diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
deleted file mode 100644
index 677858f3a..000000000
--- a/Godeps/Godeps.json
+++ /dev/null
@@ -1,277 +0,0 @@
-{
-	"ImportPath": "github.com/influxdb/telegraf",
-	"GoVersion": "go1.5.1",
-	"Deps": [
-		{
-			"ImportPath": "bitbucket.org/ww/goautoneg",
-			"Comment": "null-5",
-			"Rev": "75cd24fc2f2c2a2088577d12123ddee5f54e0675"
-		},
-		{
-			"ImportPath": "git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git",
-			"Comment": "v0.9.1-14-g546c47a",
-			"Rev": "546c47a6d0e9492e77f6f37473d59c36a708e08b"
-		},
-		{
-			"ImportPath": "github.com/Shopify/sarama",
-			"Comment": "v1.4.3-45-g5b18996",
-			"Rev": "5b18996ef1cd555a60562ae4c5d7843ae137e12d"
-		},
-		{
-			"ImportPath": "github.com/Sirupsen/logrus",
-			"Comment": "v0.8.6-7-g9c060de",
-			"Rev": "9c060de643590dae45da9d7c26276463bfc46fa0"
-		},
-		{
-			"ImportPath": "github.com/amir/raidman",
-			"Rev": "6a8e089bbe32e6b907feae5ba688841974b3c339"
-		},
-		{
-			"ImportPath": "github.com/armon/go-metrics",
-			"Rev": "b2d95e5291cdbc26997d1301a5e467ecbb240e25"
-		},
-		{
-			"ImportPath": "github.com/beorn7/perks/quantile",
-			"Rev": "b965b613227fddccbfffe13eae360ed3fa822f8d"
-		},
-		{
-			"ImportPath": "github.com/boltdb/bolt",
-			"Comment": "v1.0-117-g0f053fa",
-			"Rev": "0f053fabc06119583d61937a0a06ef0ba0f1b301"
-		},
-		{
-			"ImportPath": "github.com/cenkalti/backoff",
-			"Rev": "4dc77674aceaabba2c7e3da25d4c823edfb73f99"
-		},
-		{
-			"ImportPath": "github.com/dancannon/gorethink/encoding",
-			"Comment": "v1.x.x-1-g786f12a",
-			"Rev": "786f12ae730ea93485c4eb2c44b3ede6e1e8745f"
-		},
-		{
-			"ImportPath": "github.com/dancannon/gorethink/ql2",
-			"Comment": "v1.x.x-1-g786f12a",
-			"Rev": "786f12ae730ea93485c4eb2c44b3ede6e1e8745f"
-		},
-		{
-			"ImportPath": "github.com/dancannon/gorethink/types",
-			"Comment": "v1.x.x-1-g786f12a",
-			"Rev": "786f12ae730ea93485c4eb2c44b3ede6e1e8745f"
-		},
-		{
-			"ImportPath": "github.com/eapache/go-resiliency/breaker",
-			"Comment": "v1.0.0-1-ged0319b",
-			"Rev": "ed0319b32e66e3295db52695ba3ee493e823fbfe"
-		},
-		{
-			"ImportPath": "github.com/eapache/queue",
-			"Comment": "v1.0.2",
-			"Rev": "ded5959c0d4e360646dc9e9908cff48666781367"
-		},
-		{
-			"ImportPath": "github.com/fsouza/go-dockerclient",
-			"Rev": "ef410296f87750305e1e1acf9ad2ba3833dcb004"
-		},
-		{
-			"ImportPath": "github.com/go-sql-driver/mysql",
-			"Comment": "v1.2-118-g3dd7008",
-			"Rev": "3dd7008ac1529aca1bcd8a9db75228a71ba23cac"
-		},
-		{
-			"ImportPath": "github.com/gogo/protobuf/proto",
-			"Rev": "cabd153b69f71bab8b89fd667a2d9bb28c92ceb4"
-		},
-		{
-			"ImportPath": "github.com/golang/protobuf/proto",
-			"Rev": "73aaaa9eb61d74fbf7e256ca586a3a565b308eea"
-		},
-		{
-			"ImportPath": "github.com/golang/snappy",
-			"Rev": "723cc1e459b8eea2dea4583200fd60757d40097a"
-		},
-		{
-			"ImportPath": "github.com/gonuts/go-shellquote",
-			"Rev": "e842a11b24c6abfb3dd27af69a17f482e4b483c2"
-		},
-		{
-			"ImportPath": "github.com/hashicorp/go-msgpack/codec",
-			"Rev": "fa3f63826f7c23912c15263591e65d54d080b458"
-		},
-		{
-			"ImportPath": "github.com/hashicorp/raft",
-			"Rev": "9b586e29edf1ed085b11da7772479ee45c433996"
-		},
-		{
-			"ImportPath": "github.com/hashicorp/raft-boltdb",
-			"Rev": "d1e82c1ec3f15ee991f7cc7ffd5b67ff6f5bbaee"
-		},
-		{
-			"ImportPath": "github.com/influxdb/influxdb",
-			"Comment": "v0.9.4-rc1-922-gb0e9f7e",
-			"Rev": "b0e9f7e844225b05abf9f4455229490f99348ac4"
-		},
-		{
-			"ImportPath": "github.com/lib/pq",
-			"Comment": "go1.0-cutoff-59-gb269bd0",
-			"Rev": "b269bd035a727d6c1081f76e7a239a1b00674c40"
-		},
-		{
-			"ImportPath": "github.com/matttproud/golang_protobuf_extensions/pbutil",
-			"Rev": "fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a"
-		},
-		{
-			"ImportPath": "github.com/mreiferson/go-snappystream",
-			"Comment": "v0.2.3",
-			"Rev": "028eae7ab5c4c9e2d1cb4c4ca1e53259bbe7e504"
-		},
-		{
-			"ImportPath": "github.com/naoina/go-stringutil",
-			"Rev": "360db0db4b01d34e12a2ec042c09e7d37fece761"
-		},
-		{
-			"ImportPath": "github.com/naoina/toml",
-			"Rev": "5811abcabb29d6af0fdf060f96d328962bd3cd5e"
-		},
-		{
-			"ImportPath": "github.com/nsqio/go-nsq",
-			"Comment": "v1.0.5-6-g2118015",
-			"Rev": "2118015c120962edc5d03325c680daf3163a8b5f"
-		},
-		{
-			"ImportPath": "github.com/pborman/uuid",
-			"Rev": "ca53cad383cad2479bbba7f7a1a05797ec1386e4"
-		},
-		{
-			"ImportPath": "github.com/prometheus/client_golang/prometheus",
-			"Comment": "0.7.0-52-ge51041b",
-			"Rev": "e51041b3fa41cece0dca035740ba6411905be473"
-		},
-		{
-			"ImportPath": "github.com/prometheus/client_model/go",
-			"Comment": "model-0.0.2-12-gfa8ad6f",
-			"Rev": "fa8ad6fec33561be4280a8f0514318c79d7f6cb6"
-		},
-		{
-			"ImportPath": "github.com/prometheus/common/expfmt",
-			"Rev": "369ec0491ce7be15431bd4f23b7fa17308f94190"
-		},
-		{
-			"ImportPath": "github.com/prometheus/common/model",
-			"Rev": "369ec0491ce7be15431bd4f23b7fa17308f94190"
-		},
-		{
-			"ImportPath": "github.com/prometheus/procfs",
-			"Rev": "454a56f35412459b5e684fd5ec0f9211b94f002a"
-		},
-		{
-			"ImportPath": "github.com/samuel/go-zookeeper/zk",
-			"Rev": "5bb5cfc093ad18a28148c578f8632cfdb4d802e4"
-		},
-		{
-			"ImportPath": "github.com/shirou/gopsutil/cpu",
-			"Comment": "1.0.0-208-g759e96e",
-			"Rev": "759e96ebaffb01c3cba0e8b129ef29f56507b323"
-		},
-		{
-			"ImportPath": "github.com/shirou/gopsutil/disk",
-			"Comment": "1.0.0-208-g759e96e",
-			"Rev": "759e96ebaffb01c3cba0e8b129ef29f56507b323"
-		},
-		{
-			"ImportPath": "github.com/shirou/gopsutil/docker",
-			"Comment": "1.0.0-208-g759e96e",
-			"Rev": "759e96ebaffb01c3cba0e8b129ef29f56507b323"
-		},
-		{
-			"ImportPath": "github.com/shirou/gopsutil/host",
-			"Comment": "1.0.0-208-g759e96e",
-			"Rev": "759e96ebaffb01c3cba0e8b129ef29f56507b323"
-		},
-		{
-			"ImportPath": "github.com/shirou/gopsutil/load",
-			"Comment": "1.0.0-208-g759e96e",
-			"Rev": "759e96ebaffb01c3cba0e8b129ef29f56507b323"
-		},
-		{
-			"ImportPath": "github.com/shirou/gopsutil/mem",
-			"Comment": "1.0.0-208-g759e96e",
-			"Rev": "759e96ebaffb01c3cba0e8b129ef29f56507b323"
-		},
-		{
-			"ImportPath": "github.com/shirou/gopsutil/net",
-			"Comment": "1.0.0-208-g759e96e",
-			"Rev": "759e96ebaffb01c3cba0e8b129ef29f56507b323"
-		},
-		{
-			"ImportPath": "github.com/shirou/gopsutil/process",
-			"Comment": "1.0.0-208-g759e96e",
-			"Rev": "759e96ebaffb01c3cba0e8b129ef29f56507b323"
-		},
-		{
-			"ImportPath": "github.com/streadway/amqp",
-			"Rev": "f4879ba28fffbb576743b03622a9ff20461826b2"
-		},
-		{
-			"ImportPath": "github.com/stretchr/objx",
-			"Rev": "cbeaeb16a013161a98496fad62933b1d21786672"
-		},
-		{
-			"ImportPath": "github.com/stretchr/testify/assert",
-			"Comment": "v1.0-21-gf552045",
-			"Rev": "f5520455607c0233cb6d7b056f71b22c1d265ef1"
-		},
-		{
-			"ImportPath": "github.com/stretchr/testify/mock",
-			"Comment": "v1.0-21-gf552045",
-			"Rev": "f5520455607c0233cb6d7b056f71b22c1d265ef1"
-		},
-		{
-			"ImportPath": "github.com/stretchr/testify/require",
-			"Comment": "v1.0-21-gf552045",
-			"Rev": "f5520455607c0233cb6d7b056f71b22c1d265ef1"
-		},
-		{
-			"ImportPath": "github.com/stretchr/testify/suite",
-			"Comment": "v1.0-21-gf552045",
-			"Rev": "f5520455607c0233cb6d7b056f71b22c1d265ef1"
-		},
-		{
-			"ImportPath": "github.com/wvanbergen/kafka/consumergroup",
-			"Rev": "b0e5c20a0d7c3ccfd37a5965ae30a3a0fd15945d"
-		},
-		{
-			"ImportPath": "github.com/wvanbergen/kazoo-go",
-			"Rev": "02a3868e9b87153285439cd27a39c0a2984a13af"
-		},
-		{
-			"ImportPath": "golang.org/x/crypto/bcrypt",
-			"Rev": "173ce04bfaf66c7bb0fa9d5c0bfd93e773909dbd"
-		},
-		{
-			"ImportPath": "golang.org/x/crypto/blowfish",
-			"Rev": "173ce04bfaf66c7bb0fa9d5c0bfd93e773909dbd"
-		},
-		{
-			"ImportPath": "golang.org/x/net/websocket",
-			"Rev": "db8e4de5b2d6653f66aea53094624468caad15d2"
-		},
-		{
-			"ImportPath": "gopkg.in/dancannon/gorethink.v1",
-			"Comment": "v1.x.x",
-			"Rev": "8aca6ba2cc6e873299617d730fac0d7f6593113a"
-		},
-		{
-			"ImportPath": "gopkg.in/fatih/pool.v2",
-			"Rev": "cba550ebf9bce999a02e963296d4bc7a486cb715"
-		},
-		{
-			"ImportPath": "gopkg.in/mgo.v2",
-			"Comment": "r2015.06.03-3-g3569c88",
-			"Rev": "3569c88678d88179dcbd68d02ab081cbca3cd4d0"
-		},
-		{
-			"ImportPath": "gopkg.in/yaml.v2",
-			"Rev": "7ad95dd0798a40da1ccdff6dff35fd177b5edf40"
-		}
-	]
-}
diff --git a/Godeps/Readme b/Godeps/Readme
deleted file mode 100644
index 4cdaa53d5..000000000
--- a/Godeps/Readme
+++ /dev/null
@@ -1,5 +0,0 @@
-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
deleted file mode 100644
index f037d684e..000000000
--- a/Godeps/_workspace/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/pkg
-/bin
diff --git a/Godeps/_workspace/src/bitbucket.org/ww/goautoneg/Makefile b/Godeps/_workspace/src/bitbucket.org/ww/goautoneg/Makefile
deleted file mode 100644
index e33ee1730..000000000
--- a/Godeps/_workspace/src/bitbucket.org/ww/goautoneg/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-include $(GOROOT)/src/Make.inc
-
-TARG=bitbucket.org/ww/goautoneg
-GOFILES=autoneg.go
-
-include $(GOROOT)/src/Make.pkg
-
-format:
-	gofmt -w *.go
-
-docs:
-	gomake clean
-	godoc ${TARG} > README.txt
diff --git a/Godeps/_workspace/src/bitbucket.org/ww/goautoneg/README.txt b/Godeps/_workspace/src/bitbucket.org/ww/goautoneg/README.txt
deleted file mode 100644
index 7723656d5..000000000
--- a/Godeps/_workspace/src/bitbucket.org/ww/goautoneg/README.txt
+++ /dev/null
@@ -1,67 +0,0 @@
-PACKAGE
-
-package goautoneg
-import "bitbucket.org/ww/goautoneg"
-
-HTTP Content-Type Autonegotiation.
-
-The functions in this package implement the behaviour specified in
-http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html
-
-Copyright (c) 2011, Open Knowledge Foundation Ltd.
-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 Open Knowledge Foundation Ltd. 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.
-
-
-FUNCTIONS
-
-func Negotiate(header string, alternatives []string) (content_type string)
-Negotiate the most appropriate content_type given the accept header
-and a list of alternatives.
-
-func ParseAccept(header string) (accept []Accept)
-Parse an Accept Header string returning a sorted list
-of clauses
-
-
-TYPES
-
-type Accept struct {
-    Type, SubType string
-    Q             float32
-    Params        map[string]string
-}
-Structure to represent a clause in an HTTP Accept Header
-
-
-SUBDIRECTORIES
-
-	.hg
diff --git a/Godeps/_workspace/src/bitbucket.org/ww/goautoneg/autoneg.go b/Godeps/_workspace/src/bitbucket.org/ww/goautoneg/autoneg.go
deleted file mode 100644
index 648b38cb6..000000000
--- a/Godeps/_workspace/src/bitbucket.org/ww/goautoneg/autoneg.go
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
-HTTP Content-Type Autonegotiation.
-
-The functions in this package implement the behaviour specified in
-http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html
-
-Copyright (c) 2011, Open Knowledge Foundation Ltd.
-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 Open Knowledge Foundation Ltd. 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 goautoneg
-
-import (
-	"sort"
-	"strconv"
-	"strings"
-)
-
-// Structure to represent a clause in an HTTP Accept Header
-type Accept struct {
-	Type, SubType string
-	Q             float64
-	Params        map[string]string
-}
-
-// For internal use, so that we can use the sort interface
-type accept_slice []Accept
-
-func (accept accept_slice) Len() int {
-	slice := []Accept(accept)
-	return len(slice)
-}
-
-func (accept accept_slice) Less(i, j int) bool {
-	slice := []Accept(accept)
-	ai, aj := slice[i], slice[j]
-	if ai.Q > aj.Q {
-		return true
-	}
-	if ai.Type != "*" && aj.Type == "*" {
-		return true
-	}
-	if ai.SubType != "*" && aj.SubType == "*" {
-		return true
-	}
-	return false
-}
-
-func (accept accept_slice) Swap(i, j int) {
-	slice := []Accept(accept)
-	slice[i], slice[j] = slice[j], slice[i]
-}
-
-// Parse an Accept Header string returning a sorted list
-// of clauses
-func ParseAccept(header string) (accept []Accept) {
-	parts := strings.Split(header, ",")
-	accept = make([]Accept, 0, len(parts))
-	for _, part := range parts {
-		part := strings.Trim(part, " ")
-
-		a := Accept{}
-		a.Params = make(map[string]string)
-		a.Q = 1.0
-
-		mrp := strings.Split(part, ";")
-
-		media_range := mrp[0]
-		sp := strings.Split(media_range, "/")
-		a.Type = strings.Trim(sp[0], " ")
-
-		switch {
-		case len(sp) == 1 && a.Type == "*":
-			a.SubType = "*"
-		case len(sp) == 2:
-			a.SubType = strings.Trim(sp[1], " ")
-		default:
-			continue
-		}
-
-		if len(mrp) == 1 {
-			accept = append(accept, a)
-			continue
-		}
-
-		for _, param := range mrp[1:] {
-			sp := strings.SplitN(param, "=", 2)
-			if len(sp) != 2 {
-				continue
-			}
-			token := strings.Trim(sp[0], " ")
-			if token == "q" {
-				a.Q, _ = strconv.ParseFloat(sp[1], 32)
-			} else {
-				a.Params[token] = strings.Trim(sp[1], " ")
-			}
-		}
-
-		accept = append(accept, a)
-	}
-
-	slice := accept_slice(accept)
-	sort.Sort(slice)
-
-	return
-}
-
-// Negotiate the most appropriate content_type given the accept header
-// and a list of alternatives.
-func Negotiate(header string, alternatives []string) (content_type string) {
-	asp := make([][]string, 0, len(alternatives))
-	for _, ctype := range alternatives {
-		asp = append(asp, strings.SplitN(ctype, "/", 2))
-	}
-	for _, clause := range ParseAccept(header) {
-		for i, ctsp := range asp {
-			if clause.Type == ctsp[0] && clause.SubType == ctsp[1] {
-				content_type = alternatives[i]
-				return
-			}
-			if clause.Type == ctsp[0] && clause.SubType == "*" {
-				content_type = alternatives[i]
-				return
-			}
-			if clause.Type == "*" && clause.SubType == "*" {
-				content_type = alternatives[i]
-				return
-			}
-		}
-	}
-	return
-}
diff --git a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/.gitignore b/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/.gitignore
deleted file mode 100644
index 47bb0de48..000000000
--- a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/.gitignore
+++ /dev/null
@@ -1,36 +0,0 @@
-# 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
-
-*.msg
-*.lok
-
-samples/trivial
-samples/trivial2
-samples/sample
-samples/reconnect
-samples/ssl
-samples/custom_store
-samples/simple
-samples/stdinpub
-samples/stdoutsub
-samples/routing
\ No newline at end of file
diff --git a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/CONTRIBUTING.md b/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/CONTRIBUTING.md
deleted file mode 100644
index ce3771955..000000000
--- a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/CONTRIBUTING.md
+++ /dev/null
@@ -1,69 +0,0 @@
-Contributing to Paho
-====================
-
-Thanks for your interest in this project.
-
-Project description:
---------------------
-
-The Paho project has been created to provide scalable open-source implementations of open and standard messaging protocols aimed at new, existing, and emerging applications for Machine-to-Machine (M2M) and Internet of Things (IoT).
-Paho reflects the inherent physical and cost constraints of device connectivity. Its objectives include effective levels of decoupling between devices and applications, designed to keep markets open and encourage the rapid growth of scalable Web and Enterprise middleware and applications. Paho is being kicked off with MQTT publish/subscribe client implementations for use on embedded platforms, along with corresponding server support as determined by the community.
-
-- https://projects.eclipse.org/projects/technology.paho
-
-Developer resources:
---------------------
-
-Information regarding source code management, builds, coding standards, and more.
-
-- https://projects.eclipse.org/projects/technology.paho/developer
-
-Contributor License Agreement:
-------------------------------
-
-Before your contribution can be accepted by the project, you need to create and electronically sign the Eclipse Foundation Contributor License Agreement (CLA).
-
-- http://www.eclipse.org/legal/CLA.php
-
-Contributing Code:
-------------------
-
-The Go client uses git with Gerrit for code review, use the following URLs for Gerrit access;
-
-ssh://<username>@git.eclipse.org:29418/paho/org.eclipse.paho.mqtt.golang
-
-Configure a remote called review to push your changes to;
-
-git config remote.review.url ssh://<username>@git.eclipse.org:29418/paho/org.eclipse.paho.mqtt.golang
-git config remote.review.push HEAD:refs/for/<branch>
-
-When you have made and committed a change you can push it to Gerrit for review with;
-
-git push review
-
-See https://wiki.eclipse.org/Gerrit for more details on how Gerrit is used in Eclipse, https://wiki.eclipse.org/Gerrit#Gerrit_Code_Review_Cheatsheet has some particularly useful information.
-
-Git commit messages should follow the style described here;
-
-http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html
-
-Contact:
---------
-
-Contact the project developers via the project's "dev" list.
-
-- https://dev.eclipse.org/mailman/listinfo/paho-dev
-
-Search for bugs:
-----------------
-
-This project uses Bugzilla to track ongoing development and issues.
-
-- https://bugs.eclipse.org/bugs/buglist.cgi?product=Paho&component=MQTT-Go
-
-Create a new bug:
------------------
-
-Be sure to search for existing bugs before you create another one. Remember that contributions are always welcome!
-
-- https://bugs.eclipse.org/bugs/enter_bug.cgi?product=Paho
diff --git a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/DISTRIBUTION b/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/DISTRIBUTION
deleted file mode 100644
index 34e49731d..000000000
--- a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/DISTRIBUTION
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-Eclipse Distribution License - v 1.0
-
-Copyright (c) 2007, Eclipse Foundation, Inc. and its licensors.
-
-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 Eclipse Foundation, 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/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/LICENSE b/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/LICENSE
deleted file mode 100644
index aa7cc810f..000000000
--- a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/LICENSE
+++ /dev/null
@@ -1,87 +0,0 @@
-Eclipse Public License - v 1.0
-
-THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
-1. DEFINITIONS
-
-"Contribution" means:
-
-a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and
-
-b) in the case of each subsequent Contributor:
-
-i) changes to the Program, and
-
-ii) additions to the Program;
-
-where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program.
-
-"Contributor" means any person or entity that distributes the Program.
-
-"Licensed Patents" mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program.
-
-"Program" means the Contributions distributed in accordance with this Agreement.
-
-"Recipient" means anyone who receives the Program under this Agreement, including all Contributors.
-
-2. GRANT OF RIGHTS
-
-a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form.
-
-b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder.
-
-c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient's responsibility to acquire that license before distributing the Program.
-
-d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement.
-
-3. REQUIREMENTS
-
-A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:
-
-a) it complies with the terms and conditions of this Agreement; and
-
-b) its license agreement:
-
-i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose;
-
-ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits;
-
-iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and
-
-iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange.
-
-When the Program is made available in source code form:
-
-a) it must be made available under this Agreement; and
-
-b) a copy of this Agreement must be included with each copy of the Program.
-
-Contributors may not remove or alter any copyright notices contained within the Program.
-
-Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to identify the originator of the Contribution.
-
-4. COMMERCIAL DISTRIBUTION
-
-Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor ("Commercial Contributor") hereby agrees to defend and indemnify every other Contributor ("Indemnified Contributor") against any losses, damages and costs (collectively "Losses") arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may participate in any such claim at its own expense.
-
-For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages.
-
-5. NO WARRANTY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED 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. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks associated with its exercise of rights under this Agreement , including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations.
-
-6. DISCLAIMER OF LIABILITY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), 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 OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-7. GENERAL
-
-If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
-
-If Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such litigation is filed.
-
-All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive.
-
-Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved.
-
-This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation.
\ No newline at end of file
diff --git a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/README.md b/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/README.md
deleted file mode 100644
index cc26f0759..000000000
--- a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/README.md
+++ /dev/null
@@ -1,62 +0,0 @@
-Eclipse Paho MQTT Go client
-===========================
-
-
-This repository contains the source code for the [Eclipse Paho](http://eclipse.org/paho) MQTT Go client library. 
-
-This code builds a library which enable applications to connect to an [MQTT](http://mqtt.org) broker to publish messages, and to subscribe to topics and receive published messages.
-
-This library supports a fully asynchronous mode of operation.
-
-
-Installation and Build
-----------------------
-
-This client is designed to work with the standard Go tools, so installation is as easy as:
-
-```
-go get git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git
-```
-
-The client depends on Google's [websockets](http://godoc.org/code.google.com/p/go.net/websocket) package, 
-also easily installed with the command:
-
-```
-go get code.google.com/p/go.net/websocket
-```
-
-
-Usage and API
--------------
-
-Detailed API documentation is available by using to godoc tool, or can be browsed online
-using the [godoc.org](http://godoc.org/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git) service.
-
-Make use of the library by importing it in your Go client source code. For example,
-```
-import MQTT "git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git"
-```
-
-Samples are available in the `/samples` directory for reference.
-
-
-Runtime tracing
----------------
-
-Tracing is enabled by assigning logs (from the Go log package) to the logging endpoints, ERROR, CRITICAL, WARN and DEBUG
-
-
-Reporting bugs
---------------
-
-Please report bugs under the "MQTT-Go" Component in [Eclipse Bugzilla](http://bugs.eclipse.org/bugs/) for the Paho Technology project. This is a very new library as of Q1 2014, so there are sure to be bugs.
-
-
-More information
-----------------
-
-Discussion of the Paho clients takes place on the [Eclipse paho-dev mailing list](https://dev.eclipse.org/mailman/listinfo/paho-dev).
-
-General questions about the MQTT protocol are discussed in the [MQTT Google Group](https://groups.google.com/forum/?hl=en-US&fromgroups#!forum/mqtt).
-
-There is much more information available via the [MQTT community site](http://mqtt.org).
diff --git a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/about.html b/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/about.html
deleted file mode 100644
index b183f417a..000000000
--- a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/about.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p><em>December 9, 2013</em></p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content").  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL") and Eclipse Distribution License Version 1.0 ("EDL").
-A copy of the EPL is available at 
-<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a> 
-and a copy of the EDL is available at 
-<a href="http://www.eclipse.org/org/documents/edl-v10.php">http://www.eclipse.org/org/documents/edl-v10.php</a>. 
-For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-		
-		<h3>Third Party Content</h3>
-		<p>The Content includes items that have been sourced from third parties as set out below. If you 
-		did not receive this Content directly from the Eclipse Foundation, the following is provided 
-		for informational purposes only, and you should look to the Redistributor's license for 
-		terms and conditions of use.</p>
-		<p><em>
-		<strong>None</strong> <br><br>
-		<br><br> 
-		</em></p>
-
-
-
-</body></html>
diff --git a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/client.go b/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/client.go
deleted file mode 100644
index 1e5fd39a4..000000000
--- a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/client.go
+++ /dev/null
@@ -1,517 +0,0 @@
-/*
- * Copyright (c) 2013 IBM Corp.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Seth Hoenig
- *    Allan Stockdill-Mander
- *    Mike Robertson
- */
-
-// Package mqtt provides an MQTT v3.1.1 client library.
-package mqtt
-
-import (
-	"errors"
-	"fmt"
-	"git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/packets"
-	"net"
-	"sync"
-	"time"
-)
-
-// ClientInt is the interface definition for a Client as used by this
-// library, the interface is primarily to allow mocking tests.
-type ClientInt interface {
-	IsConnected() bool
-	Connect() Token
-	Disconnect(uint)
-	disconnect()
-	Publish(string, byte, bool, interface{}) Token
-	Subscribe(string, byte, MessageHandler) Token
-	SubscribeMultiple(map[string]byte, MessageHandler) Token
-	Unsubscribe(...string) Token
-}
-
-// Client is an MQTT v3.1.1 client for communicating
-// with an MQTT server using non-blocking methods that allow work
-// to be done in the background.
-// An application may connect to an MQTT server using:
-//   A plain TCP socket
-//   A secure SSL/TLS socket
-//   A websocket
-// To enable ensured message delivery at Quality of Service (QoS) levels
-// described in the MQTT spec, a message persistence mechanism must be
-// used. This is done by providing a type which implements the Store
-// interface. For convenience, FileStore and MemoryStore are provided
-// implementations that should be sufficient for most use cases. More
-// information can be found in their respective documentation.
-// Numerous connection options may be specified by configuring a
-// and then supplying a ClientOptions type.
-type Client struct {
-	sync.RWMutex
-	messageIds
-	conn            net.Conn
-	ibound          chan packets.ControlPacket
-	obound          chan *PacketAndToken
-	oboundP         chan *PacketAndToken
-	msgRouter       *router
-	stopRouter      chan bool
-	incomingPubChan chan *packets.PublishPacket
-	errors          chan error
-	stop            chan struct{}
-	persist         Store
-	options         ClientOptions
-	lastContact     lastcontact
-	pingOutstanding bool
-	connected       bool
-	workers         sync.WaitGroup
-}
-
-// NewClient will create an MQTT v3.1.1 client with all of the options specified
-// in the provided ClientOptions. The client must have the Start method called
-// on it before it may be used. This is to make sure resources (such as a net
-// connection) are created before the application is actually ready.
-func NewClient(o *ClientOptions) *Client {
-	c := &Client{}
-	c.options = *o
-
-	if c.options.Store == nil {
-		c.options.Store = NewMemoryStore()
-	}
-	switch c.options.ProtocolVersion {
-	case 3, 4:
-		c.options.protocolVersionExplicit = true
-	default:
-		c.options.ProtocolVersion = 4
-		c.options.protocolVersionExplicit = false
-	}
-	c.persist = c.options.Store
-	c.connected = false
-	c.messageIds = messageIds{index: make(map[uint16]Token)}
-	c.msgRouter, c.stopRouter = newRouter()
-	c.msgRouter.setDefaultHandler(c.options.DefaultPublishHander)
-	return c
-}
-
-// IsConnected returns a bool signifying whether
-// the client is connected or not.
-func (c *Client) IsConnected() bool {
-	c.RLock()
-	defer c.RUnlock()
-	return c.connected
-}
-
-func (c *Client) setConnected(status bool) {
-	c.Lock()
-	defer c.Unlock()
-	c.connected = status
-}
-
-//ErrNotConnected is the error returned from function calls that are
-//made when the client is not connected to a broker
-var ErrNotConnected = errors.New("Not Connected")
-
-// Connect will create a connection to the message broker
-// If clean session is false, then a slice will
-// be returned containing Receipts for all messages
-// that were in-flight at the last disconnect.
-// If clean session is true, then any existing client
-// state will be removed.
-func (c *Client) Connect() Token {
-	var err error
-	t := newToken(packets.Connect).(*ConnectToken)
-	DEBUG.Println(CLI, "Connect()")
-
-	go func() {
-		var rc byte
-		cm := newConnectMsgFromOptions(&c.options)
-
-		for _, broker := range c.options.Servers {
-		CONN:
-			DEBUG.Println(CLI, "about to write new connect msg")
-			c.conn, err = openConnection(broker, &c.options.TLSConfig, c.options.ConnectTimeout)
-			if err == nil {
-				DEBUG.Println(CLI, "socket connected to broker")
-				switch c.options.ProtocolVersion {
-				case 3:
-					DEBUG.Println(CLI, "Using MQTT 3.1 protocol")
-					cm.ProtocolName = "MQIsdp"
-					cm.ProtocolVersion = 3
-				default:
-					DEBUG.Println(CLI, "Using MQTT 3.1.1 protocol")
-					c.options.ProtocolVersion = 4
-					cm.ProtocolName = "MQTT"
-					cm.ProtocolVersion = 4
-				}
-				cm.Write(c.conn)
-
-				rc = c.connect()
-				if rc != packets.Accepted {
-					c.conn.Close()
-					c.conn = nil
-					//if the protocol version was explicitly set don't do any fallback
-					if c.options.protocolVersionExplicit {
-						ERROR.Println(CLI, "Connecting to", broker, "CONNACK was not CONN_ACCEPTED, but rather", packets.ConnackReturnCodes[rc])
-						continue
-					}
-					if c.options.ProtocolVersion == 4 {
-						DEBUG.Println(CLI, "Trying reconnect using MQTT 3.1 protocol")
-						c.options.ProtocolVersion = 3
-						goto CONN
-					}
-				}
-				break
-			} else {
-				ERROR.Println(CLI, err.Error())
-				WARN.Println(CLI, "failed to connect to broker, trying next")
-				rc = packets.ErrNetworkError
-			}
-		}
-
-		if c.conn == nil {
-			ERROR.Println(CLI, "Failed to connect to a broker")
-			t.returnCode = rc
-			if rc != packets.ErrNetworkError {
-				t.err = packets.ConnErrors[rc]
-			} else {
-				t.err = fmt.Errorf("%s : %s", packets.ConnErrors[rc], err)
-			}
-			t.flowComplete()
-			return
-		}
-
-		c.lastContact.update()
-		c.persist.Open()
-
-		c.obound = make(chan *PacketAndToken, 100)
-		c.oboundP = make(chan *PacketAndToken, 100)
-		c.ibound = make(chan packets.ControlPacket)
-		c.errors = make(chan error)
-		c.stop = make(chan struct{})
-
-		c.incomingPubChan = make(chan *packets.PublishPacket, 100)
-		c.msgRouter.matchAndDispatch(c.incomingPubChan, c.options.Order, c)
-
-		c.workers.Add(1)
-		go outgoing(c)
-		go alllogic(c)
-
-		c.connected = true
-		DEBUG.Println(CLI, "client is connected")
-		if c.options.OnConnect != nil {
-			go c.options.OnConnect(c)
-		}
-
-		if c.options.KeepAlive != 0 {
-			c.workers.Add(1)
-			go keepalive(c)
-		}
-
-		// Take care of any messages in the store
-		//var leftovers []Receipt
-		if c.options.CleanSession == false {
-			//leftovers = c.resume()
-		} else {
-			c.persist.Reset()
-		}
-
-		// Do not start incoming until resume has completed
-		c.workers.Add(1)
-		go incoming(c)
-
-		DEBUG.Println(CLI, "exit startClient")
-		t.flowComplete()
-	}()
-	return t
-}
-
-// internal function used to reconnect the client when it loses its connection
-func (c *Client) reconnect() {
-	DEBUG.Println(CLI, "enter reconnect")
-	var rc byte = 1
-	var sleep uint = 1
-	var err error
-
-	for rc != 0 {
-		cm := newConnectMsgFromOptions(&c.options)
-
-		for _, broker := range c.options.Servers {
-		CONN:
-			DEBUG.Println(CLI, "about to write new connect msg")
-			c.conn, err = openConnection(broker, &c.options.TLSConfig, c.options.ConnectTimeout)
-			if err == nil {
-				DEBUG.Println(CLI, "socket connected to broker")
-				switch c.options.ProtocolVersion {
-				case 3:
-					DEBUG.Println(CLI, "Using MQTT 3.1 protocol")
-					cm.ProtocolName = "MQIsdp"
-					cm.ProtocolVersion = 3
-				default:
-					DEBUG.Println(CLI, "Using MQTT 3.1.1 protocol")
-					c.options.ProtocolVersion = 4
-					cm.ProtocolName = "MQTT"
-					cm.ProtocolVersion = 4
-				}
-				cm.Write(c.conn)
-
-				rc = c.connect()
-				if rc != packets.Accepted {
-					c.conn.Close()
-					c.conn = nil
-					//if the protocol version was explicitly set don't do any fallback
-					if c.options.protocolVersionExplicit {
-						ERROR.Println(CLI, "Connecting to", broker, "CONNACK was not Accepted, but rather", packets.ConnackReturnCodes[rc])
-						continue
-					}
-					if c.options.ProtocolVersion == 4 {
-						DEBUG.Println(CLI, "Trying reconnect using MQTT 3.1 protocol")
-						c.options.ProtocolVersion = 3
-						goto CONN
-					}
-				}
-				break
-			} else {
-				ERROR.Println(CLI, err.Error())
-				WARN.Println(CLI, "failed to connect to broker, trying next")
-				rc = packets.ErrNetworkError
-			}
-		}
-		if rc != 0 {
-			DEBUG.Println(CLI, "Reconnect failed, sleeping for", sleep, "seconds")
-			time.Sleep(time.Duration(sleep) * time.Second)
-			if sleep <= uint(c.options.MaxReconnectInterval.Seconds()) {
-				sleep *= 2
-			}
-		}
-	}
-
-	c.lastContact.update()
-	c.stop = make(chan struct{})
-
-	c.workers.Add(1)
-	go outgoing(c)
-	go alllogic(c)
-
-	c.setConnected(true)
-	DEBUG.Println(CLI, "client is reconnected")
-	if c.options.OnConnect != nil {
-		go c.options.OnConnect(c)
-	}
-
-	if c.options.KeepAlive != 0 {
-		c.workers.Add(1)
-		go keepalive(c)
-	}
-	c.workers.Add(1)
-	go incoming(c)
-}
-
-// This function is only used for receiving a connack
-// when the connection is first started.
-// This prevents receiving incoming data while resume
-// is in progress if clean session is false.
-func (c *Client) connect() byte {
-	DEBUG.Println(NET, "connect started")
-
-	ca, err := packets.ReadPacket(c.conn)
-	if err != nil {
-		ERROR.Println(NET, "connect got error", err)
-		//c.errors <- err
-		return packets.ErrNetworkError
-	}
-	msg := ca.(*packets.ConnackPacket)
-
-	if msg == nil || msg.FixedHeader.MessageType != packets.Connack {
-		ERROR.Println(NET, "received msg that was nil or not CONNACK")
-	} else {
-		DEBUG.Println(NET, "received connack")
-	}
-	return msg.ReturnCode
-}
-
-// Disconnect will end the connection with the server, but not before waiting
-// the specified number of milliseconds to wait for existing work to be
-// completed.
-func (c *Client) Disconnect(quiesce uint) {
-	if !c.IsConnected() {
-		WARN.Println(CLI, "already disconnected")
-		return
-	}
-	DEBUG.Println(CLI, "disconnecting")
-	c.setConnected(false)
-
-	dm := packets.NewControlPacket(packets.Disconnect).(*packets.DisconnectPacket)
-	dt := newToken(packets.Disconnect)
-	c.oboundP <- &PacketAndToken{p: dm, t: dt}
-
-	// wait for work to finish, or quiesce time consumed
-	dt.WaitTimeout(time.Duration(quiesce) * time.Millisecond)
-	c.disconnect()
-}
-
-// ForceDisconnect will end the connection with the mqtt broker immediately.
-func (c *Client) forceDisconnect() {
-	if !c.IsConnected() {
-		WARN.Println(CLI, "already disconnected")
-		return
-	}
-	c.setConnected(false)
-	c.conn.Close()
-	DEBUG.Println(CLI, "forcefully disconnecting")
-	c.disconnect()
-}
-
-func (c *Client) internalConnLost(err error) {
-	close(c.stop)
-	c.conn.Close()
-	c.workers.Wait()
-	if c.IsConnected() {
-		if c.options.OnConnectionLost != nil {
-			go c.options.OnConnectionLost(c, err)
-		}
-		if c.options.AutoReconnect {
-			go c.reconnect()
-		} else {
-			c.setConnected(false)
-		}
-	}
-}
-
-func (c *Client) disconnect() {
-	select {
-	case <-c.stop:
-		//someone else has already closed the channel, must be error
-	default:
-		close(c.stop)
-	}
-	c.conn.Close()
-	c.workers.Wait()
-	close(c.stopRouter)
-	DEBUG.Println(CLI, "disconnected")
-	c.persist.Close()
-}
-
-// Publish will publish a message with the specified QoS
-// and content to the specified topic.
-// Returns a read only channel used to track
-// the delivery of the message.
-func (c *Client) Publish(topic string, qos byte, retained bool, payload interface{}) Token {
-	token := newToken(packets.Publish).(*PublishToken)
-	DEBUG.Println(CLI, "enter Publish")
-	if !c.IsConnected() {
-		token.err = ErrNotConnected
-		token.flowComplete()
-		return token
-	}
-	pub := packets.NewControlPacket(packets.Publish).(*packets.PublishPacket)
-	pub.Qos = qos
-	pub.TopicName = topic
-	pub.Retain = retained
-	switch payload.(type) {
-	case string:
-		pub.Payload = []byte(payload.(string))
-	case []byte:
-		pub.Payload = payload.([]byte)
-	default:
-		token.err = errors.New("Unknown payload type")
-		token.flowComplete()
-		return token
-	}
-
-	DEBUG.Println(CLI, "sending publish message, topic:", topic)
-	c.obound <- &PacketAndToken{p: pub, t: token}
-	return token
-}
-
-// Subscribe starts a new subscription. Provide a MessageHandler to be executed when
-// a message is published on the topic provided.
-func (c *Client) Subscribe(topic string, qos byte, callback MessageHandler) Token {
-	token := newToken(packets.Subscribe).(*SubscribeToken)
-	DEBUG.Println(CLI, "enter Subscribe")
-	if !c.IsConnected() {
-		token.err = ErrNotConnected
-		token.flowComplete()
-		return token
-	}
-	sub := packets.NewControlPacket(packets.Subscribe).(*packets.SubscribePacket)
-	if err := validateTopicAndQos(topic, qos); err != nil {
-		token.err = err
-		return token
-	}
-	sub.Topics = append(sub.Topics, topic)
-	sub.Qoss = append(sub.Qoss, qos)
-	DEBUG.Println(sub.String())
-
-	if callback != nil {
-		c.msgRouter.addRoute(topic, callback)
-	}
-
-	token.subs = append(token.subs, topic)
-	c.oboundP <- &PacketAndToken{p: sub, t: token}
-	DEBUG.Println(CLI, "exit Subscribe")
-	return token
-}
-
-// SubscribeMultiple starts a new subscription for multiple topics. Provide a MessageHandler to
-// be executed when a message is published on one of the topics provided.
-func (c *Client) SubscribeMultiple(filters map[string]byte, callback MessageHandler) Token {
-	var err error
-	token := newToken(packets.Subscribe).(*SubscribeToken)
-	DEBUG.Println(CLI, "enter SubscribeMultiple")
-	if !c.IsConnected() {
-		token.err = ErrNotConnected
-		token.flowComplete()
-		return token
-	}
-	sub := packets.NewControlPacket(packets.Subscribe).(*packets.SubscribePacket)
-	if sub.Topics, sub.Qoss, err = validateSubscribeMap(filters); err != nil {
-		token.err = err
-		return token
-	}
-
-	if callback != nil {
-		for topic := range filters {
-			c.msgRouter.addRoute(topic, callback)
-		}
-	}
-	token.subs = make([]string, len(sub.Topics))
-	copy(token.subs, sub.Topics)
-	c.oboundP <- &PacketAndToken{p: sub, t: token}
-	DEBUG.Println(CLI, "exit SubscribeMultiple")
-	return token
-}
-
-// Unsubscribe will end the subscription from each of the topics provided.
-// Messages published to those topics from other clients will no longer be
-// received.
-func (c *Client) Unsubscribe(topics ...string) Token {
-	token := newToken(packets.Unsubscribe).(*UnsubscribeToken)
-	DEBUG.Println(CLI, "enter Unsubscribe")
-	if !c.IsConnected() {
-		token.err = ErrNotConnected
-		token.flowComplete()
-		return token
-	}
-	unsub := packets.NewControlPacket(packets.Unsubscribe).(*packets.UnsubscribePacket)
-	unsub.Topics = make([]string, len(topics))
-	copy(unsub.Topics, topics)
-
-	c.oboundP <- &PacketAndToken{p: unsub, t: token}
-	for _, topic := range topics {
-		c.msgRouter.deleteRoute(topic)
-	}
-
-	DEBUG.Println(CLI, "exit Unsubscribe")
-	return token
-}
-
-//DefaultConnectionLostHandler is a definition of a function that simply
-//reports to the DEBUG log the reason for the client losing a connection.
-func DefaultConnectionLostHandler(client *Client, reason error) {
-	DEBUG.Println("Connection lost:", reason.Error())
-}
diff --git a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/components.go b/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/components.go
deleted file mode 100644
index 01f5fafdf..000000000
--- a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/components.go
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (c) 2013 IBM Corp.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Seth Hoenig
- *    Allan Stockdill-Mander
- *    Mike Robertson
- */
-
-package mqtt
-
-type component string
-
-// Component names for debug output
-const (
-	NET component = "[net]     "
-	PNG component = "[pinger]  "
-	CLI component = "[client]  "
-	DEC component = "[decode]  "
-	MES component = "[message] "
-	STR component = "[store]   "
-	MID component = "[msgids]  "
-	TST component = "[test]    "
-	STA component = "[state]   "
-	ERR component = "[error]   "
-)
diff --git a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/edl-v10 b/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/edl-v10
deleted file mode 100644
index cf989f145..000000000
--- a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/edl-v10
+++ /dev/null
@@ -1,15 +0,0 @@
-
-Eclipse Distribution License - v 1.0
-
-Copyright (c) 2007, Eclipse Foundation, Inc. and its licensors.
-
-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 Eclipse Foundation, 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/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/epl-v10 b/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/epl-v10
deleted file mode 100644
index 79e486c3d..000000000
--- a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/epl-v10
+++ /dev/null
@@ -1,70 +0,0 @@
-Eclipse Public License - v 1.0
-
-THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
-1. DEFINITIONS
-
-"Contribution" means:
-
-a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and
-b) in the case of each subsequent Contributor:
-i) changes to the Program, and
-ii) additions to the Program;
-where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program.
-"Contributor" means any person or entity that distributes the Program.
-
-"Licensed Patents" mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program.
-
-"Program" means the Contributions distributed in accordance with this Agreement.
-
-"Recipient" means anyone who receives the Program under this Agreement, including all Contributors.
-
-2. GRANT OF RIGHTS
-
-a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form.
-b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder.
-c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient's responsibility to acquire that license before distributing the Program.
-d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement.
-3. REQUIREMENTS
-
-A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:
-
-a) it complies with the terms and conditions of this Agreement; and
-b) its license agreement:
-i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose;
-ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits;
-iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and
-iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange.
-When the Program is made available in source code form:
-
-a) it must be made available under this Agreement; and
-b) a copy of this Agreement must be included with each copy of the Program.
-Contributors may not remove or alter any copyright notices contained within the Program.
-
-Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to identify the originator of the Contribution.
-
-4. COMMERCIAL DISTRIBUTION
-
-Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor ("Commercial Contributor") hereby agrees to defend and indemnify every other Contributor ("Indemnified Contributor") against any losses, damages and costs (collectively "Losses") arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may participate in any such claim at its own expense.
-
-For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages.
-
-5. NO WARRANTY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED 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. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks associated with its exercise of rights under this Agreement , including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations.
-
-6. DISCLAIMER OF LIABILITY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), 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 OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-7. GENERAL
-
-If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
-
-If Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such litigation is filed.
-
-All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive.
-
-Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved.
-
-This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation.
diff --git a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/filestore.go b/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/filestore.go
deleted file mode 100644
index c4a0c8b91..000000000
--- a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/filestore.go
+++ /dev/null
@@ -1,258 +0,0 @@
-/*
- * Copyright (c) 2013 IBM Corp.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Seth Hoenig
- *    Allan Stockdill-Mander
- *    Mike Robertson
- */
-
-package mqtt
-
-import (
-	"git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/packets"
-	"io"
-	"io/ioutil"
-	"os"
-	"path"
-	"sync"
-)
-
-const (
-	msgExt = ".msg"
-	bkpExt = ".bkp"
-)
-
-// FileStore implements the store interface using the filesystem to provide
-// true persistence, even across client failure. This is designed to use a
-// single directory per running client. If you are running multiple clients
-// on the same filesystem, you will need to be careful to specify unique
-// store directories for each.
-type FileStore struct {
-	sync.RWMutex
-	directory string
-	opened    bool
-}
-
-// NewFileStore will create a new FileStore which stores its messages in the
-// directory provided.
-func NewFileStore(directory string) *FileStore {
-	store := &FileStore{
-		directory: directory,
-		opened:    false,
-	}
-	return store
-}
-
-// Open will allow the FileStore to be used.
-func (store *FileStore) Open() {
-	store.Lock()
-	defer store.Unlock()
-	// if no store directory was specified in ClientOpts, by default use the
-	// current working directory
-	if store.directory == "" {
-		store.directory, _ = os.Getwd()
-	}
-
-	// if store dir exists, great, otherwise, create it
-	if !exists(store.directory) {
-		perms := os.FileMode(0770)
-		merr := os.MkdirAll(store.directory, perms)
-		chkerr(merr)
-	}
-	store.opened = true
-	DEBUG.Println(STR, "store is opened at", store.directory)
-}
-
-// Close will disallow the FileStore from being used.
-func (store *FileStore) Close() {
-	store.Lock()
-	defer store.Unlock()
-	store.opened = false
-	WARN.Println(STR, "store is not open")
-}
-
-// Put will put a message into the store, associated with the provided
-// key value.
-func (store *FileStore) Put(key string, m packets.ControlPacket) {
-	store.Lock()
-	defer store.Unlock()
-	chkcond(store.opened)
-	full := fullpath(store.directory, key)
-	if exists(full) {
-		backup(store.directory, key) // make a copy of what already exists
-		defer unbackup(store.directory, key)
-	}
-	write(store.directory, key, m)
-	chkcond(exists(full))
-}
-
-// Get will retrieve a message from the store, the one associated with
-// the provided key value.
-func (store *FileStore) Get(key string) packets.ControlPacket {
-	store.RLock()
-	defer store.RUnlock()
-	chkcond(store.opened)
-	filepath := fullpath(store.directory, key)
-	if !exists(filepath) {
-		return nil
-	}
-	mfile, oerr := os.Open(filepath)
-	chkerr(oerr)
-	//all, rerr := ioutil.ReadAll(mfile)
-	//chkerr(rerr)
-	msg, rerr := packets.ReadPacket(mfile)
-	chkerr(rerr)
-	cerr := mfile.Close()
-	chkerr(cerr)
-	return msg
-}
-
-// All will provide a list of all of the keys associated with messages
-// currenly residing in the FileStore.
-func (store *FileStore) All() []string {
-	store.RLock()
-	defer store.RUnlock()
-	return store.all()
-}
-
-// Del will remove the persisted message associated with the provided
-// key from the FileStore.
-func (store *FileStore) Del(key string) {
-	store.Lock()
-	defer store.Unlock()
-	store.del(key)
-}
-
-// Reset will remove all persisted messages from the FileStore.
-func (store *FileStore) Reset() {
-	store.Lock()
-	defer store.Unlock()
-	WARN.Println(STR, "FileStore Reset")
-	for _, key := range store.all() {
-		store.del(key)
-	}
-}
-
-// lockless
-func (store *FileStore) all() []string {
-	chkcond(store.opened)
-	keys := []string{}
-	files, rderr := ioutil.ReadDir(store.directory)
-	chkerr(rderr)
-	for _, f := range files {
-		DEBUG.Println(STR, "file in All():", f.Name())
-		key := f.Name()[0 : len(f.Name())-4] // remove file extension
-		keys = append(keys, key)
-	}
-	return keys
-}
-
-// lockless
-func (store *FileStore) del(key string) {
-	chkcond(store.opened)
-	DEBUG.Println(STR, "store del filepath:", store.directory)
-	DEBUG.Println(STR, "store delete key:", key)
-	filepath := fullpath(store.directory, key)
-	DEBUG.Println(STR, "path of deletion:", filepath)
-	if !exists(filepath) {
-		WARN.Println(STR, "store could not delete key:", key)
-		return
-	}
-	rerr := os.Remove(filepath)
-	chkerr(rerr)
-	DEBUG.Println(STR, "del msg:", key)
-	chkcond(!exists(filepath))
-}
-
-func fullpath(store string, key string) string {
-	p := path.Join(store, key+msgExt)
-	return p
-}
-
-func bkppath(store string, key string) string {
-	p := path.Join(store, key+bkpExt)
-	return p
-}
-
-// create file called "X.[messageid].msg" located in the store
-// the contents of the file is the bytes of the message
-// if a message with m's message id already exists, it will
-// be overwritten
-// X will be 'i' for inbound messages, and O for outbound messages
-func write(store, key string, m packets.ControlPacket) {
-	filepath := fullpath(store, key)
-	f, err := os.Create(filepath)
-	chkerr(err)
-	werr := m.Write(f)
-	chkerr(werr)
-	cerr := f.Close()
-	chkerr(cerr)
-}
-
-func exists(file string) bool {
-	if _, err := os.Stat(file); err != nil {
-		if os.IsNotExist(err) {
-			return false
-		}
-		chkerr(err)
-	}
-	return true
-}
-
-func backup(store, key string) {
-	bkpp := bkppath(store, key)
-	fulp := fullpath(store, key)
-	backup, err := os.Create(bkpp)
-	chkerr(err)
-	mfile, oerr := os.Open(fulp)
-	chkerr(oerr)
-	_, cerr := io.Copy(backup, mfile)
-	chkerr(cerr)
-	clberr := backup.Close()
-	chkerr(clberr)
-	clmerr := mfile.Close()
-	chkerr(clmerr)
-}
-
-// Identify .bkp files in the store and turn them into .msg files,
-// whether or not it overwrites an existing file. This is safe because
-// I'm copying the Paho Java client and they say it is.
-func restore(store string) {
-	files, rderr := ioutil.ReadDir(store)
-	chkerr(rderr)
-	for _, f := range files {
-		fname := f.Name()
-		if len(fname) > 4 {
-			if fname[len(fname)-4:] == bkpExt {
-				key := fname[0 : len(fname)-4]
-				fulp := fullpath(store, key)
-				msg, cerr := os.Create(fulp)
-				chkerr(cerr)
-				bkpp := path.Join(store, fname)
-				bkp, oerr := os.Open(bkpp)
-				chkerr(oerr)
-				n, cerr := io.Copy(msg, bkp)
-				chkerr(cerr)
-				chkcond(n > 0)
-				clmerr := msg.Close()
-				chkerr(clmerr)
-				clberr := bkp.Close()
-				chkerr(clberr)
-				remerr := os.Remove(bkpp)
-				chkerr(remerr)
-			}
-		}
-	}
-}
-
-func unbackup(store, key string) {
-	bkpp := bkppath(store, key)
-	remerr := os.Remove(bkpp)
-	chkerr(remerr)
-}
diff --git a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/fvt/README.md b/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/fvt/README.md
deleted file mode 100644
index 17790426f..000000000
--- a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/fvt/README.md
+++ /dev/null
@@ -1,74 +0,0 @@
-FVT Instructions
-================
-
-The FVT tests are currenly only supported by [IBM MessageSight](http://www-03.ibm.com/software/products/us/en/messagesight/).
-
-Support for [mosquitto](http://mosquitto.org/) and [IBM Really Small Message Broker](https://www.ibm.com/developerworks/community/groups/service/html/communityview?communityUuid=d5bedadd-e46f-4c97-af89-22d65ffee070) might be added in the future.
-
-
-IBM MessageSight Configuration
-------------------------------
-
-The IBM MessageSight Virtual Appliance can be downloaded here:
-[Download](http://www-933.ibm.com/support/fixcentral/swg/selectFixes?parent=ibm~Other+software&product=ibm/Other+software/MessageSight&function=fixId&fixids=1.0.0.1-IMA-DeveloperImage&includeSupersedes=0 "IBM MessageSight")
-
-There is a nice blog post about it here:
-[Blog](https://www.ibm.com/developerworks/community/blogs/c565c720-fe84-4f63-873f-607d87787327/entry/ibm_messagesight_for_developers_is_here?lang=en "Blog")
-
-
-The virtual appliance must be installed into a virtual machine like
-Oracle VirtualBox or VMWare Player. (Follow the instructions that come
-with the download).
-
-Next, copy your authorized keys (basically a file containing the public
-rsa key of your own computer) onto the appliance to enable passwordless ssh.
-
-For example,
-
-    Console> user sshkey add "scp://user@host:~/.ssh/authorized_keys"
-
-More information can be found in the IBM MessageSight InfoCenter:
-[InfoCenter](https://infocenters.hursley.ibm.com/ism/v1/help/index.jsp "InfoCenter")
-
-Now, execute the script setup_IMA.sh to create the objects necessary
-to configure the server for the unit test cases provided.
-
-For example,
-
-    ./setup_IMA.sh
-
-You should now be able to view the objects on your server:
-
-    Console> imaserver show Endpoint Name=GoMqttEP1
-    Name = GoMqttEP1
-    Enabled = True
-    Port = 17001
-    Protocol = MQTT
-    Interface = all
-    SecurityProfile =
-    ConnectionPolicies = GoMqttCP1
-    MessagingPolicies = GoMqttMP1
-    MaxMessageSize = 1024KB
-    MessageHub = GoMqttTestHub
-    Description =
-
-
-
-RSMB Configuration
-------------------
-Wait for SSL support?
-
-
-Mosquitto Configuration
------------------------
-Launch mosquitto from the fvt directory, specifiying mosquitto.cfg as config file
-
-``ex: /usr/bin/mosquitto -c ./mosquitto.cfg``
-
-Note: Mosquitto requires SSL 1.1 or better, while Go 1.1.2 supports
-only SSL v1.0. However, Go 1.2+ supports SSL v1.1 and SSL v1.2.
-
-
-Other Notes
------------
-Go 1.1.2 does not support intermediate certificates, however Go 1.2+ does.
diff --git a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/fvt/mosquitto.cfg b/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/fvt/mosquitto.cfg
deleted file mode 100644
index cddb94f31..000000000
--- a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/fvt/mosquitto.cfg
+++ /dev/null
@@ -1,17 +0,0 @@
-allow_anonymous true
-allow_duplicate_messages false
-connection_messages true
-log_dest stdout
-log_timestamp true
-log_type all
-persistence false
-bind_address 127.0.0.1
-
-listener 17001
-listener 17002
-listener 17003
-listener 17004
-
-#capath ../samples/samplecerts
-#certfile ../samples/samplecerts/server-crt.pem
-#keyfile ../samples/samplecerts/server-key.pem
diff --git a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/fvt/rsmb.cfg b/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/fvt/rsmb.cfg
deleted file mode 100644
index 1dd77547b..000000000
--- a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/fvt/rsmb.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-allow_anonymous false
-bind_address 127.0.0.1
-connection_messages true
-log_level detail
-
-listener 17001
-#listener 17003
-#listener 17004
\ No newline at end of file
diff --git a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/fvt/setup_IMA.sh b/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/fvt/setup_IMA.sh
deleted file mode 100644
index 6ebdda3c2..000000000
--- a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/fvt/setup_IMA.sh
+++ /dev/null
@@ -1,111 +0,0 @@
-#!/bin/bash
-
-#######################################################################
-# This script is for configuring your IBM Messaging Appliance for use #
-# as an mqtt test server for testing the go-mqtt open source client.  #
-# It creates the Policies and Endpoints necessary to test particular  #
-# features of the client, such as IPv6, SSL, and other things         #
-#                                                                     #
-# You do not need this script for any other purpose.                  #
-#######################################################################
-
-# Edit options to match your configuration
-IMA_HOST=9.41.55.184
-IMA_USER=admin
-HOST=9.41.55.146
-USER=root
-CERTDIR=~/GO/src/github.com/shoenig/go-mqtt/samples/samplecerts
-
-echo 'Configuring your IBM Messaging Appliance for testing go-mqtt'
-echo 'IMA_HOST: ' $IMA_HOST
-
-
-function ima {
-    reply=`ssh $IMA_USER@$IMA_HOST imaserver $@`
-}
-
-function imp {
-    reply=`ssh $IMA_USER@$IMA_HOST file get $@`
-}
-
-ima create MessageHub Name=GoMqttTestHub
-
-# Config "1" is a basic, open endpoint, port 17001
-ima create MessagingPolicy \
-    Name=GoMqttMP1 \
-    Protocol=MQTT \
-    ActionList=Publish,Subscribe \
-    MaxMessages=100000 \
-    DestinationType=Topic \
-    Destination=*
-
-ima create ConnectionPolicy \
-    Name=GoMqttCP1 \
-    Protocol=MQTT
-
-ima create Endpoint \
-    Name=GoMqttEP1 \
-    Protocol=MQTT \
-    MessageHub=GoMqttTestHub \
-    ConnectionPolicies=GoMqttCP1 \
-    MessagingPolicies=GoMqttMP1 \
-    Port=17001
-
-# Config "2" is IPv6 only , port 17002
-
-# Config "3" is for authorization failures, port 17003
-ima create ConnectionPolicy \
-    Name=GoMqttCP2 \
-    Protocol=MQTT \
-    ClientID=GoMqttClient
-
-ima create Endpoint \
-    Name=GoMqttEP3 \
-    Protocol=MQTT \
-    MessageHub=GoMqttTestHub \
-    ConnectionPolicies=GoMqttCP2 \
-    MessagingPolicies=GoMqttMP1 \
-    Port=17003
-
-# Config "4" is secure connections, port 17004
-imp scp://$USER@$HOST:${CERTDIR}/server-crt.pem .
-imp scp://$USER@$HOST:${CERTDIR}/server-key.pem .
-imp scp://$USER@$HOST:${CERTDIR}/rootCA-crt.pem .
-imp scp://$USER@$HOST:${CERTDIR}/intermediateCA-crt.pem .
-
-ima apply Certificate \
-    CertFileName=server-crt.pem \
-    "CertFilePassword=" \
-    KeyFileName=server-key.pem \
-    "KeyFilePassword="
-
-ima create CertificateProfile \
-    Name=GoMqttCertProf \
-    Certificate=server-crt.pem \
-    Key=server-key.pem
-
-ima create SecurityProfile \
-    Name=GoMqttSecProf \
-    MinimumProtocolMethod=SSLv3 \
-    UseClientCertificate=True \
-    UsePasswordAuthentication=False \
-    Ciphers=Fast \
-    CertificateProfile=GoMqttCertProf
-
-ima apply Certificate \
-    TrustedCertificate=rootCA-crt.pem \
-    SecurityProfileName=GoMqttSecProf
-
-ima apply Certificate \
-    TrustedCertificate=intermediateCA-crt.pem \
-    SecurityProfileName=GoMqttSecProf
-
-ima create Endpoint \
-    Name=GoMqttEP4 \
-    Port=17004 \
-    MessageHub=GoMqttTestHub \
-    ConnectionPolicies=GoMqttCP1 \
-    MessagingPolicies=GoMqttMP1 \
-    SecurityProfile=GoMqttSecProf \
-    Protocol=MQTT
-
diff --git a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/fvt_client_test.go b/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/fvt_client_test.go
deleted file mode 100644
index 8a914ceab..000000000
--- a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/fvt_client_test.go
+++ /dev/null
@@ -1,1007 +0,0 @@
-/*
- * Copyright (c) 2013 IBM Corp.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Seth Hoenig
- *    Allan Stockdill-Mander
- *    Mike Robertson
- */
-
-package mqtt
-
-import "fmt"
-import "time"
-import "bytes"
-
-import "io/ioutil"
-import "crypto/tls"
-import "crypto/x509"
-import "testing"
-
-func Test_Start(t *testing.T) {
-	ops := NewClientOptions().SetClientID("Start").
-		AddBroker(FVTTCP).
-		SetStore(NewFileStore("/tmp/fvt/Start"))
-	c := NewClient(ops)
-
-	token := c.Connect()
-	if token.Wait() && token.Error() != nil {
-		t.Fatalf("Error on Client.Connect(): %v", token.Error())
-	}
-
-	c.Disconnect(250)
-}
-
-/* uncomment this if you have connection policy disallowing FailClientID
-func Test_InvalidConnRc(t *testing.T) {
-	ops := NewClientOptions().SetClientID("FailClientID").
-		AddBroker("tcp://" + FVT_IP + ":17003").
-		SetStore(NewFileStore("/tmp/fvt/InvalidConnRc"))
-
-	c := NewClient(ops)
-	_, err := c.Connect()
-	if err != ErrNotAuthorized {
-		t.Fatalf("Did not receive error as expected, got %v", err)
-	}
-	c.Disconnect(250)
-}
-*/
-
-// Helper function for Test_Start_Ssl
-func NewTLSConfig() *tls.Config {
-	certpool := x509.NewCertPool()
-	pemCerts, err := ioutil.ReadFile("samples/samplecerts/CAfile.pem")
-	if err == nil {
-		certpool.AppendCertsFromPEM(pemCerts)
-	}
-
-	cert, err := tls.LoadX509KeyPair("samples/samplecerts/client-crt.pem", "samples/samplecerts/client-key.pem")
-	if err != nil {
-		panic(err)
-	}
-
-	return &tls.Config{
-		RootCAs:            certpool,
-		ClientAuth:         tls.NoClientCert,
-		ClientCAs:          nil,
-		InsecureSkipVerify: true,
-		Certificates:       []tls.Certificate{cert},
-	}
-}
-
-/* uncomment this if you have ssl setup
-func Test_Start_Ssl(t *testing.T) {
-	tlsconfig := NewTlsConfig()
-	ops := NewClientOptions().SetClientID("StartSsl").
-		AddBroker(FVT_SSL).
-		SetStore(NewFileStore("/tmp/fvt/Start_Ssl")).
-		SetTlsConfig(tlsconfig)
-
-	c := NewClient(ops)
-
-	_, err := c.Connect()
-	if err != nil {
-		t.Fatalf("Error on Client.Connect(): %v", err)
-	}
-
-	c.Disconnect(250)
-}
-*/
-
-func Test_Publish_1(t *testing.T) {
-	ops := NewClientOptions()
-	ops.AddBroker(FVTTCP)
-	ops.SetClientID("Publish_1")
-	ops.SetStore(NewFileStore("/tmp/fvt/Publish_1"))
-
-	c := NewClient(ops)
-	token := c.Connect()
-	if token.Wait() && token.Error() != nil {
-		t.Fatalf("Error on Client.Connect(): %v", token.Error())
-	}
-
-	c.Publish("test/Publish", 0, false, "Publish qo0")
-
-	c.Disconnect(250)
-}
-
-func Test_Publish_2(t *testing.T) {
-	ops := NewClientOptions()
-	ops.AddBroker(FVTTCP)
-	ops.SetClientID("Publish_2")
-	ops.SetStore(NewFileStore("/tmp/fvt/Publish_2"))
-
-	c := NewClient(ops)
-	token := c.Connect()
-	if token.Wait() && token.Error() != nil {
-		t.Fatalf("Error on Client.Connect(): %v", token.Error())
-	}
-
-	c.Publish("/test/Publish", 0, false, "Publish1 qos0")
-	c.Publish("/test/Publish", 0, false, "Publish2 qos0")
-
-	c.Disconnect(250)
-}
-
-func Test_Publish_3(t *testing.T) {
-	ops := NewClientOptions()
-	ops.AddBroker(FVTTCP)
-	ops.SetClientID("Publish_3")
-	ops.SetStore(NewFileStore("/tmp/fvt/Publish_3"))
-
-	c := NewClient(ops)
-	token := c.Connect()
-	if token.Wait() && token.Error() != nil {
-		t.Fatalf("Error on Client.Connect(): %v", token.Error())
-	}
-
-	c.Publish("/test/Publish", 0, false, "Publish1 qos0")
-	c.Publish("/test/Publish", 1, false, "Publish2 qos1")
-	c.Publish("/test/Publish", 2, false, "Publish2 qos2")
-
-	c.Disconnect(250)
-}
-
-func Test_Subscribe(t *testing.T) {
-	pops := NewClientOptions()
-	pops.AddBroker(FVTTCP)
-	pops.SetClientID("Subscribe_tx")
-	pops.SetStore(NewFileStore("/tmp/fvt/Subscribe/p"))
-	p := NewClient(pops)
-
-	sops := NewClientOptions()
-	sops.AddBroker(FVTTCP)
-	sops.SetClientID("Subscribe_rx")
-	sops.SetStore(NewFileStore("/tmp/fvt/Subscribe/s"))
-	var f MessageHandler = func(client *Client, msg Message) {
-		fmt.Printf("TOPIC: %s\n", msg.Topic())
-		fmt.Printf("MSG: %s\n", msg.Payload())
-	}
-	sops.SetDefaultPublishHandler(f)
-	s := NewClient(sops)
-
-	sToken := s.Connect()
-	if sToken.Wait() && sToken.Error() != nil {
-		t.Fatalf("Error on Client.Connect(): %v", sToken.Error())
-	}
-
-	s.Subscribe("/test/sub", 0, nil)
-
-	pToken := p.Connect()
-	if pToken.Wait() && pToken.Error() != nil {
-		t.Fatalf("Error on Client.Connect(): %v", pToken.Error())
-	}
-
-	p.Publish("/test/sub", 0, false, "Publish qos0")
-
-	p.Disconnect(250)
-	s.Disconnect(250)
-}
-
-func Test_Will(t *testing.T) {
-	willmsgc := make(chan string)
-
-	sops := NewClientOptions().AddBroker(FVTTCP)
-	sops.SetClientID("will-giver")
-	sops.SetWill("/wills", "good-byte!", 0, false)
-	sops.SetConnectionLostHandler(func(client *Client, err error) {
-		fmt.Println("OnConnectionLost!")
-	})
-	c := NewClient(sops)
-
-	wops := NewClientOptions()
-	wops.AddBroker(FVTTCP)
-	wops.SetClientID("will-subscriber")
-	wops.SetStore(NewFileStore("/tmp/fvt/Will"))
-	wops.SetDefaultPublishHandler(func(client *Client, msg Message) {
-		fmt.Printf("TOPIC: %s\n", msg.Topic())
-		fmt.Printf("MSG: %s\n", msg.Payload())
-		willmsgc <- string(msg.Payload())
-	})
-	wsub := NewClient(wops)
-
-	wToken := wsub.Connect()
-	if wToken.Wait() && wToken.Error() != nil {
-		t.Fatalf("Error on Client.Connect(): %v", wToken.Error())
-	}
-
-	wsub.Subscribe("/wills", 0, nil)
-
-	token := c.Connect()
-	if token.Wait() && token.Error() != nil {
-		t.Fatalf("Error on Client.Connect(): %v", token.Error())
-	}
-	time.Sleep(time.Duration(1) * time.Second)
-
-	c.forceDisconnect()
-
-	wsub.Disconnect(250)
-
-	if <-willmsgc != "good-byte!" {
-		t.Fatalf("will message did not have correct payload")
-	}
-}
-
-func Test_Binary_Will(t *testing.T) {
-	willmsgc := make(chan []byte)
-	will := []byte{
-		0xDE,
-		0xAD,
-		0xBE,
-		0xEF,
-	}
-
-	sops := NewClientOptions().AddBroker(FVTTCP)
-	sops.SetClientID("will-giver")
-	sops.SetBinaryWill("/wills", will, 0, false)
-	sops.SetConnectionLostHandler(func(client *Client, err error) {
-	})
-	c := NewClient(sops)
-
-	wops := NewClientOptions().AddBroker(FVTTCP)
-	wops.SetClientID("will-subscriber")
-	wops.SetStore(NewFileStore("/tmp/fvt/Binary_Will"))
-	wops.SetDefaultPublishHandler(func(client *Client, msg Message) {
-		fmt.Printf("TOPIC: %s\n", msg.Topic())
-		fmt.Printf("MSG: %v\n", msg.Payload())
-		willmsgc <- msg.Payload()
-	})
-	wsub := NewClient(wops)
-
-	wToken := wsub.Connect()
-	if wToken.Wait() && wToken.Error() != nil {
-		t.Fatalf("Error on Client.Connect(): %v", wToken.Error())
-	}
-
-	wsub.Subscribe("/wills", 0, nil)
-
-	token := c.Connect()
-	if token.Wait() && token.Error() != nil {
-		t.Fatalf("Error on Client.Connect(): %v", token.Error())
-	}
-	time.Sleep(time.Duration(1) * time.Second)
-
-	c.forceDisconnect()
-
-	wsub.Disconnect(250)
-
-	if !bytes.Equal(<-willmsgc, will) {
-		t.Fatalf("will message did not have correct payload")
-	}
-}
-
-/**
-"[...] a publisher is responsible for determining the maximum QoS a
-message can be delivered at, but a subscriber is able to downgrade
-the QoS to one more suitable for its usage.
-The QoS of a message is never upgraded."
-**/
-
-/***********************************
- * Tests to cover the 9 QoS combos *
- ***********************************/
-
-func wait(c chan bool) {
-	fmt.Println("choke is waiting")
-	<-c
-}
-
-// Pub 0, Sub 0
-
-func Test_p0s0(t *testing.T) {
-	store := "/tmp/fvt/p0s0"
-	topic := "/test/p0s0"
-	choke := make(chan bool)
-
-	pops := NewClientOptions()
-	pops.AddBroker(FVTTCP)
-	pops.SetClientID("p0s0-pub")
-	pops.SetStore(NewFileStore(store + "/p"))
-	p := NewClient(pops)
-
-	sops := NewClientOptions()
-	sops.AddBroker(FVTTCP)
-	sops.SetClientID("p0s0-sub")
-	sops.SetStore(NewFileStore(store + "/s"))
-	var f MessageHandler = func(client *Client, msg Message) {
-		fmt.Printf("TOPIC: %s\n", msg.Topic())
-		fmt.Printf("MSG: %s\n", msg.Payload())
-		choke <- true
-	}
-	sops.SetDefaultPublishHandler(f)
-
-	s := NewClient(sops)
-	sToken := s.Connect()
-	if sToken.Wait() && sToken.Error() != nil {
-		t.Fatalf("Error on Client.Connect(): %v", sToken.Error())
-	}
-
-	sToken = s.Subscribe(topic, 0, nil)
-	if sToken.Wait() && sToken.Error() != nil {
-		t.Fatalf("Error on Client.Subscribe(): %v", sToken.Error())
-	}
-
-	pToken := p.Connect()
-	if pToken.Wait() && pToken.Error() != nil {
-		t.Fatalf("Error on Client.Connect(): %v", pToken.Error())
-	}
-	p.Publish(topic, 0, false, "p0s0 payload 1")
-	p.Publish(topic, 0, false, "p0s0 payload 2")
-
-	wait(choke)
-	wait(choke)
-
-	p.Publish(topic, 0, false, "p0s0 payload 3")
-	wait(choke)
-
-	p.Disconnect(250)
-	s.Disconnect(250)
-
-	chkcond(isemptydir(store + "/p"))
-	chkcond(isemptydir(store + "/s"))
-}
-
-// Pub 0, Sub 1
-
-func Test_p0s1(t *testing.T) {
-	store := "/tmp/fvt/p0s1"
-	topic := "/test/p0s1"
-	choke := make(chan bool)
-
-	pops := NewClientOptions()
-	pops.AddBroker(FVTTCP)
-	pops.SetClientID("p0s1-pub")
-	pops.SetStore(NewFileStore(store + "/p"))
-	p := NewClient(pops)
-
-	sops := NewClientOptions()
-	sops.AddBroker(FVTTCP)
-	sops.SetClientID("p0s1-sub")
-	sops.SetStore(NewFileStore(store + "/s"))
-	var f MessageHandler = func(client *Client, msg Message) {
-		fmt.Printf("TOPIC: %s\n", msg.Topic())
-		fmt.Printf("MSG: %s\n", msg.Payload())
-		choke <- true
-	}
-	sops.SetDefaultPublishHandler(f)
-
-	s := NewClient(sops)
-	sToken := s.Connect()
-	if sToken.Wait() && sToken.Error() != nil {
-		t.Fatalf("Error on Client.Connect(): %v", sToken.Error())
-	}
-
-	sToken = s.Subscribe(topic, 1, nil)
-	if sToken.Wait() && sToken.Error() != nil {
-		t.Fatalf("Error on Client.Subscribe(): %v", sToken.Error())
-	}
-
-	pToken := p.Connect()
-	if pToken.Wait() && pToken.Error() != nil {
-		t.Fatalf("Error on Client.Connect(): %v", pToken.Error())
-	}
-	p.Publish(topic, 0, false, "p0s1 payload 1")
-	p.Publish(topic, 0, false, "p0s1 payload 2")
-
-	wait(choke)
-	wait(choke)
-
-	p.Publish(topic, 0, false, "p0s1 payload 3")
-	wait(choke)
-
-	p.Disconnect(250)
-	s.Disconnect(250)
-
-	chkcond(isemptydir(store + "/p"))
-	chkcond(isemptydir(store + "/s"))
-}
-
-// Pub 0, Sub 2
-
-func Test_p0s2(t *testing.T) {
-	store := "/tmp/fvt/p0s2"
-	topic := "/test/p0s2"
-	choke := make(chan bool)
-
-	pops := NewClientOptions()
-	pops.AddBroker(FVTTCP)
-	pops.SetClientID("p0s2-pub")
-	pops.SetStore(NewFileStore(store + "/p"))
-	p := NewClient(pops)
-
-	sops := NewClientOptions()
-	sops.AddBroker(FVTTCP)
-	sops.SetClientID("p0s2-sub")
-	sops.SetStore(NewFileStore(store + "/s"))
-	var f MessageHandler = func(client *Client, msg Message) {
-		fmt.Printf("TOPIC: %s\n", msg.Topic())
-		fmt.Printf("MSG: %s\n", msg.Payload())
-		choke <- true
-	}
-	sops.SetDefaultPublishHandler(f)
-
-	s := NewClient(sops)
-	sToken := s.Connect()
-	if sToken.Wait() && sToken.Error() != nil {
-		t.Fatalf("Error on Client.Connect(): %v", sToken.Error())
-	}
-
-	sToken = s.Subscribe(topic, 2, nil)
-	if sToken.Wait() && sToken.Error() != nil {
-		t.Fatalf("Error on Client.Subscribe(): %v", sToken.Error())
-	}
-
-	pToken := p.Connect()
-	if pToken.Wait() && pToken.Error() != nil {
-		t.Fatalf("Error on Client.Connect(): %v", pToken.Error())
-	}
-	p.Publish(topic, 0, false, "p0s2 payload 1")
-	p.Publish(topic, 0, false, "p0s2 payload 2")
-
-	wait(choke)
-	wait(choke)
-
-	p.Publish(topic, 0, false, "p0s2 payload 3")
-
-	wait(choke)
-
-	p.Disconnect(250)
-	s.Disconnect(250)
-
-	chkcond(isemptydir(store + "/p"))
-	chkcond(isemptydir(store + "/s"))
-}
-
-// Pub 1, Sub 0
-
-func Test_p1s0(t *testing.T) {
-	store := "/tmp/fvt/p1s0"
-	topic := "/test/p1s0"
-	choke := make(chan bool)
-
-	pops := NewClientOptions()
-	pops.AddBroker(FVTTCP)
-	pops.SetClientID("p1s0-pub")
-	pops.SetStore(NewFileStore(store + "/p"))
-	p := NewClient(pops)
-
-	sops := NewClientOptions()
-	sops.AddBroker(FVTTCP)
-	sops.SetClientID("p1s0-sub")
-	sops.SetStore(NewFileStore(store + "/s"))
-	var f MessageHandler = func(client *Client, msg Message) {
-		fmt.Printf("TOPIC: %s\n", msg.Topic())
-		fmt.Printf("MSG: %s\n", msg.Payload())
-		choke <- true
-	}
-	sops.SetDefaultPublishHandler(f)
-
-	s := NewClient(sops)
-	sToken := s.Connect()
-	if sToken.Wait() && sToken.Error() != nil {
-		t.Fatalf("Error on Client.Connect(): %v", sToken.Error())
-	}
-
-	sToken = s.Subscribe(topic, 0, nil)
-	if sToken.Wait() && sToken.Error() != nil {
-		t.Fatalf("Error on Client.Subscribe(): %v", sToken.Error())
-	}
-
-	pToken := p.Connect()
-	if pToken.Wait() && pToken.Error() != nil {
-		t.Fatalf("Error on Client.Connect(): %v", pToken.Error())
-	}
-	p.Publish(topic, 1, false, "p1s0 payload 1")
-	p.Publish(topic, 1, false, "p1s0 payload 2")
-
-	wait(choke)
-	wait(choke)
-
-	p.Publish(topic, 1, false, "p1s0 payload 3")
-
-	wait(choke)
-
-	p.Disconnect(250)
-	s.Disconnect(250)
-
-	chkcond(isemptydir(store + "/p"))
-	chkcond(isemptydir(store + "/s"))
-}
-
-// Pub 1, Sub 1
-
-func Test_p1s1(t *testing.T) {
-	store := "/tmp/fvt/p1s1"
-	topic := "/test/p1s1"
-	choke := make(chan bool)
-
-	pops := NewClientOptions()
-	pops.AddBroker(FVTTCP)
-	pops.SetClientID("p1s1-pub")
-	pops.SetStore(NewFileStore(store + "/p"))
-	p := NewClient(pops)
-
-	sops := NewClientOptions()
-	sops.AddBroker(FVTTCP)
-	sops.SetClientID("p1s1-sub")
-	sops.SetStore(NewFileStore(store + "/s"))
-	var f MessageHandler = func(client *Client, msg Message) {
-		fmt.Printf("TOPIC: %s\n", msg.Topic())
-		fmt.Printf("MSG: %s\n", msg.Payload())
-		choke <- true
-	}
-	sops.SetDefaultPublishHandler(f)
-
-	s := NewClient(sops)
-	sToken := s.Connect()
-	if sToken.Wait() && sToken.Error() != nil {
-		t.Fatalf("Error on Client.Connect(): %v", sToken.Error())
-	}
-
-	sToken = s.Subscribe(topic, 1, nil)
-	if sToken.Wait() && sToken.Error() != nil {
-		t.Fatalf("Error on Client.Subscribe(): %v", sToken.Error())
-	}
-
-	pToken := p.Connect()
-	if pToken.Wait() && pToken.Error() != nil {
-		t.Fatalf("Error on Client.Connect(): %v", pToken.Error())
-	}
-	p.Publish(topic, 1, false, "p1s1 payload 1")
-	p.Publish(topic, 1, false, "p1s1 payload 2")
-
-	wait(choke)
-	wait(choke)
-
-	p.Publish(topic, 1, false, "p1s1 payload 3")
-	wait(choke)
-
-	p.Disconnect(250)
-	s.Disconnect(250)
-
-	chkcond(isemptydir(store + "/p"))
-	chkcond(isemptydir(store + "/s"))
-}
-
-// Pub 1, Sub 2
-
-func Test_p1s2(t *testing.T) {
-	store := "/tmp/fvt/p1s2"
-	topic := "/test/p1s2"
-	choke := make(chan bool)
-
-	pops := NewClientOptions()
-	pops.AddBroker(FVTTCP)
-	pops.SetClientID("p1s2-pub")
-	pops.SetStore(NewFileStore(store + "/p"))
-	p := NewClient(pops)
-
-	sops := NewClientOptions()
-	sops.AddBroker(FVTTCP)
-	sops.SetClientID("p1s2-sub")
-	sops.SetStore(NewFileStore(store + "/s"))
-	var f MessageHandler = func(client *Client, msg Message) {
-		fmt.Printf("TOPIC: %s\n", msg.Topic())
-		fmt.Printf("MSG: %s\n", msg.Payload())
-		choke <- true
-	}
-	sops.SetDefaultPublishHandler(f)
-
-	s := NewClient(sops)
-	sToken := s.Connect()
-	if sToken.Wait() && sToken.Error() != nil {
-		t.Fatalf("Error on Client.Connect(): %v", sToken.Error())
-	}
-
-	sToken = s.Subscribe(topic, 2, nil)
-	if sToken.Wait() && sToken.Error() != nil {
-		t.Fatalf("Error on Client.Subscribe(): %v", sToken.Error())
-	}
-
-	pToken := p.Connect()
-	if pToken.Wait() && pToken.Error() != nil {
-		t.Fatalf("Error on Client.Connect(): %v", pToken.Error())
-	}
-	p.Publish(topic, 1, false, "p1s2 payload 1")
-	p.Publish(topic, 1, false, "p1s2 payload 2")
-
-	wait(choke)
-	wait(choke)
-
-	p.Publish(topic, 1, false, "p1s2 payload 3")
-
-	wait(choke)
-
-	p.Disconnect(250)
-	s.Disconnect(250)
-
-	chkcond(isemptydir(store + "/p"))
-	chkcond(isemptydir(store + "/s"))
-}
-
-// Pub 2, Sub 0
-
-func Test_p2s0(t *testing.T) {
-	store := "/tmp/fvt/p2s0"
-	topic := "/test/p2s0"
-	choke := make(chan bool)
-
-	pops := NewClientOptions()
-	pops.AddBroker(FVTTCP)
-	pops.SetClientID("p2s0-pub")
-	pops.SetStore(NewFileStore(store + "/p"))
-	p := NewClient(pops)
-
-	sops := NewClientOptions()
-	sops.AddBroker(FVTTCP)
-	sops.SetClientID("p2s0-sub")
-	sops.SetStore(NewFileStore(store + "/s"))
-	var f MessageHandler = func(client *Client, msg Message) {
-		fmt.Printf("TOPIC: %s\n", msg.Topic())
-		fmt.Printf("MSG: %s\n", msg.Payload())
-		choke <- true
-	}
-	sops.SetDefaultPublishHandler(f)
-
-	s := NewClient(sops)
-	sToken := s.Connect()
-	if sToken.Wait() && sToken.Error() != nil {
-		t.Fatalf("Error on Client.Connect(): %v", sToken.Error())
-	}
-
-	sToken = s.Subscribe(topic, 0, nil)
-	if sToken.Wait() && sToken.Error() != nil {
-		t.Fatalf("Error on Client.Subscribe(): %v", sToken.Error())
-	}
-
-	pToken := p.Connect()
-	if pToken.Wait() && pToken.Error() != nil {
-		t.Fatalf("Error on Client.Connect(): %v", pToken.Error())
-	}
-	p.Publish(topic, 2, false, "p2s0 payload 1")
-	p.Publish(topic, 2, false, "p2s0 payload 2")
-	wait(choke)
-	wait(choke)
-
-	p.Publish(topic, 2, false, "p2s0 payload 3")
-	wait(choke)
-
-	p.Disconnect(250)
-	s.Disconnect(250)
-
-	chkcond(isemptydir(store + "/p"))
-	chkcond(isemptydir(store + "/s"))
-}
-
-// Pub 2, Sub 1
-
-func Test_p2s1(t *testing.T) {
-	store := "/tmp/fvt/p2s1"
-	topic := "/test/p2s1"
-	choke := make(chan bool)
-
-	pops := NewClientOptions()
-	pops.AddBroker(FVTTCP)
-	pops.SetClientID("p2s1-pub")
-	pops.SetStore(NewFileStore(store + "/p"))
-	p := NewClient(pops)
-
-	sops := NewClientOptions()
-	sops.AddBroker(FVTTCP)
-	sops.SetClientID("p2s1-sub")
-	sops.SetStore(NewFileStore(store + "/s"))
-	var f MessageHandler = func(client *Client, msg Message) {
-		fmt.Printf("TOPIC: %s\n", msg.Topic())
-		fmt.Printf("MSG: %s\n", msg.Payload())
-		choke <- true
-	}
-	sops.SetDefaultPublishHandler(f)
-
-	s := NewClient(sops)
-	sToken := s.Connect()
-	if sToken.Wait() && sToken.Error() != nil {
-		t.Fatalf("Error on Client.Connect(): %v", sToken.Error())
-	}
-
-	sToken = s.Subscribe(topic, 1, nil)
-	if sToken.Wait() && sToken.Error() != nil {
-		t.Fatalf("Error on Client.Subscribe(): %v", sToken.Error())
-	}
-
-	pToken := p.Connect()
-	if pToken.Wait() && pToken.Error() != nil {
-		t.Fatalf("Error on Client.Connect(): %v", pToken.Error())
-	}
-	p.Publish(topic, 2, false, "p2s1 payload 1")
-	p.Publish(topic, 2, false, "p2s1 payload 2")
-
-	wait(choke)
-	wait(choke)
-
-	p.Publish(topic, 2, false, "p2s1 payload 3")
-
-	wait(choke)
-
-	p.Disconnect(250)
-	s.Disconnect(250)
-
-	chkcond(isemptydir(store + "/p"))
-	chkcond(isemptydir(store + "/s"))
-}
-
-// Pub 2, Sub 2
-
-func Test_p2s2(t *testing.T) {
-	store := "/tmp/fvt/p2s2"
-	topic := "/test/p2s2"
-	choke := make(chan bool)
-
-	pops := NewClientOptions()
-	pops.AddBroker(FVTTCP)
-	pops.SetClientID("p2s2-pub")
-	pops.SetStore(NewFileStore(store + "/p"))
-	p := NewClient(pops)
-
-	sops := NewClientOptions()
-	sops.AddBroker(FVTTCP)
-	sops.SetClientID("p2s2-sub")
-	sops.SetStore(NewFileStore(store + "/s"))
-	var f MessageHandler = func(client *Client, msg Message) {
-		fmt.Printf("TOPIC: %s\n", msg.Topic())
-		fmt.Printf("MSG: %s\n", msg.Payload())
-		choke <- true
-	}
-	sops.SetDefaultPublishHandler(f)
-
-	s := NewClient(sops)
-	sToken := s.Connect()
-	if sToken.Wait() && sToken.Error() != nil {
-		t.Fatalf("Error on Client.Connect(): %v", sToken.Error())
-	}
-
-	sToken = s.Subscribe(topic, 2, nil)
-	if sToken.Wait() && sToken.Error() != nil {
-		t.Fatalf("Error on Client.Subscribe(): %v", sToken.Error())
-	}
-
-	pToken := p.Connect()
-	if pToken.Wait() && pToken.Error() != nil {
-		t.Fatalf("Error on Client.Connect(): %v", pToken.Error())
-	}
-	p.Publish(topic, 2, false, "p2s2 payload 1")
-	p.Publish(topic, 2, false, "p2s2 payload 2")
-
-	wait(choke)
-	wait(choke)
-
-	p.Publish(topic, 2, false, "p2s2 payload 3")
-
-	wait(choke)
-
-	p.Disconnect(250)
-	s.Disconnect(250)
-
-	chkcond(isemptydir(store + "/p"))
-	chkcond(isemptydir(store + "/s"))
-}
-
-func Test_PublishMessage(t *testing.T) {
-	store := "/tmp/fvt/PublishMessage"
-	topic := "/test/pubmsg"
-	choke := make(chan bool)
-
-	pops := NewClientOptions()
-	pops.AddBroker(FVTTCP)
-	pops.SetClientID("pubmsg-pub")
-	pops.SetStore(NewFileStore(store + "/p"))
-	p := NewClient(pops)
-
-	sops := NewClientOptions()
-	sops.AddBroker(FVTTCP)
-	sops.SetClientID("pubmsg-sub")
-	sops.SetStore(NewFileStore(store + "/s"))
-	var f MessageHandler = func(client *Client, msg Message) {
-		fmt.Printf("TOPIC: %s\n", msg.Topic())
-		fmt.Printf("MSG: %s\n", msg.Payload())
-		if string(msg.Payload()) != "pubmsg payload" {
-			fmt.Println("Message payload incorrect", msg.Payload(), len("pubmsg payload"))
-			t.Fatalf("Message payload incorrect")
-		}
-		choke <- true
-	}
-	sops.SetDefaultPublishHandler(f)
-
-	s := NewClient(sops)
-	sToken := s.Connect()
-	if sToken.Wait() && sToken.Error() != nil {
-		t.Fatalf("Error on Client.Connect(): %v", sToken.Error())
-	}
-
-	sToken = s.Subscribe(topic, 2, nil)
-	if sToken.Wait() && sToken.Error() != nil {
-		t.Fatalf("Error on Client.Subscribe(): %v", sToken.Error())
-	}
-
-	pToken := p.Connect()
-	if pToken.Wait() && pToken.Error() != nil {
-		t.Fatalf("Error on Client.Connect(): %v", pToken.Error())
-	}
-
-	text := "pubmsg payload"
-	p.Publish(topic, 0, false, text)
-	p.Publish(topic, 0, false, text)
-	wait(choke)
-	wait(choke)
-
-	p.Publish(topic, 0, false, text)
-	wait(choke)
-
-	p.Disconnect(250)
-	s.Disconnect(250)
-
-	chkcond(isemptydir(store + "/p"))
-	chkcond(isemptydir(store + "/s"))
-}
-
-func Test_PublishEmptyMessage(t *testing.T) {
-	store := "/tmp/fvt/PublishEmptyMessage"
-	topic := "/test/pubmsgempty"
-	choke := make(chan bool)
-
-	pops := NewClientOptions()
-	pops.AddBroker(FVTTCP)
-	pops.SetClientID("pubmsgempty-pub")
-	pops.SetStore(NewFileStore(store + "/p"))
-	p := NewClient(pops)
-
-	sops := NewClientOptions()
-	sops.AddBroker(FVTTCP)
-	sops.SetClientID("pubmsgempty-sub")
-	sops.SetStore(NewFileStore(store + "/s"))
-	var f MessageHandler = func(client *Client, msg Message) {
-		fmt.Printf("TOPIC: %s\n", msg.Topic())
-		fmt.Printf("MSG: %s\n", msg.Payload())
-		if string(msg.Payload()) != "" {
-			t.Fatalf("Message payload incorrect")
-		}
-		choke <- true
-	}
-	sops.SetDefaultPublishHandler(f)
-
-	s := NewClient(sops)
-	sToken := s.Connect()
-	if sToken.Wait() && sToken.Error() != nil {
-		t.Fatalf("Error on Client.Connect(): %v", sToken.Error())
-	}
-
-	sToken = s.Subscribe(topic, 2, nil)
-	if sToken.Wait() && sToken.Error() != nil {
-		t.Fatalf("Error on Client.Subscribe(): %v", sToken.Error())
-	}
-
-	pToken := p.Connect()
-	if pToken.Wait() && pToken.Error() != nil {
-		t.Fatalf("Error on Client.Connect(): %v", pToken.Error())
-	}
-
-	p.Publish(topic, 0, false, "")
-	p.Publish(topic, 0, false, "")
-	wait(choke)
-	wait(choke)
-
-	p.Publish(topic, 0, false, "")
-	wait(choke)
-
-	p.Disconnect(250)
-}
-
-// func Test_Cleanstore(t *testing.T) {
-// 	store := "/tmp/fvt/cleanstore"
-// 	topic := "/test/cleanstore"
-
-// 	pops := NewClientOptions()
-// 	pops.AddBroker(FVTTCP)
-// 	pops.SetClientID("cleanstore-pub")
-// 	pops.SetStore(NewFileStore(store + "/p"))
-// 	p := NewClient(pops)
-
-// 	var s *Client
-// 	sops := NewClientOptions()
-// 	sops.AddBroker(FVTTCP)
-// 	sops.SetClientID("cleanstore-sub")
-// 	sops.SetCleanSession(false)
-// 	sops.SetStore(NewFileStore(store + "/s"))
-// 	var f MessageHandler = func(client *Client, msg Message) {
-// 		fmt.Printf("TOPIC: %s\n", msg.Topic())
-// 		fmt.Printf("MSG: %s\n", msg.Payload())
-// 		// Close the connection after receiving
-// 		// the first message so that hopefully
-// 		// there is something in the store to be
-// 		// cleaned.
-// 		s.ForceDisconnect()
-// 	}
-// 	sops.SetDefaultPublishHandler(f)
-
-// 	s = NewClient(sops)
-// 	sToken := s.Connect()
-// 	if sToken.Wait() && sToken.Error() != nil {
-// 		t.Fatalf("Error on Client.Connect(): %v", sToken.Error())
-// 	}
-
-// 	sToken = s.Subscribe(topic, 2, nil)
-// 	if sToken.Wait() && sToken.Error() != nil {
-// 		t.Fatalf("Error on Client.Subscribe(): %v", sToken.Error())
-// 	}
-
-// 	pToken := p.Connect()
-// 	if pToken.Wait() && pToken.Error() != nil {
-// 		t.Fatalf("Error on Client.Connect(): %v", pToken.Error())
-// 	}
-
-// 	text := "test message"
-// 	p.Publish(topic, 0, false, text)
-// 	p.Publish(topic, 0, false, text)
-// 	p.Publish(topic, 0, false, text)
-
-// 	p.Disconnect(250)
-
-// 	s2ops := NewClientOptions()
-// 	s2ops.AddBroker(FVTTCP)
-// 	s2ops.SetClientID("cleanstore-sub")
-// 	s2ops.SetCleanSession(true)
-// 	s2ops.SetStore(NewFileStore(store + "/s"))
-// 	s2ops.SetDefaultPublishHandler(f)
-
-// 	s2 := NewClient(s2ops)
-// 	sToken = s2.Connect()
-// 	if sToken.Wait() && sToken.Error() != nil {
-// 		t.Fatalf("Error on Client.Connect(): %v", sToken.Error())
-// 	}
-
-// 	// at this point existing state should be cleared...
-// 	// how to check?
-// }
-
-func Test_MultipleURLs(t *testing.T) {
-	ops := NewClientOptions()
-	ops.AddBroker("tcp://127.0.0.1:10000")
-	ops.AddBroker(FVTTCP)
-	ops.SetClientID("MutliURL")
-	ops.SetStore(NewFileStore("/tmp/fvt/MultiURL"))
-
-	c := NewClient(ops)
-	token := c.Connect()
-	if token.Wait() && token.Error() != nil {
-		t.Fatalf("Error on Client.Connect(): %v", token.Error())
-	}
-
-	token = c.Publish("/test/MultiURL", 0, false, "Publish qo0")
-	token.Wait()
-
-	c.Disconnect(250)
-}
-
-/*
-// A test to make sure ping mechanism is working
-// This test can be left commented out because it's annoying to wait for
-func Test_ping3_idle10(t *testing.T) {
-	ops := NewClientOptions()
-	ops.AddBroker(FVTTCP)
-	//ops.AddBroker("tcp://test.mosquitto.org:1883")
-	ops.SetClientID("p3i10")
-	ops.SetKeepAlive(4)
-
-	c := NewClient(ops)
-	token := c.Connect()
-	if token.Wait() && token.Error() != nil {
-		t.Fatalf("Error on Client.Connect(): %v", token.Error())
-	}
-	time.Sleep(time.Duration(10) * time.Second)
-	c.Disconnect(250)
-}
-*/
diff --git a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/fvt_store_test.go b/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/fvt_store_test.go
deleted file mode 100644
index d74490b54..000000000
--- a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/fvt_store_test.go
+++ /dev/null
@@ -1,496 +0,0 @@
-/*
- * Copyright (c) 2013 IBM Corp.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Seth Hoenig
- *    Allan Stockdill-Mander
- *    Mike Robertson
- */
-
-package mqtt
-
-import (
-	"bytes"
-	"fmt"
-	"git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/packets"
-	"testing"
-)
-
-/*******************************
- **** Some helper functions ****
- *******************************/
-
-func b2s(bs []byte) string {
-	s := ""
-	for _, b := range bs {
-		s += fmt.Sprintf("%x ", b)
-	}
-	return s
-}
-
-/**********************************************
- **** A mock store implementation for test ****
- **********************************************/
-
-type TestStore struct {
-	mput []uint16
-	mget []uint16
-	mdel []uint16
-}
-
-func (ts *TestStore) Open() {
-}
-
-func (ts *TestStore) Close() {
-}
-
-func (ts *TestStore) Put(key string, m packets.ControlPacket) {
-	ts.mput = append(ts.mput, m.Details().MessageID)
-}
-
-func (ts *TestStore) Get(key string) packets.ControlPacket {
-	mid := mIDFromKey(key)
-	ts.mget = append(ts.mget, mid)
-	return nil
-}
-
-func (ts *TestStore) All() []string {
-	return nil
-}
-
-func (ts *TestStore) Del(key string) {
-	mid := mIDFromKey(key)
-	ts.mdel = append(ts.mdel, mid)
-}
-
-func (ts *TestStore) Reset() {
-}
-
-/*******************
- **** FileStore ****
- *******************/
-
-func Test_NewFileStore(t *testing.T) {
-	storedir := "/tmp/TestStore/_new"
-	f := NewFileStore(storedir)
-	if f.opened {
-		t.Fatalf("filestore was opened without opening it")
-	}
-	if f.directory != storedir {
-		t.Fatalf("filestore directory is wrong")
-	}
-	// storedir might exist or might not, just like with a real client
-	// the point is, we don't care, we just want it to exist after it is
-	// opened
-}
-
-func Test_FileStore_Open(t *testing.T) {
-	storedir := "/tmp/TestStore/_open"
-
-	f := NewFileStore(storedir)
-	f.Open()
-	if !f.opened {
-		t.Fatalf("filestore was not set open")
-	}
-	if f.directory != storedir {
-		t.Fatalf("filestore directory is wrong")
-	}
-	if !exists(storedir) {
-		t.Fatalf("filestore directory does not exst after opening it")
-	}
-}
-
-func Test_FileStore_Close(t *testing.T) {
-	storedir := "/tmp/TestStore/_unopen"
-	f := NewFileStore(storedir)
-	f.Open()
-	if !f.opened {
-		t.Fatalf("filestore was not set open")
-	}
-	if f.directory != storedir {
-		t.Fatalf("filestore directory is wrong")
-	}
-	if !exists(storedir) {
-		t.Fatalf("filestore directory does not exst after opening it")
-	}
-
-	f.Close()
-	if f.opened {
-		t.Fatalf("filestore was still open after unopen")
-	}
-	if !exists(storedir) {
-		t.Fatalf("filestore was deleted after unopen")
-	}
-}
-
-func Test_FileStore_write(t *testing.T) {
-	storedir := "/tmp/TestStore/_write"
-	f := NewFileStore(storedir)
-	f.Open()
-
-	pm := packets.NewControlPacket(packets.Publish).(*packets.PublishPacket)
-	pm.Qos = 1
-	pm.TopicName = "a/b/c"
-	pm.Payload = []byte{0xBE, 0xEF, 0xED}
-	pm.MessageID = 91
-
-	key := inboundKeyFromMID(pm.MessageID)
-	f.Put(key, pm)
-
-	if !exists(storedir + "/i.91.msg") {
-		t.Fatalf("message not in store")
-	}
-
-}
-
-func Test_FileStore_Get(t *testing.T) {
-	storedir := "/tmp/TestStore/_get"
-	f := NewFileStore(storedir)
-	f.Open()
-	pm := packets.NewControlPacket(packets.Publish).(*packets.PublishPacket)
-	pm.Qos = 1
-	pm.TopicName = "/a/b/c"
-	pm.Payload = []byte{0xBE, 0xEF, 0xED}
-	pm.MessageID = 120
-
-	key := outboundKeyFromMID(pm.MessageID)
-	f.Put(key, pm)
-
-	if !exists(storedir + "/o.120.msg") {
-		t.Fatalf("message not in store")
-	}
-
-	exp := []byte{
-		/* msg type */
-		0x32, // qos 1
-
-		/* remlen */
-		0x0d,
-
-		/* topic, msg id in varheader */
-		0x00, // length of topic
-		0x06,
-		0x2F, // /
-		0x61, // a
-		0x2F, // /
-		0x62, // b
-		0x2F, // /
-		0x63, // c
-
-		/* msg id (is always 2 bytes) */
-		0x00,
-		0x78,
-
-		/*payload */
-		0xBE,
-		0xEF,
-		0xED,
-	}
-
-	m := f.Get(key)
-
-	if m == nil {
-		t.Fatalf("message not retreived from store")
-	}
-
-	var msg bytes.Buffer
-	m.Write(&msg)
-	if !bytes.Equal(exp, msg.Bytes()) {
-		t.Fatal("message from store not same as what went in", msg.Bytes())
-	}
-}
-
-func Test_FileStore_All(t *testing.T) {
-	storedir := "/tmp/TestStore/_all"
-	f := NewFileStore(storedir)
-	f.Open()
-	pm := packets.NewControlPacket(packets.Publish).(*packets.PublishPacket)
-	pm.Qos = 2
-	pm.TopicName = "/t/r/v"
-	pm.Payload = []byte{0x01, 0x02}
-	pm.MessageID = 121
-
-	key := outboundKeyFromMID(pm.MessageID)
-	f.Put(key, pm)
-
-	keys := f.All()
-	if len(keys) != 1 {
-		t.Fatalf("FileStore.All does not have the messages")
-	}
-
-	if keys[0] != "o.121" {
-		t.Fatalf("FileStore.All has wrong key")
-	}
-}
-
-func Test_FileStore_Del(t *testing.T) {
-	storedir := "/tmp/TestStore/_del"
-	f := NewFileStore(storedir)
-	f.Open()
-
-	pm := packets.NewControlPacket(packets.Publish).(*packets.PublishPacket)
-	pm.Qos = 1
-	pm.TopicName = "a/b/c"
-	pm.Payload = []byte{0xBE, 0xEF, 0xED}
-	pm.MessageID = 17
-
-	key := inboundKeyFromMID(pm.MessageID)
-	f.Put(key, pm)
-
-	if !exists(storedir + "/i.17.msg") {
-		t.Fatalf("message not in store")
-	}
-
-	f.Del(key)
-
-	if exists(storedir + "/i.17.msg") {
-		t.Fatalf("message still exists after deletion")
-	}
-}
-
-func Test_FileStore_Reset(t *testing.T) {
-	storedir := "/tmp/TestStore/_reset"
-	f := NewFileStore(storedir)
-	f.Open()
-
-	pm1 := packets.NewControlPacket(packets.Publish).(*packets.PublishPacket)
-	pm1.Qos = 1
-	pm1.TopicName = "/q/w/e"
-	pm1.Payload = []byte{0xBB}
-	pm1.MessageID = 71
-	key1 := inboundKeyFromMID(pm1.MessageID)
-	f.Put(key1, pm1)
-
-	pm2 := packets.NewControlPacket(packets.Publish).(*packets.PublishPacket)
-	pm2.Qos = 1
-	pm2.TopicName = "/q/w/e"
-	pm2.Payload = []byte{0xBB}
-	pm2.MessageID = 72
-	key2 := inboundKeyFromMID(pm2.MessageID)
-	f.Put(key2, pm2)
-
-	pm3 := packets.NewControlPacket(packets.Publish).(*packets.PublishPacket)
-	pm3.Qos = 1
-	pm3.TopicName = "/q/w/e"
-	pm3.Payload = []byte{0xBB}
-	pm3.MessageID = 73
-	key3 := inboundKeyFromMID(pm3.MessageID)
-	f.Put(key3, pm3)
-
-	pm4 := packets.NewControlPacket(packets.Publish).(*packets.PublishPacket)
-	pm4.Qos = 1
-	pm4.TopicName = "/q/w/e"
-	pm4.Payload = []byte{0xBB}
-	pm4.MessageID = 74
-	key4 := inboundKeyFromMID(pm4.MessageID)
-	f.Put(key4, pm4)
-
-	pm5 := packets.NewControlPacket(packets.Publish).(*packets.PublishPacket)
-	pm5.Qos = 1
-	pm5.TopicName = "/q/w/e"
-	pm5.Payload = []byte{0xBB}
-	pm5.MessageID = 75
-	key5 := inboundKeyFromMID(pm5.MessageID)
-	f.Put(key5, pm5)
-
-	if !exists(storedir + "/i.71.msg") {
-		t.Fatalf("message not in store")
-	}
-
-	if !exists(storedir + "/i.72.msg") {
-		t.Fatalf("message not in store")
-	}
-
-	if !exists(storedir + "/i.73.msg") {
-		t.Fatalf("message not in store")
-	}
-
-	if !exists(storedir + "/i.74.msg") {
-		t.Fatalf("message not in store")
-	}
-
-	if !exists(storedir + "/i.75.msg") {
-		t.Fatalf("message not in store")
-	}
-
-	f.Reset()
-
-	if exists(storedir + "/i.71.msg") {
-		t.Fatalf("message still exists after reset")
-	}
-
-	if exists(storedir + "/i.72.msg") {
-		t.Fatalf("message still exists after reset")
-	}
-
-	if exists(storedir + "/i.73.msg") {
-		t.Fatalf("message still exists after reset")
-	}
-
-	if exists(storedir + "/i.74.msg") {
-		t.Fatalf("message still exists after reset")
-	}
-
-	if exists(storedir + "/i.75.msg") {
-		t.Fatalf("message still exists after reset")
-	}
-}
-
-/*******************
- *** MemoryStore ***
- *******************/
-
-func Test_NewMemoryStore(t *testing.T) {
-	m := NewMemoryStore()
-	if m == nil {
-		t.Fatalf("MemoryStore could not be created")
-	}
-}
-
-func Test_MemoryStore_Open(t *testing.T) {
-	m := NewMemoryStore()
-	m.Open()
-	if !m.opened {
-		t.Fatalf("MemoryStore was not set open")
-	}
-}
-
-func Test_MemoryStore_Close(t *testing.T) {
-	m := NewMemoryStore()
-	m.Open()
-	if !m.opened {
-		t.Fatalf("MemoryStore was not set open")
-	}
-
-	m.Close()
-	if m.opened {
-		t.Fatalf("MemoryStore was still open after unopen")
-	}
-}
-
-func Test_MemoryStore_Reset(t *testing.T) {
-	m := NewMemoryStore()
-	m.Open()
-
-	pm := packets.NewControlPacket(packets.Publish).(*packets.PublishPacket)
-	pm.Qos = 2
-	pm.TopicName = "/f/r/s"
-	pm.Payload = []byte{0xAB}
-	pm.MessageID = 81
-
-	key := outboundKeyFromMID(pm.MessageID)
-	m.Put(key, pm)
-
-	if len(m.messages) != 1 {
-		t.Fatalf("message not in memstore")
-	}
-
-	m.Reset()
-
-	if len(m.messages) != 0 {
-		t.Fatalf("reset did not clear memstore")
-	}
-}
-
-func Test_MemoryStore_write(t *testing.T) {
-	m := NewMemoryStore()
-	m.Open()
-
-	pm := packets.NewControlPacket(packets.Publish).(*packets.PublishPacket)
-	pm.Qos = 1
-	pm.TopicName = "/a/b/c"
-	pm.Payload = []byte{0xBE, 0xEF, 0xED}
-	pm.MessageID = 91
-	key := inboundKeyFromMID(pm.MessageID)
-	m.Put(key, pm)
-
-	if len(m.messages) != 1 {
-		t.Fatalf("message not in store")
-	}
-}
-
-func Test_MemoryStore_Get(t *testing.T) {
-	m := NewMemoryStore()
-	m.Open()
-	pm := packets.NewControlPacket(packets.Publish).(*packets.PublishPacket)
-	pm.Qos = 1
-	pm.TopicName = "/a/b/c"
-	pm.Payload = []byte{0xBE, 0xEF, 0xED}
-	pm.MessageID = 120
-
-	key := outboundKeyFromMID(pm.MessageID)
-	m.Put(key, pm)
-
-	if len(m.messages) != 1 {
-		t.Fatalf("message not in store")
-	}
-
-	exp := []byte{
-		/* msg type */
-		0x32, // qos 1
-
-		/* remlen */
-		0x0d,
-
-		/* topic, msg id in varheader */
-		0x00, // length of topic
-		0x06,
-		0x2F, // /
-		0x61, // a
-		0x2F, // /
-		0x62, // b
-		0x2F, // /
-		0x63, // c
-
-		/* msg id (is always 2 bytes) */
-		0x00,
-		0x78,
-
-		/*payload */
-		0xBE,
-		0xEF,
-		0xED,
-	}
-
-	msg := m.Get(key)
-
-	if msg == nil {
-		t.Fatalf("message not retreived from store")
-	}
-
-	var buf bytes.Buffer
-	msg.Write(&buf)
-	if !bytes.Equal(exp, buf.Bytes()) {
-		t.Fatalf("message from store not same as what went in")
-	}
-}
-
-func Test_MemoryStore_Del(t *testing.T) {
-	m := NewMemoryStore()
-	m.Open()
-
-	pm := packets.NewControlPacket(packets.Publish).(*packets.PublishPacket)
-	pm.Qos = 1
-	pm.TopicName = "/a/b/c"
-	pm.Payload = []byte{0xBE, 0xEF, 0xED}
-	pm.MessageID = 17
-
-	key := outboundKeyFromMID(pm.MessageID)
-
-	m.Put(key, pm)
-
-	if len(m.messages) != 1 {
-		t.Fatalf("message not in store")
-	}
-
-	m.Del(key)
-
-	if len(m.messages) != 1 {
-		t.Fatalf("message still exists after deletion")
-	}
-}
diff --git a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/fvt_test.go b/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/fvt_test.go
deleted file mode 100644
index 6afd9be08..000000000
--- a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/fvt_test.go
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2013 IBM Corp.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Seth Hoenig
- *    Allan Stockdill-Mander
- *    Mike Robertson
- */
-
-package mqtt
-
-// Use setup_IMA.sh for IBM's MessageSight
-// Use fvt/rsmb.cfg for IBM's Really Small Message Broker
-// Use fvt/mosquitto.cfg for the open source Mosquitto project
-
-// Set these values to the URI of your MQTT Broker before running go-test
-const (
-	FVTAddr = "iot.eclipse.org"
-	FVTTCP  = "tcp://" + FVTAddr + ":1883"
-	FVTSSL  = "ssl://" + FVTAddr + ":8883"
-)
diff --git a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/memstore.go b/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/memstore.go
deleted file mode 100644
index 690a2cca5..000000000
--- a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/memstore.go
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * Copyright (c) 2013 IBM Corp.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Seth Hoenig
- *    Allan Stockdill-Mander
- *    Mike Robertson
- */
-
-package mqtt
-
-import (
-	"git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/packets"
-	"sync"
-)
-
-// MemoryStore implements the store interface to provide a "persistence"
-// mechanism wholly stored in memory. This is only useful for
-// as long as the client instance exists.
-type MemoryStore struct {
-	sync.RWMutex
-	messages map[string]packets.ControlPacket
-	opened   bool
-}
-
-// NewMemoryStore returns a pointer to a new instance of
-// MemoryStore, the instance is not initialized and ready to
-// use until Open() has been called on it.
-func NewMemoryStore() *MemoryStore {
-	store := &MemoryStore{
-		messages: make(map[string]packets.ControlPacket),
-		opened:   false,
-	}
-	return store
-}
-
-// Open initializes a MemoryStore instance.
-func (store *MemoryStore) Open() {
-	store.Lock()
-	defer store.Unlock()
-	store.opened = true
-	DEBUG.Println(STR, "memorystore initialized")
-}
-
-// Put takes a key and a pointer to a Message and stores the
-// message.
-func (store *MemoryStore) Put(key string, message packets.ControlPacket) {
-	store.Lock()
-	defer store.Unlock()
-	chkcond(store.opened)
-	store.messages[key] = message
-}
-
-// Get takes a key and looks in the store for a matching Message
-// returning either the Message pointer or nil.
-func (store *MemoryStore) Get(key string) packets.ControlPacket {
-	store.RLock()
-	defer store.RUnlock()
-	chkcond(store.opened)
-	mid := mIDFromKey(key)
-	m := store.messages[key]
-	if m == nil {
-		CRITICAL.Println(STR, "memorystore get: message", mid, "not found")
-	} else {
-		DEBUG.Println(STR, "memorystore get: message", mid, "found")
-	}
-	return m
-}
-
-// All returns a slice of strings containing all the keys currently
-// in the MemoryStore.
-func (store *MemoryStore) All() []string {
-	store.RLock()
-	defer store.RUnlock()
-	chkcond(store.opened)
-	keys := []string{}
-	for k := range store.messages {
-		keys = append(keys, k)
-	}
-	return keys
-}
-
-// Del takes a key, searches the MemoryStore and if the key is found
-// deletes the Message pointer associated with it.
-func (store *MemoryStore) Del(key string) {
-	store.Lock()
-	defer store.Unlock()
-	mid := mIDFromKey(key)
-	m := store.messages[key]
-	if m == nil {
-		WARN.Println(STR, "memorystore del: message", mid, "not found")
-	} else {
-		store.messages[key] = nil
-		DEBUG.Println(STR, "memorystore del: message", mid, "was deleted")
-	}
-}
-
-// Close will disallow modifications to the state of the store.
-func (store *MemoryStore) Close() {
-	store.Lock()
-	defer store.Unlock()
-	chkcond(store.opened)
-	store.opened = false
-	DEBUG.Println(STR, "memorystore closed")
-}
-
-// Reset eliminates all persisted message data in the store.
-func (store *MemoryStore) Reset() {
-	store.Lock()
-	defer store.Unlock()
-	chkcond(store.opened)
-	store.messages = make(map[string]packets.ControlPacket)
-	WARN.Println(STR, "memorystore wiped")
-}
diff --git a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/message.go b/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/message.go
deleted file mode 100644
index 0f53a1701..000000000
--- a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/message.go
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Copyright (c) 2013 IBM Corp.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Seth Hoenig
- *    Allan Stockdill-Mander
- *    Mike Robertson
- */
-
-package mqtt
-
-import (
-	"git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/packets"
-)
-
-// Message defines the externals that a message implementation must support
-// these are received messages that are passed to the callbacks, not internal
-// messages
-type Message interface {
-	Duplicate() bool
-	Qos() byte
-	Retained() bool
-	Topic() string
-	MessageID() uint16
-	Payload() []byte
-}
-
-type message struct {
-	duplicate bool
-	qos       byte
-	retained  bool
-	topic     string
-	messageID uint16
-	payload   []byte
-}
-
-func (m *message) Duplicate() bool {
-	return m.duplicate
-}
-
-func (m *message) Qos() byte {
-	return m.qos
-}
-
-func (m *message) Retained() bool {
-	return m.retained
-}
-
-func (m *message) Topic() string {
-	return m.topic
-}
-
-func (m *message) MessageID() uint16 {
-	return m.messageID
-}
-
-func (m *message) Payload() []byte {
-	return m.payload
-}
-
-func messageFromPublish(p *packets.PublishPacket) Message {
-	return &message{
-		duplicate: p.Dup,
-		qos:       p.Qos,
-		retained:  p.Retain,
-		topic:     p.TopicName,
-		messageID: p.MessageID,
-		payload:   p.Payload,
-	}
-}
-
-func newConnectMsgFromOptions(options *ClientOptions) *packets.ConnectPacket {
-	m := packets.NewControlPacket(packets.Connect).(*packets.ConnectPacket)
-
-	m.CleanSession = options.CleanSession
-	m.WillFlag = options.WillEnabled
-	m.WillRetain = options.WillRetained
-	m.ClientIdentifier = options.ClientID
-
-	if options.WillEnabled {
-		m.WillQos = options.WillQos
-		m.WillTopic = options.WillTopic
-		m.WillMessage = options.WillPayload
-	}
-
-	if options.Username != "" {
-		m.UsernameFlag = true
-		m.Username = options.Username
-		//mustn't have password without user as well
-		if options.Password != "" {
-			m.PasswordFlag = true
-			m.Password = []byte(options.Password)
-		}
-	}
-
-	m.KeepaliveTimer = uint16(options.KeepAlive)
-
-	return m
-}
diff --git a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/messageids.go b/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/messageids.go
deleted file mode 100644
index a6fc3ae4b..000000000
--- a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/messageids.go
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (c) 2013 IBM Corp.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Seth Hoenig
- *    Allan Stockdill-Mander
- *    Mike Robertson
- */
-
-package mqtt
-
-import (
-	"sync"
-)
-
-// MId is 16 bit message id as specified by the MQTT spec.
-// In general, these values should not be depended upon by
-// the client application.
-type MId uint16
-
-type messageIds struct {
-	sync.RWMutex
-	index map[uint16]Token
-}
-
-const (
-	midMin uint16 = 1
-	midMax uint16 = 65535
-)
-
-func (mids *messageIds) freeID(id uint16) {
-	mids.Lock()
-	defer mids.Unlock()
-	delete(mids.index, id)
-}
-
-func (mids *messageIds) getID(t Token) uint16 {
-	mids.Lock()
-	defer mids.Unlock()
-	for i := midMin; i < midMax; i++ {
-		if _, ok := mids.index[i]; !ok {
-			mids.index[i] = t
-			return i
-		}
-	}
-	return 0
-}
-
-func (mids *messageIds) getToken(id uint16) Token {
-	mids.RLock()
-	defer mids.RUnlock()
-	if token, ok := mids.index[id]; ok {
-		return token
-	}
-	return nil
-}
diff --git a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/net.go b/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/net.go
deleted file mode 100644
index daee86820..000000000
--- a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/net.go
+++ /dev/null
@@ -1,275 +0,0 @@
-/*
- * Copyright (c) 2013 IBM Corp.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Seth Hoenig
- *    Allan Stockdill-Mander
- *    Mike Robertson
- */
-
-package mqtt
-
-import (
-	"crypto/tls"
-	"errors"
-	"git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/packets"
-	"golang.org/x/net/websocket"
-	"net"
-	"net/url"
-	"reflect"
-	"time"
-)
-
-func openConnection(uri *url.URL, tlsc *tls.Config, timeout time.Duration) (net.Conn, error) {
-	switch uri.Scheme {
-	case "ws":
-		conn, err := websocket.Dial(uri.String(), "mqtt", "ws://localhost")
-		if err != nil {
-			return nil, err
-		}
-		conn.PayloadType = websocket.BinaryFrame
-		return conn, err
-	case "wss":
-		config, _ := websocket.NewConfig(uri.String(), "ws://localhost")
-		config.Protocol = []string{"mqtt"}
-		config.TlsConfig = tlsc
-		conn, err := websocket.DialConfig(config)
-		if err != nil {
-			return nil, err
-		}
-		conn.PayloadType = websocket.BinaryFrame
-		return conn, err
-	case "tcp":
-		conn, err := net.DialTimeout("tcp", uri.Host, timeout)
-		if err != nil {
-			return nil, err
-		}
-		return conn, nil
-	case "ssl":
-		fallthrough
-	case "tls":
-		fallthrough
-	case "tcps":
-		conn, err := tls.DialWithDialer(&net.Dialer{Timeout: timeout}, "tcp", uri.Host, tlsc)
-		if err != nil {
-			return nil, err
-		}
-		return conn, nil
-	}
-	return nil, errors.New("Unknown protocol")
-}
-
-// actually read incoming messages off the wire
-// send Message object into ibound channel
-func incoming(c *Client) {
-	defer c.workers.Done()
-	var err error
-	var cp packets.ControlPacket
-
-	DEBUG.Println(NET, "incoming started")
-
-	for {
-		if cp, err = packets.ReadPacket(c.conn); err != nil {
-			break
-		}
-		DEBUG.Println(NET, "Received Message")
-		c.ibound <- cp
-	}
-	// We received an error on read.
-	// If disconnect is in progress, swallow error and return
-	select {
-	case <-c.stop:
-		DEBUG.Println(NET, "incoming stopped")
-		return
-		// Not trying to disconnect, send the error to the errors channel
-	default:
-		ERROR.Println(NET, "incoming stopped with error")
-		c.errors <- err
-		return
-	}
-}
-
-// receive a Message object on obound, and then
-// actually send outgoing message to the wire
-func outgoing(c *Client) {
-	defer c.workers.Done()
-	DEBUG.Println(NET, "outgoing started")
-
-	for {
-		DEBUG.Println(NET, "outgoing waiting for an outbound message")
-		select {
-		case <-c.stop:
-			DEBUG.Println(NET, "outgoing stopped")
-			return
-		case pub := <-c.obound:
-			msg := pub.p.(*packets.PublishPacket)
-			if msg.Qos != 0 && msg.MessageID == 0 {
-				msg.MessageID = c.getID(pub.t)
-				pub.t.(*PublishToken).messageID = msg.MessageID
-			}
-			//persist_obound(c.persist, msg)
-
-			if c.options.WriteTimeout > 0 {
-				c.conn.SetWriteDeadline(time.Now().Add(c.options.WriteTimeout))
-			}
-
-			if err := msg.Write(c.conn); err != nil {
-				ERROR.Println(NET, "outgoing stopped with error")
-				c.errors <- err
-				return
-			}
-
-			if c.options.WriteTimeout > 0 {
-				// If we successfully wrote, we don't want the timeout to happen during an idle period
-				// so we reset it to infinite.
-				c.conn.SetWriteDeadline(time.Time{})
-			}
-
-			if msg.Qos == 0 {
-				pub.t.flowComplete()
-			}
-
-			c.lastContact.update()
-			DEBUG.Println(NET, "obound wrote msg, id:", msg.MessageID)
-		case msg := <-c.oboundP:
-			switch msg.p.(type) {
-			case *packets.SubscribePacket:
-				msg.p.(*packets.SubscribePacket).MessageID = c.getID(msg.t)
-			case *packets.UnsubscribePacket:
-				msg.p.(*packets.UnsubscribePacket).MessageID = c.getID(msg.t)
-			}
-			DEBUG.Println(NET, "obound priority msg to write, type", reflect.TypeOf(msg.p))
-			if err := msg.p.Write(c.conn); err != nil {
-				ERROR.Println(NET, "outgoing stopped with error")
-				c.errors <- err
-				return
-			}
-			c.lastContact.update()
-			switch msg.p.(type) {
-			case *packets.DisconnectPacket:
-				msg.t.(*DisconnectToken).flowComplete()
-				DEBUG.Println(NET, "outbound wrote disconnect, stopping")
-				return
-			}
-		}
-	}
-}
-
-// receive Message objects on ibound
-// store messages if necessary
-// send replies on obound
-// delete messages from store if necessary
-func alllogic(c *Client) {
-
-	DEBUG.Println(NET, "logic started")
-
-	for {
-		DEBUG.Println(NET, "logic waiting for msg on ibound")
-
-		select {
-		case msg := <-c.ibound:
-			DEBUG.Println(NET, "logic got msg on ibound")
-			//persist_ibound(c.persist, msg)
-			switch msg.(type) {
-			case *packets.PingrespPacket:
-				DEBUG.Println(NET, "received pingresp")
-				c.pingOutstanding = false
-			case *packets.SubackPacket:
-				sa := msg.(*packets.SubackPacket)
-				DEBUG.Println(NET, "received suback, id:", sa.MessageID)
-				token := c.getToken(sa.MessageID).(*SubscribeToken)
-				DEBUG.Println(NET, "granted qoss", sa.GrantedQoss)
-				for i, qos := range sa.GrantedQoss {
-					token.subResult[token.subs[i]] = qos
-				}
-				token.flowComplete()
-				go c.freeID(sa.MessageID)
-			case *packets.UnsubackPacket:
-				ua := msg.(*packets.UnsubackPacket)
-				DEBUG.Println(NET, "received unsuback, id:", ua.MessageID)
-				token := c.getToken(ua.MessageID).(*UnsubscribeToken)
-				token.flowComplete()
-				go c.freeID(ua.MessageID)
-			case *packets.PublishPacket:
-				pp := msg.(*packets.PublishPacket)
-				DEBUG.Println(NET, "received publish, msgId:", pp.MessageID)
-				DEBUG.Println(NET, "putting msg on onPubChan")
-				switch pp.Qos {
-				case 2:
-					c.incomingPubChan <- pp
-					DEBUG.Println(NET, "done putting msg on incomingPubChan")
-					pr := packets.NewControlPacket(packets.Pubrec).(*packets.PubrecPacket)
-					pr.MessageID = pp.MessageID
-					DEBUG.Println(NET, "putting pubrec msg on obound")
-					c.oboundP <- &PacketAndToken{p: pr, t: nil}
-					DEBUG.Println(NET, "done putting pubrec msg on obound")
-				case 1:
-					c.incomingPubChan <- pp
-					DEBUG.Println(NET, "done putting msg on incomingPubChan")
-					pa := packets.NewControlPacket(packets.Puback).(*packets.PubackPacket)
-					pa.MessageID = pp.MessageID
-					DEBUG.Println(NET, "putting puback msg on obound")
-					c.oboundP <- &PacketAndToken{p: pa, t: nil}
-					DEBUG.Println(NET, "done putting puback msg on obound")
-				case 0:
-					select {
-					case c.incomingPubChan <- pp:
-						DEBUG.Println(NET, "done putting msg on incomingPubChan")
-					case err, ok := <-c.errors:
-						DEBUG.Println(NET, "error while putting msg on pubChanZero")
-						// We are unblocked, but need to put the error back on so the outer
-						// select can handle it appropriately.
-						if ok {
-							go func(errVal error, errChan chan error) {
-								errChan <- errVal
-							}(err, c.errors)
-						}
-					}
-				}
-			case *packets.PubackPacket:
-				pa := msg.(*packets.PubackPacket)
-				DEBUG.Println(NET, "received puback, id:", pa.MessageID)
-				// c.receipts.get(msg.MsgId()) <- Receipt{}
-				// c.receipts.end(msg.MsgId())
-				c.getToken(pa.MessageID).flowComplete()
-				c.freeID(pa.MessageID)
-			case *packets.PubrecPacket:
-				prec := msg.(*packets.PubrecPacket)
-				DEBUG.Println(NET, "received pubrec, id:", prec.MessageID)
-				prel := packets.NewControlPacket(packets.Pubrel).(*packets.PubrelPacket)
-				prel.MessageID = prec.MessageID
-				select {
-				case c.oboundP <- &PacketAndToken{p: prel, t: nil}:
-				case <-time.After(time.Second):
-				}
-			case *packets.PubrelPacket:
-				pr := msg.(*packets.PubrelPacket)
-				DEBUG.Println(NET, "received pubrel, id:", pr.MessageID)
-				pc := packets.NewControlPacket(packets.Pubcomp).(*packets.PubcompPacket)
-				pc.MessageID = pr.MessageID
-				select {
-				case c.oboundP <- &PacketAndToken{p: pc, t: nil}:
-				case <-time.After(time.Second):
-				}
-			case *packets.PubcompPacket:
-				pc := msg.(*packets.PubcompPacket)
-				DEBUG.Println(NET, "received pubcomp, id:", pc.MessageID)
-				c.getToken(pc.MessageID).flowComplete()
-				c.freeID(pc.MessageID)
-			}
-		case <-c.stop:
-			WARN.Println(NET, "logic stopped")
-			return
-		case err := <-c.errors:
-			ERROR.Println(NET, "logic got error")
-			c.internalConnLost(err)
-			return
-		}
-		c.lastContact.update()
-	}
-}
diff --git a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/net_test.go b/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/net_test.go
deleted file mode 100644
index 9598bd6b3..000000000
--- a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/net_test.go
+++ /dev/null
@@ -1,17 +0,0 @@
-package mqtt
-
-import (
-	"errors"
-	"fmt"
-	"strconv"
-	"testing"
-)
-
-func Test_openConnection(t *testing.T) {
-	_, err := strconv.Atoi("")
-	e := fmt.Errorf(" : %s", err)
-	t.Errorf("%#v", e)
-
-	e1 := errors.New("hogehoge %s")
-	t.Errorf("%#v", e1)
-}
diff --git a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/notice.html b/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/notice.html
deleted file mode 100644
index f19c483b9..000000000
--- a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/notice.html
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Eclipse Foundation Software User Agreement</title>
-</head>
-
-<body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>February 1, 2011</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
-   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-
-<ul>
-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-       <li>The top-level (root) directory</li>
-       <li>Plug-in and Fragment directories</li>
-       <li>Inside Plug-ins and Fragments packaged as JARs</li>
-       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-       <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-
-<h3>Use of Provisioning Technology</h3>
-
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
-   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
-   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
-   (&quot;Specification&quot;).</p>
-
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
-
-<ol>
-       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
-       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
-       product.</li>
-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
-       accessed and copied to the Target Machine.</li>
-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
-       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
-</ol>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
-</body>
-</html>
diff --git a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/oops.go b/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/oops.go
deleted file mode 100644
index f15a9bae1..000000000
--- a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/oops.go
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (c) 2013 IBM Corp.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Seth Hoenig
- *    Allan Stockdill-Mander
- *    Mike Robertson
- */
-
-package mqtt
-
-func chkerr(e error) {
-	if e != nil {
-		panic(e)
-	}
-}
-
-func chkcond(b bool) {
-	if !b {
-		panic("oops")
-	}
-}
diff --git a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/options.go b/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/options.go
deleted file mode 100644
index 156b7c0e5..000000000
--- a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/options.go
+++ /dev/null
@@ -1,270 +0,0 @@
-/*
- * Copyright (c) 2013 IBM Corp.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Seth Hoenig
- *    Allan Stockdill-Mander
- *    Mike Robertson
- */
-
-package mqtt
-
-import (
-	"crypto/tls"
-	"net/url"
-	"time"
-)
-
-// MessageHandler is a callback type which can be set to be
-// executed upon the arrival of messages published to topics
-// to which the client is subscribed.
-type MessageHandler func(*Client, Message)
-
-// ConnectionLostHandler is a callback type which can be set to be
-// executed upon an unintended disconnection from the MQTT broker.
-// Disconnects caused by calling Disconnect or ForceDisconnect will
-// not cause an OnConnectionLost callback to execute.
-type ConnectionLostHandler func(*Client, error)
-
-// OnConnectHandler is a callback that is called when the client
-// state changes from unconnected/disconnected to connected. Both
-// at initial connection and on reconnection
-type OnConnectHandler func(*Client)
-
-// ClientOptions contains configurable options for an Client.
-type ClientOptions struct {
-	Servers                 []*url.URL
-	ClientID                string
-	Username                string
-	Password                string
-	CleanSession            bool
-	Order                   bool
-	WillEnabled             bool
-	WillTopic               string
-	WillPayload             []byte
-	WillQos                 byte
-	WillRetained            bool
-	ProtocolVersion         uint
-	protocolVersionExplicit bool
-	TLSConfig               tls.Config
-	KeepAlive               time.Duration
-	ConnectTimeout          time.Duration
-	MaxReconnectInterval    time.Duration
-	AutoReconnect           bool
-	Store                   Store
-	DefaultPublishHander    MessageHandler
-	OnConnect               OnConnectHandler
-	OnConnectionLost        ConnectionLostHandler
-	WriteTimeout            time.Duration
-}
-
-// NewClientOptions will create a new ClientClientOptions type with some
-// default values.
-//   Port: 1883
-//   CleanSession: True
-//   Order: True
-//   KeepAlive: 30 (seconds)
-//   ConnectTimeout: 30 (seconds)
-//   MaxReconnectInterval 10 (minutes)
-//   AutoReconnect: True
-func NewClientOptions() *ClientOptions {
-	o := &ClientOptions{
-		Servers:                 nil,
-		ClientID:                "",
-		Username:                "",
-		Password:                "",
-		CleanSession:            true,
-		Order:                   true,
-		WillEnabled:             false,
-		WillTopic:               "",
-		WillPayload:             nil,
-		WillQos:                 0,
-		WillRetained:            false,
-		ProtocolVersion:         0,
-		protocolVersionExplicit: false,
-		TLSConfig:               tls.Config{},
-		KeepAlive:               30 * time.Second,
-		ConnectTimeout:          30 * time.Second,
-		MaxReconnectInterval:    10 * time.Minute,
-		AutoReconnect:           true,
-		Store:                   nil,
-		OnConnect:               nil,
-		OnConnectionLost:        DefaultConnectionLostHandler,
-		WriteTimeout:            0, // 0 represents timeout disabled
-	}
-	return o
-}
-
-// AddBroker adds a broker URI to the list of brokers to be used. The format should be
-// scheme://host:port
-// Where "scheme" is one of "tcp", "ssl", or "ws", "host" is the ip-address (or hostname)
-// and "port" is the port on which the broker is accepting connections.
-func (o *ClientOptions) AddBroker(server string) *ClientOptions {
-	brokerURI, _ := url.Parse(server)
-	o.Servers = append(o.Servers, brokerURI)
-	return o
-}
-
-// SetClientID will set the client id to be used by this client when
-// connecting to the MQTT broker. According to the MQTT v3.1 specification,
-// a client id mus be no longer than 23 characters.
-func (o *ClientOptions) SetClientID(id string) *ClientOptions {
-	o.ClientID = id
-	return o
-}
-
-// SetUsername will set the username to be used by this client when connecting
-// to the MQTT broker. Note: without the use of SSL/TLS, this information will
-// be sent in plaintext accross the wire.
-func (o *ClientOptions) SetUsername(u string) *ClientOptions {
-	o.Username = u
-	return o
-}
-
-// SetPassword will set the password to be used by this client when connecting
-// to the MQTT broker. Note: without the use of SSL/TLS, this information will
-// be sent in plaintext accross the wire.
-func (o *ClientOptions) SetPassword(p string) *ClientOptions {
-	o.Password = p
-	return o
-}
-
-// SetCleanSession will set the "clean session" flag in the connect message
-// when this client connects to an MQTT broker. By setting this flag, you are
-// indicating that no messages saved by the broker for this client should be
-// delivered. Any messages that were going to be sent by this client before
-// diconnecting previously but didn't will not be sent upon connecting to the
-// broker.
-func (o *ClientOptions) SetCleanSession(clean bool) *ClientOptions {
-	o.CleanSession = clean
-	return o
-}
-
-// SetOrderMatters will set the message routing to guarantee order within
-// each QoS level. By default, this value is true. If set to false,
-// this flag indicates that messages can be delivered asynchronously
-// from the client to the application and possibly arrive out of order.
-func (o *ClientOptions) SetOrderMatters(order bool) *ClientOptions {
-	o.Order = order
-	return o
-}
-
-// SetTLSConfig will set an SSL/TLS configuration to be used when connecting
-// to an MQTT broker. Please read the official Go documentation for more
-// information.
-func (o *ClientOptions) SetTLSConfig(t *tls.Config) *ClientOptions {
-	o.TLSConfig = *t
-	return o
-}
-
-// SetStore will set the implementation of the Store interface
-// used to provide message persistence in cases where QoS levels
-// QoS_ONE or QoS_TWO are used. If no store is provided, then the
-// client will use MemoryStore by default.
-func (o *ClientOptions) SetStore(s Store) *ClientOptions {
-	o.Store = s
-	return o
-}
-
-// SetKeepAlive will set the amount of time (in seconds) that the client
-// should wait before sending a PING request to the broker. This will
-// allow the client to know that a connection has not been lost with the
-// server.
-func (o *ClientOptions) SetKeepAlive(k time.Duration) *ClientOptions {
-	o.KeepAlive = k
-	return o
-}
-
-// SetProtocolVersion sets the MQTT version to be used to connect to the
-// broker. Legitimate values are currently 3 - MQTT 3.1 or 4 - MQTT 3.1.1
-func (o *ClientOptions) SetProtocolVersion(pv uint) *ClientOptions {
-	if pv >= 3 && pv <= 4 {
-		o.ProtocolVersion = pv
-		o.protocolVersionExplicit = true
-	}
-	return o
-}
-
-// UnsetWill will cause any set will message to be disregarded.
-func (o *ClientOptions) UnsetWill() *ClientOptions {
-	o.WillEnabled = false
-	return o
-}
-
-// SetWill accepts a string will message to be set. When the client connects,
-// it will give this will message to the broker, which will then publish the
-// provided payload (the will) to any clients that are subscribed to the provided
-// topic.
-func (o *ClientOptions) SetWill(topic string, payload string, qos byte, retained bool) *ClientOptions {
-	o.SetBinaryWill(topic, []byte(payload), qos, retained)
-	return o
-}
-
-// SetBinaryWill accepts a []byte will message to be set. When the client connects,
-// it will give this will message to the broker, which will then publish the
-// provided payload (the will) to any clients that are subscribed to the provided
-// topic.
-func (o *ClientOptions) SetBinaryWill(topic string, payload []byte, qos byte, retained bool) *ClientOptions {
-	o.WillEnabled = true
-	o.WillTopic = topic
-	o.WillPayload = payload
-	o.WillQos = qos
-	o.WillRetained = retained
-	return o
-}
-
-// SetDefaultPublishHandler sets the MessageHandler that will be called when a message
-// is received that does not match any known subscriptions.
-func (o *ClientOptions) SetDefaultPublishHandler(defaultHandler MessageHandler) *ClientOptions {
-	o.DefaultPublishHander = defaultHandler
-	return o
-}
-
-// SetOnConnectHandler sets the function to be called when the client is connected. Both
-// at initial connection time and upon automatic reconnect.
-func (o *ClientOptions) SetOnConnectHandler(onConn OnConnectHandler) *ClientOptions {
-	o.OnConnect = onConn
-	return o
-}
-
-// SetConnectionLostHandler will set the OnConnectionLost callback to be executed
-// in the case where the client unexpectedly loses connection with the MQTT broker.
-func (o *ClientOptions) SetConnectionLostHandler(onLost ConnectionLostHandler) *ClientOptions {
-	o.OnConnectionLost = onLost
-	return o
-}
-
-// SetWriteTimeout puts a limit on how long a mqtt publish should block until it unblocks with a
-// timeout error. A duration of 0 never times out. Default 30 seconds
-func (o *ClientOptions) SetWriteTimeout(t time.Duration) *ClientOptions {
-	o.WriteTimeout = t
-	return o
-}
-
-// SetConnectTimeout limits how long the client will wait when trying to open a connection
-// to an MQTT server before timeing out and erroring the attempt. A duration of 0 never times out.
-// Default 30 seconds. Currently only operational on TCP/TLS connections.
-func (o *ClientOptions) SetConnectTimeout(t time.Duration) *ClientOptions {
-	o.ConnectTimeout = t
-	return o
-}
-
-// SetMaxReconnectInterval sets the maximum time that will be waited between reconnection attempts
-// when connection is lost
-func (o *ClientOptions) SetMaxReconnectInterval(t time.Duration) *ClientOptions {
-	o.MaxReconnectInterval = t
-	return o
-}
-
-// SetAutoReconnect sets whether the automatic reconnection logic should be used
-// when the connection is lost, even if disabled the ConnectionLostHandler is still
-// called
-func (o *ClientOptions) SetAutoReconnect(a bool) *ClientOptions {
-	o.AutoReconnect = a
-	return o
-}
diff --git a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/packets/connack.go b/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/packets/connack.go
deleted file mode 100644
index 729133767..000000000
--- a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/packets/connack.go
+++ /dev/null
@@ -1,57 +0,0 @@
-package packets
-
-import (
-	"bytes"
-	"fmt"
-	"github.com/pborman/uuid"
-	"io"
-)
-
-//ConnackPacket is an internal representation of the fields of the
-//Connack MQTT packet
-type ConnackPacket struct {
-	FixedHeader
-	TopicNameCompression byte
-	ReturnCode           byte
-	uuid                 uuid.UUID
-}
-
-func (ca *ConnackPacket) String() string {
-	str := fmt.Sprintf("%s\n", ca.FixedHeader)
-	str += fmt.Sprintf("returncode: %d", ca.ReturnCode)
-	return str
-}
-
-func (ca *ConnackPacket) Write(w io.Writer) error {
-	var body bytes.Buffer
-	var err error
-
-	body.WriteByte(ca.TopicNameCompression)
-	body.WriteByte(ca.ReturnCode)
-	ca.FixedHeader.RemainingLength = 2
-	packet := ca.FixedHeader.pack()
-	packet.Write(body.Bytes())
-	_, err = packet.WriteTo(w)
-
-	return err
-}
-
-//Unpack decodes the details of a ControlPacket after the fixed
-//header has been read
-func (ca *ConnackPacket) Unpack(b io.Reader) {
-	ca.TopicNameCompression = decodeByte(b)
-	ca.ReturnCode = decodeByte(b)
-}
-
-//Details returns a Details struct containing the Qos and
-//MessageID of this ControlPacket
-func (ca *ConnackPacket) Details() Details {
-	return Details{Qos: 0, MessageID: 0}
-}
-
-//UUID returns the unique ID assigned to the ControlPacket when
-//it was originally received. Note: this is not related to the
-//MessageID field for MQTT packets
-func (ca *ConnackPacket) UUID() uuid.UUID {
-	return ca.uuid
-}
diff --git a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/packets/connect.go b/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/packets/connect.go
deleted file mode 100644
index 283007725..000000000
--- a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/packets/connect.go
+++ /dev/null
@@ -1,128 +0,0 @@
-package packets
-
-import (
-	"bytes"
-	"fmt"
-	"github.com/pborman/uuid"
-	"io"
-)
-
-//ConnectPacket is an internal representation of the fields of the
-//Connect MQTT packet
-type ConnectPacket struct {
-	FixedHeader
-	ProtocolName    string
-	ProtocolVersion byte
-	CleanSession    bool
-	WillFlag        bool
-	WillQos         byte
-	WillRetain      bool
-	UsernameFlag    bool
-	PasswordFlag    bool
-	ReservedBit     byte
-	KeepaliveTimer  uint16
-
-	ClientIdentifier string
-	WillTopic        string
-	WillMessage      []byte
-	Username         string
-	Password         []byte
-	uuid             uuid.UUID
-}
-
-func (c *ConnectPacket) String() string {
-	str := fmt.Sprintf("%s\n", c.FixedHeader)
-	str += fmt.Sprintf("protocolversion: %d protocolname: %s cleansession: %t willflag: %t WillQos: %d WillRetain: %t Usernameflag: %t Passwordflag: %t keepalivetimer: %d\nclientId: %s\nwilltopic: %s\nwillmessage: %s\nUsername: %s\nPassword: %s\n", c.ProtocolVersion, c.ProtocolName, c.CleanSession, c.WillFlag, c.WillQos, c.WillRetain, c.UsernameFlag, c.PasswordFlag, c.KeepaliveTimer, c.ClientIdentifier, c.WillTopic, c.WillMessage, c.Username, c.Password)
-	return str
-}
-
-func (c *ConnectPacket) Write(w io.Writer) error {
-	var body bytes.Buffer
-	var err error
-
-	body.Write(encodeString(c.ProtocolName))
-	body.WriteByte(c.ProtocolVersion)
-	body.WriteByte(boolToByte(c.CleanSession)<<1 | boolToByte(c.WillFlag)<<2 | c.WillQos<<3 | boolToByte(c.WillRetain)<<5 | boolToByte(c.PasswordFlag)<<6 | boolToByte(c.UsernameFlag)<<7)
-	body.Write(encodeUint16(c.KeepaliveTimer))
-	body.Write(encodeString(c.ClientIdentifier))
-	if c.WillFlag {
-		body.Write(encodeString(c.WillTopic))
-		body.Write(encodeBytes(c.WillMessage))
-	}
-	if c.UsernameFlag {
-		body.Write(encodeString(c.Username))
-	}
-	if c.PasswordFlag {
-		body.Write(encodeBytes(c.Password))
-	}
-	c.FixedHeader.RemainingLength = body.Len()
-	packet := c.FixedHeader.pack()
-	packet.Write(body.Bytes())
-	_, err = packet.WriteTo(w)
-
-	return err
-}
-
-//Unpack decodes the details of a ControlPacket after the fixed
-//header has been read
-func (c *ConnectPacket) Unpack(b io.Reader) {
-	c.ProtocolName = decodeString(b)
-	c.ProtocolVersion = decodeByte(b)
-	options := decodeByte(b)
-	c.ReservedBit = 1 & options
-	c.CleanSession = 1&(options>>1) > 0
-	c.WillFlag = 1&(options>>2) > 0
-	c.WillQos = 3 & (options >> 3)
-	c.WillRetain = 1&(options>>5) > 0
-	c.PasswordFlag = 1&(options>>6) > 0
-	c.UsernameFlag = 1&(options>>7) > 0
-	c.KeepaliveTimer = decodeUint16(b)
-	c.ClientIdentifier = decodeString(b)
-	if c.WillFlag {
-		c.WillTopic = decodeString(b)
-		c.WillMessage = decodeBytes(b)
-	}
-	if c.UsernameFlag {
-		c.Username = decodeString(b)
-	}
-	if c.PasswordFlag {
-		c.Password = decodeBytes(b)
-	}
-}
-
-//Validate performs validation of the fields of a Connect packet
-func (c *ConnectPacket) Validate() byte {
-	if c.PasswordFlag && !c.UsernameFlag {
-		return ErrRefusedBadUsernameOrPassword
-	}
-	if c.ReservedBit != 0 {
-		//Bad reserved bit
-		return ErrProtocolViolation
-	}
-	if (c.ProtocolName == "MQIsdp" && c.ProtocolVersion != 3) || (c.ProtocolName == "MQTT" && c.ProtocolVersion != 4) {
-		//Mismatched or unsupported protocol version
-		return ErrRefusedBadProtocolVersion
-	}
-	if c.ProtocolName != "MQIsdp" && c.ProtocolName != "MQTT" {
-		//Bad protocol name
-		return ErrProtocolViolation
-	}
-	if len(c.ClientIdentifier) > 65535 || len(c.Username) > 65535 || len(c.Password) > 65535 {
-		//Bad size field
-		return ErrProtocolViolation
-	}
-	return Accepted
-}
-
-//Details returns a Details struct containing the Qos and
-//MessageID of this ControlPacket
-func (c *ConnectPacket) Details() Details {
-	return Details{Qos: 0, MessageID: 0}
-}
-
-//UUID returns the unique ID assigned to the ControlPacket when
-//it was originally received. Note: this is not related to the
-//MessageID field for MQTT packets
-func (c *ConnectPacket) UUID() uuid.UUID {
-	return c.uuid
-}
diff --git a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/packets/disconnect.go b/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/packets/disconnect.go
deleted file mode 100644
index 2f005fb35..000000000
--- a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/packets/disconnect.go
+++ /dev/null
@@ -1,44 +0,0 @@
-package packets
-
-import (
-	"fmt"
-	"github.com/pborman/uuid"
-	"io"
-)
-
-//DisconnectPacket is an internal representation of the fields of the
-//Disconnect MQTT packet
-type DisconnectPacket struct {
-	FixedHeader
-	uuid uuid.UUID
-}
-
-func (d *DisconnectPacket) String() string {
-	str := fmt.Sprintf("%s\n", d.FixedHeader)
-	return str
-}
-
-func (d *DisconnectPacket) Write(w io.Writer) error {
-	packet := d.FixedHeader.pack()
-	_, err := packet.WriteTo(w)
-
-	return err
-}
-
-//Unpack decodes the details of a ControlPacket after the fixed
-//header has been read
-func (d *DisconnectPacket) Unpack(b io.Reader) {
-}
-
-//Details returns a Details struct containing the Qos and
-//MessageID of this ControlPacket
-func (d *DisconnectPacket) Details() Details {
-	return Details{Qos: 0, MessageID: 0}
-}
-
-//UUID returns the unique ID assigned to the ControlPacket when
-//it was originally received. Note: this is not related to the
-//MessageID field for MQTT packets
-func (d *DisconnectPacket) UUID() uuid.UUID {
-	return d.uuid
-}
diff --git a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/packets/packets.go b/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/packets/packets.go
deleted file mode 100644
index 4cdf3b1f5..000000000
--- a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/packets/packets.go
+++ /dev/null
@@ -1,324 +0,0 @@
-package packets
-
-import (
-	"bytes"
-	"encoding/binary"
-	"errors"
-	"fmt"
-	"github.com/pborman/uuid"
-	"io"
-)
-
-//ControlPacket defines the interface for structs intended to hold
-//decoded MQTT packets, either from being read or before being
-//written
-type ControlPacket interface {
-	Write(io.Writer) error
-	Unpack(io.Reader)
-	String() string
-	Details() Details
-	UUID() uuid.UUID
-}
-
-//PacketNames maps the constants for each of the MQTT packet types
-//to a string representation of their name.
-var PacketNames = map[uint8]string{
-	1:  "CONNECT",
-	2:  "CONNACK",
-	3:  "PUBLISH",
-	4:  "PUBACK",
-	5:  "PUBREC",
-	6:  "PUBREL",
-	7:  "PUBCOMP",
-	8:  "SUBSCRIBE",
-	9:  "SUBACK",
-	10: "UNSUBSCRIBE",
-	11: "UNSUBACK",
-	12: "PINGREQ",
-	13: "PINGRESP",
-	14: "DISCONNECT",
-}
-
-//Below are the constants assigned to each of the MQTT packet types
-const (
-	Connect     = 1
-	Connack     = 2
-	Publish     = 3
-	Puback      = 4
-	Pubrec      = 5
-	Pubrel      = 6
-	Pubcomp     = 7
-	Subscribe   = 8
-	Suback      = 9
-	Unsubscribe = 10
-	Unsuback    = 11
-	Pingreq     = 12
-	Pingresp    = 13
-	Disconnect  = 14
-)
-
-//Below are the const definitions for error codes returned by
-//Connect()
-const (
-	Accepted                        = 0x00
-	ErrRefusedBadProtocolVersion    = 0x01
-	ErrRefusedIDRejected            = 0x02
-	ErrRefusedServerUnavailable     = 0x03
-	ErrRefusedBadUsernameOrPassword = 0x04
-	ErrRefusedNotAuthorised         = 0x05
-	ErrNetworkError                 = 0xFE
-	ErrProtocolViolation            = 0xFF
-)
-
-//ConnackReturnCodes is a map of the error codes constants for Connect()
-//to a string representation of the error
-var ConnackReturnCodes = map[uint8]string{
-	0:   "Connection Accepted",
-	1:   "Connection Refused: Bad Protocol Version",
-	2:   "Connection Refused: Client Identifier Rejected",
-	3:   "Connection Refused: Server Unavailable",
-	4:   "Connection Refused: Username or Password in unknown format",
-	5:   "Connection Refused: Not Authorised",
-	254: "Connection Error",
-	255: "Connection Refused: Protocol Violation",
-}
-
-//ConnErrors is a map of the errors codes constants for Connect()
-//to a Go error
-var ConnErrors = map[byte]error{
-	Accepted:                        nil,
-	ErrRefusedBadProtocolVersion:    errors.New("Unnacceptable protocol version"),
-	ErrRefusedIDRejected:            errors.New("Identifier rejected"),
-	ErrRefusedServerUnavailable:     errors.New("Server Unavailable"),
-	ErrRefusedBadUsernameOrPassword: errors.New("Bad user name or password"),
-	ErrRefusedNotAuthorised:         errors.New("Not Authorized"),
-	ErrNetworkError:                 errors.New("Network Error"),
-	ErrProtocolViolation:            errors.New("Protocol Violation"),
-}
-
-//ReadPacket takes an instance of an io.Reader (such as net.Conn) and attempts
-//to read an MQTT packet from the stream. It returns a ControlPacket
-//representing the decoded MQTT packet and an error. One of these returns will
-//always be nil, a nil ControlPacket indicating an error occurred.
-func ReadPacket(r io.Reader) (cp ControlPacket, err error) {
-	var fh FixedHeader
-	b := make([]byte, 1)
-
-	_, err = io.ReadFull(r, b)
-	if err != nil {
-		return nil, err
-	}
-	fh.unpack(b[0], r)
-	cp = NewControlPacketWithHeader(fh)
-	if cp == nil {
-		return nil, errors.New("Bad data from client")
-	}
-	packetBytes := make([]byte, fh.RemainingLength)
-	_, err = io.ReadFull(r, packetBytes)
-	if err != nil {
-		return nil, err
-	}
-	cp.Unpack(bytes.NewBuffer(packetBytes))
-	return cp, nil
-}
-
-//NewControlPacket is used to create a new ControlPacket of the type specified
-//by packetType, this is usually done by reference to the packet type constants
-//defined in packets.go. The newly created ControlPacket is empty and a pointer
-//is returned.
-func NewControlPacket(packetType byte) (cp ControlPacket) {
-	switch packetType {
-	case Connect:
-		cp = &ConnectPacket{FixedHeader: FixedHeader{MessageType: Connect}, uuid: uuid.NewUUID()}
-	case Connack:
-		cp = &ConnackPacket{FixedHeader: FixedHeader{MessageType: Connack}, uuid: uuid.NewUUID()}
-	case Disconnect:
-		cp = &DisconnectPacket{FixedHeader: FixedHeader{MessageType: Disconnect}, uuid: uuid.NewUUID()}
-	case Publish:
-		cp = &PublishPacket{FixedHeader: FixedHeader{MessageType: Publish}, uuid: uuid.NewUUID()}
-	case Puback:
-		cp = &PubackPacket{FixedHeader: FixedHeader{MessageType: Puback}, uuid: uuid.NewUUID()}
-	case Pubrec:
-		cp = &PubrecPacket{FixedHeader: FixedHeader{MessageType: Pubrec}, uuid: uuid.NewUUID()}
-	case Pubrel:
-		cp = &PubrelPacket{FixedHeader: FixedHeader{MessageType: Pubrel, Qos: 1}, uuid: uuid.NewUUID()}
-	case Pubcomp:
-		cp = &PubcompPacket{FixedHeader: FixedHeader{MessageType: Pubcomp}, uuid: uuid.NewUUID()}
-	case Subscribe:
-		cp = &SubscribePacket{FixedHeader: FixedHeader{MessageType: Subscribe, Qos: 1}, uuid: uuid.NewUUID()}
-	case Suback:
-		cp = &SubackPacket{FixedHeader: FixedHeader{MessageType: Suback}, uuid: uuid.NewUUID()}
-	case Unsubscribe:
-		cp = &UnsubscribePacket{FixedHeader: FixedHeader{MessageType: Unsubscribe, Qos: 1}, uuid: uuid.NewUUID()}
-	case Unsuback:
-		cp = &UnsubackPacket{FixedHeader: FixedHeader{MessageType: Unsuback}, uuid: uuid.NewUUID()}
-	case Pingreq:
-		cp = &PingreqPacket{FixedHeader: FixedHeader{MessageType: Pingreq}, uuid: uuid.NewUUID()}
-	case Pingresp:
-		cp = &PingrespPacket{FixedHeader: FixedHeader{MessageType: Pingresp}, uuid: uuid.NewUUID()}
-	default:
-		return nil
-	}
-	return cp
-}
-
-//NewControlPacketWithHeader is used to create a new ControlPacket of the type
-//specified within the FixedHeader that is passed to the function.
-//The newly created ControlPacket is empty and a pointer is returned.
-func NewControlPacketWithHeader(fh FixedHeader) (cp ControlPacket) {
-	switch fh.MessageType {
-	case Connect:
-		cp = &ConnectPacket{FixedHeader: fh, uuid: uuid.NewUUID()}
-	case Connack:
-		cp = &ConnackPacket{FixedHeader: fh, uuid: uuid.NewUUID()}
-	case Disconnect:
-		cp = &DisconnectPacket{FixedHeader: fh, uuid: uuid.NewUUID()}
-	case Publish:
-		cp = &PublishPacket{FixedHeader: fh, uuid: uuid.NewUUID()}
-	case Puback:
-		cp = &PubackPacket{FixedHeader: fh, uuid: uuid.NewUUID()}
-	case Pubrec:
-		cp = &PubrecPacket{FixedHeader: fh, uuid: uuid.NewUUID()}
-	case Pubrel:
-		cp = &PubrelPacket{FixedHeader: fh, uuid: uuid.NewUUID()}
-	case Pubcomp:
-		cp = &PubcompPacket{FixedHeader: fh, uuid: uuid.NewUUID()}
-	case Subscribe:
-		cp = &SubscribePacket{FixedHeader: fh, uuid: uuid.NewUUID()}
-	case Suback:
-		cp = &SubackPacket{FixedHeader: fh, uuid: uuid.NewUUID()}
-	case Unsubscribe:
-		cp = &UnsubscribePacket{FixedHeader: fh, uuid: uuid.NewUUID()}
-	case Unsuback:
-		cp = &UnsubackPacket{FixedHeader: fh, uuid: uuid.NewUUID()}
-	case Pingreq:
-		cp = &PingreqPacket{FixedHeader: fh, uuid: uuid.NewUUID()}
-	case Pingresp:
-		cp = &PingrespPacket{FixedHeader: fh, uuid: uuid.NewUUID()}
-	default:
-		return nil
-	}
-	return cp
-}
-
-//Details struct returned by the Details() function called on
-//ControlPackets to present details of the Qos and MessageID
-//of the ControlPacket
-type Details struct {
-	Qos       byte
-	MessageID uint16
-}
-
-//FixedHeader is a struct to hold the decoded information from
-//the fixed header of an MQTT ControlPacket
-type FixedHeader struct {
-	MessageType     byte
-	Dup             bool
-	Qos             byte
-	Retain          bool
-	RemainingLength int
-}
-
-func (fh FixedHeader) String() string {
-	return fmt.Sprintf("%s: dup: %t qos: %d retain: %t rLength: %d", PacketNames[fh.MessageType], fh.Dup, fh.Qos, fh.Retain, fh.RemainingLength)
-}
-
-func boolToByte(b bool) byte {
-	switch b {
-	case true:
-		return 1
-	default:
-		return 0
-	}
-}
-
-func (fh *FixedHeader) pack() bytes.Buffer {
-	var header bytes.Buffer
-	header.WriteByte(fh.MessageType<<4 | boolToByte(fh.Dup)<<3 | fh.Qos<<1 | boolToByte(fh.Retain))
-	header.Write(encodeLength(fh.RemainingLength))
-	return header
-}
-
-func (fh *FixedHeader) unpack(typeAndFlags byte, r io.Reader) {
-	fh.MessageType = typeAndFlags >> 4
-	fh.Dup = (typeAndFlags>>3)&0x01 > 0
-	fh.Qos = (typeAndFlags >> 1) & 0x03
-	fh.Retain = typeAndFlags&0x01 > 0
-	fh.RemainingLength = decodeLength(r)
-}
-
-func decodeByte(b io.Reader) byte {
-	num := make([]byte, 1)
-	b.Read(num)
-	return num[0]
-}
-
-func decodeUint16(b io.Reader) uint16 {
-	num := make([]byte, 2)
-	b.Read(num)
-	return binary.BigEndian.Uint16(num)
-}
-
-func encodeUint16(num uint16) []byte {
-	bytes := make([]byte, 2)
-	binary.BigEndian.PutUint16(bytes, num)
-	return bytes
-}
-
-func encodeString(field string) []byte {
-	fieldLength := make([]byte, 2)
-	binary.BigEndian.PutUint16(fieldLength, uint16(len(field)))
-	return append(fieldLength, []byte(field)...)
-}
-
-func decodeString(b io.Reader) string {
-	fieldLength := decodeUint16(b)
-	field := make([]byte, fieldLength)
-	b.Read(field)
-	return string(field)
-}
-
-func decodeBytes(b io.Reader) []byte {
-	fieldLength := decodeUint16(b)
-	field := make([]byte, fieldLength)
-	b.Read(field)
-	return field
-}
-
-func encodeBytes(field []byte) []byte {
-	fieldLength := make([]byte, 2)
-	binary.BigEndian.PutUint16(fieldLength, uint16(len(field)))
-	return append(fieldLength, field...)
-}
-
-func encodeLength(length int) []byte {
-	var encLength []byte
-	for {
-		digit := byte(length % 128)
-		length /= 128
-		if length > 0 {
-			digit |= 0x80
-		}
-		encLength = append(encLength, digit)
-		if length == 0 {
-			break
-		}
-	}
-	return encLength
-}
-
-func decodeLength(r io.Reader) int {
-	var rLength uint32
-	var multiplier uint32
-	b := make([]byte, 1)
-	for {
-		io.ReadFull(r, b)
-		digit := b[0]
-		rLength |= uint32(digit&127) << multiplier
-		if (digit & 128) == 0 {
-			break
-		}
-		multiplier += 7
-	}
-	return int(rLength)
-}
diff --git a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/packets/packets_test.go b/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/packets/packets_test.go
deleted file mode 100644
index 51d887d08..000000000
--- a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/packets/packets_test.go
+++ /dev/null
@@ -1,159 +0,0 @@
-package packets
-
-import (
-	"bytes"
-	"testing"
-)
-
-func TestPacketNames(t *testing.T) {
-	if PacketNames[1] != "CONNECT" {
-		t.Errorf("PacketNames[1] is %s, should be %s", PacketNames[1], "CONNECT")
-	}
-	if PacketNames[2] != "CONNACK" {
-		t.Errorf("PacketNames[2] is %s, should be %s", PacketNames[2], "CONNACK")
-	}
-	if PacketNames[3] != "PUBLISH" {
-		t.Errorf("PacketNames[3] is %s, should be %s", PacketNames[3], "PUBLISH")
-	}
-	if PacketNames[4] != "PUBACK" {
-		t.Errorf("PacketNames[4] is %s, should be %s", PacketNames[4], "PUBACK")
-	}
-	if PacketNames[5] != "PUBREC" {
-		t.Errorf("PacketNames[5] is %s, should be %s", PacketNames[5], "PUBREC")
-	}
-	if PacketNames[6] != "PUBREL" {
-		t.Errorf("PacketNames[6] is %s, should be %s", PacketNames[6], "PUBREL")
-	}
-	if PacketNames[7] != "PUBCOMP" {
-		t.Errorf("PacketNames[7] is %s, should be %s", PacketNames[7], "PUBCOMP")
-	}
-	if PacketNames[8] != "SUBSCRIBE" {
-		t.Errorf("PacketNames[8] is %s, should be %s", PacketNames[8], "SUBSCRIBE")
-	}
-	if PacketNames[9] != "SUBACK" {
-		t.Errorf("PacketNames[9] is %s, should be %s", PacketNames[9], "SUBACK")
-	}
-	if PacketNames[10] != "UNSUBSCRIBE" {
-		t.Errorf("PacketNames[10] is %s, should be %s", PacketNames[10], "UNSUBSCRIBE")
-	}
-	if PacketNames[11] != "UNSUBACK" {
-		t.Errorf("PacketNames[11] is %s, should be %s", PacketNames[11], "UNSUBACK")
-	}
-	if PacketNames[12] != "PINGREQ" {
-		t.Errorf("PacketNames[12] is %s, should be %s", PacketNames[12], "PINGREQ")
-	}
-	if PacketNames[13] != "PINGRESP" {
-		t.Errorf("PacketNames[13] is %s, should be %s", PacketNames[13], "PINGRESP")
-	}
-	if PacketNames[14] != "DISCONNECT" {
-		t.Errorf("PacketNames[14] is %s, should be %s", PacketNames[14], "DISCONNECT")
-	}
-}
-
-func TestPacketConsts(t *testing.T) {
-	if Connect != 1 {
-		t.Errorf("Const for Connect is %d, should be %d", Connect, 1)
-	}
-	if Connack != 2 {
-		t.Errorf("Const for Connack is %d, should be %d", Connack, 2)
-	}
-	if Publish != 3 {
-		t.Errorf("Const for Publish is %d, should be %d", Publish, 3)
-	}
-	if Puback != 4 {
-		t.Errorf("Const for Puback is %d, should be %d", Puback, 4)
-	}
-	if Pubrec != 5 {
-		t.Errorf("Const for Pubrec is %d, should be %d", Pubrec, 5)
-	}
-	if Pubrel != 6 {
-		t.Errorf("Const for Pubrel is %d, should be %d", Pubrel, 6)
-	}
-	if Pubcomp != 7 {
-		t.Errorf("Const for Pubcomp is %d, should be %d", Pubcomp, 7)
-	}
-	if Subscribe != 8 {
-		t.Errorf("Const for Subscribe is %d, should be %d", Subscribe, 8)
-	}
-	if Suback != 9 {
-		t.Errorf("Const for Suback is %d, should be %d", Suback, 9)
-	}
-	if Unsubscribe != 10 {
-		t.Errorf("Const for Unsubscribe is %d, should be %d", Unsubscribe, 10)
-	}
-	if Unsuback != 11 {
-		t.Errorf("Const for Unsuback is %d, should be %d", Unsuback, 11)
-	}
-	if Pingreq != 12 {
-		t.Errorf("Const for Pingreq is %d, should be %d", Pingreq, 12)
-	}
-	if Pingresp != 13 {
-		t.Errorf("Const for Pingresp is %d, should be %d", Pingresp, 13)
-	}
-	if Disconnect != 14 {
-		t.Errorf("Const for Disconnect is %d, should be %d", Disconnect, 14)
-	}
-}
-
-func TestConnackConsts(t *testing.T) {
-	if Accepted != 0x00 {
-		t.Errorf("Const for Accepted is %d, should be %d", Accepted, 0)
-	}
-	if ErrRefusedBadProtocolVersion != 0x01 {
-		t.Errorf("Const for RefusedBadProtocolVersion is %d, should be %d", ErrRefusedBadProtocolVersion, 1)
-	}
-	if ErrRefusedIDRejected != 0x02 {
-		t.Errorf("Const for RefusedIDRejected is %d, should be %d", ErrRefusedIDRejected, 2)
-	}
-	if ErrRefusedServerUnavailable != 0x03 {
-		t.Errorf("Const for RefusedServerUnavailable is %d, should be %d", ErrRefusedServerUnavailable, 3)
-	}
-	if ErrRefusedBadUsernameOrPassword != 0x04 {
-		t.Errorf("Const for RefusedBadUsernameOrPassword is %d, should be %d", ErrRefusedBadUsernameOrPassword, 4)
-	}
-	if ErrRefusedNotAuthorised != 0x05 {
-		t.Errorf("Const for RefusedNotAuthorised is %d, should be %d", ErrRefusedNotAuthorised, 5)
-	}
-}
-
-func TestConnectPacket(t *testing.T) {
-	connectPacketBytes := bytes.NewBuffer([]byte{16, 52, 0, 4, 77, 81, 84, 84, 4, 204, 0, 0, 0, 0, 0, 4, 116, 101, 115, 116, 0, 12, 84, 101, 115, 116, 32, 80, 97, 121, 108, 111, 97, 100, 0, 8, 116, 101, 115, 116, 117, 115, 101, 114, 0, 8, 116, 101, 115, 116, 112, 97, 115, 115})
-	packet, err := ReadPacket(connectPacketBytes)
-	if err != nil {
-		t.Fatalf("Error reading packet: %s", err.Error())
-	}
-	cp := packet.(*ConnectPacket)
-	if cp.ProtocolName != "MQTT" {
-		t.Errorf("Connect Packet ProtocolName is %s, should be %s", cp.ProtocolName, "MQTT")
-	}
-	if cp.ProtocolVersion != 4 {
-		t.Errorf("Connect Packet ProtocolVersion is %d, should be %d", cp.ProtocolVersion, 4)
-	}
-	if cp.UsernameFlag != true {
-		t.Errorf("Connect Packet UsernameFlag is %t, should be %t", cp.UsernameFlag, true)
-	}
-	if cp.Username != "testuser" {
-		t.Errorf("Connect Packet Username is %s, should be %s", cp.Username, "testuser")
-	}
-	if cp.PasswordFlag != true {
-		t.Errorf("Connect Packet PasswordFlag is %t, should be %t", cp.PasswordFlag, true)
-	}
-	if string(cp.Password) != "testpass" {
-		t.Errorf("Connect Packet Password is %s, should be %s", string(cp.Password), "testpass")
-	}
-	if cp.WillFlag != true {
-		t.Errorf("Connect Packet WillFlag is %t, should be %t", cp.WillFlag, true)
-	}
-	if cp.WillTopic != "test" {
-		t.Errorf("Connect Packet WillTopic is %s, should be %s", cp.WillTopic, "test")
-	}
-	if cp.WillQos != 1 {
-		t.Errorf("Connect Packet WillQos is %d, should be %d", cp.WillQos, 1)
-	}
-	if cp.WillRetain != false {
-		t.Errorf("Connect Packet WillRetain is %t, should be %t", cp.WillRetain, false)
-	}
-	if string(cp.WillMessage) != "Test Payload" {
-		t.Errorf("Connect Packet WillMessage is %s, should be %s", string(cp.WillMessage), "Test Payload")
-	}
-}
diff --git a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/packets/pingreq.go b/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/packets/pingreq.go
deleted file mode 100644
index 216a5f8fc..000000000
--- a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/packets/pingreq.go
+++ /dev/null
@@ -1,44 +0,0 @@
-package packets
-
-import (
-	"fmt"
-	"github.com/pborman/uuid"
-	"io"
-)
-
-//PingreqPacket is an internal representation of the fields of the
-//Pingreq MQTT packet
-type PingreqPacket struct {
-	FixedHeader
-	uuid uuid.UUID
-}
-
-func (pr *PingreqPacket) String() string {
-	str := fmt.Sprintf("%s", pr.FixedHeader)
-	return str
-}
-
-func (pr *PingreqPacket) Write(w io.Writer) error {
-	packet := pr.FixedHeader.pack()
-	_, err := packet.WriteTo(w)
-
-	return err
-}
-
-//Unpack decodes the details of a ControlPacket after the fixed
-//header has been read
-func (pr *PingreqPacket) Unpack(b io.Reader) {
-}
-
-//Details returns a Details struct containing the Qos and
-//MessageID of this ControlPacket
-func (pr *PingreqPacket) Details() Details {
-	return Details{Qos: 0, MessageID: 0}
-}
-
-//UUID returns the unique ID assigned to the ControlPacket when
-//it was originally received. Note: this is not related to the
-//MessageID field for MQTT packets
-func (pr *PingreqPacket) UUID() uuid.UUID {
-	return pr.uuid
-}
diff --git a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/packets/pingresp.go b/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/packets/pingresp.go
deleted file mode 100644
index 4658def97..000000000
--- a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/packets/pingresp.go
+++ /dev/null
@@ -1,44 +0,0 @@
-package packets
-
-import (
-	"fmt"
-	"github.com/pborman/uuid"
-	"io"
-)
-
-//PingrespPacket is an internal representation of the fields of the
-//Pingresp MQTT packet
-type PingrespPacket struct {
-	FixedHeader
-	uuid uuid.UUID
-}
-
-func (pr *PingrespPacket) String() string {
-	str := fmt.Sprintf("%s", pr.FixedHeader)
-	return str
-}
-
-func (pr *PingrespPacket) Write(w io.Writer) error {
-	packet := pr.FixedHeader.pack()
-	_, err := packet.WriteTo(w)
-
-	return err
-}
-
-//Unpack decodes the details of a ControlPacket after the fixed
-//header has been read
-func (pr *PingrespPacket) Unpack(b io.Reader) {
-}
-
-//Details returns a Details struct containing the Qos and
-//MessageID of this ControlPacket
-func (pr *PingrespPacket) Details() Details {
-	return Details{Qos: 0, MessageID: 0}
-}
-
-//UUID returns the unique ID assigned to the ControlPacket when
-//it was originally received. Note: this is not related to the
-//MessageID field for MQTT packets
-func (pr *PingrespPacket) UUID() uuid.UUID {
-	return pr.uuid
-}
diff --git a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/packets/puback.go b/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/packets/puback.go
deleted file mode 100644
index a3fe5db31..000000000
--- a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/packets/puback.go
+++ /dev/null
@@ -1,50 +0,0 @@
-package packets
-
-import (
-	"fmt"
-	"github.com/pborman/uuid"
-	"io"
-)
-
-//PubackPacket is an internal representation of the fields of the
-//Puback MQTT packet
-type PubackPacket struct {
-	FixedHeader
-	MessageID uint16
-	uuid      uuid.UUID
-}
-
-func (pa *PubackPacket) String() string {
-	str := fmt.Sprintf("%s\n", pa.FixedHeader)
-	str += fmt.Sprintf("messageID: %d", pa.MessageID)
-	return str
-}
-
-func (pa *PubackPacket) Write(w io.Writer) error {
-	var err error
-	pa.FixedHeader.RemainingLength = 2
-	packet := pa.FixedHeader.pack()
-	packet.Write(encodeUint16(pa.MessageID))
-	_, err = packet.WriteTo(w)
-
-	return err
-}
-
-//Unpack decodes the details of a ControlPacket after the fixed
-//header has been read
-func (pa *PubackPacket) Unpack(b io.Reader) {
-	pa.MessageID = decodeUint16(b)
-}
-
-//Details returns a Details struct containing the Qos and
-//MessageID of this ControlPacket
-func (pa *PubackPacket) Details() Details {
-	return Details{Qos: pa.Qos, MessageID: pa.MessageID}
-}
-
-//UUID returns the unique ID assigned to the ControlPacket when
-//it was originally received. Note: this is not related to the
-//MessageID field for MQTT packets
-func (pa *PubackPacket) UUID() uuid.UUID {
-	return pa.uuid
-}
diff --git a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/packets/pubcomp.go b/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/packets/pubcomp.go
deleted file mode 100644
index 0cd5c860c..000000000
--- a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/packets/pubcomp.go
+++ /dev/null
@@ -1,50 +0,0 @@
-package packets
-
-import (
-	"fmt"
-	"github.com/pborman/uuid"
-	"io"
-)
-
-//PubcompPacket is an internal representation of the fields of the
-//Pubcomp MQTT packet
-type PubcompPacket struct {
-	FixedHeader
-	MessageID uint16
-	uuid      uuid.UUID
-}
-
-func (pc *PubcompPacket) String() string {
-	str := fmt.Sprintf("%s\n", pc.FixedHeader)
-	str += fmt.Sprintf("MessageID: %d", pc.MessageID)
-	return str
-}
-
-func (pc *PubcompPacket) Write(w io.Writer) error {
-	var err error
-	pc.FixedHeader.RemainingLength = 2
-	packet := pc.FixedHeader.pack()
-	packet.Write(encodeUint16(pc.MessageID))
-	_, err = packet.WriteTo(w)
-
-	return err
-}
-
-//Unpack decodes the details of a ControlPacket after the fixed
-//header has been read
-func (pc *PubcompPacket) Unpack(b io.Reader) {
-	pc.MessageID = decodeUint16(b)
-}
-
-//Details returns a Details struct containing the Qos and
-//MessageID of this ControlPacket
-func (pc *PubcompPacket) Details() Details {
-	return Details{Qos: pc.Qos, MessageID: pc.MessageID}
-}
-
-//UUID returns the unique ID assigned to the ControlPacket when
-//it was originally received. Note: this is not related to the
-//MessageID field for MQTT packets
-func (pc *PubcompPacket) UUID() uuid.UUID {
-	return pc.uuid
-}
diff --git a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/packets/publish.go b/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/packets/publish.go
deleted file mode 100644
index cb886cf78..000000000
--- a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/packets/publish.go
+++ /dev/null
@@ -1,82 +0,0 @@
-package packets
-
-import (
-	"bytes"
-	"fmt"
-	"github.com/pborman/uuid"
-	"io"
-)
-
-//PublishPacket is an internal representation of the fields of the
-//Publish MQTT packet
-type PublishPacket struct {
-	FixedHeader
-	TopicName string
-	MessageID uint16
-	Payload   []byte
-	uuid      uuid.UUID
-}
-
-func (p *PublishPacket) String() string {
-	str := fmt.Sprintf("%s\n", p.FixedHeader)
-	str += fmt.Sprintf("topicName: %s MessageID: %d\n", p.TopicName, p.MessageID)
-	str += fmt.Sprintf("payload: %s\n", string(p.Payload))
-	return str
-}
-
-func (p *PublishPacket) Write(w io.Writer) error {
-	var body bytes.Buffer
-	var err error
-
-	body.Write(encodeString(p.TopicName))
-	if p.Qos > 0 {
-		body.Write(encodeUint16(p.MessageID))
-	}
-	p.FixedHeader.RemainingLength = body.Len() + len(p.Payload)
-	packet := p.FixedHeader.pack()
-	packet.Write(body.Bytes())
-	packet.Write(p.Payload)
-	_, err = w.Write(packet.Bytes())
-
-	return err
-}
-
-//Unpack decodes the details of a ControlPacket after the fixed
-//header has been read
-func (p *PublishPacket) Unpack(b io.Reader) {
-	var payloadLength = p.FixedHeader.RemainingLength
-	p.TopicName = decodeString(b)
-	if p.Qos > 0 {
-		p.MessageID = decodeUint16(b)
-		payloadLength -= len(p.TopicName) + 4
-	} else {
-		payloadLength -= len(p.TopicName) + 2
-	}
-	p.Payload = make([]byte, payloadLength)
-	b.Read(p.Payload)
-}
-
-//Copy creates a new PublishPacket with the same topic and payload
-//but an empty fixed header, useful for when you want to deliver
-//a message with different properties such as Qos but the same
-//content
-func (p *PublishPacket) Copy() *PublishPacket {
-	newP := NewControlPacket(Publish).(*PublishPacket)
-	newP.TopicName = p.TopicName
-	newP.Payload = p.Payload
-
-	return newP
-}
-
-//Details returns a Details struct containing the Qos and
-//MessageID of this ControlPacket
-func (p *PublishPacket) Details() Details {
-	return Details{Qos: p.Qos, MessageID: p.MessageID}
-}
-
-//UUID returns the unique ID assigned to the ControlPacket when
-//it was originally received. Note: this is not related to the
-//MessageID field for MQTT packets
-func (p *PublishPacket) UUID() uuid.UUID {
-	return p.uuid
-}
diff --git a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/packets/pubrec.go b/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/packets/pubrec.go
deleted file mode 100644
index b83914bc9..000000000
--- a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/packets/pubrec.go
+++ /dev/null
@@ -1,50 +0,0 @@
-package packets
-
-import (
-	"fmt"
-	"github.com/pborman/uuid"
-	"io"
-)
-
-//PubrecPacket is an internal representation of the fields of the
-//Pubrec MQTT packet
-type PubrecPacket struct {
-	FixedHeader
-	MessageID uint16
-	uuid      uuid.UUID
-}
-
-func (pr *PubrecPacket) String() string {
-	str := fmt.Sprintf("%s\n", pr.FixedHeader)
-	str += fmt.Sprintf("MessageID: %d", pr.MessageID)
-	return str
-}
-
-func (pr *PubrecPacket) Write(w io.Writer) error {
-	var err error
-	pr.FixedHeader.RemainingLength = 2
-	packet := pr.FixedHeader.pack()
-	packet.Write(encodeUint16(pr.MessageID))
-	_, err = packet.WriteTo(w)
-
-	return err
-}
-
-//Unpack decodes the details of a ControlPacket after the fixed
-//header has been read
-func (pr *PubrecPacket) Unpack(b io.Reader) {
-	pr.MessageID = decodeUint16(b)
-}
-
-//Details returns a Details struct containing the Qos and
-//MessageID of this ControlPacket
-func (pr *PubrecPacket) Details() Details {
-	return Details{Qos: pr.Qos, MessageID: pr.MessageID}
-}
-
-//UUID returns the unique ID assigned to the ControlPacket when
-//it was originally received. Note: this is not related to the
-//MessageID field for MQTT packets
-func (pr *PubrecPacket) UUID() uuid.UUID {
-	return pr.uuid
-}
diff --git a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/packets/pubrel.go b/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/packets/pubrel.go
deleted file mode 100644
index 14bfffdda..000000000
--- a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/packets/pubrel.go
+++ /dev/null
@@ -1,50 +0,0 @@
-package packets
-
-import (
-	"fmt"
-	"github.com/pborman/uuid"
-	"io"
-)
-
-//PubrelPacket is an internal representation of the fields of the
-//Pubrel MQTT packet
-type PubrelPacket struct {
-	FixedHeader
-	MessageID uint16
-	uuid      uuid.UUID
-}
-
-func (pr *PubrelPacket) String() string {
-	str := fmt.Sprintf("%s\n", pr.FixedHeader)
-	str += fmt.Sprintf("MessageID: %d", pr.MessageID)
-	return str
-}
-
-func (pr *PubrelPacket) Write(w io.Writer) error {
-	var err error
-	pr.FixedHeader.RemainingLength = 2
-	packet := pr.FixedHeader.pack()
-	packet.Write(encodeUint16(pr.MessageID))
-	_, err = packet.WriteTo(w)
-
-	return err
-}
-
-//Unpack decodes the details of a ControlPacket after the fixed
-//header has been read
-func (pr *PubrelPacket) Unpack(b io.Reader) {
-	pr.MessageID = decodeUint16(b)
-}
-
-//Details returns a Details struct containing the Qos and
-//MessageID of this ControlPacket
-func (pr *PubrelPacket) Details() Details {
-	return Details{Qos: pr.Qos, MessageID: pr.MessageID}
-}
-
-//UUID returns the unique ID assigned to the ControlPacket when
-//it was originally received. Note: this is not related to the
-//MessageID field for MQTT packets
-func (pr *PubrelPacket) UUID() uuid.UUID {
-	return pr.uuid
-}
diff --git a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/packets/suback.go b/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/packets/suback.go
deleted file mode 100644
index 0bd3b665d..000000000
--- a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/packets/suback.go
+++ /dev/null
@@ -1,58 +0,0 @@
-package packets
-
-import (
-	"bytes"
-	"fmt"
-	"github.com/pborman/uuid"
-	"io"
-)
-
-//SubackPacket is an internal representation of the fields of the
-//Suback MQTT packet
-type SubackPacket struct {
-	FixedHeader
-	MessageID   uint16
-	GrantedQoss []byte
-	uuid        uuid.UUID
-}
-
-func (sa *SubackPacket) String() string {
-	str := fmt.Sprintf("%s\n", sa.FixedHeader)
-	str += fmt.Sprintf("MessageID: %d", sa.MessageID)
-	return str
-}
-
-func (sa *SubackPacket) Write(w io.Writer) error {
-	var body bytes.Buffer
-	var err error
-	body.Write(encodeUint16(sa.MessageID))
-	body.Write(sa.GrantedQoss)
-	sa.FixedHeader.RemainingLength = body.Len()
-	packet := sa.FixedHeader.pack()
-	packet.Write(body.Bytes())
-	_, err = packet.WriteTo(w)
-
-	return err
-}
-
-//Unpack decodes the details of a ControlPacket after the fixed
-//header has been read
-func (sa *SubackPacket) Unpack(b io.Reader) {
-	var qosBuffer bytes.Buffer
-	sa.MessageID = decodeUint16(b)
-	qosBuffer.ReadFrom(b)
-	sa.GrantedQoss = qosBuffer.Bytes()
-}
-
-//Details returns a Details struct containing the Qos and
-//MessageID of this ControlPacket
-func (sa *SubackPacket) Details() Details {
-	return Details{Qos: 0, MessageID: sa.MessageID}
-}
-
-//UUID returns the unique ID assigned to the ControlPacket when
-//it was originally received. Note: this is not related to the
-//MessageID field for MQTT packets
-func (sa *SubackPacket) UUID() uuid.UUID {
-	return sa.uuid
-}
diff --git a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/packets/subscribe.go b/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/packets/subscribe.go
deleted file mode 100644
index 0aff19aac..000000000
--- a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/packets/subscribe.go
+++ /dev/null
@@ -1,68 +0,0 @@
-package packets
-
-import (
-	"bytes"
-	"fmt"
-	"github.com/pborman/uuid"
-	"io"
-)
-
-//SubscribePacket is an internal representation of the fields of the
-//Subscribe MQTT packet
-type SubscribePacket struct {
-	FixedHeader
-	MessageID uint16
-	Topics    []string
-	Qoss      []byte
-	uuid      uuid.UUID
-}
-
-func (s *SubscribePacket) String() string {
-	str := fmt.Sprintf("%s\n", s.FixedHeader)
-	str += fmt.Sprintf("MessageID: %d topics: %s", s.MessageID, s.Topics)
-	return str
-}
-
-func (s *SubscribePacket) Write(w io.Writer) error {
-	var body bytes.Buffer
-	var err error
-
-	body.Write(encodeUint16(s.MessageID))
-	for i, topic := range s.Topics {
-		body.Write(encodeString(topic))
-		body.WriteByte(s.Qoss[i])
-	}
-	s.FixedHeader.RemainingLength = body.Len()
-	packet := s.FixedHeader.pack()
-	packet.Write(body.Bytes())
-	_, err = packet.WriteTo(w)
-
-	return err
-}
-
-//Unpack decodes the details of a ControlPacket after the fixed
-//header has been read
-func (s *SubscribePacket) Unpack(b io.Reader) {
-	s.MessageID = decodeUint16(b)
-	payloadLength := s.FixedHeader.RemainingLength - 2
-	for payloadLength > 0 {
-		topic := decodeString(b)
-		s.Topics = append(s.Topics, topic)
-		qos := decodeByte(b)
-		s.Qoss = append(s.Qoss, qos)
-		payloadLength -= 2 + len(topic) + 1 //2 bytes of string length, plus string, plus 1 byte for Qos
-	}
-}
-
-//Details returns a Details struct containing the Qos and
-//MessageID of this ControlPacket
-func (s *SubscribePacket) Details() Details {
-	return Details{Qos: 1, MessageID: s.MessageID}
-}
-
-//UUID returns the unique ID assigned to the ControlPacket when
-//it was originally received. Note: this is not related to the
-//MessageID field for MQTT packets
-func (s *SubscribePacket) UUID() uuid.UUID {
-	return s.uuid
-}
diff --git a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/packets/unsuback.go b/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/packets/unsuback.go
deleted file mode 100644
index ef67734f2..000000000
--- a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/packets/unsuback.go
+++ /dev/null
@@ -1,50 +0,0 @@
-package packets
-
-import (
-	"fmt"
-	"github.com/pborman/uuid"
-	"io"
-)
-
-//UnsubackPacket is an internal representation of the fields of the
-//Unsuback MQTT packet
-type UnsubackPacket struct {
-	FixedHeader
-	MessageID uint16
-	uuid      uuid.UUID
-}
-
-func (ua *UnsubackPacket) String() string {
-	str := fmt.Sprintf("%s\n", ua.FixedHeader)
-	str += fmt.Sprintf("MessageID: %d", ua.MessageID)
-	return str
-}
-
-func (ua *UnsubackPacket) Write(w io.Writer) error {
-	var err error
-	ua.FixedHeader.RemainingLength = 2
-	packet := ua.FixedHeader.pack()
-	packet.Write(encodeUint16(ua.MessageID))
-	_, err = packet.WriteTo(w)
-
-	return err
-}
-
-//Unpack decodes the details of a ControlPacket after the fixed
-//header has been read
-func (ua *UnsubackPacket) Unpack(b io.Reader) {
-	ua.MessageID = decodeUint16(b)
-}
-
-//Details returns a Details struct containing the Qos and
-//MessageID of this ControlPacket
-func (ua *UnsubackPacket) Details() Details {
-	return Details{Qos: 0, MessageID: ua.MessageID}
-}
-
-//UUID returns the unique ID assigned to the ControlPacket when
-//it was originally received. Note: this is not related to the
-//MessageID field for MQTT packets
-func (ua *UnsubackPacket) UUID() uuid.UUID {
-	return ua.uuid
-}
diff --git a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/packets/unsubscribe.go b/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/packets/unsubscribe.go
deleted file mode 100644
index d7ee03cfc..000000000
--- a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/packets/unsubscribe.go
+++ /dev/null
@@ -1,61 +0,0 @@
-package packets
-
-import (
-	"bytes"
-	"fmt"
-	"github.com/pborman/uuid"
-	"io"
-)
-
-//UnsubscribePacket is an internal representation of the fields of the
-//Unsubscribe MQTT packet
-type UnsubscribePacket struct {
-	FixedHeader
-	MessageID uint16
-	Topics    []string
-	uuid      uuid.UUID
-}
-
-func (u *UnsubscribePacket) String() string {
-	str := fmt.Sprintf("%s\n", u.FixedHeader)
-	str += fmt.Sprintf("MessageID: %d", u.MessageID)
-	return str
-}
-
-func (u *UnsubscribePacket) Write(w io.Writer) error {
-	var body bytes.Buffer
-	var err error
-	body.Write(encodeUint16(u.MessageID))
-	for _, topic := range u.Topics {
-		body.Write(encodeString(topic))
-	}
-	u.FixedHeader.RemainingLength = body.Len()
-	packet := u.FixedHeader.pack()
-	packet.Write(body.Bytes())
-	_, err = packet.WriteTo(w)
-
-	return err
-}
-
-//Unpack decodes the details of a ControlPacket after the fixed
-//header has been read
-func (u *UnsubscribePacket) Unpack(b io.Reader) {
-	u.MessageID = decodeUint16(b)
-	var topic string
-	for topic = decodeString(b); topic != ""; topic = decodeString(b) {
-		u.Topics = append(u.Topics, topic)
-	}
-}
-
-//Details returns a Details struct containing the Qos and
-//MessageID of this ControlPacket
-func (u *UnsubscribePacket) Details() Details {
-	return Details{Qos: 1, MessageID: u.MessageID}
-}
-
-//UUID returns the unique ID assigned to the ControlPacket when
-//it was originally received. Note: this is not related to the
-//MessageID field for MQTT packets
-func (u *UnsubscribePacket) UUID() uuid.UUID {
-	return u.uuid
-}
diff --git a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/ping.go b/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/ping.go
deleted file mode 100644
index 1ccd1ec89..000000000
--- a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/ping.go
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (c) 2013 IBM Corp.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Seth Hoenig
- *    Allan Stockdill-Mander
- *    Mike Robertson
- */
-
-package mqtt
-
-import (
-	"errors"
-	"git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/packets"
-	"sync"
-	"time"
-)
-
-type lastcontact struct {
-	sync.Mutex
-	lasttime time.Time
-}
-
-func (l *lastcontact) update() {
-	l.Lock()
-	defer l.Unlock()
-	l.lasttime = time.Now()
-
-}
-
-func (l *lastcontact) get() time.Time {
-	l.Lock()
-	defer l.Unlock()
-	return l.lasttime
-}
-
-func keepalive(c *Client) {
-	DEBUG.Println(PNG, "keepalive starting")
-	c.pingOutstanding = false
-
-	for {
-		select {
-		case <-c.stop:
-			DEBUG.Println(PNG, "keepalive stopped")
-			c.workers.Done()
-			return
-		default:
-			last := uint(time.Since(c.lastContact.get()).Seconds())
-			//DEBUG.Printf("%s last contact: %d (timeout: %d)", PNG, last, uint(c.options.KeepAlive.Seconds()))
-			if last > uint(c.options.KeepAlive.Seconds()) {
-				if !c.pingOutstanding {
-					DEBUG.Println(PNG, "keepalive sending ping")
-					ping := packets.NewControlPacket(packets.Pingreq).(*packets.PingreqPacket)
-					//We don't want to wait behind large messages being sent, the Write call
-					//will block until it it able to send the packet.
-					ping.Write(c.conn)
-					c.pingOutstanding = true
-				} else {
-					CRITICAL.Println(PNG, "pingresp not received, disconnecting")
-					c.workers.Done()
-					c.internalConnLost(errors.New("pingresp not received, disconnecting"))
-					return
-				}
-			}
-			time.Sleep(1 * time.Second)
-		}
-	}
-}
diff --git a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/router.go b/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/router.go
deleted file mode 100644
index 8e8172cb5..000000000
--- a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/router.go
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- * Copyright (c) 2013 IBM Corp.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Seth Hoenig
- *    Allan Stockdill-Mander
- *    Mike Robertson
- */
-
-package mqtt
-
-import (
-	"container/list"
-	"git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/packets"
-	"strings"
-	"sync"
-)
-
-// route is a type which associates MQTT Topic strings with a
-// callback to be executed upon the arrival of a message associated
-// with a subscription to that topic.
-type route struct {
-	topic    string
-	callback MessageHandler
-}
-
-// match takes a slice of strings which represent the route being tested having been split on '/'
-// separators, and a slice of strings representing the topic string in the published message, similarly
-// split.
-// The function determines if the topic string matches the route according to the MQTT topic rules
-// and returns a boolean of the outcome
-func match(route []string, topic []string) bool {
-	if len(route) == 0 {
-		if len(topic) == 0 {
-			return true
-		}
-		return false
-	}
-
-	if len(topic) == 0 {
-		if route[0] == "#" {
-			return true
-		}
-		return false
-	}
-
-	if route[0] == "#" {
-		return true
-	}
-
-	if (route[0] == "+") || (route[0] == topic[0]) {
-		return match(route[1:], topic[1:])
-	}
-
-	return false
-}
-
-func routeIncludesTopic(route, topic string) bool {
-	return match(strings.Split(route, "/"), strings.Split(topic, "/"))
-}
-
-// match takes the topic string of the published message and does a basic compare to the
-// string of the current Route, if they match it returns true
-func (r *route) match(topic string) bool {
-	return r.topic == topic || routeIncludesTopic(r.topic, topic)
-}
-
-type router struct {
-	sync.RWMutex
-	routes         *list.List
-	defaultHandler MessageHandler
-	messages       chan *packets.PublishPacket
-	stop           chan bool
-}
-
-// newRouter returns a new instance of a Router and channel which can be used to tell the Router
-// to stop
-func newRouter() (*router, chan bool) {
-	router := &router{routes: list.New(), messages: make(chan *packets.PublishPacket), stop: make(chan bool)}
-	stop := router.stop
-	return router, stop
-}
-
-// addRoute takes a topic string and MessageHandler callback. It looks in the current list of
-// routes to see if there is already a matching Route. If there is it replaces the current
-// callback with the new one. If not it add a new entry to the list of Routes.
-func (r *router) addRoute(topic string, callback MessageHandler) {
-	r.Lock()
-	defer r.Unlock()
-	for e := r.routes.Front(); e != nil; e = e.Next() {
-		if e.Value.(*route).match(topic) {
-			r := e.Value.(*route)
-			r.callback = callback
-			return
-		}
-	}
-	r.routes.PushBack(&route{topic: topic, callback: callback})
-}
-
-// deleteRoute takes a route string, looks for a matching Route in the list of Routes. If
-// found it removes the Route from the list.
-func (r *router) deleteRoute(topic string) {
-	r.Lock()
-	defer r.Unlock()
-	for e := r.routes.Front(); e != nil; e = e.Next() {
-		if e.Value.(*route).match(topic) {
-			r.routes.Remove(e)
-			return
-		}
-	}
-}
-
-// setDefaultHandler assigns a default callback that will be called if no matching Route
-// is found for an incoming Publish.
-func (r *router) setDefaultHandler(handler MessageHandler) {
-	r.defaultHandler = handler
-}
-
-// matchAndDispatch takes a channel of Message pointers as input and starts a go routine that
-// takes messages off the channel, matches them against the internal route list and calls the
-// associated callback (or the defaultHandler, if one exists and no other route matched). If
-// anything is sent down the stop channel the function will end.
-func (r *router) matchAndDispatch(messages <-chan *packets.PublishPacket, order bool, client *Client) {
-	go func() {
-		for {
-			select {
-			case message := <-messages:
-				sent := false
-				r.RLock()
-				for e := r.routes.Front(); e != nil; e = e.Next() {
-					if e.Value.(*route).match(message.TopicName) {
-						if order {
-							r.RUnlock()
-							e.Value.(*route).callback(client, messageFromPublish(message))
-							r.RLock()
-						} else {
-							go e.Value.(*route).callback(client, messageFromPublish(message))
-						}
-						sent = true
-					}
-				}
-				r.RUnlock()
-				if !sent && r.defaultHandler != nil {
-					if order {
-						r.RLock()
-						r.defaultHandler(client, messageFromPublish(message))
-						r.RUnlock()
-					} else {
-						go r.defaultHandler(client, messageFromPublish(message))
-					}
-				}
-			case <-r.stop:
-				return
-			}
-		}
-	}()
-}
diff --git a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/samples/bug-ping.go b/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/samples/bug-ping.go
deleted file mode 100644
index 4e1f3065b..000000000
--- a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/samples/bug-ping.go
+++ /dev/null
@@ -1,18 +0,0 @@
-package main
-
-import (
-	"time"
-
-	MQTT "git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git"
-)
-
-func main() {
-	opts := MQTT.NewClientOptions().AddBroker("tcp://localhost:1883")
-	c := MQTT.NewClient(opts)
-	if token := c.Connect(); token.Wait() && token.Error() != nil {
-		panic(token.Error())
-	}
-	for {
-		time.Sleep(1 * time.Second)
-	}
-}
diff --git a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/samples/build.sh b/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/samples/build.sh
deleted file mode 100644
index 11c5a6bbd..000000000
--- a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/samples/build.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-go clean
-
-for file in *.go
-do
-    echo -n "Compiling $file ..."
-    go build "$file"
-    echo " done."
-done
diff --git a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/samples/close_bug.go b/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/samples/close_bug.go
deleted file mode 100644
index 8fa0035df..000000000
--- a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/samples/close_bug.go
+++ /dev/null
@@ -1,23 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"time"
-
-	MQTT "git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git"
-)
-
-func main() {
-	opts := MQTT.NewClientOptions().AddBroker("tcp://localhost:1883")
-	opts.SetCleanSession(true)
-
-	c := MQTT.NewClient(opts)
-	if token := c.Connect(); token.Wait() && token.Error() != nil {
-		panic(token.Error())
-	}
-	fmt.Println("plz mosquitto goes down now")
-	time.Sleep(5 * time.Second)
-
-	c.Disconnect(200)
-	time.Sleep(5 * time.Second)
-}
diff --git a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/samples/custom_store.go b/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/samples/custom_store.go
deleted file mode 100644
index 19c2a28b6..000000000
--- a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/samples/custom_store.go
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Copyright (c) 2013 IBM Corp.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Seth Hoenig
- *    Allan Stockdill-Mander
- *    Mike Robertson
- */
-
-// This demonstrates how to implement your own Store interface and provide
-// it to the go-mqtt client.
-
-package main
-
-import (
-	"fmt"
-	"time"
-
-	MQTT "git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git"
-	"git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/packets"
-)
-
-// This NoOpStore type implements the go-mqtt/Store interface, which
-// allows it to be used by the go-mqtt client library. However, it is
-// highly recommended that you do not use this NoOpStore in production,
-// because it will NOT provide any sort of guaruntee of message delivery.
-type NoOpStore struct {
-	// Contain nothing
-}
-
-func (store *NoOpStore) Open() {
-	// Do nothing
-}
-
-func (store *NoOpStore) Put(string, packets.ControlPacket) {
-	// Do nothing
-}
-
-func (store *NoOpStore) Get(string) packets.ControlPacket {
-	// Do nothing
-	return nil
-}
-
-func (store *NoOpStore) Del(string) {
-	// Do nothing
-}
-
-func (store *NoOpStore) All() []string {
-	return nil
-}
-
-func (store *NoOpStore) Close() {
-	// Do Nothing
-}
-
-func (store *NoOpStore) Reset() {
-	// Do Nothing
-}
-
-func main() {
-	myNoOpStore := &NoOpStore{}
-
-	opts := MQTT.NewClientOptions()
-	opts.AddBroker("tcp://iot.eclipse.org:1883")
-	opts.SetClientID("custom-store")
-	opts.SetStore(myNoOpStore)
-
-	var callback MQTT.MessageHandler = func(client *MQTT.Client, msg MQTT.Message) {
-		fmt.Printf("TOPIC: %s\n", msg.Topic())
-		fmt.Printf("MSG: %s\n", msg.Payload())
-	}
-
-	c := MQTT.NewClient(opts)
-	if token := c.Connect(); token.Wait() && token.Error() != nil {
-		panic(token.Error())
-	}
-
-	c.Subscribe("/go-mqtt/sample", 0, callback)
-
-	for i := 0; i < 5; i++ {
-		text := fmt.Sprintf("this is msg #%d!", i)
-		token := c.Publish("/go-mqtt/sample", 0, false, text)
-		token.Wait()
-	}
-
-	for i := 1; i < 5; i++ {
-		time.Sleep(1 * time.Second)
-	}
-
-	c.Disconnect(250)
-}
diff --git a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/samples/mosquitto.conf b/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/samples/mosquitto.conf
deleted file mode 100644
index 4c54bc201..000000000
--- a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/samples/mosquitto.conf
+++ /dev/null
@@ -1,745 +0,0 @@
-# Config file for mosquitto
-#
-# See mosquitto.conf(5) for more information.
-#
-# Default values are shown, uncomment to change.
-#
-# Use the # character to indicate a comment, but only if it is the 
-# very first character on the line.
-
-# =================================================================
-# General configuration
-# =================================================================
-
-# Time in seconds to wait before resending an outgoing QoS=1 or 
-# QoS=2 message.
-#retry_interval 20
-
-# Time in seconds between updates of the $SYS tree.
-# Set to 0 to disable the publishing of the $SYS tree.
-#sys_interval 10
-
-# Time in seconds between cleaning the internal message store of 
-# unreferenced messages. Lower values will result in lower memory 
-# usage but more processor time, higher values will have the 
-# opposite effect.
-# Setting a value of 0 means the unreferenced messages will be 
-# disposed of as quickly as possible.
-#store_clean_interval 10
-
-# Write process id to a file. Default is a blank string which means 
-# a pid file shouldn't be written.
-# This should be set to /var/run/mosquitto.pid if mosquitto is
-# being run automatically on boot with an init script and 
-# start-stop-daemon or similar.
-#pid_file
-
-# When run as root, drop privileges to this user and its primary 
-# group.
-# Leave blank to stay as root, but this is not recommended.
-# If run as a non-root user, this setting has no effect.
-# Note that on Windows this has no effect and so mosquitto should 
-# be started by the user you wish it to run as.
-#user mosquitto
-
-# The maximum number of QoS 1 and 2 messages currently inflight per 
-# client.
-# This includes messages that are partway through handshakes and 
-# those that are being retried. Defaults to 20. Set to 0 for no 
-# maximum. Setting to 1 will guarantee in-order delivery of QoS 1 
-# and 2 messages.
-#max_inflight_messages 20
-
-# The maximum number of QoS 1 and 2 messages to hold in a queue 
-# above those that are currently in-flight.  Defaults to 100. Set 
-# to 0 for no maximum (not recommended).
-# See also queue_qos0_messages.
-#max_queued_messages 100
-
-# Set to true to queue messages with QoS 0 when a persistent client is
-# disconnected. These messages are included in the limit imposed by
-# max_queued_messages.
-# Defaults to false.
-# This is a non-standard option for the MQTT v3.1 spec but is allowed in
-# v3.1.1.
-#queue_qos0_messages false
-
-# This option sets the maximum publish payload size that the broker will allow.
-# Received messages that exceed this size will not be accepted by the broker.
-# The default value is 0, which means that all valid MQTT messages are
-# accepted. MQTT imposes a maximum payload size of 268435455 bytes. 
-#message_size_limit 0
-
-# This option controls whether a client is allowed to connect with a zero
-# length client id or not. This option only affects clients using MQTT v3.1.1
-# and later. If set to false, clients connecting with a zero length client id
-# are disconnected. If set to true, clients will be allocated a client id by
-# the broker. This means it is only useful for clients with clean session set
-# to true.
-#allow_zero_length_clientid true
-
-# If allow_zero_length_clientid is true, this option allows you to set a prefix
-# to automatically generated client ids to aid visibility in logs.
-#auto_id_prefix
-
-# This option allows persistent clients (those with clean session set to false)
-# to be removed if they do not reconnect within a certain time frame.
-#
-# This is a non-standard option in MQTT V3.1 but allowed in MQTT v3.1.1.
-#
-# Badly designed clients may set clean session to false whilst using a randomly
-# generated client id. This leads to persistent clients that will never
-# reconnect. This option allows these clients to be removed.
-#
-# The expiration period should be an integer followed by one of d w m y for
-# day, week, month and year respectively. For example
-#
-# persistent_client_expiration 2m
-# persistent_client_expiration 14d
-# persistent_client_expiration 1y
-#
-# The default if not set is to never expire persistent clients.
-#persistent_client_expiration
-
-# If a client is subscribed to multiple subscriptions that overlap, e.g. foo/#
-# and foo/+/baz , then MQTT expects that when the broker receives a message on
-# a topic that matches both subscriptions, such as foo/bar/baz, then the client
-# should only receive the message once.
-# Mosquitto keeps track of which clients a message has been sent to in order to
-# meet this requirement. The allow_duplicate_messages option allows this
-# behaviour to be disabled, which may be useful if you have a large number of
-# clients subscribed to the same set of topics and are very concerned about
-# minimising memory usage.
-# It can be safely set to true if you know in advance that your clients will
-# never have overlapping subscriptions, otherwise your clients must be able to
-# correctly deal with duplicate messages even when then have QoS=2.
-#allow_duplicate_messages false
-
-# The MQTT specification requires that the QoS of a message delivered to a
-# subscriber is never upgraded to match the QoS of the subscription. Enabling
-# this option changes this behaviour. If upgrade_outgoing_qos is set true,
-# messages sent to a subscriber will always match the QoS of its subscription.
-# This is a non-standard option explicitly disallowed by the spec.
-#upgrade_outgoing_qos false
-
-# =================================================================
-# Default listener
-# =================================================================
-
-# IP address/hostname to bind the default listener to. If not
-# given, the default listener will not be bound to a specific 
-# address and so will be accessible to all network interfaces.
-# bind_address ip-address/host name
-#bind_address
-
-# Port to use for the default listener.
-#port 1883
-
-# The maximum number of client connections to allow. This is 
-# a per listener setting.
-# Default is -1, which means unlimited connections.
-# Note that other process limits mean that unlimited connections 
-# are not really possible. Typically the default maximum number of 
-# connections possible is around 1024.
-#max_connections -1
-
-# -----------------------------------------------------------------
-# Certificate based SSL/TLS support
-# -----------------------------------------------------------------
-# The following options can be used to enable SSL/TLS support for 
-# this listener. Note that the recommended port for MQTT over TLS
-# is 8883, but this must be set manually.
-#
-# See also the mosquitto-tls man page.
-
-# At least one of cafile or capath must be defined. They both 
-# define methods of accessing the PEM encoded Certificate 
-# Authority certificates that have signed your server certificate 
-# and that you wish to trust.
-# cafile defines the path to a file containing the CA certificates.
-# capath defines a directory that will be searched for files
-# containing the CA certificates. For capath to work correctly, the
-# certificate files must have ".crt" as the file ending and you must run
-# "c_rehash <path to capath>" each time you add/remove a certificate.
-#cafile
-#capath
-
-# Path to the PEM encoded server certificate.
-#certfile
-
-# Path to the PEM encoded keyfile.
-#keyfile
-
-# This option defines the version of the TLS protocol to use for this listener.
-# The default value will always be the highest version that is available for
-# the version of openssl that the broker was compiled against. For openssl >=
-# 1.0.1 the valid values are tlsv1.2 tlsv1.1 and tlsv1. For openssl < 1.0.1 the
-# valid values are tlsv1.
-#tls_version
-
-# By default a TLS enabled listener will operate in a similar fashion to a
-# https enabled web server, in that the server has a certificate signed by a CA
-# and the client will verify that it is a trusted certificate. The overall aim
-# is encryption of the network traffic. By setting require_certificate to true,
-# the client must provide a valid certificate in order for the network
-# connection to proceed. This allows access to the broker to be controlled
-# outside of the mechanisms provided by MQTT.
-#require_certificate false
-
-# If require_certificate is true, you may set use_identity_as_username to true
-# to use the CN value from the client certificate as a username. If this is
-# true, the password_file option will not be used for this listener.
-#use_identity_as_username false
-
-# If you have require_certificate set to true, you can create a certificate
-# revocation list file to revoke access to particular client certificates. If
-# you have done this, use crlfile to point to the PEM encoded revocation file.
-#crlfile
-
-# If you wish to control which encryption ciphers are used, use the ciphers
-# option. The list of available ciphers can be optained using the "openssl
-# ciphers" command and should be provided in the same format as the output of
-# that command.
-# If unset defaults to DEFAULT:!aNULL:!eNULL:!LOW:!EXPORT:!SSLv2:@STRENGTH
-#ciphers DEFAULT:!aNULL:!eNULL:!LOW:!EXPORT:!SSLv2:@STRENGTH
-
-# -----------------------------------------------------------------
-# Pre-shared-key based SSL/TLS support
-# -----------------------------------------------------------------
-# The following options can be used to enable PSK based SSL/TLS support for
-# this listener. Note that the recommended port for MQTT over TLS is 8883, but
-# this must be set manually.
-#
-# See also the mosquitto-tls man page and the "Certificate based SSL/TLS
-# support" section. Only one of certificate or PSK encryption support can be
-# enabled for any listener.
-
-# The psk_hint option enables pre-shared-key support for this listener and also
-# acts as an identifier for this listener. The hint is sent to clients and may
-# be used locally to aid authentication. The hint is a free form string that
-# doesn't have much meaning in itself, so feel free to be creative.
-# If this option is provided, see psk_file to define the pre-shared keys to be
-# used or create a security plugin to handle them.
-#psk_hint
-
-# Set use_identity_as_username to have the psk identity sent by the client used
-# as its username. Authentication will be carried out using the PSK rather than
-# the MQTT username/password and so password_file will not be used for this
-# listener.
-#use_identity_as_username false
-
-# When using PSK, the encryption ciphers used will be chosen from the list of
-# available PSK ciphers. If you want to control which ciphers are available,
-# use the "ciphers" option.  The list of available ciphers can be optained
-# using the "openssl ciphers" command and should be provided in the same format
-# as the output of that command.
-#ciphers
-
-# =================================================================
-# Extra listeners
-# =================================================================
-
-# Listen on a port/ip address combination. By using this variable 
-# multiple times, mosquitto can listen on more than one port. If 
-# this variable is used and neither bind_address nor port given, 
-# then the default listener will not be started.
-# The port number to listen on must be given. Optionally, an ip 
-# address or host name may be supplied as a second argument. In 
-# this case, mosquitto will attempt to bind the listener to that 
-# address and so restrict access to the associated network and 
-# interface. By default, mosquitto will listen on all interfaces.
-# listener port-number [ip address/host name]
-#listener
-
-# The maximum number of client connections to allow. This is 
-# a per listener setting.
-# Default is -1, which means unlimited connections.
-# Note that other process limits mean that unlimited connections 
-# are not really possible. Typically the default maximum number of 
-# connections possible is around 1024.
-#max_connections -1
-
-# The listener can be restricted to operating within a topic hierarchy using
-# the mount_point option. This is achieved be prefixing the mount_point string
-# to all topics for any clients connected to this listener. This prefixing only
-# happens internally to the broker; the client will not see the prefix.
-#mount_point
-
-# -----------------------------------------------------------------
-# Certificate based SSL/TLS support
-# -----------------------------------------------------------------
-# The following options can be used to enable certificate based SSL/TLS support
-# for this listener. Note that the recommended port for MQTT over TLS is 8883,
-# but this must be set manually.
-#
-# See also the mosquitto-tls man page and the "Pre-shared-key based SSL/TLS
-# support" section. Only one of certificate or PSK encryption support can be
-# enabled for any listener.
-
-# At least one of cafile or capath must be defined to enable certificate based
-# TLS encryption. They both define methods of accessing the PEM encoded
-# Certificate Authority certificates that have signed your server certificate
-# and that you wish to trust.
-# cafile defines the path to a file containing the CA certificates.
-# capath defines a directory that will be searched for files
-# containing the CA certificates. For capath to work correctly, the
-# certificate files must have ".crt" as the file ending and you must run
-# "c_rehash <path to capath>" each time you add/remove a certificate.
-#cafile
-#capath
-
-# Path to the PEM encoded server certificate.
-#certfile
-
-# Path to the PEM encoded keyfile.
-#keyfile
-
-# By default an TLS enabled listener will operate in a similar fashion to a
-# https enabled web server, in that the server has a certificate signed by a CA
-# and the client will verify that it is a trusted certificate. The overall aim
-# is encryption of the network traffic. By setting require_certificate to true,
-# the client must provide a valid certificate in order for the network
-# connection to proceed. This allows access to the broker to be controlled
-# outside of the mechanisms provided by MQTT.
-#require_certificate false
-
-# If require_certificate is true, you may set use_identity_as_username to true
-# to use the CN value from the client certificate as a username. If this is
-# true, the password_file option will not be used for this listener.
-#use_identity_as_username false
-
-# If you have require_certificate set to true, you can create a certificate
-# revocation list file to revoke access to particular client certificates. If
-# you have done this, use crlfile to point to the PEM encoded revocation file.
-#crlfile
-
-# If you wish to control which encryption ciphers are used, use the ciphers
-# option. The list of available ciphers can be optained using the "openssl
-# ciphers" command and should be provided in the same format as the output of
-# that command.
-#ciphers
-
-# -----------------------------------------------------------------
-# Pre-shared-key based SSL/TLS support
-# -----------------------------------------------------------------
-# The following options can be used to enable PSK based SSL/TLS support for
-# this listener. Note that the recommended port for MQTT over TLS is 8883, but
-# this must be set manually.
-#
-# See also the mosquitto-tls man page and the "Certificate based SSL/TLS
-# support" section. Only one of certificate or PSK encryption support can be
-# enabled for any listener.
-
-# The psk_hint option enables pre-shared-key support for this listener and also
-# acts as an identifier for this listener. The hint is sent to clients and may
-# be used locally to aid authentication. The hint is a free form string that
-# doesn't have much meaning in itself, so feel free to be creative.
-# If this option is provided, see psk_file to define the pre-shared keys to be
-# used or create a security plugin to handle them.
-#psk_hint
-
-# Set use_identity_as_username to have the psk identity sent by the client used
-# as its username. Authentication will be carried out using the PSK rather than
-# the MQTT username/password and so password_file will not be used for this
-# listener.
-#use_identity_as_username false
-
-# When using PSK, the encryption ciphers used will be chosen from the list of
-# available PSK ciphers. If you want to control which ciphers are available,
-# use the "ciphers" option.  The list of available ciphers can be optained
-# using the "openssl ciphers" command and should be provided in the same format
-# as the output of that command.
-#ciphers
-
-# =================================================================
-# Persistence
-# =================================================================
-
-# If persistence is enabled, save the in-memory database to disk 
-# every autosave_interval seconds. If set to 0, the persistence 
-# database will only be written when mosquitto exits. See also
-# autosave_on_changes.
-# Note that writing of the persistence database can be forced by 
-# sending mosquitto a SIGUSR1 signal.
-#autosave_interval 1800
-
-# If true, mosquitto will count the number of subscription changes, retained
-# messages received and queued messages and if the total exceeds
-# autosave_interval then the in-memory database will be saved to disk.
-# If false, mosquitto will save the in-memory database to disk by treating
-# autosave_interval as a time in seconds.
-#autosave_on_changes false
-
-# Save persistent message data to disk (true/false).
-# This saves information about all messages, including 
-# subscriptions, currently in-flight messages and retained 
-# messages.
-# retained_persistence is a synonym for this option.
-#persistence false
-
-# The filename to use for the persistent database, not including 
-# the path.
-#persistence_file mosquitto.db
-
-# Location for persistent database. Must include trailing /
-# Default is an empty string (current directory).
-# Set to e.g. /var/lib/mosquitto/ if running as a proper service on Linux or
-# similar.
-#persistence_location
-
-# =================================================================
-# Logging
-# =================================================================
-
-# Places to log to. Use multiple log_dest lines for multiple 
-# logging destinations.
-# Possible destinations are: stdout stderr syslog topic file
-#
-# stdout and stderr log to the console on the named output.
-#
-# syslog uses the userspace syslog facility which usually ends up 
-# in /var/log/messages or similar.
-#
-# topic logs to the broker topic '$SYS/broker/log/<severity>', 
-# where severity is one of D, E, W, N, I, M which are debug, error, 
-# warning, notice, information and message. Message type severity is used by
-# the subscribe/unsubscribe log_types and publishes log messages to
-# $SYS/broker/log/M/susbcribe or $SYS/broker/log/M/unsubscribe.
-#
-# The file destination requires an additional parameter which is the file to be
-# logged to, e.g. "log_dest file /var/log/mosquitto.log". The file will be
-# closed and reopened when the broker receives a HUP signal. Only a single file
-# destination may be configured.
-#
-# Note that if the broker is running as a Windows service it will default to
-# "log_dest none" and neither stdout nor stderr logging is available.
-# Use "log_dest none" if you wish to disable logging.
-log_dest stdout
-
-# Types of messages to log. Use multiple log_type lines for logging
-# multiple types of messages.
-# Possible types are: debug, error, warning, notice, information, 
-# none, subscribe, unsubscribe, all.
-# Note that debug type messages are for decoding the incoming/outgoing
-# network packets. They are not logged in "topics".
-#log_type error
-#log_type warning
-#log_type notice
-log_type information
-
-# If set to true, client connection and disconnection messages will be included
-# in the log.
-#connection_messages true
-
-# If set to true, add a timestamp value to each log message.
-#log_timestamp true
-
-# =================================================================
-# Security
-# =================================================================
-
-# If set, only clients that have a matching prefix on their 
-# clientid will be allowed to connect to the broker. By default, 
-# all clients may connect.
-# For example, setting "secure-" here would mean a client "secure-
-# client" could connect but another with clientid "mqtt" couldn't.
-#clientid_prefixes
-
-# Boolean value that determines whether clients that connect 
-# without providing a username are allowed to connect. If set to 
-# false then a password file should be created (see the 
-# password_file option) to control authenticated client access. 
-# Defaults to true.
-#allow_anonymous true
-
-# In addition to the clientid_prefixes, allow_anonymous and TLS 
-# authentication options, username based authentication is also 
-# possible. The default support is described in "Default 
-# authentication and topic access control" below. The auth_plugin 
-# allows another authentication method to be used.
-# Specify the path to the loadable plugin and see the 
-# "Authentication and topic access plugin options" section below.
-#auth_plugin
-
-# -----------------------------------------------------------------
-# Default authentication and topic access control
-# -----------------------------------------------------------------
-
-# Control access to the broker using a password file. This file can be
-# generated using the mosquitto_passwd utility. If TLS support is not compiled
-# into mosquitto (it is recommended that TLS support should be included) then
-# plain text passwords are used, in which case the file should be a text file
-# with lines in the format:
-# username:password
-# The password (and colon) may be omitted if desired, although this 
-# offers very little in the way of security.
-# 
-# See the TLS client require_certificate and use_identity_as_username options
-# for alternative authentication options.
-password_file pwfile.example
-
-# Access may also be controlled using a pre-shared-key file. This requires
-# TLS-PSK support and a listener configured to use it. The file should be text
-# lines in the format:
-# identity:key
-# The key should be in hexadecimal format without a leading "0x".
-#psk_file
-
-# Control access to topics on the broker using an access control list
-# file. If this parameter is defined then only the topics listed will
-# have access.
-# If the first character of a line of the ACL file is a # it is treated as a
-# comment.
-# Topic access is added with lines of the format:
-#
-# topic [read|write] <topic>
-# 
-# The access type is controlled using "read" or "write". This parameter
-# is optional - if not given then the access is read/write.
-# <topic> can contain the + or # wildcards as in subscriptions.
-# 
-# The first set of topics are applied to anonymous clients, assuming
-# allow_anonymous is true. User specific topic ACLs are added after a 
-# user line as follows:
-#
-# user <username>
-#
-# The username referred to here is the same as in password_file. It is
-# not the clientid.
-#
-#
-# If is also possible to define ACLs based on pattern substitution within the
-# topic. The patterns available for substition are:
-#
-# %c to match the client id of the client
-# %u to match the username of the client
-#
-# The substitution pattern must be the only text for that level of hierarchy.
-#
-# The form is the same as for the topic keyword, but using pattern as the
-# keyword.
-# Pattern ACLs apply to all users even if the "user" keyword has previously
-# been given.
-#
-# If using bridges with usernames and ACLs, connection messages can be allowed
-# with the following pattern:
-# pattern write $SYS/broker/connection/%c/state
-#
-# pattern [read|write] <topic>
-#
-# Example:
-#
-# pattern write sensor/%u/data
-#
-#acl_file
-
-# -----------------------------------------------------------------
-# Authentication and topic access plugin options
-# -----------------------------------------------------------------
-
-# If the auth_plugin option above is used, define options to pass to the
-# plugin here as described by the plugin instructions. All options named
-# using the format auth_opt_* will be passed to the plugin, for example:
-#
-# auth_opt_db_host
-# auth_opt_db_port 
-# auth_opt_db_username
-# auth_opt_db_password
-
-
-# =================================================================
-# Bridges
-# =================================================================
-
-# A bridge is a way of connecting multiple MQTT brokers together.
-# Create a new bridge using the "connection" option as described below. Set
-# options for the bridges using the remaining parameters. You must specify the
-# address and at least one topic to subscribe to.
-# Each connection must have a unique name.
-# The address line may have multiple host address and ports specified. See
-# below in the round_robin description for more details on bridge behaviour if
-# multiple addresses are used.
-# The direction that the topic will be shared can be chosen by 
-# specifying out, in or both, where the default value is out. 
-# The QoS level of the bridged communication can be specified with the next
-# topic option. The default QoS level is 0, to change the QoS the topic
-# direction must also be given.
-# The local and remote prefix options allow a topic to be remapped when it is
-# bridged to/from the remote broker. This provides the ability to place a topic
-# tree in an appropriate location. 
-# For more details see the mosquitto.conf man page.
-# Multiple topics can be specified per connection, but be careful 
-# not to create any loops.
-# If you are using bridges with cleansession set to false (the default), then
-# you may get unexpected behaviour from incoming topics if you change what
-# topics you are subscribing to. This is because the remote broker keeps the
-# subscription for the old topic. If you have this problem, connect your bridge
-# with cleansession set to true, then reconnect with cleansession set to false
-# as normal.
-#connection <name>
-#address <host>[:<port>] [<host>[:<port>]]
-#topic <topic> [[[out | in | both] qos-level] local-prefix remote-prefix]
-
-# If the bridge has more than one address given in the address/addresses
-# configuration, the round_robin option defines the behaviour of the bridge on
-# a failure of the bridge connection. If round_robin is false, the default
-# value, then the first address is treated as the main bridge connection. If
-# the connection fails, the other secondary addresses will be attempted in
-# turn. Whilst connected to a secondary bridge, the bridge will periodically
-# attempt to reconnect to the main bridge until successful.
-# If round_robin is true, then all addresses are treated as equals. If a
-# connection fails, the next address will be tried and if successful will
-# remain connected until it fails
-#round_robin false
-
-# Set the client id for this bridge connection. If not defined, 
-# this defaults to 'name.hostname' where name is the connection 
-# name and hostname is the hostname of this computer.
-#clientid
-
-# Set the clean session variable for this bridge.
-# When set to true, when the bridge disconnects for any reason, all 
-# messages and subscriptions will be cleaned up on the remote 
-# broker. Note that with cleansession set to true, there may be a 
-# significant amount of retained messages sent when the bridge 
-# reconnects after losing its connection.
-# When set to false, the subscriptions and messages are kept on the 
-# remote broker, and delivered when the bridge reconnects.
-#cleansession false
-
-# If set to true, publish notification messages to the local and remote brokers
-# giving information about the state of the bridge connection. Retained
-# messages are published to the topic $SYS/broker/connection/<clientid>/state
-# unless the notification_topic option is used.
-# If the message is 1 then the connection is active, or 0 if the connection has
-# failed.
-#notifications true
-
-# Choose the topic on which notification messages for this bridge are
-# published. If not set, messages are published on the topic
-# $SYS/broker/connection/<clientid>/state
-#notification_topic 
-
-# Set the keepalive interval for this bridge connection, in 
-# seconds.
-#keepalive_interval 60
-
-# Set the start type of the bridge. This controls how the bridge starts and
-# can be one of three types: automatic, lazy and once. Note that RSMB provides
-# a fourth start type "manual" which isn't currently supported by mosquitto.
-#
-# "automatic" is the default start type and means that the bridge connection
-# will be started automatically when the broker starts and also restarted
-# after a short delay (30 seconds) if the connection fails.
-#
-# Bridges using the "lazy" start type will be started automatically when the
-# number of queued messages exceeds the number set with the "threshold"
-# parameter. It will be stopped automatically after the time set by the
-# "idle_timeout" parameter. Use this start type if you wish the connection to
-# only be active when it is needed.
-#
-# A bridge using the "once" start type will be started automatically when the
-# broker starts but will not be restarted if the connection fails.
-#start_type automatic
-
-# Set the amount of time a bridge using the automatic start type will wait
-# until attempting to reconnect.  Defaults to 30 seconds.
-#restart_timeout 30
-
-# Set the amount of time a bridge using the lazy start type must be idle before
-# it will be stopped. Defaults to 60 seconds.
-#idle_timeout 60
-
-# Set the number of messages that need to be queued for a bridge with lazy
-# start type to be restarted. Defaults to 10 messages.
-# Must be less than max_queued_messages.
-#threshold 10
-
-# If try_private is set to true, the bridge will attempt to indicate to the
-# remote broker that it is a bridge not an ordinary client. If successful, this
-# means that loop detection will be more effective and that retained messages
-# will be propagated correctly. Not all brokers support this feature so it may
-# be necessary to set try_private to false if your bridge does not connect
-# properly.
-#try_private true
-
-# Set the username to use when connecting to an MQTT v3.1 broker 
-# that requires authentication.
-#username
-
-# Set the password to use when connecting to an MQTT v3.1 broker 
-# that requires authentication. This option is only used if 
-# username is also set.
-#password
-
-# -----------------------------------------------------------------
-# Certificate based SSL/TLS support
-# -----------------------------------------------------------------
-# Either bridge_cafile or bridge_capath must be defined to enable TLS support
-# for this bridge.
-# bridge_cafile defines the path to a file containing the
-# Certificate Authority certificates that have signed the remote broker
-# certificate.
-# bridge_capath defines a directory that will be searched for files containing
-# the CA certificates. For bridge_capath to work correctly, the certificate
-# files must have ".crt" as the file ending and you must run "c_rehash <path to
-# capath>" each time you add/remove a certificate.
-#bridge_cafile
-#bridge_capath
-
-# Path to the PEM encoded client certificate, if required by the remote broker.
-#bridge_certfile
-
-# Path to the PEM encoded client private key, if required by the remote broker.
-#bridge_keyfile
-
-# When using certificate based encryption, bridge_insecure disables
-# verification of the server hostname in the server certificate. This can be
-# useful when testing initial server configurations, but makes it possible for
-# a malicious third party to impersonate your server through DNS spoofing, for
-# example. Use this option in testing only. If you need to resort to using this
-# option in a production environment, your setup is at fault and there is no
-# point using encryption.
-#bridge_insecure false
-
-# -----------------------------------------------------------------
-# PSK based SSL/TLS support
-# -----------------------------------------------------------------
-# Pre-shared-key encryption provides an alternative to certificate based
-# encryption. A bridge can be configured to use PSK with the bridge_identity
-# and bridge_psk options. These are the client PSK identity, and pre-shared-key
-# in hexadecimal format with no "0x". Only one of certificate and PSK based
-# encryption can be used on one
-# bridge at once.
-#bridge_identity
-#bridge_psk
-
-
-# =================================================================
-# External config files
-# =================================================================
-
-# External configuration files may be included by using the 
-# include_dir option. This defines a directory that will be searched
-# for config files. All files that end in '.conf' will be loaded as
-# a configuration file. It is best to have this as the last option
-# in the main file. This option will only be processed from the main
-# configuration file. The directory specified must not contain the 
-# main configuration file.
-#include_dir
-
-# =================================================================
-# Unsupported rsmb options - for the future
-# =================================================================
-
-#addresses
-#round_robin
-
-# =================================================================
-# rsmb options - unlikely to ever be supported
-# =================================================================
-
-#ffdc_output
-#max_log_entries
-#trace_level
-#trace_output
diff --git a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/samples/pwfile.example b/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/samples/pwfile.example
deleted file mode 100644
index 58b94c9aa..000000000
--- a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/samples/pwfile.example
+++ /dev/null
@@ -1,3 +0,0 @@
-roger:$6$clQ4Ocu312S0qWgl$Cv2wUxgEN73c6C6jlBkswqR4AkHsvDLWvtEXZZ8NpsBLgP1WAo/qA+WXcmEN/mjDNgdUwcxRAveqNMs2xUVQYA==
-sub_client:$6$U+qg0/32F0g2Fh+n$fBPSkq/rfNyEQ/TkEjRgwGTTVBpvNhKSyGShovH9KHewsvJ731tD5Zx26IHhR5RYCICt0L9qBW0/KK31UkCliw==
-pub_client:$6$vxQ89y+7WrsnL2yn$fSPMmEZn9TSrC8s/jaPmxJ9NijWpkP2e7bMJLz78JXR1vW2x8+T3FZ23byJA6xs5Mt+LeOybAHwcUv0OCl40rA==
diff --git a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/samples/routing.go b/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/samples/routing.go
deleted file mode 100644
index d95c6b59c..000000000
--- a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/samples/routing.go
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Copyright (c) 2013 IBM Corp.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Seth Hoenig
- *    Allan Stockdill-Mander
- *    Mike Robertson
- */
-
-/*----------------------------------------------------------------------
-This sample is designed to demonstrate the ability to set individual
-callbacks on a per-subscription basis. There are three handlers in use:
- brokerLoadHandler -        $SYS/broker/load/#
- brokerConnectionHandler -  $SYS/broker/connection/#
- brokerClientHandler -      $SYS/broker/clients/#
-The client will receive 100 messages total from those subscriptions,
-and then print the total number of messages received from each.
-It may take a few moments for the sample to complete running, as it
-must wait for messages to be published.
------------------------------------------------------------------------*/
-
-package main
-
-import (
-	"fmt"
-	"os"
-
-	MQTT "git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git"
-)
-
-var brokerLoad = make(chan bool)
-var brokerConnection = make(chan bool)
-var brokerClients = make(chan bool)
-
-func brokerLoadHandler(client *MQTT.Client, msg MQTT.Message) {
-	brokerLoad <- true
-	fmt.Printf("BrokerLoadHandler         ")
-	fmt.Printf("[%s]  ", msg.Topic())
-	fmt.Printf("%s\n", msg.Payload())
-}
-
-func brokerConnectionHandler(client *MQTT.Client, msg MQTT.Message) {
-	brokerConnection <- true
-	fmt.Printf("BrokerConnectionHandler   ")
-	fmt.Printf("[%s]  ", msg.Topic())
-	fmt.Printf("%s\n", msg.Payload())
-}
-
-func brokerClientsHandler(client *MQTT.Client, msg MQTT.Message) {
-	brokerClients <- true
-	fmt.Printf("BrokerClientsHandler      ")
-	fmt.Printf("[%s]  ", msg.Topic())
-	fmt.Printf("%s\n", msg.Payload())
-}
-
-func main() {
-	opts := MQTT.NewClientOptions().AddBroker("tcp://iot.eclipse.org:1883").SetClientID("router-sample")
-	opts.SetCleanSession(true)
-
-	c := MQTT.NewClient(opts)
-	if token := c.Connect(); token.Wait() && token.Error() != nil {
-		panic(token.Error())
-	}
-
-	if token := c.Subscribe("$SYS/broker/load/#", 0, brokerLoadHandler); token.Wait() && token.Error() != nil {
-		fmt.Println(token.Error())
-		os.Exit(1)
-	}
-
-	if token := c.Subscribe("$SYS/broker/connection/#", 0, brokerConnectionHandler); token.Wait() && token.Error() != nil {
-		fmt.Println(token.Error())
-		os.Exit(1)
-	}
-
-	if token := c.Subscribe("$SYS/broker/clients/#", 0, brokerClientsHandler); token.Wait() && token.Error() != nil {
-		fmt.Println(token.Error())
-		os.Exit(1)
-	}
-
-	loadCount := 0
-	connectionCount := 0
-	clientsCount := 0
-
-	for i := 0; i < 100; i++ {
-		select {
-		case <-brokerLoad:
-			loadCount++
-		case <-brokerConnection:
-			connectionCount++
-		case <-brokerClients:
-			clientsCount++
-		}
-	}
-
-	fmt.Printf("Received %3d Broker Load messages\n", loadCount)
-	fmt.Printf("Received %3d Broker Connection messages\n", connectionCount)
-	fmt.Printf("Received %3d Broker Clients messages\n", clientsCount)
-
-	c.Disconnect(250)
-}
diff --git a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/samples/sample.go b/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/samples/sample.go
deleted file mode 100644
index 3f89f8af2..000000000
--- a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/samples/sample.go
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * Copyright (c) 2013 IBM Corp.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Seth Hoenig
- *    Allan Stockdill-Mander
- *    Mike Robertson
- */
-
-package main
-
-import (
-	"flag"
-	"fmt"
-	"os"
-
-	MQTT "git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git"
-)
-
-/*
-Options:
- [-help]                      Display help
- [-a pub|sub]                 Action pub (publish) or sub (subscribe)
- [-m <message>]               Payload to send
- [-n <number>]                Number of messages to send or receive
- [-q 0|1|2]                   Quality of Service
- [-clean]                     CleanSession (true if -clean is present)
- [-id <clientid>]             CliendID
- [-user <user>]               User
- [-password <password>]       Password
- [-broker <uri>]              Broker URI
- [-topic <topic>]             Topic
- [-store <path>]              Store Directory
-
-*/
-
-func main() {
-	topic := flag.String("topic", "", "The topic name to/from which to publish/subscribe")
-	broker := flag.String("broker", "tcp://iot.eclipse.org:1883", "The broker URI. ex: tcp://10.10.1.1:1883")
-	password := flag.String("password", "", "The password (optional)")
-	user := flag.String("user", "", "The User (optional)")
-	id := flag.String("id", "testgoid", "The ClientID (optional)")
-	cleansess := flag.Bool("clean", false, "Set Clean Session (default false)")
-	qos := flag.Int("qos", 0, "The Quality of Service 0,1,2 (default 0)")
-	num := flag.Int("num", 1, "The number of messages to publish or subscribe (default 1)")
-	payload := flag.String("message", "", "The message text to publish (default empty)")
-	action := flag.String("action", "", "Action publish or subscribe (required)")
-	store := flag.String("store", ":memory:", "The Store Directory (default use memory store)")
-	flag.Parse()
-
-	if *action != "pub" && *action != "sub" {
-		fmt.Println("Invalid setting for -action, must be pub or sub")
-		return
-	}
-
-	if *topic == "" {
-		fmt.Println("Invalid setting for -topic, must not be empty")
-		return
-	}
-
-	fmt.Printf("Sample Info:\n")
-	fmt.Printf("\taction:    %s\n", *action)
-	fmt.Printf("\tbroker:    %s\n", *broker)
-	fmt.Printf("\tclientid:  %s\n", *id)
-	fmt.Printf("\tuser:      %s\n", *user)
-	fmt.Printf("\tpassword:  %s\n", *password)
-	fmt.Printf("\ttopic:     %s\n", *topic)
-	fmt.Printf("\tmessage:   %s\n", *payload)
-	fmt.Printf("\tqos:       %d\n", *qos)
-	fmt.Printf("\tcleansess: %v\n", *cleansess)
-	fmt.Printf("\tnum:       %d\n", *num)
-	fmt.Printf("\tstore:     %s\n", *store)
-
-	opts := MQTT.NewClientOptions()
-	opts.AddBroker(*broker)
-	opts.SetClientID(*id)
-	opts.SetUsername(*user)
-	opts.SetPassword(*password)
-	opts.SetCleanSession(*cleansess)
-	if *store != ":memory:" {
-		opts.SetStore(MQTT.NewFileStore(*store))
-	}
-
-	if *action == "pub" {
-		client := MQTT.NewClient(opts)
-		if token := client.Connect(); token.Wait() && token.Error() != nil {
-			panic(token.Error())
-		}
-		fmt.Println("Sample Publisher Started")
-		for i := 0; i < *num; i++ {
-			fmt.Println("---- doing publish ----")
-			token := client.Publish(*topic, byte(*qos), false, *payload)
-			token.Wait()
-		}
-
-		client.Disconnect(250)
-		fmt.Println("Sample Publisher Disconnected")
-	} else {
-		receiveCount := 0
-		choke := make(chan [2]string)
-
-		opts.SetDefaultPublishHandler(func(client *MQTT.Client, msg MQTT.Message) {
-			choke <- [2]string{msg.Topic(), string(msg.Payload())}
-		})
-
-		client := MQTT.NewClient(opts)
-		if token := client.Connect(); token.Wait() && token.Error() != nil {
-			panic(token.Error())
-		}
-
-		if token := client.Subscribe(*topic, byte(*qos), nil); token.Wait() && token.Error() != nil {
-			fmt.Println(token.Error())
-			os.Exit(1)
-		}
-
-		for receiveCount < *num {
-			incoming := <-choke
-			fmt.Printf("RECEIVED TOPIC: %s MESSAGE: %s\n", incoming[0], incoming[1])
-			receiveCount++
-		}
-
-		client.Disconnect(250)
-		fmt.Println("Sample Subscriber Disconnected")
-	}
-}
diff --git a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/samples/samplecerts/CAfile.pem b/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/samples/samplecerts/CAfile.pem
deleted file mode 100644
index 16c664a43..000000000
--- a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/samples/samplecerts/CAfile.pem
+++ /dev/null
@@ -1,150 +0,0 @@
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number: 1 (0x1)
-        Signature Algorithm: sha1WithRSAEncryption
-        Issuer: C=US, ST=Dummy, L=Dummy, O=Dummy, OU=Dummy, CN=Dummy CA
-        Validity
-            Not Before: Oct 21 19:24:23 2013 GMT
-            Not After : Sep 25 19:24:23 2018 GMT
-        Subject: C=US, ST=Dummy, L=Dummy, O=Dummy, OU=Dummy, CN=Dummy CA
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-                Public-Key: (2048 bit)
-                Modulus:
-                    00:c2:d1:d0:31:dc:93:c3:ad:88:0d:f8:93:fe:cc:
-                    aa:04:1d:85:aa:c3:bb:bd:87:04:f0:42:67:14:34:
-                    4a:56:94:2b:bf:d0:6b:72:30:38:39:35:20:8c:e3:
-                    7e:65:82:b0:7e:3e:1d:f1:18:82:b7:d6:19:59:43:
-                    ed:81:be:eb:51:44:fc:77:9e:37:ad:e1:a0:18:b9:
-                    4b:59:79:90:81:a4:e4:52:2f:fc:e2:ff:98:10:5e:
-                    d5:13:9a:16:62:1a:e0:cb:ab:1d:ae:da:d1:40:d4:
-                    97:b1:e6:e3:f1:97:2c:2a:52:73:ab:d0:a2:15:f3:
-                    1e:9a:b0:67:d0:62:67:4b:74:b0:bb:8f:ef:9e:32:
-                    6a:4c:27:4e:82:7c:16:66:ce:06:e9:a3:d9:36:4f:
-                    f4:3e:bc:80:00:93:c1:ca:31:cf:03:68:d4:e5:8b:
-                    38:45:b6:1b:35:b0:c0:e9:4a:62:75:83:01:aa:b9:
-                    c1:0b:c0:ee:97:c0:73:23:cd:34:ec:bb:3c:95:35:
-                    c8:2d:69:ff:86:d8:1f:c8:04:7e:18:de:62:c2:4b:
-                    37:c6:aa:8e:03:bf:2b:0d:97:20:2a:75:47:ec:98:
-                    29:3c:64:52:ef:91:8b:63:0f:6a:f8:c2:9d:08:6a:
-                    61:68:6f:64:9a:56:b2:0a:bc:7b:59:3d:7f:fd:ba:
-                    12:4b
-                Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            X509v3 Subject Key Identifier: 
-                5B:BB:3E:8E:2D:90:AD:AE:58:07:FF:53:00:18:98:FF:44:84:4C:BA
-            X509v3 Authority Key Identifier: 
-                keyid:5B:BB:3E:8E:2D:90:AD:AE:58:07:FF:53:00:18:98:FF:44:84:4C:BA
-
-            X509v3 Basic Constraints: 
-                CA:TRUE
-    Signature Algorithm: sha1WithRSAEncryption
-        3c:89:0b:bd:49:10:a6:1a:f6:2a:4b:5f:02:3d:ee:f3:19:4f:
-        c9:10:79:9c:01:ef:88:22:3d:03:5b:1a:14:46:b6:7f:9b:af:
-        a5:99:1a:d4:d4:9b:d6:6f:c1:fe:96:8f:9a:9e:47:42:b4:ee:
-        21:56:6a:c4:92:38:6c:81:cd:8e:31:43:86:7c:97:15:90:80:
-        d8:21:f0:46:be:2a:2f:f2:96:07:85:74:a8:fa:1b:78:8f:80:
-        c1:5e:bc:d9:06:c2:33:9e:8e:f9:08:dd:43:7b:6f:5a:22:67:
-        46:78:5d:fb:4a:4e:c2:c6:29:94:17:53:a6:c5:a9:d6:67:06:
-        4f:07:ef:da:5b:45:21:83:cb:31:b2:dc:dc:ac:13:19:98:3f:
-        98:5f:2c:b4:b4:da:d4:43:d7:a9:1a:6e:b6:cf:be:85:a8:80:
-        1f:8a:c1:95:8a:83:a4:af:d2:23:4a:b6:18:87:4e:28:31:36:
-        03:2c:bf:e4:9e:b6:75:fd:c4:68:ed:4d:d5:a8:fa:a5:81:13:
-        17:1c:43:67:02:1c:d0:e6:00:6e:8b:13:e6:60:1f:ba:40:78:
-        93:25:ca:59:5a:71:cc:58:d4:52:63:1d:b3:3c:ce:37:f1:89:
-        78:fc:13:fa:b3:ea:22:af:17:68:8a:a1:59:57:f5:1a:49:6e:
-        b9:f6:5f:b3
------BEGIN CERTIFICATE-----
-MIIDizCCAnOgAwIBAgIBATANBgkqhkiG9w0BAQUFADBgMQswCQYDVQQGEwJVUzEO
-MAwGA1UECAwFRHVtbXkxDjAMBgNVBAcMBUR1bW15MQ4wDAYDVQQKDAVEdW1teTEO
-MAwGA1UECwwFRHVtbXkxETAPBgNVBAMMCER1bW15IENBMB4XDTEzMTAyMTE5MjQy
-M1oXDTE4MDkyNTE5MjQyM1owYDELMAkGA1UEBhMCVVMxDjAMBgNVBAgMBUR1bW15
-MQ4wDAYDVQQHDAVEdW1teTEOMAwGA1UECgwFRHVtbXkxDjAMBgNVBAsMBUR1bW15
-MREwDwYDVQQDDAhEdW1teSBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBAMLR0DHck8OtiA34k/7MqgQdharDu72HBPBCZxQ0SlaUK7/Qa3IwODk1IIzj
-fmWCsH4+HfEYgrfWGVlD7YG+61FE/HeeN63hoBi5S1l5kIGk5FIv/OL/mBBe1ROa
-FmIa4MurHa7a0UDUl7Hm4/GXLCpSc6vQohXzHpqwZ9BiZ0t0sLuP754yakwnToJ8
-FmbOBumj2TZP9D68gACTwcoxzwNo1OWLOEW2GzWwwOlKYnWDAaq5wQvA7pfAcyPN
-NOy7PJU1yC1p/4bYH8gEfhjeYsJLN8aqjgO/Kw2XICp1R+yYKTxkUu+Ri2MPavjC
-nQhqYWhvZJpWsgq8e1k9f/26EksCAwEAAaNQME4wHQYDVR0OBBYEFFu7Po4tkK2u
-WAf/UwAYmP9EhEy6MB8GA1UdIwQYMBaAFFu7Po4tkK2uWAf/UwAYmP9EhEy6MAwG
-A1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBADyJC71JEKYa9ipLXwI97vMZ
-T8kQeZwB74giPQNbGhRGtn+br6WZGtTUm9Zvwf6Wj5qeR0K07iFWasSSOGyBzY4x
-Q4Z8lxWQgNgh8Ea+Ki/ylgeFdKj6G3iPgMFevNkGwjOejvkI3UN7b1oiZ0Z4XftK
-TsLGKZQXU6bFqdZnBk8H79pbRSGDyzGy3NysExmYP5hfLLS02tRD16kabrbPvoWo
-gB+KwZWKg6Sv0iNKthiHTigxNgMsv+SetnX9xGjtTdWo+qWBExccQ2cCHNDmAG6L
-E+ZgH7pAeJMlyllaccxY1FJjHbM8zjfxiXj8E/qz6iKvF2iKoVlX9RpJbrn2X7M=
------END CERTIFICATE-----
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number: 1 (0x1)
-        Signature Algorithm: sha1WithRSAEncryption
-        Issuer: C=US, ST=Dummy, L=Dummy, O=Dummy, OU=Dummy, CN=Dummy CA
-        Validity
-            Not Before: Oct 21 19:24:23 2013 GMT
-            Not After : Sep 25 19:24:23 2018 GMT
-        Subject: C=US, ST=Dummy, L=Dummy, O=Dummy, OU=Dummy, CN=Dummy Intermediate CA
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-                Public-Key: (2048 bit)
-                Modulus:
-                    00:cf:7d:92:07:a5:56:1b:6f:4c:f3:34:c2:12:c2:
-                    34:62:3b:69:aa:a6:0c:c6:70:5b:93:bc:dc:41:98:
-                    61:87:61:36:be:8c:08:dd:31:a9:33:76:d3:66:3e:
-                    77:60:1e:ed:9e:e1:e5:ef:bf:17:91:ac:0c:63:07:
-                    01:ab:30:67:bc:16:a6:2f:79:f0:61:8c:79:2d:3c:
-                    98:60:74:61:c4:5f:60:44:85:71:92:9d:cc:7b:14:
-                    39:74:aa:44:f9:9f:ae:f6:c7:8d:c3:01:47:53:24:
-                    ac:7b:a2:f6:c5:7d:65:37:40:0b:20:c8:d4:14:cd:
-                    f8:f4:57:ea:23:70:f4:e3:99:2b:1c:9a:67:37:ed:
-                    93:c7:a7:7c:86:90:f7:ae:fc:6f:4b:18:dc:d5:eb:
-                    f3:68:33:d6:78:14:d1:ca:a7:06:7d:75:34:f6:c0:
-                    d4:15:1b:21:2b:78:d9:76:24:a5:f0:c6:13:c8:1e:
-                    4a:c8:ca:77:34:4e:f8:fa:49:5f:6c:e1:66:a8:65:
-                    f0:8c:bc:44:20:03:ac:af:4a:61:a5:39:48:51:1b:
-                    cb:d8:22:29:60:27:47:42:fc:bf:6a:77:65:58:09:
-                    20:82:1c:d1:16:5e:5a:18:ea:99:61:8e:93:94:27:
-                    30:20:dd:44:03:50:43:b4:ec:a3:0f:ee:91:69:d7:
-                    b1:5b
-                Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            X509v3 Basic Constraints: 
-                CA:TRUE
-    Signature Algorithm: sha1WithRSAEncryption
-        39:a0:8d:2f:68:22:1d:4f:3e:db:f1:9b:29:20:77:23:f8:21:
-        34:17:84:00:88:a8:3e:a1:4d:84:94:90:96:02:e6:6a:b4:20:
-        51:a0:66:20:38:05:18:aa:2a:3e:9a:50:60:af:eb:4a:70:ac:
-        9b:59:30:d5:17:14:9c:b4:91:6a:1b:c3:45:8a:dd:cd:2f:c6:
-        c5:8c:fe:d0:76:20:63:a4:97:db:e3:2a:8e:c1:3d:c8:b6:06:
-        2d:49:7a:d9:8a:de:16:ea:5d:5f:fb:41:79:0d:8f:d2:23:00:
-        d9:b9:6f:93:45:bb:74:17:ea:6b:72:13:01:86:fe:8d:7e:8f:
-        27:71:76:a9:37:6d:6c:90:5a:3f:d9:6d:4d:6c:a4:64:7a:ea:
-        82:c9:87:ee:6a:d0:6e:30:05:7f:19:1d:19:31:a9:9a:ce:21:
-        84:da:47:c7:a0:66:12:e8:7e:57:69:5d:9c:24:e5:46:3c:bf:
-        37:f6:88:c3:b1:42:de:3b:81:ed:f5:ae:e2:23:9e:c2:89:a1:
-        e7:5c:1d:49:0f:ed:ae:55:60:0e:4e:4c:e9:8a:64:e6:ae:c5:
-        d1:99:a7:70:4c:7e:5d:53:ac:88:2c:0f:0b:21:94:1a:32:f9:
-        a1:cc:1e:67:98:6b:b6:e9:b1:b9:4b:46:02:b1:65:c9:49:83:
-        80:bd:b9:70
------BEGIN CERTIFICATE-----
-MIIDWDCCAkCgAwIBAgIBATANBgkqhkiG9w0BAQUFADBgMQswCQYDVQQGEwJVUzEO
-MAwGA1UECAwFRHVtbXkxDjAMBgNVBAcMBUR1bW15MQ4wDAYDVQQKDAVEdW1teTEO
-MAwGA1UECwwFRHVtbXkxETAPBgNVBAMMCER1bW15IENBMB4XDTEzMTAyMTE5MjQy
-M1oXDTE4MDkyNTE5MjQyM1owbTELMAkGA1UEBhMCVVMxDjAMBgNVBAgMBUR1bW15
-MQ4wDAYDVQQHDAVEdW1teTEOMAwGA1UECgwFRHVtbXkxDjAMBgNVBAsMBUR1bW15
-MR4wHAYDVQQDDBVEdW1teSBJbnRlcm1lZGlhdGUgQ0EwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQDPfZIHpVYbb0zzNMISwjRiO2mqpgzGcFuTvNxBmGGH
-YTa+jAjdMakzdtNmPndgHu2e4eXvvxeRrAxjBwGrMGe8FqYvefBhjHktPJhgdGHE
-X2BEhXGSncx7FDl0qkT5n672x43DAUdTJKx7ovbFfWU3QAsgyNQUzfj0V+ojcPTj
-mSscmmc37ZPHp3yGkPeu/G9LGNzV6/NoM9Z4FNHKpwZ9dTT2wNQVGyEreNl2JKXw
-xhPIHkrIync0Tvj6SV9s4WaoZfCMvEQgA6yvSmGlOUhRG8vYIilgJ0dC/L9qd2VY
-CSCCHNEWXloY6plhjpOUJzAg3UQDUEO07KMP7pFp17FbAgMBAAGjEDAOMAwGA1Ud
-EwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBADmgjS9oIh1PPtvxmykgdyP4ITQX
-hACIqD6hTYSUkJYC5mq0IFGgZiA4BRiqKj6aUGCv60pwrJtZMNUXFJy0kWobw0WK
-3c0vxsWM/tB2IGOkl9vjKo7BPci2Bi1JetmK3hbqXV/7QXkNj9IjANm5b5NFu3QX
-6mtyEwGG/o1+jydxdqk3bWyQWj/ZbU1spGR66oLJh+5q0G4wBX8ZHRkxqZrOIYTa
-R8egZhLofldpXZwk5UY8vzf2iMOxQt47ge31ruIjnsKJoedcHUkP7a5VYA5OTOmK
-ZOauxdGZp3BMfl1TrIgsDwshlBoy+aHMHmeYa7bpsblLRgKxZclJg4C9uXA=
------END CERTIFICATE-----
diff --git a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/samples/samplecerts/README b/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/samples/samplecerts/README
deleted file mode 100644
index aa7c97d70..000000000
--- a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/samples/samplecerts/README
+++ /dev/null
@@ -1,9 +0,0 @@
-Certificate structure:
-
-Root CA
- |
- |-> Intermediate CA
-      |
-      |-> Server
-      |
-      |-> Client
diff --git a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/samples/samplecerts/client-crt.pem b/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/samples/samplecerts/client-crt.pem
deleted file mode 100644
index 5069e08e8..000000000
--- a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/samples/samplecerts/client-crt.pem
+++ /dev/null
@@ -1,20 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDRzCCAi8CAQIwDQYJKoZIhvcNAQEFBQAwbTELMAkGA1UEBhMCVVMxDjAMBgNV
-BAgMBUR1bW15MQ4wDAYDVQQHDAVEdW1teTEOMAwGA1UECgwFRHVtbXkxDjAMBgNV
-BAsMBUR1bW15MR4wHAYDVQQDDBVEdW1teSBJbnRlcm1lZGlhdGUgQ0EwHhcNMTMx
-MDIxMTkyNDIzWhcNMTgwOTI1MTkyNDIzWjBmMQswCQYDVQQGEwJVUzEOMAwGA1UE
-CAwFRHVtbXkxDjAMBgNVBAcMBUR1bW15MQ4wDAYDVQQKDAVEdW1teTEOMAwGA1UE
-CwwFRHVtbXkxFzAVBgNVBAMMDkR1bW15IChjbGllbnQpMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEA4J/+eKqsjK0QS+cSDa5Fh4XM4THy812JkWMySA5r
-bFxHZ5ye36/IuwyRQ0Yn2DvhhsDR5K7yz8K+Yfp9A6WRBkyHK/sy/8vurQHeDH3y
-lLtHCLi5nfyt2fDxWOYwFrS1giGn2IxJIHBAWu4cBODCkqwqAp92+Lqp3Sn+D+Fb
-maHEU3LHua8OIJiSeAIHo/jPqfHFqZxK1bXhGCSQKvUZCaTftsqDtn+LZSElqj1y
-5/cnc7XGsTf8ml/+FDMX1aSAHf+pu+UAp9JqOXOM60A5JIpYu3Lsejp1RppyPJYP
-zC4nSN8R2LOdDChP2MB7f1/sXRGlLM/X3Vi4X+c6xQ85TQIDAQABMA0GCSqGSIb3
-DQEBBQUAA4IBAQAMWt9qMUOY5z1uyYcjUnconPHLM9MADCZI2sRbfdBOBHEnTVKv
-Y63SWnCt8TRJb01LKLIEys6pW1NUlxr6b+FwicNmycR0L8b63cmNXg2NmSZsnK9C
-fGT6BbbDdVPYjvmghpSd3soBGBLPsJvaFc6UL5tunm+hT7PxWjDxHZEiE18PTs05
-Vpp/ytILzhoXvJeFOWQHIdf4DLR5izGMNTKdQzgg1eBq2vKgjJIlEZ3j/AyHkJLE
-qFip1tyc0PRzgKYFLWttaZzakCLJOGuxtvYB+GrixVM7U23p5LQbLE0KX7fe2Gql
-xKMfSID5NUDNf1SuSrrGLD3gfnJEKVB8TVBk
------END CERTIFICATE-----
diff --git a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/samples/samplecerts/client-key.pem b/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/samples/samplecerts/client-key.pem
deleted file mode 100644
index 7665fb655..000000000
--- a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/samples/samplecerts/client-key.pem
+++ /dev/null
@@ -1,27 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEpAIBAAKCAQEA4J/+eKqsjK0QS+cSDa5Fh4XM4THy812JkWMySA5rbFxHZ5ye
-36/IuwyRQ0Yn2DvhhsDR5K7yz8K+Yfp9A6WRBkyHK/sy/8vurQHeDH3ylLtHCLi5
-nfyt2fDxWOYwFrS1giGn2IxJIHBAWu4cBODCkqwqAp92+Lqp3Sn+D+FbmaHEU3LH
-ua8OIJiSeAIHo/jPqfHFqZxK1bXhGCSQKvUZCaTftsqDtn+LZSElqj1y5/cnc7XG
-sTf8ml/+FDMX1aSAHf+pu+UAp9JqOXOM60A5JIpYu3Lsejp1RppyPJYPzC4nSN8R
-2LOdDChP2MB7f1/sXRGlLM/X3Vi4X+c6xQ85TQIDAQABAoIBABosCiZdHIW3lHKD
-leLqL0e/G0QR4dDhUSoTeMRUiceyaM91vD0r6iOBL1u7TOEw+PIOfWY7zCbQ9gXM
-fcxy+hbVy9ogBq0vQbv+v7SM6DrUJ06o11fFHSyLmlNVXr0GiS+EZF4i2lJhQd5W
-aAVZetJEJRDxK5eHiEswnV2UUGvx6VCpFILL0JVGxWY7oOPxiiBLl+cmfRZdTfGx
-46VzQvBu7N8hGpCIsljuVFP/DxR7c+2oyrtFaFSMZBMNI8fICgkb2QeLk/XUBXtn
-0bDttgmOP/BvnNAor7nIRoeer/7kbXc9jOsgXwnvDKPapltQddL+exycXzbIjLuY
-Z2SFsDECgYEA+2A4QGV0biqdICAoKCHCHCU/CrdDUQiQDHqRU6/nhka7MFPSl4Wy
-9oISRrYZhKIbSbaXwTW5ZcYq8Hpn/yGYIWlINP9sjprnOWPE7L74lac+PFWXNMUI
-jNJOJkLK1IeppByXAt5ekGBrG556bhzRCJsTjYsyUR/r/bMEF1FD8WMCgYEA5MHM
-hqmkDK5CbklVaPonNc251Lx+HSzzQ40WExC/PrCczRaZMKlhmyKZfWJCInQsUDln
-w6Lqa5UnwZV2HYAF30VZYQsq84ulNnx1/36BEZyIimfAL1WHvKeGWjGsZqniXxxb
-Os5wEMAvxk0SWVrR5v6YpBDv3t9+lLg/bzBOAY8CgYEAuZ0q7CH9/vroWrhj7n4+
-3pmCG1+HDWbNNumqNalFxBimT+EVN1058FvLMvtzjERG8f8pvzj0VPom6rr336Pm
-uYUMFFYmyoYHBpFs74Nz+s0rX1Gz/PsgfRstKYNYUeZ6lPunZi7clK8dZ591t6j/
-kOMxZOrLlKuFjieJdc5D5RECgYAVTzxXOwxOJhmIHoq3Sb5HU8/A0oJJA3vxyf3J
-buDx3Q/uRvGkR9MQ2YtE09dnUD0kiARzhASkWvOmI98p5lglsVcfJCQvJc4RIkz3
-rPgnBNbvVbTgc+4+E7j/Q+tUcPTmeUTCWKK13MFWjq1r53rwMr1TY0SFFXq8LeGy
-4OQTXwKBgQDCuPN3Q+EJusYy7TXt0WicY/xyu15s1216N7PmRKFr/WAn2JdAfjbD
-JKDwVqo0AQiEDAobJk0JMPs+ENK2d58GsybCK4QGAh6z5FGunb5T432YfnoXtL3J
-ZKVvkf7eowvokTIeiDf3XrCPajLDBpo88Xax+RH03US7XRdu/fVzMA==
------END RSA PRIVATE KEY-----
diff --git a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/samples/samplecerts/intermediateCA-crt.pem b/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/samples/samplecerts/intermediateCA-crt.pem
deleted file mode 100644
index 6b2658ae2..000000000
--- a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/samples/samplecerts/intermediateCA-crt.pem
+++ /dev/null
@@ -1,20 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDWDCCAkCgAwIBAgIBATANBgkqhkiG9w0BAQUFADBgMQswCQYDVQQGEwJVUzEO
-MAwGA1UECAwFRHVtbXkxDjAMBgNVBAcMBUR1bW15MQ4wDAYDVQQKDAVEdW1teTEO
-MAwGA1UECwwFRHVtbXkxETAPBgNVBAMMCER1bW15IENBMB4XDTEzMTAyMTE5MjQy
-M1oXDTE4MDkyNTE5MjQyM1owbTELMAkGA1UEBhMCVVMxDjAMBgNVBAgMBUR1bW15
-MQ4wDAYDVQQHDAVEdW1teTEOMAwGA1UECgwFRHVtbXkxDjAMBgNVBAsMBUR1bW15
-MR4wHAYDVQQDDBVEdW1teSBJbnRlcm1lZGlhdGUgQ0EwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQDPfZIHpVYbb0zzNMISwjRiO2mqpgzGcFuTvNxBmGGH
-YTa+jAjdMakzdtNmPndgHu2e4eXvvxeRrAxjBwGrMGe8FqYvefBhjHktPJhgdGHE
-X2BEhXGSncx7FDl0qkT5n672x43DAUdTJKx7ovbFfWU3QAsgyNQUzfj0V+ojcPTj
-mSscmmc37ZPHp3yGkPeu/G9LGNzV6/NoM9Z4FNHKpwZ9dTT2wNQVGyEreNl2JKXw
-xhPIHkrIync0Tvj6SV9s4WaoZfCMvEQgA6yvSmGlOUhRG8vYIilgJ0dC/L9qd2VY
-CSCCHNEWXloY6plhjpOUJzAg3UQDUEO07KMP7pFp17FbAgMBAAGjEDAOMAwGA1Ud
-EwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBADmgjS9oIh1PPtvxmykgdyP4ITQX
-hACIqD6hTYSUkJYC5mq0IFGgZiA4BRiqKj6aUGCv60pwrJtZMNUXFJy0kWobw0WK
-3c0vxsWM/tB2IGOkl9vjKo7BPci2Bi1JetmK3hbqXV/7QXkNj9IjANm5b5NFu3QX
-6mtyEwGG/o1+jydxdqk3bWyQWj/ZbU1spGR66oLJh+5q0G4wBX8ZHRkxqZrOIYTa
-R8egZhLofldpXZwk5UY8vzf2iMOxQt47ge31ruIjnsKJoedcHUkP7a5VYA5OTOmK
-ZOauxdGZp3BMfl1TrIgsDwshlBoy+aHMHmeYa7bpsblLRgKxZclJg4C9uXA=
------END CERTIFICATE-----
diff --git a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/samples/samplecerts/intermediateCA-key.pem b/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/samples/samplecerts/intermediateCA-key.pem
deleted file mode 100644
index 747736097..000000000
--- a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/samples/samplecerts/intermediateCA-key.pem
+++ /dev/null
@@ -1,27 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEogIBAAKCAQEAz32SB6VWG29M8zTCEsI0YjtpqqYMxnBbk7zcQZhhh2E2vowI
-3TGpM3bTZj53YB7tnuHl778XkawMYwcBqzBnvBamL3nwYYx5LTyYYHRhxF9gRIVx
-kp3MexQ5dKpE+Z+u9seNwwFHUySse6L2xX1lN0ALIMjUFM349FfqI3D045krHJpn
-N+2Tx6d8hpD3rvxvSxjc1evzaDPWeBTRyqcGfXU09sDUFRshK3jZdiSl8MYTyB5K
-yMp3NE74+klfbOFmqGXwjLxEIAOsr0phpTlIURvL2CIpYCdHQvy/andlWAkgghzR
-Fl5aGOqZYY6TlCcwIN1EA1BDtOyjD+6RadexWwIDAQABAoIBAEs6OsS85DBENUEE
-QszsTnPDGLd/Rqh3uiwhUDYUGmAsFd4WBWy1AaSgE1tBkKRv8jUlr+kxfkkZeNA6
-jRdVEHc4Ov6Blm63sIN/Mbve1keNUOjm/NtsjOOe3In45dMfWx8sELC/+O0jIcod
-tpy5rwXOGXrEdWgpmXZ1nXVGEfOmQH3eGEPkqbY1I4YlAoXD0mc5fNQQrn7qrogH
-M5USCnC44yIIF0Yube2Fg0Cem41vzIvENAlZC273gyW+pQwez0uma2LaCWmkEz1N
-sESrNSQ4yeQnDQYlgX2w3RRpqql4GDzAdISL2WJcNhW6KJ72B0SQ1ny/TmQgZePG
-Ojv1T0ECgYEA9CXqKyXBSPF+Wdc/fNagrIi6tcNkLAN2/p5J3Z6TtbZGjItoMlDX
-c+hwHobcI3GZLMlxlBx7ePc7cKgaMDXrl8BZZjFoyEV9OHOLicfNkLFmBIZ14gtX
-bGZYDuCcal46r7IKRjT8lcYWCoLJnI9vLEII7Q7P/eBgcntw3+h/ziECgYEA2ZAa
-bp9d0xBaOXq/E341guxNG49R09/DeZ/2CEM+V1pMD8OVH9cvxrBdDLUmAnrqeGTh
-Djoi1UEbOVAV6/dXbTQHrla+HF4Uq+t9tV+mt68TEa54PQ/ERt5ih3nZGBiqZ6rX
-SGeyZmIXMLIZEs2dIbJ2DmLcZj6Tjxkd/PxPt/sCgYBGczZaEv/uK3k5NWplfI1K
-m/28e1BJfwp0OHq6D4sx8RH0djmv4zH4iUbpGCMnuxznFo3Gnl1mr3igbnF4HecI
-mAF0AqfoulyC0JygOl5v9TCp957Ghl1Is1OPn3KjIuOuVSKv1ZRZJ5qul8TTf3Qm
-AjwPI6oS6Q8LmeEdSzqt4QKBgB5MglHboe5t/ZK5tHibgApOrGJlMEkohYmfrFz0
-OG9j5OnhHBiGGGI8V4kYhUWdJqBDtFAN6qH2Yjs2Gwd0t9k+gL9X1zwOIiTbM/OZ
-cZdtK2Ov/5DJbFVOTTx+zKwda0Xqtfagcmjtyjr+4p0Kw5JYzzYrsHQQzO4F2nZM
-ETIXAoGADskTzhgpPrC5/qfuLY4gBUtCfYIb8kaKN90AT8A/14lBrT4lSnmsEvKP
-tRDmFjnc/ogDlHa5SRDijtT6UoyQPuauAt6DYrJ8G6qKJqiMwJcuLV1XFks7z1J8
-VzB8kso1pPAtcvVXBPklsjvZ10NdQOCqm4N3EVp69agbB1oco4I=
------END RSA PRIVATE KEY-----
diff --git a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/samples/samplecerts/mosquitto.org.crt b/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/samples/samplecerts/mosquitto.org.crt
deleted file mode 100644
index b8535e887..000000000
--- a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/samples/samplecerts/mosquitto.org.crt
+++ /dev/null
@@ -1,18 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIC8DCCAlmgAwIBAgIJAOD63PlXjJi8MA0GCSqGSIb3DQEBBQUAMIGQMQswCQYD
-VQQGEwJHQjEXMBUGA1UECAwOVW5pdGVkIEtpbmdkb20xDjAMBgNVBAcMBURlcmJ5
-MRIwEAYDVQQKDAlNb3NxdWl0dG8xCzAJBgNVBAsMAkNBMRYwFAYDVQQDDA1tb3Nx
-dWl0dG8ub3JnMR8wHQYJKoZIhvcNAQkBFhByb2dlckBhdGNob28ub3JnMB4XDTEy
-MDYyOTIyMTE1OVoXDTIyMDYyNzIyMTE1OVowgZAxCzAJBgNVBAYTAkdCMRcwFQYD
-VQQIDA5Vbml0ZWQgS2luZ2RvbTEOMAwGA1UEBwwFRGVyYnkxEjAQBgNVBAoMCU1v
-c3F1aXR0bzELMAkGA1UECwwCQ0ExFjAUBgNVBAMMDW1vc3F1aXR0by5vcmcxHzAd
-BgkqhkiG9w0BCQEWEHJvZ2VyQGF0Y2hvby5vcmcwgZ8wDQYJKoZIhvcNAQEBBQAD
-gY0AMIGJAoGBAMYkLmX7SqOT/jJCZoQ1NWdCrr/pq47m3xxyXcI+FLEmwbE3R9vM
-rE6sRbP2S89pfrCt7iuITXPKycpUcIU0mtcT1OqxGBV2lb6RaOT2gC5pxyGaFJ+h
-A+GIbdYKO3JprPxSBoRponZJvDGEZuM3N7p3S/lRoi7G5wG5mvUmaE5RAgMBAAGj
-UDBOMB0GA1UdDgQWBBTad2QneVztIPQzRRGj6ZHKqJTv5jAfBgNVHSMEGDAWgBTa
-d2QneVztIPQzRRGj6ZHKqJTv5jAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUA
-A4GBAAqw1rK4NlRUCUBLhEFUQasjP7xfFqlVbE2cRy0Rs4o3KS0JwzQVBwG85xge
-REyPOFdGdhBY2P1FNRy0MDr6xr+D2ZOwxs63dG1nnAnWZg7qwoLgpZ4fESPD3PkA
-1ZgKJc2zbSQ9fCPxt2W3mdVav66c6fsb7els2W2Iz7gERJSX
------END CERTIFICATE-----
diff --git a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/samples/samplecerts/rootCA-crt.pem b/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/samples/samplecerts/rootCA-crt.pem
deleted file mode 100644
index 1ddb0d494..000000000
--- a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/samples/samplecerts/rootCA-crt.pem
+++ /dev/null
@@ -1,21 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDizCCAnOgAwIBAgIBATANBgkqhkiG9w0BAQUFADBgMQswCQYDVQQGEwJVUzEO
-MAwGA1UECAwFRHVtbXkxDjAMBgNVBAcMBUR1bW15MQ4wDAYDVQQKDAVEdW1teTEO
-MAwGA1UECwwFRHVtbXkxETAPBgNVBAMMCER1bW15IENBMB4XDTEzMTAyMTE5MjQy
-M1oXDTE4MDkyNTE5MjQyM1owYDELMAkGA1UEBhMCVVMxDjAMBgNVBAgMBUR1bW15
-MQ4wDAYDVQQHDAVEdW1teTEOMAwGA1UECgwFRHVtbXkxDjAMBgNVBAsMBUR1bW15
-MREwDwYDVQQDDAhEdW1teSBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBAMLR0DHck8OtiA34k/7MqgQdharDu72HBPBCZxQ0SlaUK7/Qa3IwODk1IIzj
-fmWCsH4+HfEYgrfWGVlD7YG+61FE/HeeN63hoBi5S1l5kIGk5FIv/OL/mBBe1ROa
-FmIa4MurHa7a0UDUl7Hm4/GXLCpSc6vQohXzHpqwZ9BiZ0t0sLuP754yakwnToJ8
-FmbOBumj2TZP9D68gACTwcoxzwNo1OWLOEW2GzWwwOlKYnWDAaq5wQvA7pfAcyPN
-NOy7PJU1yC1p/4bYH8gEfhjeYsJLN8aqjgO/Kw2XICp1R+yYKTxkUu+Ri2MPavjC
-nQhqYWhvZJpWsgq8e1k9f/26EksCAwEAAaNQME4wHQYDVR0OBBYEFFu7Po4tkK2u
-WAf/UwAYmP9EhEy6MB8GA1UdIwQYMBaAFFu7Po4tkK2uWAf/UwAYmP9EhEy6MAwG
-A1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBADyJC71JEKYa9ipLXwI97vMZ
-T8kQeZwB74giPQNbGhRGtn+br6WZGtTUm9Zvwf6Wj5qeR0K07iFWasSSOGyBzY4x
-Q4Z8lxWQgNgh8Ea+Ki/ylgeFdKj6G3iPgMFevNkGwjOejvkI3UN7b1oiZ0Z4XftK
-TsLGKZQXU6bFqdZnBk8H79pbRSGDyzGy3NysExmYP5hfLLS02tRD16kabrbPvoWo
-gB+KwZWKg6Sv0iNKthiHTigxNgMsv+SetnX9xGjtTdWo+qWBExccQ2cCHNDmAG6L
-E+ZgH7pAeJMlyllaccxY1FJjHbM8zjfxiXj8E/qz6iKvF2iKoVlX9RpJbrn2X7M=
------END CERTIFICATE-----
diff --git a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/samples/samplecerts/rootCA-key.pem b/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/samples/samplecerts/rootCA-key.pem
deleted file mode 100644
index 278287687..000000000
--- a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/samples/samplecerts/rootCA-key.pem
+++ /dev/null
@@ -1,27 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEowIBAAKCAQEAwtHQMdyTw62IDfiT/syqBB2FqsO7vYcE8EJnFDRKVpQrv9Br
-cjA4OTUgjON+ZYKwfj4d8RiCt9YZWUPtgb7rUUT8d543reGgGLlLWXmQgaTkUi/8
-4v+YEF7VE5oWYhrgy6sdrtrRQNSXsebj8ZcsKlJzq9CiFfMemrBn0GJnS3Swu4/v
-njJqTCdOgnwWZs4G6aPZNk/0PryAAJPByjHPA2jU5Ys4RbYbNbDA6UpidYMBqrnB
-C8Dul8BzI8007Ls8lTXILWn/htgfyAR+GN5iwks3xqqOA78rDZcgKnVH7JgpPGRS
-75GLYw9q+MKdCGphaG9kmlayCrx7WT1//boSSwIDAQABAoIBAGphOzge5Cjzdtl6
-JQX7J9M7c6O9YaSqN44iFDs6GmWQXxtMaX9eyTSjx/RmvLwdUtZ8gMkHw0kzBYBy
-0RwJ7mDgNKP0px6xl0Qo2fYvpTLFoU8nmQUy4AwAXIVpnFNRrfJIq9qw7ZZi/7pL
-A6kGDT3G7Bajw/4MVWfOb8GgGhte1ZhZgXFEZNjGkhwi3Na1/6slOQIfnkkhco0X
-ru1Cw82nXNPHqu6K+pbHP9ucYdUNZWRh+yQS3p92lr5tB3/IL/lD0Cl3+xP8JFl+
-5NMSISOKGb3ld0rzrJd1ncgLgv/XlHu8DqvcFs9QwXbaUlG0U/0GrorGYqFaZYaH
-R1rkZjECgYEA9mAarVAeL7IOeEIg28f/qyp//5+pMzRpVhnI+xscHB5QUO9WH+uE
-nOXwcGvcRME134H4o/0j75aMhVs7sGfMOQ+enAwOxRC5h4MCClDSWysWftU8Ihhf
-Sm6eZ0kYLZNqXt/TxTs124NiF1Bb5pekzEr9fTj//vP4meuAQ/D0JoUCgYEAym4f
-BCm5tLwYYxZM4tko0g9BHxy4aAPfyshuLed1JjkK4JCFp368GBoknj5rUNewTun2
-1zkQF9b5Mi3k5qWkboP5rpp7DuG3PJdWypV6b/btUeqcyG1gteQwTAwebfqeM0vH
-QvpuAoRMtEcSBQBl2s9zgmObXUpDlLwuIlL+to8CgYEAyJBtxx8Mo9k4jE+Q/jnu
-+QFtF8R68jM9eRkeksR7+qv2yBw+KVgKKcvKE0rLErGS0LO2nJELexQ8qqcdjTrC
-dsUvYmsybtxxnE5bD9jBlfQaqP+fp0Xd9PLeQsivRRLXqgpeFBZifqOS69XAKpTS
-VHjLqPAI/hzQCUU8spJpvx0CgYAePgt2NMGgxcUi8I72CRl3IH5LJqBKMeH6Sq1j
-QEQZPMZqPE0rc9yoASfdWFfyEPcvIvcUulq0JRK/s2mSJ8cEF8Vyl3OxCnm0nKuD
-woczOQHFjjZ0HxsmsXuhsOHO7nU6FqUjVYSf7aIEAOYpRyDwarPIFBd+/XxROTfv
-OtUA8wKBgAOiGXRxycb4rAtJBDqPAgdAAwNgvQHyVgn32ArWtgu8ermuZW5h1y45
-hULFvCbLSCpo+I7QhRhw4y2DoB1DgIw04BeFUIcE+az7HH3euAyCLQ0caaA8Xk/6
-bpPfUMe1SNi51f345QlOPvvwGllTC6DeBhZ730k7VNB32dOCV3kE
------END RSA PRIVATE KEY-----
diff --git a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/samples/samplecerts/server-crt.pem b/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/samples/samplecerts/server-crt.pem
deleted file mode 100644
index f3de3caa2..000000000
--- a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/samples/samplecerts/server-crt.pem
+++ /dev/null
@@ -1,21 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDYTCCAkmgAwIBAgIBATANBgkqhkiG9w0BAQUFADBtMQswCQYDVQQGEwJVUzEO
-MAwGA1UECAwFRHVtbXkxDjAMBgNVBAcMBUR1bW15MQ4wDAYDVQQKDAVEdW1teTEO
-MAwGA1UECwwFRHVtbXkxHjAcBgNVBAMMFUR1bW15IEludGVybWVkaWF0ZSBDQTAe
-Fw0xMzEwMjExOTI0MjNaFw0xODA5MjUxOTI0MjNaMGYxCzAJBgNVBAYTAlVTMQ4w
-DAYDVQQIDAVEdW1teTEOMAwGA1UEBwwFRHVtbXkxDjAMBgNVBAoMBUR1bW15MQ4w
-DAYDVQQLDAVEdW1teTEXMBUGA1UEAwwORHVtbXkgKHNlcnZlcikwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQC0fQCRUWXt+i7JMR55Zuo6wBRxG7RnPutN
-2L7J/18io52vxjm8AZDiC0JFkCHh72ZzvbgVA+e+WxAIYfioRis4JWw4jK8v5m8q
-cZzS0GJNTMROPiZQi7A81tAbrV00XN7d5PsmIJ2Bf4XbJWMy31CsmoFloeRMd7bR
-LxwDIb0qqRawhKsWdfZB/c9wGKmHlei50B7PXk+koKnVdsLwXxtCZDvc/3fNRHEK
-lZs4m0N05G38FdrnczPm/0pie87nK9rnklL7u1sYOukOznnOtW5h7+A4M+DxzME0
-HRU6k4d+6QvukxBlsE93gHhwRsejIuDGlqD+DRxk2PdmmgsmPH59AgMBAAGjEzAR
-MA8GA1UdEQQIMAaHBAoKBOQwDQYJKoZIhvcNAQEFBQADggEBAJ3bKs2b4cAJWTZj
-69dMEfYZKcQIXs7euwtKlP7H8m5c+X5KmZPi1Puq4Z0gtvLu/z7J9UjZjG0CoylV
-q15Zp5svryJ7XzcsZs7rwyo1JtngW1z54wr9MezqIOF2w12dTwEAINFsW7TxAsH7
-bfqkzZjuCbbsww5q4eHuZp0yaMHc3hOGaUot27OTlxlIMhv7VBBqWAj0jmvAfTKf
-la0SiL/Mc8rD8D5C0SXGcCL6li/kqtinAxzhokuyyPf+hQX35kcZxEPu6WxtYVLv
-hMzrokOZP2FrGbCnhaNT8gw4Aa0RXV1JgonRWYSbkeaCzvr2bJ0OuJiDdwdRKvOo
-raKLlfY=
------END CERTIFICATE-----
diff --git a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/samples/samplecerts/server-key.pem b/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/samples/samplecerts/server-key.pem
deleted file mode 100644
index 951ad0efa..000000000
--- a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/samples/samplecerts/server-key.pem
+++ /dev/null
@@ -1,27 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEowIBAAKCAQEAtH0AkVFl7fouyTEeeWbqOsAUcRu0Zz7rTdi+yf9fIqOdr8Y5
-vAGQ4gtCRZAh4e9mc724FQPnvlsQCGH4qEYrOCVsOIyvL+ZvKnGc0tBiTUzETj4m
-UIuwPNbQG61dNFze3eT7JiCdgX+F2yVjMt9QrJqBZaHkTHe20S8cAyG9KqkWsISr
-FnX2Qf3PcBiph5XoudAez15PpKCp1XbC8F8bQmQ73P93zURxCpWbOJtDdORt/BXa
-53Mz5v9KYnvO5yva55JS+7tbGDrpDs55zrVuYe/gODPg8czBNB0VOpOHfukL7pMQ
-ZbBPd4B4cEbHoyLgxpag/g0cZNj3ZpoLJjx+fQIDAQABAoIBAG0UfxtUTn4dDdma
-TgihIj6Ph8s0Kzua0yshK215YU3WBJ8O9iWh7KYwl8Ti7xdVUF3y8yYATjbFYlMu
-otFQVx5/v4ANxnL0mYrVTyo5tq9xDdMbzJwxUDn0uaGAjSvwVOFWWlMYsxhoscVY
-OzOrs14dosaBqTBtyZdzGULrSSBWPCBlucRcvTV/eZwgYrYJ3bG66ZTfdc930KPj
-nfkWrsAWmPz8irHoWQ2OX+ZJTprVYRYIZXqpFn3zuwmhpJkZUVULMMk6LFBKDmBT
-F2+b4h49P+oNJ+6CRoOERHYq2k1MmYBcu1z8lMjdfRGUDdK4vS9pcqhBXJJg1vU9
-APRtfiECgYEA6Y3LqQJLkUI0w6g/9T+XyzUoi0aUfH6PT81XnGYqJxTBHinZvgML
-mF3qtZ0bHGwEoAsyhSgDkeCawE/E7Phd+B6aku2QMVm8GHygZg0Pbao4cxXv+CF3
-i1Lo7n3zY0kTVrjsvDRsDDESmRK4Ea48fJwOfUEtfG6VDtwmZAe8chcCgYEAxdWd
-sWcc45ARi2vY6yb5Ysgt/g0z26KyQydF+GMWIz1FDfUxXJ/axdCovd3VIHDvItJE
-n9LjFiobkyOKX99ou1foWwsmhn11duVrF7hsVrE0nsbd4RX3sTbqXa9x3GN/ujFr
-0xHUTmiXt3Qyn/076jBiLGnbtzSxJ/IZIEI9VIsCgYEAketHnTaT5BOLR9ss6ptq
-yUlTJYFZcFbaTy+qV0r1dyleZuwa4L6iVfYHmKSptZ4/XYbhb5RKdq/vv8uW679Z
-ZpYoWTgX6N15yYrD5D6wrwG09yJzpYGzYNbSNX93u0aC0KIFNqlCAHQAfKbXXiSQ
-IgKWgudf9ehZNMmTKtgygs0CgYAoTV9Fr7Lj7QqV84+KQDNX2137PmdNHDTil1Ka
-ylzNKwMxV70JmIsx91MY8uMjK76bwmg2gvi+IC/j5r6ez11/pOXx/jCH/3D5mr0Z
-ZPm1I36LxgmXfCkskfpmwYIZmq9/l+fWZPByVL5roiFaFHWrPNYTJDGdff+FGr3h
-o3zpBwKBgDY1sih/nY+6rwOP+DcabGK9KFFKLXsoJrXobEniLxp7oFaGN2GkmKvN
-NajCs5pr3wfb4LrVrsNvERnUsUXWg6ReLqfWbT4bmjzE2iJ3IbtVQ5M4kl6YrbdZ
-PMgWoLCqnoo8NoGBtmVMWhaXNJvVZPgZHk33T5F0Cg6PKNdHDchH
------END RSA PRIVATE KEY-----
diff --git a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/samples/sango.go b/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/samples/sango.go
deleted file mode 100644
index d3f755025..000000000
--- a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/samples/sango.go
+++ /dev/null
@@ -1,51 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"os"
-	"time"
-
-	MQTT "git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git"
-)
-
-var f MQTT.MessageHandler = func(client *MQTT.Client, msg MQTT.Message) {
-	fmt.Printf("TOPIC: %s\n", msg.Topic())
-	fmt.Printf("MSG: %s\n", msg.Payload())
-}
-
-var onConnect MQTT.OnConnectHandler = func(client *MQTT.Client) {
-	fmt.Println("onConnect")
-	if token := client.Subscribe("shirou@github/#", 0, nil); token.Wait() && token.Error() != nil {
-		fmt.Println(token.Error())
-		os.Exit(1)
-	}
-}
-
-var subscribed = "#"
-
-func main() {
-	opts := MQTT.NewClientOptions().AddBroker("tcp://lite.mqtt.shiguredo.jp:1883")
-	opts.SetDefaultPublishHandler(f)
-	opts.SetOnConnectHandler(onConnect)
-	opts.SetCleanSession(true)
-
-	opts.SetUsername("shirou@github")
-	opts.SetPassword("8Ub6F68kfYlr7RoV")
-
-	c := MQTT.NewClient(opts)
-	if token := c.Connect(); token.Wait() && token.Error() != nil {
-		panic(token.Error())
-	}
-
-	qos := 0
-	retain := false
-	payload := "sanple"
-	topic := "shirou@github/log"
-	token := c.Publish(topic, byte(qos), retain, payload)
-	//	token.Wait()
-	fmt.Println("%v", token.Error())
-
-	for {
-		time.Sleep(1 * time.Second)
-	}
-}
diff --git a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/samples/sim.go b/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/samples/sim.go
deleted file mode 100644
index 0a8f4865c..000000000
--- a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/samples/sim.go
+++ /dev/null
@@ -1,35 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"os"
-	"time"
-
-	MQTT "git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git"
-)
-
-var f MQTT.MessageHandler = func(client *MQTT.Client, msg MQTT.Message) {
-	fmt.Printf("TOPIC: %s\n", msg.Topic())
-	fmt.Printf("MSG: %s\n", msg.Payload())
-}
-
-var subscribed = "#"
-
-func main() {
-	opts := MQTT.NewClientOptions().AddBroker("tcp://localhost:1883")
-	opts.SetDefaultPublishHandler(f)
-	opts.SetCleanSession(true)
-
-	c := MQTT.NewClient(opts)
-	if token := c.Connect(); token.Wait() && token.Error() != nil {
-		panic(token.Error())
-	}
-
-	if token := c.Subscribe("#", 0, nil); token.Wait() && token.Error() != nil {
-		fmt.Println(token.Error())
-		os.Exit(1)
-	}
-	for {
-		time.Sleep(1 * time.Second)
-	}
-}
diff --git a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/samples/sim2.go b/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/samples/sim2.go
deleted file mode 100644
index 3d9b7d262..000000000
--- a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/samples/sim2.go
+++ /dev/null
@@ -1,42 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"os"
-	"time"
-
-	MQTT "git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git"
-)
-
-var f MQTT.MessageHandler = func(client *MQTT.Client, msg MQTT.Message) {
-	fmt.Printf("TOPIC: %s\n", msg.Topic())
-	fmt.Printf("MSG: %s\n", msg.Payload())
-}
-
-var onConnect MQTT.OnConnectHandler = func(client *MQTT.Client) {
-	fmt.Println("onConnect")
-	if token := client.Subscribe("#", 0, nil); token.Wait() && token.Error() != nil {
-		fmt.Println(token.Error())
-		os.Exit(1)
-	}
-}
-
-var subscribed = "#"
-
-func main() {
-	//	opts := MQTT.NewClientOptions().AddBroker("tcp://localhost:1883")
-	opts := MQTT.NewClientOptions().AddBroker("tcp://lite.mqtt.shiguredo.jp:1883")
-	opts.SetDefaultPublishHandler(f)
-	opts.SetOnConnectHandler(onConnect)
-	opts.SetCleanSession(true)
-
-	opts.SetUsername("shirou@github.com")
-	c := MQTT.NewClient(opts)
-	if token := c.Connect(); token.Wait() && token.Error() != nil {
-		panic(token.Error())
-	}
-
-	for {
-		time.Sleep(1 * time.Second)
-	}
-}
diff --git a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/samples/sim_pub.go b/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/samples/sim_pub.go
deleted file mode 100644
index 3f89f8af2..000000000
--- a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/samples/sim_pub.go
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * Copyright (c) 2013 IBM Corp.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Seth Hoenig
- *    Allan Stockdill-Mander
- *    Mike Robertson
- */
-
-package main
-
-import (
-	"flag"
-	"fmt"
-	"os"
-
-	MQTT "git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git"
-)
-
-/*
-Options:
- [-help]                      Display help
- [-a pub|sub]                 Action pub (publish) or sub (subscribe)
- [-m <message>]               Payload to send
- [-n <number>]                Number of messages to send or receive
- [-q 0|1|2]                   Quality of Service
- [-clean]                     CleanSession (true if -clean is present)
- [-id <clientid>]             CliendID
- [-user <user>]               User
- [-password <password>]       Password
- [-broker <uri>]              Broker URI
- [-topic <topic>]             Topic
- [-store <path>]              Store Directory
-
-*/
-
-func main() {
-	topic := flag.String("topic", "", "The topic name to/from which to publish/subscribe")
-	broker := flag.String("broker", "tcp://iot.eclipse.org:1883", "The broker URI. ex: tcp://10.10.1.1:1883")
-	password := flag.String("password", "", "The password (optional)")
-	user := flag.String("user", "", "The User (optional)")
-	id := flag.String("id", "testgoid", "The ClientID (optional)")
-	cleansess := flag.Bool("clean", false, "Set Clean Session (default false)")
-	qos := flag.Int("qos", 0, "The Quality of Service 0,1,2 (default 0)")
-	num := flag.Int("num", 1, "The number of messages to publish or subscribe (default 1)")
-	payload := flag.String("message", "", "The message text to publish (default empty)")
-	action := flag.String("action", "", "Action publish or subscribe (required)")
-	store := flag.String("store", ":memory:", "The Store Directory (default use memory store)")
-	flag.Parse()
-
-	if *action != "pub" && *action != "sub" {
-		fmt.Println("Invalid setting for -action, must be pub or sub")
-		return
-	}
-
-	if *topic == "" {
-		fmt.Println("Invalid setting for -topic, must not be empty")
-		return
-	}
-
-	fmt.Printf("Sample Info:\n")
-	fmt.Printf("\taction:    %s\n", *action)
-	fmt.Printf("\tbroker:    %s\n", *broker)
-	fmt.Printf("\tclientid:  %s\n", *id)
-	fmt.Printf("\tuser:      %s\n", *user)
-	fmt.Printf("\tpassword:  %s\n", *password)
-	fmt.Printf("\ttopic:     %s\n", *topic)
-	fmt.Printf("\tmessage:   %s\n", *payload)
-	fmt.Printf("\tqos:       %d\n", *qos)
-	fmt.Printf("\tcleansess: %v\n", *cleansess)
-	fmt.Printf("\tnum:       %d\n", *num)
-	fmt.Printf("\tstore:     %s\n", *store)
-
-	opts := MQTT.NewClientOptions()
-	opts.AddBroker(*broker)
-	opts.SetClientID(*id)
-	opts.SetUsername(*user)
-	opts.SetPassword(*password)
-	opts.SetCleanSession(*cleansess)
-	if *store != ":memory:" {
-		opts.SetStore(MQTT.NewFileStore(*store))
-	}
-
-	if *action == "pub" {
-		client := MQTT.NewClient(opts)
-		if token := client.Connect(); token.Wait() && token.Error() != nil {
-			panic(token.Error())
-		}
-		fmt.Println("Sample Publisher Started")
-		for i := 0; i < *num; i++ {
-			fmt.Println("---- doing publish ----")
-			token := client.Publish(*topic, byte(*qos), false, *payload)
-			token.Wait()
-		}
-
-		client.Disconnect(250)
-		fmt.Println("Sample Publisher Disconnected")
-	} else {
-		receiveCount := 0
-		choke := make(chan [2]string)
-
-		opts.SetDefaultPublishHandler(func(client *MQTT.Client, msg MQTT.Message) {
-			choke <- [2]string{msg.Topic(), string(msg.Payload())}
-		})
-
-		client := MQTT.NewClient(opts)
-		if token := client.Connect(); token.Wait() && token.Error() != nil {
-			panic(token.Error())
-		}
-
-		if token := client.Subscribe(*topic, byte(*qos), nil); token.Wait() && token.Error() != nil {
-			fmt.Println(token.Error())
-			os.Exit(1)
-		}
-
-		for receiveCount < *num {
-			incoming := <-choke
-			fmt.Printf("RECEIVED TOPIC: %s MESSAGE: %s\n", incoming[0], incoming[1])
-			receiveCount++
-		}
-
-		client.Disconnect(250)
-		fmt.Println("Sample Subscriber Disconnected")
-	}
-}
diff --git a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/samples/simple.go b/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/samples/simple.go
deleted file mode 100644
index 0caf2d5c0..000000000
--- a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/samples/simple.go
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (c) 2013 IBM Corp.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Seth Hoenig
- *    Allan Stockdill-Mander
- *    Mike Robertson
- */
-
-package main
-
-import (
-	"fmt"
-	"os"
-	"time"
-
-	MQTT "git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git"
-)
-
-var f MQTT.MessageHandler = func(client *MQTT.Client, msg MQTT.Message) {
-	fmt.Printf("TOPIC: %s\n", msg.Topic())
-	fmt.Printf("MSG: %s\n", msg.Payload())
-}
-
-func main() {
-	opts := MQTT.NewClientOptions().AddBroker("tcp://iot.eclipse.org:1883").SetClientID("gotrivial")
-	opts.SetDefaultPublishHandler(f)
-
-	c := MQTT.NewClient(opts)
-	if token := c.Connect(); token.Wait() && token.Error() != nil {
-		panic(token.Error())
-	}
-
-	if token := c.Subscribe("/go-mqtt/sample", 0, nil); token.Wait() && token.Error() != nil {
-		fmt.Println(token.Error())
-		os.Exit(1)
-	}
-
-	for i := 0; i < 5; i++ {
-		text := fmt.Sprintf("this is msg #%d!", i)
-		token := c.Publish("/go-mqtt/sample", 0, false, text)
-		token.Wait()
-	}
-
-	time.Sleep(3 * time.Second)
-
-	if token := c.Unsubscribe("/go-mqtt/sample"); token.Wait() && token.Error() != nil {
-		fmt.Println(token.Error())
-		os.Exit(1)
-	}
-
-	c.Disconnect(250)
-}
diff --git a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/samples/ssl.go b/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/samples/ssl.go
deleted file mode 100644
index c4efc27f2..000000000
--- a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/samples/ssl.go
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * Copyright (c) 2013 IBM Corp.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Seth Hoenig
- *    Allan Stockdill-Mander
- *    Mike Robertson
- */
-
-/*
-To run this sample, The following certificates
-must be created:
-
-  rootCA-crt.pem - root certificate authority that is used
-                   to sign and verify the client and server
-                   certificates.
-  rootCA-key.pem - keyfile for the rootCA.
-
-  server-crt.pem - server certificate signed by the CA.
-  server-key.pem - keyfile for the server certificate.
-
-  client-crt.pem - client certificate signed by the CA.
-  client-key.pem - keyfile for the client certificate.
-
-  CAfile.pem     - file containing concatenated CA certificates
-                   if there is more than 1 in the chain.
-                   (e.g. root CA -> intermediate CA -> server cert)
-
-  Instead of creating CAfile.pem, rootCA-crt.pem can be added
-  to the default openssl CA certificate bundle. To find the
-  default CA bundle used, check:
-  $GO_ROOT/src/pks/crypto/x509/root_unix.go
-  To use this CA bundle, just set tls.Config.RootCAs = nil.
-*/
-
-package main
-
-import "io/ioutil"
-import "fmt"
-import "time"
-import "crypto/tls"
-import "crypto/x509"
-import MQTT "git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git"
-
-func NewTLSConfig() *tls.Config {
-	// Import trusted certificates from CAfile.pem.
-	// Alternatively, manually add CA certificates to
-	// default openssl CA bundle.
-	certpool := x509.NewCertPool()
-	pemCerts, err := ioutil.ReadFile("samplecerts/CAfile.pem")
-	if err == nil {
-		certpool.AppendCertsFromPEM(pemCerts)
-	}
-
-	// Import client certificate/key pair
-	cert, err := tls.LoadX509KeyPair("samplecerts/client-crt.pem", "samplecerts/client-key.pem")
-	if err != nil {
-		panic(err)
-	}
-
-	// Just to print out the client certificate..
-	cert.Leaf, err = x509.ParseCertificate(cert.Certificate[0])
-	if err != nil {
-		panic(err)
-	}
-	fmt.Println(cert.Leaf)
-
-	// Create tls.Config with desired tls properties
-	return &tls.Config{
-		// RootCAs = certs used to verify server cert.
-		RootCAs: certpool,
-		// ClientAuth = whether to request cert from server.
-		// Since the server is set up for SSL, this happens
-		// anyways.
-		ClientAuth: tls.NoClientCert,
-		// ClientCAs = certs used to validate client cert.
-		ClientCAs: nil,
-		// InsecureSkipVerify = verify that cert contents
-		// match server. IP matches what is in cert etc.
-		InsecureSkipVerify: true,
-		// Certificates = list of certs client sends to server.
-		Certificates: []tls.Certificate{cert},
-	}
-}
-
-var f MQTT.MessageHandler = func(client *MQTT.Client, msg MQTT.Message) {
-	fmt.Printf("TOPIC: %s\n", msg.Topic())
-	fmt.Printf("MSG: %s\n", msg.Payload())
-}
-
-func main() {
-	tlsconfig := NewTLSConfig()
-
-	opts := MQTT.NewClientOptions()
-	opts.AddBroker("ssl://iot.eclipse.org:8883")
-	opts.SetClientID("ssl-sample").SetTLSConfig(tlsconfig)
-	opts.SetDefaultPublishHandler(f)
-
-	// Start the connection
-	c := MQTT.NewClient(opts)
-	if token := c.Connect(); token.Wait() && token.Error() != nil {
-		panic(token.Error())
-	}
-
-	c.Subscribe("/go-mqtt/sample", 0, nil)
-
-	i := 0
-	for _ = range time.Tick(time.Duration(1) * time.Second) {
-		if i == 5 {
-			break
-		}
-		text := fmt.Sprintf("this is msg #%d!", i)
-		c.Publish("/go-mqtt/sample", 0, false, text)
-		i++
-	}
-
-	c.Disconnect(250)
-}
diff --git a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/samples/stdinpub.go b/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/samples/stdinpub.go
deleted file mode 100644
index d5604d2a3..000000000
--- a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/samples/stdinpub.go
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright (c) 2013 IBM Corp.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Seth Hoenig
- *    Allan Stockdill-Mander
- *    Mike Robertson
- */
-
-package main
-
-import (
-	"bufio"
-	"crypto/tls"
-	"flag"
-	"fmt"
-	"io"
-	//"log"
-	"os"
-	"strconv"
-	"time"
-)
-
-import MQTT "git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git"
-
-func main() {
-	//MQTT.DEBUG = log.New(os.Stdout, "", 0)
-	//MQTT.ERROR = log.New(os.Stdout, "", 0)
-	stdin := bufio.NewReader(os.Stdin)
-	hostname, _ := os.Hostname()
-
-	server := flag.String("server", "tcp://127.0.0.1:1883", "The full URL of the MQTT server to connect to")
-	topic := flag.String("topic", hostname, "Topic to publish the messages on")
-	qos := flag.Int("qos", 0, "The QoS to send the messages at")
-	retained := flag.Bool("retained", false, "Are the messages sent with the retained flag")
-	clientid := flag.String("clientid", hostname+strconv.Itoa(time.Now().Second()), "A clientid for the connection")
-	username := flag.String("username", "", "A username to authenticate to the MQTT server")
-	password := flag.String("password", "", "Password to match username")
-	flag.Parse()
-
-	connOpts := MQTT.NewClientOptions().AddBroker(*server).SetClientID(*clientid).SetCleanSession(true)
-	if *username != "" {
-		connOpts.SetUsername(*username)
-		if *password != "" {
-			connOpts.SetPassword(*password)
-		}
-	}
-	tlsConfig := &tls.Config{InsecureSkipVerify: true, ClientAuth: tls.NoClientCert}
-	connOpts.SetTLSConfig(tlsConfig)
-
-	client := MQTT.NewClient(connOpts)
-	if token := client.Connect(); token.Wait() && token.Error() != nil {
-		fmt.Println(token.Error())
-		return
-	}
-	fmt.Printf("Connected to %s\n", *server)
-
-	for {
-		message, err := stdin.ReadString('\n')
-		if err == io.EOF {
-			os.Exit(0)
-		}
-		client.Publish(*topic, byte(*qos), *retained, message)
-	}
-}
diff --git a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/samples/stdoutsub.go b/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/samples/stdoutsub.go
deleted file mode 100644
index a6b058de1..000000000
--- a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/samples/stdoutsub.go
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright (c) 2013 IBM Corp.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Seth Hoenig
- *    Allan Stockdill-Mander
- *    Mike Robertson
- */
-
-package main
-
-import (
-	"crypto/tls"
-	"flag"
-	"fmt"
-	//"log"
-	"os"
-	"os/signal"
-	"strconv"
-	"syscall"
-	"time"
-
-	MQTT "git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git"
-)
-
-func onMessageReceived(client *MQTT.Client, message MQTT.Message) {
-	fmt.Printf("Received message on topic: %s\nMessage: %s\n", message.Topic(), message.Payload())
-}
-
-var i int64
-
-func main() {
-	//MQTT.DEBUG = log.New(os.Stdout, "", 0)
-	//MQTT.ERROR = log.New(os.Stdout, "", 0)
-	c := make(chan os.Signal, 1)
-	i = 0
-	signal.Notify(c, os.Interrupt, syscall.SIGTERM)
-	go func() {
-		<-c
-		fmt.Println("signal received, exiting")
-		os.Exit(0)
-	}()
-
-	hostname, _ := os.Hostname()
-
-	server := flag.String("server", "tcp://127.0.0.1:1883", "The full url of the MQTT server to connect to ex: tcp://127.0.0.1:1883")
-	topic := flag.String("topic", "#", "Topic to subscribe to")
-	qos := flag.Int("qos", 0, "The QoS to subscribe to messages at")
-	clientid := flag.String("clientid", hostname+strconv.Itoa(time.Now().Second()), "A clientid for the connection")
-	username := flag.String("username", "", "A username to authenticate to the MQTT server")
-	password := flag.String("password", "", "Password to match username")
-	flag.Parse()
-
-	connOpts := &MQTT.ClientOptions{
-		ClientID:             *clientid,
-		CleanSession:         true,
-		Username:             *username,
-		Password:             *password,
-		MaxReconnectInterval: 1 * time.Second,
-		KeepAlive:            30 * time.Second,
-		TLSConfig:            tls.Config{InsecureSkipVerify: true, ClientAuth: tls.NoClientCert},
-	}
-	connOpts.AddBroker(*server)
-	connOpts.OnConnect = func(c *MQTT.Client) {
-		if token := c.Subscribe(*topic, byte(*qos), onMessageReceived); token.Wait() && token.Error() != nil {
-			panic(token.Error())
-		}
-	}
-
-	client := MQTT.NewClient(connOpts)
-	if token := client.Connect(); token.Wait() && token.Error() != nil {
-		panic(token.Error())
-	} else {
-		fmt.Printf("Connected to %s\n", *server)
-	}
-
-	for {
-		time.Sleep(1 * time.Second)
-	}
-}
diff --git a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/store.go b/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/store.go
deleted file mode 100644
index 4a2ef86eb..000000000
--- a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/store.go
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * Copyright (c) 2013 IBM Corp.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Seth Hoenig
- *    Allan Stockdill-Mander
- *    Mike Robertson
- */
-
-package mqtt
-
-import (
-	"fmt"
-	"git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/packets"
-	"strconv"
-)
-
-const (
-	inboundPrefix  = "i."
-	outboundPrefix = "o."
-)
-
-// Store is an interface which can be used to provide implementations
-// for message persistence.
-// Because we may have to store distinct messages with the same
-// message ID, we need a unique key for each message. This is
-// possible by prepending "i." or "o." to each message id
-type Store interface {
-	Open()
-	Put(string, packets.ControlPacket)
-	Get(string) packets.ControlPacket
-	All() []string
-	Del(string)
-	Close()
-	Reset()
-}
-
-// A key MUST have the form "X.[messageid]"
-// where X is 'i' or 'o'
-func mIDFromKey(key string) uint16 {
-	s := key[2:]
-	i, err := strconv.Atoi(s)
-	chkerr(err)
-	return uint16(i)
-}
-
-// Return a string of the form "i.[id]"
-func inboundKeyFromMID(id uint16) string {
-	return fmt.Sprintf("%s%d", inboundPrefix, id)
-}
-
-// Return a string of the form "o.[id]"
-func outboundKeyFromMID(id uint16) string {
-	return fmt.Sprintf("%s%d", outboundPrefix, id)
-}
-
-// govern which outgoing messages are persisted
-func persistOutbound(s Store, m packets.ControlPacket) {
-	switch m.Details().Qos {
-	case 0:
-		switch m.(type) {
-		case *packets.PubackPacket, *packets.PubcompPacket:
-			// Sending puback. delete matching publish
-			// from ibound
-			s.Del(inboundKeyFromMID(m.Details().MessageID))
-		}
-	case 1:
-		switch m.(type) {
-		case *packets.PublishPacket, *packets.PubrelPacket, *packets.SubscribePacket, *packets.UnsubscribePacket:
-			// Sending publish. store in obound
-			// until puback received
-			s.Put(outboundKeyFromMID(m.Details().MessageID), m)
-		default:
-			chkcond(false)
-		}
-	case 2:
-		switch m.(type) {
-		case *packets.PublishPacket:
-			// Sending publish. store in obound
-			// until pubrel received
-			s.Put(outboundKeyFromMID(m.Details().MessageID), m)
-		default:
-			chkcond(false)
-		}
-	}
-}
-
-// govern which incoming messages are persisted
-func persistInbound(s Store, m packets.ControlPacket) {
-	switch m.Details().Qos {
-	case 0:
-		switch m.(type) {
-		case *packets.PubackPacket, *packets.SubackPacket, *packets.UnsubackPacket, *packets.PubcompPacket:
-			// Received a puback. delete matching publish
-			// from obound
-			s.Del(outboundKeyFromMID(m.Details().MessageID))
-		case *packets.PublishPacket, *packets.PubrecPacket, *packets.PingrespPacket, *packets.ConnackPacket:
-		default:
-			chkcond(false)
-		}
-	case 1:
-		switch m.(type) {
-		case *packets.PublishPacket, *packets.PubrelPacket:
-			// Received a publish. store it in ibound
-			// until puback sent
-			s.Put(inboundKeyFromMID(m.Details().MessageID), m)
-		default:
-			chkcond(false)
-		}
-	case 2:
-		switch m.(type) {
-		case *packets.PublishPacket:
-			// Received a publish. store it in ibound
-			// until pubrel received
-			s.Put(inboundKeyFromMID(m.Details().MessageID), m)
-		default:
-			chkcond(false)
-		}
-	}
-}
diff --git a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/token.go b/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/token.go
deleted file mode 100644
index 7644353b1..000000000
--- a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/token.go
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
- * Copyright (c) 2014 IBM Corp.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Allan Stockdill-Mander
- */
-
-package mqtt
-
-import (
-	"git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/packets"
-	"sync"
-	"time"
-)
-
-//PacketAndToken is a struct that contains both a ControlPacket and a
-//Token. This struct is passed via channels between the client interface
-//code and the underlying code responsible for sending and receiving
-//MQTT messages.
-type PacketAndToken struct {
-	p packets.ControlPacket
-	t Token
-}
-
-//Token defines the interface for the tokens used to indicate when
-//actions have completed.
-type Token interface {
-	Wait() bool
-	WaitTimeout(time.Duration) bool
-	flowComplete()
-	Error() error
-}
-
-type baseToken struct {
-	m        sync.RWMutex
-	complete chan struct{}
-	ready    bool
-	err      error
-}
-
-// Wait will wait indefinitely for the Token to complete, ie the Publish
-// to be sent and confirmed receipt from the broker
-func (b *baseToken) Wait() bool {
-	b.m.Lock()
-	defer b.m.Unlock()
-	if !b.ready {
-		<-b.complete
-		b.ready = true
-	}
-	return b.ready
-}
-
-// WaitTimeout takes a time in ms to wait for the flow associated with the
-// Token to complete, returns true if it returned before the timeout or
-// returns false if the timeout occurred. In the case of a timeout the Token
-// does not have an error set in case the caller wishes to wait again
-func (b *baseToken) WaitTimeout(d time.Duration) bool {
-	b.m.Lock()
-	defer b.m.Unlock()
-	if !b.ready {
-		select {
-		case <-b.complete:
-			b.ready = true
-		case <-time.After(d):
-		}
-	}
-	return b.ready
-}
-
-func (b *baseToken) flowComplete() {
-	close(b.complete)
-}
-
-func (b *baseToken) Error() error {
-	b.m.RLock()
-	defer b.m.RUnlock()
-	return b.err
-}
-
-func newToken(tType byte) Token {
-	switch tType {
-	case packets.Connect:
-		return &ConnectToken{baseToken: baseToken{complete: make(chan struct{})}}
-	case packets.Subscribe:
-		return &SubscribeToken{baseToken: baseToken{complete: make(chan struct{})}, subResult: make(map[string]byte)}
-	case packets.Publish:
-		return &PublishToken{baseToken: baseToken{complete: make(chan struct{})}}
-	case packets.Unsubscribe:
-		return &UnsubscribeToken{baseToken: baseToken{complete: make(chan struct{})}}
-	case packets.Disconnect:
-		return &DisconnectToken{baseToken: baseToken{complete: make(chan struct{})}}
-	}
-	return nil
-}
-
-//ConnectToken is an extension of Token containing the extra fields
-//required to provide information about calls to Connect()
-type ConnectToken struct {
-	baseToken
-	returnCode byte
-}
-
-//ReturnCode returns the acknowlegement code in the connack sent
-//in response to a Connect()
-func (c *ConnectToken) ReturnCode() byte {
-	c.m.RLock()
-	defer c.m.RUnlock()
-	return c.returnCode
-}
-
-//PublishToken is an extension of Token containing the extra fields
-//required to provide information about calls to Publish()
-type PublishToken struct {
-	baseToken
-	messageID uint16
-}
-
-//MessageID returns the MQTT message ID that was assigned to the
-//Publish packet when it was sent to the broker
-func (p *PublishToken) MessageID() uint16 {
-	return p.messageID
-}
-
-//SubscribeToken is an extension of Token containing the extra fields
-//required to provide information about calls to Subscribe()
-type SubscribeToken struct {
-	baseToken
-	subs      []string
-	subResult map[string]byte
-}
-
-//Result returns a map of topics that were subscribed to along with
-//the matching return code from the broker. This is either the Qos
-//value of the subscription or an error code.
-func (s *SubscribeToken) Result() map[string]byte {
-	s.m.RLock()
-	defer s.m.RUnlock()
-	return s.subResult
-}
-
-//UnsubscribeToken is an extension of Token containing the extra fields
-//required to provide information about calls to Unsubscribe()
-type UnsubscribeToken struct {
-	baseToken
-}
-
-//DisconnectToken is an extension of Token containing the extra fields
-//required to provide information about calls to Disconnect()
-type DisconnectToken struct {
-	baseToken
-}
diff --git a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/topic.go b/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/topic.go
deleted file mode 100644
index ffe796d28..000000000
--- a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/topic.go
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright (c) 2014 IBM Corp.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Seth Hoenig
- *    Allan Stockdill-Mander
- *    Mike Robertson
- */
-
-package mqtt
-
-import (
-	"errors"
-	"strings"
-)
-
-//InvalidQos is the error returned when an packet is to be sent
-//with an invalid Qos value
-var ErrInvalidQos = errors.New("Invalid QoS")
-
-//InvalidTopicEmptyString is the error returned when a topic string
-//is passed in that is 0 length
-var ErrInvalidTopicEmptyString = errors.New("Invalid Topic; empty string")
-
-//InvalidTopicMultilevel is the error returned when a topic string
-//is passed in that has the multi level wildcard in any position but
-//the last
-var ErrInvalidTopicMultilevel = errors.New("Invalid Topic; multi-level wildcard must be last level")
-
-// Topic Names and Topic Filters
-// The MQTT v3.1.1 spec clarifies a number of ambiguities with regard
-// to the validity of Topic strings.
-// - A Topic must be between 1 and 65535 bytes.
-// - A Topic is case sensitive.
-// - A Topic may contain whitespace.
-// - A Topic containing a leading forward slash is different than a Topic without.
-// - A Topic may be "/" (two levels, both empty string).
-// - A Topic must be UTF-8 encoded.
-// - A Topic may contain any number of levels.
-// - A Topic may contain an empty level (two forward slashes in a row).
-// - A TopicName may not contain a wildcard.
-// - A TopicFilter may only have a # (multi-level) wildcard as the last level.
-// - A TopicFilter may contain any number of + (single-level) wildcards.
-// - A TopicFilter with a # will match the absense of a level
-//     Example:  a subscription to "foo/#" will match messages published to "foo".
-
-func validateSubscribeMap(subs map[string]byte) ([]string, []byte, error) {
-	var topics []string
-	var qoss []byte
-	for topic, qos := range subs {
-		if err := validateTopicAndQos(topic, qos); err != nil {
-			return nil, nil, err
-		}
-		topics = append(topics, topic)
-		qoss = append(qoss, qos)
-	}
-
-	return topics, qoss, nil
-}
-
-func validateTopicAndQos(topic string, qos byte) error {
-	if len(topic) == 0 {
-		return ErrInvalidTopicEmptyString
-	}
-
-	levels := strings.Split(topic, "/")
-	for i, level := range levels {
-		if level == "#" && i != len(levels)-1 {
-			return ErrInvalidTopicMultilevel
-		}
-	}
-
-	if qos < 0 || qos > 2 {
-		return ErrInvalidQos
-	}
-	return nil
-}
diff --git a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/trace.go b/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/trace.go
deleted file mode 100644
index 2f5a01466..000000000
--- a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/trace.go
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2013 IBM Corp.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Seth Hoenig
- *    Allan Stockdill-Mander
- *    Mike Robertson
- */
-
-package mqtt
-
-import (
-	"io/ioutil"
-	"log"
-)
-
-// Internal levels of library output that are initialised to not print
-// anything but can be overridden by programmer
-var (
-	ERROR    *log.Logger
-	CRITICAL *log.Logger
-	WARN     *log.Logger
-	DEBUG    *log.Logger
-)
-
-func init() {
-	ERROR = log.New(ioutil.Discard, "", 0)
-	CRITICAL = log.New(ioutil.Discard, "", 0)
-	WARN = log.New(ioutil.Discard, "", 0)
-	DEBUG = log.New(ioutil.Discard, "", 0)
-}
diff --git a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/unit_client_test.go b/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/unit_client_test.go
deleted file mode 100644
index 59f7a4500..000000000
--- a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/unit_client_test.go
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 2013 IBM Corp.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Seth Hoenig
- *    Allan Stockdill-Mander
- *    Mike Robertson
- */
-
-package mqtt
-
-import (
-	"log"
-	"net/http"
-	"os"
-	"testing"
-
-	_ "net/http/pprof"
-)
-
-func init() {
-	DEBUG = log.New(os.Stderr, "DEBUG    ", log.Ltime)
-	WARN = log.New(os.Stderr, "WARNING  ", log.Ltime)
-	CRITICAL = log.New(os.Stderr, "CRITICAL ", log.Ltime)
-	ERROR = log.New(os.Stderr, "ERROR    ", log.Ltime)
-
-	go func() {
-		log.Println(http.ListenAndServe("localhost:6060", nil))
-	}()
-}
-
-func Test_NewClient_simple(t *testing.T) {
-	ops := NewClientOptions().SetClientID("foo").AddBroker("tcp://10.10.0.1:1883")
-	c := NewClient(ops)
-
-	if c == nil {
-		t.Fatalf("ops is nil")
-	}
-
-	if c.options.ClientID != "foo" {
-		t.Fatalf("bad client id")
-	}
-
-	if c.options.Servers[0].Scheme != "tcp" {
-		t.Fatalf("bad server scheme")
-	}
-
-	if c.options.Servers[0].Host != "10.10.0.1:1883" {
-		t.Fatalf("bad server host")
-	}
-}
diff --git a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/unit_messageids_test.go b/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/unit_messageids_test.go
deleted file mode 100644
index 9d941f697..000000000
--- a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/unit_messageids_test.go
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Copyright (c) 2013 IBM Corp.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Seth Hoenig
- *    Allan Stockdill-Mander
- *    Mike Robertson
- */
-
-package mqtt
-
-import (
-	"fmt"
-	"testing"
-	"time"
-)
-
-type DummyToken struct{}
-
-func (d *DummyToken) Wait() bool {
-	return true
-}
-
-func (d *DummyToken) WaitTimeout(t time.Duration) bool {
-	return true
-}
-
-func (d *DummyToken) flowComplete() {}
-
-func (d *DummyToken) Error() error {
-	return nil
-}
-
-func Test_getID(t *testing.T) {
-	mids := &messageIds{index: make(map[uint16]Token)}
-
-	i1 := mids.getID(&DummyToken{})
-
-	if i1 != 1 {
-		t.Fatalf("i1 was wrong: %v", i1)
-	}
-
-	i2 := mids.getID(&DummyToken{})
-
-	if i2 != 2 {
-		t.Fatalf("i2 was wrong: %v", i2)
-	}
-
-	for i := uint16(3); i < 100; i++ {
-		id := mids.getID(&DummyToken{})
-		if id != i {
-			t.Fatalf("id was wrong expected %v got %v", i, id)
-		}
-	}
-}
-
-func Test_freeID(t *testing.T) {
-	mids := &messageIds{index: make(map[uint16]Token)}
-
-	i1 := mids.getID(&DummyToken{})
-	mids.freeID(i1)
-
-	if i1 != 1 {
-		t.Fatalf("i1 was wrong: %v", i1)
-	}
-
-	i2 := mids.getID(&DummyToken{})
-	fmt.Printf("i2: %v\n", i2)
-}
-
-func Test_messageids_mix(t *testing.T) {
-	mids := &messageIds{index: make(map[uint16]Token)}
-
-	done := make(chan bool)
-	a := make(chan uint16, 3)
-	b := make(chan uint16, 20)
-	c := make(chan uint16, 100)
-
-	go func() {
-		for i := 0; i < 10000; i++ {
-			a <- mids.getID(&DummyToken{})
-			mids.freeID(<-b)
-		}
-		done <- true
-	}()
-
-	go func() {
-		for i := 0; i < 10000; i++ {
-			b <- mids.getID(&DummyToken{})
-			mids.freeID(<-c)
-		}
-		done <- true
-	}()
-
-	go func() {
-		for i := 0; i < 10000; i++ {
-			c <- mids.getID(&DummyToken{})
-			mids.freeID(<-a)
-		}
-		done <- true
-	}()
-
-	<-done
-	<-done
-	<-done
-}
diff --git a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/unit_options_test.go b/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/unit_options_test.go
deleted file mode 100644
index d4181442e..000000000
--- a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/unit_options_test.go
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * Copyright (c) 2013 IBM Corp.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Seth Hoenig
- *    Allan Stockdill-Mander
- *    Mike Robertson
- */
-
-package mqtt
-
-import (
-	"crypto/tls"
-	"crypto/x509"
-	"testing"
-	"time"
-)
-
-func Test_NewClientOptions_default(t *testing.T) {
-	o := NewClientOptions()
-
-	if o.ClientID != "" {
-		t.Fatalf("bad default client id")
-	}
-
-	if o.Username != "" {
-		t.Fatalf("bad default username")
-	}
-
-	if o.Password != "" {
-		t.Fatalf("bad default password")
-	}
-
-	if o.KeepAlive != 30*time.Second {
-		t.Fatalf("bad default timeout")
-	}
-}
-
-func Test_NewClientOptions_mix(t *testing.T) {
-	o := NewClientOptions()
-	o.AddBroker("tcp://192.168.1.2:9999")
-	o.SetClientID("myclientid")
-	o.SetUsername("myuser")
-	o.SetPassword("mypassword")
-	o.SetKeepAlive(88)
-
-	if o.Servers[0].Scheme != "tcp" {
-		t.Fatalf("bad scheme")
-	}
-
-	if o.Servers[0].Host != "192.168.1.2:9999" {
-		t.Fatalf("bad host")
-	}
-
-	if o.ClientID != "myclientid" {
-		t.Fatalf("bad set clientid")
-	}
-
-	if o.Username != "myuser" {
-		t.Fatalf("bad set username")
-	}
-
-	if o.Password != "mypassword" {
-		t.Fatalf("bad set password")
-	}
-
-	if o.KeepAlive != 88 {
-		t.Fatalf("bad set timeout")
-	}
-}
-
-func Test_ModifyOptions(t *testing.T) {
-	o := NewClientOptions()
-	o.AddBroker("tcp://3.3.3.3:12345")
-	c := NewClient(o)
-	o.AddBroker("ws://2.2.2.2:9999")
-	o.SetOrderMatters(false)
-
-	if c.options.Servers[0].Scheme != "tcp" {
-		t.Fatalf("client options.server.Scheme was modified")
-	}
-
-	// if c.options.server.Host != "2.2.2.2:9999" {
-	// 	t.Fatalf("client options.server.Host was modified")
-	// }
-
-	if o.Order != false {
-		t.Fatalf("options.order was not modified")
-	}
-}
-
-func Test_TLSConfig(t *testing.T) {
-	o := NewClientOptions().SetTLSConfig(&tls.Config{
-		RootCAs:            x509.NewCertPool(),
-		ClientAuth:         tls.NoClientCert,
-		ClientCAs:          x509.NewCertPool(),
-		InsecureSkipVerify: true})
-
-	c := NewClient(o)
-
-	if c.options.TLSConfig.ClientAuth != tls.NoClientCert {
-		t.Fatalf("client options.tlsConfig ClientAuth incorrect")
-	}
-
-	if c.options.TLSConfig.InsecureSkipVerify != true {
-		t.Fatalf("client options.tlsConfig InsecureSkipVerify incorrect")
-	}
-}
-
-func Test_OnConnectionLost(t *testing.T) {
-	onconnlost := func(client *Client, err error) {
-		panic(err)
-	}
-	o := NewClientOptions().SetConnectionLostHandler(onconnlost)
-
-	c := NewClient(o)
-
-	if c.options.OnConnectionLost == nil {
-		t.Fatalf("client options.onconnlost was nil")
-	}
-}
diff --git a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/unit_ping_test.go b/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/unit_ping_test.go
deleted file mode 100644
index 2ac8831da..000000000
--- a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/unit_ping_test.go
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (c) 2013 IBM Corp.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Seth Hoenig
- *    Allan Stockdill-Mander
- *    Mike Robertson
- */
-
-package mqtt
-
-import (
-	"bytes"
-	"git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/packets"
-	"testing"
-)
-
-func Test_NewPingReqMessage(t *testing.T) {
-	pr := packets.NewControlPacket(packets.Pingreq).(*packets.PingreqPacket)
-	if pr.MessageType != packets.Pingreq {
-		t.Errorf("NewPingReqMessage bad msg type: %v", pr.MessageType)
-	}
-	if pr.RemainingLength != 0 {
-		t.Errorf("NewPingReqMessage bad remlen, expected 0, got %d", pr.RemainingLength)
-	}
-
-	exp := []byte{
-		0xC0,
-		0x00,
-	}
-
-	var buf bytes.Buffer
-	pr.Write(&buf)
-	bs := buf.Bytes()
-
-	if len(bs) != 2 {
-		t.Errorf("NewPingReqMessage.Bytes() wrong length: %d", len(bs))
-	}
-
-	if exp[0] != bs[0] || exp[1] != bs[1] {
-		t.Errorf("NewPingMessage.Bytes() wrong")
-	}
-}
-
-func Test_DecodeMessage_pingresp(t *testing.T) {
-	bs := bytes.NewBuffer([]byte{
-		0xD0,
-		0x00,
-	})
-	presp, _ := packets.ReadPacket(bs)
-	if presp.(*packets.PingrespPacket).MessageType != packets.Pingresp {
-		t.Errorf("DecodeMessage ping response wrong msg type: %v", presp.(*packets.PingrespPacket).MessageType)
-	}
-	if presp.(*packets.PingrespPacket).RemainingLength != 0 {
-		t.Errorf("DecodeMessage ping response wrong rem len: %d", presp.(*packets.PingrespPacket).RemainingLength)
-	}
-}
diff --git a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/unit_router_test.go b/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/unit_router_test.go
deleted file mode 100644
index 48e6e392b..000000000
--- a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/unit_router_test.go
+++ /dev/null
@@ -1,287 +0,0 @@
-/*
- * Copyright (c) 2013 IBM Corp.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Seth Hoenig
- *    Allan Stockdill-Mander
- *    Mike Robertson
- */
-
-package mqtt
-
-import (
-	"git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/packets"
-	"testing"
-)
-
-func Test_newRouter(t *testing.T) {
-	router, stop := newRouter()
-	if router == nil {
-		t.Fatalf("router is nil")
-	}
-	if stop == nil {
-		t.Fatalf("stop is nil")
-	}
-	if router.routes.Len() != 0 {
-		t.Fatalf("router.routes was not empty")
-	}
-}
-
-func Test_AddRoute(t *testing.T) {
-	router, _ := newRouter()
-	calledback := false
-	cb := func(client *Client, msg Message) {
-		calledback = true
-	}
-	router.addRoute("/alpha", cb)
-
-	if router.routes.Len() != 1 {
-		t.Fatalf("router.routes was wrong")
-	}
-}
-
-func Test_Match(t *testing.T) {
-	router, _ := newRouter()
-	router.addRoute("/alpha", nil)
-
-	if !router.routes.Front().Value.(*route).match("/alpha") {
-		t.Fatalf("match function is bad")
-	}
-
-	if router.routes.Front().Value.(*route).match("alpha") {
-		t.Fatalf("match function is bad")
-	}
-}
-
-func Test_match(t *testing.T) {
-
-	check := func(route, topic string, exp bool) {
-		result := routeIncludesTopic(route, topic)
-		if exp != result {
-			t.Errorf("match was bad R: %v, T: %v, EXP: %v", route, topic, exp)
-		}
-	}
-
-	// ** Basic **
-	R := ""
-	T := ""
-	check(R, T, true)
-
-	R = "x"
-	T = ""
-	check(R, T, false)
-
-	R = ""
-	T = "x"
-	check(R, T, false)
-
-	R = "x"
-	T = "x"
-	check(R, T, true)
-
-	R = "x"
-	T = "X"
-	check(R, T, false)
-
-	R = "alpha"
-	T = "alpha"
-	check(R, T, true)
-
-	R = "alpha"
-	T = "beta"
-	check(R, T, false)
-
-	// ** / **
-	R = "/"
-	T = "/"
-	check(R, T, true)
-
-	R = "/one"
-	T = "/one"
-	check(R, T, true)
-
-	R = "/"
-	T = "/two"
-	check(R, T, false)
-
-	R = "/two"
-	T = "/"
-	check(R, T, false)
-
-	R = "/two"
-	T = "two"
-	check(R, T, false) // a leading "/" creates a different topic
-
-	R = "/a/"
-	T = "/a"
-	check(R, T, false)
-
-	R = "/a/"
-	T = "/a/b"
-	check(R, T, false)
-
-	R = "/a/b"
-	T = "/a/b"
-	check(R, T, true)
-
-	R = "/a/b/"
-	T = "/a/b"
-	check(R, T, false)
-
-	R = "/a/b"
-	T = "/R/b"
-	check(R, T, false)
-
-	// ** + **
-	R = "/a/+/c"
-	T = "/a/b/c"
-	check(R, T, true)
-
-	R = "/+/b/c"
-	T = "/a/b/c"
-	check(R, T, true)
-
-	R = "/a/b/+"
-	T = "/a/b/c"
-	check(R, T, true)
-
-	R = "/a/+/+"
-	T = "/a/b/c"
-	check(R, T, true)
-
-	R = "/+/+/+"
-	T = "/a/b/c"
-	check(R, T, true)
-
-	R = "/+/+/c"
-	T = "/a/b/c"
-	check(R, T, true)
-
-	R = "/a/b/c/+" // different number of levels
-	T = "/a/b/c"
-	check(R, T, false)
-
-	R = "+"
-	T = "a"
-	check(R, T, true)
-
-	R = "/+"
-	T = "a"
-	check(R, T, false)
-
-	R = "+/+"
-	T = "/a"
-	check(R, T, true)
-
-	R = "+/+"
-	T = "a"
-	check(R, T, false)
-
-	// ** # **
-	R = "#"
-	T = "/a/b/c"
-	check(R, T, true)
-
-	R = "/#"
-	T = "/a/b/c"
-	check(R, T, true)
-
-	// R = "/#/" // not valid
-	// T = "/a/b/c"
-	// check(R, T, true)
-
-	R = "/#"
-	T = "/a/b/c"
-	check(R, T, true)
-
-	R = "/a/#"
-	T = "/a/b/c"
-	check(R, T, true)
-
-	R = "/a/#"
-	T = "/a/b/c"
-	check(R, T, true)
-
-	R = "/a/b/#"
-	T = "/a/b/c"
-	check(R, T, true)
-
-	// ** unicode **
-	R = "☃"
-	T = "☃"
-	check(R, T, true)
-
-	R = "✈"
-	T = "☃"
-	check(R, T, false)
-
-	R = "/☃/✈"
-	T = "/☃/ッ"
-	check(R, T, false)
-
-	R = "#"
-	T = "/☃/ッ"
-	check(R, T, true)
-
-	R = "/☃/+"
-	T = "/☃/ッ/♫/ø/☹☹☹"
-	check(R, T, false)
-
-	R = "/☃/#"
-	T = "/☃/ッ/♫/ø/☹☹☹"
-	check(R, T, true)
-
-	R = "/☃/ッ/♫/ø/+"
-	T = "/☃/ッ/♫/ø/☹☹☹"
-	check(R, T, true)
-
-	R = "/☃/ッ/+/ø/☹☹☹"
-	T = "/☃/ッ/♫/ø/☹☹☹"
-	check(R, T, true)
-
-	R = "/+/a/ッ/+/ø/☹☹☹"
-	T = "/b/♫/ッ/♫/ø/☹☹☹"
-	check(R, T, false)
-
-	R = "/+/♫/ッ/+/ø/☹☹☹"
-	T = "/b/♫/ッ/♫/ø/☹☹☹"
-	check(R, T, true)
-}
-
-func Test_MatchAndDispatch(t *testing.T) {
-	calledback := make(chan bool)
-
-	cb := func(c *Client, m Message) {
-		calledback <- true
-	}
-
-	pub := packets.NewControlPacket(packets.Publish).(*packets.PublishPacket)
-	pub.Qos = 2
-	pub.TopicName = "a"
-	pub.Payload = []byte("foo")
-
-	msgs := make(chan *packets.PublishPacket)
-
-	router, stopper := newRouter()
-	router.addRoute("a", cb)
-
-	router.matchAndDispatch(msgs, true, nil)
-
-	msgs <- pub
-
-	<-calledback
-
-	stopper <- true
-
-	select {
-	case msgs <- pub:
-		t.Errorf("msgs should not have a listener")
-	default:
-	}
-
-}
diff --git a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/unit_store_test.go b/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/unit_store_test.go
deleted file mode 100644
index 42e7d7ceb..000000000
--- a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/unit_store_test.go
+++ /dev/null
@@ -1,668 +0,0 @@
-/*
- * Copyright (c) 2013 IBM Corp.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Seth Hoenig
- *    Allan Stockdill-Mander
- *    Mike Robertson
- */
-
-package mqtt
-
-import (
-	"bufio"
-	"fmt"
-	"git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/packets"
-	"io/ioutil"
-	"os"
-	"testing"
-)
-
-func Test_fullpath(t *testing.T) {
-	p := fullpath("/tmp/store", "o.44324")
-	e := "/tmp/store/o.44324.msg"
-	if p != e {
-		t.Fatalf("full path expected %s, got %s", e, p)
-	}
-}
-
-func Test_exists(t *testing.T) {
-	b := exists("/")
-	if !b {
-		t.Errorf("/proc/cpuinfo was not found")
-	}
-}
-
-func Test_exists_no(t *testing.T) {
-	b := exists("/this/path/is/not/real/i/hope")
-	if b {
-		t.Errorf("you have some strange files")
-	}
-}
-
-func isemptydir(dir string) bool {
-	chkcond(exists(dir))
-	files, err := ioutil.ReadDir(dir)
-	chkerr(err)
-	return len(files) == 0
-}
-
-func Test_mIDFromKey(t *testing.T) {
-	key := "i.123"
-	exp := uint16(123)
-	res := mIDFromKey(key)
-	if exp != res {
-		t.Fatalf("mIDFromKey failed")
-	}
-}
-
-func Test_inboundKeyFromMID(t *testing.T) {
-	id := uint16(9876)
-	exp := "i.9876"
-	res := inboundKeyFromMID(id)
-	if exp != res {
-		t.Fatalf("inboundKeyFromMID failed")
-	}
-}
-
-func Test_outboundKeyFromMID(t *testing.T) {
-	id := uint16(7654)
-	exp := "o.7654"
-	res := outboundKeyFromMID(id)
-	if exp != res {
-		t.Fatalf("outboundKeyFromMID failed")
-	}
-}
-
-/************************
- **** persistOutbound ****
- ************************/
-
-func Test_persistOutbound_connect(t *testing.T) {
-	ts := &TestStore{}
-	m := packets.NewControlPacket(packets.Connect).(*packets.ConnectPacket)
-	m.Qos = 0
-	m.Username = "user"
-	m.Password = []byte("pass")
-	m.ClientIdentifier = "cid"
-	//m := newConnectMsg(false, false, QOS_ZERO, false, "", nil, "cid", "user", "pass", 10)
-	persistOutbound(ts, m)
-
-	if len(ts.mput) != 0 {
-		t.Fatalf("persistOutbound put message it should not have")
-	}
-
-	if len(ts.mget) != 0 {
-		t.Fatalf("persistOutbound get message it should not have")
-	}
-
-	if len(ts.mdel) != 0 {
-		t.Fatalf("persistOutbound del message it should not have")
-	}
-}
-
-func Test_persistOutbound_publish_0(t *testing.T) {
-	ts := &TestStore{}
-	m := packets.NewControlPacket(packets.Publish).(*packets.PublishPacket)
-	m.Qos = 0
-	m.TopicName = "/popub0"
-	m.Payload = []byte{0xBB, 0x00}
-	m.MessageID = 40
-	persistOutbound(ts, m)
-
-	if len(ts.mput) != 0 {
-		t.Fatalf("persistOutbound put message it should not have")
-	}
-
-	if len(ts.mget) != 0 {
-		t.Fatalf("persistOutbound get message it should not have")
-	}
-
-	if len(ts.mdel) != 0 {
-		t.Fatalf("persistOutbound del message it should not have")
-	}
-}
-
-func Test_persistOutbound_publish_1(t *testing.T) {
-	ts := &TestStore{}
-	m := packets.NewControlPacket(packets.Publish).(*packets.PublishPacket)
-	m.Qos = 1
-	m.TopicName = "/popub1"
-	m.Payload = []byte{0xBB, 0x00}
-	m.MessageID = 41
-	persistOutbound(ts, m)
-
-	if len(ts.mput) != 1 || ts.mput[0] != 41 {
-		t.Fatalf("persistOutbound put message it should not have")
-	}
-
-	if len(ts.mget) != 0 {
-		t.Fatalf("persistOutbound get message it should not have")
-	}
-
-	if len(ts.mdel) != 0 {
-		t.Fatalf("persistOutbound del message it should not have")
-	}
-}
-
-func Test_persistOutbound_publish_2(t *testing.T) {
-	ts := &TestStore{}
-	m := packets.NewControlPacket(packets.Publish).(*packets.PublishPacket)
-	m.Qos = 2
-	m.TopicName = "/popub2"
-	m.Payload = []byte{0xBB, 0x00}
-	m.MessageID = 42
-	persistOutbound(ts, m)
-
-	if len(ts.mput) != 1 || ts.mput[0] != 42 {
-		t.Fatalf("persistOutbound put message it should not have")
-	}
-
-	if len(ts.mget) != 0 {
-		t.Fatalf("persistOutbound get message it should not have")
-	}
-
-	if len(ts.mdel) != 0 {
-		t.Fatalf("persistOutbound del message it should not have")
-	}
-}
-
-func Test_persistOutbound_puback(t *testing.T) {
-	ts := &TestStore{}
-	m := packets.NewControlPacket(packets.Puback).(*packets.PubackPacket)
-	persistOutbound(ts, m)
-
-	if len(ts.mput) != 0 {
-		t.Fatalf("persistOutbound put message it should not have")
-	}
-
-	if len(ts.mget) != 0 {
-		t.Fatalf("persistOutbound get message it should not have")
-	}
-
-	if len(ts.mdel) != 1 {
-		t.Fatalf("persistOutbound del message it should not have")
-	}
-}
-
-func Test_persistOutbound_pubrec(t *testing.T) {
-	ts := &TestStore{}
-	m := packets.NewControlPacket(packets.Pubrec).(*packets.PubrecPacket)
-	persistOutbound(ts, m)
-
-	if len(ts.mput) != 0 {
-		t.Fatalf("persistOutbound put message it should not have")
-	}
-
-	if len(ts.mget) != 0 {
-		t.Fatalf("persistOutbound get message it should not have")
-	}
-
-	if len(ts.mdel) != 0 {
-		t.Fatalf("persistOutbound del message it should not have")
-	}
-}
-
-func Test_persistOutbound_pubrel(t *testing.T) {
-	ts := &TestStore{}
-	m := packets.NewControlPacket(packets.Pubrel).(*packets.PubrelPacket)
-	m.MessageID = 43
-
-	persistOutbound(ts, m)
-
-	if len(ts.mput) != 1 || ts.mput[0] != 43 {
-		t.Fatalf("persistOutbound put message it should not have")
-	}
-
-	if len(ts.mget) != 0 {
-		t.Fatalf("persistOutbound get message it should not have")
-	}
-
-	if len(ts.mdel) != 0 {
-		t.Fatalf("persistOutbound del message it should not have")
-	}
-}
-
-func Test_persistOutbound_pubcomp(t *testing.T) {
-	ts := &TestStore{}
-	m := packets.NewControlPacket(packets.Pubcomp).(*packets.PubcompPacket)
-	persistOutbound(ts, m)
-
-	if len(ts.mput) != 0 {
-		t.Fatalf("persistOutbound put message it should not have")
-	}
-
-	if len(ts.mget) != 0 {
-		t.Fatalf("persistOutbound get message it should not have")
-	}
-
-	if len(ts.mdel) != 1 {
-		t.Fatalf("persistOutbound del message it should not have")
-	}
-}
-
-func Test_persistOutbound_subscribe(t *testing.T) {
-	ts := &TestStore{}
-	m := packets.NewControlPacket(packets.Subscribe).(*packets.SubscribePacket)
-	m.Topics = []string{"/posub"}
-	m.Qoss = []byte{1}
-	m.MessageID = 44
-	persistOutbound(ts, m)
-
-	if len(ts.mput) != 1 || ts.mput[0] != 44 {
-		t.Fatalf("persistOutbound put message it should not have")
-	}
-
-	if len(ts.mget) != 0 {
-		t.Fatalf("persistOutbound get message it should not have")
-	}
-
-	if len(ts.mdel) != 0 {
-		t.Fatalf("persistOutbound del message it should not have")
-	}
-}
-
-func Test_persistOutbound_unsubscribe(t *testing.T) {
-	ts := &TestStore{}
-	m := packets.NewControlPacket(packets.Unsubscribe).(*packets.UnsubscribePacket)
-	m.Topics = []string{"/posub"}
-	m.MessageID = 45
-	persistOutbound(ts, m)
-
-	if len(ts.mput) != 1 || ts.mput[0] != 45 {
-		t.Fatalf("persistOutbound put message it should not have")
-	}
-
-	if len(ts.mget) != 0 {
-		t.Fatalf("persistOutbound get message it should not have")
-	}
-
-	if len(ts.mdel) != 0 {
-		t.Fatalf("persistOutbound del message it should not have")
-	}
-}
-
-func Test_persistOutbound_pingreq(t *testing.T) {
-	ts := &TestStore{}
-	m := packets.NewControlPacket(packets.Pingreq)
-	persistOutbound(ts, m)
-
-	if len(ts.mput) != 0 {
-		t.Fatalf("persistOutbound put message it should not have")
-	}
-
-	if len(ts.mget) != 0 {
-		t.Fatalf("persistOutbound get message it should not have")
-	}
-
-	if len(ts.mdel) != 0 {
-		t.Fatalf("persistOutbound del message it should not have")
-	}
-}
-
-func Test_persistOutbound_disconnect(t *testing.T) {
-	ts := &TestStore{}
-	m := packets.NewControlPacket(packets.Disconnect)
-	persistOutbound(ts, m)
-
-	if len(ts.mput) != 0 {
-		t.Fatalf("persistOutbound put message it should not have")
-	}
-
-	if len(ts.mget) != 0 {
-		t.Fatalf("persistOutbound get message it should not have")
-	}
-
-	if len(ts.mdel) != 0 {
-		t.Fatalf("persistOutbound del message it should not have")
-	}
-}
-
-/************************
- **** persistInbound ****
- ************************/
-
-func Test_persistInbound_connack(t *testing.T) {
-	ts := &TestStore{}
-	m := packets.NewControlPacket(packets.Connack)
-	persistInbound(ts, m)
-
-	if len(ts.mput) != 0 {
-		t.Fatalf("persistInbound in bad state")
-	}
-
-	if len(ts.mget) != 0 {
-		t.Fatalf("persistInbound in bad state")
-	}
-
-	if len(ts.mdel) != 0 {
-		t.Fatalf("persistInbound in bad state")
-	}
-}
-
-func Test_persistInbound_publish_0(t *testing.T) {
-	ts := &TestStore{}
-	m := packets.NewControlPacket(packets.Publish).(*packets.PublishPacket)
-	m.Qos = 0
-	m.TopicName = "/pipub0"
-	m.Payload = []byte{0xCC, 0x01}
-	m.MessageID = 50
-	persistInbound(ts, m)
-
-	if len(ts.mput) != 0 {
-		t.Fatalf("persistInbound in bad state")
-	}
-
-	if len(ts.mget) != 0 {
-		t.Fatalf("persistInbound in bad state")
-	}
-
-	if len(ts.mdel) != 0 {
-		t.Fatalf("persistInbound in bad state")
-	}
-}
-
-func Test_persistInbound_publish_1(t *testing.T) {
-	ts := &TestStore{}
-	m := packets.NewControlPacket(packets.Publish).(*packets.PublishPacket)
-	m.Qos = 1
-	m.TopicName = "/pipub1"
-	m.Payload = []byte{0xCC, 0x02}
-	m.MessageID = 51
-	persistInbound(ts, m)
-
-	if len(ts.mput) != 1 || ts.mput[0] != 51 {
-		t.Fatalf("persistInbound in bad state")
-	}
-
-	if len(ts.mget) != 0 {
-		t.Fatalf("persistInbound in bad state")
-	}
-
-	if len(ts.mdel) != 0 {
-		t.Fatalf("persistInbound in bad state")
-	}
-}
-
-func Test_persistInbound_publish_2(t *testing.T) {
-	ts := &TestStore{}
-	m := packets.NewControlPacket(packets.Publish).(*packets.PublishPacket)
-	m.Qos = 2
-	m.TopicName = "/pipub2"
-	m.Payload = []byte{0xCC, 0x03}
-	m.MessageID = 52
-	persistInbound(ts, m)
-
-	if len(ts.mput) != 1 || ts.mput[0] != 52 {
-		t.Fatalf("persistInbound in bad state")
-	}
-
-	if len(ts.mget) != 0 {
-		t.Fatalf("persistInbound in bad state")
-	}
-
-	if len(ts.mdel) != 0 {
-		t.Fatalf("persistInbound in bad state")
-	}
-}
-
-func Test_persistInbound_puback(t *testing.T) {
-	ts := &TestStore{}
-	pub := packets.NewControlPacket(packets.Publish).(*packets.PublishPacket)
-	pub.Qos = 1
-	pub.TopicName = "/pub1"
-	pub.Payload = []byte{0xCC, 0x04}
-	pub.MessageID = 53
-	publishKey := inboundKeyFromMID(pub.MessageID)
-	ts.Put(publishKey, pub)
-
-	m := packets.NewControlPacket(packets.Puback).(*packets.PubackPacket)
-	m.MessageID = 53
-
-	persistInbound(ts, m) // "deletes" packets.Publish from store
-
-	if len(ts.mput) != 1 { // not actually deleted in TestStore
-		t.Fatalf("persistInbound in bad state")
-	}
-
-	if len(ts.mget) != 0 {
-		t.Fatalf("persistInbound in bad state")
-	}
-
-	if len(ts.mdel) != 1 || ts.mdel[0] != 53 {
-		t.Fatalf("persistInbound in bad state")
-	}
-}
-
-func Test_persistInbound_pubrec(t *testing.T) {
-	ts := &TestStore{}
-	pub := packets.NewControlPacket(packets.Publish).(*packets.PublishPacket)
-	pub.Qos = 2
-	pub.TopicName = "/pub2"
-	pub.Payload = []byte{0xCC, 0x05}
-	pub.MessageID = 54
-	publishKey := inboundKeyFromMID(pub.MessageID)
-	ts.Put(publishKey, pub)
-
-	m := packets.NewControlPacket(packets.Pubrec).(*packets.PubrecPacket)
-	m.MessageID = 54
-
-	persistInbound(ts, m)
-
-	if len(ts.mput) != 1 || ts.mput[0] != 54 {
-		t.Fatalf("persistInbound in bad state")
-	}
-
-	if len(ts.mget) != 0 {
-		t.Fatalf("persistInbound in bad state")
-	}
-
-	if len(ts.mdel) != 0 {
-		t.Fatalf("persistInbound in bad state")
-	}
-}
-
-func Test_persistInbound_pubrel(t *testing.T) {
-	ts := &TestStore{}
-	pub := packets.NewControlPacket(packets.Publish).(*packets.PublishPacket)
-	pub.Qos = 2
-	pub.TopicName = "/pub2"
-	pub.Payload = []byte{0xCC, 0x06}
-	pub.MessageID = 55
-	publishKey := inboundKeyFromMID(pub.MessageID)
-	ts.Put(publishKey, pub)
-
-	m := packets.NewControlPacket(packets.Pubrel).(*packets.PubrelPacket)
-	m.MessageID = 55
-
-	persistInbound(ts, m) // will overwrite publish
-
-	if len(ts.mput) != 2 {
-		t.Fatalf("persistInbound in bad state")
-	}
-
-	if len(ts.mget) != 0 {
-		t.Fatalf("persistInbound in bad state")
-	}
-
-	if len(ts.mdel) != 0 {
-		t.Fatalf("persistInbound in bad state")
-	}
-}
-
-func Test_persistInbound_pubcomp(t *testing.T) {
-	ts := &TestStore{}
-
-	m := packets.NewControlPacket(packets.Pubcomp).(*packets.PubcompPacket)
-	m.MessageID = 56
-
-	persistInbound(ts, m)
-
-	if len(ts.mput) != 0 {
-		t.Fatalf("persistInbound in bad state")
-	}
-
-	if len(ts.mget) != 0 {
-		t.Fatalf("persistInbound in bad state")
-	}
-
-	if len(ts.mdel) != 1 || ts.mdel[0] != 56 {
-		t.Fatalf("persistInbound in bad state")
-	}
-}
-
-func Test_persistInbound_suback(t *testing.T) {
-	ts := &TestStore{}
-
-	m := packets.NewControlPacket(packets.Suback).(*packets.SubackPacket)
-	m.MessageID = 57
-
-	persistInbound(ts, m)
-
-	if len(ts.mput) != 0 {
-		t.Fatalf("persistInbound in bad state")
-	}
-
-	if len(ts.mget) != 0 {
-		t.Fatalf("persistInbound in bad state")
-	}
-
-	if len(ts.mdel) != 1 || ts.mdel[0] != 57 {
-		t.Fatalf("persistInbound in bad state")
-	}
-}
-
-func Test_persistInbound_unsuback(t *testing.T) {
-	ts := &TestStore{}
-
-	m := packets.NewControlPacket(packets.Unsuback).(*packets.UnsubackPacket)
-	m.MessageID = 58
-
-	persistInbound(ts, m)
-
-	if len(ts.mput) != 0 {
-		t.Fatalf("persistInbound in bad state")
-	}
-
-	if len(ts.mget) != 0 {
-		t.Fatalf("persistInbound in bad state")
-	}
-
-	if len(ts.mdel) != 1 || ts.mdel[0] != 58 {
-		t.Fatalf("persistInbound in bad state")
-	}
-}
-
-func Test_persistInbound_pingresp(t *testing.T) {
-	ts := &TestStore{}
-	m := packets.NewControlPacket(packets.Pingresp)
-
-	persistInbound(ts, m)
-
-	if len(ts.mput) != 0 {
-		t.Fatalf("persistInbound in bad state")
-	}
-
-	if len(ts.mget) != 0 {
-		t.Fatalf("persistInbound in bad state")
-	}
-
-	if len(ts.mdel) != 0 {
-		t.Fatalf("persistInbound in bad state")
-	}
-}
-
-/***********
- * restore *
- ***********/
-
-func ensureRestoreDir() {
-	if exists("/tmp/restore") {
-		rerr := os.RemoveAll("/tmp/restore")
-		chkerr(rerr)
-	}
-	os.Mkdir("/tmp/restore", 0766)
-}
-
-func writeToRestore(fname, content string) {
-	f, cerr := os.Create("/tmp/restore/" + fname)
-	chkerr(cerr)
-	chkcond(f != nil)
-	w := bufio.NewWriter(f)
-	w.Write([]byte(content))
-	w.Flush()
-	f.Close()
-}
-
-func verifyFromRestore(fname, content string, t *testing.T) {
-	msg, oerr := os.Open("/tmp/restore/" + fname)
-	chkerr(oerr)
-	all, rerr := ioutil.ReadAll(msg)
-	chkerr(rerr)
-	msg.Close()
-	s := string(all)
-	if s != content {
-		t.Fatalf("verify content expected `%s` but got `%s`", content, s)
-	}
-}
-
-func Test_restore_1(t *testing.T) {
-	ensureRestoreDir()
-
-	writeToRestore("i.1.bkp", "this is critical 1")
-
-	restore("/tmp/restore")
-
-	chkcond(!exists("/tmp/restore/i.1.bkp"))
-	chkcond(exists("/tmp/restore/i.1.msg"))
-
-	verifyFromRestore("i.1.msg", "this is critical 1", t)
-}
-
-func Test_restore_2(t *testing.T) {
-	ensureRestoreDir()
-
-	writeToRestore("o.2.msg", "this is critical 2")
-
-	restore("/tmp/restore")
-
-	chkcond(!exists("/tmp/restore/o.2.bkp"))
-	chkcond(exists("/tmp/restore/o.2.msg"))
-
-	verifyFromRestore("o.2.msg", "this is critical 2", t)
-}
-
-func Test_restore_3(t *testing.T) {
-	ensureRestoreDir()
-
-	N := 20
-	// evens are .msg
-	// odds are .bkp
-	for i := 0; i < N; i++ {
-		content := fmt.Sprintf("foo %d bar", i)
-		if i%2 == 0 {
-			mname := fmt.Sprintf("i.%d.msg", i)
-			writeToRestore(mname, content)
-		} else {
-			mname := fmt.Sprintf("i.%d.bkp", i)
-			writeToRestore(mname, content)
-		}
-	}
-
-	restore("/tmp/restore")
-
-	for i := 0; i < N; i++ {
-		mname := fmt.Sprintf("i.%d.msg", i)
-		bname := fmt.Sprintf("i.%d.bkp", i)
-		content := fmt.Sprintf("foo %d bar", i)
-		chkcond(!exists("/tmp/restore/" + bname))
-		chkcond(exists("/tmp/restore/" + mname))
-
-		verifyFromRestore(mname, content, t)
-	}
-}
diff --git a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/unit_topic_test.go b/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/unit_topic_test.go
deleted file mode 100644
index da2b240e8..000000000
--- a/Godeps/_workspace/src/git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git/unit_topic_test.go
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 2013 IBM Corp.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Seth Hoenig
- *    Allan Stockdill-Mander
- *    Mike Robertson
- */
-
-package mqtt
-
-import (
-	"testing"
-)
-
-func Test_ValidateTopicAndQos_qos3(t *testing.T) {
-	e := validateTopicAndQos("a", 3)
-	if e != ErrInvalidQos {
-		t.Fatalf("invalid error for invalid qos")
-	}
-}
-
-func Test_ValidateTopicAndQos_ES(t *testing.T) {
-	e := validateTopicAndQos("", 0)
-	if e != ErrInvalidTopicEmptyString {
-		t.Fatalf("invalid error for empty topic name")
-	}
-}
-
-func Test_ValidateTopicAndQos_a_0(t *testing.T) {
-	e := validateTopicAndQos("a", 0)
-	if e != nil {
-		t.Fatalf("error from valid NewTopicFilter")
-	}
-}
-
-func Test_ValidateTopicAndQos_H(t *testing.T) {
-	e := validateTopicAndQos("a/#/c", 0)
-	if e != ErrInvalidTopicMultilevel {
-		t.Fatalf("invalid error for bad multilevel topic filter")
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/.gitignore b/Godeps/_workspace/src/github.com/Shopify/sarama/.gitignore
deleted file mode 100644
index 3591f9ff3..000000000
--- a/Godeps/_workspace/src/github.com/Shopify/sarama/.gitignore
+++ /dev/null
@@ -1,24 +0,0 @@
-# Compiled Object files, Static and Dynamic libs (Shared Objects)
-*.o
-*.a
-*.so
-*.test
-
-# Folders
-_obj
-_test
-.vagrant
-
-# Architecture specific extensions/prefixes
-*.[568vq]
-[568vq].out
-
-*.cgo1.go
-*.cgo2.c
-_cgo_defun.c
-_cgo_gotypes.go
-_cgo_export.*
-
-_testmain.go
-
-*.exe
diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/.travis.yml b/Godeps/_workspace/src/github.com/Shopify/sarama/.travis.yml
deleted file mode 100644
index a9e5cc3cb..000000000
--- a/Godeps/_workspace/src/github.com/Shopify/sarama/.travis.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-language: go
-go:
-- 1.3.3
-- 1.4.2
-
-env:
-  global:
-  - KAFKA_PEERS=localhost:9091,localhost:9092,localhost:9093,localhost:9094,localhost:9095
-  - TOXIPROXY_ADDR=http://localhost:8474
-  - KAFKA_INSTALL_ROOT=/home/travis/kafka
-  - KAFKA_HOSTNAME=localhost
-  - DEBUG=true
-  matrix:
-  - KAFKA_VERSION=0.8.1.1
-  - KAFKA_VERSION=0.8.2.1
-
-before_install:
-- export REPOSITORY_ROOT=${TRAVIS_BUILD_DIR}
-- vagrant/install_cluster.sh
-- vagrant/boot_cluster.sh
-- vagrant/create_topics.sh
-
-
-install:
-- make install_dependencies
-
-script:
-- make test
-- make vet
-- make errcheck
-- make fmt
-
-matrix:
-  include:
-    - go: tip
-      env: KAFKA_VERSION=0.8.2.1
-  allow_failures:
-    - go: tip
-  fast_finish: true
-
-sudo: false
diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/CHANGELOG.md b/Godeps/_workspace/src/github.com/Shopify/sarama/CHANGELOG.md
deleted file mode 100644
index 5bea6bc3b..000000000
--- a/Godeps/_workspace/src/github.com/Shopify/sarama/CHANGELOG.md
+++ /dev/null
@@ -1,157 +0,0 @@
-# Changelog
-
-#### Version 1.5.0 (unreleased)
-
-New Features:
- - TLS-encrypted network connections are now supported. This feature is subject
-   to change when Kafka releases built-in TLS support, but for now this is
-   enough to work with TLS-terminating proxies
-   ([#154](https://github.com/Shopify/sarama/pull/154)).
-
-Improvements:
- - The consumer will not block if a single partition is not drained by the user;
-   all other partitions will continue to consume normally
-   ([#485](https://github.com/Shopify/sarama/pull/485)).
- - Formatting of error strings has been much improved
-   ([#495](https://github.com/Shopify/sarama/pull/495)).
- - Internal refactoring of the producer for code cleanliness and to enable
-   future work ([#300](https://github.com/Shopify/sarama/pull/300)).
-
-Bug Fixes:
- - Fix a potential deadlock in the consumer on shutdown
-   ([#475](https://github.com/Shopify/sarama/pull/475)).
-
-#### Version 1.4.3 (2015-07-21)
-
-Bug Fixes:
- - Don't include the partitioner in the producer's "fetch partitions"
-   circuit-breaker ([#466](https://github.com/Shopify/sarama/pull/466)).
- - Don't retry messages until the broker is closed when abandoning a broker in
-   the producer ([#468](https://github.com/Shopify/sarama/pull/468)).
- - Update the import path for snappy-go, it has moved again and the API has
-   changed slightly ([#486](https://github.com/Shopify/sarama/pull/486)).
-
-#### Version 1.4.2 (2015-05-27)
-
-Bug Fixes:
- - Update the import path for snappy-go, it has moved from google code to github
-   ([#456](https://github.com/Shopify/sarama/pull/456)).
-
-#### Version 1.4.1 (2015-05-25)
-
-Improvements:
- - Optimizations when decoding snappy messages, thanks to John Potocny
-   ([#446](https://github.com/Shopify/sarama/pull/446)).
-
-Bug Fixes:
- - Fix hypothetical race conditions on producer shutdown
-   ([#450](https://github.com/Shopify/sarama/pull/450),
-   [#451](https://github.com/Shopify/sarama/pull/451)).
-
-#### Version 1.4.0 (2015-05-01)
-
-New Features:
- - The consumer now implements `Topics()` and `Partitions()` methods to enable
-   users to dynamically choose what topics/partitions to consume without
-   instantiating a full client
-   ([#431](https://github.com/Shopify/sarama/pull/431)).
- - The partition-consumer now exposes the high water mark offset value returned
-   by the broker via the `HighWaterMarkOffset()` method ([#339](https://github.com/Shopify/sarama/pull/339)).
- - Added a `kafka-console-consumer` tool capable of handling multiple
-   partitions, and deprecated the now-obsolete `kafka-console-partitionConsumer`
-   ([#439](https://github.com/Shopify/sarama/pull/439),
-   [#442](https://github.com/Shopify/sarama/pull/442)).
-
-Improvements:
- - The producer's logging during retry scenarios is more consistent, more
-   useful, and slightly less verbose
-   ([#429](https://github.com/Shopify/sarama/pull/429)).
- - The client now shuffles its initial list of seed brokers in order to prevent
-   thundering herd on the first broker in the list
-   ([#441](https://github.com/Shopify/sarama/pull/441)).
-
-Bug Fixes:
- - The producer now correctly manages its state if retries occur when it is
-   shutting down, fixing several instances of confusing behaviour and at least
-   one potential deadlock ([#419](https://github.com/Shopify/sarama/pull/419)).
- - The consumer now handles messages for different partitions asynchronously,
-   making it much more resilient to specific user code ordering
-   ([#325](https://github.com/Shopify/sarama/pull/325)).
-
-#### Version 1.3.0 (2015-04-16)
-
-New Features:
- - The client now tracks consumer group coordinators using
-   ConsumerMetadataRequests similar to how it tracks partition leadership using
-   regular MetadataRequests ([#411](https://github.com/Shopify/sarama/pull/411)).
-   This adds two methods to the client API:
-   - `Coordinator(consumerGroup string) (*Broker, error)`
-   - `RefreshCoordinator(consumerGroup string) error`
-
-Improvements:
- - ConsumerMetadataResponses now automatically create a Broker object out of the
-   ID/address/port combination for the Coordinator; accessing the fields
-   individually has been deprecated
-   ([#413](https://github.com/Shopify/sarama/pull/413)).
- - Much improved handling of `OffsetOutOfRange` errors in the consumer.
-   Consumers will fail to start if the provided offset is out of range
-   ([#418](https://github.com/Shopify/sarama/pull/418))
-   and they will automatically shut down if the offset falls out of range
-   ([#424](https://github.com/Shopify/sarama/pull/424)).
- - Small performance improvement in encoding and decoding protocol messages
-   ([#427](https://github.com/Shopify/sarama/pull/427)).
-
-Bug Fixes:
- - Fix a rare race condition in the client's background metadata refresher if
-   it happens to be activated while the client is being closed
-   ([#422](https://github.com/Shopify/sarama/pull/422)).
-
-#### Version 1.2.0 (2015-04-07)
-
-Improvements:
- - The producer's behaviour when `Flush.Frequency` is set is now more intuitive
-   ([#389](https://github.com/Shopify/sarama/pull/389)).
- - The producer is now somewhat more memory-efficient during and after retrying
-   messages due to an improved queue implementation
-   ([#396](https://github.com/Shopify/sarama/pull/396)).
- - The consumer produces much more useful logging output when leadership
-   changes ([#385](https://github.com/Shopify/sarama/pull/385)).
- - The client's `GetOffset` method will now automatically refresh metadata and
-   retry once in the event of stale information or similar
-   ([#394](https://github.com/Shopify/sarama/pull/394)).
- - Broker connections now have support for using TCP keepalives
-   ([#407](https://github.com/Shopify/sarama/issues/407)).
-
-Bug Fixes:
- - The OffsetCommitRequest message now correctly implements all three possible
-   API versions ([#390](https://github.com/Shopify/sarama/pull/390),
-   [#400](https://github.com/Shopify/sarama/pull/400)).
-
-#### Version 1.1.0 (2015-03-20)
-
-Improvements:
- - Wrap the producer's partitioner call in a circuit-breaker so that repeatedly
-   broken topics don't choke throughput
-   ([#373](https://github.com/Shopify/sarama/pull/373)).
-
-Bug Fixes:
- - Fix the producer's internal reference counting in certain unusual scenarios
-   ([#367](https://github.com/Shopify/sarama/pull/367)).
- - Fix the consumer's internal reference counting in certain unusual scenarios
-   ([#369](https://github.com/Shopify/sarama/pull/369)).
- - Fix a condition where the producer's internal control messages could have
-   gotten stuck ([#368](https://github.com/Shopify/sarama/pull/368)).
- - Fix an issue where invalid partition lists would be cached when asking for
-   metadata for a non-existant topic ([#372](https://github.com/Shopify/sarama/pull/372)).
-
-
-#### Version 1.0.0 (2015-03-17)
-
-Version 1.0.0 is the first tagged version, and is almost a complete rewrite. The primary differences with previous untagged versions are:
-
-- The producer has been rewritten; there is now a `SyncProducer` with a blocking API, and an `AsyncProducer` that is non-blocking.
-- The consumer has been rewritten to only open one connection per broker instead of one connection per partition.
-- The main types of Sarama are now interfaces to make depedency injection easy; mock implementations for `Consumer`, `SyncProducer` and `AsyncProducer` are provided in the `github.com/Shopify/sarama/mocks` package.
-- For most uses cases, it is no longer necessary to open a `Client`; this will be done for you.
-- All the configuration values have been unified in the `Config` struct.
-- Much improved test suite.
diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/CONTRIBUTING.md b/Godeps/_workspace/src/github.com/Shopify/sarama/CONTRIBUTING.md
deleted file mode 100644
index b0f107cbc..000000000
--- a/Godeps/_workspace/src/github.com/Shopify/sarama/CONTRIBUTING.md
+++ /dev/null
@@ -1,31 +0,0 @@
-# Contributing
-
-Contributions are always welcome, both reporting issues and submitting pull requests!
-
-### Reporting issues
-
-Please make sure to include any potentially useful information in the issue, so we can pinpoint the issue faster without going back and forth.
-
-- What SHA of Sarama are you running? If this is not the latest SHA on the master branch, please try if the problem persists with the latest version.
-- You can set `sarama.Logger` to a [log.Logger](http://golang.org/pkg/log/#Logger) instance to capture debug output. Please include it in your issue description.
-- Also look at the logs of the Kafka broker you are connected to. If you see anything out of the ordinary, please include it.
-
-Also, please include the following information about your environment, so we can help you faster:
-
-- What version of Kafka are you using?
-- What version of Go are you using?
-- What are the values of your Producer/Consumer/Client configuration?
-
-
-### Submitting pull requests
-
-We will gladly accept bug fixes, or additions to this library. Please fork this library, commit & push your changes, and open a pull request. Because this library is in production use by many people and applications, we code review all additions. To make the review process go as smooth as possible, please consider the following.
-
-- If you plan to work on something major, please open an issue to discuss the design first.
-- Don't break backwards compatibility. If you really have to, open an issue to discuss this first.
-- Make sure to use the `go fmt` command to format your code according to the standards. Even better, set up your editor to do this for you when saving.
-- Run [go vet](https://godoc.org/golang.org/x/tools/cmd/vet) to detect any suspicious constructs in your code that could be bugs.
-- Explicitly handle all error return values. If you really want to ignore an error value, you can assign it to `_`.You can use [errcheck](https://github.com/kisielk/errcheck) to verify whether you have handled all errors.
-- You may also want to run [golint](https://github.com/golang/lint) as well to detect style problems.
-- Add tests that cover the changes you made. Make sure to run `go test` with the `-race` argument to test for race conditions.
-- Make sure your code is supported by all the Go versions we support. You can rely on [Travis CI](https://travis-ci.org/Shopify/sarama) for testing older Go versions
diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/MIT-LICENSE b/Godeps/_workspace/src/github.com/Shopify/sarama/MIT-LICENSE
deleted file mode 100644
index 8121b63b1..000000000
--- a/Godeps/_workspace/src/github.com/Shopify/sarama/MIT-LICENSE
+++ /dev/null
@@ -1,20 +0,0 @@
-Copyright (c) 2013 Evan Huus
-
-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/Shopify/sarama/Makefile b/Godeps/_workspace/src/github.com/Shopify/sarama/Makefile
deleted file mode 100644
index b76e97a97..000000000
--- a/Godeps/_workspace/src/github.com/Shopify/sarama/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-default: fmt vet errcheck test
-
-test:
-	go test -v -timeout 60s -race ./...
-
-vet:
-	go vet ./...
-
-errcheck:
-	errcheck github.com/Shopify/sarama/...
-
-fmt:
-	@if [ -n "$$(go fmt ./...)" ]; then echo 'Please run go fmt on your code.' && exit 1; fi
-
-install_dependencies: install_errcheck install_go_vet get
-
-install_errcheck:
-	go get github.com/kisielk/errcheck
-
-install_go_vet:
-	go get golang.org/x/tools/cmd/vet
-
-get:
-	go get -t
diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/README.md b/Godeps/_workspace/src/github.com/Shopify/sarama/README.md
deleted file mode 100644
index 486372730..000000000
--- a/Godeps/_workspace/src/github.com/Shopify/sarama/README.md
+++ /dev/null
@@ -1,31 +0,0 @@
-sarama
-======
-
-[![GoDoc](https://godoc.org/github.com/Shopify/sarama?status.png)](https://godoc.org/github.com/Shopify/sarama)
-[![Build Status](https://travis-ci.org/Shopify/sarama.svg?branch=master)](https://travis-ci.org/Shopify/sarama)
-
-Sarama is an MIT-licensed Go client library for Apache Kafka 0.8 (and later).
-
-### Getting started
-
-- API documentation and example are available via godoc at https://godoc.org/github.com/Shopify/sarama.
-- Mocks for testing are available in the [mocks](./mocks) subpackage.
-- The [examples](./examples) directory contains more elaborate example applications.
-- The [tools](./tools) directory contains command line tools that can be useful for testing, diagnostics, and instrumentation.
-- There is a google group for Kafka client users and authors at https://groups.google.com/forum/#!forum/kafka-clients
-
-### Compatibility and API stability
-
-Sarama provides a "2 releases + 2 months" compatibility guarantee: we support the two latest releases of Kafka
-and Go, and we provide a two month grace period for older releases. This means we currently officially
-support Go 1.3 and 1.4, and Kafka 0.8.1 and 0.8.2.
-
-Sarama follows semantic versioning and provides API stability via the gopkg.in service.
-You can import a version with a guaranteed stable API via http://gopkg.in/Shopify/sarama.v1.
-A changelog is available [here](CHANGELOG.md).
-
-### Other
-
-* [Sarama wiki](https://github.com/Shopify/sarama/wiki) to get started hacking on sarama itself.
-* [Kafka Project Home](https://kafka.apache.org/)
-* [Kafka Protocol Specification](https://cwiki.apache.org/confluence/display/KAFKA/A+Guide+To+The+Kafka+Protocol)
diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/Vagrantfile b/Godeps/_workspace/src/github.com/Shopify/sarama/Vagrantfile
deleted file mode 100644
index 4862dd936..000000000
--- a/Godeps/_workspace/src/github.com/Shopify/sarama/Vagrantfile
+++ /dev/null
@@ -1,22 +0,0 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-
-# Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
-VAGRANTFILE_API_VERSION = "2"
-
-MEMORY = 3072
-
-Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
-  config.vm.box = "hashicorp/precise64"
-
-  config.vm.provision :shell, path: "vagrant/provision.sh"
-
-  config.vm.network "private_network", ip: "192.168.100.67"
-
-  config.vm.provider "vmware_fusion" do |v|
-    v.vmx["memsize"] = MEMORY.to_s
-  end
-  config.vm.provider "virtualbox" do |v|
-    v.memory = MEMORY
-  end
-end
diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/async_producer.go b/Godeps/_workspace/src/github.com/Shopify/sarama/async_producer.go
deleted file mode 100644
index 8e229490f..000000000
--- a/Godeps/_workspace/src/github.com/Shopify/sarama/async_producer.go
+++ /dev/null
@@ -1,924 +0,0 @@
-package sarama
-
-import (
-	"fmt"
-	"sync"
-	"time"
-
-	"github.com/eapache/go-resiliency/breaker"
-	"github.com/eapache/queue"
-)
-
-// AsyncProducer publishes Kafka messages using a non-blocking API. It routes messages
-// to the correct broker for the provided topic-partition, refreshing metadata as appropriate,
-// and parses responses for errors. You must read from the Errors() channel or the
-// producer will deadlock. You must call Close() or AsyncClose() on a producer to avoid
-// leaks: it will not be garbage-collected automatically when it passes out of
-// scope.
-type AsyncProducer interface {
-
-	// AsyncClose triggers a shutdown of the producer, flushing any messages it may have
-	// buffered. The shutdown has completed when both the Errors and Successes channels
-	// have been closed. When calling AsyncClose, you *must* continue to read from those
-	// channels in order to drain the results of any messages in flight.
-	AsyncClose()
-
-	// Close shuts down the producer and flushes any messages it may have buffered.
-	// You must call this function before a producer object passes out of scope, as
-	// it may otherwise leak memory. You must call this before calling Close on the
-	// underlying client.
-	Close() error
-
-	// Input is the input channel for the user to write messages to that they wish to send.
-	Input() chan<- *ProducerMessage
-
-	// Successes is the success output channel back to the user when AckSuccesses is enabled.
-	// If Return.Successes is true, you MUST read from this channel or the Producer will deadlock.
-	// It is suggested that you send and read messages together in a single select statement.
-	Successes() <-chan *ProducerMessage
-
-	// Errors is the error output channel back to the user. You MUST read from this channel
-	// or the Producer will deadlock when the channel is full. Alternatively, you can set
-	// Producer.Return.Errors in your config to false, which prevents errors to be returned.
-	Errors() <-chan *ProducerError
-}
-
-type asyncProducer struct {
-	client    Client
-	conf      *Config
-	ownClient bool
-
-	errors                    chan *ProducerError
-	input, successes, retries chan *ProducerMessage
-	inFlight                  sync.WaitGroup
-
-	brokers    map[*Broker]chan<- *ProducerMessage
-	brokerRefs map[chan<- *ProducerMessage]int
-	brokerLock sync.Mutex
-}
-
-// NewAsyncProducer creates a new AsyncProducer using the given broker addresses and configuration.
-func NewAsyncProducer(addrs []string, conf *Config) (AsyncProducer, error) {
-	client, err := NewClient(addrs, conf)
-	if err != nil {
-		return nil, err
-	}
-
-	p, err := NewAsyncProducerFromClient(client)
-	if err != nil {
-		return nil, err
-	}
-	p.(*asyncProducer).ownClient = true
-	return p, nil
-}
-
-// NewAsyncProducerFromClient creates a new Producer using the given client. It is still
-// necessary to call Close() on the underlying client when shutting down this producer.
-func NewAsyncProducerFromClient(client Client) (AsyncProducer, error) {
-	// Check that we are not dealing with a closed Client before processing any other arguments
-	if client.Closed() {
-		return nil, ErrClosedClient
-	}
-
-	p := &asyncProducer{
-		client:     client,
-		conf:       client.Config(),
-		errors:     make(chan *ProducerError),
-		input:      make(chan *ProducerMessage),
-		successes:  make(chan *ProducerMessage),
-		retries:    make(chan *ProducerMessage),
-		brokers:    make(map[*Broker]chan<- *ProducerMessage),
-		brokerRefs: make(map[chan<- *ProducerMessage]int),
-	}
-
-	// launch our singleton dispatchers
-	go withRecover(p.dispatcher)
-	go withRecover(p.retryHandler)
-
-	return p, nil
-}
-
-type flagSet int8
-
-const (
-	chaser   flagSet = 1 << iota // message is last in a group that failed
-	shutdown                     // start the shutdown process
-)
-
-// ProducerMessage is the collection of elements passed to the Producer in order to send a message.
-type ProducerMessage struct {
-	Topic string  // The Kafka topic for this message.
-	Key   Encoder // The partitioning key for this message. It must implement the Encoder interface. Pre-existing Encoders include StringEncoder and ByteEncoder.
-	Value Encoder // The actual message to store in Kafka. It must implement the Encoder interface. Pre-existing Encoders include StringEncoder and ByteEncoder.
-
-	// These are filled in by the producer as the message is processed
-	Offset    int64 // Offset is the offset of the message stored on the broker. This is only guaranteed to be defined if the message was successfully delivered and RequiredAcks is not NoResponse.
-	Partition int32 // Partition is the partition that the message was sent to. This is only guaranteed to be defined if the message was successfully delivered.
-
-	Metadata interface{} // This field is used to hold arbitrary data you wish to include so it will be available when receiving on the Successes and Errors channels.  Sarama completely ignores this field and is only to be used for pass-through data.
-
-	retries int
-	flags   flagSet
-}
-
-func (m *ProducerMessage) byteSize() int {
-	size := 26 // the metadata overhead of CRC, flags, etc.
-	if m.Key != nil {
-		size += m.Key.Length()
-	}
-	if m.Value != nil {
-		size += m.Value.Length()
-	}
-	return size
-}
-
-func (m *ProducerMessage) clear() {
-	m.flags = 0
-	m.retries = 0
-}
-
-// ProducerError is the type of error generated when the producer fails to deliver a message.
-// It contains the original ProducerMessage as well as the actual error value.
-type ProducerError struct {
-	Msg *ProducerMessage
-	Err error
-}
-
-func (pe ProducerError) Error() string {
-	return fmt.Sprintf("kafka: Failed to produce message to topic %s: %s", pe.Msg.Topic, pe.Err)
-}
-
-// ProducerErrors is a type that wraps a batch of "ProducerError"s and implements the Error interface.
-// It can be returned from the Producer's Close method to avoid the need to manually drain the Errors channel
-// when closing a producer.
-type ProducerErrors []*ProducerError
-
-func (pe ProducerErrors) Error() string {
-	return fmt.Sprintf("kafka: Failed to deliver %d messages.", len(pe))
-}
-
-func (p *asyncProducer) Errors() <-chan *ProducerError {
-	return p.errors
-}
-
-func (p *asyncProducer) Successes() <-chan *ProducerMessage {
-	return p.successes
-}
-
-func (p *asyncProducer) Input() chan<- *ProducerMessage {
-	return p.input
-}
-
-func (p *asyncProducer) Close() error {
-	p.AsyncClose()
-
-	if p.conf.Producer.Return.Successes {
-		go withRecover(func() {
-			for _ = range p.successes {
-			}
-		})
-	}
-
-	var errors ProducerErrors
-	if p.conf.Producer.Return.Errors {
-		for event := range p.errors {
-			errors = append(errors, event)
-		}
-	}
-
-	if len(errors) > 0 {
-		return errors
-	}
-	return nil
-}
-
-func (p *asyncProducer) AsyncClose() {
-	go withRecover(p.shutdown)
-}
-
-// singleton
-// dispatches messages by topic
-func (p *asyncProducer) dispatcher() {
-	handlers := make(map[string]chan<- *ProducerMessage)
-	shuttingDown := false
-
-	for msg := range p.input {
-		if msg == nil {
-			Logger.Println("Something tried to send a nil message, it was ignored.")
-			continue
-		}
-
-		if msg.flags&shutdown != 0 {
-			shuttingDown = true
-			p.inFlight.Done()
-			continue
-		} else if msg.retries == 0 {
-			if shuttingDown {
-				// we can't just call returnError here because that decrements the wait group,
-				// which hasn't been incremented yet for this message, and shouldn't be
-				pErr := &ProducerError{Msg: msg, Err: ErrShuttingDown}
-				if p.conf.Producer.Return.Errors {
-					p.errors <- pErr
-				} else {
-					Logger.Println(pErr)
-				}
-				continue
-			}
-			p.inFlight.Add(1)
-		}
-
-		if (p.conf.Producer.Compression == CompressionNone && msg.Value != nil && msg.Value.Length() > p.conf.Producer.MaxMessageBytes) ||
-			(msg.byteSize() > p.conf.Producer.MaxMessageBytes) {
-
-			p.returnError(msg, ErrMessageSizeTooLarge)
-			continue
-		}
-
-		handler := handlers[msg.Topic]
-		if handler == nil {
-			handler = p.newTopicProducer(msg.Topic)
-			handlers[msg.Topic] = handler
-		}
-
-		handler <- msg
-	}
-
-	for _, handler := range handlers {
-		close(handler)
-	}
-}
-
-// one per topic
-// partitions messages, then dispatches them by partition
-type topicProducer struct {
-	parent *asyncProducer
-	topic  string
-	input  <-chan *ProducerMessage
-
-	breaker     *breaker.Breaker
-	handlers    map[int32]chan<- *ProducerMessage
-	partitioner Partitioner
-}
-
-func (p *asyncProducer) newTopicProducer(topic string) chan<- *ProducerMessage {
-	input := make(chan *ProducerMessage, p.conf.ChannelBufferSize)
-	tp := &topicProducer{
-		parent:      p,
-		topic:       topic,
-		input:       input,
-		breaker:     breaker.New(3, 1, 10*time.Second),
-		handlers:    make(map[int32]chan<- *ProducerMessage),
-		partitioner: p.conf.Producer.Partitioner(topic),
-	}
-	go withRecover(tp.dispatch)
-	return input
-}
-
-func (tp *topicProducer) dispatch() {
-	for msg := range tp.input {
-		if msg.retries == 0 {
-			if err := tp.partitionMessage(msg); err != nil {
-				tp.parent.returnError(msg, err)
-				continue
-			}
-		}
-
-		handler := tp.handlers[msg.Partition]
-		if handler == nil {
-			handler = tp.parent.newPartitionProducer(msg.Topic, msg.Partition)
-			tp.handlers[msg.Partition] = handler
-		}
-
-		handler <- msg
-	}
-
-	for _, handler := range tp.handlers {
-		close(handler)
-	}
-}
-
-func (tp *topicProducer) partitionMessage(msg *ProducerMessage) error {
-	var partitions []int32
-
-	err := tp.breaker.Run(func() (err error) {
-		if tp.partitioner.RequiresConsistency() {
-			partitions, err = tp.parent.client.Partitions(msg.Topic)
-		} else {
-			partitions, err = tp.parent.client.WritablePartitions(msg.Topic)
-		}
-		return
-	})
-
-	if err != nil {
-		return err
-	}
-
-	numPartitions := int32(len(partitions))
-
-	if numPartitions == 0 {
-		return ErrLeaderNotAvailable
-	}
-
-	choice, err := tp.partitioner.Partition(msg, numPartitions)
-
-	if err != nil {
-		return err
-	} else if choice < 0 || choice >= numPartitions {
-		return ErrInvalidPartition
-	}
-
-	msg.Partition = partitions[choice]
-
-	return nil
-}
-
-// one per partition per topic
-// dispatches messages to the appropriate broker
-// also responsible for maintaining message order during retries
-type partitionProducer struct {
-	parent    *asyncProducer
-	topic     string
-	partition int32
-	input     <-chan *ProducerMessage
-
-	leader  *Broker
-	breaker *breaker.Breaker
-	output  chan<- *ProducerMessage
-
-	// highWatermark tracks the "current" retry level, which is the only one where we actually let messages through,
-	// all other messages get buffered in retryState[msg.retries].buf to preserve ordering
-	// retryState[msg.retries].expectChaser simply tracks whether we've seen a chaser message for a given level (and
-	// therefore whether our buffer is complete and safe to flush)
-	highWatermark int
-	retryState    []partitionRetryState
-}
-
-type partitionRetryState struct {
-	buf          []*ProducerMessage
-	expectChaser bool
-}
-
-func (p *asyncProducer) newPartitionProducer(topic string, partition int32) chan<- *ProducerMessage {
-	input := make(chan *ProducerMessage, p.conf.ChannelBufferSize)
-	pp := &partitionProducer{
-		parent:    p,
-		topic:     topic,
-		partition: partition,
-		input:     input,
-
-		breaker:    breaker.New(3, 1, 10*time.Second),
-		retryState: make([]partitionRetryState, p.conf.Producer.Retry.Max+1),
-	}
-	go withRecover(pp.dispatch)
-	return input
-}
-
-func (pp *partitionProducer) dispatch() {
-	// try to prefetch the leader; if this doesn't work, we'll do a proper call to `updateLeader`
-	// on the first message
-	pp.leader, _ = pp.parent.client.Leader(pp.topic, pp.partition)
-	if pp.leader != nil {
-		pp.output = pp.parent.getBrokerProducer(pp.leader)
-	}
-
-	for msg := range pp.input {
-		if msg.retries > pp.highWatermark {
-			// a new, higher, retry level; handle it and then back off
-			pp.newHighWatermark(msg.retries)
-			time.Sleep(pp.parent.conf.Producer.Retry.Backoff)
-		} else if pp.highWatermark > 0 {
-			// we are retrying something (else highWatermark would be 0) but this message is not a *new* retry level
-			if msg.retries < pp.highWatermark {
-				// in fact this message is not even the current retry level, so buffer it for now (unless it's a just a chaser)
-				if msg.flags&chaser == chaser {
-					pp.retryState[msg.retries].expectChaser = false
-					pp.parent.inFlight.Done() // this chaser is now handled and will be garbage collected
-				} else {
-					pp.retryState[msg.retries].buf = append(pp.retryState[msg.retries].buf, msg)
-				}
-				continue
-			} else if msg.flags&chaser == chaser {
-				// this message is of the current retry level (msg.retries == highWatermark) and the chaser flag is set,
-				// meaning this retry level is done and we can go down (at least) one level and flush that
-				pp.retryState[pp.highWatermark].expectChaser = false
-				pp.flushRetryBuffers()
-				pp.parent.inFlight.Done() // this chaser is now handled and will be garbage collected
-				continue
-			}
-		}
-
-		// if we made it this far then the current msg contains real data, and can be sent to the next goroutine
-		// without breaking any of our ordering guarantees
-
-		if pp.output == nil {
-			if err := pp.updateLeader(); err != nil {
-				pp.parent.returnError(msg, err)
-				time.Sleep(pp.parent.conf.Producer.Retry.Backoff)
-				continue
-			}
-			Logger.Printf("producer/leader/%s/%d selected broker %d\n", pp.topic, pp.partition, pp.leader.ID())
-		}
-
-		pp.output <- msg
-	}
-
-	if pp.output != nil {
-		pp.parent.unrefBrokerProducer(pp.leader, pp.output)
-	}
-}
-
-func (pp *partitionProducer) newHighWatermark(hwm int) {
-	Logger.Printf("producer/leader/%s/%d state change to [retrying-%d]\n", pp.topic, pp.partition, hwm)
-	pp.highWatermark = hwm
-
-	// send off a chaser so that we know when everything "in between" has made it
-	// back to us and we can safely flush the backlog (otherwise we risk re-ordering messages)
-	pp.retryState[pp.highWatermark].expectChaser = true
-	pp.parent.inFlight.Add(1) // we're generating a chaser message; track it so we don't shut down while it's still inflight
-	pp.output <- &ProducerMessage{Topic: pp.topic, Partition: pp.partition, flags: chaser, retries: pp.highWatermark - 1}
-
-	// a new HWM means that our current broker selection is out of date
-	Logger.Printf("producer/leader/%s/%d abandoning broker %d\n", pp.topic, pp.partition, pp.leader.ID())
-	pp.parent.unrefBrokerProducer(pp.leader, pp.output)
-	pp.output = nil
-}
-
-func (pp *partitionProducer) flushRetryBuffers() {
-	Logger.Printf("producer/leader/%s/%d state change to [flushing-%d]\n", pp.topic, pp.partition, pp.highWatermark)
-	for {
-		pp.highWatermark--
-
-		if pp.output == nil {
-			if err := pp.updateLeader(); err != nil {
-				pp.parent.returnErrors(pp.retryState[pp.highWatermark].buf, err)
-				goto flushDone
-			}
-			Logger.Printf("producer/leader/%s/%d selected broker %d\n", pp.topic, pp.partition, pp.leader.ID())
-		}
-
-		for _, msg := range pp.retryState[pp.highWatermark].buf {
-			pp.output <- msg
-		}
-
-	flushDone:
-		pp.retryState[pp.highWatermark].buf = nil
-		if pp.retryState[pp.highWatermark].expectChaser {
-			Logger.Printf("producer/leader/%s/%d state change to [retrying-%d]\n", pp.topic, pp.partition, pp.highWatermark)
-			break
-		} else if pp.highWatermark == 0 {
-			Logger.Printf("producer/leader/%s/%d state change to [normal]\n", pp.topic, pp.partition)
-			break
-		}
-	}
-}
-
-func (pp *partitionProducer) updateLeader() error {
-	return pp.breaker.Run(func() (err error) {
-		if err = pp.parent.client.RefreshMetadata(pp.topic); err != nil {
-			return err
-		}
-
-		if pp.leader, err = pp.parent.client.Leader(pp.topic, pp.partition); err != nil {
-			return err
-		}
-
-		pp.output = pp.parent.getBrokerProducer(pp.leader)
-		return nil
-	})
-}
-
-// one per broker, constructs both an aggregator and a flusher
-func (p *asyncProducer) newBrokerProducer(broker *Broker) chan<- *ProducerMessage {
-	input := make(chan *ProducerMessage)
-	bridge := make(chan []*ProducerMessage)
-
-	a := &aggregator{
-		parent: p,
-		broker: broker,
-		input:  input,
-		output: bridge,
-	}
-	go withRecover(a.run)
-
-	f := &flusher{
-		parent:         p,
-		broker:         broker,
-		input:          bridge,
-		currentRetries: make(map[string]map[int32]error),
-	}
-	go withRecover(f.run)
-
-	return input
-}
-
-// groups messages together into appropriately-sized batches for sending to the broker
-// based on https://godoc.org/github.com/eapache/channels#BatchingChannel
-type aggregator struct {
-	parent *asyncProducer
-	broker *Broker
-	input  <-chan *ProducerMessage
-	output chan<- []*ProducerMessage
-
-	buffer      []*ProducerMessage
-	bufferBytes int
-	timer       <-chan time.Time
-}
-
-func (a *aggregator) run() {
-	var output chan<- []*ProducerMessage
-
-	for {
-		select {
-		case msg := <-a.input:
-			if msg == nil {
-				goto shutdown
-			}
-
-			if a.wouldOverflow(msg) {
-				Logger.Printf("producer/aggregator/%d maximum request accumulated, forcing blocking flush\n", a.broker.ID())
-				a.output <- a.buffer
-				a.reset()
-				output = nil
-			}
-
-			a.buffer = append(a.buffer, msg)
-			a.bufferBytes += msg.byteSize()
-
-			if a.readyToFlush(msg) {
-				output = a.output
-			} else if a.parent.conf.Producer.Flush.Frequency > 0 && a.timer == nil {
-				a.timer = time.After(a.parent.conf.Producer.Flush.Frequency)
-			}
-		case <-a.timer:
-			output = a.output
-		case output <- a.buffer:
-			a.reset()
-			output = nil
-		}
-	}
-
-shutdown:
-	if len(a.buffer) > 0 {
-		a.output <- a.buffer
-	}
-	close(a.output)
-}
-
-func (a *aggregator) wouldOverflow(msg *ProducerMessage) bool {
-	switch {
-	// Would we overflow our maximum possible size-on-the-wire? 10KiB is arbitrary overhead for safety.
-	case a.bufferBytes+msg.byteSize() >= int(MaxRequestSize-(10*1024)):
-		return true
-	// Would we overflow the size-limit of a compressed message-batch?
-	case a.parent.conf.Producer.Compression != CompressionNone && a.bufferBytes+msg.byteSize() >= a.parent.conf.Producer.MaxMessageBytes:
-		return true
-	// Would we overflow simply in number of messages?
-	case a.parent.conf.Producer.Flush.MaxMessages > 0 && len(a.buffer) >= a.parent.conf.Producer.Flush.MaxMessages:
-		return true
-	default:
-		return false
-	}
-}
-
-func (a *aggregator) readyToFlush(msg *ProducerMessage) bool {
-	switch {
-	// If all three config values are 0, we always flush as-fast-as-possible
-	case a.parent.conf.Producer.Flush.Frequency == 0 && a.parent.conf.Producer.Flush.Bytes == 0 && a.parent.conf.Producer.Flush.Messages == 0:
-		return true
-	// If the messages is a chaser we must flush to maintain the state-machine
-	case msg.flags&chaser == chaser:
-		return true
-	// If we've  passed the message trigger-point
-	case a.parent.conf.Producer.Flush.Messages > 0 && len(a.buffer) >= a.parent.conf.Producer.Flush.Messages:
-		return true
-	// If we've  passed the byte trigger-point
-	case a.parent.conf.Producer.Flush.Bytes > 0 && a.bufferBytes >= a.parent.conf.Producer.Flush.Bytes:
-		return true
-	default:
-		return false
-	}
-}
-
-func (a *aggregator) reset() {
-	a.timer = nil
-	a.buffer = nil
-	a.bufferBytes = 0
-}
-
-// takes a batch at a time from the aggregator and sends to the broker
-type flusher struct {
-	parent *asyncProducer
-	broker *Broker
-	input  <-chan []*ProducerMessage
-
-	currentRetries map[string]map[int32]error
-}
-
-func (f *flusher) run() {
-	var closing error
-
-	Logger.Printf("producer/flusher/%d starting up\n", f.broker.ID())
-
-	for batch := range f.input {
-		if closing != nil {
-			f.parent.retryMessages(batch, closing)
-			continue
-		}
-
-		msgSets := f.groupAndFilter(batch)
-		request := f.parent.buildRequest(msgSets)
-		if request == nil {
-			continue
-		}
-
-		response, err := f.broker.Produce(request)
-
-		switch err.(type) {
-		case nil:
-			break
-		case PacketEncodingError:
-			f.parent.returnErrors(batch, err)
-			continue
-		default:
-			Logger.Printf("producer/flusher/%d state change to [closing] because %s\n", f.broker.ID(), err)
-			f.parent.abandonBrokerConnection(f.broker)
-			_ = f.broker.Close()
-			closing = err
-			f.parent.retryMessages(batch, err)
-			continue
-		}
-
-		if response == nil {
-			// this only happens when RequiredAcks is NoResponse, so we have to assume success
-			f.parent.returnSuccesses(batch)
-			continue
-		}
-
-		f.parseResponse(msgSets, response)
-	}
-	Logger.Printf("producer/flusher/%d shut down\n", f.broker.ID())
-}
-
-func (f *flusher) groupAndFilter(batch []*ProducerMessage) map[string]map[int32][]*ProducerMessage {
-	msgSets := make(map[string]map[int32][]*ProducerMessage)
-
-	for i, msg := range batch {
-
-		if f.currentRetries[msg.Topic] != nil && f.currentRetries[msg.Topic][msg.Partition] != nil {
-			// we're currently retrying this partition so we need to filter out this message
-			f.parent.retryMessages([]*ProducerMessage{msg}, f.currentRetries[msg.Topic][msg.Partition])
-			batch[i] = nil
-
-			if msg.flags&chaser == chaser {
-				// ...but now we can start processing future messages again
-				Logger.Printf("producer/flusher/%d state change to [normal] on %s/%d\n",
-					f.broker.ID(), msg.Topic, msg.Partition)
-				delete(f.currentRetries[msg.Topic], msg.Partition)
-			}
-
-			continue
-		}
-
-		partitionSet := msgSets[msg.Topic]
-		if partitionSet == nil {
-			partitionSet = make(map[int32][]*ProducerMessage)
-			msgSets[msg.Topic] = partitionSet
-		}
-
-		partitionSet[msg.Partition] = append(partitionSet[msg.Partition], msg)
-	}
-
-	return msgSets
-}
-
-func (f *flusher) parseResponse(msgSets map[string]map[int32][]*ProducerMessage, response *ProduceResponse) {
-	// we iterate through the blocks in the request set, not the response, so that we notice
-	// if the response is missing a block completely
-	for topic, partitionSet := range msgSets {
-		for partition, msgs := range partitionSet {
-			block := response.GetBlock(topic, partition)
-			if block == nil {
-				f.parent.returnErrors(msgs, ErrIncompleteResponse)
-				continue
-			}
-
-			switch block.Err {
-			// Success
-			case ErrNoError:
-				for i := range msgs {
-					msgs[i].Offset = block.Offset + int64(i)
-				}
-				f.parent.returnSuccesses(msgs)
-			// Retriable errors
-			case ErrUnknownTopicOrPartition, ErrNotLeaderForPartition, ErrLeaderNotAvailable,
-				ErrRequestTimedOut, ErrNotEnoughReplicas, ErrNotEnoughReplicasAfterAppend:
-				Logger.Printf("producer/flusher/%d state change to [retrying] on %s/%d because %v\n",
-					f.broker.ID(), topic, partition, block.Err)
-				if f.currentRetries[topic] == nil {
-					f.currentRetries[topic] = make(map[int32]error)
-				}
-				f.currentRetries[topic][partition] = block.Err
-				f.parent.retryMessages(msgs, block.Err)
-			// Other non-retriable errors
-			default:
-				f.parent.returnErrors(msgs, block.Err)
-			}
-		}
-	}
-}
-
-// singleton
-// effectively a "bridge" between the flushers and the dispatcher in order to avoid deadlock
-// based on https://godoc.org/github.com/eapache/channels#InfiniteChannel
-func (p *asyncProducer) retryHandler() {
-	var msg *ProducerMessage
-	buf := queue.New()
-
-	for {
-		if buf.Length() == 0 {
-			msg = <-p.retries
-		} else {
-			select {
-			case msg = <-p.retries:
-			case p.input <- buf.Peek().(*ProducerMessage):
-				buf.Remove()
-				continue
-			}
-		}
-
-		if msg == nil {
-			return
-		}
-
-		buf.Add(msg)
-	}
-}
-
-// utility functions
-
-func (p *asyncProducer) shutdown() {
-	Logger.Println("Producer shutting down.")
-	p.inFlight.Add(1)
-	p.input <- &ProducerMessage{flags: shutdown}
-
-	p.inFlight.Wait()
-
-	if p.ownClient {
-		err := p.client.Close()
-		if err != nil {
-			Logger.Println("producer/shutdown failed to close the embedded client:", err)
-		}
-	}
-
-	close(p.input)
-	close(p.retries)
-	close(p.errors)
-	close(p.successes)
-}
-
-func (p *asyncProducer) buildRequest(batch map[string]map[int32][]*ProducerMessage) *ProduceRequest {
-
-	req := &ProduceRequest{RequiredAcks: p.conf.Producer.RequiredAcks, Timeout: int32(p.conf.Producer.Timeout / time.Millisecond)}
-	empty := true
-
-	for topic, partitionSet := range batch {
-		for partition, msgSet := range partitionSet {
-			setToSend := new(MessageSet)
-			setSize := 0
-			for _, msg := range msgSet {
-				var keyBytes, valBytes []byte
-				var err error
-				if msg.Key != nil {
-					if keyBytes, err = msg.Key.Encode(); err != nil {
-						p.returnError(msg, err)
-						continue
-					}
-				}
-				if msg.Value != nil {
-					if valBytes, err = msg.Value.Encode(); err != nil {
-						p.returnError(msg, err)
-						continue
-					}
-				}
-
-				if p.conf.Producer.Compression != CompressionNone && setSize+msg.byteSize() > p.conf.Producer.MaxMessageBytes {
-					// compression causes message-sets to be wrapped as single messages, which have tighter
-					// size requirements, so we have to respect those limits
-					valBytes, err := encode(setToSend)
-					if err != nil {
-						Logger.Println(err) // if this happens, it's basically our fault.
-						panic(err)
-					}
-					req.AddMessage(topic, partition, &Message{Codec: p.conf.Producer.Compression, Key: nil, Value: valBytes})
-					setToSend = new(MessageSet)
-					setSize = 0
-				}
-				setSize += msg.byteSize()
-
-				setToSend.addMessage(&Message{Codec: CompressionNone, Key: keyBytes, Value: valBytes})
-				empty = false
-			}
-
-			if p.conf.Producer.Compression == CompressionNone {
-				req.AddSet(topic, partition, setToSend)
-			} else {
-				valBytes, err := encode(setToSend)
-				if err != nil {
-					Logger.Println(err) // if this happens, it's basically our fault.
-					panic(err)
-				}
-				req.AddMessage(topic, partition, &Message{Codec: p.conf.Producer.Compression, Key: nil, Value: valBytes})
-			}
-		}
-	}
-
-	if empty {
-		return nil
-	}
-	return req
-}
-
-func (p *asyncProducer) returnError(msg *ProducerMessage, err error) {
-	msg.clear()
-	pErr := &ProducerError{Msg: msg, Err: err}
-	if p.conf.Producer.Return.Errors {
-		p.errors <- pErr
-	} else {
-		Logger.Println(pErr)
-	}
-	p.inFlight.Done()
-}
-
-func (p *asyncProducer) returnErrors(batch []*ProducerMessage, err error) {
-	for _, msg := range batch {
-		if msg != nil {
-			p.returnError(msg, err)
-		}
-	}
-}
-
-func (p *asyncProducer) returnSuccesses(batch []*ProducerMessage) {
-	for _, msg := range batch {
-		if msg == nil {
-			continue
-		}
-		if p.conf.Producer.Return.Successes {
-			msg.clear()
-			p.successes <- msg
-		}
-		p.inFlight.Done()
-	}
-}
-
-func (p *asyncProducer) retryMessages(batch []*ProducerMessage, err error) {
-	for _, msg := range batch {
-		if msg == nil {
-			continue
-		}
-		if msg.retries >= p.conf.Producer.Retry.Max {
-			p.returnError(msg, err)
-		} else {
-			msg.retries++
-			p.retries <- msg
-		}
-	}
-}
-
-func (p *asyncProducer) getBrokerProducer(broker *Broker) chan<- *ProducerMessage {
-	p.brokerLock.Lock()
-	defer p.brokerLock.Unlock()
-
-	bp := p.brokers[broker]
-
-	if bp == nil {
-		bp = p.newBrokerProducer(broker)
-		p.brokers[broker] = bp
-		p.brokerRefs[bp] = 0
-	}
-
-	p.brokerRefs[bp]++
-
-	return bp
-}
-
-func (p *asyncProducer) unrefBrokerProducer(broker *Broker, bp chan<- *ProducerMessage) {
-	p.brokerLock.Lock()
-	defer p.brokerLock.Unlock()
-
-	p.brokerRefs[bp]--
-	if p.brokerRefs[bp] == 0 {
-		close(bp)
-		delete(p.brokerRefs, bp)
-
-		if p.brokers[broker] == bp {
-			delete(p.brokers, broker)
-		}
-	}
-}
-
-func (p *asyncProducer) abandonBrokerConnection(broker *Broker) {
-	p.brokerLock.Lock()
-	defer p.brokerLock.Unlock()
-
-	delete(p.brokers, broker)
-}
diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/async_producer_test.go b/Godeps/_workspace/src/github.com/Shopify/sarama/async_producer_test.go
deleted file mode 100644
index 403456839..000000000
--- a/Godeps/_workspace/src/github.com/Shopify/sarama/async_producer_test.go
+++ /dev/null
@@ -1,743 +0,0 @@
-package sarama
-
-import (
-	"errors"
-	"log"
-	"os"
-	"os/signal"
-	"sync"
-	"testing"
-	"time"
-)
-
-const TestMessage = "ABC THE MESSAGE"
-
-func closeProducer(t *testing.T, p AsyncProducer) {
-	var wg sync.WaitGroup
-	p.AsyncClose()
-
-	wg.Add(2)
-	go func() {
-		for _ = range p.Successes() {
-			t.Error("Unexpected message on Successes()")
-		}
-		wg.Done()
-	}()
-	go func() {
-		for msg := range p.Errors() {
-			t.Error(msg.Err)
-		}
-		wg.Done()
-	}()
-	wg.Wait()
-}
-
-func expectResults(t *testing.T, p AsyncProducer, successes, errors int) {
-	for successes > 0 || errors > 0 {
-		select {
-		case msg := <-p.Errors():
-			if msg.Msg.flags != 0 {
-				t.Error("Message had flags set")
-			}
-			errors--
-			if errors < 0 {
-				t.Error(msg.Err)
-			}
-		case msg := <-p.Successes():
-			if msg.flags != 0 {
-				t.Error("Message had flags set")
-			}
-			successes--
-			if successes < 0 {
-				t.Error("Too many successes")
-			}
-		}
-	}
-}
-
-type testPartitioner chan *int32
-
-func (p testPartitioner) Partition(msg *ProducerMessage, numPartitions int32) (int32, error) {
-	part := <-p
-	if part == nil {
-		return 0, errors.New("BOOM")
-	}
-
-	return *part, nil
-}
-
-func (p testPartitioner) RequiresConsistency() bool {
-	return true
-}
-
-func (p testPartitioner) feed(partition int32) {
-	p <- &partition
-}
-
-func TestAsyncProducer(t *testing.T) {
-	seedBroker := newMockBroker(t, 1)
-	leader := newMockBroker(t, 2)
-
-	metadataResponse := new(MetadataResponse)
-	metadataResponse.AddBroker(leader.Addr(), leader.BrokerID())
-	metadataResponse.AddTopicPartition("my_topic", 0, leader.BrokerID(), nil, nil, ErrNoError)
-	seedBroker.Returns(metadataResponse)
-
-	prodSuccess := new(ProduceResponse)
-	prodSuccess.AddTopicPartition("my_topic", 0, ErrNoError)
-	leader.Returns(prodSuccess)
-
-	config := NewConfig()
-	config.Producer.Flush.Messages = 10
-	config.Producer.Return.Successes = true
-	producer, err := NewAsyncProducer([]string{seedBroker.Addr()}, config)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	for i := 0; i < 10; i++ {
-		producer.Input() <- &ProducerMessage{Topic: "my_topic", Key: nil, Value: StringEncoder(TestMessage), Metadata: i}
-	}
-	for i := 0; i < 10; i++ {
-		select {
-		case msg := <-producer.Errors():
-			t.Error(msg.Err)
-			if msg.Msg.flags != 0 {
-				t.Error("Message had flags set")
-			}
-		case msg := <-producer.Successes():
-			if msg.flags != 0 {
-				t.Error("Message had flags set")
-			}
-			if msg.Metadata.(int) != i {
-				t.Error("Message metadata did not match")
-			}
-		}
-	}
-
-	closeProducer(t, producer)
-	leader.Close()
-	seedBroker.Close()
-}
-
-func TestAsyncProducerMultipleFlushes(t *testing.T) {
-	seedBroker := newMockBroker(t, 1)
-	leader := newMockBroker(t, 2)
-
-	metadataResponse := new(MetadataResponse)
-	metadataResponse.AddBroker(leader.Addr(), leader.BrokerID())
-	metadataResponse.AddTopicPartition("my_topic", 0, leader.BrokerID(), nil, nil, ErrNoError)
-	seedBroker.Returns(metadataResponse)
-
-	prodSuccess := new(ProduceResponse)
-	prodSuccess.AddTopicPartition("my_topic", 0, ErrNoError)
-	leader.Returns(prodSuccess)
-	leader.Returns(prodSuccess)
-	leader.Returns(prodSuccess)
-
-	config := NewConfig()
-	config.Producer.Flush.Messages = 5
-	config.Producer.Return.Successes = true
-	producer, err := NewAsyncProducer([]string{seedBroker.Addr()}, config)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	for flush := 0; flush < 3; flush++ {
-		for i := 0; i < 5; i++ {
-			producer.Input() <- &ProducerMessage{Topic: "my_topic", Key: nil, Value: StringEncoder(TestMessage)}
-		}
-		expectResults(t, producer, 5, 0)
-	}
-
-	closeProducer(t, producer)
-	leader.Close()
-	seedBroker.Close()
-}
-
-func TestAsyncProducerMultipleBrokers(t *testing.T) {
-	seedBroker := newMockBroker(t, 1)
-	leader0 := newMockBroker(t, 2)
-	leader1 := newMockBroker(t, 3)
-
-	metadataResponse := new(MetadataResponse)
-	metadataResponse.AddBroker(leader0.Addr(), leader0.BrokerID())
-	metadataResponse.AddBroker(leader1.Addr(), leader1.BrokerID())
-	metadataResponse.AddTopicPartition("my_topic", 0, leader0.BrokerID(), nil, nil, ErrNoError)
-	metadataResponse.AddTopicPartition("my_topic", 1, leader1.BrokerID(), nil, nil, ErrNoError)
-	seedBroker.Returns(metadataResponse)
-
-	prodResponse0 := new(ProduceResponse)
-	prodResponse0.AddTopicPartition("my_topic", 0, ErrNoError)
-	leader0.Returns(prodResponse0)
-
-	prodResponse1 := new(ProduceResponse)
-	prodResponse1.AddTopicPartition("my_topic", 1, ErrNoError)
-	leader1.Returns(prodResponse1)
-
-	config := NewConfig()
-	config.Producer.Flush.Messages = 5
-	config.Producer.Return.Successes = true
-	config.Producer.Partitioner = NewRoundRobinPartitioner
-	producer, err := NewAsyncProducer([]string{seedBroker.Addr()}, config)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	for i := 0; i < 10; i++ {
-		producer.Input() <- &ProducerMessage{Topic: "my_topic", Key: nil, Value: StringEncoder(TestMessage)}
-	}
-	expectResults(t, producer, 10, 0)
-
-	closeProducer(t, producer)
-	leader1.Close()
-	leader0.Close()
-	seedBroker.Close()
-}
-
-func TestAsyncProducerCustomPartitioner(t *testing.T) {
-	seedBroker := newMockBroker(t, 1)
-	leader := newMockBroker(t, 2)
-
-	metadataResponse := new(MetadataResponse)
-	metadataResponse.AddBroker(leader.Addr(), leader.BrokerID())
-	metadataResponse.AddTopicPartition("my_topic", 0, leader.BrokerID(), nil, nil, ErrNoError)
-	seedBroker.Returns(metadataResponse)
-
-	prodResponse := new(ProduceResponse)
-	prodResponse.AddTopicPartition("my_topic", 0, ErrNoError)
-	leader.Returns(prodResponse)
-
-	config := NewConfig()
-	config.Producer.Flush.Messages = 2
-	config.Producer.Return.Successes = true
-	config.Producer.Partitioner = func(topic string) Partitioner {
-		p := make(testPartitioner)
-		go func() {
-			p.feed(0)
-			p <- nil
-			p <- nil
-			p <- nil
-			p.feed(0)
-		}()
-		return p
-	}
-	producer, err := NewAsyncProducer([]string{seedBroker.Addr()}, config)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	for i := 0; i < 5; i++ {
-		producer.Input() <- &ProducerMessage{Topic: "my_topic", Key: nil, Value: StringEncoder(TestMessage)}
-	}
-	expectResults(t, producer, 2, 3)
-
-	closeProducer(t, producer)
-	leader.Close()
-	seedBroker.Close()
-}
-
-func TestAsyncProducerFailureRetry(t *testing.T) {
-	seedBroker := newMockBroker(t, 1)
-	leader1 := newMockBroker(t, 2)
-	leader2 := newMockBroker(t, 3)
-
-	metadataLeader1 := new(MetadataResponse)
-	metadataLeader1.AddBroker(leader1.Addr(), leader1.BrokerID())
-	metadataLeader1.AddTopicPartition("my_topic", 0, leader1.BrokerID(), nil, nil, ErrNoError)
-	seedBroker.Returns(metadataLeader1)
-
-	config := NewConfig()
-	config.Producer.Flush.Messages = 10
-	config.Producer.Return.Successes = true
-	config.Producer.Retry.Backoff = 0
-	producer, err := NewAsyncProducer([]string{seedBroker.Addr()}, config)
-	if err != nil {
-		t.Fatal(err)
-	}
-	seedBroker.Close()
-
-	for i := 0; i < 10; i++ {
-		producer.Input() <- &ProducerMessage{Topic: "my_topic", Key: nil, Value: StringEncoder(TestMessage)}
-	}
-	prodNotLeader := new(ProduceResponse)
-	prodNotLeader.AddTopicPartition("my_topic", 0, ErrNotLeaderForPartition)
-	leader1.Returns(prodNotLeader)
-
-	metadataLeader2 := new(MetadataResponse)
-	metadataLeader2.AddBroker(leader2.Addr(), leader2.BrokerID())
-	metadataLeader2.AddTopicPartition("my_topic", 0, leader2.BrokerID(), nil, nil, ErrNoError)
-	leader1.Returns(metadataLeader2)
-
-	prodSuccess := new(ProduceResponse)
-	prodSuccess.AddTopicPartition("my_topic", 0, ErrNoError)
-	leader2.Returns(prodSuccess)
-	expectResults(t, producer, 10, 0)
-	leader1.Close()
-
-	for i := 0; i < 10; i++ {
-		producer.Input() <- &ProducerMessage{Topic: "my_topic", Key: nil, Value: StringEncoder(TestMessage)}
-	}
-	leader2.Returns(prodSuccess)
-	expectResults(t, producer, 10, 0)
-
-	leader2.Close()
-	closeProducer(t, producer)
-}
-
-// If a Kafka broker becomes unavailable and then returns back in service, then
-// producer reconnects to it and continues sending messages.
-func TestAsyncProducerBrokerBounce(t *testing.T) {
-	// Given
-	seedBroker := newMockBroker(t, 1)
-	leader := newMockBroker(t, 2)
-	leaderAddr := leader.Addr()
-
-	metadataResponse := new(MetadataResponse)
-	metadataResponse.AddBroker(leaderAddr, leader.BrokerID())
-	metadataResponse.AddTopicPartition("my_topic", 0, leader.BrokerID(), nil, nil, ErrNoError)
-	seedBroker.Returns(metadataResponse)
-
-	prodSuccess := new(ProduceResponse)
-	prodSuccess.AddTopicPartition("my_topic", 0, ErrNoError)
-
-	config := NewConfig()
-	config.Producer.Flush.Messages = 1
-	config.Producer.Return.Successes = true
-	config.Producer.Retry.Backoff = 0
-	producer, err := NewAsyncProducer([]string{seedBroker.Addr()}, config)
-	if err != nil {
-		t.Fatal(err)
-	}
-	producer.Input() <- &ProducerMessage{Topic: "my_topic", Key: nil, Value: StringEncoder(TestMessage)}
-	leader.Returns(prodSuccess)
-	expectResults(t, producer, 1, 0)
-
-	// When: a broker connection gets reset by a broker (network glitch, restart, you name it).
-	leader.Close()                               // producer should get EOF
-	leader = newMockBrokerAddr(t, 2, leaderAddr) // start it up again right away for giggles
-	seedBroker.Returns(metadataResponse)         // tell it to go to broker 2 again
-
-	// Then: a produced message goes through the new broker connection.
-	producer.Input() <- &ProducerMessage{Topic: "my_topic", Key: nil, Value: StringEncoder(TestMessage)}
-	leader.Returns(prodSuccess)
-	expectResults(t, producer, 1, 0)
-
-	closeProducer(t, producer)
-	seedBroker.Close()
-	leader.Close()
-}
-
-func TestAsyncProducerBrokerBounceWithStaleMetadata(t *testing.T) {
-	seedBroker := newMockBroker(t, 1)
-	leader1 := newMockBroker(t, 2)
-	leader2 := newMockBroker(t, 3)
-
-	metadataLeader1 := new(MetadataResponse)
-	metadataLeader1.AddBroker(leader1.Addr(), leader1.BrokerID())
-	metadataLeader1.AddTopicPartition("my_topic", 0, leader1.BrokerID(), nil, nil, ErrNoError)
-	seedBroker.Returns(metadataLeader1)
-
-	config := NewConfig()
-	config.Producer.Flush.Messages = 10
-	config.Producer.Return.Successes = true
-	config.Producer.Retry.Max = 3
-	config.Producer.Retry.Backoff = 0
-	producer, err := NewAsyncProducer([]string{seedBroker.Addr()}, config)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	for i := 0; i < 10; i++ {
-		producer.Input() <- &ProducerMessage{Topic: "my_topic", Key: nil, Value: StringEncoder(TestMessage)}
-	}
-	leader1.Close()                     // producer should get EOF
-	seedBroker.Returns(metadataLeader1) // tell it to go to leader1 again even though it's still down
-	seedBroker.Returns(metadataLeader1) // tell it to go to leader1 again even though it's still down
-
-	// ok fine, tell it to go to leader2 finally
-	metadataLeader2 := new(MetadataResponse)
-	metadataLeader2.AddBroker(leader2.Addr(), leader2.BrokerID())
-	metadataLeader2.AddTopicPartition("my_topic", 0, leader2.BrokerID(), nil, nil, ErrNoError)
-	seedBroker.Returns(metadataLeader2)
-
-	prodSuccess := new(ProduceResponse)
-	prodSuccess.AddTopicPartition("my_topic", 0, ErrNoError)
-	leader2.Returns(prodSuccess)
-	expectResults(t, producer, 10, 0)
-	seedBroker.Close()
-	leader2.Close()
-
-	closeProducer(t, producer)
-}
-
-func TestAsyncProducerMultipleRetries(t *testing.T) {
-	seedBroker := newMockBroker(t, 1)
-	leader1 := newMockBroker(t, 2)
-	leader2 := newMockBroker(t, 3)
-
-	metadataLeader1 := new(MetadataResponse)
-	metadataLeader1.AddBroker(leader1.Addr(), leader1.BrokerID())
-	metadataLeader1.AddTopicPartition("my_topic", 0, leader1.BrokerID(), nil, nil, ErrNoError)
-	seedBroker.Returns(metadataLeader1)
-
-	config := NewConfig()
-	config.Producer.Flush.Messages = 10
-	config.Producer.Return.Successes = true
-	config.Producer.Retry.Max = 4
-	config.Producer.Retry.Backoff = 0
-	producer, err := NewAsyncProducer([]string{seedBroker.Addr()}, config)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	for i := 0; i < 10; i++ {
-		producer.Input() <- &ProducerMessage{Topic: "my_topic", Key: nil, Value: StringEncoder(TestMessage)}
-	}
-	prodNotLeader := new(ProduceResponse)
-	prodNotLeader.AddTopicPartition("my_topic", 0, ErrNotLeaderForPartition)
-	leader1.Returns(prodNotLeader)
-
-	metadataLeader2 := new(MetadataResponse)
-	metadataLeader2.AddBroker(leader2.Addr(), leader2.BrokerID())
-	metadataLeader2.AddTopicPartition("my_topic", 0, leader2.BrokerID(), nil, nil, ErrNoError)
-	seedBroker.Returns(metadataLeader2)
-	leader2.Returns(prodNotLeader)
-	seedBroker.Returns(metadataLeader1)
-	leader1.Returns(prodNotLeader)
-	seedBroker.Returns(metadataLeader1)
-	leader1.Returns(prodNotLeader)
-	seedBroker.Returns(metadataLeader2)
-
-	prodSuccess := new(ProduceResponse)
-	prodSuccess.AddTopicPartition("my_topic", 0, ErrNoError)
-	leader2.Returns(prodSuccess)
-	expectResults(t, producer, 10, 0)
-
-	for i := 0; i < 10; i++ {
-		producer.Input() <- &ProducerMessage{Topic: "my_topic", Key: nil, Value: StringEncoder(TestMessage)}
-	}
-	leader2.Returns(prodSuccess)
-	expectResults(t, producer, 10, 0)
-
-	seedBroker.Close()
-	leader1.Close()
-	leader2.Close()
-	closeProducer(t, producer)
-}
-
-func TestAsyncProducerOutOfRetries(t *testing.T) {
-	t.Skip("Enable once bug #294 is fixed.")
-
-	seedBroker := newMockBroker(t, 1)
-	leader := newMockBroker(t, 2)
-
-	metadataResponse := new(MetadataResponse)
-	metadataResponse.AddBroker(leader.Addr(), leader.BrokerID())
-	metadataResponse.AddTopicPartition("my_topic", 0, leader.BrokerID(), nil, nil, ErrNoError)
-	seedBroker.Returns(metadataResponse)
-
-	config := NewConfig()
-	config.Producer.Flush.Messages = 10
-	config.Producer.Return.Successes = true
-	config.Producer.Retry.Backoff = 0
-	config.Producer.Retry.Max = 0
-	producer, err := NewAsyncProducer([]string{seedBroker.Addr()}, config)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	for i := 0; i < 10; i++ {
-		producer.Input() <- &ProducerMessage{Topic: "my_topic", Key: nil, Value: StringEncoder(TestMessage)}
-	}
-
-	prodNotLeader := new(ProduceResponse)
-	prodNotLeader.AddTopicPartition("my_topic", 0, ErrNotLeaderForPartition)
-	leader.Returns(prodNotLeader)
-
-	for i := 0; i < 10; i++ {
-		select {
-		case msg := <-producer.Errors():
-			if msg.Err != ErrNotLeaderForPartition {
-				t.Error(msg.Err)
-			}
-		case <-producer.Successes():
-			t.Error("Unexpected success")
-		}
-	}
-
-	seedBroker.Returns(metadataResponse)
-
-	for i := 0; i < 10; i++ {
-		producer.Input() <- &ProducerMessage{Topic: "my_topic", Key: nil, Value: StringEncoder(TestMessage)}
-	}
-
-	prodSuccess := new(ProduceResponse)
-	prodSuccess.AddTopicPartition("my_topic", 0, ErrNoError)
-	leader.Returns(prodSuccess)
-
-	expectResults(t, producer, 10, 0)
-
-	leader.Close()
-	seedBroker.Close()
-	safeClose(t, producer)
-}
-
-func TestAsyncProducerRetryWithReferenceOpen(t *testing.T) {
-	seedBroker := newMockBroker(t, 1)
-	leader := newMockBroker(t, 2)
-	leaderAddr := leader.Addr()
-
-	metadataResponse := new(MetadataResponse)
-	metadataResponse.AddBroker(leaderAddr, leader.BrokerID())
-	metadataResponse.AddTopicPartition("my_topic", 0, leader.BrokerID(), nil, nil, ErrNoError)
-	metadataResponse.AddTopicPartition("my_topic", 1, leader.BrokerID(), nil, nil, ErrNoError)
-	seedBroker.Returns(metadataResponse)
-
-	config := NewConfig()
-	config.Producer.Return.Successes = true
-	config.Producer.Retry.Backoff = 0
-	config.Producer.Retry.Max = 1
-	config.Producer.Partitioner = NewRoundRobinPartitioner
-	producer, err := NewAsyncProducer([]string{seedBroker.Addr()}, config)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// prime partition 0
-	producer.Input() <- &ProducerMessage{Topic: "my_topic", Key: nil, Value: StringEncoder(TestMessage)}
-	prodSuccess := new(ProduceResponse)
-	prodSuccess.AddTopicPartition("my_topic", 0, ErrNoError)
-	leader.Returns(prodSuccess)
-	expectResults(t, producer, 1, 0)
-
-	// prime partition 1
-	producer.Input() <- &ProducerMessage{Topic: "my_topic", Key: nil, Value: StringEncoder(TestMessage)}
-	prodSuccess = new(ProduceResponse)
-	prodSuccess.AddTopicPartition("my_topic", 1, ErrNoError)
-	leader.Returns(prodSuccess)
-	expectResults(t, producer, 1, 0)
-
-	// reboot the broker (the producer will get EOF on its existing connection)
-	leader.Close()
-	leader = newMockBrokerAddr(t, 2, leaderAddr)
-
-	// send another message on partition 0 to trigger the EOF and retry
-	producer.Input() <- &ProducerMessage{Topic: "my_topic", Key: nil, Value: StringEncoder(TestMessage)}
-
-	// tell partition 0 to go to that broker again
-	seedBroker.Returns(metadataResponse)
-
-	// succeed this time
-	prodSuccess = new(ProduceResponse)
-	prodSuccess.AddTopicPartition("my_topic", 0, ErrNoError)
-	leader.Returns(prodSuccess)
-	expectResults(t, producer, 1, 0)
-
-	// shutdown
-	closeProducer(t, producer)
-	seedBroker.Close()
-	leader.Close()
-}
-
-func TestAsyncProducerFlusherRetryCondition(t *testing.T) {
-	seedBroker := newMockBroker(t, 1)
-	leader := newMockBroker(t, 2)
-
-	metadataResponse := new(MetadataResponse)
-	metadataResponse.AddBroker(leader.Addr(), leader.BrokerID())
-	metadataResponse.AddTopicPartition("my_topic", 0, leader.BrokerID(), nil, nil, ErrNoError)
-	metadataResponse.AddTopicPartition("my_topic", 1, leader.BrokerID(), nil, nil, ErrNoError)
-	seedBroker.Returns(metadataResponse)
-
-	config := NewConfig()
-	config.Producer.Flush.Messages = 5
-	config.Producer.Return.Successes = true
-	config.Producer.Retry.Backoff = 0
-	config.Producer.Retry.Max = 1
-	config.Producer.Partitioner = NewManualPartitioner
-	producer, err := NewAsyncProducer([]string{seedBroker.Addr()}, config)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// prime partitions
-	for p := int32(0); p < 2; p++ {
-		for i := 0; i < 5; i++ {
-			producer.Input() <- &ProducerMessage{Topic: "my_topic", Key: nil, Value: StringEncoder(TestMessage), Partition: p}
-		}
-		prodSuccess := new(ProduceResponse)
-		prodSuccess.AddTopicPartition("my_topic", p, ErrNoError)
-		leader.Returns(prodSuccess)
-		expectResults(t, producer, 5, 0)
-	}
-
-	// send more messages on partition 0
-	for i := 0; i < 5; i++ {
-		producer.Input() <- &ProducerMessage{Topic: "my_topic", Key: nil, Value: StringEncoder(TestMessage), Partition: 0}
-	}
-	prodNotLeader := new(ProduceResponse)
-	prodNotLeader.AddTopicPartition("my_topic", 0, ErrNotLeaderForPartition)
-	leader.Returns(prodNotLeader)
-
-	// tell partition 0 to go to that broker again
-	seedBroker.Returns(metadataResponse)
-
-	// succeed this time
-	prodSuccess := new(ProduceResponse)
-	prodSuccess.AddTopicPartition("my_topic", 0, ErrNoError)
-	leader.Returns(prodSuccess)
-	expectResults(t, producer, 5, 0)
-
-	// put five more through
-	for i := 0; i < 5; i++ {
-		producer.Input() <- &ProducerMessage{Topic: "my_topic", Key: nil, Value: StringEncoder(TestMessage), Partition: 0}
-	}
-	leader.Returns(prodSuccess)
-	expectResults(t, producer, 5, 0)
-
-	// shutdown
-	closeProducer(t, producer)
-	seedBroker.Close()
-	leader.Close()
-}
-
-func TestAsyncProducerRetryShutdown(t *testing.T) {
-	seedBroker := newMockBroker(t, 1)
-	leader := newMockBroker(t, 2)
-
-	metadataLeader := new(MetadataResponse)
-	metadataLeader.AddBroker(leader.Addr(), leader.BrokerID())
-	metadataLeader.AddTopicPartition("my_topic", 0, leader.BrokerID(), nil, nil, ErrNoError)
-	seedBroker.Returns(metadataLeader)
-
-	config := NewConfig()
-	config.Producer.Flush.Messages = 10
-	config.Producer.Return.Successes = true
-	config.Producer.Retry.Backoff = 0
-	producer, err := NewAsyncProducer([]string{seedBroker.Addr()}, config)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	for i := 0; i < 10; i++ {
-		producer.Input() <- &ProducerMessage{Topic: "my_topic", Key: nil, Value: StringEncoder(TestMessage)}
-	}
-	producer.AsyncClose()
-	time.Sleep(5 * time.Millisecond) // let the shutdown goroutine kick in
-
-	producer.Input() <- &ProducerMessage{Topic: "FOO"}
-	if err := <-producer.Errors(); err.Err != ErrShuttingDown {
-		t.Error(err)
-	}
-
-	prodNotLeader := new(ProduceResponse)
-	prodNotLeader.AddTopicPartition("my_topic", 0, ErrNotLeaderForPartition)
-	leader.Returns(prodNotLeader)
-
-	seedBroker.Returns(metadataLeader)
-
-	prodSuccess := new(ProduceResponse)
-	prodSuccess.AddTopicPartition("my_topic", 0, ErrNoError)
-	leader.Returns(prodSuccess)
-	expectResults(t, producer, 10, 0)
-
-	seedBroker.Close()
-	leader.Close()
-
-	// wait for the async-closed producer to shut down fully
-	for err := range producer.Errors() {
-		t.Error(err)
-	}
-}
-
-// This example shows how to use the producer while simultaneously
-// reading the Errors channel to know about any failures.
-func ExampleAsyncProducer_select() {
-	producer, err := NewAsyncProducer([]string{"localhost:9092"}, nil)
-	if err != nil {
-		panic(err)
-	}
-
-	defer func() {
-		if err := producer.Close(); err != nil {
-			log.Fatalln(err)
-		}
-	}()
-
-	// Trap SIGINT to trigger a shutdown.
-	signals := make(chan os.Signal, 1)
-	signal.Notify(signals, os.Interrupt)
-
-	var enqueued, errors int
-ProducerLoop:
-	for {
-		select {
-		case producer.Input() <- &ProducerMessage{Topic: "my_topic", Key: nil, Value: StringEncoder("testing 123")}:
-			enqueued++
-		case err := <-producer.Errors():
-			log.Println("Failed to produce message", err)
-			errors++
-		case <-signals:
-			break ProducerLoop
-		}
-	}
-
-	log.Printf("Enqueued: %d; errors: %d\n", enqueued, errors)
-}
-
-// This example shows how to use the producer with separate goroutines
-// reading from the Successes and Errors channels. Note that in order
-// for the Successes channel to be populated, you have to set
-// config.Producer.Return.Successes to true.
-func ExampleAsyncProducer_goroutines() {
-	config := NewConfig()
-	config.Producer.Return.Successes = true
-	producer, err := NewAsyncProducer([]string{"localhost:9092"}, config)
-	if err != nil {
-		panic(err)
-	}
-
-	// Trap SIGINT to trigger a graceful shutdown.
-	signals := make(chan os.Signal, 1)
-	signal.Notify(signals, os.Interrupt)
-
-	var (
-		wg                          sync.WaitGroup
-		enqueued, successes, errors int
-	)
-
-	wg.Add(1)
-	go func() {
-		defer wg.Done()
-		for _ = range producer.Successes() {
-			successes++
-		}
-	}()
-
-	wg.Add(1)
-	go func() {
-		defer wg.Done()
-		for err := range producer.Errors() {
-			log.Println(err)
-			errors++
-		}
-	}()
-
-ProducerLoop:
-	for {
-		message := &ProducerMessage{Topic: "my_topic", Value: StringEncoder("testing 123")}
-		select {
-		case producer.Input() <- message:
-			enqueued++
-
-		case <-signals:
-			producer.AsyncClose() // Trigger a shutdown of the producer.
-			break ProducerLoop
-		}
-	}
-
-	wg.Wait()
-
-	log.Printf("Successfully produced: %d; errors: %d\n", successes, errors)
-}
diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/broker.go b/Godeps/_workspace/src/github.com/Shopify/sarama/broker.go
deleted file mode 100644
index eb5bc0bf8..000000000
--- a/Godeps/_workspace/src/github.com/Shopify/sarama/broker.go
+++ /dev/null
@@ -1,385 +0,0 @@
-package sarama
-
-import (
-	"crypto/tls"
-	"fmt"
-	"io"
-	"net"
-	"strconv"
-	"sync"
-	"sync/atomic"
-	"time"
-)
-
-// Broker represents a single Kafka broker connection. All operations on this object are entirely concurrency-safe.
-type Broker struct {
-	id   int32
-	addr string
-
-	conf          *Config
-	correlationID int32
-	conn          net.Conn
-	connErr       error
-	lock          sync.Mutex
-	opened        int32
-
-	responses chan responsePromise
-	done      chan bool
-}
-
-type responsePromise struct {
-	correlationID int32
-	packets       chan []byte
-	errors        chan error
-}
-
-// NewBroker creates and returns a Broker targetting the given host:port address.
-// This does not attempt to actually connect, you have to call Open() for that.
-func NewBroker(addr string) *Broker {
-	return &Broker{id: -1, addr: addr}
-}
-
-// Open tries to connect to the Broker if it is not already connected or connecting, but does not block
-// waiting for the connection to complete. This means that any subsequent operations on the broker will
-// block waiting for the connection to succeed or fail. To get the effect of a fully synchronous Open call,
-// follow it by a call to Connected(). The only errors Open will return directly are ConfigurationError or
-// AlreadyConnected. If conf is nil, the result of NewConfig() is used.
-func (b *Broker) Open(conf *Config) error {
-	if conf == nil {
-		conf = NewConfig()
-	}
-
-	err := conf.Validate()
-	if err != nil {
-		return err
-	}
-
-	if !atomic.CompareAndSwapInt32(&b.opened, 0, 1) {
-		return ErrAlreadyConnected
-	}
-
-	b.lock.Lock()
-
-	if b.conn != nil {
-		b.lock.Unlock()
-		Logger.Printf("Failed to connect to broker %s: %s\n", b.addr, ErrAlreadyConnected)
-		return ErrAlreadyConnected
-	}
-
-	go withRecover(func() {
-		defer b.lock.Unlock()
-
-		dialer := net.Dialer{
-			Timeout:   conf.Net.DialTimeout,
-			KeepAlive: conf.Net.KeepAlive,
-		}
-
-		if conf.Net.TLS.Enable {
-			b.conn, b.connErr = tls.DialWithDialer(&dialer, "tcp", b.addr, conf.Net.TLS.Config)
-		} else {
-			b.conn, b.connErr = dialer.Dial("tcp", b.addr)
-		}
-		if b.connErr != nil {
-			b.conn = nil
-			atomic.StoreInt32(&b.opened, 0)
-			Logger.Printf("Failed to connect to broker %s: %s\n", b.addr, b.connErr)
-			return
-		}
-
-		b.conf = conf
-		b.done = make(chan bool)
-		b.responses = make(chan responsePromise, b.conf.Net.MaxOpenRequests-1)
-
-		if b.id >= 0 {
-			Logger.Printf("Connected to broker at %s (registered as #%d)\n", b.addr, b.id)
-		} else {
-			Logger.Printf("Connected to broker at %s (unregistered)\n", b.addr)
-		}
-		go withRecover(b.responseReceiver)
-	})
-
-	return nil
-}
-
-// Connected returns true if the broker is connected and false otherwise. If the broker is not
-// connected but it had tried to connect, the error from that connection attempt is also returned.
-func (b *Broker) Connected() (bool, error) {
-	b.lock.Lock()
-	defer b.lock.Unlock()
-
-	return b.conn != nil, b.connErr
-}
-
-func (b *Broker) Close() error {
-	b.lock.Lock()
-	defer b.lock.Unlock()
-
-	if b.conn == nil {
-		return ErrNotConnected
-	}
-
-	close(b.responses)
-	<-b.done
-
-	err := b.conn.Close()
-
-	b.conn = nil
-	b.connErr = nil
-	b.done = nil
-	b.responses = nil
-
-	atomic.StoreInt32(&b.opened, 0)
-
-	if err == nil {
-		Logger.Printf("Closed connection to broker %s\n", b.addr)
-	} else {
-		Logger.Printf("Error while closing connection to broker %s: %s\n", b.addr, err)
-	}
-
-	return err
-}
-
-// ID returns the broker ID retrieved from Kafka's metadata, or -1 if that is not known.
-func (b *Broker) ID() int32 {
-	return b.id
-}
-
-// Addr returns the broker address as either retrieved from Kafka's metadata or passed to NewBroker.
-func (b *Broker) Addr() string {
-	return b.addr
-}
-
-func (b *Broker) GetMetadata(request *MetadataRequest) (*MetadataResponse, error) {
-	response := new(MetadataResponse)
-
-	err := b.sendAndReceive(request, response)
-
-	if err != nil {
-		return nil, err
-	}
-
-	return response, nil
-}
-
-func (b *Broker) GetConsumerMetadata(request *ConsumerMetadataRequest) (*ConsumerMetadataResponse, error) {
-	response := new(ConsumerMetadataResponse)
-
-	err := b.sendAndReceive(request, response)
-
-	if err != nil {
-		return nil, err
-	}
-
-	return response, nil
-}
-
-func (b *Broker) GetAvailableOffsets(request *OffsetRequest) (*OffsetResponse, error) {
-	response := new(OffsetResponse)
-
-	err := b.sendAndReceive(request, response)
-
-	if err != nil {
-		return nil, err
-	}
-
-	return response, nil
-}
-
-func (b *Broker) Produce(request *ProduceRequest) (*ProduceResponse, error) {
-	var response *ProduceResponse
-	var err error
-
-	if request.RequiredAcks == NoResponse {
-		err = b.sendAndReceive(request, nil)
-	} else {
-		response = new(ProduceResponse)
-		err = b.sendAndReceive(request, response)
-	}
-
-	if err != nil {
-		return nil, err
-	}
-
-	return response, nil
-}
-
-func (b *Broker) Fetch(request *FetchRequest) (*FetchResponse, error) {
-	response := new(FetchResponse)
-
-	err := b.sendAndReceive(request, response)
-
-	if err != nil {
-		return nil, err
-	}
-
-	return response, nil
-}
-
-func (b *Broker) CommitOffset(request *OffsetCommitRequest) (*OffsetCommitResponse, error) {
-	response := new(OffsetCommitResponse)
-
-	err := b.sendAndReceive(request, response)
-
-	if err != nil {
-		return nil, err
-	}
-
-	return response, nil
-}
-
-func (b *Broker) FetchOffset(request *OffsetFetchRequest) (*OffsetFetchResponse, error) {
-	response := new(OffsetFetchResponse)
-
-	err := b.sendAndReceive(request, response)
-
-	if err != nil {
-		return nil, err
-	}
-
-	return response, nil
-}
-
-func (b *Broker) send(rb requestBody, promiseResponse bool) (*responsePromise, error) {
-	b.lock.Lock()
-	defer b.lock.Unlock()
-
-	if b.conn == nil {
-		if b.connErr != nil {
-			return nil, b.connErr
-		}
-		return nil, ErrNotConnected
-	}
-
-	req := &request{correlationID: b.correlationID, clientID: b.conf.ClientID, body: rb}
-	buf, err := encode(req)
-	if err != nil {
-		return nil, err
-	}
-
-	err = b.conn.SetWriteDeadline(time.Now().Add(b.conf.Net.WriteTimeout))
-	if err != nil {
-		return nil, err
-	}
-
-	_, err = b.conn.Write(buf)
-	if err != nil {
-		return nil, err
-	}
-	b.correlationID++
-
-	if !promiseResponse {
-		return nil, nil
-	}
-
-	promise := responsePromise{req.correlationID, make(chan []byte), make(chan error)}
-	b.responses <- promise
-
-	return &promise, nil
-}
-
-func (b *Broker) sendAndReceive(req requestBody, res decoder) error {
-	promise, err := b.send(req, res != nil)
-
-	if err != nil {
-		return err
-	}
-
-	if promise == nil {
-		return nil
-	}
-
-	select {
-	case buf := <-promise.packets:
-		return decode(buf, res)
-	case err = <-promise.errors:
-		return err
-	}
-}
-
-func (b *Broker) decode(pd packetDecoder) (err error) {
-	b.id, err = pd.getInt32()
-	if err != nil {
-		return err
-	}
-
-	host, err := pd.getString()
-	if err != nil {
-		return err
-	}
-
-	port, err := pd.getInt32()
-	if err != nil {
-		return err
-	}
-
-	b.addr = fmt.Sprint(host, ":", port)
-
-	return nil
-}
-
-func (b *Broker) encode(pe packetEncoder) (err error) {
-
-	host, portstr, err := net.SplitHostPort(b.addr)
-	if err != nil {
-		return err
-	}
-	port, err := strconv.Atoi(portstr)
-	if err != nil {
-		return err
-	}
-
-	pe.putInt32(b.id)
-
-	err = pe.putString(host)
-	if err != nil {
-		return err
-	}
-
-	pe.putInt32(int32(port))
-
-	return nil
-}
-
-func (b *Broker) responseReceiver() {
-	header := make([]byte, 8)
-	for response := range b.responses {
-		err := b.conn.SetReadDeadline(time.Now().Add(b.conf.Net.ReadTimeout))
-		if err != nil {
-			response.errors <- err
-			continue
-		}
-
-		_, err = io.ReadFull(b.conn, header)
-		if err != nil {
-			response.errors <- err
-			continue
-		}
-
-		decodedHeader := responseHeader{}
-		err = decode(header, &decodedHeader)
-		if err != nil {
-			response.errors <- err
-			continue
-		}
-		if decodedHeader.correlationID != response.correlationID {
-			// TODO if decoded ID < cur ID, discard until we catch up
-			// TODO if decoded ID > cur ID, save it so when cur ID catches up we have a response
-			response.errors <- PacketDecodingError{fmt.Sprintf("correlation ID didn't match, wanted %d, got %d", response.correlationID, decodedHeader.correlationID)}
-			continue
-		}
-
-		buf := make([]byte, decodedHeader.length-4)
-		_, err = io.ReadFull(b.conn, buf)
-		if err != nil {
-			// XXX: the above ReadFull call inherits the same ReadDeadline set at the top of this loop, so it may
-			// fail with a timeout error. If this happens, our connection is permanently toast since we will no longer
-			// be aligned correctly on the stream (we'll be reading garbage Kafka headers from the middle of data).
-			// Can we/should we fail harder in that case?
-			response.errors <- err
-			continue
-		}
-
-		response.packets <- buf
-	}
-	close(b.done)
-}
diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/broker_test.go b/Godeps/_workspace/src/github.com/Shopify/sarama/broker_test.go
deleted file mode 100644
index df3499e49..000000000
--- a/Godeps/_workspace/src/github.com/Shopify/sarama/broker_test.go
+++ /dev/null
@@ -1,177 +0,0 @@
-package sarama
-
-import (
-	"fmt"
-	"testing"
-)
-
-func ExampleBroker() error {
-	broker := NewBroker("localhost:9092")
-	err := broker.Open(nil)
-	if err != nil {
-		return err
-	}
-
-	request := MetadataRequest{Topics: []string{"myTopic"}}
-	response, err := broker.GetMetadata(&request)
-	if err != nil {
-		_ = broker.Close()
-		return err
-	}
-
-	fmt.Println("There are", len(response.Topics), "topics active in the cluster.")
-
-	return broker.Close()
-}
-
-type mockEncoder struct {
-	bytes []byte
-}
-
-func (m mockEncoder) encode(pe packetEncoder) error {
-	return pe.putRawBytes(m.bytes)
-}
-
-func TestBrokerAccessors(t *testing.T) {
-	broker := NewBroker("abc:123")
-
-	if broker.ID() != -1 {
-		t.Error("New broker didn't have an ID of -1.")
-	}
-
-	if broker.Addr() != "abc:123" {
-		t.Error("New broker didn't have the correct address")
-	}
-
-	broker.id = 34
-	if broker.ID() != 34 {
-		t.Error("Manually setting broker ID did not take effect.")
-	}
-}
-
-func TestSimpleBrokerCommunication(t *testing.T) {
-	mb := newMockBroker(t, 0)
-	defer mb.Close()
-
-	broker := NewBroker(mb.Addr())
-	err := broker.Open(nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	for _, tt := range brokerTestTable {
-		mb.Returns(&mockEncoder{tt.response})
-	}
-	for _, tt := range brokerTestTable {
-		tt.runner(t, broker)
-	}
-
-	err = broker.Close()
-	if err != nil {
-		t.Error(err)
-	}
-}
-
-// We're not testing encoding/decoding here, so most of the requests/responses will be empty for simplicity's sake
-var brokerTestTable = []struct {
-	response []byte
-	runner   func(*testing.T, *Broker)
-}{
-	{[]byte{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-		func(t *testing.T, broker *Broker) {
-			request := MetadataRequest{}
-			response, err := broker.GetMetadata(&request)
-			if err != nil {
-				t.Error(err)
-			}
-			if response == nil {
-				t.Error("Metadata request got no response!")
-			}
-		}},
-
-	{[]byte{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 't', 0x00, 0x00, 0x00, 0x00},
-		func(t *testing.T, broker *Broker) {
-			request := ConsumerMetadataRequest{}
-			response, err := broker.GetConsumerMetadata(&request)
-			if err != nil {
-				t.Error(err)
-			}
-			if response == nil {
-				t.Error("Consumer Metadata request got no response!")
-			}
-		}},
-
-	{[]byte{},
-		func(t *testing.T, broker *Broker) {
-			request := ProduceRequest{}
-			request.RequiredAcks = NoResponse
-			response, err := broker.Produce(&request)
-			if err != nil {
-				t.Error(err)
-			}
-			if response != nil {
-				t.Error("Produce request with NoResponse got a response!")
-			}
-		}},
-
-	{[]byte{0x00, 0x00, 0x00, 0x00},
-		func(t *testing.T, broker *Broker) {
-			request := ProduceRequest{}
-			request.RequiredAcks = WaitForLocal
-			response, err := broker.Produce(&request)
-			if err != nil {
-				t.Error(err)
-			}
-			if response == nil {
-				t.Error("Produce request without NoResponse got no response!")
-			}
-		}},
-
-	{[]byte{0x00, 0x00, 0x00, 0x00},
-		func(t *testing.T, broker *Broker) {
-			request := FetchRequest{}
-			response, err := broker.Fetch(&request)
-			if err != nil {
-				t.Error(err)
-			}
-			if response == nil {
-				t.Error("Fetch request got no response!")
-			}
-		}},
-
-	{[]byte{0x00, 0x00, 0x00, 0x00},
-		func(t *testing.T, broker *Broker) {
-			request := OffsetFetchRequest{}
-			response, err := broker.FetchOffset(&request)
-			if err != nil {
-				t.Error(err)
-			}
-			if response == nil {
-				t.Error("OffsetFetch request got no response!")
-			}
-		}},
-
-	{[]byte{0x00, 0x00, 0x00, 0x00},
-		func(t *testing.T, broker *Broker) {
-			request := OffsetCommitRequest{}
-			response, err := broker.CommitOffset(&request)
-			if err != nil {
-				t.Error(err)
-			}
-			if response == nil {
-				t.Error("OffsetCommit request got no response!")
-			}
-		}},
-
-	{[]byte{0x00, 0x00, 0x00, 0x00},
-		func(t *testing.T, broker *Broker) {
-			request := OffsetRequest{}
-			response, err := broker.GetAvailableOffsets(&request)
-			if err != nil {
-				t.Error(err)
-			}
-			if response == nil {
-				t.Error("Offset request got no response!")
-			}
-		}},
-}
diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/client.go b/Godeps/_workspace/src/github.com/Shopify/sarama/client.go
deleted file mode 100644
index 974d223e2..000000000
--- a/Godeps/_workspace/src/github.com/Shopify/sarama/client.go
+++ /dev/null
@@ -1,727 +0,0 @@
-package sarama
-
-import (
-	"math/rand"
-	"sort"
-	"sync"
-	"time"
-)
-
-// Client is a generic Kafka client. It manages connections to one or more Kafka brokers.
-// You MUST call Close() on a client to avoid leaks, it will not be garbage-collected
-// automatically when it passes out of scope. A single client can be safely shared by
-// multiple concurrent Producers and Consumers.
-type Client interface {
-	// Config returns the Config struct of the client. This struct should not be altered after it
-	// has been created.
-	Config() *Config
-
-	// Topics returns the set of available topics as retrieved from the cluster metadata.
-	Topics() ([]string, error)
-
-	// Partitions returns the sorted list of all partition IDs for the given topic.
-	Partitions(topic string) ([]int32, error)
-
-	// WritablePartitions returns the sorted list of all writable partition IDs for the given topic,
-	// where "writable" means "having a valid leader accepting writes".
-	WritablePartitions(topic string) ([]int32, error)
-
-	// Leader returns the broker object that is the leader of the current topic/partition, as
-	// determined by querying the cluster metadata.
-	Leader(topic string, partitionID int32) (*Broker, error)
-
-	// Replicas returns the set of all replica IDs for the given partition.
-	Replicas(topic string, partitionID int32) ([]int32, error)
-
-	// RefreshMetadata takes a list of topics and queries the cluster to refresh the
-	// available metadata for those topics. If no topics are provided, it will refresh metadata
-	// for all topics.
-	RefreshMetadata(topics ...string) error
-
-	// GetOffset queries the cluster to get the most recent available offset at the given
-	// time on the topic/partition combination. Time should be OffsetOldest for the earliest available
-	// offset, OffsetNewest for the offset of the message that will be produced next, or a time.
-	GetOffset(topic string, partitionID int32, time int64) (int64, error)
-
-	// Coordinator returns the coordinating broker for a consumer group. It will return a locally cached
-	// value if it's available. You can call RefreshCoordinator to update the cached value.
-	// This function only works on Kafka 0.8.2 and higher.
-	Coordinator(consumerGroup string) (*Broker, error)
-
-	// RefreshCoordinator retrieves the coordinator for a consumer group and stores it in local cache.
-	// This function only works on Kafka 0.8.2 and higher.
-	RefreshCoordinator(consumerGroup string) error
-
-	// Close shuts down all broker connections managed by this client. It is required to call this function before
-	// a client object passes out of scope, as it will otherwise leak memory. You must close any Producers or Consumers
-	// using a client before you close the client.
-	Close() error
-
-	// Closed returns true if the client has already had Close called on it
-	Closed() bool
-}
-
-const (
-	// OffsetNewest stands for the log head offset, i.e. the offset that will be assigned to the next message
-	// that will be produced to the partition. You can send this to a client's GetOffset method to get this
-	// offset, or when calling ConsumePartition to start consuming new messages.
-	OffsetNewest int64 = -1
-	// OffsetOldest stands for the oldest offset available on the broker for a partition. You can send this
-	// to a client's GetOffset method to get this offset, or when calling ConsumePartition to start consuming
-	// from the oldest offset that is still available on the broker.
-	OffsetOldest int64 = -2
-)
-
-type client struct {
-	conf           *Config
-	closer, closed chan none // for shutting down background metadata updater
-
-	// the broker addresses given to us through the constructor are not guaranteed to be returned in
-	// the cluster metadata (I *think* it only returns brokers who are currently leading partitions?)
-	// so we store them separately
-	seedBrokers []*Broker
-	deadSeeds   []*Broker
-
-	brokers      map[int32]*Broker                       // maps broker ids to brokers
-	metadata     map[string]map[int32]*PartitionMetadata // maps topics to partition ids to metadata
-	coordinators map[string]int32                        // Maps consumer group names to coordinating broker IDs
-
-	// If the number of partitions is large, we can get some churn calling cachedPartitions,
-	// so the result is cached.  It is important to update this value whenever metadata is changed
-	cachedPartitionsResults map[string][maxPartitionIndex][]int32
-
-	lock sync.RWMutex // protects access to the maps that hold cluster state.
-}
-
-// NewClient creates a new Client. It connects to one of the given broker addresses
-// and uses that broker to automatically fetch metadata on the rest of the kafka cluster. If metadata cannot
-// be retrieved from any of the given broker addresses, the client is not created.
-func NewClient(addrs []string, conf *Config) (Client, error) {
-	Logger.Println("Initializing new client")
-
-	if conf == nil {
-		conf = NewConfig()
-	}
-
-	if err := conf.Validate(); err != nil {
-		return nil, err
-	}
-
-	if len(addrs) < 1 {
-		return nil, ConfigurationError("You must provide at least one broker address")
-	}
-
-	client := &client{
-		conf:                    conf,
-		closer:                  make(chan none),
-		closed:                  make(chan none),
-		brokers:                 make(map[int32]*Broker),
-		metadata:                make(map[string]map[int32]*PartitionMetadata),
-		cachedPartitionsResults: make(map[string][maxPartitionIndex][]int32),
-		coordinators:            make(map[string]int32),
-	}
-
-	random := rand.New(rand.NewSource(time.Now().UnixNano()))
-	for _, index := range random.Perm(len(addrs)) {
-		client.seedBrokers = append(client.seedBrokers, NewBroker(addrs[index]))
-	}
-
-	// do an initial fetch of all cluster metadata by specifing an empty list of topics
-	err := client.RefreshMetadata()
-	switch err {
-	case nil:
-		break
-	case ErrLeaderNotAvailable, ErrReplicaNotAvailable:
-		// indicates that maybe part of the cluster is down, but is not fatal to creating the client
-		Logger.Println(err)
-	default:
-		close(client.closed) // we haven't started the background updater yet, so we have to do this manually
-		_ = client.Close()
-		return nil, err
-	}
-	go withRecover(client.backgroundMetadataUpdater)
-
-	Logger.Println("Successfully initialized new client")
-
-	return client, nil
-}
-
-func (client *client) Config() *Config {
-	return client.conf
-}
-
-func (client *client) Close() error {
-	if client.Closed() {
-		// Chances are this is being called from a defer() and the error will go unobserved
-		// so we go ahead and log the event in this case.
-		Logger.Printf("Close() called on already closed client")
-		return ErrClosedClient
-	}
-
-	// shutdown and wait for the background thread before we take the lock, to avoid races
-	close(client.closer)
-	<-client.closed
-
-	client.lock.Lock()
-	defer client.lock.Unlock()
-	Logger.Println("Closing Client")
-
-	for _, broker := range client.brokers {
-		safeAsyncClose(broker)
-	}
-
-	for _, broker := range client.seedBrokers {
-		safeAsyncClose(broker)
-	}
-
-	client.brokers = nil
-	client.metadata = nil
-
-	return nil
-}
-
-func (client *client) Closed() bool {
-	return client.brokers == nil
-}
-
-func (client *client) Topics() ([]string, error) {
-	if client.Closed() {
-		return nil, ErrClosedClient
-	}
-
-	client.lock.RLock()
-	defer client.lock.RUnlock()
-
-	ret := make([]string, 0, len(client.metadata))
-	for topic := range client.metadata {
-		ret = append(ret, topic)
-	}
-
-	return ret, nil
-}
-
-func (client *client) Partitions(topic string) ([]int32, error) {
-	if client.Closed() {
-		return nil, ErrClosedClient
-	}
-
-	partitions := client.cachedPartitions(topic, allPartitions)
-
-	if len(partitions) == 0 {
-		err := client.RefreshMetadata(topic)
-		if err != nil {
-			return nil, err
-		}
-		partitions = client.cachedPartitions(topic, allPartitions)
-	}
-
-	if partitions == nil {
-		return nil, ErrUnknownTopicOrPartition
-	}
-
-	return partitions, nil
-}
-
-func (client *client) WritablePartitions(topic string) ([]int32, error) {
-	if client.Closed() {
-		return nil, ErrClosedClient
-	}
-
-	partitions := client.cachedPartitions(topic, writablePartitions)
-
-	// len==0 catches when it's nil (no such topic) and the odd case when every single
-	// partition is undergoing leader election simultaneously. Callers have to be able to handle
-	// this function returning an empty slice (which is a valid return value) but catching it
-	// here the first time (note we *don't* catch it below where we return ErrUnknownTopicOrPartition) triggers
-	// a metadata refresh as a nicety so callers can just try again and don't have to manually
-	// trigger a refresh (otherwise they'd just keep getting a stale cached copy).
-	if len(partitions) == 0 {
-		err := client.RefreshMetadata(topic)
-		if err != nil {
-			return nil, err
-		}
-		partitions = client.cachedPartitions(topic, writablePartitions)
-	}
-
-	if partitions == nil {
-		return nil, ErrUnknownTopicOrPartition
-	}
-
-	return partitions, nil
-}
-
-func (client *client) Replicas(topic string, partitionID int32) ([]int32, error) {
-	if client.Closed() {
-		return nil, ErrClosedClient
-	}
-
-	metadata := client.cachedMetadata(topic, partitionID)
-
-	if metadata == nil {
-		err := client.RefreshMetadata(topic)
-		if err != nil {
-			return nil, err
-		}
-		metadata = client.cachedMetadata(topic, partitionID)
-	}
-
-	if metadata == nil {
-		return nil, ErrUnknownTopicOrPartition
-	}
-
-	if metadata.Err == ErrReplicaNotAvailable {
-		return nil, metadata.Err
-	}
-	return dupeAndSort(metadata.Replicas), nil
-}
-
-func (client *client) Leader(topic string, partitionID int32) (*Broker, error) {
-	if client.Closed() {
-		return nil, ErrClosedClient
-	}
-
-	leader, err := client.cachedLeader(topic, partitionID)
-
-	if leader == nil {
-		err := client.RefreshMetadata(topic)
-		if err != nil {
-			return nil, err
-		}
-		leader, err = client.cachedLeader(topic, partitionID)
-	}
-
-	return leader, err
-}
-
-func (client *client) RefreshMetadata(topics ...string) error {
-	if client.Closed() {
-		return ErrClosedClient
-	}
-
-	// Prior to 0.8.2, Kafka will throw exceptions on an empty topic and not return a proper
-	// error. This handles the case by returning an error instead of sending it
-	// off to Kafka. See: https://github.com/Shopify/sarama/pull/38#issuecomment-26362310
-	for _, topic := range topics {
-		if len(topic) == 0 {
-			return ErrInvalidTopic // this is the error that 0.8.2 and later correctly return
-		}
-	}
-
-	return client.tryRefreshMetadata(topics, client.conf.Metadata.Retry.Max)
-}
-
-func (client *client) GetOffset(topic string, partitionID int32, time int64) (int64, error) {
-	if client.Closed() {
-		return -1, ErrClosedClient
-	}
-
-	offset, err := client.getOffset(topic, partitionID, time)
-
-	if err != nil {
-		if err := client.RefreshMetadata(topic); err != nil {
-			return -1, err
-		}
-		return client.getOffset(topic, partitionID, time)
-	}
-
-	return offset, err
-}
-
-func (client *client) Coordinator(consumerGroup string) (*Broker, error) {
-	if client.Closed() {
-		return nil, ErrClosedClient
-	}
-
-	coordinator := client.cachedCoordinator(consumerGroup)
-
-	if coordinator == nil {
-		if err := client.RefreshCoordinator(consumerGroup); err != nil {
-			return nil, err
-		}
-		coordinator = client.cachedCoordinator(consumerGroup)
-	}
-
-	if coordinator == nil {
-		return nil, ErrConsumerCoordinatorNotAvailable
-	}
-
-	_ = coordinator.Open(client.conf)
-	return coordinator, nil
-}
-
-func (client *client) RefreshCoordinator(consumerGroup string) error {
-	if client.Closed() {
-		return ErrClosedClient
-	}
-
-	response, err := client.getConsumerMetadata(consumerGroup, client.conf.Metadata.Retry.Max)
-	if err != nil {
-		return err
-	}
-
-	client.lock.Lock()
-	defer client.lock.Unlock()
-	client.registerBroker(response.Coordinator)
-	client.coordinators[consumerGroup] = response.Coordinator.ID()
-	return nil
-}
-
-// private broker management helpers
-
-// registerBroker makes sure a broker received by a Metadata or Coordinator request is registered
-// in the brokers map. It returns the broker that is registered, which may be the provided broker,
-// or a previously registered Broker instance. You must hold the write lock before calling this function.
-func (client *client) registerBroker(broker *Broker) {
-	if client.brokers[broker.ID()] == nil {
-		client.brokers[broker.ID()] = broker
-		Logger.Printf("client/brokers registered new broker #%d at %s", broker.ID(), broker.Addr())
-	} else if broker.Addr() != client.brokers[broker.ID()].Addr() {
-		safeAsyncClose(client.brokers[broker.ID()])
-		client.brokers[broker.ID()] = broker
-		Logger.Printf("client/brokers replaced registered broker #%d with %s", broker.ID(), broker.Addr())
-	}
-}
-
-// deregisterBroker removes a broker from the seedsBroker list, and if it's
-// not the seedbroker, removes it from brokers map completely.
-func (client *client) deregisterBroker(broker *Broker) {
-	client.lock.Lock()
-	defer client.lock.Unlock()
-
-	if len(client.seedBrokers) > 0 && broker == client.seedBrokers[0] {
-		client.deadSeeds = append(client.deadSeeds, broker)
-		client.seedBrokers = client.seedBrokers[1:]
-	} else {
-		// we do this so that our loop in `tryRefreshMetadata` doesn't go on forever,
-		// but we really shouldn't have to; once that loop is made better this case can be
-		// removed, and the function generally can be renamed from `deregisterBroker` to
-		// `nextSeedBroker` or something
-		Logger.Printf("client/brokers deregistered broker #%d at %s", broker.ID(), broker.Addr())
-		delete(client.brokers, broker.ID())
-	}
-}
-
-func (client *client) resurrectDeadBrokers() {
-	client.lock.Lock()
-	defer client.lock.Unlock()
-
-	Logger.Printf("client/brokers resurrecting %d dead seed brokers", len(client.deadSeeds))
-	client.seedBrokers = append(client.seedBrokers, client.deadSeeds...)
-	client.deadSeeds = nil
-}
-
-func (client *client) any() *Broker {
-	client.lock.RLock()
-	defer client.lock.RUnlock()
-
-	if len(client.seedBrokers) > 0 {
-		_ = client.seedBrokers[0].Open(client.conf)
-		return client.seedBrokers[0]
-	}
-
-	// not guaranteed to be random *or* deterministic
-	for _, broker := range client.brokers {
-		_ = broker.Open(client.conf)
-		return broker
-	}
-
-	return nil
-}
-
-// private caching/lazy metadata helpers
-
-type partitionType int
-
-const (
-	allPartitions partitionType = iota
-	writablePartitions
-	// If you add any more types, update the partition cache in update()
-
-	// Ensure this is the last partition type value
-	maxPartitionIndex
-)
-
-func (client *client) cachedMetadata(topic string, partitionID int32) *PartitionMetadata {
-	client.lock.RLock()
-	defer client.lock.RUnlock()
-
-	partitions := client.metadata[topic]
-	if partitions != nil {
-		return partitions[partitionID]
-	}
-
-	return nil
-}
-
-func (client *client) cachedPartitions(topic string, partitionSet partitionType) []int32 {
-	client.lock.RLock()
-	defer client.lock.RUnlock()
-
-	partitions, exists := client.cachedPartitionsResults[topic]
-
-	if !exists {
-		return nil
-	}
-	return partitions[partitionSet]
-}
-
-func (client *client) setPartitionCache(topic string, partitionSet partitionType) []int32 {
-	partitions := client.metadata[topic]
-
-	if partitions == nil {
-		return nil
-	}
-
-	ret := make([]int32, 0, len(partitions))
-	for _, partition := range partitions {
-		if partitionSet == writablePartitions && partition.Err == ErrLeaderNotAvailable {
-			continue
-		}
-		ret = append(ret, partition.ID)
-	}
-
-	sort.Sort(int32Slice(ret))
-	return ret
-}
-
-func (client *client) cachedLeader(topic string, partitionID int32) (*Broker, error) {
-	client.lock.RLock()
-	defer client.lock.RUnlock()
-
-	partitions := client.metadata[topic]
-	if partitions != nil {
-		metadata, ok := partitions[partitionID]
-		if ok {
-			if metadata.Err == ErrLeaderNotAvailable {
-				return nil, ErrLeaderNotAvailable
-			}
-			b := client.brokers[metadata.Leader]
-			if b == nil {
-				return nil, ErrLeaderNotAvailable
-			}
-			_ = b.Open(client.conf)
-			return b, nil
-		}
-	}
-
-	return nil, ErrUnknownTopicOrPartition
-}
-
-func (client *client) getOffset(topic string, partitionID int32, time int64) (int64, error) {
-	broker, err := client.Leader(topic, partitionID)
-	if err != nil {
-		return -1, err
-	}
-
-	request := &OffsetRequest{}
-	request.AddBlock(topic, partitionID, time, 1)
-
-	response, err := broker.GetAvailableOffsets(request)
-	if err != nil {
-		_ = broker.Close()
-		return -1, err
-	}
-
-	block := response.GetBlock(topic, partitionID)
-	if block == nil {
-		_ = broker.Close()
-		return -1, ErrIncompleteResponse
-	}
-	if block.Err != ErrNoError {
-		return -1, block.Err
-	}
-	if len(block.Offsets) != 1 {
-		return -1, ErrOffsetOutOfRange
-	}
-
-	return block.Offsets[0], nil
-}
-
-// core metadata update logic
-
-func (client *client) backgroundMetadataUpdater() {
-	defer close(client.closed)
-
-	if client.conf.Metadata.RefreshFrequency == time.Duration(0) {
-		return
-	}
-
-	ticker := time.NewTicker(client.conf.Metadata.RefreshFrequency)
-	defer ticker.Stop()
-
-	for {
-		select {
-		case <-ticker.C:
-			if err := client.RefreshMetadata(); err != nil {
-				Logger.Println("Client background metadata update:", err)
-			}
-		case <-client.closer:
-			return
-		}
-	}
-}
-
-func (client *client) tryRefreshMetadata(topics []string, attemptsRemaining int) error {
-	retry := func(err error) error {
-		if attemptsRemaining > 0 {
-			Logger.Printf("client/metadata retrying after %dms... (%d attempts remaining)\n", client.conf.Metadata.Retry.Backoff/time.Millisecond, attemptsRemaining)
-			time.Sleep(client.conf.Metadata.Retry.Backoff)
-			return client.tryRefreshMetadata(topics, attemptsRemaining-1)
-		}
-		return err
-	}
-
-	for broker := client.any(); broker != nil; broker = client.any() {
-		if len(topics) > 0 {
-			Logger.Printf("client/metadata fetching metadata for %v from broker %s\n", topics, broker.addr)
-		} else {
-			Logger.Printf("client/metadata fetching metadata for all topics from broker %s\n", broker.addr)
-		}
-		response, err := broker.GetMetadata(&MetadataRequest{Topics: topics})
-
-		switch err.(type) {
-		case nil:
-			// valid response, use it
-			if shouldRetry, err := client.updateMetadata(response); shouldRetry {
-				Logger.Println("client/metadata found some partitions to be leaderless")
-				return retry(err) // note: err can be nil
-			} else {
-				return err
-			}
-
-		case PacketEncodingError:
-			// didn't even send, return the error
-			return err
-		default:
-			// some other error, remove that broker and try again
-			Logger.Println("client/metadata got error from broker while fetching metadata:", err)
-			_ = broker.Close()
-			client.deregisterBroker(broker)
-		}
-	}
-
-	Logger.Println("client/metadata no available broker to send metadata request to")
-	client.resurrectDeadBrokers()
-	return retry(ErrOutOfBrokers)
-}
-
-// if no fatal error, returns a list of topics that need retrying due to ErrLeaderNotAvailable
-func (client *client) updateMetadata(data *MetadataResponse) (retry bool, err error) {
-	client.lock.Lock()
-	defer client.lock.Unlock()
-
-	// For all the brokers we received:
-	// - if it is a new ID, save it
-	// - if it is an existing ID, but the address we have is stale, discard the old one and save it
-	// - otherwise ignore it, replacing our existing one would just bounce the connection
-	for _, broker := range data.Brokers {
-		client.registerBroker(broker)
-	}
-
-	for _, topic := range data.Topics {
-		delete(client.metadata, topic.Name)
-		delete(client.cachedPartitionsResults, topic.Name)
-
-		switch topic.Err {
-		case ErrNoError:
-			break
-		case ErrInvalidTopic: // don't retry, don't store partial results
-			err = topic.Err
-			continue
-		case ErrUnknownTopicOrPartition: // retry, do not store partial partition results
-			err = topic.Err
-			retry = true
-			continue
-		case ErrLeaderNotAvailable: // retry, but store partial partition results
-			retry = true
-			break
-		default: // don't retry, don't store partial results
-			Logger.Printf("Unexpected topic-level metadata error: %s", topic.Err)
-			err = topic.Err
-			continue
-		}
-
-		client.metadata[topic.Name] = make(map[int32]*PartitionMetadata, len(topic.Partitions))
-		for _, partition := range topic.Partitions {
-			client.metadata[topic.Name][partition.ID] = partition
-			if partition.Err == ErrLeaderNotAvailable {
-				retry = true
-			}
-		}
-
-		var partitionCache [maxPartitionIndex][]int32
-		partitionCache[allPartitions] = client.setPartitionCache(topic.Name, allPartitions)
-		partitionCache[writablePartitions] = client.setPartitionCache(topic.Name, writablePartitions)
-		client.cachedPartitionsResults[topic.Name] = partitionCache
-	}
-
-	return
-}
-
-func (client *client) cachedCoordinator(consumerGroup string) *Broker {
-	client.lock.RLock()
-	defer client.lock.RUnlock()
-	if coordinatorID, ok := client.coordinators[consumerGroup]; !ok {
-		return nil
-	} else {
-		return client.brokers[coordinatorID]
-	}
-}
-
-func (client *client) getConsumerMetadata(consumerGroup string, attemptsRemaining int) (*ConsumerMetadataResponse, error) {
-	retry := func(err error) (*ConsumerMetadataResponse, error) {
-		if attemptsRemaining > 0 {
-			Logger.Printf("client/coordinator retrying after %dms... (%d attempts remaining)\n", client.conf.Metadata.Retry.Backoff/time.Millisecond, attemptsRemaining)
-			time.Sleep(client.conf.Metadata.Retry.Backoff)
-			return client.getConsumerMetadata(consumerGroup, attemptsRemaining-1)
-		}
-		return nil, err
-	}
-
-	for broker := client.any(); broker != nil; broker = client.any() {
-		Logger.Printf("client/coordinator requesting coordinator for consumergoup %s from %s\n", consumerGroup, broker.Addr())
-
-		request := new(ConsumerMetadataRequest)
-		request.ConsumerGroup = consumerGroup
-
-		response, err := broker.GetConsumerMetadata(request)
-
-		if err != nil {
-			Logger.Printf("client/coordinator request to broker %s failed: %s\n", broker.Addr(), err)
-
-			switch err.(type) {
-			case PacketEncodingError:
-				return nil, err
-			default:
-				_ = broker.Close()
-				client.deregisterBroker(broker)
-				continue
-			}
-		}
-
-		switch response.Err {
-		case ErrNoError:
-			Logger.Printf("client/coordinator coordinator for consumergoup %s is #%d (%s)\n", consumerGroup, response.Coordinator.ID(), response.Coordinator.Addr())
-			return response, nil
-
-		case ErrConsumerCoordinatorNotAvailable:
-			Logger.Printf("client/coordinator coordinator for consumer group %s is not available\n", consumerGroup)
-
-			// This is very ugly, but this scenario will only happen once per cluster.
-			// The __consumer_offsets topic only has to be created one time.
-			// The number of partitions not configurable, but partition 0 should always exist.
-			if _, err := client.Leader("__consumer_offsets", 0); err != nil {
-				Logger.Printf("client/coordinator the __consumer_offsets topic is not initialized completely yet. Waiting 2 seconds...\n")
-				time.Sleep(2 * time.Second)
-			}
-
-			return retry(ErrConsumerCoordinatorNotAvailable)
-		default:
-			return nil, response.Err
-		}
-	}
-
-	Logger.Println("client/coordinator no available broker to send consumer metadata request to")
-	client.resurrectDeadBrokers()
-	return retry(ErrOutOfBrokers)
-}
diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/client_test.go b/Godeps/_workspace/src/github.com/Shopify/sarama/client_test.go
deleted file mode 100644
index f84b9af31..000000000
--- a/Godeps/_workspace/src/github.com/Shopify/sarama/client_test.go
+++ /dev/null
@@ -1,608 +0,0 @@
-package sarama
-
-import (
-	"io"
-	"sync"
-	"testing"
-	"time"
-)
-
-func safeClose(t testing.TB, c io.Closer) {
-	err := c.Close()
-	if err != nil {
-		t.Error(err)
-	}
-}
-
-func TestSimpleClient(t *testing.T) {
-	seedBroker := newMockBroker(t, 1)
-
-	seedBroker.Returns(new(MetadataResponse))
-
-	client, err := NewClient([]string{seedBroker.Addr()}, nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	seedBroker.Close()
-	safeClose(t, client)
-}
-
-func TestCachedPartitions(t *testing.T) {
-	seedBroker := newMockBroker(t, 1)
-
-	replicas := []int32{3, 1, 5}
-	isr := []int32{5, 1}
-
-	metadataResponse := new(MetadataResponse)
-	metadataResponse.AddBroker("localhost:12345", 2)
-	metadataResponse.AddTopicPartition("my_topic", 0, 2, replicas, isr, ErrNoError)
-	metadataResponse.AddTopicPartition("my_topic", 1, 2, replicas, isr, ErrLeaderNotAvailable)
-	seedBroker.Returns(metadataResponse)
-
-	config := NewConfig()
-	config.Metadata.Retry.Max = 0
-	c, err := NewClient([]string{seedBroker.Addr()}, config)
-	if err != nil {
-		t.Fatal(err)
-	}
-	client := c.(*client)
-
-	// Verify they aren't cached the same
-	allP := client.cachedPartitionsResults["my_topic"][allPartitions]
-	writeP := client.cachedPartitionsResults["my_topic"][writablePartitions]
-	if len(allP) == len(writeP) {
-		t.Fatal("Invalid lengths!")
-	}
-
-	tmp := client.cachedPartitionsResults["my_topic"]
-	// Verify we actually use the cache at all!
-	tmp[allPartitions] = []int32{1, 2, 3, 4}
-	client.cachedPartitionsResults["my_topic"] = tmp
-	if 4 != len(client.cachedPartitions("my_topic", allPartitions)) {
-		t.Fatal("Not using the cache!")
-	}
-
-	seedBroker.Close()
-	safeClose(t, client)
-}
-
-func TestClientDoesntCachePartitionsForTopicsWithErrors(t *testing.T) {
-	seedBroker := newMockBroker(t, 1)
-
-	replicas := []int32{seedBroker.BrokerID()}
-
-	metadataResponse := new(MetadataResponse)
-	metadataResponse.AddBroker(seedBroker.Addr(), seedBroker.BrokerID())
-	metadataResponse.AddTopicPartition("my_topic", 1, replicas[0], replicas, replicas, ErrNoError)
-	metadataResponse.AddTopicPartition("my_topic", 2, replicas[0], replicas, replicas, ErrNoError)
-	seedBroker.Returns(metadataResponse)
-
-	config := NewConfig()
-	config.Metadata.Retry.Max = 0
-	client, err := NewClient([]string{seedBroker.Addr()}, config)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	metadataResponse = new(MetadataResponse)
-	metadataResponse.AddTopic("unknown", ErrUnknownTopicOrPartition)
-	seedBroker.Returns(metadataResponse)
-
-	partitions, err := client.Partitions("unknown")
-
-	if err != ErrUnknownTopicOrPartition {
-		t.Error("Expected ErrUnknownTopicOrPartition, found", err)
-	}
-	if partitions != nil {
-		t.Errorf("Should return nil as partition list, found %v", partitions)
-	}
-
-	// Should still use the cache of a known topic
-	partitions, err = client.Partitions("my_topic")
-	if err != nil {
-		t.Errorf("Expected no error, found %v", err)
-	}
-
-	metadataResponse = new(MetadataResponse)
-	metadataResponse.AddTopic("unknown", ErrUnknownTopicOrPartition)
-	seedBroker.Returns(metadataResponse)
-
-	// Should not use cache for unknown topic
-	partitions, err = client.Partitions("unknown")
-	if err != ErrUnknownTopicOrPartition {
-		t.Error("Expected ErrUnknownTopicOrPartition, found", err)
-	}
-	if partitions != nil {
-		t.Errorf("Should return nil as partition list, found %v", partitions)
-	}
-
-	seedBroker.Close()
-	safeClose(t, client)
-}
-
-func TestClientSeedBrokers(t *testing.T) {
-	seedBroker := newMockBroker(t, 1)
-
-	metadataResponse := new(MetadataResponse)
-	metadataResponse.AddBroker("localhost:12345", 2)
-	seedBroker.Returns(metadataResponse)
-
-	client, err := NewClient([]string{seedBroker.Addr()}, nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	seedBroker.Close()
-	safeClose(t, client)
-}
-
-func TestClientMetadata(t *testing.T) {
-	seedBroker := newMockBroker(t, 1)
-	leader := newMockBroker(t, 5)
-
-	replicas := []int32{3, 1, 5}
-	isr := []int32{5, 1}
-
-	metadataResponse := new(MetadataResponse)
-	metadataResponse.AddBroker(leader.Addr(), leader.BrokerID())
-	metadataResponse.AddTopicPartition("my_topic", 0, leader.BrokerID(), replicas, isr, ErrNoError)
-	metadataResponse.AddTopicPartition("my_topic", 1, leader.BrokerID(), replicas, isr, ErrLeaderNotAvailable)
-	seedBroker.Returns(metadataResponse)
-
-	config := NewConfig()
-	config.Metadata.Retry.Max = 0
-	client, err := NewClient([]string{seedBroker.Addr()}, config)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	topics, err := client.Topics()
-	if err != nil {
-		t.Error(err)
-	} else if len(topics) != 1 || topics[0] != "my_topic" {
-		t.Error("Client returned incorrect topics:", topics)
-	}
-
-	parts, err := client.Partitions("my_topic")
-	if err != nil {
-		t.Error(err)
-	} else if len(parts) != 2 || parts[0] != 0 || parts[1] != 1 {
-		t.Error("Client returned incorrect partitions for my_topic:", parts)
-	}
-
-	parts, err = client.WritablePartitions("my_topic")
-	if err != nil {
-		t.Error(err)
-	} else if len(parts) != 1 || parts[0] != 0 {
-		t.Error("Client returned incorrect writable partitions for my_topic:", parts)
-	}
-
-	tst, err := client.Leader("my_topic", 0)
-	if err != nil {
-		t.Error(err)
-	} else if tst.ID() != 5 {
-		t.Error("Leader for my_topic had incorrect ID.")
-	}
-
-	replicas, err = client.Replicas("my_topic", 0)
-	if err != nil {
-		t.Error(err)
-	} else if replicas[0] != 1 {
-		t.Error("Incorrect (or unsorted) replica")
-	} else if replicas[1] != 3 {
-		t.Error("Incorrect (or unsorted) replica")
-	} else if replicas[2] != 5 {
-		t.Error("Incorrect (or unsorted) replica")
-	}
-
-	leader.Close()
-	seedBroker.Close()
-	safeClose(t, client)
-}
-
-func TestClientGetOffset(t *testing.T) {
-	seedBroker := newMockBroker(t, 1)
-	leader := newMockBroker(t, 2)
-	leaderAddr := leader.Addr()
-
-	metadata := new(MetadataResponse)
-	metadata.AddTopicPartition("foo", 0, leader.BrokerID(), nil, nil, ErrNoError)
-	metadata.AddBroker(leaderAddr, leader.BrokerID())
-	seedBroker.Returns(metadata)
-
-	client, err := NewClient([]string{seedBroker.Addr()}, nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	offsetResponse := new(OffsetResponse)
-	offsetResponse.AddTopicPartition("foo", 0, 123)
-	leader.Returns(offsetResponse)
-
-	offset, err := client.GetOffset("foo", 0, OffsetNewest)
-	if err != nil {
-		t.Error(err)
-	}
-	if offset != 123 {
-		t.Error("Unexpected offset, got ", offset)
-	}
-
-	leader.Close()
-	seedBroker.Returns(metadata)
-
-	leader = newMockBrokerAddr(t, 2, leaderAddr)
-	offsetResponse = new(OffsetResponse)
-	offsetResponse.AddTopicPartition("foo", 0, 456)
-	leader.Returns(offsetResponse)
-
-	offset, err = client.GetOffset("foo", 0, OffsetNewest)
-	if err != nil {
-		t.Error(err)
-	}
-	if offset != 456 {
-		t.Error("Unexpected offset, got ", offset)
-	}
-
-	seedBroker.Close()
-	leader.Close()
-	safeClose(t, client)
-}
-
-func TestClientReceivingUnknownTopic(t *testing.T) {
-	seedBroker := newMockBroker(t, 1)
-
-	metadataResponse1 := new(MetadataResponse)
-	seedBroker.Returns(metadataResponse1)
-
-	config := NewConfig()
-	config.Metadata.Retry.Max = 1
-	config.Metadata.Retry.Backoff = 0
-	client, err := NewClient([]string{seedBroker.Addr()}, config)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	metadataUnknownTopic := new(MetadataResponse)
-	metadataUnknownTopic.AddTopic("new_topic", ErrUnknownTopicOrPartition)
-	seedBroker.Returns(metadataUnknownTopic)
-	seedBroker.Returns(metadataUnknownTopic)
-
-	if err := client.RefreshMetadata("new_topic"); err != ErrUnknownTopicOrPartition {
-		t.Error("ErrUnknownTopicOrPartition expected, got", err)
-	}
-
-	// If we are asking for the leader of a partition of the non-existing topic.
-	// we will request metadata again.
-	seedBroker.Returns(metadataUnknownTopic)
-	seedBroker.Returns(metadataUnknownTopic)
-
-	if _, err = client.Leader("new_topic", 1); err != ErrUnknownTopicOrPartition {
-		t.Error("Expected ErrUnknownTopicOrPartition, got", err)
-	}
-
-	safeClose(t, client)
-	seedBroker.Close()
-}
-
-func TestClientReceivingPartialMetadata(t *testing.T) {
-	seedBroker := newMockBroker(t, 1)
-	leader := newMockBroker(t, 5)
-
-	metadataResponse1 := new(MetadataResponse)
-	metadataResponse1.AddBroker(leader.Addr(), leader.BrokerID())
-	seedBroker.Returns(metadataResponse1)
-
-	config := NewConfig()
-	config.Metadata.Retry.Max = 0
-	client, err := NewClient([]string{seedBroker.Addr()}, config)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	replicas := []int32{leader.BrokerID(), seedBroker.BrokerID()}
-
-	metadataPartial := new(MetadataResponse)
-	metadataPartial.AddTopic("new_topic", ErrLeaderNotAvailable)
-	metadataPartial.AddTopicPartition("new_topic", 0, leader.BrokerID(), replicas, replicas, ErrNoError)
-	metadataPartial.AddTopicPartition("new_topic", 1, -1, replicas, []int32{}, ErrLeaderNotAvailable)
-	seedBroker.Returns(metadataPartial)
-
-	if err := client.RefreshMetadata("new_topic"); err != nil {
-		t.Error("ErrLeaderNotAvailable should not make RefreshMetadata respond with an error")
-	}
-
-	// Even though the metadata was incomplete, we should be able to get the leader of a partition
-	// for which we did get a useful response, without doing additional requests.
-
-	partition0Leader, err := client.Leader("new_topic", 0)
-	if err != nil {
-		t.Error(err)
-	} else if partition0Leader.Addr() != leader.Addr() {
-		t.Error("Unexpected leader returned", partition0Leader.Addr())
-	}
-
-	// If we are asking for the leader of a partition that didn't have a leader before,
-	// we will do another metadata request.
-
-	seedBroker.Returns(metadataPartial)
-
-	// Still no leader for the partition, so asking for it should return an error.
-	_, err = client.Leader("new_topic", 1)
-	if err != ErrLeaderNotAvailable {
-		t.Error("Expected ErrLeaderNotAvailable, got", err)
-	}
-
-	safeClose(t, client)
-	seedBroker.Close()
-	leader.Close()
-}
-
-func TestClientRefreshBehaviour(t *testing.T) {
-	seedBroker := newMockBroker(t, 1)
-	leader := newMockBroker(t, 5)
-
-	metadataResponse1 := new(MetadataResponse)
-	metadataResponse1.AddBroker(leader.Addr(), leader.BrokerID())
-	seedBroker.Returns(metadataResponse1)
-
-	metadataResponse2 := new(MetadataResponse)
-	metadataResponse2.AddTopicPartition("my_topic", 0xb, leader.BrokerID(), nil, nil, ErrNoError)
-	seedBroker.Returns(metadataResponse2)
-
-	client, err := NewClient([]string{seedBroker.Addr()}, nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	parts, err := client.Partitions("my_topic")
-	if err != nil {
-		t.Error(err)
-	} else if len(parts) != 1 || parts[0] != 0xb {
-		t.Error("Client returned incorrect partitions for my_topic:", parts)
-	}
-
-	tst, err := client.Leader("my_topic", 0xb)
-	if err != nil {
-		t.Error(err)
-	} else if tst.ID() != 5 {
-		t.Error("Leader for my_topic had incorrect ID.")
-	}
-
-	leader.Close()
-	seedBroker.Close()
-	safeClose(t, client)
-}
-
-func TestClientResurrectDeadSeeds(t *testing.T) {
-	initialSeed := newMockBroker(t, 0)
-	emptyMetadata := new(MetadataResponse)
-	initialSeed.Returns(emptyMetadata)
-
-	conf := NewConfig()
-	conf.Metadata.Retry.Backoff = 0
-	conf.Metadata.RefreshFrequency = 0
-	c, err := NewClient([]string{initialSeed.Addr()}, conf)
-	if err != nil {
-		t.Fatal(err)
-	}
-	initialSeed.Close()
-
-	client := c.(*client)
-
-	seed1 := newMockBroker(t, 1)
-	seed2 := newMockBroker(t, 2)
-	seed3 := newMockBroker(t, 3)
-	addr1 := seed1.Addr()
-	addr2 := seed2.Addr()
-	addr3 := seed3.Addr()
-
-	// Overwrite the seed brokers with a fixed ordering to make this test deterministic.
-	safeClose(t, client.seedBrokers[0])
-	client.seedBrokers = []*Broker{NewBroker(addr1), NewBroker(addr2), NewBroker(addr3)}
-	client.deadSeeds = []*Broker{}
-
-	wg := sync.WaitGroup{}
-	wg.Add(1)
-	go func() {
-		if err := client.RefreshMetadata(); err != nil {
-			t.Error(err)
-		}
-		wg.Done()
-	}()
-	seed1.Close()
-	seed2.Close()
-
-	seed1 = newMockBrokerAddr(t, 1, addr1)
-	seed2 = newMockBrokerAddr(t, 2, addr2)
-
-	seed3.Close()
-
-	seed1.Close()
-	seed2.Returns(emptyMetadata)
-
-	wg.Wait()
-
-	if len(client.seedBrokers) != 2 {
-		t.Error("incorrect number of live seeds")
-	}
-	if len(client.deadSeeds) != 1 {
-		t.Error("incorrect number of dead seeds")
-	}
-
-	safeClose(t, c)
-}
-
-func TestClientCoordinatorWithConsumerOffsetsTopic(t *testing.T) {
-	seedBroker := newMockBroker(t, 1)
-	staleCoordinator := newMockBroker(t, 2)
-	freshCoordinator := newMockBroker(t, 3)
-
-	replicas := []int32{staleCoordinator.BrokerID(), freshCoordinator.BrokerID()}
-	metadataResponse1 := new(MetadataResponse)
-	metadataResponse1.AddBroker(staleCoordinator.Addr(), staleCoordinator.BrokerID())
-	metadataResponse1.AddBroker(freshCoordinator.Addr(), freshCoordinator.BrokerID())
-	metadataResponse1.AddTopicPartition("__consumer_offsets", 0, replicas[0], replicas, replicas, ErrNoError)
-	seedBroker.Returns(metadataResponse1)
-
-	client, err := NewClient([]string{seedBroker.Addr()}, nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	coordinatorResponse1 := new(ConsumerMetadataResponse)
-	coordinatorResponse1.Err = ErrConsumerCoordinatorNotAvailable
-	seedBroker.Returns(coordinatorResponse1)
-
-	coordinatorResponse2 := new(ConsumerMetadataResponse)
-	coordinatorResponse2.CoordinatorID = staleCoordinator.BrokerID()
-	coordinatorResponse2.CoordinatorHost = "127.0.0.1"
-	coordinatorResponse2.CoordinatorPort = staleCoordinator.Port()
-
-	seedBroker.Returns(coordinatorResponse2)
-
-	broker, err := client.Coordinator("my_group")
-	if err != nil {
-		t.Error(err)
-	}
-
-	if staleCoordinator.Addr() != broker.Addr() {
-		t.Errorf("Expected coordinator to have address %s, found %s", staleCoordinator.Addr(), broker.Addr())
-	}
-
-	if staleCoordinator.BrokerID() != broker.ID() {
-		t.Errorf("Expected coordinator to have ID %d, found %d", staleCoordinator.BrokerID(), broker.ID())
-	}
-
-	// Grab the cached value
-	broker2, err := client.Coordinator("my_group")
-	if err != nil {
-		t.Error(err)
-	}
-
-	if broker2.Addr() != broker.Addr() {
-		t.Errorf("Expected the coordinator to be the same, but found %s vs. %s", broker2.Addr(), broker.Addr())
-	}
-
-	coordinatorResponse3 := new(ConsumerMetadataResponse)
-	coordinatorResponse3.CoordinatorID = freshCoordinator.BrokerID()
-	coordinatorResponse3.CoordinatorHost = "127.0.0.1"
-	coordinatorResponse3.CoordinatorPort = freshCoordinator.Port()
-
-	seedBroker.Returns(coordinatorResponse3)
-
-	// Refresh the locally cahced value because it's stale
-	if err := client.RefreshCoordinator("my_group"); err != nil {
-		t.Error(err)
-	}
-
-	// Grab the fresh value
-	broker3, err := client.Coordinator("my_group")
-	if err != nil {
-		t.Error(err)
-	}
-
-	if broker3.Addr() != freshCoordinator.Addr() {
-		t.Errorf("Expected the freshCoordinator to be returned, but found %s.", broker3.Addr())
-	}
-
-	freshCoordinator.Close()
-	staleCoordinator.Close()
-	seedBroker.Close()
-	safeClose(t, client)
-}
-
-func TestClientCoordinatorWithoutConsumerOffsetsTopic(t *testing.T) {
-	seedBroker := newMockBroker(t, 1)
-	coordinator := newMockBroker(t, 2)
-
-	metadataResponse1 := new(MetadataResponse)
-	seedBroker.Returns(metadataResponse1)
-
-	config := NewConfig()
-	config.Metadata.Retry.Max = 1
-	config.Metadata.Retry.Backoff = 0
-	client, err := NewClient([]string{seedBroker.Addr()}, config)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	coordinatorResponse1 := new(ConsumerMetadataResponse)
-	coordinatorResponse1.Err = ErrConsumerCoordinatorNotAvailable
-	seedBroker.Returns(coordinatorResponse1)
-
-	metadataResponse2 := new(MetadataResponse)
-	metadataResponse2.AddTopic("__consumer_offsets", ErrUnknownTopicOrPartition)
-	seedBroker.Returns(metadataResponse2)
-
-	replicas := []int32{coordinator.BrokerID()}
-	metadataResponse3 := new(MetadataResponse)
-	metadataResponse3.AddTopicPartition("__consumer_offsets", 0, replicas[0], replicas, replicas, ErrNoError)
-	seedBroker.Returns(metadataResponse3)
-
-	coordinatorResponse2 := new(ConsumerMetadataResponse)
-	coordinatorResponse2.CoordinatorID = coordinator.BrokerID()
-	coordinatorResponse2.CoordinatorHost = "127.0.0.1"
-	coordinatorResponse2.CoordinatorPort = coordinator.Port()
-
-	seedBroker.Returns(coordinatorResponse2)
-
-	broker, err := client.Coordinator("my_group")
-	if err != nil {
-		t.Error(err)
-	}
-
-	if coordinator.Addr() != broker.Addr() {
-		t.Errorf("Expected coordinator to have address %s, found %s", coordinator.Addr(), broker.Addr())
-	}
-
-	if coordinator.BrokerID() != broker.ID() {
-		t.Errorf("Expected coordinator to have ID %d, found %d", coordinator.BrokerID(), broker.ID())
-	}
-
-	coordinator.Close()
-	seedBroker.Close()
-	safeClose(t, client)
-}
-
-func TestClientAutorefreshShutdownRace(t *testing.T) {
-	seedBroker := newMockBroker(t, 1)
-
-	metadataResponse := new(MetadataResponse)
-	seedBroker.Returns(metadataResponse)
-
-	conf := NewConfig()
-	conf.Metadata.RefreshFrequency = 100 * time.Millisecond
-	client, err := NewClient([]string{seedBroker.Addr()}, conf)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// Wait for the background refresh to kick in
-	time.Sleep(110 * time.Millisecond)
-
-	done := make(chan none)
-	go func() {
-		// Close the client
-		if err := client.Close(); err != nil {
-			t.Fatal(err)
-		}
-		close(done)
-	}()
-
-	// Wait for the Close to kick in
-	time.Sleep(10 * time.Millisecond)
-
-	// Then return some metadata to the still-running background thread
-	leader := newMockBroker(t, 2)
-	metadataResponse.AddBroker(leader.Addr(), leader.BrokerID())
-	metadataResponse.AddTopicPartition("foo", 0, leader.BrokerID(), []int32{2}, []int32{2}, ErrNoError)
-	seedBroker.Returns(metadataResponse)
-
-	<-done
-
-	seedBroker.Close()
-
-	// give the update time to happen so we get a panic if it's still running (which it shouldn't)
-	time.Sleep(10 * time.Millisecond)
-}
diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/config.go b/Godeps/_workspace/src/github.com/Shopify/sarama/config.go
deleted file mode 100644
index 0fae111e9..000000000
--- a/Godeps/_workspace/src/github.com/Shopify/sarama/config.go
+++ /dev/null
@@ -1,275 +0,0 @@
-package sarama
-
-import (
-	"crypto/tls"
-	"time"
-)
-
-// Config is used to pass multiple configuration options to Sarama's constructors.
-type Config struct {
-	// Net is the namespace for network-level properties used by the Broker, and shared by the Client/Producer/Consumer.
-	Net struct {
-		MaxOpenRequests int // How many outstanding requests a connection is allowed to have before sending on it blocks (default 5).
-
-		// All three of the below configurations are similar to the `socket.timeout.ms` setting in JVM kafka.
-		DialTimeout  time.Duration // How long to wait for the initial connection to succeed before timing out and returning an error (default 30s).
-		ReadTimeout  time.Duration // How long to wait for a response before timing out and returning an error (default 30s).
-		WriteTimeout time.Duration // How long to wait for a transmit to succeed before timing out and returning an error (default 30s).
-
-		// NOTE: these config values have no compatibility guarantees; they may change when Kafka releases its
-		// official TLS support in version 0.9.
-		TLS struct {
-			Enable bool        // Whether or not to use TLS when connecting to the broker (defaults to false).
-			Config *tls.Config // The TLS configuration to use for secure connections if enabled (defaults to nil).
-		}
-
-		// KeepAlive specifies the keep-alive period for an active network connection.
-		// If zero, keep-alives are disabled. (default is 0: disabled).
-		KeepAlive time.Duration
-	}
-
-	// Metadata is the namespace for metadata management properties used by the Client, and shared by the Producer/Consumer.
-	Metadata struct {
-		Retry struct {
-			Max     int           // The total number of times to retry a metadata request when the cluster is in the middle of a leader election (default 3).
-			Backoff time.Duration // How long to wait for leader election to occur before retrying (default 250ms). Similar to the JVM's `retry.backoff.ms`.
-		}
-		// How frequently to refresh the cluster metadata in the background. Defaults to 10 minutes.
-		// Set to 0 to disable. Similar to `topic.metadata.refresh.interval.ms` in the JVM version.
-		RefreshFrequency time.Duration
-	}
-
-	// Producer is the namespace for configuration related to producing messages, used by the Producer.
-	Producer struct {
-		// The maximum permitted size of a message (defaults to 1000000). Should be set equal to or smaller than the broker's `message.max.bytes`.
-		MaxMessageBytes int
-		// The level of acknowledgement reliability needed from the broker (defaults to WaitForLocal).
-		// Equivalent to the `request.required.acks` setting of the JVM producer.
-		RequiredAcks RequiredAcks
-		// The maximum duration the broker will wait the receipt of the number of RequiredAcks (defaults to 10 seconds).
-		// This is only relevant when RequiredAcks is set to WaitForAll or a number > 1. Only supports millisecond resolution,
-		// nanoseconds will be truncated. Equivalent to the JVM producer's `request.timeout.ms` setting.
-		Timeout time.Duration
-		// The type of compression to use on messages (defaults to no compression). Similar to `compression.codec` setting of the JVM producer.
-		Compression CompressionCodec
-		// Generates partitioners for choosing the partition to send messages to (defaults to hashing the message key).
-		// Similar to the `partitioner.class` setting for the JVM producer.
-		Partitioner PartitionerConstructor
-
-		// Return specifies what channels will be populated. If they are set to true, you must read from
-		// the respective channels to prevent deadlock.
-		Return struct {
-			// If enabled, successfully delivered messages will be returned on the Successes channel (default disabled).
-			Successes bool
-
-			// If enabled, messages that failed to deliver will be returned on the Errors channel, including error (default enabled).
-			Errors bool
-		}
-
-		// The following config options control how often messages are batched up and sent to the broker. By default,
-		// messages are sent as fast as possible, and all messages received while the current batch is in-flight are placed
-		// into the subsequent batch.
-		Flush struct {
-			Bytes     int           // The best-effort number of bytes needed to trigger a flush. Use the global sarama.MaxRequestSize to set a hard upper limit.
-			Messages  int           // The best-effort number of messages needed to trigger a flush. Use `MaxMessages` to set a hard upper limit.
-			Frequency time.Duration // The best-effort frequency of flushes. Equivalent to `queue.buffering.max.ms` setting of JVM producer.
-			// The maximum number of messages the producer will send in a single broker request.
-			// Defaults to 0 for unlimited. Similar to `queue.buffering.max.messages` in the JVM producer.
-			MaxMessages int
-		}
-
-		Retry struct {
-			// The total number of times to retry sending a message (default 3).
-			// Similar to the `message.send.max.retries` setting of the JVM producer.
-			Max int
-			// How long to wait for the cluster to settle between retries (default 100ms).
-			// Similar to the `retry.backoff.ms` setting of the JVM producer.
-			Backoff time.Duration
-		}
-	}
-
-	// Consumer is the namespace for configuration related to consuming messages, used by the Consumer.
-	Consumer struct {
-		Retry struct {
-			// How long to wait after a failing to read from a partition before trying again (default 2s).
-			Backoff time.Duration
-		}
-
-		// Fetch is the namespace for controlling how many bytes are retrieved by any given request.
-		Fetch struct {
-			// The minimum number of message bytes to fetch in a request - the broker will wait until at least this many are available.
-			// The default is 1, as 0 causes the consumer to spin when no messages are available. Equivalent to the JVM's `fetch.min.bytes`.
-			Min int32
-			// The default number of message bytes to fetch from the broker in each request (default 32768). This should be larger than the
-			// majority of your messages, or else the consumer will spend a lot of time negotiating sizes and not actually consuming. Similar
-			// to the JVM's `fetch.message.max.bytes`.
-			Default int32
-			// The maximum number of message bytes to fetch from the broker in a single request. Messages larger than this will return
-			// ErrMessageTooLarge and will not be consumable, so you must be sure this is at least as large as your largest message.
-			// Defaults to 0 (no limit). Similar to the JVM's `fetch.message.max.bytes`. The global `sarama.MaxResponseSize` still applies.
-			Max int32
-		}
-		// The maximum amount of time the broker will wait for Consumer.Fetch.Min bytes to become available before it
-		// returns fewer than that anyways. The default is 250ms, since 0 causes the consumer to spin when no events are available.
-		// 100-500ms is a reasonable range for most cases. Kafka only supports precision up to milliseconds; nanoseconds will be truncated.
-		// Equivalent to the JVM's `fetch.wait.max.ms`.
-		MaxWaitTime time.Duration
-
-		// The maximum amount of time the consumer expects a message takes to process for the user. If writing to the Messages channel
-		// takes longer than this, that partition will stop fetching more messages until it can proceed again. Note that, since the
-		// Messages channel is buffered, the actual grace time is (MaxProcessingTime * ChanneBufferSize). Defaults to 100ms.
-		MaxProcessingTime time.Duration
-
-		// Return specifies what channels will be populated. If they are set to true, you must read from
-		// them to prevent deadlock.
-		Return struct {
-			// If enabled, any errors that occured while consuming are returned on the Errors channel (default disabled).
-			Errors bool
-		}
-	}
-
-	// A user-provided string sent with every request to the brokers for logging, debugging, and auditing purposes.
-	// Defaults to "sarama", but you should probably set it to something specific to your application.
-	ClientID string
-	// The number of events to buffer in internal and external channels. This permits the producer and consumer to
-	// continue processing some messages in the background while user code is working, greatly improving throughput.
-	// Defaults to 256.
-	ChannelBufferSize int
-}
-
-// NewConfig returns a new configuration instance with sane defaults.
-func NewConfig() *Config {
-	c := &Config{}
-
-	c.Net.MaxOpenRequests = 5
-	c.Net.DialTimeout = 30 * time.Second
-	c.Net.ReadTimeout = 30 * time.Second
-	c.Net.WriteTimeout = 30 * time.Second
-
-	c.Metadata.Retry.Max = 3
-	c.Metadata.Retry.Backoff = 250 * time.Millisecond
-	c.Metadata.RefreshFrequency = 10 * time.Minute
-
-	c.Producer.MaxMessageBytes = 1000000
-	c.Producer.RequiredAcks = WaitForLocal
-	c.Producer.Timeout = 10 * time.Second
-	c.Producer.Partitioner = NewHashPartitioner
-	c.Producer.Retry.Max = 3
-	c.Producer.Retry.Backoff = 100 * time.Millisecond
-	c.Producer.Return.Errors = true
-
-	c.Consumer.Fetch.Min = 1
-	c.Consumer.Fetch.Default = 32768
-	c.Consumer.Retry.Backoff = 2 * time.Second
-	c.Consumer.MaxWaitTime = 250 * time.Millisecond
-	c.Consumer.MaxProcessingTime = 100 * time.Millisecond
-	c.Consumer.Return.Errors = false
-
-	c.ChannelBufferSize = 256
-
-	return c
-}
-
-// Validate checks a Config instance. It will return a
-// ConfigurationError if the specified values don't make sense.
-func (c *Config) Validate() error {
-	// some configuration values should be warned on but not fail completely, do those first
-	if c.Net.TLS.Enable == false && c.Net.TLS.Config != nil {
-		Logger.Println("Net.TLS is disabled but a non-nil configuration was provided.")
-	}
-	if c.Producer.RequiredAcks > 1 {
-		Logger.Println("Producer.RequiredAcks > 1 is deprecated and will raise an exception with kafka >= 0.8.2.0.")
-	}
-	if c.Producer.MaxMessageBytes >= int(MaxRequestSize) {
-		Logger.Println("Producer.MaxMessageBytes is larger than MaxRequestSize; it will be ignored.")
-	}
-	if c.Producer.Flush.Bytes >= int(MaxRequestSize) {
-		Logger.Println("Producer.Flush.Bytes is larger than MaxRequestSize; it will be ignored.")
-	}
-	if c.Producer.Timeout%time.Millisecond != 0 {
-		Logger.Println("Producer.Timeout only supports millisecond resolution; nanoseconds will be truncated.")
-	}
-	if c.Consumer.MaxWaitTime < 100*time.Millisecond {
-		Logger.Println("Consumer.MaxWaitTime is very low, which can cause high CPU and network usage. See documentation for details.")
-	}
-	if c.Consumer.MaxWaitTime%time.Millisecond != 0 {
-		Logger.Println("Consumer.MaxWaitTime only supports millisecond precision; nanoseconds will be truncated.")
-	}
-	if c.ClientID == "sarama" {
-		Logger.Println("ClientID is the default of 'sarama', you should consider setting it to something application-specific.")
-	}
-
-	// validate Net values
-	switch {
-	case c.Net.MaxOpenRequests <= 0:
-		return ConfigurationError("Net.MaxOpenRequests must be > 0")
-	case c.Net.DialTimeout <= 0:
-		return ConfigurationError("Net.DialTimeout must be > 0")
-	case c.Net.ReadTimeout <= 0:
-		return ConfigurationError("Net.ReadTimeout must be > 0")
-	case c.Net.WriteTimeout <= 0:
-		return ConfigurationError("Net.WriteTimeout must be > 0")
-	case c.Net.KeepAlive < 0:
-		return ConfigurationError("Net.KeepAlive must be >= 0")
-	}
-
-	// validate the Metadata values
-	switch {
-	case c.Metadata.Retry.Max < 0:
-		return ConfigurationError("Metadata.Retry.Max must be >= 0")
-	case c.Metadata.Retry.Backoff < 0:
-		return ConfigurationError("Metadata.Retry.Backoff must be >= 0")
-	case c.Metadata.RefreshFrequency < 0:
-		return ConfigurationError("Metadata.RefreshFrequency must be >= 0")
-	}
-
-	// validate the Producer values
-	switch {
-	case c.Producer.MaxMessageBytes <= 0:
-		return ConfigurationError("Producer.MaxMessageBytes must be > 0")
-	case c.Producer.RequiredAcks < -1:
-		return ConfigurationError("Producer.RequiredAcks must be >= -1")
-	case c.Producer.Timeout <= 0:
-		return ConfigurationError("Producer.Timeout must be > 0")
-	case c.Producer.Partitioner == nil:
-		return ConfigurationError("Producer.Partitioner must not be nil")
-	case c.Producer.Flush.Bytes < 0:
-		return ConfigurationError("Producer.Flush.Bytes must be >= 0")
-	case c.Producer.Flush.Messages < 0:
-		return ConfigurationError("Producer.Flush.Messages must be >= 0")
-	case c.Producer.Flush.Frequency < 0:
-		return ConfigurationError("Producer.Flush.Frequency must be >= 0")
-	case c.Producer.Flush.MaxMessages < 0:
-		return ConfigurationError("Producer.Flush.MaxMessages must be >= 0")
-	case c.Producer.Flush.MaxMessages > 0 && c.Producer.Flush.MaxMessages < c.Producer.Flush.Messages:
-		return ConfigurationError("Producer.Flush.MaxMessages must be >= Producer.Flush.Messages when set")
-	case c.Producer.Retry.Max < 0:
-		return ConfigurationError("Producer.Retry.Max must be >= 0")
-	case c.Producer.Retry.Backoff < 0:
-		return ConfigurationError("Producer.Retry.Backoff must be >= 0")
-	}
-
-	// validate the Consumer values
-	switch {
-	case c.Consumer.Fetch.Min <= 0:
-		return ConfigurationError("Consumer.Fetch.Min must be > 0")
-	case c.Consumer.Fetch.Default <= 0:
-		return ConfigurationError("Consumer.Fetch.Default must be > 0")
-	case c.Consumer.Fetch.Max < 0:
-		return ConfigurationError("Consumer.Fetch.Max must be >= 0")
-	case c.Consumer.MaxWaitTime < 1*time.Millisecond:
-		return ConfigurationError("Consumer.MaxWaitTime must be >= 1ms")
-	case c.Consumer.MaxProcessingTime <= 0:
-		return ConfigurationError("Consumer.MaxProcessingTime must be > 0")
-	case c.Consumer.Retry.Backoff < 0:
-		return ConfigurationError("Consumer.Retry.Backoff must be >= 0")
-	}
-
-	// validate misc shared values
-	switch {
-	case c.ChannelBufferSize < 0:
-		return ConfigurationError("ChannelBufferSize must be >= 0")
-	}
-
-	return nil
-}
diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/config_test.go b/Godeps/_workspace/src/github.com/Shopify/sarama/config_test.go
deleted file mode 100644
index 255281a65..000000000
--- a/Godeps/_workspace/src/github.com/Shopify/sarama/config_test.go
+++ /dev/null
@@ -1,10 +0,0 @@
-package sarama
-
-import "testing"
-
-func TestDefaultConfigValidates(t *testing.T) {
-	config := NewConfig()
-	if err := config.Validate(); err != nil {
-		t.Error(err)
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/consumer.go b/Godeps/_workspace/src/github.com/Shopify/sarama/consumer.go
deleted file mode 100644
index 43ce3b21b..000000000
--- a/Godeps/_workspace/src/github.com/Shopify/sarama/consumer.go
+++ /dev/null
@@ -1,676 +0,0 @@
-package sarama
-
-import (
-	"errors"
-	"fmt"
-	"sync"
-	"sync/atomic"
-	"time"
-)
-
-// ConsumerMessage encapsulates a Kafka message returned by the consumer.
-type ConsumerMessage struct {
-	Key, Value []byte
-	Topic      string
-	Partition  int32
-	Offset     int64
-}
-
-// ConsumerError is what is provided to the user when an error occurs.
-// It wraps an error and includes the topic and partition.
-type ConsumerError struct {
-	Topic     string
-	Partition int32
-	Err       error
-}
-
-func (ce ConsumerError) Error() string {
-	return fmt.Sprintf("kafka: error while consuming %s/%d: %s", ce.Topic, ce.Partition, ce.Err)
-}
-
-// ConsumerErrors is a type that wraps a batch of errors and implements the Error interface.
-// It can be returned from the PartitionConsumer's Close methods to avoid the need to manually drain errors
-// when stopping.
-type ConsumerErrors []*ConsumerError
-
-func (ce ConsumerErrors) Error() string {
-	return fmt.Sprintf("kafka: %d errors while consuming", len(ce))
-}
-
-// Consumer manages PartitionConsumers which process Kafka messages from brokers. You MUST call Close()
-// on a consumer to avoid leaks, it will not be garbage-collected automatically when it passes out of
-// scope.
-//
-// Sarama's Consumer type does not currently support automatic consumer group rebalancing and offset tracking,
-// however the https://github.com/wvanbergen/kafka library builds on Sarama to add this support. We plan
-// to properly integrate this functionality at a later date.
-type Consumer interface {
-
-	// Topics returns the set of available topics as retrieved from the cluster metadata.
-	// This method is the same as Client.Topics(), and is provided for convenience.
-	Topics() ([]string, error)
-
-	// Partitions returns the sorted list of all partition IDs for the given topic.
-	// This method is the same as Client.Pertitions(), and is provided for convenience.
-	Partitions(topic string) ([]int32, error)
-
-	// ConsumePartition creates a PartitionConsumer on the given topic/partition with the given offset. It will
-	// return an error if this Consumer is already consuming on the given topic/partition. Offset can be a
-	// literal offset, or OffsetNewest or OffsetOldest
-	ConsumePartition(topic string, partition int32, offset int64) (PartitionConsumer, error)
-
-	// Close shuts down the consumer. It must be called after all child PartitionConsumers have already been closed.
-	Close() error
-}
-
-type consumer struct {
-	client    Client
-	conf      *Config
-	ownClient bool
-
-	lock            sync.Mutex
-	children        map[string]map[int32]*partitionConsumer
-	brokerConsumers map[*Broker]*brokerConsumer
-}
-
-// NewConsumer creates a new consumer using the given broker addresses and configuration.
-func NewConsumer(addrs []string, config *Config) (Consumer, error) {
-	client, err := NewClient(addrs, config)
-	if err != nil {
-		return nil, err
-	}
-
-	c, err := NewConsumerFromClient(client)
-	if err != nil {
-		return nil, err
-	}
-	c.(*consumer).ownClient = true
-	return c, nil
-}
-
-// NewConsumerFromClient creates a new consumer using the given client. It is still
-// necessary to call Close() on the underlying client when shutting down this consumer.
-func NewConsumerFromClient(client Client) (Consumer, error) {
-	// Check that we are not dealing with a closed Client before processing any other arguments
-	if client.Closed() {
-		return nil, ErrClosedClient
-	}
-
-	c := &consumer{
-		client:          client,
-		conf:            client.Config(),
-		children:        make(map[string]map[int32]*partitionConsumer),
-		brokerConsumers: make(map[*Broker]*brokerConsumer),
-	}
-
-	return c, nil
-}
-
-func (c *consumer) Close() error {
-	if c.ownClient {
-		return c.client.Close()
-	}
-	return nil
-}
-
-func (c *consumer) Topics() ([]string, error) {
-	return c.client.Topics()
-}
-
-func (c *consumer) Partitions(topic string) ([]int32, error) {
-	return c.client.Partitions(topic)
-}
-
-func (c *consumer) ConsumePartition(topic string, partition int32, offset int64) (PartitionConsumer, error) {
-	child := &partitionConsumer{
-		consumer:  c,
-		conf:      c.conf,
-		topic:     topic,
-		partition: partition,
-		messages:  make(chan *ConsumerMessage, c.conf.ChannelBufferSize),
-		errors:    make(chan *ConsumerError, c.conf.ChannelBufferSize),
-		feeder:    make(chan *FetchResponse, 1),
-		trigger:   make(chan none, 1),
-		dying:     make(chan none),
-		fetchSize: c.conf.Consumer.Fetch.Default,
-	}
-
-	if err := child.chooseStartingOffset(offset); err != nil {
-		return nil, err
-	}
-
-	var leader *Broker
-	var err error
-	if leader, err = c.client.Leader(child.topic, child.partition); err != nil {
-		return nil, err
-	}
-
-	if err := c.addChild(child); err != nil {
-		return nil, err
-	}
-
-	go withRecover(child.dispatcher)
-	go withRecover(child.responseFeeder)
-
-	child.broker = c.refBrokerConsumer(leader)
-	child.broker.input <- child
-
-	return child, nil
-}
-
-func (c *consumer) addChild(child *partitionConsumer) error {
-	c.lock.Lock()
-	defer c.lock.Unlock()
-
-	topicChildren := c.children[child.topic]
-	if topicChildren == nil {
-		topicChildren = make(map[int32]*partitionConsumer)
-		c.children[child.topic] = topicChildren
-	}
-
-	if topicChildren[child.partition] != nil {
-		return ConfigurationError("That topic/partition is already being consumed")
-	}
-
-	topicChildren[child.partition] = child
-	return nil
-}
-
-func (c *consumer) removeChild(child *partitionConsumer) {
-	c.lock.Lock()
-	defer c.lock.Unlock()
-
-	delete(c.children[child.topic], child.partition)
-}
-
-func (c *consumer) refBrokerConsumer(broker *Broker) *brokerConsumer {
-	c.lock.Lock()
-	defer c.lock.Unlock()
-
-	bc := c.brokerConsumers[broker]
-	if bc == nil {
-		bc = c.newBrokerConsumer(broker)
-		c.brokerConsumers[broker] = bc
-	}
-
-	bc.refs++
-
-	return bc
-}
-
-func (c *consumer) unrefBrokerConsumer(brokerWorker *brokerConsumer) {
-	c.lock.Lock()
-	defer c.lock.Unlock()
-
-	brokerWorker.refs--
-
-	if brokerWorker.refs == 0 {
-		close(brokerWorker.input)
-		if c.brokerConsumers[brokerWorker.broker] == brokerWorker {
-			delete(c.brokerConsumers, brokerWorker.broker)
-		}
-	}
-}
-
-func (c *consumer) abandonBrokerConsumer(brokerWorker *brokerConsumer) {
-	c.lock.Lock()
-	defer c.lock.Unlock()
-
-	delete(c.brokerConsumers, brokerWorker.broker)
-}
-
-// PartitionConsumer
-
-// PartitionConsumer processes Kafka messages from a given topic and partition. You MUST call Close()
-// or AsyncClose() on a PartitionConsumer to avoid leaks, it will not be garbage-collected automatically
-// when it passes out of scope.
-//
-// The simplest way of using a PartitionConsumer is to loop over its Messages channel using a for/range
-// loop. The PartitionConsumer will only stop itself in one case: when the offset being consumed is reported
-// as out of range by the brokers. In this case you should decide what you want to do (try a different offset,
-// notify a human, etc) and handle it appropriately. For all other error cases, it will just keep retrying.
-// By default, it logs these errors to sarama.Logger; if you want to be notified directly of all errors, set
-// your config's Consumer.Return.Errors to true and read from the Errors channel, using a select statement
-// or a separate goroutine. Check out the Consumer examples to see implementations of these different approaches.
-type PartitionConsumer interface {
-
-	// AsyncClose initiates a shutdown of the PartitionConsumer. This method will return immediately,
-	// after which you should wait until the 'messages' and 'errors' channel are drained.
-	// It is required to call this function, or Close before a consumer object passes out of scope,
-	// as it will otherwise leak memory.  You must call this before calling Close on the underlying
-	// client.
-	AsyncClose()
-
-	// Close stops the PartitionConsumer from fetching messages. It is required to call this function
-	// (or AsyncClose) before a consumer object passes out of scope, as it will otherwise leak memory. You must
-	// call this before calling Close on the underlying client.
-	Close() error
-
-	// Messages returns the read channel for the messages that are returned by the broker.
-	Messages() <-chan *ConsumerMessage
-
-	// Errors returns a read channel of errors that occured during consuming, if enabled. By default,
-	// errors are logged and not returned over this channel. If you want to implement any custom errpr
-	// handling, set your config's Consumer.Return.Errors setting to true, and read from this channel.
-	Errors() <-chan *ConsumerError
-
-	// HighWaterMarkOffset returns the high water mark offset of the partition, i.e. the offset that will
-	// be used for the next message that will be produced. You can use this to determine how far behind
-	// the processing is.
-	HighWaterMarkOffset() int64
-}
-
-type partitionConsumer struct {
-	consumer  *consumer
-	conf      *Config
-	topic     string
-	partition int32
-
-	broker   *brokerConsumer
-	messages chan *ConsumerMessage
-	errors   chan *ConsumerError
-	feeder   chan *FetchResponse
-
-	trigger, dying chan none
-	responseResult error
-
-	fetchSize           int32
-	offset              int64
-	highWaterMarkOffset int64
-}
-
-var errTimedOut = errors.New("timed out feeding messages to the user") // not user-facing
-
-func (child *partitionConsumer) sendError(err error) {
-	cErr := &ConsumerError{
-		Topic:     child.topic,
-		Partition: child.partition,
-		Err:       err,
-	}
-
-	if child.conf.Consumer.Return.Errors {
-		child.errors <- cErr
-	} else {
-		Logger.Println(cErr)
-	}
-}
-
-func (child *partitionConsumer) dispatcher() {
-	for _ = range child.trigger {
-		select {
-		case <-child.dying:
-			close(child.trigger)
-		case <-time.After(child.conf.Consumer.Retry.Backoff):
-			if child.broker != nil {
-				child.consumer.unrefBrokerConsumer(child.broker)
-				child.broker = nil
-			}
-
-			Logger.Printf("consumer/%s/%d finding new broker\n", child.topic, child.partition)
-			if err := child.dispatch(); err != nil {
-				child.sendError(err)
-				child.trigger <- none{}
-			}
-		}
-	}
-
-	if child.broker != nil {
-		child.consumer.unrefBrokerConsumer(child.broker)
-	}
-	child.consumer.removeChild(child)
-	close(child.feeder)
-}
-
-func (child *partitionConsumer) dispatch() error {
-	if err := child.consumer.client.RefreshMetadata(child.topic); err != nil {
-		return err
-	}
-
-	var leader *Broker
-	var err error
-	if leader, err = child.consumer.client.Leader(child.topic, child.partition); err != nil {
-		return err
-	}
-
-	child.broker = child.consumer.refBrokerConsumer(leader)
-
-	child.broker.input <- child
-
-	return nil
-}
-
-func (child *partitionConsumer) chooseStartingOffset(offset int64) error {
-	newestOffset, err := child.consumer.client.GetOffset(child.topic, child.partition, OffsetNewest)
-	if err != nil {
-		return err
-	}
-	oldestOffset, err := child.consumer.client.GetOffset(child.topic, child.partition, OffsetOldest)
-	if err != nil {
-		return err
-	}
-
-	switch {
-	case offset == OffsetNewest:
-		child.offset = newestOffset
-	case offset == OffsetOldest:
-		child.offset = oldestOffset
-	case offset >= oldestOffset && offset <= newestOffset:
-		child.offset = offset
-	default:
-		return ErrOffsetOutOfRange
-	}
-
-	return nil
-}
-
-func (child *partitionConsumer) Messages() <-chan *ConsumerMessage {
-	return child.messages
-}
-
-func (child *partitionConsumer) Errors() <-chan *ConsumerError {
-	return child.errors
-}
-
-func (child *partitionConsumer) AsyncClose() {
-	// this triggers whatever broker owns this child to abandon it and close its trigger channel, which causes
-	// the dispatcher to exit its loop, which removes it from the consumer then closes its 'messages' and
-	// 'errors' channel (alternatively, if the child is already at the dispatcher for some reason, that will
-	// also just close itself)
-	close(child.dying)
-}
-
-func (child *partitionConsumer) Close() error {
-	child.AsyncClose()
-
-	go withRecover(func() {
-		for _ = range child.messages {
-			// drain
-		}
-	})
-
-	var errors ConsumerErrors
-	for err := range child.errors {
-		errors = append(errors, err)
-	}
-
-	if len(errors) > 0 {
-		return errors
-	}
-	return nil
-}
-
-func (child *partitionConsumer) HighWaterMarkOffset() int64 {
-	return atomic.LoadInt64(&child.highWaterMarkOffset)
-}
-
-func (child *partitionConsumer) responseFeeder() {
-	var msgs []*ConsumerMessage
-
-feederLoop:
-	for response := range child.feeder {
-		msgs, child.responseResult = child.parseResponse(response)
-
-		for i, msg := range msgs {
-			select {
-			case child.messages <- msg:
-			case <-time.After(child.conf.Consumer.MaxProcessingTime):
-				child.responseResult = errTimedOut
-				child.broker.acks.Done()
-				for _, msg = range msgs[i:] {
-					child.messages <- msg
-				}
-				child.broker.input <- child
-				continue feederLoop
-			}
-		}
-
-		child.broker.acks.Done()
-	}
-
-	close(child.messages)
-	close(child.errors)
-}
-
-func (child *partitionConsumer) parseResponse(response *FetchResponse) ([]*ConsumerMessage, error) {
-	block := response.GetBlock(child.topic, child.partition)
-	if block == nil {
-		return nil, ErrIncompleteResponse
-	}
-
-	if block.Err != ErrNoError {
-		return nil, block.Err
-	}
-
-	if len(block.MsgSet.Messages) == 0 {
-		// We got no messages. If we got a trailing one then we need to ask for more data.
-		// Otherwise we just poll again and wait for one to be produced...
-		if block.MsgSet.PartialTrailingMessage {
-			if child.conf.Consumer.Fetch.Max > 0 && child.fetchSize == child.conf.Consumer.Fetch.Max {
-				// we can't ask for more data, we've hit the configured limit
-				child.sendError(ErrMessageTooLarge)
-				child.offset++ // skip this one so we can keep processing future messages
-			} else {
-				child.fetchSize *= 2
-				if child.conf.Consumer.Fetch.Max > 0 && child.fetchSize > child.conf.Consumer.Fetch.Max {
-					child.fetchSize = child.conf.Consumer.Fetch.Max
-				}
-			}
-		}
-
-		return nil, nil
-	}
-
-	// we got messages, reset our fetch size in case it was increased for a previous request
-	child.fetchSize = child.conf.Consumer.Fetch.Default
-	atomic.StoreInt64(&child.highWaterMarkOffset, block.HighWaterMarkOffset)
-
-	incomplete := false
-	prelude := true
-	var messages []*ConsumerMessage
-	for _, msgBlock := range block.MsgSet.Messages {
-
-		for _, msg := range msgBlock.Messages() {
-			if prelude && msg.Offset < child.offset {
-				continue
-			}
-			prelude = false
-
-			if msg.Offset >= child.offset {
-				messages = append(messages, &ConsumerMessage{
-					Topic:     child.topic,
-					Partition: child.partition,
-					Key:       msg.Msg.Key,
-					Value:     msg.Msg.Value,
-					Offset:    msg.Offset,
-				})
-				child.offset = msg.Offset + 1
-			} else {
-				incomplete = true
-			}
-		}
-
-	}
-
-	if incomplete || len(messages) == 0 {
-		return nil, ErrIncompleteResponse
-	}
-	return messages, nil
-}
-
-// brokerConsumer
-
-type brokerConsumer struct {
-	consumer         *consumer
-	broker           *Broker
-	input            chan *partitionConsumer
-	newSubscriptions chan []*partitionConsumer
-	wait             chan none
-	subscriptions    map[*partitionConsumer]none
-	acks             sync.WaitGroup
-	refs             int
-}
-
-func (c *consumer) newBrokerConsumer(broker *Broker) *brokerConsumer {
-	bc := &brokerConsumer{
-		consumer:         c,
-		broker:           broker,
-		input:            make(chan *partitionConsumer),
-		newSubscriptions: make(chan []*partitionConsumer),
-		wait:             make(chan none),
-		subscriptions:    make(map[*partitionConsumer]none),
-		refs:             0,
-	}
-
-	go withRecover(bc.subscriptionManager)
-	go withRecover(bc.subscriptionConsumer)
-
-	return bc
-}
-
-func (bc *brokerConsumer) subscriptionManager() {
-	var buffer []*partitionConsumer
-
-	// The subscriptionManager constantly accepts new subscriptions on `input` (even when the main subscriptionConsumer
-	//  goroutine is in the middle of a network request) and batches it up. The main worker goroutine picks
-	// up a batch of new subscriptions between every network request by reading from `newSubscriptions`, so we give
-	// it nil if no new subscriptions are available. We also write to `wait` only when new subscriptions is available,
-	// so the main goroutine can block waiting for work if it has none.
-	for {
-		if len(buffer) > 0 {
-			select {
-			case event, ok := <-bc.input:
-				if !ok {
-					goto done
-				}
-				buffer = append(buffer, event)
-			case bc.newSubscriptions <- buffer:
-				buffer = nil
-			case bc.wait <- none{}:
-			}
-		} else {
-			select {
-			case event, ok := <-bc.input:
-				if !ok {
-					goto done
-				}
-				buffer = append(buffer, event)
-			case bc.newSubscriptions <- nil:
-			}
-		}
-	}
-
-done:
-	close(bc.wait)
-	if len(buffer) > 0 {
-		bc.newSubscriptions <- buffer
-	}
-	close(bc.newSubscriptions)
-}
-
-func (bc *brokerConsumer) subscriptionConsumer() {
-	<-bc.wait // wait for our first piece of work
-
-	// the subscriptionConsumer ensures we will get nil right away if no new subscriptions is available
-	for newSubscriptions := range bc.newSubscriptions {
-		for _, child := range newSubscriptions {
-			bc.subscriptions[child] = none{}
-			Logger.Printf("consumer/broker/%d added subscription to %s/%d\n", bc.broker.ID(), child.topic, child.partition)
-		}
-
-		if len(bc.subscriptions) == 0 {
-			// We're about to be shut down or we're about to receive more subscriptions.
-			// Either way, the signal just hasn't propagated to our goroutine yet.
-			<-bc.wait
-			continue
-		}
-
-		response, err := bc.fetchNewMessages()
-
-		if err != nil {
-			Logger.Printf("consumer/broker/%d disconnecting due to error processing FetchRequest: %s\n", bc.broker.ID(), err)
-			bc.abort(err)
-			return
-		}
-
-		bc.acks.Add(len(bc.subscriptions))
-		for child := range bc.subscriptions {
-			child.feeder <- response
-		}
-		bc.acks.Wait()
-		bc.handleResponses()
-	}
-}
-
-func (bc *brokerConsumer) handleResponses() {
-	// handles the response codes left for us by our subscriptions, and abandons ones that have been closed
-	for child := range bc.subscriptions {
-		select {
-		case <-child.dying:
-			Logger.Printf("consumer/broker/%d closed dead subscription to %s/%d\n", bc.broker.ID(), child.topic, child.partition)
-			close(child.trigger)
-			delete(bc.subscriptions, child)
-		default:
-			result := child.responseResult
-			child.responseResult = nil
-
-			switch result {
-			case nil:
-				break
-			case errTimedOut:
-				Logger.Printf("consumer/broker/%d abandoned subscription to %s/%d because consuming was taking too long\n",
-					bc.broker.ID(), child.topic, child.partition)
-				delete(bc.subscriptions, child)
-			case ErrOffsetOutOfRange:
-				// there's no point in retrying this it will just fail the same way again
-				// shut it down and force the user to choose what to do
-				child.sendError(result)
-				Logger.Printf("consumer/%s/%d shutting down because %s\n", child.topic, child.partition, result)
-				close(child.trigger)
-				delete(bc.subscriptions, child)
-			case ErrUnknownTopicOrPartition, ErrNotLeaderForPartition, ErrLeaderNotAvailable:
-				// not an error, but does need redispatching
-				Logger.Printf("consumer/broker/%d abandoned subscription to %s/%d because %s\n",
-					bc.broker.ID(), child.topic, child.partition, result)
-				child.trigger <- none{}
-				delete(bc.subscriptions, child)
-			default:
-				// dunno, tell the user and try redispatching
-				child.sendError(result)
-				Logger.Printf("consumer/broker/%d abandoned subscription to %s/%d because %s\n",
-					bc.broker.ID(), child.topic, child.partition, result)
-				child.trigger <- none{}
-				delete(bc.subscriptions, child)
-			}
-		}
-	}
-}
-
-func (bc *brokerConsumer) abort(err error) {
-	bc.consumer.abandonBrokerConsumer(bc)
-	_ = bc.broker.Close() // we don't care about the error this might return, we already have one
-
-	for child := range bc.subscriptions {
-		child.sendError(err)
-		child.trigger <- none{}
-	}
-
-	for newSubscription := range bc.newSubscriptions {
-		for _, child := range newSubscription {
-			child.sendError(err)
-			child.trigger <- none{}
-		}
-	}
-}
-
-func (bc *brokerConsumer) fetchNewMessages() (*FetchResponse, error) {
-	request := &FetchRequest{
-		MinBytes:    bc.consumer.conf.Consumer.Fetch.Min,
-		MaxWaitTime: int32(bc.consumer.conf.Consumer.MaxWaitTime / time.Millisecond),
-	}
-
-	for child := range bc.subscriptions {
-		request.AddBlock(child.topic, child.partition, child.offset, child.fetchSize)
-	}
-
-	return bc.broker.Fetch(request)
-}
diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/consumer_metadata_request.go b/Godeps/_workspace/src/github.com/Shopify/sarama/consumer_metadata_request.go
deleted file mode 100644
index 9b8fcd74e..000000000
--- a/Godeps/_workspace/src/github.com/Shopify/sarama/consumer_metadata_request.go
+++ /dev/null
@@ -1,22 +0,0 @@
-package sarama
-
-type ConsumerMetadataRequest struct {
-	ConsumerGroup string
-}
-
-func (r *ConsumerMetadataRequest) encode(pe packetEncoder) error {
-	return pe.putString(r.ConsumerGroup)
-}
-
-func (r *ConsumerMetadataRequest) decode(pd packetDecoder) (err error) {
-	r.ConsumerGroup, err = pd.getString()
-	return err
-}
-
-func (r *ConsumerMetadataRequest) key() int16 {
-	return 10
-}
-
-func (r *ConsumerMetadataRequest) version() int16 {
-	return 0
-}
diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/consumer_metadata_request_test.go b/Godeps/_workspace/src/github.com/Shopify/sarama/consumer_metadata_request_test.go
deleted file mode 100644
index 4509631a0..000000000
--- a/Godeps/_workspace/src/github.com/Shopify/sarama/consumer_metadata_request_test.go
+++ /dev/null
@@ -1,19 +0,0 @@
-package sarama
-
-import "testing"
-
-var (
-	consumerMetadataRequestEmpty = []byte{
-		0x00, 0x00}
-
-	consumerMetadataRequestString = []byte{
-		0x00, 0x06, 'f', 'o', 'o', 'b', 'a', 'r'}
-)
-
-func TestConsumerMetadataRequest(t *testing.T) {
-	request := new(ConsumerMetadataRequest)
-	testRequest(t, "empty string", request, consumerMetadataRequestEmpty)
-
-	request.ConsumerGroup = "foobar"
-	testRequest(t, "with string", request, consumerMetadataRequestString)
-}
diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/consumer_metadata_response.go b/Godeps/_workspace/src/github.com/Shopify/sarama/consumer_metadata_response.go
deleted file mode 100644
index d6b5614b4..000000000
--- a/Godeps/_workspace/src/github.com/Shopify/sarama/consumer_metadata_response.go
+++ /dev/null
@@ -1,73 +0,0 @@
-package sarama
-
-import (
-	"net"
-	"strconv"
-)
-
-type ConsumerMetadataResponse struct {
-	Err             KError
-	Coordinator     *Broker
-	CoordinatorID   int32  // deprecated: use Coordinator.ID()
-	CoordinatorHost string // deprecated: use Coordinator.Addr()
-	CoordinatorPort int32  // deprecated: use Coordinator.Addr()
-}
-
-func (r *ConsumerMetadataResponse) decode(pd packetDecoder) (err error) {
-	tmp, err := pd.getInt16()
-	if err != nil {
-		return err
-	}
-	r.Err = KError(tmp)
-
-	coordinator := new(Broker)
-	if err := coordinator.decode(pd); err != nil {
-		return err
-	}
-	if coordinator.addr == ":0" {
-		return nil
-	}
-	r.Coordinator = coordinator
-
-	// this can all go away in 2.0, but we have to fill in deprecated fields to maintain
-	// backwards compatibility
-	host, portstr, err := net.SplitHostPort(r.Coordinator.Addr())
-	if err != nil {
-		return err
-	}
-	port, err := strconv.ParseInt(portstr, 10, 32)
-	if err != nil {
-		return err
-	}
-	r.CoordinatorID = r.Coordinator.ID()
-	r.CoordinatorHost = host
-	r.CoordinatorPort = int32(port)
-
-	return nil
-}
-
-func (r *ConsumerMetadataResponse) encode(pe packetEncoder) error {
-	pe.putInt16(int16(r.Err))
-	if r.Coordinator != nil {
-		host, portstr, err := net.SplitHostPort(r.Coordinator.Addr())
-		if err != nil {
-			return err
-		}
-		port, err := strconv.ParseInt(portstr, 10, 32)
-		if err != nil {
-			return err
-		}
-		pe.putInt32(r.Coordinator.ID())
-		if err := pe.putString(host); err != nil {
-			return err
-		}
-		pe.putInt32(int32(port))
-		return nil
-	}
-	pe.putInt32(r.CoordinatorID)
-	if err := pe.putString(r.CoordinatorHost); err != nil {
-		return err
-	}
-	pe.putInt32(r.CoordinatorPort)
-	return nil
-}
diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/consumer_metadata_response_test.go b/Godeps/_workspace/src/github.com/Shopify/sarama/consumer_metadata_response_test.go
deleted file mode 100644
index b748784d7..000000000
--- a/Godeps/_workspace/src/github.com/Shopify/sarama/consumer_metadata_response_test.go
+++ /dev/null
@@ -1,35 +0,0 @@
-package sarama
-
-import "testing"
-
-var (
-	consumerMetadataResponseError = []byte{
-		0x00, 0x0E,
-		0x00, 0x00, 0x00, 0x00,
-		0x00, 0x00,
-		0x00, 0x00, 0x00, 0x00}
-
-	consumerMetadataResponseSuccess = []byte{
-		0x00, 0x00,
-		0x00, 0x00, 0x00, 0xAB,
-		0x00, 0x03, 'f', 'o', 'o',
-		0x00, 0x00, 0xCC, 0xDD}
-)
-
-func TestConsumerMetadataResponseError(t *testing.T) {
-	response := ConsumerMetadataResponse{Err: ErrOffsetsLoadInProgress}
-	testResponse(t, "error", &response, consumerMetadataResponseError)
-}
-
-func TestConsumerMetadataResponseSuccess(t *testing.T) {
-	broker := NewBroker("foo:52445")
-	broker.id = 0xAB
-	response := ConsumerMetadataResponse{
-		Coordinator:     broker,
-		CoordinatorID:   0xAB,
-		CoordinatorHost: "foo",
-		CoordinatorPort: 0xCCDD,
-		Err:             ErrNoError,
-	}
-	testResponse(t, "success", &response, consumerMetadataResponseSuccess)
-}
diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/consumer_test.go b/Godeps/_workspace/src/github.com/Shopify/sarama/consumer_test.go
deleted file mode 100644
index df3af07ff..000000000
--- a/Godeps/_workspace/src/github.com/Shopify/sarama/consumer_test.go
+++ /dev/null
@@ -1,844 +0,0 @@
-package sarama
-
-import (
-	"sync"
-	"testing"
-	"time"
-)
-
-var testMsg = StringEncoder("Foo")
-
-// If a particular offset is provided then messages are consumed starting from
-// that offset.
-func TestConsumerOffsetManual(t *testing.T) {
-	// Given
-	broker0 := newMockBroker(t, 0)
-
-	mockFetchResponse := newMockFetchResponse(t, 1)
-	for i := 0; i < 10; i++ {
-		mockFetchResponse.SetMessage("my_topic", 0, int64(i+1234), testMsg)
-	}
-
-	broker0.SetHandlerByMap(map[string]MockResponse{
-		"MetadataRequest": newMockMetadataResponse(t).
-			SetBroker(broker0.Addr(), broker0.BrokerID()).
-			SetLeader("my_topic", 0, broker0.BrokerID()),
-		"OffsetRequest": newMockOffsetResponse(t).
-			SetOffset("my_topic", 0, OffsetOldest, 0).
-			SetOffset("my_topic", 0, OffsetNewest, 2345),
-		"FetchRequest": mockFetchResponse,
-	})
-
-	// When
-	master, err := NewConsumer([]string{broker0.Addr()}, nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	consumer, err := master.ConsumePartition("my_topic", 0, 1234)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// Then: messages starting from offset 1234 are consumed.
-	for i := 0; i < 10; i++ {
-		select {
-		case message := <-consumer.Messages():
-			assertMessageOffset(t, message, int64(i+1234))
-		case err := <-consumer.Errors():
-			t.Error(err)
-		}
-	}
-
-	safeClose(t, consumer)
-	safeClose(t, master)
-	broker0.Close()
-}
-
-// If `OffsetNewest` is passed as the initial offset then the first consumed
-// message is indeed corresponds to the offset that broker claims to be the
-// newest in its metadata response.
-func TestConsumerOffsetNewest(t *testing.T) {
-	// Given
-	broker0 := newMockBroker(t, 0)
-	broker0.SetHandlerByMap(map[string]MockResponse{
-		"MetadataRequest": newMockMetadataResponse(t).
-			SetBroker(broker0.Addr(), broker0.BrokerID()).
-			SetLeader("my_topic", 0, broker0.BrokerID()),
-		"OffsetRequest": newMockOffsetResponse(t).
-			SetOffset("my_topic", 0, OffsetNewest, 10).
-			SetOffset("my_topic", 0, OffsetOldest, 7),
-		"FetchRequest": newMockFetchResponse(t, 1).
-			SetMessage("my_topic", 0, 9, testMsg).
-			SetMessage("my_topic", 0, 10, testMsg).
-			SetMessage("my_topic", 0, 11, testMsg).
-			SetHighWaterMark("my_topic", 0, 14),
-	})
-
-	master, err := NewConsumer([]string{broker0.Addr()}, nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// When
-	consumer, err := master.ConsumePartition("my_topic", 0, OffsetNewest)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// Then
-	assertMessageOffset(t, <-consumer.Messages(), 10)
-	if hwmo := consumer.HighWaterMarkOffset(); hwmo != 14 {
-		t.Errorf("Expected high water mark offset 14, found %d", hwmo)
-	}
-
-	safeClose(t, consumer)
-	safeClose(t, master)
-	broker0.Close()
-}
-
-// It is possible to close a partition consumer and create the same anew.
-func TestConsumerRecreate(t *testing.T) {
-	// Given
-	broker0 := newMockBroker(t, 0)
-	broker0.SetHandlerByMap(map[string]MockResponse{
-		"MetadataRequest": newMockMetadataResponse(t).
-			SetBroker(broker0.Addr(), broker0.BrokerID()).
-			SetLeader("my_topic", 0, broker0.BrokerID()),
-		"OffsetRequest": newMockOffsetResponse(t).
-			SetOffset("my_topic", 0, OffsetOldest, 0).
-			SetOffset("my_topic", 0, OffsetNewest, 1000),
-		"FetchRequest": newMockFetchResponse(t, 1).
-			SetMessage("my_topic", 0, 10, testMsg),
-	})
-
-	c, err := NewConsumer([]string{broker0.Addr()}, nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	pc, err := c.ConsumePartition("my_topic", 0, 10)
-	if err != nil {
-		t.Fatal(err)
-	}
-	assertMessageOffset(t, <-pc.Messages(), 10)
-
-	// When
-	safeClose(t, pc)
-	pc, err = c.ConsumePartition("my_topic", 0, 10)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// Then
-	assertMessageOffset(t, <-pc.Messages(), 10)
-
-	safeClose(t, pc)
-	safeClose(t, c)
-	broker0.Close()
-}
-
-// An attempt to consume the same partition twice should fail.
-func TestConsumerDuplicate(t *testing.T) {
-	// Given
-	broker0 := newMockBroker(t, 0)
-	broker0.SetHandlerByMap(map[string]MockResponse{
-		"MetadataRequest": newMockMetadataResponse(t).
-			SetBroker(broker0.Addr(), broker0.BrokerID()).
-			SetLeader("my_topic", 0, broker0.BrokerID()),
-		"OffsetRequest": newMockOffsetResponse(t).
-			SetOffset("my_topic", 0, OffsetOldest, 0).
-			SetOffset("my_topic", 0, OffsetNewest, 1000),
-		"FetchRequest": newMockFetchResponse(t, 1),
-	})
-
-	config := NewConfig()
-	config.ChannelBufferSize = 0
-	c, err := NewConsumer([]string{broker0.Addr()}, config)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	pc1, err := c.ConsumePartition("my_topic", 0, 0)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// When
-	pc2, err := c.ConsumePartition("my_topic", 0, 0)
-
-	// Then
-	if pc2 != nil || err != ConfigurationError("That topic/partition is already being consumed") {
-		t.Fatal("A partition cannot be consumed twice at the same time")
-	}
-
-	safeClose(t, pc1)
-	safeClose(t, c)
-	broker0.Close()
-}
-
-// If consumer fails to refresh metadata it keeps retrying with frequency
-// specified by `Config.Consumer.Retry.Backoff`.
-func TestConsumerLeaderRefreshError(t *testing.T) {
-	// Given
-	broker0 := newMockBroker(t, 100)
-
-	// Stage 1: my_topic/0 served by broker0
-	Logger.Printf("    STAGE 1")
-
-	broker0.SetHandlerByMap(map[string]MockResponse{
-		"MetadataRequest": newMockMetadataResponse(t).
-			SetBroker(broker0.Addr(), broker0.BrokerID()).
-			SetLeader("my_topic", 0, broker0.BrokerID()),
-		"OffsetRequest": newMockOffsetResponse(t).
-			SetOffset("my_topic", 0, OffsetOldest, 123).
-			SetOffset("my_topic", 0, OffsetNewest, 1000),
-		"FetchRequest": newMockFetchResponse(t, 1).
-			SetMessage("my_topic", 0, 123, testMsg),
-	})
-
-	config := NewConfig()
-	config.Net.ReadTimeout = 100 * time.Millisecond
-	config.Consumer.Retry.Backoff = 200 * time.Millisecond
-	config.Consumer.Return.Errors = true
-	config.Metadata.Retry.Max = 0
-	c, err := NewConsumer([]string{broker0.Addr()}, config)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	pc, err := c.ConsumePartition("my_topic", 0, OffsetOldest)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	assertMessageOffset(t, <-pc.Messages(), 123)
-
-	// Stage 2: broker0 says that it is no longer the leader for my_topic/0,
-	// but the requests to retrieve metadata fail with network timeout.
-	Logger.Printf("    STAGE 2")
-
-	fetchResponse2 := &FetchResponse{}
-	fetchResponse2.AddError("my_topic", 0, ErrNotLeaderForPartition)
-
-	broker0.SetHandlerByMap(map[string]MockResponse{
-		"FetchRequest": newMockWrapper(fetchResponse2),
-	})
-
-	if consErr := <-pc.Errors(); consErr.Err != ErrOutOfBrokers {
-		t.Errorf("Unexpected error: %v", consErr.Err)
-	}
-
-	// Stage 3: finally the metadata returned by broker0 tells that broker1 is
-	// a new leader for my_topic/0. Consumption resumes.
-
-	Logger.Printf("    STAGE 3")
-
-	broker1 := newMockBroker(t, 101)
-
-	broker1.SetHandlerByMap(map[string]MockResponse{
-		"FetchRequest": newMockFetchResponse(t, 1).
-			SetMessage("my_topic", 0, 124, testMsg),
-	})
-	broker0.SetHandlerByMap(map[string]MockResponse{
-		"MetadataRequest": newMockMetadataResponse(t).
-			SetBroker(broker0.Addr(), broker0.BrokerID()).
-			SetBroker(broker1.Addr(), broker1.BrokerID()).
-			SetLeader("my_topic", 0, broker1.BrokerID()),
-	})
-
-	assertMessageOffset(t, <-pc.Messages(), 124)
-
-	safeClose(t, pc)
-	safeClose(t, c)
-	broker1.Close()
-	broker0.Close()
-}
-
-func TestConsumerInvalidTopic(t *testing.T) {
-	// Given
-	broker0 := newMockBroker(t, 100)
-	broker0.SetHandlerByMap(map[string]MockResponse{
-		"MetadataRequest": newMockMetadataResponse(t).
-			SetBroker(broker0.Addr(), broker0.BrokerID()),
-	})
-
-	c, err := NewConsumer([]string{broker0.Addr()}, nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// When
-	pc, err := c.ConsumePartition("my_topic", 0, OffsetOldest)
-
-	// Then
-	if pc != nil || err != ErrUnknownTopicOrPartition {
-		t.Errorf("Should fail with, err=%v", err)
-	}
-
-	safeClose(t, c)
-	broker0.Close()
-}
-
-// Nothing bad happens if a partition consumer that has no leader assigned at
-// the moment is closed.
-func TestConsumerClosePartitionWithoutLeader(t *testing.T) {
-	// Given
-	broker0 := newMockBroker(t, 100)
-	broker0.SetHandlerByMap(map[string]MockResponse{
-		"MetadataRequest": newMockMetadataResponse(t).
-			SetBroker(broker0.Addr(), broker0.BrokerID()).
-			SetLeader("my_topic", 0, broker0.BrokerID()),
-		"OffsetRequest": newMockOffsetResponse(t).
-			SetOffset("my_topic", 0, OffsetOldest, 123).
-			SetOffset("my_topic", 0, OffsetNewest, 1000),
-		"FetchRequest": newMockFetchResponse(t, 1).
-			SetMessage("my_topic", 0, 123, testMsg),
-	})
-
-	config := NewConfig()
-	config.Net.ReadTimeout = 100 * time.Millisecond
-	config.Consumer.Retry.Backoff = 100 * time.Millisecond
-	config.Consumer.Return.Errors = true
-	config.Metadata.Retry.Max = 0
-	c, err := NewConsumer([]string{broker0.Addr()}, config)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	pc, err := c.ConsumePartition("my_topic", 0, OffsetOldest)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	assertMessageOffset(t, <-pc.Messages(), 123)
-
-	// broker0 says that it is no longer the leader for my_topic/0, but the
-	// requests to retrieve metadata fail with network timeout.
-	fetchResponse2 := &FetchResponse{}
-	fetchResponse2.AddError("my_topic", 0, ErrNotLeaderForPartition)
-
-	broker0.SetHandlerByMap(map[string]MockResponse{
-		"FetchRequest": newMockWrapper(fetchResponse2),
-	})
-
-	// When
-	if consErr := <-pc.Errors(); consErr.Err != ErrOutOfBrokers {
-		t.Errorf("Unexpected error: %v", consErr.Err)
-	}
-
-	// Then: the partition consumer can be closed without any problem.
-	safeClose(t, pc)
-	safeClose(t, c)
-	broker0.Close()
-}
-
-// If the initial offset passed on partition consumer creation is out of the
-// actual offset range for the partition, then the partition consumer stops
-// immediately closing its output channels.
-func TestConsumerShutsDownOutOfRange(t *testing.T) {
-	// Given
-	broker0 := newMockBroker(t, 0)
-	broker0.SetHandler(func(req *request) (res encoder) {
-		switch reqBody := req.body.(type) {
-		case *MetadataRequest:
-			return newMockMetadataResponse(t).
-				SetBroker(broker0.Addr(), broker0.BrokerID()).
-				SetLeader("my_topic", 0, broker0.BrokerID()).
-				For(reqBody)
-		case *OffsetRequest:
-			return newMockOffsetResponse(t).
-				SetOffset("my_topic", 0, OffsetNewest, 1234).
-				SetOffset("my_topic", 0, OffsetOldest, 7).
-				For(reqBody)
-		case *FetchRequest:
-			fetchResponse := new(FetchResponse)
-			fetchResponse.AddError("my_topic", 0, ErrOffsetOutOfRange)
-			return fetchResponse
-		}
-		return nil
-	})
-
-	master, err := NewConsumer([]string{broker0.Addr()}, nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// When
-	consumer, err := master.ConsumePartition("my_topic", 0, 101)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// Then: consumer should shut down closing its messages and errors channels.
-	if _, ok := <-consumer.Messages(); ok {
-		t.Error("Expected the consumer to shut down")
-	}
-	safeClose(t, consumer)
-
-	safeClose(t, master)
-	broker0.Close()
-}
-
-// If a fetch response contains messages with offsets that are smaller then
-// requested, then such messages are ignored.
-func TestConsumerExtraOffsets(t *testing.T) {
-	// Given
-	broker0 := newMockBroker(t, 0)
-	called := 0
-	broker0.SetHandler(func(req *request) (res encoder) {
-		switch req.body.(type) {
-		case *MetadataRequest:
-			return newMockMetadataResponse(t).
-				SetBroker(broker0.Addr(), broker0.BrokerID()).
-				SetLeader("my_topic", 0, broker0.BrokerID()).For(req.body)
-		case *OffsetRequest:
-			return newMockOffsetResponse(t).
-				SetOffset("my_topic", 0, OffsetNewest, 1234).
-				SetOffset("my_topic", 0, OffsetOldest, 0).For(req.body)
-		case *FetchRequest:
-			fetchResponse := &FetchResponse{}
-			called++
-			if called > 1 {
-				fetchResponse.AddError("my_topic", 0, ErrNoError)
-				return fetchResponse
-			}
-			fetchResponse.AddMessage("my_topic", 0, nil, testMsg, 1)
-			fetchResponse.AddMessage("my_topic", 0, nil, testMsg, 2)
-			fetchResponse.AddMessage("my_topic", 0, nil, testMsg, 3)
-			fetchResponse.AddMessage("my_topic", 0, nil, testMsg, 4)
-			return fetchResponse
-		}
-		return nil
-	})
-
-	master, err := NewConsumer([]string{broker0.Addr()}, nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// When
-	consumer, err := master.ConsumePartition("my_topic", 0, 3)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// Then: messages with offsets 1 and 2 are not returned even though they
-	// are present in the response.
-	assertMessageOffset(t, <-consumer.Messages(), 3)
-	assertMessageOffset(t, <-consumer.Messages(), 4)
-
-	safeClose(t, consumer)
-	safeClose(t, master)
-	broker0.Close()
-}
-
-// It is fine if offsets of fetched messages are not sequential (although
-// strictly increasing!).
-func TestConsumerNonSequentialOffsets(t *testing.T) {
-	// Given
-	broker0 := newMockBroker(t, 0)
-	called := 0
-	broker0.SetHandler(func(req *request) (res encoder) {
-		switch req.body.(type) {
-		case *MetadataRequest:
-			return newMockMetadataResponse(t).
-				SetBroker(broker0.Addr(), broker0.BrokerID()).
-				SetLeader("my_topic", 0, broker0.BrokerID()).For(req.body)
-		case *OffsetRequest:
-			return newMockOffsetResponse(t).
-				SetOffset("my_topic", 0, OffsetNewest, 1234).
-				SetOffset("my_topic", 0, OffsetOldest, 0).For(req.body)
-		case *FetchRequest:
-			called++
-			fetchResponse := &FetchResponse{}
-			if called > 1 {
-				fetchResponse.AddError("my_topic", 0, ErrNoError)
-				return fetchResponse
-			}
-			fetchResponse.AddMessage("my_topic", 0, nil, testMsg, 5)
-			fetchResponse.AddMessage("my_topic", 0, nil, testMsg, 7)
-			fetchResponse.AddMessage("my_topic", 0, nil, testMsg, 11)
-			return fetchResponse
-		}
-		return nil
-	})
-
-	master, err := NewConsumer([]string{broker0.Addr()}, nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// When
-	consumer, err := master.ConsumePartition("my_topic", 0, 3)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// Then: messages with offsets 1 and 2 are not returned even though they
-	// are present in the response.
-	assertMessageOffset(t, <-consumer.Messages(), 5)
-	assertMessageOffset(t, <-consumer.Messages(), 7)
-	assertMessageOffset(t, <-consumer.Messages(), 11)
-
-	safeClose(t, consumer)
-	safeClose(t, master)
-	broker0.Close()
-}
-
-// If leadership for a partition is changing then consumer resolves the new
-// leader and switches to it.
-func TestConsumerRebalancingMultiplePartitions(t *testing.T) {
-	// initial setup
-	seedBroker := newMockBroker(t, 10)
-	leader0 := newMockBroker(t, 0)
-	leader1 := newMockBroker(t, 1)
-
-	seedBroker.SetHandlerByMap(map[string]MockResponse{
-		"MetadataRequest": newMockMetadataResponse(t).
-			SetBroker(leader0.Addr(), leader0.BrokerID()).
-			SetBroker(leader1.Addr(), leader1.BrokerID()).
-			SetLeader("my_topic", 0, leader0.BrokerID()).
-			SetLeader("my_topic", 1, leader1.BrokerID()),
-	})
-
-	mockOffsetResponse1 := newMockOffsetResponse(t).
-		SetOffset("my_topic", 0, OffsetOldest, 0).
-		SetOffset("my_topic", 0, OffsetNewest, 1000).
-		SetOffset("my_topic", 1, OffsetOldest, 0).
-		SetOffset("my_topic", 1, OffsetNewest, 1000)
-	leader0.SetHandlerByMap(map[string]MockResponse{
-		"OffsetRequest": mockOffsetResponse1,
-		"FetchRequest":  newMockFetchResponse(t, 1),
-	})
-	leader1.SetHandlerByMap(map[string]MockResponse{
-		"OffsetRequest": mockOffsetResponse1,
-		"FetchRequest":  newMockFetchResponse(t, 1),
-	})
-
-	// launch test goroutines
-	config := NewConfig()
-	config.Consumer.Retry.Backoff = 50
-	master, err := NewConsumer([]string{seedBroker.Addr()}, config)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// we expect to end up (eventually) consuming exactly ten messages on each partition
-	var wg sync.WaitGroup
-	for i := int32(0); i < 2; i++ {
-		consumer, err := master.ConsumePartition("my_topic", i, 0)
-		if err != nil {
-			t.Error(err)
-		}
-
-		go func(c PartitionConsumer) {
-			for err := range c.Errors() {
-				t.Error(err)
-			}
-		}(consumer)
-
-		wg.Add(1)
-		go func(partition int32, c PartitionConsumer) {
-			for i := 0; i < 10; i++ {
-				message := <-consumer.Messages()
-				if message.Offset != int64(i) {
-					t.Error("Incorrect message offset!", i, partition, message.Offset)
-				}
-				if message.Partition != partition {
-					t.Error("Incorrect message partition!")
-				}
-			}
-			safeClose(t, consumer)
-			wg.Done()
-		}(i, consumer)
-	}
-
-	time.Sleep(50 * time.Millisecond)
-	Logger.Printf("    STAGE 1")
-	// Stage 1:
-	//   * my_topic/0 -> leader0 serves 4 messages
-	//   * my_topic/1 -> leader1 serves 0 messages
-
-	mockFetchResponse := newMockFetchResponse(t, 1)
-	for i := 0; i < 4; i++ {
-		mockFetchResponse.SetMessage("my_topic", 0, int64(i), testMsg)
-	}
-	leader0.SetHandlerByMap(map[string]MockResponse{
-		"FetchRequest": mockFetchResponse,
-	})
-
-	time.Sleep(50 * time.Millisecond)
-	Logger.Printf("    STAGE 2")
-	// Stage 2:
-	//   * leader0 says that it is no longer serving my_topic/0
-	//   * seedBroker tells that leader1 is serving my_topic/0 now
-
-	// seed broker tells that the new partition 0 leader is leader1
-	seedBroker.SetHandlerByMap(map[string]MockResponse{
-		"MetadataRequest": newMockMetadataResponse(t).
-			SetLeader("my_topic", 0, leader1.BrokerID()).
-			SetLeader("my_topic", 1, leader1.BrokerID()),
-	})
-
-	// leader0 says no longer leader of partition 0
-	leader0.SetHandler(func(req *request) (res encoder) {
-		switch req.body.(type) {
-		case *FetchRequest:
-			fetchResponse := new(FetchResponse)
-			fetchResponse.AddError("my_topic", 0, ErrNotLeaderForPartition)
-			return fetchResponse
-		}
-		return nil
-	})
-
-	time.Sleep(50 * time.Millisecond)
-	Logger.Printf("    STAGE 3")
-	// Stage 3:
-	//   * my_topic/0 -> leader1 serves 3 messages
-	//   * my_topic/1 -> leader1 server 8 messages
-
-	// leader1 provides 3 message on partition 0, and 8 messages on partition 1
-	mockFetchResponse2 := newMockFetchResponse(t, 2)
-	for i := 4; i < 7; i++ {
-		mockFetchResponse2.SetMessage("my_topic", 0, int64(i), testMsg)
-	}
-	for i := 0; i < 8; i++ {
-		mockFetchResponse2.SetMessage("my_topic", 1, int64(i), testMsg)
-	}
-	leader1.SetHandlerByMap(map[string]MockResponse{
-		"FetchRequest": mockFetchResponse2,
-	})
-
-	time.Sleep(50 * time.Millisecond)
-	Logger.Printf("    STAGE 4")
-	// Stage 4:
-	//   * my_topic/0 -> leader1 serves 3 messages
-	//   * my_topic/1 -> leader1 tells that it is no longer the leader
-	//   * seedBroker tells that leader0 is a new leader for my_topic/1
-
-	// metadata assigns 0 to leader1 and 1 to leader0
-	seedBroker.SetHandlerByMap(map[string]MockResponse{
-		"MetadataRequest": newMockMetadataResponse(t).
-			SetLeader("my_topic", 0, leader1.BrokerID()).
-			SetLeader("my_topic", 1, leader0.BrokerID()),
-	})
-
-	// leader1 provides three more messages on partition0, says no longer leader of partition1
-	mockFetchResponse3 := newMockFetchResponse(t, 3).
-		SetMessage("my_topic", 0, int64(7), testMsg).
-		SetMessage("my_topic", 0, int64(8), testMsg).
-		SetMessage("my_topic", 0, int64(9), testMsg)
-	leader1.SetHandler(func(req *request) (res encoder) {
-		switch reqBody := req.body.(type) {
-		case *FetchRequest:
-			res := mockFetchResponse3.For(reqBody).(*FetchResponse)
-			res.AddError("my_topic", 1, ErrNotLeaderForPartition)
-			return res
-
-		}
-		return nil
-	})
-
-	// leader0 provides two messages on partition 1
-	mockFetchResponse4 := newMockFetchResponse(t, 2)
-	for i := 8; i < 10; i++ {
-		mockFetchResponse4.SetMessage("my_topic", 1, int64(i), testMsg)
-	}
-	leader0.SetHandlerByMap(map[string]MockResponse{
-		"FetchRequest": mockFetchResponse4,
-	})
-
-	wg.Wait()
-	safeClose(t, master)
-	leader1.Close()
-	leader0.Close()
-	seedBroker.Close()
-}
-
-// When two partitions have the same broker as the leader, if one partition
-// consumer channel buffer is full then that does not affect the ability to
-// read messages by the other consumer.
-func TestConsumerInterleavedClose(t *testing.T) {
-	// Given
-	broker0 := newMockBroker(t, 0)
-	broker0.SetHandlerByMap(map[string]MockResponse{
-		"MetadataRequest": newMockMetadataResponse(t).
-			SetBroker(broker0.Addr(), broker0.BrokerID()).
-			SetLeader("my_topic", 0, broker0.BrokerID()).
-			SetLeader("my_topic", 1, broker0.BrokerID()),
-		"OffsetRequest": newMockOffsetResponse(t).
-			SetOffset("my_topic", 0, OffsetOldest, 1000).
-			SetOffset("my_topic", 0, OffsetNewest, 1100).
-			SetOffset("my_topic", 1, OffsetOldest, 2000).
-			SetOffset("my_topic", 1, OffsetNewest, 2100),
-		"FetchRequest": newMockFetchResponse(t, 1).
-			SetMessage("my_topic", 0, 1000, testMsg).
-			SetMessage("my_topic", 0, 1001, testMsg).
-			SetMessage("my_topic", 0, 1002, testMsg).
-			SetMessage("my_topic", 1, 2000, testMsg),
-	})
-
-	config := NewConfig()
-	config.ChannelBufferSize = 0
-	master, err := NewConsumer([]string{broker0.Addr()}, config)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	c0, err := master.ConsumePartition("my_topic", 0, 1000)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	c1, err := master.ConsumePartition("my_topic", 1, 2000)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// When/Then: we can read from partition 0 even if nobody reads from partition 1
-	assertMessageOffset(t, <-c0.Messages(), 1000)
-	assertMessageOffset(t, <-c0.Messages(), 1001)
-	assertMessageOffset(t, <-c0.Messages(), 1002)
-
-	safeClose(t, c1)
-	safeClose(t, c0)
-	safeClose(t, master)
-	broker0.Close()
-}
-
-func TestConsumerBounceWithReferenceOpen(t *testing.T) {
-	broker0 := newMockBroker(t, 0)
-	broker0Addr := broker0.Addr()
-	broker1 := newMockBroker(t, 1)
-
-	mockMetadataResponse := newMockMetadataResponse(t).
-		SetBroker(broker0.Addr(), broker0.BrokerID()).
-		SetBroker(broker1.Addr(), broker1.BrokerID()).
-		SetLeader("my_topic", 0, broker0.BrokerID()).
-		SetLeader("my_topic", 1, broker1.BrokerID())
-
-	mockOffsetResponse := newMockOffsetResponse(t).
-		SetOffset("my_topic", 0, OffsetOldest, 1000).
-		SetOffset("my_topic", 0, OffsetNewest, 1100).
-		SetOffset("my_topic", 1, OffsetOldest, 2000).
-		SetOffset("my_topic", 1, OffsetNewest, 2100)
-
-	mockFetchResponse := newMockFetchResponse(t, 1)
-	for i := 0; i < 10; i++ {
-		mockFetchResponse.SetMessage("my_topic", 0, int64(1000+i), testMsg)
-		mockFetchResponse.SetMessage("my_topic", 1, int64(2000+i), testMsg)
-	}
-
-	broker0.SetHandlerByMap(map[string]MockResponse{
-		"OffsetRequest": mockOffsetResponse,
-		"FetchRequest":  mockFetchResponse,
-	})
-	broker1.SetHandlerByMap(map[string]MockResponse{
-		"MetadataRequest": mockMetadataResponse,
-		"OffsetRequest":   mockOffsetResponse,
-		"FetchRequest":    mockFetchResponse,
-	})
-
-	config := NewConfig()
-	config.Consumer.Return.Errors = true
-	config.Consumer.Retry.Backoff = 100 * time.Millisecond
-	config.ChannelBufferSize = 1
-	master, err := NewConsumer([]string{broker1.Addr()}, config)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	c0, err := master.ConsumePartition("my_topic", 0, 1000)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	c1, err := master.ConsumePartition("my_topic", 1, 2000)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// read messages from both partition to make sure that both brokers operate
-	// normally.
-	assertMessageOffset(t, <-c0.Messages(), 1000)
-	assertMessageOffset(t, <-c1.Messages(), 2000)
-
-	// Simulate broker shutdown. Note that metadata response does not change,
-	// that is the leadership does not move to another broker. So partition
-	// consumer will keep retrying to restore the connection with the broker.
-	broker0.Close()
-
-	// Make sure that while the partition/0 leader is down, consumer/partition/1
-	// is capable of pulling messages from broker1.
-	for i := 1; i < 7; i++ {
-		offset := (<-c1.Messages()).Offset
-		if offset != int64(2000+i) {
-			t.Errorf("Expected offset %d from consumer/partition/1", int64(2000+i))
-		}
-	}
-
-	// Bring broker0 back to service.
-	broker0 = newMockBrokerAddr(t, 0, broker0Addr)
-	broker0.SetHandlerByMap(map[string]MockResponse{
-		"FetchRequest": mockFetchResponse,
-	})
-
-	// Read the rest of messages from both partitions.
-	for i := 7; i < 10; i++ {
-		assertMessageOffset(t, <-c1.Messages(), int64(2000+i))
-	}
-	for i := 1; i < 10; i++ {
-		assertMessageOffset(t, <-c0.Messages(), int64(1000+i))
-	}
-
-	select {
-	case <-c0.Errors():
-	default:
-		t.Errorf("Partition consumer should have detected broker restart")
-	}
-
-	safeClose(t, c1)
-	safeClose(t, c0)
-	safeClose(t, master)
-	broker0.Close()
-	broker1.Close()
-}
-
-func TestConsumerOffsetOutOfRange(t *testing.T) {
-	// Given
-	broker0 := newMockBroker(t, 2)
-	broker0.SetHandlerByMap(map[string]MockResponse{
-		"MetadataRequest": newMockMetadataResponse(t).
-			SetBroker(broker0.Addr(), broker0.BrokerID()).
-			SetLeader("my_topic", 0, broker0.BrokerID()),
-		"OffsetRequest": newMockOffsetResponse(t).
-			SetOffset("my_topic", 0, OffsetNewest, 1234).
-			SetOffset("my_topic", 0, OffsetOldest, 2345),
-	})
-
-	master, err := NewConsumer([]string{broker0.Addr()}, nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// When/Then
-	if _, err := master.ConsumePartition("my_topic", 0, 0); err != ErrOffsetOutOfRange {
-		t.Fatal("Should return ErrOffsetOutOfRange, got:", err)
-	}
-	if _, err := master.ConsumePartition("my_topic", 0, 3456); err != ErrOffsetOutOfRange {
-		t.Fatal("Should return ErrOffsetOutOfRange, got:", err)
-	}
-	if _, err := master.ConsumePartition("my_topic", 0, -3); err != ErrOffsetOutOfRange {
-		t.Fatal("Should return ErrOffsetOutOfRange, got:", err)
-	}
-
-	safeClose(t, master)
-	broker0.Close()
-}
-
-func assertMessageOffset(t *testing.T, msg *ConsumerMessage, expectedOffset int64) {
-	if msg.Offset != expectedOffset {
-		t.Errorf("Incorrect message offset: expected=%d, actual=%d", expectedOffset, msg.Offset)
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/crc32_field.go b/Godeps/_workspace/src/github.com/Shopify/sarama/crc32_field.go
deleted file mode 100644
index f4fde18ad..000000000
--- a/Godeps/_workspace/src/github.com/Shopify/sarama/crc32_field.go
+++ /dev/null
@@ -1,35 +0,0 @@
-package sarama
-
-import (
-	"encoding/binary"
-	"hash/crc32"
-)
-
-// crc32Field implements the pushEncoder and pushDecoder interfaces for calculating CRC32s.
-type crc32Field struct {
-	startOffset int
-}
-
-func (c *crc32Field) saveOffset(in int) {
-	c.startOffset = in
-}
-
-func (c *crc32Field) reserveLength() int {
-	return 4
-}
-
-func (c *crc32Field) run(curOffset int, buf []byte) error {
-	crc := crc32.ChecksumIEEE(buf[c.startOffset+4 : curOffset])
-	binary.BigEndian.PutUint32(buf[c.startOffset:], crc)
-	return nil
-}
-
-func (c *crc32Field) check(curOffset int, buf []byte) error {
-	crc := crc32.ChecksumIEEE(buf[c.startOffset+4 : curOffset])
-
-	if crc != binary.BigEndian.Uint32(buf[c.startOffset:]) {
-		return PacketDecodingError{"CRC didn't match"}
-	}
-
-	return nil
-}
diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/encoder_decoder.go b/Godeps/_workspace/src/github.com/Shopify/sarama/encoder_decoder.go
deleted file mode 100644
index b91efaa0e..000000000
--- a/Godeps/_workspace/src/github.com/Shopify/sarama/encoder_decoder.go
+++ /dev/null
@@ -1,62 +0,0 @@
-package sarama
-
-import "fmt"
-
-// Encoder is the interface that wraps the basic Encode method.
-// Anything implementing Encoder can be turned into bytes using Kafka's encoding rules.
-type encoder interface {
-	encode(pe packetEncoder) error
-}
-
-// Encode takes an Encoder and turns it into bytes.
-func encode(e encoder) ([]byte, error) {
-	if e == nil {
-		return nil, nil
-	}
-
-	var prepEnc prepEncoder
-	var realEnc realEncoder
-
-	err := e.encode(&prepEnc)
-	if err != nil {
-		return nil, err
-	}
-
-	if prepEnc.length < 0 || prepEnc.length > int(MaxRequestSize) {
-		return nil, PacketEncodingError{fmt.Sprintf("invalid request size (%d)", prepEnc.length)}
-	}
-
-	realEnc.raw = make([]byte, prepEnc.length)
-	err = e.encode(&realEnc)
-	if err != nil {
-		return nil, err
-	}
-
-	return realEnc.raw, nil
-}
-
-// Decoder is the interface that wraps the basic Decode method.
-// Anything implementing Decoder can be extracted from bytes using Kafka's encoding rules.
-type decoder interface {
-	decode(pd packetDecoder) error
-}
-
-// Decode takes bytes and a Decoder and fills the fields of the decoder from the bytes,
-// interpreted using Kafka's encoding rules.
-func decode(buf []byte, in decoder) error {
-	if buf == nil {
-		return nil
-	}
-
-	helper := realDecoder{raw: buf}
-	err := in.decode(&helper)
-	if err != nil {
-		return err
-	}
-
-	if helper.off != len(buf) {
-		return PacketDecodingError{"invalid length"}
-	}
-
-	return nil
-}
diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/errors.go b/Godeps/_workspace/src/github.com/Shopify/sarama/errors.go
deleted file mode 100644
index 70f2b9bfd..000000000
--- a/Godeps/_workspace/src/github.com/Shopify/sarama/errors.go
+++ /dev/null
@@ -1,146 +0,0 @@
-package sarama
-
-import (
-	"errors"
-	"fmt"
-)
-
-// ErrOutOfBrokers is the error returned when the client has run out of brokers to talk to because all of them errored
-// or otherwise failed to respond.
-var ErrOutOfBrokers = errors.New("kafka: client has run out of available brokers to talk to (Is your cluster reachable?)")
-
-// ErrClosedClient is the error returned when a method is called on a client that has been closed.
-var ErrClosedClient = errors.New("kafka: tried to use a client that was closed")
-
-// ErrIncompleteResponse is the error returned when the server returns a syntactically valid response, but it does
-// not contain the expected information.
-var ErrIncompleteResponse = errors.New("kafka: response did not contain all the expected topic/partition blocks")
-
-// ErrInvalidPartition is the error returned when a partitioner returns an invalid partition index
-// (meaning one outside of the range [0...numPartitions-1]).
-var ErrInvalidPartition = errors.New("kafka: partitioner returned an invalid partition index")
-
-// ErrAlreadyConnected is the error returned when calling Open() on a Broker that is already connected or connecting.
-var ErrAlreadyConnected = errors.New("kafka: broker connection already initiated")
-
-// ErrNotConnected is the error returned when trying to send or call Close() on a Broker that is not connected.
-var ErrNotConnected = errors.New("kafka: broker not connected")
-
-// ErrInsufficientData is returned when decoding and the packet is truncated. This can be expected
-// when requesting messages, since as an optimization the server is allowed to return a partial message at the end
-// of the message set.
-var ErrInsufficientData = errors.New("kafka: insufficient data to decode packet, more bytes expected")
-
-// ErrShuttingDown is returned when a producer receives a message during shutdown.
-var ErrShuttingDown = errors.New("kafka: message received by producer in process of shutting down")
-
-// ErrMessageTooLarge is returned when the next message to consume is larger than the configured Consumer.Fetch.Max
-var ErrMessageTooLarge = errors.New("kafka: message is larger than Consumer.Fetch.Max")
-
-// PacketEncodingError is returned from a failure while encoding a Kafka packet. This can happen, for example,
-// if you try to encode a string over 2^15 characters in length, since Kafka's encoding rules do not permit that.
-type PacketEncodingError struct {
-	Info string
-}
-
-func (err PacketEncodingError) Error() string {
-	return fmt.Sprintf("kafka: error encoding packet: %s", err.Info)
-}
-
-// PacketDecodingError is returned when there was an error (other than truncated data) decoding the Kafka broker's response.
-// This can be a bad CRC or length field, or any other invalid value.
-type PacketDecodingError struct {
-	Info string
-}
-
-func (err PacketDecodingError) Error() string {
-	return fmt.Sprintf("kafka: error decoding packet: %s", err.Info)
-}
-
-// ConfigurationError is the type of error returned from a constructor (e.g. NewClient, or NewConsumer)
-// when the specified configuration is invalid.
-type ConfigurationError string
-
-func (err ConfigurationError) Error() string {
-	return "kafka: invalid configuration (" + string(err) + ")"
-}
-
-// KError is the type of error that can be returned directly by the Kafka broker.
-// See https://cwiki.apache.org/confluence/display/KAFKA/A+Guide+To+The+Kafka+Protocol#AGuideToTheKafkaProtocol-ErrorCodes
-type KError int16
-
-// Numeric error codes returned by the Kafka server.
-const (
-	ErrNoError                         KError = 0
-	ErrUnknown                         KError = -1
-	ErrOffsetOutOfRange                KError = 1
-	ErrInvalidMessage                  KError = 2
-	ErrUnknownTopicOrPartition         KError = 3
-	ErrInvalidMessageSize              KError = 4
-	ErrLeaderNotAvailable              KError = 5
-	ErrNotLeaderForPartition           KError = 6
-	ErrRequestTimedOut                 KError = 7
-	ErrBrokerNotAvailable              KError = 8
-	ErrReplicaNotAvailable             KError = 9
-	ErrMessageSizeTooLarge             KError = 10
-	ErrStaleControllerEpochCode        KError = 11
-	ErrOffsetMetadataTooLarge          KError = 12
-	ErrOffsetsLoadInProgress           KError = 14
-	ErrConsumerCoordinatorNotAvailable KError = 15
-	ErrNotCoordinatorForConsumer       KError = 16
-	ErrInvalidTopic                    KError = 17
-	ErrMessageSetSizeTooLarge          KError = 18
-	ErrNotEnoughReplicas               KError = 19
-	ErrNotEnoughReplicasAfterAppend    KError = 20
-)
-
-func (err KError) Error() string {
-	// Error messages stolen/adapted from
-	// https://cwiki.apache.org/confluence/display/KAFKA/A+Guide+To+The+Kafka+Protocol
-	switch err {
-	case ErrNoError:
-		return "kafka server: Not an error, why are you printing me?"
-	case ErrUnknown:
-		return "kafka server: Unexpected (unknown?) server error."
-	case ErrOffsetOutOfRange:
-		return "kafka server: The requested offset is outside the range of offsets maintained by the server for the given topic/partition."
-	case ErrInvalidMessage:
-		return "kafka server: Message contents does not match its CRC."
-	case ErrUnknownTopicOrPartition:
-		return "kafka server: Request was for a topic or partition that does not exist on this broker."
-	case ErrInvalidMessageSize:
-		return "kafka server: The message has a negative size."
-	case ErrLeaderNotAvailable:
-		return "kafka server: In the middle of a leadership election, there is currently no leader for this partition and hence it is unavailable for writes."
-	case ErrNotLeaderForPartition:
-		return "kafka server: Tried to send a message to a replica that is not the leader for some partition. Your metadata is out of date."
-	case ErrRequestTimedOut:
-		return "kafka server: Request exceeded the user-specified time limit in the request."
-	case ErrBrokerNotAvailable:
-		return "kafka server: Broker not available. Not a client facing error, we should never receive this!!!"
-	case ErrReplicaNotAvailable:
-		return "kafka server: Replica infomation not available, one or more brokers are down."
-	case ErrMessageSizeTooLarge:
-		return "kafka server: Message was too large, server rejected it to avoid allocation error."
-	case ErrStaleControllerEpochCode:
-		return "kafka server: StaleControllerEpochCode (internal error code for broker-to-broker communication)."
-	case ErrOffsetMetadataTooLarge:
-		return "kafka server: Specified a string larger than the configured maximum for offset metadata."
-	case ErrOffsetsLoadInProgress:
-		return "kafka server: The broker is still loading offsets after a leader change for that offset's topic partition."
-	case ErrConsumerCoordinatorNotAvailable:
-		return "kafka server: Offset's topic has not yet been created."
-	case ErrNotCoordinatorForConsumer:
-		return "kafka server: Request was for a consumer group that is not coordinated by this broker."
-	case ErrInvalidTopic:
-		return "kafka server: The request attempted to perform an operation on an invalid topic."
-	case ErrMessageSetSizeTooLarge:
-		return "kafka server: The request included message batch larger than the configured segment size on the server."
-	case ErrNotEnoughReplicas:
-		return "kafka server: Messages are rejected since there are fewer in-sync replicas than required."
-	case ErrNotEnoughReplicasAfterAppend:
-		return "kafka server: Messages are written to the log, but to fewer in-sync replicas than required."
-	}
-
-	return fmt.Sprintf("Unknown error, how did this happen? Error code = %d", err)
-}
diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/examples/README.md b/Godeps/_workspace/src/github.com/Shopify/sarama/examples/README.md
deleted file mode 100644
index b6588051e..000000000
--- a/Godeps/_workspace/src/github.com/Shopify/sarama/examples/README.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# Sarama examples
-
-This folder contains example applications to demonstrate the use of Sarama. For code snippet examples on how to use the different types in Sarama, see [Sarams's API documentation on godoc.org](https://godoc.org/github.com/Shopify/sarama)
-
-In these examples, we use `github.com/Shopify/sarama` as import path. We do this to ensure all the examples are up to date with the latest changes in Sarama. For your own applications, you may want to use `gopkg.in/Shopify/sarama.v1` to lock into a stable API version.
-
-#### HTTP server
-
-[http_server](./http_server) is a simple HTTP server uses both the sync producer to produce data as part of the request handling cycle, as well as the async producer to maintain an access log. It also uses the [mocks subpackage](https://godoc.org/github.com/Shopify/sarama/mocks) to test both.
diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/examples/http_server/.gitignore b/Godeps/_workspace/src/github.com/Shopify/sarama/examples/http_server/.gitignore
deleted file mode 100644
index 9f6ed425f..000000000
--- a/Godeps/_workspace/src/github.com/Shopify/sarama/examples/http_server/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-http_server
-http_server.test
diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/examples/http_server/README.md b/Godeps/_workspace/src/github.com/Shopify/sarama/examples/http_server/README.md
deleted file mode 100644
index 5ff2bc253..000000000
--- a/Godeps/_workspace/src/github.com/Shopify/sarama/examples/http_server/README.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# HTTP server example
-
-This HTTP server example shows you how to use the AsyncProducer and SyncProducer, and how to test them using mocks. The server simply sends the data of the HTTP request's query string to Kafka, and send a 200 result if that succeeds. For every request, it will send an access log entry to Kafka as well in the background.
-
-If you need to know whether a message was successfully sent to the Kafka cluster before you can send your HTTP response, using the `SyncProducer` is probably the simplest way to achieve this. If you don't care, e.g. for the access log, using the `AsyncProducer` will let you fire and forget. You can send the HTTP response, while the message is being produced in the background.
-
-One important thing to note is that both the `SyncProducer` and `AsyncProducer` are **thread-safe**. Go's `http.Server` handles requests concurrently in different goroutines, but you can use a single producer safely. This will actually achieve efficiency gains as the producer will be able to batch messages from concurrent requests together.
diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/examples/http_server/http_server.go b/Godeps/_workspace/src/github.com/Shopify/sarama/examples/http_server/http_server.go
deleted file mode 100644
index 03e47b6b2..000000000
--- a/Godeps/_workspace/src/github.com/Shopify/sarama/examples/http_server/http_server.go
+++ /dev/null
@@ -1,246 +0,0 @@
-package main
-
-import (
-	"github.com/Shopify/sarama"
-
-	"crypto/tls"
-	"crypto/x509"
-	"encoding/json"
-	"flag"
-	"fmt"
-	"io/ioutil"
-	"log"
-	"net/http"
-	"os"
-	"strings"
-	"time"
-)
-
-var (
-	addr      = flag.String("addr", ":8080", "The address to bind to")
-	brokers   = flag.String("brokers", os.Getenv("KAFKA_PEERS"), "The Kafka brokers to connect to, as a comma separated list")
-	verbose   = flag.Bool("verbose", false, "Turn on Sarama logging")
-	certFile  = flag.String("certificate", "", "The optional certificate file for client authentication")
-	keyFile   = flag.String("key", "", "The optional key file for client authentication")
-	caFile    = flag.String("ca", "", "The optional certificate authority file for TLS client authentication")
-	verifySsl = flag.Bool("verify", false, "Optional verify ssl certificates chain")
-)
-
-func main() {
-	flag.Parse()
-
-	if *verbose {
-		sarama.Logger = log.New(os.Stdout, "[sarama] ", log.LstdFlags)
-	}
-
-	if *brokers == "" {
-		flag.PrintDefaults()
-		os.Exit(1)
-	}
-
-	brokerList := strings.Split(*brokers, ",")
-	log.Printf("Kafka brokers: %s", strings.Join(brokerList, ", "))
-
-	server := &Server{
-		DataCollector:     newDataCollector(brokerList),
-		AccessLogProducer: newAccessLogProducer(brokerList),
-	}
-	defer func() {
-		if err := server.Close(); err != nil {
-			log.Println("Failed to close server", err)
-		}
-	}()
-
-	log.Fatal(server.Run(*addr))
-}
-
-func createTlsConfiguration() (t *tls.Config) {
-	if *certFile != "" && *keyFile != "" && *caFile != "" {
-		cert, err := tls.LoadX509KeyPair(*certFile, *keyFile)
-		if err != nil {
-			log.Fatal(err)
-		}
-
-		caCert, err := ioutil.ReadFile(*caFile)
-		if err != nil {
-			log.Fatal(err)
-		}
-
-		caCertPool := x509.NewCertPool()
-		caCertPool.AppendCertsFromPEM(caCert)
-
-		t = &tls.Config{
-			Certificates:       []tls.Certificate{cert},
-			RootCAs:            caCertPool,
-			InsecureSkipVerify: *verifySsl,
-		}
-	}
-	// will be nil by default if nothing is provided
-	return t
-}
-
-type Server struct {
-	DataCollector     sarama.SyncProducer
-	AccessLogProducer sarama.AsyncProducer
-}
-
-func (s *Server) Close() error {
-	if err := s.DataCollector.Close(); err != nil {
-		log.Println("Failed to shut down data collector cleanly", err)
-	}
-
-	if err := s.AccessLogProducer.Close(); err != nil {
-		log.Println("Failed to shut down access log producer cleanly", err)
-	}
-
-	return nil
-}
-
-func (s *Server) Handler() http.Handler {
-	return s.withAccessLog(s.collectQueryStringData())
-}
-
-func (s *Server) Run(addr string) error {
-	httpServer := &http.Server{
-		Addr:    addr,
-		Handler: s.Handler(),
-	}
-
-	log.Printf("Listening for requests on %s...\n", addr)
-	return httpServer.ListenAndServe()
-}
-
-func (s *Server) collectQueryStringData() http.Handler {
-	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		if r.URL.Path != "/" {
-			http.NotFound(w, r)
-			return
-		}
-
-		// We are not setting a message key, which means that all messages will
-		// be distributed randomly over the different partitions.
-		partition, offset, err := s.DataCollector.SendMessage(&sarama.ProducerMessage{
-			Topic: "important",
-			Value: sarama.StringEncoder(r.URL.RawQuery),
-		})
-
-		if err != nil {
-			w.WriteHeader(http.StatusInternalServerError)
-			fmt.Fprintf(w, "Failed to store your data:, %s", err)
-		} else {
-			// The tuple (topic, partition, offset) can be used as a unique identifier
-			// for a message in a Kafka cluster.
-			fmt.Fprintf(w, "Your data is stored with unique identifier important/%d/%d", partition, offset)
-		}
-	})
-}
-
-type accessLogEntry struct {
-	Method       string  `json:"method"`
-	Host         string  `json:"host"`
-	Path         string  `json:"path"`
-	IP           string  `json:"ip"`
-	ResponseTime float64 `json:"response_time"`
-
-	encoded []byte
-	err     error
-}
-
-func (ale *accessLogEntry) ensureEncoded() {
-	if ale.encoded == nil && ale.err == nil {
-		ale.encoded, ale.err = json.Marshal(ale)
-	}
-}
-
-func (ale *accessLogEntry) Length() int {
-	ale.ensureEncoded()
-	return len(ale.encoded)
-}
-
-func (ale *accessLogEntry) Encode() ([]byte, error) {
-	ale.ensureEncoded()
-	return ale.encoded, ale.err
-}
-
-func (s *Server) withAccessLog(next http.Handler) http.Handler {
-
-	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		started := time.Now()
-
-		next.ServeHTTP(w, r)
-
-		entry := &accessLogEntry{
-			Method:       r.Method,
-			Host:         r.Host,
-			Path:         r.RequestURI,
-			IP:           r.RemoteAddr,
-			ResponseTime: float64(time.Since(started)) / float64(time.Second),
-		}
-
-		// We will use the client's IP address as key. This will cause
-		// all the access log entries of the same IP address to end up
-		// on the same partition.
-		s.AccessLogProducer.Input() <- &sarama.ProducerMessage{
-			Topic: "access_log",
-			Key:   sarama.StringEncoder(r.RemoteAddr),
-			Value: entry,
-		}
-	})
-}
-
-func newDataCollector(brokerList []string) sarama.SyncProducer {
-
-	// For the data collector, we are looking for strong consistency semantics.
-	// Because we don't change the flush settings, sarama will try to produce messages
-	// as fast as possible to keep latency low.
-	config := sarama.NewConfig()
-	config.Producer.RequiredAcks = sarama.WaitForAll // Wait for all in-sync replicas to ack the message
-	config.Producer.Retry.Max = 10                   // Retry up to 10 times to produce the message
-	tlsConfig := createTlsConfiguration()
-	if tlsConfig != nil {
-		config.Net.TLS.Config = tlsConfig
-		config.Net.TLS.Enable = true
-	}
-
-	// On the broker side, you may want to change the following settings to get
-	// stronger consistency guarantees:
-	// - For your broker, set `unclean.leader.election.enable` to false
-	// - For the topic, you could increase `min.insync.replicas`.
-
-	producer, err := sarama.NewSyncProducer(brokerList, config)
-	if err != nil {
-		log.Fatalln("Failed to start Sarama producer:", err)
-	}
-
-	return producer
-}
-
-func newAccessLogProducer(brokerList []string) sarama.AsyncProducer {
-
-	// For the access log, we are looking for AP semantics, with high throughput.
-	// By creating batches of compressed messages, we reduce network I/O at a cost of more latency.
-	config := sarama.NewConfig()
-	tlsConfig := createTlsConfiguration()
-	if tlsConfig != nil {
-		config.Net.TLS.Enable = true
-		config.Net.TLS.Config = tlsConfig
-	}
-	config.Producer.RequiredAcks = sarama.WaitForLocal       // Only wait for the leader to ack
-	config.Producer.Compression = sarama.CompressionSnappy   // Compress messages
-	config.Producer.Flush.Frequency = 500 * time.Millisecond // Flush batches every 500ms
-
-	producer, err := sarama.NewAsyncProducer(brokerList, config)
-	if err != nil {
-		log.Fatalln("Failed to start Sarama producer:", err)
-	}
-
-	// We will just log to STDOUT if we're not able to produce messages.
-	// Note: messages will only be returned here after all retry attempts are exhausted.
-	go func() {
-		for err := range producer.Errors() {
-			log.Println("Failed to write access log entry:", err)
-		}
-	}()
-
-	return producer
-}
diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/examples/http_server/http_server_test.go b/Godeps/_workspace/src/github.com/Shopify/sarama/examples/http_server/http_server_test.go
deleted file mode 100644
index 7b2451e28..000000000
--- a/Godeps/_workspace/src/github.com/Shopify/sarama/examples/http_server/http_server_test.go
+++ /dev/null
@@ -1,109 +0,0 @@
-package main
-
-import (
-	"io"
-	"net/http"
-	"net/http/httptest"
-	"testing"
-
-	"github.com/Shopify/sarama"
-	"github.com/Shopify/sarama/mocks"
-)
-
-// In normal operation, we expect one access log entry,
-// and one data collector entry. Let's assume both will succeed.
-// We should return a HTTP 200 status.
-func TestCollectSuccessfully(t *testing.T) {
-	dataCollectorMock := mocks.NewSyncProducer(t, nil)
-	dataCollectorMock.ExpectSendMessageAndSucceed()
-
-	accessLogProducerMock := mocks.NewAsyncProducer(t, nil)
-	accessLogProducerMock.ExpectInputAndSucceed()
-
-	// Now, use dependency injection to use the mocks.
-	s := &Server{
-		DataCollector:     dataCollectorMock,
-		AccessLogProducer: accessLogProducerMock,
-	}
-
-	// The Server's Close call is important; it will call Close on
-	// the two mock producers, which will then validate whether all
-	// expectations are resolved.
-	defer safeClose(t, s)
-
-	req, err := http.NewRequest("GET", "http://example.com/?data", nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-	res := httptest.NewRecorder()
-	s.Handler().ServeHTTP(res, req)
-
-	if res.Code != 200 {
-		t.Errorf("Expected HTTP status 200, found %d", res.Code)
-	}
-
-	if string(res.Body.Bytes()) != "Your data is stored with unique identifier important/0/1" {
-		t.Error("Unexpected response body", res.Body)
-	}
-}
-
-// Now, let's see if we handle the case of not being able to produce
-// to the data collector properly. In this case we should return a 500 status.
-func TestCollectionFailure(t *testing.T) {
-	dataCollectorMock := mocks.NewSyncProducer(t, nil)
-	dataCollectorMock.ExpectSendMessageAndFail(sarama.ErrRequestTimedOut)
-
-	accessLogProducerMock := mocks.NewAsyncProducer(t, nil)
-	accessLogProducerMock.ExpectInputAndSucceed()
-
-	s := &Server{
-		DataCollector:     dataCollectorMock,
-		AccessLogProducer: accessLogProducerMock,
-	}
-	defer safeClose(t, s)
-
-	req, err := http.NewRequest("GET", "http://example.com/?data", nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-	res := httptest.NewRecorder()
-	s.Handler().ServeHTTP(res, req)
-
-	if res.Code != 500 {
-		t.Errorf("Expected HTTP status 500, found %d", res.Code)
-	}
-}
-
-// We don't expect any data collector calls because the path is wrong,
-// so we are not setting any expectations on the dataCollectorMock. It
-// will still generate an access log entry though.
-func TestWrongPath(t *testing.T) {
-	dataCollectorMock := mocks.NewSyncProducer(t, nil)
-
-	accessLogProducerMock := mocks.NewAsyncProducer(t, nil)
-	accessLogProducerMock.ExpectInputAndSucceed()
-
-	s := &Server{
-		DataCollector:     dataCollectorMock,
-		AccessLogProducer: accessLogProducerMock,
-	}
-	defer safeClose(t, s)
-
-	req, err := http.NewRequest("GET", "http://example.com/wrong?data", nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-	res := httptest.NewRecorder()
-
-	s.Handler().ServeHTTP(res, req)
-
-	if res.Code != 404 {
-		t.Errorf("Expected HTTP status 404, found %d", res.Code)
-	}
-}
-
-func safeClose(t *testing.T, o io.Closer) {
-	if err := o.Close(); err != nil {
-		t.Error(err)
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/fetch_request.go b/Godeps/_workspace/src/github.com/Shopify/sarama/fetch_request.go
deleted file mode 100644
index 3c00fad65..000000000
--- a/Godeps/_workspace/src/github.com/Shopify/sarama/fetch_request.go
+++ /dev/null
@@ -1,123 +0,0 @@
-package sarama
-
-type fetchRequestBlock struct {
-	fetchOffset int64
-	maxBytes    int32
-}
-
-func (f *fetchRequestBlock) encode(pe packetEncoder) error {
-	pe.putInt64(f.fetchOffset)
-	pe.putInt32(f.maxBytes)
-	return nil
-}
-
-func (f *fetchRequestBlock) decode(pd packetDecoder) (err error) {
-	if f.fetchOffset, err = pd.getInt64(); err != nil {
-		return err
-	}
-	if f.maxBytes, err = pd.getInt32(); err != nil {
-		return err
-	}
-	return nil
-}
-
-type FetchRequest struct {
-	MaxWaitTime int32
-	MinBytes    int32
-	blocks      map[string]map[int32]*fetchRequestBlock
-}
-
-func (f *FetchRequest) encode(pe packetEncoder) (err error) {
-	pe.putInt32(-1) // replica ID is always -1 for clients
-	pe.putInt32(f.MaxWaitTime)
-	pe.putInt32(f.MinBytes)
-	err = pe.putArrayLength(len(f.blocks))
-	if err != nil {
-		return err
-	}
-	for topic, blocks := range f.blocks {
-		err = pe.putString(topic)
-		if err != nil {
-			return err
-		}
-		err = pe.putArrayLength(len(blocks))
-		if err != nil {
-			return err
-		}
-		for partition, block := range blocks {
-			pe.putInt32(partition)
-			err = block.encode(pe)
-			if err != nil {
-				return err
-			}
-		}
-	}
-	return nil
-}
-
-func (f *FetchRequest) decode(pd packetDecoder) (err error) {
-	if _, err = pd.getInt32(); err != nil {
-		return err
-	}
-	if f.MaxWaitTime, err = pd.getInt32(); err != nil {
-		return err
-	}
-	if f.MinBytes, err = pd.getInt32(); err != nil {
-		return err
-	}
-	topicCount, err := pd.getArrayLength()
-	if err != nil {
-		return err
-	}
-	if topicCount == 0 {
-		return nil
-	}
-	f.blocks = make(map[string]map[int32]*fetchRequestBlock)
-	for i := 0; i < topicCount; i++ {
-		topic, err := pd.getString()
-		if err != nil {
-			return err
-		}
-		partitionCount, err := pd.getArrayLength()
-		if err != nil {
-			return err
-		}
-		f.blocks[topic] = make(map[int32]*fetchRequestBlock)
-		for j := 0; j < partitionCount; j++ {
-			partition, err := pd.getInt32()
-			if err != nil {
-				return err
-			}
-			fetchBlock := &fetchRequestBlock{}
-			if err = fetchBlock.decode(pd); err != nil {
-				return nil
-			}
-			f.blocks[topic][partition] = fetchBlock
-		}
-	}
-	return nil
-}
-
-func (f *FetchRequest) key() int16 {
-	return 1
-}
-
-func (f *FetchRequest) version() int16 {
-	return 0
-}
-
-func (f *FetchRequest) AddBlock(topic string, partitionID int32, fetchOffset int64, maxBytes int32) {
-	if f.blocks == nil {
-		f.blocks = make(map[string]map[int32]*fetchRequestBlock)
-	}
-
-	if f.blocks[topic] == nil {
-		f.blocks[topic] = make(map[int32]*fetchRequestBlock)
-	}
-
-	tmp := new(fetchRequestBlock)
-	tmp.maxBytes = maxBytes
-	tmp.fetchOffset = fetchOffset
-
-	f.blocks[topic][partitionID] = tmp
-}
diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/fetch_request_test.go b/Godeps/_workspace/src/github.com/Shopify/sarama/fetch_request_test.go
deleted file mode 100644
index 32c083c7d..000000000
--- a/Godeps/_workspace/src/github.com/Shopify/sarama/fetch_request_test.go
+++ /dev/null
@@ -1,34 +0,0 @@
-package sarama
-
-import "testing"
-
-var (
-	fetchRequestNoBlocks = []byte{
-		0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-		0x00, 0x00, 0x00, 0x00}
-
-	fetchRequestWithProperties = []byte{
-		0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0xEF,
-		0x00, 0x00, 0x00, 0x00}
-
-	fetchRequestOneBlock = []byte{
-		0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-		0x00, 0x00, 0x00, 0x01,
-		0x00, 0x05, 't', 'o', 'p', 'i', 'c',
-		0x00, 0x00, 0x00, 0x01,
-		0x00, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x34, 0x00, 0x00, 0x00, 0x56}
-)
-
-func TestFetchRequest(t *testing.T) {
-	request := new(FetchRequest)
-	testRequest(t, "no blocks", request, fetchRequestNoBlocks)
-
-	request.MaxWaitTime = 0x20
-	request.MinBytes = 0xEF
-	testRequest(t, "with properties", request, fetchRequestWithProperties)
-
-	request.MaxWaitTime = 0
-	request.MinBytes = 0
-	request.AddBlock("topic", 0x12, 0x34, 0x56)
-	testRequest(t, "one block", request, fetchRequestOneBlock)
-}
diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/fetch_response.go b/Godeps/_workspace/src/github.com/Shopify/sarama/fetch_response.go
deleted file mode 100644
index 1ac543921..000000000
--- a/Godeps/_workspace/src/github.com/Shopify/sarama/fetch_response.go
+++ /dev/null
@@ -1,173 +0,0 @@
-package sarama
-
-type FetchResponseBlock struct {
-	Err                 KError
-	HighWaterMarkOffset int64
-	MsgSet              MessageSet
-}
-
-func (pr *FetchResponseBlock) decode(pd packetDecoder) (err error) {
-	tmp, err := pd.getInt16()
-	if err != nil {
-		return err
-	}
-	pr.Err = KError(tmp)
-
-	pr.HighWaterMarkOffset, err = pd.getInt64()
-	if err != nil {
-		return err
-	}
-
-	msgSetSize, err := pd.getInt32()
-	if err != nil {
-		return err
-	}
-
-	msgSetDecoder, err := pd.getSubset(int(msgSetSize))
-	if err != nil {
-		return err
-	}
-	err = (&pr.MsgSet).decode(msgSetDecoder)
-
-	return err
-}
-
-type FetchResponse struct {
-	Blocks map[string]map[int32]*FetchResponseBlock
-}
-
-func (pr *FetchResponseBlock) encode(pe packetEncoder) (err error) {
-	pe.putInt16(int16(pr.Err))
-
-	pe.putInt64(pr.HighWaterMarkOffset)
-
-	pe.push(&lengthField{})
-	err = pr.MsgSet.encode(pe)
-	if err != nil {
-		return err
-	}
-	return pe.pop()
-}
-
-func (fr *FetchResponse) decode(pd packetDecoder) (err error) {
-	numTopics, err := pd.getArrayLength()
-	if err != nil {
-		return err
-	}
-
-	fr.Blocks = make(map[string]map[int32]*FetchResponseBlock, numTopics)
-	for i := 0; i < numTopics; i++ {
-		name, err := pd.getString()
-		if err != nil {
-			return err
-		}
-
-		numBlocks, err := pd.getArrayLength()
-		if err != nil {
-			return err
-		}
-
-		fr.Blocks[name] = make(map[int32]*FetchResponseBlock, numBlocks)
-
-		for j := 0; j < numBlocks; j++ {
-			id, err := pd.getInt32()
-			if err != nil {
-				return err
-			}
-
-			block := new(FetchResponseBlock)
-			err = block.decode(pd)
-			if err != nil {
-				return err
-			}
-			fr.Blocks[name][id] = block
-		}
-	}
-
-	return nil
-}
-
-func (fr *FetchResponse) encode(pe packetEncoder) (err error) {
-	err = pe.putArrayLength(len(fr.Blocks))
-	if err != nil {
-		return err
-	}
-
-	for topic, partitions := range fr.Blocks {
-		err = pe.putString(topic)
-		if err != nil {
-			return err
-		}
-
-		err = pe.putArrayLength(len(partitions))
-		if err != nil {
-			return err
-		}
-
-		for id, block := range partitions {
-			pe.putInt32(id)
-			err = block.encode(pe)
-			if err != nil {
-				return err
-			}
-		}
-
-	}
-	return nil
-}
-
-func (fr *FetchResponse) GetBlock(topic string, partition int32) *FetchResponseBlock {
-	if fr.Blocks == nil {
-		return nil
-	}
-
-	if fr.Blocks[topic] == nil {
-		return nil
-	}
-
-	return fr.Blocks[topic][partition]
-}
-
-func (fr *FetchResponse) AddError(topic string, partition int32, err KError) {
-	if fr.Blocks == nil {
-		fr.Blocks = make(map[string]map[int32]*FetchResponseBlock)
-	}
-	partitions, ok := fr.Blocks[topic]
-	if !ok {
-		partitions = make(map[int32]*FetchResponseBlock)
-		fr.Blocks[topic] = partitions
-	}
-	frb, ok := partitions[partition]
-	if !ok {
-		frb = new(FetchResponseBlock)
-		partitions[partition] = frb
-	}
-	frb.Err = err
-}
-
-func (fr *FetchResponse) AddMessage(topic string, partition int32, key, value Encoder, offset int64) {
-	if fr.Blocks == nil {
-		fr.Blocks = make(map[string]map[int32]*FetchResponseBlock)
-	}
-	partitions, ok := fr.Blocks[topic]
-	if !ok {
-		partitions = make(map[int32]*FetchResponseBlock)
-		fr.Blocks[topic] = partitions
-	}
-	frb, ok := partitions[partition]
-	if !ok {
-		frb = new(FetchResponseBlock)
-		partitions[partition] = frb
-	}
-	var kb []byte
-	var vb []byte
-	if key != nil {
-		kb, _ = key.Encode()
-	}
-	if value != nil {
-		vb, _ = value.Encode()
-	}
-	msg := &Message{Key: kb, Value: vb}
-	msgBlock := &MessageBlock{Msg: msg, Offset: offset}
-	frb.MsgSet.Messages = append(frb.MsgSet.Messages, msgBlock)
-}
diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/fetch_response_test.go b/Godeps/_workspace/src/github.com/Shopify/sarama/fetch_response_test.go
deleted file mode 100644
index a23a05340..000000000
--- a/Godeps/_workspace/src/github.com/Shopify/sarama/fetch_response_test.go
+++ /dev/null
@@ -1,84 +0,0 @@
-package sarama
-
-import (
-	"bytes"
-	"testing"
-)
-
-var (
-	emptyFetchResponse = []byte{
-		0x00, 0x00, 0x00, 0x00}
-
-	oneMessageFetchResponse = []byte{
-		0x00, 0x00, 0x00, 0x01,
-		0x00, 0x05, 't', 'o', 'p', 'i', 'c',
-		0x00, 0x00, 0x00, 0x01,
-		0x00, 0x00, 0x00, 0x05,
-		0x00, 0x01,
-		0x00, 0x00, 0x00, 0x00, 0x10, 0x10, 0x10, 0x10,
-		0x00, 0x00, 0x00, 0x1C,
-		// messageSet
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0x00, 0x00,
-		0x00, 0x00, 0x00, 0x10,
-		// message
-		0x23, 0x96, 0x4a, 0xf7, // CRC
-		0x00,
-		0x00,
-		0xFF, 0xFF, 0xFF, 0xFF,
-		0x00, 0x00, 0x00, 0x02, 0x00, 0xEE}
-)
-
-func TestEmptyFetchResponse(t *testing.T) {
-	response := FetchResponse{}
-	testDecodable(t, "empty", &response, emptyFetchResponse)
-
-	if len(response.Blocks) != 0 {
-		t.Error("Decoding produced topic blocks where there were none.")
-	}
-
-}
-
-func TestOneMessageFetchResponse(t *testing.T) {
-	response := FetchResponse{}
-	testDecodable(t, "one message", &response, oneMessageFetchResponse)
-
-	if len(response.Blocks) != 1 {
-		t.Fatal("Decoding produced incorrect number of topic blocks.")
-	}
-
-	if len(response.Blocks["topic"]) != 1 {
-		t.Fatal("Decoding produced incorrect number of partition blocks for topic.")
-	}
-
-	block := response.GetBlock("topic", 5)
-	if block == nil {
-		t.Fatal("GetBlock didn't return block.")
-	}
-	if block.Err != ErrOffsetOutOfRange {
-		t.Error("Decoding didn't produce correct error code.")
-	}
-	if block.HighWaterMarkOffset != 0x10101010 {
-		t.Error("Decoding didn't produce correct high water mark offset.")
-	}
-	if block.MsgSet.PartialTrailingMessage {
-		t.Error("Decoding detected a partial trailing message where there wasn't one.")
-	}
-
-	if len(block.MsgSet.Messages) != 1 {
-		t.Fatal("Decoding produced incorrect number of messages.")
-	}
-	msgBlock := block.MsgSet.Messages[0]
-	if msgBlock.Offset != 0x550000 {
-		t.Error("Decoding produced incorrect message offset.")
-	}
-	msg := msgBlock.Msg
-	if msg.Codec != CompressionNone {
-		t.Error("Decoding produced incorrect message compression.")
-	}
-	if msg.Key != nil {
-		t.Error("Decoding produced message key where there was none.")
-	}
-	if !bytes.Equal(msg.Value, []byte{0x00, 0xEE}) {
-		t.Error("Decoding produced incorrect message value.")
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/functional_client_test.go b/Godeps/_workspace/src/github.com/Shopify/sarama/functional_client_test.go
deleted file mode 100644
index 9e8e32968..000000000
--- a/Godeps/_workspace/src/github.com/Shopify/sarama/functional_client_test.go
+++ /dev/null
@@ -1,90 +0,0 @@
-package sarama
-
-import (
-	"fmt"
-	"testing"
-	"time"
-)
-
-func TestFuncConnectionFailure(t *testing.T) {
-	setupFunctionalTest(t)
-	defer teardownFunctionalTest(t)
-
-	Proxies["kafka1"].Enabled = false
-	SaveProxy(t, "kafka1")
-
-	config := NewConfig()
-	config.Metadata.Retry.Max = 1
-
-	_, err := NewClient([]string{kafkaBrokers[0]}, config)
-	if err != ErrOutOfBrokers {
-		t.Fatal("Expected returned error to be ErrOutOfBrokers, but was: ", err)
-	}
-}
-
-func TestFuncClientMetadata(t *testing.T) {
-	setupFunctionalTest(t)
-	defer teardownFunctionalTest(t)
-
-	config := NewConfig()
-	config.Metadata.Retry.Max = 1
-	config.Metadata.Retry.Backoff = 10 * time.Millisecond
-	client, err := NewClient(kafkaBrokers, config)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if err := client.RefreshMetadata("unknown_topic"); err != ErrUnknownTopicOrPartition {
-		t.Error("Expected ErrUnknownTopicOrPartition, got", err)
-	}
-
-	if _, err := client.Leader("unknown_topic", 0); err != ErrUnknownTopicOrPartition {
-		t.Error("Expected ErrUnknownTopicOrPartition, got", err)
-	}
-
-	if _, err := client.Replicas("invalid/topic", 0); err != ErrUnknownTopicOrPartition {
-		t.Error("Expected ErrUnknownTopicOrPartition, got", err)
-	}
-
-	partitions, err := client.Partitions("test.4")
-	if err != nil {
-		t.Error(err)
-	}
-	if len(partitions) != 4 {
-		t.Errorf("Expected test.4 topic to have 4 partitions, found %v", partitions)
-	}
-
-	partitions, err = client.Partitions("test.1")
-	if err != nil {
-		t.Error(err)
-	}
-	if len(partitions) != 1 {
-		t.Errorf("Expected test.1 topic to have 1 partitions, found %v", partitions)
-	}
-
-	safeClose(t, client)
-}
-
-func TestFuncClientCoordinator(t *testing.T) {
-	checkKafkaVersion(t, "0.8.2")
-	setupFunctionalTest(t)
-	defer teardownFunctionalTest(t)
-
-	client, err := NewClient(kafkaBrokers, nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	for i := 0; i < 10; i++ {
-		broker, err := client.Coordinator(fmt.Sprintf("another_new_consumer_group_%d", i))
-		if err != nil {
-			t.Error(err)
-		}
-
-		if connected, err := broker.Connected(); !connected || err != nil {
-			t.Errorf("Expected to coordinator %s broker to be properly connected.", broker.Addr())
-		}
-	}
-
-	safeClose(t, client)
-}
diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/functional_consumer_test.go b/Godeps/_workspace/src/github.com/Shopify/sarama/functional_consumer_test.go
deleted file mode 100644
index ab8433109..000000000
--- a/Godeps/_workspace/src/github.com/Shopify/sarama/functional_consumer_test.go
+++ /dev/null
@@ -1,61 +0,0 @@
-package sarama
-
-import (
-	"math"
-	"testing"
-)
-
-func TestFuncConsumerOffsetOutOfRange(t *testing.T) {
-	setupFunctionalTest(t)
-	defer teardownFunctionalTest(t)
-
-	consumer, err := NewConsumer(kafkaBrokers, nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if _, err := consumer.ConsumePartition("test.1", 0, -10); err != ErrOffsetOutOfRange {
-		t.Error("Expected ErrOffsetOutOfRange, got:", err)
-	}
-
-	if _, err := consumer.ConsumePartition("test.1", 0, math.MaxInt64); err != ErrOffsetOutOfRange {
-		t.Error("Expected ErrOffsetOutOfRange, got:", err)
-	}
-
-	safeClose(t, consumer)
-}
-
-func TestConsumerHighWaterMarkOffset(t *testing.T) {
-	setupFunctionalTest(t)
-	defer teardownFunctionalTest(t)
-
-	p, err := NewSyncProducer(kafkaBrokers, nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer safeClose(t, p)
-
-	_, offset, err := p.SendMessage(&ProducerMessage{Topic: "test.1", Value: StringEncoder("Test")})
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	c, err := NewConsumer(kafkaBrokers, nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer safeClose(t, c)
-
-	pc, err := c.ConsumePartition("test.1", 0, OffsetOldest)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	<-pc.Messages()
-
-	if hwmo := pc.HighWaterMarkOffset(); hwmo != offset+1 {
-		t.Logf("Last produced offset %d; high water mark should be one higher but found %d.", offset, hwmo)
-	}
-
-	safeClose(t, pc)
-}
diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/functional_producer_test.go b/Godeps/_workspace/src/github.com/Shopify/sarama/functional_producer_test.go
deleted file mode 100644
index 1504e7600..000000000
--- a/Godeps/_workspace/src/github.com/Shopify/sarama/functional_producer_test.go
+++ /dev/null
@@ -1,203 +0,0 @@
-package sarama
-
-import (
-	"fmt"
-	"sync"
-	"testing"
-	"time"
-)
-
-const TestBatchSize = 1000
-
-func TestFuncProducing(t *testing.T) {
-	config := NewConfig()
-	testProducingMessages(t, config)
-}
-
-func TestFuncProducingGzip(t *testing.T) {
-	config := NewConfig()
-	config.Producer.Compression = CompressionGZIP
-	testProducingMessages(t, config)
-}
-
-func TestFuncProducingSnappy(t *testing.T) {
-	config := NewConfig()
-	config.Producer.Compression = CompressionSnappy
-	testProducingMessages(t, config)
-}
-
-func TestFuncProducingNoResponse(t *testing.T) {
-	config := NewConfig()
-	config.Producer.RequiredAcks = NoResponse
-	testProducingMessages(t, config)
-}
-
-func TestFuncProducingFlushing(t *testing.T) {
-	config := NewConfig()
-	config.Producer.Flush.Messages = TestBatchSize / 8
-	config.Producer.Flush.Frequency = 250 * time.Millisecond
-	testProducingMessages(t, config)
-}
-
-func TestFuncMultiPartitionProduce(t *testing.T) {
-	setupFunctionalTest(t)
-	defer teardownFunctionalTest(t)
-
-	config := NewConfig()
-	config.ChannelBufferSize = 20
-	config.Producer.Flush.Frequency = 50 * time.Millisecond
-	config.Producer.Flush.Messages = 200
-	config.Producer.Return.Successes = true
-	producer, err := NewSyncProducer(kafkaBrokers, config)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	var wg sync.WaitGroup
-	wg.Add(TestBatchSize)
-
-	for i := 1; i <= TestBatchSize; i++ {
-		go func(i int) {
-			defer wg.Done()
-			msg := &ProducerMessage{Topic: "test.64", Key: nil, Value: StringEncoder(fmt.Sprintf("hur %d", i))}
-			if _, _, err := producer.SendMessage(msg); err != nil {
-				t.Error(i, err)
-			}
-		}(i)
-	}
-
-	wg.Wait()
-	if err := producer.Close(); err != nil {
-		t.Error(err)
-	}
-}
-
-func TestFuncProducingToInvalidTopic(t *testing.T) {
-	setupFunctionalTest(t)
-	defer teardownFunctionalTest(t)
-
-	producer, err := NewSyncProducer(kafkaBrokers, nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if _, _, err := producer.SendMessage(&ProducerMessage{Topic: "in/valid"}); err != ErrUnknownTopicOrPartition {
-		t.Error("Expected ErrUnknownTopicOrPartition, found", err)
-	}
-
-	if _, _, err := producer.SendMessage(&ProducerMessage{Topic: "in/valid"}); err != ErrUnknownTopicOrPartition {
-		t.Error("Expected ErrUnknownTopicOrPartition, found", err)
-	}
-
-	safeClose(t, producer)
-}
-
-func testProducingMessages(t *testing.T, config *Config) {
-	setupFunctionalTest(t)
-	defer teardownFunctionalTest(t)
-
-	config.Producer.Return.Successes = true
-	config.Consumer.Return.Errors = true
-
-	client, err := NewClient(kafkaBrokers, config)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	master, err := NewConsumerFromClient(client)
-	if err != nil {
-		t.Fatal(err)
-	}
-	consumer, err := master.ConsumePartition("test.1", 0, OffsetNewest)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	producer, err := NewAsyncProducerFromClient(client)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	expectedResponses := TestBatchSize
-	for i := 1; i <= TestBatchSize; {
-		msg := &ProducerMessage{Topic: "test.1", Key: nil, Value: StringEncoder(fmt.Sprintf("testing %d", i))}
-		select {
-		case producer.Input() <- msg:
-			i++
-		case ret := <-producer.Errors():
-			t.Fatal(ret.Err)
-		case <-producer.Successes():
-			expectedResponses--
-		}
-	}
-	for expectedResponses > 0 {
-		select {
-		case ret := <-producer.Errors():
-			t.Fatal(ret.Err)
-		case <-producer.Successes():
-			expectedResponses--
-		}
-	}
-	safeClose(t, producer)
-
-	for i := 1; i <= TestBatchSize; i++ {
-		select {
-		case <-time.After(10 * time.Second):
-			t.Fatal("Not received any more events in the last 10 seconds.")
-
-		case err := <-consumer.Errors():
-			t.Error(err)
-
-		case message := <-consumer.Messages():
-			if string(message.Value) != fmt.Sprintf("testing %d", i) {
-				t.Fatalf("Unexpected message with index %d: %s", i, message.Value)
-			}
-		}
-
-	}
-	safeClose(t, consumer)
-	safeClose(t, client)
-}
-
-// Benchmarks
-
-func BenchmarkProducerSmall(b *testing.B) {
-	benchmarkProducer(b, nil, "test.64", ByteEncoder(make([]byte, 128)))
-}
-func BenchmarkProducerMedium(b *testing.B) {
-	benchmarkProducer(b, nil, "test.64", ByteEncoder(make([]byte, 1024)))
-}
-func BenchmarkProducerLarge(b *testing.B) {
-	benchmarkProducer(b, nil, "test.64", ByteEncoder(make([]byte, 8192)))
-}
-func BenchmarkProducerSmallSinglePartition(b *testing.B) {
-	benchmarkProducer(b, nil, "test.1", ByteEncoder(make([]byte, 128)))
-}
-func BenchmarkProducerMediumSnappy(b *testing.B) {
-	conf := NewConfig()
-	conf.Producer.Compression = CompressionSnappy
-	benchmarkProducer(b, conf, "test.1", ByteEncoder(make([]byte, 1024)))
-}
-
-func benchmarkProducer(b *testing.B, conf *Config, topic string, value Encoder) {
-	setupFunctionalTest(b)
-	defer teardownFunctionalTest(b)
-
-	producer, err := NewAsyncProducer(kafkaBrokers, conf)
-	if err != nil {
-		b.Fatal(err)
-	}
-
-	b.ResetTimer()
-
-	for i := 1; i <= b.N; {
-		msg := &ProducerMessage{Topic: topic, Key: StringEncoder(fmt.Sprintf("%d", i)), Value: value}
-		select {
-		case producer.Input() <- msg:
-			i++
-		case ret := <-producer.Errors():
-			b.Fatal(ret.Err)
-		}
-	}
-	safeClose(b, producer)
-}
diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/functional_test.go b/Godeps/_workspace/src/github.com/Shopify/sarama/functional_test.go
deleted file mode 100644
index 171002ee9..000000000
--- a/Godeps/_workspace/src/github.com/Shopify/sarama/functional_test.go
+++ /dev/null
@@ -1,146 +0,0 @@
-package sarama
-
-import (
-	"log"
-	"math/rand"
-	"net"
-	"os"
-	"strconv"
-	"strings"
-	"testing"
-	"time"
-
-	toxiproxy "github.com/Shopify/toxiproxy/client"
-)
-
-const (
-	VagrantToxiproxy      = "http://192.168.100.67:8474"
-	VagrantKafkaPeers     = "192.168.100.67:9091,192.168.100.67:9092,192.168.100.67:9093,192.168.100.67:9094,192.168.100.67:9095"
-	VagrantZookeeperPeers = "192.168.100.67:2181,192.168.100.67:2182,192.168.100.67:2183,192.168.100.67:2184,192.168.100.67:2185"
-)
-
-var (
-	kafkaAvailable, kafkaRequired bool
-	kafkaBrokers                  []string
-
-	proxyClient  *toxiproxy.Client
-	Proxies      map[string]*toxiproxy.Proxy
-	ZKProxies    = []string{"zk1", "zk2", "zk3", "zk4", "zk5"}
-	KafkaProxies = []string{"kafka1", "kafka2", "kafka3", "kafka4", "kafka5"}
-)
-
-func init() {
-	if os.Getenv("DEBUG") == "true" {
-		Logger = log.New(os.Stdout, "[sarama] ", log.LstdFlags)
-	}
-
-	seed := time.Now().UTC().UnixNano()
-	if tmp := os.Getenv("TEST_SEED"); tmp != "" {
-		seed, _ = strconv.ParseInt(tmp, 0, 64)
-	}
-	Logger.Println("Using random seed:", seed)
-	rand.Seed(seed)
-
-	proxyAddr := os.Getenv("TOXIPROXY_ADDR")
-	if proxyAddr == "" {
-		proxyAddr = VagrantToxiproxy
-	}
-	proxyClient = toxiproxy.NewClient(proxyAddr)
-
-	kafkaPeers := os.Getenv("KAFKA_PEERS")
-	if kafkaPeers == "" {
-		kafkaPeers = VagrantKafkaPeers
-	}
-	kafkaBrokers = strings.Split(kafkaPeers, ",")
-
-	if c, err := net.DialTimeout("tcp", kafkaBrokers[0], 5*time.Second); err == nil {
-		if err = c.Close(); err == nil {
-			kafkaAvailable = true
-		}
-	}
-
-	kafkaRequired = os.Getenv("CI") != ""
-}
-
-func checkKafkaAvailability(t testing.TB) {
-	if !kafkaAvailable {
-		if kafkaRequired {
-			t.Fatalf("Kafka broker is not available on %s. Set KAFKA_PEERS to connect to Kafka on a different location.", kafkaBrokers[0])
-		} else {
-			t.Skipf("Kafka broker is not available on %s. Set KAFKA_PEERS to connect to Kafka on a different location.", kafkaBrokers[0])
-		}
-	}
-}
-
-func checkKafkaVersion(t testing.TB, requiredVersion string) {
-	kafkaVersion := os.Getenv("KAFKA_VERSION")
-	if kafkaVersion == "" {
-		t.Logf("No KAFKA_VERSION set. This tests requires Kafka version %s or higher. Continuing...", requiredVersion)
-	} else {
-		available := parseKafkaVersion(kafkaVersion)
-		required := parseKafkaVersion(requiredVersion)
-		if !available.satisfies(required) {
-			t.Skipf("Kafka version %s is required for this test; you have %s. Skipping...", requiredVersion, kafkaVersion)
-		}
-	}
-}
-
-func resetProxies(t testing.TB) {
-	if err := proxyClient.ResetState(); err != nil {
-		t.Error(err)
-	}
-	Proxies = nil
-}
-
-func fetchProxies(t testing.TB) {
-	var err error
-	Proxies, err = proxyClient.Proxies()
-	if err != nil {
-		t.Fatal(err)
-	}
-}
-
-func SaveProxy(t *testing.T, px string) {
-	if err := Proxies[px].Save(); err != nil {
-		t.Fatal(err)
-	}
-}
-
-func setupFunctionalTest(t testing.TB) {
-	checkKafkaAvailability(t)
-	resetProxies(t)
-	fetchProxies(t)
-}
-
-func teardownFunctionalTest(t testing.TB) {
-	resetProxies(t)
-}
-
-type kafkaVersion []int
-
-func (kv kafkaVersion) satisfies(other kafkaVersion) bool {
-	var ov int
-	for index, v := range kv {
-		if len(other) <= index {
-			ov = 0
-		} else {
-			ov = other[index]
-		}
-
-		if v < ov {
-			return false
-		}
-	}
-	return true
-}
-
-func parseKafkaVersion(version string) kafkaVersion {
-	numbers := strings.Split(version, ".")
-	result := make(kafkaVersion, 0, len(numbers))
-	for _, number := range numbers {
-		nr, _ := strconv.Atoi(number)
-		result = append(result, nr)
-	}
-
-	return result
-}
diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/length_field.go b/Godeps/_workspace/src/github.com/Shopify/sarama/length_field.go
deleted file mode 100644
index 70078be5d..000000000
--- a/Godeps/_workspace/src/github.com/Shopify/sarama/length_field.go
+++ /dev/null
@@ -1,29 +0,0 @@
-package sarama
-
-import "encoding/binary"
-
-// LengthField implements the PushEncoder and PushDecoder interfaces for calculating 4-byte lengths.
-type lengthField struct {
-	startOffset int
-}
-
-func (l *lengthField) saveOffset(in int) {
-	l.startOffset = in
-}
-
-func (l *lengthField) reserveLength() int {
-	return 4
-}
-
-func (l *lengthField) run(curOffset int, buf []byte) error {
-	binary.BigEndian.PutUint32(buf[l.startOffset:], uint32(curOffset-l.startOffset-4))
-	return nil
-}
-
-func (l *lengthField) check(curOffset int, buf []byte) error {
-	if uint32(curOffset-l.startOffset-4) != binary.BigEndian.Uint32(buf[l.startOffset:]) {
-		return PacketDecodingError{"length field invalid"}
-	}
-
-	return nil
-}
diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/message.go b/Godeps/_workspace/src/github.com/Shopify/sarama/message.go
deleted file mode 100644
index 49b19c5a6..000000000
--- a/Godeps/_workspace/src/github.com/Shopify/sarama/message.go
+++ /dev/null
@@ -1,154 +0,0 @@
-package sarama
-
-import (
-	"bytes"
-	"compress/gzip"
-	"fmt"
-	"io/ioutil"
-)
-
-// CompressionCodec represents the various compression codecs recognized by Kafka in messages.
-type CompressionCodec int8
-
-// only the last two bits are really used
-const compressionCodecMask int8 = 0x03
-
-const (
-	CompressionNone   CompressionCodec = 0
-	CompressionGZIP   CompressionCodec = 1
-	CompressionSnappy CompressionCodec = 2
-)
-
-// The spec just says: "This is a version id used to allow backwards compatible evolution of the message
-// binary format." but it doesn't say what the current value is, so presumably 0...
-const messageFormat int8 = 0
-
-type Message struct {
-	Codec CompressionCodec // codec used to compress the message contents
-	Key   []byte           // the message key, may be nil
-	Value []byte           // the message contents
-	Set   *MessageSet      // the message set a message might wrap
-
-	compressedCache []byte
-}
-
-func (m *Message) encode(pe packetEncoder) error {
-	pe.push(&crc32Field{})
-
-	pe.putInt8(messageFormat)
-
-	attributes := int8(m.Codec) & compressionCodecMask
-	pe.putInt8(attributes)
-
-	err := pe.putBytes(m.Key)
-	if err != nil {
-		return err
-	}
-
-	var payload []byte
-
-	if m.compressedCache != nil {
-		payload = m.compressedCache
-		m.compressedCache = nil
-	} else {
-		switch m.Codec {
-		case CompressionNone:
-			payload = m.Value
-		case CompressionGZIP:
-			var buf bytes.Buffer
-			writer := gzip.NewWriter(&buf)
-			if _, err = writer.Write(m.Value); err != nil {
-				return err
-			}
-			if err = writer.Close(); err != nil {
-				return err
-			}
-			m.compressedCache = buf.Bytes()
-			payload = m.compressedCache
-		case CompressionSnappy:
-			tmp := snappyEncode(m.Value)
-			m.compressedCache = tmp
-			payload = m.compressedCache
-		default:
-			return PacketEncodingError{fmt.Sprintf("unsupported compression codec (%d)", m.Codec)}
-		}
-	}
-
-	if err = pe.putBytes(payload); err != nil {
-		return err
-	}
-
-	return pe.pop()
-}
-
-func (m *Message) decode(pd packetDecoder) (err error) {
-	err = pd.push(&crc32Field{})
-	if err != nil {
-		return err
-	}
-
-	format, err := pd.getInt8()
-	if err != nil {
-		return err
-	}
-	if format != messageFormat {
-		return PacketDecodingError{"unexpected messageFormat"}
-	}
-
-	attribute, err := pd.getInt8()
-	if err != nil {
-		return err
-	}
-	m.Codec = CompressionCodec(attribute & compressionCodecMask)
-
-	m.Key, err = pd.getBytes()
-	if err != nil {
-		return err
-	}
-
-	m.Value, err = pd.getBytes()
-	if err != nil {
-		return err
-	}
-
-	switch m.Codec {
-	case CompressionNone:
-		// nothing to do
-	case CompressionGZIP:
-		if m.Value == nil {
-			return PacketDecodingError{"GZIP compression specified, but no data to uncompress"}
-		}
-		reader, err := gzip.NewReader(bytes.NewReader(m.Value))
-		if err != nil {
-			return err
-		}
-		if m.Value, err = ioutil.ReadAll(reader); err != nil {
-			return err
-		}
-		return m.decodeSet()
-	case CompressionSnappy:
-		if m.Value == nil {
-			return PacketDecodingError{"Snappy compression specified, but no data to uncompress"}
-		}
-		if m.Value, err = snappyDecode(m.Value); err != nil {
-			return err
-		}
-		return m.decodeSet()
-	default:
-		return PacketDecodingError{fmt.Sprintf("invalid compression specified (%d)", m.Codec)}
-	}
-
-	err = pd.pop()
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-// decodes a message set from a previousy encoded bulk-message
-func (m *Message) decodeSet() (err error) {
-	pd := realDecoder{raw: m.Value}
-	m.Set = &MessageSet{}
-	return m.Set.decode(&pd)
-}
diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/message_set.go b/Godeps/_workspace/src/github.com/Shopify/sarama/message_set.go
deleted file mode 100644
index f028784e5..000000000
--- a/Godeps/_workspace/src/github.com/Shopify/sarama/message_set.go
+++ /dev/null
@@ -1,89 +0,0 @@
-package sarama
-
-type MessageBlock struct {
-	Offset int64
-	Msg    *Message
-}
-
-// Messages convenience helper which returns either all the
-// messages that are wrapped in this block
-func (msb *MessageBlock) Messages() []*MessageBlock {
-	if msb.Msg.Set != nil {
-		return msb.Msg.Set.Messages
-	}
-	return []*MessageBlock{msb}
-}
-
-func (msb *MessageBlock) encode(pe packetEncoder) error {
-	pe.putInt64(msb.Offset)
-	pe.push(&lengthField{})
-	err := msb.Msg.encode(pe)
-	if err != nil {
-		return err
-	}
-	return pe.pop()
-}
-
-func (msb *MessageBlock) decode(pd packetDecoder) (err error) {
-	if msb.Offset, err = pd.getInt64(); err != nil {
-		return err
-	}
-
-	if err = pd.push(&lengthField{}); err != nil {
-		return err
-	}
-
-	msb.Msg = new(Message)
-	if err = msb.Msg.decode(pd); err != nil {
-		return err
-	}
-
-	if err = pd.pop(); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-type MessageSet struct {
-	PartialTrailingMessage bool // whether the set on the wire contained an incomplete trailing MessageBlock
-	Messages               []*MessageBlock
-}
-
-func (ms *MessageSet) encode(pe packetEncoder) error {
-	for i := range ms.Messages {
-		err := ms.Messages[i].encode(pe)
-		if err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func (ms *MessageSet) decode(pd packetDecoder) (err error) {
-	ms.Messages = nil
-
-	for pd.remaining() > 0 {
-		msb := new(MessageBlock)
-		err = msb.decode(pd)
-		switch err {
-		case nil:
-			ms.Messages = append(ms.Messages, msb)
-		case ErrInsufficientData:
-			// As an optimization the server is allowed to return a partial message at the
-			// end of the message set. Clients should handle this case. So we just ignore such things.
-			ms.PartialTrailingMessage = true
-			return nil
-		default:
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (ms *MessageSet) addMessage(msg *Message) {
-	block := new(MessageBlock)
-	block.Msg = msg
-	ms.Messages = append(ms.Messages, block)
-}
diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/message_test.go b/Godeps/_workspace/src/github.com/Shopify/sarama/message_test.go
deleted file mode 100644
index 1dae896fe..000000000
--- a/Godeps/_workspace/src/github.com/Shopify/sarama/message_test.go
+++ /dev/null
@@ -1,113 +0,0 @@
-package sarama
-
-import "testing"
-
-var (
-	emptyMessage = []byte{
-		167, 236, 104, 3, // CRC
-		0x00,                   // magic version byte
-		0x00,                   // attribute flags
-		0xFF, 0xFF, 0xFF, 0xFF, // key
-		0xFF, 0xFF, 0xFF, 0xFF} // value
-
-	emptyGzipMessage = []byte{
-		97, 79, 149, 90, //CRC
-		0x00,                   // magic version byte
-		0x01,                   // attribute flags
-		0xFF, 0xFF, 0xFF, 0xFF, // key
-		// value
-		0x00, 0x00, 0x00, 0x17,
-		0x1f, 0x8b,
-		0x08,
-		0, 0, 9, 110, 136, 0, 255, 1, 0, 0, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0}
-
-	emptyBulkSnappyMessage = []byte{
-		180, 47, 53, 209, //CRC
-		0x00,                   // magic version byte
-		0x02,                   // attribute flags
-		0xFF, 0xFF, 0xFF, 0xFF, // key
-		0, 0, 0, 42,
-		130, 83, 78, 65, 80, 80, 89, 0, // SNAPPY magic
-		0, 0, 0, 1, // min version
-		0, 0, 0, 1, // default version
-		0, 0, 0, 22, 52, 0, 0, 25, 1, 16, 14, 227, 138, 104, 118, 25, 15, 13, 1, 8, 1, 0, 0, 62, 26, 0}
-
-	emptyBulkGzipMessage = []byte{
-		139, 160, 63, 141, //CRC
-		0x00,                   // magic version byte
-		0x01,                   // attribute flags
-		0xFF, 0xFF, 0xFF, 0xFF, // key
-		0x00, 0x00, 0x00, 0x27, // len
-		0x1f, 0x8b, // Gzip Magic
-		0x08, // deflate compressed
-		0, 0, 0, 0, 0, 0, 0, 99, 96, 128, 3, 190, 202, 112, 143, 7, 12, 12, 255, 129, 0, 33, 200, 192, 136, 41, 3, 0, 199, 226, 155, 70, 52, 0, 0, 0}
-)
-
-func TestMessageEncoding(t *testing.T) {
-	message := Message{}
-	testEncodable(t, "empty", &message, emptyMessage)
-
-	message.Value = []byte{}
-	message.Codec = CompressionGZIP
-	testEncodable(t, "empty gzip", &message, emptyGzipMessage)
-}
-
-func TestMessageDecoding(t *testing.T) {
-	message := Message{}
-	testDecodable(t, "empty", &message, emptyMessage)
-	if message.Codec != CompressionNone {
-		t.Error("Decoding produced compression codec where there was none.")
-	}
-	if message.Key != nil {
-		t.Error("Decoding produced key where there was none.")
-	}
-	if message.Value != nil {
-		t.Error("Decoding produced value where there was none.")
-	}
-	if message.Set != nil {
-		t.Error("Decoding produced set where there was none.")
-	}
-
-	testDecodable(t, "empty gzip", &message, emptyGzipMessage)
-	if message.Codec != CompressionGZIP {
-		t.Error("Decoding produced incorrect compression codec (was gzip).")
-	}
-	if message.Key != nil {
-		t.Error("Decoding produced key where there was none.")
-	}
-	if message.Value == nil || len(message.Value) != 0 {
-		t.Error("Decoding produced nil or content-ful value where there was an empty array.")
-	}
-}
-
-func TestMessageDecodingBulkSnappy(t *testing.T) {
-	message := Message{}
-	testDecodable(t, "bulk snappy", &message, emptyBulkSnappyMessage)
-	if message.Codec != CompressionSnappy {
-		t.Errorf("Decoding produced codec %d, but expected %d.", message.Codec, CompressionSnappy)
-	}
-	if message.Key != nil {
-		t.Errorf("Decoding produced key %+v, but none was expected.", message.Key)
-	}
-	if message.Set == nil {
-		t.Error("Decoding produced no set, but one was expected.")
-	} else if len(message.Set.Messages) != 2 {
-		t.Errorf("Decoding produced a set with %d messages, but 2 were expected.", len(message.Set.Messages))
-	}
-}
-
-func TestMessageDecodingBulkGzip(t *testing.T) {
-	message := Message{}
-	testDecodable(t, "bulk gzip", &message, emptyBulkGzipMessage)
-	if message.Codec != CompressionGZIP {
-		t.Errorf("Decoding produced codec %d, but expected %d.", message.Codec, CompressionGZIP)
-	}
-	if message.Key != nil {
-		t.Errorf("Decoding produced key %+v, but none was expected.", message.Key)
-	}
-	if message.Set == nil {
-		t.Error("Decoding produced no set, but one was expected.")
-	} else if len(message.Set.Messages) != 2 {
-		t.Errorf("Decoding produced a set with %d messages, but 2 were expected.", len(message.Set.Messages))
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/metadata_request.go b/Godeps/_workspace/src/github.com/Shopify/sarama/metadata_request.go
deleted file mode 100644
index 130cfd4f1..000000000
--- a/Godeps/_workspace/src/github.com/Shopify/sarama/metadata_request.go
+++ /dev/null
@@ -1,48 +0,0 @@
-package sarama
-
-type MetadataRequest struct {
-	Topics []string
-}
-
-func (mr *MetadataRequest) encode(pe packetEncoder) error {
-	err := pe.putArrayLength(len(mr.Topics))
-	if err != nil {
-		return err
-	}
-
-	for i := range mr.Topics {
-		err = pe.putString(mr.Topics[i])
-		if err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func (mr *MetadataRequest) decode(pd packetDecoder) error {
-	topicCount, err := pd.getArrayLength()
-	if err != nil {
-		return err
-	}
-	if topicCount == 0 {
-		return nil
-	}
-
-	mr.Topics = make([]string, topicCount)
-	for i := range mr.Topics {
-		topic, err := pd.getString()
-		if err != nil {
-			return err
-		}
-		mr.Topics[i] = topic
-	}
-	return nil
-}
-
-func (mr *MetadataRequest) key() int16 {
-	return 3
-}
-
-func (mr *MetadataRequest) version() int16 {
-	return 0
-}
diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/metadata_request_test.go b/Godeps/_workspace/src/github.com/Shopify/sarama/metadata_request_test.go
deleted file mode 100644
index 44f3146e4..000000000
--- a/Godeps/_workspace/src/github.com/Shopify/sarama/metadata_request_test.go
+++ /dev/null
@@ -1,29 +0,0 @@
-package sarama
-
-import "testing"
-
-var (
-	metadataRequestNoTopics = []byte{
-		0x00, 0x00, 0x00, 0x00}
-
-	metadataRequestOneTopic = []byte{
-		0x00, 0x00, 0x00, 0x01,
-		0x00, 0x06, 't', 'o', 'p', 'i', 'c', '1'}
-
-	metadataRequestThreeTopics = []byte{
-		0x00, 0x00, 0x00, 0x03,
-		0x00, 0x03, 'f', 'o', 'o',
-		0x00, 0x03, 'b', 'a', 'r',
-		0x00, 0x03, 'b', 'a', 'z'}
-)
-
-func TestMetadataRequest(t *testing.T) {
-	request := new(MetadataRequest)
-	testRequest(t, "no topics", request, metadataRequestNoTopics)
-
-	request.Topics = []string{"topic1"}
-	testRequest(t, "one topic", request, metadataRequestOneTopic)
-
-	request.Topics = []string{"foo", "bar", "baz"}
-	testRequest(t, "three topics", request, metadataRequestThreeTopics)
-}
diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/metadata_response.go b/Godeps/_workspace/src/github.com/Shopify/sarama/metadata_response.go
deleted file mode 100644
index b82221f7e..000000000
--- a/Godeps/_workspace/src/github.com/Shopify/sarama/metadata_response.go
+++ /dev/null
@@ -1,227 +0,0 @@
-package sarama
-
-type PartitionMetadata struct {
-	Err      KError
-	ID       int32
-	Leader   int32
-	Replicas []int32
-	Isr      []int32
-}
-
-func (pm *PartitionMetadata) decode(pd packetDecoder) (err error) {
-	tmp, err := pd.getInt16()
-	if err != nil {
-		return err
-	}
-	pm.Err = KError(tmp)
-
-	pm.ID, err = pd.getInt32()
-	if err != nil {
-		return err
-	}
-
-	pm.Leader, err = pd.getInt32()
-	if err != nil {
-		return err
-	}
-
-	pm.Replicas, err = pd.getInt32Array()
-	if err != nil {
-		return err
-	}
-
-	pm.Isr, err = pd.getInt32Array()
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (pm *PartitionMetadata) encode(pe packetEncoder) (err error) {
-	pe.putInt16(int16(pm.Err))
-	pe.putInt32(pm.ID)
-	pe.putInt32(pm.Leader)
-
-	err = pe.putInt32Array(pm.Replicas)
-	if err != nil {
-		return err
-	}
-
-	err = pe.putInt32Array(pm.Isr)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-type TopicMetadata struct {
-	Err        KError
-	Name       string
-	Partitions []*PartitionMetadata
-}
-
-func (tm *TopicMetadata) decode(pd packetDecoder) (err error) {
-	tmp, err := pd.getInt16()
-	if err != nil {
-		return err
-	}
-	tm.Err = KError(tmp)
-
-	tm.Name, err = pd.getString()
-	if err != nil {
-		return err
-	}
-
-	n, err := pd.getArrayLength()
-	if err != nil {
-		return err
-	}
-	tm.Partitions = make([]*PartitionMetadata, n)
-	for i := 0; i < n; i++ {
-		tm.Partitions[i] = new(PartitionMetadata)
-		err = tm.Partitions[i].decode(pd)
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (tm *TopicMetadata) encode(pe packetEncoder) (err error) {
-	pe.putInt16(int16(tm.Err))
-
-	err = pe.putString(tm.Name)
-	if err != nil {
-		return err
-	}
-
-	err = pe.putArrayLength(len(tm.Partitions))
-	if err != nil {
-		return err
-	}
-
-	for _, pm := range tm.Partitions {
-		err = pm.encode(pe)
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-type MetadataResponse struct {
-	Brokers []*Broker
-	Topics  []*TopicMetadata
-}
-
-func (m *MetadataResponse) decode(pd packetDecoder) (err error) {
-	n, err := pd.getArrayLength()
-	if err != nil {
-		return err
-	}
-
-	m.Brokers = make([]*Broker, n)
-	for i := 0; i < n; i++ {
-		m.Brokers[i] = new(Broker)
-		err = m.Brokers[i].decode(pd)
-		if err != nil {
-			return err
-		}
-	}
-
-	n, err = pd.getArrayLength()
-	if err != nil {
-		return err
-	}
-
-	m.Topics = make([]*TopicMetadata, n)
-	for i := 0; i < n; i++ {
-		m.Topics[i] = new(TopicMetadata)
-		err = m.Topics[i].decode(pd)
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (m *MetadataResponse) encode(pe packetEncoder) error {
-	err := pe.putArrayLength(len(m.Brokers))
-	if err != nil {
-		return err
-	}
-	for _, broker := range m.Brokers {
-		err = broker.encode(pe)
-		if err != nil {
-			return err
-		}
-	}
-
-	err = pe.putArrayLength(len(m.Topics))
-	if err != nil {
-		return err
-	}
-	for _, tm := range m.Topics {
-		err = tm.encode(pe)
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-// testing API
-
-func (m *MetadataResponse) AddBroker(addr string, id int32) {
-	m.Brokers = append(m.Brokers, &Broker{id: id, addr: addr})
-}
-
-func (m *MetadataResponse) AddTopic(topic string, err KError) *TopicMetadata {
-	var tmatch *TopicMetadata
-
-	for _, tm := range m.Topics {
-		if tm.Name == topic {
-			tmatch = tm
-			goto foundTopic
-		}
-	}
-
-	tmatch = new(TopicMetadata)
-	tmatch.Name = topic
-	m.Topics = append(m.Topics, tmatch)
-
-foundTopic:
-
-	tmatch.Err = err
-	return tmatch
-}
-
-func (m *MetadataResponse) AddTopicPartition(topic string, partition, brokerID int32, replicas, isr []int32, err KError) {
-	tmatch := m.AddTopic(topic, ErrNoError)
-	var pmatch *PartitionMetadata
-
-	for _, pm := range tmatch.Partitions {
-		if pm.ID == partition {
-			pmatch = pm
-			goto foundPartition
-		}
-	}
-
-	pmatch = new(PartitionMetadata)
-	pmatch.ID = partition
-	tmatch.Partitions = append(tmatch.Partitions, pmatch)
-
-foundPartition:
-
-	pmatch.Leader = brokerID
-	pmatch.Replicas = replicas
-	pmatch.Isr = isr
-	pmatch.Err = err
-
-}
diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/metadata_response_test.go b/Godeps/_workspace/src/github.com/Shopify/sarama/metadata_response_test.go
deleted file mode 100644
index 1f1a51549..000000000
--- a/Godeps/_workspace/src/github.com/Shopify/sarama/metadata_response_test.go
+++ /dev/null
@@ -1,139 +0,0 @@
-package sarama
-
-import "testing"
-
-var (
-	emptyMetadataResponse = []byte{
-		0x00, 0x00, 0x00, 0x00,
-		0x00, 0x00, 0x00, 0x00}
-
-	brokersNoTopicsMetadataResponse = []byte{
-		0x00, 0x00, 0x00, 0x02,
-
-		0x00, 0x00, 0xab, 0xff,
-		0x00, 0x09, 'l', 'o', 'c', 'a', 'l', 'h', 'o', 's', 't',
-		0x00, 0x00, 0x00, 0x33,
-
-		0x00, 0x01, 0x02, 0x03,
-		0x00, 0x0a, 'g', 'o', 'o', 'g', 'l', 'e', '.', 'c', 'o', 'm',
-		0x00, 0x00, 0x01, 0x11,
-
-		0x00, 0x00, 0x00, 0x00}
-
-	topicsNoBrokersMetadataResponse = []byte{
-		0x00, 0x00, 0x00, 0x00,
-		0x00, 0x00, 0x00, 0x02,
-
-		0x00, 0x00,
-		0x00, 0x03, 'f', 'o', 'o',
-		0x00, 0x00, 0x00, 0x01,
-		0x00, 0x04,
-		0x00, 0x00, 0x00, 0x01,
-		0x00, 0x00, 0x00, 0x07,
-		0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x03,
-		0x00, 0x00, 0x00, 0x00,
-
-		0x00, 0x00,
-		0x00, 0x03, 'b', 'a', 'r',
-		0x00, 0x00, 0x00, 0x00}
-)
-
-func TestEmptyMetadataResponse(t *testing.T) {
-	response := MetadataResponse{}
-
-	testDecodable(t, "empty", &response, emptyMetadataResponse)
-	if len(response.Brokers) != 0 {
-		t.Error("Decoding produced", len(response.Brokers), "brokers where there were none!")
-	}
-	if len(response.Topics) != 0 {
-		t.Error("Decoding produced", len(response.Topics), "topics where there were none!")
-	}
-}
-
-func TestMetadataResponseWithBrokers(t *testing.T) {
-	response := MetadataResponse{}
-
-	testDecodable(t, "brokers, no topics", &response, brokersNoTopicsMetadataResponse)
-	if len(response.Brokers) != 2 {
-		t.Fatal("Decoding produced", len(response.Brokers), "brokers where there were two!")
-	}
-
-	if response.Brokers[0].id != 0xabff {
-		t.Error("Decoding produced invalid broker 0 id.")
-	}
-	if response.Brokers[0].addr != "localhost:51" {
-		t.Error("Decoding produced invalid broker 0 address.")
-	}
-	if response.Brokers[1].id != 0x010203 {
-		t.Error("Decoding produced invalid broker 1 id.")
-	}
-	if response.Brokers[1].addr != "google.com:273" {
-		t.Error("Decoding produced invalid broker 1 address.")
-	}
-
-	if len(response.Topics) != 0 {
-		t.Error("Decoding produced", len(response.Topics), "topics where there were none!")
-	}
-}
-
-func TestMetadataResponseWithTopics(t *testing.T) {
-	response := MetadataResponse{}
-
-	testDecodable(t, "topics, no brokers", &response, topicsNoBrokersMetadataResponse)
-	if len(response.Brokers) != 0 {
-		t.Error("Decoding produced", len(response.Brokers), "brokers where there were none!")
-	}
-
-	if len(response.Topics) != 2 {
-		t.Fatal("Decoding produced", len(response.Topics), "topics where there were two!")
-	}
-
-	if response.Topics[0].Err != ErrNoError {
-		t.Error("Decoding produced invalid topic 0 error.")
-	}
-
-	if response.Topics[0].Name != "foo" {
-		t.Error("Decoding produced invalid topic 0 name.")
-	}
-
-	if len(response.Topics[0].Partitions) != 1 {
-		t.Fatal("Decoding produced invalid partition count for topic 0.")
-	}
-
-	if response.Topics[0].Partitions[0].Err != ErrInvalidMessageSize {
-		t.Error("Decoding produced invalid topic 0 partition 0 error.")
-	}
-
-	if response.Topics[0].Partitions[0].ID != 0x01 {
-		t.Error("Decoding produced invalid topic 0 partition 0 id.")
-	}
-
-	if response.Topics[0].Partitions[0].Leader != 0x07 {
-		t.Error("Decoding produced invalid topic 0 partition 0 leader.")
-	}
-
-	if len(response.Topics[0].Partitions[0].Replicas) != 3 {
-		t.Fatal("Decoding produced invalid topic 0 partition 0 replicas.")
-	}
-	for i := 0; i < 3; i++ {
-		if response.Topics[0].Partitions[0].Replicas[i] != int32(i+1) {
-			t.Error("Decoding produced invalid topic 0 partition 0 replica", i)
-		}
-	}
-
-	if len(response.Topics[0].Partitions[0].Isr) != 0 {
-		t.Error("Decoding produced invalid topic 0 partition 0 isr length.")
-	}
-
-	if response.Topics[1].Err != ErrNoError {
-		t.Error("Decoding produced invalid topic 1 error.")
-	}
-
-	if response.Topics[1].Name != "bar" {
-		t.Error("Decoding produced invalid topic 0 name.")
-	}
-
-	if len(response.Topics[1].Partitions) != 0 {
-		t.Error("Decoding produced invalid partition count for topic 1.")
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/mockbroker_test.go b/Godeps/_workspace/src/github.com/Shopify/sarama/mockbroker_test.go
deleted file mode 100644
index 987697380..000000000
--- a/Godeps/_workspace/src/github.com/Shopify/sarama/mockbroker_test.go
+++ /dev/null
@@ -1,273 +0,0 @@
-package sarama
-
-import (
-	"bytes"
-	"encoding/binary"
-	"fmt"
-	"io"
-	"net"
-	"reflect"
-	"strconv"
-	"sync"
-	"testing"
-	"time"
-
-	"github.com/davecgh/go-spew/spew"
-)
-
-const (
-	expectationTimeout = 500 * time.Millisecond
-)
-
-type requestHandlerFunc func(req *request) (res encoder)
-
-// mockBroker is a mock Kafka broker. It consists of a TCP server on a
-// kernel-selected localhost port that can accept many connections. It reads
-// Kafka requests from that connection and passes them to the user specified
-// handler function (see SetHandler) that generates respective responses. If
-// the handler has not been explicitly specified then the broker returns
-// responses set by the Returns function in the exact order they were provided.
-// (if a response has a len of 0, nothing is sent, and the client request will
-// timeout in this case).
-//
-// When running tests with one of these, it is strongly recommended to specify
-// a timeout to `go test` so that if the broker hangs waiting for a response,
-// the test panics.
-//
-// It is not necessary to prefix message length or correlation ID to your
-// response bytes, the server does that automatically as a convenience.
-type mockBroker struct {
-	brokerID     int32
-	port         int32
-	closing      chan none
-	stopper      chan none
-	expectations chan encoder
-	listener     net.Listener
-	t            *testing.T
-	latency      time.Duration
-	handler      requestHandlerFunc
-	history      []RequestResponse
-	lock         sync.Mutex
-}
-
-type RequestResponse struct {
-	Request  requestBody
-	Response encoder
-}
-
-func (b *mockBroker) SetLatency(latency time.Duration) {
-	b.latency = latency
-}
-
-// SetHandler sets the specified function as the request handler. Whenever
-// a mock broker reads a request from the wire it passes the request to the
-// function and sends back whatever the handler function returns.
-func (b *mockBroker) SetHandler(handler requestHandlerFunc) {
-	b.lock.Lock()
-	b.handler = handler
-	b.lock.Unlock()
-}
-
-func (b *mockBroker) SetHandlerByMap(handlerMap map[string]MockResponse) {
-	b.SetHandler(func(req *request) (res encoder) {
-		reqTypeName := reflect.TypeOf(req.body).Elem().Name()
-		mockResponse := handlerMap[reqTypeName]
-		if mockResponse == nil {
-			return nil
-		}
-		return mockResponse.For(req.body)
-	})
-}
-
-func (b *mockBroker) BrokerID() int32 {
-	return b.brokerID
-}
-
-func (b *mockBroker) History() []RequestResponse {
-	b.lock.Lock()
-	history := make([]RequestResponse, len(b.history))
-	copy(history, b.history)
-	b.lock.Unlock()
-	return history
-}
-
-func (b *mockBroker) Port() int32 {
-	return b.port
-}
-
-func (b *mockBroker) Addr() string {
-	return b.listener.Addr().String()
-}
-
-func (b *mockBroker) Close() {
-	close(b.expectations)
-	if len(b.expectations) > 0 {
-		buf := bytes.NewBufferString(fmt.Sprintf("mockbroker/%d: not all expectations were satisfied! Still waiting on:\n", b.BrokerID()))
-		for e := range b.expectations {
-			_, _ = buf.WriteString(spew.Sdump(e))
-		}
-		b.t.Error(buf.String())
-	}
-	close(b.closing)
-	<-b.stopper
-}
-
-func (b *mockBroker) serverLoop() {
-	defer close(b.stopper)
-	var err error
-	var conn net.Conn
-
-	go func() {
-		<-b.closing
-		safeClose(b.t, b.listener)
-	}()
-
-	wg := &sync.WaitGroup{}
-	i := 0
-	for conn, err = b.listener.Accept(); err == nil; conn, err = b.listener.Accept() {
-		wg.Add(1)
-		go b.handleRequests(conn, i, wg)
-		i++
-	}
-	wg.Wait()
-	Logger.Printf("*** mockbroker/%d: listener closed, err=%v", b.BrokerID(), err)
-}
-
-func (b *mockBroker) handleRequests(conn net.Conn, idx int, wg *sync.WaitGroup) {
-	defer wg.Done()
-	defer func() {
-		_ = conn.Close()
-	}()
-	Logger.Printf("*** mockbroker/%d/%d: connection opened", b.BrokerID(), idx)
-	var err error
-
-	abort := make(chan none)
-	defer close(abort)
-	go func() {
-		select {
-		case <-b.closing:
-			_ = conn.Close()
-		case <-abort:
-		}
-	}()
-
-	resHeader := make([]byte, 8)
-	for {
-		req, err := decodeRequest(conn)
-		if err != nil {
-			Logger.Printf("*** mockbroker/%d/%d: invalid request: err=%+v, %+v", b.brokerID, idx, err, spew.Sdump(req))
-			b.serverError(err)
-			break
-		}
-
-		if b.latency > 0 {
-			time.Sleep(b.latency)
-		}
-
-		b.lock.Lock()
-		res := b.handler(req)
-		b.history = append(b.history, RequestResponse{req.body, res})
-		b.lock.Unlock()
-
-		if res == nil {
-			Logger.Printf("*** mockbroker/%d/%d: ignored %v", b.brokerID, idx, spew.Sdump(req))
-			continue
-		}
-		Logger.Printf("*** mockbroker/%d/%d: served %v -> %v", b.brokerID, idx, req, res)
-
-		encodedRes, err := encode(res)
-		if err != nil {
-			b.serverError(err)
-			break
-		}
-		if len(encodedRes) == 0 {
-			continue
-		}
-
-		binary.BigEndian.PutUint32(resHeader, uint32(len(encodedRes)+4))
-		binary.BigEndian.PutUint32(resHeader[4:], uint32(req.correlationID))
-		if _, err = conn.Write(resHeader); err != nil {
-			b.serverError(err)
-			break
-		}
-		if _, err = conn.Write(encodedRes); err != nil {
-			b.serverError(err)
-			break
-		}
-	}
-	Logger.Printf("*** mockbroker/%d/%d: connection closed, err=%v", b.BrokerID(), idx, err)
-}
-
-func (b *mockBroker) defaultRequestHandler(req *request) (res encoder) {
-	select {
-	case res, ok := <-b.expectations:
-		if !ok {
-			return nil
-		}
-		return res
-	case <-time.After(expectationTimeout):
-		return nil
-	}
-}
-
-func (b *mockBroker) serverError(err error) {
-	isConnectionClosedError := false
-	if _, ok := err.(*net.OpError); ok {
-		isConnectionClosedError = true
-	} else if err == io.EOF {
-		isConnectionClosedError = true
-	} else if err.Error() == "use of closed network connection" {
-		isConnectionClosedError = true
-	}
-
-	if isConnectionClosedError {
-		return
-	}
-
-	b.t.Errorf(err.Error())
-}
-
-// newMockBroker launches a fake Kafka broker. It takes a *testing.T as provided by the
-// test framework and a channel of responses to use.  If an error occurs it is
-// simply logged to the *testing.T and the broker exits.
-func newMockBroker(t *testing.T, brokerID int32) *mockBroker {
-	return newMockBrokerAddr(t, brokerID, "localhost:0")
-}
-
-// newMockBrokerAddr behaves like newMockBroker but listens on the address you give
-// it rather than just some ephemeral port.
-func newMockBrokerAddr(t *testing.T, brokerID int32, addr string) *mockBroker {
-	var err error
-
-	broker := &mockBroker{
-		closing:      make(chan none),
-		stopper:      make(chan none),
-		t:            t,
-		brokerID:     brokerID,
-		expectations: make(chan encoder, 512),
-	}
-	broker.handler = broker.defaultRequestHandler
-
-	broker.listener, err = net.Listen("tcp", addr)
-	if err != nil {
-		t.Fatal(err)
-	}
-	Logger.Printf("*** mockbroker/%d listening on %s\n", brokerID, broker.listener.Addr().String())
-	_, portStr, err := net.SplitHostPort(broker.listener.Addr().String())
-	if err != nil {
-		t.Fatal(err)
-	}
-	tmp, err := strconv.ParseInt(portStr, 10, 32)
-	if err != nil {
-		t.Fatal(err)
-	}
-	broker.port = int32(tmp)
-
-	go broker.serverLoop()
-
-	return broker
-}
-
-func (b *mockBroker) Returns(e encoder) {
-	b.expectations <- e
-}
diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/mockresponses_test.go b/Godeps/_workspace/src/github.com/Shopify/sarama/mockresponses_test.go
deleted file mode 100644
index 655d9fb3b..000000000
--- a/Godeps/_workspace/src/github.com/Shopify/sarama/mockresponses_test.go
+++ /dev/null
@@ -1,411 +0,0 @@
-package sarama
-
-import (
-	"testing"
-)
-
-// MockResponse is a response builder interface it defines one method that
-// allows generating a response based on a request body.
-type MockResponse interface {
-	For(reqBody decoder) (res encoder)
-}
-
-type mockWrapper struct {
-	res encoder
-}
-
-func (mw *mockWrapper) For(reqBody decoder) (res encoder) {
-	return mw.res
-}
-
-func newMockWrapper(res encoder) *mockWrapper {
-	return &mockWrapper{res: res}
-}
-
-// mockMetadataResponse is a `MetadataResponse` builder.
-type mockMetadataResponse struct {
-	leaders map[string]map[int32]int32
-	brokers map[string]int32
-	t       *testing.T
-}
-
-func newMockMetadataResponse(t *testing.T) *mockMetadataResponse {
-	return &mockMetadataResponse{
-		leaders: make(map[string]map[int32]int32),
-		brokers: make(map[string]int32),
-		t:       t,
-	}
-}
-
-func (mmr *mockMetadataResponse) SetLeader(topic string, partition, brokerID int32) *mockMetadataResponse {
-	partitions := mmr.leaders[topic]
-	if partitions == nil {
-		partitions = make(map[int32]int32)
-		mmr.leaders[topic] = partitions
-	}
-	partitions[partition] = brokerID
-	return mmr
-}
-
-func (mmr *mockMetadataResponse) SetBroker(addr string, brokerID int32) *mockMetadataResponse {
-	mmr.brokers[addr] = brokerID
-	return mmr
-}
-
-func (mor *mockMetadataResponse) For(reqBody decoder) encoder {
-	metadataRequest := reqBody.(*MetadataRequest)
-	metadataResponse := &MetadataResponse{}
-	for addr, brokerID := range mor.brokers {
-		metadataResponse.AddBroker(addr, brokerID)
-	}
-	if len(metadataRequest.Topics) == 0 {
-		for topic, partitions := range mor.leaders {
-			for partition, brokerID := range partitions {
-				metadataResponse.AddTopicPartition(topic, partition, brokerID, nil, nil, ErrNoError)
-			}
-		}
-		return metadataResponse
-	}
-	for _, topic := range metadataRequest.Topics {
-		for partition, brokerID := range mor.leaders[topic] {
-			metadataResponse.AddTopicPartition(topic, partition, brokerID, nil, nil, ErrNoError)
-		}
-	}
-	return metadataResponse
-}
-
-// mockOffsetResponse is an `OffsetResponse` builder.
-type mockOffsetResponse struct {
-	offsets map[string]map[int32]map[int64]int64
-	t       *testing.T
-}
-
-func newMockOffsetResponse(t *testing.T) *mockOffsetResponse {
-	return &mockOffsetResponse{
-		offsets: make(map[string]map[int32]map[int64]int64),
-		t:       t,
-	}
-}
-
-func (mor *mockOffsetResponse) SetOffset(topic string, partition int32, time, offset int64) *mockOffsetResponse {
-	partitions := mor.offsets[topic]
-	if partitions == nil {
-		partitions = make(map[int32]map[int64]int64)
-		mor.offsets[topic] = partitions
-	}
-	times := partitions[partition]
-	if times == nil {
-		times = make(map[int64]int64)
-		partitions[partition] = times
-	}
-	times[time] = offset
-	return mor
-}
-
-func (mor *mockOffsetResponse) For(reqBody decoder) encoder {
-	offsetRequest := reqBody.(*OffsetRequest)
-	offsetResponse := &OffsetResponse{}
-	for topic, partitions := range offsetRequest.blocks {
-		for partition, block := range partitions {
-			offset := mor.getOffset(topic, partition, block.time)
-			offsetResponse.AddTopicPartition(topic, partition, offset)
-		}
-	}
-	return offsetResponse
-}
-
-func (mor *mockOffsetResponse) getOffset(topic string, partition int32, time int64) int64 {
-	partitions := mor.offsets[topic]
-	if partitions == nil {
-		mor.t.Errorf("missing topic: %s", topic)
-	}
-	times := partitions[partition]
-	if times == nil {
-		mor.t.Errorf("missing partition: %d", partition)
-	}
-	offset, ok := times[time]
-	if !ok {
-		mor.t.Errorf("missing time: %d", time)
-	}
-	return offset
-}
-
-// mockFetchResponse is a `FetchResponse` builder.
-type mockFetchResponse struct {
-	messages       map[string]map[int32]map[int64]Encoder
-	highWaterMarks map[string]map[int32]int64
-	t              *testing.T
-	batchSize      int
-}
-
-func newMockFetchResponse(t *testing.T, batchSize int) *mockFetchResponse {
-	return &mockFetchResponse{
-		messages:       make(map[string]map[int32]map[int64]Encoder),
-		highWaterMarks: make(map[string]map[int32]int64),
-		t:              t,
-		batchSize:      batchSize,
-	}
-}
-
-func (mfr *mockFetchResponse) SetMessage(topic string, partition int32, offset int64, msg Encoder) *mockFetchResponse {
-	partitions := mfr.messages[topic]
-	if partitions == nil {
-		partitions = make(map[int32]map[int64]Encoder)
-		mfr.messages[topic] = partitions
-	}
-	messages := partitions[partition]
-	if messages == nil {
-		messages = make(map[int64]Encoder)
-		partitions[partition] = messages
-	}
-	messages[offset] = msg
-	return mfr
-}
-
-func (mfr *mockFetchResponse) SetHighWaterMark(topic string, partition int32, offset int64) *mockFetchResponse {
-	partitions := mfr.highWaterMarks[topic]
-	if partitions == nil {
-		partitions = make(map[int32]int64)
-		mfr.highWaterMarks[topic] = partitions
-	}
-	partitions[partition] = offset
-	return mfr
-}
-
-func (mfr *mockFetchResponse) For(reqBody decoder) encoder {
-	fetchRequest := reqBody.(*FetchRequest)
-	res := &FetchResponse{}
-	for topic, partitions := range fetchRequest.blocks {
-		for partition, block := range partitions {
-			initialOffset := block.fetchOffset
-			offset := initialOffset
-			maxOffset := initialOffset + int64(mfr.getMessageCount(topic, partition))
-			for i := 0; i < mfr.batchSize && offset < maxOffset; {
-				msg := mfr.getMessage(topic, partition, offset)
-				if msg != nil {
-					res.AddMessage(topic, partition, nil, msg, offset)
-					i++
-				}
-				offset++
-			}
-			fb := res.GetBlock(topic, partition)
-			if fb == nil {
-				res.AddError(topic, partition, ErrNoError)
-				fb = res.GetBlock(topic, partition)
-			}
-			fb.HighWaterMarkOffset = mfr.getHighWaterMark(topic, partition)
-		}
-	}
-	return res
-}
-
-func (mfr *mockFetchResponse) getMessage(topic string, partition int32, offset int64) Encoder {
-	partitions := mfr.messages[topic]
-	if partitions == nil {
-		return nil
-	}
-	messages := partitions[partition]
-	if messages == nil {
-		return nil
-	}
-	return messages[offset]
-}
-
-func (mfr *mockFetchResponse) getMessageCount(topic string, partition int32) int {
-	partitions := mfr.messages[topic]
-	if partitions == nil {
-		return 0
-	}
-	messages := partitions[partition]
-	if messages == nil {
-		return 0
-	}
-	return len(messages)
-}
-
-func (mfr *mockFetchResponse) getHighWaterMark(topic string, partition int32) int64 {
-	partitions := mfr.highWaterMarks[topic]
-	if partitions == nil {
-		return 0
-	}
-	return partitions[partition]
-}
-
-// mockConsumerMetadataResponse is a `ConsumerMetadataResponse` builder.
-type mockConsumerMetadataResponse struct {
-	coordinators map[string]interface{}
-	t            *testing.T
-}
-
-func newMockConsumerMetadataResponse(t *testing.T) *mockConsumerMetadataResponse {
-	return &mockConsumerMetadataResponse{
-		coordinators: make(map[string]interface{}),
-		t:            t,
-	}
-}
-
-func (mr *mockConsumerMetadataResponse) SetCoordinator(group string, broker *mockBroker) *mockConsumerMetadataResponse {
-	mr.coordinators[group] = broker
-	return mr
-}
-
-func (mr *mockConsumerMetadataResponse) SetError(group string, kerror KError) *mockConsumerMetadataResponse {
-	mr.coordinators[group] = kerror
-	return mr
-}
-
-func (mr *mockConsumerMetadataResponse) For(reqBody decoder) encoder {
-	req := reqBody.(*ConsumerMetadataRequest)
-	group := req.ConsumerGroup
-	res := &ConsumerMetadataResponse{}
-	v := mr.coordinators[group]
-	switch v := v.(type) {
-	case *mockBroker:
-		res.Coordinator = &Broker{id: v.BrokerID(), addr: v.Addr()}
-	case KError:
-		res.Err = v
-	}
-	return res
-}
-
-// mockOffsetCommitResponse is a `OffsetCommitResponse` builder.
-type mockOffsetCommitResponse struct {
-	errors map[string]map[string]map[int32]KError
-	t      *testing.T
-}
-
-func newMockOffsetCommitResponse(t *testing.T) *mockOffsetCommitResponse {
-	return &mockOffsetCommitResponse{t: t}
-}
-
-func (mr *mockOffsetCommitResponse) SetError(group, topic string, partition int32, kerror KError) *mockOffsetCommitResponse {
-	if mr.errors == nil {
-		mr.errors = make(map[string]map[string]map[int32]KError)
-	}
-	topics := mr.errors[group]
-	if topics == nil {
-		topics = make(map[string]map[int32]KError)
-		mr.errors[group] = topics
-	}
-	partitions := topics[topic]
-	if partitions == nil {
-		partitions = make(map[int32]KError)
-		topics[topic] = partitions
-	}
-	partitions[partition] = kerror
-	return mr
-}
-
-func (mr *mockOffsetCommitResponse) For(reqBody decoder) encoder {
-	req := reqBody.(*OffsetCommitRequest)
-	group := req.ConsumerGroup
-	res := &OffsetCommitResponse{}
-	for topic, partitions := range req.blocks {
-		for partition := range partitions {
-			res.AddError(topic, partition, mr.getError(group, topic, partition))
-		}
-	}
-	return res
-}
-
-func (mr *mockOffsetCommitResponse) getError(group, topic string, partition int32) KError {
-	topics := mr.errors[group]
-	if topics == nil {
-		return ErrNoError
-	}
-	partitions := topics[topic]
-	if partitions == nil {
-		return ErrNoError
-	}
-	kerror, ok := partitions[partition]
-	if !ok {
-		return ErrNoError
-	}
-	return kerror
-}
-
-// mockProduceResponse is a `ProduceResponse` builder.
-type mockProduceResponse struct {
-	errors map[string]map[int32]KError
-	t      *testing.T
-}
-
-func newMockProduceResponse(t *testing.T) *mockProduceResponse {
-	return &mockProduceResponse{t: t}
-}
-
-func (mr *mockProduceResponse) SetError(topic string, partition int32, kerror KError) *mockProduceResponse {
-	if mr.errors == nil {
-		mr.errors = make(map[string]map[int32]KError)
-	}
-	partitions := mr.errors[topic]
-	if partitions == nil {
-		partitions = make(map[int32]KError)
-		mr.errors[topic] = partitions
-	}
-	partitions[partition] = kerror
-	return mr
-}
-
-func (mr *mockProduceResponse) For(reqBody decoder) encoder {
-	req := reqBody.(*ProduceRequest)
-	res := &ProduceResponse{}
-	for topic, partitions := range req.msgSets {
-		for partition := range partitions {
-			res.AddTopicPartition(topic, partition, mr.getError(topic, partition))
-		}
-	}
-	return res
-}
-
-func (mr *mockProduceResponse) getError(topic string, partition int32) KError {
-	partitions := mr.errors[topic]
-	if partitions == nil {
-		return ErrNoError
-	}
-	kerror, ok := partitions[partition]
-	if !ok {
-		return ErrNoError
-	}
-	return kerror
-}
-
-// mockOffsetFetchResponse is a `OffsetFetchResponse` builder.
-type mockOffsetFetchResponse struct {
-	offsets map[string]map[string]map[int32]*OffsetFetchResponseBlock
-	t       *testing.T
-}
-
-func newMockOffsetFetchResponse(t *testing.T) *mockOffsetFetchResponse {
-	return &mockOffsetFetchResponse{t: t}
-}
-
-func (mr *mockOffsetFetchResponse) SetOffset(group, topic string, partition int32, offset int64, metadata string, kerror KError) *mockOffsetFetchResponse {
-	if mr.offsets == nil {
-		mr.offsets = make(map[string]map[string]map[int32]*OffsetFetchResponseBlock)
-	}
-	topics := mr.offsets[group]
-	if topics == nil {
-		topics = make(map[string]map[int32]*OffsetFetchResponseBlock)
-		mr.offsets[group] = topics
-	}
-	partitions := topics[topic]
-	if partitions == nil {
-		partitions = make(map[int32]*OffsetFetchResponseBlock)
-		topics[topic] = partitions
-	}
-	partitions[partition] = &OffsetFetchResponseBlock{offset, metadata, kerror}
-	return mr
-}
-
-func (mr *mockOffsetFetchResponse) For(reqBody decoder) encoder {
-	req := reqBody.(*OffsetFetchRequest)
-	group := req.ConsumerGroup
-	res := &OffsetFetchResponse{}
-	for topic, partitions := range mr.offsets[group] {
-		for partition, block := range partitions {
-			res.AddBlock(topic, partition, block)
-		}
-	}
-	return res
-}
diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/mocks/README.md b/Godeps/_workspace/src/github.com/Shopify/sarama/mocks/README.md
deleted file mode 100644
index 55a6c2e61..000000000
--- a/Godeps/_workspace/src/github.com/Shopify/sarama/mocks/README.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# sarama/mocks
-
-The `mocks` subpackage includes mock implementations that implement the interfaces of the major sarama types.
-You can use them to test your sarama applications using dependency injection.
-
-The following mock objects are available:
-
-- [Consumer](https://godoc.org/github.com/Shopify/sarama/mocks#Consumer), which will create [PartitionConsumer](https://godoc.org/github.com/Shopify/sarama/mocks#PartitionConsumer) mocks.
-- [AsyncProducer](https://godoc.org/github.com/Shopify/sarama/mocks#AsyncProducer)
-- [SyncProducer](https://godoc.org/github.com/Shopify/sarama/mocks#SyncProducer)
-
-The mocks allow you to set expectations on them. When you close the mocks, the expectations will be verified,
-and the results will be reported to the `*testing.T` object you provided when creating the mock.
diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/mocks/async_producer.go b/Godeps/_workspace/src/github.com/Shopify/sarama/mocks/async_producer.go
deleted file mode 100644
index 6ccf1f145..000000000
--- a/Godeps/_workspace/src/github.com/Shopify/sarama/mocks/async_producer.go
+++ /dev/null
@@ -1,142 +0,0 @@
-package mocks
-
-import (
-	"sync"
-
-	"github.com/Shopify/sarama"
-)
-
-// AsyncProducer implements sarama's Producer interface for testing purposes.
-// Before you can send messages to it's Input channel, you have to set expectations
-// so it knows how to handle the input. This way you can easily test success and
-// failure scenarios.
-type AsyncProducer struct {
-	l            sync.Mutex
-	t            ErrorReporter
-	expectations []*producerExpectation
-	closed       chan struct{}
-	input        chan *sarama.ProducerMessage
-	successes    chan *sarama.ProducerMessage
-	errors       chan *sarama.ProducerError
-	lastOffset   int64
-}
-
-// NewAsyncProducer instantiates a new Producer mock. The t argument should
-// be the *testing.T instance of your test method. An error will be written to it if
-// an expectation is violated. The config argument is used to determine whether it
-// should ack successes on the Successes channel.
-func NewAsyncProducer(t ErrorReporter, config *sarama.Config) *AsyncProducer {
-	if config == nil {
-		config = sarama.NewConfig()
-	}
-	mp := &AsyncProducer{
-		t:            t,
-		closed:       make(chan struct{}, 0),
-		expectations: make([]*producerExpectation, 0),
-		input:        make(chan *sarama.ProducerMessage, config.ChannelBufferSize),
-		successes:    make(chan *sarama.ProducerMessage, config.ChannelBufferSize),
-		errors:       make(chan *sarama.ProducerError, config.ChannelBufferSize),
-	}
-
-	go func() {
-		defer func() {
-			close(mp.successes)
-			close(mp.errors)
-		}()
-
-		for msg := range mp.input {
-			mp.l.Lock()
-			if mp.expectations == nil || len(mp.expectations) == 0 {
-				mp.expectations = nil
-				mp.t.Errorf("No more expectation set on this mock producer to handle the input message.")
-			} else {
-				expectation := mp.expectations[0]
-				mp.expectations = mp.expectations[1:]
-				if expectation.Result == errProduceSuccess {
-					mp.lastOffset++
-					if config.Producer.Return.Successes {
-						msg.Offset = mp.lastOffset
-						mp.successes <- msg
-					}
-				} else {
-					if config.Producer.Return.Errors {
-						mp.errors <- &sarama.ProducerError{Err: expectation.Result, Msg: msg}
-					}
-				}
-			}
-			mp.l.Unlock()
-		}
-
-		mp.l.Lock()
-		if len(mp.expectations) > 0 {
-			mp.t.Errorf("Expected to exhaust all expectations, but %d are left.", len(mp.expectations))
-		}
-		mp.l.Unlock()
-
-		close(mp.closed)
-	}()
-
-	return mp
-}
-
-////////////////////////////////////////////////
-// Implement Producer interface
-////////////////////////////////////////////////
-
-// AsyncClose corresponds with the AsyncClose method of sarama's Producer implementation.
-// By closing a mock producer, you also tell it that no more input will be provided, so it will
-// write an error to the test state if there's any remaining expectations.
-func (mp *AsyncProducer) AsyncClose() {
-	close(mp.input)
-}
-
-// Close corresponds with the Close method of sarama's Producer implementation.
-// By closing a mock producer, you also tell it that no more input will be provided, so it will
-// write an error to the test state if there's any remaining expectations.
-func (mp *AsyncProducer) Close() error {
-	mp.AsyncClose()
-	<-mp.closed
-	return nil
-}
-
-// Input corresponds with the Input method of sarama's Producer implementation.
-// You have to set expectations on the mock producer before writing messages to the Input
-// channel, so it knows how to handle them. If there is no more remaining expectations and
-// a messages is written to the Input channel, the mock producer will write an error to the test
-// state object.
-func (mp *AsyncProducer) Input() chan<- *sarama.ProducerMessage {
-	return mp.input
-}
-
-// Successes corresponds with the Successes method of sarama's Producer implementation.
-func (mp *AsyncProducer) Successes() <-chan *sarama.ProducerMessage {
-	return mp.successes
-}
-
-// Errors corresponds with the Errors method of sarama's Producer implementation.
-func (mp *AsyncProducer) Errors() <-chan *sarama.ProducerError {
-	return mp.errors
-}
-
-////////////////////////////////////////////////
-// Setting expectations
-////////////////////////////////////////////////
-
-// ExpectInputAndSucceed sets an expectation on the mock producer that a message will be provided
-// on the input channel. The mock producer will handle the message as if it is produced successfully,
-// i.e. it will make it available on the Successes channel if the Producer.Return.Successes setting
-// is set to true.
-func (mp *AsyncProducer) ExpectInputAndSucceed() {
-	mp.l.Lock()
-	defer mp.l.Unlock()
-	mp.expectations = append(mp.expectations, &producerExpectation{Result: errProduceSuccess})
-}
-
-// ExpectInputAndFail sets an expectation on the mock producer that a message will be provided
-// on the input channel. The mock producer will handle the message as if it failed to produce
-// successfully. This means it will make a ProducerError available on the Errors channel.
-func (mp *AsyncProducer) ExpectInputAndFail(err error) {
-	mp.l.Lock()
-	defer mp.l.Unlock()
-	mp.expectations = append(mp.expectations, &producerExpectation{Result: err})
-}
diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/mocks/async_producer_test.go b/Godeps/_workspace/src/github.com/Shopify/sarama/mocks/async_producer_test.go
deleted file mode 100644
index 520bf58b9..000000000
--- a/Godeps/_workspace/src/github.com/Shopify/sarama/mocks/async_producer_test.go
+++ /dev/null
@@ -1,94 +0,0 @@
-package mocks
-
-import (
-	"fmt"
-	"testing"
-
-	"github.com/Shopify/sarama"
-)
-
-type testReporterMock struct {
-	errors []string
-}
-
-func newTestReporterMock() *testReporterMock {
-	return &testReporterMock{errors: make([]string, 0)}
-}
-
-func (trm *testReporterMock) Errorf(format string, args ...interface{}) {
-	trm.errors = append(trm.errors, fmt.Sprintf(format, args...))
-}
-
-func TestMockAsyncProducerImplementsAsyncProducerInterface(t *testing.T) {
-	var mp interface{} = &AsyncProducer{}
-	if _, ok := mp.(sarama.AsyncProducer); !ok {
-		t.Error("The mock producer should implement the sarama.Producer interface.")
-	}
-}
-
-func TestProducerReturnsExpectationsToChannels(t *testing.T) {
-	config := sarama.NewConfig()
-	config.Producer.Return.Successes = true
-	mp := NewAsyncProducer(t, config)
-
-	mp.ExpectInputAndSucceed()
-	mp.ExpectInputAndSucceed()
-	mp.ExpectInputAndFail(sarama.ErrOutOfBrokers)
-
-	mp.Input() <- &sarama.ProducerMessage{Topic: "test 1"}
-	mp.Input() <- &sarama.ProducerMessage{Topic: "test 2"}
-	mp.Input() <- &sarama.ProducerMessage{Topic: "test 3"}
-
-	msg1 := <-mp.Successes()
-	msg2 := <-mp.Successes()
-	err1 := <-mp.Errors()
-
-	if msg1.Topic != "test 1" {
-		t.Error("Expected message 1 to be returned first")
-	}
-
-	if msg2.Topic != "test 2" {
-		t.Error("Expected message 2 to be returned second")
-	}
-
-	if err1.Msg.Topic != "test 3" || err1.Err != sarama.ErrOutOfBrokers {
-		t.Error("Expected message 3 to be returned as error")
-	}
-
-	if err := mp.Close(); err != nil {
-		t.Error(err)
-	}
-}
-
-func TestProducerWithTooFewExpectations(t *testing.T) {
-	trm := newTestReporterMock()
-	mp := NewAsyncProducer(trm, nil)
-	mp.ExpectInputAndSucceed()
-
-	mp.Input() <- &sarama.ProducerMessage{Topic: "test"}
-	mp.Input() <- &sarama.ProducerMessage{Topic: "test"}
-
-	if err := mp.Close(); err != nil {
-		t.Error(err)
-	}
-
-	if len(trm.errors) != 1 {
-		t.Error("Expected to report an error")
-	}
-}
-
-func TestProducerWithTooManyExpectations(t *testing.T) {
-	trm := newTestReporterMock()
-	mp := NewAsyncProducer(trm, nil)
-	mp.ExpectInputAndSucceed()
-	mp.ExpectInputAndFail(sarama.ErrOutOfBrokers)
-
-	mp.Input() <- &sarama.ProducerMessage{Topic: "test"}
-	if err := mp.Close(); err != nil {
-		t.Error(err)
-	}
-
-	if len(trm.errors) != 1 {
-		t.Error("Expected to report an error")
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/mocks/consumer.go b/Godeps/_workspace/src/github.com/Shopify/sarama/mocks/consumer.go
deleted file mode 100644
index acf0894ee..000000000
--- a/Godeps/_workspace/src/github.com/Shopify/sarama/mocks/consumer.go
+++ /dev/null
@@ -1,316 +0,0 @@
-package mocks
-
-import (
-	"sync"
-	"sync/atomic"
-
-	"github.com/Shopify/sarama"
-)
-
-// Consumer implements sarama's Consumer interface for testing purposes.
-// Before you can start consuming from this consumer, you have to register
-// topic/partitions using ExpectConsumePartition, and set expectations on them.
-type Consumer struct {
-	l                  sync.Mutex
-	t                  ErrorReporter
-	config             *sarama.Config
-	partitionConsumers map[string]map[int32]*PartitionConsumer
-	metadata           map[string][]int32
-}
-
-// NewConsumer returns a new mock Consumer instance. The t argument should
-// be the *testing.T instance of your test method. An error will be written to it if
-// an expectation is violated. The config argument is currently unused and can be set to nil.
-func NewConsumer(t ErrorReporter, config *sarama.Config) *Consumer {
-	if config == nil {
-		config = sarama.NewConfig()
-	}
-
-	c := &Consumer{
-		t:                  t,
-		config:             config,
-		partitionConsumers: make(map[string]map[int32]*PartitionConsumer),
-	}
-	return c
-}
-
-///////////////////////////////////////////////////
-// Consumer interface implementation
-///////////////////////////////////////////////////
-
-// ConsumePartition implements the ConsumePartition method from the sarama.Consumer interface.
-// Before you can start consuming a partition, you have to set expectations on it using
-// ExpectConsumePartition. You can only consume a partition once per consumer.
-func (c *Consumer) ConsumePartition(topic string, partition int32, offset int64) (sarama.PartitionConsumer, error) {
-	c.l.Lock()
-	defer c.l.Unlock()
-
-	if c.partitionConsumers[topic] == nil || c.partitionConsumers[topic][partition] == nil {
-		c.t.Errorf("No expectations set for %s/%d", topic, partition)
-		return nil, errOutOfExpectations
-	}
-
-	pc := c.partitionConsumers[topic][partition]
-	if pc.consumed {
-		return nil, sarama.ConfigurationError("The topic/partition is already being consumed")
-	}
-
-	if pc.offset != AnyOffset && pc.offset != offset {
-		c.t.Errorf("Unexpected offset when calling ConsumePartition for %s/%d. Expected %d, got %d.", topic, partition, pc.offset, offset)
-	}
-
-	pc.consumed = true
-	go pc.handleExpectations()
-	return pc, nil
-}
-
-// Topics returns a list of topics, as registered with SetMetadata
-func (c *Consumer) Topics() ([]string, error) {
-	c.l.Lock()
-	defer c.l.Unlock()
-
-	if c.metadata == nil {
-		c.t.Errorf("Unexpected call to Topics. Initialize the mock's topic metadata with SetMetadata.")
-		return nil, sarama.ErrOutOfBrokers
-	}
-
-	var result []string
-	for topic, _ := range c.metadata {
-		result = append(result, topic)
-	}
-	return result, nil
-}
-
-// Partitions returns the list of parititons for the given topic, as registered with SetMetadata
-func (c *Consumer) Partitions(topic string) ([]int32, error) {
-	c.l.Lock()
-	defer c.l.Unlock()
-
-	if c.metadata == nil {
-		c.t.Errorf("Unexpected call to Partitions. Initialize the mock's topic metadata with SetMetadata.")
-		return nil, sarama.ErrOutOfBrokers
-	}
-	if c.metadata[topic] == nil {
-		return nil, sarama.ErrUnknownTopicOrPartition
-	}
-
-	return c.metadata[topic], nil
-}
-
-// Close implements the Close method from the sarama.Consumer interface. It will close
-// all registered PartitionConsumer instances.
-func (c *Consumer) Close() error {
-	c.l.Lock()
-	defer c.l.Unlock()
-
-	for _, partitions := range c.partitionConsumers {
-		for _, partitionConsumer := range partitions {
-			_ = partitionConsumer.Close()
-		}
-	}
-
-	return nil
-}
-
-///////////////////////////////////////////////////
-// Expectation API
-///////////////////////////////////////////////////
-
-// SetMetadata sets the clusters topic/partition metadata,
-// which will be returned by Topics() and Partitions().
-func (c *Consumer) SetTopicMetadata(metadata map[string][]int32) {
-	c.l.Lock()
-	defer c.l.Unlock()
-
-	c.metadata = metadata
-}
-
-// ExpectConsumePartition will register a topic/partition, so you can set expectations on it.
-// The registered PartitionConsumer will be returned, so you can set expectations
-// on it using method chanining. Once a topic/partition is registered, you are
-// expected to start consuming it using ConsumePartition. If that doesn't happen,
-// an error will be written to the error reporter once the mock consumer is closed. It will
-// also expect that the
-func (c *Consumer) ExpectConsumePartition(topic string, partition int32, offset int64) *PartitionConsumer {
-	c.l.Lock()
-	defer c.l.Unlock()
-
-	if c.partitionConsumers[topic] == nil {
-		c.partitionConsumers[topic] = make(map[int32]*PartitionConsumer)
-	}
-
-	if c.partitionConsumers[topic][partition] == nil {
-		c.partitionConsumers[topic][partition] = &PartitionConsumer{
-			t:            c.t,
-			topic:        topic,
-			partition:    partition,
-			offset:       offset,
-			expectations: make(chan *consumerExpectation, 1000),
-			messages:     make(chan *sarama.ConsumerMessage, c.config.ChannelBufferSize),
-			errors:       make(chan *sarama.ConsumerError, c.config.ChannelBufferSize),
-		}
-	}
-
-	return c.partitionConsumers[topic][partition]
-}
-
-///////////////////////////////////////////////////
-// PartitionConsumer mock type
-///////////////////////////////////////////////////
-
-// PartitionConsumer implements sarama's PartitionConsumer interface for testing purposes.
-// It is returned by the mock Consumers ConsumePartitionMethod, but only if it is
-// registered first using the Consumer's ExpectConsumePartition method. Before consuming the
-// Errors and Messages channel, you should specify what values will be provided on these
-// channels using YieldMessage and YieldError.
-type PartitionConsumer struct {
-	l                       sync.Mutex
-	t                       ErrorReporter
-	topic                   string
-	partition               int32
-	offset                  int64
-	expectations            chan *consumerExpectation
-	messages                chan *sarama.ConsumerMessage
-	errors                  chan *sarama.ConsumerError
-	singleClose             sync.Once
-	consumed                bool
-	errorsShouldBeDrained   bool
-	messagesShouldBeDrained bool
-	highWaterMarkOffset     int64
-}
-
-func (pc *PartitionConsumer) handleExpectations() {
-	pc.l.Lock()
-	defer pc.l.Unlock()
-
-	for ex := range pc.expectations {
-		if ex.Err != nil {
-			pc.errors <- &sarama.ConsumerError{
-				Topic:     pc.topic,
-				Partition: pc.partition,
-				Err:       ex.Err,
-			}
-		} else {
-			atomic.AddInt64(&pc.highWaterMarkOffset, 1)
-
-			ex.Msg.Topic = pc.topic
-			ex.Msg.Partition = pc.partition
-			ex.Msg.Offset = atomic.LoadInt64(&pc.highWaterMarkOffset)
-
-			pc.messages <- ex.Msg
-		}
-	}
-
-	close(pc.messages)
-	close(pc.errors)
-}
-
-///////////////////////////////////////////////////
-// PartitionConsumer interface implementation
-///////////////////////////////////////////////////
-
-// AsyncClose implements the AsyncClose method from the sarama.PartitionConsumer interface.
-func (pc *PartitionConsumer) AsyncClose() {
-	pc.singleClose.Do(func() {
-		close(pc.expectations)
-	})
-}
-
-// Close implements the Close method from the sarama.PartitionConsumer interface. It will
-// verify whether the partition consumer was actually started.
-func (pc *PartitionConsumer) Close() error {
-	if !pc.consumed {
-		pc.t.Errorf("Expectations set on %s/%d, but no partition consumer was started.", pc.topic, pc.partition)
-		return errPartitionConsumerNotStarted
-	}
-
-	if pc.errorsShouldBeDrained && len(pc.errors) > 0 {
-		pc.t.Errorf("Expected the errors channel for %s/%d to be drained on close, but found %d errors.", pc.topic, pc.partition, len(pc.errors))
-	}
-
-	if pc.messagesShouldBeDrained && len(pc.messages) > 0 {
-		pc.t.Errorf("Expected the messages channel for %s/%d to be drained on close, but found %d messages.", pc.topic, pc.partition, len(pc.messages))
-	}
-
-	pc.AsyncClose()
-
-	var (
-		closeErr error
-		wg       sync.WaitGroup
-	)
-
-	wg.Add(1)
-	go func() {
-		defer wg.Done()
-
-		var errs = make(sarama.ConsumerErrors, 0)
-		for err := range pc.errors {
-			errs = append(errs, err)
-		}
-
-		if len(errs) > 0 {
-			closeErr = errs
-		}
-	}()
-
-	wg.Add(1)
-	go func() {
-		defer wg.Done()
-		for _ = range pc.messages {
-			// drain
-		}
-	}()
-
-	wg.Wait()
-	return closeErr
-}
-
-// Errors implements the Errors method from the sarama.PartitionConsumer interface.
-func (pc *PartitionConsumer) Errors() <-chan *sarama.ConsumerError {
-	return pc.errors
-}
-
-// Messages implements the Messages method from the sarama.PartitionConsumer interface.
-func (pc *PartitionConsumer) Messages() <-chan *sarama.ConsumerMessage {
-	return pc.messages
-}
-
-func (pc *PartitionConsumer) HighWaterMarkOffset() int64 {
-	return atomic.LoadInt64(&pc.highWaterMarkOffset) + 1
-}
-
-///////////////////////////////////////////////////
-// Expectation API
-///////////////////////////////////////////////////
-
-// YieldMessage will yield a messages Messages channel of this partition consumer
-// when it is consumed. By default, the mock consumer will not verify whether this
-// message was consumed from the Messages channel, because there are legitimate
-// reasons forthis not to happen. ou can call ExpectMessagesDrainedOnClose so it will
-// verify that the channel is empty on close.
-func (pc *PartitionConsumer) YieldMessage(msg *sarama.ConsumerMessage) {
-	pc.expectations <- &consumerExpectation{Msg: msg}
-}
-
-// YieldError will yield an error on the Errors channel of this partition consumer
-// when it is consumed. By default, the mock consumer will not verify whether this error was
-// consumed from the Errors channel, because there are legitimate reasons for this
-// not to happen. You can call ExpectErrorsDrainedOnClose so it will verify that
-// the channel is empty on close.
-func (pc *PartitionConsumer) YieldError(err error) {
-	pc.expectations <- &consumerExpectation{Err: err}
-}
-
-// ExpectMessagesDrainedOnClose sets an expectation on the partition consumer
-// that the messages channel will be fully drained when Close is called. If this
-// expectation is not met, an error is reported to the error reporter.
-func (pc *PartitionConsumer) ExpectMessagesDrainedOnClose() {
-	pc.messagesShouldBeDrained = true
-}
-
-// ExpectErrorsDrainedOnClose sets an expectation on the partition consumer
-// that the errors channel will be fully drained when Close is called. If this
-// expectation is not met, an error is reported to the error reporter.
-func (pc *PartitionConsumer) ExpectErrorsDrainedOnClose() {
-	pc.errorsShouldBeDrained = true
-}
diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/mocks/consumer_test.go b/Godeps/_workspace/src/github.com/Shopify/sarama/mocks/consumer_test.go
deleted file mode 100644
index 50dad3a69..000000000
--- a/Godeps/_workspace/src/github.com/Shopify/sarama/mocks/consumer_test.go
+++ /dev/null
@@ -1,249 +0,0 @@
-package mocks
-
-import (
-	"sort"
-	"testing"
-
-	"github.com/Shopify/sarama"
-)
-
-func TestMockConsumerImplementsConsumerInterface(t *testing.T) {
-	var c interface{} = &Consumer{}
-	if _, ok := c.(sarama.Consumer); !ok {
-		t.Error("The mock consumer should implement the sarama.Consumer interface.")
-	}
-
-	var pc interface{} = &PartitionConsumer{}
-	if _, ok := pc.(sarama.PartitionConsumer); !ok {
-		t.Error("The mock partitionconsumer should implement the sarama.PartitionConsumer interface.")
-	}
-}
-
-func TestConsumerHandlesExpectations(t *testing.T) {
-	consumer := NewConsumer(t, nil)
-	defer func() {
-		if err := consumer.Close(); err != nil {
-			t.Error(err)
-		}
-	}()
-
-	consumer.ExpectConsumePartition("test", 0, sarama.OffsetOldest).YieldMessage(&sarama.ConsumerMessage{Value: []byte("hello world")})
-	consumer.ExpectConsumePartition("test", 0, sarama.OffsetOldest).YieldError(sarama.ErrOutOfBrokers)
-	consumer.ExpectConsumePartition("test", 1, sarama.OffsetOldest).YieldMessage(&sarama.ConsumerMessage{Value: []byte("hello world again")})
-	consumer.ExpectConsumePartition("other", 0, AnyOffset).YieldMessage(&sarama.ConsumerMessage{Value: []byte("hello other")})
-
-	pc_test0, err := consumer.ConsumePartition("test", 0, sarama.OffsetOldest)
-	if err != nil {
-		t.Fatal(err)
-	}
-	test0_msg := <-pc_test0.Messages()
-	if test0_msg.Topic != "test" || test0_msg.Partition != 0 || string(test0_msg.Value) != "hello world" {
-		t.Error("Message was not as expected:", test0_msg)
-	}
-	test0_err := <-pc_test0.Errors()
-	if test0_err.Err != sarama.ErrOutOfBrokers {
-		t.Error("Expected sarama.ErrOutOfBrokers, found:", test0_err.Err)
-	}
-
-	pc_test1, err := consumer.ConsumePartition("test", 1, sarama.OffsetOldest)
-	if err != nil {
-		t.Fatal(err)
-	}
-	test1_msg := <-pc_test1.Messages()
-	if test1_msg.Topic != "test" || test1_msg.Partition != 1 || string(test1_msg.Value) != "hello world again" {
-		t.Error("Message was not as expected:", test1_msg)
-	}
-
-	pc_other0, err := consumer.ConsumePartition("other", 0, sarama.OffsetNewest)
-	if err != nil {
-		t.Fatal(err)
-	}
-	other0_msg := <-pc_other0.Messages()
-	if other0_msg.Topic != "other" || other0_msg.Partition != 0 || string(other0_msg.Value) != "hello other" {
-		t.Error("Message was not as expected:", other0_msg)
-	}
-}
-
-func TestConsumerReturnsNonconsumedErrorsOnClose(t *testing.T) {
-	consumer := NewConsumer(t, nil)
-	consumer.ExpectConsumePartition("test", 0, sarama.OffsetOldest).YieldError(sarama.ErrOutOfBrokers)
-	consumer.ExpectConsumePartition("test", 0, sarama.OffsetOldest).YieldError(sarama.ErrOutOfBrokers)
-
-	pc, err := consumer.ConsumePartition("test", 0, sarama.OffsetOldest)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	select {
-	case <-pc.Messages():
-		t.Error("Did not epxect a message on the messages channel.")
-	case err := <-pc.Errors():
-		if err.Err != sarama.ErrOutOfBrokers {
-			t.Error("Expected sarama.ErrOutOfBrokers, found", err)
-		}
-	}
-
-	errs := pc.Close().(sarama.ConsumerErrors)
-	if len(errs) != 1 && errs[0].Err != sarama.ErrOutOfBrokers {
-		t.Error("Expected Close to return the remaining sarama.ErrOutOfBrokers")
-	}
-}
-
-func TestConsumerWithoutExpectationsOnPartition(t *testing.T) {
-	trm := newTestReporterMock()
-	consumer := NewConsumer(trm, nil)
-
-	_, err := consumer.ConsumePartition("test", 1, sarama.OffsetOldest)
-	if err != errOutOfExpectations {
-		t.Error("Expected ConsumePartition to return errOutOfExpectations")
-	}
-
-	if err := consumer.Close(); err != nil {
-		t.Error("No error expected on close, but found:", err)
-	}
-
-	if len(trm.errors) != 1 {
-		t.Errorf("Expected an expectation failure to be set on the error reporter.")
-	}
-}
-
-func TestConsumerWithExpectationsOnUnconsumedPartition(t *testing.T) {
-	trm := newTestReporterMock()
-	consumer := NewConsumer(trm, nil)
-	consumer.ExpectConsumePartition("test", 0, sarama.OffsetOldest).YieldMessage(&sarama.ConsumerMessage{Value: []byte("hello world")})
-
-	if err := consumer.Close(); err != nil {
-		t.Error("No error expected on close, but found:", err)
-	}
-
-	if len(trm.errors) != 1 {
-		t.Errorf("Expected an expectation failure to be set on the error reporter.")
-	}
-}
-
-func TestConsumerWithWrongOffsetExpectation(t *testing.T) {
-	trm := newTestReporterMock()
-	consumer := NewConsumer(trm, nil)
-	consumer.ExpectConsumePartition("test", 0, sarama.OffsetOldest)
-
-	_, err := consumer.ConsumePartition("test", 0, sarama.OffsetNewest)
-	if err != nil {
-		t.Error("Did not expect error, found:", err)
-	}
-
-	if len(trm.errors) != 1 {
-		t.Errorf("Expected an expectation failure to be set on the error reporter.")
-	}
-
-	if err := consumer.Close(); err != nil {
-		t.Error(err)
-	}
-}
-
-func TestConsumerViolatesMessagesDrainedExpectation(t *testing.T) {
-	trm := newTestReporterMock()
-	consumer := NewConsumer(trm, nil)
-	pcmock := consumer.ExpectConsumePartition("test", 0, sarama.OffsetOldest)
-	pcmock.YieldMessage(&sarama.ConsumerMessage{Value: []byte("hello")})
-	pcmock.YieldMessage(&sarama.ConsumerMessage{Value: []byte("hello")})
-	pcmock.ExpectMessagesDrainedOnClose()
-
-	pc, err := consumer.ConsumePartition("test", 0, sarama.OffsetOldest)
-	if err != nil {
-		t.Error(err)
-	}
-
-	// consume first message, not second one
-	<-pc.Messages()
-
-	if err := consumer.Close(); err != nil {
-		t.Error(err)
-	}
-
-	if len(trm.errors) != 1 {
-		t.Errorf("Expected an expectation failure to be set on the error reporter.")
-	}
-}
-
-func TestConsumerMeetsErrorsDrainedExpectation(t *testing.T) {
-	trm := newTestReporterMock()
-	consumer := NewConsumer(trm, nil)
-
-	pcmock := consumer.ExpectConsumePartition("test", 0, sarama.OffsetOldest)
-	pcmock.YieldError(sarama.ErrInvalidMessage)
-	pcmock.YieldError(sarama.ErrInvalidMessage)
-	pcmock.ExpectErrorsDrainedOnClose()
-
-	pc, err := consumer.ConsumePartition("test", 0, sarama.OffsetOldest)
-	if err != nil {
-		t.Error(err)
-	}
-
-	// consume first and second error,
-	<-pc.Errors()
-	<-pc.Errors()
-
-	if err := consumer.Close(); err != nil {
-		t.Error(err)
-	}
-
-	if len(trm.errors) != 0 {
-		t.Errorf("Expected no expectation failures to be set on the error reporter.")
-	}
-}
-
-func TestConsumerTopicMetadata(t *testing.T) {
-	trm := newTestReporterMock()
-	consumer := NewConsumer(trm, nil)
-
-	consumer.SetTopicMetadata(map[string][]int32{
-		"test1": []int32{0, 1, 2, 3},
-		"test2": []int32{0, 1, 2, 3, 4, 5, 6, 7},
-	})
-
-	topics, err := consumer.Topics()
-	if err != nil {
-		t.Error(t)
-	}
-
-	sortedTopics := sort.StringSlice(topics)
-	sortedTopics.Sort()
-	if len(sortedTopics) != 2 || sortedTopics[0] != "test1" || sortedTopics[1] != "test2" {
-		t.Error("Unexpected topics returned:", sortedTopics)
-	}
-
-	partitions1, err := consumer.Partitions("test1")
-	if err != nil {
-		t.Error(t)
-	}
-
-	if len(partitions1) != 4 {
-		t.Error("Unexpected partitions returned:", len(partitions1))
-	}
-
-	partitions2, err := consumer.Partitions("test2")
-	if err != nil {
-		t.Error(t)
-	}
-
-	if len(partitions2) != 8 {
-		t.Error("Unexpected partitions returned:", len(partitions2))
-	}
-
-	if len(trm.errors) != 0 {
-		t.Errorf("Expected no expectation failures to be set on the error reporter.")
-	}
-}
-
-func TestConsumerUnexpectedTopicMetadata(t *testing.T) {
-	trm := newTestReporterMock()
-	consumer := NewConsumer(trm, nil)
-
-	if _, err := consumer.Topics(); err != sarama.ErrOutOfBrokers {
-		t.Error("Expected sarama.ErrOutOfBrokers, found", err)
-	}
-
-	if len(trm.errors) != 1 {
-		t.Errorf("Expected an expectation failure to be set on the error reporter.")
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/mocks/mocks.go b/Godeps/_workspace/src/github.com/Shopify/sarama/mocks/mocks.go
deleted file mode 100644
index ab24beebd..000000000
--- a/Godeps/_workspace/src/github.com/Shopify/sarama/mocks/mocks.go
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
-Package mocks provides mocks that can be used for testing applications
-that use Sarama. The mock types provided by this package implement the
-interfaces Sarama exports, so you can use them for dependency injection
-in your tests.
-
-All mock instances require you to set expectations on them before you
-can use them. It will determine how the mock will behave. If an
-expectation is not met, it will make your test fail.
-
-NOTE: this package currently does not fall under the API stability
-guarantee of Sarama as it is still considered experimental.
-*/
-package mocks
-
-import (
-	"errors"
-
-	"github.com/Shopify/sarama"
-)
-
-// A simple interface that includes the testing.T methods we use to report
-// expectation violations when using the mock objects.
-type ErrorReporter interface {
-	Errorf(string, ...interface{})
-}
-
-var (
-	errProduceSuccess              error = nil
-	errOutOfExpectations                 = errors.New("No more expectations set on mock")
-	errPartitionConsumerNotStarted       = errors.New("The partition consumer was never started")
-)
-
-const AnyOffset int64 = -1000
-
-type producerExpectation struct {
-	Result error
-}
-
-type consumerExpectation struct {
-	Err error
-	Msg *sarama.ConsumerMessage
-}
diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/mocks/sync_producer.go b/Godeps/_workspace/src/github.com/Shopify/sarama/mocks/sync_producer.go
deleted file mode 100644
index be59ecdb4..000000000
--- a/Godeps/_workspace/src/github.com/Shopify/sarama/mocks/sync_producer.go
+++ /dev/null
@@ -1,93 +0,0 @@
-package mocks
-
-import (
-	"github.com/Shopify/sarama"
-	"sync"
-)
-
-// SyncProducer implements sarama's SyncProducer interface for testing purposes.
-// Before you can use it, you have to set expectations on the mock SyncProducer
-// to tell it how to handle calls to SendMessage, so you can easily test success
-// and failure scenarios.
-type SyncProducer struct {
-	l            sync.Mutex
-	t            ErrorReporter
-	expectations []*producerExpectation
-	lastOffset   int64
-}
-
-// NewSyncProducer instantiates a new SyncProducer mock. The t argument should
-// be the *testing.T instance of your test method. An error will be written to it if
-// an expectation is violated. The config argument is currently unused, but is
-// maintained to be compatible with the async Producer.
-func NewSyncProducer(t ErrorReporter, config *sarama.Config) *SyncProducer {
-	return &SyncProducer{
-		t:            t,
-		expectations: make([]*producerExpectation, 0),
-	}
-}
-
-////////////////////////////////////////////////
-// Implement SyncProducer interface
-////////////////////////////////////////////////
-
-// SendMessage corresponds with the SendMessage method of sarama's SyncProducer implementation.
-// You have to set expectations on the mock producer before calling SendMessage, so it knows
-// how to handle them. If there is no more remaining expectations when SendMessage is called,
-// the mock producer will write an error to the test state object.
-func (sp *SyncProducer) SendMessage(msg *sarama.ProducerMessage) (partition int32, offset int64, err error) {
-	sp.l.Lock()
-	defer sp.l.Unlock()
-
-	if len(sp.expectations) > 0 {
-		expectation := sp.expectations[0]
-		sp.expectations = sp.expectations[1:]
-
-		if expectation.Result == errProduceSuccess {
-			sp.lastOffset++
-			msg.Offset = sp.lastOffset
-			return 0, msg.Offset, nil
-		} else {
-			return -1, -1, expectation.Result
-		}
-	} else {
-		sp.t.Errorf("No more expectation set on this mock producer to handle the input message.")
-		return -1, -1, errOutOfExpectations
-	}
-}
-
-// Close corresponds with the Close method of sarama's SyncProducer implementation.
-// By closing a mock syncproducer, you also tell it that no more SendMessage calls will follow,
-// so it will write an error to the test state if there's any remaining expectations.
-func (sp *SyncProducer) Close() error {
-	sp.l.Lock()
-	defer sp.l.Unlock()
-
-	if len(sp.expectations) > 0 {
-		sp.t.Errorf("Expected to exhaust all expectations, but %d are left.", len(sp.expectations))
-	}
-
-	return nil
-}
-
-////////////////////////////////////////////////
-// Setting expectations
-////////////////////////////////////////////////
-
-// ExpectSendMessageAndSucceed sets an expectation on the mock producer that SendMessage will be
-// called. The mock producer will handle the message as if it produced successfully, i.e. by
-// returning a valid partition, and offset, and a nil error.
-func (sp *SyncProducer) ExpectSendMessageAndSucceed() {
-	sp.l.Lock()
-	defer sp.l.Unlock()
-	sp.expectations = append(sp.expectations, &producerExpectation{Result: errProduceSuccess})
-}
-
-// ExpectSendMessageAndFail sets an expectation on the mock producer that SendMessage will be
-// called. The mock producer will handle the message as if it failed to produce
-// successfully, i.e. by returning the provided error.
-func (sp *SyncProducer) ExpectSendMessageAndFail(err error) {
-	sp.l.Lock()
-	defer sp.l.Unlock()
-	sp.expectations = append(sp.expectations, &producerExpectation{Result: err})
-}
diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/mocks/sync_producer_test.go b/Godeps/_workspace/src/github.com/Shopify/sarama/mocks/sync_producer_test.go
deleted file mode 100644
index a674138e9..000000000
--- a/Godeps/_workspace/src/github.com/Shopify/sarama/mocks/sync_producer_test.go
+++ /dev/null
@@ -1,98 +0,0 @@
-package mocks
-
-import (
-	"testing"
-
-	"github.com/Shopify/sarama"
-)
-
-func TestMockSyncProducerImplementsSyncProducerInterface(t *testing.T) {
-	var mp interface{} = &SyncProducer{}
-	if _, ok := mp.(sarama.SyncProducer); !ok {
-		t.Error("The mock async producer should implement the sarama.SyncProducer interface.")
-	}
-}
-
-func TestSyncProducerReturnsExpectationsToSendMessage(t *testing.T) {
-	sp := NewSyncProducer(t, nil)
-	defer func() {
-		if err := sp.Close(); err != nil {
-			t.Error(err)
-		}
-	}()
-
-	sp.ExpectSendMessageAndSucceed()
-	sp.ExpectSendMessageAndSucceed()
-	sp.ExpectSendMessageAndFail(sarama.ErrOutOfBrokers)
-
-	msg := &sarama.ProducerMessage{Topic: "test", Value: sarama.StringEncoder("test")}
-
-	_, offset, err := sp.SendMessage(msg)
-	if err != nil {
-		t.Errorf("The first message should have been produced successfully, but got %s", err)
-	}
-	if offset != 1 || offset != msg.Offset {
-		t.Errorf("The first message should have been assigned offset 1, but got %d", msg.Offset)
-	}
-
-	_, offset, err = sp.SendMessage(msg)
-	if err != nil {
-		t.Errorf("The second message should have been produced successfully, but got %s", err)
-	}
-	if offset != 2 || offset != msg.Offset {
-		t.Errorf("The second message should have been assigned offset 2, but got %d", offset)
-	}
-
-	_, _, err = sp.SendMessage(msg)
-	if err != sarama.ErrOutOfBrokers {
-		t.Errorf("The third message should not have been produced successfully")
-	}
-
-	if err := sp.Close(); err != nil {
-		t.Error(err)
-	}
-}
-
-func TestSyncProducerWithTooManyExpectations(t *testing.T) {
-	trm := newTestReporterMock()
-
-	sp := NewSyncProducer(trm, nil)
-	sp.ExpectSendMessageAndSucceed()
-	sp.ExpectSendMessageAndFail(sarama.ErrOutOfBrokers)
-
-	msg := &sarama.ProducerMessage{Topic: "test", Value: sarama.StringEncoder("test")}
-	if _, _, err := sp.SendMessage(msg); err != nil {
-		t.Error("No error expected on first SendMessage call", err)
-	}
-
-	if err := sp.Close(); err != nil {
-		t.Error(err)
-	}
-
-	if len(trm.errors) != 1 {
-		t.Error("Expected to report an error")
-	}
-}
-
-func TestSyncProducerWithTooFewExpectations(t *testing.T) {
-	trm := newTestReporterMock()
-
-	sp := NewSyncProducer(trm, nil)
-	sp.ExpectSendMessageAndSucceed()
-
-	msg := &sarama.ProducerMessage{Topic: "test", Value: sarama.StringEncoder("test")}
-	if _, _, err := sp.SendMessage(msg); err != nil {
-		t.Error("No error expected on first SendMessage call", err)
-	}
-	if _, _, err := sp.SendMessage(msg); err != errOutOfExpectations {
-		t.Error("errOutOfExpectations expected on second SendMessage call, found:", err)
-	}
-
-	if err := sp.Close(); err != nil {
-		t.Error(err)
-	}
-
-	if len(trm.errors) != 1 {
-		t.Error("Expected to report an error")
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/offset_commit_request.go b/Godeps/_workspace/src/github.com/Shopify/sarama/offset_commit_request.go
deleted file mode 100644
index ba4ac76aa..000000000
--- a/Godeps/_workspace/src/github.com/Shopify/sarama/offset_commit_request.go
+++ /dev/null
@@ -1,172 +0,0 @@
-package sarama
-
-// ReceiveTime is a special value for the timestamp field of Offset Commit Requests which
-// tells the broker to set the timestamp to the time at which the request was received.
-// The timestamp is only used if message version 1 is used, which requires kafka 0.8.2.
-const ReceiveTime int64 = -1
-
-type offsetCommitRequestBlock struct {
-	offset    int64
-	timestamp int64
-	metadata  string
-}
-
-func (r *offsetCommitRequestBlock) encode(pe packetEncoder, version int16) error {
-	pe.putInt64(r.offset)
-	if version == 1 {
-		pe.putInt64(r.timestamp)
-	} else if r.timestamp != 0 {
-		Logger.Println("Non-zero timestamp specified for OffsetCommitRequest not v1, it will be ignored")
-	}
-
-	return pe.putString(r.metadata)
-}
-
-func (r *offsetCommitRequestBlock) decode(pd packetDecoder, version int16) (err error) {
-	if r.offset, err = pd.getInt64(); err != nil {
-		return err
-	}
-	if version == 1 {
-		if r.timestamp, err = pd.getInt64(); err != nil {
-			return err
-		}
-	}
-	r.metadata, err = pd.getString()
-	return err
-}
-
-type OffsetCommitRequest struct {
-	ConsumerGroup           string
-	ConsumerGroupGeneration int32  // v1 or later
-	ConsumerID              string // v1 or later
-	RetentionTime           int64  // v2 or later
-
-	// Version can be:
-	// - 0 (kafka 0.8.1 and later)
-	// - 1 (kafka 0.8.2 and later)
-	// - 2 (kafka 0.8.3 and later)
-	Version int16
-	blocks  map[string]map[int32]*offsetCommitRequestBlock
-}
-
-func (r *OffsetCommitRequest) encode(pe packetEncoder) error {
-	if r.Version < 0 || r.Version > 2 {
-		return PacketEncodingError{"invalid or unsupported OffsetCommitRequest version field"}
-	}
-
-	if err := pe.putString(r.ConsumerGroup); err != nil {
-		return err
-	}
-
-	if r.Version >= 1 {
-		pe.putInt32(r.ConsumerGroupGeneration)
-		if err := pe.putString(r.ConsumerID); err != nil {
-			return err
-		}
-	} else {
-		if r.ConsumerGroupGeneration != 0 {
-			Logger.Println("Non-zero ConsumerGroupGeneration specified for OffsetCommitRequest v0, it will be ignored")
-		}
-		if r.ConsumerID != "" {
-			Logger.Println("Non-empty ConsumerID specified for OffsetCommitRequest v0, it will be ignored")
-		}
-	}
-
-	if r.Version >= 2 {
-		pe.putInt64(r.RetentionTime)
-	} else if r.RetentionTime != 0 {
-		Logger.Println("Non-zero RetentionTime specified for OffsetCommitRequest version <2, it will be ignored")
-	}
-
-	if err := pe.putArrayLength(len(r.blocks)); err != nil {
-		return err
-	}
-	for topic, partitions := range r.blocks {
-		if err := pe.putString(topic); err != nil {
-			return err
-		}
-		if err := pe.putArrayLength(len(partitions)); err != nil {
-			return err
-		}
-		for partition, block := range partitions {
-			pe.putInt32(partition)
-			if err := block.encode(pe, r.Version); err != nil {
-				return err
-			}
-		}
-	}
-	return nil
-}
-
-func (r *OffsetCommitRequest) decode(pd packetDecoder) (err error) {
-	if r.ConsumerGroup, err = pd.getString(); err != nil {
-		return err
-	}
-
-	if r.Version >= 1 {
-		if r.ConsumerGroupGeneration, err = pd.getInt32(); err != nil {
-			return err
-		}
-		if r.ConsumerID, err = pd.getString(); err != nil {
-			return err
-		}
-	}
-
-	if r.Version >= 2 {
-		if r.RetentionTime, err = pd.getInt64(); err != nil {
-			return err
-		}
-	}
-
-	topicCount, err := pd.getArrayLength()
-	if err != nil {
-		return err
-	}
-	if topicCount == 0 {
-		return nil
-	}
-	r.blocks = make(map[string]map[int32]*offsetCommitRequestBlock)
-	for i := 0; i < topicCount; i++ {
-		topic, err := pd.getString()
-		if err != nil {
-			return err
-		}
-		partitionCount, err := pd.getArrayLength()
-		if err != nil {
-			return err
-		}
-		r.blocks[topic] = make(map[int32]*offsetCommitRequestBlock)
-		for j := 0; j < partitionCount; j++ {
-			partition, err := pd.getInt32()
-			if err != nil {
-				return err
-			}
-			block := &offsetCommitRequestBlock{}
-			if err := block.decode(pd, r.Version); err != nil {
-				return err
-			}
-			r.blocks[topic][partition] = block
-		}
-	}
-	return nil
-}
-
-func (r *OffsetCommitRequest) key() int16 {
-	return 8
-}
-
-func (r *OffsetCommitRequest) version() int16 {
-	return r.Version
-}
-
-func (r *OffsetCommitRequest) AddBlock(topic string, partitionID int32, offset int64, timestamp int64, metadata string) {
-	if r.blocks == nil {
-		r.blocks = make(map[string]map[int32]*offsetCommitRequestBlock)
-	}
-
-	if r.blocks[topic] == nil {
-		r.blocks[topic] = make(map[int32]*offsetCommitRequestBlock)
-	}
-
-	r.blocks[topic][partitionID] = &offsetCommitRequestBlock{offset, timestamp, metadata}
-}
diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/offset_commit_request_test.go b/Godeps/_workspace/src/github.com/Shopify/sarama/offset_commit_request_test.go
deleted file mode 100644
index afc25b7b3..000000000
--- a/Godeps/_workspace/src/github.com/Shopify/sarama/offset_commit_request_test.go
+++ /dev/null
@@ -1,90 +0,0 @@
-package sarama
-
-import "testing"
-
-var (
-	offsetCommitRequestNoBlocksV0 = []byte{
-		0x00, 0x06, 'f', 'o', 'o', 'b', 'a', 'r',
-		0x00, 0x00, 0x00, 0x00}
-
-	offsetCommitRequestNoBlocksV1 = []byte{
-		0x00, 0x06, 'f', 'o', 'o', 'b', 'a', 'r',
-		0x00, 0x00, 0x11, 0x22,
-		0x00, 0x04, 'c', 'o', 'n', 's',
-		0x00, 0x00, 0x00, 0x00}
-
-	offsetCommitRequestNoBlocksV2 = []byte{
-		0x00, 0x06, 'f', 'o', 'o', 'b', 'a', 'r',
-		0x00, 0x00, 0x11, 0x22,
-		0x00, 0x04, 'c', 'o', 'n', 's',
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0x33,
-		0x00, 0x00, 0x00, 0x00}
-
-	offsetCommitRequestOneBlockV0 = []byte{
-		0x00, 0x06, 'f', 'o', 'o', 'b', 'a', 'r',
-		0x00, 0x00, 0x00, 0x01,
-		0x00, 0x05, 't', 'o', 'p', 'i', 'c',
-		0x00, 0x00, 0x00, 0x01,
-		0x00, 0x00, 0x52, 0x21,
-		0x00, 0x00, 0x00, 0x00, 0xDE, 0xAD, 0xBE, 0xEF,
-		0x00, 0x08, 'm', 'e', 't', 'a', 'd', 'a', 't', 'a'}
-
-	offsetCommitRequestOneBlockV1 = []byte{
-		0x00, 0x06, 'f', 'o', 'o', 'b', 'a', 'r',
-		0x00, 0x00, 0x11, 0x22,
-		0x00, 0x04, 'c', 'o', 'n', 's',
-		0x00, 0x00, 0x00, 0x01,
-		0x00, 0x05, 't', 'o', 'p', 'i', 'c',
-		0x00, 0x00, 0x00, 0x01,
-		0x00, 0x00, 0x52, 0x21,
-		0x00, 0x00, 0x00, 0x00, 0xDE, 0xAD, 0xBE, 0xEF,
-		0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-		0x00, 0x08, 'm', 'e', 't', 'a', 'd', 'a', 't', 'a'}
-
-	offsetCommitRequestOneBlockV2 = []byte{
-		0x00, 0x06, 'f', 'o', 'o', 'b', 'a', 'r',
-		0x00, 0x00, 0x11, 0x22,
-		0x00, 0x04, 'c', 'o', 'n', 's',
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0x33,
-		0x00, 0x00, 0x00, 0x01,
-		0x00, 0x05, 't', 'o', 'p', 'i', 'c',
-		0x00, 0x00, 0x00, 0x01,
-		0x00, 0x00, 0x52, 0x21,
-		0x00, 0x00, 0x00, 0x00, 0xDE, 0xAD, 0xBE, 0xEF,
-		0x00, 0x08, 'm', 'e', 't', 'a', 'd', 'a', 't', 'a'}
-)
-
-func TestOffsetCommitRequestV0(t *testing.T) {
-	request := new(OffsetCommitRequest)
-	request.Version = 0
-	request.ConsumerGroup = "foobar"
-	testRequest(t, "no blocks v0", request, offsetCommitRequestNoBlocksV0)
-
-	request.AddBlock("topic", 0x5221, 0xDEADBEEF, 0, "metadata")
-	testRequest(t, "one block v0", request, offsetCommitRequestOneBlockV0)
-}
-
-func TestOffsetCommitRequestV1(t *testing.T) {
-	request := new(OffsetCommitRequest)
-	request.ConsumerGroup = "foobar"
-	request.ConsumerID = "cons"
-	request.ConsumerGroupGeneration = 0x1122
-	request.Version = 1
-	testRequest(t, "no blocks v1", request, offsetCommitRequestNoBlocksV1)
-
-	request.AddBlock("topic", 0x5221, 0xDEADBEEF, ReceiveTime, "metadata")
-	testRequest(t, "one block v1", request, offsetCommitRequestOneBlockV1)
-}
-
-func TestOffsetCommitRequestV2(t *testing.T) {
-	request := new(OffsetCommitRequest)
-	request.ConsumerGroup = "foobar"
-	request.ConsumerID = "cons"
-	request.ConsumerGroupGeneration = 0x1122
-	request.RetentionTime = 0x4433
-	request.Version = 2
-	testRequest(t, "no blocks v2", request, offsetCommitRequestNoBlocksV2)
-
-	request.AddBlock("topic", 0x5221, 0xDEADBEEF, 0, "metadata")
-	testRequest(t, "one block v2", request, offsetCommitRequestOneBlockV2)
-}
diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/offset_commit_response.go b/Godeps/_workspace/src/github.com/Shopify/sarama/offset_commit_response.go
deleted file mode 100644
index 573a3b6a1..000000000
--- a/Godeps/_workspace/src/github.com/Shopify/sarama/offset_commit_response.go
+++ /dev/null
@@ -1,73 +0,0 @@
-package sarama
-
-type OffsetCommitResponse struct {
-	Errors map[string]map[int32]KError
-}
-
-func (r *OffsetCommitResponse) AddError(topic string, partition int32, kerror KError) {
-	if r.Errors == nil {
-		r.Errors = make(map[string]map[int32]KError)
-	}
-	partitions := r.Errors[topic]
-	if partitions == nil {
-		partitions = make(map[int32]KError)
-		r.Errors[topic] = partitions
-	}
-	partitions[partition] = kerror
-}
-
-func (r *OffsetCommitResponse) encode(pe packetEncoder) error {
-	if err := pe.putArrayLength(len(r.Errors)); err != nil {
-		return err
-	}
-	for topic, partitions := range r.Errors {
-		if err := pe.putString(topic); err != nil {
-			return err
-		}
-		if err := pe.putArrayLength(len(partitions)); err != nil {
-			return err
-		}
-		for partition, kerror := range partitions {
-			pe.putInt32(partition)
-			pe.putInt16(int16(kerror))
-		}
-	}
-	return nil
-}
-
-func (r *OffsetCommitResponse) decode(pd packetDecoder) (err error) {
-	numTopics, err := pd.getArrayLength()
-	if err != nil || numTopics == 0 {
-		return err
-	}
-
-	r.Errors = make(map[string]map[int32]KError, numTopics)
-	for i := 0; i < numTopics; i++ {
-		name, err := pd.getString()
-		if err != nil {
-			return err
-		}
-
-		numErrors, err := pd.getArrayLength()
-		if err != nil {
-			return err
-		}
-
-		r.Errors[name] = make(map[int32]KError, numErrors)
-
-		for j := 0; j < numErrors; j++ {
-			id, err := pd.getInt32()
-			if err != nil {
-				return err
-			}
-
-			tmp, err := pd.getInt16()
-			if err != nil {
-				return err
-			}
-			r.Errors[name][id] = KError(tmp)
-		}
-	}
-
-	return nil
-}
diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/offset_commit_response_test.go b/Godeps/_workspace/src/github.com/Shopify/sarama/offset_commit_response_test.go
deleted file mode 100644
index 074ec9232..000000000
--- a/Godeps/_workspace/src/github.com/Shopify/sarama/offset_commit_response_test.go
+++ /dev/null
@@ -1,24 +0,0 @@
-package sarama
-
-import (
-	"testing"
-)
-
-var (
-	emptyOffsetCommitResponse = []byte{
-		0x00, 0x00, 0x00, 0x00}
-)
-
-func TestEmptyOffsetCommitResponse(t *testing.T) {
-	response := OffsetCommitResponse{}
-	testResponse(t, "empty", &response, emptyOffsetCommitResponse)
-}
-
-func TestNormalOffsetCommitResponse(t *testing.T) {
-	response := OffsetCommitResponse{}
-	response.AddError("t", 0, ErrNotLeaderForPartition)
-	response.Errors["m"] = make(map[int32]KError)
-	// The response encoded form cannot be checked for it varies due to
-	// unpredictable map traversal order.
-	testResponse(t, "normal", &response, nil)
-}
diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/offset_fetch_request.go b/Godeps/_workspace/src/github.com/Shopify/sarama/offset_fetch_request.go
deleted file mode 100644
index 30bbbbbd0..000000000
--- a/Godeps/_workspace/src/github.com/Shopify/sarama/offset_fetch_request.go
+++ /dev/null
@@ -1,71 +0,0 @@
-package sarama
-
-type OffsetFetchRequest struct {
-	ConsumerGroup string
-	Version       int16
-	partitions    map[string][]int32
-}
-
-func (r *OffsetFetchRequest) encode(pe packetEncoder) (err error) {
-	if r.Version < 0 || r.Version > 1 {
-		return PacketEncodingError{"invalid or unsupported OffsetFetchRequest version field"}
-	}
-
-	if err = pe.putString(r.ConsumerGroup); err != nil {
-		return err
-	}
-	if err = pe.putArrayLength(len(r.partitions)); err != nil {
-		return err
-	}
-	for topic, partitions := range r.partitions {
-		if err = pe.putString(topic); err != nil {
-			return err
-		}
-		if err = pe.putInt32Array(partitions); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func (r *OffsetFetchRequest) decode(pd packetDecoder) (err error) {
-	if r.ConsumerGroup, err = pd.getString(); err != nil {
-		return err
-	}
-	partitionCount, err := pd.getArrayLength()
-	if err != nil {
-		return err
-	}
-	if partitionCount == 0 {
-		return nil
-	}
-	r.partitions = make(map[string][]int32)
-	for i := 0; i < partitionCount; i++ {
-		topic, err := pd.getString()
-		if err != nil {
-			return err
-		}
-		partitions, err := pd.getInt32Array()
-		if err != nil {
-			return err
-		}
-		r.partitions[topic] = partitions
-	}
-	return nil
-}
-
-func (r *OffsetFetchRequest) key() int16 {
-	return 9
-}
-
-func (r *OffsetFetchRequest) version() int16 {
-	return r.Version
-}
-
-func (r *OffsetFetchRequest) AddPartition(topic string, partitionID int32) {
-	if r.partitions == nil {
-		r.partitions = make(map[string][]int32)
-	}
-
-	r.partitions[topic] = append(r.partitions[topic], partitionID)
-}
diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/offset_fetch_request_test.go b/Godeps/_workspace/src/github.com/Shopify/sarama/offset_fetch_request_test.go
deleted file mode 100644
index 025d725c9..000000000
--- a/Godeps/_workspace/src/github.com/Shopify/sarama/offset_fetch_request_test.go
+++ /dev/null
@@ -1,31 +0,0 @@
-package sarama
-
-import "testing"
-
-var (
-	offsetFetchRequestNoGroupNoPartitions = []byte{
-		0x00, 0x00,
-		0x00, 0x00, 0x00, 0x00}
-
-	offsetFetchRequestNoPartitions = []byte{
-		0x00, 0x04, 'b', 'l', 'a', 'h',
-		0x00, 0x00, 0x00, 0x00}
-
-	offsetFetchRequestOnePartition = []byte{
-		0x00, 0x04, 'b', 'l', 'a', 'h',
-		0x00, 0x00, 0x00, 0x01,
-		0x00, 0x0D, 't', 'o', 'p', 'i', 'c', 'T', 'h', 'e', 'F', 'i', 'r', 's', 't',
-		0x00, 0x00, 0x00, 0x01,
-		0x4F, 0x4F, 0x4F, 0x4F}
-)
-
-func TestOffsetFetchRequest(t *testing.T) {
-	request := new(OffsetFetchRequest)
-	testRequest(t, "no group, no partitions", request, offsetFetchRequestNoGroupNoPartitions)
-
-	request.ConsumerGroup = "blah"
-	testRequest(t, "no partitions", request, offsetFetchRequestNoPartitions)
-
-	request.AddPartition("topicTheFirst", 0x4F4F4F4F)
-	testRequest(t, "one partition", request, offsetFetchRequestOnePartition)
-}
diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/offset_fetch_response.go b/Godeps/_workspace/src/github.com/Shopify/sarama/offset_fetch_response.go
deleted file mode 100644
index 93078c350..000000000
--- a/Godeps/_workspace/src/github.com/Shopify/sarama/offset_fetch_response.go
+++ /dev/null
@@ -1,131 +0,0 @@
-package sarama
-
-type OffsetFetchResponseBlock struct {
-	Offset   int64
-	Metadata string
-	Err      KError
-}
-
-func (r *OffsetFetchResponseBlock) decode(pd packetDecoder) (err error) {
-	r.Offset, err = pd.getInt64()
-	if err != nil {
-		return err
-	}
-
-	r.Metadata, err = pd.getString()
-	if err != nil {
-		return err
-	}
-
-	tmp, err := pd.getInt16()
-	if err != nil {
-		return err
-	}
-	r.Err = KError(tmp)
-
-	return nil
-}
-
-func (r *OffsetFetchResponseBlock) encode(pe packetEncoder) (err error) {
-	pe.putInt64(r.Offset)
-
-	err = pe.putString(r.Metadata)
-	if err != nil {
-		return err
-	}
-
-	pe.putInt16(int16(r.Err))
-
-	return nil
-}
-
-type OffsetFetchResponse struct {
-	Blocks map[string]map[int32]*OffsetFetchResponseBlock
-}
-
-func (r *OffsetFetchResponse) encode(pe packetEncoder) error {
-	if err := pe.putArrayLength(len(r.Blocks)); err != nil {
-		return err
-	}
-	for topic, partitions := range r.Blocks {
-		if err := pe.putString(topic); err != nil {
-			return err
-		}
-		if err := pe.putArrayLength(len(partitions)); err != nil {
-			return err
-		}
-		for partition, block := range partitions {
-			pe.putInt32(partition)
-			if err := block.encode(pe); err != nil {
-				return err
-			}
-		}
-	}
-	return nil
-}
-
-func (r *OffsetFetchResponse) decode(pd packetDecoder) (err error) {
-	numTopics, err := pd.getArrayLength()
-	if err != nil || numTopics == 0 {
-		return err
-	}
-
-	r.Blocks = make(map[string]map[int32]*OffsetFetchResponseBlock, numTopics)
-	for i := 0; i < numTopics; i++ {
-		name, err := pd.getString()
-		if err != nil {
-			return err
-		}
-
-		numBlocks, err := pd.getArrayLength()
-		if err != nil {
-			return err
-		}
-
-		if numBlocks == 0 {
-			r.Blocks[name] = nil
-			continue
-		}
-		r.Blocks[name] = make(map[int32]*OffsetFetchResponseBlock, numBlocks)
-
-		for j := 0; j < numBlocks; j++ {
-			id, err := pd.getInt32()
-			if err != nil {
-				return err
-			}
-
-			block := new(OffsetFetchResponseBlock)
-			err = block.decode(pd)
-			if err != nil {
-				return err
-			}
-			r.Blocks[name][id] = block
-		}
-	}
-
-	return nil
-}
-
-func (r *OffsetFetchResponse) GetBlock(topic string, partition int32) *OffsetFetchResponseBlock {
-	if r.Blocks == nil {
-		return nil
-	}
-
-	if r.Blocks[topic] == nil {
-		return nil
-	}
-
-	return r.Blocks[topic][partition]
-}
-
-func (r *OffsetFetchResponse) AddBlock(topic string, partition int32, block *OffsetFetchResponseBlock) {
-	if r.Blocks == nil {
-		r.Blocks = make(map[string]map[int32]*OffsetFetchResponseBlock)
-	}
-	partitions := r.Blocks[topic]
-	if partitions == nil {
-		partitions = make(map[int32]*OffsetFetchResponseBlock)
-		r.Blocks[topic] = partitions
-	}
-	partitions[partition] = block
-}
diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/offset_fetch_response_test.go b/Godeps/_workspace/src/github.com/Shopify/sarama/offset_fetch_response_test.go
deleted file mode 100644
index 7614ae424..000000000
--- a/Godeps/_workspace/src/github.com/Shopify/sarama/offset_fetch_response_test.go
+++ /dev/null
@@ -1,22 +0,0 @@
-package sarama
-
-import "testing"
-
-var (
-	emptyOffsetFetchResponse = []byte{
-		0x00, 0x00, 0x00, 0x00}
-)
-
-func TestEmptyOffsetFetchResponse(t *testing.T) {
-	response := OffsetFetchResponse{}
-	testResponse(t, "empty", &response, emptyOffsetFetchResponse)
-}
-
-func TestNormalOffsetFetchResponse(t *testing.T) {
-	response := OffsetFetchResponse{}
-	response.AddBlock("t", 0, &OffsetFetchResponseBlock{0, "md", ErrRequestTimedOut})
-	response.Blocks["m"] = nil
-	// The response encoded form cannot be checked for it varies due to
-	// unpredictable map traversal order.
-	testResponse(t, "normal", &response, nil)
-}
diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/offset_request.go b/Godeps/_workspace/src/github.com/Shopify/sarama/offset_request.go
deleted file mode 100644
index 842d5c0f8..000000000
--- a/Godeps/_workspace/src/github.com/Shopify/sarama/offset_request.go
+++ /dev/null
@@ -1,113 +0,0 @@
-package sarama
-
-type offsetRequestBlock struct {
-	time       int64
-	maxOffsets int32
-}
-
-func (r *offsetRequestBlock) encode(pe packetEncoder) error {
-	pe.putInt64(int64(r.time))
-	pe.putInt32(r.maxOffsets)
-	return nil
-}
-
-func (r *offsetRequestBlock) decode(pd packetDecoder) (err error) {
-	if r.time, err = pd.getInt64(); err != nil {
-		return err
-	}
-	if r.maxOffsets, err = pd.getInt32(); err != nil {
-		return err
-	}
-	return nil
-}
-
-type OffsetRequest struct {
-	blocks map[string]map[int32]*offsetRequestBlock
-}
-
-func (r *OffsetRequest) encode(pe packetEncoder) error {
-	pe.putInt32(-1) // replica ID is always -1 for clients
-	err := pe.putArrayLength(len(r.blocks))
-	if err != nil {
-		return err
-	}
-	for topic, partitions := range r.blocks {
-		err = pe.putString(topic)
-		if err != nil {
-			return err
-		}
-		err = pe.putArrayLength(len(partitions))
-		if err != nil {
-			return err
-		}
-		for partition, block := range partitions {
-			pe.putInt32(partition)
-			if err = block.encode(pe); err != nil {
-				return err
-			}
-		}
-	}
-	return nil
-}
-
-func (r *OffsetRequest) decode(pd packetDecoder) error {
-	// Ignore replica ID
-	if _, err := pd.getInt32(); err != nil {
-		return err
-	}
-	blockCount, err := pd.getArrayLength()
-	if err != nil {
-		return err
-	}
-	if blockCount == 0 {
-		return nil
-	}
-	r.blocks = make(map[string]map[int32]*offsetRequestBlock)
-	for i := 0; i < blockCount; i++ {
-		topic, err := pd.getString()
-		if err != nil {
-			return err
-		}
-		partitionCount, err := pd.getArrayLength()
-		if err != nil {
-			return err
-		}
-		r.blocks[topic] = make(map[int32]*offsetRequestBlock)
-		for j := 0; j < partitionCount; j++ {
-			partition, err := pd.getInt32()
-			if err != nil {
-				return err
-			}
-			block := &offsetRequestBlock{}
-			if err := block.decode(pd); err != nil {
-				return err
-			}
-			r.blocks[topic][partition] = block
-		}
-	}
-	return nil
-}
-
-func (r *OffsetRequest) key() int16 {
-	return 2
-}
-
-func (r *OffsetRequest) version() int16 {
-	return 0
-}
-
-func (r *OffsetRequest) AddBlock(topic string, partitionID int32, time int64, maxOffsets int32) {
-	if r.blocks == nil {
-		r.blocks = make(map[string]map[int32]*offsetRequestBlock)
-	}
-
-	if r.blocks[topic] == nil {
-		r.blocks[topic] = make(map[int32]*offsetRequestBlock)
-	}
-
-	tmp := new(offsetRequestBlock)
-	tmp.time = time
-	tmp.maxOffsets = maxOffsets
-
-	r.blocks[topic][partitionID] = tmp
-}
diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/offset_request_test.go b/Godeps/_workspace/src/github.com/Shopify/sarama/offset_request_test.go
deleted file mode 100644
index f3b3046bb..000000000
--- a/Godeps/_workspace/src/github.com/Shopify/sarama/offset_request_test.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package sarama
-
-import "testing"
-
-var (
-	offsetRequestNoBlocks = []byte{
-		0xFF, 0xFF, 0xFF, 0xFF,
-		0x00, 0x00, 0x00, 0x00}
-
-	offsetRequestOneBlock = []byte{
-		0xFF, 0xFF, 0xFF, 0xFF,
-		0x00, 0x00, 0x00, 0x01,
-		0x00, 0x03, 'f', 'o', 'o',
-		0x00, 0x00, 0x00, 0x01,
-		0x00, 0x00, 0x00, 0x04,
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
-		0x00, 0x00, 0x00, 0x02}
-)
-
-func TestOffsetRequest(t *testing.T) {
-	request := new(OffsetRequest)
-	testRequest(t, "no blocks", request, offsetRequestNoBlocks)
-
-	request.AddBlock("foo", 4, 1, 2)
-	testRequest(t, "one block", request, offsetRequestOneBlock)
-}
diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/offset_response.go b/Godeps/_workspace/src/github.com/Shopify/sarama/offset_response.go
deleted file mode 100644
index 07d71ca72..000000000
--- a/Godeps/_workspace/src/github.com/Shopify/sarama/offset_response.go
+++ /dev/null
@@ -1,130 +0,0 @@
-package sarama
-
-type OffsetResponseBlock struct {
-	Err     KError
-	Offsets []int64
-}
-
-func (r *OffsetResponseBlock) decode(pd packetDecoder) (err error) {
-	tmp, err := pd.getInt16()
-	if err != nil {
-		return err
-	}
-	r.Err = KError(tmp)
-
-	r.Offsets, err = pd.getInt64Array()
-
-	return err
-}
-
-func (r *OffsetResponseBlock) encode(pe packetEncoder) (err error) {
-	pe.putInt16(int16(r.Err))
-
-	return pe.putInt64Array(r.Offsets)
-}
-
-type OffsetResponse struct {
-	Blocks map[string]map[int32]*OffsetResponseBlock
-}
-
-func (r *OffsetResponse) decode(pd packetDecoder) (err error) {
-	numTopics, err := pd.getArrayLength()
-	if err != nil {
-		return err
-	}
-
-	r.Blocks = make(map[string]map[int32]*OffsetResponseBlock, numTopics)
-	for i := 0; i < numTopics; i++ {
-		name, err := pd.getString()
-		if err != nil {
-			return err
-		}
-
-		numBlocks, err := pd.getArrayLength()
-		if err != nil {
-			return err
-		}
-
-		r.Blocks[name] = make(map[int32]*OffsetResponseBlock, numBlocks)
-
-		for j := 0; j < numBlocks; j++ {
-			id, err := pd.getInt32()
-			if err != nil {
-				return err
-			}
-
-			block := new(OffsetResponseBlock)
-			err = block.decode(pd)
-			if err != nil {
-				return err
-			}
-			r.Blocks[name][id] = block
-		}
-	}
-
-	return nil
-}
-
-func (r *OffsetResponse) GetBlock(topic string, partition int32) *OffsetResponseBlock {
-	if r.Blocks == nil {
-		return nil
-	}
-
-	if r.Blocks[topic] == nil {
-		return nil
-	}
-
-	return r.Blocks[topic][partition]
-}
-
-/*
-// [0 0 0 1 ntopics
-0 8 109 121 95 116 111 112 105 99 topic
-0 0 0 1 npartitions
-0 0 0 0 id
-0 0
-
-0 0 0 1 0 0 0 0
-0 1 1 1 0 0 0 1
-0 8 109 121 95 116 111 112
-105 99 0 0 0 1 0 0
-0 0 0 0 0 0 0 1
-0 0 0 0 0 1 1 1] <nil>
-
-*/
-func (r *OffsetResponse) encode(pe packetEncoder) (err error) {
-	if err = pe.putArrayLength(len(r.Blocks)); err != nil {
-		return err
-	}
-
-	for topic, partitions := range r.Blocks {
-		if err = pe.putString(topic); err != nil {
-			return err
-		}
-		if err = pe.putArrayLength(len(partitions)); err != nil {
-			return err
-		}
-		for partition, block := range partitions {
-			pe.putInt32(partition)
-			if err = block.encode(pe); err != nil {
-				return err
-			}
-		}
-	}
-
-	return nil
-}
-
-// testing API
-
-func (r *OffsetResponse) AddTopicPartition(topic string, partition int32, offset int64) {
-	if r.Blocks == nil {
-		r.Blocks = make(map[string]map[int32]*OffsetResponseBlock)
-	}
-	byTopic, ok := r.Blocks[topic]
-	if !ok {
-		byTopic = make(map[int32]*OffsetResponseBlock)
-		r.Blocks[topic] = byTopic
-	}
-	byTopic[partition] = &OffsetResponseBlock{Offsets: []int64{offset}}
-}
diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/offset_response_test.go b/Godeps/_workspace/src/github.com/Shopify/sarama/offset_response_test.go
deleted file mode 100644
index a427cbd20..000000000
--- a/Godeps/_workspace/src/github.com/Shopify/sarama/offset_response_test.go
+++ /dev/null
@@ -1,62 +0,0 @@
-package sarama
-
-import "testing"
-
-var (
-	emptyOffsetResponse = []byte{
-		0x00, 0x00, 0x00, 0x00}
-
-	normalOffsetResponse = []byte{
-		0x00, 0x00, 0x00, 0x02,
-
-		0x00, 0x01, 'a',
-		0x00, 0x00, 0x00, 0x00,
-
-		0x00, 0x01, 'z',
-		0x00, 0x00, 0x00, 0x01,
-		0x00, 0x00, 0x00, 0x02,
-		0x00, 0x00,
-		0x00, 0x00, 0x00, 0x02,
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05,
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06}
-)
-
-func TestEmptyOffsetResponse(t *testing.T) {
-	response := OffsetResponse{}
-
-	testDecodable(t, "empty", &response, emptyOffsetResponse)
-	if len(response.Blocks) != 0 {
-		t.Error("Decoding produced", len(response.Blocks), "topics where there were none.")
-	}
-}
-
-func TestNormalOffsetResponse(t *testing.T) {
-	response := OffsetResponse{}
-
-	testDecodable(t, "normal", &response, normalOffsetResponse)
-
-	if len(response.Blocks) != 2 {
-		t.Fatal("Decoding produced", len(response.Blocks), "topics where there were two.")
-	}
-
-	if len(response.Blocks["a"]) != 0 {
-		t.Fatal("Decoding produced", len(response.Blocks["a"]), "partitions for topic 'a' where there were none.")
-	}
-
-	if len(response.Blocks["z"]) != 1 {
-		t.Fatal("Decoding produced", len(response.Blocks["z"]), "partitions for topic 'z' where there was one.")
-	}
-
-	if response.Blocks["z"][2].Err != ErrNoError {
-		t.Fatal("Decoding produced invalid error for topic z partition 2.")
-	}
-
-	if len(response.Blocks["z"][2].Offsets) != 2 {
-		t.Fatal("Decoding produced invalid number of offsets for topic z partition 2.")
-	}
-
-	if response.Blocks["z"][2].Offsets[0] != 5 || response.Blocks["z"][2].Offsets[1] != 6 {
-		t.Fatal("Decoding produced invalid offsets for topic z partition 2.")
-	}
-
-}
diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/packet_decoder.go b/Godeps/_workspace/src/github.com/Shopify/sarama/packet_decoder.go
deleted file mode 100644
index 034222313..000000000
--- a/Godeps/_workspace/src/github.com/Shopify/sarama/packet_decoder.go
+++ /dev/null
@@ -1,44 +0,0 @@
-package sarama
-
-// PacketDecoder is the interface providing helpers for reading with Kafka's encoding rules.
-// Types implementing Decoder only need to worry about calling methods like GetString,
-// not about how a string is represented in Kafka.
-type packetDecoder interface {
-	// Primitives
-	getInt8() (int8, error)
-	getInt16() (int16, error)
-	getInt32() (int32, error)
-	getInt64() (int64, error)
-	getArrayLength() (int, error)
-
-	// Collections
-	getBytes() ([]byte, error)
-	getString() (string, error)
-	getInt32Array() ([]int32, error)
-	getInt64Array() ([]int64, error)
-
-	// Subsets
-	remaining() int
-	getSubset(length int) (packetDecoder, error)
-
-	// Stacks, see PushDecoder
-	push(in pushDecoder) error
-	pop() error
-}
-
-// PushDecoder is the interface for decoding fields like CRCs and lengths where the validity
-// of the field depends on what is after it in the packet. Start them with PacketDecoder.Push() where
-// the actual value is located in the packet, then PacketDecoder.Pop() them when all the bytes they
-// depend upon have been decoded.
-type pushDecoder interface {
-	// Saves the offset into the input buffer as the location to actually read the calculated value when able.
-	saveOffset(in int)
-
-	// Returns the length of data to reserve for the input of this encoder (eg 4 bytes for a CRC32).
-	reserveLength() int
-
-	// Indicates that all required data is now available to calculate and check the field.
-	// SaveOffset is guaranteed to have been called first. The implementation should read ReserveLength() bytes
-	// of data from the saved offset, and verify it based on the data between the saved offset and curOffset.
-	check(curOffset int, buf []byte) error
-}
diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/packet_encoder.go b/Godeps/_workspace/src/github.com/Shopify/sarama/packet_encoder.go
deleted file mode 100644
index 2c5710938..000000000
--- a/Godeps/_workspace/src/github.com/Shopify/sarama/packet_encoder.go
+++ /dev/null
@@ -1,41 +0,0 @@
-package sarama
-
-// PacketEncoder is the interface providing helpers for writing with Kafka's encoding rules.
-// Types implementing Encoder only need to worry about calling methods like PutString,
-// not about how a string is represented in Kafka.
-type packetEncoder interface {
-	// Primitives
-	putInt8(in int8)
-	putInt16(in int16)
-	putInt32(in int32)
-	putInt64(in int64)
-	putArrayLength(in int) error
-
-	// Collections
-	putBytes(in []byte) error
-	putRawBytes(in []byte) error
-	putString(in string) error
-	putInt32Array(in []int32) error
-	putInt64Array(in []int64) error
-
-	// Stacks, see PushEncoder
-	push(in pushEncoder)
-	pop() error
-}
-
-// PushEncoder is the interface for encoding fields like CRCs and lengths where the value
-// of the field depends on what is encoded after it in the packet. Start them with PacketEncoder.Push() where
-// the actual value is located in the packet, then PacketEncoder.Pop() them when all the bytes they
-// depend upon have been written.
-type pushEncoder interface {
-	// Saves the offset into the input buffer as the location to actually write the calculated value when able.
-	saveOffset(in int)
-
-	// Returns the length of data to reserve for the output of this encoder (eg 4 bytes for a CRC32).
-	reserveLength() int
-
-	// Indicates that all required data is now available to calculate and write the field.
-	// SaveOffset is guaranteed to have been called first. The implementation should write ReserveLength() bytes
-	// of data to the saved offset, based on the data between the saved offset and curOffset.
-	run(curOffset int, buf []byte) error
-}
diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/partitioner.go b/Godeps/_workspace/src/github.com/Shopify/sarama/partitioner.go
deleted file mode 100644
index 493ee0ec3..000000000
--- a/Godeps/_workspace/src/github.com/Shopify/sarama/partitioner.go
+++ /dev/null
@@ -1,120 +0,0 @@
-package sarama
-
-import (
-	"hash"
-	"hash/fnv"
-	"math/rand"
-	"time"
-)
-
-// Partitioner is anything that, given a Kafka message and a number of partitions indexed [0...numPartitions-1],
-// decides to which partition to send the message. RandomPartitioner, RoundRobinPartitioner and HashPartitioner are provided
-// as simple default implementations.
-type Partitioner interface {
-	Partition(message *ProducerMessage, numPartitions int32) (int32, error) // Partition takes a message and partition count and chooses a partition
-
-	// RequiresConsistency indicates to the user of the partitioner whether the mapping of key->partition is consistent or not.
-	// Specifically, if a partitioner requires consistency then it must be allowed to choose from all partitions (even ones known to
-	// be unavailable), and its choice must be respected by the caller. The obvious example is the HashPartitioner.
-	RequiresConsistency() bool
-}
-
-// PartitionerConstructor is the type for a function capable of constructing new Partitioners.
-type PartitionerConstructor func(topic string) Partitioner
-
-type manualPartitioner struct{}
-
-// NewManualPartitioner returns a Partitioner which uses the partition manually set in the provided
-// ProducerMessage's Partition field as the partition to produce to.
-func NewManualPartitioner(topic string) Partitioner {
-	return new(manualPartitioner)
-}
-
-func (p *manualPartitioner) Partition(message *ProducerMessage, numPartitions int32) (int32, error) {
-	return message.Partition, nil
-}
-
-func (p *manualPartitioner) RequiresConsistency() bool {
-	return true
-}
-
-type randomPartitioner struct {
-	generator *rand.Rand
-}
-
-// NewRandomPartitioner returns a Partitioner which chooses a random partition each time.
-func NewRandomPartitioner(topic string) Partitioner {
-	p := new(randomPartitioner)
-	p.generator = rand.New(rand.NewSource(time.Now().UTC().UnixNano()))
-	return p
-}
-
-func (p *randomPartitioner) Partition(message *ProducerMessage, numPartitions int32) (int32, error) {
-	return int32(p.generator.Intn(int(numPartitions))), nil
-}
-
-func (p *randomPartitioner) RequiresConsistency() bool {
-	return false
-}
-
-type roundRobinPartitioner struct {
-	partition int32
-}
-
-// NewRoundRobinPartitioner returns a Partitioner which walks through the available partitions one at a time.
-func NewRoundRobinPartitioner(topic string) Partitioner {
-	return &roundRobinPartitioner{}
-}
-
-func (p *roundRobinPartitioner) Partition(message *ProducerMessage, numPartitions int32) (int32, error) {
-	if p.partition >= numPartitions {
-		p.partition = 0
-	}
-	ret := p.partition
-	p.partition++
-	return ret, nil
-}
-
-func (p *roundRobinPartitioner) RequiresConsistency() bool {
-	return false
-}
-
-type hashPartitioner struct {
-	random Partitioner
-	hasher hash.Hash32
-}
-
-// NewHashPartitioner returns a Partitioner which behaves as follows. If the message's key is nil, or fails to
-// encode, then a random partition is chosen. Otherwise the FNV-1a hash of the encoded bytes of the message key
-// is used, modulus the number of partitions. This ensures that messages with the same key always end up on the
-// same partition.
-func NewHashPartitioner(topic string) Partitioner {
-	p := new(hashPartitioner)
-	p.random = NewRandomPartitioner(topic)
-	p.hasher = fnv.New32a()
-	return p
-}
-
-func (p *hashPartitioner) Partition(message *ProducerMessage, numPartitions int32) (int32, error) {
-	if message.Key == nil {
-		return p.random.Partition(message, numPartitions)
-	}
-	bytes, err := message.Key.Encode()
-	if err != nil {
-		return -1, err
-	}
-	p.hasher.Reset()
-	_, err = p.hasher.Write(bytes)
-	if err != nil {
-		return -1, err
-	}
-	hash := int32(p.hasher.Sum32())
-	if hash < 0 {
-		hash = -hash
-	}
-	return hash % numPartitions, nil
-}
-
-func (p *hashPartitioner) RequiresConsistency() bool {
-	return true
-}
diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/partitioner_test.go b/Godeps/_workspace/src/github.com/Shopify/sarama/partitioner_test.go
deleted file mode 100644
index f44c509d6..000000000
--- a/Godeps/_workspace/src/github.com/Shopify/sarama/partitioner_test.go
+++ /dev/null
@@ -1,198 +0,0 @@
-package sarama
-
-import (
-	"crypto/rand"
-	"log"
-	"testing"
-)
-
-func assertPartitioningConsistent(t *testing.T, partitioner Partitioner, message *ProducerMessage, numPartitions int32) {
-	choice, err := partitioner.Partition(message, numPartitions)
-	if err != nil {
-		t.Error(partitioner, err)
-	}
-	if choice < 0 || choice >= numPartitions {
-		t.Error(partitioner, "returned partition", choice, "outside of range for", message)
-	}
-	for i := 1; i < 50; i++ {
-		newChoice, err := partitioner.Partition(message, numPartitions)
-		if err != nil {
-			t.Error(partitioner, err)
-		}
-		if newChoice != choice {
-			t.Error(partitioner, "returned partition", newChoice, "inconsistent with", choice, ".")
-		}
-	}
-}
-
-func TestRandomPartitioner(t *testing.T) {
-	partitioner := NewRandomPartitioner("mytopic")
-
-	choice, err := partitioner.Partition(nil, 1)
-	if err != nil {
-		t.Error(partitioner, err)
-	}
-	if choice != 0 {
-		t.Error("Returned non-zero partition when only one available.")
-	}
-
-	for i := 1; i < 50; i++ {
-		choice, err := partitioner.Partition(nil, 50)
-		if err != nil {
-			t.Error(partitioner, err)
-		}
-		if choice < 0 || choice >= 50 {
-			t.Error("Returned partition", choice, "outside of range.")
-		}
-	}
-}
-
-func TestRoundRobinPartitioner(t *testing.T) {
-	partitioner := NewRoundRobinPartitioner("mytopic")
-
-	choice, err := partitioner.Partition(nil, 1)
-	if err != nil {
-		t.Error(partitioner, err)
-	}
-	if choice != 0 {
-		t.Error("Returned non-zero partition when only one available.")
-	}
-
-	var i int32
-	for i = 1; i < 50; i++ {
-		choice, err := partitioner.Partition(nil, 7)
-		if err != nil {
-			t.Error(partitioner, err)
-		}
-		if choice != i%7 {
-			t.Error("Returned partition", choice, "expecting", i%7)
-		}
-	}
-}
-
-func TestHashPartitioner(t *testing.T) {
-	partitioner := NewHashPartitioner("mytopic")
-
-	choice, err := partitioner.Partition(&ProducerMessage{}, 1)
-	if err != nil {
-		t.Error(partitioner, err)
-	}
-	if choice != 0 {
-		t.Error("Returned non-zero partition when only one available.")
-	}
-
-	for i := 1; i < 50; i++ {
-		choice, err := partitioner.Partition(&ProducerMessage{}, 50)
-		if err != nil {
-			t.Error(partitioner, err)
-		}
-		if choice < 0 || choice >= 50 {
-			t.Error("Returned partition", choice, "outside of range for nil key.")
-		}
-	}
-
-	buf := make([]byte, 256)
-	for i := 1; i < 50; i++ {
-		if _, err := rand.Read(buf); err != nil {
-			t.Error(err)
-		}
-		assertPartitioningConsistent(t, partitioner, &ProducerMessage{Key: ByteEncoder(buf)}, 50)
-	}
-}
-
-func TestManualPartitioner(t *testing.T) {
-	partitioner := NewManualPartitioner("mytopic")
-
-	choice, err := partitioner.Partition(&ProducerMessage{}, 1)
-	if err != nil {
-		t.Error(partitioner, err)
-	}
-	if choice != 0 {
-		t.Error("Returned non-zero partition when only one available.")
-	}
-
-	for i := int32(1); i < 50; i++ {
-		choice, err := partitioner.Partition(&ProducerMessage{Partition: i}, 50)
-		if err != nil {
-			t.Error(partitioner, err)
-		}
-		if choice != i {
-			t.Error("Returned partition not the same as the input partition")
-		}
-	}
-}
-
-// By default, Sarama uses the message's key to consistently assign a partition to
-// a message using hashing. If no key is set, a random partition will be chosen.
-// This example shows how you can partition messages randomly, even when a key is set,
-// by overriding Config.Producer.Partitioner.
-func ExamplePartitioner_random() {
-	config := NewConfig()
-	config.Producer.Partitioner = NewRandomPartitioner
-
-	producer, err := NewSyncProducer([]string{"localhost:9092"}, config)
-	if err != nil {
-		log.Fatal(err)
-	}
-	defer func() {
-		if err := producer.Close(); err != nil {
-			log.Println("Failed to close producer:", err)
-		}
-	}()
-
-	msg := &ProducerMessage{Topic: "test", Key: StringEncoder("key is set"), Value: StringEncoder("test")}
-	partition, offset, err := producer.SendMessage(msg)
-	if err != nil {
-		log.Fatalln("Failed to produce message to kafka cluster.")
-	}
-
-	log.Printf("Produced message to partition %d with offset %d", partition, offset)
-}
-
-// This example shows how to assign partitions to your messages manually.
-func ExamplePartitioner_manual() {
-	config := NewConfig()
-
-	// First, we tell the producer that we are going to partition ourselves.
-	config.Producer.Partitioner = NewManualPartitioner
-
-	producer, err := NewSyncProducer([]string{"localhost:9092"}, config)
-	if err != nil {
-		log.Fatal(err)
-	}
-	defer func() {
-		if err := producer.Close(); err != nil {
-			log.Println("Failed to close producer:", err)
-		}
-	}()
-
-	// Now, we set the Partition field of the ProducerMessage struct.
-	msg := &ProducerMessage{Topic: "test", Partition: 6, Value: StringEncoder("test")}
-
-	partition, offset, err := producer.SendMessage(msg)
-	if err != nil {
-		log.Fatalln("Failed to produce message to kafka cluster.")
-	}
-
-	if partition != 6 {
-		log.Fatal("Message should have been produced to partition 6!")
-	}
-
-	log.Printf("Produced message to partition %d with offset %d", partition, offset)
-}
-
-// This example shows how to set a different partitioner depending on the topic.
-func ExamplePartitioner_per_topic() {
-	config := NewConfig()
-	config.Producer.Partitioner = func(topic string) Partitioner {
-		switch topic {
-		case "access_log", "error_log":
-			return NewRandomPartitioner(topic)
-
-		default:
-			return NewHashPartitioner(topic)
-		}
-	}
-
-	// ...
-}
diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/prep_encoder.go b/Godeps/_workspace/src/github.com/Shopify/sarama/prep_encoder.go
deleted file mode 100644
index ddeef780e..000000000
--- a/Godeps/_workspace/src/github.com/Shopify/sarama/prep_encoder.go
+++ /dev/null
@@ -1,95 +0,0 @@
-package sarama
-
-import (
-	"fmt"
-	"math"
-)
-
-type prepEncoder struct {
-	length int
-}
-
-// primitives
-
-func (pe *prepEncoder) putInt8(in int8) {
-	pe.length += 1
-}
-
-func (pe *prepEncoder) putInt16(in int16) {
-	pe.length += 2
-}
-
-func (pe *prepEncoder) putInt32(in int32) {
-	pe.length += 4
-}
-
-func (pe *prepEncoder) putInt64(in int64) {
-	pe.length += 8
-}
-
-func (pe *prepEncoder) putArrayLength(in int) error {
-	if in > math.MaxInt32 {
-		return PacketEncodingError{fmt.Sprintf("array too long (%d)", in)}
-	}
-	pe.length += 4
-	return nil
-}
-
-// arrays
-
-func (pe *prepEncoder) putBytes(in []byte) error {
-	pe.length += 4
-	if in == nil {
-		return nil
-	}
-	if len(in) > math.MaxInt32 {
-		return PacketEncodingError{fmt.Sprintf("byteslice too long (%d)", len(in))}
-	}
-	pe.length += len(in)
-	return nil
-}
-
-func (pe *prepEncoder) putRawBytes(in []byte) error {
-	if len(in) > math.MaxInt32 {
-		return PacketEncodingError{fmt.Sprintf("byteslice too long (%d)", len(in))}
-	}
-	pe.length += len(in)
-	return nil
-}
-
-func (pe *prepEncoder) putString(in string) error {
-	pe.length += 2
-	if len(in) > math.MaxInt16 {
-		return PacketEncodingError{fmt.Sprintf("string too long (%d)", len(in))}
-	}
-	pe.length += len(in)
-	return nil
-}
-
-func (pe *prepEncoder) putInt32Array(in []int32) error {
-	err := pe.putArrayLength(len(in))
-	if err != nil {
-		return err
-	}
-	pe.length += 4 * len(in)
-	return nil
-}
-
-func (pe *prepEncoder) putInt64Array(in []int64) error {
-	err := pe.putArrayLength(len(in))
-	if err != nil {
-		return err
-	}
-	pe.length += 8 * len(in)
-	return nil
-}
-
-// stackable
-
-func (pe *prepEncoder) push(in pushEncoder) {
-	pe.length += in.reserveLength()
-}
-
-func (pe *prepEncoder) pop() error {
-	return nil
-}
diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/produce_request.go b/Godeps/_workspace/src/github.com/Shopify/sarama/produce_request.go
deleted file mode 100644
index f21956137..000000000
--- a/Godeps/_workspace/src/github.com/Shopify/sarama/produce_request.go
+++ /dev/null
@@ -1,148 +0,0 @@
-package sarama
-
-// RequiredAcks is used in Produce Requests to tell the broker how many replica acknowledgements
-// it must see before responding. Any of the constants defined here are valid. On broker versions
-// prior to 0.8.2.0 any other positive int16 is also valid (the broker will wait for that many
-// acknowledgements) but in 0.8.2.0 and later this will raise an exception (it has been replaced
-// by setting the `min.isr` value in the brokers configuration).
-type RequiredAcks int16
-
-const (
-	// NoResponse doesn't send any response, the TCP ACK is all you get.
-	NoResponse RequiredAcks = 0
-	// WaitForLocal waits for only the local commit to succeed before responding.
-	WaitForLocal RequiredAcks = 1
-	// WaitForAll waits for all replicas to commit before responding.
-	WaitForAll RequiredAcks = -1
-)
-
-type ProduceRequest struct {
-	RequiredAcks RequiredAcks
-	Timeout      int32
-	msgSets      map[string]map[int32]*MessageSet
-}
-
-func (p *ProduceRequest) encode(pe packetEncoder) error {
-	pe.putInt16(int16(p.RequiredAcks))
-	pe.putInt32(p.Timeout)
-	err := pe.putArrayLength(len(p.msgSets))
-	if err != nil {
-		return err
-	}
-	for topic, partitions := range p.msgSets {
-		err = pe.putString(topic)
-		if err != nil {
-			return err
-		}
-		err = pe.putArrayLength(len(partitions))
-		if err != nil {
-			return err
-		}
-		for id, msgSet := range partitions {
-			pe.putInt32(id)
-			pe.push(&lengthField{})
-			err = msgSet.encode(pe)
-			if err != nil {
-				return err
-			}
-			err = pe.pop()
-			if err != nil {
-				return err
-			}
-		}
-	}
-	return nil
-}
-
-func (p *ProduceRequest) decode(pd packetDecoder) error {
-	requiredAcks, err := pd.getInt16()
-	if err != nil {
-		return err
-	}
-	p.RequiredAcks = RequiredAcks(requiredAcks)
-	if p.Timeout, err = pd.getInt32(); err != nil {
-		return err
-	}
-	topicCount, err := pd.getArrayLength()
-	if err != nil {
-		return err
-	}
-	if topicCount == 0 {
-		return nil
-	}
-	p.msgSets = make(map[string]map[int32]*MessageSet)
-	for i := 0; i < topicCount; i++ {
-		topic, err := pd.getString()
-		if err != nil {
-			return err
-		}
-		partitionCount, err := pd.getArrayLength()
-		if err != nil {
-			return err
-		}
-		p.msgSets[topic] = make(map[int32]*MessageSet)
-		for j := 0; j < partitionCount; j++ {
-			partition, err := pd.getInt32()
-			if err != nil {
-				return err
-			}
-			messageSetSize, err := pd.getInt32()
-			if err != nil {
-				return err
-			}
-			if messageSetSize == 0 {
-				continue
-			}
-			msgSetDecoder, err := pd.getSubset(int(messageSetSize))
-			if err != nil {
-				return err
-			}
-			msgSet := &MessageSet{}
-			err = msgSet.decode(msgSetDecoder)
-			if err != nil {
-				return err
-			}
-			p.msgSets[topic][partition] = msgSet
-		}
-	}
-	return nil
-}
-
-func (p *ProduceRequest) key() int16 {
-	return 0
-}
-
-func (p *ProduceRequest) version() int16 {
-	return 0
-}
-
-func (p *ProduceRequest) AddMessage(topic string, partition int32, msg *Message) {
-	if p.msgSets == nil {
-		p.msgSets = make(map[string]map[int32]*MessageSet)
-	}
-
-	if p.msgSets[topic] == nil {
-		p.msgSets[topic] = make(map[int32]*MessageSet)
-	}
-
-	set := p.msgSets[topic][partition]
-
-	if set == nil {
-		set = new(MessageSet)
-		p.msgSets[topic][partition] = set
-	}
-
-	set.addMessage(msg)
-}
-
-func (p *ProduceRequest) AddSet(topic string, partition int32, set *MessageSet) {
-	if p.msgSets == nil {
-		p.msgSets = make(map[string]map[int32]*MessageSet)
-	}
-
-	if p.msgSets[topic] == nil {
-		p.msgSets[topic] = make(map[int32]*MessageSet)
-	}
-
-	p.msgSets[topic][partition] = set
-}
diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/produce_request_test.go b/Godeps/_workspace/src/github.com/Shopify/sarama/produce_request_test.go
deleted file mode 100644
index 21f4ba5b1..000000000
--- a/Godeps/_workspace/src/github.com/Shopify/sarama/produce_request_test.go
+++ /dev/null
@@ -1,47 +0,0 @@
-package sarama
-
-import (
-	"testing"
-)
-
-var (
-	produceRequestEmpty = []byte{
-		0x00, 0x00,
-		0x00, 0x00, 0x00, 0x00,
-		0x00, 0x00, 0x00, 0x00}
-
-	produceRequestHeader = []byte{
-		0x01, 0x23,
-		0x00, 0x00, 0x04, 0x44,
-		0x00, 0x00, 0x00, 0x00}
-
-	produceRequestOneMessage = []byte{
-		0x01, 0x23,
-		0x00, 0x00, 0x04, 0x44,
-		0x00, 0x00, 0x00, 0x01,
-		0x00, 0x05, 't', 'o', 'p', 'i', 'c',
-		0x00, 0x00, 0x00, 0x01,
-		0x00, 0x00, 0x00, 0xAD,
-		0x00, 0x00, 0x00, 0x1C,
-		// messageSet
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-		0x00, 0x00, 0x00, 0x10,
-		// message
-		0x23, 0x96, 0x4a, 0xf7, // CRC
-		0x00,
-		0x00,
-		0xFF, 0xFF, 0xFF, 0xFF,
-		0x00, 0x00, 0x00, 0x02, 0x00, 0xEE}
-)
-
-func TestProduceRequest(t *testing.T) {
-	request := new(ProduceRequest)
-	testRequest(t, "empty", request, produceRequestEmpty)
-
-	request.RequiredAcks = 0x123
-	request.Timeout = 0x444
-	testRequest(t, "header", request, produceRequestHeader)
-
-	request.AddMessage("topic", 0xAD, &Message{Codec: CompressionNone, Key: nil, Value: []byte{0x00, 0xEE}})
-	testRequest(t, "one message", request, produceRequestOneMessage)
-}
diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/produce_response.go b/Godeps/_workspace/src/github.com/Shopify/sarama/produce_response.go
deleted file mode 100644
index 1f49a8560..000000000
--- a/Godeps/_workspace/src/github.com/Shopify/sarama/produce_response.go
+++ /dev/null
@@ -1,112 +0,0 @@
-package sarama
-
-type ProduceResponseBlock struct {
-	Err    KError
-	Offset int64
-}
-
-func (pr *ProduceResponseBlock) decode(pd packetDecoder) (err error) {
-	tmp, err := pd.getInt16()
-	if err != nil {
-		return err
-	}
-	pr.Err = KError(tmp)
-
-	pr.Offset, err = pd.getInt64()
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-type ProduceResponse struct {
-	Blocks map[string]map[int32]*ProduceResponseBlock
-}
-
-func (pr *ProduceResponse) decode(pd packetDecoder) (err error) {
-	numTopics, err := pd.getArrayLength()
-	if err != nil {
-		return err
-	}
-
-	pr.Blocks = make(map[string]map[int32]*ProduceResponseBlock, numTopics)
-	for i := 0; i < numTopics; i++ {
-		name, err := pd.getString()
-		if err != nil {
-			return err
-		}
-
-		numBlocks, err := pd.getArrayLength()
-		if err != nil {
-			return err
-		}
-
-		pr.Blocks[name] = make(map[int32]*ProduceResponseBlock, numBlocks)
-
-		for j := 0; j < numBlocks; j++ {
-			id, err := pd.getInt32()
-			if err != nil {
-				return err
-			}
-
-			block := new(ProduceResponseBlock)
-			err = block.decode(pd)
-			if err != nil {
-				return err
-			}
-			pr.Blocks[name][id] = block
-		}
-	}
-
-	return nil
-}
-
-func (pr *ProduceResponse) encode(pe packetEncoder) error {
-	err := pe.putArrayLength(len(pr.Blocks))
-	if err != nil {
-		return err
-	}
-	for topic, partitions := range pr.Blocks {
-		err = pe.putString(topic)
-		if err != nil {
-			return err
-		}
-		err = pe.putArrayLength(len(partitions))
-		if err != nil {
-			return err
-		}
-		for id, prb := range partitions {
-			pe.putInt32(id)
-			pe.putInt16(int16(prb.Err))
-			pe.putInt64(prb.Offset)
-		}
-	}
-	return nil
-}
-
-func (pr *ProduceResponse) GetBlock(topic string, partition int32) *ProduceResponseBlock {
-	if pr.Blocks == nil {
-		return nil
-	}
-
-	if pr.Blocks[topic] == nil {
-		return nil
-	}
-
-	return pr.Blocks[topic][partition]
-}
-
-// Testing API
-
-func (pr *ProduceResponse) AddTopicPartition(topic string, partition int32, err KError) {
-	if pr.Blocks == nil {
-		pr.Blocks = make(map[string]map[int32]*ProduceResponseBlock)
-	}
-	byTopic, ok := pr.Blocks[topic]
-	if !ok {
-		byTopic = make(map[int32]*ProduceResponseBlock)
-		pr.Blocks[topic] = byTopic
-	}
-	byTopic[partition] = &ProduceResponseBlock{Err: err}
-}
diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/produce_response_test.go b/Godeps/_workspace/src/github.com/Shopify/sarama/produce_response_test.go
deleted file mode 100644
index 5c3131af4..000000000
--- a/Godeps/_workspace/src/github.com/Shopify/sarama/produce_response_test.go
+++ /dev/null
@@ -1,67 +0,0 @@
-package sarama
-
-import "testing"
-
-var (
-	produceResponseNoBlocks = []byte{
-		0x00, 0x00, 0x00, 0x00}
-
-	produceResponseManyBlocks = []byte{
-		0x00, 0x00, 0x00, 0x02,
-
-		0x00, 0x03, 'f', 'o', 'o',
-		0x00, 0x00, 0x00, 0x00,
-
-		0x00, 0x03, 'b', 'a', 'r',
-		0x00, 0x00, 0x00, 0x02,
-
-		0x00, 0x00, 0x00, 0x01,
-		0x00, 0x00,
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF,
-
-		0x00, 0x00, 0x00, 0x02,
-		0x00, 0x02,
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}
-)
-
-func TestProduceResponse(t *testing.T) {
-	response := ProduceResponse{}
-
-	testDecodable(t, "no blocks", &response, produceResponseNoBlocks)
-	if len(response.Blocks) != 0 {
-		t.Error("Decoding produced", len(response.Blocks), "topics where there were none")
-	}
-
-	testDecodable(t, "many blocks", &response, produceResponseManyBlocks)
-	if len(response.Blocks) != 2 {
-		t.Error("Decoding produced", len(response.Blocks), "topics where there were 2")
-	}
-	if len(response.Blocks["foo"]) != 0 {
-		t.Error("Decoding produced", len(response.Blocks["foo"]), "partitions for 'foo' where there were none")
-	}
-	if len(response.Blocks["bar"]) != 2 {
-		t.Error("Decoding produced", len(response.Blocks["bar"]), "partitions for 'bar' where there were two")
-	}
-	block := response.GetBlock("bar", 1)
-	if block == nil {
-		t.Error("Decoding did not produce a block for bar/1")
-	} else {
-		if block.Err != ErrNoError {
-			t.Error("Decoding failed for bar/1/Err, got:", int16(block.Err))
-		}
-		if block.Offset != 0xFF {
-			t.Error("Decoding failed for bar/1/Offset, got:", block.Offset)
-		}
-	}
-	block = response.GetBlock("bar", 2)
-	if block == nil {
-		t.Error("Decoding did not produce a block for bar/2")
-	} else {
-		if block.Err != ErrInvalidMessage {
-			t.Error("Decoding failed for bar/2/Err, got:", int16(block.Err))
-		}
-		if block.Offset != 0 {
-			t.Error("Decoding failed for bar/2/Offset, got:", block.Offset)
-		}
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/real_decoder.go b/Godeps/_workspace/src/github.com/Shopify/sarama/real_decoder.go
deleted file mode 100644
index b194b9bcc..000000000
--- a/Godeps/_workspace/src/github.com/Shopify/sarama/real_decoder.go
+++ /dev/null
@@ -1,225 +0,0 @@
-package sarama
-
-import (
-	"encoding/binary"
-	"math"
-)
-
-type realDecoder struct {
-	raw   []byte
-	off   int
-	stack []pushDecoder
-}
-
-// primitives
-
-func (rd *realDecoder) getInt8() (int8, error) {
-	if rd.remaining() < 1 {
-		rd.off = len(rd.raw)
-		return -1, ErrInsufficientData
-	}
-	tmp := int8(rd.raw[rd.off])
-	rd.off += 1
-	return tmp, nil
-}
-
-func (rd *realDecoder) getInt16() (int16, error) {
-	if rd.remaining() < 2 {
-		rd.off = len(rd.raw)
-		return -1, ErrInsufficientData
-	}
-	tmp := int16(binary.BigEndian.Uint16(rd.raw[rd.off:]))
-	rd.off += 2
-	return tmp, nil
-}
-
-func (rd *realDecoder) getInt32() (int32, error) {
-	if rd.remaining() < 4 {
-		rd.off = len(rd.raw)
-		return -1, ErrInsufficientData
-	}
-	tmp := int32(binary.BigEndian.Uint32(rd.raw[rd.off:]))
-	rd.off += 4
-	return tmp, nil
-}
-
-func (rd *realDecoder) getInt64() (int64, error) {
-	if rd.remaining() < 8 {
-		rd.off = len(rd.raw)
-		return -1, ErrInsufficientData
-	}
-	tmp := int64(binary.BigEndian.Uint64(rd.raw[rd.off:]))
-	rd.off += 8
-	return tmp, nil
-}
-
-func (rd *realDecoder) getArrayLength() (int, error) {
-	if rd.remaining() < 4 {
-		rd.off = len(rd.raw)
-		return -1, ErrInsufficientData
-	}
-	tmp := int(binary.BigEndian.Uint32(rd.raw[rd.off:]))
-	rd.off += 4
-	if tmp > rd.remaining() {
-		rd.off = len(rd.raw)
-		return -1, ErrInsufficientData
-	} else if tmp > 2*math.MaxUint16 {
-		return -1, PacketDecodingError{"invalid array length"}
-	}
-	return tmp, nil
-}
-
-// collections
-
-func (rd *realDecoder) getBytes() ([]byte, error) {
-	tmp, err := rd.getInt32()
-
-	if err != nil {
-		return nil, err
-	}
-
-	n := int(tmp)
-
-	switch {
-	case n < -1:
-		return nil, PacketDecodingError{"invalid byteslice length"}
-	case n == -1:
-		return nil, nil
-	case n == 0:
-		return make([]byte, 0), nil
-	case n > rd.remaining():
-		rd.off = len(rd.raw)
-		return nil, ErrInsufficientData
-	}
-
-	tmpStr := rd.raw[rd.off : rd.off+n]
-	rd.off += n
-	return tmpStr, nil
-}
-
-func (rd *realDecoder) getString() (string, error) {
-	tmp, err := rd.getInt16()
-
-	if err != nil {
-		return "", err
-	}
-
-	n := int(tmp)
-
-	switch {
-	case n < -1:
-		return "", PacketDecodingError{"invalid string length"}
-	case n == -1:
-		return "", nil
-	case n == 0:
-		return "", nil
-	case n > rd.remaining():
-		rd.off = len(rd.raw)
-		return "", ErrInsufficientData
-	}
-
-	tmpStr := string(rd.raw[rd.off : rd.off+n])
-	rd.off += n
-	return tmpStr, nil
-}
-
-func (rd *realDecoder) getInt32Array() ([]int32, error) {
-	if rd.remaining() < 4 {
-		rd.off = len(rd.raw)
-		return nil, ErrInsufficientData
-	}
-	n := int(binary.BigEndian.Uint32(rd.raw[rd.off:]))
-	rd.off += 4
-
-	if rd.remaining() < 4*n {
-		rd.off = len(rd.raw)
-		return nil, ErrInsufficientData
-	}
-
-	if n == 0 {
-		return nil, nil
-	}
-
-	if n < 0 {
-		return nil, PacketDecodingError{"invalid array length"}
-	}
-
-	ret := make([]int32, n)
-	for i := range ret {
-		ret[i] = int32(binary.BigEndian.Uint32(rd.raw[rd.off:]))
-		rd.off += 4
-	}
-	return ret, nil
-}
-
-func (rd *realDecoder) getInt64Array() ([]int64, error) {
-	if rd.remaining() < 4 {
-		rd.off = len(rd.raw)
-		return nil, ErrInsufficientData
-	}
-	n := int(binary.BigEndian.Uint32(rd.raw[rd.off:]))
-	rd.off += 4
-
-	if rd.remaining() < 8*n {
-		rd.off = len(rd.raw)
-		return nil, ErrInsufficientData
-	}
-
-	if n == 0 {
-		return nil, nil
-	}
-
-	if n < 0 {
-		return nil, PacketDecodingError{"invalid array length"}
-	}
-
-	ret := make([]int64, n)
-	for i := range ret {
-		ret[i] = int64(binary.BigEndian.Uint64(rd.raw[rd.off:]))
-		rd.off += 8
-	}
-	return ret, nil
-}
-
-// subsets
-
-func (rd *realDecoder) remaining() int {
-	return len(rd.raw) - rd.off
-}
-
-func (rd *realDecoder) getSubset(length int) (packetDecoder, error) {
-	if length > rd.remaining() {
-		rd.off = len(rd.raw)
-		return nil, ErrInsufficientData
-	}
-
-	start := rd.off
-	rd.off += length
-	return &realDecoder{raw: rd.raw[start:rd.off]}, nil
-}
-
-// stacks
-
-func (rd *realDecoder) push(in pushDecoder) error {
-	in.saveOffset(rd.off)
-
-	reserve := in.reserveLength()
-	if rd.remaining() < reserve {
-		rd.off = len(rd.raw)
-		return ErrInsufficientData
-	}
-
-	rd.stack = append(rd.stack, in)
-
-	rd.off += reserve
-
-	return nil
-}
-
-func (rd *realDecoder) pop() error {
-	// this is go's ugly pop pattern (the inverse of append)
-	in := rd.stack[len(rd.stack)-1]
-	rd.stack = rd.stack[:len(rd.stack)-1]
-
-	return in.check(rd.off, rd.raw)
-}
diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/real_encoder.go b/Godeps/_workspace/src/github.com/Shopify/sarama/real_encoder.go
deleted file mode 100644
index 947ce98d9..000000000
--- a/Godeps/_workspace/src/github.com/Shopify/sarama/real_encoder.go
+++ /dev/null
@@ -1,100 +0,0 @@
-package sarama
-
-import "encoding/binary"
-
-type realEncoder struct {
-	raw   []byte
-	off   int
-	stack []pushEncoder
-}
-
-// primitives
-
-func (re *realEncoder) putInt8(in int8) {
-	re.raw[re.off] = byte(in)
-	re.off += 1
-}
-
-func (re *realEncoder) putInt16(in int16) {
-	binary.BigEndian.PutUint16(re.raw[re.off:], uint16(in))
-	re.off += 2
-}
-
-func (re *realEncoder) putInt32(in int32) {
-	binary.BigEndian.PutUint32(re.raw[re.off:], uint32(in))
-	re.off += 4
-}
-
-func (re *realEncoder) putInt64(in int64) {
-	binary.BigEndian.PutUint64(re.raw[re.off:], uint64(in))
-	re.off += 8
-}
-
-func (re *realEncoder) putArrayLength(in int) error {
-	re.putInt32(int32(in))
-	return nil
-}
-
-// collection
-
-func (re *realEncoder) putRawBytes(in []byte) error {
-	copy(re.raw[re.off:], in)
-	re.off += len(in)
-	return nil
-}
-
-func (re *realEncoder) putBytes(in []byte) error {
-	if in == nil {
-		re.putInt32(-1)
-		return nil
-	}
-	re.putInt32(int32(len(in)))
-	copy(re.raw[re.off:], in)
-	re.off += len(in)
-	return nil
-}
-
-func (re *realEncoder) putString(in string) error {
-	re.putInt16(int16(len(in)))
-	copy(re.raw[re.off:], in)
-	re.off += len(in)
-	return nil
-}
-
-func (re *realEncoder) putInt32Array(in []int32) error {
-	err := re.putArrayLength(len(in))
-	if err != nil {
-		return err
-	}
-	for _, val := range in {
-		re.putInt32(val)
-	}
-	return nil
-}
-
-func (re *realEncoder) putInt64Array(in []int64) error {
-	err := re.putArrayLength(len(in))
-	if err != nil {
-		return err
-	}
-	for _, val := range in {
-		re.putInt64(val)
-	}
-	return nil
-}
-
-// stacks
-
-func (re *realEncoder) push(in pushEncoder) {
-	in.saveOffset(re.off)
-	re.off += in.reserveLength()
-	re.stack = append(re.stack, in)
-}
-
-func (re *realEncoder) pop() error {
-	// this is go's ugly pop pattern (the inverse of append)
-	in := re.stack[len(re.stack)-1]
-	re.stack = re.stack[:len(re.stack)-1]
-
-	return in.run(re.off, re.raw)
-}
diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/request.go b/Godeps/_workspace/src/github.com/Shopify/sarama/request.go
deleted file mode 100644
index d6d5cdfcd..000000000
--- a/Godeps/_workspace/src/github.com/Shopify/sarama/request.go
+++ /dev/null
@@ -1,100 +0,0 @@
-package sarama
-
-import (
-	"encoding/binary"
-	"fmt"
-	"io"
-)
-
-type requestBody interface {
-	encoder
-	decoder
-	key() int16
-	version() int16
-}
-
-type request struct {
-	correlationID int32
-	clientID      string
-	body          requestBody
-}
-
-func (r *request) encode(pe packetEncoder) (err error) {
-	pe.push(&lengthField{})
-	pe.putInt16(r.body.key())
-	pe.putInt16(r.body.version())
-	pe.putInt32(r.correlationID)
-	err = pe.putString(r.clientID)
-	if err != nil {
-		return err
-	}
-	err = r.body.encode(pe)
-	if err != nil {
-		return err
-	}
-	return pe.pop()
-}
-
-func (r *request) decode(pd packetDecoder) (err error) {
-	var key int16
-	if key, err = pd.getInt16(); err != nil {
-		return err
-	}
-	var version int16
-	if version, err = pd.getInt16(); err != nil {
-		return err
-	}
-	if r.correlationID, err = pd.getInt32(); err != nil {
-		return err
-	}
-	r.clientID, err = pd.getString()
-
-	r.body = allocateBody(key, version)
-	if r.body == nil {
-		return PacketDecodingError{fmt.Sprintf("unknown request key (%d)", key)}
-	}
-	return r.body.decode(pd)
-}
-
-func decodeRequest(r io.Reader) (req *request, err error) {
-	lengthBytes := make([]byte, 4)
-	if _, err := io.ReadFull(r, lengthBytes); err != nil {
-		return nil, err
-	}
-
-	length := int32(binary.BigEndian.Uint32(lengthBytes))
-	if length <= 4 || length > MaxRequestSize {
-		return nil, PacketDecodingError{fmt.Sprintf("message of length %d too large or too small", length)}
-	}
-
-	encodedReq := make([]byte, length)
-	if _, err := io.ReadFull(r, encodedReq); err != nil {
-		return nil, err
-	}
-
-	req = &request{}
-	if err := decode(encodedReq, req); err != nil {
-		return nil, err
-	}
-	return req, nil
-}
-
-func allocateBody(key, version int16) requestBody {
-	switch key {
-	case 0:
-		return &ProduceRequest{}
-	case 1:
-		return &FetchRequest{}
-	case 2:
-		return &OffsetRequest{}
-	case 3:
-		return &MetadataRequest{}
-	case 8:
-		return &OffsetCommitRequest{Version: version}
-	case 9:
-		return &OffsetFetchRequest{}
-	case 10:
-		return &ConsumerMetadataRequest{}
-	}
-	return nil
-}
diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/request_test.go b/Godeps/_workspace/src/github.com/Shopify/sarama/request_test.go
deleted file mode 100644
index 69e8b4cbe..000000000
--- a/Godeps/_workspace/src/github.com/Shopify/sarama/request_test.go
+++ /dev/null
@@ -1,80 +0,0 @@
-package sarama
-
-import (
-	"bytes"
-	"reflect"
-	"testing"
-)
-
-type testRequestBody struct {
-}
-
-func (s *testRequestBody) key() int16 {
-	return 0x666
-}
-
-func (s *testRequestBody) version() int16 {
-	return 0xD2
-}
-
-func (s *testRequestBody) encode(pe packetEncoder) error {
-	return pe.putString("abc")
-}
-
-// not specific to request tests, just helper functions for testing structures that
-// implement the encoder or decoder interfaces that needed somewhere to live
-
-func testEncodable(t *testing.T, name string, in encoder, expect []byte) {
-	packet, err := encode(in)
-	if err != nil {
-		t.Error(err)
-	} else if !bytes.Equal(packet, expect) {
-		t.Error("Encoding", name, "failed\ngot ", packet, "\nwant", expect)
-	}
-}
-
-func testDecodable(t *testing.T, name string, out decoder, in []byte) {
-	err := decode(in, out)
-	if err != nil {
-		t.Error("Decoding", name, "failed:", err)
-	}
-}
-
-func testRequest(t *testing.T, name string, rb requestBody, expected []byte) {
-	// Encoder request
-	req := &request{correlationID: 123, clientID: "foo", body: rb}
-	packet, err := encode(req)
-	headerSize := 14 + len("foo")
-	if err != nil {
-		t.Error(err)
-	} else if !bytes.Equal(packet[headerSize:], expected) {
-		t.Error("Encoding", name, "failed\ngot ", packet, "\nwant", expected)
-	}
-	// Decoder request
-	decoded, err := decodeRequest(bytes.NewReader(packet))
-	if err != nil {
-		t.Error("Failed to decode request", err)
-	} else if decoded.correlationID != 123 || decoded.clientID != "foo" {
-		t.Errorf("Decoded header is not valid: %v", decoded)
-	} else if !reflect.DeepEqual(rb, decoded.body) {
-		t.Errorf("Decoded request does not match the encoded one\nencoded: %v\ndecoded: %v", rb, decoded)
-	}
-}
-
-func testResponse(t *testing.T, name string, res encoder, expected []byte) {
-	encoded, err := encode(res)
-	if err != nil {
-		t.Error(err)
-	} else if expected != nil && !bytes.Equal(encoded, expected) {
-		t.Error("Encoding", name, "failed\ngot ", encoded, "\nwant", expected)
-	}
-
-	decoded := reflect.New(reflect.TypeOf(res).Elem()).Interface().(decoder)
-	if err := decode(encoded, decoded); err != nil {
-		t.Error("Decoding", name, "failed:", err)
-	}
-
-	if !reflect.DeepEqual(decoded, res) {
-		t.Errorf("Decoded response does not match the encoded one\nencoded: %#v\ndecoded: %#v", res, decoded)
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/response_header.go b/Godeps/_workspace/src/github.com/Shopify/sarama/response_header.go
deleted file mode 100644
index f3f4d27d6..000000000
--- a/Godeps/_workspace/src/github.com/Shopify/sarama/response_header.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package sarama
-
-import "fmt"
-
-type responseHeader struct {
-	length        int32
-	correlationID int32
-}
-
-func (r *responseHeader) decode(pd packetDecoder) (err error) {
-	r.length, err = pd.getInt32()
-	if err != nil {
-		return err
-	}
-	if r.length <= 4 || r.length > MaxResponseSize {
-		return PacketDecodingError{fmt.Sprintf("message of length %d too large or too small", r.length)}
-	}
-
-	r.correlationID, err = pd.getInt32()
-	return err
-}
diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/response_header_test.go b/Godeps/_workspace/src/github.com/Shopify/sarama/response_header_test.go
deleted file mode 100644
index 8f9fdb80c..000000000
--- a/Godeps/_workspace/src/github.com/Shopify/sarama/response_header_test.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package sarama
-
-import "testing"
-
-var (
-	responseHeaderBytes = []byte{
-		0x00, 0x00, 0x0f, 0x00,
-		0x0a, 0xbb, 0xcc, 0xff}
-)
-
-func TestResponseHeader(t *testing.T) {
-	header := responseHeader{}
-
-	testDecodable(t, "response header", &header, responseHeaderBytes)
-	if header.length != 0xf00 {
-		t.Error("Decoding header length failed, got", header.length)
-	}
-	if header.correlationID != 0x0abbccff {
-		t.Error("Decoding header correlation id failed, got", header.correlationID)
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/sarama.go b/Godeps/_workspace/src/github.com/Shopify/sarama/sarama.go
deleted file mode 100644
index d59821750..000000000
--- a/Godeps/_workspace/src/github.com/Shopify/sarama/sarama.go
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
-Package sarama provides client libraries for the Kafka 0.8 protocol. The AsyncProducer object is the high-level
-API for producing messages asynchronously; the SyncProducer provides a blocking API for the same purpose.
-The Consumer object is the high-level API for consuming messages. The Client object provides metadata
-management functionality that is shared between the higher-level objects.
-
-For lower-level needs, the Broker and Request/Response objects permit precise control over each connection
-and message sent on the wire.
-
-The Request/Response objects and properties are mostly undocumented, as they line up exactly with the
-protocol fields documented by Kafka at https://cwiki.apache.org/confluence/display/KAFKA/A+Guide+To+The+Kafka+Protocol
-*/
-package sarama
-
-import (
-	"io/ioutil"
-	"log"
-)
-
-// Logger is the instance of a StdLogger interface that Sarama writes connection
-// management events to. By default it is set to discard all log messages via ioutil.Discard,
-// but you can set it to redirect wherever you want.
-var Logger StdLogger = log.New(ioutil.Discard, "[Sarama] ", log.LstdFlags)
-
-// StdLogger is used to log error messages.
-type StdLogger interface {
-	Print(v ...interface{})
-	Printf(format string, v ...interface{})
-	Println(v ...interface{})
-}
-
-// PanicHandler is called for recovering from panics spawned internally to the library (and thus
-// not recoverable by the caller's goroutine). Defaults to nil, which means panics are not recovered.
-var PanicHandler func(interface{})
-
-// MaxRequestSize is the maximum size (in bytes) of any request that Sarama will attempt to send. Trying
-// to send a request larger than this will result in an PacketEncodingError. The default of 100 MiB is aligned
-// with Kafka's default `socket.request.max.bytes`, which is the largest request the broker will attempt
-// to process.
-var MaxRequestSize int32 = 100 * 1024 * 1024
-
-// MaxResponseSize is the maximum size (in bytes) of any response that Sarama will attempt to parse. If
-// a broker returns a response message larger than this value, Sarama will return a PacketDecodingError to
-// protect the client from running out of memory. Please note that brokers do not have any natural limit on
-// the size of responses they send. In particular, they can send arbitrarily large fetch responses to consumers
-// (see https://issues.apache.org/jira/browse/KAFKA-2063).
-var MaxResponseSize int32 = 100 * 1024 * 1024
diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/snappy.go b/Godeps/_workspace/src/github.com/Shopify/sarama/snappy.go
deleted file mode 100644
index e86cb7039..000000000
--- a/Godeps/_workspace/src/github.com/Shopify/sarama/snappy.go
+++ /dev/null
@@ -1,41 +0,0 @@
-package sarama
-
-import (
-	"bytes"
-	"encoding/binary"
-
-	"github.com/golang/snappy"
-)
-
-var snappyMagic = []byte{130, 83, 78, 65, 80, 80, 89, 0}
-
-// SnappyEncode encodes binary data
-func snappyEncode(src []byte) []byte {
-	return snappy.Encode(nil, src)
-}
-
-// SnappyDecode decodes snappy data
-func snappyDecode(src []byte) ([]byte, error) {
-	if bytes.Equal(src[:8], snappyMagic) {
-		var (
-			pos   = uint32(16)
-			max   = uint32(len(src))
-			dst   = make([]byte, 0, len(src))
-			chunk []byte
-			err   error
-		)
-		for pos < max {
-			size := binary.BigEndian.Uint32(src[pos : pos+4])
-			pos += 4
-
-			chunk, err = snappy.Decode(chunk, src[pos:pos+size])
-			if err != nil {
-				return nil, err
-			}
-			pos += size
-			dst = append(dst, chunk...)
-		}
-		return dst, nil
-	}
-	return snappy.Decode(nil, src)
-}
diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/snappy_test.go b/Godeps/_workspace/src/github.com/Shopify/sarama/snappy_test.go
deleted file mode 100644
index f3cf7ff5c..000000000
--- a/Godeps/_workspace/src/github.com/Shopify/sarama/snappy_test.go
+++ /dev/null
@@ -1,49 +0,0 @@
-package sarama
-
-import (
-	"bytes"
-	"testing"
-)
-
-var snappyTestCases = map[string][]byte{
-	"REPEATREPEATREPEATREPEATREPEATREPEAT": []byte{36, 20, 82, 69, 80, 69, 65, 84, 118, 6, 0},
-	"REALLY SHORT":                         []byte{12, 44, 82, 69, 65, 76, 76, 89, 32, 83, 72, 79, 82, 84},
-	"AXBXCXDXEXFX":                         []byte{12, 44, 65, 88, 66, 88, 67, 88, 68, 88, 69, 88, 70, 88},
-}
-
-var snappyStreamTestCases = map[string][]byte{
-	"PLAINDATA":                         []byte{130, 83, 78, 65, 80, 80, 89, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 11, 9, 32, 80, 76, 65, 73, 78, 68, 65, 84, 65},
-	`{"a":"UtaitILHMDAAAAfU","b":"日本"}`: []byte{130, 83, 78, 65, 80, 80, 89, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 39, 37, 144, 123, 34, 97, 34, 58, 34, 85, 116, 97, 105, 116, 73, 76, 72, 77, 68, 65, 65, 65, 65, 102, 85, 34, 44, 34, 98, 34, 58, 34, 230, 151, 165, 230, 156, 172, 34, 125},
-	`Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque laudantium, totam rem aperiam, eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae dicta sunt explicabo. Nemo enim ipsam voluptatem quia voluptas sit aspernatur aut odit aut fugit, sed quia consequuntur magni dolores eos qui ratione voluptatem sequi nesciunt. Neque porro quisquam est, qui dolorem ipsum quia dolor sit amet, consectetur, adipisci velit, sed quia non numquam eius modi tempora incidunt ut labore et dolore magnam aliquam quaerat voluptatem. Ut enim ad minima veniam, quis nostrum exercitationem ullam corporis suscipit laboriosam, nisi ut aliquid ex ea commodi consequatur? Quis autem vel eum iure reprehenderit qui in ea voluptate velit esse quam nihil molestiae consequatur, vel illum qui dolorem eum fugiat quo voluptas nulla pariatur? At vero eos et accusamus et iusto odio dignissimos ducimus qui blanditiis praesentium voluptatum deleniti atque corrupti quos dolores et quas molestias except`: []byte{130, 83, 78, 65, 80, 80, 89, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 3, 89, 128, 8, 240, 90, 83, 101, 100, 32, 117, 116, 32, 112, 101, 114, 115, 112, 105, 99, 105, 97, 116, 105, 115, 32, 117, 110, 100, 101, 32, 111, 109, 110, 105, 115, 32, 105, 115, 116, 101, 32, 110, 97, 116, 117, 115, 32, 101, 114, 114, 111, 114, 32, 115, 105, 116, 32, 118, 111, 108, 117, 112, 116, 97, 116, 101, 109, 32, 97, 99, 99, 117, 115, 97, 110, 116, 105, 117, 109, 32, 100, 111, 108, 111, 114, 101, 109, 113, 117, 101, 32, 108, 97, 117, 100, 97, 5, 22, 240, 60, 44, 32, 116, 111, 116, 97, 109, 32, 114, 101, 109, 32, 97, 112, 101, 114, 105, 97, 109, 44, 32, 101, 97, 113, 117, 101, 32, 105, 112, 115, 97, 32, 113, 117, 97, 101, 32, 97, 98, 32, 105, 108, 108, 111, 32, 105, 110, 118, 101, 110, 116, 111, 114, 101, 32, 118, 101, 114, 105, 116, 97, 1, 141, 4, 101, 116, 1, 36, 88, 115, 105, 32, 97, 114, 99, 104, 105, 116, 101, 99, 116, 111, 32, 98, 101, 97, 116, 97, 101, 32, 118, 105, 1, 6, 120, 100, 105, 99, 116, 97, 32, 115, 117, 110, 116, 32, 101, 120, 112, 108, 105, 99, 97, 98, 111, 46, 32, 78, 101, 109, 111, 32, 101, 110, 105, 109, 5, 103, 0, 109, 46, 180, 0, 12, 113, 117, 105, 97, 17, 16, 0, 115, 5, 209, 72, 97, 115, 112, 101, 114, 110, 97, 116, 117, 114, 32, 97, 117, 116, 32, 111, 100, 105, 116, 5, 9, 36, 102, 117, 103, 105, 116, 44, 32, 115, 101, 100, 9, 53, 32, 99, 111, 110, 115, 101, 113, 117, 117, 110, 1, 42, 20, 109, 97, 103, 110, 105, 32, 9, 245, 16, 115, 32, 101, 111, 115, 1, 36, 28, 32, 114, 97, 116, 105, 111, 110, 101, 17, 96, 33, 36, 1, 51, 36, 105, 32, 110, 101, 115, 99, 105, 117, 110, 116, 1, 155, 1, 254, 16, 112, 111, 114, 114, 111, 1, 51, 36, 115, 113, 117, 97, 109, 32, 101, 115, 116, 44, 1, 14, 13, 81, 5, 183, 4, 117, 109, 1, 18, 0, 97, 9, 19, 4, 32, 115, 1, 149, 12, 109, 101, 116, 44, 9, 135, 76, 99, 116, 101, 116, 117, 114, 44, 32, 97, 100, 105, 112, 105, 115, 99, 105, 32, 118, 101, 108, 50, 173, 0, 24, 110, 111, 110, 32, 110, 117, 109, 9, 94, 84, 105, 117, 115, 32, 109, 111, 100, 105, 32, 116, 101, 109, 112, 111, 114, 97, 32, 105, 110, 99, 105, 100, 33, 52, 20, 117, 116, 32, 108, 97, 98, 33, 116, 4, 101, 116, 9, 106, 0, 101, 5, 219, 20, 97, 109, 32, 97, 108, 105, 5, 62, 33, 164, 8, 114, 97, 116, 29, 212, 12, 46, 32, 85, 116, 41, 94, 52, 97, 100, 32, 109, 105, 110, 105, 109, 97, 32, 118, 101, 110, 105, 33, 221, 72, 113, 117, 105, 115, 32, 110, 111, 115, 116, 114, 117, 109, 32, 101, 120, 101, 114, 99, 105, 33, 202, 104, 111, 110, 101, 109, 32, 117, 108, 108, 97, 109, 32, 99, 111, 114, 112, 111, 114, 105, 115, 32, 115, 117, 115, 99, 105, 112, 105, 13, 130, 8, 105, 111, 115, 1, 64, 12, 110, 105, 115, 105, 1, 150, 5, 126, 44, 105, 100, 32, 101, 120, 32, 101, 97, 32, 99, 111, 109, 5, 192, 0, 99, 41, 131, 33, 172, 8, 63, 32, 81, 1, 107, 4, 97, 117, 33, 101, 96, 118, 101, 108, 32, 101, 117, 109, 32, 105, 117, 114, 101, 32, 114, 101, 112, 114, 101, 104, 101, 110, 100, 101, 114, 105, 65, 63, 12, 105, 32, 105, 110, 1, 69, 16, 118, 111, 108, 117, 112, 65, 185, 1, 47, 24, 105, 116, 32, 101, 115, 115, 101, 1, 222, 64, 109, 32, 110, 105, 104, 105, 108, 32, 109, 111, 108, 101, 115, 116, 105, 97, 101, 46, 103, 0, 0, 44, 1, 45, 16, 32, 105, 108, 108, 117, 37, 143, 45, 36, 0, 109, 5, 110, 65, 33, 20, 97, 116, 32, 113, 117, 111, 17, 92, 44, 115, 32, 110, 117, 108, 108, 97, 32, 112, 97, 114, 105, 9, 165, 24, 65, 116, 32, 118, 101, 114, 111, 69, 34, 44, 101, 116, 32, 97, 99, 99, 117, 115, 97, 109, 117, 115, 1, 13, 104, 105, 117, 115, 116, 111, 32, 111, 100, 105, 111, 32, 100, 105, 103, 110, 105, 115, 115, 105, 109, 111, 115, 32, 100, 117, 99, 105, 1, 34, 80, 113, 117, 105, 32, 98, 108, 97, 110, 100, 105, 116, 105, 105, 115, 32, 112, 114, 97, 101, 115, 101, 101, 87, 17, 111, 56, 116, 117, 109, 32, 100, 101, 108, 101, 110, 105, 116, 105, 32, 97, 116, 65, 89, 28, 99, 111, 114, 114, 117, 112, 116, 105, 1, 150, 0, 115, 13, 174, 5, 109, 8, 113, 117, 97, 65, 5, 52, 108, 101, 115, 116, 105, 97, 115, 32, 101, 120, 99, 101, 112, 116, 0, 0, 0, 1, 0},
-}
-
-func TestSnappyEncode(t *testing.T) {
-	for src, exp := range snappyTestCases {
-		dst := snappyEncode([]byte(src))
-		if !bytes.Equal(dst, exp) {
-			t.Errorf("Expected %s to generate %v, but was %v", src, exp, dst)
-		}
-	}
-}
-
-func TestSnappyDecode(t *testing.T) {
-	for exp, src := range snappyTestCases {
-		dst, err := snappyDecode(src)
-		if err != nil {
-			t.Error("Encoding error: ", err)
-		} else if !bytes.Equal(dst, []byte(exp)) {
-			t.Errorf("Expected %s to be generated from %v, but was %s", exp, src, string(dst))
-		}
-	}
-}
-
-func TestSnappyDecodeStreams(t *testing.T) {
-	for exp, src := range snappyStreamTestCases {
-		dst, err := snappyDecode(src)
-		if err != nil {
-			t.Error("Encoding error: ", err)
-		} else if !bytes.Equal(dst, []byte(exp)) {
-			t.Errorf("Expected %s to be generated from [%d]byte, but was %s", exp, len(src), string(dst))
-		}
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/sync_producer.go b/Godeps/_workspace/src/github.com/Shopify/sarama/sync_producer.go
deleted file mode 100644
index b59d74a20..000000000
--- a/Godeps/_workspace/src/github.com/Shopify/sarama/sync_producer.go
+++ /dev/null
@@ -1,94 +0,0 @@
-package sarama
-
-import "sync"
-
-// SyncProducer publishes Kafka messages. It routes messages to the correct broker, refreshing metadata as appropriate,
-// and parses responses for errors. You must call Close() on a producer to avoid leaks, it may not be garbage-collected automatically when
-// it passes out of scope.
-type SyncProducer interface {
-
-	// SendMessage produces a given message, and returns only when it either has succeeded or failed to produce.
-	// It will return the partition and the offset of the produced message, or an error if the message
-	// failed to produce.
-	SendMessage(msg *ProducerMessage) (partition int32, offset int64, err error)
-
-	// Close shuts down the producer and flushes any messages it may have buffered. You must call this function before
-	// a producer object passes out of scope, as it may otherwise leak memory. You must call this before calling Close
-	// on the underlying client.
-	Close() error
-}
-
-type syncProducer struct {
-	producer *asyncProducer
-	wg       sync.WaitGroup
-}
-
-// NewSyncProducer creates a new SyncProducer using the given broker addresses and configuration.
-func NewSyncProducer(addrs []string, config *Config) (SyncProducer, error) {
-	p, err := NewAsyncProducer(addrs, config)
-	if err != nil {
-		return nil, err
-	}
-	return newSyncProducerFromAsyncProducer(p.(*asyncProducer)), nil
-}
-
-// NewSyncProducerFromClient creates a new SyncProducer using the given client. It is still
-// necessary to call Close() on the underlying client when shutting down this producer.
-func NewSyncProducerFromClient(client Client) (SyncProducer, error) {
-	p, err := NewAsyncProducerFromClient(client)
-	if err != nil {
-		return nil, err
-	}
-	return newSyncProducerFromAsyncProducer(p.(*asyncProducer)), nil
-}
-
-func newSyncProducerFromAsyncProducer(p *asyncProducer) *syncProducer {
-	p.conf.Producer.Return.Successes = true
-	p.conf.Producer.Return.Errors = true
-	sp := &syncProducer{producer: p}
-
-	sp.wg.Add(2)
-	go withRecover(sp.handleSuccesses)
-	go withRecover(sp.handleErrors)
-
-	return sp
-}
-
-func (sp *syncProducer) SendMessage(msg *ProducerMessage) (partition int32, offset int64, err error) {
-	oldMetadata := msg.Metadata
-	defer func() {
-		msg.Metadata = oldMetadata
-	}()
-
-	expectation := make(chan error, 1)
-	msg.Metadata = expectation
-	sp.producer.Input() <- msg
-
-	if err := <-expectation; err != nil {
-		return -1, -1, err
-	} else {
-		return msg.Partition, msg.Offset, nil
-	}
-}
-
-func (sp *syncProducer) handleSuccesses() {
-	defer sp.wg.Done()
-	for msg := range sp.producer.Successes() {
-		expectation := msg.Metadata.(chan error)
-		expectation <- nil
-	}
-}
-
-func (sp *syncProducer) handleErrors() {
-	defer sp.wg.Done()
-	for err := range sp.producer.Errors() {
-		expectation := err.Msg.Metadata.(chan error)
-		expectation <- err.Err
-	}
-}
-
-func (sp *syncProducer) Close() error {
-	sp.producer.AsyncClose()
-	sp.wg.Wait()
-	return nil
-}
diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/sync_producer_test.go b/Godeps/_workspace/src/github.com/Shopify/sarama/sync_producer_test.go
deleted file mode 100644
index d378949b1..000000000
--- a/Godeps/_workspace/src/github.com/Shopify/sarama/sync_producer_test.go
+++ /dev/null
@@ -1,149 +0,0 @@
-package sarama
-
-import (
-	"log"
-	"sync"
-	"testing"
-)
-
-func TestSyncProducer(t *testing.T) {
-	seedBroker := newMockBroker(t, 1)
-	leader := newMockBroker(t, 2)
-
-	metadataResponse := new(MetadataResponse)
-	metadataResponse.AddBroker(leader.Addr(), leader.BrokerID())
-	metadataResponse.AddTopicPartition("my_topic", 0, leader.BrokerID(), nil, nil, ErrNoError)
-	seedBroker.Returns(metadataResponse)
-
-	prodSuccess := new(ProduceResponse)
-	prodSuccess.AddTopicPartition("my_topic", 0, ErrNoError)
-	for i := 0; i < 10; i++ {
-		leader.Returns(prodSuccess)
-	}
-
-	producer, err := NewSyncProducer([]string{seedBroker.Addr()}, nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	for i := 0; i < 10; i++ {
-		msg := &ProducerMessage{
-			Topic:    "my_topic",
-			Value:    StringEncoder(TestMessage),
-			Metadata: "test",
-		}
-
-		partition, offset, err := producer.SendMessage(msg)
-
-		if partition != 0 || msg.Partition != partition {
-			t.Error("Unexpected partition")
-		}
-		if offset != 0 || msg.Offset != offset {
-			t.Error("Unexpected offset")
-		}
-		if str, ok := msg.Metadata.(string); !ok || str != "test" {
-			t.Error("Unexpected metadata")
-		}
-		if err != nil {
-			t.Error(err)
-		}
-	}
-
-	safeClose(t, producer)
-	leader.Close()
-	seedBroker.Close()
-}
-
-func TestConcurrentSyncProducer(t *testing.T) {
-	seedBroker := newMockBroker(t, 1)
-	leader := newMockBroker(t, 2)
-
-	metadataResponse := new(MetadataResponse)
-	metadataResponse.AddBroker(leader.Addr(), leader.BrokerID())
-	metadataResponse.AddTopicPartition("my_topic", 0, leader.BrokerID(), nil, nil, ErrNoError)
-	seedBroker.Returns(metadataResponse)
-
-	prodSuccess := new(ProduceResponse)
-	prodSuccess.AddTopicPartition("my_topic", 0, ErrNoError)
-	leader.Returns(prodSuccess)
-
-	config := NewConfig()
-	config.Producer.Flush.Messages = 100
-	producer, err := NewSyncProducer([]string{seedBroker.Addr()}, config)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	wg := sync.WaitGroup{}
-
-	for i := 0; i < 100; i++ {
-		wg.Add(1)
-		go func() {
-			msg := &ProducerMessage{Topic: "my_topic", Value: StringEncoder(TestMessage)}
-			partition, _, err := producer.SendMessage(msg)
-			if partition != 0 {
-				t.Error("Unexpected partition")
-			}
-			if err != nil {
-				t.Error(err)
-			}
-			wg.Done()
-		}()
-	}
-	wg.Wait()
-
-	safeClose(t, producer)
-	leader.Close()
-	seedBroker.Close()
-}
-
-func TestSyncProducerToNonExistingTopic(t *testing.T) {
-	broker := newMockBroker(t, 1)
-
-	metadataResponse := new(MetadataResponse)
-	metadataResponse.AddBroker(broker.Addr(), broker.BrokerID())
-	metadataResponse.AddTopicPartition("my_topic", 0, broker.BrokerID(), nil, nil, ErrNoError)
-	broker.Returns(metadataResponse)
-
-	config := NewConfig()
-	config.Metadata.Retry.Max = 0
-	config.Producer.Retry.Max = 0
-
-	producer, err := NewSyncProducer([]string{broker.Addr()}, config)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	metadataResponse = new(MetadataResponse)
-	metadataResponse.AddTopic("unknown", ErrUnknownTopicOrPartition)
-	broker.Returns(metadataResponse)
-
-	_, _, err = producer.SendMessage(&ProducerMessage{Topic: "unknown"})
-	if err != ErrUnknownTopicOrPartition {
-		t.Error("Uxpected ErrUnknownTopicOrPartition, found:", err)
-	}
-
-	safeClose(t, producer)
-	broker.Close()
-}
-
-// This example shows the basic usage pattern of the SyncProducer.
-func ExampleSyncProducer() {
-	producer, err := NewSyncProducer([]string{"localhost:9092"}, nil)
-	if err != nil {
-		log.Fatalln(err)
-	}
-	defer func() {
-		if err := producer.Close(); err != nil {
-			log.Fatalln(err)
-		}
-	}()
-
-	msg := &ProducerMessage{Topic: "my_topic", Value: StringEncoder("testing 123")}
-	partition, offset, err := producer.SendMessage(msg)
-	if err != nil {
-		log.Printf("FAILED to send message: %s\n", err)
-	} else {
-		log.Printf("> message sent to partition %d at offset %d\n", partition, offset)
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/tools/README.md b/Godeps/_workspace/src/github.com/Shopify/sarama/tools/README.md
deleted file mode 100644
index 3464c4ad8..000000000
--- a/Godeps/_workspace/src/github.com/Shopify/sarama/tools/README.md
+++ /dev/null
@@ -1,10 +0,0 @@
-# Sarama tools
-
-This folder contains applications that are useful for exploration of your Kafka cluster, or instrumentation.
-Some of these tools mirror tools that ship with Kafka, but these tools won't require installing the JVM to function.
-
-- [kafka-console-producer](./kafka-console-producer): a command line tool to produce a single message to your Kafka custer.
-- [kafka-console-partitionconsumer](./kafka-console-partitionconsumer): (deprecated) a command line tool to consume a single partition of a topic on your Kafka cluster.
-- [kafka-console-consumer](./kafka-console-consumer): a command line tool to consume arbitrary partitions of a topic on your Kafka cluster.
-
-To install all tools, run `go get github.com/Shopify/sarama/tools/...`
diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/tools/kafka-console-consumer/.gitignore b/Godeps/_workspace/src/github.com/Shopify/sarama/tools/kafka-console-consumer/.gitignore
deleted file mode 100644
index 67da9dfa9..000000000
--- a/Godeps/_workspace/src/github.com/Shopify/sarama/tools/kafka-console-consumer/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-kafka-console-consumer
-kafka-console-consumer.test
diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/tools/kafka-console-consumer/README.md b/Godeps/_workspace/src/github.com/Shopify/sarama/tools/kafka-console-consumer/README.md
deleted file mode 100644
index 4e77f0b70..000000000
--- a/Godeps/_workspace/src/github.com/Shopify/sarama/tools/kafka-console-consumer/README.md
+++ /dev/null
@@ -1,29 +0,0 @@
-# kafka-console-consumer
-
-A simple command line tool to consume partitions of a topic and print the
-messages on the standard output.
-
-### Installation
-
-    go get github.com/Shopify/sarama/tools/kafka-console-consumer
-
-### Usage
-
-    # Minimum invocation
-    kafka-console-consumer -topic=test -brokers=kafka1:9092
-
-    # It will pick up a KAFKA_PEERS environment variable
-    export KAFKA_PEERS=kafka1:9092,kafka2:9092,kafka3:9092
-    kafka-console-consumer -topic=test
-
-    # You can specify the offset you want to start at. It can be either
-    # `oldest`, `newest`. The default is `newest`.
-    kafka-console-consumer -topic=test -offset=oldest
-    kafka-console-consumer -topic=test -offset=newest
-
-    # You can specify the partition(s) you want to consume as a comma-separated
-    # list. The default is `all`.
-    kafka-console-consumer -topic=test -partitions=1,2,3
-
-    # Display all command line options
-    kafka-console-consumer -help
diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/tools/kafka-console-consumer/kafka-console-consumer.go b/Godeps/_workspace/src/github.com/Shopify/sarama/tools/kafka-console-consumer/kafka-console-consumer.go
deleted file mode 100644
index 0f1eb89a9..000000000
--- a/Godeps/_workspace/src/github.com/Shopify/sarama/tools/kafka-console-consumer/kafka-console-consumer.go
+++ /dev/null
@@ -1,145 +0,0 @@
-package main
-
-import (
-	"flag"
-	"fmt"
-	"log"
-	"os"
-	"os/signal"
-	"strconv"
-	"strings"
-	"sync"
-
-	"github.com/Shopify/sarama"
-)
-
-var (
-	brokerList = flag.String("brokers", os.Getenv("KAFKA_PEERS"), "The comma separated list of brokers in the Kafka cluster")
-	topic      = flag.String("topic", "", "REQUIRED: the topic to consume")
-	partitions = flag.String("partitions", "all", "The partitions to consume, can be 'all' or comma-separated numbers")
-	offset     = flag.String("offset", "newest", "The offset to start with. Can be `oldest`, `newest`")
-	verbose    = flag.Bool("verbose", false, "Whether to turn on sarama logging")
-	bufferSize = flag.Int("buffer-size", 256, "The buffer size of the message channel.")
-
-	logger = log.New(os.Stderr, "", log.LstdFlags)
-)
-
-func main() {
-	flag.Parse()
-
-	if *brokerList == "" {
-		printUsageErrorAndExit("You have to provide -brokers as a comma-separated list, or set the KAFKA_PEERS environment variable.")
-	}
-
-	if *topic == "" {
-		printUsageErrorAndExit("-topic is required")
-	}
-
-	if *verbose {
-		sarama.Logger = logger
-	}
-
-	var initialOffset int64
-	switch *offset {
-	case "oldest":
-		initialOffset = sarama.OffsetOldest
-	case "newest":
-		initialOffset = sarama.OffsetNewest
-	default:
-		printUsageErrorAndExit("-offset should be `oldest` or `newest`")
-	}
-
-	c, err := sarama.NewConsumer(strings.Split(*brokerList, ","), nil)
-	if err != nil {
-		printErrorAndExit(69, "Failed to start consumer: %s", err)
-	}
-
-	partitionList, err := getPartitions(c)
-	if err != nil {
-		printErrorAndExit(69, "Failed to get the list of partitions: %s", err)
-	}
-
-	var (
-		messages = make(chan *sarama.ConsumerMessage, *bufferSize)
-		closing  = make(chan struct{})
-		wg       sync.WaitGroup
-	)
-
-	go func() {
-		signals := make(chan os.Signal, 1)
-		signal.Notify(signals, os.Kill, os.Interrupt)
-		<-signals
-		logger.Println("Initiating shutdown of consumer...")
-		close(closing)
-	}()
-
-	for _, partition := range partitionList {
-		pc, err := c.ConsumePartition(*topic, partition, initialOffset)
-		if err != nil {
-			printErrorAndExit(69, "Failed to start consumer for partition %d: %s", partition, err)
-		}
-
-		go func(pc sarama.PartitionConsumer) {
-			<-closing
-			pc.AsyncClose()
-		}(pc)
-
-		wg.Add(1)
-		go func(pc sarama.PartitionConsumer) {
-			defer wg.Done()
-			for message := range pc.Messages() {
-				messages <- message
-			}
-		}(pc)
-	}
-
-	go func() {
-		for msg := range messages {
-			fmt.Printf("Partition:\t%d\n", msg.Partition)
-			fmt.Printf("Offset:\t%d\n", msg.Offset)
-			fmt.Printf("Key:\t%s\n", string(msg.Key))
-			fmt.Printf("Value:\t%s\n", string(msg.Value))
-			fmt.Println()
-		}
-	}()
-
-	wg.Wait()
-	logger.Println("Done consuming topic", *topic)
-	close(messages)
-
-	if err := c.Close(); err != nil {
-		logger.Println("Failed to close consumer: ", err)
-	}
-}
-
-func getPartitions(c sarama.Consumer) ([]int32, error) {
-	if *partitions == "all" {
-		return c.Partitions(*topic)
-	}
-
-	tmp := strings.Split(*partitions, ",")
-	var pList []int32
-	for i := range tmp {
-		val, err := strconv.ParseInt(tmp[i], 10, 32)
-		if err != nil {
-			return nil, err
-		}
-		pList = append(pList, int32(val))
-	}
-
-	return pList, nil
-}
-
-func printErrorAndExit(code int, format string, values ...interface{}) {
-	fmt.Fprintf(os.Stderr, "ERROR: %s\n", fmt.Sprintf(format, values...))
-	fmt.Fprintln(os.Stderr)
-	os.Exit(code)
-}
-
-func printUsageErrorAndExit(format string, values ...interface{}) {
-	fmt.Fprintf(os.Stderr, "ERROR: %s\n", fmt.Sprintf(format, values...))
-	fmt.Fprintln(os.Stderr)
-	fmt.Fprintln(os.Stderr, "Available command line options:")
-	flag.PrintDefaults()
-	os.Exit(64)
-}
diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/tools/kafka-console-partitionconsumer/.gitignore b/Godeps/_workspace/src/github.com/Shopify/sarama/tools/kafka-console-partitionconsumer/.gitignore
deleted file mode 100644
index 5837fe8ca..000000000
--- a/Godeps/_workspace/src/github.com/Shopify/sarama/tools/kafka-console-partitionconsumer/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-kafka-console-partitionconsumer
-kafka-console-partitionconsumer.test
diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/tools/kafka-console-partitionconsumer/README.md b/Godeps/_workspace/src/github.com/Shopify/sarama/tools/kafka-console-partitionconsumer/README.md
deleted file mode 100644
index 646dd5f5c..000000000
--- a/Godeps/_workspace/src/github.com/Shopify/sarama/tools/kafka-console-partitionconsumer/README.md
+++ /dev/null
@@ -1,28 +0,0 @@
-# kafka-console-partitionconsumer
-
-NOTE: this tool is deprecated in favour of the more general and more powerful
-`kafka-console-consumer`.
-
-A simple command line tool to consume a partition of a topic and print the messages
-on the standard output.
-
-### Installation
-
-    go get github.com/Shopify/sarama/tools/kafka-console-partitionconsumer
-
-### Usage
-
-    # Minimum invocation
-    kafka-console-partitionconsumer -topic=test -partition=4 -brokers=kafka1:9092
-
-    # It will pick up a KAFKA_PEERS environment variable
-    export KAFKA_PEERS=kafka1:9092,kafka2:9092,kafka3:9092
-    kafka-console-partitionconsumer -topic=test -partition=4
-
-    # You can specify the offset you want to start at. It can be either
-    # `oldest`, `newest`, or a specific offset number
-    kafka-console-partitionconsumer -topic=test -partition=3 -offset=oldest
-    kafka-console-partitionconsumer -topic=test -partition=2 -offset=1337
-
-    # Display all command line options
-    kafka-console-partitionconsumer -help
diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/tools/kafka-console-partitionconsumer/kafka-console-partitionconsumer.go b/Godeps/_workspace/src/github.com/Shopify/sarama/tools/kafka-console-partitionconsumer/kafka-console-partitionconsumer.go
deleted file mode 100644
index d5e4464de..000000000
--- a/Godeps/_workspace/src/github.com/Shopify/sarama/tools/kafka-console-partitionconsumer/kafka-console-partitionconsumer.go
+++ /dev/null
@@ -1,102 +0,0 @@
-package main
-
-import (
-	"flag"
-	"fmt"
-	"log"
-	"os"
-	"os/signal"
-	"strconv"
-	"strings"
-
-	"github.com/Shopify/sarama"
-)
-
-var (
-	brokerList = flag.String("brokers", os.Getenv("KAFKA_PEERS"), "The comma separated list of brokers in the Kafka cluster")
-	topic      = flag.String("topic", "", "REQUIRED: the topic to consume")
-	partition  = flag.Int("partition", -1, "REQUIRED: the partition to consume")
-	offset     = flag.String("offset", "newest", "The offset to start with. Can be `oldest`, `newest`, or an actual offset")
-	verbose    = flag.Bool("verbose", false, "Whether to turn on sarama logging")
-
-	logger = log.New(os.Stderr, "", log.LstdFlags)
-)
-
-func main() {
-	flag.Parse()
-
-	if *brokerList == "" {
-		printUsageErrorAndExit("You have to provide -brokers as a comma-separated list, or set the KAFKA_PEERS environment variable.")
-	}
-
-	if *topic == "" {
-		printUsageErrorAndExit("-topic is required")
-	}
-
-	if *partition == -1 {
-		printUsageErrorAndExit("-partition is required")
-	}
-
-	if *verbose {
-		sarama.Logger = logger
-	}
-
-	var (
-		initialOffset int64
-		offsetError   error
-	)
-	switch *offset {
-	case "oldest":
-		initialOffset = sarama.OffsetOldest
-	case "newest":
-		initialOffset = sarama.OffsetNewest
-	default:
-		initialOffset, offsetError = strconv.ParseInt(*offset, 10, 64)
-	}
-
-	if offsetError != nil {
-		printUsageErrorAndExit("Invalid initial offset: %s", *offset)
-	}
-
-	c, err := sarama.NewConsumer(strings.Split(*brokerList, ","), nil)
-	if err != nil {
-		printErrorAndExit(69, "Failed to start consumer: %s", err)
-	}
-
-	pc, err := c.ConsumePartition(*topic, int32(*partition), initialOffset)
-	if err != nil {
-		printErrorAndExit(69, "Failed to start partition consumer: %s", err)
-	}
-
-	go func() {
-		signals := make(chan os.Signal, 1)
-		signal.Notify(signals, os.Kill, os.Interrupt)
-		<-signals
-		pc.AsyncClose()
-	}()
-
-	for msg := range pc.Messages() {
-		fmt.Printf("Offset:\t%d\n", msg.Offset)
-		fmt.Printf("Key:\t%s\n", string(msg.Key))
-		fmt.Printf("Value:\t%s\n", string(msg.Value))
-		fmt.Println()
-	}
-
-	if err := c.Close(); err != nil {
-		logger.Println("Failed to close consumer: ", err)
-	}
-}
-
-func printErrorAndExit(code int, format string, values ...interface{}) {
-	fmt.Fprintf(os.Stderr, "ERROR: %s\n", fmt.Sprintf(format, values...))
-	fmt.Fprintln(os.Stderr)
-	os.Exit(code)
-}
-
-func printUsageErrorAndExit(format string, values ...interface{}) {
-	fmt.Fprintf(os.Stderr, "ERROR: %s\n", fmt.Sprintf(format, values...))
-	fmt.Fprintln(os.Stderr)
-	fmt.Fprintln(os.Stderr, "Available command line options:")
-	flag.PrintDefaults()
-	os.Exit(64)
-}
diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/tools/kafka-console-producer/.gitignore b/Godeps/_workspace/src/github.com/Shopify/sarama/tools/kafka-console-producer/.gitignore
deleted file mode 100644
index 2b9e563a1..000000000
--- a/Godeps/_workspace/src/github.com/Shopify/sarama/tools/kafka-console-producer/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-kafka-console-producer
-kafka-console-producer.test
diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/tools/kafka-console-producer/README.md b/Godeps/_workspace/src/github.com/Shopify/sarama/tools/kafka-console-producer/README.md
deleted file mode 100644
index 6b3a65f21..000000000
--- a/Godeps/_workspace/src/github.com/Shopify/sarama/tools/kafka-console-producer/README.md
+++ /dev/null
@@ -1,34 +0,0 @@
-# kafka-console-producer
-
-A simple command line tool to produce a single message to Kafka.
-
-### Installation
-
-    go get github.com/Shopify/sarama/tools/kafka-console-producer
-
-
-### Usage
-
-    # Minimum invocation
-    kafka-console-producer -topic=test -value=value -brokers=kafka1:9092
-
-    # It will pick up a KAFKA_PEERS environment variable
-    export KAFKA_PEERS=kafka1:9092,kafka2:9092,kafka3:9092
-    kafka-console-producer -topic=test -value=value
-
-    # It will read the value from stdin by using pipes
-    echo "hello world" | kafka-console-producer -topic=test
-
-    # Specify a key:
-    echo "hello world" | kafka-console-producer -topic=test -key=key
-
-    # Partitioning: by default, kafka-console-producer will partition as follows:
-    # - manual partitioning if a -partition is provided
-    # - hash partitioning by key if a -key is provided
-    # - random partioning otherwise.
-    #
-    # You can override this using the -partitioner argument:
-    echo "hello world" | kafka-console-producer -topic=test -key=key -partitioner=random
-
-    # Display all command line options
-    kafka-console-producer -help
diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/tools/kafka-console-producer/kafka-console-producer.go b/Godeps/_workspace/src/github.com/Shopify/sarama/tools/kafka-console-producer/kafka-console-producer.go
deleted file mode 100644
index 6a1765d7c..000000000
--- a/Godeps/_workspace/src/github.com/Shopify/sarama/tools/kafka-console-producer/kafka-console-producer.go
+++ /dev/null
@@ -1,118 +0,0 @@
-package main
-
-import (
-	"flag"
-	"fmt"
-	"io/ioutil"
-	"log"
-	"os"
-	"strings"
-
-	"github.com/Shopify/sarama"
-)
-
-var (
-	brokerList  = flag.String("brokers", os.Getenv("KAFKA_PEERS"), "The comma separated list of brokers in the Kafka cluster. You can also set the KAFKA_PEERS environment variable")
-	topic       = flag.String("topic", "", "REQUIRED: the topic to produce to")
-	key         = flag.String("key", "", "The key of the message to produce. Can be empty.")
-	value       = flag.String("value", "", "REQUIRED: the value of the message to produce. You can also provide the value on stdin.")
-	partitioner = flag.String("partitioner", "", "The partitioning scheme to use. Can be `hash`, `manual`, or `random`")
-	partition   = flag.Int("partition", -1, "The partition to produce to.")
-	verbose     = flag.Bool("verbose", false, "Turn on sarama logging to stderr")
-	silent      = flag.Bool("silent", false, "Turn off printing the message's topic, partition, and offset to stdout")
-
-	logger = log.New(os.Stderr, "", log.LstdFlags)
-)
-
-func main() {
-	flag.Parse()
-
-	if *brokerList == "" {
-		printUsageErrorAndExit("no -brokers specified. Alternatively, set the KAFKA_PEERS environment variable")
-	}
-
-	if *topic == "" {
-		printUsageErrorAndExit("no -topic specified")
-	}
-
-	if *verbose {
-		sarama.Logger = logger
-	}
-
-	config := sarama.NewConfig()
-	config.Producer.RequiredAcks = sarama.WaitForAll
-
-	switch *partitioner {
-	case "":
-		if *partition >= 0 {
-			config.Producer.Partitioner = sarama.NewManualPartitioner
-		} else {
-			config.Producer.Partitioner = sarama.NewHashPartitioner
-		}
-	case "hash":
-		config.Producer.Partitioner = sarama.NewHashPartitioner
-	case "random":
-		config.Producer.Partitioner = sarama.NewRandomPartitioner
-	case "manual":
-		config.Producer.Partitioner = sarama.NewManualPartitioner
-		if *partition == -1 {
-			printUsageErrorAndExit("-partition is required when partitioning manually")
-		}
-	default:
-		printUsageErrorAndExit(fmt.Sprintf("Partitioner %s not supported.", *partitioner))
-	}
-
-	message := &sarama.ProducerMessage{Topic: *topic, Partition: int32(*partition)}
-
-	if *key != "" {
-		message.Key = sarama.StringEncoder(*key)
-	}
-
-	if *value != "" {
-		message.Value = sarama.StringEncoder(*value)
-	} else if stdinAvailable() {
-		bytes, err := ioutil.ReadAll(os.Stdin)
-		if err != nil {
-			printErrorAndExit(66, "Failed to read data from the standard input: %s", err)
-		}
-		message.Value = sarama.ByteEncoder(bytes)
-	} else {
-		printUsageErrorAndExit("-value is required, or you have to provide the value on stdin")
-	}
-
-	producer, err := sarama.NewSyncProducer(strings.Split(*brokerList, ","), config)
-	if err != nil {
-		printErrorAndExit(69, "Failed to open Kafka producer: %s", err)
-	}
-	defer func() {
-		if err := producer.Close(); err != nil {
-			logger.Println("Failed to close Kafka producer cleanly:", err)
-		}
-	}()
-
-	partition, offset, err := producer.SendMessage(message)
-	if err != nil {
-		printErrorAndExit(69, "Failed to produce message: %s", err)
-	} else if !*silent {
-		fmt.Printf("topic=%s\tpartition=%d\toffset=%d\n", *topic, partition, offset)
-	}
-}
-
-func printErrorAndExit(code int, format string, values ...interface{}) {
-	fmt.Fprintf(os.Stderr, "ERROR: %s\n", fmt.Sprintf(format, values...))
-	fmt.Fprintln(os.Stderr)
-	os.Exit(code)
-}
-
-func printUsageErrorAndExit(message string) {
-	fmt.Fprintln(os.Stderr, "ERROR:", message)
-	fmt.Fprintln(os.Stderr)
-	fmt.Fprintln(os.Stderr, "Available command line options:")
-	flag.PrintDefaults()
-	os.Exit(64)
-}
-
-func stdinAvailable() bool {
-	stat, _ := os.Stdin.Stat()
-	return (stat.Mode() & os.ModeCharDevice) == 0
-}
diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/utils.go b/Godeps/_workspace/src/github.com/Shopify/sarama/utils.go
deleted file mode 100644
index fef7c7381..000000000
--- a/Godeps/_workspace/src/github.com/Shopify/sarama/utils.go
+++ /dev/null
@@ -1,89 +0,0 @@
-package sarama
-
-import "sort"
-
-type none struct{}
-
-// make []int32 sortable so we can sort partition numbers
-type int32Slice []int32
-
-func (slice int32Slice) Len() int {
-	return len(slice)
-}
-
-func (slice int32Slice) Less(i, j int) bool {
-	return slice[i] < slice[j]
-}
-
-func (slice int32Slice) Swap(i, j int) {
-	slice[i], slice[j] = slice[j], slice[i]
-}
-
-func dupeAndSort(input []int32) []int32 {
-	ret := make([]int32, 0, len(input))
-	for _, val := range input {
-		ret = append(ret, val)
-	}
-
-	sort.Sort(int32Slice(ret))
-	return ret
-}
-
-func withRecover(fn func()) {
-	defer func() {
-		handler := PanicHandler
-		if handler != nil {
-			if err := recover(); err != nil {
-				handler(err)
-			}
-		}
-	}()
-
-	fn()
-}
-
-func safeAsyncClose(b *Broker) {
-	tmp := b // local var prevents clobbering in goroutine
-	go withRecover(func() {
-		if connected, _ := tmp.Connected(); connected {
-			if err := tmp.Close(); err != nil {
-				Logger.Println("Error closing broker", tmp.ID(), ":", err)
-			}
-		}
-	})
-}
-
-// Encoder is a simple interface for any type that can be encoded as an array of bytes
-// in order to be sent as the key or value of a Kafka message. Length() is provided as an
-// optimization, and must return the same as len() on the result of Encode().
-type Encoder interface {
-	Encode() ([]byte, error)
-	Length() int
-}
-
-// make strings and byte slices encodable for convenience so they can be used as keys
-// and/or values in kafka messages
-
-// StringEncoder implements the Encoder interface for Go strings so that they can be used
-// as the Key or Value in a ProducerMessage.
-type StringEncoder string
-
-func (s StringEncoder) Encode() ([]byte, error) {
-	return []byte(s), nil
-}
-
-func (s StringEncoder) Length() int {
-	return len(s)
-}
-
-// ByteEncoder implements the Encoder interface for Go byte slices so that they can be used
-// as the Key or Value in a ProducerMessage.
-type ByteEncoder []byte
-
-func (b ByteEncoder) Encode() ([]byte, error) {
-	return b, nil
-}
-
-func (b ByteEncoder) Length() int {
-	return len(b)
-}
diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/vagrant/boot_cluster.sh b/Godeps/_workspace/src/github.com/Shopify/sarama/vagrant/boot_cluster.sh
deleted file mode 100644
index 95e47dde4..000000000
--- a/Godeps/_workspace/src/github.com/Shopify/sarama/vagrant/boot_cluster.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-set -ex
-
-# Launch and wait for toxiproxy
-${REPOSITORY_ROOT}/vagrant/run_toxiproxy.sh &
-while ! nc -q 1 localhost 2181 </dev/null; do echo "Waiting"; sleep 1; done
-while ! nc -q 1 localhost 9092 </dev/null; do echo "Waiting"; sleep 1; done
-
-# Launch and wait for Zookeeper
-for i in 1 2 3 4 5; do
-    KAFKA_PORT=`expr $i + 9090`
-    cd ${KAFKA_INSTALL_ROOT}/kafka-${KAFKA_PORT} && bin/zookeeper-server-start.sh -daemon config/zookeeper.properties
-done
-while ! nc -q 1 localhost 21805 </dev/null; do echo "Waiting"; sleep 1; done
-
-# Launch and wait for Kafka
-for i in 1 2 3 4 5; do
-    KAFKA_PORT=`expr $i + 9090`
-    cd ${KAFKA_INSTALL_ROOT}/kafka-${KAFKA_PORT} && bin/kafka-server-start.sh -daemon config/server.properties
-done
-while ! nc -q 1 localhost 29095 </dev/null; do echo "Waiting"; sleep 1; done
diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/vagrant/create_topics.sh b/Godeps/_workspace/src/github.com/Shopify/sarama/vagrant/create_topics.sh
deleted file mode 100644
index 1fe84fbd4..000000000
--- a/Godeps/_workspace/src/github.com/Shopify/sarama/vagrant/create_topics.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-set -ex
-
-cd ${KAFKA_INSTALL_ROOT}/kafka-9092
-bin/kafka-topics.sh --create --partitions 1 --replication-factor 3 --topic test.1 --zookeeper localhost:2181
-bin/kafka-topics.sh --create --partitions 4 --replication-factor 3 --topic test.4 --zookeeper localhost:2181
-bin/kafka-topics.sh --create --partitions 64 --replication-factor 3 --topic test.64  --zookeeper localhost:2181
diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/vagrant/install_cluster.sh b/Godeps/_workspace/src/github.com/Shopify/sarama/vagrant/install_cluster.sh
deleted file mode 100644
index bb0f5a5af..000000000
--- a/Godeps/_workspace/src/github.com/Shopify/sarama/vagrant/install_cluster.sh
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/sh
-
-set -ex
-
-TOXIPROXY_VERSION=1.0.3
-
-mkdir -p ${KAFKA_INSTALL_ROOT}
-if [ ! -f ${KAFKA_INSTALL_ROOT}/kafka-${KAFKA_VERSION}.tgz ]; then
-    wget --quiet http://apache.mirror.gtcomm.net/kafka/${KAFKA_VERSION}/kafka_2.10-${KAFKA_VERSION}.tgz -O ${KAFKA_INSTALL_ROOT}/kafka-${KAFKA_VERSION}.tgz
-fi
-if [ ! -f ${KAFKA_INSTALL_ROOT}/toxiproxy-${TOXIPROXY_VERSION} ]; then
-    wget --quiet https://github.com/Shopify/toxiproxy/releases/download/v${TOXIPROXY_VERSION}/toxiproxy-linux-amd64 -O ${KAFKA_INSTALL_ROOT}/toxiproxy-${TOXIPROXY_VERSION}
-    chmod +x ${KAFKA_INSTALL_ROOT}/toxiproxy-${TOXIPROXY_VERSION}
-fi
-rm -f ${KAFKA_INSTALL_ROOT}/toxiproxy
-ln -s ${KAFKA_INSTALL_ROOT}/toxiproxy-${TOXIPROXY_VERSION} ${KAFKA_INSTALL_ROOT}/toxiproxy
-
-for i in 1 2 3 4 5; do
-    ZK_PORT=`expr $i + 2180`
-    ZK_PORT_REAL=`expr $i + 21800`
-    KAFKA_PORT=`expr $i + 9090`
-    KAFKA_PORT_REAL=`expr $i + 29090`
-
-    # unpack kafka
-    mkdir -p ${KAFKA_INSTALL_ROOT}/kafka-${KAFKA_PORT}
-    tar xzf ${KAFKA_INSTALL_ROOT}/kafka-${KAFKA_VERSION}.tgz -C ${KAFKA_INSTALL_ROOT}/kafka-${KAFKA_PORT} --strip-components 1
-
-    # broker configuration
-    cp ${REPOSITORY_ROOT}/vagrant/server.properties ${KAFKA_INSTALL_ROOT}/kafka-${KAFKA_PORT}/config/
-    sed -i s/KAFKAID/${KAFKA_PORT}/g ${KAFKA_INSTALL_ROOT}/kafka-${KAFKA_PORT}/config/server.properties
-    sed -i s/KAFKAPORT/${KAFKA_PORT_REAL}/g ${KAFKA_INSTALL_ROOT}/kafka-${KAFKA_PORT}/config/server.properties
-    sed -i s/KAFKA_HOSTNAME/${KAFKA_HOSTNAME}/g ${KAFKA_INSTALL_ROOT}/kafka-${KAFKA_PORT}/config/server.properties
-    sed -i s/ZK_PORT/${ZK_PORT}/g ${KAFKA_INSTALL_ROOT}/kafka-${KAFKA_PORT}/config/server.properties
-
-    KAFKA_DATADIR="${KAFKA_INSTALL_ROOT}/kafka-${KAFKA_PORT}/data"
-    mkdir -p ${KAFKA_DATADIR}
-    sed -i s#KAFKA_DATADIR#${KAFKA_DATADIR}#g ${KAFKA_INSTALL_ROOT}/kafka-${KAFKA_PORT}/config/server.properties
-
-    # zookeeper configuration
-    cp ${REPOSITORY_ROOT}/vagrant/zookeeper.properties ${KAFKA_INSTALL_ROOT}/kafka-${KAFKA_PORT}/config/
-    sed -i s/KAFKAID/${KAFKA_PORT}/g ${KAFKA_INSTALL_ROOT}/kafka-${KAFKA_PORT}/config/zookeeper.properties
-    sed -i s/ZK_PORT/${ZK_PORT_REAL}/g ${KAFKA_INSTALL_ROOT}/kafka-${KAFKA_PORT}/config/zookeeper.properties
-
-    ZK_DATADIR="${KAFKA_INSTALL_ROOT}/zookeeper-${ZK_PORT}"
-    mkdir -p ${ZK_DATADIR}
-    sed -i s#ZK_DATADIR#${ZK_DATADIR}#g ${KAFKA_INSTALL_ROOT}/kafka-${KAFKA_PORT}/config/zookeeper.properties
-
-    echo $i > ${KAFKA_INSTALL_ROOT}/zookeeper-${ZK_PORT}/myid
-done
diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/vagrant/kafka.conf b/Godeps/_workspace/src/github.com/Shopify/sarama/vagrant/kafka.conf
deleted file mode 100644
index d975de438..000000000
--- a/Godeps/_workspace/src/github.com/Shopify/sarama/vagrant/kafka.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-start on started zookeeper-ZK_PORT
-stop on stopping zookeeper-ZK_PORT
-
-pre-start exec sleep 2
-exec /opt/kafka-KAFKAID/bin/kafka-server-start.sh /opt/kafka-KAFKAID/config/server.properties
diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/vagrant/provision.sh b/Godeps/_workspace/src/github.com/Shopify/sarama/vagrant/provision.sh
deleted file mode 100644
index 0a2d77785..000000000
--- a/Godeps/_workspace/src/github.com/Shopify/sarama/vagrant/provision.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-set -ex
-
-apt-get update
-yes | apt-get install default-jre
-
-export KAFKA_INSTALL_ROOT=/opt
-export KAFKA_HOSTNAME=192.168.100.67
-export KAFKA_VERSION=0.8.2.1
-export REPOSITORY_ROOT=/vagrant
-
-sh /vagrant/vagrant/install_cluster.sh
-sh /vagrant/vagrant/setup_services.sh
-sh /vagrant/vagrant/create_topics.sh
diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/vagrant/run_toxiproxy.sh b/Godeps/_workspace/src/github.com/Shopify/sarama/vagrant/run_toxiproxy.sh
deleted file mode 100644
index e52c00e7b..000000000
--- a/Godeps/_workspace/src/github.com/Shopify/sarama/vagrant/run_toxiproxy.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-set -ex
-
-${KAFKA_INSTALL_ROOT}/toxiproxy -port 8474 -host 0.0.0.0 &
-PID=$!
-
-while ! nc -q 1 localhost 8474 </dev/null; do echo "Waiting"; sleep 1; done
-
-wget -O/dev/null -S --post-data='{"name":"zk1", "upstream":"localhost:21801", "listen":"0.0.0.0:2181"}' localhost:8474/proxies
-wget -O/dev/null -S --post-data='{"name":"zk2", "upstream":"localhost:21802", "listen":"0.0.0.0:2182"}' localhost:8474/proxies
-wget -O/dev/null -S --post-data='{"name":"zk3", "upstream":"localhost:21803", "listen":"0.0.0.0:2183"}' localhost:8474/proxies
-wget -O/dev/null -S --post-data='{"name":"zk4", "upstream":"localhost:21804", "listen":"0.0.0.0:2184"}' localhost:8474/proxies
-wget -O/dev/null -S --post-data='{"name":"zk5", "upstream":"localhost:21805", "listen":"0.0.0.0:2185"}' localhost:8474/proxies
-
-wget -O/dev/null -S --post-data='{"name":"kafka1", "upstream":"localhost:29091", "listen":"0.0.0.0:9091"}' localhost:8474/proxies
-wget -O/dev/null -S --post-data='{"name":"kafka2", "upstream":"localhost:29092", "listen":"0.0.0.0:9092"}' localhost:8474/proxies
-wget -O/dev/null -S --post-data='{"name":"kafka3", "upstream":"localhost:29093", "listen":"0.0.0.0:9093"}' localhost:8474/proxies
-wget -O/dev/null -S --post-data='{"name":"kafka4", "upstream":"localhost:29094", "listen":"0.0.0.0:9094"}' localhost:8474/proxies
-wget -O/dev/null -S --post-data='{"name":"kafka5", "upstream":"localhost:29095", "listen":"0.0.0.0:9095"}' localhost:8474/proxies
-
-wait $PID
diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/vagrant/server.properties b/Godeps/_workspace/src/github.com/Shopify/sarama/vagrant/server.properties
deleted file mode 100644
index 40b558bf1..000000000
--- a/Godeps/_workspace/src/github.com/Shopify/sarama/vagrant/server.properties
+++ /dev/null
@@ -1,126 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You 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.
-# see kafka.server.KafkaConfig for additional details and defaults
-
-############################# Server Basics #############################
-
-# The id of the broker. This must be set to a unique integer for each broker.
-broker.id=KAFKAID
-
-############################# Socket Server Settings #############################
-
-# The port the socket server listens on
-port=KAFKAPORT
-
-# Hostname the broker will bind to. If not set, the server will bind to all interfaces
-host.name=localhost
-
-# Hostname the broker will advertise to producers and consumers. If not set, it uses the
-# value for "host.name" if configured.  Otherwise, it will use the value returned from
-# java.net.InetAddress.getCanonicalHostName().
-advertised.host.name=KAFKA_HOSTNAME
-advertised.port=KAFKAID
-
-# The port to publish to ZooKeeper for clients to use. If this is not set,
-# it will publish the same port that the broker binds to.
-# advertised.port=<port accessible by clients>
-
-# The number of threads handling network requests
-num.network.threads=2
-
-# The number of threads doing disk I/O
-num.io.threads=8
-
-# The send buffer (SO_SNDBUF) used by the socket server
-socket.send.buffer.bytes=1048576
-
-# The receive buffer (SO_RCVBUF) used by the socket server
-socket.receive.buffer.bytes=1048576
-
-# The maximum size of a request that the socket server will accept (protection against OOM)
-socket.request.max.bytes=104857600
-
-
-############################# Log Basics #############################
-
-# A comma seperated list of directories under which to store log files
-log.dirs=KAFKA_DATADIR
-
-# The default number of log partitions per topic. More partitions allow greater
-# parallelism for consumption, but this will also result in more files across
-# the brokers.
-num.partitions=2
-
-# Create new topics with a replication factor of 2 so failover can be tested
-# more easily.
-default.replication.factor=2
-
-auto.create.topics.enable=false
-delete.topic.enable=true
-
-############################# Log Flush Policy #############################
-
-# Messages are immediately written to the filesystem but by default we only fsync() to sync
-# the OS cache lazily. The following configurations control the flush of data to disk.
-# There are a few important trade-offs here:
-#    1. Durability: Unflushed data may be lost if you are not using replication.
-#    2. Latency: Very large flush intervals may lead to latency spikes when the flush does occur as there will be a lot of data to flush.
-#    3. Throughput: The flush is generally the most expensive operation, and a small flush interval may lead to exceessive seeks.
-# The settings below allow one to configure the flush policy to flush data after a period of time or
-# every N messages (or both). This can be done globally and overridden on a per-topic basis.
-
-# The number of messages to accept before forcing a flush of data to disk
-#log.flush.interval.messages=10000
-
-# The maximum amount of time a message can sit in a log before we force a flush
-#log.flush.interval.ms=1000
-
-############################# Log Retention Policy #############################
-
-# The following configurations control the disposal of log segments. The policy can
-# be set to delete segments after a period of time, or after a given size has accumulated.
-# A segment will be deleted whenever *either* of these criteria are met. Deletion always happens
-# from the end of the log.
-
-# The minimum age of a log file to be eligible for deletion
-log.retention.hours=168
-
-# A size-based retention policy for logs. Segments are pruned from the log as long as the remaining
-# segments don't drop below log.retention.bytes.
-log.retention.bytes=268435456
-
-# The maximum size of a log segment file. When this size is reached a new log segment will be created.
-log.segment.bytes=268435456
-
-# The interval at which log segments are checked to see if they can be deleted according
-# to the retention policies
-log.retention.check.interval.ms=60000
-
-# By default the log cleaner is disabled and the log retention policy will default to just delete segments after their retention expires.
-# If log.cleaner.enable=true is set the cleaner will be enabled and individual logs can then be marked for log compaction.
-log.cleaner.enable=false
-
-############################# Zookeeper #############################
-
-# Zookeeper connection string (see zookeeper docs for details).
-# This is a comma separated host:port pairs, each corresponding to a zk
-# server. e.g. "127.0.0.1:3000,127.0.0.1:3001,127.0.0.1:3002".
-# You can also append an optional chroot string to the urls to specify the
-# root directory for all kafka znodes.
-zookeeper.connect=localhost:ZK_PORT
-
-# Timeout in ms for connecting to zookeeper
-zookeeper.session.timeout.ms=3000
-zookeeper.connection.timeout.ms=3000
diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/vagrant/setup_services.sh b/Godeps/_workspace/src/github.com/Shopify/sarama/vagrant/setup_services.sh
deleted file mode 100644
index 81d8ea05d..000000000
--- a/Godeps/_workspace/src/github.com/Shopify/sarama/vagrant/setup_services.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-
-set -ex
-
-stop toxiproxy || true
-cp ${REPOSITORY_ROOT}/vagrant/toxiproxy.conf /etc/init/toxiproxy.conf
-cp ${REPOSITORY_ROOT}/vagrant/run_toxiproxy.sh ${KAFKA_INSTALL_ROOT}/
-start toxiproxy
-
-for i in 1 2 3 4 5; do
-    ZK_PORT=`expr $i + 2180`
-    KAFKA_PORT=`expr $i + 9090`
-
-    stop zookeeper-${ZK_PORT} || true
-
-    # set up zk service
-    cp ${REPOSITORY_ROOT}/vagrant/zookeeper.conf /etc/init/zookeeper-${ZK_PORT}.conf
-    sed -i s/KAFKAID/${KAFKA_PORT}/g /etc/init/zookeeper-${ZK_PORT}.conf
-
-    # set up kafka service
-    cp ${REPOSITORY_ROOT}/vagrant/kafka.conf /etc/init/kafka-${KAFKA_PORT}.conf
-    sed -i s/KAFKAID/${KAFKA_PORT}/g /etc/init/kafka-${KAFKA_PORT}.conf
-    sed -i s/ZK_PORT/${ZK_PORT}/g /etc/init/kafka-${KAFKA_PORT}.conf
-
-    start zookeeper-${ZK_PORT}
-done
-
-# Wait for the last kafka node to finish booting
-while ! nc -q 1 localhost 29095 </dev/null; do echo "Waiting"; sleep 1; done
diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/vagrant/toxiproxy.conf b/Godeps/_workspace/src/github.com/Shopify/sarama/vagrant/toxiproxy.conf
deleted file mode 100644
index cc1226a31..000000000
--- a/Godeps/_workspace/src/github.com/Shopify/sarama/vagrant/toxiproxy.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-start on started networking
-stop on shutdown
-
-env KAFKA_INSTALL_ROOT=/opt
-
-exec /opt/run_toxiproxy.sh
diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/vagrant/zookeeper.conf b/Godeps/_workspace/src/github.com/Shopify/sarama/vagrant/zookeeper.conf
deleted file mode 100644
index 421ae0533..000000000
--- a/Godeps/_workspace/src/github.com/Shopify/sarama/vagrant/zookeeper.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-start on started toxiproxy
-stop on stopping toxiproxy
-
-exec /opt/kafka-KAFKAID/bin/zookeeper-server-start.sh /opt/kafka-KAFKAID/config/zookeeper.properties
diff --git a/Godeps/_workspace/src/github.com/Shopify/sarama/vagrant/zookeeper.properties b/Godeps/_workspace/src/github.com/Shopify/sarama/vagrant/zookeeper.properties
deleted file mode 100644
index 43b0f62f5..000000000
--- a/Godeps/_workspace/src/github.com/Shopify/sarama/vagrant/zookeeper.properties
+++ /dev/null
@@ -1,36 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You 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.
-# the directory where the snapshot is stored.
-dataDir=ZK_DATADIR
-# the port at which the clients will connect
-clientPort=ZK_PORT
-# disable the per-ip limit on the number of connections since this is a non-production config
-maxClientCnxns=0
-
-# The number of milliseconds of each tick
-tickTime=2000
-
-# The number of ticks that the initial synchronization phase can take
-initLimit=10
-
-# The number of ticks that can pass between
-# sending a request and getting an acknowledgement
-syncLimit=5
-
-server.1=localhost:2281:2381
-server.2=localhost:2282:2382
-server.3=localhost:2283:2383
-server.4=localhost:2284:2384
-server.5=localhost:2285:2385
diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/.gitignore b/Godeps/_workspace/src/github.com/Sirupsen/logrus/.gitignore
deleted file mode 100644
index 66be63a00..000000000
--- a/Godeps/_workspace/src/github.com/Sirupsen/logrus/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-logrus
diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/.travis.yml b/Godeps/_workspace/src/github.com/Sirupsen/logrus/.travis.yml
deleted file mode 100644
index 2d8c08661..000000000
--- a/Godeps/_workspace/src/github.com/Sirupsen/logrus/.travis.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-language: go
-go:
-  - 1.2
-  - 1.3
-  - 1.4
-  - tip
-install:
-  - go get -t ./...
diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/CHANGELOG.md b/Godeps/_workspace/src/github.com/Sirupsen/logrus/CHANGELOG.md
deleted file mode 100644
index b1fe4b62c..000000000
--- a/Godeps/_workspace/src/github.com/Sirupsen/logrus/CHANGELOG.md
+++ /dev/null
@@ -1,41 +0,0 @@
-# 0.8.6
-
-* hooks/raven: allow passing an initialized client
-
-# 0.8.5
-
-* logrus/core: revert #208
-
-# 0.8.4
-
-* formatter/text: fix data race (#218)
-
-# 0.8.3
-
-* logrus/core: fix entry log level (#208)
-* logrus/core: improve performance of text formatter by 40%
-* logrus/core: expose `LevelHooks` type
-* logrus/core: add support for DragonflyBSD and NetBSD
-* formatter/text: print structs more verbosely
-
-# 0.8.2
-
-* logrus: fix more Fatal family functions
-
-# 0.8.1
-
-* logrus: fix not exiting on `Fatalf` and `Fatalln`
-
-# 0.8.0
-
-* logrus: defaults to stderr instead of stdout
-* hooks/sentry: add special field for `*http.Request`
-* formatter/text: ignore Windows for colors
-
-# 0.7.3
-
-* formatter/\*: allow configuration of timestamp layout
-
-# 0.7.2
-
-* formatter/text: Add configuration option for time format (#158)
diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/LICENSE b/Godeps/_workspace/src/github.com/Sirupsen/logrus/LICENSE
deleted file mode 100644
index f090cb42f..000000000
--- a/Godeps/_workspace/src/github.com/Sirupsen/logrus/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2014 Simon Eskildsen
-
-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/Sirupsen/logrus/README.md b/Godeps/_workspace/src/github.com/Sirupsen/logrus/README.md
deleted file mode 100644
index bd9ffb6ed..000000000
--- a/Godeps/_workspace/src/github.com/Sirupsen/logrus/README.md
+++ /dev/null
@@ -1,356 +0,0 @@
-# Logrus <img src="http://i.imgur.com/hTeVwmJ.png" width="40" height="40" alt=":walrus:" class="emoji" title=":walrus:"/>&nbsp;[![Build Status](https://travis-ci.org/Sirupsen/logrus.svg?branch=master)](https://travis-ci.org/Sirupsen/logrus)&nbsp;[![godoc reference](https://godoc.org/github.com/Sirupsen/logrus?status.png)][godoc]
-
-Logrus is a structured logger for Go (golang), completely API compatible with
-the standard library logger. [Godoc][godoc]. **Please note the Logrus API is not
-yet stable (pre 1.0). Logrus itself is completely stable and has been used in
-many large deployments. The core API is unlikely to change much but please
-version control your Logrus to make sure you aren't fetching latest `master` on
-every build.**
-
-Nicely color-coded in development (when a TTY is attached, otherwise just
-plain text):
-
-![Colored](http://i.imgur.com/PY7qMwd.png)
-
-With `log.Formatter = new(logrus.JSONFormatter)`, for easy parsing by logstash
-or Splunk:
-
-```json
-{"animal":"walrus","level":"info","msg":"A group of walrus emerges from the
-ocean","size":10,"time":"2014-03-10 19:57:38.562264131 -0400 EDT"}
-
-{"level":"warning","msg":"The group's number increased tremendously!",
-"number":122,"omg":true,"time":"2014-03-10 19:57:38.562471297 -0400 EDT"}
-
-{"animal":"walrus","level":"info","msg":"A giant walrus appears!",
-"size":10,"time":"2014-03-10 19:57:38.562500591 -0400 EDT"}
-
-{"animal":"walrus","level":"info","msg":"Tremendously sized cow enters the ocean.",
-"size":9,"time":"2014-03-10 19:57:38.562527896 -0400 EDT"}
-
-{"level":"fatal","msg":"The ice breaks!","number":100,"omg":true,
-"time":"2014-03-10 19:57:38.562543128 -0400 EDT"}
-```
-
-With the default `log.Formatter = new(&log.TextFormatter{})` when a TTY is not
-attached, the output is compatible with the
-[logfmt](http://godoc.org/github.com/kr/logfmt) format:
-
-```text
-time="2015-03-26T01:27:38-04:00" level=debug msg="Started observing beach" animal=walrus number=8
-time="2015-03-26T01:27:38-04:00" level=info msg="A group of walrus emerges from the ocean" animal=walrus size=10
-time="2015-03-26T01:27:38-04:00" level=warning msg="The group's number increased tremendously!" number=122 omg=true
-time="2015-03-26T01:27:38-04:00" level=debug msg="Temperature changes" temperature=-4
-time="2015-03-26T01:27:38-04:00" level=panic msg="It's over 9000!" animal=orca size=9009
-time="2015-03-26T01:27:38-04:00" level=fatal msg="The ice breaks!" err=&{0x2082280c0 map[animal:orca size:9009] 2015-03-26 01:27:38.441574009 -0400 EDT panic It's over 9000!} number=100 omg=true
-exit status 1
-```
-
-#### Example
-
-The simplest way to use Logrus is simply the package-level exported logger:
-
-```go
-package main
-
-import (
-  log "github.com/Sirupsen/logrus"
-)
-
-func main() {
-  log.WithFields(log.Fields{
-    "animal": "walrus",
-  }).Info("A walrus appears")
-}
-```
-
-Note that it's completely api-compatible with the stdlib logger, so you can
-replace your `log` imports everywhere with `log "github.com/Sirupsen/logrus"`
-and you'll now have the flexibility of Logrus. You can customize it all you
-want:
-
-```go
-package main
-
-import (
-  "os"
-  log "github.com/Sirupsen/logrus"
-  "github.com/Sirupsen/logrus/hooks/airbrake"
-)
-
-func init() {
-  // Log as JSON instead of the default ASCII formatter.
-  log.SetFormatter(&log.JSONFormatter{})
-
-  // Use the Airbrake hook to report errors that have Error severity or above to
-  // an exception tracker. You can create custom hooks, see the Hooks section.
-  log.AddHook(airbrake.NewHook("https://example.com", "xyz", "development"))
-
-  // Output to stderr instead of stdout, could also be a file.
-  log.SetOutput(os.Stderr)
-
-  // Only log the warning severity or above.
-  log.SetLevel(log.WarnLevel)
-}
-
-func main() {
-  log.WithFields(log.Fields{
-    "animal": "walrus",
-    "size":   10,
-  }).Info("A group of walrus emerges from the ocean")
-
-  log.WithFields(log.Fields{
-    "omg":    true,
-    "number": 122,
-  }).Warn("The group's number increased tremendously!")
-
-  log.WithFields(log.Fields{
-    "omg":    true,
-    "number": 100,
-  }).Fatal("The ice breaks!")
-
-  // A common pattern is to re-use fields between logging statements by re-using
-  // the logrus.Entry returned from WithFields()
-  contextLogger := log.WithFields(log.Fields{
-    "common": "this is a common field",
-    "other": "I also should be logged always",
-  })
-
-  contextLogger.Info("I'll be logged with common and other field")
-  contextLogger.Info("Me too")
-}
-```
-
-For more advanced usage such as logging to multiple locations from the same
-application, you can also create an instance of the `logrus` Logger:
-
-```go
-package main
-
-import (
-  "github.com/Sirupsen/logrus"
-)
-
-// Create a new instance of the logger. You can have any number of instances.
-var log = logrus.New()
-
-func main() {
-  // The API for setting attributes is a little different than the package level
-  // exported logger. See Godoc.
-  log.Out = os.Stderr
-
-  log.WithFields(logrus.Fields{
-    "animal": "walrus",
-    "size":   10,
-  }).Info("A group of walrus emerges from the ocean")
-}
-```
-
-#### Fields
-
-Logrus encourages careful, structured logging though logging fields instead of
-long, unparseable error messages. For example, instead of: `log.Fatalf("Failed
-to send event %s to topic %s with key %d")`, you should log the much more
-discoverable:
-
-```go
-log.WithFields(log.Fields{
-  "event": event,
-  "topic": topic,
-  "key": key,
-}).Fatal("Failed to send event")
-```
-
-We've found this API forces you to think about logging in a way that produces
-much more useful logging messages. We've been in countless situations where just
-a single added field to a log statement that was already there would've saved us
-hours. The `WithFields` call is optional.
-
-In general, with Logrus using any of the `printf`-family functions should be
-seen as a hint you should add a field, however, you can still use the
-`printf`-family functions with Logrus.
-
-#### Hooks
-
-You can add hooks for logging levels. For example to send errors to an exception
-tracking service on `Error`, `Fatal` and `Panic`, info to StatsD or log to
-multiple places simultaneously, e.g. syslog.
-
-Logrus comes with [built-in hooks](hooks/). Add those, or your custom hook, in
-`init`:
-
-```go
-import (
-  log "github.com/Sirupsen/logrus"
-  "github.com/Sirupsen/logrus/hooks/airbrake"
-  logrus_syslog "github.com/Sirupsen/logrus/hooks/syslog"
-  "log/syslog"
-)
-
-func init() {
-  log.AddHook(airbrake.NewHook("https://example.com", "xyz", "development"))
-
-  hook, err := logrus_syslog.NewSyslogHook("udp", "localhost:514", syslog.LOG_INFO, "")
-  if err != nil {
-    log.Error("Unable to connect to local syslog daemon")
-  } else {
-    log.AddHook(hook)
-  }
-}
-```
-
-
-| Hook  | Description |
-| ----- | ----------- |
-| [Airbrake](https://github.com/Sirupsen/logrus/blob/master/hooks/airbrake/airbrake.go) | Send errors to an exception tracking service compatible with the Airbrake API. Uses [`airbrake-go`](https://github.com/tobi/airbrake-go) behind the scenes. |
-| [Papertrail](https://github.com/Sirupsen/logrus/blob/master/hooks/papertrail/papertrail.go) | Send errors to the Papertrail hosted logging service via UDP. |
-| [Syslog](https://github.com/Sirupsen/logrus/blob/master/hooks/syslog/syslog.go) | Send errors to remote syslog server. Uses standard library `log/syslog` behind the scenes. |
-| [BugSnag](https://github.com/Sirupsen/logrus/blob/master/hooks/bugsnag/bugsnag.go) | Send errors to the Bugsnag exception tracking service. |
-| [Sentry](https://github.com/Sirupsen/logrus/blob/master/hooks/sentry/sentry.go) | Send errors to the Sentry error logging and aggregation service. |
-| [Hiprus](https://github.com/nubo/hiprus) | Send errors to a channel in hipchat. |
-| [Logrusly](https://github.com/sebest/logrusly) | Send logs to [Loggly](https://www.loggly.com/) |
-| [Slackrus](https://github.com/johntdyer/slackrus) | Hook for Slack chat. |
-| [Journalhook](https://github.com/wercker/journalhook) | Hook for logging to `systemd-journald` |
-| [Graylog](https://github.com/gemnasium/logrus-hooks/tree/master/graylog) | Hook for logging to [Graylog](http://graylog2.org/) |
-| [Raygun](https://github.com/squirkle/logrus-raygun-hook) | Hook for logging to [Raygun.io](http://raygun.io/) |
-| [LFShook](https://github.com/rifflock/lfshook) | Hook for logging to the local filesystem |
-| [Honeybadger](https://github.com/agonzalezro/logrus_honeybadger) | Hook for sending exceptions to Honeybadger |
-| [Mail](https://github.com/zbindenren/logrus_mail) | Hook for sending exceptions via mail |
-| [Rollrus](https://github.com/heroku/rollrus) | Hook for sending errors to rollbar |
-| [Fluentd](https://github.com/evalphobia/logrus_fluent) | Hook for logging to fluentd |
-
-#### Level logging
-
-Logrus has six logging levels: Debug, Info, Warning, Error, Fatal and Panic.
-
-```go
-log.Debug("Useful debugging information.")
-log.Info("Something noteworthy happened!")
-log.Warn("You should probably take a look at this.")
-log.Error("Something failed but I'm not quitting.")
-// Calls os.Exit(1) after logging
-log.Fatal("Bye.")
-// Calls panic() after logging
-log.Panic("I'm bailing.")
-```
-
-You can set the logging level on a `Logger`, then it will only log entries with
-that severity or anything above it:
-
-```go
-// Will log anything that is info or above (warn, error, fatal, panic). Default.
-log.SetLevel(log.InfoLevel)
-```
-
-It may be useful to set `log.Level = logrus.DebugLevel` in a debug or verbose
-environment if your application has that.
-
-#### Entries
-
-Besides the fields added with `WithField` or `WithFields` some fields are
-automatically added to all logging events:
-
-1. `time`. The timestamp when the entry was created.
-2. `msg`. The logging message passed to `{Info,Warn,Error,Fatal,Panic}` after
-   the `AddFields` call. E.g. `Failed to send event.`
-3. `level`. The logging level. E.g. `info`.
-
-#### Environments
-
-Logrus has no notion of environment.
-
-If you wish for hooks and formatters to only be used in specific environments,
-you should handle that yourself. For example, if your application has a global
-variable `Environment`, which is a string representation of the environment you
-could do:
-
-```go
-import (
-  log "github.com/Sirupsen/logrus"
-)
-
-init() {
-  // do something here to set environment depending on an environment variable
-  // or command-line flag
-  if Environment == "production" {
-    log.SetFormatter(&logrus.JSONFormatter{})
-  } else {
-    // The TextFormatter is default, you don't actually have to do this.
-    log.SetFormatter(&log.TextFormatter{})
-  }
-}
-```
-
-This configuration is how `logrus` was intended to be used, but JSON in
-production is mostly only useful if you do log aggregation with tools like
-Splunk or Logstash.
-
-#### Formatters
-
-The built-in logging formatters are:
-
-* `logrus.TextFormatter`. Logs the event in colors if stdout is a tty, otherwise
-  without colors.
-  * *Note:* to force colored output when there is no TTY, set the `ForceColors`
-    field to `true`.  To force no colored output even if there is a TTY  set the
-    `DisableColors` field to `true`
-* `logrus.JSONFormatter`. Logs fields as JSON.
-* `logrus_logstash.LogstashFormatter`. Logs fields as Logstash Events (http://logstash.net).
-
-    ```go
-      logrus.SetFormatter(&logrus_logstash.LogstashFormatter{Type: “application_name"})
-    ```
-
-Third party logging formatters:
-
-* [`zalgo`](https://github.com/aybabtme/logzalgo): invoking the P͉̫o̳̼̊w̖͈̰͎e̬͔̭͂r͚̼̹̲ ̫͓͉̳͈ō̠͕͖̚f̝͍̠ ͕̲̞͖͑Z̖̫̤̫ͪa͉̬͈̗l͖͎g̳̥o̰̥̅!̣͔̲̻͊̄ ̙̘̦̹̦.
-
-You can define your formatter by implementing the `Formatter` interface,
-requiring a `Format` method. `Format` takes an `*Entry`. `entry.Data` is a
-`Fields` type (`map[string]interface{}`) with all your fields as well as the
-default ones (see Entries section above):
-
-```go
-type MyJSONFormatter struct {
-}
-
-log.SetFormatter(new(MyJSONFormatter))
-
-func (f *JSONFormatter) Format(entry *Entry) ([]byte, error) {
-  // Note this doesn't include Time, Level and Message which are available on
-  // the Entry. Consult `godoc` on information about those fields or read the
-  // source of the official loggers.
-  serialized, err := json.Marshal(entry.Data)
-    if err != nil {
-      return nil, fmt.Errorf("Failed to marshal fields to JSON, %v", err)
-    }
-  return append(serialized, '\n'), nil
-}
-```
-
-#### Logger as an `io.Writer`
-
-Logrus can be transformed into an `io.Writer`. That writer is the end of an `io.Pipe` and it is your responsibility to close it.
-
-```go
-w := logger.Writer()
-defer w.Close()
-
-srv := http.Server{
-    // create a stdlib log.Logger that writes to
-    // logrus.Logger.
-    ErrorLog: log.New(w, "", 0),
-}
-```
-
-Each line written to that writer will be printed the usual way, using formatters
-and hooks. The level for those entries is `info`.
-
-#### Rotation
-
-Log rotation is not provided with Logrus. Log rotation should be done by an
-external program (like `logrotate(8)`) that can compress and delete old log
-entries. It should not be a feature of the application-level logger.
-
-
-[godoc]: https://godoc.org/github.com/Sirupsen/logrus
diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/entry.go b/Godeps/_workspace/src/github.com/Sirupsen/logrus/entry.go
deleted file mode 100644
index 04673a075..000000000
--- a/Godeps/_workspace/src/github.com/Sirupsen/logrus/entry.go
+++ /dev/null
@@ -1,256 +0,0 @@
-package logrus
-
-import (
-	"bytes"
-	"fmt"
-	"io"
-	"os"
-	"time"
-)
-
-// An entry is the final or intermediate Logrus logging entry. It contains all
-// the fields passed with WithField{,s}. It's finally logged when Debug, Info,
-// Warn, Error, Fatal or Panic is called on it. These objects can be reused and
-// passed around as much as you wish to avoid field duplication.
-type Entry struct {
-	Logger *Logger
-
-	// Contains all the fields set by the user.
-	Data Fields
-
-	// Time at which the log entry was created
-	Time time.Time
-
-	// Level the log entry was logged at: Debug, Info, Warn, Error, Fatal or Panic
-	Level Level
-
-	// Message passed to Debug, Info, Warn, Error, Fatal or Panic
-	Message string
-}
-
-func NewEntry(logger *Logger) *Entry {
-	return &Entry{
-		Logger: logger,
-		// Default is three fields, give a little extra room
-		Data: make(Fields, 5),
-	}
-}
-
-// Returns a reader for the entry, which is a proxy to the formatter.
-func (entry *Entry) Reader() (*bytes.Buffer, error) {
-	serialized, err := entry.Logger.Formatter.Format(entry)
-	return bytes.NewBuffer(serialized), err
-}
-
-// Returns the string representation from the reader and ultimately the
-// formatter.
-func (entry *Entry) String() (string, error) {
-	reader, err := entry.Reader()
-	if err != nil {
-		return "", err
-	}
-
-	return reader.String(), err
-}
-
-// Add a single field to the Entry.
-func (entry *Entry) WithField(key string, value interface{}) *Entry {
-	return entry.WithFields(Fields{key: value})
-}
-
-// Add a map of fields to the Entry.
-func (entry *Entry) WithFields(fields Fields) *Entry {
-	data := Fields{}
-	for k, v := range entry.Data {
-		data[k] = v
-	}
-	for k, v := range fields {
-		data[k] = v
-	}
-	return &Entry{Logger: entry.Logger, Data: data}
-}
-
-// This function is not declared with a pointer value because otherwise
-// race conditions will occur when using multiple goroutines
-func (entry Entry) log(level Level, msg string) {
-	entry.Time = time.Now()
-	entry.Level = level
-	entry.Message = msg
-
-	if err := entry.Logger.Hooks.Fire(level, &entry); err != nil {
-		entry.Logger.mu.Lock()
-		fmt.Fprintf(os.Stderr, "Failed to fire hook: %v\n", err)
-		entry.Logger.mu.Unlock()
-	}
-
-	reader, err := entry.Reader()
-	if err != nil {
-		entry.Logger.mu.Lock()
-		fmt.Fprintf(os.Stderr, "Failed to obtain reader, %v\n", err)
-		entry.Logger.mu.Unlock()
-	}
-
-	entry.Logger.mu.Lock()
-	defer entry.Logger.mu.Unlock()
-
-	_, err = io.Copy(entry.Logger.Out, reader)
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "Failed to write to log, %v\n", err)
-	}
-
-	// To avoid Entry#log() returning a value that only would make sense for
-	// panic() to use in Entry#Panic(), we avoid the allocation by checking
-	// directly here.
-	if level <= PanicLevel {
-		panic(&entry)
-	}
-}
-
-func (entry *Entry) Debug(args ...interface{}) {
-	if entry.Logger.Level >= DebugLevel {
-		entry.log(DebugLevel, fmt.Sprint(args...))
-	}
-}
-
-func (entry *Entry) Print(args ...interface{}) {
-	entry.Info(args...)
-}
-
-func (entry *Entry) Info(args ...interface{}) {
-	if entry.Logger.Level >= InfoLevel {
-		entry.log(InfoLevel, fmt.Sprint(args...))
-	}
-}
-
-func (entry *Entry) Warn(args ...interface{}) {
-	if entry.Logger.Level >= WarnLevel {
-		entry.log(WarnLevel, fmt.Sprint(args...))
-	}
-}
-
-func (entry *Entry) Warning(args ...interface{}) {
-	entry.Warn(args...)
-}
-
-func (entry *Entry) Error(args ...interface{}) {
-	if entry.Logger.Level >= ErrorLevel {
-		entry.log(ErrorLevel, fmt.Sprint(args...))
-	}
-}
-
-func (entry *Entry) Fatal(args ...interface{}) {
-	if entry.Logger.Level >= FatalLevel {
-		entry.log(FatalLevel, fmt.Sprint(args...))
-	}
-	os.Exit(1)
-}
-
-func (entry *Entry) Panic(args ...interface{}) {
-	if entry.Logger.Level >= PanicLevel {
-		entry.log(PanicLevel, fmt.Sprint(args...))
-	}
-	panic(fmt.Sprint(args...))
-}
-
-// Entry Printf family functions
-
-func (entry *Entry) Debugf(format string, args ...interface{}) {
-	if entry.Logger.Level >= DebugLevel {
-		entry.Debug(fmt.Sprintf(format, args...))
-	}
-}
-
-func (entry *Entry) Infof(format string, args ...interface{}) {
-	if entry.Logger.Level >= InfoLevel {
-		entry.Info(fmt.Sprintf(format, args...))
-	}
-}
-
-func (entry *Entry) Printf(format string, args ...interface{}) {
-	entry.Infof(format, args...)
-}
-
-func (entry *Entry) Warnf(format string, args ...interface{}) {
-	if entry.Logger.Level >= WarnLevel {
-		entry.Warn(fmt.Sprintf(format, args...))
-	}
-}
-
-func (entry *Entry) Warningf(format string, args ...interface{}) {
-	entry.Warnf(format, args...)
-}
-
-func (entry *Entry) Errorf(format string, args ...interface{}) {
-	if entry.Logger.Level >= ErrorLevel {
-		entry.Error(fmt.Sprintf(format, args...))
-	}
-}
-
-func (entry *Entry) Fatalf(format string, args ...interface{}) {
-	if entry.Logger.Level >= FatalLevel {
-		entry.Fatal(fmt.Sprintf(format, args...))
-	}
-	os.Exit(1)
-}
-
-func (entry *Entry) Panicf(format string, args ...interface{}) {
-	if entry.Logger.Level >= PanicLevel {
-		entry.Panic(fmt.Sprintf(format, args...))
-	}
-}
-
-// Entry Println family functions
-
-func (entry *Entry) Debugln(args ...interface{}) {
-	if entry.Logger.Level >= DebugLevel {
-		entry.Debug(entry.sprintlnn(args...))
-	}
-}
-
-func (entry *Entry) Infoln(args ...interface{}) {
-	if entry.Logger.Level >= InfoLevel {
-		entry.Info(entry.sprintlnn(args...))
-	}
-}
-
-func (entry *Entry) Println(args ...interface{}) {
-	entry.Infoln(args...)
-}
-
-func (entry *Entry) Warnln(args ...interface{}) {
-	if entry.Logger.Level >= WarnLevel {
-		entry.Warn(entry.sprintlnn(args...))
-	}
-}
-
-func (entry *Entry) Warningln(args ...interface{}) {
-	entry.Warnln(args...)
-}
-
-func (entry *Entry) Errorln(args ...interface{}) {
-	if entry.Logger.Level >= ErrorLevel {
-		entry.Error(entry.sprintlnn(args...))
-	}
-}
-
-func (entry *Entry) Fatalln(args ...interface{}) {
-	if entry.Logger.Level >= FatalLevel {
-		entry.Fatal(entry.sprintlnn(args...))
-	}
-	os.Exit(1)
-}
-
-func (entry *Entry) Panicln(args ...interface{}) {
-	if entry.Logger.Level >= PanicLevel {
-		entry.Panic(entry.sprintlnn(args...))
-	}
-}
-
-// Sprintlnn => Sprint no newline. This is to get the behavior of how
-// fmt.Sprintln where spaces are always added between operands, regardless of
-// their type. Instead of vendoring the Sprintln implementation to spare a
-// string allocation, we do the simplest thing.
-func (entry *Entry) sprintlnn(args ...interface{}) string {
-	msg := fmt.Sprintln(args...)
-	return msg[:len(msg)-1]
-}
diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/entry_test.go b/Godeps/_workspace/src/github.com/Sirupsen/logrus/entry_test.go
deleted file mode 100644
index 98717df49..000000000
--- a/Godeps/_workspace/src/github.com/Sirupsen/logrus/entry_test.go
+++ /dev/null
@@ -1,53 +0,0 @@
-package logrus
-
-import (
-	"bytes"
-	"fmt"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func TestEntryPanicln(t *testing.T) {
-	errBoom := fmt.Errorf("boom time")
-
-	defer func() {
-		p := recover()
-		assert.NotNil(t, p)
-
-		switch pVal := p.(type) {
-		case *Entry:
-			assert.Equal(t, "kaboom", pVal.Message)
-			assert.Equal(t, errBoom, pVal.Data["err"])
-		default:
-			t.Fatalf("want type *Entry, got %T: %#v", pVal, pVal)
-		}
-	}()
-
-	logger := New()
-	logger.Out = &bytes.Buffer{}
-	entry := NewEntry(logger)
-	entry.WithField("err", errBoom).Panicln("kaboom")
-}
-
-func TestEntryPanicf(t *testing.T) {
-	errBoom := fmt.Errorf("boom again")
-
-	defer func() {
-		p := recover()
-		assert.NotNil(t, p)
-
-		switch pVal := p.(type) {
-		case *Entry:
-			assert.Equal(t, "kaboom true", pVal.Message)
-			assert.Equal(t, errBoom, pVal.Data["err"])
-		default:
-			t.Fatalf("want type *Entry, got %T: %#v", pVal, pVal)
-		}
-	}()
-
-	logger := New()
-	logger.Out = &bytes.Buffer{}
-	entry := NewEntry(logger)
-	entry.WithField("err", errBoom).Panicf("kaboom %v", true)
-}
diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/examples/basic/basic.go b/Godeps/_workspace/src/github.com/Sirupsen/logrus/examples/basic/basic.go
deleted file mode 100644
index a1623ec00..000000000
--- a/Godeps/_workspace/src/github.com/Sirupsen/logrus/examples/basic/basic.go
+++ /dev/null
@@ -1,50 +0,0 @@
-package main
-
-import (
-	"github.com/Sirupsen/logrus"
-)
-
-var log = logrus.New()
-
-func init() {
-	log.Formatter = new(logrus.JSONFormatter)
-	log.Formatter = new(logrus.TextFormatter) // default
-	log.Level = logrus.DebugLevel
-}
-
-func main() {
-	defer func() {
-		err := recover()
-		if err != nil {
-			log.WithFields(logrus.Fields{
-				"omg":    true,
-				"err":    err,
-				"number": 100,
-			}).Fatal("The ice breaks!")
-		}
-	}()
-
-	log.WithFields(logrus.Fields{
-		"animal": "walrus",
-		"number": 8,
-	}).Debug("Started observing beach")
-
-	log.WithFields(logrus.Fields{
-		"animal": "walrus",
-		"size":   10,
-	}).Info("A group of walrus emerges from the ocean")
-
-	log.WithFields(logrus.Fields{
-		"omg":    true,
-		"number": 122,
-	}).Warn("The group's number increased tremendously!")
-
-	log.WithFields(logrus.Fields{
-		"temperature": -4,
-	}).Debug("Temperature changes")
-
-	log.WithFields(logrus.Fields{
-		"animal": "orca",
-		"size":   9009,
-	}).Panic("It's over 9000!")
-}
diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/examples/hook/hook.go b/Godeps/_workspace/src/github.com/Sirupsen/logrus/examples/hook/hook.go
deleted file mode 100644
index cb5759a35..000000000
--- a/Godeps/_workspace/src/github.com/Sirupsen/logrus/examples/hook/hook.go
+++ /dev/null
@@ -1,30 +0,0 @@
-package main
-
-import (
-	"github.com/Sirupsen/logrus"
-	"github.com/Sirupsen/logrus/hooks/airbrake"
-)
-
-var log = logrus.New()
-
-func init() {
-	log.Formatter = new(logrus.TextFormatter) // default
-	log.Hooks.Add(airbrake.NewHook("https://example.com", "xyz", "development"))
-}
-
-func main() {
-	log.WithFields(logrus.Fields{
-		"animal": "walrus",
-		"size":   10,
-	}).Info("A group of walrus emerges from the ocean")
-
-	log.WithFields(logrus.Fields{
-		"omg":    true,
-		"number": 122,
-	}).Warn("The group's number increased tremendously!")
-
-	log.WithFields(logrus.Fields{
-		"omg":    true,
-		"number": 100,
-	}).Fatal("The ice breaks!")
-}
diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/exported.go b/Godeps/_workspace/src/github.com/Sirupsen/logrus/exported.go
deleted file mode 100644
index a67e1b802..000000000
--- a/Godeps/_workspace/src/github.com/Sirupsen/logrus/exported.go
+++ /dev/null
@@ -1,188 +0,0 @@
-package logrus
-
-import (
-	"io"
-)
-
-var (
-	// std is the name of the standard logger in stdlib `log`
-	std = New()
-)
-
-func StandardLogger() *Logger {
-	return std
-}
-
-// SetOutput sets the standard logger output.
-func SetOutput(out io.Writer) {
-	std.mu.Lock()
-	defer std.mu.Unlock()
-	std.Out = out
-}
-
-// SetFormatter sets the standard logger formatter.
-func SetFormatter(formatter Formatter) {
-	std.mu.Lock()
-	defer std.mu.Unlock()
-	std.Formatter = formatter
-}
-
-// SetLevel sets the standard logger level.
-func SetLevel(level Level) {
-	std.mu.Lock()
-	defer std.mu.Unlock()
-	std.Level = level
-}
-
-// GetLevel returns the standard logger level.
-func GetLevel() Level {
-	std.mu.Lock()
-	defer std.mu.Unlock()
-	return std.Level
-}
-
-// AddHook adds a hook to the standard logger hooks.
-func AddHook(hook Hook) {
-	std.mu.Lock()
-	defer std.mu.Unlock()
-	std.Hooks.Add(hook)
-}
-
-// WithField creates an entry from the standard logger and adds a field to
-// it. If you want multiple fields, use `WithFields`.
-//
-// Note that it doesn't log until you call Debug, Print, Info, Warn, Fatal
-// or Panic on the Entry it returns.
-func WithField(key string, value interface{}) *Entry {
-	return std.WithField(key, value)
-}
-
-// WithFields creates an entry from the standard logger and adds multiple
-// fields to it. This is simply a helper for `WithField`, invoking it
-// once for each field.
-//
-// Note that it doesn't log until you call Debug, Print, Info, Warn, Fatal
-// or Panic on the Entry it returns.
-func WithFields(fields Fields) *Entry {
-	return std.WithFields(fields)
-}
-
-// Debug logs a message at level Debug on the standard logger.
-func Debug(args ...interface{}) {
-	std.Debug(args...)
-}
-
-// Print logs a message at level Info on the standard logger.
-func Print(args ...interface{}) {
-	std.Print(args...)
-}
-
-// Info logs a message at level Info on the standard logger.
-func Info(args ...interface{}) {
-	std.Info(args...)
-}
-
-// Warn logs a message at level Warn on the standard logger.
-func Warn(args ...interface{}) {
-	std.Warn(args...)
-}
-
-// Warning logs a message at level Warn on the standard logger.
-func Warning(args ...interface{}) {
-	std.Warning(args...)
-}
-
-// Error logs a message at level Error on the standard logger.
-func Error(args ...interface{}) {
-	std.Error(args...)
-}
-
-// Panic logs a message at level Panic on the standard logger.
-func Panic(args ...interface{}) {
-	std.Panic(args...)
-}
-
-// Fatal logs a message at level Fatal on the standard logger.
-func Fatal(args ...interface{}) {
-	std.Fatal(args...)
-}
-
-// Debugf logs a message at level Debug on the standard logger.
-func Debugf(format string, args ...interface{}) {
-	std.Debugf(format, args...)
-}
-
-// Printf logs a message at level Info on the standard logger.
-func Printf(format string, args ...interface{}) {
-	std.Printf(format, args...)
-}
-
-// Infof logs a message at level Info on the standard logger.
-func Infof(format string, args ...interface{}) {
-	std.Infof(format, args...)
-}
-
-// Warnf logs a message at level Warn on the standard logger.
-func Warnf(format string, args ...interface{}) {
-	std.Warnf(format, args...)
-}
-
-// Warningf logs a message at level Warn on the standard logger.
-func Warningf(format string, args ...interface{}) {
-	std.Warningf(format, args...)
-}
-
-// Errorf logs a message at level Error on the standard logger.
-func Errorf(format string, args ...interface{}) {
-	std.Errorf(format, args...)
-}
-
-// Panicf logs a message at level Panic on the standard logger.
-func Panicf(format string, args ...interface{}) {
-	std.Panicf(format, args...)
-}
-
-// Fatalf logs a message at level Fatal on the standard logger.
-func Fatalf(format string, args ...interface{}) {
-	std.Fatalf(format, args...)
-}
-
-// Debugln logs a message at level Debug on the standard logger.
-func Debugln(args ...interface{}) {
-	std.Debugln(args...)
-}
-
-// Println logs a message at level Info on the standard logger.
-func Println(args ...interface{}) {
-	std.Println(args...)
-}
-
-// Infoln logs a message at level Info on the standard logger.
-func Infoln(args ...interface{}) {
-	std.Infoln(args...)
-}
-
-// Warnln logs a message at level Warn on the standard logger.
-func Warnln(args ...interface{}) {
-	std.Warnln(args...)
-}
-
-// Warningln logs a message at level Warn on the standard logger.
-func Warningln(args ...interface{}) {
-	std.Warningln(args...)
-}
-
-// Errorln logs a message at level Error on the standard logger.
-func Errorln(args ...interface{}) {
-	std.Errorln(args...)
-}
-
-// Panicln logs a message at level Panic on the standard logger.
-func Panicln(args ...interface{}) {
-	std.Panicln(args...)
-}
-
-// Fatalln logs a message at level Fatal on the standard logger.
-func Fatalln(args ...interface{}) {
-	std.Fatalln(args...)
-}
diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/formatter.go b/Godeps/_workspace/src/github.com/Sirupsen/logrus/formatter.go
deleted file mode 100644
index 104d689f1..000000000
--- a/Godeps/_workspace/src/github.com/Sirupsen/logrus/formatter.go
+++ /dev/null
@@ -1,48 +0,0 @@
-package logrus
-
-import "time"
-
-const DefaultTimestampFormat = time.RFC3339
-
-// The Formatter interface is used to implement a custom Formatter. It takes an
-// `Entry`. It exposes all the fields, including the default ones:
-//
-// * `entry.Data["msg"]`. The message passed from Info, Warn, Error ..
-// * `entry.Data["time"]`. The timestamp.
-// * `entry.Data["level"]. The level the entry was logged at.
-//
-// Any additional fields added with `WithField` or `WithFields` are also in
-// `entry.Data`. Format is expected to return an array of bytes which are then
-// logged to `logger.Out`.
-type Formatter interface {
-	Format(*Entry) ([]byte, error)
-}
-
-// This is to not silently overwrite `time`, `msg` and `level` fields when
-// dumping it. If this code wasn't there doing:
-//
-//  logrus.WithField("level", 1).Info("hello")
-//
-// Would just silently drop the user provided level. Instead with this code
-// it'll logged as:
-//
-//  {"level": "info", "fields.level": 1, "msg": "hello", "time": "..."}
-//
-// It's not exported because it's still using Data in an opinionated way. It's to
-// avoid code duplication between the two default formatters.
-func prefixFieldClashes(data Fields) {
-	_, ok := data["time"]
-	if ok {
-		data["fields.time"] = data["time"]
-	}
-
-	_, ok = data["msg"]
-	if ok {
-		data["fields.msg"] = data["msg"]
-	}
-
-	_, ok = data["level"]
-	if ok {
-		data["fields.level"] = data["level"]
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/formatter_bench_test.go b/Godeps/_workspace/src/github.com/Sirupsen/logrus/formatter_bench_test.go
deleted file mode 100644
index c6d290c77..000000000
--- a/Godeps/_workspace/src/github.com/Sirupsen/logrus/formatter_bench_test.go
+++ /dev/null
@@ -1,98 +0,0 @@
-package logrus
-
-import (
-	"fmt"
-	"testing"
-	"time"
-)
-
-// smallFields is a small size data set for benchmarking
-var smallFields = Fields{
-	"foo":   "bar",
-	"baz":   "qux",
-	"one":   "two",
-	"three": "four",
-}
-
-// largeFields is a large size data set for benchmarking
-var largeFields = Fields{
-	"foo":       "bar",
-	"baz":       "qux",
-	"one":       "two",
-	"three":     "four",
-	"five":      "six",
-	"seven":     "eight",
-	"nine":      "ten",
-	"eleven":    "twelve",
-	"thirteen":  "fourteen",
-	"fifteen":   "sixteen",
-	"seventeen": "eighteen",
-	"nineteen":  "twenty",
-	"a":         "b",
-	"c":         "d",
-	"e":         "f",
-	"g":         "h",
-	"i":         "j",
-	"k":         "l",
-	"m":         "n",
-	"o":         "p",
-	"q":         "r",
-	"s":         "t",
-	"u":         "v",
-	"w":         "x",
-	"y":         "z",
-	"this":      "will",
-	"make":      "thirty",
-	"entries":   "yeah",
-}
-
-var errorFields = Fields{
-	"foo": fmt.Errorf("bar"),
-	"baz": fmt.Errorf("qux"),
-}
-
-func BenchmarkErrorTextFormatter(b *testing.B) {
-	doBenchmark(b, &TextFormatter{DisableColors: true}, errorFields)
-}
-
-func BenchmarkSmallTextFormatter(b *testing.B) {
-	doBenchmark(b, &TextFormatter{DisableColors: true}, smallFields)
-}
-
-func BenchmarkLargeTextFormatter(b *testing.B) {
-	doBenchmark(b, &TextFormatter{DisableColors: true}, largeFields)
-}
-
-func BenchmarkSmallColoredTextFormatter(b *testing.B) {
-	doBenchmark(b, &TextFormatter{ForceColors: true}, smallFields)
-}
-
-func BenchmarkLargeColoredTextFormatter(b *testing.B) {
-	doBenchmark(b, &TextFormatter{ForceColors: true}, largeFields)
-}
-
-func BenchmarkSmallJSONFormatter(b *testing.B) {
-	doBenchmark(b, &JSONFormatter{}, smallFields)
-}
-
-func BenchmarkLargeJSONFormatter(b *testing.B) {
-	doBenchmark(b, &JSONFormatter{}, largeFields)
-}
-
-func doBenchmark(b *testing.B, formatter Formatter, fields Fields) {
-	entry := &Entry{
-		Time:    time.Time{},
-		Level:   InfoLevel,
-		Message: "message",
-		Data:    fields,
-	}
-	var d []byte
-	var err error
-	for i := 0; i < b.N; i++ {
-		d, err = formatter.Format(entry)
-		if err != nil {
-			b.Fatal(err)
-		}
-		b.SetBytes(int64(len(d)))
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/formatters/logstash/logstash.go b/Godeps/_workspace/src/github.com/Sirupsen/logrus/formatters/logstash/logstash.go
deleted file mode 100644
index 8ea93ddf2..000000000
--- a/Godeps/_workspace/src/github.com/Sirupsen/logrus/formatters/logstash/logstash.go
+++ /dev/null
@@ -1,56 +0,0 @@
-package logstash
-
-import (
-	"encoding/json"
-	"fmt"
-
-	"github.com/Sirupsen/logrus"
-)
-
-// Formatter generates json in logstash format.
-// Logstash site: http://logstash.net/
-type LogstashFormatter struct {
-	Type string // if not empty use for logstash type field.
-
-	// TimestampFormat sets the format used for timestamps.
-	TimestampFormat string
-}
-
-func (f *LogstashFormatter) Format(entry *logrus.Entry) ([]byte, error) {
-	entry.Data["@version"] = 1
-
-	if f.TimestampFormat == "" {
-		f.TimestampFormat = logrus.DefaultTimestampFormat
-	}
-
-	entry.Data["@timestamp"] = entry.Time.Format(f.TimestampFormat)
-
-	// set message field
-	v, ok := entry.Data["message"]
-	if ok {
-		entry.Data["fields.message"] = v
-	}
-	entry.Data["message"] = entry.Message
-
-	// set level field
-	v, ok = entry.Data["level"]
-	if ok {
-		entry.Data["fields.level"] = v
-	}
-	entry.Data["level"] = entry.Level.String()
-
-	// set type field
-	if f.Type != "" {
-		v, ok = entry.Data["type"]
-		if ok {
-			entry.Data["fields.type"] = v
-		}
-		entry.Data["type"] = f.Type
-	}
-
-	serialized, err := json.Marshal(entry.Data)
-	if err != nil {
-		return nil, fmt.Errorf("Failed to marshal fields to JSON, %v", err)
-	}
-	return append(serialized, '\n'), nil
-}
diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/formatters/logstash/logstash_test.go b/Godeps/_workspace/src/github.com/Sirupsen/logrus/formatters/logstash/logstash_test.go
deleted file mode 100644
index d8814a0ea..000000000
--- a/Godeps/_workspace/src/github.com/Sirupsen/logrus/formatters/logstash/logstash_test.go
+++ /dev/null
@@ -1,52 +0,0 @@
-package logstash
-
-import (
-	"bytes"
-	"encoding/json"
-	"github.com/Sirupsen/logrus"
-	"github.com/stretchr/testify/assert"
-	"testing"
-)
-
-func TestLogstashFormatter(t *testing.T) {
-	assert := assert.New(t)
-
-	lf := LogstashFormatter{Type: "abc"}
-
-	fields := logrus.Fields{
-		"message": "def",
-		"level":   "ijk",
-		"type":    "lmn",
-		"one":     1,
-		"pi":      3.14,
-		"bool":    true,
-	}
-
-	entry := logrus.WithFields(fields)
-	entry.Message = "msg"
-	entry.Level = logrus.InfoLevel
-
-	b, _ := lf.Format(entry)
-
-	var data map[string]interface{}
-	dec := json.NewDecoder(bytes.NewReader(b))
-	dec.UseNumber()
-	dec.Decode(&data)
-
-	// base fields
-	assert.Equal(json.Number("1"), data["@version"])
-	assert.NotEmpty(data["@timestamp"])
-	assert.Equal("abc", data["type"])
-	assert.Equal("msg", data["message"])
-	assert.Equal("info", data["level"])
-
-	// substituted fields
-	assert.Equal("def", data["fields.message"])
-	assert.Equal("ijk", data["fields.level"])
-	assert.Equal("lmn", data["fields.type"])
-
-	// formats
-	assert.Equal(json.Number("1"), data["one"])
-	assert.Equal(json.Number("3.14"), data["pi"])
-	assert.Equal(true, data["bool"])
-}
diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/hook_test.go b/Godeps/_workspace/src/github.com/Sirupsen/logrus/hook_test.go
deleted file mode 100644
index 13f34cb6f..000000000
--- a/Godeps/_workspace/src/github.com/Sirupsen/logrus/hook_test.go
+++ /dev/null
@@ -1,122 +0,0 @@
-package logrus
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-)
-
-type TestHook struct {
-	Fired bool
-}
-
-func (hook *TestHook) Fire(entry *Entry) error {
-	hook.Fired = true
-	return nil
-}
-
-func (hook *TestHook) Levels() []Level {
-	return []Level{
-		DebugLevel,
-		InfoLevel,
-		WarnLevel,
-		ErrorLevel,
-		FatalLevel,
-		PanicLevel,
-	}
-}
-
-func TestHookFires(t *testing.T) {
-	hook := new(TestHook)
-
-	LogAndAssertJSON(t, func(log *Logger) {
-		log.Hooks.Add(hook)
-		assert.Equal(t, hook.Fired, false)
-
-		log.Print("test")
-	}, func(fields Fields) {
-		assert.Equal(t, hook.Fired, true)
-	})
-}
-
-type ModifyHook struct {
-}
-
-func (hook *ModifyHook) Fire(entry *Entry) error {
-	entry.Data["wow"] = "whale"
-	return nil
-}
-
-func (hook *ModifyHook) Levels() []Level {
-	return []Level{
-		DebugLevel,
-		InfoLevel,
-		WarnLevel,
-		ErrorLevel,
-		FatalLevel,
-		PanicLevel,
-	}
-}
-
-func TestHookCanModifyEntry(t *testing.T) {
-	hook := new(ModifyHook)
-
-	LogAndAssertJSON(t, func(log *Logger) {
-		log.Hooks.Add(hook)
-		log.WithField("wow", "elephant").Print("test")
-	}, func(fields Fields) {
-		assert.Equal(t, fields["wow"], "whale")
-	})
-}
-
-func TestCanFireMultipleHooks(t *testing.T) {
-	hook1 := new(ModifyHook)
-	hook2 := new(TestHook)
-
-	LogAndAssertJSON(t, func(log *Logger) {
-		log.Hooks.Add(hook1)
-		log.Hooks.Add(hook2)
-
-		log.WithField("wow", "elephant").Print("test")
-	}, func(fields Fields) {
-		assert.Equal(t, fields["wow"], "whale")
-		assert.Equal(t, hook2.Fired, true)
-	})
-}
-
-type ErrorHook struct {
-	Fired bool
-}
-
-func (hook *ErrorHook) Fire(entry *Entry) error {
-	hook.Fired = true
-	return nil
-}
-
-func (hook *ErrorHook) Levels() []Level {
-	return []Level{
-		ErrorLevel,
-	}
-}
-
-func TestErrorHookShouldntFireOnInfo(t *testing.T) {
-	hook := new(ErrorHook)
-
-	LogAndAssertJSON(t, func(log *Logger) {
-		log.Hooks.Add(hook)
-		log.Info("test")
-	}, func(fields Fields) {
-		assert.Equal(t, hook.Fired, false)
-	})
-}
-
-func TestErrorHookShouldFireOnError(t *testing.T) {
-	hook := new(ErrorHook)
-
-	LogAndAssertJSON(t, func(log *Logger) {
-		log.Hooks.Add(hook)
-		log.Error("test")
-	}, func(fields Fields) {
-		assert.Equal(t, hook.Fired, true)
-	})
-}
diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks.go b/Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks.go
deleted file mode 100644
index 3f151cdc3..000000000
--- a/Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks.go
+++ /dev/null
@@ -1,34 +0,0 @@
-package logrus
-
-// A hook to be fired when logging on the logging levels returned from
-// `Levels()` on your implementation of the interface. Note that this is not
-// fired in a goroutine or a channel with workers, you should handle such
-// functionality yourself if your call is non-blocking and you don't wish for
-// the logging calls for levels returned from `Levels()` to block.
-type Hook interface {
-	Levels() []Level
-	Fire(*Entry) error
-}
-
-// Internal type for storing the hooks on a logger instance.
-type LevelHooks map[Level][]Hook
-
-// Add a hook to an instance of logger. This is called with
-// `log.Hooks.Add(new(MyHook))` where `MyHook` implements the `Hook` interface.
-func (hooks LevelHooks) Add(hook Hook) {
-	for _, level := range hook.Levels() {
-		hooks[level] = append(hooks[level], hook)
-	}
-}
-
-// Fire all the hooks for the passed level. Used by `entry.log` to fire
-// appropriate hooks for a log entry.
-func (hooks LevelHooks) Fire(level Level, entry *Entry) error {
-	for _, hook := range hooks[level] {
-		if err := hook.Fire(entry); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/airbrake/airbrake.go b/Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/airbrake/airbrake.go
deleted file mode 100644
index b0502c335..000000000
--- a/Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/airbrake/airbrake.go
+++ /dev/null
@@ -1,54 +0,0 @@
-package airbrake
-
-import (
-	"errors"
-	"fmt"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/tobi/airbrake-go"
-)
-
-// AirbrakeHook to send exceptions to an exception-tracking service compatible
-// with the Airbrake API.
-type airbrakeHook struct {
-	APIKey      string
-	Endpoint    string
-	Environment string
-}
-
-func NewHook(endpoint, apiKey, env string) *airbrakeHook {
-	return &airbrakeHook{
-		APIKey:      apiKey,
-		Endpoint:    endpoint,
-		Environment: env,
-	}
-}
-
-func (hook *airbrakeHook) Fire(entry *logrus.Entry) error {
-	airbrake.ApiKey = hook.APIKey
-	airbrake.Endpoint = hook.Endpoint
-	airbrake.Environment = hook.Environment
-
-	var notifyErr error
-	err, ok := entry.Data["error"].(error)
-	if ok {
-		notifyErr = err
-	} else {
-		notifyErr = errors.New(entry.Message)
-	}
-
-	airErr := airbrake.Notify(notifyErr)
-	if airErr != nil {
-		return fmt.Errorf("Failed to send error to Airbrake: %s", airErr)
-	}
-
-	return nil
-}
-
-func (hook *airbrakeHook) Levels() []logrus.Level {
-	return []logrus.Level{
-		logrus.ErrorLevel,
-		logrus.FatalLevel,
-		logrus.PanicLevel,
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/airbrake/airbrake_test.go b/Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/airbrake/airbrake_test.go
deleted file mode 100644
index 058a91e34..000000000
--- a/Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/airbrake/airbrake_test.go
+++ /dev/null
@@ -1,133 +0,0 @@
-package airbrake
-
-import (
-	"encoding/xml"
-	"net/http"
-	"net/http/httptest"
-	"testing"
-	"time"
-
-	"github.com/Sirupsen/logrus"
-)
-
-type notice struct {
-	Error NoticeError `xml:"error"`
-}
-type NoticeError struct {
-	Class   string `xml:"class"`
-	Message string `xml:"message"`
-}
-
-type customErr struct {
-	msg string
-}
-
-func (e *customErr) Error() string {
-	return e.msg
-}
-
-const (
-	testAPIKey    = "abcxyz"
-	testEnv       = "development"
-	expectedClass = "*airbrake.customErr"
-	expectedMsg   = "foo"
-	unintendedMsg = "Airbrake will not see this string"
-)
-
-var (
-	noticeError = make(chan NoticeError, 1)
-)
-
-// TestLogEntryMessageReceived checks if invoking Logrus' log.Error
-// method causes an XML payload containing the log entry message is received
-// by a HTTP server emulating an Airbrake-compatible endpoint.
-func TestLogEntryMessageReceived(t *testing.T) {
-	log := logrus.New()
-	ts := startAirbrakeServer(t)
-	defer ts.Close()
-
-	hook := NewHook(ts.URL, testAPIKey, "production")
-	log.Hooks.Add(hook)
-
-	log.Error(expectedMsg)
-
-	select {
-	case received := <-noticeError:
-		if received.Message != expectedMsg {
-			t.Errorf("Unexpected message received: %s", received.Message)
-		}
-	case <-time.After(time.Second):
-		t.Error("Timed out; no notice received by Airbrake API")
-	}
-}
-
-// TestLogEntryMessageReceived confirms that, when passing an error type using
-// logrus.Fields, a HTTP server emulating an Airbrake endpoint receives the
-// error message returned by the Error() method on the error interface
-// rather than the logrus.Entry.Message string.
-func TestLogEntryWithErrorReceived(t *testing.T) {
-	log := logrus.New()
-	ts := startAirbrakeServer(t)
-	defer ts.Close()
-
-	hook := NewHook(ts.URL, testAPIKey, "production")
-	log.Hooks.Add(hook)
-
-	log.WithFields(logrus.Fields{
-		"error": &customErr{expectedMsg},
-	}).Error(unintendedMsg)
-
-	select {
-	case received := <-noticeError:
-		if received.Message != expectedMsg {
-			t.Errorf("Unexpected message received: %s", received.Message)
-		}
-		if received.Class != expectedClass {
-			t.Errorf("Unexpected error class: %s", received.Class)
-		}
-	case <-time.After(time.Second):
-		t.Error("Timed out; no notice received by Airbrake API")
-	}
-}
-
-// TestLogEntryWithNonErrorTypeNotReceived confirms that, when passing a
-// non-error type using logrus.Fields, a HTTP server emulating an Airbrake
-// endpoint receives the logrus.Entry.Message string.
-//
-// Only error types are supported when setting the 'error' field using
-// logrus.WithFields().
-func TestLogEntryWithNonErrorTypeNotReceived(t *testing.T) {
-	log := logrus.New()
-	ts := startAirbrakeServer(t)
-	defer ts.Close()
-
-	hook := NewHook(ts.URL, testAPIKey, "production")
-	log.Hooks.Add(hook)
-
-	log.WithFields(logrus.Fields{
-		"error": expectedMsg,
-	}).Error(unintendedMsg)
-
-	select {
-	case received := <-noticeError:
-		if received.Message != unintendedMsg {
-			t.Errorf("Unexpected message received: %s", received.Message)
-		}
-	case <-time.After(time.Second):
-		t.Error("Timed out; no notice received by Airbrake API")
-	}
-}
-
-func startAirbrakeServer(t *testing.T) *httptest.Server {
-	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		var notice notice
-		if err := xml.NewDecoder(r.Body).Decode(&notice); err != nil {
-			t.Error(err)
-		}
-		r.Body.Close()
-
-		noticeError <- notice.Error
-	}))
-
-	return ts
-}
diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/bugsnag/bugsnag.go b/Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/bugsnag/bugsnag.go
deleted file mode 100644
index d20a0f54a..000000000
--- a/Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/bugsnag/bugsnag.go
+++ /dev/null
@@ -1,68 +0,0 @@
-package logrus_bugsnag
-
-import (
-	"errors"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/bugsnag/bugsnag-go"
-)
-
-type bugsnagHook struct{}
-
-// ErrBugsnagUnconfigured is returned if NewBugsnagHook is called before
-// bugsnag.Configure. Bugsnag must be configured before the hook.
-var ErrBugsnagUnconfigured = errors.New("bugsnag must be configured before installing this logrus hook")
-
-// ErrBugsnagSendFailed indicates that the hook failed to submit an error to
-// bugsnag. The error was successfully generated, but `bugsnag.Notify()`
-// failed.
-type ErrBugsnagSendFailed struct {
-	err error
-}
-
-func (e ErrBugsnagSendFailed) Error() string {
-	return "failed to send error to Bugsnag: " + e.err.Error()
-}
-
-// NewBugsnagHook initializes a logrus hook which sends exceptions to an
-// exception-tracking service compatible with the Bugsnag API. Before using
-// this hook, you must call bugsnag.Configure(). The returned object should be
-// registered with a log via `AddHook()`
-//
-// Entries that trigger an Error, Fatal or Panic should now include an "error"
-// field to send to Bugsnag.
-func NewBugsnagHook() (*bugsnagHook, error) {
-	if bugsnag.Config.APIKey == "" {
-		return nil, ErrBugsnagUnconfigured
-	}
-	return &bugsnagHook{}, nil
-}
-
-// Fire forwards an error to Bugsnag. Given a logrus.Entry, it extracts the
-// "error" field (or the Message if the error isn't present) and sends it off.
-func (hook *bugsnagHook) Fire(entry *logrus.Entry) error {
-	var notifyErr error
-	err, ok := entry.Data["error"].(error)
-	if ok {
-		notifyErr = err
-	} else {
-		notifyErr = errors.New(entry.Message)
-	}
-
-	bugsnagErr := bugsnag.Notify(notifyErr)
-	if bugsnagErr != nil {
-		return ErrBugsnagSendFailed{bugsnagErr}
-	}
-
-	return nil
-}
-
-// Levels enumerates the log levels on which the error should be forwarded to
-// bugsnag: everything at or above the "Error" level.
-func (hook *bugsnagHook) Levels() []logrus.Level {
-	return []logrus.Level{
-		logrus.ErrorLevel,
-		logrus.FatalLevel,
-		logrus.PanicLevel,
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/bugsnag/bugsnag_test.go b/Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/bugsnag/bugsnag_test.go
deleted file mode 100644
index e9ea298d8..000000000
--- a/Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/bugsnag/bugsnag_test.go
+++ /dev/null
@@ -1,64 +0,0 @@
-package logrus_bugsnag
-
-import (
-	"encoding/json"
-	"errors"
-	"io/ioutil"
-	"net/http"
-	"net/http/httptest"
-	"testing"
-	"time"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/bugsnag/bugsnag-go"
-)
-
-type notice struct {
-	Events []struct {
-		Exceptions []struct {
-			Message string `json:"message"`
-		} `json:"exceptions"`
-	} `json:"events"`
-}
-
-func TestNoticeReceived(t *testing.T) {
-	msg := make(chan string, 1)
-	expectedMsg := "foo"
-
-	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		var notice notice
-		data, _ := ioutil.ReadAll(r.Body)
-		if err := json.Unmarshal(data, &notice); err != nil {
-			t.Error(err)
-		}
-		_ = r.Body.Close()
-
-		msg <- notice.Events[0].Exceptions[0].Message
-	}))
-	defer ts.Close()
-
-	hook := &bugsnagHook{}
-
-	bugsnag.Configure(bugsnag.Configuration{
-		Endpoint:     ts.URL,
-		ReleaseStage: "production",
-		APIKey:       "12345678901234567890123456789012",
-		Synchronous:  true,
-	})
-
-	log := logrus.New()
-	log.Hooks.Add(hook)
-
-	log.WithFields(logrus.Fields{
-		"error": errors.New(expectedMsg),
-	}).Error("Bugsnag will not see this string")
-
-	select {
-	case received := <-msg:
-		if received != expectedMsg {
-			t.Errorf("Unexpected message received: %s", received)
-		}
-	case <-time.After(time.Second):
-		t.Error("Timed out; no notice received by Bugsnag API")
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/papertrail/README.md b/Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/papertrail/README.md
deleted file mode 100644
index ae61e9229..000000000
--- a/Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/papertrail/README.md
+++ /dev/null
@@ -1,28 +0,0 @@
-# Papertrail Hook for Logrus <img src="http://i.imgur.com/hTeVwmJ.png" width="40" height="40" alt=":walrus:" class="emoji" title=":walrus:" />
-
-[Papertrail](https://papertrailapp.com) provides hosted log management. Once stored in Papertrail, you can [group](http://help.papertrailapp.com/kb/how-it-works/groups/) your logs on various dimensions, [search](http://help.papertrailapp.com/kb/how-it-works/search-syntax) them, and trigger [alerts](http://help.papertrailapp.com/kb/how-it-works/alerts).
-
-In most deployments, you'll want to send logs to Papertrail via their [remote_syslog](http://help.papertrailapp.com/kb/configuration/configuring-centralized-logging-from-text-log-files-in-unix/) daemon, which requires no application-specific configuration. This hook is intended for relatively low-volume logging, likely in managed cloud hosting deployments where installing `remote_syslog` is not possible.
-
-## Usage
-
-You can find your Papertrail UDP port on your [Papertrail account page](https://papertrailapp.com/account/destinations). Substitute it below for `YOUR_PAPERTRAIL_UDP_PORT`.
-
-For `YOUR_APP_NAME`, substitute a short string that will readily identify your application or service in the logs.
-
-```go
-import (
-  "log/syslog"
-  "github.com/Sirupsen/logrus"
-  "github.com/Sirupsen/logrus/hooks/papertrail"
-)
-
-func main() {
-  log       := logrus.New()
-  hook, err := logrus_papertrail.NewPapertrailHook("logs.papertrailapp.com", YOUR_PAPERTRAIL_UDP_PORT, YOUR_APP_NAME)
-
-  if err == nil {
-    log.Hooks.Add(hook)
-  }
-}
-```
diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/papertrail/papertrail.go b/Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/papertrail/papertrail.go
deleted file mode 100644
index c0f10c1bd..000000000
--- a/Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/papertrail/papertrail.go
+++ /dev/null
@@ -1,55 +0,0 @@
-package logrus_papertrail
-
-import (
-	"fmt"
-	"net"
-	"os"
-	"time"
-
-	"github.com/Sirupsen/logrus"
-)
-
-const (
-	format = "Jan 2 15:04:05"
-)
-
-// PapertrailHook to send logs to a logging service compatible with the Papertrail API.
-type PapertrailHook struct {
-	Host    string
-	Port    int
-	AppName string
-	UDPConn net.Conn
-}
-
-// NewPapertrailHook creates a hook to be added to an instance of logger.
-func NewPapertrailHook(host string, port int, appName string) (*PapertrailHook, error) {
-	conn, err := net.Dial("udp", fmt.Sprintf("%s:%d", host, port))
-	return &PapertrailHook{host, port, appName, conn}, err
-}
-
-// Fire is called when a log event is fired.
-func (hook *PapertrailHook) Fire(entry *logrus.Entry) error {
-	date := time.Now().Format(format)
-	msg, _ := entry.String()
-	payload := fmt.Sprintf("<22> %s %s: %s", date, hook.AppName, msg)
-
-	bytesWritten, err := hook.UDPConn.Write([]byte(payload))
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "Unable to send log line to Papertrail via UDP. Wrote %d bytes before error: %v", bytesWritten, err)
-		return err
-	}
-
-	return nil
-}
-
-// Levels returns the available logging levels.
-func (hook *PapertrailHook) Levels() []logrus.Level {
-	return []logrus.Level{
-		logrus.PanicLevel,
-		logrus.FatalLevel,
-		logrus.ErrorLevel,
-		logrus.WarnLevel,
-		logrus.InfoLevel,
-		logrus.DebugLevel,
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/papertrail/papertrail_test.go b/Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/papertrail/papertrail_test.go
deleted file mode 100644
index 96318d003..000000000
--- a/Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/papertrail/papertrail_test.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package logrus_papertrail
-
-import (
-	"fmt"
-	"testing"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/stvp/go-udp-testing"
-)
-
-func TestWritingToUDP(t *testing.T) {
-	port := 16661
-	udp.SetAddr(fmt.Sprintf(":%d", port))
-
-	hook, err := NewPapertrailHook("localhost", port, "test")
-	if err != nil {
-		t.Errorf("Unable to connect to local UDP server.")
-	}
-
-	log := logrus.New()
-	log.Hooks.Add(hook)
-
-	udp.ShouldReceive(t, "foo", func() {
-		log.Info("foo")
-	})
-}
diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/sentry/README.md b/Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/sentry/README.md
deleted file mode 100644
index 31de6540a..000000000
--- a/Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/sentry/README.md
+++ /dev/null
@@ -1,111 +0,0 @@
-# Sentry Hook for Logrus <img src="http://i.imgur.com/hTeVwmJ.png" width="40" height="40" alt=":walrus:" class="emoji" title=":walrus:" />
-
-[Sentry](https://getsentry.com) provides both self-hosted and hosted
-solutions for exception tracking.
-Both client and server are
-[open source](https://github.com/getsentry/sentry).
-
-## Usage
-
-Every sentry application defined on the server gets a different
-[DSN](https://www.getsentry.com/docs/). In the example below replace
-`YOUR_DSN` with the one created for your application.
-
-```go
-import (
-  "github.com/Sirupsen/logrus"
-  "github.com/Sirupsen/logrus/hooks/sentry"
-)
-
-func main() {
-  log       := logrus.New()
-  hook, err := logrus_sentry.NewSentryHook(YOUR_DSN, []logrus.Level{
-    logrus.PanicLevel,
-    logrus.FatalLevel,
-    logrus.ErrorLevel,
-  })
-
-  if err == nil {
-    log.Hooks.Add(hook)
-  }
-}
-```
-
-If you wish to initialize a SentryHook with tags, you can use the `NewWithTagsSentryHook` constructor to provide default tags:
-
-```go
-tags := map[string]string{
-  "site": "example.com",
-}
-levels := []logrus.Level{
-  logrus.PanicLevel,
-  logrus.FatalLevel,
-  logrus.ErrorLevel,
-}
-hook, err := logrus_sentry.NewWithTagsSentryHook(YOUR_DSN, tags, levels)
-
-```
-
-If you wish to initialize a SentryHook with an already initialized raven client, you can use 
-the `NewWithClientSentryHook` constructor:
-
-```go
-import (
-  "github.com/Sirupsen/logrus"
-  "github.com/Sirupsen/logrus/hooks/sentry"
-  "github.com/getsentry/raven-go"
-)
-
-func main() {
-  log := logrus.New()
-
-  client, err := raven.New(YOUR_DSN)
-  if err != nil {
-      log.Fatal(err)
-  }
-
-  hook, err := logrus_sentry.NewWithClientSentryHook(client, []logrus.Level{
-    logrus.PanicLevel,
-    logrus.FatalLevel,
-    logrus.ErrorLevel,
-  })
-
-  if err == nil {
-    log.Hooks.Add(hook)
-  }
-}
-
-hook, err := NewWithClientSentryHook(client, []logrus.Level{
-	logrus.ErrorLevel,
-})
-```
-
-## Special fields
-
-Some logrus fields have a special meaning in this hook,
-these are `server_name`, `logger` and `http_request`.
-When logs are sent to sentry these fields are treated differently.
-- `server_name` (also known as hostname) is the name of the server which
-is logging the event (hostname.example.com)
-- `logger` is the part of the application which is logging the event.
-In go this usually means setting it to the name of the package.
-- `http_request` is the in-coming request(*http.Request). The detailed request data are sent to Sentry.
-
-## Timeout
-
-`Timeout` is the time the sentry hook will wait for a response
-from the sentry server.
-
-If this time elapses with no response from
-the server an error will be returned.
-
-If `Timeout` is set to 0 the SentryHook will not wait for a reply
-and will assume a correct delivery.
-
-The SentryHook has a default timeout of `100 milliseconds` when created
-with a call to `NewSentryHook`. This can be changed by assigning a value to the `Timeout` field:
-
-```go
-hook, _ := logrus_sentry.NewSentryHook(...)
-hook.Timeout = 20*time.Second
-```
diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/sentry/sentry.go b/Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/sentry/sentry.go
deleted file mode 100644
index cf88098a8..000000000
--- a/Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/sentry/sentry.go
+++ /dev/null
@@ -1,137 +0,0 @@
-package logrus_sentry
-
-import (
-	"fmt"
-	"net/http"
-	"time"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/getsentry/raven-go"
-)
-
-var (
-	severityMap = map[logrus.Level]raven.Severity{
-		logrus.DebugLevel: raven.DEBUG,
-		logrus.InfoLevel:  raven.INFO,
-		logrus.WarnLevel:  raven.WARNING,
-		logrus.ErrorLevel: raven.ERROR,
-		logrus.FatalLevel: raven.FATAL,
-		logrus.PanicLevel: raven.FATAL,
-	}
-)
-
-func getAndDel(d logrus.Fields, key string) (string, bool) {
-	var (
-		ok  bool
-		v   interface{}
-		val string
-	)
-	if v, ok = d[key]; !ok {
-		return "", false
-	}
-
-	if val, ok = v.(string); !ok {
-		return "", false
-	}
-	delete(d, key)
-	return val, true
-}
-
-func getAndDelRequest(d logrus.Fields, key string) (*http.Request, bool) {
-	var (
-		ok  bool
-		v   interface{}
-		req *http.Request
-	)
-	if v, ok = d[key]; !ok {
-		return nil, false
-	}
-	if req, ok = v.(*http.Request); !ok || req == nil {
-		return nil, false
-	}
-	delete(d, key)
-	return req, true
-}
-
-// SentryHook delivers logs to a sentry server.
-type SentryHook struct {
-	// Timeout sets the time to wait for a delivery error from the sentry server.
-	// If this is set to zero the server will not wait for any response and will
-	// consider the message correctly sent
-	Timeout time.Duration
-
-	client *raven.Client
-	levels []logrus.Level
-}
-
-// NewSentryHook creates a hook to be added to an instance of logger
-// and initializes the raven client.
-// This method sets the timeout to 100 milliseconds.
-func NewSentryHook(DSN string, levels []logrus.Level) (*SentryHook, error) {
-	client, err := raven.New(DSN)
-	if err != nil {
-		return nil, err
-	}
-	return &SentryHook{100 * time.Millisecond, client, levels}, nil
-}
-
-// NewWithTagsSentryHook creates a hook with tags to be added to an instance
-// of logger and initializes the raven client. This method sets the timeout to
-// 100 milliseconds.
-func NewWithTagsSentryHook(DSN string, tags map[string]string, levels []logrus.Level) (*SentryHook, error) {
-	client, err := raven.NewWithTags(DSN, tags)
-	if err != nil {
-		return nil, err
-	}
-	return &SentryHook{100 * time.Millisecond, client, levels}, nil
-}
-
-// NewWithClientSentryHook creates a hook using an initialized raven client.
-// This method sets the timeout to 100 milliseconds.
-func NewWithClientSentryHook(client *raven.Client, levels []logrus.Level) (*SentryHook, error) {
-	return &SentryHook{100 * time.Millisecond, client, levels}, nil
-}
-
-// Called when an event should be sent to sentry
-// Special fields that sentry uses to give more information to the server
-// are extracted from entry.Data (if they are found)
-// These fields are: logger, server_name and http_request
-func (hook *SentryHook) Fire(entry *logrus.Entry) error {
-	packet := &raven.Packet{
-		Message:   entry.Message,
-		Timestamp: raven.Timestamp(entry.Time),
-		Level:     severityMap[entry.Level],
-		Platform:  "go",
-	}
-
-	d := entry.Data
-
-	if logger, ok := getAndDel(d, "logger"); ok {
-		packet.Logger = logger
-	}
-	if serverName, ok := getAndDel(d, "server_name"); ok {
-		packet.ServerName = serverName
-	}
-	if req, ok := getAndDelRequest(d, "http_request"); ok {
-		packet.Interfaces = append(packet.Interfaces, raven.NewHttp(req))
-	}
-	packet.Extra = map[string]interface{}(d)
-
-	_, errCh := hook.client.Capture(packet, nil)
-	timeout := hook.Timeout
-	if timeout != 0 {
-		timeoutCh := time.After(timeout)
-		select {
-		case err := <-errCh:
-			return err
-		case <-timeoutCh:
-			return fmt.Errorf("no response from sentry server in %s", timeout)
-		}
-	}
-	return nil
-}
-
-// Levels returns the available logging levels.
-func (hook *SentryHook) Levels() []logrus.Level {
-	return hook.levels
-}
diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/sentry/sentry_test.go b/Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/sentry/sentry_test.go
deleted file mode 100644
index 4a97bc63e..000000000
--- a/Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/sentry/sentry_test.go
+++ /dev/null
@@ -1,154 +0,0 @@
-package logrus_sentry
-
-import (
-	"encoding/json"
-	"fmt"
-	"io/ioutil"
-	"net/http"
-	"net/http/httptest"
-	"reflect"
-	"strings"
-	"testing"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/getsentry/raven-go"
-)
-
-const (
-	message     = "error message"
-	server_name = "testserver.internal"
-	logger_name = "test.logger"
-)
-
-func getTestLogger() *logrus.Logger {
-	l := logrus.New()
-	l.Out = ioutil.Discard
-	return l
-}
-
-func WithTestDSN(t *testing.T, tf func(string, <-chan *raven.Packet)) {
-	pch := make(chan *raven.Packet, 1)
-	s := httptest.NewServer(http.HandlerFunc(func(rw http.ResponseWriter, req *http.Request) {
-		defer req.Body.Close()
-		d := json.NewDecoder(req.Body)
-		p := &raven.Packet{}
-		err := d.Decode(p)
-		if err != nil {
-			t.Fatal(err.Error())
-		}
-
-		pch <- p
-	}))
-	defer s.Close()
-
-	fragments := strings.SplitN(s.URL, "://", 2)
-	dsn := fmt.Sprintf(
-		"%s://public:secret@%s/sentry/project-id",
-		fragments[0],
-		fragments[1],
-	)
-	tf(dsn, pch)
-}
-
-func TestSpecialFields(t *testing.T) {
-	WithTestDSN(t, func(dsn string, pch <-chan *raven.Packet) {
-		logger := getTestLogger()
-
-		hook, err := NewSentryHook(dsn, []logrus.Level{
-			logrus.ErrorLevel,
-		})
-
-		if err != nil {
-			t.Fatal(err.Error())
-		}
-		logger.Hooks.Add(hook)
-
-		req, _ := http.NewRequest("GET", "url", nil)
-		logger.WithFields(logrus.Fields{
-			"server_name":  server_name,
-			"logger":       logger_name,
-			"http_request": req,
-		}).Error(message)
-
-		packet := <-pch
-		if packet.Logger != logger_name {
-			t.Errorf("logger should have been %s, was %s", logger_name, packet.Logger)
-		}
-
-		if packet.ServerName != server_name {
-			t.Errorf("server_name should have been %s, was %s", server_name, packet.ServerName)
-		}
-	})
-}
-
-func TestSentryHandler(t *testing.T) {
-	WithTestDSN(t, func(dsn string, pch <-chan *raven.Packet) {
-		logger := getTestLogger()
-		hook, err := NewSentryHook(dsn, []logrus.Level{
-			logrus.ErrorLevel,
-		})
-		if err != nil {
-			t.Fatal(err.Error())
-		}
-		logger.Hooks.Add(hook)
-
-		logger.Error(message)
-		packet := <-pch
-		if packet.Message != message {
-			t.Errorf("message should have been %s, was %s", message, packet.Message)
-		}
-	})
-}
-
-func TestSentryWithClient(t *testing.T) {
-	WithTestDSN(t, func(dsn string, pch <-chan *raven.Packet) {
-		logger := getTestLogger()
-
-		client, _ := raven.New(dsn)
-
-		hook, err := NewWithClientSentryHook(client, []logrus.Level{
-			logrus.ErrorLevel,
-		})
-		if err != nil {
-			t.Fatal(err.Error())
-		}
-		logger.Hooks.Add(hook)
-
-		logger.Error(message)
-		packet := <-pch
-		if packet.Message != message {
-			t.Errorf("message should have been %s, was %s", message, packet.Message)
-		}
-	})
-}
-
-func TestSentryTags(t *testing.T) {
-	WithTestDSN(t, func(dsn string, pch <-chan *raven.Packet) {
-		logger := getTestLogger()
-		tags := map[string]string{
-			"site": "test",
-		}
-		levels := []logrus.Level{
-			logrus.ErrorLevel,
-		}
-
-		hook, err := NewWithTagsSentryHook(dsn, tags, levels)
-		if err != nil {
-			t.Fatal(err.Error())
-		}
-
-		logger.Hooks.Add(hook)
-
-		logger.Error(message)
-		packet := <-pch
-		expected := raven.Tags{
-			raven.Tag{
-				Key:   "site",
-				Value: "test",
-			},
-		}
-		if !reflect.DeepEqual(packet.Tags, expected) {
-			t.Errorf("message should have been %s, was %s", message, packet.Message)
-		}
-	})
-}
diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/syslog/README.md b/Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/syslog/README.md
deleted file mode 100644
index 4dbb8e729..000000000
--- a/Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/syslog/README.md
+++ /dev/null
@@ -1,20 +0,0 @@
-# Syslog Hooks for Logrus <img src="http://i.imgur.com/hTeVwmJ.png" width="40" height="40" alt=":walrus:" class="emoji" title=":walrus:"/>
-
-## Usage
-
-```go
-import (
-  "log/syslog"
-  "github.com/Sirupsen/logrus"
-  logrus_syslog "github.com/Sirupsen/logrus/hooks/syslog"
-)
-
-func main() {
-  log       := logrus.New()
-  hook, err := logrus_syslog.NewSyslogHook("udp", "localhost:514", syslog.LOG_INFO, "")
-
-  if err == nil {
-    log.Hooks.Add(hook)
-  }
-}
-```
diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/syslog/syslog.go b/Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/syslog/syslog.go
deleted file mode 100644
index b6fa37462..000000000
--- a/Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/syslog/syslog.go
+++ /dev/null
@@ -1,59 +0,0 @@
-package logrus_syslog
-
-import (
-	"fmt"
-	"github.com/Sirupsen/logrus"
-	"log/syslog"
-	"os"
-)
-
-// SyslogHook to send logs via syslog.
-type SyslogHook struct {
-	Writer        *syslog.Writer
-	SyslogNetwork string
-	SyslogRaddr   string
-}
-
-// Creates a hook to be added to an instance of logger. This is called with
-// `hook, err := NewSyslogHook("udp", "localhost:514", syslog.LOG_DEBUG, "")`
-// `if err == nil { log.Hooks.Add(hook) }`
-func NewSyslogHook(network, raddr string, priority syslog.Priority, tag string) (*SyslogHook, error) {
-	w, err := syslog.Dial(network, raddr, priority, tag)
-	return &SyslogHook{w, network, raddr}, err
-}
-
-func (hook *SyslogHook) Fire(entry *logrus.Entry) error {
-	line, err := entry.String()
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "Unable to read entry, %v", err)
-		return err
-	}
-
-	switch entry.Level {
-	case logrus.PanicLevel:
-		return hook.Writer.Crit(line)
-	case logrus.FatalLevel:
-		return hook.Writer.Crit(line)
-	case logrus.ErrorLevel:
-		return hook.Writer.Err(line)
-	case logrus.WarnLevel:
-		return hook.Writer.Warning(line)
-	case logrus.InfoLevel:
-		return hook.Writer.Info(line)
-	case logrus.DebugLevel:
-		return hook.Writer.Debug(line)
-	default:
-		return nil
-	}
-}
-
-func (hook *SyslogHook) Levels() []logrus.Level {
-	return []logrus.Level{
-		logrus.PanicLevel,
-		logrus.FatalLevel,
-		logrus.ErrorLevel,
-		logrus.WarnLevel,
-		logrus.InfoLevel,
-		logrus.DebugLevel,
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/syslog/syslog_test.go b/Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/syslog/syslog_test.go
deleted file mode 100644
index 42762dc10..000000000
--- a/Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/syslog/syslog_test.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package logrus_syslog
-
-import (
-	"github.com/Sirupsen/logrus"
-	"log/syslog"
-	"testing"
-)
-
-func TestLocalhostAddAndPrint(t *testing.T) {
-	log := logrus.New()
-	hook, err := NewSyslogHook("udp", "localhost:514", syslog.LOG_INFO, "")
-
-	if err != nil {
-		t.Errorf("Unable to connect to local syslog.")
-	}
-
-	log.Hooks.Add(hook)
-
-	for _, level := range hook.Levels() {
-		if len(log.Hooks[level]) != 1 {
-			t.Errorf("SyslogHook was not added. The length of log.Hooks[%v]: %v", level, len(log.Hooks[level]))
-		}
-	}
-
-	log.Info("Congratulations!")
-}
diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/json_formatter.go b/Godeps/_workspace/src/github.com/Sirupsen/logrus/json_formatter.go
deleted file mode 100644
index 2ad6dc5cf..000000000
--- a/Godeps/_workspace/src/github.com/Sirupsen/logrus/json_formatter.go
+++ /dev/null
@@ -1,41 +0,0 @@
-package logrus
-
-import (
-	"encoding/json"
-	"fmt"
-)
-
-type JSONFormatter struct {
-	// TimestampFormat sets the format used for marshaling timestamps.
-	TimestampFormat string
-}
-
-func (f *JSONFormatter) Format(entry *Entry) ([]byte, error) {
-	data := make(Fields, len(entry.Data)+3)
-	for k, v := range entry.Data {
-		switch v := v.(type) {
-		case error:
-			// Otherwise errors are ignored by `encoding/json`
-			// https://github.com/Sirupsen/logrus/issues/137
-			data[k] = v.Error()
-		default:
-			data[k] = v
-		}
-	}
-	prefixFieldClashes(data)
-
-	timestampFormat := f.TimestampFormat
-	if timestampFormat == "" {
-		timestampFormat = DefaultTimestampFormat
-	}
-
-	data["time"] = entry.Time.Format(timestampFormat)
-	data["msg"] = entry.Message
-	data["level"] = entry.Level.String()
-
-	serialized, err := json.Marshal(data)
-	if err != nil {
-		return nil, fmt.Errorf("Failed to marshal fields to JSON, %v", err)
-	}
-	return append(serialized, '\n'), nil
-}
diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/json_formatter_test.go b/Godeps/_workspace/src/github.com/Sirupsen/logrus/json_formatter_test.go
deleted file mode 100644
index 1d7087325..000000000
--- a/Godeps/_workspace/src/github.com/Sirupsen/logrus/json_formatter_test.go
+++ /dev/null
@@ -1,120 +0,0 @@
-package logrus
-
-import (
-	"encoding/json"
-	"errors"
-
-	"testing"
-)
-
-func TestErrorNotLost(t *testing.T) {
-	formatter := &JSONFormatter{}
-
-	b, err := formatter.Format(WithField("error", errors.New("wild walrus")))
-	if err != nil {
-		t.Fatal("Unable to format entry: ", err)
-	}
-
-	entry := make(map[string]interface{})
-	err = json.Unmarshal(b, &entry)
-	if err != nil {
-		t.Fatal("Unable to unmarshal formatted entry: ", err)
-	}
-
-	if entry["error"] != "wild walrus" {
-		t.Fatal("Error field not set")
-	}
-}
-
-func TestErrorNotLostOnFieldNotNamedError(t *testing.T) {
-	formatter := &JSONFormatter{}
-
-	b, err := formatter.Format(WithField("omg", errors.New("wild walrus")))
-	if err != nil {
-		t.Fatal("Unable to format entry: ", err)
-	}
-
-	entry := make(map[string]interface{})
-	err = json.Unmarshal(b, &entry)
-	if err != nil {
-		t.Fatal("Unable to unmarshal formatted entry: ", err)
-	}
-
-	if entry["omg"] != "wild walrus" {
-		t.Fatal("Error field not set")
-	}
-}
-
-func TestFieldClashWithTime(t *testing.T) {
-	formatter := &JSONFormatter{}
-
-	b, err := formatter.Format(WithField("time", "right now!"))
-	if err != nil {
-		t.Fatal("Unable to format entry: ", err)
-	}
-
-	entry := make(map[string]interface{})
-	err = json.Unmarshal(b, &entry)
-	if err != nil {
-		t.Fatal("Unable to unmarshal formatted entry: ", err)
-	}
-
-	if entry["fields.time"] != "right now!" {
-		t.Fatal("fields.time not set to original time field")
-	}
-
-	if entry["time"] != "0001-01-01T00:00:00Z" {
-		t.Fatal("time field not set to current time, was: ", entry["time"])
-	}
-}
-
-func TestFieldClashWithMsg(t *testing.T) {
-	formatter := &JSONFormatter{}
-
-	b, err := formatter.Format(WithField("msg", "something"))
-	if err != nil {
-		t.Fatal("Unable to format entry: ", err)
-	}
-
-	entry := make(map[string]interface{})
-	err = json.Unmarshal(b, &entry)
-	if err != nil {
-		t.Fatal("Unable to unmarshal formatted entry: ", err)
-	}
-
-	if entry["fields.msg"] != "something" {
-		t.Fatal("fields.msg not set to original msg field")
-	}
-}
-
-func TestFieldClashWithLevel(t *testing.T) {
-	formatter := &JSONFormatter{}
-
-	b, err := formatter.Format(WithField("level", "something"))
-	if err != nil {
-		t.Fatal("Unable to format entry: ", err)
-	}
-
-	entry := make(map[string]interface{})
-	err = json.Unmarshal(b, &entry)
-	if err != nil {
-		t.Fatal("Unable to unmarshal formatted entry: ", err)
-	}
-
-	if entry["fields.level"] != "something" {
-		t.Fatal("fields.level not set to original level field")
-	}
-}
-
-func TestJSONEntryEndsWithNewline(t *testing.T) {
-	formatter := &JSONFormatter{}
-
-	b, err := formatter.Format(WithField("level", "something"))
-	if err != nil {
-		t.Fatal("Unable to format entry: ", err)
-	}
-
-	if b[len(b)-1] != '\n' {
-		t.Fatal("Expected JSON log entry to end with a newline")
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/logger.go b/Godeps/_workspace/src/github.com/Sirupsen/logrus/logger.go
deleted file mode 100644
index dd9975931..000000000
--- a/Godeps/_workspace/src/github.com/Sirupsen/logrus/logger.go
+++ /dev/null
@@ -1,206 +0,0 @@
-package logrus
-
-import (
-	"io"
-	"os"
-	"sync"
-)
-
-type Logger struct {
-	// The logs are `io.Copy`'d to this in a mutex. It's common to set this to a
-	// file, or leave it default which is `os.Stderr`. You can also set this to
-	// something more adventorous, such as logging to Kafka.
-	Out io.Writer
-	// Hooks for the logger instance. These allow firing events based on logging
-	// levels and log entries. For example, to send errors to an error tracking
-	// service, log to StatsD or dump the core on fatal errors.
-	Hooks LevelHooks
-	// All log entries pass through the formatter before logged to Out. The
-	// included formatters are `TextFormatter` and `JSONFormatter` for which
-	// TextFormatter is the default. In development (when a TTY is attached) it
-	// logs with colors, but to a file it wouldn't. You can easily implement your
-	// own that implements the `Formatter` interface, see the `README` or included
-	// formatters for examples.
-	Formatter Formatter
-	// The logging level the logger should log at. This is typically (and defaults
-	// to) `logrus.Info`, which allows Info(), Warn(), Error() and Fatal() to be
-	// logged. `logrus.Debug` is useful in
-	Level Level
-	// Used to sync writing to the log.
-	mu sync.Mutex
-}
-
-// Creates a new logger. Configuration should be set by changing `Formatter`,
-// `Out` and `Hooks` directly on the default logger instance. You can also just
-// instantiate your own:
-//
-//    var log = &Logger{
-//      Out: os.Stderr,
-//      Formatter: new(JSONFormatter),
-//      Hooks: make(LevelHooks),
-//      Level: logrus.DebugLevel,
-//    }
-//
-// It's recommended to make this a global instance called `log`.
-func New() *Logger {
-	return &Logger{
-		Out:       os.Stderr,
-		Formatter: new(TextFormatter),
-		Hooks:     make(LevelHooks),
-		Level:     InfoLevel,
-	}
-}
-
-// Adds a field to the log entry, note that you it doesn't log until you call
-// Debug, Print, Info, Warn, Fatal or Panic. It only creates a log entry.
-// Ff you want multiple fields, use `WithFields`.
-func (logger *Logger) WithField(key string, value interface{}) *Entry {
-	return NewEntry(logger).WithField(key, value)
-}
-
-// Adds a struct of fields to the log entry. All it does is call `WithField` for
-// each `Field`.
-func (logger *Logger) WithFields(fields Fields) *Entry {
-	return NewEntry(logger).WithFields(fields)
-}
-
-func (logger *Logger) Debugf(format string, args ...interface{}) {
-	if logger.Level >= DebugLevel {
-		NewEntry(logger).Debugf(format, args...)
-	}
-}
-
-func (logger *Logger) Infof(format string, args ...interface{}) {
-	if logger.Level >= InfoLevel {
-		NewEntry(logger).Infof(format, args...)
-	}
-}
-
-func (logger *Logger) Printf(format string, args ...interface{}) {
-	NewEntry(logger).Printf(format, args...)
-}
-
-func (logger *Logger) Warnf(format string, args ...interface{}) {
-	if logger.Level >= WarnLevel {
-		NewEntry(logger).Warnf(format, args...)
-	}
-}
-
-func (logger *Logger) Warningf(format string, args ...interface{}) {
-	if logger.Level >= WarnLevel {
-		NewEntry(logger).Warnf(format, args...)
-	}
-}
-
-func (logger *Logger) Errorf(format string, args ...interface{}) {
-	if logger.Level >= ErrorLevel {
-		NewEntry(logger).Errorf(format, args...)
-	}
-}
-
-func (logger *Logger) Fatalf(format string, args ...interface{}) {
-	if logger.Level >= FatalLevel {
-		NewEntry(logger).Fatalf(format, args...)
-	}
-	os.Exit(1)
-}
-
-func (logger *Logger) Panicf(format string, args ...interface{}) {
-	if logger.Level >= PanicLevel {
-		NewEntry(logger).Panicf(format, args...)
-	}
-}
-
-func (logger *Logger) Debug(args ...interface{}) {
-	if logger.Level >= DebugLevel {
-		NewEntry(logger).Debug(args...)
-	}
-}
-
-func (logger *Logger) Info(args ...interface{}) {
-	if logger.Level >= InfoLevel {
-		NewEntry(logger).Info(args...)
-	}
-}
-
-func (logger *Logger) Print(args ...interface{}) {
-	NewEntry(logger).Info(args...)
-}
-
-func (logger *Logger) Warn(args ...interface{}) {
-	if logger.Level >= WarnLevel {
-		NewEntry(logger).Warn(args...)
-	}
-}
-
-func (logger *Logger) Warning(args ...interface{}) {
-	if logger.Level >= WarnLevel {
-		NewEntry(logger).Warn(args...)
-	}
-}
-
-func (logger *Logger) Error(args ...interface{}) {
-	if logger.Level >= ErrorLevel {
-		NewEntry(logger).Error(args...)
-	}
-}
-
-func (logger *Logger) Fatal(args ...interface{}) {
-	if logger.Level >= FatalLevel {
-		NewEntry(logger).Fatal(args...)
-	}
-	os.Exit(1)
-}
-
-func (logger *Logger) Panic(args ...interface{}) {
-	if logger.Level >= PanicLevel {
-		NewEntry(logger).Panic(args...)
-	}
-}
-
-func (logger *Logger) Debugln(args ...interface{}) {
-	if logger.Level >= DebugLevel {
-		NewEntry(logger).Debugln(args...)
-	}
-}
-
-func (logger *Logger) Infoln(args ...interface{}) {
-	if logger.Level >= InfoLevel {
-		NewEntry(logger).Infoln(args...)
-	}
-}
-
-func (logger *Logger) Println(args ...interface{}) {
-	NewEntry(logger).Println(args...)
-}
-
-func (logger *Logger) Warnln(args ...interface{}) {
-	if logger.Level >= WarnLevel {
-		NewEntry(logger).Warnln(args...)
-	}
-}
-
-func (logger *Logger) Warningln(args ...interface{}) {
-	if logger.Level >= WarnLevel {
-		NewEntry(logger).Warnln(args...)
-	}
-}
-
-func (logger *Logger) Errorln(args ...interface{}) {
-	if logger.Level >= ErrorLevel {
-		NewEntry(logger).Errorln(args...)
-	}
-}
-
-func (logger *Logger) Fatalln(args ...interface{}) {
-	if logger.Level >= FatalLevel {
-		NewEntry(logger).Fatalln(args...)
-	}
-	os.Exit(1)
-}
-
-func (logger *Logger) Panicln(args ...interface{}) {
-	if logger.Level >= PanicLevel {
-		NewEntry(logger).Panicln(args...)
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/logrus.go b/Godeps/_workspace/src/github.com/Sirupsen/logrus/logrus.go
deleted file mode 100644
index 43ee12e90..000000000
--- a/Godeps/_workspace/src/github.com/Sirupsen/logrus/logrus.go
+++ /dev/null
@@ -1,94 +0,0 @@
-package logrus
-
-import (
-	"fmt"
-	"log"
-)
-
-// Fields type, used to pass to `WithFields`.
-type Fields map[string]interface{}
-
-// Level type
-type Level uint8
-
-// Convert the Level to a string. E.g. PanicLevel becomes "panic".
-func (level Level) String() string {
-	switch level {
-	case DebugLevel:
-		return "debug"
-	case InfoLevel:
-		return "info"
-	case WarnLevel:
-		return "warning"
-	case ErrorLevel:
-		return "error"
-	case FatalLevel:
-		return "fatal"
-	case PanicLevel:
-		return "panic"
-	}
-
-	return "unknown"
-}
-
-// ParseLevel takes a string level and returns the Logrus log level constant.
-func ParseLevel(lvl string) (Level, error) {
-	switch lvl {
-	case "panic":
-		return PanicLevel, nil
-	case "fatal":
-		return FatalLevel, nil
-	case "error":
-		return ErrorLevel, nil
-	case "warn", "warning":
-		return WarnLevel, nil
-	case "info":
-		return InfoLevel, nil
-	case "debug":
-		return DebugLevel, nil
-	}
-
-	var l Level
-	return l, fmt.Errorf("not a valid logrus Level: %q", lvl)
-}
-
-// These are the different logging levels. You can set the logging level to log
-// on your instance of logger, obtained with `logrus.New()`.
-const (
-	// PanicLevel level, highest level of severity. Logs and then calls panic with the
-	// message passed to Debug, Info, ...
-	PanicLevel Level = iota
-	// FatalLevel level. Logs and then calls `os.Exit(1)`. It will exit even if the
-	// logging level is set to Panic.
-	FatalLevel
-	// ErrorLevel level. Logs. Used for errors that should definitely be noted.
-	// Commonly used for hooks to send errors to an error tracking service.
-	ErrorLevel
-	// WarnLevel level. Non-critical entries that deserve eyes.
-	WarnLevel
-	// InfoLevel level. General operational entries about what's going on inside the
-	// application.
-	InfoLevel
-	// DebugLevel level. Usually only enabled when debugging. Very verbose logging.
-	DebugLevel
-)
-
-// Won't compile if StdLogger can't be realized by a log.Logger
-var _ StdLogger = &log.Logger{}
-
-// StdLogger is what your logrus-enabled library should take, that way
-// it'll accept a stdlib logger and a logrus logger. There's no standard
-// interface, this is the closest we get, unfortunately.
-type StdLogger interface {
-	Print(...interface{})
-	Printf(string, ...interface{})
-	Println(...interface{})
-
-	Fatal(...interface{})
-	Fatalf(string, ...interface{})
-	Fatalln(...interface{})
-
-	Panic(...interface{})
-	Panicf(string, ...interface{})
-	Panicln(...interface{})
-}
diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/logrus_test.go b/Godeps/_workspace/src/github.com/Sirupsen/logrus/logrus_test.go
deleted file mode 100644
index efaacea23..000000000
--- a/Godeps/_workspace/src/github.com/Sirupsen/logrus/logrus_test.go
+++ /dev/null
@@ -1,301 +0,0 @@
-package logrus
-
-import (
-	"bytes"
-	"encoding/json"
-	"strconv"
-	"strings"
-	"sync"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func LogAndAssertJSON(t *testing.T, log func(*Logger), assertions func(fields Fields)) {
-	var buffer bytes.Buffer
-	var fields Fields
-
-	logger := New()
-	logger.Out = &buffer
-	logger.Formatter = new(JSONFormatter)
-
-	log(logger)
-
-	err := json.Unmarshal(buffer.Bytes(), &fields)
-	assert.Nil(t, err)
-
-	assertions(fields)
-}
-
-func LogAndAssertText(t *testing.T, log func(*Logger), assertions func(fields map[string]string)) {
-	var buffer bytes.Buffer
-
-	logger := New()
-	logger.Out = &buffer
-	logger.Formatter = &TextFormatter{
-		DisableColors: true,
-	}
-
-	log(logger)
-
-	fields := make(map[string]string)
-	for _, kv := range strings.Split(buffer.String(), " ") {
-		if !strings.Contains(kv, "=") {
-			continue
-		}
-		kvArr := strings.Split(kv, "=")
-		key := strings.TrimSpace(kvArr[0])
-		val := kvArr[1]
-		if kvArr[1][0] == '"' {
-			var err error
-			val, err = strconv.Unquote(val)
-			assert.NoError(t, err)
-		}
-		fields[key] = val
-	}
-	assertions(fields)
-}
-
-func TestPrint(t *testing.T) {
-	LogAndAssertJSON(t, func(log *Logger) {
-		log.Print("test")
-	}, func(fields Fields) {
-		assert.Equal(t, fields["msg"], "test")
-		assert.Equal(t, fields["level"], "info")
-	})
-}
-
-func TestInfo(t *testing.T) {
-	LogAndAssertJSON(t, func(log *Logger) {
-		log.Info("test")
-	}, func(fields Fields) {
-		assert.Equal(t, fields["msg"], "test")
-		assert.Equal(t, fields["level"], "info")
-	})
-}
-
-func TestWarn(t *testing.T) {
-	LogAndAssertJSON(t, func(log *Logger) {
-		log.Warn("test")
-	}, func(fields Fields) {
-		assert.Equal(t, fields["msg"], "test")
-		assert.Equal(t, fields["level"], "warning")
-	})
-}
-
-func TestInfolnShouldAddSpacesBetweenStrings(t *testing.T) {
-	LogAndAssertJSON(t, func(log *Logger) {
-		log.Infoln("test", "test")
-	}, func(fields Fields) {
-		assert.Equal(t, fields["msg"], "test test")
-	})
-}
-
-func TestInfolnShouldAddSpacesBetweenStringAndNonstring(t *testing.T) {
-	LogAndAssertJSON(t, func(log *Logger) {
-		log.Infoln("test", 10)
-	}, func(fields Fields) {
-		assert.Equal(t, fields["msg"], "test 10")
-	})
-}
-
-func TestInfolnShouldAddSpacesBetweenTwoNonStrings(t *testing.T) {
-	LogAndAssertJSON(t, func(log *Logger) {
-		log.Infoln(10, 10)
-	}, func(fields Fields) {
-		assert.Equal(t, fields["msg"], "10 10")
-	})
-}
-
-func TestInfoShouldAddSpacesBetweenTwoNonStrings(t *testing.T) {
-	LogAndAssertJSON(t, func(log *Logger) {
-		log.Infoln(10, 10)
-	}, func(fields Fields) {
-		assert.Equal(t, fields["msg"], "10 10")
-	})
-}
-
-func TestInfoShouldNotAddSpacesBetweenStringAndNonstring(t *testing.T) {
-	LogAndAssertJSON(t, func(log *Logger) {
-		log.Info("test", 10)
-	}, func(fields Fields) {
-		assert.Equal(t, fields["msg"], "test10")
-	})
-}
-
-func TestInfoShouldNotAddSpacesBetweenStrings(t *testing.T) {
-	LogAndAssertJSON(t, func(log *Logger) {
-		log.Info("test", "test")
-	}, func(fields Fields) {
-		assert.Equal(t, fields["msg"], "testtest")
-	})
-}
-
-func TestWithFieldsShouldAllowAssignments(t *testing.T) {
-	var buffer bytes.Buffer
-	var fields Fields
-
-	logger := New()
-	logger.Out = &buffer
-	logger.Formatter = new(JSONFormatter)
-
-	localLog := logger.WithFields(Fields{
-		"key1": "value1",
-	})
-
-	localLog.WithField("key2", "value2").Info("test")
-	err := json.Unmarshal(buffer.Bytes(), &fields)
-	assert.Nil(t, err)
-
-	assert.Equal(t, "value2", fields["key2"])
-	assert.Equal(t, "value1", fields["key1"])
-
-	buffer = bytes.Buffer{}
-	fields = Fields{}
-	localLog.Info("test")
-	err = json.Unmarshal(buffer.Bytes(), &fields)
-	assert.Nil(t, err)
-
-	_, ok := fields["key2"]
-	assert.Equal(t, false, ok)
-	assert.Equal(t, "value1", fields["key1"])
-}
-
-func TestUserSuppliedFieldDoesNotOverwriteDefaults(t *testing.T) {
-	LogAndAssertJSON(t, func(log *Logger) {
-		log.WithField("msg", "hello").Info("test")
-	}, func(fields Fields) {
-		assert.Equal(t, fields["msg"], "test")
-	})
-}
-
-func TestUserSuppliedMsgFieldHasPrefix(t *testing.T) {
-	LogAndAssertJSON(t, func(log *Logger) {
-		log.WithField("msg", "hello").Info("test")
-	}, func(fields Fields) {
-		assert.Equal(t, fields["msg"], "test")
-		assert.Equal(t, fields["fields.msg"], "hello")
-	})
-}
-
-func TestUserSuppliedTimeFieldHasPrefix(t *testing.T) {
-	LogAndAssertJSON(t, func(log *Logger) {
-		log.WithField("time", "hello").Info("test")
-	}, func(fields Fields) {
-		assert.Equal(t, fields["fields.time"], "hello")
-	})
-}
-
-func TestUserSuppliedLevelFieldHasPrefix(t *testing.T) {
-	LogAndAssertJSON(t, func(log *Logger) {
-		log.WithField("level", 1).Info("test")
-	}, func(fields Fields) {
-		assert.Equal(t, fields["level"], "info")
-		assert.Equal(t, fields["fields.level"], 1.0) // JSON has floats only
-	})
-}
-
-func TestDefaultFieldsAreNotPrefixed(t *testing.T) {
-	LogAndAssertText(t, func(log *Logger) {
-		ll := log.WithField("herp", "derp")
-		ll.Info("hello")
-		ll.Info("bye")
-	}, func(fields map[string]string) {
-		for _, fieldName := range []string{"fields.level", "fields.time", "fields.msg"} {
-			if _, ok := fields[fieldName]; ok {
-				t.Fatalf("should not have prefixed %q: %v", fieldName, fields)
-			}
-		}
-	})
-}
-
-func TestDoubleLoggingDoesntPrefixPreviousFields(t *testing.T) {
-
-	var buffer bytes.Buffer
-	var fields Fields
-
-	logger := New()
-	logger.Out = &buffer
-	logger.Formatter = new(JSONFormatter)
-
-	llog := logger.WithField("context", "eating raw fish")
-
-	llog.Info("looks delicious")
-
-	err := json.Unmarshal(buffer.Bytes(), &fields)
-	assert.NoError(t, err, "should have decoded first message")
-	assert.Equal(t, len(fields), 4, "should only have msg/time/level/context fields")
-	assert.Equal(t, fields["msg"], "looks delicious")
-	assert.Equal(t, fields["context"], "eating raw fish")
-
-	buffer.Reset()
-
-	llog.Warn("omg it is!")
-
-	err = json.Unmarshal(buffer.Bytes(), &fields)
-	assert.NoError(t, err, "should have decoded second message")
-	assert.Equal(t, len(fields), 4, "should only have msg/time/level/context fields")
-	assert.Equal(t, fields["msg"], "omg it is!")
-	assert.Equal(t, fields["context"], "eating raw fish")
-	assert.Nil(t, fields["fields.msg"], "should not have prefixed previous `msg` entry")
-
-}
-
-func TestConvertLevelToString(t *testing.T) {
-	assert.Equal(t, "debug", DebugLevel.String())
-	assert.Equal(t, "info", InfoLevel.String())
-	assert.Equal(t, "warning", WarnLevel.String())
-	assert.Equal(t, "error", ErrorLevel.String())
-	assert.Equal(t, "fatal", FatalLevel.String())
-	assert.Equal(t, "panic", PanicLevel.String())
-}
-
-func TestParseLevel(t *testing.T) {
-	l, err := ParseLevel("panic")
-	assert.Nil(t, err)
-	assert.Equal(t, PanicLevel, l)
-
-	l, err = ParseLevel("fatal")
-	assert.Nil(t, err)
-	assert.Equal(t, FatalLevel, l)
-
-	l, err = ParseLevel("error")
-	assert.Nil(t, err)
-	assert.Equal(t, ErrorLevel, l)
-
-	l, err = ParseLevel("warn")
-	assert.Nil(t, err)
-	assert.Equal(t, WarnLevel, l)
-
-	l, err = ParseLevel("warning")
-	assert.Nil(t, err)
-	assert.Equal(t, WarnLevel, l)
-
-	l, err = ParseLevel("info")
-	assert.Nil(t, err)
-	assert.Equal(t, InfoLevel, l)
-
-	l, err = ParseLevel("debug")
-	assert.Nil(t, err)
-	assert.Equal(t, DebugLevel, l)
-
-	l, err = ParseLevel("invalid")
-	assert.Equal(t, "not a valid logrus Level: \"invalid\"", err.Error())
-}
-
-func TestGetSetLevelRace(t *testing.T) {
-	wg := sync.WaitGroup{}
-	for i := 0; i < 100; i++ {
-		wg.Add(1)
-		go func(i int) {
-			defer wg.Done()
-			if i%2 == 0 {
-				SetLevel(InfoLevel)
-			} else {
-				GetLevel()
-			}
-		}(i)
-
-	}
-	wg.Wait()
-}
diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/terminal_bsd.go b/Godeps/_workspace/src/github.com/Sirupsen/logrus/terminal_bsd.go
deleted file mode 100644
index 71f8d67a5..000000000
--- a/Godeps/_workspace/src/github.com/Sirupsen/logrus/terminal_bsd.go
+++ /dev/null
@@ -1,9 +0,0 @@
-// +build darwin freebsd openbsd netbsd dragonfly
-
-package logrus
-
-import "syscall"
-
-const ioctlReadTermios = syscall.TIOCGETA
-
-type Termios syscall.Termios
diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/terminal_linux.go b/Godeps/_workspace/src/github.com/Sirupsen/logrus/terminal_linux.go
deleted file mode 100644
index a2c0b40db..000000000
--- a/Godeps/_workspace/src/github.com/Sirupsen/logrus/terminal_linux.go
+++ /dev/null
@@ -1,12 +0,0 @@
-// Based on ssh/terminal:
-// 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 logrus
-
-import "syscall"
-
-const ioctlReadTermios = syscall.TCGETS
-
-type Termios syscall.Termios
diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/terminal_notwindows.go b/Godeps/_workspace/src/github.com/Sirupsen/logrus/terminal_notwindows.go
deleted file mode 100644
index 4bb537602..000000000
--- a/Godeps/_workspace/src/github.com/Sirupsen/logrus/terminal_notwindows.go
+++ /dev/null
@@ -1,21 +0,0 @@
-// Based on ssh/terminal:
-// 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.
-
-// +build linux darwin freebsd openbsd netbsd dragonfly
-
-package logrus
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-// IsTerminal returns true if the given file descriptor is a terminal.
-func IsTerminal() bool {
-	fd := syscall.Stdout
-	var termios Termios
-	_, _, err := syscall.Syscall6(syscall.SYS_IOCTL, uintptr(fd), ioctlReadTermios, uintptr(unsafe.Pointer(&termios)), 0, 0, 0)
-	return err == 0
-}
diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/terminal_windows.go b/Godeps/_workspace/src/github.com/Sirupsen/logrus/terminal_windows.go
deleted file mode 100644
index 2e09f6f7e..000000000
--- a/Godeps/_workspace/src/github.com/Sirupsen/logrus/terminal_windows.go
+++ /dev/null
@@ -1,27 +0,0 @@
-// Based on ssh/terminal:
-// 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.
-
-// +build windows
-
-package logrus
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-var kernel32 = syscall.NewLazyDLL("kernel32.dll")
-
-var (
-	procGetConsoleMode = kernel32.NewProc("GetConsoleMode")
-)
-
-// IsTerminal returns true if the given file descriptor is a terminal.
-func IsTerminal() bool {
-	fd := syscall.Stdout
-	var st uint32
-	r, _, e := syscall.Syscall(procGetConsoleMode.Addr(), 2, uintptr(fd), uintptr(unsafe.Pointer(&st)), 0)
-	return r != 0 && e == 0
-}
diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/text_formatter.go b/Godeps/_workspace/src/github.com/Sirupsen/logrus/text_formatter.go
deleted file mode 100644
index 17cc29848..000000000
--- a/Godeps/_workspace/src/github.com/Sirupsen/logrus/text_formatter.go
+++ /dev/null
@@ -1,159 +0,0 @@
-package logrus
-
-import (
-	"bytes"
-	"fmt"
-	"runtime"
-	"sort"
-	"strings"
-	"time"
-)
-
-const (
-	nocolor = 0
-	red     = 31
-	green   = 32
-	yellow  = 33
-	blue    = 34
-	gray    = 37
-)
-
-var (
-	baseTimestamp time.Time
-	isTerminal    bool
-)
-
-func init() {
-	baseTimestamp = time.Now()
-	isTerminal = IsTerminal()
-}
-
-func miniTS() int {
-	return int(time.Since(baseTimestamp) / time.Second)
-}
-
-type TextFormatter struct {
-	// Set to true to bypass checking for a TTY before outputting colors.
-	ForceColors bool
-
-	// Force disabling colors.
-	DisableColors bool
-
-	// Disable timestamp logging. useful when output is redirected to logging
-	// system that already adds timestamps.
-	DisableTimestamp bool
-
-	// Enable logging the full timestamp when a TTY is attached instead of just
-	// the time passed since beginning of execution.
-	FullTimestamp bool
-
-	// TimestampFormat to use for display when a full timestamp is printed
-	TimestampFormat string
-
-	// The fields are sorted by default for a consistent output. For applications
-	// that log extremely frequently and don't use the JSON formatter this may not
-	// be desired.
-	DisableSorting bool
-}
-
-func (f *TextFormatter) Format(entry *Entry) ([]byte, error) {
-	var keys []string = make([]string, 0, len(entry.Data))
-	for k := range entry.Data {
-		keys = append(keys, k)
-	}
-
-	if !f.DisableSorting {
-		sort.Strings(keys)
-	}
-
-	b := &bytes.Buffer{}
-
-	prefixFieldClashes(entry.Data)
-
-	isColorTerminal := isTerminal && (runtime.GOOS != "windows")
-	isColored := (f.ForceColors || isColorTerminal) && !f.DisableColors
-
-	timestampFormat := f.TimestampFormat
-	if timestampFormat == "" {
-		timestampFormat = DefaultTimestampFormat
-	}
-	if isColored {
-		f.printColored(b, entry, keys, timestampFormat)
-	} else {
-		if !f.DisableTimestamp {
-			f.appendKeyValue(b, "time", entry.Time.Format(timestampFormat))
-		}
-		f.appendKeyValue(b, "level", entry.Level.String())
-		f.appendKeyValue(b, "msg", entry.Message)
-		for _, key := range keys {
-			f.appendKeyValue(b, key, entry.Data[key])
-		}
-	}
-
-	b.WriteByte('\n')
-	return b.Bytes(), nil
-}
-
-func (f *TextFormatter) printColored(b *bytes.Buffer, entry *Entry, keys []string, timestampFormat string) {
-	var levelColor int
-	switch entry.Level {
-	case DebugLevel:
-		levelColor = gray
-	case WarnLevel:
-		levelColor = yellow
-	case ErrorLevel, FatalLevel, PanicLevel:
-		levelColor = red
-	default:
-		levelColor = blue
-	}
-
-	levelText := strings.ToUpper(entry.Level.String())[0:4]
-
-	if !f.FullTimestamp {
-		fmt.Fprintf(b, "\x1b[%dm%s\x1b[0m[%04d] %-44s ", levelColor, levelText, miniTS(), entry.Message)
-	} else {
-		fmt.Fprintf(b, "\x1b[%dm%s\x1b[0m[%s] %-44s ", levelColor, levelText, entry.Time.Format(timestampFormat), entry.Message)
-	}
-	for _, k := range keys {
-		v := entry.Data[k]
-		fmt.Fprintf(b, " \x1b[%dm%s\x1b[0m=%+v", levelColor, k, v)
-	}
-}
-
-func needsQuoting(text string) bool {
-	for _, ch := range text {
-		if !((ch >= 'a' && ch <= 'z') ||
-			(ch >= 'A' && ch <= 'Z') ||
-			(ch >= '0' && ch <= '9') ||
-			ch == '-' || ch == '.') {
-			return false
-		}
-	}
-	return true
-}
-
-func (f *TextFormatter) appendKeyValue(b *bytes.Buffer, key string, value interface{}) {
-
-	b.WriteString(key)
-	b.WriteByte('=')
-
-	switch value := value.(type) {
-	case string:
-		if needsQuoting(value) {
-			b.WriteString(value)
-		} else {
-			fmt.Fprintf(b, "%q", value)
-		}
-	case error:
-		errmsg := value.Error()
-		if needsQuoting(errmsg) {
-			b.WriteString(errmsg)
-		} else {
-			fmt.Fprintf(b, "%q", value)
-		}
-	default:
-		fmt.Fprint(b, value)
-	}
-
-	b.WriteByte(' ')
-}
diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/text_formatter_test.go b/Godeps/_workspace/src/github.com/Sirupsen/logrus/text_formatter_test.go
deleted file mode 100644
index e25a44f67..000000000
--- a/Godeps/_workspace/src/github.com/Sirupsen/logrus/text_formatter_test.go
+++ /dev/null
@@ -1,61 +0,0 @@
-package logrus
-
-import (
-	"bytes"
-	"errors"
-	"testing"
-	"time"
-)
-
-func TestQuoting(t *testing.T) {
-	tf := &TextFormatter{DisableColors: true}
-
-	checkQuoting := func(q bool, value interface{}) {
-		b, _ := tf.Format(WithField("test", value))
-		idx := bytes.Index(b, ([]byte)("test="))
-		cont := bytes.Contains(b[idx+5:], []byte{'"'})
-		if cont != q {
-			if q {
-				t.Errorf("quoting expected for: %#v", value)
-			} else {
-				t.Errorf("quoting not expected for: %#v", value)
-			}
-		}
-	}
-
-	checkQuoting(false, "abcd")
-	checkQuoting(false, "v1.0")
-	checkQuoting(false, "1234567890")
-	checkQuoting(true, "/foobar")
-	checkQuoting(true, "x y")
-	checkQuoting(true, "x,y")
-	checkQuoting(false, errors.New("invalid"))
-	checkQuoting(true, errors.New("invalid argument"))
-}
-
-func TestTimestampFormat(t *testing.T) {
-	checkTimeStr := func(format string) {
-		customFormatter := &TextFormatter{DisableColors: true, TimestampFormat: format}
-		customStr, _ := customFormatter.Format(WithField("test", "test"))
-		timeStart := bytes.Index(customStr, ([]byte)("time="))
-		timeEnd := bytes.Index(customStr, ([]byte)("level="))
-		timeStr := customStr[timeStart+5 : timeEnd-1]
-		if timeStr[0] == '"' && timeStr[len(timeStr)-1] == '"' {
-			timeStr = timeStr[1 : len(timeStr)-1]
-		}
-		if format == "" {
-			format = time.RFC3339
-		}
-		_, e := time.Parse(format, (string)(timeStr))
-		if e != nil {
-			t.Errorf("time string \"%s\" did not match provided time format \"%s\": %s", timeStr, format, e)
-		}
-	}
-
-	checkTimeStr("2006-01-02T15:04:05.000000000Z07:00")
-	checkTimeStr("Mon Jan _2 15:04:05 2006")
-	checkTimeStr("")
-}
-
-// TODO add tests for sorting etc., this requires a parser for the text
-// formatter output.
diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/writer.go b/Godeps/_workspace/src/github.com/Sirupsen/logrus/writer.go
deleted file mode 100644
index 1e30b1c75..000000000
--- a/Godeps/_workspace/src/github.com/Sirupsen/logrus/writer.go
+++ /dev/null
@@ -1,31 +0,0 @@
-package logrus
-
-import (
-	"bufio"
-	"io"
-	"runtime"
-)
-
-func (logger *Logger) Writer() *io.PipeWriter {
-	reader, writer := io.Pipe()
-
-	go logger.writerScanner(reader)
-	runtime.SetFinalizer(writer, writerFinalizer)
-
-	return writer
-}
-
-func (logger *Logger) writerScanner(reader *io.PipeReader) {
-	scanner := bufio.NewScanner(reader)
-	for scanner.Scan() {
-		logger.Print(scanner.Text())
-	}
-	if err := scanner.Err(); err != nil {
-		logger.Errorf("Error while reading from Writer: %s", err)
-	}
-	reader.Close()
-}
-
-func writerFinalizer(writer *io.PipeWriter) {
-	writer.Close()
-}
diff --git a/Godeps/_workspace/src/github.com/amir/raidman/README.md b/Godeps/_workspace/src/github.com/amir/raidman/README.md
deleted file mode 100644
index 5dbe8684e..000000000
--- a/Godeps/_workspace/src/github.com/amir/raidman/README.md
+++ /dev/null
@@ -1,73 +0,0 @@
-Raidman
-=======
-
-Go Riemann client
-
-```go
-package main
-
-import (
-        "github.com/amir/raidman"
-)
-
-func main() {
-        c, err := raidman.Dial("tcp", "localhost:5555")
-        if err != nil {
-                panic(err)
-        }
-
-        var event = &raidman.Event{
-                State:   "success",
-                Host:    "raidman",
-                Service: "raidman-sample",
-                Metric:  100,
-                Ttl:     10,
-        }
-
-        // send one event
-        err = c.Send(event)
-        if err != nil {
-                panic(err)
-        }
-        
-        // send multiple events at once
-        err = c.SendMulti([]*raidman.Event{
-                &raidman.Event{
-                        State:   "success",
-                        Host:    "raidman",
-                        Service: "raidman-sample",
-                        Metric:  100,
-                        Ttl:     10,
-                },
-                &raidman.Event{
-                        State:   "failure",
-                        Host:    "raidman",
-                        Service: "raidman-sample",
-                        Metric:  100,
-                        Ttl:     10,
-                },
-                &raidman.Event{
-                        State:   "success",
-                        Host:    "raidman",
-                        Service: "raidman-sample",
-                        Metric:  100,
-                        Ttl:     10,
-                },
-        })
-        if err != nil {
-                panic(err)
-        }
-
-        events, err := c.Query("host = \"raidman\"")
-        if err != nil {
-                panic(err)
-        }
-
-        if len(events) < 1 {
-                panic("Submitted event not found")
-        }
-
-        c.Close()
-}
-
-```
diff --git a/Godeps/_workspace/src/github.com/amir/raidman/UNLICENSE b/Godeps/_workspace/src/github.com/amir/raidman/UNLICENSE
deleted file mode 100644
index 68a49daad..000000000
--- a/Godeps/_workspace/src/github.com/amir/raidman/UNLICENSE
+++ /dev/null
@@ -1,24 +0,0 @@
-This is free and unencumbered software released into the public domain.
-
-Anyone is free to copy, modify, publish, use, compile, sell, or
-distribute this software, either in source code form or as a compiled
-binary, for any purpose, commercial or non-commercial, and by any
-means.
-
-In jurisdictions that recognize copyright laws, the author or authors
-of this software dedicate any and all copyright interest in the
-software to the public domain. We make this dedication for the benefit
-of the public at large and to the detriment of our heirs and
-successors. We intend this dedication to be an overt act of
-relinquishment in perpetuity of all present and future rights to this
-software under copyright law.
-
-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 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.
-
-For more information, please refer to <http://unlicense.org/>
diff --git a/Godeps/_workspace/src/github.com/amir/raidman/proto/Makefile b/Godeps/_workspace/src/github.com/amir/raidman/proto/Makefile
deleted file mode 100644
index 5349cc839..000000000
--- a/Godeps/_workspace/src/github.com/amir/raidman/proto/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-proto.pb.go: proto.proto
-	mkdir -p _pb
-	protoc --go_out=_pb $<
-	cat _pb/$@\
-	|gofmt >$@
-	rm -rf _pb
diff --git a/Godeps/_workspace/src/github.com/amir/raidman/proto/proto.pb.go b/Godeps/_workspace/src/github.com/amir/raidman/proto/proto.pb.go
deleted file mode 100644
index 42eea684d..000000000
--- a/Godeps/_workspace/src/github.com/amir/raidman/proto/proto.pb.go
+++ /dev/null
@@ -1,273 +0,0 @@
-// Code generated by protoc-gen-go.
-// source: proto.proto
-// DO NOT EDIT!
-
-package proto
-
-import proto1 "github.com/golang/protobuf/proto"
-import json "encoding/json"
-import math "math"
-
-// Reference proto, json, and math imports to suppress error if they are not otherwise used.
-var _ = proto1.Marshal
-var _ = &json.SyntaxError{}
-var _ = math.Inf
-
-type State struct {
-	Time             *int64   `protobuf:"varint,1,opt,name=time" json:"time,omitempty"`
-	State            *string  `protobuf:"bytes,2,opt,name=state" json:"state,omitempty"`
-	Service          *string  `protobuf:"bytes,3,opt,name=service" json:"service,omitempty"`
-	Host             *string  `protobuf:"bytes,4,opt,name=host" json:"host,omitempty"`
-	Description      *string  `protobuf:"bytes,5,opt,name=description" json:"description,omitempty"`
-	Once             *bool    `protobuf:"varint,6,opt,name=once" json:"once,omitempty"`
-	Tags             []string `protobuf:"bytes,7,rep,name=tags" json:"tags,omitempty"`
-	Ttl              *float32 `protobuf:"fixed32,8,opt,name=ttl" json:"ttl,omitempty"`
-	XXX_unrecognized []byte   `json:"-"`
-}
-
-func (this *State) Reset()         { *this = State{} }
-func (this *State) String() string { return proto1.CompactTextString(this) }
-func (*State) ProtoMessage()       {}
-
-func (this *State) GetTime() int64 {
-	if this != nil && this.Time != nil {
-		return *this.Time
-	}
-	return 0
-}
-
-func (this *State) GetState() string {
-	if this != nil && this.State != nil {
-		return *this.State
-	}
-	return ""
-}
-
-func (this *State) GetService() string {
-	if this != nil && this.Service != nil {
-		return *this.Service
-	}
-	return ""
-}
-
-func (this *State) GetHost() string {
-	if this != nil && this.Host != nil {
-		return *this.Host
-	}
-	return ""
-}
-
-func (this *State) GetDescription() string {
-	if this != nil && this.Description != nil {
-		return *this.Description
-	}
-	return ""
-}
-
-func (this *State) GetOnce() bool {
-	if this != nil && this.Once != nil {
-		return *this.Once
-	}
-	return false
-}
-
-func (this *State) GetTags() []string {
-	if this != nil {
-		return this.Tags
-	}
-	return nil
-}
-
-func (this *State) GetTtl() float32 {
-	if this != nil && this.Ttl != nil {
-		return *this.Ttl
-	}
-	return 0
-}
-
-type Event struct {
-	Time             *int64       `protobuf:"varint,1,opt,name=time" json:"time,omitempty"`
-	State            *string      `protobuf:"bytes,2,opt,name=state" json:"state,omitempty"`
-	Service          *string      `protobuf:"bytes,3,opt,name=service" json:"service,omitempty"`
-	Host             *string      `protobuf:"bytes,4,opt,name=host" json:"host,omitempty"`
-	Description      *string      `protobuf:"bytes,5,opt,name=description" json:"description,omitempty"`
-	Tags             []string     `protobuf:"bytes,7,rep,name=tags" json:"tags,omitempty"`
-	Ttl              *float32     `protobuf:"fixed32,8,opt,name=ttl" json:"ttl,omitempty"`
-	Attributes       []*Attribute `protobuf:"bytes,9,rep,name=attributes" json:"attributes,omitempty"`
-	MetricSint64     *int64       `protobuf:"zigzag64,13,opt,name=metric_sint64" json:"metric_sint64,omitempty"`
-	MetricD          *float64     `protobuf:"fixed64,14,opt,name=metric_d" json:"metric_d,omitempty"`
-	MetricF          *float32     `protobuf:"fixed32,15,opt,name=metric_f" json:"metric_f,omitempty"`
-	XXX_unrecognized []byte       `json:"-"`
-}
-
-func (this *Event) Reset()         { *this = Event{} }
-func (this *Event) String() string { return proto1.CompactTextString(this) }
-func (*Event) ProtoMessage()       {}
-
-func (this *Event) GetTime() int64 {
-	if this != nil && this.Time != nil {
-		return *this.Time
-	}
-	return 0
-}
-
-func (this *Event) GetState() string {
-	if this != nil && this.State != nil {
-		return *this.State
-	}
-	return ""
-}
-
-func (this *Event) GetService() string {
-	if this != nil && this.Service != nil {
-		return *this.Service
-	}
-	return ""
-}
-
-func (this *Event) GetHost() string {
-	if this != nil && this.Host != nil {
-		return *this.Host
-	}
-	return ""
-}
-
-func (this *Event) GetDescription() string {
-	if this != nil && this.Description != nil {
-		return *this.Description
-	}
-	return ""
-}
-
-func (this *Event) GetTags() []string {
-	if this != nil {
-		return this.Tags
-	}
-	return nil
-}
-
-func (this *Event) GetTtl() float32 {
-	if this != nil && this.Ttl != nil {
-		return *this.Ttl
-	}
-	return 0
-}
-
-func (this *Event) GetAttributes() []*Attribute {
-	if this != nil {
-		return this.Attributes
-	}
-	return nil
-}
-
-func (this *Event) GetMetricSint64() int64 {
-	if this != nil && this.MetricSint64 != nil {
-		return *this.MetricSint64
-	}
-	return 0
-}
-
-func (this *Event) GetMetricD() float64 {
-	if this != nil && this.MetricD != nil {
-		return *this.MetricD
-	}
-	return 0
-}
-
-func (this *Event) GetMetricF() float32 {
-	if this != nil && this.MetricF != nil {
-		return *this.MetricF
-	}
-	return 0
-}
-
-type Query struct {
-	String_          *string `protobuf:"bytes,1,opt,name=string" json:"string,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (this *Query) Reset()         { *this = Query{} }
-func (this *Query) String() string { return proto1.CompactTextString(this) }
-func (*Query) ProtoMessage()       {}
-
-func (this *Query) GetString_() string {
-	if this != nil && this.String_ != nil {
-		return *this.String_
-	}
-	return ""
-}
-
-type Msg struct {
-	Ok               *bool    `protobuf:"varint,2,opt,name=ok" json:"ok,omitempty"`
-	Error            *string  `protobuf:"bytes,3,opt,name=error" json:"error,omitempty"`
-	States           []*State `protobuf:"bytes,4,rep,name=states" json:"states,omitempty"`
-	Query            *Query   `protobuf:"bytes,5,opt,name=query" json:"query,omitempty"`
-	Events           []*Event `protobuf:"bytes,6,rep,name=events" json:"events,omitempty"`
-	XXX_unrecognized []byte   `json:"-"`
-}
-
-func (this *Msg) Reset()         { *this = Msg{} }
-func (this *Msg) String() string { return proto1.CompactTextString(this) }
-func (*Msg) ProtoMessage()       {}
-
-func (this *Msg) GetOk() bool {
-	if this != nil && this.Ok != nil {
-		return *this.Ok
-	}
-	return false
-}
-
-func (this *Msg) GetError() string {
-	if this != nil && this.Error != nil {
-		return *this.Error
-	}
-	return ""
-}
-
-func (this *Msg) GetStates() []*State {
-	if this != nil {
-		return this.States
-	}
-	return nil
-}
-
-func (this *Msg) GetQuery() *Query {
-	if this != nil {
-		return this.Query
-	}
-	return nil
-}
-
-func (this *Msg) GetEvents() []*Event {
-	if this != nil {
-		return this.Events
-	}
-	return nil
-}
-
-type Attribute struct {
-	Key              *string `protobuf:"bytes,1,req,name=key" json:"key,omitempty"`
-	Value            *string `protobuf:"bytes,2,opt,name=value" json:"value,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (this *Attribute) Reset()         { *this = Attribute{} }
-func (this *Attribute) String() string { return proto1.CompactTextString(this) }
-func (*Attribute) ProtoMessage()       {}
-
-func (this *Attribute) GetKey() string {
-	if this != nil && this.Key != nil {
-		return *this.Key
-	}
-	return ""
-}
-
-func (this *Attribute) GetValue() string {
-	if this != nil && this.Value != nil {
-		return *this.Value
-	}
-	return ""
-}
-
-func init() {
-}
diff --git a/Godeps/_workspace/src/github.com/amir/raidman/proto/proto.proto b/Godeps/_workspace/src/github.com/amir/raidman/proto/proto.proto
deleted file mode 100644
index 3e946a3a0..000000000
--- a/Godeps/_workspace/src/github.com/amir/raidman/proto/proto.proto
+++ /dev/null
@@ -1,45 +0,0 @@
-option java_package = "com.aphyr.riemann";
-option java_outer_classname = "Proto";
-
-message State {
-  optional int64 time = 1;
-  optional string state = 2;
-  optional string service = 3;
-  optional string host = 4;
-  optional string description = 5;
-  optional bool once = 6;
-  repeated string tags = 7;
-  optional float ttl = 8;
-}
-
-message Event {
-  optional int64 time = 1;
-  optional string state = 2;
-  optional string service = 3;
-  optional string host = 4;
-  optional string description = 5;
-  repeated string tags = 7;
-  optional float ttl = 8;
-  repeated Attribute attributes = 9;
-
-  optional sint64 metric_sint64 = 13;
-  optional double metric_d = 14;
-  optional float metric_f = 15;
-}
-
-message Query {
-  optional string string = 1;
-}
-
-message Msg {
-  optional bool ok = 2;
-  optional string error = 3;
-  repeated State states = 4;
-  optional Query query = 5;
-  repeated Event events = 6;
-}
-
-message Attribute {
-  required string key = 1;
-  optional string value = 2;
-}
diff --git a/Godeps/_workspace/src/github.com/amir/raidman/raidman.go b/Godeps/_workspace/src/github.com/amir/raidman/raidman.go
deleted file mode 100644
index 87c82777c..000000000
--- a/Godeps/_workspace/src/github.com/amir/raidman/raidman.go
+++ /dev/null
@@ -1,313 +0,0 @@
-// Go Riemann client
-package raidman
-
-import (
-	"bytes"
-	"encoding/binary"
-	"errors"
-	"fmt"
-	"io"
-	"net"
-	"os"
-	"reflect"
-	"sync"
-	"time"
-
-	"github.com/amir/raidman/proto"
-	pb "github.com/golang/protobuf/proto"
-)
-
-type network interface {
-	Send(message *proto.Msg, conn net.Conn) (*proto.Msg, error)
-}
-
-type tcp struct{}
-
-type udp struct{}
-
-// Client represents a connection to a Riemann server
-type Client struct {
-	sync.Mutex
-	net        network
-	connection net.Conn
-	timeout    time.Duration
-}
-
-// An Event represents a single Riemann event
-type Event struct {
-	Ttl         float32
-	Time        int64
-	Tags        []string
-	Host        string // Defaults to os.Hostname()
-	State       string
-	Service     string
-	Metric      interface{} // Could be Int, Float32, Float64
-	Description string
-	Attributes  map[string]string
-}
-
-// Dial establishes a connection to a Riemann server at addr, on the network
-// netwrk, with a timeout of timeout
-//
-// Known networks are "tcp", "tcp4", "tcp6", "udp", "udp4", and "udp6".
-func DialWithTimeout(netwrk, addr string, timeout time.Duration) (c *Client, err error) {
-	c = new(Client)
-
-	var cnet network
-	switch netwrk {
-	case "tcp", "tcp4", "tcp6":
-		cnet = new(tcp)
-	case "udp", "udp4", "udp6":
-		cnet = new(udp)
-	default:
-		return nil, fmt.Errorf("dial %q: unsupported network %q", netwrk, netwrk)
-	}
-
-	c.net = cnet
-	c.timeout = timeout
-	c.connection, err = net.Dial(netwrk, addr)
-	if err != nil {
-		return nil, err
-	}
-
-	return c, nil
-}
-
-// Dial establishes a connection to a Riemann server at addr, on the network
-// netwrk.
-//
-// Known networks are "tcp", "tcp4", "tcp6", "udp", "udp4", and "udp6".
-func Dial(netwrk, addr string) (c *Client, err error) {
-	return DialWithTimeout(netwrk, addr, 0)
-}
-
-func (network *tcp) Send(message *proto.Msg, conn net.Conn) (*proto.Msg, error) {
-	msg := &proto.Msg{}
-	data, err := pb.Marshal(message)
-	if err != nil {
-		return msg, err
-	}
-	b := new(bytes.Buffer)
-	if err = binary.Write(b, binary.BigEndian, uint32(len(data))); err != nil {
-		return msg, err
-	}
-	if _, err = conn.Write(b.Bytes()); err != nil {
-		return msg, err
-	}
-	if _, err = conn.Write(data); err != nil {
-		return msg, err
-	}
-	var header uint32
-	if err = binary.Read(conn, binary.BigEndian, &header); err != nil {
-		return msg, err
-	}
-	response := make([]byte, header)
-	if err = readFully(conn, response); err != nil {
-		return msg, err
-	}
-	if err = pb.Unmarshal(response, msg); err != nil {
-		return msg, err
-	}
-	if msg.GetOk() != true {
-		return msg, errors.New(msg.GetError())
-	}
-	return msg, nil
-}
-
-func readFully(r io.Reader, p []byte) error {
-	for len(p) > 0 {
-		n, err := r.Read(p)
-		p = p[n:]
-		if err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func (network *udp) Send(message *proto.Msg, conn net.Conn) (*proto.Msg, error) {
-	data, err := pb.Marshal(message)
-	if err != nil {
-		return nil, err
-	}
-	if _, err = conn.Write(data); err != nil {
-		return nil, err
-	}
-
-	return nil, nil
-}
-
-func isZero(v reflect.Value) bool {
-	switch v.Kind() {
-	case reflect.Map:
-		return v.IsNil()
-	case reflect.Slice:
-		zero := true
-		for i := 0; i < v.Len(); i++ {
-			zero = zero && isZero(v.Index(i))
-		}
-		return zero
-	}
-	zero := reflect.Zero(v.Type())
-	return v.Interface() == zero.Interface()
-}
-
-func eventToPbEvent(event *Event) (*proto.Event, error) {
-	var e proto.Event
-
-	if event.Host == "" {
-		event.Host, _ = os.Hostname()
-	}
-	t := reflect.ValueOf(&e).Elem()
-	s := reflect.ValueOf(event).Elem()
-	typeOfEvent := s.Type()
-	for i := 0; i < s.NumField(); i++ {
-		f := s.Field(i)
-		value := reflect.ValueOf(f.Interface())
-		if !isZero(f) {
-			name := typeOfEvent.Field(i).Name
-			switch name {
-			case "State", "Service", "Host", "Description":
-				tmp := reflect.ValueOf(pb.String(value.String()))
-				t.FieldByName(name).Set(tmp)
-			case "Ttl":
-				tmp := reflect.ValueOf(pb.Float32(float32(value.Float())))
-				t.FieldByName(name).Set(tmp)
-			case "Time":
-				tmp := reflect.ValueOf(pb.Int64(value.Int()))
-				t.FieldByName(name).Set(tmp)
-			case "Tags":
-				tmp := reflect.ValueOf(value.Interface().([]string))
-				t.FieldByName(name).Set(tmp)
-			case "Metric":
-				switch reflect.TypeOf(f.Interface()).Kind() {
-				case reflect.Int:
-					tmp := reflect.ValueOf(pb.Int64(int64(value.Int())))
-					t.FieldByName("MetricSint64").Set(tmp)
-				case reflect.Int64:
-					tmp := reflect.ValueOf(pb.Int64(int64(value.Int())))
-					t.FieldByName("MetricSint64").Set(tmp)
-				case reflect.Float32:
-					tmp := reflect.ValueOf(pb.Float32(float32(value.Float())))
-					t.FieldByName("MetricF").Set(tmp)
-				case reflect.Float64:
-					tmp := reflect.ValueOf(pb.Float64(value.Float()))
-					t.FieldByName("MetricD").Set(tmp)
-				default:
-					return nil, fmt.Errorf("Metric of invalid type (type %v)",
-						reflect.TypeOf(f.Interface()).Kind())
-				}
-			case "Attributes":
-				var attrs []*proto.Attribute
-				for k, v := range value.Interface().(map[string]string) {
-					// Copy k,v so we can take
-					// pointers to the new
-					// temporaries
-					k_, v_ := k, v
-					attrs = append(attrs, &proto.Attribute{
-						Key:   &k_,
-						Value: &v_,
-					})
-				}
-				t.FieldByName(name).Set(reflect.ValueOf(attrs))
-			}
-		}
-	}
-
-	return &e, nil
-}
-
-func pbEventsToEvents(pbEvents []*proto.Event) []Event {
-	var events []Event
-
-	for _, event := range pbEvents {
-		e := Event{
-			State:       event.GetState(),
-			Service:     event.GetService(),
-			Host:        event.GetHost(),
-			Description: event.GetDescription(),
-			Ttl:         event.GetTtl(),
-			Time:        event.GetTime(),
-			Tags:        event.GetTags(),
-		}
-		if event.MetricF != nil {
-			e.Metric = event.GetMetricF()
-		} else if event.MetricD != nil {
-			e.Metric = event.GetMetricD()
-		} else {
-			e.Metric = event.GetMetricSint64()
-		}
-		if event.Attributes != nil {
-			e.Attributes = make(map[string]string, len(event.GetAttributes()))
-			for _, attr := range event.GetAttributes() {
-				e.Attributes[attr.GetKey()] = attr.GetValue()
-			}
-		}
-
-		events = append(events, e)
-	}
-
-	return events
-}
-
-// Send sends an event to Riemann
-func (c *Client) Send(event *Event) error {
-	return c.SendMulti([]*Event{event})
-}
-
-// SendMulti sends multiple events to Riemann
-func (c *Client) SendMulti(events []*Event) error {
-	message := &proto.Msg{}
-
-	for _, event := range events {
-		e, err := eventToPbEvent(event)
-		if err != nil {
-			return err
-		}
-
-		message.Events = append(message.Events, e)
-	}
-
-	c.Lock()
-	defer c.Unlock()
-
-	if c.timeout > 0 {
-		err := c.connection.SetDeadline(time.Now().Add(c.timeout))
-		if err != nil {
-			return err
-		}
-	}
-
-	_, err := c.net.Send(message, c.connection)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-// Query returns a list of events matched by query
-func (c *Client) Query(q string) ([]Event, error) {
-	switch c.net.(type) {
-	case *udp:
-		return nil, errors.New("Querying over UDP is not supported")
-	}
-	query := &proto.Query{}
-	query.String_ = pb.String(q)
-	message := &proto.Msg{}
-	message.Query = query
-	c.Lock()
-	defer c.Unlock()
-	response, err := c.net.Send(message, c.connection)
-	if err != nil {
-		return nil, err
-	}
-	return pbEventsToEvents(response.GetEvents()), nil
-}
-
-// Close closes the connection to Riemann
-func (c *Client) Close() {
-	c.Lock()
-	c.connection.Close()
-	c.Unlock()
-}
diff --git a/Godeps/_workspace/src/github.com/amir/raidman/raidman_test.go b/Godeps/_workspace/src/github.com/amir/raidman/raidman_test.go
deleted file mode 100644
index 8a824ee3c..000000000
--- a/Godeps/_workspace/src/github.com/amir/raidman/raidman_test.go
+++ /dev/null
@@ -1,268 +0,0 @@
-package raidman
-
-import (
-	"reflect"
-	"testing"
-)
-
-func TestTCP(t *testing.T) {
-	c, err := Dial("tcp", "localhost:5555")
-	if err != nil {
-		t.Fatal(err.Error())
-	}
-	var event = &Event{
-		State:      "success",
-		Host:       "raidman",
-		Service:    "tcp",
-		Metric:     42,
-		Ttl:        1,
-		Tags:       []string{"tcp", "test", "raidman"},
-		Attributes: map[string]string{"type": "test"},
-	}
-
-	err = c.Send(event)
-	if err != nil {
-		t.Error(err.Error())
-	}
-
-	events, err := c.Query("tagged \"test\"")
-	if err != nil {
-		t.Error(err.Error())
-	}
-
-	if len(events) < 1 {
-		t.Error("Submitted event not found")
-	}
-
-	testAttributeExists := false
-	for _, event := range events {
-		if val, ok := event.Attributes["type"]; ok && val == "test" {
-			testAttributeExists = true
-		}
-	}
-
-	if !testAttributeExists {
-		t.Error("Attribute \"type\" is missing")
-	}
-
-	c.Close()
-}
-
-func TestMultiTCP(t *testing.T) {
-	c, err := Dial("tcp", "localhost:5555")
-	if err != nil {
-		t.Fatal(err.Error())
-	}
-
-	err = c.SendMulti([]*Event{
-		&Event{
-			State:      "success",
-			Host:       "raidman",
-			Service:    "tcp-multi-1",
-			Metric:     42,
-			Ttl:        1,
-			Tags:       []string{"tcp", "test", "raidman", "multi"},
-			Attributes: map[string]string{"type": "test"},
-		},
-		&Event{
-			State:      "success",
-			Host:       "raidman",
-			Service:    "tcp-multi-2",
-			Metric:     42,
-			Ttl:        1,
-			Tags:       []string{"tcp", "test", "raidman", "multi"},
-			Attributes: map[string]string{"type": "test"},
-		},
-	})
-	if err != nil {
-		t.Error(err.Error())
-	}
-
-	events, err := c.Query("tagged \"test\" and tagged \"multi\"")
-	if err != nil {
-		t.Error(err.Error())
-	}
-
-	if len(events) != 2 {
-		t.Error("Submitted event not found")
-	}
-
-	c.Close()
-}
-
-func TestMetricIsInt64(t *testing.T) {
-	c, err := Dial("tcp", "localhost:5555")
-	if err != nil {
-		t.Fatal(err.Error())
-	}
-
-	var int64metric int64 = 9223372036854775807
-
-	var event = &Event{
-		State:      "success",
-		Host:       "raidman",
-		Service:    "tcp",
-		Metric:     int64metric,
-		Ttl:        1,
-		Tags:       []string{"tcp", "test", "raidman"},
-		Attributes: map[string]string{"type": "test"},
-	}
-
-	err = c.Send(event)
-	if err != nil {
-		t.Error(err.Error())
-	}
-}
-
-func TestUDP(t *testing.T) {
-	c, err := Dial("udp", "localhost:5555")
-	if err != nil {
-		t.Fatal(err.Error())
-	}
-	var event = &Event{
-		State:   "warning",
-		Host:    "raidman",
-		Service: "udp",
-		Metric:  3.4,
-		Ttl:     10.7,
-	}
-
-	err = c.Send(event)
-	if err != nil {
-		t.Error(err.Error())
-	}
-	c.Close()
-}
-
-func TestTCPWithoutHost(t *testing.T) {
-	c, err := Dial("tcp", "localhost:5555")
-	if err != nil {
-		t.Fatal(err.Error())
-	}
-	defer c.Close()
-
-	var event = &Event{
-		State:   "success",
-		Service: "tcp-host-not-set",
-		Ttl:     5,
-	}
-
-	err = c.Send(event)
-	if err != nil {
-		t.Error(err.Error())
-	}
-
-	events, err := c.Query("service = \"tcp-host-not-set\"")
-	if err != nil {
-		t.Error(err.Error())
-	}
-
-	if len(events) < 1 {
-		t.Error("Submitted event not found")
-	}
-
-	for _, e := range events {
-		if e.Host == "" {
-			t.Error("Default host name is not set")
-		}
-	}
-}
-
-func TestIsZero(t *testing.T) {
-	event := &Event{
-		Time: 1,
-	}
-	elem := reflect.ValueOf(event).Elem()
-	eventType := elem.Type()
-	for i := 0; i < elem.NumField(); i++ {
-		field := elem.Field(i)
-		name := eventType.Field(i).Name
-		if name == "Time" {
-			if isZero(field) {
-				t.Error("Time should not be zero")
-			}
-		} else {
-			if !isZero(field) {
-				t.Errorf("%s should be zero", name)
-			}
-		}
-	}
-}
-
-func BenchmarkTCP(b *testing.B) {
-	c, err := Dial("tcp", "localhost:5555")
-
-	var event = &Event{
-		State:   "good",
-		Host:    "raidman",
-		Service: "benchmark",
-	}
-
-	if err == nil {
-		for i := 0; i < b.N; i++ {
-			c.Send(event)
-		}
-	}
-	c.Close()
-}
-
-func BenchmarkUDP(b *testing.B) {
-	c, err := Dial("udp", "localhost:5555")
-
-	var event = &Event{
-		State:   "good",
-		Host:    "raidman",
-		Service: "benchmark",
-	}
-
-	if err == nil {
-		for i := 0; i < b.N; i++ {
-			c.Send(event)
-		}
-	}
-	c.Close()
-}
-
-func BenchmarkConcurrentTCP(b *testing.B) {
-	c, err := Dial("tcp", "localhost:5555")
-
-	var event = &Event{
-		Host:    "raidman",
-		Service: "tcp_concurrent",
-		Tags:    []string{"concurrent", "tcp", "benchmark"},
-	}
-
-	ch := make(chan int, b.N)
-	for i := 0; i < b.N; i++ {
-		go func(metric int) {
-			event.Metric = metric
-			err = c.Send(event)
-			ch <- i
-		}(i)
-	}
-	<-ch
-
-	c.Close()
-}
-
-func BenchmarkConcurrentUDP(b *testing.B) {
-	c, err := Dial("udp", "localhost:5555")
-
-	var event = &Event{
-		Host:    "raidman",
-		Service: "udp_concurrent",
-		Tags:    []string{"concurrent", "udp", "benchmark"},
-	}
-
-	ch := make(chan int, b.N)
-	for i := 0; i < b.N; i++ {
-		go func(metric int) {
-			event.Metric = metric
-			err = c.Send(event)
-			ch <- i
-		}(i)
-	}
-	<-ch
-
-	c.Close()
-}
diff --git a/Godeps/_workspace/src/github.com/armon/go-metrics/.gitignore b/Godeps/_workspace/src/github.com/armon/go-metrics/.gitignore
deleted file mode 100644
index 00268614f..000000000
--- a/Godeps/_workspace/src/github.com/armon/go-metrics/.gitignore
+++ /dev/null
@@ -1,22 +0,0 @@
-# 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
diff --git a/Godeps/_workspace/src/github.com/armon/go-metrics/LICENSE b/Godeps/_workspace/src/github.com/armon/go-metrics/LICENSE
deleted file mode 100644
index 106569e54..000000000
--- a/Godeps/_workspace/src/github.com/armon/go-metrics/LICENSE
+++ /dev/null
@@ -1,20 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2013 Armon Dadgar
-
-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/armon/go-metrics/README.md b/Godeps/_workspace/src/github.com/armon/go-metrics/README.md
deleted file mode 100644
index 7b6f23e29..000000000
--- a/Godeps/_workspace/src/github.com/armon/go-metrics/README.md
+++ /dev/null
@@ -1,71 +0,0 @@
-go-metrics
-==========
-
-This library provides a `metrics` package which can be used to instrument code,
-expose application metrics, and profile runtime performance in a flexible manner.
-
-Current API: [![GoDoc](https://godoc.org/github.com/armon/go-metrics?status.svg)](https://godoc.org/github.com/armon/go-metrics)
-
-Sinks
-=====
-
-The `metrics` package makes use of a `MetricSink` interface to support delivery
-to any type of backend. Currently the following sinks are provided:
-
-* StatsiteSink : Sinks to a [statsite](https://github.com/armon/statsite/) instance (TCP)
-* StatsdSink: Sinks to a [StatsD](https://github.com/etsy/statsd/) / statsite instance (UDP)
-* PrometheusSink: Sinks to a [Prometheus](http://prometheus.io/) metrics endpoint (exposed via HTTP for scrapes)
-* InmemSink : Provides in-memory aggregation, can be used to export stats
-* FanoutSink : Sinks to multiple sinks. Enables writing to multiple statsite instances for example.
-* BlackholeSink : Sinks to nowhere
-
-In addition to the sinks, the `InmemSignal` can be used to catch a signal,
-and dump a formatted output of recent metrics. For example, when a process gets
-a SIGUSR1, it can dump to stderr recent performance metrics for debugging.
-
-Examples
-========
-
-Here is an example of using the package:
-
-    func SlowMethod() {
-        // Profiling the runtime of a method
-        defer metrics.MeasureSince([]string{"SlowMethod"}, time.Now())
-    }
-
-    // Configure a statsite sink as the global metrics sink
-    sink, _ := metrics.NewStatsiteSink("statsite:8125")
-    metrics.NewGlobal(metrics.DefaultConfig("service-name"), sink)
-
-    // Emit a Key/Value pair
-    metrics.EmitKey([]string{"questions", "meaning of life"}, 42)
-
-
-Here is an example of setting up an signal handler:
-
-    // Setup the inmem sink and signal handler
-    inm := metrics.NewInmemSink(10*time.Second, time.Minute)
-    sig := metrics.DefaultInmemSignal(inm)
-    metrics.NewGlobal(metrics.DefaultConfig("service-name"), inm)
-
-    // Run some code
-    inm.SetGauge([]string{"foo"}, 42)
-    inm.EmitKey([]string{"bar"}, 30)
-
-    inm.IncrCounter([]string{"baz"}, 42)
-    inm.IncrCounter([]string{"baz"}, 1)
-    inm.IncrCounter([]string{"baz"}, 80)
-
-    inm.AddSample([]string{"method", "wow"}, 42)
-    inm.AddSample([]string{"method", "wow"}, 100)
-    inm.AddSample([]string{"method", "wow"}, 22)
-
-    ....
-
-When a signal comes in, output like the following will be dumped to stderr:
-
-    [2014-01-28 14:57:33.04 -0800 PST][G] 'foo': 42.000
-    [2014-01-28 14:57:33.04 -0800 PST][P] 'bar': 30.000
-    [2014-01-28 14:57:33.04 -0800 PST][C] 'baz': Count: 3 Min: 1.000 Mean: 41.000 Max: 80.000 Stddev: 39.509
-    [2014-01-28 14:57:33.04 -0800 PST][S] 'method.wow': Count: 3 Min: 22.000 Mean: 54.667 Max: 100.000 Stddev: 40.513
-
diff --git a/Godeps/_workspace/src/github.com/armon/go-metrics/const_unix.go b/Godeps/_workspace/src/github.com/armon/go-metrics/const_unix.go
deleted file mode 100644
index 31098dd57..000000000
--- a/Godeps/_workspace/src/github.com/armon/go-metrics/const_unix.go
+++ /dev/null
@@ -1,12 +0,0 @@
-// +build !windows
-
-package metrics
-
-import (
-	"syscall"
-)
-
-const (
-	// DefaultSignal is used with DefaultInmemSignal
-	DefaultSignal = syscall.SIGUSR1
-)
diff --git a/Godeps/_workspace/src/github.com/armon/go-metrics/const_windows.go b/Godeps/_workspace/src/github.com/armon/go-metrics/const_windows.go
deleted file mode 100644
index 38136af3e..000000000
--- a/Godeps/_workspace/src/github.com/armon/go-metrics/const_windows.go
+++ /dev/null
@@ -1,13 +0,0 @@
-// +build windows
-
-package metrics
-
-import (
-	"syscall"
-)
-
-const (
-	// DefaultSignal is used with DefaultInmemSignal
-	// Windows has no SIGUSR1, use SIGBREAK
-	DefaultSignal = syscall.Signal(21)
-)
diff --git a/Godeps/_workspace/src/github.com/armon/go-metrics/inmem.go b/Godeps/_workspace/src/github.com/armon/go-metrics/inmem.go
deleted file mode 100644
index da5032960..000000000
--- a/Godeps/_workspace/src/github.com/armon/go-metrics/inmem.go
+++ /dev/null
@@ -1,241 +0,0 @@
-package metrics
-
-import (
-	"fmt"
-	"math"
-	"strings"
-	"sync"
-	"time"
-)
-
-// InmemSink provides a MetricSink that does in-memory aggregation
-// without sending metrics over a network. It can be embedded within
-// an application to provide profiling information.
-type InmemSink struct {
-	// How long is each aggregation interval
-	interval time.Duration
-
-	// Retain controls how many metrics interval we keep
-	retain time.Duration
-
-	// maxIntervals is the maximum length of intervals.
-	// It is retain / interval.
-	maxIntervals int
-
-	// intervals is a slice of the retained intervals
-	intervals    []*IntervalMetrics
-	intervalLock sync.RWMutex
-}
-
-// IntervalMetrics stores the aggregated metrics
-// for a specific interval
-type IntervalMetrics struct {
-	sync.RWMutex
-
-	// The start time of the interval
-	Interval time.Time
-
-	// Gauges maps the key to the last set value
-	Gauges map[string]float32
-
-	// Points maps the string to the list of emitted values
-	// from EmitKey
-	Points map[string][]float32
-
-	// Counters maps the string key to a sum of the counter
-	// values
-	Counters map[string]*AggregateSample
-
-	// Samples maps the key to an AggregateSample,
-	// which has the rolled up view of a sample
-	Samples map[string]*AggregateSample
-}
-
-// NewIntervalMetrics creates a new IntervalMetrics for a given interval
-func NewIntervalMetrics(intv time.Time) *IntervalMetrics {
-	return &IntervalMetrics{
-		Interval: intv,
-		Gauges:   make(map[string]float32),
-		Points:   make(map[string][]float32),
-		Counters: make(map[string]*AggregateSample),
-		Samples:  make(map[string]*AggregateSample),
-	}
-}
-
-// AggregateSample is used to hold aggregate metrics
-// about a sample
-type AggregateSample struct {
-	Count       int       // The count of emitted pairs
-	Sum         float64   // The sum of values
-	SumSq       float64   // The sum of squared values
-	Min         float64   // Minimum value
-	Max         float64   // Maximum value
-	LastUpdated time.Time // When value was last updated
-}
-
-// Computes a Stddev of the values
-func (a *AggregateSample) Stddev() float64 {
-	num := (float64(a.Count) * a.SumSq) - math.Pow(a.Sum, 2)
-	div := float64(a.Count * (a.Count - 1))
-	if div == 0 {
-		return 0
-	}
-	return math.Sqrt(num / div)
-}
-
-// Computes a mean of the values
-func (a *AggregateSample) Mean() float64 {
-	if a.Count == 0 {
-		return 0
-	}
-	return a.Sum / float64(a.Count)
-}
-
-// Ingest is used to update a sample
-func (a *AggregateSample) Ingest(v float64) {
-	a.Count++
-	a.Sum += v
-	a.SumSq += (v * v)
-	if v < a.Min || a.Count == 1 {
-		a.Min = v
-	}
-	if v > a.Max || a.Count == 1 {
-		a.Max = v
-	}
-	a.LastUpdated = time.Now()
-}
-
-func (a *AggregateSample) String() string {
-	if a.Count == 0 {
-		return "Count: 0"
-	} else if a.Stddev() == 0 {
-		return fmt.Sprintf("Count: %d Sum: %0.3f LastUpdated: %s", a.Count, a.Sum, a.LastUpdated)
-	} else {
-		return fmt.Sprintf("Count: %d Min: %0.3f Mean: %0.3f Max: %0.3f Stddev: %0.3f Sum: %0.3f LastUpdated: %s",
-			a.Count, a.Min, a.Mean(), a.Max, a.Stddev(), a.Sum, a.LastUpdated)
-	}
-}
-
-// NewInmemSink is used to construct a new in-memory sink.
-// Uses an aggregation interval and maximum retention period.
-func NewInmemSink(interval, retain time.Duration) *InmemSink {
-	i := &InmemSink{
-		interval:     interval,
-		retain:       retain,
-		maxIntervals: int(retain / interval),
-	}
-	i.intervals = make([]*IntervalMetrics, 0, i.maxIntervals)
-	return i
-}
-
-func (i *InmemSink) SetGauge(key []string, val float32) {
-	k := i.flattenKey(key)
-	intv := i.getInterval()
-
-	intv.Lock()
-	defer intv.Unlock()
-	intv.Gauges[k] = val
-}
-
-func (i *InmemSink) EmitKey(key []string, val float32) {
-	k := i.flattenKey(key)
-	intv := i.getInterval()
-
-	intv.Lock()
-	defer intv.Unlock()
-	vals := intv.Points[k]
-	intv.Points[k] = append(vals, val)
-}
-
-func (i *InmemSink) IncrCounter(key []string, val float32) {
-	k := i.flattenKey(key)
-	intv := i.getInterval()
-
-	intv.Lock()
-	defer intv.Unlock()
-
-	agg := intv.Counters[k]
-	if agg == nil {
-		agg = &AggregateSample{}
-		intv.Counters[k] = agg
-	}
-	agg.Ingest(float64(val))
-}
-
-func (i *InmemSink) AddSample(key []string, val float32) {
-	k := i.flattenKey(key)
-	intv := i.getInterval()
-
-	intv.Lock()
-	defer intv.Unlock()
-
-	agg := intv.Samples[k]
-	if agg == nil {
-		agg = &AggregateSample{}
-		intv.Samples[k] = agg
-	}
-	agg.Ingest(float64(val))
-}
-
-// Data is used to retrieve all the aggregated metrics
-// Intervals may be in use, and a read lock should be acquired
-func (i *InmemSink) Data() []*IntervalMetrics {
-	// Get the current interval, forces creation
-	i.getInterval()
-
-	i.intervalLock.RLock()
-	defer i.intervalLock.RUnlock()
-
-	intervals := make([]*IntervalMetrics, len(i.intervals))
-	copy(intervals, i.intervals)
-	return intervals
-}
-
-func (i *InmemSink) getExistingInterval(intv time.Time) *IntervalMetrics {
-	i.intervalLock.RLock()
-	defer i.intervalLock.RUnlock()
-
-	n := len(i.intervals)
-	if n > 0 && i.intervals[n-1].Interval == intv {
-		return i.intervals[n-1]
-	}
-	return nil
-}
-
-func (i *InmemSink) createInterval(intv time.Time) *IntervalMetrics {
-	i.intervalLock.Lock()
-	defer i.intervalLock.Unlock()
-
-	// Check for an existing interval
-	n := len(i.intervals)
-	if n > 0 && i.intervals[n-1].Interval == intv {
-		return i.intervals[n-1]
-	}
-
-	// Add the current interval
-	current := NewIntervalMetrics(intv)
-	i.intervals = append(i.intervals, current)
-	n++
-
-	// Truncate the intervals if they are too long
-	if n >= i.maxIntervals {
-		copy(i.intervals[0:], i.intervals[n-i.maxIntervals:])
-		i.intervals = i.intervals[:i.maxIntervals]
-	}
-	return current
-}
-
-// getInterval returns the current interval to write to
-func (i *InmemSink) getInterval() *IntervalMetrics {
-	intv := time.Now().Truncate(i.interval)
-	if m := i.getExistingInterval(intv); m != nil {
-		return m
-	}
-	return i.createInterval(intv)
-}
-
-// Flattens the key for formatting, removes spaces
-func (i *InmemSink) flattenKey(parts []string) string {
-	joined := strings.Join(parts, ".")
-	return strings.Replace(joined, " ", "_", -1)
-}
diff --git a/Godeps/_workspace/src/github.com/armon/go-metrics/inmem_signal.go b/Godeps/_workspace/src/github.com/armon/go-metrics/inmem_signal.go
deleted file mode 100644
index 95d08ee10..000000000
--- a/Godeps/_workspace/src/github.com/armon/go-metrics/inmem_signal.go
+++ /dev/null
@@ -1,100 +0,0 @@
-package metrics
-
-import (
-	"bytes"
-	"fmt"
-	"io"
-	"os"
-	"os/signal"
-	"sync"
-	"syscall"
-)
-
-// InmemSignal is used to listen for a given signal, and when received,
-// to dump the current metrics from the InmemSink to an io.Writer
-type InmemSignal struct {
-	signal syscall.Signal
-	inm    *InmemSink
-	w      io.Writer
-	sigCh  chan os.Signal
-
-	stop     bool
-	stopCh   chan struct{}
-	stopLock sync.Mutex
-}
-
-// NewInmemSignal creates a new InmemSignal which listens for a given signal,
-// and dumps the current metrics out to a writer
-func NewInmemSignal(inmem *InmemSink, sig syscall.Signal, w io.Writer) *InmemSignal {
-	i := &InmemSignal{
-		signal: sig,
-		inm:    inmem,
-		w:      w,
-		sigCh:  make(chan os.Signal, 1),
-		stopCh: make(chan struct{}),
-	}
-	signal.Notify(i.sigCh, sig)
-	go i.run()
-	return i
-}
-
-// DefaultInmemSignal returns a new InmemSignal that responds to SIGUSR1
-// and writes output to stderr. Windows uses SIGBREAK
-func DefaultInmemSignal(inmem *InmemSink) *InmemSignal {
-	return NewInmemSignal(inmem, DefaultSignal, os.Stderr)
-}
-
-// Stop is used to stop the InmemSignal from listening
-func (i *InmemSignal) Stop() {
-	i.stopLock.Lock()
-	defer i.stopLock.Unlock()
-
-	if i.stop {
-		return
-	}
-	i.stop = true
-	close(i.stopCh)
-	signal.Stop(i.sigCh)
-}
-
-// run is a long running routine that handles signals
-func (i *InmemSignal) run() {
-	for {
-		select {
-		case <-i.sigCh:
-			i.dumpStats()
-		case <-i.stopCh:
-			return
-		}
-	}
-}
-
-// dumpStats is used to dump the data to output writer
-func (i *InmemSignal) dumpStats() {
-	buf := bytes.NewBuffer(nil)
-
-	data := i.inm.Data()
-	// Skip the last period which is still being aggregated
-	for i := 0; i < len(data)-1; i++ {
-		intv := data[i]
-		intv.RLock()
-		for name, val := range intv.Gauges {
-			fmt.Fprintf(buf, "[%v][G] '%s': %0.3f\n", intv.Interval, name, val)
-		}
-		for name, vals := range intv.Points {
-			for _, val := range vals {
-				fmt.Fprintf(buf, "[%v][P] '%s': %0.3f\n", intv.Interval, name, val)
-			}
-		}
-		for name, agg := range intv.Counters {
-			fmt.Fprintf(buf, "[%v][C] '%s': %s\n", intv.Interval, name, agg)
-		}
-		for name, agg := range intv.Samples {
-			fmt.Fprintf(buf, "[%v][S] '%s': %s\n", intv.Interval, name, agg)
-		}
-		intv.RUnlock()
-	}
-
-	// Write out the bytes
-	i.w.Write(buf.Bytes())
-}
diff --git a/Godeps/_workspace/src/github.com/armon/go-metrics/inmem_signal_test.go b/Godeps/_workspace/src/github.com/armon/go-metrics/inmem_signal_test.go
deleted file mode 100644
index 9bbca5f25..000000000
--- a/Godeps/_workspace/src/github.com/armon/go-metrics/inmem_signal_test.go
+++ /dev/null
@@ -1,46 +0,0 @@
-package metrics
-
-import (
-	"bytes"
-	"os"
-	"strings"
-	"syscall"
-	"testing"
-	"time"
-)
-
-func TestInmemSignal(t *testing.T) {
-	buf := bytes.NewBuffer(nil)
-	inm := NewInmemSink(10*time.Millisecond, 50*time.Millisecond)
-	sig := NewInmemSignal(inm, syscall.SIGUSR1, buf)
-	defer sig.Stop()
-
-	inm.SetGauge([]string{"foo"}, 42)
-	inm.EmitKey([]string{"bar"}, 42)
-	inm.IncrCounter([]string{"baz"}, 42)
-	inm.AddSample([]string{"wow"}, 42)
-
-	// Wait for period to end
-	time.Sleep(15 * time.Millisecond)
-
-	// Send signal!
-	syscall.Kill(os.Getpid(), syscall.SIGUSR1)
-
-	// Wait for flush
-	time.Sleep(10 * time.Millisecond)
-
-	// Check the output
-	out := string(buf.Bytes())
-	if !strings.Contains(out, "[G] 'foo': 42") {
-		t.Fatalf("bad: %v", out)
-	}
-	if !strings.Contains(out, "[P] 'bar': 42") {
-		t.Fatalf("bad: %v", out)
-	}
-	if !strings.Contains(out, "[C] 'baz': Count: 1 Sum: 42") {
-		t.Fatalf("bad: %v", out)
-	}
-	if !strings.Contains(out, "[S] 'wow': Count: 1 Sum: 42") {
-		t.Fatalf("bad: %v", out)
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/armon/go-metrics/inmem_test.go b/Godeps/_workspace/src/github.com/armon/go-metrics/inmem_test.go
deleted file mode 100644
index 228a2fc1a..000000000
--- a/Godeps/_workspace/src/github.com/armon/go-metrics/inmem_test.go
+++ /dev/null
@@ -1,104 +0,0 @@
-package metrics
-
-import (
-	"math"
-	"testing"
-	"time"
-)
-
-func TestInmemSink(t *testing.T) {
-	inm := NewInmemSink(10*time.Millisecond, 50*time.Millisecond)
-
-	data := inm.Data()
-	if len(data) != 1 {
-		t.Fatalf("bad: %v", data)
-	}
-
-	// Add data points
-	inm.SetGauge([]string{"foo", "bar"}, 42)
-	inm.EmitKey([]string{"foo", "bar"}, 42)
-	inm.IncrCounter([]string{"foo", "bar"}, 20)
-	inm.IncrCounter([]string{"foo", "bar"}, 22)
-	inm.AddSample([]string{"foo", "bar"}, 20)
-	inm.AddSample([]string{"foo", "bar"}, 22)
-
-	data = inm.Data()
-	if len(data) != 1 {
-		t.Fatalf("bad: %v", data)
-	}
-
-	intvM := data[0]
-	intvM.RLock()
-
-	if time.Now().Sub(intvM.Interval) > 10*time.Millisecond {
-		t.Fatalf("interval too old")
-	}
-	if intvM.Gauges["foo.bar"] != 42 {
-		t.Fatalf("bad val: %v", intvM.Gauges)
-	}
-	if intvM.Points["foo.bar"][0] != 42 {
-		t.Fatalf("bad val: %v", intvM.Points)
-	}
-
-	agg := intvM.Counters["foo.bar"]
-	if agg.Count != 2 {
-		t.Fatalf("bad val: %v", agg)
-	}
-	if agg.Sum != 42 {
-		t.Fatalf("bad val: %v", agg)
-	}
-	if agg.SumSq != 884 {
-		t.Fatalf("bad val: %v", agg)
-	}
-	if agg.Min != 20 {
-		t.Fatalf("bad val: %v", agg)
-	}
-	if agg.Max != 22 {
-		t.Fatalf("bad val: %v", agg)
-	}
-	if agg.Mean() != 21 {
-		t.Fatalf("bad val: %v", agg)
-	}
-	if agg.Stddev() != math.Sqrt(2) {
-		t.Fatalf("bad val: %v", agg)
-	}
-
-	if agg.LastUpdated.IsZero() {
-		t.Fatalf("agg.LastUpdated is not set: %v", agg)
-	}
-
-	diff := time.Now().Sub(agg.LastUpdated).Seconds()
-	if diff > 1 {
-		t.Fatalf("time diff too great: %f", diff)
-	}
-
-	if agg = intvM.Samples["foo.bar"]; agg == nil {
-		t.Fatalf("missing sample")
-	}
-
-	intvM.RUnlock()
-
-	for i := 1; i < 10; i++ {
-		time.Sleep(10 * time.Millisecond)
-		inm.SetGauge([]string{"foo", "bar"}, 42)
-		data = inm.Data()
-		if len(data) != min(i+1, 5) {
-			t.Fatalf("bad: %v", data)
-		}
-	}
-
-	// Should not exceed 5 intervals!
-	time.Sleep(10 * time.Millisecond)
-	inm.SetGauge([]string{"foo", "bar"}, 42)
-	data = inm.Data()
-	if len(data) != 5 {
-		t.Fatalf("bad: %v", data)
-	}
-}
-
-func min(a, b int) int {
-	if a < b {
-		return a
-	}
-	return b
-}
diff --git a/Godeps/_workspace/src/github.com/armon/go-metrics/metrics.go b/Godeps/_workspace/src/github.com/armon/go-metrics/metrics.go
deleted file mode 100644
index b818e4182..000000000
--- a/Godeps/_workspace/src/github.com/armon/go-metrics/metrics.go
+++ /dev/null
@@ -1,115 +0,0 @@
-package metrics
-
-import (
-	"runtime"
-	"time"
-)
-
-func (m *Metrics) SetGauge(key []string, val float32) {
-	if m.HostName != "" && m.EnableHostname {
-		key = insert(0, m.HostName, key)
-	}
-	if m.EnableTypePrefix {
-		key = insert(0, "gauge", key)
-	}
-	if m.ServiceName != "" {
-		key = insert(0, m.ServiceName, key)
-	}
-	m.sink.SetGauge(key, val)
-}
-
-func (m *Metrics) EmitKey(key []string, val float32) {
-	if m.EnableTypePrefix {
-		key = insert(0, "kv", key)
-	}
-	if m.ServiceName != "" {
-		key = insert(0, m.ServiceName, key)
-	}
-	m.sink.EmitKey(key, val)
-}
-
-func (m *Metrics) IncrCounter(key []string, val float32) {
-	if m.EnableTypePrefix {
-		key = insert(0, "counter", key)
-	}
-	if m.ServiceName != "" {
-		key = insert(0, m.ServiceName, key)
-	}
-	m.sink.IncrCounter(key, val)
-}
-
-func (m *Metrics) AddSample(key []string, val float32) {
-	if m.EnableTypePrefix {
-		key = insert(0, "sample", key)
-	}
-	if m.ServiceName != "" {
-		key = insert(0, m.ServiceName, key)
-	}
-	m.sink.AddSample(key, val)
-}
-
-func (m *Metrics) MeasureSince(key []string, start time.Time) {
-	if m.EnableTypePrefix {
-		key = insert(0, "timer", key)
-	}
-	if m.ServiceName != "" {
-		key = insert(0, m.ServiceName, key)
-	}
-	now := time.Now()
-	elapsed := now.Sub(start)
-	msec := float32(elapsed.Nanoseconds()) / float32(m.TimerGranularity)
-	m.sink.AddSample(key, msec)
-}
-
-// Periodically collects runtime stats to publish
-func (m *Metrics) collectStats() {
-	for {
-		time.Sleep(m.ProfileInterval)
-		m.emitRuntimeStats()
-	}
-}
-
-// Emits various runtime statsitics
-func (m *Metrics) emitRuntimeStats() {
-	// Export number of Goroutines
-	numRoutines := runtime.NumGoroutine()
-	m.SetGauge([]string{"runtime", "num_goroutines"}, float32(numRoutines))
-
-	// Export memory stats
-	var stats runtime.MemStats
-	runtime.ReadMemStats(&stats)
-	m.SetGauge([]string{"runtime", "alloc_bytes"}, float32(stats.Alloc))
-	m.SetGauge([]string{"runtime", "sys_bytes"}, float32(stats.Sys))
-	m.SetGauge([]string{"runtime", "malloc_count"}, float32(stats.Mallocs))
-	m.SetGauge([]string{"runtime", "free_count"}, float32(stats.Frees))
-	m.SetGauge([]string{"runtime", "heap_objects"}, float32(stats.HeapObjects))
-	m.SetGauge([]string{"runtime", "total_gc_pause_ns"}, float32(stats.PauseTotalNs))
-	m.SetGauge([]string{"runtime", "total_gc_runs"}, float32(stats.NumGC))
-
-	// Export info about the last few GC runs
-	num := stats.NumGC
-
-	// Handle wrap around
-	if num < m.lastNumGC {
-		m.lastNumGC = 0
-	}
-
-	// Ensure we don't scan more than 256
-	if num-m.lastNumGC >= 256 {
-		m.lastNumGC = num - 255
-	}
-
-	for i := m.lastNumGC; i < num; i++ {
-		pause := stats.PauseNs[i%256]
-		m.AddSample([]string{"runtime", "gc_pause_ns"}, float32(pause))
-	}
-	m.lastNumGC = num
-}
-
-// Inserts a string value at an index into the slice
-func insert(i int, v string, s []string) []string {
-	s = append(s, "")
-	copy(s[i+1:], s[i:])
-	s[i] = v
-	return s
-}
diff --git a/Godeps/_workspace/src/github.com/armon/go-metrics/metrics_test.go b/Godeps/_workspace/src/github.com/armon/go-metrics/metrics_test.go
deleted file mode 100644
index c7baf22bf..000000000
--- a/Godeps/_workspace/src/github.com/armon/go-metrics/metrics_test.go
+++ /dev/null
@@ -1,262 +0,0 @@
-package metrics
-
-import (
-	"reflect"
-	"runtime"
-	"testing"
-	"time"
-)
-
-func mockMetric() (*MockSink, *Metrics) {
-	m := &MockSink{}
-	met := &Metrics{sink: m}
-	return m, met
-}
-
-func TestMetrics_SetGauge(t *testing.T) {
-	m, met := mockMetric()
-	met.SetGauge([]string{"key"}, float32(1))
-	if m.keys[0][0] != "key" {
-		t.Fatalf("")
-	}
-	if m.vals[0] != 1 {
-		t.Fatalf("")
-	}
-
-	m, met = mockMetric()
-	met.HostName = "test"
-	met.EnableHostname = true
-	met.SetGauge([]string{"key"}, float32(1))
-	if m.keys[0][0] != "test" || m.keys[0][1] != "key" {
-		t.Fatalf("")
-	}
-	if m.vals[0] != 1 {
-		t.Fatalf("")
-	}
-
-	m, met = mockMetric()
-	met.EnableTypePrefix = true
-	met.SetGauge([]string{"key"}, float32(1))
-	if m.keys[0][0] != "gauge" || m.keys[0][1] != "key" {
-		t.Fatalf("")
-	}
-	if m.vals[0] != 1 {
-		t.Fatalf("")
-	}
-
-	m, met = mockMetric()
-	met.ServiceName = "service"
-	met.SetGauge([]string{"key"}, float32(1))
-	if m.keys[0][0] != "service" || m.keys[0][1] != "key" {
-		t.Fatalf("")
-	}
-	if m.vals[0] != 1 {
-		t.Fatalf("")
-	}
-}
-
-func TestMetrics_EmitKey(t *testing.T) {
-	m, met := mockMetric()
-	met.EmitKey([]string{"key"}, float32(1))
-	if m.keys[0][0] != "key" {
-		t.Fatalf("")
-	}
-	if m.vals[0] != 1 {
-		t.Fatalf("")
-	}
-
-	m, met = mockMetric()
-	met.EnableTypePrefix = true
-	met.EmitKey([]string{"key"}, float32(1))
-	if m.keys[0][0] != "kv" || m.keys[0][1] != "key" {
-		t.Fatalf("")
-	}
-	if m.vals[0] != 1 {
-		t.Fatalf("")
-	}
-
-	m, met = mockMetric()
-	met.ServiceName = "service"
-	met.EmitKey([]string{"key"}, float32(1))
-	if m.keys[0][0] != "service" || m.keys[0][1] != "key" {
-		t.Fatalf("")
-	}
-	if m.vals[0] != 1 {
-		t.Fatalf("")
-	}
-}
-
-func TestMetrics_IncrCounter(t *testing.T) {
-	m, met := mockMetric()
-	met.IncrCounter([]string{"key"}, float32(1))
-	if m.keys[0][0] != "key" {
-		t.Fatalf("")
-	}
-	if m.vals[0] != 1 {
-		t.Fatalf("")
-	}
-
-	m, met = mockMetric()
-	met.EnableTypePrefix = true
-	met.IncrCounter([]string{"key"}, float32(1))
-	if m.keys[0][0] != "counter" || m.keys[0][1] != "key" {
-		t.Fatalf("")
-	}
-	if m.vals[0] != 1 {
-		t.Fatalf("")
-	}
-
-	m, met = mockMetric()
-	met.ServiceName = "service"
-	met.IncrCounter([]string{"key"}, float32(1))
-	if m.keys[0][0] != "service" || m.keys[0][1] != "key" {
-		t.Fatalf("")
-	}
-	if m.vals[0] != 1 {
-		t.Fatalf("")
-	}
-}
-
-func TestMetrics_AddSample(t *testing.T) {
-	m, met := mockMetric()
-	met.AddSample([]string{"key"}, float32(1))
-	if m.keys[0][0] != "key" {
-		t.Fatalf("")
-	}
-	if m.vals[0] != 1 {
-		t.Fatalf("")
-	}
-
-	m, met = mockMetric()
-	met.EnableTypePrefix = true
-	met.AddSample([]string{"key"}, float32(1))
-	if m.keys[0][0] != "sample" || m.keys[0][1] != "key" {
-		t.Fatalf("")
-	}
-	if m.vals[0] != 1 {
-		t.Fatalf("")
-	}
-
-	m, met = mockMetric()
-	met.ServiceName = "service"
-	met.AddSample([]string{"key"}, float32(1))
-	if m.keys[0][0] != "service" || m.keys[0][1] != "key" {
-		t.Fatalf("")
-	}
-	if m.vals[0] != 1 {
-		t.Fatalf("")
-	}
-}
-
-func TestMetrics_MeasureSince(t *testing.T) {
-	m, met := mockMetric()
-	met.TimerGranularity = time.Millisecond
-	n := time.Now()
-	met.MeasureSince([]string{"key"}, n)
-	if m.keys[0][0] != "key" {
-		t.Fatalf("")
-	}
-	if m.vals[0] > 0.1 {
-		t.Fatalf("")
-	}
-
-	m, met = mockMetric()
-	met.TimerGranularity = time.Millisecond
-	met.EnableTypePrefix = true
-	met.MeasureSince([]string{"key"}, n)
-	if m.keys[0][0] != "timer" || m.keys[0][1] != "key" {
-		t.Fatalf("")
-	}
-	if m.vals[0] > 0.1 {
-		t.Fatalf("")
-	}
-
-	m, met = mockMetric()
-	met.TimerGranularity = time.Millisecond
-	met.ServiceName = "service"
-	met.MeasureSince([]string{"key"}, n)
-	if m.keys[0][0] != "service" || m.keys[0][1] != "key" {
-		t.Fatalf("")
-	}
-	if m.vals[0] > 0.1 {
-		t.Fatalf("")
-	}
-}
-
-func TestMetrics_EmitRuntimeStats(t *testing.T) {
-	runtime.GC()
-	m, met := mockMetric()
-	met.emitRuntimeStats()
-
-	if m.keys[0][0] != "runtime" || m.keys[0][1] != "num_goroutines" {
-		t.Fatalf("bad key %v", m.keys)
-	}
-	if m.vals[0] <= 1 {
-		t.Fatalf("bad val: %v", m.vals)
-	}
-
-	if m.keys[1][0] != "runtime" || m.keys[1][1] != "alloc_bytes" {
-		t.Fatalf("bad key %v", m.keys)
-	}
-	if m.vals[1] <= 40000 {
-		t.Fatalf("bad val: %v", m.vals)
-	}
-
-	if m.keys[2][0] != "runtime" || m.keys[2][1] != "sys_bytes" {
-		t.Fatalf("bad key %v", m.keys)
-	}
-	if m.vals[2] <= 100000 {
-		t.Fatalf("bad val: %v", m.vals)
-	}
-
-	if m.keys[3][0] != "runtime" || m.keys[3][1] != "malloc_count" {
-		t.Fatalf("bad key %v", m.keys)
-	}
-	if m.vals[3] <= 100 {
-		t.Fatalf("bad val: %v", m.vals)
-	}
-
-	if m.keys[4][0] != "runtime" || m.keys[4][1] != "free_count" {
-		t.Fatalf("bad key %v", m.keys)
-	}
-	if m.vals[4] <= 100 {
-		t.Fatalf("bad val: %v", m.vals)
-	}
-
-	if m.keys[5][0] != "runtime" || m.keys[5][1] != "heap_objects" {
-		t.Fatalf("bad key %v", m.keys)
-	}
-	if m.vals[5] <= 100 {
-		t.Fatalf("bad val: %v", m.vals)
-	}
-
-	if m.keys[6][0] != "runtime" || m.keys[6][1] != "total_gc_pause_ns" {
-		t.Fatalf("bad key %v", m.keys)
-	}
-	if m.vals[6] <= 100000 {
-		t.Fatalf("bad val: %v", m.vals)
-	}
-
-	if m.keys[7][0] != "runtime" || m.keys[7][1] != "total_gc_runs" {
-		t.Fatalf("bad key %v", m.keys)
-	}
-	if m.vals[7] <= 1 {
-		t.Fatalf("bad val: %v", m.vals)
-	}
-
-	if m.keys[8][0] != "runtime" || m.keys[8][1] != "gc_pause_ns" {
-		t.Fatalf("bad key %v", m.keys)
-	}
-	if m.vals[8] <= 1000 {
-		t.Fatalf("bad val: %v", m.vals)
-	}
-}
-
-func TestInsert(t *testing.T) {
-	k := []string{"hi", "bob"}
-	exp := []string{"hi", "there", "bob"}
-	out := insert(1, "there", k)
-	if !reflect.DeepEqual(exp, out) {
-		t.Fatalf("bad insert %v %v", exp, out)
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/armon/go-metrics/prometheus/prometheus.go b/Godeps/_workspace/src/github.com/armon/go-metrics/prometheus/prometheus.go
deleted file mode 100644
index 362dbfb62..000000000
--- a/Godeps/_workspace/src/github.com/armon/go-metrics/prometheus/prometheus.go
+++ /dev/null
@@ -1,88 +0,0 @@
-// +build go1.3
-package prometheus
-
-import (
-	"strings"
-	"sync"
-	"time"
-
-	"github.com/prometheus/client_golang/prometheus"
-)
-
-type PrometheusSink struct {
-	mu        sync.Mutex
-	gauges    map[string]prometheus.Gauge
-	summaries map[string]prometheus.Summary
-	counters  map[string]prometheus.Counter
-}
-
-func NewPrometheusSink() (*PrometheusSink, error) {
-	return &PrometheusSink{
-		gauges:    make(map[string]prometheus.Gauge),
-		summaries: make(map[string]prometheus.Summary),
-		counters:  make(map[string]prometheus.Counter),
-	}, nil
-}
-
-func (p *PrometheusSink) flattenKey(parts []string) string {
-	joined := strings.Join(parts, "_")
-	joined = strings.Replace(joined, " ", "_", -1)
-	joined = strings.Replace(joined, ".", "_", -1)
-	joined = strings.Replace(joined, "-", "_", -1)
-	return joined
-}
-
-func (p *PrometheusSink) SetGauge(parts []string, val float32) {
-	p.mu.Lock()
-	defer p.mu.Unlock()
-	key := p.flattenKey(parts)
-	g, ok := p.gauges[key]
-	if !ok {
-		g = prometheus.NewGauge(prometheus.GaugeOpts{
-			Name: key,
-			Help: key,
-		})
-		prometheus.MustRegister(g)
-		p.gauges[key] = g
-	}
-	g.Set(float64(val))
-}
-
-func (p *PrometheusSink) AddSample(parts []string, val float32) {
-	p.mu.Lock()
-	defer p.mu.Unlock()
-	key := p.flattenKey(parts)
-	g, ok := p.summaries[key]
-	if !ok {
-		g = prometheus.NewSummary(prometheus.SummaryOpts{
-			Name:   key,
-			Help:   key,
-			MaxAge: 10 * time.Second,
-		})
-		prometheus.MustRegister(g)
-		p.summaries[key] = g
-	}
-	g.Observe(float64(val))
-}
-
-// EmitKey is not implemented. Prometheus doesn’t offer a type for which an
-// arbitrary number of values is retained, as Prometheus works with a pull
-// model, rather than a push model.
-func (p *PrometheusSink) EmitKey(key []string, val float32) {
-}
-
-func (p *PrometheusSink) IncrCounter(parts []string, val float32) {
-	p.mu.Lock()
-	defer p.mu.Unlock()
-	key := p.flattenKey(parts)
-	g, ok := p.counters[key]
-	if !ok {
-		g = prometheus.NewCounter(prometheus.CounterOpts{
-			Name: key,
-			Help: key,
-		})
-		prometheus.MustRegister(g)
-		p.counters[key] = g
-	}
-	g.Add(float64(val))
-}
diff --git a/Godeps/_workspace/src/github.com/armon/go-metrics/sink.go b/Godeps/_workspace/src/github.com/armon/go-metrics/sink.go
deleted file mode 100644
index 0c240c2c4..000000000
--- a/Godeps/_workspace/src/github.com/armon/go-metrics/sink.go
+++ /dev/null
@@ -1,52 +0,0 @@
-package metrics
-
-// The MetricSink interface is used to transmit metrics information
-// to an external system
-type MetricSink interface {
-	// A Gauge should retain the last value it is set to
-	SetGauge(key []string, val float32)
-
-	// Should emit a Key/Value pair for each call
-	EmitKey(key []string, val float32)
-
-	// Counters should accumulate values
-	IncrCounter(key []string, val float32)
-
-	// Samples are for timing information, where quantiles are used
-	AddSample(key []string, val float32)
-}
-
-// BlackholeSink is used to just blackhole messages
-type BlackholeSink struct{}
-
-func (*BlackholeSink) SetGauge(key []string, val float32)    {}
-func (*BlackholeSink) EmitKey(key []string, val float32)     {}
-func (*BlackholeSink) IncrCounter(key []string, val float32) {}
-func (*BlackholeSink) AddSample(key []string, val float32)   {}
-
-// FanoutSink is used to sink to fanout values to multiple sinks
-type FanoutSink []MetricSink
-
-func (fh FanoutSink) SetGauge(key []string, val float32) {
-	for _, s := range fh {
-		s.SetGauge(key, val)
-	}
-}
-
-func (fh FanoutSink) EmitKey(key []string, val float32) {
-	for _, s := range fh {
-		s.EmitKey(key, val)
-	}
-}
-
-func (fh FanoutSink) IncrCounter(key []string, val float32) {
-	for _, s := range fh {
-		s.IncrCounter(key, val)
-	}
-}
-
-func (fh FanoutSink) AddSample(key []string, val float32) {
-	for _, s := range fh {
-		s.AddSample(key, val)
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/armon/go-metrics/sink_test.go b/Godeps/_workspace/src/github.com/armon/go-metrics/sink_test.go
deleted file mode 100644
index 15c5d771a..000000000
--- a/Godeps/_workspace/src/github.com/armon/go-metrics/sink_test.go
+++ /dev/null
@@ -1,120 +0,0 @@
-package metrics
-
-import (
-	"reflect"
-	"testing"
-)
-
-type MockSink struct {
-	keys [][]string
-	vals []float32
-}
-
-func (m *MockSink) SetGauge(key []string, val float32) {
-	m.keys = append(m.keys, key)
-	m.vals = append(m.vals, val)
-}
-func (m *MockSink) EmitKey(key []string, val float32) {
-	m.keys = append(m.keys, key)
-	m.vals = append(m.vals, val)
-}
-func (m *MockSink) IncrCounter(key []string, val float32) {
-	m.keys = append(m.keys, key)
-	m.vals = append(m.vals, val)
-}
-func (m *MockSink) AddSample(key []string, val float32) {
-	m.keys = append(m.keys, key)
-	m.vals = append(m.vals, val)
-}
-
-func TestFanoutSink_Gauge(t *testing.T) {
-	m1 := &MockSink{}
-	m2 := &MockSink{}
-	fh := &FanoutSink{m1, m2}
-
-	k := []string{"test"}
-	v := float32(42.0)
-	fh.SetGauge(k, v)
-
-	if !reflect.DeepEqual(m1.keys[0], k) {
-		t.Fatalf("key not equal")
-	}
-	if !reflect.DeepEqual(m2.keys[0], k) {
-		t.Fatalf("key not equal")
-	}
-	if !reflect.DeepEqual(m1.vals[0], v) {
-		t.Fatalf("val not equal")
-	}
-	if !reflect.DeepEqual(m2.vals[0], v) {
-		t.Fatalf("val not equal")
-	}
-}
-
-func TestFanoutSink_Key(t *testing.T) {
-	m1 := &MockSink{}
-	m2 := &MockSink{}
-	fh := &FanoutSink{m1, m2}
-
-	k := []string{"test"}
-	v := float32(42.0)
-	fh.EmitKey(k, v)
-
-	if !reflect.DeepEqual(m1.keys[0], k) {
-		t.Fatalf("key not equal")
-	}
-	if !reflect.DeepEqual(m2.keys[0], k) {
-		t.Fatalf("key not equal")
-	}
-	if !reflect.DeepEqual(m1.vals[0], v) {
-		t.Fatalf("val not equal")
-	}
-	if !reflect.DeepEqual(m2.vals[0], v) {
-		t.Fatalf("val not equal")
-	}
-}
-
-func TestFanoutSink_Counter(t *testing.T) {
-	m1 := &MockSink{}
-	m2 := &MockSink{}
-	fh := &FanoutSink{m1, m2}
-
-	k := []string{"test"}
-	v := float32(42.0)
-	fh.IncrCounter(k, v)
-
-	if !reflect.DeepEqual(m1.keys[0], k) {
-		t.Fatalf("key not equal")
-	}
-	if !reflect.DeepEqual(m2.keys[0], k) {
-		t.Fatalf("key not equal")
-	}
-	if !reflect.DeepEqual(m1.vals[0], v) {
-		t.Fatalf("val not equal")
-	}
-	if !reflect.DeepEqual(m2.vals[0], v) {
-		t.Fatalf("val not equal")
-	}
-}
-
-func TestFanoutSink_Sample(t *testing.T) {
-	m1 := &MockSink{}
-	m2 := &MockSink{}
-	fh := &FanoutSink{m1, m2}
-
-	k := []string{"test"}
-	v := float32(42.0)
-	fh.AddSample(k, v)
-
-	if !reflect.DeepEqual(m1.keys[0], k) {
-		t.Fatalf("key not equal")
-	}
-	if !reflect.DeepEqual(m2.keys[0], k) {
-		t.Fatalf("key not equal")
-	}
-	if !reflect.DeepEqual(m1.vals[0], v) {
-		t.Fatalf("val not equal")
-	}
-	if !reflect.DeepEqual(m2.vals[0], v) {
-		t.Fatalf("val not equal")
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/armon/go-metrics/start.go b/Godeps/_workspace/src/github.com/armon/go-metrics/start.go
deleted file mode 100644
index 44113f100..000000000
--- a/Godeps/_workspace/src/github.com/armon/go-metrics/start.go
+++ /dev/null
@@ -1,95 +0,0 @@
-package metrics
-
-import (
-	"os"
-	"time"
-)
-
-// Config is used to configure metrics settings
-type Config struct {
-	ServiceName          string        // Prefixed with keys to seperate services
-	HostName             string        // Hostname to use. If not provided and EnableHostname, it will be os.Hostname
-	EnableHostname       bool          // Enable prefixing gauge values with hostname
-	EnableRuntimeMetrics bool          // Enables profiling of runtime metrics (GC, Goroutines, Memory)
-	EnableTypePrefix     bool          // Prefixes key with a type ("counter", "gauge", "timer")
-	TimerGranularity     time.Duration // Granularity of timers.
-	ProfileInterval      time.Duration // Interval to profile runtime metrics
-}
-
-// Metrics represents an instance of a metrics sink that can
-// be used to emit
-type Metrics struct {
-	Config
-	lastNumGC uint32
-	sink      MetricSink
-}
-
-// Shared global metrics instance
-var globalMetrics *Metrics
-
-func init() {
-	// Initialize to a blackhole sink to avoid errors
-	globalMetrics = &Metrics{sink: &BlackholeSink{}}
-}
-
-// DefaultConfig provides a sane default configuration
-func DefaultConfig(serviceName string) *Config {
-	c := &Config{
-		ServiceName:          serviceName, // Use client provided service
-		HostName:             "",
-		EnableHostname:       true,             // Enable hostname prefix
-		EnableRuntimeMetrics: true,             // Enable runtime profiling
-		EnableTypePrefix:     false,            // Disable type prefix
-		TimerGranularity:     time.Millisecond, // Timers are in milliseconds
-		ProfileInterval:      time.Second,      // Poll runtime every second
-	}
-
-	// Try to get the hostname
-	name, _ := os.Hostname()
-	c.HostName = name
-	return c
-}
-
-// New is used to create a new instance of Metrics
-func New(conf *Config, sink MetricSink) (*Metrics, error) {
-	met := &Metrics{}
-	met.Config = *conf
-	met.sink = sink
-
-	// Start the runtime collector
-	if conf.EnableRuntimeMetrics {
-		go met.collectStats()
-	}
-	return met, nil
-}
-
-// NewGlobal is the same as New, but it assigns the metrics object to be
-// used globally as well as returning it.
-func NewGlobal(conf *Config, sink MetricSink) (*Metrics, error) {
-	metrics, err := New(conf, sink)
-	if err == nil {
-		globalMetrics = metrics
-	}
-	return metrics, err
-}
-
-// Proxy all the methods to the globalMetrics instance
-func SetGauge(key []string, val float32) {
-	globalMetrics.SetGauge(key, val)
-}
-
-func EmitKey(key []string, val float32) {
-	globalMetrics.EmitKey(key, val)
-}
-
-func IncrCounter(key []string, val float32) {
-	globalMetrics.IncrCounter(key, val)
-}
-
-func AddSample(key []string, val float32) {
-	globalMetrics.AddSample(key, val)
-}
-
-func MeasureSince(key []string, start time.Time) {
-	globalMetrics.MeasureSince(key, start)
-}
diff --git a/Godeps/_workspace/src/github.com/armon/go-metrics/start_test.go b/Godeps/_workspace/src/github.com/armon/go-metrics/start_test.go
deleted file mode 100644
index 8b3210c15..000000000
--- a/Godeps/_workspace/src/github.com/armon/go-metrics/start_test.go
+++ /dev/null
@@ -1,110 +0,0 @@
-package metrics
-
-import (
-	"reflect"
-	"testing"
-	"time"
-)
-
-func TestDefaultConfig(t *testing.T) {
-	conf := DefaultConfig("service")
-	if conf.ServiceName != "service" {
-		t.Fatalf("Bad name")
-	}
-	if conf.HostName == "" {
-		t.Fatalf("missing hostname")
-	}
-	if !conf.EnableHostname || !conf.EnableRuntimeMetrics {
-		t.Fatalf("expect true")
-	}
-	if conf.EnableTypePrefix {
-		t.Fatalf("expect false")
-	}
-	if conf.TimerGranularity != time.Millisecond {
-		t.Fatalf("bad granularity")
-	}
-	if conf.ProfileInterval != time.Second {
-		t.Fatalf("bad interval")
-	}
-}
-
-func Test_GlobalMetrics_SetGauge(t *testing.T) {
-	m := &MockSink{}
-	globalMetrics = &Metrics{sink: m}
-
-	k := []string{"test"}
-	v := float32(42.0)
-	SetGauge(k, v)
-
-	if !reflect.DeepEqual(m.keys[0], k) {
-		t.Fatalf("key not equal")
-	}
-	if !reflect.DeepEqual(m.vals[0], v) {
-		t.Fatalf("val not equal")
-	}
-}
-
-func Test_GlobalMetrics_EmitKey(t *testing.T) {
-	m := &MockSink{}
-	globalMetrics = &Metrics{sink: m}
-
-	k := []string{"test"}
-	v := float32(42.0)
-	EmitKey(k, v)
-
-	if !reflect.DeepEqual(m.keys[0], k) {
-		t.Fatalf("key not equal")
-	}
-	if !reflect.DeepEqual(m.vals[0], v) {
-		t.Fatalf("val not equal")
-	}
-}
-
-func Test_GlobalMetrics_IncrCounter(t *testing.T) {
-	m := &MockSink{}
-	globalMetrics = &Metrics{sink: m}
-
-	k := []string{"test"}
-	v := float32(42.0)
-	IncrCounter(k, v)
-
-	if !reflect.DeepEqual(m.keys[0], k) {
-		t.Fatalf("key not equal")
-	}
-	if !reflect.DeepEqual(m.vals[0], v) {
-		t.Fatalf("val not equal")
-	}
-}
-
-func Test_GlobalMetrics_AddSample(t *testing.T) {
-	m := &MockSink{}
-	globalMetrics = &Metrics{sink: m}
-
-	k := []string{"test"}
-	v := float32(42.0)
-	AddSample(k, v)
-
-	if !reflect.DeepEqual(m.keys[0], k) {
-		t.Fatalf("key not equal")
-	}
-	if !reflect.DeepEqual(m.vals[0], v) {
-		t.Fatalf("val not equal")
-	}
-}
-
-func Test_GlobalMetrics_MeasureSince(t *testing.T) {
-	m := &MockSink{}
-	globalMetrics = &Metrics{sink: m}
-	globalMetrics.TimerGranularity = time.Millisecond
-
-	k := []string{"test"}
-	now := time.Now()
-	MeasureSince(k, now)
-
-	if !reflect.DeepEqual(m.keys[0], k) {
-		t.Fatalf("key not equal")
-	}
-	if m.vals[0] > 0.1 {
-		t.Fatalf("val too large %v", m.vals[0])
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/armon/go-metrics/statsd.go b/Godeps/_workspace/src/github.com/armon/go-metrics/statsd.go
deleted file mode 100644
index 65a5021a0..000000000
--- a/Godeps/_workspace/src/github.com/armon/go-metrics/statsd.go
+++ /dev/null
@@ -1,154 +0,0 @@
-package metrics
-
-import (
-	"bytes"
-	"fmt"
-	"log"
-	"net"
-	"strings"
-	"time"
-)
-
-const (
-	// statsdMaxLen is the maximum size of a packet
-	// to send to statsd
-	statsdMaxLen = 1400
-)
-
-// StatsdSink provides a MetricSink that can be used
-// with a statsite or statsd metrics server. It uses
-// only UDP packets, while StatsiteSink uses TCP.
-type StatsdSink struct {
-	addr        string
-	metricQueue chan string
-}
-
-// NewStatsdSink is used to create a new StatsdSink
-func NewStatsdSink(addr string) (*StatsdSink, error) {
-	s := &StatsdSink{
-		addr:        addr,
-		metricQueue: make(chan string, 4096),
-	}
-	go s.flushMetrics()
-	return s, nil
-}
-
-// Close is used to stop flushing to statsd
-func (s *StatsdSink) Shutdown() {
-	close(s.metricQueue)
-}
-
-func (s *StatsdSink) SetGauge(key []string, val float32) {
-	flatKey := s.flattenKey(key)
-	s.pushMetric(fmt.Sprintf("%s:%f|g\n", flatKey, val))
-}
-
-func (s *StatsdSink) EmitKey(key []string, val float32) {
-	flatKey := s.flattenKey(key)
-	s.pushMetric(fmt.Sprintf("%s:%f|kv\n", flatKey, val))
-}
-
-func (s *StatsdSink) IncrCounter(key []string, val float32) {
-	flatKey := s.flattenKey(key)
-	s.pushMetric(fmt.Sprintf("%s:%f|c\n", flatKey, val))
-}
-
-func (s *StatsdSink) AddSample(key []string, val float32) {
-	flatKey := s.flattenKey(key)
-	s.pushMetric(fmt.Sprintf("%s:%f|ms\n", flatKey, val))
-}
-
-// Flattens the key for formatting, removes spaces
-func (s *StatsdSink) flattenKey(parts []string) string {
-	joined := strings.Join(parts, ".")
-	return strings.Map(func(r rune) rune {
-		switch r {
-		case ':':
-			fallthrough
-		case ' ':
-			return '_'
-		default:
-			return r
-		}
-	}, joined)
-}
-
-// Does a non-blocking push to the metrics queue
-func (s *StatsdSink) pushMetric(m string) {
-	select {
-	case s.metricQueue <- m:
-	default:
-	}
-}
-
-// Flushes metrics
-func (s *StatsdSink) flushMetrics() {
-	var sock net.Conn
-	var err error
-	var wait <-chan time.Time
-	ticker := time.NewTicker(flushInterval)
-	defer ticker.Stop()
-
-CONNECT:
-	// Create a buffer
-	buf := bytes.NewBuffer(nil)
-
-	// Attempt to connect
-	sock, err = net.Dial("udp", s.addr)
-	if err != nil {
-		log.Printf("[ERR] Error connecting to statsd! Err: %s", err)
-		goto WAIT
-	}
-
-	for {
-		select {
-		case metric, ok := <-s.metricQueue:
-			// Get a metric from the queue
-			if !ok {
-				goto QUIT
-			}
-
-			// Check if this would overflow the packet size
-			if len(metric)+buf.Len() > statsdMaxLen {
-				_, err := sock.Write(buf.Bytes())
-				buf.Reset()
-				if err != nil {
-					log.Printf("[ERR] Error writing to statsd! Err: %s", err)
-					goto WAIT
-				}
-			}
-
-			// Append to the buffer
-			buf.WriteString(metric)
-
-		case <-ticker.C:
-			if buf.Len() == 0 {
-				continue
-			}
-
-			_, err := sock.Write(buf.Bytes())
-			buf.Reset()
-			if err != nil {
-				log.Printf("[ERR] Error flushing to statsd! Err: %s", err)
-				goto WAIT
-			}
-		}
-	}
-
-WAIT:
-	// Wait for a while
-	wait = time.After(time.Duration(5) * time.Second)
-	for {
-		select {
-		// Dequeue the messages to avoid backlog
-		case _, ok := <-s.metricQueue:
-			if !ok {
-				goto QUIT
-			}
-		case <-wait:
-			goto CONNECT
-		}
-	}
-QUIT:
-	s.metricQueue = nil
-}
diff --git a/Godeps/_workspace/src/github.com/armon/go-metrics/statsd_test.go b/Godeps/_workspace/src/github.com/armon/go-metrics/statsd_test.go
deleted file mode 100644
index 622eb5d3a..000000000
--- a/Godeps/_workspace/src/github.com/armon/go-metrics/statsd_test.go
+++ /dev/null
@@ -1,105 +0,0 @@
-package metrics
-
-import (
-	"bufio"
-	"bytes"
-	"net"
-	"testing"
-	"time"
-)
-
-func TestStatsd_Flatten(t *testing.T) {
-	s := &StatsdSink{}
-	flat := s.flattenKey([]string{"a", "b", "c", "d"})
-	if flat != "a.b.c.d" {
-		t.Fatalf("Bad flat")
-	}
-}
-
-func TestStatsd_PushFullQueue(t *testing.T) {
-	q := make(chan string, 1)
-	q <- "full"
-
-	s := &StatsdSink{metricQueue: q}
-	s.pushMetric("omit")
-
-	out := <-q
-	if out != "full" {
-		t.Fatalf("bad val %v", out)
-	}
-
-	select {
-	case v := <-q:
-		t.Fatalf("bad val %v", v)
-	default:
-	}
-}
-
-func TestStatsd_Conn(t *testing.T) {
-	addr := "127.0.0.1:7524"
-	done := make(chan bool)
-	go func() {
-		list, err := net.ListenUDP("udp", &net.UDPAddr{IP: net.ParseIP("127.0.0.1"), Port: 7524})
-		if err != nil {
-			panic(err)
-		}
-		defer list.Close()
-		buf := make([]byte, 1500)
-		n, err := list.Read(buf)
-		if err != nil {
-			panic(err)
-		}
-		buf = buf[:n]
-		reader := bufio.NewReader(bytes.NewReader(buf))
-
-		line, err := reader.ReadString('\n')
-		if err != nil {
-			t.Fatalf("unexpected err %s", err)
-		}
-		if line != "gauge.val:1.000000|g\n" {
-			t.Fatalf("bad line %s", line)
-		}
-
-		line, err = reader.ReadString('\n')
-		if err != nil {
-			t.Fatalf("unexpected err %s", err)
-		}
-		if line != "key.other:2.000000|kv\n" {
-			t.Fatalf("bad line %s", line)
-		}
-
-		line, err = reader.ReadString('\n')
-		if err != nil {
-			t.Fatalf("unexpected err %s", err)
-		}
-		if line != "counter.me:3.000000|c\n" {
-			t.Fatalf("bad line %s", line)
-		}
-
-		line, err = reader.ReadString('\n')
-		if err != nil {
-			t.Fatalf("unexpected err %s", err)
-		}
-		if line != "sample.slow_thingy:4.000000|ms\n" {
-			t.Fatalf("bad line %s", line)
-		}
-
-		done <- true
-	}()
-	s, err := NewStatsdSink(addr)
-	if err != nil {
-		t.Fatalf("bad error")
-	}
-
-	s.SetGauge([]string{"gauge", "val"}, float32(1))
-	s.EmitKey([]string{"key", "other"}, float32(2))
-	s.IncrCounter([]string{"counter", "me"}, float32(3))
-	s.AddSample([]string{"sample", "slow thingy"}, float32(4))
-
-	select {
-	case <-done:
-		s.Shutdown()
-	case <-time.After(3 * time.Second):
-		t.Fatalf("timeout")
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/armon/go-metrics/statsite.go b/Godeps/_workspace/src/github.com/armon/go-metrics/statsite.go
deleted file mode 100644
index 68730139a..000000000
--- a/Godeps/_workspace/src/github.com/armon/go-metrics/statsite.go
+++ /dev/null
@@ -1,142 +0,0 @@
-package metrics
-
-import (
-	"bufio"
-	"fmt"
-	"log"
-	"net"
-	"strings"
-	"time"
-)
-
-const (
-	// We force flush the statsite metrics after this period of
-	// inactivity. Prevents stats from getting stuck in a buffer
-	// forever.
-	flushInterval = 100 * time.Millisecond
-)
-
-// StatsiteSink provides a MetricSink that can be used with a
-// statsite metrics server
-type StatsiteSink struct {
-	addr        string
-	metricQueue chan string
-}
-
-// NewStatsiteSink is used to create a new StatsiteSink
-func NewStatsiteSink(addr string) (*StatsiteSink, error) {
-	s := &StatsiteSink{
-		addr:        addr,
-		metricQueue: make(chan string, 4096),
-	}
-	go s.flushMetrics()
-	return s, nil
-}
-
-// Close is used to stop flushing to statsite
-func (s *StatsiteSink) Shutdown() {
-	close(s.metricQueue)
-}
-
-func (s *StatsiteSink) SetGauge(key []string, val float32) {
-	flatKey := s.flattenKey(key)
-	s.pushMetric(fmt.Sprintf("%s:%f|g\n", flatKey, val))
-}
-
-func (s *StatsiteSink) EmitKey(key []string, val float32) {
-	flatKey := s.flattenKey(key)
-	s.pushMetric(fmt.Sprintf("%s:%f|kv\n", flatKey, val))
-}
-
-func (s *StatsiteSink) IncrCounter(key []string, val float32) {
-	flatKey := s.flattenKey(key)
-	s.pushMetric(fmt.Sprintf("%s:%f|c\n", flatKey, val))
-}
-
-func (s *StatsiteSink) AddSample(key []string, val float32) {
-	flatKey := s.flattenKey(key)
-	s.pushMetric(fmt.Sprintf("%s:%f|ms\n", flatKey, val))
-}
-
-// Flattens the key for formatting, removes spaces
-func (s *StatsiteSink) flattenKey(parts []string) string {
-	joined := strings.Join(parts, ".")
-	return strings.Map(func(r rune) rune {
-		switch r {
-		case ':':
-			fallthrough
-		case ' ':
-			return '_'
-		default:
-			return r
-		}
-	}, joined)
-}
-
-// Does a non-blocking push to the metrics queue
-func (s *StatsiteSink) pushMetric(m string) {
-	select {
-	case s.metricQueue <- m:
-	default:
-	}
-}
-
-// Flushes metrics
-func (s *StatsiteSink) flushMetrics() {
-	var sock net.Conn
-	var err error
-	var wait <-chan time.Time
-	var buffered *bufio.Writer
-	ticker := time.NewTicker(flushInterval)
-	defer ticker.Stop()
-
-CONNECT:
-	// Attempt to connect
-	sock, err = net.Dial("tcp", s.addr)
-	if err != nil {
-		log.Printf("[ERR] Error connecting to statsite! Err: %s", err)
-		goto WAIT
-	}
-
-	// Create a buffered writer
-	buffered = bufio.NewWriter(sock)
-
-	for {
-		select {
-		case metric, ok := <-s.metricQueue:
-			// Get a metric from the queue
-			if !ok {
-				goto QUIT
-			}
-
-			// Try to send to statsite
-			_, err := buffered.Write([]byte(metric))
-			if err != nil {
-				log.Printf("[ERR] Error writing to statsite! Err: %s", err)
-				goto WAIT
-			}
-		case <-ticker.C:
-			if err := buffered.Flush(); err != nil {
-				log.Printf("[ERR] Error flushing to statsite! Err: %s", err)
-				goto WAIT
-			}
-		}
-	}
-
-WAIT:
-	// Wait for a while
-	wait = time.After(time.Duration(5) * time.Second)
-	for {
-		select {
-		// Dequeue the messages to avoid backlog
-		case _, ok := <-s.metricQueue:
-			if !ok {
-				goto QUIT
-			}
-		case <-wait:
-			goto CONNECT
-		}
-	}
-QUIT:
-	s.metricQueue = nil
-}
diff --git a/Godeps/_workspace/src/github.com/armon/go-metrics/statsite_test.go b/Godeps/_workspace/src/github.com/armon/go-metrics/statsite_test.go
deleted file mode 100644
index d9c744f41..000000000
--- a/Godeps/_workspace/src/github.com/armon/go-metrics/statsite_test.go
+++ /dev/null
@@ -1,101 +0,0 @@
-package metrics
-
-import (
-	"bufio"
-	"net"
-	"testing"
-	"time"
-)
-
-func acceptConn(addr string) net.Conn {
-	ln, _ := net.Listen("tcp", addr)
-	conn, _ := ln.Accept()
-	return conn
-}
-
-func TestStatsite_Flatten(t *testing.T) {
-	s := &StatsiteSink{}
-	flat := s.flattenKey([]string{"a", "b", "c", "d"})
-	if flat != "a.b.c.d" {
-		t.Fatalf("Bad flat")
-	}
-}
-
-func TestStatsite_PushFullQueue(t *testing.T) {
-	q := make(chan string, 1)
-	q <- "full"
-
-	s := &StatsiteSink{metricQueue: q}
-	s.pushMetric("omit")
-
-	out := <-q
-	if out != "full" {
-		t.Fatalf("bad val %v", out)
-	}
-
-	select {
-	case v := <-q:
-		t.Fatalf("bad val %v", v)
-	default:
-	}
-}
-
-func TestStatsite_Conn(t *testing.T) {
-	addr := "localhost:7523"
-	done := make(chan bool)
-	go func() {
-		conn := acceptConn(addr)
-		reader := bufio.NewReader(conn)
-
-		line, err := reader.ReadString('\n')
-		if err != nil {
-			t.Fatalf("unexpected err %s", err)
-		}
-		if line != "gauge.val:1.000000|g\n" {
-			t.Fatalf("bad line %s", line)
-		}
-
-		line, err = reader.ReadString('\n')
-		if err != nil {
-			t.Fatalf("unexpected err %s", err)
-		}
-		if line != "key.other:2.000000|kv\n" {
-			t.Fatalf("bad line %s", line)
-		}
-
-		line, err = reader.ReadString('\n')
-		if err != nil {
-			t.Fatalf("unexpected err %s", err)
-		}
-		if line != "counter.me:3.000000|c\n" {
-			t.Fatalf("bad line %s", line)
-		}
-
-		line, err = reader.ReadString('\n')
-		if err != nil {
-			t.Fatalf("unexpected err %s", err)
-		}
-		if line != "sample.slow_thingy:4.000000|ms\n" {
-			t.Fatalf("bad line %s", line)
-		}
-
-		conn.Close()
-		done <- true
-	}()
-	s, err := NewStatsiteSink(addr)
-	if err != nil {
-		t.Fatalf("bad error")
-	}
-
-	s.SetGauge([]string{"gauge", "val"}, float32(1))
-	s.EmitKey([]string{"key", "other"}, float32(2))
-	s.IncrCounter([]string{"counter", "me"}, float32(3))
-	s.AddSample([]string{"sample", "slow thingy"}, float32(4))
-
-	select {
-	case <-done:
-		s.Shutdown()
-	case <-time.After(3 * time.Second):
-		t.Fatalf("timeout")
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/beorn7/perks/quantile/exampledata.txt b/Godeps/_workspace/src/github.com/beorn7/perks/quantile/exampledata.txt
deleted file mode 100644
index 1602287d7..000000000
--- a/Godeps/_workspace/src/github.com/beorn7/perks/quantile/exampledata.txt
+++ /dev/null
@@ -1,2388 +0,0 @@
-8
-5
-26
-12
-5
-235
-13
-6
-28
-30
-3
-3
-3
-3
-5
-2
-33
-7
-2
-4
-7
-12
-14
-5
-8
-3
-10
-4
-5
-3
-6
-6
-209
-20
-3
-10
-14
-3
-4
-6
-8
-5
-11
-7
-3
-2
-3
-3
-212
-5
-222
-4
-10
-10
-5
-6
-3
-8
-3
-10
-254
-220
-2
-3
-5
-24
-5
-4
-222
-7
-3
-3
-223
-8
-15
-12
-14
-14
-3
-2
-2
-3
-13
-3
-11
-4
-4
-6
-5
-7
-13
-5
-3
-5
-2
-5
-3
-5
-2
-7
-15
-17
-14
-3
-6
-6
-3
-17
-5
-4
-7
-6
-4
-4
-8
-6
-8
-3
-9
-3
-6
-3
-4
-5
-3
-3
-660
-4
-6
-10
-3
-6
-3
-2
-5
-13
-2
-4
-4
-10
-4
-8
-4
-3
-7
-9
-9
-3
-10
-37
-3
-13
-4
-12
-3
-6
-10
-8
-5
-21
-2
-3
-8
-3
-2
-3
-3
-4
-12
-2
-4
-8
-8
-4
-3
-2
-20
-1
-6
-32
-2
-11
-6
-18
-3
-8
-11
-3
-212
-3
-4
-2
-6
-7
-12
-11
-3
-2
-16
-10
-6
-4
-6
-3
-2
-7
-3
-2
-2
-2
-2
-5
-6
-4
-3
-10
-3
-4
-6
-5
-3
-4
-4
-5
-6
-4
-3
-4
-4
-5
-7
-5
-5
-3
-2
-7
-2
-4
-12
-4
-5
-6
-2
-4
-4
-8
-4
-15
-13
-7
-16
-5
-3
-23
-5
-5
-7
-3
-2
-9
-8
-7
-5
-8
-11
-4
-10
-76
-4
-47
-4
-3
-2
-7
-4
-2
-3
-37
-10
-4
-2
-20
-5
-4
-4
-10
-10
-4
-3
-7
-23
-240
-7
-13
-5
-5
-3
-3
-2
-5
-4
-2
-8
-7
-19
-2
-23
-8
-7
-2
-5
-3
-8
-3
-8
-13
-5
-5
-5
-2
-3
-23
-4
-9
-8
-4
-3
-3
-5
-220
-2
-3
-4
-6
-14
-3
-53
-6
-2
-5
-18
-6
-3
-219
-6
-5
-2
-5
-3
-6
-5
-15
-4
-3
-17
-3
-2
-4
-7
-2
-3
-3
-4
-4
-3
-2
-664
-6
-3
-23
-5
-5
-16
-5
-8
-2
-4
-2
-24
-12
-3
-2
-3
-5
-8
-3
-5
-4
-3
-14
-3
-5
-8
-2
-3
-7
-9
-4
-2
-3
-6
-8
-4
-3
-4
-6
-5
-3
-3
-6
-3
-19
-4
-4
-6
-3
-6
-3
-5
-22
-5
-4
-4
-3
-8
-11
-4
-9
-7
-6
-13
-4
-4
-4
-6
-17
-9
-3
-3
-3
-4
-3
-221
-5
-11
-3
-4
-2
-12
-6
-3
-5
-7
-5
-7
-4
-9
-7
-14
-37
-19
-217
-16
-3
-5
-2
-2
-7
-19
-7
-6
-7
-4
-24
-5
-11
-4
-7
-7
-9
-13
-3
-4
-3
-6
-28
-4
-4
-5
-5
-2
-5
-6
-4
-4
-6
-10
-5
-4
-3
-2
-3
-3
-6
-5
-5
-4
-3
-2
-3
-7
-4
-6
-18
-16
-8
-16
-4
-5
-8
-6
-9
-13
-1545
-6
-215
-6
-5
-6
-3
-45
-31
-5
-2
-2
-4
-3
-3
-2
-5
-4
-3
-5
-7
-7
-4
-5
-8
-5
-4
-749
-2
-31
-9
-11
-2
-11
-5
-4
-4
-7
-9
-11
-4
-5
-4
-7
-3
-4
-6
-2
-15
-3
-4
-3
-4
-3
-5
-2
-13
-5
-5
-3
-3
-23
-4
-4
-5
-7
-4
-13
-2
-4
-3
-4
-2
-6
-2
-7
-3
-5
-5
-3
-29
-5
-4
-4
-3
-10
-2
-3
-79
-16
-6
-6
-7
-7
-3
-5
-5
-7
-4
-3
-7
-9
-5
-6
-5
-9
-6
-3
-6
-4
-17
-2
-10
-9
-3
-6
-2
-3
-21
-22
-5
-11
-4
-2
-17
-2
-224
-2
-14
-3
-4
-4
-2
-4
-4
-4
-4
-5
-3
-4
-4
-10
-2
-6
-3
-3
-5
-7
-2
-7
-5
-6
-3
-218
-2
-2
-5
-2
-6
-3
-5
-222
-14
-6
-33
-3
-2
-5
-3
-3
-3
-9
-5
-3
-3
-2
-7
-4
-3
-4
-3
-5
-6
-5
-26
-4
-13
-9
-7
-3
-221
-3
-3
-4
-4
-4
-4
-2
-18
-5
-3
-7
-9
-6
-8
-3
-10
-3
-11
-9
-5
-4
-17
-5
-5
-6
-6
-3
-2
-4
-12
-17
-6
-7
-218
-4
-2
-4
-10
-3
-5
-15
-3
-9
-4
-3
-3
-6
-29
-3
-3
-4
-5
-5
-3
-8
-5
-6
-6
-7
-5
-3
-5
-3
-29
-2
-31
-5
-15
-24
-16
-5
-207
-4
-3
-3
-2
-15
-4
-4
-13
-5
-5
-4
-6
-10
-2
-7
-8
-4
-6
-20
-5
-3
-4
-3
-12
-12
-5
-17
-7
-3
-3
-3
-6
-10
-3
-5
-25
-80
-4
-9
-3
-2
-11
-3
-3
-2
-3
-8
-7
-5
-5
-19
-5
-3
-3
-12
-11
-2
-6
-5
-5
-5
-3
-3
-3
-4
-209
-14
-3
-2
-5
-19
-4
-4
-3
-4
-14
-5
-6
-4
-13
-9
-7
-4
-7
-10
-2
-9
-5
-7
-2
-8
-4
-6
-5
-5
-222
-8
-7
-12
-5
-216
-3
-4
-4
-6
-3
-14
-8
-7
-13
-4
-3
-3
-3
-3
-17
-5
-4
-3
-33
-6
-6
-33
-7
-5
-3
-8
-7
-5
-2
-9
-4
-2
-233
-24
-7
-4
-8
-10
-3
-4
-15
-2
-16
-3
-3
-13
-12
-7
-5
-4
-207
-4
-2
-4
-27
-15
-2
-5
-2
-25
-6
-5
-5
-6
-13
-6
-18
-6
-4
-12
-225
-10
-7
-5
-2
-2
-11
-4
-14
-21
-8
-10
-3
-5
-4
-232
-2
-5
-5
-3
-7
-17
-11
-6
-6
-23
-4
-6
-3
-5
-4
-2
-17
-3
-6
-5
-8
-3
-2
-2
-14
-9
-4
-4
-2
-5
-5
-3
-7
-6
-12
-6
-10
-3
-6
-2
-2
-19
-5
-4
-4
-9
-2
-4
-13
-3
-5
-6
-3
-6
-5
-4
-9
-6
-3
-5
-7
-3
-6
-6
-4
-3
-10
-6
-3
-221
-3
-5
-3
-6
-4
-8
-5
-3
-6
-4
-4
-2
-54
-5
-6
-11
-3
-3
-4
-4
-4
-3
-7
-3
-11
-11
-7
-10
-6
-13
-223
-213
-15
-231
-7
-3
-7
-228
-2
-3
-4
-4
-5
-6
-7
-4
-13
-3
-4
-5
-3
-6
-4
-6
-7
-2
-4
-3
-4
-3
-3
-6
-3
-7
-3
-5
-18
-5
-6
-8
-10
-3
-3
-3
-2
-4
-2
-4
-4
-5
-6
-6
-4
-10
-13
-3
-12
-5
-12
-16
-8
-4
-19
-11
-2
-4
-5
-6
-8
-5
-6
-4
-18
-10
-4
-2
-216
-6
-6
-6
-2
-4
-12
-8
-3
-11
-5
-6
-14
-5
-3
-13
-4
-5
-4
-5
-3
-28
-6
-3
-7
-219
-3
-9
-7
-3
-10
-6
-3
-4
-19
-5
-7
-11
-6
-15
-19
-4
-13
-11
-3
-7
-5
-10
-2
-8
-11
-2
-6
-4
-6
-24
-6
-3
-3
-3
-3
-6
-18
-4
-11
-4
-2
-5
-10
-8
-3
-9
-5
-3
-4
-5
-6
-2
-5
-7
-4
-4
-14
-6
-4
-4
-5
-5
-7
-2
-4
-3
-7
-3
-3
-6
-4
-5
-4
-4
-4
-3
-3
-3
-3
-8
-14
-2
-3
-5
-3
-2
-4
-5
-3
-7
-3
-3
-18
-3
-4
-4
-5
-7
-3
-3
-3
-13
-5
-4
-8
-211
-5
-5
-3
-5
-2
-5
-4
-2
-655
-6
-3
-5
-11
-2
-5
-3
-12
-9
-15
-11
-5
-12
-217
-2
-6
-17
-3
-3
-207
-5
-5
-4
-5
-9
-3
-2
-8
-5
-4
-3
-2
-5
-12
-4
-14
-5
-4
-2
-13
-5
-8
-4
-225
-4
-3
-4
-5
-4
-3
-3
-6
-23
-9
-2
-6
-7
-233
-4
-4
-6
-18
-3
-4
-6
-3
-4
-4
-2
-3
-7
-4
-13
-227
-4
-3
-5
-4
-2
-12
-9
-17
-3
-7
-14
-6
-4
-5
-21
-4
-8
-9
-2
-9
-25
-16
-3
-6
-4
-7
-8
-5
-2
-3
-5
-4
-3
-3
-5
-3
-3
-3
-2
-3
-19
-2
-4
-3
-4
-2
-3
-4
-4
-2
-4
-3
-3
-3
-2
-6
-3
-17
-5
-6
-4
-3
-13
-5
-3
-3
-3
-4
-9
-4
-2
-14
-12
-4
-5
-24
-4
-3
-37
-12
-11
-21
-3
-4
-3
-13
-4
-2
-3
-15
-4
-11
-4
-4
-3
-8
-3
-4
-4
-12
-8
-5
-3
-3
-4
-2
-220
-3
-5
-223
-3
-3
-3
-10
-3
-15
-4
-241
-9
-7
-3
-6
-6
-23
-4
-13
-7
-3
-4
-7
-4
-9
-3
-3
-4
-10
-5
-5
-1
-5
-24
-2
-4
-5
-5
-6
-14
-3
-8
-2
-3
-5
-13
-13
-3
-5
-2
-3
-15
-3
-4
-2
-10
-4
-4
-4
-5
-5
-3
-5
-3
-4
-7
-4
-27
-3
-6
-4
-15
-3
-5
-6
-6
-5
-4
-8
-3
-9
-2
-6
-3
-4
-3
-7
-4
-18
-3
-11
-3
-3
-8
-9
-7
-24
-3
-219
-7
-10
-4
-5
-9
-12
-2
-5
-4
-4
-4
-3
-3
-19
-5
-8
-16
-8
-6
-22
-3
-23
-3
-242
-9
-4
-3
-3
-5
-7
-3
-3
-5
-8
-3
-7
-5
-14
-8
-10
-3
-4
-3
-7
-4
-6
-7
-4
-10
-4
-3
-11
-3
-7
-10
-3
-13
-6
-8
-12
-10
-5
-7
-9
-3
-4
-7
-7
-10
-8
-30
-9
-19
-4
-3
-19
-15
-4
-13
-3
-215
-223
-4
-7
-4
-8
-17
-16
-3
-7
-6
-5
-5
-4
-12
-3
-7
-4
-4
-13
-4
-5
-2
-5
-6
-5
-6
-6
-7
-10
-18
-23
-9
-3
-3
-6
-5
-2
-4
-2
-7
-3
-3
-2
-5
-5
-14
-10
-224
-6
-3
-4
-3
-7
-5
-9
-3
-6
-4
-2
-5
-11
-4
-3
-3
-2
-8
-4
-7
-4
-10
-7
-3
-3
-18
-18
-17
-3
-3
-3
-4
-5
-3
-3
-4
-12
-7
-3
-11
-13
-5
-4
-7
-13
-5
-4
-11
-3
-12
-3
-6
-4
-4
-21
-4
-6
-9
-5
-3
-10
-8
-4
-6
-4
-4
-6
-5
-4
-8
-6
-4
-6
-4
-4
-5
-9
-6
-3
-4
-2
-9
-3
-18
-2
-4
-3
-13
-3
-6
-6
-8
-7
-9
-3
-2
-16
-3
-4
-6
-3
-2
-33
-22
-14
-4
-9
-12
-4
-5
-6
-3
-23
-9
-4
-3
-5
-5
-3
-4
-5
-3
-5
-3
-10
-4
-5
-5
-8
-4
-4
-6
-8
-5
-4
-3
-4
-6
-3
-3
-3
-5
-9
-12
-6
-5
-9
-3
-5
-3
-2
-2
-2
-18
-3
-2
-21
-2
-5
-4
-6
-4
-5
-10
-3
-9
-3
-2
-10
-7
-3
-6
-6
-4
-4
-8
-12
-7
-3
-7
-3
-3
-9
-3
-4
-5
-4
-4
-5
-5
-10
-15
-4
-4
-14
-6
-227
-3
-14
-5
-216
-22
-5
-4
-2
-2
-6
-3
-4
-2
-9
-9
-4
-3
-28
-13
-11
-4
-5
-3
-3
-2
-3
-3
-5
-3
-4
-3
-5
-23
-26
-3
-4
-5
-6
-4
-6
-3
-5
-5
-3
-4
-3
-2
-2
-2
-7
-14
-3
-6
-7
-17
-2
-2
-15
-14
-16
-4
-6
-7
-13
-6
-4
-5
-6
-16
-3
-3
-28
-3
-6
-15
-3
-9
-2
-4
-6
-3
-3
-22
-4
-12
-6
-7
-2
-5
-4
-10
-3
-16
-6
-9
-2
-5
-12
-7
-5
-5
-5
-5
-2
-11
-9
-17
-4
-3
-11
-7
-3
-5
-15
-4
-3
-4
-211
-8
-7
-5
-4
-7
-6
-7
-6
-3
-6
-5
-6
-5
-3
-4
-4
-26
-4
-6
-10
-4
-4
-3
-2
-3
-3
-4
-5
-9
-3
-9
-4
-4
-5
-5
-8
-2
-4
-2
-3
-8
-4
-11
-19
-5
-8
-6
-3
-5
-6
-12
-3
-2
-4
-16
-12
-3
-4
-4
-8
-6
-5
-6
-6
-219
-8
-222
-6
-16
-3
-13
-19
-5
-4
-3
-11
-6
-10
-4
-7
-7
-12
-5
-3
-3
-5
-6
-10
-3
-8
-2
-5
-4
-7
-2
-4
-4
-2
-12
-9
-6
-4
-2
-40
-2
-4
-10
-4
-223
-4
-2
-20
-6
-7
-24
-5
-4
-5
-2
-20
-16
-6
-5
-13
-2
-3
-3
-19
-3
-2
-4
-5
-6
-7
-11
-12
-5
-6
-7
-7
-3
-5
-3
-5
-3
-14
-3
-4
-4
-2
-11
-1
-7
-3
-9
-6
-11
-12
-5
-8
-6
-221
-4
-2
-12
-4
-3
-15
-4
-5
-226
-7
-218
-7
-5
-4
-5
-18
-4
-5
-9
-4
-4
-2
-9
-18
-18
-9
-5
-6
-6
-3
-3
-7
-3
-5
-4
-4
-4
-12
-3
-6
-31
-5
-4
-7
-3
-6
-5
-6
-5
-11
-2
-2
-11
-11
-6
-7
-5
-8
-7
-10
-5
-23
-7
-4
-3
-5
-34
-2
-5
-23
-7
-3
-6
-8
-4
-4
-4
-2
-5
-3
-8
-5
-4
-8
-25
-2
-3
-17
-8
-3
-4
-8
-7
-3
-15
-6
-5
-7
-21
-9
-5
-6
-6
-5
-3
-2
-3
-10
-3
-6
-3
-14
-7
-4
-4
-8
-7
-8
-2
-6
-12
-4
-213
-6
-5
-21
-8
-2
-5
-23
-3
-11
-2
-3
-6
-25
-2
-3
-6
-7
-6
-6
-4
-4
-6
-3
-17
-9
-7
-6
-4
-3
-10
-7
-2
-3
-3
-3
-11
-8
-3
-7
-6
-4
-14
-36
-3
-4
-3
-3
-22
-13
-21
-4
-2
-7
-4
-4
-17
-15
-3
-7
-11
-2
-4
-7
-6
-209
-6
-3
-2
-2
-24
-4
-9
-4
-3
-3
-3
-29
-2
-2
-4
-3
-3
-5
-4
-6
-3
-3
-2
-4
diff --git a/Godeps/_workspace/src/github.com/beorn7/perks/quantile/stream.go b/Godeps/_workspace/src/github.com/beorn7/perks/quantile/stream.go
deleted file mode 100644
index 587b1fc5b..000000000
--- a/Godeps/_workspace/src/github.com/beorn7/perks/quantile/stream.go
+++ /dev/null
@@ -1,292 +0,0 @@
-// Package quantile computes approximate quantiles over an unbounded data
-// stream within low memory and CPU bounds.
-//
-// A small amount of accuracy is traded to achieve the above properties.
-//
-// Multiple streams can be merged before calling Query to generate a single set
-// of results. This is meaningful when the streams represent the same type of
-// data. See Merge and Samples.
-//
-// For more detailed information about the algorithm used, see:
-//
-// Effective Computation of Biased Quantiles over Data Streams
-//
-// http://www.cs.rutgers.edu/~muthu/bquant.pdf
-package quantile
-
-import (
-	"math"
-	"sort"
-)
-
-// Sample holds an observed value and meta information for compression. JSON
-// tags have been added for convenience.
-type Sample struct {
-	Value float64 `json:",string"`
-	Width float64 `json:",string"`
-	Delta float64 `json:",string"`
-}
-
-// Samples represents a slice of samples. It implements sort.Interface.
-type Samples []Sample
-
-func (a Samples) Len() int           { return len(a) }
-func (a Samples) Less(i, j int) bool { return a[i].Value < a[j].Value }
-func (a Samples) Swap(i, j int)      { a[i], a[j] = a[j], a[i] }
-
-type invariant func(s *stream, r float64) float64
-
-// NewLowBiased returns an initialized Stream for low-biased quantiles
-// (e.g. 0.01, 0.1, 0.5) where the needed quantiles are not known a priori, but
-// error guarantees can still be given even for the lower ranks of the data
-// distribution.
-//
-// The provided epsilon is a relative error, i.e. the true quantile of a value
-// returned by a query is guaranteed to be within (1±Epsilon)*Quantile.
-//
-// See http://www.cs.rutgers.edu/~muthu/bquant.pdf for time, space, and error
-// properties.
-func NewLowBiased(epsilon float64) *Stream {
-	ƒ := func(s *stream, r float64) float64 {
-		return 2 * epsilon * r
-	}
-	return newStream(ƒ)
-}
-
-// NewHighBiased returns an initialized Stream for high-biased quantiles
-// (e.g. 0.01, 0.1, 0.5) where the needed quantiles are not known a priori, but
-// error guarantees can still be given even for the higher ranks of the data
-// distribution.
-//
-// The provided epsilon is a relative error, i.e. the true quantile of a value
-// returned by a query is guaranteed to be within 1-(1±Epsilon)*(1-Quantile).
-//
-// See http://www.cs.rutgers.edu/~muthu/bquant.pdf for time, space, and error
-// properties.
-func NewHighBiased(epsilon float64) *Stream {
-	ƒ := func(s *stream, r float64) float64 {
-		return 2 * epsilon * (s.n - r)
-	}
-	return newStream(ƒ)
-}
-
-// NewTargeted returns an initialized Stream concerned with a particular set of
-// quantile values that are supplied a priori. Knowing these a priori reduces
-// space and computation time. The targets map maps the desired quantiles to
-// their absolute errors, i.e. the true quantile of a value returned by a query
-// is guaranteed to be within (Quantile±Epsilon).
-//
-// See http://www.cs.rutgers.edu/~muthu/bquant.pdf for time, space, and error properties.
-func NewTargeted(targets map[float64]float64) *Stream {
-	ƒ := func(s *stream, r float64) float64 {
-		var m = math.MaxFloat64
-		var f float64
-		for quantile, epsilon := range targets {
-			if quantile*s.n <= r {
-				f = (2 * epsilon * r) / quantile
-			} else {
-				f = (2 * epsilon * (s.n - r)) / (1 - quantile)
-			}
-			if f < m {
-				m = f
-			}
-		}
-		return m
-	}
-	return newStream(ƒ)
-}
-
-// Stream computes quantiles for a stream of float64s. It is not thread-safe by
-// design. Take care when using across multiple goroutines.
-type Stream struct {
-	*stream
-	b      Samples
-	sorted bool
-}
-
-func newStream(ƒ invariant) *Stream {
-	x := &stream{ƒ: ƒ}
-	return &Stream{x, make(Samples, 0, 500), true}
-}
-
-// Insert inserts v into the stream.
-func (s *Stream) Insert(v float64) {
-	s.insert(Sample{Value: v, Width: 1})
-}
-
-func (s *Stream) insert(sample Sample) {
-	s.b = append(s.b, sample)
-	s.sorted = false
-	if len(s.b) == cap(s.b) {
-		s.flush()
-	}
-}
-
-// Query returns the computed qth percentiles value. If s was created with
-// NewTargeted, and q is not in the set of quantiles provided a priori, Query
-// will return an unspecified result.
-func (s *Stream) Query(q float64) float64 {
-	if !s.flushed() {
-		// Fast path when there hasn't been enough data for a flush;
-		// this also yields better accuracy for small sets of data.
-		l := len(s.b)
-		if l == 0 {
-			return 0
-		}
-		i := int(float64(l) * q)
-		if i > 0 {
-			i -= 1
-		}
-		s.maybeSort()
-		return s.b[i].Value
-	}
-	s.flush()
-	return s.stream.query(q)
-}
-
-// Merge merges samples into the underlying streams samples. This is handy when
-// merging multiple streams from separate threads, database shards, etc.
-//
-// ATTENTION: This method is broken and does not yield correct results. The
-// underlying algorithm is not capable of merging streams correctly.
-func (s *Stream) Merge(samples Samples) {
-	sort.Sort(samples)
-	s.stream.merge(samples)
-}
-
-// Reset reinitializes and clears the list reusing the samples buffer memory.
-func (s *Stream) Reset() {
-	s.stream.reset()
-	s.b = s.b[:0]
-}
-
-// Samples returns stream samples held by s.
-func (s *Stream) Samples() Samples {
-	if !s.flushed() {
-		return s.b
-	}
-	s.flush()
-	return s.stream.samples()
-}
-
-// Count returns the total number of samples observed in the stream
-// since initialization.
-func (s *Stream) Count() int {
-	return len(s.b) + s.stream.count()
-}
-
-func (s *Stream) flush() {
-	s.maybeSort()
-	s.stream.merge(s.b)
-	s.b = s.b[:0]
-}
-
-func (s *Stream) maybeSort() {
-	if !s.sorted {
-		s.sorted = true
-		sort.Sort(s.b)
-	}
-}
-
-func (s *Stream) flushed() bool {
-	return len(s.stream.l) > 0
-}
-
-type stream struct {
-	n float64
-	l []Sample
-	ƒ invariant
-}
-
-func (s *stream) reset() {
-	s.l = s.l[:0]
-	s.n = 0
-}
-
-func (s *stream) insert(v float64) {
-	s.merge(Samples{{v, 1, 0}})
-}
-
-func (s *stream) merge(samples Samples) {
-	// TODO(beorn7): This tries to merge not only individual samples, but
-	// whole summaries. The paper doesn't mention merging summaries at
-	// all. Unittests show that the merging is inaccurate. Find out how to
-	// do merges properly.
-	var r float64
-	i := 0
-	for _, sample := range samples {
-		for ; i < len(s.l); i++ {
-			c := s.l[i]
-			if c.Value > sample.Value {
-				// Insert at position i.
-				s.l = append(s.l, Sample{})
-				copy(s.l[i+1:], s.l[i:])
-				s.l[i] = Sample{
-					sample.Value,
-					sample.Width,
-					math.Max(sample.Delta, math.Floor(s.ƒ(s, r))-1),
-					// TODO(beorn7): How to calculate delta correctly?
-				}
-				i++
-				goto inserted
-			}
-			r += c.Width
-		}
-		s.l = append(s.l, Sample{sample.Value, sample.Width, 0})
-		i++
-	inserted:
-		s.n += sample.Width
-		r += sample.Width
-	}
-	s.compress()
-}
-
-func (s *stream) count() int {
-	return int(s.n)
-}
-
-func (s *stream) query(q float64) float64 {
-	t := math.Ceil(q * s.n)
-	t += math.Ceil(s.ƒ(s, t) / 2)
-	p := s.l[0]
-	var r float64
-	for _, c := range s.l[1:] {
-		r += p.Width
-		if r+c.Width+c.Delta > t {
-			return p.Value
-		}
-		p = c
-	}
-	return p.Value
-}
-
-func (s *stream) compress() {
-	if len(s.l) < 2 {
-		return
-	}
-	x := s.l[len(s.l)-1]
-	xi := len(s.l) - 1
-	r := s.n - 1 - x.Width
-
-	for i := len(s.l) - 2; i >= 0; i-- {
-		c := s.l[i]
-		if c.Width+x.Width+x.Delta <= s.ƒ(s, r) {
-			x.Width += c.Width
-			s.l[xi] = x
-			// Remove element at i.
-			copy(s.l[i:], s.l[i+1:])
-			s.l = s.l[:len(s.l)-1]
-			xi -= 1
-		} else {
-			x = c
-			xi = i
-		}
-		r -= c.Width
-	}
-}
-
-func (s *stream) samples() Samples {
-	samples := make(Samples, len(s.l))
-	copy(samples, s.l)
-	return samples
-}
diff --git a/Godeps/_workspace/src/github.com/boltdb/bolt/.gitignore b/Godeps/_workspace/src/github.com/boltdb/bolt/.gitignore
deleted file mode 100644
index c7bd2b7a5..000000000
--- a/Godeps/_workspace/src/github.com/boltdb/bolt/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-*.prof
-*.test
-*.swp
-/bin/
diff --git a/Godeps/_workspace/src/github.com/boltdb/bolt/LICENSE b/Godeps/_workspace/src/github.com/boltdb/bolt/LICENSE
deleted file mode 100644
index 004e77fe5..000000000
--- a/Godeps/_workspace/src/github.com/boltdb/bolt/LICENSE
+++ /dev/null
@@ -1,20 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2013 Ben Johnson
-
-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/boltdb/bolt/Makefile b/Godeps/_workspace/src/github.com/boltdb/bolt/Makefile
deleted file mode 100644
index cfbed514b..000000000
--- a/Godeps/_workspace/src/github.com/boltdb/bolt/Makefile
+++ /dev/null
@@ -1,54 +0,0 @@
-TEST=.
-BENCH=.
-COVERPROFILE=/tmp/c.out
-BRANCH=`git rev-parse --abbrev-ref HEAD`
-COMMIT=`git rev-parse --short HEAD`
-GOLDFLAGS="-X main.branch $(BRANCH) -X main.commit $(COMMIT)"
-
-default: build
-
-bench:
-	go test -v -test.run=NOTHINCONTAINSTHIS -test.bench=$(BENCH)
-
-# http://cloc.sourceforge.net/
-cloc:
-	@cloc --not-match-f='Makefile|_test.go' .
-
-cover: fmt
-	go test -coverprofile=$(COVERPROFILE) -test.run=$(TEST) $(COVERFLAG) .
-	go tool cover -html=$(COVERPROFILE)
-	rm $(COVERPROFILE)
-
-cpuprofile: fmt
-	@go test -c
-	@./bolt.test -test.v -test.run=$(TEST) -test.cpuprofile cpu.prof
-
-# go get github.com/kisielk/errcheck
-errcheck:
-	@echo "=== errcheck ==="
-	@errcheck github.com/boltdb/bolt
-
-fmt:
-	@go fmt ./...
-
-get:
-	@go get -d ./...
-
-build: get
-	@mkdir -p bin
-	@go build -ldflags=$(GOLDFLAGS) -a -o bin/bolt ./cmd/bolt
-
-test: fmt
-	@go get github.com/stretchr/testify/assert
-	@echo "=== TESTS ==="
-	@go test -v -cover -test.run=$(TEST)
-	@echo ""
-	@echo ""
-	@echo "=== CLI ==="
-	@go test -v -test.run=$(TEST) ./cmd/bolt
-	@echo ""
-	@echo ""
-	@echo "=== RACE DETECTOR ==="
-	@go test -v -race -test.run="TestSimulate_(100op|1000op)"
-
-.PHONY: bench cloc cover cpuprofile fmt memprofile test
diff --git a/Godeps/_workspace/src/github.com/boltdb/bolt/README.md b/Godeps/_workspace/src/github.com/boltdb/bolt/README.md
deleted file mode 100644
index 00fad6afb..000000000
--- a/Godeps/_workspace/src/github.com/boltdb/bolt/README.md
+++ /dev/null
@@ -1,621 +0,0 @@
-Bolt [![Build Status](https://drone.io/github.com/boltdb/bolt/status.png)](https://drone.io/github.com/boltdb/bolt/latest) [![Coverage Status](https://coveralls.io/repos/boltdb/bolt/badge.png?branch=master)](https://coveralls.io/r/boltdb/bolt?branch=master) [![GoDoc](https://godoc.org/github.com/boltdb/bolt?status.png)](https://godoc.org/github.com/boltdb/bolt) ![Version](http://img.shields.io/badge/version-1.0-green.png)
-====
-
-Bolt is a pure Go key/value store inspired by [Howard Chu's][hyc_symas] and
-the [LMDB project][lmdb]. The goal of the project is to provide a simple,
-fast, and reliable database for projects that don't require a full database
-server such as Postgres or MySQL.
-
-Since Bolt is meant to be used as such a low-level piece of functionality,
-simplicity is key. The API will be small and only focus on getting values
-and setting values. That's it.
-
-[hyc_symas]: https://twitter.com/hyc_symas
-[lmdb]: http://symas.com/mdb/
-
-
-## Project Status
-
-Bolt is stable and the API is fixed. Full unit test coverage and randomized
-black box testing are used to ensure database consistency and thread safety.
-Bolt is currently in high-load production environments serving databases as
-large as 1TB. Many companies such as Shopify and Heroku use Bolt-backed
-services every day.
-
-
-## Getting Started
-
-### Installing
-
-To start using Bolt, install Go and run `go get`:
-
-```sh
-$ go get github.com/boltdb/bolt/...
-```
-
-This will retrieve the library and install the `bolt` command line utility into
-your `$GOBIN` path.
-
-
-### Opening a database
-
-The top-level object in Bolt is a `DB`. It is represented as a single file on
-your disk and represents a consistent snapshot of your data.
-
-To open your database, simply use the `bolt.Open()` function:
-
-```go
-package main
-
-import (
-	"log"
-
-	"github.com/boltdb/bolt"
-)
-
-func main() {
-	// Open the my.db data file in your current directory.
-	// It will be created if it doesn't exist.
-	db, err := bolt.Open("my.db", 0600, nil)
-	if err != nil {
-		log.Fatal(err)
-	}
-	defer db.Close()
-
-	...
-}
-```
-
-Please note that Bolt obtains a file lock on the data file so multiple processes
-cannot open the same database at the same time. Opening an already open Bolt
-database will cause it to hang until the other process closes it. To prevent
-an indefinite wait you can pass a timeout option to the `Open()` function:
-
-```go
-db, err := bolt.Open("my.db", 0600, &bolt.Options{Timeout: 1 * time.Second})
-```
-
-
-### Transactions
-
-Bolt allows only one read-write transaction at a time but allows as many
-read-only transactions as you want at a time. Each transaction has a consistent
-view of the data as it existed when the transaction started.
-
-Individual transactions and all objects created from them (e.g. buckets, keys)
-are not thread safe. To work with data in multiple goroutines you must start
-a transaction for each one or use locking to ensure only one goroutine accesses
-a transaction at a time. Creating transaction from the `DB` is thread safe.
-
-Read-only transactions and read-write transactions should not depend on one
-another and generally shouldn't be opened simultaneously in the same goroutine.
-This can cause a deadlock as the read-write transaction needs to periodically
-re-map the data file but it cannot do so while a read-only transaction is open.
-
-
-#### Read-write transactions
-
-To start a read-write transaction, you can use the `DB.Update()` function:
-
-```go
-err := db.Update(func(tx *bolt.Tx) error {
-	...
-	return nil
-})
-```
-
-Inside the closure, you have a consistent view of the database. You commit the
-transaction by returning `nil` at the end. You can also rollback the transaction
-at any point by returning an error. All database operations are allowed inside
-a read-write transaction.
-
-Always check the return error as it will report any disk failures that can cause
-your transaction to not complete. If you return an error within your closure
-it will be passed through.
-
-
-#### Read-only transactions
-
-To start a read-only transaction, you can use the `DB.View()` function:
-
-```go
-err := db.View(func(tx *bolt.Tx) error {
-	...
-	return nil
-})
-```
-
-You also get a consistent view of the database within this closure, however,
-no mutating operations are allowed within a read-only transaction. You can only
-retrieve buckets, retrieve values, and copy the database within a read-only
-transaction.
-
-
-#### Batch read-write transactions
-
-Each `DB.Update()` waits for disk to commit the writes. This overhead
-can be minimized by combining multiple updates with the `DB.Batch()`
-function:
-
-```go
-err := db.Batch(func(tx *bolt.Tx) error {
-	...
-	return nil
-})
-```
-
-Concurrent Batch calls are opportunistically combined into larger
-transactions. Batch is only useful when there are multiple goroutines
-calling it.
-
-The trade-off is that `Batch` can call the given
-function multiple times, if parts of the transaction fail. The
-function must be idempotent and side effects must take effect only
-after a successful return from `DB.Batch()`.
-
-For example: don't display messages from inside the function, instead
-set variables in the enclosing scope:
-
-```go
-var id uint64
-err := db.Batch(func(tx *bolt.Tx) error {
-	// Find last key in bucket, decode as bigendian uint64, increment
-	// by one, encode back to []byte, and add new key.
-	...
-	id = newValue
-	return nil
-})
-if err != nil {
-	return ...
-}
-fmt.Println("Allocated ID %d", id)
-```
-
-
-#### Managing transactions manually
-
-The `DB.View()` and `DB.Update()` functions are wrappers around the `DB.Begin()`
-function. These helper functions will start the transaction, execute a function,
-and then safely close your transaction if an error is returned. This is the
-recommended way to use Bolt transactions.
-
-However, sometimes you may want to manually start and end your transactions.
-You can use the `Tx.Begin()` function directly but _please_ be sure to close the
-transaction.
-
-```go
-// Start a writable transaction.
-tx, err := db.Begin(true)
-if err != nil {
-    return err
-}
-defer tx.Rollback()
-
-// Use the transaction...
-_, err := tx.CreateBucket([]byte("MyBucket"))
-if err != nil {
-    return err
-}
-
-// Commit the transaction and check for error.
-if err := tx.Commit(); err != nil {
-    return err
-}
-```
-
-The first argument to `DB.Begin()` is a boolean stating if the transaction
-should be writable.
-
-
-### Using buckets
-
-Buckets are collections of key/value pairs within the database. All keys in a
-bucket must be unique. You can create a bucket using the `DB.CreateBucket()`
-function:
-
-```go
-db.Update(func(tx *bolt.Tx) error {
-	b, err := tx.CreateBucket([]byte("MyBucket"))
-	if err != nil {
-		return fmt.Errorf("create bucket: %s", err)
-	}
-	return nil
-})
-```
-
-You can also create a bucket only if it doesn't exist by using the
-`Tx.CreateBucketIfNotExists()` function. It's a common pattern to call this
-function for all your top-level buckets after you open your database so you can
-guarantee that they exist for future transactions.
-
-To delete a bucket, simply call the `Tx.DeleteBucket()` function.
-
-
-### Using key/value pairs
-
-To save a key/value pair to a bucket, use the `Bucket.Put()` function:
-
-```go
-db.Update(func(tx *bolt.Tx) error {
-	b := tx.Bucket([]byte("MyBucket"))
-	err := b.Put([]byte("answer"), []byte("42"))
-	return err
-})
-```
-
-This will set the value of the `"answer"` key to `"42"` in the `MyBucket`
-bucket. To retrieve this value, we can use the `Bucket.Get()` function:
-
-```go
-db.View(func(tx *bolt.Tx) error {
-	b := tx.Bucket([]byte("MyBucket"))
-	v := b.Get([]byte("answer"))
-	fmt.Printf("The answer is: %s\n", v)
-	return nil
-})
-```
-
-The `Get()` function does not return an error because its operation is
-guarenteed to work (unless there is some kind of system failure). If the key
-exists then it will return its byte slice value. If it doesn't exist then it
-will return `nil`. It's important to note that you can have a zero-length value
-set to a key which is different than the key not existing.
-
-Use the `Bucket.Delete()` function to delete a key from the bucket.
-
-Please note that values returned from `Get()` are only valid while the
-transaction is open. If you need to use a value outside of the transaction
-then you must use `copy()` to copy it to another byte slice.
-
-
-### Iterating over keys
-
-Bolt stores its keys in byte-sorted order within a bucket. This makes sequential
-iteration over these keys extremely fast. To iterate over keys we'll use a
-`Cursor`:
-
-```go
-db.View(func(tx *bolt.Tx) error {
-	b := tx.Bucket([]byte("MyBucket"))
-	c := b.Cursor()
-
-	for k, v := c.First(); k != nil; k, v = c.Next() {
-		fmt.Printf("key=%s, value=%s\n", k, v)
-	}
-
-	return nil
-})
-```
-
-The cursor allows you to move to a specific point in the list of keys and move
-forward or backward through the keys one at a time.
-
-The following functions are available on the cursor:
-
-```
-First()  Move to the first key.
-Last()   Move to the last key.
-Seek()   Move to a specific key.
-Next()   Move to the next key.
-Prev()   Move to the previous key.
-```
-
-When you have iterated to the end of the cursor then `Next()` will return `nil`.
-You must seek to a position using `First()`, `Last()`, or `Seek()` before
-calling `Next()` or `Prev()`. If you do not seek to a position then these
-functions will return `nil`.
-
-
-#### Prefix scans
-
-To iterate over a key prefix, you can combine `Seek()` and `bytes.HasPrefix()`:
-
-```go
-db.View(func(tx *bolt.Tx) error {
-	c := tx.Bucket([]byte("MyBucket")).Cursor()
-
-	prefix := []byte("1234")
-	for k, v := c.Seek(prefix); bytes.HasPrefix(k, prefix); k, v = c.Next() {
-		fmt.Printf("key=%s, value=%s\n", k, v)
-	}
-
-	return nil
-})
-```
-
-#### Range scans
-
-Another common use case is scanning over a range such as a time range. If you
-use a sortable time encoding such as RFC3339 then you can query a specific
-date range like this:
-
-```go
-db.View(func(tx *bolt.Tx) error {
-	// Assume our events bucket has RFC3339 encoded time keys.
-	c := tx.Bucket([]byte("Events")).Cursor()
-
-	// Our time range spans the 90's decade.
-	min := []byte("1990-01-01T00:00:00Z")
-	max := []byte("2000-01-01T00:00:00Z")
-
-	// Iterate over the 90's.
-	for k, v := c.Seek(min); k != nil && bytes.Compare(k, max) <= 0; k, v = c.Next() {
-		fmt.Printf("%s: %s\n", k, v)
-	}
-
-	return nil
-})
-```
-
-
-#### ForEach()
-
-You can also use the function `ForEach()` if you know you'll be iterating over
-all the keys in a bucket:
-
-```go
-db.View(func(tx *bolt.Tx) error {
-	b := tx.Bucket([]byte("MyBucket"))
-	b.ForEach(func(k, v []byte) error {
-		fmt.Printf("key=%s, value=%s\n", k, v)
-		return nil
-	})
-	return nil
-})
-```
-
-
-### Nested buckets
-
-You can also store a bucket in a key to create nested buckets. The API is the
-same as the bucket management API on the `DB` object:
-
-```go
-func (*Bucket) CreateBucket(key []byte) (*Bucket, error)
-func (*Bucket) CreateBucketIfNotExists(key []byte) (*Bucket, error)
-func (*Bucket) DeleteBucket(key []byte) error
-```
-
-
-### Database backups
-
-Bolt is a single file so it's easy to backup. You can use the `Tx.WriteTo()`
-function to write a consistent view of the database to a writer. If you call
-this from a read-only transaction, it will perform a hot backup and not block
-your other database reads and writes. It will also use `O_DIRECT` when available
-to prevent page cache trashing.
-
-One common use case is to backup over HTTP so you can use tools like `cURL` to
-do database backups:
-
-```go
-func BackupHandleFunc(w http.ResponseWriter, req *http.Request) {
-	err := db.View(func(tx *bolt.Tx) error {
-		w.Header().Set("Content-Type", "application/octet-stream")
-		w.Header().Set("Content-Disposition", `attachment; filename="my.db"`)
-		w.Header().Set("Content-Length", strconv.Itoa(int(tx.Size())))
-		_, err := tx.WriteTo(w)
-		return err
-	})
-	if err != nil {
-		http.Error(w, err.Error(), http.StatusInternalServerError)
-	}
-}
-```
-
-Then you can backup using this command:
-
-```sh
-$ curl http://localhost/backup > my.db
-```
-
-Or you can open your browser to `http://localhost/backup` and it will download
-automatically.
-
-If you want to backup to another file you can use the `Tx.CopyFile()` helper
-function.
-
-
-### Statistics
-
-The database keeps a running count of many of the internal operations it
-performs so you can better understand what's going on. By grabbing a snapshot
-of these stats at two points in time we can see what operations were performed
-in that time range.
-
-For example, we could start a goroutine to log stats every 10 seconds:
-
-```go
-go func() {
-	// Grab the initial stats.
-	prev := db.Stats()
-
-	for {
-		// Wait for 10s.
-		time.Sleep(10 * time.Second)
-
-		// Grab the current stats and diff them.
-		stats := db.Stats()
-		diff := stats.Sub(&prev)
-
-		// Encode stats to JSON and print to STDERR.
-		json.NewEncoder(os.Stderr).Encode(diff)
-
-		// Save stats for the next loop.
-		prev = stats
-	}
-}()
-```
-
-It's also useful to pipe these stats to a service such as statsd for monitoring
-or to provide an HTTP endpoint that will perform a fixed-length sample.
-
-
-### Read-Only Mode
-
-Sometimes it is useful to create a shared, read-only Bolt database. To this,
-set the `Options.ReadOnly` flag when opening your database. Read-only mode
-uses a shared lock to allow multiple processes to read from the database but
-it will block any processes from opening the database in read-write mode.
-
-```go
-db, err := bolt.Open("my.db", 0666, &bolt.Options{ReadOnly: true})
-if err != nil {
-	log.Fatal(err)
-}
-```
-
-
-## Resources
-
-For more information on getting started with Bolt, check out the following articles:
-
-* [Intro to BoltDB: Painless Performant Persistence](http://npf.io/2014/07/intro-to-boltdb-painless-performant-persistence/) by [Nate Finch](https://github.com/natefinch).
-* [Bolt -- an embedded key/value database for Go](https://www.progville.com/go/bolt-embedded-db-golang/) by Progville
-
-
-## Comparison with other databases
-
-### Postgres, MySQL, & other relational databases
-
-Relational databases structure data into rows and are only accessible through
-the use of SQL. This approach provides flexibility in how you store and query
-your data but also incurs overhead in parsing and planning SQL statements. Bolt
-accesses all data by a byte slice key. This makes Bolt fast to read and write
-data by key but provides no built-in support for joining values together.
-
-Most relational databases (with the exception of SQLite) are standalone servers
-that run separately from your application. This gives your systems
-flexibility to connect multiple application servers to a single database
-server but also adds overhead in serializing and transporting data over the
-network. Bolt runs as a library included in your application so all data access
-has to go through your application's process. This brings data closer to your
-application but limits multi-process access to the data.
-
-
-### LevelDB, RocksDB
-
-LevelDB and its derivatives (RocksDB, HyperLevelDB) are similar to Bolt in that
-they are libraries bundled into the application, however, their underlying
-structure is a log-structured merge-tree (LSM tree). An LSM tree optimizes
-random writes by using a write ahead log and multi-tiered, sorted files called
-SSTables. Bolt uses a B+tree internally and only a single file. Both approaches
-have trade offs.
-
-If you require a high random write throughput (>10,000 w/sec) or you need to use
-spinning disks then LevelDB could be a good choice. If your application is
-read-heavy or does a lot of range scans then Bolt could be a good choice.
-
-One other important consideration is that LevelDB does not have transactions.
-It supports batch writing of key/values pairs and it supports read snapshots
-but it will not give you the ability to do a compare-and-swap operation safely.
-Bolt supports fully serializable ACID transactions.
-
-
-### LMDB
-
-Bolt was originally a port of LMDB so it is architecturally similar. Both use
-a B+tree, have ACID semantics with fully serializable transactions, and support
-lock-free MVCC using a single writer and multiple readers.
-
-The two projects have somewhat diverged. LMDB heavily focuses on raw performance
-while Bolt has focused on simplicity and ease of use. For example, LMDB allows
-several unsafe actions such as direct writes for the sake of performance. Bolt
-opts to disallow actions which can leave the database in a corrupted state. The
-only exception to this in Bolt is `DB.NoSync`.
-
-There are also a few differences in API. LMDB requires a maximum mmap size when
-opening an `mdb_env` whereas Bolt will handle incremental mmap resizing
-automatically. LMDB overloads the getter and setter functions with multiple
-flags whereas Bolt splits these specialized cases into their own functions.
-
-
-## Caveats & Limitations
-
-It's important to pick the right tool for the job and Bolt is no exception.
-Here are a few things to note when evaluating and using Bolt:
-
-* Bolt is good for read intensive workloads. Sequential write performance is
-  also fast but random writes can be slow. You can add a write-ahead log or
-  [transaction coalescer](https://github.com/boltdb/coalescer) in front of Bolt
-  to mitigate this issue.
-
-* Bolt uses a B+tree internally so there can be a lot of random page access.
-  SSDs provide a significant performance boost over spinning disks.
-
-* Try to avoid long running read transactions. Bolt uses copy-on-write so
-  old pages cannot be reclaimed while an old transaction is using them.
-
-* Byte slices returned from Bolt are only valid during a transaction. Once the
-  transaction has been committed or rolled back then the memory they point to
-  can be reused by a new page or can be unmapped from virtual memory and you'll
-  see an `unexpected fault address` panic when accessing it.
-
-* Be careful when using `Bucket.FillPercent`. Setting a high fill percent for
-  buckets that have random inserts will cause your database to have very poor
-  page utilization.
-
-* Use larger buckets in general. Smaller buckets causes poor page utilization
-  once they become larger than the page size (typically 4KB).
-
-* Bulk loading a lot of random writes into a new bucket can be slow as the
-  page will not split until the transaction is committed. Randomly inserting
-  more than 100,000 key/value pairs into a single new bucket in a single
-  transaction is not advised.
-
-* Bolt uses a memory-mapped file so the underlying operating system handles the
-  caching of the data. Typically, the OS will cache as much of the file as it
-  can in memory and will release memory as needed to other processes. This means
-  that Bolt can show very high memory usage when working with large databases.
-  However, this is expected and the OS will release memory as needed. Bolt can
-  handle databases much larger than the available physical RAM.
-
-* The data structures in the Bolt database are memory mapped so the data file
-  will be endian specific. This means that you cannot copy a Bolt file from a
-  little endian machine to a big endian machine and have it work. For most 
-  users this is not a concern since most modern CPUs are little endian.
-
-* Because of the way pages are laid out on disk, Bolt cannot truncate data files
-  and return free pages back to the disk. Instead, Bolt maintains a free list
-  of unused pages within its data file. These free pages can be reused by later
-  transactions. This works well for many use cases as databases generally tend
-  to grow. However, it's important to note that deleting large chunks of data
-  will not allow you to reclaim that space on disk.
-
-  For more information on page allocation, [see this comment][page-allocation].
-
-[page-allocation]: https://github.com/boltdb/bolt/issues/308#issuecomment-74811638
-
-
-## Other Projects Using Bolt
-
-Below is a list of public, open source projects that use Bolt:
-
-* [Operation Go: A Routine Mission](http://gocode.io) - An online programming game for Golang using Bolt for user accounts and a leaderboard.
-* [Bazil](https://bazil.org/) - A file system that lets your data reside where it is most convenient for it to reside.
-* [DVID](https://github.com/janelia-flyem/dvid) - Added Bolt as optional storage engine and testing it against Basho-tuned leveldb.
-* [Skybox Analytics](https://github.com/skybox/skybox) - A standalone funnel analysis tool for web analytics.
-* [Scuttlebutt](https://github.com/benbjohnson/scuttlebutt) - Uses Bolt to store and process all Twitter mentions of GitHub projects.
-* [Wiki](https://github.com/peterhellberg/wiki) - A tiny wiki using Goji, BoltDB and Blackfriday.
-* [ChainStore](https://github.com/nulayer/chainstore) - Simple key-value interface to a variety of storage engines organized as a chain of operations.
-* [MetricBase](https://github.com/msiebuhr/MetricBase) - Single-binary version of Graphite.
-* [Gitchain](https://github.com/gitchain/gitchain) - Decentralized, peer-to-peer Git repositories aka "Git meets Bitcoin".
-* [event-shuttle](https://github.com/sclasen/event-shuttle) - A Unix system service to collect and reliably deliver messages to Kafka.
-* [ipxed](https://github.com/kelseyhightower/ipxed) - Web interface and api for ipxed.
-* [BoltStore](https://github.com/yosssi/boltstore) - Session store using Bolt.
-* [photosite/session](http://godoc.org/bitbucket.org/kardianos/photosite/session) - Sessions for a photo viewing site.
-* [LedisDB](https://github.com/siddontang/ledisdb) - A high performance NoSQL, using Bolt as optional storage.
-* [ipLocator](https://github.com/AndreasBriese/ipLocator) - A fast ip-geo-location-server using bolt with bloom filters.
-* [cayley](https://github.com/google/cayley) - Cayley is an open-source graph database using Bolt as optional backend.
-* [bleve](http://www.blevesearch.com/) - A pure Go search engine similar to ElasticSearch that uses Bolt as the default storage backend.
-* [tentacool](https://github.com/optiflows/tentacool) - REST api server to manage system stuff (IP, DNS, Gateway...) on a linux server.
-* [SkyDB](https://github.com/skydb/sky) - Behavioral analytics database.
-* [Seaweed File System](https://github.com/chrislusf/weed-fs) - Highly scalable distributed key~file system with O(1) disk read.
-* [InfluxDB](http://influxdb.com) - Scalable datastore for metrics, events, and real-time analytics.
-* [Freehold](http://tshannon.bitbucket.org/freehold/) - An open, secure, and lightweight platform for your files and data.
-* [Prometheus Annotation Server](https://github.com/oliver006/prom_annotation_server) - Annotation server for PromDash & Prometheus service monitoring system.
-* [Consul](https://github.com/hashicorp/consul) - Consul is service discovery and configuration made easy. Distributed, highly available, and datacenter-aware.
-* [Kala](https://github.com/ajvb/kala) - Kala is a modern job scheduler optimized to run on a single node. It is persistant, JSON over HTTP API, ISO 8601 duration notation, and dependent jobs.
-* [drive](https://github.com/odeke-em/drive) - drive is an unofficial Google Drive command line client for \*NIX operating systems.
-
-If you are using Bolt in a project please send a pull request to add it to the list.
diff --git a/Godeps/_workspace/src/github.com/boltdb/bolt/batch.go b/Godeps/_workspace/src/github.com/boltdb/bolt/batch.go
deleted file mode 100644
index 84acae6bb..000000000
--- a/Godeps/_workspace/src/github.com/boltdb/bolt/batch.go
+++ /dev/null
@@ -1,138 +0,0 @@
-package bolt
-
-import (
-	"errors"
-	"fmt"
-	"sync"
-	"time"
-)
-
-// Batch calls fn as part of a batch. It behaves similar to Update,
-// except:
-//
-// 1. concurrent Batch calls can be combined into a single Bolt
-// transaction.
-//
-// 2. the function passed to Batch may be called multiple times,
-// regardless of whether it returns error or not.
-//
-// This means that Batch function side effects must be idempotent and
-// take permanent effect only after a successful return is seen in
-// caller.
-//
-// The maximum batch size and delay can be adjusted with DB.MaxBatchSize
-// and DB.MaxBatchDelay, respectively.
-//
-// Batch is only useful when there are multiple goroutines calling it.
-func (db *DB) Batch(fn func(*Tx) error) error {
-	errCh := make(chan error, 1)
-
-	db.batchMu.Lock()
-	if (db.batch == nil) || (db.batch != nil && len(db.batch.calls) >= db.MaxBatchSize) {
-		// There is no existing batch, or the existing batch is full; start a new one.
-		db.batch = &batch{
-			db: db,
-		}
-		db.batch.timer = time.AfterFunc(db.MaxBatchDelay, db.batch.trigger)
-	}
-	db.batch.calls = append(db.batch.calls, call{fn: fn, err: errCh})
-	if len(db.batch.calls) >= db.MaxBatchSize {
-		// wake up batch, it's ready to run
-		go db.batch.trigger()
-	}
-	db.batchMu.Unlock()
-
-	err := <-errCh
-	if err == trySolo {
-		err = db.Update(fn)
-	}
-	return err
-}
-
-type call struct {
-	fn  func(*Tx) error
-	err chan<- error
-}
-
-type batch struct {
-	db    *DB
-	timer *time.Timer
-	start sync.Once
-	calls []call
-}
-
-// trigger runs the batch if it hasn't already been run.
-func (b *batch) trigger() {
-	b.start.Do(b.run)
-}
-
-// run performs the transactions in the batch and communicates results
-// back to DB.Batch.
-func (b *batch) run() {
-	b.db.batchMu.Lock()
-	b.timer.Stop()
-	// Make sure no new work is added to this batch, but don't break
-	// other batches.
-	if b.db.batch == b {
-		b.db.batch = nil
-	}
-	b.db.batchMu.Unlock()
-
-retry:
-	for len(b.calls) > 0 {
-		var failIdx = -1
-		err := b.db.Update(func(tx *Tx) error {
-			for i, c := range b.calls {
-				if err := safelyCall(c.fn, tx); err != nil {
-					failIdx = i
-					return err
-				}
-			}
-			return nil
-		})
-
-		if failIdx >= 0 {
-			// take the failing transaction out of the batch. it's
-			// safe to shorten b.calls here because db.batch no longer
-			// points to us, and we hold the mutex anyway.
-			c := b.calls[failIdx]
-			b.calls[failIdx], b.calls = b.calls[len(b.calls)-1], b.calls[:len(b.calls)-1]
-			// tell the submitter re-run it solo, continue with the rest of the batch
-			c.err <- trySolo
-			continue retry
-		}
-
-		// pass success, or bolt internal errors, to all callers
-		for _, c := range b.calls {
-			if c.err != nil {
-				c.err <- err
-			}
-		}
-		break retry
-	}
-}
-
-// trySolo is a special sentinel error value used for signaling that a
-// transaction function should be re-run. It should never be seen by
-// callers.
-var trySolo = errors.New("batch function returned an error and should be re-run solo")
-
-type panicked struct {
-	reason interface{}
-}
-
-func (p panicked) Error() string {
-	if err, ok := p.reason.(error); ok {
-		return err.Error()
-	}
-	return fmt.Sprintf("panic: %v", p.reason)
-}
-
-func safelyCall(fn func(*Tx) error, tx *Tx) (err error) {
-	defer func() {
-		if p := recover(); p != nil {
-			err = panicked{p}
-		}
-	}()
-	return fn(tx)
-}
diff --git a/Godeps/_workspace/src/github.com/boltdb/bolt/batch_benchmark_test.go b/Godeps/_workspace/src/github.com/boltdb/bolt/batch_benchmark_test.go
deleted file mode 100644
index b745a371f..000000000
--- a/Godeps/_workspace/src/github.com/boltdb/bolt/batch_benchmark_test.go
+++ /dev/null
@@ -1,170 +0,0 @@
-package bolt_test
-
-import (
-	"bytes"
-	"encoding/binary"
-	"errors"
-	"hash/fnv"
-	"sync"
-	"testing"
-
-	"github.com/boltdb/bolt"
-)
-
-func validateBatchBench(b *testing.B, db *TestDB) {
-	var rollback = errors.New("sentinel error to cause rollback")
-	validate := func(tx *bolt.Tx) error {
-		bucket := tx.Bucket([]byte("bench"))
-		h := fnv.New32a()
-		buf := make([]byte, 4)
-		for id := uint32(0); id < 1000; id++ {
-			binary.LittleEndian.PutUint32(buf, id)
-			h.Reset()
-			h.Write(buf[:])
-			k := h.Sum(nil)
-			v := bucket.Get(k)
-			if v == nil {
-				b.Errorf("not found id=%d key=%x", id, k)
-				continue
-			}
-			if g, e := v, []byte("filler"); !bytes.Equal(g, e) {
-				b.Errorf("bad value for id=%d key=%x: %s != %q", id, k, g, e)
-			}
-			if err := bucket.Delete(k); err != nil {
-				return err
-			}
-		}
-		// should be empty now
-		c := bucket.Cursor()
-		for k, v := c.First(); k != nil; k, v = c.Next() {
-			b.Errorf("unexpected key: %x = %q", k, v)
-		}
-		return rollback
-	}
-	if err := db.Update(validate); err != nil && err != rollback {
-		b.Error(err)
-	}
-}
-
-func BenchmarkDBBatchAutomatic(b *testing.B) {
-	db := NewTestDB()
-	defer db.Close()
-	db.MustCreateBucket([]byte("bench"))
-
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		start := make(chan struct{})
-		var wg sync.WaitGroup
-
-		for round := 0; round < 1000; round++ {
-			wg.Add(1)
-
-			go func(id uint32) {
-				defer wg.Done()
-				<-start
-
-				h := fnv.New32a()
-				buf := make([]byte, 4)
-				binary.LittleEndian.PutUint32(buf, id)
-				h.Write(buf[:])
-				k := h.Sum(nil)
-				insert := func(tx *bolt.Tx) error {
-					b := tx.Bucket([]byte("bench"))
-					return b.Put(k, []byte("filler"))
-				}
-				if err := db.Batch(insert); err != nil {
-					b.Error(err)
-					return
-				}
-			}(uint32(round))
-		}
-		close(start)
-		wg.Wait()
-	}
-
-	b.StopTimer()
-	validateBatchBench(b, db)
-}
-
-func BenchmarkDBBatchSingle(b *testing.B) {
-	db := NewTestDB()
-	defer db.Close()
-	db.MustCreateBucket([]byte("bench"))
-
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		start := make(chan struct{})
-		var wg sync.WaitGroup
-
-		for round := 0; round < 1000; round++ {
-			wg.Add(1)
-			go func(id uint32) {
-				defer wg.Done()
-				<-start
-
-				h := fnv.New32a()
-				buf := make([]byte, 4)
-				binary.LittleEndian.PutUint32(buf, id)
-				h.Write(buf[:])
-				k := h.Sum(nil)
-				insert := func(tx *bolt.Tx) error {
-					b := tx.Bucket([]byte("bench"))
-					return b.Put(k, []byte("filler"))
-				}
-				if err := db.Update(insert); err != nil {
-					b.Error(err)
-					return
-				}
-			}(uint32(round))
-		}
-		close(start)
-		wg.Wait()
-	}
-
-	b.StopTimer()
-	validateBatchBench(b, db)
-}
-
-func BenchmarkDBBatchManual10x100(b *testing.B) {
-	db := NewTestDB()
-	defer db.Close()
-	db.MustCreateBucket([]byte("bench"))
-
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		start := make(chan struct{})
-		var wg sync.WaitGroup
-
-		for major := 0; major < 10; major++ {
-			wg.Add(1)
-			go func(id uint32) {
-				defer wg.Done()
-				<-start
-
-				insert100 := func(tx *bolt.Tx) error {
-					h := fnv.New32a()
-					buf := make([]byte, 4)
-					for minor := uint32(0); minor < 100; minor++ {
-						binary.LittleEndian.PutUint32(buf, uint32(id*100+minor))
-						h.Reset()
-						h.Write(buf[:])
-						k := h.Sum(nil)
-						b := tx.Bucket([]byte("bench"))
-						if err := b.Put(k, []byte("filler")); err != nil {
-							return err
-						}
-					}
-					return nil
-				}
-				if err := db.Update(insert100); err != nil {
-					b.Fatal(err)
-				}
-			}(uint32(major))
-		}
-		close(start)
-		wg.Wait()
-	}
-
-	b.StopTimer()
-	validateBatchBench(b, db)
-}
diff --git a/Godeps/_workspace/src/github.com/boltdb/bolt/batch_example_test.go b/Godeps/_workspace/src/github.com/boltdb/bolt/batch_example_test.go
deleted file mode 100644
index 74eff8af9..000000000
--- a/Godeps/_workspace/src/github.com/boltdb/bolt/batch_example_test.go
+++ /dev/null
@@ -1,148 +0,0 @@
-package bolt_test
-
-import (
-	"encoding/binary"
-	"fmt"
-	"io/ioutil"
-	"log"
-	"math/rand"
-	"net/http"
-	"net/http/httptest"
-	"os"
-
-	"github.com/boltdb/bolt"
-)
-
-// Set this to see how the counts are actually updated.
-const verbose = false
-
-// Counter updates a counter in Bolt for every URL path requested.
-type counter struct {
-	db *bolt.DB
-}
-
-func (c counter) ServeHTTP(rw http.ResponseWriter, req *http.Request) {
-	// Communicates the new count from a successful database
-	// transaction.
-	var result uint64
-
-	increment := func(tx *bolt.Tx) error {
-		b, err := tx.CreateBucketIfNotExists([]byte("hits"))
-		if err != nil {
-			return err
-		}
-		key := []byte(req.URL.String())
-		// Decode handles key not found for us.
-		count := decode(b.Get(key)) + 1
-		b.Put(key, encode(count))
-		// All good, communicate new count.
-		result = count
-		return nil
-	}
-	if err := c.db.Batch(increment); err != nil {
-		http.Error(rw, err.Error(), 500)
-		return
-	}
-
-	if verbose {
-		log.Printf("server: %s: %d", req.URL.String(), result)
-	}
-
-	rw.Header().Set("Content-Type", "application/octet-stream")
-	fmt.Fprintf(rw, "%d\n", result)
-}
-
-func client(id int, base string, paths []string) error {
-	// Process paths in random order.
-	rng := rand.New(rand.NewSource(int64(id)))
-	permutation := rng.Perm(len(paths))
-
-	for i := range paths {
-		path := paths[permutation[i]]
-		resp, err := http.Get(base + path)
-		if err != nil {
-			return err
-		}
-		defer resp.Body.Close()
-		buf, err := ioutil.ReadAll(resp.Body)
-		if err != nil {
-			return err
-		}
-		if verbose {
-			log.Printf("client: %s: %s", path, buf)
-		}
-	}
-	return nil
-}
-
-func ExampleDB_Batch() {
-	// Open the database.
-	db, _ := bolt.Open(tempfile(), 0666, nil)
-	defer os.Remove(db.Path())
-	defer db.Close()
-
-	// Start our web server
-	count := counter{db}
-	srv := httptest.NewServer(count)
-	defer srv.Close()
-
-	// Decrease the batch size to make things more interesting.
-	db.MaxBatchSize = 3
-
-	// Get every path multiple times concurrently.
-	const clients = 10
-	paths := []string{
-		"/foo",
-		"/bar",
-		"/baz",
-		"/quux",
-		"/thud",
-		"/xyzzy",
-	}
-	errors := make(chan error, clients)
-	for i := 0; i < clients; i++ {
-		go func(id int) {
-			errors <- client(id, srv.URL, paths)
-		}(i)
-	}
-	// Check all responses to make sure there's no error.
-	for i := 0; i < clients; i++ {
-		if err := <-errors; err != nil {
-			fmt.Printf("client error: %v", err)
-			return
-		}
-	}
-
-	// Check the final result
-	db.View(func(tx *bolt.Tx) error {
-		b := tx.Bucket([]byte("hits"))
-		c := b.Cursor()
-		for k, v := c.First(); k != nil; k, v = c.Next() {
-			fmt.Printf("hits to %s: %d\n", k, decode(v))
-		}
-		return nil
-	})
-
-	// Output:
-	// hits to /bar: 10
-	// hits to /baz: 10
-	// hits to /foo: 10
-	// hits to /quux: 10
-	// hits to /thud: 10
-	// hits to /xyzzy: 10
-}
-
-// encode marshals a counter.
-func encode(n uint64) []byte {
-	buf := make([]byte, 8)
-	binary.BigEndian.PutUint64(buf, n)
-	return buf
-}
-
-// decode unmarshals a counter. Nil buffers are decoded as 0.
-func decode(buf []byte) uint64 {
-	if buf == nil {
-		return 0
-	}
-	return binary.BigEndian.Uint64(buf)
-}
diff --git a/Godeps/_workspace/src/github.com/boltdb/bolt/batch_test.go b/Godeps/_workspace/src/github.com/boltdb/bolt/batch_test.go
deleted file mode 100644
index 0b5075fdd..000000000
--- a/Godeps/_workspace/src/github.com/boltdb/bolt/batch_test.go
+++ /dev/null
@@ -1,167 +0,0 @@
-package bolt_test
-
-import (
-	"testing"
-	"time"
-
-	"github.com/boltdb/bolt"
-)
-
-// Ensure two functions can perform updates in a single batch.
-func TestDB_Batch(t *testing.T) {
-	db := NewTestDB()
-	defer db.Close()
-	db.MustCreateBucket([]byte("widgets"))
-
-	// Iterate over multiple updates in separate goroutines.
-	n := 2
-	ch := make(chan error)
-	for i := 0; i < n; i++ {
-		go func(i int) {
-			ch <- db.Batch(func(tx *bolt.Tx) error {
-				return tx.Bucket([]byte("widgets")).Put(u64tob(uint64(i)), []byte{})
-			})
-		}(i)
-	}
-
-	// Check all responses to make sure there's no error.
-	for i := 0; i < n; i++ {
-		if err := <-ch; err != nil {
-			t.Fatal(err)
-		}
-	}
-
-	// Ensure data is correct.
-	db.MustView(func(tx *bolt.Tx) error {
-		b := tx.Bucket([]byte("widgets"))
-		for i := 0; i < n; i++ {
-			if v := b.Get(u64tob(uint64(i))); v == nil {
-				t.Errorf("key not found: %d", i)
-			}
-		}
-		return nil
-	})
-}
-
-func TestDB_Batch_Panic(t *testing.T) {
-	db := NewTestDB()
-	defer db.Close()
-
-	var sentinel int
-	var bork = &sentinel
-	var problem interface{}
-	var err error
-
-	// Execute a function inside a batch that panics.
-	func() {
-		defer func() {
-			if p := recover(); p != nil {
-				problem = p
-			}
-		}()
-		err = db.Batch(func(tx *bolt.Tx) error {
-			panic(bork)
-		})
-	}()
-
-	// Verify there is no error.
-	if g, e := err, error(nil); g != e {
-		t.Fatalf("wrong error: %v != %v", g, e)
-	}
-	// Verify the panic was captured.
-	if g, e := problem, bork; g != e {
-		t.Fatalf("wrong error: %v != %v", g, e)
-	}
-}
-
-func TestDB_BatchFull(t *testing.T) {
-	db := NewTestDB()
-	defer db.Close()
-	db.MustCreateBucket([]byte("widgets"))
-
-	const size = 3
-	// buffered so we never leak goroutines
-	ch := make(chan error, size)
-	put := func(i int) {
-		ch <- db.Batch(func(tx *bolt.Tx) error {
-			return tx.Bucket([]byte("widgets")).Put(u64tob(uint64(i)), []byte{})
-		})
-	}
-
-	db.MaxBatchSize = size
-	// high enough to never trigger here
-	db.MaxBatchDelay = 1 * time.Hour
-
-	go put(1)
-	go put(2)
-
-	// Give the batch a chance to exhibit bugs.
-	time.Sleep(10 * time.Millisecond)
-
-	// not triggered yet
-	select {
-	case <-ch:
-		t.Fatalf("batch triggered too early")
-	default:
-	}
-
-	go put(3)
-
-	// Check all responses to make sure there's no error.
-	for i := 0; i < size; i++ {
-		if err := <-ch; err != nil {
-			t.Fatal(err)
-		}
-	}
-
-	// Ensure data is correct.
-	db.MustView(func(tx *bolt.Tx) error {
-		b := tx.Bucket([]byte("widgets"))
-		for i := 1; i <= size; i++ {
-			if v := b.Get(u64tob(uint64(i))); v == nil {
-				t.Errorf("key not found: %d", i)
-			}
-		}
-		return nil
-	})
-}
-
-func TestDB_BatchTime(t *testing.T) {
-	db := NewTestDB()
-	defer db.Close()
-	db.MustCreateBucket([]byte("widgets"))
-
-	const size = 1
-	// buffered so we never leak goroutines
-	ch := make(chan error, size)
-	put := func(i int) {
-		ch <- db.Batch(func(tx *bolt.Tx) error {
-			return tx.Bucket([]byte("widgets")).Put(u64tob(uint64(i)), []byte{})
-		})
-	}
-
-	db.MaxBatchSize = 1000
-	db.MaxBatchDelay = 0
-
-	go put(1)
-
-	// Batch must trigger by time alone.
-
-	// Check all responses to make sure there's no error.
-	for i := 0; i < size; i++ {
-		if err := <-ch; err != nil {
-			t.Fatal(err)
-		}
-	}
-
-	// Ensure data is correct.
-	db.MustView(func(tx *bolt.Tx) error {
-		b := tx.Bucket([]byte("widgets"))
-		for i := 1; i <= size; i++ {
-			if v := b.Get(u64tob(uint64(i))); v == nil {
-				t.Errorf("key not found: %d", i)
-			}
-		}
-		return nil
-	})
-}
diff --git a/Godeps/_workspace/src/github.com/boltdb/bolt/bolt_386.go b/Godeps/_workspace/src/github.com/boltdb/bolt/bolt_386.go
deleted file mode 100644
index e659bfb91..000000000
--- a/Godeps/_workspace/src/github.com/boltdb/bolt/bolt_386.go
+++ /dev/null
@@ -1,7 +0,0 @@
-package bolt
-
-// maxMapSize represents the largest mmap size supported by Bolt.
-const maxMapSize = 0x7FFFFFFF // 2GB
-
-// maxAllocSize is the size used when creating array pointers.
-const maxAllocSize = 0xFFFFFFF
diff --git a/Godeps/_workspace/src/github.com/boltdb/bolt/bolt_amd64.go b/Godeps/_workspace/src/github.com/boltdb/bolt/bolt_amd64.go
deleted file mode 100644
index cca6b7eb7..000000000
--- a/Godeps/_workspace/src/github.com/boltdb/bolt/bolt_amd64.go
+++ /dev/null
@@ -1,7 +0,0 @@
-package bolt
-
-// maxMapSize represents the largest mmap size supported by Bolt.
-const maxMapSize = 0xFFFFFFFFFFFF // 256TB
-
-// maxAllocSize is the size used when creating array pointers.
-const maxAllocSize = 0x7FFFFFFF
diff --git a/Godeps/_workspace/src/github.com/boltdb/bolt/bolt_arm.go b/Godeps/_workspace/src/github.com/boltdb/bolt/bolt_arm.go
deleted file mode 100644
index e659bfb91..000000000
--- a/Godeps/_workspace/src/github.com/boltdb/bolt/bolt_arm.go
+++ /dev/null
@@ -1,7 +0,0 @@
-package bolt
-
-// maxMapSize represents the largest mmap size supported by Bolt.
-const maxMapSize = 0x7FFFFFFF // 2GB
-
-// maxAllocSize is the size used when creating array pointers.
-const maxAllocSize = 0xFFFFFFF
diff --git a/Godeps/_workspace/src/github.com/boltdb/bolt/bolt_linux.go b/Godeps/_workspace/src/github.com/boltdb/bolt/bolt_linux.go
deleted file mode 100644
index e9d1c907b..000000000
--- a/Godeps/_workspace/src/github.com/boltdb/bolt/bolt_linux.go
+++ /dev/null
@@ -1,12 +0,0 @@
-package bolt
-
-import (
-	"syscall"
-)
-
-var odirect = syscall.O_DIRECT
-
-// fdatasync flushes written data to a file descriptor.
-func fdatasync(db *DB) error {
-	return syscall.Fdatasync(int(db.file.Fd()))
-}
diff --git a/Godeps/_workspace/src/github.com/boltdb/bolt/bolt_openbsd.go b/Godeps/_workspace/src/github.com/boltdb/bolt/bolt_openbsd.go
deleted file mode 100644
index 7c1bef1a4..000000000
--- a/Godeps/_workspace/src/github.com/boltdb/bolt/bolt_openbsd.go
+++ /dev/null
@@ -1,29 +0,0 @@
-package bolt
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-const (
-	msAsync      = 1 << iota // perform asynchronous writes
-	msSync                   // perform synchronous writes
-	msInvalidate             // invalidate cached data
-)
-
-var odirect int
-
-func msync(db *DB) error {
-	_, _, errno := syscall.Syscall(syscall.SYS_MSYNC, uintptr(unsafe.Pointer(db.data)), uintptr(db.datasz), msInvalidate)
-	if errno != 0 {
-		return errno
-	}
-	return nil
-}
-
-func fdatasync(db *DB) error {
-	if db.data != nil {
-		return msync(db)
-	}
-	return db.file.Sync()
-}
diff --git a/Godeps/_workspace/src/github.com/boltdb/bolt/bolt_test.go b/Godeps/_workspace/src/github.com/boltdb/bolt/bolt_test.go
deleted file mode 100644
index b7bea1fc5..000000000
--- a/Godeps/_workspace/src/github.com/boltdb/bolt/bolt_test.go
+++ /dev/null
@@ -1,36 +0,0 @@
-package bolt_test
-
-import (
-	"fmt"
-	"path/filepath"
-	"reflect"
-	"runtime"
-	"testing"
-)
-
-// assert fails the test if the condition is false.
-func assert(tb testing.TB, condition bool, msg string, v ...interface{}) {
-	if !condition {
-		_, file, line, _ := runtime.Caller(1)
-		fmt.Printf("\033[31m%s:%d: "+msg+"\033[39m\n\n", append([]interface{}{filepath.Base(file), line}, v...)...)
-		tb.FailNow()
-	}
-}
-
-// ok fails the test if an err is not nil.
-func ok(tb testing.TB, err error) {
-	if err != nil {
-		_, file, line, _ := runtime.Caller(1)
-		fmt.Printf("\033[31m%s:%d: unexpected error: %s\033[39m\n\n", filepath.Base(file), line, err.Error())
-		tb.FailNow()
-	}
-}
-
-// equals fails the test if exp is not equal to act.
-func equals(tb testing.TB, exp, act interface{}) {
-	if !reflect.DeepEqual(exp, act) {
-		_, file, line, _ := runtime.Caller(1)
-		fmt.Printf("\033[31m%s:%d:\n\n\texp: %#v\n\n\tgot: %#v\033[39m\n\n", filepath.Base(file), line, exp, act)
-		tb.FailNow()
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/boltdb/bolt/bolt_unix.go b/Godeps/_workspace/src/github.com/boltdb/bolt/bolt_unix.go
deleted file mode 100644
index 17ca318bf..000000000
--- a/Godeps/_workspace/src/github.com/boltdb/bolt/bolt_unix.go
+++ /dev/null
@@ -1,100 +0,0 @@
-// +build !windows,!plan9
-
-package bolt
-
-import (
-	"fmt"
-	"os"
-	"syscall"
-	"time"
-	"unsafe"
-)
-
-// flock acquires an advisory lock on a file descriptor.
-func flock(f *os.File, exclusive bool, timeout time.Duration) error {
-	var t time.Time
-	for {
-		// If we're beyond our timeout then return an error.
-		// This can only occur after we've attempted a flock once.
-		if t.IsZero() {
-			t = time.Now()
-		} else if timeout > 0 && time.Since(t) > timeout {
-			return ErrTimeout
-		}
-		flag := syscall.LOCK_SH
-		if exclusive {
-			flag = syscall.LOCK_EX
-		}
-
-		// Otherwise attempt to obtain an exclusive lock.
-		err := syscall.Flock(int(f.Fd()), flag|syscall.LOCK_NB)
-		if err == nil {
-			return nil
-		} else if err != syscall.EWOULDBLOCK {
-			return err
-		}
-
-		// Wait for a bit and try again.
-		time.Sleep(50 * time.Millisecond)
-	}
-}
-
-// funlock releases an advisory lock on a file descriptor.
-func funlock(f *os.File) error {
-	return syscall.Flock(int(f.Fd()), syscall.LOCK_UN)
-}
-
-// mmap memory maps a DB's data file.
-func mmap(db *DB, sz int) error {
-	// Truncate and fsync to ensure file size metadata is flushed.
-	// https://github.com/boltdb/bolt/issues/284
-	if !db.NoGrowSync && !db.readOnly {
-		if err := db.file.Truncate(int64(sz)); err != nil {
-			return fmt.Errorf("file resize error: %s", err)
-		}
-		if err := db.file.Sync(); err != nil {
-			return fmt.Errorf("file sync error: %s", err)
-		}
-	}
-
-	// Map the data file to memory.
-	b, err := syscall.Mmap(int(db.file.Fd()), 0, sz, syscall.PROT_READ, syscall.MAP_SHARED)
-	if err != nil {
-		return err
-	}
-
-	// Advise the kernel that the mmap is accessed randomly.
-	if err := madvise(b, syscall.MADV_RANDOM); err != nil {
-		return fmt.Errorf("madvise: %s", err)
-	}
-
-	// Save the original byte slice and convert to a byte array pointer.
-	db.dataref = b
-	db.data = (*[maxMapSize]byte)(unsafe.Pointer(&b[0]))
-	db.datasz = sz
-	return nil
-}
-
-// munmap unmaps a DB's data file from memory.
-func munmap(db *DB) error {
-	// Ignore the unmap if we have no mapped data.
-	if db.dataref == nil {
-		return nil
-	}
-
-	// Unmap using the original byte slice.
-	err := syscall.Munmap(db.dataref)
-	db.dataref = nil
-	db.data = nil
-	db.datasz = 0
-	return err
-}
-
-// NOTE: This function is copied from stdlib because it is not available on darwin.
-func madvise(b []byte, advice int) (err error) {
-	_, _, e1 := syscall.Syscall(syscall.SYS_MADVISE, uintptr(unsafe.Pointer(&b[0])), uintptr(len(b)), uintptr(advice))
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
diff --git a/Godeps/_workspace/src/github.com/boltdb/bolt/bolt_windows.go b/Godeps/_workspace/src/github.com/boltdb/bolt/bolt_windows.go
deleted file mode 100644
index 8b782be5f..000000000
--- a/Godeps/_workspace/src/github.com/boltdb/bolt/bolt_windows.go
+++ /dev/null
@@ -1,76 +0,0 @@
-package bolt
-
-import (
-	"fmt"
-	"os"
-	"syscall"
-	"time"
-	"unsafe"
-)
-
-var odirect int
-
-// fdatasync flushes written data to a file descriptor.
-func fdatasync(db *DB) error {
-	return db.file.Sync()
-}
-
-// flock acquires an advisory lock on a file descriptor.
-func flock(f *os.File, _ bool, _ time.Duration) error {
-	return nil
-}
-
-// funlock releases an advisory lock on a file descriptor.
-func funlock(f *os.File) error {
-	return nil
-}
-
-// mmap memory maps a DB's data file.
-// Based on: https://github.com/edsrzf/mmap-go
-func mmap(db *DB, sz int) error {
-	if !db.readOnly {
-		// Truncate the database to the size of the mmap.
-		if err := db.file.Truncate(int64(sz)); err != nil {
-			return fmt.Errorf("truncate: %s", err)
-		}
-	}
-
-	// Open a file mapping handle.
-	sizelo := uint32(sz >> 32)
-	sizehi := uint32(sz) & 0xffffffff
-	h, errno := syscall.CreateFileMapping(syscall.Handle(db.file.Fd()), nil, syscall.PAGE_READONLY, sizelo, sizehi, nil)
-	if h == 0 {
-		return os.NewSyscallError("CreateFileMapping", errno)
-	}
-
-	// Create the memory map.
-	addr, errno := syscall.MapViewOfFile(h, syscall.FILE_MAP_READ, 0, 0, uintptr(sz))
-	if addr == 0 {
-		return os.NewSyscallError("MapViewOfFile", errno)
-	}
-
-	// Close mapping handle.
-	if err := syscall.CloseHandle(syscall.Handle(h)); err != nil {
-		return os.NewSyscallError("CloseHandle", err)
-	}
-
-	// Convert to a byte array.
-	db.data = ((*[maxMapSize]byte)(unsafe.Pointer(addr)))
-	db.datasz = sz
-
-	return nil
-}
-
-// munmap unmaps a pointer from a file.
-// Based on: https://github.com/edsrzf/mmap-go
-func munmap(db *DB) error {
-	if db.data == nil {
-		return nil
-	}
-
-	addr := (uintptr)(unsafe.Pointer(&db.data[0]))
-	if err := syscall.UnmapViewOfFile(addr); err != nil {
-		return os.NewSyscallError("UnmapViewOfFile", err)
-	}
-	return nil
-}
diff --git a/Godeps/_workspace/src/github.com/boltdb/bolt/boltsync_unix.go b/Godeps/_workspace/src/github.com/boltdb/bolt/boltsync_unix.go
deleted file mode 100644
index 8db89776f..000000000
--- a/Godeps/_workspace/src/github.com/boltdb/bolt/boltsync_unix.go
+++ /dev/null
@@ -1,10 +0,0 @@
-// +build !windows,!plan9,!linux,!openbsd
-
-package bolt
-
-var odirect int
-
-// fdatasync flushes written data to a file descriptor.
-func fdatasync(db *DB) error {
-	return db.file.Sync()
-}
diff --git a/Godeps/_workspace/src/github.com/boltdb/bolt/bucket.go b/Godeps/_workspace/src/github.com/boltdb/bolt/bucket.go
deleted file mode 100644
index 676699210..000000000
--- a/Godeps/_workspace/src/github.com/boltdb/bolt/bucket.go
+++ /dev/null
@@ -1,743 +0,0 @@
-package bolt
-
-import (
-	"bytes"
-	"fmt"
-	"unsafe"
-)
-
-const (
-	// MaxKeySize is the maximum length of a key, in bytes.
-	MaxKeySize = 32768
-
-	// MaxValueSize is the maximum length of a value, in bytes.
-	MaxValueSize = 4294967295
-)
-
-const (
-	maxUint = ^uint(0)
-	minUint = 0
-	maxInt  = int(^uint(0) >> 1)
-	minInt  = -maxInt - 1
-)
-
-const bucketHeaderSize = int(unsafe.Sizeof(bucket{}))
-
-const (
-	minFillPercent = 0.1
-	maxFillPercent = 1.0
-)
-
-// DefaultFillPercent is the percentage that split pages are filled.
-// This value can be changed by setting Bucket.FillPercent.
-const DefaultFillPercent = 0.5
-
-// Bucket represents a collection of key/value pairs inside the database.
-type Bucket struct {
-	*bucket
-	tx       *Tx                // the associated transaction
-	buckets  map[string]*Bucket // subbucket cache
-	page     *page              // inline page reference
-	rootNode *node              // materialized node for the root page.
-	nodes    map[pgid]*node     // node cache
-
-	// Sets the threshold for filling nodes when they split. By default,
-	// the bucket will fill to 50% but it can be useful to increase this
-	// amount if you know that your write workloads are mostly append-only.
-	//
-	// This is non-persisted across transactions so it must be set in every Tx.
-	FillPercent float64
-}
-
-// bucket represents the on-file representation of a bucket.
-// This is stored as the "value" of a bucket key. If the bucket is small enough,
-// then its root page can be stored inline in the "value", after the bucket
-// header. In the case of inline buckets, the "root" will be 0.
-type bucket struct {
-	root     pgid   // page id of the bucket's root-level page
-	sequence uint64 // monotonically incrementing, used by NextSequence()
-}
-
-// newBucket returns a new bucket associated with a transaction.
-func newBucket(tx *Tx) Bucket {
-	var b = Bucket{tx: tx, FillPercent: DefaultFillPercent}
-	if tx.writable {
-		b.buckets = make(map[string]*Bucket)
-		b.nodes = make(map[pgid]*node)
-	}
-	return b
-}
-
-// Tx returns the tx of the bucket.
-func (b *Bucket) Tx() *Tx {
-	return b.tx
-}
-
-// Root returns the root of the bucket.
-func (b *Bucket) Root() pgid {
-	return b.root
-}
-
-// Writable returns whether the bucket is writable.
-func (b *Bucket) Writable() bool {
-	return b.tx.writable
-}
-
-// Cursor creates a cursor associated with the bucket.
-// The cursor is only valid as long as the transaction is open.
-// Do not use a cursor after the transaction is closed.
-func (b *Bucket) Cursor() *Cursor {
-	// Update transaction statistics.
-	b.tx.stats.CursorCount++
-
-	// Allocate and return a cursor.
-	return &Cursor{
-		bucket: b,
-		stack:  make([]elemRef, 0),
-	}
-}
-
-// Bucket retrieves a nested bucket by name.
-// Returns nil if the bucket does not exist.
-func (b *Bucket) Bucket(name []byte) *Bucket {
-	if b.buckets != nil {
-		if child := b.buckets[string(name)]; child != nil {
-			return child
-		}
-	}
-
-	// Move cursor to key.
-	c := b.Cursor()
-	k, v, flags := c.seek(name)
-
-	// Return nil if the key doesn't exist or it is not a bucket.
-	if !bytes.Equal(name, k) || (flags&bucketLeafFlag) == 0 {
-		return nil
-	}
-
-	// Otherwise create a bucket and cache it.
-	var child = b.openBucket(v)
-	if b.buckets != nil {
-		b.buckets[string(name)] = child
-	}
-
-	return child
-}
-
-// Helper method that re-interprets a sub-bucket value
-// from a parent into a Bucket
-func (b *Bucket) openBucket(value []byte) *Bucket {
-	var child = newBucket(b.tx)
-
-	// If this is a writable transaction then we need to copy the bucket entry.
-	// Read-only transactions can point directly at the mmap entry.
-	if b.tx.writable {
-		child.bucket = &bucket{}
-		*child.bucket = *(*bucket)(unsafe.Pointer(&value[0]))
-	} else {
-		child.bucket = (*bucket)(unsafe.Pointer(&value[0]))
-	}
-
-	// Save a reference to the inline page if the bucket is inline.
-	if child.root == 0 {
-		child.page = (*page)(unsafe.Pointer(&value[bucketHeaderSize]))
-	}
-
-	return &child
-}
-
-// CreateBucket creates a new bucket at the given key and returns the new bucket.
-// Returns an error if the key already exists, if the bucket name is blank, or if the bucket name is too long.
-func (b *Bucket) CreateBucket(key []byte) (*Bucket, error) {
-	if b.tx.db == nil {
-		return nil, ErrTxClosed
-	} else if !b.tx.writable {
-		return nil, ErrTxNotWritable
-	} else if len(key) == 0 {
-		return nil, ErrBucketNameRequired
-	}
-
-	// Move cursor to correct position.
-	c := b.Cursor()
-	k, _, flags := c.seek(key)
-
-	// Return an error if there is an existing key.
-	if bytes.Equal(key, k) {
-		if (flags & bucketLeafFlag) != 0 {
-			return nil, ErrBucketExists
-		} else {
-			return nil, ErrIncompatibleValue
-		}
-	}
-
-	// Create empty, inline bucket.
-	var bucket = Bucket{
-		bucket:      &bucket{},
-		rootNode:    &node{isLeaf: true},
-		FillPercent: DefaultFillPercent,
-	}
-	var value = bucket.write()
-
-	// Insert into node.
-	key = cloneBytes(key)
-	c.node().put(key, key, value, 0, bucketLeafFlag)
-
-	// Since subbuckets are not allowed on inline buckets, we need to
-	// dereference the inline page, if it exists. This will cause the bucket
-	// to be treated as a regular, non-inline bucket for the rest of the tx.
-	b.page = nil
-
-	return b.Bucket(key), nil
-}
-
-// CreateBucketIfNotExists creates a new bucket if it doesn't already exist and returns a reference to it.
-// Returns an error if the bucket name is blank, or if the bucket name is too long.
-func (b *Bucket) CreateBucketIfNotExists(key []byte) (*Bucket, error) {
-	child, err := b.CreateBucket(key)
-	if err == ErrBucketExists {
-		return b.Bucket(key), nil
-	} else if err != nil {
-		return nil, err
-	}
-	return child, nil
-}
-
-// DeleteBucket deletes a bucket at the given key.
-// Returns an error if the bucket does not exists, or if the key represents a non-bucket value.
-func (b *Bucket) DeleteBucket(key []byte) error {
-	if b.tx.db == nil {
-		return ErrTxClosed
-	} else if !b.Writable() {
-		return ErrTxNotWritable
-	}
-
-	// Move cursor to correct position.
-	c := b.Cursor()
-	k, _, flags := c.seek(key)
-
-	// Return an error if bucket doesn't exist or is not a bucket.
-	if !bytes.Equal(key, k) {
-		return ErrBucketNotFound
-	} else if (flags & bucketLeafFlag) == 0 {
-		return ErrIncompatibleValue
-	}
-
-	// Recursively delete all child buckets.
-	child := b.Bucket(key)
-	err := child.ForEach(func(k, v []byte) error {
-		if v == nil {
-			if err := child.DeleteBucket(k); err != nil {
-				return fmt.Errorf("delete bucket: %s", err)
-			}
-		}
-		return nil
-	})
-	if err != nil {
-		return err
-	}
-
-	// Remove cached copy.
-	delete(b.buckets, string(key))
-
-	// Release all bucket pages to freelist.
-	child.nodes = nil
-	child.rootNode = nil
-	child.free()
-
-	// Delete the node if we have a matching key.
-	c.node().del(key)
-
-	return nil
-}
-
-// Get retrieves the value for a key in the bucket.
-// Returns a nil value if the key does not exist or if the key is a nested bucket.
-// The returned value is only valid for the life of the transaction.
-func (b *Bucket) Get(key []byte) []byte {
-	k, v, flags := b.Cursor().seek(key)
-
-	// Return nil if this is a bucket.
-	if (flags & bucketLeafFlag) != 0 {
-		return nil
-	}
-
-	// If our target node isn't the same key as what's passed in then return nil.
-	if !bytes.Equal(key, k) {
-		return nil
-	}
-	return v
-}
-
-// Put sets the value for a key in the bucket.
-// If the key exist then its previous value will be overwritten.
-// Returns an error if the bucket was created from a read-only transaction, if the key is blank, if the key is too large, or if the value is too large.
-func (b *Bucket) Put(key []byte, value []byte) error {
-	if b.tx.db == nil {
-		return ErrTxClosed
-	} else if !b.Writable() {
-		return ErrTxNotWritable
-	} else if len(key) == 0 {
-		return ErrKeyRequired
-	} else if len(key) > MaxKeySize {
-		return ErrKeyTooLarge
-	} else if int64(len(value)) > MaxValueSize {
-		return ErrValueTooLarge
-	}
-
-	// Move cursor to correct position.
-	c := b.Cursor()
-	k, _, flags := c.seek(key)
-
-	// Return an error if there is an existing key with a bucket value.
-	if bytes.Equal(key, k) && (flags&bucketLeafFlag) != 0 {
-		return ErrIncompatibleValue
-	}
-
-	// Insert into node.
-	key = cloneBytes(key)
-	c.node().put(key, key, value, 0, 0)
-
-	return nil
-}
-
-// Delete removes a key from the bucket.
-// If the key does not exist then nothing is done and a nil error is returned.
-// Returns an error if the bucket was created from a read-only transaction.
-func (b *Bucket) Delete(key []byte) error {
-	if b.tx.db == nil {
-		return ErrTxClosed
-	} else if !b.Writable() {
-		return ErrTxNotWritable
-	}
-
-	// Move cursor to correct position.
-	c := b.Cursor()
-	_, _, flags := c.seek(key)
-
-	// Return an error if there is already existing bucket value.
-	if (flags & bucketLeafFlag) != 0 {
-		return ErrIncompatibleValue
-	}
-
-	// Delete the node if we have a matching key.
-	c.node().del(key)
-
-	return nil
-}
-
-// NextSequence returns an autoincrementing integer for the bucket.
-func (b *Bucket) NextSequence() (uint64, error) {
-	if b.tx.db == nil {
-		return 0, ErrTxClosed
-	} else if !b.Writable() {
-		return 0, ErrTxNotWritable
-	}
-
-	// Materialize the root node if it hasn't been already so that the
-	// bucket will be saved during commit.
-	if b.rootNode == nil {
-		_ = b.node(b.root, nil)
-	}
-
-	// Increment and return the sequence.
-	b.bucket.sequence++
-	return b.bucket.sequence, nil
-}
-
-// ForEach executes a function for each key/value pair in a bucket.
-// If the provided function returns an error then the iteration is stopped and
-// the error is returned to the caller.
-func (b *Bucket) ForEach(fn func(k, v []byte) error) error {
-	if b.tx.db == nil {
-		return ErrTxClosed
-	}
-	c := b.Cursor()
-	for k, v := c.First(); k != nil; k, v = c.Next() {
-		if err := fn(k, v); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-// Stat returns stats on a bucket.
-func (b *Bucket) Stats() BucketStats {
-	var s, subStats BucketStats
-	pageSize := b.tx.db.pageSize
-	s.BucketN += 1
-	if b.root == 0 {
-		s.InlineBucketN += 1
-	}
-	b.forEachPage(func(p *page, depth int) {
-		if (p.flags & leafPageFlag) != 0 {
-			s.KeyN += int(p.count)
-
-			// used totals the used bytes for the page
-			used := pageHeaderSize
-
-			if p.count != 0 {
-				// If page has any elements, add all element headers.
-				used += leafPageElementSize * int(p.count-1)
-
-				// Add all element key, value sizes.
-				// The computation takes advantage of the fact that the position
-				// of the last element's key/value equals to the total of the sizes
-				// of all previous elements' keys and values.
-				// It also includes the last element's header.
-				lastElement := p.leafPageElement(p.count - 1)
-				used += int(lastElement.pos + lastElement.ksize + lastElement.vsize)
-			}
-
-			if b.root == 0 {
-				// For inlined bucket just update the inline stats
-				s.InlineBucketInuse += used
-			} else {
-				// For non-inlined bucket update all the leaf stats
-				s.LeafPageN++
-				s.LeafInuse += used
-				s.LeafOverflowN += int(p.overflow)
-
-				// Collect stats from sub-buckets.
-				// Do that by iterating over all element headers
-				// looking for the ones with the bucketLeafFlag.
-				for i := uint16(0); i < p.count; i++ {
-					e := p.leafPageElement(i)
-					if (e.flags & bucketLeafFlag) != 0 {
-						// For any bucket element, open the element value
-						// and recursively call Stats on the contained bucket.
-						subStats.Add(b.openBucket(e.value()).Stats())
-					}
-				}
-			}
-		} else if (p.flags & branchPageFlag) != 0 {
-			s.BranchPageN++
-			lastElement := p.branchPageElement(p.count - 1)
-
-			// used totals the used bytes for the page
-			// Add header and all element headers.
-			used := pageHeaderSize + (branchPageElementSize * int(p.count-1))
-
-			// Add size of all keys and values.
-			// Again, use the fact that last element's position equals to
-			// the total of key, value sizes of all previous elements.
-			used += int(lastElement.pos + lastElement.ksize)
-			s.BranchInuse += used
-			s.BranchOverflowN += int(p.overflow)
-		}
-
-		// Keep track of maximum page depth.
-		if depth+1 > s.Depth {
-			s.Depth = (depth + 1)
-		}
-	})
-
-	// Alloc stats can be computed from page counts and pageSize.
-	s.BranchAlloc = (s.BranchPageN + s.BranchOverflowN) * pageSize
-	s.LeafAlloc = (s.LeafPageN + s.LeafOverflowN) * pageSize
-
-	// Add the max depth of sub-buckets to get total nested depth.
-	s.Depth += subStats.Depth
-	// Add the stats for all sub-buckets
-	s.Add(subStats)
-	return s
-}
-
-// forEachPage iterates over every page in a bucket, including inline pages.
-func (b *Bucket) forEachPage(fn func(*page, int)) {
-	// If we have an inline page then just use that.
-	if b.page != nil {
-		fn(b.page, 0)
-		return
-	}
-
-	// Otherwise traverse the page hierarchy.
-	b.tx.forEachPage(b.root, 0, fn)
-}
-
-// forEachPageNode iterates over every page (or node) in a bucket.
-// This also includes inline pages.
-func (b *Bucket) forEachPageNode(fn func(*page, *node, int)) {
-	// If we have an inline page or root node then just use that.
-	if b.page != nil {
-		fn(b.page, nil, 0)
-		return
-	}
-	b._forEachPageNode(b.root, 0, fn)
-}
-
-func (b *Bucket) _forEachPageNode(pgid pgid, depth int, fn func(*page, *node, int)) {
-	var p, n = b.pageNode(pgid)
-
-	// Execute function.
-	fn(p, n, depth)
-
-	// Recursively loop over children.
-	if p != nil {
-		if (p.flags & branchPageFlag) != 0 {
-			for i := 0; i < int(p.count); i++ {
-				elem := p.branchPageElement(uint16(i))
-				b._forEachPageNode(elem.pgid, depth+1, fn)
-			}
-		}
-	} else {
-		if !n.isLeaf {
-			for _, inode := range n.inodes {
-				b._forEachPageNode(inode.pgid, depth+1, fn)
-			}
-		}
-	}
-}
-
-// spill writes all the nodes for this bucket to dirty pages.
-func (b *Bucket) spill() error {
-	// Spill all child buckets first.
-	for name, child := range b.buckets {
-		// If the child bucket is small enough and it has no child buckets then
-		// write it inline into the parent bucket's page. Otherwise spill it
-		// like a normal bucket and make the parent value a pointer to the page.
-		var value []byte
-		if child.inlineable() {
-			child.free()
-			value = child.write()
-		} else {
-			if err := child.spill(); err != nil {
-				return err
-			}
-
-			// Update the child bucket header in this bucket.
-			value = make([]byte, unsafe.Sizeof(bucket{}))
-			var bucket = (*bucket)(unsafe.Pointer(&value[0]))
-			*bucket = *child.bucket
-		}
-
-		// Skip writing the bucket if there are no materialized nodes.
-		if child.rootNode == nil {
-			continue
-		}
-
-		// Update parent node.
-		var c = b.Cursor()
-		k, _, flags := c.seek([]byte(name))
-		if !bytes.Equal([]byte(name), k) {
-			panic(fmt.Sprintf("misplaced bucket header: %x -> %x", []byte(name), k))
-		}
-		if flags&bucketLeafFlag == 0 {
-			panic(fmt.Sprintf("unexpected bucket header flag: %x", flags))
-		}
-		c.node().put([]byte(name), []byte(name), value, 0, bucketLeafFlag)
-	}
-
-	// Ignore if there's not a materialized root node.
-	if b.rootNode == nil {
-		return nil
-	}
-
-	// Spill nodes.
-	if err := b.rootNode.spill(); err != nil {
-		return err
-	}
-	b.rootNode = b.rootNode.root()
-
-	// Update the root node for this bucket.
-	if b.rootNode.pgid >= b.tx.meta.pgid {
-		panic(fmt.Sprintf("pgid (%d) above high water mark (%d)", b.rootNode.pgid, b.tx.meta.pgid))
-	}
-	b.root = b.rootNode.pgid
-
-	return nil
-}
-
-// inlineable returns true if a bucket is small enough to be written inline
-// and if it contains no subbuckets. Otherwise returns false.
-func (b *Bucket) inlineable() bool {
-	var n = b.rootNode
-
-	// Bucket must only contain a single leaf node.
-	if n == nil || !n.isLeaf {
-		return false
-	}
-
-	// Bucket is not inlineable if it contains subbuckets or if it goes beyond
-	// our threshold for inline bucket size.
-	var size = pageHeaderSize
-	for _, inode := range n.inodes {
-		size += leafPageElementSize + len(inode.key) + len(inode.value)
-
-		if inode.flags&bucketLeafFlag != 0 {
-			return false
-		} else if size > b.maxInlineBucketSize() {
-			return false
-		}
-	}
-
-	return true
-}
-
-// Returns the maximum total size of a bucket to make it a candidate for inlining.
-func (b *Bucket) maxInlineBucketSize() int {
-	return b.tx.db.pageSize / 4
-}
-
-// write allocates and writes a bucket to a byte slice.
-func (b *Bucket) write() []byte {
-	// Allocate the appropriate size.
-	var n = b.rootNode
-	var value = make([]byte, bucketHeaderSize+n.size())
-
-	// Write a bucket header.
-	var bucket = (*bucket)(unsafe.Pointer(&value[0]))
-	*bucket = *b.bucket
-
-	// Convert byte slice to a fake page and write the root node.
-	var p = (*page)(unsafe.Pointer(&value[bucketHeaderSize]))
-	n.write(p)
-
-	return value
-}
-
-// rebalance attempts to balance all nodes.
-func (b *Bucket) rebalance() {
-	for _, n := range b.nodes {
-		n.rebalance()
-	}
-	for _, child := range b.buckets {
-		child.rebalance()
-	}
-}
-
-// node creates a node from a page and associates it with a given parent.
-func (b *Bucket) node(pgid pgid, parent *node) *node {
-	_assert(b.nodes != nil, "nodes map expected")
-
-	// Retrieve node if it's already been created.
-	if n := b.nodes[pgid]; n != nil {
-		return n
-	}
-
-	// Otherwise create a node and cache it.
-	n := &node{bucket: b, parent: parent}
-	if parent == nil {
-		b.rootNode = n
-	} else {
-		parent.children = append(parent.children, n)
-	}
-
-	// Use the inline page if this is an inline bucket.
-	var p = b.page
-	if p == nil {
-		p = b.tx.page(pgid)
-	}
-
-	// Read the page into the node and cache it.
-	n.read(p)
-	b.nodes[pgid] = n
-
-	// Update statistics.
-	b.tx.stats.NodeCount++
-
-	return n
-}
-
-// free recursively frees all pages in the bucket.
-func (b *Bucket) free() {
-	if b.root == 0 {
-		return
-	}
-
-	var tx = b.tx
-	b.forEachPageNode(func(p *page, n *node, _ int) {
-		if p != nil {
-			tx.db.freelist.free(tx.meta.txid, p)
-		} else {
-			n.free()
-		}
-	})
-	b.root = 0
-}
-
-// dereference removes all references to the old mmap.
-func (b *Bucket) dereference() {
-	if b.rootNode != nil {
-		b.rootNode.root().dereference()
-	}
-
-	for _, child := range b.buckets {
-		child.dereference()
-	}
-}
-
-// pageNode returns the in-memory node, if it exists.
-// Otherwise returns the underlying page.
-func (b *Bucket) pageNode(id pgid) (*page, *node) {
-	// Inline buckets have a fake page embedded in their value so treat them
-	// differently. We'll return the rootNode (if available) or the fake page.
-	if b.root == 0 {
-		if id != 0 {
-			panic(fmt.Sprintf("inline bucket non-zero page access(2): %d != 0", id))
-		}
-		if b.rootNode != nil {
-			return nil, b.rootNode
-		}
-		return b.page, nil
-	}
-
-	// Check the node cache for non-inline buckets.
-	if b.nodes != nil {
-		if n := b.nodes[id]; n != nil {
-			return nil, n
-		}
-	}
-
-	// Finally lookup the page from the transaction if no node is materialized.
-	return b.tx.page(id), nil
-}
-
-// BucketStats records statistics about resources used by a bucket.
-type BucketStats struct {
-	// Page count statistics.
-	BranchPageN     int // number of logical branch pages
-	BranchOverflowN int // number of physical branch overflow pages
-	LeafPageN       int // number of logical leaf pages
-	LeafOverflowN   int // number of physical leaf overflow pages
-
-	// Tree statistics.
-	KeyN  int // number of keys/value pairs
-	Depth int // number of levels in B+tree
-
-	// Page size utilization.
-	BranchAlloc int // bytes allocated for physical branch pages
-	BranchInuse int // bytes actually used for branch data
-	LeafAlloc   int // bytes allocated for physical leaf pages
-	LeafInuse   int // bytes actually used for leaf data
-
-	// Bucket statistics
-	BucketN           int // total number of buckets including the top bucket
-	InlineBucketN     int // total number on inlined buckets
-	InlineBucketInuse int // bytes used for inlined buckets (also accounted for in LeafInuse)
-}
-
-func (s *BucketStats) Add(other BucketStats) {
-	s.BranchPageN += other.BranchPageN
-	s.BranchOverflowN += other.BranchOverflowN
-	s.LeafPageN += other.LeafPageN
-	s.LeafOverflowN += other.LeafOverflowN
-	s.KeyN += other.KeyN
-	if s.Depth < other.Depth {
-		s.Depth = other.Depth
-	}
-	s.BranchAlloc += other.BranchAlloc
-	s.BranchInuse += other.BranchInuse
-	s.LeafAlloc += other.LeafAlloc
-	s.LeafInuse += other.LeafInuse
-
-	s.BucketN += other.BucketN
-	s.InlineBucketN += other.InlineBucketN
-	s.InlineBucketInuse += other.InlineBucketInuse
-}
-
-// cloneBytes returns a copy of a given slice.
-func cloneBytes(v []byte) []byte {
-	var clone = make([]byte, len(v))
-	copy(clone, v)
-	return clone
-}
diff --git a/Godeps/_workspace/src/github.com/boltdb/bolt/bucket_test.go b/Godeps/_workspace/src/github.com/boltdb/bolt/bucket_test.go
deleted file mode 100644
index 62b8c5878..000000000
--- a/Godeps/_workspace/src/github.com/boltdb/bolt/bucket_test.go
+++ /dev/null
@@ -1,1169 +0,0 @@
-package bolt_test
-
-import (
-	"bytes"
-	"encoding/binary"
-	"errors"
-	"fmt"
-	"math/rand"
-	"os"
-	"strconv"
-	"strings"
-	"testing"
-	"testing/quick"
-
-	"github.com/boltdb/bolt"
-)
-
-// Ensure that a bucket that gets a non-existent key returns nil.
-func TestBucket_Get_NonExistent(t *testing.T) {
-	db := NewTestDB()
-	defer db.Close()
-	db.Update(func(tx *bolt.Tx) error {
-		tx.CreateBucket([]byte("widgets"))
-		value := tx.Bucket([]byte("widgets")).Get([]byte("foo"))
-		assert(t, value == nil, "")
-		return nil
-	})
-}
-
-// Ensure that a bucket can read a value that is not flushed yet.
-func TestBucket_Get_FromNode(t *testing.T) {
-	db := NewTestDB()
-	defer db.Close()
-	db.Update(func(tx *bolt.Tx) error {
-		tx.CreateBucket([]byte("widgets"))
-		b := tx.Bucket([]byte("widgets"))
-		b.Put([]byte("foo"), []byte("bar"))
-		value := b.Get([]byte("foo"))
-		equals(t, []byte("bar"), value)
-		return nil
-	})
-}
-
-// Ensure that a bucket retrieved via Get() returns a nil.
-func TestBucket_Get_IncompatibleValue(t *testing.T) {
-	db := NewTestDB()
-	defer db.Close()
-	db.Update(func(tx *bolt.Tx) error {
-		tx.CreateBucket([]byte("widgets"))
-		_, err := tx.Bucket([]byte("widgets")).CreateBucket([]byte("foo"))
-		ok(t, err)
-		assert(t, tx.Bucket([]byte("widgets")).Get([]byte("foo")) == nil, "")
-		return nil
-	})
-}
-
-// Ensure that a bucket can write a key/value.
-func TestBucket_Put(t *testing.T) {
-	db := NewTestDB()
-	defer db.Close()
-	db.Update(func(tx *bolt.Tx) error {
-		tx.CreateBucket([]byte("widgets"))
-		err := tx.Bucket([]byte("widgets")).Put([]byte("foo"), []byte("bar"))
-		ok(t, err)
-		value := tx.Bucket([]byte("widgets")).Get([]byte("foo"))
-		equals(t, value, []byte("bar"))
-		return nil
-	})
-}
-
-// Ensure that a bucket can rewrite a key in the same transaction.
-func TestBucket_Put_Repeat(t *testing.T) {
-	db := NewTestDB()
-	defer db.Close()
-	db.Update(func(tx *bolt.Tx) error {
-		tx.CreateBucket([]byte("widgets"))
-		b := tx.Bucket([]byte("widgets"))
-		ok(t, b.Put([]byte("foo"), []byte("bar")))
-		ok(t, b.Put([]byte("foo"), []byte("baz")))
-		value := tx.Bucket([]byte("widgets")).Get([]byte("foo"))
-		equals(t, value, []byte("baz"))
-		return nil
-	})
-}
-
-// Ensure that a bucket can write a bunch of large values.
-func TestBucket_Put_Large(t *testing.T) {
-	db := NewTestDB()
-	defer db.Close()
-
-	count, factor := 100, 200
-	db.Update(func(tx *bolt.Tx) error {
-		tx.CreateBucket([]byte("widgets"))
-		b := tx.Bucket([]byte("widgets"))
-		for i := 1; i < count; i++ {
-			ok(t, b.Put([]byte(strings.Repeat("0", i*factor)), []byte(strings.Repeat("X", (count-i)*factor))))
-		}
-		return nil
-	})
-	db.View(func(tx *bolt.Tx) error {
-		b := tx.Bucket([]byte("widgets"))
-		for i := 1; i < count; i++ {
-			value := b.Get([]byte(strings.Repeat("0", i*factor)))
-			equals(t, []byte(strings.Repeat("X", (count-i)*factor)), value)
-		}
-		return nil
-	})
-}
-
-// Ensure that a database can perform multiple large appends safely.
-func TestDB_Put_VeryLarge(t *testing.T) {
-	if testing.Short() {
-		t.Skip("skipping test in short mode.")
-	}
-
-	n, batchN := 400000, 200000
-	ksize, vsize := 8, 500
-
-	db := NewTestDB()
-	defer db.Close()
-
-	for i := 0; i < n; i += batchN {
-		err := db.Update(func(tx *bolt.Tx) error {
-			b, _ := tx.CreateBucketIfNotExists([]byte("widgets"))
-			for j := 0; j < batchN; j++ {
-				k, v := make([]byte, ksize), make([]byte, vsize)
-				binary.BigEndian.PutUint32(k, uint32(i+j))
-				ok(t, b.Put(k, v))
-			}
-			return nil
-		})
-		ok(t, err)
-	}
-}
-
-// Ensure that a setting a value on a key with a bucket value returns an error.
-func TestBucket_Put_IncompatibleValue(t *testing.T) {
-	db := NewTestDB()
-	defer db.Close()
-	db.Update(func(tx *bolt.Tx) error {
-		tx.CreateBucket([]byte("widgets"))
-		_, err := tx.Bucket([]byte("widgets")).CreateBucket([]byte("foo"))
-		ok(t, err)
-		equals(t, bolt.ErrIncompatibleValue, tx.Bucket([]byte("widgets")).Put([]byte("foo"), []byte("bar")))
-		return nil
-	})
-}
-
-// Ensure that a setting a value while the transaction is closed returns an error.
-func TestBucket_Put_Closed(t *testing.T) {
-	db := NewTestDB()
-	defer db.Close()
-	tx, _ := db.Begin(true)
-	tx.CreateBucket([]byte("widgets"))
-	b := tx.Bucket([]byte("widgets"))
-	tx.Rollback()
-	equals(t, bolt.ErrTxClosed, b.Put([]byte("foo"), []byte("bar")))
-}
-
-// Ensure that setting a value on a read-only bucket returns an error.
-func TestBucket_Put_ReadOnly(t *testing.T) {
-	db := NewTestDB()
-	defer db.Close()
-	db.Update(func(tx *bolt.Tx) error {
-		_, err := tx.CreateBucket([]byte("widgets"))
-		ok(t, err)
-		return nil
-	})
-	db.View(func(tx *bolt.Tx) error {
-		b := tx.Bucket([]byte("widgets"))
-		err := b.Put([]byte("foo"), []byte("bar"))
-		equals(t, err, bolt.ErrTxNotWritable)
-		return nil
-	})
-}
-
-// Ensure that a bucket can delete an existing key.
-func TestBucket_Delete(t *testing.T) {
-	db := NewTestDB()
-	defer db.Close()
-	db.Update(func(tx *bolt.Tx) error {
-		tx.CreateBucket([]byte("widgets"))
-		tx.Bucket([]byte("widgets")).Put([]byte("foo"), []byte("bar"))
-		err := tx.Bucket([]byte("widgets")).Delete([]byte("foo"))
-		ok(t, err)
-		value := tx.Bucket([]byte("widgets")).Get([]byte("foo"))
-		assert(t, value == nil, "")
-		return nil
-	})
-}
-
-// Ensure that deleting a large set of keys will work correctly.
-func TestBucket_Delete_Large(t *testing.T) {
-	db := NewTestDB()
-	defer db.Close()
-	db.Update(func(tx *bolt.Tx) error {
-		var b, _ = tx.CreateBucket([]byte("widgets"))
-		for i := 0; i < 100; i++ {
-			ok(t, b.Put([]byte(strconv.Itoa(i)), []byte(strings.Repeat("*", 1024))))
-		}
-		return nil
-	})
-	db.Update(func(tx *bolt.Tx) error {
-		var b = tx.Bucket([]byte("widgets"))
-		for i := 0; i < 100; i++ {
-			ok(t, b.Delete([]byte(strconv.Itoa(i))))
-		}
-		return nil
-	})
-	db.View(func(tx *bolt.Tx) error {
-		var b = tx.Bucket([]byte("widgets"))
-		for i := 0; i < 100; i++ {
-			assert(t, b.Get([]byte(strconv.Itoa(i))) == nil, "")
-		}
-		return nil
-	})
-}
-
-// Deleting a very large list of keys will cause the freelist to use overflow.
-func TestBucket_Delete_FreelistOverflow(t *testing.T) {
-	if testing.Short() {
-		t.Skip("skipping test in short mode.")
-	}
-
-	db := NewTestDB()
-	defer db.Close()
-	k := make([]byte, 16)
-	for i := uint64(0); i < 10000; i++ {
-		err := db.Update(func(tx *bolt.Tx) error {
-			b, err := tx.CreateBucketIfNotExists([]byte("0"))
-			if err != nil {
-				t.Fatalf("bucket error: %s", err)
-			}
-
-			for j := uint64(0); j < 1000; j++ {
-				binary.BigEndian.PutUint64(k[:8], i)
-				binary.BigEndian.PutUint64(k[8:], j)
-				if err := b.Put(k, nil); err != nil {
-					t.Fatalf("put error: %s", err)
-				}
-			}
-
-			return nil
-		})
-
-		if err != nil {
-			t.Fatalf("update error: %s", err)
-		}
-	}
-
-	// Delete all of them in one large transaction
-	err := db.Update(func(tx *bolt.Tx) error {
-		b := tx.Bucket([]byte("0"))
-		c := b.Cursor()
-		for k, _ := c.First(); k != nil; k, _ = c.Next() {
-			b.Delete(k)
-		}
-		return nil
-	})
-
-	// Check that a freelist overflow occurred.
-	ok(t, err)
-}
-
-// Ensure that accessing and updating nested buckets is ok across transactions.
-func TestBucket_Nested(t *testing.T) {
-	db := NewTestDB()
-	defer db.Close()
-	db.Update(func(tx *bolt.Tx) error {
-		// Create a widgets bucket.
-		b, err := tx.CreateBucket([]byte("widgets"))
-		ok(t, err)
-
-		// Create a widgets/foo bucket.
-		_, err = b.CreateBucket([]byte("foo"))
-		ok(t, err)
-
-		// Create a widgets/bar key.
-		ok(t, b.Put([]byte("bar"), []byte("0000")))
-
-		return nil
-	})
-	db.MustCheck()
-
-	// Update widgets/bar.
-	db.Update(func(tx *bolt.Tx) error {
-		var b = tx.Bucket([]byte("widgets"))
-		ok(t, b.Put([]byte("bar"), []byte("xxxx")))
-		return nil
-	})
-	db.MustCheck()
-
-	// Cause a split.
-	db.Update(func(tx *bolt.Tx) error {
-		var b = tx.Bucket([]byte("widgets"))
-		for i := 0; i < 10000; i++ {
-			ok(t, b.Put([]byte(strconv.Itoa(i)), []byte(strconv.Itoa(i))))
-		}
-		return nil
-	})
-	db.MustCheck()
-
-	// Insert into widgets/foo/baz.
-	db.Update(func(tx *bolt.Tx) error {
-		var b = tx.Bucket([]byte("widgets"))
-		ok(t, b.Bucket([]byte("foo")).Put([]byte("baz"), []byte("yyyy")))
-		return nil
-	})
-	db.MustCheck()
-
-	// Verify.
-	db.View(func(tx *bolt.Tx) error {
-		var b = tx.Bucket([]byte("widgets"))
-		equals(t, []byte("yyyy"), b.Bucket([]byte("foo")).Get([]byte("baz")))
-		equals(t, []byte("xxxx"), b.Get([]byte("bar")))
-		for i := 0; i < 10000; i++ {
-			equals(t, []byte(strconv.Itoa(i)), b.Get([]byte(strconv.Itoa(i))))
-		}
-		return nil
-	})
-}
-
-// Ensure that deleting a bucket using Delete() returns an error.
-func TestBucket_Delete_Bucket(t *testing.T) {
-	db := NewTestDB()
-	defer db.Close()
-	db.Update(func(tx *bolt.Tx) error {
-		tx.CreateBucket([]byte("widgets"))
-		b := tx.Bucket([]byte("widgets"))
-		_, err := b.CreateBucket([]byte("foo"))
-		ok(t, err)
-		equals(t, bolt.ErrIncompatibleValue, b.Delete([]byte("foo")))
-		return nil
-	})
-}
-
-// Ensure that deleting a key on a read-only bucket returns an error.
-func TestBucket_Delete_ReadOnly(t *testing.T) {
-	db := NewTestDB()
-	defer db.Close()
-	db.Update(func(tx *bolt.Tx) error {
-		tx.CreateBucket([]byte("widgets"))
-		return nil
-	})
-	db.View(func(tx *bolt.Tx) error {
-		b := tx.Bucket([]byte("widgets"))
-		err := b.Delete([]byte("foo"))
-		equals(t, err, bolt.ErrTxNotWritable)
-		return nil
-	})
-}
-
-// Ensure that a deleting value while the transaction is closed returns an error.
-func TestBucket_Delete_Closed(t *testing.T) {
-	db := NewTestDB()
-	defer db.Close()
-	tx, _ := db.Begin(true)
-	tx.CreateBucket([]byte("widgets"))
-	b := tx.Bucket([]byte("widgets"))
-	tx.Rollback()
-	equals(t, bolt.ErrTxClosed, b.Delete([]byte("foo")))
-}
-
-// Ensure that deleting a bucket causes nested buckets to be deleted.
-func TestBucket_DeleteBucket_Nested(t *testing.T) {
-	db := NewTestDB()
-	defer db.Close()
-	db.Update(func(tx *bolt.Tx) error {
-		tx.CreateBucket([]byte("widgets"))
-		_, err := tx.Bucket([]byte("widgets")).CreateBucket([]byte("foo"))
-		ok(t, err)
-		_, err = tx.Bucket([]byte("widgets")).Bucket([]byte("foo")).CreateBucket([]byte("bar"))
-		ok(t, err)
-		ok(t, tx.Bucket([]byte("widgets")).Bucket([]byte("foo")).Bucket([]byte("bar")).Put([]byte("baz"), []byte("bat")))
-		ok(t, tx.Bucket([]byte("widgets")).DeleteBucket([]byte("foo")))
-		return nil
-	})
-}
-
-// Ensure that deleting a bucket causes nested buckets to be deleted after they have been committed.
-func TestBucket_DeleteBucket_Nested2(t *testing.T) {
-	db := NewTestDB()
-	defer db.Close()
-	db.Update(func(tx *bolt.Tx) error {
-		tx.CreateBucket([]byte("widgets"))
-		_, err := tx.Bucket([]byte("widgets")).CreateBucket([]byte("foo"))
-		ok(t, err)
-		_, err = tx.Bucket([]byte("widgets")).Bucket([]byte("foo")).CreateBucket([]byte("bar"))
-		ok(t, err)
-		ok(t, tx.Bucket([]byte("widgets")).Bucket([]byte("foo")).Bucket([]byte("bar")).Put([]byte("baz"), []byte("bat")))
-		return nil
-	})
-	db.Update(func(tx *bolt.Tx) error {
-		assert(t, tx.Bucket([]byte("widgets")) != nil, "")
-		assert(t, tx.Bucket([]byte("widgets")).Bucket([]byte("foo")) != nil, "")
-		assert(t, tx.Bucket([]byte("widgets")).Bucket([]byte("foo")).Bucket([]byte("bar")) != nil, "")
-		equals(t, []byte("bat"), tx.Bucket([]byte("widgets")).Bucket([]byte("foo")).Bucket([]byte("bar")).Get([]byte("baz")))
-		ok(t, tx.DeleteBucket([]byte("widgets")))
-		return nil
-	})
-	db.View(func(tx *bolt.Tx) error {
-		assert(t, tx.Bucket([]byte("widgets")) == nil, "")
-		return nil
-	})
-}
-
-// Ensure that deleting a child bucket with multiple pages causes all pages to get collected.
-func TestBucket_DeleteBucket_Large(t *testing.T) {
-	db := NewTestDB()
-	defer db.Close()
-	db.Update(func(tx *bolt.Tx) error {
-		_, err := tx.CreateBucket([]byte("widgets"))
-		ok(t, err)
-		_, err = tx.Bucket([]byte("widgets")).CreateBucket([]byte("foo"))
-		ok(t, err)
-		b := tx.Bucket([]byte("widgets")).Bucket([]byte("foo"))
-		for i := 0; i < 1000; i++ {
-			ok(t, b.Put([]byte(fmt.Sprintf("%d", i)), []byte(fmt.Sprintf("%0100d", i))))
-		}
-		return nil
-	})
-	db.Update(func(tx *bolt.Tx) error {
-		ok(t, tx.DeleteBucket([]byte("widgets")))
-		return nil
-	})
-
-	// NOTE: Consistency check in TestDB.Close() will panic if pages not freed properly.
-}
-
-// Ensure that a simple value retrieved via Bucket() returns a nil.
-func TestBucket_Bucket_IncompatibleValue(t *testing.T) {
-	db := NewTestDB()
-	defer db.Close()
-	db.Update(func(tx *bolt.Tx) error {
-		tx.CreateBucket([]byte("widgets"))
-		ok(t, tx.Bucket([]byte("widgets")).Put([]byte("foo"), []byte("bar")))
-		assert(t, tx.Bucket([]byte("widgets")).Bucket([]byte("foo")) == nil, "")
-		return nil
-	})
-}
-
-// Ensure that creating a bucket on an existing non-bucket key returns an error.
-func TestBucket_CreateBucket_IncompatibleValue(t *testing.T) {
-	db := NewTestDB()
-	defer db.Close()
-	db.Update(func(tx *bolt.Tx) error {
-		_, err := tx.CreateBucket([]byte("widgets"))
-		ok(t, err)
-		ok(t, tx.Bucket([]byte("widgets")).Put([]byte("foo"), []byte("bar")))
-		_, err = tx.Bucket([]byte("widgets")).CreateBucket([]byte("foo"))
-		equals(t, bolt.ErrIncompatibleValue, err)
-		return nil
-	})
-}
-
-// Ensure that deleting a bucket on an existing non-bucket key returns an error.
-func TestBucket_DeleteBucket_IncompatibleValue(t *testing.T) {
-	db := NewTestDB()
-	defer db.Close()
-	db.Update(func(tx *bolt.Tx) error {
-		_, err := tx.CreateBucket([]byte("widgets"))
-		ok(t, err)
-		ok(t, tx.Bucket([]byte("widgets")).Put([]byte("foo"), []byte("bar")))
-		equals(t, bolt.ErrIncompatibleValue, tx.Bucket([]byte("widgets")).DeleteBucket([]byte("foo")))
-		return nil
-	})
-}
-
-// Ensure that a bucket can return an autoincrementing sequence.
-func TestBucket_NextSequence(t *testing.T) {
-	db := NewTestDB()
-	defer db.Close()
-	db.Update(func(tx *bolt.Tx) error {
-		tx.CreateBucket([]byte("widgets"))
-		tx.CreateBucket([]byte("woojits"))
-
-		// Make sure sequence increments.
-		seq, err := tx.Bucket([]byte("widgets")).NextSequence()
-		ok(t, err)
-		equals(t, seq, uint64(1))
-		seq, err = tx.Bucket([]byte("widgets")).NextSequence()
-		ok(t, err)
-		equals(t, seq, uint64(2))
-
-		// Buckets should be separate.
-		seq, err = tx.Bucket([]byte("woojits")).NextSequence()
-		ok(t, err)
-		equals(t, seq, uint64(1))
-		return nil
-	})
-}
-
-// Ensure that a bucket will persist an autoincrementing sequence even if its
-// the only thing updated on the bucket.
-// https://github.com/boltdb/bolt/issues/296
-func TestBucket_NextSequence_Persist(t *testing.T) {
-	db := NewTestDB()
-	defer db.Close()
-	db.Update(func(tx *bolt.Tx) error {
-		_, _ = tx.CreateBucket([]byte("widgets"))
-		return nil
-	})
-
-	db.Update(func(tx *bolt.Tx) error {
-		_, _ = tx.Bucket([]byte("widgets")).NextSequence()
-		return nil
-	})
-
-	db.Update(func(tx *bolt.Tx) error {
-		seq, err := tx.Bucket([]byte("widgets")).NextSequence()
-		if err != nil {
-			t.Fatalf("unexpected error: %s", err)
-		} else if seq != 2 {
-			t.Fatalf("unexpected sequence: %d", seq)
-		}
-		return nil
-	})
-}
-
-// Ensure that retrieving the next sequence on a read-only bucket returns an error.
-func TestBucket_NextSequence_ReadOnly(t *testing.T) {
-	db := NewTestDB()
-	defer db.Close()
-	db.Update(func(tx *bolt.Tx) error {
-		tx.CreateBucket([]byte("widgets"))
-		return nil
-	})
-	db.View(func(tx *bolt.Tx) error {
-		b := tx.Bucket([]byte("widgets"))
-		i, err := b.NextSequence()
-		equals(t, i, uint64(0))
-		equals(t, err, bolt.ErrTxNotWritable)
-		return nil
-	})
-}
-
-// Ensure that retrieving the next sequence for a bucket on a closed database return an error.
-func TestBucket_NextSequence_Closed(t *testing.T) {
-	db := NewTestDB()
-	defer db.Close()
-	tx, _ := db.Begin(true)
-	tx.CreateBucket([]byte("widgets"))
-	b := tx.Bucket([]byte("widgets"))
-	tx.Rollback()
-	_, err := b.NextSequence()
-	equals(t, bolt.ErrTxClosed, err)
-}
-
-// Ensure a user can loop over all key/value pairs in a bucket.
-func TestBucket_ForEach(t *testing.T) {
-	db := NewTestDB()
-	defer db.Close()
-	db.Update(func(tx *bolt.Tx) error {
-		tx.CreateBucket([]byte("widgets"))
-		tx.Bucket([]byte("widgets")).Put([]byte("foo"), []byte("0000"))
-		tx.Bucket([]byte("widgets")).Put([]byte("baz"), []byte("0001"))
-		tx.Bucket([]byte("widgets")).Put([]byte("bar"), []byte("0002"))
-
-		var index int
-		err := tx.Bucket([]byte("widgets")).ForEach(func(k, v []byte) error {
-			switch index {
-			case 0:
-				equals(t, k, []byte("bar"))
-				equals(t, v, []byte("0002"))
-			case 1:
-				equals(t, k, []byte("baz"))
-				equals(t, v, []byte("0001"))
-			case 2:
-				equals(t, k, []byte("foo"))
-				equals(t, v, []byte("0000"))
-			}
-			index++
-			return nil
-		})
-		ok(t, err)
-		equals(t, index, 3)
-		return nil
-	})
-}
-
-// Ensure a database can stop iteration early.
-func TestBucket_ForEach_ShortCircuit(t *testing.T) {
-	db := NewTestDB()
-	defer db.Close()
-	db.Update(func(tx *bolt.Tx) error {
-		tx.CreateBucket([]byte("widgets"))
-		tx.Bucket([]byte("widgets")).Put([]byte("bar"), []byte("0000"))
-		tx.Bucket([]byte("widgets")).Put([]byte("baz"), []byte("0000"))
-		tx.Bucket([]byte("widgets")).Put([]byte("foo"), []byte("0000"))
-
-		var index int
-		err := tx.Bucket([]byte("widgets")).ForEach(func(k, v []byte) error {
-			index++
-			if bytes.Equal(k, []byte("baz")) {
-				return errors.New("marker")
-			}
-			return nil
-		})
-		equals(t, errors.New("marker"), err)
-		equals(t, 2, index)
-		return nil
-	})
-}
-
-// Ensure that looping over a bucket on a closed database returns an error.
-func TestBucket_ForEach_Closed(t *testing.T) {
-	db := NewTestDB()
-	defer db.Close()
-	tx, _ := db.Begin(true)
-	tx.CreateBucket([]byte("widgets"))
-	b := tx.Bucket([]byte("widgets"))
-	tx.Rollback()
-	err := b.ForEach(func(k, v []byte) error { return nil })
-	equals(t, bolt.ErrTxClosed, err)
-}
-
-// Ensure that an error is returned when inserting with an empty key.
-func TestBucket_Put_EmptyKey(t *testing.T) {
-	db := NewTestDB()
-	defer db.Close()
-	db.Update(func(tx *bolt.Tx) error {
-		tx.CreateBucket([]byte("widgets"))
-		err := tx.Bucket([]byte("widgets")).Put([]byte(""), []byte("bar"))
-		equals(t, err, bolt.ErrKeyRequired)
-		err = tx.Bucket([]byte("widgets")).Put(nil, []byte("bar"))
-		equals(t, err, bolt.ErrKeyRequired)
-		return nil
-	})
-}
-
-// Ensure that an error is returned when inserting with a key that's too large.
-func TestBucket_Put_KeyTooLarge(t *testing.T) {
-	db := NewTestDB()
-	defer db.Close()
-	db.Update(func(tx *bolt.Tx) error {
-		tx.CreateBucket([]byte("widgets"))
-		err := tx.Bucket([]byte("widgets")).Put(make([]byte, 32769), []byte("bar"))
-		equals(t, err, bolt.ErrKeyTooLarge)
-		return nil
-	})
-}
-
-// Ensure that an error is returned when inserting a value that's too large.
-func TestBucket_Put_ValueTooLarge(t *testing.T) {
-	if os.Getenv("DRONE") == "true" {
-		t.Skip("not enough RAM for test")
-	}
-
-	db := NewTestDB()
-	defer db.Close()
-	db.Update(func(tx *bolt.Tx) error {
-		tx.CreateBucket([]byte("widgets"))
-		err := tx.Bucket([]byte("widgets")).Put([]byte("foo"), make([]byte, bolt.MaxValueSize+1))
-		equals(t, err, bolt.ErrValueTooLarge)
-		return nil
-	})
-}
-
-// Ensure a bucket can calculate stats.
-func TestBucket_Stats(t *testing.T) {
-	db := NewTestDB()
-	defer db.Close()
-
-	// Add bucket with fewer keys but one big value.
-	big_key := []byte("really-big-value")
-	for i := 0; i < 500; i++ {
-		db.Update(func(tx *bolt.Tx) error {
-			b, _ := tx.CreateBucketIfNotExists([]byte("woojits"))
-			return b.Put([]byte(fmt.Sprintf("%03d", i)), []byte(strconv.Itoa(i)))
-		})
-	}
-	db.Update(func(tx *bolt.Tx) error {
-		b, _ := tx.CreateBucketIfNotExists([]byte("woojits"))
-		return b.Put(big_key, []byte(strings.Repeat("*", 10000)))
-	})
-
-	db.MustCheck()
-	db.View(func(tx *bolt.Tx) error {
-		b := tx.Bucket([]byte("woojits"))
-		stats := b.Stats()
-		equals(t, 1, stats.BranchPageN)
-		equals(t, 0, stats.BranchOverflowN)
-		equals(t, 7, stats.LeafPageN)
-		equals(t, 2, stats.LeafOverflowN)
-		equals(t, 501, stats.KeyN)
-		equals(t, 2, stats.Depth)
-
-		branchInuse := 16     // branch page header
-		branchInuse += 7 * 16 // branch elements
-		branchInuse += 7 * 3  // branch keys (6 3-byte keys)
-		equals(t, branchInuse, stats.BranchInuse)
-
-		leafInuse := 7 * 16                      // leaf page header
-		leafInuse += 501 * 16                    // leaf elements
-		leafInuse += 500*3 + len(big_key)        // leaf keys
-		leafInuse += 1*10 + 2*90 + 3*400 + 10000 // leaf values
-		equals(t, leafInuse, stats.LeafInuse)
-
-		if os.Getpagesize() == 4096 {
-			// Incompatible page size
-			equals(t, 4096, stats.BranchAlloc)
-			equals(t, 36864, stats.LeafAlloc)
-		}
-
-		equals(t, 1, stats.BucketN)
-		equals(t, 0, stats.InlineBucketN)
-		equals(t, 0, stats.InlineBucketInuse)
-		return nil
-	})
-}
-
-// Ensure a bucket with random insertion utilizes fill percentage correctly.
-func TestBucket_Stats_RandomFill(t *testing.T) {
-	if testing.Short() {
-		t.Skip("skipping test in short mode.")
-	} else if os.Getpagesize() != 4096 {
-		t.Skip("invalid page size for test")
-	}
-
-	db := NewTestDB()
-	defer db.Close()
-
-	// Add a set of values in random order. It will be the same random
-	// order so we can maintain consistency between test runs.
-	var count int
-	r := rand.New(rand.NewSource(42))
-	for _, i := range r.Perm(1000) {
-		db.Update(func(tx *bolt.Tx) error {
-			b, _ := tx.CreateBucketIfNotExists([]byte("woojits"))
-			b.FillPercent = 0.9
-			for _, j := range r.Perm(100) {
-				index := (j * 10000) + i
-				b.Put([]byte(fmt.Sprintf("%d000000000000000", index)), []byte("0000000000"))
-				count++
-			}
-			return nil
-		})
-	}
-	db.MustCheck()
-
-	db.View(func(tx *bolt.Tx) error {
-		s := tx.Bucket([]byte("woojits")).Stats()
-		equals(t, 100000, s.KeyN)
-
-		equals(t, 98, s.BranchPageN)
-		equals(t, 0, s.BranchOverflowN)
-		equals(t, 130984, s.BranchInuse)
-		equals(t, 401408, s.BranchAlloc)
-
-		equals(t, 3412, s.LeafPageN)
-		equals(t, 0, s.LeafOverflowN)
-		equals(t, 4742482, s.LeafInuse)
-		equals(t, 13975552, s.LeafAlloc)
-		return nil
-	})
-}
-
-// Ensure a bucket can calculate stats.
-func TestBucket_Stats_Small(t *testing.T) {
-	db := NewTestDB()
-	defer db.Close()
-	db.Update(func(tx *bolt.Tx) error {
-		// Add a bucket that fits on a single root leaf.
-		b, err := tx.CreateBucket([]byte("whozawhats"))
-		ok(t, err)
-		b.Put([]byte("foo"), []byte("bar"))
-
-		return nil
-	})
-	db.MustCheck()
-	db.View(func(tx *bolt.Tx) error {
-		b := tx.Bucket([]byte("whozawhats"))
-		stats := b.Stats()
-		equals(t, 0, stats.BranchPageN)
-		equals(t, 0, stats.BranchOverflowN)
-		equals(t, 0, stats.LeafPageN)
-		equals(t, 0, stats.LeafOverflowN)
-		equals(t, 1, stats.KeyN)
-		equals(t, 1, stats.Depth)
-		equals(t, 0, stats.BranchInuse)
-		equals(t, 0, stats.LeafInuse)
-		if os.Getpagesize() == 4096 {
-			// Incompatible page size
-			equals(t, 0, stats.BranchAlloc)
-			equals(t, 0, stats.LeafAlloc)
-		}
-		equals(t, 1, stats.BucketN)
-		equals(t, 1, stats.InlineBucketN)
-		equals(t, 16+16+6, stats.InlineBucketInuse)
-		return nil
-	})
-}
-
-func TestBucket_Stats_EmptyBucket(t *testing.T) {
-	db := NewTestDB()
-	defer db.Close()
-
-	db.Update(func(tx *bolt.Tx) error {
-		// Add a bucket that fits on a single root leaf.
-		_, err := tx.CreateBucket([]byte("whozawhats"))
-		ok(t, err)
-		return nil
-	})
-	db.MustCheck()
-	db.View(func(tx *bolt.Tx) error {
-		b := tx.Bucket([]byte("whozawhats"))
-		stats := b.Stats()
-		equals(t, 0, stats.BranchPageN)
-		equals(t, 0, stats.BranchOverflowN)
-		equals(t, 0, stats.LeafPageN)
-		equals(t, 0, stats.LeafOverflowN)
-		equals(t, 0, stats.KeyN)
-		equals(t, 1, stats.Depth)
-		equals(t, 0, stats.BranchInuse)
-		equals(t, 0, stats.LeafInuse)
-		if os.Getpagesize() == 4096 {
-			// Incompatible page size
-			equals(t, 0, stats.BranchAlloc)
-			equals(t, 0, stats.LeafAlloc)
-		}
-		equals(t, 1, stats.BucketN)
-		equals(t, 1, stats.InlineBucketN)
-		equals(t, 16, stats.InlineBucketInuse)
-		return nil
-	})
-}
-
-// Ensure a bucket can calculate stats.
-func TestBucket_Stats_Nested(t *testing.T) {
-	db := NewTestDB()
-	defer db.Close()
-
-	db.Update(func(tx *bolt.Tx) error {
-		b, err := tx.CreateBucket([]byte("foo"))
-		ok(t, err)
-		for i := 0; i < 100; i++ {
-			b.Put([]byte(fmt.Sprintf("%02d", i)), []byte(fmt.Sprintf("%02d", i)))
-		}
-		bar, err := b.CreateBucket([]byte("bar"))
-		ok(t, err)
-		for i := 0; i < 10; i++ {
-			bar.Put([]byte(strconv.Itoa(i)), []byte(strconv.Itoa(i)))
-		}
-		baz, err := bar.CreateBucket([]byte("baz"))
-		ok(t, err)
-		for i := 0; i < 10; i++ {
-			baz.Put([]byte(strconv.Itoa(i)), []byte(strconv.Itoa(i)))
-		}
-		return nil
-	})
-
-	db.MustCheck()
-
-	db.View(func(tx *bolt.Tx) error {
-		b := tx.Bucket([]byte("foo"))
-		stats := b.Stats()
-		equals(t, 0, stats.BranchPageN)
-		equals(t, 0, stats.BranchOverflowN)
-		equals(t, 2, stats.LeafPageN)
-		equals(t, 0, stats.LeafOverflowN)
-		equals(t, 122, stats.KeyN)
-		equals(t, 3, stats.Depth)
-		equals(t, 0, stats.BranchInuse)
-
-		foo := 16            // foo (pghdr)
-		foo += 101 * 16      // foo leaf elements
-		foo += 100*2 + 100*2 // foo leaf key/values
-		foo += 3 + 16        // foo -> bar key/value
-
-		bar := 16      // bar (pghdr)
-		bar += 11 * 16 // bar leaf elements
-		bar += 10 + 10 // bar leaf key/values
-		bar += 3 + 16  // bar -> baz key/value
-
-		baz := 16      // baz (inline) (pghdr)
-		baz += 10 * 16 // baz leaf elements
-		baz += 10 + 10 // baz leaf key/values
-
-		equals(t, foo+bar+baz, stats.LeafInuse)
-		if os.Getpagesize() == 4096 {
-			// Incompatible page size
-			equals(t, 0, stats.BranchAlloc)
-			equals(t, 8192, stats.LeafAlloc)
-		}
-		equals(t, 3, stats.BucketN)
-		equals(t, 1, stats.InlineBucketN)
-		equals(t, baz, stats.InlineBucketInuse)
-		return nil
-	})
-}
-
-// Ensure a large bucket can calculate stats.
-func TestBucket_Stats_Large(t *testing.T) {
-	if testing.Short() {
-		t.Skip("skipping test in short mode.")
-	}
-
-	db := NewTestDB()
-	defer db.Close()
-
-	var index int
-	for i := 0; i < 100; i++ {
-		db.Update(func(tx *bolt.Tx) error {
-			// Add bucket with lots of keys.
-			b, _ := tx.CreateBucketIfNotExists([]byte("widgets"))
-			for i := 0; i < 1000; i++ {
-				b.Put([]byte(strconv.Itoa(index)), []byte(strconv.Itoa(index)))
-				index++
-			}
-			return nil
-		})
-	}
-	db.MustCheck()
-
-	db.View(func(tx *bolt.Tx) error {
-		b := tx.Bucket([]byte("widgets"))
-		stats := b.Stats()
-		equals(t, 13, stats.BranchPageN)
-		equals(t, 0, stats.BranchOverflowN)
-		equals(t, 1196, stats.LeafPageN)
-		equals(t, 0, stats.LeafOverflowN)
-		equals(t, 100000, stats.KeyN)
-		equals(t, 3, stats.Depth)
-		equals(t, 25257, stats.BranchInuse)
-		equals(t, 2596916, stats.LeafInuse)
-		if os.Getpagesize() == 4096 {
-			// Incompatible page size
-			equals(t, 53248, stats.BranchAlloc)
-			equals(t, 4898816, stats.LeafAlloc)
-		}
-		equals(t, 1, stats.BucketN)
-		equals(t, 0, stats.InlineBucketN)
-		equals(t, 0, stats.InlineBucketInuse)
-		return nil
-	})
-}
-
-// Ensure that a bucket can write random keys and values across multiple transactions.
-func TestBucket_Put_Single(t *testing.T) {
-	if testing.Short() {
-		t.Skip("skipping test in short mode.")
-	}
-
-	index := 0
-	f := func(items testdata) bool {
-		db := NewTestDB()
-		defer db.Close()
-
-		m := make(map[string][]byte)
-
-		db.Update(func(tx *bolt.Tx) error {
-			_, err := tx.CreateBucket([]byte("widgets"))
-			return err
-		})
-		for _, item := range items {
-			db.Update(func(tx *bolt.Tx) error {
-				if err := tx.Bucket([]byte("widgets")).Put(item.Key, item.Value); err != nil {
-					panic("put error: " + err.Error())
-				}
-				m[string(item.Key)] = item.Value
-				return nil
-			})
-
-			// Verify all key/values so far.
-			db.View(func(tx *bolt.Tx) error {
-				i := 0
-				for k, v := range m {
-					value := tx.Bucket([]byte("widgets")).Get([]byte(k))
-					if !bytes.Equal(value, v) {
-						t.Logf("value mismatch [run %d] (%d of %d):\nkey: %x\ngot: %x\nexp: %x", index, i, len(m), []byte(k), value, v)
-						db.CopyTempFile()
-						t.FailNow()
-					}
-					i++
-				}
-				return nil
-			})
-		}
-
-		index++
-		return true
-	}
-	if err := quick.Check(f, qconfig()); err != nil {
-		t.Error(err)
-	}
-}
-
-// Ensure that a transaction can insert multiple key/value pairs at once.
-func TestBucket_Put_Multiple(t *testing.T) {
-	if testing.Short() {
-		t.Skip("skipping test in short mode.")
-	}
-
-	f := func(items testdata) bool {
-		db := NewTestDB()
-		defer db.Close()
-		// Bulk insert all values.
-		db.Update(func(tx *bolt.Tx) error {
-			_, err := tx.CreateBucket([]byte("widgets"))
-			return err
-		})
-		err := db.Update(func(tx *bolt.Tx) error {
-			b := tx.Bucket([]byte("widgets"))
-			for _, item := range items {
-				ok(t, b.Put(item.Key, item.Value))
-			}
-			return nil
-		})
-		ok(t, err)
-
-		// Verify all items exist.
-		db.View(func(tx *bolt.Tx) error {
-			b := tx.Bucket([]byte("widgets"))
-			for _, item := range items {
-				value := b.Get(item.Key)
-				if !bytes.Equal(item.Value, value) {
-					db.CopyTempFile()
-					t.Fatalf("exp=%x; got=%x", item.Value, value)
-				}
-			}
-			return nil
-		})
-		return true
-	}
-	if err := quick.Check(f, qconfig()); err != nil {
-		t.Error(err)
-	}
-}
-
-// Ensure that a transaction can delete all key/value pairs and return to a single leaf page.
-func TestBucket_Delete_Quick(t *testing.T) {
-	if testing.Short() {
-		t.Skip("skipping test in short mode.")
-	}
-
-	f := func(items testdata) bool {
-		db := NewTestDB()
-		defer db.Close()
-		// Bulk insert all values.
-		db.Update(func(tx *bolt.Tx) error {
-			_, err := tx.CreateBucket([]byte("widgets"))
-			return err
-		})
-		err := db.Update(func(tx *bolt.Tx) error {
-			b := tx.Bucket([]byte("widgets"))
-			for _, item := range items {
-				ok(t, b.Put(item.Key, item.Value))
-			}
-			return nil
-		})
-		ok(t, err)
-
-		// Remove items one at a time and check consistency.
-		for _, item := range items {
-			err := db.Update(func(tx *bolt.Tx) error {
-				return tx.Bucket([]byte("widgets")).Delete(item.Key)
-			})
-			ok(t, err)
-		}
-
-		// Anything before our deletion index should be nil.
-		db.View(func(tx *bolt.Tx) error {
-			tx.Bucket([]byte("widgets")).ForEach(func(k, v []byte) error {
-				t.Fatalf("bucket should be empty; found: %06x", trunc(k, 3))
-				return nil
-			})
-			return nil
-		})
-		return true
-	}
-	if err := quick.Check(f, qconfig()); err != nil {
-		t.Error(err)
-	}
-}
-
-func ExampleBucket_Put() {
-	// Open the database.
-	db, _ := bolt.Open(tempfile(), 0666, nil)
-	defer os.Remove(db.Path())
-	defer db.Close()
-
-	// Start a write transaction.
-	db.Update(func(tx *bolt.Tx) error {
-		// Create a bucket.
-		tx.CreateBucket([]byte("widgets"))
-
-		// Set the value "bar" for the key "foo".
-		tx.Bucket([]byte("widgets")).Put([]byte("foo"), []byte("bar"))
-		return nil
-	})
-
-	// Read value back in a different read-only transaction.
-	db.View(func(tx *bolt.Tx) error {
-		value := tx.Bucket([]byte("widgets")).Get([]byte("foo"))
-		fmt.Printf("The value of 'foo' is: %s\n", value)
-		return nil
-	})
-
-	// Output:
-	// The value of 'foo' is: bar
-}
-
-func ExampleBucket_Delete() {
-	// Open the database.
-	db, _ := bolt.Open(tempfile(), 0666, nil)
-	defer os.Remove(db.Path())
-	defer db.Close()
-
-	// Start a write transaction.
-	db.Update(func(tx *bolt.Tx) error {
-		// Create a bucket.
-		tx.CreateBucket([]byte("widgets"))
-		b := tx.Bucket([]byte("widgets"))
-
-		// Set the value "bar" for the key "foo".
-		b.Put([]byte("foo"), []byte("bar"))
-
-		// Retrieve the key back from the database and verify it.
-		value := b.Get([]byte("foo"))
-		fmt.Printf("The value of 'foo' was: %s\n", value)
-		return nil
-	})
-
-	// Delete the key in a different write transaction.
-	db.Update(func(tx *bolt.Tx) error {
-		return tx.Bucket([]byte("widgets")).Delete([]byte("foo"))
-	})
-
-	// Retrieve the key again.
-	db.View(func(tx *bolt.Tx) error {
-		value := tx.Bucket([]byte("widgets")).Get([]byte("foo"))
-		if value == nil {
-			fmt.Printf("The value of 'foo' is now: nil\n")
-		}
-		return nil
-	})
-
-	// Output:
-	// The value of 'foo' was: bar
-	// The value of 'foo' is now: nil
-}
-
-func ExampleBucket_ForEach() {
-	// Open the database.
-	db, _ := bolt.Open(tempfile(), 0666, nil)
-	defer os.Remove(db.Path())
-	defer db.Close()
-
-	// Insert data into a bucket.
-	db.Update(func(tx *bolt.Tx) error {
-		tx.CreateBucket([]byte("animals"))
-		b := tx.Bucket([]byte("animals"))
-		b.Put([]byte("dog"), []byte("fun"))
-		b.Put([]byte("cat"), []byte("lame"))
-		b.Put([]byte("liger"), []byte("awesome"))
-
-		// Iterate over items in sorted key order.
-		b.ForEach(func(k, v []byte) error {
-			fmt.Printf("A %s is %s.\n", k, v)
-			return nil
-		})
-		return nil
-	})
-
-	// Output:
-	// A cat is lame.
-	// A dog is fun.
-	// A liger is awesome.
-}
diff --git a/Godeps/_workspace/src/github.com/boltdb/bolt/cmd/bolt/main.go b/Godeps/_workspace/src/github.com/boltdb/bolt/cmd/bolt/main.go
deleted file mode 100644
index c41ebe404..000000000
--- a/Godeps/_workspace/src/github.com/boltdb/bolt/cmd/bolt/main.go
+++ /dev/null
@@ -1,1529 +0,0 @@
-package main
-
-import (
-	"bytes"
-	"encoding/binary"
-	"errors"
-	"flag"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"math/rand"
-	"os"
-	"runtime"
-	"runtime/pprof"
-	"strconv"
-	"strings"
-	"time"
-	"unicode"
-	"unicode/utf8"
-	"unsafe"
-
-	"github.com/boltdb/bolt"
-)
-
-var (
-	// ErrUsage is returned when a usage message was printed and the process
-	// should simply exit with an error.
-	ErrUsage = errors.New("usage")
-
-	// ErrUnknownCommand is returned when a CLI command is not specified.
-	ErrUnknownCommand = errors.New("unknown command")
-
-	// ErrPathRequired is returned when the path to a Bolt database is not specified.
-	ErrPathRequired = errors.New("path required")
-
-	// ErrFileNotFound is returned when a Bolt database does not exist.
-	ErrFileNotFound = errors.New("file not found")
-
-	// ErrInvalidValue is returned when a benchmark reads an unexpected value.
-	ErrInvalidValue = errors.New("invalid value")
-
-	// ErrCorrupt is returned when a checking a data file finds errors.
-	ErrCorrupt = errors.New("invalid value")
-
-	// ErrNonDivisibleBatchSize is returned when the batch size can't be evenly
-	// divided by the iteration count.
-	ErrNonDivisibleBatchSize = errors.New("number of iterations must be divisible by the batch size")
-
-	// ErrPageIDRequired is returned when a required page id is not specified.
-	ErrPageIDRequired = errors.New("page id required")
-
-	// ErrPageNotFound is returned when specifying a page above the high water mark.
-	ErrPageNotFound = errors.New("page not found")
-
-	// ErrPageFreed is returned when reading a page that has already been freed.
-	ErrPageFreed = errors.New("page freed")
-)
-
-// PageHeaderSize represents the size of the bolt.page header.
-const PageHeaderSize = 16
-
-func main() {
-	m := NewMain()
-	if err := m.Run(os.Args[1:]...); err == ErrUsage {
-		os.Exit(2)
-	} else if err != nil {
-		fmt.Println(err.Error())
-		os.Exit(1)
-	}
-}
-
-// Main represents the main program execution.
-type Main struct {
-	Stdin  io.Reader
-	Stdout io.Writer
-	Stderr io.Writer
-}
-
-// NewMain returns a new instance of Main connect to the standard input/output.
-func NewMain() *Main {
-	return &Main{
-		Stdin:  os.Stdin,
-		Stdout: os.Stdout,
-		Stderr: os.Stderr,
-	}
-}
-
-// Run executes the program.
-func (m *Main) Run(args ...string) error {
-	// Require a command at the beginning.
-	if len(args) == 0 || strings.HasPrefix(args[0], "-") {
-		fmt.Fprintln(m.Stderr, m.Usage())
-		return ErrUsage
-	}
-
-	// Execute command.
-	switch args[0] {
-	case "help":
-		fmt.Fprintln(m.Stderr, m.Usage())
-		return ErrUsage
-	case "bench":
-		return newBenchCommand(m).Run(args[1:]...)
-	case "check":
-		return newCheckCommand(m).Run(args[1:]...)
-	case "dump":
-		return newDumpCommand(m).Run(args[1:]...)
-	case "info":
-		return newInfoCommand(m).Run(args[1:]...)
-	case "page":
-		return newPageCommand(m).Run(args[1:]...)
-	case "pages":
-		return newPagesCommand(m).Run(args[1:]...)
-	case "stats":
-		return newStatsCommand(m).Run(args[1:]...)
-	default:
-		return ErrUnknownCommand
-	}
-}
-
-// Usage returns the help message.
-func (m *Main) Usage() string {
-	return strings.TrimLeft(`
-Bolt is a tool for inspecting bolt databases.
-
-Usage:
-
-	bolt command [arguments]
-
-The commands are:
-
-    bench       run synthetic benchmark against bolt
-    check       verifies integrity of bolt database
-    info        print basic info
-    help        print this screen
-    pages       print list of pages with their types
-    stats       iterate over all pages and generate usage stats
-
-Use "bolt [command] -h" for more information about a command.
-`, "\n")
-}
-
-// CheckCommand represents the "check" command execution.
-type CheckCommand struct {
-	Stdin  io.Reader
-	Stdout io.Writer
-	Stderr io.Writer
-}
-
-// NewCheckCommand returns a CheckCommand.
-func newCheckCommand(m *Main) *CheckCommand {
-	return &CheckCommand{
-		Stdin:  m.Stdin,
-		Stdout: m.Stdout,
-		Stderr: m.Stderr,
-	}
-}
-
-// Run executes the command.
-func (cmd *CheckCommand) Run(args ...string) error {
-	// Parse flags.
-	fs := flag.NewFlagSet("", flag.ContinueOnError)
-	help := fs.Bool("h", false, "")
-	if err := fs.Parse(args); err != nil {
-		return err
-	} else if *help {
-		fmt.Fprintln(cmd.Stderr, cmd.Usage())
-		return ErrUsage
-	}
-
-	// Require database path.
-	path := fs.Arg(0)
-	if path == "" {
-		return ErrPathRequired
-	} else if _, err := os.Stat(path); os.IsNotExist(err) {
-		return ErrFileNotFound
-	}
-
-	// Open database.
-	db, err := bolt.Open(path, 0666, nil)
-	if err != nil {
-		return err
-	}
-	defer db.Close()
-
-	// Perform consistency check.
-	return db.View(func(tx *bolt.Tx) error {
-		var count int
-		ch := tx.Check()
-	loop:
-		for {
-			select {
-			case err, ok := <-ch:
-				if !ok {
-					break loop
-				}
-				fmt.Fprintln(cmd.Stdout, err)
-				count++
-			}
-		}
-
-		// Print summary of errors.
-		if count > 0 {
-			fmt.Fprintf(cmd.Stdout, "%d errors found\n", count)
-			return ErrCorrupt
-		}
-
-		// Notify user that database is valid.
-		fmt.Fprintln(cmd.Stdout, "OK")
-		return nil
-	})
-}
-
-// Usage returns the help message.
-func (cmd *CheckCommand) Usage() string {
-	return strings.TrimLeft(`
-usage: bolt check PATH
-
-Check opens a database at PATH and runs an exhaustive check to verify that
-all pages are accessible or are marked as freed. It also verifies that no
-pages are double referenced.
-
-Verification errors will stream out as they are found and the process will
-return after all pages have been checked.
-`, "\n")
-}
-
-// InfoCommand represents the "info" command execution.
-type InfoCommand struct {
-	Stdin  io.Reader
-	Stdout io.Writer
-	Stderr io.Writer
-}
-
-// NewInfoCommand returns a InfoCommand.
-func newInfoCommand(m *Main) *InfoCommand {
-	return &InfoCommand{
-		Stdin:  m.Stdin,
-		Stdout: m.Stdout,
-		Stderr: m.Stderr,
-	}
-}
-
-// Run executes the command.
-func (cmd *InfoCommand) Run(args ...string) error {
-	// Parse flags.
-	fs := flag.NewFlagSet("", flag.ContinueOnError)
-	help := fs.Bool("h", false, "")
-	if err := fs.Parse(args); err != nil {
-		return err
-	} else if *help {
-		fmt.Fprintln(cmd.Stderr, cmd.Usage())
-		return ErrUsage
-	}
-
-	// Require database path.
-	path := fs.Arg(0)
-	if path == "" {
-		return ErrPathRequired
-	} else if _, err := os.Stat(path); os.IsNotExist(err) {
-		return ErrFileNotFound
-	}
-
-	// Open the database.
-	db, err := bolt.Open(path, 0666, nil)
-	if err != nil {
-		return err
-	}
-	defer db.Close()
-
-	// Print basic database info.
-	info := db.Info()
-	fmt.Fprintf(cmd.Stdout, "Page Size: %d\n", info.PageSize)
-
-	return nil
-}
-
-// Usage returns the help message.
-func (cmd *InfoCommand) Usage() string {
-	return strings.TrimLeft(`
-usage: bolt info PATH
-
-Info prints basic information about the Bolt database at PATH.
-`, "\n")
-}
-
-// DumpCommand represents the "dump" command execution.
-type DumpCommand struct {
-	Stdin  io.Reader
-	Stdout io.Writer
-	Stderr io.Writer
-}
-
-// newDumpCommand returns a DumpCommand.
-func newDumpCommand(m *Main) *DumpCommand {
-	return &DumpCommand{
-		Stdin:  m.Stdin,
-		Stdout: m.Stdout,
-		Stderr: m.Stderr,
-	}
-}
-
-// Run executes the command.
-func (cmd *DumpCommand) Run(args ...string) error {
-	// Parse flags.
-	fs := flag.NewFlagSet("", flag.ContinueOnError)
-	help := fs.Bool("h", false, "")
-	if err := fs.Parse(args); err != nil {
-		return err
-	} else if *help {
-		fmt.Fprintln(cmd.Stderr, cmd.Usage())
-		return ErrUsage
-	}
-
-	// Require database path and page id.
-	path := fs.Arg(0)
-	if path == "" {
-		return ErrPathRequired
-	} else if _, err := os.Stat(path); os.IsNotExist(err) {
-		return ErrFileNotFound
-	}
-
-	// Read page ids.
-	pageIDs, err := atois(fs.Args()[1:])
-	if err != nil {
-		return err
-	} else if len(pageIDs) == 0 {
-		return ErrPageIDRequired
-	}
-
-	// Open database to retrieve page size.
-	pageSize, err := ReadPageSize(path)
-	if err != nil {
-		return err
-	}
-
-	// Open database file handler.
-	f, err := os.Open(path)
-	if err != nil {
-		return err
-	}
-	defer func() { _ = f.Close() }()
-
-	// Print each page listed.
-	for i, pageID := range pageIDs {
-		// Print a separator.
-		if i > 0 {
-			fmt.Fprintln(cmd.Stdout, "===============================================")
-		}
-
-		// Print page to stdout.
-		if err := cmd.PrintPage(cmd.Stdout, f, pageID, pageSize); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-// PrintPage prints a given page as hexidecimal.
-func (cmd *DumpCommand) PrintPage(w io.Writer, r io.ReaderAt, pageID int, pageSize int) error {
-	const bytesPerLineN = 16
-
-	// Read page into buffer.
-	buf := make([]byte, pageSize)
-	addr := pageID * pageSize
-	if n, err := r.ReadAt(buf, int64(addr)); err != nil {
-		return err
-	} else if n != pageSize {
-		return io.ErrUnexpectedEOF
-	}
-
-	// Write out to writer in 16-byte lines.
-	var prev []byte
-	var skipped bool
-	for offset := 0; offset < pageSize; offset += bytesPerLineN {
-		// Retrieve current 16-byte line.
-		line := buf[offset : offset+bytesPerLineN]
-		isLastLine := (offset == (pageSize - bytesPerLineN))
-
-		// If it's the same as the previous line then print a skip.
-		if bytes.Equal(line, prev) && !isLastLine {
-			if !skipped {
-				fmt.Fprintf(w, "%07x *\n", addr+offset)
-				skipped = true
-			}
-		} else {
-			// Print line as hexadecimal in 2-byte groups.
-			fmt.Fprintf(w, "%07x %04x %04x %04x %04x %04x %04x %04x %04x\n", addr+offset,
-				line[0:2], line[2:4], line[4:6], line[6:8],
-				line[8:10], line[10:12], line[12:14], line[14:16],
-			)
-
-			skipped = false
-		}
-
-		// Save the previous line.
-		prev = line
-	}
-	fmt.Fprint(w, "\n")
-
-	return nil
-}
-
-// Usage returns the help message.
-func (cmd *DumpCommand) Usage() string {
-	return strings.TrimLeft(`
-usage: bolt dump -page PAGEID PATH
-
-Dump prints a hexidecimal dump of a single page.
-`, "\n")
-}
-
-// PageCommand represents the "page" command execution.
-type PageCommand struct {
-	Stdin  io.Reader
-	Stdout io.Writer
-	Stderr io.Writer
-}
-
-// newPageCommand returns a PageCommand.
-func newPageCommand(m *Main) *PageCommand {
-	return &PageCommand{
-		Stdin:  m.Stdin,
-		Stdout: m.Stdout,
-		Stderr: m.Stderr,
-	}
-}
-
-// Run executes the command.
-func (cmd *PageCommand) Run(args ...string) error {
-	// Parse flags.
-	fs := flag.NewFlagSet("", flag.ContinueOnError)
-	help := fs.Bool("h", false, "")
-	if err := fs.Parse(args); err != nil {
-		return err
-	} else if *help {
-		fmt.Fprintln(cmd.Stderr, cmd.Usage())
-		return ErrUsage
-	}
-
-	// Require database path and page id.
-	path := fs.Arg(0)
-	if path == "" {
-		return ErrPathRequired
-	} else if _, err := os.Stat(path); os.IsNotExist(err) {
-		return ErrFileNotFound
-	}
-
-	// Read page ids.
-	pageIDs, err := atois(fs.Args()[1:])
-	if err != nil {
-		return err
-	} else if len(pageIDs) == 0 {
-		return ErrPageIDRequired
-	}
-
-	// Open database file handler.
-	f, err := os.Open(path)
-	if err != nil {
-		return err
-	}
-	defer func() { _ = f.Close() }()
-
-	// Print each page listed.
-	for i, pageID := range pageIDs {
-		// Print a separator.
-		if i > 0 {
-			fmt.Fprintln(cmd.Stdout, "===============================================")
-		}
-
-		// Retrieve page info and page size.
-		p, buf, err := ReadPage(path, pageID)
-		if err != nil {
-			return err
-		}
-
-		// Print basic page info.
-		fmt.Fprintf(cmd.Stdout, "Page ID:    %d\n", p.id)
-		fmt.Fprintf(cmd.Stdout, "Page Type:  %s\n", p.Type())
-		fmt.Fprintf(cmd.Stdout, "Total Size: %d bytes\n", len(buf))
-
-		// Print type-specific data.
-		switch p.Type() {
-		case "meta":
-			err = cmd.PrintMeta(cmd.Stdout, buf)
-		case "leaf":
-			err = cmd.PrintLeaf(cmd.Stdout, buf)
-		case "branch":
-			err = cmd.PrintBranch(cmd.Stdout, buf)
-		case "freelist":
-			err = cmd.PrintFreelist(cmd.Stdout, buf)
-		}
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-// PrintMeta prints the data from the meta page.
-func (cmd *PageCommand) PrintMeta(w io.Writer, buf []byte) error {
-	m := (*meta)(unsafe.Pointer(&buf[PageHeaderSize]))
-	fmt.Fprintf(w, "Version:    %d\n", m.version)
-	fmt.Fprintf(w, "Page Size:  %d bytes\n", m.pageSize)
-	fmt.Fprintf(w, "Flags:      %08x\n", m.flags)
-	fmt.Fprintf(w, "Root:       <pgid=%d>\n", m.root.root)
-	fmt.Fprintf(w, "Freelist:   <pgid=%d>\n", m.freelist)
-	fmt.Fprintf(w, "HWM:        <pgid=%d>\n", m.pgid)
-	fmt.Fprintf(w, "Txn ID:     %d\n", m.txid)
-	fmt.Fprintf(w, "Checksum:   %016x\n", m.checksum)
-	fmt.Fprintf(w, "\n")
-	return nil
-}
-
-// PrintLeaf prints the data for a leaf page.
-func (cmd *PageCommand) PrintLeaf(w io.Writer, buf []byte) error {
-	p := (*page)(unsafe.Pointer(&buf[0]))
-
-	// Print number of items.
-	fmt.Fprintf(w, "Item Count: %d\n", p.count)
-	fmt.Fprintf(w, "\n")
-
-	// Print each key/value.
-	for i := uint16(0); i < p.count; i++ {
-		e := p.leafPageElement(i)
-
-		// Format key as string.
-		var k string
-		if isPrintable(string(e.key())) {
-			k = fmt.Sprintf("%q", string(e.key()))
-		} else {
-			k = fmt.Sprintf("%x", string(e.key()))
-		}
-
-		// Format value as string.
-		var v string
-		if (e.flags & uint32(bucketLeafFlag)) != 0 {
-			b := (*bucket)(unsafe.Pointer(&e.value()[0]))
-			v = fmt.Sprintf("<pgid=%d,seq=%d>", b.root, b.sequence)
-		} else if isPrintable(string(e.value())) {
-			k = fmt.Sprintf("%q", string(e.value()))
-		} else {
-			k = fmt.Sprintf("%x", string(e.value()))
-		}
-
-		fmt.Fprintf(w, "%s: %s\n", k, v)
-	}
-	fmt.Fprintf(w, "\n")
-	return nil
-}
-
-// PrintBranch prints the data for a leaf page.
-func (cmd *PageCommand) PrintBranch(w io.Writer, buf []byte) error {
-	p := (*page)(unsafe.Pointer(&buf[0]))
-
-	// Print number of items.
-	fmt.Fprintf(w, "Item Count: %d\n", p.count)
-	fmt.Fprintf(w, "\n")
-
-	// Print each key/value.
-	for i := uint16(0); i < p.count; i++ {
-		e := p.branchPageElement(i)
-
-		// Format key as string.
-		var k string
-		if isPrintable(string(e.key())) {
-			k = fmt.Sprintf("%q", string(e.key()))
-		} else {
-			k = fmt.Sprintf("%x", string(e.key()))
-		}
-
-		fmt.Fprintf(w, "%s: <pgid=%d>\n", k, e.pgid)
-	}
-	fmt.Fprintf(w, "\n")
-	return nil
-}
-
-// PrintFreelist prints the data for a freelist page.
-func (cmd *PageCommand) PrintFreelist(w io.Writer, buf []byte) error {
-	p := (*page)(unsafe.Pointer(&buf[0]))
-
-	// Print number of items.
-	fmt.Fprintf(w, "Item Count: %d\n", p.count)
-	fmt.Fprintf(w, "\n")
-
-	// Print each page in the freelist.
-	ids := (*[maxAllocSize]pgid)(unsafe.Pointer(&p.ptr))
-	for i := uint16(0); i < p.count; i++ {
-		fmt.Fprintf(w, "%d\n", ids[i])
-	}
-	fmt.Fprintf(w, "\n")
-	return nil
-}
-
-// PrintPage prints a given page as hexidecimal.
-func (cmd *PageCommand) PrintPage(w io.Writer, r io.ReaderAt, pageID int, pageSize int) error {
-	const bytesPerLineN = 16
-
-	// Read page into buffer.
-	buf := make([]byte, pageSize)
-	addr := pageID * pageSize
-	if n, err := r.ReadAt(buf, int64(addr)); err != nil {
-		return err
-	} else if n != pageSize {
-		return io.ErrUnexpectedEOF
-	}
-
-	// Write out to writer in 16-byte lines.
-	var prev []byte
-	var skipped bool
-	for offset := 0; offset < pageSize; offset += bytesPerLineN {
-		// Retrieve current 16-byte line.
-		line := buf[offset : offset+bytesPerLineN]
-		isLastLine := (offset == (pageSize - bytesPerLineN))
-
-		// If it's the same as the previous line then print a skip.
-		if bytes.Equal(line, prev) && !isLastLine {
-			if !skipped {
-				fmt.Fprintf(w, "%07x *\n", addr+offset)
-				skipped = true
-			}
-		} else {
-			// Print line as hexadecimal in 2-byte groups.
-			fmt.Fprintf(w, "%07x %04x %04x %04x %04x %04x %04x %04x %04x\n", addr+offset,
-				line[0:2], line[2:4], line[4:6], line[6:8],
-				line[8:10], line[10:12], line[12:14], line[14:16],
-			)
-
-			skipped = false
-		}
-
-		// Save the previous line.
-		prev = line
-	}
-	fmt.Fprint(w, "\n")
-
-	return nil
-}
-
-// Usage returns the help message.
-func (cmd *PageCommand) Usage() string {
-	return strings.TrimLeft(`
-usage: bolt page -page PATH pageid [pageid...]
-
-Page prints one or more pages in human readable format.
-`, "\n")
-}
-
-// PagesCommand represents the "pages" command execution.
-type PagesCommand struct {
-	Stdin  io.Reader
-	Stdout io.Writer
-	Stderr io.Writer
-}
-
-// NewPagesCommand returns a PagesCommand.
-func newPagesCommand(m *Main) *PagesCommand {
-	return &PagesCommand{
-		Stdin:  m.Stdin,
-		Stdout: m.Stdout,
-		Stderr: m.Stderr,
-	}
-}
-
-// Run executes the command.
-func (cmd *PagesCommand) Run(args ...string) error {
-	// Parse flags.
-	fs := flag.NewFlagSet("", flag.ContinueOnError)
-	help := fs.Bool("h", false, "")
-	if err := fs.Parse(args); err != nil {
-		return err
-	} else if *help {
-		fmt.Fprintln(cmd.Stderr, cmd.Usage())
-		return ErrUsage
-	}
-
-	// Require database path.
-	path := fs.Arg(0)
-	if path == "" {
-		return ErrPathRequired
-	} else if _, err := os.Stat(path); os.IsNotExist(err) {
-		return ErrFileNotFound
-	}
-
-	// Open database.
-	db, err := bolt.Open(path, 0666, nil)
-	if err != nil {
-		return err
-	}
-	defer func() { _ = db.Close() }()
-
-	// Write header.
-	fmt.Fprintln(cmd.Stdout, "ID       TYPE       ITEMS  OVRFLW")
-	fmt.Fprintln(cmd.Stdout, "======== ========== ====== ======")
-
-	return db.Update(func(tx *bolt.Tx) error {
-		var id int
-		for {
-			p, err := tx.Page(id)
-			if err != nil {
-				return &PageError{ID: id, Err: err}
-			} else if p == nil {
-				break
-			}
-
-			// Only display count and overflow if this is a non-free page.
-			var count, overflow string
-			if p.Type != "free" {
-				count = strconv.Itoa(p.Count)
-				if p.OverflowCount > 0 {
-					overflow = strconv.Itoa(p.OverflowCount)
-				}
-			}
-
-			// Print table row.
-			fmt.Fprintf(cmd.Stdout, "%-8d %-10s %-6s %-6s\n", p.ID, p.Type, count, overflow)
-
-			// Move to the next non-overflow page.
-			id += 1
-			if p.Type != "free" {
-				id += p.OverflowCount
-			}
-		}
-		return nil
-	})
-}
-
-// Usage returns the help message.
-func (cmd *PagesCommand) Usage() string {
-	return strings.TrimLeft(`
-usage: bolt pages PATH
-
-Pages prints a table of pages with their type (meta, leaf, branch, freelist).
-Leaf and branch pages will show a key count in the "items" column while the
-freelist will show the number of free pages in the "items" column.
-
-The "overflow" column shows the number of blocks that the page spills over
-into. Normally there is no overflow but large keys and values can cause
-a single page to take up multiple blocks.
-`, "\n")
-}
-
-// StatsCommand represents the "stats" command execution.
-type StatsCommand struct {
-	Stdin  io.Reader
-	Stdout io.Writer
-	Stderr io.Writer
-}
-
-// NewStatsCommand returns a StatsCommand.
-func newStatsCommand(m *Main) *StatsCommand {
-	return &StatsCommand{
-		Stdin:  m.Stdin,
-		Stdout: m.Stdout,
-		Stderr: m.Stderr,
-	}
-}
-
-// Run executes the command.
-func (cmd *StatsCommand) Run(args ...string) error {
-	// Parse flags.
-	fs := flag.NewFlagSet("", flag.ContinueOnError)
-	help := fs.Bool("h", false, "")
-	if err := fs.Parse(args); err != nil {
-		return err
-	} else if *help {
-		fmt.Fprintln(cmd.Stderr, cmd.Usage())
-		return ErrUsage
-	}
-
-	// Require database path.
-	path, prefix := fs.Arg(0), fs.Arg(1)
-	if path == "" {
-		return ErrPathRequired
-	} else if _, err := os.Stat(path); os.IsNotExist(err) {
-		return ErrFileNotFound
-	}
-
-	// Open database.
-	db, err := bolt.Open(path, 0666, nil)
-	if err != nil {
-		return err
-	}
-	defer db.Close()
-
-	return db.View(func(tx *bolt.Tx) error {
-		var s bolt.BucketStats
-		var count int
-		if err := tx.ForEach(func(name []byte, b *bolt.Bucket) error {
-			if bytes.HasPrefix(name, []byte(prefix)) {
-				s.Add(b.Stats())
-				count += 1
-			}
-			return nil
-		}); err != nil {
-			return err
-		}
-
-		fmt.Fprintf(cmd.Stdout, "Aggregate statistics for %d buckets\n\n", count)
-
-		fmt.Fprintln(cmd.Stdout, "Page count statistics")
-		fmt.Fprintf(cmd.Stdout, "\tNumber of logical branch pages: %d\n", s.BranchPageN)
-		fmt.Fprintf(cmd.Stdout, "\tNumber of physical branch overflow pages: %d\n", s.BranchOverflowN)
-		fmt.Fprintf(cmd.Stdout, "\tNumber of logical leaf pages: %d\n", s.LeafPageN)
-		fmt.Fprintf(cmd.Stdout, "\tNumber of physical leaf overflow pages: %d\n", s.LeafOverflowN)
-
-		fmt.Fprintln(cmd.Stdout, "Tree statistics")
-		fmt.Fprintf(cmd.Stdout, "\tNumber of keys/value pairs: %d\n", s.KeyN)
-		fmt.Fprintf(cmd.Stdout, "\tNumber of levels in B+tree: %d\n", s.Depth)
-
-		fmt.Fprintln(cmd.Stdout, "Page size utilization")
-		fmt.Fprintf(cmd.Stdout, "\tBytes allocated for physical branch pages: %d\n", s.BranchAlloc)
-		var percentage int
-		if s.BranchAlloc != 0 {
-			percentage = int(float32(s.BranchInuse) * 100.0 / float32(s.BranchAlloc))
-		}
-		fmt.Fprintf(cmd.Stdout, "\tBytes actually used for branch data: %d (%d%%)\n", s.BranchInuse, percentage)
-		fmt.Fprintf(cmd.Stdout, "\tBytes allocated for physical leaf pages: %d\n", s.LeafAlloc)
-		percentage = 0
-		if s.LeafAlloc != 0 {
-			percentage = int(float32(s.LeafInuse) * 100.0 / float32(s.LeafAlloc))
-		}
-		fmt.Fprintf(cmd.Stdout, "\tBytes actually used for leaf data: %d (%d%%)\n", s.LeafInuse, percentage)
-
-		fmt.Fprintln(cmd.Stdout, "Bucket statistics")
-		fmt.Fprintf(cmd.Stdout, "\tTotal number of buckets: %d\n", s.BucketN)
-		percentage = int(float32(s.InlineBucketN) * 100.0 / float32(s.BucketN))
-		fmt.Fprintf(cmd.Stdout, "\tTotal number on inlined buckets: %d (%d%%)\n", s.InlineBucketN, percentage)
-		percentage = 0
-		if s.LeafInuse != 0 {
-			percentage = int(float32(s.InlineBucketInuse) * 100.0 / float32(s.LeafInuse))
-		}
-		fmt.Fprintf(cmd.Stdout, "\tBytes used for inlined buckets: %d (%d%%)\n", s.InlineBucketInuse, percentage)
-
-		return nil
-	})
-}
-
-// Usage returns the help message.
-func (cmd *StatsCommand) Usage() string {
-	return strings.TrimLeft(`
-usage: bolt stats PATH
-
-Stats performs an extensive search of the database to track every page
-reference. It starts at the current meta page and recursively iterates
-through every accessible bucket.
-
-The following errors can be reported:
-
-    already freed
-        The page is referenced more than once in the freelist.
-
-    unreachable unfreed
-        The page is not referenced by a bucket or in the freelist.
-
-    reachable freed
-        The page is referenced by a bucket but is also in the freelist.
-
-    out of bounds
-        A page is referenced that is above the high water mark.
-
-    multiple references
-        A page is referenced by more than one other page.
-
-    invalid type
-        The page type is not "meta", "leaf", "branch", or "freelist".
-
-No errors should occur in your database. However, if for some reason you
-experience corruption, please submit a ticket to the Bolt project page:
-
-  https://github.com/boltdb/bolt/issues
-`, "\n")
-}
-
-var benchBucketName = []byte("bench")
-
-// BenchCommand represents the "bench" command execution.
-type BenchCommand struct {
-	Stdin  io.Reader
-	Stdout io.Writer
-	Stderr io.Writer
-}
-
-// NewBenchCommand returns a BenchCommand using the
-func newBenchCommand(m *Main) *BenchCommand {
-	return &BenchCommand{
-		Stdin:  m.Stdin,
-		Stdout: m.Stdout,
-		Stderr: m.Stderr,
-	}
-}
-
-// Run executes the "bench" command.
-func (cmd *BenchCommand) Run(args ...string) error {
-	// Parse CLI arguments.
-	options, err := cmd.ParseFlags(args)
-	if err != nil {
-		return err
-	}
-
-	// Remove path if "-work" is not set. Otherwise keep path.
-	if options.Work {
-		fmt.Fprintf(cmd.Stdout, "work: %s\n", options.Path)
-	} else {
-		defer os.Remove(options.Path)
-	}
-
-	// Create database.
-	db, err := bolt.Open(options.Path, 0666, nil)
-	if err != nil {
-		return err
-	}
-	db.NoSync = options.NoSync
-	defer db.Close()
-
-	// Write to the database.
-	var results BenchResults
-	if err := cmd.runWrites(db, options, &results); err != nil {
-		return fmt.Errorf("write: %v", err)
-	}
-
-	// Read from the database.
-	if err := cmd.runReads(db, options, &results); err != nil {
-		return fmt.Errorf("bench: read: %s", err)
-	}
-
-	// Print results.
-	fmt.Fprintf(os.Stderr, "# Write\t%v\t(%v/op)\t(%v op/sec)\n", results.WriteDuration, results.WriteOpDuration(), results.WriteOpsPerSecond())
-	fmt.Fprintf(os.Stderr, "# Read\t%v\t(%v/op)\t(%v op/sec)\n", results.ReadDuration, results.ReadOpDuration(), results.ReadOpsPerSecond())
-	fmt.Fprintln(os.Stderr, "")
-	return nil
-}
-
-// ParseFlags parses the command line flags.
-func (cmd *BenchCommand) ParseFlags(args []string) (*BenchOptions, error) {
-	var options BenchOptions
-
-	// Parse flagset.
-	fs := flag.NewFlagSet("", flag.ContinueOnError)
-	fs.StringVar(&options.ProfileMode, "profile-mode", "rw", "")
-	fs.StringVar(&options.WriteMode, "write-mode", "seq", "")
-	fs.StringVar(&options.ReadMode, "read-mode", "seq", "")
-	fs.IntVar(&options.Iterations, "count", 1000, "")
-	fs.IntVar(&options.BatchSize, "batch-size", 0, "")
-	fs.IntVar(&options.KeySize, "key-size", 8, "")
-	fs.IntVar(&options.ValueSize, "value-size", 32, "")
-	fs.StringVar(&options.CPUProfile, "cpuprofile", "", "")
-	fs.StringVar(&options.MemProfile, "memprofile", "", "")
-	fs.StringVar(&options.BlockProfile, "blockprofile", "", "")
-	fs.Float64Var(&options.FillPercent, "fill-percent", bolt.DefaultFillPercent, "")
-	fs.BoolVar(&options.NoSync, "no-sync", false, "")
-	fs.BoolVar(&options.Work, "work", false, "")
-	fs.StringVar(&options.Path, "path", "", "")
-	fs.SetOutput(cmd.Stderr)
-	if err := fs.Parse(args); err != nil {
-		return nil, err
-	}
-
-	// Set batch size to iteration size if not set.
-	// Require that batch size can be evenly divided by the iteration count.
-	if options.BatchSize == 0 {
-		options.BatchSize = options.Iterations
-	} else if options.Iterations%options.BatchSize != 0 {
-		return nil, ErrNonDivisibleBatchSize
-	}
-
-	// Generate temp path if one is not passed in.
-	if options.Path == "" {
-		f, err := ioutil.TempFile("", "bolt-bench-")
-		if err != nil {
-			return nil, fmt.Errorf("temp file: %s", err)
-		}
-		f.Close()
-		os.Remove(f.Name())
-		options.Path = f.Name()
-	}
-
-	return &options, nil
-}
-
-// Writes to the database.
-func (cmd *BenchCommand) runWrites(db *bolt.DB, options *BenchOptions, results *BenchResults) error {
-	// Start profiling for writes.
-	if options.ProfileMode == "rw" || options.ProfileMode == "w" {
-		cmd.startProfiling(options)
-	}
-
-	t := time.Now()
-
-	var err error
-	switch options.WriteMode {
-	case "seq":
-		err = cmd.runWritesSequential(db, options, results)
-	case "rnd":
-		err = cmd.runWritesRandom(db, options, results)
-	case "seq-nest":
-		err = cmd.runWritesSequentialNested(db, options, results)
-	case "rnd-nest":
-		err = cmd.runWritesRandomNested(db, options, results)
-	default:
-		return fmt.Errorf("invalid write mode: %s", options.WriteMode)
-	}
-
-	// Save time to write.
-	results.WriteDuration = time.Since(t)
-
-	// Stop profiling for writes only.
-	if options.ProfileMode == "w" {
-		cmd.stopProfiling()
-	}
-
-	return err
-}
-
-func (cmd *BenchCommand) runWritesSequential(db *bolt.DB, options *BenchOptions, results *BenchResults) error {
-	var i = uint32(0)
-	return cmd.runWritesWithSource(db, options, results, func() uint32 { i++; return i })
-}
-
-func (cmd *BenchCommand) runWritesRandom(db *bolt.DB, options *BenchOptions, results *BenchResults) error {
-	r := rand.New(rand.NewSource(time.Now().UnixNano()))
-	return cmd.runWritesWithSource(db, options, results, func() uint32 { return r.Uint32() })
-}
-
-func (cmd *BenchCommand) runWritesSequentialNested(db *bolt.DB, options *BenchOptions, results *BenchResults) error {
-	var i = uint32(0)
-	return cmd.runWritesWithSource(db, options, results, func() uint32 { i++; return i })
-}
-
-func (cmd *BenchCommand) runWritesRandomNested(db *bolt.DB, options *BenchOptions, results *BenchResults) error {
-	r := rand.New(rand.NewSource(time.Now().UnixNano()))
-	return cmd.runWritesWithSource(db, options, results, func() uint32 { return r.Uint32() })
-}
-
-func (cmd *BenchCommand) runWritesWithSource(db *bolt.DB, options *BenchOptions, results *BenchResults, keySource func() uint32) error {
-	results.WriteOps = options.Iterations
-
-	for i := 0; i < options.Iterations; i += options.BatchSize {
-		if err := db.Update(func(tx *bolt.Tx) error {
-			b, _ := tx.CreateBucketIfNotExists(benchBucketName)
-			b.FillPercent = options.FillPercent
-
-			for j := 0; j < options.BatchSize; j++ {
-				key := make([]byte, options.KeySize)
-				value := make([]byte, options.ValueSize)
-
-				// Write key as uint32.
-				binary.BigEndian.PutUint32(key, keySource())
-
-				// Insert key/value.
-				if err := b.Put(key, value); err != nil {
-					return err
-				}
-			}
-
-			return nil
-		}); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func (cmd *BenchCommand) runWritesNestedWithSource(db *bolt.DB, options *BenchOptions, results *BenchResults, keySource func() uint32) error {
-	results.WriteOps = options.Iterations
-
-	for i := 0; i < options.Iterations; i += options.BatchSize {
-		if err := db.Update(func(tx *bolt.Tx) error {
-			top, err := tx.CreateBucketIfNotExists(benchBucketName)
-			if err != nil {
-				return err
-			}
-			top.FillPercent = options.FillPercent
-
-			// Create bucket key.
-			name := make([]byte, options.KeySize)
-			binary.BigEndian.PutUint32(name, keySource())
-
-			// Create bucket.
-			b, err := top.CreateBucketIfNotExists(name)
-			if err != nil {
-				return err
-			}
-			b.FillPercent = options.FillPercent
-
-			for j := 0; j < options.BatchSize; j++ {
-				var key = make([]byte, options.KeySize)
-				var value = make([]byte, options.ValueSize)
-
-				// Generate key as uint32.
-				binary.BigEndian.PutUint32(key, keySource())
-
-				// Insert value into subbucket.
-				if err := b.Put(key, value); err != nil {
-					return err
-				}
-			}
-
-			return nil
-		}); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-// Reads from the database.
-func (cmd *BenchCommand) runReads(db *bolt.DB, options *BenchOptions, results *BenchResults) error {
-	// Start profiling for reads.
-	if options.ProfileMode == "r" {
-		cmd.startProfiling(options)
-	}
-
-	t := time.Now()
-
-	var err error
-	switch options.ReadMode {
-	case "seq":
-		switch options.WriteMode {
-		case "seq-nest", "rnd-nest":
-			err = cmd.runReadsSequentialNested(db, options, results)
-		default:
-			err = cmd.runReadsSequential(db, options, results)
-		}
-	default:
-		return fmt.Errorf("invalid read mode: %s", options.ReadMode)
-	}
-
-	// Save read time.
-	results.ReadDuration = time.Since(t)
-
-	// Stop profiling for reads.
-	if options.ProfileMode == "rw" || options.ProfileMode == "r" {
-		cmd.stopProfiling()
-	}
-
-	return err
-}
-
-func (cmd *BenchCommand) runReadsSequential(db *bolt.DB, options *BenchOptions, results *BenchResults) error {
-	return db.View(func(tx *bolt.Tx) error {
-		t := time.Now()
-
-		for {
-			var count int
-
-			c := tx.Bucket(benchBucketName).Cursor()
-			for k, v := c.First(); k != nil; k, v = c.Next() {
-				if v == nil {
-					return errors.New("invalid value")
-				}
-				count++
-			}
-
-			if options.WriteMode == "seq" && count != options.Iterations {
-				return fmt.Errorf("read seq: iter mismatch: expected %d, got %d", options.Iterations, count)
-			}
-
-			results.ReadOps += count
-
-			// Make sure we do this for at least a second.
-			if time.Since(t) >= time.Second {
-				break
-			}
-		}
-
-		return nil
-	})
-}
-
-func (cmd *BenchCommand) runReadsSequentialNested(db *bolt.DB, options *BenchOptions, results *BenchResults) error {
-	return db.View(func(tx *bolt.Tx) error {
-		t := time.Now()
-
-		for {
-			var count int
-			var top = tx.Bucket(benchBucketName)
-			if err := top.ForEach(func(name, _ []byte) error {
-				c := top.Bucket(name).Cursor()
-				for k, v := c.First(); k != nil; k, v = c.Next() {
-					if v == nil {
-						return ErrInvalidValue
-					}
-					count++
-				}
-				return nil
-			}); err != nil {
-				return err
-			}
-
-			if options.WriteMode == "seq-nest" && count != options.Iterations {
-				return fmt.Errorf("read seq-nest: iter mismatch: expected %d, got %d", options.Iterations, count)
-			}
-
-			results.ReadOps += count
-
-			// Make sure we do this for at least a second.
-			if time.Since(t) >= time.Second {
-				break
-			}
-		}
-
-		return nil
-	})
-}
-
-// File handlers for the various profiles.
-var cpuprofile, memprofile, blockprofile *os.File
-
-// Starts all profiles set on the options.
-func (cmd *BenchCommand) startProfiling(options *BenchOptions) {
-	var err error
-
-	// Start CPU profiling.
-	if options.CPUProfile != "" {
-		cpuprofile, err = os.Create(options.CPUProfile)
-		if err != nil {
-			fmt.Fprintf(cmd.Stderr, "bench: could not create cpu profile %q: %v\n", options.CPUProfile, err)
-			os.Exit(1)
-		}
-		pprof.StartCPUProfile(cpuprofile)
-	}
-
-	// Start memory profiling.
-	if options.MemProfile != "" {
-		memprofile, err = os.Create(options.MemProfile)
-		if err != nil {
-			fmt.Fprintf(cmd.Stderr, "bench: could not create memory profile %q: %v\n", options.MemProfile, err)
-			os.Exit(1)
-		}
-		runtime.MemProfileRate = 4096
-	}
-
-	// Start fatal profiling.
-	if options.BlockProfile != "" {
-		blockprofile, err = os.Create(options.BlockProfile)
-		if err != nil {
-			fmt.Fprintf(cmd.Stderr, "bench: could not create block profile %q: %v\n", options.BlockProfile, err)
-			os.Exit(1)
-		}
-		runtime.SetBlockProfileRate(1)
-	}
-}
-
-// Stops all profiles.
-func (cmd *BenchCommand) stopProfiling() {
-	if cpuprofile != nil {
-		pprof.StopCPUProfile()
-		cpuprofile.Close()
-		cpuprofile = nil
-	}
-
-	if memprofile != nil {
-		pprof.Lookup("heap").WriteTo(memprofile, 0)
-		memprofile.Close()
-		memprofile = nil
-	}
-
-	if blockprofile != nil {
-		pprof.Lookup("block").WriteTo(blockprofile, 0)
-		blockprofile.Close()
-		blockprofile = nil
-		runtime.SetBlockProfileRate(0)
-	}
-}
-
-// BenchOptions represents the set of options that can be passed to "bolt bench".
-type BenchOptions struct {
-	ProfileMode   string
-	WriteMode     string
-	ReadMode      string
-	Iterations    int
-	BatchSize     int
-	KeySize       int
-	ValueSize     int
-	CPUProfile    string
-	MemProfile    string
-	BlockProfile  string
-	StatsInterval time.Duration
-	FillPercent   float64
-	NoSync        bool
-	Work          bool
-	Path          string
-}
-
-// BenchResults represents the performance results of the benchmark.
-type BenchResults struct {
-	WriteOps      int
-	WriteDuration time.Duration
-	ReadOps       int
-	ReadDuration  time.Duration
-}
-
-// Returns the duration for a single write operation.
-func (r *BenchResults) WriteOpDuration() time.Duration {
-	if r.WriteOps == 0 {
-		return 0
-	}
-	return r.WriteDuration / time.Duration(r.WriteOps)
-}
-
-// Returns average number of write operations that can be performed per second.
-func (r *BenchResults) WriteOpsPerSecond() int {
-	var op = r.WriteOpDuration()
-	if op == 0 {
-		return 0
-	}
-	return int(time.Second) / int(op)
-}
-
-// Returns the duration for a single read operation.
-func (r *BenchResults) ReadOpDuration() time.Duration {
-	if r.ReadOps == 0 {
-		return 0
-	}
-	return r.ReadDuration / time.Duration(r.ReadOps)
-}
-
-// Returns average number of read operations that can be performed per second.
-func (r *BenchResults) ReadOpsPerSecond() int {
-	var op = r.ReadOpDuration()
-	if op == 0 {
-		return 0
-	}
-	return int(time.Second) / int(op)
-}
-
-type PageError struct {
-	ID  int
-	Err error
-}
-
-func (e *PageError) Error() string {
-	return fmt.Sprintf("page error: id=%d, err=%s", e.ID, e.Err)
-}
-
-// isPrintable returns true if the string is valid unicode and contains only printable runes.
-func isPrintable(s string) bool {
-	if !utf8.ValidString(s) {
-		return false
-	}
-	for _, ch := range s {
-		if !unicode.IsPrint(ch) {
-			return false
-		}
-	}
-	return true
-}
-
-// ReadPage reads page info & full page data from a path.
-// This is not transactionally safe.
-func ReadPage(path string, pageID int) (*page, []byte, error) {
-	// Find page size.
-	pageSize, err := ReadPageSize(path)
-	if err != nil {
-		return nil, nil, fmt.Errorf("read page size: %s", err)
-	}
-
-	// Open database file.
-	f, err := os.Open(path)
-	if err != nil {
-		return nil, nil, err
-	}
-	defer f.Close()
-
-	// Read one block into buffer.
-	buf := make([]byte, pageSize)
-	if n, err := f.ReadAt(buf, int64(pageID*pageSize)); err != nil {
-		return nil, nil, err
-	} else if n != len(buf) {
-		return nil, nil, io.ErrUnexpectedEOF
-	}
-
-	// Determine total number of blocks.
-	p := (*page)(unsafe.Pointer(&buf[0]))
-	overflowN := p.overflow
-
-	// Re-read entire page (with overflow) into buffer.
-	buf = make([]byte, (int(overflowN)+1)*pageSize)
-	if n, err := f.ReadAt(buf, int64(pageID*pageSize)); err != nil {
-		return nil, nil, err
-	} else if n != len(buf) {
-		return nil, nil, io.ErrUnexpectedEOF
-	}
-	p = (*page)(unsafe.Pointer(&buf[0]))
-
-	return p, buf, nil
-}
-
-// ReadPageSize reads page size a path.
-// This is not transactionally safe.
-func ReadPageSize(path string) (int, error) {
-	// Open database file.
-	f, err := os.Open(path)
-	if err != nil {
-		return 0, err
-	}
-	defer f.Close()
-
-	// Read 4KB chunk.
-	buf := make([]byte, 4096)
-	if _, err := io.ReadFull(f, buf); err != nil {
-		return 0, err
-	}
-
-	// Read page size from metadata.
-	m := (*meta)(unsafe.Pointer(&buf[PageHeaderSize]))
-	return int(m.pageSize), nil
-}
-
-// atois parses a slice of strings into integers.
-func atois(strs []string) ([]int, error) {
-	var a []int
-	for _, str := range strs {
-		i, err := strconv.Atoi(str)
-		if err != nil {
-			return nil, err
-		}
-		a = append(a, i)
-	}
-	return a, nil
-}
-
-// DO NOT EDIT. Copied from the "bolt" package.
-const maxAllocSize = 0xFFFFFFF
-
-// DO NOT EDIT. Copied from the "bolt" package.
-const (
-	branchPageFlag   = 0x01
-	leafPageFlag     = 0x02
-	metaPageFlag     = 0x04
-	freelistPageFlag = 0x10
-)
-
-// DO NOT EDIT. Copied from the "bolt" package.
-const bucketLeafFlag = 0x01
-
-// DO NOT EDIT. Copied from the "bolt" package.
-type pgid uint64
-
-// DO NOT EDIT. Copied from the "bolt" package.
-type txid uint64
-
-// DO NOT EDIT. Copied from the "bolt" package.
-type meta struct {
-	magic    uint32
-	version  uint32
-	pageSize uint32
-	flags    uint32
-	root     bucket
-	freelist pgid
-	pgid     pgid
-	txid     txid
-	checksum uint64
-}
-
-// DO NOT EDIT. Copied from the "bolt" package.
-type bucket struct {
-	root     pgid
-	sequence uint64
-}
-
-// DO NOT EDIT. Copied from the "bolt" package.
-type page struct {
-	id       pgid
-	flags    uint16
-	count    uint16
-	overflow uint32
-	ptr      uintptr
-}
-
-// DO NOT EDIT. Copied from the "bolt" package.
-func (p *page) Type() string {
-	if (p.flags & branchPageFlag) != 0 {
-		return "branch"
-	} else if (p.flags & leafPageFlag) != 0 {
-		return "leaf"
-	} else if (p.flags & metaPageFlag) != 0 {
-		return "meta"
-	} else if (p.flags & freelistPageFlag) != 0 {
-		return "freelist"
-	}
-	return fmt.Sprintf("unknown<%02x>", p.flags)
-}
-
-// DO NOT EDIT. Copied from the "bolt" package.
-func (p *page) leafPageElement(index uint16) *leafPageElement {
-	n := &((*[0x7FFFFFF]leafPageElement)(unsafe.Pointer(&p.ptr)))[index]
-	return n
-}
-
-// DO NOT EDIT. Copied from the "bolt" package.
-func (p *page) branchPageElement(index uint16) *branchPageElement {
-	return &((*[0x7FFFFFF]branchPageElement)(unsafe.Pointer(&p.ptr)))[index]
-}
-
-// DO NOT EDIT. Copied from the "bolt" package.
-type branchPageElement struct {
-	pos   uint32
-	ksize uint32
-	pgid  pgid
-}
-
-// DO NOT EDIT. Copied from the "bolt" package.
-func (n *branchPageElement) key() []byte {
-	buf := (*[maxAllocSize]byte)(unsafe.Pointer(n))
-	return buf[n.pos : n.pos+n.ksize]
-}
-
-// DO NOT EDIT. Copied from the "bolt" package.
-type leafPageElement struct {
-	flags uint32
-	pos   uint32
-	ksize uint32
-	vsize uint32
-}
-
-// DO NOT EDIT. Copied from the "bolt" package.
-func (n *leafPageElement) key() []byte {
-	buf := (*[maxAllocSize]byte)(unsafe.Pointer(n))
-	return buf[n.pos : n.pos+n.ksize]
-}
-
-// DO NOT EDIT. Copied from the "bolt" package.
-func (n *leafPageElement) value() []byte {
-	buf := (*[maxAllocSize]byte)(unsafe.Pointer(n))
-	return buf[n.pos+n.ksize : n.pos+n.ksize+n.vsize]
-}
diff --git a/Godeps/_workspace/src/github.com/boltdb/bolt/cmd/bolt/main_test.go b/Godeps/_workspace/src/github.com/boltdb/bolt/cmd/bolt/main_test.go
deleted file mode 100644
index b9e8c671f..000000000
--- a/Godeps/_workspace/src/github.com/boltdb/bolt/cmd/bolt/main_test.go
+++ /dev/null
@@ -1,145 +0,0 @@
-package main_test
-
-import (
-	"bytes"
-	"io/ioutil"
-	"os"
-	"strconv"
-	"testing"
-
-	"github.com/boltdb/bolt"
-	"github.com/boltdb/bolt/cmd/bolt"
-)
-
-// Ensure the "info" command can print information about a database.
-func TestInfoCommand_Run(t *testing.T) {
-	db := MustOpen(0666, nil)
-	db.DB.Close()
-	defer db.Close()
-
-	// Run the info command.
-	m := NewMain()
-	if err := m.Run("info", db.Path); err != nil {
-		t.Fatal(err)
-	}
-}
-
-// Ensure the "stats" command can execute correctly.
-func TestStatsCommand_Run(t *testing.T) {
-	// Ignore
-	if os.Getpagesize() != 4096 {
-		t.Skip("system does not use 4KB page size")
-	}
-
-	db := MustOpen(0666, nil)
-	defer db.Close()
-
-	if err := db.Update(func(tx *bolt.Tx) error {
-		// Create "foo" bucket.
-		b, err := tx.CreateBucket([]byte("foo"))
-		if err != nil {
-			return err
-		}
-		for i := 0; i < 10; i++ {
-			if err := b.Put([]byte(strconv.Itoa(i)), []byte(strconv.Itoa(i))); err != nil {
-				return err
-			}
-		}
-
-		// Create "bar" bucket.
-		b, err = tx.CreateBucket([]byte("bar"))
-		if err != nil {
-			return err
-		}
-		for i := 0; i < 100; i++ {
-			if err := b.Put([]byte(strconv.Itoa(i)), []byte(strconv.Itoa(i))); err != nil {
-				return err
-			}
-		}
-
-		// Create "baz" bucket.
-		b, err = tx.CreateBucket([]byte("baz"))
-		if err != nil {
-			return err
-		}
-		if err := b.Put([]byte("key"), []byte("value")); err != nil {
-			return err
-		}
-
-		return nil
-	}); err != nil {
-		t.Fatal(err)
-	}
-	db.DB.Close()
-
-	// Generate expected result.
-	exp := "Aggregate statistics for 3 buckets\n\n" +
-		"Page count statistics\n" +
-		"\tNumber of logical branch pages: 0\n" +
-		"\tNumber of physical branch overflow pages: 0\n" +
-		"\tNumber of logical leaf pages: 1\n" +
-		"\tNumber of physical leaf overflow pages: 0\n" +
-		"Tree statistics\n" +
-		"\tNumber of keys/value pairs: 111\n" +
-		"\tNumber of levels in B+tree: 1\n" +
-		"Page size utilization\n" +
-		"\tBytes allocated for physical branch pages: 0\n" +
-		"\tBytes actually used for branch data: 0 (0%)\n" +
-		"\tBytes allocated for physical leaf pages: 4096\n" +
-		"\tBytes actually used for leaf data: 1996 (48%)\n" +
-		"Bucket statistics\n" +
-		"\tTotal number of buckets: 3\n" +
-		"\tTotal number on inlined buckets: 2 (66%)\n" +
-		"\tBytes used for inlined buckets: 236 (11%)\n"
-
-	// Run the command.
-	m := NewMain()
-	if err := m.Run("stats", db.Path); err != nil {
-		t.Fatal(err)
-	} else if m.Stdout.String() != exp {
-		t.Fatalf("unexpected stdout:\n\n%s", m.Stdout.String())
-	}
-}
-
-// Main represents a test wrapper for main.Main that records output.
-type Main struct {
-	*main.Main
-	Stdin  bytes.Buffer
-	Stdout bytes.Buffer
-	Stderr bytes.Buffer
-}
-
-// NewMain returns a new instance of Main.
-func NewMain() *Main {
-	m := &Main{Main: main.NewMain()}
-	m.Main.Stdin = &m.Stdin
-	m.Main.Stdout = &m.Stdout
-	m.Main.Stderr = &m.Stderr
-	return m
-}
-
-// MustOpen creates a Bolt database in a temporary location.
-func MustOpen(mode os.FileMode, options *bolt.Options) *DB {
-	// Create temporary path.
-	f, _ := ioutil.TempFile("", "bolt-")
-	f.Close()
-	os.Remove(f.Name())
-
-	db, err := bolt.Open(f.Name(), mode, options)
-	if err != nil {
-		panic(err.Error())
-	}
-	return &DB{DB: db, Path: f.Name()}
-}
-
-// DB is a test wrapper for bolt.DB.
-type DB struct {
-	*bolt.DB
-	Path string
-}
-
-// Close closes and removes the database.
-func (db *DB) Close() error {
-	defer os.Remove(db.Path)
-	return db.DB.Close()
-}
diff --git a/Godeps/_workspace/src/github.com/boltdb/bolt/cursor.go b/Godeps/_workspace/src/github.com/boltdb/bolt/cursor.go
deleted file mode 100644
index 006c54889..000000000
--- a/Godeps/_workspace/src/github.com/boltdb/bolt/cursor.go
+++ /dev/null
@@ -1,384 +0,0 @@
-package bolt
-
-import (
-	"bytes"
-	"fmt"
-	"sort"
-)
-
-// Cursor represents an iterator that can traverse over all key/value pairs in a bucket in sorted order.
-// Cursors see nested buckets with value == nil.
-// Cursors can be obtained from a transaction and are valid as long as the transaction is open.
-//
-// Keys and values returned from the cursor are only valid for the life of the transaction.
-//
-// Changing data while traversing with a cursor may cause it to be invalidated
-// and return unexpected keys and/or values. You must reposition your cursor
-// after mutating data.
-type Cursor struct {
-	bucket *Bucket
-	stack  []elemRef
-}
-
-// Bucket returns the bucket that this cursor was created from.
-func (c *Cursor) Bucket() *Bucket {
-	return c.bucket
-}
-
-// First moves the cursor to the first item in the bucket and returns its key and value.
-// If the bucket is empty then a nil key and value are returned.
-// The returned key and value are only valid for the life of the transaction.
-func (c *Cursor) First() (key []byte, value []byte) {
-	_assert(c.bucket.tx.db != nil, "tx closed")
-	c.stack = c.stack[:0]
-	p, n := c.bucket.pageNode(c.bucket.root)
-	c.stack = append(c.stack, elemRef{page: p, node: n, index: 0})
-	c.first()
-	k, v, flags := c.keyValue()
-	if (flags & uint32(bucketLeafFlag)) != 0 {
-		return k, nil
-	}
-	return k, v
-
-}
-
-// Last moves the cursor to the last item in the bucket and returns its key and value.
-// If the bucket is empty then a nil key and value are returned.
-// The returned key and value are only valid for the life of the transaction.
-func (c *Cursor) Last() (key []byte, value []byte) {
-	_assert(c.bucket.tx.db != nil, "tx closed")
-	c.stack = c.stack[:0]
-	p, n := c.bucket.pageNode(c.bucket.root)
-	ref := elemRef{page: p, node: n}
-	ref.index = ref.count() - 1
-	c.stack = append(c.stack, ref)
-	c.last()
-	k, v, flags := c.keyValue()
-	if (flags & uint32(bucketLeafFlag)) != 0 {
-		return k, nil
-	}
-	return k, v
-}
-
-// Next moves the cursor to the next item in the bucket and returns its key and value.
-// If the cursor is at the end of the bucket then a nil key and value are returned.
-// The returned key and value are only valid for the life of the transaction.
-func (c *Cursor) Next() (key []byte, value []byte) {
-	_assert(c.bucket.tx.db != nil, "tx closed")
-	k, v, flags := c.next()
-	if (flags & uint32(bucketLeafFlag)) != 0 {
-		return k, nil
-	}
-	return k, v
-}
-
-// Prev moves the cursor to the previous item in the bucket and returns its key and value.
-// If the cursor is at the beginning of the bucket then a nil key and value are returned.
-// The returned key and value are only valid for the life of the transaction.
-func (c *Cursor) Prev() (key []byte, value []byte) {
-	_assert(c.bucket.tx.db != nil, "tx closed")
-
-	// Attempt to move back one element until we're successful.
-	// Move up the stack as we hit the beginning of each page in our stack.
-	for i := len(c.stack) - 1; i >= 0; i-- {
-		elem := &c.stack[i]
-		if elem.index > 0 {
-			elem.index--
-			break
-		}
-		c.stack = c.stack[:i]
-	}
-
-	// If we've hit the end then return nil.
-	if len(c.stack) == 0 {
-		return nil, nil
-	}
-
-	// Move down the stack to find the last element of the last leaf under this branch.
-	c.last()
-	k, v, flags := c.keyValue()
-	if (flags & uint32(bucketLeafFlag)) != 0 {
-		return k, nil
-	}
-	return k, v
-}
-
-// Seek moves the cursor to a given key and returns it.
-// If the key does not exist then the next key is used. If no keys
-// follow, a nil key is returned.
-// The returned key and value are only valid for the life of the transaction.
-func (c *Cursor) Seek(seek []byte) (key []byte, value []byte) {
-	k, v, flags := c.seek(seek)
-
-	// If we ended up after the last element of a page then move to the next one.
-	if ref := &c.stack[len(c.stack)-1]; ref.index >= ref.count() {
-		k, v, flags = c.next()
-	}
-
-	if k == nil {
-		return nil, nil
-	} else if (flags & uint32(bucketLeafFlag)) != 0 {
-		return k, nil
-	}
-	return k, v
-}
-
-// Delete removes the current key/value under the cursor from the bucket.
-// Delete fails if current key/value is a bucket or if the transaction is not writable.
-func (c *Cursor) Delete() error {
-	if c.bucket.tx.db == nil {
-		return ErrTxClosed
-	} else if !c.bucket.Writable() {
-		return ErrTxNotWritable
-	}
-
-	key, _, flags := c.keyValue()
-	// Return an error if current value is a bucket.
-	if (flags & bucketLeafFlag) != 0 {
-		return ErrIncompatibleValue
-	}
-	c.node().del(key)
-
-	return nil
-}
-
-// seek moves the cursor to a given key and returns it.
-// If the key does not exist then the next key is used.
-func (c *Cursor) seek(seek []byte) (key []byte, value []byte, flags uint32) {
-	_assert(c.bucket.tx.db != nil, "tx closed")
-
-	// Start from root page/node and traverse to correct page.
-	c.stack = c.stack[:0]
-	c.search(seek, c.bucket.root)
-	ref := &c.stack[len(c.stack)-1]
-
-	// If the cursor is pointing to the end of page/node then return nil.
-	if ref.index >= ref.count() {
-		return nil, nil, 0
-	}
-
-	// If this is a bucket then return a nil value.
-	return c.keyValue()
-}
-
-// first moves the cursor to the first leaf element under the last page in the stack.
-func (c *Cursor) first() {
-	for {
-		// Exit when we hit a leaf page.
-		var ref = &c.stack[len(c.stack)-1]
-		if ref.isLeaf() {
-			break
-		}
-
-		// Keep adding pages pointing to the first element to the stack.
-		var pgid pgid
-		if ref.node != nil {
-			pgid = ref.node.inodes[ref.index].pgid
-		} else {
-			pgid = ref.page.branchPageElement(uint16(ref.index)).pgid
-		}
-		p, n := c.bucket.pageNode(pgid)
-		c.stack = append(c.stack, elemRef{page: p, node: n, index: 0})
-	}
-}
-
-// last moves the cursor to the last leaf element under the last page in the stack.
-func (c *Cursor) last() {
-	for {
-		// Exit when we hit a leaf page.
-		ref := &c.stack[len(c.stack)-1]
-		if ref.isLeaf() {
-			break
-		}
-
-		// Keep adding pages pointing to the last element in the stack.
-		var pgid pgid
-		if ref.node != nil {
-			pgid = ref.node.inodes[ref.index].pgid
-		} else {
-			pgid = ref.page.branchPageElement(uint16(ref.index)).pgid
-		}
-		p, n := c.bucket.pageNode(pgid)
-
-		var nextRef = elemRef{page: p, node: n}
-		nextRef.index = nextRef.count() - 1
-		c.stack = append(c.stack, nextRef)
-	}
-}
-
-// next moves to the next leaf element and returns the key and value.
-// If the cursor is at the last leaf element then it stays there and returns nil.
-func (c *Cursor) next() (key []byte, value []byte, flags uint32) {
-	// Attempt to move over one element until we're successful.
-	// Move up the stack as we hit the end of each page in our stack.
-	var i int
-	for i = len(c.stack) - 1; i >= 0; i-- {
-		elem := &c.stack[i]
-		if elem.index < elem.count()-1 {
-			elem.index++
-			break
-		}
-	}
-
-	// If we've hit the root page then stop and return. This will leave the
-	// cursor on the last element of the last page.
-	if i == -1 {
-		return nil, nil, 0
-	}
-
-	// Otherwise start from where we left off in the stack and find the
-	// first element of the first leaf page.
-	c.stack = c.stack[:i+1]
-	c.first()
-	return c.keyValue()
-}
-
-// search recursively performs a binary search against a given page/node until it finds a given key.
-func (c *Cursor) search(key []byte, pgid pgid) {
-	p, n := c.bucket.pageNode(pgid)
-	if p != nil && (p.flags&(branchPageFlag|leafPageFlag)) == 0 {
-		panic(fmt.Sprintf("invalid page type: %d: %x", p.id, p.flags))
-	}
-	e := elemRef{page: p, node: n}
-	c.stack = append(c.stack, e)
-
-	// If we're on a leaf page/node then find the specific node.
-	if e.isLeaf() {
-		c.nsearch(key)
-		return
-	}
-
-	if n != nil {
-		c.searchNode(key, n)
-		return
-	}
-	c.searchPage(key, p)
-}
-
-func (c *Cursor) searchNode(key []byte, n *node) {
-	var exact bool
-	index := sort.Search(len(n.inodes), func(i int) bool {
-		// TODO(benbjohnson): Optimize this range search. It's a bit hacky right now.
-		// sort.Search() finds the lowest index where f() != -1 but we need the highest index.
-		ret := bytes.Compare(n.inodes[i].key, key)
-		if ret == 0 {
-			exact = true
-		}
-		return ret != -1
-	})
-	if !exact && index > 0 {
-		index--
-	}
-	c.stack[len(c.stack)-1].index = index
-
-	// Recursively search to the next page.
-	c.search(key, n.inodes[index].pgid)
-}
-
-func (c *Cursor) searchPage(key []byte, p *page) {
-	// Binary search for the correct range.
-	inodes := p.branchPageElements()
-
-	var exact bool
-	index := sort.Search(int(p.count), func(i int) bool {
-		// TODO(benbjohnson): Optimize this range search. It's a bit hacky right now.
-		// sort.Search() finds the lowest index where f() != -1 but we need the highest index.
-		ret := bytes.Compare(inodes[i].key(), key)
-		if ret == 0 {
-			exact = true
-		}
-		return ret != -1
-	})
-	if !exact && index > 0 {
-		index--
-	}
-	c.stack[len(c.stack)-1].index = index
-
-	// Recursively search to the next page.
-	c.search(key, inodes[index].pgid)
-}
-
-// nsearch searches the leaf node on the top of the stack for a key.
-func (c *Cursor) nsearch(key []byte) {
-	e := &c.stack[len(c.stack)-1]
-	p, n := e.page, e.node
-
-	// If we have a node then search its inodes.
-	if n != nil {
-		index := sort.Search(len(n.inodes), func(i int) bool {
-			return bytes.Compare(n.inodes[i].key, key) != -1
-		})
-		e.index = index
-		return
-	}
-
-	// If we have a page then search its leaf elements.
-	inodes := p.leafPageElements()
-	index := sort.Search(int(p.count), func(i int) bool {
-		return bytes.Compare(inodes[i].key(), key) != -1
-	})
-	e.index = index
-}
-
-// keyValue returns the key and value of the current leaf element.
-func (c *Cursor) keyValue() ([]byte, []byte, uint32) {
-	ref := &c.stack[len(c.stack)-1]
-	if ref.count() == 0 || ref.index >= ref.count() {
-		return nil, nil, 0
-	}
-
-	// Retrieve value from node.
-	if ref.node != nil {
-		inode := &ref.node.inodes[ref.index]
-		return inode.key, inode.value, inode.flags
-	}
-
-	// Or retrieve value from page.
-	elem := ref.page.leafPageElement(uint16(ref.index))
-	return elem.key(), elem.value(), elem.flags
-}
-
-// node returns the node that the cursor is currently positioned on.
-func (c *Cursor) node() *node {
-	_assert(len(c.stack) > 0, "accessing a node with a zero-length cursor stack")
-
-	// If the top of the stack is a leaf node then just return it.
-	if ref := &c.stack[len(c.stack)-1]; ref.node != nil && ref.isLeaf() {
-		return ref.node
-	}
-
-	// Start from root and traverse down the hierarchy.
-	var n = c.stack[0].node
-	if n == nil {
-		n = c.bucket.node(c.stack[0].page.id, nil)
-	}
-	for _, ref := range c.stack[:len(c.stack)-1] {
-		_assert(!n.isLeaf, "expected branch node")
-		n = n.childAt(int(ref.index))
-	}
-	_assert(n.isLeaf, "expected leaf node")
-	return n
-}
-
-// elemRef represents a reference to an element on a given page/node.
-type elemRef struct {
-	page  *page
-	node  *node
-	index int
-}
-
-// isLeaf returns whether the ref is pointing at a leaf page/node.
-func (r *elemRef) isLeaf() bool {
-	if r.node != nil {
-		return r.node.isLeaf
-	}
-	return (r.page.flags & leafPageFlag) != 0
-}
-
-// count returns the number of inodes or page elements.
-func (r *elemRef) count() int {
-	if r.node != nil {
-		return len(r.node.inodes)
-	}
-	return int(r.page.count)
-}
diff --git a/Godeps/_workspace/src/github.com/boltdb/bolt/cursor_test.go b/Godeps/_workspace/src/github.com/boltdb/bolt/cursor_test.go
deleted file mode 100644
index b12e1f915..000000000
--- a/Godeps/_workspace/src/github.com/boltdb/bolt/cursor_test.go
+++ /dev/null
@@ -1,511 +0,0 @@
-package bolt_test
-
-import (
-	"bytes"
-	"encoding/binary"
-	"fmt"
-	"os"
-	"sort"
-	"testing"
-	"testing/quick"
-
-	"github.com/boltdb/bolt"
-)
-
-// Ensure that a cursor can return a reference to the bucket that created it.
-func TestCursor_Bucket(t *testing.T) {
-	db := NewTestDB()
-	defer db.Close()
-	db.Update(func(tx *bolt.Tx) error {
-		b, _ := tx.CreateBucket([]byte("widgets"))
-		c := b.Cursor()
-		equals(t, b, c.Bucket())
-		return nil
-	})
-}
-
-// Ensure that a Tx cursor can seek to the appropriate keys.
-func TestCursor_Seek(t *testing.T) {
-	db := NewTestDB()
-	defer db.Close()
-	db.Update(func(tx *bolt.Tx) error {
-		b, err := tx.CreateBucket([]byte("widgets"))
-		ok(t, err)
-		ok(t, b.Put([]byte("foo"), []byte("0001")))
-		ok(t, b.Put([]byte("bar"), []byte("0002")))
-		ok(t, b.Put([]byte("baz"), []byte("0003")))
-		_, err = b.CreateBucket([]byte("bkt"))
-		ok(t, err)
-		return nil
-	})
-	db.View(func(tx *bolt.Tx) error {
-		c := tx.Bucket([]byte("widgets")).Cursor()
-
-		// Exact match should go to the key.
-		k, v := c.Seek([]byte("bar"))
-		equals(t, []byte("bar"), k)
-		equals(t, []byte("0002"), v)
-
-		// Inexact match should go to the next key.
-		k, v = c.Seek([]byte("bas"))
-		equals(t, []byte("baz"), k)
-		equals(t, []byte("0003"), v)
-
-		// Low key should go to the first key.
-		k, v = c.Seek([]byte(""))
-		equals(t, []byte("bar"), k)
-		equals(t, []byte("0002"), v)
-
-		// High key should return no key.
-		k, v = c.Seek([]byte("zzz"))
-		assert(t, k == nil, "")
-		assert(t, v == nil, "")
-
-		// Buckets should return their key but no value.
-		k, v = c.Seek([]byte("bkt"))
-		equals(t, []byte("bkt"), k)
-		assert(t, v == nil, "")
-
-		return nil
-	})
-}
-
-func TestCursor_Delete(t *testing.T) {
-	db := NewTestDB()
-	defer db.Close()
-
-	var count = 1000
-
-	// Insert every other key between 0 and $count.
-	db.Update(func(tx *bolt.Tx) error {
-		b, _ := tx.CreateBucket([]byte("widgets"))
-		for i := 0; i < count; i += 1 {
-			k := make([]byte, 8)
-			binary.BigEndian.PutUint64(k, uint64(i))
-			b.Put(k, make([]byte, 100))
-		}
-		b.CreateBucket([]byte("sub"))
-		return nil
-	})
-
-	db.Update(func(tx *bolt.Tx) error {
-		c := tx.Bucket([]byte("widgets")).Cursor()
-		bound := make([]byte, 8)
-		binary.BigEndian.PutUint64(bound, uint64(count/2))
-		for key, _ := c.First(); bytes.Compare(key, bound) < 0; key, _ = c.Next() {
-			if err := c.Delete(); err != nil {
-				return err
-			}
-		}
-		c.Seek([]byte("sub"))
-		err := c.Delete()
-		equals(t, err, bolt.ErrIncompatibleValue)
-		return nil
-	})
-
-	db.View(func(tx *bolt.Tx) error {
-		b := tx.Bucket([]byte("widgets"))
-		equals(t, b.Stats().KeyN, count/2+1)
-		return nil
-	})
-}
-
-// Ensure that a Tx cursor can seek to the appropriate keys when there are a
-// large number of keys. This test also checks that seek will always move
-// forward to the next key.
-//
-// Related: https://github.com/boltdb/bolt/pull/187
-func TestCursor_Seek_Large(t *testing.T) {
-	db := NewTestDB()
-	defer db.Close()
-
-	var count = 10000
-
-	// Insert every other key between 0 and $count.
-	db.Update(func(tx *bolt.Tx) error {
-		b, _ := tx.CreateBucket([]byte("widgets"))
-		for i := 0; i < count; i += 100 {
-			for j := i; j < i+100; j += 2 {
-				k := make([]byte, 8)
-				binary.BigEndian.PutUint64(k, uint64(j))
-				b.Put(k, make([]byte, 100))
-			}
-		}
-		return nil
-	})
-
-	db.View(func(tx *bolt.Tx) error {
-		c := tx.Bucket([]byte("widgets")).Cursor()
-		for i := 0; i < count; i++ {
-			seek := make([]byte, 8)
-			binary.BigEndian.PutUint64(seek, uint64(i))
-
-			k, _ := c.Seek(seek)
-
-			// The last seek is beyond the end of the the range so
-			// it should return nil.
-			if i == count-1 {
-				assert(t, k == nil, "")
-				continue
-			}
-
-			// Otherwise we should seek to the exact key or the next key.
-			num := binary.BigEndian.Uint64(k)
-			if i%2 == 0 {
-				equals(t, uint64(i), num)
-			} else {
-				equals(t, uint64(i+1), num)
-			}
-		}
-
-		return nil
-	})
-}
-
-// Ensure that a cursor can iterate over an empty bucket without error.
-func TestCursor_EmptyBucket(t *testing.T) {
-	db := NewTestDB()
-	defer db.Close()
-	db.Update(func(tx *bolt.Tx) error {
-		_, err := tx.CreateBucket([]byte("widgets"))
-		return err
-	})
-	db.View(func(tx *bolt.Tx) error {
-		c := tx.Bucket([]byte("widgets")).Cursor()
-		k, v := c.First()
-		assert(t, k == nil, "")
-		assert(t, v == nil, "")
-		return nil
-	})
-}
-
-// Ensure that a Tx cursor can reverse iterate over an empty bucket without error.
-func TestCursor_EmptyBucketReverse(t *testing.T) {
-	db := NewTestDB()
-	defer db.Close()
-
-	db.Update(func(tx *bolt.Tx) error {
-		_, err := tx.CreateBucket([]byte("widgets"))
-		return err
-	})
-	db.View(func(tx *bolt.Tx) error {
-		c := tx.Bucket([]byte("widgets")).Cursor()
-		k, v := c.Last()
-		assert(t, k == nil, "")
-		assert(t, v == nil, "")
-		return nil
-	})
-}
-
-// Ensure that a Tx cursor can iterate over a single root with a couple elements.
-func TestCursor_Iterate_Leaf(t *testing.T) {
-	db := NewTestDB()
-	defer db.Close()
-
-	db.Update(func(tx *bolt.Tx) error {
-		tx.CreateBucket([]byte("widgets"))
-		tx.Bucket([]byte("widgets")).Put([]byte("baz"), []byte{})
-		tx.Bucket([]byte("widgets")).Put([]byte("foo"), []byte{0})
-		tx.Bucket([]byte("widgets")).Put([]byte("bar"), []byte{1})
-		return nil
-	})
-	tx, _ := db.Begin(false)
-	c := tx.Bucket([]byte("widgets")).Cursor()
-
-	k, v := c.First()
-	equals(t, string(k), "bar")
-	equals(t, v, []byte{1})
-
-	k, v = c.Next()
-	equals(t, string(k), "baz")
-	equals(t, v, []byte{})
-
-	k, v = c.Next()
-	equals(t, string(k), "foo")
-	equals(t, v, []byte{0})
-
-	k, v = c.Next()
-	assert(t, k == nil, "")
-	assert(t, v == nil, "")
-
-	k, v = c.Next()
-	assert(t, k == nil, "")
-	assert(t, v == nil, "")
-
-	tx.Rollback()
-}
-
-// Ensure that a Tx cursor can iterate in reverse over a single root with a couple elements.
-func TestCursor_LeafRootReverse(t *testing.T) {
-	db := NewTestDB()
-	defer db.Close()
-
-	db.Update(func(tx *bolt.Tx) error {
-		tx.CreateBucket([]byte("widgets"))
-		tx.Bucket([]byte("widgets")).Put([]byte("baz"), []byte{})
-		tx.Bucket([]byte("widgets")).Put([]byte("foo"), []byte{0})
-		tx.Bucket([]byte("widgets")).Put([]byte("bar"), []byte{1})
-		return nil
-	})
-	tx, _ := db.Begin(false)
-	c := tx.Bucket([]byte("widgets")).Cursor()
-
-	k, v := c.Last()
-	equals(t, string(k), "foo")
-	equals(t, v, []byte{0})
-
-	k, v = c.Prev()
-	equals(t, string(k), "baz")
-	equals(t, v, []byte{})
-
-	k, v = c.Prev()
-	equals(t, string(k), "bar")
-	equals(t, v, []byte{1})
-
-	k, v = c.Prev()
-	assert(t, k == nil, "")
-	assert(t, v == nil, "")
-
-	k, v = c.Prev()
-	assert(t, k == nil, "")
-	assert(t, v == nil, "")
-
-	tx.Rollback()
-}
-
-// Ensure that a Tx cursor can restart from the beginning.
-func TestCursor_Restart(t *testing.T) {
-	db := NewTestDB()
-	defer db.Close()
-
-	db.Update(func(tx *bolt.Tx) error {
-		tx.CreateBucket([]byte("widgets"))
-		tx.Bucket([]byte("widgets")).Put([]byte("bar"), []byte{})
-		tx.Bucket([]byte("widgets")).Put([]byte("foo"), []byte{})
-		return nil
-	})
-
-	tx, _ := db.Begin(false)
-	c := tx.Bucket([]byte("widgets")).Cursor()
-
-	k, _ := c.First()
-	equals(t, string(k), "bar")
-
-	k, _ = c.Next()
-	equals(t, string(k), "foo")
-
-	k, _ = c.First()
-	equals(t, string(k), "bar")
-
-	k, _ = c.Next()
-	equals(t, string(k), "foo")
-
-	tx.Rollback()
-}
-
-// Ensure that a Tx can iterate over all elements in a bucket.
-func TestCursor_QuickCheck(t *testing.T) {
-	f := func(items testdata) bool {
-		db := NewTestDB()
-		defer db.Close()
-
-		// Bulk insert all values.
-		tx, _ := db.Begin(true)
-		tx.CreateBucket([]byte("widgets"))
-		b := tx.Bucket([]byte("widgets"))
-		for _, item := range items {
-			ok(t, b.Put(item.Key, item.Value))
-		}
-		ok(t, tx.Commit())
-
-		// Sort test data.
-		sort.Sort(items)
-
-		// Iterate over all items and check consistency.
-		var index = 0
-		tx, _ = db.Begin(false)
-		c := tx.Bucket([]byte("widgets")).Cursor()
-		for k, v := c.First(); k != nil && index < len(items); k, v = c.Next() {
-			equals(t, k, items[index].Key)
-			equals(t, v, items[index].Value)
-			index++
-		}
-		equals(t, len(items), index)
-		tx.Rollback()
-
-		return true
-	}
-	if err := quick.Check(f, qconfig()); err != nil {
-		t.Error(err)
-	}
-}
-
-// Ensure that a transaction can iterate over all elements in a bucket in reverse.
-func TestCursor_QuickCheck_Reverse(t *testing.T) {
-	f := func(items testdata) bool {
-		db := NewTestDB()
-		defer db.Close()
-
-		// Bulk insert all values.
-		tx, _ := db.Begin(true)
-		tx.CreateBucket([]byte("widgets"))
-		b := tx.Bucket([]byte("widgets"))
-		for _, item := range items {
-			ok(t, b.Put(item.Key, item.Value))
-		}
-		ok(t, tx.Commit())
-
-		// Sort test data.
-		sort.Sort(revtestdata(items))
-
-		// Iterate over all items and check consistency.
-		var index = 0
-		tx, _ = db.Begin(false)
-		c := tx.Bucket([]byte("widgets")).Cursor()
-		for k, v := c.Last(); k != nil && index < len(items); k, v = c.Prev() {
-			equals(t, k, items[index].Key)
-			equals(t, v, items[index].Value)
-			index++
-		}
-		equals(t, len(items), index)
-		tx.Rollback()
-
-		return true
-	}
-	if err := quick.Check(f, qconfig()); err != nil {
-		t.Error(err)
-	}
-}
-
-// Ensure that a Tx cursor can iterate over subbuckets.
-func TestCursor_QuickCheck_BucketsOnly(t *testing.T) {
-	db := NewTestDB()
-	defer db.Close()
-
-	db.Update(func(tx *bolt.Tx) error {
-		b, err := tx.CreateBucket([]byte("widgets"))
-		ok(t, err)
-		_, err = b.CreateBucket([]byte("foo"))
-		ok(t, err)
-		_, err = b.CreateBucket([]byte("bar"))
-		ok(t, err)
-		_, err = b.CreateBucket([]byte("baz"))
-		ok(t, err)
-		return nil
-	})
-	db.View(func(tx *bolt.Tx) error {
-		var names []string
-		c := tx.Bucket([]byte("widgets")).Cursor()
-		for k, v := c.First(); k != nil; k, v = c.Next() {
-			names = append(names, string(k))
-			assert(t, v == nil, "")
-		}
-		equals(t, names, []string{"bar", "baz", "foo"})
-		return nil
-	})
-}
-
-// Ensure that a Tx cursor can reverse iterate over subbuckets.
-func TestCursor_QuickCheck_BucketsOnly_Reverse(t *testing.T) {
-	db := NewTestDB()
-	defer db.Close()
-
-	db.Update(func(tx *bolt.Tx) error {
-		b, err := tx.CreateBucket([]byte("widgets"))
-		ok(t, err)
-		_, err = b.CreateBucket([]byte("foo"))
-		ok(t, err)
-		_, err = b.CreateBucket([]byte("bar"))
-		ok(t, err)
-		_, err = b.CreateBucket([]byte("baz"))
-		ok(t, err)
-		return nil
-	})
-	db.View(func(tx *bolt.Tx) error {
-		var names []string
-		c := tx.Bucket([]byte("widgets")).Cursor()
-		for k, v := c.Last(); k != nil; k, v = c.Prev() {
-			names = append(names, string(k))
-			assert(t, v == nil, "")
-		}
-		equals(t, names, []string{"foo", "baz", "bar"})
-		return nil
-	})
-}
-
-func ExampleCursor() {
-	// Open the database.
-	db, _ := bolt.Open(tempfile(), 0666, nil)
-	defer os.Remove(db.Path())
-	defer db.Close()
-
-	// Start a read-write transaction.
-	db.Update(func(tx *bolt.Tx) error {
-		// Create a new bucket.
-		tx.CreateBucket([]byte("animals"))
-
-		// Insert data into a bucket.
-		b := tx.Bucket([]byte("animals"))
-		b.Put([]byte("dog"), []byte("fun"))
-		b.Put([]byte("cat"), []byte("lame"))
-		b.Put([]byte("liger"), []byte("awesome"))
-
-		// Create a cursor for iteration.
-		c := b.Cursor()
-
-		// Iterate over items in sorted key order. This starts from the
-		// first key/value pair and updates the k/v variables to the
-		// next key/value on each iteration.
-		//
-		// The loop finishes at the end of the cursor when a nil key is returned.
-		for k, v := c.First(); k != nil; k, v = c.Next() {
-			fmt.Printf("A %s is %s.\n", k, v)
-		}
-
-		return nil
-	})
-
-	// Output:
-	// A cat is lame.
-	// A dog is fun.
-	// A liger is awesome.
-}
-
-func ExampleCursor_reverse() {
-	// Open the database.
-	db, _ := bolt.Open(tempfile(), 0666, nil)
-	defer os.Remove(db.Path())
-	defer db.Close()
-
-	// Start a read-write transaction.
-	db.Update(func(tx *bolt.Tx) error {
-		// Create a new bucket.
-		tx.CreateBucket([]byte("animals"))
-
-		// Insert data into a bucket.
-		b := tx.Bucket([]byte("animals"))
-		b.Put([]byte("dog"), []byte("fun"))
-		b.Put([]byte("cat"), []byte("lame"))
-		b.Put([]byte("liger"), []byte("awesome"))
-
-		// Create a cursor for iteration.
-		c := b.Cursor()
-
-		// Iterate over items in reverse sorted key order. This starts
-		// from the last key/value pair and updates the k/v variables to
-		// the previous key/value on each iteration.
-		//
-		// The loop finishes at the beginning of the cursor when a nil key
-		// is returned.
-		for k, v := c.Last(); k != nil; k, v = c.Prev() {
-			fmt.Printf("A %s is %s.\n", k, v)
-		}
-
-		return nil
-	})
-
-	// Output:
-	// A liger is awesome.
-	// A dog is fun.
-	// A cat is lame.
-}
diff --git a/Godeps/_workspace/src/github.com/boltdb/bolt/db.go b/Godeps/_workspace/src/github.com/boltdb/bolt/db.go
deleted file mode 100644
index d39c4aa9c..000000000
--- a/Godeps/_workspace/src/github.com/boltdb/bolt/db.go
+++ /dev/null
@@ -1,792 +0,0 @@
-package bolt
-
-import (
-	"fmt"
-	"hash/fnv"
-	"os"
-	"runtime"
-	"runtime/debug"
-	"strings"
-	"sync"
-	"time"
-	"unsafe"
-)
-
-// The largest step that can be taken when remapping the mmap.
-const maxMmapStep = 1 << 30 // 1GB
-
-// The data file format version.
-const version = 2
-
-// Represents a marker value to indicate that a file is a Bolt DB.
-const magic uint32 = 0xED0CDAED
-
-// IgnoreNoSync specifies whether the NoSync field of a DB is ignored when
-// syncing changes to a file.  This is required as some operating systems,
-// such as OpenBSD, do not have a unified buffer cache (UBC) and writes
-// must be synchronzied using the msync(2) syscall.
-const IgnoreNoSync = runtime.GOOS == "openbsd"
-
-// Default values if not set in a DB instance.
-const (
-	DefaultMaxBatchSize  int = 1000
-	DefaultMaxBatchDelay     = 10 * time.Millisecond
-)
-
-// DB represents a collection of buckets persisted to a file on disk.
-// All data access is performed through transactions which can be obtained through the DB.
-// All the functions on DB will return a ErrDatabaseNotOpen if accessed before Open() is called.
-type DB struct {
-	// When enabled, the database will perform a Check() after every commit.
-	// A panic is issued if the database is in an inconsistent state. This
-	// flag has a large performance impact so it should only be used for
-	// debugging purposes.
-	StrictMode bool
-
-	// Setting the NoSync flag will cause the database to skip fsync()
-	// calls after each commit. This can be useful when bulk loading data
-	// into a database and you can restart the bulk load in the event of
-	// a system failure or database corruption. Do not set this flag for
-	// normal use.
-	//
-	// If the package global IgnoreNoSync constant is true, this value is
-	// ignored.  See the comment on that constant for more details.
-	//
-	// THIS IS UNSAFE. PLEASE USE WITH CAUTION.
-	NoSync bool
-
-	// When true, skips the truncate call when growing the database.
-	// Setting this to true is only safe on non-ext3/ext4 systems.
-	// Skipping truncation avoids preallocation of hard drive space and
-	// bypasses a truncate() and fsync() syscall on remapping.
-	//
-	// https://github.com/boltdb/bolt/issues/284
-	NoGrowSync bool
-
-	// MaxBatchSize is the maximum size of a batch. Default value is
-	// copied from DefaultMaxBatchSize in Open.
-	//
-	// If <=0, disables batching.
-	//
-	// Do not change concurrently with calls to Batch.
-	MaxBatchSize int
-
-	// MaxBatchDelay is the maximum delay before a batch starts.
-	// Default value is copied from DefaultMaxBatchDelay in Open.
-	//
-	// If <=0, effectively disables batching.
-	//
-	// Do not change concurrently with calls to Batch.
-	MaxBatchDelay time.Duration
-
-	path     string
-	file     *os.File
-	dataref  []byte // mmap'ed readonly, write throws SEGV
-	data     *[maxMapSize]byte
-	datasz   int
-	meta0    *meta
-	meta1    *meta
-	pageSize int
-	opened   bool
-	rwtx     *Tx
-	txs      []*Tx
-	freelist *freelist
-	stats    Stats
-
-	batchMu sync.Mutex
-	batch   *batch
-
-	rwlock   sync.Mutex   // Allows only one writer at a time.
-	metalock sync.Mutex   // Protects meta page access.
-	mmaplock sync.RWMutex // Protects mmap access during remapping.
-	statlock sync.RWMutex // Protects stats access.
-
-	ops struct {
-		writeAt func(b []byte, off int64) (n int, err error)
-	}
-
-	// Read only mode.
-	// When true, Update() and Begin(true) return ErrDatabaseReadOnly immediately.
-	readOnly bool
-}
-
-// Path returns the path to currently open database file.
-func (db *DB) Path() string {
-	return db.path
-}
-
-// GoString returns the Go string representation of the database.
-func (db *DB) GoString() string {
-	return fmt.Sprintf("bolt.DB{path:%q}", db.path)
-}
-
-// String returns the string representation of the database.
-func (db *DB) String() string {
-	return fmt.Sprintf("DB<%q>", db.path)
-}
-
-// Open creates and opens a database at the given path.
-// If the file does not exist then it will be created automatically.
-// Passing in nil options will cause Bolt to open the database with the default options.
-func Open(path string, mode os.FileMode, options *Options) (*DB, error) {
-	var db = &DB{opened: true}
-
-	// Set default options if no options are provided.
-	if options == nil {
-		options = DefaultOptions
-	}
-	db.NoGrowSync = options.NoGrowSync
-
-	// Set default values for later DB operations.
-	db.MaxBatchSize = DefaultMaxBatchSize
-	db.MaxBatchDelay = DefaultMaxBatchDelay
-
-	flag := os.O_RDWR
-	if options.ReadOnly {
-		flag = os.O_RDONLY
-		db.readOnly = true
-	}
-
-	// Open data file and separate sync handler for metadata writes.
-	db.path = path
-	var err error
-	if db.file, err = os.OpenFile(db.path, flag|os.O_CREATE, mode); err != nil {
-		_ = db.close()
-		return nil, err
-	}
-
-	// Lock file so that other processes using Bolt in read-write mode cannot
-	// use the database  at the same time. This would cause corruption since
-	// the two processes would write meta pages and free pages separately.
-	// The database file is locked exclusively (only one process can grab the lock)
-	// if !options.ReadOnly.
-	// The database file is locked using the shared lock (more than one process may
-	// hold a lock at the same time) otherwise (options.ReadOnly is set).
-	if err := flock(db.file, !db.readOnly, options.Timeout); err != nil {
-		_ = db.close()
-		return nil, err
-	}
-
-	// Default values for test hooks
-	db.ops.writeAt = db.file.WriteAt
-
-	// Initialize the database if it doesn't exist.
-	if info, err := db.file.Stat(); err != nil {
-		return nil, fmt.Errorf("stat error: %s", err)
-	} else if info.Size() == 0 {
-		// Initialize new files with meta pages.
-		if err := db.init(); err != nil {
-			return nil, err
-		}
-	} else {
-		// Read the first meta page to determine the page size.
-		var buf [0x1000]byte
-		if _, err := db.file.ReadAt(buf[:], 0); err == nil {
-			m := db.pageInBuffer(buf[:], 0).meta()
-			if err := m.validate(); err != nil {
-				return nil, fmt.Errorf("meta0 error: %s", err)
-			}
-			db.pageSize = int(m.pageSize)
-		}
-	}
-
-	// Memory map the data file.
-	if err := db.mmap(0); err != nil {
-		_ = db.close()
-		return nil, err
-	}
-
-	// Read in the freelist.
-	db.freelist = newFreelist()
-	db.freelist.read(db.page(db.meta().freelist))
-
-	// Mark the database as opened and return.
-	return db, nil
-}
-
-// mmap opens the underlying memory-mapped file and initializes the meta references.
-// minsz is the minimum size that the new mmap can be.
-func (db *DB) mmap(minsz int) error {
-	db.mmaplock.Lock()
-	defer db.mmaplock.Unlock()
-
-	info, err := db.file.Stat()
-	if err != nil {
-		return fmt.Errorf("mmap stat error: %s", err)
-	} else if int(info.Size()) < db.pageSize*2 {
-		return fmt.Errorf("file size too small")
-	}
-
-	// Ensure the size is at least the minimum size.
-	var size = int(info.Size())
-	if size < minsz {
-		size = minsz
-	}
-	size, err = db.mmapSize(size)
-	if err != nil {
-		return err
-	}
-
-	// Dereference all mmap references before unmapping.
-	if db.rwtx != nil {
-		db.rwtx.root.dereference()
-	}
-
-	// Unmap existing data before continuing.
-	if err := db.munmap(); err != nil {
-		return err
-	}
-
-	// Memory-map the data file as a byte slice.
-	if err := mmap(db, size); err != nil {
-		return err
-	}
-
-	// Save references to the meta pages.
-	db.meta0 = db.page(0).meta()
-	db.meta1 = db.page(1).meta()
-
-	// Validate the meta pages.
-	if err := db.meta0.validate(); err != nil {
-		return fmt.Errorf("meta0 error: %s", err)
-	}
-	if err := db.meta1.validate(); err != nil {
-		return fmt.Errorf("meta1 error: %s", err)
-	}
-
-	return nil
-}
-
-// munmap unmaps the data file from memory.
-func (db *DB) munmap() error {
-	if err := munmap(db); err != nil {
-		return fmt.Errorf("unmap error: " + err.Error())
-	}
-	return nil
-}
-
-// mmapSize determines the appropriate size for the mmap given the current size
-// of the database. The minimum size is 1MB and doubles until it reaches 1GB.
-// Returns an error if the new mmap size is greater than the max allowed.
-func (db *DB) mmapSize(size int) (int, error) {
-	// Double the size from 32KB until 1GB.
-	for i := uint(15); i <= 30; i++ {
-		if size <= 1<<i {
-			return 1 << i, nil
-		}
-	}
-
-	// Verify the requested size is not above the maximum allowed.
-	if size > maxMapSize {
-		return 0, fmt.Errorf("mmap too large")
-	}
-
-	// If larger than 1GB then grow by 1GB at a time.
-	sz := int64(size)
-	if remainder := sz % int64(maxMmapStep); remainder > 0 {
-		sz += int64(maxMmapStep) - remainder
-	}
-
-	// Ensure that the mmap size is a multiple of the page size.
-	// This should always be true since we're incrementing in MBs.
-	pageSize := int64(db.pageSize)
-	if (sz % pageSize) != 0 {
-		sz = ((sz / pageSize) + 1) * pageSize
-	}
-
-	// If we've exceeded the max size then only grow up to the max size.
-	if sz > maxMapSize {
-		sz = maxMapSize
-	}
-
-	return int(sz), nil
-}
-
-// init creates a new database file and initializes its meta pages.
-func (db *DB) init() error {
-	// Set the page size to the OS page size.
-	db.pageSize = os.Getpagesize()
-
-	// Create two meta pages on a buffer.
-	buf := make([]byte, db.pageSize*4)
-	for i := 0; i < 2; i++ {
-		p := db.pageInBuffer(buf[:], pgid(i))
-		p.id = pgid(i)
-		p.flags = metaPageFlag
-
-		// Initialize the meta page.
-		m := p.meta()
-		m.magic = magic
-		m.version = version
-		m.pageSize = uint32(db.pageSize)
-		m.freelist = 2
-		m.root = bucket{root: 3}
-		m.pgid = 4
-		m.txid = txid(i)
-	}
-
-	// Write an empty freelist at page 3.
-	p := db.pageInBuffer(buf[:], pgid(2))
-	p.id = pgid(2)
-	p.flags = freelistPageFlag
-	p.count = 0
-
-	// Write an empty leaf page at page 4.
-	p = db.pageInBuffer(buf[:], pgid(3))
-	p.id = pgid(3)
-	p.flags = leafPageFlag
-	p.count = 0
-
-	// Write the buffer to our data file.
-	if _, err := db.ops.writeAt(buf, 0); err != nil {
-		return err
-	}
-	if err := fdatasync(db); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-// Close releases all database resources.
-// All transactions must be closed before closing the database.
-func (db *DB) Close() error {
-	db.rwlock.Lock()
-	defer db.rwlock.Unlock()
-
-	db.metalock.Lock()
-	defer db.metalock.Unlock()
-
-	db.mmaplock.RLock()
-	defer db.mmaplock.RUnlock()
-
-	return db.close()
-}
-
-func (db *DB) close() error {
-	db.opened = false
-
-	db.freelist = nil
-	db.path = ""
-
-	// Clear ops.
-	db.ops.writeAt = nil
-
-	// Close the mmap.
-	if err := db.munmap(); err != nil {
-		return err
-	}
-
-	// Close file handles.
-	if db.file != nil {
-		// No need to unlock read-only file.
-		if !db.readOnly {
-			// Unlock the file.
-			_ = funlock(db.file)
-		}
-
-		// Close the file descriptor.
-		if err := db.file.Close(); err != nil {
-			return fmt.Errorf("db file close: %s", err)
-		}
-		db.file = nil
-	}
-
-	return nil
-}
-
-// Begin starts a new transaction.
-// Multiple read-only transactions can be used concurrently but only one
-// write transaction can be used at a time. Starting multiple write transactions
-// will cause the calls to block and be serialized until the current write
-// transaction finishes.
-//
-// Transactions should not be depedent on one another. Opening a read
-// transaction and a write transaction in the same goroutine can cause the
-// writer to deadlock because the database periodically needs to re-mmap itself
-// as it grows and it cannot do that while a read transaction is open.
-//
-// IMPORTANT: You must close read-only transactions after you are finished or
-// else the database will not reclaim old pages.
-func (db *DB) Begin(writable bool) (*Tx, error) {
-	if writable {
-		return db.beginRWTx()
-	}
-	return db.beginTx()
-}
-
-func (db *DB) beginTx() (*Tx, error) {
-	// Lock the meta pages while we initialize the transaction. We obtain
-	// the meta lock before the mmap lock because that's the order that the
-	// write transaction will obtain them.
-	db.metalock.Lock()
-
-	// Obtain a read-only lock on the mmap. When the mmap is remapped it will
-	// obtain a write lock so all transactions must finish before it can be
-	// remapped.
-	db.mmaplock.RLock()
-
-	// Exit if the database is not open yet.
-	if !db.opened {
-		db.mmaplock.RUnlock()
-		db.metalock.Unlock()
-		return nil, ErrDatabaseNotOpen
-	}
-
-	// Create a transaction associated with the database.
-	t := &Tx{}
-	t.init(db)
-
-	// Keep track of transaction until it closes.
-	db.txs = append(db.txs, t)
-	n := len(db.txs)
-
-	// Unlock the meta pages.
-	db.metalock.Unlock()
-
-	// Update the transaction stats.
-	db.statlock.Lock()
-	db.stats.TxN++
-	db.stats.OpenTxN = n
-	db.statlock.Unlock()
-
-	return t, nil
-}
-
-func (db *DB) beginRWTx() (*Tx, error) {
-	// If the database was opened with Options.ReadOnly, return an error.
-	if db.readOnly {
-		return nil, ErrDatabaseReadOnly
-	}
-
-	// Obtain writer lock. This is released by the transaction when it closes.
-	// This enforces only one writer transaction at a time.
-	db.rwlock.Lock()
-
-	// Once we have the writer lock then we can lock the meta pages so that
-	// we can set up the transaction.
-	db.metalock.Lock()
-	defer db.metalock.Unlock()
-
-	// Exit if the database is not open yet.
-	if !db.opened {
-		db.rwlock.Unlock()
-		return nil, ErrDatabaseNotOpen
-	}
-
-	// Create a transaction associated with the database.
-	t := &Tx{writable: true}
-	t.init(db)
-	db.rwtx = t
-
-	// Free any pages associated with closed read-only transactions.
-	var minid txid = 0xFFFFFFFFFFFFFFFF
-	for _, t := range db.txs {
-		if t.meta.txid < minid {
-			minid = t.meta.txid
-		}
-	}
-	if minid > 0 {
-		db.freelist.release(minid - 1)
-	}
-
-	return t, nil
-}
-
-// removeTx removes a transaction from the database.
-func (db *DB) removeTx(tx *Tx) {
-	// Release the read lock on the mmap.
-	db.mmaplock.RUnlock()
-
-	// Use the meta lock to restrict access to the DB object.
-	db.metalock.Lock()
-
-	// Remove the transaction.
-	for i, t := range db.txs {
-		if t == tx {
-			db.txs = append(db.txs[:i], db.txs[i+1:]...)
-			break
-		}
-	}
-	n := len(db.txs)
-
-	// Unlock the meta pages.
-	db.metalock.Unlock()
-
-	// Merge statistics.
-	db.statlock.Lock()
-	db.stats.OpenTxN = n
-	db.stats.TxStats.add(&tx.stats)
-	db.statlock.Unlock()
-}
-
-// Update executes a function within the context of a read-write managed transaction.
-// If no error is returned from the function then the transaction is committed.
-// If an error is returned then the entire transaction is rolled back.
-// Any error that is returned from the function or returned from the commit is
-// returned from the Update() method.
-//
-// Attempting to manually commit or rollback within the function will cause a panic.
-func (db *DB) Update(fn func(*Tx) error) error {
-	t, err := db.Begin(true)
-	if err != nil {
-		return err
-	}
-
-	// Make sure the transaction rolls back in the event of a panic.
-	defer func() {
-		if t.db != nil {
-			t.rollback()
-		}
-	}()
-
-	// Mark as a managed tx so that the inner function cannot manually commit.
-	t.managed = true
-
-	// If an error is returned from the function then rollback and return error.
-	err = fn(t)
-	t.managed = false
-	if err != nil {
-		_ = t.Rollback()
-		return err
-	}
-
-	return t.Commit()
-}
-
-// View executes a function within the context of a managed read-only transaction.
-// Any error that is returned from the function is returned from the View() method.
-//
-// Attempting to manually rollback within the function will cause a panic.
-func (db *DB) View(fn func(*Tx) error) error {
-	t, err := db.Begin(false)
-	if err != nil {
-		return err
-	}
-
-	// Make sure the transaction rolls back in the event of a panic.
-	defer func() {
-		if t.db != nil {
-			t.rollback()
-		}
-	}()
-
-	// Mark as a managed tx so that the inner function cannot manually rollback.
-	t.managed = true
-
-	// If an error is returned from the function then pass it through.
-	err = fn(t)
-	t.managed = false
-	if err != nil {
-		_ = t.Rollback()
-		return err
-	}
-
-	if err := t.Rollback(); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-// Sync executes fdatasync() against the database file handle.
-//
-// This is not necessary under normal operation, however, if you use NoSync
-// then it allows you to force the database file to sync against the disk.
-func (db *DB) Sync() error { return fdatasync(db) }
-
-// Stats retrieves ongoing performance stats for the database.
-// This is only updated when a transaction closes.
-func (db *DB) Stats() Stats {
-	db.statlock.RLock()
-	defer db.statlock.RUnlock()
-	return db.stats
-}
-
-// This is for internal access to the raw data bytes from the C cursor, use
-// carefully, or not at all.
-func (db *DB) Info() *Info {
-	return &Info{uintptr(unsafe.Pointer(&db.data[0])), db.pageSize}
-}
-
-// page retrieves a page reference from the mmap based on the current page size.
-func (db *DB) page(id pgid) *page {
-	pos := id * pgid(db.pageSize)
-	return (*page)(unsafe.Pointer(&db.data[pos]))
-}
-
-// pageInBuffer retrieves a page reference from a given byte array based on the current page size.
-func (db *DB) pageInBuffer(b []byte, id pgid) *page {
-	return (*page)(unsafe.Pointer(&b[id*pgid(db.pageSize)]))
-}
-
-// meta retrieves the current meta page reference.
-func (db *DB) meta() *meta {
-	if db.meta0.txid > db.meta1.txid {
-		return db.meta0
-	}
-	return db.meta1
-}
-
-// allocate returns a contiguous block of memory starting at a given page.
-func (db *DB) allocate(count int) (*page, error) {
-	// Allocate a temporary buffer for the page.
-	buf := make([]byte, count*db.pageSize)
-	p := (*page)(unsafe.Pointer(&buf[0]))
-	p.overflow = uint32(count - 1)
-
-	// Use pages from the freelist if they are available.
-	if p.id = db.freelist.allocate(count); p.id != 0 {
-		return p, nil
-	}
-
-	// Resize mmap() if we're at the end.
-	p.id = db.rwtx.meta.pgid
-	var minsz = int((p.id+pgid(count))+1) * db.pageSize
-	if minsz >= db.datasz {
-		if err := db.mmap(minsz); err != nil {
-			return nil, fmt.Errorf("mmap allocate error: %s", err)
-		}
-	}
-
-	// Move the page id high water mark.
-	db.rwtx.meta.pgid += pgid(count)
-
-	return p, nil
-}
-
-func (db *DB) IsReadOnly() bool {
-	return db.readOnly
-}
-
-// Options represents the options that can be set when opening a database.
-type Options struct {
-	// Timeout is the amount of time to wait to obtain a file lock.
-	// When set to zero it will wait indefinitely. This option is only
-	// available on Darwin and Linux.
-	Timeout time.Duration
-
-	// Sets the DB.NoGrowSync flag before memory mapping the file.
-	NoGrowSync bool
-
-	// Open database in read-only mode. Uses flock(..., LOCK_SH |LOCK_NB) to
-	// grab a shared lock (UNIX).
-	ReadOnly bool
-}
-
-// DefaultOptions represent the options used if nil options are passed into Open().
-// No timeout is used which will cause Bolt to wait indefinitely for a lock.
-var DefaultOptions = &Options{
-	Timeout:    0,
-	NoGrowSync: false,
-}
-
-// Stats represents statistics about the database.
-type Stats struct {
-	// Freelist stats
-	FreePageN     int // total number of free pages on the freelist
-	PendingPageN  int // total number of pending pages on the freelist
-	FreeAlloc     int // total bytes allocated in free pages
-	FreelistInuse int // total bytes used by the freelist
-
-	// Transaction stats
-	TxN     int // total number of started read transactions
-	OpenTxN int // number of currently open read transactions
-
-	TxStats TxStats // global, ongoing stats.
-}
-
-// Sub calculates and returns the difference between two sets of database stats.
-// This is useful when obtaining stats at two different points and time and
-// you need the performance counters that occurred within that time span.
-func (s *Stats) Sub(other *Stats) Stats {
-	if other == nil {
-		return *s
-	}
-	var diff Stats
-	diff.FreePageN = s.FreePageN
-	diff.PendingPageN = s.PendingPageN
-	diff.FreeAlloc = s.FreeAlloc
-	diff.FreelistInuse = s.FreelistInuse
-	diff.TxN = other.TxN - s.TxN
-	diff.TxStats = s.TxStats.Sub(&other.TxStats)
-	return diff
-}
-
-func (s *Stats) add(other *Stats) {
-	s.TxStats.add(&other.TxStats)
-}
-
-type Info struct {
-	Data     uintptr
-	PageSize int
-}
-
-type meta struct {
-	magic    uint32
-	version  uint32
-	pageSize uint32
-	flags    uint32
-	root     bucket
-	freelist pgid
-	pgid     pgid
-	txid     txid
-	checksum uint64
-}
-
-// validate checks the marker bytes and version of the meta page to ensure it matches this binary.
-func (m *meta) validate() error {
-	if m.checksum != 0 && m.checksum != m.sum64() {
-		return ErrChecksum
-	} else if m.magic != magic {
-		return ErrInvalid
-	} else if m.version != version {
-		return ErrVersionMismatch
-	}
-	return nil
-}
-
-// copy copies one meta object to another.
-func (m *meta) copy(dest *meta) {
-	*dest = *m
-}
-
-// write writes the meta onto a page.
-func (m *meta) write(p *page) {
-	if m.root.root >= m.pgid {
-		panic(fmt.Sprintf("root bucket pgid (%d) above high water mark (%d)", m.root.root, m.pgid))
-	} else if m.freelist >= m.pgid {
-		panic(fmt.Sprintf("freelist pgid (%d) above high water mark (%d)", m.freelist, m.pgid))
-	}
-
-	// Page id is either going to be 0 or 1 which we can determine by the transaction ID.
-	p.id = pgid(m.txid % 2)
-	p.flags |= metaPageFlag
-
-	// Calculate the checksum.
-	m.checksum = m.sum64()
-
-	m.copy(p.meta())
-}
-
-// generates the checksum for the meta.
-func (m *meta) sum64() uint64 {
-	var h = fnv.New64a()
-	_, _ = h.Write((*[unsafe.Offsetof(meta{}.checksum)]byte)(unsafe.Pointer(m))[:])
-	return h.Sum64()
-}
-
-// _assert will panic with a given formatted message if the given condition is false.
-func _assert(condition bool, msg string, v ...interface{}) {
-	if !condition {
-		panic(fmt.Sprintf("assertion failed: "+msg, v...))
-	}
-}
-
-func warn(v ...interface{})              { fmt.Fprintln(os.Stderr, v...) }
-func warnf(msg string, v ...interface{}) { fmt.Fprintf(os.Stderr, msg+"\n", v...) }
-
-func printstack() {
-	stack := strings.Join(strings.Split(string(debug.Stack()), "\n")[2:], "\n")
-	fmt.Fprintln(os.Stderr, stack)
-}
diff --git a/Godeps/_workspace/src/github.com/boltdb/bolt/db_test.go b/Godeps/_workspace/src/github.com/boltdb/bolt/db_test.go
deleted file mode 100644
index dddf22b46..000000000
--- a/Godeps/_workspace/src/github.com/boltdb/bolt/db_test.go
+++ /dev/null
@@ -1,903 +0,0 @@
-package bolt_test
-
-import (
-	"encoding/binary"
-	"errors"
-	"flag"
-	"fmt"
-	"io/ioutil"
-	"os"
-	"regexp"
-	"runtime"
-	"sort"
-	"strings"
-	"testing"
-	"time"
-
-	"github.com/boltdb/bolt"
-)
-
-var statsFlag = flag.Bool("stats", false, "show performance stats")
-
-// Ensure that opening a database with a bad path returns an error.
-func TestOpen_BadPath(t *testing.T) {
-	db, err := bolt.Open("", 0666, nil)
-	assert(t, err != nil, "err: %s", err)
-	assert(t, db == nil, "")
-}
-
-// Ensure that a database can be opened without error.
-func TestOpen(t *testing.T) {
-	path := tempfile()
-	defer os.Remove(path)
-	db, err := bolt.Open(path, 0666, nil)
-	assert(t, db != nil, "")
-	ok(t, err)
-	equals(t, db.Path(), path)
-	ok(t, db.Close())
-}
-
-// Ensure that opening an already open database file will timeout.
-func TestOpen_Timeout(t *testing.T) {
-	if runtime.GOOS == "windows" {
-		t.Skip("timeout not supported on windows")
-	}
-
-	path := tempfile()
-	defer os.Remove(path)
-
-	// Open a data file.
-	db0, err := bolt.Open(path, 0666, nil)
-	assert(t, db0 != nil, "")
-	ok(t, err)
-
-	// Attempt to open the database again.
-	start := time.Now()
-	db1, err := bolt.Open(path, 0666, &bolt.Options{Timeout: 100 * time.Millisecond})
-	assert(t, db1 == nil, "")
-	equals(t, bolt.ErrTimeout, err)
-	assert(t, time.Since(start) > 100*time.Millisecond, "")
-
-	db0.Close()
-}
-
-// Ensure that opening an already open database file will wait until its closed.
-func TestOpen_Wait(t *testing.T) {
-	if runtime.GOOS == "windows" {
-		t.Skip("timeout not supported on windows")
-	}
-
-	path := tempfile()
-	defer os.Remove(path)
-
-	// Open a data file.
-	db0, err := bolt.Open(path, 0666, nil)
-	assert(t, db0 != nil, "")
-	ok(t, err)
-
-	// Close it in just a bit.
-	time.AfterFunc(100*time.Millisecond, func() { db0.Close() })
-
-	// Attempt to open the database again.
-	start := time.Now()
-	db1, err := bolt.Open(path, 0666, &bolt.Options{Timeout: 200 * time.Millisecond})
-	assert(t, db1 != nil, "")
-	ok(t, err)
-	assert(t, time.Since(start) > 100*time.Millisecond, "")
-}
-
-// Ensure that opening a database does not increase its size.
-// https://github.com/boltdb/bolt/issues/291
-func TestOpen_Size(t *testing.T) {
-	// Open a data file.
-	db := NewTestDB()
-	path := db.Path()
-	defer db.Close()
-
-	// Insert until we get above the minimum 4MB size.
-	ok(t, db.Update(func(tx *bolt.Tx) error {
-		b, _ := tx.CreateBucketIfNotExists([]byte("data"))
-		for i := 0; i < 10000; i++ {
-			ok(t, b.Put([]byte(fmt.Sprintf("%04d", i)), make([]byte, 1000)))
-		}
-		return nil
-	}))
-
-	// Close database and grab the size.
-	db.DB.Close()
-	sz := fileSize(path)
-	if sz == 0 {
-		t.Fatalf("unexpected new file size: %d", sz)
-	}
-
-	// Reopen database, update, and check size again.
-	db0, err := bolt.Open(path, 0666, nil)
-	ok(t, err)
-	ok(t, db0.Update(func(tx *bolt.Tx) error { return tx.Bucket([]byte("data")).Put([]byte{0}, []byte{0}) }))
-	ok(t, db0.Close())
-	newSz := fileSize(path)
-	if newSz == 0 {
-		t.Fatalf("unexpected new file size: %d", newSz)
-	}
-
-	// Compare the original size with the new size.
-	if sz != newSz {
-		t.Fatalf("unexpected file growth: %d => %d", sz, newSz)
-	}
-}
-
-// Ensure that opening a database beyond the max step size does not increase its size.
-// https://github.com/boltdb/bolt/issues/303
-func TestOpen_Size_Large(t *testing.T) {
-	if testing.Short() {
-		t.Skip("short mode")
-	}
-
-	// Open a data file.
-	db := NewTestDB()
-	path := db.Path()
-	defer db.Close()
-
-	// Insert until we get above the minimum 4MB size.
-	var index uint64
-	for i := 0; i < 10000; i++ {
-		ok(t, db.Update(func(tx *bolt.Tx) error {
-			b, _ := tx.CreateBucketIfNotExists([]byte("data"))
-			for j := 0; j < 1000; j++ {
-				ok(t, b.Put(u64tob(index), make([]byte, 50)))
-				index++
-			}
-			return nil
-		}))
-	}
-
-	// Close database and grab the size.
-	db.DB.Close()
-	sz := fileSize(path)
-	if sz == 0 {
-		t.Fatalf("unexpected new file size: %d", sz)
-	} else if sz < (1 << 30) {
-		t.Fatalf("expected larger initial size: %d", sz)
-	}
-
-	// Reopen database, update, and check size again.
-	db0, err := bolt.Open(path, 0666, nil)
-	ok(t, err)
-	ok(t, db0.Update(func(tx *bolt.Tx) error { return tx.Bucket([]byte("data")).Put([]byte{0}, []byte{0}) }))
-	ok(t, db0.Close())
-	newSz := fileSize(path)
-	if newSz == 0 {
-		t.Fatalf("unexpected new file size: %d", newSz)
-	}
-
-	// Compare the original size with the new size.
-	if sz != newSz {
-		t.Fatalf("unexpected file growth: %d => %d", sz, newSz)
-	}
-}
-
-// Ensure that a re-opened database is consistent.
-func TestOpen_Check(t *testing.T) {
-	path := tempfile()
-	defer os.Remove(path)
-
-	db, err := bolt.Open(path, 0666, nil)
-	ok(t, err)
-	ok(t, db.View(func(tx *bolt.Tx) error { return <-tx.Check() }))
-	db.Close()
-
-	db, err = bolt.Open(path, 0666, nil)
-	ok(t, err)
-	ok(t, db.View(func(tx *bolt.Tx) error { return <-tx.Check() }))
-	db.Close()
-}
-
-// Ensure that the database returns an error if the file handle cannot be open.
-func TestDB_Open_FileError(t *testing.T) {
-	path := tempfile()
-	defer os.Remove(path)
-
-	_, err := bolt.Open(path+"/youre-not-my-real-parent", 0666, nil)
-	assert(t, err.(*os.PathError) != nil, "")
-	equals(t, path+"/youre-not-my-real-parent", err.(*os.PathError).Path)
-	equals(t, "open", err.(*os.PathError).Op)
-}
-
-// Ensure that write errors to the meta file handler during initialization are returned.
-func TestDB_Open_MetaInitWriteError(t *testing.T) {
-	t.Skip("pending")
-}
-
-// Ensure that a database that is too small returns an error.
-func TestDB_Open_FileTooSmall(t *testing.T) {
-	path := tempfile()
-	defer os.Remove(path)
-
-	db, err := bolt.Open(path, 0666, nil)
-	ok(t, err)
-	db.Close()
-
-	// corrupt the database
-	ok(t, os.Truncate(path, int64(os.Getpagesize())))
-
-	db, err = bolt.Open(path, 0666, nil)
-	equals(t, errors.New("file size too small"), err)
-}
-
-// Ensure that a database can be opened in read-only mode by multiple processes
-// and that a database can not be opened in read-write mode and in read-only
-// mode at the same time.
-func TestOpen_ReadOnly(t *testing.T) {
-	bucket, key, value := []byte(`bucket`), []byte(`key`), []byte(`value`)
-
-	path := tempfile()
-	defer os.Remove(path)
-
-	// Open in read-write mode.
-	db, err := bolt.Open(path, 0666, nil)
-	ok(t, db.Update(func(tx *bolt.Tx) error {
-		b, err := tx.CreateBucket(bucket)
-		if err != nil {
-			return err
-		}
-		return b.Put(key, value)
-	}))
-	assert(t, db != nil, "")
-	assert(t, !db.IsReadOnly(), "")
-	ok(t, err)
-	ok(t, db.Close())
-
-	// Open in read-only mode.
-	db0, err := bolt.Open(path, 0666, &bolt.Options{ReadOnly: true})
-	ok(t, err)
-	defer db0.Close()
-
-	// Opening in read-write mode should return an error.
-	_, err = bolt.Open(path, 0666, &bolt.Options{Timeout: time.Millisecond * 100})
-	assert(t, err != nil, "")
-
-	// And again (in read-only mode).
-	db1, err := bolt.Open(path, 0666, &bolt.Options{ReadOnly: true})
-	ok(t, err)
-	defer db1.Close()
-
-	// Verify both read-only databases are accessible.
-	for _, db := range []*bolt.DB{db0, db1} {
-		// Verify is is in read only mode indeed.
-		assert(t, db.IsReadOnly(), "")
-
-		// Read-only databases should not allow updates.
-		assert(t,
-			bolt.ErrDatabaseReadOnly == db.Update(func(*bolt.Tx) error {
-				panic(`should never get here`)
-			}),
-			"")
-
-		// Read-only databases should not allow beginning writable txns.
-		_, err = db.Begin(true)
-		assert(t, bolt.ErrDatabaseReadOnly == err, "")
-
-		// Verify the data.
-		ok(t, db.View(func(tx *bolt.Tx) error {
-			b := tx.Bucket(bucket)
-			if b == nil {
-				return fmt.Errorf("expected bucket `%s`", string(bucket))
-			}
-
-			got := string(b.Get(key))
-			expected := string(value)
-			if got != expected {
-				return fmt.Errorf("expected `%s`, got `%s`", expected, got)
-			}
-			return nil
-		}))
-	}
-}
-
-// TODO(benbjohnson): Test corruption at every byte of the first two pages.
-
-// Ensure that a database cannot open a transaction when it's not open.
-func TestDB_Begin_DatabaseNotOpen(t *testing.T) {
-	var db bolt.DB
-	tx, err := db.Begin(false)
-	assert(t, tx == nil, "")
-	equals(t, err, bolt.ErrDatabaseNotOpen)
-}
-
-// Ensure that a read-write transaction can be retrieved.
-func TestDB_BeginRW(t *testing.T) {
-	db := NewTestDB()
-	defer db.Close()
-	tx, err := db.Begin(true)
-	assert(t, tx != nil, "")
-	ok(t, err)
-	assert(t, tx.DB() == db.DB, "")
-	equals(t, tx.Writable(), true)
-	ok(t, tx.Commit())
-}
-
-// Ensure that opening a transaction while the DB is closed returns an error.
-func TestDB_BeginRW_Closed(t *testing.T) {
-	var db bolt.DB
-	tx, err := db.Begin(true)
-	equals(t, err, bolt.ErrDatabaseNotOpen)
-	assert(t, tx == nil, "")
-}
-
-func TestDB_Close_PendingTx_RW(t *testing.T) { testDB_Close_PendingTx(t, true) }
-func TestDB_Close_PendingTx_RO(t *testing.T) { testDB_Close_PendingTx(t, false) }
-
-// Ensure that a database cannot close while transactions are open.
-func testDB_Close_PendingTx(t *testing.T, writable bool) {
-	db := NewTestDB()
-	defer db.Close()
-
-	// Start transaction.
-	tx, err := db.Begin(true)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// Open update in separate goroutine.
-	done := make(chan struct{})
-	go func() {
-		db.Close()
-		close(done)
-	}()
-
-	// Ensure database hasn't closed.
-	time.Sleep(100 * time.Millisecond)
-	select {
-	case <-done:
-		t.Fatal("database closed too early")
-	default:
-	}
-
-	// Commit transaction.
-	if err := tx.Commit(); err != nil {
-		t.Fatal(err)
-	}
-
-	// Ensure database closed now.
-	time.Sleep(100 * time.Millisecond)
-	select {
-	case <-done:
-	default:
-		t.Fatal("database did not close")
-	}
-}
-
-// Ensure a database can provide a transactional block.
-func TestDB_Update(t *testing.T) {
-	db := NewTestDB()
-	defer db.Close()
-	err := db.Update(func(tx *bolt.Tx) error {
-		tx.CreateBucket([]byte("widgets"))
-		b := tx.Bucket([]byte("widgets"))
-		b.Put([]byte("foo"), []byte("bar"))
-		b.Put([]byte("baz"), []byte("bat"))
-		b.Delete([]byte("foo"))
-		return nil
-	})
-	ok(t, err)
-	err = db.View(func(tx *bolt.Tx) error {
-		assert(t, tx.Bucket([]byte("widgets")).Get([]byte("foo")) == nil, "")
-		equals(t, []byte("bat"), tx.Bucket([]byte("widgets")).Get([]byte("baz")))
-		return nil
-	})
-	ok(t, err)
-}
-
-// Ensure a closed database returns an error while running a transaction block
-func TestDB_Update_Closed(t *testing.T) {
-	var db bolt.DB
-	err := db.Update(func(tx *bolt.Tx) error {
-		tx.CreateBucket([]byte("widgets"))
-		return nil
-	})
-	equals(t, err, bolt.ErrDatabaseNotOpen)
-}
-
-// Ensure a panic occurs while trying to commit a managed transaction.
-func TestDB_Update_ManualCommit(t *testing.T) {
-	db := NewTestDB()
-	defer db.Close()
-
-	var ok bool
-	db.Update(func(tx *bolt.Tx) error {
-		func() {
-			defer func() {
-				if r := recover(); r != nil {
-					ok = true
-				}
-			}()
-			tx.Commit()
-		}()
-		return nil
-	})
-	assert(t, ok, "expected panic")
-}
-
-// Ensure a panic occurs while trying to rollback a managed transaction.
-func TestDB_Update_ManualRollback(t *testing.T) {
-	db := NewTestDB()
-	defer db.Close()
-
-	var ok bool
-	db.Update(func(tx *bolt.Tx) error {
-		func() {
-			defer func() {
-				if r := recover(); r != nil {
-					ok = true
-				}
-			}()
-			tx.Rollback()
-		}()
-		return nil
-	})
-	assert(t, ok, "expected panic")
-}
-
-// Ensure a panic occurs while trying to commit a managed transaction.
-func TestDB_View_ManualCommit(t *testing.T) {
-	db := NewTestDB()
-	defer db.Close()
-
-	var ok bool
-	db.Update(func(tx *bolt.Tx) error {
-		func() {
-			defer func() {
-				if r := recover(); r != nil {
-					ok = true
-				}
-			}()
-			tx.Commit()
-		}()
-		return nil
-	})
-	assert(t, ok, "expected panic")
-}
-
-// Ensure a panic occurs while trying to rollback a managed transaction.
-func TestDB_View_ManualRollback(t *testing.T) {
-	db := NewTestDB()
-	defer db.Close()
-
-	var ok bool
-	db.Update(func(tx *bolt.Tx) error {
-		func() {
-			defer func() {
-				if r := recover(); r != nil {
-					ok = true
-				}
-			}()
-			tx.Rollback()
-		}()
-		return nil
-	})
-	assert(t, ok, "expected panic")
-}
-
-// Ensure a write transaction that panics does not hold open locks.
-func TestDB_Update_Panic(t *testing.T) {
-	db := NewTestDB()
-	defer db.Close()
-
-	func() {
-		defer func() {
-			if r := recover(); r != nil {
-				t.Log("recover: update", r)
-			}
-		}()
-		db.Update(func(tx *bolt.Tx) error {
-			tx.CreateBucket([]byte("widgets"))
-			panic("omg")
-		})
-	}()
-
-	// Verify we can update again.
-	err := db.Update(func(tx *bolt.Tx) error {
-		_, err := tx.CreateBucket([]byte("widgets"))
-		return err
-	})
-	ok(t, err)
-
-	// Verify that our change persisted.
-	err = db.Update(func(tx *bolt.Tx) error {
-		assert(t, tx.Bucket([]byte("widgets")) != nil, "")
-		return nil
-	})
-}
-
-// Ensure a database can return an error through a read-only transactional block.
-func TestDB_View_Error(t *testing.T) {
-	db := NewTestDB()
-	defer db.Close()
-	err := db.View(func(tx *bolt.Tx) error {
-		return errors.New("xxx")
-	})
-	equals(t, errors.New("xxx"), err)
-}
-
-// Ensure a read transaction that panics does not hold open locks.
-func TestDB_View_Panic(t *testing.T) {
-	db := NewTestDB()
-	defer db.Close()
-	db.Update(func(tx *bolt.Tx) error {
-		tx.CreateBucket([]byte("widgets"))
-		return nil
-	})
-
-	func() {
-		defer func() {
-			if r := recover(); r != nil {
-				t.Log("recover: view", r)
-			}
-		}()
-		db.View(func(tx *bolt.Tx) error {
-			assert(t, tx.Bucket([]byte("widgets")) != nil, "")
-			panic("omg")
-		})
-	}()
-
-	// Verify that we can still use read transactions.
-	db.View(func(tx *bolt.Tx) error {
-		assert(t, tx.Bucket([]byte("widgets")) != nil, "")
-		return nil
-	})
-}
-
-// Ensure that an error is returned when a database write fails.
-func TestDB_Commit_WriteFail(t *testing.T) {
-	t.Skip("pending") // TODO(benbjohnson)
-}
-
-// Ensure that DB stats can be returned.
-func TestDB_Stats(t *testing.T) {
-	db := NewTestDB()
-	defer db.Close()
-	db.Update(func(tx *bolt.Tx) error {
-		_, err := tx.CreateBucket([]byte("widgets"))
-		return err
-	})
-	stats := db.Stats()
-	equals(t, 2, stats.TxStats.PageCount)
-	equals(t, 0, stats.FreePageN)
-	equals(t, 2, stats.PendingPageN)
-}
-
-// Ensure that database pages are in expected order and type.
-func TestDB_Consistency(t *testing.T) {
-	db := NewTestDB()
-	defer db.Close()
-	db.Update(func(tx *bolt.Tx) error {
-		_, err := tx.CreateBucket([]byte("widgets"))
-		return err
-	})
-
-	for i := 0; i < 10; i++ {
-		db.Update(func(tx *bolt.Tx) error {
-			ok(t, tx.Bucket([]byte("widgets")).Put([]byte("foo"), []byte("bar")))
-			return nil
-		})
-	}
-	db.Update(func(tx *bolt.Tx) error {
-		p, _ := tx.Page(0)
-		assert(t, p != nil, "")
-		equals(t, "meta", p.Type)
-
-		p, _ = tx.Page(1)
-		assert(t, p != nil, "")
-		equals(t, "meta", p.Type)
-
-		p, _ = tx.Page(2)
-		assert(t, p != nil, "")
-		equals(t, "free", p.Type)
-
-		p, _ = tx.Page(3)
-		assert(t, p != nil, "")
-		equals(t, "free", p.Type)
-
-		p, _ = tx.Page(4)
-		assert(t, p != nil, "")
-		equals(t, "leaf", p.Type)
-
-		p, _ = tx.Page(5)
-		assert(t, p != nil, "")
-		equals(t, "freelist", p.Type)
-
-		p, _ = tx.Page(6)
-		assert(t, p == nil, "")
-		return nil
-	})
-}
-
-// Ensure that DB stats can be substracted from one another.
-func TestDBStats_Sub(t *testing.T) {
-	var a, b bolt.Stats
-	a.TxStats.PageCount = 3
-	a.FreePageN = 4
-	b.TxStats.PageCount = 10
-	b.FreePageN = 14
-	diff := b.Sub(&a)
-	equals(t, 7, diff.TxStats.PageCount)
-	// free page stats are copied from the receiver and not subtracted
-	equals(t, 14, diff.FreePageN)
-}
-
-func ExampleDB_Update() {
-	// Open the database.
-	db, _ := bolt.Open(tempfile(), 0666, nil)
-	defer os.Remove(db.Path())
-	defer db.Close()
-
-	// Execute several commands within a write transaction.
-	err := db.Update(func(tx *bolt.Tx) error {
-		b, err := tx.CreateBucket([]byte("widgets"))
-		if err != nil {
-			return err
-		}
-		if err := b.Put([]byte("foo"), []byte("bar")); err != nil {
-			return err
-		}
-		return nil
-	})
-
-	// If our transactional block didn't return an error then our data is saved.
-	if err == nil {
-		db.View(func(tx *bolt.Tx) error {
-			value := tx.Bucket([]byte("widgets")).Get([]byte("foo"))
-			fmt.Printf("The value of 'foo' is: %s\n", value)
-			return nil
-		})
-	}
-
-	// Output:
-	// The value of 'foo' is: bar
-}
-
-func ExampleDB_View() {
-	// Open the database.
-	db, _ := bolt.Open(tempfile(), 0666, nil)
-	defer os.Remove(db.Path())
-	defer db.Close()
-
-	// Insert data into a bucket.
-	db.Update(func(tx *bolt.Tx) error {
-		tx.CreateBucket([]byte("people"))
-		b := tx.Bucket([]byte("people"))
-		b.Put([]byte("john"), []byte("doe"))
-		b.Put([]byte("susy"), []byte("que"))
-		return nil
-	})
-
-	// Access data from within a read-only transactional block.
-	db.View(func(tx *bolt.Tx) error {
-		v := tx.Bucket([]byte("people")).Get([]byte("john"))
-		fmt.Printf("John's last name is %s.\n", v)
-		return nil
-	})
-
-	// Output:
-	// John's last name is doe.
-}
-
-func ExampleDB_Begin_ReadOnly() {
-	// Open the database.
-	db, _ := bolt.Open(tempfile(), 0666, nil)
-	defer os.Remove(db.Path())
-	defer db.Close()
-
-	// Create a bucket.
-	db.Update(func(tx *bolt.Tx) error {
-		_, err := tx.CreateBucket([]byte("widgets"))
-		return err
-	})
-
-	// Create several keys in a transaction.
-	tx, _ := db.Begin(true)
-	b := tx.Bucket([]byte("widgets"))
-	b.Put([]byte("john"), []byte("blue"))
-	b.Put([]byte("abby"), []byte("red"))
-	b.Put([]byte("zephyr"), []byte("purple"))
-	tx.Commit()
-
-	// Iterate over the values in sorted key order.
-	tx, _ = db.Begin(false)
-	c := tx.Bucket([]byte("widgets")).Cursor()
-	for k, v := c.First(); k != nil; k, v = c.Next() {
-		fmt.Printf("%s likes %s\n", k, v)
-	}
-	tx.Rollback()
-
-	// Output:
-	// abby likes red
-	// john likes blue
-	// zephyr likes purple
-}
-
-// TestDB represents a wrapper around a Bolt DB to handle temporary file
-// creation and automatic cleanup on close.
-type TestDB struct {
-	*bolt.DB
-}
-
-// NewTestDB returns a new instance of TestDB.
-func NewTestDB() *TestDB {
-	db, err := bolt.Open(tempfile(), 0666, nil)
-	if err != nil {
-		panic("cannot open db: " + err.Error())
-	}
-	return &TestDB{db}
-}
-
-// MustView executes a read-only function. Panic on error.
-func (db *TestDB) MustView(fn func(tx *bolt.Tx) error) {
-	if err := db.DB.View(func(tx *bolt.Tx) error {
-		return fn(tx)
-	}); err != nil {
-		panic(err.Error())
-	}
-}
-
-// MustUpdate executes a read-write function. Panic on error.
-func (db *TestDB) MustUpdate(fn func(tx *bolt.Tx) error) {
-	if err := db.DB.View(func(tx *bolt.Tx) error {
-		return fn(tx)
-	}); err != nil {
-		panic(err.Error())
-	}
-}
-
-// MustCreateBucket creates a new bucket. Panic on error.
-func (db *TestDB) MustCreateBucket(name []byte) {
-	if err := db.Update(func(tx *bolt.Tx) error {
-		_, err := tx.CreateBucket([]byte(name))
-		return err
-	}); err != nil {
-		panic(err.Error())
-	}
-}
-
-// Close closes the database and deletes the underlying file.
-func (db *TestDB) Close() {
-	// Log statistics.
-	if *statsFlag {
-		db.PrintStats()
-	}
-
-	// Check database consistency after every test.
-	db.MustCheck()
-
-	// Close database and remove file.
-	defer os.Remove(db.Path())
-	db.DB.Close()
-}
-
-// PrintStats prints the database stats
-func (db *TestDB) PrintStats() {
-	var stats = db.Stats()
-	fmt.Printf("[db] %-20s %-20s %-20s\n",
-		fmt.Sprintf("pg(%d/%d)", stats.TxStats.PageCount, stats.TxStats.PageAlloc),
-		fmt.Sprintf("cur(%d)", stats.TxStats.CursorCount),
-		fmt.Sprintf("node(%d/%d)", stats.TxStats.NodeCount, stats.TxStats.NodeDeref),
-	)
-	fmt.Printf("     %-20s %-20s %-20s\n",
-		fmt.Sprintf("rebal(%d/%v)", stats.TxStats.Rebalance, truncDuration(stats.TxStats.RebalanceTime)),
-		fmt.Sprintf("spill(%d/%v)", stats.TxStats.Spill, truncDuration(stats.TxStats.SpillTime)),
-		fmt.Sprintf("w(%d/%v)", stats.TxStats.Write, truncDuration(stats.TxStats.WriteTime)),
-	)
-}
-
-// MustCheck runs a consistency check on the database and panics if any errors are found.
-func (db *TestDB) MustCheck() {
-	db.Update(func(tx *bolt.Tx) error {
-		// Collect all the errors.
-		var errors []error
-		for err := range tx.Check() {
-			errors = append(errors, err)
-			if len(errors) > 10 {
-				break
-			}
-		}
-
-		// If errors occurred, copy the DB and print the errors.
-		if len(errors) > 0 {
-			var path = tempfile()
-			tx.CopyFile(path, 0600)
-
-			// Print errors.
-			fmt.Print("\n\n")
-			fmt.Printf("consistency check failed (%d errors)\n", len(errors))
-			for _, err := range errors {
-				fmt.Println(err)
-			}
-			fmt.Println("")
-			fmt.Println("db saved to:")
-			fmt.Println(path)
-			fmt.Print("\n\n")
-			os.Exit(-1)
-		}
-
-		return nil
-	})
-}
-
-// CopyTempFile copies a database to a temporary file.
-func (db *TestDB) CopyTempFile() {
-	path := tempfile()
-	db.View(func(tx *bolt.Tx) error { return tx.CopyFile(path, 0600) })
-	fmt.Println("db copied to: ", path)
-}
-
-// tempfile returns a temporary file path.
-func tempfile() string {
-	f, _ := ioutil.TempFile("", "bolt-")
-	f.Close()
-	os.Remove(f.Name())
-	return f.Name()
-}
-
-// mustContainKeys checks that a bucket contains a given set of keys.
-func mustContainKeys(b *bolt.Bucket, m map[string]string) {
-	found := make(map[string]string)
-	b.ForEach(func(k, _ []byte) error {
-		found[string(k)] = ""
-		return nil
-	})
-
-	// Check for keys found in bucket that shouldn't be there.
-	var keys []string
-	for k, _ := range found {
-		if _, ok := m[string(k)]; !ok {
-			keys = append(keys, k)
-		}
-	}
-	if len(keys) > 0 {
-		sort.Strings(keys)
-		panic(fmt.Sprintf("keys found(%d): %s", len(keys), strings.Join(keys, ",")))
-	}
-
-	// Check for keys not found in bucket that should be there.
-	for k, _ := range m {
-		if _, ok := found[string(k)]; !ok {
-			keys = append(keys, k)
-		}
-	}
-	if len(keys) > 0 {
-		sort.Strings(keys)
-		panic(fmt.Sprintf("keys not found(%d): %s", len(keys), strings.Join(keys, ",")))
-	}
-}
-
-func trunc(b []byte, length int) []byte {
-	if length < len(b) {
-		return b[:length]
-	}
-	return b
-}
-
-func truncDuration(d time.Duration) string {
-	return regexp.MustCompile(`^(\d+)(\.\d+)`).ReplaceAllString(d.String(), "$1")
-}
-
-func fileSize(path string) int64 {
-	fi, err := os.Stat(path)
-	if err != nil {
-		return 0
-	}
-	return fi.Size()
-}
-
-func warn(v ...interface{})              { fmt.Fprintln(os.Stderr, v...) }
-func warnf(msg string, v ...interface{}) { fmt.Fprintf(os.Stderr, msg+"\n", v...) }
-
-// u64tob converts a uint64 into an 8-byte slice.
-func u64tob(v uint64) []byte {
-	b := make([]byte, 8)
-	binary.BigEndian.PutUint64(b, v)
-	return b
-}
-
-// btou64 converts an 8-byte slice into an uint64.
-func btou64(b []byte) uint64 { return binary.BigEndian.Uint64(b) }
diff --git a/Godeps/_workspace/src/github.com/boltdb/bolt/doc.go b/Godeps/_workspace/src/github.com/boltdb/bolt/doc.go
deleted file mode 100644
index cc937845d..000000000
--- a/Godeps/_workspace/src/github.com/boltdb/bolt/doc.go
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
-Package bolt implements a low-level key/value store in pure Go. It supports
-fully serializable transactions, ACID semantics, and lock-free MVCC with
-multiple readers and a single writer. Bolt can be used for projects that
-want a simple data store without the need to add large dependencies such as
-Postgres or MySQL.
-
-Bolt is a single-level, zero-copy, B+tree data store. This means that Bolt is
-optimized for fast read access and does not require recovery in the event of a
-system crash. Transactions which have not finished committing will simply be
-rolled back in the event of a crash.
-
-The design of Bolt is based on Howard Chu's LMDB database project.
-
-Bolt currently works on Windows, Mac OS X, and Linux.
-
-
-Basics
-
-There are only a few types in Bolt: DB, Bucket, Tx, and Cursor. The DB is
-a collection of buckets and is represented by a single file on disk. A bucket is
-a collection of unique keys that are associated with values.
-
-Transactions provide either read-only or read-write access to the database.
-Read-only transactions can retrieve key/value pairs and can use Cursors to
-iterate over the dataset sequentially. Read-write transactions can create and
-delete buckets and can insert and remove keys. Only one read-write transaction
-is allowed at a time.
-
-
-Caveats
-
-The database uses a read-only, memory-mapped data file to ensure that
-applications cannot corrupt the database, however, this means that keys and
-values returned from Bolt cannot be changed. Writing to a read-only byte slice
-will cause Go to panic.
-
-Keys and values retrieved from the database are only valid for the life of
-the transaction. When used outside the transaction, these byte slices can
-point to different data or can point to invalid memory which will cause a panic.
-
-
-*/
-package bolt
diff --git a/Godeps/_workspace/src/github.com/boltdb/bolt/errors.go b/Godeps/_workspace/src/github.com/boltdb/bolt/errors.go
deleted file mode 100644
index 6883786d5..000000000
--- a/Godeps/_workspace/src/github.com/boltdb/bolt/errors.go
+++ /dev/null
@@ -1,70 +0,0 @@
-package bolt
-
-import "errors"
-
-// These errors can be returned when opening or calling methods on a DB.
-var (
-	// ErrDatabaseNotOpen is returned when a DB instance is accessed before it
-	// is opened or after it is closed.
-	ErrDatabaseNotOpen = errors.New("database not open")
-
-	// ErrDatabaseOpen is returned when opening a database that is
-	// already open.
-	ErrDatabaseOpen = errors.New("database already open")
-
-	// ErrInvalid is returned when a data file is not a Bolt-formatted database.
-	ErrInvalid = errors.New("invalid database")
-
-	// ErrVersionMismatch is returned when the data file was created with a
-	// different version of Bolt.
-	ErrVersionMismatch = errors.New("version mismatch")
-
-	// ErrChecksum is returned when either meta page checksum does not match.
-	ErrChecksum = errors.New("checksum error")
-
-	// ErrTimeout is returned when a database cannot obtain an exclusive lock
-	// on the data file after the timeout passed to Open().
-	ErrTimeout = errors.New("timeout")
-)
-
-// These errors can occur when beginning or committing a Tx.
-var (
-	// ErrTxNotWritable is returned when performing a write operation on a
-	// read-only transaction.
-	ErrTxNotWritable = errors.New("tx not writable")
-
-	// ErrTxClosed is returned when committing or rolling back a transaction
-	// that has already been committed or rolled back.
-	ErrTxClosed = errors.New("tx closed")
-
-	// ErrDatabaseReadOnly is returned when a mutating transaction is started on a
-	// read-only database.
-	ErrDatabaseReadOnly = errors.New("database is in read-only mode")
-)
-
-// These errors can occur when putting or deleting a value or a bucket.
-var (
-	// ErrBucketNotFound is returned when trying to access a bucket that has
-	// not been created yet.
-	ErrBucketNotFound = errors.New("bucket not found")
-
-	// ErrBucketExists is returned when creating a bucket that already exists.
-	ErrBucketExists = errors.New("bucket already exists")
-
-	// ErrBucketNameRequired is returned when creating a bucket with a blank name.
-	ErrBucketNameRequired = errors.New("bucket name required")
-
-	// ErrKeyRequired is returned when inserting a zero-length key.
-	ErrKeyRequired = errors.New("key required")
-
-	// ErrKeyTooLarge is returned when inserting a key that is larger than MaxKeySize.
-	ErrKeyTooLarge = errors.New("key too large")
-
-	// ErrValueTooLarge is returned when inserting a value that is larger than MaxValueSize.
-	ErrValueTooLarge = errors.New("value too large")
-
-	// ErrIncompatibleValue is returned when trying create or delete a bucket
-	// on an existing non-bucket key or when trying to create or delete a
-	// non-bucket key on an existing bucket key.
-	ErrIncompatibleValue = errors.New("incompatible value")
-)
diff --git a/Godeps/_workspace/src/github.com/boltdb/bolt/freelist.go b/Godeps/_workspace/src/github.com/boltdb/bolt/freelist.go
deleted file mode 100644
index 0161948fc..000000000
--- a/Godeps/_workspace/src/github.com/boltdb/bolt/freelist.go
+++ /dev/null
@@ -1,242 +0,0 @@
-package bolt
-
-import (
-	"fmt"
-	"sort"
-	"unsafe"
-)
-
-// freelist represents a list of all pages that are available for allocation.
-// It also tracks pages that have been freed but are still in use by open transactions.
-type freelist struct {
-	ids     []pgid          // all free and available free page ids.
-	pending map[txid][]pgid // mapping of soon-to-be free page ids by tx.
-	cache   map[pgid]bool   // fast lookup of all free and pending page ids.
-}
-
-// newFreelist returns an empty, initialized freelist.
-func newFreelist() *freelist {
-	return &freelist{
-		pending: make(map[txid][]pgid),
-		cache:   make(map[pgid]bool),
-	}
-}
-
-// size returns the size of the page after serialization.
-func (f *freelist) size() int {
-	return pageHeaderSize + (int(unsafe.Sizeof(pgid(0))) * f.count())
-}
-
-// count returns count of pages on the freelist
-func (f *freelist) count() int {
-	return f.free_count() + f.pending_count()
-}
-
-// free_count returns count of free pages
-func (f *freelist) free_count() int {
-	return len(f.ids)
-}
-
-// pending_count returns count of pending pages
-func (f *freelist) pending_count() int {
-	var count int
-	for _, list := range f.pending {
-		count += len(list)
-	}
-	return count
-}
-
-// all returns a list of all free ids and all pending ids in one sorted list.
-func (f *freelist) all() []pgid {
-	m := make(pgids, 0)
-
-	for _, list := range f.pending {
-		m = append(m, list...)
-	}
-
-	sort.Sort(m)
-	return pgids(f.ids).merge(m)
-}
-
-// allocate returns the starting page id of a contiguous list of pages of a given size.
-// If a contiguous block cannot be found then 0 is returned.
-func (f *freelist) allocate(n int) pgid {
-	if len(f.ids) == 0 {
-		return 0
-	}
-
-	var initial, previd pgid
-	for i, id := range f.ids {
-		if id <= 1 {
-			panic(fmt.Sprintf("invalid page allocation: %d", id))
-		}
-
-		// Reset initial page if this is not contiguous.
-		if previd == 0 || id-previd != 1 {
-			initial = id
-		}
-
-		// If we found a contiguous block then remove it and return it.
-		if (id-initial)+1 == pgid(n) {
-			// If we're allocating off the beginning then take the fast path
-			// and just adjust the existing slice. This will use extra memory
-			// temporarily but the append() in free() will realloc the slice
-			// as is necessary.
-			if (i + 1) == n {
-				f.ids = f.ids[i+1:]
-			} else {
-				copy(f.ids[i-n+1:], f.ids[i+1:])
-				f.ids = f.ids[:len(f.ids)-n]
-			}
-
-			// Remove from the free cache.
-			for i := pgid(0); i < pgid(n); i++ {
-				delete(f.cache, initial+i)
-			}
-
-			return initial
-		}
-
-		previd = id
-	}
-	return 0
-}
-
-// free releases a page and its overflow for a given transaction id.
-// If the page is already free then a panic will occur.
-func (f *freelist) free(txid txid, p *page) {
-	if p.id <= 1 {
-		panic(fmt.Sprintf("cannot free page 0 or 1: %d", p.id))
-	}
-
-	// Free page and all its overflow pages.
-	var ids = f.pending[txid]
-	for id := p.id; id <= p.id+pgid(p.overflow); id++ {
-		// Verify that page is not already free.
-		if f.cache[id] {
-			panic(fmt.Sprintf("page %d already freed", id))
-		}
-
-		// Add to the freelist and cache.
-		ids = append(ids, id)
-		f.cache[id] = true
-	}
-	f.pending[txid] = ids
-}
-
-// release moves all page ids for a transaction id (or older) to the freelist.
-func (f *freelist) release(txid txid) {
-	m := make(pgids, 0)
-	for tid, ids := range f.pending {
-		if tid <= txid {
-			// Move transaction's pending pages to the available freelist.
-			// Don't remove from the cache since the page is still free.
-			m = append(m, ids...)
-			delete(f.pending, tid)
-		}
-	}
-	sort.Sort(m)
-	f.ids = pgids(f.ids).merge(m)
-}
-
-// rollback removes the pages from a given pending tx.
-func (f *freelist) rollback(txid txid) {
-	// Remove page ids from cache.
-	for _, id := range f.pending[txid] {
-		delete(f.cache, id)
-	}
-
-	// Remove pages from pending list.
-	delete(f.pending, txid)
-}
-
-// freed returns whether a given page is in the free list.
-func (f *freelist) freed(pgid pgid) bool {
-	return f.cache[pgid]
-}
-
-// read initializes the freelist from a freelist page.
-func (f *freelist) read(p *page) {
-	// If the page.count is at the max uint16 value (64k) then it's considered
-	// an overflow and the size of the freelist is stored as the first element.
-	idx, count := 0, int(p.count)
-	if count == 0xFFFF {
-		idx = 1
-		count = int(((*[maxAllocSize]pgid)(unsafe.Pointer(&p.ptr)))[0])
-	}
-
-	// Copy the list of page ids from the freelist.
-	ids := ((*[maxAllocSize]pgid)(unsafe.Pointer(&p.ptr)))[idx:count]
-	f.ids = make([]pgid, len(ids))
-	copy(f.ids, ids)
-
-	// Make sure they're sorted.
-	sort.Sort(pgids(f.ids))
-
-	// Rebuild the page cache.
-	f.reindex()
-}
-
-// write writes the page ids onto a freelist page. All free and pending ids are
-// saved to disk since in the event of a program crash, all pending ids will
-// become free.
-func (f *freelist) write(p *page) error {
-	// Combine the old free pgids and pgids waiting on an open transaction.
-	ids := f.all()
-
-	// Update the header flag.
-	p.flags |= freelistPageFlag
-
-	// The page.count can only hold up to 64k elements so if we overflow that
-	// number then we handle it by putting the size in the first element.
-	if len(ids) < 0xFFFF {
-		p.count = uint16(len(ids))
-		copy(((*[maxAllocSize]pgid)(unsafe.Pointer(&p.ptr)))[:], ids)
-	} else {
-		p.count = 0xFFFF
-		((*[maxAllocSize]pgid)(unsafe.Pointer(&p.ptr)))[0] = pgid(len(ids))
-		copy(((*[maxAllocSize]pgid)(unsafe.Pointer(&p.ptr)))[1:], ids)
-	}
-
-	return nil
-}
-
-// reload reads the freelist from a page and filters out pending items.
-func (f *freelist) reload(p *page) {
-	f.read(p)
-
-	// Build a cache of only pending pages.
-	pcache := make(map[pgid]bool)
-	for _, pendingIDs := range f.pending {
-		for _, pendingID := range pendingIDs {
-			pcache[pendingID] = true
-		}
-	}
-
-	// Check each page in the freelist and build a new available freelist
-	// with any pages not in the pending lists.
-	var a []pgid
-	for _, id := range f.ids {
-		if !pcache[id] {
-			a = append(a, id)
-		}
-	}
-	f.ids = a
-
-	// Once the available list is rebuilt then rebuild the free cache so that
-	// it includes the available and pending free pages.
-	f.reindex()
-}
-
-// reindex rebuilds the free cache based on available and pending free lists.
-func (f *freelist) reindex() {
-	f.cache = make(map[pgid]bool)
-	for _, id := range f.ids {
-		f.cache[id] = true
-	}
-	for _, pendingIDs := range f.pending {
-		for _, pendingID := range pendingIDs {
-			f.cache[pendingID] = true
-		}
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/boltdb/bolt/freelist_test.go b/Godeps/_workspace/src/github.com/boltdb/bolt/freelist_test.go
deleted file mode 100644
index 8caeab2ec..000000000
--- a/Godeps/_workspace/src/github.com/boltdb/bolt/freelist_test.go
+++ /dev/null
@@ -1,156 +0,0 @@
-package bolt
-
-import (
-	"math/rand"
-	"reflect"
-	"sort"
-	"testing"
-	"unsafe"
-)
-
-// Ensure that a page is added to a transaction's freelist.
-func TestFreelist_free(t *testing.T) {
-	f := newFreelist()
-	f.free(100, &page{id: 12})
-	if !reflect.DeepEqual([]pgid{12}, f.pending[100]) {
-		t.Fatalf("exp=%v; got=%v", []pgid{12}, f.pending[100])
-	}
-}
-
-// Ensure that a page and its overflow is added to a transaction's freelist.
-func TestFreelist_free_overflow(t *testing.T) {
-	f := newFreelist()
-	f.free(100, &page{id: 12, overflow: 3})
-	if exp := []pgid{12, 13, 14, 15}; !reflect.DeepEqual(exp, f.pending[100]) {
-		t.Fatalf("exp=%v; got=%v", exp, f.pending[100])
-	}
-}
-
-// Ensure that a transaction's free pages can be released.
-func TestFreelist_release(t *testing.T) {
-	f := newFreelist()
-	f.free(100, &page{id: 12, overflow: 1})
-	f.free(100, &page{id: 9})
-	f.free(102, &page{id: 39})
-	f.release(100)
-	f.release(101)
-	if exp := []pgid{9, 12, 13}; !reflect.DeepEqual(exp, f.ids) {
-		t.Fatalf("exp=%v; got=%v", exp, f.ids)
-	}
-
-	f.release(102)
-	if exp := []pgid{9, 12, 13, 39}; !reflect.DeepEqual(exp, f.ids) {
-		t.Fatalf("exp=%v; got=%v", exp, f.ids)
-	}
-}
-
-// Ensure that a freelist can find contiguous blocks of pages.
-func TestFreelist_allocate(t *testing.T) {
-	f := &freelist{ids: []pgid{3, 4, 5, 6, 7, 9, 12, 13, 18}}
-	if id := int(f.allocate(3)); id != 3 {
-		t.Fatalf("exp=3; got=%v", id)
-	}
-	if id := int(f.allocate(1)); id != 6 {
-		t.Fatalf("exp=6; got=%v", id)
-	}
-	if id := int(f.allocate(3)); id != 0 {
-		t.Fatalf("exp=0; got=%v", id)
-	}
-	if id := int(f.allocate(2)); id != 12 {
-		t.Fatalf("exp=12; got=%v", id)
-	}
-	if id := int(f.allocate(1)); id != 7 {
-		t.Fatalf("exp=7; got=%v", id)
-	}
-	if id := int(f.allocate(0)); id != 0 {
-		t.Fatalf("exp=0; got=%v", id)
-	}
-	if id := int(f.allocate(0)); id != 0 {
-		t.Fatalf("exp=0; got=%v", id)
-	}
-	if exp := []pgid{9, 18}; !reflect.DeepEqual(exp, f.ids) {
-		t.Fatalf("exp=%v; got=%v", exp, f.ids)
-	}
-
-	if id := int(f.allocate(1)); id != 9 {
-		t.Fatalf("exp=9; got=%v", id)
-	}
-	if id := int(f.allocate(1)); id != 18 {
-		t.Fatalf("exp=18; got=%v", id)
-	}
-	if id := int(f.allocate(1)); id != 0 {
-		t.Fatalf("exp=0; got=%v", id)
-	}
-	if exp := []pgid{}; !reflect.DeepEqual(exp, f.ids) {
-		t.Fatalf("exp=%v; got=%v", exp, f.ids)
-	}
-}
-
-// Ensure that a freelist can deserialize from a freelist page.
-func TestFreelist_read(t *testing.T) {
-	// Create a page.
-	var buf [4096]byte
-	page := (*page)(unsafe.Pointer(&buf[0]))
-	page.flags = freelistPageFlag
-	page.count = 2
-
-	// Insert 2 page ids.
-	ids := (*[3]pgid)(unsafe.Pointer(&page.ptr))
-	ids[0] = 23
-	ids[1] = 50
-
-	// Deserialize page into a freelist.
-	f := newFreelist()
-	f.read(page)
-
-	// Ensure that there are two page ids in the freelist.
-	if exp := []pgid{23, 50}; !reflect.DeepEqual(exp, f.ids) {
-		t.Fatalf("exp=%v; got=%v", exp, f.ids)
-	}
-}
-
-// Ensure that a freelist can serialize into a freelist page.
-func TestFreelist_write(t *testing.T) {
-	// Create a freelist and write it to a page.
-	var buf [4096]byte
-	f := &freelist{ids: []pgid{12, 39}, pending: make(map[txid][]pgid)}
-	f.pending[100] = []pgid{28, 11}
-	f.pending[101] = []pgid{3}
-	p := (*page)(unsafe.Pointer(&buf[0]))
-	f.write(p)
-
-	// Read the page back out.
-	f2 := newFreelist()
-	f2.read(p)
-
-	// Ensure that the freelist is correct.
-	// All pages should be present and in reverse order.
-	if exp := []pgid{3, 11, 12, 28, 39}; !reflect.DeepEqual(exp, f2.ids) {
-		t.Fatalf("exp=%v; got=%v", exp, f2.ids)
-	}
-}
-
-func Benchmark_FreelistRelease10K(b *testing.B)    { benchmark_FreelistRelease(b, 10000) }
-func Benchmark_FreelistRelease100K(b *testing.B)   { benchmark_FreelistRelease(b, 100000) }
-func Benchmark_FreelistRelease1000K(b *testing.B)  { benchmark_FreelistRelease(b, 1000000) }
-func Benchmark_FreelistRelease10000K(b *testing.B) { benchmark_FreelistRelease(b, 10000000) }
-
-func benchmark_FreelistRelease(b *testing.B, size int) {
-	ids := randomPgids(size)
-	pending := randomPgids(len(ids) / 400)
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		f := &freelist{ids: ids, pending: map[txid][]pgid{1: pending}}
-		f.release(1)
-	}
-}
-
-func randomPgids(n int) []pgid {
-	rand.Seed(42)
-	pgids := make(pgids, n)
-	for i := range pgids {
-		pgids[i] = pgid(rand.Int63())
-	}
-	sort.Sort(pgids)
-	return pgids
-}
diff --git a/Godeps/_workspace/src/github.com/boltdb/bolt/node.go b/Godeps/_workspace/src/github.com/boltdb/bolt/node.go
deleted file mode 100644
index c9fb21c73..000000000
--- a/Godeps/_workspace/src/github.com/boltdb/bolt/node.go
+++ /dev/null
@@ -1,636 +0,0 @@
-package bolt
-
-import (
-	"bytes"
-	"fmt"
-	"sort"
-	"unsafe"
-)
-
-// node represents an in-memory, deserialized page.
-type node struct {
-	bucket     *Bucket
-	isLeaf     bool
-	unbalanced bool
-	spilled    bool
-	key        []byte
-	pgid       pgid
-	parent     *node
-	children   nodes
-	inodes     inodes
-}
-
-// root returns the top-level node this node is attached to.
-func (n *node) root() *node {
-	if n.parent == nil {
-		return n
-	}
-	return n.parent.root()
-}
-
-// minKeys returns the minimum number of inodes this node should have.
-func (n *node) minKeys() int {
-	if n.isLeaf {
-		return 1
-	}
-	return 2
-}
-
-// size returns the size of the node after serialization.
-func (n *node) size() int {
-	sz, elsz := pageHeaderSize, n.pageElementSize()
-	for i := 0; i < len(n.inodes); i++ {
-		item := &n.inodes[i]
-		sz += elsz + len(item.key) + len(item.value)
-	}
-	return sz
-}
-
-// sizeLessThan returns true if the node is less than a given size.
-// This is an optimization to avoid calculating a large node when we only need
-// to know if it fits inside a certain page size.
-func (n *node) sizeLessThan(v int) bool {
-	sz, elsz := pageHeaderSize, n.pageElementSize()
-	for i := 0; i < len(n.inodes); i++ {
-		item := &n.inodes[i]
-		sz += elsz + len(item.key) + len(item.value)
-		if sz >= v {
-			return false
-		}
-	}
-	return true
-}
-
-// pageElementSize returns the size of each page element based on the type of node.
-func (n *node) pageElementSize() int {
-	if n.isLeaf {
-		return leafPageElementSize
-	}
-	return branchPageElementSize
-}
-
-// childAt returns the child node at a given index.
-func (n *node) childAt(index int) *node {
-	if n.isLeaf {
-		panic(fmt.Sprintf("invalid childAt(%d) on a leaf node", index))
-	}
-	return n.bucket.node(n.inodes[index].pgid, n)
-}
-
-// childIndex returns the index of a given child node.
-func (n *node) childIndex(child *node) int {
-	index := sort.Search(len(n.inodes), func(i int) bool { return bytes.Compare(n.inodes[i].key, child.key) != -1 })
-	return index
-}
-
-// numChildren returns the number of children.
-func (n *node) numChildren() int {
-	return len(n.inodes)
-}
-
-// nextSibling returns the next node with the same parent.
-func (n *node) nextSibling() *node {
-	if n.parent == nil {
-		return nil
-	}
-	index := n.parent.childIndex(n)
-	if index >= n.parent.numChildren()-1 {
-		return nil
-	}
-	return n.parent.childAt(index + 1)
-}
-
-// prevSibling returns the previous node with the same parent.
-func (n *node) prevSibling() *node {
-	if n.parent == nil {
-		return nil
-	}
-	index := n.parent.childIndex(n)
-	if index == 0 {
-		return nil
-	}
-	return n.parent.childAt(index - 1)
-}
-
-// put inserts a key/value.
-func (n *node) put(oldKey, newKey, value []byte, pgid pgid, flags uint32) {
-	if pgid >= n.bucket.tx.meta.pgid {
-		panic(fmt.Sprintf("pgid (%d) above high water mark (%d)", pgid, n.bucket.tx.meta.pgid))
-	} else if len(oldKey) <= 0 {
-		panic("put: zero-length old key")
-	} else if len(newKey) <= 0 {
-		panic("put: zero-length new key")
-	}
-
-	// Find insertion index.
-	index := sort.Search(len(n.inodes), func(i int) bool { return bytes.Compare(n.inodes[i].key, oldKey) != -1 })
-
-	// Add capacity and shift nodes if we don't have an exact match and need to insert.
-	exact := (len(n.inodes) > 0 && index < len(n.inodes) && bytes.Equal(n.inodes[index].key, oldKey))
-	if !exact {
-		n.inodes = append(n.inodes, inode{})
-		copy(n.inodes[index+1:], n.inodes[index:])
-	}
-
-	inode := &n.inodes[index]
-	inode.flags = flags
-	inode.key = newKey
-	inode.value = value
-	inode.pgid = pgid
-	_assert(len(inode.key) > 0, "put: zero-length inode key")
-}
-
-// del removes a key from the node.
-func (n *node) del(key []byte) {
-	// Find index of key.
-	index := sort.Search(len(n.inodes), func(i int) bool { return bytes.Compare(n.inodes[i].key, key) != -1 })
-
-	// Exit if the key isn't found.
-	if index >= len(n.inodes) || !bytes.Equal(n.inodes[index].key, key) {
-		return
-	}
-
-	// Delete inode from the node.
-	n.inodes = append(n.inodes[:index], n.inodes[index+1:]...)
-
-	// Mark the node as needing rebalancing.
-	n.unbalanced = true
-}
-
-// read initializes the node from a page.
-func (n *node) read(p *page) {
-	n.pgid = p.id
-	n.isLeaf = ((p.flags & leafPageFlag) != 0)
-	n.inodes = make(inodes, int(p.count))
-
-	for i := 0; i < int(p.count); i++ {
-		inode := &n.inodes[i]
-		if n.isLeaf {
-			elem := p.leafPageElement(uint16(i))
-			inode.flags = elem.flags
-			inode.key = elem.key()
-			inode.value = elem.value()
-		} else {
-			elem := p.branchPageElement(uint16(i))
-			inode.pgid = elem.pgid
-			inode.key = elem.key()
-		}
-		_assert(len(inode.key) > 0, "read: zero-length inode key")
-	}
-
-	// Save first key so we can find the node in the parent when we spill.
-	if len(n.inodes) > 0 {
-		n.key = n.inodes[0].key
-		_assert(len(n.key) > 0, "read: zero-length node key")
-	} else {
-		n.key = nil
-	}
-}
-
-// write writes the items onto one or more pages.
-func (n *node) write(p *page) {
-	// Initialize page.
-	if n.isLeaf {
-		p.flags |= leafPageFlag
-	} else {
-		p.flags |= branchPageFlag
-	}
-
-	if len(n.inodes) >= 0xFFFF {
-		panic(fmt.Sprintf("inode overflow: %d (pgid=%d)", len(n.inodes), p.id))
-	}
-	p.count = uint16(len(n.inodes))
-
-	// Loop over each item and write it to the page.
-	b := (*[maxAllocSize]byte)(unsafe.Pointer(&p.ptr))[n.pageElementSize()*len(n.inodes):]
-	for i, item := range n.inodes {
-		_assert(len(item.key) > 0, "write: zero-length inode key")
-
-		// Write the page element.
-		if n.isLeaf {
-			elem := p.leafPageElement(uint16(i))
-			elem.pos = uint32(uintptr(unsafe.Pointer(&b[0])) - uintptr(unsafe.Pointer(elem)))
-			elem.flags = item.flags
-			elem.ksize = uint32(len(item.key))
-			elem.vsize = uint32(len(item.value))
-		} else {
-			elem := p.branchPageElement(uint16(i))
-			elem.pos = uint32(uintptr(unsafe.Pointer(&b[0])) - uintptr(unsafe.Pointer(elem)))
-			elem.ksize = uint32(len(item.key))
-			elem.pgid = item.pgid
-			_assert(elem.pgid != p.id, "write: circular dependency occurred")
-		}
-
-		// If the length of key+value is larger than the max allocation size
-		// then we need to reallocate the byte array pointer.
-		//
-		// See: https://github.com/boltdb/bolt/pull/335
-		klen, vlen := len(item.key), len(item.value)
-		if len(b) < klen+vlen {
-			b = (*[maxAllocSize]byte)(unsafe.Pointer(&b[0]))[:]
-		}
-
-		// Write data for the element to the end of the page.
-		copy(b[0:], item.key)
-		b = b[klen:]
-		copy(b[0:], item.value)
-		b = b[vlen:]
-	}
-
-	// DEBUG ONLY: n.dump()
-}
-
-// split breaks up a node into multiple smaller nodes, if appropriate.
-// This should only be called from the spill() function.
-func (n *node) split(pageSize int) []*node {
-	var nodes []*node
-
-	node := n
-	for {
-		// Split node into two.
-		a, b := node.splitTwo(pageSize)
-		nodes = append(nodes, a)
-
-		// If we can't split then exit the loop.
-		if b == nil {
-			break
-		}
-
-		// Set node to b so it gets split on the next iteration.
-		node = b
-	}
-
-	return nodes
-}
-
-// splitTwo breaks up a node into two smaller nodes, if appropriate.
-// This should only be called from the split() function.
-func (n *node) splitTwo(pageSize int) (*node, *node) {
-	// Ignore the split if the page doesn't have at least enough nodes for
-	// two pages or if the nodes can fit in a single page.
-	if len(n.inodes) <= (minKeysPerPage*2) || n.sizeLessThan(pageSize) {
-		return n, nil
-	}
-
-	// Determine the threshold before starting a new node.
-	var fillPercent = n.bucket.FillPercent
-	if fillPercent < minFillPercent {
-		fillPercent = minFillPercent
-	} else if fillPercent > maxFillPercent {
-		fillPercent = maxFillPercent
-	}
-	threshold := int(float64(pageSize) * fillPercent)
-
-	// Determine split position and sizes of the two pages.
-	splitIndex, _ := n.splitIndex(threshold)
-
-	// Split node into two separate nodes.
-	// If there's no parent then we'll need to create one.
-	if n.parent == nil {
-		n.parent = &node{bucket: n.bucket, children: []*node{n}}
-	}
-
-	// Create a new node and add it to the parent.
-	next := &node{bucket: n.bucket, isLeaf: n.isLeaf, parent: n.parent}
-	n.parent.children = append(n.parent.children, next)
-
-	// Split inodes across two nodes.
-	next.inodes = n.inodes[splitIndex:]
-	n.inodes = n.inodes[:splitIndex]
-
-	// Update the statistics.
-	n.bucket.tx.stats.Split++
-
-	return n, next
-}
-
-// splitIndex finds the position where a page will fill a given threshold.
-// It returns the index as well as the size of the first page.
-// This is only be called from split().
-func (n *node) splitIndex(threshold int) (index, sz int) {
-	sz = pageHeaderSize
-
-	// Loop until we only have the minimum number of keys required for the second page.
-	for i := 0; i < len(n.inodes)-minKeysPerPage; i++ {
-		index = i
-		inode := n.inodes[i]
-		elsize := n.pageElementSize() + len(inode.key) + len(inode.value)
-
-		// If we have at least the minimum number of keys and adding another
-		// node would put us over the threshold then exit and return.
-		if i >= minKeysPerPage && sz+elsize > threshold {
-			break
-		}
-
-		// Add the element size to the total size.
-		sz += elsize
-	}
-
-	return
-}
-
-// spill writes the nodes to dirty pages and splits nodes as it goes.
-// Returns an error if dirty pages cannot be allocated.
-func (n *node) spill() error {
-	var tx = n.bucket.tx
-	if n.spilled {
-		return nil
-	}
-
-	// Spill child nodes first. Child nodes can materialize sibling nodes in
-	// the case of split-merge so we cannot use a range loop. We have to check
-	// the children size on every loop iteration.
-	sort.Sort(n.children)
-	for i := 0; i < len(n.children); i++ {
-		if err := n.children[i].spill(); err != nil {
-			return err
-		}
-	}
-
-	// We no longer need the child list because it's only used for spill tracking.
-	n.children = nil
-
-	// Split nodes into appropriate sizes. The first node will always be n.
-	var nodes = n.split(tx.db.pageSize)
-	for _, node := range nodes {
-		// Add node's page to the freelist if it's not new.
-		if node.pgid > 0 {
-			tx.db.freelist.free(tx.meta.txid, tx.page(node.pgid))
-			node.pgid = 0
-		}
-
-		// Allocate contiguous space for the node.
-		p, err := tx.allocate((node.size() / tx.db.pageSize) + 1)
-		if err != nil {
-			return err
-		}
-
-		// Write the node.
-		if p.id >= tx.meta.pgid {
-			panic(fmt.Sprintf("pgid (%d) above high water mark (%d)", p.id, tx.meta.pgid))
-		}
-		node.pgid = p.id
-		node.write(p)
-		node.spilled = true
-
-		// Insert into parent inodes.
-		if node.parent != nil {
-			var key = node.key
-			if key == nil {
-				key = node.inodes[0].key
-			}
-
-			node.parent.put(key, node.inodes[0].key, nil, node.pgid, 0)
-			node.key = node.inodes[0].key
-			_assert(len(node.key) > 0, "spill: zero-length node key")
-		}
-
-		// Update the statistics.
-		tx.stats.Spill++
-	}
-
-	// If the root node split and created a new root then we need to spill that
-	// as well. We'll clear out the children to make sure it doesn't try to respill.
-	if n.parent != nil && n.parent.pgid == 0 {
-		n.children = nil
-		return n.parent.spill()
-	}
-
-	return nil
-}
-
-// rebalance attempts to combine the node with sibling nodes if the node fill
-// size is below a threshold or if there are not enough keys.
-func (n *node) rebalance() {
-	if !n.unbalanced {
-		return
-	}
-	n.unbalanced = false
-
-	// Update statistics.
-	n.bucket.tx.stats.Rebalance++
-
-	// Ignore if node is above threshold (25%) and has enough keys.
-	var threshold = n.bucket.tx.db.pageSize / 4
-	if n.size() > threshold && len(n.inodes) > n.minKeys() {
-		return
-	}
-
-	// Root node has special handling.
-	if n.parent == nil {
-		// If root node is a branch and only has one node then collapse it.
-		if !n.isLeaf && len(n.inodes) == 1 {
-			// Move root's child up.
-			child := n.bucket.node(n.inodes[0].pgid, n)
-			n.isLeaf = child.isLeaf
-			n.inodes = child.inodes[:]
-			n.children = child.children
-
-			// Reparent all child nodes being moved.
-			for _, inode := range n.inodes {
-				if child, ok := n.bucket.nodes[inode.pgid]; ok {
-					child.parent = n
-				}
-			}
-
-			// Remove old child.
-			child.parent = nil
-			delete(n.bucket.nodes, child.pgid)
-			child.free()
-		}
-
-		return
-	}
-
-	// If node has no keys then just remove it.
-	if n.numChildren() == 0 {
-		n.parent.del(n.key)
-		n.parent.removeChild(n)
-		delete(n.bucket.nodes, n.pgid)
-		n.free()
-		n.parent.rebalance()
-		return
-	}
-
-	_assert(n.parent.numChildren() > 1, "parent must have at least 2 children")
-
-	// Destination node is right sibling if idx == 0, otherwise left sibling.
-	var target *node
-	var useNextSibling = (n.parent.childIndex(n) == 0)
-	if useNextSibling {
-		target = n.nextSibling()
-	} else {
-		target = n.prevSibling()
-	}
-
-	// If target node has extra nodes then just move one over.
-	if target.numChildren() > target.minKeys() {
-		if useNextSibling {
-			// Reparent and move node.
-			if child, ok := n.bucket.nodes[target.inodes[0].pgid]; ok {
-				child.parent.removeChild(child)
-				child.parent = n
-				child.parent.children = append(child.parent.children, child)
-			}
-			n.inodes = append(n.inodes, target.inodes[0])
-			target.inodes = target.inodes[1:]
-
-			// Update target key on parent.
-			target.parent.put(target.key, target.inodes[0].key, nil, target.pgid, 0)
-			target.key = target.inodes[0].key
-			_assert(len(target.key) > 0, "rebalance(1): zero-length node key")
-		} else {
-			// Reparent and move node.
-			if child, ok := n.bucket.nodes[target.inodes[len(target.inodes)-1].pgid]; ok {
-				child.parent.removeChild(child)
-				child.parent = n
-				child.parent.children = append(child.parent.children, child)
-			}
-			n.inodes = append(n.inodes, inode{})
-			copy(n.inodes[1:], n.inodes)
-			n.inodes[0] = target.inodes[len(target.inodes)-1]
-			target.inodes = target.inodes[:len(target.inodes)-1]
-		}
-
-		// Update parent key for node.
-		n.parent.put(n.key, n.inodes[0].key, nil, n.pgid, 0)
-		n.key = n.inodes[0].key
-		_assert(len(n.key) > 0, "rebalance(2): zero-length node key")
-
-		return
-	}
-
-	// If both this node and the target node are too small then merge them.
-	if useNextSibling {
-		// Reparent all child nodes being moved.
-		for _, inode := range target.inodes {
-			if child, ok := n.bucket.nodes[inode.pgid]; ok {
-				child.parent.removeChild(child)
-				child.parent = n
-				child.parent.children = append(child.parent.children, child)
-			}
-		}
-
-		// Copy over inodes from target and remove target.
-		n.inodes = append(n.inodes, target.inodes...)
-		n.parent.del(target.key)
-		n.parent.removeChild(target)
-		delete(n.bucket.nodes, target.pgid)
-		target.free()
-	} else {
-		// Reparent all child nodes being moved.
-		for _, inode := range n.inodes {
-			if child, ok := n.bucket.nodes[inode.pgid]; ok {
-				child.parent.removeChild(child)
-				child.parent = target
-				child.parent.children = append(child.parent.children, child)
-			}
-		}
-
-		// Copy over inodes to target and remove node.
-		target.inodes = append(target.inodes, n.inodes...)
-		n.parent.del(n.key)
-		n.parent.removeChild(n)
-		delete(n.bucket.nodes, n.pgid)
-		n.free()
-	}
-
-	// Either this node or the target node was deleted from the parent so rebalance it.
-	n.parent.rebalance()
-}
-
-// removes a node from the list of in-memory children.
-// This does not affect the inodes.
-func (n *node) removeChild(target *node) {
-	for i, child := range n.children {
-		if child == target {
-			n.children = append(n.children[:i], n.children[i+1:]...)
-			return
-		}
-	}
-}
-
-// dereference causes the node to copy all its inode key/value references to heap memory.
-// This is required when the mmap is reallocated so inodes are not pointing to stale data.
-func (n *node) dereference() {
-	if n.key != nil {
-		key := make([]byte, len(n.key))
-		copy(key, n.key)
-		n.key = key
-		_assert(n.pgid == 0 || len(n.key) > 0, "dereference: zero-length node key on existing node")
-	}
-
-	for i := range n.inodes {
-		inode := &n.inodes[i]
-
-		key := make([]byte, len(inode.key))
-		copy(key, inode.key)
-		inode.key = key
-		_assert(len(inode.key) > 0, "dereference: zero-length inode key")
-
-		value := make([]byte, len(inode.value))
-		copy(value, inode.value)
-		inode.value = value
-	}
-
-	// Recursively dereference children.
-	for _, child := range n.children {
-		child.dereference()
-	}
-
-	// Update statistics.
-	n.bucket.tx.stats.NodeDeref++
-}
-
-// free adds the node's underlying page to the freelist.
-func (n *node) free() {
-	if n.pgid != 0 {
-		n.bucket.tx.db.freelist.free(n.bucket.tx.meta.txid, n.bucket.tx.page(n.pgid))
-		n.pgid = 0
-	}
-}
-
-// dump writes the contents of the node to STDERR for debugging purposes.
-/*
-func (n *node) dump() {
-	// Write node header.
-	var typ = "branch"
-	if n.isLeaf {
-		typ = "leaf"
-	}
-	warnf("[NODE %d {type=%s count=%d}]", n.pgid, typ, len(n.inodes))
-
-	// Write out abbreviated version of each item.
-	for _, item := range n.inodes {
-		if n.isLeaf {
-			if item.flags&bucketLeafFlag != 0 {
-				bucket := (*bucket)(unsafe.Pointer(&item.value[0]))
-				warnf("+L %08x -> (bucket root=%d)", trunc(item.key, 4), bucket.root)
-			} else {
-				warnf("+L %08x -> %08x", trunc(item.key, 4), trunc(item.value, 4))
-			}
-		} else {
-			warnf("+B %08x -> pgid=%d", trunc(item.key, 4), item.pgid)
-		}
-	}
-	warn("")
-}
-*/
-
-type nodes []*node
-
-func (s nodes) Len() int           { return len(s) }
-func (s nodes) Swap(i, j int)      { s[i], s[j] = s[j], s[i] }
-func (s nodes) Less(i, j int) bool { return bytes.Compare(s[i].inodes[0].key, s[j].inodes[0].key) == -1 }
-
-// inode represents an internal node inside of a node.
-// It can be used to point to elements in a page or point
-// to an element which hasn't been added to a page yet.
-type inode struct {
-	flags uint32
-	pgid  pgid
-	key   []byte
-	value []byte
-}
-
-type inodes []inode
diff --git a/Godeps/_workspace/src/github.com/boltdb/bolt/node_test.go b/Godeps/_workspace/src/github.com/boltdb/bolt/node_test.go
deleted file mode 100644
index fa5d10f99..000000000
--- a/Godeps/_workspace/src/github.com/boltdb/bolt/node_test.go
+++ /dev/null
@@ -1,156 +0,0 @@
-package bolt
-
-import (
-	"testing"
-	"unsafe"
-)
-
-// Ensure that a node can insert a key/value.
-func TestNode_put(t *testing.T) {
-	n := &node{inodes: make(inodes, 0), bucket: &Bucket{tx: &Tx{meta: &meta{pgid: 1}}}}
-	n.put([]byte("baz"), []byte("baz"), []byte("2"), 0, 0)
-	n.put([]byte("foo"), []byte("foo"), []byte("0"), 0, 0)
-	n.put([]byte("bar"), []byte("bar"), []byte("1"), 0, 0)
-	n.put([]byte("foo"), []byte("foo"), []byte("3"), 0, leafPageFlag)
-
-	if len(n.inodes) != 3 {
-		t.Fatalf("exp=3; got=%d", len(n.inodes))
-	}
-	if k, v := n.inodes[0].key, n.inodes[0].value; string(k) != "bar" || string(v) != "1" {
-		t.Fatalf("exp=<bar,1>; got=<%s,%s>", k, v)
-	}
-	if k, v := n.inodes[1].key, n.inodes[1].value; string(k) != "baz" || string(v) != "2" {
-		t.Fatalf("exp=<baz,2>; got=<%s,%s>", k, v)
-	}
-	if k, v := n.inodes[2].key, n.inodes[2].value; string(k) != "foo" || string(v) != "3" {
-		t.Fatalf("exp=<foo,3>; got=<%s,%s>", k, v)
-	}
-	if n.inodes[2].flags != uint32(leafPageFlag) {
-		t.Fatalf("not a leaf: %d", n.inodes[2].flags)
-	}
-}
-
-// Ensure that a node can deserialize from a leaf page.
-func TestNode_read_LeafPage(t *testing.T) {
-	// Create a page.
-	var buf [4096]byte
-	page := (*page)(unsafe.Pointer(&buf[0]))
-	page.flags = leafPageFlag
-	page.count = 2
-
-	// Insert 2 elements at the beginning. sizeof(leafPageElement) == 16
-	nodes := (*[3]leafPageElement)(unsafe.Pointer(&page.ptr))
-	nodes[0] = leafPageElement{flags: 0, pos: 32, ksize: 3, vsize: 4}  // pos = sizeof(leafPageElement) * 2
-	nodes[1] = leafPageElement{flags: 0, pos: 23, ksize: 10, vsize: 3} // pos = sizeof(leafPageElement) + 3 + 4
-
-	// Write data for the nodes at the end.
-	data := (*[4096]byte)(unsafe.Pointer(&nodes[2]))
-	copy(data[:], []byte("barfooz"))
-	copy(data[7:], []byte("helloworldbye"))
-
-	// Deserialize page into a leaf.
-	n := &node{}
-	n.read(page)
-
-	// Check that there are two inodes with correct data.
-	if !n.isLeaf {
-		t.Fatal("expected leaf")
-	}
-	if len(n.inodes) != 2 {
-		t.Fatalf("exp=2; got=%d", len(n.inodes))
-	}
-	if k, v := n.inodes[0].key, n.inodes[0].value; string(k) != "bar" || string(v) != "fooz" {
-		t.Fatalf("exp=<bar,fooz>; got=<%s,%s>", k, v)
-	}
-	if k, v := n.inodes[1].key, n.inodes[1].value; string(k) != "helloworld" || string(v) != "bye" {
-		t.Fatalf("exp=<helloworld,bye>; got=<%s,%s>", k, v)
-	}
-}
-
-// Ensure that a node can serialize into a leaf page.
-func TestNode_write_LeafPage(t *testing.T) {
-	// Create a node.
-	n := &node{isLeaf: true, inodes: make(inodes, 0), bucket: &Bucket{tx: &Tx{db: &DB{}, meta: &meta{pgid: 1}}}}
-	n.put([]byte("susy"), []byte("susy"), []byte("que"), 0, 0)
-	n.put([]byte("ricki"), []byte("ricki"), []byte("lake"), 0, 0)
-	n.put([]byte("john"), []byte("john"), []byte("johnson"), 0, 0)
-
-	// Write it to a page.
-	var buf [4096]byte
-	p := (*page)(unsafe.Pointer(&buf[0]))
-	n.write(p)
-
-	// Read the page back in.
-	n2 := &node{}
-	n2.read(p)
-
-	// Check that the two pages are the same.
-	if len(n2.inodes) != 3 {
-		t.Fatalf("exp=3; got=%d", len(n2.inodes))
-	}
-	if k, v := n2.inodes[0].key, n2.inodes[0].value; string(k) != "john" || string(v) != "johnson" {
-		t.Fatalf("exp=<john,johnson>; got=<%s,%s>", k, v)
-	}
-	if k, v := n2.inodes[1].key, n2.inodes[1].value; string(k) != "ricki" || string(v) != "lake" {
-		t.Fatalf("exp=<ricki,lake>; got=<%s,%s>", k, v)
-	}
-	if k, v := n2.inodes[2].key, n2.inodes[2].value; string(k) != "susy" || string(v) != "que" {
-		t.Fatalf("exp=<susy,que>; got=<%s,%s>", k, v)
-	}
-}
-
-// Ensure that a node can split into appropriate subgroups.
-func TestNode_split(t *testing.T) {
-	// Create a node.
-	n := &node{inodes: make(inodes, 0), bucket: &Bucket{tx: &Tx{db: &DB{}, meta: &meta{pgid: 1}}}}
-	n.put([]byte("00000001"), []byte("00000001"), []byte("0123456701234567"), 0, 0)
-	n.put([]byte("00000002"), []byte("00000002"), []byte("0123456701234567"), 0, 0)
-	n.put([]byte("00000003"), []byte("00000003"), []byte("0123456701234567"), 0, 0)
-	n.put([]byte("00000004"), []byte("00000004"), []byte("0123456701234567"), 0, 0)
-	n.put([]byte("00000005"), []byte("00000005"), []byte("0123456701234567"), 0, 0)
-
-	// Split between 2 & 3.
-	n.split(100)
-
-	var parent = n.parent
-	if len(parent.children) != 2 {
-		t.Fatalf("exp=2; got=%d", len(parent.children))
-	}
-	if len(parent.children[0].inodes) != 2 {
-		t.Fatalf("exp=2; got=%d", len(parent.children[0].inodes))
-	}
-	if len(parent.children[1].inodes) != 3 {
-		t.Fatalf("exp=3; got=%d", len(parent.children[1].inodes))
-	}
-}
-
-// Ensure that a page with the minimum number of inodes just returns a single node.
-func TestNode_split_MinKeys(t *testing.T) {
-	// Create a node.
-	n := &node{inodes: make(inodes, 0), bucket: &Bucket{tx: &Tx{db: &DB{}, meta: &meta{pgid: 1}}}}
-	n.put([]byte("00000001"), []byte("00000001"), []byte("0123456701234567"), 0, 0)
-	n.put([]byte("00000002"), []byte("00000002"), []byte("0123456701234567"), 0, 0)
-
-	// Split.
-	n.split(20)
-	if n.parent != nil {
-		t.Fatalf("expected nil parent")
-	}
-}
-
-// Ensure that a node that has keys that all fit on a page just returns one leaf.
-func TestNode_split_SinglePage(t *testing.T) {
-	// Create a node.
-	n := &node{inodes: make(inodes, 0), bucket: &Bucket{tx: &Tx{db: &DB{}, meta: &meta{pgid: 1}}}}
-	n.put([]byte("00000001"), []byte("00000001"), []byte("0123456701234567"), 0, 0)
-	n.put([]byte("00000002"), []byte("00000002"), []byte("0123456701234567"), 0, 0)
-	n.put([]byte("00000003"), []byte("00000003"), []byte("0123456701234567"), 0, 0)
-	n.put([]byte("00000004"), []byte("00000004"), []byte("0123456701234567"), 0, 0)
-	n.put([]byte("00000005"), []byte("00000005"), []byte("0123456701234567"), 0, 0)
-
-	// Split.
-	n.split(4096)
-	if n.parent != nil {
-		t.Fatalf("expected nil parent")
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/boltdb/bolt/page.go b/Godeps/_workspace/src/github.com/boltdb/bolt/page.go
deleted file mode 100644
index 818aa1b15..000000000
--- a/Godeps/_workspace/src/github.com/boltdb/bolt/page.go
+++ /dev/null
@@ -1,172 +0,0 @@
-package bolt
-
-import (
-	"fmt"
-	"os"
-	"sort"
-	"unsafe"
-)
-
-const pageHeaderSize = int(unsafe.Offsetof(((*page)(nil)).ptr))
-
-const minKeysPerPage = 2
-
-const branchPageElementSize = int(unsafe.Sizeof(branchPageElement{}))
-const leafPageElementSize = int(unsafe.Sizeof(leafPageElement{}))
-
-const (
-	branchPageFlag   = 0x01
-	leafPageFlag     = 0x02
-	metaPageFlag     = 0x04
-	freelistPageFlag = 0x10
-)
-
-const (
-	bucketLeafFlag = 0x01
-)
-
-type pgid uint64
-
-type page struct {
-	id       pgid
-	flags    uint16
-	count    uint16
-	overflow uint32
-	ptr      uintptr
-}
-
-// typ returns a human readable page type string used for debugging.
-func (p *page) typ() string {
-	if (p.flags & branchPageFlag) != 0 {
-		return "branch"
-	} else if (p.flags & leafPageFlag) != 0 {
-		return "leaf"
-	} else if (p.flags & metaPageFlag) != 0 {
-		return "meta"
-	} else if (p.flags & freelistPageFlag) != 0 {
-		return "freelist"
-	}
-	return fmt.Sprintf("unknown<%02x>", p.flags)
-}
-
-// meta returns a pointer to the metadata section of the page.
-func (p *page) meta() *meta {
-	return (*meta)(unsafe.Pointer(&p.ptr))
-}
-
-// leafPageElement retrieves the leaf node by index
-func (p *page) leafPageElement(index uint16) *leafPageElement {
-	n := &((*[0x7FFFFFF]leafPageElement)(unsafe.Pointer(&p.ptr)))[index]
-	return n
-}
-
-// leafPageElements retrieves a list of leaf nodes.
-func (p *page) leafPageElements() []leafPageElement {
-	return ((*[0x7FFFFFF]leafPageElement)(unsafe.Pointer(&p.ptr)))[:]
-}
-
-// branchPageElement retrieves the branch node by index
-func (p *page) branchPageElement(index uint16) *branchPageElement {
-	return &((*[0x7FFFFFF]branchPageElement)(unsafe.Pointer(&p.ptr)))[index]
-}
-
-// branchPageElements retrieves a list of branch nodes.
-func (p *page) branchPageElements() []branchPageElement {
-	return ((*[0x7FFFFFF]branchPageElement)(unsafe.Pointer(&p.ptr)))[:]
-}
-
-// dump writes n bytes of the page to STDERR as hex output.
-func (p *page) hexdump(n int) {
-	buf := (*[maxAllocSize]byte)(unsafe.Pointer(p))[:n]
-	fmt.Fprintf(os.Stderr, "%x\n", buf)
-}
-
-type pages []*page
-
-func (s pages) Len() int           { return len(s) }
-func (s pages) Swap(i, j int)      { s[i], s[j] = s[j], s[i] }
-func (s pages) Less(i, j int) bool { return s[i].id < s[j].id }
-
-// branchPageElement represents a node on a branch page.
-type branchPageElement struct {
-	pos   uint32
-	ksize uint32
-	pgid  pgid
-}
-
-// key returns a byte slice of the node key.
-func (n *branchPageElement) key() []byte {
-	buf := (*[maxAllocSize]byte)(unsafe.Pointer(n))
-	return (*[maxAllocSize]byte)(unsafe.Pointer(&buf[n.pos]))[:n.ksize]
-}
-
-// leafPageElement represents a node on a leaf page.
-type leafPageElement struct {
-	flags uint32
-	pos   uint32
-	ksize uint32
-	vsize uint32
-}
-
-// key returns a byte slice of the node key.
-func (n *leafPageElement) key() []byte {
-	buf := (*[maxAllocSize]byte)(unsafe.Pointer(n))
-	return (*[maxAllocSize]byte)(unsafe.Pointer(&buf[n.pos]))[:n.ksize]
-}
-
-// value returns a byte slice of the node value.
-func (n *leafPageElement) value() []byte {
-	buf := (*[maxAllocSize]byte)(unsafe.Pointer(n))
-	return (*[maxAllocSize]byte)(unsafe.Pointer(&buf[n.pos+n.ksize]))[:n.vsize]
-}
-
-// PageInfo represents human readable information about a page.
-type PageInfo struct {
-	ID            int
-	Type          string
-	Count         int
-	OverflowCount int
-}
-
-type pgids []pgid
-
-func (s pgids) Len() int           { return len(s) }
-func (s pgids) Swap(i, j int)      { s[i], s[j] = s[j], s[i] }
-func (s pgids) Less(i, j int) bool { return s[i] < s[j] }
-
-// merge returns the sorted union of a and b.
-func (a pgids) merge(b pgids) pgids {
-	// Return the opposite slice if one is nil.
-	if len(a) == 0 {
-		return b
-	} else if len(b) == 0 {
-		return a
-	}
-
-	// Create a list to hold all elements from both lists.
-	merged := make(pgids, 0, len(a)+len(b))
-
-	// Assign lead to the slice with a lower starting value, follow to the higher value.
-	lead, follow := a, b
-	if b[0] < a[0] {
-		lead, follow = b, a
-	}
-
-	// Continue while there are elements in the lead.
-	for len(lead) > 0 {
-		// Merge largest prefix of lead that is ahead of follow[0].
-		n := sort.Search(len(lead), func(i int) bool { return lead[i] > follow[0] })
-		merged = append(merged, lead[:n]...)
-		if n >= len(lead) {
-			break
-		}
-
-		// Swap lead and follow.
-		lead, follow = follow, lead[n:]
-	}
-
-	// Append what's left in follow.
-	merged = append(merged, follow...)
-
-	return merged
-}
diff --git a/Godeps/_workspace/src/github.com/boltdb/bolt/page_test.go b/Godeps/_workspace/src/github.com/boltdb/bolt/page_test.go
deleted file mode 100644
index 59f4a30ed..000000000
--- a/Godeps/_workspace/src/github.com/boltdb/bolt/page_test.go
+++ /dev/null
@@ -1,72 +0,0 @@
-package bolt
-
-import (
-	"reflect"
-	"sort"
-	"testing"
-	"testing/quick"
-)
-
-// Ensure that the page type can be returned in human readable format.
-func TestPage_typ(t *testing.T) {
-	if typ := (&page{flags: branchPageFlag}).typ(); typ != "branch" {
-		t.Fatalf("exp=branch; got=%v", typ)
-	}
-	if typ := (&page{flags: leafPageFlag}).typ(); typ != "leaf" {
-		t.Fatalf("exp=leaf; got=%v", typ)
-	}
-	if typ := (&page{flags: metaPageFlag}).typ(); typ != "meta" {
-		t.Fatalf("exp=meta; got=%v", typ)
-	}
-	if typ := (&page{flags: freelistPageFlag}).typ(); typ != "freelist" {
-		t.Fatalf("exp=freelist; got=%v", typ)
-	}
-	if typ := (&page{flags: 20000}).typ(); typ != "unknown<4e20>" {
-		t.Fatalf("exp=unknown<4e20>; got=%v", typ)
-	}
-}
-
-// Ensure that the hexdump debugging function doesn't blow up.
-func TestPage_dump(t *testing.T) {
-	(&page{id: 256}).hexdump(16)
-}
-
-func TestPgids_merge(t *testing.T) {
-	a := pgids{4, 5, 6, 10, 11, 12, 13, 27}
-	b := pgids{1, 3, 8, 9, 25, 30}
-	c := a.merge(b)
-	if !reflect.DeepEqual(c, pgids{1, 3, 4, 5, 6, 8, 9, 10, 11, 12, 13, 25, 27, 30}) {
-		t.Errorf("mismatch: %v", c)
-	}
-
-	a = pgids{4, 5, 6, 10, 11, 12, 13, 27, 35, 36}
-	b = pgids{8, 9, 25, 30}
-	c = a.merge(b)
-	if !reflect.DeepEqual(c, pgids{4, 5, 6, 8, 9, 10, 11, 12, 13, 25, 27, 30, 35, 36}) {
-		t.Errorf("mismatch: %v", c)
-	}
-}
-
-func TestPgids_merge_quick(t *testing.T) {
-	if err := quick.Check(func(a, b pgids) bool {
-		// Sort incoming lists.
-		sort.Sort(a)
-		sort.Sort(b)
-
-		// Merge the two lists together.
-		got := a.merge(b)
-
-		// The expected value should be the two lists combined and sorted.
-		exp := append(a, b...)
-		sort.Sort(exp)
-
-		if !reflect.DeepEqual(exp, got) {
-			t.Errorf("\nexp=%+v\ngot=%+v\n", exp, got)
-			return false
-		}
-
-		return true
-	}, nil); err != nil {
-		t.Fatal(err)
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/boltdb/bolt/quick_test.go b/Godeps/_workspace/src/github.com/boltdb/bolt/quick_test.go
deleted file mode 100644
index 4da581775..000000000
--- a/Godeps/_workspace/src/github.com/boltdb/bolt/quick_test.go
+++ /dev/null
@@ -1,79 +0,0 @@
-package bolt_test
-
-import (
-	"bytes"
-	"flag"
-	"fmt"
-	"math/rand"
-	"os"
-	"reflect"
-	"testing/quick"
-	"time"
-)
-
-// testing/quick defaults to 5 iterations and a random seed.
-// You can override these settings from the command line:
-//
-//   -quick.count     The number of iterations to perform.
-//   -quick.seed      The seed to use for randomizing.
-//   -quick.maxitems  The maximum number of items to insert into a DB.
-//   -quick.maxksize  The maximum size of a key.
-//   -quick.maxvsize  The maximum size of a value.
-//
-
-var qcount, qseed, qmaxitems, qmaxksize, qmaxvsize int
-
-func init() {
-	flag.IntVar(&qcount, "quick.count", 5, "")
-	flag.IntVar(&qseed, "quick.seed", int(time.Now().UnixNano())%100000, "")
-	flag.IntVar(&qmaxitems, "quick.maxitems", 1000, "")
-	flag.IntVar(&qmaxksize, "quick.maxksize", 1024, "")
-	flag.IntVar(&qmaxvsize, "quick.maxvsize", 1024, "")
-	flag.Parse()
-	fmt.Fprintln(os.Stderr, "seed:", qseed)
-	fmt.Fprintf(os.Stderr, "quick settings: count=%v, items=%v, ksize=%v, vsize=%v\n", qcount, qmaxitems, qmaxksize, qmaxvsize)
-}
-
-func qconfig() *quick.Config {
-	return &quick.Config{
-		MaxCount: qcount,
-		Rand:     rand.New(rand.NewSource(int64(qseed))),
-	}
-}
-
-type testdata []testdataitem
-
-func (t testdata) Len() int           { return len(t) }
-func (t testdata) Swap(i, j int)      { t[i], t[j] = t[j], t[i] }
-func (t testdata) Less(i, j int) bool { return bytes.Compare(t[i].Key, t[j].Key) == -1 }
-
-func (t testdata) Generate(rand *rand.Rand, size int) reflect.Value {
-	n := rand.Intn(qmaxitems-1) + 1
-	items := make(testdata, n)
-	for i := 0; i < n; i++ {
-		item := &items[i]
-		item.Key = randByteSlice(rand, 1, qmaxksize)
-		item.Value = randByteSlice(rand, 0, qmaxvsize)
-	}
-	return reflect.ValueOf(items)
-}
-
-type revtestdata []testdataitem
-
-func (t revtestdata) Len() int           { return len(t) }
-func (t revtestdata) Swap(i, j int)      { t[i], t[j] = t[j], t[i] }
-func (t revtestdata) Less(i, j int) bool { return bytes.Compare(t[i].Key, t[j].Key) == 1 }
-
-type testdataitem struct {
-	Key   []byte
-	Value []byte
-}
-
-func randByteSlice(rand *rand.Rand, minSize, maxSize int) []byte {
-	n := rand.Intn(maxSize-minSize) + minSize
-	b := make([]byte, n)
-	for i := 0; i < n; i++ {
-		b[i] = byte(rand.Intn(255))
-	}
-	return b
-}
diff --git a/Godeps/_workspace/src/github.com/boltdb/bolt/simulation_test.go b/Godeps/_workspace/src/github.com/boltdb/bolt/simulation_test.go
deleted file mode 100644
index ceb8baef0..000000000
--- a/Godeps/_workspace/src/github.com/boltdb/bolt/simulation_test.go
+++ /dev/null
@@ -1,327 +0,0 @@
-package bolt_test
-
-import (
-	"bytes"
-	"fmt"
-	"math/rand"
-	"sync"
-	"testing"
-
-	"github.com/boltdb/bolt"
-)
-
-func TestSimulate_1op_1p(t *testing.T)     { testSimulate(t, 100, 1) }
-func TestSimulate_10op_1p(t *testing.T)    { testSimulate(t, 10, 1) }
-func TestSimulate_100op_1p(t *testing.T)   { testSimulate(t, 100, 1) }
-func TestSimulate_1000op_1p(t *testing.T)  { testSimulate(t, 1000, 1) }
-func TestSimulate_10000op_1p(t *testing.T) { testSimulate(t, 10000, 1) }
-
-func TestSimulate_10op_10p(t *testing.T)    { testSimulate(t, 10, 10) }
-func TestSimulate_100op_10p(t *testing.T)   { testSimulate(t, 100, 10) }
-func TestSimulate_1000op_10p(t *testing.T)  { testSimulate(t, 1000, 10) }
-func TestSimulate_10000op_10p(t *testing.T) { testSimulate(t, 10000, 10) }
-
-func TestSimulate_100op_100p(t *testing.T)   { testSimulate(t, 100, 100) }
-func TestSimulate_1000op_100p(t *testing.T)  { testSimulate(t, 1000, 100) }
-func TestSimulate_10000op_100p(t *testing.T) { testSimulate(t, 10000, 100) }
-
-func TestSimulate_10000op_1000p(t *testing.T) { testSimulate(t, 10000, 1000) }
-
-// Randomly generate operations on a given database with multiple clients to ensure consistency and thread safety.
-func testSimulate(t *testing.T, threadCount, parallelism int) {
-	if testing.Short() {
-		t.Skip("skipping test in short mode.")
-	}
-
-	rand.Seed(int64(qseed))
-
-	// A list of operations that readers and writers can perform.
-	var readerHandlers = []simulateHandler{simulateGetHandler}
-	var writerHandlers = []simulateHandler{simulateGetHandler, simulatePutHandler}
-
-	var versions = make(map[int]*QuickDB)
-	versions[1] = NewQuickDB()
-
-	db := NewTestDB()
-	defer db.Close()
-
-	var mutex sync.Mutex
-
-	// Run n threads in parallel, each with their own operation.
-	var wg sync.WaitGroup
-	var threads = make(chan bool, parallelism)
-	var i int
-	for {
-		threads <- true
-		wg.Add(1)
-		writable := ((rand.Int() % 100) < 20) // 20% writers
-
-		// Choose an operation to execute.
-		var handler simulateHandler
-		if writable {
-			handler = writerHandlers[rand.Intn(len(writerHandlers))]
-		} else {
-			handler = readerHandlers[rand.Intn(len(readerHandlers))]
-		}
-
-		// Execute a thread for the given operation.
-		go func(writable bool, handler simulateHandler) {
-			defer wg.Done()
-
-			// Start transaction.
-			tx, err := db.Begin(writable)
-			if err != nil {
-				t.Fatal("tx begin: ", err)
-			}
-
-			// Obtain current state of the dataset.
-			mutex.Lock()
-			var qdb = versions[tx.ID()]
-			if writable {
-				qdb = versions[tx.ID()-1].Copy()
-			}
-			mutex.Unlock()
-
-			// Make sure we commit/rollback the tx at the end and update the state.
-			if writable {
-				defer func() {
-					mutex.Lock()
-					versions[tx.ID()] = qdb
-					mutex.Unlock()
-
-					ok(t, tx.Commit())
-				}()
-			} else {
-				defer tx.Rollback()
-			}
-
-			// Ignore operation if we don't have data yet.
-			if qdb == nil {
-				return
-			}
-
-			// Execute handler.
-			handler(tx, qdb)
-
-			// Release a thread back to the scheduling loop.
-			<-threads
-		}(writable, handler)
-
-		i++
-		if i > threadCount {
-			break
-		}
-	}
-
-	// Wait until all threads are done.
-	wg.Wait()
-}
-
-type simulateHandler func(tx *bolt.Tx, qdb *QuickDB)
-
-// Retrieves a key from the database and verifies that it is what is expected.
-func simulateGetHandler(tx *bolt.Tx, qdb *QuickDB) {
-	// Randomly retrieve an existing exist.
-	keys := qdb.Rand()
-	if len(keys) == 0 {
-		return
-	}
-
-	// Retrieve root bucket.
-	b := tx.Bucket(keys[0])
-	if b == nil {
-		panic(fmt.Sprintf("bucket[0] expected: %08x\n", trunc(keys[0], 4)))
-	}
-
-	// Drill into nested buckets.
-	for _, key := range keys[1 : len(keys)-1] {
-		b = b.Bucket(key)
-		if b == nil {
-			panic(fmt.Sprintf("bucket[n] expected: %v -> %v\n", keys, key))
-		}
-	}
-
-	// Verify key/value on the final bucket.
-	expected := qdb.Get(keys)
-	actual := b.Get(keys[len(keys)-1])
-	if !bytes.Equal(actual, expected) {
-		fmt.Println("=== EXPECTED ===")
-		fmt.Println(expected)
-		fmt.Println("=== ACTUAL ===")
-		fmt.Println(actual)
-		fmt.Println("=== END ===")
-		panic("value mismatch")
-	}
-}
-
-// Inserts a key into the database.
-func simulatePutHandler(tx *bolt.Tx, qdb *QuickDB) {
-	var err error
-	keys, value := randKeys(), randValue()
-
-	// Retrieve root bucket.
-	b := tx.Bucket(keys[0])
-	if b == nil {
-		b, err = tx.CreateBucket(keys[0])
-		if err != nil {
-			panic("create bucket: " + err.Error())
-		}
-	}
-
-	// Create nested buckets, if necessary.
-	for _, key := range keys[1 : len(keys)-1] {
-		child := b.Bucket(key)
-		if child != nil {
-			b = child
-		} else {
-			b, err = b.CreateBucket(key)
-			if err != nil {
-				panic("create bucket: " + err.Error())
-			}
-		}
-	}
-
-	// Insert into database.
-	if err := b.Put(keys[len(keys)-1], value); err != nil {
-		panic("put: " + err.Error())
-	}
-
-	// Insert into in-memory database.
-	qdb.Put(keys, value)
-}
-
-// QuickDB is an in-memory database that replicates the functionality of the
-// Bolt DB type except that it is entirely in-memory. It is meant for testing
-// that the Bolt database is consistent.
-type QuickDB struct {
-	sync.RWMutex
-	m map[string]interface{}
-}
-
-// NewQuickDB returns an instance of QuickDB.
-func NewQuickDB() *QuickDB {
-	return &QuickDB{m: make(map[string]interface{})}
-}
-
-// Get retrieves the value at a key path.
-func (db *QuickDB) Get(keys [][]byte) []byte {
-	db.RLock()
-	defer db.RUnlock()
-
-	m := db.m
-	for _, key := range keys[:len(keys)-1] {
-		value := m[string(key)]
-		if value == nil {
-			return nil
-		}
-		switch value := value.(type) {
-		case map[string]interface{}:
-			m = value
-		case []byte:
-			return nil
-		}
-	}
-
-	// Only return if it's a simple value.
-	if value, ok := m[string(keys[len(keys)-1])].([]byte); ok {
-		return value
-	}
-	return nil
-}
-
-// Put inserts a value into a key path.
-func (db *QuickDB) Put(keys [][]byte, value []byte) {
-	db.Lock()
-	defer db.Unlock()
-
-	// Build buckets all the way down the key path.
-	m := db.m
-	for _, key := range keys[:len(keys)-1] {
-		if _, ok := m[string(key)].([]byte); ok {
-			return // Keypath intersects with a simple value. Do nothing.
-		}
-
-		if m[string(key)] == nil {
-			m[string(key)] = make(map[string]interface{})
-		}
-		m = m[string(key)].(map[string]interface{})
-	}
-
-	// Insert value into the last key.
-	m[string(keys[len(keys)-1])] = value
-}
-
-// Rand returns a random key path that points to a simple value.
-func (db *QuickDB) Rand() [][]byte {
-	db.RLock()
-	defer db.RUnlock()
-	if len(db.m) == 0 {
-		return nil
-	}
-	var keys [][]byte
-	db.rand(db.m, &keys)
-	return keys
-}
-
-func (db *QuickDB) rand(m map[string]interface{}, keys *[][]byte) {
-	i, index := 0, rand.Intn(len(m))
-	for k, v := range m {
-		if i == index {
-			*keys = append(*keys, []byte(k))
-			if v, ok := v.(map[string]interface{}); ok {
-				db.rand(v, keys)
-			}
-			return
-		}
-		i++
-	}
-	panic("quickdb rand: out-of-range")
-}
-
-// Copy copies the entire database.
-func (db *QuickDB) Copy() *QuickDB {
-	db.RLock()
-	defer db.RUnlock()
-	return &QuickDB{m: db.copy(db.m)}
-}
-
-func (db *QuickDB) copy(m map[string]interface{}) map[string]interface{} {
-	clone := make(map[string]interface{}, len(m))
-	for k, v := range m {
-		switch v := v.(type) {
-		case map[string]interface{}:
-			clone[k] = db.copy(v)
-		default:
-			clone[k] = v
-		}
-	}
-	return clone
-}
-
-func randKey() []byte {
-	var min, max = 1, 1024
-	n := rand.Intn(max-min) + min
-	b := make([]byte, n)
-	for i := 0; i < n; i++ {
-		b[i] = byte(rand.Intn(255))
-	}
-	return b
-}
-
-func randKeys() [][]byte {
-	var keys [][]byte
-	var count = rand.Intn(2) + 2
-	for i := 0; i < count; i++ {
-		keys = append(keys, randKey())
-	}
-	return keys
-}
-
-func randValue() []byte {
-	n := rand.Intn(8192)
-	b := make([]byte, n)
-	for i := 0; i < n; i++ {
-		b[i] = byte(rand.Intn(255))
-	}
-	return b
-}
diff --git a/Godeps/_workspace/src/github.com/boltdb/bolt/tx.go b/Godeps/_workspace/src/github.com/boltdb/bolt/tx.go
deleted file mode 100644
index 6b52b2c89..000000000
--- a/Godeps/_workspace/src/github.com/boltdb/bolt/tx.go
+++ /dev/null
@@ -1,611 +0,0 @@
-package bolt
-
-import (
-	"fmt"
-	"io"
-	"os"
-	"sort"
-	"time"
-	"unsafe"
-)
-
-// txid represents the internal transaction identifier.
-type txid uint64
-
-// Tx represents a read-only or read/write transaction on the database.
-// Read-only transactions can be used for retrieving values for keys and creating cursors.
-// Read/write transactions can create and remove buckets and create and remove keys.
-//
-// IMPORTANT: You must commit or rollback transactions when you are done with
-// them. Pages can not be reclaimed by the writer until no more transactions
-// are using them. A long running read transaction can cause the database to
-// quickly grow.
-type Tx struct {
-	writable       bool
-	managed        bool
-	db             *DB
-	meta           *meta
-	root           Bucket
-	pages          map[pgid]*page
-	stats          TxStats
-	commitHandlers []func()
-}
-
-// init initializes the transaction.
-func (tx *Tx) init(db *DB) {
-	tx.db = db
-	tx.pages = nil
-
-	// Copy the meta page since it can be changed by the writer.
-	tx.meta = &meta{}
-	db.meta().copy(tx.meta)
-
-	// Copy over the root bucket.
-	tx.root = newBucket(tx)
-	tx.root.bucket = &bucket{}
-	*tx.root.bucket = tx.meta.root
-
-	// Increment the transaction id and add a page cache for writable transactions.
-	if tx.writable {
-		tx.pages = make(map[pgid]*page)
-		tx.meta.txid += txid(1)
-	}
-}
-
-// ID returns the transaction id.
-func (tx *Tx) ID() int {
-	return int(tx.meta.txid)
-}
-
-// DB returns a reference to the database that created the transaction.
-func (tx *Tx) DB() *DB {
-	return tx.db
-}
-
-// Size returns current database size in bytes as seen by this transaction.
-func (tx *Tx) Size() int64 {
-	return int64(tx.meta.pgid) * int64(tx.db.pageSize)
-}
-
-// Writable returns whether the transaction can perform write operations.
-func (tx *Tx) Writable() bool {
-	return tx.writable
-}
-
-// Cursor creates a cursor associated with the root bucket.
-// All items in the cursor will return a nil value because all root bucket keys point to buckets.
-// The cursor is only valid as long as the transaction is open.
-// Do not use a cursor after the transaction is closed.
-func (tx *Tx) Cursor() *Cursor {
-	return tx.root.Cursor()
-}
-
-// Stats retrieves a copy of the current transaction statistics.
-func (tx *Tx) Stats() TxStats {
-	return tx.stats
-}
-
-// Bucket retrieves a bucket by name.
-// Returns nil if the bucket does not exist.
-func (tx *Tx) Bucket(name []byte) *Bucket {
-	return tx.root.Bucket(name)
-}
-
-// CreateBucket creates a new bucket.
-// Returns an error if the bucket already exists, if the bucket name is blank, or if the bucket name is too long.
-func (tx *Tx) CreateBucket(name []byte) (*Bucket, error) {
-	return tx.root.CreateBucket(name)
-}
-
-// CreateBucketIfNotExists creates a new bucket if it doesn't already exist.
-// Returns an error if the bucket name is blank, or if the bucket name is too long.
-func (tx *Tx) CreateBucketIfNotExists(name []byte) (*Bucket, error) {
-	return tx.root.CreateBucketIfNotExists(name)
-}
-
-// DeleteBucket deletes a bucket.
-// Returns an error if the bucket cannot be found or if the key represents a non-bucket value.
-func (tx *Tx) DeleteBucket(name []byte) error {
-	return tx.root.DeleteBucket(name)
-}
-
-// ForEach executes a function for each bucket in the root.
-// If the provided function returns an error then the iteration is stopped and
-// the error is returned to the caller.
-func (tx *Tx) ForEach(fn func(name []byte, b *Bucket) error) error {
-	return tx.root.ForEach(func(k, v []byte) error {
-		if err := fn(k, tx.root.Bucket(k)); err != nil {
-			return err
-		}
-		return nil
-	})
-}
-
-// OnCommit adds a handler function to be executed after the transaction successfully commits.
-func (tx *Tx) OnCommit(fn func()) {
-	tx.commitHandlers = append(tx.commitHandlers, fn)
-}
-
-// Commit writes all changes to disk and updates the meta page.
-// Returns an error if a disk write error occurs, or if Commit is
-// called on a read-only transaction.
-func (tx *Tx) Commit() error {
-	_assert(!tx.managed, "managed tx commit not allowed")
-	if tx.db == nil {
-		return ErrTxClosed
-	} else if !tx.writable {
-		return ErrTxNotWritable
-	}
-
-	// TODO(benbjohnson): Use vectorized I/O to write out dirty pages.
-
-	// Rebalance nodes which have had deletions.
-	var startTime = time.Now()
-	tx.root.rebalance()
-	if tx.stats.Rebalance > 0 {
-		tx.stats.RebalanceTime += time.Since(startTime)
-	}
-
-	// spill data onto dirty pages.
-	startTime = time.Now()
-	if err := tx.root.spill(); err != nil {
-		tx.rollback()
-		return err
-	}
-	tx.stats.SpillTime += time.Since(startTime)
-
-	// Free the old root bucket.
-	tx.meta.root.root = tx.root.root
-
-	// Free the freelist and allocate new pages for it. This will overestimate
-	// the size of the freelist but not underestimate the size (which would be bad).
-	tx.db.freelist.free(tx.meta.txid, tx.db.page(tx.meta.freelist))
-	p, err := tx.allocate((tx.db.freelist.size() / tx.db.pageSize) + 1)
-	if err != nil {
-		tx.rollback()
-		return err
-	}
-	if err := tx.db.freelist.write(p); err != nil {
-		tx.rollback()
-		return err
-	}
-	tx.meta.freelist = p.id
-
-	// Write dirty pages to disk.
-	startTime = time.Now()
-	if err := tx.write(); err != nil {
-		tx.rollback()
-		return err
-	}
-
-	// If strict mode is enabled then perform a consistency check.
-	// Only the first consistency error is reported in the panic.
-	if tx.db.StrictMode {
-		if err, ok := <-tx.Check(); ok {
-			panic("check fail: " + err.Error())
-		}
-	}
-
-	// Write meta to disk.
-	if err := tx.writeMeta(); err != nil {
-		tx.rollback()
-		return err
-	}
-	tx.stats.WriteTime += time.Since(startTime)
-
-	// Finalize the transaction.
-	tx.close()
-
-	// Execute commit handlers now that the locks have been removed.
-	for _, fn := range tx.commitHandlers {
-		fn()
-	}
-
-	return nil
-}
-
-// Rollback closes the transaction and ignores all previous updates. Read-only
-// transactions must be rolled back and not committed.
-func (tx *Tx) Rollback() error {
-	_assert(!tx.managed, "managed tx rollback not allowed")
-	if tx.db == nil {
-		return ErrTxClosed
-	}
-	tx.rollback()
-	return nil
-}
-
-func (tx *Tx) rollback() {
-	if tx.db == nil {
-		return
-	}
-	if tx.writable {
-		tx.db.freelist.rollback(tx.meta.txid)
-		tx.db.freelist.reload(tx.db.page(tx.db.meta().freelist))
-	}
-	tx.close()
-}
-
-func (tx *Tx) close() {
-	if tx.db == nil {
-		return
-	}
-	if tx.writable {
-		// Grab freelist stats.
-		var freelistFreeN = tx.db.freelist.free_count()
-		var freelistPendingN = tx.db.freelist.pending_count()
-		var freelistAlloc = tx.db.freelist.size()
-
-		// Remove writer lock.
-		tx.db.rwlock.Unlock()
-
-		// Merge statistics.
-		tx.db.statlock.Lock()
-		tx.db.stats.FreePageN = freelistFreeN
-		tx.db.stats.PendingPageN = freelistPendingN
-		tx.db.stats.FreeAlloc = (freelistFreeN + freelistPendingN) * tx.db.pageSize
-		tx.db.stats.FreelistInuse = freelistAlloc
-		tx.db.stats.TxStats.add(&tx.stats)
-		tx.db.statlock.Unlock()
-	} else {
-		tx.db.removeTx(tx)
-	}
-	tx.db = nil
-}
-
-// Copy writes the entire database to a writer.
-// This function exists for backwards compatibility. Use WriteTo() in
-func (tx *Tx) Copy(w io.Writer) error {
-	_, err := tx.WriteTo(w)
-	return err
-}
-
-// WriteTo writes the entire database to a writer.
-// If err == nil then exactly tx.Size() bytes will be written into the writer.
-func (tx *Tx) WriteTo(w io.Writer) (n int64, err error) {
-	// Attempt to open reader directly.
-	var f *os.File
-	if f, err = os.OpenFile(tx.db.path, os.O_RDONLY|odirect, 0); err != nil {
-		// Fallback to a regular open if that doesn't work.
-		if f, err = os.OpenFile(tx.db.path, os.O_RDONLY, 0); err != nil {
-			return 0, err
-		}
-	}
-
-	// Copy the meta pages.
-	tx.db.metalock.Lock()
-	n, err = io.CopyN(w, f, int64(tx.db.pageSize*2))
-	tx.db.metalock.Unlock()
-	if err != nil {
-		_ = f.Close()
-		return n, fmt.Errorf("meta copy: %s", err)
-	}
-
-	// Copy data pages.
-	wn, err := io.CopyN(w, f, tx.Size()-int64(tx.db.pageSize*2))
-	n += wn
-	if err != nil {
-		_ = f.Close()
-		return n, err
-	}
-
-	return n, f.Close()
-}
-
-// CopyFile copies the entire database to file at the given path.
-// A reader transaction is maintained during the copy so it is safe to continue
-// using the database while a copy is in progress.
-func (tx *Tx) CopyFile(path string, mode os.FileMode) error {
-	f, err := os.OpenFile(path, os.O_RDWR|os.O_CREATE|os.O_TRUNC, mode)
-	if err != nil {
-		return err
-	}
-
-	err = tx.Copy(f)
-	if err != nil {
-		_ = f.Close()
-		return err
-	}
-	return f.Close()
-}
-
-// Check performs several consistency checks on the database for this transaction.
-// An error is returned if any inconsistency is found.
-//
-// It can be safely run concurrently on a writable transaction. However, this
-// incurs a high cost for large databases and databases with a lot of subbuckets
-// because of caching. This overhead can be removed if running on a read-only
-// transaction, however, it is not safe to execute other writer transactions at
-// the same time.
-func (tx *Tx) Check() <-chan error {
-	ch := make(chan error)
-	go tx.check(ch)
-	return ch
-}
-
-func (tx *Tx) check(ch chan error) {
-	// Check if any pages are double freed.
-	freed := make(map[pgid]bool)
-	for _, id := range tx.db.freelist.all() {
-		if freed[id] {
-			ch <- fmt.Errorf("page %d: already freed", id)
-		}
-		freed[id] = true
-	}
-
-	// Track every reachable page.
-	reachable := make(map[pgid]*page)
-	reachable[0] = tx.page(0) // meta0
-	reachable[1] = tx.page(1) // meta1
-	for i := uint32(0); i <= tx.page(tx.meta.freelist).overflow; i++ {
-		reachable[tx.meta.freelist+pgid(i)] = tx.page(tx.meta.freelist)
-	}
-
-	// Recursively check buckets.
-	tx.checkBucket(&tx.root, reachable, freed, ch)
-
-	// Ensure all pages below high water mark are either reachable or freed.
-	for i := pgid(0); i < tx.meta.pgid; i++ {
-		_, isReachable := reachable[i]
-		if !isReachable && !freed[i] {
-			ch <- fmt.Errorf("page %d: unreachable unfreed", int(i))
-		}
-	}
-
-	// Close the channel to signal completion.
-	close(ch)
-}
-
-func (tx *Tx) checkBucket(b *Bucket, reachable map[pgid]*page, freed map[pgid]bool, ch chan error) {
-	// Ignore inline buckets.
-	if b.root == 0 {
-		return
-	}
-
-	// Check every page used by this bucket.
-	b.tx.forEachPage(b.root, 0, func(p *page, _ int) {
-		if p.id > tx.meta.pgid {
-			ch <- fmt.Errorf("page %d: out of bounds: %d", int(p.id), int(b.tx.meta.pgid))
-		}
-
-		// Ensure each page is only referenced once.
-		for i := pgid(0); i <= pgid(p.overflow); i++ {
-			var id = p.id + i
-			if _, ok := reachable[id]; ok {
-				ch <- fmt.Errorf("page %d: multiple references", int(id))
-			}
-			reachable[id] = p
-		}
-
-		// We should only encounter un-freed leaf and branch pages.
-		if freed[p.id] {
-			ch <- fmt.Errorf("page %d: reachable freed", int(p.id))
-		} else if (p.flags&branchPageFlag) == 0 && (p.flags&leafPageFlag) == 0 {
-			ch <- fmt.Errorf("page %d: invalid type: %s", int(p.id), p.typ())
-		}
-	})
-
-	// Check each bucket within this bucket.
-	_ = b.ForEach(func(k, v []byte) error {
-		if child := b.Bucket(k); child != nil {
-			tx.checkBucket(child, reachable, freed, ch)
-		}
-		return nil
-	})
-}
-
-// allocate returns a contiguous block of memory starting at a given page.
-func (tx *Tx) allocate(count int) (*page, error) {
-	p, err := tx.db.allocate(count)
-	if err != nil {
-		return nil, err
-	}
-
-	// Save to our page cache.
-	tx.pages[p.id] = p
-
-	// Update statistics.
-	tx.stats.PageCount++
-	tx.stats.PageAlloc += count * tx.db.pageSize
-
-	return p, nil
-}
-
-// write writes any dirty pages to disk.
-func (tx *Tx) write() error {
-	// Sort pages by id.
-	pages := make(pages, 0, len(tx.pages))
-	for _, p := range tx.pages {
-		pages = append(pages, p)
-	}
-	sort.Sort(pages)
-
-	// Write pages to disk in order.
-	for _, p := range pages {
-		size := (int(p.overflow) + 1) * tx.db.pageSize
-		offset := int64(p.id) * int64(tx.db.pageSize)
-
-		// Write out page in "max allocation" sized chunks.
-		ptr := (*[maxAllocSize]byte)(unsafe.Pointer(p))
-		for {
-			// Limit our write to our max allocation size.
-			sz := size
-			if sz > maxAllocSize-1 {
-				sz = maxAllocSize - 1
-			}
-
-			// Write chunk to disk.
-			buf := ptr[:sz]
-			if _, err := tx.db.ops.writeAt(buf, offset); err != nil {
-				return err
-			}
-
-			// Update statistics.
-			tx.stats.Write++
-
-			// Exit inner for loop if we've written all the chunks.
-			size -= sz
-			if size == 0 {
-				break
-			}
-
-			// Otherwise move offset forward and move pointer to next chunk.
-			offset += int64(sz)
-			ptr = (*[maxAllocSize]byte)(unsafe.Pointer(&ptr[sz]))
-		}
-	}
-
-	// Ignore file sync if flag is set on DB.
-	if !tx.db.NoSync || IgnoreNoSync {
-		if err := fdatasync(tx.db); err != nil {
-			return err
-		}
-	}
-
-	// Clear out page cache.
-	tx.pages = make(map[pgid]*page)
-
-	return nil
-}
-
-// writeMeta writes the meta to the disk.
-func (tx *Tx) writeMeta() error {
-	// Create a temporary buffer for the meta page.
-	buf := make([]byte, tx.db.pageSize)
-	p := tx.db.pageInBuffer(buf, 0)
-	tx.meta.write(p)
-
-	// Write the meta page to file.
-	if _, err := tx.db.ops.writeAt(buf, int64(p.id)*int64(tx.db.pageSize)); err != nil {
-		return err
-	}
-	if !tx.db.NoSync || IgnoreNoSync {
-		if err := fdatasync(tx.db); err != nil {
-			return err
-		}
-	}
-
-	// Update statistics.
-	tx.stats.Write++
-
-	return nil
-}
-
-// page returns a reference to the page with a given id.
-// If page has been written to then a temporary bufferred page is returned.
-func (tx *Tx) page(id pgid) *page {
-	// Check the dirty pages first.
-	if tx.pages != nil {
-		if p, ok := tx.pages[id]; ok {
-			return p
-		}
-	}
-
-	// Otherwise return directly from the mmap.
-	return tx.db.page(id)
-}
-
-// forEachPage iterates over every page within a given page and executes a function.
-func (tx *Tx) forEachPage(pgid pgid, depth int, fn func(*page, int)) {
-	p := tx.page(pgid)
-
-	// Execute function.
-	fn(p, depth)
-
-	// Recursively loop over children.
-	if (p.flags & branchPageFlag) != 0 {
-		for i := 0; i < int(p.count); i++ {
-			elem := p.branchPageElement(uint16(i))
-			tx.forEachPage(elem.pgid, depth+1, fn)
-		}
-	}
-}
-
-// Page returns page information for a given page number.
-// This is only safe for concurrent use when used by a writable transaction.
-func (tx *Tx) Page(id int) (*PageInfo, error) {
-	if tx.db == nil {
-		return nil, ErrTxClosed
-	} else if pgid(id) >= tx.meta.pgid {
-		return nil, nil
-	}
-
-	// Build the page info.
-	p := tx.db.page(pgid(id))
-	info := &PageInfo{
-		ID:            id,
-		Count:         int(p.count),
-		OverflowCount: int(p.overflow),
-	}
-
-	// Determine the type (or if it's free).
-	if tx.db.freelist.freed(pgid(id)) {
-		info.Type = "free"
-	} else {
-		info.Type = p.typ()
-	}
-
-	return info, nil
-}
-
-// TxStats represents statistics about the actions performed by the transaction.
-type TxStats struct {
-	// Page statistics.
-	PageCount int // number of page allocations
-	PageAlloc int // total bytes allocated
-
-	// Cursor statistics.
-	CursorCount int // number of cursors created
-
-	// Node statistics
-	NodeCount int // number of node allocations
-	NodeDeref int // number of node dereferences
-
-	// Rebalance statistics.
-	Rebalance     int           // number of node rebalances
-	RebalanceTime time.Duration // total time spent rebalancing
-
-	// Split/Spill statistics.
-	Split     int           // number of nodes split
-	Spill     int           // number of nodes spilled
-	SpillTime time.Duration // total time spent spilling
-
-	// Write statistics.
-	Write     int           // number of writes performed
-	WriteTime time.Duration // total time spent writing to disk
-}
-
-func (s *TxStats) add(other *TxStats) {
-	s.PageCount += other.PageCount
-	s.PageAlloc += other.PageAlloc
-	s.CursorCount += other.CursorCount
-	s.NodeCount += other.NodeCount
-	s.NodeDeref += other.NodeDeref
-	s.Rebalance += other.Rebalance
-	s.RebalanceTime += other.RebalanceTime
-	s.Split += other.Split
-	s.Spill += other.Spill
-	s.SpillTime += other.SpillTime
-	s.Write += other.Write
-	s.WriteTime += other.WriteTime
-}
-
-// Sub calculates and returns the difference between two sets of transaction stats.
-// This is useful when obtaining stats at two different points and time and
-// you need the performance counters that occurred within that time span.
-func (s *TxStats) Sub(other *TxStats) TxStats {
-	var diff TxStats
-	diff.PageCount = s.PageCount - other.PageCount
-	diff.PageAlloc = s.PageAlloc - other.PageAlloc
-	diff.CursorCount = s.CursorCount - other.CursorCount
-	diff.NodeCount = s.NodeCount - other.NodeCount
-	diff.NodeDeref = s.NodeDeref - other.NodeDeref
-	diff.Rebalance = s.Rebalance - other.Rebalance
-	diff.RebalanceTime = s.RebalanceTime - other.RebalanceTime
-	diff.Split = s.Split - other.Split
-	diff.Spill = s.Spill - other.Spill
-	diff.SpillTime = s.SpillTime - other.SpillTime
-	diff.Write = s.Write - other.Write
-	diff.WriteTime = s.WriteTime - other.WriteTime
-	return diff
-}
diff --git a/Godeps/_workspace/src/github.com/boltdb/bolt/tx_test.go b/Godeps/_workspace/src/github.com/boltdb/bolt/tx_test.go
deleted file mode 100644
index 6c8271a60..000000000
--- a/Godeps/_workspace/src/github.com/boltdb/bolt/tx_test.go
+++ /dev/null
@@ -1,456 +0,0 @@
-package bolt_test
-
-import (
-	"errors"
-	"fmt"
-	"os"
-	"testing"
-
-	"github.com/boltdb/bolt"
-)
-
-// Ensure that committing a closed transaction returns an error.
-func TestTx_Commit_Closed(t *testing.T) {
-	db := NewTestDB()
-	defer db.Close()
-	tx, _ := db.Begin(true)
-	tx.CreateBucket([]byte("foo"))
-	ok(t, tx.Commit())
-	equals(t, tx.Commit(), bolt.ErrTxClosed)
-}
-
-// Ensure that rolling back a closed transaction returns an error.
-func TestTx_Rollback_Closed(t *testing.T) {
-	db := NewTestDB()
-	defer db.Close()
-	tx, _ := db.Begin(true)
-	ok(t, tx.Rollback())
-	equals(t, tx.Rollback(), bolt.ErrTxClosed)
-}
-
-// Ensure that committing a read-only transaction returns an error.
-func TestTx_Commit_ReadOnly(t *testing.T) {
-	db := NewTestDB()
-	defer db.Close()
-	tx, _ := db.Begin(false)
-	equals(t, tx.Commit(), bolt.ErrTxNotWritable)
-}
-
-// Ensure that a transaction can retrieve a cursor on the root bucket.
-func TestTx_Cursor(t *testing.T) {
-	db := NewTestDB()
-	defer db.Close()
-	db.Update(func(tx *bolt.Tx) error {
-		tx.CreateBucket([]byte("widgets"))
-		tx.CreateBucket([]byte("woojits"))
-		c := tx.Cursor()
-
-		k, v := c.First()
-		equals(t, "widgets", string(k))
-		assert(t, v == nil, "")
-
-		k, v = c.Next()
-		equals(t, "woojits", string(k))
-		assert(t, v == nil, "")
-
-		k, v = c.Next()
-		assert(t, k == nil, "")
-		assert(t, v == nil, "")
-
-		return nil
-	})
-}
-
-// Ensure that creating a bucket with a read-only transaction returns an error.
-func TestTx_CreateBucket_ReadOnly(t *testing.T) {
-	db := NewTestDB()
-	defer db.Close()
-	db.View(func(tx *bolt.Tx) error {
-		b, err := tx.CreateBucket([]byte("foo"))
-		assert(t, b == nil, "")
-		equals(t, bolt.ErrTxNotWritable, err)
-		return nil
-	})
-}
-
-// Ensure that creating a bucket on a closed transaction returns an error.
-func TestTx_CreateBucket_Closed(t *testing.T) {
-	db := NewTestDB()
-	defer db.Close()
-	tx, _ := db.Begin(true)
-	tx.Commit()
-	b, err := tx.CreateBucket([]byte("foo"))
-	assert(t, b == nil, "")
-	equals(t, bolt.ErrTxClosed, err)
-}
-
-// Ensure that a Tx can retrieve a bucket.
-func TestTx_Bucket(t *testing.T) {
-	db := NewTestDB()
-	defer db.Close()
-	db.Update(func(tx *bolt.Tx) error {
-		tx.CreateBucket([]byte("widgets"))
-		b := tx.Bucket([]byte("widgets"))
-		assert(t, b != nil, "")
-		return nil
-	})
-}
-
-// Ensure that a Tx retrieving a non-existent key returns nil.
-func TestTx_Get_Missing(t *testing.T) {
-	db := NewTestDB()
-	defer db.Close()
-	db.Update(func(tx *bolt.Tx) error {
-		tx.CreateBucket([]byte("widgets"))
-		tx.Bucket([]byte("widgets")).Put([]byte("foo"), []byte("bar"))
-		value := tx.Bucket([]byte("widgets")).Get([]byte("no_such_key"))
-		assert(t, value == nil, "")
-		return nil
-	})
-}
-
-// Ensure that a bucket can be created and retrieved.
-func TestTx_CreateBucket(t *testing.T) {
-	db := NewTestDB()
-	defer db.Close()
-
-	// Create a bucket.
-	db.Update(func(tx *bolt.Tx) error {
-		b, err := tx.CreateBucket([]byte("widgets"))
-		assert(t, b != nil, "")
-		ok(t, err)
-		return nil
-	})
-
-	// Read the bucket through a separate transaction.
-	db.View(func(tx *bolt.Tx) error {
-		b := tx.Bucket([]byte("widgets"))
-		assert(t, b != nil, "")
-		return nil
-	})
-}
-
-// Ensure that a bucket can be created if it doesn't already exist.
-func TestTx_CreateBucketIfNotExists(t *testing.T) {
-	db := NewTestDB()
-	defer db.Close()
-	db.Update(func(tx *bolt.Tx) error {
-		b, err := tx.CreateBucketIfNotExists([]byte("widgets"))
-		assert(t, b != nil, "")
-		ok(t, err)
-
-		b, err = tx.CreateBucketIfNotExists([]byte("widgets"))
-		assert(t, b != nil, "")
-		ok(t, err)
-
-		b, err = tx.CreateBucketIfNotExists([]byte{})
-		assert(t, b == nil, "")
-		equals(t, bolt.ErrBucketNameRequired, err)
-
-		b, err = tx.CreateBucketIfNotExists(nil)
-		assert(t, b == nil, "")
-		equals(t, bolt.ErrBucketNameRequired, err)
-		return nil
-	})
-
-	// Read the bucket through a separate transaction.
-	db.View(func(tx *bolt.Tx) error {
-		b := tx.Bucket([]byte("widgets"))
-		assert(t, b != nil, "")
-		return nil
-	})
-}
-
-// Ensure that a bucket cannot be created twice.
-func TestTx_CreateBucket_Exists(t *testing.T) {
-	db := NewTestDB()
-	defer db.Close()
-	// Create a bucket.
-	db.Update(func(tx *bolt.Tx) error {
-		b, err := tx.CreateBucket([]byte("widgets"))
-		assert(t, b != nil, "")
-		ok(t, err)
-		return nil
-	})
-
-	// Create the same bucket again.
-	db.Update(func(tx *bolt.Tx) error {
-		b, err := tx.CreateBucket([]byte("widgets"))
-		assert(t, b == nil, "")
-		equals(t, bolt.ErrBucketExists, err)
-		return nil
-	})
-}
-
-// Ensure that a bucket is created with a non-blank name.
-func TestTx_CreateBucket_NameRequired(t *testing.T) {
-	db := NewTestDB()
-	defer db.Close()
-	db.Update(func(tx *bolt.Tx) error {
-		b, err := tx.CreateBucket(nil)
-		assert(t, b == nil, "")
-		equals(t, bolt.ErrBucketNameRequired, err)
-		return nil
-	})
-}
-
-// Ensure that a bucket can be deleted.
-func TestTx_DeleteBucket(t *testing.T) {
-	db := NewTestDB()
-	defer db.Close()
-
-	// Create a bucket and add a value.
-	db.Update(func(tx *bolt.Tx) error {
-		tx.CreateBucket([]byte("widgets"))
-		tx.Bucket([]byte("widgets")).Put([]byte("foo"), []byte("bar"))
-		return nil
-	})
-
-	// Delete the bucket and make sure we can't get the value.
-	db.Update(func(tx *bolt.Tx) error {
-		ok(t, tx.DeleteBucket([]byte("widgets")))
-		assert(t, tx.Bucket([]byte("widgets")) == nil, "")
-		return nil
-	})
-
-	db.Update(func(tx *bolt.Tx) error {
-		// Create the bucket again and make sure there's not a phantom value.
-		b, err := tx.CreateBucket([]byte("widgets"))
-		assert(t, b != nil, "")
-		ok(t, err)
-		assert(t, tx.Bucket([]byte("widgets")).Get([]byte("foo")) == nil, "")
-		return nil
-	})
-}
-
-// Ensure that deleting a bucket on a closed transaction returns an error.
-func TestTx_DeleteBucket_Closed(t *testing.T) {
-	db := NewTestDB()
-	defer db.Close()
-	tx, _ := db.Begin(true)
-	tx.Commit()
-	equals(t, tx.DeleteBucket([]byte("foo")), bolt.ErrTxClosed)
-}
-
-// Ensure that deleting a bucket with a read-only transaction returns an error.
-func TestTx_DeleteBucket_ReadOnly(t *testing.T) {
-	db := NewTestDB()
-	defer db.Close()
-	db.View(func(tx *bolt.Tx) error {
-		equals(t, tx.DeleteBucket([]byte("foo")), bolt.ErrTxNotWritable)
-		return nil
-	})
-}
-
-// Ensure that nothing happens when deleting a bucket that doesn't exist.
-func TestTx_DeleteBucket_NotFound(t *testing.T) {
-	db := NewTestDB()
-	defer db.Close()
-	db.Update(func(tx *bolt.Tx) error {
-		equals(t, bolt.ErrBucketNotFound, tx.DeleteBucket([]byte("widgets")))
-		return nil
-	})
-}
-
-// Ensure that no error is returned when a tx.ForEach function does not return
-// an error.
-func TestTx_ForEach_NoError(t *testing.T) {
-	db := NewTestDB()
-	defer db.Close()
-	db.Update(func(tx *bolt.Tx) error {
-		tx.CreateBucket([]byte("widgets"))
-		tx.Bucket([]byte("widgets")).Put([]byte("foo"), []byte("bar"))
-
-		equals(t, nil, tx.ForEach(func(name []byte, b *bolt.Bucket) error {
-			return nil
-		}))
-		return nil
-	})
-}
-
-// Ensure that an error is returned when a tx.ForEach function returns an error.
-func TestTx_ForEach_WithError(t *testing.T) {
-	db := NewTestDB()
-	defer db.Close()
-	db.Update(func(tx *bolt.Tx) error {
-		tx.CreateBucket([]byte("widgets"))
-		tx.Bucket([]byte("widgets")).Put([]byte("foo"), []byte("bar"))
-
-		err := errors.New("foo")
-		equals(t, err, tx.ForEach(func(name []byte, b *bolt.Bucket) error {
-			return err
-		}))
-		return nil
-	})
-}
-
-// Ensure that Tx commit handlers are called after a transaction successfully commits.
-func TestTx_OnCommit(t *testing.T) {
-	var x int
-	db := NewTestDB()
-	defer db.Close()
-	db.Update(func(tx *bolt.Tx) error {
-		tx.OnCommit(func() { x += 1 })
-		tx.OnCommit(func() { x += 2 })
-		_, err := tx.CreateBucket([]byte("widgets"))
-		return err
-	})
-	equals(t, 3, x)
-}
-
-// Ensure that Tx commit handlers are NOT called after a transaction rolls back.
-func TestTx_OnCommit_Rollback(t *testing.T) {
-	var x int
-	db := NewTestDB()
-	defer db.Close()
-	db.Update(func(tx *bolt.Tx) error {
-		tx.OnCommit(func() { x += 1 })
-		tx.OnCommit(func() { x += 2 })
-		tx.CreateBucket([]byte("widgets"))
-		return errors.New("rollback this commit")
-	})
-	equals(t, 0, x)
-}
-
-// Ensure that the database can be copied to a file path.
-func TestTx_CopyFile(t *testing.T) {
-	db := NewTestDB()
-	defer db.Close()
-	var dest = tempfile()
-	db.Update(func(tx *bolt.Tx) error {
-		tx.CreateBucket([]byte("widgets"))
-		tx.Bucket([]byte("widgets")).Put([]byte("foo"), []byte("bar"))
-		tx.Bucket([]byte("widgets")).Put([]byte("baz"), []byte("bat"))
-		return nil
-	})
-
-	ok(t, db.View(func(tx *bolt.Tx) error { return tx.CopyFile(dest, 0600) }))
-
-	db2, err := bolt.Open(dest, 0600, nil)
-	ok(t, err)
-	defer db2.Close()
-
-	db2.View(func(tx *bolt.Tx) error {
-		equals(t, []byte("bar"), tx.Bucket([]byte("widgets")).Get([]byte("foo")))
-		equals(t, []byte("bat"), tx.Bucket([]byte("widgets")).Get([]byte("baz")))
-		return nil
-	})
-}
-
-type failWriterError struct{}
-
-func (failWriterError) Error() string {
-	return "error injected for tests"
-}
-
-type failWriter struct {
-	// fail after this many bytes
-	After int
-}
-
-func (f *failWriter) Write(p []byte) (n int, err error) {
-	n = len(p)
-	if n > f.After {
-		n = f.After
-		err = failWriterError{}
-	}
-	f.After -= n
-	return n, err
-}
-
-// Ensure that Copy handles write errors right.
-func TestTx_CopyFile_Error_Meta(t *testing.T) {
-	db := NewTestDB()
-	defer db.Close()
-	db.Update(func(tx *bolt.Tx) error {
-		tx.CreateBucket([]byte("widgets"))
-		tx.Bucket([]byte("widgets")).Put([]byte("foo"), []byte("bar"))
-		tx.Bucket([]byte("widgets")).Put([]byte("baz"), []byte("bat"))
-		return nil
-	})
-
-	err := db.View(func(tx *bolt.Tx) error { return tx.Copy(&failWriter{}) })
-	equals(t, err.Error(), "meta copy: error injected for tests")
-}
-
-// Ensure that Copy handles write errors right.
-func TestTx_CopyFile_Error_Normal(t *testing.T) {
-	db := NewTestDB()
-	defer db.Close()
-	db.Update(func(tx *bolt.Tx) error {
-		tx.CreateBucket([]byte("widgets"))
-		tx.Bucket([]byte("widgets")).Put([]byte("foo"), []byte("bar"))
-		tx.Bucket([]byte("widgets")).Put([]byte("baz"), []byte("bat"))
-		return nil
-	})
-
-	err := db.View(func(tx *bolt.Tx) error { return tx.Copy(&failWriter{3 * db.Info().PageSize}) })
-	equals(t, err.Error(), "error injected for tests")
-}
-
-func ExampleTx_Rollback() {
-	// Open the database.
-	db, _ := bolt.Open(tempfile(), 0666, nil)
-	defer os.Remove(db.Path())
-	defer db.Close()
-
-	// Create a bucket.
-	db.Update(func(tx *bolt.Tx) error {
-		_, err := tx.CreateBucket([]byte("widgets"))
-		return err
-	})
-
-	// Set a value for a key.
-	db.Update(func(tx *bolt.Tx) error {
-		return tx.Bucket([]byte("widgets")).Put([]byte("foo"), []byte("bar"))
-	})
-
-	// Update the key but rollback the transaction so it never saves.
-	tx, _ := db.Begin(true)
-	b := tx.Bucket([]byte("widgets"))
-	b.Put([]byte("foo"), []byte("baz"))
-	tx.Rollback()
-
-	// Ensure that our original value is still set.
-	db.View(func(tx *bolt.Tx) error {
-		value := tx.Bucket([]byte("widgets")).Get([]byte("foo"))
-		fmt.Printf("The value for 'foo' is still: %s\n", value)
-		return nil
-	})
-
-	// Output:
-	// The value for 'foo' is still: bar
-}
-
-func ExampleTx_CopyFile() {
-	// Open the database.
-	db, _ := bolt.Open(tempfile(), 0666, nil)
-	defer os.Remove(db.Path())
-	defer db.Close()
-
-	// Create a bucket and a key.
-	db.Update(func(tx *bolt.Tx) error {
-		tx.CreateBucket([]byte("widgets"))
-		tx.Bucket([]byte("widgets")).Put([]byte("foo"), []byte("bar"))
-		return nil
-	})
-
-	// Copy the database to another file.
-	toFile := tempfile()
-	db.View(func(tx *bolt.Tx) error { return tx.CopyFile(toFile, 0666) })
-	defer os.Remove(toFile)
-
-	// Open the cloned database.
-	db2, _ := bolt.Open(toFile, 0666, nil)
-	defer db2.Close()
-
-	// Ensure that the key exists in the copy.
-	db2.View(func(tx *bolt.Tx) error {
-		value := tx.Bucket([]byte("widgets")).Get([]byte("foo"))
-		fmt.Printf("The value for 'foo' in the clone is: %s\n", value)
-		return nil
-	})
-
-	// Output:
-	// The value for 'foo' in the clone is: bar
-}
diff --git a/Godeps/_workspace/src/github.com/cenkalti/backoff/.gitignore b/Godeps/_workspace/src/github.com/cenkalti/backoff/.gitignore
deleted file mode 100644
index 00268614f..000000000
--- a/Godeps/_workspace/src/github.com/cenkalti/backoff/.gitignore
+++ /dev/null
@@ -1,22 +0,0 @@
-# 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
diff --git a/Godeps/_workspace/src/github.com/cenkalti/backoff/.travis.yml b/Godeps/_workspace/src/github.com/cenkalti/backoff/.travis.yml
deleted file mode 100644
index ce9cb6233..000000000
--- a/Godeps/_workspace/src/github.com/cenkalti/backoff/.travis.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-language: go
-go: 1.3.3
diff --git a/Godeps/_workspace/src/github.com/cenkalti/backoff/LICENSE b/Godeps/_workspace/src/github.com/cenkalti/backoff/LICENSE
deleted file mode 100644
index 89b817996..000000000
--- a/Godeps/_workspace/src/github.com/cenkalti/backoff/LICENSE
+++ /dev/null
@@ -1,20 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2014 Cenk Altı
-
-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/cenkalti/backoff/README.md b/Godeps/_workspace/src/github.com/cenkalti/backoff/README.md
deleted file mode 100644
index 020b8fbf3..000000000
--- a/Godeps/_workspace/src/github.com/cenkalti/backoff/README.md
+++ /dev/null
@@ -1,116 +0,0 @@
-# Exponential Backoff [![GoDoc][godoc image]][godoc] [![Build Status][travis image]][travis]
-
-This is a Go port of the exponential backoff algorithm from [Google's HTTP Client Library for Java][google-http-java-client].
-
-[Exponential backoff][exponential backoff wiki]
-is an algorithm that uses feedback to multiplicatively decrease the rate of some process,
-in order to gradually find an acceptable rate.
-The retries exponentially increase and stop increasing when a certain threshold is met.
-
-## How To
-
-We define two functions, `Retry()` and `RetryNotify()`.
-They receive an `Operation` to execute, a `BackOff` algorithm,
-and an optional `Notify` error handler.
-
-The operation will be executed, and will be retried on failure with delay
-as given by the backoff algorithm. The backoff algorithm can also decide when to stop
-retrying.
-In addition, the notify error handler will be called after each failed attempt,
-except for the last time, whose error should be handled by the caller.
-
-```go
-// An Operation is executing by Retry() or RetryNotify().
-// The operation will be retried using a backoff policy if it returns an error.
-type Operation func() error
-
-// Notify is a notify-on-error function. It receives an operation error and
-// backoff delay if the operation failed (with an error).
-//
-// NOTE that if the backoff policy stated to stop retrying,
-// the notify function isn't called.
-type Notify func(error, time.Duration)
-
-func Retry(Operation, BackOff) error
-func RetryNotify(Operation, BackOff, Notify)
-```
-
-## Examples
-
-See more advanced examples in the [godoc][advanced example].
-
-### Retry
-
-Simple retry helper that uses the default exponential backoff algorithm:
-
-```go
-operation := func() error {
-    // An operation that might fail.
-    return nil // or return errors.New("some error")
-}
-
-err := Retry(operation, NewExponentialBackOff())
-if err != nil {
-    // Handle error.
-    return err
-}
-
-// Operation is successful.
-return nil
-```
-
-### Ticker
-
-```go
-operation := func() error {
-    // An operation that might fail
-    return nil // or return errors.New("some error")
-}
-
-b := NewExponentialBackOff()
-ticker := NewTicker(b)
-
-var err error
-
-// Ticks will continue to arrive when the previous operation is still running,
-// so operations that take a while to fail could run in quick succession.
-for range ticker.C {
-    if err = operation(); err != nil {
-        log.Println(err, "will retry...")
-        continue
-    }
-
-    ticker.Stop()
-    break
-}
-
-if err != nil {
-    // Operation has failed.
-    return err
-}
-
-// Operation is successful.
-return nil
-```
-
-## Getting Started
-
-```bash
-# install
-$ go get github.com/cenkalti/backoff
-
-# test
-$ cd $GOPATH/src/github.com/cenkalti/backoff
-$ go get -t ./...
-$ go test -v -cover
-```
-
-[godoc]: https://godoc.org/github.com/cenkalti/backoff
-[godoc image]: https://godoc.org/github.com/cenkalti/backoff?status.png
-[travis]: https://travis-ci.org/cenkalti/backoff
-[travis image]: https://travis-ci.org/cenkalti/backoff.png
-
-[google-http-java-client]: https://github.com/google/google-http-java-client
-[exponential backoff wiki]: http://en.wikipedia.org/wiki/Exponential_backoff
-
-[advanced example]: https://godoc.org/github.com/cenkalti/backoff#example_
diff --git a/Godeps/_workspace/src/github.com/cenkalti/backoff/adv_example_test.go b/Godeps/_workspace/src/github.com/cenkalti/backoff/adv_example_test.go
deleted file mode 100644
index 3fe6783b8..000000000
--- a/Godeps/_workspace/src/github.com/cenkalti/backoff/adv_example_test.go
+++ /dev/null
@@ -1,117 +0,0 @@
-package backoff
-
-import (
-	"io/ioutil"
-	"log"
-	"net/http"
-	"time"
-)
-
-// This is an example that demonstrates how this package could be used
-// to perform various advanced operations.
-//
-// It executes an HTTP GET request with exponential backoff,
-// while errors are logged and failed responses are closed, as required by net/http package.
-//
-// Note we define a condition function which is used inside the operation to
-// determine whether the operation succeeded or failed.
-func Example() error {
-	res, err := GetWithRetry(
-		"http://localhost:9999",
-		ErrorIfStatusCodeIsNot(http.StatusOK),
-		NewExponentialBackOff())
-
-	if err != nil {
-		// Close response body of last (failed) attempt.
-		// The Last attempt isn't handled by the notify-on-error function,
-		// which closes the body of all the previous attempts.
-		if e := res.Body.Close(); e != nil {
-			log.Printf("error closing last attempt's response body: %s", e)
-		}
-		log.Printf("too many failed request attempts: %s", err)
-		return err
-	}
-	defer res.Body.Close() // The response's Body must be closed.
-
-	// Read body
-	_, _ = ioutil.ReadAll(res.Body)
-
-	// Do more stuff
-	return nil
-}
-
-// GetWithRetry is a helper function that performs an HTTP GET request
-// to the given URL, and retries with the given backoff using the given condition function.
-//
-// It also uses a notify-on-error function which logs
-// and closes the response body of the failed request.
-func GetWithRetry(url string, condition Condition, bck BackOff) (*http.Response, error) {
-	var res *http.Response
-	err := RetryNotify(
-		func() error {
-			var err error
-			res, err = http.Get(url)
-			if err != nil {
-				return err
-			}
-			return condition(res)
-		},
-		bck,
-		LogAndClose())
-
-	return res, err
-}
-
-// Condition is a retry condition function.
-// It receives a response, and returns an error
-// if the response failed the condition.
-type Condition func(*http.Response) error
-
-// ErrorIfStatusCodeIsNot returns a retry condition function.
-// The condition returns an error
-// if the given response's status code is not the given HTTP status code.
-func ErrorIfStatusCodeIsNot(status int) Condition {
-	return func(res *http.Response) error {
-		if res.StatusCode != status {
-			return NewError(res)
-		}
-		return nil
-	}
-}
-
-// Error is returned on ErrorIfX() condition functions throughout this package.
-type Error struct {
-	Response *http.Response
-}
-
-func NewError(res *http.Response) *Error {
-	// Sanity check
-	if res == nil {
-		panic("response object is nil")
-	}
-	return &Error{Response: res}
-}
-func (err *Error) Error() string { return "request failed" }
-
-// LogAndClose is a notify-on-error function.
-// It logs the error and closes the response body.
-func LogAndClose() Notify {
-	return func(err error, wait time.Duration) {
-		switch e := err.(type) {
-		case *Error:
-			defer e.Response.Body.Close()
-
-			b, err := ioutil.ReadAll(e.Response.Body)
-			var body string
-			if err != nil {
-				body = "can't read body"
-			} else {
-				body = string(b)
-			}
-
-			log.Printf("%s: %s", e.Response.Status, body)
-		default:
-			log.Println(err)
-		}
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/cenkalti/backoff/backoff.go b/Godeps/_workspace/src/github.com/cenkalti/backoff/backoff.go
deleted file mode 100644
index 61bd6df66..000000000
--- a/Godeps/_workspace/src/github.com/cenkalti/backoff/backoff.go
+++ /dev/null
@@ -1,59 +0,0 @@
-// Package backoff implements backoff algorithms for retrying operations.
-//
-// Also has a Retry() helper for retrying operations that may fail.
-package backoff
-
-import "time"
-
-// BackOff is a backoff policy for retrying an operation.
-type BackOff interface {
-	// NextBackOff returns the duration to wait before retrying the operation,
-	// or backoff.Stop to indicate that no more retries should be made.
-	//
-	// Example usage:
-	//
-	// 	duration := backoff.NextBackOff();
-	// 	if (duration == backoff.Stop) {
-	// 		// Do not retry operation.
-	// 	} else {
-	// 		// Sleep for duration and retry operation.
-	// 	}
-	//
-	NextBackOff() time.Duration
-
-	// Reset to initial state.
-	Reset()
-}
-
-// Indicates that no more retries should be made for use in NextBackOff().
-const Stop time.Duration = -1
-
-// ZeroBackOff is a fixed backoff policy whose backoff time is always zero,
-// meaning that the operation is retried immediately without waiting, indefinitely.
-type ZeroBackOff struct{}
-
-func (b *ZeroBackOff) Reset() {}
-
-func (b *ZeroBackOff) NextBackOff() time.Duration { return 0 }
-
-// StopBackOff is a fixed backoff policy that always returns backoff.Stop for
-// NextBackOff(), meaning that the operation should never be retried.
-type StopBackOff struct{}
-
-func (b *StopBackOff) Reset() {}
-
-func (b *StopBackOff) NextBackOff() time.Duration { return Stop }
-
-// ConstantBackOff is a backoff policy that always returns the same backoff delay.
-// This is in contrast to an exponential backoff policy,
-// which returns a delay that grows longer as you call NextBackOff() over and over again.
-type ConstantBackOff struct {
-	Interval time.Duration
-}
-
-func (b *ConstantBackOff) Reset()                     {}
-func (b *ConstantBackOff) NextBackOff() time.Duration { return b.Interval }
-
-func NewConstantBackOff(d time.Duration) *ConstantBackOff {
-	return &ConstantBackOff{Interval: d}
-}
diff --git a/Godeps/_workspace/src/github.com/cenkalti/backoff/backoff_test.go b/Godeps/_workspace/src/github.com/cenkalti/backoff/backoff_test.go
deleted file mode 100644
index 91f27c4f1..000000000
--- a/Godeps/_workspace/src/github.com/cenkalti/backoff/backoff_test.go
+++ /dev/null
@@ -1,27 +0,0 @@
-package backoff
-
-import (
-	"testing"
-	"time"
-)
-
-func TestNextBackOffMillis(t *testing.T) {
-	subtestNextBackOff(t, 0, new(ZeroBackOff))
-	subtestNextBackOff(t, Stop, new(StopBackOff))
-}
-
-func subtestNextBackOff(t *testing.T, expectedValue time.Duration, backOffPolicy BackOff) {
-	for i := 0; i < 10; i++ {
-		next := backOffPolicy.NextBackOff()
-		if next != expectedValue {
-			t.Errorf("got: %d expected: %d", next, expectedValue)
-		}
-	}
-}
-
-func TestConstantBackOff(t *testing.T) {
-	backoff := NewConstantBackOff(time.Second)
-	if backoff.NextBackOff() != time.Second {
-		t.Error("invalid interval")
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/cenkalti/backoff/example_test.go b/Godeps/_workspace/src/github.com/cenkalti/backoff/example_test.go
deleted file mode 100644
index 0d1852e45..000000000
--- a/Godeps/_workspace/src/github.com/cenkalti/backoff/example_test.go
+++ /dev/null
@@ -1,51 +0,0 @@
-package backoff
-
-import "log"
-
-func ExampleRetry() error {
-	operation := func() error {
-		// An operation that might fail.
-		return nil // or return errors.New("some error")
-	}
-
-	err := Retry(operation, NewExponentialBackOff())
-	if err != nil {
-		// Handle error.
-		return err
-	}
-
-	// Operation is successful.
-	return nil
-}
-
-func ExampleTicker() error {
-	operation := func() error {
-		// An operation that might fail
-		return nil // or return errors.New("some error")
-	}
-
-	b := NewExponentialBackOff()
-	ticker := NewTicker(b)
-
-	var err error
-
-	// Ticks will continue to arrive when the previous operation is still running,
-	// so operations that take a while to fail could run in quick succession.
-	for _ = range ticker.C {
-		if err = operation(); err != nil {
-			log.Println(err, "will retry...")
-			continue
-		}
-
-		ticker.Stop()
-		break
-	}
-
-	if err != nil {
-		// Operation has failed.
-		return err
-	}
-
-	// Operation is successful.
-	return nil
-}
diff --git a/Godeps/_workspace/src/github.com/cenkalti/backoff/exponential.go b/Godeps/_workspace/src/github.com/cenkalti/backoff/exponential.go
deleted file mode 100644
index cc2a164f2..000000000
--- a/Godeps/_workspace/src/github.com/cenkalti/backoff/exponential.go
+++ /dev/null
@@ -1,151 +0,0 @@
-package backoff
-
-import (
-	"math/rand"
-	"time"
-)
-
-/*
-ExponentialBackOff is a backoff implementation that increases the backoff
-period for each retry attempt using a randomization function that grows exponentially.
-
-NextBackOff() is calculated using the following formula:
-
- randomized interval =
-     RetryInterval * (random value in range [1 - RandomizationFactor, 1 + RandomizationFactor])
-
-In other words NextBackOff() will range between the randomization factor
-percentage below and above the retry interval.
-
-For example, given the following parameters:
-
- RetryInterval = 2
- RandomizationFactor = 0.5
- Multiplier = 2
-
-the actual backoff period used in the next retry attempt will range between 1 and 3 seconds,
-multiplied by the exponential, that is, between 2 and 6 seconds.
-
-Note: MaxInterval caps the RetryInterval and not the randomized interval.
-
-If the time elapsed since an ExponentialBackOff instance is created goes past the
-MaxElapsedTime, then the method NextBackOff() starts returning backoff.Stop.
-
-The elapsed time can be reset by calling Reset().
-
-Example: Given the following default arguments, for 10 tries the sequence will be,
-and assuming we go over the MaxElapsedTime on the 10th try:
-
- Request #  RetryInterval (seconds)  Randomized Interval (seconds)
-
-  1          0.5                     [0.25,   0.75]
-  2          0.75                    [0.375,  1.125]
-  3          1.125                   [0.562,  1.687]
-  4          1.687                   [0.8435, 2.53]
-  5          2.53                    [1.265,  3.795]
-  6          3.795                   [1.897,  5.692]
-  7          5.692                   [2.846,  8.538]
-  8          8.538                   [4.269, 12.807]
-  9         12.807                   [6.403, 19.210]
- 10         19.210                   backoff.Stop
-
-Note: Implementation is not thread-safe.
-*/
-type ExponentialBackOff struct {
-	InitialInterval     time.Duration
-	RandomizationFactor float64
-	Multiplier          float64
-	MaxInterval         time.Duration
-	// After MaxElapsedTime the ExponentialBackOff stops.
-	// It never stops if MaxElapsedTime == 0.
-	MaxElapsedTime time.Duration
-	Clock          Clock
-
-	currentInterval time.Duration
-	startTime       time.Time
-}
-
-// Clock is an interface that returns current time for BackOff.
-type Clock interface {
-	Now() time.Time
-}
-
-// Default values for ExponentialBackOff.
-const (
-	DefaultInitialInterval     = 500 * time.Millisecond
-	DefaultRandomizationFactor = 0.5
-	DefaultMultiplier          = 1.5
-	DefaultMaxInterval         = 60 * time.Second
-	DefaultMaxElapsedTime      = 15 * time.Minute
-)
-
-// NewExponentialBackOff creates an instance of ExponentialBackOff using default values.
-func NewExponentialBackOff() *ExponentialBackOff {
-	b := &ExponentialBackOff{
-		InitialInterval:     DefaultInitialInterval,
-		RandomizationFactor: DefaultRandomizationFactor,
-		Multiplier:          DefaultMultiplier,
-		MaxInterval:         DefaultMaxInterval,
-		MaxElapsedTime:      DefaultMaxElapsedTime,
-		Clock:               SystemClock,
-	}
-	b.Reset()
-	return b
-}
-
-type systemClock struct{}
-
-func (t systemClock) Now() time.Time {
-	return time.Now()
-}
-
-// SystemClock implements Clock interface that uses time.Now().
-var SystemClock = systemClock{}
-
-// Reset the interval back to the initial retry interval and restarts the timer.
-func (b *ExponentialBackOff) Reset() {
-	b.currentInterval = b.InitialInterval
-	b.startTime = b.Clock.Now()
-}
-
-// NextBackOff calculates the next backoff interval using the formula:
-// 	Randomized interval = RetryInterval +/- (RandomizationFactor * RetryInterval)
-func (b *ExponentialBackOff) NextBackOff() time.Duration {
-	// Make sure we have not gone over the maximum elapsed time.
-	if b.MaxElapsedTime != 0 && b.GetElapsedTime() > b.MaxElapsedTime {
-		return Stop
-	}
-	defer b.incrementCurrentInterval()
-	return getRandomValueFromInterval(b.RandomizationFactor, rand.Float64(), b.currentInterval)
-}
-
-// GetElapsedTime returns the elapsed time since an ExponentialBackOff instance
-// is created and is reset when Reset() is called.
-//
-// The elapsed time is computed using time.Now().UnixNano().
-func (b *ExponentialBackOff) GetElapsedTime() time.Duration {
-	return b.Clock.Now().Sub(b.startTime)
-}
-
-// Increments the current interval by multiplying it with the multiplier.
-func (b *ExponentialBackOff) incrementCurrentInterval() {
-	// Check for overflow, if overflow is detected set the current interval to the max interval.
-	if float64(b.currentInterval) >= float64(b.MaxInterval)/b.Multiplier {
-		b.currentInterval = b.MaxInterval
-	} else {
-		b.currentInterval = time.Duration(float64(b.currentInterval) * b.Multiplier)
-	}
-}
-
-// Returns a random value from the following interval:
-// 	[randomizationFactor * currentInterval, randomizationFactor * currentInterval].
-func getRandomValueFromInterval(randomizationFactor, random float64, currentInterval time.Duration) time.Duration {
-	var delta = randomizationFactor * float64(currentInterval)
-	var minInterval = float64(currentInterval) - delta
-	var maxInterval = float64(currentInterval) + delta
-
-	// Get a random value from the range [minInterval, maxInterval].
-	// The formula used below has a +1 because if the minInterval is 1 and the maxInterval is 3 then
-	// we want a 33% chance for selecting either 1, 2 or 3.
-	return time.Duration(minInterval + (random * (maxInterval - minInterval + 1)))
-}
diff --git a/Godeps/_workspace/src/github.com/cenkalti/backoff/exponential_test.go b/Godeps/_workspace/src/github.com/cenkalti/backoff/exponential_test.go
deleted file mode 100644
index 11b95e4f6..000000000
--- a/Godeps/_workspace/src/github.com/cenkalti/backoff/exponential_test.go
+++ /dev/null
@@ -1,108 +0,0 @@
-package backoff
-
-import (
-	"math"
-	"testing"
-	"time"
-)
-
-func TestBackOff(t *testing.T) {
-	var (
-		testInitialInterval     = 500 * time.Millisecond
-		testRandomizationFactor = 0.1
-		testMultiplier          = 2.0
-		testMaxInterval         = 5 * time.Second
-		testMaxElapsedTime      = 15 * time.Minute
-	)
-
-	exp := NewExponentialBackOff()
-	exp.InitialInterval = testInitialInterval
-	exp.RandomizationFactor = testRandomizationFactor
-	exp.Multiplier = testMultiplier
-	exp.MaxInterval = testMaxInterval
-	exp.MaxElapsedTime = testMaxElapsedTime
-	exp.Reset()
-
-	var expectedResults = []time.Duration{500, 1000, 2000, 4000, 5000, 5000, 5000, 5000, 5000, 5000}
-	for i, d := range expectedResults {
-		expectedResults[i] = d * time.Millisecond
-	}
-
-	for _, expected := range expectedResults {
-		assertEquals(t, expected, exp.currentInterval)
-		// Assert that the next backoff falls in the expected range.
-		var minInterval = expected - time.Duration(testRandomizationFactor*float64(expected))
-		var maxInterval = expected + time.Duration(testRandomizationFactor*float64(expected))
-		var actualInterval = exp.NextBackOff()
-		if !(minInterval <= actualInterval && actualInterval <= maxInterval) {
-			t.Error("error")
-		}
-	}
-}
-
-func TestGetRandomizedInterval(t *testing.T) {
-	// 33% chance of being 1.
-	assertEquals(t, 1, getRandomValueFromInterval(0.5, 0, 2))
-	assertEquals(t, 1, getRandomValueFromInterval(0.5, 0.33, 2))
-	// 33% chance of being 2.
-	assertEquals(t, 2, getRandomValueFromInterval(0.5, 0.34, 2))
-	assertEquals(t, 2, getRandomValueFromInterval(0.5, 0.66, 2))
-	// 33% chance of being 3.
-	assertEquals(t, 3, getRandomValueFromInterval(0.5, 0.67, 2))
-	assertEquals(t, 3, getRandomValueFromInterval(0.5, 0.99, 2))
-}
-
-type TestClock struct {
-	i     time.Duration
-	start time.Time
-}
-
-func (c *TestClock) Now() time.Time {
-	t := c.start.Add(c.i)
-	c.i += time.Second
-	return t
-}
-
-func TestGetElapsedTime(t *testing.T) {
-	var exp = NewExponentialBackOff()
-	exp.Clock = &TestClock{}
-	exp.Reset()
-
-	var elapsedTime = exp.GetElapsedTime()
-	if elapsedTime != time.Second {
-		t.Errorf("elapsedTime=%d", elapsedTime)
-	}
-}
-
-func TestMaxElapsedTime(t *testing.T) {
-	var exp = NewExponentialBackOff()
-	exp.Clock = &TestClock{start: time.Time{}.Add(10000 * time.Second)}
-	// Change the currentElapsedTime to be 0 ensuring that the elapsed time will be greater
-	// than the max elapsed time.
-	exp.startTime = time.Time{}
-	assertEquals(t, Stop, exp.NextBackOff())
-}
-
-func TestBackOffOverflow(t *testing.T) {
-	var (
-		testInitialInterval time.Duration = math.MaxInt64 / 2
-		testMaxInterval     time.Duration = math.MaxInt64
-		testMultiplier                    = 2.1
-	)
-
-	exp := NewExponentialBackOff()
-	exp.InitialInterval = testInitialInterval
-	exp.Multiplier = testMultiplier
-	exp.MaxInterval = testMaxInterval
-	exp.Reset()
-
-	exp.NextBackOff()
-	// Assert that when an overflow is possible the current varerval   time.Duration    is set to the max varerval   time.Duration   .
-	assertEquals(t, testMaxInterval, exp.currentInterval)
-}
-
-func assertEquals(t *testing.T, expected, value time.Duration) {
-	if expected != value {
-		t.Errorf("got: %d, expected: %d", value, expected)
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/cenkalti/backoff/retry.go b/Godeps/_workspace/src/github.com/cenkalti/backoff/retry.go
deleted file mode 100644
index f01f2bbd0..000000000
--- a/Godeps/_workspace/src/github.com/cenkalti/backoff/retry.go
+++ /dev/null
@@ -1,46 +0,0 @@
-package backoff
-
-import "time"
-
-// An Operation is executing by Retry() or RetryNotify().
-// The operation will be retried using a backoff policy if it returns an error.
-type Operation func() error
-
-// Notify is a notify-on-error function. It receives an operation error and
-// backoff delay if the operation failed (with an error).
-//
-// NOTE that if the backoff policy stated to stop retrying,
-// the notify function isn't called.
-type Notify func(error, time.Duration)
-
-// Retry the function f until it does not return error or BackOff stops.
-// f is guaranteed to be run at least once.
-// It is the caller's responsibility to reset b after Retry returns.
-//
-// Retry sleeps the goroutine for the duration returned by BackOff after a
-// failed operation returns.
-func Retry(o Operation, b BackOff) error { return RetryNotify(o, b, nil) }
-
-// RetryNotify calls notify function with the error and wait duration
-// for each failed attempt before sleep.
-func RetryNotify(operation Operation, b BackOff, notify Notify) error {
-	var err error
-	var next time.Duration
-
-	b.Reset()
-	for {
-		if err = operation(); err == nil {
-			return nil
-		}
-
-		if next = b.NextBackOff(); next == Stop {
-			return err
-		}
-
-		if notify != nil {
-			notify(err, next)
-		}
-
-		time.Sleep(next)
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/cenkalti/backoff/retry_test.go b/Godeps/_workspace/src/github.com/cenkalti/backoff/retry_test.go
deleted file mode 100644
index c0d25ab76..000000000
--- a/Godeps/_workspace/src/github.com/cenkalti/backoff/retry_test.go
+++ /dev/null
@@ -1,34 +0,0 @@
-package backoff
-
-import (
-	"errors"
-	"log"
-	"testing"
-)
-
-func TestRetry(t *testing.T) {
-	const successOn = 3
-	var i = 0
-
-	// This function is successfull on "successOn" calls.
-	f := func() error {
-		i++
-		log.Printf("function is called %d. time\n", i)
-
-		if i == successOn {
-			log.Println("OK")
-			return nil
-		}
-
-		log.Println("error")
-		return errors.New("error")
-	}
-
-	err := Retry(f, NewExponentialBackOff())
-	if err != nil {
-		t.Errorf("unexpected error: %s", err.Error())
-	}
-	if i != successOn {
-		t.Errorf("invalid number of retries: %d", i)
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/cenkalti/backoff/ticker.go b/Godeps/_workspace/src/github.com/cenkalti/backoff/ticker.go
deleted file mode 100644
index 7a5ff4ed1..000000000
--- a/Godeps/_workspace/src/github.com/cenkalti/backoff/ticker.go
+++ /dev/null
@@ -1,79 +0,0 @@
-package backoff
-
-import (
-	"runtime"
-	"sync"
-	"time"
-)
-
-// Ticker holds a channel that delivers `ticks' of a clock at times reported by a BackOff.
-//
-// Ticks will continue to arrive when the previous operation is still running,
-// so operations that take a while to fail could run in quick succession.
-type Ticker struct {
-	C        <-chan time.Time
-	c        chan time.Time
-	b        BackOff
-	stop     chan struct{}
-	stopOnce sync.Once
-}
-
-// NewTicker returns a new Ticker containing a channel that will send the time at times
-// specified by the BackOff argument. Ticker is guaranteed to tick at least once.
-// The channel is closed when Stop method is called or BackOff stops.
-func NewTicker(b BackOff) *Ticker {
-	c := make(chan time.Time)
-	t := &Ticker{
-		C:    c,
-		c:    c,
-		b:    b,
-		stop: make(chan struct{}),
-	}
-	go t.run()
-	runtime.SetFinalizer(t, (*Ticker).Stop)
-	return t
-}
-
-// Stop turns off a ticker. After Stop, no more ticks will be sent.
-func (t *Ticker) Stop() {
-	t.stopOnce.Do(func() { close(t.stop) })
-}
-
-func (t *Ticker) run() {
-	c := t.c
-	defer close(c)
-	t.b.Reset()
-
-	// Ticker is guaranteed to tick at least once.
-	afterC := t.send(time.Now())
-
-	for {
-		if afterC == nil {
-			return
-		}
-
-		select {
-		case tick := <-afterC:
-			afterC = t.send(tick)
-		case <-t.stop:
-			t.c = nil // Prevent future ticks from being sent to the channel.
-			return
-		}
-	}
-}
-
-func (t *Ticker) send(tick time.Time) <-chan time.Time {
-	select {
-	case t.c <- tick:
-	case <-t.stop:
-		return nil
-	}
-
-	next := t.b.NextBackOff()
-	if next == Stop {
-		t.Stop()
-		return nil
-	}
-
-	return time.After(next)
-}
diff --git a/Godeps/_workspace/src/github.com/cenkalti/backoff/ticker_test.go b/Godeps/_workspace/src/github.com/cenkalti/backoff/ticker_test.go
deleted file mode 100644
index 7c392df46..000000000
--- a/Godeps/_workspace/src/github.com/cenkalti/backoff/ticker_test.go
+++ /dev/null
@@ -1,45 +0,0 @@
-package backoff
-
-import (
-	"errors"
-	"log"
-	"testing"
-)
-
-func TestTicker(t *testing.T) {
-	const successOn = 3
-	var i = 0
-
-	// This function is successfull on "successOn" calls.
-	f := func() error {
-		i++
-		log.Printf("function is called %d. time\n", i)
-
-		if i == successOn {
-			log.Println("OK")
-			return nil
-		}
-
-		log.Println("error")
-		return errors.New("error")
-	}
-
-	b := NewExponentialBackOff()
-	ticker := NewTicker(b)
-
-	var err error
-	for _ = range ticker.C {
-		if err = f(); err != nil {
-			t.Log(err)
-			continue
-		}
-
-		break
-	}
-	if err != nil {
-		t.Errorf("unexpected error: %s", err.Error())
-	}
-	if i != successOn {
-		t.Errorf("invalid number of retries: %d", i)
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/dancannon/gorethink/encoding/cache.go b/Godeps/_workspace/src/github.com/dancannon/gorethink/encoding/cache.go
deleted file mode 100644
index feb28f2a5..000000000
--- a/Godeps/_workspace/src/github.com/dancannon/gorethink/encoding/cache.go
+++ /dev/null
@@ -1,258 +0,0 @@
-// This code is based on encoding/json and gorilla/schema
-
-package encoding
-
-import (
-	"reflect"
-	"sort"
-	"sync"
-)
-
-// A field represents a single field found in a struct.
-type field struct {
-	name      string
-	nameBytes []byte // []byte(name)
-	equalFold func(s, t []byte) bool
-
-	tag       bool
-	index     []int
-	typ       reflect.Type
-	omitEmpty bool
-	quoted    bool
-}
-
-func fillField(f field) field {
-	f.nameBytes = []byte(f.name)
-	f.equalFold = foldFunc(f.nameBytes)
-
-	return f
-}
-
-// byName sorts field by name, breaking ties with depth,
-// then breaking ties with "name came from tag", then
-// breaking ties with index sequence.
-type byName []field
-
-func (x byName) Len() int { return len(x) }
-
-func (x byName) Swap(i, j int) { x[i], x[j] = x[j], x[i] }
-
-func (x byName) Less(i, j int) bool {
-	if x[i].name != x[j].name {
-		return x[i].name < x[j].name
-	}
-	if len(x[i].index) != len(x[j].index) {
-		return len(x[i].index) < len(x[j].index)
-	}
-	if x[i].tag != x[j].tag {
-		return x[i].tag
-	}
-	return byIndex(x).Less(i, j)
-}
-
-// byIndex sorts field by index sequence.
-type byIndex []field
-
-func (x byIndex) Len() int { return len(x) }
-
-func (x byIndex) Swap(i, j int) { x[i], x[j] = x[j], x[i] }
-
-func (x byIndex) Less(i, j int) bool {
-	for k, xik := range x[i].index {
-		if k >= len(x[j].index) {
-			return false
-		}
-		if xik != x[j].index[k] {
-			return xik < x[j].index[k]
-		}
-	}
-	return len(x[i].index) < len(x[j].index)
-}
-
-// typeFields returns a list of fields that should be recognized for the given type.
-// The algorithm is breadth-first search over the set of structs to include - the top struct
-// and then any reachable anonymous structs.
-func typeFields(t reflect.Type) []field {
-	// Anonymous fields to explore at the current level and the next.
-	current := []field{}
-	next := []field{{typ: t}}
-
-	// Count of queued names for current level and the next.
-	count := map[reflect.Type]int{}
-	nextCount := map[reflect.Type]int{}
-
-	// Types already visited at an earlier level.
-	visited := map[reflect.Type]bool{}
-
-	// Fields found.
-	var fields []field
-
-	for len(next) > 0 {
-		current, next = next, current[:0]
-		count, nextCount = nextCount, map[reflect.Type]int{}
-
-		for _, f := range current {
-			if visited[f.typ] {
-				continue
-			}
-			visited[f.typ] = true
-
-			// Scan f.typ for fields to include.
-			for i := 0; i < f.typ.NumField(); i++ {
-				sf := f.typ.Field(i)
-				if sf.PkgPath != "" { // unexported
-					continue
-				}
-				tag := getTag(sf)
-				if tag == "-" {
-					continue
-				}
-				name, opts := parseTag(tag)
-				if !isValidTag(name) {
-					name = ""
-				}
-				index := make([]int, len(f.index)+1)
-				copy(index, f.index)
-				index[len(f.index)] = i
-
-				ft := sf.Type
-				if ft.Name() == "" && ft.Kind() == reflect.Ptr {
-					// Follow pointer.
-					ft = ft.Elem()
-				}
-
-				// Record found field and index sequence.
-				if name != "" || !sf.Anonymous || ft.Kind() != reflect.Struct {
-					tagged := name != ""
-					if name == "" {
-						name = sf.Name
-					}
-					fields = append(fields, fillField(field{
-						name:      name,
-						tag:       tagged,
-						index:     index,
-						typ:       ft,
-						omitEmpty: opts.Contains("omitempty"),
-					}))
-					if count[f.typ] > 1 {
-						// If there were multiple instances, add a second,
-						// so that the annihilation code will see a duplicate.
-						// It only cares about the distinction between 1 or 2,
-						// so don't bother generating any more copies.
-						fields = append(fields, fields[len(fields)-1])
-					}
-					continue
-				}
-
-				// Record new anonymous struct to explore in next round.
-				nextCount[ft]++
-				if nextCount[ft] == 1 {
-					next = append(next, fillField(field{name: ft.Name(), index: index, typ: ft}))
-				}
-			}
-		}
-	}
-
-	sort.Sort(byName(fields))
-
-	// Delete all fields that are hidden by the Go rules for embedded fields,
-	// except that fields with valid tags are promoted.
-
-	// The fields are sorted in primary order of name, secondary order
-	// of field index length. Loop over names; for each name, delete
-	// hidden fields by choosing the one dominant field that survives.
-	out := fields[:0]
-	for advance, i := 0, 0; i < len(fields); i += advance {
-		// One iteration per name.
-		// Find the sequence of fields with the name of this first field.
-		fi := fields[i]
-		name := fi.name
-		for advance = 1; i+advance < len(fields); advance++ {
-			fj := fields[i+advance]
-			if fj.name != name {
-				break
-			}
-		}
-		if advance == 1 { // Only one field with this name
-			out = append(out, fi)
-			continue
-		}
-		dominant, ok := dominantField(fields[i : i+advance])
-		if ok {
-			out = append(out, dominant)
-		}
-	}
-
-	fields = out
-	sort.Sort(byIndex(fields))
-
-	return fields
-}
-
-// dominantField looks through the fields, all of which are known to
-// have the same name, to find the single field that dominates the
-// others using Go's embedding rules, modified by the presence of
-// valid tags. If there are multiple top-level fields, the boolean
-// will be false: This condition is an error in Go and we skip all
-// the fields.
-func dominantField(fields []field) (field, bool) {
-	// The fields are sorted in increasing index-length order. The winner
-	// must therefore be one with the shortest index length. Drop all
-	// longer entries, which is easy: just truncate the slice.
-	length := len(fields[0].index)
-	tagged := -1 // Index of first tagged field.
-	for i, f := range fields {
-		if len(f.index) > length {
-			fields = fields[:i]
-			break
-		}
-		if f.tag {
-			if tagged >= 0 {
-				// Multiple tagged fields at the same level: conflict.
-				// Return no field.
-				return field{}, false
-			}
-			tagged = i
-		}
-	}
-	if tagged >= 0 {
-		return fields[tagged], true
-	}
-	// All remaining fields have the same length. If there's more than one,
-	// we have a conflict (two fields named "X" at the same level) and we
-	// return no field.
-	if len(fields) > 1 {
-		return field{}, false
-	}
-	return fields[0], true
-}
-
-var fieldCache struct {
-	sync.RWMutex
-	m map[reflect.Type][]field
-}
-
-// cachedTypeFields is like typeFields but uses a cache to avoid repeated work.
-func cachedTypeFields(t reflect.Type) []field {
-	fieldCache.RLock()
-	f := fieldCache.m[t]
-	fieldCache.RUnlock()
-	if f != nil {
-		return f
-	}
-
-	// Compute fields without lock.
-	// Might duplicate effort but won't hold other computations back.
-	f = typeFields(t)
-	if f == nil {
-		f = []field{}
-	}
-
-	fieldCache.Lock()
-	if fieldCache.m == nil {
-		fieldCache.m = map[reflect.Type][]field{}
-	}
-	fieldCache.m[t] = f
-	fieldCache.Unlock()
-	return f
-}
diff --git a/Godeps/_workspace/src/github.com/dancannon/gorethink/encoding/decoder.go b/Godeps/_workspace/src/github.com/dancannon/gorethink/encoding/decoder.go
deleted file mode 100644
index f50478abb..000000000
--- a/Godeps/_workspace/src/github.com/dancannon/gorethink/encoding/decoder.go
+++ /dev/null
@@ -1,141 +0,0 @@
-package encoding
-
-import (
-	"errors"
-	"reflect"
-	"runtime"
-	"sync"
-)
-
-var byteSliceType = reflect.TypeOf([]byte(nil))
-
-type decoderFunc func(dv reflect.Value, sv reflect.Value)
-
-// Decode decodes map[string]interface{} into a struct. The first parameter
-// must be a pointer.
-func Decode(dst interface{}, src interface{}) (err error) {
-	defer func() {
-		if r := recover(); r != nil {
-			if _, ok := r.(runtime.Error); ok {
-				panic(r)
-			}
-			if v, ok := r.(string); ok {
-				err = errors.New(v)
-			} else {
-				err = r.(error)
-			}
-		}
-	}()
-
-	dv := reflect.ValueOf(dst)
-	sv := reflect.ValueOf(src)
-	if dv.Kind() != reflect.Ptr {
-		return &DecodeTypeError{
-			DestType: dv.Type(),
-			SrcType:  sv.Type(),
-			Reason:   "must be a pointer",
-		}
-	}
-
-	dv = dv.Elem()
-	if !dv.CanAddr() {
-		return &DecodeTypeError{
-			DestType: dv.Type(),
-			SrcType:  sv.Type(),
-			Reason:   "must be addressable",
-		}
-	}
-
-	decode(dv, sv)
-	return nil
-}
-
-// decode decodes the source value into the destination value
-func decode(dv, sv reflect.Value) {
-	valueDecoder(dv, sv)(dv, sv)
-}
-
-type decoderCacheKey struct {
-	dt, st reflect.Type
-}
-
-var decoderCache struct {
-	sync.RWMutex
-	m map[decoderCacheKey]decoderFunc
-}
-
-func valueDecoder(dv, sv reflect.Value) decoderFunc {
-	if !sv.IsValid() {
-		return invalidValueDecoder
-	}
-
-	if dv.IsValid() {
-		dv = indirect(dv, false)
-		dv.Set(reflect.Zero(dv.Type()))
-	}
-
-	return typeDecoder(dv.Type(), sv.Type())
-}
-
-func typeDecoder(dt, st reflect.Type) decoderFunc {
-	decoderCache.RLock()
-	f := decoderCache.m[decoderCacheKey{dt, st}]
-	decoderCache.RUnlock()
-	if f != nil {
-		return f
-	}
-
-	// To deal with recursive types, populate the map with an
-	// indirect func before we build it. This type waits on the
-	// real func (f) to be ready and then calls it.  This indirect
-	// func is only used for recursive types.
-	decoderCache.Lock()
-	var wg sync.WaitGroup
-	wg.Add(1)
-	decoderCache.m[decoderCacheKey{dt, st}] = func(dv, sv reflect.Value) {
-		wg.Wait()
-		f(dv, sv)
-	}
-	decoderCache.Unlock()
-
-	// Compute fields without lock.
-	// Might duplicate effort but won't hold other computations back.
-	f = newTypeDecoder(dt, st)
-	wg.Done()
-	decoderCache.Lock()
-	decoderCache.m[decoderCacheKey{dt, st}] = f
-	decoderCache.Unlock()
-	return f
-}
-
-// indirect walks down v allocating pointers as needed,
-// until it gets to a non-pointer.
-func indirect(v reflect.Value, decodeNull bool) reflect.Value {
-	// If v is a named type and is addressable,
-	// start with its address, so that if the type has pointer methods,
-	// we find them.
-	if v.Kind() != reflect.Ptr && v.Type().Name() != "" && v.CanAddr() {
-		v = v.Addr()
-	}
-	for {
-		// Load value from interface, but only if the result will be
-		// usefully addressable.
-		if v.Kind() == reflect.Interface && !v.IsNil() {
-			e := v.Elem()
-			if e.Kind() == reflect.Ptr && !e.IsNil() && (!decodeNull || e.Elem().Kind() == reflect.Ptr) {
-				v = e
-				continue
-			}
-		}
-
-		if v.Kind() != reflect.Ptr {
-			break
-		}
-
-		if v.IsNil() {
-			v.Set(reflect.New(v.Type().Elem()))
-		}
-		v = v.Elem()
-	}
-	return v
-}
diff --git a/Godeps/_workspace/src/github.com/dancannon/gorethink/encoding/decoder_test.go b/Godeps/_workspace/src/github.com/dancannon/gorethink/encoding/decoder_test.go
deleted file mode 100644
index 909b2cc2d..000000000
--- a/Godeps/_workspace/src/github.com/dancannon/gorethink/encoding/decoder_test.go
+++ /dev/null
@@ -1,426 +0,0 @@
-package encoding
-
-import (
-	"bytes"
-	"encoding/json"
-	"image"
-	"reflect"
-	"testing"
-)
-
-type T struct {
-	X string
-	Y int
-	Z int `gorethink:"-"`
-}
-
-type U struct {
-	Alphabet string `gorethink:"alpha"`
-}
-
-type V struct {
-	F1 interface{}
-	F2 int32
-	F3 string
-}
-
-type tx struct {
-	x int
-}
-
-var txType = reflect.TypeOf((*tx)(nil)).Elem()
-
-// Test data structures for anonymous fields.
-
-type Point struct {
-	Z int
-}
-
-type Top struct {
-	Level0 int
-	Embed0
-	*Embed0a
-	*Embed0b `gorethink:"e,omitempty"` // treated as named
-	Embed0c  `gorethink:"-"`           // ignored
-	Loop
-	Embed0p // has Point with X, Y, used
-	Embed0q // has Point with Z, used
-}
-
-type Embed0 struct {
-	Level1a int // overridden by Embed0a's Level1a with tag
-	Level1b int // used because Embed0a's Level1b is renamed
-	Level1c int // used because Embed0a's Level1c is ignored
-	Level1d int // annihilated by Embed0a's Level1d
-	Level1e int `gorethink:"x"` // annihilated by Embed0a.Level1e
-}
-
-type Embed0a struct {
-	Level1a int `gorethink:"Level1a,omitempty"`
-	Level1b int `gorethink:"LEVEL1B,omitempty"`
-	Level1c int `gorethink:"-"`
-	Level1d int // annihilated by Embed0's Level1d
-	Level1f int `gorethink:"x"` // annihilated by Embed0's Level1e
-}
-
-type Embed0b Embed0
-
-type Embed0c Embed0
-
-type Embed0p struct {
-	image.Point
-}
-
-type Embed0q struct {
-	Point
-}
-
-type Loop struct {
-	Loop1 int `gorethink:",omitempty"`
-	Loop2 int `gorethink:",omitempty"`
-	*Loop
-}
-
-// From reflect test:
-// The X in S6 and S7 annihilate, but they also block the X in S8.S9.
-type S5 struct {
-	S6
-	S7
-	S8
-}
-
-type S6 struct {
-	X int
-}
-
-type S7 S6
-
-type S8 struct {
-	S9
-}
-
-type S9 struct {
-	X int
-	Y int
-}
-
-// From reflect test:
-// The X in S11.S6 and S12.S6 annihilate, but they also block the X in S13.S8.S9.
-type S10 struct {
-	S11
-	S12
-	S13
-}
-
-type S11 struct {
-	S6
-}
-
-type S12 struct {
-	S6
-}
-
-type S13 struct {
-	S8
-}
-
-type Pointer struct {
-	PPoint *Point
-	Point  Point
-}
-
-type decodeTest struct {
-	in  interface{}
-	ptr interface{}
-	out interface{}
-	err error
-}
-
-type Ambig struct {
-	// Given "hello", the first match should win.
-	First  int `gorethink:"HELLO"`
-	Second int `gorethink:"Hello"`
-}
-
-var decodeTests = []decodeTest{
-	// basic types
-	{in: true, ptr: new(bool), out: true},
-	{in: 1, ptr: new(int), out: 1},
-	{in: 1.2, ptr: new(float64), out: 1.2},
-	{in: -5, ptr: new(int16), out: int16(-5)},
-	{in: 2, ptr: new(string), out: string("2")},
-	{in: float64(2.0), ptr: new(interface{}), out: float64(2.0)},
-	{in: string("2"), ptr: new(interface{}), out: string("2")},
-	{in: "a\u1234", ptr: new(string), out: "a\u1234"},
-	{in: []interface{}{}, ptr: new([]string), out: []string{}},
-	{in: map[string]interface{}{"X": []interface{}{1, 2, 3}, "Y": 4}, ptr: new(T), out: T{}, err: &DecodeTypeError{reflect.TypeOf(""), reflect.TypeOf([]interface{}{}), ""}},
-	{in: map[string]interface{}{"x": 1}, ptr: new(tx), out: tx{}},
-	{in: map[string]interface{}{"F1": float64(1), "F2": 2, "F3": 3}, ptr: new(V), out: V{F1: float64(1), F2: int32(2), F3: string("3")}},
-	{in: map[string]interface{}{"F1": string("1"), "F2": 2, "F3": 3}, ptr: new(V), out: V{F1: string("1"), F2: int32(2), F3: string("3")}},
-	{
-		in:  map[string]interface{}{"k1": int64(1), "k2": "s", "k3": []interface{}{int64(1), 2.0, 3e-3}, "k4": map[string]interface{}{"kk1": "s", "kk2": int64(2)}},
-		out: map[string]interface{}{"k1": int64(1), "k2": "s", "k3": []interface{}{int64(1), 2.0, 3e-3}, "k4": map[string]interface{}{"kk1": "s", "kk2": int64(2)}},
-		ptr: new(interface{}),
-	},
-
-	// Z has a "-" tag.
-	{in: map[string]interface{}{"Y": 1, "Z": 2}, ptr: new(T), out: T{Y: 1}},
-
-	{in: map[string]interface{}{"alpha": "abc", "alphabet": "xyz"}, ptr: new(U), out: U{Alphabet: "abc"}},
-	{in: map[string]interface{}{"alpha": "abc"}, ptr: new(U), out: U{Alphabet: "abc"}},
-	{in: map[string]interface{}{"alphabet": "xyz"}, ptr: new(U), out: U{}},
-
-	// array tests
-	{in: []interface{}{1, 2, 3}, ptr: new([3]int), out: [3]int{1, 2, 3}},
-	{in: []interface{}{1, 2, 3}, ptr: new([1]int), out: [1]int{1}},
-	{in: []interface{}{1, 2, 3}, ptr: new([5]int), out: [5]int{1, 2, 3, 0, 0}},
-
-	// empty array to interface test
-	{in: map[string]interface{}{"T": []interface{}{}}, ptr: new(map[string]interface{}), out: map[string]interface{}{"T": []interface{}{}}},
-
-	{
-		in: map[string]interface{}{
-			"Level0":  1,
-			"Level1b": 2,
-			"Level1c": 3,
-			"level1d": 4,
-			"Level1a": 5,
-			"LEVEL1B": 6,
-			"e": map[string]interface{}{
-				"Level1a": 8,
-				"Level1b": 9,
-				"Level1c": 10,
-				"Level1d": 11,
-				"x":       12,
-			},
-			"Loop1": 13,
-			"Loop2": 14,
-			"X":     15,
-			"Y":     16,
-			"Z":     17,
-		},
-		ptr: new(Top),
-		out: Top{
-			Level0: 1,
-			Embed0: Embed0{
-				Level1b: 2,
-				Level1c: 3,
-			},
-			Embed0a: &Embed0a{
-				Level1a: 5,
-				Level1b: 6,
-			},
-			Embed0b: &Embed0b{
-				Level1a: 8,
-				Level1b: 9,
-				Level1c: 10,
-				Level1d: 11,
-			},
-			Loop: Loop{
-				Loop1: 13,
-				Loop2: 14,
-			},
-			Embed0p: Embed0p{
-				Point: image.Point{X: 15, Y: 16},
-			},
-			Embed0q: Embed0q{
-				Point: Point{Z: 17},
-			},
-		},
-	},
-	{
-		in:  map[string]interface{}{"hello": 1},
-		ptr: new(Ambig),
-		out: Ambig{First: 1},
-	},
-	{
-		in:  map[string]interface{}{"X": 1, "Y": 2},
-		ptr: new(S5),
-		out: S5{S8: S8{S9: S9{Y: 2}}},
-	},
-	{
-		in:  map[string]interface{}{"X": 1, "Y": 2},
-		ptr: new(S10),
-		out: S10{S13: S13{S8: S8{S9: S9{Y: 2}}}},
-	},
-	{
-		in:  map[string]interface{}{"PPoint": map[string]interface{}{"Z": 1}, "Point": map[string]interface{}{"Z": 2}},
-		ptr: new(Pointer),
-		out: Pointer{PPoint: &Point{Z: 1}, Point: Point{Z: 2}},
-	},
-	{
-		in:  map[string]interface{}{"Point": map[string]interface{}{"Z": 2}},
-		ptr: new(Pointer),
-		out: Pointer{PPoint: nil, Point: Point{Z: 2}},
-	},
-}
-
-func TestDecode(t *testing.T) {
-	for i, tt := range decodeTests {
-		if tt.ptr == nil {
-			continue
-		}
-
-		// v = new(right-type)
-		v := reflect.New(reflect.TypeOf(tt.ptr).Elem())
-
-		err := Decode(v.Interface(), tt.in)
-		if !jsonEqual(err, tt.err) {
-			t.Errorf("#%d: got error %v want %v", i, err, tt.err)
-			continue
-		}
-
-		if tt.err == nil && !jsonEqual(v.Elem().Interface(), tt.out) {
-			t.Errorf("#%d: mismatch\nhave: %+v\nwant: %+v", i, v.Elem().Interface(), tt.out)
-			continue
-		}
-
-		// Check round trip.
-		if tt.err == nil {
-			enc, err := Encode(v.Interface())
-			if err != nil {
-				t.Errorf("#%d: error re-marshaling: %v", i, err)
-				continue
-			}
-			vv := reflect.New(reflect.TypeOf(tt.ptr).Elem())
-
-			if err := Decode(vv.Interface(), enc); err != nil {
-				t.Errorf("#%d: error re-decodeing: %v", i, err)
-				continue
-			}
-			if !jsonEqual(v.Elem().Interface(), vv.Elem().Interface()) {
-				t.Errorf("#%d: mismatch\nhave: %#+v\nwant: %#+v", i, v.Elem().Interface(), vv.Elem().Interface())
-				continue
-			}
-		}
-	}
-}
-
-func TestStringKind(t *testing.T) {
-	type aMap map[string]int
-
-	var m1, m2 map[string]int
-	m1 = map[string]int{
-		"foo": 42,
-	}
-
-	data, err := Encode(m1)
-	if err != nil {
-		t.Errorf("Unexpected error encoding: %v", err)
-	}
-
-	err = Decode(&m2, data)
-	if err != nil {
-		t.Errorf("Unexpected error decoding: %v", err)
-	}
-
-	if !jsonEqual(m1, m2) {
-		t.Error("Items should be equal after encoding and then decoding")
-	}
-
-}
-
-// Test handling of unexported fields that should be ignored.
-type unexportedFields struct {
-	Name string
-	m    map[string]interface{} `gorethink:"-"`
-	m2   map[string]interface{} `gorethink:"abcd"`
-}
-
-func TestDecodeUnexported(t *testing.T) {
-	input := map[string]interface{}{
-		"Name": "Bob",
-		"m": map[string]interface{}{
-			"x": 123,
-		},
-		"m2": map[string]interface{}{
-			"y": 123,
-		},
-		"abcd": map[string]interface{}{
-			"z": 789,
-		},
-	}
-	want := &unexportedFields{Name: "Bob"}
-
-	out := &unexportedFields{}
-	err := Decode(out, input)
-	if err != nil {
-		t.Errorf("got error %v, expected nil", err)
-	}
-	if !jsonEqual(out, want) {
-		t.Errorf("got %q, want %q", out, want)
-	}
-}
-
-type Foo struct {
-	FooBar interface{} `gorethink:"foobar"`
-}
-type Bar struct {
-	Baz int `gorethink:"baz"`
-}
-
-type UnmarshalerPointer struct {
-	Value *UnmarshalerValue
-}
-
-type UnmarshalerValue struct {
-	ValueInt    int64
-	ValueString string
-}
-
-func (v *UnmarshalerValue) MarshalRQL() (interface{}, error) {
-	if v.ValueInt != int64(0) {
-		return Encode(v.ValueInt)
-	}
-	if v.ValueString != "" {
-		return Encode(v.ValueString)
-	}
-
-	return Encode(nil)
-}
-
-func (v *UnmarshalerValue) UnmarshalRQL(b interface{}) (err error) {
-	n, s := int64(0), ""
-
-	if err = Decode(&s, b); err == nil {
-		v.ValueString = s
-		return
-	}
-	if err = Decode(&n, b); err == nil {
-		v.ValueInt = n
-
-	}
-
-	return
-}
-
-func TestDecodeUnmarshalerPointer(t *testing.T) {
-	input := map[string]interface{}{
-		"Value": "abc",
-	}
-	want := &UnmarshalerPointer{
-		Value: &UnmarshalerValue{ValueString: "abc"},
-	}
-
-	out := &UnmarshalerPointer{}
-	err := Decode(out, input)
-	if err != nil {
-		t.Errorf("got error %v, expected nil", err)
-	}
-	if !jsonEqual(out, want) {
-		t.Errorf("got %q, want %q", out, want)
-	}
-}
-
-func jsonEqual(a, b interface{}) bool {
-	ba, err := json.Marshal(a)
-	if err != nil {
-		panic(err)
-	}
-	bb, err := json.Marshal(b)
-	if err != nil {
-		panic(err)
-	}
-
-	return bytes.Compare(ba, bb) == 0
-}
diff --git a/Godeps/_workspace/src/github.com/dancannon/gorethink/encoding/decoder_types.go b/Godeps/_workspace/src/github.com/dancannon/gorethink/encoding/decoder_types.go
deleted file mode 100644
index 61d268f83..000000000
--- a/Godeps/_workspace/src/github.com/dancannon/gorethink/encoding/decoder_types.go
+++ /dev/null
@@ -1,524 +0,0 @@
-package encoding
-
-import (
-	"bytes"
-	"fmt"
-	"reflect"
-	"strconv"
-)
-
-// newTypeDecoder constructs an decoderFunc for a type.
-func newTypeDecoder(dt, st reflect.Type) decoderFunc {
-	if reflect.PtrTo(dt).Implements(unmarshalerType) ||
-		dt.Implements(unmarshalerType) {
-		return unmarshalerDecoder
-	}
-
-	if st.Kind() == reflect.Interface {
-		return interfaceAsTypeDecoder
-	}
-
-	switch dt.Kind() {
-	case reflect.Bool:
-		switch st.Kind() {
-		case reflect.Bool:
-			return boolAsBoolDecoder
-		case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
-			return intAsBoolDecoder
-		case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uintptr:
-			return uintAsBoolDecoder
-		case reflect.Float32, reflect.Float64:
-			return floatAsBoolDecoder
-		case reflect.String:
-			return stringAsBoolDecoder
-		default:
-			return decodeTypeError
-		}
-	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
-		switch st.Kind() {
-		case reflect.Bool:
-			return boolAsIntDecoder
-		case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
-			return intAsIntDecoder
-		case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uintptr:
-			return uintAsIntDecoder
-		case reflect.Float32, reflect.Float64:
-			return floatAsIntDecoder
-		case reflect.String:
-			return stringAsIntDecoder
-		default:
-			return decodeTypeError
-		}
-	case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uintptr:
-		switch st.Kind() {
-		case reflect.Bool:
-			return boolAsUintDecoder
-		case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
-			return intAsUintDecoder
-		case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uintptr:
-			return uintAsUintDecoder
-		case reflect.Float32, reflect.Float64:
-			return floatAsUintDecoder
-		case reflect.String:
-			return stringAsUintDecoder
-		default:
-			return decodeTypeError
-		}
-	case reflect.Float32, reflect.Float64:
-		switch st.Kind() {
-		case reflect.Bool:
-			return boolAsFloatDecoder
-		case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
-			return intAsFloatDecoder
-		case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uintptr:
-			return uintAsFloatDecoder
-		case reflect.Float32, reflect.Float64:
-			return floatAsFloatDecoder
-		case reflect.String:
-			return stringAsFloatDecoder
-		default:
-			return decodeTypeError
-		}
-	case reflect.String:
-		switch st.Kind() {
-		case reflect.Bool:
-			return boolAsStringDecoder
-		case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
-			return intAsStringDecoder
-		case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uintptr:
-			return uintAsStringDecoder
-		case reflect.Float32, reflect.Float64:
-			return floatAsStringDecoder
-		case reflect.String:
-			return stringAsStringDecoder
-		default:
-			return decodeTypeError
-		}
-	case reflect.Interface:
-		if !st.AssignableTo(dt) {
-			return decodeTypeError
-		}
-
-		return interfaceDecoder
-	case reflect.Ptr:
-		return newPtrDecoder(dt, st)
-	case reflect.Map:
-		if st.AssignableTo(dt) {
-			return interfaceDecoder
-		}
-
-		switch st.Kind() {
-		case reflect.Map:
-			return newMapAsMapDecoder(dt, st)
-		default:
-			return decodeTypeError
-		}
-	case reflect.Struct:
-		if st.AssignableTo(dt) {
-			return interfaceDecoder
-		}
-
-		switch st.Kind() {
-		case reflect.Map:
-			if kind := st.Key().Kind(); kind != reflect.String && kind != reflect.Interface {
-				return newDecodeTypeError(fmt.Errorf("map needs string keys"))
-			}
-
-			return newMapAsStructDecoder(dt, st)
-		default:
-			return decodeTypeError
-		}
-	case reflect.Slice:
-		if st.AssignableTo(dt) {
-			return interfaceDecoder
-		}
-
-		switch st.Kind() {
-		case reflect.Array, reflect.Slice:
-			return newSliceDecoder(dt, st)
-		default:
-			return decodeTypeError
-		}
-	case reflect.Array:
-		if st.AssignableTo(dt) {
-			return interfaceDecoder
-		}
-
-		switch st.Kind() {
-		case reflect.Array, reflect.Slice:
-			return newArrayDecoder(dt, st)
-		default:
-			return decodeTypeError
-		}
-	default:
-		return unsupportedTypeDecoder
-	}
-}
-
-func invalidValueDecoder(dv, sv reflect.Value) {
-	dv.Set(reflect.Zero(dv.Type()))
-}
-
-func unsupportedTypeDecoder(dv, sv reflect.Value) {
-	panic(&UnsupportedTypeError{dv.Type()})
-}
-
-func decodeTypeError(dv, sv reflect.Value) {
-	panic(&DecodeTypeError{
-		DestType: dv.Type(),
-		SrcType:  sv.Type(),
-	})
-}
-
-func newDecodeTypeError(err error) decoderFunc {
-	return func(dv, sv reflect.Value) {
-		panic(&DecodeTypeError{
-			DestType: dv.Type(),
-			SrcType:  sv.Type(),
-			Reason:   err.Error(),
-		})
-	}
-}
-
-func interfaceDecoder(dv, sv reflect.Value) {
-	dv.Set(sv)
-}
-
-func interfaceAsTypeDecoder(dv, sv reflect.Value) {
-	decode(dv, sv.Elem())
-}
-
-type ptrDecoder struct {
-	elemDec decoderFunc
-}
-
-func (d *ptrDecoder) decode(dv, sv reflect.Value) {
-	v := reflect.New(dv.Type().Elem())
-	d.elemDec(v, sv)
-	dv.Set(v)
-}
-
-func newPtrDecoder(dt, st reflect.Type) decoderFunc {
-	dec := &ptrDecoder{typeDecoder(dt.Elem(), st)}
-
-	return dec.decode
-}
-
-func unmarshalerDecoder(dv, sv reflect.Value) {
-	// modeled off of https://golang.org/src/encoding/json/decode.go?#L325
-	if dv.Kind() != reflect.Ptr && dv.Type().Name() != "" && dv.CanAddr() {
-		dv = dv.Addr()
-	}
-
-	if dv.IsNil() {
-		dv.Set(reflect.New(dv.Type().Elem()))
-	}
-
-	u := dv.Interface().(Unmarshaler)
-	err := u.UnmarshalRQL(sv.Interface())
-	if err != nil {
-		panic(&DecodeTypeError{dv.Type(), sv.Type(), err.Error()})
-	}
-}
-
-// Boolean decoders
-
-func boolAsBoolDecoder(dv, sv reflect.Value) {
-	dv.SetBool(sv.Bool())
-}
-func boolAsIntDecoder(dv, sv reflect.Value) {
-	if sv.Bool() {
-		dv.SetInt(1)
-	} else {
-		dv.SetInt(0)
-	}
-}
-func boolAsUintDecoder(dv, sv reflect.Value) {
-	if sv.Bool() {
-		dv.SetUint(1)
-	} else {
-		dv.SetUint(0)
-	}
-}
-func boolAsFloatDecoder(dv, sv reflect.Value) {
-	if sv.Bool() {
-		dv.SetFloat(1)
-	} else {
-		dv.SetFloat(0)
-	}
-}
-func boolAsStringDecoder(dv, sv reflect.Value) {
-	if sv.Bool() {
-		dv.SetString("1")
-	} else {
-		dv.SetString("0")
-	}
-}
-
-// Int decoders
-
-func intAsBoolDecoder(dv, sv reflect.Value) {
-	dv.SetBool(sv.Int() != 0)
-}
-func intAsIntDecoder(dv, sv reflect.Value) {
-	dv.SetInt(sv.Int())
-}
-func intAsUintDecoder(dv, sv reflect.Value) {
-	dv.SetUint(uint64(sv.Int()))
-}
-func intAsFloatDecoder(dv, sv reflect.Value) {
-	dv.SetFloat(float64(sv.Int()))
-}
-func intAsStringDecoder(dv, sv reflect.Value) {
-	dv.SetString(strconv.FormatInt(sv.Int(), 10))
-}
-
-// Uint decoders
-
-func uintAsBoolDecoder(dv, sv reflect.Value) {
-	dv.SetBool(sv.Uint() != 0)
-}
-func uintAsIntDecoder(dv, sv reflect.Value) {
-	dv.SetInt(int64(sv.Uint()))
-}
-func uintAsUintDecoder(dv, sv reflect.Value) {
-	dv.SetUint(sv.Uint())
-}
-func uintAsFloatDecoder(dv, sv reflect.Value) {
-	dv.SetFloat(float64(sv.Uint()))
-}
-func uintAsStringDecoder(dv, sv reflect.Value) {
-	dv.SetString(strconv.FormatUint(sv.Uint(), 10))
-}
-
-// Float decoders
-
-func floatAsBoolDecoder(dv, sv reflect.Value) {
-	dv.SetBool(sv.Float() != 0)
-}
-func floatAsIntDecoder(dv, sv reflect.Value) {
-	dv.SetInt(int64(sv.Float()))
-}
-func floatAsUintDecoder(dv, sv reflect.Value) {
-	dv.SetUint(uint64(sv.Float()))
-}
-func floatAsFloatDecoder(dv, sv reflect.Value) {
-	dv.SetFloat(float64(sv.Float()))
-}
-func floatAsStringDecoder(dv, sv reflect.Value) {
-	dv.SetString(strconv.FormatFloat(sv.Float(), 'f', -1, 64))
-}
-
-// String decoders
-
-func stringAsBoolDecoder(dv, sv reflect.Value) {
-	b, err := strconv.ParseBool(sv.String())
-	if err == nil {
-		dv.SetBool(b)
-	} else if sv.String() == "" {
-		dv.SetBool(false)
-	} else {
-		panic(&DecodeTypeError{dv.Type(), sv.Type(), err.Error()})
-	}
-}
-func stringAsIntDecoder(dv, sv reflect.Value) {
-	i, err := strconv.ParseInt(sv.String(), 0, dv.Type().Bits())
-	if err == nil {
-		dv.SetInt(i)
-	} else {
-		panic(&DecodeTypeError{dv.Type(), sv.Type(), err.Error()})
-	}
-}
-func stringAsUintDecoder(dv, sv reflect.Value) {
-	i, err := strconv.ParseUint(sv.String(), 0, dv.Type().Bits())
-	if err == nil {
-		dv.SetUint(i)
-	} else {
-		panic(&DecodeTypeError{dv.Type(), sv.Type(), err.Error()})
-	}
-}
-func stringAsFloatDecoder(dv, sv reflect.Value) {
-	f, err := strconv.ParseFloat(sv.String(), dv.Type().Bits())
-	if err == nil {
-		dv.SetFloat(f)
-	} else {
-		panic(&DecodeTypeError{dv.Type(), sv.Type(), err.Error()})
-	}
-}
-func stringAsStringDecoder(dv, sv reflect.Value) {
-	dv.SetString(sv.String())
-}
-
-// Slice/Array decoder
-
-type sliceDecoder struct {
-	arrayDec decoderFunc
-}
-
-func (d *sliceDecoder) decode(dv, sv reflect.Value) {
-	if dv.Kind() == reflect.Slice {
-		dv.Set(reflect.MakeSlice(dv.Type(), dv.Len(), dv.Cap()))
-	}
-
-	if !sv.IsNil() {
-		d.arrayDec(dv, sv)
-	}
-}
-
-func newSliceDecoder(dt, st reflect.Type) decoderFunc {
-	// Byte slices get special treatment; arrays don't.
-	// if t.Elem().Kind() == reflect.Uint8 {
-	// 	return decodeByteSlice
-	// }
-	dec := &sliceDecoder{newArrayDecoder(dt, st)}
-	return dec.decode
-}
-
-type arrayDecoder struct {
-	elemDec decoderFunc
-}
-
-func (d *arrayDecoder) decode(dv, sv reflect.Value) {
-	// Iterate through the slice/array and decode each element before adding it
-	// to the dest slice/array
-	i := 0
-	for i < sv.Len() {
-		if dv.Kind() == reflect.Slice {
-			// Get element of array, growing if necessary.
-			if i >= dv.Cap() {
-				newcap := dv.Cap() + dv.Cap()/2
-				if newcap < 4 {
-					newcap = 4
-				}
-				newdv := reflect.MakeSlice(dv.Type(), dv.Len(), newcap)
-				reflect.Copy(newdv, dv)
-				dv.Set(newdv)
-			}
-			if i >= dv.Len() {
-				dv.SetLen(i + 1)
-			}
-		}
-
-		if i < dv.Len() {
-			// Decode into element.
-			d.elemDec(dv.Index(i), sv.Index(i))
-		}
-
-		i++
-	}
-
-	// Ensure that the destination is the correct size
-	if i < dv.Len() {
-		if dv.Kind() == reflect.Array {
-			// Array.  Zero the rest.
-			z := reflect.Zero(dv.Type().Elem())
-			for ; i < dv.Len(); i++ {
-				dv.Index(i).Set(z)
-			}
-		} else {
-			dv.SetLen(i)
-		}
-	}
-}
-
-func newArrayDecoder(dt, st reflect.Type) decoderFunc {
-	dec := &arrayDecoder{typeDecoder(dt.Elem(), st.Elem())}
-	return dec.decode
-}
-
-// Map decoder
-
-type mapAsMapDecoder struct {
-	keyDec, elemDec decoderFunc
-}
-
-func (d *mapAsMapDecoder) decode(dv, sv reflect.Value) {
-	dt := dv.Type()
-	dv.Set(reflect.MakeMap(reflect.MapOf(dt.Key(), dt.Elem())))
-
-	var mapKey reflect.Value
-	var mapElem reflect.Value
-
-	keyType := dv.Type().Key()
-	elemType := dv.Type().Elem()
-
-	for _, sElemKey := range sv.MapKeys() {
-		var dElemKey reflect.Value
-		var dElemVal reflect.Value
-
-		if !mapKey.IsValid() {
-			mapKey = reflect.New(keyType).Elem()
-		} else {
-			mapKey.Set(reflect.Zero(keyType))
-		}
-		dElemKey = mapKey
-
-		if !mapElem.IsValid() {
-			mapElem = reflect.New(elemType).Elem()
-		} else {
-			mapElem.Set(reflect.Zero(elemType))
-		}
-		dElemVal = mapElem
-
-		d.keyDec(dElemKey, sElemKey)
-		d.elemDec(dElemVal, sv.MapIndex(sElemKey))
-
-		dv.SetMapIndex(dElemKey, dElemVal)
-	}
-}
-
-func newMapAsMapDecoder(dt, st reflect.Type) decoderFunc {
-	d := &mapAsMapDecoder{typeDecoder(dt.Key(), st.Key()), typeDecoder(dt.Elem(), st.Elem())}
-	return d.decode
-}
-
-type mapAsStructDecoder struct {
-	fields    []field
-	fieldDecs []decoderFunc
-}
-
-func (d *mapAsStructDecoder) decode(dv, sv reflect.Value) {
-	for _, kv := range sv.MapKeys() {
-		var f *field
-		var fieldDec decoderFunc
-		key := []byte(kv.String())
-		for i := range d.fields {
-			ff := &d.fields[i]
-			ffd := d.fieldDecs[i]
-			if bytes.Equal(ff.nameBytes, key) {
-				f = ff
-				fieldDec = ffd
-				break
-			}
-			if f == nil && ff.equalFold(ff.nameBytes, key) {
-				f = ff
-				fieldDec = ffd
-			}
-		}
-
-		if f == nil {
-			continue
-		}
-
-		dElemVal := fieldByIndex(dv, f.index)
-		sElemVal := sv.MapIndex(kv)
-
-		if !sElemVal.IsValid() || !dElemVal.CanSet() {
-			continue
-		}
-
-		fieldDec(dElemVal, sElemVal)
-	}
-}
-
-func newMapAsStructDecoder(dt, st reflect.Type) decoderFunc {
-	fields := cachedTypeFields(dt)
-	se := &mapAsStructDecoder{
-		fields:    fields,
-		fieldDecs: make([]decoderFunc, len(fields)),
-	}
-	for i, f := range fields {
-		se.fieldDecs[i] = typeDecoder(typeByIndex(dt, f.index), st.Elem())
-	}
-	return se.decode
-}
diff --git a/Godeps/_workspace/src/github.com/dancannon/gorethink/encoding/encoder.go b/Godeps/_workspace/src/github.com/dancannon/gorethink/encoding/encoder.go
deleted file mode 100644
index 3b0d3508d..000000000
--- a/Godeps/_workspace/src/github.com/dancannon/gorethink/encoding/encoder.go
+++ /dev/null
@@ -1,89 +0,0 @@
-// This code is based on encoding/json and gorilla/schema
-
-package encoding
-
-import (
-	"errors"
-	"reflect"
-	"runtime"
-	"sync"
-)
-
-type encoderFunc func(v reflect.Value) interface{}
-
-// Encode returns the encoded value of v.
-//
-// Encode  traverses the value v recursively and looks for structs. If a struct
-// is found then it is checked for tagged fields and convert to
-// map[string]interface{}
-func Encode(v interface{}) (ev interface{}, err error) {
-	defer func() {
-		if r := recover(); r != nil {
-			if _, ok := r.(runtime.Error); ok {
-				panic(r)
-			}
-			if v, ok := r.(string); ok {
-				err = errors.New(v)
-			} else {
-				err = r.(error)
-			}
-		}
-	}()
-
-	return encode(reflect.ValueOf(v)), nil
-}
-
-func encode(v reflect.Value) interface{} {
-	return valueEncoder(v)(v)
-}
-
-var encoderCache struct {
-	sync.RWMutex
-	m map[reflect.Type]encoderFunc
-}
-
-func valueEncoder(v reflect.Value) encoderFunc {
-	if !v.IsValid() {
-		return invalidValueEncoder
-	}
-	return typeEncoder(v.Type())
-}
-
-func typeEncoder(t reflect.Type) encoderFunc {
-	encoderCache.RLock()
-	f := encoderCache.m[t]
-	encoderCache.RUnlock()
-	if f != nil {
-		return f
-	}
-
-	// To deal with recursive types, populate the map with an
-	// indirect func before we build it. This type waits on the
-	// real func (f) to
-	//  be ready and then calls it.  This indirect
-	// func is only used for recursive types.
-	encoderCache.Lock()
-	var wg sync.WaitGroup
-	wg.Add(1)
-	encoderCache.m[t] = func(v reflect.Value) interface{} {
-		wg.Wait()
-		return f(v)
-	}
-	encoderCache.Unlock()
-
-	// Compute fields without lock.
-	// Might duplicate effort but won't hold other computations back.
-	f = newTypeEncoder(t, true)
-	wg.Done()
-	encoderCache.Lock()
-	encoderCache.m[t] = f
-	encoderCache.Unlock()
-	return f
-}
-
-// IgnoreType causes the encoder to ignore a type when encoding
-func IgnoreType(t reflect.Type) {
-	encoderCache.Lock()
-	encoderCache.m[t] = doNothingEncoder
-	encoderCache.Unlock()
-}
diff --git a/Godeps/_workspace/src/github.com/dancannon/gorethink/encoding/encoder_test.go b/Godeps/_workspace/src/github.com/dancannon/gorethink/encoding/encoder_test.go
deleted file mode 100644
index 7b1ee0614..000000000
--- a/Godeps/_workspace/src/github.com/dancannon/gorethink/encoding/encoder_test.go
+++ /dev/null
@@ -1,262 +0,0 @@
-package encoding
-
-import (
-	"image"
-	"reflect"
-	"testing"
-	"time"
-)
-
-var encodeExpected = map[string]interface{}{
-	"Level0":  int64(1),
-	"Level1b": int64(2),
-	"Level1c": int64(3),
-	"Level1a": int64(5),
-	"LEVEL1B": int64(6),
-	"e": map[string]interface{}{
-		"Level1a": int64(8),
-		"Level1b": int64(9),
-		"Level1c": int64(10),
-		"Level1d": int64(11),
-		"x":       int64(12),
-	},
-	"Loop1": int64(13),
-	"Loop2": int64(14),
-	"X":     int64(15),
-	"Y":     int64(16),
-	"Z":     int64(17),
-}
-
-func TestEncode(t *testing.T) {
-	// Top is defined in decoder_test.go
-	var in = Top{
-		Level0: 1,
-		Embed0: Embed0{
-			Level1b: 2,
-			Level1c: 3,
-		},
-		Embed0a: &Embed0a{
-			Level1a: 5,
-			Level1b: 6,
-		},
-		Embed0b: &Embed0b{
-			Level1a: 8,
-			Level1b: 9,
-			Level1c: 10,
-			Level1d: 11,
-			Level1e: 12,
-		},
-		Loop: Loop{
-			Loop1: 13,
-			Loop2: 14,
-		},
-		Embed0p: Embed0p{
-			Point: image.Point{X: 15, Y: 16},
-		},
-		Embed0q: Embed0q{
-			Point: Point{Z: 17},
-		},
-	}
-
-	got, err := Encode(&in)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if !reflect.DeepEqual(got, encodeExpected) {
-		t.Errorf(" got: %v\nwant: %v\n", got, encodeExpected)
-	}
-}
-
-type Optionals struct {
-	Sr string `gorethink:"sr"`
-	So string `gorethink:"so,omitempty"`
-	Sw string `gorethink:"-"`
-
-	Ir int `gorethink:"omitempty"` // actually named omitempty, not an option
-	Io int `gorethink:"io,omitempty"`
-
-	Tr time.Time `gorethink:"tr"`
-	To time.Time `gorethink:"to,omitempty"`
-
-	Slr []string `gorethink:"slr"`
-	Slo []string `gorethink:"slo,omitempty"`
-
-	Mr map[string]interface{} `gorethink:"mr"`
-	Mo map[string]interface{} `gorethink:",omitempty"`
-}
-
-var optionalsExpected = map[string]interface{}{
-	"sr":        "",
-	"omitempty": int64(0),
-	"tr":        map[string]interface{}{"$reql_type$": "TIME", "epoch_time": 0, "timezone": "+00:00"},
-	"slr":       []interface{}{},
-	"mr":        map[string]interface{}{},
-}
-
-func TestOmitEmpty(t *testing.T) {
-	var o Optionals
-	o.Sw = "something"
-	o.Tr = time.Unix(0, 0)
-	o.Mr = map[string]interface{}{}
-	o.Mo = map[string]interface{}{}
-
-	got, err := Encode(&o)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if !jsonEqual(got, optionalsExpected) {
-		t.Errorf("\ngot:  %#v\nwant: %#v\n", got, optionalsExpected)
-	}
-}
-
-type IntType int
-
-type MyStruct struct {
-	IntType
-}
-
-func TestAnonymousNonstruct(t *testing.T) {
-	var i IntType = 11
-	a := MyStruct{i}
-	var want = map[string]interface{}{"IntType": int64(11)}
-
-	got, err := Encode(a)
-	if err != nil {
-		t.Fatalf("Encode: %v", err)
-	}
-	if !reflect.DeepEqual(got, want) {
-		t.Errorf("got %v, want %v", got, want)
-	}
-}
-
-func TestEncodePointer(t *testing.T) {
-	v := Pointer{PPoint: &Point{Z: 1}, Point: Point{Z: 2}}
-	var want = map[string]interface{}{
-		"PPoint": map[string]interface{}{"Z": int64(1)},
-		"Point":  map[string]interface{}{"Z": int64(2)},
-	}
-
-	got, err := Encode(v)
-	if err != nil {
-		t.Fatalf("Encode: %v", err)
-	}
-	if !reflect.DeepEqual(got, want) {
-		t.Errorf("got %v, want %v", got, want)
-	}
-}
-
-func TestEncodeNilPointer(t *testing.T) {
-	v := Pointer{PPoint: nil, Point: Point{Z: 2}}
-	var want = map[string]interface{}{
-		"PPoint": nil,
-		"Point":  map[string]interface{}{"Z": int64(2)},
-	}
-
-	got, err := Encode(v)
-	if err != nil {
-		t.Fatalf("Encode: %v", err)
-	}
-	if !reflect.DeepEqual(got, want) {
-		t.Errorf("got %v, want %v", got, want)
-	}
-}
-
-type BugA struct {
-	S string
-}
-
-type BugB struct {
-	BugA
-	S string
-}
-
-type BugC struct {
-	S string
-}
-
-// Legal Go: We never use the repeated embedded field (S).
-type BugX struct {
-	A int
-	BugA
-	BugB
-}
-
-// Issue 5245.
-func TestEmbeddedBug(t *testing.T) {
-	v := BugB{
-		BugA{"A"},
-		"B",
-	}
-	got, err := Encode(v)
-	if err != nil {
-		t.Fatal("Encode:", err)
-	}
-	want := map[string]interface{}{"S": "B"}
-	if !reflect.DeepEqual(got, want) {
-		t.Fatalf("Encode: got %v want %v", got, want)
-	}
-	// Now check that the duplicate field, S, does not appear.
-	x := BugX{
-		A: 23,
-	}
-	got, err = Encode(x)
-	if err != nil {
-		t.Fatal("Encode:", err)
-	}
-	want = map[string]interface{}{"A": int64(23)}
-	if !reflect.DeepEqual(got, want) {
-		t.Fatalf("Encode: got %v want %v", got, want)
-	}
-}
-
-type BugD struct { // Same as BugA after tagging.
-	XXX string `gorethink:"S"`
-}
-
-// BugD's tagged S field should dominate BugA's.
-type BugY struct {
-	BugA
-	BugD
-}
-
-// Test that a field with a tag dominates untagged fields.
-func TestTaggedFieldDominates(t *testing.T) {
-	v := BugY{
-		BugA{"BugA"},
-		BugD{"BugD"},
-	}
-	got, err := Encode(v)
-	if err != nil {
-		t.Fatal("Encode:", err)
-	}
-	want := map[string]interface{}{"S": "BugD"}
-	if !reflect.DeepEqual(got, want) {
-		t.Fatalf("Encode: got %v want %v", got, want)
-	}
-}
-
-// There are no tags here, so S should not appear.
-type BugZ struct {
-	BugA
-	BugC
-	BugY // Contains a tagged S field through BugD; should not dominate.
-}
-
-func TestDuplicatedFieldDisappears(t *testing.T) {
-	v := BugZ{
-		BugA{"BugA"},
-		BugC{"BugC"},
-		BugY{
-			BugA{"nested BugA"},
-			BugD{"nested BugD"},
-		},
-	}
-	got, err := Encode(v)
-	if err != nil {
-		t.Fatal("Encode:", err)
-	}
-	want := map[string]interface{}{}
-	if !reflect.DeepEqual(got, want) {
-		t.Fatalf("Encode: got %v want %v", got, want)
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/dancannon/gorethink/encoding/encoder_types.go b/Godeps/_workspace/src/github.com/dancannon/gorethink/encoding/encoder_types.go
deleted file mode 100644
index de38a1905..000000000
--- a/Godeps/_workspace/src/github.com/dancannon/gorethink/encoding/encoder_types.go
+++ /dev/null
@@ -1,303 +0,0 @@
-package encoding
-
-import (
-	"encoding/base64"
-	"math"
-	"reflect"
-	"time"
-)
-
-// newTypeEncoder constructs an encoderFunc for a type.
-// The returned encoder only checks CanAddr when allowAddr is true.
-func newTypeEncoder(t reflect.Type, allowAddr bool) encoderFunc {
-	if t.Implements(marshalerType) {
-		return marshalerEncoder
-	}
-	if t.Kind() != reflect.Ptr && allowAddr {
-		if reflect.PtrTo(t).Implements(marshalerType) {
-			return newCondAddrEncoder(addrMarshalerEncoder, newTypeEncoder(t, false))
-		}
-	}
-
-	// Check for psuedo-types first
-	switch t {
-	case timeType:
-		return timePseudoTypeEncoder
-	}
-
-	switch t.Kind() {
-	case reflect.Bool:
-		return boolEncoder
-	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
-		return intEncoder
-	case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uintptr:
-		return uintEncoder
-	case reflect.Float32, reflect.Float64:
-		return floatEncoder
-	case reflect.String:
-		return stringEncoder
-	case reflect.Interface:
-		return interfaceEncoder
-	case reflect.Struct:
-		return newStructEncoder(t)
-	case reflect.Map:
-		return newMapEncoder(t)
-	case reflect.Slice:
-		return newSliceEncoder(t)
-	case reflect.Array:
-		return newArrayEncoder(t)
-	case reflect.Ptr:
-		return newPtrEncoder(t)
-	default:
-		return unsupportedTypeEncoder
-	}
-}
-
-func invalidValueEncoder(v reflect.Value) interface{} {
-	return nil
-}
-
-func doNothingEncoder(v reflect.Value) interface{} {
-	return v.Interface()
-}
-
-func marshalerEncoder(v reflect.Value) interface{} {
-	if v.Kind() == reflect.Ptr && v.IsNil() {
-		return nil
-	}
-	m := v.Interface().(Marshaler)
-	ev, err := m.MarshalRQL()
-	if err != nil {
-		panic(&MarshalerError{v.Type(), err})
-	}
-
-	return ev
-}
-
-func addrMarshalerEncoder(v reflect.Value) interface{} {
-	va := v.Addr()
-	if va.IsNil() {
-		return nil
-	}
-	m := va.Interface().(Marshaler)
-	ev, err := m.MarshalRQL()
-	if err != nil {
-		panic(&MarshalerError{v.Type(), err})
-	}
-
-	return ev
-}
-
-func boolEncoder(v reflect.Value) interface{} {
-	if v.Bool() {
-		return true
-	} else {
-		return false
-	}
-}
-
-func intEncoder(v reflect.Value) interface{} {
-	return v.Int()
-}
-
-func uintEncoder(v reflect.Value) interface{} {
-	return v.Uint()
-}
-
-func floatEncoder(v reflect.Value) interface{} {
-	return v.Float()
-}
-
-func stringEncoder(v reflect.Value) interface{} {
-	return v.String()
-}
-
-func interfaceEncoder(v reflect.Value) interface{} {
-	if v.IsNil() {
-		return nil
-	}
-	return encode(v.Elem())
-}
-
-func unsupportedTypeEncoder(v reflect.Value) interface{} {
-	panic(&UnsupportedTypeError{v.Type()})
-}
-
-type structEncoder struct {
-	fields    []field
-	fieldEncs []encoderFunc
-}
-
-func (se *structEncoder) encode(v reflect.Value) interface{} {
-	m := make(map[string]interface{})
-
-	for i, f := range se.fields {
-		fv := fieldByIndex(v, f.index)
-		if !fv.IsValid() || f.omitEmpty && se.isEmptyValue(fv) {
-			continue
-		}
-
-		m[f.name] = se.fieldEncs[i](fv)
-	}
-
-	return m
-}
-
-func (se *structEncoder) isEmptyValue(v reflect.Value) bool {
-	if v.Type() == timeType {
-		return v.Interface().(time.Time) == time.Time{}
-	}
-
-	return isEmptyValue(v)
-}
-
-func newStructEncoder(t reflect.Type) encoderFunc {
-	fields := cachedTypeFields(t)
-	se := &structEncoder{
-		fields:    fields,
-		fieldEncs: make([]encoderFunc, len(fields)),
-	}
-	for i, f := range fields {
-		se.fieldEncs[i] = typeEncoder(typeByIndex(t, f.index))
-	}
-	return se.encode
-}
-
-type mapEncoder struct {
-	elemEnc encoderFunc
-}
-
-func (me *mapEncoder) encode(v reflect.Value) interface{} {
-	if v.IsNil() {
-		return nil
-	}
-
-	m := make(map[string]interface{})
-
-	for _, k := range v.MapKeys() {
-		m[k.String()] = me.elemEnc(v.MapIndex(k))
-	}
-
-	return m
-}
-
-func newMapEncoder(t reflect.Type) encoderFunc {
-	if t.Key().Kind() != reflect.String {
-		return unsupportedTypeEncoder
-	}
-	me := &mapEncoder{typeEncoder(t.Elem())}
-	return me.encode
-}
-
-// sliceEncoder just wraps an arrayEncoder, checking to make sure the value isn't nil.
-type sliceEncoder struct {
-	arrayEnc encoderFunc
-}
-
-func (se *sliceEncoder) encode(v reflect.Value) interface{} {
-	if v.IsNil() {
-		return []interface{}{}
-	}
-	return se.arrayEnc(v)
-}
-
-func newSliceEncoder(t reflect.Type) encoderFunc {
-	// Byte slices get special treatment; arrays don't.
-	if t.Elem().Kind() == reflect.Uint8 {
-		return encodeByteSlice
-	}
-	enc := &sliceEncoder{newArrayEncoder(t)}
-	return enc.encode
-}
-
-type arrayEncoder struct {
-	elemEnc encoderFunc
-}
-
-func (ae *arrayEncoder) encode(v reflect.Value) interface{} {
-	n := v.Len()
-
-	a := make([]interface{}, n)
-	for i := 0; i < n; i++ {
-		a[i] = ae.elemEnc(v.Index(i))
-	}
-
-	return a
-}
-
-func newArrayEncoder(t reflect.Type) encoderFunc {
-	enc := &arrayEncoder{typeEncoder(t.Elem())}
-	return enc.encode
-}
-
-type ptrEncoder struct {
-	elemEnc encoderFunc
-}
-
-func (pe *ptrEncoder) encode(v reflect.Value) interface{} {
-	if v.IsNil() {
-		return nil
-	}
-	return pe.elemEnc(v.Elem())
-}
-
-func newPtrEncoder(t reflect.Type) encoderFunc {
-	enc := &ptrEncoder{typeEncoder(t.Elem())}
-	return enc.encode
-}
-
-type condAddrEncoder struct {
-	canAddrEnc, elseEnc encoderFunc
-}
-
-func (ce *condAddrEncoder) encode(v reflect.Value) interface{} {
-	if v.CanAddr() {
-		return ce.canAddrEnc(v)
-	} else {
-		return ce.elseEnc(v)
-	}
-}
-
-// newCondAddrEncoder returns an encoder that checks whether its value
-// CanAddr and delegates to canAddrEnc if so, else to elseEnc.
-func newCondAddrEncoder(canAddrEnc, elseEnc encoderFunc) encoderFunc {
-	enc := &condAddrEncoder{canAddrEnc: canAddrEnc, elseEnc: elseEnc}
-	return enc.encode
-}
-
-// Pseudo-type encoders
-
-// Encode a time.Time value to the TIME RQL type
-func timePseudoTypeEncoder(v reflect.Value) interface{} {
-	t := v.Interface().(time.Time)
-
-	timeVal := float64(t.UnixNano()) / float64(time.Second)
-
-	// use seconds-since-epoch precision if time.Time `t`
-	// is before the oldest nanosecond time
-	if t.Before(time.Unix(0, math.MinInt64)) {
-		timeVal = float64(t.Unix())
-	}
-
-	return map[string]interface{}{
-		"$reql_type$": "TIME",
-		"epoch_time":  timeVal,
-		"timezone":    "+00:00",
-	}
-}
-
-// Encode a byte slice to the BINARY RQL type
-func encodeByteSlice(v reflect.Value) interface{} {
-	var b []byte
-	if !v.IsNil() {
-		b = v.Bytes()
-	}
-
-	dst := make([]byte, base64.StdEncoding.EncodedLen(len(b)))
-	base64.StdEncoding.Encode(dst, b)
-
-	return map[string]interface{}{
-		"$reql_type$": "BINARY",
-		"data":        string(dst),
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/dancannon/gorethink/encoding/encoding.go b/Godeps/_workspace/src/github.com/dancannon/gorethink/encoding/encoding.go
deleted file mode 100644
index 0169e1448..000000000
--- a/Godeps/_workspace/src/github.com/dancannon/gorethink/encoding/encoding.go
+++ /dev/null
@@ -1,32 +0,0 @@
-package encoding
-
-import (
-	"reflect"
-	"time"
-)
-
-var (
-	// type constants
-	stringType = reflect.TypeOf("")
-	timeType   = reflect.TypeOf(new(time.Time)).Elem()
-
-	marshalerType   = reflect.TypeOf(new(Marshaler)).Elem()
-	unmarshalerType = reflect.TypeOf(new(Unmarshaler)).Elem()
-)
-
-// Marshaler is the interface implemented by objects that
-// can marshal themselves into a valid RQL psuedo-type.
-type Marshaler interface {
-	MarshalRQL() (interface{}, error)
-}
-
-// Unmarshaler is the interface implemented by objects
-// that can unmarshal a psuedo-type object of themselves.
-type Unmarshaler interface {
-	UnmarshalRQL(interface{}) error
-}
-
-func init() {
-	encoderCache.m = make(map[reflect.Type]encoderFunc)
-	decoderCache.m = make(map[decoderCacheKey]decoderFunc)
-}
diff --git a/Godeps/_workspace/src/github.com/dancannon/gorethink/encoding/errors.go b/Godeps/_workspace/src/github.com/dancannon/gorethink/encoding/errors.go
deleted file mode 100644
index 8b9ac2c52..000000000
--- a/Godeps/_workspace/src/github.com/dancannon/gorethink/encoding/errors.go
+++ /dev/null
@@ -1,102 +0,0 @@
-package encoding
-
-import (
-	"fmt"
-	"reflect"
-	"strings"
-)
-
-type MarshalerError struct {
-	Type reflect.Type
-	Err  error
-}
-
-func (e *MarshalerError) Error() string {
-	return "gorethink: error calling MarshalRQL for type " + e.Type.String() + ": " + e.Err.Error()
-}
-
-type InvalidUnmarshalError struct {
-	Type reflect.Type
-}
-
-func (e *InvalidUnmarshalError) Error() string {
-	if e.Type == nil {
-		return "gorethink: UnmarshalRQL(nil)"
-	}
-
-	if e.Type.Kind() != reflect.Ptr {
-		return "gorethink: UnmarshalRQL(non-pointer " + e.Type.String() + ")"
-	}
-	return "gorethink: UnmarshalRQL(nil " + e.Type.String() + ")"
-}
-
-// An InvalidTypeError describes a value that was
-// not appropriate for a value of a specific Go type.
-type DecodeTypeError struct {
-	DestType, SrcType reflect.Type
-	Reason            string
-}
-
-func (e *DecodeTypeError) Error() string {
-	if e.Reason != "" {
-		return "gorethink: could not decode type " + e.SrcType.String() + " into Go value of type " + e.DestType.String() + ": " + e.Reason
-	} else {
-		return "gorethink: could not decode type " + e.SrcType.String() + " into Go value of type " + e.DestType.String()
-
-	}
-}
-
-// An UnsupportedTypeError is returned by Marshal when attempting
-// to encode an unsupported value type.
-type UnsupportedTypeError struct {
-	Type reflect.Type
-}
-
-func (e *UnsupportedTypeError) Error() string {
-	return "gorethink: unsupported type: " + e.Type.String()
-}
-
-// An UnsupportedTypeError is returned by Marshal when attempting
-// to encode an unexpected value type.
-type UnexpectedTypeError struct {
-	DestType, SrcType reflect.Type
-}
-
-func (e *UnexpectedTypeError) Error() string {
-	return "gorethink: expected type: " + e.DestType.String() + ", got " + e.SrcType.String()
-}
-
-type UnsupportedValueError struct {
-	Value reflect.Value
-	Str   string
-}
-
-func (e *UnsupportedValueError) Error() string {
-	return "gorethink: unsupported value: " + e.Str
-}
-
-// Error implements the error interface and can represents multiple
-// errors that occur in the course of a single decode.
-type Error struct {
-	Errors []string
-}
-
-func (e *Error) Error() string {
-	points := make([]string, len(e.Errors))
-	for i, err := range e.Errors {
-		points[i] = fmt.Sprintf("* %s", err)
-	}
-
-	return fmt.Sprintf(
-		"%d error(s) decoding:\n\n%s",
-		len(e.Errors), strings.Join(points, "\n"))
-}
-
-func appendErrors(errors []string, err error) []string {
-	switch e := err.(type) {
-	case *Error:
-		return append(errors, e.Errors...)
-	default:
-		return append(errors, e.Error())
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/dancannon/gorethink/encoding/fold.go b/Godeps/_workspace/src/github.com/dancannon/gorethink/encoding/fold.go
deleted file mode 100644
index 21c9e68e4..000000000
--- a/Godeps/_workspace/src/github.com/dancannon/gorethink/encoding/fold.go
+++ /dev/null
@@ -1,139 +0,0 @@
-package encoding
-
-import (
-	"bytes"
-	"unicode/utf8"
-)
-
-const (
-	caseMask     = ^byte(0x20) // Mask to ignore case in ASCII.
-	kelvin       = '\u212a'
-	smallLongEss = '\u017f'
-)
-
-// foldFunc returns one of four different case folding equivalence
-// functions, from most general (and slow) to fastest:
-//
-// 1) bytes.EqualFold, if the key s contains any non-ASCII UTF-8
-// 2) equalFoldRight, if s contains special folding ASCII ('k', 'K', 's', 'S')
-// 3) asciiEqualFold, no special, but includes non-letters (including _)
-// 4) simpleLetterEqualFold, no specials, no non-letters.
-//
-// The letters S and K are special because they map to 3 runes, not just 2:
-//  * S maps to s and to U+017F 'ſ' Latin small letter long s
-//  * k maps to K and to U+212A 'K' Kelvin sign
-// See http://play.golang.org/p/tTxjOc0OGo
-//
-// The returned function is specialized for matching against s and
-// should only be given s. It's not curried for performance reasons.
-func foldFunc(s []byte) func(s, t []byte) bool {
-	nonLetter := false
-	special := false // special letter
-	for _, b := range s {
-		if b >= utf8.RuneSelf {
-			return bytes.EqualFold
-		}
-		upper := b & caseMask
-		if upper < 'A' || upper > 'Z' {
-			nonLetter = true
-		} else if upper == 'K' || upper == 'S' {
-			// See above for why these letters are special.
-			special = true
-		}
-	}
-	if special {
-		return equalFoldRight
-	}
-	if nonLetter {
-		return asciiEqualFold
-	}
-	return simpleLetterEqualFold
-}
-
-// equalFoldRight is a specialization of bytes.EqualFold when s is
-// known to be all ASCII (including punctuation), but contains an 's',
-// 'S', 'k', or 'K', requiring a Unicode fold on the bytes in t.
-// See comments on foldFunc.
-func equalFoldRight(s, t []byte) bool {
-	for _, sb := range s {
-		if len(t) == 0 {
-			return false
-		}
-		tb := t[0]
-		if tb < utf8.RuneSelf {
-			if sb != tb {
-				sbUpper := sb & caseMask
-				if 'A' <= sbUpper && sbUpper <= 'Z' {
-					if sbUpper != tb&caseMask {
-						return false
-					}
-				} else {
-					return false
-				}
-			}
-			t = t[1:]
-			continue
-		}
-		// sb is ASCII and t is not. t must be either kelvin
-		// sign or long s; sb must be s, S, k, or K.
-		tr, size := utf8.DecodeRune(t)
-		switch sb {
-		case 's', 'S':
-			if tr != smallLongEss {
-				return false
-			}
-		case 'k', 'K':
-			if tr != kelvin {
-				return false
-			}
-		default:
-			return false
-		}
-		t = t[size:]
-
-	}
-	if len(t) > 0 {
-		return false
-	}
-	return true
-}
-
-// asciiEqualFold is a specialization of bytes.EqualFold for use when
-// s is all ASCII (but may contain non-letters) and contains no
-// special-folding letters.
-// See comments on foldFunc.
-func asciiEqualFold(s, t []byte) bool {
-	if len(s) != len(t) {
-		return false
-	}
-	for i, sb := range s {
-		tb := t[i]
-		if sb == tb {
-			continue
-		}
-		if ('a' <= sb && sb <= 'z') || ('A' <= sb && sb <= 'Z') {
-			if sb&caseMask != tb&caseMask {
-				return false
-			}
-		} else {
-			return false
-		}
-	}
-	return true
-}
-
-// simpleLetterEqualFold is a specialization of bytes.EqualFold for
-// use when s is all ASCII letters (no underscores, etc) and also
-// doesn't contain 'k', 'K', 's', or 'S'.
-// See comments on foldFunc.
-func simpleLetterEqualFold(s, t []byte) bool {
-	if len(s) != len(t) {
-		return false
-	}
-	for i, b := range s {
-		if b&caseMask != t[i]&caseMask {
-			return false
-		}
-	}
-	return true
-}
diff --git a/Godeps/_workspace/src/github.com/dancannon/gorethink/encoding/tags.go b/Godeps/_workspace/src/github.com/dancannon/gorethink/encoding/tags.go
deleted file mode 100644
index cea3edaf1..000000000
--- a/Godeps/_workspace/src/github.com/dancannon/gorethink/encoding/tags.go
+++ /dev/null
@@ -1,69 +0,0 @@
-// This code is based on encoding/json and gorilla/schema
-
-package encoding
-
-import (
-	"reflect"
-	"strings"
-	"unicode"
-)
-
-const TagName = "gorethink"
-
-// tagOptions is the string following a comma in a struct field's
-// tag, or the empty string. It does not include the leading comma.
-type tagOptions string
-
-func getTag(sf reflect.StructField) string {
-	return sf.Tag.Get(TagName)
-}
-
-// parseTag splits a struct field's tag into its name and
-// comma-separated options.
-func parseTag(tag string) (string, tagOptions) {
-	if idx := strings.Index(tag, ","); idx != -1 {
-		return tag[:idx], tagOptions(tag[idx+1:])
-	}
-	return tag, tagOptions("")
-}
-
-func isValidTag(s string) bool {
-	if s == "" {
-		return false
-	}
-	for _, c := range s {
-		switch {
-		case strings.ContainsRune("!#$%&()*+-./:<=>?@[]^_{|}~ ", c):
-			// Backslash and quote chars are reserved, but
-			// otherwise any punctuation chars are allowed
-			// in a tag name.
-		default:
-			if !unicode.IsLetter(c) && !unicode.IsDigit(c) {
-				return false
-			}
-		}
-	}
-	return true
-}
-
-// Contains returns whether checks that a comma-separated list of options
-// contains a particular substr flag. substr must be surrounded by a
-// string boundary or commas.
-func (o tagOptions) Contains(optionName string) bool {
-	if len(o) == 0 {
-		return false
-	}
-	s := string(o)
-	for s != "" {
-		var next string
-		i := strings.Index(s, ",")
-		if i >= 0 {
-			s, next = s[:i], s[i+1:]
-		}
-		if s == optionName {
-			return true
-		}
-		s = next
-	}
-	return false
-}
diff --git a/Godeps/_workspace/src/github.com/dancannon/gorethink/encoding/utils.go b/Godeps/_workspace/src/github.com/dancannon/gorethink/encoding/utils.go
deleted file mode 100644
index 0ca2c7734..000000000
--- a/Godeps/_workspace/src/github.com/dancannon/gorethink/encoding/utils.go
+++ /dev/null
@@ -1,72 +0,0 @@
-package encoding
-
-import "reflect"
-
-func getTypeKind(t reflect.Type) reflect.Kind {
-	kind := t.Kind()
-
-	switch {
-	case kind >= reflect.Int && kind <= reflect.Int64:
-		return reflect.Int
-	case kind >= reflect.Uint && kind <= reflect.Uint64:
-		return reflect.Uint
-	case kind >= reflect.Float32 && kind <= reflect.Float64:
-		return reflect.Float32
-	default:
-		return kind
-	}
-}
-
-func isEmptyValue(v reflect.Value) bool {
-	switch v.Kind() {
-	case reflect.Array, reflect.Map, reflect.Slice, reflect.String:
-		return v.Len() == 0
-	case reflect.Bool:
-		return !v.Bool()
-	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
-		return v.Int() == 0
-	case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uintptr:
-		return v.Uint() == 0
-	case reflect.Float32, reflect.Float64:
-		return v.Float() == 0
-	case reflect.Interface, reflect.Ptr:
-		return v.IsNil()
-	}
-	return false
-}
-
-func fieldByIndex(v reflect.Value, index []int) reflect.Value {
-	for _, i := range index {
-		if v.Kind() == reflect.Ptr {
-			if v.IsNil() {
-				v.Set(reflect.New(v.Type().Elem()))
-			}
-			v = v.Elem()
-		}
-		v = v.Field(i)
-	}
-
-	return v
-}
-
-func typeByIndex(t reflect.Type, index []int) reflect.Type {
-	for _, i := range index {
-		if t.Kind() == reflect.Ptr {
-			t = t.Elem()
-		}
-		t = t.Field(i).Type
-	}
-	return t
-}
-
-// valueByString sorts reflect.Value by the string value, this is useful for
-// sorting the result of MapKeys
-type valueByString []reflect.Value
-
-func (x valueByString) Len() int { return len(x) }
-
-func (x valueByString) Swap(i, j int) { x[i], x[j] = x[j], x[i] }
-
-func (x valueByString) Less(i, j int) bool {
-	return x[i].String() < x[j].String()
-}
diff --git a/Godeps/_workspace/src/github.com/dancannon/gorethink/ql2/ql2.pb.go b/Godeps/_workspace/src/github.com/dancannon/gorethink/ql2/ql2.pb.go
deleted file mode 100644
index 54ac15198..000000000
--- a/Godeps/_workspace/src/github.com/dancannon/gorethink/ql2/ql2.pb.go
+++ /dev/null
@@ -1,1243 +0,0 @@
-// Code generated by protoc-gen-go.
-// source: ql2.proto
-// DO NOT EDIT!
-
-package ql2
-
-import proto "github.com/golang/protobuf/proto"
-import json "encoding/json"
-import math "math"
-
-// Reference proto, json, and math imports to suppress error if they are not otherwise used.
-var _ = proto.Marshal
-var _ = &json.SyntaxError{}
-var _ = math.Inf
-
-type VersionDummy_Version int32
-
-const (
-	VersionDummy_V0_1 VersionDummy_Version = 1063369270
-	VersionDummy_V0_2 VersionDummy_Version = 1915781601
-	VersionDummy_V0_3 VersionDummy_Version = 1601562686
-	VersionDummy_V0_4 VersionDummy_Version = 1074539808
-)
-
-var VersionDummy_Version_name = map[int32]string{
-	1063369270: "V0_1",
-	1915781601: "V0_2",
-	1601562686: "V0_3",
-	1074539808: "V0_4",
-}
-var VersionDummy_Version_value = map[string]int32{
-	"V0_1": 1063369270,
-	"V0_2": 1915781601,
-	"V0_3": 1601562686,
-	"V0_4": 1074539808,
-}
-
-func (x VersionDummy_Version) Enum() *VersionDummy_Version {
-	p := new(VersionDummy_Version)
-	*p = x
-	return p
-}
-func (x VersionDummy_Version) String() string {
-	return proto.EnumName(VersionDummy_Version_name, int32(x))
-}
-func (x VersionDummy_Version) MarshalJSON() ([]byte, error) {
-	return json.Marshal(x.String())
-}
-func (x *VersionDummy_Version) UnmarshalJSON(data []byte) error {
-	value, err := proto.UnmarshalJSONEnum(VersionDummy_Version_value, data, "VersionDummy_Version")
-	if err != nil {
-		return err
-	}
-	*x = VersionDummy_Version(value)
-	return nil
-}
-
-type VersionDummy_Protocol int32
-
-const (
-	VersionDummy_PROTOBUF VersionDummy_Protocol = 656407617
-	VersionDummy_JSON     VersionDummy_Protocol = 2120839367
-)
-
-var VersionDummy_Protocol_name = map[int32]string{
-	656407617:  "PROTOBUF",
-	2120839367: "JSON",
-}
-var VersionDummy_Protocol_value = map[string]int32{
-	"PROTOBUF": 656407617,
-	"JSON":     2120839367,
-}
-
-func (x VersionDummy_Protocol) Enum() *VersionDummy_Protocol {
-	p := new(VersionDummy_Protocol)
-	*p = x
-	return p
-}
-func (x VersionDummy_Protocol) String() string {
-	return proto.EnumName(VersionDummy_Protocol_name, int32(x))
-}
-func (x VersionDummy_Protocol) MarshalJSON() ([]byte, error) {
-	return json.Marshal(x.String())
-}
-func (x *VersionDummy_Protocol) UnmarshalJSON(data []byte) error {
-	value, err := proto.UnmarshalJSONEnum(VersionDummy_Protocol_value, data, "VersionDummy_Protocol")
-	if err != nil {
-		return err
-	}
-	*x = VersionDummy_Protocol(value)
-	return nil
-}
-
-type Query_QueryType int32
-
-const (
-	Query_START        Query_QueryType = 1
-	Query_CONTINUE     Query_QueryType = 2
-	Query_STOP         Query_QueryType = 3
-	Query_NOREPLY_WAIT Query_QueryType = 4
-)
-
-var Query_QueryType_name = map[int32]string{
-	1: "START",
-	2: "CONTINUE",
-	3: "STOP",
-	4: "NOREPLY_WAIT",
-}
-var Query_QueryType_value = map[string]int32{
-	"START":        1,
-	"CONTINUE":     2,
-	"STOP":         3,
-	"NOREPLY_WAIT": 4,
-}
-
-func (x Query_QueryType) Enum() *Query_QueryType {
-	p := new(Query_QueryType)
-	*p = x
-	return p
-}
-func (x Query_QueryType) String() string {
-	return proto.EnumName(Query_QueryType_name, int32(x))
-}
-func (x Query_QueryType) MarshalJSON() ([]byte, error) {
-	return json.Marshal(x.String())
-}
-func (x *Query_QueryType) UnmarshalJSON(data []byte) error {
-	value, err := proto.UnmarshalJSONEnum(Query_QueryType_value, data, "Query_QueryType")
-	if err != nil {
-		return err
-	}
-	*x = Query_QueryType(value)
-	return nil
-}
-
-type Frame_FrameType int32
-
-const (
-	Frame_POS Frame_FrameType = 1
-	Frame_OPT Frame_FrameType = 2
-)
-
-var Frame_FrameType_name = map[int32]string{
-	1: "POS",
-	2: "OPT",
-}
-var Frame_FrameType_value = map[string]int32{
-	"POS": 1,
-	"OPT": 2,
-}
-
-func (x Frame_FrameType) Enum() *Frame_FrameType {
-	p := new(Frame_FrameType)
-	*p = x
-	return p
-}
-func (x Frame_FrameType) String() string {
-	return proto.EnumName(Frame_FrameType_name, int32(x))
-}
-func (x Frame_FrameType) MarshalJSON() ([]byte, error) {
-	return json.Marshal(x.String())
-}
-func (x *Frame_FrameType) UnmarshalJSON(data []byte) error {
-	value, err := proto.UnmarshalJSONEnum(Frame_FrameType_value, data, "Frame_FrameType")
-	if err != nil {
-		return err
-	}
-	*x = Frame_FrameType(value)
-	return nil
-}
-
-type Response_ResponseType int32
-
-const (
-	Response_SUCCESS_ATOM     Response_ResponseType = 1
-	Response_SUCCESS_SEQUENCE Response_ResponseType = 2
-	Response_SUCCESS_PARTIAL  Response_ResponseType = 3
-	Response_WAIT_COMPLETE    Response_ResponseType = 4
-	Response_CLIENT_ERROR     Response_ResponseType = 16
-	Response_COMPILE_ERROR    Response_ResponseType = 17
-	Response_RUNTIME_ERROR    Response_ResponseType = 18
-)
-
-var Response_ResponseType_name = map[int32]string{
-	1:  "SUCCESS_ATOM",
-	2:  "SUCCESS_SEQUENCE",
-	3:  "SUCCESS_PARTIAL",
-	4:  "WAIT_COMPLETE",
-	16: "CLIENT_ERROR",
-	17: "COMPILE_ERROR",
-	18: "RUNTIME_ERROR",
-}
-var Response_ResponseType_value = map[string]int32{
-	"SUCCESS_ATOM":     1,
-	"SUCCESS_SEQUENCE": 2,
-	"SUCCESS_PARTIAL":  3,
-	"WAIT_COMPLETE":    4,
-	"CLIENT_ERROR":     16,
-	"COMPILE_ERROR":    17,
-	"RUNTIME_ERROR":    18,
-}
-
-func (x Response_ResponseType) Enum() *Response_ResponseType {
-	p := new(Response_ResponseType)
-	*p = x
-	return p
-}
-func (x Response_ResponseType) String() string {
-	return proto.EnumName(Response_ResponseType_name, int32(x))
-}
-func (x Response_ResponseType) MarshalJSON() ([]byte, error) {
-	return json.Marshal(x.String())
-}
-func (x *Response_ResponseType) UnmarshalJSON(data []byte) error {
-	value, err := proto.UnmarshalJSONEnum(Response_ResponseType_value, data, "Response_ResponseType")
-	if err != nil {
-		return err
-	}
-	*x = Response_ResponseType(value)
-	return nil
-}
-
-type Response_ResponseNote int32
-
-const (
-	Response_SEQUENCE_FEED       Response_ResponseNote = 1
-	Response_ATOM_FEED           Response_ResponseNote = 2
-	Response_ORDER_BY_LIMIT_FEED Response_ResponseNote = 3
-	Response_UNIONED_FEED        Response_ResponseNote = 4
-	Response_INCLUDES_STATES     Response_ResponseNote = 5
-)
-
-var Response_ResponseNote_name = map[int32]string{
-	1: "SEQUENCE_FEED",
-	2: "ATOM_FEED",
-	3: "ORDER_BY_LIMIT_FEED",
-	4: "UNIONED_FEED",
-	5: "INCLUDES_STATES",
-}
-var Response_ResponseNote_value = map[string]int32{
-	"SEQUENCE_FEED":       1,
-	"ATOM_FEED":           2,
-	"ORDER_BY_LIMIT_FEED": 3,
-	"UNIONED_FEED":        4,
-	"INCLUDES_STATES":     5,
-}
-
-func (x Response_ResponseNote) Enum() *Response_ResponseNote {
-	p := new(Response_ResponseNote)
-	*p = x
-	return p
-}
-func (x Response_ResponseNote) String() string {
-	return proto.EnumName(Response_ResponseNote_name, int32(x))
-}
-func (x Response_ResponseNote) MarshalJSON() ([]byte, error) {
-	return json.Marshal(x.String())
-}
-func (x *Response_ResponseNote) UnmarshalJSON(data []byte) error {
-	value, err := proto.UnmarshalJSONEnum(Response_ResponseNote_value, data, "Response_ResponseNote")
-	if err != nil {
-		return err
-	}
-	*x = Response_ResponseNote(value)
-	return nil
-}
-
-type Datum_DatumType int32
-
-const (
-	Datum_R_NULL   Datum_DatumType = 1
-	Datum_R_BOOL   Datum_DatumType = 2
-	Datum_R_NUM    Datum_DatumType = 3
-	Datum_R_STR    Datum_DatumType = 4
-	Datum_R_ARRAY  Datum_DatumType = 5
-	Datum_R_OBJECT Datum_DatumType = 6
-	Datum_R_JSON   Datum_DatumType = 7
-)
-
-var Datum_DatumType_name = map[int32]string{
-	1: "R_NULL",
-	2: "R_BOOL",
-	3: "R_NUM",
-	4: "R_STR",
-	5: "R_ARRAY",
-	6: "R_OBJECT",
-	7: "R_JSON",
-}
-var Datum_DatumType_value = map[string]int32{
-	"R_NULL":   1,
-	"R_BOOL":   2,
-	"R_NUM":    3,
-	"R_STR":    4,
-	"R_ARRAY":  5,
-	"R_OBJECT": 6,
-	"R_JSON":   7,
-}
-
-func (x Datum_DatumType) Enum() *Datum_DatumType {
-	p := new(Datum_DatumType)
-	*p = x
-	return p
-}
-func (x Datum_DatumType) String() string {
-	return proto.EnumName(Datum_DatumType_name, int32(x))
-}
-func (x Datum_DatumType) MarshalJSON() ([]byte, error) {
-	return json.Marshal(x.String())
-}
-func (x *Datum_DatumType) UnmarshalJSON(data []byte) error {
-	value, err := proto.UnmarshalJSONEnum(Datum_DatumType_value, data, "Datum_DatumType")
-	if err != nil {
-		return err
-	}
-	*x = Datum_DatumType(value)
-	return nil
-}
-
-type Term_TermType int32
-
-const (
-	Term_DATUM              Term_TermType = 1
-	Term_MAKE_ARRAY         Term_TermType = 2
-	Term_MAKE_OBJ           Term_TermType = 3
-	Term_VAR                Term_TermType = 10
-	Term_JAVASCRIPT         Term_TermType = 11
-	Term_UUID               Term_TermType = 169
-	Term_HTTP               Term_TermType = 153
-	Term_ERROR              Term_TermType = 12
-	Term_IMPLICIT_VAR       Term_TermType = 13
-	Term_DB                 Term_TermType = 14
-	Term_TABLE              Term_TermType = 15
-	Term_GET                Term_TermType = 16
-	Term_GET_ALL            Term_TermType = 78
-	Term_EQ                 Term_TermType = 17
-	Term_NE                 Term_TermType = 18
-	Term_LT                 Term_TermType = 19
-	Term_LE                 Term_TermType = 20
-	Term_GT                 Term_TermType = 21
-	Term_GE                 Term_TermType = 22
-	Term_NOT                Term_TermType = 23
-	Term_ADD                Term_TermType = 24
-	Term_SUB                Term_TermType = 25
-	Term_MUL                Term_TermType = 26
-	Term_DIV                Term_TermType = 27
-	Term_MOD                Term_TermType = 28
-	Term_APPEND             Term_TermType = 29
-	Term_PREPEND            Term_TermType = 80
-	Term_DIFFERENCE         Term_TermType = 95
-	Term_SET_INSERT         Term_TermType = 88
-	Term_SET_INTERSECTION   Term_TermType = 89
-	Term_SET_UNION          Term_TermType = 90
-	Term_SET_DIFFERENCE     Term_TermType = 91
-	Term_SLICE              Term_TermType = 30
-	Term_SKIP               Term_TermType = 70
-	Term_LIMIT              Term_TermType = 71
-	Term_OFFSETS_OF         Term_TermType = 87
-	Term_CONTAINS           Term_TermType = 93
-	Term_GET_FIELD          Term_TermType = 31
-	Term_KEYS               Term_TermType = 94
-	Term_OBJECT             Term_TermType = 143
-	Term_HAS_FIELDS         Term_TermType = 32
-	Term_WITH_FIELDS        Term_TermType = 96
-	Term_PLUCK              Term_TermType = 33
-	Term_WITHOUT            Term_TermType = 34
-	Term_MERGE              Term_TermType = 35
-	Term_BETWEEN_DEPRECATED Term_TermType = 36
-	Term_BETWEEN            Term_TermType = 182
-	Term_REDUCE             Term_TermType = 37
-	Term_MAP                Term_TermType = 38
-	Term_FILTER             Term_TermType = 39
-	Term_CONCAT_MAP         Term_TermType = 40
-	Term_ORDER_BY           Term_TermType = 41
-	Term_DISTINCT           Term_TermType = 42
-	Term_COUNT              Term_TermType = 43
-	Term_IS_EMPTY           Term_TermType = 86
-	Term_UNION              Term_TermType = 44
-	Term_NTH                Term_TermType = 45
-	Term_BRACKET            Term_TermType = 170
-	Term_INNER_JOIN         Term_TermType = 48
-	Term_OUTER_JOIN         Term_TermType = 49
-	Term_EQ_JOIN            Term_TermType = 50
-	Term_ZIP                Term_TermType = 72
-	Term_RANGE              Term_TermType = 173
-	Term_INSERT_AT          Term_TermType = 82
-	Term_DELETE_AT          Term_TermType = 83
-	Term_CHANGE_AT          Term_TermType = 84
-	Term_SPLICE_AT          Term_TermType = 85
-	Term_COERCE_TO          Term_TermType = 51
-	Term_TYPE_OF            Term_TermType = 52
-	Term_UPDATE             Term_TermType = 53
-	Term_DELETE             Term_TermType = 54
-	Term_REPLACE            Term_TermType = 55
-	Term_INSERT             Term_TermType = 56
-	Term_DB_CREATE          Term_TermType = 57
-	Term_DB_DROP            Term_TermType = 58
-	Term_DB_LIST            Term_TermType = 59
-	Term_TABLE_CREATE       Term_TermType = 60
-	Term_TABLE_DROP         Term_TermType = 61
-	Term_TABLE_LIST         Term_TermType = 62
-	Term_CONFIG             Term_TermType = 174
-	Term_STATUS             Term_TermType = 175
-	Term_WAIT               Term_TermType = 177
-	Term_RECONFIGURE        Term_TermType = 176
-	Term_REBALANCE          Term_TermType = 179
-	Term_SYNC               Term_TermType = 138
-	Term_INDEX_CREATE       Term_TermType = 75
-	Term_INDEX_DROP         Term_TermType = 76
-	Term_INDEX_LIST         Term_TermType = 77
-	Term_INDEX_STATUS       Term_TermType = 139
-	Term_INDEX_WAIT         Term_TermType = 140
-	Term_INDEX_RENAME       Term_TermType = 156
-	Term_FUNCALL            Term_TermType = 64
-	Term_BRANCH             Term_TermType = 65
-	Term_OR                 Term_TermType = 66
-	Term_AND                Term_TermType = 67
-	Term_FOR_EACH           Term_TermType = 68
-	Term_FUNC               Term_TermType = 69
-	Term_ASC                Term_TermType = 73
-	Term_DESC               Term_TermType = 74
-	Term_INFO               Term_TermType = 79
-	Term_MATCH              Term_TermType = 97
-	Term_UPCASE             Term_TermType = 141
-	Term_DOWNCASE           Term_TermType = 142
-	Term_SAMPLE             Term_TermType = 81
-	Term_DEFAULT            Term_TermType = 92
-	Term_JSON               Term_TermType = 98
-	Term_TO_JSON_STRING     Term_TermType = 172
-	Term_ISO8601            Term_TermType = 99
-	Term_TO_ISO8601         Term_TermType = 100
-	Term_EPOCH_TIME         Term_TermType = 101
-	Term_TO_EPOCH_TIME      Term_TermType = 102
-	Term_NOW                Term_TermType = 103
-	Term_IN_TIMEZONE        Term_TermType = 104
-	Term_DURING             Term_TermType = 105
-	Term_DATE               Term_TermType = 106
-	Term_TIME_OF_DAY        Term_TermType = 126
-	Term_TIMEZONE           Term_TermType = 127
-	Term_YEAR               Term_TermType = 128
-	Term_MONTH              Term_TermType = 129
-	Term_DAY                Term_TermType = 130
-	Term_DAY_OF_WEEK        Term_TermType = 131
-	Term_DAY_OF_YEAR        Term_TermType = 132
-	Term_HOURS              Term_TermType = 133
-	Term_MINUTES            Term_TermType = 134
-	Term_SECONDS            Term_TermType = 135
-	Term_TIME               Term_TermType = 136
-	Term_MONDAY             Term_TermType = 107
-	Term_TUESDAY            Term_TermType = 108
-	Term_WEDNESDAY          Term_TermType = 109
-	Term_THURSDAY           Term_TermType = 110
-	Term_FRIDAY             Term_TermType = 111
-	Term_SATURDAY           Term_TermType = 112
-	Term_SUNDAY             Term_TermType = 113
-	Term_JANUARY            Term_TermType = 114
-	Term_FEBRUARY           Term_TermType = 115
-	Term_MARCH              Term_TermType = 116
-	Term_APRIL              Term_TermType = 117
-	Term_MAY                Term_TermType = 118
-	Term_JUNE               Term_TermType = 119
-	Term_JULY               Term_TermType = 120
-	Term_AUGUST             Term_TermType = 121
-	Term_SEPTEMBER          Term_TermType = 122
-	Term_OCTOBER            Term_TermType = 123
-	Term_NOVEMBER           Term_TermType = 124
-	Term_DECEMBER           Term_TermType = 125
-	Term_LITERAL            Term_TermType = 137
-	Term_GROUP              Term_TermType = 144
-	Term_SUM                Term_TermType = 145
-	Term_AVG                Term_TermType = 146
-	Term_MIN                Term_TermType = 147
-	Term_MAX                Term_TermType = 148
-	Term_SPLIT              Term_TermType = 149
-	Term_UNGROUP            Term_TermType = 150
-	Term_RANDOM             Term_TermType = 151
-	Term_CHANGES            Term_TermType = 152
-	Term_ARGS               Term_TermType = 154
-	Term_BINARY             Term_TermType = 155
-	Term_GEOJSON            Term_TermType = 157
-	Term_TO_GEOJSON         Term_TermType = 158
-	Term_POINT              Term_TermType = 159
-	Term_LINE               Term_TermType = 160
-	Term_POLYGON            Term_TermType = 161
-	Term_DISTANCE           Term_TermType = 162
-	Term_INTERSECTS         Term_TermType = 163
-	Term_INCLUDES           Term_TermType = 164
-	Term_CIRCLE             Term_TermType = 165
-	Term_GET_INTERSECTING   Term_TermType = 166
-	Term_FILL               Term_TermType = 167
-	Term_GET_NEAREST        Term_TermType = 168
-	Term_POLYGON_SUB        Term_TermType = 171
-	Term_MINVAL             Term_TermType = 180
-	Term_MAXVAL             Term_TermType = 181
-)
-
-var Term_TermType_name = map[int32]string{
-	1:   "DATUM",
-	2:   "MAKE_ARRAY",
-	3:   "MAKE_OBJ",
-	10:  "VAR",
-	11:  "JAVASCRIPT",
-	169: "UUID",
-	153: "HTTP",
-	12:  "ERROR",
-	13:  "IMPLICIT_VAR",
-	14:  "DB",
-	15:  "TABLE",
-	16:  "GET",
-	78:  "GET_ALL",
-	17:  "EQ",
-	18:  "NE",
-	19:  "LT",
-	20:  "LE",
-	21:  "GT",
-	22:  "GE",
-	23:  "NOT",
-	24:  "ADD",
-	25:  "SUB",
-	26:  "MUL",
-	27:  "DIV",
-	28:  "MOD",
-	29:  "APPEND",
-	80:  "PREPEND",
-	95:  "DIFFERENCE",
-	88:  "SET_INSERT",
-	89:  "SET_INTERSECTION",
-	90:  "SET_UNION",
-	91:  "SET_DIFFERENCE",
-	30:  "SLICE",
-	70:  "SKIP",
-	71:  "LIMIT",
-	87:  "OFFSETS_OF",
-	93:  "CONTAINS",
-	31:  "GET_FIELD",
-	94:  "KEYS",
-	143: "OBJECT",
-	32:  "HAS_FIELDS",
-	96:  "WITH_FIELDS",
-	33:  "PLUCK",
-	34:  "WITHOUT",
-	35:  "MERGE",
-	36:  "BETWEEN_DEPRECATED",
-	182: "BETWEEN",
-	37:  "REDUCE",
-	38:  "MAP",
-	39:  "FILTER",
-	40:  "CONCAT_MAP",
-	41:  "ORDER_BY",
-	42:  "DISTINCT",
-	43:  "COUNT",
-	86:  "IS_EMPTY",
-	44:  "UNION",
-	45:  "NTH",
-	170: "BRACKET",
-	48:  "INNER_JOIN",
-	49:  "OUTER_JOIN",
-	50:  "EQ_JOIN",
-	72:  "ZIP",
-	173: "RANGE",
-	82:  "INSERT_AT",
-	83:  "DELETE_AT",
-	84:  "CHANGE_AT",
-	85:  "SPLICE_AT",
-	51:  "COERCE_TO",
-	52:  "TYPE_OF",
-	53:  "UPDATE",
-	54:  "DELETE",
-	55:  "REPLACE",
-	56:  "INSERT",
-	57:  "DB_CREATE",
-	58:  "DB_DROP",
-	59:  "DB_LIST",
-	60:  "TABLE_CREATE",
-	61:  "TABLE_DROP",
-	62:  "TABLE_LIST",
-	174: "CONFIG",
-	175: "STATUS",
-	177: "WAIT",
-	176: "RECONFIGURE",
-	179: "REBALANCE",
-	138: "SYNC",
-	75:  "INDEX_CREATE",
-	76:  "INDEX_DROP",
-	77:  "INDEX_LIST",
-	139: "INDEX_STATUS",
-	140: "INDEX_WAIT",
-	156: "INDEX_RENAME",
-	64:  "FUNCALL",
-	65:  "BRANCH",
-	66:  "OR",
-	67:  "AND",
-	68:  "FOR_EACH",
-	69:  "FUNC",
-	73:  "ASC",
-	74:  "DESC",
-	79:  "INFO",
-	97:  "MATCH",
-	141: "UPCASE",
-	142: "DOWNCASE",
-	81:  "SAMPLE",
-	92:  "DEFAULT",
-	98:  "JSON",
-	172: "TO_JSON_STRING",
-	99:  "ISO8601",
-	100: "TO_ISO8601",
-	101: "EPOCH_TIME",
-	102: "TO_EPOCH_TIME",
-	103: "NOW",
-	104: "IN_TIMEZONE",
-	105: "DURING",
-	106: "DATE",
-	126: "TIME_OF_DAY",
-	127: "TIMEZONE",
-	128: "YEAR",
-	129: "MONTH",
-	130: "DAY",
-	131: "DAY_OF_WEEK",
-	132: "DAY_OF_YEAR",
-	133: "HOURS",
-	134: "MINUTES",
-	135: "SECONDS",
-	136: "TIME",
-	107: "MONDAY",
-	108: "TUESDAY",
-	109: "WEDNESDAY",
-	110: "THURSDAY",
-	111: "FRIDAY",
-	112: "SATURDAY",
-	113: "SUNDAY",
-	114: "JANUARY",
-	115: "FEBRUARY",
-	116: "MARCH",
-	117: "APRIL",
-	118: "MAY",
-	119: "JUNE",
-	120: "JULY",
-	121: "AUGUST",
-	122: "SEPTEMBER",
-	123: "OCTOBER",
-	124: "NOVEMBER",
-	125: "DECEMBER",
-	137: "LITERAL",
-	144: "GROUP",
-	145: "SUM",
-	146: "AVG",
-	147: "MIN",
-	148: "MAX",
-	149: "SPLIT",
-	150: "UNGROUP",
-	151: "RANDOM",
-	152: "CHANGES",
-	154: "ARGS",
-	155: "BINARY",
-	157: "GEOJSON",
-	158: "TO_GEOJSON",
-	159: "POINT",
-	160: "LINE",
-	161: "POLYGON",
-	162: "DISTANCE",
-	163: "INTERSECTS",
-	164: "INCLUDES",
-	165: "CIRCLE",
-	166: "GET_INTERSECTING",
-	167: "FILL",
-	168: "GET_NEAREST",
-	171: "POLYGON_SUB",
-	180: "MINVAL",
-	181: "MAXVAL",
-}
-var Term_TermType_value = map[string]int32{
-	"DATUM":              1,
-	"MAKE_ARRAY":         2,
-	"MAKE_OBJ":           3,
-	"VAR":                10,
-	"JAVASCRIPT":         11,
-	"UUID":               169,
-	"HTTP":               153,
-	"ERROR":              12,
-	"IMPLICIT_VAR":       13,
-	"DB":                 14,
-	"TABLE":              15,
-	"GET":                16,
-	"GET_ALL":            78,
-	"EQ":                 17,
-	"NE":                 18,
-	"LT":                 19,
-	"LE":                 20,
-	"GT":                 21,
-	"GE":                 22,
-	"NOT":                23,
-	"ADD":                24,
-	"SUB":                25,
-	"MUL":                26,
-	"DIV":                27,
-	"MOD":                28,
-	"APPEND":             29,
-	"PREPEND":            80,
-	"DIFFERENCE":         95,
-	"SET_INSERT":         88,
-	"SET_INTERSECTION":   89,
-	"SET_UNION":          90,
-	"SET_DIFFERENCE":     91,
-	"SLICE":              30,
-	"SKIP":               70,
-	"LIMIT":              71,
-	"OFFSETS_OF":         87,
-	"CONTAINS":           93,
-	"GET_FIELD":          31,
-	"KEYS":               94,
-	"OBJECT":             143,
-	"HAS_FIELDS":         32,
-	"WITH_FIELDS":        96,
-	"PLUCK":              33,
-	"WITHOUT":            34,
-	"MERGE":              35,
-	"BETWEEN_DEPRECATED": 36,
-	"BETWEEN":            182,
-	"REDUCE":             37,
-	"MAP":                38,
-	"FILTER":             39,
-	"CONCAT_MAP":         40,
-	"ORDER_BY":           41,
-	"DISTINCT":           42,
-	"COUNT":              43,
-	"IS_EMPTY":           86,
-	"UNION":              44,
-	"NTH":                45,
-	"BRACKET":            170,
-	"INNER_JOIN":         48,
-	"OUTER_JOIN":         49,
-	"EQ_JOIN":            50,
-	"ZIP":                72,
-	"RANGE":              173,
-	"INSERT_AT":          82,
-	"DELETE_AT":          83,
-	"CHANGE_AT":          84,
-	"SPLICE_AT":          85,
-	"COERCE_TO":          51,
-	"TYPE_OF":            52,
-	"UPDATE":             53,
-	"DELETE":             54,
-	"REPLACE":            55,
-	"INSERT":             56,
-	"DB_CREATE":          57,
-	"DB_DROP":            58,
-	"DB_LIST":            59,
-	"TABLE_CREATE":       60,
-	"TABLE_DROP":         61,
-	"TABLE_LIST":         62,
-	"CONFIG":             174,
-	"STATUS":             175,
-	"WAIT":               177,
-	"RECONFIGURE":        176,
-	"REBALANCE":          179,
-	"SYNC":               138,
-	"INDEX_CREATE":       75,
-	"INDEX_DROP":         76,
-	"INDEX_LIST":         77,
-	"INDEX_STATUS":       139,
-	"INDEX_WAIT":         140,
-	"INDEX_RENAME":       156,
-	"FUNCALL":            64,
-	"BRANCH":             65,
-	"OR":                 66,
-	"AND":                67,
-	"FOR_EACH":           68,
-	"FUNC":               69,
-	"ASC":                73,
-	"DESC":               74,
-	"INFO":               79,
-	"MATCH":              97,
-	"UPCASE":             141,
-	"DOWNCASE":           142,
-	"SAMPLE":             81,
-	"DEFAULT":            92,
-	"JSON":               98,
-	"TO_JSON_STRING":     172,
-	"ISO8601":            99,
-	"TO_ISO8601":         100,
-	"EPOCH_TIME":         101,
-	"TO_EPOCH_TIME":      102,
-	"NOW":                103,
-	"IN_TIMEZONE":        104,
-	"DURING":             105,
-	"DATE":               106,
-	"TIME_OF_DAY":        126,
-	"TIMEZONE":           127,
-	"YEAR":               128,
-	"MONTH":              129,
-	"DAY":                130,
-	"DAY_OF_WEEK":        131,
-	"DAY_OF_YEAR":        132,
-	"HOURS":              133,
-	"MINUTES":            134,
-	"SECONDS":            135,
-	"TIME":               136,
-	"MONDAY":             107,
-	"TUESDAY":            108,
-	"WEDNESDAY":          109,
-	"THURSDAY":           110,
-	"FRIDAY":             111,
-	"SATURDAY":           112,
-	"SUNDAY":             113,
-	"JANUARY":            114,
-	"FEBRUARY":           115,
-	"MARCH":              116,
-	"APRIL":              117,
-	"MAY":                118,
-	"JUNE":               119,
-	"JULY":               120,
-	"AUGUST":             121,
-	"SEPTEMBER":          122,
-	"OCTOBER":            123,
-	"NOVEMBER":           124,
-	"DECEMBER":           125,
-	"LITERAL":            137,
-	"GROUP":              144,
-	"SUM":                145,
-	"AVG":                146,
-	"MIN":                147,
-	"MAX":                148,
-	"SPLIT":              149,
-	"UNGROUP":            150,
-	"RANDOM":             151,
-	"CHANGES":            152,
-	"ARGS":               154,
-	"BINARY":             155,
-	"GEOJSON":            157,
-	"TO_GEOJSON":         158,
-	"POINT":              159,
-	"LINE":               160,
-	"POLYGON":            161,
-	"DISTANCE":           162,
-	"INTERSECTS":         163,
-	"INCLUDES":           164,
-	"CIRCLE":             165,
-	"GET_INTERSECTING":   166,
-	"FILL":               167,
-	"GET_NEAREST":        168,
-	"POLYGON_SUB":        171,
-	"MINVAL":             180,
-	"MAXVAL":             181,
-}
-
-func (x Term_TermType) Enum() *Term_TermType {
-	p := new(Term_TermType)
-	*p = x
-	return p
-}
-func (x Term_TermType) String() string {
-	return proto.EnumName(Term_TermType_name, int32(x))
-}
-func (x Term_TermType) MarshalJSON() ([]byte, error) {
-	return json.Marshal(x.String())
-}
-func (x *Term_TermType) UnmarshalJSON(data []byte) error {
-	value, err := proto.UnmarshalJSONEnum(Term_TermType_value, data, "Term_TermType")
-	if err != nil {
-		return err
-	}
-	*x = Term_TermType(value)
-	return nil
-}
-
-type VersionDummy struct {
-	XXX_unrecognized []byte `json:"-"`
-}
-
-func (m *VersionDummy) Reset()         { *m = VersionDummy{} }
-func (m *VersionDummy) String() string { return proto.CompactTextString(m) }
-func (*VersionDummy) ProtoMessage()    {}
-
-type Query struct {
-	Type             *Query_QueryType   `protobuf:"varint,1,opt,name=type,enum=Query_QueryType" json:"type,omitempty"`
-	Query            *Term              `protobuf:"bytes,2,opt,name=query" json:"query,omitempty"`
-	Token            *int64             `protobuf:"varint,3,opt,name=token" json:"token,omitempty"`
-	OBSOLETENoreply  *bool              `protobuf:"varint,4,opt,name=OBSOLETE_noreply,def=0" json:"OBSOLETE_noreply,omitempty"`
-	AcceptsRJson     *bool              `protobuf:"varint,5,opt,name=accepts_r_json,def=0" json:"accepts_r_json,omitempty"`
-	GlobalOptargs    []*Query_AssocPair `protobuf:"bytes,6,rep,name=global_optargs" json:"global_optargs,omitempty"`
-	XXX_unrecognized []byte             `json:"-"`
-}
-
-func (m *Query) Reset()         { *m = Query{} }
-func (m *Query) String() string { return proto.CompactTextString(m) }
-func (*Query) ProtoMessage()    {}
-
-const Default_Query_OBSOLETENoreply bool = false
-const Default_Query_AcceptsRJson bool = false
-
-func (m *Query) GetType() Query_QueryType {
-	if m != nil && m.Type != nil {
-		return *m.Type
-	}
-	return 0
-}
-
-func (m *Query) GetQuery() *Term {
-	if m != nil {
-		return m.Query
-	}
-	return nil
-}
-
-func (m *Query) GetToken() int64 {
-	if m != nil && m.Token != nil {
-		return *m.Token
-	}
-	return 0
-}
-
-func (m *Query) GetOBSOLETENoreply() bool {
-	if m != nil && m.OBSOLETENoreply != nil {
-		return *m.OBSOLETENoreply
-	}
-	return Default_Query_OBSOLETENoreply
-}
-
-func (m *Query) GetAcceptsRJson() bool {
-	if m != nil && m.AcceptsRJson != nil {
-		return *m.AcceptsRJson
-	}
-	return Default_Query_AcceptsRJson
-}
-
-func (m *Query) GetGlobalOptargs() []*Query_AssocPair {
-	if m != nil {
-		return m.GlobalOptargs
-	}
-	return nil
-}
-
-type Query_AssocPair struct {
-	Key              *string `protobuf:"bytes,1,opt,name=key" json:"key,omitempty"`
-	Val              *Term   `protobuf:"bytes,2,opt,name=val" json:"val,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *Query_AssocPair) Reset()         { *m = Query_AssocPair{} }
-func (m *Query_AssocPair) String() string { return proto.CompactTextString(m) }
-func (*Query_AssocPair) ProtoMessage()    {}
-
-func (m *Query_AssocPair) GetKey() string {
-	if m != nil && m.Key != nil {
-		return *m.Key
-	}
-	return ""
-}
-
-func (m *Query_AssocPair) GetVal() *Term {
-	if m != nil {
-		return m.Val
-	}
-	return nil
-}
-
-type Frame struct {
-	Type             *Frame_FrameType `protobuf:"varint,1,opt,name=type,enum=Frame_FrameType" json:"type,omitempty"`
-	Pos              *int64           `protobuf:"varint,2,opt,name=pos" json:"pos,omitempty"`
-	Opt              *string          `protobuf:"bytes,3,opt,name=opt" json:"opt,omitempty"`
-	XXX_unrecognized []byte           `json:"-"`
-}
-
-func (m *Frame) Reset()         { *m = Frame{} }
-func (m *Frame) String() string { return proto.CompactTextString(m) }
-func (*Frame) ProtoMessage()    {}
-
-func (m *Frame) GetType() Frame_FrameType {
-	if m != nil && m.Type != nil {
-		return *m.Type
-	}
-	return 0
-}
-
-func (m *Frame) GetPos() int64 {
-	if m != nil && m.Pos != nil {
-		return *m.Pos
-	}
-	return 0
-}
-
-func (m *Frame) GetOpt() string {
-	if m != nil && m.Opt != nil {
-		return *m.Opt
-	}
-	return ""
-}
-
-type Backtrace struct {
-	Frames           []*Frame `protobuf:"bytes,1,rep,name=frames" json:"frames,omitempty"`
-	XXX_unrecognized []byte   `json:"-"`
-}
-
-func (m *Backtrace) Reset()         { *m = Backtrace{} }
-func (m *Backtrace) String() string { return proto.CompactTextString(m) }
-func (*Backtrace) ProtoMessage()    {}
-
-func (m *Backtrace) GetFrames() []*Frame {
-	if m != nil {
-		return m.Frames
-	}
-	return nil
-}
-
-type Response struct {
-	Type             *Response_ResponseType  `protobuf:"varint,1,opt,name=type,enum=Response_ResponseType" json:"type,omitempty"`
-	Notes            []Response_ResponseNote `protobuf:"varint,6,rep,name=notes,enum=Response_ResponseNote" json:"notes,omitempty"`
-	Token            *int64                  `protobuf:"varint,2,opt,name=token" json:"token,omitempty"`
-	Response         []*Datum                `protobuf:"bytes,3,rep,name=response" json:"response,omitempty"`
-	Backtrace        *Backtrace              `protobuf:"bytes,4,opt,name=backtrace" json:"backtrace,omitempty"`
-	Profile          *Datum                  `protobuf:"bytes,5,opt,name=profile" json:"profile,omitempty"`
-	XXX_unrecognized []byte                  `json:"-"`
-}
-
-func (m *Response) Reset()         { *m = Response{} }
-func (m *Response) String() string { return proto.CompactTextString(m) }
-func (*Response) ProtoMessage()    {}
-
-func (m *Response) GetType() Response_ResponseType {
-	if m != nil && m.Type != nil {
-		return *m.Type
-	}
-	return 0
-}
-
-func (m *Response) GetNotes() []Response_ResponseNote {
-	if m != nil {
-		return m.Notes
-	}
-	return nil
-}
-
-func (m *Response) GetToken() int64 {
-	if m != nil && m.Token != nil {
-		return *m.Token
-	}
-	return 0
-}
-
-func (m *Response) GetResponse() []*Datum {
-	if m != nil {
-		return m.Response
-	}
-	return nil
-}
-
-func (m *Response) GetBacktrace() *Backtrace {
-	if m != nil {
-		return m.Backtrace
-	}
-	return nil
-}
-
-func (m *Response) GetProfile() *Datum {
-	if m != nil {
-		return m.Profile
-	}
-	return nil
-}
-
-type Datum struct {
-	Type             *Datum_DatumType          `protobuf:"varint,1,opt,name=type,enum=Datum_DatumType" json:"type,omitempty"`
-	RBool            *bool                     `protobuf:"varint,2,opt,name=r_bool" json:"r_bool,omitempty"`
-	RNum             *float64                  `protobuf:"fixed64,3,opt,name=r_num" json:"r_num,omitempty"`
-	RStr             *string                   `protobuf:"bytes,4,opt,name=r_str" json:"r_str,omitempty"`
-	RArray           []*Datum                  `protobuf:"bytes,5,rep,name=r_array" json:"r_array,omitempty"`
-	RObject          []*Datum_AssocPair        `protobuf:"bytes,6,rep,name=r_object" json:"r_object,omitempty"`
-	XXX_extensions   map[int32]proto.Extension `json:"-"`
-	XXX_unrecognized []byte                    `json:"-"`
-}
-
-func (m *Datum) Reset()         { *m = Datum{} }
-func (m *Datum) String() string { return proto.CompactTextString(m) }
-func (*Datum) ProtoMessage()    {}
-
-var extRange_Datum = []proto.ExtensionRange{
-	{10000, 20000},
-}
-
-func (*Datum) ExtensionRangeArray() []proto.ExtensionRange {
-	return extRange_Datum
-}
-func (m *Datum) ExtensionMap() map[int32]proto.Extension {
-	if m.XXX_extensions == nil {
-		m.XXX_extensions = make(map[int32]proto.Extension)
-	}
-	return m.XXX_extensions
-}
-
-func (m *Datum) GetType() Datum_DatumType {
-	if m != nil && m.Type != nil {
-		return *m.Type
-	}
-	return 0
-}
-
-func (m *Datum) GetRBool() bool {
-	if m != nil && m.RBool != nil {
-		return *m.RBool
-	}
-	return false
-}
-
-func (m *Datum) GetRNum() float64 {
-	if m != nil && m.RNum != nil {
-		return *m.RNum
-	}
-	return 0
-}
-
-func (m *Datum) GetRStr() string {
-	if m != nil && m.RStr != nil {
-		return *m.RStr
-	}
-	return ""
-}
-
-func (m *Datum) GetRArray() []*Datum {
-	if m != nil {
-		return m.RArray
-	}
-	return nil
-}
-
-func (m *Datum) GetRObject() []*Datum_AssocPair {
-	if m != nil {
-		return m.RObject
-	}
-	return nil
-}
-
-type Datum_AssocPair struct {
-	Key              *string `protobuf:"bytes,1,opt,name=key" json:"key,omitempty"`
-	Val              *Datum  `protobuf:"bytes,2,opt,name=val" json:"val,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *Datum_AssocPair) Reset()         { *m = Datum_AssocPair{} }
-func (m *Datum_AssocPair) String() string { return proto.CompactTextString(m) }
-func (*Datum_AssocPair) ProtoMessage()    {}
-
-func (m *Datum_AssocPair) GetKey() string {
-	if m != nil && m.Key != nil {
-		return *m.Key
-	}
-	return ""
-}
-
-func (m *Datum_AssocPair) GetVal() *Datum {
-	if m != nil {
-		return m.Val
-	}
-	return nil
-}
-
-type Term struct {
-	Type             *Term_TermType            `protobuf:"varint,1,opt,name=type,enum=Term_TermType" json:"type,omitempty"`
-	Datum            *Datum                    `protobuf:"bytes,2,opt,name=datum" json:"datum,omitempty"`
-	Args             []*Term                   `protobuf:"bytes,3,rep,name=args" json:"args,omitempty"`
-	Optargs          []*Term_AssocPair         `protobuf:"bytes,4,rep,name=optargs" json:"optargs,omitempty"`
-	XXX_extensions   map[int32]proto.Extension `json:"-"`
-	XXX_unrecognized []byte                    `json:"-"`
-}
-
-func (m *Term) Reset()         { *m = Term{} }
-func (m *Term) String() string { return proto.CompactTextString(m) }
-func (*Term) ProtoMessage()    {}
-
-var extRange_Term = []proto.ExtensionRange{
-	{10000, 20000},
-}
-
-func (*Term) ExtensionRangeArray() []proto.ExtensionRange {
-	return extRange_Term
-}
-func (m *Term) ExtensionMap() map[int32]proto.Extension {
-	if m.XXX_extensions == nil {
-		m.XXX_extensions = make(map[int32]proto.Extension)
-	}
-	return m.XXX_extensions
-}
-
-func (m *Term) GetType() Term_TermType {
-	if m != nil && m.Type != nil {
-		return *m.Type
-	}
-	return 0
-}
-
-func (m *Term) GetDatum() *Datum {
-	if m != nil {
-		return m.Datum
-	}
-	return nil
-}
-
-func (m *Term) GetArgs() []*Term {
-	if m != nil {
-		return m.Args
-	}
-	return nil
-}
-
-func (m *Term) GetOptargs() []*Term_AssocPair {
-	if m != nil {
-		return m.Optargs
-	}
-	return nil
-}
-
-type Term_AssocPair struct {
-	Key              *string `protobuf:"bytes,1,opt,name=key" json:"key,omitempty"`
-	Val              *Term   `protobuf:"bytes,2,opt,name=val" json:"val,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *Term_AssocPair) Reset()         { *m = Term_AssocPair{} }
-func (m *Term_AssocPair) String() string { return proto.CompactTextString(m) }
-func (*Term_AssocPair) ProtoMessage()    {}
-
-func (m *Term_AssocPair) GetKey() string {
-	if m != nil && m.Key != nil {
-		return *m.Key
-	}
-	return ""
-}
-
-func (m *Term_AssocPair) GetVal() *Term {
-	if m != nil {
-		return m.Val
-	}
-	return nil
-}
-
-func init() {
-	proto.RegisterEnum("VersionDummy_Version", VersionDummy_Version_name, VersionDummy_Version_value)
-	proto.RegisterEnum("VersionDummy_Protocol", VersionDummy_Protocol_name, VersionDummy_Protocol_value)
-	proto.RegisterEnum("Query_QueryType", Query_QueryType_name, Query_QueryType_value)
-	proto.RegisterEnum("Frame_FrameType", Frame_FrameType_name, Frame_FrameType_value)
-	proto.RegisterEnum("Response_ResponseType", Response_ResponseType_name, Response_ResponseType_value)
-	proto.RegisterEnum("Response_ResponseNote", Response_ResponseNote_name, Response_ResponseNote_value)
-	proto.RegisterEnum("Datum_DatumType", Datum_DatumType_name, Datum_DatumType_value)
-	proto.RegisterEnum("Term_TermType", Term_TermType_name, Term_TermType_value)
-}
diff --git a/Godeps/_workspace/src/github.com/dancannon/gorethink/ql2/ql2.proto b/Godeps/_workspace/src/github.com/dancannon/gorethink/ql2/ql2.proto
deleted file mode 100644
index 3ad50a2dc..000000000
--- a/Godeps/_workspace/src/github.com/dancannon/gorethink/ql2/ql2.proto
+++ /dev/null
@@ -1,805 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//                            THE HIGH-LEVEL VIEW                             //
-////////////////////////////////////////////////////////////////////////////////
-
-// Process: When you first open a connection, send the magic number
-// for the version of the protobuf you're targeting (in the [Version]
-// enum).  This should **NOT** be sent as a protobuf; just send the
-// little-endian 32-bit integer over the wire raw.  This number should
-// only be sent once per connection.
-
-// The magic number shall be followed by an authorization key.  The
-// first 4 bytes are the length of the key to be sent as a little-endian
-// 32-bit integer, followed by the key string.  Even if there is no key,
-// an empty string should be sent (length 0 and no data).
-
-// Following the authorization key, the client shall send a magic number
-// for the communication protocol they want to use (in the [Protocol]
-// enum).  This shall be a little-endian 32-bit integer.
-
-// The server will then respond with a NULL-terminated string response.
-// "SUCCESS" indicates that the connection has been accepted. Any other
-// response indicates an error, and the response string should describe
-// the error.
-
-// Next, for each query you want to send, construct a [Query] protobuf
-// and serialize it to a binary blob.  Send the blob's size to the
-// server encoded as a little-endian 32-bit integer, followed by the
-// blob itself.  You will recieve a [Response] protobuf back preceded
-// by its own size, once again encoded as a little-endian 32-bit
-// integer.  You can see an example exchange below in **EXAMPLE**.
-
-// A query consists of a [Term] to evaluate and a unique-per-connection
-// [token].
-
-// Tokens are used for two things:
-// * Keeping track of which responses correspond to which queries.
-// * Batched queries.  Some queries return lots of results, so we send back
-//   batches of <1000, and you need to send a [CONTINUE] query with the same
-//   token to get more results from the original query.
-////////////////////////////////////////////////////////////////////////////////
-
-message VersionDummy { // We need to wrap it like this for some
-                       // non-conforming protobuf libraries
-    // This enum contains the magic numbers for your version.  See **THE HIGH-LEVEL
-    // VIEW** for what to do with it.
-    enum Version {
-        V0_1      = 0x3f61ba36;
-        V0_2      = 0x723081e1; // Authorization key during handshake
-        V0_3      = 0x5f75e83e; // Authorization key and protocol during handshake
-        V0_4      = 0x400c2d20; // Queries execute in parallel
-    }
-
-    // The protocol to use after the handshake, specified in V0_3
-    enum Protocol {
-        PROTOBUF  = 0x271ffc41;
-        JSON      = 0x7e6970c7;
-    }
-}
-
-// You send one of:
-// * A [START] query with a [Term] to evaluate and a unique-per-connection token.
-// * A [CONTINUE] query with the same token as a [START] query that returned
-//   [SUCCESS_PARTIAL] in its [Response].
-// * A [STOP] query with the same token as a [START] query that you want to stop.
-// * A [NOREPLY_WAIT] query with a unique per-connection token. The server answers
-//   with a [WAIT_COMPLETE] [Response].
-message Query {
-    enum QueryType {
-        START    = 1; // Start a new query.
-        CONTINUE = 2; // Continue a query that returned [SUCCESS_PARTIAL]
-                      // (see [Response]).
-        STOP     = 3; // Stop a query partway through executing.
-        NOREPLY_WAIT = 4;
-                      // Wait for noreply operations to finish.
-    }
-    optional QueryType type = 1;
-    // A [Term] is how we represent the operations we want a query to perform.
-    optional Term query = 2; // only present when [type] = [START]
-    optional int64 token = 3;
-    // This flag is ignored on the server.  `noreply` should be added
-    // to `global_optargs` instead (the key "noreply" should map to
-    // either true or false).
-    optional bool OBSOLETE_noreply = 4 [default = false];
-
-    // If this is set to [true], then [Datum] values will sometimes be
-    // of [DatumType] [R_JSON] (see below).  This can provide enormous
-    // speedups in languages with poor protobuf libraries.
-    optional bool accepts_r_json = 5 [default = false];
-
-    message AssocPair {
-        optional string key = 1;
-        optional Term val = 2;
-    }
-    repeated AssocPair global_optargs = 6;
-}
-
-// A backtrace frame (see `backtrace` in Response below)
-message Frame {
-    enum FrameType {
-        POS = 1; // Error occured in a positional argument.
-        OPT = 2; // Error occured in an optional argument.
-    }
-    optional FrameType type = 1;
-    optional int64 pos = 2; // The index of the positional argument.
-    optional string opt = 3; // The name of the optional argument.
-}
-message Backtrace {
-    repeated Frame frames = 1;
-}
-
-// You get back a response with the same [token] as your query.
-message Response {
-    enum ResponseType {
-        // These response types indicate success.
-        SUCCESS_ATOM      = 1; // Query returned a single RQL datatype.
-        SUCCESS_SEQUENCE  = 2; // Query returned a sequence of RQL datatypes.
-        SUCCESS_PARTIAL   = 3; // Query returned a partial sequence of RQL
-                               // datatypes.  If you send a [CONTINUE] query with
-                               // the same token as this response, you will get
-                               // more of the sequence.  Keep sending [CONTINUE]
-                               // queries until you get back [SUCCESS_SEQUENCE].
-        WAIT_COMPLETE     = 4; // A [NOREPLY_WAIT] query completed.
-
-        // These response types indicate failure.
-        CLIENT_ERROR  = 16; // Means the client is buggy.  An example is if the
-                            // client sends a malformed protobuf, or tries to
-                            // send [CONTINUE] for an unknown token.
-        COMPILE_ERROR = 17; // Means the query failed during parsing or type
-                            // checking.  For example, if you pass too many
-                            // arguments to a function.
-        RUNTIME_ERROR = 18; // Means the query failed at runtime.  An example is
-                            // if you add together two values from a table, but
-                            // they turn out at runtime to be booleans rather
-                            // than numbers.
-    }
-    optional ResponseType type = 1;
-
-    // ResponseNotes are used to provide information about the query
-    // response that may be useful for people writing drivers or ORMs.
-    // Currently all the notes we send indicate that a stream has certain
-    // special properties.
-    enum ResponseNote {
-        // The stream is a changefeed stream (e.g. `r.table('test').changes()`).
-        SEQUENCE_FEED = 1;
-        // The stream is a point changefeed stream
-        // (e.g. `r.table('test').get(0).changes()`).
-        ATOM_FEED = 2;
-        // The stream is an order_by_limit changefeed stream
-        // (e.g. `r.table('test').order_by(index: 'id').limit(5).changes()`).
-        ORDER_BY_LIMIT_FEED = 3;
-        // The stream is a union of multiple changefeed types that can't be
-        // collapsed to a single type
-        // (e.g. `r.table('test').changes().union(r.table('test').get(0).changes())`).
-        UNIONED_FEED = 4;
-        // The stream is a changefeed stream and includes notes on what state
-        // the changefeed stream is in (e.g. objects of the form `{state:
-        // 'initializing'}`).
-        INCLUDES_STATES = 5;
-    }
-    repeated ResponseNote notes = 6;
-
-    optional int64 token = 2; // Indicates what [Query] this response corresponds to.
-
-    // [response] contains 1 RQL datum if [type] is [SUCCESS_ATOM], or many RQL
-    // data if [type] is [SUCCESS_SEQUENCE] or [SUCCESS_PARTIAL].  It contains 1
-    // error message (of type [R_STR]) in all other cases.
-    repeated Datum response = 3;
-
-    // If [type] is [CLIENT_ERROR], [TYPE_ERROR], or [RUNTIME_ERROR], then a
-    // backtrace will be provided.  The backtrace says where in the query the
-    // error occured.  Ideally this information will be presented to the user as
-    // a pretty-printed version of their query with the erroneous section
-    // underlined.  A backtrace is a series of 0 or more [Frame]s, each of which
-    // specifies either the index of a positional argument or the name of an
-    // optional argument.  (Those words will make more sense if you look at the
-    // [Term] message below.)
-    optional Backtrace backtrace = 4; // Contains n [Frame]s when you get back an error.
-
-    // If the [global_optargs] in the [Query] that this [Response] is a
-    // response to contains a key "profile" which maps to a static value of
-    // true then [profile] will contain a [Datum] which provides profiling
-    // information about the execution of the query. This field should be
-    // returned to the user along with the result that would normally be
-    // returned (a datum or a cursor). In official drivers this is accomplished
-    // by putting them inside of an object with "value" mapping to the return
-    // value and "profile" mapping to the profile object.
-    optional Datum profile = 5;
-}
-
-// A [Datum] is a chunk of data that can be serialized to disk or returned to
-// the user in a Response.  Currently we only support JSON types, but we may
-// support other types in the future (e.g., a date type or an integer type).
-message Datum {
-    enum DatumType {
-        R_NULL   = 1;
-        R_BOOL   = 2;
-        R_NUM    = 3; // a double
-        R_STR    = 4;
-        R_ARRAY  = 5;
-        R_OBJECT = 6;
-        // This [DatumType] will only be used if [accepts_r_json] is
-        // set to [true] in [Query].  [r_str] will be filled with a
-        // JSON encoding of the [Datum].
-        R_JSON   = 7; // uses r_str
-    }
-    optional DatumType type = 1;
-    optional bool r_bool = 2;
-    optional double r_num = 3;
-    optional string r_str = 4;
-
-    repeated Datum r_array = 5;
-    message AssocPair {
-        optional string key = 1;
-        optional Datum val = 2;
-    }
-    repeated AssocPair r_object = 6;
-
-    extensions 10000 to 20000;
-}
-
-// A [Term] is either a piece of data (see **Datum** above), or an operator and
-// its operands.  If you have a [Datum], it's stored in the member [datum].  If
-// you have an operator, its positional arguments are stored in [args] and its
-// optional arguments are stored in [optargs].
-//
-// A note about type signatures:
-// We use the following notation to denote types:
-//   arg1_type, arg2_type, argrest_type... -> result_type
-// So, for example, if we have a function `avg` that takes any number of
-// arguments and averages them, we might write:
-//   NUMBER... -> NUMBER
-// Or if we had a function that took one number modulo another:
-//   NUMBER, NUMBER -> NUMBER
-// Or a function that takes a table and a primary key of any Datum type, then
-// retrieves the entry with that primary key:
-//   Table, DATUM -> OBJECT
-// Some arguments must be provided as literal values (and not the results of sub
-// terms).  These are marked with a `!`.
-// Optional arguments are specified within curly braces as argname `:` value
-// type (e.x `{use_outdated:BOOL}`)
-// Many RQL operations are polymorphic. For these, alterantive type signatures
-// are separated by `|`.
-//
-// The RQL type hierarchy is as follows:
-//   Top
-//     DATUM
-//       NULL
-//       BOOL
-//       NUMBER
-//       STRING
-//       OBJECT
-//         SingleSelection
-//       ARRAY
-//     Sequence
-//       ARRAY
-//       Stream
-//         StreamSelection
-//           Table
-//     Database
-//     Function
-//     Ordering - used only by ORDER_BY
-//     Pathspec -- an object, string, or array that specifies a path
-//   Error
-message Term {
-    enum TermType {
-        // A RQL datum, stored in `datum` below.
-        DATUM = 1;
-
-        MAKE_ARRAY = 2; // DATUM... -> ARRAY
-        // Evaluate the terms in [optargs] and make an object
-        MAKE_OBJ   = 3; // {...} -> OBJECT
-
-        // * Compound types
-
-        // Takes an integer representing a variable and returns the value stored
-        // in that variable.  It's the responsibility of the client to translate
-        // from their local representation of a variable to a unique _non-negative_
-        // integer for that variable.  (We do it this way instead of letting
-        // clients provide variable names as strings to discourage
-        // variable-capturing client libraries, and because it's more efficient
-        // on the wire.)
-        VAR          = 10; // !NUMBER -> DATUM
-        // Takes some javascript code and executes it.
-        JAVASCRIPT   = 11; // STRING {timeout: !NUMBER} -> DATUM |
-                           // STRING {timeout: !NUMBER} -> Function(*)
-        UUID = 169; // () -> DATUM
-
-        // Takes an HTTP URL and gets it.  If the get succeeds and
-        //  returns valid JSON, it is converted into a DATUM
-        HTTP = 153; // STRING {data: OBJECT | STRING,
-                    //         timeout: !NUMBER,
-                    //         method: STRING,
-                    //         params: OBJECT,
-                    //         header: OBJECT | ARRAY,
-                    //         attempts: NUMBER,
-                    //         redirects: NUMBER,
-                    //         verify: BOOL,
-                    //         page: FUNC | STRING,
-                    //         page_limit: NUMBER,
-                    //         auth: OBJECT,
-                    //         result_format: STRING,
-                    //         } -> STRING | STREAM
-
-        // Takes a string and throws an error with that message.
-        // Inside of a `default` block, you can omit the first
-        // argument to rethrow whatever error you catch (this is most
-        // useful as an argument to the `default` filter optarg).
-        ERROR        = 12; // STRING -> Error | -> Error
-        // Takes nothing and returns a reference to the implicit variable.
-        IMPLICIT_VAR = 13; // -> DATUM
-
-        // * Data Operators
-        // Returns a reference to a database.
-        DB    = 14; // STRING -> Database
-        // Returns a reference to a table.
-        TABLE = 15; // Database, STRING, {use_outdated:BOOL, identifier_format:STRING} -> Table
-                    // STRING, {use_outdated:BOOL, identifier_format:STRING} -> Table
-        // Gets a single element from a table by its primary or a secondary key.
-        GET   = 16; // Table, STRING -> SingleSelection | Table, NUMBER -> SingleSelection |
-                    // Table, STRING -> NULL            | Table, NUMBER -> NULL |
-        GET_ALL = 78; // Table, DATUM..., {index:!STRING} => ARRAY
-
-        // Simple DATUM Ops
-        EQ  = 17; // DATUM... -> BOOL
-        NE  = 18; // DATUM... -> BOOL
-        LT  = 19; // DATUM... -> BOOL
-        LE  = 20; // DATUM... -> BOOL
-        GT  = 21; // DATUM... -> BOOL
-        GE  = 22; // DATUM... -> BOOL
-        NOT = 23; // BOOL -> BOOL
-        // ADD can either add two numbers or concatenate two arrays.
-        ADD = 24; // NUMBER... -> NUMBER | STRING... -> STRING
-        SUB = 25; // NUMBER... -> NUMBER
-        MUL = 26; // NUMBER... -> NUMBER
-        DIV = 27; // NUMBER... -> NUMBER
-        MOD = 28; // NUMBER, NUMBER -> NUMBER
-
-        // DATUM Array Ops
-        // Append a single element to the end of an array (like `snoc`).
-        APPEND = 29; // ARRAY, DATUM -> ARRAY
-        // Prepend a single element to the end of an array (like `cons`).
-        PREPEND = 80; // ARRAY, DATUM -> ARRAY
-        //Remove the elements of one array from another array.
-        DIFFERENCE = 95; // ARRAY, ARRAY -> ARRAY
-
-        // DATUM Set Ops
-        // Set ops work on arrays. They don't use actual sets and thus have
-        // performance characteristics you would expect from arrays rather than
-        // from sets. All set operations have the post condition that they
-        // array they return contains no duplicate values.
-        SET_INSERT = 88; // ARRAY, DATUM -> ARRAY
-        SET_INTERSECTION = 89; // ARRAY, ARRAY -> ARRAY
-        SET_UNION = 90; // ARRAY, ARRAY -> ARRAY
-        SET_DIFFERENCE = 91; // ARRAY, ARRAY -> ARRAY
-
-        SLICE  = 30; // Sequence, NUMBER, NUMBER -> Sequence
-        SKIP  = 70; // Sequence, NUMBER -> Sequence
-        LIMIT = 71; // Sequence, NUMBER -> Sequence
-        OFFSETS_OF = 87; // Sequence, DATUM -> Sequence | Sequence, Function(1) -> Sequence
-        CONTAINS = 93; // Sequence, DATUM -> BOOL | Sequence, Function(1) -> BOOL
-
-        // Stream/Object Ops
-        // Get a particular field from an object, or map that over a
-        // sequence.
-        GET_FIELD  = 31; // OBJECT, STRING -> DATUM
-                         // | Sequence, STRING -> Sequence
-        // Return an array containing the keys of the object.
-        KEYS = 94; // OBJECT -> ARRAY
-        // Creates an object
-        OBJECT = 143; // STRING, DATUM, ... -> OBJECT
-        // Check whether an object contains all the specified fields,
-        // or filters a sequence so that all objects inside of it
-        // contain all the specified fields.
-        HAS_FIELDS = 32; // OBJECT, Pathspec... -> BOOL
-        // x.with_fields(...) <=> x.has_fields(...).pluck(...)
-        WITH_FIELDS = 96; // Sequence, Pathspec... -> Sequence
-        // Get a subset of an object by selecting some attributes to preserve,
-        // or map that over a sequence.  (Both pick and pluck, polymorphic.)
-        PLUCK    = 33; // Sequence, Pathspec... -> Sequence | OBJECT, Pathspec... -> OBJECT
-        // Get a subset of an object by selecting some attributes to discard, or
-        // map that over a sequence.  (Both unpick and without, polymorphic.)
-        WITHOUT  = 34; // Sequence, Pathspec... -> Sequence | OBJECT, Pathspec... -> OBJECT
-        // Merge objects (right-preferential)
-        MERGE    = 35; // OBJECT... -> OBJECT | Sequence -> Sequence
-
-        // Sequence Ops
-        // Get all elements of a sequence between two values.
-        // Half-open by default, but the openness of either side can be
-        // changed by passing 'closed' or 'open for `right_bound` or
-        // `left_bound`.
-        BETWEEN_DEPRECATED = 36; // Deprecated version of between, which allows `null` to specify unboundedness
-                                 // With the newer version, clients should use `r.minval` and `r.maxval` for unboundedness
-        BETWEEN   = 182; // StreamSelection, DATUM, DATUM, {index:!STRING, right_bound:STRING, left_bound:STRING} -> StreamSelection
-        REDUCE    = 37; // Sequence, Function(2) -> DATUM
-        MAP       = 38; // Sequence, Function(1) -> Sequence
-                        // The arity of the function should be
-                        // Sequence..., Function(sizeof...(Sequence)) -> Sequence
-
-        // Filter a sequence with either a function or a shortcut
-        // object (see API docs for details).  The body of FILTER is
-        // wrapped in an implicit `.default(false)`, and you can
-        // change the default value by specifying the `default`
-        // optarg.  If you make the default `r.error`, all errors
-        // caught by `default` will be rethrown as if the `default`
-        // did not exist.
-        FILTER    = 39; // Sequence, Function(1), {default:DATUM} -> Sequence |
-                        // Sequence, OBJECT, {default:DATUM} -> Sequence
-        // Map a function over a sequence and then concatenate the results together.
-        CONCAT_MAP = 40; // Sequence, Function(1) -> Sequence
-        // Order a sequence based on one or more attributes.
-        ORDER_BY   = 41; // Sequence, (!STRING | Ordering)... -> Sequence
-        // Get all distinct elements of a sequence (like `uniq`).
-        DISTINCT  = 42; // Sequence -> Sequence
-        // Count the number of elements in a sequence, or only the elements that match
-        // a given filter.
-        COUNT     = 43; // Sequence -> NUMBER | Sequence, DATUM -> NUMBER | Sequence, Function(1) -> NUMBER
-        IS_EMPTY = 86; // Sequence -> BOOL
-        // Take the union of multiple sequences (preserves duplicate elements! (use distinct)).
-        UNION     = 44; // Sequence... -> Sequence
-        // Get the Nth element of a sequence.
-        NTH       = 45; // Sequence, NUMBER -> DATUM
-        // do NTH or GET_FIELD depending on target object
-        BRACKET            = 170; // Sequence | OBJECT, NUMBER | STRING -> DATUM
-        // OBSOLETE_GROUPED_MAPREDUCE = 46;
-        // OBSOLETE_GROUPBY = 47;
-
-        INNER_JOIN         = 48; // Sequence, Sequence, Function(2) -> Sequence
-        OUTER_JOIN         = 49; // Sequence, Sequence, Function(2) -> Sequence
-        // An inner-join that does an equality comparison on two attributes.
-        EQ_JOIN            = 50; // Sequence, !STRING, Sequence, {index:!STRING} -> Sequence
-        ZIP                = 72; // Sequence -> Sequence
-        RANGE              = 173; // -> Sequence                        [0, +inf)
-                                  // NUMBER -> Sequence                 [0, a)
-                                  // NUMBER, NUMBER -> Sequence         [a, b)
-
-        // Array Ops
-        // Insert an element in to an array at a given index.
-        INSERT_AT          = 82; // ARRAY, NUMBER, DATUM -> ARRAY
-        // Remove an element at a given index from an array.
-        DELETE_AT          = 83; // ARRAY, NUMBER -> ARRAY |
-                                 // ARRAY, NUMBER, NUMBER -> ARRAY
-        // Change the element at a given index of an array.
-        CHANGE_AT          = 84; // ARRAY, NUMBER, DATUM -> ARRAY
-        // Splice one array in to another array.
-        SPLICE_AT          = 85; // ARRAY, NUMBER, ARRAY -> ARRAY
-
-        // * Type Ops
-        // Coerces a datum to a named type (e.g. "bool").
-        // If you previously used `stream_to_array`, you should use this instead
-        // with the type "array".
-        COERCE_TO = 51; // Top, STRING -> Top
-        // Returns the named type of a datum (e.g. TYPE_OF(true) = "BOOL")
-        TYPE_OF = 52; // Top -> STRING
-
-        // * Write Ops (the OBJECTs contain data about number of errors etc.)
-        // Updates all the rows in a selection.  Calls its Function with the row
-        // to be updated, and then merges the result of that call.
-        UPDATE   = 53; // StreamSelection, Function(1), {non_atomic:BOOL, durability:STRING, return_changes:BOOL} -> OBJECT |
-                       // SingleSelection, Function(1), {non_atomic:BOOL, durability:STRING, return_changes:BOOL} -> OBJECT |
-                       // StreamSelection, OBJECT,      {non_atomic:BOOL, durability:STRING, return_changes:BOOL} -> OBJECT |
-                       // SingleSelection, OBJECT,      {non_atomic:BOOL, durability:STRING, return_changes:BOOL} -> OBJECT
-        // Deletes all the rows in a selection.
-        DELETE   = 54; // StreamSelection, {durability:STRING, return_changes:BOOL} -> OBJECT | SingleSelection -> OBJECT
-        // Replaces all the rows in a selection.  Calls its Function with the row
-        // to be replaced, and then discards it and stores the result of that
-        // call.
-        REPLACE  = 55; // StreamSelection, Function(1), {non_atomic:BOOL, durability:STRING, return_changes:BOOL} -> OBJECT | SingleSelection, Function(1), {non_atomic:BOOL, durability:STRING, return_changes:BOOL} -> OBJECT
-        // Inserts into a table.  If `conflict` is replace, overwrites
-        // entries with the same primary key.  If `conflict` is
-        // update, does an update on the entry.  If `conflict` is
-        // error, or is omitted, conflicts will trigger an error.
-        INSERT   = 56; // Table, OBJECT, {conflict:STRING, durability:STRING, return_changes:BOOL} -> OBJECT | Table, Sequence, {conflict:STRING, durability:STRING, return_changes:BOOL} -> OBJECT
-
-        // * Administrative OPs
-        // Creates a database with a particular name.
-        DB_CREATE     = 57; // STRING -> OBJECT
-        // Drops a database with a particular name.
-        DB_DROP       = 58; // STRING -> OBJECT
-        // Lists all the databases by name.  (Takes no arguments)
-        DB_LIST       = 59; // -> ARRAY
-        // Creates a table with a particular name in a particular
-        // database.  (You may omit the first argument to use the
-        // default database.)
-        TABLE_CREATE  = 60; // Database, STRING, {primary_key:STRING, shards:NUMBER, replicas:NUMBER, primary_replica_tag:STRING} -> OBJECT
-                            // Database, STRING, {primary_key:STRING, shards:NUMBER, replicas:OBJECT, primary_replica_tag:STRING} -> OBJECT
-                            // STRING, {primary_key:STRING, shards:NUMBER, replicas:NUMBER, primary_replica_tag:STRING} -> OBJECT
-                            // STRING, {primary_key:STRING, shards:NUMBER, replicas:OBJECT, primary_replica_tag:STRING} -> OBJECT
-        // Drops a table with a particular name from a particular
-        // database.  (You may omit the first argument to use the
-        // default database.)
-        TABLE_DROP    = 61; // Database, STRING -> OBJECT
-                                // STRING -> OBJECT
-        // Lists all the tables in a particular database.  (You may
-        // omit the first argument to use the default database.)
-        TABLE_LIST    = 62; // Database -> ARRAY
-                            //  -> ARRAY
-        // Returns the row in the `rethinkdb.table_config` or `rethinkdb.db_config` table
-        // that corresponds to the given database or table.
-        CONFIG  = 174; // Database -> SingleSelection
-                       // Table -> SingleSelection
-        // Returns the row in the `rethinkdb.table_status` table that corresponds to the
-        // given table.
-        STATUS  = 175; // Table -> SingleSelection
-        // Called on a table, waits for that table to be ready for read/write operations.
-        // Called on a database, waits for all of the tables in the database to be ready.
-        // Returns the corresponding row or rows from the `rethinkdb.table_status` table.
-        WAIT    = 177; // Table -> OBJECT
-                       // Database -> OBJECT
-        // Generates a new config for the given table, or all tables in the given database
-        // The `shards` and `replicas` arguments are required
-        RECONFIGURE   = 176; // Database, {shards:NUMBER, replicas:NUMBER[, primary_replica_tag:STRING, dry_run:BOOLEAN]} -> OBJECT
-                             // Database, {shards:NUMBER, replicas:OBJECT[, primary_replica_tag:STRING, dry_run:BOOLEAN]} -> OBJECT
-                             // Table, {shards:NUMBER, replicas:NUMBER[, primary_replica_tag:STRING, dry_run:BOOLEAN]} -> OBJECT
-                             // Table, {shards:NUMBER, replicas:OBJECT[, primary_replica_tag:STRING, dry_run:BOOLEAN]} -> OBJECT
-        // Balances the table's shards but leaves everything else the same. Can also be
-        // applied to an entire database at once.
-        REBALANCE     = 179; // Table -> OBJECT
-                             // Database -> OBJECT
-
-        // Ensures that previously issued soft-durability writes are complete and
-        // written to disk.
-        SYNC          = 138; // Table -> OBJECT
-
-        // * Secondary indexes OPs
-        // Creates a new secondary index with a particular name and definition.
-        INDEX_CREATE = 75; // Table, STRING, Function(1), {multi:BOOL} -> OBJECT
-        // Drops a secondary index with a particular name from the specified table.
-        INDEX_DROP   = 76; // Table, STRING -> OBJECT
-        // Lists all secondary indexes on a particular table.
-        INDEX_LIST   = 77; // Table -> ARRAY
-        // Gets information about whether or not a set of indexes are ready to
-        // be accessed. Returns a list of objects that look like this:
-        // {index:STRING, ready:BOOL[, blocks_processed:NUMBER, blocks_total:NUMBER]}
-        INDEX_STATUS = 139; // Table, STRING... -> ARRAY
-        // Blocks until a set of indexes are ready to be accessed. Returns the
-        // same values INDEX_STATUS.
-        INDEX_WAIT = 140; // Table, STRING... -> ARRAY
-        // Renames the given index to a new name
-        INDEX_RENAME = 156; // Table, STRING, STRING, {overwrite:BOOL} -> OBJECT
-
-        // * Control Operators
-        // Calls a function on data
-        FUNCALL  = 64; // Function(*), DATUM... -> DATUM
-        // Executes its first argument, and returns its second argument if it
-        // got [true] or its third argument if it got [false] (like an `if`
-        // statement).
-        BRANCH  = 65; // BOOL, Top, Top -> Top
-        // Returns true if any of its arguments returns true (short-circuits).
-        OR      = 66; // BOOL... -> BOOL
-        // Returns true if all of its arguments return true (short-circuits).
-        AND     = 67; // BOOL... -> BOOL
-        // Calls its Function with each entry in the sequence
-        // and executes the array of terms that Function returns.
-        FOR_EACH = 68; // Sequence, Function(1) -> OBJECT
-
-////////////////////////////////////////////////////////////////////////////////
-////////// Special Terms
-////////////////////////////////////////////////////////////////////////////////
-
-        // An anonymous function.  Takes an array of numbers representing
-        // variables (see [VAR] above), and a [Term] to execute with those in
-        // scope.  Returns a function that may be passed an array of arguments,
-        // then executes the Term with those bound to the variable names.  The
-        // user will never construct this directly.  We use it internally for
-        // things like `map` which take a function.  The "arity" of a [Function] is
-        // the number of arguments it takes.
-        // For example, here's what `_X_.map{|x| x+2}` turns into:
-        // Term {
-        //   type = MAP;
-        //   args = [_X_,
-        //           Term {
-        //             type = Function;
-        //             args = [Term {
-        //                       type = DATUM;
-        //                       datum = Datum {
-        //                         type = R_ARRAY;
-        //                         r_array = [Datum { type = R_NUM; r_num = 1; }];
-        //                       };
-        //                     },
-        //                     Term {
-        //                       type = ADD;
-        //                       args = [Term {
-        //                                 type = VAR;
-        //                                 args = [Term {
-        //                                           type = DATUM;
-        //                                           datum = Datum { type = R_NUM;
-        //                                                           r_num = 1};
-        //                                         }];
-        //                               },
-        //                               Term {
-        //                                 type = DATUM;
-        //                                 datum = Datum { type = R_NUM; r_num = 2; };
-        //                               }];
-        //                     }];
-        //           }];
-        FUNC = 69; // ARRAY, Top -> ARRAY -> Top
-
-        // Indicates to ORDER_BY that this attribute is to be sorted in ascending order.
-        ASC = 73; // !STRING -> Ordering
-        // Indicates to ORDER_BY that this attribute is to be sorted in descending order.
-        DESC = 74; // !STRING -> Ordering
-
-        // Gets info about anything.  INFO is most commonly called on tables.
-        INFO = 79; // Top -> OBJECT
-
-        // `a.match(b)` returns a match object if the string `a`
-        // matches the regular expression `b`.
-        MATCH = 97; // STRING, STRING -> DATUM
-
-        // Change the case of a string.
-        UPCASE   = 141; // STRING -> STRING
-        DOWNCASE = 142; // STRING -> STRING
-
-        // Select a number of elements from sequence with uniform distribution.
-        SAMPLE = 81; // Sequence, NUMBER -> Sequence
-
-        // Evaluates its first argument.  If that argument returns
-        // NULL or throws an error related to the absence of an
-        // expected value (for instance, accessing a non-existent
-        // field or adding NULL to an integer), DEFAULT will either
-        // return its second argument or execute it if it's a
-        // function.  If the second argument is a function, it will be
-        // passed either the text of the error or NULL as its
-        // argument.
-        DEFAULT = 92; // Top, Top -> Top
-
-        // Parses its first argument as a json string and returns it as a
-        // datum.
-        JSON = 98; // STRING -> DATUM
-        // Returns the datum as a JSON string.
-        // N.B.: we would really prefer this be named TO_JSON and that exists as
-        // an alias in Python and JavaScript drivers; however it conflicts with the
-        // standard `to_json` method defined by Ruby's standard json library.
-        TO_JSON_STRING = 172; // DATUM -> STRING
-
-        // Parses its first arguments as an ISO 8601 time and returns it as a
-        // datum.
-        ISO8601 = 99; // STRING -> PSEUDOTYPE(TIME)
-        // Prints a time as an ISO 8601 time.
-        TO_ISO8601 = 100; // PSEUDOTYPE(TIME) -> STRING
-
-        // Returns a time given seconds since epoch in UTC.
-        EPOCH_TIME = 101; // NUMBER -> PSEUDOTYPE(TIME)
-        // Returns seconds since epoch in UTC given a time.
-        TO_EPOCH_TIME = 102; // PSEUDOTYPE(TIME) -> NUMBER
-
-        // The time the query was received by the server.
-        NOW = 103; // -> PSEUDOTYPE(TIME)
-        // Puts a time into an ISO 8601 timezone.
-        IN_TIMEZONE = 104; // PSEUDOTYPE(TIME), STRING -> PSEUDOTYPE(TIME)
-        // a.during(b, c) returns whether a is in the range [b, c)
-        DURING = 105; // PSEUDOTYPE(TIME), PSEUDOTYPE(TIME), PSEUDOTYPE(TIME) -> BOOL
-        // Retrieves the date portion of a time.
-        DATE = 106; // PSEUDOTYPE(TIME) -> PSEUDOTYPE(TIME)
-        // x.time_of_day == x.date - x
-        TIME_OF_DAY = 126; // PSEUDOTYPE(TIME) -> NUMBER
-        // Returns the timezone of a time.
-        TIMEZONE = 127; // PSEUDOTYPE(TIME) -> STRING
-
-        // These access the various components of a time.
-        YEAR = 128; // PSEUDOTYPE(TIME) -> NUMBER
-        MONTH = 129; // PSEUDOTYPE(TIME) -> NUMBER
-        DAY = 130; // PSEUDOTYPE(TIME) -> NUMBER
-        DAY_OF_WEEK = 131; // PSEUDOTYPE(TIME) -> NUMBER
-        DAY_OF_YEAR = 132; // PSEUDOTYPE(TIME) -> NUMBER
-        HOURS = 133; // PSEUDOTYPE(TIME) -> NUMBER
-        MINUTES = 134; // PSEUDOTYPE(TIME) -> NUMBER
-        SECONDS = 135; // PSEUDOTYPE(TIME) -> NUMBER
-
-        // Construct a time from a date and optional timezone or a
-        // date+time and optional timezone.
-        TIME = 136; // NUMBER, NUMBER, NUMBER, STRING -> PSEUDOTYPE(TIME) |
-                    // NUMBER, NUMBER, NUMBER, NUMBER, NUMBER, NUMBER, STRING -> PSEUDOTYPE(TIME) |
-
-        // Constants for ISO 8601 days of the week.
-        MONDAY = 107;    // -> 1
-        TUESDAY = 108;   // -> 2
-        WEDNESDAY = 109; // -> 3
-        THURSDAY = 110;  // -> 4
-        FRIDAY = 111;    // -> 5
-        SATURDAY = 112;  // -> 6
-        SUNDAY = 113;    // -> 7
-
-        // Constants for ISO 8601 months.
-        JANUARY = 114;   // -> 1
-        FEBRUARY = 115;  // -> 2
-        MARCH = 116;     // -> 3
-        APRIL = 117;     // -> 4
-        MAY = 118;       // -> 5
-        JUNE = 119;      // -> 6
-        JULY = 120;      // -> 7
-        AUGUST = 121;    // -> 8
-        SEPTEMBER = 122; // -> 9
-        OCTOBER = 123;   // -> 10
-        NOVEMBER = 124;  // -> 11
-        DECEMBER = 125;  // -> 12
-
-        // Indicates to MERGE to replace the other object rather than merge it.
-        LITERAL = 137; // JSON -> Merging
-
-        // SEQUENCE, STRING -> GROUPED_SEQUENCE | SEQUENCE, FUNCTION -> GROUPED_SEQUENCE
-        GROUP = 144;
-        SUM = 145;
-        AVG = 146;
-        MIN = 147;
-        MAX = 148;
-
-        // `str.split()` splits on whitespace
-        // `str.split(" ")` splits on spaces only
-        // `str.split(" ", 5)` splits on spaces with at most 5 results
-        // `str.split(nil, 5)` splits on whitespace with at most 5 results
-        SPLIT = 149; // STRING -> ARRAY | STRING, STRING -> ARRAY | STRING, STRING, NUMBER -> ARRAY | STRING, NULL, NUMBER -> ARRAY
-
-        UNGROUP = 150; // GROUPED_DATA -> ARRAY
-
-        // Takes a range of numbers and returns a random number within the range
-        RANDOM = 151; // NUMBER, NUMBER {float:BOOL} -> DATUM
-
-        CHANGES = 152; // TABLE -> STREAM
-        ARGS = 154; // ARRAY -> SPECIAL (used to splice arguments)
-
-        // BINARY is client-only at the moment, it is not supported on the server
-        BINARY = 155; // STRING -> PSEUDOTYPE(BINARY)
-
-        GEOJSON = 157;           // OBJECT -> PSEUDOTYPE(GEOMETRY)
-        TO_GEOJSON = 158;        // PSEUDOTYPE(GEOMETRY) -> OBJECT
-        POINT = 159;             // NUMBER, NUMBER -> PSEUDOTYPE(GEOMETRY)
-        LINE = 160;              // (ARRAY | PSEUDOTYPE(GEOMETRY))... -> PSEUDOTYPE(GEOMETRY)
-        POLYGON = 161;           // (ARRAY | PSEUDOTYPE(GEOMETRY))... -> PSEUDOTYPE(GEOMETRY)
-        DISTANCE = 162;          // PSEUDOTYPE(GEOMETRY), PSEUDOTYPE(GEOMETRY) {geo_system:STRING, unit:STRING} -> NUMBER
-        INTERSECTS = 163;        // PSEUDOTYPE(GEOMETRY), PSEUDOTYPE(GEOMETRY) -> BOOL
-        INCLUDES = 164;          // PSEUDOTYPE(GEOMETRY), PSEUDOTYPE(GEOMETRY) -> BOOL
-        CIRCLE = 165;            // PSEUDOTYPE(GEOMETRY), NUMBER {num_vertices:NUMBER, geo_system:STRING, unit:STRING, fill:BOOL} -> PSEUDOTYPE(GEOMETRY)
-        GET_INTERSECTING = 166;  // TABLE, PSEUDOTYPE(GEOMETRY) {index:!STRING} -> StreamSelection
-        FILL = 167;              // PSEUDOTYPE(GEOMETRY) -> PSEUDOTYPE(GEOMETRY)
-        GET_NEAREST = 168;       // TABLE, PSEUDOTYPE(GEOMETRY) {index:!STRING, max_results:NUM, max_dist:NUM, geo_system:STRING, unit:STRING} -> ARRAY
-        POLYGON_SUB = 171;       // PSEUDOTYPE(GEOMETRY), PSEUDOTYPE(GEOMETRY) -> PSEUDOTYPE(GEOMETRY)
-
-        // Constants for specifying key ranges
-        MINVAL = 180;
-        MAXVAL = 181;
-    }
-    optional TermType type = 1;
-
-    // This is only used when type is DATUM.
-    optional Datum datum = 2;
-
-    repeated Term args = 3; // Holds the positional arguments of the query.
-    message AssocPair {
-        optional string key = 1;
-        optional Term val = 2;
-    }
-    repeated AssocPair optargs = 4; // Holds the optional arguments of the query.
-    // (Note that the order of the optional arguments doesn't matter; think of a
-    // Hash.)
-
-    extensions 10000 to 20000;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-//                                  EXAMPLE                                   //
-////////////////////////////////////////////////////////////////////////////////
-//   ```ruby
-//   r.table('tbl', {:use_outdated => true}).insert([{:id => 0}, {:id => 1}])
-//   ```
-// Would turn into:
-//   Term {
-//     type = INSERT;
-//     args = [Term {
-//               type = TABLE;
-//               args = [Term {
-//                         type = DATUM;
-//                         datum = Datum { type = R_STR; r_str = "tbl"; };
-//                       }];
-//               optargs = [["use_outdated",
-//                           Term {
-//                             type = DATUM;
-//                             datum = Datum { type = R_BOOL; r_bool = true; };
-//                           }]];
-//             },
-//             Term {
-//               type = MAKE_ARRAY;
-//               args = [Term {
-//                         type = DATUM;
-//                         datum = Datum { type = R_OBJECT; r_object = [["id", 0]]; };
-//                       },
-//                       Term {
-//                         type = DATUM;
-//                         datum = Datum { type = R_OBJECT; r_object = [["id", 1]]; };
-//                       }];
-//             }]
-//   }
-// And the server would reply:
-//   Response {
-//     type = SUCCESS_ATOM;
-//     token = 1;
-//     response = [Datum { type = R_OBJECT; r_object = [["inserted", 2]]; }];
-//   }
-// Or, if there were an error:
-//   Response {
-//     type = RUNTIME_ERROR;
-//     token = 1;
-//     response = [Datum { type = R_STR; r_str = "The table `tbl` doesn't exist!"; }];
-//     backtrace = [Frame { type = POS; pos = 0; }, Frame { type = POS; pos = 0; }];
-//   }
diff --git a/Godeps/_workspace/src/github.com/dancannon/gorethink/types/geometry.go b/Godeps/_workspace/src/github.com/dancannon/gorethink/types/geometry.go
deleted file mode 100644
index 00ff80f0d..000000000
--- a/Godeps/_workspace/src/github.com/dancannon/gorethink/types/geometry.go
+++ /dev/null
@@ -1,225 +0,0 @@
-package types
-
-import (
-	"fmt"
-)
-
-type Geometry struct {
-	Type  string
-	Point Point
-	Line  Line
-	Lines Lines
-}
-
-func (g Geometry) MarshalRQL() (interface{}, error) {
-	switch g.Type {
-	case "Point":
-		return g.Point.MarshalRQL()
-	case "LineString":
-		return g.Line.MarshalRQL()
-	case "Polygon":
-		return g.Lines.MarshalRQL()
-	default:
-		return nil, fmt.Errorf("pseudo-type GEOMETRY object field 'type' %s is not valid", g.Type)
-	}
-}
-
-func (g *Geometry) UnmarshalRQL(data interface{}) error {
-	if data, ok := data.(Geometry); ok {
-		g.Type = data.Type
-		g.Point = data.Point
-		g.Line = data.Line
-		g.Lines = data.Lines
-
-		return nil
-	}
-
-	m, ok := data.(map[string]interface{})
-	if !ok {
-		return fmt.Errorf("pseudo-type GEOMETRY object is not valid")
-	}
-
-	typ, ok := m["type"]
-	if !ok {
-		return fmt.Errorf("pseudo-type GEOMETRY object is not valid, expects 'type' field")
-	}
-	coords, ok := m["coordinates"]
-	if !ok {
-		return fmt.Errorf("pseudo-type GEOMETRY object is not valid, expects 'coordinates' field")
-	}
-
-	var err error
-	switch typ {
-	case "Point":
-		g.Type = "Point"
-		g.Point, err = UnmarshalPoint(coords)
-	case "LineString":
-		g.Type = "LineString"
-		g.Line, err = UnmarshalLineString(coords)
-	case "Polygon":
-		g.Type = "Polygon"
-		g.Lines, err = UnmarshalPolygon(coords)
-	default:
-		return fmt.Errorf("pseudo-type GEOMETRY object has invalid type")
-	}
-
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-type Point struct {
-	Lon float64
-	Lat float64
-}
-type Line []Point
-type Lines []Line
-
-func (p Point) Coords() interface{} {
-	return []interface{}{p.Lon, p.Lat}
-}
-
-func (p Point) MarshalRQL() (interface{}, error) {
-	return map[string]interface{}{
-		"$reql_type$": "GEOMETRY",
-		"coordinates": p.Coords(),
-		"type":        "Point",
-	}, nil
-}
-
-func (p *Point) UnmarshalRQL(data interface{}) error {
-	g := &Geometry{}
-	err := g.UnmarshalRQL(data)
-	if err != nil {
-		return err
-	}
-	if g.Type != "Point" {
-		return fmt.Errorf("pseudo-type GEOMETRY object has type %s, expected type %s", g.Type, "Point")
-	}
-
-	p.Lat = g.Point.Lat
-	p.Lon = g.Point.Lon
-
-	return nil
-}
-
-func (l Line) Coords() interface{} {
-	coords := make([]interface{}, len(l))
-	for i, point := range l {
-		coords[i] = point.Coords()
-	}
-	return coords
-}
-
-func (l Line) MarshalRQL() (interface{}, error) {
-	return map[string]interface{}{
-		"$reql_type$": "GEOMETRY",
-		"coordinates": l.Coords(),
-		"type":        "LineString",
-	}, nil
-}
-
-func (l *Line) UnmarshalRQL(data interface{}) error {
-	g := &Geometry{}
-	err := g.UnmarshalRQL(data)
-	if err != nil {
-		return err
-	}
-	if g.Type != "LineString" {
-		return fmt.Errorf("pseudo-type GEOMETRY object has type %s, expected type %s", g.Type, "LineString")
-	}
-
-	*l = g.Line
-
-	return nil
-}
-
-func (l Lines) Coords() interface{} {
-	coords := make([]interface{}, len(l))
-	for i, line := range l {
-		coords[i] = line.Coords()
-	}
-	return coords
-}
-
-func (l Lines) MarshalRQL() (interface{}, error) {
-	return map[string]interface{}{
-		"$reql_type$": "GEOMETRY",
-		"coordinates": l.Coords(),
-		"type":        "Polygon",
-	}, nil
-}
-
-func (l *Lines) UnmarshalRQL(data interface{}) error {
-	g := &Geometry{}
-	err := g.UnmarshalRQL(data)
-	if err != nil {
-		return err
-	}
-	if g.Type != "Polygon" {
-		return fmt.Errorf("pseudo-type GEOMETRY object has type %s, expected type %s", g.Type, "Polygon")
-	}
-
-	*l = g.Lines
-
-	return nil
-}
-
-func UnmarshalPoint(v interface{}) (Point, error) {
-	coords, ok := v.([]interface{})
-	if !ok {
-		return Point{}, fmt.Errorf("pseudo-type GEOMETRY object field 'coordinates' is not valid")
-	}
-	if len(coords) != 2 {
-		return Point{}, fmt.Errorf("pseudo-type GEOMETRY object field 'coordinates' is not valid")
-	}
-	lon, ok := coords[0].(float64)
-	if !ok {
-		return Point{}, fmt.Errorf("pseudo-type GEOMETRY object field 'coordinates' is not valid")
-	}
-	lat, ok := coords[1].(float64)
-	if !ok {
-		return Point{}, fmt.Errorf("pseudo-type GEOMETRY object field 'coordinates' is not valid")
-	}
-
-	return Point{
-		Lon: lon,
-		Lat: lat,
-	}, nil
-}
-
-func UnmarshalLineString(v interface{}) (Line, error) {
-	points, ok := v.([]interface{})
-	if !ok {
-		return Line{}, fmt.Errorf("pseudo-type GEOMETRY object field 'coordinates' is not valid")
-	}
-
-	var err error
-	line := make(Line, len(points))
-	for i, coords := range points {
-		line[i], err = UnmarshalPoint(coords)
-		if err != nil {
-			return Line{}, err
-		}
-	}
-	return line, nil
-}
-
-func UnmarshalPolygon(v interface{}) (Lines, error) {
-	lines, ok := v.([]interface{})
-	if !ok {
-		return Lines{}, fmt.Errorf("pseudo-type GEOMETRY object field 'coordinates' is not valid")
-	}
-
-	var err error
-	polygon := make(Lines, len(lines))
-	for i, line := range lines {
-		polygon[i], err = UnmarshalLineString(line)
-		if err != nil {
-			return Lines{}, err
-		}
-	}
-	return polygon, nil
-}
diff --git a/Godeps/_workspace/src/github.com/eapache/go-resiliency/breaker/README.md b/Godeps/_workspace/src/github.com/eapache/go-resiliency/breaker/README.md
deleted file mode 100644
index 2d1b3d932..000000000
--- a/Godeps/_workspace/src/github.com/eapache/go-resiliency/breaker/README.md
+++ /dev/null
@@ -1,34 +0,0 @@
-circuit-breaker
-===============
-
-[![Build Status](https://travis-ci.org/eapache/go-resiliency.svg?branch=master)](https://travis-ci.org/eapache/go-resiliency)
-[![GoDoc](https://godoc.org/github.com/eapache/go-resiliency/breaker?status.svg)](https://godoc.org/github.com/eapache/go-resiliency/breaker)
-[![Code of Conduct](https://img.shields.io/badge/code%20of%20conduct-active-blue.svg)](https://eapache.github.io/conduct.html)
-
-The circuit-breaker resiliency pattern for golang.
-
-Creating a breaker takes three parameters:
-- error threshold (for opening the breaker)
-- success threshold (for closing the breaker)
-- timeout (how long to keep the breaker open)
-
-```go
-b := breaker.New(3, 1, 5*time.Second)
-
-for {
-	result := b.Run(func() error {
-		// communicate with some external service and
-		// return an error if the communication failed
-		return nil
-	})
-
-	switch result {
-	case nil:
-		// success!
-	case breaker.ErrBreakerOpen:
-		// our function wasn't run because the breaker was open
-	default:
-		// some other error
-	}
-}
-```
diff --git a/Godeps/_workspace/src/github.com/eapache/go-resiliency/breaker/breaker.go b/Godeps/_workspace/src/github.com/eapache/go-resiliency/breaker/breaker.go
deleted file mode 100644
index f88ca7248..000000000
--- a/Godeps/_workspace/src/github.com/eapache/go-resiliency/breaker/breaker.go
+++ /dev/null
@@ -1,161 +0,0 @@
-// Package breaker implements the circuit-breaker resiliency pattern for Go.
-package breaker
-
-import (
-	"errors"
-	"sync"
-	"sync/atomic"
-	"time"
-)
-
-// ErrBreakerOpen is the error returned from Run() when the function is not executed
-// because the breaker is currently open.
-var ErrBreakerOpen = errors.New("circuit breaker is open")
-
-const (
-	closed uint32 = iota
-	open
-	halfOpen
-)
-
-// Breaker implements the circuit-breaker resiliency pattern
-type Breaker struct {
-	errorThreshold, successThreshold int
-	timeout                          time.Duration
-
-	lock              sync.Mutex
-	state             uint32
-	errors, successes int
-	lastError         time.Time
-}
-
-// New constructs a new circuit-breaker that starts closed.
-// From closed, the breaker opens if "errorThreshold" errors are seen
-// without an error-free period of at least "timeout". From open, the
-// breaker half-closes after "timeout". From half-open, the breaker closes
-// after "successThreshold" consecutive successes, or opens on a single error.
-func New(errorThreshold, successThreshold int, timeout time.Duration) *Breaker {
-	return &Breaker{
-		errorThreshold:   errorThreshold,
-		successThreshold: successThreshold,
-		timeout:          timeout,
-	}
-}
-
-// Run will either return ErrBreakerOpen immediately if the circuit-breaker is
-// already open, or it will run the given function and pass along its return
-// value. It is safe to call Run concurrently on the same Breaker.
-func (b *Breaker) Run(work func() error) error {
-	state := atomic.LoadUint32(&b.state)
-
-	if state == open {
-		return ErrBreakerOpen
-	}
-
-	return b.doWork(state, work)
-}
-
-// Go will either return ErrBreakerOpen immediately if the circuit-breaker is
-// already open, or it will run the given function in a separate goroutine.
-// If the function is run, Go will return nil immediately, and will *not* return
-// the return value of the function. It is safe to call Go concurrently on the
-// same Breaker.
-func (b *Breaker) Go(work func() error) error {
-	state := atomic.LoadUint32(&b.state)
-
-	if state == open {
-		return ErrBreakerOpen
-	}
-
-	// errcheck complains about ignoring the error return value, but
-	// that's on purpose; if you want an error from a goroutine you have to
-	// get it over a channel or something
-	go b.doWork(state, work)
-
-	return nil
-}
-
-func (b *Breaker) doWork(state uint32, work func() error) error {
-	var panicValue interface{}
-
-	result := func() error {
-		defer func() {
-			panicValue = recover()
-		}()
-		return work()
-	}()
-
-	if result == nil && panicValue == nil && state == closed {
-		// short-circuit the normal, success path without contending
-		// on the lock
-		return nil
-	}
-
-	// oh well, I guess we have to contend on the lock
-	b.processResult(result, panicValue)
-
-	if panicValue != nil {
-		// as close as Go lets us come to a "rethrow" although unfortunately
-		// we lose the original panicing location
-		panic(panicValue)
-	}
-
-	return result
-}
-
-func (b *Breaker) processResult(result error, panicValue interface{}) {
-	b.lock.Lock()
-	defer b.lock.Unlock()
-
-	if result == nil && panicValue == nil {
-		if b.state == halfOpen {
-			b.successes++
-			if b.successes == b.successThreshold {
-				b.closeBreaker()
-			}
-		}
-	} else {
-		if b.errors > 0 {
-			expiry := b.lastError.Add(b.timeout)
-			if time.Now().After(expiry) {
-				b.errors = 0
-			}
-		}
-
-		switch b.state {
-		case closed:
-			b.errors++
-			if b.errors == b.errorThreshold {
-				b.openBreaker()
-			} else {
-				b.lastError = time.Now()
-			}
-		case halfOpen:
-			b.openBreaker()
-		}
-	}
-}
-
-func (b *Breaker) openBreaker() {
-	b.changeState(open)
-	go b.timer()
-}
-
-func (b *Breaker) closeBreaker() {
-	b.changeState(closed)
-}
-
-func (b *Breaker) timer() {
-	time.Sleep(b.timeout)
-
-	b.lock.Lock()
-	defer b.lock.Unlock()
-
-	b.changeState(halfOpen)
-}
-
-func (b *Breaker) changeState(newState uint32) {
-	b.errors = 0
-	b.successes = 0
-	atomic.StoreUint32(&b.state, newState)
-}
diff --git a/Godeps/_workspace/src/github.com/eapache/go-resiliency/breaker/breaker_test.go b/Godeps/_workspace/src/github.com/eapache/go-resiliency/breaker/breaker_test.go
deleted file mode 100644
index b41308db6..000000000
--- a/Godeps/_workspace/src/github.com/eapache/go-resiliency/breaker/breaker_test.go
+++ /dev/null
@@ -1,196 +0,0 @@
-package breaker
-
-import (
-	"errors"
-	"testing"
-	"time"
-)
-
-var errSomeError = errors.New("errSomeError")
-
-func alwaysPanics() error {
-	panic("foo")
-}
-
-func returnsError() error {
-	return errSomeError
-}
-
-func returnsSuccess() error {
-	return nil
-}
-
-func TestBreakerErrorExpiry(t *testing.T) {
-	breaker := New(2, 1, 1*time.Second)
-
-	for i := 0; i < 3; i++ {
-		if err := breaker.Run(returnsError); err != errSomeError {
-			t.Error(err)
-		}
-		time.Sleep(1 * time.Second)
-	}
-
-	for i := 0; i < 3; i++ {
-		if err := breaker.Go(returnsError); err != nil {
-			t.Error(err)
-		}
-		time.Sleep(1 * time.Second)
-	}
-}
-
-func TestBreakerPanicsCountAsErrors(t *testing.T) {
-	breaker := New(3, 2, 1*time.Second)
-
-	// three errors opens the breaker
-	for i := 0; i < 3; i++ {
-		func() {
-			defer func() {
-				val := recover()
-				if val.(string) != "foo" {
-					t.Error("incorrect panic")
-				}
-			}()
-			if err := breaker.Run(alwaysPanics); err != nil {
-				t.Error(err)
-			}
-			t.Error("shouldn't get here")
-		}()
-	}
-
-	// breaker is open
-	for i := 0; i < 5; i++ {
-		if err := breaker.Run(returnsError); err != ErrBreakerOpen {
-			t.Error(err)
-		}
-	}
-}
-
-func TestBreakerStateTransitions(t *testing.T) {
-	breaker := New(3, 2, 1*time.Second)
-
-	// three errors opens the breaker
-	for i := 0; i < 3; i++ {
-		if err := breaker.Run(returnsError); err != errSomeError {
-			t.Error(err)
-		}
-	}
-
-	// breaker is open
-	for i := 0; i < 5; i++ {
-		if err := breaker.Run(returnsError); err != ErrBreakerOpen {
-			t.Error(err)
-		}
-	}
-
-	// wait for it to half-close
-	time.Sleep(2 * time.Second)
-	// one success works, but is not enough to fully close
-	if err := breaker.Run(returnsSuccess); err != nil {
-		t.Error(err)
-	}
-	// error works, but re-opens immediately
-	if err := breaker.Run(returnsError); err != errSomeError {
-		t.Error(err)
-	}
-	// breaker is open
-	if err := breaker.Run(returnsError); err != ErrBreakerOpen {
-		t.Error(err)
-	}
-
-	// wait for it to half-close
-	time.Sleep(2 * time.Second)
-	// two successes is enough to close it for good
-	for i := 0; i < 2; i++ {
-		if err := breaker.Run(returnsSuccess); err != nil {
-			t.Error(err)
-		}
-	}
-	// error works
-	if err := breaker.Run(returnsError); err != errSomeError {
-		t.Error(err)
-	}
-	// breaker is still closed
-	if err := breaker.Run(returnsSuccess); err != nil {
-		t.Error(err)
-	}
-}
-
-func TestBreakerAsyncStateTransitions(t *testing.T) {
-	breaker := New(3, 2, 1*time.Second)
-
-	// three errors opens the breaker
-	for i := 0; i < 3; i++ {
-		if err := breaker.Go(returnsError); err != nil {
-			t.Error(err)
-		}
-	}
-
-	// just enough to yield the scheduler and let the goroutines work off
-	time.Sleep(1 * time.Millisecond)
-
-	// breaker is open
-	for i := 0; i < 5; i++ {
-		if err := breaker.Go(returnsError); err != ErrBreakerOpen {
-			t.Error(err)
-		}
-	}
-
-	// wait for it to half-close
-	time.Sleep(2 * time.Second)
-	// one success works, but is not enough to fully close
-	if err := breaker.Go(returnsSuccess); err != nil {
-		t.Error(err)
-	}
-	// error works, but re-opens immediately
-	if err := breaker.Go(returnsError); err != nil {
-		t.Error(err)
-	}
-	// just enough to yield the scheduler and let the goroutines work off
-	time.Sleep(1 * time.Millisecond)
-	// breaker is open
-	if err := breaker.Go(returnsError); err != ErrBreakerOpen {
-		t.Error(err)
-	}
-
-	// wait for it to half-close
-	time.Sleep(2 * time.Second)
-	// two successes is enough to close it for good
-	for i := 0; i < 2; i++ {
-		if err := breaker.Go(returnsSuccess); err != nil {
-			t.Error(err)
-		}
-	}
-	// just enough to yield the scheduler and let the goroutines work off
-	time.Sleep(1 * time.Millisecond)
-	// error works
-	if err := breaker.Go(returnsError); err != nil {
-		t.Error(err)
-	}
-	// just enough to yield the scheduler and let the goroutines work off
-	time.Sleep(1 * time.Millisecond)
-	// breaker is still closed
-	if err := breaker.Go(returnsSuccess); err != nil {
-		t.Error(err)
-	}
-}
-
-func ExampleBreaker() {
-	breaker := New(3, 1, 5*time.Second)
-
-	for {
-		result := breaker.Run(func() error {
-			// communicate with some external service and
-			// return an error if the communication failed
-			return nil
-		})
-
-		switch result {
-		case nil:
-			// success!
-		case ErrBreakerOpen:
-			// our function wasn't run because the breaker was open
-		default:
-			// some other error
-		}
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/eapache/queue/.gitignore b/Godeps/_workspace/src/github.com/eapache/queue/.gitignore
deleted file mode 100644
index 836562412..000000000
--- a/Godeps/_workspace/src/github.com/eapache/queue/.gitignore
+++ /dev/null
@@ -1,23 +0,0 @@
-# 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
diff --git a/Godeps/_workspace/src/github.com/eapache/queue/.travis.yml b/Godeps/_workspace/src/github.com/eapache/queue/.travis.yml
deleted file mode 100644
index 235a40a49..000000000
--- a/Godeps/_workspace/src/github.com/eapache/queue/.travis.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-language: go
-sudo: false
-
-go:
-  - 1.2
-  - 1.3
-  - 1.4
diff --git a/Godeps/_workspace/src/github.com/eapache/queue/LICENSE b/Godeps/_workspace/src/github.com/eapache/queue/LICENSE
deleted file mode 100644
index d5f36dbca..000000000
--- a/Godeps/_workspace/src/github.com/eapache/queue/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2014 Evan Huus
-
-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.
\ No newline at end of file
diff --git a/Godeps/_workspace/src/github.com/eapache/queue/README.md b/Godeps/_workspace/src/github.com/eapache/queue/README.md
deleted file mode 100644
index 8e782335c..000000000
--- a/Godeps/_workspace/src/github.com/eapache/queue/README.md
+++ /dev/null
@@ -1,16 +0,0 @@
-Queue
-=====
-
-[![Build Status](https://travis-ci.org/eapache/queue.svg)](https://travis-ci.org/eapache/queue)
-[![GoDoc](https://godoc.org/github.com/eapache/queue?status.png)](https://godoc.org/github.com/eapache/queue)
-[![Code of Conduct](https://img.shields.io/badge/code%20of%20conduct-active-blue.svg)](https://eapache.github.io/conduct.html)
-
-A fast Golang queue using a ring-buffer, based on the version suggested by Dariusz Górecki.
-Using this instead of other, simpler, queue implementations (slice+append or linked list) provides
-substantial memory and time benefits, and fewer GC pauses.
-
-The queue implemented here is as fast as it is in part because it is *not* thread-safe.
-
-Follows semantic versioning using https://gopkg.in/ - import from
-[`gopkg.in/eapache/queue.v1`](https://gopkg.in/eapache/queue.v1)
-for guaranteed API stability.
diff --git a/Godeps/_workspace/src/github.com/eapache/queue/queue.go b/Godeps/_workspace/src/github.com/eapache/queue/queue.go
deleted file mode 100644
index 2dc8d9395..000000000
--- a/Godeps/_workspace/src/github.com/eapache/queue/queue.go
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
-Package queue provides a fast, ring-buffer queue based on the version suggested by Dariusz Górecki.
-Using this instead of other, simpler, queue implementations (slice+append or linked list) provides
-substantial memory and time benefits, and fewer GC pauses.
-
-The queue implemented here is as fast as it is for an additional reason: it is *not* thread-safe.
-*/
-package queue
-
-const minQueueLen = 16
-
-// Queue represents a single instance of the queue data structure.
-type Queue struct {
-	buf               []interface{}
-	head, tail, count int
-}
-
-// New constructs and returns a new Queue.
-func New() *Queue {
-	return &Queue{
-		buf: make([]interface{}, minQueueLen),
-	}
-}
-
-// Length returns the number of elements currently stored in the queue.
-func (q *Queue) Length() int {
-	return q.count
-}
-
-// resizes the queue to fit exactly twice its current contents
-// this can result in shrinking if the queue is less than half-full
-func (q *Queue) resize() {
-	newBuf := make([]interface{}, q.count*2)
-
-	if q.tail > q.head {
-		copy(newBuf, q.buf[q.head:q.tail])
-	} else {
-		n := copy(newBuf, q.buf[q.head:])
-		copy(newBuf[n:], q.buf[:q.tail])
-	}
-
-	q.head = 0
-	q.tail = q.count
-	q.buf = newBuf
-}
-
-// Add puts an element on the end of the queue.
-func (q *Queue) Add(elem interface{}) {
-	if q.count == len(q.buf) {
-		q.resize()
-	}
-
-	q.buf[q.tail] = elem
-	q.tail = (q.tail + 1) % len(q.buf)
-	q.count++
-}
-
-// Peek returns the element at the head of the queue. This call panics
-// if the queue is empty.
-func (q *Queue) Peek() interface{} {
-	if q.count <= 0 {
-		panic("queue: Peek() called on empty queue")
-	}
-	return q.buf[q.head]
-}
-
-// Get returns the element at index i in the queue. If the index is
-// invalid, the call will panic.
-func (q *Queue) Get(i int) interface{} {
-	if i < 0 || i >= q.count {
-		panic("queue: Get() called with index out of range")
-	}
-	return q.buf[(q.head+i)%len(q.buf)]
-}
-
-// Remove removes the element from the front of the queue. If you actually
-// want the element, call Peek first. This call panics if the queue is empty.
-func (q *Queue) Remove() {
-	if q.count <= 0 {
-		panic("queue: Remove() called on empty queue")
-	}
-	q.buf[q.head] = nil
-	q.head = (q.head + 1) % len(q.buf)
-	q.count--
-	if len(q.buf) > minQueueLen && q.count*4 == len(q.buf) {
-		q.resize()
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/eapache/queue/queue_test.go b/Godeps/_workspace/src/github.com/eapache/queue/queue_test.go
deleted file mode 100644
index f2765c14d..000000000
--- a/Godeps/_workspace/src/github.com/eapache/queue/queue_test.go
+++ /dev/null
@@ -1,162 +0,0 @@
-package queue
-
-import "testing"
-
-func TestQueueSimple(t *testing.T) {
-	q := New()
-
-	for i := 0; i < minQueueLen; i++ {
-		q.Add(i)
-	}
-	for i := 0; i < minQueueLen; i++ {
-		if q.Peek().(int) != i {
-			t.Error("peek", i, "had value", q.Peek())
-		}
-		q.Remove()
-	}
-}
-
-func TestQueueWrapping(t *testing.T) {
-	q := New()
-
-	for i := 0; i < minQueueLen; i++ {
-		q.Add(i)
-	}
-	for i := 0; i < 3; i++ {
-		q.Remove()
-		q.Add(minQueueLen + i)
-	}
-
-	for i := 0; i < minQueueLen; i++ {
-		if q.Peek().(int) != i+3 {
-			t.Error("peek", i, "had value", q.Peek())
-		}
-		q.Remove()
-	}
-}
-
-func TestQueueLength(t *testing.T) {
-	q := New()
-
-	if q.Length() != 0 {
-		t.Error("empty queue length not 0")
-	}
-
-	for i := 0; i < 1000; i++ {
-		q.Add(i)
-		if q.Length() != i+1 {
-			t.Error("adding: queue with", i, "elements has length", q.Length())
-		}
-	}
-	for i := 0; i < 1000; i++ {
-		q.Remove()
-		if q.Length() != 1000-i-1 {
-			t.Error("removing: queue with", 1000-i-i, "elements has length", q.Length())
-		}
-	}
-}
-
-func TestQueueGet(t *testing.T) {
-	q := New()
-
-	for i := 0; i < 1000; i++ {
-		q.Add(i)
-		for j := 0; j < q.Length(); j++ {
-			if q.Get(j).(int) != j {
-				t.Errorf("index %d doesn't contain %d", j, j)
-			}
-		}
-	}
-}
-
-func TestQueueGetOutOfRangePanics(t *testing.T) {
-	q := New()
-
-	q.Add(1)
-	q.Add(2)
-	q.Add(3)
-
-	assertPanics(t, "should panic when negative index", func() {
-		q.Get(-1)
-	})
-
-	assertPanics(t, "should panic when index greater than length", func() {
-		q.Get(4)
-	})
-}
-
-func TestQueuePeekOutOfRangePanics(t *testing.T) {
-	q := New()
-
-	assertPanics(t, "should panic when peeking empty queue", func() {
-		q.Peek()
-	})
-
-	q.Add(1)
-	q.Remove()
-
-	assertPanics(t, "should panic when peeking emptied queue", func() {
-		q.Peek()
-	})
-}
-
-func TestQueueRemoveOutOfRangePanics(t *testing.T) {
-	q := New()
-
-	assertPanics(t, "should panic when removing empty queue", func() {
-		q.Remove()
-	})
-
-	q.Add(1)
-	q.Remove()
-
-	assertPanics(t, "should panic when removing emptied queue", func() {
-		q.Remove()
-	})
-}
-
-func assertPanics(t *testing.T, name string, f func()) {
-	defer func() {
-		if r := recover(); r == nil {
-			t.Errorf("%s: didn't panic as expected", name)
-		}
-	}()
-
-	f()
-}
-
-// General warning: Go's benchmark utility (go test -bench .) increases the number of
-// iterations until the benchmarks take a reasonable amount of time to run; memory usage
-// is *NOT* considered. On my machine, these benchmarks hit around ~1GB before they've had
-// enough, but if you have less than that available and start swapping, then all bets are off.
-
-func BenchmarkQueueSerial(b *testing.B) {
-	q := New()
-	for i := 0; i < b.N; i++ {
-		q.Add(nil)
-	}
-	for i := 0; i < b.N; i++ {
-		q.Peek()
-		q.Remove()
-	}
-}
-
-func BenchmarkQueueGet(b *testing.B) {
-	q := New()
-	for i := 0; i < b.N; i++ {
-		q.Add(i)
-	}
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		q.Get(i)
-	}
-}
-
-func BenchmarkQueueTickTock(b *testing.B) {
-	q := New()
-	for i := 0; i < b.N; i++ {
-		q.Add(nil)
-		q.Peek()
-		q.Remove()
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/.gitignore b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/.gitignore
deleted file mode 100644
index 5f6b48eae..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-# temporary symlink for testing
-testing/data/symlink
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/.travis.yml b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/.travis.yml
deleted file mode 100644
index d062464f2..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/.travis.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-language: go
-sudo: required
-go:
-  - 1.3.3
-  - 1.4.2
-  - 1.5.1
-  - tip
-env:
-  - GOARCH=amd64
-  - GOARCH=386
-script:
-  - make test
-  - DOCKER_HOST=tcp://127.0.0.1:2375 make integration
-services:
-  - docker
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/AUTHORS b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/AUTHORS
deleted file mode 100644
index c31304faf..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/AUTHORS
+++ /dev/null
@@ -1,108 +0,0 @@
-# This is the official list of go-dockerclient authors for copyright purposes.
-
-Abhishek Chanda <abhishek.becs@gmail.com>
-Adam Bell-Hanssen <adamb@aller.no>
-Adrien Kohlbecker <adrien.kohlbecker@gmail.com>
-Aldrin Leal <aldrin@leal.eng.br>
-Andreas Jaekle <andreas@jaekle.net>
-Andrews Medina <andrewsmedina@gmail.com>
-Artem Sidorenko <artem@2realities.com>
-Andy Goldstein <andy.goldstein@redhat.com>
-Ben Marini <ben@remind101.com>
-Ben McCann <benmccann.com>
-Brendan Fosberry <brendan@codeship.com>
-Brian Lalor <blalor@bravo5.org>
-Brian Palmer <brianp@instructure.com>
-Bryan Boreham <bjboreham@gmail.com>
-Burke Libbey <burke@libbey.me>
-Carlos Diaz-Padron <cpadron@mozilla.com>
-Cesar Wong <cewong@redhat.com>
-Cezar Sa Espinola <cezar.sa@corp.globo.com>
-Cheah Chu Yeow <chuyeow@gmail.com>
-cheneydeng <cheneydeng@qq.com>
-Chris Bednarski <banzaimonkey@gmail.com>
-CMGS <ilskdw@gmail.com>
-Craig Jellick <craig@rancher.com>
-Dan Williams <dcbw@redhat.com>
-Daniel, Dao Quang Minh <dqminh89@gmail.com>
-Daniel Garcia <daniel@danielgarcia.info>
-Darren Shepherd <darren@rancher.com>
-Dave Choi <dave.choi@daumkakao.com>
-David Huie <dahuie@gmail.com>
-Dawn Chen <dawnchen@google.com>
-Dinesh Subhraveti <dinesh@gemini-systems.net>
-Ed <edrocksit@gmail.com>
-Elias G. Schneevoigt <eliasgs@gmail.com>
-Erez Horev <erez.horev@elastifile.com>
-Eric Anderson <anderson@copperegg.com>
-Ewout Prangsma <ewout@prangsma.net>
-Fabio Rehm <fgrehm@gmail.com>
-Fatih Arslan <ftharsln@gmail.com>
-Flavia Missi <flaviamissi@gmail.com>
-Francisco Souza <f@souza.cc>
-Grégoire Delattre <gregoire.delattre@gmail.com>
-Guillermo Álvarez Fernández <guillermo@cientifico.net>
-He Simei <hesimei@zju.edu.cn>
-Ivan Mikushin <i.mikushin@gmail.com>
-James Bardin <jbardin@litl.com>
-Jari Kolehmainen <jari.kolehmainen@digia.com>
-Jason Wilder <jwilder@litl.com>
-Jawher Moussa <jawher.moussa@gmail.com>
-Jean-Baptiste Dalido <jeanbaptiste@appgratis.com>
-Jeff Mitchell <jeffrey.mitchell@gmail.com>
-Jeffrey Hulten <jhulten@gmail.com>
-Jen Andre <jandre@gmail.com>
-Johan Euphrosine <proppy@google.com>
-Kamil Domanski <kamil@domanski.co>
-Karan Misra <kidoman@gmail.com>
-Kim, Hirokuni <hirokuni.kim@kvh.co.jp>
-Kyle Allan <kallan357@gmail.com>
-Liron Levin <levinlir@gmail.com>
-Liu Peng <vslene@gmail.com>
-Lorenz Leutgeb <lorenz.leutgeb@gmail.com>
-Lucas Clemente <lucas@clemente.io>
-Lucas Weiblen <lucasweiblen@gmail.com>
-Lyon Hill <lyondhill@gmail.com>
-Mantas Matelis <mmatelis@coursera.org>
-Martin Sweeney <martin@sweeney.io>
-Máximo Cuadros Ortiz <mcuadros@gmail.com>
-Michael Schmatz <michaelschmatz@gmail.com>
-Michal Fojtik <mfojtik@redhat.com>
-Mike Dillon <mike.dillon@synctree.com>
-Mrunal Patel <mrunalp@gmail.com>
-Nick Ethier <ncethier@gmail.com>
-Omeid Matten <public@omeid.me>
-Orivej Desh <orivej@gmx.fr>
-Paul Bellamy <paul.a.bellamy@gmail.com>
-Paul Morie <pmorie@gmail.com>
-Paul Weil <pweil@redhat.com>
-Peter Edge <peter.edge@gmail.com>
-Peter Jihoon Kim <raingrove@gmail.com>
-Phil Lu <lu@stackengine.com>
-Philippe Lafoucrière <philippe.lafoucriere@tech-angels.com>
-Rafe Colton <rafael.colton@gmail.com>
-Rob Miller <rob@kalistra.com>
-Robert Williamson <williamson.robert@gmail.com>
-Salvador Gironès <salvadorgirones@gmail.com>
-Sam Rijs <srijs@airpost.net>
-Sami Wagiaalla <swagiaal@redhat.com>
-Samuel Karp <skarp@amazon.com>
-Silas Sewell <silas@sewell.org>
-Simon Eskildsen <sirup@sirupsen.com>
-Simon Menke <simon.menke@gmail.com>
-Skolos <skolos@gopherlab.com>
-Soulou <leo@unbekandt.eu>
-Sridhar Ratnakumar <sridharr@activestate.com>
-Summer Mousa <smousa@zenoss.com>
-Sunjin Lee <styner32@gmail.com>
-Tarsis Azevedo <tarsis@corp.globo.com>
-Tim Schindler <tim@catalyst-zero.com>
-Tobi Knaup <tobi@mesosphere.io>
-Tonic <tonicbupt@gmail.com>
-ttyh061 <ttyh061@gmail.com>
-Victor Marmol <vmarmol@google.com>
-Vincenzo Prignano <vincenzo.prignano@gmail.com>
-Wiliam Souza <wiliamsouza83@gmail.com>
-Ye Yin <eyniy@qq.com>
-Yu, Zou <zouyu7@huawei.com>
-Yuriy Bogdanov <chinsay@gmail.com>
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/DOCKER-LICENSE b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/DOCKER-LICENSE
deleted file mode 100644
index 706634474..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/DOCKER-LICENSE
+++ /dev/null
@@ -1,6 +0,0 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-You can find the Docker license at the following link:
-https://raw.githubusercontent.com/docker/docker/master/LICENSE
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/LICENSE b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/LICENSE
deleted file mode 100644
index 4e11de100..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/LICENSE
+++ /dev/null
@@ -1,22 +0,0 @@
-Copyright (c) 2015, go-dockerclient 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/fsouza/go-dockerclient/Makefile b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/Makefile
deleted file mode 100644
index 4d5d84067..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/Makefile
+++ /dev/null
@@ -1,51 +0,0 @@
-.PHONY: \
-	all \
-	vendor \
-	lint \
-	vet \
-	fmt \
-	fmtcheck \
-	pretest \
-	test \
-	integration \
-	cov \
-	clean
-
-SRCS = $(shell git ls-files '*.go' | grep -v '^external/')
-PKGS = ./. ./testing
-
-all: test
-
-vendor:
-	@ go get -v github.com/mjibson/party
-	party -d external -c -u
-
-lint:
-	@ go get -v github.com/golang/lint/golint
-	$(foreach file,$(SRCS),golint $(file) || exit;)
-
-vet:
-	@-go get -v golang.org/x/tools/cmd/vet
-	$(foreach pkg,$(PKGS),go vet $(pkg);)
-
-fmt:
-	gofmt -w $(SRCS)
-
-fmtcheck:
-	$(foreach file,$(SRCS),gofmt -d $(file);)
-
-pretest: lint vet fmtcheck
-
-test: pretest
-	$(foreach pkg,$(PKGS),go test $(pkg) || exit;)
-
-integration:
-	go test -tags docker_integration -run TestIntegration -v
-
-cov:
-	@ go get -v github.com/axw/gocov/gocov
-	@ go get golang.org/x/tools/cmd/cover
-	gocov test | gocov report
-
-clean:
-	$(foreach pkg,$(PKGS),go clean $(pkg) || exit;)
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/README.markdown b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/README.markdown
deleted file mode 100644
index 1672099f7..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/README.markdown
+++ /dev/null
@@ -1,106 +0,0 @@
-# go-dockerclient
-
-[![Drone](https://drone.io/github.com/fsouza/go-dockerclient/status.png)](https://drone.io/github.com/fsouza/go-dockerclient/latest)
-[![Travis](https://img.shields.io/travis/fsouza/go-dockerclient.svg?style=flat-square)](https://travis-ci.org/fsouza/go-dockerclient)
-[![GoDoc](https://img.shields.io/badge/api-Godoc-blue.svg?style=flat-square)](https://godoc.org/github.com/fsouza/go-dockerclient)
-
-This package presents a client for the Docker remote API. It also provides
-support for the extensions in the [Swarm API](https://docs.docker.com/swarm/api/swarm-api/).
-
-This package also provides support for docker's network API, which is a simple
-passthrough to the libnetwork remote API.  Note that docker's network API is
-only available in docker 1.8 and above, and only enabled in docker if
-DOCKER_EXPERIMENTAL is defined during the docker build process.
-
-For more details, check the [remote API documentation](http://docs.docker.com/engine/reference/api/docker_remote_api/).
-
-## Vendoring
-
-If you are having issues with Go 1.5 and have `GO15VENDOREXPERIMENT` set with an application that has go-dockerclient vendored,
-please update your vendoring of go-dockerclient :) We recently moved the `vendor` directory to `external` so that go-dockerclient
-is compatible with this configuration. See [338](https://github.com/fsouza/go-dockerclient/issues/338) and [339](https://github.com/fsouza/go-dockerclient/pull/339)
-for details.
-
-## Example
-
-```go
-package main
-
-import (
-	"fmt"
-
-	"github.com/fsouza/go-dockerclient"
-)
-
-func main() {
-	endpoint := "unix:///var/run/docker.sock"
-	client, _ := docker.NewClient(endpoint)
-	imgs, _ := client.ListImages(docker.ListImagesOptions{All: false})
-	for _, img := range imgs {
-		fmt.Println("ID: ", img.ID)
-		fmt.Println("RepoTags: ", img.RepoTags)
-		fmt.Println("Created: ", img.Created)
-		fmt.Println("Size: ", img.Size)
-		fmt.Println("VirtualSize: ", img.VirtualSize)
-		fmt.Println("ParentId: ", img.ParentID)
-	}
-}
-```
-
-## Using with TLS
-
-In order to instantiate the client for a TLS-enabled daemon, you should use NewTLSClient, passing the endpoint and path for key and certificates as parameters.
-
-```go
-package main
-
-import (
-	"fmt"
-
-	"github.com/fsouza/go-dockerclient"
-)
-
-func main() {
-	endpoint := "tcp://[ip]:[port]"
-	path := os.Getenv("DOCKER_CERT_PATH")
-	ca := fmt.Sprintf("%s/ca.pem", path)
-	cert := fmt.Sprintf("%s/cert.pem", path)
-	key := fmt.Sprintf("%s/key.pem", path)
-	client, _ := docker.NewTLSClient(endpoint, cert, key, ca)
-	// use client
-}
-```
-
-If using [docker-machine](https://docs.docker.com/machine/), or another application that exports environment variables
-`DOCKER_HOST, DOCKER_TLS_VERIFY, DOCKER_CERT_PATH`, you can use NewClientFromEnv.
-
-
-```go
-package main
-
-import (
-	"fmt"
-
-	"github.com/fsouza/go-dockerclient"
-)
-
-func main() {
-	client, _ := docker.NewClientFromEnv()
-	// use client
-}
-```
-
-See the documentation for more details.
-
-## Developing
-
-All development commands can be seen in the [Makefile](Makefile).
-
-Commited code must pass:
-
-* [golint](https://github.com/golang/lint)
-* [go vet](https://godoc.org/golang.org/x/tools/cmd/vet)
-* [gofmt](https://golang.org/cmd/gofmt)
-* [go test](https://golang.org/cmd/go/#hdr-Test_packages)
-
-Running `make test` will check all of these. If your editor does not automatically call gofmt, `make fmt` will format all go files in this repository.
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/auth.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/auth.go
deleted file mode 100644
index 30e3af3eb..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/auth.go
+++ /dev/null
@@ -1,136 +0,0 @@
-// Copyright 2015 go-dockerclient 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 docker
-
-import (
-	"bytes"
-	"encoding/base64"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"io"
-	"os"
-	"path"
-	"strings"
-)
-
-// ErrCannotParseDockercfg is the error returned by NewAuthConfigurations when the dockercfg cannot be parsed.
-var ErrCannotParseDockercfg = errors.New("Failed to read authentication from dockercfg")
-
-// AuthConfiguration represents authentication options to use in the PushImage
-// method. It represents the authentication in the Docker index server.
-type AuthConfiguration struct {
-	Username      string `json:"username,omitempty"`
-	Password      string `json:"password,omitempty"`
-	Email         string `json:"email,omitempty"`
-	ServerAddress string `json:"serveraddress,omitempty"`
-}
-
-// AuthConfigurations represents authentication options to use for the
-// PushImage method accommodating the new X-Registry-Config header
-type AuthConfigurations struct {
-	Configs map[string]AuthConfiguration `json:"configs"`
-}
-
-// AuthConfigurations119 is used to serialize a set of AuthConfigurations
-// for Docker API >= 1.19.
-type AuthConfigurations119 map[string]AuthConfiguration
-
-// dockerConfig represents a registry authentation configuration from the
-// .dockercfg file.
-type dockerConfig struct {
-	Auth  string `json:"auth"`
-	Email string `json:"email"`
-}
-
-// NewAuthConfigurationsFromDockerCfg returns AuthConfigurations from the
-// ~/.dockercfg file.
-func NewAuthConfigurationsFromDockerCfg() (*AuthConfigurations, error) {
-	var r io.Reader
-	var err error
-	p := path.Join(os.Getenv("HOME"), ".docker", "config.json")
-	r, err = os.Open(p)
-	if err != nil {
-		p := path.Join(os.Getenv("HOME"), ".dockercfg")
-		r, err = os.Open(p)
-		if err != nil {
-			return nil, err
-		}
-	}
-	return NewAuthConfigurations(r)
-}
-
-// NewAuthConfigurations returns AuthConfigurations from a JSON encoded string in the
-// same format as the .dockercfg file.
-func NewAuthConfigurations(r io.Reader) (*AuthConfigurations, error) {
-	var auth *AuthConfigurations
-	confs, err := parseDockerConfig(r)
-	if err != nil {
-		return nil, err
-	}
-	auth, err = authConfigs(confs)
-	if err != nil {
-		return nil, err
-	}
-	return auth, nil
-}
-
-func parseDockerConfig(r io.Reader) (map[string]dockerConfig, error) {
-	buf := new(bytes.Buffer)
-	buf.ReadFrom(r)
-	byteData := buf.Bytes()
-
-	var confsWrapper map[string]map[string]dockerConfig
-	if err := json.Unmarshal(byteData, &confsWrapper); err == nil {
-		if confs, ok := confsWrapper["auths"]; ok {
-			return confs, nil
-		}
-	}
-
-	var confs map[string]dockerConfig
-	if err := json.Unmarshal(byteData, &confs); err != nil {
-		return nil, err
-	}
-	return confs, nil
-}
-
-// authConfigs converts a dockerConfigs map to a AuthConfigurations object.
-func authConfigs(confs map[string]dockerConfig) (*AuthConfigurations, error) {
-	c := &AuthConfigurations{
-		Configs: make(map[string]AuthConfiguration),
-	}
-	for reg, conf := range confs {
-		data, err := base64.StdEncoding.DecodeString(conf.Auth)
-		if err != nil {
-			return nil, err
-		}
-		userpass := strings.Split(string(data), ":")
-		if len(userpass) != 2 {
-			return nil, ErrCannotParseDockercfg
-		}
-		c.Configs[reg] = AuthConfiguration{
-			Email:         conf.Email,
-			Username:      userpass[0],
-			Password:      userpass[1],
-			ServerAddress: reg,
-		}
-	}
-	return c, nil
-}
-
-// AuthCheck validates the given credentials. It returns nil if successful.
-//
-// See https://goo.gl/m2SleN for more details.
-func (c *Client) AuthCheck(conf *AuthConfiguration) error {
-	if conf == nil {
-		return fmt.Errorf("conf is nil")
-	}
-	resp, err := c.do("POST", "/auth", doOptions{data: conf})
-	if err != nil {
-		return err
-	}
-	resp.Body.Close()
-	return nil
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/change.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/change.go
deleted file mode 100644
index d133594d4..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/change.go
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2014 go-dockerclient 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 docker
-
-import "fmt"
-
-// ChangeType is a type for constants indicating the type of change
-// in a container
-type ChangeType int
-
-const (
-	// ChangeModify is the ChangeType for container modifications
-	ChangeModify ChangeType = iota
-
-	// ChangeAdd is the ChangeType for additions to a container
-	ChangeAdd
-
-	// ChangeDelete is the ChangeType for deletions from a container
-	ChangeDelete
-)
-
-// Change represents a change in a container.
-//
-// See https://goo.gl/9GsTIF for more details.
-type Change struct {
-	Path string
-	Kind ChangeType
-}
-
-func (change *Change) String() string {
-	var kind string
-	switch change.Kind {
-	case ChangeModify:
-		kind = "C"
-	case ChangeAdd:
-		kind = "A"
-	case ChangeDelete:
-		kind = "D"
-	}
-	return fmt.Sprintf("%s %s", kind, change.Path)
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/client.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/client.go
deleted file mode 100644
index f7a3905d0..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/client.go
+++ /dev/null
@@ -1,882 +0,0 @@
-// Copyright 2015 go-dockerclient 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 docker provides a client for the Docker remote API.
-//
-// See https://goo.gl/G3plxW for more details on the remote API.
-package docker
-
-import (
-	"bufio"
-	"bytes"
-	"crypto/tls"
-	"crypto/x509"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"net"
-	"net/http"
-	"net/http/httputil"
-	"net/url"
-	"os"
-	"path/filepath"
-	"reflect"
-	"runtime"
-	"strconv"
-	"strings"
-	"time"
-
-	"github.com/fsouza/go-dockerclient/external/github.com/docker/docker/opts"
-	"github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/homedir"
-	"github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/stdcopy"
-	"github.com/fsouza/go-dockerclient/external/github.com/hashicorp/go-cleanhttp"
-)
-
-const userAgent = "go-dockerclient"
-
-var (
-	// ErrInvalidEndpoint is returned when the endpoint is not a valid HTTP URL.
-	ErrInvalidEndpoint = errors.New("invalid endpoint")
-
-	// ErrConnectionRefused is returned when the client cannot connect to the given endpoint.
-	ErrConnectionRefused = errors.New("cannot connect to Docker endpoint")
-
-	apiVersion112, _ = NewAPIVersion("1.12")
-
-	apiVersion119, _ = NewAPIVersion("1.19")
-)
-
-// APIVersion is an internal representation of a version of the Remote API.
-type APIVersion []int
-
-// NewAPIVersion returns an instance of APIVersion for the given string.
-//
-// The given string must be in the form <major>.<minor>.<patch>, where <major>,
-// <minor> and <patch> are integer numbers.
-func NewAPIVersion(input string) (APIVersion, error) {
-	if !strings.Contains(input, ".") {
-		return nil, fmt.Errorf("Unable to parse version %q", input)
-	}
-	arr := strings.Split(input, ".")
-	ret := make(APIVersion, len(arr))
-	var err error
-	for i, val := range arr {
-		ret[i], err = strconv.Atoi(val)
-		if err != nil {
-			return nil, fmt.Errorf("Unable to parse version %q: %q is not an integer", input, val)
-		}
-	}
-	return ret, nil
-}
-
-func (version APIVersion) String() string {
-	var str string
-	for i, val := range version {
-		str += strconv.Itoa(val)
-		if i < len(version)-1 {
-			str += "."
-		}
-	}
-	return str
-}
-
-// LessThan is a function for comparing APIVersion structs
-func (version APIVersion) LessThan(other APIVersion) bool {
-	return version.compare(other) < 0
-}
-
-// LessThanOrEqualTo is a function for comparing APIVersion structs
-func (version APIVersion) LessThanOrEqualTo(other APIVersion) bool {
-	return version.compare(other) <= 0
-}
-
-// GreaterThan is a function for comparing APIVersion structs
-func (version APIVersion) GreaterThan(other APIVersion) bool {
-	return version.compare(other) > 0
-}
-
-// GreaterThanOrEqualTo is a function for comparing APIVersion structs
-func (version APIVersion) GreaterThanOrEqualTo(other APIVersion) bool {
-	return version.compare(other) >= 0
-}
-
-func (version APIVersion) compare(other APIVersion) int {
-	for i, v := range version {
-		if i <= len(other)-1 {
-			otherVersion := other[i]
-
-			if v < otherVersion {
-				return -1
-			} else if v > otherVersion {
-				return 1
-			}
-		}
-	}
-	if len(version) > len(other) {
-		return 1
-	}
-	if len(version) < len(other) {
-		return -1
-	}
-	return 0
-}
-
-// Client is the basic type of this package. It provides methods for
-// interaction with the API.
-type Client struct {
-	SkipServerVersionCheck bool
-	HTTPClient             *http.Client
-	TLSConfig              *tls.Config
-	Dialer                 *net.Dialer
-
-	endpoint            string
-	endpointURL         *url.URL
-	eventMonitor        *eventMonitoringState
-	requestedAPIVersion APIVersion
-	serverAPIVersion    APIVersion
-	expectedAPIVersion  APIVersion
-	unixHTTPClient      *http.Client
-}
-
-// NewClient returns a Client instance ready for communication with the given
-// server endpoint. It will use the latest remote API version available in the
-// server.
-func NewClient(endpoint string) (*Client, error) {
-	client, err := NewVersionedClient(endpoint, "")
-	if err != nil {
-		return nil, err
-	}
-	client.SkipServerVersionCheck = true
-	return client, nil
-}
-
-// NewTLSClient returns a Client instance ready for TLS communications with the givens
-// server endpoint, key and certificates . It will use the latest remote API version
-// available in the server.
-func NewTLSClient(endpoint string, cert, key, ca string) (*Client, error) {
-	client, err := NewVersionedTLSClient(endpoint, cert, key, ca, "")
-	if err != nil {
-		return nil, err
-	}
-	client.SkipServerVersionCheck = true
-	return client, nil
-}
-
-// NewTLSClientFromBytes returns a Client instance ready for TLS communications with the givens
-// server endpoint, key and certificates (passed inline to the function as opposed to being
-// read from a local file). It will use the latest remote API version available in the server.
-func NewTLSClientFromBytes(endpoint string, certPEMBlock, keyPEMBlock, caPEMCert []byte) (*Client, error) {
-	client, err := NewVersionedTLSClientFromBytes(endpoint, certPEMBlock, keyPEMBlock, caPEMCert, "")
-	if err != nil {
-		return nil, err
-	}
-	client.SkipServerVersionCheck = true
-	return client, nil
-}
-
-// NewVersionedClient returns a Client instance ready for communication with
-// the given server endpoint, using a specific remote API version.
-func NewVersionedClient(endpoint string, apiVersionString string) (*Client, error) {
-	u, err := parseEndpoint(endpoint, false)
-	if err != nil {
-		return nil, err
-	}
-	var requestedAPIVersion APIVersion
-	if strings.Contains(apiVersionString, ".") {
-		requestedAPIVersion, err = NewAPIVersion(apiVersionString)
-		if err != nil {
-			return nil, err
-		}
-	}
-	return &Client{
-		HTTPClient:          cleanhttp.DefaultClient(),
-		Dialer:              &net.Dialer{},
-		endpoint:            endpoint,
-		endpointURL:         u,
-		eventMonitor:        new(eventMonitoringState),
-		requestedAPIVersion: requestedAPIVersion,
-	}, nil
-}
-
-// NewVersionnedTLSClient has been DEPRECATED, please use NewVersionedTLSClient.
-func NewVersionnedTLSClient(endpoint string, cert, key, ca, apiVersionString string) (*Client, error) {
-	return NewVersionedTLSClient(endpoint, cert, key, ca, apiVersionString)
-}
-
-// NewVersionedTLSClient returns a Client instance ready for TLS communications with the givens
-// server endpoint, key and certificates, using a specific remote API version.
-func NewVersionedTLSClient(endpoint string, cert, key, ca, apiVersionString string) (*Client, error) {
-	certPEMBlock, err := ioutil.ReadFile(cert)
-	if err != nil {
-		return nil, err
-	}
-	keyPEMBlock, err := ioutil.ReadFile(key)
-	if err != nil {
-		return nil, err
-	}
-	caPEMCert, err := ioutil.ReadFile(ca)
-	if err != nil {
-		return nil, err
-	}
-	return NewVersionedTLSClientFromBytes(endpoint, certPEMBlock, keyPEMBlock, caPEMCert, apiVersionString)
-}
-
-// NewClientFromEnv returns a Client instance ready for communication created from
-// Docker's default logic for the environment variables DOCKER_HOST, DOCKER_TLS_VERIFY, and DOCKER_CERT_PATH.
-//
-// See https://github.com/docker/docker/blob/1f963af697e8df3a78217f6fdbf67b8123a7db94/docker/docker.go#L68.
-// See https://github.com/docker/compose/blob/81707ef1ad94403789166d2fe042c8a718a4c748/compose/cli/docker_client.py#L7.
-func NewClientFromEnv() (*Client, error) {
-	client, err := NewVersionedClientFromEnv("")
-	if err != nil {
-		return nil, err
-	}
-	client.SkipServerVersionCheck = true
-	return client, nil
-}
-
-// NewVersionedClientFromEnv returns a Client instance ready for TLS communications created from
-// Docker's default logic for the environment variables DOCKER_HOST, DOCKER_TLS_VERIFY, and DOCKER_CERT_PATH,
-// and using a specific remote API version.
-//
-// See https://github.com/docker/docker/blob/1f963af697e8df3a78217f6fdbf67b8123a7db94/docker/docker.go#L68.
-// See https://github.com/docker/compose/blob/81707ef1ad94403789166d2fe042c8a718a4c748/compose/cli/docker_client.py#L7.
-func NewVersionedClientFromEnv(apiVersionString string) (*Client, error) {
-	dockerEnv, err := getDockerEnv()
-	if err != nil {
-		return nil, err
-	}
-	dockerHost := dockerEnv.dockerHost
-	if dockerEnv.dockerTLSVerify {
-		parts := strings.SplitN(dockerEnv.dockerHost, "://", 2)
-		if len(parts) != 2 {
-			return nil, fmt.Errorf("could not split %s into two parts by ://", dockerHost)
-		}
-		cert := filepath.Join(dockerEnv.dockerCertPath, "cert.pem")
-		key := filepath.Join(dockerEnv.dockerCertPath, "key.pem")
-		ca := filepath.Join(dockerEnv.dockerCertPath, "ca.pem")
-		return NewVersionedTLSClient(dockerEnv.dockerHost, cert, key, ca, apiVersionString)
-	}
-	return NewVersionedClient(dockerEnv.dockerHost, apiVersionString)
-}
-
-// NewVersionedTLSClientFromBytes returns a Client instance ready for TLS communications with the givens
-// server endpoint, key and certificates (passed inline to the function as opposed to being
-// read from a local file), using a specific remote API version.
-func NewVersionedTLSClientFromBytes(endpoint string, certPEMBlock, keyPEMBlock, caPEMCert []byte, apiVersionString string) (*Client, error) {
-	u, err := parseEndpoint(endpoint, true)
-	if err != nil {
-		return nil, err
-	}
-	var requestedAPIVersion APIVersion
-	if strings.Contains(apiVersionString, ".") {
-		requestedAPIVersion, err = NewAPIVersion(apiVersionString)
-		if err != nil {
-			return nil, err
-		}
-	}
-	if certPEMBlock == nil || keyPEMBlock == nil {
-		return nil, errors.New("Both cert and key are required")
-	}
-	tlsCert, err := tls.X509KeyPair(certPEMBlock, keyPEMBlock)
-	if err != nil {
-		return nil, err
-	}
-	tlsConfig := &tls.Config{Certificates: []tls.Certificate{tlsCert}}
-	if caPEMCert == nil {
-		tlsConfig.InsecureSkipVerify = true
-	} else {
-		caPool := x509.NewCertPool()
-		if !caPool.AppendCertsFromPEM(caPEMCert) {
-			return nil, errors.New("Could not add RootCA pem")
-		}
-		tlsConfig.RootCAs = caPool
-	}
-	tr := cleanhttp.DefaultTransport()
-	tr.TLSClientConfig = tlsConfig
-	if err != nil {
-		return nil, err
-	}
-	return &Client{
-		HTTPClient:          &http.Client{Transport: tr},
-		TLSConfig:           tlsConfig,
-		Dialer:              &net.Dialer{},
-		endpoint:            endpoint,
-		endpointURL:         u,
-		eventMonitor:        new(eventMonitoringState),
-		requestedAPIVersion: requestedAPIVersion,
-	}, nil
-}
-
-func (c *Client) checkAPIVersion() error {
-	serverAPIVersionString, err := c.getServerAPIVersionString()
-	if err != nil {
-		return err
-	}
-	c.serverAPIVersion, err = NewAPIVersion(serverAPIVersionString)
-	if err != nil {
-		return err
-	}
-	if c.requestedAPIVersion == nil {
-		c.expectedAPIVersion = c.serverAPIVersion
-	} else {
-		c.expectedAPIVersion = c.requestedAPIVersion
-	}
-	return nil
-}
-
-// Endpoint returns the current endpoint. It's useful for getting the endpoint
-// when using functions that get this data from the environment (like
-// NewClientFromEnv.
-func (c *Client) Endpoint() string {
-	return c.endpoint
-}
-
-// Ping pings the docker server
-//
-// See https://goo.gl/kQCfJj for more details.
-func (c *Client) Ping() error {
-	path := "/_ping"
-	resp, err := c.do("GET", path, doOptions{})
-	if err != nil {
-		return err
-	}
-	if resp.StatusCode != http.StatusOK {
-		return newError(resp)
-	}
-	resp.Body.Close()
-	return nil
-}
-
-func (c *Client) getServerAPIVersionString() (version string, err error) {
-	resp, err := c.do("GET", "/version", doOptions{})
-	if err != nil {
-		return "", err
-	}
-	defer resp.Body.Close()
-	if resp.StatusCode != http.StatusOK {
-		return "", fmt.Errorf("Received unexpected status %d while trying to retrieve the server version", resp.StatusCode)
-	}
-	var versionResponse map[string]interface{}
-	if err := json.NewDecoder(resp.Body).Decode(&versionResponse); err != nil {
-		return "", err
-	}
-	if version, ok := (versionResponse["ApiVersion"]).(string); ok {
-		return version, nil
-	}
-	return "", nil
-}
-
-type doOptions struct {
-	data      interface{}
-	forceJSON bool
-	headers   map[string]string
-}
-
-func (c *Client) do(method, path string, doOptions doOptions) (*http.Response, error) {
-	var params io.Reader
-	if doOptions.data != nil || doOptions.forceJSON {
-		buf, err := json.Marshal(doOptions.data)
-		if err != nil {
-			return nil, err
-		}
-		params = bytes.NewBuffer(buf)
-	}
-	if path != "/version" && !c.SkipServerVersionCheck && c.expectedAPIVersion == nil {
-		err := c.checkAPIVersion()
-		if err != nil {
-			return nil, err
-		}
-	}
-	httpClient := c.HTTPClient
-	protocol := c.endpointURL.Scheme
-	var u string
-	if protocol == "unix" {
-		httpClient = c.unixClient()
-		u = c.getFakeUnixURL(path)
-	} else {
-		u = c.getURL(path)
-	}
-	req, err := http.NewRequest(method, u, params)
-	if err != nil {
-		return nil, err
-	}
-	req.Header.Set("User-Agent", userAgent)
-	if doOptions.data != nil {
-		req.Header.Set("Content-Type", "application/json")
-	} else if method == "POST" {
-		req.Header.Set("Content-Type", "plain/text")
-	}
-
-	for k, v := range doOptions.headers {
-		req.Header.Set(k, v)
-	}
-	resp, err := httpClient.Do(req)
-	if err != nil {
-		if strings.Contains(err.Error(), "connection refused") {
-			return nil, ErrConnectionRefused
-		}
-		return nil, err
-	}
-	if resp.StatusCode < 200 || resp.StatusCode >= 400 {
-		return nil, newError(resp)
-	}
-	return resp, nil
-}
-
-type streamOptions struct {
-	setRawTerminal bool
-	rawJSONStream  bool
-	useJSONDecoder bool
-	headers        map[string]string
-	in             io.Reader
-	stdout         io.Writer
-	stderr         io.Writer
-	// timeout is the inital connection timeout
-	timeout time.Duration
-}
-
-func (c *Client) stream(method, path string, streamOptions streamOptions) error {
-	if (method == "POST" || method == "PUT") && streamOptions.in == nil {
-		streamOptions.in = bytes.NewReader(nil)
-	}
-	if path != "/version" && !c.SkipServerVersionCheck && c.expectedAPIVersion == nil {
-		err := c.checkAPIVersion()
-		if err != nil {
-			return err
-		}
-	}
-	req, err := http.NewRequest(method, c.getURL(path), streamOptions.in)
-	if err != nil {
-		return err
-	}
-	req.Header.Set("User-Agent", userAgent)
-	if method == "POST" {
-		req.Header.Set("Content-Type", "plain/text")
-	}
-	for key, val := range streamOptions.headers {
-		req.Header.Set(key, val)
-	}
-	var resp *http.Response
-	protocol := c.endpointURL.Scheme
-	address := c.endpointURL.Path
-	if streamOptions.stdout == nil {
-		streamOptions.stdout = ioutil.Discard
-	}
-	if streamOptions.stderr == nil {
-		streamOptions.stderr = ioutil.Discard
-	}
-	if protocol == "unix" {
-		dial, err := c.Dialer.Dial(protocol, address)
-		if err != nil {
-			return err
-		}
-		defer dial.Close()
-		breader := bufio.NewReader(dial)
-		err = req.Write(dial)
-		if err != nil {
-			return err
-		}
-
-		// ReadResponse may hang if server does not replay
-		if streamOptions.timeout > 0 {
-			dial.SetDeadline(time.Now().Add(streamOptions.timeout))
-		}
-
-		if resp, err = http.ReadResponse(breader, req); err != nil {
-			// Cancel timeout for future I/O operations
-			if streamOptions.timeout > 0 {
-				dial.SetDeadline(time.Time{})
-			}
-			if strings.Contains(err.Error(), "connection refused") {
-				return ErrConnectionRefused
-			}
-			return err
-		}
-	} else {
-		if resp, err = c.HTTPClient.Do(req); err != nil {
-			if strings.Contains(err.Error(), "connection refused") {
-				return ErrConnectionRefused
-			}
-			return err
-		}
-	}
-	defer resp.Body.Close()
-	if resp.StatusCode < 200 || resp.StatusCode >= 400 {
-		return newError(resp)
-	}
-	if streamOptions.useJSONDecoder || resp.Header.Get("Content-Type") == "application/json" {
-		// if we want to get raw json stream, just copy it back to output
-		// without decoding it
-		if streamOptions.rawJSONStream {
-			_, err = io.Copy(streamOptions.stdout, resp.Body)
-			return err
-		}
-		dec := json.NewDecoder(resp.Body)
-		for {
-			var m jsonMessage
-			if err := dec.Decode(&m); err == io.EOF {
-				break
-			} else if err != nil {
-				return err
-			}
-			if m.Stream != "" {
-				fmt.Fprint(streamOptions.stdout, m.Stream)
-			} else if m.Progress != "" {
-				fmt.Fprintf(streamOptions.stdout, "%s %s\r", m.Status, m.Progress)
-			} else if m.Error != "" {
-				return errors.New(m.Error)
-			}
-			if m.Status != "" {
-				fmt.Fprintln(streamOptions.stdout, m.Status)
-			}
-		}
-	} else {
-		if streamOptions.setRawTerminal {
-			_, err = io.Copy(streamOptions.stdout, resp.Body)
-		} else {
-			_, err = stdcopy.StdCopy(streamOptions.stdout, streamOptions.stderr, resp.Body)
-		}
-		return err
-	}
-	return nil
-}
-
-type hijackOptions struct {
-	success        chan struct{}
-	setRawTerminal bool
-	in             io.Reader
-	stdout         io.Writer
-	stderr         io.Writer
-	data           interface{}
-}
-
-func (c *Client) hijack(method, path string, hijackOptions hijackOptions) error {
-	if path != "/version" && !c.SkipServerVersionCheck && c.expectedAPIVersion == nil {
-		err := c.checkAPIVersion()
-		if err != nil {
-			return err
-		}
-	}
-	var params io.Reader
-	if hijackOptions.data != nil {
-		buf, err := json.Marshal(hijackOptions.data)
-		if err != nil {
-			return err
-		}
-		params = bytes.NewBuffer(buf)
-	}
-	req, err := http.NewRequest(method, c.getURL(path), params)
-	if err != nil {
-		return err
-	}
-	req.Header.Set("Content-Type", "plain/text")
-	req.Header.Set("Connection", "Upgrade")
-	req.Header.Set("Upgrade", "tcp")
-	protocol := c.endpointURL.Scheme
-	address := c.endpointURL.Path
-	if protocol != "unix" {
-		protocol = "tcp"
-		address = c.endpointURL.Host
-	}
-	var dial net.Conn
-	if c.TLSConfig != nil && protocol != "unix" {
-		dial, err = tlsDialWithDialer(c.Dialer, protocol, address, c.TLSConfig)
-		if err != nil {
-			return err
-		}
-	} else {
-		dial, err = c.Dialer.Dial(protocol, address)
-		if err != nil {
-			return err
-		}
-	}
-	clientconn := httputil.NewClientConn(dial, nil)
-	defer clientconn.Close()
-	clientconn.Do(req)
-	if hijackOptions.success != nil {
-		hijackOptions.success <- struct{}{}
-		<-hijackOptions.success
-	}
-	rwc, br := clientconn.Hijack()
-	defer rwc.Close()
-	errChanOut := make(chan error, 1)
-	errChanIn := make(chan error, 1)
-	if hijackOptions.stdout == nil && hijackOptions.stderr == nil {
-		close(errChanOut)
-	} else {
-		// Only copy if hijackOptions.stdout and/or hijackOptions.stderr is actually set.
-		// Otherwise, if the only stream you care about is stdin, your attach session
-		// will "hang" until the container terminates, even though you're not reading
-		// stdout/stderr
-		if hijackOptions.stdout == nil {
-			hijackOptions.stdout = ioutil.Discard
-		}
-		if hijackOptions.stderr == nil {
-			hijackOptions.stderr = ioutil.Discard
-		}
-
-		go func() {
-			defer func() {
-				if hijackOptions.in != nil {
-					if closer, ok := hijackOptions.in.(io.Closer); ok {
-						closer.Close()
-					}
-					errChanIn <- nil
-				}
-			}()
-
-			var err error
-			if hijackOptions.setRawTerminal {
-				_, err = io.Copy(hijackOptions.stdout, br)
-			} else {
-				_, err = stdcopy.StdCopy(hijackOptions.stdout, hijackOptions.stderr, br)
-			}
-			errChanOut <- err
-		}()
-	}
-	go func() {
-		var err error
-		if hijackOptions.in != nil {
-			_, err = io.Copy(rwc, hijackOptions.in)
-		}
-		errChanIn <- err
-		rwc.(interface {
-			CloseWrite() error
-		}).CloseWrite()
-	}()
-	errIn := <-errChanIn
-	errOut := <-errChanOut
-	if errIn != nil {
-		return errIn
-	}
-	return errOut
-}
-
-func (c *Client) getURL(path string) string {
-	urlStr := strings.TrimRight(c.endpointURL.String(), "/")
-	if c.endpointURL.Scheme == "unix" {
-		urlStr = ""
-	}
-	if c.requestedAPIVersion != nil {
-		return fmt.Sprintf("%s/v%s%s", urlStr, c.requestedAPIVersion, path)
-	}
-	return fmt.Sprintf("%s%s", urlStr, path)
-}
-
-// getFakeUnixURL returns the URL needed to make an HTTP request over a UNIX
-// domain socket to the given path.
-func (c *Client) getFakeUnixURL(path string) string {
-	u := *c.endpointURL // Copy.
-
-	// Override URL so that net/http will not complain.
-	u.Scheme = "http"
-	u.Host = "unix.sock" // Doesn't matter what this is - it's not used.
-	u.Path = ""
-	urlStr := strings.TrimRight(u.String(), "/")
-	if c.requestedAPIVersion != nil {
-		return fmt.Sprintf("%s/v%s%s", urlStr, c.requestedAPIVersion, path)
-	}
-	return fmt.Sprintf("%s%s", urlStr, path)
-}
-
-func (c *Client) unixClient() *http.Client {
-	if c.unixHTTPClient != nil {
-		return c.unixHTTPClient
-	}
-	socketPath := c.endpointURL.Path
-	c.unixHTTPClient = &http.Client{
-		Transport: &http.Transport{
-			Dial: func(network, addr string) (net.Conn, error) {
-				return c.Dialer.Dial("unix", socketPath)
-			},
-		},
-	}
-	return c.unixHTTPClient
-}
-
-type jsonMessage struct {
-	Status   string `json:"status,omitempty"`
-	Progress string `json:"progress,omitempty"`
-	Error    string `json:"error,omitempty"`
-	Stream   string `json:"stream,omitempty"`
-}
-
-func queryString(opts interface{}) string {
-	if opts == nil {
-		return ""
-	}
-	value := reflect.ValueOf(opts)
-	if value.Kind() == reflect.Ptr {
-		value = value.Elem()
-	}
-	if value.Kind() != reflect.Struct {
-		return ""
-	}
-	items := url.Values(map[string][]string{})
-	for i := 0; i < value.NumField(); i++ {
-		field := value.Type().Field(i)
-		if field.PkgPath != "" {
-			continue
-		}
-		key := field.Tag.Get("qs")
-		if key == "" {
-			key = strings.ToLower(field.Name)
-		} else if key == "-" {
-			continue
-		}
-		addQueryStringValue(items, key, value.Field(i))
-	}
-	return items.Encode()
-}
-
-func addQueryStringValue(items url.Values, key string, v reflect.Value) {
-	switch v.Kind() {
-	case reflect.Bool:
-		if v.Bool() {
-			items.Add(key, "1")
-		}
-	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
-		if v.Int() > 0 {
-			items.Add(key, strconv.FormatInt(v.Int(), 10))
-		}
-	case reflect.Float32, reflect.Float64:
-		if v.Float() > 0 {
-			items.Add(key, strconv.FormatFloat(v.Float(), 'f', -1, 64))
-		}
-	case reflect.String:
-		if v.String() != "" {
-			items.Add(key, v.String())
-		}
-	case reflect.Ptr:
-		if !v.IsNil() {
-			if b, err := json.Marshal(v.Interface()); err == nil {
-				items.Add(key, string(b))
-			}
-		}
-	case reflect.Map:
-		if len(v.MapKeys()) > 0 {
-			if b, err := json.Marshal(v.Interface()); err == nil {
-				items.Add(key, string(b))
-			}
-		}
-	case reflect.Array, reflect.Slice:
-		vLen := v.Len()
-		if vLen > 0 {
-			for i := 0; i < vLen; i++ {
-				addQueryStringValue(items, key, v.Index(i))
-			}
-		}
-	}
-}
-
-// Error represents failures in the API. It represents a failure from the API.
-type Error struct {
-	Status  int
-	Message string
-}
-
-func newError(resp *http.Response) *Error {
-	defer resp.Body.Close()
-	data, err := ioutil.ReadAll(resp.Body)
-	if err != nil {
-		return &Error{Status: resp.StatusCode, Message: fmt.Sprintf("cannot read body, err: %v", err)}
-	}
-	return &Error{Status: resp.StatusCode, Message: string(data)}
-}
-
-func (e *Error) Error() string {
-	return fmt.Sprintf("API error (%d): %s", e.Status, e.Message)
-}
-
-func parseEndpoint(endpoint string, tls bool) (*url.URL, error) {
-	u, err := url.Parse(endpoint)
-	if err != nil {
-		return nil, ErrInvalidEndpoint
-	}
-	if tls {
-		u.Scheme = "https"
-	}
-	switch u.Scheme {
-	case "unix":
-		return u, nil
-	case "http", "https", "tcp":
-		_, port, err := net.SplitHostPort(u.Host)
-		if err != nil {
-			if e, ok := err.(*net.AddrError); ok {
-				if e.Err == "missing port in address" {
-					return u, nil
-				}
-			}
-			return nil, ErrInvalidEndpoint
-		}
-		number, err := strconv.ParseInt(port, 10, 64)
-		if err == nil && number > 0 && number < 65536 {
-			if u.Scheme == "tcp" {
-				if tls {
-					u.Scheme = "https"
-				} else {
-					u.Scheme = "http"
-				}
-			}
-			return u, nil
-		}
-		return nil, ErrInvalidEndpoint
-	default:
-		return nil, ErrInvalidEndpoint
-	}
-}
-
-type dockerEnv struct {
-	dockerHost      string
-	dockerTLSVerify bool
-	dockerCertPath  string
-}
-
-func getDockerEnv() (*dockerEnv, error) {
-	dockerHost := os.Getenv("DOCKER_HOST")
-	var err error
-	if dockerHost == "" {
-		dockerHost, err = DefaultDockerHost()
-		if err != nil {
-			return nil, err
-		}
-	}
-	dockerTLSVerify := os.Getenv("DOCKER_TLS_VERIFY") != ""
-	var dockerCertPath string
-	if dockerTLSVerify {
-		dockerCertPath = os.Getenv("DOCKER_CERT_PATH")
-		if dockerCertPath == "" {
-			home := homedir.Get()
-			if home == "" {
-				return nil, errors.New("environment variable HOME must be set if DOCKER_CERT_PATH is not set")
-			}
-			dockerCertPath = filepath.Join(home, ".docker")
-			dockerCertPath, err = filepath.Abs(dockerCertPath)
-			if err != nil {
-				return nil, err
-			}
-		}
-	}
-	return &dockerEnv{
-		dockerHost:      dockerHost,
-		dockerTLSVerify: dockerTLSVerify,
-		dockerCertPath:  dockerCertPath,
-	}, nil
-}
-
-// DefaultDockerHost returns the default docker socket for the current OS
-func DefaultDockerHost() (string, error) {
-	var defaultHost string
-	if runtime.GOOS == "windows" {
-		// If we do not have a host, default to TCP socket on Windows
-		defaultHost = fmt.Sprintf("tcp://%s:%d", opts.DefaultHTTPHost, opts.DefaultHTTPPort)
-	} else {
-		// If we do not have a host, default to unix socket
-		defaultHost = fmt.Sprintf("unix://%s", opts.DefaultUnixSocket)
-	}
-	return opts.ValidateHost(defaultHost)
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/container.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/container.go
deleted file mode 100644
index faf12632f..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/container.go
+++ /dev/null
@@ -1,1141 +0,0 @@
-// Copyright 2015 go-dockerclient 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 docker
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-	"io"
-	"net/http"
-	"net/url"
-	"strconv"
-	"strings"
-	"time"
-)
-
-// ErrContainerAlreadyExists is the error returned by CreateContainer when the
-// container already exists.
-var ErrContainerAlreadyExists = errors.New("container already exists")
-
-// ListContainersOptions specify parameters to the ListContainers function.
-//
-// See https://goo.gl/47a6tO for more details.
-type ListContainersOptions struct {
-	All     bool
-	Size    bool
-	Limit   int
-	Since   string
-	Before  string
-	Filters map[string][]string
-}
-
-// APIPort is a type that represents a port mapping returned by the Docker API
-type APIPort struct {
-	PrivatePort int64  `json:"PrivatePort,omitempty" yaml:"PrivatePort,omitempty"`
-	PublicPort  int64  `json:"PublicPort,omitempty" yaml:"PublicPort,omitempty"`
-	Type        string `json:"Type,omitempty" yaml:"Type,omitempty"`
-	IP          string `json:"IP,omitempty" yaml:"IP,omitempty"`
-}
-
-// APIContainers represents each container in the list returned by
-// ListContainers.
-type APIContainers struct {
-	ID         string            `json:"Id" yaml:"Id"`
-	Image      string            `json:"Image,omitempty" yaml:"Image,omitempty"`
-	Command    string            `json:"Command,omitempty" yaml:"Command,omitempty"`
-	Created    int64             `json:"Created,omitempty" yaml:"Created,omitempty"`
-	Status     string            `json:"Status,omitempty" yaml:"Status,omitempty"`
-	Ports      []APIPort         `json:"Ports,omitempty" yaml:"Ports,omitempty"`
-	SizeRw     int64             `json:"SizeRw,omitempty" yaml:"SizeRw,omitempty"`
-	SizeRootFs int64             `json:"SizeRootFs,omitempty" yaml:"SizeRootFs,omitempty"`
-	Names      []string          `json:"Names,omitempty" yaml:"Names,omitempty"`
-	Labels     map[string]string `json:"Labels,omitempty" yaml:"Labels, omitempty"`
-}
-
-// ListContainers returns a slice of containers matching the given criteria.
-//
-// See https://goo.gl/47a6tO for more details.
-func (c *Client) ListContainers(opts ListContainersOptions) ([]APIContainers, error) {
-	path := "/containers/json?" + queryString(opts)
-	resp, err := c.do("GET", path, doOptions{})
-	if err != nil {
-		return nil, err
-	}
-	defer resp.Body.Close()
-	var containers []APIContainers
-	if err := json.NewDecoder(resp.Body).Decode(&containers); err != nil {
-		return nil, err
-	}
-	return containers, nil
-}
-
-// Port represents the port number and the protocol, in the form
-// <number>/<protocol>. For example: 80/tcp.
-type Port string
-
-// Port returns the number of the port.
-func (p Port) Port() string {
-	return strings.Split(string(p), "/")[0]
-}
-
-// Proto returns the name of the protocol.
-func (p Port) Proto() string {
-	parts := strings.Split(string(p), "/")
-	if len(parts) == 1 {
-		return "tcp"
-	}
-	return parts[1]
-}
-
-// State represents the state of a container.
-type State struct {
-	Running    bool      `json:"Running,omitempty" yaml:"Running,omitempty"`
-	Paused     bool      `json:"Paused,omitempty" yaml:"Paused,omitempty"`
-	Restarting bool      `json:"Restarting,omitempty" yaml:"Restarting,omitempty"`
-	OOMKilled  bool      `json:"OOMKilled,omitempty" yaml:"OOMKilled,omitempty"`
-	Pid        int       `json:"Pid,omitempty" yaml:"Pid,omitempty"`
-	ExitCode   int       `json:"ExitCode,omitempty" yaml:"ExitCode,omitempty"`
-	Error      string    `json:"Error,omitempty" yaml:"Error,omitempty"`
-	StartedAt  time.Time `json:"StartedAt,omitempty" yaml:"StartedAt,omitempty"`
-	FinishedAt time.Time `json:"FinishedAt,omitempty" yaml:"FinishedAt,omitempty"`
-}
-
-// String returns the string representation of a state.
-func (s *State) String() string {
-	if s.Running {
-		if s.Paused {
-			return "paused"
-		}
-		return fmt.Sprintf("Up %s", time.Now().UTC().Sub(s.StartedAt))
-	}
-	return fmt.Sprintf("Exit %d", s.ExitCode)
-}
-
-// PortBinding represents the host/container port mapping as returned in the
-// `docker inspect` json
-type PortBinding struct {
-	HostIP   string `json:"HostIP,omitempty" yaml:"HostIP,omitempty"`
-	HostPort string `json:"HostPort,omitempty" yaml:"HostPort,omitempty"`
-}
-
-// PortMapping represents a deprecated field in the `docker inspect` output,
-// and its value as found in NetworkSettings should always be nil
-type PortMapping map[string]string
-
-// NetworkSettings contains network-related information about a container
-type NetworkSettings struct {
-	IPAddress              string                 `json:"IPAddress,omitempty" yaml:"IPAddress,omitempty"`
-	IPPrefixLen            int                    `json:"IPPrefixLen,omitempty" yaml:"IPPrefixLen,omitempty"`
-	MacAddress             string                 `json:"MacAddress,omitempty" yaml:"MacAddress,omitempty"`
-	Gateway                string                 `json:"Gateway,omitempty" yaml:"Gateway,omitempty"`
-	Bridge                 string                 `json:"Bridge,omitempty" yaml:"Bridge,omitempty"`
-	PortMapping            map[string]PortMapping `json:"PortMapping,omitempty" yaml:"PortMapping,omitempty"`
-	Ports                  map[Port][]PortBinding `json:"Ports,omitempty" yaml:"Ports,omitempty"`
-	NetworkID              string                 `json:"NetworkID,omitempty" yaml:"NetworkID,omitempty"`
-	EndpointID             string                 `json:"EndpointID,omitempty" yaml:"EndpointID,omitempty"`
-	SandboxKey             string                 `json:"SandboxKey,omitempty" yaml:"SandboxKey,omitempty"`
-	GlobalIPv6Address      string                 `json:"GlobalIPv6Address,omitempty" yaml:"GlobalIPv6Address,omitempty"`
-	GlobalIPv6PrefixLen    int                    `json:"GlobalIPv6PrefixLen,omitempty" yaml:"GlobalIPv6PrefixLen,omitempty"`
-	IPv6Gateway            string                 `json:"IPv6Gateway,omitempty" yaml:"IPv6Gateway,omitempty"`
-	LinkLocalIPv6Address   string                 `json:"LinkLocalIPv6Address,omitempty" yaml:"LinkLocalIPv6Address,omitempty"`
-	LinkLocalIPv6PrefixLen int                    `json:"LinkLocalIPv6PrefixLen,omitempty" yaml:"LinkLocalIPv6PrefixLen,omitempty"`
-	SecondaryIPAddresses   []string               `json:"SecondaryIPAddresses,omitempty" yaml:"SecondaryIPAddresses,omitempty"`
-	SecondaryIPv6Addresses []string               `json:"SecondaryIPv6Addresses,omitempty" yaml:"SecondaryIPv6Addresses,omitempty"`
-}
-
-// PortMappingAPI translates the port mappings as contained in NetworkSettings
-// into the format in which they would appear when returned by the API
-func (settings *NetworkSettings) PortMappingAPI() []APIPort {
-	var mapping []APIPort
-	for port, bindings := range settings.Ports {
-		p, _ := parsePort(port.Port())
-		if len(bindings) == 0 {
-			mapping = append(mapping, APIPort{
-				PublicPort: int64(p),
-				Type:       port.Proto(),
-			})
-			continue
-		}
-		for _, binding := range bindings {
-			p, _ := parsePort(port.Port())
-			h, _ := parsePort(binding.HostPort)
-			mapping = append(mapping, APIPort{
-				PrivatePort: int64(p),
-				PublicPort:  int64(h),
-				Type:        port.Proto(),
-				IP:          binding.HostIP,
-			})
-		}
-	}
-	return mapping
-}
-
-func parsePort(rawPort string) (int, error) {
-	port, err := strconv.ParseUint(rawPort, 10, 16)
-	if err != nil {
-		return 0, err
-	}
-	return int(port), nil
-}
-
-// Config is the list of configuration options used when creating a container.
-// Config does not contain the options that are specific to starting a container on a
-// given host.  Those are contained in HostConfig
-type Config struct {
-	Hostname        string              `json:"Hostname,omitempty" yaml:"Hostname,omitempty"`
-	Domainname      string              `json:"Domainname,omitempty" yaml:"Domainname,omitempty"`
-	User            string              `json:"User,omitempty" yaml:"User,omitempty"`
-	Memory          int64               `json:"Memory,omitempty" yaml:"Memory,omitempty"`
-	MemorySwap      int64               `json:"MemorySwap,omitempty" yaml:"MemorySwap,omitempty"`
-	CPUShares       int64               `json:"CpuShares,omitempty" yaml:"CpuShares,omitempty"`
-	CPUSet          string              `json:"Cpuset,omitempty" yaml:"Cpuset,omitempty"`
-	AttachStdin     bool                `json:"AttachStdin,omitempty" yaml:"AttachStdin,omitempty"`
-	AttachStdout    bool                `json:"AttachStdout,omitempty" yaml:"AttachStdout,omitempty"`
-	AttachStderr    bool                `json:"AttachStderr,omitempty" yaml:"AttachStderr,omitempty"`
-	PortSpecs       []string            `json:"PortSpecs,omitempty" yaml:"PortSpecs,omitempty"`
-	ExposedPorts    map[Port]struct{}   `json:"ExposedPorts,omitempty" yaml:"ExposedPorts,omitempty"`
-	Tty             bool                `json:"Tty,omitempty" yaml:"Tty,omitempty"`
-	OpenStdin       bool                `json:"OpenStdin,omitempty" yaml:"OpenStdin,omitempty"`
-	StdinOnce       bool                `json:"StdinOnce,omitempty" yaml:"StdinOnce,omitempty"`
-	Env             []string            `json:"Env,omitempty" yaml:"Env,omitempty"`
-	Cmd             []string            `json:"Cmd" yaml:"Cmd"`
-	DNS             []string            `json:"Dns,omitempty" yaml:"Dns,omitempty"` // For Docker API v1.9 and below only
-	Image           string              `json:"Image,omitempty" yaml:"Image,omitempty"`
-	Volumes         map[string]struct{} `json:"Volumes,omitempty" yaml:"Volumes,omitempty"`
-	VolumeDriver    string              `json:"VolumeDriver,omitempty" yaml:"VolumeDriver,omitempty"`
-	VolumesFrom     string              `json:"VolumesFrom,omitempty" yaml:"VolumesFrom,omitempty"`
-	WorkingDir      string              `json:"WorkingDir,omitempty" yaml:"WorkingDir,omitempty"`
-	MacAddress      string              `json:"MacAddress,omitempty" yaml:"MacAddress,omitempty"`
-	Entrypoint      []string            `json:"Entrypoint" yaml:"Entrypoint"`
-	NetworkDisabled bool                `json:"NetworkDisabled,omitempty" yaml:"NetworkDisabled,omitempty"`
-	SecurityOpts    []string            `json:"SecurityOpts,omitempty" yaml:"SecurityOpts,omitempty"`
-	OnBuild         []string            `json:"OnBuild,omitempty" yaml:"OnBuild,omitempty"`
-	Mounts          []Mount             `json:"Mounts,omitempty" yaml:"Mounts,omitempty"`
-	Labels          map[string]string   `json:"Labels,omitempty" yaml:"Labels,omitempty"`
-}
-
-// Mount represents a mount point in the container.
-//
-// It has been added in the version 1.20 of the Docker API, available since
-// Docker 1.8.
-type Mount struct {
-	Source      string
-	Destination string
-	Mode        string
-	RW          bool
-}
-
-// LogConfig defines the log driver type and the configuration for it.
-type LogConfig struct {
-	Type   string            `json:"Type,omitempty" yaml:"Type,omitempty"`
-	Config map[string]string `json:"Config,omitempty" yaml:"Config,omitempty"`
-}
-
-// ULimit defines system-wide resource limitations
-// This can help a lot in system administration, e.g. when a user starts too many processes and therefore makes the system unresponsive for other users.
-type ULimit struct {
-	Name string `json:"Name,omitempty" yaml:"Name,omitempty"`
-	Soft int64  `json:"Soft,omitempty" yaml:"Soft,omitempty"`
-	Hard int64  `json:"Hard,omitempty" yaml:"Hard,omitempty"`
-}
-
-// SwarmNode containers information about which Swarm node the container is on
-type SwarmNode struct {
-	ID     string            `json:"ID,omitempty" yaml:"ID,omitempty"`
-	IP     string            `json:"IP,omitempty" yaml:"IP,omitempty"`
-	Addr   string            `json:"Addr,omitempty" yaml:"Addr,omitempty"`
-	Name   string            `json:"Name,omitempty" yaml:"Name,omitempty"`
-	CPUs   int64             `json:"CPUs,omitempty" yaml:"CPUs,omitempty"`
-	Memory int64             `json:"Memory,omitempty" yaml:"Memory,omitempty"`
-	Labels map[string]string `json:"Labels,omitempty" yaml:"Labels,omitempty"`
-}
-
-// Container is the type encompasing everything about a container - its config,
-// hostconfig, etc.
-type Container struct {
-	ID string `json:"Id" yaml:"Id"`
-
-	Created time.Time `json:"Created,omitempty" yaml:"Created,omitempty"`
-
-	Path string   `json:"Path,omitempty" yaml:"Path,omitempty"`
-	Args []string `json:"Args,omitempty" yaml:"Args,omitempty"`
-
-	Config *Config `json:"Config,omitempty" yaml:"Config,omitempty"`
-	State  State   `json:"State,omitempty" yaml:"State,omitempty"`
-	Image  string  `json:"Image,omitempty" yaml:"Image,omitempty"`
-
-	Node *SwarmNode `json:"Node,omitempty" yaml:"Node,omitempty"`
-
-	NetworkSettings *NetworkSettings `json:"NetworkSettings,omitempty" yaml:"NetworkSettings,omitempty"`
-
-	SysInitPath    string  `json:"SysInitPath,omitempty" yaml:"SysInitPath,omitempty"`
-	ResolvConfPath string  `json:"ResolvConfPath,omitempty" yaml:"ResolvConfPath,omitempty"`
-	HostnamePath   string  `json:"HostnamePath,omitempty" yaml:"HostnamePath,omitempty"`
-	HostsPath      string  `json:"HostsPath,omitempty" yaml:"HostsPath,omitempty"`
-	LogPath        string  `json:"LogPath,omitempty" yaml:"LogPath,omitempty"`
-	Name           string  `json:"Name,omitempty" yaml:"Name,omitempty"`
-	Driver         string  `json:"Driver,omitempty" yaml:"Driver,omitempty"`
-	Mounts         []Mount `json:"Mounts,omitempty" yaml:"Mounts,omitempty"`
-
-	Volumes    map[string]string `json:"Volumes,omitempty" yaml:"Volumes,omitempty"`
-	VolumesRW  map[string]bool   `json:"VolumesRW,omitempty" yaml:"VolumesRW,omitempty"`
-	HostConfig *HostConfig       `json:"HostConfig,omitempty" yaml:"HostConfig,omitempty"`
-	ExecIDs    []string          `json:"ExecIDs,omitempty" yaml:"ExecIDs,omitempty"`
-
-	RestartCount int `json:"RestartCount,omitempty" yaml:"RestartCount,omitempty"`
-
-	AppArmorProfile string `json:"AppArmorProfile,omitempty" yaml:"AppArmorProfile,omitempty"`
-}
-
-// RenameContainerOptions specify parameters to the RenameContainer function.
-//
-// See https://goo.gl/laSOIy for more details.
-type RenameContainerOptions struct {
-	// ID of container to rename
-	ID string `qs:"-"`
-
-	// New name
-	Name string `json:"name,omitempty" yaml:"name,omitempty"`
-}
-
-// RenameContainer updates and existing containers name
-//
-// See https://goo.gl/laSOIy for more details.
-func (c *Client) RenameContainer(opts RenameContainerOptions) error {
-	resp, err := c.do("POST", fmt.Sprintf("/containers/"+opts.ID+"/rename?%s", queryString(opts)), doOptions{})
-	if err != nil {
-		return err
-	}
-	resp.Body.Close()
-	return nil
-}
-
-// InspectContainer returns information about a container by its ID.
-//
-// See https://goo.gl/RdIq0b for more details.
-func (c *Client) InspectContainer(id string) (*Container, error) {
-	path := "/containers/" + id + "/json"
-	resp, err := c.do("GET", path, doOptions{})
-	if err != nil {
-		if e, ok := err.(*Error); ok && e.Status == http.StatusNotFound {
-			return nil, &NoSuchContainer{ID: id}
-		}
-		return nil, err
-	}
-	defer resp.Body.Close()
-	var container Container
-	if err := json.NewDecoder(resp.Body).Decode(&container); err != nil {
-		return nil, err
-	}
-	return &container, nil
-}
-
-// ContainerChanges returns changes in the filesystem of the given container.
-//
-// See https://goo.gl/9GsTIF for more details.
-func (c *Client) ContainerChanges(id string) ([]Change, error) {
-	path := "/containers/" + id + "/changes"
-	resp, err := c.do("GET", path, doOptions{})
-	if err != nil {
-		if e, ok := err.(*Error); ok && e.Status == http.StatusNotFound {
-			return nil, &NoSuchContainer{ID: id}
-		}
-		return nil, err
-	}
-	defer resp.Body.Close()
-	var changes []Change
-	if err := json.NewDecoder(resp.Body).Decode(&changes); err != nil {
-		return nil, err
-	}
-	return changes, nil
-}
-
-// CreateContainerOptions specify parameters to the CreateContainer function.
-//
-// See https://goo.gl/WxQzrr for more details.
-type CreateContainerOptions struct {
-	Name       string
-	Config     *Config     `qs:"-"`
-	HostConfig *HostConfig `qs:"-"`
-}
-
-// CreateContainer creates a new container, returning the container instance,
-// or an error in case of failure.
-//
-// See https://goo.gl/WxQzrr for more details.
-func (c *Client) CreateContainer(opts CreateContainerOptions) (*Container, error) {
-	path := "/containers/create?" + queryString(opts)
-	resp, err := c.do(
-		"POST",
-		path,
-		doOptions{
-			data: struct {
-				*Config
-				HostConfig *HostConfig `json:"HostConfig,omitempty" yaml:"HostConfig,omitempty"`
-			}{
-				opts.Config,
-				opts.HostConfig,
-			},
-		},
-	)
-
-	if e, ok := err.(*Error); ok {
-		if e.Status == http.StatusNotFound {
-			return nil, ErrNoSuchImage
-		}
-		if e.Status == http.StatusConflict {
-			return nil, ErrContainerAlreadyExists
-		}
-	}
-
-	if err != nil {
-		return nil, err
-	}
-	defer resp.Body.Close()
-	var container Container
-	if err := json.NewDecoder(resp.Body).Decode(&container); err != nil {
-		return nil, err
-	}
-
-	container.Name = opts.Name
-
-	return &container, nil
-}
-
-// KeyValuePair is a type for generic key/value pairs as used in the Lxc
-// configuration
-type KeyValuePair struct {
-	Key   string `json:"Key,omitempty" yaml:"Key,omitempty"`
-	Value string `json:"Value,omitempty" yaml:"Value,omitempty"`
-}
-
-// RestartPolicy represents the policy for automatically restarting a container.
-//
-// Possible values are:
-//
-//   - always: the docker daemon will always restart the container
-//   - on-failure: the docker daemon will restart the container on failures, at
-//                 most MaximumRetryCount times
-//   - no: the docker daemon will not restart the container automatically
-type RestartPolicy struct {
-	Name              string `json:"Name,omitempty" yaml:"Name,omitempty"`
-	MaximumRetryCount int    `json:"MaximumRetryCount,omitempty" yaml:"MaximumRetryCount,omitempty"`
-}
-
-// AlwaysRestart returns a restart policy that tells the Docker daemon to
-// always restart the container.
-func AlwaysRestart() RestartPolicy {
-	return RestartPolicy{Name: "always"}
-}
-
-// RestartOnFailure returns a restart policy that tells the Docker daemon to
-// restart the container on failures, trying at most maxRetry times.
-func RestartOnFailure(maxRetry int) RestartPolicy {
-	return RestartPolicy{Name: "on-failure", MaximumRetryCount: maxRetry}
-}
-
-// NeverRestart returns a restart policy that tells the Docker daemon to never
-// restart the container on failures.
-func NeverRestart() RestartPolicy {
-	return RestartPolicy{Name: "no"}
-}
-
-// Device represents a device mapping between the Docker host and the
-// container.
-type Device struct {
-	PathOnHost        string `json:"PathOnHost,omitempty" yaml:"PathOnHost,omitempty"`
-	PathInContainer   string `json:"PathInContainer,omitempty" yaml:"PathInContainer,omitempty"`
-	CgroupPermissions string `json:"CgroupPermissions,omitempty" yaml:"CgroupPermissions,omitempty"`
-}
-
-// HostConfig contains the container options related to starting a container on
-// a given host
-type HostConfig struct {
-	Binds            []string               `json:"Binds,omitempty" yaml:"Binds,omitempty"`
-	CapAdd           []string               `json:"CapAdd,omitempty" yaml:"CapAdd,omitempty"`
-	CapDrop          []string               `json:"CapDrop,omitempty" yaml:"CapDrop,omitempty"`
-	GroupAdd         []string               `json:"GroupAdd,omitempty" yaml:"GroupAdd,omitempty"`
-	ContainerIDFile  string                 `json:"ContainerIDFile,omitempty" yaml:"ContainerIDFile,omitempty"`
-	LxcConf          []KeyValuePair         `json:"LxcConf,omitempty" yaml:"LxcConf,omitempty"`
-	Privileged       bool                   `json:"Privileged,omitempty" yaml:"Privileged,omitempty"`
-	PortBindings     map[Port][]PortBinding `json:"PortBindings,omitempty" yaml:"PortBindings,omitempty"`
-	Links            []string               `json:"Links,omitempty" yaml:"Links,omitempty"`
-	PublishAllPorts  bool                   `json:"PublishAllPorts,omitempty" yaml:"PublishAllPorts,omitempty"`
-	DNS              []string               `json:"Dns,omitempty" yaml:"Dns,omitempty"` // For Docker API v1.10 and above only
-	DNSSearch        []string               `json:"DnsSearch,omitempty" yaml:"DnsSearch,omitempty"`
-	ExtraHosts       []string               `json:"ExtraHosts,omitempty" yaml:"ExtraHosts,omitempty"`
-	VolumesFrom      []string               `json:"VolumesFrom,omitempty" yaml:"VolumesFrom,omitempty"`
-	NetworkMode      string                 `json:"NetworkMode,omitempty" yaml:"NetworkMode,omitempty"`
-	IpcMode          string                 `json:"IpcMode,omitempty" yaml:"IpcMode,omitempty"`
-	PidMode          string                 `json:"PidMode,omitempty" yaml:"PidMode,omitempty"`
-	UTSMode          string                 `json:"UTSMode,omitempty" yaml:"UTSMode,omitempty"`
-	RestartPolicy    RestartPolicy          `json:"RestartPolicy,omitempty" yaml:"RestartPolicy,omitempty"`
-	Devices          []Device               `json:"Devices,omitempty" yaml:"Devices,omitempty"`
-	LogConfig        LogConfig              `json:"LogConfig,omitempty" yaml:"LogConfig,omitempty"`
-	ReadonlyRootfs   bool                   `json:"ReadonlyRootfs,omitempty" yaml:"ReadonlyRootfs,omitempty"`
-	SecurityOpt      []string               `json:"SecurityOpt,omitempty" yaml:"SecurityOpt,omitempty"`
-	CgroupParent     string                 `json:"CgroupParent,omitempty" yaml:"CgroupParent,omitempty"`
-	Memory           int64                  `json:"Memory,omitempty" yaml:"Memory,omitempty"`
-	MemorySwap       int64                  `json:"MemorySwap,omitempty" yaml:"MemorySwap,omitempty"`
-	MemorySwappiness int64                  `json:"MemorySwappiness,omitempty" yaml:"MemorySwappiness,omitempty"`
-	OOMKillDisable   bool                   `json:"OomKillDisable,omitempty" yaml:"OomKillDisable"`
-	CPUShares        int64                  `json:"CpuShares,omitempty" yaml:"CpuShares,omitempty"`
-	CPUSet           string                 `json:"Cpuset,omitempty" yaml:"Cpuset,omitempty"`
-	CPUSetCPUs       string                 `json:"CpusetCpus,omitempty" yaml:"CpusetCpus,omitempty"`
-	CPUSetMEMs       string                 `json:"CpusetMems,omitempty" yaml:"CpusetMems,omitempty"`
-	CPUQuota         int64                  `json:"CpuQuota,omitempty" yaml:"CpuQuota,omitempty"`
-	CPUPeriod        int64                  `json:"CpuPeriod,omitempty" yaml:"CpuPeriod,omitempty"`
-	BlkioWeight      int64                  `json:"BlkioWeight,omitempty" yaml:"BlkioWeight"`
-	Ulimits          []ULimit               `json:"Ulimits,omitempty" yaml:"Ulimits,omitempty"`
-}
-
-// StartContainer starts a container, returning an error in case of failure.
-//
-// See https://goo.gl/MrBAJv for more details.
-func (c *Client) StartContainer(id string, hostConfig *HostConfig) error {
-	path := "/containers/" + id + "/start"
-	resp, err := c.do("POST", path, doOptions{data: hostConfig, forceJSON: true})
-	if err != nil {
-		if e, ok := err.(*Error); ok && e.Status == http.StatusNotFound {
-			return &NoSuchContainer{ID: id, Err: err}
-		}
-		return err
-	}
-	if resp.StatusCode == http.StatusNotModified {
-		return &ContainerAlreadyRunning{ID: id}
-	}
-	resp.Body.Close()
-	return nil
-}
-
-// StopContainer stops a container, killing it after the given timeout (in
-// seconds).
-//
-// See https://goo.gl/USqsFt for more details.
-func (c *Client) StopContainer(id string, timeout uint) error {
-	path := fmt.Sprintf("/containers/%s/stop?t=%d", id, timeout)
-	resp, err := c.do("POST", path, doOptions{})
-	if err != nil {
-		if e, ok := err.(*Error); ok && e.Status == http.StatusNotFound {
-			return &NoSuchContainer{ID: id}
-		}
-		return err
-	}
-	if resp.StatusCode == http.StatusNotModified {
-		return &ContainerNotRunning{ID: id}
-	}
-	resp.Body.Close()
-	return nil
-}
-
-// RestartContainer stops a container, killing it after the given timeout (in
-// seconds), during the stop process.
-//
-// See https://goo.gl/QzsDnz for more details.
-func (c *Client) RestartContainer(id string, timeout uint) error {
-	path := fmt.Sprintf("/containers/%s/restart?t=%d", id, timeout)
-	resp, err := c.do("POST", path, doOptions{})
-	if err != nil {
-		if e, ok := err.(*Error); ok && e.Status == http.StatusNotFound {
-			return &NoSuchContainer{ID: id}
-		}
-		return err
-	}
-	resp.Body.Close()
-	return nil
-}
-
-// PauseContainer pauses the given container.
-//
-// See https://goo.gl/OF7W9X for more details.
-func (c *Client) PauseContainer(id string) error {
-	path := fmt.Sprintf("/containers/%s/pause", id)
-	resp, err := c.do("POST", path, doOptions{})
-	if err != nil {
-		if e, ok := err.(*Error); ok && e.Status == http.StatusNotFound {
-			return &NoSuchContainer{ID: id}
-		}
-		return err
-	}
-	resp.Body.Close()
-	return nil
-}
-
-// UnpauseContainer unpauses the given container.
-//
-// See https://goo.gl/7dwyPA for more details.
-func (c *Client) UnpauseContainer(id string) error {
-	path := fmt.Sprintf("/containers/%s/unpause", id)
-	resp, err := c.do("POST", path, doOptions{})
-	if err != nil {
-		if e, ok := err.(*Error); ok && e.Status == http.StatusNotFound {
-			return &NoSuchContainer{ID: id}
-		}
-		return err
-	}
-	resp.Body.Close()
-	return nil
-}
-
-// TopResult represents the list of processes running in a container, as
-// returned by /containers/<id>/top.
-//
-// See https://goo.gl/Rb46aY for more details.
-type TopResult struct {
-	Titles    []string
-	Processes [][]string
-}
-
-// TopContainer returns processes running inside a container
-//
-// See https://goo.gl/Rb46aY for more details.
-func (c *Client) TopContainer(id string, psArgs string) (TopResult, error) {
-	var args string
-	var result TopResult
-	if psArgs != "" {
-		args = fmt.Sprintf("?ps_args=%s", psArgs)
-	}
-	path := fmt.Sprintf("/containers/%s/top%s", id, args)
-	resp, err := c.do("GET", path, doOptions{})
-	if err != nil {
-		if e, ok := err.(*Error); ok && e.Status == http.StatusNotFound {
-			return result, &NoSuchContainer{ID: id}
-		}
-		return result, err
-	}
-	defer resp.Body.Close()
-	if err := json.NewDecoder(resp.Body).Decode(&result); err != nil {
-		return result, err
-	}
-	return result, nil
-}
-
-// Stats represents container statistics, returned by /containers/<id>/stats.
-//
-// See https://goo.gl/GNmLHb for more details.
-type Stats struct {
-	Read    time.Time `json:"read,omitempty" yaml:"read,omitempty"`
-	Network struct {
-		RxDropped uint64 `json:"rx_dropped,omitempty" yaml:"rx_dropped,omitempty"`
-		RxBytes   uint64 `json:"rx_bytes,omitempty" yaml:"rx_bytes,omitempty"`
-		RxErrors  uint64 `json:"rx_errors,omitempty" yaml:"rx_errors,omitempty"`
-		TxPackets uint64 `json:"tx_packets,omitempty" yaml:"tx_packets,omitempty"`
-		TxDropped uint64 `json:"tx_dropped,omitempty" yaml:"tx_dropped,omitempty"`
-		RxPackets uint64 `json:"rx_packets,omitempty" yaml:"rx_packets,omitempty"`
-		TxErrors  uint64 `json:"tx_errors,omitempty" yaml:"tx_errors,omitempty"`
-		TxBytes   uint64 `json:"tx_bytes,omitempty" yaml:"tx_bytes,omitempty"`
-	} `json:"network,omitempty" yaml:"network,omitempty"`
-	MemoryStats struct {
-		Stats struct {
-			TotalPgmafault          uint64 `json:"total_pgmafault,omitempty" yaml:"total_pgmafault,omitempty"`
-			Cache                   uint64 `json:"cache,omitempty" yaml:"cache,omitempty"`
-			MappedFile              uint64 `json:"mapped_file,omitempty" yaml:"mapped_file,omitempty"`
-			TotalInactiveFile       uint64 `json:"total_inactive_file,omitempty" yaml:"total_inactive_file,omitempty"`
-			Pgpgout                 uint64 `json:"pgpgout,omitempty" yaml:"pgpgout,omitempty"`
-			Rss                     uint64 `json:"rss,omitempty" yaml:"rss,omitempty"`
-			TotalMappedFile         uint64 `json:"total_mapped_file,omitempty" yaml:"total_mapped_file,omitempty"`
-			Writeback               uint64 `json:"writeback,omitempty" yaml:"writeback,omitempty"`
-			Unevictable             uint64 `json:"unevictable,omitempty" yaml:"unevictable,omitempty"`
-			Pgpgin                  uint64 `json:"pgpgin,omitempty" yaml:"pgpgin,omitempty"`
-			TotalUnevictable        uint64 `json:"total_unevictable,omitempty" yaml:"total_unevictable,omitempty"`
-			Pgmajfault              uint64 `json:"pgmajfault,omitempty" yaml:"pgmajfault,omitempty"`
-			TotalRss                uint64 `json:"total_rss,omitempty" yaml:"total_rss,omitempty"`
-			TotalRssHuge            uint64 `json:"total_rss_huge,omitempty" yaml:"total_rss_huge,omitempty"`
-			TotalWriteback          uint64 `json:"total_writeback,omitempty" yaml:"total_writeback,omitempty"`
-			TotalInactiveAnon       uint64 `json:"total_inactive_anon,omitempty" yaml:"total_inactive_anon,omitempty"`
-			RssHuge                 uint64 `json:"rss_huge,omitempty" yaml:"rss_huge,omitempty"`
-			HierarchicalMemoryLimit uint64 `json:"hierarchical_memory_limit,omitempty" yaml:"hierarchical_memory_limit,omitempty"`
-			TotalPgfault            uint64 `json:"total_pgfault,omitempty" yaml:"total_pgfault,omitempty"`
-			TotalActiveFile         uint64 `json:"total_active_file,omitempty" yaml:"total_active_file,omitempty"`
-			ActiveAnon              uint64 `json:"active_anon,omitempty" yaml:"active_anon,omitempty"`
-			TotalActiveAnon         uint64 `json:"total_active_anon,omitempty" yaml:"total_active_anon,omitempty"`
-			TotalPgpgout            uint64 `json:"total_pgpgout,omitempty" yaml:"total_pgpgout,omitempty"`
-			TotalCache              uint64 `json:"total_cache,omitempty" yaml:"total_cache,omitempty"`
-			InactiveAnon            uint64 `json:"inactive_anon,omitempty" yaml:"inactive_anon,omitempty"`
-			ActiveFile              uint64 `json:"active_file,omitempty" yaml:"active_file,omitempty"`
-			Pgfault                 uint64 `json:"pgfault,omitempty" yaml:"pgfault,omitempty"`
-			InactiveFile            uint64 `json:"inactive_file,omitempty" yaml:"inactive_file,omitempty"`
-			TotalPgpgin             uint64 `json:"total_pgpgin,omitempty" yaml:"total_pgpgin,omitempty"`
-		} `json:"stats,omitempty" yaml:"stats,omitempty"`
-		MaxUsage uint64 `json:"max_usage,omitempty" yaml:"max_usage,omitempty"`
-		Usage    uint64 `json:"usage,omitempty" yaml:"usage,omitempty"`
-		Failcnt  uint64 `json:"failcnt,omitempty" yaml:"failcnt,omitempty"`
-		Limit    uint64 `json:"limit,omitempty" yaml:"limit,omitempty"`
-	} `json:"memory_stats,omitempty" yaml:"memory_stats,omitempty"`
-	BlkioStats struct {
-		IOServiceBytesRecursive []BlkioStatsEntry `json:"io_service_bytes_recursive,omitempty" yaml:"io_service_bytes_recursive,omitempty"`
-		IOServicedRecursive     []BlkioStatsEntry `json:"io_serviced_recursive,omitempty" yaml:"io_serviced_recursive,omitempty"`
-		IOQueueRecursive        []BlkioStatsEntry `json:"io_queue_recursive,omitempty" yaml:"io_queue_recursive,omitempty"`
-		IOServiceTimeRecursive  []BlkioStatsEntry `json:"io_service_time_recursive,omitempty" yaml:"io_service_time_recursive,omitempty"`
-		IOWaitTimeRecursive     []BlkioStatsEntry `json:"io_wait_time_recursive,omitempty" yaml:"io_wait_time_recursive,omitempty"`
-		IOMergedRecursive       []BlkioStatsEntry `json:"io_merged_recursive,omitempty" yaml:"io_merged_recursive,omitempty"`
-		IOTimeRecursive         []BlkioStatsEntry `json:"io_time_recursive,omitempty" yaml:"io_time_recursive,omitempty"`
-		SectorsRecursive        []BlkioStatsEntry `json:"sectors_recursive,omitempty" yaml:"sectors_recursive,omitempty"`
-	} `json:"blkio_stats,omitempty" yaml:"blkio_stats,omitempty"`
-	CPUStats    CPUStats `json:"cpu_stats,omitempty" yaml:"cpu_stats,omitempty"`
-	PreCPUStats CPUStats `json:"precpu_stats,omitempty"`
-}
-
-// CPUStats is a stats entry for cpu stats
-type CPUStats struct {
-	CPUUsage struct {
-		PercpuUsage       []uint64 `json:"percpu_usage,omitempty" yaml:"percpu_usage,omitempty"`
-		UsageInUsermode   uint64   `json:"usage_in_usermode,omitempty" yaml:"usage_in_usermode,omitempty"`
-		TotalUsage        uint64   `json:"total_usage,omitempty" yaml:"total_usage,omitempty"`
-		UsageInKernelmode uint64   `json:"usage_in_kernelmode,omitempty" yaml:"usage_in_kernelmode,omitempty"`
-	} `json:"cpu_usage,omitempty" yaml:"cpu_usage,omitempty"`
-	SystemCPUUsage uint64 `json:"system_cpu_usage,omitempty" yaml:"system_cpu_usage,omitempty"`
-	ThrottlingData struct {
-		Periods          uint64 `json:"periods,omitempty"`
-		ThrottledPeriods uint64 `json:"throttled_periods,omitempty"`
-		ThrottledTime    uint64 `json:"throttled_time,omitempty"`
-	} `json:"throttling_data,omitempty" yaml:"throttling_data,omitempty"`
-}
-
-// BlkioStatsEntry is a stats entry for blkio_stats
-type BlkioStatsEntry struct {
-	Major uint64 `json:"major,omitempty" yaml:"major,omitempty"`
-	Minor uint64 `json:"minor,omitempty" yaml:"minor,omitempty"`
-	Op    string `json:"op,omitempty" yaml:"op,omitempty"`
-	Value uint64 `json:"value,omitempty" yaml:"value,omitempty"`
-}
-
-// StatsOptions specify parameters to the Stats function.
-//
-// See https://goo.gl/GNmLHb for more details.
-type StatsOptions struct {
-	ID     string
-	Stats  chan<- *Stats
-	Stream bool
-	// A flag that enables stopping the stats operation
-	Done <-chan bool
-	// Initial connection timeout
-	Timeout time.Duration
-}
-
-// Stats sends container statistics for the given container to the given channel.
-//
-// This function is blocking, similar to a streaming call for logs, and should be run
-// on a separate goroutine from the caller. Note that this function will block until
-// the given container is removed, not just exited. When finished, this function
-// will close the given channel. Alternatively, function can be stopped by
-// signaling on the Done channel.
-//
-// See https://goo.gl/GNmLHb for more details.
-func (c *Client) Stats(opts StatsOptions) (retErr error) {
-	errC := make(chan error, 1)
-	readCloser, writeCloser := io.Pipe()
-
-	defer func() {
-		close(opts.Stats)
-
-		select {
-		case err := <-errC:
-			if err != nil && retErr == nil {
-				retErr = err
-			}
-		default:
-			// No errors
-		}
-
-		if err := readCloser.Close(); err != nil && retErr == nil {
-			retErr = err
-		}
-	}()
-
-	go func() {
-		err := c.stream("GET", fmt.Sprintf("/containers/%s/stats?stream=%v", opts.ID, opts.Stream), streamOptions{
-			rawJSONStream:  true,
-			useJSONDecoder: true,
-			stdout:         writeCloser,
-			timeout:        opts.Timeout,
-		})
-		if err != nil {
-			dockerError, ok := err.(*Error)
-			if ok {
-				if dockerError.Status == http.StatusNotFound {
-					err = &NoSuchContainer{ID: opts.ID}
-				}
-			}
-		}
-		if closeErr := writeCloser.Close(); closeErr != nil && err == nil {
-			err = closeErr
-		}
-		errC <- err
-		close(errC)
-	}()
-
-	quit := make(chan struct{})
-	defer close(quit)
-	go func() {
-		// block here waiting for the signal to stop function
-		select {
-		case <-opts.Done:
-			readCloser.Close()
-		case <-quit:
-			return
-		}
-	}()
-
-	decoder := json.NewDecoder(readCloser)
-	stats := new(Stats)
-	for err := decoder.Decode(stats); err != io.EOF; err = decoder.Decode(stats) {
-		if err != nil {
-			return err
-		}
-		opts.Stats <- stats
-		stats = new(Stats)
-	}
-	return nil
-}
-
-// KillContainerOptions represents the set of options that can be used in a
-// call to KillContainer.
-//
-// See https://goo.gl/hkS9i8 for more details.
-type KillContainerOptions struct {
-	// The ID of the container.
-	ID string `qs:"-"`
-
-	// The signal to send to the container. When omitted, Docker server
-	// will assume SIGKILL.
-	Signal Signal
-}
-
-// KillContainer sends a signal to a container, returning an error in case of
-// failure.
-//
-// See https://goo.gl/hkS9i8 for more details.
-func (c *Client) KillContainer(opts KillContainerOptions) error {
-	path := "/containers/" + opts.ID + "/kill" + "?" + queryString(opts)
-	resp, err := c.do("POST", path, doOptions{})
-	if err != nil {
-		if e, ok := err.(*Error); ok && e.Status == http.StatusNotFound {
-			return &NoSuchContainer{ID: opts.ID}
-		}
-		return err
-	}
-	resp.Body.Close()
-	return nil
-}
-
-// RemoveContainerOptions encapsulates options to remove a container.
-//
-// See https://goo.gl/RQyX62 for more details.
-type RemoveContainerOptions struct {
-	// The ID of the container.
-	ID string `qs:"-"`
-
-	// A flag that indicates whether Docker should remove the volumes
-	// associated to the container.
-	RemoveVolumes bool `qs:"v"`
-
-	// A flag that indicates whether Docker should remove the container
-	// even if it is currently running.
-	Force bool
-}
-
-// RemoveContainer removes a container, returning an error in case of failure.
-//
-// See https://goo.gl/RQyX62 for more details.
-func (c *Client) RemoveContainer(opts RemoveContainerOptions) error {
-	path := "/containers/" + opts.ID + "?" + queryString(opts)
-	resp, err := c.do("DELETE", path, doOptions{})
-	if err != nil {
-		if e, ok := err.(*Error); ok && e.Status == http.StatusNotFound {
-			return &NoSuchContainer{ID: opts.ID}
-		}
-		return err
-	}
-	resp.Body.Close()
-	return nil
-}
-
-// UploadToContainerOptions is the set of options that can be used when
-// uploading an archive into a container.
-//
-// See https://goo.gl/Ss97HW for more details.
-type UploadToContainerOptions struct {
-	InputStream          io.Reader `json:"-" qs:"-"`
-	Path                 string    `qs:"path"`
-	NoOverwriteDirNonDir bool      `qs:"noOverwriteDirNonDir"`
-}
-
-// UploadToContainer uploads a tar archive to be extracted to a path in the
-// filesystem of the container.
-//
-// See https://goo.gl/Ss97HW for more details.
-func (c *Client) UploadToContainer(id string, opts UploadToContainerOptions) error {
-	url := fmt.Sprintf("/containers/%s/archive?", id) + queryString(opts)
-
-	return c.stream("PUT", url, streamOptions{
-		in: opts.InputStream,
-	})
-}
-
-// DownloadFromContainerOptions is the set of options that can be used when
-// downloading resources from a container.
-//
-// See https://goo.gl/KnZJDX for more details.
-type DownloadFromContainerOptions struct {
-	OutputStream io.Writer `json:"-" qs:"-"`
-	Path         string    `qs:"path"`
-}
-
-// DownloadFromContainer downloads a tar archive of files or folders in a container.
-//
-// See https://goo.gl/KnZJDX for more details.
-func (c *Client) DownloadFromContainer(id string, opts DownloadFromContainerOptions) error {
-	url := fmt.Sprintf("/containers/%s/archive?", id) + queryString(opts)
-
-	return c.stream("GET", url, streamOptions{
-		setRawTerminal: true,
-		stdout:         opts.OutputStream,
-	})
-}
-
-// CopyFromContainerOptions has been DEPRECATED, please use DownloadFromContainerOptions along with DownloadFromContainer.
-//
-// See https://goo.gl/R2jevW for more details.
-type CopyFromContainerOptions struct {
-	OutputStream io.Writer `json:"-"`
-	Container    string    `json:"-"`
-	Resource     string
-}
-
-// CopyFromContainer has been DEPRECATED, please use DownloadFromContainerOptions along with DownloadFromContainer.
-//
-// See https://goo.gl/R2jevW for more details.
-func (c *Client) CopyFromContainer(opts CopyFromContainerOptions) error {
-	if opts.Container == "" {
-		return &NoSuchContainer{ID: opts.Container}
-	}
-	url := fmt.Sprintf("/containers/%s/copy", opts.Container)
-	resp, err := c.do("POST", url, doOptions{data: opts})
-	if err != nil {
-		if e, ok := err.(*Error); ok && e.Status == http.StatusNotFound {
-			return &NoSuchContainer{ID: opts.Container}
-		}
-		return err
-	}
-	defer resp.Body.Close()
-	_, err = io.Copy(opts.OutputStream, resp.Body)
-	return err
-}
-
-// WaitContainer blocks until the given container stops, return the exit code
-// of the container status.
-//
-// See https://goo.gl/Gc1rge for more details.
-func (c *Client) WaitContainer(id string) (int, error) {
-	resp, err := c.do("POST", "/containers/"+id+"/wait", doOptions{})
-	if err != nil {
-		if e, ok := err.(*Error); ok && e.Status == http.StatusNotFound {
-			return 0, &NoSuchContainer{ID: id}
-		}
-		return 0, err
-	}
-	defer resp.Body.Close()
-	var r struct{ StatusCode int }
-	if err := json.NewDecoder(resp.Body).Decode(&r); err != nil {
-		return 0, err
-	}
-	return r.StatusCode, nil
-}
-
-// CommitContainerOptions aggregates parameters to the CommitContainer method.
-//
-// See https://goo.gl/mqfoCw for more details.
-type CommitContainerOptions struct {
-	Container  string
-	Repository string `qs:"repo"`
-	Tag        string
-	Message    string `qs:"m"`
-	Author     string
-	Run        *Config `qs:"-"`
-}
-
-// CommitContainer creates a new image from a container's changes.
-//
-// See https://goo.gl/mqfoCw for more details.
-func (c *Client) CommitContainer(opts CommitContainerOptions) (*Image, error) {
-	path := "/commit?" + queryString(opts)
-	resp, err := c.do("POST", path, doOptions{data: opts.Run})
-	if err != nil {
-		if e, ok := err.(*Error); ok && e.Status == http.StatusNotFound {
-			return nil, &NoSuchContainer{ID: opts.Container}
-		}
-		return nil, err
-	}
-	defer resp.Body.Close()
-	var image Image
-	if err := json.NewDecoder(resp.Body).Decode(&image); err != nil {
-		return nil, err
-	}
-	return &image, nil
-}
-
-// AttachToContainerOptions is the set of options that can be used when
-// attaching to a container.
-//
-// See https://goo.gl/NKpkFk for more details.
-type AttachToContainerOptions struct {
-	Container    string    `qs:"-"`
-	InputStream  io.Reader `qs:"-"`
-	OutputStream io.Writer `qs:"-"`
-	ErrorStream  io.Writer `qs:"-"`
-
-	// Get container logs, sending it to OutputStream.
-	Logs bool
-
-	// Stream the response?
-	Stream bool
-
-	// Attach to stdin, and use InputStream.
-	Stdin bool
-
-	// Attach to stdout, and use OutputStream.
-	Stdout bool
-
-	// Attach to stderr, and use ErrorStream.
-	Stderr bool
-
-	// If set, after a successful connect, a sentinel will be sent and then the
-	// client will block on receive before continuing.
-	//
-	// It must be an unbuffered channel. Using a buffered channel can lead
-	// to unexpected behavior.
-	Success chan struct{}
-
-	// Use raw terminal? Usually true when the container contains a TTY.
-	RawTerminal bool `qs:"-"`
-}
-
-// AttachToContainer attaches to a container, using the given options.
-//
-// See https://goo.gl/NKpkFk for more details.
-func (c *Client) AttachToContainer(opts AttachToContainerOptions) error {
-	if opts.Container == "" {
-		return &NoSuchContainer{ID: opts.Container}
-	}
-	path := "/containers/" + opts.Container + "/attach?" + queryString(opts)
-	return c.hijack("POST", path, hijackOptions{
-		success:        opts.Success,
-		setRawTerminal: opts.RawTerminal,
-		in:             opts.InputStream,
-		stdout:         opts.OutputStream,
-		stderr:         opts.ErrorStream,
-	})
-}
-
-// LogsOptions represents the set of options used when getting logs from a
-// container.
-//
-// See https://goo.gl/yl8PGm for more details.
-type LogsOptions struct {
-	Container    string    `qs:"-"`
-	OutputStream io.Writer `qs:"-"`
-	ErrorStream  io.Writer `qs:"-"`
-	Follow       bool
-	Stdout       bool
-	Stderr       bool
-	Since        int64
-	Timestamps   bool
-	Tail         string
-
-	// Use raw terminal? Usually true when the container contains a TTY.
-	RawTerminal bool `qs:"-"`
-}
-
-// Logs gets stdout and stderr logs from the specified container.
-//
-// See https://goo.gl/yl8PGm for more details.
-func (c *Client) Logs(opts LogsOptions) error {
-	if opts.Container == "" {
-		return &NoSuchContainer{ID: opts.Container}
-	}
-	if opts.Tail == "" {
-		opts.Tail = "all"
-	}
-	path := "/containers/" + opts.Container + "/logs?" + queryString(opts)
-	return c.stream("GET", path, streamOptions{
-		setRawTerminal: opts.RawTerminal,
-		stdout:         opts.OutputStream,
-		stderr:         opts.ErrorStream,
-	})
-}
-
-// ResizeContainerTTY resizes the terminal to the given height and width.
-//
-// See https://goo.gl/xERhCc for more details.
-func (c *Client) ResizeContainerTTY(id string, height, width int) error {
-	params := make(url.Values)
-	params.Set("h", strconv.Itoa(height))
-	params.Set("w", strconv.Itoa(width))
-	resp, err := c.do("POST", "/containers/"+id+"/resize?"+params.Encode(), doOptions{})
-	if err != nil {
-		return err
-	}
-	resp.Body.Close()
-	return nil
-}
-
-// ExportContainerOptions is the set of parameters to the ExportContainer
-// method.
-//
-// See https://goo.gl/dOkTyk for more details.
-type ExportContainerOptions struct {
-	ID           string
-	OutputStream io.Writer
-}
-
-// ExportContainer export the contents of container id as tar archive
-// and prints the exported contents to stdout.
-//
-// See https://goo.gl/dOkTyk for more details.
-func (c *Client) ExportContainer(opts ExportContainerOptions) error {
-	if opts.ID == "" {
-		return &NoSuchContainer{ID: opts.ID}
-	}
-	url := fmt.Sprintf("/containers/%s/export", opts.ID)
-	return c.stream("GET", url, streamOptions{
-		setRawTerminal: true,
-		stdout:         opts.OutputStream,
-	})
-}
-
-// NoSuchContainer is the error returned when a given container does not exist.
-type NoSuchContainer struct {
-	ID  string
-	Err error
-}
-
-func (err *NoSuchContainer) Error() string {
-	if err.Err != nil {
-		return err.Err.Error()
-	}
-	return "No such container: " + err.ID
-}
-
-// ContainerAlreadyRunning is the error returned when a given container is
-// already running.
-type ContainerAlreadyRunning struct {
-	ID string
-}
-
-func (err *ContainerAlreadyRunning) Error() string {
-	return "Container already running: " + err.ID
-}
-
-// ContainerNotRunning is the error returned when a given container is not
-// running.
-type ContainerNotRunning struct {
-	ID string
-}
-
-func (err *ContainerNotRunning) Error() string {
-	return "Container not running: " + err.ID
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/env.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/env.go
deleted file mode 100644
index c54b0b0e8..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/env.go
+++ /dev/null
@@ -1,168 +0,0 @@
-// Copyright 2014 Docker authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the DOCKER-LICENSE file.
-
-package docker
-
-import (
-	"encoding/json"
-	"fmt"
-	"io"
-	"strconv"
-	"strings"
-)
-
-// Env represents a list of key-pair represented in the form KEY=VALUE.
-type Env []string
-
-// Get returns the string value of the given key.
-func (env *Env) Get(key string) (value string) {
-	return env.Map()[key]
-}
-
-// Exists checks whether the given key is defined in the internal Env
-// representation.
-func (env *Env) Exists(key string) bool {
-	_, exists := env.Map()[key]
-	return exists
-}
-
-// GetBool returns a boolean representation of the given key. The key is false
-// whenever its value if 0, no, false, none or an empty string. Any other value
-// will be interpreted as true.
-func (env *Env) GetBool(key string) (value bool) {
-	s := strings.ToLower(strings.Trim(env.Get(key), " \t"))
-	if s == "" || s == "0" || s == "no" || s == "false" || s == "none" {
-		return false
-	}
-	return true
-}
-
-// SetBool defines a boolean value to the given key.
-func (env *Env) SetBool(key string, value bool) {
-	if value {
-		env.Set(key, "1")
-	} else {
-		env.Set(key, "0")
-	}
-}
-
-// GetInt returns the value of the provided key, converted to int.
-//
-// It the value cannot be represented as an integer, it returns -1.
-func (env *Env) GetInt(key string) int {
-	return int(env.GetInt64(key))
-}
-
-// SetInt defines an integer value to the given key.
-func (env *Env) SetInt(key string, value int) {
-	env.Set(key, strconv.Itoa(value))
-}
-
-// GetInt64 returns the value of the provided key, converted to int64.
-//
-// It the value cannot be represented as an integer, it returns -1.
-func (env *Env) GetInt64(key string) int64 {
-	s := strings.Trim(env.Get(key), " \t")
-	val, err := strconv.ParseInt(s, 10, 64)
-	if err != nil {
-		return -1
-	}
-	return val
-}
-
-// SetInt64 defines an integer (64-bit wide) value to the given key.
-func (env *Env) SetInt64(key string, value int64) {
-	env.Set(key, strconv.FormatInt(value, 10))
-}
-
-// GetJSON unmarshals the value of the provided key in the provided iface.
-//
-// iface is a value that can be provided to the json.Unmarshal function.
-func (env *Env) GetJSON(key string, iface interface{}) error {
-	sval := env.Get(key)
-	if sval == "" {
-		return nil
-	}
-	return json.Unmarshal([]byte(sval), iface)
-}
-
-// SetJSON marshals the given value to JSON format and stores it using the
-// provided key.
-func (env *Env) SetJSON(key string, value interface{}) error {
-	sval, err := json.Marshal(value)
-	if err != nil {
-		return err
-	}
-	env.Set(key, string(sval))
-	return nil
-}
-
-// GetList returns a list of strings matching the provided key. It handles the
-// list as a JSON representation of a list of strings.
-//
-// If the given key matches to a single string, it will return a list
-// containing only the value that matches the key.
-func (env *Env) GetList(key string) []string {
-	sval := env.Get(key)
-	if sval == "" {
-		return nil
-	}
-	var l []string
-	if err := json.Unmarshal([]byte(sval), &l); err != nil {
-		l = append(l, sval)
-	}
-	return l
-}
-
-// SetList stores the given list in the provided key, after serializing it to
-// JSON format.
-func (env *Env) SetList(key string, value []string) error {
-	return env.SetJSON(key, value)
-}
-
-// Set defines the value of a key to the given string.
-func (env *Env) Set(key, value string) {
-	*env = append(*env, key+"="+value)
-}
-
-// Decode decodes `src` as a json dictionary, and adds each decoded key-value
-// pair to the environment.
-//
-// If `src` cannot be decoded as a json dictionary, an error is returned.
-func (env *Env) Decode(src io.Reader) error {
-	m := make(map[string]interface{})
-	if err := json.NewDecoder(src).Decode(&m); err != nil {
-		return err
-	}
-	for k, v := range m {
-		env.SetAuto(k, v)
-	}
-	return nil
-}
-
-// SetAuto will try to define the Set* method to call based on the given value.
-func (env *Env) SetAuto(key string, value interface{}) {
-	if fval, ok := value.(float64); ok {
-		env.SetInt64(key, int64(fval))
-	} else if sval, ok := value.(string); ok {
-		env.Set(key, sval)
-	} else if val, err := json.Marshal(value); err == nil {
-		env.Set(key, string(val))
-	} else {
-		env.Set(key, fmt.Sprintf("%v", value))
-	}
-}
-
-// Map returns the map representation of the env.
-func (env *Env) Map() map[string]string {
-	if len(*env) == 0 {
-		return nil
-	}
-	m := make(map[string]string)
-	for _, kv := range *env {
-		parts := strings.SplitN(kv, "=", 2)
-		m[parts[0]] = parts[1]
-	}
-	return m
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/event.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/event.go
deleted file mode 100644
index eaffddb82..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/event.go
+++ /dev/null
@@ -1,304 +0,0 @@
-// Copyright 2015 go-dockerclient 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 docker
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-	"io"
-	"math"
-	"net"
-	"net/http"
-	"net/http/httputil"
-	"sync"
-	"sync/atomic"
-	"time"
-)
-
-// APIEvents represents an event returned by the API.
-type APIEvents struct {
-	Status string `json:"Status,omitempty" yaml:"Status,omitempty"`
-	ID     string `json:"ID,omitempty" yaml:"ID,omitempty"`
-	From   string `json:"From,omitempty" yaml:"From,omitempty"`
-	Time   int64  `json:"Time,omitempty" yaml:"Time,omitempty"`
-}
-
-type eventMonitoringState struct {
-	sync.RWMutex
-	sync.WaitGroup
-	enabled   bool
-	lastSeen  *int64
-	C         chan *APIEvents
-	errC      chan error
-	listeners []chan<- *APIEvents
-}
-
-const (
-	maxMonitorConnRetries = 5
-	retryInitialWaitTime  = 10.
-)
-
-var (
-	// ErrNoListeners is the error returned when no listeners are available
-	// to receive an event.
-	ErrNoListeners = errors.New("no listeners present to receive event")
-
-	// ErrListenerAlreadyExists is the error returned when the listerner already
-	// exists.
-	ErrListenerAlreadyExists = errors.New("listener already exists for docker events")
-
-	// EOFEvent is sent when the event listener receives an EOF error.
-	EOFEvent = &APIEvents{
-		Status: "EOF",
-	}
-)
-
-// AddEventListener adds a new listener to container events in the Docker API.
-//
-// The parameter is a channel through which events will be sent.
-func (c *Client) AddEventListener(listener chan<- *APIEvents) error {
-	var err error
-	if !c.eventMonitor.isEnabled() {
-		err = c.eventMonitor.enableEventMonitoring(c)
-		if err != nil {
-			return err
-		}
-	}
-	err = c.eventMonitor.addListener(listener)
-	if err != nil {
-		return err
-	}
-	return nil
-}
-
-// RemoveEventListener removes a listener from the monitor.
-func (c *Client) RemoveEventListener(listener chan *APIEvents) error {
-	err := c.eventMonitor.removeListener(listener)
-	if err != nil {
-		return err
-	}
-	if len(c.eventMonitor.listeners) == 0 {
-		c.eventMonitor.disableEventMonitoring()
-	}
-	return nil
-}
-
-func (eventState *eventMonitoringState) addListener(listener chan<- *APIEvents) error {
-	eventState.Lock()
-	defer eventState.Unlock()
-	if listenerExists(listener, &eventState.listeners) {
-		return ErrListenerAlreadyExists
-	}
-	eventState.Add(1)
-	eventState.listeners = append(eventState.listeners, listener)
-	return nil
-}
-
-func (eventState *eventMonitoringState) removeListener(listener chan<- *APIEvents) error {
-	eventState.Lock()
-	defer eventState.Unlock()
-	if listenerExists(listener, &eventState.listeners) {
-		var newListeners []chan<- *APIEvents
-		for _, l := range eventState.listeners {
-			if l != listener {
-				newListeners = append(newListeners, l)
-			}
-		}
-		eventState.listeners = newListeners
-		eventState.Add(-1)
-	}
-	return nil
-}
-
-func (eventState *eventMonitoringState) closeListeners() {
-	for _, l := range eventState.listeners {
-		close(l)
-		eventState.Add(-1)
-	}
-	eventState.listeners = nil
-}
-
-func listenerExists(a chan<- *APIEvents, list *[]chan<- *APIEvents) bool {
-	for _, b := range *list {
-		if b == a {
-			return true
-		}
-	}
-	return false
-}
-
-func (eventState *eventMonitoringState) enableEventMonitoring(c *Client) error {
-	eventState.Lock()
-	defer eventState.Unlock()
-	if !eventState.enabled {
-		eventState.enabled = true
-		var lastSeenDefault = int64(0)
-		eventState.lastSeen = &lastSeenDefault
-		eventState.C = make(chan *APIEvents, 100)
-		eventState.errC = make(chan error, 1)
-		go eventState.monitorEvents(c)
-	}
-	return nil
-}
-
-func (eventState *eventMonitoringState) disableEventMonitoring() error {
-	eventState.Lock()
-	defer eventState.Unlock()
-
-	eventState.closeListeners()
-
-	eventState.Wait()
-
-	if eventState.enabled {
-		eventState.enabled = false
-		close(eventState.C)
-		close(eventState.errC)
-	}
-	return nil
-}
-
-func (eventState *eventMonitoringState) monitorEvents(c *Client) {
-	var err error
-	for eventState.noListeners() {
-		time.Sleep(10 * time.Millisecond)
-	}
-	if err = eventState.connectWithRetry(c); err != nil {
-		// terminate if connect failed
-		eventState.disableEventMonitoring()
-		return
-	}
-	for eventState.isEnabled() {
-		timeout := time.After(100 * time.Millisecond)
-		select {
-		case ev, ok := <-eventState.C:
-			if !ok {
-				return
-			}
-			if ev == EOFEvent {
-				eventState.disableEventMonitoring()
-				return
-			}
-			eventState.updateLastSeen(ev)
-			go eventState.sendEvent(ev)
-		case err = <-eventState.errC:
-			if err == ErrNoListeners {
-				eventState.disableEventMonitoring()
-				return
-			} else if err != nil {
-				defer func() { go eventState.monitorEvents(c) }()
-				return
-			}
-		case <-timeout:
-			continue
-		}
-	}
-}
-
-func (eventState *eventMonitoringState) connectWithRetry(c *Client) error {
-	var retries int
-	var err error
-	for err = c.eventHijack(atomic.LoadInt64(eventState.lastSeen), eventState.C, eventState.errC); err != nil && retries < maxMonitorConnRetries; retries++ {
-		waitTime := int64(retryInitialWaitTime * math.Pow(2, float64(retries)))
-		time.Sleep(time.Duration(waitTime) * time.Millisecond)
-		err = c.eventHijack(atomic.LoadInt64(eventState.lastSeen), eventState.C, eventState.errC)
-	}
-	return err
-}
-
-func (eventState *eventMonitoringState) noListeners() bool {
-	eventState.RLock()
-	defer eventState.RUnlock()
-	return len(eventState.listeners) == 0
-}
-
-func (eventState *eventMonitoringState) isEnabled() bool {
-	eventState.RLock()
-	defer eventState.RUnlock()
-	return eventState.enabled
-}
-
-func (eventState *eventMonitoringState) sendEvent(event *APIEvents) {
-	eventState.RLock()
-	defer eventState.RUnlock()
-	eventState.Add(1)
-	defer eventState.Done()
-	if eventState.enabled {
-		if len(eventState.listeners) == 0 {
-			eventState.errC <- ErrNoListeners
-			return
-		}
-
-		for _, listener := range eventState.listeners {
-			listener <- event
-		}
-	}
-}
-
-func (eventState *eventMonitoringState) updateLastSeen(e *APIEvents) {
-	eventState.Lock()
-	defer eventState.Unlock()
-	if atomic.LoadInt64(eventState.lastSeen) < e.Time {
-		atomic.StoreInt64(eventState.lastSeen, e.Time)
-	}
-}
-
-func (c *Client) eventHijack(startTime int64, eventChan chan *APIEvents, errChan chan error) error {
-	uri := "/events"
-	if startTime != 0 {
-		uri += fmt.Sprintf("?since=%d", startTime)
-	}
-	protocol := c.endpointURL.Scheme
-	address := c.endpointURL.Path
-	if protocol != "unix" {
-		protocol = "tcp"
-		address = c.endpointURL.Host
-	}
-	var dial net.Conn
-	var err error
-	if c.TLSConfig == nil {
-		dial, err = c.Dialer.Dial(protocol, address)
-	} else {
-		dial, err = tlsDialWithDialer(c.Dialer, protocol, address, c.TLSConfig)
-	}
-	if err != nil {
-		return err
-	}
-	conn := httputil.NewClientConn(dial, nil)
-	req, err := http.NewRequest("GET", uri, nil)
-	if err != nil {
-		return err
-	}
-	res, err := conn.Do(req)
-	if err != nil {
-		return err
-	}
-	go func(res *http.Response, conn *httputil.ClientConn) {
-		defer conn.Close()
-		defer res.Body.Close()
-		decoder := json.NewDecoder(res.Body)
-		for {
-			var event APIEvents
-			if err = decoder.Decode(&event); err != nil {
-				if err == io.EOF || err == io.ErrUnexpectedEOF {
-					if c.eventMonitor.isEnabled() {
-						// Signal that we're exiting.
-						eventChan <- EOFEvent
-					}
-					break
-				}
-				errChan <- err
-			}
-			if event.Time == 0 {
-				continue
-			}
-			if !c.eventMonitor.isEnabled() {
-				return
-			}
-			eventChan <- &event
-		}
-	}(res, conn)
-	return nil
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/exec.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/exec.go
deleted file mode 100644
index f3b705fa0..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/exec.go
+++ /dev/null
@@ -1,186 +0,0 @@
-// Copyright 2015 go-dockerclient 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 docker
-
-import (
-	"encoding/json"
-	"fmt"
-	"io"
-	"net/http"
-	"net/url"
-	"strconv"
-)
-
-// Exec is the type representing a `docker exec` instance and containing the
-// instance ID
-type Exec struct {
-	ID string `json:"Id,omitempty" yaml:"Id,omitempty"`
-}
-
-// CreateExecOptions specify parameters to the CreateExecContainer function.
-//
-// See https://goo.gl/1KSIb7 for more details
-type CreateExecOptions struct {
-	AttachStdin  bool     `json:"AttachStdin,omitempty" yaml:"AttachStdin,omitempty"`
-	AttachStdout bool     `json:"AttachStdout,omitempty" yaml:"AttachStdout,omitempty"`
-	AttachStderr bool     `json:"AttachStderr,omitempty" yaml:"AttachStderr,omitempty"`
-	Tty          bool     `json:"Tty,omitempty" yaml:"Tty,omitempty"`
-	Cmd          []string `json:"Cmd,omitempty" yaml:"Cmd,omitempty"`
-	Container    string   `json:"Container,omitempty" yaml:"Container,omitempty"`
-	User         string   `json:"User,omitempty" yaml:"User,omitempty"`
-}
-
-// CreateExec sets up an exec instance in a running container `id`, returning the exec
-// instance, or an error in case of failure.
-//
-// See https://goo.gl/1KSIb7 for more details
-func (c *Client) CreateExec(opts CreateExecOptions) (*Exec, error) {
-	path := fmt.Sprintf("/containers/%s/exec", opts.Container)
-	resp, err := c.do("POST", path, doOptions{data: opts})
-	if err != nil {
-		if e, ok := err.(*Error); ok && e.Status == http.StatusNotFound {
-			return nil, &NoSuchContainer{ID: opts.Container}
-		}
-		return nil, err
-	}
-	defer resp.Body.Close()
-	var exec Exec
-	if err := json.NewDecoder(resp.Body).Decode(&exec); err != nil {
-		return nil, err
-	}
-
-	return &exec, nil
-}
-
-// StartExecOptions specify parameters to the StartExecContainer function.
-//
-// See https://goo.gl/iQCnto for more details
-type StartExecOptions struct {
-	Detach bool `json:"Detach,omitempty" yaml:"Detach,omitempty"`
-
-	Tty bool `json:"Tty,omitempty" yaml:"Tty,omitempty"`
-
-	InputStream  io.Reader `qs:"-"`
-	OutputStream io.Writer `qs:"-"`
-	ErrorStream  io.Writer `qs:"-"`
-
-	// Use raw terminal? Usually true when the container contains a TTY.
-	RawTerminal bool `qs:"-"`
-
-	// If set, after a successful connect, a sentinel will be sent and then the
-	// client will block on receive before continuing.
-	//
-	// It must be an unbuffered channel. Using a buffered channel can lead
-	// to unexpected behavior.
-	Success chan struct{} `json:"-"`
-}
-
-// StartExec starts a previously set up exec instance id. If opts.Detach is
-// true, it returns after starting the exec command. Otherwise, it sets up an
-// interactive session with the exec command.
-//
-// See https://goo.gl/iQCnto for more details
-func (c *Client) StartExec(id string, opts StartExecOptions) error {
-	if id == "" {
-		return &NoSuchExec{ID: id}
-	}
-
-	path := fmt.Sprintf("/exec/%s/start", id)
-
-	if opts.Detach {
-		resp, err := c.do("POST", path, doOptions{data: opts})
-		if err != nil {
-			if e, ok := err.(*Error); ok && e.Status == http.StatusNotFound {
-				return &NoSuchExec{ID: id}
-			}
-			return err
-		}
-		defer resp.Body.Close()
-		return nil
-	}
-
-	return c.hijack("POST", path, hijackOptions{
-		success:        opts.Success,
-		setRawTerminal: opts.RawTerminal,
-		in:             opts.InputStream,
-		stdout:         opts.OutputStream,
-		stderr:         opts.ErrorStream,
-		data:           opts,
-	})
-}
-
-// ResizeExecTTY resizes the tty session used by the exec command id. This API
-// is valid only if Tty was specified as part of creating and starting the exec
-// command.
-//
-// See https://goo.gl/e1JpsA for more details
-func (c *Client) ResizeExecTTY(id string, height, width int) error {
-	params := make(url.Values)
-	params.Set("h", strconv.Itoa(height))
-	params.Set("w", strconv.Itoa(width))
-
-	path := fmt.Sprintf("/exec/%s/resize?%s", id, params.Encode())
-	resp, err := c.do("POST", path, doOptions{})
-	if err != nil {
-		return err
-	}
-	resp.Body.Close()
-	return nil
-}
-
-// ExecProcessConfig is a type describing the command associated to a Exec
-// instance. It's used in the ExecInspect type.
-type ExecProcessConfig struct {
-	Privileged bool     `json:"privileged,omitempty" yaml:"privileged,omitempty"`
-	User       string   `json:"user,omitempty" yaml:"user,omitempty"`
-	Tty        bool     `json:"tty,omitempty" yaml:"tty,omitempty"`
-	EntryPoint string   `json:"entrypoint,omitempty" yaml:"entrypoint,omitempty"`
-	Arguments  []string `json:"arguments,omitempty" yaml:"arguments,omitempty"`
-}
-
-// ExecInspect is a type with details about a exec instance, including the
-// exit code if the command has finished running. It's returned by a api
-// call to /exec/(id)/json
-//
-// See https://goo.gl/gPtX9R for more details
-type ExecInspect struct {
-	ID            string            `json:"ID,omitempty" yaml:"ID,omitempty"`
-	Running       bool              `json:"Running,omitempty" yaml:"Running,omitempty"`
-	ExitCode      int               `json:"ExitCode,omitempty" yaml:"ExitCode,omitempty"`
-	OpenStdin     bool              `json:"OpenStdin,omitempty" yaml:"OpenStdin,omitempty"`
-	OpenStderr    bool              `json:"OpenStderr,omitempty" yaml:"OpenStderr,omitempty"`
-	OpenStdout    bool              `json:"OpenStdout,omitempty" yaml:"OpenStdout,omitempty"`
-	ProcessConfig ExecProcessConfig `json:"ProcessConfig,omitempty" yaml:"ProcessConfig,omitempty"`
-	Container     Container         `json:"Container,omitempty" yaml:"Container,omitempty"`
-}
-
-// InspectExec returns low-level information about the exec command id.
-//
-// See https://goo.gl/gPtX9R for more details
-func (c *Client) InspectExec(id string) (*ExecInspect, error) {
-	path := fmt.Sprintf("/exec/%s/json", id)
-	resp, err := c.do("GET", path, doOptions{})
-	if err != nil {
-		if e, ok := err.(*Error); ok && e.Status == http.StatusNotFound {
-			return nil, &NoSuchExec{ID: id}
-		}
-		return nil, err
-	}
-	defer resp.Body.Close()
-	var exec ExecInspect
-	if err := json.NewDecoder(resp.Body).Decode(&exec); err != nil {
-		return nil, err
-	}
-	return &exec, nil
-}
-
-// NoSuchExec is the error returned when a given exec instance does not exist.
-type NoSuchExec struct {
-	ID string
-}
-
-func (err *NoSuchExec) Error() string {
-	return "No such exec instance: " + err.ID
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/CHANGELOG.md b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/CHANGELOG.md
deleted file mode 100644
index ecc843272..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/CHANGELOG.md
+++ /dev/null
@@ -1,55 +0,0 @@
-# 0.9.0 (Unreleased)
-
-* logrus/text_formatter: don't emit empty msg
-* logrus/hooks/airbrake: move out of main repository
-* logrus/hooks/sentry: move out of main repository
-* logrus/hooks/papertrail: move out of main repository
-* logrus/hooks/bugsnag: move out of main repository
-
-# 0.8.7
-
-* logrus/core: fix possible race (#216)
-* logrus/doc: small typo fixes and doc improvements
-
-
-# 0.8.6
-
-* hooks/raven: allow passing an initialized client
-
-# 0.8.5
-
-* logrus/core: revert #208
-
-# 0.8.4
-
-* formatter/text: fix data race (#218)
-
-# 0.8.3
-
-* logrus/core: fix entry log level (#208)
-* logrus/core: improve performance of text formatter by 40%
-* logrus/core: expose `LevelHooks` type
-* logrus/core: add support for DragonflyBSD and NetBSD
-* formatter/text: print structs more verbosely
-
-# 0.8.2
-
-* logrus: fix more Fatal family functions
-
-# 0.8.1
-
-* logrus: fix not exiting on `Fatalf` and `Fatalln`
-
-# 0.8.0
-
-* logrus: defaults to stderr instead of stdout
-* hooks/sentry: add special field for `*http.Request`
-* formatter/text: ignore Windows for colors
-
-# 0.7.3
-
-* formatter/\*: allow configuration of timestamp layout
-
-# 0.7.2
-
-* formatter/text: Add configuration option for time format (#158)
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/LICENSE b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/LICENSE
deleted file mode 100644
index f090cb42f..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2014 Simon Eskildsen
-
-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/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/README.md b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/README.md
deleted file mode 100644
index 53d27d449..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/README.md
+++ /dev/null
@@ -1,358 +0,0 @@
-# Logrus <img src="http://i.imgur.com/hTeVwmJ.png" width="40" height="40" alt=":walrus:" class="emoji" title=":walrus:"/>&nbsp;[![Build Status](https://travis-ci.org/Sirupsen/logrus.svg?branch=master)](https://travis-ci.org/Sirupsen/logrus)&nbsp;[![godoc reference](https://godoc.org/github.com/Sirupsen/logrus?status.png)][godoc]
-
-Logrus is a structured logger for Go (golang), completely API compatible with
-the standard library logger. [Godoc][godoc]. **Please note the Logrus API is not
-yet stable (pre 1.0). Logrus itself is completely stable and has been used in
-many large deployments. The core API is unlikely to change much but please
-version control your Logrus to make sure you aren't fetching latest `master` on
-every build.**
-
-Nicely color-coded in development (when a TTY is attached, otherwise just
-plain text):
-
-![Colored](http://i.imgur.com/PY7qMwd.png)
-
-With `log.Formatter = new(logrus.JSONFormatter)`, for easy parsing by logstash
-or Splunk:
-
-```json
-{"animal":"walrus","level":"info","msg":"A group of walrus emerges from the
-ocean","size":10,"time":"2014-03-10 19:57:38.562264131 -0400 EDT"}
-
-{"level":"warning","msg":"The group's number increased tremendously!",
-"number":122,"omg":true,"time":"2014-03-10 19:57:38.562471297 -0400 EDT"}
-
-{"animal":"walrus","level":"info","msg":"A giant walrus appears!",
-"size":10,"time":"2014-03-10 19:57:38.562500591 -0400 EDT"}
-
-{"animal":"walrus","level":"info","msg":"Tremendously sized cow enters the ocean.",
-"size":9,"time":"2014-03-10 19:57:38.562527896 -0400 EDT"}
-
-{"level":"fatal","msg":"The ice breaks!","number":100,"omg":true,
-"time":"2014-03-10 19:57:38.562543128 -0400 EDT"}
-```
-
-With the default `log.Formatter = new(&log.TextFormatter{})` when a TTY is not
-attached, the output is compatible with the
-[logfmt](http://godoc.org/github.com/kr/logfmt) format:
-
-```text
-time="2015-03-26T01:27:38-04:00" level=debug msg="Started observing beach" animal=walrus number=8
-time="2015-03-26T01:27:38-04:00" level=info msg="A group of walrus emerges from the ocean" animal=walrus size=10
-time="2015-03-26T01:27:38-04:00" level=warning msg="The group's number increased tremendously!" number=122 omg=true
-time="2015-03-26T01:27:38-04:00" level=debug msg="Temperature changes" temperature=-4
-time="2015-03-26T01:27:38-04:00" level=panic msg="It's over 9000!" animal=orca size=9009
-time="2015-03-26T01:27:38-04:00" level=fatal msg="The ice breaks!" err=&{0x2082280c0 map[animal:orca size:9009] 2015-03-26 01:27:38.441574009 -0400 EDT panic It's over 9000!} number=100 omg=true
-exit status 1
-```
-
-#### Example
-
-The simplest way to use Logrus is simply the package-level exported logger:
-
-```go
-package main
-
-import (
-  log "github.com/Sirupsen/logrus"
-)
-
-func main() {
-  log.WithFields(log.Fields{
-    "animal": "walrus",
-  }).Info("A walrus appears")
-}
-```
-
-Note that it's completely api-compatible with the stdlib logger, so you can
-replace your `log` imports everywhere with `log "github.com/Sirupsen/logrus"`
-and you'll now have the flexibility of Logrus. You can customize it all you
-want:
-
-```go
-package main
-
-import (
-  "os"
-  log "github.com/Sirupsen/logrus"
-)
-
-func init() {
-  // Log as JSON instead of the default ASCII formatter.
-  log.SetFormatter(&log.JSONFormatter{})
-
-  // Output to stderr instead of stdout, could also be a file.
-  log.SetOutput(os.Stderr)
-
-  // Only log the warning severity or above.
-  log.SetLevel(log.WarnLevel)
-}
-
-func main() {
-  log.WithFields(log.Fields{
-    "animal": "walrus",
-    "size":   10,
-  }).Info("A group of walrus emerges from the ocean")
-
-  log.WithFields(log.Fields{
-    "omg":    true,
-    "number": 122,
-  }).Warn("The group's number increased tremendously!")
-
-  log.WithFields(log.Fields{
-    "omg":    true,
-    "number": 100,
-  }).Fatal("The ice breaks!")
-
-  // A common pattern is to re-use fields between logging statements by re-using
-  // the logrus.Entry returned from WithFields()
-  contextLogger := log.WithFields(log.Fields{
-    "common": "this is a common field",
-    "other": "I also should be logged always",
-  })
-
-  contextLogger.Info("I'll be logged with common and other field")
-  contextLogger.Info("Me too")
-}
-```
-
-For more advanced usage such as logging to multiple locations from the same
-application, you can also create an instance of the `logrus` Logger:
-
-```go
-package main
-
-import (
-  "github.com/Sirupsen/logrus"
-)
-
-// Create a new instance of the logger. You can have any number of instances.
-var log = logrus.New()
-
-func main() {
-  // The API for setting attributes is a little different than the package level
-  // exported logger. See Godoc.
-  log.Out = os.Stderr
-
-  log.WithFields(logrus.Fields{
-    "animal": "walrus",
-    "size":   10,
-  }).Info("A group of walrus emerges from the ocean")
-}
-```
-
-#### Fields
-
-Logrus encourages careful, structured logging though logging fields instead of
-long, unparseable error messages. For example, instead of: `log.Fatalf("Failed
-to send event %s to topic %s with key %d")`, you should log the much more
-discoverable:
-
-```go
-log.WithFields(log.Fields{
-  "event": event,
-  "topic": topic,
-  "key": key,
-}).Fatal("Failed to send event")
-```
-
-We've found this API forces you to think about logging in a way that produces
-much more useful logging messages. We've been in countless situations where just
-a single added field to a log statement that was already there would've saved us
-hours. The `WithFields` call is optional.
-
-In general, with Logrus using any of the `printf`-family functions should be
-seen as a hint you should add a field, however, you can still use the
-`printf`-family functions with Logrus.
-
-#### Hooks
-
-You can add hooks for logging levels. For example to send errors to an exception
-tracking service on `Error`, `Fatal` and `Panic`, info to StatsD or log to
-multiple places simultaneously, e.g. syslog.
-
-Logrus comes with [built-in hooks](hooks/). Add those, or your custom hook, in
-`init`:
-
-```go
-import (
-  log "github.com/Sirupsen/logrus"
-  "gopkg.in/gemnasium/logrus-airbrake-hook.v2" // the package is named "aibrake"
-  logrus_syslog "github.com/Sirupsen/logrus/hooks/syslog"
-  "log/syslog"
-)
-
-func init() {
-
-  // Use the Airbrake hook to report errors that have Error severity or above to
-  // an exception tracker. You can create custom hooks, see the Hooks section.
-  log.AddHook(airbrake.NewHook(123, "xyz", "production"))
-
-  hook, err := logrus_syslog.NewSyslogHook("udp", "localhost:514", syslog.LOG_INFO, "")
-  if err != nil {
-    log.Error("Unable to connect to local syslog daemon")
-  } else {
-    log.AddHook(hook)
-  }
-}
-```
-Note: Syslog hook also support connecting to local syslog (Ex. "/dev/log" or "/var/run/syslog" or "/var/run/log"). For the detail, please check the [syslog hook README](hooks/syslog/README.md).
-
-| Hook  | Description |
-| ----- | ----------- |
-| [Airbrake](https://github.com/gemnasium/logrus-airbrake-hook) | Send errors to the Airbrake API V3. Uses the official [`gobrake`](https://github.com/airbrake/gobrake) behind the scenes. |
-| [Airbrake "legacy"](https://github.com/gemnasium/logrus-airbrake-legacy-hook) | Send errors to an exception tracking service compatible with the Airbrake API V2. Uses [`airbrake-go`](https://github.com/tobi/airbrake-go) behind the scenes. |
-| [Papertrail](https://github.com/polds/logrus-papertrail-hook) | Send errors to the [Papertrail](https://papertrailapp.com) hosted logging service via UDP. |
-| [Syslog](https://github.com/Sirupsen/logrus/blob/master/hooks/syslog/syslog.go) | Send errors to remote syslog server. Uses standard library `log/syslog` behind the scenes. |
-| [Bugsnag](https://github.com/Shopify/logrus-bugsnag/blob/master/bugsnag.go) | Send errors to the Bugsnag exception tracking service. |
-| [Sentry](https://github.com/evalphobia/logrus_sentry) | Send errors to the Sentry error logging and aggregation service. |
-| [Hiprus](https://github.com/nubo/hiprus) | Send errors to a channel in hipchat. |
-| [Logrusly](https://github.com/sebest/logrusly) | Send logs to [Loggly](https://www.loggly.com/) |
-| [Slackrus](https://github.com/johntdyer/slackrus) | Hook for Slack chat. |
-| [Journalhook](https://github.com/wercker/journalhook) | Hook for logging to `systemd-journald` |
-| [Graylog](https://github.com/gemnasium/logrus-graylog-hook) | Hook for logging to [Graylog](http://graylog2.org/) |
-| [Raygun](https://github.com/squirkle/logrus-raygun-hook) | Hook for logging to [Raygun.io](http://raygun.io/) |
-| [LFShook](https://github.com/rifflock/lfshook) | Hook for logging to the local filesystem |
-| [Honeybadger](https://github.com/agonzalezro/logrus_honeybadger) | Hook for sending exceptions to Honeybadger |
-| [Mail](https://github.com/zbindenren/logrus_mail) | Hook for sending exceptions via mail |
-| [Rollrus](https://github.com/heroku/rollrus) | Hook for sending errors to rollbar |
-| [Fluentd](https://github.com/evalphobia/logrus_fluent) | Hook for logging to fluentd |
-| [Mongodb](https://github.com/weekface/mgorus) | Hook for logging to mongodb |
-| [InfluxDB](https://github.com/Abramovic/logrus_influxdb) | Hook for logging to influxdb |
-| [Octokit](https://github.com/dorajistyle/logrus-octokit-hook) | Hook for logging to github via octokit |
-
-#### Level logging
-
-Logrus has six logging levels: Debug, Info, Warning, Error, Fatal and Panic.
-
-```go
-log.Debug("Useful debugging information.")
-log.Info("Something noteworthy happened!")
-log.Warn("You should probably take a look at this.")
-log.Error("Something failed but I'm not quitting.")
-// Calls os.Exit(1) after logging
-log.Fatal("Bye.")
-// Calls panic() after logging
-log.Panic("I'm bailing.")
-```
-
-You can set the logging level on a `Logger`, then it will only log entries with
-that severity or anything above it:
-
-```go
-// Will log anything that is info or above (warn, error, fatal, panic). Default.
-log.SetLevel(log.InfoLevel)
-```
-
-It may be useful to set `log.Level = logrus.DebugLevel` in a debug or verbose
-environment if your application has that.
-
-#### Entries
-
-Besides the fields added with `WithField` or `WithFields` some fields are
-automatically added to all logging events:
-
-1. `time`. The timestamp when the entry was created.
-2. `msg`. The logging message passed to `{Info,Warn,Error,Fatal,Panic}` after
-   the `AddFields` call. E.g. `Failed to send event.`
-3. `level`. The logging level. E.g. `info`.
-
-#### Environments
-
-Logrus has no notion of environment.
-
-If you wish for hooks and formatters to only be used in specific environments,
-you should handle that yourself. For example, if your application has a global
-variable `Environment`, which is a string representation of the environment you
-could do:
-
-```go
-import (
-  log "github.com/Sirupsen/logrus"
-)
-
-init() {
-  // do something here to set environment depending on an environment variable
-  // or command-line flag
-  if Environment == "production" {
-    log.SetFormatter(&log.JSONFormatter{})
-  } else {
-    // The TextFormatter is default, you don't actually have to do this.
-    log.SetFormatter(&log.TextFormatter{})
-  }
-}
-```
-
-This configuration is how `logrus` was intended to be used, but JSON in
-production is mostly only useful if you do log aggregation with tools like
-Splunk or Logstash.
-
-#### Formatters
-
-The built-in logging formatters are:
-
-* `logrus.TextFormatter`. Logs the event in colors if stdout is a tty, otherwise
-  without colors.
-  * *Note:* to force colored output when there is no TTY, set the `ForceColors`
-    field to `true`.  To force no colored output even if there is a TTY  set the
-    `DisableColors` field to `true`
-* `logrus.JSONFormatter`. Logs fields as JSON.
-* `logrus/formatters/logstash.LogstashFormatter`. Logs fields as [Logstash](http://logstash.net) Events.
-
-    ```go
-      logrus.SetFormatter(&logstash.LogstashFormatter{Type: “application_name"})
-    ```
-
-Third party logging formatters:
-
-* [`zalgo`](https://github.com/aybabtme/logzalgo): invoking the P͉̫o̳̼̊w̖͈̰͎e̬͔̭͂r͚̼̹̲ ̫͓͉̳͈ō̠͕͖̚f̝͍̠ ͕̲̞͖͑Z̖̫̤̫ͪa͉̬͈̗l͖͎g̳̥o̰̥̅!̣͔̲̻͊̄ ̙̘̦̹̦.
-
-You can define your formatter by implementing the `Formatter` interface,
-requiring a `Format` method. `Format` takes an `*Entry`. `entry.Data` is a
-`Fields` type (`map[string]interface{}`) with all your fields as well as the
-default ones (see Entries section above):
-
-```go
-type MyJSONFormatter struct {
-}
-
-log.SetFormatter(new(MyJSONFormatter))
-
-func (f *MyJSONFormatter) Format(entry *Entry) ([]byte, error) {
-  // Note this doesn't include Time, Level and Message which are available on
-  // the Entry. Consult `godoc` on information about those fields or read the
-  // source of the official loggers.
-  serialized, err := json.Marshal(entry.Data)
-    if err != nil {
-      return nil, fmt.Errorf("Failed to marshal fields to JSON, %v", err)
-    }
-  return append(serialized, '\n'), nil
-}
-```
-
-#### Logger as an `io.Writer`
-
-Logrus can be transformed into an `io.Writer`. That writer is the end of an `io.Pipe` and it is your responsibility to close it.
-
-```go
-w := logger.Writer()
-defer w.Close()
-
-srv := http.Server{
-    // create a stdlib log.Logger that writes to
-    // logrus.Logger.
-    ErrorLog: log.New(w, "", 0),
-}
-```
-
-Each line written to that writer will be printed the usual way, using formatters
-and hooks. The level for those entries is `info`.
-
-#### Rotation
-
-Log rotation is not provided with Logrus. Log rotation should be done by an
-external program (like `logrotate(8)`) that can compress and delete old log
-entries. It should not be a feature of the application-level logger.
-
-
-[godoc]: https://godoc.org/github.com/Sirupsen/logrus
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/doc.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/doc.go
deleted file mode 100644
index dddd5f877..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/doc.go
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
-Package logrus is a structured logger for Go, completely API compatible with the standard library logger.
-
-
-The simplest way to use Logrus is simply the package-level exported logger:
-
-  package main
-
-  import (
-    log "github.com/Sirupsen/logrus"
-  )
-
-  func main() {
-    log.WithFields(log.Fields{
-      "animal": "walrus",
-      "number": 1,
-      "size":   10,
-    }).Info("A walrus appears")
-  }
-
-Output:
-  time="2015-09-07T08:48:33Z" level=info msg="A walrus appears" animal=walrus number=1 size=10
-
-For a full guide visit https://github.com/Sirupsen/logrus
-*/
-package logrus
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/entry.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/entry.go
deleted file mode 100644
index 699ea035c..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/entry.go
+++ /dev/null
@@ -1,254 +0,0 @@
-package logrus
-
-import (
-	"bytes"
-	"fmt"
-	"io"
-	"os"
-	"time"
-)
-
-// An entry is the final or intermediate Logrus logging entry. It contains all
-// the fields passed with WithField{,s}. It's finally logged when Debug, Info,
-// Warn, Error, Fatal or Panic is called on it. These objects can be reused and
-// passed around as much as you wish to avoid field duplication.
-type Entry struct {
-	Logger *Logger
-
-	// Contains all the fields set by the user.
-	Data Fields
-
-	// Time at which the log entry was created
-	Time time.Time
-
-	// Level the log entry was logged at: Debug, Info, Warn, Error, Fatal or Panic
-	Level Level
-
-	// Message passed to Debug, Info, Warn, Error, Fatal or Panic
-	Message string
-}
-
-func NewEntry(logger *Logger) *Entry {
-	return &Entry{
-		Logger: logger,
-		// Default is three fields, give a little extra room
-		Data: make(Fields, 5),
-	}
-}
-
-// Returns a reader for the entry, which is a proxy to the formatter.
-func (entry *Entry) Reader() (*bytes.Buffer, error) {
-	serialized, err := entry.Logger.Formatter.Format(entry)
-	return bytes.NewBuffer(serialized), err
-}
-
-// Returns the string representation from the reader and ultimately the
-// formatter.
-func (entry *Entry) String() (string, error) {
-	reader, err := entry.Reader()
-	if err != nil {
-		return "", err
-	}
-
-	return reader.String(), err
-}
-
-// Add a single field to the Entry.
-func (entry *Entry) WithField(key string, value interface{}) *Entry {
-	return entry.WithFields(Fields{key: value})
-}
-
-// Add a map of fields to the Entry.
-func (entry *Entry) WithFields(fields Fields) *Entry {
-	data := Fields{}
-	for k, v := range entry.Data {
-		data[k] = v
-	}
-	for k, v := range fields {
-		data[k] = v
-	}
-	return &Entry{Logger: entry.Logger, Data: data}
-}
-
-func (entry *Entry) log(level Level, msg string) {
-	entry.Time = time.Now()
-	entry.Level = level
-	entry.Message = msg
-
-	if err := entry.Logger.Hooks.Fire(level, entry); err != nil {
-		entry.Logger.mu.Lock()
-		fmt.Fprintf(os.Stderr, "Failed to fire hook: %v\n", err)
-		entry.Logger.mu.Unlock()
-	}
-
-	reader, err := entry.Reader()
-	if err != nil {
-		entry.Logger.mu.Lock()
-		fmt.Fprintf(os.Stderr, "Failed to obtain reader, %v\n", err)
-		entry.Logger.mu.Unlock()
-	}
-
-	entry.Logger.mu.Lock()
-	defer entry.Logger.mu.Unlock()
-
-	_, err = io.Copy(entry.Logger.Out, reader)
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "Failed to write to log, %v\n", err)
-	}
-
-	// To avoid Entry#log() returning a value that only would make sense for
-	// panic() to use in Entry#Panic(), we avoid the allocation by checking
-	// directly here.
-	if level <= PanicLevel {
-		panic(entry)
-	}
-}
-
-func (entry *Entry) Debug(args ...interface{}) {
-	if entry.Logger.Level >= DebugLevel {
-		entry.log(DebugLevel, fmt.Sprint(args...))
-	}
-}
-
-func (entry *Entry) Print(args ...interface{}) {
-	entry.Info(args...)
-}
-
-func (entry *Entry) Info(args ...interface{}) {
-	if entry.Logger.Level >= InfoLevel {
-		entry.log(InfoLevel, fmt.Sprint(args...))
-	}
-}
-
-func (entry *Entry) Warn(args ...interface{}) {
-	if entry.Logger.Level >= WarnLevel {
-		entry.log(WarnLevel, fmt.Sprint(args...))
-	}
-}
-
-func (entry *Entry) Warning(args ...interface{}) {
-	entry.Warn(args...)
-}
-
-func (entry *Entry) Error(args ...interface{}) {
-	if entry.Logger.Level >= ErrorLevel {
-		entry.log(ErrorLevel, fmt.Sprint(args...))
-	}
-}
-
-func (entry *Entry) Fatal(args ...interface{}) {
-	if entry.Logger.Level >= FatalLevel {
-		entry.log(FatalLevel, fmt.Sprint(args...))
-	}
-	os.Exit(1)
-}
-
-func (entry *Entry) Panic(args ...interface{}) {
-	if entry.Logger.Level >= PanicLevel {
-		entry.log(PanicLevel, fmt.Sprint(args...))
-	}
-	panic(fmt.Sprint(args...))
-}
-
-// Entry Printf family functions
-
-func (entry *Entry) Debugf(format string, args ...interface{}) {
-	if entry.Logger.Level >= DebugLevel {
-		entry.Debug(fmt.Sprintf(format, args...))
-	}
-}
-
-func (entry *Entry) Infof(format string, args ...interface{}) {
-	if entry.Logger.Level >= InfoLevel {
-		entry.Info(fmt.Sprintf(format, args...))
-	}
-}
-
-func (entry *Entry) Printf(format string, args ...interface{}) {
-	entry.Infof(format, args...)
-}
-
-func (entry *Entry) Warnf(format string, args ...interface{}) {
-	if entry.Logger.Level >= WarnLevel {
-		entry.Warn(fmt.Sprintf(format, args...))
-	}
-}
-
-func (entry *Entry) Warningf(format string, args ...interface{}) {
-	entry.Warnf(format, args...)
-}
-
-func (entry *Entry) Errorf(format string, args ...interface{}) {
-	if entry.Logger.Level >= ErrorLevel {
-		entry.Error(fmt.Sprintf(format, args...))
-	}
-}
-
-func (entry *Entry) Fatalf(format string, args ...interface{}) {
-	if entry.Logger.Level >= FatalLevel {
-		entry.Fatal(fmt.Sprintf(format, args...))
-	}
-	os.Exit(1)
-}
-
-func (entry *Entry) Panicf(format string, args ...interface{}) {
-	if entry.Logger.Level >= PanicLevel {
-		entry.Panic(fmt.Sprintf(format, args...))
-	}
-}
-
-// Entry Println family functions
-
-func (entry *Entry) Debugln(args ...interface{}) {
-	if entry.Logger.Level >= DebugLevel {
-		entry.Debug(entry.sprintlnn(args...))
-	}
-}
-
-func (entry *Entry) Infoln(args ...interface{}) {
-	if entry.Logger.Level >= InfoLevel {
-		entry.Info(entry.sprintlnn(args...))
-	}
-}
-
-func (entry *Entry) Println(args ...interface{}) {
-	entry.Infoln(args...)
-}
-
-func (entry *Entry) Warnln(args ...interface{}) {
-	if entry.Logger.Level >= WarnLevel {
-		entry.Warn(entry.sprintlnn(args...))
-	}
-}
-
-func (entry *Entry) Warningln(args ...interface{}) {
-	entry.Warnln(args...)
-}
-
-func (entry *Entry) Errorln(args ...interface{}) {
-	if entry.Logger.Level >= ErrorLevel {
-		entry.Error(entry.sprintlnn(args...))
-	}
-}
-
-func (entry *Entry) Fatalln(args ...interface{}) {
-	if entry.Logger.Level >= FatalLevel {
-		entry.Fatal(entry.sprintlnn(args...))
-	}
-	os.Exit(1)
-}
-
-func (entry *Entry) Panicln(args ...interface{}) {
-	if entry.Logger.Level >= PanicLevel {
-		entry.Panic(entry.sprintlnn(args...))
-	}
-}
-
-// Sprintlnn => Sprint no newline. This is to get the behavior of how
-// fmt.Sprintln where spaces are always added between operands, regardless of
-// their type. Instead of vendoring the Sprintln implementation to spare a
-// string allocation, we do the simplest thing.
-func (entry *Entry) sprintlnn(args ...interface{}) string {
-	msg := fmt.Sprintln(args...)
-	return msg[:len(msg)-1]
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/exported.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/exported.go
deleted file mode 100644
index a67e1b802..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/exported.go
+++ /dev/null
@@ -1,188 +0,0 @@
-package logrus
-
-import (
-	"io"
-)
-
-var (
-	// std is the name of the standard logger in stdlib `log`
-	std = New()
-)
-
-func StandardLogger() *Logger {
-	return std
-}
-
-// SetOutput sets the standard logger output.
-func SetOutput(out io.Writer) {
-	std.mu.Lock()
-	defer std.mu.Unlock()
-	std.Out = out
-}
-
-// SetFormatter sets the standard logger formatter.
-func SetFormatter(formatter Formatter) {
-	std.mu.Lock()
-	defer std.mu.Unlock()
-	std.Formatter = formatter
-}
-
-// SetLevel sets the standard logger level.
-func SetLevel(level Level) {
-	std.mu.Lock()
-	defer std.mu.Unlock()
-	std.Level = level
-}
-
-// GetLevel returns the standard logger level.
-func GetLevel() Level {
-	std.mu.Lock()
-	defer std.mu.Unlock()
-	return std.Level
-}
-
-// AddHook adds a hook to the standard logger hooks.
-func AddHook(hook Hook) {
-	std.mu.Lock()
-	defer std.mu.Unlock()
-	std.Hooks.Add(hook)
-}
-
-// WithField creates an entry from the standard logger and adds a field to
-// it. If you want multiple fields, use `WithFields`.
-//
-// Note that it doesn't log until you call Debug, Print, Info, Warn, Fatal
-// or Panic on the Entry it returns.
-func WithField(key string, value interface{}) *Entry {
-	return std.WithField(key, value)
-}
-
-// WithFields creates an entry from the standard logger and adds multiple
-// fields to it. This is simply a helper for `WithField`, invoking it
-// once for each field.
-//
-// Note that it doesn't log until you call Debug, Print, Info, Warn, Fatal
-// or Panic on the Entry it returns.
-func WithFields(fields Fields) *Entry {
-	return std.WithFields(fields)
-}
-
-// Debug logs a message at level Debug on the standard logger.
-func Debug(args ...interface{}) {
-	std.Debug(args...)
-}
-
-// Print logs a message at level Info on the standard logger.
-func Print(args ...interface{}) {
-	std.Print(args...)
-}
-
-// Info logs a message at level Info on the standard logger.
-func Info(args ...interface{}) {
-	std.Info(args...)
-}
-
-// Warn logs a message at level Warn on the standard logger.
-func Warn(args ...interface{}) {
-	std.Warn(args...)
-}
-
-// Warning logs a message at level Warn on the standard logger.
-func Warning(args ...interface{}) {
-	std.Warning(args...)
-}
-
-// Error logs a message at level Error on the standard logger.
-func Error(args ...interface{}) {
-	std.Error(args...)
-}
-
-// Panic logs a message at level Panic on the standard logger.
-func Panic(args ...interface{}) {
-	std.Panic(args...)
-}
-
-// Fatal logs a message at level Fatal on the standard logger.
-func Fatal(args ...interface{}) {
-	std.Fatal(args...)
-}
-
-// Debugf logs a message at level Debug on the standard logger.
-func Debugf(format string, args ...interface{}) {
-	std.Debugf(format, args...)
-}
-
-// Printf logs a message at level Info on the standard logger.
-func Printf(format string, args ...interface{}) {
-	std.Printf(format, args...)
-}
-
-// Infof logs a message at level Info on the standard logger.
-func Infof(format string, args ...interface{}) {
-	std.Infof(format, args...)
-}
-
-// Warnf logs a message at level Warn on the standard logger.
-func Warnf(format string, args ...interface{}) {
-	std.Warnf(format, args...)
-}
-
-// Warningf logs a message at level Warn on the standard logger.
-func Warningf(format string, args ...interface{}) {
-	std.Warningf(format, args...)
-}
-
-// Errorf logs a message at level Error on the standard logger.
-func Errorf(format string, args ...interface{}) {
-	std.Errorf(format, args...)
-}
-
-// Panicf logs a message at level Panic on the standard logger.
-func Panicf(format string, args ...interface{}) {
-	std.Panicf(format, args...)
-}
-
-// Fatalf logs a message at level Fatal on the standard logger.
-func Fatalf(format string, args ...interface{}) {
-	std.Fatalf(format, args...)
-}
-
-// Debugln logs a message at level Debug on the standard logger.
-func Debugln(args ...interface{}) {
-	std.Debugln(args...)
-}
-
-// Println logs a message at level Info on the standard logger.
-func Println(args ...interface{}) {
-	std.Println(args...)
-}
-
-// Infoln logs a message at level Info on the standard logger.
-func Infoln(args ...interface{}) {
-	std.Infoln(args...)
-}
-
-// Warnln logs a message at level Warn on the standard logger.
-func Warnln(args ...interface{}) {
-	std.Warnln(args...)
-}
-
-// Warningln logs a message at level Warn on the standard logger.
-func Warningln(args ...interface{}) {
-	std.Warningln(args...)
-}
-
-// Errorln logs a message at level Error on the standard logger.
-func Errorln(args ...interface{}) {
-	std.Errorln(args...)
-}
-
-// Panicln logs a message at level Panic on the standard logger.
-func Panicln(args ...interface{}) {
-	std.Panicln(args...)
-}
-
-// Fatalln logs a message at level Fatal on the standard logger.
-func Fatalln(args ...interface{}) {
-	std.Fatalln(args...)
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/formatter.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/formatter.go
deleted file mode 100644
index 104d689f1..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/formatter.go
+++ /dev/null
@@ -1,48 +0,0 @@
-package logrus
-
-import "time"
-
-const DefaultTimestampFormat = time.RFC3339
-
-// The Formatter interface is used to implement a custom Formatter. It takes an
-// `Entry`. It exposes all the fields, including the default ones:
-//
-// * `entry.Data["msg"]`. The message passed from Info, Warn, Error ..
-// * `entry.Data["time"]`. The timestamp.
-// * `entry.Data["level"]. The level the entry was logged at.
-//
-// Any additional fields added with `WithField` or `WithFields` are also in
-// `entry.Data`. Format is expected to return an array of bytes which are then
-// logged to `logger.Out`.
-type Formatter interface {
-	Format(*Entry) ([]byte, error)
-}
-
-// This is to not silently overwrite `time`, `msg` and `level` fields when
-// dumping it. If this code wasn't there doing:
-//
-//  logrus.WithField("level", 1).Info("hello")
-//
-// Would just silently drop the user provided level. Instead with this code
-// it'll logged as:
-//
-//  {"level": "info", "fields.level": 1, "msg": "hello", "time": "..."}
-//
-// It's not exported because it's still using Data in an opinionated way. It's to
-// avoid code duplication between the two default formatters.
-func prefixFieldClashes(data Fields) {
-	_, ok := data["time"]
-	if ok {
-		data["fields.time"] = data["time"]
-	}
-
-	_, ok = data["msg"]
-	if ok {
-		data["fields.msg"] = data["msg"]
-	}
-
-	_, ok = data["level"]
-	if ok {
-		data["fields.level"] = data["level"]
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/hooks.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/hooks.go
deleted file mode 100644
index 3f151cdc3..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/hooks.go
+++ /dev/null
@@ -1,34 +0,0 @@
-package logrus
-
-// A hook to be fired when logging on the logging levels returned from
-// `Levels()` on your implementation of the interface. Note that this is not
-// fired in a goroutine or a channel with workers, you should handle such
-// functionality yourself if your call is non-blocking and you don't wish for
-// the logging calls for levels returned from `Levels()` to block.
-type Hook interface {
-	Levels() []Level
-	Fire(*Entry) error
-}
-
-// Internal type for storing the hooks on a logger instance.
-type LevelHooks map[Level][]Hook
-
-// Add a hook to an instance of logger. This is called with
-// `log.Hooks.Add(new(MyHook))` where `MyHook` implements the `Hook` interface.
-func (hooks LevelHooks) Add(hook Hook) {
-	for _, level := range hook.Levels() {
-		hooks[level] = append(hooks[level], hook)
-	}
-}
-
-// Fire all the hooks for the passed level. Used by `entry.log` to fire
-// appropriate hooks for a log entry.
-func (hooks LevelHooks) Fire(level Level, entry *Entry) error {
-	for _, hook := range hooks[level] {
-		if err := hook.Fire(entry); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/json_formatter.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/json_formatter.go
deleted file mode 100644
index 2ad6dc5cf..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/json_formatter.go
+++ /dev/null
@@ -1,41 +0,0 @@
-package logrus
-
-import (
-	"encoding/json"
-	"fmt"
-)
-
-type JSONFormatter struct {
-	// TimestampFormat sets the format used for marshaling timestamps.
-	TimestampFormat string
-}
-
-func (f *JSONFormatter) Format(entry *Entry) ([]byte, error) {
-	data := make(Fields, len(entry.Data)+3)
-	for k, v := range entry.Data {
-		switch v := v.(type) {
-		case error:
-			// Otherwise errors are ignored by `encoding/json`
-			// https://github.com/Sirupsen/logrus/issues/137
-			data[k] = v.Error()
-		default:
-			data[k] = v
-		}
-	}
-	prefixFieldClashes(data)
-
-	timestampFormat := f.TimestampFormat
-	if timestampFormat == "" {
-		timestampFormat = DefaultTimestampFormat
-	}
-
-	data["time"] = entry.Time.Format(timestampFormat)
-	data["msg"] = entry.Message
-	data["level"] = entry.Level.String()
-
-	serialized, err := json.Marshal(data)
-	if err != nil {
-		return nil, fmt.Errorf("Failed to marshal fields to JSON, %v", err)
-	}
-	return append(serialized, '\n'), nil
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/logger.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/logger.go
deleted file mode 100644
index e4974bfbe..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/logger.go
+++ /dev/null
@@ -1,206 +0,0 @@
-package logrus
-
-import (
-	"io"
-	"os"
-	"sync"
-)
-
-type Logger struct {
-	// The logs are `io.Copy`'d to this in a mutex. It's common to set this to a
-	// file, or leave it default which is `os.Stdout`. You can also set this to
-	// something more adventorous, such as logging to Kafka.
-	Out io.Writer
-	// Hooks for the logger instance. These allow firing events based on logging
-	// levels and log entries. For example, to send errors to an error tracking
-	// service, log to StatsD or dump the core on fatal errors.
-	Hooks LevelHooks
-	// All log entries pass through the formatter before logged to Out. The
-	// included formatters are `TextFormatter` and `JSONFormatter` for which
-	// TextFormatter is the default. In development (when a TTY is attached) it
-	// logs with colors, but to a file it wouldn't. You can easily implement your
-	// own that implements the `Formatter` interface, see the `README` or included
-	// formatters for examples.
-	Formatter Formatter
-	// The logging level the logger should log at. This is typically (and defaults
-	// to) `logrus.Info`, which allows Info(), Warn(), Error() and Fatal() to be
-	// logged. `logrus.Debug` is useful in
-	Level Level
-	// Used to sync writing to the log.
-	mu sync.Mutex
-}
-
-// Creates a new logger. Configuration should be set by changing `Formatter`,
-// `Out` and `Hooks` directly on the default logger instance. You can also just
-// instantiate your own:
-//
-//    var log = &Logger{
-//      Out: os.Stderr,
-//      Formatter: new(JSONFormatter),
-//      Hooks: make(LevelHooks),
-//      Level: logrus.DebugLevel,
-//    }
-//
-// It's recommended to make this a global instance called `log`.
-func New() *Logger {
-	return &Logger{
-		Out:       os.Stderr,
-		Formatter: new(TextFormatter),
-		Hooks:     make(LevelHooks),
-		Level:     InfoLevel,
-	}
-}
-
-// Adds a field to the log entry, note that you it doesn't log until you call
-// Debug, Print, Info, Warn, Fatal or Panic. It only creates a log entry.
-// Ff you want multiple fields, use `WithFields`.
-func (logger *Logger) WithField(key string, value interface{}) *Entry {
-	return NewEntry(logger).WithField(key, value)
-}
-
-// Adds a struct of fields to the log entry. All it does is call `WithField` for
-// each `Field`.
-func (logger *Logger) WithFields(fields Fields) *Entry {
-	return NewEntry(logger).WithFields(fields)
-}
-
-func (logger *Logger) Debugf(format string, args ...interface{}) {
-	if logger.Level >= DebugLevel {
-		NewEntry(logger).Debugf(format, args...)
-	}
-}
-
-func (logger *Logger) Infof(format string, args ...interface{}) {
-	if logger.Level >= InfoLevel {
-		NewEntry(logger).Infof(format, args...)
-	}
-}
-
-func (logger *Logger) Printf(format string, args ...interface{}) {
-	NewEntry(logger).Printf(format, args...)
-}
-
-func (logger *Logger) Warnf(format string, args ...interface{}) {
-	if logger.Level >= WarnLevel {
-		NewEntry(logger).Warnf(format, args...)
-	}
-}
-
-func (logger *Logger) Warningf(format string, args ...interface{}) {
-	if logger.Level >= WarnLevel {
-		NewEntry(logger).Warnf(format, args...)
-	}
-}
-
-func (logger *Logger) Errorf(format string, args ...interface{}) {
-	if logger.Level >= ErrorLevel {
-		NewEntry(logger).Errorf(format, args...)
-	}
-}
-
-func (logger *Logger) Fatalf(format string, args ...interface{}) {
-	if logger.Level >= FatalLevel {
-		NewEntry(logger).Fatalf(format, args...)
-	}
-	os.Exit(1)
-}
-
-func (logger *Logger) Panicf(format string, args ...interface{}) {
-	if logger.Level >= PanicLevel {
-		NewEntry(logger).Panicf(format, args...)
-	}
-}
-
-func (logger *Logger) Debug(args ...interface{}) {
-	if logger.Level >= DebugLevel {
-		NewEntry(logger).Debug(args...)
-	}
-}
-
-func (logger *Logger) Info(args ...interface{}) {
-	if logger.Level >= InfoLevel {
-		NewEntry(logger).Info(args...)
-	}
-}
-
-func (logger *Logger) Print(args ...interface{}) {
-	NewEntry(logger).Info(args...)
-}
-
-func (logger *Logger) Warn(args ...interface{}) {
-	if logger.Level >= WarnLevel {
-		NewEntry(logger).Warn(args...)
-	}
-}
-
-func (logger *Logger) Warning(args ...interface{}) {
-	if logger.Level >= WarnLevel {
-		NewEntry(logger).Warn(args...)
-	}
-}
-
-func (logger *Logger) Error(args ...interface{}) {
-	if logger.Level >= ErrorLevel {
-		NewEntry(logger).Error(args...)
-	}
-}
-
-func (logger *Logger) Fatal(args ...interface{}) {
-	if logger.Level >= FatalLevel {
-		NewEntry(logger).Fatal(args...)
-	}
-	os.Exit(1)
-}
-
-func (logger *Logger) Panic(args ...interface{}) {
-	if logger.Level >= PanicLevel {
-		NewEntry(logger).Panic(args...)
-	}
-}
-
-func (logger *Logger) Debugln(args ...interface{}) {
-	if logger.Level >= DebugLevel {
-		NewEntry(logger).Debugln(args...)
-	}
-}
-
-func (logger *Logger) Infoln(args ...interface{}) {
-	if logger.Level >= InfoLevel {
-		NewEntry(logger).Infoln(args...)
-	}
-}
-
-func (logger *Logger) Println(args ...interface{}) {
-	NewEntry(logger).Println(args...)
-}
-
-func (logger *Logger) Warnln(args ...interface{}) {
-	if logger.Level >= WarnLevel {
-		NewEntry(logger).Warnln(args...)
-	}
-}
-
-func (logger *Logger) Warningln(args ...interface{}) {
-	if logger.Level >= WarnLevel {
-		NewEntry(logger).Warnln(args...)
-	}
-}
-
-func (logger *Logger) Errorln(args ...interface{}) {
-	if logger.Level >= ErrorLevel {
-		NewEntry(logger).Errorln(args...)
-	}
-}
-
-func (logger *Logger) Fatalln(args ...interface{}) {
-	if logger.Level >= FatalLevel {
-		NewEntry(logger).Fatalln(args...)
-	}
-	os.Exit(1)
-}
-
-func (logger *Logger) Panicln(args ...interface{}) {
-	if logger.Level >= PanicLevel {
-		NewEntry(logger).Panicln(args...)
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/logrus.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/logrus.go
deleted file mode 100644
index 43ee12e90..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/logrus.go
+++ /dev/null
@@ -1,94 +0,0 @@
-package logrus
-
-import (
-	"fmt"
-	"log"
-)
-
-// Fields type, used to pass to `WithFields`.
-type Fields map[string]interface{}
-
-// Level type
-type Level uint8
-
-// Convert the Level to a string. E.g. PanicLevel becomes "panic".
-func (level Level) String() string {
-	switch level {
-	case DebugLevel:
-		return "debug"
-	case InfoLevel:
-		return "info"
-	case WarnLevel:
-		return "warning"
-	case ErrorLevel:
-		return "error"
-	case FatalLevel:
-		return "fatal"
-	case PanicLevel:
-		return "panic"
-	}
-
-	return "unknown"
-}
-
-// ParseLevel takes a string level and returns the Logrus log level constant.
-func ParseLevel(lvl string) (Level, error) {
-	switch lvl {
-	case "panic":
-		return PanicLevel, nil
-	case "fatal":
-		return FatalLevel, nil
-	case "error":
-		return ErrorLevel, nil
-	case "warn", "warning":
-		return WarnLevel, nil
-	case "info":
-		return InfoLevel, nil
-	case "debug":
-		return DebugLevel, nil
-	}
-
-	var l Level
-	return l, fmt.Errorf("not a valid logrus Level: %q", lvl)
-}
-
-// These are the different logging levels. You can set the logging level to log
-// on your instance of logger, obtained with `logrus.New()`.
-const (
-	// PanicLevel level, highest level of severity. Logs and then calls panic with the
-	// message passed to Debug, Info, ...
-	PanicLevel Level = iota
-	// FatalLevel level. Logs and then calls `os.Exit(1)`. It will exit even if the
-	// logging level is set to Panic.
-	FatalLevel
-	// ErrorLevel level. Logs. Used for errors that should definitely be noted.
-	// Commonly used for hooks to send errors to an error tracking service.
-	ErrorLevel
-	// WarnLevel level. Non-critical entries that deserve eyes.
-	WarnLevel
-	// InfoLevel level. General operational entries about what's going on inside the
-	// application.
-	InfoLevel
-	// DebugLevel level. Usually only enabled when debugging. Very verbose logging.
-	DebugLevel
-)
-
-// Won't compile if StdLogger can't be realized by a log.Logger
-var _ StdLogger = &log.Logger{}
-
-// StdLogger is what your logrus-enabled library should take, that way
-// it'll accept a stdlib logger and a logrus logger. There's no standard
-// interface, this is the closest we get, unfortunately.
-type StdLogger interface {
-	Print(...interface{})
-	Printf(string, ...interface{})
-	Println(...interface{})
-
-	Fatal(...interface{})
-	Fatalf(string, ...interface{})
-	Fatalln(...interface{})
-
-	Panic(...interface{})
-	Panicf(string, ...interface{})
-	Panicln(...interface{})
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/terminal_bsd.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/terminal_bsd.go
deleted file mode 100644
index 71f8d67a5..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/terminal_bsd.go
+++ /dev/null
@@ -1,9 +0,0 @@
-// +build darwin freebsd openbsd netbsd dragonfly
-
-package logrus
-
-import "syscall"
-
-const ioctlReadTermios = syscall.TIOCGETA
-
-type Termios syscall.Termios
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/terminal_linux.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/terminal_linux.go
deleted file mode 100644
index a2c0b40db..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/terminal_linux.go
+++ /dev/null
@@ -1,12 +0,0 @@
-// Based on ssh/terminal:
-// 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 logrus
-
-import "syscall"
-
-const ioctlReadTermios = syscall.TCGETS
-
-type Termios syscall.Termios
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/terminal_notwindows.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/terminal_notwindows.go
deleted file mode 100644
index 4bb537602..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/terminal_notwindows.go
+++ /dev/null
@@ -1,21 +0,0 @@
-// Based on ssh/terminal:
-// 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.
-
-// +build linux darwin freebsd openbsd netbsd dragonfly
-
-package logrus
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-// IsTerminal returns true if the given file descriptor is a terminal.
-func IsTerminal() bool {
-	fd := syscall.Stdout
-	var termios Termios
-	_, _, err := syscall.Syscall6(syscall.SYS_IOCTL, uintptr(fd), ioctlReadTermios, uintptr(unsafe.Pointer(&termios)), 0, 0, 0)
-	return err == 0
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/terminal_windows.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/terminal_windows.go
deleted file mode 100644
index 2e09f6f7e..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/terminal_windows.go
+++ /dev/null
@@ -1,27 +0,0 @@
-// Based on ssh/terminal:
-// 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.
-
-// +build windows
-
-package logrus
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-var kernel32 = syscall.NewLazyDLL("kernel32.dll")
-
-var (
-	procGetConsoleMode = kernel32.NewProc("GetConsoleMode")
-)
-
-// IsTerminal returns true if the given file descriptor is a terminal.
-func IsTerminal() bool {
-	fd := syscall.Stdout
-	var st uint32
-	r, _, e := syscall.Syscall(procGetConsoleMode.Addr(), 2, uintptr(fd), uintptr(unsafe.Pointer(&st)), 0)
-	return r != 0 && e == 0
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/text_formatter.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/text_formatter.go
deleted file mode 100644
index 06ef20233..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/text_formatter.go
+++ /dev/null
@@ -1,161 +0,0 @@
-package logrus
-
-import (
-	"bytes"
-	"fmt"
-	"runtime"
-	"sort"
-	"strings"
-	"time"
-)
-
-const (
-	nocolor = 0
-	red     = 31
-	green   = 32
-	yellow  = 33
-	blue    = 34
-	gray    = 37
-)
-
-var (
-	baseTimestamp time.Time
-	isTerminal    bool
-)
-
-func init() {
-	baseTimestamp = time.Now()
-	isTerminal = IsTerminal()
-}
-
-func miniTS() int {
-	return int(time.Since(baseTimestamp) / time.Second)
-}
-
-type TextFormatter struct {
-	// Set to true to bypass checking for a TTY before outputting colors.
-	ForceColors bool
-
-	// Force disabling colors.
-	DisableColors bool
-
-	// Disable timestamp logging. useful when output is redirected to logging
-	// system that already adds timestamps.
-	DisableTimestamp bool
-
-	// Enable logging the full timestamp when a TTY is attached instead of just
-	// the time passed since beginning of execution.
-	FullTimestamp bool
-
-	// TimestampFormat to use for display when a full timestamp is printed
-	TimestampFormat string
-
-	// The fields are sorted by default for a consistent output. For applications
-	// that log extremely frequently and don't use the JSON formatter this may not
-	// be desired.
-	DisableSorting bool
-}
-
-func (f *TextFormatter) Format(entry *Entry) ([]byte, error) {
-	var keys []string = make([]string, 0, len(entry.Data))
-	for k := range entry.Data {
-		keys = append(keys, k)
-	}
-
-	if !f.DisableSorting {
-		sort.Strings(keys)
-	}
-
-	b := &bytes.Buffer{}
-
-	prefixFieldClashes(entry.Data)
-
-	isColorTerminal := isTerminal && (runtime.GOOS != "windows")
-	isColored := (f.ForceColors || isColorTerminal) && !f.DisableColors
-
-	timestampFormat := f.TimestampFormat
-	if timestampFormat == "" {
-		timestampFormat = DefaultTimestampFormat
-	}
-	if isColored {
-		f.printColored(b, entry, keys, timestampFormat)
-	} else {
-		if !f.DisableTimestamp {
-			f.appendKeyValue(b, "time", entry.Time.Format(timestampFormat))
-		}
-		f.appendKeyValue(b, "level", entry.Level.String())
-		if entry.Message != "" {
-			f.appendKeyValue(b, "msg", entry.Message)
-		}
-		for _, key := range keys {
-			f.appendKeyValue(b, key, entry.Data[key])
-		}
-	}
-
-	b.WriteByte('\n')
-	return b.Bytes(), nil
-}
-
-func (f *TextFormatter) printColored(b *bytes.Buffer, entry *Entry, keys []string, timestampFormat string) {
-	var levelColor int
-	switch entry.Level {
-	case DebugLevel:
-		levelColor = gray
-	case WarnLevel:
-		levelColor = yellow
-	case ErrorLevel, FatalLevel, PanicLevel:
-		levelColor = red
-	default:
-		levelColor = blue
-	}
-
-	levelText := strings.ToUpper(entry.Level.String())[0:4]
-
-	if !f.FullTimestamp {
-		fmt.Fprintf(b, "\x1b[%dm%s\x1b[0m[%04d] %-44s ", levelColor, levelText, miniTS(), entry.Message)
-	} else {
-		fmt.Fprintf(b, "\x1b[%dm%s\x1b[0m[%s] %-44s ", levelColor, levelText, entry.Time.Format(timestampFormat), entry.Message)
-	}
-	for _, k := range keys {
-		v := entry.Data[k]
-		fmt.Fprintf(b, " \x1b[%dm%s\x1b[0m=%+v", levelColor, k, v)
-	}
-}
-
-func needsQuoting(text string) bool {
-	for _, ch := range text {
-		if !((ch >= 'a' && ch <= 'z') ||
-			(ch >= 'A' && ch <= 'Z') ||
-			(ch >= '0' && ch <= '9') ||
-			ch == '-' || ch == '.') {
-			return false
-		}
-	}
-	return true
-}
-
-func (f *TextFormatter) appendKeyValue(b *bytes.Buffer, key string, value interface{}) {
-
-	b.WriteString(key)
-	b.WriteByte('=')
-
-	switch value := value.(type) {
-	case string:
-		if needsQuoting(value) {
-			b.WriteString(value)
-		} else {
-			fmt.Fprintf(b, "%q", value)
-		}
-	case error:
-		errmsg := value.Error()
-		if needsQuoting(errmsg) {
-			b.WriteString(errmsg)
-		} else {
-			fmt.Fprintf(b, "%q", value)
-		}
-	default:
-		fmt.Fprint(b, value)
-	}
-
-	b.WriteByte(' ')
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/writer.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/writer.go
deleted file mode 100644
index 1e30b1c75..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/writer.go
+++ /dev/null
@@ -1,31 +0,0 @@
-package logrus
-
-import (
-	"bufio"
-	"io"
-	"runtime"
-)
-
-func (logger *Logger) Writer() *io.PipeWriter {
-	reader, writer := io.Pipe()
-
-	go logger.writerScanner(reader)
-	runtime.SetFinalizer(writer, writerFinalizer)
-
-	return writer
-}
-
-func (logger *Logger) writerScanner(reader *io.PipeReader) {
-	scanner := bufio.NewScanner(reader)
-	for scanner.Scan() {
-		logger.Print(scanner.Text())
-	}
-	if err := scanner.Err(); err != nil {
-		logger.Errorf("Error while reading from Writer: %s", err)
-	}
-	reader.Close()
-}
-
-func writerFinalizer(writer *io.PipeWriter) {
-	writer.Close()
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/distribution/registry/api/errcode/errors.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/distribution/registry/api/errcode/errors.go
deleted file mode 100644
index fdaddbcf8..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/distribution/registry/api/errcode/errors.go
+++ /dev/null
@@ -1,259 +0,0 @@
-package errcode
-
-import (
-	"encoding/json"
-	"fmt"
-	"strings"
-)
-
-// ErrorCoder is the base interface for ErrorCode and Error allowing
-// users of each to just call ErrorCode to get the real ID of each
-type ErrorCoder interface {
-	ErrorCode() ErrorCode
-}
-
-// ErrorCode represents the error type. The errors are serialized via strings
-// and the integer format may change and should *never* be exported.
-type ErrorCode int
-
-var _ error = ErrorCode(0)
-
-// ErrorCode just returns itself
-func (ec ErrorCode) ErrorCode() ErrorCode {
-	return ec
-}
-
-// Error returns the ID/Value
-func (ec ErrorCode) Error() string {
-	return ec.Descriptor().Value
-}
-
-// Descriptor returns the descriptor for the error code.
-func (ec ErrorCode) Descriptor() ErrorDescriptor {
-	d, ok := errorCodeToDescriptors[ec]
-
-	if !ok {
-		return ErrorCodeUnknown.Descriptor()
-	}
-
-	return d
-}
-
-// String returns the canonical identifier for this error code.
-func (ec ErrorCode) String() string {
-	return ec.Descriptor().Value
-}
-
-// Message returned the human-readable error message for this error code.
-func (ec ErrorCode) Message() string {
-	return ec.Descriptor().Message
-}
-
-// MarshalText encodes the receiver into UTF-8-encoded text and returns the
-// result.
-func (ec ErrorCode) MarshalText() (text []byte, err error) {
-	return []byte(ec.String()), nil
-}
-
-// UnmarshalText decodes the form generated by MarshalText.
-func (ec *ErrorCode) UnmarshalText(text []byte) error {
-	desc, ok := idToDescriptors[string(text)]
-
-	if !ok {
-		desc = ErrorCodeUnknown.Descriptor()
-	}
-
-	*ec = desc.Code
-
-	return nil
-}
-
-// WithDetail creates a new Error struct based on the passed-in info and
-// set the Detail property appropriately
-func (ec ErrorCode) WithDetail(detail interface{}) Error {
-	return Error{
-		Code:    ec,
-		Message: ec.Message(),
-	}.WithDetail(detail)
-}
-
-// WithArgs creates a new Error struct and sets the Args slice
-func (ec ErrorCode) WithArgs(args ...interface{}) Error {
-	return Error{
-		Code:    ec,
-		Message: ec.Message(),
-	}.WithArgs(args...)
-}
-
-// Error provides a wrapper around ErrorCode with extra Details provided.
-type Error struct {
-	Code    ErrorCode   `json:"code"`
-	Message string      `json:"message"`
-	Detail  interface{} `json:"detail,omitempty"`
-
-	// TODO(duglin): See if we need an "args" property so we can do the
-	// variable substitution right before showing the message to the user
-}
-
-var _ error = Error{}
-
-// ErrorCode returns the ID/Value of this Error
-func (e Error) ErrorCode() ErrorCode {
-	return e.Code
-}
-
-// Error returns a human readable representation of the error.
-func (e Error) Error() string {
-	return fmt.Sprintf("%s: %s",
-		strings.ToLower(strings.Replace(e.Code.String(), "_", " ", -1)),
-		e.Message)
-}
-
-// WithDetail will return a new Error, based on the current one, but with
-// some Detail info added
-func (e Error) WithDetail(detail interface{}) Error {
-	return Error{
-		Code:    e.Code,
-		Message: e.Message,
-		Detail:  detail,
-	}
-}
-
-// WithArgs uses the passed-in list of interface{} as the substitution
-// variables in the Error's Message string, but returns a new Error
-func (e Error) WithArgs(args ...interface{}) Error {
-	return Error{
-		Code:    e.Code,
-		Message: fmt.Sprintf(e.Code.Message(), args...),
-		Detail:  e.Detail,
-	}
-}
-
-// ErrorDescriptor provides relevant information about a given error code.
-type ErrorDescriptor struct {
-	// Code is the error code that this descriptor describes.
-	Code ErrorCode
-
-	// Value provides a unique, string key, often captilized with
-	// underscores, to identify the error code. This value is used as the
-	// keyed value when serializing api errors.
-	Value string
-
-	// Message is a short, human readable decription of the error condition
-	// included in API responses.
-	Message string
-
-	// Description provides a complete account of the errors purpose, suitable
-	// for use in documentation.
-	Description string
-
-	// HTTPStatusCode provides the http status code that is associated with
-	// this error condition.
-	HTTPStatusCode int
-}
-
-// ParseErrorCode returns the value by the string error code.
-// `ErrorCodeUnknown` will be returned if the error is not known.
-func ParseErrorCode(value string) ErrorCode {
-	ed, ok := idToDescriptors[value]
-	if ok {
-		return ed.Code
-	}
-
-	return ErrorCodeUnknown
-}
-
-// Errors provides the envelope for multiple errors and a few sugar methods
-// for use within the application.
-type Errors []error
-
-var _ error = Errors{}
-
-func (errs Errors) Error() string {
-	switch len(errs) {
-	case 0:
-		return "<nil>"
-	case 1:
-		return errs[0].Error()
-	default:
-		msg := "errors:\n"
-		for _, err := range errs {
-			msg += err.Error() + "\n"
-		}
-		return msg
-	}
-}
-
-// Len returns the current number of errors.
-func (errs Errors) Len() int {
-	return len(errs)
-}
-
-// MarshalJSON converts slice of error, ErrorCode or Error into a
-// slice of Error - then serializes
-func (errs Errors) MarshalJSON() ([]byte, error) {
-	var tmpErrs struct {
-		Errors []Error `json:"errors,omitempty"`
-	}
-
-	for _, daErr := range errs {
-		var err Error
-
-		switch daErr.(type) {
-		case ErrorCode:
-			err = daErr.(ErrorCode).WithDetail(nil)
-		case Error:
-			err = daErr.(Error)
-		default:
-			err = ErrorCodeUnknown.WithDetail(daErr)
-
-		}
-
-		// If the Error struct was setup and they forgot to set the
-		// Message field (meaning its "") then grab it from the ErrCode
-		msg := err.Message
-		if msg == "" {
-			msg = err.Code.Message()
-		}
-
-		tmpErrs.Errors = append(tmpErrs.Errors, Error{
-			Code:    err.Code,
-			Message: msg,
-			Detail:  err.Detail,
-		})
-	}
-
-	return json.Marshal(tmpErrs)
-}
-
-// UnmarshalJSON deserializes []Error and then converts it into slice of
-// Error or ErrorCode
-func (errs *Errors) UnmarshalJSON(data []byte) error {
-	var tmpErrs struct {
-		Errors []Error
-	}
-
-	if err := json.Unmarshal(data, &tmpErrs); err != nil {
-		return err
-	}
-
-	var newErrs Errors
-	for _, daErr := range tmpErrs.Errors {
-		// If Message is empty or exactly matches the Code's message string
-		// then just use the Code, no need for a full Error struct
-		if daErr.Detail == nil && (daErr.Message == "" || daErr.Message == daErr.Code.Message()) {
-			// Error's w/o details get converted to ErrorCode
-			newErrs = append(newErrs, daErr.Code)
-		} else {
-			// Error's w/ details are untouched
-			newErrs = append(newErrs, Error{
-				Code:    daErr.Code,
-				Message: daErr.Message,
-				Detail:  daErr.Detail,
-			})
-		}
-	}
-
-	*errs = newErrs
-	return nil
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/distribution/registry/api/errcode/handler.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/distribution/registry/api/errcode/handler.go
deleted file mode 100644
index 49a64a86e..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/distribution/registry/api/errcode/handler.go
+++ /dev/null
@@ -1,44 +0,0 @@
-package errcode
-
-import (
-	"encoding/json"
-	"net/http"
-)
-
-// ServeJSON attempts to serve the errcode in a JSON envelope. It marshals err
-// and sets the content-type header to 'application/json'. It will handle
-// ErrorCoder and Errors, and if necessary will create an envelope.
-func ServeJSON(w http.ResponseWriter, err error) error {
-	w.Header().Set("Content-Type", "application/json; charset=utf-8")
-	var sc int
-
-	switch errs := err.(type) {
-	case Errors:
-		if len(errs) < 1 {
-			break
-		}
-
-		if err, ok := errs[0].(ErrorCoder); ok {
-			sc = err.ErrorCode().Descriptor().HTTPStatusCode
-		}
-	case ErrorCoder:
-		sc = errs.ErrorCode().Descriptor().HTTPStatusCode
-		err = Errors{err} // create an envelope.
-	default:
-		// We just have an unhandled error type, so just place in an envelope
-		// and move along.
-		err = Errors{err}
-	}
-
-	if sc == 0 {
-		sc = http.StatusInternalServerError
-	}
-
-	w.WriteHeader(sc)
-
-	if err := json.NewEncoder(w).Encode(err); err != nil {
-		return err
-	}
-
-	return nil
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/distribution/registry/api/errcode/register.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/distribution/registry/api/errcode/register.go
deleted file mode 100644
index 01c34384b..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/distribution/registry/api/errcode/register.go
+++ /dev/null
@@ -1,128 +0,0 @@
-package errcode
-
-import (
-	"fmt"
-	"net/http"
-	"sort"
-	"sync"
-)
-
-var (
-	errorCodeToDescriptors = map[ErrorCode]ErrorDescriptor{}
-	idToDescriptors        = map[string]ErrorDescriptor{}
-	groupToDescriptors     = map[string][]ErrorDescriptor{}
-)
-
-var (
-	// ErrorCodeUnknown is a generic error that can be used as a last
-	// resort if there is no situation-specific error message that can be used
-	ErrorCodeUnknown = Register("errcode", ErrorDescriptor{
-		Value:   "UNKNOWN",
-		Message: "unknown error",
-		Description: `Generic error returned when the error does not have an
-			                                            API classification.`,
-		HTTPStatusCode: http.StatusInternalServerError,
-	})
-
-	// ErrorCodeUnsupported is returned when an operation is not supported.
-	ErrorCodeUnsupported = Register("errcode", ErrorDescriptor{
-		Value:   "UNSUPPORTED",
-		Message: "The operation is unsupported.",
-		Description: `The operation was unsupported due to a missing
-		implementation or invalid set of parameters.`,
-		HTTPStatusCode: http.StatusMethodNotAllowed,
-	})
-
-	// ErrorCodeUnauthorized is returned if a request requires
-	// authentication.
-	ErrorCodeUnauthorized = Register("errcode", ErrorDescriptor{
-		Value:   "UNAUTHORIZED",
-		Message: "authentication required",
-		Description: `The access controller was unable to authenticate
-		the client. Often this will be accompanied by a
-		Www-Authenticate HTTP response header indicating how to
-		authenticate.`,
-		HTTPStatusCode: http.StatusUnauthorized,
-	})
-
-	// ErrorCodeDenied is returned if a client does not have sufficient
-	// permission to perform an action.
-	ErrorCodeDenied = Register("errcode", ErrorDescriptor{
-		Value:   "DENIED",
-		Message: "requested access to the resource is denied",
-		Description: `The access controller denied access for the
-		operation on a resource.`,
-		HTTPStatusCode: http.StatusForbidden,
-	})
-
-	// ErrorCodeUnavailable provides a common error to report unavialability
-	// of a service or endpoint.
-	ErrorCodeUnavailable = Register("errcode", ErrorDescriptor{
-		Value:          "UNAVAILABLE",
-		Message:        "service unavailable",
-		Description:    "Returned when a service is not available",
-		HTTPStatusCode: http.StatusServiceUnavailable,
-	})
-)
-
-var nextCode = 1000
-var registerLock sync.Mutex
-
-// Register will make the passed-in error known to the environment and
-// return a new ErrorCode
-func Register(group string, descriptor ErrorDescriptor) ErrorCode {
-	registerLock.Lock()
-	defer registerLock.Unlock()
-
-	descriptor.Code = ErrorCode(nextCode)
-
-	if _, ok := idToDescriptors[descriptor.Value]; ok {
-		panic(fmt.Sprintf("ErrorValue %q is already registered", descriptor.Value))
-	}
-	if _, ok := errorCodeToDescriptors[descriptor.Code]; ok {
-		panic(fmt.Sprintf("ErrorCode %v is already registered", descriptor.Code))
-	}
-
-	groupToDescriptors[group] = append(groupToDescriptors[group], descriptor)
-	errorCodeToDescriptors[descriptor.Code] = descriptor
-	idToDescriptors[descriptor.Value] = descriptor
-
-	nextCode++
-	return descriptor.Code
-}
-
-type byValue []ErrorDescriptor
-
-func (a byValue) Len() int           { return len(a) }
-func (a byValue) Swap(i, j int)      { a[i], a[j] = a[j], a[i] }
-func (a byValue) Less(i, j int) bool { return a[i].Value < a[j].Value }
-
-// GetGroupNames returns the list of Error group names that are registered
-func GetGroupNames() []string {
-	keys := []string{}
-
-	for k := range groupToDescriptors {
-		keys = append(keys, k)
-	}
-	sort.Strings(keys)
-	return keys
-}
-
-// GetErrorCodeGroup returns the named group of error descriptors
-func GetErrorCodeGroup(name string) []ErrorDescriptor {
-	desc := groupToDescriptors[name]
-	sort.Sort(byValue(desc))
-	return desc
-}
-
-// GetErrorAllDescriptors returns a slice of all ErrorDescriptors that are
-// registered, irrespective of what group they're in
-func GetErrorAllDescriptors() []ErrorDescriptor {
-	result := []ErrorDescriptor{}
-
-	for _, group := range GetGroupNames() {
-		result = append(result, GetErrorCodeGroup(group)...)
-	}
-	sort.Sort(byValue(result))
-	return result
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/errors/README.md b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/errors/README.md
deleted file mode 100644
index 81fa04ccc..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/errors/README.md
+++ /dev/null
@@ -1,58 +0,0 @@
-Docker 'errors' package
-=======================
-
-This package contains all of the error messages generated by the Docker
-engine that might be exposed via the Docker engine's REST API.
-
-Each top-level engine package will have its own file in this directory
-so that there's a clear grouping of errors, instead of just one big
-file. The errors for each package are defined here instead of within
-their respective package structure so that Docker CLI code that may need
-to import these error definition files will not need to know or understand
-the engine's package/directory structure. In other words, all they should
-need to do is import `.../docker/errors` and they will automatically
-pick up all Docker engine defined errors.  This also gives the engine
-developers the freedom to change the engine packaging structure (e.g. to
-CRUD packages) without worrying about breaking existing clients.
-
-These errors are defined using the 'errcode' package. The `errcode`  package
-allows for each error to be typed and include all information necessary to
-have further processing done on them if necessary.  In particular, each error
-includes:
-
-* Value - a unique string (in all caps) associated with this error.
-Typically, this string is the same name as the variable name of the error
-(w/o the `ErrorCode` text) but in all caps.
-
-* Message - the human readable sentence that will be displayed for this
-error. It can contain '%s' substitutions that allows for the code generating
-the error to specify values that will be inserted in the string prior to
-being displayed to the end-user. The `WithArgs()` function can be used to
-specify the insertion strings.  Note, the evaluation of the strings will be
-done at the time `WithArgs()` is called.
-
-* Description - additional human readable text to further explain the
-circumstances of the error situation.
-
-* HTTPStatusCode - when the error is returned back to a CLI, this value
-will be used to populate the HTTP status code. If not present the default
-value will be `StatusInternalServerError`, 500.
-
-Not all errors generated within the engine's executable will be propagated
-back to the engine's API layer. For example, it is expected that errors
-generated by vendored code (under `docker/vendor`) and packaged code
-(under `docker/pkg`) will be converted into errors defined by this package.
-
-When processing an errcode error, if you are looking for a particular
-error then you can do something like:
-
-```
-import derr "github.com/docker/docker/errors"
-
-...
-
-err := someFunc()
-if err.ErrorCode() == derr.ErrorCodeNoSuchContainer {
-	...
-}
-```
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/errors/builder.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/errors/builder.go
deleted file mode 100644
index 07a33bbf7..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/errors/builder.go
+++ /dev/null
@@ -1,93 +0,0 @@
-package errors
-
-// This file contains all of the errors that can be generated from the
-// docker/builder component.
-
-import (
-	"net/http"
-
-	"github.com/fsouza/go-dockerclient/external/github.com/docker/distribution/registry/api/errcode"
-)
-
-var (
-	// ErrorCodeAtLeastOneArg is generated when the parser comes across a
-	// Dockerfile command that doesn't have any args.
-	ErrorCodeAtLeastOneArg = errcode.Register(errGroup, errcode.ErrorDescriptor{
-		Value:          "ATLEASTONEARG",
-		Message:        "%s requires at least one argument",
-		Description:    "The specified command requires at least one argument",
-		HTTPStatusCode: http.StatusInternalServerError,
-	})
-
-	// ErrorCodeExactlyOneArg is generated when the parser comes across a
-	// Dockerfile command that requires exactly one arg but got less/more.
-	ErrorCodeExactlyOneArg = errcode.Register(errGroup, errcode.ErrorDescriptor{
-		Value:          "EXACTLYONEARG",
-		Message:        "%s requires exactly one argument",
-		Description:    "The specified command requires exactly one argument",
-		HTTPStatusCode: http.StatusInternalServerError,
-	})
-
-	// ErrorCodeAtLeastTwoArgs is generated when the parser comes across a
-	// Dockerfile command that requires at least two args but got less.
-	ErrorCodeAtLeastTwoArgs = errcode.Register(errGroup, errcode.ErrorDescriptor{
-		Value:          "ATLEASTTWOARGS",
-		Message:        "%s requires at least two arguments",
-		Description:    "The specified command requires at least two arguments",
-		HTTPStatusCode: http.StatusInternalServerError,
-	})
-
-	// ErrorCodeTooManyArgs is generated when the parser comes across a
-	// Dockerfile command that has more args than it should
-	ErrorCodeTooManyArgs = errcode.Register(errGroup, errcode.ErrorDescriptor{
-		Value:          "TOOMANYARGS",
-		Message:        "Bad input to %s, too many args",
-		Description:    "The specified command was passed too many arguments",
-		HTTPStatusCode: http.StatusInternalServerError,
-	})
-
-	// ErrorCodeChainOnBuild is generated when the parser comes across a
-	// Dockerfile command that is trying to chain ONBUILD commands.
-	ErrorCodeChainOnBuild = errcode.Register(errGroup, errcode.ErrorDescriptor{
-		Value:          "CHAINONBUILD",
-		Message:        "Chaining ONBUILD via `ONBUILD ONBUILD` isn't allowed",
-		Description:    "ONBUILD Dockerfile commands aren't allow on ONBUILD commands",
-		HTTPStatusCode: http.StatusInternalServerError,
-	})
-
-	// ErrorCodeBadOnBuildCmd is generated when the parser comes across a
-	// an ONBUILD Dockerfile command with an invalid trigger/command.
-	ErrorCodeBadOnBuildCmd = errcode.Register(errGroup, errcode.ErrorDescriptor{
-		Value:          "BADONBUILDCMD",
-		Message:        "%s isn't allowed as an ONBUILD trigger",
-		Description:    "The specified ONBUILD command isn't allowed",
-		HTTPStatusCode: http.StatusInternalServerError,
-	})
-
-	// ErrorCodeMissingFrom is generated when the Dockerfile is missing
-	// a FROM command.
-	ErrorCodeMissingFrom = errcode.Register(errGroup, errcode.ErrorDescriptor{
-		Value:          "MISSINGFROM",
-		Message:        "Please provide a source image with `from` prior to run",
-		Description:    "The Dockerfile is missing a FROM command",
-		HTTPStatusCode: http.StatusInternalServerError,
-	})
-
-	// ErrorCodeNotOnWindows is generated when the specified Dockerfile
-	// command is not supported on Windows.
-	ErrorCodeNotOnWindows = errcode.Register(errGroup, errcode.ErrorDescriptor{
-		Value:          "NOTONWINDOWS",
-		Message:        "%s is not supported on Windows",
-		Description:    "The specified Dockerfile command is not supported on Windows",
-		HTTPStatusCode: http.StatusInternalServerError,
-	})
-
-	// ErrorCodeVolumeEmpty is generated when the specified Volume string
-	// is empty.
-	ErrorCodeVolumeEmpty = errcode.Register(errGroup, errcode.ErrorDescriptor{
-		Value:          "VOLUMEEMPTY",
-		Message:        "Volume specified can not be an empty string",
-		Description:    "The specified volume can not be an empty string",
-		HTTPStatusCode: http.StatusInternalServerError,
-	})
-)
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/errors/daemon.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/errors/daemon.go
deleted file mode 100644
index 29d077a9a..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/errors/daemon.go
+++ /dev/null
@@ -1,925 +0,0 @@
-package errors
-
-// This file contains all of the errors that can be generated from the
-// docker/daemon component.
-
-import (
-	"net/http"
-
-	"github.com/fsouza/go-dockerclient/external/github.com/docker/distribution/registry/api/errcode"
-)
-
-var (
-	// ErrorCodeNoSuchContainer is generated when we look for a container by
-	// name or ID and we can't find it.
-	ErrorCodeNoSuchContainer = errcode.Register(errGroup, errcode.ErrorDescriptor{
-		Value:          "NOSUCHCONTAINER",
-		Message:        "no such id: %s",
-		Description:    "The specified container can not be found",
-		HTTPStatusCode: http.StatusNotFound,
-	})
-
-	// ErrorCodeUnregisteredContainer is generated when we try to load
-	// a storage driver for an unregistered container
-	ErrorCodeUnregisteredContainer = errcode.Register(errGroup, errcode.ErrorDescriptor{
-		Value:          "UNREGISTEREDCONTAINER",
-		Message:        "Can't load storage driver for unregistered container %s",
-		Description:    "An attempt was made to load the storage driver for a container that is not registered with the daemon",
-		HTTPStatusCode: http.StatusInternalServerError,
-	})
-
-	// ErrorCodeContainerBeingRemoved is generated when an attempt to start
-	// a container is made but its in the process of being removed, or is dead.
-	ErrorCodeContainerBeingRemoved = errcode.Register(errGroup, errcode.ErrorDescriptor{
-		Value:          "CONTAINERBEINGREMOVED",
-		Message:        "Container is marked for removal and cannot be started.",
-		Description:    "An attempt was made to start a container that is in the process of being deleted",
-		HTTPStatusCode: http.StatusInternalServerError,
-	})
-
-	// ErrorCodeUnpauseContainer is generated when we attempt to stop a
-	// container but its paused.
-	ErrorCodeUnpauseContainer = errcode.Register(errGroup, errcode.ErrorDescriptor{
-		Value:          "UNPAUSECONTAINER",
-		Message:        "Container %s is paused. Unpause the container before stopping",
-		Description:    "The specified container is paused, before it can be stopped it must be unpaused",
-		HTTPStatusCode: http.StatusInternalServerError,
-	})
-
-	// ErrorCodeAlreadyPaused is generated when we attempt to pause a
-	// container when its already paused.
-	ErrorCodeAlreadyPaused = errcode.Register(errGroup, errcode.ErrorDescriptor{
-		Value:          "ALREADYPAUSED",
-		Message:        "Container %s is already paused",
-		Description:    "The specified container is already in the paused state",
-		HTTPStatusCode: http.StatusInternalServerError,
-	})
-
-	// ErrorCodeNotPaused is generated when we attempt to unpause a
-	// container when its not paused.
-	ErrorCodeNotPaused = errcode.Register(errGroup, errcode.ErrorDescriptor{
-		Value:          "NOTPAUSED",
-		Message:        "Container %s is not paused",
-		Description:    "The specified container can not be unpaused because it is not in a paused state",
-		HTTPStatusCode: http.StatusInternalServerError,
-	})
-
-	// ErrorCodeImageUnregContainer is generated when we attempt to get the
-	// image of an unknown/unregistered container.
-	ErrorCodeImageUnregContainer = errcode.Register(errGroup, errcode.ErrorDescriptor{
-		Value:          "IMAGEUNREGCONTAINER",
-		Message:        "Can't get image of unregistered container",
-		Description:    "An attempt to retrieve the image of a container was made but the container is not registered",
-		HTTPStatusCode: http.StatusInternalServerError,
-	})
-
-	// ErrorCodeEmptyID is generated when an ID is the emptry string.
-	ErrorCodeEmptyID = errcode.Register(errGroup, errcode.ErrorDescriptor{
-		Value:          "EMPTYID",
-		Message:        "Invalid empty id",
-		Description:    "An attempt was made to register a container but the container's ID can not be an empty string",
-		HTTPStatusCode: http.StatusInternalServerError,
-	})
-
-	// ErrorCodeLoggingFactory is generated when we could not load the
-	// log driver.
-	ErrorCodeLoggingFactory = errcode.Register(errGroup, errcode.ErrorDescriptor{
-		Value:          "LOGGINGFACTORY",
-		Message:        "Failed to get logging factory: %v",
-		Description:    "An attempt was made to register a container but the container's ID can not be an empty string",
-		HTTPStatusCode: http.StatusInternalServerError,
-	})
-
-	// ErrorCodeInitLogger is generated when we could not initialize
-	// the logging driver.
-	ErrorCodeInitLogger = errcode.Register(errGroup, errcode.ErrorDescriptor{
-		Value:          "INITLOGGER",
-		Message:        "Failed to initialize logging driver: %v",
-		Description:    "An error occurred while trying to initialize the logging driver",
-		HTTPStatusCode: http.StatusInternalServerError,
-	})
-
-	// ErrorCodeNotRunning is generated when we need to verify that
-	// a container is running, but its not.
-	ErrorCodeNotRunning = errcode.Register(errGroup, errcode.ErrorDescriptor{
-		Value:          "NOTRUNNING",
-		Message:        "Container %s is not running",
-		Description:    "The specified action can not be taken due to the container not being in a running state",
-		HTTPStatusCode: http.StatusInternalServerError,
-	})
-
-	// ErrorCodeLinkNotRunning is generated when we try to link to a
-	// container that is not running.
-	ErrorCodeLinkNotRunning = errcode.Register(errGroup, errcode.ErrorDescriptor{
-		Value:          "LINKNOTRUNNING",
-		Message:        "Cannot link to a non running container: %s AS %s",
-		Description:    "An attempt was made to link to a container but the container is not in a running state",
-		HTTPStatusCode: http.StatusInternalServerError,
-	})
-
-	// ErrorCodeDeviceInfo is generated when there is an error while trying
-	// to get info about a custom device.
-	// container that is not running.
-	ErrorCodeDeviceInfo = errcode.Register(errGroup, errcode.ErrorDescriptor{
-		Value:          "DEVICEINFO",
-		Message:        "error gathering device information while adding custom device %q: %s",
-		Description:    "There was an error while trying to retrieve the information about a custom device",
-		HTTPStatusCode: http.StatusInternalServerError,
-	})
-
-	// ErrorCodeEmptyEndpoint is generated when the endpoint for a port
-	// map is nil.
-	ErrorCodeEmptyEndpoint = errcode.Register(errGroup, errcode.ErrorDescriptor{
-		Value:          "EMPTYENDPOINT",
-		Message:        "invalid endpoint while building port map info",
-		Description:    "The specified endpoint for the port mapping is empty",
-		HTTPStatusCode: http.StatusInternalServerError,
-	})
-
-	// ErrorCodeEmptyNetwork is generated when the networkSettings for a port
-	// map is nil.
-	ErrorCodeEmptyNetwork = errcode.Register(errGroup, errcode.ErrorDescriptor{
-		Value:          "EMPTYNETWORK",
-		Message:        "invalid networksettings while building port map info",
-		Description:    "The specified endpoint for the port mapping is empty",
-		HTTPStatusCode: http.StatusInternalServerError,
-	})
-
-	// ErrorCodeParsingPort is generated when there is an error parsing
-	// a "port" string.
-	ErrorCodeParsingPort = errcode.Register(errGroup, errcode.ErrorDescriptor{
-		Value:          "PARSINGPORT",
-		Message:        "Error parsing Port value(%v):%v",
-		Description:    "There was an error while trying to parse the specified 'port' value",
-		HTTPStatusCode: http.StatusInternalServerError,
-	})
-
-	// ErrorCodeNoSandbox is generated when we can't find the specified
-	// sandbox(network) by ID.
-	ErrorCodeNoSandbox = errcode.Register(errGroup, errcode.ErrorDescriptor{
-		Value:          "NOSANDBOX",
-		Message:        "error locating sandbox id %s: %v",
-		Description:    "There was an error trying to located the specified networking sandbox",
-		HTTPStatusCode: http.StatusInternalServerError,
-	})
-
-	// ErrorCodeNetworkUpdate is generated when there is an error while
-	// trying update a network/sandbox config.
-	ErrorCodeNetworkUpdate = errcode.Register(errGroup, errcode.ErrorDescriptor{
-		Value:          "NETWORKUPDATE",
-		Message:        "Update network failed: %v",
-		Description:    "There was an error trying to update the configuration information of the specified network sandbox",
-		HTTPStatusCode: http.StatusInternalServerError,
-	})
-
-	// ErrorCodeNetworkRefresh is generated when there is an error while
-	// trying refresh a network/sandbox config.
-	ErrorCodeNetworkRefresh = errcode.Register(errGroup, errcode.ErrorDescriptor{
-		Value:          "NETWORKREFRESH",
-		Message:        "Update network failed: Failure in refresh sandbox %s: %v",
-		Description:    "There was an error trying to refresh the configuration information of the specified network sandbox",
-		HTTPStatusCode: http.StatusInternalServerError,
-	})
-
-	// ErrorCodeHostPort is generated when there was an error while trying
-	// to parse a "host/port" string.
-	ErrorCodeHostPort = errcode.Register(errGroup, errcode.ErrorDescriptor{
-		Value:          "HOSTPORT",
-		Message:        "Error parsing HostPort value(%s):%v",
-		Description:    "There was an error trying to parse the specified 'HostPort' value",
-		HTTPStatusCode: http.StatusInternalServerError,
-	})
-
-	// ErrorCodeNetworkConflict is generated when we try to publish a service
-	// in network mode.
-	ErrorCodeNetworkConflict = errcode.Register(errGroup, errcode.ErrorDescriptor{
-		Value:          "NETWORKCONFLICT",
-		Message:        "conflicting options: publishing a service and network mode",
-		Description:    "It is not possible to publish a service when it is in network mode",
-		HTTPStatusCode: http.StatusConflict,
-	})
-
-	// ErrorCodeJoinInfo is generated when we failed to update a container's
-	// join info.
-	ErrorCodeJoinInfo = errcode.Register(errGroup, errcode.ErrorDescriptor{
-		Value:          "JOININFO",
-		Message:        "Updating join info failed: %v",
-		Description:    "There was an error during an attempt update a container's join information",
-		HTTPStatusCode: http.StatusInternalServerError,
-	})
-
-	// ErrorCodeIPCRunning is generated when we try to join a container's
-	// IPC but its not running.
-	ErrorCodeIPCRunning = errcode.Register(errGroup, errcode.ErrorDescriptor{
-		Value:          "IPCRUNNING",
-		Message:        "cannot join IPC of a non running container: %s",
-		Description:    "An attempt was made to join the IPC of a container, but the container is not running",
-		HTTPStatusCode: http.StatusInternalServerError,
-	})
-
-	// ErrorCodeNotADir is generated when we try to create a directory
-	// but the path isn't a dir.
-	ErrorCodeNotADir = errcode.Register(errGroup, errcode.ErrorDescriptor{
-		Value:          "NOTADIR",
-		Message:        "Cannot mkdir: %s is not a directory",
-		Description:    "An attempt was made create a directory, but the location in which it is being created is not a directory",
-		HTTPStatusCode: http.StatusInternalServerError,
-	})
-
-	// ErrorCodeParseContainer is generated when the reference to a
-	// container doesn't include a ":" (another container).
-	ErrorCodeParseContainer = errcode.Register(errGroup, errcode.ErrorDescriptor{
-		Value:          "PARSECONTAINER",
-		Message:        "no container specified to join network",
-		Description:    "The specified reference to a container is missing a ':' as a separator between 'container' and 'name'/'id'",
-		HTTPStatusCode: http.StatusInternalServerError,
-	})
-
-	// ErrorCodeJoinSelf is generated when we try to network to ourselves.
-	ErrorCodeJoinSelf = errcode.Register(errGroup, errcode.ErrorDescriptor{
-		Value:          "JOINSELF",
-		Message:        "cannot join own network",
-		Description:    "An attempt was made to have a container join its own network",
-		HTTPStatusCode: http.StatusInternalServerError,
-	})
-
-	// ErrorCodeJoinRunning is generated when we try to network to ourselves.
-	ErrorCodeJoinRunning = errcode.Register(errGroup, errcode.ErrorDescriptor{
-		Value:          "JOINRUNNING",
-		Message:        "cannot join network of a non running container: %s",
-		Description:    "An attempt to join the network of a container, but that container isn't running",
-		HTTPStatusCode: http.StatusInternalServerError,
-	})
-
-	// ErrorCodeModeNotContainer is generated when we try to network to
-	// another container but the mode isn't 'container'.
-	ErrorCodeModeNotContainer = errcode.Register(errGroup, errcode.ErrorDescriptor{
-		Value:          "MODENOTCONTAINER",
-		Message:        "network mode not set to container",
-		Description:    "An attempt was made to connect to a container's network but the mode wasn't set to 'container'",
-		HTTPStatusCode: http.StatusInternalServerError,
-	})
-
-	// ErrorCodeRemovingVolume is generated when we try remove a mount
-	// point (volume) but fail.
-	ErrorCodeRemovingVolume = errcode.Register(errGroup, errcode.ErrorDescriptor{
-		Value:          "REMOVINGVOLUME",
-		Message:        "Error removing volumes:\n%v",
-		Description:    "There was an error while trying to remove the mount point (volume) of a container",
-		HTTPStatusCode: http.StatusInternalServerError,
-	})
-
-	// ErrorCodeInvalidNetworkMode is generated when an invalid network
-	// mode value is specified.
-	ErrorCodeInvalidNetworkMode = errcode.Register(errGroup, errcode.ErrorDescriptor{
-		Value:          "INVALIDNETWORKMODE",
-		Message:        "invalid network mode: %s",
-		Description:    "The specified networking mode is not valid",
-		HTTPStatusCode: http.StatusInternalServerError,
-	})
-
-	// ErrorCodeGetGraph is generated when there was an error while
-	// trying to find a graph/image.
-	ErrorCodeGetGraph = errcode.Register(errGroup, errcode.ErrorDescriptor{
-		Value:          "GETGRAPH",
-		Message:        "Failed to graph.Get on ImageID %s - %s",
-		Description:    "There was an error trying to retrieve the image for the specified image ID",
-		HTTPStatusCode: http.StatusInternalServerError,
-	})
-
-	// ErrorCodeGetLayer is generated when there was an error while
-	// trying to retrieve a particular layer of an image.
-	ErrorCodeGetLayer = errcode.Register(errGroup, errcode.ErrorDescriptor{
-		Value:          "GETLAYER",
-		Message:        "Failed to get layer path from graphdriver %s for ImageID %s - %s",
-		Description:    "There was an error trying to retrieve the layer of the specified image",
-		HTTPStatusCode: http.StatusInternalServerError,
-	})
-
-	// ErrorCodePutLayer is generated when there was an error while
-	// trying to 'put' a particular layer of an image.
-	ErrorCodePutLayer = errcode.Register(errGroup, errcode.ErrorDescriptor{
-		Value:          "PUTLAYER",
-		Message:        "Failed to put layer path from graphdriver %s for ImageID %s - %s",
-		Description:    "There was an error trying to store a layer for the specified image",
-		HTTPStatusCode: http.StatusInternalServerError,
-	})
-
-	// ErrorCodeGetLayerMetadata is generated when there was an error while
-	// trying to retrieve the metadata of a layer of an image.
-	ErrorCodeGetLayerMetadata = errcode.Register(errGroup, errcode.ErrorDescriptor{
-		Value:          "GETLAYERMETADATA",
-		Message:        "Failed to get layer metadata - %s",
-		Description:    "There was an error trying to retrieve the metadata of a layer for the specified image",
-		HTTPStatusCode: http.StatusInternalServerError,
-	})
-
-	// ErrorCodeEmptyConfig is generated when the input config data
-	// is empty.
-	ErrorCodeEmptyConfig = errcode.Register(errGroup, errcode.ErrorDescriptor{
-		Value:          "EMPTYCONFIG",
-		Message:        "Config cannot be empty in order to create a container",
-		Description:    "While trying to create a container, the specified configuration information was empty",
-		HTTPStatusCode: http.StatusInternalServerError,
-	})
-
-	// ErrorCodeNoSuchImageHash is generated when we can't find the
-	// specified image by its hash
-	ErrorCodeNoSuchImageHash = errcode.Register(errGroup, errcode.ErrorDescriptor{
-		Value:          "NOSUCHIMAGEHASH",
-		Message:        "No such image: %s",
-		Description:    "An attempt was made to find an image by its hash, but the lookup failed",
-		HTTPStatusCode: http.StatusNotFound,
-	})
-
-	// ErrorCodeNoSuchImageTag is generated when we can't find the
-	// specified image byt its name/tag.
-	ErrorCodeNoSuchImageTag = errcode.Register(errGroup, errcode.ErrorDescriptor{
-		Value:          "NOSUCHIMAGETAG",
-		Message:        "No such image: %s:%s",
-		Description:    "An attempt was made to find an image by its name/tag, but the lookup failed",
-		HTTPStatusCode: http.StatusNotFound,
-	})
-
-	// ErrorCodeMountOverFile is generated when we try to mount a volume
-	// over an existing file (but not a dir).
-	ErrorCodeMountOverFile = errcode.Register(errGroup, errcode.ErrorDescriptor{
-		Value:          "MOUNTOVERFILE",
-		Message:        "cannot mount volume over existing file, file exists %s",
-		Description:    "An attempt was made to mount a volume at the same location as a pre-existing file",
-		HTTPStatusCode: http.StatusInternalServerError,
-	})
-
-	// ErrorCodeMountSetup is generated when we can't define a mount point
-	// due to the source and destination being undefined.
-	ErrorCodeMountSetup = errcode.Register(errGroup, errcode.ErrorDescriptor{
-		Value:          "MOUNTSETUP",
-		Message:        "Unable to setup mount point, neither source nor volume defined",
-		Description:    "An attempt was made to setup a mount point, but the source and destination are undefined",
-		HTTPStatusCode: http.StatusInternalServerError,
-	})
-
-	// ErrorCodeVolumeInvalidMode is generated when we the mode of a volume/bind
-	// mount is invalid.
-	ErrorCodeVolumeInvalidMode = errcode.Register(errGroup, errcode.ErrorDescriptor{
-		Value:          "VOLUMEINVALIDMODE",
-		Message:        "invalid mode: %s",
-		Description:    "An invalid 'mode' was specified",
-		HTTPStatusCode: http.StatusInternalServerError,
-	})
-
-	// ErrorCodeVolumeInvalid is generated when the format fo the
-	// volume specification isn't valid.
-	ErrorCodeVolumeInvalid = errcode.Register(errGroup, errcode.ErrorDescriptor{
-		Value:          "VOLUMEINVALID",
-		Message:        "Invalid volume specification: %s",
-		Description:    "An invalid 'volume' was specified in the mount request",
-		HTTPStatusCode: http.StatusInternalServerError,
-	})
-
-	// ErrorCodeVolumeAbs is generated when path to a volume isn't absolute.
-	ErrorCodeVolumeAbs = errcode.Register(errGroup, errcode.ErrorDescriptor{
-		Value:          "VOLUMEABS",
-		Message:        "Invalid volume destination path: %s mount path must be absolute.",
-		Description:    "An invalid 'destination' path was specified in the mount request, it must be an absolute path",
-		HTTPStatusCode: http.StatusInternalServerError,
-	})
-
-	// ErrorCodeVolumeName is generated when the name of named volume isn't valid.
-	ErrorCodeVolumeName = errcode.Register(errGroup, errcode.ErrorDescriptor{
-		Value:          "VOLUME_NAME_INVALID",
-		Message:        "%s includes invalid characters for a local volume name, only %s are allowed",
-		Description:    "The name of volume is invalid",
-		HTTPStatusCode: http.StatusBadRequest,
-	})
-
-	// ErrorCodeVolumeSlash is generated when destination path to a volume is /
-	ErrorCodeVolumeSlash = errcode.Register(errGroup, errcode.ErrorDescriptor{
-		Value:          "VOLUMESLASH",
-		Message:        "Invalid specification: destination can't be '/' in '%s'",
-		HTTPStatusCode: http.StatusInternalServerError,
-	})
-
-	// ErrorCodeVolumeDestIsC is generated the destination is c: (Windows specific)
-	ErrorCodeVolumeDestIsC = errcode.Register(errGroup, errcode.ErrorDescriptor{
-		Value:          "VOLUMEDESTISC",
-		Message:        "Destination drive letter in '%s' cannot be c:",
-		HTTPStatusCode: http.StatusInternalServerError,
-	})
-
-	// ErrorCodeVolumeDestIsCRoot is generated the destination path is c:\ (Windows specific)
-	ErrorCodeVolumeDestIsCRoot = errcode.Register(errGroup, errcode.ErrorDescriptor{
-		Value:          "VOLUMEDESTISCROOT",
-		Message:        `Destination path in '%s' cannot be c:\`,
-		HTTPStatusCode: http.StatusInternalServerError,
-	})
-
-	// ErrorCodeVolumeSourceNotFound is generated the source directory could not be found (Windows specific)
-	ErrorCodeVolumeSourceNotFound = errcode.Register(errGroup, errcode.ErrorDescriptor{
-		Value:          "VOLUMESOURCENOTFOUND",
-		Message:        "Source directory '%s' could not be found: %v",
-		HTTPStatusCode: http.StatusInternalServerError,
-	})
-
-	// ErrorCodeVolumeSourceNotDirectory is generated the source is not a directory (Windows specific)
-	ErrorCodeVolumeSourceNotDirectory = errcode.Register(errGroup, errcode.ErrorDescriptor{
-		Value:          "VOLUMESOURCENOTDIRECTORY",
-		Message:        "Source '%s' is not a directory",
-		HTTPStatusCode: http.StatusInternalServerError,
-	})
-
-	// ErrorCodeVolumeFromBlank is generated when path to a volume is blank.
-	ErrorCodeVolumeFromBlank = errcode.Register(errGroup, errcode.ErrorDescriptor{
-		Value:          "VOLUMEFROMBLANK",
-		Message:        "malformed volumes-from specification: %s",
-		Description:    "An invalid 'destination' path was specified in the mount request, it must not be blank",
-		HTTPStatusCode: http.StatusInternalServerError,
-	})
-
-	// ErrorCodeVolumeDup is generated when we try to mount two volumes
-	// to the same path.
-	ErrorCodeVolumeDup = errcode.Register(errGroup, errcode.ErrorDescriptor{
-		Value:          "VOLUMEDUP",
-		Message:        "Duplicate bind mount %s",
-		Description:    "An attempt was made to mount a volume but the specified destination location is already used in a previous mount",
-		HTTPStatusCode: http.StatusInternalServerError,
-	})
-
-	// ErrorCodeVolumeNoSourceForMount is generated when no source directory
-	// for a volume mount was found. (Windows specific)
-	ErrorCodeVolumeNoSourceForMount = errcode.Register(errGroup, errcode.ErrorDescriptor{
-		Value:          "VOLUMENOSOURCEFORMOUNT",
-		Message:        "No source for mount name %q driver %q destination %s",
-		HTTPStatusCode: http.StatusInternalServerError,
-	})
-
-	// ErrorCodeVolumeNameReservedWord is generated when the name in a volume
-	// uses a reserved word for filenames. (Windows specific)
-	ErrorCodeVolumeNameReservedWord = errcode.Register(errGroup, errcode.ErrorDescriptor{
-		Value:          "VOLUMENAMERESERVEDWORD",
-		Message:        "Volume name %q cannot be a reserved word for Windows filenames",
-		HTTPStatusCode: http.StatusInternalServerError,
-	})
-
-	// ErrorCodeCantUnpause is generated when there's an error while trying
-	// to unpause a container.
-	ErrorCodeCantUnpause = errcode.Register(errGroup, errcode.ErrorDescriptor{
-		Value:          "CANTUNPAUSE",
-		Message:        "Cannot unpause container %s: %s",
-		Description:    "An error occurred while trying to unpause the specified container",
-		HTTPStatusCode: http.StatusInternalServerError,
-	})
-
-	// ErrorCodePSError is generated when trying to run 'ps'.
-	ErrorCodePSError = errcode.Register(errGroup, errcode.ErrorDescriptor{
-		Value:          "PSError",
-		Message:        "Error running ps: %s",
-		Description:    "There was an error trying to run the 'ps' command in the specified container",
-		HTTPStatusCode: http.StatusInternalServerError,
-	})
-
-	// ErrorCodeNoPID is generated when looking for the PID field in the
-	// ps output.
-	ErrorCodeNoPID = errcode.Register(errGroup, errcode.ErrorDescriptor{
-		Value:          "NOPID",
-		Message:        "Couldn't find PID field in ps output",
-		Description:    "There was no 'PID' field in the output of the 'ps' command that was executed",
-		HTTPStatusCode: http.StatusInternalServerError,
-	})
-
-	// ErrorCodeBadPID is generated when we can't convert a PID to an int.
-	ErrorCodeBadPID = errcode.Register(errGroup, errcode.ErrorDescriptor{
-		Value:          "BADPID",
-		Message:        "Unexpected pid '%s': %s",
-		Description:    "While trying to parse the output of the 'ps' command, the 'PID' field was not an integer",
-		HTTPStatusCode: http.StatusInternalServerError,
-	})
-
-	// ErrorCodeNoTop is generated when we try to run 'top' but can't
-	// because we're on windows.
-	ErrorCodeNoTop = errcode.Register(errGroup, errcode.ErrorDescriptor{
-		Value:          "NOTOP",
-		Message:        "Top is not supported on Windows",
-		Description:    "The 'top' command is not supported on Windows",
-		HTTPStatusCode: http.StatusInternalServerError,
-	})
-
-	// ErrorCodeStopped is generated when we try to stop a container
-	// that is already stopped.
-	ErrorCodeStopped = errcode.Register(errGroup, errcode.ErrorDescriptor{
-		Value:          "STOPPED",
-		Message:        "Container already stopped",
-		Description:    "An attempt was made to stop a container, but the container is already stopped",
-		HTTPStatusCode: http.StatusNotModified,
-	})
-
-	// ErrorCodeCantStop is generated when we try to stop a container
-	// but failed for some reason.
-	ErrorCodeCantStop = errcode.Register(errGroup, errcode.ErrorDescriptor{
-		Value:          "CANTSTOP",
-		Message:        "Cannot stop container %s: %s\n",
-		Description:    "An error occurred while tring to stop the specified container",
-		HTTPStatusCode: http.StatusInternalServerError,
-	})
-
-	// ErrorCodeBadCPUFields is generated when the number of CPU fields is
-	// less than 8.
-	ErrorCodeBadCPUFields = errcode.Register(errGroup, errcode.ErrorDescriptor{
-		Value:          "BADCPUFIELDS",
-		Message:        "invalid number of cpu fields",
-		Description:    "While reading the '/proc/stat' file, the number of 'cpu' fields is less than 8",
-		HTTPStatusCode: http.StatusInternalServerError,
-	})
-
-	// ErrorCodeBadCPUInt is generated the CPU field can't be parsed as an int.
-	ErrorCodeBadCPUInt = errcode.Register(errGroup, errcode.ErrorDescriptor{
-		Value:          "BADCPUINT",
-		Message:        "Unable to convert value %s to int: %s",
-		Description:    "While reading the '/proc/stat' file, the 'CPU' field could not be parsed as an integer",
-		HTTPStatusCode: http.StatusInternalServerError,
-	})
-
-	// ErrorCodeBadStatFormat is generated the output of the stat info
-	// isn't parseable.
-	ErrorCodeBadStatFormat = errcode.Register(errGroup, errcode.ErrorDescriptor{
-		Value:          "BADSTATFORMAT",
-		Message:        "invalid stat format",
-		Description:    "There was an error trying to parse the '/proc/stat' file",
-		HTTPStatusCode: http.StatusInternalServerError,
-	})
-
-	// ErrorCodeTimedOut is generated when a timer expires.
-	ErrorCodeTimedOut = errcode.Register(errGroup, errcode.ErrorDescriptor{
-		Value:          "TIMEDOUT",
-		Message:        "Timed out: %v",
-		Description:    "A timer expired",
-		HTTPStatusCode: http.StatusInternalServerError,
-	})
-
-	// ErrorCodeAlreadyRemoving is generated when we try to remove a
-	// container that is already being removed.
-	ErrorCodeAlreadyRemoving = errcode.Register(errGroup, errcode.ErrorDescriptor{
-		Value:          "ALREADYREMOVING",
-		Message:        "Status is already RemovalInProgress",
-		Description:    "An attempt to remove a container was made, but the container is already in the process of being removed",
-		HTTPStatusCode: http.StatusInternalServerError,
-	})
-
-	// ErrorCodeStartPaused is generated when we start a paused container.
-	ErrorCodeStartPaused = errcode.Register(errGroup, errcode.ErrorDescriptor{
-		Value:          "STARTPAUSED",
-		Message:        "Cannot start a paused container, try unpause instead.",
-		Description:    "An attempt to start a container was made, but the container is paused. Unpause it first",
-		HTTPStatusCode: http.StatusInternalServerError,
-	})
-
-	// ErrorCodeAlreadyStarted is generated when we try to start a container
-	// that is already running.
-	ErrorCodeAlreadyStarted = errcode.Register(errGroup, errcode.ErrorDescriptor{
-		Value:          "ALREADYSTARTED",
-		Message:        "Container already started",
-		Description:    "An attempt to start a container was made, but the container is already started",
-		HTTPStatusCode: http.StatusNotModified,
-	})
-
-	// ErrorCodeHostConfigStart is generated when a HostConfig is passed
-	// into the start command.
-	ErrorCodeHostConfigStart = errcode.Register(errGroup, errcode.ErrorDescriptor{
-		Value:          "HOSTCONFIGSTART",
-		Message:        "Supplying a hostconfig on start is not supported. It should be supplied on create",
-		Description:    "The 'start' command does not accept 'HostConfig' data, try using the 'create' command instead",
-		HTTPStatusCode: http.StatusInternalServerError,
-	})
-
-	// ErrorCodeCantStart is generated when an error occurred while
-	// trying to start a container.
-	ErrorCodeCantStart = errcode.Register(errGroup, errcode.ErrorDescriptor{
-		Value:          "CANTSTART",
-		Message:        "Cannot start container %s: %s",
-		Description:    "There was an error while trying to start a container",
-		HTTPStatusCode: http.StatusInternalServerError,
-	})
-
-	// ErrorCodeCantRestart is generated when an error occurred while
-	// trying to restart a container.
-	ErrorCodeCantRestart = errcode.Register(errGroup, errcode.ErrorDescriptor{
-		Value:          "CANTRESTART",
-		Message:        "Cannot restart container %s: %s",
-		Description:    "There was an error while trying to restart a container",
-		HTTPStatusCode: http.StatusInternalServerError,
-	})
-
-	// ErrorCodeEmptyRename is generated when one of the names on a
-	// rename is empty.
-	ErrorCodeEmptyRename = errcode.Register(errGroup, errcode.ErrorDescriptor{
-		Value:          "EMPTYRENAME",
-		Message:        "Neither old nor new names may be empty",
-		Description:    "An attempt was made to rename a container but either the old or new names were blank",
-		HTTPStatusCode: http.StatusInternalServerError,
-	})
-
-	// ErrorCodeRenameTaken is generated when we try to rename but the
-	// new name isn't available.
-	ErrorCodeRenameTaken = errcode.Register(errGroup, errcode.ErrorDescriptor{
-		Value:          "RENAMETAKEN",
-		Message:        "Error when allocating new name: %s",
-		Description:    "The new name specified on the 'rename' command is already being used",
-		HTTPStatusCode: http.StatusInternalServerError,
-	})
-
-	// ErrorCodeRenameDelete is generated when we try to rename but
-	// failed trying to delete the old container.
-	ErrorCodeRenameDelete = errcode.Register(errGroup, errcode.ErrorDescriptor{
-		Value:          "RENAMEDELETE",
-		Message:        "Failed to delete container %q: %v",
-		Description:    "There was an error trying to delete the specified container",
-		HTTPStatusCode: http.StatusInternalServerError,
-	})
-
-	// ErrorCodePauseError is generated when we try to pause a container
-	// but failed.
-	ErrorCodePauseError = errcode.Register(errGroup, errcode.ErrorDescriptor{
-		Value:          "PAUSEERROR",
-		Message:        "Cannot pause container %s: %s",
-		Description:    "There was an error trying to pause the specified container",
-		HTTPStatusCode: http.StatusInternalServerError,
-	})
-
-	// ErrorCodeNeedStream is generated when we try to stream a container's
-	// logs but no output stream was specified.
-	ErrorCodeNeedStream = errcode.Register(errGroup, errcode.ErrorDescriptor{
-		Value:          "NEEDSTREAM",
-		Message:        "You must choose at least one stream",
-		Description:    "While trying to stream a container's logs, no output stream was specified",
-		HTTPStatusCode: http.StatusInternalServerError,
-	})
-
-	// ErrorCodeDanglingOne is generated when we try to specify more than one
-	// 'dangling' specifier.
-	ErrorCodeDanglingOne = errcode.Register(errGroup, errcode.ErrorDescriptor{
-		Value:          "DANLGINGONE",
-		Message:        "Conflict: cannot use more than 1 value for `dangling` filter",
-		Description:    "The specified 'dangling' filter may not have more than one value",
-		HTTPStatusCode: http.StatusConflict,
-	})
-
-	// ErrorCodeImgDelUsed is generated when we try to delete an image
-	// but it is being used.
-	ErrorCodeImgDelUsed = errcode.Register(errGroup, errcode.ErrorDescriptor{
-		Value:          "IMGDELUSED",
-		Message:        "conflict: unable to remove repository reference %q (must force) - container %s is using its referenced image %s",
-		Description:    "An attempt was made to delete an image but it is currently being used",
-		HTTPStatusCode: http.StatusConflict,
-	})
-
-	// ErrorCodeImgNoParent is generated when we try to find an image's
-	// parent but its not in the graph.
-	ErrorCodeImgNoParent = errcode.Register(errGroup, errcode.ErrorDescriptor{
-		Value:          "IMGNOPARENT",
-		Message:        "unable to get parent image: %v",
-		Description:    "There was an error trying to find an image's parent, it was not in the graph",
-		HTTPStatusCode: http.StatusInternalServerError,
-	})
-
-	// ErrorCodeExportFailed is generated when an export fails.
-	ErrorCodeExportFailed = errcode.Register(errGroup, errcode.ErrorDescriptor{
-		Value:          "EXPORTFAILED",
-		Message:        "%s: %s",
-		Description:    "There was an error during an export operation",
-		HTTPStatusCode: http.StatusInternalServerError,
-	})
-
-	// ErrorCodeExecResize is generated when we try to resize an exec
-	// but its not running.
-	ErrorCodeExecResize = errcode.Register(errGroup, errcode.ErrorDescriptor{
-		Value:          "EXECRESIZE",
-		Message:        "Exec %s is not running, so it can not be resized.",
-		Description:    "An attempt was made to resize an 'exec', but the 'exec' is not running",
-		HTTPStatusCode: http.StatusInternalServerError,
-	})
-
-	// ErrorCodeContainerNotRunning is generated when we try to get the info
-	// on an exec but the container is not running.
-	ErrorCodeContainerNotRunning = errcode.Register(errGroup, errcode.ErrorDescriptor{
-		Value:          "CONTAINERNOTRUNNING",
-		Message:        "Container %s is not running: %s",
-		Description:    "An attempt was made to retrieve the information about an 'exec' but the container is not running",
-		HTTPStatusCode: http.StatusConflict,
-	})
-
-	// ErrorCodeNoExecID is generated when we try to get the info
-	// on an exec but it can't be found.
-	ErrorCodeNoExecID = errcode.Register(errGroup, errcode.ErrorDescriptor{
-		Value:          "NOEXECID",
-		Message:        "No such exec instance '%s' found in daemon",
-		Description:    "The specified 'exec' instance could not be found",
-		HTTPStatusCode: http.StatusNotFound,
-	})
-
-	// ErrorCodeExecPaused is generated when we try to start an exec
-	// but the container is paused.
-	ErrorCodeExecPaused = errcode.Register(errGroup, errcode.ErrorDescriptor{
-		Value:          "EXECPAUSED",
-		Message:        "Container %s is paused, unpause the container before exec",
-		Description:    "An attempt to start an 'exec' was made, but the owning container is paused",
-		HTTPStatusCode: http.StatusConflict,
-	})
-
-	// ErrorCodeExecRunning is generated when we try to start an exec
-	// but its already running.
-	ErrorCodeExecRunning = errcode.Register(errGroup, errcode.ErrorDescriptor{
-		Value:          "EXECRUNNING",
-		Message:        "Error: Exec command %s is already running",
-		Description:    "An attempt to start an 'exec' was made, but 'exec' is already running",
-		HTTPStatusCode: http.StatusInternalServerError,
-	})
-
-	// ErrorCodeExecCantRun is generated when we try to start an exec
-	// but it failed for some reason.
-	ErrorCodeExecCantRun = errcode.Register(errGroup, errcode.ErrorDescriptor{
-		Value:          "EXECCANTRUN",
-		Message:        "Cannot run exec command %s in container %s: %s",
-		Description:    "An attempt to start an 'exec' was made, but an error occurred",
-		HTTPStatusCode: http.StatusInternalServerError,
-	})
-
-	// ErrorCodeExecAttach is generated when we try to attach to an exec
-	// but failed.
-	ErrorCodeExecAttach = errcode.Register(errGroup, errcode.ErrorDescriptor{
-		Value:          "EXECATTACH",
-		Message:        "attach failed with error: %s",
-		Description:    "There was an error while trying to attach to an 'exec'",
-		HTTPStatusCode: http.StatusInternalServerError,
-	})
-
-	// ErrorCodeExecContainerStopped is generated when we try to start
-	// an exec but then the container stopped.
-	ErrorCodeExecContainerStopped = errcode.Register(errGroup, errcode.ErrorDescriptor{
-		Value:          "EXECCONTAINERSTOPPED",
-		Message:        "container stopped while running exec",
-		Description:    "An attempt was made to start an 'exec' but the owning container is in the 'stopped' state",
-		HTTPStatusCode: http.StatusInternalServerError,
-	})
-
-	// ErrorCodeDefaultName is generated when we try to delete the
-	// default name of a container.
-	ErrorCodeDefaultName = errcode.Register(errGroup, errcode.ErrorDescriptor{
-		Value:          "DEFAULTNAME",
-		Message:        "Conflict, cannot remove the default name of the container",
-		Description:    "An attempt to delete the default name of a container was made, but that is not allowed",
-		HTTPStatusCode: http.StatusConflict,
-	})
-
-	// ErrorCodeNoParent is generated when we try to delete a container
-	// but we can't find its parent image.
-	ErrorCodeNoParent = errcode.Register(errGroup, errcode.ErrorDescriptor{
-		Value:          "NOPARENT",
-		Message:        "Cannot get parent %s for name %s",
-		Description:    "An attempt was made to delete a container but its parent image could not be found",
-		HTTPStatusCode: http.StatusInternalServerError,
-	})
-
-	// ErrorCodeCantDestroy is generated when we try to delete a container
-	// but failed for some reason.
-	ErrorCodeCantDestroy = errcode.Register(errGroup, errcode.ErrorDescriptor{
-		Value:          "CANTDESTROY",
-		Message:        "Cannot destroy container %s: %v",
-		Description:    "An attempt was made to delete a container but it failed",
-		HTTPStatusCode: http.StatusInternalServerError,
-	})
-
-	// ErrorCodeRmRunning is generated when we try to delete a container
-	// but its still running.
-	ErrorCodeRmRunning = errcode.Register(errGroup, errcode.ErrorDescriptor{
-		Value:          "RMRUNNING",
-		Message:        "Conflict, You cannot remove a running container. Stop the container before attempting removal or use -f",
-		Description:    "An attempt was made to delete a container but the container is still running, try to either stop it first or use '-f'",
-		HTTPStatusCode: http.StatusConflict,
-	})
-
-	// ErrorCodeRmFailed is generated when we try to delete a container
-	// but it failed for some reason.
-	ErrorCodeRmFailed = errcode.Register(errGroup, errcode.ErrorDescriptor{
-		Value:          "RMFAILED",
-		Message:        "Could not kill running container, cannot remove - %v",
-		Description:    "An error occurred while trying to delete a running container",
-		HTTPStatusCode: http.StatusInternalServerError,
-	})
-
-	// ErrorCodeRmNotFound is generated when we try to delete a container
-	// but couldn't find it.
-	ErrorCodeRmNotFound = errcode.Register(errGroup, errcode.ErrorDescriptor{
-		Value:          "RMNOTFOUND",
-		Message:        "Could not kill running container, cannot remove - %v",
-		Description:    "An attempt to delete a container was made but the container could not be found",
-		HTTPStatusCode: http.StatusInternalServerError,
-	})
-
-	// ErrorCodeRmState is generated when we try to delete a container
-	// but couldn't set its state to RemovalInProgress.
-	ErrorCodeRmState = errcode.Register(errGroup, errcode.ErrorDescriptor{
-		Value:          "RMSTATE",
-		Message:        "Failed to set container state to RemovalInProgress: %s",
-		Description:    "An attempt to delete a container was made, but there as an error trying to set its state to 'RemovalInProgress'",
-		HTTPStatusCode: http.StatusInternalServerError,
-	})
-
-	// ErrorCodeRmDriverFS is generated when we try to delete a container
-	// but the driver failed to delete its filesystem.
-	ErrorCodeRmDriverFS = errcode.Register(errGroup, errcode.ErrorDescriptor{
-		Value:          "RMDRIVERFS",
-		Message:        "Driver %s failed to remove root filesystem %s: %s",
-		Description:    "While trying to delete a container, the driver failed to remove the root filesystem",
-		HTTPStatusCode: http.StatusInternalServerError,
-	})
-
-	// ErrorCodeRmInit is generated when we try to delete a container
-	// but failed deleting its init filesystem.
-	ErrorCodeRmInit = errcode.Register(errGroup, errcode.ErrorDescriptor{
-		Value:          "RMINIT",
-		Message:        "Driver %s failed to remove init filesystem %s: %s",
-		Description:    "While trying to delete a container, the driver failed to remove the init filesystem",
-		HTTPStatusCode: http.StatusInternalServerError,
-	})
-
-	// ErrorCodeRmFS is generated when we try to delete a container
-	// but failed deleting its filesystem.
-	ErrorCodeRmFS = errcode.Register(errGroup, errcode.ErrorDescriptor{
-		Value:          "RMFS",
-		Message:        "Unable to remove filesystem for %v: %v",
-		Description:    "While trying to delete a container, the driver failed to remove the filesystem",
-		HTTPStatusCode: http.StatusInternalServerError,
-	})
-
-	// ErrorCodeRmExecDriver is generated when we try to delete a container
-	// but failed deleting its exec driver data.
-	ErrorCodeRmExecDriver = errcode.Register(errGroup, errcode.ErrorDescriptor{
-		Value:          "RMEXECDRIVER",
-		Message:        "Unable to remove execdriver data for %s: %s",
-		Description:    "While trying to delete a container, there was an error trying to remove th exec driver data",
-		HTTPStatusCode: http.StatusInternalServerError,
-	})
-
-	// ErrorCodeRmVolumeInUse is generated when we try to delete a container
-	// but failed deleting a volume because its being used.
-	ErrorCodeRmVolumeInUse = errcode.Register(errGroup, errcode.ErrorDescriptor{
-		Value:          "RMVOLUMEINUSE",
-		Message:        "Conflict: %v",
-		Description:    "While trying to delete a container, one of its volumes is still being used",
-		HTTPStatusCode: http.StatusConflict,
-	})
-
-	// ErrorCodeRmVolume is generated when we try to delete a container
-	// but failed deleting a volume.
-	ErrorCodeRmVolume = errcode.Register(errGroup, errcode.ErrorDescriptor{
-		Value:          "RMVOLUME",
-		Message:        "Error while removing volume %s: %v",
-		Description:    "While trying to delete a container, there was an error trying to delete one of its volumes",
-		HTTPStatusCode: http.StatusInternalServerError,
-	})
-
-	// ErrorCodeInvalidCpusetCpus is generated when user provided cpuset CPUs
-	// are invalid.
-	ErrorCodeInvalidCpusetCpus = errcode.Register(errGroup, errcode.ErrorDescriptor{
-		Value:          "INVALIDCPUSETCPUS",
-		Message:        "Invalid value %s for cpuset cpus.",
-		Description:    "While verifying the container's 'HostConfig', CpusetCpus value was in an incorrect format",
-		HTTPStatusCode: http.StatusInternalServerError,
-	})
-
-	// ErrorCodeInvalidCpusetMems is generated when user provided cpuset mems
-	// are invalid.
-	ErrorCodeInvalidCpusetMems = errcode.Register(errGroup, errcode.ErrorDescriptor{
-		Value:          "INVALIDCPUSETMEMS",
-		Message:        "Invalid value %s for cpuset mems.",
-		Description:    "While verifying the container's 'HostConfig', CpusetMems value was in an incorrect format",
-		HTTPStatusCode: http.StatusInternalServerError,
-	})
-
-	// ErrorCodeNotAvailableCpusetCpus is generated when user provided cpuset
-	// CPUs aren't available in the container's cgroup.
-	ErrorCodeNotAvailableCpusetCpus = errcode.Register(errGroup, errcode.ErrorDescriptor{
-		Value:          "NOTAVAILABLECPUSETCPUS",
-		Message:        "Requested CPUs are not available - requested %s, available: %s.",
-		Description:    "While verifying the container's 'HostConfig', cpuset CPUs provided aren't available in the container's cgroup available set",
-		HTTPStatusCode: http.StatusInternalServerError,
-	})
-
-	// ErrorCodeNotAvailableCpusetMems is generated when user provided cpuset
-	// memory nodes aren't available in the container's cgroup.
-	ErrorCodeNotAvailableCpusetMems = errcode.Register(errGroup, errcode.ErrorDescriptor{
-		Value:          "NOTAVAILABLECPUSETMEMS",
-		Message:        "Requested memory nodes are not available - requested %s, available: %s.",
-		Description:    "While verifying the container's 'HostConfig', cpuset memory nodes provided aren't available in the container's cgroup available set",
-		HTTPStatusCode: http.StatusInternalServerError,
-	})
-
-	// ErrorVolumeNameTaken is generated when an error occurred while
-	// trying to create a volume that has existed using different driver.
-	ErrorVolumeNameTaken = errcode.Register(errGroup, errcode.ErrorDescriptor{
-		Value:          "VOLUME_NAME_TAKEN",
-		Message:        "A volume name %s already exists with the %s driver. Choose a different volume name.",
-		Description:    "An attempt to create a volume using a driver but the volume already exists with a different driver",
-		HTTPStatusCode: http.StatusInternalServerError,
-	})
-)
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/errors/error.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/errors/error.go
deleted file mode 100644
index 37222d443..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/errors/error.go
+++ /dev/null
@@ -1,6 +0,0 @@
-package errors
-
-// This file contains all of the errors that can be generated from the
-// docker engine but are not tied to any specific top-level component.
-
-const errGroup = "engine"
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/errors/image.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/errors/image.go
deleted file mode 100644
index c104b1bb7..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/errors/image.go
+++ /dev/null
@@ -1,20 +0,0 @@
-package errors
-
-// This file contains all of the errors that can be generated from the
-// docker/image component.
-
-import (
-	"net/http"
-
-	"github.com/fsouza/go-dockerclient/external/github.com/docker/distribution/registry/api/errcode"
-)
-
-var (
-	// ErrorCodeInvalidImageID is generated when image id specified is incorrectly formatted.
-	ErrorCodeInvalidImageID = errcode.Register(errGroup, errcode.ErrorDescriptor{
-		Value:          "INVALIDIMAGEID",
-		Message:        "image ID '%s' is invalid ",
-		Description:    "The specified image id is incorrectly formatted",
-		HTTPStatusCode: http.StatusInternalServerError,
-	})
-)
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/errors/server.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/errors/server.go
deleted file mode 100644
index 580b47f74..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/errors/server.go
+++ /dev/null
@@ -1,36 +0,0 @@
-package errors
-
-import (
-	"net/http"
-
-	"github.com/fsouza/go-dockerclient/external/github.com/docker/distribution/registry/api/errcode"
-)
-
-var (
-	// ErrorCodeNewerClientVersion is generated when a request from a client
-	// specifies a higher version than the server supports.
-	ErrorCodeNewerClientVersion = errcode.Register(errGroup, errcode.ErrorDescriptor{
-		Value:          "NEWERCLIENTVERSION",
-		Message:        "client is newer than server (client API version: %s, server API version: %s)",
-		Description:    "The client version is higher than the server version",
-		HTTPStatusCode: http.StatusBadRequest,
-	})
-
-	// ErrorCodeOldClientVersion is generated when a request from a client
-	// specifies a version lower than the minimum version supported by the server.
-	ErrorCodeOldClientVersion = errcode.Register(errGroup, errcode.ErrorDescriptor{
-		Value:          "OLDCLIENTVERSION",
-		Message:        "client version %s is too old. Minimum supported API version is %s, please upgrade your client to a newer version",
-		Description:    "The client version is too old for the server",
-		HTTPStatusCode: http.StatusBadRequest,
-	})
-
-	// ErrorNetworkControllerNotEnabled is generated when the networking stack in not enabled
-	// for certain platforms, like windows.
-	ErrorNetworkControllerNotEnabled = errcode.Register(errGroup, errcode.ErrorDescriptor{
-		Value:          "NETWORK_CONTROLLER_NOT_ENABLED",
-		Message:        "the network controller is not enabled for this platform",
-		Description:    "Docker's networking stack is disabled for this platform",
-		HTTPStatusCode: http.StatusNotFound,
-	})
-)
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/opts/envfile.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/opts/envfile.go
deleted file mode 100644
index ba8b4f201..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/opts/envfile.go
+++ /dev/null
@@ -1,67 +0,0 @@
-package opts
-
-import (
-	"bufio"
-	"fmt"
-	"os"
-	"strings"
-)
-
-// ParseEnvFile reads a file with environment variables enumerated by lines
-//
-// ``Environment variable names used by the utilities in the Shell and
-// Utilities volume of IEEE Std 1003.1-2001 consist solely of uppercase
-// letters, digits, and the '_' (underscore) from the characters defined in
-// Portable Character Set and do not begin with a digit. *But*, other
-// characters may be permitted by an implementation; applications shall
-// tolerate the presence of such names.''
-// -- http://pubs.opengroup.org/onlinepubs/009695399/basedefs/xbd_chap08.html
-//
-// As of #16585, it's up to application inside docker to validate or not
-// environment variables, that's why we just strip leading whitespace and
-// nothing more.
-func ParseEnvFile(filename string) ([]string, error) {
-	fh, err := os.Open(filename)
-	if err != nil {
-		return []string{}, err
-	}
-	defer fh.Close()
-
-	lines := []string{}
-	scanner := bufio.NewScanner(fh)
-	for scanner.Scan() {
-		// trim the line from all leading whitespace first
-		line := strings.TrimLeft(scanner.Text(), whiteSpaces)
-		// line is not empty, and not starting with '#'
-		if len(line) > 0 && !strings.HasPrefix(line, "#") {
-			data := strings.SplitN(line, "=", 2)
-
-			// trim the front of a variable, but nothing else
-			variable := strings.TrimLeft(data[0], whiteSpaces)
-			if strings.ContainsAny(variable, whiteSpaces) {
-				return []string{}, ErrBadEnvVariable{fmt.Sprintf("variable '%s' has white spaces", variable)}
-			}
-
-			if len(data) > 1 {
-
-				// pass the value through, no trimming
-				lines = append(lines, fmt.Sprintf("%s=%s", variable, data[1]))
-			} else {
-				// if only a pass-through variable is given, clean it up.
-				lines = append(lines, fmt.Sprintf("%s=%s", strings.TrimSpace(line), os.Getenv(line)))
-			}
-		}
-	}
-	return lines, scanner.Err()
-}
-
-var whiteSpaces = " \t"
-
-// ErrBadEnvVariable typed error for bad environment variable
-type ErrBadEnvVariable struct {
-	msg string
-}
-
-func (e ErrBadEnvVariable) Error() string {
-	return fmt.Sprintf("poorly formatted environment: %s", e.msg)
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/opts/hosts_unix.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/opts/hosts_unix.go
deleted file mode 100644
index 611407a9d..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/opts/hosts_unix.go
+++ /dev/null
@@ -1,8 +0,0 @@
-// +build !windows
-
-package opts
-
-import "fmt"
-
-// DefaultHost constant defines the default host string used by docker on other hosts than Windows
-var DefaultHost = fmt.Sprintf("unix://%s", DefaultUnixSocket)
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/opts/hosts_windows.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/opts/hosts_windows.go
deleted file mode 100644
index ec52e9a70..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/opts/hosts_windows.go
+++ /dev/null
@@ -1,6 +0,0 @@
-// +build windows
-
-package opts
-
-// DefaultHost constant defines the default host string used by docker on Windows
-var DefaultHost = DefaultTCPHost
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/opts/ip.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/opts/ip.go
deleted file mode 100644
index d787b56ca..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/opts/ip.go
+++ /dev/null
@@ -1,42 +0,0 @@
-package opts
-
-import (
-	"fmt"
-	"net"
-)
-
-// IPOpt holds an IP. It is used to store values from CLI flags.
-type IPOpt struct {
-	*net.IP
-}
-
-// NewIPOpt creates a new IPOpt from a reference net.IP and a
-// string representation of an IP. If the string is not a valid
-// IP it will fallback to the specified reference.
-func NewIPOpt(ref *net.IP, defaultVal string) *IPOpt {
-	o := &IPOpt{
-		IP: ref,
-	}
-	o.Set(defaultVal)
-	return o
-}
-
-// Set sets an IPv4 or IPv6 address from a given string. If the given
-// string is not parsable as an IP address it returns an error.
-func (o *IPOpt) Set(val string) error {
-	ip := net.ParseIP(val)
-	if ip == nil {
-		return fmt.Errorf("%s is not an ip address", val)
-	}
-	*o.IP = ip
-	return nil
-}
-
-// String returns the IP address stored in the IPOpt. If stored IP is a
-// nil pointer, it returns an empty string.
-func (o *IPOpt) String() string {
-	if *o.IP == nil {
-		return ""
-	}
-	return o.IP.String()
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/opts/opts.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/opts/opts.go
deleted file mode 100644
index df85a09e3..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/opts/opts.go
+++ /dev/null
@@ -1,360 +0,0 @@
-package opts
-
-import (
-	"fmt"
-	"net"
-	"os"
-	"path"
-	"regexp"
-	"strings"
-
-	"github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/parsers"
-)
-
-var (
-	alphaRegexp  = regexp.MustCompile(`[a-zA-Z]`)
-	domainRegexp = regexp.MustCompile(`^(:?(:?[a-zA-Z0-9]|(:?[a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9]))(:?\.(:?[a-zA-Z0-9]|(:?[a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9])))*)\.?\s*$`)
-	// DefaultHTTPHost Default HTTP Host used if only port is provided to -H flag e.g. docker daemon -H tcp://:8080
-	DefaultHTTPHost = "localhost"
-
-	// DefaultHTTPPort Default HTTP Port used if only the protocol is provided to -H flag e.g. docker daemon -H tcp://
-	// TODO Windows. DefaultHTTPPort is only used on Windows if a -H parameter
-	// is not supplied. A better longer term solution would be to use a named
-	// pipe as the default on the Windows daemon.
-	// These are the IANA registered port numbers for use with Docker
-	// see http://www.iana.org/assignments/service-names-port-numbers/service-names-port-numbers.xhtml?search=docker
-	DefaultHTTPPort = 2375 // Default HTTP Port
-	// DefaultTLSHTTPPort Default HTTP Port used when TLS enabled
-	DefaultTLSHTTPPort = 2376 // Default TLS encrypted HTTP Port
-	// DefaultUnixSocket Path for the unix socket.
-	// Docker daemon by default always listens on the default unix socket
-	DefaultUnixSocket = "/var/run/docker.sock"
-	// DefaultTCPHost constant defines the default host string used by docker on Windows
-	DefaultTCPHost = fmt.Sprintf("tcp://%s:%d", DefaultHTTPHost, DefaultHTTPPort)
-	// DefaultTLSHost constant defines the default host string used by docker for TLS sockets
-	DefaultTLSHost = fmt.Sprintf("tcp://%s:%d", DefaultHTTPHost, DefaultTLSHTTPPort)
-)
-
-// ListOpts holds a list of values and a validation function.
-type ListOpts struct {
-	values    *[]string
-	validator ValidatorFctType
-}
-
-// NewListOpts creates a new ListOpts with the specified validator.
-func NewListOpts(validator ValidatorFctType) ListOpts {
-	var values []string
-	return *NewListOptsRef(&values, validator)
-}
-
-// NewListOptsRef creates a new ListOpts with the specified values and validator.
-func NewListOptsRef(values *[]string, validator ValidatorFctType) *ListOpts {
-	return &ListOpts{
-		values:    values,
-		validator: validator,
-	}
-}
-
-func (opts *ListOpts) String() string {
-	return fmt.Sprintf("%v", []string((*opts.values)))
-}
-
-// Set validates if needed the input value and add it to the
-// internal slice.
-func (opts *ListOpts) Set(value string) error {
-	if opts.validator != nil {
-		v, err := opts.validator(value)
-		if err != nil {
-			return err
-		}
-		value = v
-	}
-	(*opts.values) = append((*opts.values), value)
-	return nil
-}
-
-// Delete removes the specified element from the slice.
-func (opts *ListOpts) Delete(key string) {
-	for i, k := range *opts.values {
-		if k == key {
-			(*opts.values) = append((*opts.values)[:i], (*opts.values)[i+1:]...)
-			return
-		}
-	}
-}
-
-// GetMap returns the content of values in a map in order to avoid
-// duplicates.
-func (opts *ListOpts) GetMap() map[string]struct{} {
-	ret := make(map[string]struct{})
-	for _, k := range *opts.values {
-		ret[k] = struct{}{}
-	}
-	return ret
-}
-
-// GetAll returns the values of slice.
-func (opts *ListOpts) GetAll() []string {
-	return (*opts.values)
-}
-
-// Get checks the existence of the specified key.
-func (opts *ListOpts) Get(key string) bool {
-	for _, k := range *opts.values {
-		if k == key {
-			return true
-		}
-	}
-	return false
-}
-
-// Len returns the amount of element in the slice.
-func (opts *ListOpts) Len() int {
-	return len((*opts.values))
-}
-
-//MapOpts holds a map of values and a validation function.
-type MapOpts struct {
-	values    map[string]string
-	validator ValidatorFctType
-}
-
-// Set validates if needed the input value and add it to the
-// internal map, by splitting on '='.
-func (opts *MapOpts) Set(value string) error {
-	if opts.validator != nil {
-		v, err := opts.validator(value)
-		if err != nil {
-			return err
-		}
-		value = v
-	}
-	vals := strings.SplitN(value, "=", 2)
-	if len(vals) == 1 {
-		(opts.values)[vals[0]] = ""
-	} else {
-		(opts.values)[vals[0]] = vals[1]
-	}
-	return nil
-}
-
-// GetAll returns the values of MapOpts as a map.
-func (opts *MapOpts) GetAll() map[string]string {
-	return opts.values
-}
-
-func (opts *MapOpts) String() string {
-	return fmt.Sprintf("%v", map[string]string((opts.values)))
-}
-
-// NewMapOpts creates a new MapOpts with the specified map of values and a validator.
-func NewMapOpts(values map[string]string, validator ValidatorFctType) *MapOpts {
-	if values == nil {
-		values = make(map[string]string)
-	}
-	return &MapOpts{
-		values:    values,
-		validator: validator,
-	}
-}
-
-// ValidatorFctType defines a validator function that returns a validated string and/or an error.
-type ValidatorFctType func(val string) (string, error)
-
-// ValidatorFctListType defines a validator function that returns a validated list of string and/or an error
-type ValidatorFctListType func(val string) ([]string, error)
-
-// ValidateAttach validates that the specified string is a valid attach option.
-func ValidateAttach(val string) (string, error) {
-	s := strings.ToLower(val)
-	for _, str := range []string{"stdin", "stdout", "stderr"} {
-		if s == str {
-			return s, nil
-		}
-	}
-	return val, fmt.Errorf("valid streams are STDIN, STDOUT and STDERR")
-}
-
-// ValidateLink validates that the specified string has a valid link format (containerName:alias).
-func ValidateLink(val string) (string, error) {
-	if _, _, err := parsers.ParseLink(val); err != nil {
-		return val, err
-	}
-	return val, nil
-}
-
-// ValidDeviceMode checks if the mode for device is valid or not.
-// Valid mode is a composition of r (read), w (write), and m (mknod).
-func ValidDeviceMode(mode string) bool {
-	var legalDeviceMode = map[rune]bool{
-		'r': true,
-		'w': true,
-		'm': true,
-	}
-	if mode == "" {
-		return false
-	}
-	for _, c := range mode {
-		if !legalDeviceMode[c] {
-			return false
-		}
-		legalDeviceMode[c] = false
-	}
-	return true
-}
-
-// ValidateDevice validates a path for devices
-// It will make sure 'val' is in the form:
-//    [host-dir:]container-path[:mode]
-// It also validates the device mode.
-func ValidateDevice(val string) (string, error) {
-	return validatePath(val, ValidDeviceMode)
-}
-
-func validatePath(val string, validator func(string) bool) (string, error) {
-	var containerPath string
-	var mode string
-
-	if strings.Count(val, ":") > 2 {
-		return val, fmt.Errorf("bad format for path: %s", val)
-	}
-
-	split := strings.SplitN(val, ":", 3)
-	if split[0] == "" {
-		return val, fmt.Errorf("bad format for path: %s", val)
-	}
-	switch len(split) {
-	case 1:
-		containerPath = split[0]
-		val = path.Clean(containerPath)
-	case 2:
-		if isValid := validator(split[1]); isValid {
-			containerPath = split[0]
-			mode = split[1]
-			val = fmt.Sprintf("%s:%s", path.Clean(containerPath), mode)
-		} else {
-			containerPath = split[1]
-			val = fmt.Sprintf("%s:%s", split[0], path.Clean(containerPath))
-		}
-	case 3:
-		containerPath = split[1]
-		mode = split[2]
-		if isValid := validator(split[2]); !isValid {
-			return val, fmt.Errorf("bad mode specified: %s", mode)
-		}
-		val = fmt.Sprintf("%s:%s:%s", split[0], containerPath, mode)
-	}
-
-	if !path.IsAbs(containerPath) {
-		return val, fmt.Errorf("%s is not an absolute path", containerPath)
-	}
-	return val, nil
-}
-
-// ValidateEnv validates an environment variable and returns it.
-// If no value is specified, it returns the current value using os.Getenv.
-//
-// As on ParseEnvFile and related to #16585, environment variable names
-// are not validate what so ever, it's up to application inside docker
-// to validate them or not.
-func ValidateEnv(val string) (string, error) {
-	arr := strings.Split(val, "=")
-	if len(arr) > 1 {
-		return val, nil
-	}
-	if !doesEnvExist(val) {
-		return val, nil
-	}
-	return fmt.Sprintf("%s=%s", val, os.Getenv(val)), nil
-}
-
-// ValidateIPAddress validates an Ip address.
-func ValidateIPAddress(val string) (string, error) {
-	var ip = net.ParseIP(strings.TrimSpace(val))
-	if ip != nil {
-		return ip.String(), nil
-	}
-	return "", fmt.Errorf("%s is not an ip address", val)
-}
-
-// ValidateMACAddress validates a MAC address.
-func ValidateMACAddress(val string) (string, error) {
-	_, err := net.ParseMAC(strings.TrimSpace(val))
-	if err != nil {
-		return "", err
-	}
-	return val, nil
-}
-
-// ValidateDNSSearch validates domain for resolvconf search configuration.
-// A zero length domain is represented by a dot (.).
-func ValidateDNSSearch(val string) (string, error) {
-	if val = strings.Trim(val, " "); val == "." {
-		return val, nil
-	}
-	return validateDomain(val)
-}
-
-func validateDomain(val string) (string, error) {
-	if alphaRegexp.FindString(val) == "" {
-		return "", fmt.Errorf("%s is not a valid domain", val)
-	}
-	ns := domainRegexp.FindSubmatch([]byte(val))
-	if len(ns) > 0 && len(ns[1]) < 255 {
-		return string(ns[1]), nil
-	}
-	return "", fmt.Errorf("%s is not a valid domain", val)
-}
-
-// ValidateExtraHost validates that the specified string is a valid extrahost and returns it.
-// ExtraHost are in the form of name:ip where the ip has to be a valid ip (ipv4 or ipv6).
-func ValidateExtraHost(val string) (string, error) {
-	// allow for IPv6 addresses in extra hosts by only splitting on first ":"
-	arr := strings.SplitN(val, ":", 2)
-	if len(arr) != 2 || len(arr[0]) == 0 {
-		return "", fmt.Errorf("bad format for add-host: %q", val)
-	}
-	if _, err := ValidateIPAddress(arr[1]); err != nil {
-		return "", fmt.Errorf("invalid IP address in add-host: %q", arr[1])
-	}
-	return val, nil
-}
-
-// ValidateLabel validates that the specified string is a valid label, and returns it.
-// Labels are in the form on key=value.
-func ValidateLabel(val string) (string, error) {
-	if strings.Count(val, "=") < 1 {
-		return "", fmt.Errorf("bad attribute format: %s", val)
-	}
-	return val, nil
-}
-
-// ValidateHost validates that the specified string is a valid host and returns it.
-func ValidateHost(val string) (string, error) {
-	_, err := parsers.ParseDockerDaemonHost(DefaultTCPHost, DefaultTLSHost, DefaultUnixSocket, "", val)
-	if err != nil {
-		return val, err
-	}
-	// Note: unlike most flag validators, we don't return the mutated value here
-	//       we need to know what the user entered later (using ParseHost) to adjust for tls
-	return val, nil
-}
-
-// ParseHost and set defaults for a Daemon host string
-func ParseHost(defaultHost, val string) (string, error) {
-	host, err := parsers.ParseDockerDaemonHost(DefaultTCPHost, DefaultTLSHost, DefaultUnixSocket, defaultHost, val)
-	if err != nil {
-		return val, err
-	}
-	return host, nil
-}
-
-func doesEnvExist(name string) bool {
-	for _, entry := range os.Environ() {
-		parts := strings.SplitN(entry, "=", 2)
-		if parts[0] == name {
-			return true
-		}
-	}
-	return false
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/opts/ulimit.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/opts/ulimit.go
deleted file mode 100644
index 7cd480791..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/opts/ulimit.go
+++ /dev/null
@@ -1,52 +0,0 @@
-package opts
-
-import (
-	"fmt"
-
-	"github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/ulimit"
-)
-
-// UlimitOpt defines a map of Ulimits
-type UlimitOpt struct {
-	values *map[string]*ulimit.Ulimit
-}
-
-// NewUlimitOpt creates a new UlimitOpt
-func NewUlimitOpt(ref *map[string]*ulimit.Ulimit) *UlimitOpt {
-	if ref == nil {
-		ref = &map[string]*ulimit.Ulimit{}
-	}
-	return &UlimitOpt{ref}
-}
-
-// Set validates a Ulimit and sets its name as a key in UlimitOpt
-func (o *UlimitOpt) Set(val string) error {
-	l, err := ulimit.Parse(val)
-	if err != nil {
-		return err
-	}
-
-	(*o.values)[l.Name] = l
-
-	return nil
-}
-
-// String returns Ulimit values as a string.
-func (o *UlimitOpt) String() string {
-	var out []string
-	for _, v := range *o.values {
-		out = append(out, v.String())
-	}
-
-	return fmt.Sprintf("%v", out)
-}
-
-// GetList returns a slice of pointers to Ulimits.
-func (o *UlimitOpt) GetList() []*ulimit.Ulimit {
-	var ulimits []*ulimit.Ulimit
-	for _, v := range *o.values {
-		ulimits = append(ulimits, v)
-	}
-
-	return ulimits
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/README.md b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/README.md
deleted file mode 100644
index 7307d9694..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/README.md
+++ /dev/null
@@ -1 +0,0 @@
-This code provides helper functions for dealing with archive files.
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/archive.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/archive.go
deleted file mode 100644
index fb3327f12..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/archive.go
+++ /dev/null
@@ -1,1016 +0,0 @@
-package archive
-
-import (
-	"archive/tar"
-	"bufio"
-	"bytes"
-	"compress/bzip2"
-	"compress/gzip"
-	"errors"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"runtime"
-	"strings"
-	"syscall"
-
-	"github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus"
-	"github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/fileutils"
-	"github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/idtools"
-	"github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/ioutils"
-	"github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/pools"
-	"github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/promise"
-	"github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system"
-)
-
-type (
-	// Archive is a type of io.ReadCloser which has two interfaces Read and Closer.
-	Archive io.ReadCloser
-	// Reader is a type of io.Reader.
-	Reader io.Reader
-	// Compression is the state represtents if compressed or not.
-	Compression int
-	// TarChownOptions wraps the chown options UID and GID.
-	TarChownOptions struct {
-		UID, GID int
-	}
-	// TarOptions wraps the tar options.
-	TarOptions struct {
-		IncludeFiles     []string
-		ExcludePatterns  []string
-		Compression      Compression
-		NoLchown         bool
-		UIDMaps          []idtools.IDMap
-		GIDMaps          []idtools.IDMap
-		ChownOpts        *TarChownOptions
-		IncludeSourceDir bool
-		// When unpacking, specifies whether overwriting a directory with a
-		// non-directory is allowed and vice versa.
-		NoOverwriteDirNonDir bool
-		// For each include when creating an archive, the included name will be
-		// replaced with the matching name from this map.
-		RebaseNames map[string]string
-	}
-
-	// Archiver allows the reuse of most utility functions of this package
-	// with a pluggable Untar function. Also, to facilitate the passing of
-	// specific id mappings for untar, an archiver can be created with maps
-	// which will then be passed to Untar operations
-	Archiver struct {
-		Untar   func(io.Reader, string, *TarOptions) error
-		UIDMaps []idtools.IDMap
-		GIDMaps []idtools.IDMap
-	}
-
-	// breakoutError is used to differentiate errors related to breaking out
-	// When testing archive breakout in the unit tests, this error is expected
-	// in order for the test to pass.
-	breakoutError error
-)
-
-var (
-	// ErrNotImplemented is the error message of function not implemented.
-	ErrNotImplemented = errors.New("Function not implemented")
-	defaultArchiver   = &Archiver{Untar: Untar, UIDMaps: nil, GIDMaps: nil}
-)
-
-const (
-	// Uncompressed represents the uncompressed.
-	Uncompressed Compression = iota
-	// Bzip2 is bzip2 compression algorithm.
-	Bzip2
-	// Gzip is gzip compression algorithm.
-	Gzip
-	// Xz is xz compression algorithm.
-	Xz
-)
-
-// IsArchive checks if it is a archive by the header.
-func IsArchive(header []byte) bool {
-	compression := DetectCompression(header)
-	if compression != Uncompressed {
-		return true
-	}
-	r := tar.NewReader(bytes.NewBuffer(header))
-	_, err := r.Next()
-	return err == nil
-}
-
-// DetectCompression detects the compression algorithm of the source.
-func DetectCompression(source []byte) Compression {
-	for compression, m := range map[Compression][]byte{
-		Bzip2: {0x42, 0x5A, 0x68},
-		Gzip:  {0x1F, 0x8B, 0x08},
-		Xz:    {0xFD, 0x37, 0x7A, 0x58, 0x5A, 0x00},
-	} {
-		if len(source) < len(m) {
-			logrus.Debugf("Len too short")
-			continue
-		}
-		if bytes.Compare(m, source[:len(m)]) == 0 {
-			return compression
-		}
-	}
-	return Uncompressed
-}
-
-func xzDecompress(archive io.Reader) (io.ReadCloser, <-chan struct{}, error) {
-	args := []string{"xz", "-d", "-c", "-q"}
-
-	return cmdStream(exec.Command(args[0], args[1:]...), archive)
-}
-
-// DecompressStream decompress the archive and returns a ReaderCloser with the decompressed archive.
-func DecompressStream(archive io.Reader) (io.ReadCloser, error) {
-	p := pools.BufioReader32KPool
-	buf := p.Get(archive)
-	bs, err := buf.Peek(10)
-	if err != nil {
-		return nil, err
-	}
-
-	compression := DetectCompression(bs)
-	switch compression {
-	case Uncompressed:
-		readBufWrapper := p.NewReadCloserWrapper(buf, buf)
-		return readBufWrapper, nil
-	case Gzip:
-		gzReader, err := gzip.NewReader(buf)
-		if err != nil {
-			return nil, err
-		}
-		readBufWrapper := p.NewReadCloserWrapper(buf, gzReader)
-		return readBufWrapper, nil
-	case Bzip2:
-		bz2Reader := bzip2.NewReader(buf)
-		readBufWrapper := p.NewReadCloserWrapper(buf, bz2Reader)
-		return readBufWrapper, nil
-	case Xz:
-		xzReader, chdone, err := xzDecompress(buf)
-		if err != nil {
-			return nil, err
-		}
-		readBufWrapper := p.NewReadCloserWrapper(buf, xzReader)
-		return ioutils.NewReadCloserWrapper(readBufWrapper, func() error {
-			<-chdone
-			return readBufWrapper.Close()
-		}), nil
-	default:
-		return nil, fmt.Errorf("Unsupported compression format %s", (&compression).Extension())
-	}
-}
-
-// CompressStream compresses the dest with specified compression algorithm.
-func CompressStream(dest io.WriteCloser, compression Compression) (io.WriteCloser, error) {
-	p := pools.BufioWriter32KPool
-	buf := p.Get(dest)
-	switch compression {
-	case Uncompressed:
-		writeBufWrapper := p.NewWriteCloserWrapper(buf, buf)
-		return writeBufWrapper, nil
-	case Gzip:
-		gzWriter := gzip.NewWriter(dest)
-		writeBufWrapper := p.NewWriteCloserWrapper(buf, gzWriter)
-		return writeBufWrapper, nil
-	case Bzip2, Xz:
-		// archive/bzip2 does not support writing, and there is no xz support at all
-		// However, this is not a problem as docker only currently generates gzipped tars
-		return nil, fmt.Errorf("Unsupported compression format %s", (&compression).Extension())
-	default:
-		return nil, fmt.Errorf("Unsupported compression format %s", (&compression).Extension())
-	}
-}
-
-// Extension returns the extension of a file that uses the specified compression algorithm.
-func (compression *Compression) Extension() string {
-	switch *compression {
-	case Uncompressed:
-		return "tar"
-	case Bzip2:
-		return "tar.bz2"
-	case Gzip:
-		return "tar.gz"
-	case Xz:
-		return "tar.xz"
-	}
-	return ""
-}
-
-type tarAppender struct {
-	TarWriter *tar.Writer
-	Buffer    *bufio.Writer
-
-	// for hardlink mapping
-	SeenFiles map[uint64]string
-	UIDMaps   []idtools.IDMap
-	GIDMaps   []idtools.IDMap
-}
-
-// canonicalTarName provides a platform-independent and consistent posix-style
-//path for files and directories to be archived regardless of the platform.
-func canonicalTarName(name string, isDir bool) (string, error) {
-	name, err := CanonicalTarNameForPath(name)
-	if err != nil {
-		return "", err
-	}
-
-	// suffix with '/' for directories
-	if isDir && !strings.HasSuffix(name, "/") {
-		name += "/"
-	}
-	return name, nil
-}
-
-func (ta *tarAppender) addTarFile(path, name string) error {
-	fi, err := os.Lstat(path)
-	if err != nil {
-		return err
-	}
-
-	link := ""
-	if fi.Mode()&os.ModeSymlink != 0 {
-		if link, err = os.Readlink(path); err != nil {
-			return err
-		}
-	}
-
-	hdr, err := tar.FileInfoHeader(fi, link)
-	if err != nil {
-		return err
-	}
-	hdr.Mode = int64(chmodTarEntry(os.FileMode(hdr.Mode)))
-
-	name, err = canonicalTarName(name, fi.IsDir())
-	if err != nil {
-		return fmt.Errorf("tar: cannot canonicalize path: %v", err)
-	}
-	hdr.Name = name
-
-	inode, err := setHeaderForSpecialDevice(hdr, ta, name, fi.Sys())
-	if err != nil {
-		return err
-	}
-
-	// if it's not a directory and has more than 1 link,
-	// it's hardlinked, so set the type flag accordingly
-	if !fi.IsDir() && hasHardlinks(fi) {
-		// a link should have a name that it links too
-		// and that linked name should be first in the tar archive
-		if oldpath, ok := ta.SeenFiles[inode]; ok {
-			hdr.Typeflag = tar.TypeLink
-			hdr.Linkname = oldpath
-			hdr.Size = 0 // This Must be here for the writer math to add up!
-		} else {
-			ta.SeenFiles[inode] = name
-		}
-	}
-
-	capability, _ := system.Lgetxattr(path, "security.capability")
-	if capability != nil {
-		hdr.Xattrs = make(map[string]string)
-		hdr.Xattrs["security.capability"] = string(capability)
-	}
-
-	//handle re-mapping container ID mappings back to host ID mappings before
-	//writing tar headers/files
-	if ta.UIDMaps != nil || ta.GIDMaps != nil {
-		uid, gid, err := getFileUIDGID(fi.Sys())
-		if err != nil {
-			return err
-		}
-		xUID, err := idtools.ToContainer(uid, ta.UIDMaps)
-		if err != nil {
-			return err
-		}
-		xGID, err := idtools.ToContainer(gid, ta.GIDMaps)
-		if err != nil {
-			return err
-		}
-		hdr.Uid = xUID
-		hdr.Gid = xGID
-	}
-
-	if err := ta.TarWriter.WriteHeader(hdr); err != nil {
-		return err
-	}
-
-	if hdr.Typeflag == tar.TypeReg {
-		file, err := os.Open(path)
-		if err != nil {
-			return err
-		}
-
-		ta.Buffer.Reset(ta.TarWriter)
-		defer ta.Buffer.Reset(nil)
-		_, err = io.Copy(ta.Buffer, file)
-		file.Close()
-		if err != nil {
-			return err
-		}
-		err = ta.Buffer.Flush()
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-func createTarFile(path, extractDir string, hdr *tar.Header, reader io.Reader, Lchown bool, chownOpts *TarChownOptions) error {
-	// hdr.Mode is in linux format, which we can use for sycalls,
-	// but for os.Foo() calls we need the mode converted to os.FileMode,
-	// so use hdrInfo.Mode() (they differ for e.g. setuid bits)
-	hdrInfo := hdr.FileInfo()
-
-	switch hdr.Typeflag {
-	case tar.TypeDir:
-		// Create directory unless it exists as a directory already.
-		// In that case we just want to merge the two
-		if fi, err := os.Lstat(path); !(err == nil && fi.IsDir()) {
-			if err := os.Mkdir(path, hdrInfo.Mode()); err != nil {
-				return err
-			}
-		}
-
-	case tar.TypeReg, tar.TypeRegA:
-		// Source is regular file
-		file, err := os.OpenFile(path, os.O_CREATE|os.O_WRONLY, hdrInfo.Mode())
-		if err != nil {
-			return err
-		}
-		if _, err := io.Copy(file, reader); err != nil {
-			file.Close()
-			return err
-		}
-		file.Close()
-
-	case tar.TypeBlock, tar.TypeChar, tar.TypeFifo:
-		// Handle this is an OS-specific way
-		if err := handleTarTypeBlockCharFifo(hdr, path); err != nil {
-			return err
-		}
-
-	case tar.TypeLink:
-		targetPath := filepath.Join(extractDir, hdr.Linkname)
-		// check for hardlink breakout
-		if !strings.HasPrefix(targetPath, extractDir) {
-			return breakoutError(fmt.Errorf("invalid hardlink %q -> %q", targetPath, hdr.Linkname))
-		}
-		if err := os.Link(targetPath, path); err != nil {
-			return err
-		}
-
-	case tar.TypeSymlink:
-		// 	path 				-> hdr.Linkname = targetPath
-		// e.g. /extractDir/path/to/symlink 	-> ../2/file	= /extractDir/path/2/file
-		targetPath := filepath.Join(filepath.Dir(path), hdr.Linkname)
-
-		// the reason we don't need to check symlinks in the path (with FollowSymlinkInScope) is because
-		// that symlink would first have to be created, which would be caught earlier, at this very check:
-		if !strings.HasPrefix(targetPath, extractDir) {
-			return breakoutError(fmt.Errorf("invalid symlink %q -> %q", path, hdr.Linkname))
-		}
-		if err := os.Symlink(hdr.Linkname, path); err != nil {
-			return err
-		}
-
-	case tar.TypeXGlobalHeader:
-		logrus.Debugf("PAX Global Extended Headers found and ignored")
-		return nil
-
-	default:
-		return fmt.Errorf("Unhandled tar header type %d\n", hdr.Typeflag)
-	}
-
-	// Lchown is not supported on Windows.
-	if Lchown && runtime.GOOS != "windows" {
-		if chownOpts == nil {
-			chownOpts = &TarChownOptions{UID: hdr.Uid, GID: hdr.Gid}
-		}
-		if err := os.Lchown(path, chownOpts.UID, chownOpts.GID); err != nil {
-			return err
-		}
-	}
-
-	for key, value := range hdr.Xattrs {
-		if err := system.Lsetxattr(path, key, []byte(value), 0); err != nil {
-			return err
-		}
-	}
-
-	// There is no LChmod, so ignore mode for symlink. Also, this
-	// must happen after chown, as that can modify the file mode
-	if err := handleLChmod(hdr, path, hdrInfo); err != nil {
-		return err
-	}
-
-	// system.Chtimes doesn't support a NOFOLLOW flag atm
-	if hdr.Typeflag == tar.TypeLink {
-		if fi, err := os.Lstat(hdr.Linkname); err == nil && (fi.Mode()&os.ModeSymlink == 0) {
-			if err := system.Chtimes(path, hdr.AccessTime, hdr.ModTime); err != nil {
-				return err
-			}
-		}
-	} else if hdr.Typeflag != tar.TypeSymlink {
-		if err := system.Chtimes(path, hdr.AccessTime, hdr.ModTime); err != nil {
-			return err
-		}
-	} else {
-		ts := []syscall.Timespec{timeToTimespec(hdr.AccessTime), timeToTimespec(hdr.ModTime)}
-		if err := system.LUtimesNano(path, ts); err != nil && err != system.ErrNotSupportedPlatform {
-			return err
-		}
-	}
-	return nil
-}
-
-// Tar creates an archive from the directory at `path`, and returns it as a
-// stream of bytes.
-func Tar(path string, compression Compression) (io.ReadCloser, error) {
-	return TarWithOptions(path, &TarOptions{Compression: compression})
-}
-
-// TarWithOptions creates an archive from the directory at `path`, only including files whose relative
-// paths are included in `options.IncludeFiles` (if non-nil) or not in `options.ExcludePatterns`.
-func TarWithOptions(srcPath string, options *TarOptions) (io.ReadCloser, error) {
-
-	// Fix the source path to work with long path names. This is a no-op
-	// on platforms other than Windows.
-	srcPath = fixVolumePathPrefix(srcPath)
-
-	patterns, patDirs, exceptions, err := fileutils.CleanPatterns(options.ExcludePatterns)
-
-	if err != nil {
-		return nil, err
-	}
-
-	pipeReader, pipeWriter := io.Pipe()
-
-	compressWriter, err := CompressStream(pipeWriter, options.Compression)
-	if err != nil {
-		return nil, err
-	}
-
-	go func() {
-		ta := &tarAppender{
-			TarWriter: tar.NewWriter(compressWriter),
-			Buffer:    pools.BufioWriter32KPool.Get(nil),
-			SeenFiles: make(map[uint64]string),
-			UIDMaps:   options.UIDMaps,
-			GIDMaps:   options.GIDMaps,
-		}
-
-		defer func() {
-			// Make sure to check the error on Close.
-			if err := ta.TarWriter.Close(); err != nil {
-				logrus.Debugf("Can't close tar writer: %s", err)
-			}
-			if err := compressWriter.Close(); err != nil {
-				logrus.Debugf("Can't close compress writer: %s", err)
-			}
-			if err := pipeWriter.Close(); err != nil {
-				logrus.Debugf("Can't close pipe writer: %s", err)
-			}
-		}()
-
-		// this buffer is needed for the duration of this piped stream
-		defer pools.BufioWriter32KPool.Put(ta.Buffer)
-
-		// In general we log errors here but ignore them because
-		// during e.g. a diff operation the container can continue
-		// mutating the filesystem and we can see transient errors
-		// from this
-
-		stat, err := os.Lstat(srcPath)
-		if err != nil {
-			return
-		}
-
-		if !stat.IsDir() {
-			// We can't later join a non-dir with any includes because the
-			// 'walk' will error if "file/." is stat-ed and "file" is not a
-			// directory. So, we must split the source path and use the
-			// basename as the include.
-			if len(options.IncludeFiles) > 0 {
-				logrus.Warn("Tar: Can't archive a file with includes")
-			}
-
-			dir, base := SplitPathDirEntry(srcPath)
-			srcPath = dir
-			options.IncludeFiles = []string{base}
-		}
-
-		if len(options.IncludeFiles) == 0 {
-			options.IncludeFiles = []string{"."}
-		}
-
-		seen := make(map[string]bool)
-
-		for _, include := range options.IncludeFiles {
-			rebaseName := options.RebaseNames[include]
-
-			walkRoot := getWalkRoot(srcPath, include)
-			filepath.Walk(walkRoot, func(filePath string, f os.FileInfo, err error) error {
-				if err != nil {
-					logrus.Debugf("Tar: Can't stat file %s to tar: %s", srcPath, err)
-					return nil
-				}
-
-				relFilePath, err := filepath.Rel(srcPath, filePath)
-				if err != nil || (!options.IncludeSourceDir && relFilePath == "." && f.IsDir()) {
-					// Error getting relative path OR we are looking
-					// at the source directory path. Skip in both situations.
-					return nil
-				}
-
-				if options.IncludeSourceDir && include == "." && relFilePath != "." {
-					relFilePath = strings.Join([]string{".", relFilePath}, string(filepath.Separator))
-				}
-
-				skip := false
-
-				// If "include" is an exact match for the current file
-				// then even if there's an "excludePatterns" pattern that
-				// matches it, don't skip it. IOW, assume an explicit 'include'
-				// is asking for that file no matter what - which is true
-				// for some files, like .dockerignore and Dockerfile (sometimes)
-				if include != relFilePath {
-					skip, err = fileutils.OptimizedMatches(relFilePath, patterns, patDirs)
-					if err != nil {
-						logrus.Debugf("Error matching %s: %v", relFilePath, err)
-						return err
-					}
-				}
-
-				if skip {
-					if !exceptions && f.IsDir() {
-						return filepath.SkipDir
-					}
-					return nil
-				}
-
-				if seen[relFilePath] {
-					return nil
-				}
-				seen[relFilePath] = true
-
-				// Rename the base resource.
-				if rebaseName != "" {
-					var replacement string
-					if rebaseName != string(filepath.Separator) {
-						// Special case the root directory to replace with an
-						// empty string instead so that we don't end up with
-						// double slashes in the paths.
-						replacement = rebaseName
-					}
-
-					relFilePath = strings.Replace(relFilePath, include, replacement, 1)
-				}
-
-				if err := ta.addTarFile(filePath, relFilePath); err != nil {
-					logrus.Debugf("Can't add file %s to tar: %s", filePath, err)
-				}
-				return nil
-			})
-		}
-	}()
-
-	return pipeReader, nil
-}
-
-// Unpack unpacks the decompressedArchive to dest with options.
-func Unpack(decompressedArchive io.Reader, dest string, options *TarOptions) error {
-	tr := tar.NewReader(decompressedArchive)
-	trBuf := pools.BufioReader32KPool.Get(nil)
-	defer pools.BufioReader32KPool.Put(trBuf)
-
-	var dirs []*tar.Header
-	remappedRootUID, remappedRootGID, err := idtools.GetRootUIDGID(options.UIDMaps, options.GIDMaps)
-	if err != nil {
-		return err
-	}
-
-	// Iterate through the files in the archive.
-loop:
-	for {
-		hdr, err := tr.Next()
-		if err == io.EOF {
-			// end of tar archive
-			break
-		}
-		if err != nil {
-			return err
-		}
-
-		// Normalize name, for safety and for a simple is-root check
-		// This keeps "../" as-is, but normalizes "/../" to "/". Or Windows:
-		// This keeps "..\" as-is, but normalizes "\..\" to "\".
-		hdr.Name = filepath.Clean(hdr.Name)
-
-		for _, exclude := range options.ExcludePatterns {
-			if strings.HasPrefix(hdr.Name, exclude) {
-				continue loop
-			}
-		}
-
-		// After calling filepath.Clean(hdr.Name) above, hdr.Name will now be in
-		// the filepath format for the OS on which the daemon is running. Hence
-		// the check for a slash-suffix MUST be done in an OS-agnostic way.
-		if !strings.HasSuffix(hdr.Name, string(os.PathSeparator)) {
-			// Not the root directory, ensure that the parent directory exists
-			parent := filepath.Dir(hdr.Name)
-			parentPath := filepath.Join(dest, parent)
-			if _, err := os.Lstat(parentPath); err != nil && os.IsNotExist(err) {
-				err = system.MkdirAll(parentPath, 0777)
-				if err != nil {
-					return err
-				}
-			}
-		}
-
-		path := filepath.Join(dest, hdr.Name)
-		rel, err := filepath.Rel(dest, path)
-		if err != nil {
-			return err
-		}
-		if strings.HasPrefix(rel, ".."+string(os.PathSeparator)) {
-			return breakoutError(fmt.Errorf("%q is outside of %q", hdr.Name, dest))
-		}
-
-		// If path exits we almost always just want to remove and replace it
-		// The only exception is when it is a directory *and* the file from
-		// the layer is also a directory. Then we want to merge them (i.e.
-		// just apply the metadata from the layer).
-		if fi, err := os.Lstat(path); err == nil {
-			if options.NoOverwriteDirNonDir && fi.IsDir() && hdr.Typeflag != tar.TypeDir {
-				// If NoOverwriteDirNonDir is true then we cannot replace
-				// an existing directory with a non-directory from the archive.
-				return fmt.Errorf("cannot overwrite directory %q with non-directory %q", path, dest)
-			}
-
-			if options.NoOverwriteDirNonDir && !fi.IsDir() && hdr.Typeflag == tar.TypeDir {
-				// If NoOverwriteDirNonDir is true then we cannot replace
-				// an existing non-directory with a directory from the archive.
-				return fmt.Errorf("cannot overwrite non-directory %q with directory %q", path, dest)
-			}
-
-			if fi.IsDir() && hdr.Name == "." {
-				continue
-			}
-
-			if !(fi.IsDir() && hdr.Typeflag == tar.TypeDir) {
-				if err := os.RemoveAll(path); err != nil {
-					return err
-				}
-			}
-		}
-		trBuf.Reset(tr)
-
-		// if the options contain a uid & gid maps, convert header uid/gid
-		// entries using the maps such that lchown sets the proper mapped
-		// uid/gid after writing the file. We only perform this mapping if
-		// the file isn't already owned by the remapped root UID or GID, as
-		// that specific uid/gid has no mapping from container -> host, and
-		// those files already have the proper ownership for inside the
-		// container.
-		if hdr.Uid != remappedRootUID {
-			xUID, err := idtools.ToHost(hdr.Uid, options.UIDMaps)
-			if err != nil {
-				return err
-			}
-			hdr.Uid = xUID
-		}
-		if hdr.Gid != remappedRootGID {
-			xGID, err := idtools.ToHost(hdr.Gid, options.GIDMaps)
-			if err != nil {
-				return err
-			}
-			hdr.Gid = xGID
-		}
-
-		if err := createTarFile(path, dest, hdr, trBuf, !options.NoLchown, options.ChownOpts); err != nil {
-			return err
-		}
-
-		// Directory mtimes must be handled at the end to avoid further
-		// file creation in them to modify the directory mtime
-		if hdr.Typeflag == tar.TypeDir {
-			dirs = append(dirs, hdr)
-		}
-	}
-
-	for _, hdr := range dirs {
-		path := filepath.Join(dest, hdr.Name)
-
-		if err := system.Chtimes(path, hdr.AccessTime, hdr.ModTime); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-// Untar reads a stream of bytes from `archive`, parses it as a tar archive,
-// and unpacks it into the directory at `dest`.
-// The archive may be compressed with one of the following algorithms:
-//  identity (uncompressed), gzip, bzip2, xz.
-// FIXME: specify behavior when target path exists vs. doesn't exist.
-func Untar(tarArchive io.Reader, dest string, options *TarOptions) error {
-	return untarHandler(tarArchive, dest, options, true)
-}
-
-// UntarUncompressed reads a stream of bytes from `archive`, parses it as a tar archive,
-// and unpacks it into the directory at `dest`.
-// The archive must be an uncompressed stream.
-func UntarUncompressed(tarArchive io.Reader, dest string, options *TarOptions) error {
-	return untarHandler(tarArchive, dest, options, false)
-}
-
-// Handler for teasing out the automatic decompression
-func untarHandler(tarArchive io.Reader, dest string, options *TarOptions, decompress bool) error {
-	if tarArchive == nil {
-		return fmt.Errorf("Empty archive")
-	}
-	dest = filepath.Clean(dest)
-	if options == nil {
-		options = &TarOptions{}
-	}
-	if options.ExcludePatterns == nil {
-		options.ExcludePatterns = []string{}
-	}
-
-	r := tarArchive
-	if decompress {
-		decompressedArchive, err := DecompressStream(tarArchive)
-		if err != nil {
-			return err
-		}
-		defer decompressedArchive.Close()
-		r = decompressedArchive
-	}
-
-	return Unpack(r, dest, options)
-}
-
-// TarUntar is a convenience function which calls Tar and Untar, with the output of one piped into the other.
-// If either Tar or Untar fails, TarUntar aborts and returns the error.
-func (archiver *Archiver) TarUntar(src, dst string) error {
-	logrus.Debugf("TarUntar(%s %s)", src, dst)
-	archive, err := TarWithOptions(src, &TarOptions{Compression: Uncompressed})
-	if err != nil {
-		return err
-	}
-	defer archive.Close()
-
-	var options *TarOptions
-	if archiver.UIDMaps != nil || archiver.GIDMaps != nil {
-		options = &TarOptions{
-			UIDMaps: archiver.UIDMaps,
-			GIDMaps: archiver.GIDMaps,
-		}
-	}
-	return archiver.Untar(archive, dst, options)
-}
-
-// TarUntar is a convenience function which calls Tar and Untar, with the output of one piped into the other.
-// If either Tar or Untar fails, TarUntar aborts and returns the error.
-func TarUntar(src, dst string) error {
-	return defaultArchiver.TarUntar(src, dst)
-}
-
-// UntarPath untar a file from path to a destination, src is the source tar file path.
-func (archiver *Archiver) UntarPath(src, dst string) error {
-	archive, err := os.Open(src)
-	if err != nil {
-		return err
-	}
-	defer archive.Close()
-	var options *TarOptions
-	if archiver.UIDMaps != nil || archiver.GIDMaps != nil {
-		options = &TarOptions{
-			UIDMaps: archiver.UIDMaps,
-			GIDMaps: archiver.GIDMaps,
-		}
-	}
-	if err := archiver.Untar(archive, dst, options); err != nil {
-		return err
-	}
-	return nil
-}
-
-// UntarPath is a convenience function which looks for an archive
-// at filesystem path `src`, and unpacks it at `dst`.
-func UntarPath(src, dst string) error {
-	return defaultArchiver.UntarPath(src, dst)
-}
-
-// CopyWithTar creates a tar archive of filesystem path `src`, and
-// unpacks it at filesystem path `dst`.
-// The archive is streamed directly with fixed buffering and no
-// intermediary disk IO.
-func (archiver *Archiver) CopyWithTar(src, dst string) error {
-	srcSt, err := os.Stat(src)
-	if err != nil {
-		return err
-	}
-	if !srcSt.IsDir() {
-		return archiver.CopyFileWithTar(src, dst)
-	}
-	// Create dst, copy src's content into it
-	logrus.Debugf("Creating dest directory: %s", dst)
-	if err := system.MkdirAll(dst, 0755); err != nil {
-		return err
-	}
-	logrus.Debugf("Calling TarUntar(%s, %s)", src, dst)
-	return archiver.TarUntar(src, dst)
-}
-
-// CopyWithTar creates a tar archive of filesystem path `src`, and
-// unpacks it at filesystem path `dst`.
-// The archive is streamed directly with fixed buffering and no
-// intermediary disk IO.
-func CopyWithTar(src, dst string) error {
-	return defaultArchiver.CopyWithTar(src, dst)
-}
-
-// CopyFileWithTar emulates the behavior of the 'cp' command-line
-// for a single file. It copies a regular file from path `src` to
-// path `dst`, and preserves all its metadata.
-func (archiver *Archiver) CopyFileWithTar(src, dst string) (err error) {
-	logrus.Debugf("CopyFileWithTar(%s, %s)", src, dst)
-	srcSt, err := os.Stat(src)
-	if err != nil {
-		return err
-	}
-
-	if srcSt.IsDir() {
-		return fmt.Errorf("Can't copy a directory")
-	}
-
-	// Clean up the trailing slash. This must be done in an operating
-	// system specific manner.
-	if dst[len(dst)-1] == os.PathSeparator {
-		dst = filepath.Join(dst, filepath.Base(src))
-	}
-	// Create the holding directory if necessary
-	if err := system.MkdirAll(filepath.Dir(dst), 0700); err != nil {
-		return err
-	}
-
-	r, w := io.Pipe()
-	errC := promise.Go(func() error {
-		defer w.Close()
-
-		srcF, err := os.Open(src)
-		if err != nil {
-			return err
-		}
-		defer srcF.Close()
-
-		hdr, err := tar.FileInfoHeader(srcSt, "")
-		if err != nil {
-			return err
-		}
-		hdr.Name = filepath.Base(dst)
-		hdr.Mode = int64(chmodTarEntry(os.FileMode(hdr.Mode)))
-
-		remappedRootUID, remappedRootGID, err := idtools.GetRootUIDGID(archiver.UIDMaps, archiver.GIDMaps)
-		if err != nil {
-			return err
-		}
-
-		// only perform mapping if the file being copied isn't already owned by the
-		// uid or gid of the remapped root in the container
-		if remappedRootUID != hdr.Uid {
-			xUID, err := idtools.ToHost(hdr.Uid, archiver.UIDMaps)
-			if err != nil {
-				return err
-			}
-			hdr.Uid = xUID
-		}
-		if remappedRootGID != hdr.Gid {
-			xGID, err := idtools.ToHost(hdr.Gid, archiver.GIDMaps)
-			if err != nil {
-				return err
-			}
-			hdr.Gid = xGID
-		}
-
-		tw := tar.NewWriter(w)
-		defer tw.Close()
-		if err := tw.WriteHeader(hdr); err != nil {
-			return err
-		}
-		if _, err := io.Copy(tw, srcF); err != nil {
-			return err
-		}
-		return nil
-	})
-	defer func() {
-		if er := <-errC; err != nil {
-			err = er
-		}
-	}()
-
-	err = archiver.Untar(r, filepath.Dir(dst), nil)
-	if err != nil {
-		r.CloseWithError(err)
-	}
-	return err
-}
-
-// CopyFileWithTar emulates the behavior of the 'cp' command-line
-// for a single file. It copies a regular file from path `src` to
-// path `dst`, and preserves all its metadata.
-//
-// Destination handling is in an operating specific manner depending
-// where the daemon is running. If `dst` ends with a trailing slash
-// the final destination path will be `dst/base(src)`  (Linux) or
-// `dst\base(src)` (Windows).
-func CopyFileWithTar(src, dst string) (err error) {
-	return defaultArchiver.CopyFileWithTar(src, dst)
-}
-
-// cmdStream executes a command, and returns its stdout as a stream.
-// If the command fails to run or doesn't complete successfully, an error
-// will be returned, including anything written on stderr.
-func cmdStream(cmd *exec.Cmd, input io.Reader) (io.ReadCloser, <-chan struct{}, error) {
-	chdone := make(chan struct{})
-	cmd.Stdin = input
-	pipeR, pipeW := io.Pipe()
-	cmd.Stdout = pipeW
-	var errBuf bytes.Buffer
-	cmd.Stderr = &errBuf
-
-	// Run the command and return the pipe
-	if err := cmd.Start(); err != nil {
-		return nil, nil, err
-	}
-
-	// Copy stdout to the returned pipe
-	go func() {
-		if err := cmd.Wait(); err != nil {
-			pipeW.CloseWithError(fmt.Errorf("%s: %s", err, errBuf.String()))
-		} else {
-			pipeW.Close()
-		}
-		close(chdone)
-	}()
-
-	return pipeR, chdone, nil
-}
-
-// NewTempArchive reads the content of src into a temporary file, and returns the contents
-// of that file as an archive. The archive can only be read once - as soon as reading completes,
-// the file will be deleted.
-func NewTempArchive(src Archive, dir string) (*TempArchive, error) {
-	f, err := ioutil.TempFile(dir, "")
-	if err != nil {
-		return nil, err
-	}
-	if _, err := io.Copy(f, src); err != nil {
-		return nil, err
-	}
-	if _, err := f.Seek(0, 0); err != nil {
-		return nil, err
-	}
-	st, err := f.Stat()
-	if err != nil {
-		return nil, err
-	}
-	size := st.Size()
-	return &TempArchive{File: f, Size: size}, nil
-}
-
-// TempArchive is a temporary archive. The archive can only be read once - as soon as reading completes,
-// the file will be deleted.
-type TempArchive struct {
-	*os.File
-	Size   int64 // Pre-computed from Stat().Size() as a convenience
-	read   int64
-	closed bool
-}
-
-// Close closes the underlying file if it's still open, or does a no-op
-// to allow callers to try to close the TempArchive multiple times safely.
-func (archive *TempArchive) Close() error {
-	if archive.closed {
-		return nil
-	}
-
-	archive.closed = true
-
-	return archive.File.Close()
-}
-
-func (archive *TempArchive) Read(data []byte) (int, error) {
-	n, err := archive.File.Read(data)
-	archive.read += int64(n)
-	if err != nil || archive.read == archive.Size {
-		archive.Close()
-		os.Remove(archive.File.Name())
-	}
-	return n, err
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/archive_unix.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/archive_unix.go
deleted file mode 100644
index 07693e37c..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/archive_unix.go
+++ /dev/null
@@ -1,112 +0,0 @@
-// +build !windows
-
-package archive
-
-import (
-	"archive/tar"
-	"errors"
-	"os"
-	"path/filepath"
-	"syscall"
-
-	"github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system"
-)
-
-// fixVolumePathPrefix does platform specific processing to ensure that if
-// the path being passed in is not in a volume path format, convert it to one.
-func fixVolumePathPrefix(srcPath string) string {
-	return srcPath
-}
-
-// getWalkRoot calculates the root path when performing a TarWithOptions.
-// We use a seperate function as this is platform specific. On Linux, we
-// can't use filepath.Join(srcPath,include) because this will clean away
-// a trailing "." or "/" which may be important.
-func getWalkRoot(srcPath string, include string) string {
-	return srcPath + string(filepath.Separator) + include
-}
-
-// CanonicalTarNameForPath returns platform-specific filepath
-// to canonical posix-style path for tar archival. p is relative
-// path.
-func CanonicalTarNameForPath(p string) (string, error) {
-	return p, nil // already unix-style
-}
-
-// chmodTarEntry is used to adjust the file permissions used in tar header based
-// on the platform the archival is done.
-
-func chmodTarEntry(perm os.FileMode) os.FileMode {
-	return perm // noop for unix as golang APIs provide perm bits correctly
-}
-
-func setHeaderForSpecialDevice(hdr *tar.Header, ta *tarAppender, name string, stat interface{}) (inode uint64, err error) {
-	s, ok := stat.(*syscall.Stat_t)
-
-	if !ok {
-		err = errors.New("cannot convert stat value to syscall.Stat_t")
-		return
-	}
-
-	inode = uint64(s.Ino)
-
-	// Currently go does not fill in the major/minors
-	if s.Mode&syscall.S_IFBLK != 0 ||
-		s.Mode&syscall.S_IFCHR != 0 {
-		hdr.Devmajor = int64(major(uint64(s.Rdev)))
-		hdr.Devminor = int64(minor(uint64(s.Rdev)))
-	}
-
-	return
-}
-
-func getFileUIDGID(stat interface{}) (int, int, error) {
-	s, ok := stat.(*syscall.Stat_t)
-
-	if !ok {
-		return -1, -1, errors.New("cannot convert stat value to syscall.Stat_t")
-	}
-	return int(s.Uid), int(s.Gid), nil
-}
-
-func major(device uint64) uint64 {
-	return (device >> 8) & 0xfff
-}
-
-func minor(device uint64) uint64 {
-	return (device & 0xff) | ((device >> 12) & 0xfff00)
-}
-
-// handleTarTypeBlockCharFifo is an OS-specific helper function used by
-// createTarFile to handle the following types of header: Block; Char; Fifo
-func handleTarTypeBlockCharFifo(hdr *tar.Header, path string) error {
-	mode := uint32(hdr.Mode & 07777)
-	switch hdr.Typeflag {
-	case tar.TypeBlock:
-		mode |= syscall.S_IFBLK
-	case tar.TypeChar:
-		mode |= syscall.S_IFCHR
-	case tar.TypeFifo:
-		mode |= syscall.S_IFIFO
-	}
-
-	if err := system.Mknod(path, mode, int(system.Mkdev(hdr.Devmajor, hdr.Devminor))); err != nil {
-		return err
-	}
-	return nil
-}
-
-func handleLChmod(hdr *tar.Header, path string, hdrInfo os.FileInfo) error {
-	if hdr.Typeflag == tar.TypeLink {
-		if fi, err := os.Lstat(hdr.Linkname); err == nil && (fi.Mode()&os.ModeSymlink == 0) {
-			if err := os.Chmod(path, hdrInfo.Mode()); err != nil {
-				return err
-			}
-		}
-	} else if hdr.Typeflag != tar.TypeSymlink {
-		if err := os.Chmod(path, hdrInfo.Mode()); err != nil {
-			return err
-		}
-	}
-	return nil
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/archive_windows.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/archive_windows.go
deleted file mode 100644
index fbabc03a4..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/archive_windows.go
+++ /dev/null
@@ -1,70 +0,0 @@
-// +build windows
-
-package archive
-
-import (
-	"archive/tar"
-	"fmt"
-	"os"
-	"path/filepath"
-	"strings"
-
-	"github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/longpath"
-)
-
-// fixVolumePathPrefix does platform specific processing to ensure that if
-// the path being passed in is not in a volume path format, convert it to one.
-func fixVolumePathPrefix(srcPath string) string {
-	return longpath.AddPrefix(srcPath)
-}
-
-// getWalkRoot calculates the root path when performing a TarWithOptions.
-// We use a seperate function as this is platform specific.
-func getWalkRoot(srcPath string, include string) string {
-	return filepath.Join(srcPath, include)
-}
-
-// CanonicalTarNameForPath returns platform-specific filepath
-// to canonical posix-style path for tar archival. p is relative
-// path.
-func CanonicalTarNameForPath(p string) (string, error) {
-	// windows: convert windows style relative path with backslashes
-	// into forward slashes. Since windows does not allow '/' or '\'
-	// in file names, it is mostly safe to replace however we must
-	// check just in case
-	if strings.Contains(p, "/") {
-		return "", fmt.Errorf("Windows path contains forward slash: %s", p)
-	}
-	return strings.Replace(p, string(os.PathSeparator), "/", -1), nil
-
-}
-
-// chmodTarEntry is used to adjust the file permissions used in tar header based
-// on the platform the archival is done.
-func chmodTarEntry(perm os.FileMode) os.FileMode {
-	perm &= 0755
-	// Add the x bit: make everything +x from windows
-	perm |= 0111
-
-	return perm
-}
-
-func setHeaderForSpecialDevice(hdr *tar.Header, ta *tarAppender, name string, stat interface{}) (inode uint64, err error) {
-	// do nothing. no notion of Rdev, Inode, Nlink in stat on Windows
-	return
-}
-
-// handleTarTypeBlockCharFifo is an OS-specific helper function used by
-// createTarFile to handle the following types of header: Block; Char; Fifo
-func handleTarTypeBlockCharFifo(hdr *tar.Header, path string) error {
-	return nil
-}
-
-func handleLChmod(hdr *tar.Header, path string, hdrInfo os.FileInfo) error {
-	return nil
-}
-
-func getFileUIDGID(stat interface{}) (int, int, error) {
-	// no notion of file ownership mapping yet on Windows
-	return 0, 0, nil
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/changes.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/changes.go
deleted file mode 100644
index 12ec40163..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/changes.go
+++ /dev/null
@@ -1,413 +0,0 @@
-package archive
-
-import (
-	"archive/tar"
-	"bytes"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"sort"
-	"strings"
-	"syscall"
-	"time"
-
-	"github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus"
-	"github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/idtools"
-	"github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/pools"
-	"github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system"
-)
-
-// ChangeType represents the change type.
-type ChangeType int
-
-const (
-	// ChangeModify represents the modify operation.
-	ChangeModify = iota
-	// ChangeAdd represents the add operation.
-	ChangeAdd
-	// ChangeDelete represents the delete operation.
-	ChangeDelete
-)
-
-// Change represents a change, it wraps the change type and path.
-// It describes changes of the files in the path respect to the
-// parent layers. The change could be modify, add, delete.
-// This is used for layer diff.
-type Change struct {
-	Path string
-	Kind ChangeType
-}
-
-func (change *Change) String() string {
-	var kind string
-	switch change.Kind {
-	case ChangeModify:
-		kind = "C"
-	case ChangeAdd:
-		kind = "A"
-	case ChangeDelete:
-		kind = "D"
-	}
-	return fmt.Sprintf("%s %s", kind, change.Path)
-}
-
-// for sort.Sort
-type changesByPath []Change
-
-func (c changesByPath) Less(i, j int) bool { return c[i].Path < c[j].Path }
-func (c changesByPath) Len() int           { return len(c) }
-func (c changesByPath) Swap(i, j int)      { c[j], c[i] = c[i], c[j] }
-
-// Gnu tar and the go tar writer don't have sub-second mtime
-// precision, which is problematic when we apply changes via tar
-// files, we handle this by comparing for exact times, *or* same
-// second count and either a or b having exactly 0 nanoseconds
-func sameFsTime(a, b time.Time) bool {
-	return a == b ||
-		(a.Unix() == b.Unix() &&
-			(a.Nanosecond() == 0 || b.Nanosecond() == 0))
-}
-
-func sameFsTimeSpec(a, b syscall.Timespec) bool {
-	return a.Sec == b.Sec &&
-		(a.Nsec == b.Nsec || a.Nsec == 0 || b.Nsec == 0)
-}
-
-// Changes walks the path rw and determines changes for the files in the path,
-// with respect to the parent layers
-func Changes(layers []string, rw string) ([]Change, error) {
-	var (
-		changes     []Change
-		changedDirs = make(map[string]struct{})
-	)
-
-	err := filepath.Walk(rw, func(path string, f os.FileInfo, err error) error {
-		if err != nil {
-			return err
-		}
-
-		// Rebase path
-		path, err = filepath.Rel(rw, path)
-		if err != nil {
-			return err
-		}
-
-		// As this runs on the daemon side, file paths are OS specific.
-		path = filepath.Join(string(os.PathSeparator), path)
-
-		// Skip root
-		if path == string(os.PathSeparator) {
-			return nil
-		}
-
-		// Skip AUFS metadata
-		if matched, err := filepath.Match(string(os.PathSeparator)+WhiteoutMetaPrefix+"*", path); err != nil || matched {
-			return err
-		}
-
-		change := Change{
-			Path: path,
-		}
-
-		// Find out what kind of modification happened
-		file := filepath.Base(path)
-		// If there is a whiteout, then the file was removed
-		if strings.HasPrefix(file, WhiteoutPrefix) {
-			originalFile := file[len(WhiteoutPrefix):]
-			change.Path = filepath.Join(filepath.Dir(path), originalFile)
-			change.Kind = ChangeDelete
-		} else {
-			// Otherwise, the file was added
-			change.Kind = ChangeAdd
-
-			// ...Unless it already existed in a top layer, in which case, it's a modification
-			for _, layer := range layers {
-				stat, err := os.Stat(filepath.Join(layer, path))
-				if err != nil && !os.IsNotExist(err) {
-					return err
-				}
-				if err == nil {
-					// The file existed in the top layer, so that's a modification
-
-					// However, if it's a directory, maybe it wasn't actually modified.
-					// If you modify /foo/bar/baz, then /foo will be part of the changed files only because it's the parent of bar
-					if stat.IsDir() && f.IsDir() {
-						if f.Size() == stat.Size() && f.Mode() == stat.Mode() && sameFsTime(f.ModTime(), stat.ModTime()) {
-							// Both directories are the same, don't record the change
-							return nil
-						}
-					}
-					change.Kind = ChangeModify
-					break
-				}
-			}
-		}
-
-		// If /foo/bar/file.txt is modified, then /foo/bar must be part of the changed files.
-		// This block is here to ensure the change is recorded even if the
-		// modify time, mode and size of the parent directoriy in the rw and ro layers are all equal.
-		// Check https://github.com/docker/docker/pull/13590 for details.
-		if f.IsDir() {
-			changedDirs[path] = struct{}{}
-		}
-		if change.Kind == ChangeAdd || change.Kind == ChangeDelete {
-			parent := filepath.Dir(path)
-			if _, ok := changedDirs[parent]; !ok && parent != "/" {
-				changes = append(changes, Change{Path: parent, Kind: ChangeModify})
-				changedDirs[parent] = struct{}{}
-			}
-		}
-
-		// Record change
-		changes = append(changes, change)
-		return nil
-	})
-	if err != nil && !os.IsNotExist(err) {
-		return nil, err
-	}
-	return changes, nil
-}
-
-// FileInfo describes the information of a file.
-type FileInfo struct {
-	parent     *FileInfo
-	name       string
-	stat       *system.StatT
-	children   map[string]*FileInfo
-	capability []byte
-	added      bool
-}
-
-// LookUp looks up the file information of a file.
-func (info *FileInfo) LookUp(path string) *FileInfo {
-	// As this runs on the daemon side, file paths are OS specific.
-	parent := info
-	if path == string(os.PathSeparator) {
-		return info
-	}
-
-	pathElements := strings.Split(path, string(os.PathSeparator))
-	for _, elem := range pathElements {
-		if elem != "" {
-			child := parent.children[elem]
-			if child == nil {
-				return nil
-			}
-			parent = child
-		}
-	}
-	return parent
-}
-
-func (info *FileInfo) path() string {
-	if info.parent == nil {
-		// As this runs on the daemon side, file paths are OS specific.
-		return string(os.PathSeparator)
-	}
-	return filepath.Join(info.parent.path(), info.name)
-}
-
-func (info *FileInfo) addChanges(oldInfo *FileInfo, changes *[]Change) {
-
-	sizeAtEntry := len(*changes)
-
-	if oldInfo == nil {
-		// add
-		change := Change{
-			Path: info.path(),
-			Kind: ChangeAdd,
-		}
-		*changes = append(*changes, change)
-		info.added = true
-	}
-
-	// We make a copy so we can modify it to detect additions
-	// also, we only recurse on the old dir if the new info is a directory
-	// otherwise any previous delete/change is considered recursive
-	oldChildren := make(map[string]*FileInfo)
-	if oldInfo != nil && info.isDir() {
-		for k, v := range oldInfo.children {
-			oldChildren[k] = v
-		}
-	}
-
-	for name, newChild := range info.children {
-		oldChild, _ := oldChildren[name]
-		if oldChild != nil {
-			// change?
-			oldStat := oldChild.stat
-			newStat := newChild.stat
-			// Note: We can't compare inode or ctime or blocksize here, because these change
-			// when copying a file into a container. However, that is not generally a problem
-			// because any content change will change mtime, and any status change should
-			// be visible when actually comparing the stat fields. The only time this
-			// breaks down is if some code intentionally hides a change by setting
-			// back mtime
-			if statDifferent(oldStat, newStat) ||
-				bytes.Compare(oldChild.capability, newChild.capability) != 0 {
-				change := Change{
-					Path: newChild.path(),
-					Kind: ChangeModify,
-				}
-				*changes = append(*changes, change)
-				newChild.added = true
-			}
-
-			// Remove from copy so we can detect deletions
-			delete(oldChildren, name)
-		}
-
-		newChild.addChanges(oldChild, changes)
-	}
-	for _, oldChild := range oldChildren {
-		// delete
-		change := Change{
-			Path: oldChild.path(),
-			Kind: ChangeDelete,
-		}
-		*changes = append(*changes, change)
-	}
-
-	// If there were changes inside this directory, we need to add it, even if the directory
-	// itself wasn't changed. This is needed to properly save and restore filesystem permissions.
-	// As this runs on the daemon side, file paths are OS specific.
-	if len(*changes) > sizeAtEntry && info.isDir() && !info.added && info.path() != string(os.PathSeparator) {
-		change := Change{
-			Path: info.path(),
-			Kind: ChangeModify,
-		}
-		// Let's insert the directory entry before the recently added entries located inside this dir
-		*changes = append(*changes, change) // just to resize the slice, will be overwritten
-		copy((*changes)[sizeAtEntry+1:], (*changes)[sizeAtEntry:])
-		(*changes)[sizeAtEntry] = change
-	}
-
-}
-
-// Changes add changes to file information.
-func (info *FileInfo) Changes(oldInfo *FileInfo) []Change {
-	var changes []Change
-
-	info.addChanges(oldInfo, &changes)
-
-	return changes
-}
-
-func newRootFileInfo() *FileInfo {
-	// As this runs on the daemon side, file paths are OS specific.
-	root := &FileInfo{
-		name:     string(os.PathSeparator),
-		children: make(map[string]*FileInfo),
-	}
-	return root
-}
-
-// ChangesDirs compares two directories and generates an array of Change objects describing the changes.
-// If oldDir is "", then all files in newDir will be Add-Changes.
-func ChangesDirs(newDir, oldDir string) ([]Change, error) {
-	var (
-		oldRoot, newRoot *FileInfo
-	)
-	if oldDir == "" {
-		emptyDir, err := ioutil.TempDir("", "empty")
-		if err != nil {
-			return nil, err
-		}
-		defer os.Remove(emptyDir)
-		oldDir = emptyDir
-	}
-	oldRoot, newRoot, err := collectFileInfoForChanges(oldDir, newDir)
-	if err != nil {
-		return nil, err
-	}
-
-	return newRoot.Changes(oldRoot), nil
-}
-
-// ChangesSize calculates the size in bytes of the provided changes, based on newDir.
-func ChangesSize(newDir string, changes []Change) int64 {
-	var (
-		size int64
-		sf   = make(map[uint64]struct{})
-	)
-	for _, change := range changes {
-		if change.Kind == ChangeModify || change.Kind == ChangeAdd {
-			file := filepath.Join(newDir, change.Path)
-			fileInfo, err := os.Lstat(file)
-			if err != nil {
-				logrus.Errorf("Can not stat %q: %s", file, err)
-				continue
-			}
-
-			if fileInfo != nil && !fileInfo.IsDir() {
-				if hasHardlinks(fileInfo) {
-					inode := getIno(fileInfo)
-					if _, ok := sf[inode]; !ok {
-						size += fileInfo.Size()
-						sf[inode] = struct{}{}
-					}
-				} else {
-					size += fileInfo.Size()
-				}
-			}
-		}
-	}
-	return size
-}
-
-// ExportChanges produces an Archive from the provided changes, relative to dir.
-func ExportChanges(dir string, changes []Change, uidMaps, gidMaps []idtools.IDMap) (Archive, error) {
-	reader, writer := io.Pipe()
-	go func() {
-		ta := &tarAppender{
-			TarWriter: tar.NewWriter(writer),
-			Buffer:    pools.BufioWriter32KPool.Get(nil),
-			SeenFiles: make(map[uint64]string),
-			UIDMaps:   uidMaps,
-			GIDMaps:   gidMaps,
-		}
-		// this buffer is needed for the duration of this piped stream
-		defer pools.BufioWriter32KPool.Put(ta.Buffer)
-
-		sort.Sort(changesByPath(changes))
-
-		// In general we log errors here but ignore them because
-		// during e.g. a diff operation the container can continue
-		// mutating the filesystem and we can see transient errors
-		// from this
-		for _, change := range changes {
-			if change.Kind == ChangeDelete {
-				whiteOutDir := filepath.Dir(change.Path)
-				whiteOutBase := filepath.Base(change.Path)
-				whiteOut := filepath.Join(whiteOutDir, WhiteoutPrefix+whiteOutBase)
-				timestamp := time.Now()
-				hdr := &tar.Header{
-					Name:       whiteOut[1:],
-					Size:       0,
-					ModTime:    timestamp,
-					AccessTime: timestamp,
-					ChangeTime: timestamp,
-				}
-				if err := ta.TarWriter.WriteHeader(hdr); err != nil {
-					logrus.Debugf("Can't write whiteout header: %s", err)
-				}
-			} else {
-				path := filepath.Join(dir, change.Path)
-				if err := ta.addTarFile(path, change.Path[1:]); err != nil {
-					logrus.Debugf("Can't add file %s to tar: %s", path, err)
-				}
-			}
-		}
-
-		// Make sure to check the error on Close.
-		if err := ta.TarWriter.Close(); err != nil {
-			logrus.Debugf("Can't close layer: %s", err)
-		}
-		if err := writer.Close(); err != nil {
-			logrus.Debugf("failed close Changes writer: %s", err)
-		}
-	}()
-	return reader, nil
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/changes_linux.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/changes_linux.go
deleted file mode 100644
index 378cc09c8..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/changes_linux.go
+++ /dev/null
@@ -1,285 +0,0 @@
-package archive
-
-import (
-	"bytes"
-	"fmt"
-	"os"
-	"path/filepath"
-	"sort"
-	"syscall"
-	"unsafe"
-
-	"github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system"
-)
-
-// walker is used to implement collectFileInfoForChanges on linux. Where this
-// method in general returns the entire contents of two directory trees, we
-// optimize some FS calls out on linux. In particular, we take advantage of the
-// fact that getdents(2) returns the inode of each file in the directory being
-// walked, which, when walking two trees in parallel to generate a list of
-// changes, can be used to prune subtrees without ever having to lstat(2) them
-// directly. Eliminating stat calls in this way can save up to seconds on large
-// images.
-type walker struct {
-	dir1  string
-	dir2  string
-	root1 *FileInfo
-	root2 *FileInfo
-}
-
-// collectFileInfoForChanges returns a complete representation of the trees
-// rooted at dir1 and dir2, with one important exception: any subtree or
-// leaf where the inode and device numbers are an exact match between dir1
-// and dir2 will be pruned from the results. This method is *only* to be used
-// to generating a list of changes between the two directories, as it does not
-// reflect the full contents.
-func collectFileInfoForChanges(dir1, dir2 string) (*FileInfo, *FileInfo, error) {
-	w := &walker{
-		dir1:  dir1,
-		dir2:  dir2,
-		root1: newRootFileInfo(),
-		root2: newRootFileInfo(),
-	}
-
-	i1, err := os.Lstat(w.dir1)
-	if err != nil {
-		return nil, nil, err
-	}
-	i2, err := os.Lstat(w.dir2)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	if err := w.walk("/", i1, i2); err != nil {
-		return nil, nil, err
-	}
-
-	return w.root1, w.root2, nil
-}
-
-// Given a FileInfo, its path info, and a reference to the root of the tree
-// being constructed, register this file with the tree.
-func walkchunk(path string, fi os.FileInfo, dir string, root *FileInfo) error {
-	if fi == nil {
-		return nil
-	}
-	parent := root.LookUp(filepath.Dir(path))
-	if parent == nil {
-		return fmt.Errorf("collectFileInfoForChanges: Unexpectedly no parent for %s", path)
-	}
-	info := &FileInfo{
-		name:     filepath.Base(path),
-		children: make(map[string]*FileInfo),
-		parent:   parent,
-	}
-	cpath := filepath.Join(dir, path)
-	stat, err := system.FromStatT(fi.Sys().(*syscall.Stat_t))
-	if err != nil {
-		return err
-	}
-	info.stat = stat
-	info.capability, _ = system.Lgetxattr(cpath, "security.capability") // lgetxattr(2): fs access
-	parent.children[info.name] = info
-	return nil
-}
-
-// Walk a subtree rooted at the same path in both trees being iterated. For
-// example, /docker/overlay/1234/a/b/c/d and /docker/overlay/8888/a/b/c/d
-func (w *walker) walk(path string, i1, i2 os.FileInfo) (err error) {
-	// Register these nodes with the return trees, unless we're still at the
-	// (already-created) roots:
-	if path != "/" {
-		if err := walkchunk(path, i1, w.dir1, w.root1); err != nil {
-			return err
-		}
-		if err := walkchunk(path, i2, w.dir2, w.root2); err != nil {
-			return err
-		}
-	}
-
-	is1Dir := i1 != nil && i1.IsDir()
-	is2Dir := i2 != nil && i2.IsDir()
-
-	sameDevice := false
-	if i1 != nil && i2 != nil {
-		si1 := i1.Sys().(*syscall.Stat_t)
-		si2 := i2.Sys().(*syscall.Stat_t)
-		if si1.Dev == si2.Dev {
-			sameDevice = true
-		}
-	}
-
-	// If these files are both non-existent, or leaves (non-dirs), we are done.
-	if !is1Dir && !is2Dir {
-		return nil
-	}
-
-	// Fetch the names of all the files contained in both directories being walked:
-	var names1, names2 []nameIno
-	if is1Dir {
-		names1, err = readdirnames(filepath.Join(w.dir1, path)) // getdents(2): fs access
-		if err != nil {
-			return err
-		}
-	}
-	if is2Dir {
-		names2, err = readdirnames(filepath.Join(w.dir2, path)) // getdents(2): fs access
-		if err != nil {
-			return err
-		}
-	}
-
-	// We have lists of the files contained in both parallel directories, sorted
-	// in the same order. Walk them in parallel, generating a unique merged list
-	// of all items present in either or both directories.
-	var names []string
-	ix1 := 0
-	ix2 := 0
-
-	for {
-		if ix1 >= len(names1) {
-			break
-		}
-		if ix2 >= len(names2) {
-			break
-		}
-
-		ni1 := names1[ix1]
-		ni2 := names2[ix2]
-
-		switch bytes.Compare([]byte(ni1.name), []byte(ni2.name)) {
-		case -1: // ni1 < ni2 -- advance ni1
-			// we will not encounter ni1 in names2
-			names = append(names, ni1.name)
-			ix1++
-		case 0: // ni1 == ni2
-			if ni1.ino != ni2.ino || !sameDevice {
-				names = append(names, ni1.name)
-			}
-			ix1++
-			ix2++
-		case 1: // ni1 > ni2 -- advance ni2
-			// we will not encounter ni2 in names1
-			names = append(names, ni2.name)
-			ix2++
-		}
-	}
-	for ix1 < len(names1) {
-		names = append(names, names1[ix1].name)
-		ix1++
-	}
-	for ix2 < len(names2) {
-		names = append(names, names2[ix2].name)
-		ix2++
-	}
-
-	// For each of the names present in either or both of the directories being
-	// iterated, stat the name under each root, and recurse the pair of them:
-	for _, name := range names {
-		fname := filepath.Join(path, name)
-		var cInfo1, cInfo2 os.FileInfo
-		if is1Dir {
-			cInfo1, err = os.Lstat(filepath.Join(w.dir1, fname)) // lstat(2): fs access
-			if err != nil && !os.IsNotExist(err) {
-				return err
-			}
-		}
-		if is2Dir {
-			cInfo2, err = os.Lstat(filepath.Join(w.dir2, fname)) // lstat(2): fs access
-			if err != nil && !os.IsNotExist(err) {
-				return err
-			}
-		}
-		if err = w.walk(fname, cInfo1, cInfo2); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-// {name,inode} pairs used to support the early-pruning logic of the walker type
-type nameIno struct {
-	name string
-	ino  uint64
-}
-
-type nameInoSlice []nameIno
-
-func (s nameInoSlice) Len() int           { return len(s) }
-func (s nameInoSlice) Swap(i, j int)      { s[i], s[j] = s[j], s[i] }
-func (s nameInoSlice) Less(i, j int) bool { return s[i].name < s[j].name }
-
-// readdirnames is a hacked-apart version of the Go stdlib code, exposing inode
-// numbers further up the stack when reading directory contents. Unlike
-// os.Readdirnames, which returns a list of filenames, this function returns a
-// list of {filename,inode} pairs.
-func readdirnames(dirname string) (names []nameIno, err error) {
-	var (
-		size = 100
-		buf  = make([]byte, 4096)
-		nbuf int
-		bufp int
-		nb   int
-	)
-
-	f, err := os.Open(dirname)
-	if err != nil {
-		return nil, err
-	}
-	defer f.Close()
-
-	names = make([]nameIno, 0, size) // Empty with room to grow.
-	for {
-		// Refill the buffer if necessary
-		if bufp >= nbuf {
-			bufp = 0
-			nbuf, err = syscall.ReadDirent(int(f.Fd()), buf) // getdents on linux
-			if nbuf < 0 {
-				nbuf = 0
-			}
-			if err != nil {
-				return nil, os.NewSyscallError("readdirent", err)
-			}
-			if nbuf <= 0 {
-				break // EOF
-			}
-		}
-
-		// Drain the buffer
-		nb, names = parseDirent(buf[bufp:nbuf], names)
-		bufp += nb
-	}
-
-	sl := nameInoSlice(names)
-	sort.Sort(sl)
-	return sl, nil
-}
-
-// parseDirent is a minor modification of syscall.ParseDirent (linux version)
-// which returns {name,inode} pairs instead of just names.
-func parseDirent(buf []byte, names []nameIno) (consumed int, newnames []nameIno) {
-	origlen := len(buf)
-	for len(buf) > 0 {
-		dirent := (*syscall.Dirent)(unsafe.Pointer(&buf[0]))
-		buf = buf[dirent.Reclen:]
-		if dirent.Ino == 0 { // File absent in directory.
-			continue
-		}
-		bytes := (*[10000]byte)(unsafe.Pointer(&dirent.Name[0]))
-		var name = string(bytes[0:clen(bytes[:])])
-		if name == "." || name == ".." { // Useless names
-			continue
-		}
-		names = append(names, nameIno{name, dirent.Ino})
-	}
-	return origlen - len(buf), names
-}
-
-func clen(n []byte) int {
-	for i := 0; i < len(n); i++ {
-		if n[i] == 0 {
-			return i
-		}
-	}
-	return len(n)
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/changes_other.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/changes_other.go
deleted file mode 100644
index 35832f087..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/changes_other.go
+++ /dev/null
@@ -1,97 +0,0 @@
-// +build !linux
-
-package archive
-
-import (
-	"fmt"
-	"os"
-	"path/filepath"
-	"runtime"
-	"strings"
-
-	"github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system"
-)
-
-func collectFileInfoForChanges(oldDir, newDir string) (*FileInfo, *FileInfo, error) {
-	var (
-		oldRoot, newRoot *FileInfo
-		err1, err2       error
-		errs             = make(chan error, 2)
-	)
-	go func() {
-		oldRoot, err1 = collectFileInfo(oldDir)
-		errs <- err1
-	}()
-	go func() {
-		newRoot, err2 = collectFileInfo(newDir)
-		errs <- err2
-	}()
-
-	// block until both routines have returned
-	for i := 0; i < 2; i++ {
-		if err := <-errs; err != nil {
-			return nil, nil, err
-		}
-	}
-
-	return oldRoot, newRoot, nil
-}
-
-func collectFileInfo(sourceDir string) (*FileInfo, error) {
-	root := newRootFileInfo()
-
-	err := filepath.Walk(sourceDir, func(path string, f os.FileInfo, err error) error {
-		if err != nil {
-			return err
-		}
-
-		// Rebase path
-		relPath, err := filepath.Rel(sourceDir, path)
-		if err != nil {
-			return err
-		}
-
-		// As this runs on the daemon side, file paths are OS specific.
-		relPath = filepath.Join(string(os.PathSeparator), relPath)
-
-		// See https://github.com/golang/go/issues/9168 - bug in filepath.Join.
-		// Temporary workaround. If the returned path starts with two backslashes,
-		// trim it down to a single backslash. Only relevant on Windows.
-		if runtime.GOOS == "windows" {
-			if strings.HasPrefix(relPath, `\\`) {
-				relPath = relPath[1:]
-			}
-		}
-
-		if relPath == string(os.PathSeparator) {
-			return nil
-		}
-
-		parent := root.LookUp(filepath.Dir(relPath))
-		if parent == nil {
-			return fmt.Errorf("collectFileInfo: Unexpectedly no parent for %s", relPath)
-		}
-
-		info := &FileInfo{
-			name:     filepath.Base(relPath),
-			children: make(map[string]*FileInfo),
-			parent:   parent,
-		}
-
-		s, err := system.Lstat(path)
-		if err != nil {
-			return err
-		}
-		info.stat = s
-
-		info.capability, _ = system.Lgetxattr(path, "security.capability")
-
-		parent.children[info.name] = info
-
-		return nil
-	})
-	if err != nil {
-		return nil, err
-	}
-	return root, nil
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/changes_unix.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/changes_unix.go
deleted file mode 100644
index 6646b4dfd..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/changes_unix.go
+++ /dev/null
@@ -1,36 +0,0 @@
-// +build !windows
-
-package archive
-
-import (
-	"os"
-	"syscall"
-
-	"github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system"
-)
-
-func statDifferent(oldStat *system.StatT, newStat *system.StatT) bool {
-	// Don't look at size for dirs, its not a good measure of change
-	if oldStat.Mode() != newStat.Mode() ||
-		oldStat.UID() != newStat.UID() ||
-		oldStat.GID() != newStat.GID() ||
-		oldStat.Rdev() != newStat.Rdev() ||
-		// Don't look at size for dirs, its not a good measure of change
-		(oldStat.Mode()&syscall.S_IFDIR != syscall.S_IFDIR &&
-			(!sameFsTimeSpec(oldStat.Mtim(), newStat.Mtim()) || (oldStat.Size() != newStat.Size()))) {
-		return true
-	}
-	return false
-}
-
-func (info *FileInfo) isDir() bool {
-	return info.parent == nil || info.stat.Mode()&syscall.S_IFDIR != 0
-}
-
-func getIno(fi os.FileInfo) uint64 {
-	return uint64(fi.Sys().(*syscall.Stat_t).Ino)
-}
-
-func hasHardlinks(fi os.FileInfo) bool {
-	return fi.Sys().(*syscall.Stat_t).Nlink > 1
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/changes_windows.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/changes_windows.go
deleted file mode 100644
index 2d8708d0a..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/changes_windows.go
+++ /dev/null
@@ -1,30 +0,0 @@
-package archive
-
-import (
-	"os"
-
-	"github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system"
-)
-
-func statDifferent(oldStat *system.StatT, newStat *system.StatT) bool {
-
-	// Don't look at size for dirs, its not a good measure of change
-	if oldStat.ModTime() != newStat.ModTime() ||
-		oldStat.Mode() != newStat.Mode() ||
-		oldStat.Size() != newStat.Size() && !oldStat.IsDir() {
-		return true
-	}
-	return false
-}
-
-func (info *FileInfo) isDir() bool {
-	return info.parent == nil || info.stat.IsDir()
-}
-
-func getIno(fi os.FileInfo) (inode uint64) {
-	return
-}
-
-func hasHardlinks(fi os.FileInfo) bool {
-	return false
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/copy.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/copy.go
deleted file mode 100644
index 251c9bd99..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/copy.go
+++ /dev/null
@@ -1,407 +0,0 @@
-package archive
-
-import (
-	"archive/tar"
-	"errors"
-	"io"
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"strings"
-
-	"github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus"
-	"github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system"
-)
-
-// Errors used or returned by this file.
-var (
-	ErrNotDirectory      = errors.New("not a directory")
-	ErrDirNotExists      = errors.New("no such directory")
-	ErrCannotCopyDir     = errors.New("cannot copy directory")
-	ErrInvalidCopySource = errors.New("invalid copy source content")
-)
-
-// PreserveTrailingDotOrSeparator returns the given cleaned path (after
-// processing using any utility functions from the path or filepath stdlib
-// packages) and appends a trailing `/.` or `/` if its corresponding  original
-// path (from before being processed by utility functions from the path or
-// filepath stdlib packages) ends with a trailing `/.` or `/`. If the cleaned
-// path already ends in a `.` path segment, then another is not added. If the
-// clean path already ends in a path separator, then another is not added.
-func PreserveTrailingDotOrSeparator(cleanedPath, originalPath string) string {
-	// Ensure paths are in platform semantics
-	cleanedPath = normalizePath(cleanedPath)
-	originalPath = normalizePath(originalPath)
-
-	if !specifiesCurrentDir(cleanedPath) && specifiesCurrentDir(originalPath) {
-		if !hasTrailingPathSeparator(cleanedPath) {
-			// Add a separator if it doesn't already end with one (a cleaned
-			// path would only end in a separator if it is the root).
-			cleanedPath += string(filepath.Separator)
-		}
-		cleanedPath += "."
-	}
-
-	if !hasTrailingPathSeparator(cleanedPath) && hasTrailingPathSeparator(originalPath) {
-		cleanedPath += string(filepath.Separator)
-	}
-
-	return cleanedPath
-}
-
-// assertsDirectory returns whether the given path is
-// asserted to be a directory, i.e., the path ends with
-// a trailing '/' or `/.`, assuming a path separator of `/`.
-func assertsDirectory(path string) bool {
-	return hasTrailingPathSeparator(path) || specifiesCurrentDir(path)
-}
-
-// hasTrailingPathSeparator returns whether the given
-// path ends with the system's path separator character.
-func hasTrailingPathSeparator(path string) bool {
-	return len(path) > 0 && os.IsPathSeparator(path[len(path)-1])
-}
-
-// specifiesCurrentDir returns whether the given path specifies
-// a "current directory", i.e., the last path segment is `.`.
-func specifiesCurrentDir(path string) bool {
-	return filepath.Base(path) == "."
-}
-
-// SplitPathDirEntry splits the given path between its directory name and its
-// basename by first cleaning the path but preserves a trailing "." if the
-// original path specified the current directory.
-func SplitPathDirEntry(path string) (dir, base string) {
-	cleanedPath := filepath.Clean(normalizePath(path))
-
-	if specifiesCurrentDir(path) {
-		cleanedPath += string(filepath.Separator) + "."
-	}
-
-	return filepath.Dir(cleanedPath), filepath.Base(cleanedPath)
-}
-
-// TarResource archives the resource described by the given CopyInfo to a Tar
-// archive. A non-nil error is returned if sourcePath does not exist or is
-// asserted to be a directory but exists as another type of file.
-//
-// This function acts as a convenient wrapper around TarWithOptions, which
-// requires a directory as the source path. TarResource accepts either a
-// directory or a file path and correctly sets the Tar options.
-func TarResource(sourceInfo CopyInfo) (content Archive, err error) {
-	return TarResourceRebase(sourceInfo.Path, sourceInfo.RebaseName)
-}
-
-// TarResourceRebase is like TarResource but renames the first path element of
-// items in the resulting tar archive to match the given rebaseName if not "".
-func TarResourceRebase(sourcePath, rebaseName string) (content Archive, err error) {
-	sourcePath = normalizePath(sourcePath)
-	if _, err = os.Lstat(sourcePath); err != nil {
-		// Catches the case where the source does not exist or is not a
-		// directory if asserted to be a directory, as this also causes an
-		// error.
-		return
-	}
-
-	// Separate the source path between it's directory and
-	// the entry in that directory which we are archiving.
-	sourceDir, sourceBase := SplitPathDirEntry(sourcePath)
-
-	filter := []string{sourceBase}
-
-	logrus.Debugf("copying %q from %q", sourceBase, sourceDir)
-
-	return TarWithOptions(sourceDir, &TarOptions{
-		Compression:      Uncompressed,
-		IncludeFiles:     filter,
-		IncludeSourceDir: true,
-		RebaseNames: map[string]string{
-			sourceBase: rebaseName,
-		},
-	})
-}
-
-// CopyInfo holds basic info about the source
-// or destination path of a copy operation.
-type CopyInfo struct {
-	Path       string
-	Exists     bool
-	IsDir      bool
-	RebaseName string
-}
-
-// CopyInfoSourcePath stats the given path to create a CopyInfo
-// struct representing that resource for the source of an archive copy
-// operation. The given path should be an absolute local path. A source path
-// has all symlinks evaluated that appear before the last path separator ("/"
-// on Unix). As it is to be a copy source, the path must exist.
-func CopyInfoSourcePath(path string) (CopyInfo, error) {
-	// Split the given path into its Directory and Base components. We will
-	// evaluate symlinks in the directory component then append the base.
-	path = normalizePath(path)
-	dirPath, basePath := filepath.Split(path)
-
-	resolvedDirPath, err := filepath.EvalSymlinks(dirPath)
-	if err != nil {
-		return CopyInfo{}, err
-	}
-
-	// resolvedDirPath will have been cleaned (no trailing path separators) so
-	// we can manually join it with the base path element.
-	resolvedPath := resolvedDirPath + string(filepath.Separator) + basePath
-
-	var rebaseName string
-	if hasTrailingPathSeparator(path) && filepath.Base(path) != filepath.Base(resolvedPath) {
-		// In the case where the path had a trailing separator and a symlink
-		// evaluation has changed the last path component, we will need to
-		// rebase the name in the archive that is being copied to match the
-		// originally requested name.
-		rebaseName = filepath.Base(path)
-	}
-
-	stat, err := os.Lstat(resolvedPath)
-	if err != nil {
-		return CopyInfo{}, err
-	}
-
-	return CopyInfo{
-		Path:       resolvedPath,
-		Exists:     true,
-		IsDir:      stat.IsDir(),
-		RebaseName: rebaseName,
-	}, nil
-}
-
-// CopyInfoDestinationPath stats the given path to create a CopyInfo
-// struct representing that resource for the destination of an archive copy
-// operation. The given path should be an absolute local path.
-func CopyInfoDestinationPath(path string) (info CopyInfo, err error) {
-	maxSymlinkIter := 10 // filepath.EvalSymlinks uses 255, but 10 already seems like a lot.
-	path = normalizePath(path)
-	originalPath := path
-
-	stat, err := os.Lstat(path)
-
-	if err == nil && stat.Mode()&os.ModeSymlink == 0 {
-		// The path exists and is not a symlink.
-		return CopyInfo{
-			Path:   path,
-			Exists: true,
-			IsDir:  stat.IsDir(),
-		}, nil
-	}
-
-	// While the path is a symlink.
-	for n := 0; err == nil && stat.Mode()&os.ModeSymlink != 0; n++ {
-		if n > maxSymlinkIter {
-			// Don't follow symlinks more than this arbitrary number of times.
-			return CopyInfo{}, errors.New("too many symlinks in " + originalPath)
-		}
-
-		// The path is a symbolic link. We need to evaluate it so that the
-		// destination of the copy operation is the link target and not the
-		// link itself. This is notably different than CopyInfoSourcePath which
-		// only evaluates symlinks before the last appearing path separator.
-		// Also note that it is okay if the last path element is a broken
-		// symlink as the copy operation should create the target.
-		var linkTarget string
-
-		linkTarget, err = os.Readlink(path)
-		if err != nil {
-			return CopyInfo{}, err
-		}
-
-		if !system.IsAbs(linkTarget) {
-			// Join with the parent directory.
-			dstParent, _ := SplitPathDirEntry(path)
-			linkTarget = filepath.Join(dstParent, linkTarget)
-		}
-
-		path = linkTarget
-		stat, err = os.Lstat(path)
-	}
-
-	if err != nil {
-		// It's okay if the destination path doesn't exist. We can still
-		// continue the copy operation if the parent directory exists.
-		if !os.IsNotExist(err) {
-			return CopyInfo{}, err
-		}
-
-		// Ensure destination parent dir exists.
-		dstParent, _ := SplitPathDirEntry(path)
-
-		parentDirStat, err := os.Lstat(dstParent)
-		if err != nil {
-			return CopyInfo{}, err
-		}
-		if !parentDirStat.IsDir() {
-			return CopyInfo{}, ErrNotDirectory
-		}
-
-		return CopyInfo{Path: path}, nil
-	}
-
-	// The path exists after resolving symlinks.
-	return CopyInfo{
-		Path:   path,
-		Exists: true,
-		IsDir:  stat.IsDir(),
-	}, nil
-}
-
-// PrepareArchiveCopy prepares the given srcContent archive, which should
-// contain the archived resource described by srcInfo, to the destination
-// described by dstInfo. Returns the possibly modified content archive along
-// with the path to the destination directory which it should be extracted to.
-func PrepareArchiveCopy(srcContent Reader, srcInfo, dstInfo CopyInfo) (dstDir string, content Archive, err error) {
-	// Ensure in platform semantics
-	srcInfo.Path = normalizePath(srcInfo.Path)
-	dstInfo.Path = normalizePath(dstInfo.Path)
-
-	// Separate the destination path between its directory and base
-	// components in case the source archive contents need to be rebased.
-	dstDir, dstBase := SplitPathDirEntry(dstInfo.Path)
-	_, srcBase := SplitPathDirEntry(srcInfo.Path)
-
-	switch {
-	case dstInfo.Exists && dstInfo.IsDir:
-		// The destination exists as a directory. No alteration
-		// to srcContent is needed as its contents can be
-		// simply extracted to the destination directory.
-		return dstInfo.Path, ioutil.NopCloser(srcContent), nil
-	case dstInfo.Exists && srcInfo.IsDir:
-		// The destination exists as some type of file and the source
-		// content is a directory. This is an error condition since
-		// you cannot copy a directory to an existing file location.
-		return "", nil, ErrCannotCopyDir
-	case dstInfo.Exists:
-		// The destination exists as some type of file and the source content
-		// is also a file. The source content entry will have to be renamed to
-		// have a basename which matches the destination path's basename.
-		return dstDir, rebaseArchiveEntries(srcContent, srcBase, dstBase), nil
-	case srcInfo.IsDir:
-		// The destination does not exist and the source content is an archive
-		// of a directory. The archive should be extracted to the parent of
-		// the destination path instead, and when it is, the directory that is
-		// created as a result should take the name of the destination path.
-		// The source content entries will have to be renamed to have a
-		// basename which matches the destination path's basename.
-		return dstDir, rebaseArchiveEntries(srcContent, srcBase, dstBase), nil
-	case assertsDirectory(dstInfo.Path):
-		// The destination does not exist and is asserted to be created as a
-		// directory, but the source content is not a directory. This is an
-		// error condition since you cannot create a directory from a file
-		// source.
-		return "", nil, ErrDirNotExists
-	default:
-		// The last remaining case is when the destination does not exist, is
-		// not asserted to be a directory, and the source content is not an
-		// archive of a directory. It this case, the destination file will need
-		// to be created when the archive is extracted and the source content
-		// entry will have to be renamed to have a basename which matches the
-		// destination path's basename.
-		return dstDir, rebaseArchiveEntries(srcContent, srcBase, dstBase), nil
-	}
-
-}
-
-// rebaseArchiveEntries rewrites the given srcContent archive replacing
-// an occurrence of oldBase with newBase at the beginning of entry names.
-func rebaseArchiveEntries(srcContent Reader, oldBase, newBase string) Archive {
-	if oldBase == string(os.PathSeparator) {
-		// If oldBase specifies the root directory, use an empty string as
-		// oldBase instead so that newBase doesn't replace the path separator
-		// that all paths will start with.
-		oldBase = ""
-	}
-
-	rebased, w := io.Pipe()
-
-	go func() {
-		srcTar := tar.NewReader(srcContent)
-		rebasedTar := tar.NewWriter(w)
-
-		for {
-			hdr, err := srcTar.Next()
-			if err == io.EOF {
-				// Signals end of archive.
-				rebasedTar.Close()
-				w.Close()
-				return
-			}
-			if err != nil {
-				w.CloseWithError(err)
-				return
-			}
-
-			hdr.Name = strings.Replace(hdr.Name, oldBase, newBase, 1)
-
-			if err = rebasedTar.WriteHeader(hdr); err != nil {
-				w.CloseWithError(err)
-				return
-			}
-
-			if _, err = io.Copy(rebasedTar, srcTar); err != nil {
-				w.CloseWithError(err)
-				return
-			}
-		}
-	}()
-
-	return rebased
-}
-
-// CopyResource performs an archive copy from the given source path to the
-// given destination path. The source path MUST exist and the destination
-// path's parent directory must exist.
-func CopyResource(srcPath, dstPath string) error {
-	var (
-		srcInfo CopyInfo
-		err     error
-	)
-
-	// Ensure in platform semantics
-	srcPath = normalizePath(srcPath)
-	dstPath = normalizePath(dstPath)
-
-	// Clean the source and destination paths.
-	srcPath = PreserveTrailingDotOrSeparator(filepath.Clean(srcPath), srcPath)
-	dstPath = PreserveTrailingDotOrSeparator(filepath.Clean(dstPath), dstPath)
-
-	if srcInfo, err = CopyInfoSourcePath(srcPath); err != nil {
-		return err
-	}
-
-	content, err := TarResource(srcInfo)
-	if err != nil {
-		return err
-	}
-	defer content.Close()
-
-	return CopyTo(content, srcInfo, dstPath)
-}
-
-// CopyTo handles extracting the given content whose
-// entries should be sourced from srcInfo to dstPath.
-func CopyTo(content Reader, srcInfo CopyInfo, dstPath string) error {
-	// The destination path need not exist, but CopyInfoDestinationPath will
-	// ensure that at least the parent directory exists.
-	dstInfo, err := CopyInfoDestinationPath(normalizePath(dstPath))
-	if err != nil {
-		return err
-	}
-
-	dstDir, copyArchive, err := PrepareArchiveCopy(content, srcInfo, dstInfo)
-	if err != nil {
-		return err
-	}
-	defer copyArchive.Close()
-
-	options := &TarOptions{
-		NoLchown:             true,
-		NoOverwriteDirNonDir: true,
-	}
-
-	return Untar(copyArchive, dstDir, options)
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/copy_unix.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/copy_unix.go
deleted file mode 100644
index e305b5e4a..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/copy_unix.go
+++ /dev/null
@@ -1,11 +0,0 @@
-// +build !windows
-
-package archive
-
-import (
-	"path/filepath"
-)
-
-func normalizePath(path string) string {
-	return filepath.ToSlash(path)
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/copy_windows.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/copy_windows.go
deleted file mode 100644
index 2b775b45c..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/copy_windows.go
+++ /dev/null
@@ -1,9 +0,0 @@
-package archive
-
-import (
-	"path/filepath"
-)
-
-func normalizePath(path string) string {
-	return filepath.FromSlash(path)
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/diff.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/diff.go
deleted file mode 100644
index 5ec71110a..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/diff.go
+++ /dev/null
@@ -1,264 +0,0 @@
-package archive
-
-import (
-	"archive/tar"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"runtime"
-	"strings"
-
-	"github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus"
-	"github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/idtools"
-	"github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/pools"
-	"github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system"
-)
-
-// UnpackLayer unpack `layer` to a `dest`. The stream `layer` can be
-// compressed or uncompressed.
-// Returns the size in bytes of the contents of the layer.
-func UnpackLayer(dest string, layer Reader, options *TarOptions) (size int64, err error) {
-	tr := tar.NewReader(layer)
-	trBuf := pools.BufioReader32KPool.Get(tr)
-	defer pools.BufioReader32KPool.Put(trBuf)
-
-	var dirs []*tar.Header
-
-	if options == nil {
-		options = &TarOptions{}
-	}
-	if options.ExcludePatterns == nil {
-		options.ExcludePatterns = []string{}
-	}
-	remappedRootUID, remappedRootGID, err := idtools.GetRootUIDGID(options.UIDMaps, options.GIDMaps)
-	if err != nil {
-		return 0, err
-	}
-
-	aufsTempdir := ""
-	aufsHardlinks := make(map[string]*tar.Header)
-
-	if options == nil {
-		options = &TarOptions{}
-	}
-	// Iterate through the files in the archive.
-	for {
-		hdr, err := tr.Next()
-		if err == io.EOF {
-			// end of tar archive
-			break
-		}
-		if err != nil {
-			return 0, err
-		}
-
-		size += hdr.Size
-
-		// Normalize name, for safety and for a simple is-root check
-		hdr.Name = filepath.Clean(hdr.Name)
-
-		// Windows does not support filenames with colons in them. Ignore
-		// these files. This is not a problem though (although it might
-		// appear that it is). Let's suppose a client is running docker pull.
-		// The daemon it points to is Windows. Would it make sense for the
-		// client to be doing a docker pull Ubuntu for example (which has files
-		// with colons in the name under /usr/share/man/man3)? No, absolutely
-		// not as it would really only make sense that they were pulling a
-		// Windows image. However, for development, it is necessary to be able
-		// to pull Linux images which are in the repository.
-		//
-		// TODO Windows. Once the registry is aware of what images are Windows-
-		// specific or Linux-specific, this warning should be changed to an error
-		// to cater for the situation where someone does manage to upload a Linux
-		// image but have it tagged as Windows inadvertently.
-		if runtime.GOOS == "windows" {
-			if strings.Contains(hdr.Name, ":") {
-				logrus.Warnf("Windows: Ignoring %s (is this a Linux image?)", hdr.Name)
-				continue
-			}
-		}
-
-		// Note as these operations are platform specific, so must the slash be.
-		if !strings.HasSuffix(hdr.Name, string(os.PathSeparator)) {
-			// Not the root directory, ensure that the parent directory exists.
-			// This happened in some tests where an image had a tarfile without any
-			// parent directories.
-			parent := filepath.Dir(hdr.Name)
-			parentPath := filepath.Join(dest, parent)
-
-			if _, err := os.Lstat(parentPath); err != nil && os.IsNotExist(err) {
-				err = system.MkdirAll(parentPath, 0600)
-				if err != nil {
-					return 0, err
-				}
-			}
-		}
-
-		// Skip AUFS metadata dirs
-		if strings.HasPrefix(hdr.Name, WhiteoutMetaPrefix) {
-			// Regular files inside /.wh..wh.plnk can be used as hardlink targets
-			// We don't want this directory, but we need the files in them so that
-			// such hardlinks can be resolved.
-			if strings.HasPrefix(hdr.Name, WhiteoutLinkDir) && hdr.Typeflag == tar.TypeReg {
-				basename := filepath.Base(hdr.Name)
-				aufsHardlinks[basename] = hdr
-				if aufsTempdir == "" {
-					if aufsTempdir, err = ioutil.TempDir("", "dockerplnk"); err != nil {
-						return 0, err
-					}
-					defer os.RemoveAll(aufsTempdir)
-				}
-				if err := createTarFile(filepath.Join(aufsTempdir, basename), dest, hdr, tr, true, nil); err != nil {
-					return 0, err
-				}
-			}
-
-			if hdr.Name != WhiteoutOpaqueDir {
-				continue
-			}
-		}
-		path := filepath.Join(dest, hdr.Name)
-		rel, err := filepath.Rel(dest, path)
-		if err != nil {
-			return 0, err
-		}
-
-		// Note as these operations are platform specific, so must the slash be.
-		if strings.HasPrefix(rel, ".."+string(os.PathSeparator)) {
-			return 0, breakoutError(fmt.Errorf("%q is outside of %q", hdr.Name, dest))
-		}
-		base := filepath.Base(path)
-
-		if strings.HasPrefix(base, WhiteoutPrefix) {
-			dir := filepath.Dir(path)
-			if base == WhiteoutOpaqueDir {
-				fi, err := os.Lstat(dir)
-				if err != nil && !os.IsNotExist(err) {
-					return 0, err
-				}
-				if err := os.RemoveAll(dir); err != nil {
-					return 0, err
-				}
-				if err := os.Mkdir(dir, fi.Mode()&os.ModePerm); err != nil {
-					return 0, err
-				}
-			} else {
-				originalBase := base[len(WhiteoutPrefix):]
-				originalPath := filepath.Join(dir, originalBase)
-				if err := os.RemoveAll(originalPath); err != nil {
-					return 0, err
-				}
-			}
-		} else {
-			// If path exits we almost always just want to remove and replace it.
-			// The only exception is when it is a directory *and* the file from
-			// the layer is also a directory. Then we want to merge them (i.e.
-			// just apply the metadata from the layer).
-			if fi, err := os.Lstat(path); err == nil {
-				if !(fi.IsDir() && hdr.Typeflag == tar.TypeDir) {
-					if err := os.RemoveAll(path); err != nil {
-						return 0, err
-					}
-				}
-			}
-
-			trBuf.Reset(tr)
-			srcData := io.Reader(trBuf)
-			srcHdr := hdr
-
-			// Hard links into /.wh..wh.plnk don't work, as we don't extract that directory, so
-			// we manually retarget these into the temporary files we extracted them into
-			if hdr.Typeflag == tar.TypeLink && strings.HasPrefix(filepath.Clean(hdr.Linkname), WhiteoutLinkDir) {
-				linkBasename := filepath.Base(hdr.Linkname)
-				srcHdr = aufsHardlinks[linkBasename]
-				if srcHdr == nil {
-					return 0, fmt.Errorf("Invalid aufs hardlink")
-				}
-				tmpFile, err := os.Open(filepath.Join(aufsTempdir, linkBasename))
-				if err != nil {
-					return 0, err
-				}
-				defer tmpFile.Close()
-				srcData = tmpFile
-			}
-
-			// if the options contain a uid & gid maps, convert header uid/gid
-			// entries using the maps such that lchown sets the proper mapped
-			// uid/gid after writing the file. We only perform this mapping if
-			// the file isn't already owned by the remapped root UID or GID, as
-			// that specific uid/gid has no mapping from container -> host, and
-			// those files already have the proper ownership for inside the
-			// container.
-			if srcHdr.Uid != remappedRootUID {
-				xUID, err := idtools.ToHost(srcHdr.Uid, options.UIDMaps)
-				if err != nil {
-					return 0, err
-				}
-				srcHdr.Uid = xUID
-			}
-			if srcHdr.Gid != remappedRootGID {
-				xGID, err := idtools.ToHost(srcHdr.Gid, options.GIDMaps)
-				if err != nil {
-					return 0, err
-				}
-				srcHdr.Gid = xGID
-			}
-			if err := createTarFile(path, dest, srcHdr, srcData, true, nil); err != nil {
-				return 0, err
-			}
-
-			// Directory mtimes must be handled at the end to avoid further
-			// file creation in them to modify the directory mtime
-			if hdr.Typeflag == tar.TypeDir {
-				dirs = append(dirs, hdr)
-			}
-		}
-	}
-
-	for _, hdr := range dirs {
-		path := filepath.Join(dest, hdr.Name)
-		if err := system.Chtimes(path, hdr.AccessTime, hdr.ModTime); err != nil {
-			return 0, err
-		}
-	}
-
-	return size, nil
-}
-
-// ApplyLayer parses a diff in the standard layer format from `layer`,
-// and applies it to the directory `dest`. The stream `layer` can be
-// compressed or uncompressed.
-// Returns the size in bytes of the contents of the layer.
-func ApplyLayer(dest string, layer Reader) (int64, error) {
-	return applyLayerHandler(dest, layer, &TarOptions{}, true)
-}
-
-// ApplyUncompressedLayer parses a diff in the standard layer format from
-// `layer`, and applies it to the directory `dest`. The stream `layer`
-// can only be uncompressed.
-// Returns the size in bytes of the contents of the layer.
-func ApplyUncompressedLayer(dest string, layer Reader, options *TarOptions) (int64, error) {
-	return applyLayerHandler(dest, layer, options, false)
-}
-
-// do the bulk load of ApplyLayer, but allow for not calling DecompressStream
-func applyLayerHandler(dest string, layer Reader, options *TarOptions, decompress bool) (int64, error) {
-	dest = filepath.Clean(dest)
-
-	// We need to be able to set any perms
-	oldmask, err := system.Umask(0)
-	if err != nil {
-		return 0, err
-	}
-	defer system.Umask(oldmask) // ignore err, ErrNotSupportedPlatform
-
-	if decompress {
-		layer, err = DecompressStream(layer)
-		if err != nil {
-			return 0, err
-		}
-	}
-	return UnpackLayer(dest, layer, options)
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/example_changes.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/example_changes.go
deleted file mode 100644
index a5e08e4ee..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/example_changes.go
+++ /dev/null
@@ -1,97 +0,0 @@
-// +build ignore
-
-// Simple tool to create an archive stream from an old and new directory
-//
-// By default it will stream the comparison of two temporary directories with junk files
-package main
-
-import (
-	"flag"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"os"
-	"path"
-
-	"github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus"
-	"github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive"
-)
-
-var (
-	flDebug  = flag.Bool("D", false, "debugging output")
-	flNewDir = flag.String("newdir", "", "")
-	flOldDir = flag.String("olddir", "", "")
-	log      = logrus.New()
-)
-
-func main() {
-	flag.Usage = func() {
-		fmt.Println("Produce a tar from comparing two directory paths. By default a demo tar is created of around 200 files (including hardlinks)")
-		fmt.Printf("%s [OPTIONS]\n", os.Args[0])
-		flag.PrintDefaults()
-	}
-	flag.Parse()
-	log.Out = os.Stderr
-	if (len(os.Getenv("DEBUG")) > 0) || *flDebug {
-		logrus.SetLevel(logrus.DebugLevel)
-	}
-	var newDir, oldDir string
-
-	if len(*flNewDir) == 0 {
-		var err error
-		newDir, err = ioutil.TempDir("", "docker-test-newDir")
-		if err != nil {
-			log.Fatal(err)
-		}
-		defer os.RemoveAll(newDir)
-		if _, err := prepareUntarSourceDirectory(100, newDir, true); err != nil {
-			log.Fatal(err)
-		}
-	} else {
-		newDir = *flNewDir
-	}
-
-	if len(*flOldDir) == 0 {
-		oldDir, err := ioutil.TempDir("", "docker-test-oldDir")
-		if err != nil {
-			log.Fatal(err)
-		}
-		defer os.RemoveAll(oldDir)
-	} else {
-		oldDir = *flOldDir
-	}
-
-	changes, err := archive.ChangesDirs(newDir, oldDir)
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	a, err := archive.ExportChanges(newDir, changes)
-	if err != nil {
-		log.Fatal(err)
-	}
-	defer a.Close()
-
-	i, err := io.Copy(os.Stdout, a)
-	if err != nil && err != io.EOF {
-		log.Fatal(err)
-	}
-	fmt.Fprintf(os.Stderr, "wrote archive of %d bytes", i)
-}
-
-func prepareUntarSourceDirectory(numberOfFiles int, targetPath string, makeLinks bool) (int, error) {
-	fileData := []byte("fooo")
-	for n := 0; n < numberOfFiles; n++ {
-		fileName := fmt.Sprintf("file-%d", n)
-		if err := ioutil.WriteFile(path.Join(targetPath, fileName), fileData, 0700); err != nil {
-			return 0, err
-		}
-		if makeLinks {
-			if err := os.Link(path.Join(targetPath, fileName), path.Join(targetPath, fileName+"-link")); err != nil {
-				return 0, err
-			}
-		}
-	}
-	totalSize := numberOfFiles * len(fileData)
-	return totalSize, nil
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/time_linux.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/time_linux.go
deleted file mode 100644
index 3448569b1..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/time_linux.go
+++ /dev/null
@@ -1,16 +0,0 @@
-package archive
-
-import (
-	"syscall"
-	"time"
-)
-
-func timeToTimespec(time time.Time) (ts syscall.Timespec) {
-	if time.IsZero() {
-		// Return UTIME_OMIT special value
-		ts.Sec = 0
-		ts.Nsec = ((1 << 30) - 2)
-		return
-	}
-	return syscall.NsecToTimespec(time.UnixNano())
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/time_unsupported.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/time_unsupported.go
deleted file mode 100644
index e85aac054..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/time_unsupported.go
+++ /dev/null
@@ -1,16 +0,0 @@
-// +build !linux
-
-package archive
-
-import (
-	"syscall"
-	"time"
-)
-
-func timeToTimespec(time time.Time) (ts syscall.Timespec) {
-	nsec := int64(0)
-	if !time.IsZero() {
-		nsec = time.UnixNano()
-	}
-	return syscall.NsecToTimespec(nsec)
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/whiteouts.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/whiteouts.go
deleted file mode 100644
index 3d9c31321..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/whiteouts.go
+++ /dev/null
@@ -1,23 +0,0 @@
-package archive
-
-// Whiteouts are files with a special meaning for the layered filesystem.
-// Docker uses AUFS whiteout files inside exported archives. In other
-// filesystems these files are generated/handled on tar creation/extraction.
-
-// WhiteoutPrefix prefix means file is a whiteout. If this is followed by a
-// filename this means that file has been removed from the base layer.
-const WhiteoutPrefix = ".wh."
-
-// WhiteoutMetaPrefix prefix means whiteout has a special meaning and is not
-// for remoing an actaul file. Normally these files are excluded from exported
-// archives.
-const WhiteoutMetaPrefix = WhiteoutPrefix + WhiteoutPrefix
-
-// WhiteoutLinkDir is a directory AUFS uses for storing hardlink links to other
-// layers. Normally these should not go into exported archives and all changed
-// hardlinks should be copied to the top layer.
-const WhiteoutLinkDir = WhiteoutMetaPrefix + "plnk"
-
-// WhiteoutOpaqueDir file means directory has been made opaque - meaning
-// readdir calls to this directory do not follow to lower layers.
-const WhiteoutOpaqueDir = WhiteoutMetaPrefix + ".opq"
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/wrap.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/wrap.go
deleted file mode 100644
index dfb335c0b..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/wrap.go
+++ /dev/null
@@ -1,59 +0,0 @@
-package archive
-
-import (
-	"archive/tar"
-	"bytes"
-	"io/ioutil"
-)
-
-// Generate generates a new archive from the content provided
-// as input.
-//
-// `files` is a sequence of path/content pairs. A new file is
-// added to the archive for each pair.
-// If the last pair is incomplete, the file is created with an
-// empty content. For example:
-//
-// Generate("foo.txt", "hello world", "emptyfile")
-//
-// The above call will return an archive with 2 files:
-//  * ./foo.txt with content "hello world"
-//  * ./empty with empty content
-//
-// FIXME: stream content instead of buffering
-// FIXME: specify permissions and other archive metadata
-func Generate(input ...string) (Archive, error) {
-	files := parseStringPairs(input...)
-	buf := new(bytes.Buffer)
-	tw := tar.NewWriter(buf)
-	for _, file := range files {
-		name, content := file[0], file[1]
-		hdr := &tar.Header{
-			Name: name,
-			Size: int64(len(content)),
-		}
-		if err := tw.WriteHeader(hdr); err != nil {
-			return nil, err
-		}
-		if _, err := tw.Write([]byte(content)); err != nil {
-			return nil, err
-		}
-	}
-	if err := tw.Close(); err != nil {
-		return nil, err
-	}
-	return ioutil.NopCloser(buf), nil
-}
-
-func parseStringPairs(input ...string) (output [][2]string) {
-	output = make([][2]string, 0, len(input)/2+1)
-	for i := 0; i < len(input); i += 2 {
-		var pair [2]string
-		pair[0] = input[i]
-		if i+1 < len(input) {
-			pair[1] = input[i+1]
-		}
-		output = append(output, pair)
-	}
-	return
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/fileutils/fileutils.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/fileutils/fileutils.go
deleted file mode 100644
index 5559732a0..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/fileutils/fileutils.go
+++ /dev/null
@@ -1,184 +0,0 @@
-package fileutils
-
-import (
-	"errors"
-	"fmt"
-	"io"
-	"os"
-	"path/filepath"
-	"strings"
-
-	"github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus"
-)
-
-// exclusion return true if the specified pattern is an exclusion
-func exclusion(pattern string) bool {
-	return pattern[0] == '!'
-}
-
-// empty return true if the specified pattern is empty
-func empty(pattern string) bool {
-	return pattern == ""
-}
-
-// CleanPatterns takes a slice of patterns returns a new
-// slice of patterns cleaned with filepath.Clean, stripped
-// of any empty patterns and lets the caller know whether the
-// slice contains any exception patterns (prefixed with !).
-func CleanPatterns(patterns []string) ([]string, [][]string, bool, error) {
-	// Loop over exclusion patterns and:
-	// 1. Clean them up.
-	// 2. Indicate whether we are dealing with any exception rules.
-	// 3. Error if we see a single exclusion marker on it's own (!).
-	cleanedPatterns := []string{}
-	patternDirs := [][]string{}
-	exceptions := false
-	for _, pattern := range patterns {
-		// Eliminate leading and trailing whitespace.
-		pattern = strings.TrimSpace(pattern)
-		if empty(pattern) {
-			continue
-		}
-		if exclusion(pattern) {
-			if len(pattern) == 1 {
-				return nil, nil, false, errors.New("Illegal exclusion pattern: !")
-			}
-			exceptions = true
-		}
-		pattern = filepath.Clean(pattern)
-		cleanedPatterns = append(cleanedPatterns, pattern)
-		if exclusion(pattern) {
-			pattern = pattern[1:]
-		}
-		patternDirs = append(patternDirs, strings.Split(pattern, "/"))
-	}
-
-	return cleanedPatterns, patternDirs, exceptions, nil
-}
-
-// Matches returns true if file matches any of the patterns
-// and isn't excluded by any of the subsequent patterns.
-func Matches(file string, patterns []string) (bool, error) {
-	file = filepath.Clean(file)
-
-	if file == "." {
-		// Don't let them exclude everything, kind of silly.
-		return false, nil
-	}
-
-	patterns, patDirs, _, err := CleanPatterns(patterns)
-	if err != nil {
-		return false, err
-	}
-
-	return OptimizedMatches(file, patterns, patDirs)
-}
-
-// OptimizedMatches is basically the same as fileutils.Matches() but optimized for archive.go.
-// It will assume that the inputs have been preprocessed and therefore the function
-// doen't need to do as much error checking and clean-up. This was done to avoid
-// repeating these steps on each file being checked during the archive process.
-// The more generic fileutils.Matches() can't make these assumptions.
-func OptimizedMatches(file string, patterns []string, patDirs [][]string) (bool, error) {
-	matched := false
-	parentPath := filepath.Dir(file)
-	parentPathDirs := strings.Split(parentPath, "/")
-
-	for i, pattern := range patterns {
-		negative := false
-
-		if exclusion(pattern) {
-			negative = true
-			pattern = pattern[1:]
-		}
-
-		match, err := filepath.Match(pattern, file)
-		if err != nil {
-			return false, err
-		}
-
-		if !match && parentPath != "." {
-			// Check to see if the pattern matches one of our parent dirs.
-			if len(patDirs[i]) <= len(parentPathDirs) {
-				match, _ = filepath.Match(strings.Join(patDirs[i], "/"),
-					strings.Join(parentPathDirs[:len(patDirs[i])], "/"))
-			}
-		}
-
-		if match {
-			matched = !negative
-		}
-	}
-
-	if matched {
-		logrus.Debugf("Skipping excluded path: %s", file)
-	}
-
-	return matched, nil
-}
-
-// CopyFile copies from src to dst until either EOF is reached
-// on src or an error occurs. It verifies src exists and remove
-// the dst if it exists.
-func CopyFile(src, dst string) (int64, error) {
-	cleanSrc := filepath.Clean(src)
-	cleanDst := filepath.Clean(dst)
-	if cleanSrc == cleanDst {
-		return 0, nil
-	}
-	sf, err := os.Open(cleanSrc)
-	if err != nil {
-		return 0, err
-	}
-	defer sf.Close()
-	if err := os.Remove(cleanDst); err != nil && !os.IsNotExist(err) {
-		return 0, err
-	}
-	df, err := os.Create(cleanDst)
-	if err != nil {
-		return 0, err
-	}
-	defer df.Close()
-	return io.Copy(df, sf)
-}
-
-// ReadSymlinkedDirectory returns the target directory of a symlink.
-// The target of the symbolic link may not be a file.
-func ReadSymlinkedDirectory(path string) (string, error) {
-	var realPath string
-	var err error
-	if realPath, err = filepath.Abs(path); err != nil {
-		return "", fmt.Errorf("unable to get absolute path for %s: %s", path, err)
-	}
-	if realPath, err = filepath.EvalSymlinks(realPath); err != nil {
-		return "", fmt.Errorf("failed to canonicalise path for %s: %s", path, err)
-	}
-	realPathInfo, err := os.Stat(realPath)
-	if err != nil {
-		return "", fmt.Errorf("failed to stat target '%s' of '%s': %s", realPath, path, err)
-	}
-	if !realPathInfo.Mode().IsDir() {
-		return "", fmt.Errorf("canonical path points to a file '%s'", realPath)
-	}
-	return realPath, nil
-}
-
-// CreateIfNotExists creates a file or a directory only if it does not already exist.
-func CreateIfNotExists(path string, isDir bool) error {
-	if _, err := os.Stat(path); err != nil {
-		if os.IsNotExist(err) {
-			if isDir {
-				return os.MkdirAll(path, 0755)
-			}
-			if err := os.MkdirAll(filepath.Dir(path), 0755); err != nil {
-				return err
-			}
-			f, err := os.OpenFile(path, os.O_CREATE, 0755)
-			if err != nil {
-				return err
-			}
-			f.Close()
-		}
-	}
-	return nil
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/fileutils/fileutils_unix.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/fileutils/fileutils_unix.go
deleted file mode 100644
index 7e00802c1..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/fileutils/fileutils_unix.go
+++ /dev/null
@@ -1,22 +0,0 @@
-// +build linux freebsd
-
-package fileutils
-
-import (
-	"fmt"
-	"io/ioutil"
-	"os"
-
-	"github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus"
-)
-
-// GetTotalUsedFds Returns the number of used File Descriptors by
-// reading it via /proc filesystem.
-func GetTotalUsedFds() int {
-	if fds, err := ioutil.ReadDir(fmt.Sprintf("/proc/%d/fd", os.Getpid())); err != nil {
-		logrus.Errorf("Error opening /proc/%d/fd: %s", os.Getpid(), err)
-	} else {
-		return len(fds)
-	}
-	return -1
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/fileutils/fileutils_windows.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/fileutils/fileutils_windows.go
deleted file mode 100644
index 5ec21cace..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/fileutils/fileutils_windows.go
+++ /dev/null
@@ -1,7 +0,0 @@
-package fileutils
-
-// GetTotalUsedFds Returns the number of used File Descriptors. Not supported
-// on Windows.
-func GetTotalUsedFds() int {
-	return -1
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/homedir/homedir.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/homedir/homedir.go
deleted file mode 100644
index dcae17882..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/homedir/homedir.go
+++ /dev/null
@@ -1,39 +0,0 @@
-package homedir
-
-import (
-	"os"
-	"runtime"
-
-	"github.com/fsouza/go-dockerclient/external/github.com/opencontainers/runc/libcontainer/user"
-)
-
-// Key returns the env var name for the user's home dir based on
-// the platform being run on
-func Key() string {
-	if runtime.GOOS == "windows" {
-		return "USERPROFILE"
-	}
-	return "HOME"
-}
-
-// Get returns the home directory of the current user with the help of
-// environment variables depending on the target operating system.
-// Returned path should be used with "path/filepath" to form new paths.
-func Get() string {
-	home := os.Getenv(Key())
-	if home == "" && runtime.GOOS != "windows" {
-		if u, err := user.CurrentUser(); err == nil {
-			return u.Home
-		}
-	}
-	return home
-}
-
-// GetShortcutString returns the string that is shortcut to user's home directory
-// in the native shell of the platform running on.
-func GetShortcutString() string {
-	if runtime.GOOS == "windows" {
-		return "%USERPROFILE%" // be careful while using in format functions
-	}
-	return "~"
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/idtools/idtools.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/idtools/idtools.go
deleted file mode 100644
index a1301ee97..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/idtools/idtools.go
+++ /dev/null
@@ -1,195 +0,0 @@
-package idtools
-
-import (
-	"bufio"
-	"fmt"
-	"os"
-	"sort"
-	"strconv"
-	"strings"
-)
-
-// IDMap contains a single entry for user namespace range remapping. An array
-// of IDMap entries represents the structure that will be provided to the Linux
-// kernel for creating a user namespace.
-type IDMap struct {
-	ContainerID int `json:"container_id"`
-	HostID      int `json:"host_id"`
-	Size        int `json:"size"`
-}
-
-type subIDRange struct {
-	Start  int
-	Length int
-}
-
-type ranges []subIDRange
-
-func (e ranges) Len() int           { return len(e) }
-func (e ranges) Swap(i, j int)      { e[i], e[j] = e[j], e[i] }
-func (e ranges) Less(i, j int) bool { return e[i].Start < e[j].Start }
-
-const (
-	subuidFileName string = "/etc/subuid"
-	subgidFileName string = "/etc/subgid"
-)
-
-// MkdirAllAs creates a directory (include any along the path) and then modifies
-// ownership to the requested uid/gid.  If the directory already exists, this
-// function will still change ownership to the requested uid/gid pair.
-func MkdirAllAs(path string, mode os.FileMode, ownerUID, ownerGID int) error {
-	return mkdirAs(path, mode, ownerUID, ownerGID, true, true)
-}
-
-// MkdirAllNewAs creates a directory (include any along the path) and then modifies
-// ownership ONLY of newly created directories to the requested uid/gid. If the
-// directories along the path exist, no change of ownership will be performed
-func MkdirAllNewAs(path string, mode os.FileMode, ownerUID, ownerGID int) error {
-	return mkdirAs(path, mode, ownerUID, ownerGID, true, false)
-}
-
-// MkdirAs creates a directory and then modifies ownership to the requested uid/gid.
-// If the directory already exists, this function still changes ownership
-func MkdirAs(path string, mode os.FileMode, ownerUID, ownerGID int) error {
-	return mkdirAs(path, mode, ownerUID, ownerGID, false, true)
-}
-
-// GetRootUIDGID retrieves the remapped root uid/gid pair from the set of maps.
-// If the maps are empty, then the root uid/gid will default to "real" 0/0
-func GetRootUIDGID(uidMap, gidMap []IDMap) (int, int, error) {
-	var uid, gid int
-
-	if uidMap != nil {
-		xUID, err := ToHost(0, uidMap)
-		if err != nil {
-			return -1, -1, err
-		}
-		uid = xUID
-	}
-	if gidMap != nil {
-		xGID, err := ToHost(0, gidMap)
-		if err != nil {
-			return -1, -1, err
-		}
-		gid = xGID
-	}
-	return uid, gid, nil
-}
-
-// ToContainer takes an id mapping, and uses it to translate a
-// host ID to the remapped ID. If no map is provided, then the translation
-// assumes a 1-to-1 mapping and returns the passed in id
-func ToContainer(hostID int, idMap []IDMap) (int, error) {
-	if idMap == nil {
-		return hostID, nil
-	}
-	for _, m := range idMap {
-		if (hostID >= m.HostID) && (hostID <= (m.HostID + m.Size - 1)) {
-			contID := m.ContainerID + (hostID - m.HostID)
-			return contID, nil
-		}
-	}
-	return -1, fmt.Errorf("Host ID %d cannot be mapped to a container ID", hostID)
-}
-
-// ToHost takes an id mapping and a remapped ID, and translates the
-// ID to the mapped host ID. If no map is provided, then the translation
-// assumes a 1-to-1 mapping and returns the passed in id #
-func ToHost(contID int, idMap []IDMap) (int, error) {
-	if idMap == nil {
-		return contID, nil
-	}
-	for _, m := range idMap {
-		if (contID >= m.ContainerID) && (contID <= (m.ContainerID + m.Size - 1)) {
-			hostID := m.HostID + (contID - m.ContainerID)
-			return hostID, nil
-		}
-	}
-	return -1, fmt.Errorf("Container ID %d cannot be mapped to a host ID", contID)
-}
-
-// CreateIDMappings takes a requested user and group name and
-// using the data from /etc/sub{uid,gid} ranges, creates the
-// proper uid and gid remapping ranges for that user/group pair
-func CreateIDMappings(username, groupname string) ([]IDMap, []IDMap, error) {
-	subuidRanges, err := parseSubuid(username)
-	if err != nil {
-		return nil, nil, err
-	}
-	subgidRanges, err := parseSubgid(groupname)
-	if err != nil {
-		return nil, nil, err
-	}
-	if len(subuidRanges) == 0 {
-		return nil, nil, fmt.Errorf("No subuid ranges found for user %q", username)
-	}
-	if len(subgidRanges) == 0 {
-		return nil, nil, fmt.Errorf("No subgid ranges found for group %q", groupname)
-	}
-
-	return createIDMap(subuidRanges), createIDMap(subgidRanges), nil
-}
-
-func createIDMap(subidRanges ranges) []IDMap {
-	idMap := []IDMap{}
-
-	// sort the ranges by lowest ID first
-	sort.Sort(subidRanges)
-	containerID := 0
-	for _, idrange := range subidRanges {
-		idMap = append(idMap, IDMap{
-			ContainerID: containerID,
-			HostID:      idrange.Start,
-			Size:        idrange.Length,
-		})
-		containerID = containerID + idrange.Length
-	}
-	return idMap
-}
-
-func parseSubuid(username string) (ranges, error) {
-	return parseSubidFile(subuidFileName, username)
-}
-
-func parseSubgid(username string) (ranges, error) {
-	return parseSubidFile(subgidFileName, username)
-}
-
-func parseSubidFile(path, username string) (ranges, error) {
-	var rangeList ranges
-
-	subidFile, err := os.Open(path)
-	if err != nil {
-		return rangeList, err
-	}
-	defer subidFile.Close()
-
-	s := bufio.NewScanner(subidFile)
-	for s.Scan() {
-		if err := s.Err(); err != nil {
-			return rangeList, err
-		}
-
-		text := strings.TrimSpace(s.Text())
-		if text == "" {
-			continue
-		}
-		parts := strings.Split(text, ":")
-		if len(parts) != 3 {
-			return rangeList, fmt.Errorf("Cannot parse subuid/gid information: Format not correct for %s file", path)
-		}
-		if parts[0] == username {
-			// return the first entry for a user; ignores potential for multiple ranges per user
-			startid, err := strconv.Atoi(parts[1])
-			if err != nil {
-				return rangeList, fmt.Errorf("String to int conversion failed during subuid/gid parsing of %s: %v", path, err)
-			}
-			length, err := strconv.Atoi(parts[2])
-			if err != nil {
-				return rangeList, fmt.Errorf("String to int conversion failed during subuid/gid parsing of %s: %v", path, err)
-			}
-			rangeList = append(rangeList, subIDRange{startid, length})
-		}
-	}
-	return rangeList, nil
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/idtools/idtools_unix.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/idtools/idtools_unix.go
deleted file mode 100644
index 0444307d2..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/idtools/idtools_unix.go
+++ /dev/null
@@ -1,60 +0,0 @@
-// +build !windows
-
-package idtools
-
-import (
-	"os"
-	"path/filepath"
-
-	"github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system"
-)
-
-func mkdirAs(path string, mode os.FileMode, ownerUID, ownerGID int, mkAll, chownExisting bool) error {
-	// make an array containing the original path asked for, plus (for mkAll == true)
-	// all path components leading up to the complete path that don't exist before we MkdirAll
-	// so that we can chown all of them properly at the end.  If chownExisting is false, we won't
-	// chown the full directory path if it exists
-	var paths []string
-	if _, err := os.Stat(path); err != nil && os.IsNotExist(err) {
-		paths = []string{path}
-	} else if err == nil && chownExisting {
-		if err := os.Chown(path, ownerUID, ownerGID); err != nil {
-			return err
-		}
-		// short-circuit--we were called with an existing directory and chown was requested
-		return nil
-	} else if err == nil {
-		// nothing to do; directory path fully exists already and chown was NOT requested
-		return nil
-	}
-
-	if mkAll {
-		// walk back to "/" looking for directories which do not exist
-		// and add them to the paths array for chown after creation
-		dirPath := path
-		for {
-			dirPath = filepath.Dir(dirPath)
-			if dirPath == "/" {
-				break
-			}
-			if _, err := os.Stat(dirPath); err != nil && os.IsNotExist(err) {
-				paths = append(paths, dirPath)
-			}
-		}
-		if err := system.MkdirAll(path, mode); err != nil && !os.IsExist(err) {
-			return err
-		}
-	} else {
-		if err := os.Mkdir(path, mode); err != nil && !os.IsExist(err) {
-			return err
-		}
-	}
-	// even if it existed, we will chown the requested path + any subpaths that
-	// didn't exist when we called MkdirAll
-	for _, pathComponent := range paths {
-		if err := os.Chown(pathComponent, ownerUID, ownerGID); err != nil {
-			return err
-		}
-	}
-	return nil
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/idtools/idtools_windows.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/idtools/idtools_windows.go
deleted file mode 100644
index d5ec992db..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/idtools/idtools_windows.go
+++ /dev/null
@@ -1,18 +0,0 @@
-// +build windows
-
-package idtools
-
-import (
-	"os"
-
-	"github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system"
-)
-
-// Platforms such as Windows do not support the UID/GID concept. So make this
-// just a wrapper around system.MkdirAll.
-func mkdirAs(path string, mode os.FileMode, ownerUID, ownerGID int, mkAll, chownExisting bool) error {
-	if err := system.MkdirAll(path, mode); err != nil && !os.IsExist(err) {
-		return err
-	}
-	return nil
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/idtools/usergroupadd_linux.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/idtools/usergroupadd_linux.go
deleted file mode 100644
index c1eedff10..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/idtools/usergroupadd_linux.go
+++ /dev/null
@@ -1,155 +0,0 @@
-package idtools
-
-import (
-	"fmt"
-	"os/exec"
-	"path/filepath"
-	"strings"
-	"syscall"
-)
-
-// add a user and/or group to Linux /etc/passwd, /etc/group using standard
-// Linux distribution commands:
-// adduser --uid <id> --shell /bin/login --no-create-home --disabled-login --ingroup <groupname> <username>
-// useradd -M -u <id> -s /bin/nologin -N -g <groupname> <username>
-// addgroup --gid <id> <groupname>
-// groupadd -g <id> <groupname>
-
-const baseUID int = 10000
-const baseGID int = 10000
-const idMAX int = 65534
-
-var (
-	userCommand  string
-	groupCommand string
-
-	cmdTemplates = map[string]string{
-		"adduser":  "--uid %d --shell /bin/false --no-create-home --disabled-login --ingroup %s %s",
-		"useradd":  "-M -u %d -s /bin/false -N -g %s %s",
-		"addgroup": "--gid %d %s",
-		"groupadd": "-g %d %s",
-	}
-)
-
-func init() {
-	// set up which commands are used for adding users/groups dependent on distro
-	if _, err := resolveBinary("adduser"); err == nil {
-		userCommand = "adduser"
-	} else if _, err := resolveBinary("useradd"); err == nil {
-		userCommand = "useradd"
-	}
-	if _, err := resolveBinary("addgroup"); err == nil {
-		groupCommand = "addgroup"
-	} else if _, err := resolveBinary("groupadd"); err == nil {
-		groupCommand = "groupadd"
-	}
-}
-
-func resolveBinary(binname string) (string, error) {
-	binaryPath, err := exec.LookPath(binname)
-	if err != nil {
-		return "", err
-	}
-	resolvedPath, err := filepath.EvalSymlinks(binaryPath)
-	if err != nil {
-		return "", err
-	}
-	//only return no error if the final resolved binary basename
-	//matches what was searched for
-	if filepath.Base(resolvedPath) == binname {
-		return resolvedPath, nil
-	}
-	return "", fmt.Errorf("Binary %q does not resolve to a binary of that name in $PATH (%q)", binname, resolvedPath)
-}
-
-// AddNamespaceRangesUser takes a name and finds an unused uid, gid pair
-// and calls the appropriate helper function to add the group and then
-// the user to the group in /etc/group and /etc/passwd respectively.
-// This new user's /etc/sub{uid,gid} ranges will be used for user namespace
-// mapping ranges in containers.
-func AddNamespaceRangesUser(name string) (int, int, error) {
-	// Find unused uid, gid pair
-	uid, err := findUnusedUID(baseUID)
-	if err != nil {
-		return -1, -1, fmt.Errorf("Unable to find unused UID: %v", err)
-	}
-	gid, err := findUnusedGID(baseGID)
-	if err != nil {
-		return -1, -1, fmt.Errorf("Unable to find unused GID: %v", err)
-	}
-
-	// First add the group that we will use
-	if err := addGroup(name, gid); err != nil {
-		return -1, -1, fmt.Errorf("Error adding group %q: %v", name, err)
-	}
-	// Add the user as a member of the group
-	if err := addUser(name, uid, name); err != nil {
-		return -1, -1, fmt.Errorf("Error adding user %q: %v", name, err)
-	}
-	return uid, gid, nil
-}
-
-func addUser(userName string, uid int, groupName string) error {
-
-	if userCommand == "" {
-		return fmt.Errorf("Cannot add user; no useradd/adduser binary found")
-	}
-	args := fmt.Sprintf(cmdTemplates[userCommand], uid, groupName, userName)
-	return execAddCmd(userCommand, args)
-}
-
-func addGroup(groupName string, gid int) error {
-
-	if groupCommand == "" {
-		return fmt.Errorf("Cannot add group; no groupadd/addgroup binary found")
-	}
-	args := fmt.Sprintf(cmdTemplates[groupCommand], gid, groupName)
-	// only error out if the error isn't that the group already exists
-	// if the group exists then our needs are already met
-	if err := execAddCmd(groupCommand, args); err != nil && !strings.Contains(err.Error(), "already exists") {
-		return err
-	}
-	return nil
-}
-
-func execAddCmd(cmd, args string) error {
-	execCmd := exec.Command(cmd, strings.Split(args, " ")...)
-	out, err := execCmd.CombinedOutput()
-	if err != nil {
-		return fmt.Errorf("Failed to add user/group with error: %v; output: %q", err, string(out))
-	}
-	return nil
-}
-
-func findUnusedUID(startUID int) (int, error) {
-	return findUnused("passwd", startUID)
-}
-
-func findUnusedGID(startGID int) (int, error) {
-	return findUnused("group", startGID)
-}
-
-func findUnused(file string, id int) (int, error) {
-	for {
-		cmdStr := fmt.Sprintf("cat /etc/%s | cut -d: -f3 | grep '^%d$'", file, id)
-		cmd := exec.Command("sh", "-c", cmdStr)
-		if err := cmd.Run(); err != nil {
-			// if a non-zero return code occurs, then we know the ID was not found
-			// and is usable
-			if exiterr, ok := err.(*exec.ExitError); ok {
-				// The program has exited with an exit code != 0
-				if status, ok := exiterr.Sys().(syscall.WaitStatus); ok {
-					if status.ExitStatus() == 1 {
-						//no match, we can use this ID
-						return id, nil
-					}
-				}
-			}
-			return -1, fmt.Errorf("Error looking in /etc/%s for unused ID: %v", file, err)
-		}
-		id++
-		if id > idMAX {
-			return -1, fmt.Errorf("Maximum id in %q reached with finding unused numeric ID", file)
-		}
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/idtools/usergroupadd_unsupported.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/idtools/usergroupadd_unsupported.go
deleted file mode 100644
index d98b354cb..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/idtools/usergroupadd_unsupported.go
+++ /dev/null
@@ -1,12 +0,0 @@
-// +build !linux
-
-package idtools
-
-import "fmt"
-
-// AddNamespaceRangesUser takes a name and finds an unused uid, gid pair
-// and calls the appropriate helper function to add the group and then
-// the user to the group in /etc/group and /etc/passwd respectively.
-func AddNamespaceRangesUser(name string) (int, int, error) {
-	return -1, -1, fmt.Errorf("No support for adding users or groups on this OS")
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/ioutils/bytespipe.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/ioutils/bytespipe.go
deleted file mode 100644
index 932e1d1bc..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/ioutils/bytespipe.go
+++ /dev/null
@@ -1,89 +0,0 @@
-package ioutils
-
-const maxCap = 1e6
-
-// BytesPipe is io.ReadWriter which works similarly to pipe(queue).
-// All written data could be read only once. Also BytesPipe is allocating
-// and releasing new byte slices to adjust to current needs, so there won't be
-// overgrown buffer after high load peak.
-// BytesPipe isn't goroutine-safe, caller must synchronize it if needed.
-type BytesPipe struct {
-	buf      [][]byte // slice of byte-slices of buffered data
-	lastRead int      // index in the first slice to a read point
-	bufLen   int      // length of data buffered over the slices
-}
-
-// NewBytesPipe creates new BytesPipe, initialized by specified slice.
-// If buf is nil, then it will be initialized with slice which cap is 64.
-// buf will be adjusted in a way that len(buf) == 0, cap(buf) == cap(buf).
-func NewBytesPipe(buf []byte) *BytesPipe {
-	if cap(buf) == 0 {
-		buf = make([]byte, 0, 64)
-	}
-	return &BytesPipe{
-		buf: [][]byte{buf[:0]},
-	}
-}
-
-// Write writes p to BytesPipe.
-// It can allocate new []byte slices in a process of writing.
-func (bp *BytesPipe) Write(p []byte) (n int, err error) {
-	for {
-		// write data to the last buffer
-		b := bp.buf[len(bp.buf)-1]
-		// copy data to the current empty allocated area
-		n := copy(b[len(b):cap(b)], p)
-		// increment buffered data length
-		bp.bufLen += n
-		// include written data in last buffer
-		bp.buf[len(bp.buf)-1] = b[:len(b)+n]
-
-		// if there was enough room to write all then break
-		if len(p) == n {
-			break
-		}
-
-		// more data: write to the next slice
-		p = p[n:]
-		// allocate slice that has twice the size of the last unless maximum reached
-		nextCap := 2 * cap(bp.buf[len(bp.buf)-1])
-		if maxCap < nextCap {
-			nextCap = maxCap
-		}
-		// add new byte slice to the buffers slice and continue writing
-		bp.buf = append(bp.buf, make([]byte, 0, nextCap))
-	}
-	return
-}
-
-func (bp *BytesPipe) len() int {
-	return bp.bufLen - bp.lastRead
-}
-
-// Read reads bytes from BytesPipe.
-// Data could be read only once.
-func (bp *BytesPipe) Read(p []byte) (n int, err error) {
-	for {
-		read := copy(p, bp.buf[0][bp.lastRead:])
-		n += read
-		bp.lastRead += read
-		if bp.len() == 0 {
-			// we have read everything. reset to the beginning.
-			bp.lastRead = 0
-			bp.bufLen -= len(bp.buf[0])
-			bp.buf[0] = bp.buf[0][:0]
-			break
-		}
-		// break if everything was read
-		if len(p) == read {
-			break
-		}
-		// more buffered data and more asked. read from next slice.
-		p = p[read:]
-		bp.lastRead = 0
-		bp.bufLen -= len(bp.buf[0])
-		bp.buf[0] = nil     // throw away old slice
-		bp.buf = bp.buf[1:] // switch to next
-	}
-	return
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/ioutils/fmt.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/ioutils/fmt.go
deleted file mode 100644
index 0b04b0ba3..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/ioutils/fmt.go
+++ /dev/null
@@ -1,22 +0,0 @@
-package ioutils
-
-import (
-	"fmt"
-	"io"
-)
-
-// FprintfIfNotEmpty prints the string value if it's not empty
-func FprintfIfNotEmpty(w io.Writer, format, value string) (int, error) {
-	if value != "" {
-		return fmt.Fprintf(w, format, value)
-	}
-	return 0, nil
-}
-
-// FprintfIfTrue prints the boolean value if it's true
-func FprintfIfTrue(w io.Writer, format string, ok bool) (int, error) {
-	if ok {
-		return fmt.Fprintf(w, format, ok)
-	}
-	return 0, nil
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/ioutils/multireader.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/ioutils/multireader.go
deleted file mode 100644
index f231aa9da..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/ioutils/multireader.go
+++ /dev/null
@@ -1,226 +0,0 @@
-package ioutils
-
-import (
-	"bytes"
-	"fmt"
-	"io"
-	"os"
-)
-
-type pos struct {
-	idx    int
-	offset int64
-}
-
-type multiReadSeeker struct {
-	readers []io.ReadSeeker
-	pos     *pos
-	posIdx  map[io.ReadSeeker]int
-}
-
-func (r *multiReadSeeker) Seek(offset int64, whence int) (int64, error) {
-	var tmpOffset int64
-	switch whence {
-	case os.SEEK_SET:
-		for i, rdr := range r.readers {
-			// get size of the current reader
-			s, err := rdr.Seek(0, os.SEEK_END)
-			if err != nil {
-				return -1, err
-			}
-
-			if offset > tmpOffset+s {
-				if i == len(r.readers)-1 {
-					rdrOffset := s + (offset - tmpOffset)
-					if _, err := rdr.Seek(rdrOffset, os.SEEK_SET); err != nil {
-						return -1, err
-					}
-					r.pos = &pos{i, rdrOffset}
-					return offset, nil
-				}
-
-				tmpOffset += s
-				continue
-			}
-
-			rdrOffset := offset - tmpOffset
-			idx := i
-
-			rdr.Seek(rdrOffset, os.SEEK_SET)
-			// make sure all following readers are at 0
-			for _, rdr := range r.readers[i+1:] {
-				rdr.Seek(0, os.SEEK_SET)
-			}
-
-			if rdrOffset == s && i != len(r.readers)-1 {
-				idx += 1
-				rdrOffset = 0
-			}
-			r.pos = &pos{idx, rdrOffset}
-			return offset, nil
-		}
-	case os.SEEK_END:
-		for _, rdr := range r.readers {
-			s, err := rdr.Seek(0, os.SEEK_END)
-			if err != nil {
-				return -1, err
-			}
-			tmpOffset += s
-		}
-		r.Seek(tmpOffset+offset, os.SEEK_SET)
-		return tmpOffset + offset, nil
-	case os.SEEK_CUR:
-		if r.pos == nil {
-			return r.Seek(offset, os.SEEK_SET)
-		}
-		// Just return the current offset
-		if offset == 0 {
-			return r.getCurOffset()
-		}
-
-		curOffset, err := r.getCurOffset()
-		if err != nil {
-			return -1, err
-		}
-		rdr, rdrOffset, err := r.getReaderForOffset(curOffset + offset)
-		if err != nil {
-			return -1, err
-		}
-
-		r.pos = &pos{r.posIdx[rdr], rdrOffset}
-		return curOffset + offset, nil
-	default:
-		return -1, fmt.Errorf("Invalid whence: %d", whence)
-	}
-
-	return -1, fmt.Errorf("Error seeking for whence: %d, offset: %d", whence, offset)
-}
-
-func (r *multiReadSeeker) getReaderForOffset(offset int64) (io.ReadSeeker, int64, error) {
-	var rdr io.ReadSeeker
-	var rdrOffset int64
-
-	for i, rdr := range r.readers {
-		offsetTo, err := r.getOffsetToReader(rdr)
-		if err != nil {
-			return nil, -1, err
-		}
-		if offsetTo > offset {
-			rdr = r.readers[i-1]
-			rdrOffset = offsetTo - offset
-			break
-		}
-
-		if rdr == r.readers[len(r.readers)-1] {
-			rdrOffset = offsetTo + offset
-			break
-		}
-	}
-
-	return rdr, rdrOffset, nil
-}
-
-func (r *multiReadSeeker) getCurOffset() (int64, error) {
-	var totalSize int64
-	for _, rdr := range r.readers[:r.pos.idx+1] {
-		if r.posIdx[rdr] == r.pos.idx {
-			totalSize += r.pos.offset
-			break
-		}
-
-		size, err := getReadSeekerSize(rdr)
-		if err != nil {
-			return -1, fmt.Errorf("error getting seeker size: %v", err)
-		}
-		totalSize += size
-	}
-	return totalSize, nil
-}
-
-func (r *multiReadSeeker) getOffsetToReader(rdr io.ReadSeeker) (int64, error) {
-	var offset int64
-	for _, r := range r.readers {
-		if r == rdr {
-			break
-		}
-
-		size, err := getReadSeekerSize(rdr)
-		if err != nil {
-			return -1, err
-		}
-		offset += size
-	}
-	return offset, nil
-}
-
-func (r *multiReadSeeker) Read(b []byte) (int, error) {
-	if r.pos == nil {
-		r.pos = &pos{0, 0}
-	}
-
-	bCap := int64(cap(b))
-	buf := bytes.NewBuffer(nil)
-	var rdr io.ReadSeeker
-
-	for _, rdr = range r.readers[r.pos.idx:] {
-		readBytes, err := io.CopyN(buf, rdr, bCap)
-		if err != nil && err != io.EOF {
-			return -1, err
-		}
-		bCap -= readBytes
-
-		if bCap == 0 {
-			break
-		}
-	}
-
-	rdrPos, err := rdr.Seek(0, os.SEEK_CUR)
-	if err != nil {
-		return -1, err
-	}
-	r.pos = &pos{r.posIdx[rdr], rdrPos}
-	return buf.Read(b)
-}
-
-func getReadSeekerSize(rdr io.ReadSeeker) (int64, error) {
-	// save the current position
-	pos, err := rdr.Seek(0, os.SEEK_CUR)
-	if err != nil {
-		return -1, err
-	}
-
-	// get the size
-	size, err := rdr.Seek(0, os.SEEK_END)
-	if err != nil {
-		return -1, err
-	}
-
-	// reset the position
-	if _, err := rdr.Seek(pos, os.SEEK_SET); err != nil {
-		return -1, err
-	}
-	return size, nil
-}
-
-// MultiReadSeeker returns a ReadSeeker that's the logical concatenation of the provided
-// input readseekers. After calling this method the initial position is set to the
-// beginning of the first ReadSeeker. At the end of a ReadSeeker, Read always advances
-// to the beginning of the next ReadSeeker and returns EOF at the end of the last ReadSeeker.
-// Seek can be used over the sum of lengths of all readseekers.
-//
-// When a MultiReadSeeker is used, no Read and Seek operations should be made on
-// its ReadSeeker components. Also, users should make no assumption on the state
-// of individual readseekers while the MultiReadSeeker is used.
-func MultiReadSeeker(readers ...io.ReadSeeker) io.ReadSeeker {
-	if len(readers) == 1 {
-		return readers[0]
-	}
-	idx := make(map[io.ReadSeeker]int)
-	for i, rdr := range readers {
-		idx[rdr] = i
-	}
-	return &multiReadSeeker{
-		readers: readers,
-		posIdx:  idx,
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/ioutils/readers.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/ioutils/readers.go
deleted file mode 100644
index 54dd312bb..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/ioutils/readers.go
+++ /dev/null
@@ -1,170 +0,0 @@
-package ioutils
-
-import (
-	"crypto/sha256"
-	"encoding/hex"
-	"io"
-	"sync"
-)
-
-type readCloserWrapper struct {
-	io.Reader
-	closer func() error
-}
-
-func (r *readCloserWrapper) Close() error {
-	return r.closer()
-}
-
-// NewReadCloserWrapper returns a new io.ReadCloser.
-func NewReadCloserWrapper(r io.Reader, closer func() error) io.ReadCloser {
-	return &readCloserWrapper{
-		Reader: r,
-		closer: closer,
-	}
-}
-
-type readerErrWrapper struct {
-	reader io.Reader
-	closer func()
-}
-
-func (r *readerErrWrapper) Read(p []byte) (int, error) {
-	n, err := r.reader.Read(p)
-	if err != nil {
-		r.closer()
-	}
-	return n, err
-}
-
-// NewReaderErrWrapper returns a new io.Reader.
-func NewReaderErrWrapper(r io.Reader, closer func()) io.Reader {
-	return &readerErrWrapper{
-		reader: r,
-		closer: closer,
-	}
-}
-
-// bufReader allows the underlying reader to continue to produce
-// output by pre-emptively reading from the wrapped reader.
-// This is achieved by buffering this data in bufReader's
-// expanding buffer.
-type bufReader struct {
-	sync.Mutex
-	buf      io.ReadWriter
-	reader   io.Reader
-	err      error
-	wait     sync.Cond
-	drainBuf []byte
-}
-
-// NewBufReader returns a new bufReader.
-func NewBufReader(r io.Reader) io.ReadCloser {
-	reader := &bufReader{
-		buf:      NewBytesPipe(nil),
-		reader:   r,
-		drainBuf: make([]byte, 1024),
-	}
-	reader.wait.L = &reader.Mutex
-	go reader.drain()
-	return reader
-}
-
-// NewBufReaderWithDrainbufAndBuffer returns a BufReader with drainBuffer and buffer.
-func NewBufReaderWithDrainbufAndBuffer(r io.Reader, drainBuffer []byte, buffer io.ReadWriter) io.ReadCloser {
-	reader := &bufReader{
-		buf:      buffer,
-		drainBuf: drainBuffer,
-		reader:   r,
-	}
-	reader.wait.L = &reader.Mutex
-	go reader.drain()
-	return reader
-}
-
-func (r *bufReader) drain() {
-	for {
-		//Call to scheduler is made to yield from this goroutine.
-		//This avoids goroutine looping here when n=0,err=nil, fixes code hangs when run with GCC Go.
-		callSchedulerIfNecessary()
-		n, err := r.reader.Read(r.drainBuf)
-		r.Lock()
-		if err != nil {
-			r.err = err
-		} else {
-			if n == 0 {
-				// nothing written, no need to signal
-				r.Unlock()
-				continue
-			}
-			r.buf.Write(r.drainBuf[:n])
-		}
-		r.wait.Signal()
-		r.Unlock()
-		if err != nil {
-			break
-		}
-	}
-}
-
-func (r *bufReader) Read(p []byte) (n int, err error) {
-	r.Lock()
-	defer r.Unlock()
-	for {
-		n, err = r.buf.Read(p)
-		if n > 0 {
-			return n, err
-		}
-		if r.err != nil {
-			return 0, r.err
-		}
-		r.wait.Wait()
-	}
-}
-
-// Close closes the bufReader
-func (r *bufReader) Close() error {
-	closer, ok := r.reader.(io.ReadCloser)
-	if !ok {
-		return nil
-	}
-	return closer.Close()
-}
-
-// HashData returns the sha256 sum of src.
-func HashData(src io.Reader) (string, error) {
-	h := sha256.New()
-	if _, err := io.Copy(h, src); err != nil {
-		return "", err
-	}
-	return "sha256:" + hex.EncodeToString(h.Sum(nil)), nil
-}
-
-// OnEOFReader wraps a io.ReadCloser and a function
-// the function will run at the end of file or close the file.
-type OnEOFReader struct {
-	Rc io.ReadCloser
-	Fn func()
-}
-
-func (r *OnEOFReader) Read(p []byte) (n int, err error) {
-	n, err = r.Rc.Read(p)
-	if err == io.EOF {
-		r.runFunc()
-	}
-	return
-}
-
-// Close closes the file and run the function.
-func (r *OnEOFReader) Close() error {
-	err := r.Rc.Close()
-	r.runFunc()
-	return err
-}
-
-func (r *OnEOFReader) runFunc() {
-	if fn := r.Fn; fn != nil {
-		fn()
-		r.Fn = nil
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/ioutils/scheduler.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/ioutils/scheduler.go
deleted file mode 100644
index 3c88f29e3..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/ioutils/scheduler.go
+++ /dev/null
@@ -1,6 +0,0 @@
-// +build !gccgo
-
-package ioutils
-
-func callSchedulerIfNecessary() {
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/ioutils/scheduler_gccgo.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/ioutils/scheduler_gccgo.go
deleted file mode 100644
index c11d02b94..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/ioutils/scheduler_gccgo.go
+++ /dev/null
@@ -1,13 +0,0 @@
-// +build gccgo
-
-package ioutils
-
-import (
-	"runtime"
-)
-
-func callSchedulerIfNecessary() {
-	//allow or force Go scheduler to switch context, without explicitly
-	//forcing this will make it hang when using gccgo implementation
-	runtime.Gosched()
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/ioutils/temp_unix.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/ioutils/temp_unix.go
deleted file mode 100644
index 1539ad21b..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/ioutils/temp_unix.go
+++ /dev/null
@@ -1,10 +0,0 @@
-// +build !windows
-
-package ioutils
-
-import "io/ioutil"
-
-// TempDir on Unix systems is equivalent to ioutil.TempDir.
-func TempDir(dir, prefix string) (string, error) {
-	return ioutil.TempDir(dir, prefix)
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/ioutils/temp_windows.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/ioutils/temp_windows.go
deleted file mode 100644
index 72c0bc597..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/ioutils/temp_windows.go
+++ /dev/null
@@ -1,18 +0,0 @@
-// +build windows
-
-package ioutils
-
-import (
-	"io/ioutil"
-
-	"github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/longpath"
-)
-
-// TempDir is the equivalent of ioutil.TempDir, except that the result is in Windows longpath format.
-func TempDir(dir, prefix string) (string, error) {
-	tempDir, err := ioutil.TempDir(dir, prefix)
-	if err != nil {
-		return "", err
-	}
-	return longpath.AddPrefix(tempDir), nil
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/ioutils/writeflusher.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/ioutils/writeflusher.go
deleted file mode 100644
index 25095474d..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/ioutils/writeflusher.go
+++ /dev/null
@@ -1,47 +0,0 @@
-package ioutils
-
-import (
-	"io"
-	"net/http"
-	"sync"
-)
-
-type WriteFlusher struct {
-	sync.Mutex
-	w       io.Writer
-	flusher http.Flusher
-	flushed bool
-}
-
-func (wf *WriteFlusher) Write(b []byte) (n int, err error) {
-	wf.Lock()
-	defer wf.Unlock()
-	n, err = wf.w.Write(b)
-	wf.flushed = true
-	wf.flusher.Flush()
-	return n, err
-}
-
-// Flush the stream immediately.
-func (wf *WriteFlusher) Flush() {
-	wf.Lock()
-	defer wf.Unlock()
-	wf.flushed = true
-	wf.flusher.Flush()
-}
-
-func (wf *WriteFlusher) Flushed() bool {
-	wf.Lock()
-	defer wf.Unlock()
-	return wf.flushed
-}
-
-func NewWriteFlusher(w io.Writer) *WriteFlusher {
-	var flusher http.Flusher
-	if f, ok := w.(http.Flusher); ok {
-		flusher = f
-	} else {
-		flusher = &NopFlusher{}
-	}
-	return &WriteFlusher{w: w, flusher: flusher}
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/ioutils/writers.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/ioutils/writers.go
deleted file mode 100644
index 43fdc44ea..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/ioutils/writers.go
+++ /dev/null
@@ -1,60 +0,0 @@
-package ioutils
-
-import "io"
-
-type NopWriter struct{}
-
-func (*NopWriter) Write(buf []byte) (int, error) {
-	return len(buf), nil
-}
-
-type nopWriteCloser struct {
-	io.Writer
-}
-
-func (w *nopWriteCloser) Close() error { return nil }
-
-func NopWriteCloser(w io.Writer) io.WriteCloser {
-	return &nopWriteCloser{w}
-}
-
-type NopFlusher struct{}
-
-func (f *NopFlusher) Flush() {}
-
-type writeCloserWrapper struct {
-	io.Writer
-	closer func() error
-}
-
-func (r *writeCloserWrapper) Close() error {
-	return r.closer()
-}
-
-func NewWriteCloserWrapper(r io.Writer, closer func() error) io.WriteCloser {
-	return &writeCloserWrapper{
-		Writer: r,
-		closer: closer,
-	}
-}
-
-// Wrap a concrete io.Writer and hold a count of the number
-// of bytes written to the writer during a "session".
-// This can be convenient when write return is masked
-// (e.g., json.Encoder.Encode())
-type WriteCounter struct {
-	Count  int64
-	Writer io.Writer
-}
-
-func NewWriteCounter(w io.Writer) *WriteCounter {
-	return &WriteCounter{
-		Writer: w,
-	}
-}
-
-func (wc *WriteCounter) Write(p []byte) (count int, err error) {
-	count, err = wc.Writer.Write(p)
-	wc.Count += int64(count)
-	return
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/longpath/longpath.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/longpath/longpath.go
deleted file mode 100644
index 9b15bfff4..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/longpath/longpath.go
+++ /dev/null
@@ -1,26 +0,0 @@
-// longpath introduces some constants and helper functions for handling long paths
-// in Windows, which are expected to be prepended with `\\?\` and followed by either
-// a drive letter, a UNC server\share, or a volume identifier.
-
-package longpath
-
-import (
-	"strings"
-)
-
-// Prefix is the longpath prefix for Windows file paths.
-const Prefix = `\\?\`
-
-// AddPrefix will add the Windows long path prefix to the path provided if
-// it does not already have it.
-func AddPrefix(path string) string {
-	if !strings.HasPrefix(path, Prefix) {
-		if strings.HasPrefix(path, `\\`) {
-			// This is a UNC path, so we need to add 'UNC' to the path as well.
-			path = Prefix + `UNC` + path[1:]
-		} else {
-			path = Prefix + path
-		}
-	}
-	return path
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/mflag/LICENSE b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/mflag/LICENSE
deleted file mode 100644
index ac74d8f04..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/mflag/LICENSE
+++ /dev/null
@@ -1,27 +0,0 @@
-Copyright (c) 2014-2015 The Docker & Go 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.
-   * 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/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/mflag/README.md b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/mflag/README.md
deleted file mode 100644
index da00efa33..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/mflag/README.md
+++ /dev/null
@@ -1,40 +0,0 @@
-Package mflag (aka multiple-flag) implements command-line flag parsing.  
-It's an **hacky** fork of the [official golang package](http://golang.org/pkg/flag/)
-
-It adds:
-
-* both short and long flag version  
-`./example -s red` `./example --string blue`
-
-* multiple names for the same option  
-```
-$>./example -h
-Usage of example:
-  -s, --string="": a simple string
-```
-
-___
-It is very flexible on purpose, so you can do things like:  
-```
-$>./example -h
-Usage of example:
-  -s, -string, --string="": a simple string
-```
-
-Or:  
-```
-$>./example -h
-Usage of example:
-  -oldflag, --newflag="": a simple string
-```
-
-You can also hide some flags from the usage, so if we want only `--newflag`:  
-```
-$>./example -h
-Usage of example:
-  --newflag="": a simple string
-$>./example -oldflag str
-str
-```
-
-See [example.go](example/example.go) for more details.
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/mflag/flag.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/mflag/flag.go
deleted file mode 100644
index ebfa35010..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/mflag/flag.go
+++ /dev/null
@@ -1,1201 +0,0 @@
-// Copyright 2014-2015 The Docker & 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 mflag implements command-line flag parsing.
-//
-//	Usage:
-//
-//	Define flags using flag.String(), Bool(), Int(), etc.
-//
-//	This declares an integer flag, -f or --flagname, stored in the pointer ip, with type *int.
-//		import "flag /github.com/docker/docker/pkg/mflag"
-//		var ip = flag.Int([]string{"f", "-flagname"}, 1234, "help message for flagname")
-//	If you like, you can bind the flag to a variable using the Var() functions.
-//		var flagvar int
-//		func init() {
-//			// -flaghidden will work, but will be hidden from the usage
-//			flag.IntVar(&flagvar, []string{"f", "#flaghidden", "-flagname"}, 1234, "help message for flagname")
-//		}
-//	Or you can create custom flags that satisfy the Value interface (with
-//	pointer receivers) and couple them to flag parsing by
-//		flag.Var(&flagVal, []string{"name"}, "help message for flagname")
-//	For such flags, the default value is just the initial value of the variable.
-//
-//	You can also add "deprecated" flags, they are still usable, but are not shown
-//	in the usage and will display a warning when you try to use them. `#` before
-//	an option means this option is deprecated, if there is an following option
-//	without `#` ahead, then that's the replacement, if not, it will just be removed:
-//		var ip = flag.Int([]string{"#f", "#flagname", "-flagname"}, 1234, "help message for flagname")
-//	this will display: `Warning: '-f' is deprecated, it will be replaced by '--flagname' soon. See usage.` or
-//	this will display: `Warning: '-flagname' is deprecated, it will be replaced by '--flagname' soon. See usage.`
-//		var ip = flag.Int([]string{"f", "#flagname"}, 1234, "help message for flagname")
-//	will display: `Warning: '-flagname' is deprecated, it will be removed soon. See usage.`
-//	so you can only use `-f`.
-//
-//	You can also group one letter flags, bif you declare
-//		var v = flag.Bool([]string{"v", "-verbose"}, false, "help message for verbose")
-//		var s = flag.Bool([]string{"s", "-slow"}, false, "help message for slow")
-//	you will be able to use the -vs or -sv
-//
-//	After all flags are defined, call
-//		flag.Parse()
-//	to parse the command line into the defined flags.
-//
-//	Flags may then be used directly. If you're using the flags themselves,
-//	they are all pointers; if you bind to variables, they're values.
-//		fmt.Println("ip has value ", *ip)
-//		fmt.Println("flagvar has value ", flagvar)
-//
-//	After parsing, the arguments after the flag are available as the
-//	slice flag.Args() or individually as flag.Arg(i).
-//	The arguments are indexed from 0 through flag.NArg()-1.
-//
-//	Command line flag syntax:
-//		-flag
-//		-flag=x
-//		-flag="x"
-//		-flag='x'
-//		-flag x  // non-boolean flags only
-//	One or two minus signs may be used; they are equivalent.
-//	The last form is not permitted for boolean flags because the
-//	meaning of the command
-//		cmd -x *
-//	will change if there is a file called 0, false, etc.  You must
-//	use the -flag=false form to turn off a boolean flag.
-//
-//	Flag parsing stops just before the first non-flag argument
-//	("-" is a non-flag argument) or after the terminator "--".
-//
-//	Integer flags accept 1234, 0664, 0x1234 and may be negative.
-//	Boolean flags may be 1, 0, t, f, true, false, TRUE, FALSE, True, False.
-//	Duration flags accept any input valid for time.ParseDuration.
-//
-//	The default set of command-line flags is controlled by
-//	top-level functions.  The FlagSet type allows one to define
-//	independent sets of flags, such as to implement subcommands
-//	in a command-line interface. The methods of FlagSet are
-//	analogous to the top-level functions for the command-line
-//	flag set.
-
-package mflag
-
-import (
-	"errors"
-	"fmt"
-	"io"
-	"os"
-	"runtime"
-	"sort"
-	"strconv"
-	"strings"
-	"text/tabwriter"
-	"time"
-
-	"github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/homedir"
-)
-
-// ErrHelp is the error returned if the flag -help is invoked but no such flag is defined.
-var ErrHelp = errors.New("flag: help requested")
-
-// ErrRetry is the error returned if you need to try letter by letter
-var ErrRetry = errors.New("flag: retry")
-
-// -- bool Value
-type boolValue bool
-
-func newBoolValue(val bool, p *bool) *boolValue {
-	*p = val
-	return (*boolValue)(p)
-}
-
-func (b *boolValue) Set(s string) error {
-	v, err := strconv.ParseBool(s)
-	*b = boolValue(v)
-	return err
-}
-
-func (b *boolValue) Get() interface{} { return bool(*b) }
-
-func (b *boolValue) String() string { return fmt.Sprintf("%v", *b) }
-
-func (b *boolValue) IsBoolFlag() bool { return true }
-
-// optional interface to indicate boolean flags that can be
-// supplied without "=value" text
-type boolFlag interface {
-	Value
-	IsBoolFlag() bool
-}
-
-// -- int Value
-type intValue int
-
-func newIntValue(val int, p *int) *intValue {
-	*p = val
-	return (*intValue)(p)
-}
-
-func (i *intValue) Set(s string) error {
-	v, err := strconv.ParseInt(s, 0, 64)
-	*i = intValue(v)
-	return err
-}
-
-func (i *intValue) Get() interface{} { return int(*i) }
-
-func (i *intValue) String() string { return fmt.Sprintf("%v", *i) }
-
-// -- int64 Value
-type int64Value int64
-
-func newInt64Value(val int64, p *int64) *int64Value {
-	*p = val
-	return (*int64Value)(p)
-}
-
-func (i *int64Value) Set(s string) error {
-	v, err := strconv.ParseInt(s, 0, 64)
-	*i = int64Value(v)
-	return err
-}
-
-func (i *int64Value) Get() interface{} { return int64(*i) }
-
-func (i *int64Value) String() string { return fmt.Sprintf("%v", *i) }
-
-// -- uint Value
-type uintValue uint
-
-func newUintValue(val uint, p *uint) *uintValue {
-	*p = val
-	return (*uintValue)(p)
-}
-
-func (i *uintValue) Set(s string) error {
-	v, err := strconv.ParseUint(s, 0, 64)
-	*i = uintValue(v)
-	return err
-}
-
-func (i *uintValue) Get() interface{} { return uint(*i) }
-
-func (i *uintValue) String() string { return fmt.Sprintf("%v", *i) }
-
-// -- uint64 Value
-type uint64Value uint64
-
-func newUint64Value(val uint64, p *uint64) *uint64Value {
-	*p = val
-	return (*uint64Value)(p)
-}
-
-func (i *uint64Value) Set(s string) error {
-	v, err := strconv.ParseUint(s, 0, 64)
-	*i = uint64Value(v)
-	return err
-}
-
-func (i *uint64Value) Get() interface{} { return uint64(*i) }
-
-func (i *uint64Value) String() string { return fmt.Sprintf("%v", *i) }
-
-// -- string Value
-type stringValue string
-
-func newStringValue(val string, p *string) *stringValue {
-	*p = val
-	return (*stringValue)(p)
-}
-
-func (s *stringValue) Set(val string) error {
-	*s = stringValue(val)
-	return nil
-}
-
-func (s *stringValue) Get() interface{} { return string(*s) }
-
-func (s *stringValue) String() string { return fmt.Sprintf("%s", *s) }
-
-// -- float64 Value
-type float64Value float64
-
-func newFloat64Value(val float64, p *float64) *float64Value {
-	*p = val
-	return (*float64Value)(p)
-}
-
-func (f *float64Value) Set(s string) error {
-	v, err := strconv.ParseFloat(s, 64)
-	*f = float64Value(v)
-	return err
-}
-
-func (f *float64Value) Get() interface{} { return float64(*f) }
-
-func (f *float64Value) String() string { return fmt.Sprintf("%v", *f) }
-
-// -- time.Duration Value
-type durationValue time.Duration
-
-func newDurationValue(val time.Duration, p *time.Duration) *durationValue {
-	*p = val
-	return (*durationValue)(p)
-}
-
-func (d *durationValue) Set(s string) error {
-	v, err := time.ParseDuration(s)
-	*d = durationValue(v)
-	return err
-}
-
-func (d *durationValue) Get() interface{} { return time.Duration(*d) }
-
-func (d *durationValue) String() string { return (*time.Duration)(d).String() }
-
-// Value is the interface to the dynamic value stored in a flag.
-// (The default value is represented as a string.)
-//
-// If a Value has an IsBoolFlag() bool method returning true,
-// the command-line parser makes -name equivalent to -name=true
-// rather than using the next command-line argument.
-type Value interface {
-	String() string
-	Set(string) error
-}
-
-// Getter is an interface that allows the contents of a Value to be retrieved.
-// It wraps the Value interface, rather than being part of it, because it
-// appeared after Go 1 and its compatibility rules. All Value types provided
-// by this package satisfy the Getter interface.
-type Getter interface {
-	Value
-	Get() interface{}
-}
-
-// ErrorHandling defines how to handle flag parsing errors.
-type ErrorHandling int
-
-// ErrorHandling strategies available when a flag parsing error occurs
-const (
-	ContinueOnError ErrorHandling = iota
-	ExitOnError
-	PanicOnError
-)
-
-// A FlagSet represents a set of defined flags.  The zero value of a FlagSet
-// has no name and has ContinueOnError error handling.
-type FlagSet struct {
-	// Usage is the function called when an error occurs while parsing flags.
-	// The field is a function (not a method) that may be changed to point to
-	// a custom error handler.
-	Usage      func()
-	ShortUsage func()
-
-	name             string
-	parsed           bool
-	actual           map[string]*Flag
-	formal           map[string]*Flag
-	args             []string // arguments after flags
-	errorHandling    ErrorHandling
-	output           io.Writer // nil means stderr; use Out() accessor
-	nArgRequirements []nArgRequirement
-}
-
-// A Flag represents the state of a flag.
-type Flag struct {
-	Names    []string // name as it appears on command line
-	Usage    string   // help message
-	Value    Value    // value as set
-	DefValue string   // default value (as text); for usage message
-}
-
-type flagSlice []string
-
-func (p flagSlice) Len() int { return len(p) }
-func (p flagSlice) Less(i, j int) bool {
-	pi, pj := strings.TrimPrefix(p[i], "-"), strings.TrimPrefix(p[j], "-")
-	lpi, lpj := strings.ToLower(pi), strings.ToLower(pj)
-	if lpi != lpj {
-		return lpi < lpj
-	}
-	return pi < pj
-}
-func (p flagSlice) Swap(i, j int) { p[i], p[j] = p[j], p[i] }
-
-// sortFlags returns the flags as a slice in lexicographical sorted order.
-func sortFlags(flags map[string]*Flag) []*Flag {
-	var list flagSlice
-
-	// The sorted list is based on the first name, when flag map might use the other names.
-	nameMap := make(map[string]string)
-
-	for n, f := range flags {
-		fName := strings.TrimPrefix(f.Names[0], "#")
-		nameMap[fName] = n
-		if len(f.Names) == 1 {
-			list = append(list, fName)
-			continue
-		}
-
-		found := false
-		for _, name := range list {
-			if name == fName {
-				found = true
-				break
-			}
-		}
-		if !found {
-			list = append(list, fName)
-		}
-	}
-	sort.Sort(list)
-	result := make([]*Flag, len(list))
-	for i, name := range list {
-		result[i] = flags[nameMap[name]]
-	}
-	return result
-}
-
-// Name returns the name of the FlagSet.
-func (fs *FlagSet) Name() string {
-	return fs.name
-}
-
-// Out returns the destination for usage and error messages.
-func (fs *FlagSet) Out() io.Writer {
-	if fs.output == nil {
-		return os.Stderr
-	}
-	return fs.output
-}
-
-// SetOutput sets the destination for usage and error messages.
-// If output is nil, os.Stderr is used.
-func (fs *FlagSet) SetOutput(output io.Writer) {
-	fs.output = output
-}
-
-// VisitAll visits the flags in lexicographical order, calling fn for each.
-// It visits all flags, even those not set.
-func (fs *FlagSet) VisitAll(fn func(*Flag)) {
-	for _, flag := range sortFlags(fs.formal) {
-		fn(flag)
-	}
-}
-
-// VisitAll visits the command-line flags in lexicographical order, calling
-// fn for each.  It visits all flags, even those not set.
-func VisitAll(fn func(*Flag)) {
-	CommandLine.VisitAll(fn)
-}
-
-// Visit visits the flags in lexicographical order, calling fn for each.
-// It visits only those flags that have been set.
-func (fs *FlagSet) Visit(fn func(*Flag)) {
-	for _, flag := range sortFlags(fs.actual) {
-		fn(flag)
-	}
-}
-
-// Visit visits the command-line flags in lexicographical order, calling fn
-// for each.  It visits only those flags that have been set.
-func Visit(fn func(*Flag)) {
-	CommandLine.Visit(fn)
-}
-
-// Lookup returns the Flag structure of the named flag, returning nil if none exists.
-func (fs *FlagSet) Lookup(name string) *Flag {
-	return fs.formal[name]
-}
-
-// IsSet indicates whether the specified flag is set in the given FlagSet
-func (fs *FlagSet) IsSet(name string) bool {
-	return fs.actual[name] != nil
-}
-
-// Lookup returns the Flag structure of the named command-line flag,
-// returning nil if none exists.
-func Lookup(name string) *Flag {
-	return CommandLine.formal[name]
-}
-
-// IsSet indicates whether the specified flag was specified at all on the cmd line.
-func IsSet(name string) bool {
-	return CommandLine.IsSet(name)
-}
-
-type nArgRequirementType int
-
-// Indicator used to pass to BadArgs function
-const (
-	Exact nArgRequirementType = iota
-	Max
-	Min
-)
-
-type nArgRequirement struct {
-	Type nArgRequirementType
-	N    int
-}
-
-// Require adds a requirement about the number of arguments for the FlagSet.
-// The first parameter can be Exact, Max, or Min to respectively specify the exact,
-// the maximum, or the minimal number of arguments required.
-// The actual check is done in FlagSet.CheckArgs().
-func (fs *FlagSet) Require(nArgRequirementType nArgRequirementType, nArg int) {
-	fs.nArgRequirements = append(fs.nArgRequirements, nArgRequirement{nArgRequirementType, nArg})
-}
-
-// CheckArgs uses the requirements set by FlagSet.Require() to validate
-// the number of arguments. If the requirements are not met,
-// an error message string is returned.
-func (fs *FlagSet) CheckArgs() (message string) {
-	for _, req := range fs.nArgRequirements {
-		var arguments string
-		if req.N == 1 {
-			arguments = "1 argument"
-		} else {
-			arguments = fmt.Sprintf("%d arguments", req.N)
-		}
-
-		str := func(kind string) string {
-			return fmt.Sprintf("%q requires %s%s", fs.name, kind, arguments)
-		}
-
-		switch req.Type {
-		case Exact:
-			if fs.NArg() != req.N {
-				return str("")
-			}
-		case Max:
-			if fs.NArg() > req.N {
-				return str("a maximum of ")
-			}
-		case Min:
-			if fs.NArg() < req.N {
-				return str("a minimum of ")
-			}
-		}
-	}
-	return ""
-}
-
-// Set sets the value of the named flag.
-func (fs *FlagSet) Set(name, value string) error {
-	flag, ok := fs.formal[name]
-	if !ok {
-		return fmt.Errorf("no such flag -%v", name)
-	}
-	if err := flag.Value.Set(value); err != nil {
-		return err
-	}
-	if fs.actual == nil {
-		fs.actual = make(map[string]*Flag)
-	}
-	fs.actual[name] = flag
-	return nil
-}
-
-// Set sets the value of the named command-line flag.
-func Set(name, value string) error {
-	return CommandLine.Set(name, value)
-}
-
-// PrintDefaults prints, to standard error unless configured
-// otherwise, the default values of all defined flags in the set.
-func (fs *FlagSet) PrintDefaults() {
-	writer := tabwriter.NewWriter(fs.Out(), 20, 1, 3, ' ', 0)
-	home := homedir.Get()
-
-	// Don't substitute when HOME is /
-	if runtime.GOOS != "windows" && home == "/" {
-		home = ""
-	}
-
-	// Add a blank line between cmd description and list of options
-	if fs.FlagCount() > 0 {
-		fmt.Fprintln(writer, "")
-	}
-
-	fs.VisitAll(func(flag *Flag) {
-		format := "  -%s=%s"
-		names := []string{}
-		for _, name := range flag.Names {
-			if name[0] != '#' {
-				names = append(names, name)
-			}
-		}
-		if len(names) > 0 && len(flag.Usage) > 0 {
-			val := flag.DefValue
-
-			if home != "" && strings.HasPrefix(val, home) {
-				val = homedir.GetShortcutString() + val[len(home):]
-			}
-
-			fmt.Fprintf(writer, format, strings.Join(names, ", -"), val)
-			for i, line := range strings.Split(flag.Usage, "\n") {
-				if i != 0 {
-					line = "  " + line
-				}
-				fmt.Fprintln(writer, "\t", line)
-			}
-		}
-	})
-	writer.Flush()
-}
-
-// PrintDefaults prints to standard error the default values of all defined command-line flags.
-func PrintDefaults() {
-	CommandLine.PrintDefaults()
-}
-
-// defaultUsage is the default function to print a usage message.
-func defaultUsage(fs *FlagSet) {
-	if fs.name == "" {
-		fmt.Fprintf(fs.Out(), "Usage:\n")
-	} else {
-		fmt.Fprintf(fs.Out(), "Usage of %s:\n", fs.name)
-	}
-	fs.PrintDefaults()
-}
-
-// NOTE: Usage is not just defaultUsage(CommandLine)
-// because it serves (via godoc flag Usage) as the example
-// for how to write your own usage function.
-
-// Usage prints to standard error a usage message documenting all defined command-line flags.
-// The function is a variable that may be changed to point to a custom function.
-var Usage = func() {
-	fmt.Fprintf(CommandLine.Out(), "Usage of %s:\n", os.Args[0])
-	PrintDefaults()
-}
-
-// Usage prints to standard error a usage message documenting the standard command layout
-// The function is a variable that may be changed to point to a custom function.
-var ShortUsage = func() {
-	fmt.Fprintf(CommandLine.output, "Usage of %s:\n", os.Args[0])
-}
-
-// FlagCount returns the number of flags that have been defined.
-func (fs *FlagSet) FlagCount() int { return len(sortFlags(fs.formal)) }
-
-// FlagCountUndeprecated returns the number of undeprecated flags that have been defined.
-func (fs *FlagSet) FlagCountUndeprecated() int {
-	count := 0
-	for _, flag := range sortFlags(fs.formal) {
-		for _, name := range flag.Names {
-			if name[0] != '#' {
-				count++
-				break
-			}
-		}
-	}
-	return count
-}
-
-// NFlag returns the number of flags that have been set.
-func (fs *FlagSet) NFlag() int { return len(fs.actual) }
-
-// NFlag returns the number of command-line flags that have been set.
-func NFlag() int { return len(CommandLine.actual) }
-
-// Arg returns the i'th argument.  Arg(0) is the first remaining argument
-// after flags have been processed.
-func (fs *FlagSet) Arg(i int) string {
-	if i < 0 || i >= len(fs.args) {
-		return ""
-	}
-	return fs.args[i]
-}
-
-// Arg returns the i'th command-line argument.  Arg(0) is the first remaining argument
-// after flags have been processed.
-func Arg(i int) string {
-	return CommandLine.Arg(i)
-}
-
-// NArg is the number of arguments remaining after flags have been processed.
-func (fs *FlagSet) NArg() int { return len(fs.args) }
-
-// NArg is the number of arguments remaining after flags have been processed.
-func NArg() int { return len(CommandLine.args) }
-
-// Args returns the non-flag arguments.
-func (fs *FlagSet) Args() []string { return fs.args }
-
-// Args returns the non-flag command-line arguments.
-func Args() []string { return CommandLine.args }
-
-// BoolVar defines a bool flag with specified name, default value, and usage string.
-// The argument p points to a bool variable in which to store the value of the flag.
-func (fs *FlagSet) BoolVar(p *bool, names []string, value bool, usage string) {
-	fs.Var(newBoolValue(value, p), names, usage)
-}
-
-// BoolVar defines a bool flag with specified name, default value, and usage string.
-// The argument p points to a bool variable in which to store the value of the flag.
-func BoolVar(p *bool, names []string, value bool, usage string) {
-	CommandLine.Var(newBoolValue(value, p), names, usage)
-}
-
-// Bool defines a bool flag with specified name, default value, and usage string.
-// The return value is the address of a bool variable that stores the value of the flag.
-func (fs *FlagSet) Bool(names []string, value bool, usage string) *bool {
-	p := new(bool)
-	fs.BoolVar(p, names, value, usage)
-	return p
-}
-
-// Bool defines a bool flag with specified name, default value, and usage string.
-// The return value is the address of a bool variable that stores the value of the flag.
-func Bool(names []string, value bool, usage string) *bool {
-	return CommandLine.Bool(names, value, usage)
-}
-
-// IntVar defines an int flag with specified name, default value, and usage string.
-// The argument p points to an int variable in which to store the value of the flag.
-func (fs *FlagSet) IntVar(p *int, names []string, value int, usage string) {
-	fs.Var(newIntValue(value, p), names, usage)
-}
-
-// IntVar defines an int flag with specified name, default value, and usage string.
-// The argument p points to an int variable in which to store the value of the flag.
-func IntVar(p *int, names []string, value int, usage string) {
-	CommandLine.Var(newIntValue(value, p), names, usage)
-}
-
-// Int defines an int flag with specified name, default value, and usage string.
-// The return value is the address of an int variable that stores the value of the flag.
-func (fs *FlagSet) Int(names []string, value int, usage string) *int {
-	p := new(int)
-	fs.IntVar(p, names, value, usage)
-	return p
-}
-
-// Int defines an int flag with specified name, default value, and usage string.
-// The return value is the address of an int variable that stores the value of the flag.
-func Int(names []string, value int, usage string) *int {
-	return CommandLine.Int(names, value, usage)
-}
-
-// Int64Var defines an int64 flag with specified name, default value, and usage string.
-// The argument p points to an int64 variable in which to store the value of the flag.
-func (fs *FlagSet) Int64Var(p *int64, names []string, value int64, usage string) {
-	fs.Var(newInt64Value(value, p), names, usage)
-}
-
-// Int64Var defines an int64 flag with specified name, default value, and usage string.
-// The argument p points to an int64 variable in which to store the value of the flag.
-func Int64Var(p *int64, names []string, value int64, usage string) {
-	CommandLine.Var(newInt64Value(value, p), names, usage)
-}
-
-// Int64 defines an int64 flag with specified name, default value, and usage string.
-// The return value is the address of an int64 variable that stores the value of the flag.
-func (fs *FlagSet) Int64(names []string, value int64, usage string) *int64 {
-	p := new(int64)
-	fs.Int64Var(p, names, value, usage)
-	return p
-}
-
-// Int64 defines an int64 flag with specified name, default value, and usage string.
-// The return value is the address of an int64 variable that stores the value of the flag.
-func Int64(names []string, value int64, usage string) *int64 {
-	return CommandLine.Int64(names, value, usage)
-}
-
-// UintVar defines a uint flag with specified name, default value, and usage string.
-// The argument p points to a uint variable in which to store the value of the flag.
-func (fs *FlagSet) UintVar(p *uint, names []string, value uint, usage string) {
-	fs.Var(newUintValue(value, p), names, usage)
-}
-
-// UintVar defines a uint flag with specified name, default value, and usage string.
-// The argument p points to a uint  variable in which to store the value of the flag.
-func UintVar(p *uint, names []string, value uint, usage string) {
-	CommandLine.Var(newUintValue(value, p), names, usage)
-}
-
-// Uint defines a uint flag with specified name, default value, and usage string.
-// The return value is the address of a uint  variable that stores the value of the flag.
-func (fs *FlagSet) Uint(names []string, value uint, usage string) *uint {
-	p := new(uint)
-	fs.UintVar(p, names, value, usage)
-	return p
-}
-
-// Uint defines a uint flag with specified name, default value, and usage string.
-// The return value is the address of a uint  variable that stores the value of the flag.
-func Uint(names []string, value uint, usage string) *uint {
-	return CommandLine.Uint(names, value, usage)
-}
-
-// Uint64Var defines a uint64 flag with specified name, default value, and usage string.
-// The argument p points to a uint64 variable in which to store the value of the flag.
-func (fs *FlagSet) Uint64Var(p *uint64, names []string, value uint64, usage string) {
-	fs.Var(newUint64Value(value, p), names, usage)
-}
-
-// Uint64Var defines a uint64 flag with specified name, default value, and usage string.
-// The argument p points to a uint64 variable in which to store the value of the flag.
-func Uint64Var(p *uint64, names []string, value uint64, usage string) {
-	CommandLine.Var(newUint64Value(value, p), names, usage)
-}
-
-// Uint64 defines a uint64 flag with specified name, default value, and usage string.
-// The return value is the address of a uint64 variable that stores the value of the flag.
-func (fs *FlagSet) Uint64(names []string, value uint64, usage string) *uint64 {
-	p := new(uint64)
-	fs.Uint64Var(p, names, value, usage)
-	return p
-}
-
-// Uint64 defines a uint64 flag with specified name, default value, and usage string.
-// The return value is the address of a uint64 variable that stores the value of the flag.
-func Uint64(names []string, value uint64, usage string) *uint64 {
-	return CommandLine.Uint64(names, value, usage)
-}
-
-// StringVar defines a string flag with specified name, default value, and usage string.
-// The argument p points to a string variable in which to store the value of the flag.
-func (fs *FlagSet) StringVar(p *string, names []string, value string, usage string) {
-	fs.Var(newStringValue(value, p), names, usage)
-}
-
-// StringVar defines a string flag with specified name, default value, and usage string.
-// The argument p points to a string variable in which to store the value of the flag.
-func StringVar(p *string, names []string, value string, usage string) {
-	CommandLine.Var(newStringValue(value, p), names, usage)
-}
-
-// String defines a string flag with specified name, default value, and usage string.
-// The return value is the address of a string variable that stores the value of the flag.
-func (fs *FlagSet) String(names []string, value string, usage string) *string {
-	p := new(string)
-	fs.StringVar(p, names, value, usage)
-	return p
-}
-
-// String defines a string flag with specified name, default value, and usage string.
-// The return value is the address of a string variable that stores the value of the flag.
-func String(names []string, value string, usage string) *string {
-	return CommandLine.String(names, value, usage)
-}
-
-// Float64Var defines a float64 flag with specified name, default value, and usage string.
-// The argument p points to a float64 variable in which to store the value of the flag.
-func (fs *FlagSet) Float64Var(p *float64, names []string, value float64, usage string) {
-	fs.Var(newFloat64Value(value, p), names, usage)
-}
-
-// Float64Var defines a float64 flag with specified name, default value, and usage string.
-// The argument p points to a float64 variable in which to store the value of the flag.
-func Float64Var(p *float64, names []string, value float64, usage string) {
-	CommandLine.Var(newFloat64Value(value, p), names, usage)
-}
-
-// Float64 defines a float64 flag with specified name, default value, and usage string.
-// The return value is the address of a float64 variable that stores the value of the flag.
-func (fs *FlagSet) Float64(names []string, value float64, usage string) *float64 {
-	p := new(float64)
-	fs.Float64Var(p, names, value, usage)
-	return p
-}
-
-// Float64 defines a float64 flag with specified name, default value, and usage string.
-// The return value is the address of a float64 variable that stores the value of the flag.
-func Float64(names []string, value float64, usage string) *float64 {
-	return CommandLine.Float64(names, value, usage)
-}
-
-// DurationVar defines a time.Duration flag with specified name, default value, and usage string.
-// The argument p points to a time.Duration variable in which to store the value of the flag.
-func (fs *FlagSet) DurationVar(p *time.Duration, names []string, value time.Duration, usage string) {
-	fs.Var(newDurationValue(value, p), names, usage)
-}
-
-// DurationVar defines a time.Duration flag with specified name, default value, and usage string.
-// The argument p points to a time.Duration variable in which to store the value of the flag.
-func DurationVar(p *time.Duration, names []string, value time.Duration, usage string) {
-	CommandLine.Var(newDurationValue(value, p), names, usage)
-}
-
-// Duration defines a time.Duration flag with specified name, default value, and usage string.
-// The return value is the address of a time.Duration variable that stores the value of the flag.
-func (fs *FlagSet) Duration(names []string, value time.Duration, usage string) *time.Duration {
-	p := new(time.Duration)
-	fs.DurationVar(p, names, value, usage)
-	return p
-}
-
-// Duration defines a time.Duration flag with specified name, default value, and usage string.
-// The return value is the address of a time.Duration variable that stores the value of the flag.
-func Duration(names []string, value time.Duration, usage string) *time.Duration {
-	return CommandLine.Duration(names, value, usage)
-}
-
-// Var defines a flag with the specified name and usage string. The type and
-// value of the flag are represented by the first argument, of type Value, which
-// typically holds a user-defined implementation of Value. For instance, the
-// caller could create a flag that turns a comma-separated string into a slice
-// of strings by giving the slice the methods of Value; in particular, Set would
-// decompose the comma-separated string into the slice.
-func (fs *FlagSet) Var(value Value, names []string, usage string) {
-	// Remember the default value as a string; it won't change.
-	flag := &Flag{names, usage, value, value.String()}
-	for _, name := range names {
-		name = strings.TrimPrefix(name, "#")
-		_, alreadythere := fs.formal[name]
-		if alreadythere {
-			var msg string
-			if fs.name == "" {
-				msg = fmt.Sprintf("flag redefined: %s", name)
-			} else {
-				msg = fmt.Sprintf("%s flag redefined: %s", fs.name, name)
-			}
-			fmt.Fprintln(fs.Out(), msg)
-			panic(msg) // Happens only if flags are declared with identical names
-		}
-		if fs.formal == nil {
-			fs.formal = make(map[string]*Flag)
-		}
-		fs.formal[name] = flag
-	}
-}
-
-// Var defines a flag with the specified name and usage string. The type and
-// value of the flag are represented by the first argument, of type Value, which
-// typically holds a user-defined implementation of Value. For instance, the
-// caller could create a flag that turns a comma-separated string into a slice
-// of strings by giving the slice the methods of Value; in particular, Set would
-// decompose the comma-separated string into the slice.
-func Var(value Value, names []string, usage string) {
-	CommandLine.Var(value, names, usage)
-}
-
-// failf prints to standard error a formatted error and usage message and
-// returns the error.
-func (fs *FlagSet) failf(format string, a ...interface{}) error {
-	err := fmt.Errorf(format, a...)
-	fmt.Fprintln(fs.Out(), err)
-	if os.Args[0] == fs.name {
-		fmt.Fprintf(fs.Out(), "See '%s --help'.\n", os.Args[0])
-	} else {
-		fmt.Fprintf(fs.Out(), "See '%s %s --help'.\n", os.Args[0], fs.name)
-	}
-	return err
-}
-
-// usage calls the Usage method for the flag set, or the usage function if
-// the flag set is CommandLine.
-func (fs *FlagSet) usage() {
-	if fs == CommandLine {
-		Usage()
-	} else if fs.Usage == nil {
-		defaultUsage(fs)
-	} else {
-		fs.Usage()
-	}
-}
-
-func trimQuotes(str string) string {
-	if len(str) == 0 {
-		return str
-	}
-	type quote struct {
-		start, end byte
-	}
-
-	// All valid quote types.
-	quotes := []quote{
-		// Double quotes
-		{
-			start: '"',
-			end:   '"',
-		},
-
-		// Single quotes
-		{
-			start: '\'',
-			end:   '\'',
-		},
-	}
-
-	for _, quote := range quotes {
-		// Only strip if outermost match.
-		if str[0] == quote.start && str[len(str)-1] == quote.end {
-			str = str[1 : len(str)-1]
-			break
-		}
-	}
-
-	return str
-}
-
-// parseOne parses one flag. It reports whether a flag was seen.
-func (fs *FlagSet) parseOne() (bool, string, error) {
-	if len(fs.args) == 0 {
-		return false, "", nil
-	}
-	s := fs.args[0]
-	if len(s) == 0 || s[0] != '-' || len(s) == 1 {
-		return false, "", nil
-	}
-	if s[1] == '-' && len(s) == 2 { // "--" terminates the flags
-		fs.args = fs.args[1:]
-		return false, "", nil
-	}
-	name := s[1:]
-	if len(name) == 0 || name[0] == '=' {
-		return false, "", fs.failf("bad flag syntax: %s", s)
-	}
-
-	// it's a flag. does it have an argument?
-	fs.args = fs.args[1:]
-	hasValue := false
-	value := ""
-	if i := strings.Index(name, "="); i != -1 {
-		value = trimQuotes(name[i+1:])
-		hasValue = true
-		name = name[:i]
-	}
-
-	m := fs.formal
-	flag, alreadythere := m[name] // BUG
-	if !alreadythere {
-		if name == "-help" || name == "help" || name == "h" { // special case for nice help message.
-			fs.usage()
-			return false, "", ErrHelp
-		}
-		if len(name) > 0 && name[0] == '-' {
-			return false, "", fs.failf("flag provided but not defined: -%s", name)
-		}
-		return false, name, ErrRetry
-	}
-	if fv, ok := flag.Value.(boolFlag); ok && fv.IsBoolFlag() { // special case: doesn't need an arg
-		if hasValue {
-			if err := fv.Set(value); err != nil {
-				return false, "", fs.failf("invalid boolean value %q for  -%s: %v", value, name, err)
-			}
-		} else {
-			fv.Set("true")
-		}
-	} else {
-		// It must have a value, which might be the next argument.
-		if !hasValue && len(fs.args) > 0 {
-			// value is the next arg
-			hasValue = true
-			value, fs.args = fs.args[0], fs.args[1:]
-		}
-		if !hasValue {
-			return false, "", fs.failf("flag needs an argument: -%s", name)
-		}
-		if err := flag.Value.Set(value); err != nil {
-			return false, "", fs.failf("invalid value %q for flag -%s: %v", value, name, err)
-		}
-	}
-	if fs.actual == nil {
-		fs.actual = make(map[string]*Flag)
-	}
-	fs.actual[name] = flag
-	for i, n := range flag.Names {
-		if n == fmt.Sprintf("#%s", name) {
-			replacement := ""
-			for j := i; j < len(flag.Names); j++ {
-				if flag.Names[j][0] != '#' {
-					replacement = flag.Names[j]
-					break
-				}
-			}
-			if replacement != "" {
-				fmt.Fprintf(fs.Out(), "Warning: '-%s' is deprecated, it will be replaced by '-%s' soon. See usage.\n", name, replacement)
-			} else {
-				fmt.Fprintf(fs.Out(), "Warning: '-%s' is deprecated, it will be removed soon. See usage.\n", name)
-			}
-		}
-	}
-	return true, "", nil
-}
-
-// Parse parses flag definitions from the argument list, which should not
-// include the command name.  Must be called after all flags in the FlagSet
-// are defined and before flags are accessed by the program.
-// The return value will be ErrHelp if -help was set but not defined.
-func (fs *FlagSet) Parse(arguments []string) error {
-	fs.parsed = true
-	fs.args = arguments
-	for {
-		seen, name, err := fs.parseOne()
-		if seen {
-			continue
-		}
-		if err == nil {
-			break
-		}
-		if err == ErrRetry {
-			if len(name) > 1 {
-				err = nil
-				for _, letter := range strings.Split(name, "") {
-					fs.args = append([]string{"-" + letter}, fs.args...)
-					seen2, _, err2 := fs.parseOne()
-					if seen2 {
-						continue
-					}
-					if err2 != nil {
-						err = fs.failf("flag provided but not defined: -%s", name)
-						break
-					}
-				}
-				if err == nil {
-					continue
-				}
-			} else {
-				err = fs.failf("flag provided but not defined: -%s", name)
-			}
-		}
-		switch fs.errorHandling {
-		case ContinueOnError:
-			return err
-		case ExitOnError:
-			os.Exit(2)
-		case PanicOnError:
-			panic(err)
-		}
-	}
-	return nil
-}
-
-// ParseFlags is a utility function that adds a help flag if withHelp is true,
-// calls fs.Parse(args) and prints a relevant error message if there are
-// incorrect number of arguments. It returns error only if error handling is
-// set to ContinueOnError and parsing fails. If error handling is set to
-// ExitOnError, it's safe to ignore the return value.
-func (fs *FlagSet) ParseFlags(args []string, withHelp bool) error {
-	var help *bool
-	if withHelp {
-		help = fs.Bool([]string{"#help", "-help"}, false, "Print usage")
-	}
-	if err := fs.Parse(args); err != nil {
-		return err
-	}
-	if help != nil && *help {
-		fs.SetOutput(os.Stdout)
-		fs.Usage()
-		os.Exit(0)
-	}
-	if str := fs.CheckArgs(); str != "" {
-		fs.SetOutput(os.Stderr)
-		fs.ReportError(str, withHelp)
-		fs.ShortUsage()
-		os.Exit(1)
-	}
-	return nil
-}
-
-// ReportError is a utility method that prints a user-friendly message
-// containing the error that occured during parsing and a suggestion to get help
-func (fs *FlagSet) ReportError(str string, withHelp bool) {
-	if withHelp {
-		if os.Args[0] == fs.Name() {
-			str += ".\nSee '" + os.Args[0] + " --help'"
-		} else {
-			str += ".\nSee '" + os.Args[0] + " " + fs.Name() + " --help'"
-		}
-	}
-	fmt.Fprintf(fs.Out(), "docker: %s.\n", str)
-}
-
-// Parsed reports whether fs.Parse has been called.
-func (fs *FlagSet) Parsed() bool {
-	return fs.parsed
-}
-
-// Parse parses the command-line flags from os.Args[1:].  Must be called
-// after all flags are defined and before flags are accessed by the program.
-func Parse() {
-	// Ignore errors; CommandLine is set for ExitOnError.
-	CommandLine.Parse(os.Args[1:])
-}
-
-// Parsed returns true if the command-line flags have been parsed.
-func Parsed() bool {
-	return CommandLine.Parsed()
-}
-
-// CommandLine is the default set of command-line flags, parsed from os.Args.
-// The top-level functions such as BoolVar, Arg, and on are wrappers for the
-// methods of CommandLine.
-var CommandLine = NewFlagSet(os.Args[0], ExitOnError)
-
-// NewFlagSet returns a new, empty flag set with the specified name and
-// error handling property.
-func NewFlagSet(name string, errorHandling ErrorHandling) *FlagSet {
-	f := &FlagSet{
-		name:          name,
-		errorHandling: errorHandling,
-	}
-	return f
-}
-
-// Init sets the name and error handling property for a flag set.
-// By default, the zero FlagSet uses an empty name and the
-// ContinueOnError error handling policy.
-func (fs *FlagSet) Init(name string, errorHandling ErrorHandling) {
-	fs.name = name
-	fs.errorHandling = errorHandling
-}
-
-type mergeVal struct {
-	Value
-	key  string
-	fset *FlagSet
-}
-
-func (v mergeVal) Set(s string) error {
-	return v.fset.Set(v.key, s)
-}
-
-func (v mergeVal) IsBoolFlag() bool {
-	if b, ok := v.Value.(boolFlag); ok {
-		return b.IsBoolFlag()
-	}
-	return false
-}
-
-// Merge is an helper function that merges n FlagSets into a single dest FlagSet
-// In case of name collision between the flagsets it will apply
-// the destination FlagSet's errorHandling behaviour.
-func Merge(dest *FlagSet, flagsets ...*FlagSet) error {
-	for _, fset := range flagsets {
-		for k, f := range fset.formal {
-			if _, ok := dest.formal[k]; ok {
-				var err error
-				if fset.name == "" {
-					err = fmt.Errorf("flag redefined: %s", k)
-				} else {
-					err = fmt.Errorf("%s flag redefined: %s", fset.name, k)
-				}
-				fmt.Fprintln(fset.Out(), err.Error())
-				// Happens only if flags are declared with identical names
-				switch dest.errorHandling {
-				case ContinueOnError:
-					return err
-				case ExitOnError:
-					os.Exit(2)
-				case PanicOnError:
-					panic(err)
-				}
-			}
-			newF := *f
-			newF.Value = mergeVal{f.Value, k, fset}
-			dest.formal[k] = &newF
-		}
-	}
-	return nil
-}
-
-// IsEmpty reports if the FlagSet is actually empty.
-func (fs *FlagSet) IsEmpty() bool {
-	return len(fs.actual) == 0
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/parsers/parsers.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/parsers/parsers.go
deleted file mode 100644
index a604a9e12..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/parsers/parsers.go
+++ /dev/null
@@ -1,259 +0,0 @@
-// Package parsers provides helper functions to parse and validate different type
-// of string. It can be hosts, unix addresses, tcp addresses, filters, kernel
-// operating system versions.
-package parsers
-
-import (
-	"fmt"
-	"net"
-	"net/url"
-	"path"
-	"runtime"
-	"strconv"
-	"strings"
-)
-
-// ParseDockerDaemonHost parses the specified address and returns an address that will be used as the host.
-// Depending of the address specified, will use the defaultTCPAddr or defaultUnixAddr
-// defaultUnixAddr must be a absolute file path (no `unix://` prefix)
-// defaultTCPAddr must be the full `tcp://host:port` form
-func ParseDockerDaemonHost(defaultTCPAddr, defaultTLSHost, defaultUnixAddr, defaultAddr, addr string) (string, error) {
-	addr = strings.TrimSpace(addr)
-	if addr == "" {
-		if defaultAddr == defaultTLSHost {
-			return defaultTLSHost, nil
-		}
-		if runtime.GOOS != "windows" {
-			return fmt.Sprintf("unix://%s", defaultUnixAddr), nil
-		}
-		return defaultTCPAddr, nil
-	}
-	addrParts := strings.Split(addr, "://")
-	if len(addrParts) == 1 {
-		addrParts = []string{"tcp", addrParts[0]}
-	}
-
-	switch addrParts[0] {
-	case "tcp":
-		return ParseTCPAddr(addrParts[1], defaultTCPAddr)
-	case "unix":
-		return ParseUnixAddr(addrParts[1], defaultUnixAddr)
-	case "fd":
-		return addr, nil
-	default:
-		return "", fmt.Errorf("Invalid bind address format: %s", addr)
-	}
-}
-
-// ParseUnixAddr parses and validates that the specified address is a valid UNIX
-// socket address. It returns a formatted UNIX socket address, either using the
-// address parsed from addr, or the contents of defaultAddr if addr is a blank
-// string.
-func ParseUnixAddr(addr string, defaultAddr string) (string, error) {
-	addr = strings.TrimPrefix(addr, "unix://")
-	if strings.Contains(addr, "://") {
-		return "", fmt.Errorf("Invalid proto, expected unix: %s", addr)
-	}
-	if addr == "" {
-		addr = defaultAddr
-	}
-	return fmt.Sprintf("unix://%s", addr), nil
-}
-
-// ParseTCPAddr parses and validates that the specified address is a valid TCP
-// address. It returns a formatted TCP address, either using the address parsed
-// from tryAddr, or the contents of defaultAddr if tryAddr is a blank string.
-// tryAddr is expected to have already been Trim()'d
-// defaultAddr must be in the full `tcp://host:port` form
-func ParseTCPAddr(tryAddr string, defaultAddr string) (string, error) {
-	if tryAddr == "" || tryAddr == "tcp://" {
-		return defaultAddr, nil
-	}
-	addr := strings.TrimPrefix(tryAddr, "tcp://")
-	if strings.Contains(addr, "://") || addr == "" {
-		return "", fmt.Errorf("Invalid proto, expected tcp: %s", tryAddr)
-	}
-
-	u, err := url.Parse("tcp://" + addr)
-	if err != nil {
-		return "", err
-	}
-
-	host, port, err := net.SplitHostPort(u.Host)
-	if err != nil {
-		return "", fmt.Errorf("Invalid bind address format: %s", tryAddr)
-	}
-
-	defaultAddr = strings.TrimPrefix(defaultAddr, "tcp://")
-	defaultHost, defaultPort, err := net.SplitHostPort(defaultAddr)
-	if err != nil {
-		return "", err
-	}
-
-	if host == "" {
-		host = defaultHost
-	}
-	if port == "" {
-		port = defaultPort
-	}
-	p, err := strconv.Atoi(port)
-	if err != nil && p == 0 {
-		return "", fmt.Errorf("Invalid bind address format: %s", tryAddr)
-	}
-
-	if net.ParseIP(host).To4() == nil && strings.Contains(host, ":") {
-		// This is either an ipv6 address
-		host = "[" + host + "]"
-	}
-	return fmt.Sprintf("tcp://%s:%d%s", host, p, u.Path), nil
-}
-
-// ParseRepositoryTag gets a repos name and returns the right reposName + tag|digest
-// The tag can be confusing because of a port in a repository name.
-//     Ex: localhost.localdomain:5000/samalba/hipache:latest
-//     Digest ex: localhost:5000/foo/bar@sha256:bc8813ea7b3603864987522f02a76101c17ad122e1c46d790efc0fca78ca7bfb
-func ParseRepositoryTag(repos string) (string, string) {
-	n := strings.Index(repos, "@")
-	if n >= 0 {
-		parts := strings.Split(repos, "@")
-		return parts[0], parts[1]
-	}
-	n = strings.LastIndex(repos, ":")
-	if n < 0 {
-		return repos, ""
-	}
-	if tag := repos[n+1:]; !strings.Contains(tag, "/") {
-		return repos[:n], tag
-	}
-	return repos, ""
-}
-
-// PartParser parses and validates the specified string (data) using the specified template
-// e.g. ip:public:private -> 192.168.0.1:80:8000
-func PartParser(template, data string) (map[string]string, error) {
-	// ip:public:private
-	var (
-		templateParts = strings.Split(template, ":")
-		parts         = strings.Split(data, ":")
-		out           = make(map[string]string, len(templateParts))
-	)
-	if len(parts) != len(templateParts) {
-		return nil, fmt.Errorf("Invalid format to parse. %s should match template %s", data, template)
-	}
-
-	for i, t := range templateParts {
-		value := ""
-		if len(parts) > i {
-			value = parts[i]
-		}
-		out[t] = value
-	}
-	return out, nil
-}
-
-// ParseKeyValueOpt parses and validates the specified string as a key/value pair (key=value)
-func ParseKeyValueOpt(opt string) (string, string, error) {
-	parts := strings.SplitN(opt, "=", 2)
-	if len(parts) != 2 {
-		return "", "", fmt.Errorf("Unable to parse key/value option: %s", opt)
-	}
-	return strings.TrimSpace(parts[0]), strings.TrimSpace(parts[1]), nil
-}
-
-// ParsePortRange parses and validates the specified string as a port-range (8000-9000)
-func ParsePortRange(ports string) (uint64, uint64, error) {
-	if ports == "" {
-		return 0, 0, fmt.Errorf("Empty string specified for ports.")
-	}
-	if !strings.Contains(ports, "-") {
-		start, err := strconv.ParseUint(ports, 10, 16)
-		end := start
-		return start, end, err
-	}
-
-	parts := strings.Split(ports, "-")
-	start, err := strconv.ParseUint(parts[0], 10, 16)
-	if err != nil {
-		return 0, 0, err
-	}
-	end, err := strconv.ParseUint(parts[1], 10, 16)
-	if err != nil {
-		return 0, 0, err
-	}
-	if end < start {
-		return 0, 0, fmt.Errorf("Invalid range specified for the Port: %s", ports)
-	}
-	return start, end, nil
-}
-
-// ParseLink parses and validates the specified string as a link format (name:alias)
-func ParseLink(val string) (string, string, error) {
-	if val == "" {
-		return "", "", fmt.Errorf("empty string specified for links")
-	}
-	arr := strings.Split(val, ":")
-	if len(arr) > 2 {
-		return "", "", fmt.Errorf("bad format for links: %s", val)
-	}
-	if len(arr) == 1 {
-		return val, val, nil
-	}
-	// This is kept because we can actually get an HostConfig with links
-	// from an already created container and the format is not `foo:bar`
-	// but `/foo:/c1/bar`
-	if strings.HasPrefix(arr[0], "/") {
-		_, alias := path.Split(arr[1])
-		return arr[0][1:], alias, nil
-	}
-	return arr[0], arr[1], nil
-}
-
-// ParseUintList parses and validates the specified string as the value
-// found in some cgroup file (e.g. `cpuset.cpus`, `cpuset.mems`), which could be
-// one of the formats below. Note that duplicates are actually allowed in the
-// input string. It returns a `map[int]bool` with available elements from `val`
-// set to `true`.
-// Supported formats:
-//     7
-//     1-6
-//     0,3-4,7,8-10
-//     0-0,0,1-7
-//     03,1-3      <- this is gonna get parsed as [1,2,3]
-//     3,2,1
-//     0-2,3,1
-func ParseUintList(val string) (map[int]bool, error) {
-	if val == "" {
-		return map[int]bool{}, nil
-	}
-
-	availableInts := make(map[int]bool)
-	split := strings.Split(val, ",")
-	errInvalidFormat := fmt.Errorf("invalid format: %s", val)
-
-	for _, r := range split {
-		if !strings.Contains(r, "-") {
-			v, err := strconv.Atoi(r)
-			if err != nil {
-				return nil, errInvalidFormat
-			}
-			availableInts[v] = true
-		} else {
-			split := strings.SplitN(r, "-", 2)
-			min, err := strconv.Atoi(split[0])
-			if err != nil {
-				return nil, errInvalidFormat
-			}
-			max, err := strconv.Atoi(split[1])
-			if err != nil {
-				return nil, errInvalidFormat
-			}
-			if max < min {
-				return nil, errInvalidFormat
-			}
-			for i := min; i <= max; i++ {
-				availableInts[i] = true
-			}
-		}
-	}
-	return availableInts, nil
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/pools/pools.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/pools/pools.go
deleted file mode 100644
index 515fb4d05..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/pools/pools.go
+++ /dev/null
@@ -1,119 +0,0 @@
-// Package pools provides a collection of pools which provide various
-// data types with buffers. These can be used to lower the number of
-// memory allocations and reuse buffers.
-//
-// New pools should be added to this package to allow them to be
-// shared across packages.
-//
-// Utility functions which operate on pools should be added to this
-// package to allow them to be reused.
-package pools
-
-import (
-	"bufio"
-	"io"
-	"sync"
-
-	"github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/ioutils"
-)
-
-var (
-	// BufioReader32KPool is a pool which returns bufio.Reader with a 32K buffer.
-	BufioReader32KPool *BufioReaderPool
-	// BufioWriter32KPool is a pool which returns bufio.Writer with a 32K buffer.
-	BufioWriter32KPool *BufioWriterPool
-)
-
-const buffer32K = 32 * 1024
-
-// BufioReaderPool is a bufio reader that uses sync.Pool.
-type BufioReaderPool struct {
-	pool sync.Pool
-}
-
-func init() {
-	BufioReader32KPool = newBufioReaderPoolWithSize(buffer32K)
-	BufioWriter32KPool = newBufioWriterPoolWithSize(buffer32K)
-}
-
-// newBufioReaderPoolWithSize is unexported because new pools should be
-// added here to be shared where required.
-func newBufioReaderPoolWithSize(size int) *BufioReaderPool {
-	pool := sync.Pool{
-		New: func() interface{} { return bufio.NewReaderSize(nil, size) },
-	}
-	return &BufioReaderPool{pool: pool}
-}
-
-// Get returns a bufio.Reader which reads from r. The buffer size is that of the pool.
-func (bufPool *BufioReaderPool) Get(r io.Reader) *bufio.Reader {
-	buf := bufPool.pool.Get().(*bufio.Reader)
-	buf.Reset(r)
-	return buf
-}
-
-// Put puts the bufio.Reader back into the pool.
-func (bufPool *BufioReaderPool) Put(b *bufio.Reader) {
-	b.Reset(nil)
-	bufPool.pool.Put(b)
-}
-
-// Copy is a convenience wrapper which uses a buffer to avoid allocation in io.Copy.
-func Copy(dst io.Writer, src io.Reader) (written int64, err error) {
-	buf := BufioReader32KPool.Get(src)
-	written, err = io.Copy(dst, buf)
-	BufioReader32KPool.Put(buf)
-	return
-}
-
-// NewReadCloserWrapper returns a wrapper which puts the bufio.Reader back
-// into the pool and closes the reader if it's an io.ReadCloser.
-func (bufPool *BufioReaderPool) NewReadCloserWrapper(buf *bufio.Reader, r io.Reader) io.ReadCloser {
-	return ioutils.NewReadCloserWrapper(r, func() error {
-		if readCloser, ok := r.(io.ReadCloser); ok {
-			readCloser.Close()
-		}
-		bufPool.Put(buf)
-		return nil
-	})
-}
-
-// BufioWriterPool is a bufio writer that uses sync.Pool.
-type BufioWriterPool struct {
-	pool sync.Pool
-}
-
-// newBufioWriterPoolWithSize is unexported because new pools should be
-// added here to be shared where required.
-func newBufioWriterPoolWithSize(size int) *BufioWriterPool {
-	pool := sync.Pool{
-		New: func() interface{} { return bufio.NewWriterSize(nil, size) },
-	}
-	return &BufioWriterPool{pool: pool}
-}
-
-// Get returns a bufio.Writer which writes to w. The buffer size is that of the pool.
-func (bufPool *BufioWriterPool) Get(w io.Writer) *bufio.Writer {
-	buf := bufPool.pool.Get().(*bufio.Writer)
-	buf.Reset(w)
-	return buf
-}
-
-// Put puts the bufio.Writer back into the pool.
-func (bufPool *BufioWriterPool) Put(b *bufio.Writer) {
-	b.Reset(nil)
-	bufPool.pool.Put(b)
-}
-
-// NewWriteCloserWrapper returns a wrapper which puts the bufio.Writer back
-// into the pool and closes the writer if it's an io.Writecloser.
-func (bufPool *BufioWriterPool) NewWriteCloserWrapper(buf *bufio.Writer, w io.Writer) io.WriteCloser {
-	return ioutils.NewWriteCloserWrapper(w, func() error {
-		buf.Flush()
-		if writeCloser, ok := w.(io.WriteCloser); ok {
-			writeCloser.Close()
-		}
-		bufPool.Put(buf)
-		return nil
-	})
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/promise/promise.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/promise/promise.go
deleted file mode 100644
index dd52b9082..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/promise/promise.go
+++ /dev/null
@@ -1,11 +0,0 @@
-package promise
-
-// Go is a basic promise implementation: it wraps calls a function in a goroutine,
-// and returns a channel which will later return the function's return value.
-func Go(f func() error) chan error {
-	ch := make(chan error, 1)
-	go func() {
-		ch <- f()
-	}()
-	return ch
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/stdcopy/stdcopy.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/stdcopy/stdcopy.go
deleted file mode 100644
index b2c60046a..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/stdcopy/stdcopy.go
+++ /dev/null
@@ -1,175 +0,0 @@
-package stdcopy
-
-import (
-	"encoding/binary"
-	"errors"
-	"io"
-
-	"github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus"
-)
-
-const (
-	stdWriterPrefixLen = 8
-	stdWriterFdIndex   = 0
-	stdWriterSizeIndex = 4
-
-	startingBufLen = 32*1024 + stdWriterPrefixLen + 1
-)
-
-// StdType prefixes type and length to standard stream.
-type StdType [stdWriterPrefixLen]byte
-
-var (
-	// Stdin represents standard input stream type.
-	Stdin = StdType{0: 0}
-	// Stdout represents standard output stream type.
-	Stdout = StdType{0: 1}
-	// Stderr represents standard error steam type.
-	Stderr = StdType{0: 2}
-)
-
-// StdWriter is wrapper of io.Writer with extra customized info.
-type StdWriter struct {
-	io.Writer
-	prefix  StdType
-	sizeBuf []byte
-}
-
-func (w *StdWriter) Write(buf []byte) (n int, err error) {
-	var n1, n2 int
-	if w == nil || w.Writer == nil {
-		return 0, errors.New("Writer not instantiated")
-	}
-	binary.BigEndian.PutUint32(w.prefix[4:], uint32(len(buf)))
-	n1, err = w.Writer.Write(w.prefix[:])
-	if err != nil {
-		n = n1 - stdWriterPrefixLen
-	} else {
-		n2, err = w.Writer.Write(buf)
-		n = n1 + n2 - stdWriterPrefixLen
-	}
-	if n < 0 {
-		n = 0
-	}
-	return
-}
-
-// NewStdWriter instantiates a new Writer.
-// Everything written to it will be encapsulated using a custom format,
-// and written to the underlying `w` stream.
-// This allows multiple write streams (e.g. stdout and stderr) to be muxed into a single connection.
-// `t` indicates the id of the stream to encapsulate.
-// It can be stdcopy.Stdin, stdcopy.Stdout, stdcopy.Stderr.
-func NewStdWriter(w io.Writer, t StdType) *StdWriter {
-	return &StdWriter{
-		Writer:  w,
-		prefix:  t,
-		sizeBuf: make([]byte, 4),
-	}
-}
-
-var errInvalidStdHeader = errors.New("Unrecognized input header")
-
-// StdCopy is a modified version of io.Copy.
-//
-// StdCopy will demultiplex `src`, assuming that it contains two streams,
-// previously multiplexed together using a StdWriter instance.
-// As it reads from `src`, StdCopy will write to `dstout` and `dsterr`.
-//
-// StdCopy will read until it hits EOF on `src`. It will then return a nil error.
-// In other words: if `err` is non nil, it indicates a real underlying error.
-//
-// `written` will hold the total number of bytes written to `dstout` and `dsterr`.
-func StdCopy(dstout, dsterr io.Writer, src io.Reader) (written int64, err error) {
-	var (
-		buf       = make([]byte, startingBufLen)
-		bufLen    = len(buf)
-		nr, nw    int
-		er, ew    error
-		out       io.Writer
-		frameSize int
-	)
-
-	for {
-		// Make sure we have at least a full header
-		for nr < stdWriterPrefixLen {
-			var nr2 int
-			nr2, er = src.Read(buf[nr:])
-			nr += nr2
-			if er == io.EOF {
-				if nr < stdWriterPrefixLen {
-					logrus.Debugf("Corrupted prefix: %v", buf[:nr])
-					return written, nil
-				}
-				break
-			}
-			if er != nil {
-				logrus.Debugf("Error reading header: %s", er)
-				return 0, er
-			}
-		}
-
-		// Check the first byte to know where to write
-		switch buf[stdWriterFdIndex] {
-		case 0:
-			fallthrough
-		case 1:
-			// Write on stdout
-			out = dstout
-		case 2:
-			// Write on stderr
-			out = dsterr
-		default:
-			logrus.Debugf("Error selecting output fd: (%d)", buf[stdWriterFdIndex])
-			return 0, errInvalidStdHeader
-		}
-
-		// Retrieve the size of the frame
-		frameSize = int(binary.BigEndian.Uint32(buf[stdWriterSizeIndex : stdWriterSizeIndex+4]))
-		logrus.Debugf("framesize: %d", frameSize)
-
-		// Check if the buffer is big enough to read the frame.
-		// Extend it if necessary.
-		if frameSize+stdWriterPrefixLen > bufLen {
-			logrus.Debugf("Extending buffer cap by %d (was %d)", frameSize+stdWriterPrefixLen-bufLen+1, len(buf))
-			buf = append(buf, make([]byte, frameSize+stdWriterPrefixLen-bufLen+1)...)
-			bufLen = len(buf)
-		}
-
-		// While the amount of bytes read is less than the size of the frame + header, we keep reading
-		for nr < frameSize+stdWriterPrefixLen {
-			var nr2 int
-			nr2, er = src.Read(buf[nr:])
-			nr += nr2
-			if er == io.EOF {
-				if nr < frameSize+stdWriterPrefixLen {
-					logrus.Debugf("Corrupted frame: %v", buf[stdWriterPrefixLen:nr])
-					return written, nil
-				}
-				break
-			}
-			if er != nil {
-				logrus.Debugf("Error reading frame: %s", er)
-				return 0, er
-			}
-		}
-
-		// Write the retrieved frame (without header)
-		nw, ew = out.Write(buf[stdWriterPrefixLen : frameSize+stdWriterPrefixLen])
-		if ew != nil {
-			logrus.Debugf("Error writing frame: %s", ew)
-			return 0, ew
-		}
-		// If the frame has not been fully written: error
-		if nw != frameSize {
-			logrus.Debugf("Error Short Write: (%d on %d)", nw, frameSize)
-			return 0, io.ErrShortWrite
-		}
-		written += int64(nw)
-
-		// Move the rest of the buffer to the beginning
-		copy(buf, buf[frameSize+stdWriterPrefixLen:])
-		// Move the index
-		nr -= frameSize + stdWriterPrefixLen
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/chtimes.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/chtimes.go
deleted file mode 100644
index 31ed9ff10..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/chtimes.go
+++ /dev/null
@@ -1,31 +0,0 @@
-package system
-
-import (
-	"os"
-	"time"
-)
-
-// Chtimes changes the access time and modified time of a file at the given path
-func Chtimes(name string, atime time.Time, mtime time.Time) error {
-	unixMinTime := time.Unix(0, 0)
-	// The max Unix time is 33 bits set
-	unixMaxTime := unixMinTime.Add((1<<33 - 1) * time.Second)
-
-	// If the modified time is prior to the Unix Epoch, or after the
-	// end of Unix Time, os.Chtimes has undefined behavior
-	// default to Unix Epoch in this case, just in case
-
-	if atime.Before(unixMinTime) || atime.After(unixMaxTime) {
-		atime = unixMinTime
-	}
-
-	if mtime.Before(unixMinTime) || mtime.After(unixMaxTime) {
-		mtime = unixMinTime
-	}
-
-	if err := os.Chtimes(name, atime, mtime); err != nil {
-		return err
-	}
-
-	return nil
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/errors.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/errors.go
deleted file mode 100644
index 288318985..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/errors.go
+++ /dev/null
@@ -1,10 +0,0 @@
-package system
-
-import (
-	"errors"
-)
-
-var (
-	// ErrNotSupportedPlatform means the platform is not supported.
-	ErrNotSupportedPlatform = errors.New("platform and architecture is not supported")
-)
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/events_windows.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/events_windows.go
deleted file mode 100644
index 04e2de787..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/events_windows.go
+++ /dev/null
@@ -1,83 +0,0 @@
-package system
-
-// This file implements syscalls for Win32 events which are not implemented
-// in golang.
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-var (
-	procCreateEvent = modkernel32.NewProc("CreateEventW")
-	procOpenEvent   = modkernel32.NewProc("OpenEventW")
-	procSetEvent    = modkernel32.NewProc("SetEvent")
-	procResetEvent  = modkernel32.NewProc("ResetEvent")
-	procPulseEvent  = modkernel32.NewProc("PulseEvent")
-)
-
-// CreateEvent implements win32 CreateEventW func in golang. It will create an event object.
-func CreateEvent(eventAttributes *syscall.SecurityAttributes, manualReset bool, initialState bool, name string) (handle syscall.Handle, err error) {
-	namep, _ := syscall.UTF16PtrFromString(name)
-	var _p1 uint32
-	if manualReset {
-		_p1 = 1
-	}
-	var _p2 uint32
-	if initialState {
-		_p2 = 1
-	}
-	r0, _, e1 := procCreateEvent.Call(uintptr(unsafe.Pointer(eventAttributes)), uintptr(_p1), uintptr(_p2), uintptr(unsafe.Pointer(namep)))
-	use(unsafe.Pointer(namep))
-	handle = syscall.Handle(r0)
-	if handle == syscall.InvalidHandle {
-		err = e1
-	}
-	return
-}
-
-// OpenEvent implements win32 OpenEventW func in golang. It opens an event object.
-func OpenEvent(desiredAccess uint32, inheritHandle bool, name string) (handle syscall.Handle, err error) {
-	namep, _ := syscall.UTF16PtrFromString(name)
-	var _p1 uint32
-	if inheritHandle {
-		_p1 = 1
-	}
-	r0, _, e1 := procOpenEvent.Call(uintptr(desiredAccess), uintptr(_p1), uintptr(unsafe.Pointer(namep)))
-	use(unsafe.Pointer(namep))
-	handle = syscall.Handle(r0)
-	if handle == syscall.InvalidHandle {
-		err = e1
-	}
-	return
-}
-
-// SetEvent implements win32 SetEvent func in golang.
-func SetEvent(handle syscall.Handle) (err error) {
-	return setResetPulse(handle, procSetEvent)
-}
-
-// ResetEvent implements win32 ResetEvent func in golang.
-func ResetEvent(handle syscall.Handle) (err error) {
-	return setResetPulse(handle, procResetEvent)
-}
-
-// PulseEvent implements win32 PulseEvent func in golang.
-func PulseEvent(handle syscall.Handle) (err error) {
-	return setResetPulse(handle, procPulseEvent)
-}
-
-func setResetPulse(handle syscall.Handle, proc *syscall.LazyProc) (err error) {
-	r0, _, _ := proc.Call(uintptr(handle))
-	if r0 != 0 {
-		err = syscall.Errno(r0)
-	}
-	return
-}
-
-var temp unsafe.Pointer
-
-// use ensures a variable is kept alive without the GC freeing while still needed
-func use(p unsafe.Pointer) {
-	temp = p
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/filesys.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/filesys.go
deleted file mode 100644
index c14feb849..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/filesys.go
+++ /dev/null
@@ -1,19 +0,0 @@
-// +build !windows
-
-package system
-
-import (
-	"os"
-	"path/filepath"
-)
-
-// MkdirAll creates a directory named path along with any necessary parents,
-// with permission specified by attribute perm for all dir created.
-func MkdirAll(path string, perm os.FileMode) error {
-	return os.MkdirAll(path, perm)
-}
-
-// IsAbs is a platform-specific wrapper for filepath.IsAbs.
-func IsAbs(path string) bool {
-	return filepath.IsAbs(path)
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/filesys_windows.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/filesys_windows.go
deleted file mode 100644
index 16823d551..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/filesys_windows.go
+++ /dev/null
@@ -1,82 +0,0 @@
-// +build windows
-
-package system
-
-import (
-	"os"
-	"path/filepath"
-	"regexp"
-	"strings"
-	"syscall"
-)
-
-// MkdirAll implementation that is volume path aware for Windows.
-func MkdirAll(path string, perm os.FileMode) error {
-	if re := regexp.MustCompile(`^\\\\\?\\Volume{[a-z0-9-]+}$`); re.MatchString(path) {
-		return nil
-	}
-
-	// The rest of this method is copied from os.MkdirAll and should be kept
-	// as-is to ensure compatibility.
-
-	// Fast path: if we can tell whether path is a directory or file, stop with success or error.
-	dir, err := os.Stat(path)
-	if err == nil {
-		if dir.IsDir() {
-			return nil
-		}
-		return &os.PathError{
-			Op:   "mkdir",
-			Path: path,
-			Err:  syscall.ENOTDIR,
-		}
-	}
-
-	// Slow path: make sure parent exists and then call Mkdir for path.
-	i := len(path)
-	for i > 0 && os.IsPathSeparator(path[i-1]) { // Skip trailing path separator.
-		i--
-	}
-
-	j := i
-	for j > 0 && !os.IsPathSeparator(path[j-1]) { // Scan backward over element.
-		j--
-	}
-
-	if j > 1 {
-		// Create parent
-		err = MkdirAll(path[0:j-1], perm)
-		if err != nil {
-			return err
-		}
-	}
-
-	// Parent now exists; invoke Mkdir and use its result.
-	err = os.Mkdir(path, perm)
-	if err != nil {
-		// Handle arguments like "foo/." by
-		// double-checking that directory doesn't exist.
-		dir, err1 := os.Lstat(path)
-		if err1 == nil && dir.IsDir() {
-			return nil
-		}
-		return err
-	}
-	return nil
-}
-
-// IsAbs is a platform-specific wrapper for filepath.IsAbs. On Windows,
-// golang filepath.IsAbs does not consider a path \windows\system32 as absolute
-// as it doesn't start with a drive-letter/colon combination. However, in
-// docker we need to verify things such as WORKDIR /windows/system32 in
-// a Dockerfile (which gets translated to \windows\system32 when being processed
-// by the daemon. This SHOULD be treated as absolute from a docker processing
-// perspective.
-func IsAbs(path string) bool {
-	if !filepath.IsAbs(path) {
-		if !strings.HasPrefix(path, string(os.PathSeparator)) {
-			return false
-		}
-	}
-	return true
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/lstat.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/lstat.go
deleted file mode 100644
index bd23c4d50..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/lstat.go
+++ /dev/null
@@ -1,19 +0,0 @@
-// +build !windows
-
-package system
-
-import (
-	"syscall"
-)
-
-// Lstat takes a path to a file and returns
-// a system.StatT type pertaining to that file.
-//
-// Throws an error if the file does not exist
-func Lstat(path string) (*StatT, error) {
-	s := &syscall.Stat_t{}
-	if err := syscall.Lstat(path, s); err != nil {
-		return nil, err
-	}
-	return fromStatT(s)
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/lstat_windows.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/lstat_windows.go
deleted file mode 100644
index 49e87eb40..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/lstat_windows.go
+++ /dev/null
@@ -1,25 +0,0 @@
-// +build windows
-
-package system
-
-import (
-	"os"
-)
-
-// Lstat calls os.Lstat to get a fileinfo interface back.
-// This is then copied into our own locally defined structure.
-// Note the Linux version uses fromStatT to do the copy back,
-// but that not strictly necessary when already in an OS specific module.
-func Lstat(path string) (*StatT, error) {
-	fi, err := os.Lstat(path)
-	if err != nil {
-		return nil, err
-	}
-
-	return &StatT{
-		name:    fi.Name(),
-		size:    fi.Size(),
-		mode:    fi.Mode(),
-		modTime: fi.ModTime(),
-		isDir:   fi.IsDir()}, nil
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/meminfo.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/meminfo.go
deleted file mode 100644
index 3b6e947e6..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/meminfo.go
+++ /dev/null
@@ -1,17 +0,0 @@
-package system
-
-// MemInfo contains memory statistics of the host system.
-type MemInfo struct {
-	// Total usable RAM (i.e. physical RAM minus a few reserved bits and the
-	// kernel binary code).
-	MemTotal int64
-
-	// Amount of free memory.
-	MemFree int64
-
-	// Total amount of swap space available.
-	SwapTotal int64
-
-	// Amount of swap space that is currently unused.
-	SwapFree int64
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/meminfo_linux.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/meminfo_linux.go
deleted file mode 100644
index 9d83304ff..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/meminfo_linux.go
+++ /dev/null
@@ -1,66 +0,0 @@
-package system
-
-import (
-	"bufio"
-	"io"
-	"os"
-	"strconv"
-	"strings"
-
-	"github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/units"
-)
-
-// ReadMemInfo retrieves memory statistics of the host system and returns a
-//  MemInfo type.
-func ReadMemInfo() (*MemInfo, error) {
-	file, err := os.Open("/proc/meminfo")
-	if err != nil {
-		return nil, err
-	}
-	defer file.Close()
-	return parseMemInfo(file)
-}
-
-// parseMemInfo parses the /proc/meminfo file into
-// a MemInfo object given a io.Reader to the file.
-//
-// Throws error if there are problems reading from the file
-func parseMemInfo(reader io.Reader) (*MemInfo, error) {
-	meminfo := &MemInfo{}
-	scanner := bufio.NewScanner(reader)
-	for scanner.Scan() {
-		// Expected format: ["MemTotal:", "1234", "kB"]
-		parts := strings.Fields(scanner.Text())
-
-		// Sanity checks: Skip malformed entries.
-		if len(parts) < 3 || parts[2] != "kB" {
-			continue
-		}
-
-		// Convert to bytes.
-		size, err := strconv.Atoi(parts[1])
-		if err != nil {
-			continue
-		}
-		bytes := int64(size) * units.KiB
-
-		switch parts[0] {
-		case "MemTotal:":
-			meminfo.MemTotal = bytes
-		case "MemFree:":
-			meminfo.MemFree = bytes
-		case "SwapTotal:":
-			meminfo.SwapTotal = bytes
-		case "SwapFree:":
-			meminfo.SwapFree = bytes
-		}
-
-	}
-
-	// Handle errors that may have occurred during the reading of the file.
-	if err := scanner.Err(); err != nil {
-		return nil, err
-	}
-
-	return meminfo, nil
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/meminfo_unsupported.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/meminfo_unsupported.go
deleted file mode 100644
index 82ddd30c1..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/meminfo_unsupported.go
+++ /dev/null
@@ -1,8 +0,0 @@
-// +build !linux,!windows
-
-package system
-
-// ReadMemInfo is not supported on platforms other than linux and windows.
-func ReadMemInfo() (*MemInfo, error) {
-	return nil, ErrNotSupportedPlatform
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/meminfo_windows.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/meminfo_windows.go
deleted file mode 100644
index d46642598..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/meminfo_windows.go
+++ /dev/null
@@ -1,44 +0,0 @@
-package system
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-var (
-	modkernel32 = syscall.NewLazyDLL("kernel32.dll")
-
-	procGlobalMemoryStatusEx = modkernel32.NewProc("GlobalMemoryStatusEx")
-)
-
-// https://msdn.microsoft.com/en-us/library/windows/desktop/aa366589(v=vs.85).aspx
-// https://msdn.microsoft.com/en-us/library/windows/desktop/aa366770(v=vs.85).aspx
-type memorystatusex struct {
-	dwLength                uint32
-	dwMemoryLoad            uint32
-	ullTotalPhys            uint64
-	ullAvailPhys            uint64
-	ullTotalPageFile        uint64
-	ullAvailPageFile        uint64
-	ullTotalVirtual         uint64
-	ullAvailVirtual         uint64
-	ullAvailExtendedVirtual uint64
-}
-
-// ReadMemInfo retrieves memory statistics of the host system and returns a
-//  MemInfo type.
-func ReadMemInfo() (*MemInfo, error) {
-	msi := &memorystatusex{
-		dwLength: 64,
-	}
-	r1, _, _ := procGlobalMemoryStatusEx.Call(uintptr(unsafe.Pointer(msi)))
-	if r1 == 0 {
-		return &MemInfo{}, nil
-	}
-	return &MemInfo{
-		MemTotal:  int64(msi.ullTotalPhys),
-		MemFree:   int64(msi.ullAvailPhys),
-		SwapTotal: int64(msi.ullTotalPageFile),
-		SwapFree:  int64(msi.ullAvailPageFile),
-	}, nil
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/mknod.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/mknod.go
deleted file mode 100644
index 73958182b..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/mknod.go
+++ /dev/null
@@ -1,22 +0,0 @@
-// +build !windows
-
-package system
-
-import (
-	"syscall"
-)
-
-// Mknod creates a filesystem node (file, device special file or named pipe) named path
-// with attributes specified by mode and dev.
-func Mknod(path string, mode uint32, dev int) error {
-	return syscall.Mknod(path, mode, dev)
-}
-
-// Mkdev is used to build the value of linux devices (in /dev/) which specifies major
-// and minor number of the newly created device special file.
-// Linux device nodes are a bit weird due to backwards compat with 16 bit device nodes.
-// They are, from low to high: the lower 8 bits of the minor, then 12 bits of the major,
-// then the top 12 bits of the minor.
-func Mkdev(major int64, minor int64) uint32 {
-	return uint32(((minor & 0xfff00) << 12) | ((major & 0xfff) << 8) | (minor & 0xff))
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/mknod_windows.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/mknod_windows.go
deleted file mode 100644
index 2e863c021..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/mknod_windows.go
+++ /dev/null
@@ -1,13 +0,0 @@
-// +build windows
-
-package system
-
-// Mknod is not implemented on Windows.
-func Mknod(path string, mode uint32, dev int) error {
-	return ErrNotSupportedPlatform
-}
-
-// Mkdev is not implemented on Windows.
-func Mkdev(major int64, minor int64) uint32 {
-	panic("Mkdev not implemented on Windows.")
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/stat.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/stat.go
deleted file mode 100644
index 087034c5e..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/stat.go
+++ /dev/null
@@ -1,53 +0,0 @@
-// +build !windows
-
-package system
-
-import (
-	"syscall"
-)
-
-// StatT type contains status of a file. It contains metadata
-// like permission, owner, group, size, etc about a file.
-type StatT struct {
-	mode uint32
-	uid  uint32
-	gid  uint32
-	rdev uint64
-	size int64
-	mtim syscall.Timespec
-}
-
-// Mode returns file's permission mode.
-func (s StatT) Mode() uint32 {
-	return s.mode
-}
-
-// UID returns file's user id of owner.
-func (s StatT) UID() uint32 {
-	return s.uid
-}
-
-// GID returns file's group id of owner.
-func (s StatT) GID() uint32 {
-	return s.gid
-}
-
-// Rdev returns file's device ID (if it's special file).
-func (s StatT) Rdev() uint64 {
-	return s.rdev
-}
-
-// Size returns file's size.
-func (s StatT) Size() int64 {
-	return s.size
-}
-
-// Mtim returns file's last modification time.
-func (s StatT) Mtim() syscall.Timespec {
-	return s.mtim
-}
-
-// GetLastModification returns file's last modification time.
-func (s StatT) GetLastModification() syscall.Timespec {
-	return s.Mtim()
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/stat_freebsd.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/stat_freebsd.go
deleted file mode 100644
index d0fb6f151..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/stat_freebsd.go
+++ /dev/null
@@ -1,27 +0,0 @@
-package system
-
-import (
-	"syscall"
-)
-
-// fromStatT converts a syscall.Stat_t type to a system.Stat_t type
-func fromStatT(s *syscall.Stat_t) (*StatT, error) {
-	return &StatT{size: s.Size,
-		mode: uint32(s.Mode),
-		uid:  s.Uid,
-		gid:  s.Gid,
-		rdev: uint64(s.Rdev),
-		mtim: s.Mtimespec}, nil
-}
-
-// Stat takes a path to a file and returns
-// a system.Stat_t type pertaining to that file.
-//
-// Throws an error if the file does not exist
-func Stat(path string) (*StatT, error) {
-	s := &syscall.Stat_t{}
-	if err := syscall.Stat(path, s); err != nil {
-		return nil, err
-	}
-	return fromStatT(s)
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/stat_linux.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/stat_linux.go
deleted file mode 100644
index 8b1eded13..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/stat_linux.go
+++ /dev/null
@@ -1,33 +0,0 @@
-package system
-
-import (
-	"syscall"
-)
-
-// fromStatT converts a syscall.Stat_t type to a system.Stat_t type
-func fromStatT(s *syscall.Stat_t) (*StatT, error) {
-	return &StatT{size: s.Size,
-		mode: s.Mode,
-		uid:  s.Uid,
-		gid:  s.Gid,
-		rdev: s.Rdev,
-		mtim: s.Mtim}, nil
-}
-
-// FromStatT exists only on linux, and loads a system.StatT from a
-// syscal.Stat_t.
-func FromStatT(s *syscall.Stat_t) (*StatT, error) {
-	return fromStatT(s)
-}
-
-// Stat takes a path to a file and returns
-// a system.StatT type pertaining to that file.
-//
-// Throws an error if the file does not exist
-func Stat(path string) (*StatT, error) {
-	s := &syscall.Stat_t{}
-	if err := syscall.Stat(path, s); err != nil {
-		return nil, err
-	}
-	return fromStatT(s)
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/stat_unsupported.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/stat_unsupported.go
deleted file mode 100644
index 381ea8211..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/stat_unsupported.go
+++ /dev/null
@@ -1,17 +0,0 @@
-// +build !linux,!windows,!freebsd
-
-package system
-
-import (
-	"syscall"
-)
-
-// fromStatT creates a system.StatT type from a syscall.Stat_t type
-func fromStatT(s *syscall.Stat_t) (*StatT, error) {
-	return &StatT{size: s.Size,
-		mode: uint32(s.Mode),
-		uid:  s.Uid,
-		gid:  s.Gid,
-		rdev: uint64(s.Rdev),
-		mtim: s.Mtimespec}, nil
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/stat_windows.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/stat_windows.go
deleted file mode 100644
index 39490c625..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/stat_windows.go
+++ /dev/null
@@ -1,43 +0,0 @@
-// +build windows
-
-package system
-
-import (
-	"os"
-	"time"
-)
-
-// StatT type contains status of a file. It contains metadata
-// like name, permission, size, etc about a file.
-type StatT struct {
-	name    string
-	size    int64
-	mode    os.FileMode
-	modTime time.Time
-	isDir   bool
-}
-
-// Name returns file's name.
-func (s StatT) Name() string {
-	return s.name
-}
-
-// Size returns file's size.
-func (s StatT) Size() int64 {
-	return s.size
-}
-
-// Mode returns file's permission mode.
-func (s StatT) Mode() os.FileMode {
-	return s.mode
-}
-
-// ModTime returns file's last modification time.
-func (s StatT) ModTime() time.Time {
-	return s.modTime
-}
-
-// IsDir returns whether file is actually a directory.
-func (s StatT) IsDir() bool {
-	return s.isDir
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/syscall_unix.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/syscall_unix.go
deleted file mode 100644
index 50054765a..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/syscall_unix.go
+++ /dev/null
@@ -1,11 +0,0 @@
-// +build linux freebsd
-
-package system
-
-import "syscall"
-
-// Unmount is a platform-specific helper function to call
-// the unmount syscall.
-func Unmount(dest string) {
-	syscall.Unmount(dest, 0)
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/syscall_windows.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/syscall_windows.go
deleted file mode 100644
index 3a3a55b26..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/syscall_windows.go
+++ /dev/null
@@ -1,6 +0,0 @@
-package system
-
-// Unmount is a platform-specific helper function to call
-// the unmount syscall. Not supported on Windows
-func Unmount(dest string) {
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/umask.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/umask.go
deleted file mode 100644
index c670fcd75..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/umask.go
+++ /dev/null
@@ -1,13 +0,0 @@
-// +build !windows
-
-package system
-
-import (
-	"syscall"
-)
-
-// Umask sets current process's file mode creation mask to newmask
-// and return oldmask.
-func Umask(newmask int) (oldmask int, err error) {
-	return syscall.Umask(newmask), nil
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/umask_windows.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/umask_windows.go
deleted file mode 100644
index 13f1de176..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/umask_windows.go
+++ /dev/null
@@ -1,9 +0,0 @@
-// +build windows
-
-package system
-
-// Umask is not supported on the windows platform.
-func Umask(newmask int) (oldmask int, err error) {
-	// should not be called on cli code path
-	return 0, ErrNotSupportedPlatform
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/utimes_darwin.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/utimes_darwin.go
deleted file mode 100644
index 0a1619754..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/utimes_darwin.go
+++ /dev/null
@@ -1,8 +0,0 @@
-package system
-
-import "syscall"
-
-// LUtimesNano is not supported by darwin platform.
-func LUtimesNano(path string, ts []syscall.Timespec) error {
-	return ErrNotSupportedPlatform
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/utimes_freebsd.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/utimes_freebsd.go
deleted file mode 100644
index e2eac3b55..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/utimes_freebsd.go
+++ /dev/null
@@ -1,22 +0,0 @@
-package system
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-// LUtimesNano is used to change access and modification time of the specified path.
-// It's used for symbol link file because syscall.UtimesNano doesn't support a NOFOLLOW flag atm.
-func LUtimesNano(path string, ts []syscall.Timespec) error {
-	var _path *byte
-	_path, err := syscall.BytePtrFromString(path)
-	if err != nil {
-		return err
-	}
-
-	if _, _, err := syscall.Syscall(syscall.SYS_LUTIMES, uintptr(unsafe.Pointer(_path)), uintptr(unsafe.Pointer(&ts[0])), 0); err != 0 && err != syscall.ENOSYS {
-		return err
-	}
-
-	return nil
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/utimes_linux.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/utimes_linux.go
deleted file mode 100644
index 007bfa8c0..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/utimes_linux.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package system
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-// LUtimesNano is used to change access and modification time of the speficied path.
-// It's used for symbol link file because syscall.UtimesNano doesn't support a NOFOLLOW flag atm.
-func LUtimesNano(path string, ts []syscall.Timespec) error {
-	// These are not currently available in syscall
-	atFdCwd := -100
-	atSymLinkNoFollow := 0x100
-
-	var _path *byte
-	_path, err := syscall.BytePtrFromString(path)
-	if err != nil {
-		return err
-	}
-
-	if _, _, err := syscall.Syscall6(syscall.SYS_UTIMENSAT, uintptr(atFdCwd), uintptr(unsafe.Pointer(_path)), uintptr(unsafe.Pointer(&ts[0])), uintptr(atSymLinkNoFollow), 0, 0); err != 0 && err != syscall.ENOSYS {
-		return err
-	}
-
-	return nil
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/utimes_unsupported.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/utimes_unsupported.go
deleted file mode 100644
index 50c3a0436..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/utimes_unsupported.go
+++ /dev/null
@@ -1,10 +0,0 @@
-// +build !linux,!freebsd,!darwin
-
-package system
-
-import "syscall"
-
-// LUtimesNano is not supported on platforms other than linux, freebsd and darwin.
-func LUtimesNano(path string, ts []syscall.Timespec) error {
-	return ErrNotSupportedPlatform
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/xattrs_linux.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/xattrs_linux.go
deleted file mode 100644
index d2e2c0579..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/xattrs_linux.go
+++ /dev/null
@@ -1,63 +0,0 @@
-package system
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-// Lgetxattr retrieves the value of the extended attribute identified by attr
-// and associated with the given path in the file system.
-// It will returns a nil slice and nil error if the xattr is not set.
-func Lgetxattr(path string, attr string) ([]byte, error) {
-	pathBytes, err := syscall.BytePtrFromString(path)
-	if err != nil {
-		return nil, err
-	}
-	attrBytes, err := syscall.BytePtrFromString(attr)
-	if err != nil {
-		return nil, err
-	}
-
-	dest := make([]byte, 128)
-	destBytes := unsafe.Pointer(&dest[0])
-	sz, _, errno := syscall.Syscall6(syscall.SYS_LGETXATTR, uintptr(unsafe.Pointer(pathBytes)), uintptr(unsafe.Pointer(attrBytes)), uintptr(destBytes), uintptr(len(dest)), 0, 0)
-	if errno == syscall.ENODATA {
-		return nil, nil
-	}
-	if errno == syscall.ERANGE {
-		dest = make([]byte, sz)
-		destBytes := unsafe.Pointer(&dest[0])
-		sz, _, errno = syscall.Syscall6(syscall.SYS_LGETXATTR, uintptr(unsafe.Pointer(pathBytes)), uintptr(unsafe.Pointer(attrBytes)), uintptr(destBytes), uintptr(len(dest)), 0, 0)
-	}
-	if errno != 0 {
-		return nil, errno
-	}
-
-	return dest[:sz], nil
-}
-
-var _zero uintptr
-
-// Lsetxattr sets the value of the extended attribute identified by attr
-// and associated with the given path in the file system.
-func Lsetxattr(path string, attr string, data []byte, flags int) error {
-	pathBytes, err := syscall.BytePtrFromString(path)
-	if err != nil {
-		return err
-	}
-	attrBytes, err := syscall.BytePtrFromString(attr)
-	if err != nil {
-		return err
-	}
-	var dataBytes unsafe.Pointer
-	if len(data) > 0 {
-		dataBytes = unsafe.Pointer(&data[0])
-	} else {
-		dataBytes = unsafe.Pointer(&_zero)
-	}
-	_, _, errno := syscall.Syscall6(syscall.SYS_LSETXATTR, uintptr(unsafe.Pointer(pathBytes)), uintptr(unsafe.Pointer(attrBytes)), uintptr(dataBytes), uintptr(len(data)), uintptr(flags), 0)
-	if errno != 0 {
-		return errno
-	}
-	return nil
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/xattrs_unsupported.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/xattrs_unsupported.go
deleted file mode 100644
index 0114f2227..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/xattrs_unsupported.go
+++ /dev/null
@@ -1,13 +0,0 @@
-// +build !linux
-
-package system
-
-// Lgetxattr is not supported on platforms other than linux.
-func Lgetxattr(path string, attr string) ([]byte, error) {
-	return nil, ErrNotSupportedPlatform
-}
-
-// Lsetxattr is not supported on platforms other than linux.
-func Lsetxattr(path string, attr string, data []byte, flags int) error {
-	return ErrNotSupportedPlatform
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/ulimit/ulimit.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/ulimit/ulimit.go
deleted file mode 100644
index 8fb0d804d..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/ulimit/ulimit.go
+++ /dev/null
@@ -1,111 +0,0 @@
-// Package ulimit provides structure and helper function to parse and represent
-// resource limits (Rlimit and Ulimit, its human friendly version).
-package ulimit
-
-import (
-	"fmt"
-	"strconv"
-	"strings"
-)
-
-// Ulimit is a human friendly version of Rlimit.
-type Ulimit struct {
-	Name string
-	Hard int64
-	Soft int64
-}
-
-// Rlimit specifies the resource limits, such as max open files.
-type Rlimit struct {
-	Type int    `json:"type,omitempty"`
-	Hard uint64 `json:"hard,omitempty"`
-	Soft uint64 `json:"soft,omitempty"`
-}
-
-const (
-	// magic numbers for making the syscall
-	// some of these are defined in the syscall package, but not all.
-	// Also since Windows client doesn't get access to the syscall package, need to
-	//	define these here
-	rlimitAs         = 9
-	rlimitCore       = 4
-	rlimitCPU        = 0
-	rlimitData       = 2
-	rlimitFsize      = 1
-	rlimitLocks      = 10
-	rlimitMemlock    = 8
-	rlimitMsgqueue   = 12
-	rlimitNice       = 13
-	rlimitNofile     = 7
-	rlimitNproc      = 6
-	rlimitRss        = 5
-	rlimitRtprio     = 14
-	rlimitRttime     = 15
-	rlimitSigpending = 11
-	rlimitStack      = 3
-)
-
-var ulimitNameMapping = map[string]int{
-	//"as":         rlimitAs, // Disabled since this doesn't seem usable with the way Docker inits a container.
-	"core":       rlimitCore,
-	"cpu":        rlimitCPU,
-	"data":       rlimitData,
-	"fsize":      rlimitFsize,
-	"locks":      rlimitLocks,
-	"memlock":    rlimitMemlock,
-	"msgqueue":   rlimitMsgqueue,
-	"nice":       rlimitNice,
-	"nofile":     rlimitNofile,
-	"nproc":      rlimitNproc,
-	"rss":        rlimitRss,
-	"rtprio":     rlimitRtprio,
-	"rttime":     rlimitRttime,
-	"sigpending": rlimitSigpending,
-	"stack":      rlimitStack,
-}
-
-// Parse parses and returns a Ulimit from the specified string.
-func Parse(val string) (*Ulimit, error) {
-	parts := strings.SplitN(val, "=", 2)
-	if len(parts) != 2 {
-		return nil, fmt.Errorf("invalid ulimit argument: %s", val)
-	}
-
-	if _, exists := ulimitNameMapping[parts[0]]; !exists {
-		return nil, fmt.Errorf("invalid ulimit type: %s", parts[0])
-	}
-
-	limitVals := strings.SplitN(parts[1], ":", 2)
-	if len(limitVals) > 2 {
-		return nil, fmt.Errorf("too many limit value arguments - %s, can only have up to two, `soft[:hard]`", parts[1])
-	}
-
-	soft, err := strconv.ParseInt(limitVals[0], 10, 64)
-	if err != nil {
-		return nil, err
-	}
-
-	hard := soft // in case no hard was set
-	if len(limitVals) == 2 {
-		hard, err = strconv.ParseInt(limitVals[1], 10, 64)
-	}
-	if soft > hard {
-		return nil, fmt.Errorf("ulimit soft limit must be less than or equal to hard limit: %d > %d", soft, hard)
-	}
-
-	return &Ulimit{Name: parts[0], Soft: soft, Hard: hard}, nil
-}
-
-// GetRlimit returns the RLimit corresponding to Ulimit.
-func (u *Ulimit) GetRlimit() (*Rlimit, error) {
-	t, exists := ulimitNameMapping[u.Name]
-	if !exists {
-		return nil, fmt.Errorf("invalid ulimit name %s", u.Name)
-	}
-
-	return &Rlimit{Type: t, Soft: uint64(u.Soft), Hard: uint64(u.Hard)}, nil
-}
-
-func (u *Ulimit) String() string {
-	return fmt.Sprintf("%s=%d:%d", u.Name, u.Soft, u.Hard)
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/units/duration.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/units/duration.go
deleted file mode 100644
index c219a8a96..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/units/duration.go
+++ /dev/null
@@ -1,33 +0,0 @@
-// Package units provides helper function to parse and print size and time units
-// in human-readable format.
-package units
-
-import (
-	"fmt"
-	"time"
-)
-
-// HumanDuration returns a human-readable approximation of a duration
-// (eg. "About a minute", "4 hours ago", etc.).
-func HumanDuration(d time.Duration) string {
-	if seconds := int(d.Seconds()); seconds < 1 {
-		return "Less than a second"
-	} else if seconds < 60 {
-		return fmt.Sprintf("%d seconds", seconds)
-	} else if minutes := int(d.Minutes()); minutes == 1 {
-		return "About a minute"
-	} else if minutes < 60 {
-		return fmt.Sprintf("%d minutes", minutes)
-	} else if hours := int(d.Hours()); hours == 1 {
-		return "About an hour"
-	} else if hours < 48 {
-		return fmt.Sprintf("%d hours", hours)
-	} else if hours < 24*7*2 {
-		return fmt.Sprintf("%d days", hours/24)
-	} else if hours < 24*30*3 {
-		return fmt.Sprintf("%d weeks", hours/24/7)
-	} else if hours < 24*365*2 {
-		return fmt.Sprintf("%d months", hours/24/30)
-	}
-	return fmt.Sprintf("%d years", int(d.Hours())/24/365)
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/units/size.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/units/size.go
deleted file mode 100644
index 2fde3b412..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/units/size.go
+++ /dev/null
@@ -1,95 +0,0 @@
-package units
-
-import (
-	"fmt"
-	"regexp"
-	"strconv"
-	"strings"
-)
-
-// See: http://en.wikipedia.org/wiki/Binary_prefix
-const (
-	// Decimal
-
-	KB = 1000
-	MB = 1000 * KB
-	GB = 1000 * MB
-	TB = 1000 * GB
-	PB = 1000 * TB
-
-	// Binary
-
-	KiB = 1024
-	MiB = 1024 * KiB
-	GiB = 1024 * MiB
-	TiB = 1024 * GiB
-	PiB = 1024 * TiB
-)
-
-type unitMap map[string]int64
-
-var (
-	decimalMap = unitMap{"k": KB, "m": MB, "g": GB, "t": TB, "p": PB}
-	binaryMap  = unitMap{"k": KiB, "m": MiB, "g": GiB, "t": TiB, "p": PiB}
-	sizeRegex  = regexp.MustCompile(`^(\d+)([kKmMgGtTpP])?[bB]?$`)
-)
-
-var decimapAbbrs = []string{"B", "kB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB"}
-var binaryAbbrs = []string{"B", "KiB", "MiB", "GiB", "TiB", "PiB", "EiB", "ZiB", "YiB"}
-
-// CustomSize returns a human-readable approximation of a size
-// using custom format.
-func CustomSize(format string, size float64, base float64, _map []string) string {
-	i := 0
-	for size >= base {
-		size = size / base
-		i++
-	}
-	return fmt.Sprintf(format, size, _map[i])
-}
-
-// HumanSize returns a human-readable approximation of a size
-// using SI standard (eg. "44kB", "17MB").
-func HumanSize(size float64) string {
-	return CustomSize("%.4g %s", size, 1000.0, decimapAbbrs)
-}
-
-// BytesSize returns a human-readable size in bytes, kibibytes,
-// mebibytes, gibibytes, or tebibytes (eg. "44kiB", "17MiB").
-func BytesSize(size float64) string {
-	return CustomSize("%.4g %s", size, 1024.0, binaryAbbrs)
-}
-
-// FromHumanSize returns an integer from a human-readable specification of a
-// size using SI standard (eg. "44kB", "17MB").
-func FromHumanSize(size string) (int64, error) {
-	return parseSize(size, decimalMap)
-}
-
-// RAMInBytes parses a human-readable string representing an amount of RAM
-// in bytes, kibibytes, mebibytes, gibibytes, or tebibytes and
-// returns the number of bytes, or -1 if the string is unparseable.
-// Units are case-insensitive, and the 'b' suffix is optional.
-func RAMInBytes(size string) (int64, error) {
-	return parseSize(size, binaryMap)
-}
-
-// Parses the human-readable size string into the amount it represents.
-func parseSize(sizeStr string, uMap unitMap) (int64, error) {
-	matches := sizeRegex.FindStringSubmatch(sizeStr)
-	if len(matches) != 3 {
-		return -1, fmt.Errorf("invalid size: '%s'", sizeStr)
-	}
-
-	size, err := strconv.ParseInt(matches[1], 10, 0)
-	if err != nil {
-		return -1, err
-	}
-
-	unitPrefix := strings.ToLower(matches[2])
-	if mul, ok := uMap[unitPrefix]; ok {
-		size *= mul
-	}
-
-	return size, nil
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/volume/volume.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/volume/volume.go
deleted file mode 100644
index d986207c8..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/volume/volume.go
+++ /dev/null
@@ -1,172 +0,0 @@
-package volume
-
-import (
-	"os"
-	"runtime"
-	"strings"
-
-	"github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus"
-	derr "github.com/fsouza/go-dockerclient/external/github.com/docker/docker/errors"
-	"github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system"
-)
-
-// DefaultDriverName is the driver name used for the driver
-// implemented in the local package.
-const DefaultDriverName string = "local"
-
-// Driver is for creating and removing volumes.
-type Driver interface {
-	// Name returns the name of the volume driver.
-	Name() string
-	// Create makes a new volume with the given id.
-	Create(name string, opts map[string]string) (Volume, error)
-	// Remove deletes the volume.
-	Remove(Volume) error
-}
-
-// Volume is a place to store data. It is backed by a specific driver, and can be mounted.
-type Volume interface {
-	// Name returns the name of the volume
-	Name() string
-	// DriverName returns the name of the driver which owns this volume.
-	DriverName() string
-	// Path returns the absolute path to the volume.
-	Path() string
-	// Mount mounts the volume and returns the absolute path to
-	// where it can be consumed.
-	Mount() (string, error)
-	// Unmount unmounts the volume when it is no longer in use.
-	Unmount() error
-}
-
-// MountPoint is the intersection point between a volume and a container. It
-// specifies which volume is to be used and where inside a container it should
-// be mounted.
-type MountPoint struct {
-	Source      string // Container host directory
-	Destination string // Inside the container
-	RW          bool   // True if writable
-	Name        string // Name set by user
-	Driver      string // Volume driver to use
-	Volume      Volume `json:"-"`
-
-	// Note Mode is not used on Windows
-	Mode string `json:"Relabel"` // Originally field was `Relabel`"
-}
-
-// Setup sets up a mount point by either mounting the volume if it is
-// configured, or creating the source directory if supplied.
-func (m *MountPoint) Setup() (string, error) {
-	if m.Volume != nil {
-		return m.Volume.Mount()
-	}
-	if len(m.Source) > 0 {
-		if _, err := os.Stat(m.Source); err != nil {
-			if !os.IsNotExist(err) {
-				return "", err
-			}
-			if runtime.GOOS != "windows" { // Windows does not have deprecation issues here
-				logrus.Warnf("Auto-creating non-existant volume host path %s, this is deprecated and will be removed soon", m.Source)
-				if err := system.MkdirAll(m.Source, 0755); err != nil {
-					return "", err
-				}
-			}
-		}
-		return m.Source, nil
-	}
-	return "", derr.ErrorCodeMountSetup
-}
-
-// Path returns the path of a volume in a mount point.
-func (m *MountPoint) Path() string {
-	if m.Volume != nil {
-		return m.Volume.Path()
-	}
-	return m.Source
-}
-
-// ValidMountMode will make sure the mount mode is valid.
-// returns if it's a valid mount mode or not.
-func ValidMountMode(mode string) bool {
-	return roModes[strings.ToLower(mode)] || rwModes[strings.ToLower(mode)]
-}
-
-// ReadWrite tells you if a mode string is a valid read-write mode or not.
-func ReadWrite(mode string) bool {
-	return rwModes[strings.ToLower(mode)]
-}
-
-// ParseVolumesFrom ensure that the supplied volumes-from is valid.
-func ParseVolumesFrom(spec string) (string, string, error) {
-	if len(spec) == 0 {
-		return "", "", derr.ErrorCodeVolumeFromBlank.WithArgs(spec)
-	}
-
-	specParts := strings.SplitN(spec, ":", 2)
-	id := specParts[0]
-	mode := "rw"
-
-	if len(specParts) == 2 {
-		mode = specParts[1]
-		if !ValidMountMode(mode) {
-			return "", "", derr.ErrorCodeVolumeInvalidMode.WithArgs(mode)
-		}
-	}
-	return id, mode, nil
-}
-
-// SplitN splits raw into a maximum of n parts, separated by a separator colon.
-// A separator colon is the last `:` character in the regex `[/:\\]?[a-zA-Z]:` (note `\\` is `\` escaped).
-// This allows to correctly split strings such as `C:\foo:D:\:rw`.
-func SplitN(raw string, n int) []string {
-	var array []string
-	if len(raw) == 0 || raw[0] == ':' {
-		// invalid
-		return nil
-	}
-	// numberOfParts counts the number of parts separated by a separator colon
-	numberOfParts := 0
-	// left represents the left-most cursor in raw, updated at every `:` character considered as a separator.
-	left := 0
-	// right represents the right-most cursor in raw incremented with the loop. Note this
-	// starts at index 1 as index 0 is already handle above as a special case.
-	for right := 1; right < len(raw); right++ {
-		// stop parsing if reached maximum number of parts
-		if n >= 0 && numberOfParts >= n {
-			break
-		}
-		if raw[right] != ':' {
-			continue
-		}
-		potentialDriveLetter := raw[right-1]
-		if (potentialDriveLetter >= 'A' && potentialDriveLetter <= 'Z') || (potentialDriveLetter >= 'a' && potentialDriveLetter <= 'z') {
-			if right > 1 {
-				beforePotentialDriveLetter := raw[right-2]
-				if beforePotentialDriveLetter != ':' && beforePotentialDriveLetter != '/' && beforePotentialDriveLetter != '\\' {
-					// e.g. `C:` is not preceded by any delimiter, therefore it was not a drive letter but a path ending with `C:`.
-					array = append(array, raw[left:right])
-					left = right + 1
-					numberOfParts++
-				}
-				// else, `C:` is considered as a drive letter and not as a delimiter, so we continue parsing.
-			}
-			// if right == 1, then `C:` is the beginning of the raw string, therefore `:` is again not considered a delimiter and we continue parsing.
-		} else {
-			// if `:` is not preceded by a potential drive letter, then consider it as a delimiter.
-			array = append(array, raw[left:right])
-			left = right + 1
-			numberOfParts++
-		}
-	}
-	// need to take care of the last part
-	if left < len(raw) {
-		if n >= 0 && numberOfParts >= n {
-			// if the maximum number of parts is reached, just append the rest to the last part
-			// left-1 is at the last `:` that needs to be included since not considered a separator.
-			array[n-1] += raw[left-1:]
-		} else {
-			array = append(array, raw[left:])
-		}
-	}
-	return array
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/volume/volume_unix.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/volume/volume_unix.go
deleted file mode 100644
index db0fea5b8..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/volume/volume_unix.go
+++ /dev/null
@@ -1,132 +0,0 @@
-// +build linux freebsd darwin
-
-package volume
-
-import (
-	"fmt"
-	"path/filepath"
-	"strings"
-
-	derr "github.com/fsouza/go-dockerclient/external/github.com/docker/docker/errors"
-)
-
-// read-write modes
-var rwModes = map[string]bool{
-	"rw":   true,
-	"rw,Z": true,
-	"rw,z": true,
-	"z,rw": true,
-	"Z,rw": true,
-	"Z":    true,
-	"z":    true,
-}
-
-// read-only modes
-var roModes = map[string]bool{
-	"ro":   true,
-	"ro,Z": true,
-	"ro,z": true,
-	"z,ro": true,
-	"Z,ro": true,
-}
-
-// BackwardsCompatible decides whether this mount point can be
-// used in old versions of Docker or not.
-// Only bind mounts and local volumes can be used in old versions of Docker.
-func (m *MountPoint) BackwardsCompatible() bool {
-	return len(m.Source) > 0 || m.Driver == DefaultDriverName
-}
-
-// HasResource checks whether the given absolute path for a container is in
-// this mount point. If the relative path starts with `../` then the resource
-// is outside of this mount point, but we can't simply check for this prefix
-// because it misses `..` which is also outside of the mount, so check both.
-func (m *MountPoint) HasResource(absolutePath string) bool {
-	relPath, err := filepath.Rel(m.Destination, absolutePath)
-	return err == nil && relPath != ".." && !strings.HasPrefix(relPath, fmt.Sprintf("..%c", filepath.Separator))
-}
-
-// ParseMountSpec validates the configuration of mount information is valid.
-func ParseMountSpec(spec, volumeDriver string) (*MountPoint, error) {
-	spec = filepath.ToSlash(spec)
-
-	mp := &MountPoint{
-		RW: true,
-	}
-	if strings.Count(spec, ":") > 2 {
-		return nil, derr.ErrorCodeVolumeInvalid.WithArgs(spec)
-	}
-
-	arr := strings.SplitN(spec, ":", 3)
-	if arr[0] == "" {
-		return nil, derr.ErrorCodeVolumeInvalid.WithArgs(spec)
-	}
-
-	switch len(arr) {
-	case 1:
-		// Just a destination path in the container
-		mp.Destination = filepath.Clean(arr[0])
-	case 2:
-		if isValid := ValidMountMode(arr[1]); isValid {
-			// Destination + Mode is not a valid volume - volumes
-			// cannot include a mode. eg /foo:rw
-			return nil, derr.ErrorCodeVolumeInvalid.WithArgs(spec)
-		}
-		// Host Source Path or Name + Destination
-		mp.Source = arr[0]
-		mp.Destination = arr[1]
-	case 3:
-		// HostSourcePath+DestinationPath+Mode
-		mp.Source = arr[0]
-		mp.Destination = arr[1]
-		mp.Mode = arr[2] // Mode field is used by SELinux to decide whether to apply label
-		if !ValidMountMode(mp.Mode) {
-			return nil, derr.ErrorCodeVolumeInvalidMode.WithArgs(mp.Mode)
-		}
-		mp.RW = ReadWrite(mp.Mode)
-	default:
-		return nil, derr.ErrorCodeVolumeInvalid.WithArgs(spec)
-	}
-
-	//validate the volumes destination path
-	mp.Destination = filepath.Clean(mp.Destination)
-	if !filepath.IsAbs(mp.Destination) {
-		return nil, derr.ErrorCodeVolumeAbs.WithArgs(mp.Destination)
-	}
-
-	// Destination cannot be "/"
-	if mp.Destination == "/" {
-		return nil, derr.ErrorCodeVolumeSlash.WithArgs(spec)
-	}
-
-	name, source := ParseVolumeSource(mp.Source)
-	if len(source) == 0 {
-		mp.Source = "" // Clear it out as we previously assumed it was not a name
-		mp.Driver = volumeDriver
-		if len(mp.Driver) == 0 {
-			mp.Driver = DefaultDriverName
-		}
-	} else {
-		mp.Source = filepath.Clean(source)
-	}
-
-	mp.Name = name
-
-	return mp, nil
-}
-
-// ParseVolumeSource parses the origin sources that's mounted into the container.
-// It returns a name and a source. It looks to see if the spec passed in
-// is an absolute file. If it is, it assumes the spec is a source. If not,
-// it assumes the spec is a name.
-func ParseVolumeSource(spec string) (string, string) {
-	if !filepath.IsAbs(spec) {
-		return spec, ""
-	}
-	return "", spec
-}
-
-// IsVolumeNameValid checks a volume name in a platform specific manner.
-func IsVolumeNameValid(name string) (bool, error) {
-	return true, nil
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/volume/volume_windows.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/volume/volume_windows.go
deleted file mode 100644
index 3f0278015..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/volume/volume_windows.go
+++ /dev/null
@@ -1,181 +0,0 @@
-package volume
-
-import (
-	"os"
-	"path/filepath"
-	"regexp"
-	"strings"
-
-	"github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus"
-	derr "github.com/fsouza/go-dockerclient/external/github.com/docker/docker/errors"
-)
-
-// read-write modes
-var rwModes = map[string]bool{
-	"rw": true,
-}
-
-// read-only modes
-var roModes = map[string]bool{
-	"ro": true,
-}
-
-const (
-	// Spec should be in the format [source:]destination[:mode]
-	//
-	// Examples: c:\foo bar:d:rw
-	//           c:\foo:d:\bar
-	//           myname:d:
-	//           d:\
-	//
-	// Explanation of this regex! Thanks @thaJeztah on IRC and gist for help. See
-	// https://gist.github.com/thaJeztah/6185659e4978789fb2b2. A good place to
-	// test is https://regex-golang.appspot.com/assets/html/index.html
-	//
-	// Useful link for referencing named capturing groups:
-	// http://stackoverflow.com/questions/20750843/using-named-matches-from-go-regex
-	//
-	// There are three match groups: source, destination and mode.
-	//
-
-	// RXHostDir is the first option of a source
-	RXHostDir = `[a-z]:\\(?:[^\\/:*?"<>|\r\n]+\\?)*`
-	// RXName is the second option of a source
-	RXName = `[^\\/:*?"<>|\r\n]+`
-	// RXReservedNames are reserved names not possible on Windows
-	RXReservedNames = `(con)|(prn)|(nul)|(aux)|(com[1-9])|(lpt[1-9])`
-
-	// RXSource is the combined possiblities for a source
-	RXSource = `((?P<source>((` + RXHostDir + `)|(` + RXName + `))):)?`
-
-	// Source. Can be either a host directory, a name, or omitted:
-	//  HostDir:
-	//    -  Essentially using the folder solution from
-	//       https://www.safaribooksonline.com/library/view/regular-expressions-cookbook/9781449327453/ch08s18.html
-	//       but adding case insensitivity.
-	//    -  Must be an absolute path such as c:\path
-	//    -  Can include spaces such as `c:\program files`
-	//    -  And then followed by a colon which is not in the capture group
-	//    -  And can be optional
-	//  Name:
-	//    -  Must not contain invalid NTFS filename characters (https://msdn.microsoft.com/en-us/library/windows/desktop/aa365247(v=vs.85).aspx)
-	//    -  And then followed by a colon which is not in the capture group
-	//    -  And can be optional
-
-	// RXDestination is the regex expression for the mount destination
-	RXDestination = `(?P<destination>([a-z]):((?:\\[^\\/:*?"<>\r\n]+)*\\?))`
-	// Destination (aka container path):
-	//    -  Variation on hostdir but can be a drive followed by colon as well
-	//    -  If a path, must be absolute. Can include spaces
-	//    -  Drive cannot be c: (explicitly checked in code, not RegEx)
-	//
-
-	// RXMode is the regex expression for the mode of the mount
-	RXMode = `(:(?P<mode>(?i)rw))?`
-	// Temporarily for TP4, disabling the use of ro as it's not supported yet
-	// in the platform. TODO Windows: `(:(?P<mode>(?i)ro|rw))?`
-	// mode (optional)
-	//    -  Hopefully self explanatory in comparison to above.
-	//    -  Colon is not in the capture group
-	//
-)
-
-// ParseMountSpec validates the configuration of mount information is valid.
-func ParseMountSpec(spec string, volumeDriver string) (*MountPoint, error) {
-	var specExp = regexp.MustCompile(`^` + RXSource + RXDestination + RXMode + `$`)
-
-	// Ensure in platform semantics for matching. The CLI will send in Unix semantics.
-	match := specExp.FindStringSubmatch(filepath.FromSlash(strings.ToLower(spec)))
-
-	// Must have something back
-	if len(match) == 0 {
-		return nil, derr.ErrorCodeVolumeInvalid.WithArgs(spec)
-	}
-
-	// Pull out the sub expressions from the named capture groups
-	matchgroups := make(map[string]string)
-	for i, name := range specExp.SubexpNames() {
-		matchgroups[name] = strings.ToLower(match[i])
-	}
-
-	mp := &MountPoint{
-		Source:      matchgroups["source"],
-		Destination: matchgroups["destination"],
-		RW:          true,
-	}
-	if strings.ToLower(matchgroups["mode"]) == "ro" {
-		mp.RW = false
-	}
-
-	// Volumes cannot include an explicitly supplied mode eg c:\path:rw
-	if mp.Source == "" && mp.Destination != "" && matchgroups["mode"] != "" {
-		return nil, derr.ErrorCodeVolumeInvalid.WithArgs(spec)
-	}
-
-	// Note: No need to check if destination is absolute as it must be by
-	// definition of matching the regex.
-
-	if filepath.VolumeName(mp.Destination) == mp.Destination {
-		// Ensure the destination path, if a drive letter, is not the c drive
-		if strings.ToLower(mp.Destination) == "c:" {
-			return nil, derr.ErrorCodeVolumeDestIsC.WithArgs(spec)
-		}
-	} else {
-		// So we know the destination is a path, not drive letter. Clean it up.
-		mp.Destination = filepath.Clean(mp.Destination)
-		// Ensure the destination path, if a path, is not the c root directory
-		if strings.ToLower(mp.Destination) == `c:\` {
-			return nil, derr.ErrorCodeVolumeDestIsCRoot.WithArgs(spec)
-		}
-	}
-
-	// See if the source is a name instead of a host directory
-	if len(mp.Source) > 0 {
-		validName, err := IsVolumeNameValid(mp.Source)
-		if err != nil {
-			return nil, err
-		}
-		if validName {
-			// OK, so the source is a name.
-			mp.Name = mp.Source
-			mp.Source = ""
-
-			// Set the driver accordingly
-			mp.Driver = volumeDriver
-			if len(mp.Driver) == 0 {
-				mp.Driver = DefaultDriverName
-			}
-		} else {
-			// OK, so the source must be a host directory. Make sure it's clean.
-			mp.Source = filepath.Clean(mp.Source)
-		}
-	}
-
-	// Ensure the host path source, if supplied, exists and is a directory
-	if len(mp.Source) > 0 {
-		var fi os.FileInfo
-		var err error
-		if fi, err = os.Stat(mp.Source); err != nil {
-			return nil, derr.ErrorCodeVolumeSourceNotFound.WithArgs(mp.Source, err)
-		}
-		if !fi.IsDir() {
-			return nil, derr.ErrorCodeVolumeSourceNotDirectory.WithArgs(mp.Source)
-		}
-	}
-
-	logrus.Debugf("MP: Source '%s', Dest '%s', RW %t, Name '%s', Driver '%s'", mp.Source, mp.Destination, mp.RW, mp.Name, mp.Driver)
-	return mp, nil
-}
-
-// IsVolumeNameValid checks a volume name in a platform specific manner.
-func IsVolumeNameValid(name string) (bool, error) {
-	nameExp := regexp.MustCompile(`^` + RXName + `$`)
-	if !nameExp.MatchString(name) {
-		return false, nil
-	}
-	nameExp = regexp.MustCompile(`^` + RXReservedNames + `$`)
-	if nameExp.MatchString(name) {
-		return false, derr.ErrorCodeVolumeNameReservedWord.WithArgs(name)
-	}
-	return true, nil
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/libcontainer/user/MAINTAINERS b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/libcontainer/user/MAINTAINERS
deleted file mode 100644
index edbe20066..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/libcontainer/user/MAINTAINERS
+++ /dev/null
@@ -1,2 +0,0 @@
-Tianon Gravi <admwiggin@gmail.com> (@tianon)
-Aleksa Sarai <cyphar@cyphar.com> (@cyphar)
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/libcontainer/user/lookup.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/libcontainer/user/lookup.go
deleted file mode 100644
index 6f8a982ff..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/libcontainer/user/lookup.go
+++ /dev/null
@@ -1,108 +0,0 @@
-package user
-
-import (
-	"errors"
-	"fmt"
-	"syscall"
-)
-
-var (
-	// The current operating system does not provide the required data for user lookups.
-	ErrUnsupported = errors.New("user lookup: operating system does not provide passwd-formatted data")
-)
-
-func lookupUser(filter func(u User) bool) (User, error) {
-	// Get operating system-specific passwd reader-closer.
-	passwd, err := GetPasswd()
-	if err != nil {
-		return User{}, err
-	}
-	defer passwd.Close()
-
-	// Get the users.
-	users, err := ParsePasswdFilter(passwd, filter)
-	if err != nil {
-		return User{}, err
-	}
-
-	// No user entries found.
-	if len(users) == 0 {
-		return User{}, fmt.Errorf("no matching entries in passwd file")
-	}
-
-	// Assume the first entry is the "correct" one.
-	return users[0], nil
-}
-
-// CurrentUser looks up the current user by their user id in /etc/passwd. If the
-// user cannot be found (or there is no /etc/passwd file on the filesystem),
-// then CurrentUser returns an error.
-func CurrentUser() (User, error) {
-	return LookupUid(syscall.Getuid())
-}
-
-// LookupUser looks up a user by their username in /etc/passwd. If the user
-// cannot be found (or there is no /etc/passwd file on the filesystem), then
-// LookupUser returns an error.
-func LookupUser(username string) (User, error) {
-	return lookupUser(func(u User) bool {
-		return u.Name == username
-	})
-}
-
-// LookupUid looks up a user by their user id in /etc/passwd. If the user cannot
-// be found (or there is no /etc/passwd file on the filesystem), then LookupId
-// returns an error.
-func LookupUid(uid int) (User, error) {
-	return lookupUser(func(u User) bool {
-		return u.Uid == uid
-	})
-}
-
-func lookupGroup(filter func(g Group) bool) (Group, error) {
-	// Get operating system-specific group reader-closer.
-	group, err := GetGroup()
-	if err != nil {
-		return Group{}, err
-	}
-	defer group.Close()
-
-	// Get the users.
-	groups, err := ParseGroupFilter(group, filter)
-	if err != nil {
-		return Group{}, err
-	}
-
-	// No user entries found.
-	if len(groups) == 0 {
-		return Group{}, fmt.Errorf("no matching entries in group file")
-	}
-
-	// Assume the first entry is the "correct" one.
-	return groups[0], nil
-}
-
-// CurrentGroup looks up the current user's group by their primary group id's
-// entry in /etc/passwd. If the group cannot be found (or there is no
-// /etc/group file on the filesystem), then CurrentGroup returns an error.
-func CurrentGroup() (Group, error) {
-	return LookupGid(syscall.Getgid())
-}
-
-// LookupGroup looks up a group by its name in /etc/group. If the group cannot
-// be found (or there is no /etc/group file on the filesystem), then LookupGroup
-// returns an error.
-func LookupGroup(groupname string) (Group, error) {
-	return lookupGroup(func(g Group) bool {
-		return g.Name == groupname
-	})
-}
-
-// LookupGid looks up a group by its group id in /etc/group. If the group cannot
-// be found (or there is no /etc/group file on the filesystem), then LookupGid
-// returns an error.
-func LookupGid(gid int) (Group, error) {
-	return lookupGroup(func(g Group) bool {
-		return g.Gid == gid
-	})
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/libcontainer/user/lookup_unix.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/libcontainer/user/lookup_unix.go
deleted file mode 100644
index 758b734c2..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/libcontainer/user/lookup_unix.go
+++ /dev/null
@@ -1,30 +0,0 @@
-// +build darwin dragonfly freebsd linux netbsd openbsd solaris
-
-package user
-
-import (
-	"io"
-	"os"
-)
-
-// Unix-specific path to the passwd and group formatted files.
-const (
-	unixPasswdPath = "/etc/passwd"
-	unixGroupPath  = "/etc/group"
-)
-
-func GetPasswdPath() (string, error) {
-	return unixPasswdPath, nil
-}
-
-func GetPasswd() (io.ReadCloser, error) {
-	return os.Open(unixPasswdPath)
-}
-
-func GetGroupPath() (string, error) {
-	return unixGroupPath, nil
-}
-
-func GetGroup() (io.ReadCloser, error) {
-	return os.Open(unixGroupPath)
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/libcontainer/user/lookup_unsupported.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/libcontainer/user/lookup_unsupported.go
deleted file mode 100644
index 721794887..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/libcontainer/user/lookup_unsupported.go
+++ /dev/null
@@ -1,21 +0,0 @@
-// +build !darwin,!dragonfly,!freebsd,!linux,!netbsd,!openbsd,!solaris
-
-package user
-
-import "io"
-
-func GetPasswdPath() (string, error) {
-	return "", ErrUnsupported
-}
-
-func GetPasswd() (io.ReadCloser, error) {
-	return nil, ErrUnsupported
-}
-
-func GetGroupPath() (string, error) {
-	return "", ErrUnsupported
-}
-
-func GetGroup() (io.ReadCloser, error) {
-	return nil, ErrUnsupported
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/libcontainer/user/user.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/libcontainer/user/user.go
deleted file mode 100644
index 13226dbfa..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/libcontainer/user/user.go
+++ /dev/null
@@ -1,407 +0,0 @@
-package user
-
-import (
-	"bufio"
-	"fmt"
-	"io"
-	"os"
-	"strconv"
-	"strings"
-)
-
-const (
-	minId = 0
-	maxId = 1<<31 - 1 //for 32-bit systems compatibility
-)
-
-var (
-	ErrRange = fmt.Errorf("Uids and gids must be in range %d-%d", minId, maxId)
-)
-
-type User struct {
-	Name  string
-	Pass  string
-	Uid   int
-	Gid   int
-	Gecos string
-	Home  string
-	Shell string
-}
-
-type Group struct {
-	Name string
-	Pass string
-	Gid  int
-	List []string
-}
-
-func parseLine(line string, v ...interface{}) {
-	if line == "" {
-		return
-	}
-
-	parts := strings.Split(line, ":")
-	for i, p := range parts {
-		if len(v) <= i {
-			// if we have more "parts" than we have places to put them, bail for great "tolerance" of naughty configuration files
-			break
-		}
-
-		switch e := v[i].(type) {
-		case *string:
-			// "root", "adm", "/bin/bash"
-			*e = p
-		case *int:
-			// "0", "4", "1000"
-			// ignore string to int conversion errors, for great "tolerance" of naughty configuration files
-			*e, _ = strconv.Atoi(p)
-		case *[]string:
-			// "", "root", "root,adm,daemon"
-			if p != "" {
-				*e = strings.Split(p, ",")
-			} else {
-				*e = []string{}
-			}
-		default:
-			// panic, because this is a programming/logic error, not a runtime one
-			panic("parseLine expects only pointers!  argument " + strconv.Itoa(i) + " is not a pointer!")
-		}
-	}
-}
-
-func ParsePasswdFile(path string) ([]User, error) {
-	passwd, err := os.Open(path)
-	if err != nil {
-		return nil, err
-	}
-	defer passwd.Close()
-	return ParsePasswd(passwd)
-}
-
-func ParsePasswd(passwd io.Reader) ([]User, error) {
-	return ParsePasswdFilter(passwd, nil)
-}
-
-func ParsePasswdFileFilter(path string, filter func(User) bool) ([]User, error) {
-	passwd, err := os.Open(path)
-	if err != nil {
-		return nil, err
-	}
-	defer passwd.Close()
-	return ParsePasswdFilter(passwd, filter)
-}
-
-func ParsePasswdFilter(r io.Reader, filter func(User) bool) ([]User, error) {
-	if r == nil {
-		return nil, fmt.Errorf("nil source for passwd-formatted data")
-	}
-
-	var (
-		s   = bufio.NewScanner(r)
-		out = []User{}
-	)
-
-	for s.Scan() {
-		if err := s.Err(); err != nil {
-			return nil, err
-		}
-
-		text := strings.TrimSpace(s.Text())
-		if text == "" {
-			continue
-		}
-
-		// see: man 5 passwd
-		//  name:password:UID:GID:GECOS:directory:shell
-		// Name:Pass:Uid:Gid:Gecos:Home:Shell
-		//  root:x:0:0:root:/root:/bin/bash
-		//  adm:x:3:4:adm:/var/adm:/bin/false
-		p := User{}
-		parseLine(
-			text,
-			&p.Name, &p.Pass, &p.Uid, &p.Gid, &p.Gecos, &p.Home, &p.Shell,
-		)
-
-		if filter == nil || filter(p) {
-			out = append(out, p)
-		}
-	}
-
-	return out, nil
-}
-
-func ParseGroupFile(path string) ([]Group, error) {
-	group, err := os.Open(path)
-	if err != nil {
-		return nil, err
-	}
-	defer group.Close()
-	return ParseGroup(group)
-}
-
-func ParseGroup(group io.Reader) ([]Group, error) {
-	return ParseGroupFilter(group, nil)
-}
-
-func ParseGroupFileFilter(path string, filter func(Group) bool) ([]Group, error) {
-	group, err := os.Open(path)
-	if err != nil {
-		return nil, err
-	}
-	defer group.Close()
-	return ParseGroupFilter(group, filter)
-}
-
-func ParseGroupFilter(r io.Reader, filter func(Group) bool) ([]Group, error) {
-	if r == nil {
-		return nil, fmt.Errorf("nil source for group-formatted data")
-	}
-
-	var (
-		s   = bufio.NewScanner(r)
-		out = []Group{}
-	)
-
-	for s.Scan() {
-		if err := s.Err(); err != nil {
-			return nil, err
-		}
-
-		text := s.Text()
-		if text == "" {
-			continue
-		}
-
-		// see: man 5 group
-		//  group_name:password:GID:user_list
-		// Name:Pass:Gid:List
-		//  root:x:0:root
-		//  adm:x:4:root,adm,daemon
-		p := Group{}
-		parseLine(
-			text,
-			&p.Name, &p.Pass, &p.Gid, &p.List,
-		)
-
-		if filter == nil || filter(p) {
-			out = append(out, p)
-		}
-	}
-
-	return out, nil
-}
-
-type ExecUser struct {
-	Uid, Gid int
-	Sgids    []int
-	Home     string
-}
-
-// GetExecUserPath is a wrapper for GetExecUser. It reads data from each of the
-// given file paths and uses that data as the arguments to GetExecUser. If the
-// files cannot be opened for any reason, the error is ignored and a nil
-// io.Reader is passed instead.
-func GetExecUserPath(userSpec string, defaults *ExecUser, passwdPath, groupPath string) (*ExecUser, error) {
-	passwd, err := os.Open(passwdPath)
-	if err != nil {
-		passwd = nil
-	} else {
-		defer passwd.Close()
-	}
-
-	group, err := os.Open(groupPath)
-	if err != nil {
-		group = nil
-	} else {
-		defer group.Close()
-	}
-
-	return GetExecUser(userSpec, defaults, passwd, group)
-}
-
-// GetExecUser parses a user specification string (using the passwd and group
-// readers as sources for /etc/passwd and /etc/group data, respectively). In
-// the case of blank fields or missing data from the sources, the values in
-// defaults is used.
-//
-// GetExecUser will return an error if a user or group literal could not be
-// found in any entry in passwd and group respectively.
-//
-// Examples of valid user specifications are:
-//     * ""
-//     * "user"
-//     * "uid"
-//     * "user:group"
-//     * "uid:gid
-//     * "user:gid"
-//     * "uid:group"
-func GetExecUser(userSpec string, defaults *ExecUser, passwd, group io.Reader) (*ExecUser, error) {
-	var (
-		userArg, groupArg string
-		name              string
-	)
-
-	if defaults == nil {
-		defaults = new(ExecUser)
-	}
-
-	// Copy over defaults.
-	user := &ExecUser{
-		Uid:   defaults.Uid,
-		Gid:   defaults.Gid,
-		Sgids: defaults.Sgids,
-		Home:  defaults.Home,
-	}
-
-	// Sgids slice *cannot* be nil.
-	if user.Sgids == nil {
-		user.Sgids = []int{}
-	}
-
-	// allow for userArg to have either "user" syntax, or optionally "user:group" syntax
-	parseLine(userSpec, &userArg, &groupArg)
-
-	users, err := ParsePasswdFilter(passwd, func(u User) bool {
-		if userArg == "" {
-			return u.Uid == user.Uid
-		}
-		return u.Name == userArg || strconv.Itoa(u.Uid) == userArg
-	})
-	if err != nil && passwd != nil {
-		if userArg == "" {
-			userArg = strconv.Itoa(user.Uid)
-		}
-		return nil, fmt.Errorf("Unable to find user %v: %v", userArg, err)
-	}
-
-	haveUser := users != nil && len(users) > 0
-	if haveUser {
-		// if we found any user entries that matched our filter, let's take the first one as "correct"
-		name = users[0].Name
-		user.Uid = users[0].Uid
-		user.Gid = users[0].Gid
-		user.Home = users[0].Home
-	} else if userArg != "" {
-		// we asked for a user but didn't find them...  let's check to see if we wanted a numeric user
-		user.Uid, err = strconv.Atoi(userArg)
-		if err != nil {
-			// not numeric - we have to bail
-			return nil, fmt.Errorf("Unable to find user %v", userArg)
-		}
-
-		// Must be inside valid uid range.
-		if user.Uid < minId || user.Uid > maxId {
-			return nil, ErrRange
-		}
-
-		// if userArg couldn't be found in /etc/passwd but is numeric, just roll with it - this is legit
-	}
-
-	if groupArg != "" || name != "" {
-		groups, err := ParseGroupFilter(group, func(g Group) bool {
-			// Explicit group format takes precedence.
-			if groupArg != "" {
-				return g.Name == groupArg || strconv.Itoa(g.Gid) == groupArg
-			}
-
-			// Check if user is a member.
-			for _, u := range g.List {
-				if u == name {
-					return true
-				}
-			}
-
-			return false
-		})
-		if err != nil && group != nil {
-			return nil, fmt.Errorf("Unable to find groups for user %v: %v", users[0].Name, err)
-		}
-
-		haveGroup := groups != nil && len(groups) > 0
-		if groupArg != "" {
-			if haveGroup {
-				// if we found any group entries that matched our filter, let's take the first one as "correct"
-				user.Gid = groups[0].Gid
-			} else {
-				// we asked for a group but didn't find id...  let's check to see if we wanted a numeric group
-				user.Gid, err = strconv.Atoi(groupArg)
-				if err != nil {
-					// not numeric - we have to bail
-					return nil, fmt.Errorf("Unable to find group %v", groupArg)
-				}
-
-				// Ensure gid is inside gid range.
-				if user.Gid < minId || user.Gid > maxId {
-					return nil, ErrRange
-				}
-
-				// if groupArg couldn't be found in /etc/group but is numeric, just roll with it - this is legit
-			}
-		} else if haveGroup {
-			// If implicit group format, fill supplementary gids.
-			user.Sgids = make([]int, len(groups))
-			for i, group := range groups {
-				user.Sgids[i] = group.Gid
-			}
-		}
-	}
-
-	return user, nil
-}
-
-// GetAdditionalGroupsPath looks up a list of groups by name or group id
-// against the group file. If a group name cannot be found, an error will be
-// returned. If a group id cannot be found, it will be returned as-is.
-func GetAdditionalGroupsPath(additionalGroups []string, groupPath string) ([]int, error) {
-	groupReader, err := os.Open(groupPath)
-	if err != nil {
-		return nil, fmt.Errorf("Failed to open group file: %v", err)
-	}
-	defer groupReader.Close()
-
-	groups, err := ParseGroupFilter(groupReader, func(g Group) bool {
-		for _, ag := range additionalGroups {
-			if g.Name == ag || strconv.Itoa(g.Gid) == ag {
-				return true
-			}
-		}
-		return false
-	})
-	if err != nil {
-		return nil, fmt.Errorf("Unable to find additional groups %v: %v", additionalGroups, err)
-	}
-
-	gidMap := make(map[int]struct{})
-	for _, ag := range additionalGroups {
-		var found bool
-		for _, g := range groups {
-			// if we found a matched group either by name or gid, take the
-			// first matched as correct
-			if g.Name == ag || strconv.Itoa(g.Gid) == ag {
-				if _, ok := gidMap[g.Gid]; !ok {
-					gidMap[g.Gid] = struct{}{}
-					found = true
-					break
-				}
-			}
-		}
-		// we asked for a group but didn't find it. let's check to see
-		// if we wanted a numeric group
-		if !found {
-			gid, err := strconv.Atoi(ag)
-			if err != nil {
-				return nil, fmt.Errorf("Unable to find group %s", ag)
-			}
-			// Ensure gid is inside gid range.
-			if gid < minId || gid > maxId {
-				return nil, ErrRange
-			}
-			gidMap[gid] = struct{}{}
-		}
-	}
-	gids := []int{}
-	for gid := range gidMap {
-		gids = append(gids, gid)
-	}
-	return gids, nil
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/gorilla/context/LICENSE b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/gorilla/context/LICENSE
deleted file mode 100644
index 0e5fb8728..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/gorilla/context/LICENSE
+++ /dev/null
@@ -1,27 +0,0 @@
-Copyright (c) 2012 Rodrigo Moraes. 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/github.com/fsouza/go-dockerclient/external/github.com/gorilla/context/README.md b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/gorilla/context/README.md
deleted file mode 100644
index c60a31b05..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/gorilla/context/README.md
+++ /dev/null
@@ -1,7 +0,0 @@
-context
-=======
-[![Build Status](https://travis-ci.org/gorilla/context.png?branch=master)](https://travis-ci.org/gorilla/context)
-
-gorilla/context is a general purpose registry for global request variables.
-
-Read the full documentation here: http://www.gorillatoolkit.org/pkg/context
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/gorilla/context/context.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/gorilla/context/context.go
deleted file mode 100644
index 81cb128b1..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/gorilla/context/context.go
+++ /dev/null
@@ -1,143 +0,0 @@
-// Copyright 2012 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 context
-
-import (
-	"net/http"
-	"sync"
-	"time"
-)
-
-var (
-	mutex sync.RWMutex
-	data  = make(map[*http.Request]map[interface{}]interface{})
-	datat = make(map[*http.Request]int64)
-)
-
-// Set stores a value for a given key in a given request.
-func Set(r *http.Request, key, val interface{}) {
-	mutex.Lock()
-	if data[r] == nil {
-		data[r] = make(map[interface{}]interface{})
-		datat[r] = time.Now().Unix()
-	}
-	data[r][key] = val
-	mutex.Unlock()
-}
-
-// Get returns a value stored for a given key in a given request.
-func Get(r *http.Request, key interface{}) interface{} {
-	mutex.RLock()
-	if ctx := data[r]; ctx != nil {
-		value := ctx[key]
-		mutex.RUnlock()
-		return value
-	}
-	mutex.RUnlock()
-	return nil
-}
-
-// GetOk returns stored value and presence state like multi-value return of map access.
-func GetOk(r *http.Request, key interface{}) (interface{}, bool) {
-	mutex.RLock()
-	if _, ok := data[r]; ok {
-		value, ok := data[r][key]
-		mutex.RUnlock()
-		return value, ok
-	}
-	mutex.RUnlock()
-	return nil, false
-}
-
-// GetAll returns all stored values for the request as a map. Nil is returned for invalid requests.
-func GetAll(r *http.Request) map[interface{}]interface{} {
-	mutex.RLock()
-	if context, ok := data[r]; ok {
-		result := make(map[interface{}]interface{}, len(context))
-		for k, v := range context {
-			result[k] = v
-		}
-		mutex.RUnlock()
-		return result
-	}
-	mutex.RUnlock()
-	return nil
-}
-
-// GetAllOk returns all stored values for the request as a map and a boolean value that indicates if
-// the request was registered.
-func GetAllOk(r *http.Request) (map[interface{}]interface{}, bool) {
-	mutex.RLock()
-	context, ok := data[r]
-	result := make(map[interface{}]interface{}, len(context))
-	for k, v := range context {
-		result[k] = v
-	}
-	mutex.RUnlock()
-	return result, ok
-}
-
-// Delete removes a value stored for a given key in a given request.
-func Delete(r *http.Request, key interface{}) {
-	mutex.Lock()
-	if data[r] != nil {
-		delete(data[r], key)
-	}
-	mutex.Unlock()
-}
-
-// Clear removes all values stored for a given request.
-//
-// This is usually called by a handler wrapper to clean up request
-// variables at the end of a request lifetime. See ClearHandler().
-func Clear(r *http.Request) {
-	mutex.Lock()
-	clear(r)
-	mutex.Unlock()
-}
-
-// clear is Clear without the lock.
-func clear(r *http.Request) {
-	delete(data, r)
-	delete(datat, r)
-}
-
-// Purge removes request data stored for longer than maxAge, in seconds.
-// It returns the amount of requests removed.
-//
-// If maxAge <= 0, all request data is removed.
-//
-// This is only used for sanity check: in case context cleaning was not
-// properly set some request data can be kept forever, consuming an increasing
-// amount of memory. In case this is detected, Purge() must be called
-// periodically until the problem is fixed.
-func Purge(maxAge int) int {
-	mutex.Lock()
-	count := 0
-	if maxAge <= 0 {
-		count = len(data)
-		data = make(map[*http.Request]map[interface{}]interface{})
-		datat = make(map[*http.Request]int64)
-	} else {
-		min := time.Now().Unix() - int64(maxAge)
-		for r := range data {
-			if datat[r] < min {
-				clear(r)
-				count++
-			}
-		}
-	}
-	mutex.Unlock()
-	return count
-}
-
-// ClearHandler wraps an http.Handler and clears request values at the end
-// of a request lifetime.
-func ClearHandler(h http.Handler) http.Handler {
-	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		defer Clear(r)
-		h.ServeHTTP(w, r)
-	})
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/gorilla/context/doc.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/gorilla/context/doc.go
deleted file mode 100644
index 73c740031..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/gorilla/context/doc.go
+++ /dev/null
@@ -1,82 +0,0 @@
-// Copyright 2012 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 context stores values shared during a request lifetime.
-
-For example, a router can set variables extracted from the URL and later
-application handlers can access those values, or it can be used to store
-sessions values to be saved at the end of a request. There are several
-others common uses.
-
-The idea was posted by Brad Fitzpatrick to the go-nuts mailing list:
-
-	http://groups.google.com/group/golang-nuts/msg/e2d679d303aa5d53
-
-Here's the basic usage: first define the keys that you will need. The key
-type is interface{} so a key can be of any type that supports equality.
-Here we define a key using a custom int type to avoid name collisions:
-
-	package foo
-
-	import (
-		"github.com/gorilla/context"
-	)
-
-	type key int
-
-	const MyKey key = 0
-
-Then set a variable. Variables are bound to an http.Request object, so you
-need a request instance to set a value:
-
-	context.Set(r, MyKey, "bar")
-
-The application can later access the variable using the same key you provided:
-
-	func MyHandler(w http.ResponseWriter, r *http.Request) {
-		// val is "bar".
-		val := context.Get(r, foo.MyKey)
-
-		// returns ("bar", true)
-		val, ok := context.GetOk(r, foo.MyKey)
-		// ...
-	}
-
-And that's all about the basic usage. We discuss some other ideas below.
-
-Any type can be stored in the context. To enforce a given type, make the key
-private and wrap Get() and Set() to accept and return values of a specific
-type:
-
-	type key int
-
-	const mykey key = 0
-
-	// GetMyKey returns a value for this package from the request values.
-	func GetMyKey(r *http.Request) SomeType {
-		if rv := context.Get(r, mykey); rv != nil {
-			return rv.(SomeType)
-		}
-		return nil
-	}
-
-	// SetMyKey sets a value for this package in the request values.
-	func SetMyKey(r *http.Request, val SomeType) {
-		context.Set(r, mykey, val)
-	}
-
-Variables must be cleared at the end of a request, to remove all values
-that were stored. This can be done in an http.Handler, after a request was
-served. Just call Clear() passing the request:
-
-	context.Clear(r)
-
-...or use ClearHandler(), which conveniently wraps an http.Handler to clear
-variables at the end of a request lifetime.
-
-The Routers from the packages gorilla/mux and gorilla/pat call Clear()
-so if you are using either of them you don't need to clear the context manually.
-*/
-package context
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/gorilla/mux/LICENSE b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/gorilla/mux/LICENSE
deleted file mode 100644
index 0e5fb8728..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/gorilla/mux/LICENSE
+++ /dev/null
@@ -1,27 +0,0 @@
-Copyright (c) 2012 Rodrigo Moraes. 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/github.com/fsouza/go-dockerclient/external/github.com/gorilla/mux/README.md b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/gorilla/mux/README.md
deleted file mode 100644
index 9a046ff97..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/gorilla/mux/README.md
+++ /dev/null
@@ -1,235 +0,0 @@
-mux
-===
-[![GoDoc](https://godoc.org/github.com/gorilla/securecookie?status.svg)](https://godoc.org/github.com/gorilla/securecookie)
-[![Build Status](https://travis-ci.org/gorilla/mux.png?branch=master)](https://travis-ci.org/gorilla/mux)
-
-Package gorilla/mux implements a request router and dispatcher.
-
-The name mux stands for "HTTP request multiplexer". Like the standard
-http.ServeMux, mux.Router matches incoming requests against a list of
-registered routes and calls a handler for the route that matches the URL
-or other conditions. The main features are:
-
-	* Requests can be matched based on URL host, path, path prefix, schemes,
-	  header and query values, HTTP methods or using custom matchers.
-	* URL hosts and paths can have variables with an optional regular
-	  expression.
-	* Registered URLs can be built, or "reversed", which helps maintaining
-	  references to resources.
-	* Routes can be used as subrouters: nested routes are only tested if the
-	  parent route matches. This is useful to define groups of routes that
-	  share common conditions like a host, a path prefix or other repeated
-	  attributes. As a bonus, this optimizes request matching.
-	* It implements the http.Handler interface so it is compatible with the
-	  standard http.ServeMux.
-
-Let's start registering a couple of URL paths and handlers:
-
-	func main() {
-		r := mux.NewRouter()
-		r.HandleFunc("/", HomeHandler)
-		r.HandleFunc("/products", ProductsHandler)
-		r.HandleFunc("/articles", ArticlesHandler)
-		http.Handle("/", r)
-	}
-
-Here we register three routes mapping URL paths to handlers. This is
-equivalent to how http.HandleFunc() works: if an incoming request URL matches
-one of the paths, the corresponding handler is called passing
-(http.ResponseWriter, *http.Request) as parameters.
-
-Paths can have variables. They are defined using the format {name} or
-{name:pattern}. If a regular expression pattern is not defined, the matched
-variable will be anything until the next slash. For example:
-
-	r := mux.NewRouter()
-	r.HandleFunc("/products/{key}", ProductHandler)
-	r.HandleFunc("/articles/{category}/", ArticlesCategoryHandler)
-	r.HandleFunc("/articles/{category}/{id:[0-9]+}", ArticleHandler)
-
-The names are used to create a map of route variables which can be retrieved
-calling mux.Vars():
-
-	vars := mux.Vars(request)
-	category := vars["category"]
-
-And this is all you need to know about the basic usage. More advanced options
-are explained below.
-
-Routes can also be restricted to a domain or subdomain. Just define a host
-pattern to be matched. They can also have variables:
-
-	r := mux.NewRouter()
-	// Only matches if domain is "www.example.com".
-	r.Host("www.example.com")
-	// Matches a dynamic subdomain.
-	r.Host("{subdomain:[a-z]+}.domain.com")
-
-There are several other matchers that can be added. To match path prefixes:
-
-	r.PathPrefix("/products/")
-
-...or HTTP methods:
-
-	r.Methods("GET", "POST")
-
-...or URL schemes:
-
-	r.Schemes("https")
-
-...or header values:
-
-	r.Headers("X-Requested-With", "XMLHttpRequest")
-
-...or query values:
-
-	r.Queries("key", "value")
-
-...or to use a custom matcher function:
-
-	r.MatcherFunc(func(r *http.Request, rm *RouteMatch) bool {
-		return r.ProtoMajor == 0
-	})
-
-...and finally, it is possible to combine several matchers in a single route:
-
-	r.HandleFunc("/products", ProductsHandler).
-	  Host("www.example.com").
-	  Methods("GET").
-	  Schemes("http")
-
-Setting the same matching conditions again and again can be boring, so we have
-a way to group several routes that share the same requirements.
-We call it "subrouting".
-
-For example, let's say we have several URLs that should only match when the
-host is `www.example.com`. Create a route for that host and get a "subrouter"
-from it:
-
-	r := mux.NewRouter()
-	s := r.Host("www.example.com").Subrouter()
-
-Then register routes in the subrouter:
-
-	s.HandleFunc("/products/", ProductsHandler)
-	s.HandleFunc("/products/{key}", ProductHandler)
-	s.HandleFunc("/articles/{category}/{id:[0-9]+}"), ArticleHandler)
-
-The three URL paths we registered above will only be tested if the domain is
-`www.example.com`, because the subrouter is tested first. This is not
-only convenient, but also optimizes request matching. You can create
-subrouters combining any attribute matchers accepted by a route.
-
-Subrouters can be used to create domain or path "namespaces": you define
-subrouters in a central place and then parts of the app can register its
-paths relatively to a given subrouter.
-
-There's one more thing about subroutes. When a subrouter has a path prefix,
-the inner routes use it as base for their paths:
-
-	r := mux.NewRouter()
-	s := r.PathPrefix("/products").Subrouter()
-	// "/products/"
-	s.HandleFunc("/", ProductsHandler)
-	// "/products/{key}/"
-	s.HandleFunc("/{key}/", ProductHandler)
-	// "/products/{key}/details"
-	s.HandleFunc("/{key}/details", ProductDetailsHandler)
-
-Now let's see how to build registered URLs.
-
-Routes can be named. All routes that define a name can have their URLs built,
-or "reversed". We define a name calling Name() on a route. For example:
-
-	r := mux.NewRouter()
-	r.HandleFunc("/articles/{category}/{id:[0-9]+}", ArticleHandler).
-	  Name("article")
-
-To build a URL, get the route and call the URL() method, passing a sequence of
-key/value pairs for the route variables. For the previous route, we would do:
-
-	url, err := r.Get("article").URL("category", "technology", "id", "42")
-
-...and the result will be a url.URL with the following path:
-
-	"/articles/technology/42"
-
-This also works for host variables:
-
-	r := mux.NewRouter()
-	r.Host("{subdomain}.domain.com").
-	  Path("/articles/{category}/{id:[0-9]+}").
-	  HandlerFunc(ArticleHandler).
-	  Name("article")
-
-	// url.String() will be "http://news.domain.com/articles/technology/42"
-	url, err := r.Get("article").URL("subdomain", "news",
-	                                 "category", "technology",
-	                                 "id", "42")
-
-All variables defined in the route are required, and their values must
-conform to the corresponding patterns. These requirements guarantee that a
-generated URL will always match a registered route -- the only exception is
-for explicitly defined "build-only" routes which never match.
-
-Regex support also exists for matching Headers within a route. For example, we could do:
-
-	r.HeadersRegexp("Content-Type", "application/(text|json)")
-
-...and the route will match both requests with a Content-Type of `application/json` as well as
-`application/text`
-
-There's also a way to build only the URL host or path for a route:
-use the methods URLHost() or URLPath() instead. For the previous route,
-we would do:
-
-	// "http://news.domain.com/"
-	host, err := r.Get("article").URLHost("subdomain", "news")
-
-	// "/articles/technology/42"
-	path, err := r.Get("article").URLPath("category", "technology", "id", "42")
-
-And if you use subrouters, host and path defined separately can be built
-as well:
-
-	r := mux.NewRouter()
-	s := r.Host("{subdomain}.domain.com").Subrouter()
-	s.Path("/articles/{category}/{id:[0-9]+}").
-	  HandlerFunc(ArticleHandler).
-	  Name("article")
-
-	// "http://news.domain.com/articles/technology/42"
-	url, err := r.Get("article").URL("subdomain", "news",
-	                                 "category", "technology",
-	                                 "id", "42")
-
-## Full Example
-
-Here's a complete, runnable example of a small mux based server:
-
-```go
-package main
-
-import (
-	"net/http"
-
-	"github.com/gorilla/mux"
-)
-
-func YourHandler(w http.ResponseWriter, r *http.Request) {
-	w.Write([]byte("Gorilla!\n"))
-}
-
-func main() {
-	r := mux.NewRouter()
-	// Routes consist of a path and a handler function.
-	r.HandleFunc("/", YourHandler)
-
-	// Bind to a port and pass our router in
-	http.ListenAndServe(":8000", r)
-}
-```
-
-## License
-
-BSD licensed. See the LICENSE file for details.
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/gorilla/mux/doc.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/gorilla/mux/doc.go
deleted file mode 100644
index 49798cb5c..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/gorilla/mux/doc.go
+++ /dev/null
@@ -1,206 +0,0 @@
-// Copyright 2012 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 gorilla/mux implements a request router and dispatcher.
-
-The name mux stands for "HTTP request multiplexer". Like the standard
-http.ServeMux, mux.Router matches incoming requests against a list of
-registered routes and calls a handler for the route that matches the URL
-or other conditions. The main features are:
-
-	* Requests can be matched based on URL host, path, path prefix, schemes,
-	  header and query values, HTTP methods or using custom matchers.
-	* URL hosts and paths can have variables with an optional regular
-	  expression.
-	* Registered URLs can be built, or "reversed", which helps maintaining
-	  references to resources.
-	* Routes can be used as subrouters: nested routes are only tested if the
-	  parent route matches. This is useful to define groups of routes that
-	  share common conditions like a host, a path prefix or other repeated
-	  attributes. As a bonus, this optimizes request matching.
-	* It implements the http.Handler interface so it is compatible with the
-	  standard http.ServeMux.
-
-Let's start registering a couple of URL paths and handlers:
-
-	func main() {
-		r := mux.NewRouter()
-		r.HandleFunc("/", HomeHandler)
-		r.HandleFunc("/products", ProductsHandler)
-		r.HandleFunc("/articles", ArticlesHandler)
-		http.Handle("/", r)
-	}
-
-Here we register three routes mapping URL paths to handlers. This is
-equivalent to how http.HandleFunc() works: if an incoming request URL matches
-one of the paths, the corresponding handler is called passing
-(http.ResponseWriter, *http.Request) as parameters.
-
-Paths can have variables. They are defined using the format {name} or
-{name:pattern}. If a regular expression pattern is not defined, the matched
-variable will be anything until the next slash. For example:
-
-	r := mux.NewRouter()
-	r.HandleFunc("/products/{key}", ProductHandler)
-	r.HandleFunc("/articles/{category}/", ArticlesCategoryHandler)
-	r.HandleFunc("/articles/{category}/{id:[0-9]+}", ArticleHandler)
-
-The names are used to create a map of route variables which can be retrieved
-calling mux.Vars():
-
-	vars := mux.Vars(request)
-	category := vars["category"]
-
-And this is all you need to know about the basic usage. More advanced options
-are explained below.
-
-Routes can also be restricted to a domain or subdomain. Just define a host
-pattern to be matched. They can also have variables:
-
-	r := mux.NewRouter()
-	// Only matches if domain is "www.example.com".
-	r.Host("www.example.com")
-	// Matches a dynamic subdomain.
-	r.Host("{subdomain:[a-z]+}.domain.com")
-
-There are several other matchers that can be added. To match path prefixes:
-
-	r.PathPrefix("/products/")
-
-...or HTTP methods:
-
-	r.Methods("GET", "POST")
-
-...or URL schemes:
-
-	r.Schemes("https")
-
-...or header values:
-
-	r.Headers("X-Requested-With", "XMLHttpRequest")
-
-...or query values:
-
-	r.Queries("key", "value")
-
-...or to use a custom matcher function:
-
-	r.MatcherFunc(func(r *http.Request, rm *RouteMatch) bool {
-		return r.ProtoMajor == 0
-	})
-
-...and finally, it is possible to combine several matchers in a single route:
-
-	r.HandleFunc("/products", ProductsHandler).
-	  Host("www.example.com").
-	  Methods("GET").
-	  Schemes("http")
-
-Setting the same matching conditions again and again can be boring, so we have
-a way to group several routes that share the same requirements.
-We call it "subrouting".
-
-For example, let's say we have several URLs that should only match when the
-host is "www.example.com". Create a route for that host and get a "subrouter"
-from it:
-
-	r := mux.NewRouter()
-	s := r.Host("www.example.com").Subrouter()
-
-Then register routes in the subrouter:
-
-	s.HandleFunc("/products/", ProductsHandler)
-	s.HandleFunc("/products/{key}", ProductHandler)
-	s.HandleFunc("/articles/{category}/{id:[0-9]+}"), ArticleHandler)
-
-The three URL paths we registered above will only be tested if the domain is
-"www.example.com", because the subrouter is tested first. This is not
-only convenient, but also optimizes request matching. You can create
-subrouters combining any attribute matchers accepted by a route.
-
-Subrouters can be used to create domain or path "namespaces": you define
-subrouters in a central place and then parts of the app can register its
-paths relatively to a given subrouter.
-
-There's one more thing about subroutes. When a subrouter has a path prefix,
-the inner routes use it as base for their paths:
-
-	r := mux.NewRouter()
-	s := r.PathPrefix("/products").Subrouter()
-	// "/products/"
-	s.HandleFunc("/", ProductsHandler)
-	// "/products/{key}/"
-	s.HandleFunc("/{key}/", ProductHandler)
-	// "/products/{key}/details"
-	s.HandleFunc("/{key}/details", ProductDetailsHandler)
-
-Now let's see how to build registered URLs.
-
-Routes can be named. All routes that define a name can have their URLs built,
-or "reversed". We define a name calling Name() on a route. For example:
-
-	r := mux.NewRouter()
-	r.HandleFunc("/articles/{category}/{id:[0-9]+}", ArticleHandler).
-	  Name("article")
-
-To build a URL, get the route and call the URL() method, passing a sequence of
-key/value pairs for the route variables. For the previous route, we would do:
-
-	url, err := r.Get("article").URL("category", "technology", "id", "42")
-
-...and the result will be a url.URL with the following path:
-
-	"/articles/technology/42"
-
-This also works for host variables:
-
-	r := mux.NewRouter()
-	r.Host("{subdomain}.domain.com").
-	  Path("/articles/{category}/{id:[0-9]+}").
-	  HandlerFunc(ArticleHandler).
-	  Name("article")
-
-	// url.String() will be "http://news.domain.com/articles/technology/42"
-	url, err := r.Get("article").URL("subdomain", "news",
-	                                 "category", "technology",
-	                                 "id", "42")
-
-All variables defined in the route are required, and their values must
-conform to the corresponding patterns. These requirements guarantee that a
-generated URL will always match a registered route -- the only exception is
-for explicitly defined "build-only" routes which never match.
-
-Regex support also exists for matching Headers within a route. For example, we could do:
-
-	r.HeadersRegexp("Content-Type", "application/(text|json)")
-
-...and the route will match both requests with a Content-Type of `application/json` as well as
-`application/text`
-
-There's also a way to build only the URL host or path for a route:
-use the methods URLHost() or URLPath() instead. For the previous route,
-we would do:
-
-	// "http://news.domain.com/"
-	host, err := r.Get("article").URLHost("subdomain", "news")
-
-	// "/articles/technology/42"
-	path, err := r.Get("article").URLPath("category", "technology", "id", "42")
-
-And if you use subrouters, host and path defined separately can be built
-as well:
-
-	r := mux.NewRouter()
-	s := r.Host("{subdomain}.domain.com").Subrouter()
-	s.Path("/articles/{category}/{id:[0-9]+}").
-	  HandlerFunc(ArticleHandler).
-	  Name("article")
-
-	// "http://news.domain.com/articles/technology/42"
-	url, err := r.Get("article").URL("subdomain", "news",
-	                                 "category", "technology",
-	                                 "id", "42")
-*/
-package mux
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/gorilla/mux/mux.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/gorilla/mux/mux.go
deleted file mode 100644
index 21c9d9ae7..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/gorilla/mux/mux.go
+++ /dev/null
@@ -1,474 +0,0 @@
-// Copyright 2012 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 mux
-
-import (
-	"errors"
-	"fmt"
-	"net/http"
-	"path"
-	"regexp"
-
-	"github.com/fsouza/go-dockerclient/external/github.com/gorilla/context"
-)
-
-// NewRouter returns a new router instance.
-func NewRouter() *Router {
-	return &Router{namedRoutes: make(map[string]*Route), KeepContext: false}
-}
-
-// Router registers routes to be matched and dispatches a handler.
-//
-// It implements the http.Handler interface, so it can be registered to serve
-// requests:
-//
-//     var router = mux.NewRouter()
-//
-//     func main() {
-//         http.Handle("/", router)
-//     }
-//
-// Or, for Google App Engine, register it in a init() function:
-//
-//     func init() {
-//         http.Handle("/", router)
-//     }
-//
-// This will send all incoming requests to the router.
-type Router struct {
-	// Configurable Handler to be used when no route matches.
-	NotFoundHandler http.Handler
-	// Parent route, if this is a subrouter.
-	parent parentRoute
-	// Routes to be matched, in order.
-	routes []*Route
-	// Routes by name for URL building.
-	namedRoutes map[string]*Route
-	// See Router.StrictSlash(). This defines the flag for new routes.
-	strictSlash bool
-	// If true, do not clear the request context after handling the request
-	KeepContext bool
-}
-
-// Match matches registered routes against the request.
-func (r *Router) Match(req *http.Request, match *RouteMatch) bool {
-	for _, route := range r.routes {
-		if route.Match(req, match) {
-			return true
-		}
-	}
-	return false
-}
-
-// ServeHTTP dispatches the handler registered in the matched route.
-//
-// When there is a match, the route variables can be retrieved calling
-// mux.Vars(request).
-func (r *Router) ServeHTTP(w http.ResponseWriter, req *http.Request) {
-	// Clean path to canonical form and redirect.
-	if p := cleanPath(req.URL.Path); p != req.URL.Path {
-
-		// Added 3 lines (Philip Schlump) - It was dropping the query string and #whatever from query.
-		// This matches with fix in go 1.2 r.c. 4 for same problem.  Go Issue:
-		// http://code.google.com/p/go/issues/detail?id=5252
-		url := *req.URL
-		url.Path = p
-		p = url.String()
-
-		w.Header().Set("Location", p)
-		w.WriteHeader(http.StatusMovedPermanently)
-		return
-	}
-	var match RouteMatch
-	var handler http.Handler
-	if r.Match(req, &match) {
-		handler = match.Handler
-		setVars(req, match.Vars)
-		setCurrentRoute(req, match.Route)
-	}
-	if handler == nil {
-		handler = r.NotFoundHandler
-		if handler == nil {
-			handler = http.NotFoundHandler()
-		}
-	}
-	if !r.KeepContext {
-		defer context.Clear(req)
-	}
-	handler.ServeHTTP(w, req)
-}
-
-// Get returns a route registered with the given name.
-func (r *Router) Get(name string) *Route {
-	return r.getNamedRoutes()[name]
-}
-
-// GetRoute returns a route registered with the given name. This method
-// was renamed to Get() and remains here for backwards compatibility.
-func (r *Router) GetRoute(name string) *Route {
-	return r.getNamedRoutes()[name]
-}
-
-// StrictSlash defines the trailing slash behavior for new routes. The initial
-// value is false.
-//
-// When true, if the route path is "/path/", accessing "/path" will redirect
-// to the former and vice versa. In other words, your application will always
-// see the path as specified in the route.
-//
-// When false, if the route path is "/path", accessing "/path/" will not match
-// this route and vice versa.
-//
-// Special case: when a route sets a path prefix using the PathPrefix() method,
-// strict slash is ignored for that route because the redirect behavior can't
-// be determined from a prefix alone. However, any subrouters created from that
-// route inherit the original StrictSlash setting.
-func (r *Router) StrictSlash(value bool) *Router {
-	r.strictSlash = value
-	return r
-}
-
-// ----------------------------------------------------------------------------
-// parentRoute
-// ----------------------------------------------------------------------------
-
-// getNamedRoutes returns the map where named routes are registered.
-func (r *Router) getNamedRoutes() map[string]*Route {
-	if r.namedRoutes == nil {
-		if r.parent != nil {
-			r.namedRoutes = r.parent.getNamedRoutes()
-		} else {
-			r.namedRoutes = make(map[string]*Route)
-		}
-	}
-	return r.namedRoutes
-}
-
-// getRegexpGroup returns regexp definitions from the parent route, if any.
-func (r *Router) getRegexpGroup() *routeRegexpGroup {
-	if r.parent != nil {
-		return r.parent.getRegexpGroup()
-	}
-	return nil
-}
-
-func (r *Router) buildVars(m map[string]string) map[string]string {
-	if r.parent != nil {
-		m = r.parent.buildVars(m)
-	}
-	return m
-}
-
-// ----------------------------------------------------------------------------
-// Route factories
-// ----------------------------------------------------------------------------
-
-// NewRoute registers an empty route.
-func (r *Router) NewRoute() *Route {
-	route := &Route{parent: r, strictSlash: r.strictSlash}
-	r.routes = append(r.routes, route)
-	return route
-}
-
-// Handle registers a new route with a matcher for the URL path.
-// See Route.Path() and Route.Handler().
-func (r *Router) Handle(path string, handler http.Handler) *Route {
-	return r.NewRoute().Path(path).Handler(handler)
-}
-
-// HandleFunc registers a new route with a matcher for the URL path.
-// See Route.Path() and Route.HandlerFunc().
-func (r *Router) HandleFunc(path string, f func(http.ResponseWriter,
-	*http.Request)) *Route {
-	return r.NewRoute().Path(path).HandlerFunc(f)
-}
-
-// Headers registers a new route with a matcher for request header values.
-// See Route.Headers().
-func (r *Router) Headers(pairs ...string) *Route {
-	return r.NewRoute().Headers(pairs...)
-}
-
-// Host registers a new route with a matcher for the URL host.
-// See Route.Host().
-func (r *Router) Host(tpl string) *Route {
-	return r.NewRoute().Host(tpl)
-}
-
-// MatcherFunc registers a new route with a custom matcher function.
-// See Route.MatcherFunc().
-func (r *Router) MatcherFunc(f MatcherFunc) *Route {
-	return r.NewRoute().MatcherFunc(f)
-}
-
-// Methods registers a new route with a matcher for HTTP methods.
-// See Route.Methods().
-func (r *Router) Methods(methods ...string) *Route {
-	return r.NewRoute().Methods(methods...)
-}
-
-// Path registers a new route with a matcher for the URL path.
-// See Route.Path().
-func (r *Router) Path(tpl string) *Route {
-	return r.NewRoute().Path(tpl)
-}
-
-// PathPrefix registers a new route with a matcher for the URL path prefix.
-// See Route.PathPrefix().
-func (r *Router) PathPrefix(tpl string) *Route {
-	return r.NewRoute().PathPrefix(tpl)
-}
-
-// Queries registers a new route with a matcher for URL query values.
-// See Route.Queries().
-func (r *Router) Queries(pairs ...string) *Route {
-	return r.NewRoute().Queries(pairs...)
-}
-
-// Schemes registers a new route with a matcher for URL schemes.
-// See Route.Schemes().
-func (r *Router) Schemes(schemes ...string) *Route {
-	return r.NewRoute().Schemes(schemes...)
-}
-
-// BuildVars registers a new route with a custom function for modifying
-// route variables before building a URL.
-func (r *Router) BuildVarsFunc(f BuildVarsFunc) *Route {
-	return r.NewRoute().BuildVarsFunc(f)
-}
-
-// Walk walks the router and all its sub-routers, calling walkFn for each route
-// in the tree. The routes are walked in the order they were added. Sub-routers
-// are explored depth-first.
-func (r *Router) Walk(walkFn WalkFunc) error {
-	return r.walk(walkFn, []*Route{})
-}
-
-// SkipRouter is used as a return value from WalkFuncs to indicate that the
-// router that walk is about to descend down to should be skipped.
-var SkipRouter = errors.New("skip this router")
-
-// WalkFunc is the type of the function called for each route visited by Walk.
-// At every invocation, it is given the current route, and the current router,
-// and a list of ancestor routes that lead to the current route.
-type WalkFunc func(route *Route, router *Router, ancestors []*Route) error
-
-func (r *Router) walk(walkFn WalkFunc, ancestors []*Route) error {
-	for _, t := range r.routes {
-		if t.regexp == nil || t.regexp.path == nil || t.regexp.path.template == "" {
-			continue
-		}
-
-		err := walkFn(t, r, ancestors)
-		if err == SkipRouter {
-			continue
-		}
-		for _, sr := range t.matchers {
-			if h, ok := sr.(*Router); ok {
-				err := h.walk(walkFn, ancestors)
-				if err != nil {
-					return err
-				}
-			}
-		}
-		if h, ok := t.handler.(*Router); ok {
-			ancestors = append(ancestors, t)
-			err := h.walk(walkFn, ancestors)
-			if err != nil {
-				return err
-			}
-			ancestors = ancestors[:len(ancestors)-1]
-		}
-	}
-	return nil
-}
-
-// ----------------------------------------------------------------------------
-// Context
-// ----------------------------------------------------------------------------
-
-// RouteMatch stores information about a matched route.
-type RouteMatch struct {
-	Route   *Route
-	Handler http.Handler
-	Vars    map[string]string
-}
-
-type contextKey int
-
-const (
-	varsKey contextKey = iota
-	routeKey
-)
-
-// Vars returns the route variables for the current request, if any.
-func Vars(r *http.Request) map[string]string {
-	if rv := context.Get(r, varsKey); rv != nil {
-		return rv.(map[string]string)
-	}
-	return nil
-}
-
-// CurrentRoute returns the matched route for the current request, if any.
-// This only works when called inside the handler of the matched route
-// because the matched route is stored in the request context which is cleared
-// after the handler returns, unless the KeepContext option is set on the
-// Router.
-func CurrentRoute(r *http.Request) *Route {
-	if rv := context.Get(r, routeKey); rv != nil {
-		return rv.(*Route)
-	}
-	return nil
-}
-
-func setVars(r *http.Request, val interface{}) {
-	context.Set(r, varsKey, val)
-}
-
-func setCurrentRoute(r *http.Request, val interface{}) {
-	context.Set(r, routeKey, val)
-}
-
-// ----------------------------------------------------------------------------
-// Helpers
-// ----------------------------------------------------------------------------
-
-// cleanPath returns the canonical path for p, eliminating . and .. elements.
-// Borrowed from the net/http package.
-func cleanPath(p string) string {
-	if p == "" {
-		return "/"
-	}
-	if p[0] != '/' {
-		p = "/" + p
-	}
-	np := path.Clean(p)
-	// path.Clean removes trailing slash except for root;
-	// put the trailing slash back if necessary.
-	if p[len(p)-1] == '/' && np != "/" {
-		np += "/"
-	}
-	return np
-}
-
-// uniqueVars returns an error if two slices contain duplicated strings.
-func uniqueVars(s1, s2 []string) error {
-	for _, v1 := range s1 {
-		for _, v2 := range s2 {
-			if v1 == v2 {
-				return fmt.Errorf("mux: duplicated route variable %q", v2)
-			}
-		}
-	}
-	return nil
-}
-
-// checkPairs returns the count of strings passed in, and an error if
-// the count is not an even number.
-func checkPairs(pairs ...string) (int, error) {
-	length := len(pairs)
-	if length%2 != 0 {
-		return length, fmt.Errorf(
-			"mux: number of parameters must be multiple of 2, got %v", pairs)
-	}
-	return length, nil
-}
-
-// mapFromPairsToString converts variadic string parameters to a
-// string to string map.
-func mapFromPairsToString(pairs ...string) (map[string]string, error) {
-	length, err := checkPairs(pairs...)
-	if err != nil {
-		return nil, err
-	}
-	m := make(map[string]string, length/2)
-	for i := 0; i < length; i += 2 {
-		m[pairs[i]] = pairs[i+1]
-	}
-	return m, nil
-}
-
-// mapFromPairsToRegex converts variadic string paramers to a
-// string to regex map.
-func mapFromPairsToRegex(pairs ...string) (map[string]*regexp.Regexp, error) {
-	length, err := checkPairs(pairs...)
-	if err != nil {
-		return nil, err
-	}
-	m := make(map[string]*regexp.Regexp, length/2)
-	for i := 0; i < length; i += 2 {
-		regex, err := regexp.Compile(pairs[i+1])
-		if err != nil {
-			return nil, err
-		}
-		m[pairs[i]] = regex
-	}
-	return m, nil
-}
-
-// matchInArray returns true if the given string value is in the array.
-func matchInArray(arr []string, value string) bool {
-	for _, v := range arr {
-		if v == value {
-			return true
-		}
-	}
-	return false
-}
-
-// matchMapWithString returns true if the given key/value pairs exist in a given map.
-func matchMapWithString(toCheck map[string]string, toMatch map[string][]string, canonicalKey bool) bool {
-	for k, v := range toCheck {
-		// Check if key exists.
-		if canonicalKey {
-			k = http.CanonicalHeaderKey(k)
-		}
-		if values := toMatch[k]; values == nil {
-			return false
-		} else if v != "" {
-			// If value was defined as an empty string we only check that the
-			// key exists. Otherwise we also check for equality.
-			valueExists := false
-			for _, value := range values {
-				if v == value {
-					valueExists = true
-					break
-				}
-			}
-			if !valueExists {
-				return false
-			}
-		}
-	}
-	return true
-}
-
-// matchMapWithRegex returns true if the given key/value pairs exist in a given map compiled against
-// the given regex
-func matchMapWithRegex(toCheck map[string]*regexp.Regexp, toMatch map[string][]string, canonicalKey bool) bool {
-	for k, v := range toCheck {
-		// Check if key exists.
-		if canonicalKey {
-			k = http.CanonicalHeaderKey(k)
-		}
-		if values := toMatch[k]; values == nil {
-			return false
-		} else if v != nil {
-			// If value was defined as an empty string we only check that the
-			// key exists. Otherwise we also check for equality.
-			valueExists := false
-			for _, value := range values {
-				if v.MatchString(value) {
-					valueExists = true
-					break
-				}
-			}
-			if !valueExists {
-				return false
-			}
-		}
-	}
-	return true
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/gorilla/mux/regexp.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/gorilla/mux/regexp.go
deleted file mode 100644
index 06728dd54..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/gorilla/mux/regexp.go
+++ /dev/null
@@ -1,317 +0,0 @@
-// Copyright 2012 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 mux
-
-import (
-	"bytes"
-	"fmt"
-	"net/http"
-	"net/url"
-	"regexp"
-	"strconv"
-	"strings"
-)
-
-// newRouteRegexp parses a route template and returns a routeRegexp,
-// used to match a host, a path or a query string.
-//
-// It will extract named variables, assemble a regexp to be matched, create
-// a "reverse" template to build URLs and compile regexps to validate variable
-// values used in URL building.
-//
-// Previously we accepted only Python-like identifiers for variable
-// names ([a-zA-Z_][a-zA-Z0-9_]*), but currently the only restriction is that
-// name and pattern can't be empty, and names can't contain a colon.
-func newRouteRegexp(tpl string, matchHost, matchPrefix, matchQuery, strictSlash bool) (*routeRegexp, error) {
-	// Check if it is well-formed.
-	idxs, errBraces := braceIndices(tpl)
-	if errBraces != nil {
-		return nil, errBraces
-	}
-	// Backup the original.
-	template := tpl
-	// Now let's parse it.
-	defaultPattern := "[^/]+"
-	if matchQuery {
-		defaultPattern = "[^?&]*"
-	} else if matchHost {
-		defaultPattern = "[^.]+"
-		matchPrefix = false
-	}
-	// Only match strict slash if not matching
-	if matchPrefix || matchHost || matchQuery {
-		strictSlash = false
-	}
-	// Set a flag for strictSlash.
-	endSlash := false
-	if strictSlash && strings.HasSuffix(tpl, "/") {
-		tpl = tpl[:len(tpl)-1]
-		endSlash = true
-	}
-	varsN := make([]string, len(idxs)/2)
-	varsR := make([]*regexp.Regexp, len(idxs)/2)
-	pattern := bytes.NewBufferString("")
-	pattern.WriteByte('^')
-	reverse := bytes.NewBufferString("")
-	var end int
-	var err error
-	for i := 0; i < len(idxs); i += 2 {
-		// Set all values we are interested in.
-		raw := tpl[end:idxs[i]]
-		end = idxs[i+1]
-		parts := strings.SplitN(tpl[idxs[i]+1:end-1], ":", 2)
-		name := parts[0]
-		patt := defaultPattern
-		if len(parts) == 2 {
-			patt = parts[1]
-		}
-		// Name or pattern can't be empty.
-		if name == "" || patt == "" {
-			return nil, fmt.Errorf("mux: missing name or pattern in %q",
-				tpl[idxs[i]:end])
-		}
-		// Build the regexp pattern.
-		varIdx := i / 2
-		fmt.Fprintf(pattern, "%s(?P<%s>%s)", regexp.QuoteMeta(raw), varGroupName(varIdx), patt)
-		// Build the reverse template.
-		fmt.Fprintf(reverse, "%s%%s", raw)
-
-		// Append variable name and compiled pattern.
-		varsN[varIdx] = name
-		varsR[varIdx], err = regexp.Compile(fmt.Sprintf("^%s$", patt))
-		if err != nil {
-			return nil, err
-		}
-	}
-	// Add the remaining.
-	raw := tpl[end:]
-	pattern.WriteString(regexp.QuoteMeta(raw))
-	if strictSlash {
-		pattern.WriteString("[/]?")
-	}
-	if matchQuery {
-		// Add the default pattern if the query value is empty
-		if queryVal := strings.SplitN(template, "=", 2)[1]; queryVal == "" {
-			pattern.WriteString(defaultPattern)
-		}
-	}
-	if !matchPrefix {
-		pattern.WriteByte('$')
-	}
-	reverse.WriteString(raw)
-	if endSlash {
-		reverse.WriteByte('/')
-	}
-	// Compile full regexp.
-	reg, errCompile := regexp.Compile(pattern.String())
-	if errCompile != nil {
-		return nil, errCompile
-	}
-	// Done!
-	return &routeRegexp{
-		template:    template,
-		matchHost:   matchHost,
-		matchQuery:  matchQuery,
-		strictSlash: strictSlash,
-		regexp:      reg,
-		reverse:     reverse.String(),
-		varsN:       varsN,
-		varsR:       varsR,
-	}, nil
-}
-
-// routeRegexp stores a regexp to match a host or path and information to
-// collect and validate route variables.
-type routeRegexp struct {
-	// The unmodified template.
-	template string
-	// True for host match, false for path or query string match.
-	matchHost bool
-	// True for query string match, false for path and host match.
-	matchQuery bool
-	// The strictSlash value defined on the route, but disabled if PathPrefix was used.
-	strictSlash bool
-	// Expanded regexp.
-	regexp *regexp.Regexp
-	// Reverse template.
-	reverse string
-	// Variable names.
-	varsN []string
-	// Variable regexps (validators).
-	varsR []*regexp.Regexp
-}
-
-// Match matches the regexp against the URL host or path.
-func (r *routeRegexp) Match(req *http.Request, match *RouteMatch) bool {
-	if !r.matchHost {
-		if r.matchQuery {
-			return r.matchQueryString(req)
-		} else {
-			return r.regexp.MatchString(req.URL.Path)
-		}
-	}
-	return r.regexp.MatchString(getHost(req))
-}
-
-// url builds a URL part using the given values.
-func (r *routeRegexp) url(values map[string]string) (string, error) {
-	urlValues := make([]interface{}, len(r.varsN))
-	for k, v := range r.varsN {
-		value, ok := values[v]
-		if !ok {
-			return "", fmt.Errorf("mux: missing route variable %q", v)
-		}
-		urlValues[k] = value
-	}
-	rv := fmt.Sprintf(r.reverse, urlValues...)
-	if !r.regexp.MatchString(rv) {
-		// The URL is checked against the full regexp, instead of checking
-		// individual variables. This is faster but to provide a good error
-		// message, we check individual regexps if the URL doesn't match.
-		for k, v := range r.varsN {
-			if !r.varsR[k].MatchString(values[v]) {
-				return "", fmt.Errorf(
-					"mux: variable %q doesn't match, expected %q", values[v],
-					r.varsR[k].String())
-			}
-		}
-	}
-	return rv, nil
-}
-
-// getUrlQuery returns a single query parameter from a request URL.
-// For a URL with foo=bar&baz=ding, we return only the relevant key
-// value pair for the routeRegexp.
-func (r *routeRegexp) getUrlQuery(req *http.Request) string {
-	if !r.matchQuery {
-		return ""
-	}
-	templateKey := strings.SplitN(r.template, "=", 2)[0]
-	for key, vals := range req.URL.Query() {
-		if key == templateKey && len(vals) > 0 {
-			return key + "=" + vals[0]
-		}
-	}
-	return ""
-}
-
-func (r *routeRegexp) matchQueryString(req *http.Request) bool {
-	return r.regexp.MatchString(r.getUrlQuery(req))
-}
-
-// braceIndices returns the first level curly brace indices from a string.
-// It returns an error in case of unbalanced braces.
-func braceIndices(s string) ([]int, error) {
-	var level, idx int
-	idxs := make([]int, 0)
-	for i := 0; i < len(s); i++ {
-		switch s[i] {
-		case '{':
-			if level++; level == 1 {
-				idx = i
-			}
-		case '}':
-			if level--; level == 0 {
-				idxs = append(idxs, idx, i+1)
-			} else if level < 0 {
-				return nil, fmt.Errorf("mux: unbalanced braces in %q", s)
-			}
-		}
-	}
-	if level != 0 {
-		return nil, fmt.Errorf("mux: unbalanced braces in %q", s)
-	}
-	return idxs, nil
-}
-
-// varGroupName builds a capturing group name for the indexed variable.
-func varGroupName(idx int) string {
-	return "v" + strconv.Itoa(idx)
-}
-
-// ----------------------------------------------------------------------------
-// routeRegexpGroup
-// ----------------------------------------------------------------------------
-
-// routeRegexpGroup groups the route matchers that carry variables.
-type routeRegexpGroup struct {
-	host    *routeRegexp
-	path    *routeRegexp
-	queries []*routeRegexp
-}
-
-// setMatch extracts the variables from the URL once a route matches.
-func (v *routeRegexpGroup) setMatch(req *http.Request, m *RouteMatch, r *Route) {
-	// Store host variables.
-	if v.host != nil {
-		hostVars := v.host.regexp.FindStringSubmatch(getHost(req))
-		if hostVars != nil {
-			subexpNames := v.host.regexp.SubexpNames()
-			varName := 0
-			for i, name := range subexpNames[1:] {
-				if name != "" && name == varGroupName(varName) {
-					m.Vars[v.host.varsN[varName]] = hostVars[i+1]
-					varName++
-				}
-			}
-		}
-	}
-	// Store path variables.
-	if v.path != nil {
-		pathVars := v.path.regexp.FindStringSubmatch(req.URL.Path)
-		if pathVars != nil {
-			subexpNames := v.path.regexp.SubexpNames()
-			varName := 0
-			for i, name := range subexpNames[1:] {
-				if name != "" && name == varGroupName(varName) {
-					m.Vars[v.path.varsN[varName]] = pathVars[i+1]
-					varName++
-				}
-			}
-			// Check if we should redirect.
-			if v.path.strictSlash {
-				p1 := strings.HasSuffix(req.URL.Path, "/")
-				p2 := strings.HasSuffix(v.path.template, "/")
-				if p1 != p2 {
-					u, _ := url.Parse(req.URL.String())
-					if p1 {
-						u.Path = u.Path[:len(u.Path)-1]
-					} else {
-						u.Path += "/"
-					}
-					m.Handler = http.RedirectHandler(u.String(), 301)
-				}
-			}
-		}
-	}
-	// Store query string variables.
-	for _, q := range v.queries {
-		queryVars := q.regexp.FindStringSubmatch(q.getUrlQuery(req))
-		if queryVars != nil {
-			subexpNames := q.regexp.SubexpNames()
-			varName := 0
-			for i, name := range subexpNames[1:] {
-				if name != "" && name == varGroupName(varName) {
-					m.Vars[q.varsN[varName]] = queryVars[i+1]
-					varName++
-				}
-			}
-		}
-	}
-}
-
-// getHost tries its best to return the request host.
-func getHost(r *http.Request) string {
-	if r.URL.IsAbs() {
-		return r.URL.Host
-	}
-	host := r.Host
-	// Slice off any port information.
-	if i := strings.Index(host, ":"); i != -1 {
-		host = host[:i]
-	}
-	return host
-
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/gorilla/mux/route.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/gorilla/mux/route.go
deleted file mode 100644
index 890130460..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/gorilla/mux/route.go
+++ /dev/null
@@ -1,603 +0,0 @@
-// Copyright 2012 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 mux
-
-import (
-	"errors"
-	"fmt"
-	"net/http"
-	"net/url"
-	"regexp"
-	"strings"
-)
-
-// Route stores information to match a request and build URLs.
-type Route struct {
-	// Parent where the route was registered (a Router).
-	parent parentRoute
-	// Request handler for the route.
-	handler http.Handler
-	// List of matchers.
-	matchers []matcher
-	// Manager for the variables from host and path.
-	regexp *routeRegexpGroup
-	// If true, when the path pattern is "/path/", accessing "/path" will
-	// redirect to the former and vice versa.
-	strictSlash bool
-	// If true, this route never matches: it is only used to build URLs.
-	buildOnly bool
-	// The name used to build URLs.
-	name string
-	// Error resulted from building a route.
-	err error
-
-	buildVarsFunc BuildVarsFunc
-}
-
-// Match matches the route against the request.
-func (r *Route) Match(req *http.Request, match *RouteMatch) bool {
-	if r.buildOnly || r.err != nil {
-		return false
-	}
-	// Match everything.
-	for _, m := range r.matchers {
-		if matched := m.Match(req, match); !matched {
-			return false
-		}
-	}
-	// Yay, we have a match. Let's collect some info about it.
-	if match.Route == nil {
-		match.Route = r
-	}
-	if match.Handler == nil {
-		match.Handler = r.handler
-	}
-	if match.Vars == nil {
-		match.Vars = make(map[string]string)
-	}
-	// Set variables.
-	if r.regexp != nil {
-		r.regexp.setMatch(req, match, r)
-	}
-	return true
-}
-
-// ----------------------------------------------------------------------------
-// Route attributes
-// ----------------------------------------------------------------------------
-
-// GetError returns an error resulted from building the route, if any.
-func (r *Route) GetError() error {
-	return r.err
-}
-
-// BuildOnly sets the route to never match: it is only used to build URLs.
-func (r *Route) BuildOnly() *Route {
-	r.buildOnly = true
-	return r
-}
-
-// Handler --------------------------------------------------------------------
-
-// Handler sets a handler for the route.
-func (r *Route) Handler(handler http.Handler) *Route {
-	if r.err == nil {
-		r.handler = handler
-	}
-	return r
-}
-
-// HandlerFunc sets a handler function for the route.
-func (r *Route) HandlerFunc(f func(http.ResponseWriter, *http.Request)) *Route {
-	return r.Handler(http.HandlerFunc(f))
-}
-
-// GetHandler returns the handler for the route, if any.
-func (r *Route) GetHandler() http.Handler {
-	return r.handler
-}
-
-// Name -----------------------------------------------------------------------
-
-// Name sets the name for the route, used to build URLs.
-// If the name was registered already it will be overwritten.
-func (r *Route) Name(name string) *Route {
-	if r.name != "" {
-		r.err = fmt.Errorf("mux: route already has name %q, can't set %q",
-			r.name, name)
-	}
-	if r.err == nil {
-		r.name = name
-		r.getNamedRoutes()[name] = r
-	}
-	return r
-}
-
-// GetName returns the name for the route, if any.
-func (r *Route) GetName() string {
-	return r.name
-}
-
-// ----------------------------------------------------------------------------
-// Matchers
-// ----------------------------------------------------------------------------
-
-// matcher types try to match a request.
-type matcher interface {
-	Match(*http.Request, *RouteMatch) bool
-}
-
-// addMatcher adds a matcher to the route.
-func (r *Route) addMatcher(m matcher) *Route {
-	if r.err == nil {
-		r.matchers = append(r.matchers, m)
-	}
-	return r
-}
-
-// addRegexpMatcher adds a host or path matcher and builder to a route.
-func (r *Route) addRegexpMatcher(tpl string, matchHost, matchPrefix, matchQuery bool) error {
-	if r.err != nil {
-		return r.err
-	}
-	r.regexp = r.getRegexpGroup()
-	if !matchHost && !matchQuery {
-		if len(tpl) == 0 || tpl[0] != '/' {
-			return fmt.Errorf("mux: path must start with a slash, got %q", tpl)
-		}
-		if r.regexp.path != nil {
-			tpl = strings.TrimRight(r.regexp.path.template, "/") + tpl
-		}
-	}
-	rr, err := newRouteRegexp(tpl, matchHost, matchPrefix, matchQuery, r.strictSlash)
-	if err != nil {
-		return err
-	}
-	for _, q := range r.regexp.queries {
-		if err = uniqueVars(rr.varsN, q.varsN); err != nil {
-			return err
-		}
-	}
-	if matchHost {
-		if r.regexp.path != nil {
-			if err = uniqueVars(rr.varsN, r.regexp.path.varsN); err != nil {
-				return err
-			}
-		}
-		r.regexp.host = rr
-	} else {
-		if r.regexp.host != nil {
-			if err = uniqueVars(rr.varsN, r.regexp.host.varsN); err != nil {
-				return err
-			}
-		}
-		if matchQuery {
-			r.regexp.queries = append(r.regexp.queries, rr)
-		} else {
-			r.regexp.path = rr
-		}
-	}
-	r.addMatcher(rr)
-	return nil
-}
-
-// Headers --------------------------------------------------------------------
-
-// headerMatcher matches the request against header values.
-type headerMatcher map[string]string
-
-func (m headerMatcher) Match(r *http.Request, match *RouteMatch) bool {
-	return matchMapWithString(m, r.Header, true)
-}
-
-// Headers adds a matcher for request header values.
-// It accepts a sequence of key/value pairs to be matched. For example:
-//
-//     r := mux.NewRouter()
-//     r.Headers("Content-Type", "application/json",
-//               "X-Requested-With", "XMLHttpRequest")
-//
-// The above route will only match if both request header values match.
-// Alternatively, you can provide a regular expression and match the header as follows:
-//
-//     r.Headers("Content-Type", "application/(text|json)",
-//               "X-Requested-With", "XMLHttpRequest")
-//
-// The above route will the same as the previous example, with the addition of matching
-// application/text as well.
-//
-// It the value is an empty string, it will match any value if the key is set.
-func (r *Route) Headers(pairs ...string) *Route {
-	if r.err == nil {
-		var headers map[string]string
-		headers, r.err = mapFromPairsToString(pairs...)
-		return r.addMatcher(headerMatcher(headers))
-	}
-	return r
-}
-
-// headerRegexMatcher matches the request against the route given a regex for the header
-type headerRegexMatcher map[string]*regexp.Regexp
-
-func (m headerRegexMatcher) Match(r *http.Request, match *RouteMatch) bool {
-	return matchMapWithRegex(m, r.Header, true)
-}
-
-// Regular expressions can be used with headers as well.
-// It accepts a sequence of key/value pairs, where the value has regex support. For example
-//     r := mux.NewRouter()
-//     r.HeadersRegexp("Content-Type", "application/(text|json)",
-//               "X-Requested-With", "XMLHttpRequest")
-//
-// The above route will only match if both the request header matches both regular expressions.
-// It the value is an empty string, it will match any value if the key is set.
-func (r *Route) HeadersRegexp(pairs ...string) *Route {
-	if r.err == nil {
-		var headers map[string]*regexp.Regexp
-		headers, r.err = mapFromPairsToRegex(pairs...)
-		return r.addMatcher(headerRegexMatcher(headers))
-	}
-	return r
-}
-
-// Host -----------------------------------------------------------------------
-
-// Host adds a matcher for the URL host.
-// It accepts a template with zero or more URL variables enclosed by {}.
-// Variables can define an optional regexp pattern to be matched:
-//
-// - {name} matches anything until the next dot.
-//
-// - {name:pattern} matches the given regexp pattern.
-//
-// For example:
-//
-//     r := mux.NewRouter()
-//     r.Host("www.example.com")
-//     r.Host("{subdomain}.domain.com")
-//     r.Host("{subdomain:[a-z]+}.domain.com")
-//
-// Variable names must be unique in a given route. They can be retrieved
-// calling mux.Vars(request).
-func (r *Route) Host(tpl string) *Route {
-	r.err = r.addRegexpMatcher(tpl, true, false, false)
-	return r
-}
-
-// MatcherFunc ----------------------------------------------------------------
-
-// MatcherFunc is the function signature used by custom matchers.
-type MatcherFunc func(*http.Request, *RouteMatch) bool
-
-func (m MatcherFunc) Match(r *http.Request, match *RouteMatch) bool {
-	return m(r, match)
-}
-
-// MatcherFunc adds a custom function to be used as request matcher.
-func (r *Route) MatcherFunc(f MatcherFunc) *Route {
-	return r.addMatcher(f)
-}
-
-// Methods --------------------------------------------------------------------
-
-// methodMatcher matches the request against HTTP methods.
-type methodMatcher []string
-
-func (m methodMatcher) Match(r *http.Request, match *RouteMatch) bool {
-	return matchInArray(m, r.Method)
-}
-
-// Methods adds a matcher for HTTP methods.
-// It accepts a sequence of one or more methods to be matched, e.g.:
-// "GET", "POST", "PUT".
-func (r *Route) Methods(methods ...string) *Route {
-	for k, v := range methods {
-		methods[k] = strings.ToUpper(v)
-	}
-	return r.addMatcher(methodMatcher(methods))
-}
-
-// Path -----------------------------------------------------------------------
-
-// Path adds a matcher for the URL path.
-// It accepts a template with zero or more URL variables enclosed by {}. The
-// template must start with a "/".
-// Variables can define an optional regexp pattern to be matched:
-//
-// - {name} matches anything until the next slash.
-//
-// - {name:pattern} matches the given regexp pattern.
-//
-// For example:
-//
-//     r := mux.NewRouter()
-//     r.Path("/products/").Handler(ProductsHandler)
-//     r.Path("/products/{key}").Handler(ProductsHandler)
-//     r.Path("/articles/{category}/{id:[0-9]+}").
-//       Handler(ArticleHandler)
-//
-// Variable names must be unique in a given route. They can be retrieved
-// calling mux.Vars(request).
-func (r *Route) Path(tpl string) *Route {
-	r.err = r.addRegexpMatcher(tpl, false, false, false)
-	return r
-}
-
-// PathPrefix -----------------------------------------------------------------
-
-// PathPrefix adds a matcher for the URL path prefix. This matches if the given
-// template is a prefix of the full URL path. See Route.Path() for details on
-// the tpl argument.
-//
-// Note that it does not treat slashes specially ("/foobar/" will be matched by
-// the prefix "/foo") so you may want to use a trailing slash here.
-//
-// Also note that the setting of Router.StrictSlash() has no effect on routes
-// with a PathPrefix matcher.
-func (r *Route) PathPrefix(tpl string) *Route {
-	r.err = r.addRegexpMatcher(tpl, false, true, false)
-	return r
-}
-
-// Query ----------------------------------------------------------------------
-
-// Queries adds a matcher for URL query values.
-// It accepts a sequence of key/value pairs. Values may define variables.
-// For example:
-//
-//     r := mux.NewRouter()
-//     r.Queries("foo", "bar", "id", "{id:[0-9]+}")
-//
-// The above route will only match if the URL contains the defined queries
-// values, e.g.: ?foo=bar&id=42.
-//
-// It the value is an empty string, it will match any value if the key is set.
-//
-// Variables can define an optional regexp pattern to be matched:
-//
-// - {name} matches anything until the next slash.
-//
-// - {name:pattern} matches the given regexp pattern.
-func (r *Route) Queries(pairs ...string) *Route {
-	length := len(pairs)
-	if length%2 != 0 {
-		r.err = fmt.Errorf(
-			"mux: number of parameters must be multiple of 2, got %v", pairs)
-		return nil
-	}
-	for i := 0; i < length; i += 2 {
-		if r.err = r.addRegexpMatcher(pairs[i]+"="+pairs[i+1], false, false, true); r.err != nil {
-			return r
-		}
-	}
-
-	return r
-}
-
-// Schemes --------------------------------------------------------------------
-
-// schemeMatcher matches the request against URL schemes.
-type schemeMatcher []string
-
-func (m schemeMatcher) Match(r *http.Request, match *RouteMatch) bool {
-	return matchInArray(m, r.URL.Scheme)
-}
-
-// Schemes adds a matcher for URL schemes.
-// It accepts a sequence of schemes to be matched, e.g.: "http", "https".
-func (r *Route) Schemes(schemes ...string) *Route {
-	for k, v := range schemes {
-		schemes[k] = strings.ToLower(v)
-	}
-	return r.addMatcher(schemeMatcher(schemes))
-}
-
-// BuildVarsFunc --------------------------------------------------------------
-
-// BuildVarsFunc is the function signature used by custom build variable
-// functions (which can modify route variables before a route's URL is built).
-type BuildVarsFunc func(map[string]string) map[string]string
-
-// BuildVarsFunc adds a custom function to be used to modify build variables
-// before a route's URL is built.
-func (r *Route) BuildVarsFunc(f BuildVarsFunc) *Route {
-	r.buildVarsFunc = f
-	return r
-}
-
-// Subrouter ------------------------------------------------------------------
-
-// Subrouter creates a subrouter for the route.
-//
-// It will test the inner routes only if the parent route matched. For example:
-//
-//     r := mux.NewRouter()
-//     s := r.Host("www.example.com").Subrouter()
-//     s.HandleFunc("/products/", ProductsHandler)
-//     s.HandleFunc("/products/{key}", ProductHandler)
-//     s.HandleFunc("/articles/{category}/{id:[0-9]+}"), ArticleHandler)
-//
-// Here, the routes registered in the subrouter won't be tested if the host
-// doesn't match.
-func (r *Route) Subrouter() *Router {
-	router := &Router{parent: r, strictSlash: r.strictSlash}
-	r.addMatcher(router)
-	return router
-}
-
-// ----------------------------------------------------------------------------
-// URL building
-// ----------------------------------------------------------------------------
-
-// URL builds a URL for the route.
-//
-// It accepts a sequence of key/value pairs for the route variables. For
-// example, given this route:
-//
-//     r := mux.NewRouter()
-//     r.HandleFunc("/articles/{category}/{id:[0-9]+}", ArticleHandler).
-//       Name("article")
-//
-// ...a URL for it can be built using:
-//
-//     url, err := r.Get("article").URL("category", "technology", "id", "42")
-//
-// ...which will return an url.URL with the following path:
-//
-//     "/articles/technology/42"
-//
-// This also works for host variables:
-//
-//     r := mux.NewRouter()
-//     r.Host("{subdomain}.domain.com").
-//       HandleFunc("/articles/{category}/{id:[0-9]+}", ArticleHandler).
-//       Name("article")
-//
-//     // url.String() will be "http://news.domain.com/articles/technology/42"
-//     url, err := r.Get("article").URL("subdomain", "news",
-//                                      "category", "technology",
-//                                      "id", "42")
-//
-// All variables defined in the route are required, and their values must
-// conform to the corresponding patterns.
-func (r *Route) URL(pairs ...string) (*url.URL, error) {
-	if r.err != nil {
-		return nil, r.err
-	}
-	if r.regexp == nil {
-		return nil, errors.New("mux: route doesn't have a host or path")
-	}
-	values, err := r.prepareVars(pairs...)
-	if err != nil {
-		return nil, err
-	}
-	var scheme, host, path string
-	if r.regexp.host != nil {
-		// Set a default scheme.
-		scheme = "http"
-		if host, err = r.regexp.host.url(values); err != nil {
-			return nil, err
-		}
-	}
-	if r.regexp.path != nil {
-		if path, err = r.regexp.path.url(values); err != nil {
-			return nil, err
-		}
-	}
-	return &url.URL{
-		Scheme: scheme,
-		Host:   host,
-		Path:   path,
-	}, nil
-}
-
-// URLHost builds the host part of the URL for a route. See Route.URL().
-//
-// The route must have a host defined.
-func (r *Route) URLHost(pairs ...string) (*url.URL, error) {
-	if r.err != nil {
-		return nil, r.err
-	}
-	if r.regexp == nil || r.regexp.host == nil {
-		return nil, errors.New("mux: route doesn't have a host")
-	}
-	values, err := r.prepareVars(pairs...)
-	if err != nil {
-		return nil, err
-	}
-	host, err := r.regexp.host.url(values)
-	if err != nil {
-		return nil, err
-	}
-	return &url.URL{
-		Scheme: "http",
-		Host:   host,
-	}, nil
-}
-
-// URLPath builds the path part of the URL for a route. See Route.URL().
-//
-// The route must have a path defined.
-func (r *Route) URLPath(pairs ...string) (*url.URL, error) {
-	if r.err != nil {
-		return nil, r.err
-	}
-	if r.regexp == nil || r.regexp.path == nil {
-		return nil, errors.New("mux: route doesn't have a path")
-	}
-	values, err := r.prepareVars(pairs...)
-	if err != nil {
-		return nil, err
-	}
-	path, err := r.regexp.path.url(values)
-	if err != nil {
-		return nil, err
-	}
-	return &url.URL{
-		Path: path,
-	}, nil
-}
-
-// prepareVars converts the route variable pairs into a map. If the route has a
-// BuildVarsFunc, it is invoked.
-func (r *Route) prepareVars(pairs ...string) (map[string]string, error) {
-	m, err := mapFromPairsToString(pairs...)
-	if err != nil {
-		return nil, err
-	}
-	return r.buildVars(m), nil
-}
-
-func (r *Route) buildVars(m map[string]string) map[string]string {
-	if r.parent != nil {
-		m = r.parent.buildVars(m)
-	}
-	if r.buildVarsFunc != nil {
-		m = r.buildVarsFunc(m)
-	}
-	return m
-}
-
-// ----------------------------------------------------------------------------
-// parentRoute
-// ----------------------------------------------------------------------------
-
-// parentRoute allows routes to know about parent host and path definitions.
-type parentRoute interface {
-	getNamedRoutes() map[string]*Route
-	getRegexpGroup() *routeRegexpGroup
-	buildVars(map[string]string) map[string]string
-}
-
-// getNamedRoutes returns the map where named routes are registered.
-func (r *Route) getNamedRoutes() map[string]*Route {
-	if r.parent == nil {
-		// During tests router is not always set.
-		r.parent = NewRouter()
-	}
-	return r.parent.getNamedRoutes()
-}
-
-// getRegexpGroup returns regexp definitions from this route.
-func (r *Route) getRegexpGroup() *routeRegexpGroup {
-	if r.regexp == nil {
-		if r.parent == nil {
-			// During tests router is not always set.
-			r.parent = NewRouter()
-		}
-		regexp := r.parent.getRegexpGroup()
-		if regexp == nil {
-			r.regexp = new(routeRegexpGroup)
-		} else {
-			// Copy.
-			r.regexp = &routeRegexpGroup{
-				host:    regexp.host,
-				path:    regexp.path,
-				queries: regexp.queries,
-			}
-		}
-	}
-	return r.regexp
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/hashicorp/go-cleanhttp/LICENSE b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/hashicorp/go-cleanhttp/LICENSE
deleted file mode 100644
index e87a115e4..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/hashicorp/go-cleanhttp/LICENSE
+++ /dev/null
@@ -1,363 +0,0 @@
-Mozilla Public License, version 2.0
-
-1. Definitions
-
-1.1. "Contributor"
-
-     means each individual or legal entity that creates, contributes to the
-     creation of, or owns Covered Software.
-
-1.2. "Contributor Version"
-
-     means the combination of the Contributions of others (if any) used by a
-     Contributor and that particular Contributor's Contribution.
-
-1.3. "Contribution"
-
-     means Covered Software of a particular Contributor.
-
-1.4. "Covered Software"
-
-     means Source Code Form to which the initial Contributor has attached the
-     notice in Exhibit A, the Executable Form of such Source Code Form, and
-     Modifications of such Source Code Form, in each case including portions
-     thereof.
-
-1.5. "Incompatible With Secondary Licenses"
-     means
-
-     a. that the initial Contributor has attached the notice described in
-        Exhibit B to the Covered Software; or
-
-     b. that the Covered Software was made available under the terms of
-        version 1.1 or earlier of the License, but not also under the terms of
-        a Secondary License.
-
-1.6. "Executable Form"
-
-     means any form of the work other than Source Code Form.
-
-1.7. "Larger Work"
-
-     means a work that combines Covered Software with other material, in a
-     separate file or files, that is not Covered Software.
-
-1.8. "License"
-
-     means this document.
-
-1.9. "Licensable"
-
-     means having the right to grant, to the maximum extent possible, whether
-     at the time of the initial grant or subsequently, any and all of the
-     rights conveyed by this License.
-
-1.10. "Modifications"
-
-     means any of the following:
-
-     a. any file in Source Code Form that results from an addition to,
-        deletion from, or modification of the contents of Covered Software; or
-
-     b. any new file in Source Code Form that contains any Covered Software.
-
-1.11. "Patent Claims" of a Contributor
-
-      means any patent claim(s), including without limitation, method,
-      process, and apparatus claims, in any patent Licensable by such
-      Contributor that would be infringed, but for the grant of the License,
-      by the making, using, selling, offering for sale, having made, import,
-      or transfer of either its Contributions or its Contributor Version.
-
-1.12. "Secondary License"
-
-      means either the GNU General Public License, Version 2.0, the GNU Lesser
-      General Public License, Version 2.1, the GNU Affero General Public
-      License, Version 3.0, or any later versions of those licenses.
-
-1.13. "Source Code Form"
-
-      means the form of the work preferred for making modifications.
-
-1.14. "You" (or "Your")
-
-      means an individual or a legal entity exercising rights under this
-      License. For legal entities, "You" includes any entity that controls, is
-      controlled by, or is under common control with You. For purposes of this
-      definition, "control" means (a) the power, direct or indirect, to cause
-      the direction or management of such entity, whether by contract or
-      otherwise, or (b) ownership of more than fifty percent (50%) of the
-      outstanding shares or beneficial ownership of such entity.
-
-
-2. License Grants and Conditions
-
-2.1. Grants
-
-     Each Contributor hereby grants You a world-wide, royalty-free,
-     non-exclusive license:
-
-     a. under intellectual property rights (other than patent or trademark)
-        Licensable by such Contributor to use, reproduce, make available,
-        modify, display, perform, distribute, and otherwise exploit its
-        Contributions, either on an unmodified basis, with Modifications, or
-        as part of a Larger Work; and
-
-     b. under Patent Claims of such Contributor to make, use, sell, offer for
-        sale, have made, import, and otherwise transfer either its
-        Contributions or its Contributor Version.
-
-2.2. Effective Date
-
-     The licenses granted in Section 2.1 with respect to any Contribution
-     become effective for each Contribution on the date the Contributor first
-     distributes such Contribution.
-
-2.3. Limitations on Grant Scope
-
-     The licenses granted in this Section 2 are the only rights granted under
-     this License. No additional rights or licenses will be implied from the
-     distribution or licensing of Covered Software under this License.
-     Notwithstanding Section 2.1(b) above, no patent license is granted by a
-     Contributor:
-
-     a. for any code that a Contributor has removed from Covered Software; or
-
-     b. for infringements caused by: (i) Your and any other third party's
-        modifications of Covered Software, or (ii) the combination of its
-        Contributions with other software (except as part of its Contributor
-        Version); or
-
-     c. under Patent Claims infringed by Covered Software in the absence of
-        its Contributions.
-
-     This License does not grant any rights in the trademarks, service marks,
-     or logos of any Contributor (except as may be necessary to comply with
-     the notice requirements in Section 3.4).
-
-2.4. Subsequent Licenses
-
-     No Contributor makes additional grants as a result of Your choice to
-     distribute the Covered Software under a subsequent version of this
-     License (see Section 10.2) or under the terms of a Secondary License (if
-     permitted under the terms of Section 3.3).
-
-2.5. Representation
-
-     Each Contributor represents that the Contributor believes its
-     Contributions are its original creation(s) or it has sufficient rights to
-     grant the rights to its Contributions conveyed by this License.
-
-2.6. Fair Use
-
-     This License is not intended to limit any rights You have under
-     applicable copyright doctrines of fair use, fair dealing, or other
-     equivalents.
-
-2.7. Conditions
-
-     Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted in
-     Section 2.1.
-
-
-3. Responsibilities
-
-3.1. Distribution of Source Form
-
-     All distribution of Covered Software in Source Code Form, including any
-     Modifications that You create or to which You contribute, must be under
-     the terms of this License. You must inform recipients that the Source
-     Code Form of the Covered Software is governed by the terms of this
-     License, and how they can obtain a copy of this License. You may not
-     attempt to alter or restrict the recipients' rights in the Source Code
-     Form.
-
-3.2. Distribution of Executable Form
-
-     If You distribute Covered Software in Executable Form then:
-
-     a. such Covered Software must also be made available in Source Code Form,
-        as described in Section 3.1, and You must inform recipients of the
-        Executable Form how they can obtain a copy of such Source Code Form by
-        reasonable means in a timely manner, at a charge no more than the cost
-        of distribution to the recipient; and
-
-     b. You may distribute such Executable Form under the terms of this
-        License, or sublicense it under different terms, provided that the
-        license for the Executable Form does not attempt to limit or alter the
-        recipients' rights in the Source Code Form under this License.
-
-3.3. Distribution of a Larger Work
-
-     You may create and distribute a Larger Work under terms of Your choice,
-     provided that You also comply with the requirements of this License for
-     the Covered Software. If the Larger Work is a combination of Covered
-     Software with a work governed by one or more Secondary Licenses, and the
-     Covered Software is not Incompatible With Secondary Licenses, this
-     License permits You to additionally distribute such Covered Software
-     under the terms of such Secondary License(s), so that the recipient of
-     the Larger Work may, at their option, further distribute the Covered
-     Software under the terms of either this License or such Secondary
-     License(s).
-
-3.4. Notices
-
-     You may not remove or alter the substance of any license notices
-     (including copyright notices, patent notices, disclaimers of warranty, or
-     limitations of liability) contained within the Source Code Form of the
-     Covered Software, except that You may alter any license notices to the
-     extent required to remedy known factual inaccuracies.
-
-3.5. Application of Additional Terms
-
-     You may choose to offer, and to charge a fee for, warranty, support,
-     indemnity or liability obligations to one or more recipients of Covered
-     Software. However, You may do so only on Your own behalf, and not on
-     behalf of any Contributor. You must make it absolutely clear that any
-     such warranty, support, indemnity, or liability obligation is offered by
-     You alone, and You hereby agree to indemnify every Contributor for any
-     liability incurred by such Contributor as a result of warranty, support,
-     indemnity or liability terms You offer. You may include additional
-     disclaimers of warranty and limitations of liability specific to any
-     jurisdiction.
-
-4. Inability to Comply Due to Statute or Regulation
-
-   If it is impossible for You to comply with any of the terms of this License
-   with respect to some or all of the Covered Software due to statute,
-   judicial order, or regulation then You must: (a) comply with the terms of
-   this License to the maximum extent possible; and (b) describe the
-   limitations and the code they affect. Such description must be placed in a
-   text file included with all distributions of the Covered Software under
-   this License. Except to the extent prohibited by statute or regulation,
-   such description must be sufficiently detailed for a recipient of ordinary
-   skill to be able to understand it.
-
-5. Termination
-
-5.1. The rights granted under this License will terminate automatically if You
-     fail to comply with any of its terms. However, if You become compliant,
-     then the rights granted under this License from a particular Contributor
-     are reinstated (a) provisionally, unless and until such Contributor
-     explicitly and finally terminates Your grants, and (b) on an ongoing
-     basis, if such Contributor fails to notify You of the non-compliance by
-     some reasonable means prior to 60 days after You have come back into
-     compliance. Moreover, Your grants from a particular Contributor are
-     reinstated on an ongoing basis if such Contributor notifies You of the
-     non-compliance by some reasonable means, this is the first time You have
-     received notice of non-compliance with this License from such
-     Contributor, and You become compliant prior to 30 days after Your receipt
-     of the notice.
-
-5.2. If You initiate litigation against any entity by asserting a patent
-     infringement claim (excluding declaratory judgment actions,
-     counter-claims, and cross-claims) alleging that a Contributor Version
-     directly or indirectly infringes any patent, then the rights granted to
-     You by any and all Contributors for the Covered Software under Section
-     2.1 of this License shall terminate.
-
-5.3. In the event of termination under Sections 5.1 or 5.2 above, all end user
-     license agreements (excluding distributors and resellers) which have been
-     validly granted by You or Your distributors under this License prior to
-     termination shall survive termination.
-
-6. Disclaimer of Warranty
-
-   Covered Software is provided under this License on an "as is" basis,
-   without warranty of any kind, either expressed, implied, or statutory,
-   including, without limitation, warranties that the Covered Software is free
-   of defects, merchantable, fit for a particular purpose or non-infringing.
-   The entire risk as to the quality and performance of the Covered Software
-   is with You. Should any Covered Software prove defective in any respect,
-   You (not any Contributor) assume the cost of any necessary servicing,
-   repair, or correction. This disclaimer of warranty constitutes an essential
-   part of this License. No use of  any Covered Software is authorized under
-   this License except under this disclaimer.
-
-7. Limitation of Liability
-
-   Under no circumstances and under no legal theory, whether tort (including
-   negligence), contract, or otherwise, shall any Contributor, or anyone who
-   distributes Covered Software as permitted above, be liable to You for any
-   direct, indirect, special, incidental, or consequential damages of any
-   character including, without limitation, damages for lost profits, loss of
-   goodwill, work stoppage, computer failure or malfunction, or any and all
-   other commercial damages or losses, even if such party shall have been
-   informed of the possibility of such damages. This limitation of liability
-   shall not apply to liability for death or personal injury resulting from
-   such party's negligence to the extent applicable law prohibits such
-   limitation. Some jurisdictions do not allow the exclusion or limitation of
-   incidental or consequential damages, so this exclusion and limitation may
-   not apply to You.
-
-8. Litigation
-
-   Any litigation relating to this License may be brought only in the courts
-   of a jurisdiction where the defendant maintains its principal place of
-   business and such litigation shall be governed by laws of that
-   jurisdiction, without reference to its conflict-of-law provisions. Nothing
-   in this Section shall prevent a party's ability to bring cross-claims or
-   counter-claims.
-
-9. Miscellaneous
-
-   This License represents the complete agreement concerning the subject
-   matter hereof. If any provision of this License is held to be
-   unenforceable, such provision shall be reformed only to the extent
-   necessary to make it enforceable. Any law or regulation which provides that
-   the language of a contract shall be construed against the drafter shall not
-   be used to construe this License against a Contributor.
-
-
-10. Versions of the License
-
-10.1. New Versions
-
-      Mozilla Foundation is the license steward. Except as provided in Section
-      10.3, no one other than the license steward has the right to modify or
-      publish new versions of this License. Each version will be given a
-      distinguishing version number.
-
-10.2. Effect of New Versions
-
-      You may distribute the Covered Software under the terms of the version
-      of the License under which You originally received the Covered Software,
-      or under the terms of any subsequent version published by the license
-      steward.
-
-10.3. Modified Versions
-
-      If you create software not governed by this License, and you want to
-      create a new license for such software, you may create and use a
-      modified version of this License if you rename the license and remove
-      any references to the name of the license steward (except to note that
-      such modified license differs from this License).
-
-10.4. Distributing Source Code Form that is Incompatible With Secondary
-      Licenses If You choose to distribute Source Code Form that is
-      Incompatible With Secondary Licenses under the terms of this version of
-      the License, the notice described in Exhibit B of this License must be
-      attached.
-
-Exhibit A - Source Code Form License Notice
-
-      This Source Code Form is subject to the
-      terms of the Mozilla Public License, v.
-      2.0. If a copy of the MPL was not
-      distributed with this file, You can
-      obtain one at
-      http://mozilla.org/MPL/2.0/.
-
-If it is not possible or desirable to put the notice in a particular file,
-then You may include the notice in a location (such as a LICENSE file in a
-relevant directory) where a recipient would be likely to look for such a
-notice.
-
-You may add additional accurate notices of copyright ownership.
-
-Exhibit B - "Incompatible With Secondary Licenses" Notice
-
-      This Source Code Form is "Incompatible
-      With Secondary Licenses", as defined by
-      the Mozilla Public License, v. 2.0.
-
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/hashicorp/go-cleanhttp/README.md b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/hashicorp/go-cleanhttp/README.md
deleted file mode 100644
index 036e5313f..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/hashicorp/go-cleanhttp/README.md
+++ /dev/null
@@ -1,30 +0,0 @@
-# cleanhttp
-
-Functions for accessing "clean" Go http.Client values
-
--------------
-
-The Go standard library contains a default `http.Client` called
-`http.DefaultClient`. It is a common idiom in Go code to start with
-`http.DefaultClient` and tweak it as necessary, and in fact, this is
-encouraged; from the `http` package documentation:
-
-> The Client's Transport typically has internal state (cached TCP connections),
-so Clients should be reused instead of created as needed. Clients are safe for
-concurrent use by multiple goroutines.
-
-Unfortunately, this is a shared value, and it is not uncommon for libraries to
-assume that they are free to modify it at will. With enough dependencies, it
-can be very easy to encounter strange problems and race conditions due to
-manipulation of this shared value across libraries and goroutines (clients are
-safe for concurrent use, but writing values to the client struct itself is not
-protected).
-
-Making things worse is the fact that a bare `http.Client` will use a default
-`http.Transport` called `http.DefaultTransport`, which is another global value
-that behaves the same way. So it is not simply enough to replace
-`http.DefaultClient` with `&http.Client{}`.
-
-This repository provides some simple functions to get a "clean" `http.Client`
--- one that uses the same default values as the Go standard library, but
-returns a client that does not share any state with other clients.
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/hashicorp/go-cleanhttp/cleanhttp.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/hashicorp/go-cleanhttp/cleanhttp.go
deleted file mode 100644
index 1676d79cb..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/hashicorp/go-cleanhttp/cleanhttp.go
+++ /dev/null
@@ -1,28 +0,0 @@
-package cleanhttp
-
-import (
-	"net"
-	"net/http"
-	"time"
-)
-
-// DefaultTransport returns a new http.Transport with the same default values
-// as http.DefaultTransport
-func DefaultTransport() *http.Transport {
-	return &http.Transport{
-		Proxy: http.ProxyFromEnvironment,
-		Dial: (&net.Dialer{
-			Timeout:   30 * time.Second,
-			KeepAlive: 30 * time.Second,
-		}).Dial,
-		TLSHandshakeTimeout: 10 * time.Second,
-	}
-}
-
-// DefaultClient returns a new http.Client with the same default values as
-// http.Client, but with a non-shared Transport
-func DefaultClient() *http.Client {
-	return &http.Client{
-		Transport: DefaultTransport(),
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/opencontainers/runc/libcontainer/user/MAINTAINERS b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/opencontainers/runc/libcontainer/user/MAINTAINERS
deleted file mode 100644
index edbe20066..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/opencontainers/runc/libcontainer/user/MAINTAINERS
+++ /dev/null
@@ -1,2 +0,0 @@
-Tianon Gravi <admwiggin@gmail.com> (@tianon)
-Aleksa Sarai <cyphar@cyphar.com> (@cyphar)
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/opencontainers/runc/libcontainer/user/lookup.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/opencontainers/runc/libcontainer/user/lookup.go
deleted file mode 100644
index 6f8a982ff..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/opencontainers/runc/libcontainer/user/lookup.go
+++ /dev/null
@@ -1,108 +0,0 @@
-package user
-
-import (
-	"errors"
-	"fmt"
-	"syscall"
-)
-
-var (
-	// The current operating system does not provide the required data for user lookups.
-	ErrUnsupported = errors.New("user lookup: operating system does not provide passwd-formatted data")
-)
-
-func lookupUser(filter func(u User) bool) (User, error) {
-	// Get operating system-specific passwd reader-closer.
-	passwd, err := GetPasswd()
-	if err != nil {
-		return User{}, err
-	}
-	defer passwd.Close()
-
-	// Get the users.
-	users, err := ParsePasswdFilter(passwd, filter)
-	if err != nil {
-		return User{}, err
-	}
-
-	// No user entries found.
-	if len(users) == 0 {
-		return User{}, fmt.Errorf("no matching entries in passwd file")
-	}
-
-	// Assume the first entry is the "correct" one.
-	return users[0], nil
-}
-
-// CurrentUser looks up the current user by their user id in /etc/passwd. If the
-// user cannot be found (or there is no /etc/passwd file on the filesystem),
-// then CurrentUser returns an error.
-func CurrentUser() (User, error) {
-	return LookupUid(syscall.Getuid())
-}
-
-// LookupUser looks up a user by their username in /etc/passwd. If the user
-// cannot be found (or there is no /etc/passwd file on the filesystem), then
-// LookupUser returns an error.
-func LookupUser(username string) (User, error) {
-	return lookupUser(func(u User) bool {
-		return u.Name == username
-	})
-}
-
-// LookupUid looks up a user by their user id in /etc/passwd. If the user cannot
-// be found (or there is no /etc/passwd file on the filesystem), then LookupId
-// returns an error.
-func LookupUid(uid int) (User, error) {
-	return lookupUser(func(u User) bool {
-		return u.Uid == uid
-	})
-}
-
-func lookupGroup(filter func(g Group) bool) (Group, error) {
-	// Get operating system-specific group reader-closer.
-	group, err := GetGroup()
-	if err != nil {
-		return Group{}, err
-	}
-	defer group.Close()
-
-	// Get the users.
-	groups, err := ParseGroupFilter(group, filter)
-	if err != nil {
-		return Group{}, err
-	}
-
-	// No user entries found.
-	if len(groups) == 0 {
-		return Group{}, fmt.Errorf("no matching entries in group file")
-	}
-
-	// Assume the first entry is the "correct" one.
-	return groups[0], nil
-}
-
-// CurrentGroup looks up the current user's group by their primary group id's
-// entry in /etc/passwd. If the group cannot be found (or there is no
-// /etc/group file on the filesystem), then CurrentGroup returns an error.
-func CurrentGroup() (Group, error) {
-	return LookupGid(syscall.Getgid())
-}
-
-// LookupGroup looks up a group by its name in /etc/group. If the group cannot
-// be found (or there is no /etc/group file on the filesystem), then LookupGroup
-// returns an error.
-func LookupGroup(groupname string) (Group, error) {
-	return lookupGroup(func(g Group) bool {
-		return g.Name == groupname
-	})
-}
-
-// LookupGid looks up a group by its group id in /etc/group. If the group cannot
-// be found (or there is no /etc/group file on the filesystem), then LookupGid
-// returns an error.
-func LookupGid(gid int) (Group, error) {
-	return lookupGroup(func(g Group) bool {
-		return g.Gid == gid
-	})
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/opencontainers/runc/libcontainer/user/lookup_unix.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/opencontainers/runc/libcontainer/user/lookup_unix.go
deleted file mode 100644
index 758b734c2..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/opencontainers/runc/libcontainer/user/lookup_unix.go
+++ /dev/null
@@ -1,30 +0,0 @@
-// +build darwin dragonfly freebsd linux netbsd openbsd solaris
-
-package user
-
-import (
-	"io"
-	"os"
-)
-
-// Unix-specific path to the passwd and group formatted files.
-const (
-	unixPasswdPath = "/etc/passwd"
-	unixGroupPath  = "/etc/group"
-)
-
-func GetPasswdPath() (string, error) {
-	return unixPasswdPath, nil
-}
-
-func GetPasswd() (io.ReadCloser, error) {
-	return os.Open(unixPasswdPath)
-}
-
-func GetGroupPath() (string, error) {
-	return unixGroupPath, nil
-}
-
-func GetGroup() (io.ReadCloser, error) {
-	return os.Open(unixGroupPath)
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/opencontainers/runc/libcontainer/user/lookup_unsupported.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/opencontainers/runc/libcontainer/user/lookup_unsupported.go
deleted file mode 100644
index 721794887..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/opencontainers/runc/libcontainer/user/lookup_unsupported.go
+++ /dev/null
@@ -1,21 +0,0 @@
-// +build !darwin,!dragonfly,!freebsd,!linux,!netbsd,!openbsd,!solaris
-
-package user
-
-import "io"
-
-func GetPasswdPath() (string, error) {
-	return "", ErrUnsupported
-}
-
-func GetPasswd() (io.ReadCloser, error) {
-	return nil, ErrUnsupported
-}
-
-func GetGroupPath() (string, error) {
-	return "", ErrUnsupported
-}
-
-func GetGroup() (io.ReadCloser, error) {
-	return nil, ErrUnsupported
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/opencontainers/runc/libcontainer/user/user.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/opencontainers/runc/libcontainer/user/user.go
deleted file mode 100644
index e6375ea4d..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/opencontainers/runc/libcontainer/user/user.go
+++ /dev/null
@@ -1,418 +0,0 @@
-package user
-
-import (
-	"bufio"
-	"fmt"
-	"io"
-	"os"
-	"strconv"
-	"strings"
-)
-
-const (
-	minId = 0
-	maxId = 1<<31 - 1 //for 32-bit systems compatibility
-)
-
-var (
-	ErrRange = fmt.Errorf("Uids and gids must be in range %d-%d", minId, maxId)
-)
-
-type User struct {
-	Name  string
-	Pass  string
-	Uid   int
-	Gid   int
-	Gecos string
-	Home  string
-	Shell string
-}
-
-type Group struct {
-	Name string
-	Pass string
-	Gid  int
-	List []string
-}
-
-func parseLine(line string, v ...interface{}) {
-	if line == "" {
-		return
-	}
-
-	parts := strings.Split(line, ":")
-	for i, p := range parts {
-		if len(v) <= i {
-			// if we have more "parts" than we have places to put them, bail for great "tolerance" of naughty configuration files
-			break
-		}
-
-		switch e := v[i].(type) {
-		case *string:
-			// "root", "adm", "/bin/bash"
-			*e = p
-		case *int:
-			// "0", "4", "1000"
-			// ignore string to int conversion errors, for great "tolerance" of naughty configuration files
-			*e, _ = strconv.Atoi(p)
-		case *[]string:
-			// "", "root", "root,adm,daemon"
-			if p != "" {
-				*e = strings.Split(p, ",")
-			} else {
-				*e = []string{}
-			}
-		default:
-			// panic, because this is a programming/logic error, not a runtime one
-			panic("parseLine expects only pointers!  argument " + strconv.Itoa(i) + " is not a pointer!")
-		}
-	}
-}
-
-func ParsePasswdFile(path string) ([]User, error) {
-	passwd, err := os.Open(path)
-	if err != nil {
-		return nil, err
-	}
-	defer passwd.Close()
-	return ParsePasswd(passwd)
-}
-
-func ParsePasswd(passwd io.Reader) ([]User, error) {
-	return ParsePasswdFilter(passwd, nil)
-}
-
-func ParsePasswdFileFilter(path string, filter func(User) bool) ([]User, error) {
-	passwd, err := os.Open(path)
-	if err != nil {
-		return nil, err
-	}
-	defer passwd.Close()
-	return ParsePasswdFilter(passwd, filter)
-}
-
-func ParsePasswdFilter(r io.Reader, filter func(User) bool) ([]User, error) {
-	if r == nil {
-		return nil, fmt.Errorf("nil source for passwd-formatted data")
-	}
-
-	var (
-		s   = bufio.NewScanner(r)
-		out = []User{}
-	)
-
-	for s.Scan() {
-		if err := s.Err(); err != nil {
-			return nil, err
-		}
-
-		text := strings.TrimSpace(s.Text())
-		if text == "" {
-			continue
-		}
-
-		// see: man 5 passwd
-		//  name:password:UID:GID:GECOS:directory:shell
-		// Name:Pass:Uid:Gid:Gecos:Home:Shell
-		//  root:x:0:0:root:/root:/bin/bash
-		//  adm:x:3:4:adm:/var/adm:/bin/false
-		p := User{}
-		parseLine(
-			text,
-			&p.Name, &p.Pass, &p.Uid, &p.Gid, &p.Gecos, &p.Home, &p.Shell,
-		)
-
-		if filter == nil || filter(p) {
-			out = append(out, p)
-		}
-	}
-
-	return out, nil
-}
-
-func ParseGroupFile(path string) ([]Group, error) {
-	group, err := os.Open(path)
-	if err != nil {
-		return nil, err
-	}
-	defer group.Close()
-	return ParseGroup(group)
-}
-
-func ParseGroup(group io.Reader) ([]Group, error) {
-	return ParseGroupFilter(group, nil)
-}
-
-func ParseGroupFileFilter(path string, filter func(Group) bool) ([]Group, error) {
-	group, err := os.Open(path)
-	if err != nil {
-		return nil, err
-	}
-	defer group.Close()
-	return ParseGroupFilter(group, filter)
-}
-
-func ParseGroupFilter(r io.Reader, filter func(Group) bool) ([]Group, error) {
-	if r == nil {
-		return nil, fmt.Errorf("nil source for group-formatted data")
-	}
-
-	var (
-		s   = bufio.NewScanner(r)
-		out = []Group{}
-	)
-
-	for s.Scan() {
-		if err := s.Err(); err != nil {
-			return nil, err
-		}
-
-		text := s.Text()
-		if text == "" {
-			continue
-		}
-
-		// see: man 5 group
-		//  group_name:password:GID:user_list
-		// Name:Pass:Gid:List
-		//  root:x:0:root
-		//  adm:x:4:root,adm,daemon
-		p := Group{}
-		parseLine(
-			text,
-			&p.Name, &p.Pass, &p.Gid, &p.List,
-		)
-
-		if filter == nil || filter(p) {
-			out = append(out, p)
-		}
-	}
-
-	return out, nil
-}
-
-type ExecUser struct {
-	Uid, Gid int
-	Sgids    []int
-	Home     string
-}
-
-// GetExecUserPath is a wrapper for GetExecUser. It reads data from each of the
-// given file paths and uses that data as the arguments to GetExecUser. If the
-// files cannot be opened for any reason, the error is ignored and a nil
-// io.Reader is passed instead.
-func GetExecUserPath(userSpec string, defaults *ExecUser, passwdPath, groupPath string) (*ExecUser, error) {
-	passwd, err := os.Open(passwdPath)
-	if err != nil {
-		passwd = nil
-	} else {
-		defer passwd.Close()
-	}
-
-	group, err := os.Open(groupPath)
-	if err != nil {
-		group = nil
-	} else {
-		defer group.Close()
-	}
-
-	return GetExecUser(userSpec, defaults, passwd, group)
-}
-
-// GetExecUser parses a user specification string (using the passwd and group
-// readers as sources for /etc/passwd and /etc/group data, respectively). In
-// the case of blank fields or missing data from the sources, the values in
-// defaults is used.
-//
-// GetExecUser will return an error if a user or group literal could not be
-// found in any entry in passwd and group respectively.
-//
-// Examples of valid user specifications are:
-//     * ""
-//     * "user"
-//     * "uid"
-//     * "user:group"
-//     * "uid:gid
-//     * "user:gid"
-//     * "uid:group"
-func GetExecUser(userSpec string, defaults *ExecUser, passwd, group io.Reader) (*ExecUser, error) {
-	var (
-		userArg, groupArg string
-		name              string
-	)
-
-	if defaults == nil {
-		defaults = new(ExecUser)
-	}
-
-	// Copy over defaults.
-	user := &ExecUser{
-		Uid:   defaults.Uid,
-		Gid:   defaults.Gid,
-		Sgids: defaults.Sgids,
-		Home:  defaults.Home,
-	}
-
-	// Sgids slice *cannot* be nil.
-	if user.Sgids == nil {
-		user.Sgids = []int{}
-	}
-
-	// allow for userArg to have either "user" syntax, or optionally "user:group" syntax
-	parseLine(userSpec, &userArg, &groupArg)
-
-	users, err := ParsePasswdFilter(passwd, func(u User) bool {
-		if userArg == "" {
-			return u.Uid == user.Uid
-		}
-		return u.Name == userArg || strconv.Itoa(u.Uid) == userArg
-	})
-	if err != nil && passwd != nil {
-		if userArg == "" {
-			userArg = strconv.Itoa(user.Uid)
-		}
-		return nil, fmt.Errorf("Unable to find user %v: %v", userArg, err)
-	}
-
-	haveUser := users != nil && len(users) > 0
-	if haveUser {
-		// if we found any user entries that matched our filter, let's take the first one as "correct"
-		name = users[0].Name
-		user.Uid = users[0].Uid
-		user.Gid = users[0].Gid
-		user.Home = users[0].Home
-	} else if userArg != "" {
-		// we asked for a user but didn't find them...  let's check to see if we wanted a numeric user
-		user.Uid, err = strconv.Atoi(userArg)
-		if err != nil {
-			// not numeric - we have to bail
-			return nil, fmt.Errorf("Unable to find user %v", userArg)
-		}
-
-		// Must be inside valid uid range.
-		if user.Uid < minId || user.Uid > maxId {
-			return nil, ErrRange
-		}
-
-		// if userArg couldn't be found in /etc/passwd but is numeric, just roll with it - this is legit
-	}
-
-	if groupArg != "" || name != "" {
-		groups, err := ParseGroupFilter(group, func(g Group) bool {
-			// Explicit group format takes precedence.
-			if groupArg != "" {
-				return g.Name == groupArg || strconv.Itoa(g.Gid) == groupArg
-			}
-
-			// Check if user is a member.
-			for _, u := range g.List {
-				if u == name {
-					return true
-				}
-			}
-
-			return false
-		})
-		if err != nil && group != nil {
-			return nil, fmt.Errorf("Unable to find groups for user %v: %v", users[0].Name, err)
-		}
-
-		haveGroup := groups != nil && len(groups) > 0
-		if groupArg != "" {
-			if haveGroup {
-				// if we found any group entries that matched our filter, let's take the first one as "correct"
-				user.Gid = groups[0].Gid
-			} else {
-				// we asked for a group but didn't find id...  let's check to see if we wanted a numeric group
-				user.Gid, err = strconv.Atoi(groupArg)
-				if err != nil {
-					// not numeric - we have to bail
-					return nil, fmt.Errorf("Unable to find group %v", groupArg)
-				}
-
-				// Ensure gid is inside gid range.
-				if user.Gid < minId || user.Gid > maxId {
-					return nil, ErrRange
-				}
-
-				// if groupArg couldn't be found in /etc/group but is numeric, just roll with it - this is legit
-			}
-		} else if haveGroup {
-			// If implicit group format, fill supplementary gids.
-			user.Sgids = make([]int, len(groups))
-			for i, group := range groups {
-				user.Sgids[i] = group.Gid
-			}
-		}
-	}
-
-	return user, nil
-}
-
-// GetAdditionalGroups looks up a list of groups by name or group id
-// against the given /etc/group formatted data. If a group name cannot
-// be found, an error will be returned. If a group id cannot be found,
-// or the given group data is nil, the id will be returned as-is
-// provided it is in the legal range.
-func GetAdditionalGroups(additionalGroups []string, group io.Reader) ([]int, error) {
-	var groups = []Group{}
-	if group != nil {
-		var err error
-		groups, err = ParseGroupFilter(group, func(g Group) bool {
-			for _, ag := range additionalGroups {
-				if g.Name == ag || strconv.Itoa(g.Gid) == ag {
-					return true
-				}
-			}
-			return false
-		})
-		if err != nil {
-			return nil, fmt.Errorf("Unable to find additional groups %v: %v", additionalGroups, err)
-		}
-	}
-
-	gidMap := make(map[int]struct{})
-	for _, ag := range additionalGroups {
-		var found bool
-		for _, g := range groups {
-			// if we found a matched group either by name or gid, take the
-			// first matched as correct
-			if g.Name == ag || strconv.Itoa(g.Gid) == ag {
-				if _, ok := gidMap[g.Gid]; !ok {
-					gidMap[g.Gid] = struct{}{}
-					found = true
-					break
-				}
-			}
-		}
-		// we asked for a group but didn't find it. let's check to see
-		// if we wanted a numeric group
-		if !found {
-			gid, err := strconv.Atoi(ag)
-			if err != nil {
-				return nil, fmt.Errorf("Unable to find group %s", ag)
-			}
-			// Ensure gid is inside gid range.
-			if gid < minId || gid > maxId {
-				return nil, ErrRange
-			}
-			gidMap[gid] = struct{}{}
-		}
-	}
-	gids := []int{}
-	for gid := range gidMap {
-		gids = append(gids, gid)
-	}
-	return gids, nil
-}
-
-// GetAdditionalGroupsPath is a wrapper around GetAdditionalGroups
-// that opens the groupPath given and gives it as an argument to
-// GetAdditionalGroups.
-func GetAdditionalGroupsPath(additionalGroups []string, groupPath string) ([]int, error) {
-	group, err := os.Open(groupPath)
-	if err == nil {
-		defer group.Close()
-	}
-	return GetAdditionalGroups(additionalGroups, group)
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/image.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/image.go
deleted file mode 100644
index 9d21da286..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/image.go
+++ /dev/null
@@ -1,595 +0,0 @@
-// Copyright 2015 go-dockerclient 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 docker
-
-import (
-	"bytes"
-	"encoding/base64"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"io"
-	"net/http"
-	"net/url"
-	"os"
-	"time"
-)
-
-// APIImages represent an image returned in the ListImages call.
-type APIImages struct {
-	ID          string            `json:"Id" yaml:"Id"`
-	RepoTags    []string          `json:"RepoTags,omitempty" yaml:"RepoTags,omitempty"`
-	Created     int64             `json:"Created,omitempty" yaml:"Created,omitempty"`
-	Size        int64             `json:"Size,omitempty" yaml:"Size,omitempty"`
-	VirtualSize int64             `json:"VirtualSize,omitempty" yaml:"VirtualSize,omitempty"`
-	ParentID    string            `json:"ParentId,omitempty" yaml:"ParentId,omitempty"`
-	RepoDigests []string          `json:"RepoDigests,omitempty" yaml:"RepoDigests,omitempty"`
-	Labels      map[string]string `json:"Labels,omitempty" yaml:"Labels,omitempty"`
-}
-
-// Image is the type representing a docker image and its various properties
-type Image struct {
-	ID              string    `json:"Id" yaml:"Id"`
-	Parent          string    `json:"Parent,omitempty" yaml:"Parent,omitempty"`
-	Comment         string    `json:"Comment,omitempty" yaml:"Comment,omitempty"`
-	Created         time.Time `json:"Created,omitempty" yaml:"Created,omitempty"`
-	Container       string    `json:"Container,omitempty" yaml:"Container,omitempty"`
-	ContainerConfig Config    `json:"ContainerConfig,omitempty" yaml:"ContainerConfig,omitempty"`
-	DockerVersion   string    `json:"DockerVersion,omitempty" yaml:"DockerVersion,omitempty"`
-	Author          string    `json:"Author,omitempty" yaml:"Author,omitempty"`
-	Config          *Config   `json:"Config,omitempty" yaml:"Config,omitempty"`
-	Architecture    string    `json:"Architecture,omitempty" yaml:"Architecture,omitempty"`
-	Size            int64     `json:"Size,omitempty" yaml:"Size,omitempty"`
-	VirtualSize     int64     `json:"VirtualSize,omitempty" yaml:"VirtualSize,omitempty"`
-}
-
-// ImagePre012 serves the same purpose as the Image type except that it is for
-// earlier versions of the Docker API (pre-012 to be specific)
-type ImagePre012 struct {
-	ID              string    `json:"id"`
-	Parent          string    `json:"parent,omitempty"`
-	Comment         string    `json:"comment,omitempty"`
-	Created         time.Time `json:"created"`
-	Container       string    `json:"container,omitempty"`
-	ContainerConfig Config    `json:"container_config,omitempty"`
-	DockerVersion   string    `json:"docker_version,omitempty"`
-	Author          string    `json:"author,omitempty"`
-	Config          *Config   `json:"config,omitempty"`
-	Architecture    string    `json:"architecture,omitempty"`
-	Size            int64     `json:"size,omitempty"`
-}
-
-var (
-	// ErrNoSuchImage is the error returned when the image does not exist.
-	ErrNoSuchImage = errors.New("no such image")
-
-	// ErrMissingRepo is the error returned when the remote repository is
-	// missing.
-	ErrMissingRepo = errors.New("missing remote repository e.g. 'github.com/user/repo'")
-
-	// ErrMissingOutputStream is the error returned when no output stream
-	// is provided to some calls, like BuildImage.
-	ErrMissingOutputStream = errors.New("missing output stream")
-
-	// ErrMultipleContexts is the error returned when both a ContextDir and
-	// InputStream are provided in BuildImageOptions
-	ErrMultipleContexts = errors.New("image build may not be provided BOTH context dir and input stream")
-
-	// ErrMustSpecifyNames is the error rreturned when the Names field on
-	// ExportImagesOptions is nil or empty
-	ErrMustSpecifyNames = errors.New("must specify at least one name to export")
-)
-
-// ListImagesOptions specify parameters to the ListImages function.
-//
-// See https://goo.gl/xBe1u3 for more details.
-type ListImagesOptions struct {
-	All     bool
-	Filters map[string][]string
-	Digests bool
-}
-
-// ListImages returns the list of available images in the server.
-//
-// See https://goo.gl/xBe1u3 for more details.
-func (c *Client) ListImages(opts ListImagesOptions) ([]APIImages, error) {
-	path := "/images/json?" + queryString(opts)
-	resp, err := c.do("GET", path, doOptions{})
-	if err != nil {
-		return nil, err
-	}
-	defer resp.Body.Close()
-	var images []APIImages
-	if err := json.NewDecoder(resp.Body).Decode(&images); err != nil {
-		return nil, err
-	}
-	return images, nil
-}
-
-// ImageHistory represent a layer in an image's history returned by the
-// ImageHistory call.
-type ImageHistory struct {
-	ID        string   `json:"Id" yaml:"Id"`
-	Tags      []string `json:"Tags,omitempty" yaml:"Tags,omitempty"`
-	Created   int64    `json:"Created,omitempty" yaml:"Created,omitempty"`
-	CreatedBy string   `json:"CreatedBy,omitempty" yaml:"CreatedBy,omitempty"`
-	Size      int64    `json:"Size,omitempty" yaml:"Size,omitempty"`
-}
-
-// ImageHistory returns the history of the image by its name or ID.
-//
-// See https://goo.gl/8bnTId for more details.
-func (c *Client) ImageHistory(name string) ([]ImageHistory, error) {
-	resp, err := c.do("GET", "/images/"+name+"/history", doOptions{})
-	if err != nil {
-		if e, ok := err.(*Error); ok && e.Status == http.StatusNotFound {
-			return nil, ErrNoSuchImage
-		}
-		return nil, err
-	}
-	defer resp.Body.Close()
-	var history []ImageHistory
-	if err := json.NewDecoder(resp.Body).Decode(&history); err != nil {
-		return nil, err
-	}
-	return history, nil
-}
-
-// RemoveImage removes an image by its name or ID.
-//
-// See https://goo.gl/V3ZWnK for more details.
-func (c *Client) RemoveImage(name string) error {
-	resp, err := c.do("DELETE", "/images/"+name, doOptions{})
-	if err != nil {
-		if e, ok := err.(*Error); ok && e.Status == http.StatusNotFound {
-			return ErrNoSuchImage
-		}
-		return err
-	}
-	resp.Body.Close()
-	return nil
-}
-
-// RemoveImageOptions present the set of options available for removing an image
-// from a registry.
-//
-// See https://goo.gl/V3ZWnK for more details.
-type RemoveImageOptions struct {
-	Force   bool `qs:"force"`
-	NoPrune bool `qs:"noprune"`
-}
-
-// RemoveImageExtended removes an image by its name or ID.
-// Extra params can be passed, see RemoveImageOptions
-//
-// See https://goo.gl/V3ZWnK for more details.
-func (c *Client) RemoveImageExtended(name string, opts RemoveImageOptions) error {
-	uri := fmt.Sprintf("/images/%s?%s", name, queryString(&opts))
-	resp, err := c.do("DELETE", uri, doOptions{})
-	if err != nil {
-		if e, ok := err.(*Error); ok && e.Status == http.StatusNotFound {
-			return ErrNoSuchImage
-		}
-		return err
-	}
-	resp.Body.Close()
-	return nil
-}
-
-// InspectImage returns an image by its name or ID.
-//
-// See https://goo.gl/jHPcg6 for more details.
-func (c *Client) InspectImage(name string) (*Image, error) {
-	resp, err := c.do("GET", "/images/"+name+"/json", doOptions{})
-	if err != nil {
-		if e, ok := err.(*Error); ok && e.Status == http.StatusNotFound {
-			return nil, ErrNoSuchImage
-		}
-		return nil, err
-	}
-	defer resp.Body.Close()
-
-	var image Image
-
-	// if the caller elected to skip checking the server's version, assume it's the latest
-	if c.SkipServerVersionCheck || c.expectedAPIVersion.GreaterThanOrEqualTo(apiVersion112) {
-		if err := json.NewDecoder(resp.Body).Decode(&image); err != nil {
-			return nil, err
-		}
-	} else {
-		var imagePre012 ImagePre012
-		if err := json.NewDecoder(resp.Body).Decode(&imagePre012); err != nil {
-			return nil, err
-		}
-
-		image.ID = imagePre012.ID
-		image.Parent = imagePre012.Parent
-		image.Comment = imagePre012.Comment
-		image.Created = imagePre012.Created
-		image.Container = imagePre012.Container
-		image.ContainerConfig = imagePre012.ContainerConfig
-		image.DockerVersion = imagePre012.DockerVersion
-		image.Author = imagePre012.Author
-		image.Config = imagePre012.Config
-		image.Architecture = imagePre012.Architecture
-		image.Size = imagePre012.Size
-	}
-
-	return &image, nil
-}
-
-// PushImageOptions represents options to use in the PushImage method.
-//
-// See https://goo.gl/zPtZaT for more details.
-type PushImageOptions struct {
-	// Name of the image
-	Name string
-
-	// Tag of the image
-	Tag string
-
-	// Registry server to push the image
-	Registry string
-
-	OutputStream  io.Writer `qs:"-"`
-	RawJSONStream bool      `qs:"-"`
-}
-
-// PushImage pushes an image to a remote registry, logging progress to w.
-//
-// An empty instance of AuthConfiguration may be used for unauthenticated
-// pushes.
-//
-// See https://goo.gl/zPtZaT for more details.
-func (c *Client) PushImage(opts PushImageOptions, auth AuthConfiguration) error {
-	if opts.Name == "" {
-		return ErrNoSuchImage
-	}
-	headers, err := headersWithAuth(auth)
-	if err != nil {
-		return err
-	}
-	name := opts.Name
-	opts.Name = ""
-	path := "/images/" + name + "/push?" + queryString(&opts)
-	return c.stream("POST", path, streamOptions{
-		setRawTerminal: true,
-		rawJSONStream:  opts.RawJSONStream,
-		headers:        headers,
-		stdout:         opts.OutputStream,
-	})
-}
-
-// PullImageOptions present the set of options available for pulling an image
-// from a registry.
-//
-// See https://goo.gl/iJkZjD for more details.
-type PullImageOptions struct {
-	Repository    string `qs:"fromImage"`
-	Registry      string
-	Tag           string
-	OutputStream  io.Writer `qs:"-"`
-	RawJSONStream bool      `qs:"-"`
-}
-
-// PullImage pulls an image from a remote registry, logging progress to
-// opts.OutputStream.
-//
-// See https://goo.gl/iJkZjD for more details.
-func (c *Client) PullImage(opts PullImageOptions, auth AuthConfiguration) error {
-	if opts.Repository == "" {
-		return ErrNoSuchImage
-	}
-
-	headers, err := headersWithAuth(auth)
-	if err != nil {
-		return err
-	}
-	return c.createImage(queryString(&opts), headers, nil, opts.OutputStream, opts.RawJSONStream)
-}
-
-func (c *Client) createImage(qs string, headers map[string]string, in io.Reader, w io.Writer, rawJSONStream bool) error {
-	path := "/images/create?" + qs
-	return c.stream("POST", path, streamOptions{
-		setRawTerminal: true,
-		rawJSONStream:  rawJSONStream,
-		headers:        headers,
-		in:             in,
-		stdout:         w,
-	})
-}
-
-// LoadImageOptions represents the options for LoadImage Docker API Call
-//
-// See https://goo.gl/JyClMX for more details.
-type LoadImageOptions struct {
-	InputStream io.Reader
-}
-
-// LoadImage imports a tarball docker image
-//
-// See https://goo.gl/JyClMX for more details.
-func (c *Client) LoadImage(opts LoadImageOptions) error {
-	return c.stream("POST", "/images/load", streamOptions{
-		setRawTerminal: true,
-		in:             opts.InputStream,
-	})
-}
-
-// ExportImageOptions represent the options for ExportImage Docker API call.
-//
-// See https://goo.gl/le7vK8 for more details.
-type ExportImageOptions struct {
-	Name         string
-	OutputStream io.Writer
-}
-
-// ExportImage exports an image (as a tar file) into the stream.
-//
-// See https://goo.gl/le7vK8 for more details.
-func (c *Client) ExportImage(opts ExportImageOptions) error {
-	return c.stream("GET", fmt.Sprintf("/images/%s/get", opts.Name), streamOptions{
-		setRawTerminal: true,
-		stdout:         opts.OutputStream,
-	})
-}
-
-// ExportImagesOptions represent the options for ExportImages Docker API call
-//
-// See https://goo.gl/huC7HA for more details.
-type ExportImagesOptions struct {
-	Names        []string
-	OutputStream io.Writer `qs:"-"`
-}
-
-// ExportImages exports one or more images (as a tar file) into the stream
-//
-// See https://goo.gl/huC7HA for more details.
-func (c *Client) ExportImages(opts ExportImagesOptions) error {
-	if opts.Names == nil || len(opts.Names) == 0 {
-		return ErrMustSpecifyNames
-	}
-	return c.stream("GET", "/images/get?"+queryString(&opts), streamOptions{
-		setRawTerminal: true,
-		stdout:         opts.OutputStream,
-	})
-}
-
-// ImportImageOptions present the set of informations available for importing
-// an image from a source file or the stdin.
-//
-// See https://goo.gl/iJkZjD for more details.
-type ImportImageOptions struct {
-	Repository string `qs:"repo"`
-	Source     string `qs:"fromSrc"`
-	Tag        string `qs:"tag"`
-
-	InputStream   io.Reader `qs:"-"`
-	OutputStream  io.Writer `qs:"-"`
-	RawJSONStream bool      `qs:"-"`
-}
-
-// ImportImage imports an image from a url, a file or stdin
-//
-// See https://goo.gl/iJkZjD for more details.
-func (c *Client) ImportImage(opts ImportImageOptions) error {
-	if opts.Repository == "" {
-		return ErrNoSuchImage
-	}
-	if opts.Source != "-" {
-		opts.InputStream = nil
-	}
-	if opts.Source != "-" && !isURL(opts.Source) {
-		f, err := os.Open(opts.Source)
-		if err != nil {
-			return err
-		}
-		opts.InputStream = f
-		opts.Source = "-"
-	}
-	return c.createImage(queryString(&opts), nil, opts.InputStream, opts.OutputStream, opts.RawJSONStream)
-}
-
-// BuildImageOptions present the set of informations available for building an
-// image from a tarfile with a Dockerfile in it.
-//
-// For more details about the Docker building process, see
-// http://goo.gl/tlPXPu.
-type BuildImageOptions struct {
-	Name                string             `qs:"t"`
-	Dockerfile          string             `qs:"dockerfile"`
-	NoCache             bool               `qs:"nocache"`
-	SuppressOutput      bool               `qs:"q"`
-	Pull                bool               `qs:"pull"`
-	RmTmpContainer      bool               `qs:"rm"`
-	ForceRmTmpContainer bool               `qs:"forcerm"`
-	Memory              int64              `qs:"memory"`
-	Memswap             int64              `qs:"memswap"`
-	CPUShares           int64              `qs:"cpushares"`
-	CPUSetCPUs          string             `qs:"cpusetcpus"`
-	InputStream         io.Reader          `qs:"-"`
-	OutputStream        io.Writer          `qs:"-"`
-	RawJSONStream       bool               `qs:"-"`
-	Remote              string             `qs:"remote"`
-	Auth                AuthConfiguration  `qs:"-"` // for older docker X-Registry-Auth header
-	AuthConfigs         AuthConfigurations `qs:"-"` // for newer docker X-Registry-Config header
-	ContextDir          string             `qs:"-"`
-	Ulimits             []ULimit           `qs:"-"`
-}
-
-// BuildImage builds an image from a tarball's url or a Dockerfile in the input
-// stream.
-//
-// See https://goo.gl/xySxCe for more details.
-func (c *Client) BuildImage(opts BuildImageOptions) error {
-	if opts.OutputStream == nil {
-		return ErrMissingOutputStream
-	}
-	headers, err := headersWithAuth(opts.Auth, c.versionedAuthConfigs(opts.AuthConfigs))
-	if err != nil {
-		return err
-	}
-
-	if opts.Remote != "" && opts.Name == "" {
-		opts.Name = opts.Remote
-	}
-	if opts.InputStream != nil || opts.ContextDir != "" {
-		headers["Content-Type"] = "application/tar"
-	} else if opts.Remote == "" {
-		return ErrMissingRepo
-	}
-	if opts.ContextDir != "" {
-		if opts.InputStream != nil {
-			return ErrMultipleContexts
-		}
-		var err error
-		if opts.InputStream, err = createTarStream(opts.ContextDir, opts.Dockerfile); err != nil {
-			return err
-		}
-	}
-
-	qs := queryString(&opts)
-	if len(opts.Ulimits) > 0 {
-		if b, err := json.Marshal(opts.Ulimits); err == nil {
-			item := url.Values(map[string][]string{})
-			item.Add("ulimits", string(b))
-			qs = fmt.Sprintf("%s&%s", qs, item.Encode())
-		}
-	}
-
-	return c.stream("POST", fmt.Sprintf("/build?%s", qs), streamOptions{
-		setRawTerminal: true,
-		rawJSONStream:  opts.RawJSONStream,
-		headers:        headers,
-		in:             opts.InputStream,
-		stdout:         opts.OutputStream,
-	})
-}
-
-func (c *Client) versionedAuthConfigs(authConfigs AuthConfigurations) interface{} {
-	if c.serverAPIVersion == nil {
-		c.checkAPIVersion()
-	}
-	if c.serverAPIVersion != nil && c.serverAPIVersion.GreaterThanOrEqualTo(apiVersion119) {
-		return AuthConfigurations119(authConfigs.Configs)
-	}
-	return authConfigs
-}
-
-// TagImageOptions present the set of options to tag an image.
-//
-// See https://goo.gl/98ZzkU for more details.
-type TagImageOptions struct {
-	Repo  string
-	Tag   string
-	Force bool
-}
-
-// TagImage adds a tag to the image identified by the given name.
-//
-// See https://goo.gl/98ZzkU for more details.
-func (c *Client) TagImage(name string, opts TagImageOptions) error {
-	if name == "" {
-		return ErrNoSuchImage
-	}
-	resp, err := c.do("POST", fmt.Sprintf("/images/"+name+"/tag?%s",
-		queryString(&opts)), doOptions{})
-
-	if err != nil {
-		return err
-	}
-
-	defer resp.Body.Close()
-
-	if resp.StatusCode == http.StatusNotFound {
-		return ErrNoSuchImage
-	}
-
-	return err
-}
-
-func isURL(u string) bool {
-	p, err := url.Parse(u)
-	if err != nil {
-		return false
-	}
-	return p.Scheme == "http" || p.Scheme == "https"
-}
-
-func headersWithAuth(auths ...interface{}) (map[string]string, error) {
-	var headers = make(map[string]string)
-
-	for _, auth := range auths {
-		switch auth.(type) {
-		case AuthConfiguration:
-			var buf bytes.Buffer
-			if err := json.NewEncoder(&buf).Encode(auth); err != nil {
-				return nil, err
-			}
-			headers["X-Registry-Auth"] = base64.URLEncoding.EncodeToString(buf.Bytes())
-		case AuthConfigurations, AuthConfigurations119:
-			var buf bytes.Buffer
-			if err := json.NewEncoder(&buf).Encode(auth); err != nil {
-				return nil, err
-			}
-			headers["X-Registry-Config"] = base64.URLEncoding.EncodeToString(buf.Bytes())
-		}
-	}
-
-	return headers, nil
-}
-
-// APIImageSearch reflect the result of a search on the Docker Hub.
-//
-// See https://goo.gl/AYjyrF for more details.
-type APIImageSearch struct {
-	Description string `json:"description,omitempty" yaml:"description,omitempty"`
-	IsOfficial  bool   `json:"is_official,omitempty" yaml:"is_official,omitempty"`
-	IsAutomated bool   `json:"is_automated,omitempty" yaml:"is_automated,omitempty"`
-	Name        string `json:"name,omitempty" yaml:"name,omitempty"`
-	StarCount   int    `json:"star_count,omitempty" yaml:"star_count,omitempty"`
-}
-
-// SearchImages search the docker hub with a specific given term.
-//
-// See https://goo.gl/AYjyrF for more details.
-func (c *Client) SearchImages(term string) ([]APIImageSearch, error) {
-	resp, err := c.do("GET", "/images/search?term="+term, doOptions{})
-	defer resp.Body.Close()
-	if err != nil {
-		return nil, err
-	}
-	var searchResult []APIImageSearch
-	if err := json.NewDecoder(resp.Body).Decode(&searchResult); err != nil {
-		return nil, err
-	}
-	return searchResult, nil
-}
-
-// SearchImagesEx search the docker hub with a specific given term and authentication.
-//
-// See https://goo.gl/AYjyrF for more details.
-func (c *Client) SearchImagesEx(term string, auth AuthConfiguration) ([]APIImageSearch, error) {
-	headers, err := headersWithAuth(auth)
-	if err != nil {
-		return nil, err
-	}
-
-	resp, err := c.do("GET", "/images/search?term="+term, doOptions{
-		headers: headers,
-	})
-	if err != nil {
-		return nil, err
-	}
-
-	defer resp.Body.Close()
-
-	var searchResult []APIImageSearch
-	if err := json.NewDecoder(resp.Body).Decode(&searchResult); err != nil {
-		return nil, err
-	}
-
-	return searchResult, nil
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/misc.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/misc.go
deleted file mode 100644
index 34c96531a..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/misc.go
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright 2015 go-dockerclient 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 docker
-
-import "strings"
-
-// Version returns version information about the docker server.
-//
-// See https://goo.gl/ND9R8L for more details.
-func (c *Client) Version() (*Env, error) {
-	resp, err := c.do("GET", "/version", doOptions{})
-	if err != nil {
-		return nil, err
-	}
-	defer resp.Body.Close()
-	var env Env
-	if err := env.Decode(resp.Body); err != nil {
-		return nil, err
-	}
-	return &env, nil
-}
-
-// Info returns system-wide information about the Docker server.
-//
-// See https://goo.gl/ElTHi2 for more details.
-func (c *Client) Info() (*Env, error) {
-	resp, err := c.do("GET", "/info", doOptions{})
-	if err != nil {
-		return nil, err
-	}
-	defer resp.Body.Close()
-	var info Env
-	if err := info.Decode(resp.Body); err != nil {
-		return nil, err
-	}
-	return &info, nil
-}
-
-// ParseRepositoryTag gets the name of the repository and returns it splitted
-// in two parts: the repository and the tag.
-//
-// Some examples:
-//
-//     localhost.localdomain:5000/samalba/hipache:latest -> localhost.localdomain:5000/samalba/hipache, latest
-//     localhost.localdomain:5000/samalba/hipache -> localhost.localdomain:5000/samalba/hipache, ""
-func ParseRepositoryTag(repoTag string) (repository string, tag string) {
-	n := strings.LastIndex(repoTag, ":")
-	if n < 0 {
-		return repoTag, ""
-	}
-	if tag := repoTag[n+1:]; !strings.Contains(tag, "/") {
-		return repoTag[:n], tag
-	}
-	return repoTag, ""
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/network.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/network.go
deleted file mode 100644
index 8fa7091e4..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/network.go
+++ /dev/null
@@ -1,143 +0,0 @@
-// Copyright 2015 go-dockerclient 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 docker
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-	"net/http"
-)
-
-// ErrNetworkAlreadyExists is the error returned by CreateNetwork when the
-// network already exists.
-var ErrNetworkAlreadyExists = errors.New("network already exists")
-
-// Network represents a network.
-//
-// See https://goo.gl/FDkCdQ for more details.
-type Network struct {
-	Name      string      `json:"name"`
-	ID        string      `json:"id"`
-	Type      string      `json:"type"`
-	Endpoints []*Endpoint `json:"endpoints"`
-}
-
-// Endpoint represents an endpoint.
-//
-// See https://goo.gl/FDkCdQ for more details.
-type Endpoint struct {
-	Name    string `json:"name"`
-	ID      string `json:"id"`
-	Network string `json:"network"`
-}
-
-// ListNetworks returns all networks.
-//
-// See https://goo.gl/4hCNtZ for more details.
-func (c *Client) ListNetworks() ([]Network, error) {
-	resp, err := c.do("GET", "/networks", doOptions{})
-	if err != nil {
-		return nil, err
-	}
-	defer resp.Body.Close()
-	var networks []Network
-	if err := json.NewDecoder(resp.Body).Decode(&networks); err != nil {
-		return nil, err
-	}
-	return networks, nil
-}
-
-// NetworkInfo returns information about a network by its ID.
-//
-// See https://goo.gl/4hCNtZ for more details.
-func (c *Client) NetworkInfo(id string) (*Network, error) {
-	path := "/networks/" + id
-	resp, err := c.do("GET", path, doOptions{})
-	if err != nil {
-		if e, ok := err.(*Error); ok && e.Status == http.StatusNotFound {
-			return nil, &NoSuchNetwork{ID: id}
-		}
-		return nil, err
-	}
-	defer resp.Body.Close()
-	var network Network
-	if err := json.NewDecoder(resp.Body).Decode(&network); err != nil {
-		return nil, err
-	}
-	return &network, nil
-}
-
-// CreateNetworkOptions specify parameters to the CreateNetwork function and
-// (for now) is the expected body of the "create network" http request message
-//
-// See https://goo.gl/FDkCdQ for more details.
-type CreateNetworkOptions struct {
-	Name        string                 `json:"name"`
-	NetworkType string                 `json:"network_type"`
-	Options     map[string]interface{} `json:"options"`
-}
-
-// CreateNetwork creates a new network, returning the network instance,
-// or an error in case of failure.
-//
-// See https://goo.gl/FDkCdQ for more details.
-func (c *Client) CreateNetwork(opts CreateNetworkOptions) (*Network, error) {
-	resp, err := c.do(
-		"POST",
-		"/networks",
-		doOptions{
-			data: opts,
-		},
-	)
-	if err != nil {
-		if e, ok := err.(*Error); ok && e.Status == http.StatusConflict {
-			return nil, ErrNetworkAlreadyExists
-		}
-		return nil, err
-	}
-	defer resp.Body.Close()
-
-	type createNetworkResponse struct {
-		ID string
-	}
-	var (
-		network Network
-		cnr     createNetworkResponse
-	)
-	if err := json.NewDecoder(resp.Body).Decode(&cnr); err != nil {
-		return nil, err
-	}
-
-	network.Name = opts.Name
-	network.ID = cnr.ID
-	network.Type = opts.NetworkType
-
-	return &network, nil
-}
-
-// RemoveNetwork removes a network or an error in case of failure.
-//
-// See https://goo.gl/FDkCdQ for more details.
-func (c *Client) RemoveNetwork(id string) error {
-	resp, err := c.do("DELETE", "/networks/"+id, doOptions{})
-	if err != nil {
-		if e, ok := err.(*Error); ok && e.Status == http.StatusNotFound {
-			return &NoSuchNetwork{ID: id}
-		}
-		return err
-	}
-	resp.Body.Close()
-	return nil
-}
-
-// NoSuchNetwork is the error returned when a given network does not exist.
-type NoSuchNetwork struct {
-	ID string
-}
-
-func (err *NoSuchNetwork) Error() string {
-	return fmt.Sprintf("No such network: %s", err.ID)
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/signal.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/signal.go
deleted file mode 100644
index 16aa00388..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/signal.go
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright 2014 go-dockerclient 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 docker
-
-// Signal represents a signal that can be send to the container on
-// KillContainer call.
-type Signal int
-
-// These values represent all signals available on Linux, where containers will
-// be running.
-const (
-	SIGABRT   = Signal(0x6)
-	SIGALRM   = Signal(0xe)
-	SIGBUS    = Signal(0x7)
-	SIGCHLD   = Signal(0x11)
-	SIGCLD    = Signal(0x11)
-	SIGCONT   = Signal(0x12)
-	SIGFPE    = Signal(0x8)
-	SIGHUP    = Signal(0x1)
-	SIGILL    = Signal(0x4)
-	SIGINT    = Signal(0x2)
-	SIGIO     = Signal(0x1d)
-	SIGIOT    = Signal(0x6)
-	SIGKILL   = Signal(0x9)
-	SIGPIPE   = Signal(0xd)
-	SIGPOLL   = Signal(0x1d)
-	SIGPROF   = Signal(0x1b)
-	SIGPWR    = Signal(0x1e)
-	SIGQUIT   = Signal(0x3)
-	SIGSEGV   = Signal(0xb)
-	SIGSTKFLT = Signal(0x10)
-	SIGSTOP   = Signal(0x13)
-	SIGSYS    = Signal(0x1f)
-	SIGTERM   = Signal(0xf)
-	SIGTRAP   = Signal(0x5)
-	SIGTSTP   = Signal(0x14)
-	SIGTTIN   = Signal(0x15)
-	SIGTTOU   = Signal(0x16)
-	SIGUNUSED = Signal(0x1f)
-	SIGURG    = Signal(0x17)
-	SIGUSR1   = Signal(0xa)
-	SIGUSR2   = Signal(0xc)
-	SIGVTALRM = Signal(0x1a)
-	SIGWINCH  = Signal(0x1c)
-	SIGXCPU   = Signal(0x18)
-	SIGXFSZ   = Signal(0x19)
-)
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/tar.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/tar.go
deleted file mode 100644
index 48042cbda..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/tar.go
+++ /dev/null
@@ -1,117 +0,0 @@
-// Copyright 2015 go-dockerclient 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 docker
-
-import (
-	"fmt"
-	"io"
-	"io/ioutil"
-	"os"
-	"path"
-	"path/filepath"
-	"strings"
-
-	"github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive"
-	"github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/fileutils"
-)
-
-func createTarStream(srcPath, dockerfilePath string) (io.ReadCloser, error) {
-	excludes, err := parseDockerignore(srcPath)
-	if err != nil {
-		return nil, err
-	}
-
-	includes := []string{"."}
-
-	// If .dockerignore mentions .dockerignore or the Dockerfile
-	// then make sure we send both files over to the daemon
-	// because Dockerfile is, obviously, needed no matter what, and
-	// .dockerignore is needed to know if either one needs to be
-	// removed.  The deamon will remove them for us, if needed, after it
-	// parses the Dockerfile.
-	//
-	// https://github.com/docker/docker/issues/8330
-	//
-	forceIncludeFiles := []string{".dockerignore", dockerfilePath}
-
-	for _, includeFile := range forceIncludeFiles {
-		if includeFile == "" {
-			continue
-		}
-		keepThem, err := fileutils.Matches(includeFile, excludes)
-		if err != nil {
-			return nil, fmt.Errorf("cannot match .dockerfile: '%s', error: %s", includeFile, err)
-		}
-		if keepThem {
-			includes = append(includes, includeFile)
-		}
-	}
-
-	if err := validateContextDirectory(srcPath, excludes); err != nil {
-		return nil, err
-	}
-	tarOpts := &archive.TarOptions{
-		ExcludePatterns: excludes,
-		IncludeFiles:    includes,
-		Compression:     archive.Uncompressed,
-		NoLchown:        true,
-	}
-	return archive.TarWithOptions(srcPath, tarOpts)
-}
-
-// validateContextDirectory checks if all the contents of the directory
-// can be read and returns an error if some files can't be read.
-// Symlinks which point to non-existing files don't trigger an error
-func validateContextDirectory(srcPath string, excludes []string) error {
-	return filepath.Walk(filepath.Join(srcPath, "."), func(filePath string, f os.FileInfo, err error) error {
-		// skip this directory/file if it's not in the path, it won't get added to the context
-		if relFilePath, err := filepath.Rel(srcPath, filePath); err != nil {
-			return err
-		} else if skip, err := fileutils.Matches(relFilePath, excludes); err != nil {
-			return err
-		} else if skip {
-			if f.IsDir() {
-				return filepath.SkipDir
-			}
-			return nil
-		}
-
-		if err != nil {
-			if os.IsPermission(err) {
-				return fmt.Errorf("can't stat '%s'", filePath)
-			}
-			if os.IsNotExist(err) {
-				return nil
-			}
-			return err
-		}
-
-		// skip checking if symlinks point to non-existing files, such symlinks can be useful
-		// also skip named pipes, because they hanging on open
-		if f.Mode()&(os.ModeSymlink|os.ModeNamedPipe) != 0 {
-			return nil
-		}
-
-		if !f.IsDir() {
-			currentFile, err := os.Open(filePath)
-			if err != nil && os.IsPermission(err) {
-				return fmt.Errorf("no permission to read from '%s'", filePath)
-			}
-			currentFile.Close()
-		}
-		return nil
-	})
-}
-
-func parseDockerignore(root string) ([]string, error) {
-	var excludes []string
-	ignore, err := ioutil.ReadFile(path.Join(root, ".dockerignore"))
-	if err != nil && !os.IsNotExist(err) {
-		return excludes, fmt.Errorf("error reading .dockerignore: '%s'", err)
-	}
-	excludes = strings.Split(string(ignore), "\n")
-
-	return excludes, nil
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/data/.dockerignore b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/data/.dockerignore
deleted file mode 100644
index 027e8c20e..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/data/.dockerignore
+++ /dev/null
@@ -1,3 +0,0 @@
-container.tar
-dockerfile.tar
-foofile
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/data/Dockerfile b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/data/Dockerfile
deleted file mode 100644
index 0948dcfa8..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/data/Dockerfile
+++ /dev/null
@@ -1,15 +0,0 @@
-# this file describes how to build tsuru python image
-# to run it:
-# 1- install docker
-# 2- run: $ docker build -t tsuru/python https://raw.github.com/tsuru/basebuilder/master/python/Dockerfile
-
-from	base:ubuntu-quantal
-run	apt-get install wget -y --force-yes
-run	wget http://github.com/tsuru/basebuilder/tarball/master -O basebuilder.tar.gz --no-check-certificate
-run	mkdir /var/lib/tsuru
-run	tar -xvf basebuilder.tar.gz -C /var/lib/tsuru --strip 1
-run	cp /var/lib/tsuru/python/deploy /var/lib/tsuru
-run	cp /var/lib/tsuru/base/restart /var/lib/tsuru
-run	cp /var/lib/tsuru/base/start /var/lib/tsuru
-run	/var/lib/tsuru/base/install
-run	/var/lib/tsuru/base/setup
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/data/barfile b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/data/barfile
deleted file mode 100644
index e69de29bb..000000000
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/data/ca.pem b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/data/ca.pem
deleted file mode 100644
index 8e38bba13..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/data/ca.pem
+++ /dev/null
@@ -1,18 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIC1TCCAb+gAwIBAgIQJ9MsNxrUxumNbAytGi3GEDALBgkqhkiG9w0BAQswFjEU
-MBIGA1UEChMLQm9vdDJEb2NrZXIwHhcNMTQxMDE2MjAyMTM4WhcNMTcwOTMwMjAy
-MTM4WjAWMRQwEgYDVQQKEwtCb290MkRvY2tlcjCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBALpFCSARjG+5yXoqr7UMzuE0df7RRZfeRZI06lJ02ZqV4Iii
-rgL7ML9yPxX50NbLnjiilSDTUhnyocYFItokzUzz8qpX/nlYhuN2Iqwh4d0aWS8z
-f5y248F+H1z+HY2W8NPl/6DVlVwYaNW1/k+RPMlHS0INLR6j+3Ievew7RNE0NnM2
-znELW6NetekDt3GUcz0Z95vDUDfdPnIk1eIFMmYvLxZh23xOca4Q37a3S8F3d+dN
-+OOpwjdgY9Qme0NQUaXpgp58jWuQfB8q7mZrdnLlLqRa8gx1HeDSotX7UmWtWPkb
-vd9EdlKLYw5PVpxMV1rkwf2t4TdgD5NfkpXlXkkCAwEAAaMjMCEwDgYDVR0PAQH/
-BAQDAgCkMA8GA1UdEwEB/wQFMAMBAf8wCwYJKoZIhvcNAQELA4IBAQBxYjHVSKqE
-MJw7CW0GddesULtXXVWGJuZdWJLQlPvPMfIfjIvlcZyS4cdVNiQ3sREFIZz8TpII
-CT0/Pg3sgv/FcOQe1CN0xZYZcyiAZHK1z0fJQq2qVpdv7+tJcjI2vvU6NI24iQCo
-W1wz25trJz9QbdB2MRLMjyz7TSWuafztIvcfEzaIdQ0Whqund/cSuPGQx5IwF83F
-rvlkOyJSH2+VIEBTCIuykJeL0DLTt8cePBQR5L1ISXb4RUMK9ZtqRscBRv8sn7o2
-ixG3wtL0gYF4xLtsQWVxI3iFVrU3WzOH/3c5shVRkWBd+AQRSwCJI4mKH7penJCF
-i3/zzlkvOnjV
------END CERTIFICATE-----
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/data/cert.pem b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/data/cert.pem
deleted file mode 100644
index 5e7244b24..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/data/cert.pem
+++ /dev/null
@@ -1,18 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIC6DCCAdKgAwIBAgIRANO6ymxQAjp66KmEka1G6b0wCwYJKoZIhvcNAQELMBYx
-FDASBgNVBAoTC0Jvb3QyRG9ja2VyMB4XDTE0MTAxNjIwMjE1MloXDTE3MDkzMDIw
-MjE1MlowFjEUMBIGA1UEChMLQm9vdDJEb2NrZXIwggEiMA0GCSqGSIb3DQEBAQUA
-A4IBDwAwggEKAoIBAQDGA1mAhSOpZspD1dpZ7qVEQrIJw4Xo8252jHaORnEdDiFm
-b6brEmr6jw8t4P3IGxbqBc/TqRV+SSXxwYEVvfpeQKH+SmqStoMNtD3Ura161az4
-V0BcxMtSlsUGpoz+//QCAq8qiaxMwgiyc5253mkQm88anj2cNt7xbewiu/KFWuf7
-BVpNK1+ltpJmlukfcj/G+I1bw7j1KxBjDrFqe5cyDuuZcDL2tmUXP/ZWDyXwSv+H
-AOckqn44z6aXlBkVvOXDBZJqY76d/vWVDNCuZeXRnqlhP3t1kH4V0RQXo+JD2tgt
-JgdU0unzyoFOSWNUBPm73tqmjUGGAmGHBmeegJr/AgMBAAGjNTAzMA4GA1UdDwEB
-/wQEAwIAgDATBgNVHSUEDDAKBggrBgEFBQcDAjAMBgNVHRMBAf8EAjAAMAsGCSqG
-SIb3DQEBCwOCAQEABVTWl5SmBP+j5He5bQsgnIXjviSKqe40/10V4LJAOmilycRF
-zLrzM+YMwfjg6PLIs8CldAMWHw9y9ktZY4MxkgCktaiaN/QmMTMwFWEcN4wy5IpM
-U5l93eAg7xsnY430h3QBBADujX4wdF3fs8rSL8zAAQFL0ihurwU124K3yXKsrwpb
-CiVUGfIN4sPwjy8Ws9oxHFDC9/P8lgjHZ1nBIf8KSHnMzlxDGj7isQfhtH+7mcCL
-cM1qO2NirS2v7uaEPPY+MJstAz+W7EJCW9dfMSmHna2SDC37Xkin7uEY9z+qaKFL
-8d/XxOB/L8Ucy8VZhdsv0dsBq5KfJntITM0ksQ==
------END CERTIFICATE-----
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/data/container.tar b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/data/container.tar
deleted file mode 100644
index e4b066e3b..000000000
Binary files a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/data/container.tar and /dev/null differ
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/data/dockerfile.tar b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/data/dockerfile.tar
deleted file mode 100644
index 32c9ce647..000000000
Binary files a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/data/dockerfile.tar and /dev/null differ
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/data/foofile b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/data/foofile
deleted file mode 100644
index e69de29bb..000000000
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/data/key.pem b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/data/key.pem
deleted file mode 100644
index a9346bcf4..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/data/key.pem
+++ /dev/null
@@ -1,27 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEowIBAAKCAQEAxgNZgIUjqWbKQ9XaWe6lREKyCcOF6PNudox2jkZxHQ4hZm+m
-6xJq+o8PLeD9yBsW6gXP06kVfkkl8cGBFb36XkCh/kpqkraDDbQ91K2tetWs+FdA
-XMTLUpbFBqaM/v/0AgKvKomsTMIIsnOdud5pEJvPGp49nDbe8W3sIrvyhVrn+wVa
-TStfpbaSZpbpH3I/xviNW8O49SsQYw6xanuXMg7rmXAy9rZlFz/2Vg8l8Er/hwDn
-JKp+OM+ml5QZFbzlwwWSamO+nf71lQzQrmXl0Z6pYT97dZB+FdEUF6PiQ9rYLSYH
-VNLp88qBTkljVAT5u97apo1BhgJhhwZnnoCa/wIDAQABAoIBAQCaGy9EC9pmU95l
-DwGh7k5nIrUnTilg1FwLHWSDdCVCZKXv8ENrPelOWZqJrUo1u4eI2L8XTsewgkNq
-tJu/DRzWz9yDaO0qg6rZNobMh+K076lvmZA44twOydJLS8H+D7ua+PXU2FLlZjmY
-kMyXRJZmW6zCXZc7haTbJx6ZJccoquk/DkS4FcFurJP177u1YrWS9TTw9kensUtU
-jQ63uf56UTN1i+0+Rxl7OW1TZlqwlri5I4njg5249+FxwwHzIq8+l7zD7K9pl8c/
-nG1HuulvU2bVlDlRdyslMPAH34vw9Sku1BD8furrJLr1na5lRSLKJODEaIPEsLwv
-CdEUwP9JAoGBAO76ZW80RyNB2fA+wbTq70Sr8CwrXxYemXrez5LKDC7SsohKFCPE
-IedpO/n+nmymiiJvMm874EExoG6BVrbkWkeb+2vinEfOQNlDMsDx7WLjPekP3t6i
-rXHO3CjFooVFq2z3mZa/Nc5NZqu8fNWNCKJxZDJphdoj6sORNJIUvZVjAoGBANQd
-++J+ITcu3/+A6JrGcgLunBFQYPqkiItk0J4QKYKuX5ik9rWcQDN8TTtfW2mDuiQ4
-NrCwuVPq1V1kB16JzH017SsYLo9g8I20YjnBZge9pKTeUaLVTb3C50LW8FBylop0
-Bnm597dNbtSjphjoTMg0XyC19o3Esf2YeWG0QNS1AoGAWWDfFRNJU99qIldmXULM
-0DM6NVrXSk+ReYnhunXEzrJQwXZrR+EwCPurydk36Uz0NuK9yypquhdUeF/5TZfk
-SAoHo5byekyipl9imRUigqyY2BTudvgCxKDoaHtaSFwBPFTyZZYICquaLbrmOXxw
-8UhVgCFFRYvPXuts7QHC0h8CgYBWEvy9gfU0kV7wLX02IUTuj6jhFb7ktpN6DSTi
-nyhZES1VoctDEu6ydcRZTW6ouH12aSE4Pd5WgTqntQmQgVZrkNB25k8ue2Xh+srJ
-KQOgLIJ9LIHwE6KCWG7DnrjRzE3uTPq7to0g4tkQjH/AJ7PQof/gJDayfJjFkXPg
-A+cy6QKBgEPbKpiqscm03gT2QanBut5pg4dqPOxp0SlErA3kSFNTRK3oYBQPC+LH
-qA5nD5brdkeNBB58Rll8Zpzxiff50bcvLP/7/Sb3NjaXFTEY0gVbdRof3n6N0YP3
-Hu5XDNJ9RNkNzE5RIG1g86KE+aKlcrKMaigqAiuIy2PSnjkQeGk8
------END RSA PRIVATE KEY-----
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/data/server.pem b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/data/server.pem
deleted file mode 100644
index 89cc445e1..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/data/server.pem
+++ /dev/null
@@ -1,18 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIC/DCCAeagAwIBAgIQMUILcXtvmSOK63zEBo0VXzALBgkqhkiG9w0BAQswFjEU
-MBIGA1UEChMLQm9vdDJEb2NrZXIwHhcNMTQxMDE2MjAyMTQ2WhcNMTcwOTMwMjAy
-MTQ2WjAWMRQwEgYDVQQKEwtCb290MkRvY2tlcjCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBANxUOUhNnqFnrTlLsBYzfFRZWQo268l+4K4lOJCVbfDonP3g
-Mz0vGi9fcyFqEWSA8Y+ShXna625HTnReCwFdsu0861qCIq7v95hFFCyOe0iIxpd0
-AKLnl90d+1vonE7andgFgoobbTiMly4UK4H6z8D148fFNIihoteOG3PIF89TFxP7
-CJ/3wXnx/IKpdlO8PAnub3tBPJHvGDj7KORLy4IBxRX5VBAdfGNybE66fcrehEva
-rLA4m9pgiaR/Nnr9FdKhPyqYdjflLNvzydxNvMIV4M0hFlhXmYvpMjA5/XsTnsyV
-t9JHJa5Upwqsbne08t7rsm7liZNxZlko8xPOTQcCAwEAAaNKMEgwDgYDVR0PAQH/
-BAQDAgCgMAwGA1UdEwEB/wQCMAAwKAYDVR0RBCEwH4ILYm9vdDJkb2NrZXKHBH8A
-AAGHBAoAAg+HBMCoO2cwCwYJKoZIhvcNAQELA4IBAQAYoYcDkDWkl73FZ0WnPmAj
-LiF7HU95Qg3KyEpFsAJeShSLPPbQntmwhdekEzY4tQ3eKQB/+zHFjzsCr/lmDUmH
-Ea/ryQ17C+jyH+Ykg0IWW6L6veZhvRDg6Z9focVtPVBRxPTqC/Qhb54blWRASV+W
-UreMuXQ5+1dQptAM7ixOeLVHjBi/bd9TL3jvwBVCr9QedteMjjK4TCF9Tbcou+MF
-2w3OJJZMDhcD+YwoK9uJDqlKmcTm/vVMbSsp/pTMcnQ7jxCeR8/XyX+VwTZwaHAa
-o92Q/eg3THAiWhvyT/SzyH9dHHBAyXynUwGCggKawHktfvW4QXRPuLxLrJ7iB5cy
------END CERTIFICATE-----
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/data/serverkey.pem b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/data/serverkey.pem
deleted file mode 100644
index c897e5da5..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/data/serverkey.pem
+++ /dev/null
@@ -1,27 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEoAIBAAKCAQEA3FQ5SE2eoWetOUuwFjN8VFlZCjbryX7griU4kJVt8Oic/eAz
-PS8aL19zIWoRZIDxj5KFedrrbkdOdF4LAV2y7TzrWoIiru/3mEUULI57SIjGl3QA
-oueX3R37W+icTtqd2AWCihttOIyXLhQrgfrPwPXjx8U0iKGi144bc8gXz1MXE/sI
-n/fBefH8gql2U7w8Ce5ve0E8ke8YOPso5EvLggHFFflUEB18Y3JsTrp9yt6ES9qs
-sDib2mCJpH82ev0V0qE/Kph2N+Us2/PJ3E28whXgzSEWWFeZi+kyMDn9exOezJW3
-0kclrlSnCqxud7Ty3uuybuWJk3FmWSjzE85NBwIDAQABAoIBAG0ak+cW8LeShHf7
-3+2Of0GxoOLrAWWdG5uAuPr31CJYve0FybnBimDtDjD8ujIfm/7xmoEWBEFutA3x
-x9dcU88gvJbsHEqub9gKVQwfXjMz78tt2SbSMiR/xUnk7QorPcCMMfE71aEMFYzu
-1gCed6Rg3vO81t/V0rKVH0j9S7UQz5v/oX15eVDV5LOqyCHwAi6K0eXXbqnbI0TH
-SOQ/nexM2msVXWbO9t6ra6f5V7FXziDK5Xi+rPxRbX9mkrDzxDAevfuRqYBx5vtL
-W2Q2hKjUAHFgXFniNSZBS7dCdAtz0el/3ct+cNmpuTMhhs7M6wC1CuYiZ/DxLiFh
-Si73VckCgYEA+/ceh3+VjtQ0rgEw8sD9bqYEA8IaBiObjneIoFnKBYRG7yZd8JMm
-HD4M/aQ1qhcRLPN7GR03YQULgQJURbKSjJHnhfTXHyeHC3NN4gMVHQXewu2MHCh6
-7FCQ9CfK0KcYLgegVVvL3PrF3hyWGnmTu+G0UkDQRYVnaNrB7snrW6UCgYEA39tq
-+MCQdu0moJ5szSZf02undg9EeW6isk9qzi7TId3/MLci2eH7PEnipipPUK3+DERq
-aba0y0TKgBR2EXvXLFJA/+kfdo2loIEHOfox85HVfxgUaFRti63ZI0uF8D0QT2Yy
-oJal+RFghVoSnv4LjhRKEPbIkScTXGjdK+7wFjsCfz79iKRXQQx0ALd/lL0bgkAn
-QNmvrNHcFQeI2p8700WNzC39aX67SsvEt3qxkrjzC1gxhpTAuReIK1gVPPwvqHN8
-BmV20FD5kMlMCix2mNCopwgUWvKvLAvoGFTxncKMA39+aJbuXAjiqJTekKgNvOE7
-i9kEWw0GTNPp3JHV6QECgYAPwb0M11kT1euDIMOdyRazpf86kyaJuZzgGjD1ZFxe
-JOcigbGFTp/FhZnbglzk2+pm6KXo3QBq0mPCki4hWusxZnTGzpz1VlETNCHTFeZQ
-M7KoaIR/N3oie9Et59H8r/+m5xWnMhNqratyl316DX24uXrhKM3DUdHODl+LCR2D
-IwKBgE1MbHuwolUPEw3HeO4R7NMFVTFei7E/fpUsimPfArGg8UydwvloNT1myJos
-N2JzfGGjN2KPVcBk9fOs71mJ6VcK3C3g5JIccplk6h9VNaw55+zdQvKPTzoBoTvy
-A+Fwx2AlF61KeRF87DL2YTRJ6B9MHmWgf7+GVZOxomLgEAcZ
------END RSA PRIVATE KEY-----
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/server.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/server.go
deleted file mode 100644
index 5052e2d05..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/server.go
+++ /dev/null
@@ -1,1096 +0,0 @@
-// Copyright 2015 go-dockerclient 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 testing provides a fake implementation of the Docker API, useful for
-// testing purpose.
-package testing
-
-import (
-	"archive/tar"
-	"crypto/rand"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"io/ioutil"
-	mathrand "math/rand"
-	"net"
-	"net/http"
-	"regexp"
-	"strconv"
-	"strings"
-	"sync"
-	"time"
-
-	"github.com/fsouza/go-dockerclient"
-	"github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/stdcopy"
-	"github.com/fsouza/go-dockerclient/external/github.com/gorilla/mux"
-)
-
-var nameRegexp = regexp.MustCompile(`^[a-zA-Z0-9][a-zA-Z0-9_.-]+$`)
-
-// DockerServer represents a programmable, concurrent (not much), HTTP server
-// implementing a fake version of the Docker remote API.
-//
-// It can used in standalone mode, listening for connections or as an arbitrary
-// HTTP handler.
-//
-// For more details on the remote API, check http://goo.gl/G3plxW.
-type DockerServer struct {
-	containers     []*docker.Container
-	execs          []*docker.ExecInspect
-	execMut        sync.RWMutex
-	cMut           sync.RWMutex
-	images         []docker.Image
-	iMut           sync.RWMutex
-	imgIDs         map[string]string
-	networks       []*docker.Network
-	netMut         sync.RWMutex
-	listener       net.Listener
-	mux            *mux.Router
-	hook           func(*http.Request)
-	failures       map[string]string
-	multiFailures  []map[string]string
-	execCallbacks  map[string]func()
-	statsCallbacks map[string]func(string) docker.Stats
-	customHandlers map[string]http.Handler
-	handlerMutex   sync.RWMutex
-	cChan          chan<- *docker.Container
-}
-
-// NewServer returns a new instance of the fake server, in standalone mode. Use
-// the method URL to get the URL of the server.
-//
-// It receives the bind address (use 127.0.0.1:0 for getting an available port
-// on the host), a channel of containers and a hook function, that will be
-// called on every request.
-//
-// The fake server will send containers in the channel whenever the container
-// changes its state, via the HTTP API (i.e.: create, start and stop). This
-// channel may be nil, which means that the server won't notify on state
-// changes.
-func NewServer(bind string, containerChan chan<- *docker.Container, hook func(*http.Request)) (*DockerServer, error) {
-	listener, err := net.Listen("tcp", bind)
-	if err != nil {
-		return nil, err
-	}
-	server := DockerServer{
-		listener:       listener,
-		imgIDs:         make(map[string]string),
-		hook:           hook,
-		failures:       make(map[string]string),
-		execCallbacks:  make(map[string]func()),
-		statsCallbacks: make(map[string]func(string) docker.Stats),
-		customHandlers: make(map[string]http.Handler),
-		cChan:          containerChan,
-	}
-	server.buildMuxer()
-	go http.Serve(listener, &server)
-	return &server, nil
-}
-
-func (s *DockerServer) notify(container *docker.Container) {
-	if s.cChan != nil {
-		s.cChan <- container
-	}
-}
-
-func (s *DockerServer) buildMuxer() {
-	s.mux = mux.NewRouter()
-	s.mux.Path("/commit").Methods("POST").HandlerFunc(s.handlerWrapper(s.commitContainer))
-	s.mux.Path("/containers/json").Methods("GET").HandlerFunc(s.handlerWrapper(s.listContainers))
-	s.mux.Path("/containers/create").Methods("POST").HandlerFunc(s.handlerWrapper(s.createContainer))
-	s.mux.Path("/containers/{id:.*}/json").Methods("GET").HandlerFunc(s.handlerWrapper(s.inspectContainer))
-	s.mux.Path("/containers/{id:.*}/rename").Methods("POST").HandlerFunc(s.handlerWrapper(s.renameContainer))
-	s.mux.Path("/containers/{id:.*}/top").Methods("GET").HandlerFunc(s.handlerWrapper(s.topContainer))
-	s.mux.Path("/containers/{id:.*}/start").Methods("POST").HandlerFunc(s.handlerWrapper(s.startContainer))
-	s.mux.Path("/containers/{id:.*}/kill").Methods("POST").HandlerFunc(s.handlerWrapper(s.stopContainer))
-	s.mux.Path("/containers/{id:.*}/stop").Methods("POST").HandlerFunc(s.handlerWrapper(s.stopContainer))
-	s.mux.Path("/containers/{id:.*}/pause").Methods("POST").HandlerFunc(s.handlerWrapper(s.pauseContainer))
-	s.mux.Path("/containers/{id:.*}/unpause").Methods("POST").HandlerFunc(s.handlerWrapper(s.unpauseContainer))
-	s.mux.Path("/containers/{id:.*}/wait").Methods("POST").HandlerFunc(s.handlerWrapper(s.waitContainer))
-	s.mux.Path("/containers/{id:.*}/attach").Methods("POST").HandlerFunc(s.handlerWrapper(s.attachContainer))
-	s.mux.Path("/containers/{id:.*}").Methods("DELETE").HandlerFunc(s.handlerWrapper(s.removeContainer))
-	s.mux.Path("/containers/{id:.*}/exec").Methods("POST").HandlerFunc(s.handlerWrapper(s.createExecContainer))
-	s.mux.Path("/containers/{id:.*}/stats").Methods("GET").HandlerFunc(s.handlerWrapper(s.statsContainer))
-	s.mux.Path("/exec/{id:.*}/resize").Methods("POST").HandlerFunc(s.handlerWrapper(s.resizeExecContainer))
-	s.mux.Path("/exec/{id:.*}/start").Methods("POST").HandlerFunc(s.handlerWrapper(s.startExecContainer))
-	s.mux.Path("/exec/{id:.*}/json").Methods("GET").HandlerFunc(s.handlerWrapper(s.inspectExecContainer))
-	s.mux.Path("/images/create").Methods("POST").HandlerFunc(s.handlerWrapper(s.pullImage))
-	s.mux.Path("/build").Methods("POST").HandlerFunc(s.handlerWrapper(s.buildImage))
-	s.mux.Path("/images/json").Methods("GET").HandlerFunc(s.handlerWrapper(s.listImages))
-	s.mux.Path("/images/{id:.*}").Methods("DELETE").HandlerFunc(s.handlerWrapper(s.removeImage))
-	s.mux.Path("/images/{name:.*}/json").Methods("GET").HandlerFunc(s.handlerWrapper(s.inspectImage))
-	s.mux.Path("/images/{name:.*}/push").Methods("POST").HandlerFunc(s.handlerWrapper(s.pushImage))
-	s.mux.Path("/images/{name:.*}/tag").Methods("POST").HandlerFunc(s.handlerWrapper(s.tagImage))
-	s.mux.Path("/events").Methods("GET").HandlerFunc(s.listEvents)
-	s.mux.Path("/_ping").Methods("GET").HandlerFunc(s.handlerWrapper(s.pingDocker))
-	s.mux.Path("/images/load").Methods("POST").HandlerFunc(s.handlerWrapper(s.loadImage))
-	s.mux.Path("/images/{id:.*}/get").Methods("GET").HandlerFunc(s.handlerWrapper(s.getImage))
-	s.mux.Path("/networks").Methods("GET").HandlerFunc(s.handlerWrapper(s.listNetworks))
-	s.mux.Path("/networks/{id:.*}").Methods("GET").HandlerFunc(s.handlerWrapper(s.networkInfo))
-	s.mux.Path("/networks").Methods("POST").HandlerFunc(s.handlerWrapper(s.createNetwork))
-}
-
-// SetHook changes the hook function used by the server.
-//
-// The hook function is a function called on every request.
-func (s *DockerServer) SetHook(hook func(*http.Request)) {
-	s.hook = hook
-}
-
-// PrepareExec adds a callback to a container exec in the fake server.
-//
-// This function will be called whenever the given exec id is started, and the
-// given exec id will remain in the "Running" start while the function is
-// running, so it's useful for emulating an exec that runs for two seconds, for
-// example:
-//
-//    opts := docker.CreateExecOptions{
-//        AttachStdin:  true,
-//        AttachStdout: true,
-//        AttachStderr: true,
-//        Tty:          true,
-//        Cmd:          []string{"/bin/bash", "-l"},
-//    }
-//    // Client points to a fake server.
-//    exec, err := client.CreateExec(opts)
-//    // handle error
-//    server.PrepareExec(exec.ID, func() {time.Sleep(2 * time.Second)})
-//    err = client.StartExec(exec.ID, docker.StartExecOptions{Tty: true}) // will block for 2 seconds
-//    // handle error
-func (s *DockerServer) PrepareExec(id string, callback func()) {
-	s.execCallbacks[id] = callback
-}
-
-// PrepareStats adds a callback that will be called for each container stats
-// call.
-//
-// This callback function will be called multiple times if stream is set to
-// true when stats is called.
-func (s *DockerServer) PrepareStats(id string, callback func(string) docker.Stats) {
-	s.statsCallbacks[id] = callback
-}
-
-// PrepareFailure adds a new expected failure based on a URL regexp it receives
-// an id for the failure.
-func (s *DockerServer) PrepareFailure(id string, urlRegexp string) {
-	s.failures[id] = urlRegexp
-}
-
-// PrepareMultiFailures enqueues a new expected failure based on a URL regexp
-// it receives an id for the failure.
-func (s *DockerServer) PrepareMultiFailures(id string, urlRegexp string) {
-	s.multiFailures = append(s.multiFailures, map[string]string{"error": id, "url": urlRegexp})
-}
-
-// ResetFailure removes an expected failure identified by the given id.
-func (s *DockerServer) ResetFailure(id string) {
-	delete(s.failures, id)
-}
-
-// ResetMultiFailures removes all enqueued failures.
-func (s *DockerServer) ResetMultiFailures() {
-	s.multiFailures = []map[string]string{}
-}
-
-// CustomHandler registers a custom handler for a specific path.
-//
-// For example:
-//
-//     server.CustomHandler("/containers/json", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-//         http.Error(w, "Something wrong is not right", http.StatusInternalServerError)
-//     }))
-func (s *DockerServer) CustomHandler(path string, handler http.Handler) {
-	s.handlerMutex.Lock()
-	s.customHandlers[path] = handler
-	s.handlerMutex.Unlock()
-}
-
-// MutateContainer changes the state of a container, returning an error if the
-// given id does not match to any container "running" in the server.
-func (s *DockerServer) MutateContainer(id string, state docker.State) error {
-	for _, container := range s.containers {
-		if container.ID == id {
-			container.State = state
-			return nil
-		}
-	}
-	return errors.New("container not found")
-}
-
-// Stop stops the server.
-func (s *DockerServer) Stop() {
-	if s.listener != nil {
-		s.listener.Close()
-	}
-}
-
-// URL returns the HTTP URL of the server.
-func (s *DockerServer) URL() string {
-	if s.listener == nil {
-		return ""
-	}
-	return "http://" + s.listener.Addr().String() + "/"
-}
-
-// ServeHTTP handles HTTP requests sent to the server.
-func (s *DockerServer) ServeHTTP(w http.ResponseWriter, r *http.Request) {
-	s.handlerMutex.RLock()
-	defer s.handlerMutex.RUnlock()
-	for re, handler := range s.customHandlers {
-		if m, _ := regexp.MatchString(re, r.URL.Path); m {
-			handler.ServeHTTP(w, r)
-			return
-		}
-	}
-	s.mux.ServeHTTP(w, r)
-	if s.hook != nil {
-		s.hook(r)
-	}
-}
-
-// DefaultHandler returns default http.Handler mux, it allows customHandlers to
-// call the default behavior if wanted.
-func (s *DockerServer) DefaultHandler() http.Handler {
-	return s.mux
-}
-
-func (s *DockerServer) handlerWrapper(f func(http.ResponseWriter, *http.Request)) func(http.ResponseWriter, *http.Request) {
-	return func(w http.ResponseWriter, r *http.Request) {
-		for errorID, urlRegexp := range s.failures {
-			matched, err := regexp.MatchString(urlRegexp, r.URL.Path)
-			if err != nil {
-				http.Error(w, err.Error(), http.StatusBadRequest)
-				return
-			}
-			if !matched {
-				continue
-			}
-			http.Error(w, errorID, http.StatusBadRequest)
-			return
-		}
-		for i, failure := range s.multiFailures {
-			matched, err := regexp.MatchString(failure["url"], r.URL.Path)
-			if err != nil {
-				http.Error(w, err.Error(), http.StatusBadRequest)
-				return
-			}
-			if !matched {
-				continue
-			}
-			http.Error(w, failure["error"], http.StatusBadRequest)
-			s.multiFailures = append(s.multiFailures[:i], s.multiFailures[i+1:]...)
-			return
-		}
-		f(w, r)
-	}
-}
-
-func (s *DockerServer) listContainers(w http.ResponseWriter, r *http.Request) {
-	all := r.URL.Query().Get("all")
-	s.cMut.RLock()
-	result := make([]docker.APIContainers, 0, len(s.containers))
-	for _, container := range s.containers {
-		if all == "1" || container.State.Running {
-			result = append(result, docker.APIContainers{
-				ID:      container.ID,
-				Image:   container.Image,
-				Command: fmt.Sprintf("%s %s", container.Path, strings.Join(container.Args, " ")),
-				Created: container.Created.Unix(),
-				Status:  container.State.String(),
-				Ports:   container.NetworkSettings.PortMappingAPI(),
-				Names:   []string{fmt.Sprintf("/%s", container.Name)},
-			})
-		}
-	}
-	s.cMut.RUnlock()
-	w.Header().Set("Content-Type", "application/json")
-	w.WriteHeader(http.StatusOK)
-	json.NewEncoder(w).Encode(result)
-}
-
-func (s *DockerServer) listImages(w http.ResponseWriter, r *http.Request) {
-	s.cMut.RLock()
-	result := make([]docker.APIImages, len(s.images))
-	for i, image := range s.images {
-		result[i] = docker.APIImages{
-			ID:      image.ID,
-			Created: image.Created.Unix(),
-		}
-		for tag, id := range s.imgIDs {
-			if id == image.ID {
-				result[i].RepoTags = append(result[i].RepoTags, tag)
-			}
-		}
-	}
-	s.cMut.RUnlock()
-	w.Header().Set("Content-Type", "application/json")
-	w.WriteHeader(http.StatusOK)
-	json.NewEncoder(w).Encode(result)
-}
-
-func (s *DockerServer) findImage(id string) (string, error) {
-	s.iMut.RLock()
-	defer s.iMut.RUnlock()
-	image, ok := s.imgIDs[id]
-	if ok {
-		return image, nil
-	}
-	image, _, err := s.findImageByID(id)
-	return image, err
-}
-
-func (s *DockerServer) findImageByID(id string) (string, int, error) {
-	s.iMut.RLock()
-	defer s.iMut.RUnlock()
-	for i, image := range s.images {
-		if image.ID == id {
-			return image.ID, i, nil
-		}
-	}
-	return "", -1, errors.New("No such image")
-}
-
-func (s *DockerServer) createContainer(w http.ResponseWriter, r *http.Request) {
-	var config struct {
-		*docker.Config
-		HostConfig *docker.HostConfig
-	}
-	defer r.Body.Close()
-	err := json.NewDecoder(r.Body).Decode(&config)
-	if err != nil {
-		http.Error(w, err.Error(), http.StatusBadRequest)
-		return
-	}
-	name := r.URL.Query().Get("name")
-	if name != "" && !nameRegexp.MatchString(name) {
-		http.Error(w, "Invalid container name", http.StatusInternalServerError)
-		return
-	}
-	if _, err := s.findImage(config.Image); err != nil {
-		http.Error(w, err.Error(), http.StatusNotFound)
-		return
-	}
-	ports := map[docker.Port][]docker.PortBinding{}
-	for port := range config.ExposedPorts {
-		ports[port] = []docker.PortBinding{{
-			HostIP:   "0.0.0.0",
-			HostPort: strconv.Itoa(mathrand.Int() % 65536),
-		}}
-	}
-
-	//the container may not have cmd when using a Dockerfile
-	var path string
-	var args []string
-	if len(config.Cmd) == 1 {
-		path = config.Cmd[0]
-	} else if len(config.Cmd) > 1 {
-		path = config.Cmd[0]
-		args = config.Cmd[1:]
-	}
-
-	generatedID := s.generateID()
-	config.Config.Hostname = generatedID[:12]
-	container := docker.Container{
-		Name:       name,
-		ID:         generatedID,
-		Created:    time.Now(),
-		Path:       path,
-		Args:       args,
-		Config:     config.Config,
-		HostConfig: config.HostConfig,
-		State: docker.State{
-			Running:   false,
-			Pid:       mathrand.Int() % 50000,
-			ExitCode:  0,
-			StartedAt: time.Now(),
-		},
-		Image: config.Image,
-		NetworkSettings: &docker.NetworkSettings{
-			IPAddress:   fmt.Sprintf("172.16.42.%d", mathrand.Int()%250+2),
-			IPPrefixLen: 24,
-			Gateway:     "172.16.42.1",
-			Bridge:      "docker0",
-			Ports:       ports,
-		},
-	}
-	s.cMut.Lock()
-	if container.Name != "" {
-		for _, c := range s.containers {
-			if c.Name == container.Name {
-				defer s.cMut.Unlock()
-				http.Error(w, "there's already a container with this name", http.StatusConflict)
-				return
-			}
-		}
-	}
-	s.containers = append(s.containers, &container)
-	s.cMut.Unlock()
-	w.WriteHeader(http.StatusCreated)
-	s.notify(&container)
-	var c = struct{ ID string }{ID: container.ID}
-	json.NewEncoder(w).Encode(c)
-}
-
-func (s *DockerServer) generateID() string {
-	var buf [16]byte
-	rand.Read(buf[:])
-	return fmt.Sprintf("%x", buf)
-}
-
-func (s *DockerServer) renameContainer(w http.ResponseWriter, r *http.Request) {
-	id := mux.Vars(r)["id"]
-	container, index, err := s.findContainer(id)
-	if err != nil {
-		http.Error(w, err.Error(), http.StatusNotFound)
-		return
-	}
-	copy := *container
-	copy.Name = r.URL.Query().Get("name")
-	s.cMut.Lock()
-	defer s.cMut.Unlock()
-	if s.containers[index].ID == copy.ID {
-		s.containers[index] = &copy
-	}
-	w.WriteHeader(http.StatusNoContent)
-}
-
-func (s *DockerServer) inspectContainer(w http.ResponseWriter, r *http.Request) {
-	id := mux.Vars(r)["id"]
-	container, _, err := s.findContainer(id)
-	if err != nil {
-		http.Error(w, err.Error(), http.StatusNotFound)
-		return
-	}
-	w.Header().Set("Content-Type", "application/json")
-	w.WriteHeader(http.StatusOK)
-	json.NewEncoder(w).Encode(container)
-}
-
-func (s *DockerServer) statsContainer(w http.ResponseWriter, r *http.Request) {
-	id := mux.Vars(r)["id"]
-	_, _, err := s.findContainer(id)
-	if err != nil {
-		http.Error(w, err.Error(), http.StatusNotFound)
-		return
-	}
-	stream, _ := strconv.ParseBool(r.URL.Query().Get("stream"))
-	callback := s.statsCallbacks[id]
-	w.Header().Set("Content-Type", "application/json")
-	w.WriteHeader(http.StatusOK)
-	encoder := json.NewEncoder(w)
-	for {
-		var stats docker.Stats
-		if callback != nil {
-			stats = callback(id)
-		}
-		encoder.Encode(stats)
-		if !stream {
-			break
-		}
-	}
-}
-
-func (s *DockerServer) topContainer(w http.ResponseWriter, r *http.Request) {
-	id := mux.Vars(r)["id"]
-	container, _, err := s.findContainer(id)
-	if err != nil {
-		http.Error(w, err.Error(), http.StatusNotFound)
-		return
-	}
-	if !container.State.Running {
-		w.WriteHeader(http.StatusInternalServerError)
-		fmt.Fprintf(w, "Container %s is not running", id)
-		return
-	}
-	w.Header().Set("Content-Type", "application/json")
-	w.WriteHeader(http.StatusOK)
-	result := docker.TopResult{
-		Titles: []string{"UID", "PID", "PPID", "C", "STIME", "TTY", "TIME", "CMD"},
-		Processes: [][]string{
-			{"root", "7535", "7516", "0", "03:20", "?", "00:00:00", container.Path + " " + strings.Join(container.Args, " ")},
-		},
-	}
-	json.NewEncoder(w).Encode(result)
-}
-
-func (s *DockerServer) startContainer(w http.ResponseWriter, r *http.Request) {
-	id := mux.Vars(r)["id"]
-	container, _, err := s.findContainer(id)
-	if err != nil {
-		http.Error(w, err.Error(), http.StatusNotFound)
-		return
-	}
-	s.cMut.Lock()
-	defer s.cMut.Unlock()
-	defer r.Body.Close()
-	var hostConfig docker.HostConfig
-	err = json.NewDecoder(r.Body).Decode(&hostConfig)
-	if err != nil {
-		http.Error(w, err.Error(), http.StatusInternalServerError)
-		return
-	}
-	container.HostConfig = &hostConfig
-	if container.State.Running {
-		http.Error(w, "", http.StatusNotModified)
-		return
-	}
-	container.State.Running = true
-	s.notify(container)
-}
-
-func (s *DockerServer) stopContainer(w http.ResponseWriter, r *http.Request) {
-	id := mux.Vars(r)["id"]
-	container, _, err := s.findContainer(id)
-	if err != nil {
-		http.Error(w, err.Error(), http.StatusNotFound)
-		return
-	}
-	s.cMut.Lock()
-	defer s.cMut.Unlock()
-	if !container.State.Running {
-		http.Error(w, "Container not running", http.StatusBadRequest)
-		return
-	}
-	w.WriteHeader(http.StatusNoContent)
-	container.State.Running = false
-	s.notify(container)
-}
-
-func (s *DockerServer) pauseContainer(w http.ResponseWriter, r *http.Request) {
-	id := mux.Vars(r)["id"]
-	container, _, err := s.findContainer(id)
-	if err != nil {
-		http.Error(w, err.Error(), http.StatusNotFound)
-		return
-	}
-	s.cMut.Lock()
-	defer s.cMut.Unlock()
-	if container.State.Paused {
-		http.Error(w, "Container already paused", http.StatusBadRequest)
-		return
-	}
-	w.WriteHeader(http.StatusNoContent)
-	container.State.Paused = true
-}
-
-func (s *DockerServer) unpauseContainer(w http.ResponseWriter, r *http.Request) {
-	id := mux.Vars(r)["id"]
-	container, _, err := s.findContainer(id)
-	if err != nil {
-		http.Error(w, err.Error(), http.StatusNotFound)
-		return
-	}
-	s.cMut.Lock()
-	defer s.cMut.Unlock()
-	if !container.State.Paused {
-		http.Error(w, "Container not paused", http.StatusBadRequest)
-		return
-	}
-	w.WriteHeader(http.StatusNoContent)
-	container.State.Paused = false
-}
-
-func (s *DockerServer) attachContainer(w http.ResponseWriter, r *http.Request) {
-	id := mux.Vars(r)["id"]
-	container, _, err := s.findContainer(id)
-	if err != nil {
-		http.Error(w, err.Error(), http.StatusNotFound)
-		return
-	}
-	hijacker, ok := w.(http.Hijacker)
-	if !ok {
-		http.Error(w, "cannot hijack connection", http.StatusInternalServerError)
-		return
-	}
-	w.Header().Set("Content-Type", "application/vnd.docker.raw-stream")
-	w.WriteHeader(http.StatusOK)
-	conn, _, err := hijacker.Hijack()
-	if err != nil {
-		http.Error(w, err.Error(), http.StatusInternalServerError)
-		return
-	}
-	wg := sync.WaitGroup{}
-	if r.URL.Query().Get("stdin") == "1" {
-		wg.Add(1)
-		go func() {
-			ioutil.ReadAll(conn)
-			wg.Done()
-		}()
-	}
-	outStream := stdcopy.NewStdWriter(conn, stdcopy.Stdout)
-	if container.State.Running {
-		fmt.Fprintf(outStream, "Container is running\n")
-	} else {
-		fmt.Fprintf(outStream, "Container is not running\n")
-	}
-	fmt.Fprintln(outStream, "What happened?")
-	fmt.Fprintln(outStream, "Something happened")
-	wg.Wait()
-	if r.URL.Query().Get("stream") == "1" {
-		for {
-			time.Sleep(1e6)
-			s.cMut.RLock()
-			if !container.State.Running {
-				s.cMut.RUnlock()
-				break
-			}
-			s.cMut.RUnlock()
-		}
-	}
-	conn.Close()
-}
-
-func (s *DockerServer) waitContainer(w http.ResponseWriter, r *http.Request) {
-	id := mux.Vars(r)["id"]
-	container, _, err := s.findContainer(id)
-	if err != nil {
-		http.Error(w, err.Error(), http.StatusNotFound)
-		return
-	}
-	for {
-		time.Sleep(1e6)
-		s.cMut.RLock()
-		if !container.State.Running {
-			s.cMut.RUnlock()
-			break
-		}
-		s.cMut.RUnlock()
-	}
-	result := map[string]int{"StatusCode": container.State.ExitCode}
-	json.NewEncoder(w).Encode(result)
-}
-
-func (s *DockerServer) removeContainer(w http.ResponseWriter, r *http.Request) {
-	id := mux.Vars(r)["id"]
-	force := r.URL.Query().Get("force")
-	_, index, err := s.findContainer(id)
-	if err != nil {
-		http.Error(w, err.Error(), http.StatusNotFound)
-		return
-	}
-	if s.containers[index].State.Running && force != "1" {
-		msg := "Error: API error (406): Impossible to remove a running container, please stop it first"
-		http.Error(w, msg, http.StatusInternalServerError)
-		return
-	}
-	w.WriteHeader(http.StatusNoContent)
-	s.cMut.Lock()
-	defer s.cMut.Unlock()
-	s.containers[index] = s.containers[len(s.containers)-1]
-	s.containers = s.containers[:len(s.containers)-1]
-}
-
-func (s *DockerServer) commitContainer(w http.ResponseWriter, r *http.Request) {
-	id := r.URL.Query().Get("container")
-	container, _, err := s.findContainer(id)
-	if err != nil {
-		http.Error(w, err.Error(), http.StatusNotFound)
-		return
-	}
-	var config *docker.Config
-	runConfig := r.URL.Query().Get("run")
-	if runConfig != "" {
-		config = new(docker.Config)
-		err = json.Unmarshal([]byte(runConfig), config)
-		if err != nil {
-			http.Error(w, err.Error(), http.StatusBadRequest)
-			return
-		}
-	}
-	w.WriteHeader(http.StatusOK)
-	image := docker.Image{
-		ID:        "img-" + container.ID,
-		Parent:    container.Image,
-		Container: container.ID,
-		Comment:   r.URL.Query().Get("m"),
-		Author:    r.URL.Query().Get("author"),
-		Config:    config,
-	}
-	repository := r.URL.Query().Get("repo")
-	tag := r.URL.Query().Get("tag")
-	s.iMut.Lock()
-	s.images = append(s.images, image)
-	if repository != "" {
-		if tag != "" {
-			repository += ":" + tag
-		}
-		s.imgIDs[repository] = image.ID
-	}
-	s.iMut.Unlock()
-	fmt.Fprintf(w, `{"ID":%q}`, image.ID)
-}
-
-func (s *DockerServer) findContainer(idOrName string) (*docker.Container, int, error) {
-	s.cMut.RLock()
-	defer s.cMut.RUnlock()
-	for i, container := range s.containers {
-		if container.ID == idOrName || container.Name == idOrName {
-			return container, i, nil
-		}
-	}
-	return nil, -1, errors.New("No such container")
-}
-
-func (s *DockerServer) buildImage(w http.ResponseWriter, r *http.Request) {
-	if ct := r.Header.Get("Content-Type"); ct == "application/tar" {
-		gotDockerFile := false
-		tr := tar.NewReader(r.Body)
-		for {
-			header, err := tr.Next()
-			if err != nil {
-				break
-			}
-			if header.Name == "Dockerfile" {
-				gotDockerFile = true
-			}
-		}
-		if !gotDockerFile {
-			w.WriteHeader(http.StatusBadRequest)
-			w.Write([]byte("miss Dockerfile"))
-			return
-		}
-	}
-	//we did not use that Dockerfile to build image cause we are a fake Docker daemon
-	image := docker.Image{
-		ID:      s.generateID(),
-		Created: time.Now(),
-	}
-
-	query := r.URL.Query()
-	repository := image.ID
-	if t := query.Get("t"); t != "" {
-		repository = t
-	}
-	s.iMut.Lock()
-	s.images = append(s.images, image)
-	s.imgIDs[repository] = image.ID
-	s.iMut.Unlock()
-	w.Write([]byte(fmt.Sprintf("Successfully built %s", image.ID)))
-}
-
-func (s *DockerServer) pullImage(w http.ResponseWriter, r *http.Request) {
-	fromImageName := r.URL.Query().Get("fromImage")
-	tag := r.URL.Query().Get("tag")
-	image := docker.Image{
-		ID: s.generateID(),
-	}
-	s.iMut.Lock()
-	s.images = append(s.images, image)
-	if fromImageName != "" {
-		if tag != "" {
-			fromImageName = fmt.Sprintf("%s:%s", fromImageName, tag)
-		}
-		s.imgIDs[fromImageName] = image.ID
-	}
-	s.iMut.Unlock()
-}
-
-func (s *DockerServer) pushImage(w http.ResponseWriter, r *http.Request) {
-	name := mux.Vars(r)["name"]
-	tag := r.URL.Query().Get("tag")
-	if tag != "" {
-		name += ":" + tag
-	}
-	s.iMut.RLock()
-	if _, ok := s.imgIDs[name]; !ok {
-		s.iMut.RUnlock()
-		http.Error(w, "No such image", http.StatusNotFound)
-		return
-	}
-	s.iMut.RUnlock()
-	fmt.Fprintln(w, "Pushing...")
-	fmt.Fprintln(w, "Pushed")
-}
-
-func (s *DockerServer) tagImage(w http.ResponseWriter, r *http.Request) {
-	name := mux.Vars(r)["name"]
-	s.iMut.RLock()
-	if _, ok := s.imgIDs[name]; !ok {
-		s.iMut.RUnlock()
-		http.Error(w, "No such image", http.StatusNotFound)
-		return
-	}
-	s.iMut.RUnlock()
-	s.iMut.Lock()
-	defer s.iMut.Unlock()
-	newRepo := r.URL.Query().Get("repo")
-	newTag := r.URL.Query().Get("tag")
-	if newTag != "" {
-		newRepo += ":" + newTag
-	}
-	s.imgIDs[newRepo] = s.imgIDs[name]
-	w.WriteHeader(http.StatusCreated)
-}
-
-func (s *DockerServer) removeImage(w http.ResponseWriter, r *http.Request) {
-	id := mux.Vars(r)["id"]
-	s.iMut.RLock()
-	var tag string
-	if img, ok := s.imgIDs[id]; ok {
-		id, tag = img, id
-	}
-	var tags []string
-	for tag, taggedID := range s.imgIDs {
-		if taggedID == id {
-			tags = append(tags, tag)
-		}
-	}
-	s.iMut.RUnlock()
-	_, index, err := s.findImageByID(id)
-	if err != nil {
-		http.Error(w, err.Error(), http.StatusNotFound)
-		return
-	}
-	w.WriteHeader(http.StatusNoContent)
-	s.iMut.Lock()
-	defer s.iMut.Unlock()
-	if len(tags) < 2 {
-		s.images[index] = s.images[len(s.images)-1]
-		s.images = s.images[:len(s.images)-1]
-	}
-	if tag != "" {
-		delete(s.imgIDs, tag)
-	}
-}
-
-func (s *DockerServer) inspectImage(w http.ResponseWriter, r *http.Request) {
-	name := mux.Vars(r)["name"]
-	s.iMut.RLock()
-	defer s.iMut.RUnlock()
-	if id, ok := s.imgIDs[name]; ok {
-		for _, img := range s.images {
-			if img.ID == id {
-				w.Header().Set("Content-Type", "application/json")
-				w.WriteHeader(http.StatusOK)
-				json.NewEncoder(w).Encode(img)
-				return
-			}
-		}
-	}
-	http.Error(w, "not found", http.StatusNotFound)
-}
-
-func (s *DockerServer) listEvents(w http.ResponseWriter, r *http.Request) {
-	w.Header().Set("Content-Type", "application/json")
-	var events [][]byte
-	count := mathrand.Intn(20)
-	for i := 0; i < count; i++ {
-		data, err := json.Marshal(s.generateEvent())
-		if err != nil {
-			w.WriteHeader(http.StatusInternalServerError)
-			return
-		}
-		events = append(events, data)
-	}
-	w.WriteHeader(http.StatusOK)
-	for _, d := range events {
-		fmt.Fprintln(w, d)
-		time.Sleep(time.Duration(mathrand.Intn(200)) * time.Millisecond)
-	}
-}
-
-func (s *DockerServer) pingDocker(w http.ResponseWriter, r *http.Request) {
-	w.WriteHeader(http.StatusOK)
-}
-
-func (s *DockerServer) generateEvent() *docker.APIEvents {
-	var eventType string
-	switch mathrand.Intn(4) {
-	case 0:
-		eventType = "create"
-	case 1:
-		eventType = "start"
-	case 2:
-		eventType = "stop"
-	case 3:
-		eventType = "destroy"
-	}
-	return &docker.APIEvents{
-		ID:     s.generateID(),
-		Status: eventType,
-		From:   "mybase:latest",
-		Time:   time.Now().Unix(),
-	}
-}
-
-func (s *DockerServer) loadImage(w http.ResponseWriter, r *http.Request) {
-	w.WriteHeader(http.StatusOK)
-}
-
-func (s *DockerServer) getImage(w http.ResponseWriter, r *http.Request) {
-	w.WriteHeader(http.StatusOK)
-	w.Header().Set("Content-Type", "application/tar")
-}
-
-func (s *DockerServer) createExecContainer(w http.ResponseWriter, r *http.Request) {
-	id := mux.Vars(r)["id"]
-	container, _, err := s.findContainer(id)
-	if err != nil {
-		http.Error(w, err.Error(), http.StatusNotFound)
-		return
-	}
-
-	execID := s.generateID()
-	container.ExecIDs = append(container.ExecIDs, execID)
-
-	exec := docker.ExecInspect{
-		ID:        execID,
-		Container: *container,
-	}
-
-	var params docker.CreateExecOptions
-	err = json.NewDecoder(r.Body).Decode(&params)
-	if err != nil {
-		http.Error(w, err.Error(), http.StatusInternalServerError)
-		return
-	}
-	if len(params.Cmd) > 0 {
-		exec.ProcessConfig.EntryPoint = params.Cmd[0]
-		if len(params.Cmd) > 1 {
-			exec.ProcessConfig.Arguments = params.Cmd[1:]
-		}
-	}
-
-	exec.ProcessConfig.User = params.User
-	exec.ProcessConfig.Tty = params.Tty
-
-	s.execMut.Lock()
-	s.execs = append(s.execs, &exec)
-	s.execMut.Unlock()
-	w.WriteHeader(http.StatusOK)
-	w.Header().Set("Content-Type", "application/json")
-	json.NewEncoder(w).Encode(map[string]string{"Id": exec.ID})
-}
-
-func (s *DockerServer) startExecContainer(w http.ResponseWriter, r *http.Request) {
-	id := mux.Vars(r)["id"]
-	if exec, err := s.getExec(id, false); err == nil {
-		s.execMut.Lock()
-		exec.Running = true
-		s.execMut.Unlock()
-		if callback, ok := s.execCallbacks[id]; ok {
-			callback()
-			delete(s.execCallbacks, id)
-		} else if callback, ok := s.execCallbacks["*"]; ok {
-			callback()
-			delete(s.execCallbacks, "*")
-		}
-		s.execMut.Lock()
-		exec.Running = false
-		s.execMut.Unlock()
-		w.WriteHeader(http.StatusOK)
-		return
-	}
-	w.WriteHeader(http.StatusNotFound)
-}
-
-func (s *DockerServer) resizeExecContainer(w http.ResponseWriter, r *http.Request) {
-	id := mux.Vars(r)["id"]
-	if _, err := s.getExec(id, false); err == nil {
-		w.WriteHeader(http.StatusOK)
-		return
-	}
-	w.WriteHeader(http.StatusNotFound)
-}
-
-func (s *DockerServer) inspectExecContainer(w http.ResponseWriter, r *http.Request) {
-	id := mux.Vars(r)["id"]
-	if exec, err := s.getExec(id, true); err == nil {
-		w.WriteHeader(http.StatusOK)
-		w.Header().Set("Content-Type", "application/json")
-		json.NewEncoder(w).Encode(exec)
-		return
-	}
-	w.WriteHeader(http.StatusNotFound)
-}
-
-func (s *DockerServer) getExec(id string, copy bool) (*docker.ExecInspect, error) {
-	s.execMut.RLock()
-	defer s.execMut.RUnlock()
-	for _, exec := range s.execs {
-		if exec.ID == id {
-			if copy {
-				cp := *exec
-				exec = &cp
-			}
-			return exec, nil
-		}
-	}
-	return nil, errors.New("exec not found")
-}
-
-func (s *DockerServer) findNetwork(idOrName string) (*docker.Network, int, error) {
-	s.netMut.RLock()
-	defer s.netMut.RUnlock()
-	for i, network := range s.networks {
-		if network.ID == idOrName || network.Name == idOrName {
-			return network, i, nil
-		}
-	}
-	return nil, -1, errors.New("No such network")
-}
-
-func (s *DockerServer) listNetworks(w http.ResponseWriter, r *http.Request) {
-	s.netMut.RLock()
-	result := make([]docker.Network, 0, len(s.networks))
-	for _, network := range s.networks {
-		result = append(result, *network)
-	}
-	s.netMut.RUnlock()
-	w.Header().Set("Content-Type", "application/json")
-	w.WriteHeader(http.StatusOK)
-	json.NewEncoder(w).Encode(result)
-}
-
-func (s *DockerServer) networkInfo(w http.ResponseWriter, r *http.Request) {
-	id := mux.Vars(r)["id"]
-	network, _, err := s.findNetwork(id)
-	if err != nil {
-		http.Error(w, err.Error(), http.StatusNotFound)
-		return
-	}
-	w.Header().Set("Content-Type", "application/json")
-	w.WriteHeader(http.StatusOK)
-	json.NewEncoder(w).Encode(network)
-}
-
-// isValidName validates configuration objects supported by libnetwork
-func isValidName(name string) bool {
-	if name == "" || strings.Contains(name, ".") {
-		return false
-	}
-	return true
-}
-
-func (s *DockerServer) createNetwork(w http.ResponseWriter, r *http.Request) {
-	var config *docker.CreateNetworkOptions
-	defer r.Body.Close()
-	err := json.NewDecoder(r.Body).Decode(&config)
-	if err != nil {
-		http.Error(w, err.Error(), http.StatusBadRequest)
-		return
-	}
-	if !isValidName(config.Name) {
-		http.Error(w, "Invalid network name", http.StatusBadRequest)
-		return
-	}
-	if n, _, _ := s.findNetwork(config.Name); n != nil {
-		http.Error(w, "network already exists", http.StatusForbidden)
-		return
-	}
-
-	generatedID := s.generateID()
-	network := docker.Network{
-		Name: config.Name,
-		ID:   generatedID,
-		Type: config.NetworkType,
-	}
-	s.netMut.Lock()
-	s.networks = append(s.networks, &network)
-	s.netMut.Unlock()
-	w.WriteHeader(http.StatusCreated)
-	var c = struct{ ID string }{ID: network.ID}
-	json.NewEncoder(w).Encode(c)
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/tls.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/tls.go
deleted file mode 100644
index 55f43174b..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/tls.go
+++ /dev/null
@@ -1,96 +0,0 @@
-// Copyright 2014 go-dockerclient 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 content is borrowed from Docker's own source code to provide a simple
-// tls based dialer
-
-package docker
-
-import (
-	"crypto/tls"
-	"errors"
-	"net"
-	"strings"
-	"time"
-)
-
-type tlsClientCon struct {
-	*tls.Conn
-	rawConn net.Conn
-}
-
-func (c *tlsClientCon) CloseWrite() error {
-	// Go standard tls.Conn doesn't provide the CloseWrite() method so we do it
-	// on its underlying connection.
-	if cwc, ok := c.rawConn.(interface {
-		CloseWrite() error
-	}); ok {
-		return cwc.CloseWrite()
-	}
-	return nil
-}
-
-func tlsDialWithDialer(dialer *net.Dialer, network, addr string, config *tls.Config) (net.Conn, error) {
-	// We want the Timeout and Deadline values from dialer to cover the
-	// whole process: TCP connection and TLS handshake. This means that we
-	// also need to start our own timers now.
-	timeout := dialer.Timeout
-
-	if !dialer.Deadline.IsZero() {
-		deadlineTimeout := dialer.Deadline.Sub(time.Now())
-		if timeout == 0 || deadlineTimeout < timeout {
-			timeout = deadlineTimeout
-		}
-	}
-
-	var errChannel chan error
-
-	if timeout != 0 {
-		errChannel = make(chan error, 2)
-		time.AfterFunc(timeout, func() {
-			errChannel <- errors.New("")
-		})
-	}
-
-	rawConn, err := dialer.Dial(network, addr)
-	if err != nil {
-		return nil, err
-	}
-
-	colonPos := strings.LastIndex(addr, ":")
-	if colonPos == -1 {
-		colonPos = len(addr)
-	}
-	hostname := addr[:colonPos]
-
-	// If no ServerName is set, infer the ServerName
-	// from the hostname we're connecting to.
-	if config.ServerName == "" {
-		// Make a copy to avoid polluting argument or default.
-		c := *config
-		c.ServerName = hostname
-		config = &c
-	}
-
-	conn := tls.Client(rawConn, config)
-
-	if timeout == 0 {
-		err = conn.Handshake()
-	} else {
-		go func() {
-			errChannel <- conn.Handshake()
-		}()
-
-		err = <-errChannel
-	}
-
-	if err != nil {
-		rawConn.Close()
-		return nil, err
-	}
-
-	// This is Docker difference with standard's crypto/tls package: returned a
-	// wrapper which holds both the TLS and raw connections.
-	return &tlsClientCon{conn, rawConn}, nil
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/volume.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/volume.go
deleted file mode 100644
index a989a6eee..000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/volume.go
+++ /dev/null
@@ -1,127 +0,0 @@
-// Copyright 2015 go-dockerclient 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 docker
-
-import (
-	"encoding/json"
-	"errors"
-	"net/http"
-)
-
-var (
-	// ErrNoSuchVolume is the error returned when the volume does not exist.
-	ErrNoSuchVolume = errors.New("no such volume")
-
-	// ErrVolumeInUse is the error returned when the volume requested to be removed is still in use.
-	ErrVolumeInUse = errors.New("volume in use and cannot be removed")
-)
-
-// Volume represents a volume.
-//
-// See https://goo.gl/FZA4BK for more details.
-type Volume struct {
-	Name       string `json:"Name" yaml:"Name"`
-	Driver     string `json:"Driver,omitempty" yaml:"Driver,omitempty"`
-	Mountpoint string `json:"Mountpoint,omitempty" yaml:"Mountpoint,omitempty"`
-}
-
-// ListVolumesOptions specify parameters to the ListVolumes function.
-//
-// See https://goo.gl/FZA4BK for more details.
-type ListVolumesOptions struct {
-	Filters map[string][]string
-}
-
-// ListVolumes returns a list of available volumes in the server.
-//
-// See https://goo.gl/FZA4BK for more details.
-func (c *Client) ListVolumes(opts ListVolumesOptions) ([]Volume, error) {
-	resp, err := c.do("GET", "/volumes?"+queryString(opts), doOptions{})
-	if err != nil {
-		return nil, err
-	}
-	defer resp.Body.Close()
-	m := make(map[string]interface{})
-	if err := json.NewDecoder(resp.Body).Decode(&m); err != nil {
-		return nil, err
-	}
-	var volumes []Volume
-	volumesJSON, ok := m["Volumes"]
-	if !ok {
-		return volumes, nil
-	}
-	data, err := json.Marshal(volumesJSON)
-	if err != nil {
-		return nil, err
-	}
-	if err := json.Unmarshal(data, &volumes); err != nil {
-		return nil, err
-	}
-	return volumes, nil
-}
-
-// CreateVolumeOptions specify parameters to the CreateVolume function.
-//
-// See https://goo.gl/pBUbZ9 for more details.
-type CreateVolumeOptions struct {
-	Name       string
-	Driver     string
-	DriverOpts map[string]string
-}
-
-// CreateVolume creates a volume on the server.
-//
-// See https://goo.gl/pBUbZ9 for more details.
-func (c *Client) CreateVolume(opts CreateVolumeOptions) (*Volume, error) {
-	resp, err := c.do("POST", "/volumes", doOptions{data: opts})
-	if err != nil {
-		return nil, err
-	}
-	defer resp.Body.Close()
-	var volume Volume
-	if err := json.NewDecoder(resp.Body).Decode(&volume); err != nil {
-		return nil, err
-	}
-	return &volume, nil
-}
-
-// InspectVolume returns a volume by its name.
-//
-// See https://goo.gl/0g9A6i for more details.
-func (c *Client) InspectVolume(name string) (*Volume, error) {
-	resp, err := c.do("GET", "/volumes/"+name, doOptions{})
-	if err != nil {
-		if e, ok := err.(*Error); ok && e.Status == http.StatusNotFound {
-			return nil, ErrNoSuchVolume
-		}
-		return nil, err
-	}
-	defer resp.Body.Close()
-	var volume Volume
-	if err := json.NewDecoder(resp.Body).Decode(&volume); err != nil {
-		return nil, err
-	}
-	return &volume, nil
-}
-
-// RemoveVolume removes a volume by its name.
-//
-// See https://goo.gl/79GNQz for more details.
-func (c *Client) RemoveVolume(name string) error {
-	resp, err := c.do("DELETE", "/volumes/"+name, doOptions{})
-	if err != nil {
-		if e, ok := err.(*Error); ok {
-			if e.Status == http.StatusNotFound {
-				return ErrNoSuchVolume
-			}
-			if e.Status == http.StatusConflict {
-				return ErrVolumeInUse
-			}
-		}
-		return nil
-	}
-	defer resp.Body.Close()
-	return nil
-}
diff --git a/Godeps/_workspace/src/github.com/go-sql-driver/mysql/.gitignore b/Godeps/_workspace/src/github.com/go-sql-driver/mysql/.gitignore
deleted file mode 100644
index ba8e0cb3a..000000000
--- a/Godeps/_workspace/src/github.com/go-sql-driver/mysql/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-.DS_Store
-.DS_Store?
-._*
-.Spotlight-V100
-.Trashes
-Icon?
-ehthumbs.db
-Thumbs.db
diff --git a/Godeps/_workspace/src/github.com/go-sql-driver/mysql/.travis.yml b/Godeps/_workspace/src/github.com/go-sql-driver/mysql/.travis.yml
deleted file mode 100644
index 2f4e3c2f0..000000000
--- a/Godeps/_workspace/src/github.com/go-sql-driver/mysql/.travis.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-sudo: false
-language: go
-go:
-  - 1.2
-  - 1.3
-  - 1.4
-  - tip
-
-before_script:
-  - mysql -e 'create database gotest;'
diff --git a/Godeps/_workspace/src/github.com/go-sql-driver/mysql/AUTHORS b/Godeps/_workspace/src/github.com/go-sql-driver/mysql/AUTHORS
deleted file mode 100644
index 6fc4c6f7b..000000000
--- a/Godeps/_workspace/src/github.com/go-sql-driver/mysql/AUTHORS
+++ /dev/null
@@ -1,44 +0,0 @@
-# This is the official list of Go-MySQL-Driver authors for copyright purposes.
-
-# If you are submitting a patch, please add your name or the name of the
-# organization which holds the copyright to this list in alphabetical order.
-
-# Names should be added to this file as
-#	Name <email address>
-# The email address is not required for organizations.
-# Please keep the list sorted.
-
-
-# Individual Persons
-
-Aaron Hopkins <go-sql-driver at die.net>
-Arne Hormann <arnehormann at gmail.com>
-Carlos Nieto <jose.carlos at menteslibres.net>
-Chris Moos <chris at tech9computers.com>
-DisposaBoy <disposaboy at dby.me>
-Frederick Mayle <frederickmayle at gmail.com>
-Gustavo Kristic <gkristic at gmail.com>
-Hanno Braun <mail at hannobraun.com>
-Henri Yandell <flamefew at gmail.com>
-INADA Naoki <songofacandy at gmail.com>
-James Harr <james.harr at gmail.com>
-Jian Zhen <zhenjl at gmail.com>
-Joshua Prunier <joshua.prunier at gmail.com>
-Julien Schmidt <go-sql-driver at julienschmidt.com>
-Kamil Dziedzic <kamil at klecza.pl>
-Leonardo YongUk Kim <dalinaum at gmail.com>
-Lucas Liu <extrafliu at gmail.com>
-Luke Scott <luke at webconnex.com>
-Michael Woolnough <michael.woolnough at gmail.com>
-Nicola Peduzzi <thenikso at gmail.com>
-Runrioter Wung <runrioter at gmail.com>
-Soroush Pour <me at soroushjp.com>
-Stan Putrya <root.vagner at gmail.com>
-Xiaobing Jiang <s7v7nislands at gmail.com>
-Xiuming Chen <cc at cxm.cc>
-
-# Organizations
-
-Barracuda Networks, Inc.
-Google Inc.
-Stripe Inc.
diff --git a/Godeps/_workspace/src/github.com/go-sql-driver/mysql/CHANGELOG.md b/Godeps/_workspace/src/github.com/go-sql-driver/mysql/CHANGELOG.md
deleted file mode 100644
index 161ad0fcc..000000000
--- a/Godeps/_workspace/src/github.com/go-sql-driver/mysql/CHANGELOG.md
+++ /dev/null
@@ -1,92 +0,0 @@
-## HEAD
-
-Changes:
-
- - Go 1.1 is no longer supported
- - Use decimals field from MySQL to format time types (#249)
- - Buffer optimizations (#269)
- - TLS ServerName defaults to the host (#283)
-
-Bugfixes:
-
- - Enable microsecond resolution on TIME, DATETIME and TIMESTAMP (#249)
- - Fixed handling of queries without columns and rows (#255)
- - Fixed a panic when SetKeepAlive() failed (#298)
-
-New Features:
- - Support for returning table alias on Columns() (#289)
- - Placeholder interpolation, can be actived with the DSN parameter `interpolateParams=true` (#309, #318)
-
-
-## Version 1.2 (2014-06-03)
-
-Changes:
-
- - We switched back to a "rolling release". `go get` installs the current master branch again
- - Version v1 of the driver will not be maintained anymore. Go 1.0 is no longer supported by this driver
- - Exported errors to allow easy checking from application code
- - Enabled TCP Keepalives on TCP connections
- - Optimized INFILE handling (better buffer size calculation, lazy init, ...)
- - The DSN parser also checks for a missing separating slash
- - Faster binary date / datetime to string formatting
- - Also exported the MySQLWarning type
- - mysqlConn.Close returns the first error encountered instead of ignoring all errors
- - writePacket() automatically writes the packet size to the header
- - readPacket() uses an iterative approach instead of the recursive approach to merge splitted packets
-
-New Features:
-
- - `RegisterDial` allows the usage of a custom dial function to establish the network connection
- - Setting the connection collation is possible with the `collation` DSN parameter. This parameter should be preferred over the `charset` parameter
- - Logging of critical errors is configurable with `SetLogger`
- - Google CloudSQL support
-
-Bugfixes:
-
- - Allow more than 32 parameters in prepared statements
- - Various old_password fixes
- - Fixed TestConcurrent test to pass Go's race detection
- - Fixed appendLengthEncodedInteger for large numbers
- - Renamed readLengthEnodedString to readLengthEncodedString and skipLengthEnodedString to skipLengthEncodedString (fixed typo)
-
-
-## Version 1.1 (2013-11-02)
-
-Changes:
-
-  - Go-MySQL-Driver now requires Go 1.1
-  - Connections now use the collation `utf8_general_ci` by default. Adding `&charset=UTF8` to the DSN should not be necessary anymore
-  - Made closing rows and connections error tolerant. This allows for example deferring rows.Close() without checking for errors
-  - `[]byte(nil)` is now treated as a NULL value. Before, it was treated like an empty string / `[]byte("")`
-  - DSN parameter values must now be url.QueryEscape'ed. This allows text values to contain special characters, such as '&'.
-  - Use the IO buffer also for writing. This results in zero allocations (by the driver) for most queries
-  - Optimized the buffer for reading
-  - stmt.Query now caches column metadata
-  - New Logo
-  - Changed the copyright header to include all contributors
-  - Improved the LOAD INFILE documentation
-  - The driver struct is now exported to make the driver directly accessible
-  - Refactored the driver tests
-  - Added more benchmarks and moved all to a separate file
-  - Other small refactoring
-
-New Features:
-
-  - Added *old_passwords* support: Required in some cases, but must be enabled by adding `allowOldPasswords=true` to the DSN since it is insecure
-  - Added a `clientFoundRows` parameter: Return the number of matching rows instead of the number of rows changed on UPDATEs
-  - Added TLS/SSL support: Use a TLS/SSL encrypted connection to the server. Custom TLS configs can be registered and used
-
-Bugfixes:
-
-  - Fixed MySQL 4.1 support: MySQL 4.1 sends packets with lengths which differ from the specification
-  - Convert to DB timezone when inserting `time.Time`
-  - Splitted packets (more than 16MB) are now merged correctly
-  - Fixed false positive `io.EOF` errors when the data was fully read
-  - Avoid panics on reuse of closed connections
-  - Fixed empty string producing false nil values
-  - Fixed sign byte for positive TIME fields
-
-
-## Version 1.0 (2013-05-14)
-
-Initial Release
diff --git a/Godeps/_workspace/src/github.com/go-sql-driver/mysql/CONTRIBUTING.md b/Godeps/_workspace/src/github.com/go-sql-driver/mysql/CONTRIBUTING.md
deleted file mode 100644
index f87c19824..000000000
--- a/Godeps/_workspace/src/github.com/go-sql-driver/mysql/CONTRIBUTING.md
+++ /dev/null
@@ -1,40 +0,0 @@
-# Contributing Guidelines
-
-## Reporting Issues
-
-Before creating a new Issue, please check first if a similar Issue [already exists](https://github.com/go-sql-driver/mysql/issues?state=open) or was [recently closed](https://github.com/go-sql-driver/mysql/issues?direction=desc&page=1&sort=updated&state=closed).
-
-Please provide the following minimum information:
-* Your Go-MySQL-Driver version (or git SHA)
-* Your Go version (run `go version` in your console)
-* A detailed issue description
-* Error Log if present
-* If possible, a short example
-
-
-## Contributing Code
-
-By contributing to this project, you share your code under the Mozilla Public License 2, as specified in the LICENSE file.
-Don't forget to add yourself to the AUTHORS file.
-
-### Pull Requests Checklist
-
-Please check the following points before submitting your pull request:
-- [x] Code compiles correctly
-- [x] Created tests, if possible
-- [x] All tests pass
-- [x] Extended the README / documentation, if necessary
-- [x] Added yourself to the AUTHORS file
-
-### Code Review
-
-Everyone is invited to review and comment on pull requests.
-If it looks fine to you, comment with "LGTM" (Looks good to me).
-
-If changes are required, notice the reviewers with "PTAL" (Please take another look) after committing the fixes.
-
-Before merging the Pull Request, at least one [team member](https://github.com/go-sql-driver?tab=members) must have commented with "LGTM".
-
-## Development Ideas
-
-If you are looking for ideas for code contributions, please check our [Development Ideas](https://github.com/go-sql-driver/mysql/wiki/Development-Ideas) Wiki page.
diff --git a/Godeps/_workspace/src/github.com/go-sql-driver/mysql/LICENSE b/Godeps/_workspace/src/github.com/go-sql-driver/mysql/LICENSE
deleted file mode 100644
index 14e2f777f..000000000
--- a/Godeps/_workspace/src/github.com/go-sql-driver/mysql/LICENSE
+++ /dev/null
@@ -1,373 +0,0 @@
-Mozilla Public License Version 2.0
-==================================
-
-1. Definitions
---------------
-
-1.1. "Contributor"
-    means each individual or legal entity that creates, contributes to
-    the creation of, or owns Covered Software.
-
-1.2. "Contributor Version"
-    means the combination of the Contributions of others (if any) used
-    by a Contributor and that particular Contributor's Contribution.
-
-1.3. "Contribution"
-    means Covered Software of a particular Contributor.
-
-1.4. "Covered Software"
-    means Source Code Form to which the initial Contributor has attached
-    the notice in Exhibit A, the Executable Form of such Source Code
-    Form, and Modifications of such Source Code Form, in each case
-    including portions thereof.
-
-1.5. "Incompatible With Secondary Licenses"
-    means
-
-    (a) that the initial Contributor has attached the notice described
-        in Exhibit B to the Covered Software; or
-
-    (b) that the Covered Software was made available under the terms of
-        version 1.1 or earlier of the License, but not also under the
-        terms of a Secondary License.
-
-1.6. "Executable Form"
-    means any form of the work other than Source Code Form.
-
-1.7. "Larger Work"
-    means a work that combines Covered Software with other material, in 
-    a separate file or files, that is not Covered Software.
-
-1.8. "License"
-    means this document.
-
-1.9. "Licensable"
-    means having the right to grant, to the maximum extent possible,
-    whether at the time of the initial grant or subsequently, any and
-    all of the rights conveyed by this License.
-
-1.10. "Modifications"
-    means any of the following:
-
-    (a) any file in Source Code Form that results from an addition to,
-        deletion from, or modification of the contents of Covered
-        Software; or
-
-    (b) any new file in Source Code Form that contains any Covered
-        Software.
-
-1.11. "Patent Claims" of a Contributor
-    means any patent claim(s), including without limitation, method,
-    process, and apparatus claims, in any patent Licensable by such
-    Contributor that would be infringed, but for the grant of the
-    License, by the making, using, selling, offering for sale, having
-    made, import, or transfer of either its Contributions or its
-    Contributor Version.
-
-1.12. "Secondary License"
-    means either the GNU General Public License, Version 2.0, the GNU
-    Lesser General Public License, Version 2.1, the GNU Affero General
-    Public License, Version 3.0, or any later versions of those
-    licenses.
-
-1.13. "Source Code Form"
-    means the form of the work preferred for making modifications.
-
-1.14. "You" (or "Your")
-    means an individual or a legal entity exercising rights under this
-    License. For legal entities, "You" includes any entity that
-    controls, is controlled by, or is under common control with You. For
-    purposes of this definition, "control" means (a) the power, direct
-    or indirect, to cause the direction or management of such entity,
-    whether by contract or otherwise, or (b) ownership of more than
-    fifty percent (50%) of the outstanding shares or beneficial
-    ownership of such entity.
-
-2. License Grants and Conditions
---------------------------------
-
-2.1. Grants
-
-Each Contributor hereby grants You a world-wide, royalty-free,
-non-exclusive license:
-
-(a) under intellectual property rights (other than patent or trademark)
-    Licensable by such Contributor to use, reproduce, make available,
-    modify, display, perform, distribute, and otherwise exploit its
-    Contributions, either on an unmodified basis, with Modifications, or
-    as part of a Larger Work; and
-
-(b) under Patent Claims of such Contributor to make, use, sell, offer
-    for sale, have made, import, and otherwise transfer either its
-    Contributions or its Contributor Version.
-
-2.2. Effective Date
-
-The licenses granted in Section 2.1 with respect to any Contribution
-become effective for each Contribution on the date the Contributor first
-distributes such Contribution.
-
-2.3. Limitations on Grant Scope
-
-The licenses granted in this Section 2 are the only rights granted under
-this License. No additional rights or licenses will be implied from the
-distribution or licensing of Covered Software under this License.
-Notwithstanding Section 2.1(b) above, no patent license is granted by a
-Contributor:
-
-(a) for any code that a Contributor has removed from Covered Software;
-    or
-
-(b) for infringements caused by: (i) Your and any other third party's
-    modifications of Covered Software, or (ii) the combination of its
-    Contributions with other software (except as part of its Contributor
-    Version); or
-
-(c) under Patent Claims infringed by Covered Software in the absence of
-    its Contributions.
-
-This License does not grant any rights in the trademarks, service marks,
-or logos of any Contributor (except as may be necessary to comply with
-the notice requirements in Section 3.4).
-
-2.4. Subsequent Licenses
-
-No Contributor makes additional grants as a result of Your choice to
-distribute the Covered Software under a subsequent version of this
-License (see Section 10.2) or under the terms of a Secondary License (if
-permitted under the terms of Section 3.3).
-
-2.5. Representation
-
-Each Contributor represents that the Contributor believes its
-Contributions are its original creation(s) or it has sufficient rights
-to grant the rights to its Contributions conveyed by this License.
-
-2.6. Fair Use
-
-This License is not intended to limit any rights You have under
-applicable copyright doctrines of fair use, fair dealing, or other
-equivalents.
-
-2.7. Conditions
-
-Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted
-in Section 2.1.
-
-3. Responsibilities
--------------------
-
-3.1. Distribution of Source Form
-
-All distribution of Covered Software in Source Code Form, including any
-Modifications that You create or to which You contribute, must be under
-the terms of this License. You must inform recipients that the Source
-Code Form of the Covered Software is governed by the terms of this
-License, and how they can obtain a copy of this License. You may not
-attempt to alter or restrict the recipients' rights in the Source Code
-Form.
-
-3.2. Distribution of Executable Form
-
-If You distribute Covered Software in Executable Form then:
-
-(a) such Covered Software must also be made available in Source Code
-    Form, as described in Section 3.1, and You must inform recipients of
-    the Executable Form how they can obtain a copy of such Source Code
-    Form by reasonable means in a timely manner, at a charge no more
-    than the cost of distribution to the recipient; and
-
-(b) You may distribute such Executable Form under the terms of this
-    License, or sublicense it under different terms, provided that the
-    license for the Executable Form does not attempt to limit or alter
-    the recipients' rights in the Source Code Form under this License.
-
-3.3. Distribution of a Larger Work
-
-You may create and distribute a Larger Work under terms of Your choice,
-provided that You also comply with the requirements of this License for
-the Covered Software. If the Larger Work is a combination of Covered
-Software with a work governed by one or more Secondary Licenses, and the
-Covered Software is not Incompatible With Secondary Licenses, this
-License permits You to additionally distribute such Covered Software
-under the terms of such Secondary License(s), so that the recipient of
-the Larger Work may, at their option, further distribute the Covered
-Software under the terms of either this License or such Secondary
-License(s).
-
-3.4. Notices
-
-You may not remove or alter the substance of any license notices
-(including copyright notices, patent notices, disclaimers of warranty,
-or limitations of liability) contained within the Source Code Form of
-the Covered Software, except that You may alter any license notices to
-the extent required to remedy known factual inaccuracies.
-
-3.5. Application of Additional Terms
-
-You may choose to offer, and to charge a fee for, warranty, support,
-indemnity or liability obligations to one or more recipients of Covered
-Software. However, You may do so only on Your own behalf, and not on
-behalf of any Contributor. You must make it absolutely clear that any
-such warranty, support, indemnity, or liability obligation is offered by
-You alone, and You hereby agree to indemnify every Contributor for any
-liability incurred by such Contributor as a result of warranty, support,
-indemnity or liability terms You offer. You may include additional
-disclaimers of warranty and limitations of liability specific to any
-jurisdiction.
-
-4. Inability to Comply Due to Statute or Regulation
----------------------------------------------------
-
-If it is impossible for You to comply with any of the terms of this
-License with respect to some or all of the Covered Software due to
-statute, judicial order, or regulation then You must: (a) comply with
-the terms of this License to the maximum extent possible; and (b)
-describe the limitations and the code they affect. Such description must
-be placed in a text file included with all distributions of the Covered
-Software under this License. Except to the extent prohibited by statute
-or regulation, such description must be sufficiently detailed for a
-recipient of ordinary skill to be able to understand it.
-
-5. Termination
---------------
-
-5.1. The rights granted under this License will terminate automatically
-if You fail to comply with any of its terms. However, if You become
-compliant, then the rights granted under this License from a particular
-Contributor are reinstated (a) provisionally, unless and until such
-Contributor explicitly and finally terminates Your grants, and (b) on an
-ongoing basis, if such Contributor fails to notify You of the
-non-compliance by some reasonable means prior to 60 days after You have
-come back into compliance. Moreover, Your grants from a particular
-Contributor are reinstated on an ongoing basis if such Contributor
-notifies You of the non-compliance by some reasonable means, this is the
-first time You have received notice of non-compliance with this License
-from such Contributor, and You become compliant prior to 30 days after
-Your receipt of the notice.
-
-5.2. If You initiate litigation against any entity by asserting a patent
-infringement claim (excluding declaratory judgment actions,
-counter-claims, and cross-claims) alleging that a Contributor Version
-directly or indirectly infringes any patent, then the rights granted to
-You by any and all Contributors for the Covered Software under Section
-2.1 of this License shall terminate.
-
-5.3. In the event of termination under Sections 5.1 or 5.2 above, all
-end user license agreements (excluding distributors and resellers) which
-have been validly granted by You or Your distributors under this License
-prior to termination shall survive termination.
-
-************************************************************************
-*                                                                      *
-*  6. Disclaimer of Warranty                                           *
-*  -------------------------                                           *
-*                                                                      *
-*  Covered Software is provided under this License on an "as is"       *
-*  basis, without warranty of any kind, either expressed, implied, or  *
-*  statutory, including, without limitation, warranties that the       *
-*  Covered Software is free of defects, merchantable, fit for a        *
-*  particular purpose or non-infringing. The entire risk as to the     *
-*  quality and performance of the Covered Software is with You.        *
-*  Should any Covered Software prove defective in any respect, You     *
-*  (not any Contributor) assume the cost of any necessary servicing,   *
-*  repair, or correction. This disclaimer of warranty constitutes an   *
-*  essential part of this License. No use of any Covered Software is   *
-*  authorized under this License except under this disclaimer.         *
-*                                                                      *
-************************************************************************
-
-************************************************************************
-*                                                                      *
-*  7. Limitation of Liability                                          *
-*  --------------------------                                          *
-*                                                                      *
-*  Under no circumstances and under no legal theory, whether tort      *
-*  (including negligence), contract, or otherwise, shall any           *
-*  Contributor, or anyone who distributes Covered Software as          *
-*  permitted above, be liable to You for any direct, indirect,         *
-*  special, incidental, or consequential damages of any character      *
-*  including, without limitation, damages for lost profits, loss of    *
-*  goodwill, work stoppage, computer failure or malfunction, or any    *
-*  and all other commercial damages or losses, even if such party      *
-*  shall have been informed of the possibility of such damages. This   *
-*  limitation of liability shall not apply to liability for death or   *
-*  personal injury resulting from such party's negligence to the       *
-*  extent applicable law prohibits such limitation. Some               *
-*  jurisdictions do not allow the exclusion or limitation of           *
-*  incidental or consequential damages, so this exclusion and          *
-*  limitation may not apply to You.                                    *
-*                                                                      *
-************************************************************************
-
-8. Litigation
--------------
-
-Any litigation relating to this License may be brought only in the
-courts of a jurisdiction where the defendant maintains its principal
-place of business and such litigation shall be governed by laws of that
-jurisdiction, without reference to its conflict-of-law provisions.
-Nothing in this Section shall prevent a party's ability to bring
-cross-claims or counter-claims.
-
-9. Miscellaneous
-----------------
-
-This License represents the complete agreement concerning the subject
-matter hereof. If any provision of this License is held to be
-unenforceable, such provision shall be reformed only to the extent
-necessary to make it enforceable. Any law or regulation which provides
-that the language of a contract shall be construed against the drafter
-shall not be used to construe this License against a Contributor.
-
-10. Versions of the License
----------------------------
-
-10.1. New Versions
-
-Mozilla Foundation is the license steward. Except as provided in Section
-10.3, no one other than the license steward has the right to modify or
-publish new versions of this License. Each version will be given a
-distinguishing version number.
-
-10.2. Effect of New Versions
-
-You may distribute the Covered Software under the terms of the version
-of the License under which You originally received the Covered Software,
-or under the terms of any subsequent version published by the license
-steward.
-
-10.3. Modified Versions
-
-If you create software not governed by this License, and you want to
-create a new license for such software, you may create and use a
-modified version of this License if you rename the license and remove
-any references to the name of the license steward (except to note that
-such modified license differs from this License).
-
-10.4. Distributing Source Code Form that is Incompatible With Secondary
-Licenses
-
-If You choose to distribute Source Code Form that is Incompatible With
-Secondary Licenses under the terms of this version of the License, the
-notice described in Exhibit B of this License must be attached.
-
-Exhibit A - Source Code Form License Notice
--------------------------------------------
-
-  This Source Code Form is subject to the terms of the Mozilla Public
-  License, v. 2.0. If a copy of the MPL was not distributed with this
-  file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-If it is not possible or desirable to put the notice in a particular
-file, then You may include the notice in a location (such as a LICENSE
-file in a relevant directory) where a recipient would be likely to look
-for such a notice.
-
-You may add additional accurate notices of copyright ownership.
-
-Exhibit B - "Incompatible With Secondary Licenses" Notice
----------------------------------------------------------
-
-  This Source Code Form is "Incompatible With Secondary Licenses", as
-  defined by the Mozilla Public License, v. 2.0.
diff --git a/Godeps/_workspace/src/github.com/go-sql-driver/mysql/README.md b/Godeps/_workspace/src/github.com/go-sql-driver/mysql/README.md
deleted file mode 100644
index 6a2bb2ca3..000000000
--- a/Godeps/_workspace/src/github.com/go-sql-driver/mysql/README.md
+++ /dev/null
@@ -1,386 +0,0 @@
-# Go-MySQL-Driver
-
-A MySQL-Driver for Go's [database/sql](http://golang.org/pkg/database/sql) package
-
-![Go-MySQL-Driver logo](https://raw.github.com/wiki/go-sql-driver/mysql/gomysql_m.png "Golang Gopher holding the MySQL Dolphin")
-
-**Latest stable Release:** [Version 1.2 (June 03, 2014)](https://github.com/go-sql-driver/mysql/releases)
-
-[![Build Status](https://travis-ci.org/go-sql-driver/mysql.png?branch=master)](https://travis-ci.org/go-sql-driver/mysql)
-
----------------------------------------
-  * [Features](#features)
-  * [Requirements](#requirements)
-  * [Installation](#installation)
-  * [Usage](#usage)
-    * [DSN (Data Source Name)](#dsn-data-source-name)
-      * [Password](#password)
-      * [Protocol](#protocol)
-      * [Address](#address)
-      * [Parameters](#parameters)
-      * [Examples](#examples)
-    * [LOAD DATA LOCAL INFILE support](#load-data-local-infile-support)
-    * [time.Time support](#timetime-support)
-    * [Unicode support](#unicode-support)
-  * [Testing / Development](#testing--development)
-  * [License](#license)
-
----------------------------------------
-
-## Features
-  * Lightweight and [fast](https://github.com/go-sql-driver/sql-benchmark "golang MySQL-Driver performance")
-  * Native Go implementation. No C-bindings, just pure Go
-  * Connections over TCP/IPv4, TCP/IPv6 or Unix domain sockets
-  * Automatic handling of broken connections
-  * Automatic Connection Pooling *(by database/sql package)*
-  * Supports queries larger than 16MB
-  * Full [`sql.RawBytes`](http://golang.org/pkg/database/sql/#RawBytes) support.
-  * Intelligent `LONG DATA` handling in prepared statements
-  * Secure `LOAD DATA LOCAL INFILE` support with file Whitelisting and `io.Reader` support
-  * Optional `time.Time` parsing
-  * Optional placeholder interpolation
-
-## Requirements
-  * Go 1.2 or higher
-  * MySQL (4.1+), MariaDB, Percona Server, Google CloudSQL or Sphinx (2.2.3+)
-
----------------------------------------
-
-## Installation
-Simple install the package to your [$GOPATH](http://code.google.com/p/go-wiki/wiki/GOPATH "GOPATH") with the [go tool](http://golang.org/cmd/go/ "go command") from shell:
-```bash
-$ go get github.com/go-sql-driver/mysql
-```
-Make sure [Git is installed](http://git-scm.com/downloads) on your machine and in your system's `PATH`.
-
-## Usage
-_Go MySQL Driver_ is an implementation of Go's `database/sql/driver` interface. You only need to import the driver and can use the full [`database/sql`](http://golang.org/pkg/database/sql) API then.
-
-Use `mysql` as `driverName` and a valid [DSN](#dsn-data-source-name)  as `dataSourceName`:
-```go
-import "database/sql"
-import _ "github.com/go-sql-driver/mysql"
-
-db, err := sql.Open("mysql", "user:password@/dbname")
-```
-
-[Examples are available in our Wiki](https://github.com/go-sql-driver/mysql/wiki/Examples "Go-MySQL-Driver Examples").
-
-
-### DSN (Data Source Name)
-
-The Data Source Name has a common format, like e.g. [PEAR DB](http://pear.php.net/manual/en/package.database.db.intro-dsn.php) uses it, but without type-prefix (optional parts marked by squared brackets):
-```
-[username[:password]@][protocol[(address)]]/dbname[?param1=value1&...&paramN=valueN]
-```
-
-A DSN in its fullest form:
-```
-username:password@protocol(address)/dbname?param=value
-```
-
-Except for the databasename, all values are optional. So the minimal DSN is:
-```
-/dbname
-```
-
-If you do not want to preselect a database, leave `dbname` empty:
-```
-/
-```
-This has the same effect as an empty DSN string:
-```
-
-```
-
-#### Password
-Passwords can consist of any character. Escaping is **not** necessary.
-
-#### Protocol
-See [net.Dial](http://golang.org/pkg/net/#Dial) for more information which networks are available.
-In general you should use an Unix domain socket if available and TCP otherwise for best performance.
-
-#### Address
-For TCP and UDP networks, addresses have the form `host:port`.
-If `host` is a literal IPv6 address, it must be enclosed in square brackets.
-The functions [net.JoinHostPort](http://golang.org/pkg/net/#JoinHostPort) and [net.SplitHostPort](http://golang.org/pkg/net/#SplitHostPort) manipulate addresses in this form.
-
-For Unix domain sockets the address is the absolute path to the MySQL-Server-socket, e.g. `/var/run/mysqld/mysqld.sock` or `/tmp/mysql.sock`.
-
-#### Parameters
-*Parameters are case-sensitive!*
-
-Notice that any of `true`, `TRUE`, `True` or `1` is accepted to stand for a true boolean value. Not surprisingly, false can be specified as any of: `false`, `FALSE`, `False` or `0`.
-
-##### `allowAllFiles`
-
-```
-Type:           bool
-Valid Values:   true, false
-Default:        false
-```
-
-`allowAllFiles=true` disables the file Whitelist for `LOAD DATA LOCAL INFILE` and allows *all* files.
-[*Might be insecure!*](http://dev.mysql.com/doc/refman/5.7/en/load-data-local.html)
-
-##### `allowCleartextPasswords`
-
-```
-Type:           bool
-Valid Values:   true, false
-Default:        false
-```
-
-`allowCleartextPasswords=true` allows using the [cleartext client side plugin](http://dev.mysql.com/doc/en/cleartext-authentication-plugin.html) if required by an account, such as one defined with the [PAM authentication plugin](http://dev.mysql.com/doc/en/pam-authentication-plugin.html). Sending passwords in clear text may be a security problem in some configurations. To avoid problems if there is any possibility that the password would be intercepted, clients should connect to MySQL Server using a method that protects the password. Possibilities include [TLS / SSL](#tls), IPsec, or a private network.
-
-##### `allowOldPasswords`
-
-```
-Type:           bool
-Valid Values:   true, false
-Default:        false
-```
-`allowOldPasswords=true` allows the usage of the insecure old password method. This should be avoided, but is necessary in some cases. See also [the old_passwords wiki page](https://github.com/go-sql-driver/mysql/wiki/old_passwords).
-
-##### `charset`
-
-```
-Type:           string
-Valid Values:   <name>
-Default:        none
-```
-
-Sets the charset used for client-server interaction (`"SET NAMES <value>"`). If multiple charsets are set (separated by a comma), the following charset is used if setting the charset failes. This enables for example support for `utf8mb4` ([introduced in MySQL 5.5.3](http://dev.mysql.com/doc/refman/5.5/en/charset-unicode-utf8mb4.html)) with fallback to `utf8` for older servers (`charset=utf8mb4,utf8`).
-
-Usage of the `charset` parameter is discouraged because it issues additional queries to the server.
-Unless you need the fallback behavior, please use `collation` instead.
-
-##### `collation`
-
-```
-Type:           string
-Valid Values:   <name>
-Default:        utf8_general_ci
-```
-
-Sets the collation used for client-server interaction on connection. In contrast to `charset`, `collation` does not issue additional queries. If the specified collation is unavailable on the target server, the connection will fail.
-
-A list of valid charsets for a server is retrievable with `SHOW COLLATION`.
-
-##### `clientFoundRows`
-
-```
-Type:           bool
-Valid Values:   true, false
-Default:        false
-```
-
-`clientFoundRows=true` causes an UPDATE to return the number of matching rows instead of the number of rows changed.
-
-##### `columnsWithAlias`
-
-```
-Type:           bool
-Valid Values:   true, false
-Default:        false
-```
-
-When `columnsWithAlias` is true, calls to `sql.Rows.Columns()` will return the table alias and the column name separated by a dot. For example:
-
-```
-SELECT u.id FROM users as u
-```
-
-will return `u.id` instead of just `id` if `columnsWithAlias=true`.
-
-##### `interpolateParams`
-
-```
-Type:           bool
-Valid Values:   true, false
-Default:        false
-```
-
-If `interpolateParams` is true, placeholders (`?`) in calls to `db.Query()` and `db.Exec()` are interpolated into a single query string with given parameters. This reduces the number of roundtrips, since the driver has to prepare a statement, execute it with given parameters and close the statement again with `interpolateParams=false`.
-
-*This can not be used together with the multibyte encodings BIG5, CP932, GB2312, GBK or SJIS. These are blacklisted as they may [introduce a SQL injection vulnerability](http://stackoverflow.com/a/12118602/3430118)!*
-
-##### `loc`
-
-```
-Type:           string
-Valid Values:   <escaped name>
-Default:        UTC
-```
-
-Sets the location for time.Time values (when using `parseTime=true`). *"Local"* sets the system's location. See [time.LoadLocation](http://golang.org/pkg/time/#LoadLocation) for details.
-
-Note that this sets the location for time.Time values but does not change MySQL's [time_zone setting](https://dev.mysql.com/doc/refman/5.5/en/time-zone-support.html). For that see the [time_zone system variable](#system-variables), which can also be set as a DSN parameter.
-
-Please keep in mind, that param values must be [url.QueryEscape](http://golang.org/pkg/net/url/#QueryEscape)'ed. Alternatively you can manually replace the `/` with `%2F`. For example `US/Pacific` would be `loc=US%2FPacific`.
-
-
-##### `parseTime`
-
-```
-Type:           bool
-Valid Values:   true, false
-Default:        false
-```
-
-`parseTime=true` changes the output type of `DATE` and `DATETIME` values to `time.Time` instead of `[]byte` / `string`
-
-
-##### `strict`
-
-```
-Type:           bool
-Valid Values:   true, false
-Default:        false
-```
-
-`strict=true` enables the strict mode in which MySQL warnings are treated as errors.
-
-By default MySQL also treats notes as warnings. Use [`sql_notes=false`](http://dev.mysql.com/doc/refman/5.7/en/server-system-variables.html#sysvar_sql_notes) to ignore notes. See the [examples](#examples) for an DSN example.
-
-
-##### `timeout`
-
-```
-Type:           decimal number
-Default:        OS default
-```
-
-*Driver* side connection timeout. The value must be a string of decimal numbers, each with optional fraction and a unit suffix ( *"ms"*, *"s"*, *"m"*, *"h"* ), such as *"30s"*, *"0.5m"* or *"1m30s"*. To set a server side timeout, use the parameter [`wait_timeout`](http://dev.mysql.com/doc/refman/5.6/en/server-system-variables.html#sysvar_wait_timeout).
-
-
-##### `tls`
-
-```
-Type:           bool / string
-Valid Values:   true, false, skip-verify, <name>
-Default:        false
-```
-
-`tls=true` enables TLS / SSL encrypted connection to the server. Use `skip-verify` if you want to use a self-signed or invalid certificate (server side). Use a custom value registered with [`mysql.RegisterTLSConfig`](http://godoc.org/github.com/go-sql-driver/mysql#RegisterTLSConfig).
-
-
-##### System Variables
-
-All other parameters are interpreted as system variables:
-  * `autocommit`: `"SET autocommit=<value>"`
-  * [`time_zone`](https://dev.mysql.com/doc/refman/5.5/en/time-zone-support.html): `"SET time_zone=<value>"`
-  * [`tx_isolation`](https://dev.mysql.com/doc/refman/5.5/en/server-system-variables.html#sysvar_tx_isolation): `"SET tx_isolation=<value>"`
-  * `param`: `"SET <param>=<value>"`
-
-*The values must be [url.QueryEscape](http://golang.org/pkg/net/url/#QueryEscape)'ed!*
-
-#### Examples
-```
-user@unix(/path/to/socket)/dbname
-```
-
-```
-root:pw@unix(/tmp/mysql.sock)/myDatabase?loc=Local
-```
-
-```
-user:password@tcp(localhost:5555)/dbname?tls=skip-verify&autocommit=true
-```
-
-Use the [strict mode](#strict) but ignore notes:
-```
-user:password@/dbname?strict=true&sql_notes=false
-```
-
-TCP via IPv6:
-```
-user:password@tcp([de:ad:be:ef::ca:fe]:80)/dbname?timeout=90s&collation=utf8mb4_unicode_ci
-```
-
-TCP on a remote host, e.g. Amazon RDS:
-```
-id:password@tcp(your-amazonaws-uri.com:3306)/dbname
-```
-
-Google Cloud SQL on App Engine:
-```
-user@cloudsql(project-id:instance-name)/dbname
-```
-
-TCP using default port (3306) on localhost:
-```
-user:password@tcp/dbname?charset=utf8mb4,utf8&sys_var=esc%40ped
-```
-
-Use the default protocol (tcp) and host (localhost:3306):
-```
-user:password@/dbname
-```
-
-No Database preselected:
-```
-user:password@/
-```
-
-### `LOAD DATA LOCAL INFILE` support
-For this feature you need direct access to the package. Therefore you must change the import path (no `_`):
-```go
-import "github.com/go-sql-driver/mysql"
-```
-
-Files must be whitelisted by registering them with `mysql.RegisterLocalFile(filepath)` (recommended) or the Whitelist check must be deactivated by using the DSN parameter `allowAllFiles=true` ([*Might be insecure!*](http://dev.mysql.com/doc/refman/5.7/en/load-data-local.html)).
-
-To use a `io.Reader` a handler function must be registered with `mysql.RegisterReaderHandler(name, handler)` which returns a `io.Reader` or `io.ReadCloser`. The Reader is available with the filepath `Reader::<name>` then.
-
-See the [godoc of Go-MySQL-Driver](http://godoc.org/github.com/go-sql-driver/mysql "golang mysql driver documentation") for details.
-
-
-### `time.Time` support
-The default internal output type of MySQL `DATE` and `DATETIME` values is `[]byte` which allows you to scan the value into a `[]byte`, `string` or `sql.RawBytes` variable in your programm.
-
-However, many want to scan MySQL `DATE` and `DATETIME` values into `time.Time` variables, which is the logical opposite in Go to `DATE` and `DATETIME` in MySQL. You can do that by changing the internal output type from `[]byte` to `time.Time` with the DSN parameter `parseTime=true`. You can set the default [`time.Time` location](http://golang.org/pkg/time/#Location) with the `loc` DSN parameter.
-
-**Caution:** As of Go 1.1, this makes `time.Time` the only variable type you can scan `DATE` and `DATETIME` values into. This breaks for example [`sql.RawBytes` support](https://github.com/go-sql-driver/mysql/wiki/Examples#rawbytes).
-
-Alternatively you can use the [`NullTime`](http://godoc.org/github.com/go-sql-driver/mysql#NullTime) type as the scan destination, which works with both `time.Time` and `string` / `[]byte`.
-
-
-### Unicode support
-Since version 1.1 Go-MySQL-Driver automatically uses the collation `utf8_general_ci` by default.
-
-Other collations / charsets can be set using the [`collation`](#collation) DSN parameter.
-
-Version 1.0 of the driver recommended adding `&charset=utf8` (alias for `SET NAMES utf8`) to the DSN to enable proper UTF-8 support. This is not necessary anymore. The [`collation`](#collation) parameter should be preferred to set another collation / charset than the default.
-
-See http://dev.mysql.com/doc/refman/5.7/en/charset-unicode.html for more details on MySQL's Unicode support.
-
-
-## Testing / Development
-To run the driver tests you may need to adjust the configuration. See the [Testing Wiki-Page](https://github.com/go-sql-driver/mysql/wiki/Testing "Testing") for details.
-
-Go-MySQL-Driver is not feature-complete yet. Your help is very appreciated.
-If you want to contribute, you can work on an [open issue](https://github.com/go-sql-driver/mysql/issues?state=open) or review a [pull request](https://github.com/go-sql-driver/mysql/pulls).
-
-See the [Contribution Guidelines](https://github.com/go-sql-driver/mysql/blob/master/CONTRIBUTING.md) for details.
-
----------------------------------------
-
-## License
-Go-MySQL-Driver is licensed under the [Mozilla Public License Version 2.0](https://raw.github.com/go-sql-driver/mysql/master/LICENSE)
-
-Mozilla summarizes the license scope as follows:
-> MPL: The copyleft applies to any files containing MPLed code.
-
-
-That means:
-  * You can **use** the **unchanged** source code both in private and commercially
-  * When distributing, you **must publish** the source code of any **changed files** licensed under the MPL 2.0 under a) the MPL 2.0 itself or b) a compatible license (e.g. GPL 3.0 or Apache License 2.0)
-  * You **needn't publish** the source code of your library as long as the files licensed under the MPL 2.0 are **unchanged**
-
-Please read the [MPL 2.0 FAQ](http://www.mozilla.org/MPL/2.0/FAQ.html) if you have further questions regarding the license.
-
-You can read the full terms here: [LICENSE](https://raw.github.com/go-sql-driver/mysql/master/LICENSE)
-
-![Go Gopher and MySQL Dolphin](https://raw.github.com/wiki/go-sql-driver/mysql/go-mysql-driver_m.jpg "Golang Gopher transporting the MySQL Dolphin in a wheelbarrow")
-
diff --git a/Godeps/_workspace/src/github.com/go-sql-driver/mysql/appengine.go b/Godeps/_workspace/src/github.com/go-sql-driver/mysql/appengine.go
deleted file mode 100644
index 565614eef..000000000
--- a/Godeps/_workspace/src/github.com/go-sql-driver/mysql/appengine.go
+++ /dev/null
@@ -1,19 +0,0 @@
-// Go MySQL Driver - A MySQL-Driver for Go's database/sql package
-//
-// Copyright 2013 The Go-MySQL-Driver Authors. All rights reserved.
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this file,
-// You can obtain one at http://mozilla.org/MPL/2.0/.
-
-// +build appengine
-
-package mysql
-
-import (
-	"appengine/cloudsql"
-)
-
-func init() {
-	RegisterDial("cloudsql", cloudsql.Dial)
-}
diff --git a/Godeps/_workspace/src/github.com/go-sql-driver/mysql/benchmark_test.go b/Godeps/_workspace/src/github.com/go-sql-driver/mysql/benchmark_test.go
deleted file mode 100644
index fb8a2f5f3..000000000
--- a/Godeps/_workspace/src/github.com/go-sql-driver/mysql/benchmark_test.go
+++ /dev/null
@@ -1,246 +0,0 @@
-// Go MySQL Driver - A MySQL-Driver for Go's database/sql package
-//
-// Copyright 2013 The Go-MySQL-Driver Authors. All rights reserved.
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this file,
-// You can obtain one at http://mozilla.org/MPL/2.0/.
-
-package mysql
-
-import (
-	"bytes"
-	"database/sql"
-	"database/sql/driver"
-	"math"
-	"strings"
-	"sync"
-	"sync/atomic"
-	"testing"
-	"time"
-)
-
-type TB testing.B
-
-func (tb *TB) check(err error) {
-	if err != nil {
-		tb.Fatal(err)
-	}
-}
-
-func (tb *TB) checkDB(db *sql.DB, err error) *sql.DB {
-	tb.check(err)
-	return db
-}
-
-func (tb *TB) checkRows(rows *sql.Rows, err error) *sql.Rows {
-	tb.check(err)
-	return rows
-}
-
-func (tb *TB) checkStmt(stmt *sql.Stmt, err error) *sql.Stmt {
-	tb.check(err)
-	return stmt
-}
-
-func initDB(b *testing.B, queries ...string) *sql.DB {
-	tb := (*TB)(b)
-	db := tb.checkDB(sql.Open("mysql", dsn))
-	for _, query := range queries {
-		if _, err := db.Exec(query); err != nil {
-			if w, ok := err.(MySQLWarnings); ok {
-				b.Logf("Warning on %q: %v", query, w)
-			} else {
-				b.Fatalf("Error on %q: %v", query, err)
-			}
-		}
-	}
-	return db
-}
-
-const concurrencyLevel = 10
-
-func BenchmarkQuery(b *testing.B) {
-	tb := (*TB)(b)
-	b.StopTimer()
-	b.ReportAllocs()
-	db := initDB(b,
-		"DROP TABLE IF EXISTS foo",
-		"CREATE TABLE foo (id INT PRIMARY KEY, val CHAR(50))",
-		`INSERT INTO foo VALUES (1, "one")`,
-		`INSERT INTO foo VALUES (2, "two")`,
-	)
-	db.SetMaxIdleConns(concurrencyLevel)
-	defer db.Close()
-
-	stmt := tb.checkStmt(db.Prepare("SELECT val FROM foo WHERE id=?"))
-	defer stmt.Close()
-
-	remain := int64(b.N)
-	var wg sync.WaitGroup
-	wg.Add(concurrencyLevel)
-	defer wg.Wait()
-	b.StartTimer()
-
-	for i := 0; i < concurrencyLevel; i++ {
-		go func() {
-			for {
-				if atomic.AddInt64(&remain, -1) < 0 {
-					wg.Done()
-					return
-				}
-
-				var got string
-				tb.check(stmt.QueryRow(1).Scan(&got))
-				if got != "one" {
-					b.Errorf("query = %q; want one", got)
-					wg.Done()
-					return
-				}
-			}
-		}()
-	}
-}
-
-func BenchmarkExec(b *testing.B) {
-	tb := (*TB)(b)
-	b.StopTimer()
-	b.ReportAllocs()
-	db := tb.checkDB(sql.Open("mysql", dsn))
-	db.SetMaxIdleConns(concurrencyLevel)
-	defer db.Close()
-
-	stmt := tb.checkStmt(db.Prepare("DO 1"))
-	defer stmt.Close()
-
-	remain := int64(b.N)
-	var wg sync.WaitGroup
-	wg.Add(concurrencyLevel)
-	defer wg.Wait()
-	b.StartTimer()
-
-	for i := 0; i < concurrencyLevel; i++ {
-		go func() {
-			for {
-				if atomic.AddInt64(&remain, -1) < 0 {
-					wg.Done()
-					return
-				}
-
-				if _, err := stmt.Exec(); err != nil {
-					b.Fatal(err.Error())
-				}
-			}
-		}()
-	}
-}
-
-// data, but no db writes
-var roundtripSample []byte
-
-func initRoundtripBenchmarks() ([]byte, int, int) {
-	if roundtripSample == nil {
-		roundtripSample = []byte(strings.Repeat("0123456789abcdef", 1024*1024))
-	}
-	return roundtripSample, 16, len(roundtripSample)
-}
-
-func BenchmarkRoundtripTxt(b *testing.B) {
-	b.StopTimer()
-	sample, min, max := initRoundtripBenchmarks()
-	sampleString := string(sample)
-	b.ReportAllocs()
-	tb := (*TB)(b)
-	db := tb.checkDB(sql.Open("mysql", dsn))
-	defer db.Close()
-	b.StartTimer()
-	var result string
-	for i := 0; i < b.N; i++ {
-		length := min + i
-		if length > max {
-			length = max
-		}
-		test := sampleString[0:length]
-		rows := tb.checkRows(db.Query(`SELECT "` + test + `"`))
-		if !rows.Next() {
-			rows.Close()
-			b.Fatalf("crashed")
-		}
-		err := rows.Scan(&result)
-		if err != nil {
-			rows.Close()
-			b.Fatalf("crashed")
-		}
-		if result != test {
-			rows.Close()
-			b.Errorf("mismatch")
-		}
-		rows.Close()
-	}
-}
-
-func BenchmarkRoundtripBin(b *testing.B) {
-	b.StopTimer()
-	sample, min, max := initRoundtripBenchmarks()
-	b.ReportAllocs()
-	tb := (*TB)(b)
-	db := tb.checkDB(sql.Open("mysql", dsn))
-	defer db.Close()
-	stmt := tb.checkStmt(db.Prepare("SELECT ?"))
-	defer stmt.Close()
-	b.StartTimer()
-	var result sql.RawBytes
-	for i := 0; i < b.N; i++ {
-		length := min + i
-		if length > max {
-			length = max
-		}
-		test := sample[0:length]
-		rows := tb.checkRows(stmt.Query(test))
-		if !rows.Next() {
-			rows.Close()
-			b.Fatalf("crashed")
-		}
-		err := rows.Scan(&result)
-		if err != nil {
-			rows.Close()
-			b.Fatalf("crashed")
-		}
-		if !bytes.Equal(result, test) {
-			rows.Close()
-			b.Errorf("mismatch")
-		}
-		rows.Close()
-	}
-}
-
-func BenchmarkInterpolation(b *testing.B) {
-	mc := &mysqlConn{
-		cfg: &config{
-			interpolateParams: true,
-			loc:               time.UTC,
-		},
-		maxPacketAllowed: maxPacketSize,
-		maxWriteSize:     maxPacketSize - 1,
-		buf:              newBuffer(nil),
-	}
-
-	args := []driver.Value{
-		int64(42424242),
-		float64(math.Pi),
-		false,
-		time.Unix(1423411542, 807015000),
-		[]byte("bytes containing special chars ' \" \a \x00"),
-		"string containing special chars ' \" \a \x00",
-	}
-	q := "SELECT ?, ?, ?, ?, ?, ?"
-
-	b.ReportAllocs()
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		_, err := mc.interpolateParams(q, args)
-		if err != nil {
-			b.Fatal(err)
-		}
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/go-sql-driver/mysql/buffer.go b/Godeps/_workspace/src/github.com/go-sql-driver/mysql/buffer.go
deleted file mode 100644
index 509ce89e4..000000000
--- a/Godeps/_workspace/src/github.com/go-sql-driver/mysql/buffer.go
+++ /dev/null
@@ -1,136 +0,0 @@
-// Go MySQL Driver - A MySQL-Driver for Go's database/sql package
-//
-// Copyright 2013 The Go-MySQL-Driver Authors. All rights reserved.
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this file,
-// You can obtain one at http://mozilla.org/MPL/2.0/.
-
-package mysql
-
-import "io"
-
-const defaultBufSize = 4096
-
-// A buffer which is used for both reading and writing.
-// This is possible since communication on each connection is synchronous.
-// In other words, we can't write and read simultaneously on the same connection.
-// The buffer is similar to bufio.Reader / Writer but zero-copy-ish
-// Also highly optimized for this particular use case.
-type buffer struct {
-	buf    []byte
-	rd     io.Reader
-	idx    int
-	length int
-}
-
-func newBuffer(rd io.Reader) buffer {
-	var b [defaultBufSize]byte
-	return buffer{
-		buf: b[:],
-		rd:  rd,
-	}
-}
-
-// fill reads into the buffer until at least _need_ bytes are in it
-func (b *buffer) fill(need int) error {
-	n := b.length
-
-	// move existing data to the beginning
-	if n > 0 && b.idx > 0 {
-		copy(b.buf[0:n], b.buf[b.idx:])
-	}
-
-	// grow buffer if necessary
-	// TODO: let the buffer shrink again at some point
-	//       Maybe keep the org buf slice and swap back?
-	if need > len(b.buf) {
-		// Round up to the next multiple of the default size
-		newBuf := make([]byte, ((need/defaultBufSize)+1)*defaultBufSize)
-		copy(newBuf, b.buf)
-		b.buf = newBuf
-	}
-
-	b.idx = 0
-
-	for {
-		nn, err := b.rd.Read(b.buf[n:])
-		n += nn
-
-		switch err {
-		case nil:
-			if n < need {
-				continue
-			}
-			b.length = n
-			return nil
-
-		case io.EOF:
-			if n >= need {
-				b.length = n
-				return nil
-			}
-			return io.ErrUnexpectedEOF
-
-		default:
-			return err
-		}
-	}
-}
-
-// returns next N bytes from buffer.
-// The returned slice is only guaranteed to be valid until the next read
-func (b *buffer) readNext(need int) ([]byte, error) {
-	if b.length < need {
-		// refill
-		if err := b.fill(need); err != nil {
-			return nil, err
-		}
-	}
-
-	offset := b.idx
-	b.idx += need
-	b.length -= need
-	return b.buf[offset:b.idx], nil
-}
-
-// returns a buffer with the requested size.
-// If possible, a slice from the existing buffer is returned.
-// Otherwise a bigger buffer is made.
-// Only one buffer (total) can be used at a time.
-func (b *buffer) takeBuffer(length int) []byte {
-	if b.length > 0 {
-		return nil
-	}
-
-	// test (cheap) general case first
-	if length <= defaultBufSize || length <= cap(b.buf) {
-		return b.buf[:length]
-	}
-
-	if length < maxPacketSize {
-		b.buf = make([]byte, length)
-		return b.buf
-	}
-	return make([]byte, length)
-}
-
-// shortcut which can be used if the requested buffer is guaranteed to be
-// smaller than defaultBufSize
-// Only one buffer (total) can be used at a time.
-func (b *buffer) takeSmallBuffer(length int) []byte {
-	if b.length == 0 {
-		return b.buf[:length]
-	}
-	return nil
-}
-
-// takeCompleteBuffer returns the complete existing buffer.
-// This can be used if the necessary buffer size is unknown.
-// Only one buffer (total) can be used at a time.
-func (b *buffer) takeCompleteBuffer() []byte {
-	if b.length == 0 {
-		return b.buf
-	}
-	return nil
-}
diff --git a/Godeps/_workspace/src/github.com/go-sql-driver/mysql/collations.go b/Godeps/_workspace/src/github.com/go-sql-driver/mysql/collations.go
deleted file mode 100644
index 6c1d613d5..000000000
--- a/Godeps/_workspace/src/github.com/go-sql-driver/mysql/collations.go
+++ /dev/null
@@ -1,250 +0,0 @@
-// Go MySQL Driver - A MySQL-Driver for Go's database/sql package
-//
-// Copyright 2014 The Go-MySQL-Driver Authors. All rights reserved.
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this file,
-// You can obtain one at http://mozilla.org/MPL/2.0/.
-
-package mysql
-
-const defaultCollation byte = 33 // utf8_general_ci
-
-// A list of available collations mapped to the internal ID.
-// To update this map use the following MySQL query:
-//     SELECT COLLATION_NAME, ID FROM information_schema.COLLATIONS
-var collations = map[string]byte{
-	"big5_chinese_ci":          1,
-	"latin2_czech_cs":          2,
-	"dec8_swedish_ci":          3,
-	"cp850_general_ci":         4,
-	"latin1_german1_ci":        5,
-	"hp8_english_ci":           6,
-	"koi8r_general_ci":         7,
-	"latin1_swedish_ci":        8,
-	"latin2_general_ci":        9,
-	"swe7_swedish_ci":          10,
-	"ascii_general_ci":         11,
-	"ujis_japanese_ci":         12,
-	"sjis_japanese_ci":         13,
-	"cp1251_bulgarian_ci":      14,
-	"latin1_danish_ci":         15,
-	"hebrew_general_ci":        16,
-	"tis620_thai_ci":           18,
-	"euckr_korean_ci":          19,
-	"latin7_estonian_cs":       20,
-	"latin2_hungarian_ci":      21,
-	"koi8u_general_ci":         22,
-	"cp1251_ukrainian_ci":      23,
-	"gb2312_chinese_ci":        24,
-	"greek_general_ci":         25,
-	"cp1250_general_ci":        26,
-	"latin2_croatian_ci":       27,
-	"gbk_chinese_ci":           28,
-	"cp1257_lithuanian_ci":     29,
-	"latin5_turkish_ci":        30,
-	"latin1_german2_ci":        31,
-	"armscii8_general_ci":      32,
-	"utf8_general_ci":          33,
-	"cp1250_czech_cs":          34,
-	"ucs2_general_ci":          35,
-	"cp866_general_ci":         36,
-	"keybcs2_general_ci":       37,
-	"macce_general_ci":         38,
-	"macroman_general_ci":      39,
-	"cp852_general_ci":         40,
-	"latin7_general_ci":        41,
-	"latin7_general_cs":        42,
-	"macce_bin":                43,
-	"cp1250_croatian_ci":       44,
-	"utf8mb4_general_ci":       45,
-	"utf8mb4_bin":              46,
-	"latin1_bin":               47,
-	"latin1_general_ci":        48,
-	"latin1_general_cs":        49,
-	"cp1251_bin":               50,
-	"cp1251_general_ci":        51,
-	"cp1251_general_cs":        52,
-	"macroman_bin":             53,
-	"utf16_general_ci":         54,
-	"utf16_bin":                55,
-	"utf16le_general_ci":       56,
-	"cp1256_general_ci":        57,
-	"cp1257_bin":               58,
-	"cp1257_general_ci":        59,
-	"utf32_general_ci":         60,
-	"utf32_bin":                61,
-	"utf16le_bin":              62,
-	"binary":                   63,
-	"armscii8_bin":             64,
-	"ascii_bin":                65,
-	"cp1250_bin":               66,
-	"cp1256_bin":               67,
-	"cp866_bin":                68,
-	"dec8_bin":                 69,
-	"greek_bin":                70,
-	"hebrew_bin":               71,
-	"hp8_bin":                  72,
-	"keybcs2_bin":              73,
-	"koi8r_bin":                74,
-	"koi8u_bin":                75,
-	"latin2_bin":               77,
-	"latin5_bin":               78,
-	"latin7_bin":               79,
-	"cp850_bin":                80,
-	"cp852_bin":                81,
-	"swe7_bin":                 82,
-	"utf8_bin":                 83,
-	"big5_bin":                 84,
-	"euckr_bin":                85,
-	"gb2312_bin":               86,
-	"gbk_bin":                  87,
-	"sjis_bin":                 88,
-	"tis620_bin":               89,
-	"ucs2_bin":                 90,
-	"ujis_bin":                 91,
-	"geostd8_general_ci":       92,
-	"geostd8_bin":              93,
-	"latin1_spanish_ci":        94,
-	"cp932_japanese_ci":        95,
-	"cp932_bin":                96,
-	"eucjpms_japanese_ci":      97,
-	"eucjpms_bin":              98,
-	"cp1250_polish_ci":         99,
-	"utf16_unicode_ci":         101,
-	"utf16_icelandic_ci":       102,
-	"utf16_latvian_ci":         103,
-	"utf16_romanian_ci":        104,
-	"utf16_slovenian_ci":       105,
-	"utf16_polish_ci":          106,
-	"utf16_estonian_ci":        107,
-	"utf16_spanish_ci":         108,
-	"utf16_swedish_ci":         109,
-	"utf16_turkish_ci":         110,
-	"utf16_czech_ci":           111,
-	"utf16_danish_ci":          112,
-	"utf16_lithuanian_ci":      113,
-	"utf16_slovak_ci":          114,
-	"utf16_spanish2_ci":        115,
-	"utf16_roman_ci":           116,
-	"utf16_persian_ci":         117,
-	"utf16_esperanto_ci":       118,
-	"utf16_hungarian_ci":       119,
-	"utf16_sinhala_ci":         120,
-	"utf16_german2_ci":         121,
-	"utf16_croatian_ci":        122,
-	"utf16_unicode_520_ci":     123,
-	"utf16_vietnamese_ci":      124,
-	"ucs2_unicode_ci":          128,
-	"ucs2_icelandic_ci":        129,
-	"ucs2_latvian_ci":          130,
-	"ucs2_romanian_ci":         131,
-	"ucs2_slovenian_ci":        132,
-	"ucs2_polish_ci":           133,
-	"ucs2_estonian_ci":         134,
-	"ucs2_spanish_ci":          135,
-	"ucs2_swedish_ci":          136,
-	"ucs2_turkish_ci":          137,
-	"ucs2_czech_ci":            138,
-	"ucs2_danish_ci":           139,
-	"ucs2_lithuanian_ci":       140,
-	"ucs2_slovak_ci":           141,
-	"ucs2_spanish2_ci":         142,
-	"ucs2_roman_ci":            143,
-	"ucs2_persian_ci":          144,
-	"ucs2_esperanto_ci":        145,
-	"ucs2_hungarian_ci":        146,
-	"ucs2_sinhala_ci":          147,
-	"ucs2_german2_ci":          148,
-	"ucs2_croatian_ci":         149,
-	"ucs2_unicode_520_ci":      150,
-	"ucs2_vietnamese_ci":       151,
-	"ucs2_general_mysql500_ci": 159,
-	"utf32_unicode_ci":         160,
-	"utf32_icelandic_ci":       161,
-	"utf32_latvian_ci":         162,
-	"utf32_romanian_ci":        163,
-	"utf32_slovenian_ci":       164,
-	"utf32_polish_ci":          165,
-	"utf32_estonian_ci":        166,
-	"utf32_spanish_ci":         167,
-	"utf32_swedish_ci":         168,
-	"utf32_turkish_ci":         169,
-	"utf32_czech_ci":           170,
-	"utf32_danish_ci":          171,
-	"utf32_lithuanian_ci":      172,
-	"utf32_slovak_ci":          173,
-	"utf32_spanish2_ci":        174,
-	"utf32_roman_ci":           175,
-	"utf32_persian_ci":         176,
-	"utf32_esperanto_ci":       177,
-	"utf32_hungarian_ci":       178,
-	"utf32_sinhala_ci":         179,
-	"utf32_german2_ci":         180,
-	"utf32_croatian_ci":        181,
-	"utf32_unicode_520_ci":     182,
-	"utf32_vietnamese_ci":      183,
-	"utf8_unicode_ci":          192,
-	"utf8_icelandic_ci":        193,
-	"utf8_latvian_ci":          194,
-	"utf8_romanian_ci":         195,
-	"utf8_slovenian_ci":        196,
-	"utf8_polish_ci":           197,
-	"utf8_estonian_ci":         198,
-	"utf8_spanish_ci":          199,
-	"utf8_swedish_ci":          200,
-	"utf8_turkish_ci":          201,
-	"utf8_czech_ci":            202,
-	"utf8_danish_ci":           203,
-	"utf8_lithuanian_ci":       204,
-	"utf8_slovak_ci":           205,
-	"utf8_spanish2_ci":         206,
-	"utf8_roman_ci":            207,
-	"utf8_persian_ci":          208,
-	"utf8_esperanto_ci":        209,
-	"utf8_hungarian_ci":        210,
-	"utf8_sinhala_ci":          211,
-	"utf8_german2_ci":          212,
-	"utf8_croatian_ci":         213,
-	"utf8_unicode_520_ci":      214,
-	"utf8_vietnamese_ci":       215,
-	"utf8_general_mysql500_ci": 223,
-	"utf8mb4_unicode_ci":       224,
-	"utf8mb4_icelandic_ci":     225,
-	"utf8mb4_latvian_ci":       226,
-	"utf8mb4_romanian_ci":      227,
-	"utf8mb4_slovenian_ci":     228,
-	"utf8mb4_polish_ci":        229,
-	"utf8mb4_estonian_ci":      230,
-	"utf8mb4_spanish_ci":       231,
-	"utf8mb4_swedish_ci":       232,
-	"utf8mb4_turkish_ci":       233,
-	"utf8mb4_czech_ci":         234,
-	"utf8mb4_danish_ci":        235,
-	"utf8mb4_lithuanian_ci":    236,
-	"utf8mb4_slovak_ci":        237,
-	"utf8mb4_spanish2_ci":      238,
-	"utf8mb4_roman_ci":         239,
-	"utf8mb4_persian_ci":       240,
-	"utf8mb4_esperanto_ci":     241,
-	"utf8mb4_hungarian_ci":     242,
-	"utf8mb4_sinhala_ci":       243,
-	"utf8mb4_german2_ci":       244,
-	"utf8mb4_croatian_ci":      245,
-	"utf8mb4_unicode_520_ci":   246,
-	"utf8mb4_vietnamese_ci":    247,
-}
-
-// A blacklist of collations which is unsafe to interpolate parameters.
-// These multibyte encodings may contains 0x5c (`\`) in their trailing bytes.
-var unsafeCollations = map[byte]bool{
-	1:  true, // big5_chinese_ci
-	13: true, // sjis_japanese_ci
-	28: true, // gbk_chinese_ci
-	84: true, // big5_bin
-	86: true, // gb2312_bin
-	87: true, // gbk_bin
-	88: true, // sjis_bin
-	95: true, // cp932_japanese_ci
-	96: true, // cp932_bin
-}
diff --git a/Godeps/_workspace/src/github.com/go-sql-driver/mysql/connection.go b/Godeps/_workspace/src/github.com/go-sql-driver/mysql/connection.go
deleted file mode 100644
index caaae013f..000000000
--- a/Godeps/_workspace/src/github.com/go-sql-driver/mysql/connection.go
+++ /dev/null
@@ -1,403 +0,0 @@
-// Go MySQL Driver - A MySQL-Driver for Go's database/sql package
-//
-// Copyright 2012 The Go-MySQL-Driver Authors. All rights reserved.
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this file,
-// You can obtain one at http://mozilla.org/MPL/2.0/.
-
-package mysql
-
-import (
-	"crypto/tls"
-	"database/sql/driver"
-	"errors"
-	"net"
-	"strconv"
-	"strings"
-	"time"
-)
-
-type mysqlConn struct {
-	buf              buffer
-	netConn          net.Conn
-	affectedRows     uint64
-	insertId         uint64
-	cfg              *config
-	maxPacketAllowed int
-	maxWriteSize     int
-	flags            clientFlag
-	status           statusFlag
-	sequence         uint8
-	parseTime        bool
-	strict           bool
-}
-
-type config struct {
-	user                    string
-	passwd                  string
-	net                     string
-	addr                    string
-	dbname                  string
-	params                  map[string]string
-	loc                     *time.Location
-	tls                     *tls.Config
-	timeout                 time.Duration
-	collation               uint8
-	allowAllFiles           bool
-	allowOldPasswords       bool
-	allowCleartextPasswords bool
-	clientFoundRows         bool
-	columnsWithAlias        bool
-	interpolateParams       bool
-}
-
-// Handles parameters set in DSN after the connection is established
-func (mc *mysqlConn) handleParams() (err error) {
-	for param, val := range mc.cfg.params {
-		switch param {
-		// Charset
-		case "charset":
-			charsets := strings.Split(val, ",")
-			for i := range charsets {
-				// ignore errors here - a charset may not exist
-				err = mc.exec("SET NAMES " + charsets[i])
-				if err == nil {
-					break
-				}
-			}
-			if err != nil {
-				return
-			}
-
-		// time.Time parsing
-		case "parseTime":
-			var isBool bool
-			mc.parseTime, isBool = readBool(val)
-			if !isBool {
-				return errors.New("Invalid Bool value: " + val)
-			}
-
-		// Strict mode
-		case "strict":
-			var isBool bool
-			mc.strict, isBool = readBool(val)
-			if !isBool {
-				return errors.New("Invalid Bool value: " + val)
-			}
-
-		// Compression
-		case "compress":
-			err = errors.New("Compression not implemented yet")
-			return
-
-		// System Vars
-		default:
-			err = mc.exec("SET " + param + "=" + val + "")
-			if err != nil {
-				return
-			}
-		}
-	}
-
-	return
-}
-
-func (mc *mysqlConn) Begin() (driver.Tx, error) {
-	if mc.netConn == nil {
-		errLog.Print(ErrInvalidConn)
-		return nil, driver.ErrBadConn
-	}
-	err := mc.exec("START TRANSACTION")
-	if err == nil {
-		return &mysqlTx{mc}, err
-	}
-
-	return nil, err
-}
-
-func (mc *mysqlConn) Close() (err error) {
-	// Makes Close idempotent
-	if mc.netConn != nil {
-		err = mc.writeCommandPacket(comQuit)
-		if err == nil {
-			err = mc.netConn.Close()
-		} else {
-			mc.netConn.Close()
-		}
-		mc.netConn = nil
-	}
-
-	mc.cfg = nil
-	mc.buf.rd = nil
-
-	return
-}
-
-func (mc *mysqlConn) Prepare(query string) (driver.Stmt, error) {
-	if mc.netConn == nil {
-		errLog.Print(ErrInvalidConn)
-		return nil, driver.ErrBadConn
-	}
-	// Send command
-	err := mc.writeCommandPacketStr(comStmtPrepare, query)
-	if err != nil {
-		return nil, err
-	}
-
-	stmt := &mysqlStmt{
-		mc: mc,
-	}
-
-	// Read Result
-	columnCount, err := stmt.readPrepareResultPacket()
-	if err == nil {
-		if stmt.paramCount > 0 {
-			if err = mc.readUntilEOF(); err != nil {
-				return nil, err
-			}
-		}
-
-		if columnCount > 0 {
-			err = mc.readUntilEOF()
-		}
-	}
-
-	return stmt, err
-}
-
-func (mc *mysqlConn) interpolateParams(query string, args []driver.Value) (string, error) {
-	buf := mc.buf.takeCompleteBuffer()
-	if buf == nil {
-		// can not take the buffer. Something must be wrong with the connection
-		errLog.Print(ErrBusyBuffer)
-		return "", driver.ErrBadConn
-	}
-	buf = buf[:0]
-	argPos := 0
-
-	for i := 0; i < len(query); i++ {
-		q := strings.IndexByte(query[i:], '?')
-		if q == -1 {
-			buf = append(buf, query[i:]...)
-			break
-		}
-		buf = append(buf, query[i:i+q]...)
-		i += q
-
-		arg := args[argPos]
-		argPos++
-
-		if arg == nil {
-			buf = append(buf, "NULL"...)
-			continue
-		}
-
-		switch v := arg.(type) {
-		case int64:
-			buf = strconv.AppendInt(buf, v, 10)
-		case float64:
-			buf = strconv.AppendFloat(buf, v, 'g', -1, 64)
-		case bool:
-			if v {
-				buf = append(buf, '1')
-			} else {
-				buf = append(buf, '0')
-			}
-		case time.Time:
-			if v.IsZero() {
-				buf = append(buf, "'0000-00-00'"...)
-			} else {
-				v := v.In(mc.cfg.loc)
-				v = v.Add(time.Nanosecond * 500) // To round under microsecond
-				year := v.Year()
-				year100 := year / 100
-				year1 := year % 100
-				month := v.Month()
-				day := v.Day()
-				hour := v.Hour()
-				minute := v.Minute()
-				second := v.Second()
-				micro := v.Nanosecond() / 1000
-
-				buf = append(buf, []byte{
-					'\'',
-					digits10[year100], digits01[year100],
-					digits10[year1], digits01[year1],
-					'-',
-					digits10[month], digits01[month],
-					'-',
-					digits10[day], digits01[day],
-					' ',
-					digits10[hour], digits01[hour],
-					':',
-					digits10[minute], digits01[minute],
-					':',
-					digits10[second], digits01[second],
-				}...)
-
-				if micro != 0 {
-					micro10000 := micro / 10000
-					micro100 := micro / 100 % 100
-					micro1 := micro % 100
-					buf = append(buf, []byte{
-						'.',
-						digits10[micro10000], digits01[micro10000],
-						digits10[micro100], digits01[micro100],
-						digits10[micro1], digits01[micro1],
-					}...)
-				}
-				buf = append(buf, '\'')
-			}
-		case []byte:
-			if v == nil {
-				buf = append(buf, "NULL"...)
-			} else {
-				buf = append(buf, '\'')
-				if mc.status&statusNoBackslashEscapes == 0 {
-					buf = escapeBytesBackslash(buf, v)
-				} else {
-					buf = escapeBytesQuotes(buf, v)
-				}
-				buf = append(buf, '\'')
-			}
-		case string:
-			buf = append(buf, '\'')
-			if mc.status&statusNoBackslashEscapes == 0 {
-				buf = escapeStringBackslash(buf, v)
-			} else {
-				buf = escapeStringQuotes(buf, v)
-			}
-			buf = append(buf, '\'')
-		default:
-			return "", driver.ErrSkip
-		}
-
-		if len(buf)+4 > mc.maxPacketAllowed {
-			return "", driver.ErrSkip
-		}
-	}
-	if argPos != len(args) {
-		return "", driver.ErrSkip
-	}
-	return string(buf), nil
-}
-
-func (mc *mysqlConn) Exec(query string, args []driver.Value) (driver.Result, error) {
-	if mc.netConn == nil {
-		errLog.Print(ErrInvalidConn)
-		return nil, driver.ErrBadConn
-	}
-	if len(args) != 0 {
-		if !mc.cfg.interpolateParams {
-			return nil, driver.ErrSkip
-		}
-		// try to interpolate the parameters to save extra roundtrips for preparing and closing a statement
-		prepared, err := mc.interpolateParams(query, args)
-		if err != nil {
-			return nil, err
-		}
-		query = prepared
-		args = nil
-	}
-	mc.affectedRows = 0
-	mc.insertId = 0
-
-	err := mc.exec(query)
-	if err == nil {
-		return &mysqlResult{
-			affectedRows: int64(mc.affectedRows),
-			insertId:     int64(mc.insertId),
-		}, err
-	}
-	return nil, err
-}
-
-// Internal function to execute commands
-func (mc *mysqlConn) exec(query string) error {
-	// Send command
-	err := mc.writeCommandPacketStr(comQuery, query)
-	if err != nil {
-		return err
-	}
-
-	// Read Result
-	resLen, err := mc.readResultSetHeaderPacket()
-	if err == nil && resLen > 0 {
-		if err = mc.readUntilEOF(); err != nil {
-			return err
-		}
-
-		err = mc.readUntilEOF()
-	}
-
-	return err
-}
-
-func (mc *mysqlConn) Query(query string, args []driver.Value) (driver.Rows, error) {
-	if mc.netConn == nil {
-		errLog.Print(ErrInvalidConn)
-		return nil, driver.ErrBadConn
-	}
-	if len(args) != 0 {
-		if !mc.cfg.interpolateParams {
-			return nil, driver.ErrSkip
-		}
-		// try client-side prepare to reduce roundtrip
-		prepared, err := mc.interpolateParams(query, args)
-		if err != nil {
-			return nil, err
-		}
-		query = prepared
-		args = nil
-	}
-	// Send command
-	err := mc.writeCommandPacketStr(comQuery, query)
-	if err == nil {
-		// Read Result
-		var resLen int
-		resLen, err = mc.readResultSetHeaderPacket()
-		if err == nil {
-			rows := new(textRows)
-			rows.mc = mc
-
-			if resLen == 0 {
-				// no columns, no more data
-				return emptyRows{}, nil
-			}
-			// Columns
-			rows.columns, err = mc.readColumns(resLen)
-			return rows, err
-		}
-	}
-	return nil, err
-}
-
-// Gets the value of the given MySQL System Variable
-// The returned byte slice is only valid until the next read
-func (mc *mysqlConn) getSystemVar(name string) ([]byte, error) {
-	// Send command
-	if err := mc.writeCommandPacketStr(comQuery, "SELECT @@"+name); err != nil {
-		return nil, err
-	}
-
-	// Read Result
-	resLen, err := mc.readResultSetHeaderPacket()
-	if err == nil {
-		rows := new(textRows)
-		rows.mc = mc
-
-		if resLen > 0 {
-			// Columns
-			if err := mc.readUntilEOF(); err != nil {
-				return nil, err
-			}
-		}
-
-		dest := make([]driver.Value, resLen)
-		if err = rows.readRow(dest); err == nil {
-			return dest[0].([]byte), mc.readUntilEOF()
-		}
-	}
-	return nil, err
-}
diff --git a/Godeps/_workspace/src/github.com/go-sql-driver/mysql/const.go b/Godeps/_workspace/src/github.com/go-sql-driver/mysql/const.go
deleted file mode 100644
index dddc12908..000000000
--- a/Godeps/_workspace/src/github.com/go-sql-driver/mysql/const.go
+++ /dev/null
@@ -1,162 +0,0 @@
-// Go MySQL Driver - A MySQL-Driver for Go's database/sql package
-//
-// Copyright 2012 The Go-MySQL-Driver Authors. All rights reserved.
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this file,
-// You can obtain one at http://mozilla.org/MPL/2.0/.
-
-package mysql
-
-const (
-	minProtocolVersion byte = 10
-	maxPacketSize           = 1<<24 - 1
-	timeFormat              = "2006-01-02 15:04:05.999999"
-)
-
-// MySQL constants documentation:
-// http://dev.mysql.com/doc/internals/en/client-server-protocol.html
-
-const (
-	iOK          byte = 0x00
-	iLocalInFile byte = 0xfb
-	iEOF         byte = 0xfe
-	iERR         byte = 0xff
-)
-
-// https://dev.mysql.com/doc/internals/en/capability-flags.html#packet-Protocol::CapabilityFlags
-type clientFlag uint32
-
-const (
-	clientLongPassword clientFlag = 1 << iota
-	clientFoundRows
-	clientLongFlag
-	clientConnectWithDB
-	clientNoSchema
-	clientCompress
-	clientODBC
-	clientLocalFiles
-	clientIgnoreSpace
-	clientProtocol41
-	clientInteractive
-	clientSSL
-	clientIgnoreSIGPIPE
-	clientTransactions
-	clientReserved
-	clientSecureConn
-	clientMultiStatements
-	clientMultiResults
-	clientPSMultiResults
-	clientPluginAuth
-	clientConnectAttrs
-	clientPluginAuthLenEncClientData
-	clientCanHandleExpiredPasswords
-	clientSessionTrack
-	clientDeprecateEOF
-)
-
-const (
-	comQuit byte = iota + 1
-	comInitDB
-	comQuery
-	comFieldList
-	comCreateDB
-	comDropDB
-	comRefresh
-	comShutdown
-	comStatistics
-	comProcessInfo
-	comConnect
-	comProcessKill
-	comDebug
-	comPing
-	comTime
-	comDelayedInsert
-	comChangeUser
-	comBinlogDump
-	comTableDump
-	comConnectOut
-	comRegisterSlave
-	comStmtPrepare
-	comStmtExecute
-	comStmtSendLongData
-	comStmtClose
-	comStmtReset
-	comSetOption
-	comStmtFetch
-)
-
-// https://dev.mysql.com/doc/internals/en/com-query-response.html#packet-Protocol::ColumnType
-const (
-	fieldTypeDecimal byte = iota
-	fieldTypeTiny
-	fieldTypeShort
-	fieldTypeLong
-	fieldTypeFloat
-	fieldTypeDouble
-	fieldTypeNULL
-	fieldTypeTimestamp
-	fieldTypeLongLong
-	fieldTypeInt24
-	fieldTypeDate
-	fieldTypeTime
-	fieldTypeDateTime
-	fieldTypeYear
-	fieldTypeNewDate
-	fieldTypeVarChar
-	fieldTypeBit
-)
-const (
-	fieldTypeNewDecimal byte = iota + 0xf6
-	fieldTypeEnum
-	fieldTypeSet
-	fieldTypeTinyBLOB
-	fieldTypeMediumBLOB
-	fieldTypeLongBLOB
-	fieldTypeBLOB
-	fieldTypeVarString
-	fieldTypeString
-	fieldTypeGeometry
-)
-
-type fieldFlag uint16
-
-const (
-	flagNotNULL fieldFlag = 1 << iota
-	flagPriKey
-	flagUniqueKey
-	flagMultipleKey
-	flagBLOB
-	flagUnsigned
-	flagZeroFill
-	flagBinary
-	flagEnum
-	flagAutoIncrement
-	flagTimestamp
-	flagSet
-	flagUnknown1
-	flagUnknown2
-	flagUnknown3
-	flagUnknown4
-)
-
-// http://dev.mysql.com/doc/internals/en/status-flags.html
-type statusFlag uint16
-
-const (
-	statusInTrans statusFlag = 1 << iota
-	statusInAutocommit
-	statusReserved // Not in documentation
-	statusMoreResultsExists
-	statusNoGoodIndexUsed
-	statusNoIndexUsed
-	statusCursorExists
-	statusLastRowSent
-	statusDbDropped
-	statusNoBackslashEscapes
-	statusMetadataChanged
-	statusQueryWasSlow
-	statusPsOutParams
-	statusInTransReadonly
-	statusSessionStateChanged
-)
diff --git a/Godeps/_workspace/src/github.com/go-sql-driver/mysql/driver.go b/Godeps/_workspace/src/github.com/go-sql-driver/mysql/driver.go
deleted file mode 100644
index d310624ad..000000000
--- a/Godeps/_workspace/src/github.com/go-sql-driver/mysql/driver.go
+++ /dev/null
@@ -1,149 +0,0 @@
-// Copyright 2012 The Go-MySQL-Driver Authors. All rights reserved.
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this file,
-// You can obtain one at http://mozilla.org/MPL/2.0/.
-
-// Go MySQL Driver - A MySQL-Driver for Go's database/sql package
-//
-// The driver should be used via the database/sql package:
-//
-//  import "database/sql"
-//  import _ "github.com/go-sql-driver/mysql"
-//
-//  db, err := sql.Open("mysql", "user:password@/dbname")
-//
-// See https://github.com/go-sql-driver/mysql#usage for details
-package mysql
-
-import (
-	"database/sql"
-	"database/sql/driver"
-	"net"
-)
-
-// This struct is exported to make the driver directly accessible.
-// In general the driver is used via the database/sql package.
-type MySQLDriver struct{}
-
-// DialFunc is a function which can be used to establish the network connection.
-// Custom dial functions must be registered with RegisterDial
-type DialFunc func(addr string) (net.Conn, error)
-
-var dials map[string]DialFunc
-
-// RegisterDial registers a custom dial function. It can then be used by the
-// network address mynet(addr), where mynet is the registered new network.
-// addr is passed as a parameter to the dial function.
-func RegisterDial(net string, dial DialFunc) {
-	if dials == nil {
-		dials = make(map[string]DialFunc)
-	}
-	dials[net] = dial
-}
-
-// Open new Connection.
-// See https://github.com/go-sql-driver/mysql#dsn-data-source-name for how
-// the DSN string is formated
-func (d MySQLDriver) Open(dsn string) (driver.Conn, error) {
-	var err error
-
-	// New mysqlConn
-	mc := &mysqlConn{
-		maxPacketAllowed: maxPacketSize,
-		maxWriteSize:     maxPacketSize - 1,
-	}
-	mc.cfg, err = parseDSN(dsn)
-	if err != nil {
-		return nil, err
-	}
-
-	// Connect to Server
-	if dial, ok := dials[mc.cfg.net]; ok {
-		mc.netConn, err = dial(mc.cfg.addr)
-	} else {
-		nd := net.Dialer{Timeout: mc.cfg.timeout}
-		mc.netConn, err = nd.Dial(mc.cfg.net, mc.cfg.addr)
-	}
-	if err != nil {
-		return nil, err
-	}
-
-	// Enable TCP Keepalives on TCP connections
-	if tc, ok := mc.netConn.(*net.TCPConn); ok {
-		if err := tc.SetKeepAlive(true); err != nil {
-			// Don't send COM_QUIT before handshake.
-			mc.netConn.Close()
-			mc.netConn = nil
-			return nil, err
-		}
-	}
-
-	mc.buf = newBuffer(mc.netConn)
-
-	// Reading Handshake Initialization Packet
-	cipher, err := mc.readInitPacket()
-	if err != nil {
-		mc.Close()
-		return nil, err
-	}
-
-	// Send Client Authentication Packet
-	if err = mc.writeAuthPacket(cipher); err != nil {
-		mc.Close()
-		return nil, err
-	}
-
-	// Read Result Packet
-	err = mc.readResultOK()
-	if err != nil {
-		// Retry with old authentication method, if allowed
-		if mc.cfg != nil && mc.cfg.allowOldPasswords && err == ErrOldPassword {
-			if err = mc.writeOldAuthPacket(cipher); err != nil {
-				mc.Close()
-				return nil, err
-			}
-			if err = mc.readResultOK(); err != nil {
-				mc.Close()
-				return nil, err
-			}
-		} else if mc.cfg != nil && mc.cfg.allowCleartextPasswords && err == ErrCleartextPassword {
-			if err = mc.writeClearAuthPacket(); err != nil {
-				mc.Close()
-				return nil, err
-			}
-			if err = mc.readResultOK(); err != nil {
-				mc.Close()
-				return nil, err
-			}
-		} else {
-			mc.Close()
-			return nil, err
-		}
-
-	}
-
-	// Get max allowed packet size
-	maxap, err := mc.getSystemVar("max_allowed_packet")
-	if err != nil {
-		mc.Close()
-		return nil, err
-	}
-	mc.maxPacketAllowed = stringToInt(maxap) - 1
-	if mc.maxPacketAllowed < maxPacketSize {
-		mc.maxWriteSize = mc.maxPacketAllowed
-	}
-
-	// Handle DSN Params
-	err = mc.handleParams()
-	if err != nil {
-		mc.Close()
-		return nil, err
-	}
-
-	return mc, nil
-}
-
-func init() {
-	sql.Register("mysql", &MySQLDriver{})
-}
diff --git a/Godeps/_workspace/src/github.com/go-sql-driver/mysql/driver_test.go b/Godeps/_workspace/src/github.com/go-sql-driver/mysql/driver_test.go
deleted file mode 100644
index f9da416ec..000000000
--- a/Godeps/_workspace/src/github.com/go-sql-driver/mysql/driver_test.go
+++ /dev/null
@@ -1,1681 +0,0 @@
-// Go MySQL Driver - A MySQL-Driver for Go's database/sql package
-//
-// Copyright 2013 The Go-MySQL-Driver Authors. All rights reserved.
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this file,
-// You can obtain one at http://mozilla.org/MPL/2.0/.
-
-package mysql
-
-import (
-	"crypto/tls"
-	"database/sql"
-	"database/sql/driver"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"net"
-	"net/url"
-	"os"
-	"strings"
-	"sync"
-	"sync/atomic"
-	"testing"
-	"time"
-)
-
-var (
-	user      string
-	pass      string
-	prot      string
-	addr      string
-	dbname    string
-	dsn       string
-	netAddr   string
-	available bool
-)
-
-var (
-	tDate      = time.Date(2012, 6, 14, 0, 0, 0, 0, time.UTC)
-	sDate      = "2012-06-14"
-	tDateTime  = time.Date(2011, 11, 20, 21, 27, 37, 0, time.UTC)
-	sDateTime  = "2011-11-20 21:27:37"
-	tDate0     = time.Time{}
-	sDate0     = "0000-00-00"
-	sDateTime0 = "0000-00-00 00:00:00"
-)
-
-// See https://github.com/go-sql-driver/mysql/wiki/Testing
-func init() {
-	// get environment variables
-	env := func(key, defaultValue string) string {
-		if value := os.Getenv(key); value != "" {
-			return value
-		}
-		return defaultValue
-	}
-	user = env("MYSQL_TEST_USER", "root")
-	pass = env("MYSQL_TEST_PASS", "")
-	prot = env("MYSQL_TEST_PROT", "tcp")
-	addr = env("MYSQL_TEST_ADDR", "localhost:3306")
-	dbname = env("MYSQL_TEST_DBNAME", "gotest")
-	netAddr = fmt.Sprintf("%s(%s)", prot, addr)
-	dsn = fmt.Sprintf("%s:%s@%s/%s?timeout=30s&strict=true", user, pass, netAddr, dbname)
-	c, err := net.Dial(prot, addr)
-	if err == nil {
-		available = true
-		c.Close()
-	}
-}
-
-type DBTest struct {
-	*testing.T
-	db *sql.DB
-}
-
-func runTests(t *testing.T, dsn string, tests ...func(dbt *DBTest)) {
-	if !available {
-		t.Skipf("MySQL-Server not running on %s", netAddr)
-	}
-
-	db, err := sql.Open("mysql", dsn)
-	if err != nil {
-		t.Fatalf("Error connecting: %s", err.Error())
-	}
-	defer db.Close()
-
-	db.Exec("DROP TABLE IF EXISTS test")
-
-	dsn2 := dsn + "&interpolateParams=true"
-	var db2 *sql.DB
-	if _, err := parseDSN(dsn2); err != errInvalidDSNUnsafeCollation {
-		db2, err = sql.Open("mysql", dsn2)
-		if err != nil {
-			t.Fatalf("Error connecting: %s", err.Error())
-		}
-		defer db2.Close()
-	}
-
-	dbt := &DBTest{t, db}
-	dbt2 := &DBTest{t, db2}
-	for _, test := range tests {
-		test(dbt)
-		dbt.db.Exec("DROP TABLE IF EXISTS test")
-		if db2 != nil {
-			test(dbt2)
-			dbt2.db.Exec("DROP TABLE IF EXISTS test")
-		}
-	}
-}
-
-func (dbt *DBTest) fail(method, query string, err error) {
-	if len(query) > 300 {
-		query = "[query too large to print]"
-	}
-	dbt.Fatalf("Error on %s %s: %s", method, query, err.Error())
-}
-
-func (dbt *DBTest) mustExec(query string, args ...interface{}) (res sql.Result) {
-	res, err := dbt.db.Exec(query, args...)
-	if err != nil {
-		dbt.fail("Exec", query, err)
-	}
-	return res
-}
-
-func (dbt *DBTest) mustQuery(query string, args ...interface{}) (rows *sql.Rows) {
-	rows, err := dbt.db.Query(query, args...)
-	if err != nil {
-		dbt.fail("Query", query, err)
-	}
-	return rows
-}
-
-func TestEmptyQuery(t *testing.T) {
-	runTests(t, dsn, func(dbt *DBTest) {
-		// just a comment, no query
-		rows := dbt.mustQuery("--")
-		// will hang before #255
-		if rows.Next() {
-			dbt.Errorf("Next on rows must be false")
-		}
-	})
-}
-
-func TestCRUD(t *testing.T) {
-	runTests(t, dsn, func(dbt *DBTest) {
-		// Create Table
-		dbt.mustExec("CREATE TABLE test (value BOOL)")
-
-		// Test for unexpected data
-		var out bool
-		rows := dbt.mustQuery("SELECT * FROM test")
-		if rows.Next() {
-			dbt.Error("unexpected data in empty table")
-		}
-
-		// Create Data
-		res := dbt.mustExec("INSERT INTO test VALUES (1)")
-		count, err := res.RowsAffected()
-		if err != nil {
-			dbt.Fatalf("res.RowsAffected() returned error: %s", err.Error())
-		}
-		if count != 1 {
-			dbt.Fatalf("Expected 1 affected row, got %d", count)
-		}
-
-		id, err := res.LastInsertId()
-		if err != nil {
-			dbt.Fatalf("res.LastInsertId() returned error: %s", err.Error())
-		}
-		if id != 0 {
-			dbt.Fatalf("Expected InsertID 0, got %d", id)
-		}
-
-		// Read
-		rows = dbt.mustQuery("SELECT value FROM test")
-		if rows.Next() {
-			rows.Scan(&out)
-			if true != out {
-				dbt.Errorf("true != %t", out)
-			}
-
-			if rows.Next() {
-				dbt.Error("unexpected data")
-			}
-		} else {
-			dbt.Error("no data")
-		}
-
-		// Update
-		res = dbt.mustExec("UPDATE test SET value = ? WHERE value = ?", false, true)
-		count, err = res.RowsAffected()
-		if err != nil {
-			dbt.Fatalf("res.RowsAffected() returned error: %s", err.Error())
-		}
-		if count != 1 {
-			dbt.Fatalf("Expected 1 affected row, got %d", count)
-		}
-
-		// Check Update
-		rows = dbt.mustQuery("SELECT value FROM test")
-		if rows.Next() {
-			rows.Scan(&out)
-			if false != out {
-				dbt.Errorf("false != %t", out)
-			}
-
-			if rows.Next() {
-				dbt.Error("unexpected data")
-			}
-		} else {
-			dbt.Error("no data")
-		}
-
-		// Delete
-		res = dbt.mustExec("DELETE FROM test WHERE value = ?", false)
-		count, err = res.RowsAffected()
-		if err != nil {
-			dbt.Fatalf("res.RowsAffected() returned error: %s", err.Error())
-		}
-		if count != 1 {
-			dbt.Fatalf("Expected 1 affected row, got %d", count)
-		}
-
-		// Check for unexpected rows
-		res = dbt.mustExec("DELETE FROM test")
-		count, err = res.RowsAffected()
-		if err != nil {
-			dbt.Fatalf("res.RowsAffected() returned error: %s", err.Error())
-		}
-		if count != 0 {
-			dbt.Fatalf("Expected 0 affected row, got %d", count)
-		}
-	})
-}
-
-func TestInt(t *testing.T) {
-	runTests(t, dsn, func(dbt *DBTest) {
-		types := [5]string{"TINYINT", "SMALLINT", "MEDIUMINT", "INT", "BIGINT"}
-		in := int64(42)
-		var out int64
-		var rows *sql.Rows
-
-		// SIGNED
-		for _, v := range types {
-			dbt.mustExec("CREATE TABLE test (value " + v + ")")
-
-			dbt.mustExec("INSERT INTO test VALUES (?)", in)
-
-			rows = dbt.mustQuery("SELECT value FROM test")
-			if rows.Next() {
-				rows.Scan(&out)
-				if in != out {
-					dbt.Errorf("%s: %d != %d", v, in, out)
-				}
-			} else {
-				dbt.Errorf("%s: no data", v)
-			}
-
-			dbt.mustExec("DROP TABLE IF EXISTS test")
-		}
-
-		// UNSIGNED ZEROFILL
-		for _, v := range types {
-			dbt.mustExec("CREATE TABLE test (value " + v + " ZEROFILL)")
-
-			dbt.mustExec("INSERT INTO test VALUES (?)", in)
-
-			rows = dbt.mustQuery("SELECT value FROM test")
-			if rows.Next() {
-				rows.Scan(&out)
-				if in != out {
-					dbt.Errorf("%s ZEROFILL: %d != %d", v, in, out)
-				}
-			} else {
-				dbt.Errorf("%s ZEROFILL: no data", v)
-			}
-
-			dbt.mustExec("DROP TABLE IF EXISTS test")
-		}
-	})
-}
-
-func TestFloat(t *testing.T) {
-	runTests(t, dsn, func(dbt *DBTest) {
-		types := [2]string{"FLOAT", "DOUBLE"}
-		in := float32(42.23)
-		var out float32
-		var rows *sql.Rows
-		for _, v := range types {
-			dbt.mustExec("CREATE TABLE test (value " + v + ")")
-			dbt.mustExec("INSERT INTO test VALUES (?)", in)
-			rows = dbt.mustQuery("SELECT value FROM test")
-			if rows.Next() {
-				rows.Scan(&out)
-				if in != out {
-					dbt.Errorf("%s: %g != %g", v, in, out)
-				}
-			} else {
-				dbt.Errorf("%s: no data", v)
-			}
-			dbt.mustExec("DROP TABLE IF EXISTS test")
-		}
-	})
-}
-
-func TestString(t *testing.T) {
-	runTests(t, dsn, func(dbt *DBTest) {
-		types := [6]string{"CHAR(255)", "VARCHAR(255)", "TINYTEXT", "TEXT", "MEDIUMTEXT", "LONGTEXT"}
-		in := "κόσμε üöäßñóùéàâÿœ'îë Árvíztűrő いろはにほへとちりぬるを イロハニホヘト דג סקרן чащах  น่าฟังเอย"
-		var out string
-		var rows *sql.Rows
-
-		for _, v := range types {
-			dbt.mustExec("CREATE TABLE test (value " + v + ") CHARACTER SET utf8")
-
-			dbt.mustExec("INSERT INTO test VALUES (?)", in)
-
-			rows = dbt.mustQuery("SELECT value FROM test")
-			if rows.Next() {
-				rows.Scan(&out)
-				if in != out {
-					dbt.Errorf("%s: %s != %s", v, in, out)
-				}
-			} else {
-				dbt.Errorf("%s: no data", v)
-			}
-
-			dbt.mustExec("DROP TABLE IF EXISTS test")
-		}
-
-		// BLOB
-		dbt.mustExec("CREATE TABLE test (id int, value BLOB) CHARACTER SET utf8")
-
-		id := 2
-		in = "Lorem ipsum dolor sit amet, consetetur sadipscing elitr, " +
-			"sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, " +
-			"sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. " +
-			"Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. " +
-			"Lorem ipsum dolor sit amet, consetetur sadipscing elitr, " +
-			"sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, " +
-			"sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. " +
-			"Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet."
-		dbt.mustExec("INSERT INTO test VALUES (?, ?)", id, in)
-
-		err := dbt.db.QueryRow("SELECT value FROM test WHERE id = ?", id).Scan(&out)
-		if err != nil {
-			dbt.Fatalf("Error on BLOB-Query: %s", err.Error())
-		} else if out != in {
-			dbt.Errorf("BLOB: %s != %s", in, out)
-		}
-	})
-}
-
-type timeTests struct {
-	dbtype  string
-	tlayout string
-	tests   []timeTest
-}
-
-type timeTest struct {
-	s string // leading "!": do not use t as value in queries
-	t time.Time
-}
-
-type timeMode byte
-
-func (t timeMode) String() string {
-	switch t {
-	case binaryString:
-		return "binary:string"
-	case binaryTime:
-		return "binary:time.Time"
-	case textString:
-		return "text:string"
-	}
-	panic("unsupported timeMode")
-}
-
-func (t timeMode) Binary() bool {
-	switch t {
-	case binaryString, binaryTime:
-		return true
-	}
-	return false
-}
-
-const (
-	binaryString timeMode = iota
-	binaryTime
-	textString
-)
-
-func (t timeTest) genQuery(dbtype string, mode timeMode) string {
-	var inner string
-	if mode.Binary() {
-		inner = "?"
-	} else {
-		inner = `"%s"`
-	}
-	return `SELECT cast(` + inner + ` as ` + dbtype + `)`
-}
-
-func (t timeTest) run(dbt *DBTest, dbtype, tlayout string, mode timeMode) {
-	var rows *sql.Rows
-	query := t.genQuery(dbtype, mode)
-	switch mode {
-	case binaryString:
-		rows = dbt.mustQuery(query, t.s)
-	case binaryTime:
-		rows = dbt.mustQuery(query, t.t)
-	case textString:
-		query = fmt.Sprintf(query, t.s)
-		rows = dbt.mustQuery(query)
-	default:
-		panic("unsupported mode")
-	}
-	defer rows.Close()
-	var err error
-	if !rows.Next() {
-		err = rows.Err()
-		if err == nil {
-			err = fmt.Errorf("no data")
-		}
-		dbt.Errorf("%s [%s]: %s", dbtype, mode, err)
-		return
-	}
-	var dst interface{}
-	err = rows.Scan(&dst)
-	if err != nil {
-		dbt.Errorf("%s [%s]: %s", dbtype, mode, err)
-		return
-	}
-	switch val := dst.(type) {
-	case []uint8:
-		str := string(val)
-		if str == t.s {
-			return
-		}
-		if mode.Binary() && dbtype == "DATETIME" && len(str) == 26 && str[:19] == t.s {
-			// a fix mainly for TravisCI:
-			// accept full microsecond resolution in result for DATETIME columns
-			// where the binary protocol was used
-			return
-		}
-		dbt.Errorf("%s [%s] to string: expected %q, got %q",
-			dbtype, mode,
-			t.s, str,
-		)
-	case time.Time:
-		if val == t.t {
-			return
-		}
-		dbt.Errorf("%s [%s] to string: expected %q, got %q",
-			dbtype, mode,
-			t.s, val.Format(tlayout),
-		)
-	default:
-		fmt.Printf("%#v\n", []interface{}{dbtype, tlayout, mode, t.s, t.t})
-		dbt.Errorf("%s [%s]: unhandled type %T (is '%v')",
-			dbtype, mode,
-			val, val,
-		)
-	}
-}
-
-func TestDateTime(t *testing.T) {
-	afterTime := func(t time.Time, d string) time.Time {
-		dur, err := time.ParseDuration(d)
-		if err != nil {
-			panic(err)
-		}
-		return t.Add(dur)
-	}
-	// NOTE: MySQL rounds DATETIME(x) up - but that's not included in the tests
-	format := "2006-01-02 15:04:05.999999"
-	t0 := time.Time{}
-	tstr0 := "0000-00-00 00:00:00.000000"
-	testcases := []timeTests{
-		{"DATE", format[:10], []timeTest{
-			{t: time.Date(2011, 11, 20, 0, 0, 0, 0, time.UTC)},
-			{t: t0, s: tstr0[:10]},
-		}},
-		{"DATETIME", format[:19], []timeTest{
-			{t: time.Date(2011, 11, 20, 21, 27, 37, 0, time.UTC)},
-			{t: t0, s: tstr0[:19]},
-		}},
-		{"DATETIME(0)", format[:21], []timeTest{
-			{t: time.Date(2011, 11, 20, 21, 27, 37, 0, time.UTC)},
-			{t: t0, s: tstr0[:19]},
-		}},
-		{"DATETIME(1)", format[:21], []timeTest{
-			{t: time.Date(2011, 11, 20, 21, 27, 37, 100000000, time.UTC)},
-			{t: t0, s: tstr0[:21]},
-		}},
-		{"DATETIME(6)", format, []timeTest{
-			{t: time.Date(2011, 11, 20, 21, 27, 37, 123456000, time.UTC)},
-			{t: t0, s: tstr0},
-		}},
-		{"TIME", format[11:19], []timeTest{
-			{t: afterTime(t0, "12345s")},
-			{s: "!-12:34:56"},
-			{s: "!-838:59:59"},
-			{s: "!838:59:59"},
-			{t: t0, s: tstr0[11:19]},
-		}},
-		{"TIME(0)", format[11:19], []timeTest{
-			{t: afterTime(t0, "12345s")},
-			{s: "!-12:34:56"},
-			{s: "!-838:59:59"},
-			{s: "!838:59:59"},
-			{t: t0, s: tstr0[11:19]},
-		}},
-		{"TIME(1)", format[11:21], []timeTest{
-			{t: afterTime(t0, "12345600ms")},
-			{s: "!-12:34:56.7"},
-			{s: "!-838:59:58.9"},
-			{s: "!838:59:58.9"},
-			{t: t0, s: tstr0[11:21]},
-		}},
-		{"TIME(6)", format[11:], []timeTest{
-			{t: afterTime(t0, "1234567890123000ns")},
-			{s: "!-12:34:56.789012"},
-			{s: "!-838:59:58.999999"},
-			{s: "!838:59:58.999999"},
-			{t: t0, s: tstr0[11:]},
-		}},
-	}
-	dsns := []string{
-		dsn + "&parseTime=true",
-		dsn + "&parseTime=false",
-	}
-	for _, testdsn := range dsns {
-		runTests(t, testdsn, func(dbt *DBTest) {
-			microsecsSupported := false
-			zeroDateSupported := false
-			var rows *sql.Rows
-			var err error
-			rows, err = dbt.db.Query(`SELECT cast("00:00:00.1" as TIME(1)) = "00:00:00.1"`)
-			if err == nil {
-				rows.Scan(&microsecsSupported)
-				rows.Close()
-			}
-			rows, err = dbt.db.Query(`SELECT cast("0000-00-00" as DATE) = "0000-00-00"`)
-			if err == nil {
-				rows.Scan(&zeroDateSupported)
-				rows.Close()
-			}
-			for _, setups := range testcases {
-				if t := setups.dbtype; !microsecsSupported && t[len(t)-1:] == ")" {
-					// skip fractional second tests if unsupported by server
-					continue
-				}
-				for _, setup := range setups.tests {
-					allowBinTime := true
-					if setup.s == "" {
-						// fill time string whereever Go can reliable produce it
-						setup.s = setup.t.Format(setups.tlayout)
-					} else if setup.s[0] == '!' {
-						// skip tests using setup.t as source in queries
-						allowBinTime = false
-						// fix setup.s - remove the "!"
-						setup.s = setup.s[1:]
-					}
-					if !zeroDateSupported && setup.s == tstr0[:len(setup.s)] {
-						// skip disallowed 0000-00-00 date
-						continue
-					}
-					setup.run(dbt, setups.dbtype, setups.tlayout, textString)
-					setup.run(dbt, setups.dbtype, setups.tlayout, binaryString)
-					if allowBinTime {
-						setup.run(dbt, setups.dbtype, setups.tlayout, binaryTime)
-					}
-				}
-			}
-		})
-	}
-}
-
-func TestTimestampMicros(t *testing.T) {
-	format := "2006-01-02 15:04:05.999999"
-	f0 := format[:19]
-	f1 := format[:21]
-	f6 := format[:26]
-	runTests(t, dsn, func(dbt *DBTest) {
-		// check if microseconds are supported.
-		// Do not use timestamp(x) for that check - before 5.5.6, x would mean display width
-		// and not precision.
-		// Se last paragraph at http://dev.mysql.com/doc/refman/5.6/en/fractional-seconds.html
-		microsecsSupported := false
-		if rows, err := dbt.db.Query(`SELECT cast("00:00:00.1" as TIME(1)) = "00:00:00.1"`); err == nil {
-			rows.Scan(&microsecsSupported)
-			rows.Close()
-		}
-		if !microsecsSupported {
-			// skip test
-			return
-		}
-		_, err := dbt.db.Exec(`
-			CREATE TABLE test (
-				value0 TIMESTAMP NOT NULL DEFAULT '` + f0 + `',
-				value1 TIMESTAMP(1) NOT NULL DEFAULT '` + f1 + `',
-				value6 TIMESTAMP(6) NOT NULL DEFAULT '` + f6 + `'
-			)`,
-		)
-		if err != nil {
-			dbt.Error(err)
-		}
-		defer dbt.mustExec("DROP TABLE IF EXISTS test")
-		dbt.mustExec("INSERT INTO test SET value0=?, value1=?, value6=?", f0, f1, f6)
-		var res0, res1, res6 string
-		rows := dbt.mustQuery("SELECT * FROM test")
-		if !rows.Next() {
-			dbt.Errorf("test contained no selectable values")
-		}
-		err = rows.Scan(&res0, &res1, &res6)
-		if err != nil {
-			dbt.Error(err)
-		}
-		if res0 != f0 {
-			dbt.Errorf("expected %q, got %q", f0, res0)
-		}
-		if res1 != f1 {
-			dbt.Errorf("expected %q, got %q", f1, res1)
-		}
-		if res6 != f6 {
-			dbt.Errorf("expected %q, got %q", f6, res6)
-		}
-	})
-}
-
-func TestNULL(t *testing.T) {
-	runTests(t, dsn, func(dbt *DBTest) {
-		nullStmt, err := dbt.db.Prepare("SELECT NULL")
-		if err != nil {
-			dbt.Fatal(err)
-		}
-		defer nullStmt.Close()
-
-		nonNullStmt, err := dbt.db.Prepare("SELECT 1")
-		if err != nil {
-			dbt.Fatal(err)
-		}
-		defer nonNullStmt.Close()
-
-		// NullBool
-		var nb sql.NullBool
-		// Invalid
-		if err = nullStmt.QueryRow().Scan(&nb); err != nil {
-			dbt.Fatal(err)
-		}
-		if nb.Valid {
-			dbt.Error("Valid NullBool which should be invalid")
-		}
-		// Valid
-		if err = nonNullStmt.QueryRow().Scan(&nb); err != nil {
-			dbt.Fatal(err)
-		}
-		if !nb.Valid {
-			dbt.Error("Invalid NullBool which should be valid")
-		} else if nb.Bool != true {
-			dbt.Errorf("Unexpected NullBool value: %t (should be true)", nb.Bool)
-		}
-
-		// NullFloat64
-		var nf sql.NullFloat64
-		// Invalid
-		if err = nullStmt.QueryRow().Scan(&nf); err != nil {
-			dbt.Fatal(err)
-		}
-		if nf.Valid {
-			dbt.Error("Valid NullFloat64 which should be invalid")
-		}
-		// Valid
-		if err = nonNullStmt.QueryRow().Scan(&nf); err != nil {
-			dbt.Fatal(err)
-		}
-		if !nf.Valid {
-			dbt.Error("Invalid NullFloat64 which should be valid")
-		} else if nf.Float64 != float64(1) {
-			dbt.Errorf("Unexpected NullFloat64 value: %f (should be 1.0)", nf.Float64)
-		}
-
-		// NullInt64
-		var ni sql.NullInt64
-		// Invalid
-		if err = nullStmt.QueryRow().Scan(&ni); err != nil {
-			dbt.Fatal(err)
-		}
-		if ni.Valid {
-			dbt.Error("Valid NullInt64 which should be invalid")
-		}
-		// Valid
-		if err = nonNullStmt.QueryRow().Scan(&ni); err != nil {
-			dbt.Fatal(err)
-		}
-		if !ni.Valid {
-			dbt.Error("Invalid NullInt64 which should be valid")
-		} else if ni.Int64 != int64(1) {
-			dbt.Errorf("Unexpected NullInt64 value: %d (should be 1)", ni.Int64)
-		}
-
-		// NullString
-		var ns sql.NullString
-		// Invalid
-		if err = nullStmt.QueryRow().Scan(&ns); err != nil {
-			dbt.Fatal(err)
-		}
-		if ns.Valid {
-			dbt.Error("Valid NullString which should be invalid")
-		}
-		// Valid
-		if err = nonNullStmt.QueryRow().Scan(&ns); err != nil {
-			dbt.Fatal(err)
-		}
-		if !ns.Valid {
-			dbt.Error("Invalid NullString which should be valid")
-		} else if ns.String != `1` {
-			dbt.Error("Unexpected NullString value:" + ns.String + " (should be `1`)")
-		}
-
-		// nil-bytes
-		var b []byte
-		// Read nil
-		if err = nullStmt.QueryRow().Scan(&b); err != nil {
-			dbt.Fatal(err)
-		}
-		if b != nil {
-			dbt.Error("Non-nil []byte wich should be nil")
-		}
-		// Read non-nil
-		if err = nonNullStmt.QueryRow().Scan(&b); err != nil {
-			dbt.Fatal(err)
-		}
-		if b == nil {
-			dbt.Error("Nil []byte wich should be non-nil")
-		}
-		// Insert nil
-		b = nil
-		success := false
-		if err = dbt.db.QueryRow("SELECT ? IS NULL", b).Scan(&success); err != nil {
-			dbt.Fatal(err)
-		}
-		if !success {
-			dbt.Error("Inserting []byte(nil) as NULL failed")
-		}
-		// Check input==output with input==nil
-		b = nil
-		if err = dbt.db.QueryRow("SELECT ?", b).Scan(&b); err != nil {
-			dbt.Fatal(err)
-		}
-		if b != nil {
-			dbt.Error("Non-nil echo from nil input")
-		}
-		// Check input==output with input!=nil
-		b = []byte("")
-		if err = dbt.db.QueryRow("SELECT ?", b).Scan(&b); err != nil {
-			dbt.Fatal(err)
-		}
-		if b == nil {
-			dbt.Error("nil echo from non-nil input")
-		}
-
-		// Insert NULL
-		dbt.mustExec("CREATE TABLE test (dummmy1 int, value int, dummy2 int)")
-
-		dbt.mustExec("INSERT INTO test VALUES (?, ?, ?)", 1, nil, 2)
-
-		var out interface{}
-		rows := dbt.mustQuery("SELECT * FROM test")
-		if rows.Next() {
-			rows.Scan(&out)
-			if out != nil {
-				dbt.Errorf("%v != nil", out)
-			}
-		} else {
-			dbt.Error("no data")
-		}
-	})
-}
-
-func TestUint64(t *testing.T) {
-	const (
-		u0    = uint64(0)
-		uall  = ^u0
-		uhigh = uall >> 1
-		utop  = ^uhigh
-		s0    = int64(0)
-		sall  = ^s0
-		shigh = int64(uhigh)
-		stop  = ^shigh
-	)
-	runTests(t, dsn, func(dbt *DBTest) {
-		stmt, err := dbt.db.Prepare(`SELECT ?, ?, ? ,?, ?, ?, ?, ?`)
-		if err != nil {
-			dbt.Fatal(err)
-		}
-		defer stmt.Close()
-		row := stmt.QueryRow(
-			u0, uhigh, utop, uall,
-			s0, shigh, stop, sall,
-		)
-
-		var ua, ub, uc, ud uint64
-		var sa, sb, sc, sd int64
-
-		err = row.Scan(&ua, &ub, &uc, &ud, &sa, &sb, &sc, &sd)
-		if err != nil {
-			dbt.Fatal(err)
-		}
-		switch {
-		case ua != u0,
-			ub != uhigh,
-			uc != utop,
-			ud != uall,
-			sa != s0,
-			sb != shigh,
-			sc != stop,
-			sd != sall:
-			dbt.Fatal("Unexpected result value")
-		}
-	})
-}
-
-func TestLongData(t *testing.T) {
-	runTests(t, dsn, func(dbt *DBTest) {
-		var maxAllowedPacketSize int
-		err := dbt.db.QueryRow("select @@max_allowed_packet").Scan(&maxAllowedPacketSize)
-		if err != nil {
-			dbt.Fatal(err)
-		}
-		maxAllowedPacketSize--
-
-		// don't get too ambitious
-		if maxAllowedPacketSize > 1<<25 {
-			maxAllowedPacketSize = 1 << 25
-		}
-
-		dbt.mustExec("CREATE TABLE test (value LONGBLOB)")
-
-		in := strings.Repeat(`a`, maxAllowedPacketSize+1)
-		var out string
-		var rows *sql.Rows
-
-		// Long text data
-		const nonDataQueryLen = 28 // length query w/o value
-		inS := in[:maxAllowedPacketSize-nonDataQueryLen]
-		dbt.mustExec("INSERT INTO test VALUES('" + inS + "')")
-		rows = dbt.mustQuery("SELECT value FROM test")
-		if rows.Next() {
-			rows.Scan(&out)
-			if inS != out {
-				dbt.Fatalf("LONGBLOB: length in: %d, length out: %d", len(inS), len(out))
-			}
-			if rows.Next() {
-				dbt.Error("LONGBLOB: unexpexted row")
-			}
-		} else {
-			dbt.Fatalf("LONGBLOB: no data")
-		}
-
-		// Empty table
-		dbt.mustExec("TRUNCATE TABLE test")
-
-		// Long binary data
-		dbt.mustExec("INSERT INTO test VALUES(?)", in)
-		rows = dbt.mustQuery("SELECT value FROM test WHERE 1=?", 1)
-		if rows.Next() {
-			rows.Scan(&out)
-			if in != out {
-				dbt.Fatalf("LONGBLOB: length in: %d, length out: %d", len(in), len(out))
-			}
-			if rows.Next() {
-				dbt.Error("LONGBLOB: unexpexted row")
-			}
-		} else {
-			if err = rows.Err(); err != nil {
-				dbt.Fatalf("LONGBLOB: no data (err: %s)", err.Error())
-			} else {
-				dbt.Fatal("LONGBLOB: no data (err: <nil>)")
-			}
-		}
-	})
-}
-
-func TestLoadData(t *testing.T) {
-	runTests(t, dsn, func(dbt *DBTest) {
-		verifyLoadDataResult := func() {
-			rows, err := dbt.db.Query("SELECT * FROM test")
-			if err != nil {
-				dbt.Fatal(err.Error())
-			}
-
-			i := 0
-			values := [4]string{
-				"a string",
-				"a string containing a \t",
-				"a string containing a \n",
-				"a string containing both \t\n",
-			}
-
-			var id int
-			var value string
-
-			for rows.Next() {
-				i++
-				err = rows.Scan(&id, &value)
-				if err != nil {
-					dbt.Fatal(err.Error())
-				}
-				if i != id {
-					dbt.Fatalf("%d != %d", i, id)
-				}
-				if values[i-1] != value {
-					dbt.Fatalf("%q != %q", values[i-1], value)
-				}
-			}
-			err = rows.Err()
-			if err != nil {
-				dbt.Fatal(err.Error())
-			}
-
-			if i != 4 {
-				dbt.Fatalf("Rows count mismatch. Got %d, want 4", i)
-			}
-		}
-		file, err := ioutil.TempFile("", "gotest")
-		defer os.Remove(file.Name())
-		if err != nil {
-			dbt.Fatal(err)
-		}
-		file.WriteString("1\ta string\n2\ta string containing a \\t\n3\ta string containing a \\n\n4\ta string containing both \\t\\n\n")
-		file.Close()
-
-		dbt.db.Exec("DROP TABLE IF EXISTS test")
-		dbt.mustExec("CREATE TABLE test (id INT NOT NULL PRIMARY KEY, value TEXT NOT NULL) CHARACTER SET utf8")
-
-		// Local File
-		RegisterLocalFile(file.Name())
-		dbt.mustExec(fmt.Sprintf("LOAD DATA LOCAL INFILE %q INTO TABLE test", file.Name()))
-		verifyLoadDataResult()
-		// negative test
-		_, err = dbt.db.Exec("LOAD DATA LOCAL INFILE 'doesnotexist' INTO TABLE test")
-		if err == nil {
-			dbt.Fatal("Load non-existent file didn't fail")
-		} else if err.Error() != "Local File 'doesnotexist' is not registered. Use the DSN parameter 'allowAllFiles=true' to allow all files" {
-			dbt.Fatal(err.Error())
-		}
-
-		// Empty table
-		dbt.mustExec("TRUNCATE TABLE test")
-
-		// Reader
-		RegisterReaderHandler("test", func() io.Reader {
-			file, err = os.Open(file.Name())
-			if err != nil {
-				dbt.Fatal(err)
-			}
-			return file
-		})
-		dbt.mustExec("LOAD DATA LOCAL INFILE 'Reader::test' INTO TABLE test")
-		verifyLoadDataResult()
-		// negative test
-		_, err = dbt.db.Exec("LOAD DATA LOCAL INFILE 'Reader::doesnotexist' INTO TABLE test")
-		if err == nil {
-			dbt.Fatal("Load non-existent Reader didn't fail")
-		} else if err.Error() != "Reader 'doesnotexist' is not registered" {
-			dbt.Fatal(err.Error())
-		}
-	})
-}
-
-func TestFoundRows(t *testing.T) {
-	runTests(t, dsn, func(dbt *DBTest) {
-		dbt.mustExec("CREATE TABLE test (id INT NOT NULL ,data INT NOT NULL)")
-		dbt.mustExec("INSERT INTO test (id, data) VALUES (0, 0),(0, 0),(1, 0),(1, 0),(1, 1)")
-
-		res := dbt.mustExec("UPDATE test SET data = 1 WHERE id = 0")
-		count, err := res.RowsAffected()
-		if err != nil {
-			dbt.Fatalf("res.RowsAffected() returned error: %s", err.Error())
-		}
-		if count != 2 {
-			dbt.Fatalf("Expected 2 affected rows, got %d", count)
-		}
-		res = dbt.mustExec("UPDATE test SET data = 1 WHERE id = 1")
-		count, err = res.RowsAffected()
-		if err != nil {
-			dbt.Fatalf("res.RowsAffected() returned error: %s", err.Error())
-		}
-		if count != 2 {
-			dbt.Fatalf("Expected 2 affected rows, got %d", count)
-		}
-	})
-	runTests(t, dsn+"&clientFoundRows=true", func(dbt *DBTest) {
-		dbt.mustExec("CREATE TABLE test (id INT NOT NULL ,data INT NOT NULL)")
-		dbt.mustExec("INSERT INTO test (id, data) VALUES (0, 0),(0, 0),(1, 0),(1, 0),(1, 1)")
-
-		res := dbt.mustExec("UPDATE test SET data = 1 WHERE id = 0")
-		count, err := res.RowsAffected()
-		if err != nil {
-			dbt.Fatalf("res.RowsAffected() returned error: %s", err.Error())
-		}
-		if count != 2 {
-			dbt.Fatalf("Expected 2 matched rows, got %d", count)
-		}
-		res = dbt.mustExec("UPDATE test SET data = 1 WHERE id = 1")
-		count, err = res.RowsAffected()
-		if err != nil {
-			dbt.Fatalf("res.RowsAffected() returned error: %s", err.Error())
-		}
-		if count != 3 {
-			dbt.Fatalf("Expected 3 matched rows, got %d", count)
-		}
-	})
-}
-
-func TestStrict(t *testing.T) {
-	// ALLOW_INVALID_DATES to get rid of stricter modes - we want to test for warnings, not errors
-	relaxedDsn := dsn + "&sql_mode=ALLOW_INVALID_DATES"
-	// make sure the MySQL version is recent enough with a separate connection
-	// before running the test
-	conn, err := MySQLDriver{}.Open(relaxedDsn)
-	if conn != nil {
-		conn.Close()
-	}
-	if me, ok := err.(*MySQLError); ok && me.Number == 1231 {
-		// Error 1231: Variable 'sql_mode' can't be set to the value of 'ALLOW_INVALID_DATES'
-		// => skip test, MySQL server version is too old
-		return
-	}
-	runTests(t, relaxedDsn, func(dbt *DBTest) {
-		dbt.mustExec("CREATE TABLE test (a TINYINT NOT NULL, b CHAR(4))")
-
-		var queries = [...]struct {
-			in    string
-			codes []string
-		}{
-			{"DROP TABLE IF EXISTS no_such_table", []string{"1051"}},
-			{"INSERT INTO test VALUES(10,'mysql'),(NULL,'test'),(300,'Open Source')", []string{"1265", "1048", "1264", "1265"}},
-		}
-		var err error
-
-		var checkWarnings = func(err error, mode string, idx int) {
-			if err == nil {
-				dbt.Errorf("Expected STRICT error on query [%s] %s", mode, queries[idx].in)
-			}
-
-			if warnings, ok := err.(MySQLWarnings); ok {
-				var codes = make([]string, len(warnings))
-				for i := range warnings {
-					codes[i] = warnings[i].Code
-				}
-				if len(codes) != len(queries[idx].codes) {
-					dbt.Errorf("Unexpected STRICT error count on query [%s] %s: Wanted %v, Got %v", mode, queries[idx].in, queries[idx].codes, codes)
-				}
-
-				for i := range warnings {
-					if codes[i] != queries[idx].codes[i] {
-						dbt.Errorf("Unexpected STRICT error codes on query [%s] %s: Wanted %v, Got %v", mode, queries[idx].in, queries[idx].codes, codes)
-						return
-					}
-				}
-
-			} else {
-				dbt.Errorf("Unexpected error on query [%s] %s: %s", mode, queries[idx].in, err.Error())
-			}
-		}
-
-		// text protocol
-		for i := range queries {
-			_, err = dbt.db.Exec(queries[i].in)
-			checkWarnings(err, "text", i)
-		}
-
-		var stmt *sql.Stmt
-
-		// binary protocol
-		for i := range queries {
-			stmt, err = dbt.db.Prepare(queries[i].in)
-			if err != nil {
-				dbt.Errorf("Error on preparing query %s: %s", queries[i].in, err.Error())
-			}
-
-			_, err = stmt.Exec()
-			checkWarnings(err, "binary", i)
-
-			err = stmt.Close()
-			if err != nil {
-				dbt.Errorf("Error on closing stmt for query %s: %s", queries[i].in, err.Error())
-			}
-		}
-	})
-}
-
-func TestTLS(t *testing.T) {
-	tlsTest := func(dbt *DBTest) {
-		if err := dbt.db.Ping(); err != nil {
-			if err == ErrNoTLS {
-				dbt.Skip("Server does not support TLS")
-			} else {
-				dbt.Fatalf("Error on Ping: %s", err.Error())
-			}
-		}
-
-		rows := dbt.mustQuery("SHOW STATUS LIKE 'Ssl_cipher'")
-
-		var variable, value *sql.RawBytes
-		for rows.Next() {
-			if err := rows.Scan(&variable, &value); err != nil {
-				dbt.Fatal(err.Error())
-			}
-
-			if value == nil {
-				dbt.Fatal("No Cipher")
-			}
-		}
-	}
-
-	runTests(t, dsn+"&tls=skip-verify", tlsTest)
-
-	// Verify that registering / using a custom cfg works
-	RegisterTLSConfig("custom-skip-verify", &tls.Config{
-		InsecureSkipVerify: true,
-	})
-	runTests(t, dsn+"&tls=custom-skip-verify", tlsTest)
-}
-
-func TestReuseClosedConnection(t *testing.T) {
-	// this test does not use sql.database, it uses the driver directly
-	if !available {
-		t.Skipf("MySQL-Server not running on %s", netAddr)
-	}
-
-	md := &MySQLDriver{}
-	conn, err := md.Open(dsn)
-	if err != nil {
-		t.Fatalf("Error connecting: %s", err.Error())
-	}
-	stmt, err := conn.Prepare("DO 1")
-	if err != nil {
-		t.Fatalf("Error preparing statement: %s", err.Error())
-	}
-	_, err = stmt.Exec(nil)
-	if err != nil {
-		t.Fatalf("Error executing statement: %s", err.Error())
-	}
-	err = conn.Close()
-	if err != nil {
-		t.Fatalf("Error closing connection: %s", err.Error())
-	}
-
-	defer func() {
-		if err := recover(); err != nil {
-			t.Errorf("Panic after reusing a closed connection: %v", err)
-		}
-	}()
-	_, err = stmt.Exec(nil)
-	if err != nil && err != driver.ErrBadConn {
-		t.Errorf("Unexpected error '%s', expected '%s'",
-			err.Error(), driver.ErrBadConn.Error())
-	}
-}
-
-func TestCharset(t *testing.T) {
-	if !available {
-		t.Skipf("MySQL-Server not running on %s", netAddr)
-	}
-
-	mustSetCharset := func(charsetParam, expected string) {
-		runTests(t, dsn+"&"+charsetParam, func(dbt *DBTest) {
-			rows := dbt.mustQuery("SELECT @@character_set_connection")
-			defer rows.Close()
-
-			if !rows.Next() {
-				dbt.Fatalf("Error getting connection charset: %s", rows.Err())
-			}
-
-			var got string
-			rows.Scan(&got)
-
-			if got != expected {
-				dbt.Fatalf("Expected connection charset %s but got %s", expected, got)
-			}
-		})
-	}
-
-	// non utf8 test
-	mustSetCharset("charset=ascii", "ascii")
-
-	// when the first charset is invalid, use the second
-	mustSetCharset("charset=none,utf8", "utf8")
-
-	// when the first charset is valid, use it
-	mustSetCharset("charset=ascii,utf8", "ascii")
-	mustSetCharset("charset=utf8,ascii", "utf8")
-}
-
-func TestFailingCharset(t *testing.T) {
-	runTests(t, dsn+"&charset=none", func(dbt *DBTest) {
-		// run query to really establish connection...
-		_, err := dbt.db.Exec("SELECT 1")
-		if err == nil {
-			dbt.db.Close()
-			t.Fatalf("Connection must not succeed without a valid charset")
-		}
-	})
-}
-
-func TestCollation(t *testing.T) {
-	if !available {
-		t.Skipf("MySQL-Server not running on %s", netAddr)
-	}
-
-	defaultCollation := "utf8_general_ci"
-	testCollations := []string{
-		"",               // do not set
-		defaultCollation, // driver default
-		"latin1_general_ci",
-		"binary",
-		"utf8_unicode_ci",
-		"cp1257_bin",
-	}
-
-	for _, collation := range testCollations {
-		var expected, tdsn string
-		if collation != "" {
-			tdsn = dsn + "&collation=" + collation
-			expected = collation
-		} else {
-			tdsn = dsn
-			expected = defaultCollation
-		}
-
-		runTests(t, tdsn, func(dbt *DBTest) {
-			var got string
-			if err := dbt.db.QueryRow("SELECT @@collation_connection").Scan(&got); err != nil {
-				dbt.Fatal(err)
-			}
-
-			if got != expected {
-				dbt.Fatalf("Expected connection collation %s but got %s", expected, got)
-			}
-		})
-	}
-}
-
-func TestColumnsWithAlias(t *testing.T) {
-	runTests(t, dsn+"&columnsWithAlias=true", func(dbt *DBTest) {
-		rows := dbt.mustQuery("SELECT 1 AS A")
-		defer rows.Close()
-		cols, _ := rows.Columns()
-		if len(cols) != 1 {
-			t.Fatalf("expected 1 column, got %d", len(cols))
-		}
-		if cols[0] != "A" {
-			t.Fatalf("expected column name \"A\", got \"%s\"", cols[0])
-		}
-		rows.Close()
-
-		rows = dbt.mustQuery("SELECT * FROM (SELECT 1 AS one) AS A")
-		cols, _ = rows.Columns()
-		if len(cols) != 1 {
-			t.Fatalf("expected 1 column, got %d", len(cols))
-		}
-		if cols[0] != "A.one" {
-			t.Fatalf("expected column name \"A.one\", got \"%s\"", cols[0])
-		}
-	})
-}
-
-func TestRawBytesResultExceedsBuffer(t *testing.T) {
-	runTests(t, dsn, func(dbt *DBTest) {
-		// defaultBufSize from buffer.go
-		expected := strings.Repeat("abc", defaultBufSize)
-
-		rows := dbt.mustQuery("SELECT '" + expected + "'")
-		defer rows.Close()
-		if !rows.Next() {
-			dbt.Error("expected result, got none")
-		}
-		var result sql.RawBytes
-		rows.Scan(&result)
-		if expected != string(result) {
-			dbt.Error("result did not match expected value")
-		}
-	})
-}
-
-func TestTimezoneConversion(t *testing.T) {
-	zones := []string{"UTC", "US/Central", "US/Pacific", "Local"}
-
-	// Regression test for timezone handling
-	tzTest := func(dbt *DBTest) {
-
-		// Create table
-		dbt.mustExec("CREATE TABLE test (ts TIMESTAMP)")
-
-		// Insert local time into database (should be converted)
-		usCentral, _ := time.LoadLocation("US/Central")
-		reftime := time.Date(2014, 05, 30, 18, 03, 17, 0, time.UTC).In(usCentral)
-		dbt.mustExec("INSERT INTO test VALUE (?)", reftime)
-
-		// Retrieve time from DB
-		rows := dbt.mustQuery("SELECT ts FROM test")
-		if !rows.Next() {
-			dbt.Fatal("Didn't get any rows out")
-		}
-
-		var dbTime time.Time
-		err := rows.Scan(&dbTime)
-		if err != nil {
-			dbt.Fatal("Err", err)
-		}
-
-		// Check that dates match
-		if reftime.Unix() != dbTime.Unix() {
-			dbt.Errorf("Times don't match.\n")
-			dbt.Errorf(" Now(%v)=%v\n", usCentral, reftime)
-			dbt.Errorf(" Now(UTC)=%v\n", dbTime)
-		}
-	}
-
-	for _, tz := range zones {
-		runTests(t, dsn+"&parseTime=true&loc="+url.QueryEscape(tz), tzTest)
-	}
-}
-
-// Special cases
-
-func TestRowsClose(t *testing.T) {
-	runTests(t, dsn, func(dbt *DBTest) {
-		rows, err := dbt.db.Query("SELECT 1")
-		if err != nil {
-			dbt.Fatal(err)
-		}
-
-		err = rows.Close()
-		if err != nil {
-			dbt.Fatal(err)
-		}
-
-		if rows.Next() {
-			dbt.Fatal("Unexpected row after rows.Close()")
-		}
-
-		err = rows.Err()
-		if err != nil {
-			dbt.Fatal(err)
-		}
-	})
-}
-
-// dangling statements
-// http://code.google.com/p/go/issues/detail?id=3865
-func TestCloseStmtBeforeRows(t *testing.T) {
-	runTests(t, dsn, func(dbt *DBTest) {
-		stmt, err := dbt.db.Prepare("SELECT 1")
-		if err != nil {
-			dbt.Fatal(err)
-		}
-
-		rows, err := stmt.Query()
-		if err != nil {
-			stmt.Close()
-			dbt.Fatal(err)
-		}
-		defer rows.Close()
-
-		err = stmt.Close()
-		if err != nil {
-			dbt.Fatal(err)
-		}
-
-		if !rows.Next() {
-			dbt.Fatal("Getting row failed")
-		} else {
-			err = rows.Err()
-			if err != nil {
-				dbt.Fatal(err)
-			}
-
-			var out bool
-			err = rows.Scan(&out)
-			if err != nil {
-				dbt.Fatalf("Error on rows.Scan(): %s", err.Error())
-			}
-			if out != true {
-				dbt.Errorf("true != %t", out)
-			}
-		}
-	})
-}
-
-// It is valid to have multiple Rows for the same Stmt
-// http://code.google.com/p/go/issues/detail?id=3734
-func TestStmtMultiRows(t *testing.T) {
-	runTests(t, dsn, func(dbt *DBTest) {
-		stmt, err := dbt.db.Prepare("SELECT 1 UNION SELECT 0")
-		if err != nil {
-			dbt.Fatal(err)
-		}
-
-		rows1, err := stmt.Query()
-		if err != nil {
-			stmt.Close()
-			dbt.Fatal(err)
-		}
-		defer rows1.Close()
-
-		rows2, err := stmt.Query()
-		if err != nil {
-			stmt.Close()
-			dbt.Fatal(err)
-		}
-		defer rows2.Close()
-
-		var out bool
-
-		// 1
-		if !rows1.Next() {
-			dbt.Fatal("1st rows1.Next failed")
-		} else {
-			err = rows1.Err()
-			if err != nil {
-				dbt.Fatal(err)
-			}
-
-			err = rows1.Scan(&out)
-			if err != nil {
-				dbt.Fatalf("Error on rows.Scan(): %s", err.Error())
-			}
-			if out != true {
-				dbt.Errorf("true != %t", out)
-			}
-		}
-
-		if !rows2.Next() {
-			dbt.Fatal("1st rows2.Next failed")
-		} else {
-			err = rows2.Err()
-			if err != nil {
-				dbt.Fatal(err)
-			}
-
-			err = rows2.Scan(&out)
-			if err != nil {
-				dbt.Fatalf("Error on rows.Scan(): %s", err.Error())
-			}
-			if out != true {
-				dbt.Errorf("true != %t", out)
-			}
-		}
-
-		// 2
-		if !rows1.Next() {
-			dbt.Fatal("2nd rows1.Next failed")
-		} else {
-			err = rows1.Err()
-			if err != nil {
-				dbt.Fatal(err)
-			}
-
-			err = rows1.Scan(&out)
-			if err != nil {
-				dbt.Fatalf("Error on rows.Scan(): %s", err.Error())
-			}
-			if out != false {
-				dbt.Errorf("false != %t", out)
-			}
-
-			if rows1.Next() {
-				dbt.Fatal("Unexpected row on rows1")
-			}
-			err = rows1.Close()
-			if err != nil {
-				dbt.Fatal(err)
-			}
-		}
-
-		if !rows2.Next() {
-			dbt.Fatal("2nd rows2.Next failed")
-		} else {
-			err = rows2.Err()
-			if err != nil {
-				dbt.Fatal(err)
-			}
-
-			err = rows2.Scan(&out)
-			if err != nil {
-				dbt.Fatalf("Error on rows.Scan(): %s", err.Error())
-			}
-			if out != false {
-				dbt.Errorf("false != %t", out)
-			}
-
-			if rows2.Next() {
-				dbt.Fatal("Unexpected row on rows2")
-			}
-			err = rows2.Close()
-			if err != nil {
-				dbt.Fatal(err)
-			}
-		}
-	})
-}
-
-// Regression test for
-// * more than 32 NULL parameters (issue 209)
-// * more parameters than fit into the buffer (issue 201)
-func TestPreparedManyCols(t *testing.T) {
-	const numParams = defaultBufSize
-	runTests(t, dsn, func(dbt *DBTest) {
-		query := "SELECT ?" + strings.Repeat(",?", numParams-1)
-		stmt, err := dbt.db.Prepare(query)
-		if err != nil {
-			dbt.Fatal(err)
-		}
-		defer stmt.Close()
-		// create more parameters than fit into the buffer
-		// which will take nil-values
-		params := make([]interface{}, numParams)
-		rows, err := stmt.Query(params...)
-		if err != nil {
-			stmt.Close()
-			dbt.Fatal(err)
-		}
-		defer rows.Close()
-	})
-}
-
-func TestConcurrent(t *testing.T) {
-	if enabled, _ := readBool(os.Getenv("MYSQL_TEST_CONCURRENT")); !enabled {
-		t.Skip("MYSQL_TEST_CONCURRENT env var not set")
-	}
-
-	runTests(t, dsn, func(dbt *DBTest) {
-		var max int
-		err := dbt.db.QueryRow("SELECT @@max_connections").Scan(&max)
-		if err != nil {
-			dbt.Fatalf("%s", err.Error())
-		}
-		dbt.Logf("Testing up to %d concurrent connections \r\n", max)
-
-		var remaining, succeeded int32 = int32(max), 0
-
-		var wg sync.WaitGroup
-		wg.Add(max)
-
-		var fatalError string
-		var once sync.Once
-		fatalf := func(s string, vals ...interface{}) {
-			once.Do(func() {
-				fatalError = fmt.Sprintf(s, vals...)
-			})
-		}
-
-		for i := 0; i < max; i++ {
-			go func(id int) {
-				defer wg.Done()
-
-				tx, err := dbt.db.Begin()
-				atomic.AddInt32(&remaining, -1)
-
-				if err != nil {
-					if err.Error() != "Error 1040: Too many connections" {
-						fatalf("Error on Conn %d: %s", id, err.Error())
-					}
-					return
-				}
-
-				// keep the connection busy until all connections are open
-				for remaining > 0 {
-					if _, err = tx.Exec("DO 1"); err != nil {
-						fatalf("Error on Conn %d: %s", id, err.Error())
-						return
-					}
-				}
-
-				if err = tx.Commit(); err != nil {
-					fatalf("Error on Conn %d: %s", id, err.Error())
-					return
-				}
-
-				// everything went fine with this connection
-				atomic.AddInt32(&succeeded, 1)
-			}(i)
-		}
-
-		// wait until all conections are open
-		wg.Wait()
-
-		if fatalError != "" {
-			dbt.Fatal(fatalError)
-		}
-
-		dbt.Logf("Reached %d concurrent connections\r\n", succeeded)
-	})
-}
-
-// Tests custom dial functions
-func TestCustomDial(t *testing.T) {
-	if !available {
-		t.Skipf("MySQL-Server not running on %s", netAddr)
-	}
-
-	// our custom dial function which justs wraps net.Dial here
-	RegisterDial("mydial", func(addr string) (net.Conn, error) {
-		return net.Dial(prot, addr)
-	})
-
-	db, err := sql.Open("mysql", fmt.Sprintf("%s:%s@mydial(%s)/%s?timeout=30s&strict=true", user, pass, addr, dbname))
-	if err != nil {
-		t.Fatalf("Error connecting: %s", err.Error())
-	}
-	defer db.Close()
-
-	if _, err = db.Exec("DO 1"); err != nil {
-		t.Fatalf("Connection failed: %s", err.Error())
-	}
-}
-
-func TestSqlInjection(t *testing.T) {
-	createTest := func(arg string) func(dbt *DBTest) {
-		return func(dbt *DBTest) {
-			dbt.mustExec("CREATE TABLE test (v INTEGER)")
-			dbt.mustExec("INSERT INTO test VALUES (?)", 1)
-
-			var v int
-			// NULL can't be equal to anything, the idea here is to inject query so it returns row
-			// This test verifies that escapeQuotes and escapeBackslash are working properly
-			err := dbt.db.QueryRow("SELECT v FROM test WHERE NULL = ?", arg).Scan(&v)
-			if err == sql.ErrNoRows {
-				return // success, sql injection failed
-			} else if err == nil {
-				dbt.Errorf("Sql injection successful with arg: %s", arg)
-			} else {
-				dbt.Errorf("Error running query with arg: %s; err: %s", arg, err.Error())
-			}
-		}
-	}
-
-	dsns := []string{
-		dsn,
-		dsn + "&sql_mode=NO_BACKSLASH_ESCAPES",
-	}
-	for _, testdsn := range dsns {
-		runTests(t, testdsn, createTest("1 OR 1=1"))
-		runTests(t, testdsn, createTest("' OR '1'='1"))
-	}
-}
-
-// Test if inserted data is correctly retrieved after being escaped
-func TestInsertRetrieveEscapedData(t *testing.T) {
-	testData := func(dbt *DBTest) {
-		dbt.mustExec("CREATE TABLE test (v VARCHAR(255))")
-
-		// All sequences that are escaped by escapeQuotes and escapeBackslash
-		v := "foo \x00\n\r\x1a\"'\\"
-		dbt.mustExec("INSERT INTO test VALUES (?)", v)
-
-		var out string
-		err := dbt.db.QueryRow("SELECT v FROM test").Scan(&out)
-		if err != nil {
-			dbt.Fatalf("%s", err.Error())
-		}
-
-		if out != v {
-			dbt.Errorf("%q != %q", out, v)
-		}
-	}
-
-	dsns := []string{
-		dsn,
-		dsn + "&sql_mode=NO_BACKSLASH_ESCAPES",
-	}
-	for _, testdsn := range dsns {
-		runTests(t, testdsn, testData)
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/go-sql-driver/mysql/errors.go b/Godeps/_workspace/src/github.com/go-sql-driver/mysql/errors.go
deleted file mode 100644
index 44cf30db6..000000000
--- a/Godeps/_workspace/src/github.com/go-sql-driver/mysql/errors.go
+++ /dev/null
@@ -1,131 +0,0 @@
-// Go MySQL Driver - A MySQL-Driver for Go's database/sql package
-//
-// Copyright 2013 The Go-MySQL-Driver Authors. All rights reserved.
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this file,
-// You can obtain one at http://mozilla.org/MPL/2.0/.
-
-package mysql
-
-import (
-	"database/sql/driver"
-	"errors"
-	"fmt"
-	"io"
-	"log"
-	"os"
-)
-
-// Various errors the driver might return. Can change between driver versions.
-var (
-	ErrInvalidConn       = errors.New("Invalid Connection")
-	ErrMalformPkt        = errors.New("Malformed Packet")
-	ErrNoTLS             = errors.New("TLS encryption requested but server does not support TLS")
-	ErrOldPassword       = errors.New("This user requires old password authentication. If you still want to use it, please add 'allowOldPasswords=1' to your DSN. See also https://github.com/go-sql-driver/mysql/wiki/old_passwords")
-	ErrCleartextPassword = errors.New("This user requires clear text authentication. If you still want to use it, please add 'allowCleartextPasswords=1' to your DSN.")
-	ErrUnknownPlugin     = errors.New("The authentication plugin is not supported.")
-	ErrOldProtocol       = errors.New("MySQL-Server does not support required Protocol 41+")
-	ErrPktSync           = errors.New("Commands out of sync. You can't run this command now")
-	ErrPktSyncMul        = errors.New("Commands out of sync. Did you run multiple statements at once?")
-	ErrPktTooLarge       = errors.New("Packet for query is too large. You can change this value on the server by adjusting the 'max_allowed_packet' variable.")
-	ErrBusyBuffer        = errors.New("Busy buffer")
-)
-
-var errLog Logger = log.New(os.Stderr, "[MySQL] ", log.Ldate|log.Ltime|log.Lshortfile)
-
-// Logger is used to log critical error messages.
-type Logger interface {
-	Print(v ...interface{})
-}
-
-// SetLogger is used to set the logger for critical errors.
-// The initial logger is os.Stderr.
-func SetLogger(logger Logger) error {
-	if logger == nil {
-		return errors.New("logger is nil")
-	}
-	errLog = logger
-	return nil
-}
-
-// MySQLError is an error type which represents a single MySQL error
-type MySQLError struct {
-	Number  uint16
-	Message string
-}
-
-func (me *MySQLError) Error() string {
-	return fmt.Sprintf("Error %d: %s", me.Number, me.Message)
-}
-
-// MySQLWarnings is an error type which represents a group of one or more MySQL
-// warnings
-type MySQLWarnings []MySQLWarning
-
-func (mws MySQLWarnings) Error() string {
-	var msg string
-	for i, warning := range mws {
-		if i > 0 {
-			msg += "\r\n"
-		}
-		msg += fmt.Sprintf(
-			"%s %s: %s",
-			warning.Level,
-			warning.Code,
-			warning.Message,
-		)
-	}
-	return msg
-}
-
-// MySQLWarning is an error type which represents a single MySQL warning.
-// Warnings are returned in groups only. See MySQLWarnings
-type MySQLWarning struct {
-	Level   string
-	Code    string
-	Message string
-}
-
-func (mc *mysqlConn) getWarnings() (err error) {
-	rows, err := mc.Query("SHOW WARNINGS", nil)
-	if err != nil {
-		return
-	}
-
-	var warnings = MySQLWarnings{}
-	var values = make([]driver.Value, 3)
-
-	for {
-		err = rows.Next(values)
-		switch err {
-		case nil:
-			warning := MySQLWarning{}
-
-			if raw, ok := values[0].([]byte); ok {
-				warning.Level = string(raw)
-			} else {
-				warning.Level = fmt.Sprintf("%s", values[0])
-			}
-			if raw, ok := values[1].([]byte); ok {
-				warning.Code = string(raw)
-			} else {
-				warning.Code = fmt.Sprintf("%s", values[1])
-			}
-			if raw, ok := values[2].([]byte); ok {
-				warning.Message = string(raw)
-			} else {
-				warning.Message = fmt.Sprintf("%s", values[0])
-			}
-
-			warnings = append(warnings, warning)
-
-		case io.EOF:
-			return warnings
-
-		default:
-			rows.Close()
-			return
-		}
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/go-sql-driver/mysql/errors_test.go b/Godeps/_workspace/src/github.com/go-sql-driver/mysql/errors_test.go
deleted file mode 100644
index 96f9126d6..000000000
--- a/Godeps/_workspace/src/github.com/go-sql-driver/mysql/errors_test.go
+++ /dev/null
@@ -1,42 +0,0 @@
-// Go MySQL Driver - A MySQL-Driver for Go's database/sql package
-//
-// Copyright 2013 The Go-MySQL-Driver Authors. All rights reserved.
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this file,
-// You can obtain one at http://mozilla.org/MPL/2.0/.
-
-package mysql
-
-import (
-	"bytes"
-	"log"
-	"testing"
-)
-
-func TestErrorsSetLogger(t *testing.T) {
-	previous := errLog
-	defer func() {
-		errLog = previous
-	}()
-
-	// set up logger
-	const expected = "prefix: test\n"
-	buffer := bytes.NewBuffer(make([]byte, 0, 64))
-	logger := log.New(buffer, "prefix: ", 0)
-
-	// print
-	SetLogger(logger)
-	errLog.Print("test")
-
-	// check result
-	if actual := buffer.String(); actual != expected {
-		t.Errorf("expected %q, got %q", expected, actual)
-	}
-}
-
-func TestErrorsStrictIgnoreNotes(t *testing.T) {
-	runTests(t, dsn+"&sql_notes=false", func(dbt *DBTest) {
-		dbt.mustExec("DROP TABLE IF EXISTS does_not_exist")
-	})
-}
diff --git a/Godeps/_workspace/src/github.com/go-sql-driver/mysql/infile.go b/Godeps/_workspace/src/github.com/go-sql-driver/mysql/infile.go
deleted file mode 100644
index a2dedb3c0..000000000
--- a/Godeps/_workspace/src/github.com/go-sql-driver/mysql/infile.go
+++ /dev/null
@@ -1,164 +0,0 @@
-// Go MySQL Driver - A MySQL-Driver for Go's database/sql package
-//
-// Copyright 2013 The Go-MySQL-Driver Authors. All rights reserved.
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this file,
-// You can obtain one at http://mozilla.org/MPL/2.0/.
-
-package mysql
-
-import (
-	"fmt"
-	"io"
-	"os"
-	"strings"
-)
-
-var (
-	fileRegister   map[string]bool
-	readerRegister map[string]func() io.Reader
-)
-
-// RegisterLocalFile adds the given file to the file whitelist,
-// so that it can be used by "LOAD DATA LOCAL INFILE <filepath>".
-// Alternatively you can allow the use of all local files with
-// the DSN parameter 'allowAllFiles=true'
-//
-//  filePath := "/home/gopher/data.csv"
-//  mysql.RegisterLocalFile(filePath)
-//  err := db.Exec("LOAD DATA LOCAL INFILE '" + filePath + "' INTO TABLE foo")
-//  if err != nil {
-//  ...
-//
-func RegisterLocalFile(filePath string) {
-	// lazy map init
-	if fileRegister == nil {
-		fileRegister = make(map[string]bool)
-	}
-
-	fileRegister[strings.Trim(filePath, `"`)] = true
-}
-
-// DeregisterLocalFile removes the given filepath from the whitelist.
-func DeregisterLocalFile(filePath string) {
-	delete(fileRegister, strings.Trim(filePath, `"`))
-}
-
-// RegisterReaderHandler registers a handler function which is used
-// to receive a io.Reader.
-// The Reader can be used by "LOAD DATA LOCAL INFILE Reader::<name>".
-// If the handler returns a io.ReadCloser Close() is called when the
-// request is finished.
-//
-//  mysql.RegisterReaderHandler("data", func() io.Reader {
-//  	var csvReader io.Reader // Some Reader that returns CSV data
-//  	... // Open Reader here
-//  	return csvReader
-//  })
-//  err := db.Exec("LOAD DATA LOCAL INFILE 'Reader::data' INTO TABLE foo")
-//  if err != nil {
-//  ...
-//
-func RegisterReaderHandler(name string, handler func() io.Reader) {
-	// lazy map init
-	if readerRegister == nil {
-		readerRegister = make(map[string]func() io.Reader)
-	}
-
-	readerRegister[name] = handler
-}
-
-// DeregisterReaderHandler removes the ReaderHandler function with
-// the given name from the registry.
-func DeregisterReaderHandler(name string) {
-	delete(readerRegister, name)
-}
-
-func deferredClose(err *error, closer io.Closer) {
-	closeErr := closer.Close()
-	if *err == nil {
-		*err = closeErr
-	}
-}
-
-func (mc *mysqlConn) handleInFileRequest(name string) (err error) {
-	var rdr io.Reader
-	var data []byte
-
-	if idx := strings.Index(name, "Reader::"); idx == 0 || (idx > 0 && name[idx-1] == '/') { // io.Reader
-		// The server might return an an absolute path. See issue #355.
-		name = name[idx+8:]
-
-		if handler, inMap := readerRegister[name]; inMap {
-			rdr = handler()
-			if rdr != nil {
-				data = make([]byte, 4+mc.maxWriteSize)
-
-				if cl, ok := rdr.(io.Closer); ok {
-					defer deferredClose(&err, cl)
-				}
-			} else {
-				err = fmt.Errorf("Reader '%s' is <nil>", name)
-			}
-		} else {
-			err = fmt.Errorf("Reader '%s' is not registered", name)
-		}
-	} else { // File
-		name = strings.Trim(name, `"`)
-		if mc.cfg.allowAllFiles || fileRegister[name] {
-			var file *os.File
-			var fi os.FileInfo
-
-			if file, err = os.Open(name); err == nil {
-				defer deferredClose(&err, file)
-
-				// get file size
-				if fi, err = file.Stat(); err == nil {
-					rdr = file
-					if fileSize := int(fi.Size()); fileSize <= mc.maxWriteSize {
-						data = make([]byte, 4+fileSize)
-					} else if fileSize <= mc.maxPacketAllowed {
-						data = make([]byte, 4+mc.maxWriteSize)
-					} else {
-						err = fmt.Errorf("Local File '%s' too large: Size: %d, Max: %d", name, fileSize, mc.maxPacketAllowed)
-					}
-				}
-			}
-		} else {
-			err = fmt.Errorf("Local File '%s' is not registered. Use the DSN parameter 'allowAllFiles=true' to allow all files", name)
-		}
-	}
-
-	// send content packets
-	if err == nil {
-		var n int
-		for err == nil {
-			n, err = rdr.Read(data[4:])
-			if n > 0 {
-				if ioErr := mc.writePacket(data[:4+n]); ioErr != nil {
-					return ioErr
-				}
-			}
-		}
-		if err == io.EOF {
-			err = nil
-		}
-	}
-
-	// send empty packet (termination)
-	if data == nil {
-		data = make([]byte, 4)
-	}
-	if ioErr := mc.writePacket(data[:4]); ioErr != nil {
-		return ioErr
-	}
-
-	// read OK packet
-	if err == nil {
-		return mc.readResultOK()
-	} else {
-		mc.readPacket()
-	}
-	return err
-}
diff --git a/Godeps/_workspace/src/github.com/go-sql-driver/mysql/packets.go b/Godeps/_workspace/src/github.com/go-sql-driver/mysql/packets.go
deleted file mode 100644
index 14395bf9a..000000000
--- a/Godeps/_workspace/src/github.com/go-sql-driver/mysql/packets.go
+++ /dev/null
@@ -1,1179 +0,0 @@
-// Go MySQL Driver - A MySQL-Driver for Go's database/sql package
-//
-// Copyright 2012 The Go-MySQL-Driver Authors. All rights reserved.
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this file,
-// You can obtain one at http://mozilla.org/MPL/2.0/.
-
-package mysql
-
-import (
-	"bytes"
-	"crypto/tls"
-	"database/sql/driver"
-	"encoding/binary"
-	"fmt"
-	"io"
-	"math"
-	"time"
-)
-
-// Packets documentation:
-// http://dev.mysql.com/doc/internals/en/client-server-protocol.html
-
-// Read packet to buffer 'data'
-func (mc *mysqlConn) readPacket() ([]byte, error) {
-	var payload []byte
-	for {
-		// Read packet header
-		data, err := mc.buf.readNext(4)
-		if err != nil {
-			errLog.Print(err)
-			mc.Close()
-			return nil, driver.ErrBadConn
-		}
-
-		// Packet Length [24 bit]
-		pktLen := int(uint32(data[0]) | uint32(data[1])<<8 | uint32(data[2])<<16)
-
-		if pktLen < 1 {
-			errLog.Print(ErrMalformPkt)
-			mc.Close()
-			return nil, driver.ErrBadConn
-		}
-
-		// Check Packet Sync [8 bit]
-		if data[3] != mc.sequence {
-			if data[3] > mc.sequence {
-				return nil, ErrPktSyncMul
-			} else {
-				return nil, ErrPktSync
-			}
-		}
-		mc.sequence++
-
-		// Read packet body [pktLen bytes]
-		data, err = mc.buf.readNext(pktLen)
-		if err != nil {
-			errLog.Print(err)
-			mc.Close()
-			return nil, driver.ErrBadConn
-		}
-
-		isLastPacket := (pktLen < maxPacketSize)
-
-		// Zero allocations for non-splitting packets
-		if isLastPacket && payload == nil {
-			return data, nil
-		}
-
-		payload = append(payload, data...)
-
-		if isLastPacket {
-			return payload, nil
-		}
-	}
-}
-
-// Write packet buffer 'data'
-func (mc *mysqlConn) writePacket(data []byte) error {
-	pktLen := len(data) - 4
-
-	if pktLen > mc.maxPacketAllowed {
-		return ErrPktTooLarge
-	}
-
-	for {
-		var size int
-		if pktLen >= maxPacketSize {
-			data[0] = 0xff
-			data[1] = 0xff
-			data[2] = 0xff
-			size = maxPacketSize
-		} else {
-			data[0] = byte(pktLen)
-			data[1] = byte(pktLen >> 8)
-			data[2] = byte(pktLen >> 16)
-			size = pktLen
-		}
-		data[3] = mc.sequence
-
-		// Write packet
-		n, err := mc.netConn.Write(data[:4+size])
-		if err == nil && n == 4+size {
-			mc.sequence++
-			if size != maxPacketSize {
-				return nil
-			}
-			pktLen -= size
-			data = data[size:]
-			continue
-		}
-
-		// Handle error
-		if err == nil { // n != len(data)
-			errLog.Print(ErrMalformPkt)
-		} else {
-			errLog.Print(err)
-		}
-		return driver.ErrBadConn
-	}
-}
-
-/******************************************************************************
-*                           Initialisation Process                            *
-******************************************************************************/
-
-// Handshake Initialization Packet
-// http://dev.mysql.com/doc/internals/en/connection-phase-packets.html#packet-Protocol::Handshake
-func (mc *mysqlConn) readInitPacket() ([]byte, error) {
-	data, err := mc.readPacket()
-	if err != nil {
-		return nil, err
-	}
-
-	if data[0] == iERR {
-		return nil, mc.handleErrorPacket(data)
-	}
-
-	// protocol version [1 byte]
-	if data[0] < minProtocolVersion {
-		return nil, fmt.Errorf(
-			"Unsupported MySQL Protocol Version %d. Protocol Version %d or higher is required",
-			data[0],
-			minProtocolVersion,
-		)
-	}
-
-	// server version [null terminated string]
-	// connection id [4 bytes]
-	pos := 1 + bytes.IndexByte(data[1:], 0x00) + 1 + 4
-
-	// first part of the password cipher [8 bytes]
-	cipher := data[pos : pos+8]
-
-	// (filler) always 0x00 [1 byte]
-	pos += 8 + 1
-
-	// capability flags (lower 2 bytes) [2 bytes]
-	mc.flags = clientFlag(binary.LittleEndian.Uint16(data[pos : pos+2]))
-	if mc.flags&clientProtocol41 == 0 {
-		return nil, ErrOldProtocol
-	}
-	if mc.flags&clientSSL == 0 && mc.cfg.tls != nil {
-		return nil, ErrNoTLS
-	}
-	pos += 2
-
-	if len(data) > pos {
-		// character set [1 byte]
-		// status flags [2 bytes]
-		// capability flags (upper 2 bytes) [2 bytes]
-		// length of auth-plugin-data [1 byte]
-		// reserved (all [00]) [10 bytes]
-		pos += 1 + 2 + 2 + 1 + 10
-
-		// second part of the password cipher [mininum 13 bytes],
-		// where len=MAX(13, length of auth-plugin-data - 8)
-		//
-		// The web documentation is ambiguous about the length. However,
-		// according to mysql-5.7/sql/auth/sql_authentication.cc line 538,
-		// the 13th byte is "\0 byte, terminating the second part of
-		// a scramble". So the second part of the password cipher is
-		// a NULL terminated string that's at least 13 bytes with the
-		// last byte being NULL.
-		//
-		// The official Python library uses the fixed length 12
-		// which seems to work but technically could have a hidden bug.
-		cipher = append(cipher, data[pos:pos+12]...)
-
-		// TODO: Verify string termination
-		// EOF if version (>= 5.5.7 and < 5.5.10) or (>= 5.6.0 and < 5.6.2)
-		// \NUL otherwise
-		//
-		//if data[len(data)-1] == 0 {
-		//	return
-		//}
-		//return ErrMalformPkt
-
-		// make a memory safe copy of the cipher slice
-		var b [20]byte
-		copy(b[:], cipher)
-		return b[:], nil
-	}
-
-	// make a memory safe copy of the cipher slice
-	var b [8]byte
-	copy(b[:], cipher)
-	return b[:], nil
-}
-
-// Client Authentication Packet
-// http://dev.mysql.com/doc/internals/en/connection-phase-packets.html#packet-Protocol::HandshakeResponse
-func (mc *mysqlConn) writeAuthPacket(cipher []byte) error {
-	// Adjust client flags based on server support
-	clientFlags := clientProtocol41 |
-		clientSecureConn |
-		clientLongPassword |
-		clientTransactions |
-		clientLocalFiles |
-		clientPluginAuth |
-		mc.flags&clientLongFlag
-
-	if mc.cfg.clientFoundRows {
-		clientFlags |= clientFoundRows
-	}
-
-	// To enable TLS / SSL
-	if mc.cfg.tls != nil {
-		clientFlags |= clientSSL
-	}
-
-	// User Password
-	scrambleBuff := scramblePassword(cipher, []byte(mc.cfg.passwd))
-
-	pktLen := 4 + 4 + 1 + 23 + len(mc.cfg.user) + 1 + 1 + len(scrambleBuff) + 21 + 1
-
-	// To specify a db name
-	if n := len(mc.cfg.dbname); n > 0 {
-		clientFlags |= clientConnectWithDB
-		pktLen += n + 1
-	}
-
-	// Calculate packet length and get buffer with that size
-	data := mc.buf.takeSmallBuffer(pktLen + 4)
-	if data == nil {
-		// can not take the buffer. Something must be wrong with the connection
-		errLog.Print(ErrBusyBuffer)
-		return driver.ErrBadConn
-	}
-
-	// ClientFlags [32 bit]
-	data[4] = byte(clientFlags)
-	data[5] = byte(clientFlags >> 8)
-	data[6] = byte(clientFlags >> 16)
-	data[7] = byte(clientFlags >> 24)
-
-	// MaxPacketSize [32 bit] (none)
-	data[8] = 0x00
-	data[9] = 0x00
-	data[10] = 0x00
-	data[11] = 0x00
-
-	// Charset [1 byte]
-	data[12] = mc.cfg.collation
-
-	// SSL Connection Request Packet
-	// http://dev.mysql.com/doc/internals/en/connection-phase-packets.html#packet-Protocol::SSLRequest
-	if mc.cfg.tls != nil {
-		// Send TLS / SSL request packet
-		if err := mc.writePacket(data[:(4+4+1+23)+4]); err != nil {
-			return err
-		}
-
-		// Switch to TLS
-		tlsConn := tls.Client(mc.netConn, mc.cfg.tls)
-		if err := tlsConn.Handshake(); err != nil {
-			return err
-		}
-		mc.netConn = tlsConn
-		mc.buf.rd = tlsConn
-	}
-
-	// Filler [23 bytes] (all 0x00)
-	pos := 13 + 23
-
-	// User [null terminated string]
-	if len(mc.cfg.user) > 0 {
-		pos += copy(data[pos:], mc.cfg.user)
-	}
-	data[pos] = 0x00
-	pos++
-
-	// ScrambleBuffer [length encoded integer]
-	data[pos] = byte(len(scrambleBuff))
-	pos += 1 + copy(data[pos+1:], scrambleBuff)
-
-	// Databasename [null terminated string]
-	if len(mc.cfg.dbname) > 0 {
-		pos += copy(data[pos:], mc.cfg.dbname)
-		data[pos] = 0x00
-		pos++
-	}
-
-	// Assume native client during response
-	pos += copy(data[pos:], "mysql_native_password")
-	data[pos] = 0x00
-
-	// Send Auth packet
-	return mc.writePacket(data)
-}
-
-//  Client old authentication packet
-// http://dev.mysql.com/doc/internals/en/connection-phase-packets.html#packet-Protocol::AuthSwitchResponse
-func (mc *mysqlConn) writeOldAuthPacket(cipher []byte) error {
-	// User password
-	scrambleBuff := scrambleOldPassword(cipher, []byte(mc.cfg.passwd))
-
-	// Calculate the packet length and add a tailing 0
-	pktLen := len(scrambleBuff) + 1
-	data := mc.buf.takeSmallBuffer(4 + pktLen)
-	if data == nil {
-		// can not take the buffer. Something must be wrong with the connection
-		errLog.Print(ErrBusyBuffer)
-		return driver.ErrBadConn
-	}
-
-	// Add the scrambled password [null terminated string]
-	copy(data[4:], scrambleBuff)
-	data[4+pktLen-1] = 0x00
-
-	return mc.writePacket(data)
-}
-
-//  Client clear text authentication packet
-// http://dev.mysql.com/doc/internals/en/connection-phase-packets.html#packet-Protocol::AuthSwitchResponse
-func (mc *mysqlConn) writeClearAuthPacket() error {
-	// Calculate the packet length and add a tailing 0
-	pktLen := len(mc.cfg.passwd) + 1
-	data := mc.buf.takeSmallBuffer(4 + pktLen)
-	if data == nil {
-		// can not take the buffer. Something must be wrong with the connection
-		errLog.Print(ErrBusyBuffer)
-		return driver.ErrBadConn
-	}
-
-	// Add the clear password [null terminated string]
-	copy(data[4:], mc.cfg.passwd)
-	data[4+pktLen-1] = 0x00
-
-	return mc.writePacket(data)
-}
-
-/******************************************************************************
-*                             Command Packets                                 *
-******************************************************************************/
-
-func (mc *mysqlConn) writeCommandPacket(command byte) error {
-	// Reset Packet Sequence
-	mc.sequence = 0
-
-	data := mc.buf.takeSmallBuffer(4 + 1)
-	if data == nil {
-		// can not take the buffer. Something must be wrong with the connection
-		errLog.Print(ErrBusyBuffer)
-		return driver.ErrBadConn
-	}
-
-	// Add command byte
-	data[4] = command
-
-	// Send CMD packet
-	return mc.writePacket(data)
-}
-
-func (mc *mysqlConn) writeCommandPacketStr(command byte, arg string) error {
-	// Reset Packet Sequence
-	mc.sequence = 0
-
-	pktLen := 1 + len(arg)
-	data := mc.buf.takeBuffer(pktLen + 4)
-	if data == nil {
-		// can not take the buffer. Something must be wrong with the connection
-		errLog.Print(ErrBusyBuffer)
-		return driver.ErrBadConn
-	}
-
-	// Add command byte
-	data[4] = command
-
-	// Add arg
-	copy(data[5:], arg)
-
-	// Send CMD packet
-	return mc.writePacket(data)
-}
-
-func (mc *mysqlConn) writeCommandPacketUint32(command byte, arg uint32) error {
-	// Reset Packet Sequence
-	mc.sequence = 0
-
-	data := mc.buf.takeSmallBuffer(4 + 1 + 4)
-	if data == nil {
-		// can not take the buffer. Something must be wrong with the connection
-		errLog.Print(ErrBusyBuffer)
-		return driver.ErrBadConn
-	}
-
-	// Add command byte
-	data[4] = command
-
-	// Add arg [32 bit]
-	data[5] = byte(arg)
-	data[6] = byte(arg >> 8)
-	data[7] = byte(arg >> 16)
-	data[8] = byte(arg >> 24)
-
-	// Send CMD packet
-	return mc.writePacket(data)
-}
-
-/******************************************************************************
-*                              Result Packets                                 *
-******************************************************************************/
-
-// Returns error if Packet is not an 'Result OK'-Packet
-func (mc *mysqlConn) readResultOK() error {
-	data, err := mc.readPacket()
-	if err == nil {
-		// packet indicator
-		switch data[0] {
-
-		case iOK:
-			return mc.handleOkPacket(data)
-
-		case iEOF:
-			if len(data) > 1 {
-				plugin := string(data[1:bytes.IndexByte(data, 0x00)])
-				if plugin == "mysql_old_password" {
-					// using old_passwords
-					return ErrOldPassword
-				} else if plugin == "mysql_clear_password" {
-					// using clear text password
-					return ErrCleartextPassword
-				} else {
-					return ErrUnknownPlugin
-				}
-			} else {
-				return ErrOldPassword
-			}
-
-		default: // Error otherwise
-			return mc.handleErrorPacket(data)
-		}
-	}
-	return err
-}
-
-// Result Set Header Packet
-// http://dev.mysql.com/doc/internals/en/com-query-response.html#packet-ProtocolText::Resultset
-func (mc *mysqlConn) readResultSetHeaderPacket() (int, error) {
-	data, err := mc.readPacket()
-	if err == nil {
-		switch data[0] {
-
-		case iOK:
-			return 0, mc.handleOkPacket(data)
-
-		case iERR:
-			return 0, mc.handleErrorPacket(data)
-
-		case iLocalInFile:
-			return 0, mc.handleInFileRequest(string(data[1:]))
-		}
-
-		// column count
-		num, _, n := readLengthEncodedInteger(data)
-		if n-len(data) == 0 {
-			return int(num), nil
-		}
-
-		return 0, ErrMalformPkt
-	}
-	return 0, err
-}
-
-// Error Packet
-// http://dev.mysql.com/doc/internals/en/generic-response-packets.html#packet-ERR_Packet
-func (mc *mysqlConn) handleErrorPacket(data []byte) error {
-	if data[0] != iERR {
-		return ErrMalformPkt
-	}
-
-	// 0xff [1 byte]
-
-	// Error Number [16 bit uint]
-	errno := binary.LittleEndian.Uint16(data[1:3])
-
-	pos := 3
-
-	// SQL State [optional: # + 5bytes string]
-	if data[3] == 0x23 {
-		//sqlstate := string(data[4 : 4+5])
-		pos = 9
-	}
-
-	// Error Message [string]
-	return &MySQLError{
-		Number:  errno,
-		Message: string(data[pos:]),
-	}
-}
-
-// Ok Packet
-// http://dev.mysql.com/doc/internals/en/generic-response-packets.html#packet-OK_Packet
-func (mc *mysqlConn) handleOkPacket(data []byte) error {
-	var n, m int
-
-	// 0x00 [1 byte]
-
-	// Affected rows [Length Coded Binary]
-	mc.affectedRows, _, n = readLengthEncodedInteger(data[1:])
-
-	// Insert id [Length Coded Binary]
-	mc.insertId, _, m = readLengthEncodedInteger(data[1+n:])
-
-	// server_status [2 bytes]
-	mc.status = statusFlag(data[1+n+m]) | statusFlag(data[1+n+m+1])<<8
-
-	// warning count [2 bytes]
-	if !mc.strict {
-		return nil
-	} else {
-		pos := 1 + n + m + 2
-		if binary.LittleEndian.Uint16(data[pos:pos+2]) > 0 {
-			return mc.getWarnings()
-		}
-		return nil
-	}
-}
-
-// Read Packets as Field Packets until EOF-Packet or an Error appears
-// http://dev.mysql.com/doc/internals/en/com-query-response.html#packet-Protocol::ColumnDefinition41
-func (mc *mysqlConn) readColumns(count int) ([]mysqlField, error) {
-	columns := make([]mysqlField, count)
-
-	for i := 0; ; i++ {
-		data, err := mc.readPacket()
-		if err != nil {
-			return nil, err
-		}
-
-		// EOF Packet
-		if data[0] == iEOF && (len(data) == 5 || len(data) == 1) {
-			if i == count {
-				return columns, nil
-			}
-			return nil, fmt.Errorf("ColumnsCount mismatch n:%d len:%d", count, len(columns))
-		}
-
-		// Catalog
-		pos, err := skipLengthEncodedString(data)
-		if err != nil {
-			return nil, err
-		}
-
-		// Database [len coded string]
-		n, err := skipLengthEncodedString(data[pos:])
-		if err != nil {
-			return nil, err
-		}
-		pos += n
-
-		// Table [len coded string]
-		if mc.cfg.columnsWithAlias {
-			tableName, _, n, err := readLengthEncodedString(data[pos:])
-			if err != nil {
-				return nil, err
-			}
-			pos += n
-			columns[i].tableName = string(tableName)
-		} else {
-			n, err = skipLengthEncodedString(data[pos:])
-			if err != nil {
-				return nil, err
-			}
-			pos += n
-		}
-
-		// Original table [len coded string]
-		n, err = skipLengthEncodedString(data[pos:])
-		if err != nil {
-			return nil, err
-		}
-		pos += n
-
-		// Name [len coded string]
-		name, _, n, err := readLengthEncodedString(data[pos:])
-		if err != nil {
-			return nil, err
-		}
-		columns[i].name = string(name)
-		pos += n
-
-		// Original name [len coded string]
-		n, err = skipLengthEncodedString(data[pos:])
-		if err != nil {
-			return nil, err
-		}
-
-		// Filler [uint8]
-		// Charset [charset, collation uint8]
-		// Length [uint32]
-		pos += n + 1 + 2 + 4
-
-		// Field type [uint8]
-		columns[i].fieldType = data[pos]
-		pos++
-
-		// Flags [uint16]
-		columns[i].flags = fieldFlag(binary.LittleEndian.Uint16(data[pos : pos+2]))
-		pos += 2
-
-		// Decimals [uint8]
-		columns[i].decimals = data[pos]
-		//pos++
-
-		// Default value [len coded binary]
-		//if pos < len(data) {
-		//	defaultVal, _, err = bytesToLengthCodedBinary(data[pos:])
-		//}
-	}
-}
-
-// Read Packets as Field Packets until EOF-Packet or an Error appears
-// http://dev.mysql.com/doc/internals/en/com-query-response.html#packet-ProtocolText::ResultsetRow
-func (rows *textRows) readRow(dest []driver.Value) error {
-	mc := rows.mc
-
-	data, err := mc.readPacket()
-	if err != nil {
-		return err
-	}
-
-	// EOF Packet
-	if data[0] == iEOF && len(data) == 5 {
-		rows.mc = nil
-		return io.EOF
-	}
-	if data[0] == iERR {
-		rows.mc = nil
-		return mc.handleErrorPacket(data)
-	}
-
-	// RowSet Packet
-	var n int
-	var isNull bool
-	pos := 0
-
-	for i := range dest {
-		// Read bytes and convert to string
-		dest[i], isNull, n, err = readLengthEncodedString(data[pos:])
-		pos += n
-		if err == nil {
-			if !isNull {
-				if !mc.parseTime {
-					continue
-				} else {
-					switch rows.columns[i].fieldType {
-					case fieldTypeTimestamp, fieldTypeDateTime,
-						fieldTypeDate, fieldTypeNewDate:
-						dest[i], err = parseDateTime(
-							string(dest[i].([]byte)),
-							mc.cfg.loc,
-						)
-						if err == nil {
-							continue
-						}
-					default:
-						continue
-					}
-				}
-
-			} else {
-				dest[i] = nil
-				continue
-			}
-		}
-		return err // err != nil
-	}
-
-	return nil
-}
-
-// Reads Packets until EOF-Packet or an Error appears. Returns count of Packets read
-func (mc *mysqlConn) readUntilEOF() error {
-	for {
-		data, err := mc.readPacket()
-
-		// No Err and no EOF Packet
-		if err == nil && data[0] != iEOF {
-			continue
-		}
-		return err // Err or EOF
-	}
-}
-
-/******************************************************************************
-*                           Prepared Statements                               *
-******************************************************************************/
-
-// Prepare Result Packets
-// http://dev.mysql.com/doc/internals/en/com-stmt-prepare-response.html
-func (stmt *mysqlStmt) readPrepareResultPacket() (uint16, error) {
-	data, err := stmt.mc.readPacket()
-	if err == nil {
-		// packet indicator [1 byte]
-		if data[0] != iOK {
-			return 0, stmt.mc.handleErrorPacket(data)
-		}
-
-		// statement id [4 bytes]
-		stmt.id = binary.LittleEndian.Uint32(data[1:5])
-
-		// Column count [16 bit uint]
-		columnCount := binary.LittleEndian.Uint16(data[5:7])
-
-		// Param count [16 bit uint]
-		stmt.paramCount = int(binary.LittleEndian.Uint16(data[7:9]))
-
-		// Reserved [8 bit]
-
-		// Warning count [16 bit uint]
-		if !stmt.mc.strict {
-			return columnCount, nil
-		} else {
-			// Check for warnings count > 0, only available in MySQL > 4.1
-			if len(data) >= 12 && binary.LittleEndian.Uint16(data[10:12]) > 0 {
-				return columnCount, stmt.mc.getWarnings()
-			}
-			return columnCount, nil
-		}
-	}
-	return 0, err
-}
-
-// http://dev.mysql.com/doc/internals/en/com-stmt-send-long-data.html
-func (stmt *mysqlStmt) writeCommandLongData(paramID int, arg []byte) error {
-	maxLen := stmt.mc.maxPacketAllowed - 1
-	pktLen := maxLen
-
-	// After the header (bytes 0-3) follows before the data:
-	// 1 byte command
-	// 4 bytes stmtID
-	// 2 bytes paramID
-	const dataOffset = 1 + 4 + 2
-
-	// Can not use the write buffer since
-	// a) the buffer is too small
-	// b) it is in use
-	data := make([]byte, 4+1+4+2+len(arg))
-
-	copy(data[4+dataOffset:], arg)
-
-	for argLen := len(arg); argLen > 0; argLen -= pktLen - dataOffset {
-		if dataOffset+argLen < maxLen {
-			pktLen = dataOffset + argLen
-		}
-
-		stmt.mc.sequence = 0
-		// Add command byte [1 byte]
-		data[4] = comStmtSendLongData
-
-		// Add stmtID [32 bit]
-		data[5] = byte(stmt.id)
-		data[6] = byte(stmt.id >> 8)
-		data[7] = byte(stmt.id >> 16)
-		data[8] = byte(stmt.id >> 24)
-
-		// Add paramID [16 bit]
-		data[9] = byte(paramID)
-		data[10] = byte(paramID >> 8)
-
-		// Send CMD packet
-		err := stmt.mc.writePacket(data[:4+pktLen])
-		if err == nil {
-			data = data[pktLen-dataOffset:]
-			continue
-		}
-		return err
-
-	}
-
-	// Reset Packet Sequence
-	stmt.mc.sequence = 0
-	return nil
-}
-
-// Execute Prepared Statement
-// http://dev.mysql.com/doc/internals/en/com-stmt-execute.html
-func (stmt *mysqlStmt) writeExecutePacket(args []driver.Value) error {
-	if len(args) != stmt.paramCount {
-		return fmt.Errorf(
-			"Arguments count mismatch (Got: %d Has: %d)",
-			len(args),
-			stmt.paramCount,
-		)
-	}
-
-	const minPktLen = 4 + 1 + 4 + 1 + 4
-	mc := stmt.mc
-
-	// Reset packet-sequence
-	mc.sequence = 0
-
-	var data []byte
-
-	if len(args) == 0 {
-		data = mc.buf.takeBuffer(minPktLen)
-	} else {
-		data = mc.buf.takeCompleteBuffer()
-	}
-	if data == nil {
-		// can not take the buffer. Something must be wrong with the connection
-		errLog.Print(ErrBusyBuffer)
-		return driver.ErrBadConn
-	}
-
-	// command [1 byte]
-	data[4] = comStmtExecute
-
-	// statement_id [4 bytes]
-	data[5] = byte(stmt.id)
-	data[6] = byte(stmt.id >> 8)
-	data[7] = byte(stmt.id >> 16)
-	data[8] = byte(stmt.id >> 24)
-
-	// flags (0: CURSOR_TYPE_NO_CURSOR) [1 byte]
-	data[9] = 0x00
-
-	// iteration_count (uint32(1)) [4 bytes]
-	data[10] = 0x01
-	data[11] = 0x00
-	data[12] = 0x00
-	data[13] = 0x00
-
-	if len(args) > 0 {
-		pos := minPktLen
-
-		var nullMask []byte
-		if maskLen, typesLen := (len(args)+7)/8, 1+2*len(args); pos+maskLen+typesLen >= len(data) {
-			// buffer has to be extended but we don't know by how much so
-			// we depend on append after all data with known sizes fit.
-			// We stop at that because we deal with a lot of columns here
-			// which makes the required allocation size hard to guess.
-			tmp := make([]byte, pos+maskLen+typesLen)
-			copy(tmp[:pos], data[:pos])
-			data = tmp
-			nullMask = data[pos : pos+maskLen]
-			pos += maskLen
-		} else {
-			nullMask = data[pos : pos+maskLen]
-			for i := 0; i < maskLen; i++ {
-				nullMask[i] = 0
-			}
-			pos += maskLen
-		}
-
-		// newParameterBoundFlag 1 [1 byte]
-		data[pos] = 0x01
-		pos++
-
-		// type of each parameter [len(args)*2 bytes]
-		paramTypes := data[pos:]
-		pos += len(args) * 2
-
-		// value of each parameter [n bytes]
-		paramValues := data[pos:pos]
-		valuesCap := cap(paramValues)
-
-		for i, arg := range args {
-			// build NULL-bitmap
-			if arg == nil {
-				nullMask[i/8] |= 1 << (uint(i) & 7)
-				paramTypes[i+i] = fieldTypeNULL
-				paramTypes[i+i+1] = 0x00
-				continue
-			}
-
-			// cache types and values
-			switch v := arg.(type) {
-			case int64:
-				paramTypes[i+i] = fieldTypeLongLong
-				paramTypes[i+i+1] = 0x00
-
-				if cap(paramValues)-len(paramValues)-8 >= 0 {
-					paramValues = paramValues[:len(paramValues)+8]
-					binary.LittleEndian.PutUint64(
-						paramValues[len(paramValues)-8:],
-						uint64(v),
-					)
-				} else {
-					paramValues = append(paramValues,
-						uint64ToBytes(uint64(v))...,
-					)
-				}
-
-			case float64:
-				paramTypes[i+i] = fieldTypeDouble
-				paramTypes[i+i+1] = 0x00
-
-				if cap(paramValues)-len(paramValues)-8 >= 0 {
-					paramValues = paramValues[:len(paramValues)+8]
-					binary.LittleEndian.PutUint64(
-						paramValues[len(paramValues)-8:],
-						math.Float64bits(v),
-					)
-				} else {
-					paramValues = append(paramValues,
-						uint64ToBytes(math.Float64bits(v))...,
-					)
-				}
-
-			case bool:
-				paramTypes[i+i] = fieldTypeTiny
-				paramTypes[i+i+1] = 0x00
-
-				if v {
-					paramValues = append(paramValues, 0x01)
-				} else {
-					paramValues = append(paramValues, 0x00)
-				}
-
-			case []byte:
-				// Common case (non-nil value) first
-				if v != nil {
-					paramTypes[i+i] = fieldTypeString
-					paramTypes[i+i+1] = 0x00
-
-					if len(v) < mc.maxPacketAllowed-pos-len(paramValues)-(len(args)-(i+1))*64 {
-						paramValues = appendLengthEncodedInteger(paramValues,
-							uint64(len(v)),
-						)
-						paramValues = append(paramValues, v...)
-					} else {
-						if err := stmt.writeCommandLongData(i, v); err != nil {
-							return err
-						}
-					}
-					continue
-				}
-
-				// Handle []byte(nil) as a NULL value
-				nullMask[i/8] |= 1 << (uint(i) & 7)
-				paramTypes[i+i] = fieldTypeNULL
-				paramTypes[i+i+1] = 0x00
-
-			case string:
-				paramTypes[i+i] = fieldTypeString
-				paramTypes[i+i+1] = 0x00
-
-				if len(v) < mc.maxPacketAllowed-pos-len(paramValues)-(len(args)-(i+1))*64 {
-					paramValues = appendLengthEncodedInteger(paramValues,
-						uint64(len(v)),
-					)
-					paramValues = append(paramValues, v...)
-				} else {
-					if err := stmt.writeCommandLongData(i, []byte(v)); err != nil {
-						return err
-					}
-				}
-
-			case time.Time:
-				paramTypes[i+i] = fieldTypeString
-				paramTypes[i+i+1] = 0x00
-
-				var val []byte
-				if v.IsZero() {
-					val = []byte("0000-00-00")
-				} else {
-					val = []byte(v.In(mc.cfg.loc).Format(timeFormat))
-				}
-
-				paramValues = appendLengthEncodedInteger(paramValues,
-					uint64(len(val)),
-				)
-				paramValues = append(paramValues, val...)
-
-			default:
-				return fmt.Errorf("Can't convert type: %T", arg)
-			}
-		}
-
-		// Check if param values exceeded the available buffer
-		// In that case we must build the data packet with the new values buffer
-		if valuesCap != cap(paramValues) {
-			data = append(data[:pos], paramValues...)
-			mc.buf.buf = data
-		}
-
-		pos += len(paramValues)
-		data = data[:pos]
-	}
-
-	return mc.writePacket(data)
-}
-
-// http://dev.mysql.com/doc/internals/en/binary-protocol-resultset-row.html
-func (rows *binaryRows) readRow(dest []driver.Value) error {
-	data, err := rows.mc.readPacket()
-	if err != nil {
-		return err
-	}
-
-	// packet indicator [1 byte]
-	if data[0] != iOK {
-		rows.mc = nil
-		// EOF Packet
-		if data[0] == iEOF && len(data) == 5 {
-			return io.EOF
-		}
-
-		// Error otherwise
-		return rows.mc.handleErrorPacket(data)
-	}
-
-	// NULL-bitmap,  [(column-count + 7 + 2) / 8 bytes]
-	pos := 1 + (len(dest)+7+2)>>3
-	nullMask := data[1:pos]
-
-	for i := range dest {
-		// Field is NULL
-		// (byte >> bit-pos) % 2 == 1
-		if ((nullMask[(i+2)>>3] >> uint((i+2)&7)) & 1) == 1 {
-			dest[i] = nil
-			continue
-		}
-
-		// Convert to byte-coded string
-		switch rows.columns[i].fieldType {
-		case fieldTypeNULL:
-			dest[i] = nil
-			continue
-
-		// Numeric Types
-		case fieldTypeTiny:
-			if rows.columns[i].flags&flagUnsigned != 0 {
-				dest[i] = int64(data[pos])
-			} else {
-				dest[i] = int64(int8(data[pos]))
-			}
-			pos++
-			continue
-
-		case fieldTypeShort, fieldTypeYear:
-			if rows.columns[i].flags&flagUnsigned != 0 {
-				dest[i] = int64(binary.LittleEndian.Uint16(data[pos : pos+2]))
-			} else {
-				dest[i] = int64(int16(binary.LittleEndian.Uint16(data[pos : pos+2])))
-			}
-			pos += 2
-			continue
-
-		case fieldTypeInt24, fieldTypeLong:
-			if rows.columns[i].flags&flagUnsigned != 0 {
-				dest[i] = int64(binary.LittleEndian.Uint32(data[pos : pos+4]))
-			} else {
-				dest[i] = int64(int32(binary.LittleEndian.Uint32(data[pos : pos+4])))
-			}
-			pos += 4
-			continue
-
-		case fieldTypeLongLong:
-			if rows.columns[i].flags&flagUnsigned != 0 {
-				val := binary.LittleEndian.Uint64(data[pos : pos+8])
-				if val > math.MaxInt64 {
-					dest[i] = uint64ToString(val)
-				} else {
-					dest[i] = int64(val)
-				}
-			} else {
-				dest[i] = int64(binary.LittleEndian.Uint64(data[pos : pos+8]))
-			}
-			pos += 8
-			continue
-
-		case fieldTypeFloat:
-			dest[i] = float64(math.Float32frombits(binary.LittleEndian.Uint32(data[pos : pos+4])))
-			pos += 4
-			continue
-
-		case fieldTypeDouble:
-			dest[i] = math.Float64frombits(binary.LittleEndian.Uint64(data[pos : pos+8]))
-			pos += 8
-			continue
-
-		// Length coded Binary Strings
-		case fieldTypeDecimal, fieldTypeNewDecimal, fieldTypeVarChar,
-			fieldTypeBit, fieldTypeEnum, fieldTypeSet, fieldTypeTinyBLOB,
-			fieldTypeMediumBLOB, fieldTypeLongBLOB, fieldTypeBLOB,
-			fieldTypeVarString, fieldTypeString, fieldTypeGeometry:
-			var isNull bool
-			var n int
-			dest[i], isNull, n, err = readLengthEncodedString(data[pos:])
-			pos += n
-			if err == nil {
-				if !isNull {
-					continue
-				} else {
-					dest[i] = nil
-					continue
-				}
-			}
-			return err
-
-		case
-			fieldTypeDate, fieldTypeNewDate, // Date YYYY-MM-DD
-			fieldTypeTime,                         // Time [-][H]HH:MM:SS[.fractal]
-			fieldTypeTimestamp, fieldTypeDateTime: // Timestamp YYYY-MM-DD HH:MM:SS[.fractal]
-
-			num, isNull, n := readLengthEncodedInteger(data[pos:])
-			pos += n
-
-			switch {
-			case isNull:
-				dest[i] = nil
-				continue
-			case rows.columns[i].fieldType == fieldTypeTime:
-				// database/sql does not support an equivalent to TIME, return a string
-				var dstlen uint8
-				switch decimals := rows.columns[i].decimals; decimals {
-				case 0x00, 0x1f:
-					dstlen = 8
-				case 1, 2, 3, 4, 5, 6:
-					dstlen = 8 + 1 + decimals
-				default:
-					return fmt.Errorf(
-						"MySQL protocol error, illegal decimals value %d",
-						rows.columns[i].decimals,
-					)
-				}
-				dest[i], err = formatBinaryDateTime(data[pos:pos+int(num)], dstlen, true)
-			case rows.mc.parseTime:
-				dest[i], err = parseBinaryDateTime(num, data[pos:], rows.mc.cfg.loc)
-			default:
-				var dstlen uint8
-				if rows.columns[i].fieldType == fieldTypeDate {
-					dstlen = 10
-				} else {
-					switch decimals := rows.columns[i].decimals; decimals {
-					case 0x00, 0x1f:
-						dstlen = 19
-					case 1, 2, 3, 4, 5, 6:
-						dstlen = 19 + 1 + decimals
-					default:
-						return fmt.Errorf(
-							"MySQL protocol error, illegal decimals value %d",
-							rows.columns[i].decimals,
-						)
-					}
-				}
-				dest[i], err = formatBinaryDateTime(data[pos:pos+int(num)], dstlen, false)
-			}
-
-			if err == nil {
-				pos += int(num)
-				continue
-			} else {
-				return err
-			}
-
-		// Please report if this happens!
-		default:
-			return fmt.Errorf("Unknown FieldType %d", rows.columns[i].fieldType)
-		}
-	}
-
-	return nil
-}
diff --git a/Godeps/_workspace/src/github.com/go-sql-driver/mysql/result.go b/Godeps/_workspace/src/github.com/go-sql-driver/mysql/result.go
deleted file mode 100644
index c6438d034..000000000
--- a/Godeps/_workspace/src/github.com/go-sql-driver/mysql/result.go
+++ /dev/null
@@ -1,22 +0,0 @@
-// Go MySQL Driver - A MySQL-Driver for Go's database/sql package
-//
-// Copyright 2012 The Go-MySQL-Driver Authors. All rights reserved.
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this file,
-// You can obtain one at http://mozilla.org/MPL/2.0/.
-
-package mysql
-
-type mysqlResult struct {
-	affectedRows int64
-	insertId     int64
-}
-
-func (res *mysqlResult) LastInsertId() (int64, error) {
-	return res.insertId, nil
-}
-
-func (res *mysqlResult) RowsAffected() (int64, error) {
-	return res.affectedRows, nil
-}
diff --git a/Godeps/_workspace/src/github.com/go-sql-driver/mysql/rows.go b/Godeps/_workspace/src/github.com/go-sql-driver/mysql/rows.go
deleted file mode 100644
index ba606e146..000000000
--- a/Godeps/_workspace/src/github.com/go-sql-driver/mysql/rows.go
+++ /dev/null
@@ -1,106 +0,0 @@
-// Go MySQL Driver - A MySQL-Driver for Go's database/sql package
-//
-// Copyright 2012 The Go-MySQL-Driver Authors. All rights reserved.
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this file,
-// You can obtain one at http://mozilla.org/MPL/2.0/.
-
-package mysql
-
-import (
-	"database/sql/driver"
-	"io"
-)
-
-type mysqlField struct {
-	tableName string
-	name      string
-	flags     fieldFlag
-	fieldType byte
-	decimals  byte
-}
-
-type mysqlRows struct {
-	mc      *mysqlConn
-	columns []mysqlField
-}
-
-type binaryRows struct {
-	mysqlRows
-}
-
-type textRows struct {
-	mysqlRows
-}
-
-type emptyRows struct{}
-
-func (rows *mysqlRows) Columns() []string {
-	columns := make([]string, len(rows.columns))
-	if rows.mc.cfg.columnsWithAlias {
-		for i := range columns {
-			if tableName := rows.columns[i].tableName; len(tableName) > 0 {
-				columns[i] = tableName + "." + rows.columns[i].name
-			} else {
-				columns[i] = rows.columns[i].name
-			}
-		}
-	} else {
-		for i := range columns {
-			columns[i] = rows.columns[i].name
-		}
-	}
-	return columns
-}
-
-func (rows *mysqlRows) Close() error {
-	mc := rows.mc
-	if mc == nil {
-		return nil
-	}
-	if mc.netConn == nil {
-		return ErrInvalidConn
-	}
-
-	// Remove unread packets from stream
-	err := mc.readUntilEOF()
-	rows.mc = nil
-	return err
-}
-
-func (rows *binaryRows) Next(dest []driver.Value) error {
-	if mc := rows.mc; mc != nil {
-		if mc.netConn == nil {
-			return ErrInvalidConn
-		}
-
-		// Fetch next row from stream
-		return rows.readRow(dest)
-	}
-	return io.EOF
-}
-
-func (rows *textRows) Next(dest []driver.Value) error {
-	if mc := rows.mc; mc != nil {
-		if mc.netConn == nil {
-			return ErrInvalidConn
-		}
-
-		// Fetch next row from stream
-		return rows.readRow(dest)
-	}
-	return io.EOF
-}
-
-func (rows emptyRows) Columns() []string {
-	return nil
-}
-
-func (rows emptyRows) Close() error {
-	return nil
-}
-
-func (rows emptyRows) Next(dest []driver.Value) error {
-	return io.EOF
-}
diff --git a/Godeps/_workspace/src/github.com/go-sql-driver/mysql/statement.go b/Godeps/_workspace/src/github.com/go-sql-driver/mysql/statement.go
deleted file mode 100644
index 6e869b340..000000000
--- a/Godeps/_workspace/src/github.com/go-sql-driver/mysql/statement.go
+++ /dev/null
@@ -1,150 +0,0 @@
-// Go MySQL Driver - A MySQL-Driver for Go's database/sql package
-//
-// Copyright 2012 The Go-MySQL-Driver Authors. All rights reserved.
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this file,
-// You can obtain one at http://mozilla.org/MPL/2.0/.
-
-package mysql
-
-import (
-	"database/sql/driver"
-	"fmt"
-	"reflect"
-	"strconv"
-)
-
-type mysqlStmt struct {
-	mc         *mysqlConn
-	id         uint32
-	paramCount int
-	columns    []mysqlField // cached from the first query
-}
-
-func (stmt *mysqlStmt) Close() error {
-	if stmt.mc == nil || stmt.mc.netConn == nil {
-		errLog.Print(ErrInvalidConn)
-		return driver.ErrBadConn
-	}
-
-	err := stmt.mc.writeCommandPacketUint32(comStmtClose, stmt.id)
-	stmt.mc = nil
-	return err
-}
-
-func (stmt *mysqlStmt) NumInput() int {
-	return stmt.paramCount
-}
-
-func (stmt *mysqlStmt) ColumnConverter(idx int) driver.ValueConverter {
-	return converter{}
-}
-
-func (stmt *mysqlStmt) Exec(args []driver.Value) (driver.Result, error) {
-	if stmt.mc.netConn == nil {
-		errLog.Print(ErrInvalidConn)
-		return nil, driver.ErrBadConn
-	}
-	// Send command
-	err := stmt.writeExecutePacket(args)
-	if err != nil {
-		return nil, err
-	}
-
-	mc := stmt.mc
-
-	mc.affectedRows = 0
-	mc.insertId = 0
-
-	// Read Result
-	resLen, err := mc.readResultSetHeaderPacket()
-	if err == nil {
-		if resLen > 0 {
-			// Columns
-			err = mc.readUntilEOF()
-			if err != nil {
-				return nil, err
-			}
-
-			// Rows
-			err = mc.readUntilEOF()
-		}
-		if err == nil {
-			return &mysqlResult{
-				affectedRows: int64(mc.affectedRows),
-				insertId:     int64(mc.insertId),
-			}, nil
-		}
-	}
-
-	return nil, err
-}
-
-func (stmt *mysqlStmt) Query(args []driver.Value) (driver.Rows, error) {
-	if stmt.mc.netConn == nil {
-		errLog.Print(ErrInvalidConn)
-		return nil, driver.ErrBadConn
-	}
-	// Send command
-	err := stmt.writeExecutePacket(args)
-	if err != nil {
-		return nil, err
-	}
-
-	mc := stmt.mc
-
-	// Read Result
-	resLen, err := mc.readResultSetHeaderPacket()
-	if err != nil {
-		return nil, err
-	}
-
-	rows := new(binaryRows)
-	rows.mc = mc
-
-	if resLen > 0 {
-		// Columns
-		// If not cached, read them and cache them
-		if stmt.columns == nil {
-			rows.columns, err = mc.readColumns(resLen)
-			stmt.columns = rows.columns
-		} else {
-			rows.columns = stmt.columns
-			err = mc.readUntilEOF()
-		}
-	}
-
-	return rows, err
-}
-
-type converter struct{}
-
-func (c converter) ConvertValue(v interface{}) (driver.Value, error) {
-	if driver.IsValue(v) {
-		return v, nil
-	}
-
-	rv := reflect.ValueOf(v)
-	switch rv.Kind() {
-	case reflect.Ptr:
-		// indirect pointers
-		if rv.IsNil() {
-			return nil, nil
-		}
-		return c.ConvertValue(rv.Elem().Interface())
-	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
-		return rv.Int(), nil
-	case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32:
-		return int64(rv.Uint()), nil
-	case reflect.Uint64:
-		u64 := rv.Uint()
-		if u64 >= 1<<63 {
-			return strconv.FormatUint(u64, 10), nil
-		}
-		return int64(u64), nil
-	case reflect.Float32, reflect.Float64:
-		return rv.Float(), nil
-	}
-	return nil, fmt.Errorf("unsupported type %T, a %s", v, rv.Kind())
-}
diff --git a/Godeps/_workspace/src/github.com/go-sql-driver/mysql/transaction.go b/Godeps/_workspace/src/github.com/go-sql-driver/mysql/transaction.go
deleted file mode 100644
index 33c749b35..000000000
--- a/Godeps/_workspace/src/github.com/go-sql-driver/mysql/transaction.go
+++ /dev/null
@@ -1,31 +0,0 @@
-// Go MySQL Driver - A MySQL-Driver for Go's database/sql package
-//
-// Copyright 2012 The Go-MySQL-Driver Authors. All rights reserved.
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this file,
-// You can obtain one at http://mozilla.org/MPL/2.0/.
-
-package mysql
-
-type mysqlTx struct {
-	mc *mysqlConn
-}
-
-func (tx *mysqlTx) Commit() (err error) {
-	if tx.mc == nil || tx.mc.netConn == nil {
-		return ErrInvalidConn
-	}
-	err = tx.mc.exec("COMMIT")
-	tx.mc = nil
-	return
-}
-
-func (tx *mysqlTx) Rollback() (err error) {
-	if tx.mc == nil || tx.mc.netConn == nil {
-		return ErrInvalidConn
-	}
-	err = tx.mc.exec("ROLLBACK")
-	tx.mc = nil
-	return
-}
diff --git a/Godeps/_workspace/src/github.com/go-sql-driver/mysql/utils.go b/Godeps/_workspace/src/github.com/go-sql-driver/mysql/utils.go
deleted file mode 100644
index 6a26ad129..000000000
--- a/Godeps/_workspace/src/github.com/go-sql-driver/mysql/utils.go
+++ /dev/null
@@ -1,973 +0,0 @@
-// Go MySQL Driver - A MySQL-Driver for Go's database/sql package
-//
-// Copyright 2012 The Go-MySQL-Driver Authors. All rights reserved.
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this file,
-// You can obtain one at http://mozilla.org/MPL/2.0/.
-
-package mysql
-
-import (
-	"crypto/sha1"
-	"crypto/tls"
-	"database/sql/driver"
-	"encoding/binary"
-	"errors"
-	"fmt"
-	"io"
-	"net"
-	"net/url"
-	"strings"
-	"time"
-)
-
-var (
-	tlsConfigRegister map[string]*tls.Config // Register for custom tls.Configs
-
-	errInvalidDSNUnescaped       = errors.New("Invalid DSN: Did you forget to escape a param value?")
-	errInvalidDSNAddr            = errors.New("Invalid DSN: Network Address not terminated (missing closing brace)")
-	errInvalidDSNNoSlash         = errors.New("Invalid DSN: Missing the slash separating the database name")
-	errInvalidDSNUnsafeCollation = errors.New("Invalid DSN: interpolateParams can be used with ascii, latin1, utf8 and utf8mb4 charset")
-)
-
-func init() {
-	tlsConfigRegister = make(map[string]*tls.Config)
-}
-
-// RegisterTLSConfig registers a custom tls.Config to be used with sql.Open.
-// Use the key as a value in the DSN where tls=value.
-//
-//  rootCertPool := x509.NewCertPool()
-//  pem, err := ioutil.ReadFile("/path/ca-cert.pem")
-//  if err != nil {
-//      log.Fatal(err)
-//  }
-//  if ok := rootCertPool.AppendCertsFromPEM(pem); !ok {
-//      log.Fatal("Failed to append PEM.")
-//  }
-//  clientCert := make([]tls.Certificate, 0, 1)
-//  certs, err := tls.LoadX509KeyPair("/path/client-cert.pem", "/path/client-key.pem")
-//  if err != nil {
-//      log.Fatal(err)
-//  }
-//  clientCert = append(clientCert, certs)
-//  mysql.RegisterTLSConfig("custom", &tls.Config{
-//      RootCAs: rootCertPool,
-//      Certificates: clientCert,
-//  })
-//  db, err := sql.Open("mysql", "user@tcp(localhost:3306)/test?tls=custom")
-//
-func RegisterTLSConfig(key string, config *tls.Config) error {
-	if _, isBool := readBool(key); isBool || strings.ToLower(key) == "skip-verify" {
-		return fmt.Errorf("Key '%s' is reserved", key)
-	}
-
-	tlsConfigRegister[key] = config
-	return nil
-}
-
-// DeregisterTLSConfig removes the tls.Config associated with key.
-func DeregisterTLSConfig(key string) {
-	delete(tlsConfigRegister, key)
-}
-
-// parseDSN parses the DSN string to a config
-func parseDSN(dsn string) (cfg *config, err error) {
-	// New config with some default values
-	cfg = &config{
-		loc:       time.UTC,
-		collation: defaultCollation,
-	}
-
-	// [user[:password]@][net[(addr)]]/dbname[?param1=value1&paramN=valueN]
-	// Find the last '/' (since the password or the net addr might contain a '/')
-	foundSlash := false
-	for i := len(dsn) - 1; i >= 0; i-- {
-		if dsn[i] == '/' {
-			foundSlash = true
-			var j, k int
-
-			// left part is empty if i <= 0
-			if i > 0 {
-				// [username[:password]@][protocol[(address)]]
-				// Find the last '@' in dsn[:i]
-				for j = i; j >= 0; j-- {
-					if dsn[j] == '@' {
-						// username[:password]
-						// Find the first ':' in dsn[:j]
-						for k = 0; k < j; k++ {
-							if dsn[k] == ':' {
-								cfg.passwd = dsn[k+1 : j]
-								break
-							}
-						}
-						cfg.user = dsn[:k]
-
-						break
-					}
-				}
-
-				// [protocol[(address)]]
-				// Find the first '(' in dsn[j+1:i]
-				for k = j + 1; k < i; k++ {
-					if dsn[k] == '(' {
-						// dsn[i-1] must be == ')' if an address is specified
-						if dsn[i-1] != ')' {
-							if strings.ContainsRune(dsn[k+1:i], ')') {
-								return nil, errInvalidDSNUnescaped
-							}
-							return nil, errInvalidDSNAddr
-						}
-						cfg.addr = dsn[k+1 : i-1]
-						break
-					}
-				}
-				cfg.net = dsn[j+1 : k]
-			}
-
-			// dbname[?param1=value1&...&paramN=valueN]
-			// Find the first '?' in dsn[i+1:]
-			for j = i + 1; j < len(dsn); j++ {
-				if dsn[j] == '?' {
-					if err = parseDSNParams(cfg, dsn[j+1:]); err != nil {
-						return
-					}
-					break
-				}
-			}
-			cfg.dbname = dsn[i+1 : j]
-
-			break
-		}
-	}
-
-	if !foundSlash && len(dsn) > 0 {
-		return nil, errInvalidDSNNoSlash
-	}
-
-	if cfg.interpolateParams && unsafeCollations[cfg.collation] {
-		return nil, errInvalidDSNUnsafeCollation
-	}
-
-	// Set default network if empty
-	if cfg.net == "" {
-		cfg.net = "tcp"
-	}
-
-	// Set default address if empty
-	if cfg.addr == "" {
-		switch cfg.net {
-		case "tcp":
-			cfg.addr = "127.0.0.1:3306"
-		case "unix":
-			cfg.addr = "/tmp/mysql.sock"
-		default:
-			return nil, errors.New("Default addr for network '" + cfg.net + "' unknown")
-		}
-
-	}
-
-	return
-}
-
-// parseDSNParams parses the DSN "query string"
-// Values must be url.QueryEscape'ed
-func parseDSNParams(cfg *config, params string) (err error) {
-	for _, v := range strings.Split(params, "&") {
-		param := strings.SplitN(v, "=", 2)
-		if len(param) != 2 {
-			continue
-		}
-
-		// cfg params
-		switch value := param[1]; param[0] {
-
-		// Enable client side placeholder substitution
-		case "interpolateParams":
-			var isBool bool
-			cfg.interpolateParams, isBool = readBool(value)
-			if !isBool {
-				return fmt.Errorf("Invalid Bool value: %s", value)
-			}
-
-		// Disable INFILE whitelist / enable all files
-		case "allowAllFiles":
-			var isBool bool
-			cfg.allowAllFiles, isBool = readBool(value)
-			if !isBool {
-				return fmt.Errorf("Invalid Bool value: %s", value)
-			}
-
-		// Use cleartext authentication mode (MySQL 5.5.10+)
-		case "allowCleartextPasswords":
-			var isBool bool
-			cfg.allowCleartextPasswords, isBool = readBool(value)
-			if !isBool {
-				return fmt.Errorf("Invalid Bool value: %s", value)
-			}
-
-		// Use old authentication mode (pre MySQL 4.1)
-		case "allowOldPasswords":
-			var isBool bool
-			cfg.allowOldPasswords, isBool = readBool(value)
-			if !isBool {
-				return fmt.Errorf("Invalid Bool value: %s", value)
-			}
-
-		// Switch "rowsAffected" mode
-		case "clientFoundRows":
-			var isBool bool
-			cfg.clientFoundRows, isBool = readBool(value)
-			if !isBool {
-				return fmt.Errorf("Invalid Bool value: %s", value)
-			}
-
-		// Collation
-		case "collation":
-			collation, ok := collations[value]
-			if !ok {
-				// Note possibility for false negatives:
-				// could be triggered  although the collation is valid if the
-				// collations map does not contain entries the server supports.
-				err = errors.New("unknown collation")
-				return
-			}
-			cfg.collation = collation
-			break
-
-		case "columnsWithAlias":
-			var isBool bool
-			cfg.columnsWithAlias, isBool = readBool(value)
-			if !isBool {
-				return fmt.Errorf("Invalid Bool value: %s", value)
-			}
-
-		// Time Location
-		case "loc":
-			if value, err = url.QueryUnescape(value); err != nil {
-				return
-			}
-			cfg.loc, err = time.LoadLocation(value)
-			if err != nil {
-				return
-			}
-
-		// Dial Timeout
-		case "timeout":
-			cfg.timeout, err = time.ParseDuration(value)
-			if err != nil {
-				return
-			}
-
-		// TLS-Encryption
-		case "tls":
-			boolValue, isBool := readBool(value)
-			if isBool {
-				if boolValue {
-					cfg.tls = &tls.Config{}
-				}
-			} else {
-				if strings.ToLower(value) == "skip-verify" {
-					cfg.tls = &tls.Config{InsecureSkipVerify: true}
-				} else if tlsConfig, ok := tlsConfigRegister[value]; ok {
-					if len(tlsConfig.ServerName) == 0 && !tlsConfig.InsecureSkipVerify {
-						host, _, err := net.SplitHostPort(cfg.addr)
-						if err == nil {
-							tlsConfig.ServerName = host
-						}
-					}
-
-					cfg.tls = tlsConfig
-				} else {
-					return fmt.Errorf("Invalid value / unknown config name: %s", value)
-				}
-			}
-
-		default:
-			// lazy init
-			if cfg.params == nil {
-				cfg.params = make(map[string]string)
-			}
-
-			if cfg.params[param[0]], err = url.QueryUnescape(value); err != nil {
-				return
-			}
-		}
-	}
-
-	return
-}
-
-// Returns the bool value of the input.
-// The 2nd return value indicates if the input was a valid bool value
-func readBool(input string) (value bool, valid bool) {
-	switch input {
-	case "1", "true", "TRUE", "True":
-		return true, true
-	case "0", "false", "FALSE", "False":
-		return false, true
-	}
-
-	// Not a valid bool value
-	return
-}
-
-/******************************************************************************
-*                             Authentication                                  *
-******************************************************************************/
-
-// Encrypt password using 4.1+ method
-func scramblePassword(scramble, password []byte) []byte {
-	if len(password) == 0 {
-		return nil
-	}
-
-	// stage1Hash = SHA1(password)
-	crypt := sha1.New()
-	crypt.Write(password)
-	stage1 := crypt.Sum(nil)
-
-	// scrambleHash = SHA1(scramble + SHA1(stage1Hash))
-	// inner Hash
-	crypt.Reset()
-	crypt.Write(stage1)
-	hash := crypt.Sum(nil)
-
-	// outer Hash
-	crypt.Reset()
-	crypt.Write(scramble)
-	crypt.Write(hash)
-	scramble = crypt.Sum(nil)
-
-	// token = scrambleHash XOR stage1Hash
-	for i := range scramble {
-		scramble[i] ^= stage1[i]
-	}
-	return scramble
-}
-
-// Encrypt password using pre 4.1 (old password) method
-// https://github.com/atcurtis/mariadb/blob/master/mysys/my_rnd.c
-type myRnd struct {
-	seed1, seed2 uint32
-}
-
-const myRndMaxVal = 0x3FFFFFFF
-
-// Pseudo random number generator
-func newMyRnd(seed1, seed2 uint32) *myRnd {
-	return &myRnd{
-		seed1: seed1 % myRndMaxVal,
-		seed2: seed2 % myRndMaxVal,
-	}
-}
-
-// Tested to be equivalent to MariaDB's floating point variant
-// http://play.golang.org/p/QHvhd4qved
-// http://play.golang.org/p/RG0q4ElWDx
-func (r *myRnd) NextByte() byte {
-	r.seed1 = (r.seed1*3 + r.seed2) % myRndMaxVal
-	r.seed2 = (r.seed1 + r.seed2 + 33) % myRndMaxVal
-
-	return byte(uint64(r.seed1) * 31 / myRndMaxVal)
-}
-
-// Generate binary hash from byte string using insecure pre 4.1 method
-func pwHash(password []byte) (result [2]uint32) {
-	var add uint32 = 7
-	var tmp uint32
-
-	result[0] = 1345345333
-	result[1] = 0x12345671
-
-	for _, c := range password {
-		// skip spaces and tabs in password
-		if c == ' ' || c == '\t' {
-			continue
-		}
-
-		tmp = uint32(c)
-		result[0] ^= (((result[0] & 63) + add) * tmp) + (result[0] << 8)
-		result[1] += (result[1] << 8) ^ result[0]
-		add += tmp
-	}
-
-	// Remove sign bit (1<<31)-1)
-	result[0] &= 0x7FFFFFFF
-	result[1] &= 0x7FFFFFFF
-
-	return
-}
-
-// Encrypt password using insecure pre 4.1 method
-func scrambleOldPassword(scramble, password []byte) []byte {
-	if len(password) == 0 {
-		return nil
-	}
-
-	scramble = scramble[:8]
-
-	hashPw := pwHash(password)
-	hashSc := pwHash(scramble)
-
-	r := newMyRnd(hashPw[0]^hashSc[0], hashPw[1]^hashSc[1])
-
-	var out [8]byte
-	for i := range out {
-		out[i] = r.NextByte() + 64
-	}
-
-	mask := r.NextByte()
-	for i := range out {
-		out[i] ^= mask
-	}
-
-	return out[:]
-}
-
-/******************************************************************************
-*                           Time related utils                                *
-******************************************************************************/
-
-// NullTime represents a time.Time that may be NULL.
-// NullTime implements the Scanner interface so
-// it can be used as a scan destination:
-//
-//  var nt NullTime
-//  err := db.QueryRow("SELECT time FROM foo WHERE id=?", id).Scan(&nt)
-//  ...
-//  if nt.Valid {
-//     // use nt.Time
-//  } else {
-//     // NULL value
-//  }
-//
-// This NullTime implementation is not driver-specific
-type NullTime struct {
-	Time  time.Time
-	Valid bool // Valid is true if Time is not NULL
-}
-
-// Scan implements the Scanner interface.
-// The value type must be time.Time or string / []byte (formatted time-string),
-// otherwise Scan fails.
-func (nt *NullTime) Scan(value interface{}) (err error) {
-	if value == nil {
-		nt.Time, nt.Valid = time.Time{}, false
-		return
-	}
-
-	switch v := value.(type) {
-	case time.Time:
-		nt.Time, nt.Valid = v, true
-		return
-	case []byte:
-		nt.Time, err = parseDateTime(string(v), time.UTC)
-		nt.Valid = (err == nil)
-		return
-	case string:
-		nt.Time, err = parseDateTime(v, time.UTC)
-		nt.Valid = (err == nil)
-		return
-	}
-
-	nt.Valid = false
-	return fmt.Errorf("Can't convert %T to time.Time", value)
-}
-
-// Value implements the driver Valuer interface.
-func (nt NullTime) Value() (driver.Value, error) {
-	if !nt.Valid {
-		return nil, nil
-	}
-	return nt.Time, nil
-}
-
-func parseDateTime(str string, loc *time.Location) (t time.Time, err error) {
-	base := "0000-00-00 00:00:00.0000000"
-	switch len(str) {
-	case 10, 19, 21, 22, 23, 24, 25, 26: // up to "YYYY-MM-DD HH:MM:SS.MMMMMM"
-		if str == base[:len(str)] {
-			return
-		}
-		t, err = time.Parse(timeFormat[:len(str)], str)
-	default:
-		err = fmt.Errorf("Invalid Time-String: %s", str)
-		return
-	}
-
-	// Adjust location
-	if err == nil && loc != time.UTC {
-		y, mo, d := t.Date()
-		h, mi, s := t.Clock()
-		t, err = time.Date(y, mo, d, h, mi, s, t.Nanosecond(), loc), nil
-	}
-
-	return
-}
-
-func parseBinaryDateTime(num uint64, data []byte, loc *time.Location) (driver.Value, error) {
-	switch num {
-	case 0:
-		return time.Time{}, nil
-	case 4:
-		return time.Date(
-			int(binary.LittleEndian.Uint16(data[:2])), // year
-			time.Month(data[2]),                       // month
-			int(data[3]),                              // day
-			0, 0, 0, 0,
-			loc,
-		), nil
-	case 7:
-		return time.Date(
-			int(binary.LittleEndian.Uint16(data[:2])), // year
-			time.Month(data[2]),                       // month
-			int(data[3]),                              // day
-			int(data[4]),                              // hour
-			int(data[5]),                              // minutes
-			int(data[6]),                              // seconds
-			0,
-			loc,
-		), nil
-	case 11:
-		return time.Date(
-			int(binary.LittleEndian.Uint16(data[:2])), // year
-			time.Month(data[2]),                       // month
-			int(data[3]),                              // day
-			int(data[4]),                              // hour
-			int(data[5]),                              // minutes
-			int(data[6]),                              // seconds
-			int(binary.LittleEndian.Uint32(data[7:11]))*1000, // nanoseconds
-			loc,
-		), nil
-	}
-	return nil, fmt.Errorf("Invalid DATETIME-packet length %d", num)
-}
-
-// zeroDateTime is used in formatBinaryDateTime to avoid an allocation
-// if the DATE or DATETIME has the zero value.
-// It must never be changed.
-// The current behavior depends on database/sql copying the result.
-var zeroDateTime = []byte("0000-00-00 00:00:00.000000")
-
-const digits01 = "0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789"
-const digits10 = "0000000000111111111122222222223333333333444444444455555555556666666666777777777788888888889999999999"
-
-func formatBinaryDateTime(src []byte, length uint8, justTime bool) (driver.Value, error) {
-	// length expects the deterministic length of the zero value,
-	// negative time and 100+ hours are automatically added if needed
-	if len(src) == 0 {
-		if justTime {
-			return zeroDateTime[11 : 11+length], nil
-		}
-		return zeroDateTime[:length], nil
-	}
-	var dst []byte          // return value
-	var pt, p1, p2, p3 byte // current digit pair
-	var zOffs byte          // offset of value in zeroDateTime
-	if justTime {
-		switch length {
-		case
-			8,                      // time (can be up to 10 when negative and 100+ hours)
-			10, 11, 12, 13, 14, 15: // time with fractional seconds
-		default:
-			return nil, fmt.Errorf("illegal TIME length %d", length)
-		}
-		switch len(src) {
-		case 8, 12:
-		default:
-			return nil, fmt.Errorf("Invalid TIME-packet length %d", len(src))
-		}
-		// +2 to enable negative time and 100+ hours
-		dst = make([]byte, 0, length+2)
-		if src[0] == 1 {
-			dst = append(dst, '-')
-		}
-		if src[1] != 0 {
-			hour := uint16(src[1])*24 + uint16(src[5])
-			pt = byte(hour / 100)
-			p1 = byte(hour - 100*uint16(pt))
-			dst = append(dst, digits01[pt])
-		} else {
-			p1 = src[5]
-		}
-		zOffs = 11
-		src = src[6:]
-	} else {
-		switch length {
-		case 10, 19, 21, 22, 23, 24, 25, 26:
-		default:
-			t := "DATE"
-			if length > 10 {
-				t += "TIME"
-			}
-			return nil, fmt.Errorf("illegal %s length %d", t, length)
-		}
-		switch len(src) {
-		case 4, 7, 11:
-		default:
-			t := "DATE"
-			if length > 10 {
-				t += "TIME"
-			}
-			return nil, fmt.Errorf("illegal %s-packet length %d", t, len(src))
-		}
-		dst = make([]byte, 0, length)
-		// start with the date
-		year := binary.LittleEndian.Uint16(src[:2])
-		pt = byte(year / 100)
-		p1 = byte(year - 100*uint16(pt))
-		p2, p3 = src[2], src[3]
-		dst = append(dst,
-			digits10[pt], digits01[pt],
-			digits10[p1], digits01[p1], '-',
-			digits10[p2], digits01[p2], '-',
-			digits10[p3], digits01[p3],
-		)
-		if length == 10 {
-			return dst, nil
-		}
-		if len(src) == 4 {
-			return append(dst, zeroDateTime[10:length]...), nil
-		}
-		dst = append(dst, ' ')
-		p1 = src[4] // hour
-		src = src[5:]
-	}
-	// p1 is 2-digit hour, src is after hour
-	p2, p3 = src[0], src[1]
-	dst = append(dst,
-		digits10[p1], digits01[p1], ':',
-		digits10[p2], digits01[p2], ':',
-		digits10[p3], digits01[p3],
-	)
-	if length <= byte(len(dst)) {
-		return dst, nil
-	}
-	src = src[2:]
-	if len(src) == 0 {
-		return append(dst, zeroDateTime[19:zOffs+length]...), nil
-	}
-	microsecs := binary.LittleEndian.Uint32(src[:4])
-	p1 = byte(microsecs / 10000)
-	microsecs -= 10000 * uint32(p1)
-	p2 = byte(microsecs / 100)
-	microsecs -= 100 * uint32(p2)
-	p3 = byte(microsecs)
-	switch decimals := zOffs + length - 20; decimals {
-	default:
-		return append(dst, '.',
-			digits10[p1], digits01[p1],
-			digits10[p2], digits01[p2],
-			digits10[p3], digits01[p3],
-		), nil
-	case 1:
-		return append(dst, '.',
-			digits10[p1],
-		), nil
-	case 2:
-		return append(dst, '.',
-			digits10[p1], digits01[p1],
-		), nil
-	case 3:
-		return append(dst, '.',
-			digits10[p1], digits01[p1],
-			digits10[p2],
-		), nil
-	case 4:
-		return append(dst, '.',
-			digits10[p1], digits01[p1],
-			digits10[p2], digits01[p2],
-		), nil
-	case 5:
-		return append(dst, '.',
-			digits10[p1], digits01[p1],
-			digits10[p2], digits01[p2],
-			digits10[p3],
-		), nil
-	}
-}
-
-/******************************************************************************
-*                       Convert from and to bytes                             *
-******************************************************************************/
-
-func uint64ToBytes(n uint64) []byte {
-	return []byte{
-		byte(n),
-		byte(n >> 8),
-		byte(n >> 16),
-		byte(n >> 24),
-		byte(n >> 32),
-		byte(n >> 40),
-		byte(n >> 48),
-		byte(n >> 56),
-	}
-}
-
-func uint64ToString(n uint64) []byte {
-	var a [20]byte
-	i := 20
-
-	// U+0030 = 0
-	// ...
-	// U+0039 = 9
-
-	var q uint64
-	for n >= 10 {
-		i--
-		q = n / 10
-		a[i] = uint8(n-q*10) + 0x30
-		n = q
-	}
-
-	i--
-	a[i] = uint8(n) + 0x30
-
-	return a[i:]
-}
-
-// treats string value as unsigned integer representation
-func stringToInt(b []byte) int {
-	val := 0
-	for i := range b {
-		val *= 10
-		val += int(b[i] - 0x30)
-	}
-	return val
-}
-
-// returns the string read as a bytes slice, wheter the value is NULL,
-// the number of bytes read and an error, in case the string is longer than
-// the input slice
-func readLengthEncodedString(b []byte) ([]byte, bool, int, error) {
-	// Get length
-	num, isNull, n := readLengthEncodedInteger(b)
-	if num < 1 {
-		return b[n:n], isNull, n, nil
-	}
-
-	n += int(num)
-
-	// Check data length
-	if len(b) >= n {
-		return b[n-int(num) : n], false, n, nil
-	}
-	return nil, false, n, io.EOF
-}
-
-// returns the number of bytes skipped and an error, in case the string is
-// longer than the input slice
-func skipLengthEncodedString(b []byte) (int, error) {
-	// Get length
-	num, _, n := readLengthEncodedInteger(b)
-	if num < 1 {
-		return n, nil
-	}
-
-	n += int(num)
-
-	// Check data length
-	if len(b) >= n {
-		return n, nil
-	}
-	return n, io.EOF
-}
-
-// returns the number read, whether the value is NULL and the number of bytes read
-func readLengthEncodedInteger(b []byte) (uint64, bool, int) {
-	// See issue #349
-	if len(b) == 0 {
-		return 0, true, 1
-	}
-	switch b[0] {
-
-	// 251: NULL
-	case 0xfb:
-		return 0, true, 1
-
-	// 252: value of following 2
-	case 0xfc:
-		return uint64(b[1]) | uint64(b[2])<<8, false, 3
-
-	// 253: value of following 3
-	case 0xfd:
-		return uint64(b[1]) | uint64(b[2])<<8 | uint64(b[3])<<16, false, 4
-
-	// 254: value of following 8
-	case 0xfe:
-		return uint64(b[1]) | uint64(b[2])<<8 | uint64(b[3])<<16 |
-				uint64(b[4])<<24 | uint64(b[5])<<32 | uint64(b[6])<<40 |
-				uint64(b[7])<<48 | uint64(b[8])<<56,
-			false, 9
-	}
-
-	// 0-250: value of first byte
-	return uint64(b[0]), false, 1
-}
-
-// encodes a uint64 value and appends it to the given bytes slice
-func appendLengthEncodedInteger(b []byte, n uint64) []byte {
-	switch {
-	case n <= 250:
-		return append(b, byte(n))
-
-	case n <= 0xffff:
-		return append(b, 0xfc, byte(n), byte(n>>8))
-
-	case n <= 0xffffff:
-		return append(b, 0xfd, byte(n), byte(n>>8), byte(n>>16))
-	}
-	return append(b, 0xfe, byte(n), byte(n>>8), byte(n>>16), byte(n>>24),
-		byte(n>>32), byte(n>>40), byte(n>>48), byte(n>>56))
-}
-
-// reserveBuffer checks cap(buf) and expand buffer to len(buf) + appendSize.
-// If cap(buf) is not enough, reallocate new buffer.
-func reserveBuffer(buf []byte, appendSize int) []byte {
-	newSize := len(buf) + appendSize
-	if cap(buf) < newSize {
-		// Grow buffer exponentially
-		newBuf := make([]byte, len(buf)*2+appendSize)
-		copy(newBuf, buf)
-		buf = newBuf
-	}
-	return buf[:newSize]
-}
-
-// escapeBytesBackslash escapes []byte with backslashes (\)
-// This escapes the contents of a string (provided as []byte) by adding backslashes before special
-// characters, and turning others into specific escape sequences, such as
-// turning newlines into \n and null bytes into \0.
-// https://github.com/mysql/mysql-server/blob/mysql-5.7.5/mysys/charset.c#L823-L932
-func escapeBytesBackslash(buf, v []byte) []byte {
-	pos := len(buf)
-	buf = reserveBuffer(buf, len(v)*2)
-
-	for _, c := range v {
-		switch c {
-		case '\x00':
-			buf[pos] = '\\'
-			buf[pos+1] = '0'
-			pos += 2
-		case '\n':
-			buf[pos] = '\\'
-			buf[pos+1] = 'n'
-			pos += 2
-		case '\r':
-			buf[pos] = '\\'
-			buf[pos+1] = 'r'
-			pos += 2
-		case '\x1a':
-			buf[pos] = '\\'
-			buf[pos+1] = 'Z'
-			pos += 2
-		case '\'':
-			buf[pos] = '\\'
-			buf[pos+1] = '\''
-			pos += 2
-		case '"':
-			buf[pos] = '\\'
-			buf[pos+1] = '"'
-			pos += 2
-		case '\\':
-			buf[pos] = '\\'
-			buf[pos+1] = '\\'
-			pos += 2
-		default:
-			buf[pos] = c
-			pos += 1
-		}
-	}
-
-	return buf[:pos]
-}
-
-// escapeStringBackslash is similar to escapeBytesBackslash but for string.
-func escapeStringBackslash(buf []byte, v string) []byte {
-	pos := len(buf)
-	buf = reserveBuffer(buf, len(v)*2)
-
-	for i := 0; i < len(v); i++ {
-		c := v[i]
-		switch c {
-		case '\x00':
-			buf[pos] = '\\'
-			buf[pos+1] = '0'
-			pos += 2
-		case '\n':
-			buf[pos] = '\\'
-			buf[pos+1] = 'n'
-			pos += 2
-		case '\r':
-			buf[pos] = '\\'
-			buf[pos+1] = 'r'
-			pos += 2
-		case '\x1a':
-			buf[pos] = '\\'
-			buf[pos+1] = 'Z'
-			pos += 2
-		case '\'':
-			buf[pos] = '\\'
-			buf[pos+1] = '\''
-			pos += 2
-		case '"':
-			buf[pos] = '\\'
-			buf[pos+1] = '"'
-			pos += 2
-		case '\\':
-			buf[pos] = '\\'
-			buf[pos+1] = '\\'
-			pos += 2
-		default:
-			buf[pos] = c
-			pos += 1
-		}
-	}
-
-	return buf[:pos]
-}
-
-// escapeBytesQuotes escapes apostrophes in []byte by doubling them up.
-// This escapes the contents of a string by doubling up any apostrophes that
-// it contains. This is used when the NO_BACKSLASH_ESCAPES SQL_MODE is in
-// effect on the server.
-// https://github.com/mysql/mysql-server/blob/mysql-5.7.5/mysys/charset.c#L963-L1038
-func escapeBytesQuotes(buf, v []byte) []byte {
-	pos := len(buf)
-	buf = reserveBuffer(buf, len(v)*2)
-
-	for _, c := range v {
-		if c == '\'' {
-			buf[pos] = '\''
-			buf[pos+1] = '\''
-			pos += 2
-		} else {
-			buf[pos] = c
-			pos++
-		}
-	}
-
-	return buf[:pos]
-}
-
-// escapeStringQuotes is similar to escapeBytesQuotes but for string.
-func escapeStringQuotes(buf []byte, v string) []byte {
-	pos := len(buf)
-	buf = reserveBuffer(buf, len(v)*2)
-
-	for i := 0; i < len(v); i++ {
-		c := v[i]
-		if c == '\'' {
-			buf[pos] = '\''
-			buf[pos+1] = '\''
-			pos += 2
-		} else {
-			buf[pos] = c
-			pos++
-		}
-	}
-
-	return buf[:pos]
-}
diff --git a/Godeps/_workspace/src/github.com/go-sql-driver/mysql/utils_test.go b/Godeps/_workspace/src/github.com/go-sql-driver/mysql/utils_test.go
deleted file mode 100644
index 79fbdd1eb..000000000
--- a/Godeps/_workspace/src/github.com/go-sql-driver/mysql/utils_test.go
+++ /dev/null
@@ -1,346 +0,0 @@
-// Go MySQL Driver - A MySQL-Driver for Go's database/sql package
-//
-// Copyright 2013 The Go-MySQL-Driver Authors. All rights reserved.
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this file,
-// You can obtain one at http://mozilla.org/MPL/2.0/.
-
-package mysql
-
-import (
-	"bytes"
-	"crypto/tls"
-	"encoding/binary"
-	"fmt"
-	"testing"
-	"time"
-)
-
-var testDSNs = []struct {
-	in  string
-	out string
-	loc *time.Location
-}{
-	{"username:password@protocol(address)/dbname?param=value", "&{user:username passwd:password net:protocol addr:address dbname:dbname params:map[param:value] loc:%p tls:<nil> timeout:0 collation:33 allowAllFiles:false allowOldPasswords:false allowCleartextPasswords:false clientFoundRows:false columnsWithAlias:false interpolateParams:false}", time.UTC},
-	{"username:password@protocol(address)/dbname?param=value&columnsWithAlias=true", "&{user:username passwd:password net:protocol addr:address dbname:dbname params:map[param:value] loc:%p tls:<nil> timeout:0 collation:33 allowAllFiles:false allowOldPasswords:false allowCleartextPasswords:false clientFoundRows:false columnsWithAlias:true interpolateParams:false}", time.UTC},
-	{"user@unix(/path/to/socket)/dbname?charset=utf8", "&{user:user passwd: net:unix addr:/path/to/socket dbname:dbname params:map[charset:utf8] loc:%p tls:<nil> timeout:0 collation:33 allowAllFiles:false allowOldPasswords:false allowCleartextPasswords:false clientFoundRows:false columnsWithAlias:false interpolateParams:false}", time.UTC},
-	{"user:password@tcp(localhost:5555)/dbname?charset=utf8&tls=true", "&{user:user passwd:password net:tcp addr:localhost:5555 dbname:dbname params:map[charset:utf8] loc:%p tls:<nil> timeout:0 collation:33 allowAllFiles:false allowOldPasswords:false allowCleartextPasswords:false clientFoundRows:false columnsWithAlias:false interpolateParams:false}", time.UTC},
-	{"user:password@tcp(localhost:5555)/dbname?charset=utf8mb4,utf8&tls=skip-verify", "&{user:user passwd:password net:tcp addr:localhost:5555 dbname:dbname params:map[charset:utf8mb4,utf8] loc:%p tls:<nil> timeout:0 collation:33 allowAllFiles:false allowOldPasswords:false allowCleartextPasswords:false clientFoundRows:false columnsWithAlias:false interpolateParams:false}", time.UTC},
-	{"user:password@/dbname?loc=UTC&timeout=30s&allowAllFiles=1&clientFoundRows=true&allowOldPasswords=TRUE&collation=utf8mb4_unicode_ci", "&{user:user passwd:password net:tcp addr:127.0.0.1:3306 dbname:dbname params:map[] loc:%p tls:<nil> timeout:30000000000 collation:224 allowAllFiles:true allowOldPasswords:true allowCleartextPasswords:false clientFoundRows:true columnsWithAlias:false interpolateParams:false}", time.UTC},
-	{"user:p@ss(word)@tcp([de:ad:be:ef::ca:fe]:80)/dbname?loc=Local", "&{user:user passwd:p@ss(word) net:tcp addr:[de:ad:be:ef::ca:fe]:80 dbname:dbname params:map[] loc:%p tls:<nil> timeout:0 collation:33 allowAllFiles:false allowOldPasswords:false allowCleartextPasswords:false clientFoundRows:false columnsWithAlias:false interpolateParams:false}", time.Local},
-	{"/dbname", "&{user: passwd: net:tcp addr:127.0.0.1:3306 dbname:dbname params:map[] loc:%p tls:<nil> timeout:0 collation:33 allowAllFiles:false allowOldPasswords:false allowCleartextPasswords:false clientFoundRows:false columnsWithAlias:false interpolateParams:false}", time.UTC},
-	{"@/", "&{user: passwd: net:tcp addr:127.0.0.1:3306 dbname: params:map[] loc:%p tls:<nil> timeout:0 collation:33 allowAllFiles:false allowOldPasswords:false allowCleartextPasswords:false clientFoundRows:false columnsWithAlias:false interpolateParams:false}", time.UTC},
-	{"/", "&{user: passwd: net:tcp addr:127.0.0.1:3306 dbname: params:map[] loc:%p tls:<nil> timeout:0 collation:33 allowAllFiles:false allowOldPasswords:false allowCleartextPasswords:false clientFoundRows:false columnsWithAlias:false interpolateParams:false}", time.UTC},
-	{"", "&{user: passwd: net:tcp addr:127.0.0.1:3306 dbname: params:map[] loc:%p tls:<nil> timeout:0 collation:33 allowAllFiles:false allowOldPasswords:false allowCleartextPasswords:false clientFoundRows:false columnsWithAlias:false interpolateParams:false}", time.UTC},
-	{"user:p@/ssword@/", "&{user:user passwd:p@/ssword net:tcp addr:127.0.0.1:3306 dbname: params:map[] loc:%p tls:<nil> timeout:0 collation:33 allowAllFiles:false allowOldPasswords:false allowCleartextPasswords:false clientFoundRows:false columnsWithAlias:false interpolateParams:false}", time.UTC},
-	{"unix/?arg=%2Fsome%2Fpath.ext", "&{user: passwd: net:unix addr:/tmp/mysql.sock dbname: params:map[arg:/some/path.ext] loc:%p tls:<nil> timeout:0 collation:33 allowAllFiles:false allowOldPasswords:false allowCleartextPasswords:false clientFoundRows:false columnsWithAlias:false interpolateParams:false}", time.UTC},
-}
-
-func TestDSNParser(t *testing.T) {
-	var cfg *config
-	var err error
-	var res string
-
-	for i, tst := range testDSNs {
-		cfg, err = parseDSN(tst.in)
-		if err != nil {
-			t.Error(err.Error())
-		}
-
-		// pointer not static
-		cfg.tls = nil
-
-		res = fmt.Sprintf("%+v", cfg)
-		if res != fmt.Sprintf(tst.out, tst.loc) {
-			t.Errorf("%d. parseDSN(%q) => %q, want %q", i, tst.in, res, fmt.Sprintf(tst.out, tst.loc))
-		}
-	}
-}
-
-func TestDSNParserInvalid(t *testing.T) {
-	var invalidDSNs = []string{
-		"@net(addr/",                  // no closing brace
-		"@tcp(/",                      // no closing brace
-		"tcp(/",                       // no closing brace
-		"(/",                          // no closing brace
-		"net(addr)//",                 // unescaped
-		"user:pass@tcp(1.2.3.4:3306)", // no trailing slash
-		//"/dbname?arg=/some/unescaped/path",
-	}
-
-	for i, tst := range invalidDSNs {
-		if _, err := parseDSN(tst); err == nil {
-			t.Errorf("invalid DSN #%d. (%s) didn't error!", i, tst)
-		}
-	}
-}
-
-func TestDSNWithCustomTLS(t *testing.T) {
-	baseDSN := "user:password@tcp(localhost:5555)/dbname?tls="
-	tlsCfg := tls.Config{}
-
-	RegisterTLSConfig("utils_test", &tlsCfg)
-
-	// Custom TLS is missing
-	tst := baseDSN + "invalid_tls"
-	cfg, err := parseDSN(tst)
-	if err == nil {
-		t.Errorf("Invalid custom TLS in DSN (%s) but did not error.  Got config: %#v", tst, cfg)
-	}
-
-	tst = baseDSN + "utils_test"
-
-	// Custom TLS with a server name
-	name := "foohost"
-	tlsCfg.ServerName = name
-	cfg, err = parseDSN(tst)
-
-	if err != nil {
-		t.Error(err.Error())
-	} else if cfg.tls.ServerName != name {
-		t.Errorf("Did not get the correct TLS ServerName (%s) parsing DSN (%s).", name, tst)
-	}
-
-	// Custom TLS without a server name
-	name = "localhost"
-	tlsCfg.ServerName = ""
-	cfg, err = parseDSN(tst)
-
-	if err != nil {
-		t.Error(err.Error())
-	} else if cfg.tls.ServerName != name {
-		t.Errorf("Did not get the correct ServerName (%s) parsing DSN (%s).", name, tst)
-	}
-
-	DeregisterTLSConfig("utils_test")
-}
-
-func TestDSNUnsafeCollation(t *testing.T) {
-	_, err := parseDSN("/dbname?collation=gbk_chinese_ci&interpolateParams=true")
-	if err != errInvalidDSNUnsafeCollation {
-		t.Error("Expected %v, Got %v", errInvalidDSNUnsafeCollation, err)
-	}
-
-	_, err = parseDSN("/dbname?collation=gbk_chinese_ci&interpolateParams=false")
-	if err != nil {
-		t.Error("Expected %v, Got %v", nil, err)
-	}
-
-	_, err = parseDSN("/dbname?collation=gbk_chinese_ci")
-	if err != nil {
-		t.Error("Expected %v, Got %v", nil, err)
-	}
-
-	_, err = parseDSN("/dbname?collation=ascii_bin&interpolateParams=true")
-	if err != nil {
-		t.Error("Expected %v, Got %v", nil, err)
-	}
-
-	_, err = parseDSN("/dbname?collation=latin1_german1_ci&interpolateParams=true")
-	if err != nil {
-		t.Error("Expected %v, Got %v", nil, err)
-	}
-
-	_, err = parseDSN("/dbname?collation=utf8_general_ci&interpolateParams=true")
-	if err != nil {
-		t.Error("Expected %v, Got %v", nil, err)
-	}
-
-	_, err = parseDSN("/dbname?collation=utf8mb4_general_ci&interpolateParams=true")
-	if err != nil {
-		t.Error("Expected %v, Got %v", nil, err)
-	}
-}
-
-func BenchmarkParseDSN(b *testing.B) {
-	b.ReportAllocs()
-
-	for i := 0; i < b.N; i++ {
-		for _, tst := range testDSNs {
-			if _, err := parseDSN(tst.in); err != nil {
-				b.Error(err.Error())
-			}
-		}
-	}
-}
-
-func TestScanNullTime(t *testing.T) {
-	var scanTests = []struct {
-		in    interface{}
-		error bool
-		valid bool
-		time  time.Time
-	}{
-		{tDate, false, true, tDate},
-		{sDate, false, true, tDate},
-		{[]byte(sDate), false, true, tDate},
-		{tDateTime, false, true, tDateTime},
-		{sDateTime, false, true, tDateTime},
-		{[]byte(sDateTime), false, true, tDateTime},
-		{tDate0, false, true, tDate0},
-		{sDate0, false, true, tDate0},
-		{[]byte(sDate0), false, true, tDate0},
-		{sDateTime0, false, true, tDate0},
-		{[]byte(sDateTime0), false, true, tDate0},
-		{"", true, false, tDate0},
-		{"1234", true, false, tDate0},
-		{0, true, false, tDate0},
-	}
-
-	var nt = NullTime{}
-	var err error
-
-	for _, tst := range scanTests {
-		err = nt.Scan(tst.in)
-		if (err != nil) != tst.error {
-			t.Errorf("%v: expected error status %t, got %t", tst.in, tst.error, (err != nil))
-		}
-		if nt.Valid != tst.valid {
-			t.Errorf("%v: expected valid status %t, got %t", tst.in, tst.valid, nt.Valid)
-		}
-		if nt.Time != tst.time {
-			t.Errorf("%v: expected time %v, got %v", tst.in, tst.time, nt.Time)
-		}
-	}
-}
-
-func TestLengthEncodedInteger(t *testing.T) {
-	var integerTests = []struct {
-		num     uint64
-		encoded []byte
-	}{
-		{0x0000000000000000, []byte{0x00}},
-		{0x0000000000000012, []byte{0x12}},
-		{0x00000000000000fa, []byte{0xfa}},
-		{0x0000000000000100, []byte{0xfc, 0x00, 0x01}},
-		{0x0000000000001234, []byte{0xfc, 0x34, 0x12}},
-		{0x000000000000ffff, []byte{0xfc, 0xff, 0xff}},
-		{0x0000000000010000, []byte{0xfd, 0x00, 0x00, 0x01}},
-		{0x0000000000123456, []byte{0xfd, 0x56, 0x34, 0x12}},
-		{0x0000000000ffffff, []byte{0xfd, 0xff, 0xff, 0xff}},
-		{0x0000000001000000, []byte{0xfe, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00}},
-		{0x123456789abcdef0, []byte{0xfe, 0xf0, 0xde, 0xbc, 0x9a, 0x78, 0x56, 0x34, 0x12}},
-		{0xffffffffffffffff, []byte{0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}},
-	}
-
-	for _, tst := range integerTests {
-		num, isNull, numLen := readLengthEncodedInteger(tst.encoded)
-		if isNull {
-			t.Errorf("%x: expected %d, got NULL", tst.encoded, tst.num)
-		}
-		if num != tst.num {
-			t.Errorf("%x: expected %d, got %d", tst.encoded, tst.num, num)
-		}
-		if numLen != len(tst.encoded) {
-			t.Errorf("%x: expected size %d, got %d", tst.encoded, len(tst.encoded), numLen)
-		}
-		encoded := appendLengthEncodedInteger(nil, num)
-		if !bytes.Equal(encoded, tst.encoded) {
-			t.Errorf("%v: expected %x, got %x", num, tst.encoded, encoded)
-		}
-	}
-}
-
-func TestOldPass(t *testing.T) {
-	scramble := []byte{9, 8, 7, 6, 5, 4, 3, 2}
-	vectors := []struct {
-		pass string
-		out  string
-	}{
-		{" pass", "47575c5a435b4251"},
-		{"pass ", "47575c5a435b4251"},
-		{"123\t456", "575c47505b5b5559"},
-		{"C0mpl!ca ted#PASS123", "5d5d554849584a45"},
-	}
-	for _, tuple := range vectors {
-		ours := scrambleOldPassword(scramble, []byte(tuple.pass))
-		if tuple.out != fmt.Sprintf("%x", ours) {
-			t.Errorf("Failed old password %q", tuple.pass)
-		}
-	}
-}
-
-func TestFormatBinaryDateTime(t *testing.T) {
-	rawDate := [11]byte{}
-	binary.LittleEndian.PutUint16(rawDate[:2], 1978)   // years
-	rawDate[2] = 12                                    // months
-	rawDate[3] = 30                                    // days
-	rawDate[4] = 15                                    // hours
-	rawDate[5] = 46                                    // minutes
-	rawDate[6] = 23                                    // seconds
-	binary.LittleEndian.PutUint32(rawDate[7:], 987654) // microseconds
-	expect := func(expected string, inlen, outlen uint8) {
-		actual, _ := formatBinaryDateTime(rawDate[:inlen], outlen, false)
-		bytes, ok := actual.([]byte)
-		if !ok {
-			t.Errorf("formatBinaryDateTime must return []byte, was %T", actual)
-		}
-		if string(bytes) != expected {
-			t.Errorf(
-				"expected %q, got %q for length in %d, out %d",
-				bytes, actual, inlen, outlen,
-			)
-		}
-	}
-	expect("0000-00-00", 0, 10)
-	expect("0000-00-00 00:00:00", 0, 19)
-	expect("1978-12-30", 4, 10)
-	expect("1978-12-30 15:46:23", 7, 19)
-	expect("1978-12-30 15:46:23.987654", 11, 26)
-}
-
-func TestEscapeBackslash(t *testing.T) {
-	expect := func(expected, value string) {
-		actual := string(escapeBytesBackslash([]byte{}, []byte(value)))
-		if actual != expected {
-			t.Errorf(
-				"expected %s, got %s",
-				expected, actual,
-			)
-		}
-
-		actual = string(escapeStringBackslash([]byte{}, value))
-		if actual != expected {
-			t.Errorf(
-				"expected %s, got %s",
-				expected, actual,
-			)
-		}
-	}
-
-	expect("foo\\0bar", "foo\x00bar")
-	expect("foo\\nbar", "foo\nbar")
-	expect("foo\\rbar", "foo\rbar")
-	expect("foo\\Zbar", "foo\x1abar")
-	expect("foo\\\"bar", "foo\"bar")
-	expect("foo\\\\bar", "foo\\bar")
-	expect("foo\\'bar", "foo'bar")
-}
-
-func TestEscapeQuotes(t *testing.T) {
-	expect := func(expected, value string) {
-		actual := string(escapeBytesQuotes([]byte{}, []byte(value)))
-		if actual != expected {
-			t.Errorf(
-				"expected %s, got %s",
-				expected, actual,
-			)
-		}
-
-		actual = string(escapeStringQuotes([]byte{}, value))
-		if actual != expected {
-			t.Errorf(
-				"expected %s, got %s",
-				expected, actual,
-			)
-		}
-	}
-
-	expect("foo\x00bar", "foo\x00bar") // not affected
-	expect("foo\nbar", "foo\nbar")     // not affected
-	expect("foo\rbar", "foo\rbar")     // not affected
-	expect("foo\x1abar", "foo\x1abar") // not affected
-	expect("foo''bar", "foo'bar")      // affected
-	expect("foo\"bar", "foo\"bar")     // not affected
-}
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/Makefile b/Godeps/_workspace/src/github.com/gogo/protobuf/proto/Makefile
deleted file mode 100644
index 23a6b1734..000000000
--- a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-# Go support for Protocol Buffers - Google's data interchange format
-#
-# Copyright 2010 The Go Authors.  All rights reserved.
-# https://github.com/golang/protobuf
-#
-# 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.
-
-install:
-	go install
-
-test: install generate-test-pbs
-	go test
-
-
-generate-test-pbs:
-	make install
-	make -C testdata
-	protoc-min-version --version="3.0.0" --proto_path=.:../../../../ --gogo_out=. proto3_proto/proto3.proto
-	make
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/all_test.go b/Godeps/_workspace/src/github.com/gogo/protobuf/proto/all_test.go
deleted file mode 100644
index 88c506cf0..000000000
--- a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/all_test.go
+++ /dev/null
@@ -1,2104 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2010 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// 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.
-
-package proto_test
-
-import (
-	"bytes"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"math"
-	"math/rand"
-	"reflect"
-	"runtime/debug"
-	"strings"
-	"testing"
-	"time"
-
-	. "github.com/gogo/protobuf/proto"
-	. "github.com/gogo/protobuf/proto/testdata"
-)
-
-var globalO *Buffer
-
-func old() *Buffer {
-	if globalO == nil {
-		globalO = NewBuffer(nil)
-	}
-	globalO.Reset()
-	return globalO
-}
-
-func equalbytes(b1, b2 []byte, t *testing.T) {
-	if len(b1) != len(b2) {
-		t.Errorf("wrong lengths: 2*%d != %d", len(b1), len(b2))
-		return
-	}
-	for i := 0; i < len(b1); i++ {
-		if b1[i] != b2[i] {
-			t.Errorf("bad byte[%d]:%x %x: %s %s", i, b1[i], b2[i], b1, b2)
-		}
-	}
-}
-
-func initGoTestField() *GoTestField {
-	f := new(GoTestField)
-	f.Label = String("label")
-	f.Type = String("type")
-	return f
-}
-
-// These are all structurally equivalent but the tag numbers differ.
-// (It's remarkable that required, optional, and repeated all have
-// 8 letters.)
-func initGoTest_RequiredGroup() *GoTest_RequiredGroup {
-	return &GoTest_RequiredGroup{
-		RequiredField: String("required"),
-	}
-}
-
-func initGoTest_OptionalGroup() *GoTest_OptionalGroup {
-	return &GoTest_OptionalGroup{
-		RequiredField: String("optional"),
-	}
-}
-
-func initGoTest_RepeatedGroup() *GoTest_RepeatedGroup {
-	return &GoTest_RepeatedGroup{
-		RequiredField: String("repeated"),
-	}
-}
-
-func initGoTest(setdefaults bool) *GoTest {
-	pb := new(GoTest)
-	if setdefaults {
-		pb.F_BoolDefaulted = Bool(Default_GoTest_F_BoolDefaulted)
-		pb.F_Int32Defaulted = Int32(Default_GoTest_F_Int32Defaulted)
-		pb.F_Int64Defaulted = Int64(Default_GoTest_F_Int64Defaulted)
-		pb.F_Fixed32Defaulted = Uint32(Default_GoTest_F_Fixed32Defaulted)
-		pb.F_Fixed64Defaulted = Uint64(Default_GoTest_F_Fixed64Defaulted)
-		pb.F_Uint32Defaulted = Uint32(Default_GoTest_F_Uint32Defaulted)
-		pb.F_Uint64Defaulted = Uint64(Default_GoTest_F_Uint64Defaulted)
-		pb.F_FloatDefaulted = Float32(Default_GoTest_F_FloatDefaulted)
-		pb.F_DoubleDefaulted = Float64(Default_GoTest_F_DoubleDefaulted)
-		pb.F_StringDefaulted = String(Default_GoTest_F_StringDefaulted)
-		pb.F_BytesDefaulted = Default_GoTest_F_BytesDefaulted
-		pb.F_Sint32Defaulted = Int32(Default_GoTest_F_Sint32Defaulted)
-		pb.F_Sint64Defaulted = Int64(Default_GoTest_F_Sint64Defaulted)
-	}
-
-	pb.Kind = GoTest_TIME.Enum()
-	pb.RequiredField = initGoTestField()
-	pb.F_BoolRequired = Bool(true)
-	pb.F_Int32Required = Int32(3)
-	pb.F_Int64Required = Int64(6)
-	pb.F_Fixed32Required = Uint32(32)
-	pb.F_Fixed64Required = Uint64(64)
-	pb.F_Uint32Required = Uint32(3232)
-	pb.F_Uint64Required = Uint64(6464)
-	pb.F_FloatRequired = Float32(3232)
-	pb.F_DoubleRequired = Float64(6464)
-	pb.F_StringRequired = String("string")
-	pb.F_BytesRequired = []byte("bytes")
-	pb.F_Sint32Required = Int32(-32)
-	pb.F_Sint64Required = Int64(-64)
-	pb.Requiredgroup = initGoTest_RequiredGroup()
-
-	return pb
-}
-
-func fail(msg string, b *bytes.Buffer, s string, t *testing.T) {
-	data := b.Bytes()
-	ld := len(data)
-	ls := len(s) / 2
-
-	fmt.Printf("fail %s ld=%d ls=%d\n", msg, ld, ls)
-
-	// find the interesting spot - n
-	n := ls
-	if ld < ls {
-		n = ld
-	}
-	j := 0
-	for i := 0; i < n; i++ {
-		bs := hex(s[j])*16 + hex(s[j+1])
-		j += 2
-		if data[i] == bs {
-			continue
-		}
-		n = i
-		break
-	}
-	l := n - 10
-	if l < 0 {
-		l = 0
-	}
-	h := n + 10
-
-	// find the interesting spot - n
-	fmt.Printf("is[%d]:", l)
-	for i := l; i < h; i++ {
-		if i >= ld {
-			fmt.Printf(" --")
-			continue
-		}
-		fmt.Printf(" %.2x", data[i])
-	}
-	fmt.Printf("\n")
-
-	fmt.Printf("sb[%d]:", l)
-	for i := l; i < h; i++ {
-		if i >= ls {
-			fmt.Printf(" --")
-			continue
-		}
-		bs := hex(s[j])*16 + hex(s[j+1])
-		j += 2
-		fmt.Printf(" %.2x", bs)
-	}
-	fmt.Printf("\n")
-
-	t.Fail()
-
-	//	t.Errorf("%s: \ngood: %s\nbad: %x", msg, s, b.Bytes())
-	// Print the output in a partially-decoded format; can
-	// be helpful when updating the test.  It produces the output
-	// that is pasted, with minor edits, into the argument to verify().
-	//	data := b.Bytes()
-	//	nesting := 0
-	//	for b.Len() > 0 {
-	//		start := len(data) - b.Len()
-	//		var u uint64
-	//		u, err := DecodeVarint(b)
-	//		if err != nil {
-	//			fmt.Printf("decode error on varint:", err)
-	//			return
-	//		}
-	//		wire := u & 0x7
-	//		tag := u >> 3
-	//		switch wire {
-	//		case WireVarint:
-	//			v, err := DecodeVarint(b)
-	//			if err != nil {
-	//				fmt.Printf("decode error on varint:", err)
-	//				return
-	//			}
-	//			fmt.Printf("\t\t\"%x\"  // field %d, encoding %d, value %d\n",
-	//				data[start:len(data)-b.Len()], tag, wire, v)
-	//		case WireFixed32:
-	//			v, err := DecodeFixed32(b)
-	//			if err != nil {
-	//				fmt.Printf("decode error on fixed32:", err)
-	//				return
-	//			}
-	//			fmt.Printf("\t\t\"%x\"  // field %d, encoding %d, value %d\n",
-	//				data[start:len(data)-b.Len()], tag, wire, v)
-	//		case WireFixed64:
-	//			v, err := DecodeFixed64(b)
-	//			if err != nil {
-	//				fmt.Printf("decode error on fixed64:", err)
-	//				return
-	//			}
-	//			fmt.Printf("\t\t\"%x\"  // field %d, encoding %d, value %d\n",
-	//				data[start:len(data)-b.Len()], tag, wire, v)
-	//		case WireBytes:
-	//			nb, err := DecodeVarint(b)
-	//			if err != nil {
-	//				fmt.Printf("decode error on bytes:", err)
-	//				return
-	//			}
-	//			after_tag := len(data) - b.Len()
-	//			str := make([]byte, nb)
-	//			_, err = b.Read(str)
-	//			if err != nil {
-	//				fmt.Printf("decode error on bytes:", err)
-	//				return
-	//			}
-	//			fmt.Printf("\t\t\"%x\" \"%x\"  // field %d, encoding %d (FIELD)\n",
-	//				data[start:after_tag], str, tag, wire)
-	//		case WireStartGroup:
-	//			nesting++
-	//			fmt.Printf("\t\t\"%x\"\t\t// start group field %d level %d\n",
-	//				data[start:len(data)-b.Len()], tag, nesting)
-	//		case WireEndGroup:
-	//			fmt.Printf("\t\t\"%x\"\t\t// end group field %d level %d\n",
-	//				data[start:len(data)-b.Len()], tag, nesting)
-	//			nesting--
-	//		default:
-	//			fmt.Printf("unrecognized wire type %d\n", wire)
-	//			return
-	//		}
-	//	}
-}
-
-func hex(c uint8) uint8 {
-	if '0' <= c && c <= '9' {
-		return c - '0'
-	}
-	if 'a' <= c && c <= 'f' {
-		return 10 + c - 'a'
-	}
-	if 'A' <= c && c <= 'F' {
-		return 10 + c - 'A'
-	}
-	return 0
-}
-
-func equal(b []byte, s string, t *testing.T) bool {
-	if 2*len(b) != len(s) {
-		//		fail(fmt.Sprintf("wrong lengths: 2*%d != %d", len(b), len(s)), b, s, t)
-		fmt.Printf("wrong lengths: 2*%d != %d\n", len(b), len(s))
-		return false
-	}
-	for i, j := 0, 0; i < len(b); i, j = i+1, j+2 {
-		x := hex(s[j])*16 + hex(s[j+1])
-		if b[i] != x {
-			//			fail(fmt.Sprintf("bad byte[%d]:%x %x", i, b[i], x), b, s, t)
-			fmt.Printf("bad byte[%d]:%x %x", i, b[i], x)
-			return false
-		}
-	}
-	return true
-}
-
-func overify(t *testing.T, pb *GoTest, expected string) {
-	o := old()
-	err := o.Marshal(pb)
-	if err != nil {
-		fmt.Printf("overify marshal-1 err = %v", err)
-		o.DebugPrint("", o.Bytes())
-		t.Fatalf("expected = %s", expected)
-	}
-	if !equal(o.Bytes(), expected, t) {
-		o.DebugPrint("overify neq 1", o.Bytes())
-		t.Fatalf("expected = %s", expected)
-	}
-
-	// Now test Unmarshal by recreating the original buffer.
-	pbd := new(GoTest)
-	err = o.Unmarshal(pbd)
-	if err != nil {
-		t.Fatalf("overify unmarshal err = %v", err)
-		o.DebugPrint("", o.Bytes())
-		t.Fatalf("string = %s", expected)
-	}
-	o.Reset()
-	err = o.Marshal(pbd)
-	if err != nil {
-		t.Errorf("overify marshal-2 err = %v", err)
-		o.DebugPrint("", o.Bytes())
-		t.Fatalf("string = %s", expected)
-	}
-	if !equal(o.Bytes(), expected, t) {
-		o.DebugPrint("overify neq 2", o.Bytes())
-		t.Fatalf("string = %s", expected)
-	}
-}
-
-// Simple tests for numeric encode/decode primitives (varint, etc.)
-func TestNumericPrimitives(t *testing.T) {
-	for i := uint64(0); i < 1e6; i += 111 {
-		o := old()
-		if o.EncodeVarint(i) != nil {
-			t.Error("EncodeVarint")
-			break
-		}
-		x, e := o.DecodeVarint()
-		if e != nil {
-			t.Fatal("DecodeVarint")
-		}
-		if x != i {
-			t.Fatal("varint decode fail:", i, x)
-		}
-
-		o = old()
-		if o.EncodeFixed32(i) != nil {
-			t.Fatal("encFixed32")
-		}
-		x, e = o.DecodeFixed32()
-		if e != nil {
-			t.Fatal("decFixed32")
-		}
-		if x != i {
-			t.Fatal("fixed32 decode fail:", i, x)
-		}
-
-		o = old()
-		if o.EncodeFixed64(i*1234567) != nil {
-			t.Error("encFixed64")
-			break
-		}
-		x, e = o.DecodeFixed64()
-		if e != nil {
-			t.Error("decFixed64")
-			break
-		}
-		if x != i*1234567 {
-			t.Error("fixed64 decode fail:", i*1234567, x)
-			break
-		}
-
-		o = old()
-		i32 := int32(i - 12345)
-		if o.EncodeZigzag32(uint64(i32)) != nil {
-			t.Fatal("EncodeZigzag32")
-		}
-		x, e = o.DecodeZigzag32()
-		if e != nil {
-			t.Fatal("DecodeZigzag32")
-		}
-		if x != uint64(uint32(i32)) {
-			t.Fatal("zigzag32 decode fail:", i32, x)
-		}
-
-		o = old()
-		i64 := int64(i - 12345)
-		if o.EncodeZigzag64(uint64(i64)) != nil {
-			t.Fatal("EncodeZigzag64")
-		}
-		x, e = o.DecodeZigzag64()
-		if e != nil {
-			t.Fatal("DecodeZigzag64")
-		}
-		if x != uint64(i64) {
-			t.Fatal("zigzag64 decode fail:", i64, x)
-		}
-	}
-}
-
-// fakeMarshaler is a simple struct implementing Marshaler and Message interfaces.
-type fakeMarshaler struct {
-	b   []byte
-	err error
-}
-
-func (f *fakeMarshaler) Marshal() ([]byte, error) { return f.b, f.err }
-func (f *fakeMarshaler) String() string           { return fmt.Sprintf("Bytes: %v Error: %v", f.b, f.err) }
-func (f *fakeMarshaler) ProtoMessage()            {}
-func (f *fakeMarshaler) Reset()                   {}
-
-type msgWithFakeMarshaler struct {
-	M *fakeMarshaler `protobuf:"bytes,1,opt,name=fake"`
-}
-
-func (m *msgWithFakeMarshaler) String() string { return CompactTextString(m) }
-func (m *msgWithFakeMarshaler) ProtoMessage()  {}
-func (m *msgWithFakeMarshaler) Reset()         {}
-
-// Simple tests for proto messages that implement the Marshaler interface.
-func TestMarshalerEncoding(t *testing.T) {
-	tests := []struct {
-		name    string
-		m       Message
-		want    []byte
-		wantErr error
-	}{
-		{
-			name: "Marshaler that fails",
-			m: &fakeMarshaler{
-				err: errors.New("some marshal err"),
-				b:   []byte{5, 6, 7},
-			},
-			// Since there's an error, nothing should be written to buffer.
-			want:    nil,
-			wantErr: errors.New("some marshal err"),
-		},
-		{
-			name: "Marshaler that fails with RequiredNotSetError",
-			m: &msgWithFakeMarshaler{
-				M: &fakeMarshaler{
-					err: &RequiredNotSetError{},
-					b:   []byte{5, 6, 7},
-				},
-			},
-			// Since there's an error that can be continued after,
-			// the buffer should be written.
-			want: []byte{
-				10, 3, // for &msgWithFakeMarshaler
-				5, 6, 7, // for &fakeMarshaler
-			},
-			wantErr: &RequiredNotSetError{},
-		},
-		{
-			name: "Marshaler that succeeds",
-			m: &fakeMarshaler{
-				b: []byte{0, 1, 2, 3, 4, 127, 255},
-			},
-			want:    []byte{0, 1, 2, 3, 4, 127, 255},
-			wantErr: nil,
-		},
-	}
-	for _, test := range tests {
-		b := NewBuffer(nil)
-		err := b.Marshal(test.m)
-		if _, ok := err.(*RequiredNotSetError); ok {
-			// We're not in package proto, so we can only assert the type in this case.
-			err = &RequiredNotSetError{}
-		}
-		if !reflect.DeepEqual(test.wantErr, err) {
-			t.Errorf("%s: got err %v wanted %v", test.name, err, test.wantErr)
-		}
-		if !reflect.DeepEqual(test.want, b.Bytes()) {
-			t.Errorf("%s: got bytes %v wanted %v", test.name, b.Bytes(), test.want)
-		}
-	}
-}
-
-// Simple tests for bytes
-func TestBytesPrimitives(t *testing.T) {
-	o := old()
-	bytes := []byte{'n', 'o', 'w', ' ', 'i', 's', ' ', 't', 'h', 'e', ' ', 't', 'i', 'm', 'e'}
-	if o.EncodeRawBytes(bytes) != nil {
-		t.Error("EncodeRawBytes")
-	}
-	decb, e := o.DecodeRawBytes(false)
-	if e != nil {
-		t.Error("DecodeRawBytes")
-	}
-	equalbytes(bytes, decb, t)
-}
-
-// Simple tests for strings
-func TestStringPrimitives(t *testing.T) {
-	o := old()
-	s := "now is the time"
-	if o.EncodeStringBytes(s) != nil {
-		t.Error("enc_string")
-	}
-	decs, e := o.DecodeStringBytes()
-	if e != nil {
-		t.Error("dec_string")
-	}
-	if s != decs {
-		t.Error("string encode/decode fail:", s, decs)
-	}
-}
-
-// Do we catch the "required bit not set" case?
-func TestRequiredBit(t *testing.T) {
-	o := old()
-	pb := new(GoTest)
-	err := o.Marshal(pb)
-	if err == nil {
-		t.Error("did not catch missing required fields")
-	} else if strings.Index(err.Error(), "Kind") < 0 {
-		t.Error("wrong error type:", err)
-	}
-}
-
-// Check that all fields are nil.
-// Clearly silly, and a residue from a more interesting test with an earlier,
-// different initialization property, but it once caught a compiler bug so
-// it lives.
-func checkInitialized(pb *GoTest, t *testing.T) {
-	if pb.F_BoolDefaulted != nil {
-		t.Error("New or Reset did not set boolean:", *pb.F_BoolDefaulted)
-	}
-	if pb.F_Int32Defaulted != nil {
-		t.Error("New or Reset did not set int32:", *pb.F_Int32Defaulted)
-	}
-	if pb.F_Int64Defaulted != nil {
-		t.Error("New or Reset did not set int64:", *pb.F_Int64Defaulted)
-	}
-	if pb.F_Fixed32Defaulted != nil {
-		t.Error("New or Reset did not set fixed32:", *pb.F_Fixed32Defaulted)
-	}
-	if pb.F_Fixed64Defaulted != nil {
-		t.Error("New or Reset did not set fixed64:", *pb.F_Fixed64Defaulted)
-	}
-	if pb.F_Uint32Defaulted != nil {
-		t.Error("New or Reset did not set uint32:", *pb.F_Uint32Defaulted)
-	}
-	if pb.F_Uint64Defaulted != nil {
-		t.Error("New or Reset did not set uint64:", *pb.F_Uint64Defaulted)
-	}
-	if pb.F_FloatDefaulted != nil {
-		t.Error("New or Reset did not set float:", *pb.F_FloatDefaulted)
-	}
-	if pb.F_DoubleDefaulted != nil {
-		t.Error("New or Reset did not set double:", *pb.F_DoubleDefaulted)
-	}
-	if pb.F_StringDefaulted != nil {
-		t.Error("New or Reset did not set string:", *pb.F_StringDefaulted)
-	}
-	if pb.F_BytesDefaulted != nil {
-		t.Error("New or Reset did not set bytes:", string(pb.F_BytesDefaulted))
-	}
-	if pb.F_Sint32Defaulted != nil {
-		t.Error("New or Reset did not set int32:", *pb.F_Sint32Defaulted)
-	}
-	if pb.F_Sint64Defaulted != nil {
-		t.Error("New or Reset did not set int64:", *pb.F_Sint64Defaulted)
-	}
-}
-
-// Does Reset() reset?
-func TestReset(t *testing.T) {
-	pb := initGoTest(true)
-	// muck with some values
-	pb.F_BoolDefaulted = Bool(false)
-	pb.F_Int32Defaulted = Int32(237)
-	pb.F_Int64Defaulted = Int64(12346)
-	pb.F_Fixed32Defaulted = Uint32(32000)
-	pb.F_Fixed64Defaulted = Uint64(666)
-	pb.F_Uint32Defaulted = Uint32(323232)
-	pb.F_Uint64Defaulted = nil
-	pb.F_FloatDefaulted = nil
-	pb.F_DoubleDefaulted = Float64(0)
-	pb.F_StringDefaulted = String("gotcha")
-	pb.F_BytesDefaulted = []byte("asdfasdf")
-	pb.F_Sint32Defaulted = Int32(123)
-	pb.F_Sint64Defaulted = Int64(789)
-	pb.Reset()
-	checkInitialized(pb, t)
-}
-
-// All required fields set, no defaults provided.
-func TestEncodeDecode1(t *testing.T) {
-	pb := initGoTest(false)
-	overify(t, pb,
-		"0807"+ // field 1, encoding 0, value 7
-			"220d"+"0a056c6162656c120474797065"+ // field 4, encoding 2 (GoTestField)
-			"5001"+ // field 10, encoding 0, value 1
-			"5803"+ // field 11, encoding 0, value 3
-			"6006"+ // field 12, encoding 0, value 6
-			"6d20000000"+ // field 13, encoding 5, value 0x20
-			"714000000000000000"+ // field 14, encoding 1, value 0x40
-			"78a019"+ // field 15, encoding 0, value 0xca0 = 3232
-			"8001c032"+ // field 16, encoding 0, value 0x1940 = 6464
-			"8d0100004a45"+ // field 17, encoding 5, value 3232.0
-			"9101000000000040b940"+ // field 18, encoding 1, value 6464.0
-			"9a0106"+"737472696e67"+ // field 19, encoding 2, string "string"
-			"b304"+ // field 70, encoding 3, start group
-			"ba0408"+"7265717569726564"+ // field 71, encoding 2, string "required"
-			"b404"+ // field 70, encoding 4, end group
-			"aa0605"+"6279746573"+ // field 101, encoding 2, string "bytes"
-			"b0063f"+ // field 102, encoding 0, 0x3f zigzag32
-			"b8067f") // field 103, encoding 0, 0x7f zigzag64
-}
-
-// All required fields set, defaults provided.
-func TestEncodeDecode2(t *testing.T) {
-	pb := initGoTest(true)
-	overify(t, pb,
-		"0807"+ // field 1, encoding 0, value 7
-			"220d"+"0a056c6162656c120474797065"+ // field 4, encoding 2 (GoTestField)
-			"5001"+ // field 10, encoding 0, value 1
-			"5803"+ // field 11, encoding 0, value 3
-			"6006"+ // field 12, encoding 0, value 6
-			"6d20000000"+ // field 13, encoding 5, value 32
-			"714000000000000000"+ // field 14, encoding 1, value 64
-			"78a019"+ // field 15, encoding 0, value 3232
-			"8001c032"+ // field 16, encoding 0, value 6464
-			"8d0100004a45"+ // field 17, encoding 5, value 3232.0
-			"9101000000000040b940"+ // field 18, encoding 1, value 6464.0
-			"9a0106"+"737472696e67"+ // field 19, encoding 2 string "string"
-			"c00201"+ // field 40, encoding 0, value 1
-			"c80220"+ // field 41, encoding 0, value 32
-			"d00240"+ // field 42, encoding 0, value 64
-			"dd0240010000"+ // field 43, encoding 5, value 320
-			"e1028002000000000000"+ // field 44, encoding 1, value 640
-			"e8028019"+ // field 45, encoding 0, value 3200
-			"f0028032"+ // field 46, encoding 0, value 6400
-			"fd02e0659948"+ // field 47, encoding 5, value 314159.0
-			"81030000000050971041"+ // field 48, encoding 1, value 271828.0
-			"8a0310"+"68656c6c6f2c2022776f726c6421220a"+ // field 49, encoding 2 string "hello, \"world!\"\n"
-			"b304"+ // start group field 70 level 1
-			"ba0408"+"7265717569726564"+ // field 71, encoding 2, string "required"
-			"b404"+ // end group field 70 level 1
-			"aa0605"+"6279746573"+ // field 101, encoding 2 string "bytes"
-			"b0063f"+ // field 102, encoding 0, 0x3f zigzag32
-			"b8067f"+ // field 103, encoding 0, 0x7f zigzag64
-			"8a1907"+"4269676e6f7365"+ // field 401, encoding 2, string "Bignose"
-			"90193f"+ // field 402, encoding 0, value 63
-			"98197f") // field 403, encoding 0, value 127
-
-}
-
-// All default fields set to their default value by hand
-func TestEncodeDecode3(t *testing.T) {
-	pb := initGoTest(false)
-	pb.F_BoolDefaulted = Bool(true)
-	pb.F_Int32Defaulted = Int32(32)
-	pb.F_Int64Defaulted = Int64(64)
-	pb.F_Fixed32Defaulted = Uint32(320)
-	pb.F_Fixed64Defaulted = Uint64(640)
-	pb.F_Uint32Defaulted = Uint32(3200)
-	pb.F_Uint64Defaulted = Uint64(6400)
-	pb.F_FloatDefaulted = Float32(314159)
-	pb.F_DoubleDefaulted = Float64(271828)
-	pb.F_StringDefaulted = String("hello, \"world!\"\n")
-	pb.F_BytesDefaulted = []byte("Bignose")
-	pb.F_Sint32Defaulted = Int32(-32)
-	pb.F_Sint64Defaulted = Int64(-64)
-
-	overify(t, pb,
-		"0807"+ // field 1, encoding 0, value 7
-			"220d"+"0a056c6162656c120474797065"+ // field 4, encoding 2 (GoTestField)
-			"5001"+ // field 10, encoding 0, value 1
-			"5803"+ // field 11, encoding 0, value 3
-			"6006"+ // field 12, encoding 0, value 6
-			"6d20000000"+ // field 13, encoding 5, value 32
-			"714000000000000000"+ // field 14, encoding 1, value 64
-			"78a019"+ // field 15, encoding 0, value 3232
-			"8001c032"+ // field 16, encoding 0, value 6464
-			"8d0100004a45"+ // field 17, encoding 5, value 3232.0
-			"9101000000000040b940"+ // field 18, encoding 1, value 6464.0
-			"9a0106"+"737472696e67"+ // field 19, encoding 2 string "string"
-			"c00201"+ // field 40, encoding 0, value 1
-			"c80220"+ // field 41, encoding 0, value 32
-			"d00240"+ // field 42, encoding 0, value 64
-			"dd0240010000"+ // field 43, encoding 5, value 320
-			"e1028002000000000000"+ // field 44, encoding 1, value 640
-			"e8028019"+ // field 45, encoding 0, value 3200
-			"f0028032"+ // field 46, encoding 0, value 6400
-			"fd02e0659948"+ // field 47, encoding 5, value 314159.0
-			"81030000000050971041"+ // field 48, encoding 1, value 271828.0
-			"8a0310"+"68656c6c6f2c2022776f726c6421220a"+ // field 49, encoding 2 string "hello, \"world!\"\n"
-			"b304"+ // start group field 70 level 1
-			"ba0408"+"7265717569726564"+ // field 71, encoding 2, string "required"
-			"b404"+ // end group field 70 level 1
-			"aa0605"+"6279746573"+ // field 101, encoding 2 string "bytes"
-			"b0063f"+ // field 102, encoding 0, 0x3f zigzag32
-			"b8067f"+ // field 103, encoding 0, 0x7f zigzag64
-			"8a1907"+"4269676e6f7365"+ // field 401, encoding 2, string "Bignose"
-			"90193f"+ // field 402, encoding 0, value 63
-			"98197f") // field 403, encoding 0, value 127
-
-}
-
-// All required fields set, defaults provided, all non-defaulted optional fields have values.
-func TestEncodeDecode4(t *testing.T) {
-	pb := initGoTest(true)
-	pb.Table = String("hello")
-	pb.Param = Int32(7)
-	pb.OptionalField = initGoTestField()
-	pb.F_BoolOptional = Bool(true)
-	pb.F_Int32Optional = Int32(32)
-	pb.F_Int64Optional = Int64(64)
-	pb.F_Fixed32Optional = Uint32(3232)
-	pb.F_Fixed64Optional = Uint64(6464)
-	pb.F_Uint32Optional = Uint32(323232)
-	pb.F_Uint64Optional = Uint64(646464)
-	pb.F_FloatOptional = Float32(32.)
-	pb.F_DoubleOptional = Float64(64.)
-	pb.F_StringOptional = String("hello")
-	pb.F_BytesOptional = []byte("Bignose")
-	pb.F_Sint32Optional = Int32(-32)
-	pb.F_Sint64Optional = Int64(-64)
-	pb.Optionalgroup = initGoTest_OptionalGroup()
-
-	overify(t, pb,
-		"0807"+ // field 1, encoding 0, value 7
-			"1205"+"68656c6c6f"+ // field 2, encoding 2, string "hello"
-			"1807"+ // field 3, encoding 0, value 7
-			"220d"+"0a056c6162656c120474797065"+ // field 4, encoding 2 (GoTestField)
-			"320d"+"0a056c6162656c120474797065"+ // field 6, encoding 2 (GoTestField)
-			"5001"+ // field 10, encoding 0, value 1
-			"5803"+ // field 11, encoding 0, value 3
-			"6006"+ // field 12, encoding 0, value 6
-			"6d20000000"+ // field 13, encoding 5, value 32
-			"714000000000000000"+ // field 14, encoding 1, value 64
-			"78a019"+ // field 15, encoding 0, value 3232
-			"8001c032"+ // field 16, encoding 0, value 6464
-			"8d0100004a45"+ // field 17, encoding 5, value 3232.0
-			"9101000000000040b940"+ // field 18, encoding 1, value 6464.0
-			"9a0106"+"737472696e67"+ // field 19, encoding 2 string "string"
-			"f00101"+ // field 30, encoding 0, value 1
-			"f80120"+ // field 31, encoding 0, value 32
-			"800240"+ // field 32, encoding 0, value 64
-			"8d02a00c0000"+ // field 33, encoding 5, value 3232
-			"91024019000000000000"+ // field 34, encoding 1, value 6464
-			"9802a0dd13"+ // field 35, encoding 0, value 323232
-			"a002c0ba27"+ // field 36, encoding 0, value 646464
-			"ad0200000042"+ // field 37, encoding 5, value 32.0
-			"b1020000000000005040"+ // field 38, encoding 1, value 64.0
-			"ba0205"+"68656c6c6f"+ // field 39, encoding 2, string "hello"
-			"c00201"+ // field 40, encoding 0, value 1
-			"c80220"+ // field 41, encoding 0, value 32
-			"d00240"+ // field 42, encoding 0, value 64
-			"dd0240010000"+ // field 43, encoding 5, value 320
-			"e1028002000000000000"+ // field 44, encoding 1, value 640
-			"e8028019"+ // field 45, encoding 0, value 3200
-			"f0028032"+ // field 46, encoding 0, value 6400
-			"fd02e0659948"+ // field 47, encoding 5, value 314159.0
-			"81030000000050971041"+ // field 48, encoding 1, value 271828.0
-			"8a0310"+"68656c6c6f2c2022776f726c6421220a"+ // field 49, encoding 2 string "hello, \"world!\"\n"
-			"b304"+ // start group field 70 level 1
-			"ba0408"+"7265717569726564"+ // field 71, encoding 2, string "required"
-			"b404"+ // end group field 70 level 1
-			"d305"+ // start group field 90 level 1
-			"da0508"+"6f7074696f6e616c"+ // field 91, encoding 2, string "optional"
-			"d405"+ // end group field 90 level 1
-			"aa0605"+"6279746573"+ // field 101, encoding 2 string "bytes"
-			"b0063f"+ // field 102, encoding 0, 0x3f zigzag32
-			"b8067f"+ // field 103, encoding 0, 0x7f zigzag64
-			"ea1207"+"4269676e6f7365"+ // field 301, encoding 2, string "Bignose"
-			"f0123f"+ // field 302, encoding 0, value 63
-			"f8127f"+ // field 303, encoding 0, value 127
-			"8a1907"+"4269676e6f7365"+ // field 401, encoding 2, string "Bignose"
-			"90193f"+ // field 402, encoding 0, value 63
-			"98197f") // field 403, encoding 0, value 127
-
-}
-
-// All required fields set, defaults provided, all repeated fields given two values.
-func TestEncodeDecode5(t *testing.T) {
-	pb := initGoTest(true)
-	pb.RepeatedField = []*GoTestField{initGoTestField(), initGoTestField()}
-	pb.F_BoolRepeated = []bool{false, true}
-	pb.F_Int32Repeated = []int32{32, 33}
-	pb.F_Int64Repeated = []int64{64, 65}
-	pb.F_Fixed32Repeated = []uint32{3232, 3333}
-	pb.F_Fixed64Repeated = []uint64{6464, 6565}
-	pb.F_Uint32Repeated = []uint32{323232, 333333}
-	pb.F_Uint64Repeated = []uint64{646464, 656565}
-	pb.F_FloatRepeated = []float32{32., 33.}
-	pb.F_DoubleRepeated = []float64{64., 65.}
-	pb.F_StringRepeated = []string{"hello", "sailor"}
-	pb.F_BytesRepeated = [][]byte{[]byte("big"), []byte("nose")}
-	pb.F_Sint32Repeated = []int32{32, -32}
-	pb.F_Sint64Repeated = []int64{64, -64}
-	pb.Repeatedgroup = []*GoTest_RepeatedGroup{initGoTest_RepeatedGroup(), initGoTest_RepeatedGroup()}
-
-	overify(t, pb,
-		"0807"+ // field 1, encoding 0, value 7
-			"220d"+"0a056c6162656c120474797065"+ // field 4, encoding 2 (GoTestField)
-			"2a0d"+"0a056c6162656c120474797065"+ // field 5, encoding 2 (GoTestField)
-			"2a0d"+"0a056c6162656c120474797065"+ // field 5, encoding 2 (GoTestField)
-			"5001"+ // field 10, encoding 0, value 1
-			"5803"+ // field 11, encoding 0, value 3
-			"6006"+ // field 12, encoding 0, value 6
-			"6d20000000"+ // field 13, encoding 5, value 32
-			"714000000000000000"+ // field 14, encoding 1, value 64
-			"78a019"+ // field 15, encoding 0, value 3232
-			"8001c032"+ // field 16, encoding 0, value 6464
-			"8d0100004a45"+ // field 17, encoding 5, value 3232.0
-			"9101000000000040b940"+ // field 18, encoding 1, value 6464.0
-			"9a0106"+"737472696e67"+ // field 19, encoding 2 string "string"
-			"a00100"+ // field 20, encoding 0, value 0
-			"a00101"+ // field 20, encoding 0, value 1
-			"a80120"+ // field 21, encoding 0, value 32
-			"a80121"+ // field 21, encoding 0, value 33
-			"b00140"+ // field 22, encoding 0, value 64
-			"b00141"+ // field 22, encoding 0, value 65
-			"bd01a00c0000"+ // field 23, encoding 5, value 3232
-			"bd01050d0000"+ // field 23, encoding 5, value 3333
-			"c1014019000000000000"+ // field 24, encoding 1, value 6464
-			"c101a519000000000000"+ // field 24, encoding 1, value 6565
-			"c801a0dd13"+ // field 25, encoding 0, value 323232
-			"c80195ac14"+ // field 25, encoding 0, value 333333
-			"d001c0ba27"+ // field 26, encoding 0, value 646464
-			"d001b58928"+ // field 26, encoding 0, value 656565
-			"dd0100000042"+ // field 27, encoding 5, value 32.0
-			"dd0100000442"+ // field 27, encoding 5, value 33.0
-			"e1010000000000005040"+ // field 28, encoding 1, value 64.0
-			"e1010000000000405040"+ // field 28, encoding 1, value 65.0
-			"ea0105"+"68656c6c6f"+ // field 29, encoding 2, string "hello"
-			"ea0106"+"7361696c6f72"+ // field 29, encoding 2, string "sailor"
-			"c00201"+ // field 40, encoding 0, value 1
-			"c80220"+ // field 41, encoding 0, value 32
-			"d00240"+ // field 42, encoding 0, value 64
-			"dd0240010000"+ // field 43, encoding 5, value 320
-			"e1028002000000000000"+ // field 44, encoding 1, value 640
-			"e8028019"+ // field 45, encoding 0, value 3200
-			"f0028032"+ // field 46, encoding 0, value 6400
-			"fd02e0659948"+ // field 47, encoding 5, value 314159.0
-			"81030000000050971041"+ // field 48, encoding 1, value 271828.0
-			"8a0310"+"68656c6c6f2c2022776f726c6421220a"+ // field 49, encoding 2 string "hello, \"world!\"\n"
-			"b304"+ // start group field 70 level 1
-			"ba0408"+"7265717569726564"+ // field 71, encoding 2, string "required"
-			"b404"+ // end group field 70 level 1
-			"8305"+ // start group field 80 level 1
-			"8a0508"+"7265706561746564"+ // field 81, encoding 2, string "repeated"
-			"8405"+ // end group field 80 level 1
-			"8305"+ // start group field 80 level 1
-			"8a0508"+"7265706561746564"+ // field 81, encoding 2, string "repeated"
-			"8405"+ // end group field 80 level 1
-			"aa0605"+"6279746573"+ // field 101, encoding 2 string "bytes"
-			"b0063f"+ // field 102, encoding 0, 0x3f zigzag32
-			"b8067f"+ // field 103, encoding 0, 0x7f zigzag64
-			"ca0c03"+"626967"+ // field 201, encoding 2, string "big"
-			"ca0c04"+"6e6f7365"+ // field 201, encoding 2, string "nose"
-			"d00c40"+ // field 202, encoding 0, value 32
-			"d00c3f"+ // field 202, encoding 0, value -32
-			"d80c8001"+ // field 203, encoding 0, value 64
-			"d80c7f"+ // field 203, encoding 0, value -64
-			"8a1907"+"4269676e6f7365"+ // field 401, encoding 2, string "Bignose"
-			"90193f"+ // field 402, encoding 0, value 63
-			"98197f") // field 403, encoding 0, value 127
-
-}
-
-// All required fields set, all packed repeated fields given two values.
-func TestEncodeDecode6(t *testing.T) {
-	pb := initGoTest(false)
-	pb.F_BoolRepeatedPacked = []bool{false, true}
-	pb.F_Int32RepeatedPacked = []int32{32, 33}
-	pb.F_Int64RepeatedPacked = []int64{64, 65}
-	pb.F_Fixed32RepeatedPacked = []uint32{3232, 3333}
-	pb.F_Fixed64RepeatedPacked = []uint64{6464, 6565}
-	pb.F_Uint32RepeatedPacked = []uint32{323232, 333333}
-	pb.F_Uint64RepeatedPacked = []uint64{646464, 656565}
-	pb.F_FloatRepeatedPacked = []float32{32., 33.}
-	pb.F_DoubleRepeatedPacked = []float64{64., 65.}
-	pb.F_Sint32RepeatedPacked = []int32{32, -32}
-	pb.F_Sint64RepeatedPacked = []int64{64, -64}
-
-	overify(t, pb,
-		"0807"+ // field 1, encoding 0, value 7
-			"220d"+"0a056c6162656c120474797065"+ // field 4, encoding 2 (GoTestField)
-			"5001"+ // field 10, encoding 0, value 1
-			"5803"+ // field 11, encoding 0, value 3
-			"6006"+ // field 12, encoding 0, value 6
-			"6d20000000"+ // field 13, encoding 5, value 32
-			"714000000000000000"+ // field 14, encoding 1, value 64
-			"78a019"+ // field 15, encoding 0, value 3232
-			"8001c032"+ // field 16, encoding 0, value 6464
-			"8d0100004a45"+ // field 17, encoding 5, value 3232.0
-			"9101000000000040b940"+ // field 18, encoding 1, value 6464.0
-			"9a0106"+"737472696e67"+ // field 19, encoding 2 string "string"
-			"9203020001"+ // field 50, encoding 2, 2 bytes, value 0, value 1
-			"9a03022021"+ // field 51, encoding 2, 2 bytes, value 32, value 33
-			"a203024041"+ // field 52, encoding 2, 2 bytes, value 64, value 65
-			"aa0308"+ // field 53, encoding 2, 8 bytes
-			"a00c0000050d0000"+ // value 3232, value 3333
-			"b20310"+ // field 54, encoding 2, 16 bytes
-			"4019000000000000a519000000000000"+ // value 6464, value 6565
-			"ba0306"+ // field 55, encoding 2, 6 bytes
-			"a0dd1395ac14"+ // value 323232, value 333333
-			"c20306"+ // field 56, encoding 2, 6 bytes
-			"c0ba27b58928"+ // value 646464, value 656565
-			"ca0308"+ // field 57, encoding 2, 8 bytes
-			"0000004200000442"+ // value 32.0, value 33.0
-			"d20310"+ // field 58, encoding 2, 16 bytes
-			"00000000000050400000000000405040"+ // value 64.0, value 65.0
-			"b304"+ // start group field 70 level 1
-			"ba0408"+"7265717569726564"+ // field 71, encoding 2, string "required"
-			"b404"+ // end group field 70 level 1
-			"aa0605"+"6279746573"+ // field 101, encoding 2 string "bytes"
-			"b0063f"+ // field 102, encoding 0, 0x3f zigzag32
-			"b8067f"+ // field 103, encoding 0, 0x7f zigzag64
-			"b21f02"+ // field 502, encoding 2, 2 bytes
-			"403f"+ // value 32, value -32
-			"ba1f03"+ // field 503, encoding 2, 3 bytes
-			"80017f") // value 64, value -64
-}
-
-// Test that we can encode empty bytes fields.
-func TestEncodeDecodeBytes1(t *testing.T) {
-	pb := initGoTest(false)
-
-	// Create our bytes
-	pb.F_BytesRequired = []byte{}
-	pb.F_BytesRepeated = [][]byte{{}}
-	pb.F_BytesOptional = []byte{}
-
-	d, err := Marshal(pb)
-	if err != nil {
-		t.Error(err)
-	}
-
-	pbd := new(GoTest)
-	if err := Unmarshal(d, pbd); err != nil {
-		t.Error(err)
-	}
-
-	if pbd.F_BytesRequired == nil || len(pbd.F_BytesRequired) != 0 {
-		t.Error("required empty bytes field is incorrect")
-	}
-	if pbd.F_BytesRepeated == nil || len(pbd.F_BytesRepeated) == 1 && pbd.F_BytesRepeated[0] == nil {
-		t.Error("repeated empty bytes field is incorrect")
-	}
-	if pbd.F_BytesOptional == nil || len(pbd.F_BytesOptional) != 0 {
-		t.Error("optional empty bytes field is incorrect")
-	}
-}
-
-// Test that we encode nil-valued fields of a repeated bytes field correctly.
-// Since entries in a repeated field cannot be nil, nil must mean empty value.
-func TestEncodeDecodeBytes2(t *testing.T) {
-	pb := initGoTest(false)
-
-	// Create our bytes
-	pb.F_BytesRepeated = [][]byte{nil}
-
-	d, err := Marshal(pb)
-	if err != nil {
-		t.Error(err)
-	}
-
-	pbd := new(GoTest)
-	if err := Unmarshal(d, pbd); err != nil {
-		t.Error(err)
-	}
-
-	if len(pbd.F_BytesRepeated) != 1 || pbd.F_BytesRepeated[0] == nil {
-		t.Error("Unexpected value for repeated bytes field")
-	}
-}
-
-// All required fields set, defaults provided, all repeated fields given two values.
-func TestSkippingUnrecognizedFields(t *testing.T) {
-	o := old()
-	pb := initGoTestField()
-
-	// Marshal it normally.
-	o.Marshal(pb)
-
-	// Now new a GoSkipTest record.
-	skip := &GoSkipTest{
-		SkipInt32:   Int32(32),
-		SkipFixed32: Uint32(3232),
-		SkipFixed64: Uint64(6464),
-		SkipString:  String("skipper"),
-		Skipgroup: &GoSkipTest_SkipGroup{
-			GroupInt32:  Int32(75),
-			GroupString: String("wxyz"),
-		},
-	}
-
-	// Marshal it into same buffer.
-	o.Marshal(skip)
-
-	pbd := new(GoTestField)
-	o.Unmarshal(pbd)
-
-	// The __unrecognized field should be a marshaling of GoSkipTest
-	skipd := new(GoSkipTest)
-
-	o.SetBuf(pbd.XXX_unrecognized)
-	o.Unmarshal(skipd)
-
-	if *skipd.SkipInt32 != *skip.SkipInt32 {
-		t.Error("skip int32", skipd.SkipInt32)
-	}
-	if *skipd.SkipFixed32 != *skip.SkipFixed32 {
-		t.Error("skip fixed32", skipd.SkipFixed32)
-	}
-	if *skipd.SkipFixed64 != *skip.SkipFixed64 {
-		t.Error("skip fixed64", skipd.SkipFixed64)
-	}
-	if *skipd.SkipString != *skip.SkipString {
-		t.Error("skip string", *skipd.SkipString)
-	}
-	if *skipd.Skipgroup.GroupInt32 != *skip.Skipgroup.GroupInt32 {
-		t.Error("skip group int32", skipd.Skipgroup.GroupInt32)
-	}
-	if *skipd.Skipgroup.GroupString != *skip.Skipgroup.GroupString {
-		t.Error("skip group string", *skipd.Skipgroup.GroupString)
-	}
-}
-
-// Check that unrecognized fields of a submessage are preserved.
-func TestSubmessageUnrecognizedFields(t *testing.T) {
-	nm := &NewMessage{
-		Nested: &NewMessage_Nested{
-			Name:      String("Nigel"),
-			FoodGroup: String("carbs"),
-		},
-	}
-	b, err := Marshal(nm)
-	if err != nil {
-		t.Fatalf("Marshal of NewMessage: %v", err)
-	}
-
-	// Unmarshal into an OldMessage.
-	om := new(OldMessage)
-	if err := Unmarshal(b, om); err != nil {
-		t.Fatalf("Unmarshal to OldMessage: %v", err)
-	}
-	exp := &OldMessage{
-		Nested: &OldMessage_Nested{
-			Name: String("Nigel"),
-			// normal protocol buffer users should not do this
-			XXX_unrecognized: []byte("\x12\x05carbs"),
-		},
-	}
-	if !Equal(om, exp) {
-		t.Errorf("om = %v, want %v", om, exp)
-	}
-
-	// Clone the OldMessage.
-	om = Clone(om).(*OldMessage)
-	if !Equal(om, exp) {
-		t.Errorf("Clone(om) = %v, want %v", om, exp)
-	}
-
-	// Marshal the OldMessage, then unmarshal it into an empty NewMessage.
-	if b, err = Marshal(om); err != nil {
-		t.Fatalf("Marshal of OldMessage: %v", err)
-	}
-	t.Logf("Marshal(%v) -> %q", om, b)
-	nm2 := new(NewMessage)
-	if err := Unmarshal(b, nm2); err != nil {
-		t.Fatalf("Unmarshal to NewMessage: %v", err)
-	}
-	if !Equal(nm, nm2) {
-		t.Errorf("NewMessage round-trip: %v => %v", nm, nm2)
-	}
-}
-
-// Check that an int32 field can be upgraded to an int64 field.
-func TestNegativeInt32(t *testing.T) {
-	om := &OldMessage{
-		Num: Int32(-1),
-	}
-	b, err := Marshal(om)
-	if err != nil {
-		t.Fatalf("Marshal of OldMessage: %v", err)
-	}
-
-	// Check the size. It should be 11 bytes;
-	// 1 for the field/wire type, and 10 for the negative number.
-	if len(b) != 11 {
-		t.Errorf("%v marshaled as %q, wanted 11 bytes", om, b)
-	}
-
-	// Unmarshal into a NewMessage.
-	nm := new(NewMessage)
-	if err := Unmarshal(b, nm); err != nil {
-		t.Fatalf("Unmarshal to NewMessage: %v", err)
-	}
-	want := &NewMessage{
-		Num: Int64(-1),
-	}
-	if !Equal(nm, want) {
-		t.Errorf("nm = %v, want %v", nm, want)
-	}
-}
-
-// Check that we can grow an array (repeated field) to have many elements.
-// This test doesn't depend only on our encoding; for variety, it makes sure
-// we create, encode, and decode the correct contents explicitly.  It's therefore
-// a bit messier.
-// This test also uses (and hence tests) the Marshal/Unmarshal functions
-// instead of the methods.
-func TestBigRepeated(t *testing.T) {
-	pb := initGoTest(true)
-
-	// Create the arrays
-	const N = 50 // Internally the library starts much smaller.
-	pb.Repeatedgroup = make([]*GoTest_RepeatedGroup, N)
-	pb.F_Sint64Repeated = make([]int64, N)
-	pb.F_Sint32Repeated = make([]int32, N)
-	pb.F_BytesRepeated = make([][]byte, N)
-	pb.F_StringRepeated = make([]string, N)
-	pb.F_DoubleRepeated = make([]float64, N)
-	pb.F_FloatRepeated = make([]float32, N)
-	pb.F_Uint64Repeated = make([]uint64, N)
-	pb.F_Uint32Repeated = make([]uint32, N)
-	pb.F_Fixed64Repeated = make([]uint64, N)
-	pb.F_Fixed32Repeated = make([]uint32, N)
-	pb.F_Int64Repeated = make([]int64, N)
-	pb.F_Int32Repeated = make([]int32, N)
-	pb.F_BoolRepeated = make([]bool, N)
-	pb.RepeatedField = make([]*GoTestField, N)
-
-	// Fill in the arrays with checkable values.
-	igtf := initGoTestField()
-	igtrg := initGoTest_RepeatedGroup()
-	for i := 0; i < N; i++ {
-		pb.Repeatedgroup[i] = igtrg
-		pb.F_Sint64Repeated[i] = int64(i)
-		pb.F_Sint32Repeated[i] = int32(i)
-		s := fmt.Sprint(i)
-		pb.F_BytesRepeated[i] = []byte(s)
-		pb.F_StringRepeated[i] = s
-		pb.F_DoubleRepeated[i] = float64(i)
-		pb.F_FloatRepeated[i] = float32(i)
-		pb.F_Uint64Repeated[i] = uint64(i)
-		pb.F_Uint32Repeated[i] = uint32(i)
-		pb.F_Fixed64Repeated[i] = uint64(i)
-		pb.F_Fixed32Repeated[i] = uint32(i)
-		pb.F_Int64Repeated[i] = int64(i)
-		pb.F_Int32Repeated[i] = int32(i)
-		pb.F_BoolRepeated[i] = i%2 == 0
-		pb.RepeatedField[i] = igtf
-	}
-
-	// Marshal.
-	buf, _ := Marshal(pb)
-
-	// Now test Unmarshal by recreating the original buffer.
-	pbd := new(GoTest)
-	Unmarshal(buf, pbd)
-
-	// Check the checkable values
-	for i := uint64(0); i < N; i++ {
-		if pbd.Repeatedgroup[i] == nil { // TODO: more checking?
-			t.Error("pbd.Repeatedgroup bad")
-		}
-		var x uint64
-		x = uint64(pbd.F_Sint64Repeated[i])
-		if x != i {
-			t.Error("pbd.F_Sint64Repeated bad", x, i)
-		}
-		x = uint64(pbd.F_Sint32Repeated[i])
-		if x != i {
-			t.Error("pbd.F_Sint32Repeated bad", x, i)
-		}
-		s := fmt.Sprint(i)
-		equalbytes(pbd.F_BytesRepeated[i], []byte(s), t)
-		if pbd.F_StringRepeated[i] != s {
-			t.Error("pbd.F_Sint32Repeated bad", pbd.F_StringRepeated[i], i)
-		}
-		x = uint64(pbd.F_DoubleRepeated[i])
-		if x != i {
-			t.Error("pbd.F_DoubleRepeated bad", x, i)
-		}
-		x = uint64(pbd.F_FloatRepeated[i])
-		if x != i {
-			t.Error("pbd.F_FloatRepeated bad", x, i)
-		}
-		x = pbd.F_Uint64Repeated[i]
-		if x != i {
-			t.Error("pbd.F_Uint64Repeated bad", x, i)
-		}
-		x = uint64(pbd.F_Uint32Repeated[i])
-		if x != i {
-			t.Error("pbd.F_Uint32Repeated bad", x, i)
-		}
-		x = pbd.F_Fixed64Repeated[i]
-		if x != i {
-			t.Error("pbd.F_Fixed64Repeated bad", x, i)
-		}
-		x = uint64(pbd.F_Fixed32Repeated[i])
-		if x != i {
-			t.Error("pbd.F_Fixed32Repeated bad", x, i)
-		}
-		x = uint64(pbd.F_Int64Repeated[i])
-		if x != i {
-			t.Error("pbd.F_Int64Repeated bad", x, i)
-		}
-		x = uint64(pbd.F_Int32Repeated[i])
-		if x != i {
-			t.Error("pbd.F_Int32Repeated bad", x, i)
-		}
-		if pbd.F_BoolRepeated[i] != (i%2 == 0) {
-			t.Error("pbd.F_BoolRepeated bad", x, i)
-		}
-		if pbd.RepeatedField[i] == nil { // TODO: more checking?
-			t.Error("pbd.RepeatedField bad")
-		}
-	}
-}
-
-// Verify we give a useful message when decoding to the wrong structure type.
-func TestTypeMismatch(t *testing.T) {
-	pb1 := initGoTest(true)
-
-	// Marshal
-	o := old()
-	o.Marshal(pb1)
-
-	// Now Unmarshal it to the wrong type.
-	pb2 := initGoTestField()
-	err := o.Unmarshal(pb2)
-	if err == nil {
-		t.Error("expected error, got no error")
-	} else if !strings.Contains(err.Error(), "bad wiretype") {
-		t.Error("expected bad wiretype error, got", err)
-	}
-}
-
-func encodeDecode(t *testing.T, in, out Message, msg string) {
-	buf, err := Marshal(in)
-	if err != nil {
-		t.Fatalf("failed marshaling %v: %v", msg, err)
-	}
-	if err := Unmarshal(buf, out); err != nil {
-		t.Fatalf("failed unmarshaling %v: %v", msg, err)
-	}
-}
-
-func TestPackedNonPackedDecoderSwitching(t *testing.T) {
-	np, p := new(NonPackedTest), new(PackedTest)
-
-	// non-packed -> packed
-	np.A = []int32{0, 1, 1, 2, 3, 5}
-	encodeDecode(t, np, p, "non-packed -> packed")
-	if !reflect.DeepEqual(np.A, p.B) {
-		t.Errorf("failed non-packed -> packed; np.A=%+v, p.B=%+v", np.A, p.B)
-	}
-
-	// packed -> non-packed
-	np.Reset()
-	p.B = []int32{3, 1, 4, 1, 5, 9}
-	encodeDecode(t, p, np, "packed -> non-packed")
-	if !reflect.DeepEqual(p.B, np.A) {
-		t.Errorf("failed packed -> non-packed; p.B=%+v, np.A=%+v", p.B, np.A)
-	}
-}
-
-func TestProto1RepeatedGroup(t *testing.T) {
-	pb := &MessageList{
-		Message: []*MessageList_Message{
-			{
-				Name:  String("blah"),
-				Count: Int32(7),
-			},
-			// NOTE: pb.Message[1] is a nil
-			nil,
-		},
-	}
-
-	o := old()
-	err := o.Marshal(pb)
-	if err == nil || !strings.Contains(err.Error(), "repeated field Message has nil") {
-		t.Fatalf("unexpected or no error when marshaling: %v", err)
-	}
-}
-
-// Test that enums work.  Checks for a bug introduced by making enums
-// named types instead of int32: newInt32FromUint64 would crash with
-// a type mismatch in reflect.PointTo.
-func TestEnum(t *testing.T) {
-	pb := new(GoEnum)
-	pb.Foo = FOO_FOO1.Enum()
-	o := old()
-	if err := o.Marshal(pb); err != nil {
-		t.Fatal("error encoding enum:", err)
-	}
-	pb1 := new(GoEnum)
-	if err := o.Unmarshal(pb1); err != nil {
-		t.Fatal("error decoding enum:", err)
-	}
-	if *pb1.Foo != FOO_FOO1 {
-		t.Error("expected 7 but got ", *pb1.Foo)
-	}
-}
-
-// Enum types have String methods. Check that enum fields can be printed.
-// We don't care what the value actually is, just as long as it doesn't crash.
-func TestPrintingNilEnumFields(t *testing.T) {
-	pb := new(GoEnum)
-	_ = fmt.Sprintf("%+v", pb)
-}
-
-// Verify that absent required fields cause Marshal/Unmarshal to return errors.
-func TestRequiredFieldEnforcement(t *testing.T) {
-	pb := new(GoTestField)
-	_, err := Marshal(pb)
-	if err == nil {
-		t.Error("marshal: expected error, got nil")
-	} else if strings.Index(err.Error(), "Label") < 0 {
-		t.Errorf("marshal: bad error type: %v", err)
-	}
-
-	// A slightly sneaky, yet valid, proto. It encodes the same required field twice,
-	// so simply counting the required fields is insufficient.
-	// field 1, encoding 2, value "hi"
-	buf := []byte("\x0A\x02hi\x0A\x02hi")
-	err = Unmarshal(buf, pb)
-	if err == nil {
-		t.Error("unmarshal: expected error, got nil")
-	} else if strings.Index(err.Error(), "{Unknown}") < 0 {
-		t.Errorf("unmarshal: bad error type: %v", err)
-	}
-}
-
-func TestTypedNilMarshal(t *testing.T) {
-	// A typed nil should return ErrNil and not crash.
-	_, err := Marshal((*GoEnum)(nil))
-	if err != ErrNil {
-		t.Errorf("Marshal: got err %v, want ErrNil", err)
-	}
-}
-
-// A type that implements the Marshaler interface, but is not nillable.
-type nonNillableInt uint64
-
-func (nni nonNillableInt) Marshal() ([]byte, error) {
-	return EncodeVarint(uint64(nni)), nil
-}
-
-type NNIMessage struct {
-	nni nonNillableInt
-}
-
-func (*NNIMessage) Reset()         {}
-func (*NNIMessage) String() string { return "" }
-func (*NNIMessage) ProtoMessage()  {}
-
-// A type that implements the Marshaler interface and is nillable.
-type nillableMessage struct {
-	x uint64
-}
-
-func (nm *nillableMessage) Marshal() ([]byte, error) {
-	return EncodeVarint(nm.x), nil
-}
-
-type NMMessage struct {
-	nm *nillableMessage
-}
-
-func (*NMMessage) Reset()         {}
-func (*NMMessage) String() string { return "" }
-func (*NMMessage) ProtoMessage()  {}
-
-// Verify a type that uses the Marshaler interface, but has a nil pointer.
-func TestNilMarshaler(t *testing.T) {
-	// Try a struct with a Marshaler field that is nil.
-	// It should be directly marshable.
-	nmm := new(NMMessage)
-	if _, err := Marshal(nmm); err != nil {
-		t.Error("unexpected error marshaling nmm: ", err)
-	}
-
-	// Try a struct with a Marshaler field that is not nillable.
-	nnim := new(NNIMessage)
-	nnim.nni = 7
-	var _ Marshaler = nnim.nni // verify it is truly a Marshaler
-	if _, err := Marshal(nnim); err != nil {
-		t.Error("unexpected error marshaling nnim: ", err)
-	}
-}
-
-func TestAllSetDefaults(t *testing.T) {
-	// Exercise SetDefaults with all scalar field types.
-	m := &Defaults{
-		// NaN != NaN, so override that here.
-		F_Nan: Float32(1.7),
-	}
-	expected := &Defaults{
-		F_Bool:    Bool(true),
-		F_Int32:   Int32(32),
-		F_Int64:   Int64(64),
-		F_Fixed32: Uint32(320),
-		F_Fixed64: Uint64(640),
-		F_Uint32:  Uint32(3200),
-		F_Uint64:  Uint64(6400),
-		F_Float:   Float32(314159),
-		F_Double:  Float64(271828),
-		F_String:  String(`hello, "world!"` + "\n"),
-		F_Bytes:   []byte("Bignose"),
-		F_Sint32:  Int32(-32),
-		F_Sint64:  Int64(-64),
-		F_Enum:    Defaults_GREEN.Enum(),
-		F_Pinf:    Float32(float32(math.Inf(1))),
-		F_Ninf:    Float32(float32(math.Inf(-1))),
-		F_Nan:     Float32(1.7),
-		StrZero:   String(""),
-	}
-	SetDefaults(m)
-	if !Equal(m, expected) {
-		t.Errorf("SetDefaults failed\n got %v\nwant %v", m, expected)
-	}
-}
-
-func TestSetDefaultsWithSetField(t *testing.T) {
-	// Check that a set value is not overridden.
-	m := &Defaults{
-		F_Int32: Int32(12),
-	}
-	SetDefaults(m)
-	if v := m.GetF_Int32(); v != 12 {
-		t.Errorf("m.FInt32 = %v, want 12", v)
-	}
-}
-
-func TestSetDefaultsWithSubMessage(t *testing.T) {
-	m := &OtherMessage{
-		Key: Int64(123),
-		Inner: &InnerMessage{
-			Host: String("gopher"),
-		},
-	}
-	expected := &OtherMessage{
-		Key: Int64(123),
-		Inner: &InnerMessage{
-			Host: String("gopher"),
-			Port: Int32(4000),
-		},
-	}
-	SetDefaults(m)
-	if !Equal(m, expected) {
-		t.Errorf("\n got %v\nwant %v", m, expected)
-	}
-}
-
-func TestSetDefaultsWithRepeatedSubMessage(t *testing.T) {
-	m := &MyMessage{
-		RepInner: []*InnerMessage{{}},
-	}
-	expected := &MyMessage{
-		RepInner: []*InnerMessage{{
-			Port: Int32(4000),
-		}},
-	}
-	SetDefaults(m)
-	if !Equal(m, expected) {
-		t.Errorf("\n got %v\nwant %v", m, expected)
-	}
-}
-
-func TestSetDefaultWithRepeatedNonMessage(t *testing.T) {
-	m := &MyMessage{
-		Pet: []string{"turtle", "wombat"},
-	}
-	expected := Clone(m)
-	SetDefaults(m)
-	if !Equal(m, expected) {
-		t.Errorf("\n got %v\nwant %v", m, expected)
-	}
-}
-
-func TestMaximumTagNumber(t *testing.T) {
-	m := &MaxTag{
-		LastField: String("natural goat essence"),
-	}
-	buf, err := Marshal(m)
-	if err != nil {
-		t.Fatalf("proto.Marshal failed: %v", err)
-	}
-	m2 := new(MaxTag)
-	if err := Unmarshal(buf, m2); err != nil {
-		t.Fatalf("proto.Unmarshal failed: %v", err)
-	}
-	if got, want := m2.GetLastField(), *m.LastField; got != want {
-		t.Errorf("got %q, want %q", got, want)
-	}
-}
-
-func TestJSON(t *testing.T) {
-	m := &MyMessage{
-		Count: Int32(4),
-		Pet:   []string{"bunny", "kitty"},
-		Inner: &InnerMessage{
-			Host: String("cauchy"),
-		},
-		Bikeshed: MyMessage_GREEN.Enum(),
-	}
-	const expected = `{"count":4,"pet":["bunny","kitty"],"inner":{"host":"cauchy"},"bikeshed":1}`
-
-	b, err := json.Marshal(m)
-	if err != nil {
-		t.Fatalf("json.Marshal failed: %v", err)
-	}
-	s := string(b)
-	if s != expected {
-		t.Errorf("got  %s\nwant %s", s, expected)
-	}
-
-	received := new(MyMessage)
-	if err := json.Unmarshal(b, received); err != nil {
-		t.Fatalf("json.Unmarshal failed: %v", err)
-	}
-	if !Equal(received, m) {
-		t.Fatalf("got %s, want %s", received, m)
-	}
-
-	// Test unmarshalling of JSON with symbolic enum name.
-	const old = `{"count":4,"pet":["bunny","kitty"],"inner":{"host":"cauchy"},"bikeshed":"GREEN"}`
-	received.Reset()
-	if err := json.Unmarshal([]byte(old), received); err != nil {
-		t.Fatalf("json.Unmarshal failed: %v", err)
-	}
-	if !Equal(received, m) {
-		t.Fatalf("got %s, want %s", received, m)
-	}
-}
-
-func TestBadWireType(t *testing.T) {
-	b := []byte{7<<3 | 6} // field 7, wire type 6
-	pb := new(OtherMessage)
-	if err := Unmarshal(b, pb); err == nil {
-		t.Errorf("Unmarshal did not fail")
-	} else if !strings.Contains(err.Error(), "unknown wire type") {
-		t.Errorf("wrong error: %v", err)
-	}
-}
-
-func TestBytesWithInvalidLength(t *testing.T) {
-	// If a byte sequence has an invalid (negative) length, Unmarshal should not panic.
-	b := []byte{2<<3 | WireBytes, 0xff, 0xff, 0xff, 0xff, 0xff, 0}
-	Unmarshal(b, new(MyMessage))
-}
-
-func TestLengthOverflow(t *testing.T) {
-	// Overflowing a length should not panic.
-	b := []byte{2<<3 | WireBytes, 1, 1, 3<<3 | WireBytes, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x01}
-	Unmarshal(b, new(MyMessage))
-}
-
-func TestVarintOverflow(t *testing.T) {
-	// Overflowing a 64-bit length should not be allowed.
-	b := []byte{1<<3 | WireVarint, 0x01, 3<<3 | WireBytes, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x01}
-	if err := Unmarshal(b, new(MyMessage)); err == nil {
-		t.Fatalf("Overflowed uint64 length without error")
-	}
-}
-
-func TestUnmarshalFuzz(t *testing.T) {
-	const N = 1000
-	seed := time.Now().UnixNano()
-	t.Logf("RNG seed is %d", seed)
-	rng := rand.New(rand.NewSource(seed))
-	buf := make([]byte, 20)
-	for i := 0; i < N; i++ {
-		for j := range buf {
-			buf[j] = byte(rng.Intn(256))
-		}
-		fuzzUnmarshal(t, buf)
-	}
-}
-
-func TestMergeMessages(t *testing.T) {
-	pb := &MessageList{Message: []*MessageList_Message{{Name: String("x"), Count: Int32(1)}}}
-	data, err := Marshal(pb)
-	if err != nil {
-		t.Fatalf("Marshal: %v", err)
-	}
-
-	pb1 := new(MessageList)
-	if err := Unmarshal(data, pb1); err != nil {
-		t.Fatalf("first Unmarshal: %v", err)
-	}
-	if err := Unmarshal(data, pb1); err != nil {
-		t.Fatalf("second Unmarshal: %v", err)
-	}
-	if len(pb1.Message) != 1 {
-		t.Errorf("two Unmarshals produced %d Messages, want 1", len(pb1.Message))
-	}
-
-	pb2 := new(MessageList)
-	if err := UnmarshalMerge(data, pb2); err != nil {
-		t.Fatalf("first UnmarshalMerge: %v", err)
-	}
-	if err := UnmarshalMerge(data, pb2); err != nil {
-		t.Fatalf("second UnmarshalMerge: %v", err)
-	}
-	if len(pb2.Message) != 2 {
-		t.Errorf("two UnmarshalMerges produced %d Messages, want 2", len(pb2.Message))
-	}
-}
-
-func TestExtensionMarshalOrder(t *testing.T) {
-	m := &MyMessage{Count: Int(123)}
-	if err := SetExtension(m, E_Ext_More, &Ext{Data: String("alpha")}); err != nil {
-		t.Fatalf("SetExtension: %v", err)
-	}
-	if err := SetExtension(m, E_Ext_Text, String("aleph")); err != nil {
-		t.Fatalf("SetExtension: %v", err)
-	}
-	if err := SetExtension(m, E_Ext_Number, Int32(1)); err != nil {
-		t.Fatalf("SetExtension: %v", err)
-	}
-
-	// Serialize m several times, and check we get the same bytes each time.
-	var orig []byte
-	for i := 0; i < 100; i++ {
-		b, err := Marshal(m)
-		if err != nil {
-			t.Fatalf("Marshal: %v", err)
-		}
-		if i == 0 {
-			orig = b
-			continue
-		}
-		if !bytes.Equal(b, orig) {
-			t.Errorf("Bytes differ on attempt #%d", i)
-		}
-	}
-}
-
-// Many extensions, because small maps might not iterate differently on each iteration.
-var exts = []*ExtensionDesc{
-	E_X201,
-	E_X202,
-	E_X203,
-	E_X204,
-	E_X205,
-	E_X206,
-	E_X207,
-	E_X208,
-	E_X209,
-	E_X210,
-	E_X211,
-	E_X212,
-	E_X213,
-	E_X214,
-	E_X215,
-	E_X216,
-	E_X217,
-	E_X218,
-	E_X219,
-	E_X220,
-	E_X221,
-	E_X222,
-	E_X223,
-	E_X224,
-	E_X225,
-	E_X226,
-	E_X227,
-	E_X228,
-	E_X229,
-	E_X230,
-	E_X231,
-	E_X232,
-	E_X233,
-	E_X234,
-	E_X235,
-	E_X236,
-	E_X237,
-	E_X238,
-	E_X239,
-	E_X240,
-	E_X241,
-	E_X242,
-	E_X243,
-	E_X244,
-	E_X245,
-	E_X246,
-	E_X247,
-	E_X248,
-	E_X249,
-	E_X250,
-}
-
-func TestMessageSetMarshalOrder(t *testing.T) {
-	m := &MyMessageSet{}
-	for _, x := range exts {
-		if err := SetExtension(m, x, &Empty{}); err != nil {
-			t.Fatalf("SetExtension: %v", err)
-		}
-	}
-
-	buf, err := Marshal(m)
-	if err != nil {
-		t.Fatalf("Marshal: %v", err)
-	}
-
-	// Serialize m several times, and check we get the same bytes each time.
-	for i := 0; i < 10; i++ {
-		b1, err := Marshal(m)
-		if err != nil {
-			t.Fatalf("Marshal: %v", err)
-		}
-		if !bytes.Equal(b1, buf) {
-			t.Errorf("Bytes differ on re-Marshal #%d", i)
-		}
-
-		m2 := &MyMessageSet{}
-		if err := Unmarshal(buf, m2); err != nil {
-			t.Errorf("Unmarshal: %v", err)
-		}
-		b2, err := Marshal(m2)
-		if err != nil {
-			t.Errorf("re-Marshal: %v", err)
-		}
-		if !bytes.Equal(b2, buf) {
-			t.Errorf("Bytes differ on round-trip #%d", i)
-		}
-	}
-}
-
-func TestUnmarshalMergesMessages(t *testing.T) {
-	// If a nested message occurs twice in the input,
-	// the fields should be merged when decoding.
-	a := &OtherMessage{
-		Key: Int64(123),
-		Inner: &InnerMessage{
-			Host: String("polhode"),
-			Port: Int32(1234),
-		},
-	}
-	aData, err := Marshal(a)
-	if err != nil {
-		t.Fatalf("Marshal(a): %v", err)
-	}
-	b := &OtherMessage{
-		Weight: Float32(1.2),
-		Inner: &InnerMessage{
-			Host:      String("herpolhode"),
-			Connected: Bool(true),
-		},
-	}
-	bData, err := Marshal(b)
-	if err != nil {
-		t.Fatalf("Marshal(b): %v", err)
-	}
-	want := &OtherMessage{
-		Key:    Int64(123),
-		Weight: Float32(1.2),
-		Inner: &InnerMessage{
-			Host:      String("herpolhode"),
-			Port:      Int32(1234),
-			Connected: Bool(true),
-		},
-	}
-	got := new(OtherMessage)
-	if err := Unmarshal(append(aData, bData...), got); err != nil {
-		t.Fatalf("Unmarshal: %v", err)
-	}
-	if !Equal(got, want) {
-		t.Errorf("\n got %v\nwant %v", got, want)
-	}
-}
-
-func TestEncodingSizes(t *testing.T) {
-	tests := []struct {
-		m Message
-		n int
-	}{
-		{&Defaults{F_Int32: Int32(math.MaxInt32)}, 6},
-		{&Defaults{F_Int32: Int32(math.MinInt32)}, 11},
-		{&Defaults{F_Uint32: Uint32(uint32(math.MaxInt32) + 1)}, 6},
-		{&Defaults{F_Uint32: Uint32(math.MaxUint32)}, 6},
-	}
-	for _, test := range tests {
-		b, err := Marshal(test.m)
-		if err != nil {
-			t.Errorf("Marshal(%v): %v", test.m, err)
-			continue
-		}
-		if len(b) != test.n {
-			t.Errorf("Marshal(%v) yielded %d bytes, want %d bytes", test.m, len(b), test.n)
-		}
-	}
-}
-
-func TestRequiredNotSetError(t *testing.T) {
-	pb := initGoTest(false)
-	pb.RequiredField.Label = nil
-	pb.F_Int32Required = nil
-	pb.F_Int64Required = nil
-
-	expected := "0807" + // field 1, encoding 0, value 7
-		"2206" + "120474797065" + // field 4, encoding 2 (GoTestField)
-		"5001" + // field 10, encoding 0, value 1
-		"6d20000000" + // field 13, encoding 5, value 0x20
-		"714000000000000000" + // field 14, encoding 1, value 0x40
-		"78a019" + // field 15, encoding 0, value 0xca0 = 3232
-		"8001c032" + // field 16, encoding 0, value 0x1940 = 6464
-		"8d0100004a45" + // field 17, encoding 5, value 3232.0
-		"9101000000000040b940" + // field 18, encoding 1, value 6464.0
-		"9a0106" + "737472696e67" + // field 19, encoding 2, string "string"
-		"b304" + // field 70, encoding 3, start group
-		"ba0408" + "7265717569726564" + // field 71, encoding 2, string "required"
-		"b404" + // field 70, encoding 4, end group
-		"aa0605" + "6279746573" + // field 101, encoding 2, string "bytes"
-		"b0063f" + // field 102, encoding 0, 0x3f zigzag32
-		"b8067f" // field 103, encoding 0, 0x7f zigzag64
-
-	o := old()
-	bytes, err := Marshal(pb)
-	if _, ok := err.(*RequiredNotSetError); !ok {
-		fmt.Printf("marshal-1 err = %v, want *RequiredNotSetError", err)
-		o.DebugPrint("", bytes)
-		t.Fatalf("expected = %s", expected)
-	}
-	if strings.Index(err.Error(), "RequiredField.Label") < 0 {
-		t.Errorf("marshal-1 wrong err msg: %v", err)
-	}
-	if !equal(bytes, expected, t) {
-		o.DebugPrint("neq 1", bytes)
-		t.Fatalf("expected = %s", expected)
-	}
-
-	// Now test Unmarshal by recreating the original buffer.
-	pbd := new(GoTest)
-	err = Unmarshal(bytes, pbd)
-	if _, ok := err.(*RequiredNotSetError); !ok {
-		t.Fatalf("unmarshal err = %v, want *RequiredNotSetError", err)
-		o.DebugPrint("", bytes)
-		t.Fatalf("string = %s", expected)
-	}
-	if strings.Index(err.Error(), "RequiredField.{Unknown}") < 0 {
-		t.Errorf("unmarshal wrong err msg: %v", err)
-	}
-	bytes, err = Marshal(pbd)
-	if _, ok := err.(*RequiredNotSetError); !ok {
-		t.Errorf("marshal-2 err = %v, want *RequiredNotSetError", err)
-		o.DebugPrint("", bytes)
-		t.Fatalf("string = %s", expected)
-	}
-	if strings.Index(err.Error(), "RequiredField.Label") < 0 {
-		t.Errorf("marshal-2 wrong err msg: %v", err)
-	}
-	if !equal(bytes, expected, t) {
-		o.DebugPrint("neq 2", bytes)
-		t.Fatalf("string = %s", expected)
-	}
-}
-
-func fuzzUnmarshal(t *testing.T, data []byte) {
-	defer func() {
-		if e := recover(); e != nil {
-			t.Errorf("These bytes caused a panic: %+v", data)
-			t.Logf("Stack:\n%s", debug.Stack())
-			t.FailNow()
-		}
-	}()
-
-	pb := new(MyMessage)
-	Unmarshal(data, pb)
-}
-
-func TestMapFieldMarshal(t *testing.T) {
-	m := &MessageWithMap{
-		NameMapping: map[int32]string{
-			1: "Rob",
-			4: "Ian",
-			8: "Dave",
-		},
-	}
-	b, err := Marshal(m)
-	if err != nil {
-		t.Fatalf("Marshal: %v", err)
-	}
-
-	// b should be the concatenation of these three byte sequences in some order.
-	parts := []string{
-		"\n\a\b\x01\x12\x03Rob",
-		"\n\a\b\x04\x12\x03Ian",
-		"\n\b\b\x08\x12\x04Dave",
-	}
-	ok := false
-	for i := range parts {
-		for j := range parts {
-			if j == i {
-				continue
-			}
-			for k := range parts {
-				if k == i || k == j {
-					continue
-				}
-				try := parts[i] + parts[j] + parts[k]
-				if bytes.Equal(b, []byte(try)) {
-					ok = true
-					break
-				}
-			}
-		}
-	}
-	if !ok {
-		t.Fatalf("Incorrect Marshal output.\n got %q\nwant %q (or a permutation of that)", b, parts[0]+parts[1]+parts[2])
-	}
-	t.Logf("FYI b: %q", b)
-
-	(new(Buffer)).DebugPrint("Dump of b", b)
-}
-
-func TestMapFieldRoundTrips(t *testing.T) {
-	m := &MessageWithMap{
-		NameMapping: map[int32]string{
-			1: "Rob",
-			4: "Ian",
-			8: "Dave",
-		},
-		MsgMapping: map[int64]*FloatingPoint{
-			0x7001: {F: Float64(2.0)},
-		},
-		ByteMapping: map[bool][]byte{
-			false: []byte("that's not right!"),
-			true:  []byte("aye, 'tis true!"),
-		},
-	}
-	b, err := Marshal(m)
-	if err != nil {
-		t.Fatalf("Marshal: %v", err)
-	}
-	t.Logf("FYI b: %q", b)
-	m2 := new(MessageWithMap)
-	if err := Unmarshal(b, m2); err != nil {
-		t.Fatalf("Unmarshal: %v", err)
-	}
-	for _, pair := range [][2]interface{}{
-		{m.NameMapping, m2.NameMapping},
-		{m.MsgMapping, m2.MsgMapping},
-		{m.ByteMapping, m2.ByteMapping},
-	} {
-		if !reflect.DeepEqual(pair[0], pair[1]) {
-			t.Errorf("Map did not survive a round trip.\ninitial: %v\n  final: %v", pair[0], pair[1])
-		}
-	}
-}
-
-func TestMapFieldWithNil(t *testing.T) {
-	m := &MessageWithMap{
-		MsgMapping: map[int64]*FloatingPoint{
-			1: nil,
-		},
-	}
-	b, err := Marshal(m)
-	if err == nil {
-		t.Fatalf("Marshal of bad map should have failed, got these bytes: %v", b)
-	}
-}
-
-// Benchmarks
-
-func testMsg() *GoTest {
-	pb := initGoTest(true)
-	const N = 1000 // Internally the library starts much smaller.
-	pb.F_Int32Repeated = make([]int32, N)
-	pb.F_DoubleRepeated = make([]float64, N)
-	for i := 0; i < N; i++ {
-		pb.F_Int32Repeated[i] = int32(i)
-		pb.F_DoubleRepeated[i] = float64(i)
-	}
-	return pb
-}
-
-func bytesMsg() *GoTest {
-	pb := initGoTest(true)
-	buf := make([]byte, 4000)
-	for i := range buf {
-		buf[i] = byte(i)
-	}
-	pb.F_BytesDefaulted = buf
-	return pb
-}
-
-func benchmarkMarshal(b *testing.B, pb Message, marshal func(Message) ([]byte, error)) {
-	d, _ := marshal(pb)
-	b.SetBytes(int64(len(d)))
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		marshal(pb)
-	}
-}
-
-func benchmarkBufferMarshal(b *testing.B, pb Message) {
-	p := NewBuffer(nil)
-	benchmarkMarshal(b, pb, func(pb0 Message) ([]byte, error) {
-		p.Reset()
-		err := p.Marshal(pb0)
-		return p.Bytes(), err
-	})
-}
-
-func benchmarkSize(b *testing.B, pb Message) {
-	benchmarkMarshal(b, pb, func(pb0 Message) ([]byte, error) {
-		Size(pb)
-		return nil, nil
-	})
-}
-
-func newOf(pb Message) Message {
-	in := reflect.ValueOf(pb)
-	if in.IsNil() {
-		return pb
-	}
-	return reflect.New(in.Type().Elem()).Interface().(Message)
-}
-
-func benchmarkUnmarshal(b *testing.B, pb Message, unmarshal func([]byte, Message) error) {
-	d, _ := Marshal(pb)
-	b.SetBytes(int64(len(d)))
-	pbd := newOf(pb)
-
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		unmarshal(d, pbd)
-	}
-}
-
-func benchmarkBufferUnmarshal(b *testing.B, pb Message) {
-	p := NewBuffer(nil)
-	benchmarkUnmarshal(b, pb, func(d []byte, pb0 Message) error {
-		p.SetBuf(d)
-		return p.Unmarshal(pb0)
-	})
-}
-
-// Benchmark{Marshal,BufferMarshal,Size,Unmarshal,BufferUnmarshal}{,Bytes}
-
-func BenchmarkMarshal(b *testing.B) {
-	benchmarkMarshal(b, testMsg(), Marshal)
-}
-
-func BenchmarkBufferMarshal(b *testing.B) {
-	benchmarkBufferMarshal(b, testMsg())
-}
-
-func BenchmarkSize(b *testing.B) {
-	benchmarkSize(b, testMsg())
-}
-
-func BenchmarkUnmarshal(b *testing.B) {
-	benchmarkUnmarshal(b, testMsg(), Unmarshal)
-}
-
-func BenchmarkBufferUnmarshal(b *testing.B) {
-	benchmarkBufferUnmarshal(b, testMsg())
-}
-
-func BenchmarkMarshalBytes(b *testing.B) {
-	benchmarkMarshal(b, bytesMsg(), Marshal)
-}
-
-func BenchmarkBufferMarshalBytes(b *testing.B) {
-	benchmarkBufferMarshal(b, bytesMsg())
-}
-
-func BenchmarkSizeBytes(b *testing.B) {
-	benchmarkSize(b, bytesMsg())
-}
-
-func BenchmarkUnmarshalBytes(b *testing.B) {
-	benchmarkUnmarshal(b, bytesMsg(), Unmarshal)
-}
-
-func BenchmarkBufferUnmarshalBytes(b *testing.B) {
-	benchmarkBufferUnmarshal(b, bytesMsg())
-}
-
-func BenchmarkUnmarshalUnrecognizedFields(b *testing.B) {
-	b.StopTimer()
-	pb := initGoTestField()
-	skip := &GoSkipTest{
-		SkipInt32:   Int32(32),
-		SkipFixed32: Uint32(3232),
-		SkipFixed64: Uint64(6464),
-		SkipString:  String("skipper"),
-		Skipgroup: &GoSkipTest_SkipGroup{
-			GroupInt32:  Int32(75),
-			GroupString: String("wxyz"),
-		},
-	}
-
-	pbd := new(GoTestField)
-	p := NewBuffer(nil)
-	p.Marshal(pb)
-	p.Marshal(skip)
-	p2 := NewBuffer(nil)
-
-	b.StartTimer()
-	for i := 0; i < b.N; i++ {
-		p2.SetBuf(p.Bytes())
-		p2.Unmarshal(pbd)
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/clone.go b/Godeps/_workspace/src/github.com/gogo/protobuf/proto/clone.go
deleted file mode 100644
index 57297947b..000000000
--- a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/clone.go
+++ /dev/null
@@ -1,217 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2011 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// 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.
-
-// Protocol buffer deep copy and merge.
-// TODO: MessageSet and RawMessage.
-
-package proto
-
-import (
-	"log"
-	"reflect"
-	"strings"
-)
-
-// Clone returns a deep copy of a protocol buffer.
-func Clone(pb Message) Message {
-	in := reflect.ValueOf(pb)
-	if in.IsNil() {
-		return pb
-	}
-
-	out := reflect.New(in.Type().Elem())
-	// out is empty so a merge is a deep copy.
-	mergeStruct(out.Elem(), in.Elem())
-	return out.Interface().(Message)
-}
-
-// Merge merges src into dst.
-// Required and optional fields that are set in src will be set to that value in dst.
-// Elements of repeated fields will be appended.
-// Merge panics if src and dst are not the same type, or if dst is nil.
-func Merge(dst, src Message) {
-	in := reflect.ValueOf(src)
-	out := reflect.ValueOf(dst)
-	if out.IsNil() {
-		panic("proto: nil destination")
-	}
-	if in.Type() != out.Type() {
-		// Explicit test prior to mergeStruct so that mistyped nils will fail
-		panic("proto: type mismatch")
-	}
-	if in.IsNil() {
-		// Merging nil into non-nil is a quiet no-op
-		return
-	}
-	mergeStruct(out.Elem(), in.Elem())
-}
-
-func mergeStruct(out, in reflect.Value) {
-	sprop := GetProperties(in.Type())
-	for i := 0; i < in.NumField(); i++ {
-		f := in.Type().Field(i)
-		if strings.HasPrefix(f.Name, "XXX_") {
-			continue
-		}
-		mergeAny(out.Field(i), in.Field(i), false, sprop.Prop[i])
-	}
-
-	if emIn, ok := in.Addr().Interface().(extensionsMap); ok {
-		emOut := out.Addr().Interface().(extensionsMap)
-		mergeExtension(emOut.ExtensionMap(), emIn.ExtensionMap())
-	} else if emIn, ok := in.Addr().Interface().(extensionsBytes); ok {
-		emOut := out.Addr().Interface().(extensionsBytes)
-		bIn := emIn.GetExtensions()
-		bOut := emOut.GetExtensions()
-		*bOut = append(*bOut, *bIn...)
-	}
-
-	uf := in.FieldByName("XXX_unrecognized")
-	if !uf.IsValid() {
-		return
-	}
-	uin := uf.Bytes()
-	if len(uin) > 0 {
-		out.FieldByName("XXX_unrecognized").SetBytes(append([]byte(nil), uin...))
-	}
-}
-
-// mergeAny performs a merge between two values of the same type.
-// viaPtr indicates whether the values were indirected through a pointer (implying proto2).
-// prop is set if this is a struct field (it may be nil).
-func mergeAny(out, in reflect.Value, viaPtr bool, prop *Properties) {
-	if in.Type() == protoMessageType {
-		if !in.IsNil() {
-			if out.IsNil() {
-				out.Set(reflect.ValueOf(Clone(in.Interface().(Message))))
-			} else {
-				Merge(out.Interface().(Message), in.Interface().(Message))
-			}
-		}
-		return
-	}
-	switch in.Kind() {
-	case reflect.Bool, reflect.Float32, reflect.Float64, reflect.Int32, reflect.Int64,
-		reflect.String, reflect.Uint32, reflect.Uint64:
-		if !viaPtr && isProto3Zero(in) {
-			return
-		}
-		out.Set(in)
-	case reflect.Map:
-		if in.Len() == 0 {
-			return
-		}
-		if out.IsNil() {
-			out.Set(reflect.MakeMap(in.Type()))
-		}
-		// For maps with value types of *T or []byte we need to deep copy each value.
-		elemKind := in.Type().Elem().Kind()
-		for _, key := range in.MapKeys() {
-			var val reflect.Value
-			switch elemKind {
-			case reflect.Ptr:
-				val = reflect.New(in.Type().Elem().Elem())
-				mergeAny(val, in.MapIndex(key), false, nil)
-			case reflect.Slice:
-				val = in.MapIndex(key)
-				val = reflect.ValueOf(append([]byte{}, val.Bytes()...))
-			default:
-				val = in.MapIndex(key)
-			}
-			out.SetMapIndex(key, val)
-		}
-	case reflect.Ptr:
-		if in.IsNil() {
-			return
-		}
-		if out.IsNil() {
-			out.Set(reflect.New(in.Elem().Type()))
-		}
-		mergeAny(out.Elem(), in.Elem(), true, nil)
-	case reflect.Slice:
-		if in.IsNil() {
-			return
-		}
-		if in.Type().Elem().Kind() == reflect.Uint8 {
-			// []byte is a scalar bytes field, not a repeated field.
-
-			// Edge case: if this is in a proto3 message, a zero length
-			// bytes field is considered the zero value, and should not
-			// be merged.
-			if prop != nil && prop.proto3 && in.Len() == 0 {
-				return
-			}
-
-			// Make a deep copy.
-			// Append to []byte{} instead of []byte(nil) so that we never end up
-			// with a nil result.
-			out.SetBytes(append([]byte{}, in.Bytes()...))
-			return
-		}
-		n := in.Len()
-		if out.IsNil() {
-			out.Set(reflect.MakeSlice(in.Type(), 0, n))
-		}
-		switch in.Type().Elem().Kind() {
-		case reflect.Bool, reflect.Float32, reflect.Float64, reflect.Int32, reflect.Int64,
-			reflect.String, reflect.Uint32, reflect.Uint64:
-			out.Set(reflect.AppendSlice(out, in))
-		default:
-			for i := 0; i < n; i++ {
-				x := reflect.Indirect(reflect.New(in.Type().Elem()))
-				mergeAny(x, in.Index(i), false, nil)
-				out.Set(reflect.Append(out, x))
-			}
-		}
-	case reflect.Struct:
-		mergeStruct(out, in)
-	default:
-		// unknown type, so not a protocol buffer
-		log.Printf("proto: don't know how to copy %v", in)
-	}
-}
-
-func mergeExtension(out, in map[int32]Extension) {
-	for extNum, eIn := range in {
-		eOut := Extension{desc: eIn.desc}
-		if eIn.value != nil {
-			v := reflect.New(reflect.TypeOf(eIn.value)).Elem()
-			mergeAny(v, reflect.ValueOf(eIn.value), false, nil)
-			eOut.value = v.Interface()
-		}
-		if eIn.enc != nil {
-			eOut.enc = make([]byte, len(eIn.enc))
-			copy(eOut.enc, eIn.enc)
-		}
-
-		out[extNum] = eOut
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/clone_test.go b/Godeps/_workspace/src/github.com/gogo/protobuf/proto/clone_test.go
deleted file mode 100644
index 7eef89ee0..000000000
--- a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/clone_test.go
+++ /dev/null
@@ -1,245 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2011 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// 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.
-
-package proto_test
-
-import (
-	"testing"
-
-	"github.com/gogo/protobuf/proto"
-
-	proto3pb "github.com/gogo/protobuf/proto/proto3_proto"
-	pb "github.com/gogo/protobuf/proto/testdata"
-)
-
-var cloneTestMessage = &pb.MyMessage{
-	Count: proto.Int32(42),
-	Name:  proto.String("Dave"),
-	Pet:   []string{"bunny", "kitty", "horsey"},
-	Inner: &pb.InnerMessage{
-		Host:      proto.String("niles"),
-		Port:      proto.Int32(9099),
-		Connected: proto.Bool(true),
-	},
-	Others: []*pb.OtherMessage{
-		{
-			Value: []byte("some bytes"),
-		},
-	},
-	Somegroup: &pb.MyMessage_SomeGroup{
-		GroupField: proto.Int32(6),
-	},
-	RepBytes: [][]byte{[]byte("sham"), []byte("wow")},
-}
-
-func init() {
-	ext := &pb.Ext{
-		Data: proto.String("extension"),
-	}
-	if err := proto.SetExtension(cloneTestMessage, pb.E_Ext_More, ext); err != nil {
-		panic("SetExtension: " + err.Error())
-	}
-}
-
-func TestClone(t *testing.T) {
-	m := proto.Clone(cloneTestMessage).(*pb.MyMessage)
-	if !proto.Equal(m, cloneTestMessage) {
-		t.Errorf("Clone(%v) = %v", cloneTestMessage, m)
-	}
-
-	// Verify it was a deep copy.
-	*m.Inner.Port++
-	if proto.Equal(m, cloneTestMessage) {
-		t.Error("Mutating clone changed the original")
-	}
-	// Byte fields and repeated fields should be copied.
-	if &m.Pet[0] == &cloneTestMessage.Pet[0] {
-		t.Error("Pet: repeated field not copied")
-	}
-	if &m.Others[0] == &cloneTestMessage.Others[0] {
-		t.Error("Others: repeated field not copied")
-	}
-	if &m.Others[0].Value[0] == &cloneTestMessage.Others[0].Value[0] {
-		t.Error("Others[0].Value: bytes field not copied")
-	}
-	if &m.RepBytes[0] == &cloneTestMessage.RepBytes[0] {
-		t.Error("RepBytes: repeated field not copied")
-	}
-	if &m.RepBytes[0][0] == &cloneTestMessage.RepBytes[0][0] {
-		t.Error("RepBytes[0]: bytes field not copied")
-	}
-}
-
-func TestCloneNil(t *testing.T) {
-	var m *pb.MyMessage
-	if c := proto.Clone(m); !proto.Equal(m, c) {
-		t.Errorf("Clone(%v) = %v", m, c)
-	}
-}
-
-var mergeTests = []struct {
-	src, dst, want proto.Message
-}{
-	{
-		src: &pb.MyMessage{
-			Count: proto.Int32(42),
-		},
-		dst: &pb.MyMessage{
-			Name: proto.String("Dave"),
-		},
-		want: &pb.MyMessage{
-			Count: proto.Int32(42),
-			Name:  proto.String("Dave"),
-		},
-	},
-	{
-		src: &pb.MyMessage{
-			Inner: &pb.InnerMessage{
-				Host:      proto.String("hey"),
-				Connected: proto.Bool(true),
-			},
-			Pet: []string{"horsey"},
-			Others: []*pb.OtherMessage{
-				{
-					Value: []byte("some bytes"),
-				},
-			},
-		},
-		dst: &pb.MyMessage{
-			Inner: &pb.InnerMessage{
-				Host: proto.String("niles"),
-				Port: proto.Int32(9099),
-			},
-			Pet: []string{"bunny", "kitty"},
-			Others: []*pb.OtherMessage{
-				{
-					Key: proto.Int64(31415926535),
-				},
-				{
-					// Explicitly test a src=nil field
-					Inner: nil,
-				},
-			},
-		},
-		want: &pb.MyMessage{
-			Inner: &pb.InnerMessage{
-				Host:      proto.String("hey"),
-				Connected: proto.Bool(true),
-				Port:      proto.Int32(9099),
-			},
-			Pet: []string{"bunny", "kitty", "horsey"},
-			Others: []*pb.OtherMessage{
-				{
-					Key: proto.Int64(31415926535),
-				},
-				{},
-				{
-					Value: []byte("some bytes"),
-				},
-			},
-		},
-	},
-	{
-		src: &pb.MyMessage{
-			RepBytes: [][]byte{[]byte("wow")},
-		},
-		dst: &pb.MyMessage{
-			Somegroup: &pb.MyMessage_SomeGroup{
-				GroupField: proto.Int32(6),
-			},
-			RepBytes: [][]byte{[]byte("sham")},
-		},
-		want: &pb.MyMessage{
-			Somegroup: &pb.MyMessage_SomeGroup{
-				GroupField: proto.Int32(6),
-			},
-			RepBytes: [][]byte{[]byte("sham"), []byte("wow")},
-		},
-	},
-	// Check that a scalar bytes field replaces rather than appends.
-	{
-		src:  &pb.OtherMessage{Value: []byte("foo")},
-		dst:  &pb.OtherMessage{Value: []byte("bar")},
-		want: &pb.OtherMessage{Value: []byte("foo")},
-	},
-	{
-		src: &pb.MessageWithMap{
-			NameMapping: map[int32]string{6: "Nigel"},
-			MsgMapping: map[int64]*pb.FloatingPoint{
-				0x4001: {F: proto.Float64(2.0)},
-			},
-			ByteMapping: map[bool][]byte{true: []byte("wowsa")},
-		},
-		dst: &pb.MessageWithMap{
-			NameMapping: map[int32]string{
-				6: "Bruce", // should be overwritten
-				7: "Andrew",
-			},
-		},
-		want: &pb.MessageWithMap{
-			NameMapping: map[int32]string{
-				6: "Nigel",
-				7: "Andrew",
-			},
-			MsgMapping: map[int64]*pb.FloatingPoint{
-				0x4001: {F: proto.Float64(2.0)},
-			},
-			ByteMapping: map[bool][]byte{true: []byte("wowsa")},
-		},
-	},
-	// proto3 shouldn't merge zero values,
-	// in the same way that proto2 shouldn't merge nils.
-	{
-		src: &proto3pb.Message{
-			Name: "Aaron",
-			Data: []byte(""), // zero value, but not nil
-		},
-		dst: &proto3pb.Message{
-			HeightInCm: 176,
-			Data:       []byte("texas!"),
-		},
-		want: &proto3pb.Message{
-			Name:       "Aaron",
-			HeightInCm: 176,
-			Data:       []byte("texas!"),
-		},
-	},
-}
-
-func TestMerge(t *testing.T) {
-	for _, m := range mergeTests {
-		got := proto.Clone(m.dst)
-		proto.Merge(got, m.src)
-		if !proto.Equal(got, m.want) {
-			t.Errorf("Merge(%v, %v)\n got %v\nwant %v\n", m.dst, m.src, got, m.want)
-		}
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/decode.go b/Godeps/_workspace/src/github.com/gogo/protobuf/proto/decode.go
deleted file mode 100644
index f7b1884b3..000000000
--- a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/decode.go
+++ /dev/null
@@ -1,832 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2010 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// 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.
-
-package proto
-
-/*
- * Routines for decoding protocol buffer data to construct in-memory representations.
- */
-
-import (
-	"errors"
-	"fmt"
-	"io"
-	"os"
-	"reflect"
-)
-
-// errOverflow is returned when an integer is too large to be represented.
-var errOverflow = errors.New("proto: integer overflow")
-
-// The fundamental decoders that interpret bytes on the wire.
-// Those that take integer types all return uint64 and are
-// therefore of type valueDecoder.
-
-// DecodeVarint reads a varint-encoded integer from the slice.
-// It returns the integer and the number of bytes consumed, or
-// zero if there is not enough.
-// This is the format for the
-// int32, int64, uint32, uint64, bool, and enum
-// protocol buffer types.
-func DecodeVarint(buf []byte) (x uint64, n int) {
-	// x, n already 0
-	for shift := uint(0); shift < 64; shift += 7 {
-		if n >= len(buf) {
-			return 0, 0
-		}
-		b := uint64(buf[n])
-		n++
-		x |= (b & 0x7F) << shift
-		if (b & 0x80) == 0 {
-			return x, n
-		}
-	}
-
-	// The number is too large to represent in a 64-bit value.
-	return 0, 0
-}
-
-// DecodeVarint reads a varint-encoded integer from the Buffer.
-// This is the format for the
-// int32, int64, uint32, uint64, bool, and enum
-// protocol buffer types.
-func (p *Buffer) DecodeVarint() (x uint64, err error) {
-	// x, err already 0
-
-	i := p.index
-	l := len(p.buf)
-
-	for shift := uint(0); shift < 64; shift += 7 {
-		if i >= l {
-			err = io.ErrUnexpectedEOF
-			return
-		}
-		b := p.buf[i]
-		i++
-		x |= (uint64(b) & 0x7F) << shift
-		if b < 0x80 {
-			p.index = i
-			return
-		}
-	}
-
-	// The number is too large to represent in a 64-bit value.
-	err = errOverflow
-	return
-}
-
-// DecodeFixed64 reads a 64-bit integer from the Buffer.
-// This is the format for the
-// fixed64, sfixed64, and double protocol buffer types.
-func (p *Buffer) DecodeFixed64() (x uint64, err error) {
-	// x, err already 0
-	i := p.index + 8
-	if i < 0 || i > len(p.buf) {
-		err = io.ErrUnexpectedEOF
-		return
-	}
-	p.index = i
-
-	x = uint64(p.buf[i-8])
-	x |= uint64(p.buf[i-7]) << 8
-	x |= uint64(p.buf[i-6]) << 16
-	x |= uint64(p.buf[i-5]) << 24
-	x |= uint64(p.buf[i-4]) << 32
-	x |= uint64(p.buf[i-3]) << 40
-	x |= uint64(p.buf[i-2]) << 48
-	x |= uint64(p.buf[i-1]) << 56
-	return
-}
-
-// DecodeFixed32 reads a 32-bit integer from the Buffer.
-// This is the format for the
-// fixed32, sfixed32, and float protocol buffer types.
-func (p *Buffer) DecodeFixed32() (x uint64, err error) {
-	// x, err already 0
-	i := p.index + 4
-	if i < 0 || i > len(p.buf) {
-		err = io.ErrUnexpectedEOF
-		return
-	}
-	p.index = i
-
-	x = uint64(p.buf[i-4])
-	x |= uint64(p.buf[i-3]) << 8
-	x |= uint64(p.buf[i-2]) << 16
-	x |= uint64(p.buf[i-1]) << 24
-	return
-}
-
-// DecodeZigzag64 reads a zigzag-encoded 64-bit integer
-// from the Buffer.
-// This is the format used for the sint64 protocol buffer type.
-func (p *Buffer) DecodeZigzag64() (x uint64, err error) {
-	x, err = p.DecodeVarint()
-	if err != nil {
-		return
-	}
-	x = (x >> 1) ^ uint64((int64(x&1)<<63)>>63)
-	return
-}
-
-// DecodeZigzag32 reads a zigzag-encoded 32-bit integer
-// from  the Buffer.
-// This is the format used for the sint32 protocol buffer type.
-func (p *Buffer) DecodeZigzag32() (x uint64, err error) {
-	x, err = p.DecodeVarint()
-	if err != nil {
-		return
-	}
-	x = uint64((uint32(x) >> 1) ^ uint32((int32(x&1)<<31)>>31))
-	return
-}
-
-// These are not ValueDecoders: they produce an array of bytes or a string.
-// bytes, embedded messages
-
-// DecodeRawBytes reads a count-delimited byte buffer from the Buffer.
-// This is the format used for the bytes protocol buffer
-// type and for embedded messages.
-func (p *Buffer) DecodeRawBytes(alloc bool) (buf []byte, err error) {
-	n, err := p.DecodeVarint()
-	if err != nil {
-		return nil, err
-	}
-
-	nb := int(n)
-	if nb < 0 {
-		return nil, fmt.Errorf("proto: bad byte length %d", nb)
-	}
-	end := p.index + nb
-	if end < p.index || end > len(p.buf) {
-		return nil, io.ErrUnexpectedEOF
-	}
-
-	if !alloc {
-		// todo: check if can get more uses of alloc=false
-		buf = p.buf[p.index:end]
-		p.index += nb
-		return
-	}
-
-	buf = make([]byte, nb)
-	copy(buf, p.buf[p.index:])
-	p.index += nb
-	return
-}
-
-// DecodeStringBytes reads an encoded string from the Buffer.
-// This is the format used for the proto2 string type.
-func (p *Buffer) DecodeStringBytes() (s string, err error) {
-	buf, err := p.DecodeRawBytes(false)
-	if err != nil {
-		return
-	}
-	return string(buf), nil
-}
-
-// Skip the next item in the buffer. Its wire type is decoded and presented as an argument.
-// If the protocol buffer has extensions, and the field matches, add it as an extension.
-// Otherwise, if the XXX_unrecognized field exists, append the skipped data there.
-func (o *Buffer) skipAndSave(t reflect.Type, tag, wire int, base structPointer, unrecField field) error {
-	oi := o.index
-
-	err := o.skip(t, tag, wire)
-	if err != nil {
-		return err
-	}
-
-	if !unrecField.IsValid() {
-		return nil
-	}
-
-	ptr := structPointer_Bytes(base, unrecField)
-
-	// Add the skipped field to struct field
-	obuf := o.buf
-
-	o.buf = *ptr
-	o.EncodeVarint(uint64(tag<<3 | wire))
-	*ptr = append(o.buf, obuf[oi:o.index]...)
-
-	o.buf = obuf
-
-	return nil
-}
-
-// Skip the next item in the buffer. Its wire type is decoded and presented as an argument.
-func (o *Buffer) skip(t reflect.Type, tag, wire int) error {
-
-	var u uint64
-	var err error
-
-	switch wire {
-	case WireVarint:
-		_, err = o.DecodeVarint()
-	case WireFixed64:
-		_, err = o.DecodeFixed64()
-	case WireBytes:
-		_, err = o.DecodeRawBytes(false)
-	case WireFixed32:
-		_, err = o.DecodeFixed32()
-	case WireStartGroup:
-		for {
-			u, err = o.DecodeVarint()
-			if err != nil {
-				break
-			}
-			fwire := int(u & 0x7)
-			if fwire == WireEndGroup {
-				break
-			}
-			ftag := int(u >> 3)
-			err = o.skip(t, ftag, fwire)
-			if err != nil {
-				break
-			}
-		}
-	default:
-		err = fmt.Errorf("proto: can't skip unknown wire type %d for %s", wire, t)
-	}
-	return err
-}
-
-// Unmarshaler is the interface representing objects that can
-// unmarshal themselves.  The method should reset the receiver before
-// decoding starts.  The argument points to data that may be
-// overwritten, so implementations should not keep references to the
-// buffer.
-type Unmarshaler interface {
-	Unmarshal([]byte) error
-}
-
-// Unmarshal parses the protocol buffer representation in buf and places the
-// decoded result in pb.  If the struct underlying pb does not match
-// the data in buf, the results can be unpredictable.
-//
-// Unmarshal resets pb before starting to unmarshal, so any
-// existing data in pb is always removed. Use UnmarshalMerge
-// to preserve and append to existing data.
-func Unmarshal(buf []byte, pb Message) error {
-	pb.Reset()
-	return UnmarshalMerge(buf, pb)
-}
-
-// UnmarshalMerge parses the protocol buffer representation in buf and
-// writes the decoded result to pb.  If the struct underlying pb does not match
-// the data in buf, the results can be unpredictable.
-//
-// UnmarshalMerge merges into existing data in pb.
-// Most code should use Unmarshal instead.
-func UnmarshalMerge(buf []byte, pb Message) error {
-	// If the object can unmarshal itself, let it.
-	if u, ok := pb.(Unmarshaler); ok {
-		return u.Unmarshal(buf)
-	}
-	return NewBuffer(buf).Unmarshal(pb)
-}
-
-// Unmarshal parses the protocol buffer representation in the
-// Buffer and places the decoded result in pb.  If the struct
-// underlying pb does not match the data in the buffer, the results can be
-// unpredictable.
-func (p *Buffer) Unmarshal(pb Message) error {
-	// If the object can unmarshal itself, let it.
-	if u, ok := pb.(Unmarshaler); ok {
-		err := u.Unmarshal(p.buf[p.index:])
-		p.index = len(p.buf)
-		return err
-	}
-
-	typ, base, err := getbase(pb)
-	if err != nil {
-		return err
-	}
-
-	err = p.unmarshalType(typ.Elem(), GetProperties(typ.Elem()), false, base)
-
-	if collectStats {
-		stats.Decode++
-	}
-
-	return err
-}
-
-// unmarshalType does the work of unmarshaling a structure.
-func (o *Buffer) unmarshalType(st reflect.Type, prop *StructProperties, is_group bool, base structPointer) error {
-	var state errorState
-	required, reqFields := prop.reqCount, uint64(0)
-
-	var err error
-	for err == nil && o.index < len(o.buf) {
-		oi := o.index
-		var u uint64
-		u, err = o.DecodeVarint()
-		if err != nil {
-			break
-		}
-		wire := int(u & 0x7)
-		if wire == WireEndGroup {
-			if is_group {
-				return nil // input is satisfied
-			}
-			return fmt.Errorf("proto: %s: wiretype end group for non-group", st)
-		}
-		tag := int(u >> 3)
-		if tag <= 0 {
-			return fmt.Errorf("proto: %s: illegal tag %d (wire type %d)", st, tag, wire)
-		}
-		fieldnum, ok := prop.decoderTags.get(tag)
-		if !ok {
-			// Maybe it's an extension?
-			if prop.extendable {
-				if e := structPointer_Interface(base, st).(extendableProto); isExtensionField(e, int32(tag)) {
-					if err = o.skip(st, tag, wire); err == nil {
-						if ee, ok := e.(extensionsMap); ok {
-							ext := ee.ExtensionMap()[int32(tag)] // may be missing
-							ext.enc = append(ext.enc, o.buf[oi:o.index]...)
-							ee.ExtensionMap()[int32(tag)] = ext
-						} else if ee, ok := e.(extensionsBytes); ok {
-							ext := ee.GetExtensions()
-							*ext = append(*ext, o.buf[oi:o.index]...)
-						}
-					}
-					continue
-				}
-			}
-			err = o.skipAndSave(st, tag, wire, base, prop.unrecField)
-			continue
-		}
-		p := prop.Prop[fieldnum]
-
-		if p.dec == nil {
-			fmt.Fprintf(os.Stderr, "proto: no protobuf decoder for %s.%s\n", st, st.Field(fieldnum).Name)
-			continue
-		}
-		dec := p.dec
-		if wire != WireStartGroup && wire != p.WireType {
-			if wire == WireBytes && p.packedDec != nil {
-				// a packable field
-				dec = p.packedDec
-			} else {
-				err = fmt.Errorf("proto: bad wiretype for field %s.%s: got wiretype %d, want %d", st, st.Field(fieldnum).Name, wire, p.WireType)
-				continue
-			}
-		}
-		decErr := dec(o, p, base)
-		if decErr != nil && !state.shouldContinue(decErr, p) {
-			err = decErr
-		}
-		if err == nil && p.Required {
-			// Successfully decoded a required field.
-			if tag <= 64 {
-				// use bitmap for fields 1-64 to catch field reuse.
-				var mask uint64 = 1 << uint64(tag-1)
-				if reqFields&mask == 0 {
-					// new required field
-					reqFields |= mask
-					required--
-				}
-			} else {
-				// This is imprecise. It can be fooled by a required field
-				// with a tag > 64 that is encoded twice; that's very rare.
-				// A fully correct implementation would require allocating
-				// a data structure, which we would like to avoid.
-				required--
-			}
-		}
-	}
-	if err == nil {
-		if is_group {
-			return io.ErrUnexpectedEOF
-		}
-		if state.err != nil {
-			return state.err
-		}
-		if required > 0 {
-			// Not enough information to determine the exact field. If we use extra
-			// CPU, we could determine the field only if the missing required field
-			// has a tag <= 64 and we check reqFields.
-			return &RequiredNotSetError{"{Unknown}"}
-		}
-	}
-	return err
-}
-
-// Individual type decoders
-// For each,
-//	u is the decoded value,
-//	v is a pointer to the field (pointer) in the struct
-
-// Sizes of the pools to allocate inside the Buffer.
-// The goal is modest amortization and allocation
-// on at least 16-byte boundaries.
-const (
-	boolPoolSize   = 16
-	uint32PoolSize = 8
-	uint64PoolSize = 4
-)
-
-// Decode a bool.
-func (o *Buffer) dec_bool(p *Properties, base structPointer) error {
-	u, err := p.valDec(o)
-	if err != nil {
-		return err
-	}
-	if len(o.bools) == 0 {
-		o.bools = make([]bool, boolPoolSize)
-	}
-	o.bools[0] = u != 0
-	*structPointer_Bool(base, p.field) = &o.bools[0]
-	o.bools = o.bools[1:]
-	return nil
-}
-
-func (o *Buffer) dec_proto3_bool(p *Properties, base structPointer) error {
-	u, err := p.valDec(o)
-	if err != nil {
-		return err
-	}
-	*structPointer_BoolVal(base, p.field) = u != 0
-	return nil
-}
-
-// Decode an int32.
-func (o *Buffer) dec_int32(p *Properties, base structPointer) error {
-	u, err := p.valDec(o)
-	if err != nil {
-		return err
-	}
-	word32_Set(structPointer_Word32(base, p.field), o, uint32(u))
-	return nil
-}
-
-func (o *Buffer) dec_proto3_int32(p *Properties, base structPointer) error {
-	u, err := p.valDec(o)
-	if err != nil {
-		return err
-	}
-	word32Val_Set(structPointer_Word32Val(base, p.field), uint32(u))
-	return nil
-}
-
-// Decode an int64.
-func (o *Buffer) dec_int64(p *Properties, base structPointer) error {
-	u, err := p.valDec(o)
-	if err != nil {
-		return err
-	}
-	word64_Set(structPointer_Word64(base, p.field), o, u)
-	return nil
-}
-
-func (o *Buffer) dec_proto3_int64(p *Properties, base structPointer) error {
-	u, err := p.valDec(o)
-	if err != nil {
-		return err
-	}
-	word64Val_Set(structPointer_Word64Val(base, p.field), o, u)
-	return nil
-}
-
-// Decode a string.
-func (o *Buffer) dec_string(p *Properties, base structPointer) error {
-	s, err := o.DecodeStringBytes()
-	if err != nil {
-		return err
-	}
-	*structPointer_String(base, p.field) = &s
-	return nil
-}
-
-func (o *Buffer) dec_proto3_string(p *Properties, base structPointer) error {
-	s, err := o.DecodeStringBytes()
-	if err != nil {
-		return err
-	}
-	*structPointer_StringVal(base, p.field) = s
-	return nil
-}
-
-// Decode a slice of bytes ([]byte).
-func (o *Buffer) dec_slice_byte(p *Properties, base structPointer) error {
-	b, err := o.DecodeRawBytes(true)
-	if err != nil {
-		return err
-	}
-	*structPointer_Bytes(base, p.field) = b
-	return nil
-}
-
-// Decode a slice of bools ([]bool).
-func (o *Buffer) dec_slice_bool(p *Properties, base structPointer) error {
-	u, err := p.valDec(o)
-	if err != nil {
-		return err
-	}
-	v := structPointer_BoolSlice(base, p.field)
-	*v = append(*v, u != 0)
-	return nil
-}
-
-// Decode a slice of bools ([]bool) in packed format.
-func (o *Buffer) dec_slice_packed_bool(p *Properties, base structPointer) error {
-	v := structPointer_BoolSlice(base, p.field)
-
-	nn, err := o.DecodeVarint()
-	if err != nil {
-		return err
-	}
-	nb := int(nn) // number of bytes of encoded bools
-
-	y := *v
-	for i := 0; i < nb; i++ {
-		u, err := p.valDec(o)
-		if err != nil {
-			return err
-		}
-		y = append(y, u != 0)
-	}
-
-	*v = y
-	return nil
-}
-
-// Decode a slice of int32s ([]int32).
-func (o *Buffer) dec_slice_int32(p *Properties, base structPointer) error {
-	u, err := p.valDec(o)
-	if err != nil {
-		return err
-	}
-	structPointer_Word32Slice(base, p.field).Append(uint32(u))
-	return nil
-}
-
-// Decode a slice of int32s ([]int32) in packed format.
-func (o *Buffer) dec_slice_packed_int32(p *Properties, base structPointer) error {
-	v := structPointer_Word32Slice(base, p.field)
-
-	nn, err := o.DecodeVarint()
-	if err != nil {
-		return err
-	}
-	nb := int(nn) // number of bytes of encoded int32s
-
-	fin := o.index + nb
-	if fin < o.index {
-		return errOverflow
-	}
-	for o.index < fin {
-		u, err := p.valDec(o)
-		if err != nil {
-			return err
-		}
-		v.Append(uint32(u))
-	}
-	return nil
-}
-
-// Decode a slice of int64s ([]int64).
-func (o *Buffer) dec_slice_int64(p *Properties, base structPointer) error {
-	u, err := p.valDec(o)
-	if err != nil {
-		return err
-	}
-
-	structPointer_Word64Slice(base, p.field).Append(u)
-	return nil
-}
-
-// Decode a slice of int64s ([]int64) in packed format.
-func (o *Buffer) dec_slice_packed_int64(p *Properties, base structPointer) error {
-	v := structPointer_Word64Slice(base, p.field)
-
-	nn, err := o.DecodeVarint()
-	if err != nil {
-		return err
-	}
-	nb := int(nn) // number of bytes of encoded int64s
-
-	fin := o.index + nb
-	if fin < o.index {
-		return errOverflow
-	}
-	for o.index < fin {
-		u, err := p.valDec(o)
-		if err != nil {
-			return err
-		}
-		v.Append(u)
-	}
-	return nil
-}
-
-// Decode a slice of strings ([]string).
-func (o *Buffer) dec_slice_string(p *Properties, base structPointer) error {
-	s, err := o.DecodeStringBytes()
-	if err != nil {
-		return err
-	}
-	v := structPointer_StringSlice(base, p.field)
-	*v = append(*v, s)
-	return nil
-}
-
-// Decode a slice of slice of bytes ([][]byte).
-func (o *Buffer) dec_slice_slice_byte(p *Properties, base structPointer) error {
-	b, err := o.DecodeRawBytes(true)
-	if err != nil {
-		return err
-	}
-	v := structPointer_BytesSlice(base, p.field)
-	*v = append(*v, b)
-	return nil
-}
-
-// Decode a map field.
-func (o *Buffer) dec_new_map(p *Properties, base structPointer) error {
-	raw, err := o.DecodeRawBytes(false)
-	if err != nil {
-		return err
-	}
-	oi := o.index       // index at the end of this map entry
-	o.index -= len(raw) // move buffer back to start of map entry
-
-	mptr := structPointer_NewAt(base, p.field, p.mtype) // *map[K]V
-	if mptr.Elem().IsNil() {
-		mptr.Elem().Set(reflect.MakeMap(mptr.Type().Elem()))
-	}
-	v := mptr.Elem() // map[K]V
-
-	// Prepare addressable doubly-indirect placeholders for the key and value types.
-	// See enc_new_map for why.
-	keyptr := reflect.New(reflect.PtrTo(p.mtype.Key())).Elem() // addressable *K
-	keybase := toStructPointer(keyptr.Addr())                  // **K
-
-	var valbase structPointer
-	var valptr reflect.Value
-	switch p.mtype.Elem().Kind() {
-	case reflect.Slice:
-		// []byte
-		var dummy []byte
-		valptr = reflect.ValueOf(&dummy)  // *[]byte
-		valbase = toStructPointer(valptr) // *[]byte
-	case reflect.Ptr:
-		// message; valptr is **Msg; need to allocate the intermediate pointer
-		valptr = reflect.New(reflect.PtrTo(p.mtype.Elem())).Elem() // addressable *V
-		valptr.Set(reflect.New(valptr.Type().Elem()))
-		valbase = toStructPointer(valptr)
-	default:
-		// everything else
-		valptr = reflect.New(reflect.PtrTo(p.mtype.Elem())).Elem() // addressable *V
-		valbase = toStructPointer(valptr.Addr())                   // **V
-	}
-
-	// Decode.
-	// This parses a restricted wire format, namely the encoding of a message
-	// with two fields. See enc_new_map for the format.
-	for o.index < oi {
-		// tagcode for key and value properties are always a single byte
-		// because they have tags 1 and 2.
-		tagcode := o.buf[o.index]
-		o.index++
-		switch tagcode {
-		case p.mkeyprop.tagcode[0]:
-			if err := p.mkeyprop.dec(o, p.mkeyprop, keybase); err != nil {
-				return err
-			}
-		case p.mvalprop.tagcode[0]:
-			if err := p.mvalprop.dec(o, p.mvalprop, valbase); err != nil {
-				return err
-			}
-		default:
-			// TODO: Should we silently skip this instead?
-			return fmt.Errorf("proto: bad map data tag %d", raw[0])
-		}
-	}
-	keyelem, valelem := keyptr.Elem(), valptr.Elem()
-	if !keyelem.IsValid() || !valelem.IsValid() {
-		// We did not decode the key or the value in the map entry.
-		// Either way, it's an invalid map entry.
-		return fmt.Errorf("proto: bad map data: missing key/val")
-	}
-
-	v.SetMapIndex(keyelem, valelem)
-	return nil
-}
-
-// Decode a group.
-func (o *Buffer) dec_struct_group(p *Properties, base structPointer) error {
-	bas := structPointer_GetStructPointer(base, p.field)
-	if structPointer_IsNil(bas) {
-		// allocate new nested message
-		bas = toStructPointer(reflect.New(p.stype))
-		structPointer_SetStructPointer(base, p.field, bas)
-	}
-	return o.unmarshalType(p.stype, p.sprop, true, bas)
-}
-
-// Decode an embedded message.
-func (o *Buffer) dec_struct_message(p *Properties, base structPointer) (err error) {
-	raw, e := o.DecodeRawBytes(false)
-	if e != nil {
-		return e
-	}
-
-	bas := structPointer_GetStructPointer(base, p.field)
-	if structPointer_IsNil(bas) {
-		// allocate new nested message
-		bas = toStructPointer(reflect.New(p.stype))
-		structPointer_SetStructPointer(base, p.field, bas)
-	}
-
-	// If the object can unmarshal itself, let it.
-	if p.isUnmarshaler {
-		iv := structPointer_Interface(bas, p.stype)
-		return iv.(Unmarshaler).Unmarshal(raw)
-	}
-
-	obuf := o.buf
-	oi := o.index
-	o.buf = raw
-	o.index = 0
-
-	err = o.unmarshalType(p.stype, p.sprop, false, bas)
-	o.buf = obuf
-	o.index = oi
-
-	return err
-}
-
-// Decode a slice of embedded messages.
-func (o *Buffer) dec_slice_struct_message(p *Properties, base structPointer) error {
-	return o.dec_slice_struct(p, false, base)
-}
-
-// Decode a slice of embedded groups.
-func (o *Buffer) dec_slice_struct_group(p *Properties, base structPointer) error {
-	return o.dec_slice_struct(p, true, base)
-}
-
-// Decode a slice of structs ([]*struct).
-func (o *Buffer) dec_slice_struct(p *Properties, is_group bool, base structPointer) error {
-	v := reflect.New(p.stype)
-	bas := toStructPointer(v)
-	structPointer_StructPointerSlice(base, p.field).Append(bas)
-
-	if is_group {
-		err := o.unmarshalType(p.stype, p.sprop, is_group, bas)
-		return err
-	}
-
-	raw, err := o.DecodeRawBytes(false)
-	if err != nil {
-		return err
-	}
-
-	// If the object can unmarshal itself, let it.
-	if p.isUnmarshaler {
-		iv := v.Interface()
-		return iv.(Unmarshaler).Unmarshal(raw)
-	}
-
-	obuf := o.buf
-	oi := o.index
-	o.buf = raw
-	o.index = 0
-
-	err = o.unmarshalType(p.stype, p.sprop, is_group, bas)
-
-	o.buf = obuf
-	o.index = oi
-
-	return err
-}
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/decode_gogo.go b/Godeps/_workspace/src/github.com/gogo/protobuf/proto/decode_gogo.go
deleted file mode 100644
index 6a77aad76..000000000
--- a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/decode_gogo.go
+++ /dev/null
@@ -1,175 +0,0 @@
-// Copyright (c) 2013, Vastech SA (PTY) LTD. All rights reserved.
-// http://github.com/gogo/protobuf/gogoproto
-//
-// 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.
-
-package proto
-
-import (
-	"reflect"
-)
-
-// Decode a reference to a struct pointer.
-func (o *Buffer) dec_ref_struct_message(p *Properties, base structPointer) (err error) {
-	raw, e := o.DecodeRawBytes(false)
-	if e != nil {
-		return e
-	}
-
-	// If the object can unmarshal itself, let it.
-	if p.isUnmarshaler {
-		panic("not supported, since this is a pointer receiver")
-	}
-
-	obuf := o.buf
-	oi := o.index
-	o.buf = raw
-	o.index = 0
-
-	bas := structPointer_FieldPointer(base, p.field)
-
-	err = o.unmarshalType(p.stype, p.sprop, false, bas)
-	o.buf = obuf
-	o.index = oi
-
-	return err
-}
-
-// Decode a slice of references to struct pointers ([]struct).
-func (o *Buffer) dec_slice_ref_struct(p *Properties, is_group bool, base structPointer) error {
-	newBas := appendStructPointer(base, p.field, p.sstype)
-
-	if is_group {
-		panic("not supported, maybe in future, if requested.")
-	}
-
-	raw, err := o.DecodeRawBytes(false)
-	if err != nil {
-		return err
-	}
-
-	// If the object can unmarshal itself, let it.
-	if p.isUnmarshaler {
-		panic("not supported, since this is not a pointer receiver.")
-	}
-
-	obuf := o.buf
-	oi := o.index
-	o.buf = raw
-	o.index = 0
-
-	err = o.unmarshalType(p.stype, p.sprop, is_group, newBas)
-
-	o.buf = obuf
-	o.index = oi
-
-	return err
-}
-
-// Decode a slice of references to struct pointers.
-func (o *Buffer) dec_slice_ref_struct_message(p *Properties, base structPointer) error {
-	return o.dec_slice_ref_struct(p, false, base)
-}
-
-func setPtrCustomType(base structPointer, f field, v interface{}) {
-	if v == nil {
-		return
-	}
-	structPointer_SetStructPointer(base, f, structPointer(reflect.ValueOf(v).Pointer()))
-}
-
-func setCustomType(base structPointer, f field, value interface{}) {
-	if value == nil {
-		return
-	}
-	v := reflect.ValueOf(value).Elem()
-	t := reflect.TypeOf(value).Elem()
-	kind := t.Kind()
-	switch kind {
-	case reflect.Slice:
-		slice := reflect.MakeSlice(t, v.Len(), v.Cap())
-		reflect.Copy(slice, v)
-		oldHeader := structPointer_GetSliceHeader(base, f)
-		oldHeader.Data = slice.Pointer()
-		oldHeader.Len = v.Len()
-		oldHeader.Cap = v.Cap()
-	default:
-		l := 1
-		size := reflect.TypeOf(value).Elem().Size()
-		if kind == reflect.Array {
-			l = reflect.TypeOf(value).Elem().Len()
-			size = reflect.TypeOf(value).Size()
-		}
-		total := int(size) * l
-		structPointer_Copy(toStructPointer(reflect.ValueOf(value)), structPointer_Add(base, f), total)
-	}
-}
-
-func (o *Buffer) dec_custom_bytes(p *Properties, base structPointer) error {
-	b, err := o.DecodeRawBytes(true)
-	if err != nil {
-		return err
-	}
-	i := reflect.New(p.ctype.Elem()).Interface()
-	custom := (i).(Unmarshaler)
-	if err := custom.Unmarshal(b); err != nil {
-		return err
-	}
-	setPtrCustomType(base, p.field, custom)
-	return nil
-}
-
-func (o *Buffer) dec_custom_ref_bytes(p *Properties, base structPointer) error {
-	b, err := o.DecodeRawBytes(true)
-	if err != nil {
-		return err
-	}
-	i := reflect.New(p.ctype).Interface()
-	custom := (i).(Unmarshaler)
-	if err := custom.Unmarshal(b); err != nil {
-		return err
-	}
-	if custom != nil {
-		setCustomType(base, p.field, custom)
-	}
-	return nil
-}
-
-// Decode a slice of bytes ([]byte) into a slice of custom types.
-func (o *Buffer) dec_custom_slice_bytes(p *Properties, base structPointer) error {
-	b, err := o.DecodeRawBytes(true)
-	if err != nil {
-		return err
-	}
-	i := reflect.New(p.ctype.Elem()).Interface()
-	custom := (i).(Unmarshaler)
-	if err := custom.Unmarshal(b); err != nil {
-		return err
-	}
-	newBas := appendStructPointer(base, p.field, p.ctype)
-
-	setCustomType(newBas, 0, custom)
-
-	return nil
-}
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/encode.go b/Godeps/_workspace/src/github.com/gogo/protobuf/proto/encode.go
deleted file mode 100644
index 91f3f0784..000000000
--- a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/encode.go
+++ /dev/null
@@ -1,1293 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2010 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// 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.
-
-package proto
-
-/*
- * Routines for encoding data into the wire format for protocol buffers.
- */
-
-import (
-	"errors"
-	"fmt"
-	"reflect"
-	"sort"
-)
-
-// RequiredNotSetError is the error returned if Marshal is called with
-// a protocol buffer struct whose required fields have not
-// all been initialized. It is also the error returned if Unmarshal is
-// called with an encoded protocol buffer that does not include all the
-// required fields.
-//
-// When printed, RequiredNotSetError reports the first unset required field in a
-// message. If the field cannot be precisely determined, it is reported as
-// "{Unknown}".
-type RequiredNotSetError struct {
-	field string
-}
-
-func (e *RequiredNotSetError) Error() string {
-	return fmt.Sprintf("proto: required field %q not set", e.field)
-}
-
-var (
-	// errRepeatedHasNil is the error returned if Marshal is called with
-	// a struct with a repeated field containing a nil element.
-	errRepeatedHasNil = errors.New("proto: repeated field has nil element")
-
-	// ErrNil is the error returned if Marshal is called with nil.
-	ErrNil = errors.New("proto: Marshal called with nil")
-)
-
-// The fundamental encoders that put bytes on the wire.
-// Those that take integer types all accept uint64 and are
-// therefore of type valueEncoder.
-
-const maxVarintBytes = 10 // maximum length of a varint
-
-// EncodeVarint returns the varint encoding of x.
-// This is the format for the
-// int32, int64, uint32, uint64, bool, and enum
-// protocol buffer types.
-// Not used by the package itself, but helpful to clients
-// wishing to use the same encoding.
-func EncodeVarint(x uint64) []byte {
-	var buf [maxVarintBytes]byte
-	var n int
-	for n = 0; x > 127; n++ {
-		buf[n] = 0x80 | uint8(x&0x7F)
-		x >>= 7
-	}
-	buf[n] = uint8(x)
-	n++
-	return buf[0:n]
-}
-
-// EncodeVarint writes a varint-encoded integer to the Buffer.
-// This is the format for the
-// int32, int64, uint32, uint64, bool, and enum
-// protocol buffer types.
-func (p *Buffer) EncodeVarint(x uint64) error {
-	for x >= 1<<7 {
-		p.buf = append(p.buf, uint8(x&0x7f|0x80))
-		x >>= 7
-	}
-	p.buf = append(p.buf, uint8(x))
-	return nil
-}
-
-func sizeVarint(x uint64) (n int) {
-	for {
-		n++
-		x >>= 7
-		if x == 0 {
-			break
-		}
-	}
-	return n
-}
-
-// EncodeFixed64 writes a 64-bit integer to the Buffer.
-// This is the format for the
-// fixed64, sfixed64, and double protocol buffer types.
-func (p *Buffer) EncodeFixed64(x uint64) error {
-	p.buf = append(p.buf,
-		uint8(x),
-		uint8(x>>8),
-		uint8(x>>16),
-		uint8(x>>24),
-		uint8(x>>32),
-		uint8(x>>40),
-		uint8(x>>48),
-		uint8(x>>56))
-	return nil
-}
-
-func sizeFixed64(x uint64) int {
-	return 8
-}
-
-// EncodeFixed32 writes a 32-bit integer to the Buffer.
-// This is the format for the
-// fixed32, sfixed32, and float protocol buffer types.
-func (p *Buffer) EncodeFixed32(x uint64) error {
-	p.buf = append(p.buf,
-		uint8(x),
-		uint8(x>>8),
-		uint8(x>>16),
-		uint8(x>>24))
-	return nil
-}
-
-func sizeFixed32(x uint64) int {
-	return 4
-}
-
-// EncodeZigzag64 writes a zigzag-encoded 64-bit integer
-// to the Buffer.
-// This is the format used for the sint64 protocol buffer type.
-func (p *Buffer) EncodeZigzag64(x uint64) error {
-	// use signed number to get arithmetic right shift.
-	return p.EncodeVarint(uint64((x << 1) ^ uint64((int64(x) >> 63))))
-}
-
-func sizeZigzag64(x uint64) int {
-	return sizeVarint(uint64((x << 1) ^ uint64((int64(x) >> 63))))
-}
-
-// EncodeZigzag32 writes a zigzag-encoded 32-bit integer
-// to the Buffer.
-// This is the format used for the sint32 protocol buffer type.
-func (p *Buffer) EncodeZigzag32(x uint64) error {
-	// use signed number to get arithmetic right shift.
-	return p.EncodeVarint(uint64((uint32(x) << 1) ^ uint32((int32(x) >> 31))))
-}
-
-func sizeZigzag32(x uint64) int {
-	return sizeVarint(uint64((uint32(x) << 1) ^ uint32((int32(x) >> 31))))
-}
-
-// EncodeRawBytes writes a count-delimited byte buffer to the Buffer.
-// This is the format used for the bytes protocol buffer
-// type and for embedded messages.
-func (p *Buffer) EncodeRawBytes(b []byte) error {
-	p.EncodeVarint(uint64(len(b)))
-	p.buf = append(p.buf, b...)
-	return nil
-}
-
-func sizeRawBytes(b []byte) int {
-	return sizeVarint(uint64(len(b))) +
-		len(b)
-}
-
-// EncodeStringBytes writes an encoded string to the Buffer.
-// This is the format used for the proto2 string type.
-func (p *Buffer) EncodeStringBytes(s string) error {
-	p.EncodeVarint(uint64(len(s)))
-	p.buf = append(p.buf, s...)
-	return nil
-}
-
-func sizeStringBytes(s string) int {
-	return sizeVarint(uint64(len(s))) +
-		len(s)
-}
-
-// Marshaler is the interface representing objects that can marshal themselves.
-type Marshaler interface {
-	Marshal() ([]byte, error)
-}
-
-// Marshal takes the protocol buffer
-// and encodes it into the wire format, returning the data.
-func Marshal(pb Message) ([]byte, error) {
-	// Can the object marshal itself?
-	if m, ok := pb.(Marshaler); ok {
-		return m.Marshal()
-	}
-	p := NewBuffer(nil)
-	err := p.Marshal(pb)
-	var state errorState
-	if err != nil && !state.shouldContinue(err, nil) {
-		return nil, err
-	}
-	if p.buf == nil && err == nil {
-		// Return a non-nil slice on success.
-		return []byte{}, nil
-	}
-	return p.buf, err
-}
-
-// Marshal takes the protocol buffer
-// and encodes it into the wire format, writing the result to the
-// Buffer.
-func (p *Buffer) Marshal(pb Message) error {
-	// Can the object marshal itself?
-	if m, ok := pb.(Marshaler); ok {
-		data, err := m.Marshal()
-		if err != nil {
-			return err
-		}
-		p.buf = append(p.buf, data...)
-		return nil
-	}
-
-	t, base, err := getbase(pb)
-	if structPointer_IsNil(base) {
-		return ErrNil
-	}
-	if err == nil {
-		err = p.enc_struct(GetProperties(t.Elem()), base)
-	}
-
-	if collectStats {
-		stats.Encode++
-	}
-
-	return err
-}
-
-// Size returns the encoded size of a protocol buffer.
-func Size(pb Message) (n int) {
-	// Can the object marshal itself?  If so, Size is slow.
-	// TODO: add Size to Marshaler, or add a Sizer interface.
-	if m, ok := pb.(Marshaler); ok {
-		b, _ := m.Marshal()
-		return len(b)
-	}
-
-	t, base, err := getbase(pb)
-	if structPointer_IsNil(base) {
-		return 0
-	}
-	if err == nil {
-		n = size_struct(GetProperties(t.Elem()), base)
-	}
-
-	if collectStats {
-		stats.Size++
-	}
-
-	return
-}
-
-// Individual type encoders.
-
-// Encode a bool.
-func (o *Buffer) enc_bool(p *Properties, base structPointer) error {
-	v := *structPointer_Bool(base, p.field)
-	if v == nil {
-		return ErrNil
-	}
-	x := 0
-	if *v {
-		x = 1
-	}
-	o.buf = append(o.buf, p.tagcode...)
-	p.valEnc(o, uint64(x))
-	return nil
-}
-
-func (o *Buffer) enc_proto3_bool(p *Properties, base structPointer) error {
-	v := *structPointer_BoolVal(base, p.field)
-	if !v {
-		return ErrNil
-	}
-	o.buf = append(o.buf, p.tagcode...)
-	p.valEnc(o, 1)
-	return nil
-}
-
-func size_bool(p *Properties, base structPointer) int {
-	v := *structPointer_Bool(base, p.field)
-	if v == nil {
-		return 0
-	}
-	return len(p.tagcode) + 1 // each bool takes exactly one byte
-}
-
-func size_proto3_bool(p *Properties, base structPointer) int {
-	v := *structPointer_BoolVal(base, p.field)
-	if !v {
-		return 0
-	}
-	return len(p.tagcode) + 1 // each bool takes exactly one byte
-}
-
-// Encode an int32.
-func (o *Buffer) enc_int32(p *Properties, base structPointer) error {
-	v := structPointer_Word32(base, p.field)
-	if word32_IsNil(v) {
-		return ErrNil
-	}
-	x := int32(word32_Get(v)) // permit sign extension to use full 64-bit range
-	o.buf = append(o.buf, p.tagcode...)
-	p.valEnc(o, uint64(x))
-	return nil
-}
-
-func (o *Buffer) enc_proto3_int32(p *Properties, base structPointer) error {
-	v := structPointer_Word32Val(base, p.field)
-	x := int32(word32Val_Get(v)) // permit sign extension to use full 64-bit range
-	if x == 0 {
-		return ErrNil
-	}
-	o.buf = append(o.buf, p.tagcode...)
-	p.valEnc(o, uint64(x))
-	return nil
-}
-
-func size_int32(p *Properties, base structPointer) (n int) {
-	v := structPointer_Word32(base, p.field)
-	if word32_IsNil(v) {
-		return 0
-	}
-	x := int32(word32_Get(v)) // permit sign extension to use full 64-bit range
-	n += len(p.tagcode)
-	n += p.valSize(uint64(x))
-	return
-}
-
-func size_proto3_int32(p *Properties, base structPointer) (n int) {
-	v := structPointer_Word32Val(base, p.field)
-	x := int32(word32Val_Get(v)) // permit sign extension to use full 64-bit range
-	if x == 0 {
-		return 0
-	}
-	n += len(p.tagcode)
-	n += p.valSize(uint64(x))
-	return
-}
-
-// Encode a uint32.
-// Exactly the same as int32, except for no sign extension.
-func (o *Buffer) enc_uint32(p *Properties, base structPointer) error {
-	v := structPointer_Word32(base, p.field)
-	if word32_IsNil(v) {
-		return ErrNil
-	}
-	x := word32_Get(v)
-	o.buf = append(o.buf, p.tagcode...)
-	p.valEnc(o, uint64(x))
-	return nil
-}
-
-func (o *Buffer) enc_proto3_uint32(p *Properties, base structPointer) error {
-	v := structPointer_Word32Val(base, p.field)
-	x := word32Val_Get(v)
-	if x == 0 {
-		return ErrNil
-	}
-	o.buf = append(o.buf, p.tagcode...)
-	p.valEnc(o, uint64(x))
-	return nil
-}
-
-func size_uint32(p *Properties, base structPointer) (n int) {
-	v := structPointer_Word32(base, p.field)
-	if word32_IsNil(v) {
-		return 0
-	}
-	x := word32_Get(v)
-	n += len(p.tagcode)
-	n += p.valSize(uint64(x))
-	return
-}
-
-func size_proto3_uint32(p *Properties, base structPointer) (n int) {
-	v := structPointer_Word32Val(base, p.field)
-	x := word32Val_Get(v)
-	if x == 0 {
-		return 0
-	}
-	n += len(p.tagcode)
-	n += p.valSize(uint64(x))
-	return
-}
-
-// Encode an int64.
-func (o *Buffer) enc_int64(p *Properties, base structPointer) error {
-	v := structPointer_Word64(base, p.field)
-	if word64_IsNil(v) {
-		return ErrNil
-	}
-	x := word64_Get(v)
-	o.buf = append(o.buf, p.tagcode...)
-	p.valEnc(o, x)
-	return nil
-}
-
-func (o *Buffer) enc_proto3_int64(p *Properties, base structPointer) error {
-	v := structPointer_Word64Val(base, p.field)
-	x := word64Val_Get(v)
-	if x == 0 {
-		return ErrNil
-	}
-	o.buf = append(o.buf, p.tagcode...)
-	p.valEnc(o, x)
-	return nil
-}
-
-func size_int64(p *Properties, base structPointer) (n int) {
-	v := structPointer_Word64(base, p.field)
-	if word64_IsNil(v) {
-		return 0
-	}
-	x := word64_Get(v)
-	n += len(p.tagcode)
-	n += p.valSize(x)
-	return
-}
-
-func size_proto3_int64(p *Properties, base structPointer) (n int) {
-	v := structPointer_Word64Val(base, p.field)
-	x := word64Val_Get(v)
-	if x == 0 {
-		return 0
-	}
-	n += len(p.tagcode)
-	n += p.valSize(x)
-	return
-}
-
-// Encode a string.
-func (o *Buffer) enc_string(p *Properties, base structPointer) error {
-	v := *structPointer_String(base, p.field)
-	if v == nil {
-		return ErrNil
-	}
-	x := *v
-	o.buf = append(o.buf, p.tagcode...)
-	o.EncodeStringBytes(x)
-	return nil
-}
-
-func (o *Buffer) enc_proto3_string(p *Properties, base structPointer) error {
-	v := *structPointer_StringVal(base, p.field)
-	if v == "" {
-		return ErrNil
-	}
-	o.buf = append(o.buf, p.tagcode...)
-	o.EncodeStringBytes(v)
-	return nil
-}
-
-func size_string(p *Properties, base structPointer) (n int) {
-	v := *structPointer_String(base, p.field)
-	if v == nil {
-		return 0
-	}
-	x := *v
-	n += len(p.tagcode)
-	n += sizeStringBytes(x)
-	return
-}
-
-func size_proto3_string(p *Properties, base structPointer) (n int) {
-	v := *structPointer_StringVal(base, p.field)
-	if v == "" {
-		return 0
-	}
-	n += len(p.tagcode)
-	n += sizeStringBytes(v)
-	return
-}
-
-// All protocol buffer fields are nillable, but be careful.
-func isNil(v reflect.Value) bool {
-	switch v.Kind() {
-	case reflect.Interface, reflect.Map, reflect.Ptr, reflect.Slice:
-		return v.IsNil()
-	}
-	return false
-}
-
-// Encode a message struct.
-func (o *Buffer) enc_struct_message(p *Properties, base structPointer) error {
-	var state errorState
-	structp := structPointer_GetStructPointer(base, p.field)
-	if structPointer_IsNil(structp) {
-		return ErrNil
-	}
-
-	// Can the object marshal itself?
-	if p.isMarshaler {
-		m := structPointer_Interface(structp, p.stype).(Marshaler)
-		data, err := m.Marshal()
-		if err != nil && !state.shouldContinue(err, nil) {
-			return err
-		}
-		o.buf = append(o.buf, p.tagcode...)
-		o.EncodeRawBytes(data)
-		return state.err
-	}
-
-	o.buf = append(o.buf, p.tagcode...)
-	return o.enc_len_struct(p.sprop, structp, &state)
-}
-
-func size_struct_message(p *Properties, base structPointer) int {
-	structp := structPointer_GetStructPointer(base, p.field)
-	if structPointer_IsNil(structp) {
-		return 0
-	}
-
-	// Can the object marshal itself?
-	if p.isMarshaler {
-		m := structPointer_Interface(structp, p.stype).(Marshaler)
-		data, _ := m.Marshal()
-		n0 := len(p.tagcode)
-		n1 := sizeRawBytes(data)
-		return n0 + n1
-	}
-
-	n0 := len(p.tagcode)
-	n1 := size_struct(p.sprop, structp)
-	n2 := sizeVarint(uint64(n1)) // size of encoded length
-	return n0 + n1 + n2
-}
-
-// Encode a group struct.
-func (o *Buffer) enc_struct_group(p *Properties, base structPointer) error {
-	var state errorState
-	b := structPointer_GetStructPointer(base, p.field)
-	if structPointer_IsNil(b) {
-		return ErrNil
-	}
-
-	o.EncodeVarint(uint64((p.Tag << 3) | WireStartGroup))
-	err := o.enc_struct(p.sprop, b)
-	if err != nil && !state.shouldContinue(err, nil) {
-		return err
-	}
-	o.EncodeVarint(uint64((p.Tag << 3) | WireEndGroup))
-	return state.err
-}
-
-func size_struct_group(p *Properties, base structPointer) (n int) {
-	b := structPointer_GetStructPointer(base, p.field)
-	if structPointer_IsNil(b) {
-		return 0
-	}
-
-	n += sizeVarint(uint64((p.Tag << 3) | WireStartGroup))
-	n += size_struct(p.sprop, b)
-	n += sizeVarint(uint64((p.Tag << 3) | WireEndGroup))
-	return
-}
-
-// Encode a slice of bools ([]bool).
-func (o *Buffer) enc_slice_bool(p *Properties, base structPointer) error {
-	s := *structPointer_BoolSlice(base, p.field)
-	l := len(s)
-	if l == 0 {
-		return ErrNil
-	}
-	for _, x := range s {
-		o.buf = append(o.buf, p.tagcode...)
-		v := uint64(0)
-		if x {
-			v = 1
-		}
-		p.valEnc(o, v)
-	}
-	return nil
-}
-
-func size_slice_bool(p *Properties, base structPointer) int {
-	s := *structPointer_BoolSlice(base, p.field)
-	l := len(s)
-	if l == 0 {
-		return 0
-	}
-	return l * (len(p.tagcode) + 1) // each bool takes exactly one byte
-}
-
-// Encode a slice of bools ([]bool) in packed format.
-func (o *Buffer) enc_slice_packed_bool(p *Properties, base structPointer) error {
-	s := *structPointer_BoolSlice(base, p.field)
-	l := len(s)
-	if l == 0 {
-		return ErrNil
-	}
-	o.buf = append(o.buf, p.tagcode...)
-	o.EncodeVarint(uint64(l)) // each bool takes exactly one byte
-	for _, x := range s {
-		v := uint64(0)
-		if x {
-			v = 1
-		}
-		p.valEnc(o, v)
-	}
-	return nil
-}
-
-func size_slice_packed_bool(p *Properties, base structPointer) (n int) {
-	s := *structPointer_BoolSlice(base, p.field)
-	l := len(s)
-	if l == 0 {
-		return 0
-	}
-	n += len(p.tagcode)
-	n += sizeVarint(uint64(l))
-	n += l // each bool takes exactly one byte
-	return
-}
-
-// Encode a slice of bytes ([]byte).
-func (o *Buffer) enc_slice_byte(p *Properties, base structPointer) error {
-	s := *structPointer_Bytes(base, p.field)
-	if s == nil {
-		return ErrNil
-	}
-	o.buf = append(o.buf, p.tagcode...)
-	o.EncodeRawBytes(s)
-	return nil
-}
-
-func (o *Buffer) enc_proto3_slice_byte(p *Properties, base structPointer) error {
-	s := *structPointer_Bytes(base, p.field)
-	if len(s) == 0 {
-		return ErrNil
-	}
-	o.buf = append(o.buf, p.tagcode...)
-	o.EncodeRawBytes(s)
-	return nil
-}
-
-func size_slice_byte(p *Properties, base structPointer) (n int) {
-	s := *structPointer_Bytes(base, p.field)
-	if s == nil {
-		return 0
-	}
-	n += len(p.tagcode)
-	n += sizeRawBytes(s)
-	return
-}
-
-func size_proto3_slice_byte(p *Properties, base structPointer) (n int) {
-	s := *structPointer_Bytes(base, p.field)
-	if len(s) == 0 {
-		return 0
-	}
-	n += len(p.tagcode)
-	n += sizeRawBytes(s)
-	return
-}
-
-// Encode a slice of int32s ([]int32).
-func (o *Buffer) enc_slice_int32(p *Properties, base structPointer) error {
-	s := structPointer_Word32Slice(base, p.field)
-	l := s.Len()
-	if l == 0 {
-		return ErrNil
-	}
-	for i := 0; i < l; i++ {
-		o.buf = append(o.buf, p.tagcode...)
-		x := int32(s.Index(i)) // permit sign extension to use full 64-bit range
-		p.valEnc(o, uint64(x))
-	}
-	return nil
-}
-
-func size_slice_int32(p *Properties, base structPointer) (n int) {
-	s := structPointer_Word32Slice(base, p.field)
-	l := s.Len()
-	if l == 0 {
-		return 0
-	}
-	for i := 0; i < l; i++ {
-		n += len(p.tagcode)
-		x := int32(s.Index(i)) // permit sign extension to use full 64-bit range
-		n += p.valSize(uint64(x))
-	}
-	return
-}
-
-// Encode a slice of int32s ([]int32) in packed format.
-func (o *Buffer) enc_slice_packed_int32(p *Properties, base structPointer) error {
-	s := structPointer_Word32Slice(base, p.field)
-	l := s.Len()
-	if l == 0 {
-		return ErrNil
-	}
-	// TODO: Reuse a Buffer.
-	buf := NewBuffer(nil)
-	for i := 0; i < l; i++ {
-		x := int32(s.Index(i)) // permit sign extension to use full 64-bit range
-		p.valEnc(buf, uint64(x))
-	}
-
-	o.buf = append(o.buf, p.tagcode...)
-	o.EncodeVarint(uint64(len(buf.buf)))
-	o.buf = append(o.buf, buf.buf...)
-	return nil
-}
-
-func size_slice_packed_int32(p *Properties, base structPointer) (n int) {
-	s := structPointer_Word32Slice(base, p.field)
-	l := s.Len()
-	if l == 0 {
-		return 0
-	}
-	var bufSize int
-	for i := 0; i < l; i++ {
-		x := int32(s.Index(i)) // permit sign extension to use full 64-bit range
-		bufSize += p.valSize(uint64(x))
-	}
-
-	n += len(p.tagcode)
-	n += sizeVarint(uint64(bufSize))
-	n += bufSize
-	return
-}
-
-// Encode a slice of uint32s ([]uint32).
-// Exactly the same as int32, except for no sign extension.
-func (o *Buffer) enc_slice_uint32(p *Properties, base structPointer) error {
-	s := structPointer_Word32Slice(base, p.field)
-	l := s.Len()
-	if l == 0 {
-		return ErrNil
-	}
-	for i := 0; i < l; i++ {
-		o.buf = append(o.buf, p.tagcode...)
-		x := s.Index(i)
-		p.valEnc(o, uint64(x))
-	}
-	return nil
-}
-
-func size_slice_uint32(p *Properties, base structPointer) (n int) {
-	s := structPointer_Word32Slice(base, p.field)
-	l := s.Len()
-	if l == 0 {
-		return 0
-	}
-	for i := 0; i < l; i++ {
-		n += len(p.tagcode)
-		x := s.Index(i)
-		n += p.valSize(uint64(x))
-	}
-	return
-}
-
-// Encode a slice of uint32s ([]uint32) in packed format.
-// Exactly the same as int32, except for no sign extension.
-func (o *Buffer) enc_slice_packed_uint32(p *Properties, base structPointer) error {
-	s := structPointer_Word32Slice(base, p.field)
-	l := s.Len()
-	if l == 0 {
-		return ErrNil
-	}
-	// TODO: Reuse a Buffer.
-	buf := NewBuffer(nil)
-	for i := 0; i < l; i++ {
-		p.valEnc(buf, uint64(s.Index(i)))
-	}
-
-	o.buf = append(o.buf, p.tagcode...)
-	o.EncodeVarint(uint64(len(buf.buf)))
-	o.buf = append(o.buf, buf.buf...)
-	return nil
-}
-
-func size_slice_packed_uint32(p *Properties, base structPointer) (n int) {
-	s := structPointer_Word32Slice(base, p.field)
-	l := s.Len()
-	if l == 0 {
-		return 0
-	}
-	var bufSize int
-	for i := 0; i < l; i++ {
-		bufSize += p.valSize(uint64(s.Index(i)))
-	}
-
-	n += len(p.tagcode)
-	n += sizeVarint(uint64(bufSize))
-	n += bufSize
-	return
-}
-
-// Encode a slice of int64s ([]int64).
-func (o *Buffer) enc_slice_int64(p *Properties, base structPointer) error {
-	s := structPointer_Word64Slice(base, p.field)
-	l := s.Len()
-	if l == 0 {
-		return ErrNil
-	}
-	for i := 0; i < l; i++ {
-		o.buf = append(o.buf, p.tagcode...)
-		p.valEnc(o, s.Index(i))
-	}
-	return nil
-}
-
-func size_slice_int64(p *Properties, base structPointer) (n int) {
-	s := structPointer_Word64Slice(base, p.field)
-	l := s.Len()
-	if l == 0 {
-		return 0
-	}
-	for i := 0; i < l; i++ {
-		n += len(p.tagcode)
-		n += p.valSize(s.Index(i))
-	}
-	return
-}
-
-// Encode a slice of int64s ([]int64) in packed format.
-func (o *Buffer) enc_slice_packed_int64(p *Properties, base structPointer) error {
-	s := structPointer_Word64Slice(base, p.field)
-	l := s.Len()
-	if l == 0 {
-		return ErrNil
-	}
-	// TODO: Reuse a Buffer.
-	buf := NewBuffer(nil)
-	for i := 0; i < l; i++ {
-		p.valEnc(buf, s.Index(i))
-	}
-
-	o.buf = append(o.buf, p.tagcode...)
-	o.EncodeVarint(uint64(len(buf.buf)))
-	o.buf = append(o.buf, buf.buf...)
-	return nil
-}
-
-func size_slice_packed_int64(p *Properties, base structPointer) (n int) {
-	s := structPointer_Word64Slice(base, p.field)
-	l := s.Len()
-	if l == 0 {
-		return 0
-	}
-	var bufSize int
-	for i := 0; i < l; i++ {
-		bufSize += p.valSize(s.Index(i))
-	}
-
-	n += len(p.tagcode)
-	n += sizeVarint(uint64(bufSize))
-	n += bufSize
-	return
-}
-
-// Encode a slice of slice of bytes ([][]byte).
-func (o *Buffer) enc_slice_slice_byte(p *Properties, base structPointer) error {
-	ss := *structPointer_BytesSlice(base, p.field)
-	l := len(ss)
-	if l == 0 {
-		return ErrNil
-	}
-	for i := 0; i < l; i++ {
-		o.buf = append(o.buf, p.tagcode...)
-		o.EncodeRawBytes(ss[i])
-	}
-	return nil
-}
-
-func size_slice_slice_byte(p *Properties, base structPointer) (n int) {
-	ss := *structPointer_BytesSlice(base, p.field)
-	l := len(ss)
-	if l == 0 {
-		return 0
-	}
-	n += l * len(p.tagcode)
-	for i := 0; i < l; i++ {
-		n += sizeRawBytes(ss[i])
-	}
-	return
-}
-
-// Encode a slice of strings ([]string).
-func (o *Buffer) enc_slice_string(p *Properties, base structPointer) error {
-	ss := *structPointer_StringSlice(base, p.field)
-	l := len(ss)
-	for i := 0; i < l; i++ {
-		o.buf = append(o.buf, p.tagcode...)
-		o.EncodeStringBytes(ss[i])
-	}
-	return nil
-}
-
-func size_slice_string(p *Properties, base structPointer) (n int) {
-	ss := *structPointer_StringSlice(base, p.field)
-	l := len(ss)
-	n += l * len(p.tagcode)
-	for i := 0; i < l; i++ {
-		n += sizeStringBytes(ss[i])
-	}
-	return
-}
-
-// Encode a slice of message structs ([]*struct).
-func (o *Buffer) enc_slice_struct_message(p *Properties, base structPointer) error {
-	var state errorState
-	s := structPointer_StructPointerSlice(base, p.field)
-	l := s.Len()
-
-	for i := 0; i < l; i++ {
-		structp := s.Index(i)
-		if structPointer_IsNil(structp) {
-			return errRepeatedHasNil
-		}
-
-		// Can the object marshal itself?
-		if p.isMarshaler {
-			m := structPointer_Interface(structp, p.stype).(Marshaler)
-			data, err := m.Marshal()
-			if err != nil && !state.shouldContinue(err, nil) {
-				return err
-			}
-			o.buf = append(o.buf, p.tagcode...)
-			o.EncodeRawBytes(data)
-			continue
-		}
-
-		o.buf = append(o.buf, p.tagcode...)
-		err := o.enc_len_struct(p.sprop, structp, &state)
-		if err != nil && !state.shouldContinue(err, nil) {
-			if err == ErrNil {
-				return errRepeatedHasNil
-			}
-			return err
-		}
-	}
-	return state.err
-}
-
-func size_slice_struct_message(p *Properties, base structPointer) (n int) {
-	s := structPointer_StructPointerSlice(base, p.field)
-	l := s.Len()
-	n += l * len(p.tagcode)
-	for i := 0; i < l; i++ {
-		structp := s.Index(i)
-		if structPointer_IsNil(structp) {
-			return // return the size up to this point
-		}
-
-		// Can the object marshal itself?
-		if p.isMarshaler {
-			m := structPointer_Interface(structp, p.stype).(Marshaler)
-			data, _ := m.Marshal()
-			n += len(p.tagcode)
-			n += sizeRawBytes(data)
-			continue
-		}
-
-		n0 := size_struct(p.sprop, structp)
-		n1 := sizeVarint(uint64(n0)) // size of encoded length
-		n += n0 + n1
-	}
-	return
-}
-
-// Encode a slice of group structs ([]*struct).
-func (o *Buffer) enc_slice_struct_group(p *Properties, base structPointer) error {
-	var state errorState
-	s := structPointer_StructPointerSlice(base, p.field)
-	l := s.Len()
-
-	for i := 0; i < l; i++ {
-		b := s.Index(i)
-		if structPointer_IsNil(b) {
-			return errRepeatedHasNil
-		}
-
-		o.EncodeVarint(uint64((p.Tag << 3) | WireStartGroup))
-
-		err := o.enc_struct(p.sprop, b)
-
-		if err != nil && !state.shouldContinue(err, nil) {
-			if err == ErrNil {
-				return errRepeatedHasNil
-			}
-			return err
-		}
-
-		o.EncodeVarint(uint64((p.Tag << 3) | WireEndGroup))
-	}
-	return state.err
-}
-
-func size_slice_struct_group(p *Properties, base structPointer) (n int) {
-	s := structPointer_StructPointerSlice(base, p.field)
-	l := s.Len()
-
-	n += l * sizeVarint(uint64((p.Tag<<3)|WireStartGroup))
-	n += l * sizeVarint(uint64((p.Tag<<3)|WireEndGroup))
-	for i := 0; i < l; i++ {
-		b := s.Index(i)
-		if structPointer_IsNil(b) {
-			return // return size up to this point
-		}
-
-		n += size_struct(p.sprop, b)
-	}
-	return
-}
-
-// Encode an extension map.
-func (o *Buffer) enc_map(p *Properties, base structPointer) error {
-	v := *structPointer_ExtMap(base, p.field)
-	if err := encodeExtensionMap(v); err != nil {
-		return err
-	}
-	// Fast-path for common cases: zero or one extensions.
-	if len(v) <= 1 {
-		for _, e := range v {
-			o.buf = append(o.buf, e.enc...)
-		}
-		return nil
-	}
-
-	// Sort keys to provide a deterministic encoding.
-	keys := make([]int, 0, len(v))
-	for k := range v {
-		keys = append(keys, int(k))
-	}
-	sort.Ints(keys)
-
-	for _, k := range keys {
-		o.buf = append(o.buf, v[int32(k)].enc...)
-	}
-	return nil
-}
-
-func size_map(p *Properties, base structPointer) int {
-	v := *structPointer_ExtMap(base, p.field)
-	return sizeExtensionMap(v)
-}
-
-// Encode a map field.
-func (o *Buffer) enc_new_map(p *Properties, base structPointer) error {
-	var state errorState // XXX: or do we need to plumb this through?
-
-	/*
-		A map defined as
-			map<key_type, value_type> map_field = N;
-		is encoded in the same way as
-			message MapFieldEntry {
-				key_type key = 1;
-				value_type value = 2;
-			}
-			repeated MapFieldEntry map_field = N;
-	*/
-
-	v := structPointer_NewAt(base, p.field, p.mtype).Elem() // map[K]V
-	if v.Len() == 0 {
-		return nil
-	}
-
-	keycopy, valcopy, keybase, valbase := mapEncodeScratch(p.mtype)
-
-	enc := func() error {
-		if err := p.mkeyprop.enc(o, p.mkeyprop, keybase); err != nil {
-			return err
-		}
-		if err := p.mvalprop.enc(o, p.mvalprop, valbase); err != nil {
-			return err
-		}
-		return nil
-	}
-
-	keys := v.MapKeys()
-	sort.Sort(mapKeys(keys))
-	for _, key := range keys {
-		val := v.MapIndex(key)
-
-		// The only illegal map entry values are nil message pointers.
-		if val.Kind() == reflect.Ptr && val.IsNil() {
-			return errors.New("proto: map has nil element")
-		}
-
-		keycopy.Set(key)
-		valcopy.Set(val)
-
-		o.buf = append(o.buf, p.tagcode...)
-		if err := o.enc_len_thing(enc, &state); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func size_new_map(p *Properties, base structPointer) int {
-	v := structPointer_NewAt(base, p.field, p.mtype).Elem() // map[K]V
-
-	keycopy, valcopy, keybase, valbase := mapEncodeScratch(p.mtype)
-
-	n := 0
-	for _, key := range v.MapKeys() {
-		val := v.MapIndex(key)
-		keycopy.Set(key)
-		valcopy.Set(val)
-
-		// Tag codes for key and val are the responsibility of the sub-sizer.
-		keysize := p.mkeyprop.size(p.mkeyprop, keybase)
-		valsize := p.mvalprop.size(p.mvalprop, valbase)
-		entry := keysize + valsize
-		// Add on tag code and length of map entry itself.
-		n += len(p.tagcode) + sizeVarint(uint64(entry)) + entry
-	}
-	return n
-}
-
-// mapEncodeScratch returns a new reflect.Value matching the map's value type,
-// and a structPointer suitable for passing to an encoder or sizer.
-func mapEncodeScratch(mapType reflect.Type) (keycopy, valcopy reflect.Value, keybase, valbase structPointer) {
-	// Prepare addressable doubly-indirect placeholders for the key and value types.
-	// This is needed because the element-type encoders expect **T, but the map iteration produces T.
-
-	keycopy = reflect.New(mapType.Key()).Elem()                 // addressable K
-	keyptr := reflect.New(reflect.PtrTo(keycopy.Type())).Elem() // addressable *K
-	keyptr.Set(keycopy.Addr())                                  //
-	keybase = toStructPointer(keyptr.Addr())                    // **K
-
-	// Value types are more varied and require special handling.
-	switch mapType.Elem().Kind() {
-	case reflect.Slice:
-		// []byte
-		var dummy []byte
-		valcopy = reflect.ValueOf(&dummy).Elem() // addressable []byte
-		valbase = toStructPointer(valcopy.Addr())
-	case reflect.Ptr:
-		// message; the generated field type is map[K]*Msg (so V is *Msg),
-		// so we only need one level of indirection.
-		valcopy = reflect.New(mapType.Elem()).Elem() // addressable V
-		valbase = toStructPointer(valcopy.Addr())
-	default:
-		// everything else
-		valcopy = reflect.New(mapType.Elem()).Elem()                // addressable V
-		valptr := reflect.New(reflect.PtrTo(valcopy.Type())).Elem() // addressable *V
-		valptr.Set(valcopy.Addr())                                  //
-		valbase = toStructPointer(valptr.Addr())                    // **V
-	}
-	return
-}
-
-// Encode a struct.
-func (o *Buffer) enc_struct(prop *StructProperties, base structPointer) error {
-	var state errorState
-	// Encode fields in tag order so that decoders may use optimizations
-	// that depend on the ordering.
-	// https://developers.google.com/protocol-buffers/docs/encoding#order
-	for _, i := range prop.order {
-		p := prop.Prop[i]
-		if p.enc != nil {
-			err := p.enc(o, p, base)
-			if err != nil {
-				if err == ErrNil {
-					if p.Required && state.err == nil {
-						state.err = &RequiredNotSetError{p.Name}
-					}
-				} else if err == errRepeatedHasNil {
-					// Give more context to nil values in repeated fields.
-					return errors.New("repeated field " + p.OrigName + " has nil element")
-				} else if !state.shouldContinue(err, p) {
-					return err
-				}
-			}
-		}
-	}
-
-	// Add unrecognized fields at the end.
-	if prop.unrecField.IsValid() {
-		v := *structPointer_Bytes(base, prop.unrecField)
-		if len(v) > 0 {
-			o.buf = append(o.buf, v...)
-		}
-	}
-
-	return state.err
-}
-
-func size_struct(prop *StructProperties, base structPointer) (n int) {
-	for _, i := range prop.order {
-		p := prop.Prop[i]
-		if p.size != nil {
-			n += p.size(p, base)
-		}
-	}
-
-	// Add unrecognized fields at the end.
-	if prop.unrecField.IsValid() {
-		v := *structPointer_Bytes(base, prop.unrecField)
-		n += len(v)
-	}
-
-	return
-}
-
-var zeroes [20]byte // longer than any conceivable sizeVarint
-
-// Encode a struct, preceded by its encoded length (as a varint).
-func (o *Buffer) enc_len_struct(prop *StructProperties, base structPointer, state *errorState) error {
-	return o.enc_len_thing(func() error { return o.enc_struct(prop, base) }, state)
-}
-
-// Encode something, preceded by its encoded length (as a varint).
-func (o *Buffer) enc_len_thing(enc func() error, state *errorState) error {
-	iLen := len(o.buf)
-	o.buf = append(o.buf, 0, 0, 0, 0) // reserve four bytes for length
-	iMsg := len(o.buf)
-	err := enc()
-	if err != nil && !state.shouldContinue(err, nil) {
-		return err
-	}
-	lMsg := len(o.buf) - iMsg
-	lLen := sizeVarint(uint64(lMsg))
-	switch x := lLen - (iMsg - iLen); {
-	case x > 0: // actual length is x bytes larger than the space we reserved
-		// Move msg x bytes right.
-		o.buf = append(o.buf, zeroes[:x]...)
-		copy(o.buf[iMsg+x:], o.buf[iMsg:iMsg+lMsg])
-	case x < 0: // actual length is x bytes smaller than the space we reserved
-		// Move msg x bytes left.
-		copy(o.buf[iMsg+x:], o.buf[iMsg:iMsg+lMsg])
-		o.buf = o.buf[:len(o.buf)+x] // x is negative
-	}
-	// Encode the length in the reserved space.
-	o.buf = o.buf[:iLen]
-	o.EncodeVarint(uint64(lMsg))
-	o.buf = o.buf[:len(o.buf)+lMsg]
-	return state.err
-}
-
-// errorState maintains the first error that occurs and updates that error
-// with additional context.
-type errorState struct {
-	err error
-}
-
-// shouldContinue reports whether encoding should continue upon encountering the
-// given error. If the error is RequiredNotSetError, shouldContinue returns true
-// and, if this is the first appearance of that error, remembers it for future
-// reporting.
-//
-// If prop is not nil, it may update any error with additional context about the
-// field with the error.
-func (s *errorState) shouldContinue(err error, prop *Properties) bool {
-	// Ignore unset required fields.
-	reqNotSet, ok := err.(*RequiredNotSetError)
-	if !ok {
-		return false
-	}
-	if s.err == nil {
-		if prop != nil {
-			err = &RequiredNotSetError{prop.Name + "." + reqNotSet.field}
-		}
-		s.err = err
-	}
-	return true
-}
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/encode_gogo.go b/Godeps/_workspace/src/github.com/gogo/protobuf/proto/encode_gogo.go
deleted file mode 100644
index f77cfb1ee..000000000
--- a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/encode_gogo.go
+++ /dev/null
@@ -1,354 +0,0 @@
-// Extensions for Protocol Buffers to create more go like structures.
-//
-// Copyright (c) 2013, Vastech SA (PTY) LTD. All rights reserved.
-// http://github.com/gogo/protobuf/gogoproto
-//
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2010 The Go Authors.  All rights reserved.
-// http://github.com/golang/protobuf/
-//
-// 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.
-
-package proto
-
-import (
-	"reflect"
-)
-
-func NewRequiredNotSetError(field string) *RequiredNotSetError {
-	return &RequiredNotSetError{field}
-}
-
-type Sizer interface {
-	Size() int
-}
-
-func (o *Buffer) enc_ext_slice_byte(p *Properties, base structPointer) error {
-	s := *structPointer_Bytes(base, p.field)
-	if s == nil {
-		return ErrNil
-	}
-	o.buf = append(o.buf, s...)
-	return nil
-}
-
-func size_ext_slice_byte(p *Properties, base structPointer) (n int) {
-	s := *structPointer_Bytes(base, p.field)
-	if s == nil {
-		return 0
-	}
-	n += len(s)
-	return
-}
-
-// Encode a reference to bool pointer.
-func (o *Buffer) enc_ref_bool(p *Properties, base structPointer) error {
-	v := *structPointer_BoolVal(base, p.field)
-	x := 0
-	if v {
-		x = 1
-	}
-	o.buf = append(o.buf, p.tagcode...)
-	p.valEnc(o, uint64(x))
-	return nil
-}
-
-func size_ref_bool(p *Properties, base structPointer) int {
-	return len(p.tagcode) + 1 // each bool takes exactly one byte
-}
-
-// Encode a reference to int32 pointer.
-func (o *Buffer) enc_ref_int32(p *Properties, base structPointer) error {
-	v := structPointer_Word32Val(base, p.field)
-	x := int32(word32Val_Get(v))
-	o.buf = append(o.buf, p.tagcode...)
-	p.valEnc(o, uint64(x))
-	return nil
-}
-
-func size_ref_int32(p *Properties, base structPointer) (n int) {
-	v := structPointer_Word32Val(base, p.field)
-	x := int32(word32Val_Get(v))
-	n += len(p.tagcode)
-	n += p.valSize(uint64(x))
-	return
-}
-
-func (o *Buffer) enc_ref_uint32(p *Properties, base structPointer) error {
-	v := structPointer_Word32Val(base, p.field)
-	x := word32Val_Get(v)
-	o.buf = append(o.buf, p.tagcode...)
-	p.valEnc(o, uint64(x))
-	return nil
-}
-
-func size_ref_uint32(p *Properties, base structPointer) (n int) {
-	v := structPointer_Word32Val(base, p.field)
-	x := word32Val_Get(v)
-	n += len(p.tagcode)
-	n += p.valSize(uint64(x))
-	return
-}
-
-// Encode a reference to an int64 pointer.
-func (o *Buffer) enc_ref_int64(p *Properties, base structPointer) error {
-	v := structPointer_Word64Val(base, p.field)
-	x := word64Val_Get(v)
-	o.buf = append(o.buf, p.tagcode...)
-	p.valEnc(o, x)
-	return nil
-}
-
-func size_ref_int64(p *Properties, base structPointer) (n int) {
-	v := structPointer_Word64Val(base, p.field)
-	x := word64Val_Get(v)
-	n += len(p.tagcode)
-	n += p.valSize(x)
-	return
-}
-
-// Encode a reference to a string pointer.
-func (o *Buffer) enc_ref_string(p *Properties, base structPointer) error {
-	v := *structPointer_StringVal(base, p.field)
-	o.buf = append(o.buf, p.tagcode...)
-	o.EncodeStringBytes(v)
-	return nil
-}
-
-func size_ref_string(p *Properties, base structPointer) (n int) {
-	v := *structPointer_StringVal(base, p.field)
-	n += len(p.tagcode)
-	n += sizeStringBytes(v)
-	return
-}
-
-// Encode a reference to a message struct.
-func (o *Buffer) enc_ref_struct_message(p *Properties, base structPointer) error {
-	var state errorState
-	structp := structPointer_GetRefStructPointer(base, p.field)
-	if structPointer_IsNil(structp) {
-		return ErrNil
-	}
-
-	// Can the object marshal itself?
-	if p.isMarshaler {
-		m := structPointer_Interface(structp, p.stype).(Marshaler)
-		data, err := m.Marshal()
-		if err != nil && !state.shouldContinue(err, nil) {
-			return err
-		}
-		o.buf = append(o.buf, p.tagcode...)
-		o.EncodeRawBytes(data)
-		return nil
-	}
-
-	o.buf = append(o.buf, p.tagcode...)
-	return o.enc_len_struct(p.sprop, structp, &state)
-}
-
-//TODO this is only copied, please fix this
-func size_ref_struct_message(p *Properties, base structPointer) int {
-	structp := structPointer_GetRefStructPointer(base, p.field)
-	if structPointer_IsNil(structp) {
-		return 0
-	}
-
-	// Can the object marshal itself?
-	if p.isMarshaler {
-		m := structPointer_Interface(structp, p.stype).(Marshaler)
-		data, _ := m.Marshal()
-		n0 := len(p.tagcode)
-		n1 := sizeRawBytes(data)
-		return n0 + n1
-	}
-
-	n0 := len(p.tagcode)
-	n1 := size_struct(p.sprop, structp)
-	n2 := sizeVarint(uint64(n1)) // size of encoded length
-	return n0 + n1 + n2
-}
-
-// Encode a slice of references to message struct pointers ([]struct).
-func (o *Buffer) enc_slice_ref_struct_message(p *Properties, base structPointer) error {
-	var state errorState
-	ss := structPointer_GetStructPointer(base, p.field)
-	ss1 := structPointer_GetRefStructPointer(ss, field(0))
-	size := p.stype.Size()
-	l := structPointer_Len(base, p.field)
-	for i := 0; i < l; i++ {
-		structp := structPointer_Add(ss1, field(uintptr(i)*size))
-		if structPointer_IsNil(structp) {
-			return errRepeatedHasNil
-		}
-
-		// Can the object marshal itself?
-		if p.isMarshaler {
-			m := structPointer_Interface(structp, p.stype).(Marshaler)
-			data, err := m.Marshal()
-			if err != nil && !state.shouldContinue(err, nil) {
-				return err
-			}
-			o.buf = append(o.buf, p.tagcode...)
-			o.EncodeRawBytes(data)
-			continue
-		}
-
-		o.buf = append(o.buf, p.tagcode...)
-		err := o.enc_len_struct(p.sprop, structp, &state)
-		if err != nil && !state.shouldContinue(err, nil) {
-			if err == ErrNil {
-				return errRepeatedHasNil
-			}
-			return err
-		}
-
-	}
-	return state.err
-}
-
-//TODO this is only copied, please fix this
-func size_slice_ref_struct_message(p *Properties, base structPointer) (n int) {
-	ss := structPointer_GetStructPointer(base, p.field)
-	ss1 := structPointer_GetRefStructPointer(ss, field(0))
-	size := p.stype.Size()
-	l := structPointer_Len(base, p.field)
-	n += l * len(p.tagcode)
-	for i := 0; i < l; i++ {
-		structp := structPointer_Add(ss1, field(uintptr(i)*size))
-		if structPointer_IsNil(structp) {
-			return // return the size up to this point
-		}
-
-		// Can the object marshal itself?
-		if p.isMarshaler {
-			m := structPointer_Interface(structp, p.stype).(Marshaler)
-			data, _ := m.Marshal()
-			n += len(p.tagcode)
-			n += sizeRawBytes(data)
-			continue
-		}
-
-		n0 := size_struct(p.sprop, structp)
-		n1 := sizeVarint(uint64(n0)) // size of encoded length
-		n += n0 + n1
-	}
-	return
-}
-
-func (o *Buffer) enc_custom_bytes(p *Properties, base structPointer) error {
-	i := structPointer_InterfaceRef(base, p.field, p.ctype)
-	if i == nil {
-		return ErrNil
-	}
-	custom := i.(Marshaler)
-	data, err := custom.Marshal()
-	if err != nil {
-		return err
-	}
-	if data == nil {
-		return ErrNil
-	}
-	o.buf = append(o.buf, p.tagcode...)
-	o.EncodeRawBytes(data)
-	return nil
-}
-
-func size_custom_bytes(p *Properties, base structPointer) (n int) {
-	n += len(p.tagcode)
-	i := structPointer_InterfaceRef(base, p.field, p.ctype)
-	if i == nil {
-		return 0
-	}
-	custom := i.(Marshaler)
-	data, _ := custom.Marshal()
-	n += sizeRawBytes(data)
-	return
-}
-
-func (o *Buffer) enc_custom_ref_bytes(p *Properties, base structPointer) error {
-	custom := structPointer_InterfaceAt(base, p.field, p.ctype).(Marshaler)
-	data, err := custom.Marshal()
-	if err != nil {
-		return err
-	}
-	if data == nil {
-		return ErrNil
-	}
-	o.buf = append(o.buf, p.tagcode...)
-	o.EncodeRawBytes(data)
-	return nil
-}
-
-func size_custom_ref_bytes(p *Properties, base structPointer) (n int) {
-	n += len(p.tagcode)
-	i := structPointer_InterfaceAt(base, p.field, p.ctype)
-	if i == nil {
-		return 0
-	}
-	custom := i.(Marshaler)
-	data, _ := custom.Marshal()
-	n += sizeRawBytes(data)
-	return
-}
-
-func (o *Buffer) enc_custom_slice_bytes(p *Properties, base structPointer) error {
-	inter := structPointer_InterfaceRef(base, p.field, p.ctype)
-	if inter == nil {
-		return ErrNil
-	}
-	slice := reflect.ValueOf(inter)
-	l := slice.Len()
-	for i := 0; i < l; i++ {
-		v := slice.Index(i)
-		custom := v.Interface().(Marshaler)
-		data, err := custom.Marshal()
-		if err != nil {
-			return err
-		}
-		o.buf = append(o.buf, p.tagcode...)
-		o.EncodeRawBytes(data)
-	}
-	return nil
-}
-
-func size_custom_slice_bytes(p *Properties, base structPointer) (n int) {
-	inter := structPointer_InterfaceRef(base, p.field, p.ctype)
-	if inter == nil {
-		return 0
-	}
-	slice := reflect.ValueOf(inter)
-	l := slice.Len()
-	n += l * len(p.tagcode)
-	for i := 0; i < l; i++ {
-		v := slice.Index(i)
-		custom := v.Interface().(Marshaler)
-		data, _ := custom.Marshal()
-		n += sizeRawBytes(data)
-	}
-	return
-}
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/equal.go b/Godeps/_workspace/src/github.com/gogo/protobuf/proto/equal.go
deleted file mode 100644
index d8673a3e9..000000000
--- a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/equal.go
+++ /dev/null
@@ -1,256 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2011 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// 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.
-
-// Protocol buffer comparison.
-// TODO: MessageSet.
-
-package proto
-
-import (
-	"bytes"
-	"log"
-	"reflect"
-	"strings"
-)
-
-/*
-Equal returns true iff protocol buffers a and b are equal.
-The arguments must both be pointers to protocol buffer structs.
-
-Equality is defined in this way:
-  - Two messages are equal iff they are the same type,
-    corresponding fields are equal, unknown field sets
-    are equal, and extensions sets are equal.
-  - Two set scalar fields are equal iff their values are equal.
-    If the fields are of a floating-point type, remember that
-    NaN != x for all x, including NaN.
-  - Two repeated fields are equal iff their lengths are the same,
-    and their corresponding elements are equal (a "bytes" field,
-    although represented by []byte, is not a repeated field)
-  - Two unset fields are equal.
-  - Two unknown field sets are equal if their current
-    encoded state is equal.
-  - Two extension sets are equal iff they have corresponding
-    elements that are pairwise equal.
-  - Every other combination of things are not equal.
-
-The return value is undefined if a and b are not protocol buffers.
-*/
-func Equal(a, b Message) bool {
-	if a == nil || b == nil {
-		return a == b
-	}
-	v1, v2 := reflect.ValueOf(a), reflect.ValueOf(b)
-	if v1.Type() != v2.Type() {
-		return false
-	}
-	if v1.Kind() == reflect.Ptr {
-		if v1.IsNil() {
-			return v2.IsNil()
-		}
-		if v2.IsNil() {
-			return false
-		}
-		v1, v2 = v1.Elem(), v2.Elem()
-	}
-	if v1.Kind() != reflect.Struct {
-		return false
-	}
-	return equalStruct(v1, v2)
-}
-
-// v1 and v2 are known to have the same type.
-func equalStruct(v1, v2 reflect.Value) bool {
-	for i := 0; i < v1.NumField(); i++ {
-		f := v1.Type().Field(i)
-		if strings.HasPrefix(f.Name, "XXX_") {
-			continue
-		}
-		f1, f2 := v1.Field(i), v2.Field(i)
-		if f.Type.Kind() == reflect.Ptr {
-			if n1, n2 := f1.IsNil(), f2.IsNil(); n1 && n2 {
-				// both unset
-				continue
-			} else if n1 != n2 {
-				// set/unset mismatch
-				return false
-			}
-			b1, ok := f1.Interface().(raw)
-			if ok {
-				b2 := f2.Interface().(raw)
-				// RawMessage
-				if !bytes.Equal(b1.Bytes(), b2.Bytes()) {
-					return false
-				}
-				continue
-			}
-			f1, f2 = f1.Elem(), f2.Elem()
-		}
-		if !equalAny(f1, f2) {
-			return false
-		}
-	}
-
-	if em1 := v1.FieldByName("XXX_extensions"); em1.IsValid() {
-		em2 := v2.FieldByName("XXX_extensions")
-		if !equalExtensions(v1.Type(), em1.Interface().(map[int32]Extension), em2.Interface().(map[int32]Extension)) {
-			return false
-		}
-	}
-
-	uf := v1.FieldByName("XXX_unrecognized")
-	if !uf.IsValid() {
-		return true
-	}
-
-	u1 := uf.Bytes()
-	u2 := v2.FieldByName("XXX_unrecognized").Bytes()
-	if !bytes.Equal(u1, u2) {
-		return false
-	}
-
-	return true
-}
-
-// v1 and v2 are known to have the same type.
-func equalAny(v1, v2 reflect.Value) bool {
-	if v1.Type() == protoMessageType {
-		m1, _ := v1.Interface().(Message)
-		m2, _ := v2.Interface().(Message)
-		return Equal(m1, m2)
-	}
-	switch v1.Kind() {
-	case reflect.Bool:
-		return v1.Bool() == v2.Bool()
-	case reflect.Float32, reflect.Float64:
-		return v1.Float() == v2.Float()
-	case reflect.Int32, reflect.Int64:
-		return v1.Int() == v2.Int()
-	case reflect.Map:
-		if v1.Len() != v2.Len() {
-			return false
-		}
-		for _, key := range v1.MapKeys() {
-			val2 := v2.MapIndex(key)
-			if !val2.IsValid() {
-				// This key was not found in the second map.
-				return false
-			}
-			if !equalAny(v1.MapIndex(key), val2) {
-				return false
-			}
-		}
-		return true
-	case reflect.Ptr:
-		return equalAny(v1.Elem(), v2.Elem())
-	case reflect.Slice:
-		if v1.Type().Elem().Kind() == reflect.Uint8 {
-			// short circuit: []byte
-			if v1.IsNil() != v2.IsNil() {
-				return false
-			}
-			return bytes.Equal(v1.Interface().([]byte), v2.Interface().([]byte))
-		}
-
-		if v1.Len() != v2.Len() {
-			return false
-		}
-		for i := 0; i < v1.Len(); i++ {
-			if !equalAny(v1.Index(i), v2.Index(i)) {
-				return false
-			}
-		}
-		return true
-	case reflect.String:
-		return v1.Interface().(string) == v2.Interface().(string)
-	case reflect.Struct:
-		return equalStruct(v1, v2)
-	case reflect.Uint32, reflect.Uint64:
-		return v1.Uint() == v2.Uint()
-	}
-
-	// unknown type, so not a protocol buffer
-	log.Printf("proto: don't know how to compare %v", v1)
-	return false
-}
-
-// base is the struct type that the extensions are based on.
-// em1 and em2 are extension maps.
-func equalExtensions(base reflect.Type, em1, em2 map[int32]Extension) bool {
-	if len(em1) != len(em2) {
-		return false
-	}
-
-	for extNum, e1 := range em1 {
-		e2, ok := em2[extNum]
-		if !ok {
-			return false
-		}
-
-		m1, m2 := e1.value, e2.value
-
-		if m1 != nil && m2 != nil {
-			// Both are unencoded.
-			if !equalAny(reflect.ValueOf(m1), reflect.ValueOf(m2)) {
-				return false
-			}
-			continue
-		}
-
-		// At least one is encoded. To do a semantically correct comparison
-		// we need to unmarshal them first.
-		var desc *ExtensionDesc
-		if m := extensionMaps[base]; m != nil {
-			desc = m[extNum]
-		}
-		if desc == nil {
-			log.Printf("proto: don't know how to compare extension %d of %v", extNum, base)
-			continue
-		}
-		var err error
-		if m1 == nil {
-			m1, err = decodeExtension(e1.enc, desc)
-		}
-		if m2 == nil && err == nil {
-			m2, err = decodeExtension(e2.enc, desc)
-		}
-		if err != nil {
-			// The encoded form is invalid.
-			log.Printf("proto: badly encoded extension %d of %v: %v", extNum, base, err)
-			return false
-		}
-		if !equalAny(reflect.ValueOf(m1), reflect.ValueOf(m2)) {
-			return false
-		}
-	}
-
-	return true
-}
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/equal_test.go b/Godeps/_workspace/src/github.com/gogo/protobuf/proto/equal_test.go
deleted file mode 100644
index ef6048008..000000000
--- a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/equal_test.go
+++ /dev/null
@@ -1,191 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2011 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// 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.
-
-package proto_test
-
-import (
-	"testing"
-
-	. "github.com/gogo/protobuf/proto"
-	pb "github.com/gogo/protobuf/proto/testdata"
-)
-
-// Four identical base messages.
-// The init function adds extensions to some of them.
-var messageWithoutExtension = &pb.MyMessage{Count: Int32(7)}
-var messageWithExtension1a = &pb.MyMessage{Count: Int32(7)}
-var messageWithExtension1b = &pb.MyMessage{Count: Int32(7)}
-var messageWithExtension2 = &pb.MyMessage{Count: Int32(7)}
-
-// Two messages with non-message extensions.
-var messageWithInt32Extension1 = &pb.MyMessage{Count: Int32(8)}
-var messageWithInt32Extension2 = &pb.MyMessage{Count: Int32(8)}
-
-func init() {
-	ext1 := &pb.Ext{Data: String("Kirk")}
-	ext2 := &pb.Ext{Data: String("Picard")}
-
-	// messageWithExtension1a has ext1, but never marshals it.
-	if err := SetExtension(messageWithExtension1a, pb.E_Ext_More, ext1); err != nil {
-		panic("SetExtension on 1a failed: " + err.Error())
-	}
-
-	// messageWithExtension1b is the unmarshaled form of messageWithExtension1a.
-	if err := SetExtension(messageWithExtension1b, pb.E_Ext_More, ext1); err != nil {
-		panic("SetExtension on 1b failed: " + err.Error())
-	}
-	buf, err := Marshal(messageWithExtension1b)
-	if err != nil {
-		panic("Marshal of 1b failed: " + err.Error())
-	}
-	messageWithExtension1b.Reset()
-	if err := Unmarshal(buf, messageWithExtension1b); err != nil {
-		panic("Unmarshal of 1b failed: " + err.Error())
-	}
-
-	// messageWithExtension2 has ext2.
-	if err := SetExtension(messageWithExtension2, pb.E_Ext_More, ext2); err != nil {
-		panic("SetExtension on 2 failed: " + err.Error())
-	}
-
-	if err := SetExtension(messageWithInt32Extension1, pb.E_Ext_Number, Int32(23)); err != nil {
-		panic("SetExtension on Int32-1 failed: " + err.Error())
-	}
-	if err := SetExtension(messageWithInt32Extension1, pb.E_Ext_Number, Int32(24)); err != nil {
-		panic("SetExtension on Int32-2 failed: " + err.Error())
-	}
-}
-
-var EqualTests = []struct {
-	desc string
-	a, b Message
-	exp  bool
-}{
-	{"different types", &pb.GoEnum{}, &pb.GoTestField{}, false},
-	{"equal empty", &pb.GoEnum{}, &pb.GoEnum{}, true},
-	{"nil vs nil", nil, nil, true},
-	{"typed nil vs typed nil", (*pb.GoEnum)(nil), (*pb.GoEnum)(nil), true},
-	{"typed nil vs empty", (*pb.GoEnum)(nil), &pb.GoEnum{}, false},
-	{"different typed nil", (*pb.GoEnum)(nil), (*pb.GoTestField)(nil), false},
-
-	{"one set field, one unset field", &pb.GoTestField{Label: String("foo")}, &pb.GoTestField{}, false},
-	{"one set field zero, one unset field", &pb.GoTest{Param: Int32(0)}, &pb.GoTest{}, false},
-	{"different set fields", &pb.GoTestField{Label: String("foo")}, &pb.GoTestField{Label: String("bar")}, false},
-	{"equal set", &pb.GoTestField{Label: String("foo")}, &pb.GoTestField{Label: String("foo")}, true},
-
-	{"repeated, one set", &pb.GoTest{F_Int32Repeated: []int32{2, 3}}, &pb.GoTest{}, false},
-	{"repeated, different length", &pb.GoTest{F_Int32Repeated: []int32{2, 3}}, &pb.GoTest{F_Int32Repeated: []int32{2}}, false},
-	{"repeated, different value", &pb.GoTest{F_Int32Repeated: []int32{2}}, &pb.GoTest{F_Int32Repeated: []int32{3}}, false},
-	{"repeated, equal", &pb.GoTest{F_Int32Repeated: []int32{2, 4}}, &pb.GoTest{F_Int32Repeated: []int32{2, 4}}, true},
-	{"repeated, nil equal nil", &pb.GoTest{F_Int32Repeated: nil}, &pb.GoTest{F_Int32Repeated: nil}, true},
-	{"repeated, nil equal empty", &pb.GoTest{F_Int32Repeated: nil}, &pb.GoTest{F_Int32Repeated: []int32{}}, true},
-	{"repeated, empty equal nil", &pb.GoTest{F_Int32Repeated: []int32{}}, &pb.GoTest{F_Int32Repeated: nil}, true},
-
-	{
-		"nested, different",
-		&pb.GoTest{RequiredField: &pb.GoTestField{Label: String("foo")}},
-		&pb.GoTest{RequiredField: &pb.GoTestField{Label: String("bar")}},
-		false,
-	},
-	{
-		"nested, equal",
-		&pb.GoTest{RequiredField: &pb.GoTestField{Label: String("wow")}},
-		&pb.GoTest{RequiredField: &pb.GoTestField{Label: String("wow")}},
-		true,
-	},
-
-	{"bytes", &pb.OtherMessage{Value: []byte("foo")}, &pb.OtherMessage{Value: []byte("foo")}, true},
-	{"bytes, empty", &pb.OtherMessage{Value: []byte{}}, &pb.OtherMessage{Value: []byte{}}, true},
-	{"bytes, empty vs nil", &pb.OtherMessage{Value: []byte{}}, &pb.OtherMessage{Value: nil}, false},
-	{
-		"repeated bytes",
-		&pb.MyMessage{RepBytes: [][]byte{[]byte("sham"), []byte("wow")}},
-		&pb.MyMessage{RepBytes: [][]byte{[]byte("sham"), []byte("wow")}},
-		true,
-	},
-
-	{"extension vs. no extension", messageWithoutExtension, messageWithExtension1a, false},
-	{"extension vs. same extension", messageWithExtension1a, messageWithExtension1b, true},
-	{"extension vs. different extension", messageWithExtension1a, messageWithExtension2, false},
-
-	{"int32 extension vs. itself", messageWithInt32Extension1, messageWithInt32Extension1, true},
-	{"int32 extension vs. a different int32", messageWithInt32Extension1, messageWithInt32Extension2, false},
-
-	{
-		"message with group",
-		&pb.MyMessage{
-			Count: Int32(1),
-			Somegroup: &pb.MyMessage_SomeGroup{
-				GroupField: Int32(5),
-			},
-		},
-		&pb.MyMessage{
-			Count: Int32(1),
-			Somegroup: &pb.MyMessage_SomeGroup{
-				GroupField: Int32(5),
-			},
-		},
-		true,
-	},
-
-	{
-		"map same",
-		&pb.MessageWithMap{NameMapping: map[int32]string{1: "Ken"}},
-		&pb.MessageWithMap{NameMapping: map[int32]string{1: "Ken"}},
-		true,
-	},
-	{
-		"map different entry",
-		&pb.MessageWithMap{NameMapping: map[int32]string{1: "Ken"}},
-		&pb.MessageWithMap{NameMapping: map[int32]string{2: "Rob"}},
-		false,
-	},
-	{
-		"map different key only",
-		&pb.MessageWithMap{NameMapping: map[int32]string{1: "Ken"}},
-		&pb.MessageWithMap{NameMapping: map[int32]string{2: "Ken"}},
-		false,
-	},
-	{
-		"map different value only",
-		&pb.MessageWithMap{NameMapping: map[int32]string{1: "Ken"}},
-		&pb.MessageWithMap{NameMapping: map[int32]string{1: "Rob"}},
-		false,
-	},
-}
-
-func TestEqual(t *testing.T) {
-	for _, tc := range EqualTests {
-		if res := Equal(tc.a, tc.b); res != tc.exp {
-			t.Errorf("%v: Equal(%v, %v) = %v, want %v", tc.desc, tc.a, tc.b, res, tc.exp)
-		}
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/extensions.go b/Godeps/_workspace/src/github.com/gogo/protobuf/proto/extensions.go
deleted file mode 100644
index 9a6374fdb..000000000
--- a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/extensions.go
+++ /dev/null
@@ -1,519 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2010 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// 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.
-
-package proto
-
-/*
- * Types and routines for supporting protocol buffer extensions.
- */
-
-import (
-	"errors"
-	"fmt"
-	"reflect"
-	"strconv"
-	"sync"
-)
-
-// ErrMissingExtension is the error returned by GetExtension if the named extension is not in the message.
-var ErrMissingExtension = errors.New("proto: missing extension")
-
-// ExtensionRange represents a range of message extensions for a protocol buffer.
-// Used in code generated by the protocol compiler.
-type ExtensionRange struct {
-	Start, End int32 // both inclusive
-}
-
-// extendableProto is an interface implemented by any protocol buffer that may be extended.
-type extendableProto interface {
-	Message
-	ExtensionRangeArray() []ExtensionRange
-}
-
-type extensionsMap interface {
-	extendableProto
-	ExtensionMap() map[int32]Extension
-}
-
-type extensionsBytes interface {
-	extendableProto
-	GetExtensions() *[]byte
-}
-
-var extendableProtoType = reflect.TypeOf((*extendableProto)(nil)).Elem()
-
-// ExtensionDesc represents an extension specification.
-// Used in generated code from the protocol compiler.
-type ExtensionDesc struct {
-	ExtendedType  Message     // nil pointer to the type that is being extended
-	ExtensionType interface{} // nil pointer to the extension type
-	Field         int32       // field number
-	Name          string      // fully-qualified name of extension, for text formatting
-	Tag           string      // protobuf tag style
-}
-
-func (ed *ExtensionDesc) repeated() bool {
-	t := reflect.TypeOf(ed.ExtensionType)
-	return t.Kind() == reflect.Slice && t.Elem().Kind() != reflect.Uint8
-}
-
-// Extension represents an extension in a message.
-type Extension struct {
-	// When an extension is stored in a message using SetExtension
-	// only desc and value are set. When the message is marshaled
-	// enc will be set to the encoded form of the message.
-	//
-	// When a message is unmarshaled and contains extensions, each
-	// extension will have only enc set. When such an extension is
-	// accessed using GetExtension (or GetExtensions) desc and value
-	// will be set.
-	desc  *ExtensionDesc
-	value interface{}
-	enc   []byte
-}
-
-// SetRawExtension is for testing only.
-func SetRawExtension(base extendableProto, id int32, b []byte) {
-	if ebase, ok := base.(extensionsMap); ok {
-		ebase.ExtensionMap()[id] = Extension{enc: b}
-	} else if ebase, ok := base.(extensionsBytes); ok {
-		clearExtension(base, id)
-		ext := ebase.GetExtensions()
-		*ext = append(*ext, b...)
-	} else {
-		panic("unreachable")
-	}
-}
-
-// isExtensionField returns true iff the given field number is in an extension range.
-func isExtensionField(pb extendableProto, field int32) bool {
-	for _, er := range pb.ExtensionRangeArray() {
-		if er.Start <= field && field <= er.End {
-			return true
-		}
-	}
-	return false
-}
-
-// checkExtensionTypes checks that the given extension is valid for pb.
-func checkExtensionTypes(pb extendableProto, extension *ExtensionDesc) error {
-	// Check the extended type.
-	if a, b := reflect.TypeOf(pb), reflect.TypeOf(extension.ExtendedType); a != b {
-		return errors.New("proto: bad extended type; " + b.String() + " does not extend " + a.String())
-	}
-	// Check the range.
-	if !isExtensionField(pb, extension.Field) {
-		return errors.New("proto: bad extension number; not in declared ranges")
-	}
-	return nil
-}
-
-// extPropKey is sufficient to uniquely identify an extension.
-type extPropKey struct {
-	base  reflect.Type
-	field int32
-}
-
-var extProp = struct {
-	sync.RWMutex
-	m map[extPropKey]*Properties
-}{
-	m: make(map[extPropKey]*Properties),
-}
-
-func extensionProperties(ed *ExtensionDesc) *Properties {
-	key := extPropKey{base: reflect.TypeOf(ed.ExtendedType), field: ed.Field}
-
-	extProp.RLock()
-	if prop, ok := extProp.m[key]; ok {
-		extProp.RUnlock()
-		return prop
-	}
-	extProp.RUnlock()
-
-	extProp.Lock()
-	defer extProp.Unlock()
-	// Check again.
-	if prop, ok := extProp.m[key]; ok {
-		return prop
-	}
-
-	prop := new(Properties)
-	prop.Init(reflect.TypeOf(ed.ExtensionType), "unknown_name", ed.Tag, nil)
-	extProp.m[key] = prop
-	return prop
-}
-
-// encodeExtensionMap encodes any unmarshaled (unencoded) extensions in m.
-func encodeExtensionMap(m map[int32]Extension) error {
-	for k, e := range m {
-		err := encodeExtension(&e)
-		if err != nil {
-			return err
-		}
-		m[k] = e
-	}
-	return nil
-}
-
-func encodeExtension(e *Extension) error {
-	if e.value == nil || e.desc == nil {
-		// Extension is only in its encoded form.
-		return nil
-	}
-	// We don't skip extensions that have an encoded form set,
-	// because the extension value may have been mutated after
-	// the last time this function was called.
-
-	et := reflect.TypeOf(e.desc.ExtensionType)
-	props := extensionProperties(e.desc)
-
-	p := NewBuffer(nil)
-	// If e.value has type T, the encoder expects a *struct{ X T }.
-	// Pass a *T with a zero field and hope it all works out.
-	x := reflect.New(et)
-	x.Elem().Set(reflect.ValueOf(e.value))
-	if err := props.enc(p, props, toStructPointer(x)); err != nil {
-		return err
-	}
-	e.enc = p.buf
-	return nil
-}
-
-func sizeExtensionMap(m map[int32]Extension) (n int) {
-	for _, e := range m {
-		if e.value == nil || e.desc == nil {
-			// Extension is only in its encoded form.
-			n += len(e.enc)
-			continue
-		}
-
-		// We don't skip extensions that have an encoded form set,
-		// because the extension value may have been mutated after
-		// the last time this function was called.
-
-		et := reflect.TypeOf(e.desc.ExtensionType)
-		props := extensionProperties(e.desc)
-
-		// If e.value has type T, the encoder expects a *struct{ X T }.
-		// Pass a *T with a zero field and hope it all works out.
-		x := reflect.New(et)
-		x.Elem().Set(reflect.ValueOf(e.value))
-		n += props.size(props, toStructPointer(x))
-	}
-	return
-}
-
-// HasExtension returns whether the given extension is present in pb.
-func HasExtension(pb extendableProto, extension *ExtensionDesc) bool {
-	// TODO: Check types, field numbers, etc.?
-	if epb, doki := pb.(extensionsMap); doki {
-		_, ok := epb.ExtensionMap()[extension.Field]
-		return ok
-	} else if epb, doki := pb.(extensionsBytes); doki {
-		ext := epb.GetExtensions()
-		buf := *ext
-		o := 0
-		for o < len(buf) {
-			tag, n := DecodeVarint(buf[o:])
-			fieldNum := int32(tag >> 3)
-			if int32(fieldNum) == extension.Field {
-				return true
-			}
-			wireType := int(tag & 0x7)
-			o += n
-			l, err := size(buf[o:], wireType)
-			if err != nil {
-				return false
-			}
-			o += l
-		}
-		return false
-	}
-	panic("unreachable")
-}
-
-func deleteExtension(pb extensionsBytes, theFieldNum int32, offset int) int {
-	ext := pb.GetExtensions()
-	for offset < len(*ext) {
-		tag, n1 := DecodeVarint((*ext)[offset:])
-		fieldNum := int32(tag >> 3)
-		wireType := int(tag & 0x7)
-		n2, err := size((*ext)[offset+n1:], wireType)
-		if err != nil {
-			panic(err)
-		}
-		newOffset := offset + n1 + n2
-		if fieldNum == theFieldNum {
-			*ext = append((*ext)[:offset], (*ext)[newOffset:]...)
-			return offset
-		}
-		offset = newOffset
-	}
-	return -1
-}
-
-func clearExtension(pb extendableProto, fieldNum int32) {
-	if epb, doki := pb.(extensionsMap); doki {
-		delete(epb.ExtensionMap(), fieldNum)
-	} else if epb, doki := pb.(extensionsBytes); doki {
-		offset := 0
-		for offset != -1 {
-			offset = deleteExtension(epb, fieldNum, offset)
-		}
-	} else {
-		panic("unreachable")
-	}
-}
-
-// ClearExtension removes the given extension from pb.
-func ClearExtension(pb extendableProto, extension *ExtensionDesc) {
-	// TODO: Check types, field numbers, etc.?
-	clearExtension(pb, extension.Field)
-}
-
-// GetExtension parses and returns the given extension of pb.
-// If the extension is not present it returns ErrMissingExtension.
-func GetExtension(pb extendableProto, extension *ExtensionDesc) (interface{}, error) {
-	if err := checkExtensionTypes(pb, extension); err != nil {
-		return nil, err
-	}
-
-	if epb, doki := pb.(extensionsMap); doki {
-		emap := epb.ExtensionMap()
-		e, ok := emap[extension.Field]
-		if !ok {
-			// defaultExtensionValue returns the default value or
-			// ErrMissingExtension if there is no default.
-			return defaultExtensionValue(extension)
-		}
-		if e.value != nil {
-			// Already decoded. Check the descriptor, though.
-			if e.desc != extension {
-				// This shouldn't happen. If it does, it means that
-				// GetExtension was called twice with two different
-				// descriptors with the same field number.
-				return nil, errors.New("proto: descriptor conflict")
-			}
-			return e.value, nil
-		}
-
-		v, err := decodeExtension(e.enc, extension)
-		if err != nil {
-			return nil, err
-		}
-
-		// Remember the decoded version and drop the encoded version.
-		// That way it is safe to mutate what we return.
-		e.value = v
-		e.desc = extension
-		e.enc = nil
-		emap[extension.Field] = e
-		return e.value, nil
-	} else if epb, doki := pb.(extensionsBytes); doki {
-		ext := epb.GetExtensions()
-		o := 0
-		for o < len(*ext) {
-			tag, n := DecodeVarint((*ext)[o:])
-			fieldNum := int32(tag >> 3)
-			wireType := int(tag & 0x7)
-			l, err := size((*ext)[o+n:], wireType)
-			if err != nil {
-				return nil, err
-			}
-			if int32(fieldNum) == extension.Field {
-				v, err := decodeExtension((*ext)[o:o+n+l], extension)
-				if err != nil {
-					return nil, err
-				}
-				return v, nil
-			}
-			o += n + l
-		}
-		return defaultExtensionValue(extension)
-	}
-	panic("unreachable")
-}
-
-// defaultExtensionValue returns the default value for extension.
-// If no default for an extension is defined ErrMissingExtension is returned.
-func defaultExtensionValue(extension *ExtensionDesc) (interface{}, error) {
-	t := reflect.TypeOf(extension.ExtensionType)
-	props := extensionProperties(extension)
-
-	sf, _, err := fieldDefault(t, props)
-	if err != nil {
-		return nil, err
-	}
-
-	if sf == nil || sf.value == nil {
-		// There is no default value.
-		return nil, ErrMissingExtension
-	}
-
-	if t.Kind() != reflect.Ptr {
-		// We do not need to return a Ptr, we can directly return sf.value.
-		return sf.value, nil
-	}
-
-	// We need to return an interface{} that is a pointer to sf.value.
-	value := reflect.New(t).Elem()
-	value.Set(reflect.New(value.Type().Elem()))
-	if sf.kind == reflect.Int32 {
-		// We may have an int32 or an enum, but the underlying data is int32.
-		// Since we can't set an int32 into a non int32 reflect.value directly
-		// set it as a int32.
-		value.Elem().SetInt(int64(sf.value.(int32)))
-	} else {
-		value.Elem().Set(reflect.ValueOf(sf.value))
-	}
-	return value.Interface(), nil
-}
-
-// decodeExtension decodes an extension encoded in b.
-func decodeExtension(b []byte, extension *ExtensionDesc) (interface{}, error) {
-	o := NewBuffer(b)
-
-	t := reflect.TypeOf(extension.ExtensionType)
-	rep := extension.repeated()
-
-	props := extensionProperties(extension)
-
-	// t is a pointer to a struct, pointer to basic type or a slice.
-	// Allocate a "field" to store the pointer/slice itself; the
-	// pointer/slice will be stored here. We pass
-	// the address of this field to props.dec.
-	// This passes a zero field and a *t and lets props.dec
-	// interpret it as a *struct{ x t }.
-	value := reflect.New(t).Elem()
-
-	for {
-		// Discard wire type and field number varint. It isn't needed.
-		if _, err := o.DecodeVarint(); err != nil {
-			return nil, err
-		}
-
-		if err := props.dec(o, props, toStructPointer(value.Addr())); err != nil {
-			return nil, err
-		}
-
-		if !rep || o.index >= len(o.buf) {
-			break
-		}
-	}
-	return value.Interface(), nil
-}
-
-// GetExtensions returns a slice of the extensions present in pb that are also listed in es.
-// The returned slice has the same length as es; missing extensions will appear as nil elements.
-func GetExtensions(pb Message, es []*ExtensionDesc) (extensions []interface{}, err error) {
-	epb, ok := pb.(extendableProto)
-	if !ok {
-		err = errors.New("proto: not an extendable proto")
-		return
-	}
-	extensions = make([]interface{}, len(es))
-	for i, e := range es {
-		extensions[i], err = GetExtension(epb, e)
-		if err == ErrMissingExtension {
-			err = nil
-		}
-		if err != nil {
-			return
-		}
-	}
-	return
-}
-
-// SetExtension sets the specified extension of pb to the specified value.
-func SetExtension(pb extendableProto, extension *ExtensionDesc, value interface{}) error {
-	if err := checkExtensionTypes(pb, extension); err != nil {
-		return err
-	}
-	typ := reflect.TypeOf(extension.ExtensionType)
-	if typ != reflect.TypeOf(value) {
-		return errors.New("proto: bad extension value type")
-	}
-	// nil extension values need to be caught early, because the
-	// encoder can't distinguish an ErrNil due to a nil extension
-	// from an ErrNil due to a missing field. Extensions are
-	// always optional, so the encoder would just swallow the error
-	// and drop all the extensions from the encoded message.
-	if reflect.ValueOf(value).IsNil() {
-		return fmt.Errorf("proto: SetExtension called with nil value of type %T", value)
-	}
-	return setExtension(pb, extension, value)
-}
-
-func setExtension(pb extendableProto, extension *ExtensionDesc, value interface{}) error {
-	if epb, doki := pb.(extensionsMap); doki {
-		epb.ExtensionMap()[extension.Field] = Extension{desc: extension, value: value}
-	} else if epb, doki := pb.(extensionsBytes); doki {
-		ClearExtension(pb, extension)
-		ext := epb.GetExtensions()
-		et := reflect.TypeOf(extension.ExtensionType)
-		props := extensionProperties(extension)
-		p := NewBuffer(nil)
-		x := reflect.New(et)
-		x.Elem().Set(reflect.ValueOf(value))
-		if err := props.enc(p, props, toStructPointer(x)); err != nil {
-			return err
-		}
-		*ext = append(*ext, p.buf...)
-	}
-	return nil
-}
-
-// A global registry of extensions.
-// The generated code will register the generated descriptors by calling RegisterExtension.
-
-var extensionMaps = make(map[reflect.Type]map[int32]*ExtensionDesc)
-
-// RegisterExtension is called from the generated code.
-func RegisterExtension(desc *ExtensionDesc) {
-	st := reflect.TypeOf(desc.ExtendedType).Elem()
-	m := extensionMaps[st]
-	if m == nil {
-		m = make(map[int32]*ExtensionDesc)
-		extensionMaps[st] = m
-	}
-	if _, ok := m[desc.Field]; ok {
-		panic("proto: duplicate extension registered: " + st.String() + " " + strconv.Itoa(int(desc.Field)))
-	}
-	m[desc.Field] = desc
-}
-
-// RegisteredExtensions returns a map of the registered extensions of a
-// protocol buffer struct, indexed by the extension number.
-// The argument pb should be a nil pointer to the struct type.
-func RegisteredExtensions(pb Message) map[int32]*ExtensionDesc {
-	return extensionMaps[reflect.TypeOf(pb).Elem()]
-}
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/extensions_gogo.go b/Godeps/_workspace/src/github.com/gogo/protobuf/proto/extensions_gogo.go
deleted file mode 100644
index bd55fb68b..000000000
--- a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/extensions_gogo.go
+++ /dev/null
@@ -1,221 +0,0 @@
-// Copyright (c) 2013, Vastech SA (PTY) LTD. All rights reserved.
-// http://github.com/gogo/protobuf/gogoproto
-//
-// 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.
-
-package proto
-
-import (
-	"bytes"
-	"errors"
-	"fmt"
-	"reflect"
-	"sort"
-	"strings"
-)
-
-func GetBoolExtension(pb extendableProto, extension *ExtensionDesc, ifnotset bool) bool {
-	if reflect.ValueOf(pb).IsNil() {
-		return ifnotset
-	}
-	value, err := GetExtension(pb, extension)
-	if err != nil {
-		return ifnotset
-	}
-	if value == nil {
-		return ifnotset
-	}
-	if value.(*bool) == nil {
-		return ifnotset
-	}
-	return *(value.(*bool))
-}
-
-func (this *Extension) Equal(that *Extension) bool {
-	return bytes.Equal(this.enc, that.enc)
-}
-
-func SizeOfExtensionMap(m map[int32]Extension) (n int) {
-	return sizeExtensionMap(m)
-}
-
-type sortableMapElem struct {
-	field int32
-	ext   Extension
-}
-
-func newSortableExtensionsFromMap(m map[int32]Extension) sortableExtensions {
-	s := make(sortableExtensions, 0, len(m))
-	for k, v := range m {
-		s = append(s, &sortableMapElem{field: k, ext: v})
-	}
-	return s
-}
-
-type sortableExtensions []*sortableMapElem
-
-func (this sortableExtensions) Len() int { return len(this) }
-
-func (this sortableExtensions) Swap(i, j int) { this[i], this[j] = this[j], this[i] }
-
-func (this sortableExtensions) Less(i, j int) bool { return this[i].field < this[j].field }
-
-func (this sortableExtensions) String() string {
-	sort.Sort(this)
-	ss := make([]string, len(this))
-	for i := range this {
-		ss[i] = fmt.Sprintf("%d: %v", this[i].field, this[i].ext)
-	}
-	return "map[" + strings.Join(ss, ",") + "]"
-}
-
-func StringFromExtensionsMap(m map[int32]Extension) string {
-	return newSortableExtensionsFromMap(m).String()
-}
-
-func StringFromExtensionsBytes(ext []byte) string {
-	m, err := BytesToExtensionsMap(ext)
-	if err != nil {
-		panic(err)
-	}
-	return StringFromExtensionsMap(m)
-}
-
-func EncodeExtensionMap(m map[int32]Extension, data []byte) (n int, err error) {
-	if err := encodeExtensionMap(m); err != nil {
-		return 0, err
-	}
-	keys := make([]int, 0, len(m))
-	for k := range m {
-		keys = append(keys, int(k))
-	}
-	sort.Ints(keys)
-	for _, k := range keys {
-		n += copy(data[n:], m[int32(k)].enc)
-	}
-	return n, nil
-}
-
-func GetRawExtension(m map[int32]Extension, id int32) ([]byte, error) {
-	if m[id].value == nil || m[id].desc == nil {
-		return m[id].enc, nil
-	}
-	if err := encodeExtensionMap(m); err != nil {
-		return nil, err
-	}
-	return m[id].enc, nil
-}
-
-func size(buf []byte, wire int) (int, error) {
-	switch wire {
-	case WireVarint:
-		_, n := DecodeVarint(buf)
-		return n, nil
-	case WireFixed64:
-		return 8, nil
-	case WireBytes:
-		v, n := DecodeVarint(buf)
-		return int(v) + n, nil
-	case WireFixed32:
-		return 4, nil
-	case WireStartGroup:
-		offset := 0
-		for {
-			u, n := DecodeVarint(buf[offset:])
-			fwire := int(u & 0x7)
-			offset += n
-			if fwire == WireEndGroup {
-				return offset, nil
-			}
-			s, err := size(buf[offset:], wire)
-			if err != nil {
-				return 0, err
-			}
-			offset += s
-		}
-	}
-	return 0, fmt.Errorf("proto: can't get size for unknown wire type %d", wire)
-}
-
-func BytesToExtensionsMap(buf []byte) (map[int32]Extension, error) {
-	m := make(map[int32]Extension)
-	i := 0
-	for i < len(buf) {
-		tag, n := DecodeVarint(buf[i:])
-		if n <= 0 {
-			return nil, fmt.Errorf("unable to decode varint")
-		}
-		fieldNum := int32(tag >> 3)
-		wireType := int(tag & 0x7)
-		l, err := size(buf[i+n:], wireType)
-		if err != nil {
-			return nil, err
-		}
-		end := i + int(l) + n
-		m[int32(fieldNum)] = Extension{enc: buf[i:end]}
-		i = end
-	}
-	return m, nil
-}
-
-func NewExtension(e []byte) Extension {
-	ee := Extension{enc: make([]byte, len(e))}
-	copy(ee.enc, e)
-	return ee
-}
-
-func (this Extension) GoString() string {
-	if this.enc == nil {
-		if err := encodeExtension(&this); err != nil {
-			panic(err)
-		}
-	}
-	return fmt.Sprintf("proto.NewExtension(%#v)", this.enc)
-}
-
-func SetUnsafeExtension(pb extendableProto, fieldNum int32, value interface{}) error {
-	typ := reflect.TypeOf(pb).Elem()
-	ext, ok := extensionMaps[typ]
-	if !ok {
-		return fmt.Errorf("proto: bad extended type; %s is not extendable", typ.String())
-	}
-	desc, ok := ext[fieldNum]
-	if !ok {
-		return errors.New("proto: bad extension number; not in declared ranges")
-	}
-	return setExtension(pb, desc, value)
-}
-
-func GetUnsafeExtension(pb extendableProto, fieldNum int32) (interface{}, error) {
-	typ := reflect.TypeOf(pb).Elem()
-	ext, ok := extensionMaps[typ]
-	if !ok {
-		return nil, fmt.Errorf("proto: bad extended type; %s is not extendable", typ.String())
-	}
-	desc, ok := ext[fieldNum]
-	if !ok {
-		return nil, fmt.Errorf("unregistered field number %d", fieldNum)
-	}
-	return GetExtension(pb, desc)
-}
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/extensions_test.go b/Godeps/_workspace/src/github.com/gogo/protobuf/proto/extensions_test.go
deleted file mode 100644
index 86e3006d7..000000000
--- a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/extensions_test.go
+++ /dev/null
@@ -1,292 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2014 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// 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.
-
-package proto_test
-
-import (
-	"fmt"
-	"reflect"
-	"testing"
-
-	"github.com/gogo/protobuf/proto"
-	pb "github.com/gogo/protobuf/proto/testdata"
-)
-
-func TestGetExtensionsWithMissingExtensions(t *testing.T) {
-	msg := &pb.MyMessage{}
-	ext1 := &pb.Ext{}
-	if err := proto.SetExtension(msg, pb.E_Ext_More, ext1); err != nil {
-		t.Fatalf("Could not set ext1: %s", ext1)
-	}
-	exts, err := proto.GetExtensions(msg, []*proto.ExtensionDesc{
-		pb.E_Ext_More,
-		pb.E_Ext_Text,
-	})
-	if err != nil {
-		t.Fatalf("GetExtensions() failed: %s", err)
-	}
-	if exts[0] != ext1 {
-		t.Errorf("ext1 not in returned extensions: %T %v", exts[0], exts[0])
-	}
-	if exts[1] != nil {
-		t.Errorf("ext2 in returned extensions: %T %v", exts[1], exts[1])
-	}
-}
-
-func TestGetExtensionStability(t *testing.T) {
-	check := func(m *pb.MyMessage) bool {
-		ext1, err := proto.GetExtension(m, pb.E_Ext_More)
-		if err != nil {
-			t.Fatalf("GetExtension() failed: %s", err)
-		}
-		ext2, err := proto.GetExtension(m, pb.E_Ext_More)
-		if err != nil {
-			t.Fatalf("GetExtension() failed: %s", err)
-		}
-		return ext1 == ext2
-	}
-	msg := &pb.MyMessage{Count: proto.Int32(4)}
-	ext0 := &pb.Ext{}
-	if err := proto.SetExtension(msg, pb.E_Ext_More, ext0); err != nil {
-		t.Fatalf("Could not set ext1: %s", ext0)
-	}
-	if !check(msg) {
-		t.Errorf("GetExtension() not stable before marshaling")
-	}
-	bb, err := proto.Marshal(msg)
-	if err != nil {
-		t.Fatalf("Marshal() failed: %s", err)
-	}
-	msg1 := &pb.MyMessage{}
-	err = proto.Unmarshal(bb, msg1)
-	if err != nil {
-		t.Fatalf("Unmarshal() failed: %s", err)
-	}
-	if !check(msg1) {
-		t.Errorf("GetExtension() not stable after unmarshaling")
-	}
-}
-
-func TestGetExtensionDefaults(t *testing.T) {
-	var setFloat64 float64 = 1
-	var setFloat32 float32 = 2
-	var setInt32 int32 = 3
-	var setInt64 int64 = 4
-	var setUint32 uint32 = 5
-	var setUint64 uint64 = 6
-	var setBool = true
-	var setBool2 = false
-	var setString = "Goodnight string"
-	var setBytes = []byte("Goodnight bytes")
-	var setEnum = pb.DefaultsMessage_TWO
-
-	type testcase struct {
-		ext  *proto.ExtensionDesc // Extension we are testing.
-		want interface{}          // Expected value of extension, or nil (meaning that GetExtension will fail).
-		def  interface{}          // Expected value of extension after ClearExtension().
-	}
-	tests := []testcase{
-		{pb.E_NoDefaultDouble, setFloat64, nil},
-		{pb.E_NoDefaultFloat, setFloat32, nil},
-		{pb.E_NoDefaultInt32, setInt32, nil},
-		{pb.E_NoDefaultInt64, setInt64, nil},
-		{pb.E_NoDefaultUint32, setUint32, nil},
-		{pb.E_NoDefaultUint64, setUint64, nil},
-		{pb.E_NoDefaultSint32, setInt32, nil},
-		{pb.E_NoDefaultSint64, setInt64, nil},
-		{pb.E_NoDefaultFixed32, setUint32, nil},
-		{pb.E_NoDefaultFixed64, setUint64, nil},
-		{pb.E_NoDefaultSfixed32, setInt32, nil},
-		{pb.E_NoDefaultSfixed64, setInt64, nil},
-		{pb.E_NoDefaultBool, setBool, nil},
-		{pb.E_NoDefaultBool, setBool2, nil},
-		{pb.E_NoDefaultString, setString, nil},
-		{pb.E_NoDefaultBytes, setBytes, nil},
-		{pb.E_NoDefaultEnum, setEnum, nil},
-		{pb.E_DefaultDouble, setFloat64, float64(3.1415)},
-		{pb.E_DefaultFloat, setFloat32, float32(3.14)},
-		{pb.E_DefaultInt32, setInt32, int32(42)},
-		{pb.E_DefaultInt64, setInt64, int64(43)},
-		{pb.E_DefaultUint32, setUint32, uint32(44)},
-		{pb.E_DefaultUint64, setUint64, uint64(45)},
-		{pb.E_DefaultSint32, setInt32, int32(46)},
-		{pb.E_DefaultSint64, setInt64, int64(47)},
-		{pb.E_DefaultFixed32, setUint32, uint32(48)},
-		{pb.E_DefaultFixed64, setUint64, uint64(49)},
-		{pb.E_DefaultSfixed32, setInt32, int32(50)},
-		{pb.E_DefaultSfixed64, setInt64, int64(51)},
-		{pb.E_DefaultBool, setBool, true},
-		{pb.E_DefaultBool, setBool2, true},
-		{pb.E_DefaultString, setString, "Hello, string"},
-		{pb.E_DefaultBytes, setBytes, []byte("Hello, bytes")},
-		{pb.E_DefaultEnum, setEnum, pb.DefaultsMessage_ONE},
-	}
-
-	checkVal := func(test testcase, msg *pb.DefaultsMessage, valWant interface{}) error {
-		val, err := proto.GetExtension(msg, test.ext)
-		if err != nil {
-			if valWant != nil {
-				return fmt.Errorf("GetExtension(): %s", err)
-			}
-			if want := proto.ErrMissingExtension; err != want {
-				return fmt.Errorf("Unexpected error: got %v, want %v", err, want)
-			}
-			return nil
-		}
-
-		// All proto2 extension values are either a pointer to a value or a slice of values.
-		ty := reflect.TypeOf(val)
-		tyWant := reflect.TypeOf(test.ext.ExtensionType)
-		if got, want := ty, tyWant; got != want {
-			return fmt.Errorf("unexpected reflect.TypeOf(): got %v want %v", got, want)
-		}
-		tye := ty.Elem()
-		tyeWant := tyWant.Elem()
-		if got, want := tye, tyeWant; got != want {
-			return fmt.Errorf("unexpected reflect.TypeOf().Elem(): got %v want %v", got, want)
-		}
-
-		// Check the name of the type of the value.
-		// If it is an enum it will be type int32 with the name of the enum.
-		if got, want := tye.Name(), tye.Name(); got != want {
-			return fmt.Errorf("unexpected reflect.TypeOf().Elem().Name(): got %v want %v", got, want)
-		}
-
-		// Check that value is what we expect.
-		// If we have a pointer in val, get the value it points to.
-		valExp := val
-		if ty.Kind() == reflect.Ptr {
-			valExp = reflect.ValueOf(val).Elem().Interface()
-		}
-		if got, want := valExp, valWant; !reflect.DeepEqual(got, want) {
-			return fmt.Errorf("unexpected reflect.DeepEqual(): got %v want %v", got, want)
-		}
-
-		return nil
-	}
-
-	setTo := func(test testcase) interface{} {
-		setTo := reflect.ValueOf(test.want)
-		if typ := reflect.TypeOf(test.ext.ExtensionType); typ.Kind() == reflect.Ptr {
-			setTo = reflect.New(typ).Elem()
-			setTo.Set(reflect.New(setTo.Type().Elem()))
-			setTo.Elem().Set(reflect.ValueOf(test.want))
-		}
-		return setTo.Interface()
-	}
-
-	for _, test := range tests {
-		msg := &pb.DefaultsMessage{}
-		name := test.ext.Name
-
-		// Check the initial value.
-		if err := checkVal(test, msg, test.def); err != nil {
-			t.Errorf("%s: %v", name, err)
-		}
-
-		// Set the per-type value and check value.
-		name = fmt.Sprintf("%s (set to %T %v)", name, test.want, test.want)
-		if err := proto.SetExtension(msg, test.ext, setTo(test)); err != nil {
-			t.Errorf("%s: SetExtension(): %v", name, err)
-			continue
-		}
-		if err := checkVal(test, msg, test.want); err != nil {
-			t.Errorf("%s: %v", name, err)
-			continue
-		}
-
-		// Set and check the value.
-		name += " (cleared)"
-		proto.ClearExtension(msg, test.ext)
-		if err := checkVal(test, msg, test.def); err != nil {
-			t.Errorf("%s: %v", name, err)
-		}
-	}
-}
-
-func TestExtensionsRoundTrip(t *testing.T) {
-	msg := &pb.MyMessage{}
-	ext1 := &pb.Ext{
-		Data: proto.String("hi"),
-	}
-	ext2 := &pb.Ext{
-		Data: proto.String("there"),
-	}
-	exists := proto.HasExtension(msg, pb.E_Ext_More)
-	if exists {
-		t.Error("Extension More present unexpectedly")
-	}
-	if err := proto.SetExtension(msg, pb.E_Ext_More, ext1); err != nil {
-		t.Error(err)
-	}
-	if err := proto.SetExtension(msg, pb.E_Ext_More, ext2); err != nil {
-		t.Error(err)
-	}
-	e, err := proto.GetExtension(msg, pb.E_Ext_More)
-	if err != nil {
-		t.Error(err)
-	}
-	x, ok := e.(*pb.Ext)
-	if !ok {
-		t.Errorf("e has type %T, expected testdata.Ext", e)
-	} else if *x.Data != "there" {
-		t.Errorf("SetExtension failed to overwrite, got %+v, not 'there'", x)
-	}
-	proto.ClearExtension(msg, pb.E_Ext_More)
-	if _, err = proto.GetExtension(msg, pb.E_Ext_More); err != proto.ErrMissingExtension {
-		t.Errorf("got %v, expected ErrMissingExtension", e)
-	}
-	if _, err := proto.GetExtension(msg, pb.E_X215); err == nil {
-		t.Error("expected bad extension error, got nil")
-	}
-	if err := proto.SetExtension(msg, pb.E_X215, 12); err == nil {
-		t.Error("expected extension err")
-	}
-	if err := proto.SetExtension(msg, pb.E_Ext_More, 12); err == nil {
-		t.Error("expected some sort of type mismatch error, got nil")
-	}
-}
-
-func TestNilExtension(t *testing.T) {
-	msg := &pb.MyMessage{
-		Count: proto.Int32(1),
-	}
-	if err := proto.SetExtension(msg, pb.E_Ext_Text, proto.String("hello")); err != nil {
-		t.Fatal(err)
-	}
-	if err := proto.SetExtension(msg, pb.E_Ext_More, (*pb.Ext)(nil)); err == nil {
-		t.Error("expected SetExtension to fail due to a nil extension")
-	} else if want := "proto: SetExtension called with nil value of type *testdata.Ext"; err.Error() != want {
-		t.Errorf("expected error %v, got %v", want, err)
-	}
-	// Note: if the behavior of Marshal is ever changed to ignore nil extensions, update
-	// this test to verify that E_Ext_Text is properly propagated through marshal->unmarshal.
-}
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/lib.go b/Godeps/_workspace/src/github.com/gogo/protobuf/proto/lib.go
deleted file mode 100644
index d36f9ad12..000000000
--- a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/lib.go
+++ /dev/null
@@ -1,841 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2010 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// 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.
-
-/*
-Package proto converts data structures to and from the wire format of
-protocol buffers.  It works in concert with the Go source code generated
-for .proto files by the protocol compiler.
-
-A summary of the properties of the protocol buffer interface
-for a protocol buffer variable v:
-
-  - Names are turned from camel_case to CamelCase for export.
-  - There are no methods on v to set fields; just treat
-	them as structure fields.
-  - There are getters that return a field's value if set,
-	and return the field's default value if unset.
-	The getters work even if the receiver is a nil message.
-  - The zero value for a struct is its correct initialization state.
-	All desired fields must be set before marshaling.
-  - A Reset() method will restore a protobuf struct to its zero state.
-  - Non-repeated fields are pointers to the values; nil means unset.
-	That is, optional or required field int32 f becomes F *int32.
-  - Repeated fields are slices.
-  - Helper functions are available to aid the setting of fields.
-	msg.Foo = proto.String("hello") // set field
-  - Constants are defined to hold the default values of all fields that
-	have them.  They have the form Default_StructName_FieldName.
-	Because the getter methods handle defaulted values,
-	direct use of these constants should be rare.
-  - Enums are given type names and maps from names to values.
-	Enum values are prefixed by the enclosing message's name, or by the
-	enum's type name if it is a top-level enum. Enum types have a String
-	method, and a Enum method to assist in message construction.
-  - Nested messages, groups and enums have type names prefixed with the name of
-	the surrounding message type.
-  - Extensions are given descriptor names that start with E_,
-	followed by an underscore-delimited list of the nested messages
-	that contain it (if any) followed by the CamelCased name of the
-	extension field itself.  HasExtension, ClearExtension, GetExtension
-	and SetExtension are functions for manipulating extensions.
-  - Marshal and Unmarshal are functions to encode and decode the wire format.
-
-The simplest way to describe this is to see an example.
-Given file test.proto, containing
-
-	package example;
-
-	enum FOO { X = 17; }
-
-	message Test {
-	  required string label = 1;
-	  optional int32 type = 2 [default=77];
-	  repeated int64 reps = 3;
-	  optional group OptionalGroup = 4 {
-	    required string RequiredField = 5;
-	  }
-	}
-
-The resulting file, test.pb.go, is:
-
-	package example
-
-	import proto "github.com/gogo/protobuf/proto"
-	import math "math"
-
-	type FOO int32
-	const (
-		FOO_X FOO = 17
-	)
-	var FOO_name = map[int32]string{
-		17: "X",
-	}
-	var FOO_value = map[string]int32{
-		"X": 17,
-	}
-
-	func (x FOO) Enum() *FOO {
-		p := new(FOO)
-		*p = x
-		return p
-	}
-	func (x FOO) String() string {
-		return proto.EnumName(FOO_name, int32(x))
-	}
-	func (x *FOO) UnmarshalJSON(data []byte) error {
-		value, err := proto.UnmarshalJSONEnum(FOO_value, data)
-		if err != nil {
-			return err
-		}
-		*x = FOO(value)
-		return nil
-	}
-
-	type Test struct {
-		Label            *string             `protobuf:"bytes,1,req,name=label" json:"label,omitempty"`
-		Type             *int32              `protobuf:"varint,2,opt,name=type,def=77" json:"type,omitempty"`
-		Reps             []int64             `protobuf:"varint,3,rep,name=reps" json:"reps,omitempty"`
-		Optionalgroup    *Test_OptionalGroup `protobuf:"group,4,opt,name=OptionalGroup" json:"optionalgroup,omitempty"`
-		XXX_unrecognized []byte              `json:"-"`
-	}
-	func (m *Test) Reset()         { *m = Test{} }
-	func (m *Test) String() string { return proto.CompactTextString(m) }
-	func (*Test) ProtoMessage()    {}
-	const Default_Test_Type int32 = 77
-
-	func (m *Test) GetLabel() string {
-		if m != nil && m.Label != nil {
-			return *m.Label
-		}
-		return ""
-	}
-
-	func (m *Test) GetType() int32 {
-		if m != nil && m.Type != nil {
-			return *m.Type
-		}
-		return Default_Test_Type
-	}
-
-	func (m *Test) GetOptionalgroup() *Test_OptionalGroup {
-		if m != nil {
-			return m.Optionalgroup
-		}
-		return nil
-	}
-
-	type Test_OptionalGroup struct {
-		RequiredField *string `protobuf:"bytes,5,req" json:"RequiredField,omitempty"`
-	}
-	func (m *Test_OptionalGroup) Reset()         { *m = Test_OptionalGroup{} }
-	func (m *Test_OptionalGroup) String() string { return proto.CompactTextString(m) }
-
-	func (m *Test_OptionalGroup) GetRequiredField() string {
-		if m != nil && m.RequiredField != nil {
-			return *m.RequiredField
-		}
-		return ""
-	}
-
-	func init() {
-		proto.RegisterEnum("example.FOO", FOO_name, FOO_value)
-	}
-
-To create and play with a Test object:
-
-package main
-
-	import (
-		"log"
-
-		"github.com/gogo/protobuf/proto"
-		pb "./example.pb"
-	)
-
-	func main() {
-		test := &pb.Test{
-			Label: proto.String("hello"),
-			Type:  proto.Int32(17),
-			Optionalgroup: &pb.Test_OptionalGroup{
-				RequiredField: proto.String("good bye"),
-			},
-		}
-		data, err := proto.Marshal(test)
-		if err != nil {
-			log.Fatal("marshaling error: ", err)
-		}
-		newTest := &pb.Test{}
-		err = proto.Unmarshal(data, newTest)
-		if err != nil {
-			log.Fatal("unmarshaling error: ", err)
-		}
-		// Now test and newTest contain the same data.
-		if test.GetLabel() != newTest.GetLabel() {
-			log.Fatalf("data mismatch %q != %q", test.GetLabel(), newTest.GetLabel())
-		}
-		// etc.
-	}
-*/
-package proto
-
-import (
-	"encoding/json"
-	"fmt"
-	"log"
-	"reflect"
-	"sort"
-	"strconv"
-	"sync"
-)
-
-// Message is implemented by generated protocol buffer messages.
-type Message interface {
-	Reset()
-	String() string
-	ProtoMessage()
-}
-
-// Stats records allocation details about the protocol buffer encoders
-// and decoders.  Useful for tuning the library itself.
-type Stats struct {
-	Emalloc uint64 // mallocs in encode
-	Dmalloc uint64 // mallocs in decode
-	Encode  uint64 // number of encodes
-	Decode  uint64 // number of decodes
-	Chit    uint64 // number of cache hits
-	Cmiss   uint64 // number of cache misses
-	Size    uint64 // number of sizes
-}
-
-// Set to true to enable stats collection.
-const collectStats = false
-
-var stats Stats
-
-// GetStats returns a copy of the global Stats structure.
-func GetStats() Stats { return stats }
-
-// A Buffer is a buffer manager for marshaling and unmarshaling
-// protocol buffers.  It may be reused between invocations to
-// reduce memory usage.  It is not necessary to use a Buffer;
-// the global functions Marshal and Unmarshal create a
-// temporary Buffer and are fine for most applications.
-type Buffer struct {
-	buf   []byte // encode/decode byte stream
-	index int    // write point
-
-	// pools of basic types to amortize allocation.
-	bools   []bool
-	uint32s []uint32
-	uint64s []uint64
-
-	// extra pools, only used with pointer_reflect.go
-	int32s   []int32
-	int64s   []int64
-	float32s []float32
-	float64s []float64
-}
-
-// NewBuffer allocates a new Buffer and initializes its internal data to
-// the contents of the argument slice.
-func NewBuffer(e []byte) *Buffer {
-	return &Buffer{buf: e}
-}
-
-// Reset resets the Buffer, ready for marshaling a new protocol buffer.
-func (p *Buffer) Reset() {
-	p.buf = p.buf[0:0] // for reading/writing
-	p.index = 0        // for reading
-}
-
-// SetBuf replaces the internal buffer with the slice,
-// ready for unmarshaling the contents of the slice.
-func (p *Buffer) SetBuf(s []byte) {
-	p.buf = s
-	p.index = 0
-}
-
-// Bytes returns the contents of the Buffer.
-func (p *Buffer) Bytes() []byte { return p.buf }
-
-/*
- * Helper routines for simplifying the creation of optional fields of basic type.
- */
-
-// Bool is a helper routine that allocates a new bool value
-// to store v and returns a pointer to it.
-func Bool(v bool) *bool {
-	return &v
-}
-
-// Int32 is a helper routine that allocates a new int32 value
-// to store v and returns a pointer to it.
-func Int32(v int32) *int32 {
-	return &v
-}
-
-// Int is a helper routine that allocates a new int32 value
-// to store v and returns a pointer to it, but unlike Int32
-// its argument value is an int.
-func Int(v int) *int32 {
-	p := new(int32)
-	*p = int32(v)
-	return p
-}
-
-// Int64 is a helper routine that allocates a new int64 value
-// to store v and returns a pointer to it.
-func Int64(v int64) *int64 {
-	return &v
-}
-
-// Float32 is a helper routine that allocates a new float32 value
-// to store v and returns a pointer to it.
-func Float32(v float32) *float32 {
-	return &v
-}
-
-// Float64 is a helper routine that allocates a new float64 value
-// to store v and returns a pointer to it.
-func Float64(v float64) *float64 {
-	return &v
-}
-
-// Uint32 is a helper routine that allocates a new uint32 value
-// to store v and returns a pointer to it.
-func Uint32(v uint32) *uint32 {
-	return &v
-}
-
-// Uint64 is a helper routine that allocates a new uint64 value
-// to store v and returns a pointer to it.
-func Uint64(v uint64) *uint64 {
-	return &v
-}
-
-// String is a helper routine that allocates a new string value
-// to store v and returns a pointer to it.
-func String(v string) *string {
-	return &v
-}
-
-// EnumName is a helper function to simplify printing protocol buffer enums
-// by name.  Given an enum map and a value, it returns a useful string.
-func EnumName(m map[int32]string, v int32) string {
-	s, ok := m[v]
-	if ok {
-		return s
-	}
-	return strconv.Itoa(int(v))
-}
-
-// UnmarshalJSONEnum is a helper function to simplify recovering enum int values
-// from their JSON-encoded representation. Given a map from the enum's symbolic
-// names to its int values, and a byte buffer containing the JSON-encoded
-// value, it returns an int32 that can be cast to the enum type by the caller.
-//
-// The function can deal with both JSON representations, numeric and symbolic.
-func UnmarshalJSONEnum(m map[string]int32, data []byte, enumName string) (int32, error) {
-	if data[0] == '"' {
-		// New style: enums are strings.
-		var repr string
-		if err := json.Unmarshal(data, &repr); err != nil {
-			return -1, err
-		}
-		val, ok := m[repr]
-		if !ok {
-			return 0, fmt.Errorf("unrecognized enum %s value %q", enumName, repr)
-		}
-		return val, nil
-	}
-	// Old style: enums are ints.
-	var val int32
-	if err := json.Unmarshal(data, &val); err != nil {
-		return 0, fmt.Errorf("cannot unmarshal %#q into enum %s", data, enumName)
-	}
-	return val, nil
-}
-
-// DebugPrint dumps the encoded data in b in a debugging format with a header
-// including the string s. Used in testing but made available for general debugging.
-func (p *Buffer) DebugPrint(s string, b []byte) {
-	var u uint64
-
-	obuf := p.buf
-	index := p.index
-	p.buf = b
-	p.index = 0
-	depth := 0
-
-	fmt.Printf("\n--- %s ---\n", s)
-
-out:
-	for {
-		for i := 0; i < depth; i++ {
-			fmt.Print("  ")
-		}
-
-		index := p.index
-		if index == len(p.buf) {
-			break
-		}
-
-		op, err := p.DecodeVarint()
-		if err != nil {
-			fmt.Printf("%3d: fetching op err %v\n", index, err)
-			break out
-		}
-		tag := op >> 3
-		wire := op & 7
-
-		switch wire {
-		default:
-			fmt.Printf("%3d: t=%3d unknown wire=%d\n",
-				index, tag, wire)
-			break out
-
-		case WireBytes:
-			var r []byte
-
-			r, err = p.DecodeRawBytes(false)
-			if err != nil {
-				break out
-			}
-			fmt.Printf("%3d: t=%3d bytes [%d]", index, tag, len(r))
-			if len(r) <= 6 {
-				for i := 0; i < len(r); i++ {
-					fmt.Printf(" %.2x", r[i])
-				}
-			} else {
-				for i := 0; i < 3; i++ {
-					fmt.Printf(" %.2x", r[i])
-				}
-				fmt.Printf(" ..")
-				for i := len(r) - 3; i < len(r); i++ {
-					fmt.Printf(" %.2x", r[i])
-				}
-			}
-			fmt.Printf("\n")
-
-		case WireFixed32:
-			u, err = p.DecodeFixed32()
-			if err != nil {
-				fmt.Printf("%3d: t=%3d fix32 err %v\n", index, tag, err)
-				break out
-			}
-			fmt.Printf("%3d: t=%3d fix32 %d\n", index, tag, u)
-
-		case WireFixed64:
-			u, err = p.DecodeFixed64()
-			if err != nil {
-				fmt.Printf("%3d: t=%3d fix64 err %v\n", index, tag, err)
-				break out
-			}
-			fmt.Printf("%3d: t=%3d fix64 %d\n", index, tag, u)
-			break
-
-		case WireVarint:
-			u, err = p.DecodeVarint()
-			if err != nil {
-				fmt.Printf("%3d: t=%3d varint err %v\n", index, tag, err)
-				break out
-			}
-			fmt.Printf("%3d: t=%3d varint %d\n", index, tag, u)
-
-		case WireStartGroup:
-			if err != nil {
-				fmt.Printf("%3d: t=%3d start err %v\n", index, tag, err)
-				break out
-			}
-			fmt.Printf("%3d: t=%3d start\n", index, tag)
-			depth++
-
-		case WireEndGroup:
-			depth--
-			if err != nil {
-				fmt.Printf("%3d: t=%3d end err %v\n", index, tag, err)
-				break out
-			}
-			fmt.Printf("%3d: t=%3d end\n", index, tag)
-		}
-	}
-
-	if depth != 0 {
-		fmt.Printf("%3d: start-end not balanced %d\n", p.index, depth)
-	}
-	fmt.Printf("\n")
-
-	p.buf = obuf
-	p.index = index
-}
-
-// SetDefaults sets unset protocol buffer fields to their default values.
-// It only modifies fields that are both unset and have defined defaults.
-// It recursively sets default values in any non-nil sub-messages.
-func SetDefaults(pb Message) {
-	setDefaults(reflect.ValueOf(pb), true, false)
-}
-
-// v is a pointer to a struct.
-func setDefaults(v reflect.Value, recur, zeros bool) {
-	v = v.Elem()
-
-	defaultMu.RLock()
-	dm, ok := defaults[v.Type()]
-	defaultMu.RUnlock()
-	if !ok {
-		dm = buildDefaultMessage(v.Type())
-		defaultMu.Lock()
-		defaults[v.Type()] = dm
-		defaultMu.Unlock()
-	}
-
-	for _, sf := range dm.scalars {
-		f := v.Field(sf.index)
-		if !f.IsNil() {
-			// field already set
-			continue
-		}
-		dv := sf.value
-		if dv == nil && !zeros {
-			// no explicit default, and don't want to set zeros
-			continue
-		}
-		fptr := f.Addr().Interface() // **T
-		// TODO: Consider batching the allocations we do here.
-		switch sf.kind {
-		case reflect.Bool:
-			b := new(bool)
-			if dv != nil {
-				*b = dv.(bool)
-			}
-			*(fptr.(**bool)) = b
-		case reflect.Float32:
-			f := new(float32)
-			if dv != nil {
-				*f = dv.(float32)
-			}
-			*(fptr.(**float32)) = f
-		case reflect.Float64:
-			f := new(float64)
-			if dv != nil {
-				*f = dv.(float64)
-			}
-			*(fptr.(**float64)) = f
-		case reflect.Int32:
-			// might be an enum
-			if ft := f.Type(); ft != int32PtrType {
-				// enum
-				f.Set(reflect.New(ft.Elem()))
-				if dv != nil {
-					f.Elem().SetInt(int64(dv.(int32)))
-				}
-			} else {
-				// int32 field
-				i := new(int32)
-				if dv != nil {
-					*i = dv.(int32)
-				}
-				*(fptr.(**int32)) = i
-			}
-		case reflect.Int64:
-			i := new(int64)
-			if dv != nil {
-				*i = dv.(int64)
-			}
-			*(fptr.(**int64)) = i
-		case reflect.String:
-			s := new(string)
-			if dv != nil {
-				*s = dv.(string)
-			}
-			*(fptr.(**string)) = s
-		case reflect.Uint8:
-			// exceptional case: []byte
-			var b []byte
-			if dv != nil {
-				db := dv.([]byte)
-				b = make([]byte, len(db))
-				copy(b, db)
-			} else {
-				b = []byte{}
-			}
-			*(fptr.(*[]byte)) = b
-		case reflect.Uint32:
-			u := new(uint32)
-			if dv != nil {
-				*u = dv.(uint32)
-			}
-			*(fptr.(**uint32)) = u
-		case reflect.Uint64:
-			u := new(uint64)
-			if dv != nil {
-				*u = dv.(uint64)
-			}
-			*(fptr.(**uint64)) = u
-		default:
-			log.Printf("proto: can't set default for field %v (sf.kind=%v)", f, sf.kind)
-		}
-	}
-
-	for _, ni := range dm.nested {
-		f := v.Field(ni)
-		// f is *T or []*T or map[T]*T
-		switch f.Kind() {
-		case reflect.Ptr:
-			if f.IsNil() {
-				continue
-			}
-			setDefaults(f, recur, zeros)
-
-		case reflect.Slice:
-			for i := 0; i < f.Len(); i++ {
-				e := f.Index(i)
-				if e.IsNil() {
-					continue
-				}
-				setDefaults(e, recur, zeros)
-			}
-
-		case reflect.Map:
-			for _, k := range f.MapKeys() {
-				e := f.MapIndex(k)
-				if e.IsNil() {
-					continue
-				}
-				setDefaults(e, recur, zeros)
-			}
-		}
-	}
-}
-
-var (
-	// defaults maps a protocol buffer struct type to a slice of the fields,
-	// with its scalar fields set to their proto-declared non-zero default values.
-	defaultMu sync.RWMutex
-	defaults  = make(map[reflect.Type]defaultMessage)
-
-	int32PtrType = reflect.TypeOf((*int32)(nil))
-)
-
-// defaultMessage represents information about the default values of a message.
-type defaultMessage struct {
-	scalars []scalarField
-	nested  []int // struct field index of nested messages
-}
-
-type scalarField struct {
-	index int          // struct field index
-	kind  reflect.Kind // element type (the T in *T or []T)
-	value interface{}  // the proto-declared default value, or nil
-}
-
-// t is a struct type.
-func buildDefaultMessage(t reflect.Type) (dm defaultMessage) {
-	sprop := GetProperties(t)
-	for _, prop := range sprop.Prop {
-		fi, ok := sprop.decoderTags.get(prop.Tag)
-		if !ok {
-			// XXX_unrecognized
-			continue
-		}
-		ft := t.Field(fi).Type
-
-		sf, nested, err := fieldDefault(ft, prop)
-		switch {
-		case err != nil:
-			log.Print(err)
-		case nested:
-			dm.nested = append(dm.nested, fi)
-		case sf != nil:
-			sf.index = fi
-			dm.scalars = append(dm.scalars, *sf)
-		}
-	}
-
-	return dm
-}
-
-// fieldDefault returns the scalarField for field type ft.
-// sf will be nil if the field can not have a default.
-// nestedMessage will be true if this is a nested message.
-// Note that sf.index is not set on return.
-func fieldDefault(ft reflect.Type, prop *Properties) (sf *scalarField, nestedMessage bool, err error) {
-	var canHaveDefault bool
-	switch ft.Kind() {
-	case reflect.Ptr:
-		if ft.Elem().Kind() == reflect.Struct {
-			nestedMessage = true
-		} else {
-			canHaveDefault = true // proto2 scalar field
-		}
-
-	case reflect.Slice:
-		switch ft.Elem().Kind() {
-		case reflect.Ptr:
-			nestedMessage = true // repeated message
-		case reflect.Uint8:
-			canHaveDefault = true // bytes field
-		}
-
-	case reflect.Map:
-		if ft.Elem().Kind() == reflect.Ptr {
-			nestedMessage = true // map with message values
-		}
-	}
-
-	if !canHaveDefault {
-		if nestedMessage {
-			return nil, true, nil
-		}
-		return nil, false, nil
-	}
-
-	// We now know that ft is a pointer or slice.
-	sf = &scalarField{kind: ft.Elem().Kind()}
-
-	// scalar fields without defaults
-	if !prop.HasDefault {
-		return sf, false, nil
-	}
-
-	// a scalar field: either *T or []byte
-	switch ft.Elem().Kind() {
-	case reflect.Bool:
-		x, err := strconv.ParseBool(prop.Default)
-		if err != nil {
-			return nil, false, fmt.Errorf("proto: bad default bool %q: %v", prop.Default, err)
-		}
-		sf.value = x
-	case reflect.Float32:
-		x, err := strconv.ParseFloat(prop.Default, 32)
-		if err != nil {
-			return nil, false, fmt.Errorf("proto: bad default float32 %q: %v", prop.Default, err)
-		}
-		sf.value = float32(x)
-	case reflect.Float64:
-		x, err := strconv.ParseFloat(prop.Default, 64)
-		if err != nil {
-			return nil, false, fmt.Errorf("proto: bad default float64 %q: %v", prop.Default, err)
-		}
-		sf.value = x
-	case reflect.Int32:
-		x, err := strconv.ParseInt(prop.Default, 10, 32)
-		if err != nil {
-			return nil, false, fmt.Errorf("proto: bad default int32 %q: %v", prop.Default, err)
-		}
-		sf.value = int32(x)
-	case reflect.Int64:
-		x, err := strconv.ParseInt(prop.Default, 10, 64)
-		if err != nil {
-			return nil, false, fmt.Errorf("proto: bad default int64 %q: %v", prop.Default, err)
-		}
-		sf.value = x
-	case reflect.String:
-		sf.value = prop.Default
-	case reflect.Uint8:
-		// []byte (not *uint8)
-		sf.value = []byte(prop.Default)
-	case reflect.Uint32:
-		x, err := strconv.ParseUint(prop.Default, 10, 32)
-		if err != nil {
-			return nil, false, fmt.Errorf("proto: bad default uint32 %q: %v", prop.Default, err)
-		}
-		sf.value = uint32(x)
-	case reflect.Uint64:
-		x, err := strconv.ParseUint(prop.Default, 10, 64)
-		if err != nil {
-			return nil, false, fmt.Errorf("proto: bad default uint64 %q: %v", prop.Default, err)
-		}
-		sf.value = x
-	default:
-		return nil, false, fmt.Errorf("proto: unhandled def kind %v", ft.Elem().Kind())
-	}
-
-	return sf, false, nil
-}
-
-// Map fields may have key types of non-float scalars, strings and enums.
-// The easiest way to sort them in some deterministic order is to use fmt.
-// If this turns out to be inefficient we can always consider other options,
-// such as doing a Schwartzian transform.
-
-func mapKeys(vs []reflect.Value) sort.Interface {
-	s := mapKeySorter{
-		vs: vs,
-		// default Less function: textual comparison
-		less: func(a, b reflect.Value) bool {
-			return fmt.Sprint(a.Interface()) < fmt.Sprint(b.Interface())
-		},
-	}
-
-	// Type specialization per https://developers.google.com/protocol-buffers/docs/proto#maps;
-	// numeric keys are sorted numerically.
-	if len(vs) == 0 {
-		return s
-	}
-	switch vs[0].Kind() {
-	case reflect.Int32, reflect.Int64:
-		s.less = func(a, b reflect.Value) bool { return a.Int() < b.Int() }
-	case reflect.Uint32, reflect.Uint64:
-		s.less = func(a, b reflect.Value) bool { return a.Uint() < b.Uint() }
-	}
-
-	return s
-}
-
-type mapKeySorter struct {
-	vs   []reflect.Value
-	less func(a, b reflect.Value) bool
-}
-
-func (s mapKeySorter) Len() int      { return len(s.vs) }
-func (s mapKeySorter) Swap(i, j int) { s.vs[i], s.vs[j] = s.vs[j], s.vs[i] }
-func (s mapKeySorter) Less(i, j int) bool {
-	return s.less(s.vs[i], s.vs[j])
-}
-
-// isProto3Zero reports whether v is a zero proto3 value.
-func isProto3Zero(v reflect.Value) bool {
-	switch v.Kind() {
-	case reflect.Bool:
-		return !v.Bool()
-	case reflect.Int32, reflect.Int64:
-		return v.Int() == 0
-	case reflect.Uint32, reflect.Uint64:
-		return v.Uint() == 0
-	case reflect.Float32, reflect.Float64:
-		return v.Float() == 0
-	case reflect.String:
-		return v.String() == ""
-	}
-	return false
-}
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/lib_gogo.go b/Godeps/_workspace/src/github.com/gogo/protobuf/proto/lib_gogo.go
deleted file mode 100644
index a6c2c06b2..000000000
--- a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/lib_gogo.go
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright (c) 2013, Vastech SA (PTY) LTD. All rights reserved.
-// http://github.com/gogo/protobuf/gogoproto
-//
-// 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.
-
-package proto
-
-import (
-	"encoding/json"
-	"strconv"
-)
-
-func MarshalJSONEnum(m map[int32]string, value int32) ([]byte, error) {
-	s, ok := m[value]
-	if !ok {
-		s = strconv.Itoa(int(value))
-	}
-	return json.Marshal(s)
-}
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/message_set.go b/Godeps/_workspace/src/github.com/gogo/protobuf/proto/message_set.go
deleted file mode 100644
index 9d912bce1..000000000
--- a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/message_set.go
+++ /dev/null
@@ -1,287 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2010 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// 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.
-
-package proto
-
-/*
- * Support for message sets.
- */
-
-import (
-	"bytes"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"reflect"
-	"sort"
-)
-
-// ErrNoMessageTypeId occurs when a protocol buffer does not have a message type ID.
-// A message type ID is required for storing a protocol buffer in a message set.
-var ErrNoMessageTypeId = errors.New("proto does not have a message type ID")
-
-// The first two types (_MessageSet_Item and MessageSet)
-// model what the protocol compiler produces for the following protocol message:
-//   message MessageSet {
-//     repeated group Item = 1 {
-//       required int32 type_id = 2;
-//       required string message = 3;
-//     };
-//   }
-// That is the MessageSet wire format. We can't use a proto to generate these
-// because that would introduce a circular dependency between it and this package.
-//
-// When a proto1 proto has a field that looks like:
-//   optional message<MessageSet> info = 3;
-// the protocol compiler produces a field in the generated struct that looks like:
-//   Info *_proto_.MessageSet  `protobuf:"bytes,3,opt,name=info"`
-// The package is automatically inserted so there is no need for that proto file to
-// import this package.
-
-type _MessageSet_Item struct {
-	TypeId  *int32 `protobuf:"varint,2,req,name=type_id"`
-	Message []byte `protobuf:"bytes,3,req,name=message"`
-}
-
-type MessageSet struct {
-	Item             []*_MessageSet_Item `protobuf:"group,1,rep"`
-	XXX_unrecognized []byte
-	// TODO: caching?
-}
-
-// Make sure MessageSet is a Message.
-var _ Message = (*MessageSet)(nil)
-
-// messageTypeIder is an interface satisfied by a protocol buffer type
-// that may be stored in a MessageSet.
-type messageTypeIder interface {
-	MessageTypeId() int32
-}
-
-func (ms *MessageSet) find(pb Message) *_MessageSet_Item {
-	mti, ok := pb.(messageTypeIder)
-	if !ok {
-		return nil
-	}
-	id := mti.MessageTypeId()
-	for _, item := range ms.Item {
-		if *item.TypeId == id {
-			return item
-		}
-	}
-	return nil
-}
-
-func (ms *MessageSet) Has(pb Message) bool {
-	if ms.find(pb) != nil {
-		return true
-	}
-	return false
-}
-
-func (ms *MessageSet) Unmarshal(pb Message) error {
-	if item := ms.find(pb); item != nil {
-		return Unmarshal(item.Message, pb)
-	}
-	if _, ok := pb.(messageTypeIder); !ok {
-		return ErrNoMessageTypeId
-	}
-	return nil // TODO: return error instead?
-}
-
-func (ms *MessageSet) Marshal(pb Message) error {
-	msg, err := Marshal(pb)
-	if err != nil {
-		return err
-	}
-	if item := ms.find(pb); item != nil {
-		// reuse existing item
-		item.Message = msg
-		return nil
-	}
-
-	mti, ok := pb.(messageTypeIder)
-	if !ok {
-		return ErrNoMessageTypeId
-	}
-
-	mtid := mti.MessageTypeId()
-	ms.Item = append(ms.Item, &_MessageSet_Item{
-		TypeId:  &mtid,
-		Message: msg,
-	})
-	return nil
-}
-
-func (ms *MessageSet) Reset()         { *ms = MessageSet{} }
-func (ms *MessageSet) String() string { return CompactTextString(ms) }
-func (*MessageSet) ProtoMessage()     {}
-
-// Support for the message_set_wire_format message option.
-
-func skipVarint(buf []byte) []byte {
-	i := 0
-	for ; buf[i]&0x80 != 0; i++ {
-	}
-	return buf[i+1:]
-}
-
-// MarshalMessageSet encodes the extension map represented by m in the message set wire format.
-// It is called by generated Marshal methods on protocol buffer messages with the message_set_wire_format option.
-func MarshalMessageSet(m map[int32]Extension) ([]byte, error) {
-	if err := encodeExtensionMap(m); err != nil {
-		return nil, err
-	}
-
-	// Sort extension IDs to provide a deterministic encoding.
-	// See also enc_map in encode.go.
-	ids := make([]int, 0, len(m))
-	for id := range m {
-		ids = append(ids, int(id))
-	}
-	sort.Ints(ids)
-
-	ms := &MessageSet{Item: make([]*_MessageSet_Item, 0, len(m))}
-	for _, id := range ids {
-		e := m[int32(id)]
-		// Remove the wire type and field number varint, as well as the length varint.
-		msg := skipVarint(skipVarint(e.enc))
-
-		ms.Item = append(ms.Item, &_MessageSet_Item{
-			TypeId:  Int32(int32(id)),
-			Message: msg,
-		})
-	}
-	return Marshal(ms)
-}
-
-// UnmarshalMessageSet decodes the extension map encoded in buf in the message set wire format.
-// It is called by generated Unmarshal methods on protocol buffer messages with the message_set_wire_format option.
-func UnmarshalMessageSet(buf []byte, m map[int32]Extension) error {
-	ms := new(MessageSet)
-	if err := Unmarshal(buf, ms); err != nil {
-		return err
-	}
-	for _, item := range ms.Item {
-		id := *item.TypeId
-		msg := item.Message
-
-		// Restore wire type and field number varint, plus length varint.
-		// Be careful to preserve duplicate items.
-		b := EncodeVarint(uint64(id)<<3 | WireBytes)
-		if ext, ok := m[id]; ok {
-			// Existing data; rip off the tag and length varint
-			// so we join the new data correctly.
-			// We can assume that ext.enc is set because we are unmarshaling.
-			o := ext.enc[len(b):]   // skip wire type and field number
-			_, n := DecodeVarint(o) // calculate length of length varint
-			o = o[n:]               // skip length varint
-			msg = append(o, msg...) // join old data and new data
-		}
-		b = append(b, EncodeVarint(uint64(len(msg)))...)
-		b = append(b, msg...)
-
-		m[id] = Extension{enc: b}
-	}
-	return nil
-}
-
-// MarshalMessageSetJSON encodes the extension map represented by m in JSON format.
-// It is called by generated MarshalJSON methods on protocol buffer messages with the message_set_wire_format option.
-func MarshalMessageSetJSON(m map[int32]Extension) ([]byte, error) {
-	var b bytes.Buffer
-	b.WriteByte('{')
-
-	// Process the map in key order for deterministic output.
-	ids := make([]int32, 0, len(m))
-	for id := range m {
-		ids = append(ids, id)
-	}
-	sort.Sort(int32Slice(ids)) // int32Slice defined in text.go
-
-	for i, id := range ids {
-		ext := m[id]
-		if i > 0 {
-			b.WriteByte(',')
-		}
-
-		msd, ok := messageSetMap[id]
-		if !ok {
-			// Unknown type; we can't render it, so skip it.
-			continue
-		}
-		fmt.Fprintf(&b, `"[%s]":`, msd.name)
-
-		x := ext.value
-		if x == nil {
-			x = reflect.New(msd.t.Elem()).Interface()
-			if err := Unmarshal(ext.enc, x.(Message)); err != nil {
-				return nil, err
-			}
-		}
-		d, err := json.Marshal(x)
-		if err != nil {
-			return nil, err
-		}
-		b.Write(d)
-	}
-	b.WriteByte('}')
-	return b.Bytes(), nil
-}
-
-// UnmarshalMessageSetJSON decodes the extension map encoded in buf in JSON format.
-// It is called by generated UnmarshalJSON methods on protocol buffer messages with the message_set_wire_format option.
-func UnmarshalMessageSetJSON(buf []byte, m map[int32]Extension) error {
-	// Common-case fast path.
-	if len(buf) == 0 || bytes.Equal(buf, []byte("{}")) {
-		return nil
-	}
-
-	// This is fairly tricky, and it's not clear that it is needed.
-	return errors.New("TODO: UnmarshalMessageSetJSON not yet implemented")
-}
-
-// A global registry of types that can be used in a MessageSet.
-
-var messageSetMap = make(map[int32]messageSetDesc)
-
-type messageSetDesc struct {
-	t    reflect.Type // pointer to struct
-	name string
-}
-
-// RegisterMessageSetType is called from the generated code.
-func RegisterMessageSetType(m Message, fieldNum int32, name string) {
-	messageSetMap[fieldNum] = messageSetDesc{
-		t:    reflect.TypeOf(m),
-		name: name,
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/message_set_test.go b/Godeps/_workspace/src/github.com/gogo/protobuf/proto/message_set_test.go
deleted file mode 100644
index 7c29bccf4..000000000
--- a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/message_set_test.go
+++ /dev/null
@@ -1,66 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2014 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// 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.
-
-package proto
-
-import (
-	"bytes"
-	"testing"
-)
-
-func TestUnmarshalMessageSetWithDuplicate(t *testing.T) {
-	// Check that a repeated message set entry will be concatenated.
-	in := &MessageSet{
-		Item: []*_MessageSet_Item{
-			{TypeId: Int32(12345), Message: []byte("hoo")},
-			{TypeId: Int32(12345), Message: []byte("hah")},
-		},
-	}
-	b, err := Marshal(in)
-	if err != nil {
-		t.Fatalf("Marshal: %v", err)
-	}
-	t.Logf("Marshaled bytes: %q", b)
-
-	m := make(map[int32]Extension)
-	if err := UnmarshalMessageSet(b, m); err != nil {
-		t.Fatalf("UnmarshalMessageSet: %v", err)
-	}
-	ext, ok := m[12345]
-	if !ok {
-		t.Fatalf("Didn't retrieve extension 12345; map is %v", m)
-	}
-	// Skip wire type/field number and length varints.
-	got := skipVarint(skipVarint(ext.enc))
-	if want := []byte("hoohah"); !bytes.Equal(got, want) {
-		t.Errorf("Combined extension is %q, want %q", got, want)
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/pointer_reflect.go b/Godeps/_workspace/src/github.com/gogo/protobuf/proto/pointer_reflect.go
deleted file mode 100644
index 749919d25..000000000
--- a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/pointer_reflect.go
+++ /dev/null
@@ -1,479 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2012 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// 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.
-
-// +build appengine
-
-// This file contains an implementation of proto field accesses using package reflect.
-// It is slower than the code in pointer_unsafe.go but it avoids package unsafe and can
-// be used on App Engine.
-
-package proto
-
-import (
-	"math"
-	"reflect"
-)
-
-// A structPointer is a pointer to a struct.
-type structPointer struct {
-	v reflect.Value
-}
-
-// toStructPointer returns a structPointer equivalent to the given reflect value.
-// The reflect value must itself be a pointer to a struct.
-func toStructPointer(v reflect.Value) structPointer {
-	return structPointer{v}
-}
-
-// IsNil reports whether p is nil.
-func structPointer_IsNil(p structPointer) bool {
-	return p.v.IsNil()
-}
-
-// Interface returns the struct pointer as an interface value.
-func structPointer_Interface(p structPointer, _ reflect.Type) interface{} {
-	return p.v.Interface()
-}
-
-// A field identifies a field in a struct, accessible from a structPointer.
-// In this implementation, a field is identified by the sequence of field indices
-// passed to reflect's FieldByIndex.
-type field []int
-
-// toField returns a field equivalent to the given reflect field.
-func toField(f *reflect.StructField) field {
-	return f.Index
-}
-
-// invalidField is an invalid field identifier.
-var invalidField = field(nil)
-
-// IsValid reports whether the field identifier is valid.
-func (f field) IsValid() bool { return f != nil }
-
-// field returns the given field in the struct as a reflect value.
-func structPointer_field(p structPointer, f field) reflect.Value {
-	// Special case: an extension map entry with a value of type T
-	// passes a *T to the struct-handling code with a zero field,
-	// expecting that it will be treated as equivalent to *struct{ X T },
-	// which has the same memory layout. We have to handle that case
-	// specially, because reflect will panic if we call FieldByIndex on a
-	// non-struct.
-	if f == nil {
-		return p.v.Elem()
-	}
-
-	return p.v.Elem().FieldByIndex(f)
-}
-
-// ifield returns the given field in the struct as an interface value.
-func structPointer_ifield(p structPointer, f field) interface{} {
-	return structPointer_field(p, f).Addr().Interface()
-}
-
-// Bytes returns the address of a []byte field in the struct.
-func structPointer_Bytes(p structPointer, f field) *[]byte {
-	return structPointer_ifield(p, f).(*[]byte)
-}
-
-// BytesSlice returns the address of a [][]byte field in the struct.
-func structPointer_BytesSlice(p structPointer, f field) *[][]byte {
-	return structPointer_ifield(p, f).(*[][]byte)
-}
-
-// Bool returns the address of a *bool field in the struct.
-func structPointer_Bool(p structPointer, f field) **bool {
-	return structPointer_ifield(p, f).(**bool)
-}
-
-// BoolVal returns the address of a bool field in the struct.
-func structPointer_BoolVal(p structPointer, f field) *bool {
-	return structPointer_ifield(p, f).(*bool)
-}
-
-// BoolSlice returns the address of a []bool field in the struct.
-func structPointer_BoolSlice(p structPointer, f field) *[]bool {
-	return structPointer_ifield(p, f).(*[]bool)
-}
-
-// String returns the address of a *string field in the struct.
-func structPointer_String(p structPointer, f field) **string {
-	return structPointer_ifield(p, f).(**string)
-}
-
-// StringVal returns the address of a string field in the struct.
-func structPointer_StringVal(p structPointer, f field) *string {
-	return structPointer_ifield(p, f).(*string)
-}
-
-// StringSlice returns the address of a []string field in the struct.
-func structPointer_StringSlice(p structPointer, f field) *[]string {
-	return structPointer_ifield(p, f).(*[]string)
-}
-
-// ExtMap returns the address of an extension map field in the struct.
-func structPointer_ExtMap(p structPointer, f field) *map[int32]Extension {
-	return structPointer_ifield(p, f).(*map[int32]Extension)
-}
-
-// NewAt returns the reflect.Value for a pointer to a field in the struct.
-func structPointer_NewAt(p structPointer, f field, typ reflect.Type) reflect.Value {
-	return structPointer_field(p, f).Addr()
-}
-
-// SetStructPointer writes a *struct field in the struct.
-func structPointer_SetStructPointer(p structPointer, f field, q structPointer) {
-	structPointer_field(p, f).Set(q.v)
-}
-
-// GetStructPointer reads a *struct field in the struct.
-func structPointer_GetStructPointer(p structPointer, f field) structPointer {
-	return structPointer{structPointer_field(p, f)}
-}
-
-// StructPointerSlice the address of a []*struct field in the struct.
-func structPointer_StructPointerSlice(p structPointer, f field) structPointerSlice {
-	return structPointerSlice{structPointer_field(p, f)}
-}
-
-// A structPointerSlice represents the address of a slice of pointers to structs
-// (themselves messages or groups). That is, v.Type() is *[]*struct{...}.
-type structPointerSlice struct {
-	v reflect.Value
-}
-
-func (p structPointerSlice) Len() int                  { return p.v.Len() }
-func (p structPointerSlice) Index(i int) structPointer { return structPointer{p.v.Index(i)} }
-func (p structPointerSlice) Append(q structPointer) {
-	p.v.Set(reflect.Append(p.v, q.v))
-}
-
-var (
-	int32Type   = reflect.TypeOf(int32(0))
-	uint32Type  = reflect.TypeOf(uint32(0))
-	float32Type = reflect.TypeOf(float32(0))
-	int64Type   = reflect.TypeOf(int64(0))
-	uint64Type  = reflect.TypeOf(uint64(0))
-	float64Type = reflect.TypeOf(float64(0))
-)
-
-// A word32 represents a field of type *int32, *uint32, *float32, or *enum.
-// That is, v.Type() is *int32, *uint32, *float32, or *enum and v is assignable.
-type word32 struct {
-	v reflect.Value
-}
-
-// IsNil reports whether p is nil.
-func word32_IsNil(p word32) bool {
-	return p.v.IsNil()
-}
-
-// Set sets p to point at a newly allocated word with bits set to x.
-func word32_Set(p word32, o *Buffer, x uint32) {
-	t := p.v.Type().Elem()
-	switch t {
-	case int32Type:
-		if len(o.int32s) == 0 {
-			o.int32s = make([]int32, uint32PoolSize)
-		}
-		o.int32s[0] = int32(x)
-		p.v.Set(reflect.ValueOf(&o.int32s[0]))
-		o.int32s = o.int32s[1:]
-		return
-	case uint32Type:
-		if len(o.uint32s) == 0 {
-			o.uint32s = make([]uint32, uint32PoolSize)
-		}
-		o.uint32s[0] = x
-		p.v.Set(reflect.ValueOf(&o.uint32s[0]))
-		o.uint32s = o.uint32s[1:]
-		return
-	case float32Type:
-		if len(o.float32s) == 0 {
-			o.float32s = make([]float32, uint32PoolSize)
-		}
-		o.float32s[0] = math.Float32frombits(x)
-		p.v.Set(reflect.ValueOf(&o.float32s[0]))
-		o.float32s = o.float32s[1:]
-		return
-	}
-
-	// must be enum
-	p.v.Set(reflect.New(t))
-	p.v.Elem().SetInt(int64(int32(x)))
-}
-
-// Get gets the bits pointed at by p, as a uint32.
-func word32_Get(p word32) uint32 {
-	elem := p.v.Elem()
-	switch elem.Kind() {
-	case reflect.Int32:
-		return uint32(elem.Int())
-	case reflect.Uint32:
-		return uint32(elem.Uint())
-	case reflect.Float32:
-		return math.Float32bits(float32(elem.Float()))
-	}
-	panic("unreachable")
-}
-
-// Word32 returns a reference to a *int32, *uint32, *float32, or *enum field in the struct.
-func structPointer_Word32(p structPointer, f field) word32 {
-	return word32{structPointer_field(p, f)}
-}
-
-// A word32Val represents a field of type int32, uint32, float32, or enum.
-// That is, v.Type() is int32, uint32, float32, or enum and v is assignable.
-type word32Val struct {
-	v reflect.Value
-}
-
-// Set sets *p to x.
-func word32Val_Set(p word32Val, x uint32) {
-	switch p.v.Type() {
-	case int32Type:
-		p.v.SetInt(int64(x))
-		return
-	case uint32Type:
-		p.v.SetUint(uint64(x))
-		return
-	case float32Type:
-		p.v.SetFloat(float64(math.Float32frombits(x)))
-		return
-	}
-
-	// must be enum
-	p.v.SetInt(int64(int32(x)))
-}
-
-// Get gets the bits pointed at by p, as a uint32.
-func word32Val_Get(p word32Val) uint32 {
-	elem := p.v
-	switch elem.Kind() {
-	case reflect.Int32:
-		return uint32(elem.Int())
-	case reflect.Uint32:
-		return uint32(elem.Uint())
-	case reflect.Float32:
-		return math.Float32bits(float32(elem.Float()))
-	}
-	panic("unreachable")
-}
-
-// Word32Val returns a reference to a int32, uint32, float32, or enum field in the struct.
-func structPointer_Word32Val(p structPointer, f field) word32Val {
-	return word32Val{structPointer_field(p, f)}
-}
-
-// A word32Slice is a slice of 32-bit values.
-// That is, v.Type() is []int32, []uint32, []float32, or []enum.
-type word32Slice struct {
-	v reflect.Value
-}
-
-func (p word32Slice) Append(x uint32) {
-	n, m := p.v.Len(), p.v.Cap()
-	if n < m {
-		p.v.SetLen(n + 1)
-	} else {
-		t := p.v.Type().Elem()
-		p.v.Set(reflect.Append(p.v, reflect.Zero(t)))
-	}
-	elem := p.v.Index(n)
-	switch elem.Kind() {
-	case reflect.Int32:
-		elem.SetInt(int64(int32(x)))
-	case reflect.Uint32:
-		elem.SetUint(uint64(x))
-	case reflect.Float32:
-		elem.SetFloat(float64(math.Float32frombits(x)))
-	}
-}
-
-func (p word32Slice) Len() int {
-	return p.v.Len()
-}
-
-func (p word32Slice) Index(i int) uint32 {
-	elem := p.v.Index(i)
-	switch elem.Kind() {
-	case reflect.Int32:
-		return uint32(elem.Int())
-	case reflect.Uint32:
-		return uint32(elem.Uint())
-	case reflect.Float32:
-		return math.Float32bits(float32(elem.Float()))
-	}
-	panic("unreachable")
-}
-
-// Word32Slice returns a reference to a []int32, []uint32, []float32, or []enum field in the struct.
-func structPointer_Word32Slice(p structPointer, f field) word32Slice {
-	return word32Slice{structPointer_field(p, f)}
-}
-
-// word64 is like word32 but for 64-bit values.
-type word64 struct {
-	v reflect.Value
-}
-
-func word64_Set(p word64, o *Buffer, x uint64) {
-	t := p.v.Type().Elem()
-	switch t {
-	case int64Type:
-		if len(o.int64s) == 0 {
-			o.int64s = make([]int64, uint64PoolSize)
-		}
-		o.int64s[0] = int64(x)
-		p.v.Set(reflect.ValueOf(&o.int64s[0]))
-		o.int64s = o.int64s[1:]
-		return
-	case uint64Type:
-		if len(o.uint64s) == 0 {
-			o.uint64s = make([]uint64, uint64PoolSize)
-		}
-		o.uint64s[0] = x
-		p.v.Set(reflect.ValueOf(&o.uint64s[0]))
-		o.uint64s = o.uint64s[1:]
-		return
-	case float64Type:
-		if len(o.float64s) == 0 {
-			o.float64s = make([]float64, uint64PoolSize)
-		}
-		o.float64s[0] = math.Float64frombits(x)
-		p.v.Set(reflect.ValueOf(&o.float64s[0]))
-		o.float64s = o.float64s[1:]
-		return
-	}
-	panic("unreachable")
-}
-
-func word64_IsNil(p word64) bool {
-	return p.v.IsNil()
-}
-
-func word64_Get(p word64) uint64 {
-	elem := p.v.Elem()
-	switch elem.Kind() {
-	case reflect.Int64:
-		return uint64(elem.Int())
-	case reflect.Uint64:
-		return elem.Uint()
-	case reflect.Float64:
-		return math.Float64bits(elem.Float())
-	}
-	panic("unreachable")
-}
-
-func structPointer_Word64(p structPointer, f field) word64 {
-	return word64{structPointer_field(p, f)}
-}
-
-// word64Val is like word32Val but for 64-bit values.
-type word64Val struct {
-	v reflect.Value
-}
-
-func word64Val_Set(p word64Val, o *Buffer, x uint64) {
-	switch p.v.Type() {
-	case int64Type:
-		p.v.SetInt(int64(x))
-		return
-	case uint64Type:
-		p.v.SetUint(x)
-		return
-	case float64Type:
-		p.v.SetFloat(math.Float64frombits(x))
-		return
-	}
-	panic("unreachable")
-}
-
-func word64Val_Get(p word64Val) uint64 {
-	elem := p.v
-	switch elem.Kind() {
-	case reflect.Int64:
-		return uint64(elem.Int())
-	case reflect.Uint64:
-		return elem.Uint()
-	case reflect.Float64:
-		return math.Float64bits(elem.Float())
-	}
-	panic("unreachable")
-}
-
-func structPointer_Word64Val(p structPointer, f field) word64Val {
-	return word64Val{structPointer_field(p, f)}
-}
-
-type word64Slice struct {
-	v reflect.Value
-}
-
-func (p word64Slice) Append(x uint64) {
-	n, m := p.v.Len(), p.v.Cap()
-	if n < m {
-		p.v.SetLen(n + 1)
-	} else {
-		t := p.v.Type().Elem()
-		p.v.Set(reflect.Append(p.v, reflect.Zero(t)))
-	}
-	elem := p.v.Index(n)
-	switch elem.Kind() {
-	case reflect.Int64:
-		elem.SetInt(int64(int64(x)))
-	case reflect.Uint64:
-		elem.SetUint(uint64(x))
-	case reflect.Float64:
-		elem.SetFloat(float64(math.Float64frombits(x)))
-	}
-}
-
-func (p word64Slice) Len() int {
-	return p.v.Len()
-}
-
-func (p word64Slice) Index(i int) uint64 {
-	elem := p.v.Index(i)
-	switch elem.Kind() {
-	case reflect.Int64:
-		return uint64(elem.Int())
-	case reflect.Uint64:
-		return uint64(elem.Uint())
-	case reflect.Float64:
-		return math.Float64bits(float64(elem.Float()))
-	}
-	panic("unreachable")
-}
-
-func structPointer_Word64Slice(p structPointer, f field) word64Slice {
-	return word64Slice{structPointer_field(p, f)}
-}
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/pointer_unsafe.go b/Godeps/_workspace/src/github.com/gogo/protobuf/proto/pointer_unsafe.go
deleted file mode 100644
index e9be0fe92..000000000
--- a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/pointer_unsafe.go
+++ /dev/null
@@ -1,266 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2012 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// 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.
-
-// +build !appengine
-
-// This file contains the implementation of the proto field accesses using package unsafe.
-
-package proto
-
-import (
-	"reflect"
-	"unsafe"
-)
-
-// NOTE: These type_Foo functions would more idiomatically be methods,
-// but Go does not allow methods on pointer types, and we must preserve
-// some pointer type for the garbage collector. We use these
-// funcs with clunky names as our poor approximation to methods.
-//
-// An alternative would be
-//	type structPointer struct { p unsafe.Pointer }
-// but that does not registerize as well.
-
-// A structPointer is a pointer to a struct.
-type structPointer unsafe.Pointer
-
-// toStructPointer returns a structPointer equivalent to the given reflect value.
-func toStructPointer(v reflect.Value) structPointer {
-	return structPointer(unsafe.Pointer(v.Pointer()))
-}
-
-// IsNil reports whether p is nil.
-func structPointer_IsNil(p structPointer) bool {
-	return p == nil
-}
-
-// Interface returns the struct pointer, assumed to have element type t,
-// as an interface value.
-func structPointer_Interface(p structPointer, t reflect.Type) interface{} {
-	return reflect.NewAt(t, unsafe.Pointer(p)).Interface()
-}
-
-// A field identifies a field in a struct, accessible from a structPointer.
-// In this implementation, a field is identified by its byte offset from the start of the struct.
-type field uintptr
-
-// toField returns a field equivalent to the given reflect field.
-func toField(f *reflect.StructField) field {
-	return field(f.Offset)
-}
-
-// invalidField is an invalid field identifier.
-const invalidField = ^field(0)
-
-// IsValid reports whether the field identifier is valid.
-func (f field) IsValid() bool {
-	return f != ^field(0)
-}
-
-// Bytes returns the address of a []byte field in the struct.
-func structPointer_Bytes(p structPointer, f field) *[]byte {
-	return (*[]byte)(unsafe.Pointer(uintptr(p) + uintptr(f)))
-}
-
-// BytesSlice returns the address of a [][]byte field in the struct.
-func structPointer_BytesSlice(p structPointer, f field) *[][]byte {
-	return (*[][]byte)(unsafe.Pointer(uintptr(p) + uintptr(f)))
-}
-
-// Bool returns the address of a *bool field in the struct.
-func structPointer_Bool(p structPointer, f field) **bool {
-	return (**bool)(unsafe.Pointer(uintptr(p) + uintptr(f)))
-}
-
-// BoolVal returns the address of a bool field in the struct.
-func structPointer_BoolVal(p structPointer, f field) *bool {
-	return (*bool)(unsafe.Pointer(uintptr(p) + uintptr(f)))
-}
-
-// BoolSlice returns the address of a []bool field in the struct.
-func structPointer_BoolSlice(p structPointer, f field) *[]bool {
-	return (*[]bool)(unsafe.Pointer(uintptr(p) + uintptr(f)))
-}
-
-// String returns the address of a *string field in the struct.
-func structPointer_String(p structPointer, f field) **string {
-	return (**string)(unsafe.Pointer(uintptr(p) + uintptr(f)))
-}
-
-// StringVal returns the address of a string field in the struct.
-func structPointer_StringVal(p structPointer, f field) *string {
-	return (*string)(unsafe.Pointer(uintptr(p) + uintptr(f)))
-}
-
-// StringSlice returns the address of a []string field in the struct.
-func structPointer_StringSlice(p structPointer, f field) *[]string {
-	return (*[]string)(unsafe.Pointer(uintptr(p) + uintptr(f)))
-}
-
-// ExtMap returns the address of an extension map field in the struct.
-func structPointer_ExtMap(p structPointer, f field) *map[int32]Extension {
-	return (*map[int32]Extension)(unsafe.Pointer(uintptr(p) + uintptr(f)))
-}
-
-// NewAt returns the reflect.Value for a pointer to a field in the struct.
-func structPointer_NewAt(p structPointer, f field, typ reflect.Type) reflect.Value {
-	return reflect.NewAt(typ, unsafe.Pointer(uintptr(p)+uintptr(f)))
-}
-
-// SetStructPointer writes a *struct field in the struct.
-func structPointer_SetStructPointer(p structPointer, f field, q structPointer) {
-	*(*structPointer)(unsafe.Pointer(uintptr(p) + uintptr(f))) = q
-}
-
-// GetStructPointer reads a *struct field in the struct.
-func structPointer_GetStructPointer(p structPointer, f field) structPointer {
-	return *(*structPointer)(unsafe.Pointer(uintptr(p) + uintptr(f)))
-}
-
-// StructPointerSlice the address of a []*struct field in the struct.
-func structPointer_StructPointerSlice(p structPointer, f field) *structPointerSlice {
-	return (*structPointerSlice)(unsafe.Pointer(uintptr(p) + uintptr(f)))
-}
-
-// A structPointerSlice represents a slice of pointers to structs (themselves submessages or groups).
-type structPointerSlice []structPointer
-
-func (v *structPointerSlice) Len() int                  { return len(*v) }
-func (v *structPointerSlice) Index(i int) structPointer { return (*v)[i] }
-func (v *structPointerSlice) Append(p structPointer)    { *v = append(*v, p) }
-
-// A word32 is the address of a "pointer to 32-bit value" field.
-type word32 **uint32
-
-// IsNil reports whether *v is nil.
-func word32_IsNil(p word32) bool {
-	return *p == nil
-}
-
-// Set sets *v to point at a newly allocated word set to x.
-func word32_Set(p word32, o *Buffer, x uint32) {
-	if len(o.uint32s) == 0 {
-		o.uint32s = make([]uint32, uint32PoolSize)
-	}
-	o.uint32s[0] = x
-	*p = &o.uint32s[0]
-	o.uint32s = o.uint32s[1:]
-}
-
-// Get gets the value pointed at by *v.
-func word32_Get(p word32) uint32 {
-	return **p
-}
-
-// Word32 returns the address of a *int32, *uint32, *float32, or *enum field in the struct.
-func structPointer_Word32(p structPointer, f field) word32 {
-	return word32((**uint32)(unsafe.Pointer(uintptr(p) + uintptr(f))))
-}
-
-// A word32Val is the address of a 32-bit value field.
-type word32Val *uint32
-
-// Set sets *p to x.
-func word32Val_Set(p word32Val, x uint32) {
-	*p = x
-}
-
-// Get gets the value pointed at by p.
-func word32Val_Get(p word32Val) uint32 {
-	return *p
-}
-
-// Word32Val returns the address of a *int32, *uint32, *float32, or *enum field in the struct.
-func structPointer_Word32Val(p structPointer, f field) word32Val {
-	return word32Val((*uint32)(unsafe.Pointer(uintptr(p) + uintptr(f))))
-}
-
-// A word32Slice is a slice of 32-bit values.
-type word32Slice []uint32
-
-func (v *word32Slice) Append(x uint32)    { *v = append(*v, x) }
-func (v *word32Slice) Len() int           { return len(*v) }
-func (v *word32Slice) Index(i int) uint32 { return (*v)[i] }
-
-// Word32Slice returns the address of a []int32, []uint32, []float32, or []enum field in the struct.
-func structPointer_Word32Slice(p structPointer, f field) *word32Slice {
-	return (*word32Slice)(unsafe.Pointer(uintptr(p) + uintptr(f)))
-}
-
-// word64 is like word32 but for 64-bit values.
-type word64 **uint64
-
-func word64_Set(p word64, o *Buffer, x uint64) {
-	if len(o.uint64s) == 0 {
-		o.uint64s = make([]uint64, uint64PoolSize)
-	}
-	o.uint64s[0] = x
-	*p = &o.uint64s[0]
-	o.uint64s = o.uint64s[1:]
-}
-
-func word64_IsNil(p word64) bool {
-	return *p == nil
-}
-
-func word64_Get(p word64) uint64 {
-	return **p
-}
-
-func structPointer_Word64(p structPointer, f field) word64 {
-	return word64((**uint64)(unsafe.Pointer(uintptr(p) + uintptr(f))))
-}
-
-// word64Val is like word32Val but for 64-bit values.
-type word64Val *uint64
-
-func word64Val_Set(p word64Val, o *Buffer, x uint64) {
-	*p = x
-}
-
-func word64Val_Get(p word64Val) uint64 {
-	return *p
-}
-
-func structPointer_Word64Val(p structPointer, f field) word64Val {
-	return word64Val((*uint64)(unsafe.Pointer(uintptr(p) + uintptr(f))))
-}
-
-// word64Slice is like word32Slice but for 64-bit values.
-type word64Slice []uint64
-
-func (v *word64Slice) Append(x uint64)    { *v = append(*v, x) }
-func (v *word64Slice) Len() int           { return len(*v) }
-func (v *word64Slice) Index(i int) uint64 { return (*v)[i] }
-
-func structPointer_Word64Slice(p structPointer, f field) *word64Slice {
-	return (*word64Slice)(unsafe.Pointer(uintptr(p) + uintptr(f)))
-}
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/pointer_unsafe_gogo.go b/Godeps/_workspace/src/github.com/gogo/protobuf/proto/pointer_unsafe_gogo.go
deleted file mode 100644
index 6bc85fa98..000000000
--- a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/pointer_unsafe_gogo.go
+++ /dev/null
@@ -1,108 +0,0 @@
-// Copyright (c) 2013, Vastech SA (PTY) LTD. All rights reserved.
-// http://github.com/gogo/protobuf/gogoproto
-//
-// 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.
-
-// +build !appengine
-
-// This file contains the implementation of the proto field accesses using package unsafe.
-
-package proto
-
-import (
-	"reflect"
-	"unsafe"
-)
-
-func structPointer_InterfaceAt(p structPointer, f field, t reflect.Type) interface{} {
-	point := unsafe.Pointer(uintptr(p) + uintptr(f))
-	r := reflect.NewAt(t, point)
-	return r.Interface()
-}
-
-func structPointer_InterfaceRef(p structPointer, f field, t reflect.Type) interface{} {
-	point := unsafe.Pointer(uintptr(p) + uintptr(f))
-	r := reflect.NewAt(t, point)
-	if r.Elem().IsNil() {
-		return nil
-	}
-	return r.Elem().Interface()
-}
-
-func copyUintPtr(oldptr, newptr uintptr, size int) {
-	oldbytes := make([]byte, 0)
-	oldslice := (*reflect.SliceHeader)(unsafe.Pointer(&oldbytes))
-	oldslice.Data = oldptr
-	oldslice.Len = size
-	oldslice.Cap = size
-	newbytes := make([]byte, 0)
-	newslice := (*reflect.SliceHeader)(unsafe.Pointer(&newbytes))
-	newslice.Data = newptr
-	newslice.Len = size
-	newslice.Cap = size
-	copy(newbytes, oldbytes)
-}
-
-func structPointer_Copy(oldptr structPointer, newptr structPointer, size int) {
-	copyUintPtr(uintptr(oldptr), uintptr(newptr), size)
-}
-
-func appendStructPointer(base structPointer, f field, typ reflect.Type) structPointer {
-	size := typ.Elem().Size()
-	oldHeader := structPointer_GetSliceHeader(base, f)
-	newLen := oldHeader.Len + 1
-	slice := reflect.MakeSlice(typ, newLen, newLen)
-	bas := toStructPointer(slice)
-	for i := 0; i < oldHeader.Len; i++ {
-		newElemptr := uintptr(bas) + uintptr(i)*size
-		oldElemptr := oldHeader.Data + uintptr(i)*size
-		copyUintPtr(oldElemptr, newElemptr, int(size))
-	}
-
-	oldHeader.Data = uintptr(bas)
-	oldHeader.Len = newLen
-	oldHeader.Cap = newLen
-
-	return structPointer(unsafe.Pointer(uintptr(unsafe.Pointer(bas)) + uintptr(uintptr(newLen-1)*size)))
-}
-
-func structPointer_FieldPointer(p structPointer, f field) structPointer {
-	return structPointer(unsafe.Pointer(uintptr(p) + uintptr(f)))
-}
-
-func structPointer_GetRefStructPointer(p structPointer, f field) structPointer {
-	return structPointer((*structPointer)(unsafe.Pointer(uintptr(p) + uintptr(f))))
-}
-
-func structPointer_GetSliceHeader(p structPointer, f field) *reflect.SliceHeader {
-	return (*reflect.SliceHeader)(unsafe.Pointer(uintptr(p) + uintptr(f)))
-}
-
-func structPointer_Add(p structPointer, size field) structPointer {
-	return structPointer(unsafe.Pointer(uintptr(p) + uintptr(size)))
-}
-
-func structPointer_Len(p structPointer, f field) int {
-	return len(*(*[]interface{})(unsafe.Pointer(structPointer_GetRefStructPointer(p, f))))
-}
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/properties.go b/Godeps/_workspace/src/github.com/gogo/protobuf/proto/properties.go
deleted file mode 100644
index 13245c00d..000000000
--- a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/properties.go
+++ /dev/null
@@ -1,815 +0,0 @@
-// Extensions for Protocol Buffers to create more go like structures.
-//
-// Copyright (c) 2013, Vastech SA (PTY) LTD. All rights reserved.
-// http://github.com/gogo/protobuf/gogoproto
-//
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2010 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// 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.
-
-package proto
-
-/*
- * Routines for encoding data into the wire format for protocol buffers.
- */
-
-import (
-	"fmt"
-	"os"
-	"reflect"
-	"sort"
-	"strconv"
-	"strings"
-	"sync"
-)
-
-const debug bool = false
-
-// Constants that identify the encoding of a value on the wire.
-const (
-	WireVarint     = 0
-	WireFixed64    = 1
-	WireBytes      = 2
-	WireStartGroup = 3
-	WireEndGroup   = 4
-	WireFixed32    = 5
-)
-
-const startSize = 10 // initial slice/string sizes
-
-// Encoders are defined in encode.go
-// An encoder outputs the full representation of a field, including its
-// tag and encoder type.
-type encoder func(p *Buffer, prop *Properties, base structPointer) error
-
-// A valueEncoder encodes a single integer in a particular encoding.
-type valueEncoder func(o *Buffer, x uint64) error
-
-// Sizers are defined in encode.go
-// A sizer returns the encoded size of a field, including its tag and encoder
-// type.
-type sizer func(prop *Properties, base structPointer) int
-
-// A valueSizer returns the encoded size of a single integer in a particular
-// encoding.
-type valueSizer func(x uint64) int
-
-// Decoders are defined in decode.go
-// A decoder creates a value from its wire representation.
-// Unrecognized subelements are saved in unrec.
-type decoder func(p *Buffer, prop *Properties, base structPointer) error
-
-// A valueDecoder decodes a single integer in a particular encoding.
-type valueDecoder func(o *Buffer) (x uint64, err error)
-
-// tagMap is an optimization over map[int]int for typical protocol buffer
-// use-cases. Encoded protocol buffers are often in tag order with small tag
-// numbers.
-type tagMap struct {
-	fastTags []int
-	slowTags map[int]int
-}
-
-// tagMapFastLimit is the upper bound on the tag number that will be stored in
-// the tagMap slice rather than its map.
-const tagMapFastLimit = 1024
-
-func (p *tagMap) get(t int) (int, bool) {
-	if t > 0 && t < tagMapFastLimit {
-		if t >= len(p.fastTags) {
-			return 0, false
-		}
-		fi := p.fastTags[t]
-		return fi, fi >= 0
-	}
-	fi, ok := p.slowTags[t]
-	return fi, ok
-}
-
-func (p *tagMap) put(t int, fi int) {
-	if t > 0 && t < tagMapFastLimit {
-		for len(p.fastTags) < t+1 {
-			p.fastTags = append(p.fastTags, -1)
-		}
-		p.fastTags[t] = fi
-		return
-	}
-	if p.slowTags == nil {
-		p.slowTags = make(map[int]int)
-	}
-	p.slowTags[t] = fi
-}
-
-// StructProperties represents properties for all the fields of a struct.
-// decoderTags and decoderOrigNames should only be used by the decoder.
-type StructProperties struct {
-	Prop             []*Properties  // properties for each field
-	reqCount         int            // required count
-	decoderTags      tagMap         // map from proto tag to struct field number
-	decoderOrigNames map[string]int // map from original name to struct field number
-	order            []int          // list of struct field numbers in tag order
-	unrecField       field          // field id of the XXX_unrecognized []byte field
-	extendable       bool           // is this an extendable proto
-}
-
-// Implement the sorting interface so we can sort the fields in tag order, as recommended by the spec.
-// See encode.go, (*Buffer).enc_struct.
-
-func (sp *StructProperties) Len() int { return len(sp.order) }
-func (sp *StructProperties) Less(i, j int) bool {
-	return sp.Prop[sp.order[i]].Tag < sp.Prop[sp.order[j]].Tag
-}
-func (sp *StructProperties) Swap(i, j int) { sp.order[i], sp.order[j] = sp.order[j], sp.order[i] }
-
-// Properties represents the protocol-specific behavior of a single struct field.
-type Properties struct {
-	Name     string // name of the field, for error messages
-	OrigName string // original name before protocol compiler (always set)
-	Wire     string
-	WireType int
-	Tag      int
-	Required bool
-	Optional bool
-	Repeated bool
-	Packed   bool   // relevant for repeated primitives only
-	Enum     string // set for enum types only
-	proto3   bool   // whether this is known to be a proto3 field; set for []byte only
-
-	Default    string // default value
-	HasDefault bool   // whether an explicit default was provided
-	CustomType string
-	def_uint64 uint64
-
-	enc           encoder
-	valEnc        valueEncoder // set for bool and numeric types only
-	field         field
-	tagcode       []byte // encoding of EncodeVarint((Tag<<3)|WireType)
-	tagbuf        [8]byte
-	stype         reflect.Type      // set for struct types only
-	sstype        reflect.Type      // set for slices of structs types only
-	ctype         reflect.Type      // set for custom types only
-	sprop         *StructProperties // set for struct types only
-	isMarshaler   bool
-	isUnmarshaler bool
-
-	mtype    reflect.Type // set for map types only
-	mkeyprop *Properties  // set for map types only
-	mvalprop *Properties  // set for map types only
-
-	size    sizer
-	valSize valueSizer // set for bool and numeric types only
-
-	dec    decoder
-	valDec valueDecoder // set for bool and numeric types only
-
-	// If this is a packable field, this will be the decoder for the packed version of the field.
-	packedDec decoder
-}
-
-// String formats the properties in the protobuf struct field tag style.
-func (p *Properties) String() string {
-	s := p.Wire
-	s = ","
-	s += strconv.Itoa(p.Tag)
-	if p.Required {
-		s += ",req"
-	}
-	if p.Optional {
-		s += ",opt"
-	}
-	if p.Repeated {
-		s += ",rep"
-	}
-	if p.Packed {
-		s += ",packed"
-	}
-	if p.OrigName != p.Name {
-		s += ",name=" + p.OrigName
-	}
-	if p.proto3 {
-		s += ",proto3"
-	}
-	if len(p.Enum) > 0 {
-		s += ",enum=" + p.Enum
-	}
-	if p.HasDefault {
-		s += ",def=" + p.Default
-	}
-	return s
-}
-
-// Parse populates p by parsing a string in the protobuf struct field tag style.
-func (p *Properties) Parse(s string) {
-	// "bytes,49,opt,name=foo,def=hello!"
-	fields := strings.Split(s, ",") // breaks def=, but handled below.
-	if len(fields) < 2 {
-		fmt.Fprintf(os.Stderr, "proto: tag has too few fields: %q\n", s)
-		return
-	}
-
-	p.Wire = fields[0]
-	switch p.Wire {
-	case "varint":
-		p.WireType = WireVarint
-		p.valEnc = (*Buffer).EncodeVarint
-		p.valDec = (*Buffer).DecodeVarint
-		p.valSize = sizeVarint
-	case "fixed32":
-		p.WireType = WireFixed32
-		p.valEnc = (*Buffer).EncodeFixed32
-		p.valDec = (*Buffer).DecodeFixed32
-		p.valSize = sizeFixed32
-	case "fixed64":
-		p.WireType = WireFixed64
-		p.valEnc = (*Buffer).EncodeFixed64
-		p.valDec = (*Buffer).DecodeFixed64
-		p.valSize = sizeFixed64
-	case "zigzag32":
-		p.WireType = WireVarint
-		p.valEnc = (*Buffer).EncodeZigzag32
-		p.valDec = (*Buffer).DecodeZigzag32
-		p.valSize = sizeZigzag32
-	case "zigzag64":
-		p.WireType = WireVarint
-		p.valEnc = (*Buffer).EncodeZigzag64
-		p.valDec = (*Buffer).DecodeZigzag64
-		p.valSize = sizeZigzag64
-	case "bytes", "group":
-		p.WireType = WireBytes
-		// no numeric converter for non-numeric types
-	default:
-		fmt.Fprintf(os.Stderr, "proto: tag has unknown wire type: %q\n", s)
-		return
-	}
-
-	var err error
-	p.Tag, err = strconv.Atoi(fields[1])
-	if err != nil {
-		return
-	}
-
-	for i := 2; i < len(fields); i++ {
-		f := fields[i]
-		switch {
-		case f == "req":
-			p.Required = true
-		case f == "opt":
-			p.Optional = true
-		case f == "rep":
-			p.Repeated = true
-		case f == "packed":
-			p.Packed = true
-		case strings.HasPrefix(f, "name="):
-			p.OrigName = f[5:]
-		case strings.HasPrefix(f, "enum="):
-			p.Enum = f[5:]
-		case f == "proto3":
-			p.proto3 = true
-		case strings.HasPrefix(f, "def="):
-			p.HasDefault = true
-			p.Default = f[4:] // rest of string
-			if i+1 < len(fields) {
-				// Commas aren't escaped, and def is always last.
-				p.Default += "," + strings.Join(fields[i+1:], ",")
-				break
-			}
-		case strings.HasPrefix(f, "embedded="):
-			p.OrigName = strings.Split(f, "=")[1]
-		case strings.HasPrefix(f, "customtype="):
-			p.CustomType = strings.Split(f, "=")[1]
-		}
-	}
-}
-
-func logNoSliceEnc(t1, t2 reflect.Type) {
-	fmt.Fprintf(os.Stderr, "proto: no slice oenc for %T = []%T\n", t1, t2)
-}
-
-var protoMessageType = reflect.TypeOf((*Message)(nil)).Elem()
-
-// Initialize the fields for encoding and decoding.
-func (p *Properties) setEncAndDec(typ reflect.Type, f *reflect.StructField, lockGetProp bool) {
-	p.enc = nil
-	p.dec = nil
-	p.size = nil
-	if len(p.CustomType) > 0 {
-		p.setCustomEncAndDec(typ)
-		p.setTag(lockGetProp)
-		return
-	}
-	switch t1 := typ; t1.Kind() {
-	default:
-		fmt.Fprintf(os.Stderr, "proto: no coders for %v\n", t1)
-
-	// proto3 scalar types
-
-	case reflect.Bool:
-		if p.proto3 {
-			p.enc = (*Buffer).enc_proto3_bool
-			p.dec = (*Buffer).dec_proto3_bool
-			p.size = size_proto3_bool
-		} else {
-			p.enc = (*Buffer).enc_ref_bool
-			p.dec = (*Buffer).dec_proto3_bool
-			p.size = size_ref_bool
-		}
-	case reflect.Int32:
-		if p.proto3 {
-			p.enc = (*Buffer).enc_proto3_int32
-			p.dec = (*Buffer).dec_proto3_int32
-			p.size = size_proto3_int32
-		} else {
-			p.enc = (*Buffer).enc_ref_int32
-			p.dec = (*Buffer).dec_proto3_int32
-			p.size = size_ref_int32
-		}
-	case reflect.Uint32:
-		if p.proto3 {
-			p.enc = (*Buffer).enc_proto3_uint32
-			p.dec = (*Buffer).dec_proto3_int32 // can reuse
-			p.size = size_proto3_uint32
-		} else {
-			p.enc = (*Buffer).enc_ref_uint32
-			p.dec = (*Buffer).dec_proto3_int32 // can reuse
-			p.size = size_ref_uint32
-		}
-	case reflect.Int64, reflect.Uint64:
-		if p.proto3 {
-			p.enc = (*Buffer).enc_proto3_int64
-			p.dec = (*Buffer).dec_proto3_int64
-			p.size = size_proto3_int64
-		} else {
-			p.enc = (*Buffer).enc_ref_int64
-			p.dec = (*Buffer).dec_proto3_int64
-			p.size = size_ref_int64
-		}
-	case reflect.Float32:
-		if p.proto3 {
-			p.enc = (*Buffer).enc_proto3_uint32 // can just treat them as bits
-			p.dec = (*Buffer).dec_proto3_int32
-			p.size = size_proto3_uint32
-		} else {
-			p.enc = (*Buffer).enc_ref_uint32 // can just treat them as bits
-			p.dec = (*Buffer).dec_proto3_int32
-			p.size = size_ref_uint32
-		}
-	case reflect.Float64:
-		if p.proto3 {
-			p.enc = (*Buffer).enc_proto3_int64 // can just treat them as bits
-			p.dec = (*Buffer).dec_proto3_int64
-			p.size = size_proto3_int64
-		} else {
-			p.enc = (*Buffer).enc_ref_int64 // can just treat them as bits
-			p.dec = (*Buffer).dec_proto3_int64
-			p.size = size_ref_int64
-		}
-	case reflect.String:
-		if p.proto3 {
-			p.enc = (*Buffer).enc_proto3_string
-			p.dec = (*Buffer).dec_proto3_string
-			p.size = size_proto3_string
-		} else {
-			p.enc = (*Buffer).enc_ref_string
-			p.dec = (*Buffer).dec_proto3_string
-			p.size = size_ref_string
-		}
-	case reflect.Struct:
-		p.stype = typ
-		p.isMarshaler = isMarshaler(typ)
-		p.isUnmarshaler = isUnmarshaler(typ)
-		if p.Wire == "bytes" {
-			p.enc = (*Buffer).enc_ref_struct_message
-			p.dec = (*Buffer).dec_ref_struct_message
-			p.size = size_ref_struct_message
-		} else {
-			fmt.Fprintf(os.Stderr, "proto: no coders for struct %T\n", typ)
-		}
-
-	case reflect.Ptr:
-		switch t2 := t1.Elem(); t2.Kind() {
-		default:
-			fmt.Fprintf(os.Stderr, "proto: no encoder function for %v -> %v\n", t1, t2)
-			break
-		case reflect.Bool:
-			p.enc = (*Buffer).enc_bool
-			p.dec = (*Buffer).dec_bool
-			p.size = size_bool
-		case reflect.Int32:
-			p.enc = (*Buffer).enc_int32
-			p.dec = (*Buffer).dec_int32
-			p.size = size_int32
-		case reflect.Uint32:
-			p.enc = (*Buffer).enc_uint32
-			p.dec = (*Buffer).dec_int32 // can reuse
-			p.size = size_uint32
-		case reflect.Int64, reflect.Uint64:
-			p.enc = (*Buffer).enc_int64
-			p.dec = (*Buffer).dec_int64
-			p.size = size_int64
-		case reflect.Float32:
-			p.enc = (*Buffer).enc_uint32 // can just treat them as bits
-			p.dec = (*Buffer).dec_int32
-			p.size = size_uint32
-		case reflect.Float64:
-			p.enc = (*Buffer).enc_int64 // can just treat them as bits
-			p.dec = (*Buffer).dec_int64
-			p.size = size_int64
-		case reflect.String:
-			p.enc = (*Buffer).enc_string
-			p.dec = (*Buffer).dec_string
-			p.size = size_string
-		case reflect.Struct:
-			p.stype = t1.Elem()
-			p.isMarshaler = isMarshaler(t1)
-			p.isUnmarshaler = isUnmarshaler(t1)
-			if p.Wire == "bytes" {
-				p.enc = (*Buffer).enc_struct_message
-				p.dec = (*Buffer).dec_struct_message
-				p.size = size_struct_message
-			} else {
-				p.enc = (*Buffer).enc_struct_group
-				p.dec = (*Buffer).dec_struct_group
-				p.size = size_struct_group
-			}
-		}
-
-	case reflect.Slice:
-		switch t2 := t1.Elem(); t2.Kind() {
-		default:
-			logNoSliceEnc(t1, t2)
-			break
-		case reflect.Bool:
-			if p.Packed {
-				p.enc = (*Buffer).enc_slice_packed_bool
-				p.size = size_slice_packed_bool
-			} else {
-				p.enc = (*Buffer).enc_slice_bool
-				p.size = size_slice_bool
-			}
-			p.dec = (*Buffer).dec_slice_bool
-			p.packedDec = (*Buffer).dec_slice_packed_bool
-		case reflect.Int32:
-			if p.Packed {
-				p.enc = (*Buffer).enc_slice_packed_int32
-				p.size = size_slice_packed_int32
-			} else {
-				p.enc = (*Buffer).enc_slice_int32
-				p.size = size_slice_int32
-			}
-			p.dec = (*Buffer).dec_slice_int32
-			p.packedDec = (*Buffer).dec_slice_packed_int32
-		case reflect.Uint32:
-			if p.Packed {
-				p.enc = (*Buffer).enc_slice_packed_uint32
-				p.size = size_slice_packed_uint32
-			} else {
-				p.enc = (*Buffer).enc_slice_uint32
-				p.size = size_slice_uint32
-			}
-			p.dec = (*Buffer).dec_slice_int32
-			p.packedDec = (*Buffer).dec_slice_packed_int32
-		case reflect.Int64, reflect.Uint64:
-			if p.Packed {
-				p.enc = (*Buffer).enc_slice_packed_int64
-				p.size = size_slice_packed_int64
-			} else {
-				p.enc = (*Buffer).enc_slice_int64
-				p.size = size_slice_int64
-			}
-			p.dec = (*Buffer).dec_slice_int64
-			p.packedDec = (*Buffer).dec_slice_packed_int64
-		case reflect.Uint8:
-			p.enc = (*Buffer).enc_slice_byte
-			p.dec = (*Buffer).dec_slice_byte
-			p.size = size_slice_byte
-			// This is a []byte, which is either a bytes field,
-			// or the value of a map field. In the latter case,
-			// we always encode an empty []byte, so we should not
-			// use the proto3 enc/size funcs.
-			// f == nil iff this is the key/value of a map field.
-			if p.proto3 && f != nil {
-				p.enc = (*Buffer).enc_proto3_slice_byte
-				p.size = size_proto3_slice_byte
-			}
-		case reflect.Float32, reflect.Float64:
-			switch t2.Bits() {
-			case 32:
-				// can just treat them as bits
-				if p.Packed {
-					p.enc = (*Buffer).enc_slice_packed_uint32
-					p.size = size_slice_packed_uint32
-				} else {
-					p.enc = (*Buffer).enc_slice_uint32
-					p.size = size_slice_uint32
-				}
-				p.dec = (*Buffer).dec_slice_int32
-				p.packedDec = (*Buffer).dec_slice_packed_int32
-			case 64:
-				// can just treat them as bits
-				if p.Packed {
-					p.enc = (*Buffer).enc_slice_packed_int64
-					p.size = size_slice_packed_int64
-				} else {
-					p.enc = (*Buffer).enc_slice_int64
-					p.size = size_slice_int64
-				}
-				p.dec = (*Buffer).dec_slice_int64
-				p.packedDec = (*Buffer).dec_slice_packed_int64
-			default:
-				logNoSliceEnc(t1, t2)
-				break
-			}
-		case reflect.String:
-			p.enc = (*Buffer).enc_slice_string
-			p.dec = (*Buffer).dec_slice_string
-			p.size = size_slice_string
-		case reflect.Ptr:
-			switch t3 := t2.Elem(); t3.Kind() {
-			default:
-				fmt.Fprintf(os.Stderr, "proto: no ptr oenc for %T -> %T -> %T\n", t1, t2, t3)
-				break
-			case reflect.Struct:
-				p.stype = t2.Elem()
-				p.isMarshaler = isMarshaler(t2)
-				p.isUnmarshaler = isUnmarshaler(t2)
-				if p.Wire == "bytes" {
-					p.enc = (*Buffer).enc_slice_struct_message
-					p.dec = (*Buffer).dec_slice_struct_message
-					p.size = size_slice_struct_message
-				} else {
-					p.enc = (*Buffer).enc_slice_struct_group
-					p.dec = (*Buffer).dec_slice_struct_group
-					p.size = size_slice_struct_group
-				}
-			}
-		case reflect.Slice:
-			switch t2.Elem().Kind() {
-			default:
-				fmt.Fprintf(os.Stderr, "proto: no slice elem oenc for %T -> %T -> %T\n", t1, t2, t2.Elem())
-				break
-			case reflect.Uint8:
-				p.enc = (*Buffer).enc_slice_slice_byte
-				p.dec = (*Buffer).dec_slice_slice_byte
-				p.size = size_slice_slice_byte
-			}
-		case reflect.Struct:
-			p.setSliceOfNonPointerStructs(t1)
-		}
-
-	case reflect.Map:
-		p.enc = (*Buffer).enc_new_map
-		p.dec = (*Buffer).dec_new_map
-		p.size = size_new_map
-
-		p.mtype = t1
-		p.mkeyprop = &Properties{}
-		p.mkeyprop.init(reflect.PtrTo(p.mtype.Key()), "Key", f.Tag.Get("protobuf_key"), nil, lockGetProp)
-		p.mvalprop = &Properties{}
-		vtype := p.mtype.Elem()
-		if vtype.Kind() != reflect.Ptr && vtype.Kind() != reflect.Slice {
-			// The value type is not a message (*T) or bytes ([]byte),
-			// so we need encoders for the pointer to this type.
-			vtype = reflect.PtrTo(vtype)
-		}
-		p.mvalprop.init(vtype, "Value", f.Tag.Get("protobuf_val"), nil, lockGetProp)
-	}
-	p.setTag(lockGetProp)
-}
-
-func (p *Properties) setTag(lockGetProp bool) {
-	// precalculate tag code
-	wire := p.WireType
-	if p.Packed {
-		wire = WireBytes
-	}
-	x := uint32(p.Tag)<<3 | uint32(wire)
-	i := 0
-	for i = 0; x > 127; i++ {
-		p.tagbuf[i] = 0x80 | uint8(x&0x7F)
-		x >>= 7
-	}
-	p.tagbuf[i] = uint8(x)
-	p.tagcode = p.tagbuf[0 : i+1]
-
-	if p.stype != nil {
-		if lockGetProp {
-			p.sprop = GetProperties(p.stype)
-		} else {
-			p.sprop = getPropertiesLocked(p.stype)
-		}
-	}
-}
-
-var (
-	marshalerType   = reflect.TypeOf((*Marshaler)(nil)).Elem()
-	unmarshalerType = reflect.TypeOf((*Unmarshaler)(nil)).Elem()
-)
-
-// isMarshaler reports whether type t implements Marshaler.
-func isMarshaler(t reflect.Type) bool {
-	return t.Implements(marshalerType)
-}
-
-// isUnmarshaler reports whether type t implements Unmarshaler.
-func isUnmarshaler(t reflect.Type) bool {
-	return t.Implements(unmarshalerType)
-}
-
-// Init populates the properties from a protocol buffer struct tag.
-func (p *Properties) Init(typ reflect.Type, name, tag string, f *reflect.StructField) {
-	p.init(typ, name, tag, f, true)
-}
-
-func (p *Properties) init(typ reflect.Type, name, tag string, f *reflect.StructField, lockGetProp bool) {
-	// "bytes,49,opt,def=hello!"
-	p.Name = name
-	p.OrigName = name
-	if f != nil {
-		p.field = toField(f)
-	}
-	if tag == "" {
-		return
-	}
-	p.Parse(tag)
-	p.setEncAndDec(typ, f, lockGetProp)
-}
-
-var (
-	propertiesMu  sync.RWMutex
-	propertiesMap = make(map[reflect.Type]*StructProperties)
-)
-
-// GetProperties returns the list of properties for the type represented by t.
-// t must represent a generated struct type of a protocol message.
-func GetProperties(t reflect.Type) *StructProperties {
-	if t.Kind() != reflect.Struct {
-		panic("proto: type must have kind struct")
-	}
-
-	// Most calls to GetProperties in a long-running program will be
-	// retrieving details for types we have seen before.
-	propertiesMu.RLock()
-	sprop, ok := propertiesMap[t]
-	propertiesMu.RUnlock()
-	if ok {
-		if collectStats {
-			stats.Chit++
-		}
-		return sprop
-	}
-
-	propertiesMu.Lock()
-	sprop = getPropertiesLocked(t)
-	propertiesMu.Unlock()
-	return sprop
-}
-
-// getPropertiesLocked requires that propertiesMu is held.
-func getPropertiesLocked(t reflect.Type) *StructProperties {
-	if prop, ok := propertiesMap[t]; ok {
-		if collectStats {
-			stats.Chit++
-		}
-		return prop
-	}
-	if collectStats {
-		stats.Cmiss++
-	}
-
-	prop := new(StructProperties)
-	// in case of recursive protos, fill this in now.
-	propertiesMap[t] = prop
-
-	// build properties
-	prop.extendable = reflect.PtrTo(t).Implements(extendableProtoType)
-	prop.unrecField = invalidField
-	prop.Prop = make([]*Properties, t.NumField())
-	prop.order = make([]int, t.NumField())
-
-	for i := 0; i < t.NumField(); i++ {
-		f := t.Field(i)
-		p := new(Properties)
-		name := f.Name
-		p.init(f.Type, name, f.Tag.Get("protobuf"), &f, false)
-
-		if f.Name == "XXX_extensions" { // special case
-			if len(f.Tag.Get("protobuf")) > 0 {
-				p.enc = (*Buffer).enc_ext_slice_byte
-				p.dec = nil // not needed
-				p.size = size_ext_slice_byte
-			} else {
-				p.enc = (*Buffer).enc_map
-				p.dec = nil // not needed
-				p.size = size_map
-			}
-		}
-		if f.Name == "XXX_unrecognized" { // special case
-			prop.unrecField = toField(&f)
-		}
-		prop.Prop[i] = p
-		prop.order[i] = i
-		if debug {
-			print(i, " ", f.Name, " ", t.String(), " ")
-			if p.Tag > 0 {
-				print(p.String())
-			}
-			print("\n")
-		}
-		if p.enc == nil && !strings.HasPrefix(f.Name, "XXX_") {
-			fmt.Fprintln(os.Stderr, "proto: no encoder for", f.Name, f.Type.String(), "[GetProperties]")
-		}
-	}
-
-	// Re-order prop.order.
-	sort.Sort(prop)
-
-	// build required counts
-	// build tags
-	reqCount := 0
-	prop.decoderOrigNames = make(map[string]int)
-	for i, p := range prop.Prop {
-		if strings.HasPrefix(p.Name, "XXX_") {
-			// Internal fields should not appear in tags/origNames maps.
-			// They are handled specially when encoding and decoding.
-			continue
-		}
-		if p.Required {
-			reqCount++
-		}
-		prop.decoderTags.put(p.Tag, i)
-		prop.decoderOrigNames[p.OrigName] = i
-	}
-	prop.reqCount = reqCount
-
-	return prop
-}
-
-// Return the Properties object for the x[0]'th field of the structure.
-func propByIndex(t reflect.Type, x []int) *Properties {
-	if len(x) != 1 {
-		fmt.Fprintf(os.Stderr, "proto: field index dimension %d (not 1) for type %s\n", len(x), t)
-		return nil
-	}
-	prop := GetProperties(t)
-	return prop.Prop[x[0]]
-}
-
-// Get the address and type of a pointer to a struct from an interface.
-func getbase(pb Message) (t reflect.Type, b structPointer, err error) {
-	if pb == nil {
-		err = ErrNil
-		return
-	}
-	// get the reflect type of the pointer to the struct.
-	t = reflect.TypeOf(pb)
-	// get the address of the struct.
-	value := reflect.ValueOf(pb)
-	b = toStructPointer(value)
-	return
-}
-
-// A global registry of enum types.
-// The generated code will register the generated maps by calling RegisterEnum.
-
-var enumValueMaps = make(map[string]map[string]int32)
-var enumStringMaps = make(map[string]map[int32]string)
-
-// RegisterEnum is called from the generated code to install the enum descriptor
-// maps into the global table to aid parsing text format protocol buffers.
-func RegisterEnum(typeName string, unusedNameMap map[int32]string, valueMap map[string]int32) {
-	if _, ok := enumValueMaps[typeName]; ok {
-		panic("proto: duplicate enum registered: " + typeName)
-	}
-	enumValueMaps[typeName] = valueMap
-	if _, ok := enumStringMaps[typeName]; ok {
-		panic("proto: duplicate enum registered: " + typeName)
-	}
-	enumStringMaps[typeName] = unusedNameMap
-}
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/properties_gogo.go b/Godeps/_workspace/src/github.com/gogo/protobuf/proto/properties_gogo.go
deleted file mode 100644
index 8daf9f776..000000000
--- a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/properties_gogo.go
+++ /dev/null
@@ -1,64 +0,0 @@
-// Copyright (c) 2013, Vastech SA (PTY) LTD. All rights reserved.
-// http://github.com/gogo/protobuf/gogoproto
-//
-// 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.
-
-package proto
-
-import (
-	"fmt"
-	"os"
-	"reflect"
-)
-
-func (p *Properties) setCustomEncAndDec(typ reflect.Type) {
-	p.ctype = typ
-	if p.Repeated {
-		p.enc = (*Buffer).enc_custom_slice_bytes
-		p.dec = (*Buffer).dec_custom_slice_bytes
-		p.size = size_custom_slice_bytes
-	} else if typ.Kind() == reflect.Ptr {
-		p.enc = (*Buffer).enc_custom_bytes
-		p.dec = (*Buffer).dec_custom_bytes
-		p.size = size_custom_bytes
-	} else {
-		p.enc = (*Buffer).enc_custom_ref_bytes
-		p.dec = (*Buffer).dec_custom_ref_bytes
-		p.size = size_custom_ref_bytes
-	}
-}
-
-func (p *Properties) setSliceOfNonPointerStructs(typ reflect.Type) {
-	t2 := typ.Elem()
-	p.sstype = typ
-	p.stype = t2
-	p.isMarshaler = isMarshaler(t2)
-	p.isUnmarshaler = isUnmarshaler(t2)
-	p.enc = (*Buffer).enc_slice_ref_struct_message
-	p.dec = (*Buffer).dec_slice_ref_struct_message
-	p.size = size_slice_ref_struct_message
-	if p.Wire != "bytes" {
-		fmt.Fprintf(os.Stderr, "proto: no ptr oenc for %T -> %T \n", typ, t2)
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/proto3_proto/proto3.pb.go b/Godeps/_workspace/src/github.com/gogo/protobuf/proto/proto3_proto/proto3.pb.go
deleted file mode 100644
index 2f2da4604..000000000
--- a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/proto3_proto/proto3.pb.go
+++ /dev/null
@@ -1,122 +0,0 @@
-// Code generated by protoc-gen-gogo.
-// source: proto3_proto/proto3.proto
-// DO NOT EDIT!
-
-/*
-Package proto3_proto is a generated protocol buffer package.
-
-It is generated from these files:
-	proto3_proto/proto3.proto
-
-It has these top-level messages:
-	Message
-	Nested
-	MessageWithMap
-*/
-package proto3_proto
-
-import proto "github.com/gogo/protobuf/proto"
-import testdata "github.com/gogo/protobuf/proto/testdata"
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-
-type Message_Humour int32
-
-const (
-	Message_UNKNOWN     Message_Humour = 0
-	Message_PUNS        Message_Humour = 1
-	Message_SLAPSTICK   Message_Humour = 2
-	Message_BILL_BAILEY Message_Humour = 3
-)
-
-var Message_Humour_name = map[int32]string{
-	0: "UNKNOWN",
-	1: "PUNS",
-	2: "SLAPSTICK",
-	3: "BILL_BAILEY",
-}
-var Message_Humour_value = map[string]int32{
-	"UNKNOWN":     0,
-	"PUNS":        1,
-	"SLAPSTICK":   2,
-	"BILL_BAILEY": 3,
-}
-
-func (x Message_Humour) String() string {
-	return proto.EnumName(Message_Humour_name, int32(x))
-}
-
-type Message struct {
-	Name         string                           `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
-	Hilarity     Message_Humour                   `protobuf:"varint,2,opt,name=hilarity,proto3,enum=proto3_proto.Message_Humour" json:"hilarity,omitempty"`
-	HeightInCm   uint32                           `protobuf:"varint,3,opt,name=height_in_cm,proto3" json:"height_in_cm,omitempty"`
-	Data         []byte                           `protobuf:"bytes,4,opt,name=data,proto3" json:"data,omitempty"`
-	ResultCount  int64                            `protobuf:"varint,7,opt,name=result_count,proto3" json:"result_count,omitempty"`
-	TrueScotsman bool                             `protobuf:"varint,8,opt,name=true_scotsman,proto3" json:"true_scotsman,omitempty"`
-	Score        float32                          `protobuf:"fixed32,9,opt,name=score,proto3" json:"score,omitempty"`
-	Key          []uint64                         `protobuf:"varint,5,rep,name=key" json:"key,omitempty"`
-	Nested       *Nested                          `protobuf:"bytes,6,opt,name=nested" json:"nested,omitempty"`
-	Terrain      map[string]*Nested               `protobuf:"bytes,10,rep,name=terrain" json:"terrain,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value"`
-	Proto2Field  *testdata.SubDefaults            `protobuf:"bytes,11,opt,name=proto2_field" json:"proto2_field,omitempty"`
-	Proto2Value  map[string]*testdata.SubDefaults `protobuf:"bytes,13,rep,name=proto2_value" json:"proto2_value,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value"`
-}
-
-func (m *Message) Reset()         { *m = Message{} }
-func (m *Message) String() string { return proto.CompactTextString(m) }
-func (*Message) ProtoMessage()    {}
-
-func (m *Message) GetNested() *Nested {
-	if m != nil {
-		return m.Nested
-	}
-	return nil
-}
-
-func (m *Message) GetTerrain() map[string]*Nested {
-	if m != nil {
-		return m.Terrain
-	}
-	return nil
-}
-
-func (m *Message) GetProto2Field() *testdata.SubDefaults {
-	if m != nil {
-		return m.Proto2Field
-	}
-	return nil
-}
-
-func (m *Message) GetProto2Value() map[string]*testdata.SubDefaults {
-	if m != nil {
-		return m.Proto2Value
-	}
-	return nil
-}
-
-type Nested struct {
-	Bunny string `protobuf:"bytes,1,opt,name=bunny,proto3" json:"bunny,omitempty"`
-}
-
-func (m *Nested) Reset()         { *m = Nested{} }
-func (m *Nested) String() string { return proto.CompactTextString(m) }
-func (*Nested) ProtoMessage()    {}
-
-type MessageWithMap struct {
-	ByteMapping map[bool][]byte `protobuf:"bytes,1,rep,name=byte_mapping" json:"byte_mapping,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
-}
-
-func (m *MessageWithMap) Reset()         { *m = MessageWithMap{} }
-func (m *MessageWithMap) String() string { return proto.CompactTextString(m) }
-func (*MessageWithMap) ProtoMessage()    {}
-
-func (m *MessageWithMap) GetByteMapping() map[bool][]byte {
-	if m != nil {
-		return m.ByteMapping
-	}
-	return nil
-}
-
-func init() {
-	proto.RegisterEnum("proto3_proto.Message_Humour", Message_Humour_name, Message_Humour_value)
-}
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/proto3_proto/proto3.proto b/Godeps/_workspace/src/github.com/gogo/protobuf/proto/proto3_proto/proto3.proto
deleted file mode 100644
index ca670015a..000000000
--- a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/proto3_proto/proto3.proto
+++ /dev/null
@@ -1,68 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2014 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// 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.
-
-syntax = "proto3";
-
-package proto3_proto;
-
-import "github.com/gogo/protobuf/proto/testdata/test.proto";
-
-message Message {
-  enum Humour {
-    UNKNOWN = 0;
-    PUNS = 1;
-    SLAPSTICK = 2;
-    BILL_BAILEY = 3;
-  }
-
-  string name = 1;
-  Humour hilarity = 2;
-  uint32 height_in_cm = 3;
-  bytes data = 4;
-  int64 result_count = 7;
-  bool true_scotsman = 8;
-  float score = 9;
-
-  repeated uint64 key = 5;
-  Nested nested = 6;
-
-  map<string, Nested> terrain = 10;
-  testdata.SubDefaults proto2_field = 11;
-  map<string, testdata.SubDefaults> proto2_value = 13;
-}
-
-message Nested {
-  string bunny = 1;
-}
-
-message MessageWithMap {
-  map<bool, bytes> byte_mapping = 1;
-}
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/proto3_test.go b/Godeps/_workspace/src/github.com/gogo/protobuf/proto/proto3_test.go
deleted file mode 100644
index 6f9cddc3f..000000000
--- a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/proto3_test.go
+++ /dev/null
@@ -1,125 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2014 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// 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.
-
-package proto_test
-
-import (
-	"testing"
-
-	"github.com/gogo/protobuf/proto"
-	pb "github.com/gogo/protobuf/proto/proto3_proto"
-	tpb "github.com/gogo/protobuf/proto/testdata"
-)
-
-func TestProto3ZeroValues(t *testing.T) {
-	tests := []struct {
-		desc string
-		m    proto.Message
-	}{
-		{"zero message", &pb.Message{}},
-		{"empty bytes field", &pb.Message{Data: []byte{}}},
-	}
-	for _, test := range tests {
-		b, err := proto.Marshal(test.m)
-		if err != nil {
-			t.Errorf("%s: proto.Marshal: %v", test.desc, err)
-			continue
-		}
-		if len(b) > 0 {
-			t.Errorf("%s: Encoding is non-empty: %q", test.desc, b)
-		}
-	}
-}
-
-func TestRoundTripProto3(t *testing.T) {
-	m := &pb.Message{
-		Name:         "David",          // (2 | 1<<3): 0x0a 0x05 "David"
-		Hilarity:     pb.Message_PUNS,  // (0 | 2<<3): 0x10 0x01
-		HeightInCm:   178,              // (0 | 3<<3): 0x18 0xb2 0x01
-		Data:         []byte("roboto"), // (2 | 4<<3): 0x20 0x06 "roboto"
-		ResultCount:  47,               // (0 | 7<<3): 0x38 0x2f
-		TrueScotsman: true,             // (0 | 8<<3): 0x40 0x01
-		Score:        8.1,              // (5 | 9<<3): 0x4d <8.1>
-
-		Key: []uint64{1, 0xdeadbeef},
-		Nested: &pb.Nested{
-			Bunny: "Monty",
-		},
-	}
-	t.Logf(" m: %v", m)
-
-	b, err := proto.Marshal(m)
-	if err != nil {
-		t.Fatalf("proto.Marshal: %v", err)
-	}
-	t.Logf(" b: %q", b)
-
-	m2 := new(pb.Message)
-	if err := proto.Unmarshal(b, m2); err != nil {
-		t.Fatalf("proto.Unmarshal: %v", err)
-	}
-	t.Logf("m2: %v", m2)
-
-	if !proto.Equal(m, m2) {
-		t.Errorf("proto.Equal returned false:\n m: %v\nm2: %v", m, m2)
-	}
-}
-
-func TestProto3SetDefaults(t *testing.T) {
-	in := &pb.Message{
-		Terrain: map[string]*pb.Nested{
-			"meadow": new(pb.Nested),
-		},
-		Proto2Field: new(tpb.SubDefaults),
-		Proto2Value: map[string]*tpb.SubDefaults{
-			"badlands": new(tpb.SubDefaults),
-		},
-	}
-
-	got := proto.Clone(in).(*pb.Message)
-	proto.SetDefaults(got)
-
-	// There are no defaults in proto3.  Everything should be the zero value, but
-	// we need to remember to set defaults for nested proto2 messages.
-	want := &pb.Message{
-		Terrain: map[string]*pb.Nested{
-			"meadow": new(pb.Nested),
-		},
-		Proto2Field: &tpb.SubDefaults{N: proto.Int64(7)},
-		Proto2Value: map[string]*tpb.SubDefaults{
-			"badlands": {N: proto.Int64(7)},
-		},
-	}
-
-	if !proto.Equal(got, want) {
-		t.Errorf("with in = %v\nproto.SetDefaults(in) =>\ngot %v\nwant %v", in, got, want)
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/size2_test.go b/Godeps/_workspace/src/github.com/gogo/protobuf/proto/size2_test.go
deleted file mode 100644
index a2729c39a..000000000
--- a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/size2_test.go
+++ /dev/null
@@ -1,63 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2012 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// 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.
-
-package proto
-
-import (
-	"testing"
-)
-
-// This is a separate file and package from size_test.go because that one uses
-// generated messages and thus may not be in package proto without having a circular
-// dependency, whereas this file tests unexported details of size.go.
-
-func TestVarintSize(t *testing.T) {
-	// Check the edge cases carefully.
-	testCases := []struct {
-		n    uint64
-		size int
-	}{
-		{0, 1},
-		{1, 1},
-		{127, 1},
-		{128, 2},
-		{16383, 2},
-		{16384, 3},
-		{1<<63 - 1, 9},
-		{1 << 63, 10},
-	}
-	for _, tc := range testCases {
-		size := sizeVarint(tc.n)
-		if size != tc.size {
-			t.Errorf("sizeVarint(%d) = %d, want %d", tc.n, size, tc.size)
-		}
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/size_test.go b/Godeps/_workspace/src/github.com/gogo/protobuf/proto/size_test.go
deleted file mode 100644
index 457a479eb..000000000
--- a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/size_test.go
+++ /dev/null
@@ -1,142 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2012 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// 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.
-
-package proto_test
-
-import (
-	"log"
-	"strings"
-	"testing"
-
-	. "github.com/gogo/protobuf/proto"
-	proto3pb "github.com/gogo/protobuf/proto/proto3_proto"
-	pb "github.com/gogo/protobuf/proto/testdata"
-)
-
-var messageWithExtension1 = &pb.MyMessage{Count: Int32(7)}
-
-// messageWithExtension2 is in equal_test.go.
-var messageWithExtension3 = &pb.MyMessage{Count: Int32(8)}
-
-func init() {
-	if err := SetExtension(messageWithExtension1, pb.E_Ext_More, &pb.Ext{Data: String("Abbott")}); err != nil {
-		log.Panicf("SetExtension: %v", err)
-	}
-	if err := SetExtension(messageWithExtension3, pb.E_Ext_More, &pb.Ext{Data: String("Costello")}); err != nil {
-		log.Panicf("SetExtension: %v", err)
-	}
-
-	// Force messageWithExtension3 to have the extension encoded.
-	Marshal(messageWithExtension3)
-
-}
-
-var SizeTests = []struct {
-	desc string
-	pb   Message
-}{
-	{"empty", &pb.OtherMessage{}},
-	// Basic types.
-	{"bool", &pb.Defaults{F_Bool: Bool(true)}},
-	{"int32", &pb.Defaults{F_Int32: Int32(12)}},
-	{"negative int32", &pb.Defaults{F_Int32: Int32(-1)}},
-	{"small int64", &pb.Defaults{F_Int64: Int64(1)}},
-	{"big int64", &pb.Defaults{F_Int64: Int64(1 << 20)}},
-	{"negative int64", &pb.Defaults{F_Int64: Int64(-1)}},
-	{"fixed32", &pb.Defaults{F_Fixed32: Uint32(71)}},
-	{"fixed64", &pb.Defaults{F_Fixed64: Uint64(72)}},
-	{"uint32", &pb.Defaults{F_Uint32: Uint32(123)}},
-	{"uint64", &pb.Defaults{F_Uint64: Uint64(124)}},
-	{"float", &pb.Defaults{F_Float: Float32(12.6)}},
-	{"double", &pb.Defaults{F_Double: Float64(13.9)}},
-	{"string", &pb.Defaults{F_String: String("niles")}},
-	{"bytes", &pb.Defaults{F_Bytes: []byte("wowsa")}},
-	{"bytes, empty", &pb.Defaults{F_Bytes: []byte{}}},
-	{"sint32", &pb.Defaults{F_Sint32: Int32(65)}},
-	{"sint64", &pb.Defaults{F_Sint64: Int64(67)}},
-	{"enum", &pb.Defaults{F_Enum: pb.Defaults_BLUE.Enum()}},
-	// Repeated.
-	{"empty repeated bool", &pb.MoreRepeated{Bools: []bool{}}},
-	{"repeated bool", &pb.MoreRepeated{Bools: []bool{false, true, true, false}}},
-	{"packed repeated bool", &pb.MoreRepeated{BoolsPacked: []bool{false, true, true, false, true, true, true}}},
-	{"repeated int32", &pb.MoreRepeated{Ints: []int32{1, 12203, 1729, -1}}},
-	{"repeated int32 packed", &pb.MoreRepeated{IntsPacked: []int32{1, 12203, 1729}}},
-	{"repeated int64 packed", &pb.MoreRepeated{Int64SPacked: []int64{
-		// Need enough large numbers to verify that the header is counting the number of bytes
-		// for the field, not the number of elements.
-		1 << 62, 1 << 62, 1 << 62, 1 << 62, 1 << 62, 1 << 62, 1 << 62, 1 << 62, 1 << 62, 1 << 62,
-		1 << 62, 1 << 62, 1 << 62, 1 << 62, 1 << 62, 1 << 62, 1 << 62, 1 << 62, 1 << 62, 1 << 62,
-	}}},
-	{"repeated string", &pb.MoreRepeated{Strings: []string{"r", "ken", "gri"}}},
-	{"repeated fixed", &pb.MoreRepeated{Fixeds: []uint32{1, 2, 3, 4}}},
-	// Nested.
-	{"nested", &pb.OldMessage{Nested: &pb.OldMessage_Nested{Name: String("whatever")}}},
-	{"group", &pb.GroupOld{G: &pb.GroupOld_G{X: Int32(12345)}}},
-	// Other things.
-	{"unrecognized", &pb.MoreRepeated{XXX_unrecognized: []byte{13<<3 | 0, 4}}},
-	{"extension (unencoded)", messageWithExtension1},
-	{"extension (encoded)", messageWithExtension3},
-	// proto3 message
-	{"proto3 empty", &proto3pb.Message{}},
-	{"proto3 bool", &proto3pb.Message{TrueScotsman: true}},
-	{"proto3 int64", &proto3pb.Message{ResultCount: 1}},
-	{"proto3 uint32", &proto3pb.Message{HeightInCm: 123}},
-	{"proto3 float", &proto3pb.Message{Score: 12.6}},
-	{"proto3 string", &proto3pb.Message{Name: "Snezana"}},
-	{"proto3 bytes", &proto3pb.Message{Data: []byte("wowsa")}},
-	{"proto3 bytes, empty", &proto3pb.Message{Data: []byte{}}},
-	{"proto3 enum", &proto3pb.Message{Hilarity: proto3pb.Message_PUNS}},
-	{"proto3 map field with empty bytes", &proto3pb.MessageWithMap{ByteMapping: map[bool][]byte{false: {}}}},
-
-	{"map field", &pb.MessageWithMap{NameMapping: map[int32]string{1: "Rob", 7: "Andrew"}}},
-	{"map field with message", &pb.MessageWithMap{MsgMapping: map[int64]*pb.FloatingPoint{0x7001: {F: Float64(2.0)}}}},
-	{"map field with bytes", &pb.MessageWithMap{ByteMapping: map[bool][]byte{true: []byte("this time for sure")}}},
-	{"map field with empty bytes", &pb.MessageWithMap{ByteMapping: map[bool][]byte{true: {}}}},
-
-	{"map field with big entry", &pb.MessageWithMap{NameMapping: map[int32]string{8: strings.Repeat("x", 125)}}},
-	{"map field with big key and val", &pb.MessageWithMap{StrToStr: map[string]string{strings.Repeat("x", 70): strings.Repeat("y", 70)}}},
-	{"map field with big numeric key", &pb.MessageWithMap{NameMapping: map[int32]string{0xf00d: "om nom nom"}}},
-}
-
-func TestSize(t *testing.T) {
-	for _, tc := range SizeTests {
-		size := Size(tc.pb)
-		b, err := Marshal(tc.pb)
-		if err != nil {
-			t.Errorf("%v: Marshal failed: %v", tc.desc, err)
-			continue
-		}
-		if size != len(b) {
-			t.Errorf("%v: Size(%v) = %d, want %d", tc.desc, tc.pb, size, len(b))
-			t.Logf("%v: bytes: %#v", tc.desc, b)
-		}
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/skip_gogo.go b/Godeps/_workspace/src/github.com/gogo/protobuf/proto/skip_gogo.go
deleted file mode 100644
index 4fe7e0815..000000000
--- a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/skip_gogo.go
+++ /dev/null
@@ -1,117 +0,0 @@
-// Copyright (c) 2013, Vastech SA (PTY) LTD. All rights reserved.
-// http://github.com/gogo/protobuf/gogoproto
-//
-// 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.
-
-package proto
-
-import (
-	"fmt"
-	"io"
-)
-
-func Skip(data []byte) (n int, err error) {
-	l := len(data)
-	index := 0
-	for index < l {
-		var wire uint64
-		for shift := uint(0); ; shift += 7 {
-			if index >= l {
-				return 0, io.ErrUnexpectedEOF
-			}
-			b := data[index]
-			index++
-			wire |= (uint64(b) & 0x7F) << shift
-			if b < 0x80 {
-				break
-			}
-		}
-		wireType := int(wire & 0x7)
-		switch wireType {
-		case 0:
-			for {
-				if index >= l {
-					return 0, io.ErrUnexpectedEOF
-				}
-				index++
-				if data[index-1] < 0x80 {
-					break
-				}
-			}
-			return index, nil
-		case 1:
-			index += 8
-			return index, nil
-		case 2:
-			var length int
-			for shift := uint(0); ; shift += 7 {
-				if index >= l {
-					return 0, io.ErrUnexpectedEOF
-				}
-				b := data[index]
-				index++
-				length |= (int(b) & 0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			index += length
-			return index, nil
-		case 3:
-			for {
-				var innerWire uint64
-				var start int = index
-				for shift := uint(0); ; shift += 7 {
-					if index >= l {
-						return 0, io.ErrUnexpectedEOF
-					}
-					b := data[index]
-					index++
-					innerWire |= (uint64(b) & 0x7F) << shift
-					if b < 0x80 {
-						break
-					}
-				}
-				innerWireType := int(innerWire & 0x7)
-				if innerWireType == 4 {
-					break
-				}
-				next, err := Skip(data[start:])
-				if err != nil {
-					return 0, err
-				}
-				index = start + next
-			}
-			return index, nil
-		case 4:
-			return index, nil
-		case 5:
-			index += 4
-			return index, nil
-		default:
-			return 0, fmt.Errorf("proto: illegal wireType %d", wireType)
-		}
-	}
-	panic("unreachable")
-}
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/testdata/Makefile b/Godeps/_workspace/src/github.com/gogo/protobuf/proto/testdata/Makefile
deleted file mode 100644
index 1e676c37f..000000000
--- a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/testdata/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-# Go support for Protocol Buffers - Google's data interchange format
-#
-# Copyright 2010 The Go Authors.  All rights reserved.
-# https://github.com/golang/protobuf
-#
-# 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.
-
-all:	regenerate
-
-regenerate:
-	go install github.com/gogo/protobuf/protoc-gen-gogo/version/protoc-min-version
-	protoc-min-version --version="3.0.0" --gogo_out=. test.proto
-	
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/testdata/golden_test.go b/Godeps/_workspace/src/github.com/gogo/protobuf/proto/testdata/golden_test.go
deleted file mode 100644
index 8e8451537..000000000
--- a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/testdata/golden_test.go
+++ /dev/null
@@ -1,86 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2012 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// 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.
-
-// Verify that the compiler output for test.proto is unchanged.
-
-package testdata
-
-import (
-	"crypto/sha1"
-	"fmt"
-	"io/ioutil"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"testing"
-)
-
-// sum returns in string form (for easy comparison) the SHA-1 hash of the named file.
-func sum(t *testing.T, name string) string {
-	data, err := ioutil.ReadFile(name)
-	if err != nil {
-		t.Fatal(err)
-	}
-	t.Logf("sum(%q): length is %d", name, len(data))
-	hash := sha1.New()
-	_, err = hash.Write(data)
-	if err != nil {
-		t.Fatal(err)
-	}
-	return fmt.Sprintf("% x", hash.Sum(nil))
-}
-
-func run(t *testing.T, name string, args ...string) {
-	cmd := exec.Command(name, args...)
-	cmd.Stdin = os.Stdin
-	cmd.Stdout = os.Stdout
-	cmd.Stderr = os.Stderr
-	err := cmd.Run()
-	if err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestGolden(t *testing.T) {
-	// Compute the original checksum.
-	goldenSum := sum(t, "test.pb.go")
-	// Run the proto compiler.
-	run(t, "protoc", "--gogo_out="+os.TempDir(), "test.proto")
-	newFile := filepath.Join(os.TempDir(), "test.pb.go")
-	defer os.Remove(newFile)
-	// Compute the new checksum.
-	newSum := sum(t, newFile)
-	// Verify
-	if newSum != goldenSum {
-		run(t, "diff", "-u", "test.pb.go", newFile)
-		t.Fatal("Code generated by protoc-gen-go has changed; update test.pb.go")
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/testdata/test.pb.go b/Godeps/_workspace/src/github.com/gogo/protobuf/proto/testdata/test.pb.go
deleted file mode 100644
index 8bc688c2f..000000000
--- a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/testdata/test.pb.go
+++ /dev/null
@@ -1,2746 +0,0 @@
-// Code generated by protoc-gen-gogo.
-// source: test.proto
-// DO NOT EDIT!
-
-/*
-Package testdata is a generated protocol buffer package.
-
-It is generated from these files:
-	test.proto
-
-It has these top-level messages:
-	GoEnum
-	GoTestField
-	GoTest
-	GoSkipTest
-	NonPackedTest
-	PackedTest
-	MaxTag
-	OldMessage
-	NewMessage
-	InnerMessage
-	OtherMessage
-	MyMessage
-	Ext
-	DefaultsMessage
-	MyMessageSet
-	Empty
-	MessageList
-	Strings
-	Defaults
-	SubDefaults
-	RepeatedEnum
-	MoreRepeated
-	GroupOld
-	GroupNew
-	FloatingPoint
-	MessageWithMap
-*/
-package testdata
-
-import proto "github.com/gogo/protobuf/proto"
-import math "math"
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = math.Inf
-
-type FOO int32
-
-const (
-	FOO_FOO1 FOO = 1
-)
-
-var FOO_name = map[int32]string{
-	1: "FOO1",
-}
-var FOO_value = map[string]int32{
-	"FOO1": 1,
-}
-
-func (x FOO) Enum() *FOO {
-	p := new(FOO)
-	*p = x
-	return p
-}
-func (x FOO) String() string {
-	return proto.EnumName(FOO_name, int32(x))
-}
-func (x *FOO) UnmarshalJSON(data []byte) error {
-	value, err := proto.UnmarshalJSONEnum(FOO_value, data, "FOO")
-	if err != nil {
-		return err
-	}
-	*x = FOO(value)
-	return nil
-}
-
-// An enum, for completeness.
-type GoTest_KIND int32
-
-const (
-	GoTest_VOID GoTest_KIND = 0
-	// Basic types
-	GoTest_BOOL        GoTest_KIND = 1
-	GoTest_BYTES       GoTest_KIND = 2
-	GoTest_FINGERPRINT GoTest_KIND = 3
-	GoTest_FLOAT       GoTest_KIND = 4
-	GoTest_INT         GoTest_KIND = 5
-	GoTest_STRING      GoTest_KIND = 6
-	GoTest_TIME        GoTest_KIND = 7
-	// Groupings
-	GoTest_TUPLE GoTest_KIND = 8
-	GoTest_ARRAY GoTest_KIND = 9
-	GoTest_MAP   GoTest_KIND = 10
-	// Table types
-	GoTest_TABLE GoTest_KIND = 11
-	// Functions
-	GoTest_FUNCTION GoTest_KIND = 12
-)
-
-var GoTest_KIND_name = map[int32]string{
-	0:  "VOID",
-	1:  "BOOL",
-	2:  "BYTES",
-	3:  "FINGERPRINT",
-	4:  "FLOAT",
-	5:  "INT",
-	6:  "STRING",
-	7:  "TIME",
-	8:  "TUPLE",
-	9:  "ARRAY",
-	10: "MAP",
-	11: "TABLE",
-	12: "FUNCTION",
-}
-var GoTest_KIND_value = map[string]int32{
-	"VOID":        0,
-	"BOOL":        1,
-	"BYTES":       2,
-	"FINGERPRINT": 3,
-	"FLOAT":       4,
-	"INT":         5,
-	"STRING":      6,
-	"TIME":        7,
-	"TUPLE":       8,
-	"ARRAY":       9,
-	"MAP":         10,
-	"TABLE":       11,
-	"FUNCTION":    12,
-}
-
-func (x GoTest_KIND) Enum() *GoTest_KIND {
-	p := new(GoTest_KIND)
-	*p = x
-	return p
-}
-func (x GoTest_KIND) String() string {
-	return proto.EnumName(GoTest_KIND_name, int32(x))
-}
-func (x *GoTest_KIND) UnmarshalJSON(data []byte) error {
-	value, err := proto.UnmarshalJSONEnum(GoTest_KIND_value, data, "GoTest_KIND")
-	if err != nil {
-		return err
-	}
-	*x = GoTest_KIND(value)
-	return nil
-}
-
-type MyMessage_Color int32
-
-const (
-	MyMessage_RED   MyMessage_Color = 0
-	MyMessage_GREEN MyMessage_Color = 1
-	MyMessage_BLUE  MyMessage_Color = 2
-)
-
-var MyMessage_Color_name = map[int32]string{
-	0: "RED",
-	1: "GREEN",
-	2: "BLUE",
-}
-var MyMessage_Color_value = map[string]int32{
-	"RED":   0,
-	"GREEN": 1,
-	"BLUE":  2,
-}
-
-func (x MyMessage_Color) Enum() *MyMessage_Color {
-	p := new(MyMessage_Color)
-	*p = x
-	return p
-}
-func (x MyMessage_Color) String() string {
-	return proto.EnumName(MyMessage_Color_name, int32(x))
-}
-func (x *MyMessage_Color) UnmarshalJSON(data []byte) error {
-	value, err := proto.UnmarshalJSONEnum(MyMessage_Color_value, data, "MyMessage_Color")
-	if err != nil {
-		return err
-	}
-	*x = MyMessage_Color(value)
-	return nil
-}
-
-type DefaultsMessage_DefaultsEnum int32
-
-const (
-	DefaultsMessage_ZERO DefaultsMessage_DefaultsEnum = 0
-	DefaultsMessage_ONE  DefaultsMessage_DefaultsEnum = 1
-	DefaultsMessage_TWO  DefaultsMessage_DefaultsEnum = 2
-)
-
-var DefaultsMessage_DefaultsEnum_name = map[int32]string{
-	0: "ZERO",
-	1: "ONE",
-	2: "TWO",
-}
-var DefaultsMessage_DefaultsEnum_value = map[string]int32{
-	"ZERO": 0,
-	"ONE":  1,
-	"TWO":  2,
-}
-
-func (x DefaultsMessage_DefaultsEnum) Enum() *DefaultsMessage_DefaultsEnum {
-	p := new(DefaultsMessage_DefaultsEnum)
-	*p = x
-	return p
-}
-func (x DefaultsMessage_DefaultsEnum) String() string {
-	return proto.EnumName(DefaultsMessage_DefaultsEnum_name, int32(x))
-}
-func (x *DefaultsMessage_DefaultsEnum) UnmarshalJSON(data []byte) error {
-	value, err := proto.UnmarshalJSONEnum(DefaultsMessage_DefaultsEnum_value, data, "DefaultsMessage_DefaultsEnum")
-	if err != nil {
-		return err
-	}
-	*x = DefaultsMessage_DefaultsEnum(value)
-	return nil
-}
-
-type Defaults_Color int32
-
-const (
-	Defaults_RED   Defaults_Color = 0
-	Defaults_GREEN Defaults_Color = 1
-	Defaults_BLUE  Defaults_Color = 2
-)
-
-var Defaults_Color_name = map[int32]string{
-	0: "RED",
-	1: "GREEN",
-	2: "BLUE",
-}
-var Defaults_Color_value = map[string]int32{
-	"RED":   0,
-	"GREEN": 1,
-	"BLUE":  2,
-}
-
-func (x Defaults_Color) Enum() *Defaults_Color {
-	p := new(Defaults_Color)
-	*p = x
-	return p
-}
-func (x Defaults_Color) String() string {
-	return proto.EnumName(Defaults_Color_name, int32(x))
-}
-func (x *Defaults_Color) UnmarshalJSON(data []byte) error {
-	value, err := proto.UnmarshalJSONEnum(Defaults_Color_value, data, "Defaults_Color")
-	if err != nil {
-		return err
-	}
-	*x = Defaults_Color(value)
-	return nil
-}
-
-type RepeatedEnum_Color int32
-
-const (
-	RepeatedEnum_RED RepeatedEnum_Color = 1
-)
-
-var RepeatedEnum_Color_name = map[int32]string{
-	1: "RED",
-}
-var RepeatedEnum_Color_value = map[string]int32{
-	"RED": 1,
-}
-
-func (x RepeatedEnum_Color) Enum() *RepeatedEnum_Color {
-	p := new(RepeatedEnum_Color)
-	*p = x
-	return p
-}
-func (x RepeatedEnum_Color) String() string {
-	return proto.EnumName(RepeatedEnum_Color_name, int32(x))
-}
-func (x *RepeatedEnum_Color) UnmarshalJSON(data []byte) error {
-	value, err := proto.UnmarshalJSONEnum(RepeatedEnum_Color_value, data, "RepeatedEnum_Color")
-	if err != nil {
-		return err
-	}
-	*x = RepeatedEnum_Color(value)
-	return nil
-}
-
-type GoEnum struct {
-	Foo              *FOO   `protobuf:"varint,1,req,name=foo,enum=testdata.FOO" json:"foo,omitempty"`
-	XXX_unrecognized []byte `json:"-"`
-}
-
-func (m *GoEnum) Reset()         { *m = GoEnum{} }
-func (m *GoEnum) String() string { return proto.CompactTextString(m) }
-func (*GoEnum) ProtoMessage()    {}
-
-func (m *GoEnum) GetFoo() FOO {
-	if m != nil && m.Foo != nil {
-		return *m.Foo
-	}
-	return FOO_FOO1
-}
-
-type GoTestField struct {
-	Label            *string `protobuf:"bytes,1,req" json:"Label,omitempty"`
-	Type             *string `protobuf:"bytes,2,req" json:"Type,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *GoTestField) Reset()         { *m = GoTestField{} }
-func (m *GoTestField) String() string { return proto.CompactTextString(m) }
-func (*GoTestField) ProtoMessage()    {}
-
-func (m *GoTestField) GetLabel() string {
-	if m != nil && m.Label != nil {
-		return *m.Label
-	}
-	return ""
-}
-
-func (m *GoTestField) GetType() string {
-	if m != nil && m.Type != nil {
-		return *m.Type
-	}
-	return ""
-}
-
-type GoTest struct {
-	// Some typical parameters
-	Kind  *GoTest_KIND `protobuf:"varint,1,req,enum=testdata.GoTest_KIND" json:"Kind,omitempty"`
-	Table *string      `protobuf:"bytes,2,opt" json:"Table,omitempty"`
-	Param *int32       `protobuf:"varint,3,opt" json:"Param,omitempty"`
-	// Required, repeated and optional foreign fields.
-	RequiredField *GoTestField   `protobuf:"bytes,4,req" json:"RequiredField,omitempty"`
-	RepeatedField []*GoTestField `protobuf:"bytes,5,rep" json:"RepeatedField,omitempty"`
-	OptionalField *GoTestField   `protobuf:"bytes,6,opt" json:"OptionalField,omitempty"`
-	// Required fields of all basic types
-	F_BoolRequired    *bool    `protobuf:"varint,10,req,name=F_Bool_required" json:"F_Bool_required,omitempty"`
-	F_Int32Required   *int32   `protobuf:"varint,11,req,name=F_Int32_required" json:"F_Int32_required,omitempty"`
-	F_Int64Required   *int64   `protobuf:"varint,12,req,name=F_Int64_required" json:"F_Int64_required,omitempty"`
-	F_Fixed32Required *uint32  `protobuf:"fixed32,13,req,name=F_Fixed32_required" json:"F_Fixed32_required,omitempty"`
-	F_Fixed64Required *uint64  `protobuf:"fixed64,14,req,name=F_Fixed64_required" json:"F_Fixed64_required,omitempty"`
-	F_Uint32Required  *uint32  `protobuf:"varint,15,req,name=F_Uint32_required" json:"F_Uint32_required,omitempty"`
-	F_Uint64Required  *uint64  `protobuf:"varint,16,req,name=F_Uint64_required" json:"F_Uint64_required,omitempty"`
-	F_FloatRequired   *float32 `protobuf:"fixed32,17,req,name=F_Float_required" json:"F_Float_required,omitempty"`
-	F_DoubleRequired  *float64 `protobuf:"fixed64,18,req,name=F_Double_required" json:"F_Double_required,omitempty"`
-	F_StringRequired  *string  `protobuf:"bytes,19,req,name=F_String_required" json:"F_String_required,omitempty"`
-	F_BytesRequired   []byte   `protobuf:"bytes,101,req,name=F_Bytes_required" json:"F_Bytes_required,omitempty"`
-	F_Sint32Required  *int32   `protobuf:"zigzag32,102,req,name=F_Sint32_required" json:"F_Sint32_required,omitempty"`
-	F_Sint64Required  *int64   `protobuf:"zigzag64,103,req,name=F_Sint64_required" json:"F_Sint64_required,omitempty"`
-	// Repeated fields of all basic types
-	F_BoolRepeated    []bool    `protobuf:"varint,20,rep,name=F_Bool_repeated" json:"F_Bool_repeated,omitempty"`
-	F_Int32Repeated   []int32   `protobuf:"varint,21,rep,name=F_Int32_repeated" json:"F_Int32_repeated,omitempty"`
-	F_Int64Repeated   []int64   `protobuf:"varint,22,rep,name=F_Int64_repeated" json:"F_Int64_repeated,omitempty"`
-	F_Fixed32Repeated []uint32  `protobuf:"fixed32,23,rep,name=F_Fixed32_repeated" json:"F_Fixed32_repeated,omitempty"`
-	F_Fixed64Repeated []uint64  `protobuf:"fixed64,24,rep,name=F_Fixed64_repeated" json:"F_Fixed64_repeated,omitempty"`
-	F_Uint32Repeated  []uint32  `protobuf:"varint,25,rep,name=F_Uint32_repeated" json:"F_Uint32_repeated,omitempty"`
-	F_Uint64Repeated  []uint64  `protobuf:"varint,26,rep,name=F_Uint64_repeated" json:"F_Uint64_repeated,omitempty"`
-	F_FloatRepeated   []float32 `protobuf:"fixed32,27,rep,name=F_Float_repeated" json:"F_Float_repeated,omitempty"`
-	F_DoubleRepeated  []float64 `protobuf:"fixed64,28,rep,name=F_Double_repeated" json:"F_Double_repeated,omitempty"`
-	F_StringRepeated  []string  `protobuf:"bytes,29,rep,name=F_String_repeated" json:"F_String_repeated,omitempty"`
-	F_BytesRepeated   [][]byte  `protobuf:"bytes,201,rep,name=F_Bytes_repeated" json:"F_Bytes_repeated,omitempty"`
-	F_Sint32Repeated  []int32   `protobuf:"zigzag32,202,rep,name=F_Sint32_repeated" json:"F_Sint32_repeated,omitempty"`
-	F_Sint64Repeated  []int64   `protobuf:"zigzag64,203,rep,name=F_Sint64_repeated" json:"F_Sint64_repeated,omitempty"`
-	// Optional fields of all basic types
-	F_BoolOptional    *bool    `protobuf:"varint,30,opt,name=F_Bool_optional" json:"F_Bool_optional,omitempty"`
-	F_Int32Optional   *int32   `protobuf:"varint,31,opt,name=F_Int32_optional" json:"F_Int32_optional,omitempty"`
-	F_Int64Optional   *int64   `protobuf:"varint,32,opt,name=F_Int64_optional" json:"F_Int64_optional,omitempty"`
-	F_Fixed32Optional *uint32  `protobuf:"fixed32,33,opt,name=F_Fixed32_optional" json:"F_Fixed32_optional,omitempty"`
-	F_Fixed64Optional *uint64  `protobuf:"fixed64,34,opt,name=F_Fixed64_optional" json:"F_Fixed64_optional,omitempty"`
-	F_Uint32Optional  *uint32  `protobuf:"varint,35,opt,name=F_Uint32_optional" json:"F_Uint32_optional,omitempty"`
-	F_Uint64Optional  *uint64  `protobuf:"varint,36,opt,name=F_Uint64_optional" json:"F_Uint64_optional,omitempty"`
-	F_FloatOptional   *float32 `protobuf:"fixed32,37,opt,name=F_Float_optional" json:"F_Float_optional,omitempty"`
-	F_DoubleOptional  *float64 `protobuf:"fixed64,38,opt,name=F_Double_optional" json:"F_Double_optional,omitempty"`
-	F_StringOptional  *string  `protobuf:"bytes,39,opt,name=F_String_optional" json:"F_String_optional,omitempty"`
-	F_BytesOptional   []byte   `protobuf:"bytes,301,opt,name=F_Bytes_optional" json:"F_Bytes_optional,omitempty"`
-	F_Sint32Optional  *int32   `protobuf:"zigzag32,302,opt,name=F_Sint32_optional" json:"F_Sint32_optional,omitempty"`
-	F_Sint64Optional  *int64   `protobuf:"zigzag64,303,opt,name=F_Sint64_optional" json:"F_Sint64_optional,omitempty"`
-	// Default-valued fields of all basic types
-	F_BoolDefaulted    *bool    `protobuf:"varint,40,opt,name=F_Bool_defaulted,def=1" json:"F_Bool_defaulted,omitempty"`
-	F_Int32Defaulted   *int32   `protobuf:"varint,41,opt,name=F_Int32_defaulted,def=32" json:"F_Int32_defaulted,omitempty"`
-	F_Int64Defaulted   *int64   `protobuf:"varint,42,opt,name=F_Int64_defaulted,def=64" json:"F_Int64_defaulted,omitempty"`
-	F_Fixed32Defaulted *uint32  `protobuf:"fixed32,43,opt,name=F_Fixed32_defaulted,def=320" json:"F_Fixed32_defaulted,omitempty"`
-	F_Fixed64Defaulted *uint64  `protobuf:"fixed64,44,opt,name=F_Fixed64_defaulted,def=640" json:"F_Fixed64_defaulted,omitempty"`
-	F_Uint32Defaulted  *uint32  `protobuf:"varint,45,opt,name=F_Uint32_defaulted,def=3200" json:"F_Uint32_defaulted,omitempty"`
-	F_Uint64Defaulted  *uint64  `protobuf:"varint,46,opt,name=F_Uint64_defaulted,def=6400" json:"F_Uint64_defaulted,omitempty"`
-	F_FloatDefaulted   *float32 `protobuf:"fixed32,47,opt,name=F_Float_defaulted,def=314159" json:"F_Float_defaulted,omitempty"`
-	F_DoubleDefaulted  *float64 `protobuf:"fixed64,48,opt,name=F_Double_defaulted,def=271828" json:"F_Double_defaulted,omitempty"`
-	F_StringDefaulted  *string  `protobuf:"bytes,49,opt,name=F_String_defaulted,def=hello, \"world!\"\n" json:"F_String_defaulted,omitempty"`
-	F_BytesDefaulted   []byte   `protobuf:"bytes,401,opt,name=F_Bytes_defaulted,def=Bignose" json:"F_Bytes_defaulted,omitempty"`
-	F_Sint32Defaulted  *int32   `protobuf:"zigzag32,402,opt,name=F_Sint32_defaulted,def=-32" json:"F_Sint32_defaulted,omitempty"`
-	F_Sint64Defaulted  *int64   `protobuf:"zigzag64,403,opt,name=F_Sint64_defaulted,def=-64" json:"F_Sint64_defaulted,omitempty"`
-	// Packed repeated fields (no string or bytes).
-	F_BoolRepeatedPacked    []bool                  `protobuf:"varint,50,rep,packed,name=F_Bool_repeated_packed" json:"F_Bool_repeated_packed,omitempty"`
-	F_Int32RepeatedPacked   []int32                 `protobuf:"varint,51,rep,packed,name=F_Int32_repeated_packed" json:"F_Int32_repeated_packed,omitempty"`
-	F_Int64RepeatedPacked   []int64                 `protobuf:"varint,52,rep,packed,name=F_Int64_repeated_packed" json:"F_Int64_repeated_packed,omitempty"`
-	F_Fixed32RepeatedPacked []uint32                `protobuf:"fixed32,53,rep,packed,name=F_Fixed32_repeated_packed" json:"F_Fixed32_repeated_packed,omitempty"`
-	F_Fixed64RepeatedPacked []uint64                `protobuf:"fixed64,54,rep,packed,name=F_Fixed64_repeated_packed" json:"F_Fixed64_repeated_packed,omitempty"`
-	F_Uint32RepeatedPacked  []uint32                `protobuf:"varint,55,rep,packed,name=F_Uint32_repeated_packed" json:"F_Uint32_repeated_packed,omitempty"`
-	F_Uint64RepeatedPacked  []uint64                `protobuf:"varint,56,rep,packed,name=F_Uint64_repeated_packed" json:"F_Uint64_repeated_packed,omitempty"`
-	F_FloatRepeatedPacked   []float32               `protobuf:"fixed32,57,rep,packed,name=F_Float_repeated_packed" json:"F_Float_repeated_packed,omitempty"`
-	F_DoubleRepeatedPacked  []float64               `protobuf:"fixed64,58,rep,packed,name=F_Double_repeated_packed" json:"F_Double_repeated_packed,omitempty"`
-	F_Sint32RepeatedPacked  []int32                 `protobuf:"zigzag32,502,rep,packed,name=F_Sint32_repeated_packed" json:"F_Sint32_repeated_packed,omitempty"`
-	F_Sint64RepeatedPacked  []int64                 `protobuf:"zigzag64,503,rep,packed,name=F_Sint64_repeated_packed" json:"F_Sint64_repeated_packed,omitempty"`
-	Requiredgroup           *GoTest_RequiredGroup   `protobuf:"group,70,req,name=RequiredGroup" json:"requiredgroup,omitempty"`
-	Repeatedgroup           []*GoTest_RepeatedGroup `protobuf:"group,80,rep,name=RepeatedGroup" json:"repeatedgroup,omitempty"`
-	Optionalgroup           *GoTest_OptionalGroup   `protobuf:"group,90,opt,name=OptionalGroup" json:"optionalgroup,omitempty"`
-	XXX_unrecognized        []byte                  `json:"-"`
-}
-
-func (m *GoTest) Reset()         { *m = GoTest{} }
-func (m *GoTest) String() string { return proto.CompactTextString(m) }
-func (*GoTest) ProtoMessage()    {}
-
-const Default_GoTest_F_BoolDefaulted bool = true
-const Default_GoTest_F_Int32Defaulted int32 = 32
-const Default_GoTest_F_Int64Defaulted int64 = 64
-const Default_GoTest_F_Fixed32Defaulted uint32 = 320
-const Default_GoTest_F_Fixed64Defaulted uint64 = 640
-const Default_GoTest_F_Uint32Defaulted uint32 = 3200
-const Default_GoTest_F_Uint64Defaulted uint64 = 6400
-const Default_GoTest_F_FloatDefaulted float32 = 314159
-const Default_GoTest_F_DoubleDefaulted float64 = 271828
-const Default_GoTest_F_StringDefaulted string = "hello, \"world!\"\n"
-
-var Default_GoTest_F_BytesDefaulted []byte = []byte("Bignose")
-
-const Default_GoTest_F_Sint32Defaulted int32 = -32
-const Default_GoTest_F_Sint64Defaulted int64 = -64
-
-func (m *GoTest) GetKind() GoTest_KIND {
-	if m != nil && m.Kind != nil {
-		return *m.Kind
-	}
-	return GoTest_VOID
-}
-
-func (m *GoTest) GetTable() string {
-	if m != nil && m.Table != nil {
-		return *m.Table
-	}
-	return ""
-}
-
-func (m *GoTest) GetParam() int32 {
-	if m != nil && m.Param != nil {
-		return *m.Param
-	}
-	return 0
-}
-
-func (m *GoTest) GetRequiredField() *GoTestField {
-	if m != nil {
-		return m.RequiredField
-	}
-	return nil
-}
-
-func (m *GoTest) GetRepeatedField() []*GoTestField {
-	if m != nil {
-		return m.RepeatedField
-	}
-	return nil
-}
-
-func (m *GoTest) GetOptionalField() *GoTestField {
-	if m != nil {
-		return m.OptionalField
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_BoolRequired() bool {
-	if m != nil && m.F_BoolRequired != nil {
-		return *m.F_BoolRequired
-	}
-	return false
-}
-
-func (m *GoTest) GetF_Int32Required() int32 {
-	if m != nil && m.F_Int32Required != nil {
-		return *m.F_Int32Required
-	}
-	return 0
-}
-
-func (m *GoTest) GetF_Int64Required() int64 {
-	if m != nil && m.F_Int64Required != nil {
-		return *m.F_Int64Required
-	}
-	return 0
-}
-
-func (m *GoTest) GetF_Fixed32Required() uint32 {
-	if m != nil && m.F_Fixed32Required != nil {
-		return *m.F_Fixed32Required
-	}
-	return 0
-}
-
-func (m *GoTest) GetF_Fixed64Required() uint64 {
-	if m != nil && m.F_Fixed64Required != nil {
-		return *m.F_Fixed64Required
-	}
-	return 0
-}
-
-func (m *GoTest) GetF_Uint32Required() uint32 {
-	if m != nil && m.F_Uint32Required != nil {
-		return *m.F_Uint32Required
-	}
-	return 0
-}
-
-func (m *GoTest) GetF_Uint64Required() uint64 {
-	if m != nil && m.F_Uint64Required != nil {
-		return *m.F_Uint64Required
-	}
-	return 0
-}
-
-func (m *GoTest) GetF_FloatRequired() float32 {
-	if m != nil && m.F_FloatRequired != nil {
-		return *m.F_FloatRequired
-	}
-	return 0
-}
-
-func (m *GoTest) GetF_DoubleRequired() float64 {
-	if m != nil && m.F_DoubleRequired != nil {
-		return *m.F_DoubleRequired
-	}
-	return 0
-}
-
-func (m *GoTest) GetF_StringRequired() string {
-	if m != nil && m.F_StringRequired != nil {
-		return *m.F_StringRequired
-	}
-	return ""
-}
-
-func (m *GoTest) GetF_BytesRequired() []byte {
-	if m != nil {
-		return m.F_BytesRequired
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_Sint32Required() int32 {
-	if m != nil && m.F_Sint32Required != nil {
-		return *m.F_Sint32Required
-	}
-	return 0
-}
-
-func (m *GoTest) GetF_Sint64Required() int64 {
-	if m != nil && m.F_Sint64Required != nil {
-		return *m.F_Sint64Required
-	}
-	return 0
-}
-
-func (m *GoTest) GetF_BoolRepeated() []bool {
-	if m != nil {
-		return m.F_BoolRepeated
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_Int32Repeated() []int32 {
-	if m != nil {
-		return m.F_Int32Repeated
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_Int64Repeated() []int64 {
-	if m != nil {
-		return m.F_Int64Repeated
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_Fixed32Repeated() []uint32 {
-	if m != nil {
-		return m.F_Fixed32Repeated
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_Fixed64Repeated() []uint64 {
-	if m != nil {
-		return m.F_Fixed64Repeated
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_Uint32Repeated() []uint32 {
-	if m != nil {
-		return m.F_Uint32Repeated
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_Uint64Repeated() []uint64 {
-	if m != nil {
-		return m.F_Uint64Repeated
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_FloatRepeated() []float32 {
-	if m != nil {
-		return m.F_FloatRepeated
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_DoubleRepeated() []float64 {
-	if m != nil {
-		return m.F_DoubleRepeated
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_StringRepeated() []string {
-	if m != nil {
-		return m.F_StringRepeated
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_BytesRepeated() [][]byte {
-	if m != nil {
-		return m.F_BytesRepeated
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_Sint32Repeated() []int32 {
-	if m != nil {
-		return m.F_Sint32Repeated
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_Sint64Repeated() []int64 {
-	if m != nil {
-		return m.F_Sint64Repeated
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_BoolOptional() bool {
-	if m != nil && m.F_BoolOptional != nil {
-		return *m.F_BoolOptional
-	}
-	return false
-}
-
-func (m *GoTest) GetF_Int32Optional() int32 {
-	if m != nil && m.F_Int32Optional != nil {
-		return *m.F_Int32Optional
-	}
-	return 0
-}
-
-func (m *GoTest) GetF_Int64Optional() int64 {
-	if m != nil && m.F_Int64Optional != nil {
-		return *m.F_Int64Optional
-	}
-	return 0
-}
-
-func (m *GoTest) GetF_Fixed32Optional() uint32 {
-	if m != nil && m.F_Fixed32Optional != nil {
-		return *m.F_Fixed32Optional
-	}
-	return 0
-}
-
-func (m *GoTest) GetF_Fixed64Optional() uint64 {
-	if m != nil && m.F_Fixed64Optional != nil {
-		return *m.F_Fixed64Optional
-	}
-	return 0
-}
-
-func (m *GoTest) GetF_Uint32Optional() uint32 {
-	if m != nil && m.F_Uint32Optional != nil {
-		return *m.F_Uint32Optional
-	}
-	return 0
-}
-
-func (m *GoTest) GetF_Uint64Optional() uint64 {
-	if m != nil && m.F_Uint64Optional != nil {
-		return *m.F_Uint64Optional
-	}
-	return 0
-}
-
-func (m *GoTest) GetF_FloatOptional() float32 {
-	if m != nil && m.F_FloatOptional != nil {
-		return *m.F_FloatOptional
-	}
-	return 0
-}
-
-func (m *GoTest) GetF_DoubleOptional() float64 {
-	if m != nil && m.F_DoubleOptional != nil {
-		return *m.F_DoubleOptional
-	}
-	return 0
-}
-
-func (m *GoTest) GetF_StringOptional() string {
-	if m != nil && m.F_StringOptional != nil {
-		return *m.F_StringOptional
-	}
-	return ""
-}
-
-func (m *GoTest) GetF_BytesOptional() []byte {
-	if m != nil {
-		return m.F_BytesOptional
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_Sint32Optional() int32 {
-	if m != nil && m.F_Sint32Optional != nil {
-		return *m.F_Sint32Optional
-	}
-	return 0
-}
-
-func (m *GoTest) GetF_Sint64Optional() int64 {
-	if m != nil && m.F_Sint64Optional != nil {
-		return *m.F_Sint64Optional
-	}
-	return 0
-}
-
-func (m *GoTest) GetF_BoolDefaulted() bool {
-	if m != nil && m.F_BoolDefaulted != nil {
-		return *m.F_BoolDefaulted
-	}
-	return Default_GoTest_F_BoolDefaulted
-}
-
-func (m *GoTest) GetF_Int32Defaulted() int32 {
-	if m != nil && m.F_Int32Defaulted != nil {
-		return *m.F_Int32Defaulted
-	}
-	return Default_GoTest_F_Int32Defaulted
-}
-
-func (m *GoTest) GetF_Int64Defaulted() int64 {
-	if m != nil && m.F_Int64Defaulted != nil {
-		return *m.F_Int64Defaulted
-	}
-	return Default_GoTest_F_Int64Defaulted
-}
-
-func (m *GoTest) GetF_Fixed32Defaulted() uint32 {
-	if m != nil && m.F_Fixed32Defaulted != nil {
-		return *m.F_Fixed32Defaulted
-	}
-	return Default_GoTest_F_Fixed32Defaulted
-}
-
-func (m *GoTest) GetF_Fixed64Defaulted() uint64 {
-	if m != nil && m.F_Fixed64Defaulted != nil {
-		return *m.F_Fixed64Defaulted
-	}
-	return Default_GoTest_F_Fixed64Defaulted
-}
-
-func (m *GoTest) GetF_Uint32Defaulted() uint32 {
-	if m != nil && m.F_Uint32Defaulted != nil {
-		return *m.F_Uint32Defaulted
-	}
-	return Default_GoTest_F_Uint32Defaulted
-}
-
-func (m *GoTest) GetF_Uint64Defaulted() uint64 {
-	if m != nil && m.F_Uint64Defaulted != nil {
-		return *m.F_Uint64Defaulted
-	}
-	return Default_GoTest_F_Uint64Defaulted
-}
-
-func (m *GoTest) GetF_FloatDefaulted() float32 {
-	if m != nil && m.F_FloatDefaulted != nil {
-		return *m.F_FloatDefaulted
-	}
-	return Default_GoTest_F_FloatDefaulted
-}
-
-func (m *GoTest) GetF_DoubleDefaulted() float64 {
-	if m != nil && m.F_DoubleDefaulted != nil {
-		return *m.F_DoubleDefaulted
-	}
-	return Default_GoTest_F_DoubleDefaulted
-}
-
-func (m *GoTest) GetF_StringDefaulted() string {
-	if m != nil && m.F_StringDefaulted != nil {
-		return *m.F_StringDefaulted
-	}
-	return Default_GoTest_F_StringDefaulted
-}
-
-func (m *GoTest) GetF_BytesDefaulted() []byte {
-	if m != nil && m.F_BytesDefaulted != nil {
-		return m.F_BytesDefaulted
-	}
-	return append([]byte(nil), Default_GoTest_F_BytesDefaulted...)
-}
-
-func (m *GoTest) GetF_Sint32Defaulted() int32 {
-	if m != nil && m.F_Sint32Defaulted != nil {
-		return *m.F_Sint32Defaulted
-	}
-	return Default_GoTest_F_Sint32Defaulted
-}
-
-func (m *GoTest) GetF_Sint64Defaulted() int64 {
-	if m != nil && m.F_Sint64Defaulted != nil {
-		return *m.F_Sint64Defaulted
-	}
-	return Default_GoTest_F_Sint64Defaulted
-}
-
-func (m *GoTest) GetF_BoolRepeatedPacked() []bool {
-	if m != nil {
-		return m.F_BoolRepeatedPacked
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_Int32RepeatedPacked() []int32 {
-	if m != nil {
-		return m.F_Int32RepeatedPacked
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_Int64RepeatedPacked() []int64 {
-	if m != nil {
-		return m.F_Int64RepeatedPacked
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_Fixed32RepeatedPacked() []uint32 {
-	if m != nil {
-		return m.F_Fixed32RepeatedPacked
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_Fixed64RepeatedPacked() []uint64 {
-	if m != nil {
-		return m.F_Fixed64RepeatedPacked
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_Uint32RepeatedPacked() []uint32 {
-	if m != nil {
-		return m.F_Uint32RepeatedPacked
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_Uint64RepeatedPacked() []uint64 {
-	if m != nil {
-		return m.F_Uint64RepeatedPacked
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_FloatRepeatedPacked() []float32 {
-	if m != nil {
-		return m.F_FloatRepeatedPacked
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_DoubleRepeatedPacked() []float64 {
-	if m != nil {
-		return m.F_DoubleRepeatedPacked
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_Sint32RepeatedPacked() []int32 {
-	if m != nil {
-		return m.F_Sint32RepeatedPacked
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_Sint64RepeatedPacked() []int64 {
-	if m != nil {
-		return m.F_Sint64RepeatedPacked
-	}
-	return nil
-}
-
-func (m *GoTest) GetRequiredgroup() *GoTest_RequiredGroup {
-	if m != nil {
-		return m.Requiredgroup
-	}
-	return nil
-}
-
-func (m *GoTest) GetRepeatedgroup() []*GoTest_RepeatedGroup {
-	if m != nil {
-		return m.Repeatedgroup
-	}
-	return nil
-}
-
-func (m *GoTest) GetOptionalgroup() *GoTest_OptionalGroup {
-	if m != nil {
-		return m.Optionalgroup
-	}
-	return nil
-}
-
-// Required, repeated, and optional groups.
-type GoTest_RequiredGroup struct {
-	RequiredField    *string `protobuf:"bytes,71,req" json:"RequiredField,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *GoTest_RequiredGroup) Reset()         { *m = GoTest_RequiredGroup{} }
-func (m *GoTest_RequiredGroup) String() string { return proto.CompactTextString(m) }
-func (*GoTest_RequiredGroup) ProtoMessage()    {}
-
-func (m *GoTest_RequiredGroup) GetRequiredField() string {
-	if m != nil && m.RequiredField != nil {
-		return *m.RequiredField
-	}
-	return ""
-}
-
-type GoTest_RepeatedGroup struct {
-	RequiredField    *string `protobuf:"bytes,81,req" json:"RequiredField,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *GoTest_RepeatedGroup) Reset()         { *m = GoTest_RepeatedGroup{} }
-func (m *GoTest_RepeatedGroup) String() string { return proto.CompactTextString(m) }
-func (*GoTest_RepeatedGroup) ProtoMessage()    {}
-
-func (m *GoTest_RepeatedGroup) GetRequiredField() string {
-	if m != nil && m.RequiredField != nil {
-		return *m.RequiredField
-	}
-	return ""
-}
-
-type GoTest_OptionalGroup struct {
-	RequiredField    *string `protobuf:"bytes,91,req" json:"RequiredField,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *GoTest_OptionalGroup) Reset()         { *m = GoTest_OptionalGroup{} }
-func (m *GoTest_OptionalGroup) String() string { return proto.CompactTextString(m) }
-func (*GoTest_OptionalGroup) ProtoMessage()    {}
-
-func (m *GoTest_OptionalGroup) GetRequiredField() string {
-	if m != nil && m.RequiredField != nil {
-		return *m.RequiredField
-	}
-	return ""
-}
-
-// For testing skipping of unrecognized fields.
-// Numbers are all big, larger than tag numbers in GoTestField,
-// the message used in the corresponding test.
-type GoSkipTest struct {
-	SkipInt32        *int32                `protobuf:"varint,11,req,name=skip_int32" json:"skip_int32,omitempty"`
-	SkipFixed32      *uint32               `protobuf:"fixed32,12,req,name=skip_fixed32" json:"skip_fixed32,omitempty"`
-	SkipFixed64      *uint64               `protobuf:"fixed64,13,req,name=skip_fixed64" json:"skip_fixed64,omitempty"`
-	SkipString       *string               `protobuf:"bytes,14,req,name=skip_string" json:"skip_string,omitempty"`
-	Skipgroup        *GoSkipTest_SkipGroup `protobuf:"group,15,req,name=SkipGroup" json:"skipgroup,omitempty"`
-	XXX_unrecognized []byte                `json:"-"`
-}
-
-func (m *GoSkipTest) Reset()         { *m = GoSkipTest{} }
-func (m *GoSkipTest) String() string { return proto.CompactTextString(m) }
-func (*GoSkipTest) ProtoMessage()    {}
-
-func (m *GoSkipTest) GetSkipInt32() int32 {
-	if m != nil && m.SkipInt32 != nil {
-		return *m.SkipInt32
-	}
-	return 0
-}
-
-func (m *GoSkipTest) GetSkipFixed32() uint32 {
-	if m != nil && m.SkipFixed32 != nil {
-		return *m.SkipFixed32
-	}
-	return 0
-}
-
-func (m *GoSkipTest) GetSkipFixed64() uint64 {
-	if m != nil && m.SkipFixed64 != nil {
-		return *m.SkipFixed64
-	}
-	return 0
-}
-
-func (m *GoSkipTest) GetSkipString() string {
-	if m != nil && m.SkipString != nil {
-		return *m.SkipString
-	}
-	return ""
-}
-
-func (m *GoSkipTest) GetSkipgroup() *GoSkipTest_SkipGroup {
-	if m != nil {
-		return m.Skipgroup
-	}
-	return nil
-}
-
-type GoSkipTest_SkipGroup struct {
-	GroupInt32       *int32  `protobuf:"varint,16,req,name=group_int32" json:"group_int32,omitempty"`
-	GroupString      *string `protobuf:"bytes,17,req,name=group_string" json:"group_string,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *GoSkipTest_SkipGroup) Reset()         { *m = GoSkipTest_SkipGroup{} }
-func (m *GoSkipTest_SkipGroup) String() string { return proto.CompactTextString(m) }
-func (*GoSkipTest_SkipGroup) ProtoMessage()    {}
-
-func (m *GoSkipTest_SkipGroup) GetGroupInt32() int32 {
-	if m != nil && m.GroupInt32 != nil {
-		return *m.GroupInt32
-	}
-	return 0
-}
-
-func (m *GoSkipTest_SkipGroup) GetGroupString() string {
-	if m != nil && m.GroupString != nil {
-		return *m.GroupString
-	}
-	return ""
-}
-
-// For testing packed/non-packed decoder switching.
-// A serialized instance of one should be deserializable as the other.
-type NonPackedTest struct {
-	A                []int32 `protobuf:"varint,1,rep,name=a" json:"a,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *NonPackedTest) Reset()         { *m = NonPackedTest{} }
-func (m *NonPackedTest) String() string { return proto.CompactTextString(m) }
-func (*NonPackedTest) ProtoMessage()    {}
-
-func (m *NonPackedTest) GetA() []int32 {
-	if m != nil {
-		return m.A
-	}
-	return nil
-}
-
-type PackedTest struct {
-	B                []int32 `protobuf:"varint,1,rep,packed,name=b" json:"b,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *PackedTest) Reset()         { *m = PackedTest{} }
-func (m *PackedTest) String() string { return proto.CompactTextString(m) }
-func (*PackedTest) ProtoMessage()    {}
-
-func (m *PackedTest) GetB() []int32 {
-	if m != nil {
-		return m.B
-	}
-	return nil
-}
-
-type MaxTag struct {
-	// Maximum possible tag number.
-	LastField        *string `protobuf:"bytes,536870911,opt,name=last_field" json:"last_field,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *MaxTag) Reset()         { *m = MaxTag{} }
-func (m *MaxTag) String() string { return proto.CompactTextString(m) }
-func (*MaxTag) ProtoMessage()    {}
-
-func (m *MaxTag) GetLastField() string {
-	if m != nil && m.LastField != nil {
-		return *m.LastField
-	}
-	return ""
-}
-
-type OldMessage struct {
-	Nested           *OldMessage_Nested `protobuf:"bytes,1,opt,name=nested" json:"nested,omitempty"`
-	Num              *int32             `protobuf:"varint,2,opt,name=num" json:"num,omitempty"`
-	XXX_unrecognized []byte             `json:"-"`
-}
-
-func (m *OldMessage) Reset()         { *m = OldMessage{} }
-func (m *OldMessage) String() string { return proto.CompactTextString(m) }
-func (*OldMessage) ProtoMessage()    {}
-
-func (m *OldMessage) GetNested() *OldMessage_Nested {
-	if m != nil {
-		return m.Nested
-	}
-	return nil
-}
-
-func (m *OldMessage) GetNum() int32 {
-	if m != nil && m.Num != nil {
-		return *m.Num
-	}
-	return 0
-}
-
-type OldMessage_Nested struct {
-	Name             *string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *OldMessage_Nested) Reset()         { *m = OldMessage_Nested{} }
-func (m *OldMessage_Nested) String() string { return proto.CompactTextString(m) }
-func (*OldMessage_Nested) ProtoMessage()    {}
-
-func (m *OldMessage_Nested) GetName() string {
-	if m != nil && m.Name != nil {
-		return *m.Name
-	}
-	return ""
-}
-
-// NewMessage is wire compatible with OldMessage;
-// imagine it as a future version.
-type NewMessage struct {
-	Nested *NewMessage_Nested `protobuf:"bytes,1,opt,name=nested" json:"nested,omitempty"`
-	// This is an int32 in OldMessage.
-	Num              *int64 `protobuf:"varint,2,opt,name=num" json:"num,omitempty"`
-	XXX_unrecognized []byte `json:"-"`
-}
-
-func (m *NewMessage) Reset()         { *m = NewMessage{} }
-func (m *NewMessage) String() string { return proto.CompactTextString(m) }
-func (*NewMessage) ProtoMessage()    {}
-
-func (m *NewMessage) GetNested() *NewMessage_Nested {
-	if m != nil {
-		return m.Nested
-	}
-	return nil
-}
-
-func (m *NewMessage) GetNum() int64 {
-	if m != nil && m.Num != nil {
-		return *m.Num
-	}
-	return 0
-}
-
-type NewMessage_Nested struct {
-	Name             *string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
-	FoodGroup        *string `protobuf:"bytes,2,opt,name=food_group" json:"food_group,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *NewMessage_Nested) Reset()         { *m = NewMessage_Nested{} }
-func (m *NewMessage_Nested) String() string { return proto.CompactTextString(m) }
-func (*NewMessage_Nested) ProtoMessage()    {}
-
-func (m *NewMessage_Nested) GetName() string {
-	if m != nil && m.Name != nil {
-		return *m.Name
-	}
-	return ""
-}
-
-func (m *NewMessage_Nested) GetFoodGroup() string {
-	if m != nil && m.FoodGroup != nil {
-		return *m.FoodGroup
-	}
-	return ""
-}
-
-type InnerMessage struct {
-	Host             *string `protobuf:"bytes,1,req,name=host" json:"host,omitempty"`
-	Port             *int32  `protobuf:"varint,2,opt,name=port,def=4000" json:"port,omitempty"`
-	Connected        *bool   `protobuf:"varint,3,opt,name=connected" json:"connected,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *InnerMessage) Reset()         { *m = InnerMessage{} }
-func (m *InnerMessage) String() string { return proto.CompactTextString(m) }
-func (*InnerMessage) ProtoMessage()    {}
-
-const Default_InnerMessage_Port int32 = 4000
-
-func (m *InnerMessage) GetHost() string {
-	if m != nil && m.Host != nil {
-		return *m.Host
-	}
-	return ""
-}
-
-func (m *InnerMessage) GetPort() int32 {
-	if m != nil && m.Port != nil {
-		return *m.Port
-	}
-	return Default_InnerMessage_Port
-}
-
-func (m *InnerMessage) GetConnected() bool {
-	if m != nil && m.Connected != nil {
-		return *m.Connected
-	}
-	return false
-}
-
-type OtherMessage struct {
-	Key              *int64        `protobuf:"varint,1,opt,name=key" json:"key,omitempty"`
-	Value            []byte        `protobuf:"bytes,2,opt,name=value" json:"value,omitempty"`
-	Weight           *float32      `protobuf:"fixed32,3,opt,name=weight" json:"weight,omitempty"`
-	Inner            *InnerMessage `protobuf:"bytes,4,opt,name=inner" json:"inner,omitempty"`
-	XXX_unrecognized []byte        `json:"-"`
-}
-
-func (m *OtherMessage) Reset()         { *m = OtherMessage{} }
-func (m *OtherMessage) String() string { return proto.CompactTextString(m) }
-func (*OtherMessage) ProtoMessage()    {}
-
-func (m *OtherMessage) GetKey() int64 {
-	if m != nil && m.Key != nil {
-		return *m.Key
-	}
-	return 0
-}
-
-func (m *OtherMessage) GetValue() []byte {
-	if m != nil {
-		return m.Value
-	}
-	return nil
-}
-
-func (m *OtherMessage) GetWeight() float32 {
-	if m != nil && m.Weight != nil {
-		return *m.Weight
-	}
-	return 0
-}
-
-func (m *OtherMessage) GetInner() *InnerMessage {
-	if m != nil {
-		return m.Inner
-	}
-	return nil
-}
-
-type MyMessage struct {
-	Count     *int32               `protobuf:"varint,1,req,name=count" json:"count,omitempty"`
-	Name      *string              `protobuf:"bytes,2,opt,name=name" json:"name,omitempty"`
-	Quote     *string              `protobuf:"bytes,3,opt,name=quote" json:"quote,omitempty"`
-	Pet       []string             `protobuf:"bytes,4,rep,name=pet" json:"pet,omitempty"`
-	Inner     *InnerMessage        `protobuf:"bytes,5,opt,name=inner" json:"inner,omitempty"`
-	Others    []*OtherMessage      `protobuf:"bytes,6,rep,name=others" json:"others,omitempty"`
-	RepInner  []*InnerMessage      `protobuf:"bytes,12,rep,name=rep_inner" json:"rep_inner,omitempty"`
-	Bikeshed  *MyMessage_Color     `protobuf:"varint,7,opt,name=bikeshed,enum=testdata.MyMessage_Color" json:"bikeshed,omitempty"`
-	Somegroup *MyMessage_SomeGroup `protobuf:"group,8,opt,name=SomeGroup" json:"somegroup,omitempty"`
-	// This field becomes [][]byte in the generated code.
-	RepBytes         [][]byte                  `protobuf:"bytes,10,rep,name=rep_bytes" json:"rep_bytes,omitempty"`
-	Bigfloat         *float64                  `protobuf:"fixed64,11,opt,name=bigfloat" json:"bigfloat,omitempty"`
-	XXX_extensions   map[int32]proto.Extension `json:"-"`
-	XXX_unrecognized []byte                    `json:"-"`
-}
-
-func (m *MyMessage) Reset()         { *m = MyMessage{} }
-func (m *MyMessage) String() string { return proto.CompactTextString(m) }
-func (*MyMessage) ProtoMessage()    {}
-
-var extRange_MyMessage = []proto.ExtensionRange{
-	{100, 536870911},
-}
-
-func (*MyMessage) ExtensionRangeArray() []proto.ExtensionRange {
-	return extRange_MyMessage
-}
-func (m *MyMessage) ExtensionMap() map[int32]proto.Extension {
-	if m.XXX_extensions == nil {
-		m.XXX_extensions = make(map[int32]proto.Extension)
-	}
-	return m.XXX_extensions
-}
-
-func (m *MyMessage) GetCount() int32 {
-	if m != nil && m.Count != nil {
-		return *m.Count
-	}
-	return 0
-}
-
-func (m *MyMessage) GetName() string {
-	if m != nil && m.Name != nil {
-		return *m.Name
-	}
-	return ""
-}
-
-func (m *MyMessage) GetQuote() string {
-	if m != nil && m.Quote != nil {
-		return *m.Quote
-	}
-	return ""
-}
-
-func (m *MyMessage) GetPet() []string {
-	if m != nil {
-		return m.Pet
-	}
-	return nil
-}
-
-func (m *MyMessage) GetInner() *InnerMessage {
-	if m != nil {
-		return m.Inner
-	}
-	return nil
-}
-
-func (m *MyMessage) GetOthers() []*OtherMessage {
-	if m != nil {
-		return m.Others
-	}
-	return nil
-}
-
-func (m *MyMessage) GetRepInner() []*InnerMessage {
-	if m != nil {
-		return m.RepInner
-	}
-	return nil
-}
-
-func (m *MyMessage) GetBikeshed() MyMessage_Color {
-	if m != nil && m.Bikeshed != nil {
-		return *m.Bikeshed
-	}
-	return MyMessage_RED
-}
-
-func (m *MyMessage) GetSomegroup() *MyMessage_SomeGroup {
-	if m != nil {
-		return m.Somegroup
-	}
-	return nil
-}
-
-func (m *MyMessage) GetRepBytes() [][]byte {
-	if m != nil {
-		return m.RepBytes
-	}
-	return nil
-}
-
-func (m *MyMessage) GetBigfloat() float64 {
-	if m != nil && m.Bigfloat != nil {
-		return *m.Bigfloat
-	}
-	return 0
-}
-
-type MyMessage_SomeGroup struct {
-	GroupField       *int32 `protobuf:"varint,9,opt,name=group_field" json:"group_field,omitempty"`
-	XXX_unrecognized []byte `json:"-"`
-}
-
-func (m *MyMessage_SomeGroup) Reset()         { *m = MyMessage_SomeGroup{} }
-func (m *MyMessage_SomeGroup) String() string { return proto.CompactTextString(m) }
-func (*MyMessage_SomeGroup) ProtoMessage()    {}
-
-func (m *MyMessage_SomeGroup) GetGroupField() int32 {
-	if m != nil && m.GroupField != nil {
-		return *m.GroupField
-	}
-	return 0
-}
-
-type Ext struct {
-	Data             *string `protobuf:"bytes,1,opt,name=data" json:"data,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *Ext) Reset()         { *m = Ext{} }
-func (m *Ext) String() string { return proto.CompactTextString(m) }
-func (*Ext) ProtoMessage()    {}
-
-func (m *Ext) GetData() string {
-	if m != nil && m.Data != nil {
-		return *m.Data
-	}
-	return ""
-}
-
-var E_Ext_More = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessage)(nil),
-	ExtensionType: (*Ext)(nil),
-	Field:         103,
-	Name:          "testdata.Ext.more",
-	Tag:           "bytes,103,opt,name=more",
-}
-
-var E_Ext_Text = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessage)(nil),
-	ExtensionType: (*string)(nil),
-	Field:         104,
-	Name:          "testdata.Ext.text",
-	Tag:           "bytes,104,opt,name=text",
-}
-
-var E_Ext_Number = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessage)(nil),
-	ExtensionType: (*int32)(nil),
-	Field:         105,
-	Name:          "testdata.Ext.number",
-	Tag:           "varint,105,opt,name=number",
-}
-
-type DefaultsMessage struct {
-	XXX_extensions   map[int32]proto.Extension `json:"-"`
-	XXX_unrecognized []byte                    `json:"-"`
-}
-
-func (m *DefaultsMessage) Reset()         { *m = DefaultsMessage{} }
-func (m *DefaultsMessage) String() string { return proto.CompactTextString(m) }
-func (*DefaultsMessage) ProtoMessage()    {}
-
-var extRange_DefaultsMessage = []proto.ExtensionRange{
-	{100, 536870911},
-}
-
-func (*DefaultsMessage) ExtensionRangeArray() []proto.ExtensionRange {
-	return extRange_DefaultsMessage
-}
-func (m *DefaultsMessage) ExtensionMap() map[int32]proto.Extension {
-	if m.XXX_extensions == nil {
-		m.XXX_extensions = make(map[int32]proto.Extension)
-	}
-	return m.XXX_extensions
-}
-
-type MyMessageSet struct {
-	XXX_extensions   map[int32]proto.Extension `json:"-"`
-	XXX_unrecognized []byte                    `json:"-"`
-}
-
-func (m *MyMessageSet) Reset()         { *m = MyMessageSet{} }
-func (m *MyMessageSet) String() string { return proto.CompactTextString(m) }
-func (*MyMessageSet) ProtoMessage()    {}
-
-func (m *MyMessageSet) Marshal() ([]byte, error) {
-	return proto.MarshalMessageSet(m.ExtensionMap())
-}
-func (m *MyMessageSet) Unmarshal(buf []byte) error {
-	return proto.UnmarshalMessageSet(buf, m.ExtensionMap())
-}
-func (m *MyMessageSet) MarshalJSON() ([]byte, error) {
-	return proto.MarshalMessageSetJSON(m.XXX_extensions)
-}
-func (m *MyMessageSet) UnmarshalJSON(buf []byte) error {
-	return proto.UnmarshalMessageSetJSON(buf, m.XXX_extensions)
-}
-
-// ensure MyMessageSet satisfies proto.Marshaler and proto.Unmarshaler
-var _ proto.Marshaler = (*MyMessageSet)(nil)
-var _ proto.Unmarshaler = (*MyMessageSet)(nil)
-
-var extRange_MyMessageSet = []proto.ExtensionRange{
-	{100, 2147483646},
-}
-
-func (*MyMessageSet) ExtensionRangeArray() []proto.ExtensionRange {
-	return extRange_MyMessageSet
-}
-func (m *MyMessageSet) ExtensionMap() map[int32]proto.Extension {
-	if m.XXX_extensions == nil {
-		m.XXX_extensions = make(map[int32]proto.Extension)
-	}
-	return m.XXX_extensions
-}
-
-type Empty struct {
-	XXX_unrecognized []byte `json:"-"`
-}
-
-func (m *Empty) Reset()         { *m = Empty{} }
-func (m *Empty) String() string { return proto.CompactTextString(m) }
-func (*Empty) ProtoMessage()    {}
-
-type MessageList struct {
-	Message          []*MessageList_Message `protobuf:"group,1,rep" json:"message,omitempty"`
-	XXX_unrecognized []byte                 `json:"-"`
-}
-
-func (m *MessageList) Reset()         { *m = MessageList{} }
-func (m *MessageList) String() string { return proto.CompactTextString(m) }
-func (*MessageList) ProtoMessage()    {}
-
-func (m *MessageList) GetMessage() []*MessageList_Message {
-	if m != nil {
-		return m.Message
-	}
-	return nil
-}
-
-type MessageList_Message struct {
-	Name             *string `protobuf:"bytes,2,req,name=name" json:"name,omitempty"`
-	Count            *int32  `protobuf:"varint,3,req,name=count" json:"count,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *MessageList_Message) Reset()         { *m = MessageList_Message{} }
-func (m *MessageList_Message) String() string { return proto.CompactTextString(m) }
-func (*MessageList_Message) ProtoMessage()    {}
-
-func (m *MessageList_Message) GetName() string {
-	if m != nil && m.Name != nil {
-		return *m.Name
-	}
-	return ""
-}
-
-func (m *MessageList_Message) GetCount() int32 {
-	if m != nil && m.Count != nil {
-		return *m.Count
-	}
-	return 0
-}
-
-type Strings struct {
-	StringField      *string `protobuf:"bytes,1,opt,name=string_field" json:"string_field,omitempty"`
-	BytesField       []byte  `protobuf:"bytes,2,opt,name=bytes_field" json:"bytes_field,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *Strings) Reset()         { *m = Strings{} }
-func (m *Strings) String() string { return proto.CompactTextString(m) }
-func (*Strings) ProtoMessage()    {}
-
-func (m *Strings) GetStringField() string {
-	if m != nil && m.StringField != nil {
-		return *m.StringField
-	}
-	return ""
-}
-
-func (m *Strings) GetBytesField() []byte {
-	if m != nil {
-		return m.BytesField
-	}
-	return nil
-}
-
-type Defaults struct {
-	// Default-valued fields of all basic types.
-	// Same as GoTest, but copied here to make testing easier.
-	F_Bool    *bool           `protobuf:"varint,1,opt,def=1" json:"F_Bool,omitempty"`
-	F_Int32   *int32          `protobuf:"varint,2,opt,def=32" json:"F_Int32,omitempty"`
-	F_Int64   *int64          `protobuf:"varint,3,opt,def=64" json:"F_Int64,omitempty"`
-	F_Fixed32 *uint32         `protobuf:"fixed32,4,opt,def=320" json:"F_Fixed32,omitempty"`
-	F_Fixed64 *uint64         `protobuf:"fixed64,5,opt,def=640" json:"F_Fixed64,omitempty"`
-	F_Uint32  *uint32         `protobuf:"varint,6,opt,def=3200" json:"F_Uint32,omitempty"`
-	F_Uint64  *uint64         `protobuf:"varint,7,opt,def=6400" json:"F_Uint64,omitempty"`
-	F_Float   *float32        `protobuf:"fixed32,8,opt,def=314159" json:"F_Float,omitempty"`
-	F_Double  *float64        `protobuf:"fixed64,9,opt,def=271828" json:"F_Double,omitempty"`
-	F_String  *string         `protobuf:"bytes,10,opt,def=hello, \"world!\"\n" json:"F_String,omitempty"`
-	F_Bytes   []byte          `protobuf:"bytes,11,opt,def=Bignose" json:"F_Bytes,omitempty"`
-	F_Sint32  *int32          `protobuf:"zigzag32,12,opt,def=-32" json:"F_Sint32,omitempty"`
-	F_Sint64  *int64          `protobuf:"zigzag64,13,opt,def=-64" json:"F_Sint64,omitempty"`
-	F_Enum    *Defaults_Color `protobuf:"varint,14,opt,enum=testdata.Defaults_Color,def=1" json:"F_Enum,omitempty"`
-	// More fields with crazy defaults.
-	F_Pinf *float32 `protobuf:"fixed32,15,opt,def=inf" json:"F_Pinf,omitempty"`
-	F_Ninf *float32 `protobuf:"fixed32,16,opt,def=-inf" json:"F_Ninf,omitempty"`
-	F_Nan  *float32 `protobuf:"fixed32,17,opt,def=nan" json:"F_Nan,omitempty"`
-	// Sub-message.
-	Sub *SubDefaults `protobuf:"bytes,18,opt,name=sub" json:"sub,omitempty"`
-	// Redundant but explicit defaults.
-	StrZero          *string `protobuf:"bytes,19,opt,name=str_zero,def=" json:"str_zero,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *Defaults) Reset()         { *m = Defaults{} }
-func (m *Defaults) String() string { return proto.CompactTextString(m) }
-func (*Defaults) ProtoMessage()    {}
-
-const Default_Defaults_F_Bool bool = true
-const Default_Defaults_F_Int32 int32 = 32
-const Default_Defaults_F_Int64 int64 = 64
-const Default_Defaults_F_Fixed32 uint32 = 320
-const Default_Defaults_F_Fixed64 uint64 = 640
-const Default_Defaults_F_Uint32 uint32 = 3200
-const Default_Defaults_F_Uint64 uint64 = 6400
-const Default_Defaults_F_Float float32 = 314159
-const Default_Defaults_F_Double float64 = 271828
-const Default_Defaults_F_String string = "hello, \"world!\"\n"
-
-var Default_Defaults_F_Bytes []byte = []byte("Bignose")
-
-const Default_Defaults_F_Sint32 int32 = -32
-const Default_Defaults_F_Sint64 int64 = -64
-const Default_Defaults_F_Enum Defaults_Color = Defaults_GREEN
-
-var Default_Defaults_F_Pinf float32 = float32(math.Inf(1))
-var Default_Defaults_F_Ninf float32 = float32(math.Inf(-1))
-var Default_Defaults_F_Nan float32 = float32(math.NaN())
-
-func (m *Defaults) GetF_Bool() bool {
-	if m != nil && m.F_Bool != nil {
-		return *m.F_Bool
-	}
-	return Default_Defaults_F_Bool
-}
-
-func (m *Defaults) GetF_Int32() int32 {
-	if m != nil && m.F_Int32 != nil {
-		return *m.F_Int32
-	}
-	return Default_Defaults_F_Int32
-}
-
-func (m *Defaults) GetF_Int64() int64 {
-	if m != nil && m.F_Int64 != nil {
-		return *m.F_Int64
-	}
-	return Default_Defaults_F_Int64
-}
-
-func (m *Defaults) GetF_Fixed32() uint32 {
-	if m != nil && m.F_Fixed32 != nil {
-		return *m.F_Fixed32
-	}
-	return Default_Defaults_F_Fixed32
-}
-
-func (m *Defaults) GetF_Fixed64() uint64 {
-	if m != nil && m.F_Fixed64 != nil {
-		return *m.F_Fixed64
-	}
-	return Default_Defaults_F_Fixed64
-}
-
-func (m *Defaults) GetF_Uint32() uint32 {
-	if m != nil && m.F_Uint32 != nil {
-		return *m.F_Uint32
-	}
-	return Default_Defaults_F_Uint32
-}
-
-func (m *Defaults) GetF_Uint64() uint64 {
-	if m != nil && m.F_Uint64 != nil {
-		return *m.F_Uint64
-	}
-	return Default_Defaults_F_Uint64
-}
-
-func (m *Defaults) GetF_Float() float32 {
-	if m != nil && m.F_Float != nil {
-		return *m.F_Float
-	}
-	return Default_Defaults_F_Float
-}
-
-func (m *Defaults) GetF_Double() float64 {
-	if m != nil && m.F_Double != nil {
-		return *m.F_Double
-	}
-	return Default_Defaults_F_Double
-}
-
-func (m *Defaults) GetF_String() string {
-	if m != nil && m.F_String != nil {
-		return *m.F_String
-	}
-	return Default_Defaults_F_String
-}
-
-func (m *Defaults) GetF_Bytes() []byte {
-	if m != nil && m.F_Bytes != nil {
-		return m.F_Bytes
-	}
-	return append([]byte(nil), Default_Defaults_F_Bytes...)
-}
-
-func (m *Defaults) GetF_Sint32() int32 {
-	if m != nil && m.F_Sint32 != nil {
-		return *m.F_Sint32
-	}
-	return Default_Defaults_F_Sint32
-}
-
-func (m *Defaults) GetF_Sint64() int64 {
-	if m != nil && m.F_Sint64 != nil {
-		return *m.F_Sint64
-	}
-	return Default_Defaults_F_Sint64
-}
-
-func (m *Defaults) GetF_Enum() Defaults_Color {
-	if m != nil && m.F_Enum != nil {
-		return *m.F_Enum
-	}
-	return Default_Defaults_F_Enum
-}
-
-func (m *Defaults) GetF_Pinf() float32 {
-	if m != nil && m.F_Pinf != nil {
-		return *m.F_Pinf
-	}
-	return Default_Defaults_F_Pinf
-}
-
-func (m *Defaults) GetF_Ninf() float32 {
-	if m != nil && m.F_Ninf != nil {
-		return *m.F_Ninf
-	}
-	return Default_Defaults_F_Ninf
-}
-
-func (m *Defaults) GetF_Nan() float32 {
-	if m != nil && m.F_Nan != nil {
-		return *m.F_Nan
-	}
-	return Default_Defaults_F_Nan
-}
-
-func (m *Defaults) GetSub() *SubDefaults {
-	if m != nil {
-		return m.Sub
-	}
-	return nil
-}
-
-func (m *Defaults) GetStrZero() string {
-	if m != nil && m.StrZero != nil {
-		return *m.StrZero
-	}
-	return ""
-}
-
-type SubDefaults struct {
-	N                *int64 `protobuf:"varint,1,opt,name=n,def=7" json:"n,omitempty"`
-	XXX_unrecognized []byte `json:"-"`
-}
-
-func (m *SubDefaults) Reset()         { *m = SubDefaults{} }
-func (m *SubDefaults) String() string { return proto.CompactTextString(m) }
-func (*SubDefaults) ProtoMessage()    {}
-
-const Default_SubDefaults_N int64 = 7
-
-func (m *SubDefaults) GetN() int64 {
-	if m != nil && m.N != nil {
-		return *m.N
-	}
-	return Default_SubDefaults_N
-}
-
-type RepeatedEnum struct {
-	Color            []RepeatedEnum_Color `protobuf:"varint,1,rep,name=color,enum=testdata.RepeatedEnum_Color" json:"color,omitempty"`
-	XXX_unrecognized []byte               `json:"-"`
-}
-
-func (m *RepeatedEnum) Reset()         { *m = RepeatedEnum{} }
-func (m *RepeatedEnum) String() string { return proto.CompactTextString(m) }
-func (*RepeatedEnum) ProtoMessage()    {}
-
-func (m *RepeatedEnum) GetColor() []RepeatedEnum_Color {
-	if m != nil {
-		return m.Color
-	}
-	return nil
-}
-
-type MoreRepeated struct {
-	Bools            []bool   `protobuf:"varint,1,rep,name=bools" json:"bools,omitempty"`
-	BoolsPacked      []bool   `protobuf:"varint,2,rep,packed,name=bools_packed" json:"bools_packed,omitempty"`
-	Ints             []int32  `protobuf:"varint,3,rep,name=ints" json:"ints,omitempty"`
-	IntsPacked       []int32  `protobuf:"varint,4,rep,packed,name=ints_packed" json:"ints_packed,omitempty"`
-	Int64SPacked     []int64  `protobuf:"varint,7,rep,packed,name=int64s_packed" json:"int64s_packed,omitempty"`
-	Strings          []string `protobuf:"bytes,5,rep,name=strings" json:"strings,omitempty"`
-	Fixeds           []uint32 `protobuf:"fixed32,6,rep,name=fixeds" json:"fixeds,omitempty"`
-	XXX_unrecognized []byte   `json:"-"`
-}
-
-func (m *MoreRepeated) Reset()         { *m = MoreRepeated{} }
-func (m *MoreRepeated) String() string { return proto.CompactTextString(m) }
-func (*MoreRepeated) ProtoMessage()    {}
-
-func (m *MoreRepeated) GetBools() []bool {
-	if m != nil {
-		return m.Bools
-	}
-	return nil
-}
-
-func (m *MoreRepeated) GetBoolsPacked() []bool {
-	if m != nil {
-		return m.BoolsPacked
-	}
-	return nil
-}
-
-func (m *MoreRepeated) GetInts() []int32 {
-	if m != nil {
-		return m.Ints
-	}
-	return nil
-}
-
-func (m *MoreRepeated) GetIntsPacked() []int32 {
-	if m != nil {
-		return m.IntsPacked
-	}
-	return nil
-}
-
-func (m *MoreRepeated) GetInt64SPacked() []int64 {
-	if m != nil {
-		return m.Int64SPacked
-	}
-	return nil
-}
-
-func (m *MoreRepeated) GetStrings() []string {
-	if m != nil {
-		return m.Strings
-	}
-	return nil
-}
-
-func (m *MoreRepeated) GetFixeds() []uint32 {
-	if m != nil {
-		return m.Fixeds
-	}
-	return nil
-}
-
-type GroupOld struct {
-	G                *GroupOld_G `protobuf:"group,101,opt" json:"g,omitempty"`
-	XXX_unrecognized []byte      `json:"-"`
-}
-
-func (m *GroupOld) Reset()         { *m = GroupOld{} }
-func (m *GroupOld) String() string { return proto.CompactTextString(m) }
-func (*GroupOld) ProtoMessage()    {}
-
-func (m *GroupOld) GetG() *GroupOld_G {
-	if m != nil {
-		return m.G
-	}
-	return nil
-}
-
-type GroupOld_G struct {
-	X                *int32 `protobuf:"varint,2,opt,name=x" json:"x,omitempty"`
-	XXX_unrecognized []byte `json:"-"`
-}
-
-func (m *GroupOld_G) Reset()         { *m = GroupOld_G{} }
-func (m *GroupOld_G) String() string { return proto.CompactTextString(m) }
-func (*GroupOld_G) ProtoMessage()    {}
-
-func (m *GroupOld_G) GetX() int32 {
-	if m != nil && m.X != nil {
-		return *m.X
-	}
-	return 0
-}
-
-type GroupNew struct {
-	G                *GroupNew_G `protobuf:"group,101,opt" json:"g,omitempty"`
-	XXX_unrecognized []byte      `json:"-"`
-}
-
-func (m *GroupNew) Reset()         { *m = GroupNew{} }
-func (m *GroupNew) String() string { return proto.CompactTextString(m) }
-func (*GroupNew) ProtoMessage()    {}
-
-func (m *GroupNew) GetG() *GroupNew_G {
-	if m != nil {
-		return m.G
-	}
-	return nil
-}
-
-type GroupNew_G struct {
-	X                *int32 `protobuf:"varint,2,opt,name=x" json:"x,omitempty"`
-	Y                *int32 `protobuf:"varint,3,opt,name=y" json:"y,omitempty"`
-	XXX_unrecognized []byte `json:"-"`
-}
-
-func (m *GroupNew_G) Reset()         { *m = GroupNew_G{} }
-func (m *GroupNew_G) String() string { return proto.CompactTextString(m) }
-func (*GroupNew_G) ProtoMessage()    {}
-
-func (m *GroupNew_G) GetX() int32 {
-	if m != nil && m.X != nil {
-		return *m.X
-	}
-	return 0
-}
-
-func (m *GroupNew_G) GetY() int32 {
-	if m != nil && m.Y != nil {
-		return *m.Y
-	}
-	return 0
-}
-
-type FloatingPoint struct {
-	F                *float64 `protobuf:"fixed64,1,req,name=f" json:"f,omitempty"`
-	XXX_unrecognized []byte   `json:"-"`
-}
-
-func (m *FloatingPoint) Reset()         { *m = FloatingPoint{} }
-func (m *FloatingPoint) String() string { return proto.CompactTextString(m) }
-func (*FloatingPoint) ProtoMessage()    {}
-
-func (m *FloatingPoint) GetF() float64 {
-	if m != nil && m.F != nil {
-		return *m.F
-	}
-	return 0
-}
-
-type MessageWithMap struct {
-	NameMapping      map[int32]string         `protobuf:"bytes,1,rep,name=name_mapping" json:"name_mapping,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
-	MsgMapping       map[int64]*FloatingPoint `protobuf:"bytes,2,rep,name=msg_mapping" json:"msg_mapping,omitempty" protobuf_key:"zigzag64,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
-	ByteMapping      map[bool][]byte          `protobuf:"bytes,3,rep,name=byte_mapping" json:"byte_mapping,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
-	StrToStr         map[string]string        `protobuf:"bytes,4,rep,name=str_to_str" json:"str_to_str,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
-	XXX_unrecognized []byte                   `json:"-"`
-}
-
-func (m *MessageWithMap) Reset()         { *m = MessageWithMap{} }
-func (m *MessageWithMap) String() string { return proto.CompactTextString(m) }
-func (*MessageWithMap) ProtoMessage()    {}
-
-func (m *MessageWithMap) GetNameMapping() map[int32]string {
-	if m != nil {
-		return m.NameMapping
-	}
-	return nil
-}
-
-func (m *MessageWithMap) GetMsgMapping() map[int64]*FloatingPoint {
-	if m != nil {
-		return m.MsgMapping
-	}
-	return nil
-}
-
-func (m *MessageWithMap) GetByteMapping() map[bool][]byte {
-	if m != nil {
-		return m.ByteMapping
-	}
-	return nil
-}
-
-func (m *MessageWithMap) GetStrToStr() map[string]string {
-	if m != nil {
-		return m.StrToStr
-	}
-	return nil
-}
-
-var E_Greeting = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessage)(nil),
-	ExtensionType: ([]string)(nil),
-	Field:         106,
-	Name:          "testdata.greeting",
-	Tag:           "bytes,106,rep,name=greeting",
-}
-
-var E_NoDefaultDouble = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: (*float64)(nil),
-	Field:         101,
-	Name:          "testdata.no_default_double",
-	Tag:           "fixed64,101,opt,name=no_default_double",
-}
-
-var E_NoDefaultFloat = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: (*float32)(nil),
-	Field:         102,
-	Name:          "testdata.no_default_float",
-	Tag:           "fixed32,102,opt,name=no_default_float",
-}
-
-var E_NoDefaultInt32 = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: (*int32)(nil),
-	Field:         103,
-	Name:          "testdata.no_default_int32",
-	Tag:           "varint,103,opt,name=no_default_int32",
-}
-
-var E_NoDefaultInt64 = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: (*int64)(nil),
-	Field:         104,
-	Name:          "testdata.no_default_int64",
-	Tag:           "varint,104,opt,name=no_default_int64",
-}
-
-var E_NoDefaultUint32 = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: (*uint32)(nil),
-	Field:         105,
-	Name:          "testdata.no_default_uint32",
-	Tag:           "varint,105,opt,name=no_default_uint32",
-}
-
-var E_NoDefaultUint64 = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: (*uint64)(nil),
-	Field:         106,
-	Name:          "testdata.no_default_uint64",
-	Tag:           "varint,106,opt,name=no_default_uint64",
-}
-
-var E_NoDefaultSint32 = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: (*int32)(nil),
-	Field:         107,
-	Name:          "testdata.no_default_sint32",
-	Tag:           "zigzag32,107,opt,name=no_default_sint32",
-}
-
-var E_NoDefaultSint64 = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: (*int64)(nil),
-	Field:         108,
-	Name:          "testdata.no_default_sint64",
-	Tag:           "zigzag64,108,opt,name=no_default_sint64",
-}
-
-var E_NoDefaultFixed32 = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: (*uint32)(nil),
-	Field:         109,
-	Name:          "testdata.no_default_fixed32",
-	Tag:           "fixed32,109,opt,name=no_default_fixed32",
-}
-
-var E_NoDefaultFixed64 = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: (*uint64)(nil),
-	Field:         110,
-	Name:          "testdata.no_default_fixed64",
-	Tag:           "fixed64,110,opt,name=no_default_fixed64",
-}
-
-var E_NoDefaultSfixed32 = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: (*int32)(nil),
-	Field:         111,
-	Name:          "testdata.no_default_sfixed32",
-	Tag:           "fixed32,111,opt,name=no_default_sfixed32",
-}
-
-var E_NoDefaultSfixed64 = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: (*int64)(nil),
-	Field:         112,
-	Name:          "testdata.no_default_sfixed64",
-	Tag:           "fixed64,112,opt,name=no_default_sfixed64",
-}
-
-var E_NoDefaultBool = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: (*bool)(nil),
-	Field:         113,
-	Name:          "testdata.no_default_bool",
-	Tag:           "varint,113,opt,name=no_default_bool",
-}
-
-var E_NoDefaultString = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: (*string)(nil),
-	Field:         114,
-	Name:          "testdata.no_default_string",
-	Tag:           "bytes,114,opt,name=no_default_string",
-}
-
-var E_NoDefaultBytes = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: ([]byte)(nil),
-	Field:         115,
-	Name:          "testdata.no_default_bytes",
-	Tag:           "bytes,115,opt,name=no_default_bytes",
-}
-
-var E_NoDefaultEnum = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: (*DefaultsMessage_DefaultsEnum)(nil),
-	Field:         116,
-	Name:          "testdata.no_default_enum",
-	Tag:           "varint,116,opt,name=no_default_enum,enum=testdata.DefaultsMessage_DefaultsEnum",
-}
-
-var E_DefaultDouble = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: (*float64)(nil),
-	Field:         201,
-	Name:          "testdata.default_double",
-	Tag:           "fixed64,201,opt,name=default_double,def=3.1415",
-}
-
-var E_DefaultFloat = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: (*float32)(nil),
-	Field:         202,
-	Name:          "testdata.default_float",
-	Tag:           "fixed32,202,opt,name=default_float,def=3.14",
-}
-
-var E_DefaultInt32 = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: (*int32)(nil),
-	Field:         203,
-	Name:          "testdata.default_int32",
-	Tag:           "varint,203,opt,name=default_int32,def=42",
-}
-
-var E_DefaultInt64 = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: (*int64)(nil),
-	Field:         204,
-	Name:          "testdata.default_int64",
-	Tag:           "varint,204,opt,name=default_int64,def=43",
-}
-
-var E_DefaultUint32 = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: (*uint32)(nil),
-	Field:         205,
-	Name:          "testdata.default_uint32",
-	Tag:           "varint,205,opt,name=default_uint32,def=44",
-}
-
-var E_DefaultUint64 = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: (*uint64)(nil),
-	Field:         206,
-	Name:          "testdata.default_uint64",
-	Tag:           "varint,206,opt,name=default_uint64,def=45",
-}
-
-var E_DefaultSint32 = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: (*int32)(nil),
-	Field:         207,
-	Name:          "testdata.default_sint32",
-	Tag:           "zigzag32,207,opt,name=default_sint32,def=46",
-}
-
-var E_DefaultSint64 = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: (*int64)(nil),
-	Field:         208,
-	Name:          "testdata.default_sint64",
-	Tag:           "zigzag64,208,opt,name=default_sint64,def=47",
-}
-
-var E_DefaultFixed32 = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: (*uint32)(nil),
-	Field:         209,
-	Name:          "testdata.default_fixed32",
-	Tag:           "fixed32,209,opt,name=default_fixed32,def=48",
-}
-
-var E_DefaultFixed64 = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: (*uint64)(nil),
-	Field:         210,
-	Name:          "testdata.default_fixed64",
-	Tag:           "fixed64,210,opt,name=default_fixed64,def=49",
-}
-
-var E_DefaultSfixed32 = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: (*int32)(nil),
-	Field:         211,
-	Name:          "testdata.default_sfixed32",
-	Tag:           "fixed32,211,opt,name=default_sfixed32,def=50",
-}
-
-var E_DefaultSfixed64 = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: (*int64)(nil),
-	Field:         212,
-	Name:          "testdata.default_sfixed64",
-	Tag:           "fixed64,212,opt,name=default_sfixed64,def=51",
-}
-
-var E_DefaultBool = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: (*bool)(nil),
-	Field:         213,
-	Name:          "testdata.default_bool",
-	Tag:           "varint,213,opt,name=default_bool,def=1",
-}
-
-var E_DefaultString = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: (*string)(nil),
-	Field:         214,
-	Name:          "testdata.default_string",
-	Tag:           "bytes,214,opt,name=default_string,def=Hello, string",
-}
-
-var E_DefaultBytes = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: ([]byte)(nil),
-	Field:         215,
-	Name:          "testdata.default_bytes",
-	Tag:           "bytes,215,opt,name=default_bytes,def=Hello, bytes",
-}
-
-var E_DefaultEnum = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: (*DefaultsMessage_DefaultsEnum)(nil),
-	Field:         216,
-	Name:          "testdata.default_enum",
-	Tag:           "varint,216,opt,name=default_enum,enum=testdata.DefaultsMessage_DefaultsEnum,def=1",
-}
-
-var E_X201 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         201,
-	Name:          "testdata.x201",
-	Tag:           "bytes,201,opt,name=x201",
-}
-
-var E_X202 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         202,
-	Name:          "testdata.x202",
-	Tag:           "bytes,202,opt,name=x202",
-}
-
-var E_X203 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         203,
-	Name:          "testdata.x203",
-	Tag:           "bytes,203,opt,name=x203",
-}
-
-var E_X204 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         204,
-	Name:          "testdata.x204",
-	Tag:           "bytes,204,opt,name=x204",
-}
-
-var E_X205 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         205,
-	Name:          "testdata.x205",
-	Tag:           "bytes,205,opt,name=x205",
-}
-
-var E_X206 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         206,
-	Name:          "testdata.x206",
-	Tag:           "bytes,206,opt,name=x206",
-}
-
-var E_X207 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         207,
-	Name:          "testdata.x207",
-	Tag:           "bytes,207,opt,name=x207",
-}
-
-var E_X208 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         208,
-	Name:          "testdata.x208",
-	Tag:           "bytes,208,opt,name=x208",
-}
-
-var E_X209 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         209,
-	Name:          "testdata.x209",
-	Tag:           "bytes,209,opt,name=x209",
-}
-
-var E_X210 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         210,
-	Name:          "testdata.x210",
-	Tag:           "bytes,210,opt,name=x210",
-}
-
-var E_X211 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         211,
-	Name:          "testdata.x211",
-	Tag:           "bytes,211,opt,name=x211",
-}
-
-var E_X212 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         212,
-	Name:          "testdata.x212",
-	Tag:           "bytes,212,opt,name=x212",
-}
-
-var E_X213 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         213,
-	Name:          "testdata.x213",
-	Tag:           "bytes,213,opt,name=x213",
-}
-
-var E_X214 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         214,
-	Name:          "testdata.x214",
-	Tag:           "bytes,214,opt,name=x214",
-}
-
-var E_X215 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         215,
-	Name:          "testdata.x215",
-	Tag:           "bytes,215,opt,name=x215",
-}
-
-var E_X216 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         216,
-	Name:          "testdata.x216",
-	Tag:           "bytes,216,opt,name=x216",
-}
-
-var E_X217 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         217,
-	Name:          "testdata.x217",
-	Tag:           "bytes,217,opt,name=x217",
-}
-
-var E_X218 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         218,
-	Name:          "testdata.x218",
-	Tag:           "bytes,218,opt,name=x218",
-}
-
-var E_X219 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         219,
-	Name:          "testdata.x219",
-	Tag:           "bytes,219,opt,name=x219",
-}
-
-var E_X220 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         220,
-	Name:          "testdata.x220",
-	Tag:           "bytes,220,opt,name=x220",
-}
-
-var E_X221 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         221,
-	Name:          "testdata.x221",
-	Tag:           "bytes,221,opt,name=x221",
-}
-
-var E_X222 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         222,
-	Name:          "testdata.x222",
-	Tag:           "bytes,222,opt,name=x222",
-}
-
-var E_X223 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         223,
-	Name:          "testdata.x223",
-	Tag:           "bytes,223,opt,name=x223",
-}
-
-var E_X224 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         224,
-	Name:          "testdata.x224",
-	Tag:           "bytes,224,opt,name=x224",
-}
-
-var E_X225 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         225,
-	Name:          "testdata.x225",
-	Tag:           "bytes,225,opt,name=x225",
-}
-
-var E_X226 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         226,
-	Name:          "testdata.x226",
-	Tag:           "bytes,226,opt,name=x226",
-}
-
-var E_X227 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         227,
-	Name:          "testdata.x227",
-	Tag:           "bytes,227,opt,name=x227",
-}
-
-var E_X228 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         228,
-	Name:          "testdata.x228",
-	Tag:           "bytes,228,opt,name=x228",
-}
-
-var E_X229 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         229,
-	Name:          "testdata.x229",
-	Tag:           "bytes,229,opt,name=x229",
-}
-
-var E_X230 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         230,
-	Name:          "testdata.x230",
-	Tag:           "bytes,230,opt,name=x230",
-}
-
-var E_X231 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         231,
-	Name:          "testdata.x231",
-	Tag:           "bytes,231,opt,name=x231",
-}
-
-var E_X232 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         232,
-	Name:          "testdata.x232",
-	Tag:           "bytes,232,opt,name=x232",
-}
-
-var E_X233 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         233,
-	Name:          "testdata.x233",
-	Tag:           "bytes,233,opt,name=x233",
-}
-
-var E_X234 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         234,
-	Name:          "testdata.x234",
-	Tag:           "bytes,234,opt,name=x234",
-}
-
-var E_X235 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         235,
-	Name:          "testdata.x235",
-	Tag:           "bytes,235,opt,name=x235",
-}
-
-var E_X236 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         236,
-	Name:          "testdata.x236",
-	Tag:           "bytes,236,opt,name=x236",
-}
-
-var E_X237 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         237,
-	Name:          "testdata.x237",
-	Tag:           "bytes,237,opt,name=x237",
-}
-
-var E_X238 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         238,
-	Name:          "testdata.x238",
-	Tag:           "bytes,238,opt,name=x238",
-}
-
-var E_X239 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         239,
-	Name:          "testdata.x239",
-	Tag:           "bytes,239,opt,name=x239",
-}
-
-var E_X240 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         240,
-	Name:          "testdata.x240",
-	Tag:           "bytes,240,opt,name=x240",
-}
-
-var E_X241 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         241,
-	Name:          "testdata.x241",
-	Tag:           "bytes,241,opt,name=x241",
-}
-
-var E_X242 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         242,
-	Name:          "testdata.x242",
-	Tag:           "bytes,242,opt,name=x242",
-}
-
-var E_X243 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         243,
-	Name:          "testdata.x243",
-	Tag:           "bytes,243,opt,name=x243",
-}
-
-var E_X244 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         244,
-	Name:          "testdata.x244",
-	Tag:           "bytes,244,opt,name=x244",
-}
-
-var E_X245 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         245,
-	Name:          "testdata.x245",
-	Tag:           "bytes,245,opt,name=x245",
-}
-
-var E_X246 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         246,
-	Name:          "testdata.x246",
-	Tag:           "bytes,246,opt,name=x246",
-}
-
-var E_X247 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         247,
-	Name:          "testdata.x247",
-	Tag:           "bytes,247,opt,name=x247",
-}
-
-var E_X248 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         248,
-	Name:          "testdata.x248",
-	Tag:           "bytes,248,opt,name=x248",
-}
-
-var E_X249 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         249,
-	Name:          "testdata.x249",
-	Tag:           "bytes,249,opt,name=x249",
-}
-
-var E_X250 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         250,
-	Name:          "testdata.x250",
-	Tag:           "bytes,250,opt,name=x250",
-}
-
-func init() {
-	proto.RegisterEnum("testdata.FOO", FOO_name, FOO_value)
-	proto.RegisterEnum("testdata.GoTest_KIND", GoTest_KIND_name, GoTest_KIND_value)
-	proto.RegisterEnum("testdata.MyMessage_Color", MyMessage_Color_name, MyMessage_Color_value)
-	proto.RegisterEnum("testdata.DefaultsMessage_DefaultsEnum", DefaultsMessage_DefaultsEnum_name, DefaultsMessage_DefaultsEnum_value)
-	proto.RegisterEnum("testdata.Defaults_Color", Defaults_Color_name, Defaults_Color_value)
-	proto.RegisterEnum("testdata.RepeatedEnum_Color", RepeatedEnum_Color_name, RepeatedEnum_Color_value)
-	proto.RegisterExtension(E_Ext_More)
-	proto.RegisterExtension(E_Ext_Text)
-	proto.RegisterExtension(E_Ext_Number)
-	proto.RegisterExtension(E_Greeting)
-	proto.RegisterExtension(E_NoDefaultDouble)
-	proto.RegisterExtension(E_NoDefaultFloat)
-	proto.RegisterExtension(E_NoDefaultInt32)
-	proto.RegisterExtension(E_NoDefaultInt64)
-	proto.RegisterExtension(E_NoDefaultUint32)
-	proto.RegisterExtension(E_NoDefaultUint64)
-	proto.RegisterExtension(E_NoDefaultSint32)
-	proto.RegisterExtension(E_NoDefaultSint64)
-	proto.RegisterExtension(E_NoDefaultFixed32)
-	proto.RegisterExtension(E_NoDefaultFixed64)
-	proto.RegisterExtension(E_NoDefaultSfixed32)
-	proto.RegisterExtension(E_NoDefaultSfixed64)
-	proto.RegisterExtension(E_NoDefaultBool)
-	proto.RegisterExtension(E_NoDefaultString)
-	proto.RegisterExtension(E_NoDefaultBytes)
-	proto.RegisterExtension(E_NoDefaultEnum)
-	proto.RegisterExtension(E_DefaultDouble)
-	proto.RegisterExtension(E_DefaultFloat)
-	proto.RegisterExtension(E_DefaultInt32)
-	proto.RegisterExtension(E_DefaultInt64)
-	proto.RegisterExtension(E_DefaultUint32)
-	proto.RegisterExtension(E_DefaultUint64)
-	proto.RegisterExtension(E_DefaultSint32)
-	proto.RegisterExtension(E_DefaultSint64)
-	proto.RegisterExtension(E_DefaultFixed32)
-	proto.RegisterExtension(E_DefaultFixed64)
-	proto.RegisterExtension(E_DefaultSfixed32)
-	proto.RegisterExtension(E_DefaultSfixed64)
-	proto.RegisterExtension(E_DefaultBool)
-	proto.RegisterExtension(E_DefaultString)
-	proto.RegisterExtension(E_DefaultBytes)
-	proto.RegisterExtension(E_DefaultEnum)
-	proto.RegisterExtension(E_X201)
-	proto.RegisterExtension(E_X202)
-	proto.RegisterExtension(E_X203)
-	proto.RegisterExtension(E_X204)
-	proto.RegisterExtension(E_X205)
-	proto.RegisterExtension(E_X206)
-	proto.RegisterExtension(E_X207)
-	proto.RegisterExtension(E_X208)
-	proto.RegisterExtension(E_X209)
-	proto.RegisterExtension(E_X210)
-	proto.RegisterExtension(E_X211)
-	proto.RegisterExtension(E_X212)
-	proto.RegisterExtension(E_X213)
-	proto.RegisterExtension(E_X214)
-	proto.RegisterExtension(E_X215)
-	proto.RegisterExtension(E_X216)
-	proto.RegisterExtension(E_X217)
-	proto.RegisterExtension(E_X218)
-	proto.RegisterExtension(E_X219)
-	proto.RegisterExtension(E_X220)
-	proto.RegisterExtension(E_X221)
-	proto.RegisterExtension(E_X222)
-	proto.RegisterExtension(E_X223)
-	proto.RegisterExtension(E_X224)
-	proto.RegisterExtension(E_X225)
-	proto.RegisterExtension(E_X226)
-	proto.RegisterExtension(E_X227)
-	proto.RegisterExtension(E_X228)
-	proto.RegisterExtension(E_X229)
-	proto.RegisterExtension(E_X230)
-	proto.RegisterExtension(E_X231)
-	proto.RegisterExtension(E_X232)
-	proto.RegisterExtension(E_X233)
-	proto.RegisterExtension(E_X234)
-	proto.RegisterExtension(E_X235)
-	proto.RegisterExtension(E_X236)
-	proto.RegisterExtension(E_X237)
-	proto.RegisterExtension(E_X238)
-	proto.RegisterExtension(E_X239)
-	proto.RegisterExtension(E_X240)
-	proto.RegisterExtension(E_X241)
-	proto.RegisterExtension(E_X242)
-	proto.RegisterExtension(E_X243)
-	proto.RegisterExtension(E_X244)
-	proto.RegisterExtension(E_X245)
-	proto.RegisterExtension(E_X246)
-	proto.RegisterExtension(E_X247)
-	proto.RegisterExtension(E_X248)
-	proto.RegisterExtension(E_X249)
-	proto.RegisterExtension(E_X250)
-}
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/testdata/test.pb.go.golden b/Godeps/_workspace/src/github.com/gogo/protobuf/proto/testdata/test.pb.go.golden
deleted file mode 100644
index 0387853d5..000000000
--- a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/testdata/test.pb.go.golden
+++ /dev/null
@@ -1,1737 +0,0 @@
-// Code generated by protoc-gen-gogo.
-// source: test.proto
-// DO NOT EDIT!
-
-package testdata
-
-import proto "github.com/gogo/protobuf/proto"
-import json "encoding/json"
-import math "math"
-
-import ()
-
-// Reference proto, json, and math imports to suppress error if they are not otherwise used.
-var _ = proto.Marshal
-var _ = &json.SyntaxError{}
-var _ = math.Inf
-
-type FOO int32
-
-const (
-	FOO_FOO1 FOO = 1
-)
-
-var FOO_name = map[int32]string{
-	1: "FOO1",
-}
-var FOO_value = map[string]int32{
-	"FOO1": 1,
-}
-
-func (x FOO) Enum() *FOO {
-	p := new(FOO)
-	*p = x
-	return p
-}
-func (x FOO) String() string {
-	return proto.EnumName(FOO_name, int32(x))
-}
-func (x FOO) MarshalJSON() ([]byte, error) {
-	return json.Marshal(x.String())
-}
-func (x *FOO) UnmarshalJSON(data []byte) error {
-	value, err := proto.UnmarshalJSONEnum(FOO_value, data, "FOO")
-	if err != nil {
-		return err
-	}
-	*x = FOO(value)
-	return nil
-}
-
-type GoTest_KIND int32
-
-const (
-	GoTest_VOID        GoTest_KIND = 0
-	GoTest_BOOL        GoTest_KIND = 1
-	GoTest_BYTES       GoTest_KIND = 2
-	GoTest_FINGERPRINT GoTest_KIND = 3
-	GoTest_FLOAT       GoTest_KIND = 4
-	GoTest_INT         GoTest_KIND = 5
-	GoTest_STRING      GoTest_KIND = 6
-	GoTest_TIME        GoTest_KIND = 7
-	GoTest_TUPLE       GoTest_KIND = 8
-	GoTest_ARRAY       GoTest_KIND = 9
-	GoTest_MAP         GoTest_KIND = 10
-	GoTest_TABLE       GoTest_KIND = 11
-	GoTest_FUNCTION    GoTest_KIND = 12
-)
-
-var GoTest_KIND_name = map[int32]string{
-	0:  "VOID",
-	1:  "BOOL",
-	2:  "BYTES",
-	3:  "FINGERPRINT",
-	4:  "FLOAT",
-	5:  "INT",
-	6:  "STRING",
-	7:  "TIME",
-	8:  "TUPLE",
-	9:  "ARRAY",
-	10: "MAP",
-	11: "TABLE",
-	12: "FUNCTION",
-}
-var GoTest_KIND_value = map[string]int32{
-	"VOID":        0,
-	"BOOL":        1,
-	"BYTES":       2,
-	"FINGERPRINT": 3,
-	"FLOAT":       4,
-	"INT":         5,
-	"STRING":      6,
-	"TIME":        7,
-	"TUPLE":       8,
-	"ARRAY":       9,
-	"MAP":         10,
-	"TABLE":       11,
-	"FUNCTION":    12,
-}
-
-func (x GoTest_KIND) Enum() *GoTest_KIND {
-	p := new(GoTest_KIND)
-	*p = x
-	return p
-}
-func (x GoTest_KIND) String() string {
-	return proto.EnumName(GoTest_KIND_name, int32(x))
-}
-func (x GoTest_KIND) MarshalJSON() ([]byte, error) {
-	return json.Marshal(x.String())
-}
-func (x *GoTest_KIND) UnmarshalJSON(data []byte) error {
-	value, err := proto.UnmarshalJSONEnum(GoTest_KIND_value, data, "GoTest_KIND")
-	if err != nil {
-		return err
-	}
-	*x = GoTest_KIND(value)
-	return nil
-}
-
-type MyMessage_Color int32
-
-const (
-	MyMessage_RED   MyMessage_Color = 0
-	MyMessage_GREEN MyMessage_Color = 1
-	MyMessage_BLUE  MyMessage_Color = 2
-)
-
-var MyMessage_Color_name = map[int32]string{
-	0: "RED",
-	1: "GREEN",
-	2: "BLUE",
-}
-var MyMessage_Color_value = map[string]int32{
-	"RED":   0,
-	"GREEN": 1,
-	"BLUE":  2,
-}
-
-func (x MyMessage_Color) Enum() *MyMessage_Color {
-	p := new(MyMessage_Color)
-	*p = x
-	return p
-}
-func (x MyMessage_Color) String() string {
-	return proto.EnumName(MyMessage_Color_name, int32(x))
-}
-func (x MyMessage_Color) MarshalJSON() ([]byte, error) {
-	return json.Marshal(x.String())
-}
-func (x *MyMessage_Color) UnmarshalJSON(data []byte) error {
-	value, err := proto.UnmarshalJSONEnum(MyMessage_Color_value, data, "MyMessage_Color")
-	if err != nil {
-		return err
-	}
-	*x = MyMessage_Color(value)
-	return nil
-}
-
-type Defaults_Color int32
-
-const (
-	Defaults_RED   Defaults_Color = 0
-	Defaults_GREEN Defaults_Color = 1
-	Defaults_BLUE  Defaults_Color = 2
-)
-
-var Defaults_Color_name = map[int32]string{
-	0: "RED",
-	1: "GREEN",
-	2: "BLUE",
-}
-var Defaults_Color_value = map[string]int32{
-	"RED":   0,
-	"GREEN": 1,
-	"BLUE":  2,
-}
-
-func (x Defaults_Color) Enum() *Defaults_Color {
-	p := new(Defaults_Color)
-	*p = x
-	return p
-}
-func (x Defaults_Color) String() string {
-	return proto.EnumName(Defaults_Color_name, int32(x))
-}
-func (x Defaults_Color) MarshalJSON() ([]byte, error) {
-	return json.Marshal(x.String())
-}
-func (x *Defaults_Color) UnmarshalJSON(data []byte) error {
-	value, err := proto.UnmarshalJSONEnum(Defaults_Color_value, data, "Defaults_Color")
-	if err != nil {
-		return err
-	}
-	*x = Defaults_Color(value)
-	return nil
-}
-
-type RepeatedEnum_Color int32
-
-const (
-	RepeatedEnum_RED RepeatedEnum_Color = 1
-)
-
-var RepeatedEnum_Color_name = map[int32]string{
-	1: "RED",
-}
-var RepeatedEnum_Color_value = map[string]int32{
-	"RED": 1,
-}
-
-func (x RepeatedEnum_Color) Enum() *RepeatedEnum_Color {
-	p := new(RepeatedEnum_Color)
-	*p = x
-	return p
-}
-func (x RepeatedEnum_Color) String() string {
-	return proto.EnumName(RepeatedEnum_Color_name, int32(x))
-}
-func (x RepeatedEnum_Color) MarshalJSON() ([]byte, error) {
-	return json.Marshal(x.String())
-}
-func (x *RepeatedEnum_Color) UnmarshalJSON(data []byte) error {
-	value, err := proto.UnmarshalJSONEnum(RepeatedEnum_Color_value, data, "RepeatedEnum_Color")
-	if err != nil {
-		return err
-	}
-	*x = RepeatedEnum_Color(value)
-	return nil
-}
-
-type GoEnum struct {
-	Foo              *FOO   `protobuf:"varint,1,req,name=foo,enum=testdata.FOO" json:"foo,omitempty"`
-	XXX_unrecognized []byte `json:"-"`
-}
-
-func (m *GoEnum) Reset()         { *m = GoEnum{} }
-func (m *GoEnum) String() string { return proto.CompactTextString(m) }
-func (*GoEnum) ProtoMessage()    {}
-
-func (m *GoEnum) GetFoo() FOO {
-	if m != nil && m.Foo != nil {
-		return *m.Foo
-	}
-	return 0
-}
-
-type GoTestField struct {
-	Label            *string `protobuf:"bytes,1,req" json:"Label,omitempty"`
-	Type             *string `protobuf:"bytes,2,req" json:"Type,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *GoTestField) Reset()         { *m = GoTestField{} }
-func (m *GoTestField) String() string { return proto.CompactTextString(m) }
-func (*GoTestField) ProtoMessage()    {}
-
-func (m *GoTestField) GetLabel() string {
-	if m != nil && m.Label != nil {
-		return *m.Label
-	}
-	return ""
-}
-
-func (m *GoTestField) GetType() string {
-	if m != nil && m.Type != nil {
-		return *m.Type
-	}
-	return ""
-}
-
-type GoTest struct {
-	Kind                    *GoTest_KIND            `protobuf:"varint,1,req,enum=testdata.GoTest_KIND" json:"Kind,omitempty"`
-	Table                   *string                 `protobuf:"bytes,2,opt" json:"Table,omitempty"`
-	Param                   *int32                  `protobuf:"varint,3,opt" json:"Param,omitempty"`
-	RequiredField           *GoTestField            `protobuf:"bytes,4,req" json:"RequiredField,omitempty"`
-	RepeatedField           []*GoTestField          `protobuf:"bytes,5,rep" json:"RepeatedField,omitempty"`
-	OptionalField           *GoTestField            `protobuf:"bytes,6,opt" json:"OptionalField,omitempty"`
-	F_BoolRequired          *bool                   `protobuf:"varint,10,req,name=F_Bool_required" json:"F_Bool_required,omitempty"`
-	F_Int32Required         *int32                  `protobuf:"varint,11,req,name=F_Int32_required" json:"F_Int32_required,omitempty"`
-	F_Int64Required         *int64                  `protobuf:"varint,12,req,name=F_Int64_required" json:"F_Int64_required,omitempty"`
-	F_Fixed32Required       *uint32                 `protobuf:"fixed32,13,req,name=F_Fixed32_required" json:"F_Fixed32_required,omitempty"`
-	F_Fixed64Required       *uint64                 `protobuf:"fixed64,14,req,name=F_Fixed64_required" json:"F_Fixed64_required,omitempty"`
-	F_Uint32Required        *uint32                 `protobuf:"varint,15,req,name=F_Uint32_required" json:"F_Uint32_required,omitempty"`
-	F_Uint64Required        *uint64                 `protobuf:"varint,16,req,name=F_Uint64_required" json:"F_Uint64_required,omitempty"`
-	F_FloatRequired         *float32                `protobuf:"fixed32,17,req,name=F_Float_required" json:"F_Float_required,omitempty"`
-	F_DoubleRequired        *float64                `protobuf:"fixed64,18,req,name=F_Double_required" json:"F_Double_required,omitempty"`
-	F_StringRequired        *string                 `protobuf:"bytes,19,req,name=F_String_required" json:"F_String_required,omitempty"`
-	F_BytesRequired         []byte                  `protobuf:"bytes,101,req,name=F_Bytes_required" json:"F_Bytes_required,omitempty"`
-	F_Sint32Required        *int32                  `protobuf:"zigzag32,102,req,name=F_Sint32_required" json:"F_Sint32_required,omitempty"`
-	F_Sint64Required        *int64                  `protobuf:"zigzag64,103,req,name=F_Sint64_required" json:"F_Sint64_required,omitempty"`
-	F_BoolRepeated          []bool                  `protobuf:"varint,20,rep,name=F_Bool_repeated" json:"F_Bool_repeated,omitempty"`
-	F_Int32Repeated         []int32                 `protobuf:"varint,21,rep,name=F_Int32_repeated" json:"F_Int32_repeated,omitempty"`
-	F_Int64Repeated         []int64                 `protobuf:"varint,22,rep,name=F_Int64_repeated" json:"F_Int64_repeated,omitempty"`
-	F_Fixed32Repeated       []uint32                `protobuf:"fixed32,23,rep,name=F_Fixed32_repeated" json:"F_Fixed32_repeated,omitempty"`
-	F_Fixed64Repeated       []uint64                `protobuf:"fixed64,24,rep,name=F_Fixed64_repeated" json:"F_Fixed64_repeated,omitempty"`
-	F_Uint32Repeated        []uint32                `protobuf:"varint,25,rep,name=F_Uint32_repeated" json:"F_Uint32_repeated,omitempty"`
-	F_Uint64Repeated        []uint64                `protobuf:"varint,26,rep,name=F_Uint64_repeated" json:"F_Uint64_repeated,omitempty"`
-	F_FloatRepeated         []float32               `protobuf:"fixed32,27,rep,name=F_Float_repeated" json:"F_Float_repeated,omitempty"`
-	F_DoubleRepeated        []float64               `protobuf:"fixed64,28,rep,name=F_Double_repeated" json:"F_Double_repeated,omitempty"`
-	F_StringRepeated        []string                `protobuf:"bytes,29,rep,name=F_String_repeated" json:"F_String_repeated,omitempty"`
-	F_BytesRepeated         [][]byte                `protobuf:"bytes,201,rep,name=F_Bytes_repeated" json:"F_Bytes_repeated,omitempty"`
-	F_Sint32Repeated        []int32                 `protobuf:"zigzag32,202,rep,name=F_Sint32_repeated" json:"F_Sint32_repeated,omitempty"`
-	F_Sint64Repeated        []int64                 `protobuf:"zigzag64,203,rep,name=F_Sint64_repeated" json:"F_Sint64_repeated,omitempty"`
-	F_BoolOptional          *bool                   `protobuf:"varint,30,opt,name=F_Bool_optional" json:"F_Bool_optional,omitempty"`
-	F_Int32Optional         *int32                  `protobuf:"varint,31,opt,name=F_Int32_optional" json:"F_Int32_optional,omitempty"`
-	F_Int64Optional         *int64                  `protobuf:"varint,32,opt,name=F_Int64_optional" json:"F_Int64_optional,omitempty"`
-	F_Fixed32Optional       *uint32                 `protobuf:"fixed32,33,opt,name=F_Fixed32_optional" json:"F_Fixed32_optional,omitempty"`
-	F_Fixed64Optional       *uint64                 `protobuf:"fixed64,34,opt,name=F_Fixed64_optional" json:"F_Fixed64_optional,omitempty"`
-	F_Uint32Optional        *uint32                 `protobuf:"varint,35,opt,name=F_Uint32_optional" json:"F_Uint32_optional,omitempty"`
-	F_Uint64Optional        *uint64                 `protobuf:"varint,36,opt,name=F_Uint64_optional" json:"F_Uint64_optional,omitempty"`
-	F_FloatOptional         *float32                `protobuf:"fixed32,37,opt,name=F_Float_optional" json:"F_Float_optional,omitempty"`
-	F_DoubleOptional        *float64                `protobuf:"fixed64,38,opt,name=F_Double_optional" json:"F_Double_optional,omitempty"`
-	F_StringOptional        *string                 `protobuf:"bytes,39,opt,name=F_String_optional" json:"F_String_optional,omitempty"`
-	F_BytesOptional         []byte                  `protobuf:"bytes,301,opt,name=F_Bytes_optional" json:"F_Bytes_optional,omitempty"`
-	F_Sint32Optional        *int32                  `protobuf:"zigzag32,302,opt,name=F_Sint32_optional" json:"F_Sint32_optional,omitempty"`
-	F_Sint64Optional        *int64                  `protobuf:"zigzag64,303,opt,name=F_Sint64_optional" json:"F_Sint64_optional,omitempty"`
-	F_BoolDefaulted         *bool                   `protobuf:"varint,40,opt,name=F_Bool_defaulted,def=1" json:"F_Bool_defaulted,omitempty"`
-	F_Int32Defaulted        *int32                  `protobuf:"varint,41,opt,name=F_Int32_defaulted,def=32" json:"F_Int32_defaulted,omitempty"`
-	F_Int64Defaulted        *int64                  `protobuf:"varint,42,opt,name=F_Int64_defaulted,def=64" json:"F_Int64_defaulted,omitempty"`
-	F_Fixed32Defaulted      *uint32                 `protobuf:"fixed32,43,opt,name=F_Fixed32_defaulted,def=320" json:"F_Fixed32_defaulted,omitempty"`
-	F_Fixed64Defaulted      *uint64                 `protobuf:"fixed64,44,opt,name=F_Fixed64_defaulted,def=640" json:"F_Fixed64_defaulted,omitempty"`
-	F_Uint32Defaulted       *uint32                 `protobuf:"varint,45,opt,name=F_Uint32_defaulted,def=3200" json:"F_Uint32_defaulted,omitempty"`
-	F_Uint64Defaulted       *uint64                 `protobuf:"varint,46,opt,name=F_Uint64_defaulted,def=6400" json:"F_Uint64_defaulted,omitempty"`
-	F_FloatDefaulted        *float32                `protobuf:"fixed32,47,opt,name=F_Float_defaulted,def=314159" json:"F_Float_defaulted,omitempty"`
-	F_DoubleDefaulted       *float64                `protobuf:"fixed64,48,opt,name=F_Double_defaulted,def=271828" json:"F_Double_defaulted,omitempty"`
-	F_StringDefaulted       *string                 `protobuf:"bytes,49,opt,name=F_String_defaulted,def=hello, \"world!\"\n" json:"F_String_defaulted,omitempty"`
-	F_BytesDefaulted        []byte                  `protobuf:"bytes,401,opt,name=F_Bytes_defaulted,def=Bignose" json:"F_Bytes_defaulted,omitempty"`
-	F_Sint32Defaulted       *int32                  `protobuf:"zigzag32,402,opt,name=F_Sint32_defaulted,def=-32" json:"F_Sint32_defaulted,omitempty"`
-	F_Sint64Defaulted       *int64                  `protobuf:"zigzag64,403,opt,name=F_Sint64_defaulted,def=-64" json:"F_Sint64_defaulted,omitempty"`
-	F_BoolRepeatedPacked    []bool                  `protobuf:"varint,50,rep,packed,name=F_Bool_repeated_packed" json:"F_Bool_repeated_packed,omitempty"`
-	F_Int32RepeatedPacked   []int32                 `protobuf:"varint,51,rep,packed,name=F_Int32_repeated_packed" json:"F_Int32_repeated_packed,omitempty"`
-	F_Int64RepeatedPacked   []int64                 `protobuf:"varint,52,rep,packed,name=F_Int64_repeated_packed" json:"F_Int64_repeated_packed,omitempty"`
-	F_Fixed32RepeatedPacked []uint32                `protobuf:"fixed32,53,rep,packed,name=F_Fixed32_repeated_packed" json:"F_Fixed32_repeated_packed,omitempty"`
-	F_Fixed64RepeatedPacked []uint64                `protobuf:"fixed64,54,rep,packed,name=F_Fixed64_repeated_packed" json:"F_Fixed64_repeated_packed,omitempty"`
-	F_Uint32RepeatedPacked  []uint32                `protobuf:"varint,55,rep,packed,name=F_Uint32_repeated_packed" json:"F_Uint32_repeated_packed,omitempty"`
-	F_Uint64RepeatedPacked  []uint64                `protobuf:"varint,56,rep,packed,name=F_Uint64_repeated_packed" json:"F_Uint64_repeated_packed,omitempty"`
-	F_FloatRepeatedPacked   []float32               `protobuf:"fixed32,57,rep,packed,name=F_Float_repeated_packed" json:"F_Float_repeated_packed,omitempty"`
-	F_DoubleRepeatedPacked  []float64               `protobuf:"fixed64,58,rep,packed,name=F_Double_repeated_packed" json:"F_Double_repeated_packed,omitempty"`
-	F_Sint32RepeatedPacked  []int32                 `protobuf:"zigzag32,502,rep,packed,name=F_Sint32_repeated_packed" json:"F_Sint32_repeated_packed,omitempty"`
-	F_Sint64RepeatedPacked  []int64                 `protobuf:"zigzag64,503,rep,packed,name=F_Sint64_repeated_packed" json:"F_Sint64_repeated_packed,omitempty"`
-	Requiredgroup           *GoTest_RequiredGroup   `protobuf:"group,70,req,name=RequiredGroup" json:"requiredgroup,omitempty"`
-	Repeatedgroup           []*GoTest_RepeatedGroup `protobuf:"group,80,rep,name=RepeatedGroup" json:"repeatedgroup,omitempty"`
-	Optionalgroup           *GoTest_OptionalGroup   `protobuf:"group,90,opt,name=OptionalGroup" json:"optionalgroup,omitempty"`
-	XXX_unrecognized        []byte                  `json:"-"`
-}
-
-func (m *GoTest) Reset()         { *m = GoTest{} }
-func (m *GoTest) String() string { return proto.CompactTextString(m) }
-func (*GoTest) ProtoMessage()    {}
-
-const Default_GoTest_F_BoolDefaulted bool = true
-const Default_GoTest_F_Int32Defaulted int32 = 32
-const Default_GoTest_F_Int64Defaulted int64 = 64
-const Default_GoTest_F_Fixed32Defaulted uint32 = 320
-const Default_GoTest_F_Fixed64Defaulted uint64 = 640
-const Default_GoTest_F_Uint32Defaulted uint32 = 3200
-const Default_GoTest_F_Uint64Defaulted uint64 = 6400
-const Default_GoTest_F_FloatDefaulted float32 = 314159
-const Default_GoTest_F_DoubleDefaulted float64 = 271828
-const Default_GoTest_F_StringDefaulted string = "hello, \"world!\"\n"
-
-var Default_GoTest_F_BytesDefaulted []byte = []byte("Bignose")
-
-const Default_GoTest_F_Sint32Defaulted int32 = -32
-const Default_GoTest_F_Sint64Defaulted int64 = -64
-
-func (m *GoTest) GetKind() GoTest_KIND {
-	if m != nil && m.Kind != nil {
-		return *m.Kind
-	}
-	return 0
-}
-
-func (m *GoTest) GetTable() string {
-	if m != nil && m.Table != nil {
-		return *m.Table
-	}
-	return ""
-}
-
-func (m *GoTest) GetParam() int32 {
-	if m != nil && m.Param != nil {
-		return *m.Param
-	}
-	return 0
-}
-
-func (m *GoTest) GetRequiredField() *GoTestField {
-	if m != nil {
-		return m.RequiredField
-	}
-	return nil
-}
-
-func (m *GoTest) GetRepeatedField() []*GoTestField {
-	if m != nil {
-		return m.RepeatedField
-	}
-	return nil
-}
-
-func (m *GoTest) GetOptionalField() *GoTestField {
-	if m != nil {
-		return m.OptionalField
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_BoolRequired() bool {
-	if m != nil && m.F_BoolRequired != nil {
-		return *m.F_BoolRequired
-	}
-	return false
-}
-
-func (m *GoTest) GetF_Int32Required() int32 {
-	if m != nil && m.F_Int32Required != nil {
-		return *m.F_Int32Required
-	}
-	return 0
-}
-
-func (m *GoTest) GetF_Int64Required() int64 {
-	if m != nil && m.F_Int64Required != nil {
-		return *m.F_Int64Required
-	}
-	return 0
-}
-
-func (m *GoTest) GetF_Fixed32Required() uint32 {
-	if m != nil && m.F_Fixed32Required != nil {
-		return *m.F_Fixed32Required
-	}
-	return 0
-}
-
-func (m *GoTest) GetF_Fixed64Required() uint64 {
-	if m != nil && m.F_Fixed64Required != nil {
-		return *m.F_Fixed64Required
-	}
-	return 0
-}
-
-func (m *GoTest) GetF_Uint32Required() uint32 {
-	if m != nil && m.F_Uint32Required != nil {
-		return *m.F_Uint32Required
-	}
-	return 0
-}
-
-func (m *GoTest) GetF_Uint64Required() uint64 {
-	if m != nil && m.F_Uint64Required != nil {
-		return *m.F_Uint64Required
-	}
-	return 0
-}
-
-func (m *GoTest) GetF_FloatRequired() float32 {
-	if m != nil && m.F_FloatRequired != nil {
-		return *m.F_FloatRequired
-	}
-	return 0
-}
-
-func (m *GoTest) GetF_DoubleRequired() float64 {
-	if m != nil && m.F_DoubleRequired != nil {
-		return *m.F_DoubleRequired
-	}
-	return 0
-}
-
-func (m *GoTest) GetF_StringRequired() string {
-	if m != nil && m.F_StringRequired != nil {
-		return *m.F_StringRequired
-	}
-	return ""
-}
-
-func (m *GoTest) GetF_BytesRequired() []byte {
-	if m != nil {
-		return m.F_BytesRequired
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_Sint32Required() int32 {
-	if m != nil && m.F_Sint32Required != nil {
-		return *m.F_Sint32Required
-	}
-	return 0
-}
-
-func (m *GoTest) GetF_Sint64Required() int64 {
-	if m != nil && m.F_Sint64Required != nil {
-		return *m.F_Sint64Required
-	}
-	return 0
-}
-
-func (m *GoTest) GetF_BoolRepeated() []bool {
-	if m != nil {
-		return m.F_BoolRepeated
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_Int32Repeated() []int32 {
-	if m != nil {
-		return m.F_Int32Repeated
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_Int64Repeated() []int64 {
-	if m != nil {
-		return m.F_Int64Repeated
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_Fixed32Repeated() []uint32 {
-	if m != nil {
-		return m.F_Fixed32Repeated
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_Fixed64Repeated() []uint64 {
-	if m != nil {
-		return m.F_Fixed64Repeated
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_Uint32Repeated() []uint32 {
-	if m != nil {
-		return m.F_Uint32Repeated
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_Uint64Repeated() []uint64 {
-	if m != nil {
-		return m.F_Uint64Repeated
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_FloatRepeated() []float32 {
-	if m != nil {
-		return m.F_FloatRepeated
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_DoubleRepeated() []float64 {
-	if m != nil {
-		return m.F_DoubleRepeated
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_StringRepeated() []string {
-	if m != nil {
-		return m.F_StringRepeated
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_BytesRepeated() [][]byte {
-	if m != nil {
-		return m.F_BytesRepeated
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_Sint32Repeated() []int32 {
-	if m != nil {
-		return m.F_Sint32Repeated
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_Sint64Repeated() []int64 {
-	if m != nil {
-		return m.F_Sint64Repeated
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_BoolOptional() bool {
-	if m != nil && m.F_BoolOptional != nil {
-		return *m.F_BoolOptional
-	}
-	return false
-}
-
-func (m *GoTest) GetF_Int32Optional() int32 {
-	if m != nil && m.F_Int32Optional != nil {
-		return *m.F_Int32Optional
-	}
-	return 0
-}
-
-func (m *GoTest) GetF_Int64Optional() int64 {
-	if m != nil && m.F_Int64Optional != nil {
-		return *m.F_Int64Optional
-	}
-	return 0
-}
-
-func (m *GoTest) GetF_Fixed32Optional() uint32 {
-	if m != nil && m.F_Fixed32Optional != nil {
-		return *m.F_Fixed32Optional
-	}
-	return 0
-}
-
-func (m *GoTest) GetF_Fixed64Optional() uint64 {
-	if m != nil && m.F_Fixed64Optional != nil {
-		return *m.F_Fixed64Optional
-	}
-	return 0
-}
-
-func (m *GoTest) GetF_Uint32Optional() uint32 {
-	if m != nil && m.F_Uint32Optional != nil {
-		return *m.F_Uint32Optional
-	}
-	return 0
-}
-
-func (m *GoTest) GetF_Uint64Optional() uint64 {
-	if m != nil && m.F_Uint64Optional != nil {
-		return *m.F_Uint64Optional
-	}
-	return 0
-}
-
-func (m *GoTest) GetF_FloatOptional() float32 {
-	if m != nil && m.F_FloatOptional != nil {
-		return *m.F_FloatOptional
-	}
-	return 0
-}
-
-func (m *GoTest) GetF_DoubleOptional() float64 {
-	if m != nil && m.F_DoubleOptional != nil {
-		return *m.F_DoubleOptional
-	}
-	return 0
-}
-
-func (m *GoTest) GetF_StringOptional() string {
-	if m != nil && m.F_StringOptional != nil {
-		return *m.F_StringOptional
-	}
-	return ""
-}
-
-func (m *GoTest) GetF_BytesOptional() []byte {
-	if m != nil {
-		return m.F_BytesOptional
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_Sint32Optional() int32 {
-	if m != nil && m.F_Sint32Optional != nil {
-		return *m.F_Sint32Optional
-	}
-	return 0
-}
-
-func (m *GoTest) GetF_Sint64Optional() int64 {
-	if m != nil && m.F_Sint64Optional != nil {
-		return *m.F_Sint64Optional
-	}
-	return 0
-}
-
-func (m *GoTest) GetF_BoolDefaulted() bool {
-	if m != nil && m.F_BoolDefaulted != nil {
-		return *m.F_BoolDefaulted
-	}
-	return Default_GoTest_F_BoolDefaulted
-}
-
-func (m *GoTest) GetF_Int32Defaulted() int32 {
-	if m != nil && m.F_Int32Defaulted != nil {
-		return *m.F_Int32Defaulted
-	}
-	return Default_GoTest_F_Int32Defaulted
-}
-
-func (m *GoTest) GetF_Int64Defaulted() int64 {
-	if m != nil && m.F_Int64Defaulted != nil {
-		return *m.F_Int64Defaulted
-	}
-	return Default_GoTest_F_Int64Defaulted
-}
-
-func (m *GoTest) GetF_Fixed32Defaulted() uint32 {
-	if m != nil && m.F_Fixed32Defaulted != nil {
-		return *m.F_Fixed32Defaulted
-	}
-	return Default_GoTest_F_Fixed32Defaulted
-}
-
-func (m *GoTest) GetF_Fixed64Defaulted() uint64 {
-	if m != nil && m.F_Fixed64Defaulted != nil {
-		return *m.F_Fixed64Defaulted
-	}
-	return Default_GoTest_F_Fixed64Defaulted
-}
-
-func (m *GoTest) GetF_Uint32Defaulted() uint32 {
-	if m != nil && m.F_Uint32Defaulted != nil {
-		return *m.F_Uint32Defaulted
-	}
-	return Default_GoTest_F_Uint32Defaulted
-}
-
-func (m *GoTest) GetF_Uint64Defaulted() uint64 {
-	if m != nil && m.F_Uint64Defaulted != nil {
-		return *m.F_Uint64Defaulted
-	}
-	return Default_GoTest_F_Uint64Defaulted
-}
-
-func (m *GoTest) GetF_FloatDefaulted() float32 {
-	if m != nil && m.F_FloatDefaulted != nil {
-		return *m.F_FloatDefaulted
-	}
-	return Default_GoTest_F_FloatDefaulted
-}
-
-func (m *GoTest) GetF_DoubleDefaulted() float64 {
-	if m != nil && m.F_DoubleDefaulted != nil {
-		return *m.F_DoubleDefaulted
-	}
-	return Default_GoTest_F_DoubleDefaulted
-}
-
-func (m *GoTest) GetF_StringDefaulted() string {
-	if m != nil && m.F_StringDefaulted != nil {
-		return *m.F_StringDefaulted
-	}
-	return Default_GoTest_F_StringDefaulted
-}
-
-func (m *GoTest) GetF_BytesDefaulted() []byte {
-	if m != nil && m.F_BytesDefaulted != nil {
-		return m.F_BytesDefaulted
-	}
-	return append([]byte(nil), Default_GoTest_F_BytesDefaulted...)
-}
-
-func (m *GoTest) GetF_Sint32Defaulted() int32 {
-	if m != nil && m.F_Sint32Defaulted != nil {
-		return *m.F_Sint32Defaulted
-	}
-	return Default_GoTest_F_Sint32Defaulted
-}
-
-func (m *GoTest) GetF_Sint64Defaulted() int64 {
-	if m != nil && m.F_Sint64Defaulted != nil {
-		return *m.F_Sint64Defaulted
-	}
-	return Default_GoTest_F_Sint64Defaulted
-}
-
-func (m *GoTest) GetF_BoolRepeatedPacked() []bool {
-	if m != nil {
-		return m.F_BoolRepeatedPacked
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_Int32RepeatedPacked() []int32 {
-	if m != nil {
-		return m.F_Int32RepeatedPacked
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_Int64RepeatedPacked() []int64 {
-	if m != nil {
-		return m.F_Int64RepeatedPacked
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_Fixed32RepeatedPacked() []uint32 {
-	if m != nil {
-		return m.F_Fixed32RepeatedPacked
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_Fixed64RepeatedPacked() []uint64 {
-	if m != nil {
-		return m.F_Fixed64RepeatedPacked
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_Uint32RepeatedPacked() []uint32 {
-	if m != nil {
-		return m.F_Uint32RepeatedPacked
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_Uint64RepeatedPacked() []uint64 {
-	if m != nil {
-		return m.F_Uint64RepeatedPacked
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_FloatRepeatedPacked() []float32 {
-	if m != nil {
-		return m.F_FloatRepeatedPacked
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_DoubleRepeatedPacked() []float64 {
-	if m != nil {
-		return m.F_DoubleRepeatedPacked
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_Sint32RepeatedPacked() []int32 {
-	if m != nil {
-		return m.F_Sint32RepeatedPacked
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_Sint64RepeatedPacked() []int64 {
-	if m != nil {
-		return m.F_Sint64RepeatedPacked
-	}
-	return nil
-}
-
-func (m *GoTest) GetRequiredgroup() *GoTest_RequiredGroup {
-	if m != nil {
-		return m.Requiredgroup
-	}
-	return nil
-}
-
-func (m *GoTest) GetRepeatedgroup() []*GoTest_RepeatedGroup {
-	if m != nil {
-		return m.Repeatedgroup
-	}
-	return nil
-}
-
-func (m *GoTest) GetOptionalgroup() *GoTest_OptionalGroup {
-	if m != nil {
-		return m.Optionalgroup
-	}
-	return nil
-}
-
-type GoTest_RequiredGroup struct {
-	RequiredField    *string `protobuf:"bytes,71,req" json:"RequiredField,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *GoTest_RequiredGroup) Reset() { *m = GoTest_RequiredGroup{} }
-
-func (m *GoTest_RequiredGroup) GetRequiredField() string {
-	if m != nil && m.RequiredField != nil {
-		return *m.RequiredField
-	}
-	return ""
-}
-
-type GoTest_RepeatedGroup struct {
-	RequiredField    *string `protobuf:"bytes,81,req" json:"RequiredField,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *GoTest_RepeatedGroup) Reset() { *m = GoTest_RepeatedGroup{} }
-
-func (m *GoTest_RepeatedGroup) GetRequiredField() string {
-	if m != nil && m.RequiredField != nil {
-		return *m.RequiredField
-	}
-	return ""
-}
-
-type GoTest_OptionalGroup struct {
-	RequiredField    *string `protobuf:"bytes,91,req" json:"RequiredField,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *GoTest_OptionalGroup) Reset() { *m = GoTest_OptionalGroup{} }
-
-func (m *GoTest_OptionalGroup) GetRequiredField() string {
-	if m != nil && m.RequiredField != nil {
-		return *m.RequiredField
-	}
-	return ""
-}
-
-type GoSkipTest struct {
-	SkipInt32        *int32                `protobuf:"varint,11,req,name=skip_int32" json:"skip_int32,omitempty"`
-	SkipFixed32      *uint32               `protobuf:"fixed32,12,req,name=skip_fixed32" json:"skip_fixed32,omitempty"`
-	SkipFixed64      *uint64               `protobuf:"fixed64,13,req,name=skip_fixed64" json:"skip_fixed64,omitempty"`
-	SkipString       *string               `protobuf:"bytes,14,req,name=skip_string" json:"skip_string,omitempty"`
-	Skipgroup        *GoSkipTest_SkipGroup `protobuf:"group,15,req,name=SkipGroup" json:"skipgroup,omitempty"`
-	XXX_unrecognized []byte                `json:"-"`
-}
-
-func (m *GoSkipTest) Reset()         { *m = GoSkipTest{} }
-func (m *GoSkipTest) String() string { return proto.CompactTextString(m) }
-func (*GoSkipTest) ProtoMessage()    {}
-
-func (m *GoSkipTest) GetSkipInt32() int32 {
-	if m != nil && m.SkipInt32 != nil {
-		return *m.SkipInt32
-	}
-	return 0
-}
-
-func (m *GoSkipTest) GetSkipFixed32() uint32 {
-	if m != nil && m.SkipFixed32 != nil {
-		return *m.SkipFixed32
-	}
-	return 0
-}
-
-func (m *GoSkipTest) GetSkipFixed64() uint64 {
-	if m != nil && m.SkipFixed64 != nil {
-		return *m.SkipFixed64
-	}
-	return 0
-}
-
-func (m *GoSkipTest) GetSkipString() string {
-	if m != nil && m.SkipString != nil {
-		return *m.SkipString
-	}
-	return ""
-}
-
-func (m *GoSkipTest) GetSkipgroup() *GoSkipTest_SkipGroup {
-	if m != nil {
-		return m.Skipgroup
-	}
-	return nil
-}
-
-type GoSkipTest_SkipGroup struct {
-	GroupInt32       *int32  `protobuf:"varint,16,req,name=group_int32" json:"group_int32,omitempty"`
-	GroupString      *string `protobuf:"bytes,17,req,name=group_string" json:"group_string,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *GoSkipTest_SkipGroup) Reset() { *m = GoSkipTest_SkipGroup{} }
-
-func (m *GoSkipTest_SkipGroup) GetGroupInt32() int32 {
-	if m != nil && m.GroupInt32 != nil {
-		return *m.GroupInt32
-	}
-	return 0
-}
-
-func (m *GoSkipTest_SkipGroup) GetGroupString() string {
-	if m != nil && m.GroupString != nil {
-		return *m.GroupString
-	}
-	return ""
-}
-
-type NonPackedTest struct {
-	A                []int32 `protobuf:"varint,1,rep,name=a" json:"a,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *NonPackedTest) Reset()         { *m = NonPackedTest{} }
-func (m *NonPackedTest) String() string { return proto.CompactTextString(m) }
-func (*NonPackedTest) ProtoMessage()    {}
-
-func (m *NonPackedTest) GetA() []int32 {
-	if m != nil {
-		return m.A
-	}
-	return nil
-}
-
-type PackedTest struct {
-	B                []int32 `protobuf:"varint,1,rep,packed,name=b" json:"b,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *PackedTest) Reset()         { *m = PackedTest{} }
-func (m *PackedTest) String() string { return proto.CompactTextString(m) }
-func (*PackedTest) ProtoMessage()    {}
-
-func (m *PackedTest) GetB() []int32 {
-	if m != nil {
-		return m.B
-	}
-	return nil
-}
-
-type MaxTag struct {
-	LastField        *string `protobuf:"bytes,536870911,opt,name=last_field" json:"last_field,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *MaxTag) Reset()         { *m = MaxTag{} }
-func (m *MaxTag) String() string { return proto.CompactTextString(m) }
-func (*MaxTag) ProtoMessage()    {}
-
-func (m *MaxTag) GetLastField() string {
-	if m != nil && m.LastField != nil {
-		return *m.LastField
-	}
-	return ""
-}
-
-type OldMessage struct {
-	Nested           *OldMessage_Nested `protobuf:"bytes,1,opt,name=nested" json:"nested,omitempty"`
-	XXX_unrecognized []byte             `json:"-"`
-}
-
-func (m *OldMessage) Reset()         { *m = OldMessage{} }
-func (m *OldMessage) String() string { return proto.CompactTextString(m) }
-func (*OldMessage) ProtoMessage()    {}
-
-func (m *OldMessage) GetNested() *OldMessage_Nested {
-	if m != nil {
-		return m.Nested
-	}
-	return nil
-}
-
-type OldMessage_Nested struct {
-	Name             *string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *OldMessage_Nested) Reset()         { *m = OldMessage_Nested{} }
-func (m *OldMessage_Nested) String() string { return proto.CompactTextString(m) }
-func (*OldMessage_Nested) ProtoMessage()    {}
-
-func (m *OldMessage_Nested) GetName() string {
-	if m != nil && m.Name != nil {
-		return *m.Name
-	}
-	return ""
-}
-
-type NewMessage struct {
-	Nested           *NewMessage_Nested `protobuf:"bytes,1,opt,name=nested" json:"nested,omitempty"`
-	XXX_unrecognized []byte             `json:"-"`
-}
-
-func (m *NewMessage) Reset()         { *m = NewMessage{} }
-func (m *NewMessage) String() string { return proto.CompactTextString(m) }
-func (*NewMessage) ProtoMessage()    {}
-
-func (m *NewMessage) GetNested() *NewMessage_Nested {
-	if m != nil {
-		return m.Nested
-	}
-	return nil
-}
-
-type NewMessage_Nested struct {
-	Name             *string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
-	FoodGroup        *string `protobuf:"bytes,2,opt,name=food_group" json:"food_group,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *NewMessage_Nested) Reset()         { *m = NewMessage_Nested{} }
-func (m *NewMessage_Nested) String() string { return proto.CompactTextString(m) }
-func (*NewMessage_Nested) ProtoMessage()    {}
-
-func (m *NewMessage_Nested) GetName() string {
-	if m != nil && m.Name != nil {
-		return *m.Name
-	}
-	return ""
-}
-
-func (m *NewMessage_Nested) GetFoodGroup() string {
-	if m != nil && m.FoodGroup != nil {
-		return *m.FoodGroup
-	}
-	return ""
-}
-
-type InnerMessage struct {
-	Host             *string `protobuf:"bytes,1,req,name=host" json:"host,omitempty"`
-	Port             *int32  `protobuf:"varint,2,opt,name=port,def=4000" json:"port,omitempty"`
-	Connected        *bool   `protobuf:"varint,3,opt,name=connected" json:"connected,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *InnerMessage) Reset()         { *m = InnerMessage{} }
-func (m *InnerMessage) String() string { return proto.CompactTextString(m) }
-func (*InnerMessage) ProtoMessage()    {}
-
-const Default_InnerMessage_Port int32 = 4000
-
-func (m *InnerMessage) GetHost() string {
-	if m != nil && m.Host != nil {
-		return *m.Host
-	}
-	return ""
-}
-
-func (m *InnerMessage) GetPort() int32 {
-	if m != nil && m.Port != nil {
-		return *m.Port
-	}
-	return Default_InnerMessage_Port
-}
-
-func (m *InnerMessage) GetConnected() bool {
-	if m != nil && m.Connected != nil {
-		return *m.Connected
-	}
-	return false
-}
-
-type OtherMessage struct {
-	Key              *int64        `protobuf:"varint,1,opt,name=key" json:"key,omitempty"`
-	Value            []byte        `protobuf:"bytes,2,opt,name=value" json:"value,omitempty"`
-	Weight           *float32      `protobuf:"fixed32,3,opt,name=weight" json:"weight,omitempty"`
-	Inner            *InnerMessage `protobuf:"bytes,4,opt,name=inner" json:"inner,omitempty"`
-	XXX_unrecognized []byte        `json:"-"`
-}
-
-func (m *OtherMessage) Reset()         { *m = OtherMessage{} }
-func (m *OtherMessage) String() string { return proto.CompactTextString(m) }
-func (*OtherMessage) ProtoMessage()    {}
-
-func (m *OtherMessage) GetKey() int64 {
-	if m != nil && m.Key != nil {
-		return *m.Key
-	}
-	return 0
-}
-
-func (m *OtherMessage) GetValue() []byte {
-	if m != nil {
-		return m.Value
-	}
-	return nil
-}
-
-func (m *OtherMessage) GetWeight() float32 {
-	if m != nil && m.Weight != nil {
-		return *m.Weight
-	}
-	return 0
-}
-
-func (m *OtherMessage) GetInner() *InnerMessage {
-	if m != nil {
-		return m.Inner
-	}
-	return nil
-}
-
-type MyMessage struct {
-	Count            *int32                    `protobuf:"varint,1,req,name=count" json:"count,omitempty"`
-	Name             *string                   `protobuf:"bytes,2,opt,name=name" json:"name,omitempty"`
-	Quote            *string                   `protobuf:"bytes,3,opt,name=quote" json:"quote,omitempty"`
-	Pet              []string                  `protobuf:"bytes,4,rep,name=pet" json:"pet,omitempty"`
-	Inner            *InnerMessage             `protobuf:"bytes,5,opt,name=inner" json:"inner,omitempty"`
-	Others           []*OtherMessage           `protobuf:"bytes,6,rep,name=others" json:"others,omitempty"`
-	Bikeshed         *MyMessage_Color          `protobuf:"varint,7,opt,name=bikeshed,enum=testdata.MyMessage_Color" json:"bikeshed,omitempty"`
-	Somegroup        *MyMessage_SomeGroup      `protobuf:"group,8,opt,name=SomeGroup" json:"somegroup,omitempty"`
-	RepBytes         [][]byte                  `protobuf:"bytes,10,rep,name=rep_bytes" json:"rep_bytes,omitempty"`
-	Bigfloat         *float64                  `protobuf:"fixed64,11,opt,name=bigfloat" json:"bigfloat,omitempty"`
-	XXX_extensions   map[int32]proto.Extension `json:"-"`
-	XXX_unrecognized []byte                    `json:"-"`
-}
-
-func (m *MyMessage) Reset()         { *m = MyMessage{} }
-func (m *MyMessage) String() string { return proto.CompactTextString(m) }
-func (*MyMessage) ProtoMessage()    {}
-
-var extRange_MyMessage = []proto.ExtensionRange{
-	{100, 536870911},
-}
-
-func (*MyMessage) ExtensionRangeArray() []proto.ExtensionRange {
-	return extRange_MyMessage
-}
-func (m *MyMessage) ExtensionMap() map[int32]proto.Extension {
-	if m.XXX_extensions == nil {
-		m.XXX_extensions = make(map[int32]proto.Extension)
-	}
-	return m.XXX_extensions
-}
-
-func (m *MyMessage) GetCount() int32 {
-	if m != nil && m.Count != nil {
-		return *m.Count
-	}
-	return 0
-}
-
-func (m *MyMessage) GetName() string {
-	if m != nil && m.Name != nil {
-		return *m.Name
-	}
-	return ""
-}
-
-func (m *MyMessage) GetQuote() string {
-	if m != nil && m.Quote != nil {
-		return *m.Quote
-	}
-	return ""
-}
-
-func (m *MyMessage) GetPet() []string {
-	if m != nil {
-		return m.Pet
-	}
-	return nil
-}
-
-func (m *MyMessage) GetInner() *InnerMessage {
-	if m != nil {
-		return m.Inner
-	}
-	return nil
-}
-
-func (m *MyMessage) GetOthers() []*OtherMessage {
-	if m != nil {
-		return m.Others
-	}
-	return nil
-}
-
-func (m *MyMessage) GetBikeshed() MyMessage_Color {
-	if m != nil && m.Bikeshed != nil {
-		return *m.Bikeshed
-	}
-	return 0
-}
-
-func (m *MyMessage) GetSomegroup() *MyMessage_SomeGroup {
-	if m != nil {
-		return m.Somegroup
-	}
-	return nil
-}
-
-func (m *MyMessage) GetRepBytes() [][]byte {
-	if m != nil {
-		return m.RepBytes
-	}
-	return nil
-}
-
-func (m *MyMessage) GetBigfloat() float64 {
-	if m != nil && m.Bigfloat != nil {
-		return *m.Bigfloat
-	}
-	return 0
-}
-
-type MyMessage_SomeGroup struct {
-	GroupField       *int32 `protobuf:"varint,9,opt,name=group_field" json:"group_field,omitempty"`
-	XXX_unrecognized []byte `json:"-"`
-}
-
-func (m *MyMessage_SomeGroup) Reset() { *m = MyMessage_SomeGroup{} }
-
-func (m *MyMessage_SomeGroup) GetGroupField() int32 {
-	if m != nil && m.GroupField != nil {
-		return *m.GroupField
-	}
-	return 0
-}
-
-type Ext struct {
-	Data             *string `protobuf:"bytes,1,opt,name=data" json:"data,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *Ext) Reset()         { *m = Ext{} }
-func (m *Ext) String() string { return proto.CompactTextString(m) }
-func (*Ext) ProtoMessage()    {}
-
-func (m *Ext) GetData() string {
-	if m != nil && m.Data != nil {
-		return *m.Data
-	}
-	return ""
-}
-
-var E_Ext_More = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessage)(nil),
-	ExtensionType: (*Ext)(nil),
-	Field:         103,
-	Name:          "testdata.Ext.more",
-	Tag:           "bytes,103,opt,name=more",
-}
-
-var E_Ext_Text = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessage)(nil),
-	ExtensionType: (*string)(nil),
-	Field:         104,
-	Name:          "testdata.Ext.text",
-	Tag:           "bytes,104,opt,name=text",
-}
-
-var E_Ext_Number = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessage)(nil),
-	ExtensionType: (*int32)(nil),
-	Field:         105,
-	Name:          "testdata.Ext.number",
-	Tag:           "varint,105,opt,name=number",
-}
-
-type MessageList struct {
-	Message          []*MessageList_Message `protobuf:"group,1,rep" json:"message,omitempty"`
-	XXX_unrecognized []byte                 `json:"-"`
-}
-
-func (m *MessageList) Reset()         { *m = MessageList{} }
-func (m *MessageList) String() string { return proto.CompactTextString(m) }
-func (*MessageList) ProtoMessage()    {}
-
-func (m *MessageList) GetMessage() []*MessageList_Message {
-	if m != nil {
-		return m.Message
-	}
-	return nil
-}
-
-type MessageList_Message struct {
-	Name             *string `protobuf:"bytes,2,req,name=name" json:"name,omitempty"`
-	Count            *int32  `protobuf:"varint,3,req,name=count" json:"count,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *MessageList_Message) Reset() { *m = MessageList_Message{} }
-
-func (m *MessageList_Message) GetName() string {
-	if m != nil && m.Name != nil {
-		return *m.Name
-	}
-	return ""
-}
-
-func (m *MessageList_Message) GetCount() int32 {
-	if m != nil && m.Count != nil {
-		return *m.Count
-	}
-	return 0
-}
-
-type Strings struct {
-	StringField      *string `protobuf:"bytes,1,opt,name=string_field" json:"string_field,omitempty"`
-	BytesField       []byte  `protobuf:"bytes,2,opt,name=bytes_field" json:"bytes_field,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *Strings) Reset()         { *m = Strings{} }
-func (m *Strings) String() string { return proto.CompactTextString(m) }
-func (*Strings) ProtoMessage()    {}
-
-func (m *Strings) GetStringField() string {
-	if m != nil && m.StringField != nil {
-		return *m.StringField
-	}
-	return ""
-}
-
-func (m *Strings) GetBytesField() []byte {
-	if m != nil {
-		return m.BytesField
-	}
-	return nil
-}
-
-type Defaults struct {
-	F_Bool           *bool           `protobuf:"varint,1,opt,def=1" json:"F_Bool,omitempty"`
-	F_Int32          *int32          `protobuf:"varint,2,opt,def=32" json:"F_Int32,omitempty"`
-	F_Int64          *int64          `protobuf:"varint,3,opt,def=64" json:"F_Int64,omitempty"`
-	F_Fixed32        *uint32         `protobuf:"fixed32,4,opt,def=320" json:"F_Fixed32,omitempty"`
-	F_Fixed64        *uint64         `protobuf:"fixed64,5,opt,def=640" json:"F_Fixed64,omitempty"`
-	F_Uint32         *uint32         `protobuf:"varint,6,opt,def=3200" json:"F_Uint32,omitempty"`
-	F_Uint64         *uint64         `protobuf:"varint,7,opt,def=6400" json:"F_Uint64,omitempty"`
-	F_Float          *float32        `protobuf:"fixed32,8,opt,def=314159" json:"F_Float,omitempty"`
-	F_Double         *float64        `protobuf:"fixed64,9,opt,def=271828" json:"F_Double,omitempty"`
-	F_String         *string         `protobuf:"bytes,10,opt,def=hello, \"world!\"\n" json:"F_String,omitempty"`
-	F_Bytes          []byte          `protobuf:"bytes,11,opt,def=Bignose" json:"F_Bytes,omitempty"`
-	F_Sint32         *int32          `protobuf:"zigzag32,12,opt,def=-32" json:"F_Sint32,omitempty"`
-	F_Sint64         *int64          `protobuf:"zigzag64,13,opt,def=-64" json:"F_Sint64,omitempty"`
-	F_Enum           *Defaults_Color `protobuf:"varint,14,opt,enum=testdata.Defaults_Color,def=1" json:"F_Enum,omitempty"`
-	F_Pinf           *float32        `protobuf:"fixed32,15,opt,def=inf" json:"F_Pinf,omitempty"`
-	F_Ninf           *float32        `protobuf:"fixed32,16,opt,def=-inf" json:"F_Ninf,omitempty"`
-	F_Nan            *float32        `protobuf:"fixed32,17,opt,def=nan" json:"F_Nan,omitempty"`
-	Sub              *SubDefaults    `protobuf:"bytes,18,opt,name=sub" json:"sub,omitempty"`
-	XXX_unrecognized []byte          `json:"-"`
-}
-
-func (m *Defaults) Reset()         { *m = Defaults{} }
-func (m *Defaults) String() string { return proto.CompactTextString(m) }
-func (*Defaults) ProtoMessage()    {}
-
-const Default_Defaults_F_Bool bool = true
-const Default_Defaults_F_Int32 int32 = 32
-const Default_Defaults_F_Int64 int64 = 64
-const Default_Defaults_F_Fixed32 uint32 = 320
-const Default_Defaults_F_Fixed64 uint64 = 640
-const Default_Defaults_F_Uint32 uint32 = 3200
-const Default_Defaults_F_Uint64 uint64 = 6400
-const Default_Defaults_F_Float float32 = 314159
-const Default_Defaults_F_Double float64 = 271828
-const Default_Defaults_F_String string = "hello, \"world!\"\n"
-
-var Default_Defaults_F_Bytes []byte = []byte("Bignose")
-
-const Default_Defaults_F_Sint32 int32 = -32
-const Default_Defaults_F_Sint64 int64 = -64
-const Default_Defaults_F_Enum Defaults_Color = Defaults_GREEN
-
-var Default_Defaults_F_Pinf float32 = float32(math.Inf(1))
-var Default_Defaults_F_Ninf float32 = float32(math.Inf(-1))
-var Default_Defaults_F_Nan float32 = float32(math.NaN())
-
-func (m *Defaults) GetF_Bool() bool {
-	if m != nil && m.F_Bool != nil {
-		return *m.F_Bool
-	}
-	return Default_Defaults_F_Bool
-}
-
-func (m *Defaults) GetF_Int32() int32 {
-	if m != nil && m.F_Int32 != nil {
-		return *m.F_Int32
-	}
-	return Default_Defaults_F_Int32
-}
-
-func (m *Defaults) GetF_Int64() int64 {
-	if m != nil && m.F_Int64 != nil {
-		return *m.F_Int64
-	}
-	return Default_Defaults_F_Int64
-}
-
-func (m *Defaults) GetF_Fixed32() uint32 {
-	if m != nil && m.F_Fixed32 != nil {
-		return *m.F_Fixed32
-	}
-	return Default_Defaults_F_Fixed32
-}
-
-func (m *Defaults) GetF_Fixed64() uint64 {
-	if m != nil && m.F_Fixed64 != nil {
-		return *m.F_Fixed64
-	}
-	return Default_Defaults_F_Fixed64
-}
-
-func (m *Defaults) GetF_Uint32() uint32 {
-	if m != nil && m.F_Uint32 != nil {
-		return *m.F_Uint32
-	}
-	return Default_Defaults_F_Uint32
-}
-
-func (m *Defaults) GetF_Uint64() uint64 {
-	if m != nil && m.F_Uint64 != nil {
-		return *m.F_Uint64
-	}
-	return Default_Defaults_F_Uint64
-}
-
-func (m *Defaults) GetF_Float() float32 {
-	if m != nil && m.F_Float != nil {
-		return *m.F_Float
-	}
-	return Default_Defaults_F_Float
-}
-
-func (m *Defaults) GetF_Double() float64 {
-	if m != nil && m.F_Double != nil {
-		return *m.F_Double
-	}
-	return Default_Defaults_F_Double
-}
-
-func (m *Defaults) GetF_String() string {
-	if m != nil && m.F_String != nil {
-		return *m.F_String
-	}
-	return Default_Defaults_F_String
-}
-
-func (m *Defaults) GetF_Bytes() []byte {
-	if m != nil && m.F_Bytes != nil {
-		return m.F_Bytes
-	}
-	return append([]byte(nil), Default_Defaults_F_Bytes...)
-}
-
-func (m *Defaults) GetF_Sint32() int32 {
-	if m != nil && m.F_Sint32 != nil {
-		return *m.F_Sint32
-	}
-	return Default_Defaults_F_Sint32
-}
-
-func (m *Defaults) GetF_Sint64() int64 {
-	if m != nil && m.F_Sint64 != nil {
-		return *m.F_Sint64
-	}
-	return Default_Defaults_F_Sint64
-}
-
-func (m *Defaults) GetF_Enum() Defaults_Color {
-	if m != nil && m.F_Enum != nil {
-		return *m.F_Enum
-	}
-	return Default_Defaults_F_Enum
-}
-
-func (m *Defaults) GetF_Pinf() float32 {
-	if m != nil && m.F_Pinf != nil {
-		return *m.F_Pinf
-	}
-	return Default_Defaults_F_Pinf
-}
-
-func (m *Defaults) GetF_Ninf() float32 {
-	if m != nil && m.F_Ninf != nil {
-		return *m.F_Ninf
-	}
-	return Default_Defaults_F_Ninf
-}
-
-func (m *Defaults) GetF_Nan() float32 {
-	if m != nil && m.F_Nan != nil {
-		return *m.F_Nan
-	}
-	return Default_Defaults_F_Nan
-}
-
-func (m *Defaults) GetSub() *SubDefaults {
-	if m != nil {
-		return m.Sub
-	}
-	return nil
-}
-
-type SubDefaults struct {
-	N                *int64 `protobuf:"varint,1,opt,name=n,def=7" json:"n,omitempty"`
-	XXX_unrecognized []byte `json:"-"`
-}
-
-func (m *SubDefaults) Reset()         { *m = SubDefaults{} }
-func (m *SubDefaults) String() string { return proto.CompactTextString(m) }
-func (*SubDefaults) ProtoMessage()    {}
-
-const Default_SubDefaults_N int64 = 7
-
-func (m *SubDefaults) GetN() int64 {
-	if m != nil && m.N != nil {
-		return *m.N
-	}
-	return Default_SubDefaults_N
-}
-
-type RepeatedEnum struct {
-	Color            []RepeatedEnum_Color `protobuf:"varint,1,rep,name=color,enum=testdata.RepeatedEnum_Color" json:"color,omitempty"`
-	XXX_unrecognized []byte               `json:"-"`
-}
-
-func (m *RepeatedEnum) Reset()         { *m = RepeatedEnum{} }
-func (m *RepeatedEnum) String() string { return proto.CompactTextString(m) }
-func (*RepeatedEnum) ProtoMessage()    {}
-
-func (m *RepeatedEnum) GetColor() []RepeatedEnum_Color {
-	if m != nil {
-		return m.Color
-	}
-	return nil
-}
-
-type MoreRepeated struct {
-	Bools            []bool   `protobuf:"varint,1,rep,name=bools" json:"bools,omitempty"`
-	BoolsPacked      []bool   `protobuf:"varint,2,rep,packed,name=bools_packed" json:"bools_packed,omitempty"`
-	Ints             []int32  `protobuf:"varint,3,rep,name=ints" json:"ints,omitempty"`
-	IntsPacked       []int32  `protobuf:"varint,4,rep,packed,name=ints_packed" json:"ints_packed,omitempty"`
-	Strings          []string `protobuf:"bytes,5,rep,name=strings" json:"strings,omitempty"`
-	XXX_unrecognized []byte   `json:"-"`
-}
-
-func (m *MoreRepeated) Reset()         { *m = MoreRepeated{} }
-func (m *MoreRepeated) String() string { return proto.CompactTextString(m) }
-func (*MoreRepeated) ProtoMessage()    {}
-
-func (m *MoreRepeated) GetBools() []bool {
-	if m != nil {
-		return m.Bools
-	}
-	return nil
-}
-
-func (m *MoreRepeated) GetBoolsPacked() []bool {
-	if m != nil {
-		return m.BoolsPacked
-	}
-	return nil
-}
-
-func (m *MoreRepeated) GetInts() []int32 {
-	if m != nil {
-		return m.Ints
-	}
-	return nil
-}
-
-func (m *MoreRepeated) GetIntsPacked() []int32 {
-	if m != nil {
-		return m.IntsPacked
-	}
-	return nil
-}
-
-func (m *MoreRepeated) GetStrings() []string {
-	if m != nil {
-		return m.Strings
-	}
-	return nil
-}
-
-type GroupOld struct {
-	G                *GroupOld_G `protobuf:"group,1,opt" json:"g,omitempty"`
-	XXX_unrecognized []byte      `json:"-"`
-}
-
-func (m *GroupOld) Reset()         { *m = GroupOld{} }
-func (m *GroupOld) String() string { return proto.CompactTextString(m) }
-func (*GroupOld) ProtoMessage()    {}
-
-func (m *GroupOld) GetG() *GroupOld_G {
-	if m != nil {
-		return m.G
-	}
-	return nil
-}
-
-type GroupOld_G struct {
-	X                *int32 `protobuf:"varint,2,opt,name=x" json:"x,omitempty"`
-	XXX_unrecognized []byte `json:"-"`
-}
-
-func (m *GroupOld_G) Reset() { *m = GroupOld_G{} }
-
-func (m *GroupOld_G) GetX() int32 {
-	if m != nil && m.X != nil {
-		return *m.X
-	}
-	return 0
-}
-
-type GroupNew struct {
-	G                *GroupNew_G `protobuf:"group,1,opt" json:"g,omitempty"`
-	XXX_unrecognized []byte      `json:"-"`
-}
-
-func (m *GroupNew) Reset()         { *m = GroupNew{} }
-func (m *GroupNew) String() string { return proto.CompactTextString(m) }
-func (*GroupNew) ProtoMessage()    {}
-
-func (m *GroupNew) GetG() *GroupNew_G {
-	if m != nil {
-		return m.G
-	}
-	return nil
-}
-
-type GroupNew_G struct {
-	X                *int32 `protobuf:"varint,2,opt,name=x" json:"x,omitempty"`
-	Y                *int32 `protobuf:"varint,3,opt,name=y" json:"y,omitempty"`
-	XXX_unrecognized []byte `json:"-"`
-}
-
-func (m *GroupNew_G) Reset() { *m = GroupNew_G{} }
-
-func (m *GroupNew_G) GetX() int32 {
-	if m != nil && m.X != nil {
-		return *m.X
-	}
-	return 0
-}
-
-func (m *GroupNew_G) GetY() int32 {
-	if m != nil && m.Y != nil {
-		return *m.Y
-	}
-	return 0
-}
-
-var E_Greeting = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessage)(nil),
-	ExtensionType: ([]string)(nil),
-	Field:         106,
-	Name:          "testdata.greeting",
-	Tag:           "bytes,106,rep,name=greeting",
-}
-
-func init() {
-	proto.RegisterEnum("testdata.FOO", FOO_name, FOO_value)
-	proto.RegisterEnum("testdata.GoTest_KIND", GoTest_KIND_name, GoTest_KIND_value)
-	proto.RegisterEnum("testdata.MyMessage_Color", MyMessage_Color_name, MyMessage_Color_value)
-	proto.RegisterEnum("testdata.Defaults_Color", Defaults_Color_name, Defaults_Color_value)
-	proto.RegisterEnum("testdata.RepeatedEnum_Color", RepeatedEnum_Color_name, RepeatedEnum_Color_value)
-	proto.RegisterExtension(E_Ext_More)
-	proto.RegisterExtension(E_Ext_Text)
-	proto.RegisterExtension(E_Ext_Number)
-	proto.RegisterExtension(E_Greeting)
-}
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/testdata/test.proto b/Godeps/_workspace/src/github.com/gogo/protobuf/proto/testdata/test.proto
deleted file mode 100644
index 440dba38d..000000000
--- a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/testdata/test.proto
+++ /dev/null
@@ -1,480 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2010 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// 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.
-
-// A feature-rich test file for the protocol compiler and libraries.
-
-syntax = "proto2";
-
-package testdata;
-
-enum FOO { FOO1 = 1; };
-
-message GoEnum {
-  required FOO foo = 1;
-}
-
-message GoTestField {
-  required string Label = 1;
-  required string Type = 2;
-}
-
-message GoTest {
-  // An enum, for completeness.
-  enum KIND {
-    VOID = 0;
-
-    // Basic types
-    BOOL = 1;
-    BYTES = 2;
-    FINGERPRINT = 3;
-    FLOAT = 4;
-    INT = 5;
-    STRING = 6;
-    TIME = 7;
-
-    // Groupings
-    TUPLE = 8;
-    ARRAY = 9;
-    MAP = 10;
-
-    // Table types
-    TABLE = 11;
-
-    // Functions
-    FUNCTION = 12;  // last tag
-  };
-
-  // Some typical parameters
-  required KIND Kind = 1;
-  optional string Table = 2;
-  optional int32 Param = 3;
-
-  // Required, repeated and optional foreign fields.
-  required GoTestField RequiredField = 4;
-  repeated GoTestField RepeatedField = 5;
-  optional GoTestField OptionalField = 6;
-
-  // Required fields of all basic types
-  required bool F_Bool_required = 10;
-  required int32 F_Int32_required = 11;
-  required int64 F_Int64_required = 12;
-  required fixed32 F_Fixed32_required = 13;
-  required fixed64 F_Fixed64_required = 14;
-  required uint32 F_Uint32_required = 15;
-  required uint64 F_Uint64_required = 16;
-  required float F_Float_required = 17;
-  required double F_Double_required = 18;
-  required string F_String_required = 19;
-  required bytes F_Bytes_required = 101;
-  required sint32 F_Sint32_required = 102;
-  required sint64 F_Sint64_required = 103;
-
-  // Repeated fields of all basic types
-  repeated bool F_Bool_repeated = 20;
-  repeated int32 F_Int32_repeated = 21;
-  repeated int64 F_Int64_repeated = 22;
-  repeated fixed32 F_Fixed32_repeated = 23;
-  repeated fixed64 F_Fixed64_repeated = 24;
-  repeated uint32 F_Uint32_repeated = 25;
-  repeated uint64 F_Uint64_repeated = 26;
-  repeated float F_Float_repeated = 27;
-  repeated double F_Double_repeated = 28;
-  repeated string F_String_repeated = 29;
-  repeated bytes F_Bytes_repeated = 201;
-  repeated sint32 F_Sint32_repeated = 202;
-  repeated sint64 F_Sint64_repeated = 203;
-
-  // Optional fields of all basic types
-  optional bool F_Bool_optional = 30;
-  optional int32 F_Int32_optional = 31;
-  optional int64 F_Int64_optional = 32;
-  optional fixed32 F_Fixed32_optional = 33;
-  optional fixed64 F_Fixed64_optional = 34;
-  optional uint32 F_Uint32_optional = 35;
-  optional uint64 F_Uint64_optional = 36;
-  optional float F_Float_optional = 37;
-  optional double F_Double_optional = 38;
-  optional string F_String_optional = 39;
-  optional bytes F_Bytes_optional = 301;
-  optional sint32 F_Sint32_optional = 302;
-  optional sint64 F_Sint64_optional = 303;
-
-  // Default-valued fields of all basic types
-  optional bool F_Bool_defaulted = 40 [default=true];
-  optional int32 F_Int32_defaulted = 41 [default=32];
-  optional int64 F_Int64_defaulted = 42 [default=64];
-  optional fixed32 F_Fixed32_defaulted = 43 [default=320];
-  optional fixed64 F_Fixed64_defaulted = 44 [default=640];
-  optional uint32 F_Uint32_defaulted = 45 [default=3200];
-  optional uint64 F_Uint64_defaulted = 46 [default=6400];
-  optional float F_Float_defaulted = 47 [default=314159.];
-  optional double F_Double_defaulted = 48 [default=271828.];
-  optional string F_String_defaulted = 49 [default="hello, \"world!\"\n"];
-  optional bytes F_Bytes_defaulted = 401 [default="Bignose"];
-  optional sint32 F_Sint32_defaulted = 402 [default = -32];
-  optional sint64 F_Sint64_defaulted = 403 [default = -64];
-
-  // Packed repeated fields (no string or bytes).
-  repeated bool F_Bool_repeated_packed = 50 [packed=true];
-  repeated int32 F_Int32_repeated_packed = 51 [packed=true];
-  repeated int64 F_Int64_repeated_packed = 52 [packed=true];
-  repeated fixed32 F_Fixed32_repeated_packed = 53 [packed=true];
-  repeated fixed64 F_Fixed64_repeated_packed = 54 [packed=true];
-  repeated uint32 F_Uint32_repeated_packed = 55 [packed=true];
-  repeated uint64 F_Uint64_repeated_packed = 56 [packed=true];
-  repeated float F_Float_repeated_packed = 57 [packed=true];
-  repeated double F_Double_repeated_packed = 58 [packed=true];
-  repeated sint32 F_Sint32_repeated_packed = 502 [packed=true];
-  repeated sint64 F_Sint64_repeated_packed = 503 [packed=true];
-
-  // Required, repeated, and optional groups.
-  required group RequiredGroup = 70 {
-    required string RequiredField = 71;
-  };
-
-  repeated group RepeatedGroup = 80 {
-    required string RequiredField = 81;
-  };
-
-  optional group OptionalGroup = 90 {
-    required string RequiredField = 91;
-  };
-}
-
-// For testing skipping of unrecognized fields.
-// Numbers are all big, larger than tag numbers in GoTestField,
-// the message used in the corresponding test.
-message GoSkipTest {
-  required int32 skip_int32 = 11;
-  required fixed32 skip_fixed32 = 12;
-  required fixed64 skip_fixed64 = 13;
-  required string skip_string = 14;
-  required group SkipGroup = 15 {
-    required int32 group_int32 = 16;
-    required string group_string = 17;
-  }
-}
-
-// For testing packed/non-packed decoder switching.
-// A serialized instance of one should be deserializable as the other.
-message NonPackedTest {
-  repeated int32 a = 1;
-}
-
-message PackedTest {
-  repeated int32 b = 1 [packed=true];
-}
-
-message MaxTag {
-  // Maximum possible tag number.
-  optional string last_field = 536870911;
-}
-
-message OldMessage {
-  message Nested {
-    optional string name = 1;
-  }
-  optional Nested nested = 1;
-
-  optional int32 num = 2;
-}
-
-// NewMessage is wire compatible with OldMessage;
-// imagine it as a future version.
-message NewMessage {
-  message Nested {
-    optional string name = 1;
-    optional string food_group = 2;
-  }
-  optional Nested nested = 1;
-
-  // This is an int32 in OldMessage.
-  optional int64 num = 2;
-}
-
-// Smaller tests for ASCII formatting.
-
-message InnerMessage {
-  required string host = 1;
-  optional int32 port = 2 [default=4000];
-  optional bool connected = 3;
-}
-
-message OtherMessage {
-  optional int64 key = 1;
-  optional bytes value = 2;
-  optional float weight = 3;
-  optional InnerMessage inner = 4;
-}
-
-message MyMessage {
-  required int32 count = 1;
-  optional string name = 2;
-  optional string quote = 3;
-  repeated string pet = 4;
-  optional InnerMessage inner = 5;
-  repeated OtherMessage others = 6;
-  repeated InnerMessage rep_inner = 12;
-
-  enum Color {
-    RED = 0;
-    GREEN = 1;
-    BLUE = 2;
-  };
-  optional Color bikeshed = 7;
-
-  optional group SomeGroup = 8 {
-    optional int32 group_field = 9;
-  }
-
-  // This field becomes [][]byte in the generated code.
-  repeated bytes rep_bytes = 10;
-
-  optional double bigfloat = 11;
-
-  extensions 100 to max;
-}
-
-message Ext {
-  extend MyMessage {
-    optional Ext more = 103;
-    optional string text = 104;
-    optional int32 number = 105;
-  }
-
-  optional string data = 1;
-}
-
-extend MyMessage {
-  repeated string greeting = 106;
-}
-
-message DefaultsMessage {
-  enum DefaultsEnum {
-    ZERO = 0;
-    ONE = 1;
-    TWO = 2;
-  };
-  extensions 100 to max;
-}
-
-extend DefaultsMessage {
-  optional double no_default_double = 101;
-  optional float no_default_float = 102;
-  optional int32 no_default_int32 = 103;
-  optional int64 no_default_int64 = 104;
-  optional uint32 no_default_uint32 = 105;
-  optional uint64 no_default_uint64 = 106;
-  optional sint32 no_default_sint32 = 107;
-  optional sint64 no_default_sint64 = 108;
-  optional fixed32 no_default_fixed32 = 109;
-  optional fixed64 no_default_fixed64 = 110;
-  optional sfixed32 no_default_sfixed32 = 111;
-  optional sfixed64 no_default_sfixed64 = 112;
-  optional bool no_default_bool = 113;
-  optional string no_default_string = 114;
-  optional bytes no_default_bytes = 115;
-  optional DefaultsMessage.DefaultsEnum no_default_enum = 116;
-
-  optional double default_double = 201 [default = 3.1415];
-  optional float default_float = 202 [default = 3.14];
-  optional int32 default_int32 = 203 [default = 42];
-  optional int64 default_int64 = 204 [default = 43];
-  optional uint32 default_uint32 = 205 [default = 44];
-  optional uint64 default_uint64 = 206 [default = 45];
-  optional sint32 default_sint32 = 207 [default = 46];
-  optional sint64 default_sint64 = 208 [default = 47];
-  optional fixed32 default_fixed32 = 209 [default = 48];
-  optional fixed64 default_fixed64 = 210 [default = 49];
-  optional sfixed32 default_sfixed32 = 211 [default = 50];
-  optional sfixed64 default_sfixed64 = 212 [default = 51];
-  optional bool default_bool = 213 [default = true];
-  optional string default_string = 214 [default = "Hello, string"];
-  optional bytes default_bytes = 215 [default = "Hello, bytes"];
-  optional DefaultsMessage.DefaultsEnum default_enum = 216 [default = ONE];
-}
-
-message MyMessageSet {
-  option message_set_wire_format = true;
-  extensions 100 to max;
-}
-
-message Empty {
-}
-
-extend MyMessageSet {
-    optional Empty x201 = 201;
-    optional Empty x202 = 202;
-    optional Empty x203 = 203;
-    optional Empty x204 = 204;
-    optional Empty x205 = 205;
-    optional Empty x206 = 206;
-    optional Empty x207 = 207;
-    optional Empty x208 = 208;
-    optional Empty x209 = 209;
-    optional Empty x210 = 210;
-    optional Empty x211 = 211;
-    optional Empty x212 = 212;
-    optional Empty x213 = 213;
-    optional Empty x214 = 214;
-    optional Empty x215 = 215;
-    optional Empty x216 = 216;
-    optional Empty x217 = 217;
-    optional Empty x218 = 218;
-    optional Empty x219 = 219;
-    optional Empty x220 = 220;
-    optional Empty x221 = 221;
-    optional Empty x222 = 222;
-    optional Empty x223 = 223;
-    optional Empty x224 = 224;
-    optional Empty x225 = 225;
-    optional Empty x226 = 226;
-    optional Empty x227 = 227;
-    optional Empty x228 = 228;
-    optional Empty x229 = 229;
-    optional Empty x230 = 230;
-    optional Empty x231 = 231;
-    optional Empty x232 = 232;
-    optional Empty x233 = 233;
-    optional Empty x234 = 234;
-    optional Empty x235 = 235;
-    optional Empty x236 = 236;
-    optional Empty x237 = 237;
-    optional Empty x238 = 238;
-    optional Empty x239 = 239;
-    optional Empty x240 = 240;
-    optional Empty x241 = 241;
-    optional Empty x242 = 242;
-    optional Empty x243 = 243;
-    optional Empty x244 = 244;
-    optional Empty x245 = 245;
-    optional Empty x246 = 246;
-    optional Empty x247 = 247;
-    optional Empty x248 = 248;
-    optional Empty x249 = 249;
-    optional Empty x250 = 250;
-}
-
-message MessageList {
-  repeated group Message = 1 {
-    required string name = 2;
-    required int32 count = 3;
-  }
-}
-
-message Strings {
-  optional string string_field = 1;
-  optional bytes bytes_field = 2;
-}
-
-message Defaults {
-  enum Color {
-    RED = 0;
-    GREEN = 1;
-    BLUE = 2;
-  }
-
-  // Default-valued fields of all basic types.
-  // Same as GoTest, but copied here to make testing easier.
-  optional bool F_Bool = 1 [default=true];
-  optional int32 F_Int32 = 2 [default=32];
-  optional int64 F_Int64 = 3 [default=64];
-  optional fixed32 F_Fixed32 = 4 [default=320];
-  optional fixed64 F_Fixed64 = 5 [default=640];
-  optional uint32 F_Uint32 = 6 [default=3200];
-  optional uint64 F_Uint64 = 7 [default=6400];
-  optional float F_Float = 8 [default=314159.];
-  optional double F_Double = 9 [default=271828.];
-  optional string F_String = 10 [default="hello, \"world!\"\n"];
-  optional bytes F_Bytes = 11 [default="Bignose"];
-  optional sint32 F_Sint32 = 12 [default=-32];
-  optional sint64 F_Sint64 = 13 [default=-64];
-  optional Color F_Enum = 14 [default=GREEN];
-
-  // More fields with crazy defaults.
-  optional float F_Pinf = 15 [default=inf];
-  optional float F_Ninf = 16 [default=-inf];
-  optional float F_Nan = 17 [default=nan];
-
-  // Sub-message.
-  optional SubDefaults sub = 18;
-
-  // Redundant but explicit defaults.
-  optional string str_zero = 19 [default=""];
-}
-
-message SubDefaults {
-  optional int64 n = 1 [default=7];
-}
-
-message RepeatedEnum {
-  enum Color {
-    RED = 1;
-  }
-  repeated Color color = 1;
-}
-
-message MoreRepeated {
-  repeated bool bools = 1;
-  repeated bool bools_packed = 2 [packed=true];
-  repeated int32 ints = 3;
-  repeated int32 ints_packed = 4 [packed=true];
-  repeated int64 int64s_packed = 7 [packed=true];
-  repeated string strings = 5;
-  repeated fixed32 fixeds = 6;
-}
-
-// GroupOld and GroupNew have the same wire format.
-// GroupNew has a new field inside a group.
-
-message GroupOld {
-  optional group G = 101 {
-    optional int32 x = 2;
-  }
-}
-
-message GroupNew {
-  optional group G = 101 {
-    optional int32 x = 2;
-    optional int32 y = 3;
-  }
-}
-
-message FloatingPoint {
-  required double f = 1;
-}
-
-message MessageWithMap {
-  map<int32, string> name_mapping = 1;
-  map<sint64, FloatingPoint> msg_mapping = 2;
-  map<bool, bytes> byte_mapping = 3;
-  map<string, string> str_to_str = 4;
-}
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/text.go b/Godeps/_workspace/src/github.com/gogo/protobuf/proto/text.go
deleted file mode 100644
index 365242441..000000000
--- a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/text.go
+++ /dev/null
@@ -1,804 +0,0 @@
-// Extensions for Protocol Buffers to create more go like structures.
-//
-// Copyright (c) 2013, Vastech SA (PTY) LTD. All rights reserved.
-// http://github.com/gogo/protobuf/gogoproto
-//
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2010 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// 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.
-
-package proto
-
-// Functions for writing the text protocol buffer format.
-
-import (
-	"bufio"
-	"bytes"
-	"encoding"
-	"fmt"
-	"io"
-	"log"
-	"math"
-	"reflect"
-	"sort"
-	"strings"
-)
-
-var (
-	newline         = []byte("\n")
-	spaces          = []byte("                                        ")
-	gtNewline       = []byte(">\n")
-	endBraceNewline = []byte("}\n")
-	backslashN      = []byte{'\\', 'n'}
-	backslashR      = []byte{'\\', 'r'}
-	backslashT      = []byte{'\\', 't'}
-	backslashDQ     = []byte{'\\', '"'}
-	backslashBS     = []byte{'\\', '\\'}
-	posInf          = []byte("inf")
-	negInf          = []byte("-inf")
-	nan             = []byte("nan")
-)
-
-type writer interface {
-	io.Writer
-	WriteByte(byte) error
-}
-
-// textWriter is an io.Writer that tracks its indentation level.
-type textWriter struct {
-	ind      int
-	complete bool // if the current position is a complete line
-	compact  bool // whether to write out as a one-liner
-	w        writer
-}
-
-func (w *textWriter) WriteString(s string) (n int, err error) {
-	if !strings.Contains(s, "\n") {
-		if !w.compact && w.complete {
-			w.writeIndent()
-		}
-		w.complete = false
-		return io.WriteString(w.w, s)
-	}
-	// WriteString is typically called without newlines, so this
-	// codepath and its copy are rare.  We copy to avoid
-	// duplicating all of Write's logic here.
-	return w.Write([]byte(s))
-}
-
-func (w *textWriter) Write(p []byte) (n int, err error) {
-	newlines := bytes.Count(p, newline)
-	if newlines == 0 {
-		if !w.compact && w.complete {
-			w.writeIndent()
-		}
-		n, err = w.w.Write(p)
-		w.complete = false
-		return n, err
-	}
-
-	frags := bytes.SplitN(p, newline, newlines+1)
-	if w.compact {
-		for i, frag := range frags {
-			if i > 0 {
-				if err := w.w.WriteByte(' '); err != nil {
-					return n, err
-				}
-				n++
-			}
-			nn, err := w.w.Write(frag)
-			n += nn
-			if err != nil {
-				return n, err
-			}
-		}
-		return n, nil
-	}
-
-	for i, frag := range frags {
-		if w.complete {
-			w.writeIndent()
-		}
-		nn, err := w.w.Write(frag)
-		n += nn
-		if err != nil {
-			return n, err
-		}
-		if i+1 < len(frags) {
-			if err := w.w.WriteByte('\n'); err != nil {
-				return n, err
-			}
-			n++
-		}
-	}
-	w.complete = len(frags[len(frags)-1]) == 0
-	return n, nil
-}
-
-func (w *textWriter) WriteByte(c byte) error {
-	if w.compact && c == '\n' {
-		c = ' '
-	}
-	if !w.compact && w.complete {
-		w.writeIndent()
-	}
-	err := w.w.WriteByte(c)
-	w.complete = c == '\n'
-	return err
-}
-
-func (w *textWriter) indent() { w.ind++ }
-
-func (w *textWriter) unindent() {
-	if w.ind == 0 {
-		log.Printf("proto: textWriter unindented too far")
-		return
-	}
-	w.ind--
-}
-
-func writeName(w *textWriter, props *Properties) error {
-	if _, err := w.WriteString(props.OrigName); err != nil {
-		return err
-	}
-	if props.Wire != "group" {
-		return w.WriteByte(':')
-	}
-	return nil
-}
-
-var (
-	messageSetType = reflect.TypeOf((*MessageSet)(nil)).Elem()
-)
-
-// raw is the interface satisfied by RawMessage.
-type raw interface {
-	Bytes() []byte
-}
-
-func writeStruct(w *textWriter, sv reflect.Value) error {
-	if sv.Type() == messageSetType {
-		return writeMessageSet(w, sv.Addr().Interface().(*MessageSet))
-	}
-
-	st := sv.Type()
-	sprops := GetProperties(st)
-	for i := 0; i < sv.NumField(); i++ {
-		fv := sv.Field(i)
-		props := sprops.Prop[i]
-		name := st.Field(i).Name
-
-		if strings.HasPrefix(name, "XXX_") {
-			// There are two XXX_ fields:
-			//   XXX_unrecognized []byte
-			//   XXX_extensions   map[int32]proto.Extension
-			// The first is handled here;
-			// the second is handled at the bottom of this function.
-			if name == "XXX_unrecognized" && !fv.IsNil() {
-				if err := writeUnknownStruct(w, fv.Interface().([]byte)); err != nil {
-					return err
-				}
-			}
-			continue
-		}
-		if fv.Kind() == reflect.Ptr && fv.IsNil() {
-			// Field not filled in. This could be an optional field or
-			// a required field that wasn't filled in. Either way, there
-			// isn't anything we can show for it.
-			continue
-		}
-		if fv.Kind() == reflect.Slice && fv.IsNil() {
-			// Repeated field that is empty, or a bytes field that is unused.
-			continue
-		}
-
-		if props.Repeated && fv.Kind() == reflect.Slice {
-			// Repeated field.
-			for j := 0; j < fv.Len(); j++ {
-				if err := writeName(w, props); err != nil {
-					return err
-				}
-				if !w.compact {
-					if err := w.WriteByte(' '); err != nil {
-						return err
-					}
-				}
-				v := fv.Index(j)
-				if v.Kind() == reflect.Ptr && v.IsNil() {
-					// A nil message in a repeated field is not valid,
-					// but we can handle that more gracefully than panicking.
-					if _, err := w.Write([]byte("<nil>\n")); err != nil {
-						return err
-					}
-					continue
-				}
-				if len(props.Enum) > 0 {
-					if err := writeEnum(w, v, props); err != nil {
-						return err
-					}
-				} else if err := writeAny(w, v, props); err != nil {
-					return err
-				}
-				if err := w.WriteByte('\n'); err != nil {
-					return err
-				}
-			}
-			continue
-		}
-		if fv.Kind() == reflect.Map {
-			// Map fields are rendered as a repeated struct with key/value fields.
-			keys := fv.MapKeys()
-			sort.Sort(mapKeys(keys))
-			for _, key := range keys {
-				val := fv.MapIndex(key)
-				if err := writeName(w, props); err != nil {
-					return err
-				}
-				if !w.compact {
-					if err := w.WriteByte(' '); err != nil {
-						return err
-					}
-				}
-				// open struct
-				if err := w.WriteByte('<'); err != nil {
-					return err
-				}
-				if !w.compact {
-					if err := w.WriteByte('\n'); err != nil {
-						return err
-					}
-				}
-				w.indent()
-				// key
-				if _, err := w.WriteString("key:"); err != nil {
-					return err
-				}
-				if !w.compact {
-					if err := w.WriteByte(' '); err != nil {
-						return err
-					}
-				}
-				if err := writeAny(w, key, props.mkeyprop); err != nil {
-					return err
-				}
-				if err := w.WriteByte('\n'); err != nil {
-					return err
-				}
-				// nil values aren't legal, but we can avoid panicking because of them.
-				if val.Kind() != reflect.Ptr || !val.IsNil() {
-					// value
-					if _, err := w.WriteString("value:"); err != nil {
-						return err
-					}
-					if !w.compact {
-						if err := w.WriteByte(' '); err != nil {
-							return err
-						}
-					}
-					if err := writeAny(w, val, props.mvalprop); err != nil {
-						return err
-					}
-					if err := w.WriteByte('\n'); err != nil {
-						return err
-					}
-				}
-				// close struct
-				w.unindent()
-				if err := w.WriteByte('>'); err != nil {
-					return err
-				}
-				if err := w.WriteByte('\n'); err != nil {
-					return err
-				}
-			}
-			continue
-		}
-		if props.proto3 && fv.Kind() == reflect.Slice && fv.Len() == 0 {
-			// empty bytes field
-			continue
-		}
-		if props.proto3 && fv.Kind() != reflect.Ptr && fv.Kind() != reflect.Slice {
-			// proto3 non-repeated scalar field; skip if zero value
-			if isProto3Zero(fv) {
-				continue
-			}
-		}
-
-		if err := writeName(w, props); err != nil {
-			return err
-		}
-		if !w.compact {
-			if err := w.WriteByte(' '); err != nil {
-				return err
-			}
-		}
-		if b, ok := fv.Interface().(raw); ok {
-			if err := writeRaw(w, b.Bytes()); err != nil {
-				return err
-			}
-			continue
-		}
-
-		if len(props.Enum) > 0 {
-			if err := writeEnum(w, fv, props); err != nil {
-				return err
-			}
-		} else if err := writeAny(w, fv, props); err != nil {
-			return err
-		}
-
-		if err := w.WriteByte('\n'); err != nil {
-			return err
-		}
-	}
-
-	// Extensions (the XXX_extensions field).
-	pv := sv.Addr()
-	if pv.Type().Implements(extendableProtoType) {
-		if err := writeExtensions(w, pv); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-// writeRaw writes an uninterpreted raw message.
-func writeRaw(w *textWriter, b []byte) error {
-	if err := w.WriteByte('<'); err != nil {
-		return err
-	}
-	if !w.compact {
-		if err := w.WriteByte('\n'); err != nil {
-			return err
-		}
-	}
-	w.indent()
-	if err := writeUnknownStruct(w, b); err != nil {
-		return err
-	}
-	w.unindent()
-	if err := w.WriteByte('>'); err != nil {
-		return err
-	}
-	return nil
-}
-
-// writeAny writes an arbitrary field.
-func writeAny(w *textWriter, v reflect.Value, props *Properties) error {
-	v = reflect.Indirect(v)
-
-	if props != nil && len(props.CustomType) > 0 {
-		var custom Marshaler = v.Interface().(Marshaler)
-		data, err := custom.Marshal()
-		if err != nil {
-			return err
-		}
-		if err := writeString(w, string(data)); err != nil {
-			return err
-		}
-		return nil
-	}
-
-	// Floats have special cases.
-	if v.Kind() == reflect.Float32 || v.Kind() == reflect.Float64 {
-		x := v.Float()
-		var b []byte
-		switch {
-		case math.IsInf(x, 1):
-			b = posInf
-		case math.IsInf(x, -1):
-			b = negInf
-		case math.IsNaN(x):
-			b = nan
-		}
-		if b != nil {
-			_, err := w.Write(b)
-			return err
-		}
-		// Other values are handled below.
-	}
-
-	// We don't attempt to serialise every possible value type; only those
-	// that can occur in protocol buffers.
-	switch v.Kind() {
-	case reflect.Slice:
-		// Should only be a []byte; repeated fields are handled in writeStruct.
-		if err := writeString(w, string(v.Bytes())); err != nil {
-			return err
-		}
-	case reflect.String:
-		if err := writeString(w, v.String()); err != nil {
-			return err
-		}
-	case reflect.Struct:
-		// Required/optional group/message.
-		var bra, ket byte = '<', '>'
-		if props != nil && props.Wire == "group" {
-			bra, ket = '{', '}'
-		}
-		if err := w.WriteByte(bra); err != nil {
-			return err
-		}
-		if !w.compact {
-			if err := w.WriteByte('\n'); err != nil {
-				return err
-			}
-		}
-		w.indent()
-		if tm, ok := v.Interface().(encoding.TextMarshaler); ok {
-			text, err := tm.MarshalText()
-			if err != nil {
-				return err
-			}
-			if _, err = w.Write(text); err != nil {
-				return err
-			}
-		} else if err := writeStruct(w, v); err != nil {
-			return err
-		}
-		w.unindent()
-		if err := w.WriteByte(ket); err != nil {
-			return err
-		}
-	default:
-		_, err := fmt.Fprint(w, v.Interface())
-		return err
-	}
-	return nil
-}
-
-// equivalent to C's isprint.
-func isprint(c byte) bool {
-	return c >= 0x20 && c < 0x7f
-}
-
-// writeString writes a string in the protocol buffer text format.
-// It is similar to strconv.Quote except we don't use Go escape sequences,
-// we treat the string as a byte sequence, and we use octal escapes.
-// These differences are to maintain interoperability with the other
-// languages' implementations of the text format.
-func writeString(w *textWriter, s string) error {
-	// use WriteByte here to get any needed indent
-	if err := w.WriteByte('"'); err != nil {
-		return err
-	}
-	// Loop over the bytes, not the runes.
-	for i := 0; i < len(s); i++ {
-		var err error
-		// Divergence from C++: we don't escape apostrophes.
-		// There's no need to escape them, and the C++ parser
-		// copes with a naked apostrophe.
-		switch c := s[i]; c {
-		case '\n':
-			_, err = w.w.Write(backslashN)
-		case '\r':
-			_, err = w.w.Write(backslashR)
-		case '\t':
-			_, err = w.w.Write(backslashT)
-		case '"':
-			_, err = w.w.Write(backslashDQ)
-		case '\\':
-			_, err = w.w.Write(backslashBS)
-		default:
-			if isprint(c) {
-				err = w.w.WriteByte(c)
-			} else {
-				_, err = fmt.Fprintf(w.w, "\\%03o", c)
-			}
-		}
-		if err != nil {
-			return err
-		}
-	}
-	return w.WriteByte('"')
-}
-
-func writeMessageSet(w *textWriter, ms *MessageSet) error {
-	for _, item := range ms.Item {
-		id := *item.TypeId
-		if msd, ok := messageSetMap[id]; ok {
-			// Known message set type.
-			if _, err := fmt.Fprintf(w, "[%s]: <\n", msd.name); err != nil {
-				return err
-			}
-			w.indent()
-
-			pb := reflect.New(msd.t.Elem())
-			if err := Unmarshal(item.Message, pb.Interface().(Message)); err != nil {
-				if _, err := fmt.Fprintf(w, "/* bad message: %v */\n", err); err != nil {
-					return err
-				}
-			} else {
-				if err := writeStruct(w, pb.Elem()); err != nil {
-					return err
-				}
-			}
-		} else {
-			// Unknown type.
-			if _, err := fmt.Fprintf(w, "[%d]: <\n", id); err != nil {
-				return err
-			}
-			w.indent()
-			if err := writeUnknownStruct(w, item.Message); err != nil {
-				return err
-			}
-		}
-		w.unindent()
-		if _, err := w.Write(gtNewline); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func writeUnknownStruct(w *textWriter, data []byte) error {
-	if !w.compact {
-		if _, err := fmt.Fprintf(w, "/* %d unknown bytes */\n", len(data)); err != nil {
-			return err
-		}
-	}
-	b := NewBuffer(data)
-	for b.index < len(b.buf) {
-		x, err := b.DecodeVarint()
-		if err != nil {
-			_, err := fmt.Fprintf(w, "/* %v */\n", err)
-			return err
-		}
-		wire, tag := x&7, x>>3
-		if wire == WireEndGroup {
-			w.unindent()
-			if _, err := w.Write(endBraceNewline); err != nil {
-				return err
-			}
-			continue
-		}
-		if _, err := fmt.Fprint(w, tag); err != nil {
-			return err
-		}
-		if wire != WireStartGroup {
-			if err := w.WriteByte(':'); err != nil {
-				return err
-			}
-		}
-		if !w.compact || wire == WireStartGroup {
-			if err := w.WriteByte(' '); err != nil {
-				return err
-			}
-		}
-		switch wire {
-		case WireBytes:
-			buf, e := b.DecodeRawBytes(false)
-			if e == nil {
-				_, err = fmt.Fprintf(w, "%q", buf)
-			} else {
-				_, err = fmt.Fprintf(w, "/* %v */", e)
-			}
-		case WireFixed32:
-			x, err = b.DecodeFixed32()
-			err = writeUnknownInt(w, x, err)
-		case WireFixed64:
-			x, err = b.DecodeFixed64()
-			err = writeUnknownInt(w, x, err)
-		case WireStartGroup:
-			err = w.WriteByte('{')
-			w.indent()
-		case WireVarint:
-			x, err = b.DecodeVarint()
-			err = writeUnknownInt(w, x, err)
-		default:
-			_, err = fmt.Fprintf(w, "/* unknown wire type %d */", wire)
-		}
-		if err != nil {
-			return err
-		}
-		if err := w.WriteByte('\n'); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func writeUnknownInt(w *textWriter, x uint64, err error) error {
-	if err == nil {
-		_, err = fmt.Fprint(w, x)
-	} else {
-		_, err = fmt.Fprintf(w, "/* %v */", err)
-	}
-	return err
-}
-
-type int32Slice []int32
-
-func (s int32Slice) Len() int           { return len(s) }
-func (s int32Slice) Less(i, j int) bool { return s[i] < s[j] }
-func (s int32Slice) Swap(i, j int)      { s[i], s[j] = s[j], s[i] }
-
-// writeExtensions writes all the extensions in pv.
-// pv is assumed to be a pointer to a protocol message struct that is extendable.
-func writeExtensions(w *textWriter, pv reflect.Value) error {
-	emap := extensionMaps[pv.Type().Elem()]
-	ep := pv.Interface().(extendableProto)
-
-	// Order the extensions by ID.
-	// This isn't strictly necessary, but it will give us
-	// canonical output, which will also make testing easier.
-	var m map[int32]Extension
-	if em, ok := ep.(extensionsMap); ok {
-		m = em.ExtensionMap()
-	} else if em, ok := ep.(extensionsBytes); ok {
-		eb := em.GetExtensions()
-		var err error
-		m, err = BytesToExtensionsMap(*eb)
-		if err != nil {
-			return err
-		}
-	}
-
-	ids := make([]int32, 0, len(m))
-	for id := range m {
-		ids = append(ids, id)
-	}
-	sort.Sort(int32Slice(ids))
-
-	for _, extNum := range ids {
-		ext := m[extNum]
-		var desc *ExtensionDesc
-		if emap != nil {
-			desc = emap[extNum]
-		}
-		if desc == nil {
-			// Unknown extension.
-			if err := writeUnknownStruct(w, ext.enc); err != nil {
-				return err
-			}
-			continue
-		}
-
-		pb, err := GetExtension(ep, desc)
-		if err != nil {
-			return fmt.Errorf("failed getting extension: %v", err)
-		}
-
-		// Repeated extensions will appear as a slice.
-		if !desc.repeated() {
-			if err := writeExtension(w, desc.Name, pb); err != nil {
-				return err
-			}
-		} else {
-			v := reflect.ValueOf(pb)
-			for i := 0; i < v.Len(); i++ {
-				if err := writeExtension(w, desc.Name, v.Index(i).Interface()); err != nil {
-					return err
-				}
-			}
-		}
-	}
-	return nil
-}
-
-func writeExtension(w *textWriter, name string, pb interface{}) error {
-	if _, err := fmt.Fprintf(w, "[%s]:", name); err != nil {
-		return err
-	}
-	if !w.compact {
-		if err := w.WriteByte(' '); err != nil {
-			return err
-		}
-	}
-	if err := writeAny(w, reflect.ValueOf(pb), nil); err != nil {
-		return err
-	}
-	if err := w.WriteByte('\n'); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (w *textWriter) writeIndent() {
-	if !w.complete {
-		return
-	}
-	remain := w.ind * 2
-	for remain > 0 {
-		n := remain
-		if n > len(spaces) {
-			n = len(spaces)
-		}
-		w.w.Write(spaces[:n])
-		remain -= n
-	}
-	w.complete = false
-}
-
-func marshalText(w io.Writer, pb Message, compact bool) error {
-	val := reflect.ValueOf(pb)
-	if pb == nil || val.IsNil() {
-		w.Write([]byte("<nil>"))
-		return nil
-	}
-	var bw *bufio.Writer
-	ww, ok := w.(writer)
-	if !ok {
-		bw = bufio.NewWriter(w)
-		ww = bw
-	}
-	aw := &textWriter{
-		w:        ww,
-		complete: true,
-		compact:  compact,
-	}
-
-	if tm, ok := pb.(encoding.TextMarshaler); ok {
-		text, err := tm.MarshalText()
-		if err != nil {
-			return err
-		}
-		if _, err = aw.Write(text); err != nil {
-			return err
-		}
-		if bw != nil {
-			return bw.Flush()
-		}
-		return nil
-	}
-	// Dereference the received pointer so we don't have outer < and >.
-	v := reflect.Indirect(val)
-	if err := writeStruct(aw, v); err != nil {
-		return err
-	}
-	if bw != nil {
-		return bw.Flush()
-	}
-	return nil
-}
-
-// MarshalText writes a given protocol buffer in text format.
-// The only errors returned are from w.
-func MarshalText(w io.Writer, pb Message) error {
-	return marshalText(w, pb, false)
-}
-
-// MarshalTextString is the same as MarshalText, but returns the string directly.
-func MarshalTextString(pb Message) string {
-	var buf bytes.Buffer
-	marshalText(&buf, pb, false)
-	return buf.String()
-}
-
-// CompactText writes a given protocol buffer in compact text format (one line).
-func CompactText(w io.Writer, pb Message) error { return marshalText(w, pb, true) }
-
-// CompactTextString is the same as CompactText, but returns the string directly.
-func CompactTextString(pb Message) string {
-	var buf bytes.Buffer
-	marshalText(&buf, pb, true)
-	return buf.String()
-}
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/text_gogo.go b/Godeps/_workspace/src/github.com/gogo/protobuf/proto/text_gogo.go
deleted file mode 100644
index cdb23373c..000000000
--- a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/text_gogo.go
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright (c) 2013, Vastech SA (PTY) LTD. All rights reserved.
-// http://github.com/gogo/protobuf/gogoproto
-//
-// 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.
-
-package proto
-
-import (
-	"fmt"
-	"reflect"
-)
-
-func writeEnum(w *textWriter, v reflect.Value, props *Properties) error {
-	m, ok := enumStringMaps[props.Enum]
-	if !ok {
-		if err := writeAny(w, v, props); err != nil {
-			return err
-		}
-	}
-	key := int32(0)
-	if v.Kind() == reflect.Ptr {
-		key = int32(v.Elem().Int())
-	} else {
-		key = int32(v.Int())
-	}
-	s, ok := m[key]
-	if !ok {
-		if err := writeAny(w, v, props); err != nil {
-			return err
-		}
-	}
-	_, err := fmt.Fprint(w, s)
-	return err
-}
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/text_parser.go b/Godeps/_workspace/src/github.com/gogo/protobuf/proto/text_parser.go
deleted file mode 100644
index 9b2fab593..000000000
--- a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/text_parser.go
+++ /dev/null
@@ -1,815 +0,0 @@
-// Extensions for Protocol Buffers to create more go like structures.
-//
-// Copyright (c) 2013, Vastech SA (PTY) LTD. All rights reserved.
-// http://github.com/gogo/protobuf/gogoproto
-//
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2010 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// 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.
-
-package proto
-
-// Functions for parsing the Text protocol buffer format.
-// TODO: message sets.
-
-import (
-	"encoding"
-	"errors"
-	"fmt"
-	"reflect"
-	"strconv"
-	"strings"
-	"unicode/utf8"
-)
-
-type ParseError struct {
-	Message string
-	Line    int // 1-based line number
-	Offset  int // 0-based byte offset from start of input
-}
-
-func (p *ParseError) Error() string {
-	if p.Line == 1 {
-		// show offset only for first line
-		return fmt.Sprintf("line 1.%d: %v", p.Offset, p.Message)
-	}
-	return fmt.Sprintf("line %d: %v", p.Line, p.Message)
-}
-
-type token struct {
-	value    string
-	err      *ParseError
-	line     int    // line number
-	offset   int    // byte number from start of input, not start of line
-	unquoted string // the unquoted version of value, if it was a quoted string
-}
-
-func (t *token) String() string {
-	if t.err == nil {
-		return fmt.Sprintf("%q (line=%d, offset=%d)", t.value, t.line, t.offset)
-	}
-	return fmt.Sprintf("parse error: %v", t.err)
-}
-
-type textParser struct {
-	s            string // remaining input
-	done         bool   // whether the parsing is finished (success or error)
-	backed       bool   // whether back() was called
-	offset, line int
-	cur          token
-}
-
-func newTextParser(s string) *textParser {
-	p := new(textParser)
-	p.s = s
-	p.line = 1
-	p.cur.line = 1
-	return p
-}
-
-func (p *textParser) errorf(format string, a ...interface{}) *ParseError {
-	pe := &ParseError{fmt.Sprintf(format, a...), p.cur.line, p.cur.offset}
-	p.cur.err = pe
-	p.done = true
-	return pe
-}
-
-// Numbers and identifiers are matched by [-+._A-Za-z0-9]
-func isIdentOrNumberChar(c byte) bool {
-	switch {
-	case 'A' <= c && c <= 'Z', 'a' <= c && c <= 'z':
-		return true
-	case '0' <= c && c <= '9':
-		return true
-	}
-	switch c {
-	case '-', '+', '.', '_':
-		return true
-	}
-	return false
-}
-
-func isWhitespace(c byte) bool {
-	switch c {
-	case ' ', '\t', '\n', '\r':
-		return true
-	}
-	return false
-}
-
-func (p *textParser) skipWhitespace() {
-	i := 0
-	for i < len(p.s) && (isWhitespace(p.s[i]) || p.s[i] == '#') {
-		if p.s[i] == '#' {
-			// comment; skip to end of line or input
-			for i < len(p.s) && p.s[i] != '\n' {
-				i++
-			}
-			if i == len(p.s) {
-				break
-			}
-		}
-		if p.s[i] == '\n' {
-			p.line++
-		}
-		i++
-	}
-	p.offset += i
-	p.s = p.s[i:len(p.s)]
-	if len(p.s) == 0 {
-		p.done = true
-	}
-}
-
-func (p *textParser) advance() {
-	// Skip whitespace
-	p.skipWhitespace()
-	if p.done {
-		return
-	}
-
-	// Start of non-whitespace
-	p.cur.err = nil
-	p.cur.offset, p.cur.line = p.offset, p.line
-	p.cur.unquoted = ""
-	switch p.s[0] {
-	case '<', '>', '{', '}', ':', '[', ']', ';', ',':
-		// Single symbol
-		p.cur.value, p.s = p.s[0:1], p.s[1:len(p.s)]
-	case '"', '\'':
-		// Quoted string
-		i := 1
-		for i < len(p.s) && p.s[i] != p.s[0] && p.s[i] != '\n' {
-			if p.s[i] == '\\' && i+1 < len(p.s) {
-				// skip escaped char
-				i++
-			}
-			i++
-		}
-		if i >= len(p.s) || p.s[i] != p.s[0] {
-			p.errorf("unmatched quote")
-			return
-		}
-		unq, err := unquoteC(p.s[1:i], rune(p.s[0]))
-		if err != nil {
-			p.errorf("invalid quoted string %s: %v", p.s[0:i+1], err)
-			return
-		}
-		p.cur.value, p.s = p.s[0:i+1], p.s[i+1:len(p.s)]
-		p.cur.unquoted = unq
-	default:
-		i := 0
-		for i < len(p.s) && isIdentOrNumberChar(p.s[i]) {
-			i++
-		}
-		if i == 0 {
-			p.errorf("unexpected byte %#x", p.s[0])
-			return
-		}
-		p.cur.value, p.s = p.s[0:i], p.s[i:len(p.s)]
-	}
-	p.offset += len(p.cur.value)
-}
-
-var (
-	errBadUTF8 = errors.New("proto: bad UTF-8")
-	errBadHex  = errors.New("proto: bad hexadecimal")
-)
-
-func unquoteC(s string, quote rune) (string, error) {
-	// This is based on C++'s tokenizer.cc.
-	// Despite its name, this is *not* parsing C syntax.
-	// For instance, "\0" is an invalid quoted string.
-
-	// Avoid allocation in trivial cases.
-	simple := true
-	for _, r := range s {
-		if r == '\\' || r == quote {
-			simple = false
-			break
-		}
-	}
-	if simple {
-		return s, nil
-	}
-
-	buf := make([]byte, 0, 3*len(s)/2)
-	for len(s) > 0 {
-		r, n := utf8.DecodeRuneInString(s)
-		if r == utf8.RuneError && n == 1 {
-			return "", errBadUTF8
-		}
-		s = s[n:]
-		if r != '\\' {
-			if r < utf8.RuneSelf {
-				buf = append(buf, byte(r))
-			} else {
-				buf = append(buf, string(r)...)
-			}
-			continue
-		}
-
-		ch, tail, err := unescape(s)
-		if err != nil {
-			return "", err
-		}
-		buf = append(buf, ch...)
-		s = tail
-	}
-	return string(buf), nil
-}
-
-func unescape(s string) (ch string, tail string, err error) {
-	r, n := utf8.DecodeRuneInString(s)
-	if r == utf8.RuneError && n == 1 {
-		return "", "", errBadUTF8
-	}
-	s = s[n:]
-	switch r {
-	case 'a':
-		return "\a", s, nil
-	case 'b':
-		return "\b", s, nil
-	case 'f':
-		return "\f", s, nil
-	case 'n':
-		return "\n", s, nil
-	case 'r':
-		return "\r", s, nil
-	case 't':
-		return "\t", s, nil
-	case 'v':
-		return "\v", s, nil
-	case '?':
-		return "?", s, nil // trigraph workaround
-	case '\'', '"', '\\':
-		return string(r), s, nil
-	case '0', '1', '2', '3', '4', '5', '6', '7', 'x', 'X':
-		if len(s) < 2 {
-			return "", "", fmt.Errorf(`\%c requires 2 following digits`, r)
-		}
-		base := 8
-		ss := s[:2]
-		s = s[2:]
-		if r == 'x' || r == 'X' {
-			base = 16
-		} else {
-			ss = string(r) + ss
-		}
-		i, err := strconv.ParseUint(ss, base, 8)
-		if err != nil {
-			return "", "", err
-		}
-		return string([]byte{byte(i)}), s, nil
-	case 'u', 'U':
-		n := 4
-		if r == 'U' {
-			n = 8
-		}
-		if len(s) < n {
-			return "", "", fmt.Errorf(`\%c requires %d digits`, r, n)
-		}
-
-		bs := make([]byte, n/2)
-		for i := 0; i < n; i += 2 {
-			a, ok1 := unhex(s[i])
-			b, ok2 := unhex(s[i+1])
-			if !ok1 || !ok2 {
-				return "", "", errBadHex
-			}
-			bs[i/2] = a<<4 | b
-		}
-		s = s[n:]
-		return string(bs), s, nil
-	}
-	return "", "", fmt.Errorf(`unknown escape \%c`, r)
-}
-
-// Adapted from src/pkg/strconv/quote.go.
-func unhex(b byte) (v byte, ok bool) {
-	switch {
-	case '0' <= b && b <= '9':
-		return b - '0', true
-	case 'a' <= b && b <= 'f':
-		return b - 'a' + 10, true
-	case 'A' <= b && b <= 'F':
-		return b - 'A' + 10, true
-	}
-	return 0, false
-}
-
-// Back off the parser by one token. Can only be done between calls to next().
-// It makes the next advance() a no-op.
-func (p *textParser) back() { p.backed = true }
-
-// Advances the parser and returns the new current token.
-func (p *textParser) next() *token {
-	if p.backed || p.done {
-		p.backed = false
-		return &p.cur
-	}
-	p.advance()
-	if p.done {
-		p.cur.value = ""
-	} else if len(p.cur.value) > 0 && p.cur.value[0] == '"' {
-		// Look for multiple quoted strings separated by whitespace,
-		// and concatenate them.
-		cat := p.cur
-		for {
-			p.skipWhitespace()
-			if p.done || p.s[0] != '"' {
-				break
-			}
-			p.advance()
-			if p.cur.err != nil {
-				return &p.cur
-			}
-			cat.value += " " + p.cur.value
-			cat.unquoted += p.cur.unquoted
-		}
-		p.done = false // parser may have seen EOF, but we want to return cat
-		p.cur = cat
-	}
-	return &p.cur
-}
-
-func (p *textParser) consumeToken(s string) error {
-	tok := p.next()
-	if tok.err != nil {
-		return tok.err
-	}
-	if tok.value != s {
-		p.back()
-		return p.errorf("expected %q, found %q", s, tok.value)
-	}
-	return nil
-}
-
-// Return a RequiredNotSetError indicating which required field was not set.
-func (p *textParser) missingRequiredFieldError(sv reflect.Value) *RequiredNotSetError {
-	st := sv.Type()
-	sprops := GetProperties(st)
-	for i := 0; i < st.NumField(); i++ {
-		if !isNil(sv.Field(i)) {
-			continue
-		}
-
-		props := sprops.Prop[i]
-		if props.Required {
-			return &RequiredNotSetError{fmt.Sprintf("%v.%v", st, props.OrigName)}
-		}
-	}
-	return &RequiredNotSetError{fmt.Sprintf("%v.<unknown field name>", st)} // should not happen
-}
-
-// Returns the index in the struct for the named field, as well as the parsed tag properties.
-func structFieldByName(st reflect.Type, name string) (int, *Properties, bool) {
-	sprops := GetProperties(st)
-	i, ok := sprops.decoderOrigNames[name]
-	if ok {
-		return i, sprops.Prop[i], true
-	}
-	return -1, nil, false
-}
-
-// Consume a ':' from the input stream (if the next token is a colon),
-// returning an error if a colon is needed but not present.
-func (p *textParser) checkForColon(props *Properties, typ reflect.Type) *ParseError {
-	tok := p.next()
-	if tok.err != nil {
-		return tok.err
-	}
-	if tok.value != ":" {
-		// Colon is optional when the field is a group or message.
-		needColon := true
-		switch props.Wire {
-		case "group":
-			needColon = false
-		case "bytes":
-			// A "bytes" field is either a message, a string, or a repeated field;
-			// those three become *T, *string and []T respectively, so we can check for
-			// this field being a pointer to a non-string.
-			if typ.Kind() == reflect.Ptr {
-				// *T or *string
-				if typ.Elem().Kind() == reflect.String {
-					break
-				}
-			} else if typ.Kind() == reflect.Slice {
-				// []T or []*T
-				if typ.Elem().Kind() != reflect.Ptr {
-					break
-				}
-			} else if typ.Kind() == reflect.String {
-				// The proto3 exception is for a string field,
-				// which requires a colon.
-				break
-			}
-			needColon = false
-		}
-		if needColon {
-			return p.errorf("expected ':', found %q", tok.value)
-		}
-		p.back()
-	}
-	return nil
-}
-
-func (p *textParser) readStruct(sv reflect.Value, terminator string) error {
-	st := sv.Type()
-	reqCount := GetProperties(st).reqCount
-	var reqFieldErr error
-	fieldSet := make(map[string]bool)
-	// A struct is a sequence of "name: value", terminated by one of
-	// '>' or '}', or the end of the input.  A name may also be
-	// "[extension]".
-	for {
-		tok := p.next()
-		if tok.err != nil {
-			return tok.err
-		}
-		if tok.value == terminator {
-			break
-		}
-		if tok.value == "[" {
-			// Looks like an extension.
-			//
-			// TODO: Check whether we need to handle
-			// namespace rooted names (e.g. ".something.Foo").
-			tok = p.next()
-			if tok.err != nil {
-				return tok.err
-			}
-			var desc *ExtensionDesc
-			// This could be faster, but it's functional.
-			// TODO: Do something smarter than a linear scan.
-			for _, d := range RegisteredExtensions(reflect.New(st).Interface().(Message)) {
-				if d.Name == tok.value {
-					desc = d
-					break
-				}
-			}
-			if desc == nil {
-				return p.errorf("unrecognized extension %q", tok.value)
-			}
-			// Check the extension terminator.
-			tok = p.next()
-			if tok.err != nil {
-				return tok.err
-			}
-			if tok.value != "]" {
-				return p.errorf("unrecognized extension terminator %q", tok.value)
-			}
-
-			props := &Properties{}
-			props.Parse(desc.Tag)
-
-			typ := reflect.TypeOf(desc.ExtensionType)
-			if err := p.checkForColon(props, typ); err != nil {
-				return err
-			}
-
-			rep := desc.repeated()
-
-			// Read the extension structure, and set it in
-			// the value we're constructing.
-			var ext reflect.Value
-			if !rep {
-				ext = reflect.New(typ).Elem()
-			} else {
-				ext = reflect.New(typ.Elem()).Elem()
-			}
-			if err := p.readAny(ext, props); err != nil {
-				if _, ok := err.(*RequiredNotSetError); !ok {
-					return err
-				}
-				reqFieldErr = err
-			}
-			ep := sv.Addr().Interface().(extendableProto)
-			if !rep {
-				SetExtension(ep, desc, ext.Interface())
-			} else {
-				old, err := GetExtension(ep, desc)
-				var sl reflect.Value
-				if err == nil {
-					sl = reflect.ValueOf(old) // existing slice
-				} else {
-					sl = reflect.MakeSlice(typ, 0, 1)
-				}
-				sl = reflect.Append(sl, ext)
-				SetExtension(ep, desc, sl.Interface())
-			}
-		} else {
-			// This is a normal, non-extension field.
-			name := tok.value
-			fi, props, ok := structFieldByName(st, name)
-			if !ok {
-				return p.errorf("unknown field name %q in %v", name, st)
-			}
-
-			dst := sv.Field(fi)
-
-			if dst.Kind() == reflect.Map {
-				// Consume any colon.
-				if err := p.checkForColon(props, dst.Type()); err != nil {
-					return err
-				}
-
-				// Construct the map if it doesn't already exist.
-				if dst.IsNil() {
-					dst.Set(reflect.MakeMap(dst.Type()))
-				}
-				key := reflect.New(dst.Type().Key()).Elem()
-				val := reflect.New(dst.Type().Elem()).Elem()
-
-				// The map entry should be this sequence of tokens:
-				//	< key : KEY value : VALUE >
-				// Technically the "key" and "value" could come in any order,
-				// but in practice they won't.
-
-				tok := p.next()
-				var terminator string
-				switch tok.value {
-				case "<":
-					terminator = ">"
-				case "{":
-					terminator = "}"
-				default:
-					return p.errorf("expected '{' or '<', found %q", tok.value)
-				}
-				if err := p.consumeToken("key"); err != nil {
-					return err
-				}
-				if err := p.consumeToken(":"); err != nil {
-					return err
-				}
-				if err := p.readAny(key, props.mkeyprop); err != nil {
-					return err
-				}
-				if err := p.consumeOptionalSeparator(); err != nil {
-					return err
-				}
-				if err := p.consumeToken("value"); err != nil {
-					return err
-				}
-				if err := p.checkForColon(props.mvalprop, dst.Type().Elem()); err != nil {
-					return err
-				}
-				if err := p.readAny(val, props.mvalprop); err != nil {
-					return err
-				}
-				if err := p.consumeOptionalSeparator(); err != nil {
-					return err
-				}
-				if err := p.consumeToken(terminator); err != nil {
-					return err
-				}
-
-				dst.SetMapIndex(key, val)
-				continue
-			}
-
-			// Check that it's not already set if it's not a repeated field.
-			if !props.Repeated && fieldSet[name] {
-				return p.errorf("non-repeated field %q was repeated", name)
-			}
-
-			if err := p.checkForColon(props, st.Field(fi).Type); err != nil {
-				return err
-			}
-
-			// Parse into the field.
-			fieldSet[name] = true
-			if err := p.readAny(dst, props); err != nil {
-				if _, ok := err.(*RequiredNotSetError); !ok {
-					return err
-				}
-				reqFieldErr = err
-			} else if props.Required {
-				reqCount--
-			}
-		}
-
-		if err := p.consumeOptionalSeparator(); err != nil {
-			return err
-		}
-
-	}
-
-	if reqCount > 0 {
-		return p.missingRequiredFieldError(sv)
-	}
-	return reqFieldErr
-}
-
-// consumeOptionalSeparator consumes an optional semicolon or comma.
-// It is used in readStruct to provide backward compatibility.
-func (p *textParser) consumeOptionalSeparator() error {
-	tok := p.next()
-	if tok.err != nil {
-		return tok.err
-	}
-	if tok.value != ";" && tok.value != "," {
-		p.back()
-	}
-	return nil
-}
-
-func (p *textParser) readAny(v reflect.Value, props *Properties) error {
-	tok := p.next()
-	if tok.err != nil {
-		return tok.err
-	}
-	if tok.value == "" {
-		return p.errorf("unexpected EOF")
-	}
-	if len(props.CustomType) > 0 {
-		if props.Repeated {
-			t := reflect.TypeOf(v.Interface())
-			if t.Kind() == reflect.Slice {
-				tc := reflect.TypeOf(new(Marshaler))
-				ok := t.Elem().Implements(tc.Elem())
-				if ok {
-					fv := v
-					flen := fv.Len()
-					if flen == fv.Cap() {
-						nav := reflect.MakeSlice(v.Type(), flen, 2*flen+1)
-						reflect.Copy(nav, fv)
-						fv.Set(nav)
-					}
-					fv.SetLen(flen + 1)
-
-					// Read one.
-					p.back()
-					return p.readAny(fv.Index(flen), props)
-				}
-			}
-		}
-		if reflect.TypeOf(v.Interface()).Kind() == reflect.Ptr {
-			custom := reflect.New(props.ctype.Elem()).Interface().(Unmarshaler)
-			err := custom.Unmarshal([]byte(tok.unquoted))
-			if err != nil {
-				return p.errorf("%v %v: %v", err, v.Type(), tok.value)
-			}
-			v.Set(reflect.ValueOf(custom))
-		} else {
-			custom := reflect.New(reflect.TypeOf(v.Interface())).Interface().(Unmarshaler)
-			err := custom.Unmarshal([]byte(tok.unquoted))
-			if err != nil {
-				return p.errorf("%v %v: %v", err, v.Type(), tok.value)
-			}
-			v.Set(reflect.Indirect(reflect.ValueOf(custom)))
-		}
-		return nil
-	}
-	switch fv := v; fv.Kind() {
-	case reflect.Slice:
-		at := v.Type()
-		if at.Elem().Kind() == reflect.Uint8 {
-			// Special case for []byte
-			if tok.value[0] != '"' && tok.value[0] != '\'' {
-				// Deliberately written out here, as the error after
-				// this switch statement would write "invalid []byte: ...",
-				// which is not as user-friendly.
-				return p.errorf("invalid string: %v", tok.value)
-			}
-			bytes := []byte(tok.unquoted)
-			fv.Set(reflect.ValueOf(bytes))
-			return nil
-		}
-		// Repeated field. May already exist.
-		flen := fv.Len()
-		if flen == fv.Cap() {
-			nav := reflect.MakeSlice(at, flen, 2*flen+1)
-			reflect.Copy(nav, fv)
-			fv.Set(nav)
-		}
-		fv.SetLen(flen + 1)
-
-		// Read one.
-		p.back()
-		return p.readAny(fv.Index(flen), props)
-	case reflect.Bool:
-		// Either "true", "false", 1 or 0.
-		switch tok.value {
-		case "true", "1":
-			fv.SetBool(true)
-			return nil
-		case "false", "0":
-			fv.SetBool(false)
-			return nil
-		}
-	case reflect.Float32, reflect.Float64:
-		v := tok.value
-		// Ignore 'f' for compatibility with output generated by C++, but don't
-		// remove 'f' when the value is "-inf" or "inf".
-		if strings.HasSuffix(v, "f") && tok.value != "-inf" && tok.value != "inf" {
-			v = v[:len(v)-1]
-		}
-		if f, err := strconv.ParseFloat(v, fv.Type().Bits()); err == nil {
-			fv.SetFloat(f)
-			return nil
-		}
-	case reflect.Int32:
-		if x, err := strconv.ParseInt(tok.value, 0, 32); err == nil {
-			fv.SetInt(x)
-			return nil
-		}
-
-		if len(props.Enum) == 0 {
-			break
-		}
-		m, ok := enumValueMaps[props.Enum]
-		if !ok {
-			break
-		}
-		x, ok := m[tok.value]
-		if !ok {
-			break
-		}
-		fv.SetInt(int64(x))
-		return nil
-	case reflect.Int64:
-		if x, err := strconv.ParseInt(tok.value, 0, 64); err == nil {
-			fv.SetInt(x)
-			return nil
-		}
-
-	case reflect.Ptr:
-		// A basic field (indirected through pointer), or a repeated message/group
-		p.back()
-		fv.Set(reflect.New(fv.Type().Elem()))
-		return p.readAny(fv.Elem(), props)
-	case reflect.String:
-		if tok.value[0] == '"' || tok.value[0] == '\'' {
-			fv.SetString(tok.unquoted)
-			return nil
-		}
-	case reflect.Struct:
-		var terminator string
-		switch tok.value {
-		case "{":
-			terminator = "}"
-		case "<":
-			terminator = ">"
-		default:
-			return p.errorf("expected '{' or '<', found %q", tok.value)
-		}
-		// TODO: Handle nested messages which implement encoding.TextUnmarshaler.
-		return p.readStruct(fv, terminator)
-	case reflect.Uint32:
-		if x, err := strconv.ParseUint(tok.value, 0, 32); err == nil {
-			fv.SetUint(uint64(x))
-			return nil
-		}
-	case reflect.Uint64:
-		if x, err := strconv.ParseUint(tok.value, 0, 64); err == nil {
-			fv.SetUint(x)
-			return nil
-		}
-	}
-	return p.errorf("invalid %v: %v", v.Type(), tok.value)
-}
-
-// UnmarshalText reads a protocol buffer in Text format. UnmarshalText resets pb
-// before starting to unmarshal, so any existing data in pb is always removed.
-// If a required field is not set and no other error occurs,
-// UnmarshalText returns *RequiredNotSetError.
-func UnmarshalText(s string, pb Message) error {
-	if um, ok := pb.(encoding.TextUnmarshaler); ok {
-		err := um.UnmarshalText([]byte(s))
-		return err
-	}
-	pb.Reset()
-	v := reflect.ValueOf(pb)
-	if pe := newTextParser(s).readStruct(v.Elem(), ""); pe != nil {
-		return pe
-	}
-	return nil
-}
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/text_parser_test.go b/Godeps/_workspace/src/github.com/gogo/protobuf/proto/text_parser_test.go
deleted file mode 100644
index f1c623192..000000000
--- a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/text_parser_test.go
+++ /dev/null
@@ -1,511 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2010 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// 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.
-
-package proto_test
-
-import (
-	"math"
-	"reflect"
-	"testing"
-
-	. "github.com/gogo/protobuf/proto"
-	proto3pb "github.com/gogo/protobuf/proto/proto3_proto"
-	. "github.com/gogo/protobuf/proto/testdata"
-)
-
-type UnmarshalTextTest struct {
-	in  string
-	err string // if "", no error expected
-	out *MyMessage
-}
-
-func buildExtStructTest(text string) UnmarshalTextTest {
-	msg := &MyMessage{
-		Count: Int32(42),
-	}
-	SetExtension(msg, E_Ext_More, &Ext{
-		Data: String("Hello, world!"),
-	})
-	return UnmarshalTextTest{in: text, out: msg}
-}
-
-func buildExtDataTest(text string) UnmarshalTextTest {
-	msg := &MyMessage{
-		Count: Int32(42),
-	}
-	SetExtension(msg, E_Ext_Text, String("Hello, world!"))
-	SetExtension(msg, E_Ext_Number, Int32(1729))
-	return UnmarshalTextTest{in: text, out: msg}
-}
-
-func buildExtRepStringTest(text string) UnmarshalTextTest {
-	msg := &MyMessage{
-		Count: Int32(42),
-	}
-	if err := SetExtension(msg, E_Greeting, []string{"bula", "hola"}); err != nil {
-		panic(err)
-	}
-	return UnmarshalTextTest{in: text, out: msg}
-}
-
-var unMarshalTextTests = []UnmarshalTextTest{
-	// Basic
-	{
-		in: " count:42\n  name:\"Dave\" ",
-		out: &MyMessage{
-			Count: Int32(42),
-			Name:  String("Dave"),
-		},
-	},
-
-	// Empty quoted string
-	{
-		in: `count:42 name:""`,
-		out: &MyMessage{
-			Count: Int32(42),
-			Name:  String(""),
-		},
-	},
-
-	// Quoted string concatenation
-	{
-		in: `count:42 name: "My name is "` + "\n" + `"elsewhere"`,
-		out: &MyMessage{
-			Count: Int32(42),
-			Name:  String("My name is elsewhere"),
-		},
-	},
-
-	// Quoted string with escaped apostrophe
-	{
-		in: `count:42 name: "HOLIDAY - New Year\'s Day"`,
-		out: &MyMessage{
-			Count: Int32(42),
-			Name:  String("HOLIDAY - New Year's Day"),
-		},
-	},
-
-	// Quoted string with single quote
-	{
-		in: `count:42 name: 'Roger "The Ramster" Ramjet'`,
-		out: &MyMessage{
-			Count: Int32(42),
-			Name:  String(`Roger "The Ramster" Ramjet`),
-		},
-	},
-
-	// Quoted string with all the accepted special characters from the C++ test
-	{
-		in: `count:42 name: ` + "\"\\\"A string with \\' characters \\n and \\r newlines and \\t tabs and \\001 slashes \\\\ and  multiple   spaces\"",
-		out: &MyMessage{
-			Count: Int32(42),
-			Name:  String("\"A string with ' characters \n and \r newlines and \t tabs and \001 slashes \\ and  multiple   spaces"),
-		},
-	},
-
-	// Quoted string with quoted backslash
-	{
-		in: `count:42 name: "\\'xyz"`,
-		out: &MyMessage{
-			Count: Int32(42),
-			Name:  String(`\'xyz`),
-		},
-	},
-
-	// Quoted string with UTF-8 bytes.
-	{
-		in: "count:42 name: '\303\277\302\201\xAB'",
-		out: &MyMessage{
-			Count: Int32(42),
-			Name:  String("\303\277\302\201\xAB"),
-		},
-	},
-
-	// Bad quoted string
-	{
-		in:  `inner: < host: "\0" >` + "\n",
-		err: `line 1.15: invalid quoted string "\0": \0 requires 2 following digits`,
-	},
-
-	// Number too large for int64
-	{
-		in:  "count: 1 others { key: 123456789012345678901 }",
-		err: "line 1.23: invalid int64: 123456789012345678901",
-	},
-
-	// Number too large for int32
-	{
-		in:  "count: 1234567890123",
-		err: "line 1.7: invalid int32: 1234567890123",
-	},
-
-	// Number in hexadecimal
-	{
-		in: "count: 0x2beef",
-		out: &MyMessage{
-			Count: Int32(0x2beef),
-		},
-	},
-
-	// Number in octal
-	{
-		in: "count: 024601",
-		out: &MyMessage{
-			Count: Int32(024601),
-		},
-	},
-
-	// Floating point number with "f" suffix
-	{
-		in: "count: 4 others:< weight: 17.0f >",
-		out: &MyMessage{
-			Count: Int32(4),
-			Others: []*OtherMessage{
-				{
-					Weight: Float32(17),
-				},
-			},
-		},
-	},
-
-	// Floating point positive infinity
-	{
-		in: "count: 4 bigfloat: inf",
-		out: &MyMessage{
-			Count:    Int32(4),
-			Bigfloat: Float64(math.Inf(1)),
-		},
-	},
-
-	// Floating point negative infinity
-	{
-		in: "count: 4 bigfloat: -inf",
-		out: &MyMessage{
-			Count:    Int32(4),
-			Bigfloat: Float64(math.Inf(-1)),
-		},
-	},
-
-	// Number too large for float32
-	{
-		in:  "others:< weight: 12345678901234567890123456789012345678901234567890 >",
-		err: "line 1.17: invalid float32: 12345678901234567890123456789012345678901234567890",
-	},
-
-	// Number posing as a quoted string
-	{
-		in:  `inner: < host: 12 >` + "\n",
-		err: `line 1.15: invalid string: 12`,
-	},
-
-	// Quoted string posing as int32
-	{
-		in:  `count: "12"`,
-		err: `line 1.7: invalid int32: "12"`,
-	},
-
-	// Quoted string posing a float32
-	{
-		in:  `others:< weight: "17.4" >`,
-		err: `line 1.17: invalid float32: "17.4"`,
-	},
-
-	// Enum
-	{
-		in: `count:42 bikeshed: BLUE`,
-		out: &MyMessage{
-			Count:    Int32(42),
-			Bikeshed: MyMessage_BLUE.Enum(),
-		},
-	},
-
-	// Repeated field
-	{
-		in: `count:42 pet: "horsey" pet:"bunny"`,
-		out: &MyMessage{
-			Count: Int32(42),
-			Pet:   []string{"horsey", "bunny"},
-		},
-	},
-
-	// Repeated message with/without colon and <>/{}
-	{
-		in: `count:42 others:{} others{} others:<> others:{}`,
-		out: &MyMessage{
-			Count: Int32(42),
-			Others: []*OtherMessage{
-				{},
-				{},
-				{},
-				{},
-			},
-		},
-	},
-
-	// Missing colon for inner message
-	{
-		in: `count:42 inner < host: "cauchy.syd" >`,
-		out: &MyMessage{
-			Count: Int32(42),
-			Inner: &InnerMessage{
-				Host: String("cauchy.syd"),
-			},
-		},
-	},
-
-	// Missing colon for string field
-	{
-		in:  `name "Dave"`,
-		err: `line 1.5: expected ':', found "\"Dave\""`,
-	},
-
-	// Missing colon for int32 field
-	{
-		in:  `count 42`,
-		err: `line 1.6: expected ':', found "42"`,
-	},
-
-	// Missing required field
-	{
-		in:  `name: "Pawel"`,
-		err: `proto: required field "testdata.MyMessage.count" not set`,
-		out: &MyMessage{
-			Name: String("Pawel"),
-		},
-	},
-
-	// Repeated non-repeated field
-	{
-		in:  `name: "Rob" name: "Russ"`,
-		err: `line 1.12: non-repeated field "name" was repeated`,
-	},
-
-	// Group
-	{
-		in: `count: 17 SomeGroup { group_field: 12 }`,
-		out: &MyMessage{
-			Count: Int32(17),
-			Somegroup: &MyMessage_SomeGroup{
-				GroupField: Int32(12),
-			},
-		},
-	},
-
-	// Semicolon between fields
-	{
-		in: `count:3;name:"Calvin"`,
-		out: &MyMessage{
-			Count: Int32(3),
-			Name:  String("Calvin"),
-		},
-	},
-	// Comma between fields
-	{
-		in: `count:4,name:"Ezekiel"`,
-		out: &MyMessage{
-			Count: Int32(4),
-			Name:  String("Ezekiel"),
-		},
-	},
-
-	// Extension
-	buildExtStructTest(`count: 42 [testdata.Ext.more]:<data:"Hello, world!" >`),
-	buildExtStructTest(`count: 42 [testdata.Ext.more] {data:"Hello, world!"}`),
-	buildExtDataTest(`count: 42 [testdata.Ext.text]:"Hello, world!" [testdata.Ext.number]:1729`),
-	buildExtRepStringTest(`count: 42 [testdata.greeting]:"bula" [testdata.greeting]:"hola"`),
-
-	// Big all-in-one
-	{
-		in: "count:42  # Meaning\n" +
-			`name:"Dave" ` +
-			`quote:"\"I didn't want to go.\"" ` +
-			`pet:"bunny" ` +
-			`pet:"kitty" ` +
-			`pet:"horsey" ` +
-			`inner:<` +
-			`  host:"footrest.syd" ` +
-			`  port:7001 ` +
-			`  connected:true ` +
-			`> ` +
-			`others:<` +
-			`  key:3735928559 ` +
-			`  value:"\x01A\a\f" ` +
-			`> ` +
-			`others:<` +
-			"  weight:58.9  # Atomic weight of Co\n" +
-			`  inner:<` +
-			`    host:"lesha.mtv" ` +
-			`    port:8002 ` +
-			`  >` +
-			`>`,
-		out: &MyMessage{
-			Count: Int32(42),
-			Name:  String("Dave"),
-			Quote: String(`"I didn't want to go."`),
-			Pet:   []string{"bunny", "kitty", "horsey"},
-			Inner: &InnerMessage{
-				Host:      String("footrest.syd"),
-				Port:      Int32(7001),
-				Connected: Bool(true),
-			},
-			Others: []*OtherMessage{
-				{
-					Key:   Int64(3735928559),
-					Value: []byte{0x1, 'A', '\a', '\f'},
-				},
-				{
-					Weight: Float32(58.9),
-					Inner: &InnerMessage{
-						Host: String("lesha.mtv"),
-						Port: Int32(8002),
-					},
-				},
-			},
-		},
-	},
-}
-
-func TestUnmarshalText(t *testing.T) {
-	for i, test := range unMarshalTextTests {
-		pb := new(MyMessage)
-		err := UnmarshalText(test.in, pb)
-		if test.err == "" {
-			// We don't expect failure.
-			if err != nil {
-				t.Errorf("Test %d: Unexpected error: %v", i, err)
-			} else if !reflect.DeepEqual(pb, test.out) {
-				t.Errorf("Test %d: Incorrect populated \nHave: %v\nWant: %v",
-					i, pb, test.out)
-			}
-		} else {
-			// We do expect failure.
-			if err == nil {
-				t.Errorf("Test %d: Didn't get expected error: %v", i, test.err)
-			} else if err.Error() != test.err {
-				t.Errorf("Test %d: Incorrect error.\nHave: %v\nWant: %v",
-					i, err.Error(), test.err)
-			} else if _, ok := err.(*RequiredNotSetError); ok && test.out != nil && !reflect.DeepEqual(pb, test.out) {
-				t.Errorf("Test %d: Incorrect populated \nHave: %v\nWant: %v",
-					i, pb, test.out)
-			}
-		}
-	}
-}
-
-func TestUnmarshalTextCustomMessage(t *testing.T) {
-	msg := &textMessage{}
-	if err := UnmarshalText("custom", msg); err != nil {
-		t.Errorf("Unexpected error from custom unmarshal: %v", err)
-	}
-	if UnmarshalText("not custom", msg) == nil {
-		t.Errorf("Didn't get expected error from custom unmarshal")
-	}
-}
-
-// Regression test; this caused a panic.
-func TestRepeatedEnum(t *testing.T) {
-	pb := new(RepeatedEnum)
-	if err := UnmarshalText("color: RED", pb); err != nil {
-		t.Fatal(err)
-	}
-	exp := &RepeatedEnum{
-		Color: []RepeatedEnum_Color{RepeatedEnum_RED},
-	}
-	if !Equal(pb, exp) {
-		t.Errorf("Incorrect populated \nHave: %v\nWant: %v", pb, exp)
-	}
-}
-
-func TestProto3TextParsing(t *testing.T) {
-	m := new(proto3pb.Message)
-	const in = `name: "Wallace" true_scotsman: true`
-	want := &proto3pb.Message{
-		Name:         "Wallace",
-		TrueScotsman: true,
-	}
-	if err := UnmarshalText(in, m); err != nil {
-		t.Fatal(err)
-	}
-	if !Equal(m, want) {
-		t.Errorf("\n got %v\nwant %v", m, want)
-	}
-}
-
-func TestMapParsing(t *testing.T) {
-	m := new(MessageWithMap)
-	const in = `name_mapping:<key:1234 value:"Feist"> name_mapping:<key:1 value:"Beatles">` +
-		`msg_mapping:<key:-4, value:<f: 2.0>,>` + // separating commas are okay
-		`msg_mapping<key:-2 value<f: 4.0>>` + // no colon after "value"
-		`byte_mapping:<key:true value:"so be it">`
-	want := &MessageWithMap{
-		NameMapping: map[int32]string{
-			1:    "Beatles",
-			1234: "Feist",
-		},
-		MsgMapping: map[int64]*FloatingPoint{
-			-4: {F: Float64(2.0)},
-			-2: {F: Float64(4.0)},
-		},
-		ByteMapping: map[bool][]byte{
-			true: []byte("so be it"),
-		},
-	}
-	if err := UnmarshalText(in, m); err != nil {
-		t.Fatal(err)
-	}
-	if !Equal(m, want) {
-		t.Errorf("\n got %v\nwant %v", m, want)
-	}
-}
-
-var benchInput string
-
-func init() {
-	benchInput = "count: 4\n"
-	for i := 0; i < 1000; i++ {
-		benchInput += "pet: \"fido\"\n"
-	}
-
-	// Check it is valid input.
-	pb := new(MyMessage)
-	err := UnmarshalText(benchInput, pb)
-	if err != nil {
-		panic("Bad benchmark input: " + err.Error())
-	}
-}
-
-func BenchmarkUnmarshalText(b *testing.B) {
-	pb := new(MyMessage)
-	for i := 0; i < b.N; i++ {
-		UnmarshalText(benchInput, pb)
-	}
-	b.SetBytes(int64(len(benchInput)))
-}
diff --git a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/text_test.go b/Godeps/_workspace/src/github.com/gogo/protobuf/proto/text_test.go
deleted file mode 100644
index a98504ef3..000000000
--- a/Godeps/_workspace/src/github.com/gogo/protobuf/proto/text_test.go
+++ /dev/null
@@ -1,450 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2010 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// 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.
-
-package proto_test
-
-import (
-	"bytes"
-	"errors"
-	"io/ioutil"
-	"math"
-	"strings"
-	"testing"
-
-	"github.com/gogo/protobuf/proto"
-
-	proto3pb "github.com/gogo/protobuf/proto/proto3_proto"
-	pb "github.com/gogo/protobuf/proto/testdata"
-)
-
-// textMessage implements the methods that allow it to marshal and unmarshal
-// itself as text.
-type textMessage struct {
-}
-
-func (*textMessage) MarshalText() ([]byte, error) {
-	return []byte("custom"), nil
-}
-
-func (*textMessage) UnmarshalText(bytes []byte) error {
-	if string(bytes) != "custom" {
-		return errors.New("expected 'custom'")
-	}
-	return nil
-}
-
-func (*textMessage) Reset()         {}
-func (*textMessage) String() string { return "" }
-func (*textMessage) ProtoMessage()  {}
-
-func newTestMessage() *pb.MyMessage {
-	msg := &pb.MyMessage{
-		Count: proto.Int32(42),
-		Name:  proto.String("Dave"),
-		Quote: proto.String(`"I didn't want to go."`),
-		Pet:   []string{"bunny", "kitty", "horsey"},
-		Inner: &pb.InnerMessage{
-			Host:      proto.String("footrest.syd"),
-			Port:      proto.Int32(7001),
-			Connected: proto.Bool(true),
-		},
-		Others: []*pb.OtherMessage{
-			{
-				Key:   proto.Int64(0xdeadbeef),
-				Value: []byte{1, 65, 7, 12},
-			},
-			{
-				Weight: proto.Float32(6.022),
-				Inner: &pb.InnerMessage{
-					Host: proto.String("lesha.mtv"),
-					Port: proto.Int32(8002),
-				},
-			},
-		},
-		Bikeshed: pb.MyMessage_BLUE.Enum(),
-		Somegroup: &pb.MyMessage_SomeGroup{
-			GroupField: proto.Int32(8),
-		},
-		// One normally wouldn't do this.
-		// This is an undeclared tag 13, as a varint (wire type 0) with value 4.
-		XXX_unrecognized: []byte{13<<3 | 0, 4},
-	}
-	ext := &pb.Ext{
-		Data: proto.String("Big gobs for big rats"),
-	}
-	if err := proto.SetExtension(msg, pb.E_Ext_More, ext); err != nil {
-		panic(err)
-	}
-	greetings := []string{"adg", "easy", "cow"}
-	if err := proto.SetExtension(msg, pb.E_Greeting, greetings); err != nil {
-		panic(err)
-	}
-
-	// Add an unknown extension. We marshal a pb.Ext, and fake the ID.
-	b, err := proto.Marshal(&pb.Ext{Data: proto.String("3G skiing")})
-	if err != nil {
-		panic(err)
-	}
-	b = append(proto.EncodeVarint(201<<3|proto.WireBytes), b...)
-	proto.SetRawExtension(msg, 201, b)
-
-	// Extensions can be plain fields, too, so let's test that.
-	b = append(proto.EncodeVarint(202<<3|proto.WireVarint), 19)
-	proto.SetRawExtension(msg, 202, b)
-
-	return msg
-}
-
-const text = `count: 42
-name: "Dave"
-quote: "\"I didn't want to go.\""
-pet: "bunny"
-pet: "kitty"
-pet: "horsey"
-inner: <
-  host: "footrest.syd"
-  port: 7001
-  connected: true
->
-others: <
-  key: 3735928559
-  value: "\001A\007\014"
->
-others: <
-  weight: 6.022
-  inner: <
-    host: "lesha.mtv"
-    port: 8002
-  >
->
-bikeshed: BLUE
-SomeGroup {
-  group_field: 8
-}
-/* 2 unknown bytes */
-13: 4
-[testdata.Ext.more]: <
-  data: "Big gobs for big rats"
->
-[testdata.greeting]: "adg"
-[testdata.greeting]: "easy"
-[testdata.greeting]: "cow"
-/* 13 unknown bytes */
-201: "\t3G skiing"
-/* 3 unknown bytes */
-202: 19
-`
-
-func TestMarshalText(t *testing.T) {
-	buf := new(bytes.Buffer)
-	if err := proto.MarshalText(buf, newTestMessage()); err != nil {
-		t.Fatalf("proto.MarshalText: %v", err)
-	}
-	s := buf.String()
-	if s != text {
-		t.Errorf("Got:\n===\n%v===\nExpected:\n===\n%v===\n", s, text)
-	}
-}
-
-func TestMarshalTextCustomMessage(t *testing.T) {
-	buf := new(bytes.Buffer)
-	if err := proto.MarshalText(buf, &textMessage{}); err != nil {
-		t.Fatalf("proto.MarshalText: %v", err)
-	}
-	s := buf.String()
-	if s != "custom" {
-		t.Errorf("Got %q, expected %q", s, "custom")
-	}
-}
-func TestMarshalTextNil(t *testing.T) {
-	want := "<nil>"
-	tests := []proto.Message{nil, (*pb.MyMessage)(nil)}
-	for i, test := range tests {
-		buf := new(bytes.Buffer)
-		if err := proto.MarshalText(buf, test); err != nil {
-			t.Fatal(err)
-		}
-		if got := buf.String(); got != want {
-			t.Errorf("%d: got %q want %q", i, got, want)
-		}
-	}
-}
-
-func TestMarshalTextUnknownEnum(t *testing.T) {
-	// The Color enum only specifies values 0-2.
-	m := &pb.MyMessage{Bikeshed: pb.MyMessage_Color(3).Enum()}
-	got := m.String()
-	const want = `bikeshed:3 `
-	if got != want {
-		t.Errorf("\n got %q\nwant %q", got, want)
-	}
-}
-
-func BenchmarkMarshalTextBuffered(b *testing.B) {
-	buf := new(bytes.Buffer)
-	m := newTestMessage()
-	for i := 0; i < b.N; i++ {
-		buf.Reset()
-		proto.MarshalText(buf, m)
-	}
-}
-
-func BenchmarkMarshalTextUnbuffered(b *testing.B) {
-	w := ioutil.Discard
-	m := newTestMessage()
-	for i := 0; i < b.N; i++ {
-		proto.MarshalText(w, m)
-	}
-}
-
-func compact(src string) string {
-	// s/[ \n]+/ /g; s/ $//;
-	dst := make([]byte, len(src))
-	space, comment := false, false
-	j := 0
-	for i := 0; i < len(src); i++ {
-		if strings.HasPrefix(src[i:], "/*") {
-			comment = true
-			i++
-			continue
-		}
-		if comment && strings.HasPrefix(src[i:], "*/") {
-			comment = false
-			i++
-			continue
-		}
-		if comment {
-			continue
-		}
-		c := src[i]
-		if c == ' ' || c == '\n' {
-			space = true
-			continue
-		}
-		if j > 0 && (dst[j-1] == ':' || dst[j-1] == '<' || dst[j-1] == '{') {
-			space = false
-		}
-		if c == '{' {
-			space = false
-		}
-		if space {
-			dst[j] = ' '
-			j++
-			space = false
-		}
-		dst[j] = c
-		j++
-	}
-	if space {
-		dst[j] = ' '
-		j++
-	}
-	return string(dst[0:j])
-}
-
-var compactText = compact(text)
-
-func TestCompactText(t *testing.T) {
-	s := proto.CompactTextString(newTestMessage())
-	if s != compactText {
-		t.Errorf("Got:\n===\n%v===\nExpected:\n===\n%v\n===\n", s, compactText)
-	}
-}
-
-func TestStringEscaping(t *testing.T) {
-	testCases := []struct {
-		in  *pb.Strings
-		out string
-	}{
-		{
-			// Test data from C++ test (TextFormatTest.StringEscape).
-			// Single divergence: we don't escape apostrophes.
-			&pb.Strings{StringField: proto.String("\"A string with ' characters \n and \r newlines and \t tabs and \001 slashes \\ and  multiple   spaces")},
-			"string_field: \"\\\"A string with ' characters \\n and \\r newlines and \\t tabs and \\001 slashes \\\\ and  multiple   spaces\"\n",
-		},
-		{
-			// Test data from the same C++ test.
-			&pb.Strings{StringField: proto.String("\350\260\267\346\255\214")},
-			"string_field: \"\\350\\260\\267\\346\\255\\214\"\n",
-		},
-		{
-			// Some UTF-8.
-			&pb.Strings{StringField: proto.String("\x00\x01\xff\x81")},
-			`string_field: "\000\001\377\201"` + "\n",
-		},
-	}
-
-	for i, tc := range testCases {
-		var buf bytes.Buffer
-		if err := proto.MarshalText(&buf, tc.in); err != nil {
-			t.Errorf("proto.MarsalText: %v", err)
-			continue
-		}
-		s := buf.String()
-		if s != tc.out {
-			t.Errorf("#%d: Got:\n%s\nExpected:\n%s\n", i, s, tc.out)
-			continue
-		}
-
-		// Check round-trip.
-		pb := new(pb.Strings)
-		if err := proto.UnmarshalText(s, pb); err != nil {
-			t.Errorf("#%d: UnmarshalText: %v", i, err)
-			continue
-		}
-		if !proto.Equal(pb, tc.in) {
-			t.Errorf("#%d: Round-trip failed:\nstart: %v\n  end: %v", i, tc.in, pb)
-		}
-	}
-}
-
-// A limitedWriter accepts some output before it fails.
-// This is a proxy for something like a nearly-full or imminently-failing disk,
-// or a network connection that is about to die.
-type limitedWriter struct {
-	b     bytes.Buffer
-	limit int
-}
-
-var outOfSpace = errors.New("proto: insufficient space")
-
-func (w *limitedWriter) Write(p []byte) (n int, err error) {
-	var avail = w.limit - w.b.Len()
-	if avail <= 0 {
-		return 0, outOfSpace
-	}
-	if len(p) <= avail {
-		return w.b.Write(p)
-	}
-	n, _ = w.b.Write(p[:avail])
-	return n, outOfSpace
-}
-
-func TestMarshalTextFailing(t *testing.T) {
-	// Try lots of different sizes to exercise more error code-paths.
-	for lim := 0; lim < len(text); lim++ {
-		buf := new(limitedWriter)
-		buf.limit = lim
-		err := proto.MarshalText(buf, newTestMessage())
-		// We expect a certain error, but also some partial results in the buffer.
-		if err != outOfSpace {
-			t.Errorf("Got:\n===\n%v===\nExpected:\n===\n%v===\n", err, outOfSpace)
-		}
-		s := buf.b.String()
-		x := text[:buf.limit]
-		if s != x {
-			t.Errorf("Got:\n===\n%v===\nExpected:\n===\n%v===\n", s, x)
-		}
-	}
-}
-
-func TestFloats(t *testing.T) {
-	tests := []struct {
-		f    float64
-		want string
-	}{
-		{0, "0"},
-		{4.7, "4.7"},
-		{math.Inf(1), "inf"},
-		{math.Inf(-1), "-inf"},
-		{math.NaN(), "nan"},
-	}
-	for _, test := range tests {
-		msg := &pb.FloatingPoint{F: &test.f}
-		got := strings.TrimSpace(msg.String())
-		want := `f:` + test.want
-		if got != want {
-			t.Errorf("f=%f: got %q, want %q", test.f, got, want)
-		}
-	}
-}
-
-func TestRepeatedNilText(t *testing.T) {
-	m := &pb.MessageList{
-		Message: []*pb.MessageList_Message{
-			nil,
-			{
-				Name: proto.String("Horse"),
-			},
-			nil,
-		},
-	}
-	want := `Message <nil>
-Message {
-  name: "Horse"
-}
-Message <nil>
-`
-	if s := proto.MarshalTextString(m); s != want {
-		t.Errorf(" got: %s\nwant: %s", s, want)
-	}
-}
-
-func TestProto3Text(t *testing.T) {
-	tests := []struct {
-		m    proto.Message
-		want string
-	}{
-		// zero message
-		{&proto3pb.Message{}, ``},
-		// zero message except for an empty byte slice
-		{&proto3pb.Message{Data: []byte{}}, ``},
-		// trivial case
-		{&proto3pb.Message{Name: "Rob", HeightInCm: 175}, `name:"Rob" height_in_cm:175`},
-		// empty map
-		{&pb.MessageWithMap{}, ``},
-		// non-empty map; map format is the same as a repeated struct,
-		// and they are sorted by key (numerically for numeric keys).
-		{
-			&pb.MessageWithMap{NameMapping: map[int32]string{
-				-1:      "Negatory",
-				7:       "Lucky",
-				1234:    "Feist",
-				6345789: "Otis",
-			}},
-			`name_mapping:<key:-1 value:"Negatory" > ` +
-				`name_mapping:<key:7 value:"Lucky" > ` +
-				`name_mapping:<key:1234 value:"Feist" > ` +
-				`name_mapping:<key:6345789 value:"Otis" >`,
-		},
-		// map with nil value; not well-defined, but we shouldn't crash
-		{
-			&pb.MessageWithMap{MsgMapping: map[int64]*pb.FloatingPoint{7: nil}},
-			`msg_mapping:<key:7 >`,
-		},
-	}
-	for _, test := range tests {
-		got := strings.TrimSpace(test.m.String())
-		if got != test.want {
-			t.Errorf("\n got %s\nwant %s", got, test.want)
-		}
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/proto/Makefile b/Godeps/_workspace/src/github.com/golang/protobuf/proto/Makefile
deleted file mode 100644
index f1f06564a..000000000
--- a/Godeps/_workspace/src/github.com/golang/protobuf/proto/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-# Go support for Protocol Buffers - Google's data interchange format
-#
-# Copyright 2010 The Go Authors.  All rights reserved.
-# https://github.com/golang/protobuf
-#
-# 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.
-
-install:
-	go install
-
-test: install generate-test-pbs
-	go test
-
-
-generate-test-pbs:
-	make install
-	make -C testdata
-	protoc --go_out=Mtestdata/test.proto=github.com/golang/protobuf/proto/testdata:. proto3_proto/proto3.proto
-	make
diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/proto/all_test.go b/Godeps/_workspace/src/github.com/golang/protobuf/proto/all_test.go
deleted file mode 100644
index b787d58aa..000000000
--- a/Godeps/_workspace/src/github.com/golang/protobuf/proto/all_test.go
+++ /dev/null
@@ -1,2104 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2010 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// 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.
-
-package proto_test
-
-import (
-	"bytes"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"math"
-	"math/rand"
-	"reflect"
-	"runtime/debug"
-	"strings"
-	"testing"
-	"time"
-
-	. "github.com/golang/protobuf/proto"
-	. "github.com/golang/protobuf/proto/testdata"
-)
-
-var globalO *Buffer
-
-func old() *Buffer {
-	if globalO == nil {
-		globalO = NewBuffer(nil)
-	}
-	globalO.Reset()
-	return globalO
-}
-
-func equalbytes(b1, b2 []byte, t *testing.T) {
-	if len(b1) != len(b2) {
-		t.Errorf("wrong lengths: 2*%d != %d", len(b1), len(b2))
-		return
-	}
-	for i := 0; i < len(b1); i++ {
-		if b1[i] != b2[i] {
-			t.Errorf("bad byte[%d]:%x %x: %s %s", i, b1[i], b2[i], b1, b2)
-		}
-	}
-}
-
-func initGoTestField() *GoTestField {
-	f := new(GoTestField)
-	f.Label = String("label")
-	f.Type = String("type")
-	return f
-}
-
-// These are all structurally equivalent but the tag numbers differ.
-// (It's remarkable that required, optional, and repeated all have
-// 8 letters.)
-func initGoTest_RequiredGroup() *GoTest_RequiredGroup {
-	return &GoTest_RequiredGroup{
-		RequiredField: String("required"),
-	}
-}
-
-func initGoTest_OptionalGroup() *GoTest_OptionalGroup {
-	return &GoTest_OptionalGroup{
-		RequiredField: String("optional"),
-	}
-}
-
-func initGoTest_RepeatedGroup() *GoTest_RepeatedGroup {
-	return &GoTest_RepeatedGroup{
-		RequiredField: String("repeated"),
-	}
-}
-
-func initGoTest(setdefaults bool) *GoTest {
-	pb := new(GoTest)
-	if setdefaults {
-		pb.F_BoolDefaulted = Bool(Default_GoTest_F_BoolDefaulted)
-		pb.F_Int32Defaulted = Int32(Default_GoTest_F_Int32Defaulted)
-		pb.F_Int64Defaulted = Int64(Default_GoTest_F_Int64Defaulted)
-		pb.F_Fixed32Defaulted = Uint32(Default_GoTest_F_Fixed32Defaulted)
-		pb.F_Fixed64Defaulted = Uint64(Default_GoTest_F_Fixed64Defaulted)
-		pb.F_Uint32Defaulted = Uint32(Default_GoTest_F_Uint32Defaulted)
-		pb.F_Uint64Defaulted = Uint64(Default_GoTest_F_Uint64Defaulted)
-		pb.F_FloatDefaulted = Float32(Default_GoTest_F_FloatDefaulted)
-		pb.F_DoubleDefaulted = Float64(Default_GoTest_F_DoubleDefaulted)
-		pb.F_StringDefaulted = String(Default_GoTest_F_StringDefaulted)
-		pb.F_BytesDefaulted = Default_GoTest_F_BytesDefaulted
-		pb.F_Sint32Defaulted = Int32(Default_GoTest_F_Sint32Defaulted)
-		pb.F_Sint64Defaulted = Int64(Default_GoTest_F_Sint64Defaulted)
-	}
-
-	pb.Kind = GoTest_TIME.Enum()
-	pb.RequiredField = initGoTestField()
-	pb.F_BoolRequired = Bool(true)
-	pb.F_Int32Required = Int32(3)
-	pb.F_Int64Required = Int64(6)
-	pb.F_Fixed32Required = Uint32(32)
-	pb.F_Fixed64Required = Uint64(64)
-	pb.F_Uint32Required = Uint32(3232)
-	pb.F_Uint64Required = Uint64(6464)
-	pb.F_FloatRequired = Float32(3232)
-	pb.F_DoubleRequired = Float64(6464)
-	pb.F_StringRequired = String("string")
-	pb.F_BytesRequired = []byte("bytes")
-	pb.F_Sint32Required = Int32(-32)
-	pb.F_Sint64Required = Int64(-64)
-	pb.Requiredgroup = initGoTest_RequiredGroup()
-
-	return pb
-}
-
-func fail(msg string, b *bytes.Buffer, s string, t *testing.T) {
-	data := b.Bytes()
-	ld := len(data)
-	ls := len(s) / 2
-
-	fmt.Printf("fail %s ld=%d ls=%d\n", msg, ld, ls)
-
-	// find the interesting spot - n
-	n := ls
-	if ld < ls {
-		n = ld
-	}
-	j := 0
-	for i := 0; i < n; i++ {
-		bs := hex(s[j])*16 + hex(s[j+1])
-		j += 2
-		if data[i] == bs {
-			continue
-		}
-		n = i
-		break
-	}
-	l := n - 10
-	if l < 0 {
-		l = 0
-	}
-	h := n + 10
-
-	// find the interesting spot - n
-	fmt.Printf("is[%d]:", l)
-	for i := l; i < h; i++ {
-		if i >= ld {
-			fmt.Printf(" --")
-			continue
-		}
-		fmt.Printf(" %.2x", data[i])
-	}
-	fmt.Printf("\n")
-
-	fmt.Printf("sb[%d]:", l)
-	for i := l; i < h; i++ {
-		if i >= ls {
-			fmt.Printf(" --")
-			continue
-		}
-		bs := hex(s[j])*16 + hex(s[j+1])
-		j += 2
-		fmt.Printf(" %.2x", bs)
-	}
-	fmt.Printf("\n")
-
-	t.Fail()
-
-	//	t.Errorf("%s: \ngood: %s\nbad: %x", msg, s, b.Bytes())
-	// Print the output in a partially-decoded format; can
-	// be helpful when updating the test.  It produces the output
-	// that is pasted, with minor edits, into the argument to verify().
-	//	data := b.Bytes()
-	//	nesting := 0
-	//	for b.Len() > 0 {
-	//		start := len(data) - b.Len()
-	//		var u uint64
-	//		u, err := DecodeVarint(b)
-	//		if err != nil {
-	//			fmt.Printf("decode error on varint:", err)
-	//			return
-	//		}
-	//		wire := u & 0x7
-	//		tag := u >> 3
-	//		switch wire {
-	//		case WireVarint:
-	//			v, err := DecodeVarint(b)
-	//			if err != nil {
-	//				fmt.Printf("decode error on varint:", err)
-	//				return
-	//			}
-	//			fmt.Printf("\t\t\"%x\"  // field %d, encoding %d, value %d\n",
-	//				data[start:len(data)-b.Len()], tag, wire, v)
-	//		case WireFixed32:
-	//			v, err := DecodeFixed32(b)
-	//			if err != nil {
-	//				fmt.Printf("decode error on fixed32:", err)
-	//				return
-	//			}
-	//			fmt.Printf("\t\t\"%x\"  // field %d, encoding %d, value %d\n",
-	//				data[start:len(data)-b.Len()], tag, wire, v)
-	//		case WireFixed64:
-	//			v, err := DecodeFixed64(b)
-	//			if err != nil {
-	//				fmt.Printf("decode error on fixed64:", err)
-	//				return
-	//			}
-	//			fmt.Printf("\t\t\"%x\"  // field %d, encoding %d, value %d\n",
-	//				data[start:len(data)-b.Len()], tag, wire, v)
-	//		case WireBytes:
-	//			nb, err := DecodeVarint(b)
-	//			if err != nil {
-	//				fmt.Printf("decode error on bytes:", err)
-	//				return
-	//			}
-	//			after_tag := len(data) - b.Len()
-	//			str := make([]byte, nb)
-	//			_, err = b.Read(str)
-	//			if err != nil {
-	//				fmt.Printf("decode error on bytes:", err)
-	//				return
-	//			}
-	//			fmt.Printf("\t\t\"%x\" \"%x\"  // field %d, encoding %d (FIELD)\n",
-	//				data[start:after_tag], str, tag, wire)
-	//		case WireStartGroup:
-	//			nesting++
-	//			fmt.Printf("\t\t\"%x\"\t\t// start group field %d level %d\n",
-	//				data[start:len(data)-b.Len()], tag, nesting)
-	//		case WireEndGroup:
-	//			fmt.Printf("\t\t\"%x\"\t\t// end group field %d level %d\n",
-	//				data[start:len(data)-b.Len()], tag, nesting)
-	//			nesting--
-	//		default:
-	//			fmt.Printf("unrecognized wire type %d\n", wire)
-	//			return
-	//		}
-	//	}
-}
-
-func hex(c uint8) uint8 {
-	if '0' <= c && c <= '9' {
-		return c - '0'
-	}
-	if 'a' <= c && c <= 'f' {
-		return 10 + c - 'a'
-	}
-	if 'A' <= c && c <= 'F' {
-		return 10 + c - 'A'
-	}
-	return 0
-}
-
-func equal(b []byte, s string, t *testing.T) bool {
-	if 2*len(b) != len(s) {
-		//		fail(fmt.Sprintf("wrong lengths: 2*%d != %d", len(b), len(s)), b, s, t)
-		fmt.Printf("wrong lengths: 2*%d != %d\n", len(b), len(s))
-		return false
-	}
-	for i, j := 0, 0; i < len(b); i, j = i+1, j+2 {
-		x := hex(s[j])*16 + hex(s[j+1])
-		if b[i] != x {
-			//			fail(fmt.Sprintf("bad byte[%d]:%x %x", i, b[i], x), b, s, t)
-			fmt.Printf("bad byte[%d]:%x %x", i, b[i], x)
-			return false
-		}
-	}
-	return true
-}
-
-func overify(t *testing.T, pb *GoTest, expected string) {
-	o := old()
-	err := o.Marshal(pb)
-	if err != nil {
-		fmt.Printf("overify marshal-1 err = %v", err)
-		o.DebugPrint("", o.Bytes())
-		t.Fatalf("expected = %s", expected)
-	}
-	if !equal(o.Bytes(), expected, t) {
-		o.DebugPrint("overify neq 1", o.Bytes())
-		t.Fatalf("expected = %s", expected)
-	}
-
-	// Now test Unmarshal by recreating the original buffer.
-	pbd := new(GoTest)
-	err = o.Unmarshal(pbd)
-	if err != nil {
-		t.Fatalf("overify unmarshal err = %v", err)
-		o.DebugPrint("", o.Bytes())
-		t.Fatalf("string = %s", expected)
-	}
-	o.Reset()
-	err = o.Marshal(pbd)
-	if err != nil {
-		t.Errorf("overify marshal-2 err = %v", err)
-		o.DebugPrint("", o.Bytes())
-		t.Fatalf("string = %s", expected)
-	}
-	if !equal(o.Bytes(), expected, t) {
-		o.DebugPrint("overify neq 2", o.Bytes())
-		t.Fatalf("string = %s", expected)
-	}
-}
-
-// Simple tests for numeric encode/decode primitives (varint, etc.)
-func TestNumericPrimitives(t *testing.T) {
-	for i := uint64(0); i < 1e6; i += 111 {
-		o := old()
-		if o.EncodeVarint(i) != nil {
-			t.Error("EncodeVarint")
-			break
-		}
-		x, e := o.DecodeVarint()
-		if e != nil {
-			t.Fatal("DecodeVarint")
-		}
-		if x != i {
-			t.Fatal("varint decode fail:", i, x)
-		}
-
-		o = old()
-		if o.EncodeFixed32(i) != nil {
-			t.Fatal("encFixed32")
-		}
-		x, e = o.DecodeFixed32()
-		if e != nil {
-			t.Fatal("decFixed32")
-		}
-		if x != i {
-			t.Fatal("fixed32 decode fail:", i, x)
-		}
-
-		o = old()
-		if o.EncodeFixed64(i*1234567) != nil {
-			t.Error("encFixed64")
-			break
-		}
-		x, e = o.DecodeFixed64()
-		if e != nil {
-			t.Error("decFixed64")
-			break
-		}
-		if x != i*1234567 {
-			t.Error("fixed64 decode fail:", i*1234567, x)
-			break
-		}
-
-		o = old()
-		i32 := int32(i - 12345)
-		if o.EncodeZigzag32(uint64(i32)) != nil {
-			t.Fatal("EncodeZigzag32")
-		}
-		x, e = o.DecodeZigzag32()
-		if e != nil {
-			t.Fatal("DecodeZigzag32")
-		}
-		if x != uint64(uint32(i32)) {
-			t.Fatal("zigzag32 decode fail:", i32, x)
-		}
-
-		o = old()
-		i64 := int64(i - 12345)
-		if o.EncodeZigzag64(uint64(i64)) != nil {
-			t.Fatal("EncodeZigzag64")
-		}
-		x, e = o.DecodeZigzag64()
-		if e != nil {
-			t.Fatal("DecodeZigzag64")
-		}
-		if x != uint64(i64) {
-			t.Fatal("zigzag64 decode fail:", i64, x)
-		}
-	}
-}
-
-// fakeMarshaler is a simple struct implementing Marshaler and Message interfaces.
-type fakeMarshaler struct {
-	b   []byte
-	err error
-}
-
-func (f *fakeMarshaler) Marshal() ([]byte, error) { return f.b, f.err }
-func (f *fakeMarshaler) String() string           { return fmt.Sprintf("Bytes: %v Error: %v", f.b, f.err) }
-func (f *fakeMarshaler) ProtoMessage()            {}
-func (f *fakeMarshaler) Reset()                   {}
-
-type msgWithFakeMarshaler struct {
-	M *fakeMarshaler `protobuf:"bytes,1,opt,name=fake"`
-}
-
-func (m *msgWithFakeMarshaler) String() string { return CompactTextString(m) }
-func (m *msgWithFakeMarshaler) ProtoMessage()  {}
-func (m *msgWithFakeMarshaler) Reset()         {}
-
-// Simple tests for proto messages that implement the Marshaler interface.
-func TestMarshalerEncoding(t *testing.T) {
-	tests := []struct {
-		name    string
-		m       Message
-		want    []byte
-		wantErr error
-	}{
-		{
-			name: "Marshaler that fails",
-			m: &fakeMarshaler{
-				err: errors.New("some marshal err"),
-				b:   []byte{5, 6, 7},
-			},
-			// Since there's an error, nothing should be written to buffer.
-			want:    nil,
-			wantErr: errors.New("some marshal err"),
-		},
-		{
-			name: "Marshaler that fails with RequiredNotSetError",
-			m: &msgWithFakeMarshaler{
-				M: &fakeMarshaler{
-					err: &RequiredNotSetError{},
-					b:   []byte{5, 6, 7},
-				},
-			},
-			// Since there's an error that can be continued after,
-			// the buffer should be written.
-			want: []byte{
-				10, 3, // for &msgWithFakeMarshaler
-				5, 6, 7, // for &fakeMarshaler
-			},
-			wantErr: &RequiredNotSetError{},
-		},
-		{
-			name: "Marshaler that succeeds",
-			m: &fakeMarshaler{
-				b: []byte{0, 1, 2, 3, 4, 127, 255},
-			},
-			want:    []byte{0, 1, 2, 3, 4, 127, 255},
-			wantErr: nil,
-		},
-	}
-	for _, test := range tests {
-		b := NewBuffer(nil)
-		err := b.Marshal(test.m)
-		if _, ok := err.(*RequiredNotSetError); ok {
-			// We're not in package proto, so we can only assert the type in this case.
-			err = &RequiredNotSetError{}
-		}
-		if !reflect.DeepEqual(test.wantErr, err) {
-			t.Errorf("%s: got err %v wanted %v", test.name, err, test.wantErr)
-		}
-		if !reflect.DeepEqual(test.want, b.Bytes()) {
-			t.Errorf("%s: got bytes %v wanted %v", test.name, b.Bytes(), test.want)
-		}
-	}
-}
-
-// Simple tests for bytes
-func TestBytesPrimitives(t *testing.T) {
-	o := old()
-	bytes := []byte{'n', 'o', 'w', ' ', 'i', 's', ' ', 't', 'h', 'e', ' ', 't', 'i', 'm', 'e'}
-	if o.EncodeRawBytes(bytes) != nil {
-		t.Error("EncodeRawBytes")
-	}
-	decb, e := o.DecodeRawBytes(false)
-	if e != nil {
-		t.Error("DecodeRawBytes")
-	}
-	equalbytes(bytes, decb, t)
-}
-
-// Simple tests for strings
-func TestStringPrimitives(t *testing.T) {
-	o := old()
-	s := "now is the time"
-	if o.EncodeStringBytes(s) != nil {
-		t.Error("enc_string")
-	}
-	decs, e := o.DecodeStringBytes()
-	if e != nil {
-		t.Error("dec_string")
-	}
-	if s != decs {
-		t.Error("string encode/decode fail:", s, decs)
-	}
-}
-
-// Do we catch the "required bit not set" case?
-func TestRequiredBit(t *testing.T) {
-	o := old()
-	pb := new(GoTest)
-	err := o.Marshal(pb)
-	if err == nil {
-		t.Error("did not catch missing required fields")
-	} else if strings.Index(err.Error(), "Kind") < 0 {
-		t.Error("wrong error type:", err)
-	}
-}
-
-// Check that all fields are nil.
-// Clearly silly, and a residue from a more interesting test with an earlier,
-// different initialization property, but it once caught a compiler bug so
-// it lives.
-func checkInitialized(pb *GoTest, t *testing.T) {
-	if pb.F_BoolDefaulted != nil {
-		t.Error("New or Reset did not set boolean:", *pb.F_BoolDefaulted)
-	}
-	if pb.F_Int32Defaulted != nil {
-		t.Error("New or Reset did not set int32:", *pb.F_Int32Defaulted)
-	}
-	if pb.F_Int64Defaulted != nil {
-		t.Error("New or Reset did not set int64:", *pb.F_Int64Defaulted)
-	}
-	if pb.F_Fixed32Defaulted != nil {
-		t.Error("New or Reset did not set fixed32:", *pb.F_Fixed32Defaulted)
-	}
-	if pb.F_Fixed64Defaulted != nil {
-		t.Error("New or Reset did not set fixed64:", *pb.F_Fixed64Defaulted)
-	}
-	if pb.F_Uint32Defaulted != nil {
-		t.Error("New or Reset did not set uint32:", *pb.F_Uint32Defaulted)
-	}
-	if pb.F_Uint64Defaulted != nil {
-		t.Error("New or Reset did not set uint64:", *pb.F_Uint64Defaulted)
-	}
-	if pb.F_FloatDefaulted != nil {
-		t.Error("New or Reset did not set float:", *pb.F_FloatDefaulted)
-	}
-	if pb.F_DoubleDefaulted != nil {
-		t.Error("New or Reset did not set double:", *pb.F_DoubleDefaulted)
-	}
-	if pb.F_StringDefaulted != nil {
-		t.Error("New or Reset did not set string:", *pb.F_StringDefaulted)
-	}
-	if pb.F_BytesDefaulted != nil {
-		t.Error("New or Reset did not set bytes:", string(pb.F_BytesDefaulted))
-	}
-	if pb.F_Sint32Defaulted != nil {
-		t.Error("New or Reset did not set int32:", *pb.F_Sint32Defaulted)
-	}
-	if pb.F_Sint64Defaulted != nil {
-		t.Error("New or Reset did not set int64:", *pb.F_Sint64Defaulted)
-	}
-}
-
-// Does Reset() reset?
-func TestReset(t *testing.T) {
-	pb := initGoTest(true)
-	// muck with some values
-	pb.F_BoolDefaulted = Bool(false)
-	pb.F_Int32Defaulted = Int32(237)
-	pb.F_Int64Defaulted = Int64(12346)
-	pb.F_Fixed32Defaulted = Uint32(32000)
-	pb.F_Fixed64Defaulted = Uint64(666)
-	pb.F_Uint32Defaulted = Uint32(323232)
-	pb.F_Uint64Defaulted = nil
-	pb.F_FloatDefaulted = nil
-	pb.F_DoubleDefaulted = Float64(0)
-	pb.F_StringDefaulted = String("gotcha")
-	pb.F_BytesDefaulted = []byte("asdfasdf")
-	pb.F_Sint32Defaulted = Int32(123)
-	pb.F_Sint64Defaulted = Int64(789)
-	pb.Reset()
-	checkInitialized(pb, t)
-}
-
-// All required fields set, no defaults provided.
-func TestEncodeDecode1(t *testing.T) {
-	pb := initGoTest(false)
-	overify(t, pb,
-		"0807"+ // field 1, encoding 0, value 7
-			"220d"+"0a056c6162656c120474797065"+ // field 4, encoding 2 (GoTestField)
-			"5001"+ // field 10, encoding 0, value 1
-			"5803"+ // field 11, encoding 0, value 3
-			"6006"+ // field 12, encoding 0, value 6
-			"6d20000000"+ // field 13, encoding 5, value 0x20
-			"714000000000000000"+ // field 14, encoding 1, value 0x40
-			"78a019"+ // field 15, encoding 0, value 0xca0 = 3232
-			"8001c032"+ // field 16, encoding 0, value 0x1940 = 6464
-			"8d0100004a45"+ // field 17, encoding 5, value 3232.0
-			"9101000000000040b940"+ // field 18, encoding 1, value 6464.0
-			"9a0106"+"737472696e67"+ // field 19, encoding 2, string "string"
-			"b304"+ // field 70, encoding 3, start group
-			"ba0408"+"7265717569726564"+ // field 71, encoding 2, string "required"
-			"b404"+ // field 70, encoding 4, end group
-			"aa0605"+"6279746573"+ // field 101, encoding 2, string "bytes"
-			"b0063f"+ // field 102, encoding 0, 0x3f zigzag32
-			"b8067f") // field 103, encoding 0, 0x7f zigzag64
-}
-
-// All required fields set, defaults provided.
-func TestEncodeDecode2(t *testing.T) {
-	pb := initGoTest(true)
-	overify(t, pb,
-		"0807"+ // field 1, encoding 0, value 7
-			"220d"+"0a056c6162656c120474797065"+ // field 4, encoding 2 (GoTestField)
-			"5001"+ // field 10, encoding 0, value 1
-			"5803"+ // field 11, encoding 0, value 3
-			"6006"+ // field 12, encoding 0, value 6
-			"6d20000000"+ // field 13, encoding 5, value 32
-			"714000000000000000"+ // field 14, encoding 1, value 64
-			"78a019"+ // field 15, encoding 0, value 3232
-			"8001c032"+ // field 16, encoding 0, value 6464
-			"8d0100004a45"+ // field 17, encoding 5, value 3232.0
-			"9101000000000040b940"+ // field 18, encoding 1, value 6464.0
-			"9a0106"+"737472696e67"+ // field 19, encoding 2 string "string"
-			"c00201"+ // field 40, encoding 0, value 1
-			"c80220"+ // field 41, encoding 0, value 32
-			"d00240"+ // field 42, encoding 0, value 64
-			"dd0240010000"+ // field 43, encoding 5, value 320
-			"e1028002000000000000"+ // field 44, encoding 1, value 640
-			"e8028019"+ // field 45, encoding 0, value 3200
-			"f0028032"+ // field 46, encoding 0, value 6400
-			"fd02e0659948"+ // field 47, encoding 5, value 314159.0
-			"81030000000050971041"+ // field 48, encoding 1, value 271828.0
-			"8a0310"+"68656c6c6f2c2022776f726c6421220a"+ // field 49, encoding 2 string "hello, \"world!\"\n"
-			"b304"+ // start group field 70 level 1
-			"ba0408"+"7265717569726564"+ // field 71, encoding 2, string "required"
-			"b404"+ // end group field 70 level 1
-			"aa0605"+"6279746573"+ // field 101, encoding 2 string "bytes"
-			"b0063f"+ // field 102, encoding 0, 0x3f zigzag32
-			"b8067f"+ // field 103, encoding 0, 0x7f zigzag64
-			"8a1907"+"4269676e6f7365"+ // field 401, encoding 2, string "Bignose"
-			"90193f"+ // field 402, encoding 0, value 63
-			"98197f") // field 403, encoding 0, value 127
-
-}
-
-// All default fields set to their default value by hand
-func TestEncodeDecode3(t *testing.T) {
-	pb := initGoTest(false)
-	pb.F_BoolDefaulted = Bool(true)
-	pb.F_Int32Defaulted = Int32(32)
-	pb.F_Int64Defaulted = Int64(64)
-	pb.F_Fixed32Defaulted = Uint32(320)
-	pb.F_Fixed64Defaulted = Uint64(640)
-	pb.F_Uint32Defaulted = Uint32(3200)
-	pb.F_Uint64Defaulted = Uint64(6400)
-	pb.F_FloatDefaulted = Float32(314159)
-	pb.F_DoubleDefaulted = Float64(271828)
-	pb.F_StringDefaulted = String("hello, \"world!\"\n")
-	pb.F_BytesDefaulted = []byte("Bignose")
-	pb.F_Sint32Defaulted = Int32(-32)
-	pb.F_Sint64Defaulted = Int64(-64)
-
-	overify(t, pb,
-		"0807"+ // field 1, encoding 0, value 7
-			"220d"+"0a056c6162656c120474797065"+ // field 4, encoding 2 (GoTestField)
-			"5001"+ // field 10, encoding 0, value 1
-			"5803"+ // field 11, encoding 0, value 3
-			"6006"+ // field 12, encoding 0, value 6
-			"6d20000000"+ // field 13, encoding 5, value 32
-			"714000000000000000"+ // field 14, encoding 1, value 64
-			"78a019"+ // field 15, encoding 0, value 3232
-			"8001c032"+ // field 16, encoding 0, value 6464
-			"8d0100004a45"+ // field 17, encoding 5, value 3232.0
-			"9101000000000040b940"+ // field 18, encoding 1, value 6464.0
-			"9a0106"+"737472696e67"+ // field 19, encoding 2 string "string"
-			"c00201"+ // field 40, encoding 0, value 1
-			"c80220"+ // field 41, encoding 0, value 32
-			"d00240"+ // field 42, encoding 0, value 64
-			"dd0240010000"+ // field 43, encoding 5, value 320
-			"e1028002000000000000"+ // field 44, encoding 1, value 640
-			"e8028019"+ // field 45, encoding 0, value 3200
-			"f0028032"+ // field 46, encoding 0, value 6400
-			"fd02e0659948"+ // field 47, encoding 5, value 314159.0
-			"81030000000050971041"+ // field 48, encoding 1, value 271828.0
-			"8a0310"+"68656c6c6f2c2022776f726c6421220a"+ // field 49, encoding 2 string "hello, \"world!\"\n"
-			"b304"+ // start group field 70 level 1
-			"ba0408"+"7265717569726564"+ // field 71, encoding 2, string "required"
-			"b404"+ // end group field 70 level 1
-			"aa0605"+"6279746573"+ // field 101, encoding 2 string "bytes"
-			"b0063f"+ // field 102, encoding 0, 0x3f zigzag32
-			"b8067f"+ // field 103, encoding 0, 0x7f zigzag64
-			"8a1907"+"4269676e6f7365"+ // field 401, encoding 2, string "Bignose"
-			"90193f"+ // field 402, encoding 0, value 63
-			"98197f") // field 403, encoding 0, value 127
-
-}
-
-// All required fields set, defaults provided, all non-defaulted optional fields have values.
-func TestEncodeDecode4(t *testing.T) {
-	pb := initGoTest(true)
-	pb.Table = String("hello")
-	pb.Param = Int32(7)
-	pb.OptionalField = initGoTestField()
-	pb.F_BoolOptional = Bool(true)
-	pb.F_Int32Optional = Int32(32)
-	pb.F_Int64Optional = Int64(64)
-	pb.F_Fixed32Optional = Uint32(3232)
-	pb.F_Fixed64Optional = Uint64(6464)
-	pb.F_Uint32Optional = Uint32(323232)
-	pb.F_Uint64Optional = Uint64(646464)
-	pb.F_FloatOptional = Float32(32.)
-	pb.F_DoubleOptional = Float64(64.)
-	pb.F_StringOptional = String("hello")
-	pb.F_BytesOptional = []byte("Bignose")
-	pb.F_Sint32Optional = Int32(-32)
-	pb.F_Sint64Optional = Int64(-64)
-	pb.Optionalgroup = initGoTest_OptionalGroup()
-
-	overify(t, pb,
-		"0807"+ // field 1, encoding 0, value 7
-			"1205"+"68656c6c6f"+ // field 2, encoding 2, string "hello"
-			"1807"+ // field 3, encoding 0, value 7
-			"220d"+"0a056c6162656c120474797065"+ // field 4, encoding 2 (GoTestField)
-			"320d"+"0a056c6162656c120474797065"+ // field 6, encoding 2 (GoTestField)
-			"5001"+ // field 10, encoding 0, value 1
-			"5803"+ // field 11, encoding 0, value 3
-			"6006"+ // field 12, encoding 0, value 6
-			"6d20000000"+ // field 13, encoding 5, value 32
-			"714000000000000000"+ // field 14, encoding 1, value 64
-			"78a019"+ // field 15, encoding 0, value 3232
-			"8001c032"+ // field 16, encoding 0, value 6464
-			"8d0100004a45"+ // field 17, encoding 5, value 3232.0
-			"9101000000000040b940"+ // field 18, encoding 1, value 6464.0
-			"9a0106"+"737472696e67"+ // field 19, encoding 2 string "string"
-			"f00101"+ // field 30, encoding 0, value 1
-			"f80120"+ // field 31, encoding 0, value 32
-			"800240"+ // field 32, encoding 0, value 64
-			"8d02a00c0000"+ // field 33, encoding 5, value 3232
-			"91024019000000000000"+ // field 34, encoding 1, value 6464
-			"9802a0dd13"+ // field 35, encoding 0, value 323232
-			"a002c0ba27"+ // field 36, encoding 0, value 646464
-			"ad0200000042"+ // field 37, encoding 5, value 32.0
-			"b1020000000000005040"+ // field 38, encoding 1, value 64.0
-			"ba0205"+"68656c6c6f"+ // field 39, encoding 2, string "hello"
-			"c00201"+ // field 40, encoding 0, value 1
-			"c80220"+ // field 41, encoding 0, value 32
-			"d00240"+ // field 42, encoding 0, value 64
-			"dd0240010000"+ // field 43, encoding 5, value 320
-			"e1028002000000000000"+ // field 44, encoding 1, value 640
-			"e8028019"+ // field 45, encoding 0, value 3200
-			"f0028032"+ // field 46, encoding 0, value 6400
-			"fd02e0659948"+ // field 47, encoding 5, value 314159.0
-			"81030000000050971041"+ // field 48, encoding 1, value 271828.0
-			"8a0310"+"68656c6c6f2c2022776f726c6421220a"+ // field 49, encoding 2 string "hello, \"world!\"\n"
-			"b304"+ // start group field 70 level 1
-			"ba0408"+"7265717569726564"+ // field 71, encoding 2, string "required"
-			"b404"+ // end group field 70 level 1
-			"d305"+ // start group field 90 level 1
-			"da0508"+"6f7074696f6e616c"+ // field 91, encoding 2, string "optional"
-			"d405"+ // end group field 90 level 1
-			"aa0605"+"6279746573"+ // field 101, encoding 2 string "bytes"
-			"b0063f"+ // field 102, encoding 0, 0x3f zigzag32
-			"b8067f"+ // field 103, encoding 0, 0x7f zigzag64
-			"ea1207"+"4269676e6f7365"+ // field 301, encoding 2, string "Bignose"
-			"f0123f"+ // field 302, encoding 0, value 63
-			"f8127f"+ // field 303, encoding 0, value 127
-			"8a1907"+"4269676e6f7365"+ // field 401, encoding 2, string "Bignose"
-			"90193f"+ // field 402, encoding 0, value 63
-			"98197f") // field 403, encoding 0, value 127
-
-}
-
-// All required fields set, defaults provided, all repeated fields given two values.
-func TestEncodeDecode5(t *testing.T) {
-	pb := initGoTest(true)
-	pb.RepeatedField = []*GoTestField{initGoTestField(), initGoTestField()}
-	pb.F_BoolRepeated = []bool{false, true}
-	pb.F_Int32Repeated = []int32{32, 33}
-	pb.F_Int64Repeated = []int64{64, 65}
-	pb.F_Fixed32Repeated = []uint32{3232, 3333}
-	pb.F_Fixed64Repeated = []uint64{6464, 6565}
-	pb.F_Uint32Repeated = []uint32{323232, 333333}
-	pb.F_Uint64Repeated = []uint64{646464, 656565}
-	pb.F_FloatRepeated = []float32{32., 33.}
-	pb.F_DoubleRepeated = []float64{64., 65.}
-	pb.F_StringRepeated = []string{"hello", "sailor"}
-	pb.F_BytesRepeated = [][]byte{[]byte("big"), []byte("nose")}
-	pb.F_Sint32Repeated = []int32{32, -32}
-	pb.F_Sint64Repeated = []int64{64, -64}
-	pb.Repeatedgroup = []*GoTest_RepeatedGroup{initGoTest_RepeatedGroup(), initGoTest_RepeatedGroup()}
-
-	overify(t, pb,
-		"0807"+ // field 1, encoding 0, value 7
-			"220d"+"0a056c6162656c120474797065"+ // field 4, encoding 2 (GoTestField)
-			"2a0d"+"0a056c6162656c120474797065"+ // field 5, encoding 2 (GoTestField)
-			"2a0d"+"0a056c6162656c120474797065"+ // field 5, encoding 2 (GoTestField)
-			"5001"+ // field 10, encoding 0, value 1
-			"5803"+ // field 11, encoding 0, value 3
-			"6006"+ // field 12, encoding 0, value 6
-			"6d20000000"+ // field 13, encoding 5, value 32
-			"714000000000000000"+ // field 14, encoding 1, value 64
-			"78a019"+ // field 15, encoding 0, value 3232
-			"8001c032"+ // field 16, encoding 0, value 6464
-			"8d0100004a45"+ // field 17, encoding 5, value 3232.0
-			"9101000000000040b940"+ // field 18, encoding 1, value 6464.0
-			"9a0106"+"737472696e67"+ // field 19, encoding 2 string "string"
-			"a00100"+ // field 20, encoding 0, value 0
-			"a00101"+ // field 20, encoding 0, value 1
-			"a80120"+ // field 21, encoding 0, value 32
-			"a80121"+ // field 21, encoding 0, value 33
-			"b00140"+ // field 22, encoding 0, value 64
-			"b00141"+ // field 22, encoding 0, value 65
-			"bd01a00c0000"+ // field 23, encoding 5, value 3232
-			"bd01050d0000"+ // field 23, encoding 5, value 3333
-			"c1014019000000000000"+ // field 24, encoding 1, value 6464
-			"c101a519000000000000"+ // field 24, encoding 1, value 6565
-			"c801a0dd13"+ // field 25, encoding 0, value 323232
-			"c80195ac14"+ // field 25, encoding 0, value 333333
-			"d001c0ba27"+ // field 26, encoding 0, value 646464
-			"d001b58928"+ // field 26, encoding 0, value 656565
-			"dd0100000042"+ // field 27, encoding 5, value 32.0
-			"dd0100000442"+ // field 27, encoding 5, value 33.0
-			"e1010000000000005040"+ // field 28, encoding 1, value 64.0
-			"e1010000000000405040"+ // field 28, encoding 1, value 65.0
-			"ea0105"+"68656c6c6f"+ // field 29, encoding 2, string "hello"
-			"ea0106"+"7361696c6f72"+ // field 29, encoding 2, string "sailor"
-			"c00201"+ // field 40, encoding 0, value 1
-			"c80220"+ // field 41, encoding 0, value 32
-			"d00240"+ // field 42, encoding 0, value 64
-			"dd0240010000"+ // field 43, encoding 5, value 320
-			"e1028002000000000000"+ // field 44, encoding 1, value 640
-			"e8028019"+ // field 45, encoding 0, value 3200
-			"f0028032"+ // field 46, encoding 0, value 6400
-			"fd02e0659948"+ // field 47, encoding 5, value 314159.0
-			"81030000000050971041"+ // field 48, encoding 1, value 271828.0
-			"8a0310"+"68656c6c6f2c2022776f726c6421220a"+ // field 49, encoding 2 string "hello, \"world!\"\n"
-			"b304"+ // start group field 70 level 1
-			"ba0408"+"7265717569726564"+ // field 71, encoding 2, string "required"
-			"b404"+ // end group field 70 level 1
-			"8305"+ // start group field 80 level 1
-			"8a0508"+"7265706561746564"+ // field 81, encoding 2, string "repeated"
-			"8405"+ // end group field 80 level 1
-			"8305"+ // start group field 80 level 1
-			"8a0508"+"7265706561746564"+ // field 81, encoding 2, string "repeated"
-			"8405"+ // end group field 80 level 1
-			"aa0605"+"6279746573"+ // field 101, encoding 2 string "bytes"
-			"b0063f"+ // field 102, encoding 0, 0x3f zigzag32
-			"b8067f"+ // field 103, encoding 0, 0x7f zigzag64
-			"ca0c03"+"626967"+ // field 201, encoding 2, string "big"
-			"ca0c04"+"6e6f7365"+ // field 201, encoding 2, string "nose"
-			"d00c40"+ // field 202, encoding 0, value 32
-			"d00c3f"+ // field 202, encoding 0, value -32
-			"d80c8001"+ // field 203, encoding 0, value 64
-			"d80c7f"+ // field 203, encoding 0, value -64
-			"8a1907"+"4269676e6f7365"+ // field 401, encoding 2, string "Bignose"
-			"90193f"+ // field 402, encoding 0, value 63
-			"98197f") // field 403, encoding 0, value 127
-
-}
-
-// All required fields set, all packed repeated fields given two values.
-func TestEncodeDecode6(t *testing.T) {
-	pb := initGoTest(false)
-	pb.F_BoolRepeatedPacked = []bool{false, true}
-	pb.F_Int32RepeatedPacked = []int32{32, 33}
-	pb.F_Int64RepeatedPacked = []int64{64, 65}
-	pb.F_Fixed32RepeatedPacked = []uint32{3232, 3333}
-	pb.F_Fixed64RepeatedPacked = []uint64{6464, 6565}
-	pb.F_Uint32RepeatedPacked = []uint32{323232, 333333}
-	pb.F_Uint64RepeatedPacked = []uint64{646464, 656565}
-	pb.F_FloatRepeatedPacked = []float32{32., 33.}
-	pb.F_DoubleRepeatedPacked = []float64{64., 65.}
-	pb.F_Sint32RepeatedPacked = []int32{32, -32}
-	pb.F_Sint64RepeatedPacked = []int64{64, -64}
-
-	overify(t, pb,
-		"0807"+ // field 1, encoding 0, value 7
-			"220d"+"0a056c6162656c120474797065"+ // field 4, encoding 2 (GoTestField)
-			"5001"+ // field 10, encoding 0, value 1
-			"5803"+ // field 11, encoding 0, value 3
-			"6006"+ // field 12, encoding 0, value 6
-			"6d20000000"+ // field 13, encoding 5, value 32
-			"714000000000000000"+ // field 14, encoding 1, value 64
-			"78a019"+ // field 15, encoding 0, value 3232
-			"8001c032"+ // field 16, encoding 0, value 6464
-			"8d0100004a45"+ // field 17, encoding 5, value 3232.0
-			"9101000000000040b940"+ // field 18, encoding 1, value 6464.0
-			"9a0106"+"737472696e67"+ // field 19, encoding 2 string "string"
-			"9203020001"+ // field 50, encoding 2, 2 bytes, value 0, value 1
-			"9a03022021"+ // field 51, encoding 2, 2 bytes, value 32, value 33
-			"a203024041"+ // field 52, encoding 2, 2 bytes, value 64, value 65
-			"aa0308"+ // field 53, encoding 2, 8 bytes
-			"a00c0000050d0000"+ // value 3232, value 3333
-			"b20310"+ // field 54, encoding 2, 16 bytes
-			"4019000000000000a519000000000000"+ // value 6464, value 6565
-			"ba0306"+ // field 55, encoding 2, 6 bytes
-			"a0dd1395ac14"+ // value 323232, value 333333
-			"c20306"+ // field 56, encoding 2, 6 bytes
-			"c0ba27b58928"+ // value 646464, value 656565
-			"ca0308"+ // field 57, encoding 2, 8 bytes
-			"0000004200000442"+ // value 32.0, value 33.0
-			"d20310"+ // field 58, encoding 2, 16 bytes
-			"00000000000050400000000000405040"+ // value 64.0, value 65.0
-			"b304"+ // start group field 70 level 1
-			"ba0408"+"7265717569726564"+ // field 71, encoding 2, string "required"
-			"b404"+ // end group field 70 level 1
-			"aa0605"+"6279746573"+ // field 101, encoding 2 string "bytes"
-			"b0063f"+ // field 102, encoding 0, 0x3f zigzag32
-			"b8067f"+ // field 103, encoding 0, 0x7f zigzag64
-			"b21f02"+ // field 502, encoding 2, 2 bytes
-			"403f"+ // value 32, value -32
-			"ba1f03"+ // field 503, encoding 2, 3 bytes
-			"80017f") // value 64, value -64
-}
-
-// Test that we can encode empty bytes fields.
-func TestEncodeDecodeBytes1(t *testing.T) {
-	pb := initGoTest(false)
-
-	// Create our bytes
-	pb.F_BytesRequired = []byte{}
-	pb.F_BytesRepeated = [][]byte{{}}
-	pb.F_BytesOptional = []byte{}
-
-	d, err := Marshal(pb)
-	if err != nil {
-		t.Error(err)
-	}
-
-	pbd := new(GoTest)
-	if err := Unmarshal(d, pbd); err != nil {
-		t.Error(err)
-	}
-
-	if pbd.F_BytesRequired == nil || len(pbd.F_BytesRequired) != 0 {
-		t.Error("required empty bytes field is incorrect")
-	}
-	if pbd.F_BytesRepeated == nil || len(pbd.F_BytesRepeated) == 1 && pbd.F_BytesRepeated[0] == nil {
-		t.Error("repeated empty bytes field is incorrect")
-	}
-	if pbd.F_BytesOptional == nil || len(pbd.F_BytesOptional) != 0 {
-		t.Error("optional empty bytes field is incorrect")
-	}
-}
-
-// Test that we encode nil-valued fields of a repeated bytes field correctly.
-// Since entries in a repeated field cannot be nil, nil must mean empty value.
-func TestEncodeDecodeBytes2(t *testing.T) {
-	pb := initGoTest(false)
-
-	// Create our bytes
-	pb.F_BytesRepeated = [][]byte{nil}
-
-	d, err := Marshal(pb)
-	if err != nil {
-		t.Error(err)
-	}
-
-	pbd := new(GoTest)
-	if err := Unmarshal(d, pbd); err != nil {
-		t.Error(err)
-	}
-
-	if len(pbd.F_BytesRepeated) != 1 || pbd.F_BytesRepeated[0] == nil {
-		t.Error("Unexpected value for repeated bytes field")
-	}
-}
-
-// All required fields set, defaults provided, all repeated fields given two values.
-func TestSkippingUnrecognizedFields(t *testing.T) {
-	o := old()
-	pb := initGoTestField()
-
-	// Marshal it normally.
-	o.Marshal(pb)
-
-	// Now new a GoSkipTest record.
-	skip := &GoSkipTest{
-		SkipInt32:   Int32(32),
-		SkipFixed32: Uint32(3232),
-		SkipFixed64: Uint64(6464),
-		SkipString:  String("skipper"),
-		Skipgroup: &GoSkipTest_SkipGroup{
-			GroupInt32:  Int32(75),
-			GroupString: String("wxyz"),
-		},
-	}
-
-	// Marshal it into same buffer.
-	o.Marshal(skip)
-
-	pbd := new(GoTestField)
-	o.Unmarshal(pbd)
-
-	// The __unrecognized field should be a marshaling of GoSkipTest
-	skipd := new(GoSkipTest)
-
-	o.SetBuf(pbd.XXX_unrecognized)
-	o.Unmarshal(skipd)
-
-	if *skipd.SkipInt32 != *skip.SkipInt32 {
-		t.Error("skip int32", skipd.SkipInt32)
-	}
-	if *skipd.SkipFixed32 != *skip.SkipFixed32 {
-		t.Error("skip fixed32", skipd.SkipFixed32)
-	}
-	if *skipd.SkipFixed64 != *skip.SkipFixed64 {
-		t.Error("skip fixed64", skipd.SkipFixed64)
-	}
-	if *skipd.SkipString != *skip.SkipString {
-		t.Error("skip string", *skipd.SkipString)
-	}
-	if *skipd.Skipgroup.GroupInt32 != *skip.Skipgroup.GroupInt32 {
-		t.Error("skip group int32", skipd.Skipgroup.GroupInt32)
-	}
-	if *skipd.Skipgroup.GroupString != *skip.Skipgroup.GroupString {
-		t.Error("skip group string", *skipd.Skipgroup.GroupString)
-	}
-}
-
-// Check that unrecognized fields of a submessage are preserved.
-func TestSubmessageUnrecognizedFields(t *testing.T) {
-	nm := &NewMessage{
-		Nested: &NewMessage_Nested{
-			Name:      String("Nigel"),
-			FoodGroup: String("carbs"),
-		},
-	}
-	b, err := Marshal(nm)
-	if err != nil {
-		t.Fatalf("Marshal of NewMessage: %v", err)
-	}
-
-	// Unmarshal into an OldMessage.
-	om := new(OldMessage)
-	if err := Unmarshal(b, om); err != nil {
-		t.Fatalf("Unmarshal to OldMessage: %v", err)
-	}
-	exp := &OldMessage{
-		Nested: &OldMessage_Nested{
-			Name: String("Nigel"),
-			// normal protocol buffer users should not do this
-			XXX_unrecognized: []byte("\x12\x05carbs"),
-		},
-	}
-	if !Equal(om, exp) {
-		t.Errorf("om = %v, want %v", om, exp)
-	}
-
-	// Clone the OldMessage.
-	om = Clone(om).(*OldMessage)
-	if !Equal(om, exp) {
-		t.Errorf("Clone(om) = %v, want %v", om, exp)
-	}
-
-	// Marshal the OldMessage, then unmarshal it into an empty NewMessage.
-	if b, err = Marshal(om); err != nil {
-		t.Fatalf("Marshal of OldMessage: %v", err)
-	}
-	t.Logf("Marshal(%v) -> %q", om, b)
-	nm2 := new(NewMessage)
-	if err := Unmarshal(b, nm2); err != nil {
-		t.Fatalf("Unmarshal to NewMessage: %v", err)
-	}
-	if !Equal(nm, nm2) {
-		t.Errorf("NewMessage round-trip: %v => %v", nm, nm2)
-	}
-}
-
-// Check that an int32 field can be upgraded to an int64 field.
-func TestNegativeInt32(t *testing.T) {
-	om := &OldMessage{
-		Num: Int32(-1),
-	}
-	b, err := Marshal(om)
-	if err != nil {
-		t.Fatalf("Marshal of OldMessage: %v", err)
-	}
-
-	// Check the size. It should be 11 bytes;
-	// 1 for the field/wire type, and 10 for the negative number.
-	if len(b) != 11 {
-		t.Errorf("%v marshaled as %q, wanted 11 bytes", om, b)
-	}
-
-	// Unmarshal into a NewMessage.
-	nm := new(NewMessage)
-	if err := Unmarshal(b, nm); err != nil {
-		t.Fatalf("Unmarshal to NewMessage: %v", err)
-	}
-	want := &NewMessage{
-		Num: Int64(-1),
-	}
-	if !Equal(nm, want) {
-		t.Errorf("nm = %v, want %v", nm, want)
-	}
-}
-
-// Check that we can grow an array (repeated field) to have many elements.
-// This test doesn't depend only on our encoding; for variety, it makes sure
-// we create, encode, and decode the correct contents explicitly.  It's therefore
-// a bit messier.
-// This test also uses (and hence tests) the Marshal/Unmarshal functions
-// instead of the methods.
-func TestBigRepeated(t *testing.T) {
-	pb := initGoTest(true)
-
-	// Create the arrays
-	const N = 50 // Internally the library starts much smaller.
-	pb.Repeatedgroup = make([]*GoTest_RepeatedGroup, N)
-	pb.F_Sint64Repeated = make([]int64, N)
-	pb.F_Sint32Repeated = make([]int32, N)
-	pb.F_BytesRepeated = make([][]byte, N)
-	pb.F_StringRepeated = make([]string, N)
-	pb.F_DoubleRepeated = make([]float64, N)
-	pb.F_FloatRepeated = make([]float32, N)
-	pb.F_Uint64Repeated = make([]uint64, N)
-	pb.F_Uint32Repeated = make([]uint32, N)
-	pb.F_Fixed64Repeated = make([]uint64, N)
-	pb.F_Fixed32Repeated = make([]uint32, N)
-	pb.F_Int64Repeated = make([]int64, N)
-	pb.F_Int32Repeated = make([]int32, N)
-	pb.F_BoolRepeated = make([]bool, N)
-	pb.RepeatedField = make([]*GoTestField, N)
-
-	// Fill in the arrays with checkable values.
-	igtf := initGoTestField()
-	igtrg := initGoTest_RepeatedGroup()
-	for i := 0; i < N; i++ {
-		pb.Repeatedgroup[i] = igtrg
-		pb.F_Sint64Repeated[i] = int64(i)
-		pb.F_Sint32Repeated[i] = int32(i)
-		s := fmt.Sprint(i)
-		pb.F_BytesRepeated[i] = []byte(s)
-		pb.F_StringRepeated[i] = s
-		pb.F_DoubleRepeated[i] = float64(i)
-		pb.F_FloatRepeated[i] = float32(i)
-		pb.F_Uint64Repeated[i] = uint64(i)
-		pb.F_Uint32Repeated[i] = uint32(i)
-		pb.F_Fixed64Repeated[i] = uint64(i)
-		pb.F_Fixed32Repeated[i] = uint32(i)
-		pb.F_Int64Repeated[i] = int64(i)
-		pb.F_Int32Repeated[i] = int32(i)
-		pb.F_BoolRepeated[i] = i%2 == 0
-		pb.RepeatedField[i] = igtf
-	}
-
-	// Marshal.
-	buf, _ := Marshal(pb)
-
-	// Now test Unmarshal by recreating the original buffer.
-	pbd := new(GoTest)
-	Unmarshal(buf, pbd)
-
-	// Check the checkable values
-	for i := uint64(0); i < N; i++ {
-		if pbd.Repeatedgroup[i] == nil { // TODO: more checking?
-			t.Error("pbd.Repeatedgroup bad")
-		}
-		var x uint64
-		x = uint64(pbd.F_Sint64Repeated[i])
-		if x != i {
-			t.Error("pbd.F_Sint64Repeated bad", x, i)
-		}
-		x = uint64(pbd.F_Sint32Repeated[i])
-		if x != i {
-			t.Error("pbd.F_Sint32Repeated bad", x, i)
-		}
-		s := fmt.Sprint(i)
-		equalbytes(pbd.F_BytesRepeated[i], []byte(s), t)
-		if pbd.F_StringRepeated[i] != s {
-			t.Error("pbd.F_Sint32Repeated bad", pbd.F_StringRepeated[i], i)
-		}
-		x = uint64(pbd.F_DoubleRepeated[i])
-		if x != i {
-			t.Error("pbd.F_DoubleRepeated bad", x, i)
-		}
-		x = uint64(pbd.F_FloatRepeated[i])
-		if x != i {
-			t.Error("pbd.F_FloatRepeated bad", x, i)
-		}
-		x = pbd.F_Uint64Repeated[i]
-		if x != i {
-			t.Error("pbd.F_Uint64Repeated bad", x, i)
-		}
-		x = uint64(pbd.F_Uint32Repeated[i])
-		if x != i {
-			t.Error("pbd.F_Uint32Repeated bad", x, i)
-		}
-		x = pbd.F_Fixed64Repeated[i]
-		if x != i {
-			t.Error("pbd.F_Fixed64Repeated bad", x, i)
-		}
-		x = uint64(pbd.F_Fixed32Repeated[i])
-		if x != i {
-			t.Error("pbd.F_Fixed32Repeated bad", x, i)
-		}
-		x = uint64(pbd.F_Int64Repeated[i])
-		if x != i {
-			t.Error("pbd.F_Int64Repeated bad", x, i)
-		}
-		x = uint64(pbd.F_Int32Repeated[i])
-		if x != i {
-			t.Error("pbd.F_Int32Repeated bad", x, i)
-		}
-		if pbd.F_BoolRepeated[i] != (i%2 == 0) {
-			t.Error("pbd.F_BoolRepeated bad", x, i)
-		}
-		if pbd.RepeatedField[i] == nil { // TODO: more checking?
-			t.Error("pbd.RepeatedField bad")
-		}
-	}
-}
-
-// Verify we give a useful message when decoding to the wrong structure type.
-func TestTypeMismatch(t *testing.T) {
-	pb1 := initGoTest(true)
-
-	// Marshal
-	o := old()
-	o.Marshal(pb1)
-
-	// Now Unmarshal it to the wrong type.
-	pb2 := initGoTestField()
-	err := o.Unmarshal(pb2)
-	if err == nil {
-		t.Error("expected error, got no error")
-	} else if !strings.Contains(err.Error(), "bad wiretype") {
-		t.Error("expected bad wiretype error, got", err)
-	}
-}
-
-func encodeDecode(t *testing.T, in, out Message, msg string) {
-	buf, err := Marshal(in)
-	if err != nil {
-		t.Fatalf("failed marshaling %v: %v", msg, err)
-	}
-	if err := Unmarshal(buf, out); err != nil {
-		t.Fatalf("failed unmarshaling %v: %v", msg, err)
-	}
-}
-
-func TestPackedNonPackedDecoderSwitching(t *testing.T) {
-	np, p := new(NonPackedTest), new(PackedTest)
-
-	// non-packed -> packed
-	np.A = []int32{0, 1, 1, 2, 3, 5}
-	encodeDecode(t, np, p, "non-packed -> packed")
-	if !reflect.DeepEqual(np.A, p.B) {
-		t.Errorf("failed non-packed -> packed; np.A=%+v, p.B=%+v", np.A, p.B)
-	}
-
-	// packed -> non-packed
-	np.Reset()
-	p.B = []int32{3, 1, 4, 1, 5, 9}
-	encodeDecode(t, p, np, "packed -> non-packed")
-	if !reflect.DeepEqual(p.B, np.A) {
-		t.Errorf("failed packed -> non-packed; p.B=%+v, np.A=%+v", p.B, np.A)
-	}
-}
-
-func TestProto1RepeatedGroup(t *testing.T) {
-	pb := &MessageList{
-		Message: []*MessageList_Message{
-			{
-				Name:  String("blah"),
-				Count: Int32(7),
-			},
-			// NOTE: pb.Message[1] is a nil
-			nil,
-		},
-	}
-
-	o := old()
-	err := o.Marshal(pb)
-	if err == nil || !strings.Contains(err.Error(), "repeated field Message has nil") {
-		t.Fatalf("unexpected or no error when marshaling: %v", err)
-	}
-}
-
-// Test that enums work.  Checks for a bug introduced by making enums
-// named types instead of int32: newInt32FromUint64 would crash with
-// a type mismatch in reflect.PointTo.
-func TestEnum(t *testing.T) {
-	pb := new(GoEnum)
-	pb.Foo = FOO_FOO1.Enum()
-	o := old()
-	if err := o.Marshal(pb); err != nil {
-		t.Fatal("error encoding enum:", err)
-	}
-	pb1 := new(GoEnum)
-	if err := o.Unmarshal(pb1); err != nil {
-		t.Fatal("error decoding enum:", err)
-	}
-	if *pb1.Foo != FOO_FOO1 {
-		t.Error("expected 7 but got ", *pb1.Foo)
-	}
-}
-
-// Enum types have String methods. Check that enum fields can be printed.
-// We don't care what the value actually is, just as long as it doesn't crash.
-func TestPrintingNilEnumFields(t *testing.T) {
-	pb := new(GoEnum)
-	fmt.Sprintf("%+v", pb)
-}
-
-// Verify that absent required fields cause Marshal/Unmarshal to return errors.
-func TestRequiredFieldEnforcement(t *testing.T) {
-	pb := new(GoTestField)
-	_, err := Marshal(pb)
-	if err == nil {
-		t.Error("marshal: expected error, got nil")
-	} else if strings.Index(err.Error(), "Label") < 0 {
-		t.Errorf("marshal: bad error type: %v", err)
-	}
-
-	// A slightly sneaky, yet valid, proto. It encodes the same required field twice,
-	// so simply counting the required fields is insufficient.
-	// field 1, encoding 2, value "hi"
-	buf := []byte("\x0A\x02hi\x0A\x02hi")
-	err = Unmarshal(buf, pb)
-	if err == nil {
-		t.Error("unmarshal: expected error, got nil")
-	} else if strings.Index(err.Error(), "{Unknown}") < 0 {
-		t.Errorf("unmarshal: bad error type: %v", err)
-	}
-}
-
-func TestTypedNilMarshal(t *testing.T) {
-	// A typed nil should return ErrNil and not crash.
-	_, err := Marshal((*GoEnum)(nil))
-	if err != ErrNil {
-		t.Errorf("Marshal: got err %v, want ErrNil", err)
-	}
-}
-
-// A type that implements the Marshaler interface, but is not nillable.
-type nonNillableInt uint64
-
-func (nni nonNillableInt) Marshal() ([]byte, error) {
-	return EncodeVarint(uint64(nni)), nil
-}
-
-type NNIMessage struct {
-	nni nonNillableInt
-}
-
-func (*NNIMessage) Reset()         {}
-func (*NNIMessage) String() string { return "" }
-func (*NNIMessage) ProtoMessage()  {}
-
-// A type that implements the Marshaler interface and is nillable.
-type nillableMessage struct {
-	x uint64
-}
-
-func (nm *nillableMessage) Marshal() ([]byte, error) {
-	return EncodeVarint(nm.x), nil
-}
-
-type NMMessage struct {
-	nm *nillableMessage
-}
-
-func (*NMMessage) Reset()         {}
-func (*NMMessage) String() string { return "" }
-func (*NMMessage) ProtoMessage()  {}
-
-// Verify a type that uses the Marshaler interface, but has a nil pointer.
-func TestNilMarshaler(t *testing.T) {
-	// Try a struct with a Marshaler field that is nil.
-	// It should be directly marshable.
-	nmm := new(NMMessage)
-	if _, err := Marshal(nmm); err != nil {
-		t.Error("unexpected error marshaling nmm: ", err)
-	}
-
-	// Try a struct with a Marshaler field that is not nillable.
-	nnim := new(NNIMessage)
-	nnim.nni = 7
-	var _ Marshaler = nnim.nni // verify it is truly a Marshaler
-	if _, err := Marshal(nnim); err != nil {
-		t.Error("unexpected error marshaling nnim: ", err)
-	}
-}
-
-func TestAllSetDefaults(t *testing.T) {
-	// Exercise SetDefaults with all scalar field types.
-	m := &Defaults{
-		// NaN != NaN, so override that here.
-		F_Nan: Float32(1.7),
-	}
-	expected := &Defaults{
-		F_Bool:    Bool(true),
-		F_Int32:   Int32(32),
-		F_Int64:   Int64(64),
-		F_Fixed32: Uint32(320),
-		F_Fixed64: Uint64(640),
-		F_Uint32:  Uint32(3200),
-		F_Uint64:  Uint64(6400),
-		F_Float:   Float32(314159),
-		F_Double:  Float64(271828),
-		F_String:  String(`hello, "world!"` + "\n"),
-		F_Bytes:   []byte("Bignose"),
-		F_Sint32:  Int32(-32),
-		F_Sint64:  Int64(-64),
-		F_Enum:    Defaults_GREEN.Enum(),
-		F_Pinf:    Float32(float32(math.Inf(1))),
-		F_Ninf:    Float32(float32(math.Inf(-1))),
-		F_Nan:     Float32(1.7),
-		StrZero:   String(""),
-	}
-	SetDefaults(m)
-	if !Equal(m, expected) {
-		t.Errorf("SetDefaults failed\n got %v\nwant %v", m, expected)
-	}
-}
-
-func TestSetDefaultsWithSetField(t *testing.T) {
-	// Check that a set value is not overridden.
-	m := &Defaults{
-		F_Int32: Int32(12),
-	}
-	SetDefaults(m)
-	if v := m.GetF_Int32(); v != 12 {
-		t.Errorf("m.FInt32 = %v, want 12", v)
-	}
-}
-
-func TestSetDefaultsWithSubMessage(t *testing.T) {
-	m := &OtherMessage{
-		Key: Int64(123),
-		Inner: &InnerMessage{
-			Host: String("gopher"),
-		},
-	}
-	expected := &OtherMessage{
-		Key: Int64(123),
-		Inner: &InnerMessage{
-			Host: String("gopher"),
-			Port: Int32(4000),
-		},
-	}
-	SetDefaults(m)
-	if !Equal(m, expected) {
-		t.Errorf("\n got %v\nwant %v", m, expected)
-	}
-}
-
-func TestSetDefaultsWithRepeatedSubMessage(t *testing.T) {
-	m := &MyMessage{
-		RepInner: []*InnerMessage{{}},
-	}
-	expected := &MyMessage{
-		RepInner: []*InnerMessage{{
-			Port: Int32(4000),
-		}},
-	}
-	SetDefaults(m)
-	if !Equal(m, expected) {
-		t.Errorf("\n got %v\nwant %v", m, expected)
-	}
-}
-
-func TestSetDefaultWithRepeatedNonMessage(t *testing.T) {
-	m := &MyMessage{
-		Pet: []string{"turtle", "wombat"},
-	}
-	expected := Clone(m)
-	SetDefaults(m)
-	if !Equal(m, expected) {
-		t.Errorf("\n got %v\nwant %v", m, expected)
-	}
-}
-
-func TestMaximumTagNumber(t *testing.T) {
-	m := &MaxTag{
-		LastField: String("natural goat essence"),
-	}
-	buf, err := Marshal(m)
-	if err != nil {
-		t.Fatalf("proto.Marshal failed: %v", err)
-	}
-	m2 := new(MaxTag)
-	if err := Unmarshal(buf, m2); err != nil {
-		t.Fatalf("proto.Unmarshal failed: %v", err)
-	}
-	if got, want := m2.GetLastField(), *m.LastField; got != want {
-		t.Errorf("got %q, want %q", got, want)
-	}
-}
-
-func TestJSON(t *testing.T) {
-	m := &MyMessage{
-		Count: Int32(4),
-		Pet:   []string{"bunny", "kitty"},
-		Inner: &InnerMessage{
-			Host: String("cauchy"),
-		},
-		Bikeshed: MyMessage_GREEN.Enum(),
-	}
-	const expected = `{"count":4,"pet":["bunny","kitty"],"inner":{"host":"cauchy"},"bikeshed":1}`
-
-	b, err := json.Marshal(m)
-	if err != nil {
-		t.Fatalf("json.Marshal failed: %v", err)
-	}
-	s := string(b)
-	if s != expected {
-		t.Errorf("got  %s\nwant %s", s, expected)
-	}
-
-	received := new(MyMessage)
-	if err := json.Unmarshal(b, received); err != nil {
-		t.Fatalf("json.Unmarshal failed: %v", err)
-	}
-	if !Equal(received, m) {
-		t.Fatalf("got %s, want %s", received, m)
-	}
-
-	// Test unmarshalling of JSON with symbolic enum name.
-	const old = `{"count":4,"pet":["bunny","kitty"],"inner":{"host":"cauchy"},"bikeshed":"GREEN"}`
-	received.Reset()
-	if err := json.Unmarshal([]byte(old), received); err != nil {
-		t.Fatalf("json.Unmarshal failed: %v", err)
-	}
-	if !Equal(received, m) {
-		t.Fatalf("got %s, want %s", received, m)
-	}
-}
-
-func TestBadWireType(t *testing.T) {
-	b := []byte{7<<3 | 6} // field 7, wire type 6
-	pb := new(OtherMessage)
-	if err := Unmarshal(b, pb); err == nil {
-		t.Errorf("Unmarshal did not fail")
-	} else if !strings.Contains(err.Error(), "unknown wire type") {
-		t.Errorf("wrong error: %v", err)
-	}
-}
-
-func TestBytesWithInvalidLength(t *testing.T) {
-	// If a byte sequence has an invalid (negative) length, Unmarshal should not panic.
-	b := []byte{2<<3 | WireBytes, 0xff, 0xff, 0xff, 0xff, 0xff, 0}
-	Unmarshal(b, new(MyMessage))
-}
-
-func TestLengthOverflow(t *testing.T) {
-	// Overflowing a length should not panic.
-	b := []byte{2<<3 | WireBytes, 1, 1, 3<<3 | WireBytes, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x01}
-	Unmarshal(b, new(MyMessage))
-}
-
-func TestVarintOverflow(t *testing.T) {
-	// Overflowing a 64-bit length should not be allowed.
-	b := []byte{1<<3 | WireVarint, 0x01, 3<<3 | WireBytes, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x01}
-	if err := Unmarshal(b, new(MyMessage)); err == nil {
-		t.Fatalf("Overflowed uint64 length without error")
-	}
-}
-
-func TestUnmarshalFuzz(t *testing.T) {
-	const N = 1000
-	seed := time.Now().UnixNano()
-	t.Logf("RNG seed is %d", seed)
-	rng := rand.New(rand.NewSource(seed))
-	buf := make([]byte, 20)
-	for i := 0; i < N; i++ {
-		for j := range buf {
-			buf[j] = byte(rng.Intn(256))
-		}
-		fuzzUnmarshal(t, buf)
-	}
-}
-
-func TestMergeMessages(t *testing.T) {
-	pb := &MessageList{Message: []*MessageList_Message{{Name: String("x"), Count: Int32(1)}}}
-	data, err := Marshal(pb)
-	if err != nil {
-		t.Fatalf("Marshal: %v", err)
-	}
-
-	pb1 := new(MessageList)
-	if err := Unmarshal(data, pb1); err != nil {
-		t.Fatalf("first Unmarshal: %v", err)
-	}
-	if err := Unmarshal(data, pb1); err != nil {
-		t.Fatalf("second Unmarshal: %v", err)
-	}
-	if len(pb1.Message) != 1 {
-		t.Errorf("two Unmarshals produced %d Messages, want 1", len(pb1.Message))
-	}
-
-	pb2 := new(MessageList)
-	if err := UnmarshalMerge(data, pb2); err != nil {
-		t.Fatalf("first UnmarshalMerge: %v", err)
-	}
-	if err := UnmarshalMerge(data, pb2); err != nil {
-		t.Fatalf("second UnmarshalMerge: %v", err)
-	}
-	if len(pb2.Message) != 2 {
-		t.Errorf("two UnmarshalMerges produced %d Messages, want 2", len(pb2.Message))
-	}
-}
-
-func TestExtensionMarshalOrder(t *testing.T) {
-	m := &MyMessage{Count: Int(123)}
-	if err := SetExtension(m, E_Ext_More, &Ext{Data: String("alpha")}); err != nil {
-		t.Fatalf("SetExtension: %v", err)
-	}
-	if err := SetExtension(m, E_Ext_Text, String("aleph")); err != nil {
-		t.Fatalf("SetExtension: %v", err)
-	}
-	if err := SetExtension(m, E_Ext_Number, Int32(1)); err != nil {
-		t.Fatalf("SetExtension: %v", err)
-	}
-
-	// Serialize m several times, and check we get the same bytes each time.
-	var orig []byte
-	for i := 0; i < 100; i++ {
-		b, err := Marshal(m)
-		if err != nil {
-			t.Fatalf("Marshal: %v", err)
-		}
-		if i == 0 {
-			orig = b
-			continue
-		}
-		if !bytes.Equal(b, orig) {
-			t.Errorf("Bytes differ on attempt #%d", i)
-		}
-	}
-}
-
-// Many extensions, because small maps might not iterate differently on each iteration.
-var exts = []*ExtensionDesc{
-	E_X201,
-	E_X202,
-	E_X203,
-	E_X204,
-	E_X205,
-	E_X206,
-	E_X207,
-	E_X208,
-	E_X209,
-	E_X210,
-	E_X211,
-	E_X212,
-	E_X213,
-	E_X214,
-	E_X215,
-	E_X216,
-	E_X217,
-	E_X218,
-	E_X219,
-	E_X220,
-	E_X221,
-	E_X222,
-	E_X223,
-	E_X224,
-	E_X225,
-	E_X226,
-	E_X227,
-	E_X228,
-	E_X229,
-	E_X230,
-	E_X231,
-	E_X232,
-	E_X233,
-	E_X234,
-	E_X235,
-	E_X236,
-	E_X237,
-	E_X238,
-	E_X239,
-	E_X240,
-	E_X241,
-	E_X242,
-	E_X243,
-	E_X244,
-	E_X245,
-	E_X246,
-	E_X247,
-	E_X248,
-	E_X249,
-	E_X250,
-}
-
-func TestMessageSetMarshalOrder(t *testing.T) {
-	m := &MyMessageSet{}
-	for _, x := range exts {
-		if err := SetExtension(m, x, &Empty{}); err != nil {
-			t.Fatalf("SetExtension: %v", err)
-		}
-	}
-
-	buf, err := Marshal(m)
-	if err != nil {
-		t.Fatalf("Marshal: %v", err)
-	}
-
-	// Serialize m several times, and check we get the same bytes each time.
-	for i := 0; i < 10; i++ {
-		b1, err := Marshal(m)
-		if err != nil {
-			t.Fatalf("Marshal: %v", err)
-		}
-		if !bytes.Equal(b1, buf) {
-			t.Errorf("Bytes differ on re-Marshal #%d", i)
-		}
-
-		m2 := &MyMessageSet{}
-		if err := Unmarshal(buf, m2); err != nil {
-			t.Errorf("Unmarshal: %v", err)
-		}
-		b2, err := Marshal(m2)
-		if err != nil {
-			t.Errorf("re-Marshal: %v", err)
-		}
-		if !bytes.Equal(b2, buf) {
-			t.Errorf("Bytes differ on round-trip #%d", i)
-		}
-	}
-}
-
-func TestUnmarshalMergesMessages(t *testing.T) {
-	// If a nested message occurs twice in the input,
-	// the fields should be merged when decoding.
-	a := &OtherMessage{
-		Key: Int64(123),
-		Inner: &InnerMessage{
-			Host: String("polhode"),
-			Port: Int32(1234),
-		},
-	}
-	aData, err := Marshal(a)
-	if err != nil {
-		t.Fatalf("Marshal(a): %v", err)
-	}
-	b := &OtherMessage{
-		Weight: Float32(1.2),
-		Inner: &InnerMessage{
-			Host:      String("herpolhode"),
-			Connected: Bool(true),
-		},
-	}
-	bData, err := Marshal(b)
-	if err != nil {
-		t.Fatalf("Marshal(b): %v", err)
-	}
-	want := &OtherMessage{
-		Key:    Int64(123),
-		Weight: Float32(1.2),
-		Inner: &InnerMessage{
-			Host:      String("herpolhode"),
-			Port:      Int32(1234),
-			Connected: Bool(true),
-		},
-	}
-	got := new(OtherMessage)
-	if err := Unmarshal(append(aData, bData...), got); err != nil {
-		t.Fatalf("Unmarshal: %v", err)
-	}
-	if !Equal(got, want) {
-		t.Errorf("\n got %v\nwant %v", got, want)
-	}
-}
-
-func TestEncodingSizes(t *testing.T) {
-	tests := []struct {
-		m Message
-		n int
-	}{
-		{&Defaults{F_Int32: Int32(math.MaxInt32)}, 6},
-		{&Defaults{F_Int32: Int32(math.MinInt32)}, 11},
-		{&Defaults{F_Uint32: Uint32(uint32(math.MaxInt32) + 1)}, 6},
-		{&Defaults{F_Uint32: Uint32(math.MaxUint32)}, 6},
-	}
-	for _, test := range tests {
-		b, err := Marshal(test.m)
-		if err != nil {
-			t.Errorf("Marshal(%v): %v", test.m, err)
-			continue
-		}
-		if len(b) != test.n {
-			t.Errorf("Marshal(%v) yielded %d bytes, want %d bytes", test.m, len(b), test.n)
-		}
-	}
-}
-
-func TestRequiredNotSetError(t *testing.T) {
-	pb := initGoTest(false)
-	pb.RequiredField.Label = nil
-	pb.F_Int32Required = nil
-	pb.F_Int64Required = nil
-
-	expected := "0807" + // field 1, encoding 0, value 7
-		"2206" + "120474797065" + // field 4, encoding 2 (GoTestField)
-		"5001" + // field 10, encoding 0, value 1
-		"6d20000000" + // field 13, encoding 5, value 0x20
-		"714000000000000000" + // field 14, encoding 1, value 0x40
-		"78a019" + // field 15, encoding 0, value 0xca0 = 3232
-		"8001c032" + // field 16, encoding 0, value 0x1940 = 6464
-		"8d0100004a45" + // field 17, encoding 5, value 3232.0
-		"9101000000000040b940" + // field 18, encoding 1, value 6464.0
-		"9a0106" + "737472696e67" + // field 19, encoding 2, string "string"
-		"b304" + // field 70, encoding 3, start group
-		"ba0408" + "7265717569726564" + // field 71, encoding 2, string "required"
-		"b404" + // field 70, encoding 4, end group
-		"aa0605" + "6279746573" + // field 101, encoding 2, string "bytes"
-		"b0063f" + // field 102, encoding 0, 0x3f zigzag32
-		"b8067f" // field 103, encoding 0, 0x7f zigzag64
-
-	o := old()
-	bytes, err := Marshal(pb)
-	if _, ok := err.(*RequiredNotSetError); !ok {
-		fmt.Printf("marshal-1 err = %v, want *RequiredNotSetError", err)
-		o.DebugPrint("", bytes)
-		t.Fatalf("expected = %s", expected)
-	}
-	if strings.Index(err.Error(), "RequiredField.Label") < 0 {
-		t.Errorf("marshal-1 wrong err msg: %v", err)
-	}
-	if !equal(bytes, expected, t) {
-		o.DebugPrint("neq 1", bytes)
-		t.Fatalf("expected = %s", expected)
-	}
-
-	// Now test Unmarshal by recreating the original buffer.
-	pbd := new(GoTest)
-	err = Unmarshal(bytes, pbd)
-	if _, ok := err.(*RequiredNotSetError); !ok {
-		t.Fatalf("unmarshal err = %v, want *RequiredNotSetError", err)
-		o.DebugPrint("", bytes)
-		t.Fatalf("string = %s", expected)
-	}
-	if strings.Index(err.Error(), "RequiredField.{Unknown}") < 0 {
-		t.Errorf("unmarshal wrong err msg: %v", err)
-	}
-	bytes, err = Marshal(pbd)
-	if _, ok := err.(*RequiredNotSetError); !ok {
-		t.Errorf("marshal-2 err = %v, want *RequiredNotSetError", err)
-		o.DebugPrint("", bytes)
-		t.Fatalf("string = %s", expected)
-	}
-	if strings.Index(err.Error(), "RequiredField.Label") < 0 {
-		t.Errorf("marshal-2 wrong err msg: %v", err)
-	}
-	if !equal(bytes, expected, t) {
-		o.DebugPrint("neq 2", bytes)
-		t.Fatalf("string = %s", expected)
-	}
-}
-
-func fuzzUnmarshal(t *testing.T, data []byte) {
-	defer func() {
-		if e := recover(); e != nil {
-			t.Errorf("These bytes caused a panic: %+v", data)
-			t.Logf("Stack:\n%s", debug.Stack())
-			t.FailNow()
-		}
-	}()
-
-	pb := new(MyMessage)
-	Unmarshal(data, pb)
-}
-
-func TestMapFieldMarshal(t *testing.T) {
-	m := &MessageWithMap{
-		NameMapping: map[int32]string{
-			1: "Rob",
-			4: "Ian",
-			8: "Dave",
-		},
-	}
-	b, err := Marshal(m)
-	if err != nil {
-		t.Fatalf("Marshal: %v", err)
-	}
-
-	// b should be the concatenation of these three byte sequences in some order.
-	parts := []string{
-		"\n\a\b\x01\x12\x03Rob",
-		"\n\a\b\x04\x12\x03Ian",
-		"\n\b\b\x08\x12\x04Dave",
-	}
-	ok := false
-	for i := range parts {
-		for j := range parts {
-			if j == i {
-				continue
-			}
-			for k := range parts {
-				if k == i || k == j {
-					continue
-				}
-				try := parts[i] + parts[j] + parts[k]
-				if bytes.Equal(b, []byte(try)) {
-					ok = true
-					break
-				}
-			}
-		}
-	}
-	if !ok {
-		t.Fatalf("Incorrect Marshal output.\n got %q\nwant %q (or a permutation of that)", b, parts[0]+parts[1]+parts[2])
-	}
-	t.Logf("FYI b: %q", b)
-
-	(new(Buffer)).DebugPrint("Dump of b", b)
-}
-
-func TestMapFieldRoundTrips(t *testing.T) {
-	m := &MessageWithMap{
-		NameMapping: map[int32]string{
-			1: "Rob",
-			4: "Ian",
-			8: "Dave",
-		},
-		MsgMapping: map[int64]*FloatingPoint{
-			0x7001: &FloatingPoint{F: Float64(2.0)},
-		},
-		ByteMapping: map[bool][]byte{
-			false: []byte("that's not right!"),
-			true:  []byte("aye, 'tis true!"),
-		},
-	}
-	b, err := Marshal(m)
-	if err != nil {
-		t.Fatalf("Marshal: %v", err)
-	}
-	t.Logf("FYI b: %q", b)
-	m2 := new(MessageWithMap)
-	if err := Unmarshal(b, m2); err != nil {
-		t.Fatalf("Unmarshal: %v", err)
-	}
-	for _, pair := range [][2]interface{}{
-		{m.NameMapping, m2.NameMapping},
-		{m.MsgMapping, m2.MsgMapping},
-		{m.ByteMapping, m2.ByteMapping},
-	} {
-		if !reflect.DeepEqual(pair[0], pair[1]) {
-			t.Errorf("Map did not survive a round trip.\ninitial: %v\n  final: %v", pair[0], pair[1])
-		}
-	}
-}
-
-func TestMapFieldWithNil(t *testing.T) {
-	m := &MessageWithMap{
-		MsgMapping: map[int64]*FloatingPoint{
-			1: nil,
-		},
-	}
-	b, err := Marshal(m)
-	if err == nil {
-		t.Fatalf("Marshal of bad map should have failed, got these bytes: %v", b)
-	}
-}
-
-// Benchmarks
-
-func testMsg() *GoTest {
-	pb := initGoTest(true)
-	const N = 1000 // Internally the library starts much smaller.
-	pb.F_Int32Repeated = make([]int32, N)
-	pb.F_DoubleRepeated = make([]float64, N)
-	for i := 0; i < N; i++ {
-		pb.F_Int32Repeated[i] = int32(i)
-		pb.F_DoubleRepeated[i] = float64(i)
-	}
-	return pb
-}
-
-func bytesMsg() *GoTest {
-	pb := initGoTest(true)
-	buf := make([]byte, 4000)
-	for i := range buf {
-		buf[i] = byte(i)
-	}
-	pb.F_BytesDefaulted = buf
-	return pb
-}
-
-func benchmarkMarshal(b *testing.B, pb Message, marshal func(Message) ([]byte, error)) {
-	d, _ := marshal(pb)
-	b.SetBytes(int64(len(d)))
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		marshal(pb)
-	}
-}
-
-func benchmarkBufferMarshal(b *testing.B, pb Message) {
-	p := NewBuffer(nil)
-	benchmarkMarshal(b, pb, func(pb0 Message) ([]byte, error) {
-		p.Reset()
-		err := p.Marshal(pb0)
-		return p.Bytes(), err
-	})
-}
-
-func benchmarkSize(b *testing.B, pb Message) {
-	benchmarkMarshal(b, pb, func(pb0 Message) ([]byte, error) {
-		Size(pb)
-		return nil, nil
-	})
-}
-
-func newOf(pb Message) Message {
-	in := reflect.ValueOf(pb)
-	if in.IsNil() {
-		return pb
-	}
-	return reflect.New(in.Type().Elem()).Interface().(Message)
-}
-
-func benchmarkUnmarshal(b *testing.B, pb Message, unmarshal func([]byte, Message) error) {
-	d, _ := Marshal(pb)
-	b.SetBytes(int64(len(d)))
-	pbd := newOf(pb)
-
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		unmarshal(d, pbd)
-	}
-}
-
-func benchmarkBufferUnmarshal(b *testing.B, pb Message) {
-	p := NewBuffer(nil)
-	benchmarkUnmarshal(b, pb, func(d []byte, pb0 Message) error {
-		p.SetBuf(d)
-		return p.Unmarshal(pb0)
-	})
-}
-
-// Benchmark{Marshal,BufferMarshal,Size,Unmarshal,BufferUnmarshal}{,Bytes}
-
-func BenchmarkMarshal(b *testing.B) {
-	benchmarkMarshal(b, testMsg(), Marshal)
-}
-
-func BenchmarkBufferMarshal(b *testing.B) {
-	benchmarkBufferMarshal(b, testMsg())
-}
-
-func BenchmarkSize(b *testing.B) {
-	benchmarkSize(b, testMsg())
-}
-
-func BenchmarkUnmarshal(b *testing.B) {
-	benchmarkUnmarshal(b, testMsg(), Unmarshal)
-}
-
-func BenchmarkBufferUnmarshal(b *testing.B) {
-	benchmarkBufferUnmarshal(b, testMsg())
-}
-
-func BenchmarkMarshalBytes(b *testing.B) {
-	benchmarkMarshal(b, bytesMsg(), Marshal)
-}
-
-func BenchmarkBufferMarshalBytes(b *testing.B) {
-	benchmarkBufferMarshal(b, bytesMsg())
-}
-
-func BenchmarkSizeBytes(b *testing.B) {
-	benchmarkSize(b, bytesMsg())
-}
-
-func BenchmarkUnmarshalBytes(b *testing.B) {
-	benchmarkUnmarshal(b, bytesMsg(), Unmarshal)
-}
-
-func BenchmarkBufferUnmarshalBytes(b *testing.B) {
-	benchmarkBufferUnmarshal(b, bytesMsg())
-}
-
-func BenchmarkUnmarshalUnrecognizedFields(b *testing.B) {
-	b.StopTimer()
-	pb := initGoTestField()
-	skip := &GoSkipTest{
-		SkipInt32:   Int32(32),
-		SkipFixed32: Uint32(3232),
-		SkipFixed64: Uint64(6464),
-		SkipString:  String("skipper"),
-		Skipgroup: &GoSkipTest_SkipGroup{
-			GroupInt32:  Int32(75),
-			GroupString: String("wxyz"),
-		},
-	}
-
-	pbd := new(GoTestField)
-	p := NewBuffer(nil)
-	p.Marshal(pb)
-	p.Marshal(skip)
-	p2 := NewBuffer(nil)
-
-	b.StartTimer()
-	for i := 0; i < b.N; i++ {
-		p2.SetBuf(p.Bytes())
-		p2.Unmarshal(pbd)
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/proto/clone.go b/Godeps/_workspace/src/github.com/golang/protobuf/proto/clone.go
deleted file mode 100644
index 915a68b8e..000000000
--- a/Godeps/_workspace/src/github.com/golang/protobuf/proto/clone.go
+++ /dev/null
@@ -1,212 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2011 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// 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.
-
-// Protocol buffer deep copy and merge.
-// TODO: MessageSet and RawMessage.
-
-package proto
-
-import (
-	"log"
-	"reflect"
-	"strings"
-)
-
-// Clone returns a deep copy of a protocol buffer.
-func Clone(pb Message) Message {
-	in := reflect.ValueOf(pb)
-	if in.IsNil() {
-		return pb
-	}
-
-	out := reflect.New(in.Type().Elem())
-	// out is empty so a merge is a deep copy.
-	mergeStruct(out.Elem(), in.Elem())
-	return out.Interface().(Message)
-}
-
-// Merge merges src into dst.
-// Required and optional fields that are set in src will be set to that value in dst.
-// Elements of repeated fields will be appended.
-// Merge panics if src and dst are not the same type, or if dst is nil.
-func Merge(dst, src Message) {
-	in := reflect.ValueOf(src)
-	out := reflect.ValueOf(dst)
-	if out.IsNil() {
-		panic("proto: nil destination")
-	}
-	if in.Type() != out.Type() {
-		// Explicit test prior to mergeStruct so that mistyped nils will fail
-		panic("proto: type mismatch")
-	}
-	if in.IsNil() {
-		// Merging nil into non-nil is a quiet no-op
-		return
-	}
-	mergeStruct(out.Elem(), in.Elem())
-}
-
-func mergeStruct(out, in reflect.Value) {
-	sprop := GetProperties(in.Type())
-	for i := 0; i < in.NumField(); i++ {
-		f := in.Type().Field(i)
-		if strings.HasPrefix(f.Name, "XXX_") {
-			continue
-		}
-		mergeAny(out.Field(i), in.Field(i), false, sprop.Prop[i])
-	}
-
-	if emIn, ok := in.Addr().Interface().(extendableProto); ok {
-		emOut := out.Addr().Interface().(extendableProto)
-		mergeExtension(emOut.ExtensionMap(), emIn.ExtensionMap())
-	}
-
-	uf := in.FieldByName("XXX_unrecognized")
-	if !uf.IsValid() {
-		return
-	}
-	uin := uf.Bytes()
-	if len(uin) > 0 {
-		out.FieldByName("XXX_unrecognized").SetBytes(append([]byte(nil), uin...))
-	}
-}
-
-// mergeAny performs a merge between two values of the same type.
-// viaPtr indicates whether the values were indirected through a pointer (implying proto2).
-// prop is set if this is a struct field (it may be nil).
-func mergeAny(out, in reflect.Value, viaPtr bool, prop *Properties) {
-	if in.Type() == protoMessageType {
-		if !in.IsNil() {
-			if out.IsNil() {
-				out.Set(reflect.ValueOf(Clone(in.Interface().(Message))))
-			} else {
-				Merge(out.Interface().(Message), in.Interface().(Message))
-			}
-		}
-		return
-	}
-	switch in.Kind() {
-	case reflect.Bool, reflect.Float32, reflect.Float64, reflect.Int32, reflect.Int64,
-		reflect.String, reflect.Uint32, reflect.Uint64:
-		if !viaPtr && isProto3Zero(in) {
-			return
-		}
-		out.Set(in)
-	case reflect.Map:
-		if in.Len() == 0 {
-			return
-		}
-		if out.IsNil() {
-			out.Set(reflect.MakeMap(in.Type()))
-		}
-		// For maps with value types of *T or []byte we need to deep copy each value.
-		elemKind := in.Type().Elem().Kind()
-		for _, key := range in.MapKeys() {
-			var val reflect.Value
-			switch elemKind {
-			case reflect.Ptr:
-				val = reflect.New(in.Type().Elem().Elem())
-				mergeAny(val, in.MapIndex(key), false, nil)
-			case reflect.Slice:
-				val = in.MapIndex(key)
-				val = reflect.ValueOf(append([]byte{}, val.Bytes()...))
-			default:
-				val = in.MapIndex(key)
-			}
-			out.SetMapIndex(key, val)
-		}
-	case reflect.Ptr:
-		if in.IsNil() {
-			return
-		}
-		if out.IsNil() {
-			out.Set(reflect.New(in.Elem().Type()))
-		}
-		mergeAny(out.Elem(), in.Elem(), true, nil)
-	case reflect.Slice:
-		if in.IsNil() {
-			return
-		}
-		if in.Type().Elem().Kind() == reflect.Uint8 {
-			// []byte is a scalar bytes field, not a repeated field.
-
-			// Edge case: if this is in a proto3 message, a zero length
-			// bytes field is considered the zero value, and should not
-			// be merged.
-			if prop != nil && prop.proto3 && in.Len() == 0 {
-				return
-			}
-
-			// Make a deep copy.
-			// Append to []byte{} instead of []byte(nil) so that we never end up
-			// with a nil result.
-			out.SetBytes(append([]byte{}, in.Bytes()...))
-			return
-		}
-		n := in.Len()
-		if out.IsNil() {
-			out.Set(reflect.MakeSlice(in.Type(), 0, n))
-		}
-		switch in.Type().Elem().Kind() {
-		case reflect.Bool, reflect.Float32, reflect.Float64, reflect.Int32, reflect.Int64,
-			reflect.String, reflect.Uint32, reflect.Uint64:
-			out.Set(reflect.AppendSlice(out, in))
-		default:
-			for i := 0; i < n; i++ {
-				x := reflect.Indirect(reflect.New(in.Type().Elem()))
-				mergeAny(x, in.Index(i), false, nil)
-				out.Set(reflect.Append(out, x))
-			}
-		}
-	case reflect.Struct:
-		mergeStruct(out, in)
-	default:
-		// unknown type, so not a protocol buffer
-		log.Printf("proto: don't know how to copy %v", in)
-	}
-}
-
-func mergeExtension(out, in map[int32]Extension) {
-	for extNum, eIn := range in {
-		eOut := Extension{desc: eIn.desc}
-		if eIn.value != nil {
-			v := reflect.New(reflect.TypeOf(eIn.value)).Elem()
-			mergeAny(v, reflect.ValueOf(eIn.value), false, nil)
-			eOut.value = v.Interface()
-		}
-		if eIn.enc != nil {
-			eOut.enc = make([]byte, len(eIn.enc))
-			copy(eOut.enc, eIn.enc)
-		}
-
-		out[extNum] = eOut
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/proto/clone_test.go b/Godeps/_workspace/src/github.com/golang/protobuf/proto/clone_test.go
deleted file mode 100644
index a1c697bc8..000000000
--- a/Godeps/_workspace/src/github.com/golang/protobuf/proto/clone_test.go
+++ /dev/null
@@ -1,245 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2011 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// 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.
-
-package proto_test
-
-import (
-	"testing"
-
-	"github.com/golang/protobuf/proto"
-
-	proto3pb "github.com/golang/protobuf/proto/proto3_proto"
-	pb "github.com/golang/protobuf/proto/testdata"
-)
-
-var cloneTestMessage = &pb.MyMessage{
-	Count: proto.Int32(42),
-	Name:  proto.String("Dave"),
-	Pet:   []string{"bunny", "kitty", "horsey"},
-	Inner: &pb.InnerMessage{
-		Host:      proto.String("niles"),
-		Port:      proto.Int32(9099),
-		Connected: proto.Bool(true),
-	},
-	Others: []*pb.OtherMessage{
-		{
-			Value: []byte("some bytes"),
-		},
-	},
-	Somegroup: &pb.MyMessage_SomeGroup{
-		GroupField: proto.Int32(6),
-	},
-	RepBytes: [][]byte{[]byte("sham"), []byte("wow")},
-}
-
-func init() {
-	ext := &pb.Ext{
-		Data: proto.String("extension"),
-	}
-	if err := proto.SetExtension(cloneTestMessage, pb.E_Ext_More, ext); err != nil {
-		panic("SetExtension: " + err.Error())
-	}
-}
-
-func TestClone(t *testing.T) {
-	m := proto.Clone(cloneTestMessage).(*pb.MyMessage)
-	if !proto.Equal(m, cloneTestMessage) {
-		t.Errorf("Clone(%v) = %v", cloneTestMessage, m)
-	}
-
-	// Verify it was a deep copy.
-	*m.Inner.Port++
-	if proto.Equal(m, cloneTestMessage) {
-		t.Error("Mutating clone changed the original")
-	}
-	// Byte fields and repeated fields should be copied.
-	if &m.Pet[0] == &cloneTestMessage.Pet[0] {
-		t.Error("Pet: repeated field not copied")
-	}
-	if &m.Others[0] == &cloneTestMessage.Others[0] {
-		t.Error("Others: repeated field not copied")
-	}
-	if &m.Others[0].Value[0] == &cloneTestMessage.Others[0].Value[0] {
-		t.Error("Others[0].Value: bytes field not copied")
-	}
-	if &m.RepBytes[0] == &cloneTestMessage.RepBytes[0] {
-		t.Error("RepBytes: repeated field not copied")
-	}
-	if &m.RepBytes[0][0] == &cloneTestMessage.RepBytes[0][0] {
-		t.Error("RepBytes[0]: bytes field not copied")
-	}
-}
-
-func TestCloneNil(t *testing.T) {
-	var m *pb.MyMessage
-	if c := proto.Clone(m); !proto.Equal(m, c) {
-		t.Errorf("Clone(%v) = %v", m, c)
-	}
-}
-
-var mergeTests = []struct {
-	src, dst, want proto.Message
-}{
-	{
-		src: &pb.MyMessage{
-			Count: proto.Int32(42),
-		},
-		dst: &pb.MyMessage{
-			Name: proto.String("Dave"),
-		},
-		want: &pb.MyMessage{
-			Count: proto.Int32(42),
-			Name:  proto.String("Dave"),
-		},
-	},
-	{
-		src: &pb.MyMessage{
-			Inner: &pb.InnerMessage{
-				Host:      proto.String("hey"),
-				Connected: proto.Bool(true),
-			},
-			Pet: []string{"horsey"},
-			Others: []*pb.OtherMessage{
-				{
-					Value: []byte("some bytes"),
-				},
-			},
-		},
-		dst: &pb.MyMessage{
-			Inner: &pb.InnerMessage{
-				Host: proto.String("niles"),
-				Port: proto.Int32(9099),
-			},
-			Pet: []string{"bunny", "kitty"},
-			Others: []*pb.OtherMessage{
-				{
-					Key: proto.Int64(31415926535),
-				},
-				{
-					// Explicitly test a src=nil field
-					Inner: nil,
-				},
-			},
-		},
-		want: &pb.MyMessage{
-			Inner: &pb.InnerMessage{
-				Host:      proto.String("hey"),
-				Connected: proto.Bool(true),
-				Port:      proto.Int32(9099),
-			},
-			Pet: []string{"bunny", "kitty", "horsey"},
-			Others: []*pb.OtherMessage{
-				{
-					Key: proto.Int64(31415926535),
-				},
-				{},
-				{
-					Value: []byte("some bytes"),
-				},
-			},
-		},
-	},
-	{
-		src: &pb.MyMessage{
-			RepBytes: [][]byte{[]byte("wow")},
-		},
-		dst: &pb.MyMessage{
-			Somegroup: &pb.MyMessage_SomeGroup{
-				GroupField: proto.Int32(6),
-			},
-			RepBytes: [][]byte{[]byte("sham")},
-		},
-		want: &pb.MyMessage{
-			Somegroup: &pb.MyMessage_SomeGroup{
-				GroupField: proto.Int32(6),
-			},
-			RepBytes: [][]byte{[]byte("sham"), []byte("wow")},
-		},
-	},
-	// Check that a scalar bytes field replaces rather than appends.
-	{
-		src:  &pb.OtherMessage{Value: []byte("foo")},
-		dst:  &pb.OtherMessage{Value: []byte("bar")},
-		want: &pb.OtherMessage{Value: []byte("foo")},
-	},
-	{
-		src: &pb.MessageWithMap{
-			NameMapping: map[int32]string{6: "Nigel"},
-			MsgMapping: map[int64]*pb.FloatingPoint{
-				0x4001: &pb.FloatingPoint{F: proto.Float64(2.0)},
-			},
-			ByteMapping: map[bool][]byte{true: []byte("wowsa")},
-		},
-		dst: &pb.MessageWithMap{
-			NameMapping: map[int32]string{
-				6: "Bruce", // should be overwritten
-				7: "Andrew",
-			},
-		},
-		want: &pb.MessageWithMap{
-			NameMapping: map[int32]string{
-				6: "Nigel",
-				7: "Andrew",
-			},
-			MsgMapping: map[int64]*pb.FloatingPoint{
-				0x4001: &pb.FloatingPoint{F: proto.Float64(2.0)},
-			},
-			ByteMapping: map[bool][]byte{true: []byte("wowsa")},
-		},
-	},
-	// proto3 shouldn't merge zero values,
-	// in the same way that proto2 shouldn't merge nils.
-	{
-		src: &proto3pb.Message{
-			Name: "Aaron",
-			Data: []byte(""), // zero value, but not nil
-		},
-		dst: &proto3pb.Message{
-			HeightInCm: 176,
-			Data:       []byte("texas!"),
-		},
-		want: &proto3pb.Message{
-			Name:       "Aaron",
-			HeightInCm: 176,
-			Data:       []byte("texas!"),
-		},
-	},
-}
-
-func TestMerge(t *testing.T) {
-	for _, m := range mergeTests {
-		got := proto.Clone(m.dst)
-		proto.Merge(got, m.src)
-		if !proto.Equal(got, m.want) {
-			t.Errorf("Merge(%v, %v)\n got %v\nwant %v\n", m.dst, m.src, got, m.want)
-		}
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/proto/decode.go b/Godeps/_workspace/src/github.com/golang/protobuf/proto/decode.go
deleted file mode 100644
index bf71dcad1..000000000
--- a/Godeps/_workspace/src/github.com/golang/protobuf/proto/decode.go
+++ /dev/null
@@ -1,827 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2010 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// 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.
-
-package proto
-
-/*
- * Routines for decoding protocol buffer data to construct in-memory representations.
- */
-
-import (
-	"errors"
-	"fmt"
-	"io"
-	"os"
-	"reflect"
-)
-
-// errOverflow is returned when an integer is too large to be represented.
-var errOverflow = errors.New("proto: integer overflow")
-
-// The fundamental decoders that interpret bytes on the wire.
-// Those that take integer types all return uint64 and are
-// therefore of type valueDecoder.
-
-// DecodeVarint reads a varint-encoded integer from the slice.
-// It returns the integer and the number of bytes consumed, or
-// zero if there is not enough.
-// This is the format for the
-// int32, int64, uint32, uint64, bool, and enum
-// protocol buffer types.
-func DecodeVarint(buf []byte) (x uint64, n int) {
-	// x, n already 0
-	for shift := uint(0); shift < 64; shift += 7 {
-		if n >= len(buf) {
-			return 0, 0
-		}
-		b := uint64(buf[n])
-		n++
-		x |= (b & 0x7F) << shift
-		if (b & 0x80) == 0 {
-			return x, n
-		}
-	}
-
-	// The number is too large to represent in a 64-bit value.
-	return 0, 0
-}
-
-// DecodeVarint reads a varint-encoded integer from the Buffer.
-// This is the format for the
-// int32, int64, uint32, uint64, bool, and enum
-// protocol buffer types.
-func (p *Buffer) DecodeVarint() (x uint64, err error) {
-	// x, err already 0
-
-	i := p.index
-	l := len(p.buf)
-
-	for shift := uint(0); shift < 64; shift += 7 {
-		if i >= l {
-			err = io.ErrUnexpectedEOF
-			return
-		}
-		b := p.buf[i]
-		i++
-		x |= (uint64(b) & 0x7F) << shift
-		if b < 0x80 {
-			p.index = i
-			return
-		}
-	}
-
-	// The number is too large to represent in a 64-bit value.
-	err = errOverflow
-	return
-}
-
-// DecodeFixed64 reads a 64-bit integer from the Buffer.
-// This is the format for the
-// fixed64, sfixed64, and double protocol buffer types.
-func (p *Buffer) DecodeFixed64() (x uint64, err error) {
-	// x, err already 0
-	i := p.index + 8
-	if i < 0 || i > len(p.buf) {
-		err = io.ErrUnexpectedEOF
-		return
-	}
-	p.index = i
-
-	x = uint64(p.buf[i-8])
-	x |= uint64(p.buf[i-7]) << 8
-	x |= uint64(p.buf[i-6]) << 16
-	x |= uint64(p.buf[i-5]) << 24
-	x |= uint64(p.buf[i-4]) << 32
-	x |= uint64(p.buf[i-3]) << 40
-	x |= uint64(p.buf[i-2]) << 48
-	x |= uint64(p.buf[i-1]) << 56
-	return
-}
-
-// DecodeFixed32 reads a 32-bit integer from the Buffer.
-// This is the format for the
-// fixed32, sfixed32, and float protocol buffer types.
-func (p *Buffer) DecodeFixed32() (x uint64, err error) {
-	// x, err already 0
-	i := p.index + 4
-	if i < 0 || i > len(p.buf) {
-		err = io.ErrUnexpectedEOF
-		return
-	}
-	p.index = i
-
-	x = uint64(p.buf[i-4])
-	x |= uint64(p.buf[i-3]) << 8
-	x |= uint64(p.buf[i-2]) << 16
-	x |= uint64(p.buf[i-1]) << 24
-	return
-}
-
-// DecodeZigzag64 reads a zigzag-encoded 64-bit integer
-// from the Buffer.
-// This is the format used for the sint64 protocol buffer type.
-func (p *Buffer) DecodeZigzag64() (x uint64, err error) {
-	x, err = p.DecodeVarint()
-	if err != nil {
-		return
-	}
-	x = (x >> 1) ^ uint64((int64(x&1)<<63)>>63)
-	return
-}
-
-// DecodeZigzag32 reads a zigzag-encoded 32-bit integer
-// from  the Buffer.
-// This is the format used for the sint32 protocol buffer type.
-func (p *Buffer) DecodeZigzag32() (x uint64, err error) {
-	x, err = p.DecodeVarint()
-	if err != nil {
-		return
-	}
-	x = uint64((uint32(x) >> 1) ^ uint32((int32(x&1)<<31)>>31))
-	return
-}
-
-// These are not ValueDecoders: they produce an array of bytes or a string.
-// bytes, embedded messages
-
-// DecodeRawBytes reads a count-delimited byte buffer from the Buffer.
-// This is the format used for the bytes protocol buffer
-// type and for embedded messages.
-func (p *Buffer) DecodeRawBytes(alloc bool) (buf []byte, err error) {
-	n, err := p.DecodeVarint()
-	if err != nil {
-		return nil, err
-	}
-
-	nb := int(n)
-	if nb < 0 {
-		return nil, fmt.Errorf("proto: bad byte length %d", nb)
-	}
-	end := p.index + nb
-	if end < p.index || end > len(p.buf) {
-		return nil, io.ErrUnexpectedEOF
-	}
-
-	if !alloc {
-		// todo: check if can get more uses of alloc=false
-		buf = p.buf[p.index:end]
-		p.index += nb
-		return
-	}
-
-	buf = make([]byte, nb)
-	copy(buf, p.buf[p.index:])
-	p.index += nb
-	return
-}
-
-// DecodeStringBytes reads an encoded string from the Buffer.
-// This is the format used for the proto2 string type.
-func (p *Buffer) DecodeStringBytes() (s string, err error) {
-	buf, err := p.DecodeRawBytes(false)
-	if err != nil {
-		return
-	}
-	return string(buf), nil
-}
-
-// Skip the next item in the buffer. Its wire type is decoded and presented as an argument.
-// If the protocol buffer has extensions, and the field matches, add it as an extension.
-// Otherwise, if the XXX_unrecognized field exists, append the skipped data there.
-func (o *Buffer) skipAndSave(t reflect.Type, tag, wire int, base structPointer, unrecField field) error {
-	oi := o.index
-
-	err := o.skip(t, tag, wire)
-	if err != nil {
-		return err
-	}
-
-	if !unrecField.IsValid() {
-		return nil
-	}
-
-	ptr := structPointer_Bytes(base, unrecField)
-
-	// Add the skipped field to struct field
-	obuf := o.buf
-
-	o.buf = *ptr
-	o.EncodeVarint(uint64(tag<<3 | wire))
-	*ptr = append(o.buf, obuf[oi:o.index]...)
-
-	o.buf = obuf
-
-	return nil
-}
-
-// Skip the next item in the buffer. Its wire type is decoded and presented as an argument.
-func (o *Buffer) skip(t reflect.Type, tag, wire int) error {
-
-	var u uint64
-	var err error
-
-	switch wire {
-	case WireVarint:
-		_, err = o.DecodeVarint()
-	case WireFixed64:
-		_, err = o.DecodeFixed64()
-	case WireBytes:
-		_, err = o.DecodeRawBytes(false)
-	case WireFixed32:
-		_, err = o.DecodeFixed32()
-	case WireStartGroup:
-		for {
-			u, err = o.DecodeVarint()
-			if err != nil {
-				break
-			}
-			fwire := int(u & 0x7)
-			if fwire == WireEndGroup {
-				break
-			}
-			ftag := int(u >> 3)
-			err = o.skip(t, ftag, fwire)
-			if err != nil {
-				break
-			}
-		}
-	default:
-		err = fmt.Errorf("proto: can't skip unknown wire type %d for %s", wire, t)
-	}
-	return err
-}
-
-// Unmarshaler is the interface representing objects that can
-// unmarshal themselves.  The method should reset the receiver before
-// decoding starts.  The argument points to data that may be
-// overwritten, so implementations should not keep references to the
-// buffer.
-type Unmarshaler interface {
-	Unmarshal([]byte) error
-}
-
-// Unmarshal parses the protocol buffer representation in buf and places the
-// decoded result in pb.  If the struct underlying pb does not match
-// the data in buf, the results can be unpredictable.
-//
-// Unmarshal resets pb before starting to unmarshal, so any
-// existing data in pb is always removed. Use UnmarshalMerge
-// to preserve and append to existing data.
-func Unmarshal(buf []byte, pb Message) error {
-	pb.Reset()
-	return UnmarshalMerge(buf, pb)
-}
-
-// UnmarshalMerge parses the protocol buffer representation in buf and
-// writes the decoded result to pb.  If the struct underlying pb does not match
-// the data in buf, the results can be unpredictable.
-//
-// UnmarshalMerge merges into existing data in pb.
-// Most code should use Unmarshal instead.
-func UnmarshalMerge(buf []byte, pb Message) error {
-	// If the object can unmarshal itself, let it.
-	if u, ok := pb.(Unmarshaler); ok {
-		return u.Unmarshal(buf)
-	}
-	return NewBuffer(buf).Unmarshal(pb)
-}
-
-// Unmarshal parses the protocol buffer representation in the
-// Buffer and places the decoded result in pb.  If the struct
-// underlying pb does not match the data in the buffer, the results can be
-// unpredictable.
-func (p *Buffer) Unmarshal(pb Message) error {
-	// If the object can unmarshal itself, let it.
-	if u, ok := pb.(Unmarshaler); ok {
-		err := u.Unmarshal(p.buf[p.index:])
-		p.index = len(p.buf)
-		return err
-	}
-
-	typ, base, err := getbase(pb)
-	if err != nil {
-		return err
-	}
-
-	err = p.unmarshalType(typ.Elem(), GetProperties(typ.Elem()), false, base)
-
-	if collectStats {
-		stats.Decode++
-	}
-
-	return err
-}
-
-// unmarshalType does the work of unmarshaling a structure.
-func (o *Buffer) unmarshalType(st reflect.Type, prop *StructProperties, is_group bool, base structPointer) error {
-	var state errorState
-	required, reqFields := prop.reqCount, uint64(0)
-
-	var err error
-	for err == nil && o.index < len(o.buf) {
-		oi := o.index
-		var u uint64
-		u, err = o.DecodeVarint()
-		if err != nil {
-			break
-		}
-		wire := int(u & 0x7)
-		if wire == WireEndGroup {
-			if is_group {
-				return nil // input is satisfied
-			}
-			return fmt.Errorf("proto: %s: wiretype end group for non-group", st)
-		}
-		tag := int(u >> 3)
-		if tag <= 0 {
-			return fmt.Errorf("proto: %s: illegal tag %d (wire type %d)", st, tag, wire)
-		}
-		fieldnum, ok := prop.decoderTags.get(tag)
-		if !ok {
-			// Maybe it's an extension?
-			if prop.extendable {
-				if e := structPointer_Interface(base, st).(extendableProto); isExtensionField(e, int32(tag)) {
-					if err = o.skip(st, tag, wire); err == nil {
-						ext := e.ExtensionMap()[int32(tag)] // may be missing
-						ext.enc = append(ext.enc, o.buf[oi:o.index]...)
-						e.ExtensionMap()[int32(tag)] = ext
-					}
-					continue
-				}
-			}
-			err = o.skipAndSave(st, tag, wire, base, prop.unrecField)
-			continue
-		}
-		p := prop.Prop[fieldnum]
-
-		if p.dec == nil {
-			fmt.Fprintf(os.Stderr, "proto: no protobuf decoder for %s.%s\n", st, st.Field(fieldnum).Name)
-			continue
-		}
-		dec := p.dec
-		if wire != WireStartGroup && wire != p.WireType {
-			if wire == WireBytes && p.packedDec != nil {
-				// a packable field
-				dec = p.packedDec
-			} else {
-				err = fmt.Errorf("proto: bad wiretype for field %s.%s: got wiretype %d, want %d", st, st.Field(fieldnum).Name, wire, p.WireType)
-				continue
-			}
-		}
-		decErr := dec(o, p, base)
-		if decErr != nil && !state.shouldContinue(decErr, p) {
-			err = decErr
-		}
-		if err == nil && p.Required {
-			// Successfully decoded a required field.
-			if tag <= 64 {
-				// use bitmap for fields 1-64 to catch field reuse.
-				var mask uint64 = 1 << uint64(tag-1)
-				if reqFields&mask == 0 {
-					// new required field
-					reqFields |= mask
-					required--
-				}
-			} else {
-				// This is imprecise. It can be fooled by a required field
-				// with a tag > 64 that is encoded twice; that's very rare.
-				// A fully correct implementation would require allocating
-				// a data structure, which we would like to avoid.
-				required--
-			}
-		}
-	}
-	if err == nil {
-		if is_group {
-			return io.ErrUnexpectedEOF
-		}
-		if state.err != nil {
-			return state.err
-		}
-		if required > 0 {
-			// Not enough information to determine the exact field. If we use extra
-			// CPU, we could determine the field only if the missing required field
-			// has a tag <= 64 and we check reqFields.
-			return &RequiredNotSetError{"{Unknown}"}
-		}
-	}
-	return err
-}
-
-// Individual type decoders
-// For each,
-//	u is the decoded value,
-//	v is a pointer to the field (pointer) in the struct
-
-// Sizes of the pools to allocate inside the Buffer.
-// The goal is modest amortization and allocation
-// on at least 16-byte boundaries.
-const (
-	boolPoolSize   = 16
-	uint32PoolSize = 8
-	uint64PoolSize = 4
-)
-
-// Decode a bool.
-func (o *Buffer) dec_bool(p *Properties, base structPointer) error {
-	u, err := p.valDec(o)
-	if err != nil {
-		return err
-	}
-	if len(o.bools) == 0 {
-		o.bools = make([]bool, boolPoolSize)
-	}
-	o.bools[0] = u != 0
-	*structPointer_Bool(base, p.field) = &o.bools[0]
-	o.bools = o.bools[1:]
-	return nil
-}
-
-func (o *Buffer) dec_proto3_bool(p *Properties, base structPointer) error {
-	u, err := p.valDec(o)
-	if err != nil {
-		return err
-	}
-	*structPointer_BoolVal(base, p.field) = u != 0
-	return nil
-}
-
-// Decode an int32.
-func (o *Buffer) dec_int32(p *Properties, base structPointer) error {
-	u, err := p.valDec(o)
-	if err != nil {
-		return err
-	}
-	word32_Set(structPointer_Word32(base, p.field), o, uint32(u))
-	return nil
-}
-
-func (o *Buffer) dec_proto3_int32(p *Properties, base structPointer) error {
-	u, err := p.valDec(o)
-	if err != nil {
-		return err
-	}
-	word32Val_Set(structPointer_Word32Val(base, p.field), uint32(u))
-	return nil
-}
-
-// Decode an int64.
-func (o *Buffer) dec_int64(p *Properties, base structPointer) error {
-	u, err := p.valDec(o)
-	if err != nil {
-		return err
-	}
-	word64_Set(structPointer_Word64(base, p.field), o, u)
-	return nil
-}
-
-func (o *Buffer) dec_proto3_int64(p *Properties, base structPointer) error {
-	u, err := p.valDec(o)
-	if err != nil {
-		return err
-	}
-	word64Val_Set(structPointer_Word64Val(base, p.field), o, u)
-	return nil
-}
-
-// Decode a string.
-func (o *Buffer) dec_string(p *Properties, base structPointer) error {
-	s, err := o.DecodeStringBytes()
-	if err != nil {
-		return err
-	}
-	*structPointer_String(base, p.field) = &s
-	return nil
-}
-
-func (o *Buffer) dec_proto3_string(p *Properties, base structPointer) error {
-	s, err := o.DecodeStringBytes()
-	if err != nil {
-		return err
-	}
-	*structPointer_StringVal(base, p.field) = s
-	return nil
-}
-
-// Decode a slice of bytes ([]byte).
-func (o *Buffer) dec_slice_byte(p *Properties, base structPointer) error {
-	b, err := o.DecodeRawBytes(true)
-	if err != nil {
-		return err
-	}
-	*structPointer_Bytes(base, p.field) = b
-	return nil
-}
-
-// Decode a slice of bools ([]bool).
-func (o *Buffer) dec_slice_bool(p *Properties, base structPointer) error {
-	u, err := p.valDec(o)
-	if err != nil {
-		return err
-	}
-	v := structPointer_BoolSlice(base, p.field)
-	*v = append(*v, u != 0)
-	return nil
-}
-
-// Decode a slice of bools ([]bool) in packed format.
-func (o *Buffer) dec_slice_packed_bool(p *Properties, base structPointer) error {
-	v := structPointer_BoolSlice(base, p.field)
-
-	nn, err := o.DecodeVarint()
-	if err != nil {
-		return err
-	}
-	nb := int(nn) // number of bytes of encoded bools
-
-	y := *v
-	for i := 0; i < nb; i++ {
-		u, err := p.valDec(o)
-		if err != nil {
-			return err
-		}
-		y = append(y, u != 0)
-	}
-
-	*v = y
-	return nil
-}
-
-// Decode a slice of int32s ([]int32).
-func (o *Buffer) dec_slice_int32(p *Properties, base structPointer) error {
-	u, err := p.valDec(o)
-	if err != nil {
-		return err
-	}
-	structPointer_Word32Slice(base, p.field).Append(uint32(u))
-	return nil
-}
-
-// Decode a slice of int32s ([]int32) in packed format.
-func (o *Buffer) dec_slice_packed_int32(p *Properties, base structPointer) error {
-	v := structPointer_Word32Slice(base, p.field)
-
-	nn, err := o.DecodeVarint()
-	if err != nil {
-		return err
-	}
-	nb := int(nn) // number of bytes of encoded int32s
-
-	fin := o.index + nb
-	if fin < o.index {
-		return errOverflow
-	}
-	for o.index < fin {
-		u, err := p.valDec(o)
-		if err != nil {
-			return err
-		}
-		v.Append(uint32(u))
-	}
-	return nil
-}
-
-// Decode a slice of int64s ([]int64).
-func (o *Buffer) dec_slice_int64(p *Properties, base structPointer) error {
-	u, err := p.valDec(o)
-	if err != nil {
-		return err
-	}
-
-	structPointer_Word64Slice(base, p.field).Append(u)
-	return nil
-}
-
-// Decode a slice of int64s ([]int64) in packed format.
-func (o *Buffer) dec_slice_packed_int64(p *Properties, base structPointer) error {
-	v := structPointer_Word64Slice(base, p.field)
-
-	nn, err := o.DecodeVarint()
-	if err != nil {
-		return err
-	}
-	nb := int(nn) // number of bytes of encoded int64s
-
-	fin := o.index + nb
-	if fin < o.index {
-		return errOverflow
-	}
-	for o.index < fin {
-		u, err := p.valDec(o)
-		if err != nil {
-			return err
-		}
-		v.Append(u)
-	}
-	return nil
-}
-
-// Decode a slice of strings ([]string).
-func (o *Buffer) dec_slice_string(p *Properties, base structPointer) error {
-	s, err := o.DecodeStringBytes()
-	if err != nil {
-		return err
-	}
-	v := structPointer_StringSlice(base, p.field)
-	*v = append(*v, s)
-	return nil
-}
-
-// Decode a slice of slice of bytes ([][]byte).
-func (o *Buffer) dec_slice_slice_byte(p *Properties, base structPointer) error {
-	b, err := o.DecodeRawBytes(true)
-	if err != nil {
-		return err
-	}
-	v := structPointer_BytesSlice(base, p.field)
-	*v = append(*v, b)
-	return nil
-}
-
-// Decode a map field.
-func (o *Buffer) dec_new_map(p *Properties, base structPointer) error {
-	raw, err := o.DecodeRawBytes(false)
-	if err != nil {
-		return err
-	}
-	oi := o.index       // index at the end of this map entry
-	o.index -= len(raw) // move buffer back to start of map entry
-
-	mptr := structPointer_NewAt(base, p.field, p.mtype) // *map[K]V
-	if mptr.Elem().IsNil() {
-		mptr.Elem().Set(reflect.MakeMap(mptr.Type().Elem()))
-	}
-	v := mptr.Elem() // map[K]V
-
-	// Prepare addressable doubly-indirect placeholders for the key and value types.
-	// See enc_new_map for why.
-	keyptr := reflect.New(reflect.PtrTo(p.mtype.Key())).Elem() // addressable *K
-	keybase := toStructPointer(keyptr.Addr())                  // **K
-
-	var valbase structPointer
-	var valptr reflect.Value
-	switch p.mtype.Elem().Kind() {
-	case reflect.Slice:
-		// []byte
-		var dummy []byte
-		valptr = reflect.ValueOf(&dummy)  // *[]byte
-		valbase = toStructPointer(valptr) // *[]byte
-	case reflect.Ptr:
-		// message; valptr is **Msg; need to allocate the intermediate pointer
-		valptr = reflect.New(reflect.PtrTo(p.mtype.Elem())).Elem() // addressable *V
-		valptr.Set(reflect.New(valptr.Type().Elem()))
-		valbase = toStructPointer(valptr)
-	default:
-		// everything else
-		valptr = reflect.New(reflect.PtrTo(p.mtype.Elem())).Elem() // addressable *V
-		valbase = toStructPointer(valptr.Addr())                   // **V
-	}
-
-	// Decode.
-	// This parses a restricted wire format, namely the encoding of a message
-	// with two fields. See enc_new_map for the format.
-	for o.index < oi {
-		// tagcode for key and value properties are always a single byte
-		// because they have tags 1 and 2.
-		tagcode := o.buf[o.index]
-		o.index++
-		switch tagcode {
-		case p.mkeyprop.tagcode[0]:
-			if err := p.mkeyprop.dec(o, p.mkeyprop, keybase); err != nil {
-				return err
-			}
-		case p.mvalprop.tagcode[0]:
-			if err := p.mvalprop.dec(o, p.mvalprop, valbase); err != nil {
-				return err
-			}
-		default:
-			// TODO: Should we silently skip this instead?
-			return fmt.Errorf("proto: bad map data tag %d", raw[0])
-		}
-	}
-	keyelem, valelem := keyptr.Elem(), valptr.Elem()
-	if !keyelem.IsValid() || !valelem.IsValid() {
-		// We did not decode the key or the value in the map entry.
-		// Either way, it's an invalid map entry.
-		return fmt.Errorf("proto: bad map data: missing key/val")
-	}
-
-	v.SetMapIndex(keyelem, valelem)
-	return nil
-}
-
-// Decode a group.
-func (o *Buffer) dec_struct_group(p *Properties, base structPointer) error {
-	bas := structPointer_GetStructPointer(base, p.field)
-	if structPointer_IsNil(bas) {
-		// allocate new nested message
-		bas = toStructPointer(reflect.New(p.stype))
-		structPointer_SetStructPointer(base, p.field, bas)
-	}
-	return o.unmarshalType(p.stype, p.sprop, true, bas)
-}
-
-// Decode an embedded message.
-func (o *Buffer) dec_struct_message(p *Properties, base structPointer) (err error) {
-	raw, e := o.DecodeRawBytes(false)
-	if e != nil {
-		return e
-	}
-
-	bas := structPointer_GetStructPointer(base, p.field)
-	if structPointer_IsNil(bas) {
-		// allocate new nested message
-		bas = toStructPointer(reflect.New(p.stype))
-		structPointer_SetStructPointer(base, p.field, bas)
-	}
-
-	// If the object can unmarshal itself, let it.
-	if p.isUnmarshaler {
-		iv := structPointer_Interface(bas, p.stype)
-		return iv.(Unmarshaler).Unmarshal(raw)
-	}
-
-	obuf := o.buf
-	oi := o.index
-	o.buf = raw
-	o.index = 0
-
-	err = o.unmarshalType(p.stype, p.sprop, false, bas)
-	o.buf = obuf
-	o.index = oi
-
-	return err
-}
-
-// Decode a slice of embedded messages.
-func (o *Buffer) dec_slice_struct_message(p *Properties, base structPointer) error {
-	return o.dec_slice_struct(p, false, base)
-}
-
-// Decode a slice of embedded groups.
-func (o *Buffer) dec_slice_struct_group(p *Properties, base structPointer) error {
-	return o.dec_slice_struct(p, true, base)
-}
-
-// Decode a slice of structs ([]*struct).
-func (o *Buffer) dec_slice_struct(p *Properties, is_group bool, base structPointer) error {
-	v := reflect.New(p.stype)
-	bas := toStructPointer(v)
-	structPointer_StructPointerSlice(base, p.field).Append(bas)
-
-	if is_group {
-		err := o.unmarshalType(p.stype, p.sprop, is_group, bas)
-		return err
-	}
-
-	raw, err := o.DecodeRawBytes(false)
-	if err != nil {
-		return err
-	}
-
-	// If the object can unmarshal itself, let it.
-	if p.isUnmarshaler {
-		iv := v.Interface()
-		return iv.(Unmarshaler).Unmarshal(raw)
-	}
-
-	obuf := o.buf
-	oi := o.index
-	o.buf = raw
-	o.index = 0
-
-	err = o.unmarshalType(p.stype, p.sprop, is_group, bas)
-
-	o.buf = obuf
-	o.index = oi
-
-	return err
-}
diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/proto/encode.go b/Godeps/_workspace/src/github.com/golang/protobuf/proto/encode.go
deleted file mode 100644
index 91f3f0784..000000000
--- a/Godeps/_workspace/src/github.com/golang/protobuf/proto/encode.go
+++ /dev/null
@@ -1,1293 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2010 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// 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.
-
-package proto
-
-/*
- * Routines for encoding data into the wire format for protocol buffers.
- */
-
-import (
-	"errors"
-	"fmt"
-	"reflect"
-	"sort"
-)
-
-// RequiredNotSetError is the error returned if Marshal is called with
-// a protocol buffer struct whose required fields have not
-// all been initialized. It is also the error returned if Unmarshal is
-// called with an encoded protocol buffer that does not include all the
-// required fields.
-//
-// When printed, RequiredNotSetError reports the first unset required field in a
-// message. If the field cannot be precisely determined, it is reported as
-// "{Unknown}".
-type RequiredNotSetError struct {
-	field string
-}
-
-func (e *RequiredNotSetError) Error() string {
-	return fmt.Sprintf("proto: required field %q not set", e.field)
-}
-
-var (
-	// errRepeatedHasNil is the error returned if Marshal is called with
-	// a struct with a repeated field containing a nil element.
-	errRepeatedHasNil = errors.New("proto: repeated field has nil element")
-
-	// ErrNil is the error returned if Marshal is called with nil.
-	ErrNil = errors.New("proto: Marshal called with nil")
-)
-
-// The fundamental encoders that put bytes on the wire.
-// Those that take integer types all accept uint64 and are
-// therefore of type valueEncoder.
-
-const maxVarintBytes = 10 // maximum length of a varint
-
-// EncodeVarint returns the varint encoding of x.
-// This is the format for the
-// int32, int64, uint32, uint64, bool, and enum
-// protocol buffer types.
-// Not used by the package itself, but helpful to clients
-// wishing to use the same encoding.
-func EncodeVarint(x uint64) []byte {
-	var buf [maxVarintBytes]byte
-	var n int
-	for n = 0; x > 127; n++ {
-		buf[n] = 0x80 | uint8(x&0x7F)
-		x >>= 7
-	}
-	buf[n] = uint8(x)
-	n++
-	return buf[0:n]
-}
-
-// EncodeVarint writes a varint-encoded integer to the Buffer.
-// This is the format for the
-// int32, int64, uint32, uint64, bool, and enum
-// protocol buffer types.
-func (p *Buffer) EncodeVarint(x uint64) error {
-	for x >= 1<<7 {
-		p.buf = append(p.buf, uint8(x&0x7f|0x80))
-		x >>= 7
-	}
-	p.buf = append(p.buf, uint8(x))
-	return nil
-}
-
-func sizeVarint(x uint64) (n int) {
-	for {
-		n++
-		x >>= 7
-		if x == 0 {
-			break
-		}
-	}
-	return n
-}
-
-// EncodeFixed64 writes a 64-bit integer to the Buffer.
-// This is the format for the
-// fixed64, sfixed64, and double protocol buffer types.
-func (p *Buffer) EncodeFixed64(x uint64) error {
-	p.buf = append(p.buf,
-		uint8(x),
-		uint8(x>>8),
-		uint8(x>>16),
-		uint8(x>>24),
-		uint8(x>>32),
-		uint8(x>>40),
-		uint8(x>>48),
-		uint8(x>>56))
-	return nil
-}
-
-func sizeFixed64(x uint64) int {
-	return 8
-}
-
-// EncodeFixed32 writes a 32-bit integer to the Buffer.
-// This is the format for the
-// fixed32, sfixed32, and float protocol buffer types.
-func (p *Buffer) EncodeFixed32(x uint64) error {
-	p.buf = append(p.buf,
-		uint8(x),
-		uint8(x>>8),
-		uint8(x>>16),
-		uint8(x>>24))
-	return nil
-}
-
-func sizeFixed32(x uint64) int {
-	return 4
-}
-
-// EncodeZigzag64 writes a zigzag-encoded 64-bit integer
-// to the Buffer.
-// This is the format used for the sint64 protocol buffer type.
-func (p *Buffer) EncodeZigzag64(x uint64) error {
-	// use signed number to get arithmetic right shift.
-	return p.EncodeVarint(uint64((x << 1) ^ uint64((int64(x) >> 63))))
-}
-
-func sizeZigzag64(x uint64) int {
-	return sizeVarint(uint64((x << 1) ^ uint64((int64(x) >> 63))))
-}
-
-// EncodeZigzag32 writes a zigzag-encoded 32-bit integer
-// to the Buffer.
-// This is the format used for the sint32 protocol buffer type.
-func (p *Buffer) EncodeZigzag32(x uint64) error {
-	// use signed number to get arithmetic right shift.
-	return p.EncodeVarint(uint64((uint32(x) << 1) ^ uint32((int32(x) >> 31))))
-}
-
-func sizeZigzag32(x uint64) int {
-	return sizeVarint(uint64((uint32(x) << 1) ^ uint32((int32(x) >> 31))))
-}
-
-// EncodeRawBytes writes a count-delimited byte buffer to the Buffer.
-// This is the format used for the bytes protocol buffer
-// type and for embedded messages.
-func (p *Buffer) EncodeRawBytes(b []byte) error {
-	p.EncodeVarint(uint64(len(b)))
-	p.buf = append(p.buf, b...)
-	return nil
-}
-
-func sizeRawBytes(b []byte) int {
-	return sizeVarint(uint64(len(b))) +
-		len(b)
-}
-
-// EncodeStringBytes writes an encoded string to the Buffer.
-// This is the format used for the proto2 string type.
-func (p *Buffer) EncodeStringBytes(s string) error {
-	p.EncodeVarint(uint64(len(s)))
-	p.buf = append(p.buf, s...)
-	return nil
-}
-
-func sizeStringBytes(s string) int {
-	return sizeVarint(uint64(len(s))) +
-		len(s)
-}
-
-// Marshaler is the interface representing objects that can marshal themselves.
-type Marshaler interface {
-	Marshal() ([]byte, error)
-}
-
-// Marshal takes the protocol buffer
-// and encodes it into the wire format, returning the data.
-func Marshal(pb Message) ([]byte, error) {
-	// Can the object marshal itself?
-	if m, ok := pb.(Marshaler); ok {
-		return m.Marshal()
-	}
-	p := NewBuffer(nil)
-	err := p.Marshal(pb)
-	var state errorState
-	if err != nil && !state.shouldContinue(err, nil) {
-		return nil, err
-	}
-	if p.buf == nil && err == nil {
-		// Return a non-nil slice on success.
-		return []byte{}, nil
-	}
-	return p.buf, err
-}
-
-// Marshal takes the protocol buffer
-// and encodes it into the wire format, writing the result to the
-// Buffer.
-func (p *Buffer) Marshal(pb Message) error {
-	// Can the object marshal itself?
-	if m, ok := pb.(Marshaler); ok {
-		data, err := m.Marshal()
-		if err != nil {
-			return err
-		}
-		p.buf = append(p.buf, data...)
-		return nil
-	}
-
-	t, base, err := getbase(pb)
-	if structPointer_IsNil(base) {
-		return ErrNil
-	}
-	if err == nil {
-		err = p.enc_struct(GetProperties(t.Elem()), base)
-	}
-
-	if collectStats {
-		stats.Encode++
-	}
-
-	return err
-}
-
-// Size returns the encoded size of a protocol buffer.
-func Size(pb Message) (n int) {
-	// Can the object marshal itself?  If so, Size is slow.
-	// TODO: add Size to Marshaler, or add a Sizer interface.
-	if m, ok := pb.(Marshaler); ok {
-		b, _ := m.Marshal()
-		return len(b)
-	}
-
-	t, base, err := getbase(pb)
-	if structPointer_IsNil(base) {
-		return 0
-	}
-	if err == nil {
-		n = size_struct(GetProperties(t.Elem()), base)
-	}
-
-	if collectStats {
-		stats.Size++
-	}
-
-	return
-}
-
-// Individual type encoders.
-
-// Encode a bool.
-func (o *Buffer) enc_bool(p *Properties, base structPointer) error {
-	v := *structPointer_Bool(base, p.field)
-	if v == nil {
-		return ErrNil
-	}
-	x := 0
-	if *v {
-		x = 1
-	}
-	o.buf = append(o.buf, p.tagcode...)
-	p.valEnc(o, uint64(x))
-	return nil
-}
-
-func (o *Buffer) enc_proto3_bool(p *Properties, base structPointer) error {
-	v := *structPointer_BoolVal(base, p.field)
-	if !v {
-		return ErrNil
-	}
-	o.buf = append(o.buf, p.tagcode...)
-	p.valEnc(o, 1)
-	return nil
-}
-
-func size_bool(p *Properties, base structPointer) int {
-	v := *structPointer_Bool(base, p.field)
-	if v == nil {
-		return 0
-	}
-	return len(p.tagcode) + 1 // each bool takes exactly one byte
-}
-
-func size_proto3_bool(p *Properties, base structPointer) int {
-	v := *structPointer_BoolVal(base, p.field)
-	if !v {
-		return 0
-	}
-	return len(p.tagcode) + 1 // each bool takes exactly one byte
-}
-
-// Encode an int32.
-func (o *Buffer) enc_int32(p *Properties, base structPointer) error {
-	v := structPointer_Word32(base, p.field)
-	if word32_IsNil(v) {
-		return ErrNil
-	}
-	x := int32(word32_Get(v)) // permit sign extension to use full 64-bit range
-	o.buf = append(o.buf, p.tagcode...)
-	p.valEnc(o, uint64(x))
-	return nil
-}
-
-func (o *Buffer) enc_proto3_int32(p *Properties, base structPointer) error {
-	v := structPointer_Word32Val(base, p.field)
-	x := int32(word32Val_Get(v)) // permit sign extension to use full 64-bit range
-	if x == 0 {
-		return ErrNil
-	}
-	o.buf = append(o.buf, p.tagcode...)
-	p.valEnc(o, uint64(x))
-	return nil
-}
-
-func size_int32(p *Properties, base structPointer) (n int) {
-	v := structPointer_Word32(base, p.field)
-	if word32_IsNil(v) {
-		return 0
-	}
-	x := int32(word32_Get(v)) // permit sign extension to use full 64-bit range
-	n += len(p.tagcode)
-	n += p.valSize(uint64(x))
-	return
-}
-
-func size_proto3_int32(p *Properties, base structPointer) (n int) {
-	v := structPointer_Word32Val(base, p.field)
-	x := int32(word32Val_Get(v)) // permit sign extension to use full 64-bit range
-	if x == 0 {
-		return 0
-	}
-	n += len(p.tagcode)
-	n += p.valSize(uint64(x))
-	return
-}
-
-// Encode a uint32.
-// Exactly the same as int32, except for no sign extension.
-func (o *Buffer) enc_uint32(p *Properties, base structPointer) error {
-	v := structPointer_Word32(base, p.field)
-	if word32_IsNil(v) {
-		return ErrNil
-	}
-	x := word32_Get(v)
-	o.buf = append(o.buf, p.tagcode...)
-	p.valEnc(o, uint64(x))
-	return nil
-}
-
-func (o *Buffer) enc_proto3_uint32(p *Properties, base structPointer) error {
-	v := structPointer_Word32Val(base, p.field)
-	x := word32Val_Get(v)
-	if x == 0 {
-		return ErrNil
-	}
-	o.buf = append(o.buf, p.tagcode...)
-	p.valEnc(o, uint64(x))
-	return nil
-}
-
-func size_uint32(p *Properties, base structPointer) (n int) {
-	v := structPointer_Word32(base, p.field)
-	if word32_IsNil(v) {
-		return 0
-	}
-	x := word32_Get(v)
-	n += len(p.tagcode)
-	n += p.valSize(uint64(x))
-	return
-}
-
-func size_proto3_uint32(p *Properties, base structPointer) (n int) {
-	v := structPointer_Word32Val(base, p.field)
-	x := word32Val_Get(v)
-	if x == 0 {
-		return 0
-	}
-	n += len(p.tagcode)
-	n += p.valSize(uint64(x))
-	return
-}
-
-// Encode an int64.
-func (o *Buffer) enc_int64(p *Properties, base structPointer) error {
-	v := structPointer_Word64(base, p.field)
-	if word64_IsNil(v) {
-		return ErrNil
-	}
-	x := word64_Get(v)
-	o.buf = append(o.buf, p.tagcode...)
-	p.valEnc(o, x)
-	return nil
-}
-
-func (o *Buffer) enc_proto3_int64(p *Properties, base structPointer) error {
-	v := structPointer_Word64Val(base, p.field)
-	x := word64Val_Get(v)
-	if x == 0 {
-		return ErrNil
-	}
-	o.buf = append(o.buf, p.tagcode...)
-	p.valEnc(o, x)
-	return nil
-}
-
-func size_int64(p *Properties, base structPointer) (n int) {
-	v := structPointer_Word64(base, p.field)
-	if word64_IsNil(v) {
-		return 0
-	}
-	x := word64_Get(v)
-	n += len(p.tagcode)
-	n += p.valSize(x)
-	return
-}
-
-func size_proto3_int64(p *Properties, base structPointer) (n int) {
-	v := structPointer_Word64Val(base, p.field)
-	x := word64Val_Get(v)
-	if x == 0 {
-		return 0
-	}
-	n += len(p.tagcode)
-	n += p.valSize(x)
-	return
-}
-
-// Encode a string.
-func (o *Buffer) enc_string(p *Properties, base structPointer) error {
-	v := *structPointer_String(base, p.field)
-	if v == nil {
-		return ErrNil
-	}
-	x := *v
-	o.buf = append(o.buf, p.tagcode...)
-	o.EncodeStringBytes(x)
-	return nil
-}
-
-func (o *Buffer) enc_proto3_string(p *Properties, base structPointer) error {
-	v := *structPointer_StringVal(base, p.field)
-	if v == "" {
-		return ErrNil
-	}
-	o.buf = append(o.buf, p.tagcode...)
-	o.EncodeStringBytes(v)
-	return nil
-}
-
-func size_string(p *Properties, base structPointer) (n int) {
-	v := *structPointer_String(base, p.field)
-	if v == nil {
-		return 0
-	}
-	x := *v
-	n += len(p.tagcode)
-	n += sizeStringBytes(x)
-	return
-}
-
-func size_proto3_string(p *Properties, base structPointer) (n int) {
-	v := *structPointer_StringVal(base, p.field)
-	if v == "" {
-		return 0
-	}
-	n += len(p.tagcode)
-	n += sizeStringBytes(v)
-	return
-}
-
-// All protocol buffer fields are nillable, but be careful.
-func isNil(v reflect.Value) bool {
-	switch v.Kind() {
-	case reflect.Interface, reflect.Map, reflect.Ptr, reflect.Slice:
-		return v.IsNil()
-	}
-	return false
-}
-
-// Encode a message struct.
-func (o *Buffer) enc_struct_message(p *Properties, base structPointer) error {
-	var state errorState
-	structp := structPointer_GetStructPointer(base, p.field)
-	if structPointer_IsNil(structp) {
-		return ErrNil
-	}
-
-	// Can the object marshal itself?
-	if p.isMarshaler {
-		m := structPointer_Interface(structp, p.stype).(Marshaler)
-		data, err := m.Marshal()
-		if err != nil && !state.shouldContinue(err, nil) {
-			return err
-		}
-		o.buf = append(o.buf, p.tagcode...)
-		o.EncodeRawBytes(data)
-		return state.err
-	}
-
-	o.buf = append(o.buf, p.tagcode...)
-	return o.enc_len_struct(p.sprop, structp, &state)
-}
-
-func size_struct_message(p *Properties, base structPointer) int {
-	structp := structPointer_GetStructPointer(base, p.field)
-	if structPointer_IsNil(structp) {
-		return 0
-	}
-
-	// Can the object marshal itself?
-	if p.isMarshaler {
-		m := structPointer_Interface(structp, p.stype).(Marshaler)
-		data, _ := m.Marshal()
-		n0 := len(p.tagcode)
-		n1 := sizeRawBytes(data)
-		return n0 + n1
-	}
-
-	n0 := len(p.tagcode)
-	n1 := size_struct(p.sprop, structp)
-	n2 := sizeVarint(uint64(n1)) // size of encoded length
-	return n0 + n1 + n2
-}
-
-// Encode a group struct.
-func (o *Buffer) enc_struct_group(p *Properties, base structPointer) error {
-	var state errorState
-	b := structPointer_GetStructPointer(base, p.field)
-	if structPointer_IsNil(b) {
-		return ErrNil
-	}
-
-	o.EncodeVarint(uint64((p.Tag << 3) | WireStartGroup))
-	err := o.enc_struct(p.sprop, b)
-	if err != nil && !state.shouldContinue(err, nil) {
-		return err
-	}
-	o.EncodeVarint(uint64((p.Tag << 3) | WireEndGroup))
-	return state.err
-}
-
-func size_struct_group(p *Properties, base structPointer) (n int) {
-	b := structPointer_GetStructPointer(base, p.field)
-	if structPointer_IsNil(b) {
-		return 0
-	}
-
-	n += sizeVarint(uint64((p.Tag << 3) | WireStartGroup))
-	n += size_struct(p.sprop, b)
-	n += sizeVarint(uint64((p.Tag << 3) | WireEndGroup))
-	return
-}
-
-// Encode a slice of bools ([]bool).
-func (o *Buffer) enc_slice_bool(p *Properties, base structPointer) error {
-	s := *structPointer_BoolSlice(base, p.field)
-	l := len(s)
-	if l == 0 {
-		return ErrNil
-	}
-	for _, x := range s {
-		o.buf = append(o.buf, p.tagcode...)
-		v := uint64(0)
-		if x {
-			v = 1
-		}
-		p.valEnc(o, v)
-	}
-	return nil
-}
-
-func size_slice_bool(p *Properties, base structPointer) int {
-	s := *structPointer_BoolSlice(base, p.field)
-	l := len(s)
-	if l == 0 {
-		return 0
-	}
-	return l * (len(p.tagcode) + 1) // each bool takes exactly one byte
-}
-
-// Encode a slice of bools ([]bool) in packed format.
-func (o *Buffer) enc_slice_packed_bool(p *Properties, base structPointer) error {
-	s := *structPointer_BoolSlice(base, p.field)
-	l := len(s)
-	if l == 0 {
-		return ErrNil
-	}
-	o.buf = append(o.buf, p.tagcode...)
-	o.EncodeVarint(uint64(l)) // each bool takes exactly one byte
-	for _, x := range s {
-		v := uint64(0)
-		if x {
-			v = 1
-		}
-		p.valEnc(o, v)
-	}
-	return nil
-}
-
-func size_slice_packed_bool(p *Properties, base structPointer) (n int) {
-	s := *structPointer_BoolSlice(base, p.field)
-	l := len(s)
-	if l == 0 {
-		return 0
-	}
-	n += len(p.tagcode)
-	n += sizeVarint(uint64(l))
-	n += l // each bool takes exactly one byte
-	return
-}
-
-// Encode a slice of bytes ([]byte).
-func (o *Buffer) enc_slice_byte(p *Properties, base structPointer) error {
-	s := *structPointer_Bytes(base, p.field)
-	if s == nil {
-		return ErrNil
-	}
-	o.buf = append(o.buf, p.tagcode...)
-	o.EncodeRawBytes(s)
-	return nil
-}
-
-func (o *Buffer) enc_proto3_slice_byte(p *Properties, base structPointer) error {
-	s := *structPointer_Bytes(base, p.field)
-	if len(s) == 0 {
-		return ErrNil
-	}
-	o.buf = append(o.buf, p.tagcode...)
-	o.EncodeRawBytes(s)
-	return nil
-}
-
-func size_slice_byte(p *Properties, base structPointer) (n int) {
-	s := *structPointer_Bytes(base, p.field)
-	if s == nil {
-		return 0
-	}
-	n += len(p.tagcode)
-	n += sizeRawBytes(s)
-	return
-}
-
-func size_proto3_slice_byte(p *Properties, base structPointer) (n int) {
-	s := *structPointer_Bytes(base, p.field)
-	if len(s) == 0 {
-		return 0
-	}
-	n += len(p.tagcode)
-	n += sizeRawBytes(s)
-	return
-}
-
-// Encode a slice of int32s ([]int32).
-func (o *Buffer) enc_slice_int32(p *Properties, base structPointer) error {
-	s := structPointer_Word32Slice(base, p.field)
-	l := s.Len()
-	if l == 0 {
-		return ErrNil
-	}
-	for i := 0; i < l; i++ {
-		o.buf = append(o.buf, p.tagcode...)
-		x := int32(s.Index(i)) // permit sign extension to use full 64-bit range
-		p.valEnc(o, uint64(x))
-	}
-	return nil
-}
-
-func size_slice_int32(p *Properties, base structPointer) (n int) {
-	s := structPointer_Word32Slice(base, p.field)
-	l := s.Len()
-	if l == 0 {
-		return 0
-	}
-	for i := 0; i < l; i++ {
-		n += len(p.tagcode)
-		x := int32(s.Index(i)) // permit sign extension to use full 64-bit range
-		n += p.valSize(uint64(x))
-	}
-	return
-}
-
-// Encode a slice of int32s ([]int32) in packed format.
-func (o *Buffer) enc_slice_packed_int32(p *Properties, base structPointer) error {
-	s := structPointer_Word32Slice(base, p.field)
-	l := s.Len()
-	if l == 0 {
-		return ErrNil
-	}
-	// TODO: Reuse a Buffer.
-	buf := NewBuffer(nil)
-	for i := 0; i < l; i++ {
-		x := int32(s.Index(i)) // permit sign extension to use full 64-bit range
-		p.valEnc(buf, uint64(x))
-	}
-
-	o.buf = append(o.buf, p.tagcode...)
-	o.EncodeVarint(uint64(len(buf.buf)))
-	o.buf = append(o.buf, buf.buf...)
-	return nil
-}
-
-func size_slice_packed_int32(p *Properties, base structPointer) (n int) {
-	s := structPointer_Word32Slice(base, p.field)
-	l := s.Len()
-	if l == 0 {
-		return 0
-	}
-	var bufSize int
-	for i := 0; i < l; i++ {
-		x := int32(s.Index(i)) // permit sign extension to use full 64-bit range
-		bufSize += p.valSize(uint64(x))
-	}
-
-	n += len(p.tagcode)
-	n += sizeVarint(uint64(bufSize))
-	n += bufSize
-	return
-}
-
-// Encode a slice of uint32s ([]uint32).
-// Exactly the same as int32, except for no sign extension.
-func (o *Buffer) enc_slice_uint32(p *Properties, base structPointer) error {
-	s := structPointer_Word32Slice(base, p.field)
-	l := s.Len()
-	if l == 0 {
-		return ErrNil
-	}
-	for i := 0; i < l; i++ {
-		o.buf = append(o.buf, p.tagcode...)
-		x := s.Index(i)
-		p.valEnc(o, uint64(x))
-	}
-	return nil
-}
-
-func size_slice_uint32(p *Properties, base structPointer) (n int) {
-	s := structPointer_Word32Slice(base, p.field)
-	l := s.Len()
-	if l == 0 {
-		return 0
-	}
-	for i := 0; i < l; i++ {
-		n += len(p.tagcode)
-		x := s.Index(i)
-		n += p.valSize(uint64(x))
-	}
-	return
-}
-
-// Encode a slice of uint32s ([]uint32) in packed format.
-// Exactly the same as int32, except for no sign extension.
-func (o *Buffer) enc_slice_packed_uint32(p *Properties, base structPointer) error {
-	s := structPointer_Word32Slice(base, p.field)
-	l := s.Len()
-	if l == 0 {
-		return ErrNil
-	}
-	// TODO: Reuse a Buffer.
-	buf := NewBuffer(nil)
-	for i := 0; i < l; i++ {
-		p.valEnc(buf, uint64(s.Index(i)))
-	}
-
-	o.buf = append(o.buf, p.tagcode...)
-	o.EncodeVarint(uint64(len(buf.buf)))
-	o.buf = append(o.buf, buf.buf...)
-	return nil
-}
-
-func size_slice_packed_uint32(p *Properties, base structPointer) (n int) {
-	s := structPointer_Word32Slice(base, p.field)
-	l := s.Len()
-	if l == 0 {
-		return 0
-	}
-	var bufSize int
-	for i := 0; i < l; i++ {
-		bufSize += p.valSize(uint64(s.Index(i)))
-	}
-
-	n += len(p.tagcode)
-	n += sizeVarint(uint64(bufSize))
-	n += bufSize
-	return
-}
-
-// Encode a slice of int64s ([]int64).
-func (o *Buffer) enc_slice_int64(p *Properties, base structPointer) error {
-	s := structPointer_Word64Slice(base, p.field)
-	l := s.Len()
-	if l == 0 {
-		return ErrNil
-	}
-	for i := 0; i < l; i++ {
-		o.buf = append(o.buf, p.tagcode...)
-		p.valEnc(o, s.Index(i))
-	}
-	return nil
-}
-
-func size_slice_int64(p *Properties, base structPointer) (n int) {
-	s := structPointer_Word64Slice(base, p.field)
-	l := s.Len()
-	if l == 0 {
-		return 0
-	}
-	for i := 0; i < l; i++ {
-		n += len(p.tagcode)
-		n += p.valSize(s.Index(i))
-	}
-	return
-}
-
-// Encode a slice of int64s ([]int64) in packed format.
-func (o *Buffer) enc_slice_packed_int64(p *Properties, base structPointer) error {
-	s := structPointer_Word64Slice(base, p.field)
-	l := s.Len()
-	if l == 0 {
-		return ErrNil
-	}
-	// TODO: Reuse a Buffer.
-	buf := NewBuffer(nil)
-	for i := 0; i < l; i++ {
-		p.valEnc(buf, s.Index(i))
-	}
-
-	o.buf = append(o.buf, p.tagcode...)
-	o.EncodeVarint(uint64(len(buf.buf)))
-	o.buf = append(o.buf, buf.buf...)
-	return nil
-}
-
-func size_slice_packed_int64(p *Properties, base structPointer) (n int) {
-	s := structPointer_Word64Slice(base, p.field)
-	l := s.Len()
-	if l == 0 {
-		return 0
-	}
-	var bufSize int
-	for i := 0; i < l; i++ {
-		bufSize += p.valSize(s.Index(i))
-	}
-
-	n += len(p.tagcode)
-	n += sizeVarint(uint64(bufSize))
-	n += bufSize
-	return
-}
-
-// Encode a slice of slice of bytes ([][]byte).
-func (o *Buffer) enc_slice_slice_byte(p *Properties, base structPointer) error {
-	ss := *structPointer_BytesSlice(base, p.field)
-	l := len(ss)
-	if l == 0 {
-		return ErrNil
-	}
-	for i := 0; i < l; i++ {
-		o.buf = append(o.buf, p.tagcode...)
-		o.EncodeRawBytes(ss[i])
-	}
-	return nil
-}
-
-func size_slice_slice_byte(p *Properties, base structPointer) (n int) {
-	ss := *structPointer_BytesSlice(base, p.field)
-	l := len(ss)
-	if l == 0 {
-		return 0
-	}
-	n += l * len(p.tagcode)
-	for i := 0; i < l; i++ {
-		n += sizeRawBytes(ss[i])
-	}
-	return
-}
-
-// Encode a slice of strings ([]string).
-func (o *Buffer) enc_slice_string(p *Properties, base structPointer) error {
-	ss := *structPointer_StringSlice(base, p.field)
-	l := len(ss)
-	for i := 0; i < l; i++ {
-		o.buf = append(o.buf, p.tagcode...)
-		o.EncodeStringBytes(ss[i])
-	}
-	return nil
-}
-
-func size_slice_string(p *Properties, base structPointer) (n int) {
-	ss := *structPointer_StringSlice(base, p.field)
-	l := len(ss)
-	n += l * len(p.tagcode)
-	for i := 0; i < l; i++ {
-		n += sizeStringBytes(ss[i])
-	}
-	return
-}
-
-// Encode a slice of message structs ([]*struct).
-func (o *Buffer) enc_slice_struct_message(p *Properties, base structPointer) error {
-	var state errorState
-	s := structPointer_StructPointerSlice(base, p.field)
-	l := s.Len()
-
-	for i := 0; i < l; i++ {
-		structp := s.Index(i)
-		if structPointer_IsNil(structp) {
-			return errRepeatedHasNil
-		}
-
-		// Can the object marshal itself?
-		if p.isMarshaler {
-			m := structPointer_Interface(structp, p.stype).(Marshaler)
-			data, err := m.Marshal()
-			if err != nil && !state.shouldContinue(err, nil) {
-				return err
-			}
-			o.buf = append(o.buf, p.tagcode...)
-			o.EncodeRawBytes(data)
-			continue
-		}
-
-		o.buf = append(o.buf, p.tagcode...)
-		err := o.enc_len_struct(p.sprop, structp, &state)
-		if err != nil && !state.shouldContinue(err, nil) {
-			if err == ErrNil {
-				return errRepeatedHasNil
-			}
-			return err
-		}
-	}
-	return state.err
-}
-
-func size_slice_struct_message(p *Properties, base structPointer) (n int) {
-	s := structPointer_StructPointerSlice(base, p.field)
-	l := s.Len()
-	n += l * len(p.tagcode)
-	for i := 0; i < l; i++ {
-		structp := s.Index(i)
-		if structPointer_IsNil(structp) {
-			return // return the size up to this point
-		}
-
-		// Can the object marshal itself?
-		if p.isMarshaler {
-			m := structPointer_Interface(structp, p.stype).(Marshaler)
-			data, _ := m.Marshal()
-			n += len(p.tagcode)
-			n += sizeRawBytes(data)
-			continue
-		}
-
-		n0 := size_struct(p.sprop, structp)
-		n1 := sizeVarint(uint64(n0)) // size of encoded length
-		n += n0 + n1
-	}
-	return
-}
-
-// Encode a slice of group structs ([]*struct).
-func (o *Buffer) enc_slice_struct_group(p *Properties, base structPointer) error {
-	var state errorState
-	s := structPointer_StructPointerSlice(base, p.field)
-	l := s.Len()
-
-	for i := 0; i < l; i++ {
-		b := s.Index(i)
-		if structPointer_IsNil(b) {
-			return errRepeatedHasNil
-		}
-
-		o.EncodeVarint(uint64((p.Tag << 3) | WireStartGroup))
-
-		err := o.enc_struct(p.sprop, b)
-
-		if err != nil && !state.shouldContinue(err, nil) {
-			if err == ErrNil {
-				return errRepeatedHasNil
-			}
-			return err
-		}
-
-		o.EncodeVarint(uint64((p.Tag << 3) | WireEndGroup))
-	}
-	return state.err
-}
-
-func size_slice_struct_group(p *Properties, base structPointer) (n int) {
-	s := structPointer_StructPointerSlice(base, p.field)
-	l := s.Len()
-
-	n += l * sizeVarint(uint64((p.Tag<<3)|WireStartGroup))
-	n += l * sizeVarint(uint64((p.Tag<<3)|WireEndGroup))
-	for i := 0; i < l; i++ {
-		b := s.Index(i)
-		if structPointer_IsNil(b) {
-			return // return size up to this point
-		}
-
-		n += size_struct(p.sprop, b)
-	}
-	return
-}
-
-// Encode an extension map.
-func (o *Buffer) enc_map(p *Properties, base structPointer) error {
-	v := *structPointer_ExtMap(base, p.field)
-	if err := encodeExtensionMap(v); err != nil {
-		return err
-	}
-	// Fast-path for common cases: zero or one extensions.
-	if len(v) <= 1 {
-		for _, e := range v {
-			o.buf = append(o.buf, e.enc...)
-		}
-		return nil
-	}
-
-	// Sort keys to provide a deterministic encoding.
-	keys := make([]int, 0, len(v))
-	for k := range v {
-		keys = append(keys, int(k))
-	}
-	sort.Ints(keys)
-
-	for _, k := range keys {
-		o.buf = append(o.buf, v[int32(k)].enc...)
-	}
-	return nil
-}
-
-func size_map(p *Properties, base structPointer) int {
-	v := *structPointer_ExtMap(base, p.field)
-	return sizeExtensionMap(v)
-}
-
-// Encode a map field.
-func (o *Buffer) enc_new_map(p *Properties, base structPointer) error {
-	var state errorState // XXX: or do we need to plumb this through?
-
-	/*
-		A map defined as
-			map<key_type, value_type> map_field = N;
-		is encoded in the same way as
-			message MapFieldEntry {
-				key_type key = 1;
-				value_type value = 2;
-			}
-			repeated MapFieldEntry map_field = N;
-	*/
-
-	v := structPointer_NewAt(base, p.field, p.mtype).Elem() // map[K]V
-	if v.Len() == 0 {
-		return nil
-	}
-
-	keycopy, valcopy, keybase, valbase := mapEncodeScratch(p.mtype)
-
-	enc := func() error {
-		if err := p.mkeyprop.enc(o, p.mkeyprop, keybase); err != nil {
-			return err
-		}
-		if err := p.mvalprop.enc(o, p.mvalprop, valbase); err != nil {
-			return err
-		}
-		return nil
-	}
-
-	keys := v.MapKeys()
-	sort.Sort(mapKeys(keys))
-	for _, key := range keys {
-		val := v.MapIndex(key)
-
-		// The only illegal map entry values are nil message pointers.
-		if val.Kind() == reflect.Ptr && val.IsNil() {
-			return errors.New("proto: map has nil element")
-		}
-
-		keycopy.Set(key)
-		valcopy.Set(val)
-
-		o.buf = append(o.buf, p.tagcode...)
-		if err := o.enc_len_thing(enc, &state); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func size_new_map(p *Properties, base structPointer) int {
-	v := structPointer_NewAt(base, p.field, p.mtype).Elem() // map[K]V
-
-	keycopy, valcopy, keybase, valbase := mapEncodeScratch(p.mtype)
-
-	n := 0
-	for _, key := range v.MapKeys() {
-		val := v.MapIndex(key)
-		keycopy.Set(key)
-		valcopy.Set(val)
-
-		// Tag codes for key and val are the responsibility of the sub-sizer.
-		keysize := p.mkeyprop.size(p.mkeyprop, keybase)
-		valsize := p.mvalprop.size(p.mvalprop, valbase)
-		entry := keysize + valsize
-		// Add on tag code and length of map entry itself.
-		n += len(p.tagcode) + sizeVarint(uint64(entry)) + entry
-	}
-	return n
-}
-
-// mapEncodeScratch returns a new reflect.Value matching the map's value type,
-// and a structPointer suitable for passing to an encoder or sizer.
-func mapEncodeScratch(mapType reflect.Type) (keycopy, valcopy reflect.Value, keybase, valbase structPointer) {
-	// Prepare addressable doubly-indirect placeholders for the key and value types.
-	// This is needed because the element-type encoders expect **T, but the map iteration produces T.
-
-	keycopy = reflect.New(mapType.Key()).Elem()                 // addressable K
-	keyptr := reflect.New(reflect.PtrTo(keycopy.Type())).Elem() // addressable *K
-	keyptr.Set(keycopy.Addr())                                  //
-	keybase = toStructPointer(keyptr.Addr())                    // **K
-
-	// Value types are more varied and require special handling.
-	switch mapType.Elem().Kind() {
-	case reflect.Slice:
-		// []byte
-		var dummy []byte
-		valcopy = reflect.ValueOf(&dummy).Elem() // addressable []byte
-		valbase = toStructPointer(valcopy.Addr())
-	case reflect.Ptr:
-		// message; the generated field type is map[K]*Msg (so V is *Msg),
-		// so we only need one level of indirection.
-		valcopy = reflect.New(mapType.Elem()).Elem() // addressable V
-		valbase = toStructPointer(valcopy.Addr())
-	default:
-		// everything else
-		valcopy = reflect.New(mapType.Elem()).Elem()                // addressable V
-		valptr := reflect.New(reflect.PtrTo(valcopy.Type())).Elem() // addressable *V
-		valptr.Set(valcopy.Addr())                                  //
-		valbase = toStructPointer(valptr.Addr())                    // **V
-	}
-	return
-}
-
-// Encode a struct.
-func (o *Buffer) enc_struct(prop *StructProperties, base structPointer) error {
-	var state errorState
-	// Encode fields in tag order so that decoders may use optimizations
-	// that depend on the ordering.
-	// https://developers.google.com/protocol-buffers/docs/encoding#order
-	for _, i := range prop.order {
-		p := prop.Prop[i]
-		if p.enc != nil {
-			err := p.enc(o, p, base)
-			if err != nil {
-				if err == ErrNil {
-					if p.Required && state.err == nil {
-						state.err = &RequiredNotSetError{p.Name}
-					}
-				} else if err == errRepeatedHasNil {
-					// Give more context to nil values in repeated fields.
-					return errors.New("repeated field " + p.OrigName + " has nil element")
-				} else if !state.shouldContinue(err, p) {
-					return err
-				}
-			}
-		}
-	}
-
-	// Add unrecognized fields at the end.
-	if prop.unrecField.IsValid() {
-		v := *structPointer_Bytes(base, prop.unrecField)
-		if len(v) > 0 {
-			o.buf = append(o.buf, v...)
-		}
-	}
-
-	return state.err
-}
-
-func size_struct(prop *StructProperties, base structPointer) (n int) {
-	for _, i := range prop.order {
-		p := prop.Prop[i]
-		if p.size != nil {
-			n += p.size(p, base)
-		}
-	}
-
-	// Add unrecognized fields at the end.
-	if prop.unrecField.IsValid() {
-		v := *structPointer_Bytes(base, prop.unrecField)
-		n += len(v)
-	}
-
-	return
-}
-
-var zeroes [20]byte // longer than any conceivable sizeVarint
-
-// Encode a struct, preceded by its encoded length (as a varint).
-func (o *Buffer) enc_len_struct(prop *StructProperties, base structPointer, state *errorState) error {
-	return o.enc_len_thing(func() error { return o.enc_struct(prop, base) }, state)
-}
-
-// Encode something, preceded by its encoded length (as a varint).
-func (o *Buffer) enc_len_thing(enc func() error, state *errorState) error {
-	iLen := len(o.buf)
-	o.buf = append(o.buf, 0, 0, 0, 0) // reserve four bytes for length
-	iMsg := len(o.buf)
-	err := enc()
-	if err != nil && !state.shouldContinue(err, nil) {
-		return err
-	}
-	lMsg := len(o.buf) - iMsg
-	lLen := sizeVarint(uint64(lMsg))
-	switch x := lLen - (iMsg - iLen); {
-	case x > 0: // actual length is x bytes larger than the space we reserved
-		// Move msg x bytes right.
-		o.buf = append(o.buf, zeroes[:x]...)
-		copy(o.buf[iMsg+x:], o.buf[iMsg:iMsg+lMsg])
-	case x < 0: // actual length is x bytes smaller than the space we reserved
-		// Move msg x bytes left.
-		copy(o.buf[iMsg+x:], o.buf[iMsg:iMsg+lMsg])
-		o.buf = o.buf[:len(o.buf)+x] // x is negative
-	}
-	// Encode the length in the reserved space.
-	o.buf = o.buf[:iLen]
-	o.EncodeVarint(uint64(lMsg))
-	o.buf = o.buf[:len(o.buf)+lMsg]
-	return state.err
-}
-
-// errorState maintains the first error that occurs and updates that error
-// with additional context.
-type errorState struct {
-	err error
-}
-
-// shouldContinue reports whether encoding should continue upon encountering the
-// given error. If the error is RequiredNotSetError, shouldContinue returns true
-// and, if this is the first appearance of that error, remembers it for future
-// reporting.
-//
-// If prop is not nil, it may update any error with additional context about the
-// field with the error.
-func (s *errorState) shouldContinue(err error, prop *Properties) bool {
-	// Ignore unset required fields.
-	reqNotSet, ok := err.(*RequiredNotSetError)
-	if !ok {
-		return false
-	}
-	if s.err == nil {
-		if prop != nil {
-			err = &RequiredNotSetError{prop.Name + "." + reqNotSet.field}
-		}
-		s.err = err
-	}
-	return true
-}
diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/proto/equal.go b/Godeps/_workspace/src/github.com/golang/protobuf/proto/equal.go
deleted file mode 100644
index d8673a3e9..000000000
--- a/Godeps/_workspace/src/github.com/golang/protobuf/proto/equal.go
+++ /dev/null
@@ -1,256 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2011 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// 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.
-
-// Protocol buffer comparison.
-// TODO: MessageSet.
-
-package proto
-
-import (
-	"bytes"
-	"log"
-	"reflect"
-	"strings"
-)
-
-/*
-Equal returns true iff protocol buffers a and b are equal.
-The arguments must both be pointers to protocol buffer structs.
-
-Equality is defined in this way:
-  - Two messages are equal iff they are the same type,
-    corresponding fields are equal, unknown field sets
-    are equal, and extensions sets are equal.
-  - Two set scalar fields are equal iff their values are equal.
-    If the fields are of a floating-point type, remember that
-    NaN != x for all x, including NaN.
-  - Two repeated fields are equal iff their lengths are the same,
-    and their corresponding elements are equal (a "bytes" field,
-    although represented by []byte, is not a repeated field)
-  - Two unset fields are equal.
-  - Two unknown field sets are equal if their current
-    encoded state is equal.
-  - Two extension sets are equal iff they have corresponding
-    elements that are pairwise equal.
-  - Every other combination of things are not equal.
-
-The return value is undefined if a and b are not protocol buffers.
-*/
-func Equal(a, b Message) bool {
-	if a == nil || b == nil {
-		return a == b
-	}
-	v1, v2 := reflect.ValueOf(a), reflect.ValueOf(b)
-	if v1.Type() != v2.Type() {
-		return false
-	}
-	if v1.Kind() == reflect.Ptr {
-		if v1.IsNil() {
-			return v2.IsNil()
-		}
-		if v2.IsNil() {
-			return false
-		}
-		v1, v2 = v1.Elem(), v2.Elem()
-	}
-	if v1.Kind() != reflect.Struct {
-		return false
-	}
-	return equalStruct(v1, v2)
-}
-
-// v1 and v2 are known to have the same type.
-func equalStruct(v1, v2 reflect.Value) bool {
-	for i := 0; i < v1.NumField(); i++ {
-		f := v1.Type().Field(i)
-		if strings.HasPrefix(f.Name, "XXX_") {
-			continue
-		}
-		f1, f2 := v1.Field(i), v2.Field(i)
-		if f.Type.Kind() == reflect.Ptr {
-			if n1, n2 := f1.IsNil(), f2.IsNil(); n1 && n2 {
-				// both unset
-				continue
-			} else if n1 != n2 {
-				// set/unset mismatch
-				return false
-			}
-			b1, ok := f1.Interface().(raw)
-			if ok {
-				b2 := f2.Interface().(raw)
-				// RawMessage
-				if !bytes.Equal(b1.Bytes(), b2.Bytes()) {
-					return false
-				}
-				continue
-			}
-			f1, f2 = f1.Elem(), f2.Elem()
-		}
-		if !equalAny(f1, f2) {
-			return false
-		}
-	}
-
-	if em1 := v1.FieldByName("XXX_extensions"); em1.IsValid() {
-		em2 := v2.FieldByName("XXX_extensions")
-		if !equalExtensions(v1.Type(), em1.Interface().(map[int32]Extension), em2.Interface().(map[int32]Extension)) {
-			return false
-		}
-	}
-
-	uf := v1.FieldByName("XXX_unrecognized")
-	if !uf.IsValid() {
-		return true
-	}
-
-	u1 := uf.Bytes()
-	u2 := v2.FieldByName("XXX_unrecognized").Bytes()
-	if !bytes.Equal(u1, u2) {
-		return false
-	}
-
-	return true
-}
-
-// v1 and v2 are known to have the same type.
-func equalAny(v1, v2 reflect.Value) bool {
-	if v1.Type() == protoMessageType {
-		m1, _ := v1.Interface().(Message)
-		m2, _ := v2.Interface().(Message)
-		return Equal(m1, m2)
-	}
-	switch v1.Kind() {
-	case reflect.Bool:
-		return v1.Bool() == v2.Bool()
-	case reflect.Float32, reflect.Float64:
-		return v1.Float() == v2.Float()
-	case reflect.Int32, reflect.Int64:
-		return v1.Int() == v2.Int()
-	case reflect.Map:
-		if v1.Len() != v2.Len() {
-			return false
-		}
-		for _, key := range v1.MapKeys() {
-			val2 := v2.MapIndex(key)
-			if !val2.IsValid() {
-				// This key was not found in the second map.
-				return false
-			}
-			if !equalAny(v1.MapIndex(key), val2) {
-				return false
-			}
-		}
-		return true
-	case reflect.Ptr:
-		return equalAny(v1.Elem(), v2.Elem())
-	case reflect.Slice:
-		if v1.Type().Elem().Kind() == reflect.Uint8 {
-			// short circuit: []byte
-			if v1.IsNil() != v2.IsNil() {
-				return false
-			}
-			return bytes.Equal(v1.Interface().([]byte), v2.Interface().([]byte))
-		}
-
-		if v1.Len() != v2.Len() {
-			return false
-		}
-		for i := 0; i < v1.Len(); i++ {
-			if !equalAny(v1.Index(i), v2.Index(i)) {
-				return false
-			}
-		}
-		return true
-	case reflect.String:
-		return v1.Interface().(string) == v2.Interface().(string)
-	case reflect.Struct:
-		return equalStruct(v1, v2)
-	case reflect.Uint32, reflect.Uint64:
-		return v1.Uint() == v2.Uint()
-	}
-
-	// unknown type, so not a protocol buffer
-	log.Printf("proto: don't know how to compare %v", v1)
-	return false
-}
-
-// base is the struct type that the extensions are based on.
-// em1 and em2 are extension maps.
-func equalExtensions(base reflect.Type, em1, em2 map[int32]Extension) bool {
-	if len(em1) != len(em2) {
-		return false
-	}
-
-	for extNum, e1 := range em1 {
-		e2, ok := em2[extNum]
-		if !ok {
-			return false
-		}
-
-		m1, m2 := e1.value, e2.value
-
-		if m1 != nil && m2 != nil {
-			// Both are unencoded.
-			if !equalAny(reflect.ValueOf(m1), reflect.ValueOf(m2)) {
-				return false
-			}
-			continue
-		}
-
-		// At least one is encoded. To do a semantically correct comparison
-		// we need to unmarshal them first.
-		var desc *ExtensionDesc
-		if m := extensionMaps[base]; m != nil {
-			desc = m[extNum]
-		}
-		if desc == nil {
-			log.Printf("proto: don't know how to compare extension %d of %v", extNum, base)
-			continue
-		}
-		var err error
-		if m1 == nil {
-			m1, err = decodeExtension(e1.enc, desc)
-		}
-		if m2 == nil && err == nil {
-			m2, err = decodeExtension(e2.enc, desc)
-		}
-		if err != nil {
-			// The encoded form is invalid.
-			log.Printf("proto: badly encoded extension %d of %v: %v", extNum, base, err)
-			return false
-		}
-		if !equalAny(reflect.ValueOf(m1), reflect.ValueOf(m2)) {
-			return false
-		}
-	}
-
-	return true
-}
diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/proto/equal_test.go b/Godeps/_workspace/src/github.com/golang/protobuf/proto/equal_test.go
deleted file mode 100644
index b322f65ab..000000000
--- a/Godeps/_workspace/src/github.com/golang/protobuf/proto/equal_test.go
+++ /dev/null
@@ -1,191 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2011 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// 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.
-
-package proto_test
-
-import (
-	"testing"
-
-	. "github.com/golang/protobuf/proto"
-	pb "github.com/golang/protobuf/proto/testdata"
-)
-
-// Four identical base messages.
-// The init function adds extensions to some of them.
-var messageWithoutExtension = &pb.MyMessage{Count: Int32(7)}
-var messageWithExtension1a = &pb.MyMessage{Count: Int32(7)}
-var messageWithExtension1b = &pb.MyMessage{Count: Int32(7)}
-var messageWithExtension2 = &pb.MyMessage{Count: Int32(7)}
-
-// Two messages with non-message extensions.
-var messageWithInt32Extension1 = &pb.MyMessage{Count: Int32(8)}
-var messageWithInt32Extension2 = &pb.MyMessage{Count: Int32(8)}
-
-func init() {
-	ext1 := &pb.Ext{Data: String("Kirk")}
-	ext2 := &pb.Ext{Data: String("Picard")}
-
-	// messageWithExtension1a has ext1, but never marshals it.
-	if err := SetExtension(messageWithExtension1a, pb.E_Ext_More, ext1); err != nil {
-		panic("SetExtension on 1a failed: " + err.Error())
-	}
-
-	// messageWithExtension1b is the unmarshaled form of messageWithExtension1a.
-	if err := SetExtension(messageWithExtension1b, pb.E_Ext_More, ext1); err != nil {
-		panic("SetExtension on 1b failed: " + err.Error())
-	}
-	buf, err := Marshal(messageWithExtension1b)
-	if err != nil {
-		panic("Marshal of 1b failed: " + err.Error())
-	}
-	messageWithExtension1b.Reset()
-	if err := Unmarshal(buf, messageWithExtension1b); err != nil {
-		panic("Unmarshal of 1b failed: " + err.Error())
-	}
-
-	// messageWithExtension2 has ext2.
-	if err := SetExtension(messageWithExtension2, pb.E_Ext_More, ext2); err != nil {
-		panic("SetExtension on 2 failed: " + err.Error())
-	}
-
-	if err := SetExtension(messageWithInt32Extension1, pb.E_Ext_Number, Int32(23)); err != nil {
-		panic("SetExtension on Int32-1 failed: " + err.Error())
-	}
-	if err := SetExtension(messageWithInt32Extension1, pb.E_Ext_Number, Int32(24)); err != nil {
-		panic("SetExtension on Int32-2 failed: " + err.Error())
-	}
-}
-
-var EqualTests = []struct {
-	desc string
-	a, b Message
-	exp  bool
-}{
-	{"different types", &pb.GoEnum{}, &pb.GoTestField{}, false},
-	{"equal empty", &pb.GoEnum{}, &pb.GoEnum{}, true},
-	{"nil vs nil", nil, nil, true},
-	{"typed nil vs typed nil", (*pb.GoEnum)(nil), (*pb.GoEnum)(nil), true},
-	{"typed nil vs empty", (*pb.GoEnum)(nil), &pb.GoEnum{}, false},
-	{"different typed nil", (*pb.GoEnum)(nil), (*pb.GoTestField)(nil), false},
-
-	{"one set field, one unset field", &pb.GoTestField{Label: String("foo")}, &pb.GoTestField{}, false},
-	{"one set field zero, one unset field", &pb.GoTest{Param: Int32(0)}, &pb.GoTest{}, false},
-	{"different set fields", &pb.GoTestField{Label: String("foo")}, &pb.GoTestField{Label: String("bar")}, false},
-	{"equal set", &pb.GoTestField{Label: String("foo")}, &pb.GoTestField{Label: String("foo")}, true},
-
-	{"repeated, one set", &pb.GoTest{F_Int32Repeated: []int32{2, 3}}, &pb.GoTest{}, false},
-	{"repeated, different length", &pb.GoTest{F_Int32Repeated: []int32{2, 3}}, &pb.GoTest{F_Int32Repeated: []int32{2}}, false},
-	{"repeated, different value", &pb.GoTest{F_Int32Repeated: []int32{2}}, &pb.GoTest{F_Int32Repeated: []int32{3}}, false},
-	{"repeated, equal", &pb.GoTest{F_Int32Repeated: []int32{2, 4}}, &pb.GoTest{F_Int32Repeated: []int32{2, 4}}, true},
-	{"repeated, nil equal nil", &pb.GoTest{F_Int32Repeated: nil}, &pb.GoTest{F_Int32Repeated: nil}, true},
-	{"repeated, nil equal empty", &pb.GoTest{F_Int32Repeated: nil}, &pb.GoTest{F_Int32Repeated: []int32{}}, true},
-	{"repeated, empty equal nil", &pb.GoTest{F_Int32Repeated: []int32{}}, &pb.GoTest{F_Int32Repeated: nil}, true},
-
-	{
-		"nested, different",
-		&pb.GoTest{RequiredField: &pb.GoTestField{Label: String("foo")}},
-		&pb.GoTest{RequiredField: &pb.GoTestField{Label: String("bar")}},
-		false,
-	},
-	{
-		"nested, equal",
-		&pb.GoTest{RequiredField: &pb.GoTestField{Label: String("wow")}},
-		&pb.GoTest{RequiredField: &pb.GoTestField{Label: String("wow")}},
-		true,
-	},
-
-	{"bytes", &pb.OtherMessage{Value: []byte("foo")}, &pb.OtherMessage{Value: []byte("foo")}, true},
-	{"bytes, empty", &pb.OtherMessage{Value: []byte{}}, &pb.OtherMessage{Value: []byte{}}, true},
-	{"bytes, empty vs nil", &pb.OtherMessage{Value: []byte{}}, &pb.OtherMessage{Value: nil}, false},
-	{
-		"repeated bytes",
-		&pb.MyMessage{RepBytes: [][]byte{[]byte("sham"), []byte("wow")}},
-		&pb.MyMessage{RepBytes: [][]byte{[]byte("sham"), []byte("wow")}},
-		true,
-	},
-
-	{"extension vs. no extension", messageWithoutExtension, messageWithExtension1a, false},
-	{"extension vs. same extension", messageWithExtension1a, messageWithExtension1b, true},
-	{"extension vs. different extension", messageWithExtension1a, messageWithExtension2, false},
-
-	{"int32 extension vs. itself", messageWithInt32Extension1, messageWithInt32Extension1, true},
-	{"int32 extension vs. a different int32", messageWithInt32Extension1, messageWithInt32Extension2, false},
-
-	{
-		"message with group",
-		&pb.MyMessage{
-			Count: Int32(1),
-			Somegroup: &pb.MyMessage_SomeGroup{
-				GroupField: Int32(5),
-			},
-		},
-		&pb.MyMessage{
-			Count: Int32(1),
-			Somegroup: &pb.MyMessage_SomeGroup{
-				GroupField: Int32(5),
-			},
-		},
-		true,
-	},
-
-	{
-		"map same",
-		&pb.MessageWithMap{NameMapping: map[int32]string{1: "Ken"}},
-		&pb.MessageWithMap{NameMapping: map[int32]string{1: "Ken"}},
-		true,
-	},
-	{
-		"map different entry",
-		&pb.MessageWithMap{NameMapping: map[int32]string{1: "Ken"}},
-		&pb.MessageWithMap{NameMapping: map[int32]string{2: "Rob"}},
-		false,
-	},
-	{
-		"map different key only",
-		&pb.MessageWithMap{NameMapping: map[int32]string{1: "Ken"}},
-		&pb.MessageWithMap{NameMapping: map[int32]string{2: "Ken"}},
-		false,
-	},
-	{
-		"map different value only",
-		&pb.MessageWithMap{NameMapping: map[int32]string{1: "Ken"}},
-		&pb.MessageWithMap{NameMapping: map[int32]string{1: "Rob"}},
-		false,
-	},
-}
-
-func TestEqual(t *testing.T) {
-	for _, tc := range EqualTests {
-		if res := Equal(tc.a, tc.b); res != tc.exp {
-			t.Errorf("%v: Equal(%v, %v) = %v, want %v", tc.desc, tc.a, tc.b, res, tc.exp)
-		}
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/proto/extensions.go b/Godeps/_workspace/src/github.com/golang/protobuf/proto/extensions.go
deleted file mode 100644
index e591ccef7..000000000
--- a/Godeps/_workspace/src/github.com/golang/protobuf/proto/extensions.go
+++ /dev/null
@@ -1,400 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2010 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// 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.
-
-package proto
-
-/*
- * Types and routines for supporting protocol buffer extensions.
- */
-
-import (
-	"errors"
-	"fmt"
-	"reflect"
-	"strconv"
-	"sync"
-)
-
-// ErrMissingExtension is the error returned by GetExtension if the named extension is not in the message.
-var ErrMissingExtension = errors.New("proto: missing extension")
-
-// ExtensionRange represents a range of message extensions for a protocol buffer.
-// Used in code generated by the protocol compiler.
-type ExtensionRange struct {
-	Start, End int32 // both inclusive
-}
-
-// extendableProto is an interface implemented by any protocol buffer that may be extended.
-type extendableProto interface {
-	Message
-	ExtensionRangeArray() []ExtensionRange
-	ExtensionMap() map[int32]Extension
-}
-
-var extendableProtoType = reflect.TypeOf((*extendableProto)(nil)).Elem()
-
-// ExtensionDesc represents an extension specification.
-// Used in generated code from the protocol compiler.
-type ExtensionDesc struct {
-	ExtendedType  Message     // nil pointer to the type that is being extended
-	ExtensionType interface{} // nil pointer to the extension type
-	Field         int32       // field number
-	Name          string      // fully-qualified name of extension, for text formatting
-	Tag           string      // protobuf tag style
-}
-
-func (ed *ExtensionDesc) repeated() bool {
-	t := reflect.TypeOf(ed.ExtensionType)
-	return t.Kind() == reflect.Slice && t.Elem().Kind() != reflect.Uint8
-}
-
-// Extension represents an extension in a message.
-type Extension struct {
-	// When an extension is stored in a message using SetExtension
-	// only desc and value are set. When the message is marshaled
-	// enc will be set to the encoded form of the message.
-	//
-	// When a message is unmarshaled and contains extensions, each
-	// extension will have only enc set. When such an extension is
-	// accessed using GetExtension (or GetExtensions) desc and value
-	// will be set.
-	desc  *ExtensionDesc
-	value interface{}
-	enc   []byte
-}
-
-// SetRawExtension is for testing only.
-func SetRawExtension(base extendableProto, id int32, b []byte) {
-	base.ExtensionMap()[id] = Extension{enc: b}
-}
-
-// isExtensionField returns true iff the given field number is in an extension range.
-func isExtensionField(pb extendableProto, field int32) bool {
-	for _, er := range pb.ExtensionRangeArray() {
-		if er.Start <= field && field <= er.End {
-			return true
-		}
-	}
-	return false
-}
-
-// checkExtensionTypes checks that the given extension is valid for pb.
-func checkExtensionTypes(pb extendableProto, extension *ExtensionDesc) error {
-	// Check the extended type.
-	if a, b := reflect.TypeOf(pb), reflect.TypeOf(extension.ExtendedType); a != b {
-		return errors.New("proto: bad extended type; " + b.String() + " does not extend " + a.String())
-	}
-	// Check the range.
-	if !isExtensionField(pb, extension.Field) {
-		return errors.New("proto: bad extension number; not in declared ranges")
-	}
-	return nil
-}
-
-// extPropKey is sufficient to uniquely identify an extension.
-type extPropKey struct {
-	base  reflect.Type
-	field int32
-}
-
-var extProp = struct {
-	sync.RWMutex
-	m map[extPropKey]*Properties
-}{
-	m: make(map[extPropKey]*Properties),
-}
-
-func extensionProperties(ed *ExtensionDesc) *Properties {
-	key := extPropKey{base: reflect.TypeOf(ed.ExtendedType), field: ed.Field}
-
-	extProp.RLock()
-	if prop, ok := extProp.m[key]; ok {
-		extProp.RUnlock()
-		return prop
-	}
-	extProp.RUnlock()
-
-	extProp.Lock()
-	defer extProp.Unlock()
-	// Check again.
-	if prop, ok := extProp.m[key]; ok {
-		return prop
-	}
-
-	prop := new(Properties)
-	prop.Init(reflect.TypeOf(ed.ExtensionType), "unknown_name", ed.Tag, nil)
-	extProp.m[key] = prop
-	return prop
-}
-
-// encodeExtensionMap encodes any unmarshaled (unencoded) extensions in m.
-func encodeExtensionMap(m map[int32]Extension) error {
-	for k, e := range m {
-		if e.value == nil || e.desc == nil {
-			// Extension is only in its encoded form.
-			continue
-		}
-
-		// We don't skip extensions that have an encoded form set,
-		// because the extension value may have been mutated after
-		// the last time this function was called.
-
-		et := reflect.TypeOf(e.desc.ExtensionType)
-		props := extensionProperties(e.desc)
-
-		p := NewBuffer(nil)
-		// If e.value has type T, the encoder expects a *struct{ X T }.
-		// Pass a *T with a zero field and hope it all works out.
-		x := reflect.New(et)
-		x.Elem().Set(reflect.ValueOf(e.value))
-		if err := props.enc(p, props, toStructPointer(x)); err != nil {
-			return err
-		}
-		e.enc = p.buf
-		m[k] = e
-	}
-	return nil
-}
-
-func sizeExtensionMap(m map[int32]Extension) (n int) {
-	for _, e := range m {
-		if e.value == nil || e.desc == nil {
-			// Extension is only in its encoded form.
-			n += len(e.enc)
-			continue
-		}
-
-		// We don't skip extensions that have an encoded form set,
-		// because the extension value may have been mutated after
-		// the last time this function was called.
-
-		et := reflect.TypeOf(e.desc.ExtensionType)
-		props := extensionProperties(e.desc)
-
-		// If e.value has type T, the encoder expects a *struct{ X T }.
-		// Pass a *T with a zero field and hope it all works out.
-		x := reflect.New(et)
-		x.Elem().Set(reflect.ValueOf(e.value))
-		n += props.size(props, toStructPointer(x))
-	}
-	return
-}
-
-// HasExtension returns whether the given extension is present in pb.
-func HasExtension(pb extendableProto, extension *ExtensionDesc) bool {
-	// TODO: Check types, field numbers, etc.?
-	_, ok := pb.ExtensionMap()[extension.Field]
-	return ok
-}
-
-// ClearExtension removes the given extension from pb.
-func ClearExtension(pb extendableProto, extension *ExtensionDesc) {
-	// TODO: Check types, field numbers, etc.?
-	delete(pb.ExtensionMap(), extension.Field)
-}
-
-// GetExtension parses and returns the given extension of pb.
-// If the extension is not present and has no default value it returns ErrMissingExtension.
-func GetExtension(pb extendableProto, extension *ExtensionDesc) (interface{}, error) {
-	if err := checkExtensionTypes(pb, extension); err != nil {
-		return nil, err
-	}
-
-	emap := pb.ExtensionMap()
-	e, ok := emap[extension.Field]
-	if !ok {
-		// defaultExtensionValue returns the default value or
-		// ErrMissingExtension if there is no default.
-		return defaultExtensionValue(extension)
-	}
-
-	if e.value != nil {
-		// Already decoded. Check the descriptor, though.
-		if e.desc != extension {
-			// This shouldn't happen. If it does, it means that
-			// GetExtension was called twice with two different
-			// descriptors with the same field number.
-			return nil, errors.New("proto: descriptor conflict")
-		}
-		return e.value, nil
-	}
-
-	v, err := decodeExtension(e.enc, extension)
-	if err != nil {
-		return nil, err
-	}
-
-	// Remember the decoded version and drop the encoded version.
-	// That way it is safe to mutate what we return.
-	e.value = v
-	e.desc = extension
-	e.enc = nil
-	emap[extension.Field] = e
-	return e.value, nil
-}
-
-// defaultExtensionValue returns the default value for extension.
-// If no default for an extension is defined ErrMissingExtension is returned.
-func defaultExtensionValue(extension *ExtensionDesc) (interface{}, error) {
-	t := reflect.TypeOf(extension.ExtensionType)
-	props := extensionProperties(extension)
-
-	sf, _, err := fieldDefault(t, props)
-	if err != nil {
-		return nil, err
-	}
-
-	if sf == nil || sf.value == nil {
-		// There is no default value.
-		return nil, ErrMissingExtension
-	}
-
-	if t.Kind() != reflect.Ptr {
-		// We do not need to return a Ptr, we can directly return sf.value.
-		return sf.value, nil
-	}
-
-	// We need to return an interface{} that is a pointer to sf.value.
-	value := reflect.New(t).Elem()
-	value.Set(reflect.New(value.Type().Elem()))
-	if sf.kind == reflect.Int32 {
-		// We may have an int32 or an enum, but the underlying data is int32.
-		// Since we can't set an int32 into a non int32 reflect.value directly
-		// set it as a int32.
-		value.Elem().SetInt(int64(sf.value.(int32)))
-	} else {
-		value.Elem().Set(reflect.ValueOf(sf.value))
-	}
-	return value.Interface(), nil
-}
-
-// decodeExtension decodes an extension encoded in b.
-func decodeExtension(b []byte, extension *ExtensionDesc) (interface{}, error) {
-	o := NewBuffer(b)
-
-	t := reflect.TypeOf(extension.ExtensionType)
-	rep := extension.repeated()
-
-	props := extensionProperties(extension)
-
-	// t is a pointer to a struct, pointer to basic type or a slice.
-	// Allocate a "field" to store the pointer/slice itself; the
-	// pointer/slice will be stored here. We pass
-	// the address of this field to props.dec.
-	// This passes a zero field and a *t and lets props.dec
-	// interpret it as a *struct{ x t }.
-	value := reflect.New(t).Elem()
-
-	for {
-		// Discard wire type and field number varint. It isn't needed.
-		if _, err := o.DecodeVarint(); err != nil {
-			return nil, err
-		}
-
-		if err := props.dec(o, props, toStructPointer(value.Addr())); err != nil {
-			return nil, err
-		}
-
-		if !rep || o.index >= len(o.buf) {
-			break
-		}
-	}
-	return value.Interface(), nil
-}
-
-// GetExtensions returns a slice of the extensions present in pb that are also listed in es.
-// The returned slice has the same length as es; missing extensions will appear as nil elements.
-func GetExtensions(pb Message, es []*ExtensionDesc) (extensions []interface{}, err error) {
-	epb, ok := pb.(extendableProto)
-	if !ok {
-		err = errors.New("proto: not an extendable proto")
-		return
-	}
-	extensions = make([]interface{}, len(es))
-	for i, e := range es {
-		extensions[i], err = GetExtension(epb, e)
-		if err == ErrMissingExtension {
-			err = nil
-		}
-		if err != nil {
-			return
-		}
-	}
-	return
-}
-
-// SetExtension sets the specified extension of pb to the specified value.
-func SetExtension(pb extendableProto, extension *ExtensionDesc, value interface{}) error {
-	if err := checkExtensionTypes(pb, extension); err != nil {
-		return err
-	}
-	typ := reflect.TypeOf(extension.ExtensionType)
-	if typ != reflect.TypeOf(value) {
-		return errors.New("proto: bad extension value type")
-	}
-	// nil extension values need to be caught early, because the
-	// encoder can't distinguish an ErrNil due to a nil extension
-	// from an ErrNil due to a missing field. Extensions are
-	// always optional, so the encoder would just swallow the error
-	// and drop all the extensions from the encoded message.
-	if reflect.ValueOf(value).IsNil() {
-		return fmt.Errorf("proto: SetExtension called with nil value of type %T", value)
-	}
-
-	pb.ExtensionMap()[extension.Field] = Extension{desc: extension, value: value}
-	return nil
-}
-
-// A global registry of extensions.
-// The generated code will register the generated descriptors by calling RegisterExtension.
-
-var extensionMaps = make(map[reflect.Type]map[int32]*ExtensionDesc)
-
-// RegisterExtension is called from the generated code.
-func RegisterExtension(desc *ExtensionDesc) {
-	st := reflect.TypeOf(desc.ExtendedType).Elem()
-	m := extensionMaps[st]
-	if m == nil {
-		m = make(map[int32]*ExtensionDesc)
-		extensionMaps[st] = m
-	}
-	if _, ok := m[desc.Field]; ok {
-		panic("proto: duplicate extension registered: " + st.String() + " " + strconv.Itoa(int(desc.Field)))
-	}
-	m[desc.Field] = desc
-}
-
-// RegisteredExtensions returns a map of the registered extensions of a
-// protocol buffer struct, indexed by the extension number.
-// The argument pb should be a nil pointer to the struct type.
-func RegisteredExtensions(pb Message) map[int32]*ExtensionDesc {
-	return extensionMaps[reflect.TypeOf(pb).Elem()]
-}
diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/proto/extensions_test.go b/Godeps/_workspace/src/github.com/golang/protobuf/proto/extensions_test.go
deleted file mode 100644
index 72552767d..000000000
--- a/Godeps/_workspace/src/github.com/golang/protobuf/proto/extensions_test.go
+++ /dev/null
@@ -1,292 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2014 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// 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.
-
-package proto_test
-
-import (
-	"fmt"
-	"reflect"
-	"testing"
-
-	"github.com/golang/protobuf/proto"
-	pb "github.com/golang/protobuf/proto/testdata"
-)
-
-func TestGetExtensionsWithMissingExtensions(t *testing.T) {
-	msg := &pb.MyMessage{}
-	ext1 := &pb.Ext{}
-	if err := proto.SetExtension(msg, pb.E_Ext_More, ext1); err != nil {
-		t.Fatalf("Could not set ext1: %s", ext1)
-	}
-	exts, err := proto.GetExtensions(msg, []*proto.ExtensionDesc{
-		pb.E_Ext_More,
-		pb.E_Ext_Text,
-	})
-	if err != nil {
-		t.Fatalf("GetExtensions() failed: %s", err)
-	}
-	if exts[0] != ext1 {
-		t.Errorf("ext1 not in returned extensions: %T %v", exts[0], exts[0])
-	}
-	if exts[1] != nil {
-		t.Errorf("ext2 in returned extensions: %T %v", exts[1], exts[1])
-	}
-}
-
-func TestGetExtensionStability(t *testing.T) {
-	check := func(m *pb.MyMessage) bool {
-		ext1, err := proto.GetExtension(m, pb.E_Ext_More)
-		if err != nil {
-			t.Fatalf("GetExtension() failed: %s", err)
-		}
-		ext2, err := proto.GetExtension(m, pb.E_Ext_More)
-		if err != nil {
-			t.Fatalf("GetExtension() failed: %s", err)
-		}
-		return ext1 == ext2
-	}
-	msg := &pb.MyMessage{Count: proto.Int32(4)}
-	ext0 := &pb.Ext{}
-	if err := proto.SetExtension(msg, pb.E_Ext_More, ext0); err != nil {
-		t.Fatalf("Could not set ext1: %s", ext0)
-	}
-	if !check(msg) {
-		t.Errorf("GetExtension() not stable before marshaling")
-	}
-	bb, err := proto.Marshal(msg)
-	if err != nil {
-		t.Fatalf("Marshal() failed: %s", err)
-	}
-	msg1 := &pb.MyMessage{}
-	err = proto.Unmarshal(bb, msg1)
-	if err != nil {
-		t.Fatalf("Unmarshal() failed: %s", err)
-	}
-	if !check(msg1) {
-		t.Errorf("GetExtension() not stable after unmarshaling")
-	}
-}
-
-func TestGetExtensionDefaults(t *testing.T) {
-	var setFloat64 float64 = 1
-	var setFloat32 float32 = 2
-	var setInt32 int32 = 3
-	var setInt64 int64 = 4
-	var setUint32 uint32 = 5
-	var setUint64 uint64 = 6
-	var setBool = true
-	var setBool2 = false
-	var setString = "Goodnight string"
-	var setBytes = []byte("Goodnight bytes")
-	var setEnum = pb.DefaultsMessage_TWO
-
-	type testcase struct {
-		ext  *proto.ExtensionDesc // Extension we are testing.
-		want interface{}          // Expected value of extension, or nil (meaning that GetExtension will fail).
-		def  interface{}          // Expected value of extension after ClearExtension().
-	}
-	tests := []testcase{
-		{pb.E_NoDefaultDouble, setFloat64, nil},
-		{pb.E_NoDefaultFloat, setFloat32, nil},
-		{pb.E_NoDefaultInt32, setInt32, nil},
-		{pb.E_NoDefaultInt64, setInt64, nil},
-		{pb.E_NoDefaultUint32, setUint32, nil},
-		{pb.E_NoDefaultUint64, setUint64, nil},
-		{pb.E_NoDefaultSint32, setInt32, nil},
-		{pb.E_NoDefaultSint64, setInt64, nil},
-		{pb.E_NoDefaultFixed32, setUint32, nil},
-		{pb.E_NoDefaultFixed64, setUint64, nil},
-		{pb.E_NoDefaultSfixed32, setInt32, nil},
-		{pb.E_NoDefaultSfixed64, setInt64, nil},
-		{pb.E_NoDefaultBool, setBool, nil},
-		{pb.E_NoDefaultBool, setBool2, nil},
-		{pb.E_NoDefaultString, setString, nil},
-		{pb.E_NoDefaultBytes, setBytes, nil},
-		{pb.E_NoDefaultEnum, setEnum, nil},
-		{pb.E_DefaultDouble, setFloat64, float64(3.1415)},
-		{pb.E_DefaultFloat, setFloat32, float32(3.14)},
-		{pb.E_DefaultInt32, setInt32, int32(42)},
-		{pb.E_DefaultInt64, setInt64, int64(43)},
-		{pb.E_DefaultUint32, setUint32, uint32(44)},
-		{pb.E_DefaultUint64, setUint64, uint64(45)},
-		{pb.E_DefaultSint32, setInt32, int32(46)},
-		{pb.E_DefaultSint64, setInt64, int64(47)},
-		{pb.E_DefaultFixed32, setUint32, uint32(48)},
-		{pb.E_DefaultFixed64, setUint64, uint64(49)},
-		{pb.E_DefaultSfixed32, setInt32, int32(50)},
-		{pb.E_DefaultSfixed64, setInt64, int64(51)},
-		{pb.E_DefaultBool, setBool, true},
-		{pb.E_DefaultBool, setBool2, true},
-		{pb.E_DefaultString, setString, "Hello, string"},
-		{pb.E_DefaultBytes, setBytes, []byte("Hello, bytes")},
-		{pb.E_DefaultEnum, setEnum, pb.DefaultsMessage_ONE},
-	}
-
-	checkVal := func(test testcase, msg *pb.DefaultsMessage, valWant interface{}) error {
-		val, err := proto.GetExtension(msg, test.ext)
-		if err != nil {
-			if valWant != nil {
-				return fmt.Errorf("GetExtension(): %s", err)
-			}
-			if want := proto.ErrMissingExtension; err != want {
-				return fmt.Errorf("Unexpected error: got %v, want %v", err, want)
-			}
-			return nil
-		}
-
-		// All proto2 extension values are either a pointer to a value or a slice of values.
-		ty := reflect.TypeOf(val)
-		tyWant := reflect.TypeOf(test.ext.ExtensionType)
-		if got, want := ty, tyWant; got != want {
-			return fmt.Errorf("unexpected reflect.TypeOf(): got %v want %v", got, want)
-		}
-		tye := ty.Elem()
-		tyeWant := tyWant.Elem()
-		if got, want := tye, tyeWant; got != want {
-			return fmt.Errorf("unexpected reflect.TypeOf().Elem(): got %v want %v", got, want)
-		}
-
-		// Check the name of the type of the value.
-		// If it is an enum it will be type int32 with the name of the enum.
-		if got, want := tye.Name(), tye.Name(); got != want {
-			return fmt.Errorf("unexpected reflect.TypeOf().Elem().Name(): got %v want %v", got, want)
-		}
-
-		// Check that value is what we expect.
-		// If we have a pointer in val, get the value it points to.
-		valExp := val
-		if ty.Kind() == reflect.Ptr {
-			valExp = reflect.ValueOf(val).Elem().Interface()
-		}
-		if got, want := valExp, valWant; !reflect.DeepEqual(got, want) {
-			return fmt.Errorf("unexpected reflect.DeepEqual(): got %v want %v", got, want)
-		}
-
-		return nil
-	}
-
-	setTo := func(test testcase) interface{} {
-		setTo := reflect.ValueOf(test.want)
-		if typ := reflect.TypeOf(test.ext.ExtensionType); typ.Kind() == reflect.Ptr {
-			setTo = reflect.New(typ).Elem()
-			setTo.Set(reflect.New(setTo.Type().Elem()))
-			setTo.Elem().Set(reflect.ValueOf(test.want))
-		}
-		return setTo.Interface()
-	}
-
-	for _, test := range tests {
-		msg := &pb.DefaultsMessage{}
-		name := test.ext.Name
-
-		// Check the initial value.
-		if err := checkVal(test, msg, test.def); err != nil {
-			t.Errorf("%s: %v", name, err)
-		}
-
-		// Set the per-type value and check value.
-		name = fmt.Sprintf("%s (set to %T %v)", name, test.want, test.want)
-		if err := proto.SetExtension(msg, test.ext, setTo(test)); err != nil {
-			t.Errorf("%s: SetExtension(): %v", name, err)
-			continue
-		}
-		if err := checkVal(test, msg, test.want); err != nil {
-			t.Errorf("%s: %v", name, err)
-			continue
-		}
-
-		// Set and check the value.
-		name += " (cleared)"
-		proto.ClearExtension(msg, test.ext)
-		if err := checkVal(test, msg, test.def); err != nil {
-			t.Errorf("%s: %v", name, err)
-		}
-	}
-}
-
-func TestExtensionsRoundTrip(t *testing.T) {
-	msg := &pb.MyMessage{}
-	ext1 := &pb.Ext{
-		Data: proto.String("hi"),
-	}
-	ext2 := &pb.Ext{
-		Data: proto.String("there"),
-	}
-	exists := proto.HasExtension(msg, pb.E_Ext_More)
-	if exists {
-		t.Error("Extension More present unexpectedly")
-	}
-	if err := proto.SetExtension(msg, pb.E_Ext_More, ext1); err != nil {
-		t.Error(err)
-	}
-	if err := proto.SetExtension(msg, pb.E_Ext_More, ext2); err != nil {
-		t.Error(err)
-	}
-	e, err := proto.GetExtension(msg, pb.E_Ext_More)
-	if err != nil {
-		t.Error(err)
-	}
-	x, ok := e.(*pb.Ext)
-	if !ok {
-		t.Errorf("e has type %T, expected testdata.Ext", e)
-	} else if *x.Data != "there" {
-		t.Errorf("SetExtension failed to overwrite, got %+v, not 'there'", x)
-	}
-	proto.ClearExtension(msg, pb.E_Ext_More)
-	if _, err = proto.GetExtension(msg, pb.E_Ext_More); err != proto.ErrMissingExtension {
-		t.Errorf("got %v, expected ErrMissingExtension", e)
-	}
-	if _, err := proto.GetExtension(msg, pb.E_X215); err == nil {
-		t.Error("expected bad extension error, got nil")
-	}
-	if err := proto.SetExtension(msg, pb.E_X215, 12); err == nil {
-		t.Error("expected extension err")
-	}
-	if err := proto.SetExtension(msg, pb.E_Ext_More, 12); err == nil {
-		t.Error("expected some sort of type mismatch error, got nil")
-	}
-}
-
-func TestNilExtension(t *testing.T) {
-	msg := &pb.MyMessage{
-		Count: proto.Int32(1),
-	}
-	if err := proto.SetExtension(msg, pb.E_Ext_Text, proto.String("hello")); err != nil {
-		t.Fatal(err)
-	}
-	if err := proto.SetExtension(msg, pb.E_Ext_More, (*pb.Ext)(nil)); err == nil {
-		t.Error("expected SetExtension to fail due to a nil extension")
-	} else if want := "proto: SetExtension called with nil value of type *testdata.Ext"; err.Error() != want {
-		t.Errorf("expected error %v, got %v", want, err)
-	}
-	// Note: if the behavior of Marshal is ever changed to ignore nil extensions, update
-	// this test to verify that E_Ext_Text is properly propagated through marshal->unmarshal.
-}
diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/proto/lib.go b/Godeps/_workspace/src/github.com/golang/protobuf/proto/lib.go
deleted file mode 100644
index 95f7975dd..000000000
--- a/Godeps/_workspace/src/github.com/golang/protobuf/proto/lib.go
+++ /dev/null
@@ -1,841 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2010 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// 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.
-
-/*
-Package proto converts data structures to and from the wire format of
-protocol buffers.  It works in concert with the Go source code generated
-for .proto files by the protocol compiler.
-
-A summary of the properties of the protocol buffer interface
-for a protocol buffer variable v:
-
-  - Names are turned from camel_case to CamelCase for export.
-  - There are no methods on v to set fields; just treat
-	them as structure fields.
-  - There are getters that return a field's value if set,
-	and return the field's default value if unset.
-	The getters work even if the receiver is a nil message.
-  - The zero value for a struct is its correct initialization state.
-	All desired fields must be set before marshaling.
-  - A Reset() method will restore a protobuf struct to its zero state.
-  - Non-repeated fields are pointers to the values; nil means unset.
-	That is, optional or required field int32 f becomes F *int32.
-  - Repeated fields are slices.
-  - Helper functions are available to aid the setting of fields.
-	msg.Foo = proto.String("hello") // set field
-  - Constants are defined to hold the default values of all fields that
-	have them.  They have the form Default_StructName_FieldName.
-	Because the getter methods handle defaulted values,
-	direct use of these constants should be rare.
-  - Enums are given type names and maps from names to values.
-	Enum values are prefixed by the enclosing message's name, or by the
-	enum's type name if it is a top-level enum. Enum types have a String
-	method, and a Enum method to assist in message construction.
-  - Nested messages, groups and enums have type names prefixed with the name of
-	the surrounding message type.
-  - Extensions are given descriptor names that start with E_,
-	followed by an underscore-delimited list of the nested messages
-	that contain it (if any) followed by the CamelCased name of the
-	extension field itself.  HasExtension, ClearExtension, GetExtension
-	and SetExtension are functions for manipulating extensions.
-  - Marshal and Unmarshal are functions to encode and decode the wire format.
-
-The simplest way to describe this is to see an example.
-Given file test.proto, containing
-
-	package example;
-
-	enum FOO { X = 17; }
-
-	message Test {
-	  required string label = 1;
-	  optional int32 type = 2 [default=77];
-	  repeated int64 reps = 3;
-	  optional group OptionalGroup = 4 {
-	    required string RequiredField = 5;
-	  }
-	}
-
-The resulting file, test.pb.go, is:
-
-	package example
-
-	import proto "github.com/golang/protobuf/proto"
-	import math "math"
-
-	type FOO int32
-	const (
-		FOO_X FOO = 17
-	)
-	var FOO_name = map[int32]string{
-		17: "X",
-	}
-	var FOO_value = map[string]int32{
-		"X": 17,
-	}
-
-	func (x FOO) Enum() *FOO {
-		p := new(FOO)
-		*p = x
-		return p
-	}
-	func (x FOO) String() string {
-		return proto.EnumName(FOO_name, int32(x))
-	}
-	func (x *FOO) UnmarshalJSON(data []byte) error {
-		value, err := proto.UnmarshalJSONEnum(FOO_value, data)
-		if err != nil {
-			return err
-		}
-		*x = FOO(value)
-		return nil
-	}
-
-	type Test struct {
-		Label            *string             `protobuf:"bytes,1,req,name=label" json:"label,omitempty"`
-		Type             *int32              `protobuf:"varint,2,opt,name=type,def=77" json:"type,omitempty"`
-		Reps             []int64             `protobuf:"varint,3,rep,name=reps" json:"reps,omitempty"`
-		Optionalgroup    *Test_OptionalGroup `protobuf:"group,4,opt,name=OptionalGroup" json:"optionalgroup,omitempty"`
-		XXX_unrecognized []byte              `json:"-"`
-	}
-	func (m *Test) Reset()         { *m = Test{} }
-	func (m *Test) String() string { return proto.CompactTextString(m) }
-	func (*Test) ProtoMessage()    {}
-	const Default_Test_Type int32 = 77
-
-	func (m *Test) GetLabel() string {
-		if m != nil && m.Label != nil {
-			return *m.Label
-		}
-		return ""
-	}
-
-	func (m *Test) GetType() int32 {
-		if m != nil && m.Type != nil {
-			return *m.Type
-		}
-		return Default_Test_Type
-	}
-
-	func (m *Test) GetOptionalgroup() *Test_OptionalGroup {
-		if m != nil {
-			return m.Optionalgroup
-		}
-		return nil
-	}
-
-	type Test_OptionalGroup struct {
-		RequiredField *string `protobuf:"bytes,5,req" json:"RequiredField,omitempty"`
-	}
-	func (m *Test_OptionalGroup) Reset()         { *m = Test_OptionalGroup{} }
-	func (m *Test_OptionalGroup) String() string { return proto.CompactTextString(m) }
-
-	func (m *Test_OptionalGroup) GetRequiredField() string {
-		if m != nil && m.RequiredField != nil {
-			return *m.RequiredField
-		}
-		return ""
-	}
-
-	func init() {
-		proto.RegisterEnum("example.FOO", FOO_name, FOO_value)
-	}
-
-To create and play with a Test object:
-
-package main
-
-	import (
-		"log"
-
-		"github.com/golang/protobuf/proto"
-		pb "./example.pb"
-	)
-
-	func main() {
-		test := &pb.Test{
-			Label: proto.String("hello"),
-			Type:  proto.Int32(17),
-			Optionalgroup: &pb.Test_OptionalGroup{
-				RequiredField: proto.String("good bye"),
-			},
-		}
-		data, err := proto.Marshal(test)
-		if err != nil {
-			log.Fatal("marshaling error: ", err)
-		}
-		newTest := &pb.Test{}
-		err = proto.Unmarshal(data, newTest)
-		if err != nil {
-			log.Fatal("unmarshaling error: ", err)
-		}
-		// Now test and newTest contain the same data.
-		if test.GetLabel() != newTest.GetLabel() {
-			log.Fatalf("data mismatch %q != %q", test.GetLabel(), newTest.GetLabel())
-		}
-		// etc.
-	}
-*/
-package proto
-
-import (
-	"encoding/json"
-	"fmt"
-	"log"
-	"reflect"
-	"sort"
-	"strconv"
-	"sync"
-)
-
-// Message is implemented by generated protocol buffer messages.
-type Message interface {
-	Reset()
-	String() string
-	ProtoMessage()
-}
-
-// Stats records allocation details about the protocol buffer encoders
-// and decoders.  Useful for tuning the library itself.
-type Stats struct {
-	Emalloc uint64 // mallocs in encode
-	Dmalloc uint64 // mallocs in decode
-	Encode  uint64 // number of encodes
-	Decode  uint64 // number of decodes
-	Chit    uint64 // number of cache hits
-	Cmiss   uint64 // number of cache misses
-	Size    uint64 // number of sizes
-}
-
-// Set to true to enable stats collection.
-const collectStats = false
-
-var stats Stats
-
-// GetStats returns a copy of the global Stats structure.
-func GetStats() Stats { return stats }
-
-// A Buffer is a buffer manager for marshaling and unmarshaling
-// protocol buffers.  It may be reused between invocations to
-// reduce memory usage.  It is not necessary to use a Buffer;
-// the global functions Marshal and Unmarshal create a
-// temporary Buffer and are fine for most applications.
-type Buffer struct {
-	buf   []byte // encode/decode byte stream
-	index int    // write point
-
-	// pools of basic types to amortize allocation.
-	bools   []bool
-	uint32s []uint32
-	uint64s []uint64
-
-	// extra pools, only used with pointer_reflect.go
-	int32s   []int32
-	int64s   []int64
-	float32s []float32
-	float64s []float64
-}
-
-// NewBuffer allocates a new Buffer and initializes its internal data to
-// the contents of the argument slice.
-func NewBuffer(e []byte) *Buffer {
-	return &Buffer{buf: e}
-}
-
-// Reset resets the Buffer, ready for marshaling a new protocol buffer.
-func (p *Buffer) Reset() {
-	p.buf = p.buf[0:0] // for reading/writing
-	p.index = 0        // for reading
-}
-
-// SetBuf replaces the internal buffer with the slice,
-// ready for unmarshaling the contents of the slice.
-func (p *Buffer) SetBuf(s []byte) {
-	p.buf = s
-	p.index = 0
-}
-
-// Bytes returns the contents of the Buffer.
-func (p *Buffer) Bytes() []byte { return p.buf }
-
-/*
- * Helper routines for simplifying the creation of optional fields of basic type.
- */
-
-// Bool is a helper routine that allocates a new bool value
-// to store v and returns a pointer to it.
-func Bool(v bool) *bool {
-	return &v
-}
-
-// Int32 is a helper routine that allocates a new int32 value
-// to store v and returns a pointer to it.
-func Int32(v int32) *int32 {
-	return &v
-}
-
-// Int is a helper routine that allocates a new int32 value
-// to store v and returns a pointer to it, but unlike Int32
-// its argument value is an int.
-func Int(v int) *int32 {
-	p := new(int32)
-	*p = int32(v)
-	return p
-}
-
-// Int64 is a helper routine that allocates a new int64 value
-// to store v and returns a pointer to it.
-func Int64(v int64) *int64 {
-	return &v
-}
-
-// Float32 is a helper routine that allocates a new float32 value
-// to store v and returns a pointer to it.
-func Float32(v float32) *float32 {
-	return &v
-}
-
-// Float64 is a helper routine that allocates a new float64 value
-// to store v and returns a pointer to it.
-func Float64(v float64) *float64 {
-	return &v
-}
-
-// Uint32 is a helper routine that allocates a new uint32 value
-// to store v and returns a pointer to it.
-func Uint32(v uint32) *uint32 {
-	return &v
-}
-
-// Uint64 is a helper routine that allocates a new uint64 value
-// to store v and returns a pointer to it.
-func Uint64(v uint64) *uint64 {
-	return &v
-}
-
-// String is a helper routine that allocates a new string value
-// to store v and returns a pointer to it.
-func String(v string) *string {
-	return &v
-}
-
-// EnumName is a helper function to simplify printing protocol buffer enums
-// by name.  Given an enum map and a value, it returns a useful string.
-func EnumName(m map[int32]string, v int32) string {
-	s, ok := m[v]
-	if ok {
-		return s
-	}
-	return strconv.Itoa(int(v))
-}
-
-// UnmarshalJSONEnum is a helper function to simplify recovering enum int values
-// from their JSON-encoded representation. Given a map from the enum's symbolic
-// names to its int values, and a byte buffer containing the JSON-encoded
-// value, it returns an int32 that can be cast to the enum type by the caller.
-//
-// The function can deal with both JSON representations, numeric and symbolic.
-func UnmarshalJSONEnum(m map[string]int32, data []byte, enumName string) (int32, error) {
-	if data[0] == '"' {
-		// New style: enums are strings.
-		var repr string
-		if err := json.Unmarshal(data, &repr); err != nil {
-			return -1, err
-		}
-		val, ok := m[repr]
-		if !ok {
-			return 0, fmt.Errorf("unrecognized enum %s value %q", enumName, repr)
-		}
-		return val, nil
-	}
-	// Old style: enums are ints.
-	var val int32
-	if err := json.Unmarshal(data, &val); err != nil {
-		return 0, fmt.Errorf("cannot unmarshal %#q into enum %s", data, enumName)
-	}
-	return val, nil
-}
-
-// DebugPrint dumps the encoded data in b in a debugging format with a header
-// including the string s. Used in testing but made available for general debugging.
-func (p *Buffer) DebugPrint(s string, b []byte) {
-	var u uint64
-
-	obuf := p.buf
-	index := p.index
-	p.buf = b
-	p.index = 0
-	depth := 0
-
-	fmt.Printf("\n--- %s ---\n", s)
-
-out:
-	for {
-		for i := 0; i < depth; i++ {
-			fmt.Print("  ")
-		}
-
-		index := p.index
-		if index == len(p.buf) {
-			break
-		}
-
-		op, err := p.DecodeVarint()
-		if err != nil {
-			fmt.Printf("%3d: fetching op err %v\n", index, err)
-			break out
-		}
-		tag := op >> 3
-		wire := op & 7
-
-		switch wire {
-		default:
-			fmt.Printf("%3d: t=%3d unknown wire=%d\n",
-				index, tag, wire)
-			break out
-
-		case WireBytes:
-			var r []byte
-
-			r, err = p.DecodeRawBytes(false)
-			if err != nil {
-				break out
-			}
-			fmt.Printf("%3d: t=%3d bytes [%d]", index, tag, len(r))
-			if len(r) <= 6 {
-				for i := 0; i < len(r); i++ {
-					fmt.Printf(" %.2x", r[i])
-				}
-			} else {
-				for i := 0; i < 3; i++ {
-					fmt.Printf(" %.2x", r[i])
-				}
-				fmt.Printf(" ..")
-				for i := len(r) - 3; i < len(r); i++ {
-					fmt.Printf(" %.2x", r[i])
-				}
-			}
-			fmt.Printf("\n")
-
-		case WireFixed32:
-			u, err = p.DecodeFixed32()
-			if err != nil {
-				fmt.Printf("%3d: t=%3d fix32 err %v\n", index, tag, err)
-				break out
-			}
-			fmt.Printf("%3d: t=%3d fix32 %d\n", index, tag, u)
-
-		case WireFixed64:
-			u, err = p.DecodeFixed64()
-			if err != nil {
-				fmt.Printf("%3d: t=%3d fix64 err %v\n", index, tag, err)
-				break out
-			}
-			fmt.Printf("%3d: t=%3d fix64 %d\n", index, tag, u)
-			break
-
-		case WireVarint:
-			u, err = p.DecodeVarint()
-			if err != nil {
-				fmt.Printf("%3d: t=%3d varint err %v\n", index, tag, err)
-				break out
-			}
-			fmt.Printf("%3d: t=%3d varint %d\n", index, tag, u)
-
-		case WireStartGroup:
-			if err != nil {
-				fmt.Printf("%3d: t=%3d start err %v\n", index, tag, err)
-				break out
-			}
-			fmt.Printf("%3d: t=%3d start\n", index, tag)
-			depth++
-
-		case WireEndGroup:
-			depth--
-			if err != nil {
-				fmt.Printf("%3d: t=%3d end err %v\n", index, tag, err)
-				break out
-			}
-			fmt.Printf("%3d: t=%3d end\n", index, tag)
-		}
-	}
-
-	if depth != 0 {
-		fmt.Printf("%3d: start-end not balanced %d\n", p.index, depth)
-	}
-	fmt.Printf("\n")
-
-	p.buf = obuf
-	p.index = index
-}
-
-// SetDefaults sets unset protocol buffer fields to their default values.
-// It only modifies fields that are both unset and have defined defaults.
-// It recursively sets default values in any non-nil sub-messages.
-func SetDefaults(pb Message) {
-	setDefaults(reflect.ValueOf(pb), true, false)
-}
-
-// v is a pointer to a struct.
-func setDefaults(v reflect.Value, recur, zeros bool) {
-	v = v.Elem()
-
-	defaultMu.RLock()
-	dm, ok := defaults[v.Type()]
-	defaultMu.RUnlock()
-	if !ok {
-		dm = buildDefaultMessage(v.Type())
-		defaultMu.Lock()
-		defaults[v.Type()] = dm
-		defaultMu.Unlock()
-	}
-
-	for _, sf := range dm.scalars {
-		f := v.Field(sf.index)
-		if !f.IsNil() {
-			// field already set
-			continue
-		}
-		dv := sf.value
-		if dv == nil && !zeros {
-			// no explicit default, and don't want to set zeros
-			continue
-		}
-		fptr := f.Addr().Interface() // **T
-		// TODO: Consider batching the allocations we do here.
-		switch sf.kind {
-		case reflect.Bool:
-			b := new(bool)
-			if dv != nil {
-				*b = dv.(bool)
-			}
-			*(fptr.(**bool)) = b
-		case reflect.Float32:
-			f := new(float32)
-			if dv != nil {
-				*f = dv.(float32)
-			}
-			*(fptr.(**float32)) = f
-		case reflect.Float64:
-			f := new(float64)
-			if dv != nil {
-				*f = dv.(float64)
-			}
-			*(fptr.(**float64)) = f
-		case reflect.Int32:
-			// might be an enum
-			if ft := f.Type(); ft != int32PtrType {
-				// enum
-				f.Set(reflect.New(ft.Elem()))
-				if dv != nil {
-					f.Elem().SetInt(int64(dv.(int32)))
-				}
-			} else {
-				// int32 field
-				i := new(int32)
-				if dv != nil {
-					*i = dv.(int32)
-				}
-				*(fptr.(**int32)) = i
-			}
-		case reflect.Int64:
-			i := new(int64)
-			if dv != nil {
-				*i = dv.(int64)
-			}
-			*(fptr.(**int64)) = i
-		case reflect.String:
-			s := new(string)
-			if dv != nil {
-				*s = dv.(string)
-			}
-			*(fptr.(**string)) = s
-		case reflect.Uint8:
-			// exceptional case: []byte
-			var b []byte
-			if dv != nil {
-				db := dv.([]byte)
-				b = make([]byte, len(db))
-				copy(b, db)
-			} else {
-				b = []byte{}
-			}
-			*(fptr.(*[]byte)) = b
-		case reflect.Uint32:
-			u := new(uint32)
-			if dv != nil {
-				*u = dv.(uint32)
-			}
-			*(fptr.(**uint32)) = u
-		case reflect.Uint64:
-			u := new(uint64)
-			if dv != nil {
-				*u = dv.(uint64)
-			}
-			*(fptr.(**uint64)) = u
-		default:
-			log.Printf("proto: can't set default for field %v (sf.kind=%v)", f, sf.kind)
-		}
-	}
-
-	for _, ni := range dm.nested {
-		f := v.Field(ni)
-		// f is *T or []*T or map[T]*T
-		switch f.Kind() {
-		case reflect.Ptr:
-			if f.IsNil() {
-				continue
-			}
-			setDefaults(f, recur, zeros)
-
-		case reflect.Slice:
-			for i := 0; i < f.Len(); i++ {
-				e := f.Index(i)
-				if e.IsNil() {
-					continue
-				}
-				setDefaults(e, recur, zeros)
-			}
-
-		case reflect.Map:
-			for _, k := range f.MapKeys() {
-				e := f.MapIndex(k)
-				if e.IsNil() {
-					continue
-				}
-				setDefaults(e, recur, zeros)
-			}
-		}
-	}
-}
-
-var (
-	// defaults maps a protocol buffer struct type to a slice of the fields,
-	// with its scalar fields set to their proto-declared non-zero default values.
-	defaultMu sync.RWMutex
-	defaults  = make(map[reflect.Type]defaultMessage)
-
-	int32PtrType = reflect.TypeOf((*int32)(nil))
-)
-
-// defaultMessage represents information about the default values of a message.
-type defaultMessage struct {
-	scalars []scalarField
-	nested  []int // struct field index of nested messages
-}
-
-type scalarField struct {
-	index int          // struct field index
-	kind  reflect.Kind // element type (the T in *T or []T)
-	value interface{}  // the proto-declared default value, or nil
-}
-
-// t is a struct type.
-func buildDefaultMessage(t reflect.Type) (dm defaultMessage) {
-	sprop := GetProperties(t)
-	for _, prop := range sprop.Prop {
-		fi, ok := sprop.decoderTags.get(prop.Tag)
-		if !ok {
-			// XXX_unrecognized
-			continue
-		}
-		ft := t.Field(fi).Type
-
-		sf, nested, err := fieldDefault(ft, prop)
-		switch {
-		case err != nil:
-			log.Print(err)
-		case nested:
-			dm.nested = append(dm.nested, fi)
-		case sf != nil:
-			sf.index = fi
-			dm.scalars = append(dm.scalars, *sf)
-		}
-	}
-
-	return dm
-}
-
-// fieldDefault returns the scalarField for field type ft.
-// sf will be nil if the field can not have a default.
-// nestedMessage will be true if this is a nested message.
-// Note that sf.index is not set on return.
-func fieldDefault(ft reflect.Type, prop *Properties) (sf *scalarField, nestedMessage bool, err error) {
-	var canHaveDefault bool
-	switch ft.Kind() {
-	case reflect.Ptr:
-		if ft.Elem().Kind() == reflect.Struct {
-			nestedMessage = true
-		} else {
-			canHaveDefault = true // proto2 scalar field
-		}
-
-	case reflect.Slice:
-		switch ft.Elem().Kind() {
-		case reflect.Ptr:
-			nestedMessage = true // repeated message
-		case reflect.Uint8:
-			canHaveDefault = true // bytes field
-		}
-
-	case reflect.Map:
-		if ft.Elem().Kind() == reflect.Ptr {
-			nestedMessage = true // map with message values
-		}
-	}
-
-	if !canHaveDefault {
-		if nestedMessage {
-			return nil, true, nil
-		}
-		return nil, false, nil
-	}
-
-	// We now know that ft is a pointer or slice.
-	sf = &scalarField{kind: ft.Elem().Kind()}
-
-	// scalar fields without defaults
-	if !prop.HasDefault {
-		return sf, false, nil
-	}
-
-	// a scalar field: either *T or []byte
-	switch ft.Elem().Kind() {
-	case reflect.Bool:
-		x, err := strconv.ParseBool(prop.Default)
-		if err != nil {
-			return nil, false, fmt.Errorf("proto: bad default bool %q: %v", prop.Default, err)
-		}
-		sf.value = x
-	case reflect.Float32:
-		x, err := strconv.ParseFloat(prop.Default, 32)
-		if err != nil {
-			return nil, false, fmt.Errorf("proto: bad default float32 %q: %v", prop.Default, err)
-		}
-		sf.value = float32(x)
-	case reflect.Float64:
-		x, err := strconv.ParseFloat(prop.Default, 64)
-		if err != nil {
-			return nil, false, fmt.Errorf("proto: bad default float64 %q: %v", prop.Default, err)
-		}
-		sf.value = x
-	case reflect.Int32:
-		x, err := strconv.ParseInt(prop.Default, 10, 32)
-		if err != nil {
-			return nil, false, fmt.Errorf("proto: bad default int32 %q: %v", prop.Default, err)
-		}
-		sf.value = int32(x)
-	case reflect.Int64:
-		x, err := strconv.ParseInt(prop.Default, 10, 64)
-		if err != nil {
-			return nil, false, fmt.Errorf("proto: bad default int64 %q: %v", prop.Default, err)
-		}
-		sf.value = x
-	case reflect.String:
-		sf.value = prop.Default
-	case reflect.Uint8:
-		// []byte (not *uint8)
-		sf.value = []byte(prop.Default)
-	case reflect.Uint32:
-		x, err := strconv.ParseUint(prop.Default, 10, 32)
-		if err != nil {
-			return nil, false, fmt.Errorf("proto: bad default uint32 %q: %v", prop.Default, err)
-		}
-		sf.value = uint32(x)
-	case reflect.Uint64:
-		x, err := strconv.ParseUint(prop.Default, 10, 64)
-		if err != nil {
-			return nil, false, fmt.Errorf("proto: bad default uint64 %q: %v", prop.Default, err)
-		}
-		sf.value = x
-	default:
-		return nil, false, fmt.Errorf("proto: unhandled def kind %v", ft.Elem().Kind())
-	}
-
-	return sf, false, nil
-}
-
-// Map fields may have key types of non-float scalars, strings and enums.
-// The easiest way to sort them in some deterministic order is to use fmt.
-// If this turns out to be inefficient we can always consider other options,
-// such as doing a Schwartzian transform.
-
-func mapKeys(vs []reflect.Value) sort.Interface {
-	s := mapKeySorter{
-		vs: vs,
-		// default Less function: textual comparison
-		less: func(a, b reflect.Value) bool {
-			return fmt.Sprint(a.Interface()) < fmt.Sprint(b.Interface())
-		},
-	}
-
-	// Type specialization per https://developers.google.com/protocol-buffers/docs/proto#maps;
-	// numeric keys are sorted numerically.
-	if len(vs) == 0 {
-		return s
-	}
-	switch vs[0].Kind() {
-	case reflect.Int32, reflect.Int64:
-		s.less = func(a, b reflect.Value) bool { return a.Int() < b.Int() }
-	case reflect.Uint32, reflect.Uint64:
-		s.less = func(a, b reflect.Value) bool { return a.Uint() < b.Uint() }
-	}
-
-	return s
-}
-
-type mapKeySorter struct {
-	vs   []reflect.Value
-	less func(a, b reflect.Value) bool
-}
-
-func (s mapKeySorter) Len() int      { return len(s.vs) }
-func (s mapKeySorter) Swap(i, j int) { s.vs[i], s.vs[j] = s.vs[j], s.vs[i] }
-func (s mapKeySorter) Less(i, j int) bool {
-	return s.less(s.vs[i], s.vs[j])
-}
-
-// isProto3Zero reports whether v is a zero proto3 value.
-func isProto3Zero(v reflect.Value) bool {
-	switch v.Kind() {
-	case reflect.Bool:
-		return !v.Bool()
-	case reflect.Int32, reflect.Int64:
-		return v.Int() == 0
-	case reflect.Uint32, reflect.Uint64:
-		return v.Uint() == 0
-	case reflect.Float32, reflect.Float64:
-		return v.Float() == 0
-	case reflect.String:
-		return v.String() == ""
-	}
-	return false
-}
diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/proto/message_set.go b/Godeps/_workspace/src/github.com/golang/protobuf/proto/message_set.go
deleted file mode 100644
index 9d912bce1..000000000
--- a/Godeps/_workspace/src/github.com/golang/protobuf/proto/message_set.go
+++ /dev/null
@@ -1,287 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2010 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// 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.
-
-package proto
-
-/*
- * Support for message sets.
- */
-
-import (
-	"bytes"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"reflect"
-	"sort"
-)
-
-// ErrNoMessageTypeId occurs when a protocol buffer does not have a message type ID.
-// A message type ID is required for storing a protocol buffer in a message set.
-var ErrNoMessageTypeId = errors.New("proto does not have a message type ID")
-
-// The first two types (_MessageSet_Item and MessageSet)
-// model what the protocol compiler produces for the following protocol message:
-//   message MessageSet {
-//     repeated group Item = 1 {
-//       required int32 type_id = 2;
-//       required string message = 3;
-//     };
-//   }
-// That is the MessageSet wire format. We can't use a proto to generate these
-// because that would introduce a circular dependency between it and this package.
-//
-// When a proto1 proto has a field that looks like:
-//   optional message<MessageSet> info = 3;
-// the protocol compiler produces a field in the generated struct that looks like:
-//   Info *_proto_.MessageSet  `protobuf:"bytes,3,opt,name=info"`
-// The package is automatically inserted so there is no need for that proto file to
-// import this package.
-
-type _MessageSet_Item struct {
-	TypeId  *int32 `protobuf:"varint,2,req,name=type_id"`
-	Message []byte `protobuf:"bytes,3,req,name=message"`
-}
-
-type MessageSet struct {
-	Item             []*_MessageSet_Item `protobuf:"group,1,rep"`
-	XXX_unrecognized []byte
-	// TODO: caching?
-}
-
-// Make sure MessageSet is a Message.
-var _ Message = (*MessageSet)(nil)
-
-// messageTypeIder is an interface satisfied by a protocol buffer type
-// that may be stored in a MessageSet.
-type messageTypeIder interface {
-	MessageTypeId() int32
-}
-
-func (ms *MessageSet) find(pb Message) *_MessageSet_Item {
-	mti, ok := pb.(messageTypeIder)
-	if !ok {
-		return nil
-	}
-	id := mti.MessageTypeId()
-	for _, item := range ms.Item {
-		if *item.TypeId == id {
-			return item
-		}
-	}
-	return nil
-}
-
-func (ms *MessageSet) Has(pb Message) bool {
-	if ms.find(pb) != nil {
-		return true
-	}
-	return false
-}
-
-func (ms *MessageSet) Unmarshal(pb Message) error {
-	if item := ms.find(pb); item != nil {
-		return Unmarshal(item.Message, pb)
-	}
-	if _, ok := pb.(messageTypeIder); !ok {
-		return ErrNoMessageTypeId
-	}
-	return nil // TODO: return error instead?
-}
-
-func (ms *MessageSet) Marshal(pb Message) error {
-	msg, err := Marshal(pb)
-	if err != nil {
-		return err
-	}
-	if item := ms.find(pb); item != nil {
-		// reuse existing item
-		item.Message = msg
-		return nil
-	}
-
-	mti, ok := pb.(messageTypeIder)
-	if !ok {
-		return ErrNoMessageTypeId
-	}
-
-	mtid := mti.MessageTypeId()
-	ms.Item = append(ms.Item, &_MessageSet_Item{
-		TypeId:  &mtid,
-		Message: msg,
-	})
-	return nil
-}
-
-func (ms *MessageSet) Reset()         { *ms = MessageSet{} }
-func (ms *MessageSet) String() string { return CompactTextString(ms) }
-func (*MessageSet) ProtoMessage()     {}
-
-// Support for the message_set_wire_format message option.
-
-func skipVarint(buf []byte) []byte {
-	i := 0
-	for ; buf[i]&0x80 != 0; i++ {
-	}
-	return buf[i+1:]
-}
-
-// MarshalMessageSet encodes the extension map represented by m in the message set wire format.
-// It is called by generated Marshal methods on protocol buffer messages with the message_set_wire_format option.
-func MarshalMessageSet(m map[int32]Extension) ([]byte, error) {
-	if err := encodeExtensionMap(m); err != nil {
-		return nil, err
-	}
-
-	// Sort extension IDs to provide a deterministic encoding.
-	// See also enc_map in encode.go.
-	ids := make([]int, 0, len(m))
-	for id := range m {
-		ids = append(ids, int(id))
-	}
-	sort.Ints(ids)
-
-	ms := &MessageSet{Item: make([]*_MessageSet_Item, 0, len(m))}
-	for _, id := range ids {
-		e := m[int32(id)]
-		// Remove the wire type and field number varint, as well as the length varint.
-		msg := skipVarint(skipVarint(e.enc))
-
-		ms.Item = append(ms.Item, &_MessageSet_Item{
-			TypeId:  Int32(int32(id)),
-			Message: msg,
-		})
-	}
-	return Marshal(ms)
-}
-
-// UnmarshalMessageSet decodes the extension map encoded in buf in the message set wire format.
-// It is called by generated Unmarshal methods on protocol buffer messages with the message_set_wire_format option.
-func UnmarshalMessageSet(buf []byte, m map[int32]Extension) error {
-	ms := new(MessageSet)
-	if err := Unmarshal(buf, ms); err != nil {
-		return err
-	}
-	for _, item := range ms.Item {
-		id := *item.TypeId
-		msg := item.Message
-
-		// Restore wire type and field number varint, plus length varint.
-		// Be careful to preserve duplicate items.
-		b := EncodeVarint(uint64(id)<<3 | WireBytes)
-		if ext, ok := m[id]; ok {
-			// Existing data; rip off the tag and length varint
-			// so we join the new data correctly.
-			// We can assume that ext.enc is set because we are unmarshaling.
-			o := ext.enc[len(b):]   // skip wire type and field number
-			_, n := DecodeVarint(o) // calculate length of length varint
-			o = o[n:]               // skip length varint
-			msg = append(o, msg...) // join old data and new data
-		}
-		b = append(b, EncodeVarint(uint64(len(msg)))...)
-		b = append(b, msg...)
-
-		m[id] = Extension{enc: b}
-	}
-	return nil
-}
-
-// MarshalMessageSetJSON encodes the extension map represented by m in JSON format.
-// It is called by generated MarshalJSON methods on protocol buffer messages with the message_set_wire_format option.
-func MarshalMessageSetJSON(m map[int32]Extension) ([]byte, error) {
-	var b bytes.Buffer
-	b.WriteByte('{')
-
-	// Process the map in key order for deterministic output.
-	ids := make([]int32, 0, len(m))
-	for id := range m {
-		ids = append(ids, id)
-	}
-	sort.Sort(int32Slice(ids)) // int32Slice defined in text.go
-
-	for i, id := range ids {
-		ext := m[id]
-		if i > 0 {
-			b.WriteByte(',')
-		}
-
-		msd, ok := messageSetMap[id]
-		if !ok {
-			// Unknown type; we can't render it, so skip it.
-			continue
-		}
-		fmt.Fprintf(&b, `"[%s]":`, msd.name)
-
-		x := ext.value
-		if x == nil {
-			x = reflect.New(msd.t.Elem()).Interface()
-			if err := Unmarshal(ext.enc, x.(Message)); err != nil {
-				return nil, err
-			}
-		}
-		d, err := json.Marshal(x)
-		if err != nil {
-			return nil, err
-		}
-		b.Write(d)
-	}
-	b.WriteByte('}')
-	return b.Bytes(), nil
-}
-
-// UnmarshalMessageSetJSON decodes the extension map encoded in buf in JSON format.
-// It is called by generated UnmarshalJSON methods on protocol buffer messages with the message_set_wire_format option.
-func UnmarshalMessageSetJSON(buf []byte, m map[int32]Extension) error {
-	// Common-case fast path.
-	if len(buf) == 0 || bytes.Equal(buf, []byte("{}")) {
-		return nil
-	}
-
-	// This is fairly tricky, and it's not clear that it is needed.
-	return errors.New("TODO: UnmarshalMessageSetJSON not yet implemented")
-}
-
-// A global registry of types that can be used in a MessageSet.
-
-var messageSetMap = make(map[int32]messageSetDesc)
-
-type messageSetDesc struct {
-	t    reflect.Type // pointer to struct
-	name string
-}
-
-// RegisterMessageSetType is called from the generated code.
-func RegisterMessageSetType(m Message, fieldNum int32, name string) {
-	messageSetMap[fieldNum] = messageSetDesc{
-		t:    reflect.TypeOf(m),
-		name: name,
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/proto/message_set_test.go b/Godeps/_workspace/src/github.com/golang/protobuf/proto/message_set_test.go
deleted file mode 100644
index 7c29bccf4..000000000
--- a/Godeps/_workspace/src/github.com/golang/protobuf/proto/message_set_test.go
+++ /dev/null
@@ -1,66 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2014 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// 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.
-
-package proto
-
-import (
-	"bytes"
-	"testing"
-)
-
-func TestUnmarshalMessageSetWithDuplicate(t *testing.T) {
-	// Check that a repeated message set entry will be concatenated.
-	in := &MessageSet{
-		Item: []*_MessageSet_Item{
-			{TypeId: Int32(12345), Message: []byte("hoo")},
-			{TypeId: Int32(12345), Message: []byte("hah")},
-		},
-	}
-	b, err := Marshal(in)
-	if err != nil {
-		t.Fatalf("Marshal: %v", err)
-	}
-	t.Logf("Marshaled bytes: %q", b)
-
-	m := make(map[int32]Extension)
-	if err := UnmarshalMessageSet(b, m); err != nil {
-		t.Fatalf("UnmarshalMessageSet: %v", err)
-	}
-	ext, ok := m[12345]
-	if !ok {
-		t.Fatalf("Didn't retrieve extension 12345; map is %v", m)
-	}
-	// Skip wire type/field number and length varints.
-	got := skipVarint(skipVarint(ext.enc))
-	if want := []byte("hoohah"); !bytes.Equal(got, want) {
-		t.Errorf("Combined extension is %q, want %q", got, want)
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/proto/pointer_reflect.go b/Godeps/_workspace/src/github.com/golang/protobuf/proto/pointer_reflect.go
deleted file mode 100644
index 749919d25..000000000
--- a/Godeps/_workspace/src/github.com/golang/protobuf/proto/pointer_reflect.go
+++ /dev/null
@@ -1,479 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2012 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// 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.
-
-// +build appengine
-
-// This file contains an implementation of proto field accesses using package reflect.
-// It is slower than the code in pointer_unsafe.go but it avoids package unsafe and can
-// be used on App Engine.
-
-package proto
-
-import (
-	"math"
-	"reflect"
-)
-
-// A structPointer is a pointer to a struct.
-type structPointer struct {
-	v reflect.Value
-}
-
-// toStructPointer returns a structPointer equivalent to the given reflect value.
-// The reflect value must itself be a pointer to a struct.
-func toStructPointer(v reflect.Value) structPointer {
-	return structPointer{v}
-}
-
-// IsNil reports whether p is nil.
-func structPointer_IsNil(p structPointer) bool {
-	return p.v.IsNil()
-}
-
-// Interface returns the struct pointer as an interface value.
-func structPointer_Interface(p structPointer, _ reflect.Type) interface{} {
-	return p.v.Interface()
-}
-
-// A field identifies a field in a struct, accessible from a structPointer.
-// In this implementation, a field is identified by the sequence of field indices
-// passed to reflect's FieldByIndex.
-type field []int
-
-// toField returns a field equivalent to the given reflect field.
-func toField(f *reflect.StructField) field {
-	return f.Index
-}
-
-// invalidField is an invalid field identifier.
-var invalidField = field(nil)
-
-// IsValid reports whether the field identifier is valid.
-func (f field) IsValid() bool { return f != nil }
-
-// field returns the given field in the struct as a reflect value.
-func structPointer_field(p structPointer, f field) reflect.Value {
-	// Special case: an extension map entry with a value of type T
-	// passes a *T to the struct-handling code with a zero field,
-	// expecting that it will be treated as equivalent to *struct{ X T },
-	// which has the same memory layout. We have to handle that case
-	// specially, because reflect will panic if we call FieldByIndex on a
-	// non-struct.
-	if f == nil {
-		return p.v.Elem()
-	}
-
-	return p.v.Elem().FieldByIndex(f)
-}
-
-// ifield returns the given field in the struct as an interface value.
-func structPointer_ifield(p structPointer, f field) interface{} {
-	return structPointer_field(p, f).Addr().Interface()
-}
-
-// Bytes returns the address of a []byte field in the struct.
-func structPointer_Bytes(p structPointer, f field) *[]byte {
-	return structPointer_ifield(p, f).(*[]byte)
-}
-
-// BytesSlice returns the address of a [][]byte field in the struct.
-func structPointer_BytesSlice(p structPointer, f field) *[][]byte {
-	return structPointer_ifield(p, f).(*[][]byte)
-}
-
-// Bool returns the address of a *bool field in the struct.
-func structPointer_Bool(p structPointer, f field) **bool {
-	return structPointer_ifield(p, f).(**bool)
-}
-
-// BoolVal returns the address of a bool field in the struct.
-func structPointer_BoolVal(p structPointer, f field) *bool {
-	return structPointer_ifield(p, f).(*bool)
-}
-
-// BoolSlice returns the address of a []bool field in the struct.
-func structPointer_BoolSlice(p structPointer, f field) *[]bool {
-	return structPointer_ifield(p, f).(*[]bool)
-}
-
-// String returns the address of a *string field in the struct.
-func structPointer_String(p structPointer, f field) **string {
-	return structPointer_ifield(p, f).(**string)
-}
-
-// StringVal returns the address of a string field in the struct.
-func structPointer_StringVal(p structPointer, f field) *string {
-	return structPointer_ifield(p, f).(*string)
-}
-
-// StringSlice returns the address of a []string field in the struct.
-func structPointer_StringSlice(p structPointer, f field) *[]string {
-	return structPointer_ifield(p, f).(*[]string)
-}
-
-// ExtMap returns the address of an extension map field in the struct.
-func structPointer_ExtMap(p structPointer, f field) *map[int32]Extension {
-	return structPointer_ifield(p, f).(*map[int32]Extension)
-}
-
-// NewAt returns the reflect.Value for a pointer to a field in the struct.
-func structPointer_NewAt(p structPointer, f field, typ reflect.Type) reflect.Value {
-	return structPointer_field(p, f).Addr()
-}
-
-// SetStructPointer writes a *struct field in the struct.
-func structPointer_SetStructPointer(p structPointer, f field, q structPointer) {
-	structPointer_field(p, f).Set(q.v)
-}
-
-// GetStructPointer reads a *struct field in the struct.
-func structPointer_GetStructPointer(p structPointer, f field) structPointer {
-	return structPointer{structPointer_field(p, f)}
-}
-
-// StructPointerSlice the address of a []*struct field in the struct.
-func structPointer_StructPointerSlice(p structPointer, f field) structPointerSlice {
-	return structPointerSlice{structPointer_field(p, f)}
-}
-
-// A structPointerSlice represents the address of a slice of pointers to structs
-// (themselves messages or groups). That is, v.Type() is *[]*struct{...}.
-type structPointerSlice struct {
-	v reflect.Value
-}
-
-func (p structPointerSlice) Len() int                  { return p.v.Len() }
-func (p structPointerSlice) Index(i int) structPointer { return structPointer{p.v.Index(i)} }
-func (p structPointerSlice) Append(q structPointer) {
-	p.v.Set(reflect.Append(p.v, q.v))
-}
-
-var (
-	int32Type   = reflect.TypeOf(int32(0))
-	uint32Type  = reflect.TypeOf(uint32(0))
-	float32Type = reflect.TypeOf(float32(0))
-	int64Type   = reflect.TypeOf(int64(0))
-	uint64Type  = reflect.TypeOf(uint64(0))
-	float64Type = reflect.TypeOf(float64(0))
-)
-
-// A word32 represents a field of type *int32, *uint32, *float32, or *enum.
-// That is, v.Type() is *int32, *uint32, *float32, or *enum and v is assignable.
-type word32 struct {
-	v reflect.Value
-}
-
-// IsNil reports whether p is nil.
-func word32_IsNil(p word32) bool {
-	return p.v.IsNil()
-}
-
-// Set sets p to point at a newly allocated word with bits set to x.
-func word32_Set(p word32, o *Buffer, x uint32) {
-	t := p.v.Type().Elem()
-	switch t {
-	case int32Type:
-		if len(o.int32s) == 0 {
-			o.int32s = make([]int32, uint32PoolSize)
-		}
-		o.int32s[0] = int32(x)
-		p.v.Set(reflect.ValueOf(&o.int32s[0]))
-		o.int32s = o.int32s[1:]
-		return
-	case uint32Type:
-		if len(o.uint32s) == 0 {
-			o.uint32s = make([]uint32, uint32PoolSize)
-		}
-		o.uint32s[0] = x
-		p.v.Set(reflect.ValueOf(&o.uint32s[0]))
-		o.uint32s = o.uint32s[1:]
-		return
-	case float32Type:
-		if len(o.float32s) == 0 {
-			o.float32s = make([]float32, uint32PoolSize)
-		}
-		o.float32s[0] = math.Float32frombits(x)
-		p.v.Set(reflect.ValueOf(&o.float32s[0]))
-		o.float32s = o.float32s[1:]
-		return
-	}
-
-	// must be enum
-	p.v.Set(reflect.New(t))
-	p.v.Elem().SetInt(int64(int32(x)))
-}
-
-// Get gets the bits pointed at by p, as a uint32.
-func word32_Get(p word32) uint32 {
-	elem := p.v.Elem()
-	switch elem.Kind() {
-	case reflect.Int32:
-		return uint32(elem.Int())
-	case reflect.Uint32:
-		return uint32(elem.Uint())
-	case reflect.Float32:
-		return math.Float32bits(float32(elem.Float()))
-	}
-	panic("unreachable")
-}
-
-// Word32 returns a reference to a *int32, *uint32, *float32, or *enum field in the struct.
-func structPointer_Word32(p structPointer, f field) word32 {
-	return word32{structPointer_field(p, f)}
-}
-
-// A word32Val represents a field of type int32, uint32, float32, or enum.
-// That is, v.Type() is int32, uint32, float32, or enum and v is assignable.
-type word32Val struct {
-	v reflect.Value
-}
-
-// Set sets *p to x.
-func word32Val_Set(p word32Val, x uint32) {
-	switch p.v.Type() {
-	case int32Type:
-		p.v.SetInt(int64(x))
-		return
-	case uint32Type:
-		p.v.SetUint(uint64(x))
-		return
-	case float32Type:
-		p.v.SetFloat(float64(math.Float32frombits(x)))
-		return
-	}
-
-	// must be enum
-	p.v.SetInt(int64(int32(x)))
-}
-
-// Get gets the bits pointed at by p, as a uint32.
-func word32Val_Get(p word32Val) uint32 {
-	elem := p.v
-	switch elem.Kind() {
-	case reflect.Int32:
-		return uint32(elem.Int())
-	case reflect.Uint32:
-		return uint32(elem.Uint())
-	case reflect.Float32:
-		return math.Float32bits(float32(elem.Float()))
-	}
-	panic("unreachable")
-}
-
-// Word32Val returns a reference to a int32, uint32, float32, or enum field in the struct.
-func structPointer_Word32Val(p structPointer, f field) word32Val {
-	return word32Val{structPointer_field(p, f)}
-}
-
-// A word32Slice is a slice of 32-bit values.
-// That is, v.Type() is []int32, []uint32, []float32, or []enum.
-type word32Slice struct {
-	v reflect.Value
-}
-
-func (p word32Slice) Append(x uint32) {
-	n, m := p.v.Len(), p.v.Cap()
-	if n < m {
-		p.v.SetLen(n + 1)
-	} else {
-		t := p.v.Type().Elem()
-		p.v.Set(reflect.Append(p.v, reflect.Zero(t)))
-	}
-	elem := p.v.Index(n)
-	switch elem.Kind() {
-	case reflect.Int32:
-		elem.SetInt(int64(int32(x)))
-	case reflect.Uint32:
-		elem.SetUint(uint64(x))
-	case reflect.Float32:
-		elem.SetFloat(float64(math.Float32frombits(x)))
-	}
-}
-
-func (p word32Slice) Len() int {
-	return p.v.Len()
-}
-
-func (p word32Slice) Index(i int) uint32 {
-	elem := p.v.Index(i)
-	switch elem.Kind() {
-	case reflect.Int32:
-		return uint32(elem.Int())
-	case reflect.Uint32:
-		return uint32(elem.Uint())
-	case reflect.Float32:
-		return math.Float32bits(float32(elem.Float()))
-	}
-	panic("unreachable")
-}
-
-// Word32Slice returns a reference to a []int32, []uint32, []float32, or []enum field in the struct.
-func structPointer_Word32Slice(p structPointer, f field) word32Slice {
-	return word32Slice{structPointer_field(p, f)}
-}
-
-// word64 is like word32 but for 64-bit values.
-type word64 struct {
-	v reflect.Value
-}
-
-func word64_Set(p word64, o *Buffer, x uint64) {
-	t := p.v.Type().Elem()
-	switch t {
-	case int64Type:
-		if len(o.int64s) == 0 {
-			o.int64s = make([]int64, uint64PoolSize)
-		}
-		o.int64s[0] = int64(x)
-		p.v.Set(reflect.ValueOf(&o.int64s[0]))
-		o.int64s = o.int64s[1:]
-		return
-	case uint64Type:
-		if len(o.uint64s) == 0 {
-			o.uint64s = make([]uint64, uint64PoolSize)
-		}
-		o.uint64s[0] = x
-		p.v.Set(reflect.ValueOf(&o.uint64s[0]))
-		o.uint64s = o.uint64s[1:]
-		return
-	case float64Type:
-		if len(o.float64s) == 0 {
-			o.float64s = make([]float64, uint64PoolSize)
-		}
-		o.float64s[0] = math.Float64frombits(x)
-		p.v.Set(reflect.ValueOf(&o.float64s[0]))
-		o.float64s = o.float64s[1:]
-		return
-	}
-	panic("unreachable")
-}
-
-func word64_IsNil(p word64) bool {
-	return p.v.IsNil()
-}
-
-func word64_Get(p word64) uint64 {
-	elem := p.v.Elem()
-	switch elem.Kind() {
-	case reflect.Int64:
-		return uint64(elem.Int())
-	case reflect.Uint64:
-		return elem.Uint()
-	case reflect.Float64:
-		return math.Float64bits(elem.Float())
-	}
-	panic("unreachable")
-}
-
-func structPointer_Word64(p structPointer, f field) word64 {
-	return word64{structPointer_field(p, f)}
-}
-
-// word64Val is like word32Val but for 64-bit values.
-type word64Val struct {
-	v reflect.Value
-}
-
-func word64Val_Set(p word64Val, o *Buffer, x uint64) {
-	switch p.v.Type() {
-	case int64Type:
-		p.v.SetInt(int64(x))
-		return
-	case uint64Type:
-		p.v.SetUint(x)
-		return
-	case float64Type:
-		p.v.SetFloat(math.Float64frombits(x))
-		return
-	}
-	panic("unreachable")
-}
-
-func word64Val_Get(p word64Val) uint64 {
-	elem := p.v
-	switch elem.Kind() {
-	case reflect.Int64:
-		return uint64(elem.Int())
-	case reflect.Uint64:
-		return elem.Uint()
-	case reflect.Float64:
-		return math.Float64bits(elem.Float())
-	}
-	panic("unreachable")
-}
-
-func structPointer_Word64Val(p structPointer, f field) word64Val {
-	return word64Val{structPointer_field(p, f)}
-}
-
-type word64Slice struct {
-	v reflect.Value
-}
-
-func (p word64Slice) Append(x uint64) {
-	n, m := p.v.Len(), p.v.Cap()
-	if n < m {
-		p.v.SetLen(n + 1)
-	} else {
-		t := p.v.Type().Elem()
-		p.v.Set(reflect.Append(p.v, reflect.Zero(t)))
-	}
-	elem := p.v.Index(n)
-	switch elem.Kind() {
-	case reflect.Int64:
-		elem.SetInt(int64(int64(x)))
-	case reflect.Uint64:
-		elem.SetUint(uint64(x))
-	case reflect.Float64:
-		elem.SetFloat(float64(math.Float64frombits(x)))
-	}
-}
-
-func (p word64Slice) Len() int {
-	return p.v.Len()
-}
-
-func (p word64Slice) Index(i int) uint64 {
-	elem := p.v.Index(i)
-	switch elem.Kind() {
-	case reflect.Int64:
-		return uint64(elem.Int())
-	case reflect.Uint64:
-		return uint64(elem.Uint())
-	case reflect.Float64:
-		return math.Float64bits(float64(elem.Float()))
-	}
-	panic("unreachable")
-}
-
-func structPointer_Word64Slice(p structPointer, f field) word64Slice {
-	return word64Slice{structPointer_field(p, f)}
-}
diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/proto/pointer_unsafe.go b/Godeps/_workspace/src/github.com/golang/protobuf/proto/pointer_unsafe.go
deleted file mode 100644
index e9be0fe92..000000000
--- a/Godeps/_workspace/src/github.com/golang/protobuf/proto/pointer_unsafe.go
+++ /dev/null
@@ -1,266 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2012 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// 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.
-
-// +build !appengine
-
-// This file contains the implementation of the proto field accesses using package unsafe.
-
-package proto
-
-import (
-	"reflect"
-	"unsafe"
-)
-
-// NOTE: These type_Foo functions would more idiomatically be methods,
-// but Go does not allow methods on pointer types, and we must preserve
-// some pointer type for the garbage collector. We use these
-// funcs with clunky names as our poor approximation to methods.
-//
-// An alternative would be
-//	type structPointer struct { p unsafe.Pointer }
-// but that does not registerize as well.
-
-// A structPointer is a pointer to a struct.
-type structPointer unsafe.Pointer
-
-// toStructPointer returns a structPointer equivalent to the given reflect value.
-func toStructPointer(v reflect.Value) structPointer {
-	return structPointer(unsafe.Pointer(v.Pointer()))
-}
-
-// IsNil reports whether p is nil.
-func structPointer_IsNil(p structPointer) bool {
-	return p == nil
-}
-
-// Interface returns the struct pointer, assumed to have element type t,
-// as an interface value.
-func structPointer_Interface(p structPointer, t reflect.Type) interface{} {
-	return reflect.NewAt(t, unsafe.Pointer(p)).Interface()
-}
-
-// A field identifies a field in a struct, accessible from a structPointer.
-// In this implementation, a field is identified by its byte offset from the start of the struct.
-type field uintptr
-
-// toField returns a field equivalent to the given reflect field.
-func toField(f *reflect.StructField) field {
-	return field(f.Offset)
-}
-
-// invalidField is an invalid field identifier.
-const invalidField = ^field(0)
-
-// IsValid reports whether the field identifier is valid.
-func (f field) IsValid() bool {
-	return f != ^field(0)
-}
-
-// Bytes returns the address of a []byte field in the struct.
-func structPointer_Bytes(p structPointer, f field) *[]byte {
-	return (*[]byte)(unsafe.Pointer(uintptr(p) + uintptr(f)))
-}
-
-// BytesSlice returns the address of a [][]byte field in the struct.
-func structPointer_BytesSlice(p structPointer, f field) *[][]byte {
-	return (*[][]byte)(unsafe.Pointer(uintptr(p) + uintptr(f)))
-}
-
-// Bool returns the address of a *bool field in the struct.
-func structPointer_Bool(p structPointer, f field) **bool {
-	return (**bool)(unsafe.Pointer(uintptr(p) + uintptr(f)))
-}
-
-// BoolVal returns the address of a bool field in the struct.
-func structPointer_BoolVal(p structPointer, f field) *bool {
-	return (*bool)(unsafe.Pointer(uintptr(p) + uintptr(f)))
-}
-
-// BoolSlice returns the address of a []bool field in the struct.
-func structPointer_BoolSlice(p structPointer, f field) *[]bool {
-	return (*[]bool)(unsafe.Pointer(uintptr(p) + uintptr(f)))
-}
-
-// String returns the address of a *string field in the struct.
-func structPointer_String(p structPointer, f field) **string {
-	return (**string)(unsafe.Pointer(uintptr(p) + uintptr(f)))
-}
-
-// StringVal returns the address of a string field in the struct.
-func structPointer_StringVal(p structPointer, f field) *string {
-	return (*string)(unsafe.Pointer(uintptr(p) + uintptr(f)))
-}
-
-// StringSlice returns the address of a []string field in the struct.
-func structPointer_StringSlice(p structPointer, f field) *[]string {
-	return (*[]string)(unsafe.Pointer(uintptr(p) + uintptr(f)))
-}
-
-// ExtMap returns the address of an extension map field in the struct.
-func structPointer_ExtMap(p structPointer, f field) *map[int32]Extension {
-	return (*map[int32]Extension)(unsafe.Pointer(uintptr(p) + uintptr(f)))
-}
-
-// NewAt returns the reflect.Value for a pointer to a field in the struct.
-func structPointer_NewAt(p structPointer, f field, typ reflect.Type) reflect.Value {
-	return reflect.NewAt(typ, unsafe.Pointer(uintptr(p)+uintptr(f)))
-}
-
-// SetStructPointer writes a *struct field in the struct.
-func structPointer_SetStructPointer(p structPointer, f field, q structPointer) {
-	*(*structPointer)(unsafe.Pointer(uintptr(p) + uintptr(f))) = q
-}
-
-// GetStructPointer reads a *struct field in the struct.
-func structPointer_GetStructPointer(p structPointer, f field) structPointer {
-	return *(*structPointer)(unsafe.Pointer(uintptr(p) + uintptr(f)))
-}
-
-// StructPointerSlice the address of a []*struct field in the struct.
-func structPointer_StructPointerSlice(p structPointer, f field) *structPointerSlice {
-	return (*structPointerSlice)(unsafe.Pointer(uintptr(p) + uintptr(f)))
-}
-
-// A structPointerSlice represents a slice of pointers to structs (themselves submessages or groups).
-type structPointerSlice []structPointer
-
-func (v *structPointerSlice) Len() int                  { return len(*v) }
-func (v *structPointerSlice) Index(i int) structPointer { return (*v)[i] }
-func (v *structPointerSlice) Append(p structPointer)    { *v = append(*v, p) }
-
-// A word32 is the address of a "pointer to 32-bit value" field.
-type word32 **uint32
-
-// IsNil reports whether *v is nil.
-func word32_IsNil(p word32) bool {
-	return *p == nil
-}
-
-// Set sets *v to point at a newly allocated word set to x.
-func word32_Set(p word32, o *Buffer, x uint32) {
-	if len(o.uint32s) == 0 {
-		o.uint32s = make([]uint32, uint32PoolSize)
-	}
-	o.uint32s[0] = x
-	*p = &o.uint32s[0]
-	o.uint32s = o.uint32s[1:]
-}
-
-// Get gets the value pointed at by *v.
-func word32_Get(p word32) uint32 {
-	return **p
-}
-
-// Word32 returns the address of a *int32, *uint32, *float32, or *enum field in the struct.
-func structPointer_Word32(p structPointer, f field) word32 {
-	return word32((**uint32)(unsafe.Pointer(uintptr(p) + uintptr(f))))
-}
-
-// A word32Val is the address of a 32-bit value field.
-type word32Val *uint32
-
-// Set sets *p to x.
-func word32Val_Set(p word32Val, x uint32) {
-	*p = x
-}
-
-// Get gets the value pointed at by p.
-func word32Val_Get(p word32Val) uint32 {
-	return *p
-}
-
-// Word32Val returns the address of a *int32, *uint32, *float32, or *enum field in the struct.
-func structPointer_Word32Val(p structPointer, f field) word32Val {
-	return word32Val((*uint32)(unsafe.Pointer(uintptr(p) + uintptr(f))))
-}
-
-// A word32Slice is a slice of 32-bit values.
-type word32Slice []uint32
-
-func (v *word32Slice) Append(x uint32)    { *v = append(*v, x) }
-func (v *word32Slice) Len() int           { return len(*v) }
-func (v *word32Slice) Index(i int) uint32 { return (*v)[i] }
-
-// Word32Slice returns the address of a []int32, []uint32, []float32, or []enum field in the struct.
-func structPointer_Word32Slice(p structPointer, f field) *word32Slice {
-	return (*word32Slice)(unsafe.Pointer(uintptr(p) + uintptr(f)))
-}
-
-// word64 is like word32 but for 64-bit values.
-type word64 **uint64
-
-func word64_Set(p word64, o *Buffer, x uint64) {
-	if len(o.uint64s) == 0 {
-		o.uint64s = make([]uint64, uint64PoolSize)
-	}
-	o.uint64s[0] = x
-	*p = &o.uint64s[0]
-	o.uint64s = o.uint64s[1:]
-}
-
-func word64_IsNil(p word64) bool {
-	return *p == nil
-}
-
-func word64_Get(p word64) uint64 {
-	return **p
-}
-
-func structPointer_Word64(p structPointer, f field) word64 {
-	return word64((**uint64)(unsafe.Pointer(uintptr(p) + uintptr(f))))
-}
-
-// word64Val is like word32Val but for 64-bit values.
-type word64Val *uint64
-
-func word64Val_Set(p word64Val, o *Buffer, x uint64) {
-	*p = x
-}
-
-func word64Val_Get(p word64Val) uint64 {
-	return *p
-}
-
-func structPointer_Word64Val(p structPointer, f field) word64Val {
-	return word64Val((*uint64)(unsafe.Pointer(uintptr(p) + uintptr(f))))
-}
-
-// word64Slice is like word32Slice but for 64-bit values.
-type word64Slice []uint64
-
-func (v *word64Slice) Append(x uint64)    { *v = append(*v, x) }
-func (v *word64Slice) Len() int           { return len(*v) }
-func (v *word64Slice) Index(i int) uint64 { return (*v)[i] }
-
-func structPointer_Word64Slice(p structPointer, f field) *word64Slice {
-	return (*word64Slice)(unsafe.Pointer(uintptr(p) + uintptr(f)))
-}
diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/proto/properties.go b/Godeps/_workspace/src/github.com/golang/protobuf/proto/properties.go
deleted file mode 100644
index d74844ab2..000000000
--- a/Godeps/_workspace/src/github.com/golang/protobuf/proto/properties.go
+++ /dev/null
@@ -1,742 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2010 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// 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.
-
-package proto
-
-/*
- * Routines for encoding data into the wire format for protocol buffers.
- */
-
-import (
-	"fmt"
-	"os"
-	"reflect"
-	"sort"
-	"strconv"
-	"strings"
-	"sync"
-)
-
-const debug bool = false
-
-// Constants that identify the encoding of a value on the wire.
-const (
-	WireVarint     = 0
-	WireFixed64    = 1
-	WireBytes      = 2
-	WireStartGroup = 3
-	WireEndGroup   = 4
-	WireFixed32    = 5
-)
-
-const startSize = 10 // initial slice/string sizes
-
-// Encoders are defined in encode.go
-// An encoder outputs the full representation of a field, including its
-// tag and encoder type.
-type encoder func(p *Buffer, prop *Properties, base structPointer) error
-
-// A valueEncoder encodes a single integer in a particular encoding.
-type valueEncoder func(o *Buffer, x uint64) error
-
-// Sizers are defined in encode.go
-// A sizer returns the encoded size of a field, including its tag and encoder
-// type.
-type sizer func(prop *Properties, base structPointer) int
-
-// A valueSizer returns the encoded size of a single integer in a particular
-// encoding.
-type valueSizer func(x uint64) int
-
-// Decoders are defined in decode.go
-// A decoder creates a value from its wire representation.
-// Unrecognized subelements are saved in unrec.
-type decoder func(p *Buffer, prop *Properties, base structPointer) error
-
-// A valueDecoder decodes a single integer in a particular encoding.
-type valueDecoder func(o *Buffer) (x uint64, err error)
-
-// tagMap is an optimization over map[int]int for typical protocol buffer
-// use-cases. Encoded protocol buffers are often in tag order with small tag
-// numbers.
-type tagMap struct {
-	fastTags []int
-	slowTags map[int]int
-}
-
-// tagMapFastLimit is the upper bound on the tag number that will be stored in
-// the tagMap slice rather than its map.
-const tagMapFastLimit = 1024
-
-func (p *tagMap) get(t int) (int, bool) {
-	if t > 0 && t < tagMapFastLimit {
-		if t >= len(p.fastTags) {
-			return 0, false
-		}
-		fi := p.fastTags[t]
-		return fi, fi >= 0
-	}
-	fi, ok := p.slowTags[t]
-	return fi, ok
-}
-
-func (p *tagMap) put(t int, fi int) {
-	if t > 0 && t < tagMapFastLimit {
-		for len(p.fastTags) < t+1 {
-			p.fastTags = append(p.fastTags, -1)
-		}
-		p.fastTags[t] = fi
-		return
-	}
-	if p.slowTags == nil {
-		p.slowTags = make(map[int]int)
-	}
-	p.slowTags[t] = fi
-}
-
-// StructProperties represents properties for all the fields of a struct.
-// decoderTags and decoderOrigNames should only be used by the decoder.
-type StructProperties struct {
-	Prop             []*Properties  // properties for each field
-	reqCount         int            // required count
-	decoderTags      tagMap         // map from proto tag to struct field number
-	decoderOrigNames map[string]int // map from original name to struct field number
-	order            []int          // list of struct field numbers in tag order
-	unrecField       field          // field id of the XXX_unrecognized []byte field
-	extendable       bool           // is this an extendable proto
-}
-
-// Implement the sorting interface so we can sort the fields in tag order, as recommended by the spec.
-// See encode.go, (*Buffer).enc_struct.
-
-func (sp *StructProperties) Len() int { return len(sp.order) }
-func (sp *StructProperties) Less(i, j int) bool {
-	return sp.Prop[sp.order[i]].Tag < sp.Prop[sp.order[j]].Tag
-}
-func (sp *StructProperties) Swap(i, j int) { sp.order[i], sp.order[j] = sp.order[j], sp.order[i] }
-
-// Properties represents the protocol-specific behavior of a single struct field.
-type Properties struct {
-	Name     string // name of the field, for error messages
-	OrigName string // original name before protocol compiler (always set)
-	Wire     string
-	WireType int
-	Tag      int
-	Required bool
-	Optional bool
-	Repeated bool
-	Packed   bool   // relevant for repeated primitives only
-	Enum     string // set for enum types only
-	proto3   bool   // whether this is known to be a proto3 field; set for []byte only
-
-	Default    string // default value
-	HasDefault bool   // whether an explicit default was provided
-	def_uint64 uint64
-
-	enc           encoder
-	valEnc        valueEncoder // set for bool and numeric types only
-	field         field
-	tagcode       []byte // encoding of EncodeVarint((Tag<<3)|WireType)
-	tagbuf        [8]byte
-	stype         reflect.Type      // set for struct types only
-	sprop         *StructProperties // set for struct types only
-	isMarshaler   bool
-	isUnmarshaler bool
-
-	mtype    reflect.Type // set for map types only
-	mkeyprop *Properties  // set for map types only
-	mvalprop *Properties  // set for map types only
-
-	size    sizer
-	valSize valueSizer // set for bool and numeric types only
-
-	dec    decoder
-	valDec valueDecoder // set for bool and numeric types only
-
-	// If this is a packable field, this will be the decoder for the packed version of the field.
-	packedDec decoder
-}
-
-// String formats the properties in the protobuf struct field tag style.
-func (p *Properties) String() string {
-	s := p.Wire
-	s = ","
-	s += strconv.Itoa(p.Tag)
-	if p.Required {
-		s += ",req"
-	}
-	if p.Optional {
-		s += ",opt"
-	}
-	if p.Repeated {
-		s += ",rep"
-	}
-	if p.Packed {
-		s += ",packed"
-	}
-	if p.OrigName != p.Name {
-		s += ",name=" + p.OrigName
-	}
-	if p.proto3 {
-		s += ",proto3"
-	}
-	if len(p.Enum) > 0 {
-		s += ",enum=" + p.Enum
-	}
-	if p.HasDefault {
-		s += ",def=" + p.Default
-	}
-	return s
-}
-
-// Parse populates p by parsing a string in the protobuf struct field tag style.
-func (p *Properties) Parse(s string) {
-	// "bytes,49,opt,name=foo,def=hello!"
-	fields := strings.Split(s, ",") // breaks def=, but handled below.
-	if len(fields) < 2 {
-		fmt.Fprintf(os.Stderr, "proto: tag has too few fields: %q\n", s)
-		return
-	}
-
-	p.Wire = fields[0]
-	switch p.Wire {
-	case "varint":
-		p.WireType = WireVarint
-		p.valEnc = (*Buffer).EncodeVarint
-		p.valDec = (*Buffer).DecodeVarint
-		p.valSize = sizeVarint
-	case "fixed32":
-		p.WireType = WireFixed32
-		p.valEnc = (*Buffer).EncodeFixed32
-		p.valDec = (*Buffer).DecodeFixed32
-		p.valSize = sizeFixed32
-	case "fixed64":
-		p.WireType = WireFixed64
-		p.valEnc = (*Buffer).EncodeFixed64
-		p.valDec = (*Buffer).DecodeFixed64
-		p.valSize = sizeFixed64
-	case "zigzag32":
-		p.WireType = WireVarint
-		p.valEnc = (*Buffer).EncodeZigzag32
-		p.valDec = (*Buffer).DecodeZigzag32
-		p.valSize = sizeZigzag32
-	case "zigzag64":
-		p.WireType = WireVarint
-		p.valEnc = (*Buffer).EncodeZigzag64
-		p.valDec = (*Buffer).DecodeZigzag64
-		p.valSize = sizeZigzag64
-	case "bytes", "group":
-		p.WireType = WireBytes
-		// no numeric converter for non-numeric types
-	default:
-		fmt.Fprintf(os.Stderr, "proto: tag has unknown wire type: %q\n", s)
-		return
-	}
-
-	var err error
-	p.Tag, err = strconv.Atoi(fields[1])
-	if err != nil {
-		return
-	}
-
-	for i := 2; i < len(fields); i++ {
-		f := fields[i]
-		switch {
-		case f == "req":
-			p.Required = true
-		case f == "opt":
-			p.Optional = true
-		case f == "rep":
-			p.Repeated = true
-		case f == "packed":
-			p.Packed = true
-		case strings.HasPrefix(f, "name="):
-			p.OrigName = f[5:]
-		case strings.HasPrefix(f, "enum="):
-			p.Enum = f[5:]
-		case f == "proto3":
-			p.proto3 = true
-		case strings.HasPrefix(f, "def="):
-			p.HasDefault = true
-			p.Default = f[4:] // rest of string
-			if i+1 < len(fields) {
-				// Commas aren't escaped, and def is always last.
-				p.Default += "," + strings.Join(fields[i+1:], ",")
-				break
-			}
-		}
-	}
-}
-
-func logNoSliceEnc(t1, t2 reflect.Type) {
-	fmt.Fprintf(os.Stderr, "proto: no slice oenc for %T = []%T\n", t1, t2)
-}
-
-var protoMessageType = reflect.TypeOf((*Message)(nil)).Elem()
-
-// Initialize the fields for encoding and decoding.
-func (p *Properties) setEncAndDec(typ reflect.Type, f *reflect.StructField, lockGetProp bool) {
-	p.enc = nil
-	p.dec = nil
-	p.size = nil
-
-	switch t1 := typ; t1.Kind() {
-	default:
-		fmt.Fprintf(os.Stderr, "proto: no coders for %v\n", t1)
-
-	// proto3 scalar types
-
-	case reflect.Bool:
-		p.enc = (*Buffer).enc_proto3_bool
-		p.dec = (*Buffer).dec_proto3_bool
-		p.size = size_proto3_bool
-	case reflect.Int32:
-		p.enc = (*Buffer).enc_proto3_int32
-		p.dec = (*Buffer).dec_proto3_int32
-		p.size = size_proto3_int32
-	case reflect.Uint32:
-		p.enc = (*Buffer).enc_proto3_uint32
-		p.dec = (*Buffer).dec_proto3_int32 // can reuse
-		p.size = size_proto3_uint32
-	case reflect.Int64, reflect.Uint64:
-		p.enc = (*Buffer).enc_proto3_int64
-		p.dec = (*Buffer).dec_proto3_int64
-		p.size = size_proto3_int64
-	case reflect.Float32:
-		p.enc = (*Buffer).enc_proto3_uint32 // can just treat them as bits
-		p.dec = (*Buffer).dec_proto3_int32
-		p.size = size_proto3_uint32
-	case reflect.Float64:
-		p.enc = (*Buffer).enc_proto3_int64 // can just treat them as bits
-		p.dec = (*Buffer).dec_proto3_int64
-		p.size = size_proto3_int64
-	case reflect.String:
-		p.enc = (*Buffer).enc_proto3_string
-		p.dec = (*Buffer).dec_proto3_string
-		p.size = size_proto3_string
-
-	case reflect.Ptr:
-		switch t2 := t1.Elem(); t2.Kind() {
-		default:
-			fmt.Fprintf(os.Stderr, "proto: no encoder function for %v -> %v\n", t1, t2)
-			break
-		case reflect.Bool:
-			p.enc = (*Buffer).enc_bool
-			p.dec = (*Buffer).dec_bool
-			p.size = size_bool
-		case reflect.Int32:
-			p.enc = (*Buffer).enc_int32
-			p.dec = (*Buffer).dec_int32
-			p.size = size_int32
-		case reflect.Uint32:
-			p.enc = (*Buffer).enc_uint32
-			p.dec = (*Buffer).dec_int32 // can reuse
-			p.size = size_uint32
-		case reflect.Int64, reflect.Uint64:
-			p.enc = (*Buffer).enc_int64
-			p.dec = (*Buffer).dec_int64
-			p.size = size_int64
-		case reflect.Float32:
-			p.enc = (*Buffer).enc_uint32 // can just treat them as bits
-			p.dec = (*Buffer).dec_int32
-			p.size = size_uint32
-		case reflect.Float64:
-			p.enc = (*Buffer).enc_int64 // can just treat them as bits
-			p.dec = (*Buffer).dec_int64
-			p.size = size_int64
-		case reflect.String:
-			p.enc = (*Buffer).enc_string
-			p.dec = (*Buffer).dec_string
-			p.size = size_string
-		case reflect.Struct:
-			p.stype = t1.Elem()
-			p.isMarshaler = isMarshaler(t1)
-			p.isUnmarshaler = isUnmarshaler(t1)
-			if p.Wire == "bytes" {
-				p.enc = (*Buffer).enc_struct_message
-				p.dec = (*Buffer).dec_struct_message
-				p.size = size_struct_message
-			} else {
-				p.enc = (*Buffer).enc_struct_group
-				p.dec = (*Buffer).dec_struct_group
-				p.size = size_struct_group
-			}
-		}
-
-	case reflect.Slice:
-		switch t2 := t1.Elem(); t2.Kind() {
-		default:
-			logNoSliceEnc(t1, t2)
-			break
-		case reflect.Bool:
-			if p.Packed {
-				p.enc = (*Buffer).enc_slice_packed_bool
-				p.size = size_slice_packed_bool
-			} else {
-				p.enc = (*Buffer).enc_slice_bool
-				p.size = size_slice_bool
-			}
-			p.dec = (*Buffer).dec_slice_bool
-			p.packedDec = (*Buffer).dec_slice_packed_bool
-		case reflect.Int32:
-			if p.Packed {
-				p.enc = (*Buffer).enc_slice_packed_int32
-				p.size = size_slice_packed_int32
-			} else {
-				p.enc = (*Buffer).enc_slice_int32
-				p.size = size_slice_int32
-			}
-			p.dec = (*Buffer).dec_slice_int32
-			p.packedDec = (*Buffer).dec_slice_packed_int32
-		case reflect.Uint32:
-			if p.Packed {
-				p.enc = (*Buffer).enc_slice_packed_uint32
-				p.size = size_slice_packed_uint32
-			} else {
-				p.enc = (*Buffer).enc_slice_uint32
-				p.size = size_slice_uint32
-			}
-			p.dec = (*Buffer).dec_slice_int32
-			p.packedDec = (*Buffer).dec_slice_packed_int32
-		case reflect.Int64, reflect.Uint64:
-			if p.Packed {
-				p.enc = (*Buffer).enc_slice_packed_int64
-				p.size = size_slice_packed_int64
-			} else {
-				p.enc = (*Buffer).enc_slice_int64
-				p.size = size_slice_int64
-			}
-			p.dec = (*Buffer).dec_slice_int64
-			p.packedDec = (*Buffer).dec_slice_packed_int64
-		case reflect.Uint8:
-			p.enc = (*Buffer).enc_slice_byte
-			p.dec = (*Buffer).dec_slice_byte
-			p.size = size_slice_byte
-			// This is a []byte, which is either a bytes field,
-			// or the value of a map field. In the latter case,
-			// we always encode an empty []byte, so we should not
-			// use the proto3 enc/size funcs.
-			// f == nil iff this is the key/value of a map field.
-			if p.proto3 && f != nil {
-				p.enc = (*Buffer).enc_proto3_slice_byte
-				p.size = size_proto3_slice_byte
-			}
-		case reflect.Float32, reflect.Float64:
-			switch t2.Bits() {
-			case 32:
-				// can just treat them as bits
-				if p.Packed {
-					p.enc = (*Buffer).enc_slice_packed_uint32
-					p.size = size_slice_packed_uint32
-				} else {
-					p.enc = (*Buffer).enc_slice_uint32
-					p.size = size_slice_uint32
-				}
-				p.dec = (*Buffer).dec_slice_int32
-				p.packedDec = (*Buffer).dec_slice_packed_int32
-			case 64:
-				// can just treat them as bits
-				if p.Packed {
-					p.enc = (*Buffer).enc_slice_packed_int64
-					p.size = size_slice_packed_int64
-				} else {
-					p.enc = (*Buffer).enc_slice_int64
-					p.size = size_slice_int64
-				}
-				p.dec = (*Buffer).dec_slice_int64
-				p.packedDec = (*Buffer).dec_slice_packed_int64
-			default:
-				logNoSliceEnc(t1, t2)
-				break
-			}
-		case reflect.String:
-			p.enc = (*Buffer).enc_slice_string
-			p.dec = (*Buffer).dec_slice_string
-			p.size = size_slice_string
-		case reflect.Ptr:
-			switch t3 := t2.Elem(); t3.Kind() {
-			default:
-				fmt.Fprintf(os.Stderr, "proto: no ptr oenc for %T -> %T -> %T\n", t1, t2, t3)
-				break
-			case reflect.Struct:
-				p.stype = t2.Elem()
-				p.isMarshaler = isMarshaler(t2)
-				p.isUnmarshaler = isUnmarshaler(t2)
-				if p.Wire == "bytes" {
-					p.enc = (*Buffer).enc_slice_struct_message
-					p.dec = (*Buffer).dec_slice_struct_message
-					p.size = size_slice_struct_message
-				} else {
-					p.enc = (*Buffer).enc_slice_struct_group
-					p.dec = (*Buffer).dec_slice_struct_group
-					p.size = size_slice_struct_group
-				}
-			}
-		case reflect.Slice:
-			switch t2.Elem().Kind() {
-			default:
-				fmt.Fprintf(os.Stderr, "proto: no slice elem oenc for %T -> %T -> %T\n", t1, t2, t2.Elem())
-				break
-			case reflect.Uint8:
-				p.enc = (*Buffer).enc_slice_slice_byte
-				p.dec = (*Buffer).dec_slice_slice_byte
-				p.size = size_slice_slice_byte
-			}
-		}
-
-	case reflect.Map:
-		p.enc = (*Buffer).enc_new_map
-		p.dec = (*Buffer).dec_new_map
-		p.size = size_new_map
-
-		p.mtype = t1
-		p.mkeyprop = &Properties{}
-		p.mkeyprop.init(reflect.PtrTo(p.mtype.Key()), "Key", f.Tag.Get("protobuf_key"), nil, lockGetProp)
-		p.mvalprop = &Properties{}
-		vtype := p.mtype.Elem()
-		if vtype.Kind() != reflect.Ptr && vtype.Kind() != reflect.Slice {
-			// The value type is not a message (*T) or bytes ([]byte),
-			// so we need encoders for the pointer to this type.
-			vtype = reflect.PtrTo(vtype)
-		}
-		p.mvalprop.init(vtype, "Value", f.Tag.Get("protobuf_val"), nil, lockGetProp)
-	}
-
-	// precalculate tag code
-	wire := p.WireType
-	if p.Packed {
-		wire = WireBytes
-	}
-	x := uint32(p.Tag)<<3 | uint32(wire)
-	i := 0
-	for i = 0; x > 127; i++ {
-		p.tagbuf[i] = 0x80 | uint8(x&0x7F)
-		x >>= 7
-	}
-	p.tagbuf[i] = uint8(x)
-	p.tagcode = p.tagbuf[0 : i+1]
-
-	if p.stype != nil {
-		if lockGetProp {
-			p.sprop = GetProperties(p.stype)
-		} else {
-			p.sprop = getPropertiesLocked(p.stype)
-		}
-	}
-}
-
-var (
-	marshalerType   = reflect.TypeOf((*Marshaler)(nil)).Elem()
-	unmarshalerType = reflect.TypeOf((*Unmarshaler)(nil)).Elem()
-)
-
-// isMarshaler reports whether type t implements Marshaler.
-func isMarshaler(t reflect.Type) bool {
-	// We're checking for (likely) pointer-receiver methods
-	// so if t is not a pointer, something is very wrong.
-	// The calls above only invoke isMarshaler on pointer types.
-	if t.Kind() != reflect.Ptr {
-		panic("proto: misuse of isMarshaler")
-	}
-	return t.Implements(marshalerType)
-}
-
-// isUnmarshaler reports whether type t implements Unmarshaler.
-func isUnmarshaler(t reflect.Type) bool {
-	// We're checking for (likely) pointer-receiver methods
-	// so if t is not a pointer, something is very wrong.
-	// The calls above only invoke isUnmarshaler on pointer types.
-	if t.Kind() != reflect.Ptr {
-		panic("proto: misuse of isUnmarshaler")
-	}
-	return t.Implements(unmarshalerType)
-}
-
-// Init populates the properties from a protocol buffer struct tag.
-func (p *Properties) Init(typ reflect.Type, name, tag string, f *reflect.StructField) {
-	p.init(typ, name, tag, f, true)
-}
-
-func (p *Properties) init(typ reflect.Type, name, tag string, f *reflect.StructField, lockGetProp bool) {
-	// "bytes,49,opt,def=hello!"
-	p.Name = name
-	p.OrigName = name
-	if f != nil {
-		p.field = toField(f)
-	}
-	if tag == "" {
-		return
-	}
-	p.Parse(tag)
-	p.setEncAndDec(typ, f, lockGetProp)
-}
-
-var (
-	propertiesMu  sync.RWMutex
-	propertiesMap = make(map[reflect.Type]*StructProperties)
-)
-
-// GetProperties returns the list of properties for the type represented by t.
-// t must represent a generated struct type of a protocol message.
-func GetProperties(t reflect.Type) *StructProperties {
-	if t.Kind() != reflect.Struct {
-		panic("proto: type must have kind struct")
-	}
-
-	// Most calls to GetProperties in a long-running program will be
-	// retrieving details for types we have seen before.
-	propertiesMu.RLock()
-	sprop, ok := propertiesMap[t]
-	propertiesMu.RUnlock()
-	if ok {
-		if collectStats {
-			stats.Chit++
-		}
-		return sprop
-	}
-
-	propertiesMu.Lock()
-	sprop = getPropertiesLocked(t)
-	propertiesMu.Unlock()
-	return sprop
-}
-
-// getPropertiesLocked requires that propertiesMu is held.
-func getPropertiesLocked(t reflect.Type) *StructProperties {
-	if prop, ok := propertiesMap[t]; ok {
-		if collectStats {
-			stats.Chit++
-		}
-		return prop
-	}
-	if collectStats {
-		stats.Cmiss++
-	}
-
-	prop := new(StructProperties)
-	// in case of recursive protos, fill this in now.
-	propertiesMap[t] = prop
-
-	// build properties
-	prop.extendable = reflect.PtrTo(t).Implements(extendableProtoType)
-	prop.unrecField = invalidField
-	prop.Prop = make([]*Properties, t.NumField())
-	prop.order = make([]int, t.NumField())
-
-	for i := 0; i < t.NumField(); i++ {
-		f := t.Field(i)
-		p := new(Properties)
-		name := f.Name
-		p.init(f.Type, name, f.Tag.Get("protobuf"), &f, false)
-
-		if f.Name == "XXX_extensions" { // special case
-			p.enc = (*Buffer).enc_map
-			p.dec = nil // not needed
-			p.size = size_map
-		}
-		if f.Name == "XXX_unrecognized" { // special case
-			prop.unrecField = toField(&f)
-		}
-		prop.Prop[i] = p
-		prop.order[i] = i
-		if debug {
-			print(i, " ", f.Name, " ", t.String(), " ")
-			if p.Tag > 0 {
-				print(p.String())
-			}
-			print("\n")
-		}
-		if p.enc == nil && !strings.HasPrefix(f.Name, "XXX_") {
-			fmt.Fprintln(os.Stderr, "proto: no encoder for", f.Name, f.Type.String(), "[GetProperties]")
-		}
-	}
-
-	// Re-order prop.order.
-	sort.Sort(prop)
-
-	// build required counts
-	// build tags
-	reqCount := 0
-	prop.decoderOrigNames = make(map[string]int)
-	for i, p := range prop.Prop {
-		if strings.HasPrefix(p.Name, "XXX_") {
-			// Internal fields should not appear in tags/origNames maps.
-			// They are handled specially when encoding and decoding.
-			continue
-		}
-		if p.Required {
-			reqCount++
-		}
-		prop.decoderTags.put(p.Tag, i)
-		prop.decoderOrigNames[p.OrigName] = i
-	}
-	prop.reqCount = reqCount
-
-	return prop
-}
-
-// Return the Properties object for the x[0]'th field of the structure.
-func propByIndex(t reflect.Type, x []int) *Properties {
-	if len(x) != 1 {
-		fmt.Fprintf(os.Stderr, "proto: field index dimension %d (not 1) for type %s\n", len(x), t)
-		return nil
-	}
-	prop := GetProperties(t)
-	return prop.Prop[x[0]]
-}
-
-// Get the address and type of a pointer to a struct from an interface.
-func getbase(pb Message) (t reflect.Type, b structPointer, err error) {
-	if pb == nil {
-		err = ErrNil
-		return
-	}
-	// get the reflect type of the pointer to the struct.
-	t = reflect.TypeOf(pb)
-	// get the address of the struct.
-	value := reflect.ValueOf(pb)
-	b = toStructPointer(value)
-	return
-}
-
-// A global registry of enum types.
-// The generated code will register the generated maps by calling RegisterEnum.
-
-var enumValueMaps = make(map[string]map[string]int32)
-
-// RegisterEnum is called from the generated code to install the enum descriptor
-// maps into the global table to aid parsing text format protocol buffers.
-func RegisterEnum(typeName string, unusedNameMap map[int32]string, valueMap map[string]int32) {
-	if _, ok := enumValueMaps[typeName]; ok {
-		panic("proto: duplicate enum registered: " + typeName)
-	}
-	enumValueMaps[typeName] = valueMap
-}
diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/proto/proto3_proto/proto3.pb.go b/Godeps/_workspace/src/github.com/golang/protobuf/proto/proto3_proto/proto3.pb.go
deleted file mode 100644
index 37c778209..000000000
--- a/Godeps/_workspace/src/github.com/golang/protobuf/proto/proto3_proto/proto3.pb.go
+++ /dev/null
@@ -1,122 +0,0 @@
-// Code generated by protoc-gen-go.
-// source: proto3_proto/proto3.proto
-// DO NOT EDIT!
-
-/*
-Package proto3_proto is a generated protocol buffer package.
-
-It is generated from these files:
-	proto3_proto/proto3.proto
-
-It has these top-level messages:
-	Message
-	Nested
-	MessageWithMap
-*/
-package proto3_proto
-
-import proto "github.com/golang/protobuf/proto"
-import testdata "github.com/golang/protobuf/proto/testdata"
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-
-type Message_Humour int32
-
-const (
-	Message_UNKNOWN     Message_Humour = 0
-	Message_PUNS        Message_Humour = 1
-	Message_SLAPSTICK   Message_Humour = 2
-	Message_BILL_BAILEY Message_Humour = 3
-)
-
-var Message_Humour_name = map[int32]string{
-	0: "UNKNOWN",
-	1: "PUNS",
-	2: "SLAPSTICK",
-	3: "BILL_BAILEY",
-}
-var Message_Humour_value = map[string]int32{
-	"UNKNOWN":     0,
-	"PUNS":        1,
-	"SLAPSTICK":   2,
-	"BILL_BAILEY": 3,
-}
-
-func (x Message_Humour) String() string {
-	return proto.EnumName(Message_Humour_name, int32(x))
-}
-
-type Message struct {
-	Name         string                           `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
-	Hilarity     Message_Humour                   `protobuf:"varint,2,opt,name=hilarity,enum=proto3_proto.Message_Humour" json:"hilarity,omitempty"`
-	HeightInCm   uint32                           `protobuf:"varint,3,opt,name=height_in_cm" json:"height_in_cm,omitempty"`
-	Data         []byte                           `protobuf:"bytes,4,opt,name=data,proto3" json:"data,omitempty"`
-	ResultCount  int64                            `protobuf:"varint,7,opt,name=result_count" json:"result_count,omitempty"`
-	TrueScotsman bool                             `protobuf:"varint,8,opt,name=true_scotsman" json:"true_scotsman,omitempty"`
-	Score        float32                          `protobuf:"fixed32,9,opt,name=score" json:"score,omitempty"`
-	Key          []uint64                         `protobuf:"varint,5,rep,name=key" json:"key,omitempty"`
-	Nested       *Nested                          `protobuf:"bytes,6,opt,name=nested" json:"nested,omitempty"`
-	Terrain      map[string]*Nested               `protobuf:"bytes,10,rep,name=terrain" json:"terrain,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
-	Proto2Field  *testdata.SubDefaults            `protobuf:"bytes,11,opt,name=proto2_field" json:"proto2_field,omitempty"`
-	Proto2Value  map[string]*testdata.SubDefaults `protobuf:"bytes,13,rep,name=proto2_value" json:"proto2_value,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
-}
-
-func (m *Message) Reset()         { *m = Message{} }
-func (m *Message) String() string { return proto.CompactTextString(m) }
-func (*Message) ProtoMessage()    {}
-
-func (m *Message) GetNested() *Nested {
-	if m != nil {
-		return m.Nested
-	}
-	return nil
-}
-
-func (m *Message) GetTerrain() map[string]*Nested {
-	if m != nil {
-		return m.Terrain
-	}
-	return nil
-}
-
-func (m *Message) GetProto2Field() *testdata.SubDefaults {
-	if m != nil {
-		return m.Proto2Field
-	}
-	return nil
-}
-
-func (m *Message) GetProto2Value() map[string]*testdata.SubDefaults {
-	if m != nil {
-		return m.Proto2Value
-	}
-	return nil
-}
-
-type Nested struct {
-	Bunny string `protobuf:"bytes,1,opt,name=bunny" json:"bunny,omitempty"`
-}
-
-func (m *Nested) Reset()         { *m = Nested{} }
-func (m *Nested) String() string { return proto.CompactTextString(m) }
-func (*Nested) ProtoMessage()    {}
-
-type MessageWithMap struct {
-	ByteMapping map[bool][]byte `protobuf:"bytes,1,rep,name=byte_mapping" json:"byte_mapping,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value,proto3"`
-}
-
-func (m *MessageWithMap) Reset()         { *m = MessageWithMap{} }
-func (m *MessageWithMap) String() string { return proto.CompactTextString(m) }
-func (*MessageWithMap) ProtoMessage()    {}
-
-func (m *MessageWithMap) GetByteMapping() map[bool][]byte {
-	if m != nil {
-		return m.ByteMapping
-	}
-	return nil
-}
-
-func init() {
-	proto.RegisterEnum("proto3_proto.Message_Humour", Message_Humour_name, Message_Humour_value)
-}
diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/proto/proto3_proto/proto3.proto b/Godeps/_workspace/src/github.com/golang/protobuf/proto/proto3_proto/proto3.proto
deleted file mode 100644
index e2311d929..000000000
--- a/Godeps/_workspace/src/github.com/golang/protobuf/proto/proto3_proto/proto3.proto
+++ /dev/null
@@ -1,68 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2014 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// 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.
-
-syntax = "proto3";
-
-import "testdata/test.proto";
-
-package proto3_proto;
-
-message Message {
-  enum Humour {
-    UNKNOWN = 0;
-    PUNS = 1;
-    SLAPSTICK = 2;
-    BILL_BAILEY = 3;
-  }
-
-  string name = 1;
-  Humour hilarity = 2;
-  uint32 height_in_cm = 3;
-  bytes data = 4;
-  int64 result_count = 7;
-  bool true_scotsman = 8;
-  float score = 9;
-
-  repeated uint64 key = 5;
-  Nested nested = 6;
-
-  map<string, Nested> terrain = 10;
-  testdata.SubDefaults proto2_field = 11;
-  map<string, testdata.SubDefaults> proto2_value = 13;
-}
-
-message Nested {
-  string bunny = 1;
-}
-
-message MessageWithMap {
-  map<bool, bytes> byte_mapping = 1;
-}
diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/proto/proto3_test.go b/Godeps/_workspace/src/github.com/golang/protobuf/proto/proto3_test.go
deleted file mode 100644
index 462f8055c..000000000
--- a/Godeps/_workspace/src/github.com/golang/protobuf/proto/proto3_test.go
+++ /dev/null
@@ -1,125 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2014 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// 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.
-
-package proto_test
-
-import (
-	"testing"
-
-	"github.com/golang/protobuf/proto"
-	pb "github.com/golang/protobuf/proto/proto3_proto"
-	tpb "github.com/golang/protobuf/proto/testdata"
-)
-
-func TestProto3ZeroValues(t *testing.T) {
-	tests := []struct {
-		desc string
-		m    proto.Message
-	}{
-		{"zero message", &pb.Message{}},
-		{"empty bytes field", &pb.Message{Data: []byte{}}},
-	}
-	for _, test := range tests {
-		b, err := proto.Marshal(test.m)
-		if err != nil {
-			t.Errorf("%s: proto.Marshal: %v", test.desc, err)
-			continue
-		}
-		if len(b) > 0 {
-			t.Errorf("%s: Encoding is non-empty: %q", test.desc, b)
-		}
-	}
-}
-
-func TestRoundTripProto3(t *testing.T) {
-	m := &pb.Message{
-		Name:         "David",          // (2 | 1<<3): 0x0a 0x05 "David"
-		Hilarity:     pb.Message_PUNS,  // (0 | 2<<3): 0x10 0x01
-		HeightInCm:   178,              // (0 | 3<<3): 0x18 0xb2 0x01
-		Data:         []byte("roboto"), // (2 | 4<<3): 0x20 0x06 "roboto"
-		ResultCount:  47,               // (0 | 7<<3): 0x38 0x2f
-		TrueScotsman: true,             // (0 | 8<<3): 0x40 0x01
-		Score:        8.1,              // (5 | 9<<3): 0x4d <8.1>
-
-		Key: []uint64{1, 0xdeadbeef},
-		Nested: &pb.Nested{
-			Bunny: "Monty",
-		},
-	}
-	t.Logf(" m: %v", m)
-
-	b, err := proto.Marshal(m)
-	if err != nil {
-		t.Fatalf("proto.Marshal: %v", err)
-	}
-	t.Logf(" b: %q", b)
-
-	m2 := new(pb.Message)
-	if err := proto.Unmarshal(b, m2); err != nil {
-		t.Fatalf("proto.Unmarshal: %v", err)
-	}
-	t.Logf("m2: %v", m2)
-
-	if !proto.Equal(m, m2) {
-		t.Errorf("proto.Equal returned false:\n m: %v\nm2: %v", m, m2)
-	}
-}
-
-func TestProto3SetDefaults(t *testing.T) {
-	in := &pb.Message{
-		Terrain: map[string]*pb.Nested{
-			"meadow": new(pb.Nested),
-		},
-		Proto2Field: new(tpb.SubDefaults),
-		Proto2Value: map[string]*tpb.SubDefaults{
-			"badlands": new(tpb.SubDefaults),
-		},
-	}
-
-	got := proto.Clone(in).(*pb.Message)
-	proto.SetDefaults(got)
-
-	// There are no defaults in proto3.  Everything should be the zero value, but
-	// we need to remember to set defaults for nested proto2 messages.
-	want := &pb.Message{
-		Terrain: map[string]*pb.Nested{
-			"meadow": new(pb.Nested),
-		},
-		Proto2Field: &tpb.SubDefaults{N: proto.Int64(7)},
-		Proto2Value: map[string]*tpb.SubDefaults{
-			"badlands": &tpb.SubDefaults{N: proto.Int64(7)},
-		},
-	}
-
-	if !proto.Equal(got, want) {
-		t.Errorf("with in = %v\nproto.SetDefaults(in) =>\ngot %v\nwant %v", in, got, want)
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/proto/size2_test.go b/Godeps/_workspace/src/github.com/golang/protobuf/proto/size2_test.go
deleted file mode 100644
index a2729c39a..000000000
--- a/Godeps/_workspace/src/github.com/golang/protobuf/proto/size2_test.go
+++ /dev/null
@@ -1,63 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2012 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// 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.
-
-package proto
-
-import (
-	"testing"
-)
-
-// This is a separate file and package from size_test.go because that one uses
-// generated messages and thus may not be in package proto without having a circular
-// dependency, whereas this file tests unexported details of size.go.
-
-func TestVarintSize(t *testing.T) {
-	// Check the edge cases carefully.
-	testCases := []struct {
-		n    uint64
-		size int
-	}{
-		{0, 1},
-		{1, 1},
-		{127, 1},
-		{128, 2},
-		{16383, 2},
-		{16384, 3},
-		{1<<63 - 1, 9},
-		{1 << 63, 10},
-	}
-	for _, tc := range testCases {
-		size := sizeVarint(tc.n)
-		if size != tc.size {
-			t.Errorf("sizeVarint(%d) = %d, want %d", tc.n, size, tc.size)
-		}
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/proto/size_test.go b/Godeps/_workspace/src/github.com/golang/protobuf/proto/size_test.go
deleted file mode 100644
index db5614fd1..000000000
--- a/Godeps/_workspace/src/github.com/golang/protobuf/proto/size_test.go
+++ /dev/null
@@ -1,142 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2012 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// 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.
-
-package proto_test
-
-import (
-	"log"
-	"strings"
-	"testing"
-
-	. "github.com/golang/protobuf/proto"
-	proto3pb "github.com/golang/protobuf/proto/proto3_proto"
-	pb "github.com/golang/protobuf/proto/testdata"
-)
-
-var messageWithExtension1 = &pb.MyMessage{Count: Int32(7)}
-
-// messageWithExtension2 is in equal_test.go.
-var messageWithExtension3 = &pb.MyMessage{Count: Int32(8)}
-
-func init() {
-	if err := SetExtension(messageWithExtension1, pb.E_Ext_More, &pb.Ext{Data: String("Abbott")}); err != nil {
-		log.Panicf("SetExtension: %v", err)
-	}
-	if err := SetExtension(messageWithExtension3, pb.E_Ext_More, &pb.Ext{Data: String("Costello")}); err != nil {
-		log.Panicf("SetExtension: %v", err)
-	}
-
-	// Force messageWithExtension3 to have the extension encoded.
-	Marshal(messageWithExtension3)
-
-}
-
-var SizeTests = []struct {
-	desc string
-	pb   Message
-}{
-	{"empty", &pb.OtherMessage{}},
-	// Basic types.
-	{"bool", &pb.Defaults{F_Bool: Bool(true)}},
-	{"int32", &pb.Defaults{F_Int32: Int32(12)}},
-	{"negative int32", &pb.Defaults{F_Int32: Int32(-1)}},
-	{"small int64", &pb.Defaults{F_Int64: Int64(1)}},
-	{"big int64", &pb.Defaults{F_Int64: Int64(1 << 20)}},
-	{"negative int64", &pb.Defaults{F_Int64: Int64(-1)}},
-	{"fixed32", &pb.Defaults{F_Fixed32: Uint32(71)}},
-	{"fixed64", &pb.Defaults{F_Fixed64: Uint64(72)}},
-	{"uint32", &pb.Defaults{F_Uint32: Uint32(123)}},
-	{"uint64", &pb.Defaults{F_Uint64: Uint64(124)}},
-	{"float", &pb.Defaults{F_Float: Float32(12.6)}},
-	{"double", &pb.Defaults{F_Double: Float64(13.9)}},
-	{"string", &pb.Defaults{F_String: String("niles")}},
-	{"bytes", &pb.Defaults{F_Bytes: []byte("wowsa")}},
-	{"bytes, empty", &pb.Defaults{F_Bytes: []byte{}}},
-	{"sint32", &pb.Defaults{F_Sint32: Int32(65)}},
-	{"sint64", &pb.Defaults{F_Sint64: Int64(67)}},
-	{"enum", &pb.Defaults{F_Enum: pb.Defaults_BLUE.Enum()}},
-	// Repeated.
-	{"empty repeated bool", &pb.MoreRepeated{Bools: []bool{}}},
-	{"repeated bool", &pb.MoreRepeated{Bools: []bool{false, true, true, false}}},
-	{"packed repeated bool", &pb.MoreRepeated{BoolsPacked: []bool{false, true, true, false, true, true, true}}},
-	{"repeated int32", &pb.MoreRepeated{Ints: []int32{1, 12203, 1729, -1}}},
-	{"repeated int32 packed", &pb.MoreRepeated{IntsPacked: []int32{1, 12203, 1729}}},
-	{"repeated int64 packed", &pb.MoreRepeated{Int64SPacked: []int64{
-		// Need enough large numbers to verify that the header is counting the number of bytes
-		// for the field, not the number of elements.
-		1 << 62, 1 << 62, 1 << 62, 1 << 62, 1 << 62, 1 << 62, 1 << 62, 1 << 62, 1 << 62, 1 << 62,
-		1 << 62, 1 << 62, 1 << 62, 1 << 62, 1 << 62, 1 << 62, 1 << 62, 1 << 62, 1 << 62, 1 << 62,
-	}}},
-	{"repeated string", &pb.MoreRepeated{Strings: []string{"r", "ken", "gri"}}},
-	{"repeated fixed", &pb.MoreRepeated{Fixeds: []uint32{1, 2, 3, 4}}},
-	// Nested.
-	{"nested", &pb.OldMessage{Nested: &pb.OldMessage_Nested{Name: String("whatever")}}},
-	{"group", &pb.GroupOld{G: &pb.GroupOld_G{X: Int32(12345)}}},
-	// Other things.
-	{"unrecognized", &pb.MoreRepeated{XXX_unrecognized: []byte{13<<3 | 0, 4}}},
-	{"extension (unencoded)", messageWithExtension1},
-	{"extension (encoded)", messageWithExtension3},
-	// proto3 message
-	{"proto3 empty", &proto3pb.Message{}},
-	{"proto3 bool", &proto3pb.Message{TrueScotsman: true}},
-	{"proto3 int64", &proto3pb.Message{ResultCount: 1}},
-	{"proto3 uint32", &proto3pb.Message{HeightInCm: 123}},
-	{"proto3 float", &proto3pb.Message{Score: 12.6}},
-	{"proto3 string", &proto3pb.Message{Name: "Snezana"}},
-	{"proto3 bytes", &proto3pb.Message{Data: []byte("wowsa")}},
-	{"proto3 bytes, empty", &proto3pb.Message{Data: []byte{}}},
-	{"proto3 enum", &proto3pb.Message{Hilarity: proto3pb.Message_PUNS}},
-	{"proto3 map field with empty bytes", &proto3pb.MessageWithMap{ByteMapping: map[bool][]byte{false: []byte{}}}},
-
-	{"map field", &pb.MessageWithMap{NameMapping: map[int32]string{1: "Rob", 7: "Andrew"}}},
-	{"map field with message", &pb.MessageWithMap{MsgMapping: map[int64]*pb.FloatingPoint{0x7001: &pb.FloatingPoint{F: Float64(2.0)}}}},
-	{"map field with bytes", &pb.MessageWithMap{ByteMapping: map[bool][]byte{true: []byte("this time for sure")}}},
-	{"map field with empty bytes", &pb.MessageWithMap{ByteMapping: map[bool][]byte{true: []byte{}}}},
-
-	{"map field with big entry", &pb.MessageWithMap{NameMapping: map[int32]string{8: strings.Repeat("x", 125)}}},
-	{"map field with big key and val", &pb.MessageWithMap{StrToStr: map[string]string{strings.Repeat("x", 70): strings.Repeat("y", 70)}}},
-	{"map field with big numeric key", &pb.MessageWithMap{NameMapping: map[int32]string{0xf00d: "om nom nom"}}},
-}
-
-func TestSize(t *testing.T) {
-	for _, tc := range SizeTests {
-		size := Size(tc.pb)
-		b, err := Marshal(tc.pb)
-		if err != nil {
-			t.Errorf("%v: Marshal failed: %v", tc.desc, err)
-			continue
-		}
-		if size != len(b) {
-			t.Errorf("%v: Size(%v) = %d, want %d", tc.desc, tc.pb, size, len(b))
-			t.Logf("%v: bytes: %#v", tc.desc, b)
-		}
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/proto/testdata/Makefile b/Godeps/_workspace/src/github.com/golang/protobuf/proto/testdata/Makefile
deleted file mode 100644
index fc288628a..000000000
--- a/Godeps/_workspace/src/github.com/golang/protobuf/proto/testdata/Makefile
+++ /dev/null
@@ -1,50 +0,0 @@
-# Go support for Protocol Buffers - Google's data interchange format
-#
-# Copyright 2010 The Go Authors.  All rights reserved.
-# https://github.com/golang/protobuf
-#
-# 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.
-
-
-include ../../Make.protobuf
-
-all:	regenerate
-
-regenerate:
-	rm -f test.pb.go
-	make test.pb.go
-
-# The following rules are just aids to development. Not needed for typical testing.
-
-diff:	regenerate
-	git diff test.pb.go
-
-restore:
-	cp test.pb.go.golden test.pb.go
-
-preserve:
-	cp test.pb.go test.pb.go.golden
diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/proto/testdata/golden_test.go b/Godeps/_workspace/src/github.com/golang/protobuf/proto/testdata/golden_test.go
deleted file mode 100644
index 7172d0e96..000000000
--- a/Godeps/_workspace/src/github.com/golang/protobuf/proto/testdata/golden_test.go
+++ /dev/null
@@ -1,86 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2012 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// 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.
-
-// Verify that the compiler output for test.proto is unchanged.
-
-package testdata
-
-import (
-	"crypto/sha1"
-	"fmt"
-	"io/ioutil"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"testing"
-)
-
-// sum returns in string form (for easy comparison) the SHA-1 hash of the named file.
-func sum(t *testing.T, name string) string {
-	data, err := ioutil.ReadFile(name)
-	if err != nil {
-		t.Fatal(err)
-	}
-	t.Logf("sum(%q): length is %d", name, len(data))
-	hash := sha1.New()
-	_, err = hash.Write(data)
-	if err != nil {
-		t.Fatal(err)
-	}
-	return fmt.Sprintf("% x", hash.Sum(nil))
-}
-
-func run(t *testing.T, name string, args ...string) {
-	cmd := exec.Command(name, args...)
-	cmd.Stdin = os.Stdin
-	cmd.Stdout = os.Stdout
-	cmd.Stderr = os.Stderr
-	err := cmd.Run()
-	if err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestGolden(t *testing.T) {
-	// Compute the original checksum.
-	goldenSum := sum(t, "test.pb.go")
-	// Run the proto compiler.
-	run(t, "protoc", "--go_out="+os.TempDir(), "test.proto")
-	newFile := filepath.Join(os.TempDir(), "test.pb.go")
-	defer os.Remove(newFile)
-	// Compute the new checksum.
-	newSum := sum(t, newFile)
-	// Verify
-	if newSum != goldenSum {
-		run(t, "diff", "-u", "test.pb.go", newFile)
-		t.Fatal("Code generated by protoc-gen-go has changed; update test.pb.go")
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/proto/testdata/test.pb.go b/Godeps/_workspace/src/github.com/golang/protobuf/proto/testdata/test.pb.go
deleted file mode 100644
index 13674a449..000000000
--- a/Godeps/_workspace/src/github.com/golang/protobuf/proto/testdata/test.pb.go
+++ /dev/null
@@ -1,2746 +0,0 @@
-// Code generated by protoc-gen-go.
-// source: test.proto
-// DO NOT EDIT!
-
-/*
-Package testdata is a generated protocol buffer package.
-
-It is generated from these files:
-	test.proto
-
-It has these top-level messages:
-	GoEnum
-	GoTestField
-	GoTest
-	GoSkipTest
-	NonPackedTest
-	PackedTest
-	MaxTag
-	OldMessage
-	NewMessage
-	InnerMessage
-	OtherMessage
-	MyMessage
-	Ext
-	DefaultsMessage
-	MyMessageSet
-	Empty
-	MessageList
-	Strings
-	Defaults
-	SubDefaults
-	RepeatedEnum
-	MoreRepeated
-	GroupOld
-	GroupNew
-	FloatingPoint
-	MessageWithMap
-*/
-package testdata
-
-import proto "github.com/golang/protobuf/proto"
-import math "math"
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = math.Inf
-
-type FOO int32
-
-const (
-	FOO_FOO1 FOO = 1
-)
-
-var FOO_name = map[int32]string{
-	1: "FOO1",
-}
-var FOO_value = map[string]int32{
-	"FOO1": 1,
-}
-
-func (x FOO) Enum() *FOO {
-	p := new(FOO)
-	*p = x
-	return p
-}
-func (x FOO) String() string {
-	return proto.EnumName(FOO_name, int32(x))
-}
-func (x *FOO) UnmarshalJSON(data []byte) error {
-	value, err := proto.UnmarshalJSONEnum(FOO_value, data, "FOO")
-	if err != nil {
-		return err
-	}
-	*x = FOO(value)
-	return nil
-}
-
-// An enum, for completeness.
-type GoTest_KIND int32
-
-const (
-	GoTest_VOID GoTest_KIND = 0
-	// Basic types
-	GoTest_BOOL        GoTest_KIND = 1
-	GoTest_BYTES       GoTest_KIND = 2
-	GoTest_FINGERPRINT GoTest_KIND = 3
-	GoTest_FLOAT       GoTest_KIND = 4
-	GoTest_INT         GoTest_KIND = 5
-	GoTest_STRING      GoTest_KIND = 6
-	GoTest_TIME        GoTest_KIND = 7
-	// Groupings
-	GoTest_TUPLE GoTest_KIND = 8
-	GoTest_ARRAY GoTest_KIND = 9
-	GoTest_MAP   GoTest_KIND = 10
-	// Table types
-	GoTest_TABLE GoTest_KIND = 11
-	// Functions
-	GoTest_FUNCTION GoTest_KIND = 12
-)
-
-var GoTest_KIND_name = map[int32]string{
-	0:  "VOID",
-	1:  "BOOL",
-	2:  "BYTES",
-	3:  "FINGERPRINT",
-	4:  "FLOAT",
-	5:  "INT",
-	6:  "STRING",
-	7:  "TIME",
-	8:  "TUPLE",
-	9:  "ARRAY",
-	10: "MAP",
-	11: "TABLE",
-	12: "FUNCTION",
-}
-var GoTest_KIND_value = map[string]int32{
-	"VOID":        0,
-	"BOOL":        1,
-	"BYTES":       2,
-	"FINGERPRINT": 3,
-	"FLOAT":       4,
-	"INT":         5,
-	"STRING":      6,
-	"TIME":        7,
-	"TUPLE":       8,
-	"ARRAY":       9,
-	"MAP":         10,
-	"TABLE":       11,
-	"FUNCTION":    12,
-}
-
-func (x GoTest_KIND) Enum() *GoTest_KIND {
-	p := new(GoTest_KIND)
-	*p = x
-	return p
-}
-func (x GoTest_KIND) String() string {
-	return proto.EnumName(GoTest_KIND_name, int32(x))
-}
-func (x *GoTest_KIND) UnmarshalJSON(data []byte) error {
-	value, err := proto.UnmarshalJSONEnum(GoTest_KIND_value, data, "GoTest_KIND")
-	if err != nil {
-		return err
-	}
-	*x = GoTest_KIND(value)
-	return nil
-}
-
-type MyMessage_Color int32
-
-const (
-	MyMessage_RED   MyMessage_Color = 0
-	MyMessage_GREEN MyMessage_Color = 1
-	MyMessage_BLUE  MyMessage_Color = 2
-)
-
-var MyMessage_Color_name = map[int32]string{
-	0: "RED",
-	1: "GREEN",
-	2: "BLUE",
-}
-var MyMessage_Color_value = map[string]int32{
-	"RED":   0,
-	"GREEN": 1,
-	"BLUE":  2,
-}
-
-func (x MyMessage_Color) Enum() *MyMessage_Color {
-	p := new(MyMessage_Color)
-	*p = x
-	return p
-}
-func (x MyMessage_Color) String() string {
-	return proto.EnumName(MyMessage_Color_name, int32(x))
-}
-func (x *MyMessage_Color) UnmarshalJSON(data []byte) error {
-	value, err := proto.UnmarshalJSONEnum(MyMessage_Color_value, data, "MyMessage_Color")
-	if err != nil {
-		return err
-	}
-	*x = MyMessage_Color(value)
-	return nil
-}
-
-type DefaultsMessage_DefaultsEnum int32
-
-const (
-	DefaultsMessage_ZERO DefaultsMessage_DefaultsEnum = 0
-	DefaultsMessage_ONE  DefaultsMessage_DefaultsEnum = 1
-	DefaultsMessage_TWO  DefaultsMessage_DefaultsEnum = 2
-)
-
-var DefaultsMessage_DefaultsEnum_name = map[int32]string{
-	0: "ZERO",
-	1: "ONE",
-	2: "TWO",
-}
-var DefaultsMessage_DefaultsEnum_value = map[string]int32{
-	"ZERO": 0,
-	"ONE":  1,
-	"TWO":  2,
-}
-
-func (x DefaultsMessage_DefaultsEnum) Enum() *DefaultsMessage_DefaultsEnum {
-	p := new(DefaultsMessage_DefaultsEnum)
-	*p = x
-	return p
-}
-func (x DefaultsMessage_DefaultsEnum) String() string {
-	return proto.EnumName(DefaultsMessage_DefaultsEnum_name, int32(x))
-}
-func (x *DefaultsMessage_DefaultsEnum) UnmarshalJSON(data []byte) error {
-	value, err := proto.UnmarshalJSONEnum(DefaultsMessage_DefaultsEnum_value, data, "DefaultsMessage_DefaultsEnum")
-	if err != nil {
-		return err
-	}
-	*x = DefaultsMessage_DefaultsEnum(value)
-	return nil
-}
-
-type Defaults_Color int32
-
-const (
-	Defaults_RED   Defaults_Color = 0
-	Defaults_GREEN Defaults_Color = 1
-	Defaults_BLUE  Defaults_Color = 2
-)
-
-var Defaults_Color_name = map[int32]string{
-	0: "RED",
-	1: "GREEN",
-	2: "BLUE",
-}
-var Defaults_Color_value = map[string]int32{
-	"RED":   0,
-	"GREEN": 1,
-	"BLUE":  2,
-}
-
-func (x Defaults_Color) Enum() *Defaults_Color {
-	p := new(Defaults_Color)
-	*p = x
-	return p
-}
-func (x Defaults_Color) String() string {
-	return proto.EnumName(Defaults_Color_name, int32(x))
-}
-func (x *Defaults_Color) UnmarshalJSON(data []byte) error {
-	value, err := proto.UnmarshalJSONEnum(Defaults_Color_value, data, "Defaults_Color")
-	if err != nil {
-		return err
-	}
-	*x = Defaults_Color(value)
-	return nil
-}
-
-type RepeatedEnum_Color int32
-
-const (
-	RepeatedEnum_RED RepeatedEnum_Color = 1
-)
-
-var RepeatedEnum_Color_name = map[int32]string{
-	1: "RED",
-}
-var RepeatedEnum_Color_value = map[string]int32{
-	"RED": 1,
-}
-
-func (x RepeatedEnum_Color) Enum() *RepeatedEnum_Color {
-	p := new(RepeatedEnum_Color)
-	*p = x
-	return p
-}
-func (x RepeatedEnum_Color) String() string {
-	return proto.EnumName(RepeatedEnum_Color_name, int32(x))
-}
-func (x *RepeatedEnum_Color) UnmarshalJSON(data []byte) error {
-	value, err := proto.UnmarshalJSONEnum(RepeatedEnum_Color_value, data, "RepeatedEnum_Color")
-	if err != nil {
-		return err
-	}
-	*x = RepeatedEnum_Color(value)
-	return nil
-}
-
-type GoEnum struct {
-	Foo              *FOO   `protobuf:"varint,1,req,name=foo,enum=testdata.FOO" json:"foo,omitempty"`
-	XXX_unrecognized []byte `json:"-"`
-}
-
-func (m *GoEnum) Reset()         { *m = GoEnum{} }
-func (m *GoEnum) String() string { return proto.CompactTextString(m) }
-func (*GoEnum) ProtoMessage()    {}
-
-func (m *GoEnum) GetFoo() FOO {
-	if m != nil && m.Foo != nil {
-		return *m.Foo
-	}
-	return FOO_FOO1
-}
-
-type GoTestField struct {
-	Label            *string `protobuf:"bytes,1,req" json:"Label,omitempty"`
-	Type             *string `protobuf:"bytes,2,req" json:"Type,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *GoTestField) Reset()         { *m = GoTestField{} }
-func (m *GoTestField) String() string { return proto.CompactTextString(m) }
-func (*GoTestField) ProtoMessage()    {}
-
-func (m *GoTestField) GetLabel() string {
-	if m != nil && m.Label != nil {
-		return *m.Label
-	}
-	return ""
-}
-
-func (m *GoTestField) GetType() string {
-	if m != nil && m.Type != nil {
-		return *m.Type
-	}
-	return ""
-}
-
-type GoTest struct {
-	// Some typical parameters
-	Kind  *GoTest_KIND `protobuf:"varint,1,req,enum=testdata.GoTest_KIND" json:"Kind,omitempty"`
-	Table *string      `protobuf:"bytes,2,opt" json:"Table,omitempty"`
-	Param *int32       `protobuf:"varint,3,opt" json:"Param,omitempty"`
-	// Required, repeated and optional foreign fields.
-	RequiredField *GoTestField   `protobuf:"bytes,4,req" json:"RequiredField,omitempty"`
-	RepeatedField []*GoTestField `protobuf:"bytes,5,rep" json:"RepeatedField,omitempty"`
-	OptionalField *GoTestField   `protobuf:"bytes,6,opt" json:"OptionalField,omitempty"`
-	// Required fields of all basic types
-	F_BoolRequired    *bool    `protobuf:"varint,10,req,name=F_Bool_required" json:"F_Bool_required,omitempty"`
-	F_Int32Required   *int32   `protobuf:"varint,11,req,name=F_Int32_required" json:"F_Int32_required,omitempty"`
-	F_Int64Required   *int64   `protobuf:"varint,12,req,name=F_Int64_required" json:"F_Int64_required,omitempty"`
-	F_Fixed32Required *uint32  `protobuf:"fixed32,13,req,name=F_Fixed32_required" json:"F_Fixed32_required,omitempty"`
-	F_Fixed64Required *uint64  `protobuf:"fixed64,14,req,name=F_Fixed64_required" json:"F_Fixed64_required,omitempty"`
-	F_Uint32Required  *uint32  `protobuf:"varint,15,req,name=F_Uint32_required" json:"F_Uint32_required,omitempty"`
-	F_Uint64Required  *uint64  `protobuf:"varint,16,req,name=F_Uint64_required" json:"F_Uint64_required,omitempty"`
-	F_FloatRequired   *float32 `protobuf:"fixed32,17,req,name=F_Float_required" json:"F_Float_required,omitempty"`
-	F_DoubleRequired  *float64 `protobuf:"fixed64,18,req,name=F_Double_required" json:"F_Double_required,omitempty"`
-	F_StringRequired  *string  `protobuf:"bytes,19,req,name=F_String_required" json:"F_String_required,omitempty"`
-	F_BytesRequired   []byte   `protobuf:"bytes,101,req,name=F_Bytes_required" json:"F_Bytes_required,omitempty"`
-	F_Sint32Required  *int32   `protobuf:"zigzag32,102,req,name=F_Sint32_required" json:"F_Sint32_required,omitempty"`
-	F_Sint64Required  *int64   `protobuf:"zigzag64,103,req,name=F_Sint64_required" json:"F_Sint64_required,omitempty"`
-	// Repeated fields of all basic types
-	F_BoolRepeated    []bool    `protobuf:"varint,20,rep,name=F_Bool_repeated" json:"F_Bool_repeated,omitempty"`
-	F_Int32Repeated   []int32   `protobuf:"varint,21,rep,name=F_Int32_repeated" json:"F_Int32_repeated,omitempty"`
-	F_Int64Repeated   []int64   `protobuf:"varint,22,rep,name=F_Int64_repeated" json:"F_Int64_repeated,omitempty"`
-	F_Fixed32Repeated []uint32  `protobuf:"fixed32,23,rep,name=F_Fixed32_repeated" json:"F_Fixed32_repeated,omitempty"`
-	F_Fixed64Repeated []uint64  `protobuf:"fixed64,24,rep,name=F_Fixed64_repeated" json:"F_Fixed64_repeated,omitempty"`
-	F_Uint32Repeated  []uint32  `protobuf:"varint,25,rep,name=F_Uint32_repeated" json:"F_Uint32_repeated,omitempty"`
-	F_Uint64Repeated  []uint64  `protobuf:"varint,26,rep,name=F_Uint64_repeated" json:"F_Uint64_repeated,omitempty"`
-	F_FloatRepeated   []float32 `protobuf:"fixed32,27,rep,name=F_Float_repeated" json:"F_Float_repeated,omitempty"`
-	F_DoubleRepeated  []float64 `protobuf:"fixed64,28,rep,name=F_Double_repeated" json:"F_Double_repeated,omitempty"`
-	F_StringRepeated  []string  `protobuf:"bytes,29,rep,name=F_String_repeated" json:"F_String_repeated,omitempty"`
-	F_BytesRepeated   [][]byte  `protobuf:"bytes,201,rep,name=F_Bytes_repeated" json:"F_Bytes_repeated,omitempty"`
-	F_Sint32Repeated  []int32   `protobuf:"zigzag32,202,rep,name=F_Sint32_repeated" json:"F_Sint32_repeated,omitempty"`
-	F_Sint64Repeated  []int64   `protobuf:"zigzag64,203,rep,name=F_Sint64_repeated" json:"F_Sint64_repeated,omitempty"`
-	// Optional fields of all basic types
-	F_BoolOptional    *bool    `protobuf:"varint,30,opt,name=F_Bool_optional" json:"F_Bool_optional,omitempty"`
-	F_Int32Optional   *int32   `protobuf:"varint,31,opt,name=F_Int32_optional" json:"F_Int32_optional,omitempty"`
-	F_Int64Optional   *int64   `protobuf:"varint,32,opt,name=F_Int64_optional" json:"F_Int64_optional,omitempty"`
-	F_Fixed32Optional *uint32  `protobuf:"fixed32,33,opt,name=F_Fixed32_optional" json:"F_Fixed32_optional,omitempty"`
-	F_Fixed64Optional *uint64  `protobuf:"fixed64,34,opt,name=F_Fixed64_optional" json:"F_Fixed64_optional,omitempty"`
-	F_Uint32Optional  *uint32  `protobuf:"varint,35,opt,name=F_Uint32_optional" json:"F_Uint32_optional,omitempty"`
-	F_Uint64Optional  *uint64  `protobuf:"varint,36,opt,name=F_Uint64_optional" json:"F_Uint64_optional,omitempty"`
-	F_FloatOptional   *float32 `protobuf:"fixed32,37,opt,name=F_Float_optional" json:"F_Float_optional,omitempty"`
-	F_DoubleOptional  *float64 `protobuf:"fixed64,38,opt,name=F_Double_optional" json:"F_Double_optional,omitempty"`
-	F_StringOptional  *string  `protobuf:"bytes,39,opt,name=F_String_optional" json:"F_String_optional,omitempty"`
-	F_BytesOptional   []byte   `protobuf:"bytes,301,opt,name=F_Bytes_optional" json:"F_Bytes_optional,omitempty"`
-	F_Sint32Optional  *int32   `protobuf:"zigzag32,302,opt,name=F_Sint32_optional" json:"F_Sint32_optional,omitempty"`
-	F_Sint64Optional  *int64   `protobuf:"zigzag64,303,opt,name=F_Sint64_optional" json:"F_Sint64_optional,omitempty"`
-	// Default-valued fields of all basic types
-	F_BoolDefaulted    *bool    `protobuf:"varint,40,opt,name=F_Bool_defaulted,def=1" json:"F_Bool_defaulted,omitempty"`
-	F_Int32Defaulted   *int32   `protobuf:"varint,41,opt,name=F_Int32_defaulted,def=32" json:"F_Int32_defaulted,omitempty"`
-	F_Int64Defaulted   *int64   `protobuf:"varint,42,opt,name=F_Int64_defaulted,def=64" json:"F_Int64_defaulted,omitempty"`
-	F_Fixed32Defaulted *uint32  `protobuf:"fixed32,43,opt,name=F_Fixed32_defaulted,def=320" json:"F_Fixed32_defaulted,omitempty"`
-	F_Fixed64Defaulted *uint64  `protobuf:"fixed64,44,opt,name=F_Fixed64_defaulted,def=640" json:"F_Fixed64_defaulted,omitempty"`
-	F_Uint32Defaulted  *uint32  `protobuf:"varint,45,opt,name=F_Uint32_defaulted,def=3200" json:"F_Uint32_defaulted,omitempty"`
-	F_Uint64Defaulted  *uint64  `protobuf:"varint,46,opt,name=F_Uint64_defaulted,def=6400" json:"F_Uint64_defaulted,omitempty"`
-	F_FloatDefaulted   *float32 `protobuf:"fixed32,47,opt,name=F_Float_defaulted,def=314159" json:"F_Float_defaulted,omitempty"`
-	F_DoubleDefaulted  *float64 `protobuf:"fixed64,48,opt,name=F_Double_defaulted,def=271828" json:"F_Double_defaulted,omitempty"`
-	F_StringDefaulted  *string  `protobuf:"bytes,49,opt,name=F_String_defaulted,def=hello, \"world!\"\n" json:"F_String_defaulted,omitempty"`
-	F_BytesDefaulted   []byte   `protobuf:"bytes,401,opt,name=F_Bytes_defaulted,def=Bignose" json:"F_Bytes_defaulted,omitempty"`
-	F_Sint32Defaulted  *int32   `protobuf:"zigzag32,402,opt,name=F_Sint32_defaulted,def=-32" json:"F_Sint32_defaulted,omitempty"`
-	F_Sint64Defaulted  *int64   `protobuf:"zigzag64,403,opt,name=F_Sint64_defaulted,def=-64" json:"F_Sint64_defaulted,omitempty"`
-	// Packed repeated fields (no string or bytes).
-	F_BoolRepeatedPacked    []bool                  `protobuf:"varint,50,rep,packed,name=F_Bool_repeated_packed" json:"F_Bool_repeated_packed,omitempty"`
-	F_Int32RepeatedPacked   []int32                 `protobuf:"varint,51,rep,packed,name=F_Int32_repeated_packed" json:"F_Int32_repeated_packed,omitempty"`
-	F_Int64RepeatedPacked   []int64                 `protobuf:"varint,52,rep,packed,name=F_Int64_repeated_packed" json:"F_Int64_repeated_packed,omitempty"`
-	F_Fixed32RepeatedPacked []uint32                `protobuf:"fixed32,53,rep,packed,name=F_Fixed32_repeated_packed" json:"F_Fixed32_repeated_packed,omitempty"`
-	F_Fixed64RepeatedPacked []uint64                `protobuf:"fixed64,54,rep,packed,name=F_Fixed64_repeated_packed" json:"F_Fixed64_repeated_packed,omitempty"`
-	F_Uint32RepeatedPacked  []uint32                `protobuf:"varint,55,rep,packed,name=F_Uint32_repeated_packed" json:"F_Uint32_repeated_packed,omitempty"`
-	F_Uint64RepeatedPacked  []uint64                `protobuf:"varint,56,rep,packed,name=F_Uint64_repeated_packed" json:"F_Uint64_repeated_packed,omitempty"`
-	F_FloatRepeatedPacked   []float32               `protobuf:"fixed32,57,rep,packed,name=F_Float_repeated_packed" json:"F_Float_repeated_packed,omitempty"`
-	F_DoubleRepeatedPacked  []float64               `protobuf:"fixed64,58,rep,packed,name=F_Double_repeated_packed" json:"F_Double_repeated_packed,omitempty"`
-	F_Sint32RepeatedPacked  []int32                 `protobuf:"zigzag32,502,rep,packed,name=F_Sint32_repeated_packed" json:"F_Sint32_repeated_packed,omitempty"`
-	F_Sint64RepeatedPacked  []int64                 `protobuf:"zigzag64,503,rep,packed,name=F_Sint64_repeated_packed" json:"F_Sint64_repeated_packed,omitempty"`
-	Requiredgroup           *GoTest_RequiredGroup   `protobuf:"group,70,req,name=RequiredGroup" json:"requiredgroup,omitempty"`
-	Repeatedgroup           []*GoTest_RepeatedGroup `protobuf:"group,80,rep,name=RepeatedGroup" json:"repeatedgroup,omitempty"`
-	Optionalgroup           *GoTest_OptionalGroup   `protobuf:"group,90,opt,name=OptionalGroup" json:"optionalgroup,omitempty"`
-	XXX_unrecognized        []byte                  `json:"-"`
-}
-
-func (m *GoTest) Reset()         { *m = GoTest{} }
-func (m *GoTest) String() string { return proto.CompactTextString(m) }
-func (*GoTest) ProtoMessage()    {}
-
-const Default_GoTest_F_BoolDefaulted bool = true
-const Default_GoTest_F_Int32Defaulted int32 = 32
-const Default_GoTest_F_Int64Defaulted int64 = 64
-const Default_GoTest_F_Fixed32Defaulted uint32 = 320
-const Default_GoTest_F_Fixed64Defaulted uint64 = 640
-const Default_GoTest_F_Uint32Defaulted uint32 = 3200
-const Default_GoTest_F_Uint64Defaulted uint64 = 6400
-const Default_GoTest_F_FloatDefaulted float32 = 314159
-const Default_GoTest_F_DoubleDefaulted float64 = 271828
-const Default_GoTest_F_StringDefaulted string = "hello, \"world!\"\n"
-
-var Default_GoTest_F_BytesDefaulted []byte = []byte("Bignose")
-
-const Default_GoTest_F_Sint32Defaulted int32 = -32
-const Default_GoTest_F_Sint64Defaulted int64 = -64
-
-func (m *GoTest) GetKind() GoTest_KIND {
-	if m != nil && m.Kind != nil {
-		return *m.Kind
-	}
-	return GoTest_VOID
-}
-
-func (m *GoTest) GetTable() string {
-	if m != nil && m.Table != nil {
-		return *m.Table
-	}
-	return ""
-}
-
-func (m *GoTest) GetParam() int32 {
-	if m != nil && m.Param != nil {
-		return *m.Param
-	}
-	return 0
-}
-
-func (m *GoTest) GetRequiredField() *GoTestField {
-	if m != nil {
-		return m.RequiredField
-	}
-	return nil
-}
-
-func (m *GoTest) GetRepeatedField() []*GoTestField {
-	if m != nil {
-		return m.RepeatedField
-	}
-	return nil
-}
-
-func (m *GoTest) GetOptionalField() *GoTestField {
-	if m != nil {
-		return m.OptionalField
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_BoolRequired() bool {
-	if m != nil && m.F_BoolRequired != nil {
-		return *m.F_BoolRequired
-	}
-	return false
-}
-
-func (m *GoTest) GetF_Int32Required() int32 {
-	if m != nil && m.F_Int32Required != nil {
-		return *m.F_Int32Required
-	}
-	return 0
-}
-
-func (m *GoTest) GetF_Int64Required() int64 {
-	if m != nil && m.F_Int64Required != nil {
-		return *m.F_Int64Required
-	}
-	return 0
-}
-
-func (m *GoTest) GetF_Fixed32Required() uint32 {
-	if m != nil && m.F_Fixed32Required != nil {
-		return *m.F_Fixed32Required
-	}
-	return 0
-}
-
-func (m *GoTest) GetF_Fixed64Required() uint64 {
-	if m != nil && m.F_Fixed64Required != nil {
-		return *m.F_Fixed64Required
-	}
-	return 0
-}
-
-func (m *GoTest) GetF_Uint32Required() uint32 {
-	if m != nil && m.F_Uint32Required != nil {
-		return *m.F_Uint32Required
-	}
-	return 0
-}
-
-func (m *GoTest) GetF_Uint64Required() uint64 {
-	if m != nil && m.F_Uint64Required != nil {
-		return *m.F_Uint64Required
-	}
-	return 0
-}
-
-func (m *GoTest) GetF_FloatRequired() float32 {
-	if m != nil && m.F_FloatRequired != nil {
-		return *m.F_FloatRequired
-	}
-	return 0
-}
-
-func (m *GoTest) GetF_DoubleRequired() float64 {
-	if m != nil && m.F_DoubleRequired != nil {
-		return *m.F_DoubleRequired
-	}
-	return 0
-}
-
-func (m *GoTest) GetF_StringRequired() string {
-	if m != nil && m.F_StringRequired != nil {
-		return *m.F_StringRequired
-	}
-	return ""
-}
-
-func (m *GoTest) GetF_BytesRequired() []byte {
-	if m != nil {
-		return m.F_BytesRequired
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_Sint32Required() int32 {
-	if m != nil && m.F_Sint32Required != nil {
-		return *m.F_Sint32Required
-	}
-	return 0
-}
-
-func (m *GoTest) GetF_Sint64Required() int64 {
-	if m != nil && m.F_Sint64Required != nil {
-		return *m.F_Sint64Required
-	}
-	return 0
-}
-
-func (m *GoTest) GetF_BoolRepeated() []bool {
-	if m != nil {
-		return m.F_BoolRepeated
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_Int32Repeated() []int32 {
-	if m != nil {
-		return m.F_Int32Repeated
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_Int64Repeated() []int64 {
-	if m != nil {
-		return m.F_Int64Repeated
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_Fixed32Repeated() []uint32 {
-	if m != nil {
-		return m.F_Fixed32Repeated
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_Fixed64Repeated() []uint64 {
-	if m != nil {
-		return m.F_Fixed64Repeated
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_Uint32Repeated() []uint32 {
-	if m != nil {
-		return m.F_Uint32Repeated
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_Uint64Repeated() []uint64 {
-	if m != nil {
-		return m.F_Uint64Repeated
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_FloatRepeated() []float32 {
-	if m != nil {
-		return m.F_FloatRepeated
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_DoubleRepeated() []float64 {
-	if m != nil {
-		return m.F_DoubleRepeated
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_StringRepeated() []string {
-	if m != nil {
-		return m.F_StringRepeated
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_BytesRepeated() [][]byte {
-	if m != nil {
-		return m.F_BytesRepeated
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_Sint32Repeated() []int32 {
-	if m != nil {
-		return m.F_Sint32Repeated
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_Sint64Repeated() []int64 {
-	if m != nil {
-		return m.F_Sint64Repeated
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_BoolOptional() bool {
-	if m != nil && m.F_BoolOptional != nil {
-		return *m.F_BoolOptional
-	}
-	return false
-}
-
-func (m *GoTest) GetF_Int32Optional() int32 {
-	if m != nil && m.F_Int32Optional != nil {
-		return *m.F_Int32Optional
-	}
-	return 0
-}
-
-func (m *GoTest) GetF_Int64Optional() int64 {
-	if m != nil && m.F_Int64Optional != nil {
-		return *m.F_Int64Optional
-	}
-	return 0
-}
-
-func (m *GoTest) GetF_Fixed32Optional() uint32 {
-	if m != nil && m.F_Fixed32Optional != nil {
-		return *m.F_Fixed32Optional
-	}
-	return 0
-}
-
-func (m *GoTest) GetF_Fixed64Optional() uint64 {
-	if m != nil && m.F_Fixed64Optional != nil {
-		return *m.F_Fixed64Optional
-	}
-	return 0
-}
-
-func (m *GoTest) GetF_Uint32Optional() uint32 {
-	if m != nil && m.F_Uint32Optional != nil {
-		return *m.F_Uint32Optional
-	}
-	return 0
-}
-
-func (m *GoTest) GetF_Uint64Optional() uint64 {
-	if m != nil && m.F_Uint64Optional != nil {
-		return *m.F_Uint64Optional
-	}
-	return 0
-}
-
-func (m *GoTest) GetF_FloatOptional() float32 {
-	if m != nil && m.F_FloatOptional != nil {
-		return *m.F_FloatOptional
-	}
-	return 0
-}
-
-func (m *GoTest) GetF_DoubleOptional() float64 {
-	if m != nil && m.F_DoubleOptional != nil {
-		return *m.F_DoubleOptional
-	}
-	return 0
-}
-
-func (m *GoTest) GetF_StringOptional() string {
-	if m != nil && m.F_StringOptional != nil {
-		return *m.F_StringOptional
-	}
-	return ""
-}
-
-func (m *GoTest) GetF_BytesOptional() []byte {
-	if m != nil {
-		return m.F_BytesOptional
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_Sint32Optional() int32 {
-	if m != nil && m.F_Sint32Optional != nil {
-		return *m.F_Sint32Optional
-	}
-	return 0
-}
-
-func (m *GoTest) GetF_Sint64Optional() int64 {
-	if m != nil && m.F_Sint64Optional != nil {
-		return *m.F_Sint64Optional
-	}
-	return 0
-}
-
-func (m *GoTest) GetF_BoolDefaulted() bool {
-	if m != nil && m.F_BoolDefaulted != nil {
-		return *m.F_BoolDefaulted
-	}
-	return Default_GoTest_F_BoolDefaulted
-}
-
-func (m *GoTest) GetF_Int32Defaulted() int32 {
-	if m != nil && m.F_Int32Defaulted != nil {
-		return *m.F_Int32Defaulted
-	}
-	return Default_GoTest_F_Int32Defaulted
-}
-
-func (m *GoTest) GetF_Int64Defaulted() int64 {
-	if m != nil && m.F_Int64Defaulted != nil {
-		return *m.F_Int64Defaulted
-	}
-	return Default_GoTest_F_Int64Defaulted
-}
-
-func (m *GoTest) GetF_Fixed32Defaulted() uint32 {
-	if m != nil && m.F_Fixed32Defaulted != nil {
-		return *m.F_Fixed32Defaulted
-	}
-	return Default_GoTest_F_Fixed32Defaulted
-}
-
-func (m *GoTest) GetF_Fixed64Defaulted() uint64 {
-	if m != nil && m.F_Fixed64Defaulted != nil {
-		return *m.F_Fixed64Defaulted
-	}
-	return Default_GoTest_F_Fixed64Defaulted
-}
-
-func (m *GoTest) GetF_Uint32Defaulted() uint32 {
-	if m != nil && m.F_Uint32Defaulted != nil {
-		return *m.F_Uint32Defaulted
-	}
-	return Default_GoTest_F_Uint32Defaulted
-}
-
-func (m *GoTest) GetF_Uint64Defaulted() uint64 {
-	if m != nil && m.F_Uint64Defaulted != nil {
-		return *m.F_Uint64Defaulted
-	}
-	return Default_GoTest_F_Uint64Defaulted
-}
-
-func (m *GoTest) GetF_FloatDefaulted() float32 {
-	if m != nil && m.F_FloatDefaulted != nil {
-		return *m.F_FloatDefaulted
-	}
-	return Default_GoTest_F_FloatDefaulted
-}
-
-func (m *GoTest) GetF_DoubleDefaulted() float64 {
-	if m != nil && m.F_DoubleDefaulted != nil {
-		return *m.F_DoubleDefaulted
-	}
-	return Default_GoTest_F_DoubleDefaulted
-}
-
-func (m *GoTest) GetF_StringDefaulted() string {
-	if m != nil && m.F_StringDefaulted != nil {
-		return *m.F_StringDefaulted
-	}
-	return Default_GoTest_F_StringDefaulted
-}
-
-func (m *GoTest) GetF_BytesDefaulted() []byte {
-	if m != nil && m.F_BytesDefaulted != nil {
-		return m.F_BytesDefaulted
-	}
-	return append([]byte(nil), Default_GoTest_F_BytesDefaulted...)
-}
-
-func (m *GoTest) GetF_Sint32Defaulted() int32 {
-	if m != nil && m.F_Sint32Defaulted != nil {
-		return *m.F_Sint32Defaulted
-	}
-	return Default_GoTest_F_Sint32Defaulted
-}
-
-func (m *GoTest) GetF_Sint64Defaulted() int64 {
-	if m != nil && m.F_Sint64Defaulted != nil {
-		return *m.F_Sint64Defaulted
-	}
-	return Default_GoTest_F_Sint64Defaulted
-}
-
-func (m *GoTest) GetF_BoolRepeatedPacked() []bool {
-	if m != nil {
-		return m.F_BoolRepeatedPacked
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_Int32RepeatedPacked() []int32 {
-	if m != nil {
-		return m.F_Int32RepeatedPacked
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_Int64RepeatedPacked() []int64 {
-	if m != nil {
-		return m.F_Int64RepeatedPacked
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_Fixed32RepeatedPacked() []uint32 {
-	if m != nil {
-		return m.F_Fixed32RepeatedPacked
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_Fixed64RepeatedPacked() []uint64 {
-	if m != nil {
-		return m.F_Fixed64RepeatedPacked
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_Uint32RepeatedPacked() []uint32 {
-	if m != nil {
-		return m.F_Uint32RepeatedPacked
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_Uint64RepeatedPacked() []uint64 {
-	if m != nil {
-		return m.F_Uint64RepeatedPacked
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_FloatRepeatedPacked() []float32 {
-	if m != nil {
-		return m.F_FloatRepeatedPacked
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_DoubleRepeatedPacked() []float64 {
-	if m != nil {
-		return m.F_DoubleRepeatedPacked
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_Sint32RepeatedPacked() []int32 {
-	if m != nil {
-		return m.F_Sint32RepeatedPacked
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_Sint64RepeatedPacked() []int64 {
-	if m != nil {
-		return m.F_Sint64RepeatedPacked
-	}
-	return nil
-}
-
-func (m *GoTest) GetRequiredgroup() *GoTest_RequiredGroup {
-	if m != nil {
-		return m.Requiredgroup
-	}
-	return nil
-}
-
-func (m *GoTest) GetRepeatedgroup() []*GoTest_RepeatedGroup {
-	if m != nil {
-		return m.Repeatedgroup
-	}
-	return nil
-}
-
-func (m *GoTest) GetOptionalgroup() *GoTest_OptionalGroup {
-	if m != nil {
-		return m.Optionalgroup
-	}
-	return nil
-}
-
-// Required, repeated, and optional groups.
-type GoTest_RequiredGroup struct {
-	RequiredField    *string `protobuf:"bytes,71,req" json:"RequiredField,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *GoTest_RequiredGroup) Reset()         { *m = GoTest_RequiredGroup{} }
-func (m *GoTest_RequiredGroup) String() string { return proto.CompactTextString(m) }
-func (*GoTest_RequiredGroup) ProtoMessage()    {}
-
-func (m *GoTest_RequiredGroup) GetRequiredField() string {
-	if m != nil && m.RequiredField != nil {
-		return *m.RequiredField
-	}
-	return ""
-}
-
-type GoTest_RepeatedGroup struct {
-	RequiredField    *string `protobuf:"bytes,81,req" json:"RequiredField,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *GoTest_RepeatedGroup) Reset()         { *m = GoTest_RepeatedGroup{} }
-func (m *GoTest_RepeatedGroup) String() string { return proto.CompactTextString(m) }
-func (*GoTest_RepeatedGroup) ProtoMessage()    {}
-
-func (m *GoTest_RepeatedGroup) GetRequiredField() string {
-	if m != nil && m.RequiredField != nil {
-		return *m.RequiredField
-	}
-	return ""
-}
-
-type GoTest_OptionalGroup struct {
-	RequiredField    *string `protobuf:"bytes,91,req" json:"RequiredField,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *GoTest_OptionalGroup) Reset()         { *m = GoTest_OptionalGroup{} }
-func (m *GoTest_OptionalGroup) String() string { return proto.CompactTextString(m) }
-func (*GoTest_OptionalGroup) ProtoMessage()    {}
-
-func (m *GoTest_OptionalGroup) GetRequiredField() string {
-	if m != nil && m.RequiredField != nil {
-		return *m.RequiredField
-	}
-	return ""
-}
-
-// For testing skipping of unrecognized fields.
-// Numbers are all big, larger than tag numbers in GoTestField,
-// the message used in the corresponding test.
-type GoSkipTest struct {
-	SkipInt32        *int32                `protobuf:"varint,11,req,name=skip_int32" json:"skip_int32,omitempty"`
-	SkipFixed32      *uint32               `protobuf:"fixed32,12,req,name=skip_fixed32" json:"skip_fixed32,omitempty"`
-	SkipFixed64      *uint64               `protobuf:"fixed64,13,req,name=skip_fixed64" json:"skip_fixed64,omitempty"`
-	SkipString       *string               `protobuf:"bytes,14,req,name=skip_string" json:"skip_string,omitempty"`
-	Skipgroup        *GoSkipTest_SkipGroup `protobuf:"group,15,req,name=SkipGroup" json:"skipgroup,omitempty"`
-	XXX_unrecognized []byte                `json:"-"`
-}
-
-func (m *GoSkipTest) Reset()         { *m = GoSkipTest{} }
-func (m *GoSkipTest) String() string { return proto.CompactTextString(m) }
-func (*GoSkipTest) ProtoMessage()    {}
-
-func (m *GoSkipTest) GetSkipInt32() int32 {
-	if m != nil && m.SkipInt32 != nil {
-		return *m.SkipInt32
-	}
-	return 0
-}
-
-func (m *GoSkipTest) GetSkipFixed32() uint32 {
-	if m != nil && m.SkipFixed32 != nil {
-		return *m.SkipFixed32
-	}
-	return 0
-}
-
-func (m *GoSkipTest) GetSkipFixed64() uint64 {
-	if m != nil && m.SkipFixed64 != nil {
-		return *m.SkipFixed64
-	}
-	return 0
-}
-
-func (m *GoSkipTest) GetSkipString() string {
-	if m != nil && m.SkipString != nil {
-		return *m.SkipString
-	}
-	return ""
-}
-
-func (m *GoSkipTest) GetSkipgroup() *GoSkipTest_SkipGroup {
-	if m != nil {
-		return m.Skipgroup
-	}
-	return nil
-}
-
-type GoSkipTest_SkipGroup struct {
-	GroupInt32       *int32  `protobuf:"varint,16,req,name=group_int32" json:"group_int32,omitempty"`
-	GroupString      *string `protobuf:"bytes,17,req,name=group_string" json:"group_string,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *GoSkipTest_SkipGroup) Reset()         { *m = GoSkipTest_SkipGroup{} }
-func (m *GoSkipTest_SkipGroup) String() string { return proto.CompactTextString(m) }
-func (*GoSkipTest_SkipGroup) ProtoMessage()    {}
-
-func (m *GoSkipTest_SkipGroup) GetGroupInt32() int32 {
-	if m != nil && m.GroupInt32 != nil {
-		return *m.GroupInt32
-	}
-	return 0
-}
-
-func (m *GoSkipTest_SkipGroup) GetGroupString() string {
-	if m != nil && m.GroupString != nil {
-		return *m.GroupString
-	}
-	return ""
-}
-
-// For testing packed/non-packed decoder switching.
-// A serialized instance of one should be deserializable as the other.
-type NonPackedTest struct {
-	A                []int32 `protobuf:"varint,1,rep,name=a" json:"a,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *NonPackedTest) Reset()         { *m = NonPackedTest{} }
-func (m *NonPackedTest) String() string { return proto.CompactTextString(m) }
-func (*NonPackedTest) ProtoMessage()    {}
-
-func (m *NonPackedTest) GetA() []int32 {
-	if m != nil {
-		return m.A
-	}
-	return nil
-}
-
-type PackedTest struct {
-	B                []int32 `protobuf:"varint,1,rep,packed,name=b" json:"b,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *PackedTest) Reset()         { *m = PackedTest{} }
-func (m *PackedTest) String() string { return proto.CompactTextString(m) }
-func (*PackedTest) ProtoMessage()    {}
-
-func (m *PackedTest) GetB() []int32 {
-	if m != nil {
-		return m.B
-	}
-	return nil
-}
-
-type MaxTag struct {
-	// Maximum possible tag number.
-	LastField        *string `protobuf:"bytes,536870911,opt,name=last_field" json:"last_field,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *MaxTag) Reset()         { *m = MaxTag{} }
-func (m *MaxTag) String() string { return proto.CompactTextString(m) }
-func (*MaxTag) ProtoMessage()    {}
-
-func (m *MaxTag) GetLastField() string {
-	if m != nil && m.LastField != nil {
-		return *m.LastField
-	}
-	return ""
-}
-
-type OldMessage struct {
-	Nested           *OldMessage_Nested `protobuf:"bytes,1,opt,name=nested" json:"nested,omitempty"`
-	Num              *int32             `protobuf:"varint,2,opt,name=num" json:"num,omitempty"`
-	XXX_unrecognized []byte             `json:"-"`
-}
-
-func (m *OldMessage) Reset()         { *m = OldMessage{} }
-func (m *OldMessage) String() string { return proto.CompactTextString(m) }
-func (*OldMessage) ProtoMessage()    {}
-
-func (m *OldMessage) GetNested() *OldMessage_Nested {
-	if m != nil {
-		return m.Nested
-	}
-	return nil
-}
-
-func (m *OldMessage) GetNum() int32 {
-	if m != nil && m.Num != nil {
-		return *m.Num
-	}
-	return 0
-}
-
-type OldMessage_Nested struct {
-	Name             *string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *OldMessage_Nested) Reset()         { *m = OldMessage_Nested{} }
-func (m *OldMessage_Nested) String() string { return proto.CompactTextString(m) }
-func (*OldMessage_Nested) ProtoMessage()    {}
-
-func (m *OldMessage_Nested) GetName() string {
-	if m != nil && m.Name != nil {
-		return *m.Name
-	}
-	return ""
-}
-
-// NewMessage is wire compatible with OldMessage;
-// imagine it as a future version.
-type NewMessage struct {
-	Nested *NewMessage_Nested `protobuf:"bytes,1,opt,name=nested" json:"nested,omitempty"`
-	// This is an int32 in OldMessage.
-	Num              *int64 `protobuf:"varint,2,opt,name=num" json:"num,omitempty"`
-	XXX_unrecognized []byte `json:"-"`
-}
-
-func (m *NewMessage) Reset()         { *m = NewMessage{} }
-func (m *NewMessage) String() string { return proto.CompactTextString(m) }
-func (*NewMessage) ProtoMessage()    {}
-
-func (m *NewMessage) GetNested() *NewMessage_Nested {
-	if m != nil {
-		return m.Nested
-	}
-	return nil
-}
-
-func (m *NewMessage) GetNum() int64 {
-	if m != nil && m.Num != nil {
-		return *m.Num
-	}
-	return 0
-}
-
-type NewMessage_Nested struct {
-	Name             *string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
-	FoodGroup        *string `protobuf:"bytes,2,opt,name=food_group" json:"food_group,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *NewMessage_Nested) Reset()         { *m = NewMessage_Nested{} }
-func (m *NewMessage_Nested) String() string { return proto.CompactTextString(m) }
-func (*NewMessage_Nested) ProtoMessage()    {}
-
-func (m *NewMessage_Nested) GetName() string {
-	if m != nil && m.Name != nil {
-		return *m.Name
-	}
-	return ""
-}
-
-func (m *NewMessage_Nested) GetFoodGroup() string {
-	if m != nil && m.FoodGroup != nil {
-		return *m.FoodGroup
-	}
-	return ""
-}
-
-type InnerMessage struct {
-	Host             *string `protobuf:"bytes,1,req,name=host" json:"host,omitempty"`
-	Port             *int32  `protobuf:"varint,2,opt,name=port,def=4000" json:"port,omitempty"`
-	Connected        *bool   `protobuf:"varint,3,opt,name=connected" json:"connected,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *InnerMessage) Reset()         { *m = InnerMessage{} }
-func (m *InnerMessage) String() string { return proto.CompactTextString(m) }
-func (*InnerMessage) ProtoMessage()    {}
-
-const Default_InnerMessage_Port int32 = 4000
-
-func (m *InnerMessage) GetHost() string {
-	if m != nil && m.Host != nil {
-		return *m.Host
-	}
-	return ""
-}
-
-func (m *InnerMessage) GetPort() int32 {
-	if m != nil && m.Port != nil {
-		return *m.Port
-	}
-	return Default_InnerMessage_Port
-}
-
-func (m *InnerMessage) GetConnected() bool {
-	if m != nil && m.Connected != nil {
-		return *m.Connected
-	}
-	return false
-}
-
-type OtherMessage struct {
-	Key              *int64        `protobuf:"varint,1,opt,name=key" json:"key,omitempty"`
-	Value            []byte        `protobuf:"bytes,2,opt,name=value" json:"value,omitempty"`
-	Weight           *float32      `protobuf:"fixed32,3,opt,name=weight" json:"weight,omitempty"`
-	Inner            *InnerMessage `protobuf:"bytes,4,opt,name=inner" json:"inner,omitempty"`
-	XXX_unrecognized []byte        `json:"-"`
-}
-
-func (m *OtherMessage) Reset()         { *m = OtherMessage{} }
-func (m *OtherMessage) String() string { return proto.CompactTextString(m) }
-func (*OtherMessage) ProtoMessage()    {}
-
-func (m *OtherMessage) GetKey() int64 {
-	if m != nil && m.Key != nil {
-		return *m.Key
-	}
-	return 0
-}
-
-func (m *OtherMessage) GetValue() []byte {
-	if m != nil {
-		return m.Value
-	}
-	return nil
-}
-
-func (m *OtherMessage) GetWeight() float32 {
-	if m != nil && m.Weight != nil {
-		return *m.Weight
-	}
-	return 0
-}
-
-func (m *OtherMessage) GetInner() *InnerMessage {
-	if m != nil {
-		return m.Inner
-	}
-	return nil
-}
-
-type MyMessage struct {
-	Count     *int32               `protobuf:"varint,1,req,name=count" json:"count,omitempty"`
-	Name      *string              `protobuf:"bytes,2,opt,name=name" json:"name,omitempty"`
-	Quote     *string              `protobuf:"bytes,3,opt,name=quote" json:"quote,omitempty"`
-	Pet       []string             `protobuf:"bytes,4,rep,name=pet" json:"pet,omitempty"`
-	Inner     *InnerMessage        `protobuf:"bytes,5,opt,name=inner" json:"inner,omitempty"`
-	Others    []*OtherMessage      `protobuf:"bytes,6,rep,name=others" json:"others,omitempty"`
-	RepInner  []*InnerMessage      `protobuf:"bytes,12,rep,name=rep_inner" json:"rep_inner,omitempty"`
-	Bikeshed  *MyMessage_Color     `protobuf:"varint,7,opt,name=bikeshed,enum=testdata.MyMessage_Color" json:"bikeshed,omitempty"`
-	Somegroup *MyMessage_SomeGroup `protobuf:"group,8,opt,name=SomeGroup" json:"somegroup,omitempty"`
-	// This field becomes [][]byte in the generated code.
-	RepBytes         [][]byte                  `protobuf:"bytes,10,rep,name=rep_bytes" json:"rep_bytes,omitempty"`
-	Bigfloat         *float64                  `protobuf:"fixed64,11,opt,name=bigfloat" json:"bigfloat,omitempty"`
-	XXX_extensions   map[int32]proto.Extension `json:"-"`
-	XXX_unrecognized []byte                    `json:"-"`
-}
-
-func (m *MyMessage) Reset()         { *m = MyMessage{} }
-func (m *MyMessage) String() string { return proto.CompactTextString(m) }
-func (*MyMessage) ProtoMessage()    {}
-
-var extRange_MyMessage = []proto.ExtensionRange{
-	{100, 536870911},
-}
-
-func (*MyMessage) ExtensionRangeArray() []proto.ExtensionRange {
-	return extRange_MyMessage
-}
-func (m *MyMessage) ExtensionMap() map[int32]proto.Extension {
-	if m.XXX_extensions == nil {
-		m.XXX_extensions = make(map[int32]proto.Extension)
-	}
-	return m.XXX_extensions
-}
-
-func (m *MyMessage) GetCount() int32 {
-	if m != nil && m.Count != nil {
-		return *m.Count
-	}
-	return 0
-}
-
-func (m *MyMessage) GetName() string {
-	if m != nil && m.Name != nil {
-		return *m.Name
-	}
-	return ""
-}
-
-func (m *MyMessage) GetQuote() string {
-	if m != nil && m.Quote != nil {
-		return *m.Quote
-	}
-	return ""
-}
-
-func (m *MyMessage) GetPet() []string {
-	if m != nil {
-		return m.Pet
-	}
-	return nil
-}
-
-func (m *MyMessage) GetInner() *InnerMessage {
-	if m != nil {
-		return m.Inner
-	}
-	return nil
-}
-
-func (m *MyMessage) GetOthers() []*OtherMessage {
-	if m != nil {
-		return m.Others
-	}
-	return nil
-}
-
-func (m *MyMessage) GetRepInner() []*InnerMessage {
-	if m != nil {
-		return m.RepInner
-	}
-	return nil
-}
-
-func (m *MyMessage) GetBikeshed() MyMessage_Color {
-	if m != nil && m.Bikeshed != nil {
-		return *m.Bikeshed
-	}
-	return MyMessage_RED
-}
-
-func (m *MyMessage) GetSomegroup() *MyMessage_SomeGroup {
-	if m != nil {
-		return m.Somegroup
-	}
-	return nil
-}
-
-func (m *MyMessage) GetRepBytes() [][]byte {
-	if m != nil {
-		return m.RepBytes
-	}
-	return nil
-}
-
-func (m *MyMessage) GetBigfloat() float64 {
-	if m != nil && m.Bigfloat != nil {
-		return *m.Bigfloat
-	}
-	return 0
-}
-
-type MyMessage_SomeGroup struct {
-	GroupField       *int32 `protobuf:"varint,9,opt,name=group_field" json:"group_field,omitempty"`
-	XXX_unrecognized []byte `json:"-"`
-}
-
-func (m *MyMessage_SomeGroup) Reset()         { *m = MyMessage_SomeGroup{} }
-func (m *MyMessage_SomeGroup) String() string { return proto.CompactTextString(m) }
-func (*MyMessage_SomeGroup) ProtoMessage()    {}
-
-func (m *MyMessage_SomeGroup) GetGroupField() int32 {
-	if m != nil && m.GroupField != nil {
-		return *m.GroupField
-	}
-	return 0
-}
-
-type Ext struct {
-	Data             *string `protobuf:"bytes,1,opt,name=data" json:"data,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *Ext) Reset()         { *m = Ext{} }
-func (m *Ext) String() string { return proto.CompactTextString(m) }
-func (*Ext) ProtoMessage()    {}
-
-func (m *Ext) GetData() string {
-	if m != nil && m.Data != nil {
-		return *m.Data
-	}
-	return ""
-}
-
-var E_Ext_More = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessage)(nil),
-	ExtensionType: (*Ext)(nil),
-	Field:         103,
-	Name:          "testdata.Ext.more",
-	Tag:           "bytes,103,opt,name=more",
-}
-
-var E_Ext_Text = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessage)(nil),
-	ExtensionType: (*string)(nil),
-	Field:         104,
-	Name:          "testdata.Ext.text",
-	Tag:           "bytes,104,opt,name=text",
-}
-
-var E_Ext_Number = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessage)(nil),
-	ExtensionType: (*int32)(nil),
-	Field:         105,
-	Name:          "testdata.Ext.number",
-	Tag:           "varint,105,opt,name=number",
-}
-
-type DefaultsMessage struct {
-	XXX_extensions   map[int32]proto.Extension `json:"-"`
-	XXX_unrecognized []byte                    `json:"-"`
-}
-
-func (m *DefaultsMessage) Reset()         { *m = DefaultsMessage{} }
-func (m *DefaultsMessage) String() string { return proto.CompactTextString(m) }
-func (*DefaultsMessage) ProtoMessage()    {}
-
-var extRange_DefaultsMessage = []proto.ExtensionRange{
-	{100, 536870911},
-}
-
-func (*DefaultsMessage) ExtensionRangeArray() []proto.ExtensionRange {
-	return extRange_DefaultsMessage
-}
-func (m *DefaultsMessage) ExtensionMap() map[int32]proto.Extension {
-	if m.XXX_extensions == nil {
-		m.XXX_extensions = make(map[int32]proto.Extension)
-	}
-	return m.XXX_extensions
-}
-
-type MyMessageSet struct {
-	XXX_extensions   map[int32]proto.Extension `json:"-"`
-	XXX_unrecognized []byte                    `json:"-"`
-}
-
-func (m *MyMessageSet) Reset()         { *m = MyMessageSet{} }
-func (m *MyMessageSet) String() string { return proto.CompactTextString(m) }
-func (*MyMessageSet) ProtoMessage()    {}
-
-func (m *MyMessageSet) Marshal() ([]byte, error) {
-	return proto.MarshalMessageSet(m.ExtensionMap())
-}
-func (m *MyMessageSet) Unmarshal(buf []byte) error {
-	return proto.UnmarshalMessageSet(buf, m.ExtensionMap())
-}
-func (m *MyMessageSet) MarshalJSON() ([]byte, error) {
-	return proto.MarshalMessageSetJSON(m.XXX_extensions)
-}
-func (m *MyMessageSet) UnmarshalJSON(buf []byte) error {
-	return proto.UnmarshalMessageSetJSON(buf, m.XXX_extensions)
-}
-
-// ensure MyMessageSet satisfies proto.Marshaler and proto.Unmarshaler
-var _ proto.Marshaler = (*MyMessageSet)(nil)
-var _ proto.Unmarshaler = (*MyMessageSet)(nil)
-
-var extRange_MyMessageSet = []proto.ExtensionRange{
-	{100, 2147483646},
-}
-
-func (*MyMessageSet) ExtensionRangeArray() []proto.ExtensionRange {
-	return extRange_MyMessageSet
-}
-func (m *MyMessageSet) ExtensionMap() map[int32]proto.Extension {
-	if m.XXX_extensions == nil {
-		m.XXX_extensions = make(map[int32]proto.Extension)
-	}
-	return m.XXX_extensions
-}
-
-type Empty struct {
-	XXX_unrecognized []byte `json:"-"`
-}
-
-func (m *Empty) Reset()         { *m = Empty{} }
-func (m *Empty) String() string { return proto.CompactTextString(m) }
-func (*Empty) ProtoMessage()    {}
-
-type MessageList struct {
-	Message          []*MessageList_Message `protobuf:"group,1,rep" json:"message,omitempty"`
-	XXX_unrecognized []byte                 `json:"-"`
-}
-
-func (m *MessageList) Reset()         { *m = MessageList{} }
-func (m *MessageList) String() string { return proto.CompactTextString(m) }
-func (*MessageList) ProtoMessage()    {}
-
-func (m *MessageList) GetMessage() []*MessageList_Message {
-	if m != nil {
-		return m.Message
-	}
-	return nil
-}
-
-type MessageList_Message struct {
-	Name             *string `protobuf:"bytes,2,req,name=name" json:"name,omitempty"`
-	Count            *int32  `protobuf:"varint,3,req,name=count" json:"count,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *MessageList_Message) Reset()         { *m = MessageList_Message{} }
-func (m *MessageList_Message) String() string { return proto.CompactTextString(m) }
-func (*MessageList_Message) ProtoMessage()    {}
-
-func (m *MessageList_Message) GetName() string {
-	if m != nil && m.Name != nil {
-		return *m.Name
-	}
-	return ""
-}
-
-func (m *MessageList_Message) GetCount() int32 {
-	if m != nil && m.Count != nil {
-		return *m.Count
-	}
-	return 0
-}
-
-type Strings struct {
-	StringField      *string `protobuf:"bytes,1,opt,name=string_field" json:"string_field,omitempty"`
-	BytesField       []byte  `protobuf:"bytes,2,opt,name=bytes_field" json:"bytes_field,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *Strings) Reset()         { *m = Strings{} }
-func (m *Strings) String() string { return proto.CompactTextString(m) }
-func (*Strings) ProtoMessage()    {}
-
-func (m *Strings) GetStringField() string {
-	if m != nil && m.StringField != nil {
-		return *m.StringField
-	}
-	return ""
-}
-
-func (m *Strings) GetBytesField() []byte {
-	if m != nil {
-		return m.BytesField
-	}
-	return nil
-}
-
-type Defaults struct {
-	// Default-valued fields of all basic types.
-	// Same as GoTest, but copied here to make testing easier.
-	F_Bool    *bool           `protobuf:"varint,1,opt,def=1" json:"F_Bool,omitempty"`
-	F_Int32   *int32          `protobuf:"varint,2,opt,def=32" json:"F_Int32,omitempty"`
-	F_Int64   *int64          `protobuf:"varint,3,opt,def=64" json:"F_Int64,omitempty"`
-	F_Fixed32 *uint32         `protobuf:"fixed32,4,opt,def=320" json:"F_Fixed32,omitempty"`
-	F_Fixed64 *uint64         `protobuf:"fixed64,5,opt,def=640" json:"F_Fixed64,omitempty"`
-	F_Uint32  *uint32         `protobuf:"varint,6,opt,def=3200" json:"F_Uint32,omitempty"`
-	F_Uint64  *uint64         `protobuf:"varint,7,opt,def=6400" json:"F_Uint64,omitempty"`
-	F_Float   *float32        `protobuf:"fixed32,8,opt,def=314159" json:"F_Float,omitempty"`
-	F_Double  *float64        `protobuf:"fixed64,9,opt,def=271828" json:"F_Double,omitempty"`
-	F_String  *string         `protobuf:"bytes,10,opt,def=hello, \"world!\"\n" json:"F_String,omitempty"`
-	F_Bytes   []byte          `protobuf:"bytes,11,opt,def=Bignose" json:"F_Bytes,omitempty"`
-	F_Sint32  *int32          `protobuf:"zigzag32,12,opt,def=-32" json:"F_Sint32,omitempty"`
-	F_Sint64  *int64          `protobuf:"zigzag64,13,opt,def=-64" json:"F_Sint64,omitempty"`
-	F_Enum    *Defaults_Color `protobuf:"varint,14,opt,enum=testdata.Defaults_Color,def=1" json:"F_Enum,omitempty"`
-	// More fields with crazy defaults.
-	F_Pinf *float32 `protobuf:"fixed32,15,opt,def=inf" json:"F_Pinf,omitempty"`
-	F_Ninf *float32 `protobuf:"fixed32,16,opt,def=-inf" json:"F_Ninf,omitempty"`
-	F_Nan  *float32 `protobuf:"fixed32,17,opt,def=nan" json:"F_Nan,omitempty"`
-	// Sub-message.
-	Sub *SubDefaults `protobuf:"bytes,18,opt,name=sub" json:"sub,omitempty"`
-	// Redundant but explicit defaults.
-	StrZero          *string `protobuf:"bytes,19,opt,name=str_zero,def=" json:"str_zero,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *Defaults) Reset()         { *m = Defaults{} }
-func (m *Defaults) String() string { return proto.CompactTextString(m) }
-func (*Defaults) ProtoMessage()    {}
-
-const Default_Defaults_F_Bool bool = true
-const Default_Defaults_F_Int32 int32 = 32
-const Default_Defaults_F_Int64 int64 = 64
-const Default_Defaults_F_Fixed32 uint32 = 320
-const Default_Defaults_F_Fixed64 uint64 = 640
-const Default_Defaults_F_Uint32 uint32 = 3200
-const Default_Defaults_F_Uint64 uint64 = 6400
-const Default_Defaults_F_Float float32 = 314159
-const Default_Defaults_F_Double float64 = 271828
-const Default_Defaults_F_String string = "hello, \"world!\"\n"
-
-var Default_Defaults_F_Bytes []byte = []byte("Bignose")
-
-const Default_Defaults_F_Sint32 int32 = -32
-const Default_Defaults_F_Sint64 int64 = -64
-const Default_Defaults_F_Enum Defaults_Color = Defaults_GREEN
-
-var Default_Defaults_F_Pinf float32 = float32(math.Inf(1))
-var Default_Defaults_F_Ninf float32 = float32(math.Inf(-1))
-var Default_Defaults_F_Nan float32 = float32(math.NaN())
-
-func (m *Defaults) GetF_Bool() bool {
-	if m != nil && m.F_Bool != nil {
-		return *m.F_Bool
-	}
-	return Default_Defaults_F_Bool
-}
-
-func (m *Defaults) GetF_Int32() int32 {
-	if m != nil && m.F_Int32 != nil {
-		return *m.F_Int32
-	}
-	return Default_Defaults_F_Int32
-}
-
-func (m *Defaults) GetF_Int64() int64 {
-	if m != nil && m.F_Int64 != nil {
-		return *m.F_Int64
-	}
-	return Default_Defaults_F_Int64
-}
-
-func (m *Defaults) GetF_Fixed32() uint32 {
-	if m != nil && m.F_Fixed32 != nil {
-		return *m.F_Fixed32
-	}
-	return Default_Defaults_F_Fixed32
-}
-
-func (m *Defaults) GetF_Fixed64() uint64 {
-	if m != nil && m.F_Fixed64 != nil {
-		return *m.F_Fixed64
-	}
-	return Default_Defaults_F_Fixed64
-}
-
-func (m *Defaults) GetF_Uint32() uint32 {
-	if m != nil && m.F_Uint32 != nil {
-		return *m.F_Uint32
-	}
-	return Default_Defaults_F_Uint32
-}
-
-func (m *Defaults) GetF_Uint64() uint64 {
-	if m != nil && m.F_Uint64 != nil {
-		return *m.F_Uint64
-	}
-	return Default_Defaults_F_Uint64
-}
-
-func (m *Defaults) GetF_Float() float32 {
-	if m != nil && m.F_Float != nil {
-		return *m.F_Float
-	}
-	return Default_Defaults_F_Float
-}
-
-func (m *Defaults) GetF_Double() float64 {
-	if m != nil && m.F_Double != nil {
-		return *m.F_Double
-	}
-	return Default_Defaults_F_Double
-}
-
-func (m *Defaults) GetF_String() string {
-	if m != nil && m.F_String != nil {
-		return *m.F_String
-	}
-	return Default_Defaults_F_String
-}
-
-func (m *Defaults) GetF_Bytes() []byte {
-	if m != nil && m.F_Bytes != nil {
-		return m.F_Bytes
-	}
-	return append([]byte(nil), Default_Defaults_F_Bytes...)
-}
-
-func (m *Defaults) GetF_Sint32() int32 {
-	if m != nil && m.F_Sint32 != nil {
-		return *m.F_Sint32
-	}
-	return Default_Defaults_F_Sint32
-}
-
-func (m *Defaults) GetF_Sint64() int64 {
-	if m != nil && m.F_Sint64 != nil {
-		return *m.F_Sint64
-	}
-	return Default_Defaults_F_Sint64
-}
-
-func (m *Defaults) GetF_Enum() Defaults_Color {
-	if m != nil && m.F_Enum != nil {
-		return *m.F_Enum
-	}
-	return Default_Defaults_F_Enum
-}
-
-func (m *Defaults) GetF_Pinf() float32 {
-	if m != nil && m.F_Pinf != nil {
-		return *m.F_Pinf
-	}
-	return Default_Defaults_F_Pinf
-}
-
-func (m *Defaults) GetF_Ninf() float32 {
-	if m != nil && m.F_Ninf != nil {
-		return *m.F_Ninf
-	}
-	return Default_Defaults_F_Ninf
-}
-
-func (m *Defaults) GetF_Nan() float32 {
-	if m != nil && m.F_Nan != nil {
-		return *m.F_Nan
-	}
-	return Default_Defaults_F_Nan
-}
-
-func (m *Defaults) GetSub() *SubDefaults {
-	if m != nil {
-		return m.Sub
-	}
-	return nil
-}
-
-func (m *Defaults) GetStrZero() string {
-	if m != nil && m.StrZero != nil {
-		return *m.StrZero
-	}
-	return ""
-}
-
-type SubDefaults struct {
-	N                *int64 `protobuf:"varint,1,opt,name=n,def=7" json:"n,omitempty"`
-	XXX_unrecognized []byte `json:"-"`
-}
-
-func (m *SubDefaults) Reset()         { *m = SubDefaults{} }
-func (m *SubDefaults) String() string { return proto.CompactTextString(m) }
-func (*SubDefaults) ProtoMessage()    {}
-
-const Default_SubDefaults_N int64 = 7
-
-func (m *SubDefaults) GetN() int64 {
-	if m != nil && m.N != nil {
-		return *m.N
-	}
-	return Default_SubDefaults_N
-}
-
-type RepeatedEnum struct {
-	Color            []RepeatedEnum_Color `protobuf:"varint,1,rep,name=color,enum=testdata.RepeatedEnum_Color" json:"color,omitempty"`
-	XXX_unrecognized []byte               `json:"-"`
-}
-
-func (m *RepeatedEnum) Reset()         { *m = RepeatedEnum{} }
-func (m *RepeatedEnum) String() string { return proto.CompactTextString(m) }
-func (*RepeatedEnum) ProtoMessage()    {}
-
-func (m *RepeatedEnum) GetColor() []RepeatedEnum_Color {
-	if m != nil {
-		return m.Color
-	}
-	return nil
-}
-
-type MoreRepeated struct {
-	Bools            []bool   `protobuf:"varint,1,rep,name=bools" json:"bools,omitempty"`
-	BoolsPacked      []bool   `protobuf:"varint,2,rep,packed,name=bools_packed" json:"bools_packed,omitempty"`
-	Ints             []int32  `protobuf:"varint,3,rep,name=ints" json:"ints,omitempty"`
-	IntsPacked       []int32  `protobuf:"varint,4,rep,packed,name=ints_packed" json:"ints_packed,omitempty"`
-	Int64SPacked     []int64  `protobuf:"varint,7,rep,packed,name=int64s_packed" json:"int64s_packed,omitempty"`
-	Strings          []string `protobuf:"bytes,5,rep,name=strings" json:"strings,omitempty"`
-	Fixeds           []uint32 `protobuf:"fixed32,6,rep,name=fixeds" json:"fixeds,omitempty"`
-	XXX_unrecognized []byte   `json:"-"`
-}
-
-func (m *MoreRepeated) Reset()         { *m = MoreRepeated{} }
-func (m *MoreRepeated) String() string { return proto.CompactTextString(m) }
-func (*MoreRepeated) ProtoMessage()    {}
-
-func (m *MoreRepeated) GetBools() []bool {
-	if m != nil {
-		return m.Bools
-	}
-	return nil
-}
-
-func (m *MoreRepeated) GetBoolsPacked() []bool {
-	if m != nil {
-		return m.BoolsPacked
-	}
-	return nil
-}
-
-func (m *MoreRepeated) GetInts() []int32 {
-	if m != nil {
-		return m.Ints
-	}
-	return nil
-}
-
-func (m *MoreRepeated) GetIntsPacked() []int32 {
-	if m != nil {
-		return m.IntsPacked
-	}
-	return nil
-}
-
-func (m *MoreRepeated) GetInt64SPacked() []int64 {
-	if m != nil {
-		return m.Int64SPacked
-	}
-	return nil
-}
-
-func (m *MoreRepeated) GetStrings() []string {
-	if m != nil {
-		return m.Strings
-	}
-	return nil
-}
-
-func (m *MoreRepeated) GetFixeds() []uint32 {
-	if m != nil {
-		return m.Fixeds
-	}
-	return nil
-}
-
-type GroupOld struct {
-	G                *GroupOld_G `protobuf:"group,101,opt" json:"g,omitempty"`
-	XXX_unrecognized []byte      `json:"-"`
-}
-
-func (m *GroupOld) Reset()         { *m = GroupOld{} }
-func (m *GroupOld) String() string { return proto.CompactTextString(m) }
-func (*GroupOld) ProtoMessage()    {}
-
-func (m *GroupOld) GetG() *GroupOld_G {
-	if m != nil {
-		return m.G
-	}
-	return nil
-}
-
-type GroupOld_G struct {
-	X                *int32 `protobuf:"varint,2,opt,name=x" json:"x,omitempty"`
-	XXX_unrecognized []byte `json:"-"`
-}
-
-func (m *GroupOld_G) Reset()         { *m = GroupOld_G{} }
-func (m *GroupOld_G) String() string { return proto.CompactTextString(m) }
-func (*GroupOld_G) ProtoMessage()    {}
-
-func (m *GroupOld_G) GetX() int32 {
-	if m != nil && m.X != nil {
-		return *m.X
-	}
-	return 0
-}
-
-type GroupNew struct {
-	G                *GroupNew_G `protobuf:"group,101,opt" json:"g,omitempty"`
-	XXX_unrecognized []byte      `json:"-"`
-}
-
-func (m *GroupNew) Reset()         { *m = GroupNew{} }
-func (m *GroupNew) String() string { return proto.CompactTextString(m) }
-func (*GroupNew) ProtoMessage()    {}
-
-func (m *GroupNew) GetG() *GroupNew_G {
-	if m != nil {
-		return m.G
-	}
-	return nil
-}
-
-type GroupNew_G struct {
-	X                *int32 `protobuf:"varint,2,opt,name=x" json:"x,omitempty"`
-	Y                *int32 `protobuf:"varint,3,opt,name=y" json:"y,omitempty"`
-	XXX_unrecognized []byte `json:"-"`
-}
-
-func (m *GroupNew_G) Reset()         { *m = GroupNew_G{} }
-func (m *GroupNew_G) String() string { return proto.CompactTextString(m) }
-func (*GroupNew_G) ProtoMessage()    {}
-
-func (m *GroupNew_G) GetX() int32 {
-	if m != nil && m.X != nil {
-		return *m.X
-	}
-	return 0
-}
-
-func (m *GroupNew_G) GetY() int32 {
-	if m != nil && m.Y != nil {
-		return *m.Y
-	}
-	return 0
-}
-
-type FloatingPoint struct {
-	F                *float64 `protobuf:"fixed64,1,req,name=f" json:"f,omitempty"`
-	XXX_unrecognized []byte   `json:"-"`
-}
-
-func (m *FloatingPoint) Reset()         { *m = FloatingPoint{} }
-func (m *FloatingPoint) String() string { return proto.CompactTextString(m) }
-func (*FloatingPoint) ProtoMessage()    {}
-
-func (m *FloatingPoint) GetF() float64 {
-	if m != nil && m.F != nil {
-		return *m.F
-	}
-	return 0
-}
-
-type MessageWithMap struct {
-	NameMapping      map[int32]string         `protobuf:"bytes,1,rep,name=name_mapping" json:"name_mapping,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
-	MsgMapping       map[int64]*FloatingPoint `protobuf:"bytes,2,rep,name=msg_mapping" json:"msg_mapping,omitempty" protobuf_key:"zigzag64,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
-	ByteMapping      map[bool][]byte          `protobuf:"bytes,3,rep,name=byte_mapping" json:"byte_mapping,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
-	StrToStr         map[string]string        `protobuf:"bytes,4,rep,name=str_to_str" json:"str_to_str,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
-	XXX_unrecognized []byte                   `json:"-"`
-}
-
-func (m *MessageWithMap) Reset()         { *m = MessageWithMap{} }
-func (m *MessageWithMap) String() string { return proto.CompactTextString(m) }
-func (*MessageWithMap) ProtoMessage()    {}
-
-func (m *MessageWithMap) GetNameMapping() map[int32]string {
-	if m != nil {
-		return m.NameMapping
-	}
-	return nil
-}
-
-func (m *MessageWithMap) GetMsgMapping() map[int64]*FloatingPoint {
-	if m != nil {
-		return m.MsgMapping
-	}
-	return nil
-}
-
-func (m *MessageWithMap) GetByteMapping() map[bool][]byte {
-	if m != nil {
-		return m.ByteMapping
-	}
-	return nil
-}
-
-func (m *MessageWithMap) GetStrToStr() map[string]string {
-	if m != nil {
-		return m.StrToStr
-	}
-	return nil
-}
-
-var E_Greeting = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessage)(nil),
-	ExtensionType: ([]string)(nil),
-	Field:         106,
-	Name:          "testdata.greeting",
-	Tag:           "bytes,106,rep,name=greeting",
-}
-
-var E_NoDefaultDouble = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: (*float64)(nil),
-	Field:         101,
-	Name:          "testdata.no_default_double",
-	Tag:           "fixed64,101,opt,name=no_default_double",
-}
-
-var E_NoDefaultFloat = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: (*float32)(nil),
-	Field:         102,
-	Name:          "testdata.no_default_float",
-	Tag:           "fixed32,102,opt,name=no_default_float",
-}
-
-var E_NoDefaultInt32 = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: (*int32)(nil),
-	Field:         103,
-	Name:          "testdata.no_default_int32",
-	Tag:           "varint,103,opt,name=no_default_int32",
-}
-
-var E_NoDefaultInt64 = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: (*int64)(nil),
-	Field:         104,
-	Name:          "testdata.no_default_int64",
-	Tag:           "varint,104,opt,name=no_default_int64",
-}
-
-var E_NoDefaultUint32 = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: (*uint32)(nil),
-	Field:         105,
-	Name:          "testdata.no_default_uint32",
-	Tag:           "varint,105,opt,name=no_default_uint32",
-}
-
-var E_NoDefaultUint64 = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: (*uint64)(nil),
-	Field:         106,
-	Name:          "testdata.no_default_uint64",
-	Tag:           "varint,106,opt,name=no_default_uint64",
-}
-
-var E_NoDefaultSint32 = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: (*int32)(nil),
-	Field:         107,
-	Name:          "testdata.no_default_sint32",
-	Tag:           "zigzag32,107,opt,name=no_default_sint32",
-}
-
-var E_NoDefaultSint64 = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: (*int64)(nil),
-	Field:         108,
-	Name:          "testdata.no_default_sint64",
-	Tag:           "zigzag64,108,opt,name=no_default_sint64",
-}
-
-var E_NoDefaultFixed32 = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: (*uint32)(nil),
-	Field:         109,
-	Name:          "testdata.no_default_fixed32",
-	Tag:           "fixed32,109,opt,name=no_default_fixed32",
-}
-
-var E_NoDefaultFixed64 = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: (*uint64)(nil),
-	Field:         110,
-	Name:          "testdata.no_default_fixed64",
-	Tag:           "fixed64,110,opt,name=no_default_fixed64",
-}
-
-var E_NoDefaultSfixed32 = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: (*int32)(nil),
-	Field:         111,
-	Name:          "testdata.no_default_sfixed32",
-	Tag:           "fixed32,111,opt,name=no_default_sfixed32",
-}
-
-var E_NoDefaultSfixed64 = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: (*int64)(nil),
-	Field:         112,
-	Name:          "testdata.no_default_sfixed64",
-	Tag:           "fixed64,112,opt,name=no_default_sfixed64",
-}
-
-var E_NoDefaultBool = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: (*bool)(nil),
-	Field:         113,
-	Name:          "testdata.no_default_bool",
-	Tag:           "varint,113,opt,name=no_default_bool",
-}
-
-var E_NoDefaultString = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: (*string)(nil),
-	Field:         114,
-	Name:          "testdata.no_default_string",
-	Tag:           "bytes,114,opt,name=no_default_string",
-}
-
-var E_NoDefaultBytes = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: ([]byte)(nil),
-	Field:         115,
-	Name:          "testdata.no_default_bytes",
-	Tag:           "bytes,115,opt,name=no_default_bytes",
-}
-
-var E_NoDefaultEnum = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: (*DefaultsMessage_DefaultsEnum)(nil),
-	Field:         116,
-	Name:          "testdata.no_default_enum",
-	Tag:           "varint,116,opt,name=no_default_enum,enum=testdata.DefaultsMessage_DefaultsEnum",
-}
-
-var E_DefaultDouble = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: (*float64)(nil),
-	Field:         201,
-	Name:          "testdata.default_double",
-	Tag:           "fixed64,201,opt,name=default_double,def=3.1415",
-}
-
-var E_DefaultFloat = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: (*float32)(nil),
-	Field:         202,
-	Name:          "testdata.default_float",
-	Tag:           "fixed32,202,opt,name=default_float,def=3.14",
-}
-
-var E_DefaultInt32 = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: (*int32)(nil),
-	Field:         203,
-	Name:          "testdata.default_int32",
-	Tag:           "varint,203,opt,name=default_int32,def=42",
-}
-
-var E_DefaultInt64 = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: (*int64)(nil),
-	Field:         204,
-	Name:          "testdata.default_int64",
-	Tag:           "varint,204,opt,name=default_int64,def=43",
-}
-
-var E_DefaultUint32 = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: (*uint32)(nil),
-	Field:         205,
-	Name:          "testdata.default_uint32",
-	Tag:           "varint,205,opt,name=default_uint32,def=44",
-}
-
-var E_DefaultUint64 = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: (*uint64)(nil),
-	Field:         206,
-	Name:          "testdata.default_uint64",
-	Tag:           "varint,206,opt,name=default_uint64,def=45",
-}
-
-var E_DefaultSint32 = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: (*int32)(nil),
-	Field:         207,
-	Name:          "testdata.default_sint32",
-	Tag:           "zigzag32,207,opt,name=default_sint32,def=46",
-}
-
-var E_DefaultSint64 = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: (*int64)(nil),
-	Field:         208,
-	Name:          "testdata.default_sint64",
-	Tag:           "zigzag64,208,opt,name=default_sint64,def=47",
-}
-
-var E_DefaultFixed32 = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: (*uint32)(nil),
-	Field:         209,
-	Name:          "testdata.default_fixed32",
-	Tag:           "fixed32,209,opt,name=default_fixed32,def=48",
-}
-
-var E_DefaultFixed64 = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: (*uint64)(nil),
-	Field:         210,
-	Name:          "testdata.default_fixed64",
-	Tag:           "fixed64,210,opt,name=default_fixed64,def=49",
-}
-
-var E_DefaultSfixed32 = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: (*int32)(nil),
-	Field:         211,
-	Name:          "testdata.default_sfixed32",
-	Tag:           "fixed32,211,opt,name=default_sfixed32,def=50",
-}
-
-var E_DefaultSfixed64 = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: (*int64)(nil),
-	Field:         212,
-	Name:          "testdata.default_sfixed64",
-	Tag:           "fixed64,212,opt,name=default_sfixed64,def=51",
-}
-
-var E_DefaultBool = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: (*bool)(nil),
-	Field:         213,
-	Name:          "testdata.default_bool",
-	Tag:           "varint,213,opt,name=default_bool,def=1",
-}
-
-var E_DefaultString = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: (*string)(nil),
-	Field:         214,
-	Name:          "testdata.default_string",
-	Tag:           "bytes,214,opt,name=default_string,def=Hello, string",
-}
-
-var E_DefaultBytes = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: ([]byte)(nil),
-	Field:         215,
-	Name:          "testdata.default_bytes",
-	Tag:           "bytes,215,opt,name=default_bytes,def=Hello, bytes",
-}
-
-var E_DefaultEnum = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: (*DefaultsMessage_DefaultsEnum)(nil),
-	Field:         216,
-	Name:          "testdata.default_enum",
-	Tag:           "varint,216,opt,name=default_enum,enum=testdata.DefaultsMessage_DefaultsEnum,def=1",
-}
-
-var E_X201 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         201,
-	Name:          "testdata.x201",
-	Tag:           "bytes,201,opt,name=x201",
-}
-
-var E_X202 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         202,
-	Name:          "testdata.x202",
-	Tag:           "bytes,202,opt,name=x202",
-}
-
-var E_X203 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         203,
-	Name:          "testdata.x203",
-	Tag:           "bytes,203,opt,name=x203",
-}
-
-var E_X204 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         204,
-	Name:          "testdata.x204",
-	Tag:           "bytes,204,opt,name=x204",
-}
-
-var E_X205 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         205,
-	Name:          "testdata.x205",
-	Tag:           "bytes,205,opt,name=x205",
-}
-
-var E_X206 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         206,
-	Name:          "testdata.x206",
-	Tag:           "bytes,206,opt,name=x206",
-}
-
-var E_X207 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         207,
-	Name:          "testdata.x207",
-	Tag:           "bytes,207,opt,name=x207",
-}
-
-var E_X208 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         208,
-	Name:          "testdata.x208",
-	Tag:           "bytes,208,opt,name=x208",
-}
-
-var E_X209 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         209,
-	Name:          "testdata.x209",
-	Tag:           "bytes,209,opt,name=x209",
-}
-
-var E_X210 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         210,
-	Name:          "testdata.x210",
-	Tag:           "bytes,210,opt,name=x210",
-}
-
-var E_X211 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         211,
-	Name:          "testdata.x211",
-	Tag:           "bytes,211,opt,name=x211",
-}
-
-var E_X212 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         212,
-	Name:          "testdata.x212",
-	Tag:           "bytes,212,opt,name=x212",
-}
-
-var E_X213 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         213,
-	Name:          "testdata.x213",
-	Tag:           "bytes,213,opt,name=x213",
-}
-
-var E_X214 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         214,
-	Name:          "testdata.x214",
-	Tag:           "bytes,214,opt,name=x214",
-}
-
-var E_X215 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         215,
-	Name:          "testdata.x215",
-	Tag:           "bytes,215,opt,name=x215",
-}
-
-var E_X216 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         216,
-	Name:          "testdata.x216",
-	Tag:           "bytes,216,opt,name=x216",
-}
-
-var E_X217 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         217,
-	Name:          "testdata.x217",
-	Tag:           "bytes,217,opt,name=x217",
-}
-
-var E_X218 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         218,
-	Name:          "testdata.x218",
-	Tag:           "bytes,218,opt,name=x218",
-}
-
-var E_X219 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         219,
-	Name:          "testdata.x219",
-	Tag:           "bytes,219,opt,name=x219",
-}
-
-var E_X220 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         220,
-	Name:          "testdata.x220",
-	Tag:           "bytes,220,opt,name=x220",
-}
-
-var E_X221 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         221,
-	Name:          "testdata.x221",
-	Tag:           "bytes,221,opt,name=x221",
-}
-
-var E_X222 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         222,
-	Name:          "testdata.x222",
-	Tag:           "bytes,222,opt,name=x222",
-}
-
-var E_X223 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         223,
-	Name:          "testdata.x223",
-	Tag:           "bytes,223,opt,name=x223",
-}
-
-var E_X224 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         224,
-	Name:          "testdata.x224",
-	Tag:           "bytes,224,opt,name=x224",
-}
-
-var E_X225 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         225,
-	Name:          "testdata.x225",
-	Tag:           "bytes,225,opt,name=x225",
-}
-
-var E_X226 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         226,
-	Name:          "testdata.x226",
-	Tag:           "bytes,226,opt,name=x226",
-}
-
-var E_X227 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         227,
-	Name:          "testdata.x227",
-	Tag:           "bytes,227,opt,name=x227",
-}
-
-var E_X228 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         228,
-	Name:          "testdata.x228",
-	Tag:           "bytes,228,opt,name=x228",
-}
-
-var E_X229 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         229,
-	Name:          "testdata.x229",
-	Tag:           "bytes,229,opt,name=x229",
-}
-
-var E_X230 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         230,
-	Name:          "testdata.x230",
-	Tag:           "bytes,230,opt,name=x230",
-}
-
-var E_X231 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         231,
-	Name:          "testdata.x231",
-	Tag:           "bytes,231,opt,name=x231",
-}
-
-var E_X232 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         232,
-	Name:          "testdata.x232",
-	Tag:           "bytes,232,opt,name=x232",
-}
-
-var E_X233 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         233,
-	Name:          "testdata.x233",
-	Tag:           "bytes,233,opt,name=x233",
-}
-
-var E_X234 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         234,
-	Name:          "testdata.x234",
-	Tag:           "bytes,234,opt,name=x234",
-}
-
-var E_X235 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         235,
-	Name:          "testdata.x235",
-	Tag:           "bytes,235,opt,name=x235",
-}
-
-var E_X236 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         236,
-	Name:          "testdata.x236",
-	Tag:           "bytes,236,opt,name=x236",
-}
-
-var E_X237 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         237,
-	Name:          "testdata.x237",
-	Tag:           "bytes,237,opt,name=x237",
-}
-
-var E_X238 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         238,
-	Name:          "testdata.x238",
-	Tag:           "bytes,238,opt,name=x238",
-}
-
-var E_X239 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         239,
-	Name:          "testdata.x239",
-	Tag:           "bytes,239,opt,name=x239",
-}
-
-var E_X240 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         240,
-	Name:          "testdata.x240",
-	Tag:           "bytes,240,opt,name=x240",
-}
-
-var E_X241 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         241,
-	Name:          "testdata.x241",
-	Tag:           "bytes,241,opt,name=x241",
-}
-
-var E_X242 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         242,
-	Name:          "testdata.x242",
-	Tag:           "bytes,242,opt,name=x242",
-}
-
-var E_X243 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         243,
-	Name:          "testdata.x243",
-	Tag:           "bytes,243,opt,name=x243",
-}
-
-var E_X244 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         244,
-	Name:          "testdata.x244",
-	Tag:           "bytes,244,opt,name=x244",
-}
-
-var E_X245 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         245,
-	Name:          "testdata.x245",
-	Tag:           "bytes,245,opt,name=x245",
-}
-
-var E_X246 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         246,
-	Name:          "testdata.x246",
-	Tag:           "bytes,246,opt,name=x246",
-}
-
-var E_X247 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         247,
-	Name:          "testdata.x247",
-	Tag:           "bytes,247,opt,name=x247",
-}
-
-var E_X248 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         248,
-	Name:          "testdata.x248",
-	Tag:           "bytes,248,opt,name=x248",
-}
-
-var E_X249 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         249,
-	Name:          "testdata.x249",
-	Tag:           "bytes,249,opt,name=x249",
-}
-
-var E_X250 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         250,
-	Name:          "testdata.x250",
-	Tag:           "bytes,250,opt,name=x250",
-}
-
-func init() {
-	proto.RegisterEnum("testdata.FOO", FOO_name, FOO_value)
-	proto.RegisterEnum("testdata.GoTest_KIND", GoTest_KIND_name, GoTest_KIND_value)
-	proto.RegisterEnum("testdata.MyMessage_Color", MyMessage_Color_name, MyMessage_Color_value)
-	proto.RegisterEnum("testdata.DefaultsMessage_DefaultsEnum", DefaultsMessage_DefaultsEnum_name, DefaultsMessage_DefaultsEnum_value)
-	proto.RegisterEnum("testdata.Defaults_Color", Defaults_Color_name, Defaults_Color_value)
-	proto.RegisterEnum("testdata.RepeatedEnum_Color", RepeatedEnum_Color_name, RepeatedEnum_Color_value)
-	proto.RegisterExtension(E_Ext_More)
-	proto.RegisterExtension(E_Ext_Text)
-	proto.RegisterExtension(E_Ext_Number)
-	proto.RegisterExtension(E_Greeting)
-	proto.RegisterExtension(E_NoDefaultDouble)
-	proto.RegisterExtension(E_NoDefaultFloat)
-	proto.RegisterExtension(E_NoDefaultInt32)
-	proto.RegisterExtension(E_NoDefaultInt64)
-	proto.RegisterExtension(E_NoDefaultUint32)
-	proto.RegisterExtension(E_NoDefaultUint64)
-	proto.RegisterExtension(E_NoDefaultSint32)
-	proto.RegisterExtension(E_NoDefaultSint64)
-	proto.RegisterExtension(E_NoDefaultFixed32)
-	proto.RegisterExtension(E_NoDefaultFixed64)
-	proto.RegisterExtension(E_NoDefaultSfixed32)
-	proto.RegisterExtension(E_NoDefaultSfixed64)
-	proto.RegisterExtension(E_NoDefaultBool)
-	proto.RegisterExtension(E_NoDefaultString)
-	proto.RegisterExtension(E_NoDefaultBytes)
-	proto.RegisterExtension(E_NoDefaultEnum)
-	proto.RegisterExtension(E_DefaultDouble)
-	proto.RegisterExtension(E_DefaultFloat)
-	proto.RegisterExtension(E_DefaultInt32)
-	proto.RegisterExtension(E_DefaultInt64)
-	proto.RegisterExtension(E_DefaultUint32)
-	proto.RegisterExtension(E_DefaultUint64)
-	proto.RegisterExtension(E_DefaultSint32)
-	proto.RegisterExtension(E_DefaultSint64)
-	proto.RegisterExtension(E_DefaultFixed32)
-	proto.RegisterExtension(E_DefaultFixed64)
-	proto.RegisterExtension(E_DefaultSfixed32)
-	proto.RegisterExtension(E_DefaultSfixed64)
-	proto.RegisterExtension(E_DefaultBool)
-	proto.RegisterExtension(E_DefaultString)
-	proto.RegisterExtension(E_DefaultBytes)
-	proto.RegisterExtension(E_DefaultEnum)
-	proto.RegisterExtension(E_X201)
-	proto.RegisterExtension(E_X202)
-	proto.RegisterExtension(E_X203)
-	proto.RegisterExtension(E_X204)
-	proto.RegisterExtension(E_X205)
-	proto.RegisterExtension(E_X206)
-	proto.RegisterExtension(E_X207)
-	proto.RegisterExtension(E_X208)
-	proto.RegisterExtension(E_X209)
-	proto.RegisterExtension(E_X210)
-	proto.RegisterExtension(E_X211)
-	proto.RegisterExtension(E_X212)
-	proto.RegisterExtension(E_X213)
-	proto.RegisterExtension(E_X214)
-	proto.RegisterExtension(E_X215)
-	proto.RegisterExtension(E_X216)
-	proto.RegisterExtension(E_X217)
-	proto.RegisterExtension(E_X218)
-	proto.RegisterExtension(E_X219)
-	proto.RegisterExtension(E_X220)
-	proto.RegisterExtension(E_X221)
-	proto.RegisterExtension(E_X222)
-	proto.RegisterExtension(E_X223)
-	proto.RegisterExtension(E_X224)
-	proto.RegisterExtension(E_X225)
-	proto.RegisterExtension(E_X226)
-	proto.RegisterExtension(E_X227)
-	proto.RegisterExtension(E_X228)
-	proto.RegisterExtension(E_X229)
-	proto.RegisterExtension(E_X230)
-	proto.RegisterExtension(E_X231)
-	proto.RegisterExtension(E_X232)
-	proto.RegisterExtension(E_X233)
-	proto.RegisterExtension(E_X234)
-	proto.RegisterExtension(E_X235)
-	proto.RegisterExtension(E_X236)
-	proto.RegisterExtension(E_X237)
-	proto.RegisterExtension(E_X238)
-	proto.RegisterExtension(E_X239)
-	proto.RegisterExtension(E_X240)
-	proto.RegisterExtension(E_X241)
-	proto.RegisterExtension(E_X242)
-	proto.RegisterExtension(E_X243)
-	proto.RegisterExtension(E_X244)
-	proto.RegisterExtension(E_X245)
-	proto.RegisterExtension(E_X246)
-	proto.RegisterExtension(E_X247)
-	proto.RegisterExtension(E_X248)
-	proto.RegisterExtension(E_X249)
-	proto.RegisterExtension(E_X250)
-}
diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/proto/testdata/test.proto b/Godeps/_workspace/src/github.com/golang/protobuf/proto/testdata/test.proto
deleted file mode 100644
index 440dba38d..000000000
--- a/Godeps/_workspace/src/github.com/golang/protobuf/proto/testdata/test.proto
+++ /dev/null
@@ -1,480 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2010 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// 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.
-
-// A feature-rich test file for the protocol compiler and libraries.
-
-syntax = "proto2";
-
-package testdata;
-
-enum FOO { FOO1 = 1; };
-
-message GoEnum {
-  required FOO foo = 1;
-}
-
-message GoTestField {
-  required string Label = 1;
-  required string Type = 2;
-}
-
-message GoTest {
-  // An enum, for completeness.
-  enum KIND {
-    VOID = 0;
-
-    // Basic types
-    BOOL = 1;
-    BYTES = 2;
-    FINGERPRINT = 3;
-    FLOAT = 4;
-    INT = 5;
-    STRING = 6;
-    TIME = 7;
-
-    // Groupings
-    TUPLE = 8;
-    ARRAY = 9;
-    MAP = 10;
-
-    // Table types
-    TABLE = 11;
-
-    // Functions
-    FUNCTION = 12;  // last tag
-  };
-
-  // Some typical parameters
-  required KIND Kind = 1;
-  optional string Table = 2;
-  optional int32 Param = 3;
-
-  // Required, repeated and optional foreign fields.
-  required GoTestField RequiredField = 4;
-  repeated GoTestField RepeatedField = 5;
-  optional GoTestField OptionalField = 6;
-
-  // Required fields of all basic types
-  required bool F_Bool_required = 10;
-  required int32 F_Int32_required = 11;
-  required int64 F_Int64_required = 12;
-  required fixed32 F_Fixed32_required = 13;
-  required fixed64 F_Fixed64_required = 14;
-  required uint32 F_Uint32_required = 15;
-  required uint64 F_Uint64_required = 16;
-  required float F_Float_required = 17;
-  required double F_Double_required = 18;
-  required string F_String_required = 19;
-  required bytes F_Bytes_required = 101;
-  required sint32 F_Sint32_required = 102;
-  required sint64 F_Sint64_required = 103;
-
-  // Repeated fields of all basic types
-  repeated bool F_Bool_repeated = 20;
-  repeated int32 F_Int32_repeated = 21;
-  repeated int64 F_Int64_repeated = 22;
-  repeated fixed32 F_Fixed32_repeated = 23;
-  repeated fixed64 F_Fixed64_repeated = 24;
-  repeated uint32 F_Uint32_repeated = 25;
-  repeated uint64 F_Uint64_repeated = 26;
-  repeated float F_Float_repeated = 27;
-  repeated double F_Double_repeated = 28;
-  repeated string F_String_repeated = 29;
-  repeated bytes F_Bytes_repeated = 201;
-  repeated sint32 F_Sint32_repeated = 202;
-  repeated sint64 F_Sint64_repeated = 203;
-
-  // Optional fields of all basic types
-  optional bool F_Bool_optional = 30;
-  optional int32 F_Int32_optional = 31;
-  optional int64 F_Int64_optional = 32;
-  optional fixed32 F_Fixed32_optional = 33;
-  optional fixed64 F_Fixed64_optional = 34;
-  optional uint32 F_Uint32_optional = 35;
-  optional uint64 F_Uint64_optional = 36;
-  optional float F_Float_optional = 37;
-  optional double F_Double_optional = 38;
-  optional string F_String_optional = 39;
-  optional bytes F_Bytes_optional = 301;
-  optional sint32 F_Sint32_optional = 302;
-  optional sint64 F_Sint64_optional = 303;
-
-  // Default-valued fields of all basic types
-  optional bool F_Bool_defaulted = 40 [default=true];
-  optional int32 F_Int32_defaulted = 41 [default=32];
-  optional int64 F_Int64_defaulted = 42 [default=64];
-  optional fixed32 F_Fixed32_defaulted = 43 [default=320];
-  optional fixed64 F_Fixed64_defaulted = 44 [default=640];
-  optional uint32 F_Uint32_defaulted = 45 [default=3200];
-  optional uint64 F_Uint64_defaulted = 46 [default=6400];
-  optional float F_Float_defaulted = 47 [default=314159.];
-  optional double F_Double_defaulted = 48 [default=271828.];
-  optional string F_String_defaulted = 49 [default="hello, \"world!\"\n"];
-  optional bytes F_Bytes_defaulted = 401 [default="Bignose"];
-  optional sint32 F_Sint32_defaulted = 402 [default = -32];
-  optional sint64 F_Sint64_defaulted = 403 [default = -64];
-
-  // Packed repeated fields (no string or bytes).
-  repeated bool F_Bool_repeated_packed = 50 [packed=true];
-  repeated int32 F_Int32_repeated_packed = 51 [packed=true];
-  repeated int64 F_Int64_repeated_packed = 52 [packed=true];
-  repeated fixed32 F_Fixed32_repeated_packed = 53 [packed=true];
-  repeated fixed64 F_Fixed64_repeated_packed = 54 [packed=true];
-  repeated uint32 F_Uint32_repeated_packed = 55 [packed=true];
-  repeated uint64 F_Uint64_repeated_packed = 56 [packed=true];
-  repeated float F_Float_repeated_packed = 57 [packed=true];
-  repeated double F_Double_repeated_packed = 58 [packed=true];
-  repeated sint32 F_Sint32_repeated_packed = 502 [packed=true];
-  repeated sint64 F_Sint64_repeated_packed = 503 [packed=true];
-
-  // Required, repeated, and optional groups.
-  required group RequiredGroup = 70 {
-    required string RequiredField = 71;
-  };
-
-  repeated group RepeatedGroup = 80 {
-    required string RequiredField = 81;
-  };
-
-  optional group OptionalGroup = 90 {
-    required string RequiredField = 91;
-  };
-}
-
-// For testing skipping of unrecognized fields.
-// Numbers are all big, larger than tag numbers in GoTestField,
-// the message used in the corresponding test.
-message GoSkipTest {
-  required int32 skip_int32 = 11;
-  required fixed32 skip_fixed32 = 12;
-  required fixed64 skip_fixed64 = 13;
-  required string skip_string = 14;
-  required group SkipGroup = 15 {
-    required int32 group_int32 = 16;
-    required string group_string = 17;
-  }
-}
-
-// For testing packed/non-packed decoder switching.
-// A serialized instance of one should be deserializable as the other.
-message NonPackedTest {
-  repeated int32 a = 1;
-}
-
-message PackedTest {
-  repeated int32 b = 1 [packed=true];
-}
-
-message MaxTag {
-  // Maximum possible tag number.
-  optional string last_field = 536870911;
-}
-
-message OldMessage {
-  message Nested {
-    optional string name = 1;
-  }
-  optional Nested nested = 1;
-
-  optional int32 num = 2;
-}
-
-// NewMessage is wire compatible with OldMessage;
-// imagine it as a future version.
-message NewMessage {
-  message Nested {
-    optional string name = 1;
-    optional string food_group = 2;
-  }
-  optional Nested nested = 1;
-
-  // This is an int32 in OldMessage.
-  optional int64 num = 2;
-}
-
-// Smaller tests for ASCII formatting.
-
-message InnerMessage {
-  required string host = 1;
-  optional int32 port = 2 [default=4000];
-  optional bool connected = 3;
-}
-
-message OtherMessage {
-  optional int64 key = 1;
-  optional bytes value = 2;
-  optional float weight = 3;
-  optional InnerMessage inner = 4;
-}
-
-message MyMessage {
-  required int32 count = 1;
-  optional string name = 2;
-  optional string quote = 3;
-  repeated string pet = 4;
-  optional InnerMessage inner = 5;
-  repeated OtherMessage others = 6;
-  repeated InnerMessage rep_inner = 12;
-
-  enum Color {
-    RED = 0;
-    GREEN = 1;
-    BLUE = 2;
-  };
-  optional Color bikeshed = 7;
-
-  optional group SomeGroup = 8 {
-    optional int32 group_field = 9;
-  }
-
-  // This field becomes [][]byte in the generated code.
-  repeated bytes rep_bytes = 10;
-
-  optional double bigfloat = 11;
-
-  extensions 100 to max;
-}
-
-message Ext {
-  extend MyMessage {
-    optional Ext more = 103;
-    optional string text = 104;
-    optional int32 number = 105;
-  }
-
-  optional string data = 1;
-}
-
-extend MyMessage {
-  repeated string greeting = 106;
-}
-
-message DefaultsMessage {
-  enum DefaultsEnum {
-    ZERO = 0;
-    ONE = 1;
-    TWO = 2;
-  };
-  extensions 100 to max;
-}
-
-extend DefaultsMessage {
-  optional double no_default_double = 101;
-  optional float no_default_float = 102;
-  optional int32 no_default_int32 = 103;
-  optional int64 no_default_int64 = 104;
-  optional uint32 no_default_uint32 = 105;
-  optional uint64 no_default_uint64 = 106;
-  optional sint32 no_default_sint32 = 107;
-  optional sint64 no_default_sint64 = 108;
-  optional fixed32 no_default_fixed32 = 109;
-  optional fixed64 no_default_fixed64 = 110;
-  optional sfixed32 no_default_sfixed32 = 111;
-  optional sfixed64 no_default_sfixed64 = 112;
-  optional bool no_default_bool = 113;
-  optional string no_default_string = 114;
-  optional bytes no_default_bytes = 115;
-  optional DefaultsMessage.DefaultsEnum no_default_enum = 116;
-
-  optional double default_double = 201 [default = 3.1415];
-  optional float default_float = 202 [default = 3.14];
-  optional int32 default_int32 = 203 [default = 42];
-  optional int64 default_int64 = 204 [default = 43];
-  optional uint32 default_uint32 = 205 [default = 44];
-  optional uint64 default_uint64 = 206 [default = 45];
-  optional sint32 default_sint32 = 207 [default = 46];
-  optional sint64 default_sint64 = 208 [default = 47];
-  optional fixed32 default_fixed32 = 209 [default = 48];
-  optional fixed64 default_fixed64 = 210 [default = 49];
-  optional sfixed32 default_sfixed32 = 211 [default = 50];
-  optional sfixed64 default_sfixed64 = 212 [default = 51];
-  optional bool default_bool = 213 [default = true];
-  optional string default_string = 214 [default = "Hello, string"];
-  optional bytes default_bytes = 215 [default = "Hello, bytes"];
-  optional DefaultsMessage.DefaultsEnum default_enum = 216 [default = ONE];
-}
-
-message MyMessageSet {
-  option message_set_wire_format = true;
-  extensions 100 to max;
-}
-
-message Empty {
-}
-
-extend MyMessageSet {
-    optional Empty x201 = 201;
-    optional Empty x202 = 202;
-    optional Empty x203 = 203;
-    optional Empty x204 = 204;
-    optional Empty x205 = 205;
-    optional Empty x206 = 206;
-    optional Empty x207 = 207;
-    optional Empty x208 = 208;
-    optional Empty x209 = 209;
-    optional Empty x210 = 210;
-    optional Empty x211 = 211;
-    optional Empty x212 = 212;
-    optional Empty x213 = 213;
-    optional Empty x214 = 214;
-    optional Empty x215 = 215;
-    optional Empty x216 = 216;
-    optional Empty x217 = 217;
-    optional Empty x218 = 218;
-    optional Empty x219 = 219;
-    optional Empty x220 = 220;
-    optional Empty x221 = 221;
-    optional Empty x222 = 222;
-    optional Empty x223 = 223;
-    optional Empty x224 = 224;
-    optional Empty x225 = 225;
-    optional Empty x226 = 226;
-    optional Empty x227 = 227;
-    optional Empty x228 = 228;
-    optional Empty x229 = 229;
-    optional Empty x230 = 230;
-    optional Empty x231 = 231;
-    optional Empty x232 = 232;
-    optional Empty x233 = 233;
-    optional Empty x234 = 234;
-    optional Empty x235 = 235;
-    optional Empty x236 = 236;
-    optional Empty x237 = 237;
-    optional Empty x238 = 238;
-    optional Empty x239 = 239;
-    optional Empty x240 = 240;
-    optional Empty x241 = 241;
-    optional Empty x242 = 242;
-    optional Empty x243 = 243;
-    optional Empty x244 = 244;
-    optional Empty x245 = 245;
-    optional Empty x246 = 246;
-    optional Empty x247 = 247;
-    optional Empty x248 = 248;
-    optional Empty x249 = 249;
-    optional Empty x250 = 250;
-}
-
-message MessageList {
-  repeated group Message = 1 {
-    required string name = 2;
-    required int32 count = 3;
-  }
-}
-
-message Strings {
-  optional string string_field = 1;
-  optional bytes bytes_field = 2;
-}
-
-message Defaults {
-  enum Color {
-    RED = 0;
-    GREEN = 1;
-    BLUE = 2;
-  }
-
-  // Default-valued fields of all basic types.
-  // Same as GoTest, but copied here to make testing easier.
-  optional bool F_Bool = 1 [default=true];
-  optional int32 F_Int32 = 2 [default=32];
-  optional int64 F_Int64 = 3 [default=64];
-  optional fixed32 F_Fixed32 = 4 [default=320];
-  optional fixed64 F_Fixed64 = 5 [default=640];
-  optional uint32 F_Uint32 = 6 [default=3200];
-  optional uint64 F_Uint64 = 7 [default=6400];
-  optional float F_Float = 8 [default=314159.];
-  optional double F_Double = 9 [default=271828.];
-  optional string F_String = 10 [default="hello, \"world!\"\n"];
-  optional bytes F_Bytes = 11 [default="Bignose"];
-  optional sint32 F_Sint32 = 12 [default=-32];
-  optional sint64 F_Sint64 = 13 [default=-64];
-  optional Color F_Enum = 14 [default=GREEN];
-
-  // More fields with crazy defaults.
-  optional float F_Pinf = 15 [default=inf];
-  optional float F_Ninf = 16 [default=-inf];
-  optional float F_Nan = 17 [default=nan];
-
-  // Sub-message.
-  optional SubDefaults sub = 18;
-
-  // Redundant but explicit defaults.
-  optional string str_zero = 19 [default=""];
-}
-
-message SubDefaults {
-  optional int64 n = 1 [default=7];
-}
-
-message RepeatedEnum {
-  enum Color {
-    RED = 1;
-  }
-  repeated Color color = 1;
-}
-
-message MoreRepeated {
-  repeated bool bools = 1;
-  repeated bool bools_packed = 2 [packed=true];
-  repeated int32 ints = 3;
-  repeated int32 ints_packed = 4 [packed=true];
-  repeated int64 int64s_packed = 7 [packed=true];
-  repeated string strings = 5;
-  repeated fixed32 fixeds = 6;
-}
-
-// GroupOld and GroupNew have the same wire format.
-// GroupNew has a new field inside a group.
-
-message GroupOld {
-  optional group G = 101 {
-    optional int32 x = 2;
-  }
-}
-
-message GroupNew {
-  optional group G = 101 {
-    optional int32 x = 2;
-    optional int32 y = 3;
-  }
-}
-
-message FloatingPoint {
-  required double f = 1;
-}
-
-message MessageWithMap {
-  map<int32, string> name_mapping = 1;
-  map<sint64, FloatingPoint> msg_mapping = 2;
-  map<bool, bytes> byte_mapping = 3;
-  map<string, string> str_to_str = 4;
-}
diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/proto/text.go b/Godeps/_workspace/src/github.com/golang/protobuf/proto/text.go
deleted file mode 100644
index f3db2cf5e..000000000
--- a/Godeps/_workspace/src/github.com/golang/protobuf/proto/text.go
+++ /dev/null
@@ -1,769 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2010 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// 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.
-
-package proto
-
-// Functions for writing the text protocol buffer format.
-
-import (
-	"bufio"
-	"bytes"
-	"encoding"
-	"fmt"
-	"io"
-	"log"
-	"math"
-	"reflect"
-	"sort"
-	"strings"
-)
-
-var (
-	newline         = []byte("\n")
-	spaces          = []byte("                                        ")
-	gtNewline       = []byte(">\n")
-	endBraceNewline = []byte("}\n")
-	backslashN      = []byte{'\\', 'n'}
-	backslashR      = []byte{'\\', 'r'}
-	backslashT      = []byte{'\\', 't'}
-	backslashDQ     = []byte{'\\', '"'}
-	backslashBS     = []byte{'\\', '\\'}
-	posInf          = []byte("inf")
-	negInf          = []byte("-inf")
-	nan             = []byte("nan")
-)
-
-type writer interface {
-	io.Writer
-	WriteByte(byte) error
-}
-
-// textWriter is an io.Writer that tracks its indentation level.
-type textWriter struct {
-	ind      int
-	complete bool // if the current position is a complete line
-	compact  bool // whether to write out as a one-liner
-	w        writer
-}
-
-func (w *textWriter) WriteString(s string) (n int, err error) {
-	if !strings.Contains(s, "\n") {
-		if !w.compact && w.complete {
-			w.writeIndent()
-		}
-		w.complete = false
-		return io.WriteString(w.w, s)
-	}
-	// WriteString is typically called without newlines, so this
-	// codepath and its copy are rare.  We copy to avoid
-	// duplicating all of Write's logic here.
-	return w.Write([]byte(s))
-}
-
-func (w *textWriter) Write(p []byte) (n int, err error) {
-	newlines := bytes.Count(p, newline)
-	if newlines == 0 {
-		if !w.compact && w.complete {
-			w.writeIndent()
-		}
-		n, err = w.w.Write(p)
-		w.complete = false
-		return n, err
-	}
-
-	frags := bytes.SplitN(p, newline, newlines+1)
-	if w.compact {
-		for i, frag := range frags {
-			if i > 0 {
-				if err := w.w.WriteByte(' '); err != nil {
-					return n, err
-				}
-				n++
-			}
-			nn, err := w.w.Write(frag)
-			n += nn
-			if err != nil {
-				return n, err
-			}
-		}
-		return n, nil
-	}
-
-	for i, frag := range frags {
-		if w.complete {
-			w.writeIndent()
-		}
-		nn, err := w.w.Write(frag)
-		n += nn
-		if err != nil {
-			return n, err
-		}
-		if i+1 < len(frags) {
-			if err := w.w.WriteByte('\n'); err != nil {
-				return n, err
-			}
-			n++
-		}
-	}
-	w.complete = len(frags[len(frags)-1]) == 0
-	return n, nil
-}
-
-func (w *textWriter) WriteByte(c byte) error {
-	if w.compact && c == '\n' {
-		c = ' '
-	}
-	if !w.compact && w.complete {
-		w.writeIndent()
-	}
-	err := w.w.WriteByte(c)
-	w.complete = c == '\n'
-	return err
-}
-
-func (w *textWriter) indent() { w.ind++ }
-
-func (w *textWriter) unindent() {
-	if w.ind == 0 {
-		log.Printf("proto: textWriter unindented too far")
-		return
-	}
-	w.ind--
-}
-
-func writeName(w *textWriter, props *Properties) error {
-	if _, err := w.WriteString(props.OrigName); err != nil {
-		return err
-	}
-	if props.Wire != "group" {
-		return w.WriteByte(':')
-	}
-	return nil
-}
-
-var (
-	messageSetType = reflect.TypeOf((*MessageSet)(nil)).Elem()
-)
-
-// raw is the interface satisfied by RawMessage.
-type raw interface {
-	Bytes() []byte
-}
-
-func writeStruct(w *textWriter, sv reflect.Value) error {
-	if sv.Type() == messageSetType {
-		return writeMessageSet(w, sv.Addr().Interface().(*MessageSet))
-	}
-
-	st := sv.Type()
-	sprops := GetProperties(st)
-	for i := 0; i < sv.NumField(); i++ {
-		fv := sv.Field(i)
-		props := sprops.Prop[i]
-		name := st.Field(i).Name
-
-		if strings.HasPrefix(name, "XXX_") {
-			// There are two XXX_ fields:
-			//   XXX_unrecognized []byte
-			//   XXX_extensions   map[int32]proto.Extension
-			// The first is handled here;
-			// the second is handled at the bottom of this function.
-			if name == "XXX_unrecognized" && !fv.IsNil() {
-				if err := writeUnknownStruct(w, fv.Interface().([]byte)); err != nil {
-					return err
-				}
-			}
-			continue
-		}
-		if fv.Kind() == reflect.Ptr && fv.IsNil() {
-			// Field not filled in. This could be an optional field or
-			// a required field that wasn't filled in. Either way, there
-			// isn't anything we can show for it.
-			continue
-		}
-		if fv.Kind() == reflect.Slice && fv.IsNil() {
-			// Repeated field that is empty, or a bytes field that is unused.
-			continue
-		}
-
-		if props.Repeated && fv.Kind() == reflect.Slice {
-			// Repeated field.
-			for j := 0; j < fv.Len(); j++ {
-				if err := writeName(w, props); err != nil {
-					return err
-				}
-				if !w.compact {
-					if err := w.WriteByte(' '); err != nil {
-						return err
-					}
-				}
-				v := fv.Index(j)
-				if v.Kind() == reflect.Ptr && v.IsNil() {
-					// A nil message in a repeated field is not valid,
-					// but we can handle that more gracefully than panicking.
-					if _, err := w.Write([]byte("<nil>\n")); err != nil {
-						return err
-					}
-					continue
-				}
-				if err := writeAny(w, v, props); err != nil {
-					return err
-				}
-				if err := w.WriteByte('\n'); err != nil {
-					return err
-				}
-			}
-			continue
-		}
-		if fv.Kind() == reflect.Map {
-			// Map fields are rendered as a repeated struct with key/value fields.
-			keys := fv.MapKeys()
-			sort.Sort(mapKeys(keys))
-			for _, key := range keys {
-				val := fv.MapIndex(key)
-				if err := writeName(w, props); err != nil {
-					return err
-				}
-				if !w.compact {
-					if err := w.WriteByte(' '); err != nil {
-						return err
-					}
-				}
-				// open struct
-				if err := w.WriteByte('<'); err != nil {
-					return err
-				}
-				if !w.compact {
-					if err := w.WriteByte('\n'); err != nil {
-						return err
-					}
-				}
-				w.indent()
-				// key
-				if _, err := w.WriteString("key:"); err != nil {
-					return err
-				}
-				if !w.compact {
-					if err := w.WriteByte(' '); err != nil {
-						return err
-					}
-				}
-				if err := writeAny(w, key, props.mkeyprop); err != nil {
-					return err
-				}
-				if err := w.WriteByte('\n'); err != nil {
-					return err
-				}
-				// nil values aren't legal, but we can avoid panicking because of them.
-				if val.Kind() != reflect.Ptr || !val.IsNil() {
-					// value
-					if _, err := w.WriteString("value:"); err != nil {
-						return err
-					}
-					if !w.compact {
-						if err := w.WriteByte(' '); err != nil {
-							return err
-						}
-					}
-					if err := writeAny(w, val, props.mvalprop); err != nil {
-						return err
-					}
-					if err := w.WriteByte('\n'); err != nil {
-						return err
-					}
-				}
-				// close struct
-				w.unindent()
-				if err := w.WriteByte('>'); err != nil {
-					return err
-				}
-				if err := w.WriteByte('\n'); err != nil {
-					return err
-				}
-			}
-			continue
-		}
-		if props.proto3 && fv.Kind() == reflect.Slice && fv.Len() == 0 {
-			// empty bytes field
-			continue
-		}
-		if fv.Kind() != reflect.Ptr && fv.Kind() != reflect.Slice {
-			// proto3 non-repeated scalar field; skip if zero value
-			if isProto3Zero(fv) {
-				continue
-			}
-		}
-
-		if err := writeName(w, props); err != nil {
-			return err
-		}
-		if !w.compact {
-			if err := w.WriteByte(' '); err != nil {
-				return err
-			}
-		}
-		if b, ok := fv.Interface().(raw); ok {
-			if err := writeRaw(w, b.Bytes()); err != nil {
-				return err
-			}
-			continue
-		}
-
-		// Enums have a String method, so writeAny will work fine.
-		if err := writeAny(w, fv, props); err != nil {
-			return err
-		}
-
-		if err := w.WriteByte('\n'); err != nil {
-			return err
-		}
-	}
-
-	// Extensions (the XXX_extensions field).
-	pv := sv.Addr()
-	if pv.Type().Implements(extendableProtoType) {
-		if err := writeExtensions(w, pv); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-// writeRaw writes an uninterpreted raw message.
-func writeRaw(w *textWriter, b []byte) error {
-	if err := w.WriteByte('<'); err != nil {
-		return err
-	}
-	if !w.compact {
-		if err := w.WriteByte('\n'); err != nil {
-			return err
-		}
-	}
-	w.indent()
-	if err := writeUnknownStruct(w, b); err != nil {
-		return err
-	}
-	w.unindent()
-	if err := w.WriteByte('>'); err != nil {
-		return err
-	}
-	return nil
-}
-
-// writeAny writes an arbitrary field.
-func writeAny(w *textWriter, v reflect.Value, props *Properties) error {
-	v = reflect.Indirect(v)
-
-	// Floats have special cases.
-	if v.Kind() == reflect.Float32 || v.Kind() == reflect.Float64 {
-		x := v.Float()
-		var b []byte
-		switch {
-		case math.IsInf(x, 1):
-			b = posInf
-		case math.IsInf(x, -1):
-			b = negInf
-		case math.IsNaN(x):
-			b = nan
-		}
-		if b != nil {
-			_, err := w.Write(b)
-			return err
-		}
-		// Other values are handled below.
-	}
-
-	// We don't attempt to serialise every possible value type; only those
-	// that can occur in protocol buffers.
-	switch v.Kind() {
-	case reflect.Slice:
-		// Should only be a []byte; repeated fields are handled in writeStruct.
-		if err := writeString(w, string(v.Interface().([]byte))); err != nil {
-			return err
-		}
-	case reflect.String:
-		if err := writeString(w, v.String()); err != nil {
-			return err
-		}
-	case reflect.Struct:
-		// Required/optional group/message.
-		var bra, ket byte = '<', '>'
-		if props != nil && props.Wire == "group" {
-			bra, ket = '{', '}'
-		}
-		if err := w.WriteByte(bra); err != nil {
-			return err
-		}
-		if !w.compact {
-			if err := w.WriteByte('\n'); err != nil {
-				return err
-			}
-		}
-		w.indent()
-		if tm, ok := v.Interface().(encoding.TextMarshaler); ok {
-			text, err := tm.MarshalText()
-			if err != nil {
-				return err
-			}
-			if _, err = w.Write(text); err != nil {
-				return err
-			}
-		} else if err := writeStruct(w, v); err != nil {
-			return err
-		}
-		w.unindent()
-		if err := w.WriteByte(ket); err != nil {
-			return err
-		}
-	default:
-		_, err := fmt.Fprint(w, v.Interface())
-		return err
-	}
-	return nil
-}
-
-// equivalent to C's isprint.
-func isprint(c byte) bool {
-	return c >= 0x20 && c < 0x7f
-}
-
-// writeString writes a string in the protocol buffer text format.
-// It is similar to strconv.Quote except we don't use Go escape sequences,
-// we treat the string as a byte sequence, and we use octal escapes.
-// These differences are to maintain interoperability with the other
-// languages' implementations of the text format.
-func writeString(w *textWriter, s string) error {
-	// use WriteByte here to get any needed indent
-	if err := w.WriteByte('"'); err != nil {
-		return err
-	}
-	// Loop over the bytes, not the runes.
-	for i := 0; i < len(s); i++ {
-		var err error
-		// Divergence from C++: we don't escape apostrophes.
-		// There's no need to escape them, and the C++ parser
-		// copes with a naked apostrophe.
-		switch c := s[i]; c {
-		case '\n':
-			_, err = w.w.Write(backslashN)
-		case '\r':
-			_, err = w.w.Write(backslashR)
-		case '\t':
-			_, err = w.w.Write(backslashT)
-		case '"':
-			_, err = w.w.Write(backslashDQ)
-		case '\\':
-			_, err = w.w.Write(backslashBS)
-		default:
-			if isprint(c) {
-				err = w.w.WriteByte(c)
-			} else {
-				_, err = fmt.Fprintf(w.w, "\\%03o", c)
-			}
-		}
-		if err != nil {
-			return err
-		}
-	}
-	return w.WriteByte('"')
-}
-
-func writeMessageSet(w *textWriter, ms *MessageSet) error {
-	for _, item := range ms.Item {
-		id := *item.TypeId
-		if msd, ok := messageSetMap[id]; ok {
-			// Known message set type.
-			if _, err := fmt.Fprintf(w, "[%s]: <\n", msd.name); err != nil {
-				return err
-			}
-			w.indent()
-
-			pb := reflect.New(msd.t.Elem())
-			if err := Unmarshal(item.Message, pb.Interface().(Message)); err != nil {
-				if _, err := fmt.Fprintf(w, "/* bad message: %v */\n", err); err != nil {
-					return err
-				}
-			} else {
-				if err := writeStruct(w, pb.Elem()); err != nil {
-					return err
-				}
-			}
-		} else {
-			// Unknown type.
-			if _, err := fmt.Fprintf(w, "[%d]: <\n", id); err != nil {
-				return err
-			}
-			w.indent()
-			if err := writeUnknownStruct(w, item.Message); err != nil {
-				return err
-			}
-		}
-		w.unindent()
-		if _, err := w.Write(gtNewline); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func writeUnknownStruct(w *textWriter, data []byte) (err error) {
-	if !w.compact {
-		if _, err := fmt.Fprintf(w, "/* %d unknown bytes */\n", len(data)); err != nil {
-			return err
-		}
-	}
-	b := NewBuffer(data)
-	for b.index < len(b.buf) {
-		x, err := b.DecodeVarint()
-		if err != nil {
-			_, err := fmt.Fprintf(w, "/* %v */\n", err)
-			return err
-		}
-		wire, tag := x&7, x>>3
-		if wire == WireEndGroup {
-			w.unindent()
-			if _, err := w.Write(endBraceNewline); err != nil {
-				return err
-			}
-			continue
-		}
-		if _, err := fmt.Fprint(w, tag); err != nil {
-			return err
-		}
-		if wire != WireStartGroup {
-			if err := w.WriteByte(':'); err != nil {
-				return err
-			}
-		}
-		if !w.compact || wire == WireStartGroup {
-			if err := w.WriteByte(' '); err != nil {
-				return err
-			}
-		}
-		switch wire {
-		case WireBytes:
-			buf, e := b.DecodeRawBytes(false)
-			if e == nil {
-				_, err = fmt.Fprintf(w, "%q", buf)
-			} else {
-				_, err = fmt.Fprintf(w, "/* %v */", e)
-			}
-		case WireFixed32:
-			x, err = b.DecodeFixed32()
-			err = writeUnknownInt(w, x, err)
-		case WireFixed64:
-			x, err = b.DecodeFixed64()
-			err = writeUnknownInt(w, x, err)
-		case WireStartGroup:
-			err = w.WriteByte('{')
-			w.indent()
-		case WireVarint:
-			x, err = b.DecodeVarint()
-			err = writeUnknownInt(w, x, err)
-		default:
-			_, err = fmt.Fprintf(w, "/* unknown wire type %d */", wire)
-		}
-		if err != nil {
-			return err
-		}
-		if err = w.WriteByte('\n'); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func writeUnknownInt(w *textWriter, x uint64, err error) error {
-	if err == nil {
-		_, err = fmt.Fprint(w, x)
-	} else {
-		_, err = fmt.Fprintf(w, "/* %v */", err)
-	}
-	return err
-}
-
-type int32Slice []int32
-
-func (s int32Slice) Len() int           { return len(s) }
-func (s int32Slice) Less(i, j int) bool { return s[i] < s[j] }
-func (s int32Slice) Swap(i, j int)      { s[i], s[j] = s[j], s[i] }
-
-// writeExtensions writes all the extensions in pv.
-// pv is assumed to be a pointer to a protocol message struct that is extendable.
-func writeExtensions(w *textWriter, pv reflect.Value) error {
-	emap := extensionMaps[pv.Type().Elem()]
-	ep := pv.Interface().(extendableProto)
-
-	// Order the extensions by ID.
-	// This isn't strictly necessary, but it will give us
-	// canonical output, which will also make testing easier.
-	m := ep.ExtensionMap()
-	ids := make([]int32, 0, len(m))
-	for id := range m {
-		ids = append(ids, id)
-	}
-	sort.Sort(int32Slice(ids))
-
-	for _, extNum := range ids {
-		ext := m[extNum]
-		var desc *ExtensionDesc
-		if emap != nil {
-			desc = emap[extNum]
-		}
-		if desc == nil {
-			// Unknown extension.
-			if err := writeUnknownStruct(w, ext.enc); err != nil {
-				return err
-			}
-			continue
-		}
-
-		pb, err := GetExtension(ep, desc)
-		if err != nil {
-			return fmt.Errorf("failed getting extension: %v", err)
-		}
-
-		// Repeated extensions will appear as a slice.
-		if !desc.repeated() {
-			if err := writeExtension(w, desc.Name, pb); err != nil {
-				return err
-			}
-		} else {
-			v := reflect.ValueOf(pb)
-			for i := 0; i < v.Len(); i++ {
-				if err := writeExtension(w, desc.Name, v.Index(i).Interface()); err != nil {
-					return err
-				}
-			}
-		}
-	}
-	return nil
-}
-
-func writeExtension(w *textWriter, name string, pb interface{}) error {
-	if _, err := fmt.Fprintf(w, "[%s]:", name); err != nil {
-		return err
-	}
-	if !w.compact {
-		if err := w.WriteByte(' '); err != nil {
-			return err
-		}
-	}
-	if err := writeAny(w, reflect.ValueOf(pb), nil); err != nil {
-		return err
-	}
-	if err := w.WriteByte('\n'); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (w *textWriter) writeIndent() {
-	if !w.complete {
-		return
-	}
-	remain := w.ind * 2
-	for remain > 0 {
-		n := remain
-		if n > len(spaces) {
-			n = len(spaces)
-		}
-		w.w.Write(spaces[:n])
-		remain -= n
-	}
-	w.complete = false
-}
-
-func marshalText(w io.Writer, pb Message, compact bool) error {
-	val := reflect.ValueOf(pb)
-	if pb == nil || val.IsNil() {
-		w.Write([]byte("<nil>"))
-		return nil
-	}
-	var bw *bufio.Writer
-	ww, ok := w.(writer)
-	if !ok {
-		bw = bufio.NewWriter(w)
-		ww = bw
-	}
-	aw := &textWriter{
-		w:        ww,
-		complete: true,
-		compact:  compact,
-	}
-
-	if tm, ok := pb.(encoding.TextMarshaler); ok {
-		text, err := tm.MarshalText()
-		if err != nil {
-			return err
-		}
-		if _, err = aw.Write(text); err != nil {
-			return err
-		}
-		if bw != nil {
-			return bw.Flush()
-		}
-		return nil
-	}
-	// Dereference the received pointer so we don't have outer < and >.
-	v := reflect.Indirect(val)
-	if err := writeStruct(aw, v); err != nil {
-		return err
-	}
-	if bw != nil {
-		return bw.Flush()
-	}
-	return nil
-}
-
-// MarshalText writes a given protocol buffer in text format.
-// The only errors returned are from w.
-func MarshalText(w io.Writer, pb Message) error {
-	return marshalText(w, pb, false)
-}
-
-// MarshalTextString is the same as MarshalText, but returns the string directly.
-func MarshalTextString(pb Message) string {
-	var buf bytes.Buffer
-	marshalText(&buf, pb, false)
-	return buf.String()
-}
-
-// CompactText writes a given protocol buffer in compact text format (one line).
-func CompactText(w io.Writer, pb Message) error { return marshalText(w, pb, true) }
-
-// CompactTextString is the same as CompactText, but returns the string directly.
-func CompactTextString(pb Message) string {
-	var buf bytes.Buffer
-	marshalText(&buf, pb, true)
-	return buf.String()
-}
diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/proto/text_parser.go b/Godeps/_workspace/src/github.com/golang/protobuf/proto/text_parser.go
deleted file mode 100644
index 7d0c75719..000000000
--- a/Godeps/_workspace/src/github.com/golang/protobuf/proto/text_parser.go
+++ /dev/null
@@ -1,772 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2010 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// 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.
-
-package proto
-
-// Functions for parsing the Text protocol buffer format.
-// TODO: message sets.
-
-import (
-	"encoding"
-	"errors"
-	"fmt"
-	"reflect"
-	"strconv"
-	"strings"
-	"unicode/utf8"
-)
-
-type ParseError struct {
-	Message string
-	Line    int // 1-based line number
-	Offset  int // 0-based byte offset from start of input
-}
-
-func (p *ParseError) Error() string {
-	if p.Line == 1 {
-		// show offset only for first line
-		return fmt.Sprintf("line 1.%d: %v", p.Offset, p.Message)
-	}
-	return fmt.Sprintf("line %d: %v", p.Line, p.Message)
-}
-
-type token struct {
-	value    string
-	err      *ParseError
-	line     int    // line number
-	offset   int    // byte number from start of input, not start of line
-	unquoted string // the unquoted version of value, if it was a quoted string
-}
-
-func (t *token) String() string {
-	if t.err == nil {
-		return fmt.Sprintf("%q (line=%d, offset=%d)", t.value, t.line, t.offset)
-	}
-	return fmt.Sprintf("parse error: %v", t.err)
-}
-
-type textParser struct {
-	s            string // remaining input
-	done         bool   // whether the parsing is finished (success or error)
-	backed       bool   // whether back() was called
-	offset, line int
-	cur          token
-}
-
-func newTextParser(s string) *textParser {
-	p := new(textParser)
-	p.s = s
-	p.line = 1
-	p.cur.line = 1
-	return p
-}
-
-func (p *textParser) errorf(format string, a ...interface{}) *ParseError {
-	pe := &ParseError{fmt.Sprintf(format, a...), p.cur.line, p.cur.offset}
-	p.cur.err = pe
-	p.done = true
-	return pe
-}
-
-// Numbers and identifiers are matched by [-+._A-Za-z0-9]
-func isIdentOrNumberChar(c byte) bool {
-	switch {
-	case 'A' <= c && c <= 'Z', 'a' <= c && c <= 'z':
-		return true
-	case '0' <= c && c <= '9':
-		return true
-	}
-	switch c {
-	case '-', '+', '.', '_':
-		return true
-	}
-	return false
-}
-
-func isWhitespace(c byte) bool {
-	switch c {
-	case ' ', '\t', '\n', '\r':
-		return true
-	}
-	return false
-}
-
-func (p *textParser) skipWhitespace() {
-	i := 0
-	for i < len(p.s) && (isWhitespace(p.s[i]) || p.s[i] == '#') {
-		if p.s[i] == '#' {
-			// comment; skip to end of line or input
-			for i < len(p.s) && p.s[i] != '\n' {
-				i++
-			}
-			if i == len(p.s) {
-				break
-			}
-		}
-		if p.s[i] == '\n' {
-			p.line++
-		}
-		i++
-	}
-	p.offset += i
-	p.s = p.s[i:len(p.s)]
-	if len(p.s) == 0 {
-		p.done = true
-	}
-}
-
-func (p *textParser) advance() {
-	// Skip whitespace
-	p.skipWhitespace()
-	if p.done {
-		return
-	}
-
-	// Start of non-whitespace
-	p.cur.err = nil
-	p.cur.offset, p.cur.line = p.offset, p.line
-	p.cur.unquoted = ""
-	switch p.s[0] {
-	case '<', '>', '{', '}', ':', '[', ']', ';', ',':
-		// Single symbol
-		p.cur.value, p.s = p.s[0:1], p.s[1:len(p.s)]
-	case '"', '\'':
-		// Quoted string
-		i := 1
-		for i < len(p.s) && p.s[i] != p.s[0] && p.s[i] != '\n' {
-			if p.s[i] == '\\' && i+1 < len(p.s) {
-				// skip escaped char
-				i++
-			}
-			i++
-		}
-		if i >= len(p.s) || p.s[i] != p.s[0] {
-			p.errorf("unmatched quote")
-			return
-		}
-		unq, err := unquoteC(p.s[1:i], rune(p.s[0]))
-		if err != nil {
-			p.errorf("invalid quoted string %s: %v", p.s[0:i+1], err)
-			return
-		}
-		p.cur.value, p.s = p.s[0:i+1], p.s[i+1:len(p.s)]
-		p.cur.unquoted = unq
-	default:
-		i := 0
-		for i < len(p.s) && isIdentOrNumberChar(p.s[i]) {
-			i++
-		}
-		if i == 0 {
-			p.errorf("unexpected byte %#x", p.s[0])
-			return
-		}
-		p.cur.value, p.s = p.s[0:i], p.s[i:len(p.s)]
-	}
-	p.offset += len(p.cur.value)
-}
-
-var (
-	errBadUTF8 = errors.New("proto: bad UTF-8")
-	errBadHex  = errors.New("proto: bad hexadecimal")
-)
-
-func unquoteC(s string, quote rune) (string, error) {
-	// This is based on C++'s tokenizer.cc.
-	// Despite its name, this is *not* parsing C syntax.
-	// For instance, "\0" is an invalid quoted string.
-
-	// Avoid allocation in trivial cases.
-	simple := true
-	for _, r := range s {
-		if r == '\\' || r == quote {
-			simple = false
-			break
-		}
-	}
-	if simple {
-		return s, nil
-	}
-
-	buf := make([]byte, 0, 3*len(s)/2)
-	for len(s) > 0 {
-		r, n := utf8.DecodeRuneInString(s)
-		if r == utf8.RuneError && n == 1 {
-			return "", errBadUTF8
-		}
-		s = s[n:]
-		if r != '\\' {
-			if r < utf8.RuneSelf {
-				buf = append(buf, byte(r))
-			} else {
-				buf = append(buf, string(r)...)
-			}
-			continue
-		}
-
-		ch, tail, err := unescape(s)
-		if err != nil {
-			return "", err
-		}
-		buf = append(buf, ch...)
-		s = tail
-	}
-	return string(buf), nil
-}
-
-func unescape(s string) (ch string, tail string, err error) {
-	r, n := utf8.DecodeRuneInString(s)
-	if r == utf8.RuneError && n == 1 {
-		return "", "", errBadUTF8
-	}
-	s = s[n:]
-	switch r {
-	case 'a':
-		return "\a", s, nil
-	case 'b':
-		return "\b", s, nil
-	case 'f':
-		return "\f", s, nil
-	case 'n':
-		return "\n", s, nil
-	case 'r':
-		return "\r", s, nil
-	case 't':
-		return "\t", s, nil
-	case 'v':
-		return "\v", s, nil
-	case '?':
-		return "?", s, nil // trigraph workaround
-	case '\'', '"', '\\':
-		return string(r), s, nil
-	case '0', '1', '2', '3', '4', '5', '6', '7', 'x', 'X':
-		if len(s) < 2 {
-			return "", "", fmt.Errorf(`\%c requires 2 following digits`, r)
-		}
-		base := 8
-		ss := s[:2]
-		s = s[2:]
-		if r == 'x' || r == 'X' {
-			base = 16
-		} else {
-			ss = string(r) + ss
-		}
-		i, err := strconv.ParseUint(ss, base, 8)
-		if err != nil {
-			return "", "", err
-		}
-		return string([]byte{byte(i)}), s, nil
-	case 'u', 'U':
-		n := 4
-		if r == 'U' {
-			n = 8
-		}
-		if len(s) < n {
-			return "", "", fmt.Errorf(`\%c requires %d digits`, r, n)
-		}
-
-		bs := make([]byte, n/2)
-		for i := 0; i < n; i += 2 {
-			a, ok1 := unhex(s[i])
-			b, ok2 := unhex(s[i+1])
-			if !ok1 || !ok2 {
-				return "", "", errBadHex
-			}
-			bs[i/2] = a<<4 | b
-		}
-		s = s[n:]
-		return string(bs), s, nil
-	}
-	return "", "", fmt.Errorf(`unknown escape \%c`, r)
-}
-
-// Adapted from src/pkg/strconv/quote.go.
-func unhex(b byte) (v byte, ok bool) {
-	switch {
-	case '0' <= b && b <= '9':
-		return b - '0', true
-	case 'a' <= b && b <= 'f':
-		return b - 'a' + 10, true
-	case 'A' <= b && b <= 'F':
-		return b - 'A' + 10, true
-	}
-	return 0, false
-}
-
-// Back off the parser by one token. Can only be done between calls to next().
-// It makes the next advance() a no-op.
-func (p *textParser) back() { p.backed = true }
-
-// Advances the parser and returns the new current token.
-func (p *textParser) next() *token {
-	if p.backed || p.done {
-		p.backed = false
-		return &p.cur
-	}
-	p.advance()
-	if p.done {
-		p.cur.value = ""
-	} else if len(p.cur.value) > 0 && p.cur.value[0] == '"' {
-		// Look for multiple quoted strings separated by whitespace,
-		// and concatenate them.
-		cat := p.cur
-		for {
-			p.skipWhitespace()
-			if p.done || p.s[0] != '"' {
-				break
-			}
-			p.advance()
-			if p.cur.err != nil {
-				return &p.cur
-			}
-			cat.value += " " + p.cur.value
-			cat.unquoted += p.cur.unquoted
-		}
-		p.done = false // parser may have seen EOF, but we want to return cat
-		p.cur = cat
-	}
-	return &p.cur
-}
-
-func (p *textParser) consumeToken(s string) error {
-	tok := p.next()
-	if tok.err != nil {
-		return tok.err
-	}
-	if tok.value != s {
-		p.back()
-		return p.errorf("expected %q, found %q", s, tok.value)
-	}
-	return nil
-}
-
-// Return a RequiredNotSetError indicating which required field was not set.
-func (p *textParser) missingRequiredFieldError(sv reflect.Value) *RequiredNotSetError {
-	st := sv.Type()
-	sprops := GetProperties(st)
-	for i := 0; i < st.NumField(); i++ {
-		if !isNil(sv.Field(i)) {
-			continue
-		}
-
-		props := sprops.Prop[i]
-		if props.Required {
-			return &RequiredNotSetError{fmt.Sprintf("%v.%v", st, props.OrigName)}
-		}
-	}
-	return &RequiredNotSetError{fmt.Sprintf("%v.<unknown field name>", st)} // should not happen
-}
-
-// Returns the index in the struct for the named field, as well as the parsed tag properties.
-func structFieldByName(st reflect.Type, name string) (int, *Properties, bool) {
-	sprops := GetProperties(st)
-	i, ok := sprops.decoderOrigNames[name]
-	if ok {
-		return i, sprops.Prop[i], true
-	}
-	return -1, nil, false
-}
-
-// Consume a ':' from the input stream (if the next token is a colon),
-// returning an error if a colon is needed but not present.
-func (p *textParser) checkForColon(props *Properties, typ reflect.Type) *ParseError {
-	tok := p.next()
-	if tok.err != nil {
-		return tok.err
-	}
-	if tok.value != ":" {
-		// Colon is optional when the field is a group or message.
-		needColon := true
-		switch props.Wire {
-		case "group":
-			needColon = false
-		case "bytes":
-			// A "bytes" field is either a message, a string, or a repeated field;
-			// those three become *T, *string and []T respectively, so we can check for
-			// this field being a pointer to a non-string.
-			if typ.Kind() == reflect.Ptr {
-				// *T or *string
-				if typ.Elem().Kind() == reflect.String {
-					break
-				}
-			} else if typ.Kind() == reflect.Slice {
-				// []T or []*T
-				if typ.Elem().Kind() != reflect.Ptr {
-					break
-				}
-			} else if typ.Kind() == reflect.String {
-				// The proto3 exception is for a string field,
-				// which requires a colon.
-				break
-			}
-			needColon = false
-		}
-		if needColon {
-			return p.errorf("expected ':', found %q", tok.value)
-		}
-		p.back()
-	}
-	return nil
-}
-
-func (p *textParser) readStruct(sv reflect.Value, terminator string) error {
-	st := sv.Type()
-	reqCount := GetProperties(st).reqCount
-	var reqFieldErr error
-	fieldSet := make(map[string]bool)
-	// A struct is a sequence of "name: value", terminated by one of
-	// '>' or '}', or the end of the input.  A name may also be
-	// "[extension]".
-	for {
-		tok := p.next()
-		if tok.err != nil {
-			return tok.err
-		}
-		if tok.value == terminator {
-			break
-		}
-		if tok.value == "[" {
-			// Looks like an extension.
-			//
-			// TODO: Check whether we need to handle
-			// namespace rooted names (e.g. ".something.Foo").
-			tok = p.next()
-			if tok.err != nil {
-				return tok.err
-			}
-			var desc *ExtensionDesc
-			// This could be faster, but it's functional.
-			// TODO: Do something smarter than a linear scan.
-			for _, d := range RegisteredExtensions(reflect.New(st).Interface().(Message)) {
-				if d.Name == tok.value {
-					desc = d
-					break
-				}
-			}
-			if desc == nil {
-				return p.errorf("unrecognized extension %q", tok.value)
-			}
-			// Check the extension terminator.
-			tok = p.next()
-			if tok.err != nil {
-				return tok.err
-			}
-			if tok.value != "]" {
-				return p.errorf("unrecognized extension terminator %q", tok.value)
-			}
-
-			props := &Properties{}
-			props.Parse(desc.Tag)
-
-			typ := reflect.TypeOf(desc.ExtensionType)
-			if err := p.checkForColon(props, typ); err != nil {
-				return err
-			}
-
-			rep := desc.repeated()
-
-			// Read the extension structure, and set it in
-			// the value we're constructing.
-			var ext reflect.Value
-			if !rep {
-				ext = reflect.New(typ).Elem()
-			} else {
-				ext = reflect.New(typ.Elem()).Elem()
-			}
-			if err := p.readAny(ext, props); err != nil {
-				if _, ok := err.(*RequiredNotSetError); !ok {
-					return err
-				}
-				reqFieldErr = err
-			}
-			ep := sv.Addr().Interface().(extendableProto)
-			if !rep {
-				SetExtension(ep, desc, ext.Interface())
-			} else {
-				old, err := GetExtension(ep, desc)
-				var sl reflect.Value
-				if err == nil {
-					sl = reflect.ValueOf(old) // existing slice
-				} else {
-					sl = reflect.MakeSlice(typ, 0, 1)
-				}
-				sl = reflect.Append(sl, ext)
-				SetExtension(ep, desc, sl.Interface())
-			}
-		} else {
-			// This is a normal, non-extension field.
-			name := tok.value
-			fi, props, ok := structFieldByName(st, name)
-			if !ok {
-				return p.errorf("unknown field name %q in %v", name, st)
-			}
-
-			dst := sv.Field(fi)
-
-			if dst.Kind() == reflect.Map {
-				// Consume any colon.
-				if err := p.checkForColon(props, dst.Type()); err != nil {
-					return err
-				}
-
-				// Construct the map if it doesn't already exist.
-				if dst.IsNil() {
-					dst.Set(reflect.MakeMap(dst.Type()))
-				}
-				key := reflect.New(dst.Type().Key()).Elem()
-				val := reflect.New(dst.Type().Elem()).Elem()
-
-				// The map entry should be this sequence of tokens:
-				//	< key : KEY value : VALUE >
-				// Technically the "key" and "value" could come in any order,
-				// but in practice they won't.
-
-				tok := p.next()
-				var terminator string
-				switch tok.value {
-				case "<":
-					terminator = ">"
-				case "{":
-					terminator = "}"
-				default:
-					return p.errorf("expected '{' or '<', found %q", tok.value)
-				}
-				if err := p.consumeToken("key"); err != nil {
-					return err
-				}
-				if err := p.consumeToken(":"); err != nil {
-					return err
-				}
-				if err := p.readAny(key, props.mkeyprop); err != nil {
-					return err
-				}
-				if err := p.consumeOptionalSeparator(); err != nil {
-					return err
-				}
-				if err := p.consumeToken("value"); err != nil {
-					return err
-				}
-				if err := p.checkForColon(props.mvalprop, dst.Type().Elem()); err != nil {
-					return err
-				}
-				if err := p.readAny(val, props.mvalprop); err != nil {
-					return err
-				}
-				if err := p.consumeOptionalSeparator(); err != nil {
-					return err
-				}
-				if err := p.consumeToken(terminator); err != nil {
-					return err
-				}
-
-				dst.SetMapIndex(key, val)
-				continue
-			}
-
-			// Check that it's not already set if it's not a repeated field.
-			if !props.Repeated && fieldSet[name] {
-				return p.errorf("non-repeated field %q was repeated", name)
-			}
-
-			if err := p.checkForColon(props, st.Field(fi).Type); err != nil {
-				return err
-			}
-
-			// Parse into the field.
-			fieldSet[name] = true
-			if err := p.readAny(dst, props); err != nil {
-				if _, ok := err.(*RequiredNotSetError); !ok {
-					return err
-				}
-				reqFieldErr = err
-			} else if props.Required {
-				reqCount--
-			}
-		}
-
-		if err := p.consumeOptionalSeparator(); err != nil {
-			return err
-		}
-
-	}
-
-	if reqCount > 0 {
-		return p.missingRequiredFieldError(sv)
-	}
-	return reqFieldErr
-}
-
-// consumeOptionalSeparator consumes an optional semicolon or comma.
-// It is used in readStruct to provide backward compatibility.
-func (p *textParser) consumeOptionalSeparator() error {
-	tok := p.next()
-	if tok.err != nil {
-		return tok.err
-	}
-	if tok.value != ";" && tok.value != "," {
-		p.back()
-	}
-	return nil
-}
-
-func (p *textParser) readAny(v reflect.Value, props *Properties) error {
-	tok := p.next()
-	if tok.err != nil {
-		return tok.err
-	}
-	if tok.value == "" {
-		return p.errorf("unexpected EOF")
-	}
-
-	switch fv := v; fv.Kind() {
-	case reflect.Slice:
-		at := v.Type()
-		if at.Elem().Kind() == reflect.Uint8 {
-			// Special case for []byte
-			if tok.value[0] != '"' && tok.value[0] != '\'' {
-				// Deliberately written out here, as the error after
-				// this switch statement would write "invalid []byte: ...",
-				// which is not as user-friendly.
-				return p.errorf("invalid string: %v", tok.value)
-			}
-			bytes := []byte(tok.unquoted)
-			fv.Set(reflect.ValueOf(bytes))
-			return nil
-		}
-		// Repeated field. May already exist.
-		flen := fv.Len()
-		if flen == fv.Cap() {
-			nav := reflect.MakeSlice(at, flen, 2*flen+1)
-			reflect.Copy(nav, fv)
-			fv.Set(nav)
-		}
-		fv.SetLen(flen + 1)
-
-		// Read one.
-		p.back()
-		return p.readAny(fv.Index(flen), props)
-	case reflect.Bool:
-		// Either "true", "false", 1 or 0.
-		switch tok.value {
-		case "true", "1":
-			fv.SetBool(true)
-			return nil
-		case "false", "0":
-			fv.SetBool(false)
-			return nil
-		}
-	case reflect.Float32, reflect.Float64:
-		v := tok.value
-		// Ignore 'f' for compatibility with output generated by C++, but don't
-		// remove 'f' when the value is "-inf" or "inf".
-		if strings.HasSuffix(v, "f") && tok.value != "-inf" && tok.value != "inf" {
-			v = v[:len(v)-1]
-		}
-		if f, err := strconv.ParseFloat(v, fv.Type().Bits()); err == nil {
-			fv.SetFloat(f)
-			return nil
-		}
-	case reflect.Int32:
-		if x, err := strconv.ParseInt(tok.value, 0, 32); err == nil {
-			fv.SetInt(x)
-			return nil
-		}
-
-		if len(props.Enum) == 0 {
-			break
-		}
-		m, ok := enumValueMaps[props.Enum]
-		if !ok {
-			break
-		}
-		x, ok := m[tok.value]
-		if !ok {
-			break
-		}
-		fv.SetInt(int64(x))
-		return nil
-	case reflect.Int64:
-		if x, err := strconv.ParseInt(tok.value, 0, 64); err == nil {
-			fv.SetInt(x)
-			return nil
-		}
-
-	case reflect.Ptr:
-		// A basic field (indirected through pointer), or a repeated message/group
-		p.back()
-		fv.Set(reflect.New(fv.Type().Elem()))
-		return p.readAny(fv.Elem(), props)
-	case reflect.String:
-		if tok.value[0] == '"' || tok.value[0] == '\'' {
-			fv.SetString(tok.unquoted)
-			return nil
-		}
-	case reflect.Struct:
-		var terminator string
-		switch tok.value {
-		case "{":
-			terminator = "}"
-		case "<":
-			terminator = ">"
-		default:
-			return p.errorf("expected '{' or '<', found %q", tok.value)
-		}
-		// TODO: Handle nested messages which implement encoding.TextUnmarshaler.
-		return p.readStruct(fv, terminator)
-	case reflect.Uint32:
-		if x, err := strconv.ParseUint(tok.value, 0, 32); err == nil {
-			fv.SetUint(uint64(x))
-			return nil
-		}
-	case reflect.Uint64:
-		if x, err := strconv.ParseUint(tok.value, 0, 64); err == nil {
-			fv.SetUint(x)
-			return nil
-		}
-	}
-	return p.errorf("invalid %v: %v", v.Type(), tok.value)
-}
-
-// UnmarshalText reads a protocol buffer in Text format. UnmarshalText resets pb
-// before starting to unmarshal, so any existing data in pb is always removed.
-// If a required field is not set and no other error occurs,
-// UnmarshalText returns *RequiredNotSetError.
-func UnmarshalText(s string, pb Message) error {
-	if um, ok := pb.(encoding.TextUnmarshaler); ok {
-		err := um.UnmarshalText([]byte(s))
-		return err
-	}
-	pb.Reset()
-	v := reflect.ValueOf(pb)
-	if pe := newTextParser(s).readStruct(v.Elem(), ""); pe != nil {
-		return pe
-	}
-	return nil
-}
diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/proto/text_parser_test.go b/Godeps/_workspace/src/github.com/golang/protobuf/proto/text_parser_test.go
deleted file mode 100644
index 0754b2626..000000000
--- a/Godeps/_workspace/src/github.com/golang/protobuf/proto/text_parser_test.go
+++ /dev/null
@@ -1,511 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2010 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// 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.
-
-package proto_test
-
-import (
-	"math"
-	"reflect"
-	"testing"
-
-	. "github.com/golang/protobuf/proto"
-	proto3pb "github.com/golang/protobuf/proto/proto3_proto"
-	. "github.com/golang/protobuf/proto/testdata"
-)
-
-type UnmarshalTextTest struct {
-	in  string
-	err string // if "", no error expected
-	out *MyMessage
-}
-
-func buildExtStructTest(text string) UnmarshalTextTest {
-	msg := &MyMessage{
-		Count: Int32(42),
-	}
-	SetExtension(msg, E_Ext_More, &Ext{
-		Data: String("Hello, world!"),
-	})
-	return UnmarshalTextTest{in: text, out: msg}
-}
-
-func buildExtDataTest(text string) UnmarshalTextTest {
-	msg := &MyMessage{
-		Count: Int32(42),
-	}
-	SetExtension(msg, E_Ext_Text, String("Hello, world!"))
-	SetExtension(msg, E_Ext_Number, Int32(1729))
-	return UnmarshalTextTest{in: text, out: msg}
-}
-
-func buildExtRepStringTest(text string) UnmarshalTextTest {
-	msg := &MyMessage{
-		Count: Int32(42),
-	}
-	if err := SetExtension(msg, E_Greeting, []string{"bula", "hola"}); err != nil {
-		panic(err)
-	}
-	return UnmarshalTextTest{in: text, out: msg}
-}
-
-var unMarshalTextTests = []UnmarshalTextTest{
-	// Basic
-	{
-		in: " count:42\n  name:\"Dave\" ",
-		out: &MyMessage{
-			Count: Int32(42),
-			Name:  String("Dave"),
-		},
-	},
-
-	// Empty quoted string
-	{
-		in: `count:42 name:""`,
-		out: &MyMessage{
-			Count: Int32(42),
-			Name:  String(""),
-		},
-	},
-
-	// Quoted string concatenation
-	{
-		in: `count:42 name: "My name is "` + "\n" + `"elsewhere"`,
-		out: &MyMessage{
-			Count: Int32(42),
-			Name:  String("My name is elsewhere"),
-		},
-	},
-
-	// Quoted string with escaped apostrophe
-	{
-		in: `count:42 name: "HOLIDAY - New Year\'s Day"`,
-		out: &MyMessage{
-			Count: Int32(42),
-			Name:  String("HOLIDAY - New Year's Day"),
-		},
-	},
-
-	// Quoted string with single quote
-	{
-		in: `count:42 name: 'Roger "The Ramster" Ramjet'`,
-		out: &MyMessage{
-			Count: Int32(42),
-			Name:  String(`Roger "The Ramster" Ramjet`),
-		},
-	},
-
-	// Quoted string with all the accepted special characters from the C++ test
-	{
-		in: `count:42 name: ` + "\"\\\"A string with \\' characters \\n and \\r newlines and \\t tabs and \\001 slashes \\\\ and  multiple   spaces\"",
-		out: &MyMessage{
-			Count: Int32(42),
-			Name:  String("\"A string with ' characters \n and \r newlines and \t tabs and \001 slashes \\ and  multiple   spaces"),
-		},
-	},
-
-	// Quoted string with quoted backslash
-	{
-		in: `count:42 name: "\\'xyz"`,
-		out: &MyMessage{
-			Count: Int32(42),
-			Name:  String(`\'xyz`),
-		},
-	},
-
-	// Quoted string with UTF-8 bytes.
-	{
-		in: "count:42 name: '\303\277\302\201\xAB'",
-		out: &MyMessage{
-			Count: Int32(42),
-			Name:  String("\303\277\302\201\xAB"),
-		},
-	},
-
-	// Bad quoted string
-	{
-		in:  `inner: < host: "\0" >` + "\n",
-		err: `line 1.15: invalid quoted string "\0": \0 requires 2 following digits`,
-	},
-
-	// Number too large for int64
-	{
-		in:  "count: 1 others { key: 123456789012345678901 }",
-		err: "line 1.23: invalid int64: 123456789012345678901",
-	},
-
-	// Number too large for int32
-	{
-		in:  "count: 1234567890123",
-		err: "line 1.7: invalid int32: 1234567890123",
-	},
-
-	// Number in hexadecimal
-	{
-		in: "count: 0x2beef",
-		out: &MyMessage{
-			Count: Int32(0x2beef),
-		},
-	},
-
-	// Number in octal
-	{
-		in: "count: 024601",
-		out: &MyMessage{
-			Count: Int32(024601),
-		},
-	},
-
-	// Floating point number with "f" suffix
-	{
-		in: "count: 4 others:< weight: 17.0f >",
-		out: &MyMessage{
-			Count: Int32(4),
-			Others: []*OtherMessage{
-				{
-					Weight: Float32(17),
-				},
-			},
-		},
-	},
-
-	// Floating point positive infinity
-	{
-		in: "count: 4 bigfloat: inf",
-		out: &MyMessage{
-			Count:    Int32(4),
-			Bigfloat: Float64(math.Inf(1)),
-		},
-	},
-
-	// Floating point negative infinity
-	{
-		in: "count: 4 bigfloat: -inf",
-		out: &MyMessage{
-			Count:    Int32(4),
-			Bigfloat: Float64(math.Inf(-1)),
-		},
-	},
-
-	// Number too large for float32
-	{
-		in:  "others:< weight: 12345678901234567890123456789012345678901234567890 >",
-		err: "line 1.17: invalid float32: 12345678901234567890123456789012345678901234567890",
-	},
-
-	// Number posing as a quoted string
-	{
-		in:  `inner: < host: 12 >` + "\n",
-		err: `line 1.15: invalid string: 12`,
-	},
-
-	// Quoted string posing as int32
-	{
-		in:  `count: "12"`,
-		err: `line 1.7: invalid int32: "12"`,
-	},
-
-	// Quoted string posing a float32
-	{
-		in:  `others:< weight: "17.4" >`,
-		err: `line 1.17: invalid float32: "17.4"`,
-	},
-
-	// Enum
-	{
-		in: `count:42 bikeshed: BLUE`,
-		out: &MyMessage{
-			Count:    Int32(42),
-			Bikeshed: MyMessage_BLUE.Enum(),
-		},
-	},
-
-	// Repeated field
-	{
-		in: `count:42 pet: "horsey" pet:"bunny"`,
-		out: &MyMessage{
-			Count: Int32(42),
-			Pet:   []string{"horsey", "bunny"},
-		},
-	},
-
-	// Repeated message with/without colon and <>/{}
-	{
-		in: `count:42 others:{} others{} others:<> others:{}`,
-		out: &MyMessage{
-			Count: Int32(42),
-			Others: []*OtherMessage{
-				{},
-				{},
-				{},
-				{},
-			},
-		},
-	},
-
-	// Missing colon for inner message
-	{
-		in: `count:42 inner < host: "cauchy.syd" >`,
-		out: &MyMessage{
-			Count: Int32(42),
-			Inner: &InnerMessage{
-				Host: String("cauchy.syd"),
-			},
-		},
-	},
-
-	// Missing colon for string field
-	{
-		in:  `name "Dave"`,
-		err: `line 1.5: expected ':', found "\"Dave\""`,
-	},
-
-	// Missing colon for int32 field
-	{
-		in:  `count 42`,
-		err: `line 1.6: expected ':', found "42"`,
-	},
-
-	// Missing required field
-	{
-		in:  `name: "Pawel"`,
-		err: `proto: required field "testdata.MyMessage.count" not set`,
-		out: &MyMessage{
-			Name: String("Pawel"),
-		},
-	},
-
-	// Repeated non-repeated field
-	{
-		in:  `name: "Rob" name: "Russ"`,
-		err: `line 1.12: non-repeated field "name" was repeated`,
-	},
-
-	// Group
-	{
-		in: `count: 17 SomeGroup { group_field: 12 }`,
-		out: &MyMessage{
-			Count: Int32(17),
-			Somegroup: &MyMessage_SomeGroup{
-				GroupField: Int32(12),
-			},
-		},
-	},
-
-	// Semicolon between fields
-	{
-		in: `count:3;name:"Calvin"`,
-		out: &MyMessage{
-			Count: Int32(3),
-			Name:  String("Calvin"),
-		},
-	},
-	// Comma between fields
-	{
-		in: `count:4,name:"Ezekiel"`,
-		out: &MyMessage{
-			Count: Int32(4),
-			Name:  String("Ezekiel"),
-		},
-	},
-
-	// Extension
-	buildExtStructTest(`count: 42 [testdata.Ext.more]:<data:"Hello, world!" >`),
-	buildExtStructTest(`count: 42 [testdata.Ext.more] {data:"Hello, world!"}`),
-	buildExtDataTest(`count: 42 [testdata.Ext.text]:"Hello, world!" [testdata.Ext.number]:1729`),
-	buildExtRepStringTest(`count: 42 [testdata.greeting]:"bula" [testdata.greeting]:"hola"`),
-
-	// Big all-in-one
-	{
-		in: "count:42  # Meaning\n" +
-			`name:"Dave" ` +
-			`quote:"\"I didn't want to go.\"" ` +
-			`pet:"bunny" ` +
-			`pet:"kitty" ` +
-			`pet:"horsey" ` +
-			`inner:<` +
-			`  host:"footrest.syd" ` +
-			`  port:7001 ` +
-			`  connected:true ` +
-			`> ` +
-			`others:<` +
-			`  key:3735928559 ` +
-			`  value:"\x01A\a\f" ` +
-			`> ` +
-			`others:<` +
-			"  weight:58.9  # Atomic weight of Co\n" +
-			`  inner:<` +
-			`    host:"lesha.mtv" ` +
-			`    port:8002 ` +
-			`  >` +
-			`>`,
-		out: &MyMessage{
-			Count: Int32(42),
-			Name:  String("Dave"),
-			Quote: String(`"I didn't want to go."`),
-			Pet:   []string{"bunny", "kitty", "horsey"},
-			Inner: &InnerMessage{
-				Host:      String("footrest.syd"),
-				Port:      Int32(7001),
-				Connected: Bool(true),
-			},
-			Others: []*OtherMessage{
-				{
-					Key:   Int64(3735928559),
-					Value: []byte{0x1, 'A', '\a', '\f'},
-				},
-				{
-					Weight: Float32(58.9),
-					Inner: &InnerMessage{
-						Host: String("lesha.mtv"),
-						Port: Int32(8002),
-					},
-				},
-			},
-		},
-	},
-}
-
-func TestUnmarshalText(t *testing.T) {
-	for i, test := range unMarshalTextTests {
-		pb := new(MyMessage)
-		err := UnmarshalText(test.in, pb)
-		if test.err == "" {
-			// We don't expect failure.
-			if err != nil {
-				t.Errorf("Test %d: Unexpected error: %v", i, err)
-			} else if !reflect.DeepEqual(pb, test.out) {
-				t.Errorf("Test %d: Incorrect populated \nHave: %v\nWant: %v",
-					i, pb, test.out)
-			}
-		} else {
-			// We do expect failure.
-			if err == nil {
-				t.Errorf("Test %d: Didn't get expected error: %v", i, test.err)
-			} else if err.Error() != test.err {
-				t.Errorf("Test %d: Incorrect error.\nHave: %v\nWant: %v",
-					i, err.Error(), test.err)
-			} else if _, ok := err.(*RequiredNotSetError); ok && test.out != nil && !reflect.DeepEqual(pb, test.out) {
-				t.Errorf("Test %d: Incorrect populated \nHave: %v\nWant: %v",
-					i, pb, test.out)
-			}
-		}
-	}
-}
-
-func TestUnmarshalTextCustomMessage(t *testing.T) {
-	msg := &textMessage{}
-	if err := UnmarshalText("custom", msg); err != nil {
-		t.Errorf("Unexpected error from custom unmarshal: %v", err)
-	}
-	if UnmarshalText("not custom", msg) == nil {
-		t.Errorf("Didn't get expected error from custom unmarshal")
-	}
-}
-
-// Regression test; this caused a panic.
-func TestRepeatedEnum(t *testing.T) {
-	pb := new(RepeatedEnum)
-	if err := UnmarshalText("color: RED", pb); err != nil {
-		t.Fatal(err)
-	}
-	exp := &RepeatedEnum{
-		Color: []RepeatedEnum_Color{RepeatedEnum_RED},
-	}
-	if !Equal(pb, exp) {
-		t.Errorf("Incorrect populated \nHave: %v\nWant: %v", pb, exp)
-	}
-}
-
-func TestProto3TextParsing(t *testing.T) {
-	m := new(proto3pb.Message)
-	const in = `name: "Wallace" true_scotsman: true`
-	want := &proto3pb.Message{
-		Name:         "Wallace",
-		TrueScotsman: true,
-	}
-	if err := UnmarshalText(in, m); err != nil {
-		t.Fatal(err)
-	}
-	if !Equal(m, want) {
-		t.Errorf("\n got %v\nwant %v", m, want)
-	}
-}
-
-func TestMapParsing(t *testing.T) {
-	m := new(MessageWithMap)
-	const in = `name_mapping:<key:1234 value:"Feist"> name_mapping:<key:1 value:"Beatles">` +
-		`msg_mapping:<key:-4, value:<f: 2.0>,>` + // separating commas are okay
-		`msg_mapping<key:-2 value<f: 4.0>>` + // no colon after "value"
-		`byte_mapping:<key:true value:"so be it">`
-	want := &MessageWithMap{
-		NameMapping: map[int32]string{
-			1:    "Beatles",
-			1234: "Feist",
-		},
-		MsgMapping: map[int64]*FloatingPoint{
-			-4: {F: Float64(2.0)},
-			-2: {F: Float64(4.0)},
-		},
-		ByteMapping: map[bool][]byte{
-			true: []byte("so be it"),
-		},
-	}
-	if err := UnmarshalText(in, m); err != nil {
-		t.Fatal(err)
-	}
-	if !Equal(m, want) {
-		t.Errorf("\n got %v\nwant %v", m, want)
-	}
-}
-
-var benchInput string
-
-func init() {
-	benchInput = "count: 4\n"
-	for i := 0; i < 1000; i++ {
-		benchInput += "pet: \"fido\"\n"
-	}
-
-	// Check it is valid input.
-	pb := new(MyMessage)
-	err := UnmarshalText(benchInput, pb)
-	if err != nil {
-		panic("Bad benchmark input: " + err.Error())
-	}
-}
-
-func BenchmarkUnmarshalText(b *testing.B) {
-	pb := new(MyMessage)
-	for i := 0; i < b.N; i++ {
-		UnmarshalText(benchInput, pb)
-	}
-	b.SetBytes(int64(len(benchInput)))
-}
diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/proto/text_test.go b/Godeps/_workspace/src/github.com/golang/protobuf/proto/text_test.go
deleted file mode 100644
index 64579e94d..000000000
--- a/Godeps/_workspace/src/github.com/golang/protobuf/proto/text_test.go
+++ /dev/null
@@ -1,450 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2010 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// 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.
-
-package proto_test
-
-import (
-	"bytes"
-	"errors"
-	"io/ioutil"
-	"math"
-	"strings"
-	"testing"
-
-	"github.com/golang/protobuf/proto"
-
-	proto3pb "github.com/golang/protobuf/proto/proto3_proto"
-	pb "github.com/golang/protobuf/proto/testdata"
-)
-
-// textMessage implements the methods that allow it to marshal and unmarshal
-// itself as text.
-type textMessage struct {
-}
-
-func (*textMessage) MarshalText() ([]byte, error) {
-	return []byte("custom"), nil
-}
-
-func (*textMessage) UnmarshalText(bytes []byte) error {
-	if string(bytes) != "custom" {
-		return errors.New("expected 'custom'")
-	}
-	return nil
-}
-
-func (*textMessage) Reset()         {}
-func (*textMessage) String() string { return "" }
-func (*textMessage) ProtoMessage()  {}
-
-func newTestMessage() *pb.MyMessage {
-	msg := &pb.MyMessage{
-		Count: proto.Int32(42),
-		Name:  proto.String("Dave"),
-		Quote: proto.String(`"I didn't want to go."`),
-		Pet:   []string{"bunny", "kitty", "horsey"},
-		Inner: &pb.InnerMessage{
-			Host:      proto.String("footrest.syd"),
-			Port:      proto.Int32(7001),
-			Connected: proto.Bool(true),
-		},
-		Others: []*pb.OtherMessage{
-			{
-				Key:   proto.Int64(0xdeadbeef),
-				Value: []byte{1, 65, 7, 12},
-			},
-			{
-				Weight: proto.Float32(6.022),
-				Inner: &pb.InnerMessage{
-					Host: proto.String("lesha.mtv"),
-					Port: proto.Int32(8002),
-				},
-			},
-		},
-		Bikeshed: pb.MyMessage_BLUE.Enum(),
-		Somegroup: &pb.MyMessage_SomeGroup{
-			GroupField: proto.Int32(8),
-		},
-		// One normally wouldn't do this.
-		// This is an undeclared tag 13, as a varint (wire type 0) with value 4.
-		XXX_unrecognized: []byte{13<<3 | 0, 4},
-	}
-	ext := &pb.Ext{
-		Data: proto.String("Big gobs for big rats"),
-	}
-	if err := proto.SetExtension(msg, pb.E_Ext_More, ext); err != nil {
-		panic(err)
-	}
-	greetings := []string{"adg", "easy", "cow"}
-	if err := proto.SetExtension(msg, pb.E_Greeting, greetings); err != nil {
-		panic(err)
-	}
-
-	// Add an unknown extension. We marshal a pb.Ext, and fake the ID.
-	b, err := proto.Marshal(&pb.Ext{Data: proto.String("3G skiing")})
-	if err != nil {
-		panic(err)
-	}
-	b = append(proto.EncodeVarint(201<<3|proto.WireBytes), b...)
-	proto.SetRawExtension(msg, 201, b)
-
-	// Extensions can be plain fields, too, so let's test that.
-	b = append(proto.EncodeVarint(202<<3|proto.WireVarint), 19)
-	proto.SetRawExtension(msg, 202, b)
-
-	return msg
-}
-
-const text = `count: 42
-name: "Dave"
-quote: "\"I didn't want to go.\""
-pet: "bunny"
-pet: "kitty"
-pet: "horsey"
-inner: <
-  host: "footrest.syd"
-  port: 7001
-  connected: true
->
-others: <
-  key: 3735928559
-  value: "\001A\007\014"
->
-others: <
-  weight: 6.022
-  inner: <
-    host: "lesha.mtv"
-    port: 8002
-  >
->
-bikeshed: BLUE
-SomeGroup {
-  group_field: 8
-}
-/* 2 unknown bytes */
-13: 4
-[testdata.Ext.more]: <
-  data: "Big gobs for big rats"
->
-[testdata.greeting]: "adg"
-[testdata.greeting]: "easy"
-[testdata.greeting]: "cow"
-/* 13 unknown bytes */
-201: "\t3G skiing"
-/* 3 unknown bytes */
-202: 19
-`
-
-func TestMarshalText(t *testing.T) {
-	buf := new(bytes.Buffer)
-	if err := proto.MarshalText(buf, newTestMessage()); err != nil {
-		t.Fatalf("proto.MarshalText: %v", err)
-	}
-	s := buf.String()
-	if s != text {
-		t.Errorf("Got:\n===\n%v===\nExpected:\n===\n%v===\n", s, text)
-	}
-}
-
-func TestMarshalTextCustomMessage(t *testing.T) {
-	buf := new(bytes.Buffer)
-	if err := proto.MarshalText(buf, &textMessage{}); err != nil {
-		t.Fatalf("proto.MarshalText: %v", err)
-	}
-	s := buf.String()
-	if s != "custom" {
-		t.Errorf("Got %q, expected %q", s, "custom")
-	}
-}
-func TestMarshalTextNil(t *testing.T) {
-	want := "<nil>"
-	tests := []proto.Message{nil, (*pb.MyMessage)(nil)}
-	for i, test := range tests {
-		buf := new(bytes.Buffer)
-		if err := proto.MarshalText(buf, test); err != nil {
-			t.Fatal(err)
-		}
-		if got := buf.String(); got != want {
-			t.Errorf("%d: got %q want %q", i, got, want)
-		}
-	}
-}
-
-func TestMarshalTextUnknownEnum(t *testing.T) {
-	// The Color enum only specifies values 0-2.
-	m := &pb.MyMessage{Bikeshed: pb.MyMessage_Color(3).Enum()}
-	got := m.String()
-	const want = `bikeshed:3 `
-	if got != want {
-		t.Errorf("\n got %q\nwant %q", got, want)
-	}
-}
-
-func BenchmarkMarshalTextBuffered(b *testing.B) {
-	buf := new(bytes.Buffer)
-	m := newTestMessage()
-	for i := 0; i < b.N; i++ {
-		buf.Reset()
-		proto.MarshalText(buf, m)
-	}
-}
-
-func BenchmarkMarshalTextUnbuffered(b *testing.B) {
-	w := ioutil.Discard
-	m := newTestMessage()
-	for i := 0; i < b.N; i++ {
-		proto.MarshalText(w, m)
-	}
-}
-
-func compact(src string) string {
-	// s/[ \n]+/ /g; s/ $//;
-	dst := make([]byte, len(src))
-	space, comment := false, false
-	j := 0
-	for i := 0; i < len(src); i++ {
-		if strings.HasPrefix(src[i:], "/*") {
-			comment = true
-			i++
-			continue
-		}
-		if comment && strings.HasPrefix(src[i:], "*/") {
-			comment = false
-			i++
-			continue
-		}
-		if comment {
-			continue
-		}
-		c := src[i]
-		if c == ' ' || c == '\n' {
-			space = true
-			continue
-		}
-		if j > 0 && (dst[j-1] == ':' || dst[j-1] == '<' || dst[j-1] == '{') {
-			space = false
-		}
-		if c == '{' {
-			space = false
-		}
-		if space {
-			dst[j] = ' '
-			j++
-			space = false
-		}
-		dst[j] = c
-		j++
-	}
-	if space {
-		dst[j] = ' '
-		j++
-	}
-	return string(dst[0:j])
-}
-
-var compactText = compact(text)
-
-func TestCompactText(t *testing.T) {
-	s := proto.CompactTextString(newTestMessage())
-	if s != compactText {
-		t.Errorf("Got:\n===\n%v===\nExpected:\n===\n%v\n===\n", s, compactText)
-	}
-}
-
-func TestStringEscaping(t *testing.T) {
-	testCases := []struct {
-		in  *pb.Strings
-		out string
-	}{
-		{
-			// Test data from C++ test (TextFormatTest.StringEscape).
-			// Single divergence: we don't escape apostrophes.
-			&pb.Strings{StringField: proto.String("\"A string with ' characters \n and \r newlines and \t tabs and \001 slashes \\ and  multiple   spaces")},
-			"string_field: \"\\\"A string with ' characters \\n and \\r newlines and \\t tabs and \\001 slashes \\\\ and  multiple   spaces\"\n",
-		},
-		{
-			// Test data from the same C++ test.
-			&pb.Strings{StringField: proto.String("\350\260\267\346\255\214")},
-			"string_field: \"\\350\\260\\267\\346\\255\\214\"\n",
-		},
-		{
-			// Some UTF-8.
-			&pb.Strings{StringField: proto.String("\x00\x01\xff\x81")},
-			`string_field: "\000\001\377\201"` + "\n",
-		},
-	}
-
-	for i, tc := range testCases {
-		var buf bytes.Buffer
-		if err := proto.MarshalText(&buf, tc.in); err != nil {
-			t.Errorf("proto.MarsalText: %v", err)
-			continue
-		}
-		s := buf.String()
-		if s != tc.out {
-			t.Errorf("#%d: Got:\n%s\nExpected:\n%s\n", i, s, tc.out)
-			continue
-		}
-
-		// Check round-trip.
-		pb := new(pb.Strings)
-		if err := proto.UnmarshalText(s, pb); err != nil {
-			t.Errorf("#%d: UnmarshalText: %v", i, err)
-			continue
-		}
-		if !proto.Equal(pb, tc.in) {
-			t.Errorf("#%d: Round-trip failed:\nstart: %v\n  end: %v", i, tc.in, pb)
-		}
-	}
-}
-
-// A limitedWriter accepts some output before it fails.
-// This is a proxy for something like a nearly-full or imminently-failing disk,
-// or a network connection that is about to die.
-type limitedWriter struct {
-	b     bytes.Buffer
-	limit int
-}
-
-var outOfSpace = errors.New("proto: insufficient space")
-
-func (w *limitedWriter) Write(p []byte) (n int, err error) {
-	var avail = w.limit - w.b.Len()
-	if avail <= 0 {
-		return 0, outOfSpace
-	}
-	if len(p) <= avail {
-		return w.b.Write(p)
-	}
-	n, _ = w.b.Write(p[:avail])
-	return n, outOfSpace
-}
-
-func TestMarshalTextFailing(t *testing.T) {
-	// Try lots of different sizes to exercise more error code-paths.
-	for lim := 0; lim < len(text); lim++ {
-		buf := new(limitedWriter)
-		buf.limit = lim
-		err := proto.MarshalText(buf, newTestMessage())
-		// We expect a certain error, but also some partial results in the buffer.
-		if err != outOfSpace {
-			t.Errorf("Got:\n===\n%v===\nExpected:\n===\n%v===\n", err, outOfSpace)
-		}
-		s := buf.b.String()
-		x := text[:buf.limit]
-		if s != x {
-			t.Errorf("Got:\n===\n%v===\nExpected:\n===\n%v===\n", s, x)
-		}
-	}
-}
-
-func TestFloats(t *testing.T) {
-	tests := []struct {
-		f    float64
-		want string
-	}{
-		{0, "0"},
-		{4.7, "4.7"},
-		{math.Inf(1), "inf"},
-		{math.Inf(-1), "-inf"},
-		{math.NaN(), "nan"},
-	}
-	for _, test := range tests {
-		msg := &pb.FloatingPoint{F: &test.f}
-		got := strings.TrimSpace(msg.String())
-		want := `f:` + test.want
-		if got != want {
-			t.Errorf("f=%f: got %q, want %q", test.f, got, want)
-		}
-	}
-}
-
-func TestRepeatedNilText(t *testing.T) {
-	m := &pb.MessageList{
-		Message: []*pb.MessageList_Message{
-			nil,
-			&pb.MessageList_Message{
-				Name: proto.String("Horse"),
-			},
-			nil,
-		},
-	}
-	want := `Message <nil>
-Message {
-  name: "Horse"
-}
-Message <nil>
-`
-	if s := proto.MarshalTextString(m); s != want {
-		t.Errorf(" got: %s\nwant: %s", s, want)
-	}
-}
-
-func TestProto3Text(t *testing.T) {
-	tests := []struct {
-		m    proto.Message
-		want string
-	}{
-		// zero message
-		{&proto3pb.Message{}, ``},
-		// zero message except for an empty byte slice
-		{&proto3pb.Message{Data: []byte{}}, ``},
-		// trivial case
-		{&proto3pb.Message{Name: "Rob", HeightInCm: 175}, `name:"Rob" height_in_cm:175`},
-		// empty map
-		{&pb.MessageWithMap{}, ``},
-		// non-empty map; map format is the same as a repeated struct,
-		// and they are sorted by key (numerically for numeric keys).
-		{
-			&pb.MessageWithMap{NameMapping: map[int32]string{
-				-1:      "Negatory",
-				7:       "Lucky",
-				1234:    "Feist",
-				6345789: "Otis",
-			}},
-			`name_mapping:<key:-1 value:"Negatory" > ` +
-				`name_mapping:<key:7 value:"Lucky" > ` +
-				`name_mapping:<key:1234 value:"Feist" > ` +
-				`name_mapping:<key:6345789 value:"Otis" >`,
-		},
-		// map with nil value; not well-defined, but we shouldn't crash
-		{
-			&pb.MessageWithMap{MsgMapping: map[int64]*pb.FloatingPoint{7: nil}},
-			`msg_mapping:<key:7 >`,
-		},
-	}
-	for _, test := range tests {
-		got := strings.TrimSpace(test.m.String())
-		if got != test.want {
-			t.Errorf("\n got %s\nwant %s", got, test.want)
-		}
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/golang/snappy/AUTHORS b/Godeps/_workspace/src/github.com/golang/snappy/AUTHORS
deleted file mode 100644
index 824bf2e14..000000000
--- a/Godeps/_workspace/src/github.com/golang/snappy/AUTHORS
+++ /dev/null
@@ -1,14 +0,0 @@
-# This is the official list of Snappy-Go authors for copyright purposes.
-# This file is distinct from the CONTRIBUTORS files.
-# See the latter for an explanation.
-
-# Names should be added to this file as
-#	Name or Organization <email address>
-# The email address is not required for organizations.
-
-# Please keep the list sorted.
-
-Damian Gryski <dgryski@gmail.com>
-Google Inc.
-Jan Mercl <0xjnml@gmail.com>
-Sebastien Binet <seb.binet@gmail.com>
diff --git a/Godeps/_workspace/src/github.com/golang/snappy/CONTRIBUTORS b/Godeps/_workspace/src/github.com/golang/snappy/CONTRIBUTORS
deleted file mode 100644
index 9f54f21ff..000000000
--- a/Godeps/_workspace/src/github.com/golang/snappy/CONTRIBUTORS
+++ /dev/null
@@ -1,36 +0,0 @@
-# This is the official list of people who can contribute
-# (and typically have contributed) code to the Snappy-Go repository.
-# The AUTHORS file lists the copyright holders; this file
-# lists people.  For example, Google employees are listed here
-# but not in AUTHORS, because Google holds the copyright.
-#
-# The submission process automatically checks to make sure
-# that people submitting code are listed in this file (by email address).
-#
-# Names should be added to this file only after verifying that
-# the individual or the individual's organization has agreed to
-# the appropriate Contributor License Agreement, found here:
-#
-#     http://code.google.com/legal/individual-cla-v1.0.html
-#     http://code.google.com/legal/corporate-cla-v1.0.html
-#
-# The agreement for individuals can be filled out on the web.
-#
-# When adding J Random Contributor's name to this file,
-# either J's name or J's organization's name should be
-# added to the AUTHORS file, depending on whether the
-# individual or corporate CLA was used.
-
-# Names should be added to this file like so:
-#     Name <email address>
-
-# Please keep the list sorted.
-
-Damian Gryski <dgryski@gmail.com>
-Jan Mercl <0xjnml@gmail.com>
-Kai Backman <kaib@golang.org>
-Marc-Antoine Ruel <maruel@chromium.org>
-Nigel Tao <nigeltao@golang.org>
-Rob Pike <r@golang.org>
-Russ Cox <rsc@golang.org>
-Sebastien Binet <seb.binet@gmail.com>
diff --git a/Godeps/_workspace/src/github.com/golang/snappy/LICENSE b/Godeps/_workspace/src/github.com/golang/snappy/LICENSE
deleted file mode 100644
index 6050c10f4..000000000
--- a/Godeps/_workspace/src/github.com/golang/snappy/LICENSE
+++ /dev/null
@@ -1,27 +0,0 @@
-Copyright (c) 2011 The Snappy-Go 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.
-   * 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/github.com/golang/snappy/README b/Godeps/_workspace/src/github.com/golang/snappy/README
deleted file mode 100644
index 5074bbab8..000000000
--- a/Godeps/_workspace/src/github.com/golang/snappy/README
+++ /dev/null
@@ -1,7 +0,0 @@
-The Snappy compression format in the Go programming language.
-
-To download and install from source:
-$ go get github.com/golang/snappy
-
-Unless otherwise noted, the Snappy-Go source files are distributed
-under the BSD-style license found in the LICENSE file.
diff --git a/Godeps/_workspace/src/github.com/golang/snappy/decode.go b/Godeps/_workspace/src/github.com/golang/snappy/decode.go
deleted file mode 100644
index e7f1259a3..000000000
--- a/Godeps/_workspace/src/github.com/golang/snappy/decode.go
+++ /dev/null
@@ -1,294 +0,0 @@
-// Copyright 2011 The Snappy-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 snappy
-
-import (
-	"encoding/binary"
-	"errors"
-	"io"
-)
-
-var (
-	// ErrCorrupt reports that the input is invalid.
-	ErrCorrupt = errors.New("snappy: corrupt input")
-	// ErrTooLarge reports that the uncompressed length is too large.
-	ErrTooLarge = errors.New("snappy: decoded block is too large")
-	// ErrUnsupported reports that the input isn't supported.
-	ErrUnsupported = errors.New("snappy: unsupported input")
-)
-
-// DecodedLen returns the length of the decoded block.
-func DecodedLen(src []byte) (int, error) {
-	v, _, err := decodedLen(src)
-	return v, err
-}
-
-// decodedLen returns the length of the decoded block and the number of bytes
-// that the length header occupied.
-func decodedLen(src []byte) (blockLen, headerLen int, err error) {
-	v, n := binary.Uvarint(src)
-	if n <= 0 || v > 0xffffffff {
-		return 0, 0, ErrCorrupt
-	}
-
-	const wordSize = 32 << (^uint(0) >> 32 & 1)
-	if wordSize == 32 && v > 0x7fffffff {
-		return 0, 0, ErrTooLarge
-	}
-	return int(v), n, nil
-}
-
-// Decode returns the decoded form of src. The returned slice may be a sub-
-// slice of dst if dst was large enough to hold the entire decoded block.
-// Otherwise, a newly allocated slice will be returned.
-// It is valid to pass a nil dst.
-func Decode(dst, src []byte) ([]byte, error) {
-	dLen, s, err := decodedLen(src)
-	if err != nil {
-		return nil, err
-	}
-	if len(dst) < dLen {
-		dst = make([]byte, dLen)
-	}
-
-	var d, offset, length int
-	for s < len(src) {
-		switch src[s] & 0x03 {
-		case tagLiteral:
-			x := uint(src[s] >> 2)
-			switch {
-			case x < 60:
-				s++
-			case x == 60:
-				s += 2
-				if s > len(src) {
-					return nil, ErrCorrupt
-				}
-				x = uint(src[s-1])
-			case x == 61:
-				s += 3
-				if s > len(src) {
-					return nil, ErrCorrupt
-				}
-				x = uint(src[s-2]) | uint(src[s-1])<<8
-			case x == 62:
-				s += 4
-				if s > len(src) {
-					return nil, ErrCorrupt
-				}
-				x = uint(src[s-3]) | uint(src[s-2])<<8 | uint(src[s-1])<<16
-			case x == 63:
-				s += 5
-				if s > len(src) {
-					return nil, ErrCorrupt
-				}
-				x = uint(src[s-4]) | uint(src[s-3])<<8 | uint(src[s-2])<<16 | uint(src[s-1])<<24
-			}
-			length = int(x + 1)
-			if length <= 0 {
-				return nil, errors.New("snappy: unsupported literal length")
-			}
-			if length > len(dst)-d || length > len(src)-s {
-				return nil, ErrCorrupt
-			}
-			copy(dst[d:], src[s:s+length])
-			d += length
-			s += length
-			continue
-
-		case tagCopy1:
-			s += 2
-			if s > len(src) {
-				return nil, ErrCorrupt
-			}
-			length = 4 + int(src[s-2])>>2&0x7
-			offset = int(src[s-2])&0xe0<<3 | int(src[s-1])
-
-		case tagCopy2:
-			s += 3
-			if s > len(src) {
-				return nil, ErrCorrupt
-			}
-			length = 1 + int(src[s-3])>>2
-			offset = int(src[s-2]) | int(src[s-1])<<8
-
-		case tagCopy4:
-			return nil, errors.New("snappy: unsupported COPY_4 tag")
-		}
-
-		end := d + length
-		if offset > d || end > len(dst) {
-			return nil, ErrCorrupt
-		}
-		for ; d < end; d++ {
-			dst[d] = dst[d-offset]
-		}
-	}
-	if d != dLen {
-		return nil, ErrCorrupt
-	}
-	return dst[:d], nil
-}
-
-// NewReader returns a new Reader that decompresses from r, using the framing
-// format described at
-// https://github.com/google/snappy/blob/master/framing_format.txt
-func NewReader(r io.Reader) *Reader {
-	return &Reader{
-		r:       r,
-		decoded: make([]byte, maxUncompressedChunkLen),
-		buf:     make([]byte, MaxEncodedLen(maxUncompressedChunkLen)+checksumSize),
-	}
-}
-
-// Reader is an io.Reader than can read Snappy-compressed bytes.
-type Reader struct {
-	r       io.Reader
-	err     error
-	decoded []byte
-	buf     []byte
-	// decoded[i:j] contains decoded bytes that have not yet been passed on.
-	i, j       int
-	readHeader bool
-}
-
-// Reset discards any buffered data, resets all state, and switches the Snappy
-// reader to read from r. This permits reusing a Reader rather than allocating
-// a new one.
-func (r *Reader) Reset(reader io.Reader) {
-	r.r = reader
-	r.err = nil
-	r.i = 0
-	r.j = 0
-	r.readHeader = false
-}
-
-func (r *Reader) readFull(p []byte) (ok bool) {
-	if _, r.err = io.ReadFull(r.r, p); r.err != nil {
-		if r.err == io.ErrUnexpectedEOF {
-			r.err = ErrCorrupt
-		}
-		return false
-	}
-	return true
-}
-
-// Read satisfies the io.Reader interface.
-func (r *Reader) Read(p []byte) (int, error) {
-	if r.err != nil {
-		return 0, r.err
-	}
-	for {
-		if r.i < r.j {
-			n := copy(p, r.decoded[r.i:r.j])
-			r.i += n
-			return n, nil
-		}
-		if !r.readFull(r.buf[:4]) {
-			return 0, r.err
-		}
-		chunkType := r.buf[0]
-		if !r.readHeader {
-			if chunkType != chunkTypeStreamIdentifier {
-				r.err = ErrCorrupt
-				return 0, r.err
-			}
-			r.readHeader = true
-		}
-		chunkLen := int(r.buf[1]) | int(r.buf[2])<<8 | int(r.buf[3])<<16
-		if chunkLen > len(r.buf) {
-			r.err = ErrUnsupported
-			return 0, r.err
-		}
-
-		// The chunk types are specified at
-		// https://github.com/google/snappy/blob/master/framing_format.txt
-		switch chunkType {
-		case chunkTypeCompressedData:
-			// Section 4.2. Compressed data (chunk type 0x00).
-			if chunkLen < checksumSize {
-				r.err = ErrCorrupt
-				return 0, r.err
-			}
-			buf := r.buf[:chunkLen]
-			if !r.readFull(buf) {
-				return 0, r.err
-			}
-			checksum := uint32(buf[0]) | uint32(buf[1])<<8 | uint32(buf[2])<<16 | uint32(buf[3])<<24
-			buf = buf[checksumSize:]
-
-			n, err := DecodedLen(buf)
-			if err != nil {
-				r.err = err
-				return 0, r.err
-			}
-			if n > len(r.decoded) {
-				r.err = ErrCorrupt
-				return 0, r.err
-			}
-			if _, err := Decode(r.decoded, buf); err != nil {
-				r.err = err
-				return 0, r.err
-			}
-			if crc(r.decoded[:n]) != checksum {
-				r.err = ErrCorrupt
-				return 0, r.err
-			}
-			r.i, r.j = 0, n
-			continue
-
-		case chunkTypeUncompressedData:
-			// Section 4.3. Uncompressed data (chunk type 0x01).
-			if chunkLen < checksumSize {
-				r.err = ErrCorrupt
-				return 0, r.err
-			}
-			buf := r.buf[:checksumSize]
-			if !r.readFull(buf) {
-				return 0, r.err
-			}
-			checksum := uint32(buf[0]) | uint32(buf[1])<<8 | uint32(buf[2])<<16 | uint32(buf[3])<<24
-			// Read directly into r.decoded instead of via r.buf.
-			n := chunkLen - checksumSize
-			if !r.readFull(r.decoded[:n]) {
-				return 0, r.err
-			}
-			if crc(r.decoded[:n]) != checksum {
-				r.err = ErrCorrupt
-				return 0, r.err
-			}
-			r.i, r.j = 0, n
-			continue
-
-		case chunkTypeStreamIdentifier:
-			// Section 4.1. Stream identifier (chunk type 0xff).
-			if chunkLen != len(magicBody) {
-				r.err = ErrCorrupt
-				return 0, r.err
-			}
-			if !r.readFull(r.buf[:len(magicBody)]) {
-				return 0, r.err
-			}
-			for i := 0; i < len(magicBody); i++ {
-				if r.buf[i] != magicBody[i] {
-					r.err = ErrCorrupt
-					return 0, r.err
-				}
-			}
-			continue
-		}
-
-		if chunkType <= 0x7f {
-			// Section 4.5. Reserved unskippable chunks (chunk types 0x02-0x7f).
-			r.err = ErrUnsupported
-			return 0, r.err
-		}
-		// Section 4.4 Padding (chunk type 0xfe).
-		// Section 4.6. Reserved skippable chunks (chunk types 0x80-0xfd).
-		if !r.readFull(r.buf[:chunkLen]) {
-			return 0, r.err
-		}
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/golang/snappy/encode.go b/Godeps/_workspace/src/github.com/golang/snappy/encode.go
deleted file mode 100644
index f3b5484bc..000000000
--- a/Godeps/_workspace/src/github.com/golang/snappy/encode.go
+++ /dev/null
@@ -1,254 +0,0 @@
-// Copyright 2011 The Snappy-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 snappy
-
-import (
-	"encoding/binary"
-	"io"
-)
-
-// We limit how far copy back-references can go, the same as the C++ code.
-const maxOffset = 1 << 15
-
-// emitLiteral writes a literal chunk and returns the number of bytes written.
-func emitLiteral(dst, lit []byte) int {
-	i, n := 0, uint(len(lit)-1)
-	switch {
-	case n < 60:
-		dst[0] = uint8(n)<<2 | tagLiteral
-		i = 1
-	case n < 1<<8:
-		dst[0] = 60<<2 | tagLiteral
-		dst[1] = uint8(n)
-		i = 2
-	case n < 1<<16:
-		dst[0] = 61<<2 | tagLiteral
-		dst[1] = uint8(n)
-		dst[2] = uint8(n >> 8)
-		i = 3
-	case n < 1<<24:
-		dst[0] = 62<<2 | tagLiteral
-		dst[1] = uint8(n)
-		dst[2] = uint8(n >> 8)
-		dst[3] = uint8(n >> 16)
-		i = 4
-	case int64(n) < 1<<32:
-		dst[0] = 63<<2 | tagLiteral
-		dst[1] = uint8(n)
-		dst[2] = uint8(n >> 8)
-		dst[3] = uint8(n >> 16)
-		dst[4] = uint8(n >> 24)
-		i = 5
-	default:
-		panic("snappy: source buffer is too long")
-	}
-	if copy(dst[i:], lit) != len(lit) {
-		panic("snappy: destination buffer is too short")
-	}
-	return i + len(lit)
-}
-
-// emitCopy writes a copy chunk and returns the number of bytes written.
-func emitCopy(dst []byte, offset, length int) int {
-	i := 0
-	for length > 0 {
-		x := length - 4
-		if 0 <= x && x < 1<<3 && offset < 1<<11 {
-			dst[i+0] = uint8(offset>>8)&0x07<<5 | uint8(x)<<2 | tagCopy1
-			dst[i+1] = uint8(offset)
-			i += 2
-			break
-		}
-
-		x = length
-		if x > 1<<6 {
-			x = 1 << 6
-		}
-		dst[i+0] = uint8(x-1)<<2 | tagCopy2
-		dst[i+1] = uint8(offset)
-		dst[i+2] = uint8(offset >> 8)
-		i += 3
-		length -= x
-	}
-	return i
-}
-
-// Encode returns the encoded form of src. The returned slice may be a sub-
-// slice of dst if dst was large enough to hold the entire encoded block.
-// Otherwise, a newly allocated slice will be returned.
-// It is valid to pass a nil dst.
-func Encode(dst, src []byte) []byte {
-	if n := MaxEncodedLen(len(src)); len(dst) < n {
-		dst = make([]byte, n)
-	}
-
-	// The block starts with the varint-encoded length of the decompressed bytes.
-	d := binary.PutUvarint(dst, uint64(len(src)))
-
-	// Return early if src is short.
-	if len(src) <= 4 {
-		if len(src) != 0 {
-			d += emitLiteral(dst[d:], src)
-		}
-		return dst[:d]
-	}
-
-	// Initialize the hash table. Its size ranges from 1<<8 to 1<<14 inclusive.
-	const maxTableSize = 1 << 14
-	shift, tableSize := uint(32-8), 1<<8
-	for tableSize < maxTableSize && tableSize < len(src) {
-		shift--
-		tableSize *= 2
-	}
-	var table [maxTableSize]int
-
-	// Iterate over the source bytes.
-	var (
-		s   int // The iterator position.
-		t   int // The last position with the same hash as s.
-		lit int // The start position of any pending literal bytes.
-	)
-	for s+3 < len(src) {
-		// Update the hash table.
-		b0, b1, b2, b3 := src[s], src[s+1], src[s+2], src[s+3]
-		h := uint32(b0) | uint32(b1)<<8 | uint32(b2)<<16 | uint32(b3)<<24
-		p := &table[(h*0x1e35a7bd)>>shift]
-		// We need to to store values in [-1, inf) in table. To save
-		// some initialization time, (re)use the table's zero value
-		// and shift the values against this zero: add 1 on writes,
-		// subtract 1 on reads.
-		t, *p = *p-1, s+1
-		// If t is invalid or src[s:s+4] differs from src[t:t+4], accumulate a literal byte.
-		if t < 0 || s-t >= maxOffset || b0 != src[t] || b1 != src[t+1] || b2 != src[t+2] || b3 != src[t+3] {
-			s++
-			continue
-		}
-		// Otherwise, we have a match. First, emit any pending literal bytes.
-		if lit != s {
-			d += emitLiteral(dst[d:], src[lit:s])
-		}
-		// Extend the match to be as long as possible.
-		s0 := s
-		s, t = s+4, t+4
-		for s < len(src) && src[s] == src[t] {
-			s++
-			t++
-		}
-		// Emit the copied bytes.
-		d += emitCopy(dst[d:], s-t, s-s0)
-		lit = s
-	}
-
-	// Emit any final pending literal bytes and return.
-	if lit != len(src) {
-		d += emitLiteral(dst[d:], src[lit:])
-	}
-	return dst[:d]
-}
-
-// MaxEncodedLen returns the maximum length of a snappy block, given its
-// uncompressed length.
-func MaxEncodedLen(srcLen int) int {
-	// Compressed data can be defined as:
-	//    compressed := item* literal*
-	//    item       := literal* copy
-	//
-	// The trailing literal sequence has a space blowup of at most 62/60
-	// since a literal of length 60 needs one tag byte + one extra byte
-	// for length information.
-	//
-	// Item blowup is trickier to measure. Suppose the "copy" op copies
-	// 4 bytes of data. Because of a special check in the encoding code,
-	// we produce a 4-byte copy only if the offset is < 65536. Therefore
-	// the copy op takes 3 bytes to encode, and this type of item leads
-	// to at most the 62/60 blowup for representing literals.
-	//
-	// Suppose the "copy" op copies 5 bytes of data. If the offset is big
-	// enough, it will take 5 bytes to encode the copy op. Therefore the
-	// worst case here is a one-byte literal followed by a five-byte copy.
-	// That is, 6 bytes of input turn into 7 bytes of "compressed" data.
-	//
-	// This last factor dominates the blowup, so the final estimate is:
-	return 32 + srcLen + srcLen/6
-}
-
-// NewWriter returns a new Writer that compresses to w, using the framing
-// format described at
-// https://github.com/google/snappy/blob/master/framing_format.txt
-func NewWriter(w io.Writer) *Writer {
-	return &Writer{
-		w:   w,
-		enc: make([]byte, MaxEncodedLen(maxUncompressedChunkLen)),
-	}
-}
-
-// Writer is an io.Writer than can write Snappy-compressed bytes.
-type Writer struct {
-	w           io.Writer
-	err         error
-	enc         []byte
-	buf         [checksumSize + chunkHeaderSize]byte
-	wroteHeader bool
-}
-
-// Reset discards the writer's state and switches the Snappy writer to write to
-// w. This permits reusing a Writer rather than allocating a new one.
-func (w *Writer) Reset(writer io.Writer) {
-	w.w = writer
-	w.err = nil
-	w.wroteHeader = false
-}
-
-// Write satisfies the io.Writer interface.
-func (w *Writer) Write(p []byte) (n int, errRet error) {
-	if w.err != nil {
-		return 0, w.err
-	}
-	if !w.wroteHeader {
-		copy(w.enc, magicChunk)
-		if _, err := w.w.Write(w.enc[:len(magicChunk)]); err != nil {
-			w.err = err
-			return n, err
-		}
-		w.wroteHeader = true
-	}
-	for len(p) > 0 {
-		var uncompressed []byte
-		if len(p) > maxUncompressedChunkLen {
-			uncompressed, p = p[:maxUncompressedChunkLen], p[maxUncompressedChunkLen:]
-		} else {
-			uncompressed, p = p, nil
-		}
-		checksum := crc(uncompressed)
-
-		// Compress the buffer, discarding the result if the improvement
-		// isn't at least 12.5%.
-		chunkType := uint8(chunkTypeCompressedData)
-		chunkBody := Encode(w.enc, uncompressed)
-		if len(chunkBody) >= len(uncompressed)-len(uncompressed)/8 {
-			chunkType, chunkBody = chunkTypeUncompressedData, uncompressed
-		}
-
-		chunkLen := 4 + len(chunkBody)
-		w.buf[0] = chunkType
-		w.buf[1] = uint8(chunkLen >> 0)
-		w.buf[2] = uint8(chunkLen >> 8)
-		w.buf[3] = uint8(chunkLen >> 16)
-		w.buf[4] = uint8(checksum >> 0)
-		w.buf[5] = uint8(checksum >> 8)
-		w.buf[6] = uint8(checksum >> 16)
-		w.buf[7] = uint8(checksum >> 24)
-		if _, err := w.w.Write(w.buf[:]); err != nil {
-			w.err = err
-			return n, err
-		}
-		if _, err := w.w.Write(chunkBody); err != nil {
-			w.err = err
-			return n, err
-		}
-		n += len(uncompressed)
-	}
-	return n, nil
-}
diff --git a/Godeps/_workspace/src/github.com/golang/snappy/snappy.go b/Godeps/_workspace/src/github.com/golang/snappy/snappy.go
deleted file mode 100644
index e98653acf..000000000
--- a/Godeps/_workspace/src/github.com/golang/snappy/snappy.go
+++ /dev/null
@@ -1,68 +0,0 @@
-// Copyright 2011 The Snappy-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 snappy implements the snappy block-based compression format.
-// It aims for very high speeds and reasonable compression.
-//
-// The C++ snappy implementation is at https://github.com/google/snappy
-package snappy
-
-import (
-	"hash/crc32"
-)
-
-/*
-Each encoded block begins with the varint-encoded length of the decoded data,
-followed by a sequence of chunks. Chunks begin and end on byte boundaries. The
-first byte of each chunk is broken into its 2 least and 6 most significant bits
-called l and m: l ranges in [0, 4) and m ranges in [0, 64). l is the chunk tag.
-Zero means a literal tag. All other values mean a copy tag.
-
-For literal tags:
-  - If m < 60, the next 1 + m bytes are literal bytes.
-  - Otherwise, let n be the little-endian unsigned integer denoted by the next
-    m - 59 bytes. The next 1 + n bytes after that are literal bytes.
-
-For copy tags, length bytes are copied from offset bytes ago, in the style of
-Lempel-Ziv compression algorithms. In particular:
-  - For l == 1, the offset ranges in [0, 1<<11) and the length in [4, 12).
-    The length is 4 + the low 3 bits of m. The high 3 bits of m form bits 8-10
-    of the offset. The next byte is bits 0-7 of the offset.
-  - For l == 2, the offset ranges in [0, 1<<16) and the length in [1, 65).
-    The length is 1 + m. The offset is the little-endian unsigned integer
-    denoted by the next 2 bytes.
-  - For l == 3, this tag is a legacy format that is no longer supported.
-*/
-const (
-	tagLiteral = 0x00
-	tagCopy1   = 0x01
-	tagCopy2   = 0x02
-	tagCopy4   = 0x03
-)
-
-const (
-	checksumSize    = 4
-	chunkHeaderSize = 4
-	magicChunk      = "\xff\x06\x00\x00" + magicBody
-	magicBody       = "sNaPpY"
-	// https://github.com/google/snappy/blob/master/framing_format.txt says
-	// that "the uncompressed data in a chunk must be no longer than 65536 bytes".
-	maxUncompressedChunkLen = 65536
-)
-
-const (
-	chunkTypeCompressedData   = 0x00
-	chunkTypeUncompressedData = 0x01
-	chunkTypePadding          = 0xfe
-	chunkTypeStreamIdentifier = 0xff
-)
-
-var crcTable = crc32.MakeTable(crc32.Castagnoli)
-
-// crc implements the checksum specified in section 3 of
-// https://github.com/google/snappy/blob/master/framing_format.txt
-func crc(b []byte) uint32 {
-	c := crc32.Update(0, crcTable, b)
-	return uint32(c>>15|c<<17) + 0xa282ead8
-}
diff --git a/Godeps/_workspace/src/github.com/golang/snappy/snappy_test.go b/Godeps/_workspace/src/github.com/golang/snappy/snappy_test.go
deleted file mode 100644
index f8188f11e..000000000
--- a/Godeps/_workspace/src/github.com/golang/snappy/snappy_test.go
+++ /dev/null
@@ -1,377 +0,0 @@
-// Copyright 2011 The Snappy-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 snappy
-
-import (
-	"bytes"
-	"flag"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"math/rand"
-	"net/http"
-	"os"
-	"path/filepath"
-	"strings"
-	"testing"
-)
-
-var (
-	download = flag.Bool("download", false, "If true, download any missing files before running benchmarks")
-	testdata = flag.String("testdata", "testdata", "Directory containing the test data")
-)
-
-func roundtrip(b, ebuf, dbuf []byte) error {
-	d, err := Decode(dbuf, Encode(ebuf, b))
-	if err != nil {
-		return fmt.Errorf("decoding error: %v", err)
-	}
-	if !bytes.Equal(b, d) {
-		return fmt.Errorf("roundtrip mismatch:\n\twant %v\n\tgot  %v", b, d)
-	}
-	return nil
-}
-
-func TestEmpty(t *testing.T) {
-	if err := roundtrip(nil, nil, nil); err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestSmallCopy(t *testing.T) {
-	for _, ebuf := range [][]byte{nil, make([]byte, 20), make([]byte, 64)} {
-		for _, dbuf := range [][]byte{nil, make([]byte, 20), make([]byte, 64)} {
-			for i := 0; i < 32; i++ {
-				s := "aaaa" + strings.Repeat("b", i) + "aaaabbbb"
-				if err := roundtrip([]byte(s), ebuf, dbuf); err != nil {
-					t.Errorf("len(ebuf)=%d, len(dbuf)=%d, i=%d: %v", len(ebuf), len(dbuf), i, err)
-				}
-			}
-		}
-	}
-}
-
-func TestSmallRand(t *testing.T) {
-	rng := rand.New(rand.NewSource(27354294))
-	for n := 1; n < 20000; n += 23 {
-		b := make([]byte, n)
-		for i := range b {
-			b[i] = uint8(rng.Uint32())
-		}
-		if err := roundtrip(b, nil, nil); err != nil {
-			t.Fatal(err)
-		}
-	}
-}
-
-func TestSmallRegular(t *testing.T) {
-	for n := 1; n < 20000; n += 23 {
-		b := make([]byte, n)
-		for i := range b {
-			b[i] = uint8(i%10 + 'a')
-		}
-		if err := roundtrip(b, nil, nil); err != nil {
-			t.Fatal(err)
-		}
-	}
-}
-
-func TestInvalidVarint(t *testing.T) {
-	data := []byte("\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\x00")
-	if _, err := DecodedLen(data); err != ErrCorrupt {
-		t.Errorf("DecodedLen: got %v, want ErrCorrupt", err)
-	}
-	if _, err := Decode(nil, data); err != ErrCorrupt {
-		t.Errorf("Decode: got %v, want ErrCorrupt", err)
-	}
-
-	// The encoded varint overflows 32 bits
-	data = []byte("\xff\xff\xff\xff\xff\x00")
-
-	if _, err := DecodedLen(data); err != ErrCorrupt {
-		t.Errorf("DecodedLen: got %v, want ErrCorrupt", err)
-	}
-	if _, err := Decode(nil, data); err != ErrCorrupt {
-		t.Errorf("Decode: got %v, want ErrCorrupt", err)
-	}
-}
-
-func cmp(a, b []byte) error {
-	if len(a) != len(b) {
-		return fmt.Errorf("got %d bytes, want %d", len(a), len(b))
-	}
-	for i := range a {
-		if a[i] != b[i] {
-			return fmt.Errorf("byte #%d: got 0x%02x, want 0x%02x", i, a[i], b[i])
-		}
-	}
-	return nil
-}
-
-func TestFramingFormat(t *testing.T) {
-	// src is comprised of alternating 1e5-sized sequences of random
-	// (incompressible) bytes and repeated (compressible) bytes. 1e5 was chosen
-	// because it is larger than maxUncompressedChunkLen (64k).
-	src := make([]byte, 1e6)
-	rng := rand.New(rand.NewSource(1))
-	for i := 0; i < 10; i++ {
-		if i%2 == 0 {
-			for j := 0; j < 1e5; j++ {
-				src[1e5*i+j] = uint8(rng.Intn(256))
-			}
-		} else {
-			for j := 0; j < 1e5; j++ {
-				src[1e5*i+j] = uint8(i)
-			}
-		}
-	}
-
-	buf := new(bytes.Buffer)
-	if _, err := NewWriter(buf).Write(src); err != nil {
-		t.Fatalf("Write: encoding: %v", err)
-	}
-	dst, err := ioutil.ReadAll(NewReader(buf))
-	if err != nil {
-		t.Fatalf("ReadAll: decoding: %v", err)
-	}
-	if err := cmp(dst, src); err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestReaderReset(t *testing.T) {
-	gold := bytes.Repeat([]byte("All that is gold does not glitter,\n"), 10000)
-	buf := new(bytes.Buffer)
-	if _, err := NewWriter(buf).Write(gold); err != nil {
-		t.Fatalf("Write: %v", err)
-	}
-	encoded, invalid, partial := buf.String(), "invalid", "partial"
-	r := NewReader(nil)
-	for i, s := range []string{encoded, invalid, partial, encoded, partial, invalid, encoded, encoded} {
-		if s == partial {
-			r.Reset(strings.NewReader(encoded))
-			if _, err := r.Read(make([]byte, 101)); err != nil {
-				t.Errorf("#%d: %v", i, err)
-				continue
-			}
-			continue
-		}
-		r.Reset(strings.NewReader(s))
-		got, err := ioutil.ReadAll(r)
-		switch s {
-		case encoded:
-			if err != nil {
-				t.Errorf("#%d: %v", i, err)
-				continue
-			}
-			if err := cmp(got, gold); err != nil {
-				t.Errorf("#%d: %v", i, err)
-				continue
-			}
-		case invalid:
-			if err == nil {
-				t.Errorf("#%d: got nil error, want non-nil", i)
-				continue
-			}
-		}
-	}
-}
-
-func TestWriterReset(t *testing.T) {
-	gold := bytes.Repeat([]byte("Not all those who wander are lost;\n"), 10000)
-	var gots, wants [][]byte
-	const n = 20
-	w, failed := NewWriter(nil), false
-	for i := 0; i <= n; i++ {
-		buf := new(bytes.Buffer)
-		w.Reset(buf)
-		want := gold[:len(gold)*i/n]
-		if _, err := w.Write(want); err != nil {
-			t.Errorf("#%d: Write: %v", i, err)
-			failed = true
-			continue
-		}
-		got, err := ioutil.ReadAll(NewReader(buf))
-		if err != nil {
-			t.Errorf("#%d: ReadAll: %v", i, err)
-			failed = true
-			continue
-		}
-		gots = append(gots, got)
-		wants = append(wants, want)
-	}
-	if failed {
-		return
-	}
-	for i := range gots {
-		if err := cmp(gots[i], wants[i]); err != nil {
-			t.Errorf("#%d: %v", i, err)
-		}
-	}
-}
-
-func benchDecode(b *testing.B, src []byte) {
-	encoded := Encode(nil, src)
-	// Bandwidth is in amount of uncompressed data.
-	b.SetBytes(int64(len(src)))
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		Decode(src, encoded)
-	}
-}
-
-func benchEncode(b *testing.B, src []byte) {
-	// Bandwidth is in amount of uncompressed data.
-	b.SetBytes(int64(len(src)))
-	dst := make([]byte, MaxEncodedLen(len(src)))
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		Encode(dst, src)
-	}
-}
-
-func readFile(b testing.TB, filename string) []byte {
-	src, err := ioutil.ReadFile(filename)
-	if err != nil {
-		b.Skipf("skipping benchmark: %v", err)
-	}
-	if len(src) == 0 {
-		b.Fatalf("%s has zero length", filename)
-	}
-	return src
-}
-
-// expand returns a slice of length n containing repeated copies of src.
-func expand(src []byte, n int) []byte {
-	dst := make([]byte, n)
-	for x := dst; len(x) > 0; {
-		i := copy(x, src)
-		x = x[i:]
-	}
-	return dst
-}
-
-func benchWords(b *testing.B, n int, decode bool) {
-	// Note: the file is OS-language dependent so the resulting values are not
-	// directly comparable for non-US-English OS installations.
-	data := expand(readFile(b, "/usr/share/dict/words"), n)
-	if decode {
-		benchDecode(b, data)
-	} else {
-		benchEncode(b, data)
-	}
-}
-
-func BenchmarkWordsDecode1e3(b *testing.B) { benchWords(b, 1e3, true) }
-func BenchmarkWordsDecode1e4(b *testing.B) { benchWords(b, 1e4, true) }
-func BenchmarkWordsDecode1e5(b *testing.B) { benchWords(b, 1e5, true) }
-func BenchmarkWordsDecode1e6(b *testing.B) { benchWords(b, 1e6, true) }
-func BenchmarkWordsEncode1e3(b *testing.B) { benchWords(b, 1e3, false) }
-func BenchmarkWordsEncode1e4(b *testing.B) { benchWords(b, 1e4, false) }
-func BenchmarkWordsEncode1e5(b *testing.B) { benchWords(b, 1e5, false) }
-func BenchmarkWordsEncode1e6(b *testing.B) { benchWords(b, 1e6, false) }
-
-// testFiles' values are copied directly from
-// https://raw.githubusercontent.com/google/snappy/master/snappy_unittest.cc
-// The label field is unused in snappy-go.
-var testFiles = []struct {
-	label    string
-	filename string
-}{
-	{"html", "html"},
-	{"urls", "urls.10K"},
-	{"jpg", "fireworks.jpeg"},
-	{"jpg_200", "fireworks.jpeg"},
-	{"pdf", "paper-100k.pdf"},
-	{"html4", "html_x_4"},
-	{"txt1", "alice29.txt"},
-	{"txt2", "asyoulik.txt"},
-	{"txt3", "lcet10.txt"},
-	{"txt4", "plrabn12.txt"},
-	{"pb", "geo.protodata"},
-	{"gaviota", "kppkn.gtb"},
-}
-
-// The test data files are present at this canonical URL.
-const baseURL = "https://raw.githubusercontent.com/google/snappy/master/testdata/"
-
-func downloadTestdata(b *testing.B, basename string) (errRet error) {
-	filename := filepath.Join(*testdata, basename)
-	if stat, err := os.Stat(filename); err == nil && stat.Size() != 0 {
-		return nil
-	}
-
-	if !*download {
-		b.Skipf("test data not found; skipping benchmark without the -download flag")
-	}
-	// Download the official snappy C++ implementation reference test data
-	// files for benchmarking.
-	if err := os.Mkdir(*testdata, 0777); err != nil && !os.IsExist(err) {
-		return fmt.Errorf("failed to create testdata: %s", err)
-	}
-
-	f, err := os.Create(filename)
-	if err != nil {
-		return fmt.Errorf("failed to create %s: %s", filename, err)
-	}
-	defer f.Close()
-	defer func() {
-		if errRet != nil {
-			os.Remove(filename)
-		}
-	}()
-	url := baseURL + basename
-	resp, err := http.Get(url)
-	if err != nil {
-		return fmt.Errorf("failed to download %s: %s", url, err)
-	}
-	defer resp.Body.Close()
-	if s := resp.StatusCode; s != http.StatusOK {
-		return fmt.Errorf("downloading %s: HTTP status code %d (%s)", url, s, http.StatusText(s))
-	}
-	_, err = io.Copy(f, resp.Body)
-	if err != nil {
-		return fmt.Errorf("failed to download %s to %s: %s", url, filename, err)
-	}
-	return nil
-}
-
-func benchFile(b *testing.B, n int, decode bool) {
-	if err := downloadTestdata(b, testFiles[n].filename); err != nil {
-		b.Fatalf("failed to download testdata: %s", err)
-	}
-	data := readFile(b, filepath.Join(*testdata, testFiles[n].filename))
-	if decode {
-		benchDecode(b, data)
-	} else {
-		benchEncode(b, data)
-	}
-}
-
-// Naming convention is kept similar to what snappy's C++ implementation uses.
-func Benchmark_UFlat0(b *testing.B)  { benchFile(b, 0, true) }
-func Benchmark_UFlat1(b *testing.B)  { benchFile(b, 1, true) }
-func Benchmark_UFlat2(b *testing.B)  { benchFile(b, 2, true) }
-func Benchmark_UFlat3(b *testing.B)  { benchFile(b, 3, true) }
-func Benchmark_UFlat4(b *testing.B)  { benchFile(b, 4, true) }
-func Benchmark_UFlat5(b *testing.B)  { benchFile(b, 5, true) }
-func Benchmark_UFlat6(b *testing.B)  { benchFile(b, 6, true) }
-func Benchmark_UFlat7(b *testing.B)  { benchFile(b, 7, true) }
-func Benchmark_UFlat8(b *testing.B)  { benchFile(b, 8, true) }
-func Benchmark_UFlat9(b *testing.B)  { benchFile(b, 9, true) }
-func Benchmark_UFlat10(b *testing.B) { benchFile(b, 10, true) }
-func Benchmark_UFlat11(b *testing.B) { benchFile(b, 11, true) }
-func Benchmark_ZFlat0(b *testing.B)  { benchFile(b, 0, false) }
-func Benchmark_ZFlat1(b *testing.B)  { benchFile(b, 1, false) }
-func Benchmark_ZFlat2(b *testing.B)  { benchFile(b, 2, false) }
-func Benchmark_ZFlat3(b *testing.B)  { benchFile(b, 3, false) }
-func Benchmark_ZFlat4(b *testing.B)  { benchFile(b, 4, false) }
-func Benchmark_ZFlat5(b *testing.B)  { benchFile(b, 5, false) }
-func Benchmark_ZFlat6(b *testing.B)  { benchFile(b, 6, false) }
-func Benchmark_ZFlat7(b *testing.B)  { benchFile(b, 7, false) }
-func Benchmark_ZFlat8(b *testing.B)  { benchFile(b, 8, false) }
-func Benchmark_ZFlat9(b *testing.B)  { benchFile(b, 9, false) }
-func Benchmark_ZFlat10(b *testing.B) { benchFile(b, 10, false) }
-func Benchmark_ZFlat11(b *testing.B) { benchFile(b, 11, false) }
diff --git a/Godeps/_workspace/src/github.com/gonuts/go-shellquote/README b/Godeps/_workspace/src/github.com/gonuts/go-shellquote/README
deleted file mode 100644
index 4d34e87af..000000000
--- a/Godeps/_workspace/src/github.com/gonuts/go-shellquote/README
+++ /dev/null
@@ -1,36 +0,0 @@
-PACKAGE
-
-package shellquote
-    import "github.com/kballard/go-shellquote"
-
-    Shellquote provides utilities for joining/splitting strings using sh's
-    word-splitting rules.
-
-VARIABLES
-
-var (
-    UnterminatedSingleQuoteError = errors.New("Unterminated single-quoted string")
-    UnterminatedDoubleQuoteError = errors.New("Unterminated double-quoted string")
-    UnterminatedEscapeError      = errors.New("Unterminated backslash-escape")
-)
-
-
-FUNCTIONS
-
-func Join(args ...string) string
-    Join quotes each argument and joins them with a space. If passed to
-    /bin/sh, the resulting string will be split back into the original
-    arguments.
-
-func Split(input string) (words []string, err error)
-    Split splits a string according to /bin/sh's word-splitting rules. It
-    supports backslash-escapes, single-quotes, and double-quotes. Notably it
-    does not support the $'' style of quoting. It also doesn't attempt to
-    perform any other sort of expansion, including brace expansion, shell
-    expansion, or pathname expansion.
-
-    If the given input has an unterminated quoted string or ends in a
-    backslash-escape, one of UnterminatedSingleQuoteError,
-    UnterminatedDoubleQuoteError, or UnterminatedEscapeError is returned.
-
-
diff --git a/Godeps/_workspace/src/github.com/gonuts/go-shellquote/both_test.go b/Godeps/_workspace/src/github.com/gonuts/go-shellquote/both_test.go
deleted file mode 100644
index 9cba3c849..000000000
--- a/Godeps/_workspace/src/github.com/gonuts/go-shellquote/both_test.go
+++ /dev/null
@@ -1,29 +0,0 @@
-package shellquote
-
-import (
-	"reflect"
-	"testing"
-	"testing/quick"
-)
-
-// this is called bothtest because it tests Split and Join together
-
-func TestJoinSplit(t *testing.T) {
-	f := func(strs []string) bool {
-		// Join, then split, the input
-		combined := Join(strs...)
-		split, err := Split(combined)
-		if err != nil {
-			t.Logf("Error splitting %#v: %v", combined, err)
-			return false
-		}
-		if !reflect.DeepEqual(strs, split) {
-			t.Logf("Input %q did not match output %q", strs, split)
-			return false
-		}
-		return true
-	}
-	if err := quick.Check(f, nil); err != nil {
-		t.Error(err)
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/gonuts/go-shellquote/doc.go b/Godeps/_workspace/src/github.com/gonuts/go-shellquote/doc.go
deleted file mode 100644
index 9445fa4ad..000000000
--- a/Godeps/_workspace/src/github.com/gonuts/go-shellquote/doc.go
+++ /dev/null
@@ -1,3 +0,0 @@
-// Shellquote provides utilities for joining/splitting strings using sh's
-// word-splitting rules.
-package shellquote
diff --git a/Godeps/_workspace/src/github.com/gonuts/go-shellquote/quote.go b/Godeps/_workspace/src/github.com/gonuts/go-shellquote/quote.go
deleted file mode 100644
index f6cacee0f..000000000
--- a/Godeps/_workspace/src/github.com/gonuts/go-shellquote/quote.go
+++ /dev/null
@@ -1,102 +0,0 @@
-package shellquote
-
-import (
-	"bytes"
-	"strings"
-	"unicode/utf8"
-)
-
-// Join quotes each argument and joins them with a space.
-// If passed to /bin/sh, the resulting string will be split back into the
-// original arguments.
-func Join(args ...string) string {
-	var buf bytes.Buffer
-	for i, arg := range args {
-		if i != 0 {
-			buf.WriteByte(' ')
-		}
-		quote(arg, &buf)
-	}
-	return buf.String()
-}
-
-const (
-	specialChars      = "\\'\"`${[|&;<>()*?!"
-	extraSpecialChars = " \t\n"
-	prefixChars       = "~"
-)
-
-func quote(word string, buf *bytes.Buffer) {
-	// We want to try to produce a "nice" output. As such, we will
-	// backslash-escape most characters, but if we encounter a space, or if we
-	// encounter an extra-special char (which doesn't work with
-	// backslash-escaping) we switch over to quoting the whole word. We do this
-	// with a space because it's typically easier for people to read multi-word
-	// arguments when quoted with a space rather than with ugly backslashes
-	// everywhere.
-	origLen := buf.Len()
-
-	if len(word) == 0 {
-		// oops, no content
-		buf.WriteString("''")
-		return
-	}
-
-	cur, prev := word, word
-	atStart := true
-	for len(cur) > 0 {
-		c, l := utf8.DecodeRuneInString(cur)
-		cur = cur[l:]
-		if strings.ContainsRune(specialChars, c) || (atStart && strings.ContainsRune(prefixChars, c)) {
-			// copy the non-special chars up to this point
-			if len(cur) < len(prev) {
-				buf.WriteString(word[0 : len(prev)-len(cur)-l])
-			}
-			buf.WriteByte('\\')
-			buf.WriteRune(c)
-			prev = cur
-		} else if strings.ContainsRune(extraSpecialChars, c) {
-			// start over in quote mode
-			buf.Truncate(origLen)
-			goto quote
-		}
-		atStart = false
-	}
-	if len(prev) > 0 {
-		buf.WriteString(prev)
-	}
-	return
-
-quote:
-	// quote mode
-	// Use single-quotes, but if we find a single-quote in the word, we need
-	// to terminate the string, emit an escaped quote, and start the string up
-	// again
-	inQuote := false
-	for len(word) > 0 {
-		i := strings.IndexRune(word, '\'')
-		if i == -1 {
-			break
-		}
-		if i > 0 {
-			if !inQuote {
-				buf.WriteByte('\'')
-				inQuote = true
-			}
-			buf.WriteString(word[0:i])
-			word = word[i+1:]
-		}
-		if inQuote {
-			buf.WriteByte('\'')
-			inQuote = false
-		}
-		buf.WriteString("\\'")
-	}
-	if len(word) > 0 {
-		if !inQuote {
-			buf.WriteByte('\'')
-		}
-		buf.WriteString(word)
-		buf.WriteByte('\'')
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/gonuts/go-shellquote/quote_test.go b/Godeps/_workspace/src/github.com/gonuts/go-shellquote/quote_test.go
deleted file mode 100644
index a4d2d82fb..000000000
--- a/Godeps/_workspace/src/github.com/gonuts/go-shellquote/quote_test.go
+++ /dev/null
@@ -1,28 +0,0 @@
-package shellquote
-
-import (
-	"testing"
-)
-
-func TestSimpleJoin(t *testing.T) {
-	for _, elem := range simpleJoinTest {
-		output := Join(elem.input...)
-		if output != elem.output {
-			t.Errorf("Input %q, got %q, expected %q", elem.input, output, elem.output)
-		}
-	}
-}
-
-var simpleJoinTest = []struct {
-	input  []string
-	output string
-}{
-	{[]string{"test"}, "test"},
-	{[]string{"hello goodbye"}, "'hello goodbye'"},
-	{[]string{"hello", "goodbye"}, "hello goodbye"},
-	{[]string{"don't you know the dewey decimal system?"}, "'don'\\''t you know the dewey decimal system?'"},
-	{[]string{"don't", "you", "know", "the", "dewey", "decimal", "system?"}, "don\\'t you know the dewey decimal system\\?"},
-	{[]string{"~user", "u~ser", " ~user", "!~user"}, "\\~user u~ser ' ~user' \\!~user"},
-	{[]string{"foo*", "M{ovies,usic}", "ab[cd]", "%3"}, "foo\\* M\\{ovies,usic} ab\\[cd] %3"},
-	{[]string{"one", "", "three"}, "one '' three"},
-}
diff --git a/Godeps/_workspace/src/github.com/gonuts/go-shellquote/unquote.go b/Godeps/_workspace/src/github.com/gonuts/go-shellquote/unquote.go
deleted file mode 100644
index ba3a0f227..000000000
--- a/Godeps/_workspace/src/github.com/gonuts/go-shellquote/unquote.go
+++ /dev/null
@@ -1,144 +0,0 @@
-package shellquote
-
-import (
-	"bytes"
-	"errors"
-	"strings"
-	"unicode/utf8"
-)
-
-var (
-	UnterminatedSingleQuoteError = errors.New("Unterminated single-quoted string")
-	UnterminatedDoubleQuoteError = errors.New("Unterminated double-quoted string")
-	UnterminatedEscapeError      = errors.New("Unterminated backslash-escape")
-)
-
-var (
-	splitChars        = " \n\t"
-	singleChar        = '\''
-	doubleChar        = '"'
-	escapeChar        = '\\'
-	doubleEscapeChars = "$`\"\n\\"
-)
-
-// Split splits a string according to /bin/sh's word-splitting rules. It
-// supports backslash-escapes, single-quotes, and double-quotes. Notably it does
-// not support the $'' style of quoting. It also doesn't attempt to perform any
-// other sort of expansion, including brace expansion, shell expansion, or
-// pathname expansion.
-//
-// If the given input has an unterminated quoted string or ends in a
-// backslash-escape, one of UnterminatedSingleQuoteError,
-// UnterminatedDoubleQuoteError, or UnterminatedEscapeError is returned.
-func Split(input string) (words []string, err error) {
-	var buf bytes.Buffer
-	words = make([]string, 0)
-
-	for len(input) > 0 {
-		// skip any splitChars at the start
-		c, l := utf8.DecodeRuneInString(input)
-		if strings.ContainsRune(splitChars, c) {
-			input = input[l:]
-			continue
-		}
-
-		var word string
-		word, input, err = splitWord(input, &buf)
-		if err != nil {
-			return
-		}
-		words = append(words, word)
-	}
-	return
-}
-
-func splitWord(input string, buf *bytes.Buffer) (word string, remainder string, err error) {
-	buf.Reset()
-
-raw:
-	{
-		cur := input
-		for len(cur) > 0 {
-			c, l := utf8.DecodeRuneInString(cur)
-			cur = cur[l:]
-			if c == singleChar {
-				buf.WriteString(input[0 : len(input)-len(cur)-l])
-				input = cur
-				goto single
-			} else if c == doubleChar {
-				buf.WriteString(input[0 : len(input)-len(cur)-l])
-				input = cur
-				goto double
-			} else if c == escapeChar {
-				buf.WriteString(input[0 : len(input)-len(cur)-l])
-				input = cur
-				goto escape
-			} else if strings.ContainsRune(splitChars, c) {
-				buf.WriteString(input[0 : len(input)-len(cur)-l])
-				return buf.String(), cur, nil
-			}
-		}
-		if len(input) > 0 {
-			buf.WriteString(input)
-			input = ""
-		}
-		goto done
-	}
-
-escape:
-	{
-		if len(input) == 0 {
-			return "", "", UnterminatedEscapeError
-		}
-		c, l := utf8.DecodeRuneInString(input)
-		if c == '\n' {
-			// a backslash-escaped newline is elided from the output entirely
-		} else {
-			buf.WriteString(input[:l])
-		}
-		input = input[l:]
-	}
-	goto raw
-
-single:
-	{
-		i := strings.IndexRune(input, singleChar)
-		if i == -1 {
-			return "", "", UnterminatedSingleQuoteError
-		}
-		buf.WriteString(input[0:i])
-		input = input[i+1:]
-		goto raw
-	}
-
-double:
-	{
-		cur := input
-		for len(cur) > 0 {
-			c, l := utf8.DecodeRuneInString(cur)
-			cur = cur[l:]
-			if c == doubleChar {
-				buf.WriteString(input[0 : len(input)-len(cur)-l])
-				input = cur
-				goto raw
-			} else if c == escapeChar {
-				// bash only supports certain escapes in double-quoted strings
-				c2, l2 := utf8.DecodeRuneInString(cur)
-				cur = cur[l2:]
-				if strings.ContainsRune(doubleEscapeChars, c2) {
-					buf.WriteString(input[0 : len(input)-len(cur)-l-l2])
-					if c2 == '\n' {
-						// newline is special, skip the backslash entirely
-					} else {
-						buf.WriteRune(c2)
-					}
-					input = cur
-				}
-			}
-		}
-		return "", "", UnterminatedDoubleQuoteError
-	}
-
-done:
-	return buf.String(), input, nil
-}
diff --git a/Godeps/_workspace/src/github.com/gonuts/go-shellquote/unquote_test.go b/Godeps/_workspace/src/github.com/gonuts/go-shellquote/unquote_test.go
deleted file mode 100644
index 32ea5144b..000000000
--- a/Godeps/_workspace/src/github.com/gonuts/go-shellquote/unquote_test.go
+++ /dev/null
@@ -1,52 +0,0 @@
-package shellquote
-
-import (
-	"reflect"
-	"testing"
-)
-
-func TestSimpleSplit(t *testing.T) {
-	for _, elem := range simpleSplitTest {
-		output, err := Split(elem.input)
-		if err != nil {
-			t.Errorf("Input %q, got error %#v", elem.input, err)
-		} else if !reflect.DeepEqual(output, elem.output) {
-			t.Errorf("Input %q, got %q, expected %q", elem.input, output, elem.output)
-		}
-	}
-}
-
-func TestErrorSplit(t *testing.T) {
-	for _, elem := range errorSplitTest {
-		_, err := Split(elem.input)
-		if err != elem.error {
-			t.Errorf("Input %q, got error %#v, expected error %#v", elem.input, err, elem.error)
-		}
-	}
-}
-
-var simpleSplitTest = []struct {
-	input  string
-	output []string
-}{
-	{"hello", []string{"hello"}},
-	{"hello goodbye", []string{"hello", "goodbye"}},
-	{"hello   goodbye", []string{"hello", "goodbye"}},
-	{"glob* test?", []string{"glob*", "test?"}},
-	{"don\\'t you know the dewey decimal system\\?", []string{"don't", "you", "know", "the", "dewey", "decimal", "system?"}},
-	{"'don'\\''t you know the dewey decimal system?'", []string{"don't you know the dewey decimal system?"}},
-	{"one '' two", []string{"one", "", "two"}},
-	{"text with\\\na newline", []string{"text", "witha", "newline"}},
-	{"\"quoted\\d\\\\\\\" text with a\\\nnewline\"", []string{"quoted\\d\\\" text with anewline"}},
-	{"foo\"bar\"baz", []string{"foobarbaz"}},
-}
-
-var errorSplitTest = []struct {
-	input string
-	error error
-}{
-	{"don't worry", UnterminatedSingleQuoteError},
-	{"'test'\\''ing", UnterminatedSingleQuoteError},
-	{"\"foo'bar", UnterminatedDoubleQuoteError},
-	{"foo\\", UnterminatedEscapeError},
-}
diff --git a/Godeps/_workspace/src/github.com/hashicorp/go-msgpack/codec/0doc.go b/Godeps/_workspace/src/github.com/hashicorp/go-msgpack/codec/0doc.go
deleted file mode 100644
index c14d810a7..000000000
--- a/Godeps/_workspace/src/github.com/hashicorp/go-msgpack/codec/0doc.go
+++ /dev/null
@@ -1,143 +0,0 @@
-// Copyright (c) 2012, 2013 Ugorji Nwoke. All rights reserved.
-// Use of this source code is governed by a BSD-style license found in the LICENSE file.
-
-/*
-High Performance, Feature-Rich Idiomatic Go encoding library for msgpack and binc .
-
-Supported Serialization formats are:
-
-  - msgpack: [https://github.com/msgpack/msgpack]
-  - binc: [http://github.com/ugorji/binc]
-
-To install:
-
-    go get github.com/ugorji/go/codec
-
-The idiomatic Go support is as seen in other encoding packages in
-the standard library (ie json, xml, gob, etc).
-
-Rich Feature Set includes:
-
-  - Simple but extremely powerful and feature-rich API
-  - Very High Performance.
-    Our extensive benchmarks show us outperforming Gob, Json and Bson by 2-4X.
-    This was achieved by taking extreme care on:
-      - managing allocation
-      - function frame size (important due to Go's use of split stacks),
-      - reflection use (and by-passing reflection for common types)
-      - recursion implications
-      - zero-copy mode (encoding/decoding to byte slice without using temp buffers)
-  - Correct.
-    Care was taken to precisely handle corner cases like:
-      overflows, nil maps and slices, nil value in stream, etc.
-  - Efficient zero-copying into temporary byte buffers
-    when encoding into or decoding from a byte slice.
-  - Standard field renaming via tags
-  - Encoding from any value
-    (struct, slice, map, primitives, pointers, interface{}, etc)
-  - Decoding into pointer to any non-nil typed value
-    (struct, slice, map, int, float32, bool, string, reflect.Value, etc)
-  - Supports extension functions to handle the encode/decode of custom types
-  - Support Go 1.2 encoding.BinaryMarshaler/BinaryUnmarshaler
-  - Schema-less decoding
-    (decode into a pointer to a nil interface{} as opposed to a typed non-nil value).
-    Includes Options to configure what specific map or slice type to use
-    when decoding an encoded list or map into a nil interface{}
-  - Provides a RPC Server and Client Codec for net/rpc communication protocol.
-  - Msgpack Specific:
-      - Provides extension functions to handle spec-defined extensions (binary, timestamp)
-      - Options to resolve ambiguities in handling raw bytes (as string or []byte)
-        during schema-less decoding (decoding into a nil interface{})
-      - RPC Server/Client Codec for msgpack-rpc protocol defined at:
-        https://github.com/msgpack-rpc/msgpack-rpc/blob/master/spec.md
-  - Fast Paths for some container types:
-    For some container types, we circumvent reflection and its associated overhead
-    and allocation costs, and encode/decode directly. These types are:
-	    []interface{}
-	    []int
-	    []string
-	    map[interface{}]interface{}
-	    map[int]interface{}
-	    map[string]interface{}
-
-Extension Support
-
-Users can register a function to handle the encoding or decoding of
-their custom types.
-
-There are no restrictions on what the custom type can be. Some examples:
-
-    type BisSet   []int
-    type BitSet64 uint64
-    type UUID     string
-    type MyStructWithUnexportedFields struct { a int; b bool; c []int; }
-    type GifImage struct { ... }
-
-As an illustration, MyStructWithUnexportedFields would normally be
-encoded as an empty map because it has no exported fields, while UUID
-would be encoded as a string. However, with extension support, you can
-encode any of these however you like.
-
-RPC
-
-RPC Client and Server Codecs are implemented, so the codecs can be used
-with the standard net/rpc package.
-
-Usage
-
-Typical usage model:
-
-    // create and configure Handle
-    var (
-      bh codec.BincHandle
-      mh codec.MsgpackHandle
-    )
-
-    mh.MapType = reflect.TypeOf(map[string]interface{}(nil))
-
-    // configure extensions
-    // e.g. for msgpack, define functions and enable Time support for tag 1
-    // mh.AddExt(reflect.TypeOf(time.Time{}), 1, myMsgpackTimeEncodeExtFn, myMsgpackTimeDecodeExtFn)
-
-    // create and use decoder/encoder
-    var (
-      r io.Reader
-      w io.Writer
-      b []byte
-      h = &bh // or mh to use msgpack
-    )
-
-    dec = codec.NewDecoder(r, h)
-    dec = codec.NewDecoderBytes(b, h)
-    err = dec.Decode(&v)
-
-    enc = codec.NewEncoder(w, h)
-    enc = codec.NewEncoderBytes(&b, h)
-    err = enc.Encode(v)
-
-    //RPC Server
-    go func() {
-        for {
-            conn, err := listener.Accept()
-            rpcCodec := codec.GoRpc.ServerCodec(conn, h)
-            //OR rpcCodec := codec.MsgpackSpecRpc.ServerCodec(conn, h)
-            rpc.ServeCodec(rpcCodec)
-        }
-    }()
-
-    //RPC Communication (client side)
-    conn, err = net.Dial("tcp", "localhost:5555")
-    rpcCodec := codec.GoRpc.ClientCodec(conn, h)
-    //OR rpcCodec := codec.MsgpackSpecRpc.ClientCodec(conn, h)
-    client := rpc.NewClientWithCodec(rpcCodec)
-
-Representative Benchmark Results
-
-Run the benchmark suite using:
-   go test -bi -bench=. -benchmem
-
-To run full benchmark suite (including against vmsgpack and bson),
-see notes in ext_dep_test.go
-
-*/
-package codec
diff --git a/Godeps/_workspace/src/github.com/hashicorp/go-msgpack/codec/README.md b/Godeps/_workspace/src/github.com/hashicorp/go-msgpack/codec/README.md
deleted file mode 100644
index 6c95d1bfd..000000000
--- a/Godeps/_workspace/src/github.com/hashicorp/go-msgpack/codec/README.md
+++ /dev/null
@@ -1,174 +0,0 @@
-# Codec
-
-High Performance and Feature-Rich Idiomatic Go Library providing
-encode/decode support for different serialization formats.
-
-Supported Serialization formats are:
-
-  - msgpack: [https://github.com/msgpack/msgpack]
-  - binc: [http://github.com/ugorji/binc]
-
-To install:
-
-    go get github.com/ugorji/go/codec
-
-Online documentation: [http://godoc.org/github.com/ugorji/go/codec]
-
-The idiomatic Go support is as seen in other encoding packages in
-the standard library (ie json, xml, gob, etc).
-
-Rich Feature Set includes:
-
-  - Simple but extremely powerful and feature-rich API
-  - Very High Performance.   
-    Our extensive benchmarks show us outperforming Gob, Json and Bson by 2-4X.
-    This was achieved by taking extreme care on:
-      - managing allocation
-      - function frame size (important due to Go's use of split stacks),
-      - reflection use (and by-passing reflection for common types)
-      - recursion implications
-      - zero-copy mode (encoding/decoding to byte slice without using temp buffers)
-  - Correct.  
-    Care was taken to precisely handle corner cases like: 
-      overflows, nil maps and slices, nil value in stream, etc.
-  - Efficient zero-copying into temporary byte buffers  
-    when encoding into or decoding from a byte slice.
-  - Standard field renaming via tags
-  - Encoding from any value  
-    (struct, slice, map, primitives, pointers, interface{}, etc)
-  - Decoding into pointer to any non-nil typed value  
-    (struct, slice, map, int, float32, bool, string, reflect.Value, etc)
-  - Supports extension functions to handle the encode/decode of custom types
-  - Support Go 1.2 encoding.BinaryMarshaler/BinaryUnmarshaler
-  - Schema-less decoding  
-    (decode into a pointer to a nil interface{} as opposed to a typed non-nil value).  
-    Includes Options to configure what specific map or slice type to use 
-    when decoding an encoded list or map into a nil interface{}
-  - Provides a RPC Server and Client Codec for net/rpc communication protocol.
-  - Msgpack Specific:
-      - Provides extension functions to handle spec-defined extensions (binary, timestamp)
-      - Options to resolve ambiguities in handling raw bytes (as string or []byte)  
-        during schema-less decoding (decoding into a nil interface{})
-      - RPC Server/Client Codec for msgpack-rpc protocol defined at: 
-        https://github.com/msgpack-rpc/msgpack-rpc/blob/master/spec.md
-  - Fast Paths for some container types:  
-    For some container types, we circumvent reflection and its associated overhead
-    and allocation costs, and encode/decode directly. These types are:  
-	    []interface{}
-	    []int
-	    []string
-	    map[interface{}]interface{}
-	    map[int]interface{}
-	    map[string]interface{}
-
-## Extension Support
-
-Users can register a function to handle the encoding or decoding of
-their custom types.
-
-There are no restrictions on what the custom type can be. Some examples:
-
-    type BisSet   []int
-    type BitSet64 uint64
-    type UUID     string
-    type MyStructWithUnexportedFields struct { a int; b bool; c []int; }
-    type GifImage struct { ... }
-
-As an illustration, MyStructWithUnexportedFields would normally be
-encoded as an empty map because it has no exported fields, while UUID
-would be encoded as a string. However, with extension support, you can
-encode any of these however you like.
-
-## RPC
-
-RPC Client and Server Codecs are implemented, so the codecs can be used
-with the standard net/rpc package.
-
-## Usage
-
-Typical usage model:
-
-    // create and configure Handle
-    var (
-      bh codec.BincHandle
-      mh codec.MsgpackHandle
-    )
-
-    mh.MapType = reflect.TypeOf(map[string]interface{}(nil))
-    
-    // configure extensions
-    // e.g. for msgpack, define functions and enable Time support for tag 1
-    // mh.AddExt(reflect.TypeOf(time.Time{}), 1, myMsgpackTimeEncodeExtFn, myMsgpackTimeDecodeExtFn)
-
-    // create and use decoder/encoder
-    var (
-      r io.Reader
-      w io.Writer
-      b []byte
-      h = &bh // or mh to use msgpack
-    )
-    
-    dec = codec.NewDecoder(r, h)
-    dec = codec.NewDecoderBytes(b, h)
-    err = dec.Decode(&v) 
-    
-    enc = codec.NewEncoder(w, h)
-    enc = codec.NewEncoderBytes(&b, h)
-    err = enc.Encode(v)
-    
-    //RPC Server
-    go func() {
-        for {
-            conn, err := listener.Accept()
-            rpcCodec := codec.GoRpc.ServerCodec(conn, h)
-            //OR rpcCodec := codec.MsgpackSpecRpc.ServerCodec(conn, h)
-            rpc.ServeCodec(rpcCodec)
-        }
-    }()
-
-    //RPC Communication (client side)
-    conn, err = net.Dial("tcp", "localhost:5555")
-    rpcCodec := codec.GoRpc.ClientCodec(conn, h)
-    //OR rpcCodec := codec.MsgpackSpecRpc.ClientCodec(conn, h)
-    client := rpc.NewClientWithCodec(rpcCodec)
-
-## Representative Benchmark Results
-
-A sample run of benchmark using "go test -bi -bench=. -benchmem":
-
-    /proc/cpuinfo: Intel(R) Core(TM) i7-2630QM CPU @ 2.00GHz (HT)
-    
-    ..............................................
-    BENCHMARK INIT: 2013-10-16 11:02:50.345970786 -0400 EDT
-    To run full benchmark comparing encodings (MsgPack, Binc, JSON, GOB, etc), use: "go test -bench=."
-    Benchmark: 
-    	Struct recursive Depth:             1
-    	ApproxDeepSize Of benchmark Struct: 4694 bytes
-    Benchmark One-Pass Run:
-    	 v-msgpack: len: 1600 bytes
-    	      bson: len: 3025 bytes
-    	   msgpack: len: 1560 bytes
-    	      binc: len: 1187 bytes
-    	       gob: len: 1972 bytes
-    	      json: len: 2538 bytes
-    ..............................................
-    PASS
-    Benchmark__Msgpack____Encode	   50000	     54359 ns/op	   14953 B/op	      83 allocs/op
-    Benchmark__Msgpack____Decode	   10000	    106531 ns/op	   14990 B/op	     410 allocs/op
-    Benchmark__Binc_NoSym_Encode	   50000	     53956 ns/op	   14966 B/op	      83 allocs/op
-    Benchmark__Binc_NoSym_Decode	   10000	    103751 ns/op	   14529 B/op	     386 allocs/op
-    Benchmark__Binc_Sym___Encode	   50000	     65961 ns/op	   17130 B/op	      88 allocs/op
-    Benchmark__Binc_Sym___Decode	   10000	    106310 ns/op	   15857 B/op	     287 allocs/op
-    Benchmark__Gob________Encode	   10000	    135944 ns/op	   21189 B/op	     237 allocs/op
-    Benchmark__Gob________Decode	    5000	    405390 ns/op	   83460 B/op	    1841 allocs/op
-    Benchmark__Json_______Encode	   20000	     79412 ns/op	   13874 B/op	     102 allocs/op
-    Benchmark__Json_______Decode	   10000	    247979 ns/op	   14202 B/op	     493 allocs/op
-    Benchmark__Bson_______Encode	   10000	    121762 ns/op	   27814 B/op	     514 allocs/op
-    Benchmark__Bson_______Decode	   10000	    162126 ns/op	   16514 B/op	     789 allocs/op
-    Benchmark__VMsgpack___Encode	   50000	     69155 ns/op	   12370 B/op	     344 allocs/op
-    Benchmark__VMsgpack___Decode	   10000	    151609 ns/op	   20307 B/op	     571 allocs/op
-    ok  	ugorji.net/codec	30.827s
-
-To run full benchmark suite (including against vmsgpack and bson), 
-see notes in ext\_dep\_test.go
-
diff --git a/Godeps/_workspace/src/github.com/hashicorp/go-msgpack/codec/bench_test.go b/Godeps/_workspace/src/github.com/hashicorp/go-msgpack/codec/bench_test.go
deleted file mode 100644
index 4d437035e..000000000
--- a/Godeps/_workspace/src/github.com/hashicorp/go-msgpack/codec/bench_test.go
+++ /dev/null
@@ -1,319 +0,0 @@
-// Copyright (c) 2012, 2013 Ugorji Nwoke. All rights reserved.
-// Use of this source code is governed by a BSD-style license found in the LICENSE file.
-
-package codec
-
-import (
-	"bytes"
-	"encoding/gob"
-	"encoding/json"
-	"flag"
-	"fmt"
-	"reflect"
-	"runtime"
-	"testing"
-	"time"
-)
-
-// Sample way to run:
-// go test -bi -bv -bd=1 -benchmem -bench=.
-
-var (
-	_       = fmt.Printf
-	benchTs *TestStruc
-
-	approxSize int
-
-	benchDoInitBench     bool
-	benchVerify          bool
-	benchUnscientificRes bool = false
-	//depth of 0 maps to ~400bytes json-encoded string, 1 maps to ~1400 bytes, etc
-	//For depth>1, we likely trigger stack growth for encoders, making benchmarking unreliable.
-	benchDepth     int
-	benchInitDebug bool
-	benchCheckers  []benchChecker
-)
-
-type benchEncFn func(interface{}) ([]byte, error)
-type benchDecFn func([]byte, interface{}) error
-type benchIntfFn func() interface{}
-
-type benchChecker struct {
-	name     string
-	encodefn benchEncFn
-	decodefn benchDecFn
-}
-
-func benchInitFlags() {
-	flag.BoolVar(&benchInitDebug, "bg", false, "Bench Debug")
-	flag.IntVar(&benchDepth, "bd", 1, "Bench Depth: If >1, potential unreliable results due to stack growth")
-	flag.BoolVar(&benchDoInitBench, "bi", false, "Run Bench Init")
-	flag.BoolVar(&benchVerify, "bv", false, "Verify Decoded Value during Benchmark")
-	flag.BoolVar(&benchUnscientificRes, "bu", false, "Show Unscientific Results during Benchmark")
-}
-
-func benchInit() {
-	benchTs = newTestStruc(benchDepth, true)
-	approxSize = approxDataSize(reflect.ValueOf(benchTs))
-	bytesLen := 1024 * 4 * (benchDepth + 1) * (benchDepth + 1)
-	if bytesLen < approxSize {
-		bytesLen = approxSize
-	}
-
-	benchCheckers = append(benchCheckers,
-		benchChecker{"msgpack", fnMsgpackEncodeFn, fnMsgpackDecodeFn},
-		benchChecker{"binc-nosym", fnBincNoSymEncodeFn, fnBincNoSymDecodeFn},
-		benchChecker{"binc-sym", fnBincSymEncodeFn, fnBincSymDecodeFn},
-		benchChecker{"simple", fnSimpleEncodeFn, fnSimpleDecodeFn},
-		benchChecker{"gob", fnGobEncodeFn, fnGobDecodeFn},
-		benchChecker{"json", fnJsonEncodeFn, fnJsonDecodeFn},
-	)
-	if benchDoInitBench {
-		runBenchInit()
-	}
-}
-
-func runBenchInit() {
-	logT(nil, "..............................................")
-	logT(nil, "BENCHMARK INIT: %v", time.Now())
-	logT(nil, "To run full benchmark comparing encodings (MsgPack, Binc, Simple, JSON, GOB, etc), "+
-		"use: \"go test -bench=.\"")
-	logT(nil, "Benchmark: ")
-	logT(nil, "\tStruct recursive Depth:             %d", benchDepth)
-	if approxSize > 0 {
-		logT(nil, "\tApproxDeepSize Of benchmark Struct: %d bytes", approxSize)
-	}
-	if benchUnscientificRes {
-		logT(nil, "Benchmark One-Pass Run (with Unscientific Encode/Decode times): ")
-	} else {
-		logT(nil, "Benchmark One-Pass Run:")
-	}
-	for _, bc := range benchCheckers {
-		doBenchCheck(bc.name, bc.encodefn, bc.decodefn)
-	}
-	logT(nil, "..............................................")
-	if benchInitDebug {
-		logT(nil, "<<<<====>>>> depth: %v, ts: %#v\n", benchDepth, benchTs)
-	}
-}
-
-func fnBenchNewTs() interface{} {
-	return new(TestStruc)
-}
-
-func doBenchCheck(name string, encfn benchEncFn, decfn benchDecFn) {
-	runtime.GC()
-	tnow := time.Now()
-	buf, err := encfn(benchTs)
-	if err != nil {
-		logT(nil, "\t%10s: **** Error encoding benchTs: %v", name, err)
-	}
-	encDur := time.Now().Sub(tnow)
-	encLen := len(buf)
-	runtime.GC()
-	if !benchUnscientificRes {
-		logT(nil, "\t%10s: len: %d bytes\n", name, encLen)
-		return
-	}
-	tnow = time.Now()
-	if err = decfn(buf, new(TestStruc)); err != nil {
-		logT(nil, "\t%10s: **** Error decoding into new TestStruc: %v", name, err)
-	}
-	decDur := time.Now().Sub(tnow)
-	logT(nil, "\t%10s: len: %d bytes, encode: %v, decode: %v\n", name, encLen, encDur, decDur)
-}
-
-func fnBenchmarkEncode(b *testing.B, encName string, ts interface{}, encfn benchEncFn) {
-	runtime.GC()
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		_, err := encfn(ts)
-		if err != nil {
-			logT(b, "Error encoding benchTs: %s: %v", encName, err)
-			b.FailNow()
-		}
-	}
-}
-
-func fnBenchmarkDecode(b *testing.B, encName string, ts interface{},
-	encfn benchEncFn, decfn benchDecFn, newfn benchIntfFn,
-) {
-	buf, err := encfn(ts)
-	if err != nil {
-		logT(b, "Error encoding benchTs: %s: %v", encName, err)
-		b.FailNow()
-	}
-	runtime.GC()
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		ts = newfn()
-		if err = decfn(buf, ts); err != nil {
-			logT(b, "Error decoding into new TestStruc: %s: %v", encName, err)
-			b.FailNow()
-		}
-		if benchVerify {
-			if vts, vok := ts.(*TestStruc); vok {
-				verifyTsTree(b, vts)
-			}
-		}
-	}
-}
-
-func verifyTsTree(b *testing.B, ts *TestStruc) {
-	var ts0, ts1m, ts2m, ts1s, ts2s *TestStruc
-	ts0 = ts
-
-	if benchDepth > 0 {
-		ts1m, ts1s = verifyCheckAndGet(b, ts0)
-	}
-
-	if benchDepth > 1 {
-		ts2m, ts2s = verifyCheckAndGet(b, ts1m)
-	}
-	for _, tsx := range []*TestStruc{ts0, ts1m, ts2m, ts1s, ts2s} {
-		if tsx != nil {
-			verifyOneOne(b, tsx)
-		}
-	}
-}
-
-func verifyCheckAndGet(b *testing.B, ts0 *TestStruc) (ts1m *TestStruc, ts1s *TestStruc) {
-	// if len(ts1m.Ms) <= 2 {
-	// 	logT(b, "Error: ts1m.Ms len should be > 2. Got: %v", len(ts1m.Ms))
-	// 	b.FailNow()
-	// }
-	if len(ts0.Its) == 0 {
-		logT(b, "Error: ts0.Islice len should be > 0. Got: %v", len(ts0.Its))
-		b.FailNow()
-	}
-	ts1m = ts0.Mtsptr["0"]
-	ts1s = ts0.Its[0]
-	if ts1m == nil || ts1s == nil {
-		logT(b, "Error: At benchDepth 1, No *TestStruc found")
-		b.FailNow()
-	}
-	return
-}
-
-func verifyOneOne(b *testing.B, ts *TestStruc) {
-	if ts.I64slice[2] != int64(3) {
-		logT(b, "Error: Decode failed by checking values")
-		b.FailNow()
-	}
-}
-
-func fnMsgpackEncodeFn(ts interface{}) (bs []byte, err error) {
-	err = NewEncoderBytes(&bs, testMsgpackH).Encode(ts)
-	return
-}
-
-func fnMsgpackDecodeFn(buf []byte, ts interface{}) error {
-	return NewDecoderBytes(buf, testMsgpackH).Decode(ts)
-}
-
-func fnBincEncodeFn(ts interface{}, sym AsSymbolFlag) (bs []byte, err error) {
-	tSym := testBincH.AsSymbols
-	testBincH.AsSymbols = sym
-	err = NewEncoderBytes(&bs, testBincH).Encode(ts)
-	testBincH.AsSymbols = tSym
-	return
-}
-
-func fnBincDecodeFn(buf []byte, ts interface{}, sym AsSymbolFlag) (err error) {
-	tSym := testBincH.AsSymbols
-	testBincH.AsSymbols = sym
-	err = NewDecoderBytes(buf, testBincH).Decode(ts)
-	testBincH.AsSymbols = tSym
-	return
-}
-
-func fnBincNoSymEncodeFn(ts interface{}) (bs []byte, err error) {
-	return fnBincEncodeFn(ts, AsSymbolNone)
-}
-
-func fnBincNoSymDecodeFn(buf []byte, ts interface{}) error {
-	return fnBincDecodeFn(buf, ts, AsSymbolNone)
-}
-
-func fnBincSymEncodeFn(ts interface{}) (bs []byte, err error) {
-	return fnBincEncodeFn(ts, AsSymbolAll)
-}
-
-func fnBincSymDecodeFn(buf []byte, ts interface{}) error {
-	return fnBincDecodeFn(buf, ts, AsSymbolAll)
-}
-
-func fnSimpleEncodeFn(ts interface{}) (bs []byte, err error) {
-	err = NewEncoderBytes(&bs, testSimpleH).Encode(ts)
-	return
-}
-
-func fnSimpleDecodeFn(buf []byte, ts interface{}) error {
-	return NewDecoderBytes(buf, testSimpleH).Decode(ts)
-}
-
-func fnGobEncodeFn(ts interface{}) ([]byte, error) {
-	bbuf := new(bytes.Buffer)
-	err := gob.NewEncoder(bbuf).Encode(ts)
-	return bbuf.Bytes(), err
-}
-
-func fnGobDecodeFn(buf []byte, ts interface{}) error {
-	return gob.NewDecoder(bytes.NewBuffer(buf)).Decode(ts)
-}
-
-func fnJsonEncodeFn(ts interface{}) ([]byte, error) {
-	return json.Marshal(ts)
-}
-
-func fnJsonDecodeFn(buf []byte, ts interface{}) error {
-	return json.Unmarshal(buf, ts)
-}
-
-func Benchmark__Msgpack____Encode(b *testing.B) {
-	fnBenchmarkEncode(b, "msgpack", benchTs, fnMsgpackEncodeFn)
-}
-
-func Benchmark__Msgpack____Decode(b *testing.B) {
-	fnBenchmarkDecode(b, "msgpack", benchTs, fnMsgpackEncodeFn, fnMsgpackDecodeFn, fnBenchNewTs)
-}
-
-func Benchmark__Binc_NoSym_Encode(b *testing.B) {
-	fnBenchmarkEncode(b, "binc", benchTs, fnBincNoSymEncodeFn)
-}
-
-func Benchmark__Binc_NoSym_Decode(b *testing.B) {
-	fnBenchmarkDecode(b, "binc", benchTs, fnBincNoSymEncodeFn, fnBincNoSymDecodeFn, fnBenchNewTs)
-}
-
-func Benchmark__Binc_Sym___Encode(b *testing.B) {
-	fnBenchmarkEncode(b, "binc", benchTs, fnBincSymEncodeFn)
-}
-
-func Benchmark__Binc_Sym___Decode(b *testing.B) {
-	fnBenchmarkDecode(b, "binc", benchTs, fnBincSymEncodeFn, fnBincSymDecodeFn, fnBenchNewTs)
-}
-
-func Benchmark__Simple____Encode(b *testing.B) {
-	fnBenchmarkEncode(b, "simple", benchTs, fnSimpleEncodeFn)
-}
-
-func Benchmark__Simple____Decode(b *testing.B) {
-	fnBenchmarkDecode(b, "simple", benchTs, fnSimpleEncodeFn, fnSimpleDecodeFn, fnBenchNewTs)
-}
-
-func Benchmark__Gob________Encode(b *testing.B) {
-	fnBenchmarkEncode(b, "gob", benchTs, fnGobEncodeFn)
-}
-
-func Benchmark__Gob________Decode(b *testing.B) {
-	fnBenchmarkDecode(b, "gob", benchTs, fnGobEncodeFn, fnGobDecodeFn, fnBenchNewTs)
-}
-
-func Benchmark__Json_______Encode(b *testing.B) {
-	fnBenchmarkEncode(b, "json", benchTs, fnJsonEncodeFn)
-}
-
-func Benchmark__Json_______Decode(b *testing.B) {
-	fnBenchmarkDecode(b, "json", benchTs, fnJsonEncodeFn, fnJsonDecodeFn, fnBenchNewTs)
-}
diff --git a/Godeps/_workspace/src/github.com/hashicorp/go-msgpack/codec/binc.go b/Godeps/_workspace/src/github.com/hashicorp/go-msgpack/codec/binc.go
deleted file mode 100644
index 2bb5e8fee..000000000
--- a/Godeps/_workspace/src/github.com/hashicorp/go-msgpack/codec/binc.go
+++ /dev/null
@@ -1,786 +0,0 @@
-// Copyright (c) 2012, 2013 Ugorji Nwoke. All rights reserved.
-// Use of this source code is governed by a BSD-style license found in the LICENSE file.
-
-package codec
-
-import (
-	"math"
-	// "reflect"
-	// "sync/atomic"
-	"time"
-	//"fmt"
-)
-
-const bincDoPrune = true // No longer needed. Needed before as C lib did not support pruning.
-
-//var _ = fmt.Printf
-
-// vd as low 4 bits (there are 16 slots)
-const (
-	bincVdSpecial byte = iota
-	bincVdPosInt
-	bincVdNegInt
-	bincVdFloat
-
-	bincVdString
-	bincVdByteArray
-	bincVdArray
-	bincVdMap
-
-	bincVdTimestamp
-	bincVdSmallInt
-	bincVdUnicodeOther
-	bincVdSymbol
-
-	bincVdDecimal
-	_               // open slot
-	_               // open slot
-	bincVdCustomExt = 0x0f
-)
-
-const (
-	bincSpNil byte = iota
-	bincSpFalse
-	bincSpTrue
-	bincSpNan
-	bincSpPosInf
-	bincSpNegInf
-	bincSpZeroFloat
-	bincSpZero
-	bincSpNegOne
-)
-
-const (
-	bincFlBin16 byte = iota
-	bincFlBin32
-	_ // bincFlBin32e
-	bincFlBin64
-	_ // bincFlBin64e
-	// others not currently supported
-)
-
-type bincEncDriver struct {
-	w encWriter
-	m map[string]uint16 // symbols
-	s uint32            // symbols sequencer
-	b [8]byte
-}
-
-func (e *bincEncDriver) isBuiltinType(rt uintptr) bool {
-	return rt == timeTypId
-}
-
-func (e *bincEncDriver) encodeBuiltin(rt uintptr, v interface{}) {
-	switch rt {
-	case timeTypId:
-		bs := encodeTime(v.(time.Time))
-		e.w.writen1(bincVdTimestamp<<4 | uint8(len(bs)))
-		e.w.writeb(bs)
-	}
-}
-
-func (e *bincEncDriver) encodeNil() {
-	e.w.writen1(bincVdSpecial<<4 | bincSpNil)
-}
-
-func (e *bincEncDriver) encodeBool(b bool) {
-	if b {
-		e.w.writen1(bincVdSpecial<<4 | bincSpTrue)
-	} else {
-		e.w.writen1(bincVdSpecial<<4 | bincSpFalse)
-	}
-}
-
-func (e *bincEncDriver) encodeFloat32(f float32) {
-	if f == 0 {
-		e.w.writen1(bincVdSpecial<<4 | bincSpZeroFloat)
-		return
-	}
-	e.w.writen1(bincVdFloat<<4 | bincFlBin32)
-	e.w.writeUint32(math.Float32bits(f))
-}
-
-func (e *bincEncDriver) encodeFloat64(f float64) {
-	if f == 0 {
-		e.w.writen1(bincVdSpecial<<4 | bincSpZeroFloat)
-		return
-	}
-	bigen.PutUint64(e.b[:], math.Float64bits(f))
-	if bincDoPrune {
-		i := 7
-		for ; i >= 0 && (e.b[i] == 0); i-- {
-		}
-		i++
-		if i <= 6 {
-			e.w.writen1(bincVdFloat<<4 | 0x8 | bincFlBin64)
-			e.w.writen1(byte(i))
-			e.w.writeb(e.b[:i])
-			return
-		}
-	}
-	e.w.writen1(bincVdFloat<<4 | bincFlBin64)
-	e.w.writeb(e.b[:])
-}
-
-func (e *bincEncDriver) encIntegerPrune(bd byte, pos bool, v uint64, lim uint8) {
-	if lim == 4 {
-		bigen.PutUint32(e.b[:lim], uint32(v))
-	} else {
-		bigen.PutUint64(e.b[:lim], v)
-	}
-	if bincDoPrune {
-		i := pruneSignExt(e.b[:lim], pos)
-		e.w.writen1(bd | lim - 1 - byte(i))
-		e.w.writeb(e.b[i:lim])
-	} else {
-		e.w.writen1(bd | lim - 1)
-		e.w.writeb(e.b[:lim])
-	}
-}
-
-func (e *bincEncDriver) encodeInt(v int64) {
-	const nbd byte = bincVdNegInt << 4
-	switch {
-	case v >= 0:
-		e.encUint(bincVdPosInt<<4, true, uint64(v))
-	case v == -1:
-		e.w.writen1(bincVdSpecial<<4 | bincSpNegOne)
-	default:
-		e.encUint(bincVdNegInt<<4, false, uint64(-v))
-	}
-}
-
-func (e *bincEncDriver) encodeUint(v uint64) {
-	e.encUint(bincVdPosInt<<4, true, v)
-}
-
-func (e *bincEncDriver) encUint(bd byte, pos bool, v uint64) {
-	switch {
-	case v == 0:
-		e.w.writen1(bincVdSpecial<<4 | bincSpZero)
-	case pos && v >= 1 && v <= 16:
-		e.w.writen1(bincVdSmallInt<<4 | byte(v-1))
-	case v <= math.MaxUint8:
-		e.w.writen2(bd|0x0, byte(v))
-	case v <= math.MaxUint16:
-		e.w.writen1(bd | 0x01)
-		e.w.writeUint16(uint16(v))
-	case v <= math.MaxUint32:
-		e.encIntegerPrune(bd, pos, v, 4)
-	default:
-		e.encIntegerPrune(bd, pos, v, 8)
-	}
-}
-
-func (e *bincEncDriver) encodeExtPreamble(xtag byte, length int) {
-	e.encLen(bincVdCustomExt<<4, uint64(length))
-	e.w.writen1(xtag)
-}
-
-func (e *bincEncDriver) encodeArrayPreamble(length int) {
-	e.encLen(bincVdArray<<4, uint64(length))
-}
-
-func (e *bincEncDriver) encodeMapPreamble(length int) {
-	e.encLen(bincVdMap<<4, uint64(length))
-}
-
-func (e *bincEncDriver) encodeString(c charEncoding, v string) {
-	l := uint64(len(v))
-	e.encBytesLen(c, l)
-	if l > 0 {
-		e.w.writestr(v)
-	}
-}
-
-func (e *bincEncDriver) encodeSymbol(v string) {
-	// if WriteSymbolsNoRefs {
-	// 	e.encodeString(c_UTF8, v)
-	// 	return
-	// }
-
-	//symbols only offer benefit when string length > 1.
-	//This is because strings with length 1 take only 2 bytes to store
-	//(bd with embedded length, and single byte for string val).
-
-	l := len(v)
-	switch l {
-	case 0:
-		e.encBytesLen(c_UTF8, 0)
-		return
-	case 1:
-		e.encBytesLen(c_UTF8, 1)
-		e.w.writen1(v[0])
-		return
-	}
-	if e.m == nil {
-		e.m = make(map[string]uint16, 16)
-	}
-	ui, ok := e.m[v]
-	if ok {
-		if ui <= math.MaxUint8 {
-			e.w.writen2(bincVdSymbol<<4, byte(ui))
-		} else {
-			e.w.writen1(bincVdSymbol<<4 | 0x8)
-			e.w.writeUint16(ui)
-		}
-	} else {
-		e.s++
-		ui = uint16(e.s)
-		//ui = uint16(atomic.AddUint32(&e.s, 1))
-		e.m[v] = ui
-		var lenprec uint8
-		switch {
-		case l <= math.MaxUint8:
-			// lenprec = 0
-		case l <= math.MaxUint16:
-			lenprec = 1
-		case int64(l) <= math.MaxUint32:
-			lenprec = 2
-		default:
-			lenprec = 3
-		}
-		if ui <= math.MaxUint8 {
-			e.w.writen2(bincVdSymbol<<4|0x0|0x4|lenprec, byte(ui))
-		} else {
-			e.w.writen1(bincVdSymbol<<4 | 0x8 | 0x4 | lenprec)
-			e.w.writeUint16(ui)
-		}
-		switch lenprec {
-		case 0:
-			e.w.writen1(byte(l))
-		case 1:
-			e.w.writeUint16(uint16(l))
-		case 2:
-			e.w.writeUint32(uint32(l))
-		default:
-			e.w.writeUint64(uint64(l))
-		}
-		e.w.writestr(v)
-	}
-}
-
-func (e *bincEncDriver) encodeStringBytes(c charEncoding, v []byte) {
-	l := uint64(len(v))
-	e.encBytesLen(c, l)
-	if l > 0 {
-		e.w.writeb(v)
-	}
-}
-
-func (e *bincEncDriver) encBytesLen(c charEncoding, length uint64) {
-	//TODO: support bincUnicodeOther (for now, just use string or bytearray)
-	if c == c_RAW {
-		e.encLen(bincVdByteArray<<4, length)
-	} else {
-		e.encLen(bincVdString<<4, length)
-	}
-}
-
-func (e *bincEncDriver) encLen(bd byte, l uint64) {
-	if l < 12 {
-		e.w.writen1(bd | uint8(l+4))
-	} else {
-		e.encLenNumber(bd, l)
-	}
-}
-
-func (e *bincEncDriver) encLenNumber(bd byte, v uint64) {
-	switch {
-	case v <= math.MaxUint8:
-		e.w.writen2(bd, byte(v))
-	case v <= math.MaxUint16:
-		e.w.writen1(bd | 0x01)
-		e.w.writeUint16(uint16(v))
-	case v <= math.MaxUint32:
-		e.w.writen1(bd | 0x02)
-		e.w.writeUint32(uint32(v))
-	default:
-		e.w.writen1(bd | 0x03)
-		e.w.writeUint64(uint64(v))
-	}
-}
-
-//------------------------------------
-
-type bincDecDriver struct {
-	r      decReader
-	bdRead bool
-	bdType valueType
-	bd     byte
-	vd     byte
-	vs     byte
-	b      [8]byte
-	m      map[uint32]string // symbols (use uint32 as key, as map optimizes for it)
-}
-
-func (d *bincDecDriver) initReadNext() {
-	if d.bdRead {
-		return
-	}
-	d.bd = d.r.readn1()
-	d.vd = d.bd >> 4
-	d.vs = d.bd & 0x0f
-	d.bdRead = true
-	d.bdType = valueTypeUnset
-}
-
-func (d *bincDecDriver) currentEncodedType() valueType {
-	if d.bdType == valueTypeUnset {
-		switch d.vd {
-		case bincVdSpecial:
-			switch d.vs {
-			case bincSpNil:
-				d.bdType = valueTypeNil
-			case bincSpFalse, bincSpTrue:
-				d.bdType = valueTypeBool
-			case bincSpNan, bincSpNegInf, bincSpPosInf, bincSpZeroFloat:
-				d.bdType = valueTypeFloat
-			case bincSpZero:
-				d.bdType = valueTypeUint
-			case bincSpNegOne:
-				d.bdType = valueTypeInt
-			default:
-				decErr("currentEncodedType: Unrecognized special value 0x%x", d.vs)
-			}
-		case bincVdSmallInt:
-			d.bdType = valueTypeUint
-		case bincVdPosInt:
-			d.bdType = valueTypeUint
-		case bincVdNegInt:
-			d.bdType = valueTypeInt
-		case bincVdFloat:
-			d.bdType = valueTypeFloat
-		case bincVdString:
-			d.bdType = valueTypeString
-		case bincVdSymbol:
-			d.bdType = valueTypeSymbol
-		case bincVdByteArray:
-			d.bdType = valueTypeBytes
-		case bincVdTimestamp:
-			d.bdType = valueTypeTimestamp
-		case bincVdCustomExt:
-			d.bdType = valueTypeExt
-		case bincVdArray:
-			d.bdType = valueTypeArray
-		case bincVdMap:
-			d.bdType = valueTypeMap
-		default:
-			decErr("currentEncodedType: Unrecognized d.vd: 0x%x", d.vd)
-		}
-	}
-	return d.bdType
-}
-
-func (d *bincDecDriver) tryDecodeAsNil() bool {
-	if d.bd == bincVdSpecial<<4|bincSpNil {
-		d.bdRead = false
-		return true
-	}
-	return false
-}
-
-func (d *bincDecDriver) isBuiltinType(rt uintptr) bool {
-	return rt == timeTypId
-}
-
-func (d *bincDecDriver) decodeBuiltin(rt uintptr, v interface{}) {
-	switch rt {
-	case timeTypId:
-		if d.vd != bincVdTimestamp {
-			decErr("Invalid d.vd. Expecting 0x%x. Received: 0x%x", bincVdTimestamp, d.vd)
-		}
-		tt, err := decodeTime(d.r.readn(int(d.vs)))
-		if err != nil {
-			panic(err)
-		}
-		var vt *time.Time = v.(*time.Time)
-		*vt = tt
-		d.bdRead = false
-	}
-}
-
-func (d *bincDecDriver) decFloatPre(vs, defaultLen byte) {
-	if vs&0x8 == 0 {
-		d.r.readb(d.b[0:defaultLen])
-	} else {
-		l := d.r.readn1()
-		if l > 8 {
-			decErr("At most 8 bytes used to represent float. Received: %v bytes", l)
-		}
-		for i := l; i < 8; i++ {
-			d.b[i] = 0
-		}
-		d.r.readb(d.b[0:l])
-	}
-}
-
-func (d *bincDecDriver) decFloat() (f float64) {
-	//if true { f = math.Float64frombits(d.r.readUint64()); break; }
-	switch vs := d.vs; vs & 0x7 {
-	case bincFlBin32:
-		d.decFloatPre(vs, 4)
-		f = float64(math.Float32frombits(bigen.Uint32(d.b[0:4])))
-	case bincFlBin64:
-		d.decFloatPre(vs, 8)
-		f = math.Float64frombits(bigen.Uint64(d.b[0:8]))
-	default:
-		decErr("only float32 and float64 are supported. d.vd: 0x%x, d.vs: 0x%x", d.vd, d.vs)
-	}
-	return
-}
-
-func (d *bincDecDriver) decUint() (v uint64) {
-	// need to inline the code (interface conversion and type assertion expensive)
-	switch d.vs {
-	case 0:
-		v = uint64(d.r.readn1())
-	case 1:
-		d.r.readb(d.b[6:])
-		v = uint64(bigen.Uint16(d.b[6:]))
-	case 2:
-		d.b[4] = 0
-		d.r.readb(d.b[5:])
-		v = uint64(bigen.Uint32(d.b[4:]))
-	case 3:
-		d.r.readb(d.b[4:])
-		v = uint64(bigen.Uint32(d.b[4:]))
-	case 4, 5, 6:
-		lim := int(7 - d.vs)
-		d.r.readb(d.b[lim:])
-		for i := 0; i < lim; i++ {
-			d.b[i] = 0
-		}
-		v = uint64(bigen.Uint64(d.b[:]))
-	case 7:
-		d.r.readb(d.b[:])
-		v = uint64(bigen.Uint64(d.b[:]))
-	default:
-		decErr("unsigned integers with greater than 64 bits of precision not supported")
-	}
-	return
-}
-
-func (d *bincDecDriver) decIntAny() (ui uint64, i int64, neg bool) {
-	switch d.vd {
-	case bincVdPosInt:
-		ui = d.decUint()
-		i = int64(ui)
-	case bincVdNegInt:
-		ui = d.decUint()
-		i = -(int64(ui))
-		neg = true
-	case bincVdSmallInt:
-		i = int64(d.vs) + 1
-		ui = uint64(d.vs) + 1
-	case bincVdSpecial:
-		switch d.vs {
-		case bincSpZero:
-			//i = 0
-		case bincSpNegOne:
-			neg = true
-			ui = 1
-			i = -1
-		default:
-			decErr("numeric decode fails for special value: d.vs: 0x%x", d.vs)
-		}
-	default:
-		decErr("number can only be decoded from uint or int values. d.bd: 0x%x, d.vd: 0x%x", d.bd, d.vd)
-	}
-	return
-}
-
-func (d *bincDecDriver) decodeInt(bitsize uint8) (i int64) {
-	_, i, _ = d.decIntAny()
-	checkOverflow(0, i, bitsize)
-	d.bdRead = false
-	return
-}
-
-func (d *bincDecDriver) decodeUint(bitsize uint8) (ui uint64) {
-	ui, i, neg := d.decIntAny()
-	if neg {
-		decErr("Assigning negative signed value: %v, to unsigned type", i)
-	}
-	checkOverflow(ui, 0, bitsize)
-	d.bdRead = false
-	return
-}
-
-func (d *bincDecDriver) decodeFloat(chkOverflow32 bool) (f float64) {
-	switch d.vd {
-	case bincVdSpecial:
-		d.bdRead = false
-		switch d.vs {
-		case bincSpNan:
-			return math.NaN()
-		case bincSpPosInf:
-			return math.Inf(1)
-		case bincSpZeroFloat, bincSpZero:
-			return
-		case bincSpNegInf:
-			return math.Inf(-1)
-		default:
-			decErr("Invalid d.vs decoding float where d.vd=bincVdSpecial: %v", d.vs)
-		}
-	case bincVdFloat:
-		f = d.decFloat()
-	default:
-		_, i, _ := d.decIntAny()
-		f = float64(i)
-	}
-	checkOverflowFloat32(f, chkOverflow32)
-	d.bdRead = false
-	return
-}
-
-// bool can be decoded from bool only (single byte).
-func (d *bincDecDriver) decodeBool() (b bool) {
-	switch d.bd {
-	case (bincVdSpecial | bincSpFalse):
-		// b = false
-	case (bincVdSpecial | bincSpTrue):
-		b = true
-	default:
-		decErr("Invalid single-byte value for bool: %s: %x", msgBadDesc, d.bd)
-	}
-	d.bdRead = false
-	return
-}
-
-func (d *bincDecDriver) readMapLen() (length int) {
-	if d.vd != bincVdMap {
-		decErr("Invalid d.vd for map. Expecting 0x%x. Got: 0x%x", bincVdMap, d.vd)
-	}
-	length = d.decLen()
-	d.bdRead = false
-	return
-}
-
-func (d *bincDecDriver) readArrayLen() (length int) {
-	if d.vd != bincVdArray {
-		decErr("Invalid d.vd for array. Expecting 0x%x. Got: 0x%x", bincVdArray, d.vd)
-	}
-	length = d.decLen()
-	d.bdRead = false
-	return
-}
-
-func (d *bincDecDriver) decLen() int {
-	if d.vs <= 3 {
-		return int(d.decUint())
-	}
-	return int(d.vs - 4)
-}
-
-func (d *bincDecDriver) decodeString() (s string) {
-	switch d.vd {
-	case bincVdString, bincVdByteArray:
-		if length := d.decLen(); length > 0 {
-			s = string(d.r.readn(length))
-		}
-	case bincVdSymbol:
-		//from vs: extract numSymbolBytes, containsStringVal, strLenPrecision,
-		//extract symbol
-		//if containsStringVal, read it and put in map
-		//else look in map for string value
-		var symbol uint32
-		vs := d.vs
-		//fmt.Printf(">>>> d.vs: 0b%b, & 0x8: %v, & 0x4: %v\n", d.vs, vs & 0x8, vs & 0x4)
-		if vs&0x8 == 0 {
-			symbol = uint32(d.r.readn1())
-		} else {
-			symbol = uint32(d.r.readUint16())
-		}
-		if d.m == nil {
-			d.m = make(map[uint32]string, 16)
-		}
-
-		if vs&0x4 == 0 {
-			s = d.m[symbol]
-		} else {
-			var slen int
-			switch vs & 0x3 {
-			case 0:
-				slen = int(d.r.readn1())
-			case 1:
-				slen = int(d.r.readUint16())
-			case 2:
-				slen = int(d.r.readUint32())
-			case 3:
-				slen = int(d.r.readUint64())
-			}
-			s = string(d.r.readn(slen))
-			d.m[symbol] = s
-		}
-	default:
-		decErr("Invalid d.vd for string. Expecting string:0x%x, bytearray:0x%x or symbol: 0x%x. Got: 0x%x",
-			bincVdString, bincVdByteArray, bincVdSymbol, d.vd)
-	}
-	d.bdRead = false
-	return
-}
-
-func (d *bincDecDriver) decodeBytes(bs []byte) (bsOut []byte, changed bool) {
-	var clen int
-	switch d.vd {
-	case bincVdString, bincVdByteArray:
-		clen = d.decLen()
-	default:
-		decErr("Invalid d.vd for bytes. Expecting string:0x%x or bytearray:0x%x. Got: 0x%x",
-			bincVdString, bincVdByteArray, d.vd)
-	}
-	if clen > 0 {
-		// if no contents in stream, don't update the passed byteslice
-		if len(bs) != clen {
-			if len(bs) > clen {
-				bs = bs[:clen]
-			} else {
-				bs = make([]byte, clen)
-			}
-			bsOut = bs
-			changed = true
-		}
-		d.r.readb(bs)
-	}
-	d.bdRead = false
-	return
-}
-
-func (d *bincDecDriver) decodeExt(verifyTag bool, tag byte) (xtag byte, xbs []byte) {
-	switch d.vd {
-	case bincVdCustomExt:
-		l := d.decLen()
-		xtag = d.r.readn1()
-		if verifyTag && xtag != tag {
-			decErr("Wrong extension tag. Got %b. Expecting: %v", xtag, tag)
-		}
-		xbs = d.r.readn(l)
-	case bincVdByteArray:
-		xbs, _ = d.decodeBytes(nil)
-	default:
-		decErr("Invalid d.vd for extensions (Expecting extensions or byte array). Got: 0x%x", d.vd)
-	}
-	d.bdRead = false
-	return
-}
-
-func (d *bincDecDriver) decodeNaked() (v interface{}, vt valueType, decodeFurther bool) {
-	d.initReadNext()
-
-	switch d.vd {
-	case bincVdSpecial:
-		switch d.vs {
-		case bincSpNil:
-			vt = valueTypeNil
-		case bincSpFalse:
-			vt = valueTypeBool
-			v = false
-		case bincSpTrue:
-			vt = valueTypeBool
-			v = true
-		case bincSpNan:
-			vt = valueTypeFloat
-			v = math.NaN()
-		case bincSpPosInf:
-			vt = valueTypeFloat
-			v = math.Inf(1)
-		case bincSpNegInf:
-			vt = valueTypeFloat
-			v = math.Inf(-1)
-		case bincSpZeroFloat:
-			vt = valueTypeFloat
-			v = float64(0)
-		case bincSpZero:
-			vt = valueTypeUint
-			v = int64(0) // int8(0)
-		case bincSpNegOne:
-			vt = valueTypeInt
-			v = int64(-1) // int8(-1)
-		default:
-			decErr("decodeNaked: Unrecognized special value 0x%x", d.vs)
-		}
-	case bincVdSmallInt:
-		vt = valueTypeUint
-		v = uint64(int8(d.vs)) + 1 // int8(d.vs) + 1
-	case bincVdPosInt:
-		vt = valueTypeUint
-		v = d.decUint()
-	case bincVdNegInt:
-		vt = valueTypeInt
-		v = -(int64(d.decUint()))
-	case bincVdFloat:
-		vt = valueTypeFloat
-		v = d.decFloat()
-	case bincVdSymbol:
-		vt = valueTypeSymbol
-		v = d.decodeString()
-	case bincVdString:
-		vt = valueTypeString
-		v = d.decodeString()
-	case bincVdByteArray:
-		vt = valueTypeBytes
-		v, _ = d.decodeBytes(nil)
-	case bincVdTimestamp:
-		vt = valueTypeTimestamp
-		tt, err := decodeTime(d.r.readn(int(d.vs)))
-		if err != nil {
-			panic(err)
-		}
-		v = tt
-	case bincVdCustomExt:
-		vt = valueTypeExt
-		l := d.decLen()
-		var re RawExt
-		re.Tag = d.r.readn1()
-		re.Data = d.r.readn(l)
-		v = &re
-		vt = valueTypeExt
-	case bincVdArray:
-		vt = valueTypeArray
-		decodeFurther = true
-	case bincVdMap:
-		vt = valueTypeMap
-		decodeFurther = true
-	default:
-		decErr("decodeNaked: Unrecognized d.vd: 0x%x", d.vd)
-	}
-
-	if !decodeFurther {
-		d.bdRead = false
-	}
-	return
-}
-
-//------------------------------------
-
-//BincHandle is a Handle for the Binc Schema-Free Encoding Format
-//defined at https://github.com/ugorji/binc .
-//
-//BincHandle currently supports all Binc features with the following EXCEPTIONS:
-//  - only integers up to 64 bits of precision are supported.
-//    big integers are unsupported.
-//  - Only IEEE 754 binary32 and binary64 floats are supported (ie Go float32 and float64 types).
-//    extended precision and decimal IEEE 754 floats are unsupported.
-//  - Only UTF-8 strings supported.
-//    Unicode_Other Binc types (UTF16, UTF32) are currently unsupported.
-//Note that these EXCEPTIONS are temporary and full support is possible and may happen soon.
-type BincHandle struct {
-	BasicHandle
-}
-
-func (h *BincHandle) newEncDriver(w encWriter) encDriver {
-	return &bincEncDriver{w: w}
-}
-
-func (h *BincHandle) newDecDriver(r decReader) decDriver {
-	return &bincDecDriver{r: r}
-}
-
-func (_ *BincHandle) writeExt() bool {
-	return true
-}
-
-func (h *BincHandle) getBasicHandle() *BasicHandle {
-	return &h.BasicHandle
-}
diff --git a/Godeps/_workspace/src/github.com/hashicorp/go-msgpack/codec/codecs_test.go b/Godeps/_workspace/src/github.com/hashicorp/go-msgpack/codec/codecs_test.go
deleted file mode 100644
index cb184491f..000000000
--- a/Godeps/_workspace/src/github.com/hashicorp/go-msgpack/codec/codecs_test.go
+++ /dev/null
@@ -1,1002 +0,0 @@
-// Copyright (c) 2012, 2013 Ugorji Nwoke. All rights reserved.
-// Use of this source code is governed by a BSD-style license found in the LICENSE file.
-
-package codec
-
-// Test works by using a slice of interfaces.
-// It can test for encoding/decoding into/from a nil interface{}
-// or passing the object to encode/decode into.
-//
-// There are basically 2 main tests here.
-// First test internally encodes and decodes things and verifies that
-// the artifact was as expected.
-// Second test will use python msgpack to create a bunch of golden files,
-// read those files, and compare them to what it should be. It then
-// writes those files back out and compares the byte streams.
-//
-// Taken together, the tests are pretty extensive.
-
-import (
-	"bytes"
-	"encoding/gob"
-	"flag"
-	"fmt"
-	"io/ioutil"
-	"math"
-	"net"
-	"net/rpc"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"reflect"
-	"runtime"
-	"strconv"
-	"sync/atomic"
-	"testing"
-	"time"
-)
-
-type testVerifyArg int
-
-const (
-	testVerifyMapTypeSame testVerifyArg = iota
-	testVerifyMapTypeStrIntf
-	testVerifyMapTypeIntfIntf
-	// testVerifySliceIntf
-	testVerifyForPython
-)
-
-var (
-	testInitDebug      bool
-	testUseIoEncDec    bool
-	testStructToArray  bool
-	testWriteNoSymbols bool
-
-	_                         = fmt.Printf
-	skipVerifyVal interface{} = &(struct{}{})
-
-	// For Go Time, do not use a descriptive timezone.
-	// It's unnecessary, and makes it harder to do a reflect.DeepEqual.
-	// The Offset already tells what the offset should be, if not on UTC and unknown zone name.
-	timeLoc        = time.FixedZone("", -8*60*60) // UTC-08:00 //time.UTC-8
-	timeToCompare1 = time.Date(2012, 2, 2, 2, 2, 2, 2000, timeLoc)
-	timeToCompare2 = time.Date(1900, 2, 2, 2, 2, 2, 2000, timeLoc)
-	timeToCompare3 = time.Unix(0, 0).UTC()
-	timeToCompare4 = time.Time{}.UTC()
-
-	table              []interface{} // main items we encode
-	tableVerify        []interface{} // we verify encoded things against this after decode
-	tableTestNilVerify []interface{} // for nil interface, use this to verify (rules are different)
-	tablePythonVerify  []interface{} // for verifying for python, since Python sometimes
-	// will encode a float32 as float64, or large int as uint
-	testRpcInt   = new(TestRpcInt)
-	testMsgpackH = &MsgpackHandle{}
-	testBincH    = &BincHandle{}
-	testSimpleH  = &SimpleHandle{}
-)
-
-func testInitFlags() {
-	// delete(testDecOpts.ExtFuncs, timeTyp)
-	flag.BoolVar(&testInitDebug, "tg", false, "Test Debug")
-	flag.BoolVar(&testUseIoEncDec, "ti", false, "Use IO Reader/Writer for Marshal/Unmarshal")
-	flag.BoolVar(&testStructToArray, "ts", false, "Set StructToArray option")
-	flag.BoolVar(&testWriteNoSymbols, "tn", false, "Set NoSymbols option")
-}
-
-type AnonInTestStruc struct {
-	AS        string
-	AI64      int64
-	AI16      int16
-	AUi64     uint64
-	ASslice   []string
-	AI64slice []int64
-}
-
-type TestStruc struct {
-	S    string
-	I64  int64
-	I16  int16
-	Ui64 uint64
-	Ui8  uint8
-	B    bool
-	By   byte
-
-	Sslice    []string
-	I64slice  []int64
-	I16slice  []int16
-	Ui64slice []uint64
-	Ui8slice  []uint8
-	Bslice    []bool
-	Byslice   []byte
-
-	Islice    []interface{}
-	Iptrslice []*int64
-
-	AnonInTestStruc
-
-	//M map[interface{}]interface{}  `json:"-",bson:"-"`
-	Ms    map[string]interface{}
-	Msi64 map[string]int64
-
-	Nintf      interface{} //don't set this, so we can test for nil
-	T          time.Time
-	Nmap       map[string]bool //don't set this, so we can test for nil
-	Nslice     []byte          //don't set this, so we can test for nil
-	Nint64     *int64          //don't set this, so we can test for nil
-	Mtsptr     map[string]*TestStruc
-	Mts        map[string]TestStruc
-	Its        []*TestStruc
-	Nteststruc *TestStruc
-}
-
-type TestABC struct {
-	A, B, C string
-}
-
-type TestRpcInt struct {
-	i int
-}
-
-func (r *TestRpcInt) Update(n int, res *int) error      { r.i = n; *res = r.i; return nil }
-func (r *TestRpcInt) Square(ignore int, res *int) error { *res = r.i * r.i; return nil }
-func (r *TestRpcInt) Mult(n int, res *int) error        { *res = r.i * n; return nil }
-func (r *TestRpcInt) EchoStruct(arg TestABC, res *string) error {
-	*res = fmt.Sprintf("%#v", arg)
-	return nil
-}
-func (r *TestRpcInt) Echo123(args []string, res *string) error {
-	*res = fmt.Sprintf("%#v", args)
-	return nil
-}
-
-func testVerifyVal(v interface{}, arg testVerifyArg) (v2 interface{}) {
-	//for python msgpack,
-	//  - all positive integers are unsigned 64-bit ints
-	//  - all floats are float64
-	switch iv := v.(type) {
-	case int8:
-		if iv > 0 {
-			v2 = uint64(iv)
-		} else {
-			v2 = int64(iv)
-		}
-	case int16:
-		if iv > 0 {
-			v2 = uint64(iv)
-		} else {
-			v2 = int64(iv)
-		}
-	case int32:
-		if iv > 0 {
-			v2 = uint64(iv)
-		} else {
-			v2 = int64(iv)
-		}
-	case int64:
-		if iv > 0 {
-			v2 = uint64(iv)
-		} else {
-			v2 = int64(iv)
-		}
-	case uint8:
-		v2 = uint64(iv)
-	case uint16:
-		v2 = uint64(iv)
-	case uint32:
-		v2 = uint64(iv)
-	case uint64:
-		v2 = uint64(iv)
-	case float32:
-		v2 = float64(iv)
-	case float64:
-		v2 = float64(iv)
-	case []interface{}:
-		m2 := make([]interface{}, len(iv))
-		for j, vj := range iv {
-			m2[j] = testVerifyVal(vj, arg)
-		}
-		v2 = m2
-	case map[string]bool:
-		switch arg {
-		case testVerifyMapTypeSame:
-			m2 := make(map[string]bool)
-			for kj, kv := range iv {
-				m2[kj] = kv
-			}
-			v2 = m2
-		case testVerifyMapTypeStrIntf, testVerifyForPython:
-			m2 := make(map[string]interface{})
-			for kj, kv := range iv {
-				m2[kj] = kv
-			}
-			v2 = m2
-		case testVerifyMapTypeIntfIntf:
-			m2 := make(map[interface{}]interface{})
-			for kj, kv := range iv {
-				m2[kj] = kv
-			}
-			v2 = m2
-		}
-	case map[string]interface{}:
-		switch arg {
-		case testVerifyMapTypeSame:
-			m2 := make(map[string]interface{})
-			for kj, kv := range iv {
-				m2[kj] = testVerifyVal(kv, arg)
-			}
-			v2 = m2
-		case testVerifyMapTypeStrIntf, testVerifyForPython:
-			m2 := make(map[string]interface{})
-			for kj, kv := range iv {
-				m2[kj] = testVerifyVal(kv, arg)
-			}
-			v2 = m2
-		case testVerifyMapTypeIntfIntf:
-			m2 := make(map[interface{}]interface{})
-			for kj, kv := range iv {
-				m2[kj] = testVerifyVal(kv, arg)
-			}
-			v2 = m2
-		}
-	case map[interface{}]interface{}:
-		m2 := make(map[interface{}]interface{})
-		for kj, kv := range iv {
-			m2[testVerifyVal(kj, arg)] = testVerifyVal(kv, arg)
-		}
-		v2 = m2
-	case time.Time:
-		switch arg {
-		case testVerifyForPython:
-			if iv2 := iv.UnixNano(); iv2 > 0 {
-				v2 = uint64(iv2)
-			} else {
-				v2 = int64(iv2)
-			}
-		default:
-			v2 = v
-		}
-	default:
-		v2 = v
-	}
-	return
-}
-
-func testInit() {
-	gob.Register(new(TestStruc))
-	if testInitDebug {
-		ts0 := newTestStruc(2, false)
-		fmt.Printf("====> depth: %v, ts: %#v\n", 2, ts0)
-	}
-
-	testBincH.StructToArray = testStructToArray
-	if testWriteNoSymbols {
-		testBincH.AsSymbols = AsSymbolNone
-	} else {
-		testBincH.AsSymbols = AsSymbolAll
-	}
-	testMsgpackH.StructToArray = testStructToArray
-	testMsgpackH.RawToString = true
-	// testMsgpackH.AddExt(byteSliceTyp, 0, testMsgpackH.BinaryEncodeExt, testMsgpackH.BinaryDecodeExt)
-	// testMsgpackH.AddExt(timeTyp, 1, testMsgpackH.TimeEncodeExt, testMsgpackH.TimeDecodeExt)
-	timeEncExt := func(rv reflect.Value) ([]byte, error) {
-		return encodeTime(rv.Interface().(time.Time)), nil
-	}
-	timeDecExt := func(rv reflect.Value, bs []byte) error {
-		tt, err := decodeTime(bs)
-		if err == nil {
-			rv.Set(reflect.ValueOf(tt))
-		}
-		return err
-	}
-
-	// add extensions for msgpack, simple for time.Time, so we can encode/decode same way.
-	testMsgpackH.AddExt(timeTyp, 1, timeEncExt, timeDecExt)
-	testSimpleH.AddExt(timeTyp, 1, timeEncExt, timeDecExt)
-
-	primitives := []interface{}{
-		int8(-8),
-		int16(-1616),
-		int32(-32323232),
-		int64(-6464646464646464),
-		uint8(192),
-		uint16(1616),
-		uint32(32323232),
-		uint64(6464646464646464),
-		byte(192),
-		float32(-3232.0),
-		float64(-6464646464.0),
-		float32(3232.0),
-		float64(6464646464.0),
-		false,
-		true,
-		nil,
-		"someday",
-		"",
-		"bytestring",
-		timeToCompare1,
-		timeToCompare2,
-		timeToCompare3,
-		timeToCompare4,
-	}
-	mapsAndStrucs := []interface{}{
-		map[string]bool{
-			"true":  true,
-			"false": false,
-		},
-		map[string]interface{}{
-			"true":         "True",
-			"false":        false,
-			"uint16(1616)": uint16(1616),
-		},
-		//add a complex combo map in here. (map has list which has map)
-		//note that after the first thing, everything else should be generic.
-		map[string]interface{}{
-			"list": []interface{}{
-				int16(1616),
-				int32(32323232),
-				true,
-				float32(-3232.0),
-				map[string]interface{}{
-					"TRUE":  true,
-					"FALSE": false,
-				},
-				[]interface{}{true, false},
-			},
-			"int32":        int32(32323232),
-			"bool":         true,
-			"LONG STRING":  "123456789012345678901234567890123456789012345678901234567890",
-			"SHORT STRING": "1234567890",
-		},
-		map[interface{}]interface{}{
-			true:       "true",
-			uint8(138): false,
-			"false":    uint8(200),
-		},
-		newTestStruc(0, false),
-	}
-
-	table = []interface{}{}
-	table = append(table, primitives...)    //0-19 are primitives
-	table = append(table, primitives)       //20 is a list of primitives
-	table = append(table, mapsAndStrucs...) //21-24 are maps. 25 is a *struct
-
-	tableVerify = make([]interface{}, len(table))
-	tableTestNilVerify = make([]interface{}, len(table))
-	tablePythonVerify = make([]interface{}, len(table))
-
-	lp := len(primitives)
-	av := tableVerify
-	for i, v := range table {
-		if i == lp+3 {
-			av[i] = skipVerifyVal
-			continue
-		}
-		//av[i] = testVerifyVal(v, testVerifyMapTypeSame)
-		switch v.(type) {
-		case []interface{}:
-			av[i] = testVerifyVal(v, testVerifyMapTypeSame)
-		case map[string]interface{}:
-			av[i] = testVerifyVal(v, testVerifyMapTypeSame)
-		case map[interface{}]interface{}:
-			av[i] = testVerifyVal(v, testVerifyMapTypeSame)
-		default:
-			av[i] = v
-		}
-	}
-
-	av = tableTestNilVerify
-	for i, v := range table {
-		if i > lp+3 {
-			av[i] = skipVerifyVal
-			continue
-		}
-		av[i] = testVerifyVal(v, testVerifyMapTypeStrIntf)
-	}
-
-	av = tablePythonVerify
-	for i, v := range table {
-		if i > lp+3 {
-			av[i] = skipVerifyVal
-			continue
-		}
-		av[i] = testVerifyVal(v, testVerifyForPython)
-	}
-
-	tablePythonVerify = tablePythonVerify[:24]
-}
-
-func testUnmarshal(v interface{}, data []byte, h Handle) error {
-	if testUseIoEncDec {
-		return NewDecoder(bytes.NewBuffer(data), h).Decode(v)
-	}
-	return NewDecoderBytes(data, h).Decode(v)
-}
-
-func testMarshal(v interface{}, h Handle) (bs []byte, err error) {
-	if testUseIoEncDec {
-		var buf bytes.Buffer
-		err = NewEncoder(&buf, h).Encode(v)
-		bs = buf.Bytes()
-		return
-	}
-	err = NewEncoderBytes(&bs, h).Encode(v)
-	return
-}
-
-func testMarshalErr(v interface{}, h Handle, t *testing.T, name string) (bs []byte, err error) {
-	if bs, err = testMarshal(v, h); err != nil {
-		logT(t, "Error encoding %s: %v, Err: %v", name, v, err)
-		t.FailNow()
-	}
-	return
-}
-
-func testUnmarshalErr(v interface{}, data []byte, h Handle, t *testing.T, name string) (err error) {
-	if err = testUnmarshal(v, data, h); err != nil {
-		logT(t, "Error Decoding into %s: %v, Err: %v", name, v, err)
-		t.FailNow()
-	}
-	return
-}
-
-func newTestStruc(depth int, bench bool) (ts *TestStruc) {
-	var i64a, i64b, i64c, i64d int64 = 64, 6464, 646464, 64646464
-
-	ts = &TestStruc{
-		S:    "some string",
-		I64:  math.MaxInt64 * 2 / 3, // 64,
-		I16:  16,
-		Ui64: uint64(int64(math.MaxInt64 * 2 / 3)), // 64, //don't use MaxUint64, as bson can't write it
-		Ui8:  160,
-		B:    true,
-		By:   5,
-
-		Sslice:    []string{"one", "two", "three"},
-		I64slice:  []int64{1, 2, 3},
-		I16slice:  []int16{4, 5, 6},
-		Ui64slice: []uint64{137, 138, 139},
-		Ui8slice:  []uint8{210, 211, 212},
-		Bslice:    []bool{true, false, true, false},
-		Byslice:   []byte{13, 14, 15},
-
-		Islice: []interface{}{"true", true, "no", false, uint64(288), float64(0.4)},
-
-		Ms: map[string]interface{}{
-			"true":     "true",
-			"int64(9)": false,
-		},
-		Msi64: map[string]int64{
-			"one": 1,
-			"two": 2,
-		},
-		T: timeToCompare1,
-		AnonInTestStruc: AnonInTestStruc{
-			AS:        "A-String",
-			AI64:      64,
-			AI16:      16,
-			AUi64:     64,
-			ASslice:   []string{"Aone", "Atwo", "Athree"},
-			AI64slice: []int64{1, 2, 3},
-		},
-	}
-	//For benchmarks, some things will not work.
-	if !bench {
-		//json and bson require string keys in maps
-		//ts.M = map[interface{}]interface{}{
-		//	true: "true",
-		//	int8(9): false,
-		//}
-		//gob cannot encode nil in element in array (encodeArray: nil element)
-		ts.Iptrslice = []*int64{nil, &i64a, nil, &i64b, nil, &i64c, nil, &i64d, nil}
-		// ts.Iptrslice = nil
-	}
-	if depth > 0 {
-		depth--
-		if ts.Mtsptr == nil {
-			ts.Mtsptr = make(map[string]*TestStruc)
-		}
-		if ts.Mts == nil {
-			ts.Mts = make(map[string]TestStruc)
-		}
-		ts.Mtsptr["0"] = newTestStruc(depth, bench)
-		ts.Mts["0"] = *(ts.Mtsptr["0"])
-		ts.Its = append(ts.Its, ts.Mtsptr["0"])
-	}
-	return
-}
-
-// doTestCodecTableOne allows us test for different variations based on arguments passed.
-func doTestCodecTableOne(t *testing.T, testNil bool, h Handle,
-	vs []interface{}, vsVerify []interface{}) {
-	//if testNil, then just test for when a pointer to a nil interface{} is passed. It should work.
-	//Current setup allows us test (at least manually) the nil interface or typed interface.
-	logT(t, "================ TestNil: %v ================\n", testNil)
-	for i, v0 := range vs {
-		logT(t, "..............................................")
-		logT(t, "         Testing: #%d:, %T, %#v\n", i, v0, v0)
-		b0, err := testMarshalErr(v0, h, t, "v0")
-		if err != nil {
-			continue
-		}
-		logT(t, "         Encoded bytes: len: %v, %v\n", len(b0), b0)
-
-		var v1 interface{}
-
-		if testNil {
-			err = testUnmarshal(&v1, b0, h)
-		} else {
-			if v0 != nil {
-				v0rt := reflect.TypeOf(v0) // ptr
-				rv1 := reflect.New(v0rt)
-				err = testUnmarshal(rv1.Interface(), b0, h)
-				v1 = rv1.Elem().Interface()
-				// v1 = reflect.Indirect(reflect.ValueOf(v1)).Interface()
-			}
-		}
-
-		logT(t, "         v1 returned: %T, %#v", v1, v1)
-		// if v1 != nil {
-		//	logT(t, "         v1 returned: %T, %#v", v1, v1)
-		//	//we always indirect, because ptr to typed value may be passed (if not testNil)
-		//	v1 = reflect.Indirect(reflect.ValueOf(v1)).Interface()
-		// }
-		if err != nil {
-			logT(t, "-------- Error: %v. Partial return: %v", err, v1)
-			failT(t)
-			continue
-		}
-		v0check := vsVerify[i]
-		if v0check == skipVerifyVal {
-			logT(t, "        Nil Check skipped: Decoded: %T, %#v\n", v1, v1)
-			continue
-		}
-
-		if err = deepEqual(v0check, v1); err == nil {
-			logT(t, "++++++++ Before and After marshal matched\n")
-		} else {
-			logT(t, "-------- Before and After marshal do not match: Error: %v"+
-				" ====> GOLDEN: (%T) %#v, DECODED: (%T) %#v\n", err, v0check, v0check, v1, v1)
-			failT(t)
-		}
-	}
-}
-
-func testCodecTableOne(t *testing.T, h Handle) {
-	// func TestMsgpackAllExperimental(t *testing.T) {
-	// dopts := testDecOpts(nil, nil, false, true, true),
-
-	switch v := h.(type) {
-	case *MsgpackHandle:
-		var oldWriteExt, oldRawToString bool
-		oldWriteExt, v.WriteExt = v.WriteExt, true
-		oldRawToString, v.RawToString = v.RawToString, true
-		doTestCodecTableOne(t, false, h, table, tableVerify)
-		v.WriteExt, v.RawToString = oldWriteExt, oldRawToString
-	default:
-		doTestCodecTableOne(t, false, h, table, tableVerify)
-	}
-	// func TestMsgpackAll(t *testing.T) {
-	idxTime, numPrim, numMap := 19, 23, 4
-
-	//skip []interface{} containing time.Time
-	doTestCodecTableOne(t, false, h, table[:numPrim], tableVerify[:numPrim])
-	doTestCodecTableOne(t, false, h, table[numPrim+1:], tableVerify[numPrim+1:])
-	// func TestMsgpackNilStringMap(t *testing.T) {
-	var oldMapType reflect.Type
-	v := h.getBasicHandle()
-	oldMapType, v.MapType = v.MapType, mapStrIntfTyp
-
-	//skip time.Time, []interface{} containing time.Time, last map, and newStruc
-	doTestCodecTableOne(t, true, h, table[:idxTime], tableTestNilVerify[:idxTime])
-	doTestCodecTableOne(t, true, h, table[numPrim+1:numPrim+numMap], tableTestNilVerify[numPrim+1:numPrim+numMap])
-
-	v.MapType = oldMapType
-
-	// func TestMsgpackNilIntf(t *testing.T) {
-
-	//do newTestStruc and last element of map
-	doTestCodecTableOne(t, true, h, table[numPrim+numMap:], tableTestNilVerify[numPrim+numMap:])
-	//TODO? What is this one?
-	//doTestCodecTableOne(t, true, h, table[17:18], tableTestNilVerify[17:18])
-}
-
-func testCodecMiscOne(t *testing.T, h Handle) {
-	b, err := testMarshalErr(32, h, t, "32")
-	// Cannot do this nil one, because faster type assertion decoding will panic
-	// var i *int32
-	// if err = testUnmarshal(b, i, nil); err == nil {
-	// 	logT(t, "------- Expecting error because we cannot unmarshal to int32 nil ptr")
-	// 	t.FailNow()
-	// }
-	var i2 int32 = 0
-	err = testUnmarshalErr(&i2, b, h, t, "int32-ptr")
-	if i2 != int32(32) {
-		logT(t, "------- didn't unmarshal to 32: Received: %d", i2)
-		t.FailNow()
-	}
-
-	// func TestMsgpackDecodePtr(t *testing.T) {
-	ts := newTestStruc(0, false)
-	b, err = testMarshalErr(ts, h, t, "pointer-to-struct")
-	if len(b) < 40 {
-		logT(t, "------- Size must be > 40. Size: %d", len(b))
-		t.FailNow()
-	}
-	logT(t, "------- b: %v", b)
-	ts2 := new(TestStruc)
-	err = testUnmarshalErr(ts2, b, h, t, "pointer-to-struct")
-	if ts2.I64 != math.MaxInt64*2/3 {
-		logT(t, "------- Unmarshal wrong. Expect I64 = 64. Got: %v", ts2.I64)
-		t.FailNow()
-	}
-
-	// func TestMsgpackIntfDecode(t *testing.T) {
-	m := map[string]int{"A": 2, "B": 3}
-	p := []interface{}{m}
-	bs, err := testMarshalErr(p, h, t, "p")
-
-	m2 := map[string]int{}
-	p2 := []interface{}{m2}
-	err = testUnmarshalErr(&p2, bs, h, t, "&p2")
-
-	if m2["A"] != 2 || m2["B"] != 3 {
-		logT(t, "m2 not as expected: expecting: %v, got: %v", m, m2)
-		t.FailNow()
-	}
-	// log("m: %v, m2: %v, p: %v, p2: %v", m, m2, p, p2)
-	checkEqualT(t, p, p2, "p=p2")
-	checkEqualT(t, m, m2, "m=m2")
-	if err = deepEqual(p, p2); err == nil {
-		logT(t, "p and p2 match")
-	} else {
-		logT(t, "Not Equal: %v. p: %v, p2: %v", err, p, p2)
-		t.FailNow()
-	}
-	if err = deepEqual(m, m2); err == nil {
-		logT(t, "m and m2 match")
-	} else {
-		logT(t, "Not Equal: %v. m: %v, m2: %v", err, m, m2)
-		t.FailNow()
-	}
-
-	// func TestMsgpackDecodeStructSubset(t *testing.T) {
-	// test that we can decode a subset of the stream
-	mm := map[string]interface{}{"A": 5, "B": 99, "C": 333}
-	bs, err = testMarshalErr(mm, h, t, "mm")
-	type ttt struct {
-		A uint8
-		C int32
-	}
-	var t2 ttt
-	testUnmarshalErr(&t2, bs, h, t, "t2")
-	t3 := ttt{5, 333}
-	checkEqualT(t, t2, t3, "t2=t3")
-
-	// println(">>>>>")
-	// test simple arrays, non-addressable arrays, slices
-	type tarr struct {
-		A int64
-		B [3]int64
-		C []byte
-		D [3]byte
-	}
-	var tarr0 = tarr{1, [3]int64{2, 3, 4}, []byte{4, 5, 6}, [3]byte{7, 8, 9}}
-	// test both pointer and non-pointer (value)
-	for _, tarr1 := range []interface{}{tarr0, &tarr0} {
-		bs, err = testMarshalErr(tarr1, h, t, "tarr1")
-		var tarr2 tarr
-		testUnmarshalErr(&tarr2, bs, h, t, "tarr2")
-		checkEqualT(t, tarr0, tarr2, "tarr0=tarr2")
-		// fmt.Printf(">>>> err: %v. tarr1: %v, tarr2: %v\n", err, tarr0, tarr2)
-	}
-
-	// test byte array, even if empty (msgpack only)
-	if h == testMsgpackH {
-		type ystruct struct {
-			Anarray []byte
-		}
-		var ya = ystruct{}
-		testUnmarshalErr(&ya, []byte{0x91, 0x90}, h, t, "ya")
-	}
-}
-
-func testCodecEmbeddedPointer(t *testing.T, h Handle) {
-	type Z int
-	type A struct {
-		AnInt int
-	}
-	type B struct {
-		*Z
-		*A
-		MoreInt int
-	}
-	var z Z = 4
-	x1 := &B{&z, &A{5}, 6}
-	bs, err := testMarshalErr(x1, h, t, "x1")
-	// fmt.Printf("buf: len(%v): %x\n", buf.Len(), buf.Bytes())
-	var x2 = new(B)
-	err = testUnmarshalErr(x2, bs, h, t, "x2")
-	err = checkEqualT(t, x1, x2, "x1=x2")
-	_ = err
-}
-
-func doTestRpcOne(t *testing.T, rr Rpc, h Handle, doRequest bool, exitSleepMs time.Duration,
-) (port int) {
-	// rpc needs EOF, which is sent via a panic, and so must be recovered.
-	if !recoverPanicToErr {
-		logT(t, "EXPECTED. set recoverPanicToErr=true, since rpc needs EOF")
-		t.FailNow()
-	}
-	srv := rpc.NewServer()
-	srv.Register(testRpcInt)
-	ln, err := net.Listen("tcp", "127.0.0.1:0")
-	// log("listener: %v", ln.Addr())
-	checkErrT(t, err)
-	port = (ln.Addr().(*net.TCPAddr)).Port
-	// var opts *DecoderOptions
-	// opts := testDecOpts
-	// opts.MapType = mapStrIntfTyp
-	// opts.RawToString = false
-	serverExitChan := make(chan bool, 1)
-	var serverExitFlag uint64 = 0
-	serverFn := func() {
-		for {
-			conn1, err1 := ln.Accept()
-			// if err1 != nil {
-			// 	//fmt.Printf("accept err1: %v\n", err1)
-			// 	continue
-			// }
-			if atomic.LoadUint64(&serverExitFlag) == 1 {
-				serverExitChan <- true
-				conn1.Close()
-				return // exit serverFn goroutine
-			}
-			if err1 == nil {
-				var sc rpc.ServerCodec = rr.ServerCodec(conn1, h)
-				srv.ServeCodec(sc)
-			}
-		}
-	}
-
-	clientFn := func(cc rpc.ClientCodec) {
-		cl := rpc.NewClientWithCodec(cc)
-		defer cl.Close()
-		var up, sq, mult int
-		var rstr string
-		// log("Calling client")
-		checkErrT(t, cl.Call("TestRpcInt.Update", 5, &up))
-		// log("Called TestRpcInt.Update")
-		checkEqualT(t, testRpcInt.i, 5, "testRpcInt.i=5")
-		checkEqualT(t, up, 5, "up=5")
-		checkErrT(t, cl.Call("TestRpcInt.Square", 1, &sq))
-		checkEqualT(t, sq, 25, "sq=25")
-		checkErrT(t, cl.Call("TestRpcInt.Mult", 20, &mult))
-		checkEqualT(t, mult, 100, "mult=100")
-		checkErrT(t, cl.Call("TestRpcInt.EchoStruct", TestABC{"Aa", "Bb", "Cc"}, &rstr))
-		checkEqualT(t, rstr, fmt.Sprintf("%#v", TestABC{"Aa", "Bb", "Cc"}), "rstr=")
-		checkErrT(t, cl.Call("TestRpcInt.Echo123", []string{"A1", "B2", "C3"}, &rstr))
-		checkEqualT(t, rstr, fmt.Sprintf("%#v", []string{"A1", "B2", "C3"}), "rstr=")
-	}
-
-	connFn := func() (bs net.Conn) {
-		// log("calling f1")
-		bs, err2 := net.Dial(ln.Addr().Network(), ln.Addr().String())
-		//fmt.Printf("f1. bs: %v, err2: %v\n", bs, err2)
-		checkErrT(t, err2)
-		return
-	}
-
-	exitFn := func() {
-		atomic.StoreUint64(&serverExitFlag, 1)
-		bs := connFn()
-		<-serverExitChan
-		bs.Close()
-		// serverExitChan <- true
-	}
-
-	go serverFn()
-	runtime.Gosched()
-	//time.Sleep(100 * time.Millisecond)
-	if exitSleepMs == 0 {
-		defer ln.Close()
-		defer exitFn()
-	}
-	if doRequest {
-		bs := connFn()
-		cc := rr.ClientCodec(bs, h)
-		clientFn(cc)
-	}
-	if exitSleepMs != 0 {
-		go func() {
-			defer ln.Close()
-			time.Sleep(exitSleepMs)
-			exitFn()
-		}()
-	}
-	return
-}
-
-// Comprehensive testing that generates data encoded from python msgpack,
-// and validates that our code can read and write it out accordingly.
-// We keep this unexported here, and put actual test in ext_dep_test.go.
-// This way, it can be excluded by excluding file completely.
-func doTestMsgpackPythonGenStreams(t *testing.T) {
-	logT(t, "TestPythonGenStreams")
-	tmpdir, err := ioutil.TempDir("", "golang-msgpack-test")
-	if err != nil {
-		logT(t, "-------- Unable to create temp directory\n")
-		t.FailNow()
-	}
-	defer os.RemoveAll(tmpdir)
-	logT(t, "tmpdir: %v", tmpdir)
-	cmd := exec.Command("python", "msgpack_test.py", "testdata", tmpdir)
-	//cmd.Stdin = strings.NewReader("some input")
-	//cmd.Stdout = &out
-	var cmdout []byte
-	if cmdout, err = cmd.CombinedOutput(); err != nil {
-		logT(t, "-------- Error running msgpack_test.py testdata. Err: %v", err)
-		logT(t, "         %v", string(cmdout))
-		t.FailNow()
-	}
-
-	oldMapType := testMsgpackH.MapType
-	for i, v := range tablePythonVerify {
-		testMsgpackH.MapType = oldMapType
-		//load up the golden file based on number
-		//decode it
-		//compare to in-mem object
-		//encode it again
-		//compare to output stream
-		logT(t, "..............................................")
-		logT(t, "         Testing: #%d: %T, %#v\n", i, v, v)
-		var bss []byte
-		bss, err = ioutil.ReadFile(filepath.Join(tmpdir, strconv.Itoa(i)+".golden"))
-		if err != nil {
-			logT(t, "-------- Error reading golden file: %d. Err: %v", i, err)
-			failT(t)
-			continue
-		}
-		testMsgpackH.MapType = mapStrIntfTyp
-
-		var v1 interface{}
-		if err = testUnmarshal(&v1, bss, testMsgpackH); err != nil {
-			logT(t, "-------- Error decoding stream: %d: Err: %v", i, err)
-			failT(t)
-			continue
-		}
-		if v == skipVerifyVal {
-			continue
-		}
-		//no need to indirect, because we pass a nil ptr, so we already have the value
-		//if v1 != nil { v1 = reflect.Indirect(reflect.ValueOf(v1)).Interface() }
-		if err = deepEqual(v, v1); err == nil {
-			logT(t, "++++++++ Objects match")
-		} else {
-			logT(t, "-------- Objects do not match: %v. Source: %T. Decoded: %T", err, v, v1)
-			logT(t, "--------   AGAINST: %#v", v)
-			logT(t, "--------   DECODED: %#v <====> %#v", v1, reflect.Indirect(reflect.ValueOf(v1)).Interface())
-			failT(t)
-		}
-		bsb, err := testMarshal(v1, testMsgpackH)
-		if err != nil {
-			logT(t, "Error encoding to stream: %d: Err: %v", i, err)
-			failT(t)
-			continue
-		}
-		if err = deepEqual(bsb, bss); err == nil {
-			logT(t, "++++++++ Bytes match")
-		} else {
-			logT(t, "???????? Bytes do not match. %v.", err)
-			xs := "--------"
-			if reflect.ValueOf(v).Kind() == reflect.Map {
-				xs = "        "
-				logT(t, "%s It's a map. Ok that they don't match (dependent on ordering).", xs)
-			} else {
-				logT(t, "%s It's not a map. They should match.", xs)
-				failT(t)
-			}
-			logT(t, "%s   FROM_FILE: %4d] %v", xs, len(bss), bss)
-			logT(t, "%s     ENCODED: %4d] %v", xs, len(bsb), bsb)
-		}
-	}
-	testMsgpackH.MapType = oldMapType
-}
-
-// To test MsgpackSpecRpc, we test 3 scenarios:
-//    - Go Client to Go RPC Service (contained within TestMsgpackRpcSpec)
-//    - Go client to Python RPC Service (contained within doTestMsgpackRpcSpecGoClientToPythonSvc)
-//    - Python Client to Go RPC Service (contained within doTestMsgpackRpcSpecPythonClientToGoSvc)
-//
-// This allows us test the different calling conventions
-//    - Go Service requires only one argument
-//    - Python Service allows multiple arguments
-
-func doTestMsgpackRpcSpecGoClientToPythonSvc(t *testing.T) {
-	openPort := "6789"
-	cmd := exec.Command("python", "msgpack_test.py", "rpc-server", openPort, "2")
-	checkErrT(t, cmd.Start())
-	time.Sleep(100 * time.Millisecond) // time for python rpc server to start
-	bs, err2 := net.Dial("tcp", ":"+openPort)
-	checkErrT(t, err2)
-	cc := MsgpackSpecRpc.ClientCodec(bs, testMsgpackH)
-	cl := rpc.NewClientWithCodec(cc)
-	defer cl.Close()
-	var rstr string
-	checkErrT(t, cl.Call("EchoStruct", TestABC{"Aa", "Bb", "Cc"}, &rstr))
-	//checkEqualT(t, rstr, "{'A': 'Aa', 'B': 'Bb', 'C': 'Cc'}")
-	var mArgs MsgpackSpecRpcMultiArgs = []interface{}{"A1", "B2", "C3"}
-	checkErrT(t, cl.Call("Echo123", mArgs, &rstr))
-	checkEqualT(t, rstr, "1:A1 2:B2 3:C3", "rstr=")
-}
-
-func doTestMsgpackRpcSpecPythonClientToGoSvc(t *testing.T) {
-	port := doTestRpcOne(t, MsgpackSpecRpc, testMsgpackH, false, 1*time.Second)
-	//time.Sleep(1000 * time.Millisecond)
-	cmd := exec.Command("python", "msgpack_test.py", "rpc-client-go-service", strconv.Itoa(port))
-	var cmdout []byte
-	var err error
-	if cmdout, err = cmd.CombinedOutput(); err != nil {
-		logT(t, "-------- Error running msgpack_test.py rpc-client-go-service. Err: %v", err)
-		logT(t, "         %v", string(cmdout))
-		t.FailNow()
-	}
-	checkEqualT(t, string(cmdout),
-		fmt.Sprintf("%#v\n%#v\n", []string{"A1", "B2", "C3"}, TestABC{"Aa", "Bb", "Cc"}), "cmdout=")
-}
-
-func TestBincCodecsTable(t *testing.T) {
-	testCodecTableOne(t, testBincH)
-}
-
-func TestBincCodecsMisc(t *testing.T) {
-	testCodecMiscOne(t, testBincH)
-}
-
-func TestBincCodecsEmbeddedPointer(t *testing.T) {
-	testCodecEmbeddedPointer(t, testBincH)
-}
-
-func TestSimpleCodecsTable(t *testing.T) {
-	testCodecTableOne(t, testSimpleH)
-}
-
-func TestSimpleCodecsMisc(t *testing.T) {
-	testCodecMiscOne(t, testSimpleH)
-}
-
-func TestSimpleCodecsEmbeddedPointer(t *testing.T) {
-	testCodecEmbeddedPointer(t, testSimpleH)
-}
-
-func TestMsgpackCodecsTable(t *testing.T) {
-	testCodecTableOne(t, testMsgpackH)
-}
-
-func TestMsgpackCodecsMisc(t *testing.T) {
-	testCodecMiscOne(t, testMsgpackH)
-}
-
-func TestMsgpackCodecsEmbeddedPointer(t *testing.T) {
-	testCodecEmbeddedPointer(t, testMsgpackH)
-}
-
-func TestBincRpcGo(t *testing.T) {
-	doTestRpcOne(t, GoRpc, testBincH, true, 0)
-}
-
-func _TestSimpleRpcGo(t *testing.T) {
-	doTestRpcOne(t, GoRpc, testSimpleH, true, 0)
-}
-
-func TestMsgpackRpcGo(t *testing.T) {
-	doTestRpcOne(t, GoRpc, testMsgpackH, true, 0)
-}
-
-func TestMsgpackRpcSpec(t *testing.T) {
-	doTestRpcOne(t, MsgpackSpecRpc, testMsgpackH, true, 0)
-}
-
-// TODO:
-//   Add Tests for:
-//   - decoding empty list/map in stream into a nil slice/map
-//   - binary(M|Unm)arsher support for time.Time
diff --git a/Godeps/_workspace/src/github.com/hashicorp/go-msgpack/codec/decode.go b/Godeps/_workspace/src/github.com/hashicorp/go-msgpack/codec/decode.go
deleted file mode 100644
index 87bef2b93..000000000
--- a/Godeps/_workspace/src/github.com/hashicorp/go-msgpack/codec/decode.go
+++ /dev/null
@@ -1,1048 +0,0 @@
-// Copyright (c) 2012, 2013 Ugorji Nwoke. All rights reserved.
-// Use of this source code is governed by a BSD-style license found in the LICENSE file.
-
-package codec
-
-import (
-	"io"
-	"reflect"
-	// "runtime/debug"
-)
-
-// Some tagging information for error messages.
-const (
-	msgTagDec             = "codec.decoder"
-	msgBadDesc            = "Unrecognized descriptor byte"
-	msgDecCannotExpandArr = "cannot expand go array from %v to stream length: %v"
-)
-
-// decReader abstracts the reading source, allowing implementations that can
-// read from an io.Reader or directly off a byte slice with zero-copying.
-type decReader interface {
-	readn(n int) []byte
-	readb([]byte)
-	readn1() uint8
-	readUint16() uint16
-	readUint32() uint32
-	readUint64() uint64
-}
-
-type decDriver interface {
-	initReadNext()
-	tryDecodeAsNil() bool
-	currentEncodedType() valueType
-	isBuiltinType(rt uintptr) bool
-	decodeBuiltin(rt uintptr, v interface{})
-	//decodeNaked: Numbers are decoded as int64, uint64, float64 only (no smaller sized number types).
-	decodeNaked() (v interface{}, vt valueType, decodeFurther bool)
-	decodeInt(bitsize uint8) (i int64)
-	decodeUint(bitsize uint8) (ui uint64)
-	decodeFloat(chkOverflow32 bool) (f float64)
-	decodeBool() (b bool)
-	// decodeString can also decode symbols
-	decodeString() (s string)
-	decodeBytes(bs []byte) (bsOut []byte, changed bool)
-	decodeExt(verifyTag bool, tag byte) (xtag byte, xbs []byte)
-	readMapLen() int
-	readArrayLen() int
-}
-
-type DecodeOptions struct {
-	// An instance of MapType is used during schema-less decoding of a map in the stream.
-	// If nil, we use map[interface{}]interface{}
-	MapType reflect.Type
-	// An instance of SliceType is used during schema-less decoding of an array in the stream.
-	// If nil, we use []interface{}
-	SliceType reflect.Type
-	// ErrorIfNoField controls whether an error is returned when decoding a map
-	// from a codec stream into a struct, and no matching struct field is found.
-	ErrorIfNoField bool
-}
-
-// ------------------------------------
-
-// ioDecReader is a decReader that reads off an io.Reader
-type ioDecReader struct {
-	r  io.Reader
-	br io.ByteReader
-	x  [8]byte //temp byte array re-used internally for efficiency
-}
-
-func (z *ioDecReader) readn(n int) (bs []byte) {
-	if n <= 0 {
-		return
-	}
-	bs = make([]byte, n)
-	if _, err := io.ReadAtLeast(z.r, bs, n); err != nil {
-		panic(err)
-	}
-	return
-}
-
-func (z *ioDecReader) readb(bs []byte) {
-	if _, err := io.ReadAtLeast(z.r, bs, len(bs)); err != nil {
-		panic(err)
-	}
-}
-
-func (z *ioDecReader) readn1() uint8 {
-	if z.br != nil {
-		b, err := z.br.ReadByte()
-		if err != nil {
-			panic(err)
-		}
-		return b
-	}
-	z.readb(z.x[:1])
-	return z.x[0]
-}
-
-func (z *ioDecReader) readUint16() uint16 {
-	z.readb(z.x[:2])
-	return bigen.Uint16(z.x[:2])
-}
-
-func (z *ioDecReader) readUint32() uint32 {
-	z.readb(z.x[:4])
-	return bigen.Uint32(z.x[:4])
-}
-
-func (z *ioDecReader) readUint64() uint64 {
-	z.readb(z.x[:8])
-	return bigen.Uint64(z.x[:8])
-}
-
-// ------------------------------------
-
-// bytesDecReader is a decReader that reads off a byte slice with zero copying
-type bytesDecReader struct {
-	b []byte // data
-	c int    // cursor
-	a int    // available
-}
-
-func (z *bytesDecReader) consume(n int) (oldcursor int) {
-	if z.a == 0 {
-		panic(io.EOF)
-	}
-	if n > z.a {
-		decErr("Trying to read %v bytes. Only %v available", n, z.a)
-	}
-	// z.checkAvailable(n)
-	oldcursor = z.c
-	z.c = oldcursor + n
-	z.a = z.a - n
-	return
-}
-
-func (z *bytesDecReader) readn(n int) (bs []byte) {
-	if n <= 0 {
-		return
-	}
-	c0 := z.consume(n)
-	bs = z.b[c0:z.c]
-	return
-}
-
-func (z *bytesDecReader) readb(bs []byte) {
-	copy(bs, z.readn(len(bs)))
-}
-
-func (z *bytesDecReader) readn1() uint8 {
-	c0 := z.consume(1)
-	return z.b[c0]
-}
-
-// Use binaryEncoding helper for 4 and 8 bits, but inline it for 2 bits
-// creating temp slice variable and copying it to helper function is expensive
-// for just 2 bits.
-
-func (z *bytesDecReader) readUint16() uint16 {
-	c0 := z.consume(2)
-	return uint16(z.b[c0+1]) | uint16(z.b[c0])<<8
-}
-
-func (z *bytesDecReader) readUint32() uint32 {
-	c0 := z.consume(4)
-	return bigen.Uint32(z.b[c0:z.c])
-}
-
-func (z *bytesDecReader) readUint64() uint64 {
-	c0 := z.consume(8)
-	return bigen.Uint64(z.b[c0:z.c])
-}
-
-// ------------------------------------
-
-// decFnInfo has methods for registering handling decoding of a specific type
-// based on some characteristics (builtin, extension, reflect Kind, etc)
-type decFnInfo struct {
-	ti    *typeInfo
-	d     *Decoder
-	dd    decDriver
-	xfFn  func(reflect.Value, []byte) error
-	xfTag byte
-	array bool
-}
-
-func (f *decFnInfo) builtin(rv reflect.Value) {
-	f.dd.decodeBuiltin(f.ti.rtid, rv.Addr().Interface())
-}
-
-func (f *decFnInfo) rawExt(rv reflect.Value) {
-	xtag, xbs := f.dd.decodeExt(false, 0)
-	rv.Field(0).SetUint(uint64(xtag))
-	rv.Field(1).SetBytes(xbs)
-}
-
-func (f *decFnInfo) ext(rv reflect.Value) {
-	_, xbs := f.dd.decodeExt(true, f.xfTag)
-	if fnerr := f.xfFn(rv, xbs); fnerr != nil {
-		panic(fnerr)
-	}
-}
-
-func (f *decFnInfo) binaryMarshal(rv reflect.Value) {
-	var bm binaryUnmarshaler
-	if f.ti.unmIndir == -1 {
-		bm = rv.Addr().Interface().(binaryUnmarshaler)
-	} else if f.ti.unmIndir == 0 {
-		bm = rv.Interface().(binaryUnmarshaler)
-	} else {
-		for j, k := int8(0), f.ti.unmIndir; j < k; j++ {
-			if rv.IsNil() {
-				rv.Set(reflect.New(rv.Type().Elem()))
-			}
-			rv = rv.Elem()
-		}
-		bm = rv.Interface().(binaryUnmarshaler)
-	}
-	xbs, _ := f.dd.decodeBytes(nil)
-	if fnerr := bm.UnmarshalBinary(xbs); fnerr != nil {
-		panic(fnerr)
-	}
-}
-
-func (f *decFnInfo) kErr(rv reflect.Value) {
-	decErr("Unhandled value for kind: %v: %s", rv.Kind(), msgBadDesc)
-}
-
-func (f *decFnInfo) kString(rv reflect.Value) {
-	rv.SetString(f.dd.decodeString())
-}
-
-func (f *decFnInfo) kBool(rv reflect.Value) {
-	rv.SetBool(f.dd.decodeBool())
-}
-
-func (f *decFnInfo) kInt(rv reflect.Value) {
-	rv.SetInt(f.dd.decodeInt(intBitsize))
-}
-
-func (f *decFnInfo) kInt64(rv reflect.Value) {
-	rv.SetInt(f.dd.decodeInt(64))
-}
-
-func (f *decFnInfo) kInt32(rv reflect.Value) {
-	rv.SetInt(f.dd.decodeInt(32))
-}
-
-func (f *decFnInfo) kInt8(rv reflect.Value) {
-	rv.SetInt(f.dd.decodeInt(8))
-}
-
-func (f *decFnInfo) kInt16(rv reflect.Value) {
-	rv.SetInt(f.dd.decodeInt(16))
-}
-
-func (f *decFnInfo) kFloat32(rv reflect.Value) {
-	rv.SetFloat(f.dd.decodeFloat(true))
-}
-
-func (f *decFnInfo) kFloat64(rv reflect.Value) {
-	rv.SetFloat(f.dd.decodeFloat(false))
-}
-
-func (f *decFnInfo) kUint8(rv reflect.Value) {
-	rv.SetUint(f.dd.decodeUint(8))
-}
-
-func (f *decFnInfo) kUint64(rv reflect.Value) {
-	rv.SetUint(f.dd.decodeUint(64))
-}
-
-func (f *decFnInfo) kUint(rv reflect.Value) {
-	rv.SetUint(f.dd.decodeUint(uintBitsize))
-}
-
-func (f *decFnInfo) kUint32(rv reflect.Value) {
-	rv.SetUint(f.dd.decodeUint(32))
-}
-
-func (f *decFnInfo) kUint16(rv reflect.Value) {
-	rv.SetUint(f.dd.decodeUint(16))
-}
-
-// func (f *decFnInfo) kPtr(rv reflect.Value) {
-// 	debugf(">>>>>>> ??? decode kPtr called - shouldn't get called")
-// 	if rv.IsNil() {
-// 		rv.Set(reflect.New(rv.Type().Elem()))
-// 	}
-// 	f.d.decodeValue(rv.Elem())
-// }
-
-func (f *decFnInfo) kInterface(rv reflect.Value) {
-	// debugf("\t===> kInterface")
-	if !rv.IsNil() {
-		f.d.decodeValue(rv.Elem())
-		return
-	}
-	// nil interface:
-	// use some hieristics to set the nil interface to an
-	// appropriate value based on the first byte read (byte descriptor bd)
-	v, vt, decodeFurther := f.dd.decodeNaked()
-	if vt == valueTypeNil {
-		return
-	}
-	// Cannot decode into nil interface with methods (e.g. error, io.Reader, etc)
-	// if non-nil value in stream.
-	if num := f.ti.rt.NumMethod(); num > 0 {
-		decErr("decodeValue: Cannot decode non-nil codec value into nil %v (%v methods)",
-			f.ti.rt, num)
-	}
-	var rvn reflect.Value
-	var useRvn bool
-	switch vt {
-	case valueTypeMap:
-		if f.d.h.MapType == nil {
-			var m2 map[interface{}]interface{}
-			v = &m2
-		} else {
-			rvn = reflect.New(f.d.h.MapType).Elem()
-			useRvn = true
-		}
-	case valueTypeArray:
-		if f.d.h.SliceType == nil {
-			var m2 []interface{}
-			v = &m2
-		} else {
-			rvn = reflect.New(f.d.h.SliceType).Elem()
-			useRvn = true
-		}
-	case valueTypeExt:
-		re := v.(*RawExt)
-		var bfn func(reflect.Value, []byte) error
-		rvn, bfn = f.d.h.getDecodeExtForTag(re.Tag)
-		if bfn == nil {
-			rvn = reflect.ValueOf(*re)
-		} else if fnerr := bfn(rvn, re.Data); fnerr != nil {
-			panic(fnerr)
-		}
-		rv.Set(rvn)
-		return
-	}
-	if decodeFurther {
-		if useRvn {
-			f.d.decodeValue(rvn)
-		} else if v != nil {
-			// this v is a pointer, so we need to dereference it when done
-			f.d.decode(v)
-			rvn = reflect.ValueOf(v).Elem()
-			useRvn = true
-		}
-	}
-	if useRvn {
-		rv.Set(rvn)
-	} else if v != nil {
-		rv.Set(reflect.ValueOf(v))
-	}
-}
-
-func (f *decFnInfo) kStruct(rv reflect.Value) {
-	fti := f.ti
-	if currEncodedType := f.dd.currentEncodedType(); currEncodedType == valueTypeMap {
-		containerLen := f.dd.readMapLen()
-		if containerLen == 0 {
-			return
-		}
-		tisfi := fti.sfi
-		for j := 0; j < containerLen; j++ {
-			// var rvkencname string
-			// ddecode(&rvkencname)
-			f.dd.initReadNext()
-			rvkencname := f.dd.decodeString()
-			// rvksi := ti.getForEncName(rvkencname)
-			if k := fti.indexForEncName(rvkencname); k > -1 {
-				sfik := tisfi[k]
-				if sfik.i != -1 {
-					f.d.decodeValue(rv.Field(int(sfik.i)))
-				} else {
-					f.d.decEmbeddedField(rv, sfik.is)
-				}
-				// f.d.decodeValue(ti.field(k, rv))
-			} else {
-				if f.d.h.ErrorIfNoField {
-					decErr("No matching struct field found when decoding stream map with key: %v",
-						rvkencname)
-				} else {
-					var nilintf0 interface{}
-					f.d.decodeValue(reflect.ValueOf(&nilintf0).Elem())
-				}
-			}
-		}
-	} else if currEncodedType == valueTypeArray {
-		containerLen := f.dd.readArrayLen()
-		if containerLen == 0 {
-			return
-		}
-		for j, si := range fti.sfip {
-			if j == containerLen {
-				break
-			}
-			if si.i != -1 {
-				f.d.decodeValue(rv.Field(int(si.i)))
-			} else {
-				f.d.decEmbeddedField(rv, si.is)
-			}
-		}
-		if containerLen > len(fti.sfip) {
-			// read remaining values and throw away
-			for j := len(fti.sfip); j < containerLen; j++ {
-				var nilintf0 interface{}
-				f.d.decodeValue(reflect.ValueOf(&nilintf0).Elem())
-			}
-		}
-	} else {
-		decErr("Only encoded map or array can be decoded into a struct. (valueType: %x)",
-			currEncodedType)
-	}
-}
-
-func (f *decFnInfo) kSlice(rv reflect.Value) {
-	// A slice can be set from a map or array in stream.
-	currEncodedType := f.dd.currentEncodedType()
-
-	switch currEncodedType {
-	case valueTypeBytes, valueTypeString:
-		if f.ti.rtid == uint8SliceTypId || f.ti.rt.Elem().Kind() == reflect.Uint8 {
-			if bs2, changed2 := f.dd.decodeBytes(rv.Bytes()); changed2 {
-				rv.SetBytes(bs2)
-			}
-			return
-		}
-	}
-
-	if shortCircuitReflectToFastPath && rv.CanAddr() {
-		switch f.ti.rtid {
-		case intfSliceTypId:
-			f.d.decSliceIntf(rv.Addr().Interface().(*[]interface{}), currEncodedType, f.array)
-			return
-		case uint64SliceTypId:
-			f.d.decSliceUint64(rv.Addr().Interface().(*[]uint64), currEncodedType, f.array)
-			return
-		case int64SliceTypId:
-			f.d.decSliceInt64(rv.Addr().Interface().(*[]int64), currEncodedType, f.array)
-			return
-		case strSliceTypId:
-			f.d.decSliceStr(rv.Addr().Interface().(*[]string), currEncodedType, f.array)
-			return
-		}
-	}
-
-	containerLen, containerLenS := decContLens(f.dd, currEncodedType)
-
-	// an array can never return a nil slice. so no need to check f.array here.
-
-	if rv.IsNil() {
-		rv.Set(reflect.MakeSlice(f.ti.rt, containerLenS, containerLenS))
-	}
-
-	if containerLen == 0 {
-		return
-	}
-
-	if rvcap, rvlen := rv.Len(), rv.Cap(); containerLenS > rvcap {
-		if f.array { // !rv.CanSet()
-			decErr(msgDecCannotExpandArr, rvcap, containerLenS)
-		}
-		rvn := reflect.MakeSlice(f.ti.rt, containerLenS, containerLenS)
-		if rvlen > 0 {
-			reflect.Copy(rvn, rv)
-		}
-		rv.Set(rvn)
-	} else if containerLenS > rvlen {
-		rv.SetLen(containerLenS)
-	}
-
-	for j := 0; j < containerLenS; j++ {
-		f.d.decodeValue(rv.Index(j))
-	}
-}
-
-func (f *decFnInfo) kArray(rv reflect.Value) {
-	// f.d.decodeValue(rv.Slice(0, rv.Len()))
-	f.kSlice(rv.Slice(0, rv.Len()))
-}
-
-func (f *decFnInfo) kMap(rv reflect.Value) {
-	if shortCircuitReflectToFastPath && rv.CanAddr() {
-		switch f.ti.rtid {
-		case mapStrIntfTypId:
-			f.d.decMapStrIntf(rv.Addr().Interface().(*map[string]interface{}))
-			return
-		case mapIntfIntfTypId:
-			f.d.decMapIntfIntf(rv.Addr().Interface().(*map[interface{}]interface{}))
-			return
-		case mapInt64IntfTypId:
-			f.d.decMapInt64Intf(rv.Addr().Interface().(*map[int64]interface{}))
-			return
-		case mapUint64IntfTypId:
-			f.d.decMapUint64Intf(rv.Addr().Interface().(*map[uint64]interface{}))
-			return
-		}
-	}
-
-	containerLen := f.dd.readMapLen()
-
-	if rv.IsNil() {
-		rv.Set(reflect.MakeMap(f.ti.rt))
-	}
-
-	if containerLen == 0 {
-		return
-	}
-
-	ktype, vtype := f.ti.rt.Key(), f.ti.rt.Elem()
-	ktypeId := reflect.ValueOf(ktype).Pointer()
-	for j := 0; j < containerLen; j++ {
-		rvk := reflect.New(ktype).Elem()
-		f.d.decodeValue(rvk)
-
-		// special case if a byte array.
-		// if ktype == intfTyp {
-		if ktypeId == intfTypId {
-			rvk = rvk.Elem()
-			if rvk.Type() == uint8SliceTyp {
-				rvk = reflect.ValueOf(string(rvk.Bytes()))
-			}
-		}
-		rvv := rv.MapIndex(rvk)
-		if !rvv.IsValid() {
-			rvv = reflect.New(vtype).Elem()
-		}
-
-		f.d.decodeValue(rvv)
-		rv.SetMapIndex(rvk, rvv)
-	}
-}
-
-// ----------------------------------------
-
-type decFn struct {
-	i *decFnInfo
-	f func(*decFnInfo, reflect.Value)
-}
-
-// A Decoder reads and decodes an object from an input stream in the codec format.
-type Decoder struct {
-	r decReader
-	d decDriver
-	h *BasicHandle
-	f map[uintptr]decFn
-	x []uintptr
-	s []decFn
-}
-
-// NewDecoder returns a Decoder for decoding a stream of bytes from an io.Reader.
-//
-// For efficiency, Users are encouraged to pass in a memory buffered writer
-// (eg bufio.Reader, bytes.Buffer).
-func NewDecoder(r io.Reader, h Handle) *Decoder {
-	z := ioDecReader{
-		r: r,
-	}
-	z.br, _ = r.(io.ByteReader)
-	return &Decoder{r: &z, d: h.newDecDriver(&z), h: h.getBasicHandle()}
-}
-
-// NewDecoderBytes returns a Decoder which efficiently decodes directly
-// from a byte slice with zero copying.
-func NewDecoderBytes(in []byte, h Handle) *Decoder {
-	z := bytesDecReader{
-		b: in,
-		a: len(in),
-	}
-	return &Decoder{r: &z, d: h.newDecDriver(&z), h: h.getBasicHandle()}
-}
-
-// Decode decodes the stream from reader and stores the result in the
-// value pointed to by v. v cannot be a nil pointer. v can also be
-// a reflect.Value of a pointer.
-//
-// Note that a pointer to a nil interface is not a nil pointer.
-// If you do not know what type of stream it is, pass in a pointer to a nil interface.
-// We will decode and store a value in that nil interface.
-//
-// Sample usages:
-//   // Decoding into a non-nil typed value
-//   var f float32
-//   err = codec.NewDecoder(r, handle).Decode(&f)
-//
-//   // Decoding into nil interface
-//   var v interface{}
-//   dec := codec.NewDecoder(r, handle)
-//   err = dec.Decode(&v)
-//
-// When decoding into a nil interface{}, we will decode into an appropriate value based
-// on the contents of the stream:
-//   - Numbers are decoded as float64, int64 or uint64.
-//   - Other values are decoded appropriately depending on the type:
-//     bool, string, []byte, time.Time, etc
-//   - Extensions are decoded as RawExt (if no ext function registered for the tag)
-// Configurations exist on the Handle to override defaults
-// (e.g. for MapType, SliceType and how to decode raw bytes).
-//
-// When decoding into a non-nil interface{} value, the mode of encoding is based on the
-// type of the value. When a value is seen:
-//   - If an extension is registered for it, call that extension function
-//   - If it implements BinaryUnmarshaler, call its UnmarshalBinary(data []byte) error
-//   - Else decode it based on its reflect.Kind
-//
-// There are some special rules when decoding into containers (slice/array/map/struct).
-// Decode will typically use the stream contents to UPDATE the container.
-//   - A map can be decoded from a stream map, by updating matching keys.
-//   - A slice can be decoded from a stream array,
-//     by updating the first n elements, where n is length of the stream.
-//   - A slice can be decoded from a stream map, by decoding as if
-//     it contains a sequence of key-value pairs.
-//   - A struct can be decoded from a stream map, by updating matching fields.
-//   - A struct can be decoded from a stream array,
-//     by updating fields as they occur in the struct (by index).
-//
-// When decoding a stream map or array with length of 0 into a nil map or slice,
-// we reset the destination map or slice to a zero-length value.
-//
-// However, when decoding a stream nil, we reset the destination container
-// to its "zero" value (e.g. nil for slice/map, etc).
-//
-func (d *Decoder) Decode(v interface{}) (err error) {
-	defer panicToErr(&err)
-	d.decode(v)
-	return
-}
-
-func (d *Decoder) decode(iv interface{}) {
-	d.d.initReadNext()
-
-	switch v := iv.(type) {
-	case nil:
-		decErr("Cannot decode into nil.")
-
-	case reflect.Value:
-		d.chkPtrValue(v)
-		d.decodeValue(v.Elem())
-
-	case *string:
-		*v = d.d.decodeString()
-	case *bool:
-		*v = d.d.decodeBool()
-	case *int:
-		*v = int(d.d.decodeInt(intBitsize))
-	case *int8:
-		*v = int8(d.d.decodeInt(8))
-	case *int16:
-		*v = int16(d.d.decodeInt(16))
-	case *int32:
-		*v = int32(d.d.decodeInt(32))
-	case *int64:
-		*v = d.d.decodeInt(64)
-	case *uint:
-		*v = uint(d.d.decodeUint(uintBitsize))
-	case *uint8:
-		*v = uint8(d.d.decodeUint(8))
-	case *uint16:
-		*v = uint16(d.d.decodeUint(16))
-	case *uint32:
-		*v = uint32(d.d.decodeUint(32))
-	case *uint64:
-		*v = d.d.decodeUint(64)
-	case *float32:
-		*v = float32(d.d.decodeFloat(true))
-	case *float64:
-		*v = d.d.decodeFloat(false)
-	case *[]byte:
-		*v, _ = d.d.decodeBytes(*v)
-
-	case *[]interface{}:
-		d.decSliceIntf(v, valueTypeInvalid, false)
-	case *[]uint64:
-		d.decSliceUint64(v, valueTypeInvalid, false)
-	case *[]int64:
-		d.decSliceInt64(v, valueTypeInvalid, false)
-	case *[]string:
-		d.decSliceStr(v, valueTypeInvalid, false)
-	case *map[string]interface{}:
-		d.decMapStrIntf(v)
-	case *map[interface{}]interface{}:
-		d.decMapIntfIntf(v)
-	case *map[uint64]interface{}:
-		d.decMapUint64Intf(v)
-	case *map[int64]interface{}:
-		d.decMapInt64Intf(v)
-
-	case *interface{}:
-		d.decodeValue(reflect.ValueOf(iv).Elem())
-
-	default:
-		rv := reflect.ValueOf(iv)
-		d.chkPtrValue(rv)
-		d.decodeValue(rv.Elem())
-	}
-}
-
-func (d *Decoder) decodeValue(rv reflect.Value) {
-	d.d.initReadNext()
-
-	if d.d.tryDecodeAsNil() {
-		// If value in stream is nil, set the dereferenced value to its "zero" value (if settable)
-		if rv.Kind() == reflect.Ptr {
-			if !rv.IsNil() {
-				rv.Set(reflect.Zero(rv.Type()))
-			}
-			return
-		}
-		// for rv.Kind() == reflect.Ptr {
-		// 	rv = rv.Elem()
-		// }
-		if rv.IsValid() { // rv.CanSet() // always settable, except it's invalid
-			rv.Set(reflect.Zero(rv.Type()))
-		}
-		return
-	}
-
-	// If stream is not containing a nil value, then we can deref to the base
-	// non-pointer value, and decode into that.
-	for rv.Kind() == reflect.Ptr {
-		if rv.IsNil() {
-			rv.Set(reflect.New(rv.Type().Elem()))
-		}
-		rv = rv.Elem()
-	}
-
-	rt := rv.Type()
-	rtid := reflect.ValueOf(rt).Pointer()
-
-	// retrieve or register a focus'ed function for this type
-	// to eliminate need to do the retrieval multiple times
-
-	// if d.f == nil && d.s == nil { debugf("---->Creating new dec f map for type: %v\n", rt) }
-	var fn decFn
-	var ok bool
-	if useMapForCodecCache {
-		fn, ok = d.f[rtid]
-	} else {
-		for i, v := range d.x {
-			if v == rtid {
-				fn, ok = d.s[i], true
-				break
-			}
-		}
-	}
-	if !ok {
-		// debugf("\tCreating new dec fn for type: %v\n", rt)
-		fi := decFnInfo{ti: getTypeInfo(rtid, rt), d: d, dd: d.d}
-		fn.i = &fi
-		// An extension can be registered for any type, regardless of the Kind
-		// (e.g. type BitSet int64, type MyStruct { / * unexported fields * / }, type X []int, etc.
-		//
-		// We can't check if it's an extension byte here first, because the user may have
-		// registered a pointer or non-pointer type, meaning we may have to recurse first
-		// before matching a mapped type, even though the extension byte is already detected.
-		//
-		// NOTE: if decoding into a nil interface{}, we return a non-nil
-		// value except even if the container registers a length of 0.
-		if rtid == rawExtTypId {
-			fn.f = (*decFnInfo).rawExt
-		} else if d.d.isBuiltinType(rtid) {
-			fn.f = (*decFnInfo).builtin
-		} else if xfTag, xfFn := d.h.getDecodeExt(rtid); xfFn != nil {
-			fi.xfTag, fi.xfFn = xfTag, xfFn
-			fn.f = (*decFnInfo).ext
-		} else if supportBinaryMarshal && fi.ti.unm {
-			fn.f = (*decFnInfo).binaryMarshal
-		} else {
-			switch rk := rt.Kind(); rk {
-			case reflect.String:
-				fn.f = (*decFnInfo).kString
-			case reflect.Bool:
-				fn.f = (*decFnInfo).kBool
-			case reflect.Int:
-				fn.f = (*decFnInfo).kInt
-			case reflect.Int64:
-				fn.f = (*decFnInfo).kInt64
-			case reflect.Int32:
-				fn.f = (*decFnInfo).kInt32
-			case reflect.Int8:
-				fn.f = (*decFnInfo).kInt8
-			case reflect.Int16:
-				fn.f = (*decFnInfo).kInt16
-			case reflect.Float32:
-				fn.f = (*decFnInfo).kFloat32
-			case reflect.Float64:
-				fn.f = (*decFnInfo).kFloat64
-			case reflect.Uint8:
-				fn.f = (*decFnInfo).kUint8
-			case reflect.Uint64:
-				fn.f = (*decFnInfo).kUint64
-			case reflect.Uint:
-				fn.f = (*decFnInfo).kUint
-			case reflect.Uint32:
-				fn.f = (*decFnInfo).kUint32
-			case reflect.Uint16:
-				fn.f = (*decFnInfo).kUint16
-			// case reflect.Ptr:
-			// 	fn.f = (*decFnInfo).kPtr
-			case reflect.Interface:
-				fn.f = (*decFnInfo).kInterface
-			case reflect.Struct:
-				fn.f = (*decFnInfo).kStruct
-			case reflect.Slice:
-				fn.f = (*decFnInfo).kSlice
-			case reflect.Array:
-				fi.array = true
-				fn.f = (*decFnInfo).kArray
-			case reflect.Map:
-				fn.f = (*decFnInfo).kMap
-			default:
-				fn.f = (*decFnInfo).kErr
-			}
-		}
-		if useMapForCodecCache {
-			if d.f == nil {
-				d.f = make(map[uintptr]decFn, 16)
-			}
-			d.f[rtid] = fn
-		} else {
-			d.s = append(d.s, fn)
-			d.x = append(d.x, rtid)
-		}
-	}
-
-	fn.f(fn.i, rv)
-
-	return
-}
-
-func (d *Decoder) chkPtrValue(rv reflect.Value) {
-	// We can only decode into a non-nil pointer
-	if rv.Kind() == reflect.Ptr && !rv.IsNil() {
-		return
-	}
-	if !rv.IsValid() {
-		decErr("Cannot decode into a zero (ie invalid) reflect.Value")
-	}
-	if !rv.CanInterface() {
-		decErr("Cannot decode into a value without an interface: %v", rv)
-	}
-	rvi := rv.Interface()
-	decErr("Cannot decode into non-pointer or nil pointer. Got: %v, %T, %v",
-		rv.Kind(), rvi, rvi)
-}
-
-func (d *Decoder) decEmbeddedField(rv reflect.Value, index []int) {
-	// d.decodeValue(rv.FieldByIndex(index))
-	// nil pointers may be here; so reproduce FieldByIndex logic + enhancements
-	for _, j := range index {
-		if rv.Kind() == reflect.Ptr {
-			if rv.IsNil() {
-				rv.Set(reflect.New(rv.Type().Elem()))
-			}
-			// If a pointer, it must be a pointer to struct (based on typeInfo contract)
-			rv = rv.Elem()
-		}
-		rv = rv.Field(j)
-	}
-	d.decodeValue(rv)
-}
-
-// --------------------------------------------------
-
-// short circuit functions for common maps and slices
-
-func (d *Decoder) decSliceIntf(v *[]interface{}, currEncodedType valueType, doNotReset bool) {
-	_, containerLenS := decContLens(d.d, currEncodedType)
-	s := *v
-	if s == nil {
-		s = make([]interface{}, containerLenS, containerLenS)
-	} else if containerLenS > cap(s) {
-		if doNotReset {
-			decErr(msgDecCannotExpandArr, cap(s), containerLenS)
-		}
-		s = make([]interface{}, containerLenS, containerLenS)
-		copy(s, *v)
-	} else if containerLenS > len(s) {
-		s = s[:containerLenS]
-	}
-	for j := 0; j < containerLenS; j++ {
-		d.decode(&s[j])
-	}
-	*v = s
-}
-
-func (d *Decoder) decSliceInt64(v *[]int64, currEncodedType valueType, doNotReset bool) {
-	_, containerLenS := decContLens(d.d, currEncodedType)
-	s := *v
-	if s == nil {
-		s = make([]int64, containerLenS, containerLenS)
-	} else if containerLenS > cap(s) {
-		if doNotReset {
-			decErr(msgDecCannotExpandArr, cap(s), containerLenS)
-		}
-		s = make([]int64, containerLenS, containerLenS)
-		copy(s, *v)
-	} else if containerLenS > len(s) {
-		s = s[:containerLenS]
-	}
-	for j := 0; j < containerLenS; j++ {
-		// d.decode(&s[j])
-		d.d.initReadNext()
-		s[j] = d.d.decodeInt(intBitsize)
-	}
-	*v = s
-}
-
-func (d *Decoder) decSliceUint64(v *[]uint64, currEncodedType valueType, doNotReset bool) {
-	_, containerLenS := decContLens(d.d, currEncodedType)
-	s := *v
-	if s == nil {
-		s = make([]uint64, containerLenS, containerLenS)
-	} else if containerLenS > cap(s) {
-		if doNotReset {
-			decErr(msgDecCannotExpandArr, cap(s), containerLenS)
-		}
-		s = make([]uint64, containerLenS, containerLenS)
-		copy(s, *v)
-	} else if containerLenS > len(s) {
-		s = s[:containerLenS]
-	}
-	for j := 0; j < containerLenS; j++ {
-		// d.decode(&s[j])
-		d.d.initReadNext()
-		s[j] = d.d.decodeUint(intBitsize)
-	}
-	*v = s
-}
-
-func (d *Decoder) decSliceStr(v *[]string, currEncodedType valueType, doNotReset bool) {
-	_, containerLenS := decContLens(d.d, currEncodedType)
-	s := *v
-	if s == nil {
-		s = make([]string, containerLenS, containerLenS)
-	} else if containerLenS > cap(s) {
-		if doNotReset {
-			decErr(msgDecCannotExpandArr, cap(s), containerLenS)
-		}
-		s = make([]string, containerLenS, containerLenS)
-		copy(s, *v)
-	} else if containerLenS > len(s) {
-		s = s[:containerLenS]
-	}
-	for j := 0; j < containerLenS; j++ {
-		// d.decode(&s[j])
-		d.d.initReadNext()
-		s[j] = d.d.decodeString()
-	}
-	*v = s
-}
-
-func (d *Decoder) decMapIntfIntf(v *map[interface{}]interface{}) {
-	containerLen := d.d.readMapLen()
-	m := *v
-	if m == nil {
-		m = make(map[interface{}]interface{}, containerLen)
-		*v = m
-	}
-	for j := 0; j < containerLen; j++ {
-		var mk interface{}
-		d.decode(&mk)
-		// special case if a byte array.
-		if bv, bok := mk.([]byte); bok {
-			mk = string(bv)
-		}
-		mv := m[mk]
-		d.decode(&mv)
-		m[mk] = mv
-	}
-}
-
-func (d *Decoder) decMapInt64Intf(v *map[int64]interface{}) {
-	containerLen := d.d.readMapLen()
-	m := *v
-	if m == nil {
-		m = make(map[int64]interface{}, containerLen)
-		*v = m
-	}
-	for j := 0; j < containerLen; j++ {
-		d.d.initReadNext()
-		mk := d.d.decodeInt(intBitsize)
-		mv := m[mk]
-		d.decode(&mv)
-		m[mk] = mv
-	}
-}
-
-func (d *Decoder) decMapUint64Intf(v *map[uint64]interface{}) {
-	containerLen := d.d.readMapLen()
-	m := *v
-	if m == nil {
-		m = make(map[uint64]interface{}, containerLen)
-		*v = m
-	}
-	for j := 0; j < containerLen; j++ {
-		d.d.initReadNext()
-		mk := d.d.decodeUint(intBitsize)
-		mv := m[mk]
-		d.decode(&mv)
-		m[mk] = mv
-	}
-}
-
-func (d *Decoder) decMapStrIntf(v *map[string]interface{}) {
-	containerLen := d.d.readMapLen()
-	m := *v
-	if m == nil {
-		m = make(map[string]interface{}, containerLen)
-		*v = m
-	}
-	for j := 0; j < containerLen; j++ {
-		d.d.initReadNext()
-		mk := d.d.decodeString()
-		mv := m[mk]
-		d.decode(&mv)
-		m[mk] = mv
-	}
-}
-
-// ----------------------------------------
-
-func decContLens(dd decDriver, currEncodedType valueType) (containerLen, containerLenS int) {
-	if currEncodedType == valueTypeInvalid {
-		currEncodedType = dd.currentEncodedType()
-	}
-	switch currEncodedType {
-	case valueTypeArray:
-		containerLen = dd.readArrayLen()
-		containerLenS = containerLen
-	case valueTypeMap:
-		containerLen = dd.readMapLen()
-		containerLenS = containerLen * 2
-	default:
-		decErr("Only encoded map or array can be decoded into a slice. (valueType: %0x)",
-			currEncodedType)
-	}
-	return
-}
-
-func decErr(format string, params ...interface{}) {
-	doPanic(msgTagDec, format, params...)
-}
diff --git a/Godeps/_workspace/src/github.com/hashicorp/go-msgpack/codec/encode.go b/Godeps/_workspace/src/github.com/hashicorp/go-msgpack/codec/encode.go
deleted file mode 100644
index 4914be0c7..000000000
--- a/Godeps/_workspace/src/github.com/hashicorp/go-msgpack/codec/encode.go
+++ /dev/null
@@ -1,1001 +0,0 @@
-// Copyright (c) 2012, 2013 Ugorji Nwoke. All rights reserved.
-// Use of this source code is governed by a BSD-style license found in the LICENSE file.
-
-package codec
-
-import (
-	"io"
-	"reflect"
-)
-
-const (
-	// Some tagging information for error messages.
-	msgTagEnc         = "codec.encoder"
-	defEncByteBufSize = 1 << 6 // 4:16, 6:64, 8:256, 10:1024
-	// maxTimeSecs32 = math.MaxInt32 / 60 / 24 / 366
-)
-
-// AsSymbolFlag defines what should be encoded as symbols.
-type AsSymbolFlag uint8
-
-const (
-	// AsSymbolDefault is default.
-	// Currently, this means only encode struct field names as symbols.
-	// The default is subject to change.
-	AsSymbolDefault AsSymbolFlag = iota
-
-	// AsSymbolAll means encode anything which could be a symbol as a symbol.
-	AsSymbolAll = 0xfe
-
-	// AsSymbolNone means do not encode anything as a symbol.
-	AsSymbolNone = 1 << iota
-
-	// AsSymbolMapStringKeys means encode keys in map[string]XXX as symbols.
-	AsSymbolMapStringKeysFlag
-
-	// AsSymbolStructFieldName means encode struct field names as symbols.
-	AsSymbolStructFieldNameFlag
-)
-
-// encWriter abstracting writing to a byte array or to an io.Writer.
-type encWriter interface {
-	writeUint16(uint16)
-	writeUint32(uint32)
-	writeUint64(uint64)
-	writeb([]byte)
-	writestr(string)
-	writen1(byte)
-	writen2(byte, byte)
-	atEndOfEncode()
-}
-
-// encDriver abstracts the actual codec (binc vs msgpack, etc)
-type encDriver interface {
-	isBuiltinType(rt uintptr) bool
-	encodeBuiltin(rt uintptr, v interface{})
-	encodeNil()
-	encodeInt(i int64)
-	encodeUint(i uint64)
-	encodeBool(b bool)
-	encodeFloat32(f float32)
-	encodeFloat64(f float64)
-	encodeExtPreamble(xtag byte, length int)
-	encodeArrayPreamble(length int)
-	encodeMapPreamble(length int)
-	encodeString(c charEncoding, v string)
-	encodeSymbol(v string)
-	encodeStringBytes(c charEncoding, v []byte)
-	//TODO
-	//encBignum(f *big.Int)
-	//encStringRunes(c charEncoding, v []rune)
-}
-
-type ioEncWriterWriter interface {
-	WriteByte(c byte) error
-	WriteString(s string) (n int, err error)
-	Write(p []byte) (n int, err error)
-}
-
-type ioEncStringWriter interface {
-	WriteString(s string) (n int, err error)
-}
-
-type EncodeOptions struct {
-	// Encode a struct as an array, and not as a map.
-	StructToArray bool
-
-	// AsSymbols defines what should be encoded as symbols.
-	//
-	// Encoding as symbols can reduce the encoded size significantly.
-	//
-	// However, during decoding, each string to be encoded as a symbol must
-	// be checked to see if it has been seen before. Consequently, encoding time
-	// will increase if using symbols, because string comparisons has a clear cost.
-	//
-	// Sample values:
-	//   AsSymbolNone
-	//   AsSymbolAll
-	//   AsSymbolMapStringKeys
-	//   AsSymbolMapStringKeysFlag | AsSymbolStructFieldNameFlag
-	AsSymbols AsSymbolFlag
-}
-
-// ---------------------------------------------
-
-type simpleIoEncWriterWriter struct {
-	w  io.Writer
-	bw io.ByteWriter
-	sw ioEncStringWriter
-}
-
-func (o *simpleIoEncWriterWriter) WriteByte(c byte) (err error) {
-	if o.bw != nil {
-		return o.bw.WriteByte(c)
-	}
-	_, err = o.w.Write([]byte{c})
-	return
-}
-
-func (o *simpleIoEncWriterWriter) WriteString(s string) (n int, err error) {
-	if o.sw != nil {
-		return o.sw.WriteString(s)
-	}
-	return o.w.Write([]byte(s))
-}
-
-func (o *simpleIoEncWriterWriter) Write(p []byte) (n int, err error) {
-	return o.w.Write(p)
-}
-
-// ----------------------------------------
-
-// ioEncWriter implements encWriter and can write to an io.Writer implementation
-type ioEncWriter struct {
-	w ioEncWriterWriter
-	x [8]byte // temp byte array re-used internally for efficiency
-}
-
-func (z *ioEncWriter) writeUint16(v uint16) {
-	bigen.PutUint16(z.x[:2], v)
-	z.writeb(z.x[:2])
-}
-
-func (z *ioEncWriter) writeUint32(v uint32) {
-	bigen.PutUint32(z.x[:4], v)
-	z.writeb(z.x[:4])
-}
-
-func (z *ioEncWriter) writeUint64(v uint64) {
-	bigen.PutUint64(z.x[:8], v)
-	z.writeb(z.x[:8])
-}
-
-func (z *ioEncWriter) writeb(bs []byte) {
-	if len(bs) == 0 {
-		return
-	}
-	n, err := z.w.Write(bs)
-	if err != nil {
-		panic(err)
-	}
-	if n != len(bs) {
-		encErr("write: Incorrect num bytes written. Expecting: %v, Wrote: %v", len(bs), n)
-	}
-}
-
-func (z *ioEncWriter) writestr(s string) {
-	n, err := z.w.WriteString(s)
-	if err != nil {
-		panic(err)
-	}
-	if n != len(s) {
-		encErr("write: Incorrect num bytes written. Expecting: %v, Wrote: %v", len(s), n)
-	}
-}
-
-func (z *ioEncWriter) writen1(b byte) {
-	if err := z.w.WriteByte(b); err != nil {
-		panic(err)
-	}
-}
-
-func (z *ioEncWriter) writen2(b1 byte, b2 byte) {
-	z.writen1(b1)
-	z.writen1(b2)
-}
-
-func (z *ioEncWriter) atEndOfEncode() {}
-
-// ----------------------------------------
-
-// bytesEncWriter implements encWriter and can write to an byte slice.
-// It is used by Marshal function.
-type bytesEncWriter struct {
-	b   []byte
-	c   int     // cursor
-	out *[]byte // write out on atEndOfEncode
-}
-
-func (z *bytesEncWriter) writeUint16(v uint16) {
-	c := z.grow(2)
-	z.b[c] = byte(v >> 8)
-	z.b[c+1] = byte(v)
-}
-
-func (z *bytesEncWriter) writeUint32(v uint32) {
-	c := z.grow(4)
-	z.b[c] = byte(v >> 24)
-	z.b[c+1] = byte(v >> 16)
-	z.b[c+2] = byte(v >> 8)
-	z.b[c+3] = byte(v)
-}
-
-func (z *bytesEncWriter) writeUint64(v uint64) {
-	c := z.grow(8)
-	z.b[c] = byte(v >> 56)
-	z.b[c+1] = byte(v >> 48)
-	z.b[c+2] = byte(v >> 40)
-	z.b[c+3] = byte(v >> 32)
-	z.b[c+4] = byte(v >> 24)
-	z.b[c+5] = byte(v >> 16)
-	z.b[c+6] = byte(v >> 8)
-	z.b[c+7] = byte(v)
-}
-
-func (z *bytesEncWriter) writeb(s []byte) {
-	if len(s) == 0 {
-		return
-	}
-	c := z.grow(len(s))
-	copy(z.b[c:], s)
-}
-
-func (z *bytesEncWriter) writestr(s string) {
-	c := z.grow(len(s))
-	copy(z.b[c:], s)
-}
-
-func (z *bytesEncWriter) writen1(b1 byte) {
-	c := z.grow(1)
-	z.b[c] = b1
-}
-
-func (z *bytesEncWriter) writen2(b1 byte, b2 byte) {
-	c := z.grow(2)
-	z.b[c] = b1
-	z.b[c+1] = b2
-}
-
-func (z *bytesEncWriter) atEndOfEncode() {
-	*(z.out) = z.b[:z.c]
-}
-
-func (z *bytesEncWriter) grow(n int) (oldcursor int) {
-	oldcursor = z.c
-	z.c = oldcursor + n
-	if z.c > cap(z.b) {
-		// Tried using appendslice logic: (if cap < 1024, *2, else *1.25).
-		// However, it was too expensive, causing too many iterations of copy.
-		// Using bytes.Buffer model was much better (2*cap + n)
-		bs := make([]byte, 2*cap(z.b)+n)
-		copy(bs, z.b[:oldcursor])
-		z.b = bs
-	} else if z.c > len(z.b) {
-		z.b = z.b[:cap(z.b)]
-	}
-	return
-}
-
-// ---------------------------------------------
-
-type encFnInfo struct {
-	ti    *typeInfo
-	e     *Encoder
-	ee    encDriver
-	xfFn  func(reflect.Value) ([]byte, error)
-	xfTag byte
-}
-
-func (f *encFnInfo) builtin(rv reflect.Value) {
-	f.ee.encodeBuiltin(f.ti.rtid, rv.Interface())
-}
-
-func (f *encFnInfo) rawExt(rv reflect.Value) {
-	f.e.encRawExt(rv.Interface().(RawExt))
-}
-
-func (f *encFnInfo) ext(rv reflect.Value) {
-	bs, fnerr := f.xfFn(rv)
-	if fnerr != nil {
-		panic(fnerr)
-	}
-	if bs == nil {
-		f.ee.encodeNil()
-		return
-	}
-	if f.e.hh.writeExt() {
-		f.ee.encodeExtPreamble(f.xfTag, len(bs))
-		f.e.w.writeb(bs)
-	} else {
-		f.ee.encodeStringBytes(c_RAW, bs)
-	}
-
-}
-
-func (f *encFnInfo) binaryMarshal(rv reflect.Value) {
-	var bm binaryMarshaler
-	if f.ti.mIndir == 0 {
-		bm = rv.Interface().(binaryMarshaler)
-	} else if f.ti.mIndir == -1 {
-		bm = rv.Addr().Interface().(binaryMarshaler)
-	} else {
-		for j, k := int8(0), f.ti.mIndir; j < k; j++ {
-			if rv.IsNil() {
-				f.ee.encodeNil()
-				return
-			}
-			rv = rv.Elem()
-		}
-		bm = rv.Interface().(binaryMarshaler)
-	}
-	// debugf(">>>> binaryMarshaler: %T", rv.Interface())
-	bs, fnerr := bm.MarshalBinary()
-	if fnerr != nil {
-		panic(fnerr)
-	}
-	if bs == nil {
-		f.ee.encodeNil()
-	} else {
-		f.ee.encodeStringBytes(c_RAW, bs)
-	}
-}
-
-func (f *encFnInfo) kBool(rv reflect.Value) {
-	f.ee.encodeBool(rv.Bool())
-}
-
-func (f *encFnInfo) kString(rv reflect.Value) {
-	f.ee.encodeString(c_UTF8, rv.String())
-}
-
-func (f *encFnInfo) kFloat64(rv reflect.Value) {
-	f.ee.encodeFloat64(rv.Float())
-}
-
-func (f *encFnInfo) kFloat32(rv reflect.Value) {
-	f.ee.encodeFloat32(float32(rv.Float()))
-}
-
-func (f *encFnInfo) kInt(rv reflect.Value) {
-	f.ee.encodeInt(rv.Int())
-}
-
-func (f *encFnInfo) kUint(rv reflect.Value) {
-	f.ee.encodeUint(rv.Uint())
-}
-
-func (f *encFnInfo) kInvalid(rv reflect.Value) {
-	f.ee.encodeNil()
-}
-
-func (f *encFnInfo) kErr(rv reflect.Value) {
-	encErr("Unsupported kind: %s, for: %#v", rv.Kind(), rv)
-}
-
-func (f *encFnInfo) kSlice(rv reflect.Value) {
-	if rv.IsNil() {
-		f.ee.encodeNil()
-		return
-	}
-
-	if shortCircuitReflectToFastPath {
-		switch f.ti.rtid {
-		case intfSliceTypId:
-			f.e.encSliceIntf(rv.Interface().([]interface{}))
-			return
-		case strSliceTypId:
-			f.e.encSliceStr(rv.Interface().([]string))
-			return
-		case uint64SliceTypId:
-			f.e.encSliceUint64(rv.Interface().([]uint64))
-			return
-		case int64SliceTypId:
-			f.e.encSliceInt64(rv.Interface().([]int64))
-			return
-		}
-	}
-
-	// If in this method, then there was no extension function defined.
-	// So it's okay to treat as []byte.
-	if f.ti.rtid == uint8SliceTypId || f.ti.rt.Elem().Kind() == reflect.Uint8 {
-		f.ee.encodeStringBytes(c_RAW, rv.Bytes())
-		return
-	}
-
-	l := rv.Len()
-	if f.ti.mbs {
-		if l%2 == 1 {
-			encErr("mapBySlice: invalid length (must be divisible by 2): %v", l)
-		}
-		f.ee.encodeMapPreamble(l / 2)
-	} else {
-		f.ee.encodeArrayPreamble(l)
-	}
-	if l == 0 {
-		return
-	}
-	for j := 0; j < l; j++ {
-		// TODO: Consider perf implication of encoding odd index values as symbols if type is string
-		f.e.encodeValue(rv.Index(j))
-	}
-}
-
-func (f *encFnInfo) kArray(rv reflect.Value) {
-	// We cannot share kSlice method, because the array may be non-addressable.
-	// E.g. type struct S{B [2]byte}; Encode(S{}) will bomb on "panic: slice of unaddressable array".
-	// So we have to duplicate the functionality here.
-	// f.e.encodeValue(rv.Slice(0, rv.Len()))
-	// f.kSlice(rv.Slice(0, rv.Len()))
-
-	l := rv.Len()
-	// Handle an array of bytes specially (in line with what is done for slices)
-	if f.ti.rt.Elem().Kind() == reflect.Uint8 {
-		if l == 0 {
-			f.ee.encodeStringBytes(c_RAW, nil)
-			return
-		}
-		var bs []byte
-		if rv.CanAddr() {
-			bs = rv.Slice(0, l).Bytes()
-		} else {
-			bs = make([]byte, l)
-			for i := 0; i < l; i++ {
-				bs[i] = byte(rv.Index(i).Uint())
-			}
-		}
-		f.ee.encodeStringBytes(c_RAW, bs)
-		return
-	}
-
-	if f.ti.mbs {
-		if l%2 == 1 {
-			encErr("mapBySlice: invalid length (must be divisible by 2): %v", l)
-		}
-		f.ee.encodeMapPreamble(l / 2)
-	} else {
-		f.ee.encodeArrayPreamble(l)
-	}
-	if l == 0 {
-		return
-	}
-	for j := 0; j < l; j++ {
-		// TODO: Consider perf implication of encoding odd index values as symbols if type is string
-		f.e.encodeValue(rv.Index(j))
-	}
-}
-
-func (f *encFnInfo) kStruct(rv reflect.Value) {
-	fti := f.ti
-	newlen := len(fti.sfi)
-	rvals := make([]reflect.Value, newlen)
-	var encnames []string
-	e := f.e
-	tisfi := fti.sfip
-	toMap := !(fti.toArray || e.h.StructToArray)
-	// if toMap, use the sorted array. If toArray, use unsorted array (to match sequence in struct)
-	if toMap {
-		tisfi = fti.sfi
-		encnames = make([]string, newlen)
-	}
-	newlen = 0
-	for _, si := range tisfi {
-		if si.i != -1 {
-			rvals[newlen] = rv.Field(int(si.i))
-		} else {
-			rvals[newlen] = rv.FieldByIndex(si.is)
-		}
-		if toMap {
-			if si.omitEmpty && isEmptyValue(rvals[newlen]) {
-				continue
-			}
-			encnames[newlen] = si.encName
-		} else {
-			if si.omitEmpty && isEmptyValue(rvals[newlen]) {
-				rvals[newlen] = reflect.Value{} //encode as nil
-			}
-		}
-		newlen++
-	}
-
-	// debugf(">>>> kStruct: newlen: %v", newlen)
-	if toMap {
-		ee := f.ee //don't dereference everytime
-		ee.encodeMapPreamble(newlen)
-		// asSymbols := e.h.AsSymbols&AsSymbolStructFieldNameFlag != 0
-		asSymbols := e.h.AsSymbols == AsSymbolDefault || e.h.AsSymbols&AsSymbolStructFieldNameFlag != 0
-		for j := 0; j < newlen; j++ {
-			if asSymbols {
-				ee.encodeSymbol(encnames[j])
-			} else {
-				ee.encodeString(c_UTF8, encnames[j])
-			}
-			e.encodeValue(rvals[j])
-		}
-	} else {
-		f.ee.encodeArrayPreamble(newlen)
-		for j := 0; j < newlen; j++ {
-			e.encodeValue(rvals[j])
-		}
-	}
-}
-
-// func (f *encFnInfo) kPtr(rv reflect.Value) {
-// 	debugf(">>>>>>> ??? encode kPtr called - shouldn't get called")
-// 	if rv.IsNil() {
-// 		f.ee.encodeNil()
-// 		return
-// 	}
-// 	f.e.encodeValue(rv.Elem())
-// }
-
-func (f *encFnInfo) kInterface(rv reflect.Value) {
-	if rv.IsNil() {
-		f.ee.encodeNil()
-		return
-	}
-	f.e.encodeValue(rv.Elem())
-}
-
-func (f *encFnInfo) kMap(rv reflect.Value) {
-	if rv.IsNil() {
-		f.ee.encodeNil()
-		return
-	}
-
-	if shortCircuitReflectToFastPath {
-		switch f.ti.rtid {
-		case mapIntfIntfTypId:
-			f.e.encMapIntfIntf(rv.Interface().(map[interface{}]interface{}))
-			return
-		case mapStrIntfTypId:
-			f.e.encMapStrIntf(rv.Interface().(map[string]interface{}))
-			return
-		case mapStrStrTypId:
-			f.e.encMapStrStr(rv.Interface().(map[string]string))
-			return
-		case mapInt64IntfTypId:
-			f.e.encMapInt64Intf(rv.Interface().(map[int64]interface{}))
-			return
-		case mapUint64IntfTypId:
-			f.e.encMapUint64Intf(rv.Interface().(map[uint64]interface{}))
-			return
-		}
-	}
-
-	l := rv.Len()
-	f.ee.encodeMapPreamble(l)
-	if l == 0 {
-		return
-	}
-	// keyTypeIsString := f.ti.rt.Key().Kind() == reflect.String
-	keyTypeIsString := f.ti.rt.Key() == stringTyp
-	var asSymbols bool
-	if keyTypeIsString {
-		asSymbols = f.e.h.AsSymbols&AsSymbolMapStringKeysFlag != 0
-	}
-	mks := rv.MapKeys()
-	// for j, lmks := 0, len(mks); j < lmks; j++ {
-	for j := range mks {
-		if keyTypeIsString {
-			if asSymbols {
-				f.ee.encodeSymbol(mks[j].String())
-			} else {
-				f.ee.encodeString(c_UTF8, mks[j].String())
-			}
-		} else {
-			f.e.encodeValue(mks[j])
-		}
-		f.e.encodeValue(rv.MapIndex(mks[j]))
-	}
-
-}
-
-// --------------------------------------------------
-
-// encFn encapsulates the captured variables and the encode function.
-// This way, we only do some calculations one times, and pass to the
-// code block that should be called (encapsulated in a function)
-// instead of executing the checks every time.
-type encFn struct {
-	i *encFnInfo
-	f func(*encFnInfo, reflect.Value)
-}
-
-// --------------------------------------------------
-
-// An Encoder writes an object to an output stream in the codec format.
-type Encoder struct {
-	w  encWriter
-	e  encDriver
-	h  *BasicHandle
-	hh Handle
-	f  map[uintptr]encFn
-	x  []uintptr
-	s  []encFn
-}
-
-// NewEncoder returns an Encoder for encoding into an io.Writer.
-//
-// For efficiency, Users are encouraged to pass in a memory buffered writer
-// (eg bufio.Writer, bytes.Buffer).
-func NewEncoder(w io.Writer, h Handle) *Encoder {
-	ww, ok := w.(ioEncWriterWriter)
-	if !ok {
-		sww := simpleIoEncWriterWriter{w: w}
-		sww.bw, _ = w.(io.ByteWriter)
-		sww.sw, _ = w.(ioEncStringWriter)
-		ww = &sww
-		//ww = bufio.NewWriterSize(w, defEncByteBufSize)
-	}
-	z := ioEncWriter{
-		w: ww,
-	}
-	return &Encoder{w: &z, hh: h, h: h.getBasicHandle(), e: h.newEncDriver(&z)}
-}
-
-// NewEncoderBytes returns an encoder for encoding directly and efficiently
-// into a byte slice, using zero-copying to temporary slices.
-//
-// It will potentially replace the output byte slice pointed to.
-// After encoding, the out parameter contains the encoded contents.
-func NewEncoderBytes(out *[]byte, h Handle) *Encoder {
-	in := *out
-	if in == nil {
-		in = make([]byte, defEncByteBufSize)
-	}
-	z := bytesEncWriter{
-		b:   in,
-		out: out,
-	}
-	return &Encoder{w: &z, hh: h, h: h.getBasicHandle(), e: h.newEncDriver(&z)}
-}
-
-// Encode writes an object into a stream in the codec format.
-//
-// Encoding can be configured via the "codec" struct tag for the fields.
-//
-// The "codec" key in struct field's tag value is the key name,
-// followed by an optional comma and options.
-//
-// To set an option on all fields (e.g. omitempty on all fields), you
-// can create a field called _struct, and set flags on it.
-//
-// Struct values "usually" encode as maps. Each exported struct field is encoded unless:
-//    - the field's codec tag is "-", OR
-//    - the field is empty and its codec tag specifies the "omitempty" option.
-//
-// When encoding as a map, the first string in the tag (before the comma)
-// is the map key string to use when encoding.
-//
-// However, struct values may encode as arrays. This happens when:
-//    - StructToArray Encode option is set, OR
-//    - the codec tag on the _struct field sets the "toarray" option
-//
-// Values with types that implement MapBySlice are encoded as stream maps.
-//
-// The empty values (for omitempty option) are false, 0, any nil pointer
-// or interface value, and any array, slice, map, or string of length zero.
-//
-// Anonymous fields are encoded inline if no struct tag is present.
-// Else they are encoded as regular fields.
-//
-// Examples:
-//
-//      type MyStruct struct {
-//          _struct bool    `codec:",omitempty"`   //set omitempty for every field
-//          Field1 string   `codec:"-"`            //skip this field
-//          Field2 int      `codec:"myName"`       //Use key "myName" in encode stream
-//          Field3 int32    `codec:",omitempty"`   //use key "Field3". Omit if empty.
-//          Field4 bool     `codec:"f4,omitempty"` //use key "f4". Omit if empty.
-//          ...
-//      }
-//
-//      type MyStruct struct {
-//          _struct bool    `codec:",omitempty,toarray"`   //set omitempty for every field
-//                                                         //and encode struct as an array
-//      }
-//
-// The mode of encoding is based on the type of the value. When a value is seen:
-//   - If an extension is registered for it, call that extension function
-//   - If it implements BinaryMarshaler, call its MarshalBinary() (data []byte, err error)
-//   - Else encode it based on its reflect.Kind
-//
-// Note that struct field names and keys in map[string]XXX will be treated as symbols.
-// Some formats support symbols (e.g. binc) and will properly encode the string
-// only once in the stream, and use a tag to refer to it thereafter.
-func (e *Encoder) Encode(v interface{}) (err error) {
-	defer panicToErr(&err)
-	e.encode(v)
-	e.w.atEndOfEncode()
-	return
-}
-
-func (e *Encoder) encode(iv interface{}) {
-	switch v := iv.(type) {
-	case nil:
-		e.e.encodeNil()
-
-	case reflect.Value:
-		e.encodeValue(v)
-
-	case string:
-		e.e.encodeString(c_UTF8, v)
-	case bool:
-		e.e.encodeBool(v)
-	case int:
-		e.e.encodeInt(int64(v))
-	case int8:
-		e.e.encodeInt(int64(v))
-	case int16:
-		e.e.encodeInt(int64(v))
-	case int32:
-		e.e.encodeInt(int64(v))
-	case int64:
-		e.e.encodeInt(v)
-	case uint:
-		e.e.encodeUint(uint64(v))
-	case uint8:
-		e.e.encodeUint(uint64(v))
-	case uint16:
-		e.e.encodeUint(uint64(v))
-	case uint32:
-		e.e.encodeUint(uint64(v))
-	case uint64:
-		e.e.encodeUint(v)
-	case float32:
-		e.e.encodeFloat32(v)
-	case float64:
-		e.e.encodeFloat64(v)
-
-	case []interface{}:
-		e.encSliceIntf(v)
-	case []string:
-		e.encSliceStr(v)
-	case []int64:
-		e.encSliceInt64(v)
-	case []uint64:
-		e.encSliceUint64(v)
-	case []uint8:
-		e.e.encodeStringBytes(c_RAW, v)
-
-	case map[interface{}]interface{}:
-		e.encMapIntfIntf(v)
-	case map[string]interface{}:
-		e.encMapStrIntf(v)
-	case map[string]string:
-		e.encMapStrStr(v)
-	case map[int64]interface{}:
-		e.encMapInt64Intf(v)
-	case map[uint64]interface{}:
-		e.encMapUint64Intf(v)
-
-	case *string:
-		e.e.encodeString(c_UTF8, *v)
-	case *bool:
-		e.e.encodeBool(*v)
-	case *int:
-		e.e.encodeInt(int64(*v))
-	case *int8:
-		e.e.encodeInt(int64(*v))
-	case *int16:
-		e.e.encodeInt(int64(*v))
-	case *int32:
-		e.e.encodeInt(int64(*v))
-	case *int64:
-		e.e.encodeInt(*v)
-	case *uint:
-		e.e.encodeUint(uint64(*v))
-	case *uint8:
-		e.e.encodeUint(uint64(*v))
-	case *uint16:
-		e.e.encodeUint(uint64(*v))
-	case *uint32:
-		e.e.encodeUint(uint64(*v))
-	case *uint64:
-		e.e.encodeUint(*v)
-	case *float32:
-		e.e.encodeFloat32(*v)
-	case *float64:
-		e.e.encodeFloat64(*v)
-
-	case *[]interface{}:
-		e.encSliceIntf(*v)
-	case *[]string:
-		e.encSliceStr(*v)
-	case *[]int64:
-		e.encSliceInt64(*v)
-	case *[]uint64:
-		e.encSliceUint64(*v)
-	case *[]uint8:
-		e.e.encodeStringBytes(c_RAW, *v)
-
-	case *map[interface{}]interface{}:
-		e.encMapIntfIntf(*v)
-	case *map[string]interface{}:
-		e.encMapStrIntf(*v)
-	case *map[string]string:
-		e.encMapStrStr(*v)
-	case *map[int64]interface{}:
-		e.encMapInt64Intf(*v)
-	case *map[uint64]interface{}:
-		e.encMapUint64Intf(*v)
-
-	default:
-		e.encodeValue(reflect.ValueOf(iv))
-	}
-}
-
-func (e *Encoder) encodeValue(rv reflect.Value) {
-	for rv.Kind() == reflect.Ptr {
-		if rv.IsNil() {
-			e.e.encodeNil()
-			return
-		}
-		rv = rv.Elem()
-	}
-
-	rt := rv.Type()
-	rtid := reflect.ValueOf(rt).Pointer()
-
-	// if e.f == nil && e.s == nil { debugf("---->Creating new enc f map for type: %v\n", rt) }
-	var fn encFn
-	var ok bool
-	if useMapForCodecCache {
-		fn, ok = e.f[rtid]
-	} else {
-		for i, v := range e.x {
-			if v == rtid {
-				fn, ok = e.s[i], true
-				break
-			}
-		}
-	}
-	if !ok {
-		// debugf("\tCreating new enc fn for type: %v\n", rt)
-		fi := encFnInfo{ti: getTypeInfo(rtid, rt), e: e, ee: e.e}
-		fn.i = &fi
-		if rtid == rawExtTypId {
-			fn.f = (*encFnInfo).rawExt
-		} else if e.e.isBuiltinType(rtid) {
-			fn.f = (*encFnInfo).builtin
-		} else if xfTag, xfFn := e.h.getEncodeExt(rtid); xfFn != nil {
-			fi.xfTag, fi.xfFn = xfTag, xfFn
-			fn.f = (*encFnInfo).ext
-		} else if supportBinaryMarshal && fi.ti.m {
-			fn.f = (*encFnInfo).binaryMarshal
-		} else {
-			switch rk := rt.Kind(); rk {
-			case reflect.Bool:
-				fn.f = (*encFnInfo).kBool
-			case reflect.String:
-				fn.f = (*encFnInfo).kString
-			case reflect.Float64:
-				fn.f = (*encFnInfo).kFloat64
-			case reflect.Float32:
-				fn.f = (*encFnInfo).kFloat32
-			case reflect.Int, reflect.Int8, reflect.Int64, reflect.Int32, reflect.Int16:
-				fn.f = (*encFnInfo).kInt
-			case reflect.Uint8, reflect.Uint64, reflect.Uint, reflect.Uint32, reflect.Uint16:
-				fn.f = (*encFnInfo).kUint
-			case reflect.Invalid:
-				fn.f = (*encFnInfo).kInvalid
-			case reflect.Slice:
-				fn.f = (*encFnInfo).kSlice
-			case reflect.Array:
-				fn.f = (*encFnInfo).kArray
-			case reflect.Struct:
-				fn.f = (*encFnInfo).kStruct
-			// case reflect.Ptr:
-			// 	fn.f = (*encFnInfo).kPtr
-			case reflect.Interface:
-				fn.f = (*encFnInfo).kInterface
-			case reflect.Map:
-				fn.f = (*encFnInfo).kMap
-			default:
-				fn.f = (*encFnInfo).kErr
-			}
-		}
-		if useMapForCodecCache {
-			if e.f == nil {
-				e.f = make(map[uintptr]encFn, 16)
-			}
-			e.f[rtid] = fn
-		} else {
-			e.s = append(e.s, fn)
-			e.x = append(e.x, rtid)
-		}
-	}
-
-	fn.f(fn.i, rv)
-
-}
-
-func (e *Encoder) encRawExt(re RawExt) {
-	if re.Data == nil {
-		e.e.encodeNil()
-		return
-	}
-	if e.hh.writeExt() {
-		e.e.encodeExtPreamble(re.Tag, len(re.Data))
-		e.w.writeb(re.Data)
-	} else {
-		e.e.encodeStringBytes(c_RAW, re.Data)
-	}
-}
-
-// ---------------------------------------------
-// short circuit functions for common maps and slices
-
-func (e *Encoder) encSliceIntf(v []interface{}) {
-	e.e.encodeArrayPreamble(len(v))
-	for _, v2 := range v {
-		e.encode(v2)
-	}
-}
-
-func (e *Encoder) encSliceStr(v []string) {
-	e.e.encodeArrayPreamble(len(v))
-	for _, v2 := range v {
-		e.e.encodeString(c_UTF8, v2)
-	}
-}
-
-func (e *Encoder) encSliceInt64(v []int64) {
-	e.e.encodeArrayPreamble(len(v))
-	for _, v2 := range v {
-		e.e.encodeInt(v2)
-	}
-}
-
-func (e *Encoder) encSliceUint64(v []uint64) {
-	e.e.encodeArrayPreamble(len(v))
-	for _, v2 := range v {
-		e.e.encodeUint(v2)
-	}
-}
-
-func (e *Encoder) encMapStrStr(v map[string]string) {
-	e.e.encodeMapPreamble(len(v))
-	asSymbols := e.h.AsSymbols&AsSymbolMapStringKeysFlag != 0
-	for k2, v2 := range v {
-		if asSymbols {
-			e.e.encodeSymbol(k2)
-		} else {
-			e.e.encodeString(c_UTF8, k2)
-		}
-		e.e.encodeString(c_UTF8, v2)
-	}
-}
-
-func (e *Encoder) encMapStrIntf(v map[string]interface{}) {
-	e.e.encodeMapPreamble(len(v))
-	asSymbols := e.h.AsSymbols&AsSymbolMapStringKeysFlag != 0
-	for k2, v2 := range v {
-		if asSymbols {
-			e.e.encodeSymbol(k2)
-		} else {
-			e.e.encodeString(c_UTF8, k2)
-		}
-		e.encode(v2)
-	}
-}
-
-func (e *Encoder) encMapInt64Intf(v map[int64]interface{}) {
-	e.e.encodeMapPreamble(len(v))
-	for k2, v2 := range v {
-		e.e.encodeInt(k2)
-		e.encode(v2)
-	}
-}
-
-func (e *Encoder) encMapUint64Intf(v map[uint64]interface{}) {
-	e.e.encodeMapPreamble(len(v))
-	for k2, v2 := range v {
-		e.e.encodeUint(uint64(k2))
-		e.encode(v2)
-	}
-}
-
-func (e *Encoder) encMapIntfIntf(v map[interface{}]interface{}) {
-	e.e.encodeMapPreamble(len(v))
-	for k2, v2 := range v {
-		e.encode(k2)
-		e.encode(v2)
-	}
-}
-
-// ----------------------------------------
-
-func encErr(format string, params ...interface{}) {
-	doPanic(msgTagEnc, format, params...)
-}
diff --git a/Godeps/_workspace/src/github.com/hashicorp/go-msgpack/codec/ext_dep_test.go b/Godeps/_workspace/src/github.com/hashicorp/go-msgpack/codec/ext_dep_test.go
deleted file mode 100644
index bdf448d52..000000000
--- a/Godeps/_workspace/src/github.com/hashicorp/go-msgpack/codec/ext_dep_test.go
+++ /dev/null
@@ -1,75 +0,0 @@
-// //+build ignore
-
-// Copyright (c) 2012, 2013 Ugorji Nwoke. All rights reserved.
-// Use of this source code is governed by a BSD-style license found in the LICENSE file.
-
-package codec
-
-// This file includes benchmarks which have dependencies on 3rdparty
-// packages (bson and vmihailenco/msgpack) which must be installed locally.
-//
-// To run the benchmarks including these 3rdparty packages, first
-//   - Uncomment first line in this file (put // // in front of it)
-//   - Get those packages:
-//       go get github.com/vmihailenco/msgpack
-//       go get labix.org/v2/mgo/bson
-//   - Run:
-//       go test -bi -bench=.
-
-import (
-	"testing"
-
-	vmsgpack "gopkg.in/vmihailenco/msgpack.v2"
-	"labix.org/v2/mgo/bson"
-)
-
-func init() {
-	benchCheckers = append(benchCheckers,
-		benchChecker{"v-msgpack", fnVMsgpackEncodeFn, fnVMsgpackDecodeFn},
-		benchChecker{"bson", fnBsonEncodeFn, fnBsonDecodeFn},
-	)
-}
-
-func fnVMsgpackEncodeFn(ts interface{}) ([]byte, error) {
-	return vmsgpack.Marshal(ts)
-}
-
-func fnVMsgpackDecodeFn(buf []byte, ts interface{}) error {
-	return vmsgpack.Unmarshal(buf, ts)
-}
-
-func fnBsonEncodeFn(ts interface{}) ([]byte, error) {
-	return bson.Marshal(ts)
-}
-
-func fnBsonDecodeFn(buf []byte, ts interface{}) error {
-	return bson.Unmarshal(buf, ts)
-}
-
-func Benchmark__Bson_______Encode(b *testing.B) {
-	fnBenchmarkEncode(b, "bson", benchTs, fnBsonEncodeFn)
-}
-
-func Benchmark__Bson_______Decode(b *testing.B) {
-	fnBenchmarkDecode(b, "bson", benchTs, fnBsonEncodeFn, fnBsonDecodeFn, fnBenchNewTs)
-}
-
-func Benchmark__VMsgpack___Encode(b *testing.B) {
-	fnBenchmarkEncode(b, "v-msgpack", benchTs, fnVMsgpackEncodeFn)
-}
-
-func Benchmark__VMsgpack___Decode(b *testing.B) {
-	fnBenchmarkDecode(b, "v-msgpack", benchTs, fnVMsgpackEncodeFn, fnVMsgpackDecodeFn, fnBenchNewTs)
-}
-
-func TestMsgpackPythonGenStreams(t *testing.T) {
-	doTestMsgpackPythonGenStreams(t)
-}
-
-func TestMsgpackRpcSpecGoClientToPythonSvc(t *testing.T) {
-	doTestMsgpackRpcSpecGoClientToPythonSvc(t)
-}
-
-func TestMsgpackRpcSpecPythonClientToGoSvc(t *testing.T) {
-	doTestMsgpackRpcSpecPythonClientToGoSvc(t)
-}
diff --git a/Godeps/_workspace/src/github.com/hashicorp/go-msgpack/codec/helper.go b/Godeps/_workspace/src/github.com/hashicorp/go-msgpack/codec/helper.go
deleted file mode 100644
index e6dc0563f..000000000
--- a/Godeps/_workspace/src/github.com/hashicorp/go-msgpack/codec/helper.go
+++ /dev/null
@@ -1,589 +0,0 @@
-// Copyright (c) 2012, 2013 Ugorji Nwoke. All rights reserved.
-// Use of this source code is governed by a BSD-style license found in the LICENSE file.
-
-package codec
-
-// Contains code shared by both encode and decode.
-
-import (
-	"encoding/binary"
-	"fmt"
-	"math"
-	"reflect"
-	"sort"
-	"strings"
-	"sync"
-	"time"
-	"unicode"
-	"unicode/utf8"
-)
-
-const (
-	structTagName = "codec"
-
-	// Support
-	//    encoding.BinaryMarshaler: MarshalBinary() (data []byte, err error)
-	//    encoding.BinaryUnmarshaler: UnmarshalBinary(data []byte) error
-	// This constant flag will enable or disable it.
-	supportBinaryMarshal = true
-
-	// Each Encoder or Decoder uses a cache of functions based on conditionals,
-	// so that the conditionals are not run every time.
-	//
-	// Either a map or a slice is used to keep track of the functions.
-	// The map is more natural, but has a higher cost than a slice/array.
-	// This flag (useMapForCodecCache) controls which is used.
-	useMapForCodecCache = false
-
-	// For some common container types, we can short-circuit an elaborate
-	// reflection dance and call encode/decode directly.
-	// The currently supported types are:
-	//    - slices of strings, or id's (int64,uint64) or interfaces.
-	//    - maps of str->str, str->intf, id(int64,uint64)->intf, intf->intf
-	shortCircuitReflectToFastPath = true
-
-	// for debugging, set this to false, to catch panic traces.
-	// Note that this will always cause rpc tests to fail, since they need io.EOF sent via panic.
-	recoverPanicToErr = true
-)
-
-type charEncoding uint8
-
-const (
-	c_RAW charEncoding = iota
-	c_UTF8
-	c_UTF16LE
-	c_UTF16BE
-	c_UTF32LE
-	c_UTF32BE
-)
-
-// valueType is the stream type
-type valueType uint8
-
-const (
-	valueTypeUnset valueType = iota
-	valueTypeNil
-	valueTypeInt
-	valueTypeUint
-	valueTypeFloat
-	valueTypeBool
-	valueTypeString
-	valueTypeSymbol
-	valueTypeBytes
-	valueTypeMap
-	valueTypeArray
-	valueTypeTimestamp
-	valueTypeExt
-
-	valueTypeInvalid = 0xff
-)
-
-var (
-	bigen               = binary.BigEndian
-	structInfoFieldName = "_struct"
-
-	cachedTypeInfo      = make(map[uintptr]*typeInfo, 4)
-	cachedTypeInfoMutex sync.RWMutex
-
-	intfSliceTyp = reflect.TypeOf([]interface{}(nil))
-	intfTyp      = intfSliceTyp.Elem()
-
-	strSliceTyp     = reflect.TypeOf([]string(nil))
-	boolSliceTyp    = reflect.TypeOf([]bool(nil))
-	uintSliceTyp    = reflect.TypeOf([]uint(nil))
-	uint8SliceTyp   = reflect.TypeOf([]uint8(nil))
-	uint16SliceTyp  = reflect.TypeOf([]uint16(nil))
-	uint32SliceTyp  = reflect.TypeOf([]uint32(nil))
-	uint64SliceTyp  = reflect.TypeOf([]uint64(nil))
-	intSliceTyp     = reflect.TypeOf([]int(nil))
-	int8SliceTyp    = reflect.TypeOf([]int8(nil))
-	int16SliceTyp   = reflect.TypeOf([]int16(nil))
-	int32SliceTyp   = reflect.TypeOf([]int32(nil))
-	int64SliceTyp   = reflect.TypeOf([]int64(nil))
-	float32SliceTyp = reflect.TypeOf([]float32(nil))
-	float64SliceTyp = reflect.TypeOf([]float64(nil))
-
-	mapIntfIntfTyp = reflect.TypeOf(map[interface{}]interface{}(nil))
-	mapStrIntfTyp  = reflect.TypeOf(map[string]interface{}(nil))
-	mapStrStrTyp   = reflect.TypeOf(map[string]string(nil))
-
-	mapIntIntfTyp    = reflect.TypeOf(map[int]interface{}(nil))
-	mapInt64IntfTyp  = reflect.TypeOf(map[int64]interface{}(nil))
-	mapUintIntfTyp   = reflect.TypeOf(map[uint]interface{}(nil))
-	mapUint64IntfTyp = reflect.TypeOf(map[uint64]interface{}(nil))
-
-	stringTyp = reflect.TypeOf("")
-	timeTyp   = reflect.TypeOf(time.Time{})
-	rawExtTyp = reflect.TypeOf(RawExt{})
-
-	mapBySliceTyp        = reflect.TypeOf((*MapBySlice)(nil)).Elem()
-	binaryMarshalerTyp   = reflect.TypeOf((*binaryMarshaler)(nil)).Elem()
-	binaryUnmarshalerTyp = reflect.TypeOf((*binaryUnmarshaler)(nil)).Elem()
-
-	rawExtTypId = reflect.ValueOf(rawExtTyp).Pointer()
-	intfTypId   = reflect.ValueOf(intfTyp).Pointer()
-	timeTypId   = reflect.ValueOf(timeTyp).Pointer()
-
-	intfSliceTypId = reflect.ValueOf(intfSliceTyp).Pointer()
-	strSliceTypId  = reflect.ValueOf(strSliceTyp).Pointer()
-
-	boolSliceTypId    = reflect.ValueOf(boolSliceTyp).Pointer()
-	uintSliceTypId    = reflect.ValueOf(uintSliceTyp).Pointer()
-	uint8SliceTypId   = reflect.ValueOf(uint8SliceTyp).Pointer()
-	uint16SliceTypId  = reflect.ValueOf(uint16SliceTyp).Pointer()
-	uint32SliceTypId  = reflect.ValueOf(uint32SliceTyp).Pointer()
-	uint64SliceTypId  = reflect.ValueOf(uint64SliceTyp).Pointer()
-	intSliceTypId     = reflect.ValueOf(intSliceTyp).Pointer()
-	int8SliceTypId    = reflect.ValueOf(int8SliceTyp).Pointer()
-	int16SliceTypId   = reflect.ValueOf(int16SliceTyp).Pointer()
-	int32SliceTypId   = reflect.ValueOf(int32SliceTyp).Pointer()
-	int64SliceTypId   = reflect.ValueOf(int64SliceTyp).Pointer()
-	float32SliceTypId = reflect.ValueOf(float32SliceTyp).Pointer()
-	float64SliceTypId = reflect.ValueOf(float64SliceTyp).Pointer()
-
-	mapStrStrTypId     = reflect.ValueOf(mapStrStrTyp).Pointer()
-	mapIntfIntfTypId   = reflect.ValueOf(mapIntfIntfTyp).Pointer()
-	mapStrIntfTypId    = reflect.ValueOf(mapStrIntfTyp).Pointer()
-	mapIntIntfTypId    = reflect.ValueOf(mapIntIntfTyp).Pointer()
-	mapInt64IntfTypId  = reflect.ValueOf(mapInt64IntfTyp).Pointer()
-	mapUintIntfTypId   = reflect.ValueOf(mapUintIntfTyp).Pointer()
-	mapUint64IntfTypId = reflect.ValueOf(mapUint64IntfTyp).Pointer()
-	// Id = reflect.ValueOf().Pointer()
-	// mapBySliceTypId  = reflect.ValueOf(mapBySliceTyp).Pointer()
-
-	binaryMarshalerTypId   = reflect.ValueOf(binaryMarshalerTyp).Pointer()
-	binaryUnmarshalerTypId = reflect.ValueOf(binaryUnmarshalerTyp).Pointer()
-
-	intBitsize  uint8 = uint8(reflect.TypeOf(int(0)).Bits())
-	uintBitsize uint8 = uint8(reflect.TypeOf(uint(0)).Bits())
-
-	bsAll0x00 = []byte{0, 0, 0, 0, 0, 0, 0, 0}
-	bsAll0xff = []byte{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}
-)
-
-type binaryUnmarshaler interface {
-	UnmarshalBinary(data []byte) error
-}
-
-type binaryMarshaler interface {
-	MarshalBinary() (data []byte, err error)
-}
-
-// MapBySlice represents a slice which should be encoded as a map in the stream.
-// The slice contains a sequence of key-value pairs.
-type MapBySlice interface {
-	MapBySlice()
-}
-
-// WARNING: DO NOT USE DIRECTLY. EXPORTED FOR GODOC BENEFIT. WILL BE REMOVED.
-//
-// BasicHandle encapsulates the common options and extension functions.
-type BasicHandle struct {
-	extHandle
-	EncodeOptions
-	DecodeOptions
-}
-
-// Handle is the interface for a specific encoding format.
-//
-// Typically, a Handle is pre-configured before first time use,
-// and not modified while in use. Such a pre-configured Handle
-// is safe for concurrent access.
-type Handle interface {
-	writeExt() bool
-	getBasicHandle() *BasicHandle
-	newEncDriver(w encWriter) encDriver
-	newDecDriver(r decReader) decDriver
-}
-
-// RawExt represents raw unprocessed extension data.
-type RawExt struct {
-	Tag  byte
-	Data []byte
-}
-
-type extTypeTagFn struct {
-	rtid  uintptr
-	rt    reflect.Type
-	tag   byte
-	encFn func(reflect.Value) ([]byte, error)
-	decFn func(reflect.Value, []byte) error
-}
-
-type extHandle []*extTypeTagFn
-
-// AddExt registers an encode and decode function for a reflect.Type.
-// Note that the type must be a named type, and specifically not
-// a pointer or Interface. An error is returned if that is not honored.
-//
-// To Deregister an ext, call AddExt with 0 tag, nil encfn and nil decfn.
-func (o *extHandle) AddExt(
-	rt reflect.Type,
-	tag byte,
-	encfn func(reflect.Value) ([]byte, error),
-	decfn func(reflect.Value, []byte) error,
-) (err error) {
-	// o is a pointer, because we may need to initialize it
-	if rt.PkgPath() == "" || rt.Kind() == reflect.Interface {
-		err = fmt.Errorf("codec.Handle.AddExt: Takes named type, especially not a pointer or interface: %T",
-			reflect.Zero(rt).Interface())
-		return
-	}
-
-	// o cannot be nil, since it is always embedded in a Handle.
-	// if nil, let it panic.
-	// if o == nil {
-	// 	err = errors.New("codec.Handle.AddExt: extHandle cannot be a nil pointer.")
-	// 	return
-	// }
-
-	rtid := reflect.ValueOf(rt).Pointer()
-	for _, v := range *o {
-		if v.rtid == rtid {
-			v.tag, v.encFn, v.decFn = tag, encfn, decfn
-			return
-		}
-	}
-
-	*o = append(*o, &extTypeTagFn{rtid, rt, tag, encfn, decfn})
-	return
-}
-
-func (o extHandle) getExt(rtid uintptr) *extTypeTagFn {
-	for _, v := range o {
-		if v.rtid == rtid {
-			return v
-		}
-	}
-	return nil
-}
-
-func (o extHandle) getExtForTag(tag byte) *extTypeTagFn {
-	for _, v := range o {
-		if v.tag == tag {
-			return v
-		}
-	}
-	return nil
-}
-
-func (o extHandle) getDecodeExtForTag(tag byte) (
-	rv reflect.Value, fn func(reflect.Value, []byte) error) {
-	if x := o.getExtForTag(tag); x != nil {
-		// ext is only registered for base
-		rv = reflect.New(x.rt).Elem()
-		fn = x.decFn
-	}
-	return
-}
-
-func (o extHandle) getDecodeExt(rtid uintptr) (tag byte, fn func(reflect.Value, []byte) error) {
-	if x := o.getExt(rtid); x != nil {
-		tag = x.tag
-		fn = x.decFn
-	}
-	return
-}
-
-func (o extHandle) getEncodeExt(rtid uintptr) (tag byte, fn func(reflect.Value) ([]byte, error)) {
-	if x := o.getExt(rtid); x != nil {
-		tag = x.tag
-		fn = x.encFn
-	}
-	return
-}
-
-type structFieldInfo struct {
-	encName string // encode name
-
-	// only one of 'i' or 'is' can be set. If 'i' is -1, then 'is' has been set.
-
-	is        []int // (recursive/embedded) field index in struct
-	i         int16 // field index in struct
-	omitEmpty bool
-	toArray   bool // if field is _struct, is the toArray set?
-
-	// tag       string   // tag
-	// name      string   // field name
-	// encNameBs []byte   // encoded name as byte stream
-	// ikind     int      // kind of the field as an int i.e. int(reflect.Kind)
-}
-
-func parseStructFieldInfo(fname string, stag string) *structFieldInfo {
-	if fname == "" {
-		panic("parseStructFieldInfo: No Field Name")
-	}
-	si := structFieldInfo{
-		// name: fname,
-		encName: fname,
-		// tag: stag,
-	}
-
-	if stag != "" {
-		for i, s := range strings.Split(stag, ",") {
-			if i == 0 {
-				if s != "" {
-					si.encName = s
-				}
-			} else {
-				switch s {
-				case "omitempty":
-					si.omitEmpty = true
-				case "toarray":
-					si.toArray = true
-				}
-			}
-		}
-	}
-	// si.encNameBs = []byte(si.encName)
-	return &si
-}
-
-type sfiSortedByEncName []*structFieldInfo
-
-func (p sfiSortedByEncName) Len() int {
-	return len(p)
-}
-
-func (p sfiSortedByEncName) Less(i, j int) bool {
-	return p[i].encName < p[j].encName
-}
-
-func (p sfiSortedByEncName) Swap(i, j int) {
-	p[i], p[j] = p[j], p[i]
-}
-
-// typeInfo keeps information about each type referenced in the encode/decode sequence.
-//
-// During an encode/decode sequence, we work as below:
-//   - If base is a built in type, en/decode base value
-//   - If base is registered as an extension, en/decode base value
-//   - If type is binary(M/Unm)arshaler, call Binary(M/Unm)arshal method
-//   - Else decode appropriately based on the reflect.Kind
-type typeInfo struct {
-	sfi  []*structFieldInfo // sorted. Used when enc/dec struct to map.
-	sfip []*structFieldInfo // unsorted. Used when enc/dec struct to array.
-
-	rt   reflect.Type
-	rtid uintptr
-
-	// baseId gives pointer to the base reflect.Type, after deferencing
-	// the pointers. E.g. base type of ***time.Time is time.Time.
-	base      reflect.Type
-	baseId    uintptr
-	baseIndir int8 // number of indirections to get to base
-
-	mbs bool // base type (T or *T) is a MapBySlice
-
-	m        bool // base type (T or *T) is a binaryMarshaler
-	unm      bool // base type (T or *T) is a binaryUnmarshaler
-	mIndir   int8 // number of indirections to get to binaryMarshaler type
-	unmIndir int8 // number of indirections to get to binaryUnmarshaler type
-	toArray  bool // whether this (struct) type should be encoded as an array
-}
-
-func (ti *typeInfo) indexForEncName(name string) int {
-	//tisfi := ti.sfi
-	const binarySearchThreshold = 16
-	if sfilen := len(ti.sfi); sfilen < binarySearchThreshold {
-		// linear search. faster than binary search in my testing up to 16-field structs.
-		for i, si := range ti.sfi {
-			if si.encName == name {
-				return i
-			}
-		}
-	} else {
-		// binary search. adapted from sort/search.go.
-		h, i, j := 0, 0, sfilen
-		for i < j {
-			h = i + (j-i)/2
-			if ti.sfi[h].encName < name {
-				i = h + 1
-			} else {
-				j = h
-			}
-		}
-		if i < sfilen && ti.sfi[i].encName == name {
-			return i
-		}
-	}
-	return -1
-}
-
-func getTypeInfo(rtid uintptr, rt reflect.Type) (pti *typeInfo) {
-	var ok bool
-	cachedTypeInfoMutex.RLock()
-	pti, ok = cachedTypeInfo[rtid]
-	cachedTypeInfoMutex.RUnlock()
-	if ok {
-		return
-	}
-
-	cachedTypeInfoMutex.Lock()
-	defer cachedTypeInfoMutex.Unlock()
-	if pti, ok = cachedTypeInfo[rtid]; ok {
-		return
-	}
-
-	ti := typeInfo{rt: rt, rtid: rtid}
-	pti = &ti
-
-	var indir int8
-	if ok, indir = implementsIntf(rt, binaryMarshalerTyp); ok {
-		ti.m, ti.mIndir = true, indir
-	}
-	if ok, indir = implementsIntf(rt, binaryUnmarshalerTyp); ok {
-		ti.unm, ti.unmIndir = true, indir
-	}
-	if ok, _ = implementsIntf(rt, mapBySliceTyp); ok {
-		ti.mbs = true
-	}
-
-	pt := rt
-	var ptIndir int8
-	// for ; pt.Kind() == reflect.Ptr; pt, ptIndir = pt.Elem(), ptIndir+1 { }
-	for pt.Kind() == reflect.Ptr {
-		pt = pt.Elem()
-		ptIndir++
-	}
-	if ptIndir == 0 {
-		ti.base = rt
-		ti.baseId = rtid
-	} else {
-		ti.base = pt
-		ti.baseId = reflect.ValueOf(pt).Pointer()
-		ti.baseIndir = ptIndir
-	}
-
-	if rt.Kind() == reflect.Struct {
-		var siInfo *structFieldInfo
-		if f, ok := rt.FieldByName(structInfoFieldName); ok {
-			siInfo = parseStructFieldInfo(structInfoFieldName, f.Tag.Get(structTagName))
-			ti.toArray = siInfo.toArray
-		}
-		sfip := make([]*structFieldInfo, 0, rt.NumField())
-		rgetTypeInfo(rt, nil, make(map[string]bool), &sfip, siInfo)
-
-		// // try to put all si close together
-		// const tryToPutAllStructFieldInfoTogether = true
-		// if tryToPutAllStructFieldInfoTogether {
-		// 	sfip2 := make([]structFieldInfo, len(sfip))
-		// 	for i, si := range sfip {
-		// 		sfip2[i] = *si
-		// 	}
-		// 	for i := range sfip {
-		// 		sfip[i] = &sfip2[i]
-		// 	}
-		// }
-
-		ti.sfip = make([]*structFieldInfo, len(sfip))
-		ti.sfi = make([]*structFieldInfo, len(sfip))
-		copy(ti.sfip, sfip)
-		sort.Sort(sfiSortedByEncName(sfip))
-		copy(ti.sfi, sfip)
-	}
-	// sfi = sfip
-	cachedTypeInfo[rtid] = pti
-	return
-}
-
-func rgetTypeInfo(rt reflect.Type, indexstack []int, fnameToHastag map[string]bool,
-	sfi *[]*structFieldInfo, siInfo *structFieldInfo,
-) {
-	// for rt.Kind() == reflect.Ptr {
-	// 	// indexstack = append(indexstack, 0)
-	// 	rt = rt.Elem()
-	// }
-	for j := 0; j < rt.NumField(); j++ {
-		f := rt.Field(j)
-		stag := f.Tag.Get(structTagName)
-		if stag == "-" {
-			continue
-		}
-		if r1, _ := utf8.DecodeRuneInString(f.Name); r1 == utf8.RuneError || !unicode.IsUpper(r1) {
-			continue
-		}
-		// if anonymous and there is no struct tag and its a struct (or pointer to struct), inline it.
-		if f.Anonymous && stag == "" {
-			ft := f.Type
-			for ft.Kind() == reflect.Ptr {
-				ft = ft.Elem()
-			}
-			if ft.Kind() == reflect.Struct {
-				indexstack2 := append(append(make([]int, 0, len(indexstack)+4), indexstack...), j)
-				rgetTypeInfo(ft, indexstack2, fnameToHastag, sfi, siInfo)
-				continue
-			}
-		}
-		// do not let fields with same name in embedded structs override field at higher level.
-		// this must be done after anonymous check, to allow anonymous field
-		// still include their child fields
-		if _, ok := fnameToHastag[f.Name]; ok {
-			continue
-		}
-		si := parseStructFieldInfo(f.Name, stag)
-		// si.ikind = int(f.Type.Kind())
-		if len(indexstack) == 0 {
-			si.i = int16(j)
-		} else {
-			si.i = -1
-			si.is = append(append(make([]int, 0, len(indexstack)+4), indexstack...), j)
-		}
-
-		if siInfo != nil {
-			if siInfo.omitEmpty {
-				si.omitEmpty = true
-			}
-		}
-		*sfi = append(*sfi, si)
-		fnameToHastag[f.Name] = stag != ""
-	}
-}
-
-func panicToErr(err *error) {
-	if recoverPanicToErr {
-		if x := recover(); x != nil {
-			//debug.PrintStack()
-			panicValToErr(x, err)
-		}
-	}
-}
-
-func doPanic(tag string, format string, params ...interface{}) {
-	params2 := make([]interface{}, len(params)+1)
-	params2[0] = tag
-	copy(params2[1:], params)
-	panic(fmt.Errorf("%s: "+format, params2...))
-}
-
-func checkOverflowFloat32(f float64, doCheck bool) {
-	if !doCheck {
-		return
-	}
-	// check overflow (logic adapted from std pkg reflect/value.go OverflowFloat()
-	f2 := f
-	if f2 < 0 {
-		f2 = -f
-	}
-	if math.MaxFloat32 < f2 && f2 <= math.MaxFloat64 {
-		decErr("Overflow float32 value: %v", f2)
-	}
-}
-
-func checkOverflow(ui uint64, i int64, bitsize uint8) {
-	// check overflow (logic adapted from std pkg reflect/value.go OverflowUint()
-	if bitsize == 0 {
-		return
-	}
-	if i != 0 {
-		if trunc := (i << (64 - bitsize)) >> (64 - bitsize); i != trunc {
-			decErr("Overflow int value: %v", i)
-		}
-	}
-	if ui != 0 {
-		if trunc := (ui << (64 - bitsize)) >> (64 - bitsize); ui != trunc {
-			decErr("Overflow uint value: %v", ui)
-		}
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/hashicorp/go-msgpack/codec/helper_internal.go b/Godeps/_workspace/src/github.com/hashicorp/go-msgpack/codec/helper_internal.go
deleted file mode 100644
index 58417da95..000000000
--- a/Godeps/_workspace/src/github.com/hashicorp/go-msgpack/codec/helper_internal.go
+++ /dev/null
@@ -1,127 +0,0 @@
-// Copyright (c) 2012, 2013 Ugorji Nwoke. All rights reserved.
-// Use of this source code is governed by a BSD-style license found in the LICENSE file.
-
-package codec
-
-// All non-std package dependencies live in this file,
-// so porting to different environment is easy (just update functions).
-
-import (
-	"errors"
-	"fmt"
-	"math"
-	"reflect"
-)
-
-var (
-	raisePanicAfterRecover = false
-	debugging              = true
-)
-
-func panicValToErr(panicVal interface{}, err *error) {
-	switch xerr := panicVal.(type) {
-	case error:
-		*err = xerr
-	case string:
-		*err = errors.New(xerr)
-	default:
-		*err = fmt.Errorf("%v", panicVal)
-	}
-	if raisePanicAfterRecover {
-		panic(panicVal)
-	}
-	return
-}
-
-func isEmptyValueDeref(v reflect.Value, deref bool) bool {
-	switch v.Kind() {
-	case reflect.Array, reflect.Map, reflect.Slice, reflect.String:
-		return v.Len() == 0
-	case reflect.Bool:
-		return !v.Bool()
-	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
-		return v.Int() == 0
-	case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uintptr:
-		return v.Uint() == 0
-	case reflect.Float32, reflect.Float64:
-		return v.Float() == 0
-	case reflect.Interface, reflect.Ptr:
-		if deref {
-			if v.IsNil() {
-				return true
-			}
-			return isEmptyValueDeref(v.Elem(), deref)
-		} else {
-			return v.IsNil()
-		}
-	case reflect.Struct:
-		// return true if all fields are empty. else return false.
-
-		// we cannot use equality check, because some fields may be maps/slices/etc
-		// and consequently the structs are not comparable.
-		// return v.Interface() == reflect.Zero(v.Type()).Interface()
-		for i, n := 0, v.NumField(); i < n; i++ {
-			if !isEmptyValueDeref(v.Field(i), deref) {
-				return false
-			}
-		}
-		return true
-	}
-	return false
-}
-
-func isEmptyValue(v reflect.Value) bool {
-	return isEmptyValueDeref(v, true)
-}
-
-func debugf(format string, args ...interface{}) {
-	if debugging {
-		if len(format) == 0 || format[len(format)-1] != '\n' {
-			format = format + "\n"
-		}
-		fmt.Printf(format, args...)
-	}
-}
-
-func pruneSignExt(v []byte, pos bool) (n int) {
-	if len(v) < 2 {
-	} else if pos && v[0] == 0 {
-		for ; v[n] == 0 && n+1 < len(v) && (v[n+1]&(1<<7) == 0); n++ {
-		}
-	} else if !pos && v[0] == 0xff {
-		for ; v[n] == 0xff && n+1 < len(v) && (v[n+1]&(1<<7) != 0); n++ {
-		}
-	}
-	return
-}
-
-func implementsIntf(typ, iTyp reflect.Type) (success bool, indir int8) {
-	if typ == nil {
-		return
-	}
-	rt := typ
-	// The type might be a pointer and we need to keep
-	// dereferencing to the base type until we find an implementation.
-	for {
-		if rt.Implements(iTyp) {
-			return true, indir
-		}
-		if p := rt; p.Kind() == reflect.Ptr {
-			indir++
-			if indir >= math.MaxInt8 { // insane number of indirections
-				return false, 0
-			}
-			rt = p.Elem()
-			continue
-		}
-		break
-	}
-	// No luck yet, but if this is a base type (non-pointer), the pointer might satisfy.
-	if typ.Kind() != reflect.Ptr {
-		// Not a pointer, but does the pointer work?
-		if reflect.PtrTo(typ).Implements(iTyp) {
-			return true, -1
-		}
-	}
-	return false, 0
-}
diff --git a/Godeps/_workspace/src/github.com/hashicorp/go-msgpack/codec/msgpack.go b/Godeps/_workspace/src/github.com/hashicorp/go-msgpack/codec/msgpack.go
deleted file mode 100644
index da0500d19..000000000
--- a/Godeps/_workspace/src/github.com/hashicorp/go-msgpack/codec/msgpack.go
+++ /dev/null
@@ -1,816 +0,0 @@
-// Copyright (c) 2012, 2013 Ugorji Nwoke. All rights reserved.
-// Use of this source code is governed by a BSD-style license found in the LICENSE file.
-
-/*
-MSGPACK
-
-Msgpack-c implementation powers the c, c++, python, ruby, etc libraries.
-We need to maintain compatibility with it and how it encodes integer values
-without caring about the type.
-
-For compatibility with behaviour of msgpack-c reference implementation:
-  - Go intX (>0) and uintX
-       IS ENCODED AS
-    msgpack +ve fixnum, unsigned
-  - Go intX (<0)
-       IS ENCODED AS
-    msgpack -ve fixnum, signed
-
-*/
-package codec
-
-import (
-	"fmt"
-	"io"
-	"math"
-	"net/rpc"
-)
-
-const (
-	mpPosFixNumMin byte = 0x00
-	mpPosFixNumMax      = 0x7f
-	mpFixMapMin         = 0x80
-	mpFixMapMax         = 0x8f
-	mpFixArrayMin       = 0x90
-	mpFixArrayMax       = 0x9f
-	mpFixStrMin         = 0xa0
-	mpFixStrMax         = 0xbf
-	mpNil               = 0xc0
-	_                   = 0xc1
-	mpFalse             = 0xc2
-	mpTrue              = 0xc3
-	mpFloat             = 0xca
-	mpDouble            = 0xcb
-	mpUint8             = 0xcc
-	mpUint16            = 0xcd
-	mpUint32            = 0xce
-	mpUint64            = 0xcf
-	mpInt8              = 0xd0
-	mpInt16             = 0xd1
-	mpInt32             = 0xd2
-	mpInt64             = 0xd3
-
-	// extensions below
-	mpBin8     = 0xc4
-	mpBin16    = 0xc5
-	mpBin32    = 0xc6
-	mpExt8     = 0xc7
-	mpExt16    = 0xc8
-	mpExt32    = 0xc9
-	mpFixExt1  = 0xd4
-	mpFixExt2  = 0xd5
-	mpFixExt4  = 0xd6
-	mpFixExt8  = 0xd7
-	mpFixExt16 = 0xd8
-
-	mpStr8  = 0xd9 // new
-	mpStr16 = 0xda
-	mpStr32 = 0xdb
-
-	mpArray16 = 0xdc
-	mpArray32 = 0xdd
-
-	mpMap16 = 0xde
-	mpMap32 = 0xdf
-
-	mpNegFixNumMin = 0xe0
-	mpNegFixNumMax = 0xff
-)
-
-// MsgpackSpecRpcMultiArgs is a special type which signifies to the MsgpackSpecRpcCodec
-// that the backend RPC service takes multiple arguments, which have been arranged
-// in sequence in the slice.
-//
-// The Codec then passes it AS-IS to the rpc service (without wrapping it in an
-// array of 1 element).
-type MsgpackSpecRpcMultiArgs []interface{}
-
-// A MsgpackContainer type specifies the different types of msgpackContainers.
-type msgpackContainerType struct {
-	fixCutoff                   int
-	bFixMin, b8, b16, b32       byte
-	hasFixMin, has8, has8Always bool
-}
-
-var (
-	msgpackContainerStr  = msgpackContainerType{32, mpFixStrMin, mpStr8, mpStr16, mpStr32, true, true, false}
-	msgpackContainerBin  = msgpackContainerType{0, 0, mpBin8, mpBin16, mpBin32, false, true, true}
-	msgpackContainerList = msgpackContainerType{16, mpFixArrayMin, 0, mpArray16, mpArray32, true, false, false}
-	msgpackContainerMap  = msgpackContainerType{16, mpFixMapMin, 0, mpMap16, mpMap32, true, false, false}
-)
-
-//---------------------------------------------
-
-type msgpackEncDriver struct {
-	w encWriter
-	h *MsgpackHandle
-}
-
-func (e *msgpackEncDriver) isBuiltinType(rt uintptr) bool {
-	//no builtin types. All encodings are based on kinds. Types supported as extensions.
-	return false
-}
-
-func (e *msgpackEncDriver) encodeBuiltin(rt uintptr, v interface{}) {}
-
-func (e *msgpackEncDriver) encodeNil() {
-	e.w.writen1(mpNil)
-}
-
-func (e *msgpackEncDriver) encodeInt(i int64) {
-
-	switch {
-	case i >= 0:
-		e.encodeUint(uint64(i))
-	case i >= -32:
-		e.w.writen1(byte(i))
-	case i >= math.MinInt8:
-		e.w.writen2(mpInt8, byte(i))
-	case i >= math.MinInt16:
-		e.w.writen1(mpInt16)
-		e.w.writeUint16(uint16(i))
-	case i >= math.MinInt32:
-		e.w.writen1(mpInt32)
-		e.w.writeUint32(uint32(i))
-	default:
-		e.w.writen1(mpInt64)
-		e.w.writeUint64(uint64(i))
-	}
-}
-
-func (e *msgpackEncDriver) encodeUint(i uint64) {
-	switch {
-	case i <= math.MaxInt8:
-		e.w.writen1(byte(i))
-	case i <= math.MaxUint8:
-		e.w.writen2(mpUint8, byte(i))
-	case i <= math.MaxUint16:
-		e.w.writen1(mpUint16)
-		e.w.writeUint16(uint16(i))
-	case i <= math.MaxUint32:
-		e.w.writen1(mpUint32)
-		e.w.writeUint32(uint32(i))
-	default:
-		e.w.writen1(mpUint64)
-		e.w.writeUint64(uint64(i))
-	}
-}
-
-func (e *msgpackEncDriver) encodeBool(b bool) {
-	if b {
-		e.w.writen1(mpTrue)
-	} else {
-		e.w.writen1(mpFalse)
-	}
-}
-
-func (e *msgpackEncDriver) encodeFloat32(f float32) {
-	e.w.writen1(mpFloat)
-	e.w.writeUint32(math.Float32bits(f))
-}
-
-func (e *msgpackEncDriver) encodeFloat64(f float64) {
-	e.w.writen1(mpDouble)
-	e.w.writeUint64(math.Float64bits(f))
-}
-
-func (e *msgpackEncDriver) encodeExtPreamble(xtag byte, l int) {
-	switch {
-	case l == 1:
-		e.w.writen2(mpFixExt1, xtag)
-	case l == 2:
-		e.w.writen2(mpFixExt2, xtag)
-	case l == 4:
-		e.w.writen2(mpFixExt4, xtag)
-	case l == 8:
-		e.w.writen2(mpFixExt8, xtag)
-	case l == 16:
-		e.w.writen2(mpFixExt16, xtag)
-	case l < 256:
-		e.w.writen2(mpExt8, byte(l))
-		e.w.writen1(xtag)
-	case l < 65536:
-		e.w.writen1(mpExt16)
-		e.w.writeUint16(uint16(l))
-		e.w.writen1(xtag)
-	default:
-		e.w.writen1(mpExt32)
-		e.w.writeUint32(uint32(l))
-		e.w.writen1(xtag)
-	}
-}
-
-func (e *msgpackEncDriver) encodeArrayPreamble(length int) {
-	e.writeContainerLen(msgpackContainerList, length)
-}
-
-func (e *msgpackEncDriver) encodeMapPreamble(length int) {
-	e.writeContainerLen(msgpackContainerMap, length)
-}
-
-func (e *msgpackEncDriver) encodeString(c charEncoding, s string) {
-	if c == c_RAW && e.h.WriteExt {
-		e.writeContainerLen(msgpackContainerBin, len(s))
-	} else {
-		e.writeContainerLen(msgpackContainerStr, len(s))
-	}
-	if len(s) > 0 {
-		e.w.writestr(s)
-	}
-}
-
-func (e *msgpackEncDriver) encodeSymbol(v string) {
-	e.encodeString(c_UTF8, v)
-}
-
-func (e *msgpackEncDriver) encodeStringBytes(c charEncoding, bs []byte) {
-	if c == c_RAW && e.h.WriteExt {
-		e.writeContainerLen(msgpackContainerBin, len(bs))
-	} else {
-		e.writeContainerLen(msgpackContainerStr, len(bs))
-	}
-	if len(bs) > 0 {
-		e.w.writeb(bs)
-	}
-}
-
-func (e *msgpackEncDriver) writeContainerLen(ct msgpackContainerType, l int) {
-	switch {
-	case ct.hasFixMin && l < ct.fixCutoff:
-		e.w.writen1(ct.bFixMin | byte(l))
-	case ct.has8 && l < 256 && (ct.has8Always || e.h.WriteExt):
-		e.w.writen2(ct.b8, uint8(l))
-	case l < 65536:
-		e.w.writen1(ct.b16)
-		e.w.writeUint16(uint16(l))
-	default:
-		e.w.writen1(ct.b32)
-		e.w.writeUint32(uint32(l))
-	}
-}
-
-//---------------------------------------------
-
-type msgpackDecDriver struct {
-	r      decReader
-	h      *MsgpackHandle
-	bd     byte
-	bdRead bool
-	bdType valueType
-}
-
-func (d *msgpackDecDriver) isBuiltinType(rt uintptr) bool {
-	//no builtin types. All encodings are based on kinds. Types supported as extensions.
-	return false
-}
-
-func (d *msgpackDecDriver) decodeBuiltin(rt uintptr, v interface{}) {}
-
-// Note: This returns either a primitive (int, bool, etc) for non-containers,
-// or a containerType, or a specific type denoting nil or extension.
-// It is called when a nil interface{} is passed, leaving it up to the DecDriver
-// to introspect the stream and decide how best to decode.
-// It deciphers the value by looking at the stream first.
-func (d *msgpackDecDriver) decodeNaked() (v interface{}, vt valueType, decodeFurther bool) {
-	d.initReadNext()
-	bd := d.bd
-
-	switch bd {
-	case mpNil:
-		vt = valueTypeNil
-		d.bdRead = false
-	case mpFalse:
-		vt = valueTypeBool
-		v = false
-	case mpTrue:
-		vt = valueTypeBool
-		v = true
-
-	case mpFloat:
-		vt = valueTypeFloat
-		v = float64(math.Float32frombits(d.r.readUint32()))
-	case mpDouble:
-		vt = valueTypeFloat
-		v = math.Float64frombits(d.r.readUint64())
-
-	case mpUint8:
-		vt = valueTypeUint
-		v = uint64(d.r.readn1())
-	case mpUint16:
-		vt = valueTypeUint
-		v = uint64(d.r.readUint16())
-	case mpUint32:
-		vt = valueTypeUint
-		v = uint64(d.r.readUint32())
-	case mpUint64:
-		vt = valueTypeUint
-		v = uint64(d.r.readUint64())
-
-	case mpInt8:
-		vt = valueTypeInt
-		v = int64(int8(d.r.readn1()))
-	case mpInt16:
-		vt = valueTypeInt
-		v = int64(int16(d.r.readUint16()))
-	case mpInt32:
-		vt = valueTypeInt
-		v = int64(int32(d.r.readUint32()))
-	case mpInt64:
-		vt = valueTypeInt
-		v = int64(int64(d.r.readUint64()))
-
-	default:
-		switch {
-		case bd >= mpPosFixNumMin && bd <= mpPosFixNumMax:
-			// positive fixnum (always signed)
-			vt = valueTypeInt
-			v = int64(int8(bd))
-		case bd >= mpNegFixNumMin && bd <= mpNegFixNumMax:
-			// negative fixnum
-			vt = valueTypeInt
-			v = int64(int8(bd))
-		case bd == mpStr8, bd == mpStr16, bd == mpStr32, bd >= mpFixStrMin && bd <= mpFixStrMax:
-			if d.h.RawToString {
-				var rvm string
-				vt = valueTypeString
-				v = &rvm
-			} else {
-				var rvm = []byte{}
-				vt = valueTypeBytes
-				v = &rvm
-			}
-			decodeFurther = true
-		case bd == mpBin8, bd == mpBin16, bd == mpBin32:
-			var rvm = []byte{}
-			vt = valueTypeBytes
-			v = &rvm
-			decodeFurther = true
-		case bd == mpArray16, bd == mpArray32, bd >= mpFixArrayMin && bd <= mpFixArrayMax:
-			vt = valueTypeArray
-			decodeFurther = true
-		case bd == mpMap16, bd == mpMap32, bd >= mpFixMapMin && bd <= mpFixMapMax:
-			vt = valueTypeMap
-			decodeFurther = true
-		case bd >= mpFixExt1 && bd <= mpFixExt16, bd >= mpExt8 && bd <= mpExt32:
-			clen := d.readExtLen()
-			var re RawExt
-			re.Tag = d.r.readn1()
-			re.Data = d.r.readn(clen)
-			v = &re
-			vt = valueTypeExt
-		default:
-			decErr("Nil-Deciphered DecodeValue: %s: hex: %x, dec: %d", msgBadDesc, bd, bd)
-		}
-	}
-	if !decodeFurther {
-		d.bdRead = false
-	}
-	return
-}
-
-// int can be decoded from msgpack type: intXXX or uintXXX
-func (d *msgpackDecDriver) decodeInt(bitsize uint8) (i int64) {
-	switch d.bd {
-	case mpUint8:
-		i = int64(uint64(d.r.readn1()))
-	case mpUint16:
-		i = int64(uint64(d.r.readUint16()))
-	case mpUint32:
-		i = int64(uint64(d.r.readUint32()))
-	case mpUint64:
-		i = int64(d.r.readUint64())
-	case mpInt8:
-		i = int64(int8(d.r.readn1()))
-	case mpInt16:
-		i = int64(int16(d.r.readUint16()))
-	case mpInt32:
-		i = int64(int32(d.r.readUint32()))
-	case mpInt64:
-		i = int64(d.r.readUint64())
-	default:
-		switch {
-		case d.bd >= mpPosFixNumMin && d.bd <= mpPosFixNumMax:
-			i = int64(int8(d.bd))
-		case d.bd >= mpNegFixNumMin && d.bd <= mpNegFixNumMax:
-			i = int64(int8(d.bd))
-		default:
-			decErr("Unhandled single-byte unsigned integer value: %s: %x", msgBadDesc, d.bd)
-		}
-	}
-	// check overflow (logic adapted from std pkg reflect/value.go OverflowUint()
-	if bitsize > 0 {
-		if trunc := (i << (64 - bitsize)) >> (64 - bitsize); i != trunc {
-			decErr("Overflow int value: %v", i)
-		}
-	}
-	d.bdRead = false
-	return
-}
-
-// uint can be decoded from msgpack type: intXXX or uintXXX
-func (d *msgpackDecDriver) decodeUint(bitsize uint8) (ui uint64) {
-	switch d.bd {
-	case mpUint8:
-		ui = uint64(d.r.readn1())
-	case mpUint16:
-		ui = uint64(d.r.readUint16())
-	case mpUint32:
-		ui = uint64(d.r.readUint32())
-	case mpUint64:
-		ui = d.r.readUint64()
-	case mpInt8:
-		if i := int64(int8(d.r.readn1())); i >= 0 {
-			ui = uint64(i)
-		} else {
-			decErr("Assigning negative signed value: %v, to unsigned type", i)
-		}
-	case mpInt16:
-		if i := int64(int16(d.r.readUint16())); i >= 0 {
-			ui = uint64(i)
-		} else {
-			decErr("Assigning negative signed value: %v, to unsigned type", i)
-		}
-	case mpInt32:
-		if i := int64(int32(d.r.readUint32())); i >= 0 {
-			ui = uint64(i)
-		} else {
-			decErr("Assigning negative signed value: %v, to unsigned type", i)
-		}
-	case mpInt64:
-		if i := int64(d.r.readUint64()); i >= 0 {
-			ui = uint64(i)
-		} else {
-			decErr("Assigning negative signed value: %v, to unsigned type", i)
-		}
-	default:
-		switch {
-		case d.bd >= mpPosFixNumMin && d.bd <= mpPosFixNumMax:
-			ui = uint64(d.bd)
-		case d.bd >= mpNegFixNumMin && d.bd <= mpNegFixNumMax:
-			decErr("Assigning negative signed value: %v, to unsigned type", int(d.bd))
-		default:
-			decErr("Unhandled single-byte unsigned integer value: %s: %x", msgBadDesc, d.bd)
-		}
-	}
-	// check overflow (logic adapted from std pkg reflect/value.go OverflowUint()
-	if bitsize > 0 {
-		if trunc := (ui << (64 - bitsize)) >> (64 - bitsize); ui != trunc {
-			decErr("Overflow uint value: %v", ui)
-		}
-	}
-	d.bdRead = false
-	return
-}
-
-// float can either be decoded from msgpack type: float, double or intX
-func (d *msgpackDecDriver) decodeFloat(chkOverflow32 bool) (f float64) {
-	switch d.bd {
-	case mpFloat:
-		f = float64(math.Float32frombits(d.r.readUint32()))
-	case mpDouble:
-		f = math.Float64frombits(d.r.readUint64())
-	default:
-		f = float64(d.decodeInt(0))
-	}
-	checkOverflowFloat32(f, chkOverflow32)
-	d.bdRead = false
-	return
-}
-
-// bool can be decoded from bool, fixnum 0 or 1.
-func (d *msgpackDecDriver) decodeBool() (b bool) {
-	switch d.bd {
-	case mpFalse, 0:
-		// b = false
-	case mpTrue, 1:
-		b = true
-	default:
-		decErr("Invalid single-byte value for bool: %s: %x", msgBadDesc, d.bd)
-	}
-	d.bdRead = false
-	return
-}
-
-func (d *msgpackDecDriver) decodeString() (s string) {
-	clen := d.readContainerLen(msgpackContainerStr)
-	if clen > 0 {
-		s = string(d.r.readn(clen))
-	}
-	d.bdRead = false
-	return
-}
-
-// Callers must check if changed=true (to decide whether to replace the one they have)
-func (d *msgpackDecDriver) decodeBytes(bs []byte) (bsOut []byte, changed bool) {
-	// bytes can be decoded from msgpackContainerStr or msgpackContainerBin
-	var clen int
-	switch d.bd {
-	case mpBin8, mpBin16, mpBin32:
-		clen = d.readContainerLen(msgpackContainerBin)
-	default:
-		clen = d.readContainerLen(msgpackContainerStr)
-	}
-	// if clen < 0 {
-	// 	changed = true
-	// 	panic("length cannot be zero. this cannot be nil.")
-	// }
-	if clen > 0 {
-		// if no contents in stream, don't update the passed byteslice
-		if len(bs) != clen {
-			// Return changed=true if length of passed slice diff from length of bytes in stream
-			if len(bs) > clen {
-				bs = bs[:clen]
-			} else {
-				bs = make([]byte, clen)
-			}
-			bsOut = bs
-			changed = true
-		}
-		d.r.readb(bs)
-	}
-	d.bdRead = false
-	return
-}
-
-// Every top-level decode funcs (i.e. decodeValue, decode) must call this first.
-func (d *msgpackDecDriver) initReadNext() {
-	if d.bdRead {
-		return
-	}
-	d.bd = d.r.readn1()
-	d.bdRead = true
-	d.bdType = valueTypeUnset
-}
-
-func (d *msgpackDecDriver) currentEncodedType() valueType {
-	if d.bdType == valueTypeUnset {
-		bd := d.bd
-		switch bd {
-		case mpNil:
-			d.bdType = valueTypeNil
-		case mpFalse, mpTrue:
-			d.bdType = valueTypeBool
-		case mpFloat, mpDouble:
-			d.bdType = valueTypeFloat
-		case mpUint8, mpUint16, mpUint32, mpUint64:
-			d.bdType = valueTypeUint
-		case mpInt8, mpInt16, mpInt32, mpInt64:
-			d.bdType = valueTypeInt
-		default:
-			switch {
-			case bd >= mpPosFixNumMin && bd <= mpPosFixNumMax:
-				d.bdType = valueTypeInt
-			case bd >= mpNegFixNumMin && bd <= mpNegFixNumMax:
-				d.bdType = valueTypeInt
-			case bd == mpStr8, bd == mpStr16, bd == mpStr32, bd >= mpFixStrMin && bd <= mpFixStrMax:
-				if d.h.RawToString {
-					d.bdType = valueTypeString
-				} else {
-					d.bdType = valueTypeBytes
-				}
-			case bd == mpBin8, bd == mpBin16, bd == mpBin32:
-				d.bdType = valueTypeBytes
-			case bd == mpArray16, bd == mpArray32, bd >= mpFixArrayMin && bd <= mpFixArrayMax:
-				d.bdType = valueTypeArray
-			case bd == mpMap16, bd == mpMap32, bd >= mpFixMapMin && bd <= mpFixMapMax:
-				d.bdType = valueTypeMap
-			case bd >= mpFixExt1 && bd <= mpFixExt16, bd >= mpExt8 && bd <= mpExt32:
-				d.bdType = valueTypeExt
-			default:
-				decErr("currentEncodedType: Undeciphered descriptor: %s: hex: %x, dec: %d", msgBadDesc, bd, bd)
-			}
-		}
-	}
-	return d.bdType
-}
-
-func (d *msgpackDecDriver) tryDecodeAsNil() bool {
-	if d.bd == mpNil {
-		d.bdRead = false
-		return true
-	}
-	return false
-}
-
-func (d *msgpackDecDriver) readContainerLen(ct msgpackContainerType) (clen int) {
-	bd := d.bd
-	switch {
-	case bd == mpNil:
-		clen = -1 // to represent nil
-	case bd == ct.b8:
-		clen = int(d.r.readn1())
-	case bd == ct.b16:
-		clen = int(d.r.readUint16())
-	case bd == ct.b32:
-		clen = int(d.r.readUint32())
-	case (ct.bFixMin & bd) == ct.bFixMin:
-		clen = int(ct.bFixMin ^ bd)
-	default:
-		decErr("readContainerLen: %s: hex: %x, dec: %d", msgBadDesc, bd, bd)
-	}
-	d.bdRead = false
-	return
-}
-
-func (d *msgpackDecDriver) readMapLen() int {
-	return d.readContainerLen(msgpackContainerMap)
-}
-
-func (d *msgpackDecDriver) readArrayLen() int {
-	return d.readContainerLen(msgpackContainerList)
-}
-
-func (d *msgpackDecDriver) readExtLen() (clen int) {
-	switch d.bd {
-	case mpNil:
-		clen = -1 // to represent nil
-	case mpFixExt1:
-		clen = 1
-	case mpFixExt2:
-		clen = 2
-	case mpFixExt4:
-		clen = 4
-	case mpFixExt8:
-		clen = 8
-	case mpFixExt16:
-		clen = 16
-	case mpExt8:
-		clen = int(d.r.readn1())
-	case mpExt16:
-		clen = int(d.r.readUint16())
-	case mpExt32:
-		clen = int(d.r.readUint32())
-	default:
-		decErr("decoding ext bytes: found unexpected byte: %x", d.bd)
-	}
-	return
-}
-
-func (d *msgpackDecDriver) decodeExt(verifyTag bool, tag byte) (xtag byte, xbs []byte) {
-	xbd := d.bd
-	switch {
-	case xbd == mpBin8, xbd == mpBin16, xbd == mpBin32:
-		xbs, _ = d.decodeBytes(nil)
-	case xbd == mpStr8, xbd == mpStr16, xbd == mpStr32,
-		xbd >= mpFixStrMin && xbd <= mpFixStrMax:
-		xbs = []byte(d.decodeString())
-	default:
-		clen := d.readExtLen()
-		xtag = d.r.readn1()
-		if verifyTag && xtag != tag {
-			decErr("Wrong extension tag. Got %b. Expecting: %v", xtag, tag)
-		}
-		xbs = d.r.readn(clen)
-	}
-	d.bdRead = false
-	return
-}
-
-//--------------------------------------------------
-
-//MsgpackHandle is a Handle for the Msgpack Schema-Free Encoding Format.
-type MsgpackHandle struct {
-	BasicHandle
-
-	// RawToString controls how raw bytes are decoded into a nil interface{}.
-	RawToString bool
-	// WriteExt flag supports encoding configured extensions with extension tags.
-	// It also controls whether other elements of the new spec are encoded (ie Str8).
-	//
-	// With WriteExt=false, configured extensions are serialized as raw bytes
-	// and Str8 is not encoded.
-	//
-	// A stream can still be decoded into a typed value, provided an appropriate value
-	// is provided, but the type cannot be inferred from the stream. If no appropriate
-	// type is provided (e.g. decoding into a nil interface{}), you get back
-	// a []byte or string based on the setting of RawToString.
-	WriteExt bool
-}
-
-func (h *MsgpackHandle) newEncDriver(w encWriter) encDriver {
-	return &msgpackEncDriver{w: w, h: h}
-}
-
-func (h *MsgpackHandle) newDecDriver(r decReader) decDriver {
-	return &msgpackDecDriver{r: r, h: h}
-}
-
-func (h *MsgpackHandle) writeExt() bool {
-	return h.WriteExt
-}
-
-func (h *MsgpackHandle) getBasicHandle() *BasicHandle {
-	return &h.BasicHandle
-}
-
-//--------------------------------------------------
-
-type msgpackSpecRpcCodec struct {
-	rpcCodec
-}
-
-// /////////////// Spec RPC Codec ///////////////////
-func (c *msgpackSpecRpcCodec) WriteRequest(r *rpc.Request, body interface{}) error {
-	// WriteRequest can write to both a Go service, and other services that do
-	// not abide by the 1 argument rule of a Go service.
-	// We discriminate based on if the body is a MsgpackSpecRpcMultiArgs
-	var bodyArr []interface{}
-	if m, ok := body.(MsgpackSpecRpcMultiArgs); ok {
-		bodyArr = ([]interface{})(m)
-	} else {
-		bodyArr = []interface{}{body}
-	}
-	r2 := []interface{}{0, uint32(r.Seq), r.ServiceMethod, bodyArr}
-	return c.write(r2, nil, false, true)
-}
-
-func (c *msgpackSpecRpcCodec) WriteResponse(r *rpc.Response, body interface{}) error {
-	var moe interface{}
-	if r.Error != "" {
-		moe = r.Error
-	}
-	if moe != nil && body != nil {
-		body = nil
-	}
-	r2 := []interface{}{1, uint32(r.Seq), moe, body}
-	return c.write(r2, nil, false, true)
-}
-
-func (c *msgpackSpecRpcCodec) ReadResponseHeader(r *rpc.Response) error {
-	return c.parseCustomHeader(1, &r.Seq, &r.Error)
-}
-
-func (c *msgpackSpecRpcCodec) ReadRequestHeader(r *rpc.Request) error {
-	return c.parseCustomHeader(0, &r.Seq, &r.ServiceMethod)
-}
-
-func (c *msgpackSpecRpcCodec) ReadRequestBody(body interface{}) error {
-	if body == nil { // read and discard
-		return c.read(nil)
-	}
-	bodyArr := []interface{}{body}
-	return c.read(&bodyArr)
-}
-
-func (c *msgpackSpecRpcCodec) parseCustomHeader(expectTypeByte byte, msgid *uint64, methodOrError *string) (err error) {
-
-	if c.cls {
-		return io.EOF
-	}
-
-	// We read the response header by hand
-	// so that the body can be decoded on its own from the stream at a later time.
-
-	const fia byte = 0x94 //four item array descriptor value
-	// Not sure why the panic of EOF is swallowed above.
-	// if bs1 := c.dec.r.readn1(); bs1 != fia {
-	// 	err = fmt.Errorf("Unexpected value for array descriptor: Expecting %v. Received %v", fia, bs1)
-	// 	return
-	// }
-	var b byte
-	b, err = c.br.ReadByte()
-	if err != nil {
-		return
-	}
-	if b != fia {
-		err = fmt.Errorf("Unexpected value for array descriptor: Expecting %v. Received %v", fia, b)
-		return
-	}
-
-	if err = c.read(&b); err != nil {
-		return
-	}
-	if b != expectTypeByte {
-		err = fmt.Errorf("Unexpected byte descriptor in header. Expecting %v. Received %v", expectTypeByte, b)
-		return
-	}
-	if err = c.read(msgid); err != nil {
-		return
-	}
-	if err = c.read(methodOrError); err != nil {
-		return
-	}
-	return
-}
-
-//--------------------------------------------------
-
-// msgpackSpecRpc is the implementation of Rpc that uses custom communication protocol
-// as defined in the msgpack spec at https://github.com/msgpack-rpc/msgpack-rpc/blob/master/spec.md
-type msgpackSpecRpc struct{}
-
-// MsgpackSpecRpc implements Rpc using the communication protocol defined in
-// the msgpack spec at https://github.com/msgpack-rpc/msgpack-rpc/blob/master/spec.md .
-// Its methods (ServerCodec and ClientCodec) return values that implement RpcCodecBuffered.
-var MsgpackSpecRpc msgpackSpecRpc
-
-func (x msgpackSpecRpc) ServerCodec(conn io.ReadWriteCloser, h Handle) rpc.ServerCodec {
-	return &msgpackSpecRpcCodec{newRPCCodec(conn, h)}
-}
-
-func (x msgpackSpecRpc) ClientCodec(conn io.ReadWriteCloser, h Handle) rpc.ClientCodec {
-	return &msgpackSpecRpcCodec{newRPCCodec(conn, h)}
-}
-
-var _ decDriver = (*msgpackDecDriver)(nil)
-var _ encDriver = (*msgpackEncDriver)(nil)
diff --git a/Godeps/_workspace/src/github.com/hashicorp/go-msgpack/codec/msgpack_test.py b/Godeps/_workspace/src/github.com/hashicorp/go-msgpack/codec/msgpack_test.py
deleted file mode 100644
index e933838c5..000000000
--- a/Godeps/_workspace/src/github.com/hashicorp/go-msgpack/codec/msgpack_test.py
+++ /dev/null
@@ -1,110 +0,0 @@
-#!/usr/bin/env python
-
-# This will create golden files in a directory passed to it.
-# A Test calls this internally to create the golden files
-# So it can process them (so we don't have to checkin the files).
-
-import msgpack, msgpackrpc, sys, os, threading
-
-def get_test_data_list():
-    # get list with all primitive types, and a combo type
-    l0 = [ 
-        -8,
-         -1616,
-         -32323232,
-         -6464646464646464,
-         192,
-         1616,
-         32323232,
-         6464646464646464,
-         192,
-         -3232.0,
-         -6464646464.0,
-         3232.0,
-         6464646464.0,
-         False,
-         True,
-         None,
-         "someday",
-         "",
-         "bytestring",
-         1328176922000002000,
-         -2206187877999998000,
-         0,
-         -6795364578871345152
-         ]
-    l1 = [
-        { "true": True,
-          "false": False },
-        { "true": "True",
-          "false": False,
-          "uint16(1616)": 1616 },
-        { "list": [1616, 32323232, True, -3232.0, {"TRUE":True, "FALSE":False}, [True, False] ],
-          "int32":32323232, "bool": True, 
-          "LONG STRING": "123456789012345678901234567890123456789012345678901234567890",
-          "SHORT STRING": "1234567890" },	
-        { True: "true", 8: False, "false": 0 }
-        ]
-    
-    l = []
-    l.extend(l0)
-    l.append(l0)
-    l.extend(l1)
-    return l
-
-def build_test_data(destdir):
-    l = get_test_data_list()
-    for i in range(len(l)):
-        packer = msgpack.Packer()
-        serialized = packer.pack(l[i])
-        f = open(os.path.join(destdir, str(i) + '.golden'), 'wb')
-        f.write(serialized)
-        f.close()
-
-def doRpcServer(port, stopTimeSec):
-    class EchoHandler(object):
-        def Echo123(self, msg1, msg2, msg3):
-            return ("1:%s 2:%s 3:%s" % (msg1, msg2, msg3))
-        def EchoStruct(self, msg):
-            return ("%s" % msg)
-    
-    addr = msgpackrpc.Address('localhost', port)
-    server = msgpackrpc.Server(EchoHandler())
-    server.listen(addr)
-    # run thread to stop it after stopTimeSec seconds if > 0
-    if stopTimeSec > 0:
-        def myStopRpcServer():
-            server.stop()
-        t = threading.Timer(stopTimeSec, myStopRpcServer)
-        t.start()
-    server.start()
-
-def doRpcClientToPythonSvc(port):
-    address = msgpackrpc.Address('localhost', port)
-    client = msgpackrpc.Client(address, unpack_encoding='utf-8')
-    print client.call("Echo123", "A1", "B2", "C3")
-    print client.call("EchoStruct", {"A" :"Aa", "B":"Bb", "C":"Cc"})
-   
-def doRpcClientToGoSvc(port):
-    # print ">>>> port: ", port, " <<<<<"
-    address = msgpackrpc.Address('localhost', port)
-    client = msgpackrpc.Client(address, unpack_encoding='utf-8')
-    print client.call("TestRpcInt.Echo123", ["A1", "B2", "C3"])
-    print client.call("TestRpcInt.EchoStruct", {"A" :"Aa", "B":"Bb", "C":"Cc"})
-
-def doMain(args):
-    if len(args) == 2 and args[0] == "testdata":
-        build_test_data(args[1])
-    elif len(args) == 3 and args[0] == "rpc-server":
-        doRpcServer(int(args[1]), int(args[2]))
-    elif len(args) == 2 and args[0] == "rpc-client-python-service":
-        doRpcClientToPythonSvc(int(args[1]))
-    elif len(args) == 2 and args[0] == "rpc-client-go-service":
-        doRpcClientToGoSvc(int(args[1]))
-    else:
-        print("Usage: msgpack_test.py " + 
-              "[testdata|rpc-server|rpc-client-python-service|rpc-client-go-service] ...")
-    
-if __name__ == "__main__":
-    doMain(sys.argv[1:])
-
diff --git a/Godeps/_workspace/src/github.com/hashicorp/go-msgpack/codec/rpc.go b/Godeps/_workspace/src/github.com/hashicorp/go-msgpack/codec/rpc.go
deleted file mode 100644
index d014dbdcc..000000000
--- a/Godeps/_workspace/src/github.com/hashicorp/go-msgpack/codec/rpc.go
+++ /dev/null
@@ -1,152 +0,0 @@
-// Copyright (c) 2012, 2013 Ugorji Nwoke. All rights reserved.
-// Use of this source code is governed by a BSD-style license found in the LICENSE file.
-
-package codec
-
-import (
-	"bufio"
-	"io"
-	"net/rpc"
-	"sync"
-)
-
-// Rpc provides a rpc Server or Client Codec for rpc communication.
-type Rpc interface {
-	ServerCodec(conn io.ReadWriteCloser, h Handle) rpc.ServerCodec
-	ClientCodec(conn io.ReadWriteCloser, h Handle) rpc.ClientCodec
-}
-
-// RpcCodecBuffered allows access to the underlying bufio.Reader/Writer
-// used by the rpc connection. It accomodates use-cases where the connection
-// should be used by rpc and non-rpc functions, e.g. streaming a file after
-// sending an rpc response.
-type RpcCodecBuffered interface {
-	BufferedReader() *bufio.Reader
-	BufferedWriter() *bufio.Writer
-}
-
-// -------------------------------------
-
-// rpcCodec defines the struct members and common methods.
-type rpcCodec struct {
-	rwc io.ReadWriteCloser
-	dec *Decoder
-	enc *Encoder
-	bw  *bufio.Writer
-	br  *bufio.Reader
-	mu  sync.Mutex
-	cls bool
-}
-
-func newRPCCodec(conn io.ReadWriteCloser, h Handle) rpcCodec {
-	bw := bufio.NewWriter(conn)
-	br := bufio.NewReader(conn)
-	return rpcCodec{
-		rwc: conn,
-		bw:  bw,
-		br:  br,
-		enc: NewEncoder(bw, h),
-		dec: NewDecoder(br, h),
-	}
-}
-
-func (c *rpcCodec) BufferedReader() *bufio.Reader {
-	return c.br
-}
-
-func (c *rpcCodec) BufferedWriter() *bufio.Writer {
-	return c.bw
-}
-
-func (c *rpcCodec) write(obj1, obj2 interface{}, writeObj2, doFlush bool) (err error) {
-	if c.cls {
-		return io.EOF
-	}
-	if err = c.enc.Encode(obj1); err != nil {
-		return
-	}
-	if writeObj2 {
-		if err = c.enc.Encode(obj2); err != nil {
-			return
-		}
-	}
-	if doFlush && c.bw != nil {
-		return c.bw.Flush()
-	}
-	return
-}
-
-func (c *rpcCodec) read(obj interface{}) (err error) {
-	if c.cls {
-		return io.EOF
-	}
-	//If nil is passed in, we should still attempt to read content to nowhere.
-	if obj == nil {
-		var obj2 interface{}
-		return c.dec.Decode(&obj2)
-	}
-	return c.dec.Decode(obj)
-}
-
-func (c *rpcCodec) Close() error {
-	if c.cls {
-		return io.EOF
-	}
-	c.cls = true
-	return c.rwc.Close()
-}
-
-func (c *rpcCodec) ReadResponseBody(body interface{}) error {
-	return c.read(body)
-}
-
-// -------------------------------------
-
-type goRpcCodec struct {
-	rpcCodec
-}
-
-func (c *goRpcCodec) WriteRequest(r *rpc.Request, body interface{}) error {
-	// Must protect for concurrent access as per API
-	c.mu.Lock()
-	defer c.mu.Unlock()
-	return c.write(r, body, true, true)
-}
-
-func (c *goRpcCodec) WriteResponse(r *rpc.Response, body interface{}) error {
-	c.mu.Lock()
-	defer c.mu.Unlock()
-	return c.write(r, body, true, true)
-}
-
-func (c *goRpcCodec) ReadResponseHeader(r *rpc.Response) error {
-	return c.read(r)
-}
-
-func (c *goRpcCodec) ReadRequestHeader(r *rpc.Request) error {
-	return c.read(r)
-}
-
-func (c *goRpcCodec) ReadRequestBody(body interface{}) error {
-	return c.read(body)
-}
-
-// -------------------------------------
-
-// goRpc is the implementation of Rpc that uses the communication protocol
-// as defined in net/rpc package.
-type goRpc struct{}
-
-// GoRpc implements Rpc using the communication protocol defined in net/rpc package.
-// Its methods (ServerCodec and ClientCodec) return values that implement RpcCodecBuffered.
-var GoRpc goRpc
-
-func (x goRpc) ServerCodec(conn io.ReadWriteCloser, h Handle) rpc.ServerCodec {
-	return &goRpcCodec{newRPCCodec(conn, h)}
-}
-
-func (x goRpc) ClientCodec(conn io.ReadWriteCloser, h Handle) rpc.ClientCodec {
-	return &goRpcCodec{newRPCCodec(conn, h)}
-}
-
-var _ RpcCodecBuffered = (*rpcCodec)(nil) // ensure *rpcCodec implements RpcCodecBuffered
diff --git a/Godeps/_workspace/src/github.com/hashicorp/go-msgpack/codec/simple.go b/Godeps/_workspace/src/github.com/hashicorp/go-msgpack/codec/simple.go
deleted file mode 100644
index 9e4d148a2..000000000
--- a/Godeps/_workspace/src/github.com/hashicorp/go-msgpack/codec/simple.go
+++ /dev/null
@@ -1,461 +0,0 @@
-// Copyright (c) 2012, 2013 Ugorji Nwoke. All rights reserved.
-// Use of this source code is governed by a BSD-style license found in the LICENSE file.
-
-package codec
-
-import "math"
-
-const (
-	_               uint8 = iota
-	simpleVdNil           = 1
-	simpleVdFalse         = 2
-	simpleVdTrue          = 3
-	simpleVdFloat32       = 4
-	simpleVdFloat64       = 5
-
-	// each lasts for 4 (ie n, n+1, n+2, n+3)
-	simpleVdPosInt = 8
-	simpleVdNegInt = 12
-
-	// containers: each lasts for 4 (ie n, n+1, n+2, ... n+7)
-	simpleVdString    = 216
-	simpleVdByteArray = 224
-	simpleVdArray     = 232
-	simpleVdMap       = 240
-	simpleVdExt       = 248
-)
-
-type simpleEncDriver struct {
-	h *SimpleHandle
-	w encWriter
-	//b [8]byte
-}
-
-func (e *simpleEncDriver) isBuiltinType(rt uintptr) bool {
-	return false
-}
-
-func (e *simpleEncDriver) encodeBuiltin(rt uintptr, v interface{}) {
-}
-
-func (e *simpleEncDriver) encodeNil() {
-	e.w.writen1(simpleVdNil)
-}
-
-func (e *simpleEncDriver) encodeBool(b bool) {
-	if b {
-		e.w.writen1(simpleVdTrue)
-	} else {
-		e.w.writen1(simpleVdFalse)
-	}
-}
-
-func (e *simpleEncDriver) encodeFloat32(f float32) {
-	e.w.writen1(simpleVdFloat32)
-	e.w.writeUint32(math.Float32bits(f))
-}
-
-func (e *simpleEncDriver) encodeFloat64(f float64) {
-	e.w.writen1(simpleVdFloat64)
-	e.w.writeUint64(math.Float64bits(f))
-}
-
-func (e *simpleEncDriver) encodeInt(v int64) {
-	if v < 0 {
-		e.encUint(uint64(-v), simpleVdNegInt)
-	} else {
-		e.encUint(uint64(v), simpleVdPosInt)
-	}
-}
-
-func (e *simpleEncDriver) encodeUint(v uint64) {
-	e.encUint(v, simpleVdPosInt)
-}
-
-func (e *simpleEncDriver) encUint(v uint64, bd uint8) {
-	switch {
-	case v <= math.MaxUint8:
-		e.w.writen2(bd, uint8(v))
-	case v <= math.MaxUint16:
-		e.w.writen1(bd + 1)
-		e.w.writeUint16(uint16(v))
-	case v <= math.MaxUint32:
-		e.w.writen1(bd + 2)
-		e.w.writeUint32(uint32(v))
-	case v <= math.MaxUint64:
-		e.w.writen1(bd + 3)
-		e.w.writeUint64(v)
-	}
-}
-
-func (e *simpleEncDriver) encLen(bd byte, length int) {
-	switch {
-	case length == 0:
-		e.w.writen1(bd)
-	case length <= math.MaxUint8:
-		e.w.writen1(bd + 1)
-		e.w.writen1(uint8(length))
-	case length <= math.MaxUint16:
-		e.w.writen1(bd + 2)
-		e.w.writeUint16(uint16(length))
-	case int64(length) <= math.MaxUint32:
-		e.w.writen1(bd + 3)
-		e.w.writeUint32(uint32(length))
-	default:
-		e.w.writen1(bd + 4)
-		e.w.writeUint64(uint64(length))
-	}
-}
-
-func (e *simpleEncDriver) encodeExtPreamble(xtag byte, length int) {
-	e.encLen(simpleVdExt, length)
-	e.w.writen1(xtag)
-}
-
-func (e *simpleEncDriver) encodeArrayPreamble(length int) {
-	e.encLen(simpleVdArray, length)
-}
-
-func (e *simpleEncDriver) encodeMapPreamble(length int) {
-	e.encLen(simpleVdMap, length)
-}
-
-func (e *simpleEncDriver) encodeString(c charEncoding, v string) {
-	e.encLen(simpleVdString, len(v))
-	e.w.writestr(v)
-}
-
-func (e *simpleEncDriver) encodeSymbol(v string) {
-	e.encodeString(c_UTF8, v)
-}
-
-func (e *simpleEncDriver) encodeStringBytes(c charEncoding, v []byte) {
-	e.encLen(simpleVdByteArray, len(v))
-	e.w.writeb(v)
-}
-
-//------------------------------------
-
-type simpleDecDriver struct {
-	h      *SimpleHandle
-	r      decReader
-	bdRead bool
-	bdType valueType
-	bd     byte
-	//b      [8]byte
-}
-
-func (d *simpleDecDriver) initReadNext() {
-	if d.bdRead {
-		return
-	}
-	d.bd = d.r.readn1()
-	d.bdRead = true
-	d.bdType = valueTypeUnset
-}
-
-func (d *simpleDecDriver) currentEncodedType() valueType {
-	if d.bdType == valueTypeUnset {
-		switch d.bd {
-		case simpleVdNil:
-			d.bdType = valueTypeNil
-		case simpleVdTrue, simpleVdFalse:
-			d.bdType = valueTypeBool
-		case simpleVdPosInt, simpleVdPosInt + 1, simpleVdPosInt + 2, simpleVdPosInt + 3:
-			d.bdType = valueTypeUint
-		case simpleVdNegInt, simpleVdNegInt + 1, simpleVdNegInt + 2, simpleVdNegInt + 3:
-			d.bdType = valueTypeInt
-		case simpleVdFloat32, simpleVdFloat64:
-			d.bdType = valueTypeFloat
-		case simpleVdString, simpleVdString + 1, simpleVdString + 2, simpleVdString + 3, simpleVdString + 4:
-			d.bdType = valueTypeString
-		case simpleVdByteArray, simpleVdByteArray + 1, simpleVdByteArray + 2, simpleVdByteArray + 3, simpleVdByteArray + 4:
-			d.bdType = valueTypeBytes
-		case simpleVdExt, simpleVdExt + 1, simpleVdExt + 2, simpleVdExt + 3, simpleVdExt + 4:
-			d.bdType = valueTypeExt
-		case simpleVdArray, simpleVdArray + 1, simpleVdArray + 2, simpleVdArray + 3, simpleVdArray + 4:
-			d.bdType = valueTypeArray
-		case simpleVdMap, simpleVdMap + 1, simpleVdMap + 2, simpleVdMap + 3, simpleVdMap + 4:
-			d.bdType = valueTypeMap
-		default:
-			decErr("currentEncodedType: Unrecognized d.vd: 0x%x", d.bd)
-		}
-	}
-	return d.bdType
-}
-
-func (d *simpleDecDriver) tryDecodeAsNil() bool {
-	if d.bd == simpleVdNil {
-		d.bdRead = false
-		return true
-	}
-	return false
-}
-
-func (d *simpleDecDriver) isBuiltinType(rt uintptr) bool {
-	return false
-}
-
-func (d *simpleDecDriver) decodeBuiltin(rt uintptr, v interface{}) {
-}
-
-func (d *simpleDecDriver) decIntAny() (ui uint64, i int64, neg bool) {
-	switch d.bd {
-	case simpleVdPosInt:
-		ui = uint64(d.r.readn1())
-		i = int64(ui)
-	case simpleVdPosInt + 1:
-		ui = uint64(d.r.readUint16())
-		i = int64(ui)
-	case simpleVdPosInt + 2:
-		ui = uint64(d.r.readUint32())
-		i = int64(ui)
-	case simpleVdPosInt + 3:
-		ui = uint64(d.r.readUint64())
-		i = int64(ui)
-	case simpleVdNegInt:
-		ui = uint64(d.r.readn1())
-		i = -(int64(ui))
-		neg = true
-	case simpleVdNegInt + 1:
-		ui = uint64(d.r.readUint16())
-		i = -(int64(ui))
-		neg = true
-	case simpleVdNegInt + 2:
-		ui = uint64(d.r.readUint32())
-		i = -(int64(ui))
-		neg = true
-	case simpleVdNegInt + 3:
-		ui = uint64(d.r.readUint64())
-		i = -(int64(ui))
-		neg = true
-	default:
-		decErr("decIntAny: Integer only valid from pos/neg integer1..8. Invalid descriptor: %v", d.bd)
-	}
-	// don't do this check, because callers may only want the unsigned value.
-	// if ui > math.MaxInt64 {
-	// 	decErr("decIntAny: Integer out of range for signed int64: %v", ui)
-	// }
-	return
-}
-
-func (d *simpleDecDriver) decodeInt(bitsize uint8) (i int64) {
-	_, i, _ = d.decIntAny()
-	checkOverflow(0, i, bitsize)
-	d.bdRead = false
-	return
-}
-
-func (d *simpleDecDriver) decodeUint(bitsize uint8) (ui uint64) {
-	ui, i, neg := d.decIntAny()
-	if neg {
-		decErr("Assigning negative signed value: %v, to unsigned type", i)
-	}
-	checkOverflow(ui, 0, bitsize)
-	d.bdRead = false
-	return
-}
-
-func (d *simpleDecDriver) decodeFloat(chkOverflow32 bool) (f float64) {
-	switch d.bd {
-	case simpleVdFloat32:
-		f = float64(math.Float32frombits(d.r.readUint32()))
-	case simpleVdFloat64:
-		f = math.Float64frombits(d.r.readUint64())
-	default:
-		if d.bd >= simpleVdPosInt && d.bd <= simpleVdNegInt+3 {
-			_, i, _ := d.decIntAny()
-			f = float64(i)
-		} else {
-			decErr("Float only valid from float32/64: Invalid descriptor: %v", d.bd)
-		}
-	}
-	checkOverflowFloat32(f, chkOverflow32)
-	d.bdRead = false
-	return
-}
-
-// bool can be decoded from bool only (single byte).
-func (d *simpleDecDriver) decodeBool() (b bool) {
-	switch d.bd {
-	case simpleVdTrue:
-		b = true
-	case simpleVdFalse:
-	default:
-		decErr("Invalid single-byte value for bool: %s: %x", msgBadDesc, d.bd)
-	}
-	d.bdRead = false
-	return
-}
-
-func (d *simpleDecDriver) readMapLen() (length int) {
-	d.bdRead = false
-	return d.decLen()
-}
-
-func (d *simpleDecDriver) readArrayLen() (length int) {
-	d.bdRead = false
-	return d.decLen()
-}
-
-func (d *simpleDecDriver) decLen() int {
-	switch d.bd % 8 {
-	case 0:
-		return 0
-	case 1:
-		return int(d.r.readn1())
-	case 2:
-		return int(d.r.readUint16())
-	case 3:
-		ui := uint64(d.r.readUint32())
-		checkOverflow(ui, 0, intBitsize)
-		return int(ui)
-	case 4:
-		ui := d.r.readUint64()
-		checkOverflow(ui, 0, intBitsize)
-		return int(ui)
-	}
-	decErr("decLen: Cannot read length: bd%8 must be in range 0..4. Got: %d", d.bd%8)
-	return -1
-}
-
-func (d *simpleDecDriver) decodeString() (s string) {
-	s = string(d.r.readn(d.decLen()))
-	d.bdRead = false
-	return
-}
-
-func (d *simpleDecDriver) decodeBytes(bs []byte) (bsOut []byte, changed bool) {
-	if clen := d.decLen(); clen > 0 {
-		// if no contents in stream, don't update the passed byteslice
-		if len(bs) != clen {
-			if len(bs) > clen {
-				bs = bs[:clen]
-			} else {
-				bs = make([]byte, clen)
-			}
-			bsOut = bs
-			changed = true
-		}
-		d.r.readb(bs)
-	}
-	d.bdRead = false
-	return
-}
-
-func (d *simpleDecDriver) decodeExt(verifyTag bool, tag byte) (xtag byte, xbs []byte) {
-	switch d.bd {
-	case simpleVdExt, simpleVdExt + 1, simpleVdExt + 2, simpleVdExt + 3, simpleVdExt + 4:
-		l := d.decLen()
-		xtag = d.r.readn1()
-		if verifyTag && xtag != tag {
-			decErr("Wrong extension tag. Got %b. Expecting: %v", xtag, tag)
-		}
-		xbs = d.r.readn(l)
-	case simpleVdByteArray, simpleVdByteArray + 1, simpleVdByteArray + 2, simpleVdByteArray + 3, simpleVdByteArray + 4:
-		xbs, _ = d.decodeBytes(nil)
-	default:
-		decErr("Invalid d.vd for extensions (Expecting extensions or byte array). Got: 0x%x", d.bd)
-	}
-	d.bdRead = false
-	return
-}
-
-func (d *simpleDecDriver) decodeNaked() (v interface{}, vt valueType, decodeFurther bool) {
-	d.initReadNext()
-
-	switch d.bd {
-	case simpleVdNil:
-		vt = valueTypeNil
-	case simpleVdFalse:
-		vt = valueTypeBool
-		v = false
-	case simpleVdTrue:
-		vt = valueTypeBool
-		v = true
-	case simpleVdPosInt, simpleVdPosInt + 1, simpleVdPosInt + 2, simpleVdPosInt + 3:
-		vt = valueTypeUint
-		ui, _, _ := d.decIntAny()
-		v = ui
-	case simpleVdNegInt, simpleVdNegInt + 1, simpleVdNegInt + 2, simpleVdNegInt + 3:
-		vt = valueTypeInt
-		_, i, _ := d.decIntAny()
-		v = i
-	case simpleVdFloat32:
-		vt = valueTypeFloat
-		v = d.decodeFloat(true)
-	case simpleVdFloat64:
-		vt = valueTypeFloat
-		v = d.decodeFloat(false)
-	case simpleVdString, simpleVdString + 1, simpleVdString + 2, simpleVdString + 3, simpleVdString + 4:
-		vt = valueTypeString
-		v = d.decodeString()
-	case simpleVdByteArray, simpleVdByteArray + 1, simpleVdByteArray + 2, simpleVdByteArray + 3, simpleVdByteArray + 4:
-		vt = valueTypeBytes
-		v, _ = d.decodeBytes(nil)
-	case simpleVdExt, simpleVdExt + 1, simpleVdExt + 2, simpleVdExt + 3, simpleVdExt + 4:
-		vt = valueTypeExt
-		l := d.decLen()
-		var re RawExt
-		re.Tag = d.r.readn1()
-		re.Data = d.r.readn(l)
-		v = &re
-		vt = valueTypeExt
-	case simpleVdArray, simpleVdArray + 1, simpleVdArray + 2, simpleVdArray + 3, simpleVdArray + 4:
-		vt = valueTypeArray
-		decodeFurther = true
-	case simpleVdMap, simpleVdMap + 1, simpleVdMap + 2, simpleVdMap + 3, simpleVdMap + 4:
-		vt = valueTypeMap
-		decodeFurther = true
-	default:
-		decErr("decodeNaked: Unrecognized d.vd: 0x%x", d.bd)
-	}
-
-	if !decodeFurther {
-		d.bdRead = false
-	}
-	return
-}
-
-//------------------------------------
-
-// SimpleHandle is a Handle for a very simple encoding format.
-//
-// simple is a simplistic codec similar to binc, but not as compact.
-//   - Encoding of a value is always preceeded by the descriptor byte (bd)
-//   - True, false, nil are encoded fully in 1 byte (the descriptor)
-//   - Integers (intXXX, uintXXX) are encoded in 1, 2, 4 or 8 bytes (plus a descriptor byte).
-//     There are positive (uintXXX and intXXX >= 0) and negative (intXXX < 0) integers.
-//   - Floats are encoded in 4 or 8 bytes (plus a descriptor byte)
-//   - Lenght of containers (strings, bytes, array, map, extensions)
-//     are encoded in 0, 1, 2, 4 or 8 bytes.
-//     Zero-length containers have no length encoded.
-//     For others, the number of bytes is given by pow(2, bd%3)
-//   - maps are encoded as [bd] [length] [[key][value]]...
-//   - arrays are encoded as [bd] [length] [value]...
-//   - extensions are encoded as [bd] [length] [tag] [byte]...
-//   - strings/bytearrays are encoded as [bd] [length] [byte]...
-//
-// The full spec will be published soon.
-type SimpleHandle struct {
-	BasicHandle
-}
-
-func (h *SimpleHandle) newEncDriver(w encWriter) encDriver {
-	return &simpleEncDriver{w: w, h: h}
-}
-
-func (h *SimpleHandle) newDecDriver(r decReader) decDriver {
-	return &simpleDecDriver{r: r, h: h}
-}
-
-func (_ *SimpleHandle) writeExt() bool {
-	return true
-}
-
-func (h *SimpleHandle) getBasicHandle() *BasicHandle {
-	return &h.BasicHandle
-}
-
-var _ decDriver = (*simpleDecDriver)(nil)
-var _ encDriver = (*simpleEncDriver)(nil)
diff --git a/Godeps/_workspace/src/github.com/hashicorp/go-msgpack/codec/time.go b/Godeps/_workspace/src/github.com/hashicorp/go-msgpack/codec/time.go
deleted file mode 100644
index c86d65328..000000000
--- a/Godeps/_workspace/src/github.com/hashicorp/go-msgpack/codec/time.go
+++ /dev/null
@@ -1,193 +0,0 @@
-// Copyright (c) 2012, 2013 Ugorji Nwoke. All rights reserved.
-// Use of this source code is governed by a BSD-style license found in the LICENSE file.
-
-package codec
-
-import (
-	"time"
-)
-
-var (
-	timeDigits = [...]byte{'0', '1', '2', '3', '4', '5', '6', '7', '8', '9'}
-)
-
-// EncodeTime encodes a time.Time as a []byte, including
-// information on the instant in time and UTC offset.
-//
-// Format Description
-//
-//   A timestamp is composed of 3 components:
-//
-//   - secs: signed integer representing seconds since unix epoch
-//   - nsces: unsigned integer representing fractional seconds as a
-//     nanosecond offset within secs, in the range 0 <= nsecs < 1e9
-//   - tz: signed integer representing timezone offset in minutes east of UTC,
-//     and a dst (daylight savings time) flag
-//
-//   When encoding a timestamp, the first byte is the descriptor, which
-//   defines which components are encoded and how many bytes are used to
-//   encode secs and nsecs components. *If secs/nsecs is 0 or tz is UTC, it
-//   is not encoded in the byte array explicitly*.
-//
-//       Descriptor 8 bits are of the form `A B C DDD EE`:
-//           A:   Is secs component encoded? 1 = true
-//           B:   Is nsecs component encoded? 1 = true
-//           C:   Is tz component encoded? 1 = true
-//           DDD: Number of extra bytes for secs (range 0-7).
-//                If A = 1, secs encoded in DDD+1 bytes.
-//                    If A = 0, secs is not encoded, and is assumed to be 0.
-//                    If A = 1, then we need at least 1 byte to encode secs.
-//                    DDD says the number of extra bytes beyond that 1.
-//                    E.g. if DDD=0, then secs is represented in 1 byte.
-//                         if DDD=2, then secs is represented in 3 bytes.
-//           EE:  Number of extra bytes for nsecs (range 0-3).
-//                If B = 1, nsecs encoded in EE+1 bytes (similar to secs/DDD above)
-//
-//   Following the descriptor bytes, subsequent bytes are:
-//
-//       secs component encoded in `DDD + 1` bytes (if A == 1)
-//       nsecs component encoded in `EE + 1` bytes (if B == 1)
-//       tz component encoded in 2 bytes (if C == 1)
-//
-//   secs and nsecs components are integers encoded in a BigEndian
-//   2-complement encoding format.
-//
-//   tz component is encoded as 2 bytes (16 bits). Most significant bit 15 to
-//   Least significant bit 0 are described below:
-//
-//       Timezone offset has a range of -12:00 to +14:00 (ie -720 to +840 minutes).
-//       Bit 15 = have\_dst: set to 1 if we set the dst flag.
-//       Bit 14 = dst\_on: set to 1 if dst is in effect at the time, or 0 if not.
-//       Bits 13..0 = timezone offset in minutes. It is a signed integer in Big Endian format.
-//
-func encodeTime(t time.Time) []byte {
-	//t := rv.Interface().(time.Time)
-	tsecs, tnsecs := t.Unix(), t.Nanosecond()
-	var (
-		bd   byte
-		btmp [8]byte
-		bs   [16]byte
-		i    int = 1
-	)
-	l := t.Location()
-	if l == time.UTC {
-		l = nil
-	}
-	if tsecs != 0 {
-		bd = bd | 0x80
-		bigen.PutUint64(btmp[:], uint64(tsecs))
-		f := pruneSignExt(btmp[:], tsecs >= 0)
-		bd = bd | (byte(7-f) << 2)
-		copy(bs[i:], btmp[f:])
-		i = i + (8 - f)
-	}
-	if tnsecs != 0 {
-		bd = bd | 0x40
-		bigen.PutUint32(btmp[:4], uint32(tnsecs))
-		f := pruneSignExt(btmp[:4], true)
-		bd = bd | byte(3-f)
-		copy(bs[i:], btmp[f:4])
-		i = i + (4 - f)
-	}
-	if l != nil {
-		bd = bd | 0x20
-		// Note that Go Libs do not give access to dst flag.
-		_, zoneOffset := t.Zone()
-		//zoneName, zoneOffset := t.Zone()
-		zoneOffset /= 60
-		z := uint16(zoneOffset)
-		bigen.PutUint16(btmp[:2], z)
-		// clear dst flags
-		bs[i] = btmp[0] & 0x3f
-		bs[i+1] = btmp[1]
-		i = i + 2
-	}
-	bs[0] = bd
-	return bs[0:i]
-}
-
-// DecodeTime decodes a []byte into a time.Time.
-func decodeTime(bs []byte) (tt time.Time, err error) {
-	bd := bs[0]
-	var (
-		tsec  int64
-		tnsec uint32
-		tz    uint16
-		i     byte = 1
-		i2    byte
-		n     byte
-	)
-	if bd&(1<<7) != 0 {
-		var btmp [8]byte
-		n = ((bd >> 2) & 0x7) + 1
-		i2 = i + n
-		copy(btmp[8-n:], bs[i:i2])
-		//if first bit of bs[i] is set, then fill btmp[0..8-n] with 0xff (ie sign extend it)
-		if bs[i]&(1<<7) != 0 {
-			copy(btmp[0:8-n], bsAll0xff)
-			//for j,k := byte(0), 8-n; j < k; j++ {	btmp[j] = 0xff }
-		}
-		i = i2
-		tsec = int64(bigen.Uint64(btmp[:]))
-	}
-	if bd&(1<<6) != 0 {
-		var btmp [4]byte
-		n = (bd & 0x3) + 1
-		i2 = i + n
-		copy(btmp[4-n:], bs[i:i2])
-		i = i2
-		tnsec = bigen.Uint32(btmp[:])
-	}
-	if bd&(1<<5) == 0 {
-		tt = time.Unix(tsec, int64(tnsec)).UTC()
-		return
-	}
-	// In stdlib time.Parse, when a date is parsed without a zone name, it uses "" as zone name.
-	// However, we need name here, so it can be shown when time is printed.
-	// Zone name is in form: UTC-08:00.
-	// Note that Go Libs do not give access to dst flag, so we ignore dst bits
-
-	i2 = i + 2
-	tz = bigen.Uint16(bs[i:i2])
-	i = i2
-	// sign extend sign bit into top 2 MSB (which were dst bits):
-	if tz&(1<<13) == 0 { // positive
-		tz = tz & 0x3fff //clear 2 MSBs: dst bits
-	} else { // negative
-		tz = tz | 0xc000 //set 2 MSBs: dst bits
-		//tzname[3] = '-' (TODO: verify. this works here)
-	}
-	tzint := int16(tz)
-	if tzint == 0 {
-		tt = time.Unix(tsec, int64(tnsec)).UTC()
-	} else {
-		// For Go Time, do not use a descriptive timezone.
-		// It's unnecessary, and makes it harder to do a reflect.DeepEqual.
-		// The Offset already tells what the offset should be, if not on UTC and unknown zone name.
-		// var zoneName = timeLocUTCName(tzint)
-		tt = time.Unix(tsec, int64(tnsec)).In(time.FixedZone("", int(tzint)*60))
-	}
-	return
-}
-
-func timeLocUTCName(tzint int16) string {
-	if tzint == 0 {
-		return "UTC"
-	}
-	var tzname = []byte("UTC+00:00")
-	//tzname := fmt.Sprintf("UTC%s%02d:%02d", tzsign, tz/60, tz%60) //perf issue using Sprintf. inline below.
-	//tzhr, tzmin := tz/60, tz%60 //faster if u convert to int first
-	var tzhr, tzmin int16
-	if tzint < 0 {
-		tzname[3] = '-' // (TODO: verify. this works here)
-		tzhr, tzmin = -tzint/60, (-tzint)%60
-	} else {
-		tzhr, tzmin = tzint/60, tzint%60
-	}
-	tzname[4] = timeDigits[tzhr/10]
-	tzname[5] = timeDigits[tzhr%10]
-	tzname[7] = timeDigits[tzmin/10]
-	tzname[8] = timeDigits[tzmin%10]
-	return string(tzname)
-	//return time.FixedZone(string(tzname), int(tzint)*60)
-}
diff --git a/Godeps/_workspace/src/github.com/hashicorp/go-msgpack/codec/z_helper_test.go b/Godeps/_workspace/src/github.com/hashicorp/go-msgpack/codec/z_helper_test.go
deleted file mode 100644
index 2e9b3a0f0..000000000
--- a/Godeps/_workspace/src/github.com/hashicorp/go-msgpack/codec/z_helper_test.go
+++ /dev/null
@@ -1,103 +0,0 @@
-// Copyright (c) 2012, 2013 Ugorji Nwoke. All rights reserved.
-// Use of this source code is governed by a BSD-style license found in the LICENSE file.
-
-package codec
-
-// All non-std package dependencies related to testing live in this file,
-// so porting to different environment is easy (just update functions).
-//
-// Also, this file is called z_helper_test, to give a "hint" to compiler
-// that its init() function should be called last. (not guaranteed by spec)
-
-import (
-	"errors"
-	"reflect"
-	"flag"
-	"testing"
-)
-
-var (
-	testLogToT    = true
-	failNowOnFail = true
-)
-
-func init() {
-	testInitFlags()
-	benchInitFlags()
-	flag.Parse()
-	testInit()
-	benchInit()
-}
-
-func checkErrT(t *testing.T, err error) {
-	if err != nil {
-		logT(t, err.Error())
-		failT(t)
-	}
-}
-
-func checkEqualT(t *testing.T, v1 interface{}, v2 interface{}, desc string) (err error) {
-	if err = deepEqual(v1, v2); err != nil {
-		logT(t, "Not Equal: %s: %v. v1: %v, v2: %v", desc, err, v1, v2)
-		failT(t)
-	}
-	return
-}
-
-func logT(x interface{}, format string, args ...interface{}) {
-	if t, ok := x.(*testing.T); ok && t != nil && testLogToT {
-		t.Logf(format, args...)
-	} else if b, ok := x.(*testing.B); ok && b != nil && testLogToT {
-		b.Logf(format, args...)
-	} else {
-		debugf(format, args...)
-	}
-}
-
-func failT(t *testing.T) {
-	if failNowOnFail {
-		t.FailNow()
-	} else {
-		t.Fail()
-	}
-}
-
-func deepEqual(v1, v2 interface{}) (err error) {
-	if !reflect.DeepEqual(v1, v2) {
-		err = errors.New("Not Match")
-	}
-	return
-}
-
-func approxDataSize(rv reflect.Value) (sum int) {
-	switch rk := rv.Kind(); rk {
-	case reflect.Invalid:
-	case reflect.Ptr, reflect.Interface:
-		sum += int(rv.Type().Size())
-		sum += approxDataSize(rv.Elem())
-	case reflect.Slice:
-		sum += int(rv.Type().Size())
-		for j := 0; j < rv.Len(); j++ {
-			sum += approxDataSize(rv.Index(j))
-		}
-	case reflect.String:
-		sum += int(rv.Type().Size())
-		sum += rv.Len()
-	case reflect.Map:
-		sum += int(rv.Type().Size())
-		for _, mk := range rv.MapKeys() {
-			sum += approxDataSize(mk)
-			sum += approxDataSize(rv.MapIndex(mk))
-		}
-	case reflect.Struct:
-		//struct size already includes the full data size.
-		//sum += int(rv.Type().Size())
-		for j := 0; j < rv.NumField(); j++ {
-			sum += approxDataSize(rv.Field(j))
-		}
-	default:
-		//pure value types
-		sum += int(rv.Type().Size())
-	}
-	return
-}
diff --git a/Godeps/_workspace/src/github.com/hashicorp/raft-boltdb/LICENSE b/Godeps/_workspace/src/github.com/hashicorp/raft-boltdb/LICENSE
deleted file mode 100644
index f0e5c79e1..000000000
--- a/Godeps/_workspace/src/github.com/hashicorp/raft-boltdb/LICENSE
+++ /dev/null
@@ -1,362 +0,0 @@
-Mozilla Public License, version 2.0
-
-1. Definitions
-
-1.1. "Contributor"
-
-     means each individual or legal entity that creates, contributes to the
-     creation of, or owns Covered Software.
-
-1.2. "Contributor Version"
-
-     means the combination of the Contributions of others (if any) used by a
-     Contributor and that particular Contributor's Contribution.
-
-1.3. "Contribution"
-
-     means Covered Software of a particular Contributor.
-
-1.4. "Covered Software"
-
-     means Source Code Form to which the initial Contributor has attached the
-     notice in Exhibit A, the Executable Form of such Source Code Form, and
-     Modifications of such Source Code Form, in each case including portions
-     thereof.
-
-1.5. "Incompatible With Secondary Licenses"
-     means
-
-     a. that the initial Contributor has attached the notice described in
-        Exhibit B to the Covered Software; or
-
-     b. that the Covered Software was made available under the terms of
-        version 1.1 or earlier of the License, but not also under the terms of
-        a Secondary License.
-
-1.6. "Executable Form"
-
-     means any form of the work other than Source Code Form.
-
-1.7. "Larger Work"
-
-     means a work that combines Covered Software with other material, in a
-     separate file or files, that is not Covered Software.
-
-1.8. "License"
-
-     means this document.
-
-1.9. "Licensable"
-
-     means having the right to grant, to the maximum extent possible, whether
-     at the time of the initial grant or subsequently, any and all of the
-     rights conveyed by this License.
-
-1.10. "Modifications"
-
-     means any of the following:
-
-     a. any file in Source Code Form that results from an addition to,
-        deletion from, or modification of the contents of Covered Software; or
-
-     b. any new file in Source Code Form that contains any Covered Software.
-
-1.11. "Patent Claims" of a Contributor
-
-      means any patent claim(s), including without limitation, method,
-      process, and apparatus claims, in any patent Licensable by such
-      Contributor that would be infringed, but for the grant of the License,
-      by the making, using, selling, offering for sale, having made, import,
-      or transfer of either its Contributions or its Contributor Version.
-
-1.12. "Secondary License"
-
-      means either the GNU General Public License, Version 2.0, the GNU Lesser
-      General Public License, Version 2.1, the GNU Affero General Public
-      License, Version 3.0, or any later versions of those licenses.
-
-1.13. "Source Code Form"
-
-      means the form of the work preferred for making modifications.
-
-1.14. "You" (or "Your")
-
-      means an individual or a legal entity exercising rights under this
-      License. For legal entities, "You" includes any entity that controls, is
-      controlled by, or is under common control with You. For purposes of this
-      definition, "control" means (a) the power, direct or indirect, to cause
-      the direction or management of such entity, whether by contract or
-      otherwise, or (b) ownership of more than fifty percent (50%) of the
-      outstanding shares or beneficial ownership of such entity.
-
-
-2. License Grants and Conditions
-
-2.1. Grants
-
-     Each Contributor hereby grants You a world-wide, royalty-free,
-     non-exclusive license:
-
-     a. under intellectual property rights (other than patent or trademark)
-        Licensable by such Contributor to use, reproduce, make available,
-        modify, display, perform, distribute, and otherwise exploit its
-        Contributions, either on an unmodified basis, with Modifications, or
-        as part of a Larger Work; and
-
-     b. under Patent Claims of such Contributor to make, use, sell, offer for
-        sale, have made, import, and otherwise transfer either its
-        Contributions or its Contributor Version.
-
-2.2. Effective Date
-
-     The licenses granted in Section 2.1 with respect to any Contribution
-     become effective for each Contribution on the date the Contributor first
-     distributes such Contribution.
-
-2.3. Limitations on Grant Scope
-
-     The licenses granted in this Section 2 are the only rights granted under
-     this License. No additional rights or licenses will be implied from the
-     distribution or licensing of Covered Software under this License.
-     Notwithstanding Section 2.1(b) above, no patent license is granted by a
-     Contributor:
-
-     a. for any code that a Contributor has removed from Covered Software; or
-
-     b. for infringements caused by: (i) Your and any other third party's
-        modifications of Covered Software, or (ii) the combination of its
-        Contributions with other software (except as part of its Contributor
-        Version); or
-
-     c. under Patent Claims infringed by Covered Software in the absence of
-        its Contributions.
-
-     This License does not grant any rights in the trademarks, service marks,
-     or logos of any Contributor (except as may be necessary to comply with
-     the notice requirements in Section 3.4).
-
-2.4. Subsequent Licenses
-
-     No Contributor makes additional grants as a result of Your choice to
-     distribute the Covered Software under a subsequent version of this
-     License (see Section 10.2) or under the terms of a Secondary License (if
-     permitted under the terms of Section 3.3).
-
-2.5. Representation
-
-     Each Contributor represents that the Contributor believes its
-     Contributions are its original creation(s) or it has sufficient rights to
-     grant the rights to its Contributions conveyed by this License.
-
-2.6. Fair Use
-
-     This License is not intended to limit any rights You have under
-     applicable copyright doctrines of fair use, fair dealing, or other
-     equivalents.
-
-2.7. Conditions
-
-     Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted in
-     Section 2.1.
-
-
-3. Responsibilities
-
-3.1. Distribution of Source Form
-
-     All distribution of Covered Software in Source Code Form, including any
-     Modifications that You create or to which You contribute, must be under
-     the terms of this License. You must inform recipients that the Source
-     Code Form of the Covered Software is governed by the terms of this
-     License, and how they can obtain a copy of this License. You may not
-     attempt to alter or restrict the recipients' rights in the Source Code
-     Form.
-
-3.2. Distribution of Executable Form
-
-     If You distribute Covered Software in Executable Form then:
-
-     a. such Covered Software must also be made available in Source Code Form,
-        as described in Section 3.1, and You must inform recipients of the
-        Executable Form how they can obtain a copy of such Source Code Form by
-        reasonable means in a timely manner, at a charge no more than the cost
-        of distribution to the recipient; and
-
-     b. You may distribute such Executable Form under the terms of this
-        License, or sublicense it under different terms, provided that the
-        license for the Executable Form does not attempt to limit or alter the
-        recipients' rights in the Source Code Form under this License.
-
-3.3. Distribution of a Larger Work
-
-     You may create and distribute a Larger Work under terms of Your choice,
-     provided that You also comply with the requirements of this License for
-     the Covered Software. If the Larger Work is a combination of Covered
-     Software with a work governed by one or more Secondary Licenses, and the
-     Covered Software is not Incompatible With Secondary Licenses, this
-     License permits You to additionally distribute such Covered Software
-     under the terms of such Secondary License(s), so that the recipient of
-     the Larger Work may, at their option, further distribute the Covered
-     Software under the terms of either this License or such Secondary
-     License(s).
-
-3.4. Notices
-
-     You may not remove or alter the substance of any license notices
-     (including copyright notices, patent notices, disclaimers of warranty, or
-     limitations of liability) contained within the Source Code Form of the
-     Covered Software, except that You may alter any license notices to the
-     extent required to remedy known factual inaccuracies.
-
-3.5. Application of Additional Terms
-
-     You may choose to offer, and to charge a fee for, warranty, support,
-     indemnity or liability obligations to one or more recipients of Covered
-     Software. However, You may do so only on Your own behalf, and not on
-     behalf of any Contributor. You must make it absolutely clear that any
-     such warranty, support, indemnity, or liability obligation is offered by
-     You alone, and You hereby agree to indemnify every Contributor for any
-     liability incurred by such Contributor as a result of warranty, support,
-     indemnity or liability terms You offer. You may include additional
-     disclaimers of warranty and limitations of liability specific to any
-     jurisdiction.
-
-4. Inability to Comply Due to Statute or Regulation
-
-   If it is impossible for You to comply with any of the terms of this License
-   with respect to some or all of the Covered Software due to statute,
-   judicial order, or regulation then You must: (a) comply with the terms of
-   this License to the maximum extent possible; and (b) describe the
-   limitations and the code they affect. Such description must be placed in a
-   text file included with all distributions of the Covered Software under
-   this License. Except to the extent prohibited by statute or regulation,
-   such description must be sufficiently detailed for a recipient of ordinary
-   skill to be able to understand it.
-
-5. Termination
-
-5.1. The rights granted under this License will terminate automatically if You
-     fail to comply with any of its terms. However, if You become compliant,
-     then the rights granted under this License from a particular Contributor
-     are reinstated (a) provisionally, unless and until such Contributor
-     explicitly and finally terminates Your grants, and (b) on an ongoing
-     basis, if such Contributor fails to notify You of the non-compliance by
-     some reasonable means prior to 60 days after You have come back into
-     compliance. Moreover, Your grants from a particular Contributor are
-     reinstated on an ongoing basis if such Contributor notifies You of the
-     non-compliance by some reasonable means, this is the first time You have
-     received notice of non-compliance with this License from such
-     Contributor, and You become compliant prior to 30 days after Your receipt
-     of the notice.
-
-5.2. If You initiate litigation against any entity by asserting a patent
-     infringement claim (excluding declaratory judgment actions,
-     counter-claims, and cross-claims) alleging that a Contributor Version
-     directly or indirectly infringes any patent, then the rights granted to
-     You by any and all Contributors for the Covered Software under Section
-     2.1 of this License shall terminate.
-
-5.3. In the event of termination under Sections 5.1 or 5.2 above, all end user
-     license agreements (excluding distributors and resellers) which have been
-     validly granted by You or Your distributors under this License prior to
-     termination shall survive termination.
-
-6. Disclaimer of Warranty
-
-   Covered Software is provided under this License on an "as is" basis,
-   without warranty of any kind, either expressed, implied, or statutory,
-   including, without limitation, warranties that the Covered Software is free
-   of defects, merchantable, fit for a particular purpose or non-infringing.
-   The entire risk as to the quality and performance of the Covered Software
-   is with You. Should any Covered Software prove defective in any respect,
-   You (not any Contributor) assume the cost of any necessary servicing,
-   repair, or correction. This disclaimer of warranty constitutes an essential
-   part of this License. No use of  any Covered Software is authorized under
-   this License except under this disclaimer.
-
-7. Limitation of Liability
-
-   Under no circumstances and under no legal theory, whether tort (including
-   negligence), contract, or otherwise, shall any Contributor, or anyone who
-   distributes Covered Software as permitted above, be liable to You for any
-   direct, indirect, special, incidental, or consequential damages of any
-   character including, without limitation, damages for lost profits, loss of
-   goodwill, work stoppage, computer failure or malfunction, or any and all
-   other commercial damages or losses, even if such party shall have been
-   informed of the possibility of such damages. This limitation of liability
-   shall not apply to liability for death or personal injury resulting from
-   such party's negligence to the extent applicable law prohibits such
-   limitation. Some jurisdictions do not allow the exclusion or limitation of
-   incidental or consequential damages, so this exclusion and limitation may
-   not apply to You.
-
-8. Litigation
-
-   Any litigation relating to this License may be brought only in the courts
-   of a jurisdiction where the defendant maintains its principal place of
-   business and such litigation shall be governed by laws of that
-   jurisdiction, without reference to its conflict-of-law provisions. Nothing
-   in this Section shall prevent a party's ability to bring cross-claims or
-   counter-claims.
-
-9. Miscellaneous
-
-   This License represents the complete agreement concerning the subject
-   matter hereof. If any provision of this License is held to be
-   unenforceable, such provision shall be reformed only to the extent
-   necessary to make it enforceable. Any law or regulation which provides that
-   the language of a contract shall be construed against the drafter shall not
-   be used to construe this License against a Contributor.
-
-
-10. Versions of the License
-
-10.1. New Versions
-
-      Mozilla Foundation is the license steward. Except as provided in Section
-      10.3, no one other than the license steward has the right to modify or
-      publish new versions of this License. Each version will be given a
-      distinguishing version number.
-
-10.2. Effect of New Versions
-
-      You may distribute the Covered Software under the terms of the version
-      of the License under which You originally received the Covered Software,
-      or under the terms of any subsequent version published by the license
-      steward.
-
-10.3. Modified Versions
-
-      If you create software not governed by this License, and you want to
-      create a new license for such software, you may create and use a
-      modified version of this License if you rename the license and remove
-      any references to the name of the license steward (except to note that
-      such modified license differs from this License).
-
-10.4. Distributing Source Code Form that is Incompatible With Secondary
-      Licenses If You choose to distribute Source Code Form that is
-      Incompatible With Secondary Licenses under the terms of this version of
-      the License, the notice described in Exhibit B of this License must be
-      attached.
-
-Exhibit A - Source Code Form License Notice
-
-      This Source Code Form is subject to the
-      terms of the Mozilla Public License, v.
-      2.0. If a copy of the MPL was not
-      distributed with this file, You can
-      obtain one at
-      http://mozilla.org/MPL/2.0/.
-
-If it is not possible or desirable to put the notice in a particular file,
-then You may include the notice in a location (such as a LICENSE file in a
-relevant directory) where a recipient would be likely to look for such a
-notice.
-
-You may add additional accurate notices of copyright ownership.
-
-Exhibit B - "Incompatible With Secondary Licenses" Notice
-
-      This Source Code Form is "Incompatible
-      With Secondary Licenses", as defined by
-      the Mozilla Public License, v. 2.0.
\ No newline at end of file
diff --git a/Godeps/_workspace/src/github.com/hashicorp/raft-boltdb/README.md b/Godeps/_workspace/src/github.com/hashicorp/raft-boltdb/README.md
deleted file mode 100644
index 5d7180ab9..000000000
--- a/Godeps/_workspace/src/github.com/hashicorp/raft-boltdb/README.md
+++ /dev/null
@@ -1,11 +0,0 @@
-raft-boltdb
-===========
-
-This repository provides the `raftboltdb` package. The package exports the
-`BoltStore` which is an implementation of both a `LogStore` and `StableStore`.
-
-It is meant to be used as a backend for the `raft` [package
-here](https://github.com/hashicorp/raft).
-
-This implementation uses [BoltDB](https://github.com/boltdb/bolt). BoltDB is
-a simple key/value store implemented in pure Go, and inspired by LMDB.
diff --git a/Godeps/_workspace/src/github.com/hashicorp/raft-boltdb/bench_test.go b/Godeps/_workspace/src/github.com/hashicorp/raft-boltdb/bench_test.go
deleted file mode 100644
index b860706fd..000000000
--- a/Godeps/_workspace/src/github.com/hashicorp/raft-boltdb/bench_test.go
+++ /dev/null
@@ -1,88 +0,0 @@
-package raftboltdb
-
-import (
-	"os"
-	"testing"
-
-	"github.com/hashicorp/raft/bench"
-)
-
-func BenchmarkBoltStore_FirstIndex(b *testing.B) {
-	store := testBoltStore(b)
-	defer store.Close()
-	defer os.Remove(store.path)
-
-	raftbench.FirstIndex(b, store)
-}
-
-func BenchmarkBoltStore_LastIndex(b *testing.B) {
-	store := testBoltStore(b)
-	defer store.Close()
-	defer os.Remove(store.path)
-
-	raftbench.LastIndex(b, store)
-}
-
-func BenchmarkBoltStore_GetLog(b *testing.B) {
-	store := testBoltStore(b)
-	defer store.Close()
-	defer os.Remove(store.path)
-
-	raftbench.GetLog(b, store)
-}
-
-func BenchmarkBoltStore_StoreLog(b *testing.B) {
-	store := testBoltStore(b)
-	defer store.Close()
-	defer os.Remove(store.path)
-
-	raftbench.StoreLog(b, store)
-}
-
-func BenchmarkBoltStore_StoreLogs(b *testing.B) {
-	store := testBoltStore(b)
-	defer store.Close()
-	defer os.Remove(store.path)
-
-	raftbench.StoreLogs(b, store)
-}
-
-func BenchmarkBoltStore_DeleteRange(b *testing.B) {
-	store := testBoltStore(b)
-	defer store.Close()
-	defer os.Remove(store.path)
-
-	raftbench.DeleteRange(b, store)
-}
-
-func BenchmarkBoltStore_Set(b *testing.B) {
-	store := testBoltStore(b)
-	defer store.Close()
-	defer os.Remove(store.path)
-
-	raftbench.Set(b, store)
-}
-
-func BenchmarkBoltStore_Get(b *testing.B) {
-	store := testBoltStore(b)
-	defer store.Close()
-	defer os.Remove(store.path)
-
-	raftbench.Get(b, store)
-}
-
-func BenchmarkBoltStore_SetUint64(b *testing.B) {
-	store := testBoltStore(b)
-	defer store.Close()
-	defer os.Remove(store.path)
-
-	raftbench.SetUint64(b, store)
-}
-
-func BenchmarkBoltStore_GetUint64(b *testing.B) {
-	store := testBoltStore(b)
-	defer store.Close()
-	defer os.Remove(store.path)
-
-	raftbench.GetUint64(b, store)
-}
diff --git a/Godeps/_workspace/src/github.com/hashicorp/raft-boltdb/bolt_store.go b/Godeps/_workspace/src/github.com/hashicorp/raft-boltdb/bolt_store.go
deleted file mode 100644
index ab6dd4803..000000000
--- a/Godeps/_workspace/src/github.com/hashicorp/raft-boltdb/bolt_store.go
+++ /dev/null
@@ -1,231 +0,0 @@
-package raftboltdb
-
-import (
-	"errors"
-
-	"github.com/boltdb/bolt"
-	"github.com/hashicorp/raft"
-)
-
-const (
-	// Permissions to use on the db file. This is only used if the
-	// database file does not exist and needs to be created.
-	dbFileMode = 0600
-)
-
-var (
-	// Bucket names we perform transactions in
-	dbLogs = []byte("logs")
-	dbConf = []byte("conf")
-
-	// An error indicating a given key does not exist
-	ErrKeyNotFound = errors.New("not found")
-)
-
-// BoltStore provides access to BoltDB for Raft to store and retrieve
-// log entries. It also provides key/value storage, and can be used as
-// a LogStore and StableStore.
-type BoltStore struct {
-	// conn is the underlying handle to the db.
-	conn *bolt.DB
-
-	// The path to the Bolt database file
-	path string
-}
-
-// NewBoltStore takes a file path and returns a connected Raft backend.
-func NewBoltStore(path string) (*BoltStore, error) {
-	// Try to connect
-	handle, err := bolt.Open(path, dbFileMode, nil)
-	if err != nil {
-		return nil, err
-	}
-
-	// Create the new store
-	store := &BoltStore{
-		conn: handle,
-		path: path,
-	}
-
-	// Set up our buckets
-	if err := store.initialize(); err != nil {
-		store.Close()
-		return nil, err
-	}
-
-	return store, nil
-}
-
-// initialize is used to set up all of the buckets.
-func (b *BoltStore) initialize() error {
-	tx, err := b.conn.Begin(true)
-	if err != nil {
-		return err
-	}
-	defer tx.Rollback()
-
-	// Create all the buckets
-	if _, err := tx.CreateBucketIfNotExists(dbLogs); err != nil {
-		return err
-	}
-	if _, err := tx.CreateBucketIfNotExists(dbConf); err != nil {
-		return err
-	}
-
-	return tx.Commit()
-}
-
-// Close is used to gracefully close the DB connection.
-func (b *BoltStore) Close() error {
-	return b.conn.Close()
-}
-
-// FirstIndex returns the first known index from the Raft log.
-func (b *BoltStore) FirstIndex() (uint64, error) {
-	tx, err := b.conn.Begin(false)
-	if err != nil {
-		return 0, err
-	}
-	defer tx.Rollback()
-
-	curs := tx.Bucket(dbLogs).Cursor()
-	if first, _ := curs.First(); first == nil {
-		return 0, nil
-	} else {
-		return bytesToUint64(first), nil
-	}
-}
-
-// LastIndex returns the last known index from the Raft log.
-func (b *BoltStore) LastIndex() (uint64, error) {
-	tx, err := b.conn.Begin(false)
-	if err != nil {
-		return 0, err
-	}
-	defer tx.Rollback()
-
-	curs := tx.Bucket(dbLogs).Cursor()
-	if last, _ := curs.Last(); last == nil {
-		return 0, nil
-	} else {
-		return bytesToUint64(last), nil
-	}
-}
-
-// GetLog is used to retrieve a log from BoltDB at a given index.
-func (b *BoltStore) GetLog(idx uint64, log *raft.Log) error {
-	tx, err := b.conn.Begin(false)
-	if err != nil {
-		return err
-	}
-	defer tx.Rollback()
-
-	bucket := tx.Bucket(dbLogs)
-	val := bucket.Get(uint64ToBytes(idx))
-
-	if val == nil {
-		return raft.ErrLogNotFound
-	}
-	return decodeMsgPack(val, log)
-}
-
-// StoreLog is used to store a single raft log
-func (b *BoltStore) StoreLog(log *raft.Log) error {
-	return b.StoreLogs([]*raft.Log{log})
-}
-
-// StoreLogs is used to store a set of raft logs
-func (b *BoltStore) StoreLogs(logs []*raft.Log) error {
-	tx, err := b.conn.Begin(true)
-	if err != nil {
-		return err
-	}
-	defer tx.Rollback()
-
-	for _, log := range logs {
-		key := uint64ToBytes(log.Index)
-		val, err := encodeMsgPack(log)
-		if err != nil {
-			return err
-		}
-		bucket := tx.Bucket(dbLogs)
-		if err := bucket.Put(key, val.Bytes()); err != nil {
-			return err
-		}
-	}
-
-	return tx.Commit()
-}
-
-// DeleteRange is used to delete logs within a given range inclusively.
-func (b *BoltStore) DeleteRange(min, max uint64) error {
-	minKey := uint64ToBytes(min)
-
-	tx, err := b.conn.Begin(true)
-	if err != nil {
-		return err
-	}
-	defer tx.Rollback()
-
-	curs := tx.Bucket(dbLogs).Cursor()
-	for k, _ := curs.Seek(minKey); k != nil; k, _ = curs.Next() {
-		// Handle out-of-range log index
-		if bytesToUint64(k) > max {
-			break
-		}
-
-		// Delete in-range log index
-		if err := curs.Delete(); err != nil {
-			return err
-		}
-	}
-
-	return tx.Commit()
-}
-
-// Set is used to set a key/value set outside of the raft log
-func (b *BoltStore) Set(k, v []byte) error {
-	tx, err := b.conn.Begin(true)
-	if err != nil {
-		return err
-	}
-	defer tx.Rollback()
-
-	bucket := tx.Bucket(dbConf)
-	if err := bucket.Put(k, v); err != nil {
-		return err
-	}
-
-	return tx.Commit()
-}
-
-// Get is used to retrieve a value from the k/v store by key
-func (b *BoltStore) Get(k []byte) ([]byte, error) {
-	tx, err := b.conn.Begin(false)
-	if err != nil {
-		return nil, err
-	}
-	defer tx.Rollback()
-
-	bucket := tx.Bucket(dbConf)
-	val := bucket.Get(k)
-
-	if val == nil {
-		return nil, ErrKeyNotFound
-	}
-	return append([]byte{}, val...), nil
-}
-
-// SetUint64 is like Set, but handles uint64 values
-func (b *BoltStore) SetUint64(key []byte, val uint64) error {
-	return b.Set(key, uint64ToBytes(val))
-}
-
-// GetUint64 is like Get, but handles uint64 values
-func (b *BoltStore) GetUint64(key []byte) (uint64, error) {
-	val, err := b.Get(key)
-	if err != nil {
-		return 0, err
-	}
-	return bytesToUint64(val), nil
-}
diff --git a/Godeps/_workspace/src/github.com/hashicorp/raft-boltdb/bolt_store_test.go b/Godeps/_workspace/src/github.com/hashicorp/raft-boltdb/bolt_store_test.go
deleted file mode 100644
index ab2a1525c..000000000
--- a/Godeps/_workspace/src/github.com/hashicorp/raft-boltdb/bolt_store_test.go
+++ /dev/null
@@ -1,332 +0,0 @@
-package raftboltdb
-
-import (
-	"bytes"
-	"io/ioutil"
-	"os"
-	"reflect"
-	"testing"
-
-	"github.com/boltdb/bolt"
-	"github.com/hashicorp/raft"
-)
-
-func testBoltStore(t testing.TB) *BoltStore {
-	fh, err := ioutil.TempFile("", "bolt")
-	if err != nil {
-		t.Fatalf("err: %s", err)
-	}
-	os.Remove(fh.Name())
-
-	// Successfully creates and returns a store
-	store, err := NewBoltStore(fh.Name())
-	if err != nil {
-		t.Fatalf("err: %s", err)
-	}
-
-	return store
-}
-
-func testRaftLog(idx uint64, data string) *raft.Log {
-	return &raft.Log{
-		Data:  []byte(data),
-		Index: idx,
-	}
-}
-
-func TestBoltStore_Implements(t *testing.T) {
-	var store interface{} = &BoltStore{}
-	if _, ok := store.(raft.StableStore); !ok {
-		t.Fatalf("BoltStore does not implement raft.StableStore")
-	}
-	if _, ok := store.(raft.LogStore); !ok {
-		t.Fatalf("BoltStore does not implement raft.LogStore")
-	}
-}
-
-func TestNewBoltStore(t *testing.T) {
-	fh, err := ioutil.TempFile("", "bolt")
-	if err != nil {
-		t.Fatalf("err: %s", err)
-	}
-	os.Remove(fh.Name())
-	defer os.Remove(fh.Name())
-
-	// Successfully creates and returns a store
-	store, err := NewBoltStore(fh.Name())
-	if err != nil {
-		t.Fatalf("err: %s", err)
-	}
-
-	// Ensure the file was created
-	if store.path != fh.Name() {
-		t.Fatalf("unexpected file path %q", store.path)
-	}
-	if _, err := os.Stat(fh.Name()); err != nil {
-		t.Fatalf("err: %s", err)
-	}
-
-	// Close the store so we can open again
-	if err := store.Close(); err != nil {
-		t.Fatalf("err: %s", err)
-	}
-
-	// Ensure our tables were created
-	db, err := bolt.Open(fh.Name(), dbFileMode, nil)
-	if err != nil {
-		t.Fatalf("err: %s", err)
-	}
-	tx, err := db.Begin(true)
-	if err != nil {
-		t.Fatalf("err: %s", err)
-	}
-	if _, err := tx.CreateBucket([]byte(dbLogs)); err != bolt.ErrBucketExists {
-		t.Fatalf("bad: %v", err)
-	}
-	if _, err := tx.CreateBucket([]byte(dbConf)); err != bolt.ErrBucketExists {
-		t.Fatalf("bad: %v", err)
-	}
-}
-
-func TestBoltStore_FirstIndex(t *testing.T) {
-	store := testBoltStore(t)
-	defer store.Close()
-	defer os.Remove(store.path)
-
-	// Should get 0 index on empty log
-	idx, err := store.FirstIndex()
-	if err != nil {
-		t.Fatalf("err: %s", err)
-	}
-	if idx != 0 {
-		t.Fatalf("bad: %v", idx)
-	}
-
-	// Set a mock raft log
-	logs := []*raft.Log{
-		testRaftLog(1, "log1"),
-		testRaftLog(2, "log2"),
-		testRaftLog(3, "log3"),
-	}
-	if err := store.StoreLogs(logs); err != nil {
-		t.Fatalf("bad: %s", err)
-	}
-
-	// Fetch the first Raft index
-	idx, err = store.FirstIndex()
-	if err != nil {
-		t.Fatalf("err: %s", err)
-	}
-	if idx != 1 {
-		t.Fatalf("bad: %d", idx)
-	}
-}
-
-func TestBoltStore_LastIndex(t *testing.T) {
-	store := testBoltStore(t)
-	defer store.Close()
-	defer os.Remove(store.path)
-
-	// Should get 0 index on empty log
-	idx, err := store.LastIndex()
-	if err != nil {
-		t.Fatalf("err: %s", err)
-	}
-	if idx != 0 {
-		t.Fatalf("bad: %v", idx)
-	}
-
-	// Set a mock raft log
-	logs := []*raft.Log{
-		testRaftLog(1, "log1"),
-		testRaftLog(2, "log2"),
-		testRaftLog(3, "log3"),
-	}
-	if err := store.StoreLogs(logs); err != nil {
-		t.Fatalf("bad: %s", err)
-	}
-
-	// Fetch the last Raft index
-	idx, err = store.LastIndex()
-	if err != nil {
-		t.Fatalf("err: %s", err)
-	}
-	if idx != 3 {
-		t.Fatalf("bad: %d", idx)
-	}
-}
-
-func TestBoltStore_GetLog(t *testing.T) {
-	store := testBoltStore(t)
-	defer store.Close()
-	defer os.Remove(store.path)
-
-	log := new(raft.Log)
-
-	// Should return an error on non-existent log
-	if err := store.GetLog(1, log); err != raft.ErrLogNotFound {
-		t.Fatalf("expected raft log not found error, got: %v", err)
-	}
-
-	// Set a mock raft log
-	logs := []*raft.Log{
-		testRaftLog(1, "log1"),
-		testRaftLog(2, "log2"),
-		testRaftLog(3, "log3"),
-	}
-	if err := store.StoreLogs(logs); err != nil {
-		t.Fatalf("bad: %s", err)
-	}
-
-	// Should return the proper log
-	if err := store.GetLog(2, log); err != nil {
-		t.Fatalf("err: %s", err)
-	}
-	if !reflect.DeepEqual(log, logs[1]) {
-		t.Fatalf("bad: %#v", log)
-	}
-}
-
-func TestBoltStore_SetLog(t *testing.T) {
-	store := testBoltStore(t)
-	defer store.Close()
-	defer os.Remove(store.path)
-
-	// Create the log
-	log := &raft.Log{
-		Data:  []byte("log1"),
-		Index: 1,
-	}
-
-	// Attempt to store the log
-	if err := store.StoreLog(log); err != nil {
-		t.Fatalf("err: %s", err)
-	}
-
-	// Retrieve the log again
-	result := new(raft.Log)
-	if err := store.GetLog(1, result); err != nil {
-		t.Fatalf("err: %s", err)
-	}
-
-	// Ensure the log comes back the same
-	if !reflect.DeepEqual(log, result) {
-		t.Fatalf("bad: %v", result)
-	}
-}
-
-func TestBoltStore_SetLogs(t *testing.T) {
-	store := testBoltStore(t)
-	defer store.Close()
-	defer os.Remove(store.path)
-
-	// Create a set of logs
-	logs := []*raft.Log{
-		testRaftLog(1, "log1"),
-		testRaftLog(2, "log2"),
-	}
-
-	// Attempt to store the logs
-	if err := store.StoreLogs(logs); err != nil {
-		t.Fatalf("err: %s", err)
-	}
-
-	// Ensure we stored them all
-	result1, result2 := new(raft.Log), new(raft.Log)
-	if err := store.GetLog(1, result1); err != nil {
-		t.Fatalf("err: %s", err)
-	}
-	if !reflect.DeepEqual(logs[0], result1) {
-		t.Fatalf("bad: %#v", result1)
-	}
-	if err := store.GetLog(2, result2); err != nil {
-		t.Fatalf("err: %s", err)
-	}
-	if !reflect.DeepEqual(logs[1], result2) {
-		t.Fatalf("bad: %#v", result2)
-	}
-}
-
-func TestBoltStore_DeleteRange(t *testing.T) {
-	store := testBoltStore(t)
-	defer store.Close()
-	defer os.Remove(store.path)
-
-	// Create a set of logs
-	log1 := testRaftLog(1, "log1")
-	log2 := testRaftLog(2, "log2")
-	log3 := testRaftLog(3, "log3")
-	logs := []*raft.Log{log1, log2, log3}
-
-	// Attempt to store the logs
-	if err := store.StoreLogs(logs); err != nil {
-		t.Fatalf("err: %s", err)
-	}
-
-	// Attempt to delete a range of logs
-	if err := store.DeleteRange(1, 2); err != nil {
-		t.Fatalf("err: %s", err)
-	}
-
-	// Ensure the logs were deleted
-	if err := store.GetLog(1, new(raft.Log)); err != raft.ErrLogNotFound {
-		t.Fatalf("should have deleted log1")
-	}
-	if err := store.GetLog(2, new(raft.Log)); err != raft.ErrLogNotFound {
-		t.Fatalf("should have deleted log2")
-	}
-}
-
-func TestBoltStore_Set_Get(t *testing.T) {
-	store := testBoltStore(t)
-	defer store.Close()
-	defer os.Remove(store.path)
-
-	// Returns error on non-existent key
-	if _, err := store.Get([]byte("bad")); err != ErrKeyNotFound {
-		t.Fatalf("expected not found error, got: %q", err)
-	}
-
-	k, v := []byte("hello"), []byte("world")
-
-	// Try to set a k/v pair
-	if err := store.Set(k, v); err != nil {
-		t.Fatalf("err: %s", err)
-	}
-
-	// Try to read it back
-	val, err := store.Get(k)
-	if err != nil {
-		t.Fatalf("err: %s", err)
-	}
-	if !bytes.Equal(val, v) {
-		t.Fatalf("bad: %v", val)
-	}
-}
-
-func TestBoltStore_SetUint64_GetUint64(t *testing.T) {
-	store := testBoltStore(t)
-	defer store.Close()
-	defer os.Remove(store.path)
-
-	// Returns error on non-existent key
-	if _, err := store.GetUint64([]byte("bad")); err != ErrKeyNotFound {
-		t.Fatalf("expected not found error, got: %q", err)
-	}
-
-	k, v := []byte("abc"), uint64(123)
-
-	// Attempt to set the k/v pair
-	if err := store.SetUint64(k, v); err != nil {
-		t.Fatalf("err: %s", err)
-	}
-
-	// Read back the value
-	val, err := store.GetUint64(k)
-	if err != nil {
-		t.Fatalf("err: %s", err)
-	}
-	if val != v {
-		t.Fatalf("bad: %v", val)
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/hashicorp/raft-boltdb/util.go b/Godeps/_workspace/src/github.com/hashicorp/raft-boltdb/util.go
deleted file mode 100644
index 68dd786b7..000000000
--- a/Godeps/_workspace/src/github.com/hashicorp/raft-boltdb/util.go
+++ /dev/null
@@ -1,37 +0,0 @@
-package raftboltdb
-
-import (
-	"bytes"
-	"encoding/binary"
-
-	"github.com/hashicorp/go-msgpack/codec"
-)
-
-// Decode reverses the encode operation on a byte slice input
-func decodeMsgPack(buf []byte, out interface{}) error {
-	r := bytes.NewBuffer(buf)
-	hd := codec.MsgpackHandle{}
-	dec := codec.NewDecoder(r, &hd)
-	return dec.Decode(out)
-}
-
-// Encode writes an encoded object to a new bytes buffer
-func encodeMsgPack(in interface{}) (*bytes.Buffer, error) {
-	buf := bytes.NewBuffer(nil)
-	hd := codec.MsgpackHandle{}
-	enc := codec.NewEncoder(buf, &hd)
-	err := enc.Encode(in)
-	return buf, err
-}
-
-// Converts bytes to an integer
-func bytesToUint64(b []byte) uint64 {
-	return binary.BigEndian.Uint64(b)
-}
-
-// Converts a uint to a byte slice
-func uint64ToBytes(u uint64) []byte {
-	buf := make([]byte, 8)
-	binary.BigEndian.PutUint64(buf, u)
-	return buf
-}
diff --git a/Godeps/_workspace/src/github.com/hashicorp/raft/.gitignore b/Godeps/_workspace/src/github.com/hashicorp/raft/.gitignore
deleted file mode 100644
index 836562412..000000000
--- a/Godeps/_workspace/src/github.com/hashicorp/raft/.gitignore
+++ /dev/null
@@ -1,23 +0,0 @@
-# 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
diff --git a/Godeps/_workspace/src/github.com/hashicorp/raft/.travis.yml b/Godeps/_workspace/src/github.com/hashicorp/raft/.travis.yml
deleted file mode 100644
index 5cf041d26..000000000
--- a/Godeps/_workspace/src/github.com/hashicorp/raft/.travis.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-language: go
-
-go:
-    - 1.2
-    - tip
-
-install: make deps
-script:
-    - make integ
-
-notifications:
-    flowdock:
-        secure: fZrcf9rlh2IrQrlch1sHkn3YI7SKvjGnAl/zyV5D6NROe1Bbr6d3QRMuCXWWdhJHzjKmXk5rIzbqJhUc0PNF7YjxGNKSzqWMQ56KcvN1k8DzlqxpqkcA3Jbs6fXCWo2fssRtZ7hj/wOP1f5n6cc7kzHDt9dgaYJ6nO2fqNPJiTc=
-
diff --git a/Godeps/_workspace/src/github.com/hashicorp/raft/LICENSE b/Godeps/_workspace/src/github.com/hashicorp/raft/LICENSE
deleted file mode 100644
index c33dcc7c9..000000000
--- a/Godeps/_workspace/src/github.com/hashicorp/raft/LICENSE
+++ /dev/null
@@ -1,354 +0,0 @@
-Mozilla Public License, version 2.0
-
-1. Definitions
-
-1.1. “Contributor”
-
-     means each individual or legal entity that creates, contributes to the
-     creation of, or owns Covered Software.
-
-1.2. “Contributor Version”
-
-     means the combination of the Contributions of others (if any) used by a
-     Contributor and that particular Contributor’s Contribution.
-
-1.3. “Contribution”
-
-     means Covered Software of a particular Contributor.
-
-1.4. “Covered Software”
-
-     means Source Code Form to which the initial Contributor has attached the
-     notice in Exhibit A, the Executable Form of such Source Code Form, and
-     Modifications of such Source Code Form, in each case including portions
-     thereof.
-
-1.5. “Incompatible With Secondary Licenses”
-     means
-
-     a. that the initial Contributor has attached the notice described in
-        Exhibit B to the Covered Software; or
-
-     b. that the Covered Software was made available under the terms of version
-        1.1 or earlier of the License, but not also under the terms of a
-        Secondary License.
-
-1.6. “Executable Form”
-
-     means any form of the work other than Source Code Form.
-
-1.7. “Larger Work”
-
-     means a work that combines Covered Software with other material, in a separate
-     file or files, that is not Covered Software.
-
-1.8. “License”
-
-     means this document.
-
-1.9. “Licensable”
-
-     means having the right to grant, to the maximum extent possible, whether at the
-     time of the initial grant or subsequently, any and all of the rights conveyed by
-     this License.
-
-1.10. “Modifications”
-
-     means any of the following:
-
-     a. any file in Source Code Form that results from an addition to, deletion
-        from, or modification of the contents of Covered Software; or
-
-     b. any new file in Source Code Form that contains any Covered Software.
-
-1.11. “Patent Claims” of a Contributor
-
-      means any patent claim(s), including without limitation, method, process,
-      and apparatus claims, in any patent Licensable by such Contributor that
-      would be infringed, but for the grant of the License, by the making,
-      using, selling, offering for sale, having made, import, or transfer of
-      either its Contributions or its Contributor Version.
-
-1.12. “Secondary License”
-
-      means either the GNU General Public License, Version 2.0, the GNU Lesser
-      General Public License, Version 2.1, the GNU Affero General Public
-      License, Version 3.0, or any later versions of those licenses.
-
-1.13. “Source Code Form”
-
-      means the form of the work preferred for making modifications.
-
-1.14. “You” (or “Your”)
-
-      means an individual or a legal entity exercising rights under this
-      License. For legal entities, “You” includes any entity that controls, is
-      controlled by, or is under common control with You. For purposes of this
-      definition, “control” means (a) the power, direct or indirect, to cause
-      the direction or management of such entity, whether by contract or
-      otherwise, or (b) ownership of more than fifty percent (50%) of the
-      outstanding shares or beneficial ownership of such entity.
-
-
-2. License Grants and Conditions
-
-2.1. Grants
-
-     Each Contributor hereby grants You a world-wide, royalty-free,
-     non-exclusive license:
-
-     a. under intellectual property rights (other than patent or trademark)
-        Licensable by such Contributor to use, reproduce, make available,
-        modify, display, perform, distribute, and otherwise exploit its
-        Contributions, either on an unmodified basis, with Modifications, or as
-        part of a Larger Work; and
-
-     b. under Patent Claims of such Contributor to make, use, sell, offer for
-        sale, have made, import, and otherwise transfer either its Contributions
-        or its Contributor Version.
-
-2.2. Effective Date
-
-     The licenses granted in Section 2.1 with respect to any Contribution become
-     effective for each Contribution on the date the Contributor first distributes
-     such Contribution.
-
-2.3. Limitations on Grant Scope
-
-     The licenses granted in this Section 2 are the only rights granted under this
-     License. No additional rights or licenses will be implied from the distribution
-     or licensing of Covered Software under this License. Notwithstanding Section
-     2.1(b) above, no patent license is granted by a Contributor:
-
-     a. for any code that a Contributor has removed from Covered Software; or
-
-     b. for infringements caused by: (i) Your and any other third party’s
-        modifications of Covered Software, or (ii) the combination of its
-        Contributions with other software (except as part of its Contributor
-        Version); or
-
-     c. under Patent Claims infringed by Covered Software in the absence of its
-        Contributions.
-
-     This License does not grant any rights in the trademarks, service marks, or
-     logos of any Contributor (except as may be necessary to comply with the
-     notice requirements in Section 3.4).
-
-2.4. Subsequent Licenses
-
-     No Contributor makes additional grants as a result of Your choice to
-     distribute the Covered Software under a subsequent version of this License
-     (see Section 10.2) or under the terms of a Secondary License (if permitted
-     under the terms of Section 3.3).
-
-2.5. Representation
-
-     Each Contributor represents that the Contributor believes its Contributions
-     are its original creation(s) or it has sufficient rights to grant the
-     rights to its Contributions conveyed by this License.
-
-2.6. Fair Use
-
-     This License is not intended to limit any rights You have under applicable
-     copyright doctrines of fair use, fair dealing, or other equivalents.
-
-2.7. Conditions
-
-     Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted in
-     Section 2.1.
-
-
-3. Responsibilities
-
-3.1. Distribution of Source Form
-
-     All distribution of Covered Software in Source Code Form, including any
-     Modifications that You create or to which You contribute, must be under the
-     terms of this License. You must inform recipients that the Source Code Form
-     of the Covered Software is governed by the terms of this License, and how
-     they can obtain a copy of this License. You may not attempt to alter or
-     restrict the recipients’ rights in the Source Code Form.
-
-3.2. Distribution of Executable Form
-
-     If You distribute Covered Software in Executable Form then:
-
-     a. such Covered Software must also be made available in Source Code Form,
-        as described in Section 3.1, and You must inform recipients of the
-        Executable Form how they can obtain a copy of such Source Code Form by
-        reasonable means in a timely manner, at a charge no more than the cost
-        of distribution to the recipient; and
-
-     b. You may distribute such Executable Form under the terms of this License,
-        or sublicense it under different terms, provided that the license for
-        the Executable Form does not attempt to limit or alter the recipients’
-        rights in the Source Code Form under this License.
-
-3.3. Distribution of a Larger Work
-
-     You may create and distribute a Larger Work under terms of Your choice,
-     provided that You also comply with the requirements of this License for the
-     Covered Software. If the Larger Work is a combination of Covered Software
-     with a work governed by one or more Secondary Licenses, and the Covered
-     Software is not Incompatible With Secondary Licenses, this License permits
-     You to additionally distribute such Covered Software under the terms of
-     such Secondary License(s), so that the recipient of the Larger Work may, at
-     their option, further distribute the Covered Software under the terms of
-     either this License or such Secondary License(s).
-
-3.4. Notices
-
-     You may not remove or alter the substance of any license notices (including
-     copyright notices, patent notices, disclaimers of warranty, or limitations
-     of liability) contained within the Source Code Form of the Covered
-     Software, except that You may alter any license notices to the extent
-     required to remedy known factual inaccuracies.
-
-3.5. Application of Additional Terms
-
-     You may choose to offer, and to charge a fee for, warranty, support,
-     indemnity or liability obligations to one or more recipients of Covered
-     Software. However, You may do so only on Your own behalf, and not on behalf
-     of any Contributor. You must make it absolutely clear that any such
-     warranty, support, indemnity, or liability obligation is offered by You
-     alone, and You hereby agree to indemnify every Contributor for any
-     liability incurred by such Contributor as a result of warranty, support,
-     indemnity or liability terms You offer. You may include additional
-     disclaimers of warranty and limitations of liability specific to any
-     jurisdiction.
-
-4. Inability to Comply Due to Statute or Regulation
-
-   If it is impossible for You to comply with any of the terms of this License
-   with respect to some or all of the Covered Software due to statute, judicial
-   order, or regulation then You must: (a) comply with the terms of this License
-   to the maximum extent possible; and (b) describe the limitations and the code
-   they affect. Such description must be placed in a text file included with all
-   distributions of the Covered Software under this License. Except to the
-   extent prohibited by statute or regulation, such description must be
-   sufficiently detailed for a recipient of ordinary skill to be able to
-   understand it.
-
-5. Termination
-
-5.1. The rights granted under this License will terminate automatically if You
-     fail to comply with any of its terms. However, if You become compliant,
-     then the rights granted under this License from a particular Contributor
-     are reinstated (a) provisionally, unless and until such Contributor
-     explicitly and finally terminates Your grants, and (b) on an ongoing basis,
-     if such Contributor fails to notify You of the non-compliance by some
-     reasonable means prior to 60 days after You have come back into compliance.
-     Moreover, Your grants from a particular Contributor are reinstated on an
-     ongoing basis if such Contributor notifies You of the non-compliance by
-     some reasonable means, this is the first time You have received notice of
-     non-compliance with this License from such Contributor, and You become
-     compliant prior to 30 days after Your receipt of the notice.
-
-5.2. If You initiate litigation against any entity by asserting a patent
-     infringement claim (excluding declaratory judgment actions, counter-claims,
-     and cross-claims) alleging that a Contributor Version directly or
-     indirectly infringes any patent, then the rights granted to You by any and
-     all Contributors for the Covered Software under Section 2.1 of this License
-     shall terminate.
-
-5.3. In the event of termination under Sections 5.1 or 5.2 above, all end user
-     license agreements (excluding distributors and resellers) which have been
-     validly granted by You or Your distributors under this License prior to
-     termination shall survive termination.
-
-6. Disclaimer of Warranty
-
-   Covered Software is provided under this License on an “as is” basis, without
-   warranty of any kind, either expressed, implied, or statutory, including,
-   without limitation, warranties that the Covered Software is free of defects,
-   merchantable, fit for a particular purpose or non-infringing. The entire
-   risk as to the quality and performance of the Covered Software is with You.
-   Should any Covered Software prove defective in any respect, You (not any
-   Contributor) assume the cost of any necessary servicing, repair, or
-   correction. This disclaimer of warranty constitutes an essential part of this
-   License. No use of  any Covered Software is authorized under this License
-   except under this disclaimer.
-
-7. Limitation of Liability
-
-   Under no circumstances and under no legal theory, whether tort (including
-   negligence), contract, or otherwise, shall any Contributor, or anyone who
-   distributes Covered Software as permitted above, be liable to You for any
-   direct, indirect, special, incidental, or consequential damages of any
-   character including, without limitation, damages for lost profits, loss of
-   goodwill, work stoppage, computer failure or malfunction, or any and all
-   other commercial damages or losses, even if such party shall have been
-   informed of the possibility of such damages. This limitation of liability
-   shall not apply to liability for death or personal injury resulting from such
-   party’s negligence to the extent applicable law prohibits such limitation.
-   Some jurisdictions do not allow the exclusion or limitation of incidental or
-   consequential damages, so this exclusion and limitation may not apply to You.
-
-8. Litigation
-
-   Any litigation relating to this License may be brought only in the courts of
-   a jurisdiction where the defendant maintains its principal place of business
-   and such litigation shall be governed by laws of that jurisdiction, without
-   reference to its conflict-of-law provisions. Nothing in this Section shall
-   prevent a party’s ability to bring cross-claims or counter-claims.
-
-9. Miscellaneous
-
-   This License represents the complete agreement concerning the subject matter
-   hereof. If any provision of this License is held to be unenforceable, such
-   provision shall be reformed only to the extent necessary to make it
-   enforceable. Any law or regulation which provides that the language of a
-   contract shall be construed against the drafter shall not be used to construe
-   this License against a Contributor.
-
-
-10. Versions of the License
-
-10.1. New Versions
-
-      Mozilla Foundation is the license steward. Except as provided in Section
-      10.3, no one other than the license steward has the right to modify or
-      publish new versions of this License. Each version will be given a
-      distinguishing version number.
-
-10.2. Effect of New Versions
-
-      You may distribute the Covered Software under the terms of the version of
-      the License under which You originally received the Covered Software, or
-      under the terms of any subsequent version published by the license
-      steward.
-
-10.3. Modified Versions
-
-      If you create software not governed by this License, and you want to
-      create a new license for such software, you may create and use a modified
-      version of this License if you rename the license and remove any
-      references to the name of the license steward (except to note that such
-      modified license differs from this License).
-
-10.4. Distributing Source Code Form that is Incompatible With Secondary Licenses
-      If You choose to distribute Source Code Form that is Incompatible With
-      Secondary Licenses under the terms of this version of the License, the
-      notice described in Exhibit B of this License must be attached.
-
-Exhibit A - Source Code Form License Notice
-
-      This Source Code Form is subject to the
-      terms of the Mozilla Public License, v.
-      2.0. If a copy of the MPL was not
-      distributed with this file, You can
-      obtain one at
-      http://mozilla.org/MPL/2.0/.
-
-If it is not possible or desirable to put the notice in a particular file, then
-You may include the notice in a location (such as a LICENSE file in a relevant
-directory) where a recipient would be likely to look for such a notice.
-
-You may add additional accurate notices of copyright ownership.
-
-Exhibit B - “Incompatible With Secondary Licenses” Notice
-
-      This Source Code Form is “Incompatible
-      With Secondary Licenses”, as defined by
-      the Mozilla Public License, v. 2.0.
-
diff --git a/Godeps/_workspace/src/github.com/hashicorp/raft/Makefile b/Godeps/_workspace/src/github.com/hashicorp/raft/Makefile
deleted file mode 100644
index c61b34a8f..000000000
--- a/Godeps/_workspace/src/github.com/hashicorp/raft/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-DEPS = $(go list -f '{{range .TestImports}}{{.}} {{end}}' ./...)
-
-test:
-	go test -timeout=5s ./...
-
-integ: test
-	INTEG_TESTS=yes go test -timeout=3s -run=Integ ./...
-
-deps:
-	go get -d -v ./...
-	echo $(DEPS) | xargs -n1 go get -d
-
-cov:
-	INTEG_TESTS=yes gocov test github.com/hashicorp/raft | gocov-html > /tmp/coverage.html
-	open /tmp/coverage.html
-
-.PHONY: test cov integ deps
diff --git a/Godeps/_workspace/src/github.com/hashicorp/raft/README.md b/Godeps/_workspace/src/github.com/hashicorp/raft/README.md
deleted file mode 100644
index ecb6c977e..000000000
--- a/Godeps/_workspace/src/github.com/hashicorp/raft/README.md
+++ /dev/null
@@ -1,89 +0,0 @@
-raft [![Build Status](https://travis-ci.org/hashicorp/raft.png)](https://travis-ci.org/hashicorp/raft)
-====
-
-raft is a [Go](http://www.golang.org) library that manages a replicated
-log and can be used with an FSM to manage replicated state machines. It
-is library for providing [consensus](http://en.wikipedia.org/wiki/Consensus_(computer_science)).
-
-The use cases for such a library are far-reaching as replicated state
-machines are a key component of many distributed systems. They enable
-building Consistent, Partition Tolerant (CP) systems, with limited
-fault tolerance as well.
-
-## Building
-
-If you wish to build raft you'll need Go version 1.2+ installed.
-
-Please check your installation with:
-
-```
-go version
-```
-
-## Documentation
-
-For complete documentation, see the associated [Godoc](http://godoc.org/github.com/hashicorp/raft).
-
-To prevent complications with cgo, the primary backend `MDBStore` is in a separate repositoy,
-called [raft-mdb](http://github.com/hashicorp/raft-mdb). That is the recommended implementation
-for the `LogStore` and `StableStore`.
-
-A pure Go backend using [BoltDB](https://github.com/boltdb/bolt) is also available called
-[raft-boltdb](https://github.com/hashicorp/raft-boltdb). It can also be used as a `LogStore`
-and `StableStore`.
-
-## Protocol
-
-raft is based on ["Raft: In Search of an Understandable Consensus Algorithm"](https://ramcloud.stanford.edu/wiki/download/attachments/11370504/raft.pdf)
-
-A high level overview of the Raft protocol is described below, but for details please read the full
-[Raft paper](https://ramcloud.stanford.edu/wiki/download/attachments/11370504/raft.pdf)
-followed by the raft source. Any questions about the raft protocol should be sent to the
-[raft-dev mailing list](https://groups.google.com/forum/#!forum/raft-dev).
-
-### Protocol Description
-
-Raft nodes are always in one of three states: follower, candidate or leader. All
-nodes initially start out as a follower. In this state, nodes can accept log entries
-from a leader and cast votes. If no entries are received for some time, nodes
-self-promote to the candidate state. In the candidate state nodes request votes from
-their peers. If a candidate receives a quorum of votes, then it is promoted to a leader.
-The leader must accept new log entries and replicate to all the other followers.
-In addition, if stale reads are not acceptable, all queries must also be performed on
-the leader.
-
-Once a cluster has a leader, it is able to accept new log entries. A client can
-request that a leader append a new log entry, which is an opaque binary blob to
-Raft. The leader then writes the entry to durable storage and attempts to replicate
-to a quorum of followers. Once the log entry is considered *committed*, it can be
-*applied* to a finite state machine. The finite state machine is application specific,
-and is implemented using an interface.
-
-An obvious question relates to the unbounded nature of a replicated log. Raft provides
-a mechanism by which the current state is snapshotted, and the log is compacted. Because
-of the FSM abstraction, restoring the state of the FSM must result in the same state
-as a replay of old logs. This allows Raft to capture the FSM state at a point in time,
-and then remove all the logs that were used to reach that state. This is performed automatically
-without user intervention, and prevents unbounded disk usage as well as minimizing
-time spent replaying logs.
-
-Lastly, there is the issue of updating the peer set when new servers are joining
-or existing servers are leaving. As long as a quorum of nodes is available, this
-is not an issue as Raft provides mechanisms to dynamically update the peer set.
-If a quorum of nodes is unavailable, then this becomes a very challenging issue.
-For example, suppose there are only 2 peers, A and B. The quorum size is also
-2, meaning both nodes must agree to commit a log entry. If either A or B fails,
-it is now impossible to reach quorum. This means the cluster is unable to add,
-or remove a node, or commit any additional log entries. This results in *unavailability*.
-At this point, manual intervention would be required to remove either A or B,
-and to restart the remaining node in bootstrap mode.
-
-A Raft cluster of 3 nodes can tolerate a single node failure, while a cluster
-of 5 can tolerate 2 node failures. The recommended configuration is to either
-run 3 or 5 raft servers. This maximizes availability without
-greatly sacrificing performance.
-
-In terms of performance, Raft is comparable to Paxos. Assuming stable leadership,
-committing a log entry requires a single round trip to half of the cluster.
-Thus performance is bound by disk I/O and network latency.
-
diff --git a/Godeps/_workspace/src/github.com/hashicorp/raft/bench/bench.go b/Godeps/_workspace/src/github.com/hashicorp/raft/bench/bench.go
deleted file mode 100644
index d7a58f45f..000000000
--- a/Godeps/_workspace/src/github.com/hashicorp/raft/bench/bench.go
+++ /dev/null
@@ -1,171 +0,0 @@
-package raftbench
-
-// raftbench provides common benchmarking functions which can be used by
-// anything which implements the raft.LogStore and raft.StableStore interfaces.
-// All functions accept these interfaces and perform benchmarking. This
-// makes comparing backend performance easier by sharing the tests.
-
-import (
-	"github.com/hashicorp/raft"
-	"testing"
-)
-
-func FirstIndex(b *testing.B, store raft.LogStore) {
-	// Create some fake data
-	var logs []*raft.Log
-	for i := 1; i < 10; i++ {
-		logs = append(logs, &raft.Log{Index: uint64(i), Data: []byte("data")})
-	}
-	if err := store.StoreLogs(logs); err != nil {
-		b.Fatalf("err: %s", err)
-	}
-	b.ResetTimer()
-
-	// Run FirstIndex a number of times
-	for n := 0; n < b.N; n++ {
-		store.FirstIndex()
-	}
-}
-
-func LastIndex(b *testing.B, store raft.LogStore) {
-	// Create some fake data
-	var logs []*raft.Log
-	for i := 1; i < 10; i++ {
-		logs = append(logs, &raft.Log{Index: uint64(i), Data: []byte("data")})
-	}
-	if err := store.StoreLogs(logs); err != nil {
-		b.Fatalf("err: %s", err)
-	}
-	b.ResetTimer()
-
-	// Run LastIndex a number of times
-	for n := 0; n < b.N; n++ {
-		store.LastIndex()
-	}
-}
-
-func GetLog(b *testing.B, store raft.LogStore) {
-	// Create some fake data
-	var logs []*raft.Log
-	for i := 1; i < 10; i++ {
-		logs = append(logs, &raft.Log{Index: uint64(i), Data: []byte("data")})
-	}
-	if err := store.StoreLogs(logs); err != nil {
-		b.Fatalf("err: %s", err)
-	}
-	b.ResetTimer()
-
-	// Run GetLog a number of times
-	for n := 0; n < b.N; n++ {
-		if err := store.GetLog(5, new(raft.Log)); err != nil {
-			b.Fatalf("err: %s", err)
-		}
-	}
-}
-
-func StoreLog(b *testing.B, store raft.LogStore) {
-	// Run StoreLog a number of times
-	for n := 0; n < b.N; n++ {
-		log := &raft.Log{Index: uint64(n), Data: []byte("data")}
-		if err := store.StoreLog(log); err != nil {
-			b.Fatalf("err: %s", err)
-		}
-	}
-}
-
-func StoreLogs(b *testing.B, store raft.LogStore) {
-	// Run StoreLogs a number of times. We want to set multiple logs each
-	// run, so we create 3 logs with incrementing indexes for each iteration.
-	for n := 0; n < b.N; n++ {
-		b.StopTimer()
-		offset := 3 * (n + 1)
-		logs := []*raft.Log{
-			&raft.Log{Index: uint64(offset - 2), Data: []byte("data")},
-			&raft.Log{Index: uint64(offset - 1), Data: []byte("data")},
-			&raft.Log{Index: uint64(offset), Data: []byte("data")},
-		}
-		b.StartTimer()
-
-		if err := store.StoreLogs(logs); err != nil {
-			b.Fatalf("err: %s", err)
-		}
-	}
-}
-
-func DeleteRange(b *testing.B, store raft.LogStore) {
-	// Create some fake data. In this case, we create 3 new log entries for each
-	// test case, and separate them by index in multiples of 10. This allows
-	// some room so that we can test deleting ranges with "extra" logs to
-	// to ensure we stop going to the database once our max index is hit.
-	var logs []*raft.Log
-	for n := 0; n < b.N; n++ {
-		offset := 10 * n
-		for i := offset; i < offset+3; i++ {
-			logs = append(logs, &raft.Log{Index: uint64(i), Data: []byte("data")})
-		}
-	}
-	if err := store.StoreLogs(logs); err != nil {
-		b.Fatalf("err: %s", err)
-	}
-	b.ResetTimer()
-
-	// Delete a range of the data
-	for n := 0; n < b.N; n++ {
-		offset := 10 * n
-		if err := store.DeleteRange(uint64(offset), uint64(offset+9)); err != nil {
-			b.Fatalf("err: %s", err)
-		}
-	}
-}
-
-func Set(b *testing.B, store raft.StableStore) {
-	// Run Set a number of times
-	for n := 0; n < b.N; n++ {
-		if err := store.Set([]byte{byte(n)}, []byte("val")); err != nil {
-			b.Fatalf("err: %s", err)
-		}
-	}
-}
-
-func Get(b *testing.B, store raft.StableStore) {
-	// Create some fake data
-	for i := 1; i < 10; i++ {
-		if err := store.Set([]byte{byte(i)}, []byte("val")); err != nil {
-			b.Fatalf("err: %s", err)
-		}
-	}
-	b.ResetTimer()
-
-	// Run Get a number of times
-	for n := 0; n < b.N; n++ {
-		if _, err := store.Get([]byte{0x05}); err != nil {
-			b.Fatalf("err: %s", err)
-		}
-	}
-}
-
-func SetUint64(b *testing.B, store raft.StableStore) {
-	// Run SetUint64 a number of times
-	for n := 0; n < b.N; n++ {
-		if err := store.SetUint64([]byte{byte(n)}, uint64(n)); err != nil {
-			b.Fatalf("err: %s", err)
-		}
-	}
-}
-
-func GetUint64(b *testing.B, store raft.StableStore) {
-	// Create some fake data
-	for i := 0; i < 10; i++ {
-		if err := store.SetUint64([]byte{byte(i)}, uint64(i)); err != nil {
-			b.Fatalf("err: %s", err)
-		}
-	}
-	b.ResetTimer()
-
-	// Run GetUint64 a number of times
-	for n := 0; n < b.N; n++ {
-		if _, err := store.Get([]byte{0x05}); err != nil {
-			b.Fatalf("err: %s", err)
-		}
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/hashicorp/raft/commands.go b/Godeps/_workspace/src/github.com/hashicorp/raft/commands.go
deleted file mode 100644
index fd0194841..000000000
--- a/Godeps/_workspace/src/github.com/hashicorp/raft/commands.go
+++ /dev/null
@@ -1,80 +0,0 @@
-package raft
-
-// AppendEntriesRequest is the command used to append entries to the
-// replicated log.
-type AppendEntriesRequest struct {
-	// Provide the current term and leader
-	Term   uint64
-	Leader []byte
-
-	// Provide the previous entries for integrity checking
-	PrevLogEntry uint64
-	PrevLogTerm  uint64
-
-	// New entries to commit
-	Entries []*Log
-
-	// Commit index on the leader
-	LeaderCommitIndex uint64
-}
-
-// AppendEntriesResponse is the response returned from an
-// AppendEntriesRequest.
-type AppendEntriesResponse struct {
-	// Newer term if leader is out of date
-	Term uint64
-
-	// Last Log is a hint to help accelerate rebuilding slow nodes
-	LastLog uint64
-
-	// We may not succeed if we have a conflicting entry
-	Success bool
-}
-
-// RequestVoteRequest is the command used by a candidate to ask a Raft peer
-// for a vote in an election.
-type RequestVoteRequest struct {
-	// Provide the term and our id
-	Term      uint64
-	Candidate []byte
-
-	// Used to ensure safety
-	LastLogIndex uint64
-	LastLogTerm  uint64
-}
-
-// RequestVoteResponse is the response returned from a RequestVoteRequest.
-type RequestVoteResponse struct {
-	// Newer term if leader is out of date
-	Term uint64
-
-	// Return the peers, so that a node can shutdown on removal
-	Peers []byte
-
-	// Is the vote granted
-	Granted bool
-}
-
-// InstallSnapshotRequest is the command sent to a Raft peer to bootstrap its
-// log (and state machine) from a snapshot on another peer.
-type InstallSnapshotRequest struct {
-	Term   uint64
-	Leader []byte
-
-	// These are the last index/term included in the snapshot
-	LastLogIndex uint64
-	LastLogTerm  uint64
-
-	// Peer Set in the snapshot
-	Peers []byte
-
-	// Size of the snapshot
-	Size int64
-}
-
-// InstallSnapshotResponse is the response returned from an
-// InstallSnapshotRequest.
-type InstallSnapshotResponse struct {
-	Term    uint64
-	Success bool
-}
diff --git a/Godeps/_workspace/src/github.com/hashicorp/raft/config.go b/Godeps/_workspace/src/github.com/hashicorp/raft/config.go
deleted file mode 100644
index 047a88abe..000000000
--- a/Godeps/_workspace/src/github.com/hashicorp/raft/config.go
+++ /dev/null
@@ -1,125 +0,0 @@
-package raft
-
-import (
-	"fmt"
-	"io"
-	"log"
-	"time"
-)
-
-// Config provides any necessary configuration to
-// the Raft server
-type Config struct {
-	// Time in follower state without a leader before we attempt an election.
-	HeartbeatTimeout time.Duration
-
-	// Time in candidate state without a leader before we attempt an election.
-	ElectionTimeout time.Duration
-
-	// Time without an Apply() operation before we heartbeat to ensure
-	// a timely commit. Due to random staggering, may be delayed as much as
-	// 2x this value.
-	CommitTimeout time.Duration
-
-	// MaxAppendEntries controls the maximum number of append entries
-	// to send at once. We want to strike a balance between efficiency
-	// and avoiding waste if the follower is going to reject because of
-	// an inconsistent log.
-	MaxAppendEntries int
-
-	// If we are a member of a cluster, and RemovePeer is invoked for the
-	// local node, then we forget all peers and transition into the follower state.
-	// If ShutdownOnRemove is is set, we additional shutdown Raft. Otherwise,
-	// we can become a leader of a cluster containing only this node.
-	ShutdownOnRemove bool
-
-	// DisableBootstrapAfterElect is used to turn off EnableSingleNode
-	// after the node is elected. This is used to prevent self-election
-	// if the node is removed from the Raft cluster via RemovePeer. Setting
-	// it to false will keep the bootstrap mode, allowing the node to self-elect
-	// and potentially bootstrap a separate cluster.
-	DisableBootstrapAfterElect bool
-
-	// TrailingLogs controls how many logs we leave after a snapshot. This is
-	// used so that we can quickly replay logs on a follower instead of being
-	// forced to send an entire snapshot.
-	TrailingLogs uint64
-
-	// SnapshotInterval controls how often we check if we should perform a snapshot.
-	// We randomly stagger between this value and 2x this value to avoid the entire
-	// cluster from performing a snapshot at once.
-	SnapshotInterval time.Duration
-
-	// SnapshotThreshold controls how many outstanding logs there must be before
-	// we perform a snapshot. This is to prevent excessive snapshots when we can
-	// just replay a small set of logs.
-	SnapshotThreshold uint64
-
-	// EnableSingleNode allows for a single node mode of operation. This
-	// is false by default, which prevents a lone node from electing itself.
-	// leader.
-	EnableSingleNode bool
-
-	// LeaderLeaseTimeout is used to control how long the "lease" lasts
-	// for being the leader without being able to contact a quorum
-	// of nodes. If we reach this interval without contact, we will
-	// step down as leader.
-	LeaderLeaseTimeout time.Duration
-
-	// LogOutput is used as a sink for logs, unless Logger is specified.
-	// Defaults to os.Stderr.
-	LogOutput io.Writer
-
-	// Logger is a user-provided logger. If nil, a logger writing to LogOutput
-	// is used.
-	Logger *log.Logger
-}
-
-// DefaultConfig returns a Config with usable defaults.
-func DefaultConfig() *Config {
-	return &Config{
-		HeartbeatTimeout:           1000 * time.Millisecond,
-		ElectionTimeout:            1000 * time.Millisecond,
-		CommitTimeout:              50 * time.Millisecond,
-		MaxAppendEntries:           64,
-		ShutdownOnRemove:           true,
-		DisableBootstrapAfterElect: true,
-		TrailingLogs:               10240,
-		SnapshotInterval:           120 * time.Second,
-		SnapshotThreshold:          8192,
-		EnableSingleNode:           false,
-		LeaderLeaseTimeout:         500 * time.Millisecond,
-	}
-}
-
-// ValidateConfig is used to validate a sane configuration
-func ValidateConfig(config *Config) error {
-	if config.HeartbeatTimeout < 5*time.Millisecond {
-		return fmt.Errorf("Heartbeat timeout is too low")
-	}
-	if config.ElectionTimeout < 5*time.Millisecond {
-		return fmt.Errorf("Election timeout is too low")
-	}
-	if config.CommitTimeout < time.Millisecond {
-		return fmt.Errorf("Commit timeout is too low")
-	}
-	if config.MaxAppendEntries <= 0 {
-		return fmt.Errorf("MaxAppendEntries must be positive")
-	}
-	if config.MaxAppendEntries > 1024 {
-		return fmt.Errorf("MaxAppendEntries is too large")
-	}
-	if config.SnapshotInterval < 5*time.Millisecond {
-		return fmt.Errorf("Snapshot interval is too low")
-	}
-	if config.LeaderLeaseTimeout < 5*time.Millisecond {
-		return fmt.Errorf("Leader lease timeout is too low")
-	}
-	if config.LeaderLeaseTimeout > config.HeartbeatTimeout {
-		return fmt.Errorf("Leader lease timeout cannot be larger than heartbeat timeout")
-	}
-	if config.ElectionTimeout < config.HeartbeatTimeout {
-		return fmt.Errorf("Election timeout must be equal or greater than Heartbeat Timeout")
-	}
-	return nil
-}
diff --git a/Godeps/_workspace/src/github.com/hashicorp/raft/discard_snapshot.go b/Godeps/_workspace/src/github.com/hashicorp/raft/discard_snapshot.go
deleted file mode 100644
index 1b4611d55..000000000
--- a/Godeps/_workspace/src/github.com/hashicorp/raft/discard_snapshot.go
+++ /dev/null
@@ -1,48 +0,0 @@
-package raft
-
-import (
-	"fmt"
-	"io"
-)
-
-// DiscardSnapshotStore is used to successfully snapshot while
-// always discarding the snapshot. This is useful for when the
-// log should be truncated but no snapshot should be retained.
-// This should never be used for production use, and is only
-// suitable for testing.
-type DiscardSnapshotStore struct{}
-
-type DiscardSnapshotSink struct{}
-
-// NewDiscardSnapshotStore is used to create a new DiscardSnapshotStore.
-func NewDiscardSnapshotStore() *DiscardSnapshotStore {
-	return &DiscardSnapshotStore{}
-}
-
-func (d *DiscardSnapshotStore) Create(index, term uint64, peers []byte) (SnapshotSink, error) {
-	return &DiscardSnapshotSink{}, nil
-}
-
-func (d *DiscardSnapshotStore) List() ([]*SnapshotMeta, error) {
-	return nil, nil
-}
-
-func (d *DiscardSnapshotStore) Open(id string) (*SnapshotMeta, io.ReadCloser, error) {
-	return nil, nil, fmt.Errorf("open is not supported")
-}
-
-func (d *DiscardSnapshotSink) Write(b []byte) (int, error) {
-	return len(b), nil
-}
-
-func (d *DiscardSnapshotSink) Close() error {
-	return nil
-}
-
-func (d *DiscardSnapshotSink) ID() string {
-	return "discard"
-}
-
-func (d *DiscardSnapshotSink) Cancel() error {
-	return nil
-}
diff --git a/Godeps/_workspace/src/github.com/hashicorp/raft/discard_snapshot_test.go b/Godeps/_workspace/src/github.com/hashicorp/raft/discard_snapshot_test.go
deleted file mode 100644
index 5abedfe2c..000000000
--- a/Godeps/_workspace/src/github.com/hashicorp/raft/discard_snapshot_test.go
+++ /dev/null
@@ -1,17 +0,0 @@
-package raft
-
-import "testing"
-
-func TestDiscardSnapshotStoreImpl(t *testing.T) {
-	var impl interface{} = &DiscardSnapshotStore{}
-	if _, ok := impl.(SnapshotStore); !ok {
-		t.Fatalf("DiscardSnapshotStore not a SnapshotStore")
-	}
-}
-
-func TestDiscardSnapshotSinkImpl(t *testing.T) {
-	var impl interface{} = &DiscardSnapshotSink{}
-	if _, ok := impl.(SnapshotSink); !ok {
-		t.Fatalf("DiscardSnapshotSink not a SnapshotSink")
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/hashicorp/raft/file_snapshot.go b/Godeps/_workspace/src/github.com/hashicorp/raft/file_snapshot.go
deleted file mode 100644
index bda3d6d8e..000000000
--- a/Godeps/_workspace/src/github.com/hashicorp/raft/file_snapshot.go
+++ /dev/null
@@ -1,460 +0,0 @@
-package raft
-
-import (
-	"bufio"
-	"bytes"
-	"encoding/json"
-	"fmt"
-	"hash"
-	"hash/crc64"
-	"io"
-	"io/ioutil"
-	"log"
-	"os"
-	"path/filepath"
-	"sort"
-	"strings"
-	"time"
-)
-
-const (
-	testPath      = "permTest"
-	snapPath      = "snapshots"
-	metaFilePath  = "meta.json"
-	stateFilePath = "state.bin"
-	tmpSuffix     = ".tmp"
-)
-
-// FileSnapshotStore implements the SnapshotStore interface and allows
-// snapshots to be made on the local disk.
-type FileSnapshotStore struct {
-	path   string
-	retain int
-	logger *log.Logger
-}
-
-type snapMetaSlice []*fileSnapshotMeta
-
-// FileSnapshotSink implements SnapshotSink with a file.
-type FileSnapshotSink struct {
-	store  *FileSnapshotStore
-	logger *log.Logger
-	dir    string
-	meta   fileSnapshotMeta
-
-	stateFile *os.File
-	stateHash hash.Hash64
-	buffered  *bufio.Writer
-
-	closed bool
-}
-
-// fileSnapshotMeta is stored on disk. We also put a CRC
-// on disk so that we can verify the snapshot.
-type fileSnapshotMeta struct {
-	SnapshotMeta
-	CRC []byte
-}
-
-// bufferedFile is returned when we open a snapshot. This way
-// reads are buffered and the file still gets closed.
-type bufferedFile struct {
-	bh *bufio.Reader
-	fh *os.File
-}
-
-func (b *bufferedFile) Read(p []byte) (n int, err error) {
-	return b.bh.Read(p)
-}
-
-func (b *bufferedFile) Close() error {
-	return b.fh.Close()
-}
-
-// NewFileSnapshotStore creates a new FileSnapshotStore based
-// on a base directory. The `retain` parameter controls how many
-// snapshots are retained. Must be at least 1.
-func NewFileSnapshotStore(base string, retain int, logOutput io.Writer) (*FileSnapshotStore, error) {
-	if retain < 1 {
-		return nil, fmt.Errorf("must retain at least one snapshot")
-	}
-	if logOutput == nil {
-		logOutput = os.Stderr
-	}
-
-	// Ensure our path exists
-	path := filepath.Join(base, snapPath)
-	if err := os.MkdirAll(path, 0755); err != nil && !os.IsExist(err) {
-		return nil, fmt.Errorf("snapshot path not accessible: %v", err)
-	}
-
-	// Setup the store
-	store := &FileSnapshotStore{
-		path:   path,
-		retain: retain,
-		logger: log.New(logOutput, "", log.LstdFlags),
-	}
-
-	// Do a permissions test
-	if err := store.testPermissions(); err != nil {
-		return nil, fmt.Errorf("permissions test failed: %v", err)
-	}
-	return store, nil
-}
-
-// testPermissions tries to touch a file in our path to see if it works.
-func (f *FileSnapshotStore) testPermissions() error {
-	path := filepath.Join(f.path, testPath)
-	fh, err := os.Create(path)
-	if err != nil {
-		return err
-	}
-	fh.Close()
-	os.Remove(path)
-	return nil
-}
-
-// snapshotName generates a name for the snapshot.
-func snapshotName(term, index uint64) string {
-	now := time.Now()
-	msec := now.UnixNano() / int64(time.Millisecond)
-	return fmt.Sprintf("%d-%d-%d", term, index, msec)
-}
-
-// Create is used to start a new snapshot
-func (f *FileSnapshotStore) Create(index, term uint64, peers []byte) (SnapshotSink, error) {
-	// Create a new path
-	name := snapshotName(term, index)
-	path := filepath.Join(f.path, name+tmpSuffix)
-	f.logger.Printf("[INFO] snapshot: Creating new snapshot at %s", path)
-
-	// Make the directory
-	if err := os.MkdirAll(path, 0755); err != nil {
-		f.logger.Printf("[ERR] snapshot: Failed to make snapshot directory: %v", err)
-		return nil, err
-	}
-
-	// Create the sink
-	sink := &FileSnapshotSink{
-		store:  f,
-		logger: f.logger,
-		dir:    path,
-		meta: fileSnapshotMeta{
-			SnapshotMeta: SnapshotMeta{
-				ID:    name,
-				Index: index,
-				Term:  term,
-				Peers: peers,
-			},
-			CRC: nil,
-		},
-	}
-
-	// Write out the meta data
-	if err := sink.writeMeta(); err != nil {
-		f.logger.Printf("[ERR] snapshot: Failed to write metadata: %v", err)
-		return nil, err
-	}
-
-	// Open the state file
-	statePath := filepath.Join(path, stateFilePath)
-	fh, err := os.Create(statePath)
-	if err != nil {
-		f.logger.Printf("[ERR] snapshot: Failed to create state file: %v", err)
-		return nil, err
-	}
-	sink.stateFile = fh
-
-	// Create a CRC64 hash
-	sink.stateHash = crc64.New(crc64.MakeTable(crc64.ECMA))
-
-	// Wrap both the hash and file in a MultiWriter with buffering
-	multi := io.MultiWriter(sink.stateFile, sink.stateHash)
-	sink.buffered = bufio.NewWriter(multi)
-
-	// Done
-	return sink, nil
-}
-
-// List returns available snapshots in the store.
-func (f *FileSnapshotStore) List() ([]*SnapshotMeta, error) {
-	// Get the eligible snapshots
-	snapshots, err := f.getSnapshots()
-	if err != nil {
-		f.logger.Printf("[ERR] snapshot: Failed to get snapshots: %v", err)
-		return nil, err
-	}
-
-	var snapMeta []*SnapshotMeta
-	for _, meta := range snapshots {
-		snapMeta = append(snapMeta, &meta.SnapshotMeta)
-		if len(snapMeta) == f.retain {
-			break
-		}
-	}
-	return snapMeta, nil
-}
-
-// getSnapshots returns all the known snapshots.
-func (f *FileSnapshotStore) getSnapshots() ([]*fileSnapshotMeta, error) {
-	// Get the eligible snapshots
-	snapshots, err := ioutil.ReadDir(f.path)
-	if err != nil {
-		f.logger.Printf("[ERR] snapshot: Failed to scan snapshot dir: %v", err)
-		return nil, err
-	}
-
-	// Populate the metadata
-	var snapMeta []*fileSnapshotMeta
-	for _, snap := range snapshots {
-		// Ignore any files
-		if !snap.IsDir() {
-			continue
-		}
-
-		// Ignore any temporary snapshots
-		dirName := snap.Name()
-		if strings.HasSuffix(dirName, tmpSuffix) {
-			f.logger.Printf("[WARN] snapshot: Found temporary snapshot: %v", dirName)
-			continue
-		}
-
-		// Try to read the meta data
-		meta, err := f.readMeta(dirName)
-		if err != nil {
-			f.logger.Printf("[WARN] snapshot: Failed to read metadata for %v: %v", dirName, err)
-			continue
-		}
-
-		// Append, but only return up to the retain count
-		snapMeta = append(snapMeta, meta)
-	}
-
-	// Sort the snapshot, reverse so we get new -> old
-	sort.Sort(sort.Reverse(snapMetaSlice(snapMeta)))
-
-	return snapMeta, nil
-}
-
-// readMeta is used to read the meta data for a given named backup
-func (f *FileSnapshotStore) readMeta(name string) (*fileSnapshotMeta, error) {
-	// Open the meta file
-	metaPath := filepath.Join(f.path, name, metaFilePath)
-	fh, err := os.Open(metaPath)
-	if err != nil {
-		return nil, err
-	}
-	defer fh.Close()
-
-	// Buffer the file IO
-	buffered := bufio.NewReader(fh)
-
-	// Read in the JSON
-	meta := &fileSnapshotMeta{}
-	dec := json.NewDecoder(buffered)
-	if err := dec.Decode(meta); err != nil {
-		return nil, err
-	}
-	return meta, nil
-}
-
-// Open takes a snapshot ID and returns a ReadCloser for that snapshot.
-func (f *FileSnapshotStore) Open(id string) (*SnapshotMeta, io.ReadCloser, error) {
-	// Get the metadata
-	meta, err := f.readMeta(id)
-	if err != nil {
-		f.logger.Printf("[ERR] snapshot: Failed to get meta data to open snapshot: %v", err)
-		return nil, nil, err
-	}
-
-	// Open the state file
-	statePath := filepath.Join(f.path, id, stateFilePath)
-	fh, err := os.Open(statePath)
-	if err != nil {
-		f.logger.Printf("[ERR] snapshot: Failed to open state file: %v", err)
-		return nil, nil, err
-	}
-
-	// Create a CRC64 hash
-	stateHash := crc64.New(crc64.MakeTable(crc64.ECMA))
-
-	// Compute the hash
-	_, err = io.Copy(stateHash, fh)
-	if err != nil {
-		f.logger.Printf("[ERR] snapshot: Failed to read state file: %v", err)
-		fh.Close()
-		return nil, nil, err
-	}
-
-	// Verify the hash
-	computed := stateHash.Sum(nil)
-	if bytes.Compare(meta.CRC, computed) != 0 {
-		f.logger.Printf("[ERR] snapshot: CRC checksum failed (stored: %v computed: %v)",
-			meta.CRC, computed)
-		fh.Close()
-		return nil, nil, fmt.Errorf("CRC mismatch")
-	}
-
-	// Seek to the start
-	if _, err := fh.Seek(0, 0); err != nil {
-		f.logger.Printf("[ERR] snapshot: State file seek failed: %v", err)
-		fh.Close()
-		return nil, nil, err
-	}
-
-	// Return a buffered file
-	buffered := &bufferedFile{
-		bh: bufio.NewReader(fh),
-		fh: fh,
-	}
-
-	return &meta.SnapshotMeta, buffered, nil
-}
-
-// ReapSnapshots reaps any snapshots beyond the retain count.
-func (f *FileSnapshotStore) ReapSnapshots() error {
-	snapshots, err := f.getSnapshots()
-	if err != nil {
-		f.logger.Printf("[ERR] snapshot: Failed to get snapshots: %v", err)
-		return err
-	}
-
-	for i := f.retain; i < len(snapshots); i++ {
-		path := filepath.Join(f.path, snapshots[i].ID)
-		f.logger.Printf("[INFO] snapshot: reaping snapshot %v", path)
-		if err := os.RemoveAll(path); err != nil {
-			f.logger.Printf("[ERR] snapshot: Failed to reap snapshot %v: %v", path, err)
-			return err
-		}
-	}
-	return nil
-}
-
-// ID returns the ID of the snapshot, can be used with Open()
-// after the snapshot is finalized.
-func (s *FileSnapshotSink) ID() string {
-	return s.meta.ID
-}
-
-// Write is used to append to the state file. We write to the
-// buffered IO object to reduce the amount of context switches.
-func (s *FileSnapshotSink) Write(b []byte) (int, error) {
-	return s.buffered.Write(b)
-}
-
-// Close is used to indicate a successful end.
-func (s *FileSnapshotSink) Close() error {
-	// Make sure close is idempotent
-	if s.closed {
-		return nil
-	}
-	s.closed = true
-
-	// Close the open handles
-	if err := s.finalize(); err != nil {
-		s.logger.Printf("[ERR] snapshot: Failed to finalize snapshot: %v", err)
-		return err
-	}
-
-	// Write out the meta data
-	if err := s.writeMeta(); err != nil {
-		s.logger.Printf("[ERR] snapshot: Failed to write metadata: %v", err)
-		return err
-	}
-
-	// Move the directory into place
-	newPath := strings.TrimSuffix(s.dir, tmpSuffix)
-	if err := os.Rename(s.dir, newPath); err != nil {
-		s.logger.Printf("[ERR] snapshot: Failed to move snapshot into place: %v", err)
-		return err
-	}
-
-	// Reap any old snapshots
-	s.store.ReapSnapshots()
-	return nil
-}
-
-// Cancel is used to indicate an unsuccessful end.
-func (s *FileSnapshotSink) Cancel() error {
-	// Make sure close is idempotent
-	if s.closed {
-		return nil
-	}
-	s.closed = true
-
-	// Close the open handles
-	if err := s.finalize(); err != nil {
-		s.logger.Printf("[ERR] snapshot: Failed to finalize snapshot: %v", err)
-		return err
-	}
-
-	// Attempt to remove all artifacts
-	return os.RemoveAll(s.dir)
-}
-
-// finalize is used to close all of our resources.
-func (s *FileSnapshotSink) finalize() error {
-	// Flush any remaining data
-	if err := s.buffered.Flush(); err != nil {
-		return err
-	}
-
-	// Get the file size
-	stat, statErr := s.stateFile.Stat()
-
-	// Close the file
-	if err := s.stateFile.Close(); err != nil {
-		return err
-	}
-
-	// Set the file size, check after we close
-	if statErr != nil {
-		return statErr
-	}
-	s.meta.Size = stat.Size()
-
-	// Set the CRC
-	s.meta.CRC = s.stateHash.Sum(nil)
-	return nil
-}
-
-// writeMeta is used to write out the metadata we have.
-func (s *FileSnapshotSink) writeMeta() error {
-	// Open the meta file
-	metaPath := filepath.Join(s.dir, metaFilePath)
-	fh, err := os.Create(metaPath)
-	if err != nil {
-		return err
-	}
-	defer fh.Close()
-
-	// Buffer the file IO
-	buffered := bufio.NewWriter(fh)
-	defer buffered.Flush()
-
-	// Write out as JSON
-	enc := json.NewEncoder(buffered)
-	if err := enc.Encode(&s.meta); err != nil {
-		return err
-	}
-	return nil
-}
-
-// Implement the sort interface for []*fileSnapshotMeta.
-func (s snapMetaSlice) Len() int {
-	return len(s)
-}
-
-func (s snapMetaSlice) Less(i, j int) bool {
-	if s[i].Term != s[j].Term {
-		return s[i].Term < s[j].Term
-	}
-	if s[i].Index != s[j].Index {
-		return s[i].Index < s[j].Index
-	}
-	return s[i].ID < s[j].ID
-}
-
-func (s snapMetaSlice) Swap(i, j int) {
-	s[i], s[j] = s[j], s[i]
-}
diff --git a/Godeps/_workspace/src/github.com/hashicorp/raft/file_snapshot_test.go b/Godeps/_workspace/src/github.com/hashicorp/raft/file_snapshot_test.go
deleted file mode 100644
index 7620c1938..000000000
--- a/Godeps/_workspace/src/github.com/hashicorp/raft/file_snapshot_test.go
+++ /dev/null
@@ -1,343 +0,0 @@
-package raft
-
-import (
-	"bytes"
-	"io"
-	"io/ioutil"
-	"os"
-	"runtime"
-	"testing"
-)
-
-func FileSnapTest(t *testing.T) (string, *FileSnapshotStore) {
-	// Create a test dir
-	dir, err := ioutil.TempDir("", "raft")
-	if err != nil {
-		t.Fatalf("err: %v ", err)
-	}
-
-	snap, err := NewFileSnapshotStore(dir, 3, nil)
-	if err != nil {
-		t.Fatalf("err: %v", err)
-	}
-	return dir, snap
-}
-
-func TestFileSnapshotStoreImpl(t *testing.T) {
-	var impl interface{} = &FileSnapshotStore{}
-	if _, ok := impl.(SnapshotStore); !ok {
-		t.Fatalf("FileSnapshotStore not a SnapshotStore")
-	}
-}
-
-func TestFileSnapshotSinkImpl(t *testing.T) {
-	var impl interface{} = &FileSnapshotSink{}
-	if _, ok := impl.(SnapshotSink); !ok {
-		t.Fatalf("FileSnapshotSink not a SnapshotSink")
-	}
-}
-
-func TestFileSS_CreateSnapshotMissingParentDir(t *testing.T) {
-	parent, err := ioutil.TempDir("", "raft")
-	if err != nil {
-		t.Fatalf("err: %v ", err)
-	}
-	defer os.RemoveAll(parent)
-
-	dir, err := ioutil.TempDir(parent, "raft")
-	if err != nil {
-		t.Fatalf("err: %v ", err)
-	}
-
-	snap, err := NewFileSnapshotStore(dir, 3, nil)
-	if err != nil {
-		t.Fatalf("err: %v", err)
-	}
-
-	os.RemoveAll(parent)
-	peers := []byte("all my lovely friends")
-	_, err = snap.Create(10, 3, peers)
-	if err != nil {
-		t.Fatalf("should not fail when using non existing parent")
-	}
-
-}
-func TestFileSS_CreateSnapshot(t *testing.T) {
-	// Create a test dir
-	dir, err := ioutil.TempDir("", "raft")
-	if err != nil {
-		t.Fatalf("err: %v ", err)
-	}
-	defer os.RemoveAll(dir)
-
-	snap, err := NewFileSnapshotStore(dir, 3, nil)
-	if err != nil {
-		t.Fatalf("err: %v", err)
-	}
-
-	// Check no snapshots
-	snaps, err := snap.List()
-	if err != nil {
-		t.Fatalf("err: %v", err)
-	}
-	if len(snaps) != 0 {
-		t.Fatalf("did not expect any snapshots: %v", snaps)
-	}
-
-	// Create a new sink
-	peers := []byte("all my lovely friends")
-	sink, err := snap.Create(10, 3, peers)
-	if err != nil {
-		t.Fatalf("err: %v", err)
-	}
-
-	// The sink is not done, should not be in a list!
-	snaps, err = snap.List()
-	if err != nil {
-		t.Fatalf("err: %v", err)
-	}
-	if len(snaps) != 0 {
-		t.Fatalf("did not expect any snapshots: %v", snaps)
-	}
-
-	// Write to the sink
-	_, err = sink.Write([]byte("first\n"))
-	if err != nil {
-		t.Fatalf("err: %v", err)
-	}
-	_, err = sink.Write([]byte("second\n"))
-	if err != nil {
-		t.Fatalf("err: %v", err)
-	}
-
-	// Done!
-	err = sink.Close()
-	if err != nil {
-		t.Fatalf("err: %v", err)
-	}
-
-	// Should have a snapshot!
-	snaps, err = snap.List()
-	if err != nil {
-		t.Fatalf("err: %v", err)
-	}
-	if len(snaps) != 1 {
-		t.Fatalf("expect a snapshots: %v", snaps)
-	}
-
-	// Check the latest
-	latest := snaps[0]
-	if latest.Index != 10 {
-		t.Fatalf("bad snapshot: %v", *latest)
-	}
-	if latest.Term != 3 {
-		t.Fatalf("bad snapshot: %v", *latest)
-	}
-	if bytes.Compare(latest.Peers, peers) != 0 {
-		t.Fatalf("bad snapshot: %v", *latest)
-	}
-	if latest.Size != 13 {
-		t.Fatalf("bad snapshot: %v", *latest)
-	}
-
-	// Read the snapshot
-	_, r, err := snap.Open(latest.ID)
-	if err != nil {
-		t.Fatalf("err: %v", err)
-	}
-
-	// Read out everything
-	var buf bytes.Buffer
-	if _, err := io.Copy(&buf, r); err != nil {
-		t.Fatalf("err: %v", err)
-	}
-	if err := r.Close(); err != nil {
-		t.Fatalf("err: %v", err)
-	}
-
-	// Ensure a match
-	if bytes.Compare(buf.Bytes(), []byte("first\nsecond\n")) != 0 {
-		t.Fatalf("content mismatch")
-	}
-}
-
-func TestFileSS_CancelSnapshot(t *testing.T) {
-	// Create a test dir
-	dir, err := ioutil.TempDir("", "raft")
-	if err != nil {
-		t.Fatalf("err: %v ", err)
-	}
-	defer os.RemoveAll(dir)
-
-	snap, err := NewFileSnapshotStore(dir, 3, nil)
-	if err != nil {
-		t.Fatalf("err: %v", err)
-	}
-
-	// Create a new sink
-	peers := []byte("all my lovely friends")
-	sink, err := snap.Create(10, 3, peers)
-	if err != nil {
-		t.Fatalf("err: %v", err)
-	}
-
-	// Cancel the snapshot! Should delete
-	err = sink.Cancel()
-	if err != nil {
-		t.Fatalf("err: %v", err)
-	}
-
-	// The sink is canceled, should not be in a list!
-	snaps, err := snap.List()
-	if err != nil {
-		t.Fatalf("err: %v", err)
-	}
-	if len(snaps) != 0 {
-		t.Fatalf("did not expect any snapshots: %v", snaps)
-	}
-}
-
-func TestFileSS_Retention(t *testing.T) {
-	// Create a test dir
-	dir, err := ioutil.TempDir("", "raft")
-	if err != nil {
-		t.Fatalf("err: %v ", err)
-	}
-	defer os.RemoveAll(dir)
-
-	snap, err := NewFileSnapshotStore(dir, 2, nil)
-	if err != nil {
-		t.Fatalf("err: %v", err)
-	}
-
-	// Create a new sink
-	peers := []byte("all my lovely friends")
-
-	// Create a few snapshots
-	for i := 10; i < 15; i++ {
-		sink, err := snap.Create(uint64(i), 3, peers)
-		if err != nil {
-			t.Fatalf("err: %v", err)
-		}
-		err = sink.Close()
-		if err != nil {
-			t.Fatalf("err: %v", err)
-		}
-	}
-
-	// Should only have 2 listed!
-	snaps, err := snap.List()
-	if err != nil {
-		t.Fatalf("err: %v", err)
-	}
-	if len(snaps) != 2 {
-		t.Fatalf("expect 2 snapshots: %v", snaps)
-	}
-
-	// Check they are the latest
-	if snaps[0].Index != 14 {
-		t.Fatalf("bad snap: %#v", *snaps[0])
-	}
-	if snaps[1].Index != 13 {
-		t.Fatalf("bad snap: %#v", *snaps[1])
-	}
-}
-
-func TestFileSS_BadPerm(t *testing.T) {
-	if runtime.GOOS == "windows" {
-		t.Skip("skipping file permission test on windows")
-	}
-
-	// Create a temp dir
-	dir1, err := ioutil.TempDir("", "raft")
-	if err != nil {
-		t.Fatalf("err: %s", err)
-	}
-	defer os.RemoveAll(dir1)
-
-	// Create a sub dir and remove all permissions
-	dir2, err := ioutil.TempDir(dir1, "badperm")
-	if err != nil {
-		t.Fatalf("err: %s", err)
-	}
-	if err := os.Chmod(dir2, 000); err != nil {
-		t.Fatalf("err: %s", err)
-	}
-	defer os.Chmod(dir2, 777) // Set perms back for delete
-
-	// Should fail
-	if _, err := NewFileSnapshotStore(dir2, 3, nil); err == nil {
-		t.Fatalf("should fail to use dir with bad perms")
-	}
-}
-
-func TestFileSS_MissingParentDir(t *testing.T) {
-	parent, err := ioutil.TempDir("", "raft")
-	if err != nil {
-		t.Fatalf("err: %v ", err)
-	}
-	defer os.RemoveAll(parent)
-
-	dir, err := ioutil.TempDir(parent, "raft")
-	if err != nil {
-		t.Fatalf("err: %v ", err)
-	}
-
-	os.RemoveAll(parent)
-	_, err = NewFileSnapshotStore(dir, 3, nil)
-	if err != nil {
-		t.Fatalf("should not fail when using non existing parent")
-	}
-}
-
-func TestFileSS_Ordering(t *testing.T) {
-	// Create a test dir
-	dir, err := ioutil.TempDir("", "raft")
-	if err != nil {
-		t.Fatalf("err: %v ", err)
-	}
-	defer os.RemoveAll(dir)
-
-	snap, err := NewFileSnapshotStore(dir, 3, nil)
-	if err != nil {
-		t.Fatalf("err: %v", err)
-	}
-
-	// Create a new sink
-	peers := []byte("all my lovely friends")
-
-	sink, err := snap.Create(130350, 5, peers)
-	if err != nil {
-		t.Fatalf("err: %v", err)
-	}
-	err = sink.Close()
-	if err != nil {
-		t.Fatalf("err: %v", err)
-	}
-
-	sink, err = snap.Create(204917, 36, peers)
-	if err != nil {
-		t.Fatalf("err: %v", err)
-	}
-	err = sink.Close()
-	if err != nil {
-		t.Fatalf("err: %v", err)
-	}
-
-	// Should only have 2 listed!
-	snaps, err := snap.List()
-	if err != nil {
-		t.Fatalf("err: %v", err)
-	}
-	if len(snaps) != 2 {
-		t.Fatalf("expect 2 snapshots: %v", snaps)
-	}
-
-	// Check they are ordered
-	if snaps[0].Term != 36 {
-		t.Fatalf("bad snap: %#v", *snaps[0])
-	}
-	if snaps[1].Term != 5 {
-		t.Fatalf("bad snap: %#v", *snaps[1])
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/hashicorp/raft/fsm.go b/Godeps/_workspace/src/github.com/hashicorp/raft/fsm.go
deleted file mode 100644
index ea8ab548d..000000000
--- a/Godeps/_workspace/src/github.com/hashicorp/raft/fsm.go
+++ /dev/null
@@ -1,37 +0,0 @@
-package raft
-
-import (
-	"io"
-)
-
-// FSM provides an interface that can be implemented by
-// clients to make use of the replicated log.
-type FSM interface {
-	// Apply log is invoked once a log entry is committed.
-	Apply(*Log) interface{}
-
-	// Snapshot is used to support log compaction. This call should
-	// return an FSMSnapshot which can be used to save a point-in-time
-	// snapshot of the FSM. Apply and Snapshot are not called in multiple
-	// threads, but Apply will be called concurrently with Persist. This means
-	// the FSM should be implemented in a fashion that allows for concurrent
-	// updates while a snapshot is happening.
-	Snapshot() (FSMSnapshot, error)
-
-	// Restore is used to restore an FSM from a snapshot. It is not called
-	// concurrently with any other command. The FSM must discard all previous
-	// state.
-	Restore(io.ReadCloser) error
-}
-
-// FSMSnapshot is returned by an FSM in response to a Snapshot
-// It must be safe to invoke FSMSnapshot methods with concurrent
-// calls to Apply.
-type FSMSnapshot interface {
-	// Persist should dump all necessary state to the WriteCloser 'sink',
-	// and call sink.Close() when finished or call sink.Cancel() on error.
-	Persist(sink SnapshotSink) error
-
-	// Release is invoked when we are finished with the snapshot.
-	Release()
-}
diff --git a/Godeps/_workspace/src/github.com/hashicorp/raft/future.go b/Godeps/_workspace/src/github.com/hashicorp/raft/future.go
deleted file mode 100644
index 854e1ac92..000000000
--- a/Godeps/_workspace/src/github.com/hashicorp/raft/future.go
+++ /dev/null
@@ -1,182 +0,0 @@
-package raft
-
-import (
-	"sync"
-	"time"
-)
-
-// Future is used to represent an action that may occur in the future.
-type Future interface {
-	Error() error
-}
-
-// ApplyFuture is used for Apply() and can returns the FSM response.
-type ApplyFuture interface {
-	Future
-	Response() interface{}
-	Index() uint64
-}
-
-// errorFuture is used to return a static error.
-type errorFuture struct {
-	err error
-}
-
-func (e errorFuture) Error() error {
-	return e.err
-}
-
-func (e errorFuture) Response() interface{} {
-	return nil
-}
-
-func (e errorFuture) Index() uint64 {
-	return 0
-}
-
-// deferError can be embedded to allow a future
-// to provide an error in the future.
-type deferError struct {
-	err       error
-	errCh     chan error
-	responded bool
-}
-
-func (d *deferError) init() {
-	d.errCh = make(chan error, 1)
-}
-
-func (d *deferError) Error() error {
-	if d.err != nil {
-		return d.err
-	}
-	if d.errCh == nil {
-		panic("waiting for response on nil channel")
-	}
-	d.err = <-d.errCh
-	return d.err
-}
-
-func (d *deferError) respond(err error) {
-	if d.errCh == nil {
-		return
-	}
-	if d.responded {
-		return
-	}
-	d.errCh <- err
-	close(d.errCh)
-	d.responded = true
-}
-
-// logFuture is used to apply a log entry and waits until
-// the log is considered committed.
-type logFuture struct {
-	deferError
-	log      Log
-	policy   quorumPolicy
-	response interface{}
-	dispatch time.Time
-}
-
-func (l *logFuture) Response() interface{} {
-	return l.response
-}
-
-func (l *logFuture) Index() uint64 {
-	return l.log.Index
-}
-
-type peerFuture struct {
-	deferError
-	peers []string
-}
-
-type shutdownFuture struct {
-	raft *Raft
-}
-
-func (s *shutdownFuture) Error() error {
-	for s.raft.getRoutines() > 0 {
-		time.Sleep(5 * time.Millisecond)
-	}
-	return nil
-}
-
-// snapshotFuture is used for waiting on a snapshot to complete.
-type snapshotFuture struct {
-	deferError
-}
-
-// reqSnapshotFuture is used for requesting a snapshot start.
-// It is only used internally.
-type reqSnapshotFuture struct {
-	deferError
-
-	// snapshot details provided by the FSM runner before responding
-	index    uint64
-	term     uint64
-	peers    []string
-	snapshot FSMSnapshot
-}
-
-// restoreFuture is used for requesting an FSM to perform a
-// snapshot restore. Used internally only.
-type restoreFuture struct {
-	deferError
-	ID string
-}
-
-// verifyFuture is used to verify the current node is still
-// the leader. This is to prevent a stale read.
-type verifyFuture struct {
-	deferError
-	notifyCh   chan *verifyFuture
-	quorumSize int
-	votes      int
-	voteLock   sync.Mutex
-}
-
-// vote is used to respond to a verifyFuture.
-// This may block when responding on the notifyCh.
-func (v *verifyFuture) vote(leader bool) {
-	v.voteLock.Lock()
-	defer v.voteLock.Unlock()
-
-	// Guard against having notified already
-	if v.notifyCh == nil {
-		return
-	}
-
-	if leader {
-		v.votes++
-		if v.votes >= v.quorumSize {
-			v.notifyCh <- v
-			v.notifyCh = nil
-		}
-	} else {
-		v.notifyCh <- v
-		v.notifyCh = nil
-	}
-}
-
-// appendFuture is used for waiting on a pipelined append
-// entries RPC.
-type appendFuture struct {
-	deferError
-	start time.Time
-	args  *AppendEntriesRequest
-	resp  *AppendEntriesResponse
-}
-
-func (a *appendFuture) Start() time.Time {
-	return a.start
-}
-
-func (a *appendFuture) Request() *AppendEntriesRequest {
-	return a.args
-}
-
-func (a *appendFuture) Response() *AppendEntriesResponse {
-	return a.resp
-}
diff --git a/Godeps/_workspace/src/github.com/hashicorp/raft/inflight.go b/Godeps/_workspace/src/github.com/hashicorp/raft/inflight.go
deleted file mode 100644
index 7014ff503..000000000
--- a/Godeps/_workspace/src/github.com/hashicorp/raft/inflight.go
+++ /dev/null
@@ -1,213 +0,0 @@
-package raft
-
-import (
-	"container/list"
-	"sync"
-)
-
-// QuorumPolicy allows individual logFutures to have different
-// commitment rules while still using the inflight mechanism.
-type quorumPolicy interface {
-	// Checks if a commit from a given peer is enough to
-	// satisfy the commitment rules
-	Commit() bool
-
-	// Checks if a commit is committed
-	IsCommitted() bool
-}
-
-// MajorityQuorum is used by Apply transactions and requires
-// a simple majority of nodes.
-type majorityQuorum struct {
-	count       int
-	votesNeeded int
-}
-
-func newMajorityQuorum(clusterSize int) *majorityQuorum {
-	votesNeeded := (clusterSize / 2) + 1
-	return &majorityQuorum{count: 0, votesNeeded: votesNeeded}
-}
-
-func (m *majorityQuorum) Commit() bool {
-	m.count++
-	return m.count >= m.votesNeeded
-}
-
-func (m *majorityQuorum) IsCommitted() bool {
-	return m.count >= m.votesNeeded
-}
-
-// Inflight is used to track operations that are still in-flight.
-type inflight struct {
-	sync.Mutex
-	committed  *list.List
-	commitCh   chan struct{}
-	minCommit  uint64
-	maxCommit  uint64
-	operations map[uint64]*logFuture
-	stopCh     chan struct{}
-}
-
-// NewInflight returns an inflight struct that notifies
-// the provided channel when logs are finished committing.
-func newInflight(commitCh chan struct{}) *inflight {
-	return &inflight{
-		committed:  list.New(),
-		commitCh:   commitCh,
-		minCommit:  0,
-		maxCommit:  0,
-		operations: make(map[uint64]*logFuture),
-		stopCh:     make(chan struct{}),
-	}
-}
-
-// Start is used to mark a logFuture as being inflight. It
-// also commits the entry, as it is assumed the leader is
-// starting.
-func (i *inflight) Start(l *logFuture) {
-	i.Lock()
-	defer i.Unlock()
-	i.start(l)
-}
-
-// StartAll is used to mark a list of logFuture's as being
-// inflight. It also commits each entry as the leader is
-// assumed to be starting.
-func (i *inflight) StartAll(logs []*logFuture) {
-	i.Lock()
-	defer i.Unlock()
-	for _, l := range logs {
-		i.start(l)
-	}
-}
-
-// start is used to mark a single entry as inflight,
-// must be invoked with the lock held.
-func (i *inflight) start(l *logFuture) {
-	idx := l.log.Index
-	i.operations[idx] = l
-
-	if idx > i.maxCommit {
-		i.maxCommit = idx
-	}
-	if i.minCommit == 0 {
-		i.minCommit = idx
-	}
-	i.commit(idx)
-}
-
-// Cancel is used to cancel all in-flight operations.
-// This is done when the leader steps down, and all futures
-// are sent the given error.
-func (i *inflight) Cancel(err error) {
-	// Close the channel first to unblock any pending commits
-	close(i.stopCh)
-
-	// Lock after close to avoid deadlock
-	i.Lock()
-	defer i.Unlock()
-
-	// Respond to all inflight operations
-	for _, op := range i.operations {
-		op.respond(err)
-	}
-
-	// Clear all the committed but not processed
-	for e := i.committed.Front(); e != nil; e = e.Next() {
-		e.Value.(*logFuture).respond(err)
-	}
-
-	// Clear the map
-	i.operations = make(map[uint64]*logFuture)
-
-	// Clear the list of committed
-	i.committed = list.New()
-
-	// Close the commmitCh
-	close(i.commitCh)
-
-	// Reset indexes
-	i.minCommit = 0
-	i.maxCommit = 0
-}
-
-// Committed returns all the committed operations in order.
-func (i *inflight) Committed() (l *list.List) {
-	i.Lock()
-	l, i.committed = i.committed, list.New()
-	i.Unlock()
-	return l
-}
-
-// Commit is used by leader replication routines to indicate that
-// a follower was finished committing a log to disk.
-func (i *inflight) Commit(index uint64) {
-	i.Lock()
-	defer i.Unlock()
-	i.commit(index)
-}
-
-// CommitRange is used to commit a range of indexes inclusively.
-// It is optimized to avoid commits for indexes that are not tracked.
-func (i *inflight) CommitRange(minIndex, maxIndex uint64) {
-	i.Lock()
-	defer i.Unlock()
-
-	// Update the minimum index
-	minIndex = max(i.minCommit, minIndex)
-
-	// Commit each index
-	for idx := minIndex; idx <= maxIndex; idx++ {
-		i.commit(idx)
-	}
-}
-
-// commit is used to commit a single index. Must be called with the lock held.
-func (i *inflight) commit(index uint64) {
-	op, ok := i.operations[index]
-	if !ok {
-		// Ignore if not in the map, as it may be committed already
-		return
-	}
-
-	// Check if we've satisfied the commit
-	if !op.policy.Commit() {
-		return
-	}
-
-	// Cannot commit if this is not the minimum inflight. This can happen
-	// if the quorum size changes, meaning a previous commit requires a larger
-	// quorum that this commit. We MUST block until the previous log is committed,
-	// otherwise logs will be applied out of order.
-	if index != i.minCommit {
-		return
-	}
-
-NOTIFY:
-	// Add the operation to the committed list
-	i.committed.PushBack(op)
-
-	// Stop tracking since it is committed
-	delete(i.operations, index)
-
-	// Update the indexes
-	if index == i.maxCommit {
-		i.minCommit = 0
-		i.maxCommit = 0
-
-	} else {
-		i.minCommit++
-	}
-
-	// Check if the next in-flight operation is ready
-	if i.minCommit != 0 {
-		op = i.operations[i.minCommit]
-		if op.policy.IsCommitted() {
-			index = i.minCommit
-			goto NOTIFY
-		}
-	}
-
-	// Async notify of ready operations
-	asyncNotifyCh(i.commitCh)
-}
diff --git a/Godeps/_workspace/src/github.com/hashicorp/raft/inflight_test.go b/Godeps/_workspace/src/github.com/hashicorp/raft/inflight_test.go
deleted file mode 100644
index a9f57d6ea..000000000
--- a/Godeps/_workspace/src/github.com/hashicorp/raft/inflight_test.go
+++ /dev/null
@@ -1,150 +0,0 @@
-package raft
-
-import (
-	"fmt"
-	"testing"
-)
-
-func TestInflight_StartCommit(t *testing.T) {
-	commitCh := make(chan struct{}, 1)
-	in := newInflight(commitCh)
-
-	// Commit a transaction as being in flight
-	l := &logFuture{log: Log{Index: 1}}
-	l.policy = newMajorityQuorum(5)
-	in.Start(l)
-
-	// Commit 3 times
-	in.Commit(1)
-	if in.Committed().Len() != 0 {
-		t.Fatalf("should not be commited")
-	}
-
-	in.Commit(1)
-	if in.Committed().Len() != 1 {
-		t.Fatalf("should be commited")
-	}
-
-	// Already committed but should work anyways
-	in.Commit(1)
-}
-
-func TestInflight_Cancel(t *testing.T) {
-	commitCh := make(chan struct{}, 1)
-	in := newInflight(commitCh)
-
-	// Commit a transaction as being in flight
-	l := &logFuture{
-		log: Log{Index: 1},
-	}
-	l.init()
-	l.policy = newMajorityQuorum(3)
-	in.Start(l)
-
-	// Cancel with an error
-	err := fmt.Errorf("error 1")
-	in.Cancel(err)
-
-	// Should get an error return
-	if l.Error() != err {
-		t.Fatalf("expected error")
-	}
-}
-
-func TestInflight_StartAll(t *testing.T) {
-	commitCh := make(chan struct{}, 1)
-	in := newInflight(commitCh)
-
-	// Commit a few transaction as being in flight
-	l1 := &logFuture{log: Log{Index: 2}}
-	l1.policy = newMajorityQuorum(5)
-	l2 := &logFuture{log: Log{Index: 3}}
-	l2.policy = newMajorityQuorum(5)
-	l3 := &logFuture{log: Log{Index: 4}}
-	l3.policy = newMajorityQuorum(5)
-
-	// Start all the entries
-	in.StartAll([]*logFuture{l1, l2, l3})
-
-	// Commit ranges
-	in.CommitRange(1, 5)
-	in.CommitRange(1, 4)
-	in.CommitRange(1, 10)
-
-	// Should get 3 back
-	if in.Committed().Len() != 3 {
-		t.Fatalf("expected all 3 to commit")
-	}
-}
-
-func TestInflight_CommitRange(t *testing.T) {
-	commitCh := make(chan struct{}, 1)
-	in := newInflight(commitCh)
-
-	// Commit a few transaction as being in flight
-	l1 := &logFuture{log: Log{Index: 2}}
-	l1.policy = newMajorityQuorum(5)
-	in.Start(l1)
-
-	l2 := &logFuture{log: Log{Index: 3}}
-	l2.policy = newMajorityQuorum(5)
-	in.Start(l2)
-
-	l3 := &logFuture{log: Log{Index: 4}}
-	l3.policy = newMajorityQuorum(5)
-	in.Start(l3)
-
-	// Commit ranges
-	in.CommitRange(1, 5)
-	in.CommitRange(1, 4)
-	in.CommitRange(1, 10)
-
-	// Should get 3 back
-	if in.Committed().Len() != 3 {
-		t.Fatalf("expected all 3 to commit")
-	}
-}
-
-// Should panic if we commit non contiguously!
-func TestInflight_NonContiguous(t *testing.T) {
-	commitCh := make(chan struct{}, 1)
-	in := newInflight(commitCh)
-
-	// Commit a few transaction as being in flight
-	l1 := &logFuture{log: Log{Index: 2}}
-	l1.policy = newMajorityQuorum(5)
-	in.Start(l1)
-
-	l2 := &logFuture{log: Log{Index: 3}}
-	l2.policy = newMajorityQuorum(5)
-	in.Start(l2)
-
-	in.Commit(3)
-	in.Commit(3)
-	in.Commit(3) // panic!
-
-	if in.Committed().Len() != 0 {
-		t.Fatalf("should not commit")
-	}
-
-	in.Commit(2)
-	in.Commit(2)
-	in.Commit(2) // panic!
-
-	committed := in.Committed()
-	if committed.Len() != 2 {
-		t.Fatalf("should commit both")
-	}
-
-	current := committed.Front()
-	l := current.Value.(*logFuture)
-	if l.log.Index != 2 {
-		t.Fatalf("bad: %v", *l)
-	}
-
-	current = current.Next()
-	l = current.Value.(*logFuture)
-	if l.log.Index != 3 {
-		t.Fatalf("bad: %v", *l)
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/hashicorp/raft/inmem_store.go b/Godeps/_workspace/src/github.com/hashicorp/raft/inmem_store.go
deleted file mode 100644
index 6e4dfd020..000000000
--- a/Godeps/_workspace/src/github.com/hashicorp/raft/inmem_store.go
+++ /dev/null
@@ -1,116 +0,0 @@
-package raft
-
-import (
-	"sync"
-)
-
-// InmemStore implements the LogStore and StableStore interface.
-// It should NOT EVER be used for production. It is used only for
-// unit tests. Use the MDBStore implementation instead.
-type InmemStore struct {
-	l         sync.RWMutex
-	lowIndex  uint64
-	highIndex uint64
-	logs      map[uint64]*Log
-	kv        map[string][]byte
-	kvInt     map[string]uint64
-}
-
-// NewInmemStore returns a new in-memory backend. Do not ever
-// use for production. Only for testing.
-func NewInmemStore() *InmemStore {
-	i := &InmemStore{
-		logs:  make(map[uint64]*Log),
-		kv:    make(map[string][]byte),
-		kvInt: make(map[string]uint64),
-	}
-	return i
-}
-
-// FirstIndex implements the LogStore interface.
-func (i *InmemStore) FirstIndex() (uint64, error) {
-	i.l.RLock()
-	defer i.l.RUnlock()
-	return i.lowIndex, nil
-}
-
-// LastIndex implements the LogStore interface.
-func (i *InmemStore) LastIndex() (uint64, error) {
-	i.l.RLock()
-	defer i.l.RUnlock()
-	return i.highIndex, nil
-}
-
-// GetLog implements the LogStore interface.
-func (i *InmemStore) GetLog(index uint64, log *Log) error {
-	i.l.RLock()
-	defer i.l.RUnlock()
-	l, ok := i.logs[index]
-	if !ok {
-		return ErrLogNotFound
-	}
-	*log = *l
-	return nil
-}
-
-// StoreLog implements the LogStore interface.
-func (i *InmemStore) StoreLog(log *Log) error {
-	return i.StoreLogs([]*Log{log})
-}
-
-// StoreLogs implements the LogStore interface.
-func (i *InmemStore) StoreLogs(logs []*Log) error {
-	i.l.Lock()
-	defer i.l.Unlock()
-	for _, l := range logs {
-		i.logs[l.Index] = l
-		if i.lowIndex == 0 {
-			i.lowIndex = l.Index
-		}
-		if l.Index > i.highIndex {
-			i.highIndex = l.Index
-		}
-	}
-	return nil
-}
-
-// DeleteRange implements the LogStore interface.
-func (i *InmemStore) DeleteRange(min, max uint64) error {
-	i.l.Lock()
-	defer i.l.Unlock()
-	for j := min; j <= max; j++ {
-		delete(i.logs, j)
-	}
-	i.lowIndex = max + 1
-	return nil
-}
-
-// Set implements the StableStore interface.
-func (i *InmemStore) Set(key []byte, val []byte) error {
-	i.l.Lock()
-	defer i.l.Unlock()
-	i.kv[string(key)] = val
-	return nil
-}
-
-// Get implements the StableStore interface.
-func (i *InmemStore) Get(key []byte) ([]byte, error) {
-	i.l.RLock()
-	defer i.l.RUnlock()
-	return i.kv[string(key)], nil
-}
-
-// SetUint64 implements the StableStore interface.
-func (i *InmemStore) SetUint64(key []byte, val uint64) error {
-	i.l.Lock()
-	defer i.l.Unlock()
-	i.kvInt[string(key)] = val
-	return nil
-}
-
-// GetUint64 implements the StableStore interface.
-func (i *InmemStore) GetUint64(key []byte) (uint64, error) {
-	i.l.RLock()
-	defer i.l.RUnlock()
-	return i.kvInt[string(key)], nil
-}
diff --git a/Godeps/_workspace/src/github.com/hashicorp/raft/inmem_transport.go b/Godeps/_workspace/src/github.com/hashicorp/raft/inmem_transport.go
deleted file mode 100644
index 994d06d8f..000000000
--- a/Godeps/_workspace/src/github.com/hashicorp/raft/inmem_transport.go
+++ /dev/null
@@ -1,315 +0,0 @@
-package raft
-
-import (
-	"fmt"
-	"io"
-	"sync"
-	"time"
-)
-
-// NewInmemAddr returns a new in-memory addr with
-// a randomly generate UUID as the ID.
-func NewInmemAddr() string {
-	return generateUUID()
-}
-
-// inmemPipeline is used to pipeline requests for the in-mem transport.
-type inmemPipeline struct {
-	trans    *InmemTransport
-	peer     *InmemTransport
-	peerAddr string
-
-	doneCh       chan AppendFuture
-	inprogressCh chan *inmemPipelineInflight
-
-	shutdown     bool
-	shutdownCh   chan struct{}
-	shutdownLock sync.Mutex
-}
-
-type inmemPipelineInflight struct {
-	future *appendFuture
-	respCh <-chan RPCResponse
-}
-
-// InmemTransport Implements the Transport interface, to allow Raft to be
-// tested in-memory without going over a network.
-type InmemTransport struct {
-	sync.RWMutex
-	consumerCh chan RPC
-	localAddr  string
-	peers      map[string]*InmemTransport
-	pipelines  []*inmemPipeline
-	timeout    time.Duration
-}
-
-// NewInmemTransport is used to initialize a new transport
-// and generates a random local address.
-func NewInmemTransport() (string, *InmemTransport) {
-	addr := NewInmemAddr()
-	trans := &InmemTransport{
-		consumerCh: make(chan RPC, 16),
-		localAddr:  addr,
-		peers:      make(map[string]*InmemTransport),
-		timeout:    50 * time.Millisecond,
-	}
-	return addr, trans
-}
-
-// SetHeartbeatHandler is used to set optional fast-path for
-// heartbeats, not supported for this transport.
-func (i *InmemTransport) SetHeartbeatHandler(cb func(RPC)) {
-}
-
-// Consumer implements the Transport interface.
-func (i *InmemTransport) Consumer() <-chan RPC {
-	return i.consumerCh
-}
-
-// LocalAddr implements the Transport interface.
-func (i *InmemTransport) LocalAddr() string {
-	return i.localAddr
-}
-
-// AppendEntriesPipeline returns an interface that can be used to pipeline
-// AppendEntries requests.
-func (i *InmemTransport) AppendEntriesPipeline(target string) (AppendPipeline, error) {
-	i.RLock()
-	peer, ok := i.peers[target]
-	i.RUnlock()
-	if !ok {
-		return nil, fmt.Errorf("failed to connect to peer: %v", target)
-	}
-	pipeline := newInmemPipeline(i, peer, target)
-	i.Lock()
-	i.pipelines = append(i.pipelines, pipeline)
-	i.Unlock()
-	return pipeline, nil
-}
-
-// AppendEntries implements the Transport interface.
-func (i *InmemTransport) AppendEntries(target string, args *AppendEntriesRequest, resp *AppendEntriesResponse) error {
-	rpcResp, err := i.makeRPC(target, args, nil, i.timeout)
-	if err != nil {
-		return err
-	}
-
-	// Copy the result back
-	out := rpcResp.Response.(*AppendEntriesResponse)
-	*resp = *out
-	return nil
-}
-
-// RequestVote implements the Transport interface.
-func (i *InmemTransport) RequestVote(target string, args *RequestVoteRequest, resp *RequestVoteResponse) error {
-	rpcResp, err := i.makeRPC(target, args, nil, i.timeout)
-	if err != nil {
-		return err
-	}
-
-	// Copy the result back
-	out := rpcResp.Response.(*RequestVoteResponse)
-	*resp = *out
-	return nil
-}
-
-// InstallSnapshot implements the Transport interface.
-func (i *InmemTransport) InstallSnapshot(target string, args *InstallSnapshotRequest, resp *InstallSnapshotResponse, data io.Reader) error {
-	rpcResp, err := i.makeRPC(target, args, data, 10*i.timeout)
-	if err != nil {
-		return err
-	}
-
-	// Copy the result back
-	out := rpcResp.Response.(*InstallSnapshotResponse)
-	*resp = *out
-	return nil
-}
-
-func (i *InmemTransport) makeRPC(target string, args interface{}, r io.Reader, timeout time.Duration) (rpcResp RPCResponse, err error) {
-	i.RLock()
-	peer, ok := i.peers[target]
-	i.RUnlock()
-
-	if !ok {
-		err = fmt.Errorf("failed to connect to peer: %v", target)
-		return
-	}
-
-	// Send the RPC over
-	respCh := make(chan RPCResponse)
-	peer.consumerCh <- RPC{
-		Command:  args,
-		Reader:   r,
-		RespChan: respCh,
-	}
-
-	// Wait for a response
-	select {
-	case rpcResp = <-respCh:
-		if rpcResp.Error != nil {
-			err = rpcResp.Error
-		}
-	case <-time.After(timeout):
-		err = fmt.Errorf("command timed out")
-	}
-	return
-}
-
-// EncodePeer implements the Transport interface. It uses the UUID as the
-// address directly.
-func (i *InmemTransport) EncodePeer(p string) []byte {
-	return []byte(p)
-}
-
-// DecodePeer implements the Transport interface. It wraps the UUID in an
-// InmemAddr.
-func (i *InmemTransport) DecodePeer(buf []byte) string {
-	return string(buf)
-}
-
-// Connect is used to connect this transport to another transport for
-// a given peer name. This allows for local routing.
-func (i *InmemTransport) Connect(peer string, trans *InmemTransport) {
-	i.Lock()
-	defer i.Unlock()
-	i.peers[peer] = trans
-}
-
-// Disconnect is used to remove the ability to route to a given peer.
-func (i *InmemTransport) Disconnect(peer string) {
-	i.Lock()
-	defer i.Unlock()
-	delete(i.peers, peer)
-
-	// Disconnect any pipelines
-	n := len(i.pipelines)
-	for idx := 0; idx < n; idx++ {
-		if i.pipelines[idx].peerAddr == peer {
-			i.pipelines[idx].Close()
-			i.pipelines[idx], i.pipelines[n-1] = i.pipelines[n-1], nil
-			idx--
-			n--
-		}
-	}
-	i.pipelines = i.pipelines[:n]
-}
-
-// DisconnectAll is used to remove all routes to peers.
-func (i *InmemTransport) DisconnectAll() {
-	i.Lock()
-	defer i.Unlock()
-	i.peers = make(map[string]*InmemTransport)
-
-	// Handle pipelines
-	for _, pipeline := range i.pipelines {
-		pipeline.Close()
-	}
-	i.pipelines = nil
-}
-
-func newInmemPipeline(trans *InmemTransport, peer *InmemTransport, addr string) *inmemPipeline {
-	i := &inmemPipeline{
-		trans:        trans,
-		peer:         peer,
-		peerAddr:     addr,
-		doneCh:       make(chan AppendFuture, 16),
-		inprogressCh: make(chan *inmemPipelineInflight, 16),
-		shutdownCh:   make(chan struct{}),
-	}
-	go i.decodeResponses()
-	return i
-}
-
-func (i *inmemPipeline) decodeResponses() {
-	timeout := i.trans.timeout
-	for {
-		select {
-		case inp := <-i.inprogressCh:
-			var timeoutCh <-chan time.Time
-			if timeout > 0 {
-				timeoutCh = time.After(timeout)
-			}
-
-			select {
-			case rpcResp := <-inp.respCh:
-				// Copy the result back
-				*inp.future.resp = *rpcResp.Response.(*AppendEntriesResponse)
-				inp.future.respond(rpcResp.Error)
-
-				select {
-				case i.doneCh <- inp.future:
-				case <-i.shutdownCh:
-					return
-				}
-
-			case <-timeoutCh:
-				inp.future.respond(fmt.Errorf("command timed out"))
-				select {
-				case i.doneCh <- inp.future:
-				case <-i.shutdownCh:
-					return
-				}
-
-			case <-i.shutdownCh:
-				return
-			}
-		case <-i.shutdownCh:
-			return
-		}
-	}
-}
-
-func (i *inmemPipeline) AppendEntries(args *AppendEntriesRequest, resp *AppendEntriesResponse) (AppendFuture, error) {
-	// Create a new future
-	future := &appendFuture{
-		start: time.Now(),
-		args:  args,
-		resp:  resp,
-	}
-	future.init()
-
-	// Handle a timeout
-	var timeout <-chan time.Time
-	if i.trans.timeout > 0 {
-		timeout = time.After(i.trans.timeout)
-	}
-
-	// Send the RPC over
-	respCh := make(chan RPCResponse, 1)
-	rpc := RPC{
-		Command:  args,
-		RespChan: respCh,
-	}
-	select {
-	case i.peer.consumerCh <- rpc:
-	case <-timeout:
-		return nil, fmt.Errorf("command enqueue timeout")
-	case <-i.shutdownCh:
-		return nil, ErrPipelineShutdown
-	}
-
-	// Send to be decoded
-	select {
-	case i.inprogressCh <- &inmemPipelineInflight{future, respCh}:
-		return future, nil
-	case <-i.shutdownCh:
-		return nil, ErrPipelineShutdown
-	}
-}
-
-func (i *inmemPipeline) Consumer() <-chan AppendFuture {
-	return i.doneCh
-}
-
-func (i *inmemPipeline) Close() error {
-	i.shutdownLock.Lock()
-	defer i.shutdownLock.Unlock()
-	if i.shutdown {
-		return nil
-	}
-
-	i.shutdown = true
-	close(i.shutdownCh)
-	return nil
-}
diff --git a/Godeps/_workspace/src/github.com/hashicorp/raft/inmem_transport_test.go b/Godeps/_workspace/src/github.com/hashicorp/raft/inmem_transport_test.go
deleted file mode 100644
index 2086a2389..000000000
--- a/Godeps/_workspace/src/github.com/hashicorp/raft/inmem_transport_test.go
+++ /dev/null
@@ -1,12 +0,0 @@
-package raft
-
-import (
-	"testing"
-)
-
-func TestInmemTransportImpl(t *testing.T) {
-	var inm interface{} = &InmemTransport{}
-	if _, ok := inm.(Transport); !ok {
-		t.Fatalf("InmemTransport is not a Transport")
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/hashicorp/raft/integ_test.go b/Godeps/_workspace/src/github.com/hashicorp/raft/integ_test.go
deleted file mode 100644
index 1d071e139..000000000
--- a/Godeps/_workspace/src/github.com/hashicorp/raft/integ_test.go
+++ /dev/null
@@ -1,266 +0,0 @@
-package raft
-
-import (
-	"bytes"
-	"fmt"
-	"io/ioutil"
-	"log"
-	"os"
-	"testing"
-	"time"
-)
-
-// CheckInteg will skip a test if integration testing is not enabled.
-func CheckInteg(t *testing.T) {
-	if !IsInteg() {
-		t.SkipNow()
-	}
-}
-
-// IsInteg returns a boolean telling you if we're in integ testing mode.
-func IsInteg() bool {
-	return os.Getenv("INTEG_TESTS") != ""
-}
-
-type RaftEnv struct {
-	dir      string
-	conf     *Config
-	fsm      *MockFSM
-	store    *InmemStore
-	snapshot *FileSnapshotStore
-	peers    *JSONPeers
-	trans    *NetworkTransport
-	raft     *Raft
-}
-
-func (r *RaftEnv) Release() {
-	log.Printf("[WARN] Release node at %v", r.raft.localAddr)
-	f := r.raft.Shutdown()
-	if err := f.Error(); err != nil {
-		panic(err)
-	}
-	r.trans.Close()
-	os.RemoveAll(r.dir)
-}
-
-func MakeRaft(t *testing.T, conf *Config) *RaftEnv {
-	env := &RaftEnv{}
-
-	// Set the config
-	if conf == nil {
-		conf = inmemConfig()
-	}
-	env.conf = conf
-
-	dir, err := ioutil.TempDir("", "raft")
-	if err != nil {
-		t.Fatalf("err: %v ", err)
-	}
-	env.dir = dir
-
-	stable := NewInmemStore()
-	env.store = stable
-
-	snap, err := NewFileSnapshotStore(dir, 3, nil)
-	if err != nil {
-		t.Fatalf("err: %v", err)
-	}
-	env.snapshot = snap
-
-	env.fsm = &MockFSM{}
-
-	trans, err := NewTCPTransport("127.0.0.1:0", nil, 2, time.Second, nil)
-	if err != nil {
-		t.Fatalf("err: %v", err)
-	}
-	env.trans = trans
-
-	env.peers = NewJSONPeers(dir, trans)
-
-	log.Printf("[INFO] Starting node at %v", trans.LocalAddr())
-	raft, err := NewRaft(conf, env.fsm, stable, stable, snap, env.peers, trans)
-	if err != nil {
-		t.Fatalf("err: %v", err)
-	}
-	env.raft = raft
-	return env
-}
-
-func WaitFor(env *RaftEnv, state RaftState) error {
-	limit := time.Now().Add(200 * time.Millisecond)
-	for env.raft.State() != state {
-		if time.Now().Before(limit) {
-			time.Sleep(10 * time.Millisecond)
-		} else {
-			return fmt.Errorf("failed to transition to state %v", state)
-		}
-	}
-	return nil
-}
-
-func WaitForAny(state RaftState, envs []*RaftEnv) (*RaftEnv, error) {
-	limit := time.Now().Add(200 * time.Millisecond)
-CHECK:
-	for _, env := range envs {
-		if env.raft.State() == state {
-			return env, nil
-		}
-	}
-	if time.Now().Before(limit) {
-		goto WAIT
-	}
-	return nil, fmt.Errorf("failed to find node in %v state", state)
-WAIT:
-	time.Sleep(10 * time.Millisecond)
-	goto CHECK
-}
-
-func WaitFuture(f Future, t *testing.T) error {
-	timer := time.AfterFunc(200*time.Millisecond, func() {
-		panic(fmt.Errorf("timeout waiting for future %v", f))
-	})
-	defer timer.Stop()
-	return f.Error()
-}
-
-func NoErr(err error, t *testing.T) {
-	if err != nil {
-		t.Fatalf("err: %v", err)
-	}
-}
-
-func CheckConsistent(envs []*RaftEnv, t *testing.T) {
-	limit := time.Now().Add(400 * time.Millisecond)
-	first := envs[0]
-	var err error
-CHECK:
-	l1 := len(first.fsm.logs)
-	for i := 1; i < len(envs); i++ {
-		env := envs[i]
-		l2 := len(env.fsm.logs)
-		if l1 != l2 {
-			err = fmt.Errorf("log length mismatch %d %d", l1, l2)
-			goto ERR
-		}
-		for idx, log := range first.fsm.logs {
-			other := env.fsm.logs[idx]
-			if bytes.Compare(log, other) != 0 {
-				err = fmt.Errorf("log %d mismatch %v %v", idx, log, other)
-				goto ERR
-			}
-		}
-	}
-	return
-ERR:
-	if time.Now().After(limit) {
-		t.Fatalf("%v", err)
-	}
-	time.Sleep(20 * time.Millisecond)
-	goto CHECK
-}
-
-// Tests Raft by creating a cluster, growing it to 5 nodes while
-// causing various stressful conditions
-func TestRaft_Integ(t *testing.T) {
-	CheckInteg(t)
-	conf := DefaultConfig()
-	conf.HeartbeatTimeout = 50 * time.Millisecond
-	conf.ElectionTimeout = 50 * time.Millisecond
-	conf.LeaderLeaseTimeout = 50 * time.Millisecond
-	conf.CommitTimeout = 5 * time.Millisecond
-	conf.SnapshotThreshold = 100
-	conf.TrailingLogs = 10
-	conf.EnableSingleNode = true
-
-	// Create a single node
-	env1 := MakeRaft(t, conf)
-	NoErr(WaitFor(env1, Leader), t)
-
-	// Do some commits
-	var futures []Future
-	for i := 0; i < 100; i++ {
-		futures = append(futures, env1.raft.Apply([]byte(fmt.Sprintf("test%d", i)), 0))
-	}
-	for _, f := range futures {
-		NoErr(WaitFuture(f, t), t)
-		log.Printf("[DEBUG] Applied %v", f)
-	}
-
-	// Do a snapshot
-	NoErr(WaitFuture(env1.raft.Snapshot(), t), t)
-
-	// Join a few nodes!
-	var envs []*RaftEnv
-	for i := 0; i < 4; i++ {
-		env := MakeRaft(t, conf)
-		addr := env.trans.LocalAddr()
-		NoErr(WaitFuture(env1.raft.AddPeer(addr), t), t)
-		envs = append(envs, env)
-	}
-
-	// Wait for a leader
-	leader, err := WaitForAny(Leader, append([]*RaftEnv{env1}, envs...))
-	NoErr(err, t)
-
-	// Do some more commits
-	futures = nil
-	for i := 0; i < 100; i++ {
-		futures = append(futures, leader.raft.Apply([]byte(fmt.Sprintf("test%d", i)), 0))
-	}
-	for _, f := range futures {
-		NoErr(WaitFuture(f, t), t)
-		log.Printf("[DEBUG] Applied %v", f)
-	}
-
-	// Shoot two nodes in the head!
-	rm1, rm2 := envs[0], envs[1]
-	rm1.Release()
-	rm2.Release()
-	envs = envs[2:]
-	time.Sleep(10 * time.Millisecond)
-
-	// Wait for a leader
-	leader, err = WaitForAny(Leader, append([]*RaftEnv{env1}, envs...))
-	NoErr(err, t)
-
-	// Do some more commits
-	futures = nil
-	for i := 0; i < 100; i++ {
-		futures = append(futures, leader.raft.Apply([]byte(fmt.Sprintf("test%d", i)), 0))
-	}
-	for _, f := range futures {
-		NoErr(WaitFuture(f, t), t)
-		log.Printf("[DEBUG] Applied %v", f)
-	}
-
-	// Join a few new nodes!
-	for i := 0; i < 2; i++ {
-		env := MakeRaft(t, conf)
-		addr := env.trans.LocalAddr()
-		NoErr(WaitFuture(leader.raft.AddPeer(addr), t), t)
-		envs = append(envs, env)
-	}
-
-	// Remove the old nodes
-	NoErr(WaitFuture(leader.raft.RemovePeer(rm1.raft.localAddr), t), t)
-	NoErr(WaitFuture(leader.raft.RemovePeer(rm2.raft.localAddr), t), t)
-
-	// Shoot the leader
-	env1.Release()
-	time.Sleep(3 * conf.HeartbeatTimeout)
-
-	// Wait for a leader
-	leader, err = WaitForAny(Leader, envs)
-	NoErr(err, t)
-
-	allEnvs := append([]*RaftEnv{env1}, envs...)
-	CheckConsistent(allEnvs, t)
-
-	if len(env1.fsm.logs) != 300 {
-		t.Fatalf("should apply 300 logs! %d", len(env1.fsm.logs))
-	}
-
-	for _, e := range envs {
-		e.Release()
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/hashicorp/raft/log.go b/Godeps/_workspace/src/github.com/hashicorp/raft/log.go
deleted file mode 100644
index a8c5a40ea..000000000
--- a/Godeps/_workspace/src/github.com/hashicorp/raft/log.go
+++ /dev/null
@@ -1,60 +0,0 @@
-package raft
-
-// LogType describes various types of log entries.
-type LogType uint8
-
-const (
-	// LogCommand is applied to a user FSM.
-	LogCommand LogType = iota
-
-	// LogNoop is used to assert leadership.
-	LogNoop
-
-	// LogAddPeer is used to add a new peer.
-	LogAddPeer
-
-	// LogRemovePeer is used to remove an existing peer.
-	LogRemovePeer
-
-	// LogBarrier is used to ensure all preceding operations have been
-	// applied to the FSM. It is similar to LogNoop, but instead of returning
-	// once committed, it only returns once the FSM manager acks it. Otherwise
-	// it is possible there are operations committed but not yet applied to
-	// the FSM.
-	LogBarrier
-)
-
-// Log entries are replicated to all members of the Raft cluster
-// and form the heart of the replicated state machine.
-type Log struct {
-	Index uint64
-	Term  uint64
-	Type  LogType
-	Data  []byte
-
-	// peer is not exported since it is not transmitted, only used
-	// internally to construct the Data field.
-	peer string
-}
-
-// LogStore is used to provide an interface for storing
-// and retrieving logs in a durable fashion.
-type LogStore interface {
-	// Returns the first index written. 0 for no entries.
-	FirstIndex() (uint64, error)
-
-	// Returns the last index written. 0 for no entries.
-	LastIndex() (uint64, error)
-
-	// Gets a log entry at a given index.
-	GetLog(index uint64, log *Log) error
-
-	// Stores a log entry.
-	StoreLog(log *Log) error
-
-	// Stores multiple log entries.
-	StoreLogs(logs []*Log) error
-
-	// Deletes a range of log entries. The range is inclusive.
-	DeleteRange(min, max uint64) error
-}
diff --git a/Godeps/_workspace/src/github.com/hashicorp/raft/log_cache.go b/Godeps/_workspace/src/github.com/hashicorp/raft/log_cache.go
deleted file mode 100644
index 952e98c22..000000000
--- a/Godeps/_workspace/src/github.com/hashicorp/raft/log_cache.go
+++ /dev/null
@@ -1,79 +0,0 @@
-package raft
-
-import (
-	"fmt"
-	"sync"
-)
-
-// LogCache wraps any LogStore implementation to provide an
-// in-memory ring buffer. This is used to cache access to
-// the recently written entries. For implementations that do not
-// cache themselves, this can provide a substantial boost by
-// avoiding disk I/O on recent entries.
-type LogCache struct {
-	store LogStore
-
-	cache []*Log
-	l     sync.RWMutex
-}
-
-// NewLogCache is used to create a new LogCache with the
-// given capacity and backend store.
-func NewLogCache(capacity int, store LogStore) (*LogCache, error) {
-	if capacity <= 0 {
-		return nil, fmt.Errorf("capacity must be positive")
-	}
-	c := &LogCache{
-		store: store,
-		cache: make([]*Log, capacity),
-	}
-	return c, nil
-}
-
-func (c *LogCache) GetLog(idx uint64, log *Log) error {
-	// Check the buffer for an entry
-	c.l.RLock()
-	cached := c.cache[idx%uint64(len(c.cache))]
-	c.l.RUnlock()
-
-	// Check if entry is valid
-	if cached != nil && cached.Index == idx {
-		*log = *cached
-		return nil
-	}
-
-	// Forward request on cache miss
-	return c.store.GetLog(idx, log)
-}
-
-func (c *LogCache) StoreLog(log *Log) error {
-	return c.StoreLogs([]*Log{log})
-}
-
-func (c *LogCache) StoreLogs(logs []*Log) error {
-	// Insert the logs into the ring buffer
-	c.l.Lock()
-	for _, l := range logs {
-		c.cache[l.Index%uint64(len(c.cache))] = l
-	}
-	c.l.Unlock()
-
-	return c.store.StoreLogs(logs)
-}
-
-func (c *LogCache) FirstIndex() (uint64, error) {
-	return c.store.FirstIndex()
-}
-
-func (c *LogCache) LastIndex() (uint64, error) {
-	return c.store.LastIndex()
-}
-
-func (c *LogCache) DeleteRange(min, max uint64) error {
-	// Invalidate the cache on deletes
-	c.l.Lock()
-	c.cache = make([]*Log, len(c.cache))
-	c.l.Unlock()
-
-	return c.store.DeleteRange(min, max)
-}
diff --git a/Godeps/_workspace/src/github.com/hashicorp/raft/log_cache_test.go b/Godeps/_workspace/src/github.com/hashicorp/raft/log_cache_test.go
deleted file mode 100644
index 7569e78ee..000000000
--- a/Godeps/_workspace/src/github.com/hashicorp/raft/log_cache_test.go
+++ /dev/null
@@ -1,88 +0,0 @@
-package raft
-
-import (
-	"testing"
-)
-
-func TestLogCache(t *testing.T) {
-	store := NewInmemStore()
-	c, _ := NewLogCache(16, store)
-
-	// Insert into the in-mem store
-	for i := 0; i < 32; i++ {
-		log := &Log{Index: uint64(i) + 1}
-		store.StoreLog(log)
-	}
-
-	// Check the indexes
-	if idx, _ := c.FirstIndex(); idx != 1 {
-		t.Fatalf("bad: %d", idx)
-	}
-	if idx, _ := c.LastIndex(); idx != 32 {
-		t.Fatalf("bad: %d", idx)
-	}
-
-	// Try get log with a miss
-	var out Log
-	err := c.GetLog(1, &out)
-	if err != nil {
-		t.Fatalf("err: %v", err)
-	}
-	if out.Index != 1 {
-		t.Fatalf("bad: %#v", out)
-	}
-
-	// Store logs
-	l1 := &Log{Index: 33}
-	l2 := &Log{Index: 34}
-	err = c.StoreLogs([]*Log{l1, l2})
-	if err != nil {
-		t.Fatalf("err: %v", err)
-	}
-
-	if idx, _ := c.LastIndex(); idx != 34 {
-		t.Fatalf("bad: %d", idx)
-	}
-
-	// Check that it wrote-through
-	err = store.GetLog(33, &out)
-	if err != nil {
-		t.Fatalf("err: %v", err)
-	}
-	err = store.GetLog(34, &out)
-	if err != nil {
-		t.Fatalf("err: %v", err)
-	}
-
-	// Delete in the backend
-	err = store.DeleteRange(33, 34)
-	if err != nil {
-		t.Fatalf("err: %v", err)
-	}
-
-	// Should be in the ring buffer
-	err = c.GetLog(33, &out)
-	if err != nil {
-		t.Fatalf("err: %v", err)
-	}
-	err = c.GetLog(34, &out)
-	if err != nil {
-		t.Fatalf("err: %v", err)
-	}
-
-	// Purge the ring buffer
-	err = c.DeleteRange(33, 34)
-	if err != nil {
-		t.Fatalf("err: %v", err)
-	}
-
-	// Should not be in the ring buffer
-	err = c.GetLog(33, &out)
-	if err != ErrLogNotFound {
-		t.Fatalf("err: %v", err)
-	}
-	err = c.GetLog(34, &out)
-	if err != ErrLogNotFound {
-		t.Fatalf("err: %v", err)
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/hashicorp/raft/net_transport.go b/Godeps/_workspace/src/github.com/hashicorp/raft/net_transport.go
deleted file mode 100644
index 3f3ed31fd..000000000
--- a/Godeps/_workspace/src/github.com/hashicorp/raft/net_transport.go
+++ /dev/null
@@ -1,606 +0,0 @@
-package raft
-
-import (
-	"bufio"
-	"errors"
-	"fmt"
-	"io"
-	"log"
-	"net"
-	"os"
-	"sync"
-	"time"
-
-	"github.com/hashicorp/go-msgpack/codec"
-)
-
-const (
-	rpcAppendEntries uint8 = iota
-	rpcRequestVote
-	rpcInstallSnapshot
-
-	// DefaultTimeoutScale is the default TimeoutScale in a NetworkTransport.
-	DefaultTimeoutScale = 256 * 1024 // 256KB
-
-	// rpcMaxPipeline controls the maximum number of outstanding
-	// AppendEntries RPC calls.
-	rpcMaxPipeline = 128
-)
-
-var (
-	// ErrTransportShutdown is returned when operations on a transport are
-	// invoked after it's been terminated.
-	ErrTransportShutdown = errors.New("transport shutdown")
-
-	// ErrPipelineShutdown is returned when the pipeline is closed.
-	ErrPipelineShutdown = errors.New("append pipeline closed")
-)
-
-/*
-
-NetworkTransport provides a network based transport that can be
-used to communicate with Raft on remote machines. It requires
-an underlying stream layer to provide a stream abstraction, which can
-be simple TCP, TLS, etc.
-
-This transport is very simple and lightweight. Each RPC request is
-framed by sending a byte that indicates the message type, followed
-by the MsgPack encoded request.
-
-The response is an error string followed by the response object,
-both are encoded using MsgPack.
-
-InstallSnapshot is special, in that after the RPC request we stream
-the entire state. That socket is not re-used as the connection state
-is not known if there is an error.
-
-*/
-type NetworkTransport struct {
-	connPool     map[string][]*netConn
-	connPoolLock sync.Mutex
-
-	consumeCh chan RPC
-
-	heartbeatFn     func(RPC)
-	heartbeatFnLock sync.Mutex
-
-	logger *log.Logger
-
-	maxPool int
-
-	shutdown     bool
-	shutdownCh   chan struct{}
-	shutdownLock sync.Mutex
-
-	stream StreamLayer
-
-	timeout      time.Duration
-	TimeoutScale int
-}
-
-// StreamLayer is used with the NetworkTransport to provide
-// the low level stream abstraction.
-type StreamLayer interface {
-	net.Listener
-
-	// Dial is used to create a new outgoing connection
-	Dial(address string, timeout time.Duration) (net.Conn, error)
-}
-
-type netConn struct {
-	target string
-	conn   net.Conn
-	r      *bufio.Reader
-	w      *bufio.Writer
-	dec    *codec.Decoder
-	enc    *codec.Encoder
-}
-
-func (n *netConn) Release() error {
-	return n.conn.Close()
-}
-
-type netPipeline struct {
-	conn  *netConn
-	trans *NetworkTransport
-
-	doneCh       chan AppendFuture
-	inprogressCh chan *appendFuture
-
-	shutdown     bool
-	shutdownCh   chan struct{}
-	shutdownLock sync.Mutex
-}
-
-// NewNetworkTransport creates a new network transport with the given dialer
-// and listener. The maxPool controls how many connections we will pool. The
-// timeout is used to apply I/O deadlines. For InstallSnapshot, we multiply
-// the timeout by (SnapshotSize / TimeoutScale).
-func NewNetworkTransport(
-	stream StreamLayer,
-	maxPool int,
-	timeout time.Duration,
-	logOutput io.Writer,
-) *NetworkTransport {
-	if logOutput == nil {
-		logOutput = os.Stderr
-	}
-	trans := &NetworkTransport{
-		connPool:     make(map[string][]*netConn),
-		consumeCh:    make(chan RPC),
-		logger:       log.New(logOutput, "", log.LstdFlags),
-		maxPool:      maxPool,
-		shutdownCh:   make(chan struct{}),
-		stream:       stream,
-		timeout:      timeout,
-		TimeoutScale: DefaultTimeoutScale,
-	}
-	go trans.listen()
-	return trans
-}
-
-// SetHeartbeatHandler is used to setup a heartbeat handler
-// as a fast-pass. This is to avoid head-of-line blocking from
-// disk IO.
-func (n *NetworkTransport) SetHeartbeatHandler(cb func(rpc RPC)) {
-	n.heartbeatFnLock.Lock()
-	defer n.heartbeatFnLock.Unlock()
-	n.heartbeatFn = cb
-}
-
-// Close is used to stop the network transport.
-func (n *NetworkTransport) Close() error {
-	n.shutdownLock.Lock()
-	defer n.shutdownLock.Unlock()
-
-	if !n.shutdown {
-		close(n.shutdownCh)
-		n.stream.Close()
-		n.shutdown = true
-	}
-	return nil
-}
-
-// Consumer implements the Transport interface.
-func (n *NetworkTransport) Consumer() <-chan RPC {
-	return n.consumeCh
-}
-
-// LocalAddr implements the Transport interface.
-func (n *NetworkTransport) LocalAddr() string {
-	return n.stream.Addr().String()
-}
-
-// IsShutdown is used to check if the transport is shutdown.
-func (n *NetworkTransport) IsShutdown() bool {
-	select {
-	case <-n.shutdownCh:
-		return true
-	default:
-		return false
-	}
-}
-
-// getExistingConn is used to grab a pooled connection.
-func (n *NetworkTransport) getPooledConn(target string) *netConn {
-	n.connPoolLock.Lock()
-	defer n.connPoolLock.Unlock()
-
-	conns, ok := n.connPool[target]
-	if !ok || len(conns) == 0 {
-		return nil
-	}
-
-	var conn *netConn
-	num := len(conns)
-	conn, conns[num-1] = conns[num-1], nil
-	n.connPool[target] = conns[:num-1]
-	return conn
-}
-
-// getConn is used to get a connection from the pool.
-func (n *NetworkTransport) getConn(target string) (*netConn, error) {
-	// Check for a pooled conn
-	if conn := n.getPooledConn(target); conn != nil {
-		return conn, nil
-	}
-
-	// Dial a new connection
-	conn, err := n.stream.Dial(target, n.timeout)
-	if err != nil {
-		return nil, err
-	}
-
-	// Wrap the conn
-	netConn := &netConn{
-		target: target,
-		conn:   conn,
-		r:      bufio.NewReader(conn),
-		w:      bufio.NewWriter(conn),
-	}
-
-	// Setup encoder/decoders
-	netConn.dec = codec.NewDecoder(netConn.r, &codec.MsgpackHandle{})
-	netConn.enc = codec.NewEncoder(netConn.w, &codec.MsgpackHandle{})
-
-	// Done
-	return netConn, nil
-}
-
-// returnConn returns a connection back to the pool.
-func (n *NetworkTransport) returnConn(conn *netConn) {
-	n.connPoolLock.Lock()
-	defer n.connPoolLock.Unlock()
-
-	key := conn.target
-	conns, _ := n.connPool[key]
-
-	if !n.IsShutdown() && len(conns) < n.maxPool {
-		n.connPool[key] = append(conns, conn)
-	} else {
-		conn.Release()
-	}
-}
-
-// AppendEntriesPipeline returns an interface that can be used to pipeline
-// AppendEntries requests.
-func (n *NetworkTransport) AppendEntriesPipeline(target string) (AppendPipeline, error) {
-	// Get a connection
-	conn, err := n.getConn(target)
-	if err != nil {
-		return nil, err
-	}
-
-	// Create the pipeline
-	return newNetPipeline(n, conn), nil
-}
-
-// AppendEntries implements the Transport interface.
-func (n *NetworkTransport) AppendEntries(target string, args *AppendEntriesRequest, resp *AppendEntriesResponse) error {
-	return n.genericRPC(target, rpcAppendEntries, args, resp)
-}
-
-// RequestVote implements the Transport interface.
-func (n *NetworkTransport) RequestVote(target string, args *RequestVoteRequest, resp *RequestVoteResponse) error {
-	return n.genericRPC(target, rpcRequestVote, args, resp)
-}
-
-// genericRPC handles a simple request/response RPC.
-func (n *NetworkTransport) genericRPC(target string, rpcType uint8, args interface{}, resp interface{}) error {
-	// Get a conn
-	conn, err := n.getConn(target)
-	if err != nil {
-		return err
-	}
-
-	// Set a deadline
-	if n.timeout > 0 {
-		conn.conn.SetDeadline(time.Now().Add(n.timeout))
-	}
-
-	// Send the RPC
-	if err := sendRPC(conn, rpcType, args); err != nil {
-		return err
-	}
-
-	// Decode the response
-	canReturn, err := decodeResponse(conn, resp)
-	if canReturn {
-		n.returnConn(conn)
-	}
-	return err
-}
-
-// InstallSnapshot implements the Transport interface.
-func (n *NetworkTransport) InstallSnapshot(target string, args *InstallSnapshotRequest, resp *InstallSnapshotResponse, data io.Reader) error {
-	// Get a conn, always close for InstallSnapshot
-	conn, err := n.getConn(target)
-	if err != nil {
-		return err
-	}
-	defer conn.Release()
-
-	// Set a deadline, scaled by request size
-	if n.timeout > 0 {
-		timeout := n.timeout * time.Duration(args.Size/int64(n.TimeoutScale))
-		if timeout < n.timeout {
-			timeout = n.timeout
-		}
-		conn.conn.SetDeadline(time.Now().Add(timeout))
-	}
-
-	// Send the RPC
-	if err := sendRPC(conn, rpcInstallSnapshot, args); err != nil {
-		return err
-	}
-
-	// Stream the state
-	if _, err := io.Copy(conn.w, data); err != nil {
-		return err
-	}
-
-	// Flush
-	if err := conn.w.Flush(); err != nil {
-		return err
-	}
-
-	// Decode the response, do not return conn
-	_, err = decodeResponse(conn, resp)
-	return err
-}
-
-// EncodePeer implements the Transport interface.
-func (n *NetworkTransport) EncodePeer(p string) []byte {
-	return []byte(p)
-}
-
-// DecodePeer implements the Transport interface.
-func (n *NetworkTransport) DecodePeer(buf []byte) string {
-	return string(buf)
-}
-
-// listen is used to handling incoming connections.
-func (n *NetworkTransport) listen() {
-	for {
-		// Accept incoming connections
-		conn, err := n.stream.Accept()
-		if err != nil {
-			if n.IsShutdown() {
-				return
-			}
-			n.logger.Printf("[ERR] raft-net: Failed to accept connection: %v", err)
-			continue
-		}
-		n.logger.Printf("[DEBUG] raft-net: %v accepted connection from: %v", n.LocalAddr(), conn.RemoteAddr())
-
-		// Handle the connection in dedicated routine
-		go n.handleConn(conn)
-	}
-}
-
-// handleConn is used to handle an inbound connection for its lifespan.
-func (n *NetworkTransport) handleConn(conn net.Conn) {
-	defer conn.Close()
-	r := bufio.NewReader(conn)
-	w := bufio.NewWriter(conn)
-	dec := codec.NewDecoder(r, &codec.MsgpackHandle{})
-	enc := codec.NewEncoder(w, &codec.MsgpackHandle{})
-
-	for {
-		if err := n.handleCommand(r, dec, enc); err != nil {
-			if err != io.EOF {
-				n.logger.Printf("[ERR] raft-net: Failed to decode incoming command: %v", err)
-			}
-			return
-		}
-		if err := w.Flush(); err != nil {
-			n.logger.Printf("[ERR] raft-net: Failed to flush response: %v", err)
-			return
-		}
-	}
-}
-
-// handleCommand is used to decode and dispatch a single command.
-func (n *NetworkTransport) handleCommand(r *bufio.Reader, dec *codec.Decoder, enc *codec.Encoder) error {
-	// Get the rpc type
-	rpcType, err := r.ReadByte()
-	if err != nil {
-		return err
-	}
-
-	// Create the RPC object
-	respCh := make(chan RPCResponse, 1)
-	rpc := RPC{
-		RespChan: respCh,
-	}
-
-	// Decode the command
-	isHeartbeat := false
-	switch rpcType {
-	case rpcAppendEntries:
-		var req AppendEntriesRequest
-		if err := dec.Decode(&req); err != nil {
-			return err
-		}
-		rpc.Command = &req
-
-		// Check if this is a heartbeat
-		if req.Term != 0 && req.Leader != nil &&
-			req.PrevLogEntry == 0 && req.PrevLogTerm == 0 &&
-			len(req.Entries) == 0 && req.LeaderCommitIndex == 0 {
-			isHeartbeat = true
-		}
-
-	case rpcRequestVote:
-		var req RequestVoteRequest
-		if err := dec.Decode(&req); err != nil {
-			return err
-		}
-		rpc.Command = &req
-
-	case rpcInstallSnapshot:
-		var req InstallSnapshotRequest
-		if err := dec.Decode(&req); err != nil {
-			return err
-		}
-		rpc.Command = &req
-		rpc.Reader = io.LimitReader(r, req.Size)
-
-	default:
-		return fmt.Errorf("unknown rpc type %d", rpcType)
-	}
-
-	// Check for heartbeat fast-path
-	if isHeartbeat {
-		n.heartbeatFnLock.Lock()
-		fn := n.heartbeatFn
-		n.heartbeatFnLock.Unlock()
-		if fn != nil {
-			fn(rpc)
-			goto RESP
-		}
-	}
-
-	// Dispatch the RPC
-	select {
-	case n.consumeCh <- rpc:
-	case <-n.shutdownCh:
-		return ErrTransportShutdown
-	}
-
-	// Wait for response
-RESP:
-	select {
-	case resp := <-respCh:
-		// Send the error first
-		respErr := ""
-		if resp.Error != nil {
-			respErr = resp.Error.Error()
-		}
-		if err := enc.Encode(respErr); err != nil {
-			return err
-		}
-
-		// Send the response
-		if err := enc.Encode(resp.Response); err != nil {
-			return err
-		}
-	case <-n.shutdownCh:
-		return ErrTransportShutdown
-	}
-	return nil
-}
-
-// decodeResponse is used to decode an RPC response and reports whether
-// the connection can be reused.
-func decodeResponse(conn *netConn, resp interface{}) (bool, error) {
-	// Decode the error if any
-	var rpcError string
-	if err := conn.dec.Decode(&rpcError); err != nil {
-		conn.Release()
-		return false, err
-	}
-
-	// Decode the response
-	if err := conn.dec.Decode(resp); err != nil {
-		conn.Release()
-		return false, err
-	}
-
-	// Format an error if any
-	if rpcError != "" {
-		return true, fmt.Errorf(rpcError)
-	}
-	return true, nil
-}
-
-// sendRPC is used to encode and send the RPC.
-func sendRPC(conn *netConn, rpcType uint8, args interface{}) error {
-	// Write the request type
-	if err := conn.w.WriteByte(rpcType); err != nil {
-		conn.Release()
-		return err
-	}
-
-	// Send the request
-	if err := conn.enc.Encode(args); err != nil {
-		conn.Release()
-		return err
-	}
-
-	// Flush
-	if err := conn.w.Flush(); err != nil {
-		conn.Release()
-		return err
-	}
-	return nil
-}
-
-// newNetPipeline is used to construct a netPipeline from a given
-// transport and connection.
-func newNetPipeline(trans *NetworkTransport, conn *netConn) *netPipeline {
-	n := &netPipeline{
-		conn:         conn,
-		trans:        trans,
-		doneCh:       make(chan AppendFuture, rpcMaxPipeline),
-		inprogressCh: make(chan *appendFuture, rpcMaxPipeline),
-		shutdownCh:   make(chan struct{}),
-	}
-	go n.decodeResponses()
-	return n
-}
-
-// decodeResponses is a long running routine that decodes the responses
-// sent on the connection.
-func (n *netPipeline) decodeResponses() {
-	timeout := n.trans.timeout
-	for {
-		select {
-		case future := <-n.inprogressCh:
-			if timeout > 0 {
-				n.conn.conn.SetReadDeadline(time.Now().Add(timeout))
-			}
-
-			_, err := decodeResponse(n.conn, future.resp)
-			future.respond(err)
-			select {
-			case n.doneCh <- future:
-			case <-n.shutdownCh:
-				return
-			}
-		case <-n.shutdownCh:
-			return
-		}
-	}
-}
-
-// AppendEntries is used to pipeline a new append entries request.
-func (n *netPipeline) AppendEntries(args *AppendEntriesRequest, resp *AppendEntriesResponse) (AppendFuture, error) {
-	// Create a new future
-	future := &appendFuture{
-		start: time.Now(),
-		args:  args,
-		resp:  resp,
-	}
-	future.init()
-
-	// Add a send timeout
-	if timeout := n.trans.timeout; timeout > 0 {
-		n.conn.conn.SetWriteDeadline(time.Now().Add(timeout))
-	}
-
-	// Send the RPC
-	if err := sendRPC(n.conn, rpcAppendEntries, future.args); err != nil {
-		return nil, err
-	}
-
-	// Hand-off for decoding, this can also cause back-pressure
-	// to prevent too many inflight requests
-	select {
-	case n.inprogressCh <- future:
-		return future, nil
-	case <-n.shutdownCh:
-		return nil, ErrPipelineShutdown
-	}
-}
-
-// Consumer returns a channel that can be used to consume complete futures.
-func (n *netPipeline) Consumer() <-chan AppendFuture {
-	return n.doneCh
-}
-
-// Closed is used to shutdown the pipeline connection.
-func (n *netPipeline) Close() error {
-	n.shutdownLock.Lock()
-	defer n.shutdownLock.Unlock()
-	if n.shutdown {
-		return nil
-	}
-
-	// Release the connection
-	n.conn.Release()
-
-	n.shutdown = true
-	close(n.shutdownCh)
-	return nil
-}
diff --git a/Godeps/_workspace/src/github.com/hashicorp/raft/net_transport_test.go b/Godeps/_workspace/src/github.com/hashicorp/raft/net_transport_test.go
deleted file mode 100644
index 0127ac55e..000000000
--- a/Godeps/_workspace/src/github.com/hashicorp/raft/net_transport_test.go
+++ /dev/null
@@ -1,449 +0,0 @@
-package raft
-
-import (
-	"bytes"
-	"reflect"
-	"sync"
-	"testing"
-	"time"
-)
-
-func TestNetworkTransport_StartStop(t *testing.T) {
-	trans, err := NewTCPTransport("127.0.0.1:0", nil, 2, time.Second, nil)
-	if err != nil {
-		t.Fatalf("err: %v", err)
-	}
-	trans.Close()
-}
-
-func TestNetworkTransport_Heartbeat_FastPath(t *testing.T) {
-	// Transport 1 is consumer
-	trans1, err := NewTCPTransport("127.0.0.1:0", nil, 2, time.Second, nil)
-	if err != nil {
-		t.Fatalf("err: %v", err)
-	}
-	defer trans1.Close()
-
-	// Make the RPC request
-	args := AppendEntriesRequest{
-		Term:   10,
-		Leader: []byte("cartman"),
-	}
-	resp := AppendEntriesResponse{
-		Term:    4,
-		LastLog: 90,
-		Success: true,
-	}
-
-	invoked := false
-	fastpath := func(rpc RPC) {
-		// Verify the command
-		req := rpc.Command.(*AppendEntriesRequest)
-		if !reflect.DeepEqual(req, &args) {
-			t.Fatalf("command mismatch: %#v %#v", *req, args)
-		}
-
-		rpc.Respond(&resp, nil)
-		invoked = true
-	}
-	trans1.SetHeartbeatHandler(fastpath)
-
-	// Transport 2 makes outbound request
-	trans2, err := NewTCPTransport("127.0.0.1:0", nil, 2, time.Second, nil)
-	if err != nil {
-		t.Fatalf("err: %v", err)
-	}
-	defer trans2.Close()
-
-	var out AppendEntriesResponse
-	if err := trans2.AppendEntries(trans1.LocalAddr(), &args, &out); err != nil {
-		t.Fatalf("err: %v", err)
-	}
-
-	// Verify the response
-	if !reflect.DeepEqual(resp, out) {
-		t.Fatalf("command mismatch: %#v %#v", resp, out)
-	}
-
-	// Ensure fast-path is used
-	if !invoked {
-		t.Fatalf("fast-path not used")
-	}
-}
-
-func TestNetworkTransport_AppendEntries(t *testing.T) {
-	// Transport 1 is consumer
-	trans1, err := NewTCPTransport("127.0.0.1:0", nil, 2, time.Second, nil)
-	if err != nil {
-		t.Fatalf("err: %v", err)
-	}
-	defer trans1.Close()
-	rpcCh := trans1.Consumer()
-
-	// Make the RPC request
-	args := AppendEntriesRequest{
-		Term:         10,
-		Leader:       []byte("cartman"),
-		PrevLogEntry: 100,
-		PrevLogTerm:  4,
-		Entries: []*Log{
-			&Log{
-				Index: 101,
-				Term:  4,
-				Type:  LogNoop,
-			},
-		},
-		LeaderCommitIndex: 90,
-	}
-	resp := AppendEntriesResponse{
-		Term:    4,
-		LastLog: 90,
-		Success: true,
-	}
-
-	// Listen for a request
-	go func() {
-		select {
-		case rpc := <-rpcCh:
-			// Verify the command
-			req := rpc.Command.(*AppendEntriesRequest)
-			if !reflect.DeepEqual(req, &args) {
-				t.Fatalf("command mismatch: %#v %#v", *req, args)
-			}
-
-			rpc.Respond(&resp, nil)
-
-		case <-time.After(200 * time.Millisecond):
-			t.Fatalf("timeout")
-		}
-	}()
-
-	// Transport 2 makes outbound request
-	trans2, err := NewTCPTransport("127.0.0.1:0", nil, 2, time.Second, nil)
-	if err != nil {
-		t.Fatalf("err: %v", err)
-	}
-	defer trans2.Close()
-
-	var out AppendEntriesResponse
-	if err := trans2.AppendEntries(trans1.LocalAddr(), &args, &out); err != nil {
-		t.Fatalf("err: %v", err)
-	}
-
-	// Verify the response
-	if !reflect.DeepEqual(resp, out) {
-		t.Fatalf("command mismatch: %#v %#v", resp, out)
-	}
-}
-
-func TestNetworkTransport_AppendEntriesPipeline(t *testing.T) {
-	// Transport 1 is consumer
-	trans1, err := NewTCPTransport("127.0.0.1:0", nil, 2, time.Second, nil)
-	if err != nil {
-		t.Fatalf("err: %v", err)
-	}
-	defer trans1.Close()
-	rpcCh := trans1.Consumer()
-
-	// Make the RPC request
-	args := AppendEntriesRequest{
-		Term:         10,
-		Leader:       []byte("cartman"),
-		PrevLogEntry: 100,
-		PrevLogTerm:  4,
-		Entries: []*Log{
-			&Log{
-				Index: 101,
-				Term:  4,
-				Type:  LogNoop,
-			},
-		},
-		LeaderCommitIndex: 90,
-	}
-	resp := AppendEntriesResponse{
-		Term:    4,
-		LastLog: 90,
-		Success: true,
-	}
-
-	// Listen for a request
-	go func() {
-		for i := 0; i < 10; i++ {
-			select {
-			case rpc := <-rpcCh:
-				// Verify the command
-				req := rpc.Command.(*AppendEntriesRequest)
-				if !reflect.DeepEqual(req, &args) {
-					t.Fatalf("command mismatch: %#v %#v", *req, args)
-				}
-				rpc.Respond(&resp, nil)
-
-			case <-time.After(200 * time.Millisecond):
-				t.Fatalf("timeout")
-			}
-		}
-	}()
-
-	// Transport 2 makes outbound request
-	trans2, err := NewTCPTransport("127.0.0.1:0", nil, 2, time.Second, nil)
-	if err != nil {
-		t.Fatalf("err: %v", err)
-	}
-	defer trans2.Close()
-
-	pipeline, err := trans2.AppendEntriesPipeline(trans1.LocalAddr())
-	if err != nil {
-		t.Fatalf("err: %v", err)
-	}
-	defer pipeline.Close()
-	for i := 0; i < 10; i++ {
-		out := new(AppendEntriesResponse)
-		if _, err := pipeline.AppendEntries(&args, out); err != nil {
-			t.Fatalf("err: %v", err)
-		}
-	}
-
-	respCh := pipeline.Consumer()
-	for i := 0; i < 10; i++ {
-		select {
-		case ready := <-respCh:
-			// Verify the response
-			if !reflect.DeepEqual(&resp, ready.Response()) {
-				t.Fatalf("command mismatch: %#v %#v", &resp, ready.Response())
-			}
-		case <-time.After(200 * time.Millisecond):
-			t.Fatalf("timeout")
-		}
-	}
-}
-
-func TestNetworkTransport_RequestVote(t *testing.T) {
-	// Transport 1 is consumer
-	trans1, err := NewTCPTransport("127.0.0.1:0", nil, 2, time.Second, nil)
-	if err != nil {
-		t.Fatalf("err: %v", err)
-	}
-	defer trans1.Close()
-	rpcCh := trans1.Consumer()
-
-	// Make the RPC request
-	args := RequestVoteRequest{
-		Term:         20,
-		Candidate:    []byte("butters"),
-		LastLogIndex: 100,
-		LastLogTerm:  19,
-	}
-	resp := RequestVoteResponse{
-		Term:    100,
-		Peers:   []byte("blah"),
-		Granted: false,
-	}
-
-	// Listen for a request
-	go func() {
-		select {
-		case rpc := <-rpcCh:
-			// Verify the command
-			req := rpc.Command.(*RequestVoteRequest)
-			if !reflect.DeepEqual(req, &args) {
-				t.Fatalf("command mismatch: %#v %#v", *req, args)
-			}
-
-			rpc.Respond(&resp, nil)
-
-		case <-time.After(200 * time.Millisecond):
-			t.Fatalf("timeout")
-		}
-	}()
-
-	// Transport 2 makes outbound request
-	trans2, err := NewTCPTransport("127.0.0.1:0", nil, 2, time.Second, nil)
-	if err != nil {
-		t.Fatalf("err: %v", err)
-	}
-	defer trans2.Close()
-
-	var out RequestVoteResponse
-	if err := trans2.RequestVote(trans1.LocalAddr(), &args, &out); err != nil {
-		t.Fatalf("err: %v", err)
-	}
-
-	// Verify the response
-	if !reflect.DeepEqual(resp, out) {
-		t.Fatalf("command mismatch: %#v %#v", resp, out)
-	}
-}
-
-func TestNetworkTransport_InstallSnapshot(t *testing.T) {
-	// Transport 1 is consumer
-	trans1, err := NewTCPTransport("127.0.0.1:0", nil, 2, time.Second, nil)
-	if err != nil {
-		t.Fatalf("err: %v", err)
-	}
-	defer trans1.Close()
-	rpcCh := trans1.Consumer()
-
-	// Make the RPC request
-	args := InstallSnapshotRequest{
-		Term:         10,
-		Leader:       []byte("kyle"),
-		LastLogIndex: 100,
-		LastLogTerm:  9,
-		Peers:        []byte("blah blah"),
-		Size:         10,
-	}
-	resp := InstallSnapshotResponse{
-		Term:    10,
-		Success: true,
-	}
-
-	// Listen for a request
-	go func() {
-		select {
-		case rpc := <-rpcCh:
-			// Verify the command
-			req := rpc.Command.(*InstallSnapshotRequest)
-			if !reflect.DeepEqual(req, &args) {
-				t.Fatalf("command mismatch: %#v %#v", *req, args)
-			}
-
-			// Try to read the bytes
-			buf := make([]byte, 10)
-			rpc.Reader.Read(buf)
-
-			// Compare
-			if bytes.Compare(buf, []byte("0123456789")) != 0 {
-				t.Fatalf("bad buf %v", buf)
-			}
-
-			rpc.Respond(&resp, nil)
-
-		case <-time.After(200 * time.Millisecond):
-			t.Fatalf("timeout")
-		}
-	}()
-
-	// Transport 2 makes outbound request
-	trans2, err := NewTCPTransport("127.0.0.1:0", nil, 2, time.Second, nil)
-	if err != nil {
-		t.Fatalf("err: %v", err)
-	}
-	defer trans2.Close()
-
-	// Create a buffer
-	buf := bytes.NewBuffer([]byte("0123456789"))
-
-	var out InstallSnapshotResponse
-	if err := trans2.InstallSnapshot(trans1.LocalAddr(), &args, &out, buf); err != nil {
-		t.Fatalf("err: %v", err)
-	}
-
-	// Verify the response
-	if !reflect.DeepEqual(resp, out) {
-		t.Fatalf("command mismatch: %#v %#v", resp, out)
-	}
-}
-
-func TestNetworkTransport_EncodeDecode(t *testing.T) {
-	// Transport 1 is consumer
-	trans1, err := NewTCPTransport("127.0.0.1:0", nil, 2, time.Second, nil)
-	if err != nil {
-		t.Fatalf("err: %v", err)
-	}
-	defer trans1.Close()
-
-	local := trans1.LocalAddr()
-	enc := trans1.EncodePeer(local)
-	dec := trans1.DecodePeer(enc)
-
-	if dec != local {
-		t.Fatalf("enc/dec fail: %v %v", dec, local)
-	}
-}
-
-func TestNetworkTransport_PooledConn(t *testing.T) {
-	// Transport 1 is consumer
-	trans1, err := NewTCPTransport("127.0.0.1:0", nil, 2, time.Second, nil)
-	if err != nil {
-		t.Fatalf("err: %v", err)
-	}
-	defer trans1.Close()
-	rpcCh := trans1.Consumer()
-
-	// Make the RPC request
-	args := AppendEntriesRequest{
-		Term:         10,
-		Leader:       []byte("cartman"),
-		PrevLogEntry: 100,
-		PrevLogTerm:  4,
-		Entries: []*Log{
-			&Log{
-				Index: 101,
-				Term:  4,
-				Type:  LogNoop,
-			},
-		},
-		LeaderCommitIndex: 90,
-	}
-	resp := AppendEntriesResponse{
-		Term:    4,
-		LastLog: 90,
-		Success: true,
-	}
-
-	// Listen for a request
-	go func() {
-		for {
-			select {
-			case rpc := <-rpcCh:
-				// Verify the command
-				req := rpc.Command.(*AppendEntriesRequest)
-				if !reflect.DeepEqual(req, &args) {
-					t.Fatalf("command mismatch: %#v %#v", *req, args)
-				}
-				rpc.Respond(&resp, nil)
-
-			case <-time.After(200 * time.Millisecond):
-				return
-			}
-		}
-	}()
-
-	// Transport 2 makes outbound request, 3 conn pool
-	trans2, err := NewTCPTransport("127.0.0.1:0", nil, 3, time.Second, nil)
-	if err != nil {
-		t.Fatalf("err: %v", err)
-	}
-	defer trans2.Close()
-
-	// Create wait group
-	wg := &sync.WaitGroup{}
-	wg.Add(5)
-
-	appendFunc := func() {
-		defer wg.Done()
-		var out AppendEntriesResponse
-		if err := trans2.AppendEntries(trans1.LocalAddr(), &args, &out); err != nil {
-			t.Fatalf("err: %v", err)
-		}
-
-		// Verify the response
-		if !reflect.DeepEqual(resp, out) {
-			t.Fatalf("command mismatch: %#v %#v", resp, out)
-		}
-	}
-
-	// Try to do parallel appends, should stress the conn pool
-	for i := 0; i < 5; i++ {
-		go appendFunc()
-	}
-
-	// Wait for the routines to finish
-	wg.Wait()
-
-	// Check the conn pool size
-	addr := trans1.LocalAddr()
-	if len(trans2.connPool[addr]) != 3 {
-		t.Fatalf("Expected 2 pooled conns!")
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/hashicorp/raft/peer.go b/Godeps/_workspace/src/github.com/hashicorp/raft/peer.go
deleted file mode 100644
index 6f3bcf856..000000000
--- a/Godeps/_workspace/src/github.com/hashicorp/raft/peer.go
+++ /dev/null
@@ -1,122 +0,0 @@
-package raft
-
-import (
-	"bytes"
-	"encoding/json"
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"sync"
-)
-
-const (
-	jsonPeerPath = "peers.json"
-)
-
-// PeerStore provides an interface for persistent storage and
-// retrieval of peers. We use a separate interface than StableStore
-// since the peers may need to be edited by a human operator. For example,
-// in a two node cluster, the failure of either node requires human intervention
-// since consensus is impossible.
-type PeerStore interface {
-	// Peers returns the list of known peers.
-	Peers() ([]string, error)
-
-	// SetPeers sets the list of known peers. This is invoked when a peer is
-	// added or removed.
-	SetPeers([]string) error
-}
-
-// StaticPeers is used to provide a static list of peers.
-type StaticPeers struct {
-	StaticPeers []string
-	l           sync.Mutex
-}
-
-// Peers implements the PeerStore interface.
-func (s *StaticPeers) Peers() ([]string, error) {
-	s.l.Lock()
-	peers := s.StaticPeers
-	s.l.Unlock()
-	return peers, nil
-}
-
-// SetPeers implements the PeerStore interface.
-func (s *StaticPeers) SetPeers(p []string) error {
-	s.l.Lock()
-	s.StaticPeers = p
-	s.l.Unlock()
-	return nil
-}
-
-// JSONPeers is used to provide peer persistence on disk in the form
-// of a JSON file. This allows human operators to manipulate the file.
-type JSONPeers struct {
-	l     sync.Mutex
-	path  string
-	trans Transport
-}
-
-// NewJSONPeers creates a new JSONPeers store. Requires a transport
-// to handle the serialization of network addresses.
-func NewJSONPeers(base string, trans Transport) *JSONPeers {
-	path := filepath.Join(base, jsonPeerPath)
-	store := &JSONPeers{
-		path:  path,
-		trans: trans,
-	}
-	return store
-}
-
-// Peers implements the PeerStore interface.
-func (j *JSONPeers) Peers() ([]string, error) {
-	j.l.Lock()
-	defer j.l.Unlock()
-
-	// Read the file
-	buf, err := ioutil.ReadFile(j.path)
-	if err != nil && !os.IsNotExist(err) {
-		return nil, err
-	}
-
-	// Check for no peers
-	if len(buf) == 0 {
-		return nil, nil
-	}
-
-	// Decode the peers
-	var peerSet []string
-	dec := json.NewDecoder(bytes.NewReader(buf))
-	if err := dec.Decode(&peerSet); err != nil {
-		return nil, err
-	}
-
-	// Deserialize each peer
-	var peers []string
-	for _, p := range peerSet {
-		peers = append(peers, j.trans.DecodePeer([]byte(p)))
-	}
-	return peers, nil
-}
-
-// SetPeers implements the PeerStore interface.
-func (j *JSONPeers) SetPeers(peers []string) error {
-	j.l.Lock()
-	defer j.l.Unlock()
-
-	// Encode each peer
-	var peerSet []string
-	for _, p := range peers {
-		peerSet = append(peerSet, string(j.trans.EncodePeer(p)))
-	}
-
-	// Convert to JSON
-	var buf bytes.Buffer
-	enc := json.NewEncoder(&buf)
-	if err := enc.Encode(peerSet); err != nil {
-		return err
-	}
-
-	// Write out as JSON
-	return ioutil.WriteFile(j.path, buf.Bytes(), 0755)
-}
diff --git a/Godeps/_workspace/src/github.com/hashicorp/raft/peer_test.go b/Godeps/_workspace/src/github.com/hashicorp/raft/peer_test.go
deleted file mode 100644
index 1cb1159e2..000000000
--- a/Godeps/_workspace/src/github.com/hashicorp/raft/peer_test.go
+++ /dev/null
@@ -1,44 +0,0 @@
-package raft
-
-import (
-	"io/ioutil"
-	"os"
-	"testing"
-)
-
-func TestJSONPeers(t *testing.T) {
-	// Create a test dir
-	dir, err := ioutil.TempDir("", "raft")
-	if err != nil {
-		t.Fatalf("err: %v ", err)
-	}
-	defer os.RemoveAll(dir)
-
-	// Create the store
-	_, trans := NewInmemTransport()
-	store := NewJSONPeers(dir, trans)
-
-	// Try a read, should get nothing
-	peers, err := store.Peers()
-	if err != nil {
-		t.Fatalf("err: %v", err)
-	}
-	if len(peers) != 0 {
-		t.Fatalf("peers: %v", peers)
-	}
-
-	// Initialize some peers
-	newPeers := []string{NewInmemAddr(), NewInmemAddr(), NewInmemAddr()}
-	if err := store.SetPeers(newPeers); err != nil {
-		t.Fatalf("err: %v", err)
-	}
-
-	// Try a read, should peers
-	peers, err = store.Peers()
-	if err != nil {
-		t.Fatalf("err: %v", err)
-	}
-	if len(peers) != 3 {
-		t.Fatalf("peers: %v", peers)
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/hashicorp/raft/raft.go b/Godeps/_workspace/src/github.com/hashicorp/raft/raft.go
deleted file mode 100644
index 2fdc6d796..000000000
--- a/Godeps/_workspace/src/github.com/hashicorp/raft/raft.go
+++ /dev/null
@@ -1,1781 +0,0 @@
-package raft
-
-import (
-	"bytes"
-	"errors"
-	"fmt"
-	"io"
-	"log"
-	"os"
-	"strconv"
-	"sync"
-	"time"
-
-	"github.com/armon/go-metrics"
-)
-
-const (
-	minCheckInterval = 10 * time.Millisecond
-)
-
-var (
-	keyCurrentTerm  = []byte("CurrentTerm")
-	keyLastVoteTerm = []byte("LastVoteTerm")
-	keyLastVoteCand = []byte("LastVoteCand")
-
-	// ErrLeader is returned when an operation can't be completed on a
-	// leader node.
-	ErrLeader = errors.New("node is the leader")
-
-	// ErrNotLeader is returned when an operation can't be completed on a
-	// follower or candidate node.
-	ErrNotLeader = errors.New("node is not the leader")
-
-	// ErrLeadershipLost is returned when a leader fails to commit a log entry
-	// because it's been deposed in the process.
-	ErrLeadershipLost = errors.New("leadership lost while committing log")
-
-	// ErrRaftShutdown is returned when operations are requested against an
-	// inactive Raft.
-	ErrRaftShutdown = errors.New("raft is already shutdown")
-
-	// ErrEnqueueTimeout is returned when a command fails due to a timeout.
-	ErrEnqueueTimeout = errors.New("timed out enqueuing operation")
-
-	// ErrKnownPeer is returned when trying to add a peer to the configuration
-	// that already exists.
-	ErrKnownPeer = errors.New("peer already known")
-
-	// ErrUnknownPeer is returned when trying to remove a peer from the
-	// configuration that doesn't exist.
-	ErrUnknownPeer = errors.New("peer is unknown")
-)
-
-// commitTuple is used to send an index that was committed,
-// with an optional associated future that should be invoked.
-type commitTuple struct {
-	log    *Log
-	future *logFuture
-}
-
-// leaderState is state that is used while we are a leader.
-type leaderState struct {
-	commitCh  chan struct{}
-	inflight  *inflight
-	replState map[string]*followerReplication
-	notify    map[*verifyFuture]struct{}
-	stepDown  chan struct{}
-}
-
-// Raft implements a Raft node.
-type Raft struct {
-	raftState
-
-	// applyCh is used to async send logs to the main thread to
-	// be committed and applied to the FSM.
-	applyCh chan *logFuture
-
-	// Configuration provided at Raft initialization
-	conf *Config
-
-	// FSM is the client state machine to apply commands to
-	fsm FSM
-
-	// fsmCommitCh is used to trigger async application of logs to the fsm
-	fsmCommitCh chan commitTuple
-
-	// fsmRestoreCh is used to trigger a restore from snapshot
-	fsmRestoreCh chan *restoreFuture
-
-	// fsmSnapshotCh is used to trigger a new snapshot being taken
-	fsmSnapshotCh chan *reqSnapshotFuture
-
-	// lastContact is the last time we had contact from the
-	// leader node. This can be used to gauge staleness.
-	lastContact     time.Time
-	lastContactLock sync.RWMutex
-
-	// Leader is the current cluster leader
-	leader     string
-	leaderLock sync.RWMutex
-
-	// leaderCh is used to notify of leadership changes
-	leaderCh chan bool
-
-	// leaderState used only while state is leader
-	leaderState leaderState
-
-	// Stores our local addr
-	localAddr string
-
-	// Used for our logging
-	logger *log.Logger
-
-	// LogStore provides durable storage for logs
-	logs LogStore
-
-	// Track our known peers
-	peerCh    chan *peerFuture
-	peers     []string
-	peerStore PeerStore
-
-	// RPC chan comes from the transport layer
-	rpcCh <-chan RPC
-
-	// Shutdown channel to exit, protected to prevent concurrent exits
-	shutdown     bool
-	shutdownCh   chan struct{}
-	shutdownLock sync.Mutex
-
-	// snapshots is used to store and retrieve snapshots
-	snapshots SnapshotStore
-
-	// snapshotCh is used for user triggered snapshots
-	snapshotCh chan *snapshotFuture
-
-	// stable is a StableStore implementation for durable state
-	// It provides stable storage for many fields in raftState
-	stable StableStore
-
-	// The transport layer we use
-	trans Transport
-
-	// verifyCh is used to async send verify futures to the main thread
-	// to verify we are still the leader
-	verifyCh chan *verifyFuture
-}
-
-// NewRaft is used to construct a new Raft node. It takes a configuration, as well
-// as implementations of various interfaces that are required. If we have any old state,
-// such as snapshots, logs, peers, etc, all those will be restored when creating the
-// Raft node.
-func NewRaft(conf *Config, fsm FSM, logs LogStore, stable StableStore, snaps SnapshotStore,
-	peerStore PeerStore, trans Transport) (*Raft, error) {
-	// Validate the configuration
-	if err := ValidateConfig(conf); err != nil {
-		return nil, err
-	}
-
-	// Ensure we have a LogOutput
-	var logger *log.Logger
-	if conf.Logger != nil {
-		logger = conf.Logger
-	} else {
-		if conf.LogOutput == nil {
-			conf.LogOutput = os.Stderr
-		}
-		logger = log.New(conf.LogOutput, "", log.LstdFlags)
-	}
-
-	// Try to restore the current term
-	currentTerm, err := stable.GetUint64(keyCurrentTerm)
-	if err != nil && err.Error() != "not found" {
-		return nil, fmt.Errorf("failed to load current term: %v", err)
-	}
-
-	// Read the last log value
-	lastIdx, err := logs.LastIndex()
-	if err != nil {
-		return nil, fmt.Errorf("failed to find last log: %v", err)
-	}
-
-	// Get the log
-	var lastLog Log
-	if lastIdx > 0 {
-		if err := logs.GetLog(lastIdx, &lastLog); err != nil {
-			return nil, fmt.Errorf("failed to get last log: %v", err)
-		}
-	}
-
-	// Construct the list of peers that excludes us
-	localAddr := trans.LocalAddr()
-	peers, err := peerStore.Peers()
-	if err != nil {
-		return nil, fmt.Errorf("failed to get list of peers: %v", err)
-	}
-	peers = ExcludePeer(peers, localAddr)
-
-	// Create Raft struct
-	r := &Raft{
-		applyCh:       make(chan *logFuture),
-		conf:          conf,
-		fsm:           fsm,
-		fsmCommitCh:   make(chan commitTuple, 128),
-		fsmRestoreCh:  make(chan *restoreFuture),
-		fsmSnapshotCh: make(chan *reqSnapshotFuture),
-		leaderCh:      make(chan bool),
-		localAddr:     localAddr,
-		logger:        logger,
-		logs:          logs,
-		peerCh:        make(chan *peerFuture),
-		peers:         peers,
-		peerStore:     peerStore,
-		rpcCh:         trans.Consumer(),
-		snapshots:     snaps,
-		snapshotCh:    make(chan *snapshotFuture),
-		shutdownCh:    make(chan struct{}),
-		stable:        stable,
-		trans:         trans,
-		verifyCh:      make(chan *verifyFuture, 64),
-	}
-
-	// Initialize as a follower
-	r.setState(Follower)
-
-	// Restore the current term and the last log
-	r.setCurrentTerm(currentTerm)
-	r.setLastLogIndex(lastLog.Index)
-	r.setLastLogTerm(lastLog.Term)
-
-	// Attempt to restore a snapshot if there are any
-	if err := r.restoreSnapshot(); err != nil {
-		return nil, err
-	}
-
-	// Setup a heartbeat fast-path to avoid head-of-line
-	// blocking where possible. It MUST be safe for this
-	// to be called concurrently with a blocking RPC.
-	trans.SetHeartbeatHandler(r.processHeartbeat)
-
-	// Start the background work
-	r.goFunc(r.run)
-	r.goFunc(r.runFSM)
-	r.goFunc(r.runSnapshots)
-	return r, nil
-}
-
-// Leader is used to return the current leader of the cluster.
-// It may return empty string if there is no current leader
-// or the leader is unknown.
-func (r *Raft) Leader() string {
-	r.leaderLock.RLock()
-	leader := r.leader
-	r.leaderLock.RUnlock()
-	return leader
-}
-
-// setLeader is used to modify the current leader of the cluster
-func (r *Raft) setLeader(leader string) {
-	r.leaderLock.Lock()
-	r.leader = leader
-	r.leaderLock.Unlock()
-}
-
-// Apply is used to apply a command to the FSM in a highly consistent
-// manner. This returns a future that can be used to wait on the application.
-// An optional timeout can be provided to limit the amount of time we wait
-// for the command to be started. This must be run on the leader or it
-// will fail.
-func (r *Raft) Apply(cmd []byte, timeout time.Duration) ApplyFuture {
-	metrics.IncrCounter([]string{"raft", "apply"}, 1)
-	var timer <-chan time.Time
-	if timeout > 0 {
-		timer = time.After(timeout)
-	}
-
-	// Create a log future, no index or term yet
-	logFuture := &logFuture{
-		log: Log{
-			Type: LogCommand,
-			Data: cmd,
-		},
-	}
-	logFuture.init()
-
-	select {
-	case <-timer:
-		return errorFuture{ErrEnqueueTimeout}
-	case <-r.shutdownCh:
-		return errorFuture{ErrRaftShutdown}
-	case r.applyCh <- logFuture:
-		return logFuture
-	}
-}
-
-// Barrier is used to issue a command that blocks until all preceeding
-// operations have been applied to the FSM. It can be used to ensure the
-// FSM reflects all queued writes. An optional timeout can be provided to
-// limit the amount of time we wait for the command to be started. This
-// must be run on the leader or it will fail.
-func (r *Raft) Barrier(timeout time.Duration) Future {
-	metrics.IncrCounter([]string{"raft", "barrier"}, 1)
-	var timer <-chan time.Time
-	if timeout > 0 {
-		timer = time.After(timeout)
-	}
-
-	// Create a log future, no index or term yet
-	logFuture := &logFuture{
-		log: Log{
-			Type: LogBarrier,
-		},
-	}
-	logFuture.init()
-
-	select {
-	case <-timer:
-		return errorFuture{ErrEnqueueTimeout}
-	case <-r.shutdownCh:
-		return errorFuture{ErrRaftShutdown}
-	case r.applyCh <- logFuture:
-		return logFuture
-	}
-}
-
-// VerifyLeader is used to ensure the current node is still
-// the leader. This can be done to prevent stale reads when a
-// new leader has potentially been elected.
-func (r *Raft) VerifyLeader() Future {
-	metrics.IncrCounter([]string{"raft", "verify_leader"}, 1)
-	verifyFuture := &verifyFuture{}
-	verifyFuture.init()
-	select {
-	case <-r.shutdownCh:
-		return errorFuture{ErrRaftShutdown}
-	case r.verifyCh <- verifyFuture:
-		return verifyFuture
-	}
-}
-
-// AddPeer is used to add a new peer into the cluster. This must be
-// run on the leader or it will fail.
-func (r *Raft) AddPeer(peer string) Future {
-	logFuture := &logFuture{
-		log: Log{
-			Type: LogAddPeer,
-			peer: peer,
-		},
-	}
-	logFuture.init()
-	select {
-	case r.applyCh <- logFuture:
-		return logFuture
-	case <-r.shutdownCh:
-		return errorFuture{ErrRaftShutdown}
-	}
-}
-
-// RemovePeer is used to remove a peer from the cluster. If the
-// current leader is being removed, it will cause a new election
-// to occur. This must be run on the leader or it will fail.
-func (r *Raft) RemovePeer(peer string) Future {
-	logFuture := &logFuture{
-		log: Log{
-			Type: LogRemovePeer,
-			peer: peer,
-		},
-	}
-	logFuture.init()
-	select {
-	case r.applyCh <- logFuture:
-		return logFuture
-	case <-r.shutdownCh:
-		return errorFuture{ErrRaftShutdown}
-	}
-}
-
-// SetPeers is used to forcibly replace the set of internal peers and
-// the peerstore with the ones specified. This can be considered unsafe.
-func (r *Raft) SetPeers(p []string) Future {
-	peerFuture := &peerFuture{
-		peers: p,
-	}
-	peerFuture.init()
-
-	select {
-	case r.peerCh <- peerFuture:
-		return peerFuture
-	case <-r.shutdownCh:
-		return errorFuture{ErrRaftShutdown}
-	}
-}
-
-// Shutdown is used to stop the Raft background routines.
-// This is not a graceful operation. Provides a future that
-// can be used to block until all background routines have exited.
-func (r *Raft) Shutdown() Future {
-	r.shutdownLock.Lock()
-	defer r.shutdownLock.Unlock()
-
-	if !r.shutdown {
-		close(r.shutdownCh)
-		r.shutdown = true
-		r.setState(Shutdown)
-	}
-
-	return &shutdownFuture{r}
-}
-
-// Snapshot is used to manually force Raft to take a snapshot.
-// Returns a future that can be used to block until complete.
-func (r *Raft) Snapshot() Future {
-	snapFuture := &snapshotFuture{}
-	snapFuture.init()
-	select {
-	case r.snapshotCh <- snapFuture:
-		return snapFuture
-	case <-r.shutdownCh:
-		return errorFuture{ErrRaftShutdown}
-	}
-
-}
-
-// State is used to return the current raft state.
-func (r *Raft) State() RaftState {
-	return r.getState()
-}
-
-// LeaderCh is used to get a channel which delivers signals on
-// acquiring or losing leadership. It sends true if we become
-// the leader, and false if we lose it. The channel is not buffered,
-// and does not block on writes.
-func (r *Raft) LeaderCh() <-chan bool {
-	return r.leaderCh
-}
-
-func (r *Raft) String() string {
-	return fmt.Sprintf("Node at %s [%v]", r.localAddr, r.getState())
-}
-
-// LastContact returns the time of last contact by a leader.
-// This only makes sense if we are currently a follower.
-func (r *Raft) LastContact() time.Time {
-	r.lastContactLock.RLock()
-	last := r.lastContact
-	r.lastContactLock.RUnlock()
-	return last
-}
-
-// Stats is used to return a map of various internal stats. This should only
-// be used for informative purposes or debugging.
-func (r *Raft) Stats() map[string]string {
-	toString := func(v uint64) string {
-		return strconv.FormatUint(v, 10)
-	}
-	s := map[string]string{
-		"state":               r.getState().String(),
-		"term":                toString(r.getCurrentTerm()),
-		"last_log_index":      toString(r.getLastLogIndex()),
-		"last_log_term":       toString(r.getLastLogTerm()),
-		"commit_index":        toString(r.getCommitIndex()),
-		"applied_index":       toString(r.getLastApplied()),
-		"fsm_pending":         toString(uint64(len(r.fsmCommitCh))),
-		"last_snapshot_index": toString(r.getLastSnapshotIndex()),
-		"last_snapshot_term":  toString(r.getLastSnapshotTerm()),
-		"num_peers":           toString(uint64(len(r.peers))),
-	}
-	last := r.LastContact()
-	if last.IsZero() {
-		s["last_contact"] = "never"
-	} else if r.getState() == Leader {
-		s["last_contact"] = "0"
-	} else {
-		s["last_contact"] = fmt.Sprintf("%v", time.Now().Sub(last))
-	}
-	return s
-}
-
-// LastIndex returns the last index in stable storage,
-// either from the last log or from the last snapshot.
-func (r *Raft) LastIndex() uint64 {
-	return r.getLastIndex()
-}
-
-// AppliedIndex returns the last index applied to the FSM.
-// This is generally lagging behind the last index, especially
-// for indexes that are persisted but have not yet been considered
-// committed by the leader.
-func (r *Raft) AppliedIndex() uint64 {
-	return r.getLastApplied()
-}
-
-// runFSM is a long running goroutine responsible for applying logs
-// to the FSM. This is done async of other logs since we don't want
-// the FSM to block our internal operations.
-func (r *Raft) runFSM() {
-	var lastIndex, lastTerm uint64
-	for {
-		select {
-		case req := <-r.fsmRestoreCh:
-			// Open the snapshot
-			meta, source, err := r.snapshots.Open(req.ID)
-			if err != nil {
-				req.respond(fmt.Errorf("failed to open snapshot %v: %v", req.ID, err))
-				continue
-			}
-
-			// Attempt to restore
-			start := time.Now()
-			if err := r.fsm.Restore(source); err != nil {
-				req.respond(fmt.Errorf("failed to restore snapshot %v: %v", req.ID, err))
-				source.Close()
-				continue
-			}
-			source.Close()
-			metrics.MeasureSince([]string{"raft", "fsm", "restore"}, start)
-
-			// Update the last index and term
-			lastIndex = meta.Index
-			lastTerm = meta.Term
-			req.respond(nil)
-
-		case req := <-r.fsmSnapshotCh:
-			// Get our peers
-			peers, err := r.peerStore.Peers()
-			if err != nil {
-				req.respond(err)
-			}
-
-			// Start a snapshot
-			start := time.Now()
-			snap, err := r.fsm.Snapshot()
-			metrics.MeasureSince([]string{"raft", "fsm", "snapshot"}, start)
-
-			// Respond to the request
-			req.index = lastIndex
-			req.term = lastTerm
-			req.peers = peers
-			req.snapshot = snap
-			req.respond(err)
-
-		case commitTuple := <-r.fsmCommitCh:
-			// Apply the log if a command
-			var resp interface{}
-			if commitTuple.log.Type == LogCommand {
-				start := time.Now()
-				resp = r.fsm.Apply(commitTuple.log)
-				metrics.MeasureSince([]string{"raft", "fsm", "apply"}, start)
-			}
-
-			// Update the indexes
-			lastIndex = commitTuple.log.Index
-			lastTerm = commitTuple.log.Term
-
-			// Invoke the future if given
-			if commitTuple.future != nil {
-				commitTuple.future.response = resp
-				commitTuple.future.respond(nil)
-			}
-		case <-r.shutdownCh:
-			return
-		}
-	}
-}
-
-// run is a long running goroutine that runs the Raft FSM.
-func (r *Raft) run() {
-	for {
-		// Check if we are doing a shutdown
-		select {
-		case <-r.shutdownCh:
-			// Clear the leader to prevent forwarding
-			r.setLeader("")
-			return
-		default:
-		}
-
-		// Enter into a sub-FSM
-		switch r.getState() {
-		case Follower:
-			r.runFollower()
-		case Candidate:
-			r.runCandidate()
-		case Leader:
-			r.runLeader()
-		}
-	}
-}
-
-// runFollower runs the FSM for a follower.
-func (r *Raft) runFollower() {
-	didWarn := false
-	r.logger.Printf("[INFO] raft: %v entering Follower state", r)
-	heartbeatTimer := randomTimeout(r.conf.HeartbeatTimeout)
-	for {
-		select {
-		case rpc := <-r.rpcCh:
-			r.processRPC(rpc)
-
-		case a := <-r.applyCh:
-			// Reject any operations since we are not the leader
-			a.respond(ErrNotLeader)
-
-		case v := <-r.verifyCh:
-			// Reject any operations since we are not the leader
-			v.respond(ErrNotLeader)
-
-		case p := <-r.peerCh:
-			// Set the peers
-			r.peers = ExcludePeer(p.peers, r.localAddr)
-			p.respond(r.peerStore.SetPeers(p.peers))
-
-		case <-heartbeatTimer:
-			// Restart the heartbeat timer
-			heartbeatTimer = randomTimeout(r.conf.HeartbeatTimeout)
-
-			// Check if we have had a successful contact
-			lastContact := r.LastContact()
-			if time.Now().Sub(lastContact) < r.conf.HeartbeatTimeout {
-				continue
-			}
-
-			// Heartbeat failed! Transition to the candidate state
-			r.setLeader("")
-			if len(r.peers) == 0 && !r.conf.EnableSingleNode {
-				if !didWarn {
-					r.logger.Printf("[WARN] raft: EnableSingleNode disabled, and no known peers. Aborting election.")
-					didWarn = true
-				}
-			} else {
-				r.logger.Printf("[WARN] raft: Heartbeat timeout reached, starting election")
-				r.setState(Candidate)
-				return
-			}
-
-		case <-r.shutdownCh:
-			return
-		}
-	}
-}
-
-// runCandidate runs the FSM for a candidate.
-func (r *Raft) runCandidate() {
-	r.logger.Printf("[INFO] raft: %v entering Candidate state", r)
-
-	// Start vote for us, and set a timeout
-	voteCh := r.electSelf()
-	electionTimer := randomTimeout(r.conf.ElectionTimeout)
-
-	// Tally the votes, need a simple majority
-	grantedVotes := 0
-	votesNeeded := r.quorumSize()
-	r.logger.Printf("[DEBUG] raft: Votes needed: %d", votesNeeded)
-
-	for r.getState() == Candidate {
-		select {
-		case rpc := <-r.rpcCh:
-			r.processRPC(rpc)
-
-		case vote := <-voteCh:
-			// Check if the term is greater than ours, bail
-			if vote.Term > r.getCurrentTerm() {
-				r.logger.Printf("[DEBUG] raft: Newer term discovered, fallback to follower")
-				r.setState(Follower)
-				r.setCurrentTerm(vote.Term)
-				return
-			}
-
-			// Check if the vote is granted
-			if vote.Granted {
-				grantedVotes++
-				r.logger.Printf("[DEBUG] raft: Vote granted. Tally: %d", grantedVotes)
-			}
-
-			// Check if we've become the leader
-			if grantedVotes >= votesNeeded {
-				r.logger.Printf("[INFO] raft: Election won. Tally: %d", grantedVotes)
-				r.setState(Leader)
-				r.setLeader(r.localAddr)
-				return
-			}
-
-		case a := <-r.applyCh:
-			// Reject any operations since we are not the leader
-			a.respond(ErrNotLeader)
-
-		case v := <-r.verifyCh:
-			// Reject any operations since we are not the leader
-			v.respond(ErrNotLeader)
-
-		case p := <-r.peerCh:
-			// Set the peers
-			r.peers = ExcludePeer(p.peers, r.localAddr)
-			p.respond(r.peerStore.SetPeers(p.peers))
-			// Become a follower again
-			r.setState(Follower)
-			return
-
-		case <-electionTimer:
-			// Election failed! Restart the election. We simply return,
-			// which will kick us back into runCandidate
-			r.logger.Printf("[WARN] raft: Election timeout reached, restarting election")
-			return
-
-		case <-r.shutdownCh:
-			return
-		}
-	}
-}
-
-// runLeader runs the FSM for a leader. Do the setup here and drop into
-// the leaderLoop for the hot loop.
-func (r *Raft) runLeader() {
-	r.logger.Printf("[INFO] raft: %v entering Leader state", r)
-
-	// Notify that we are the leader
-	asyncNotifyBool(r.leaderCh, true)
-
-	// Setup leader state
-	r.leaderState.commitCh = make(chan struct{}, 1)
-	r.leaderState.inflight = newInflight(r.leaderState.commitCh)
-	r.leaderState.replState = make(map[string]*followerReplication)
-	r.leaderState.notify = make(map[*verifyFuture]struct{})
-	r.leaderState.stepDown = make(chan struct{}, 1)
-
-	// Cleanup state on step down
-	defer func() {
-		// Stop replication
-		for _, p := range r.leaderState.replState {
-			close(p.stopCh)
-		}
-
-		// Cancel inflight requests
-		r.leaderState.inflight.Cancel(ErrLeadershipLost)
-
-		// Respond to any pending verify requests
-		for future := range r.leaderState.notify {
-			future.respond(ErrLeadershipLost)
-		}
-
-		// Clear all the state
-		r.leaderState.commitCh = nil
-		r.leaderState.inflight = nil
-		r.leaderState.replState = nil
-		r.leaderState.notify = nil
-		r.leaderState.stepDown = nil
-
-		// If we are stepping down for some reason, no known leader.
-		// We may have stepped down due to an RPC call, which would
-		// provide the leader, so we cannot always blank this out.
-		r.leaderLock.Lock()
-		if r.leader == r.localAddr {
-			r.leader = ""
-		}
-		r.leaderLock.Unlock()
-
-		// Notify that we are not the leader
-		asyncNotifyBool(r.leaderCh, false)
-	}()
-
-	// Start a replication routine for each peer
-	for _, peer := range r.peers {
-		r.startReplication(peer)
-	}
-
-	// Dispatch a no-op log first. Instead of LogNoop,
-	// we use a LogAddPeer with our peerset. This acts like
-	// a no-op as well, but when doing an initial bootstrap, ensures
-	// that all nodes share a common peerset.
-	peerSet := append([]string{r.localAddr}, r.peers...)
-	noop := &logFuture{
-		log: Log{
-			Type: LogAddPeer,
-			Data: encodePeers(peerSet, r.trans),
-		},
-	}
-	r.dispatchLogs([]*logFuture{noop})
-
-	// Disable EnableSingleNode after we've been elected leader.
-	// This is to prevent a split brain in the future, if we are removed
-	// from the cluster and then elect ourself as leader.
-	if r.conf.DisableBootstrapAfterElect && r.conf.EnableSingleNode {
-		r.logger.Printf("[INFO] raft: Disabling EnableSingleNode (bootstrap)")
-		r.conf.EnableSingleNode = false
-	}
-
-	// Sit in the leader loop until we step down
-	r.leaderLoop()
-}
-
-// startReplication is a helper to setup state and start async replication to a peer.
-func (r *Raft) startReplication(peer string) {
-	lastIdx := r.getLastIndex()
-	s := &followerReplication{
-		peer:        peer,
-		inflight:    r.leaderState.inflight,
-		stopCh:      make(chan uint64, 1),
-		triggerCh:   make(chan struct{}, 1),
-		currentTerm: r.getCurrentTerm(),
-		matchIndex:  0,
-		nextIndex:   lastIdx + 1,
-		lastContact: time.Now(),
-		notifyCh:    make(chan struct{}, 1),
-		stepDown:    r.leaderState.stepDown,
-	}
-	r.leaderState.replState[peer] = s
-	r.goFunc(func() { r.replicate(s) })
-	asyncNotifyCh(s.triggerCh)
-}
-
-// leaderLoop is the hot loop for a leader. It is invoked
-// after all the various leader setup is done.
-func (r *Raft) leaderLoop() {
-	lease := time.After(r.conf.LeaderLeaseTimeout)
-	for r.getState() == Leader {
-		select {
-		case rpc := <-r.rpcCh:
-			r.processRPC(rpc)
-
-		case <-r.leaderState.stepDown:
-			r.setState(Follower)
-
-		case <-r.leaderState.commitCh:
-			// Get the committed messages
-			committed := r.leaderState.inflight.Committed()
-			for e := committed.Front(); e != nil; e = e.Next() {
-				// Measure the commit time
-				commitLog := e.Value.(*logFuture)
-				metrics.MeasureSince([]string{"raft", "commitTime"}, commitLog.dispatch)
-
-				// Increment the commit index
-				idx := commitLog.log.Index
-				r.setCommitIndex(idx)
-				r.processLogs(idx, commitLog)
-			}
-
-		case v := <-r.verifyCh:
-			if v.quorumSize == 0 {
-				// Just dispatched, start the verification
-				r.verifyLeader(v)
-
-			} else if v.votes < v.quorumSize {
-				// Early return, means there must be a new leader
-				r.logger.Printf("[WARN] raft: New leader elected, stepping down")
-				r.setState(Follower)
-				delete(r.leaderState.notify, v)
-				v.respond(ErrNotLeader)
-
-			} else {
-				// Quorum of members agree, we are still leader
-				delete(r.leaderState.notify, v)
-				v.respond(nil)
-			}
-
-		case p := <-r.peerCh:
-			p.respond(ErrLeader)
-
-		case newLog := <-r.applyCh:
-			// Group commit, gather all the ready commits
-			ready := []*logFuture{newLog}
-			for i := 0; i < r.conf.MaxAppendEntries; i++ {
-				select {
-				case newLog := <-r.applyCh:
-					ready = append(ready, newLog)
-				default:
-					break
-				}
-			}
-
-			// Handle any peer set changes
-			n := len(ready)
-			for i := 0; i < n; i++ {
-				// Special case AddPeer and RemovePeer
-				log := ready[i]
-				if log.log.Type != LogAddPeer && log.log.Type != LogRemovePeer {
-					continue
-				}
-
-				// Check if this log should be ignored
-				if !r.preparePeerChange(log) {
-					ready[i], ready[n-1] = ready[n-1], nil
-					n--
-					i--
-					continue
-				}
-
-				// Apply peer set changes early
-				r.processLog(&log.log, nil, true)
-			}
-
-			// Nothing to do if all logs are invalid
-			if n == 0 {
-				continue
-			}
-
-			// Dispatch the logs
-			ready = ready[:n]
-			r.dispatchLogs(ready)
-
-		case <-lease:
-			// Check if we've exceeded the lease, potentially stepping down
-			maxDiff := r.checkLeaderLease()
-
-			// Next check interval should adjust for the last node we've
-			// contacted, without going negative
-			checkInterval := r.conf.LeaderLeaseTimeout - maxDiff
-			if checkInterval < minCheckInterval {
-				checkInterval = minCheckInterval
-			}
-
-			// Renew the lease timer
-			lease = time.After(checkInterval)
-
-		case <-r.shutdownCh:
-			return
-		}
-	}
-}
-
-// verifyLeader must be called from the main thread for safety.
-// Causes the followers to attempt an immediate heartbeat.
-func (r *Raft) verifyLeader(v *verifyFuture) {
-	// Current leader always votes for self
-	v.votes = 1
-
-	// Set the quorum size, hot-path for single node
-	v.quorumSize = r.quorumSize()
-	if v.quorumSize == 1 {
-		v.respond(nil)
-		return
-	}
-
-	// Track this request
-	v.notifyCh = r.verifyCh
-	r.leaderState.notify[v] = struct{}{}
-
-	// Trigger immediate heartbeats
-	for _, repl := range r.leaderState.replState {
-		repl.notifyLock.Lock()
-		repl.notify = append(repl.notify, v)
-		repl.notifyLock.Unlock()
-		asyncNotifyCh(repl.notifyCh)
-	}
-}
-
-// checkLeaderLease is used to check if we can contact a quorum of nodes
-// within the last leader lease interval. If not, we need to step down,
-// as we may have lost connectivity. Returns the maximum duration without
-// contact.
-func (r *Raft) checkLeaderLease() time.Duration {
-	// Track contacted nodes, we can always contact ourself
-	contacted := 1
-
-	// Check each follower
-	var maxDiff time.Duration
-	now := time.Now()
-	for peer, f := range r.leaderState.replState {
-		diff := now.Sub(f.LastContact())
-		if diff <= r.conf.LeaderLeaseTimeout {
-			contacted++
-			if diff > maxDiff {
-				maxDiff = diff
-			}
-		} else {
-			// Log at least once at high value, then debug. Otherwise it gets very verbose.
-			if diff <= 3*r.conf.LeaderLeaseTimeout {
-				r.logger.Printf("[WARN] raft: Failed to contact %v in %v", peer, diff)
-			} else {
-				r.logger.Printf("[DEBUG] raft: Failed to contact %v in %v", peer, diff)
-			}
-		}
-		metrics.AddSample([]string{"raft", "leader", "lastContact"}, float32(diff/time.Millisecond))
-	}
-
-	// Verify we can contact a quorum
-	quorum := r.quorumSize()
-	if contacted < quorum {
-		r.logger.Printf("[WARN] raft: Failed to contact quorum of nodes, stepping down")
-		r.setState(Follower)
-	}
-	return maxDiff
-}
-
-// quorumSize is used to return the quorum size
-func (r *Raft) quorumSize() int {
-	return ((len(r.peers) + 1) / 2) + 1
-}
-
-// preparePeerChange checks if a LogAddPeer or LogRemovePeer should be performed,
-// and properly formats the data field on the log before dispatching it.
-func (r *Raft) preparePeerChange(l *logFuture) bool {
-	// Check if this is a known peer
-	p := l.log.peer
-	knownPeer := PeerContained(r.peers, p) || r.localAddr == p
-
-	// Ignore known peers on add
-	if l.log.Type == LogAddPeer && knownPeer {
-		l.respond(ErrKnownPeer)
-		return false
-	}
-
-	// Ignore unknown peers on remove
-	if l.log.Type == LogRemovePeer && !knownPeer {
-		l.respond(ErrUnknownPeer)
-		return false
-	}
-
-	// Construct the peer set
-	var peerSet []string
-	if l.log.Type == LogAddPeer {
-		peerSet = append([]string{p, r.localAddr}, r.peers...)
-	} else {
-		peerSet = ExcludePeer(append([]string{r.localAddr}, r.peers...), p)
-	}
-
-	// Setup the log
-	l.log.Data = encodePeers(peerSet, r.trans)
-	return true
-}
-
-// dispatchLog is called to push a log to disk, mark it
-// as inflight and begin replication of it.
-func (r *Raft) dispatchLogs(applyLogs []*logFuture) {
-	now := time.Now()
-	defer metrics.MeasureSince([]string{"raft", "leader", "dispatchLog"}, now)
-
-	term := r.getCurrentTerm()
-	lastIndex := r.getLastIndex()
-	logs := make([]*Log, len(applyLogs))
-
-	for idx, applyLog := range applyLogs {
-		applyLog.dispatch = now
-		applyLog.log.Index = lastIndex + uint64(idx) + 1
-		applyLog.log.Term = term
-		applyLog.policy = newMajorityQuorum(len(r.peers) + 1)
-		logs[idx] = &applyLog.log
-	}
-
-	// Write the log entry locally
-	if err := r.logs.StoreLogs(logs); err != nil {
-		r.logger.Printf("[ERR] raft: Failed to commit logs: %v", err)
-		for _, applyLog := range applyLogs {
-			applyLog.respond(err)
-		}
-		r.setState(Follower)
-		return
-	}
-
-	// Add this to the inflight logs, commit
-	r.leaderState.inflight.StartAll(applyLogs)
-
-	// Update the last log since it's on disk now
-	r.setLastLogIndex(lastIndex + uint64(len(applyLogs)))
-	r.setLastLogTerm(term)
-
-	// Notify the replicators of the new log
-	for _, f := range r.leaderState.replState {
-		asyncNotifyCh(f.triggerCh)
-	}
-}
-
-// processLogs is used to process all the logs from the lastApplied
-// up to the given index.
-func (r *Raft) processLogs(index uint64, future *logFuture) {
-	// Reject logs we've applied already
-	lastApplied := r.getLastApplied()
-	if index <= lastApplied {
-		r.logger.Printf("[WARN] raft: Skipping application of old log: %d", index)
-		return
-	}
-
-	// Apply all the preceding logs
-	for idx := r.getLastApplied() + 1; idx <= index; idx++ {
-		// Get the log, either from the future or from our log store
-		if future != nil && future.log.Index == idx {
-			r.processLog(&future.log, future, false)
-
-		} else {
-			l := new(Log)
-			if err := r.logs.GetLog(idx, l); err != nil {
-				r.logger.Printf("[ERR] raft: Failed to get log at %d: %v", idx, err)
-				panic(err)
-			}
-			r.processLog(l, nil, false)
-		}
-
-		// Update the lastApplied index and term
-		r.setLastApplied(idx)
-	}
-}
-
-// processLog is invoked to process the application of a single committed log.
-func (r *Raft) processLog(l *Log, future *logFuture, precommit bool) {
-	switch l.Type {
-	case LogBarrier:
-		// Barrier is handled by the FSM
-		fallthrough
-
-	case LogCommand:
-		// Forward to the fsm handler
-		select {
-		case r.fsmCommitCh <- commitTuple{l, future}:
-		case <-r.shutdownCh:
-			if future != nil {
-				future.respond(ErrRaftShutdown)
-			}
-		}
-
-		// Return so that the future is only responded to
-		// by the FSM handler when the application is done
-		return
-
-	case LogAddPeer:
-		fallthrough
-	case LogRemovePeer:
-		peers := decodePeers(l.Data, r.trans)
-		r.logger.Printf("[DEBUG] raft: Node %v updated peer set (%v): %v", r.localAddr, l.Type, peers)
-
-		// If the peer set does not include us, remove all other peers
-		removeSelf := !PeerContained(peers, r.localAddr) && l.Type == LogRemovePeer
-		if removeSelf {
-			r.peers = nil
-			r.peerStore.SetPeers([]string{r.localAddr})
-		} else {
-			r.peers = ExcludePeer(peers, r.localAddr)
-			r.peerStore.SetPeers(peers)
-		}
-
-		// Handle replication if we are the leader
-		if r.getState() == Leader {
-			for _, p := range r.peers {
-				if _, ok := r.leaderState.replState[p]; !ok {
-					r.logger.Printf("[INFO] raft: Added peer %v, starting replication", p)
-					r.startReplication(p)
-				}
-			}
-		}
-
-		// Stop replication for old nodes
-		if r.getState() == Leader && !precommit {
-			var toDelete []string
-			for _, repl := range r.leaderState.replState {
-				if !PeerContained(r.peers, repl.peer) {
-					r.logger.Printf("[INFO] raft: Removed peer %v, stopping replication (Index: %d)", repl.peer, l.Index)
-
-					// Replicate up to this index and stop
-					repl.stopCh <- l.Index
-					close(repl.stopCh)
-					toDelete = append(toDelete, repl.peer)
-				}
-			}
-			for _, name := range toDelete {
-				delete(r.leaderState.replState, name)
-			}
-		}
-
-		// Handle removing ourself
-		if removeSelf && !precommit {
-			if r.conf.ShutdownOnRemove {
-				r.logger.Printf("[INFO] raft: Removed ourself, shutting down")
-				r.Shutdown()
-			} else {
-				r.logger.Printf("[INFO] raft: Removed ourself, transitioning to follower")
-				r.setState(Follower)
-			}
-		}
-
-	case LogNoop:
-		// Ignore the no-op
-	default:
-		r.logger.Printf("[ERR] raft: Got unrecognized log type: %#v", l)
-	}
-
-	// Invoke the future if given
-	if future != nil && !precommit {
-		future.respond(nil)
-	}
-}
-
-// processRPC is called to handle an incoming RPC request.
-func (r *Raft) processRPC(rpc RPC) {
-	switch cmd := rpc.Command.(type) {
-	case *AppendEntriesRequest:
-		r.appendEntries(rpc, cmd)
-	case *RequestVoteRequest:
-		r.requestVote(rpc, cmd)
-	case *InstallSnapshotRequest:
-		r.installSnapshot(rpc, cmd)
-	default:
-		r.logger.Printf("[ERR] raft: Got unexpected command: %#v", rpc.Command)
-		rpc.Respond(nil, fmt.Errorf("unexpected command"))
-	}
-}
-
-// processHeartbeat is a special handler used just for heartbeat requests
-// so that they can be fast-pathed if a transport supports it.
-func (r *Raft) processHeartbeat(rpc RPC) {
-	defer metrics.MeasureSince([]string{"raft", "rpc", "processHeartbeat"}, time.Now())
-
-	// Check if we are shutdown, just ignore the RPC
-	select {
-	case <-r.shutdownCh:
-		return
-	default:
-	}
-
-	// Ensure we are only handling a heartbeat
-	switch cmd := rpc.Command.(type) {
-	case *AppendEntriesRequest:
-		r.appendEntries(rpc, cmd)
-	default:
-		r.logger.Printf("[ERR] raft: Expected heartbeat, got command: %#v", rpc.Command)
-		rpc.Respond(nil, fmt.Errorf("unexpected command"))
-	}
-}
-
-// appendEntries is invoked when we get an append entries RPC call.
-func (r *Raft) appendEntries(rpc RPC, a *AppendEntriesRequest) {
-	defer metrics.MeasureSince([]string{"raft", "rpc", "appendEntries"}, time.Now())
-	// Setup a response
-	resp := &AppendEntriesResponse{
-		Term:    r.getCurrentTerm(),
-		LastLog: r.getLastIndex(),
-		Success: false,
-	}
-	var rpcErr error
-	defer func() {
-		rpc.Respond(resp, rpcErr)
-	}()
-
-	// Ignore an older term
-	if a.Term < r.getCurrentTerm() {
-		return
-	}
-
-	// Increase the term if we see a newer one, also transition to follower
-	// if we ever get an appendEntries call
-	if a.Term > r.getCurrentTerm() || r.getState() != Follower {
-		// Ensure transition to follower
-		r.setState(Follower)
-		r.setCurrentTerm(a.Term)
-		resp.Term = a.Term
-	}
-
-	// Save the current leader
-	r.setLeader(r.trans.DecodePeer(a.Leader))
-
-	// Verify the last log entry
-	if a.PrevLogEntry > 0 {
-		lastIdx, lastTerm := r.getLastEntry()
-
-		var prevLogTerm uint64
-		if a.PrevLogEntry == lastIdx {
-			prevLogTerm = lastTerm
-
-		} else {
-			var prevLog Log
-			if err := r.logs.GetLog(a.PrevLogEntry, &prevLog); err != nil {
-				r.logger.Printf("[WARN] raft: Failed to get previous log: %d %v (last: %d)",
-					a.PrevLogEntry, err, lastIdx)
-				return
-			}
-			prevLogTerm = prevLog.Term
-		}
-
-		if a.PrevLogTerm != prevLogTerm {
-			r.logger.Printf("[WARN] raft: Previous log term mis-match: ours: %d remote: %d",
-				prevLogTerm, a.PrevLogTerm)
-			return
-		}
-	}
-
-	// Process any new entries
-	if n := len(a.Entries); n > 0 {
-		start := time.Now()
-		first := a.Entries[0]
-		last := a.Entries[n-1]
-
-		// Delete any conflicting entries
-		lastLogIdx := r.getLastLogIndex()
-		if first.Index <= lastLogIdx {
-			r.logger.Printf("[WARN] raft: Clearing log suffix from %d to %d", first.Index, lastLogIdx)
-			if err := r.logs.DeleteRange(first.Index, lastLogIdx); err != nil {
-				r.logger.Printf("[ERR] raft: Failed to clear log suffix: %v", err)
-				return
-			}
-		}
-
-		// Append the entry
-		if err := r.logs.StoreLogs(a.Entries); err != nil {
-			r.logger.Printf("[ERR] raft: Failed to append to logs: %v", err)
-			return
-		}
-
-		// Update the lastLog
-		r.setLastLogIndex(last.Index)
-		r.setLastLogTerm(last.Term)
-		metrics.MeasureSince([]string{"raft", "rpc", "appendEntries", "storeLogs"}, start)
-	}
-
-	// Update the commit index
-	if a.LeaderCommitIndex > 0 && a.LeaderCommitIndex > r.getCommitIndex() {
-		start := time.Now()
-		idx := min(a.LeaderCommitIndex, r.getLastIndex())
-		r.setCommitIndex(idx)
-		r.processLogs(idx, nil)
-		metrics.MeasureSince([]string{"raft", "rpc", "appendEntries", "processLogs"}, start)
-	}
-
-	// Everything went well, set success
-	resp.Success = true
-	r.lastContactLock.Lock()
-	r.lastContact = time.Now()
-	r.lastContactLock.Unlock()
-	return
-}
-
-// requestVote is invoked when we get an request vote RPC call.
-func (r *Raft) requestVote(rpc RPC, req *RequestVoteRequest) {
-	defer metrics.MeasureSince([]string{"raft", "rpc", "requestVote"}, time.Now())
-	// Setup a response
-	resp := &RequestVoteResponse{
-		Term:    r.getCurrentTerm(),
-		Peers:   encodePeers(r.peers, r.trans),
-		Granted: false,
-	}
-	var rpcErr error
-	defer func() {
-		rpc.Respond(resp, rpcErr)
-	}()
-
-	// Check if we have an existing leader
-	if leader := r.Leader(); leader != "" {
-		r.logger.Printf("[WARN] raft: Rejecting vote from %v since we have a leader: %v",
-			r.trans.DecodePeer(req.Candidate), leader)
-		return
-	}
-
-	// Ignore an older term
-	if req.Term < r.getCurrentTerm() {
-		return
-	}
-
-	// Increase the term if we see a newer one
-	if req.Term > r.getCurrentTerm() {
-		// Ensure transition to follower
-		r.setState(Follower)
-		r.setCurrentTerm(req.Term)
-		resp.Term = req.Term
-	}
-
-	// Check if we have voted yet
-	lastVoteTerm, err := r.stable.GetUint64(keyLastVoteTerm)
-	if err != nil && err.Error() != "not found" {
-		r.logger.Printf("[ERR] raft: Failed to get last vote term: %v", err)
-		return
-	}
-	lastVoteCandBytes, err := r.stable.Get(keyLastVoteCand)
-	if err != nil && err.Error() != "not found" {
-		r.logger.Printf("[ERR] raft: Failed to get last vote candidate: %v", err)
-		return
-	}
-
-	// Check if we've voted in this election before
-	if lastVoteTerm == req.Term && lastVoteCandBytes != nil {
-		r.logger.Printf("[INFO] raft: Duplicate RequestVote for same term: %d", req.Term)
-		if bytes.Compare(lastVoteCandBytes, req.Candidate) == 0 {
-			r.logger.Printf("[WARN] raft: Duplicate RequestVote from candidate: %s", req.Candidate)
-			resp.Granted = true
-		}
-		return
-	}
-
-	// Reject if their term is older
-	lastIdx, lastTerm := r.getLastEntry()
-	if lastTerm > req.LastLogTerm {
-		r.logger.Printf("[WARN] raft: Rejecting vote from %v since our last term is greater (%d, %d)",
-			r.trans.DecodePeer(req.Candidate), lastTerm, req.LastLogTerm)
-		return
-	}
-
-	if lastIdx > req.LastLogIndex {
-		r.logger.Printf("[WARN] raft: Rejecting vote from %v since our last index is greater (%d, %d)",
-			r.trans.DecodePeer(req.Candidate), lastIdx, req.LastLogIndex)
-		return
-	}
-
-	// Persist a vote for safety
-	if err := r.persistVote(req.Term, req.Candidate); err != nil {
-		r.logger.Printf("[ERR] raft: Failed to persist vote: %v", err)
-		return
-	}
-
-	resp.Granted = true
-	return
-}
-
-// installSnapshot is invoked when we get a InstallSnapshot RPC call.
-// We must be in the follower state for this, since it means we are
-// too far behind a leader for log replay.
-func (r *Raft) installSnapshot(rpc RPC, req *InstallSnapshotRequest) {
-	defer metrics.MeasureSince([]string{"raft", "rpc", "installSnapshot"}, time.Now())
-	// Setup a response
-	resp := &InstallSnapshotResponse{
-		Term:    r.getCurrentTerm(),
-		Success: false,
-	}
-	var rpcErr error
-	defer func() {
-		rpc.Respond(resp, rpcErr)
-	}()
-
-	// Ignore an older term
-	if req.Term < r.getCurrentTerm() {
-		return
-	}
-
-	// Increase the term if we see a newer one
-	if req.Term > r.getCurrentTerm() {
-		// Ensure transition to follower
-		r.setState(Follower)
-		r.setCurrentTerm(req.Term)
-		resp.Term = req.Term
-	}
-
-	// Save the current leader
-	r.setLeader(r.trans.DecodePeer(req.Leader))
-
-	// Create a new snapshot
-	sink, err := r.snapshots.Create(req.LastLogIndex, req.LastLogTerm, req.Peers)
-	if err != nil {
-		r.logger.Printf("[ERR] raft: Failed to create snapshot to install: %v", err)
-		rpcErr = fmt.Errorf("failed to create snapshot: %v", err)
-		return
-	}
-
-	// Spill the remote snapshot to disk
-	n, err := io.Copy(sink, rpc.Reader)
-	if err != nil {
-		sink.Cancel()
-		r.logger.Printf("[ERR] raft: Failed to copy snapshot: %v", err)
-		rpcErr = err
-		return
-	}
-
-	// Check that we received it all
-	if n != req.Size {
-		sink.Cancel()
-		r.logger.Printf("[ERR] raft: Failed to receive whole snapshot: %d / %d", n, req.Size)
-		rpcErr = fmt.Errorf("short read")
-		return
-	}
-
-	// Finalize the snapshot
-	if err := sink.Close(); err != nil {
-		r.logger.Printf("[ERR] raft: Failed to finalize snapshot: %v", err)
-		rpcErr = err
-		return
-	}
-	r.logger.Printf("[INFO] raft: Copied %d bytes to local snapshot", n)
-
-	// Restore snapshot
-	future := &restoreFuture{ID: sink.ID()}
-	future.init()
-	select {
-	case r.fsmRestoreCh <- future:
-	case <-r.shutdownCh:
-		future.respond(ErrRaftShutdown)
-		return
-	}
-
-	// Wait for the restore to happen
-	if err := future.Error(); err != nil {
-		r.logger.Printf("[ERR] raft: Failed to restore snapshot: %v", err)
-		rpcErr = err
-		return
-	}
-
-	// Update the lastApplied so we don't replay old logs
-	r.setLastApplied(req.LastLogIndex)
-
-	// Update the last stable snapshot info
-	r.setLastSnapshotIndex(req.LastLogIndex)
-	r.setLastSnapshotTerm(req.LastLogTerm)
-
-	// Restore the peer set
-	peers := decodePeers(req.Peers, r.trans)
-	r.peers = ExcludePeer(peers, r.localAddr)
-	r.peerStore.SetPeers(peers)
-
-	// Compact logs, continue even if this fails
-	if err := r.compactLogs(req.LastLogIndex); err != nil {
-		r.logger.Printf("[ERR] raft: Failed to compact logs: %v", err)
-	}
-
-	r.logger.Printf("[INFO] raft: Installed remote snapshot")
-	resp.Success = true
-	r.lastContactLock.Lock()
-	r.lastContact = time.Now()
-	r.lastContactLock.Unlock()
-	return
-}
-
-// electSelf is used to send a RequestVote RPC to all peers,
-// and vote for ourself. This has the side affecting of incrementing
-// the current term. The response channel returned is used to wait
-// for all the responses (including a vote for ourself).
-func (r *Raft) electSelf() <-chan *RequestVoteResponse {
-	// Create a response channel
-	respCh := make(chan *RequestVoteResponse, len(r.peers)+1)
-
-	// Increment the term
-	r.setCurrentTerm(r.getCurrentTerm() + 1)
-
-	// Construct the request
-	lastIdx, lastTerm := r.getLastEntry()
-	req := &RequestVoteRequest{
-		Term:         r.getCurrentTerm(),
-		Candidate:    r.trans.EncodePeer(r.localAddr),
-		LastLogIndex: lastIdx,
-		LastLogTerm:  lastTerm,
-	}
-
-	// Construct a function to ask for a vote
-	askPeer := func(peer string) {
-		r.goFunc(func() {
-			defer metrics.MeasureSince([]string{"raft", "candidate", "electSelf"}, time.Now())
-			resp := new(RequestVoteResponse)
-			err := r.trans.RequestVote(peer, req, resp)
-			if err != nil {
-				r.logger.Printf("[ERR] raft: Failed to make RequestVote RPC to %v: %v", peer, err)
-				resp.Term = req.Term
-				resp.Granted = false
-			}
-
-			// If we are not a peer, we could have been removed but failed
-			// to receive the log message. OR it could mean an improperly configured
-			// cluster. Either way, we should warn
-			if err == nil {
-				peerSet := decodePeers(resp.Peers, r.trans)
-				if !PeerContained(peerSet, r.localAddr) {
-					r.logger.Printf("[WARN] raft: Remote peer %v does not have local node %v as a peer",
-						peer, r.localAddr)
-				}
-			}
-
-			respCh <- resp
-		})
-	}
-
-	// For each peer, request a vote
-	for _, peer := range r.peers {
-		askPeer(peer)
-	}
-
-	// Persist a vote for ourselves
-	if err := r.persistVote(req.Term, req.Candidate); err != nil {
-		r.logger.Printf("[ERR] raft: Failed to persist vote : %v", err)
-		return nil
-	}
-
-	// Include our own vote
-	respCh <- &RequestVoteResponse{
-		Term:    req.Term,
-		Granted: true,
-	}
-	return respCh
-}
-
-// persistVote is used to persist our vote for safety.
-func (r *Raft) persistVote(term uint64, candidate []byte) error {
-	if err := r.stable.SetUint64(keyLastVoteTerm, term); err != nil {
-		return err
-	}
-	if err := r.stable.Set(keyLastVoteCand, candidate); err != nil {
-		return err
-	}
-	return nil
-}
-
-// setCurrentTerm is used to set the current term in a durable manner.
-func (r *Raft) setCurrentTerm(t uint64) {
-	// Persist to disk first
-	if err := r.stable.SetUint64(keyCurrentTerm, t); err != nil {
-		panic(fmt.Errorf("failed to save current term: %v", err))
-	}
-	r.raftState.setCurrentTerm(t)
-}
-
-// setState is used to update the current state. Any state
-// transition causes the known leader to be cleared. This means
-// that leader should be set only after updating the state.
-func (r *Raft) setState(state RaftState) {
-	r.setLeader("")
-	r.raftState.setState(state)
-}
-
-// runSnapshots is a long running goroutine used to manage taking
-// new snapshots of the FSM. It runs in parallel to the FSM and
-// main goroutines, so that snapshots do not block normal operation.
-func (r *Raft) runSnapshots() {
-	for {
-		select {
-		case <-randomTimeout(r.conf.SnapshotInterval):
-			// Check if we should snapshot
-			if !r.shouldSnapshot() {
-				continue
-			}
-
-			// Trigger a snapshot
-			if err := r.takeSnapshot(); err != nil {
-				r.logger.Printf("[ERR] raft: Failed to take snapshot: %v", err)
-			}
-
-		case future := <-r.snapshotCh:
-			// User-triggered, run immediately
-			err := r.takeSnapshot()
-			if err != nil {
-				r.logger.Printf("[ERR] raft: Failed to take snapshot: %v", err)
-			}
-			future.respond(err)
-
-		case <-r.shutdownCh:
-			return
-		}
-	}
-}
-
-// shouldSnapshot checks if we meet the conditions to take
-// a new snapshot.
-func (r *Raft) shouldSnapshot() bool {
-	// Check the last snapshot index
-	lastSnap := r.getLastSnapshotIndex()
-
-	// Check the last log index
-	lastIdx, err := r.logs.LastIndex()
-	if err != nil {
-		r.logger.Printf("[ERR] raft: Failed to get last log index: %v", err)
-		return false
-	}
-
-	// Compare the delta to the threshold
-	delta := lastIdx - lastSnap
-	return delta >= r.conf.SnapshotThreshold
-}
-
-// takeSnapshot is used to take a new snapshot.
-func (r *Raft) takeSnapshot() error {
-	defer metrics.MeasureSince([]string{"raft", "snapshot", "takeSnapshot"}, time.Now())
-	// Create a snapshot request
-	req := &reqSnapshotFuture{}
-	req.init()
-
-	// Wait for dispatch or shutdown
-	select {
-	case r.fsmSnapshotCh <- req:
-	case <-r.shutdownCh:
-		return ErrRaftShutdown
-	}
-
-	// Wait until we get a response
-	if err := req.Error(); err != nil {
-		return fmt.Errorf("failed to start snapshot: %v", err)
-	}
-	defer req.snapshot.Release()
-
-	// Log that we are starting the snapshot
-	r.logger.Printf("[INFO] raft: Starting snapshot up to %d", req.index)
-
-	// Encode the peerset
-	peerSet := encodePeers(req.peers, r.trans)
-
-	// Create a new snapshot
-	start := time.Now()
-	sink, err := r.snapshots.Create(req.index, req.term, peerSet)
-	if err != nil {
-		return fmt.Errorf("failed to create snapshot: %v", err)
-	}
-	metrics.MeasureSince([]string{"raft", "snapshot", "create"}, start)
-
-	// Try to persist the snapshot
-	start = time.Now()
-	if err := req.snapshot.Persist(sink); err != nil {
-		sink.Cancel()
-		return fmt.Errorf("failed to persist snapshot: %v", err)
-	}
-	metrics.MeasureSince([]string{"raft", "snapshot", "persist"}, start)
-
-	// Close and check for error
-	if err := sink.Close(); err != nil {
-		return fmt.Errorf("failed to close snapshot: %v", err)
-	}
-
-	// Update the last stable snapshot info
-	r.setLastSnapshotIndex(req.index)
-	r.setLastSnapshotTerm(req.term)
-
-	// Compact the logs
-	if err := r.compactLogs(req.index); err != nil {
-		return err
-	}
-
-	// Log completion
-	r.logger.Printf("[INFO] raft: Snapshot to %d complete", req.index)
-	return nil
-}
-
-// compactLogs takes the last inclusive index of a snapshot
-// and trims the logs that are no longer needed.
-func (r *Raft) compactLogs(snapIdx uint64) error {
-	defer metrics.MeasureSince([]string{"raft", "compactLogs"}, time.Now())
-	// Determine log ranges to compact
-	minLog, err := r.logs.FirstIndex()
-	if err != nil {
-		return fmt.Errorf("failed to get first log index: %v", err)
-	}
-
-	// Check if we have enough logs to truncate
-	if r.getLastLogIndex() <= r.conf.TrailingLogs {
-		return nil
-	}
-
-	// Truncate up to the end of the snapshot, or `TrailingLogs`
-	// back from the head, which ever is further back. This ensures
-	// at least `TrailingLogs` entries, but does not allow logs
-	// after the snapshot to be removed.
-	maxLog := min(snapIdx, r.getLastLogIndex()-r.conf.TrailingLogs)
-
-	// Log this
-	r.logger.Printf("[INFO] raft: Compacting logs from %d to %d", minLog, maxLog)
-
-	// Compact the logs
-	if err := r.logs.DeleteRange(minLog, maxLog); err != nil {
-		return fmt.Errorf("log compaction failed: %v", err)
-	}
-	return nil
-}
-
-// restoreSnapshot attempts to restore the latest snapshots, and fails
-// if none of them can be restored. This is called at initialization time,
-// and is completely unsafe to call at any other time.
-func (r *Raft) restoreSnapshot() error {
-	snapshots, err := r.snapshots.List()
-	if err != nil {
-		r.logger.Printf("[ERR] raft: Failed to list snapshots: %v", err)
-		return err
-	}
-
-	// Try to load in order of newest to oldest
-	for _, snapshot := range snapshots {
-		_, source, err := r.snapshots.Open(snapshot.ID)
-		if err != nil {
-			r.logger.Printf("[ERR] raft: Failed to open snapshot %v: %v", snapshot.ID, err)
-			continue
-		}
-		defer source.Close()
-
-		if err := r.fsm.Restore(source); err != nil {
-			r.logger.Printf("[ERR] raft: Failed to restore snapshot %v: %v", snapshot.ID, err)
-			continue
-		}
-
-		// Log success
-		r.logger.Printf("[INFO] raft: Restored from snapshot %v", snapshot.ID)
-
-		// Update the lastApplied so we don't replay old logs
-		r.setLastApplied(snapshot.Index)
-
-		// Update the last stable snapshot info
-		r.setLastSnapshotIndex(snapshot.Index)
-		r.setLastSnapshotTerm(snapshot.Term)
-
-		// Success!
-		return nil
-	}
-
-	// If we had snapshots and failed to load them, its an error
-	if len(snapshots) > 0 {
-		return fmt.Errorf("failed to load any existing snapshots")
-	}
-	return nil
-}
diff --git a/Godeps/_workspace/src/github.com/hashicorp/raft/raft_test.go b/Godeps/_workspace/src/github.com/hashicorp/raft/raft_test.go
deleted file mode 100644
index 284a5dd0e..000000000
--- a/Godeps/_workspace/src/github.com/hashicorp/raft/raft_test.go
+++ /dev/null
@@ -1,1454 +0,0 @@
-package raft
-
-import (
-	"bytes"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"log"
-	"os"
-	"reflect"
-	"sync"
-	"sync/atomic"
-	"testing"
-	"time"
-
-	"github.com/hashicorp/go-msgpack/codec"
-)
-
-// MockFSM is an implementation of the FSM interface, and just stores
-// the logs sequentially.
-type MockFSM struct {
-	sync.Mutex
-	logs [][]byte
-}
-
-type MockSnapshot struct {
-	logs     [][]byte
-	maxIndex int
-}
-
-func (m *MockFSM) Apply(log *Log) interface{} {
-	m.Lock()
-	defer m.Unlock()
-	m.logs = append(m.logs, log.Data)
-	return len(m.logs)
-}
-
-func (m *MockFSM) Snapshot() (FSMSnapshot, error) {
-	m.Lock()
-	defer m.Unlock()
-	return &MockSnapshot{m.logs, len(m.logs)}, nil
-}
-
-func (m *MockFSM) Restore(inp io.ReadCloser) error {
-	m.Lock()
-	defer m.Unlock()
-	defer inp.Close()
-	hd := codec.MsgpackHandle{}
-	dec := codec.NewDecoder(inp, &hd)
-
-	m.logs = nil
-	return dec.Decode(&m.logs)
-}
-
-func (m *MockSnapshot) Persist(sink SnapshotSink) error {
-	hd := codec.MsgpackHandle{}
-	enc := codec.NewEncoder(sink, &hd)
-	if err := enc.Encode(m.logs[:m.maxIndex]); err != nil {
-		sink.Cancel()
-		return err
-	}
-	sink.Close()
-	return nil
-}
-
-func (m *MockSnapshot) Release() {
-}
-
-// Return configurations optimized for in-memory
-func inmemConfig() *Config {
-	conf := DefaultConfig()
-	conf.HeartbeatTimeout = 50 * time.Millisecond
-	conf.ElectionTimeout = 50 * time.Millisecond
-	conf.LeaderLeaseTimeout = 50 * time.Millisecond
-	conf.CommitTimeout = time.Millisecond
-	return conf
-}
-
-type cluster struct {
-	dirs   []string
-	stores []*InmemStore
-	fsms   []*MockFSM
-	snaps  []*FileSnapshotStore
-	trans  []*InmemTransport
-	rafts  []*Raft
-}
-
-func (c *cluster) Merge(other *cluster) {
-	c.dirs = append(c.dirs, other.dirs...)
-	c.stores = append(c.stores, other.stores...)
-	c.fsms = append(c.fsms, other.fsms...)
-	c.snaps = append(c.snaps, other.snaps...)
-	c.trans = append(c.trans, other.trans...)
-	c.rafts = append(c.rafts, other.rafts...)
-}
-
-func (c *cluster) Close() {
-	var futures []Future
-	for _, r := range c.rafts {
-		futures = append(futures, r.Shutdown())
-	}
-
-	// Wait for shutdown
-	timer := time.AfterFunc(200*time.Millisecond, func() {
-		panic("timed out waiting for shutdown")
-	})
-
-	for _, f := range futures {
-		if err := f.Error(); err != nil {
-			panic(fmt.Errorf("shutdown future err: %v", err))
-		}
-	}
-	timer.Stop()
-
-	for _, d := range c.dirs {
-		os.RemoveAll(d)
-	}
-}
-
-func (c *cluster) GetInState(s RaftState) []*Raft {
-	in := make([]*Raft, 0, 1)
-	for _, r := range c.rafts {
-		if r.State() == s {
-			in = append(in, r)
-		}
-	}
-	return in
-}
-
-func (c *cluster) Leader() *Raft {
-	timeout := time.AfterFunc(400*time.Millisecond, func() {
-		panic("timeout waiting for leader")
-	})
-	defer timeout.Stop()
-
-	for len(c.GetInState(Leader)) < 1 {
-		time.Sleep(time.Millisecond)
-	}
-	leaders := c.GetInState(Leader)
-	if len(leaders) != 1 {
-		panic(fmt.Errorf("expected one leader: %v", leaders))
-	}
-	return leaders[0]
-}
-
-func (c *cluster) FullyConnect() {
-	log.Printf("[WARN] Fully Connecting")
-	for i, t1 := range c.trans {
-		for j, t2 := range c.trans {
-			if i != j {
-				t1.Connect(t2.LocalAddr(), t2)
-				t2.Connect(t1.LocalAddr(), t1)
-			}
-		}
-	}
-}
-
-func (c *cluster) Disconnect(a string) {
-	log.Printf("[WARN] Disconnecting %v", a)
-	for _, t := range c.trans {
-		if t.localAddr == a {
-			t.DisconnectAll()
-		} else {
-			t.Disconnect(a)
-		}
-	}
-}
-
-func (c *cluster) EnsureLeader(t *testing.T, expect string) {
-	limit := time.Now().Add(400 * time.Millisecond)
-CHECK:
-	for _, r := range c.rafts {
-		leader := r.Leader()
-		if expect == "" {
-			if leader != "" {
-				if time.Now().After(limit) {
-					t.Fatalf("leader %v expected nil", leader)
-				} else {
-					goto WAIT
-				}
-			}
-		} else {
-			if leader == "" || leader != expect {
-				if time.Now().After(limit) {
-					t.Fatalf("leader %v expected %v", leader, expect)
-				} else {
-					goto WAIT
-				}
-			}
-		}
-	}
-
-	return
-WAIT:
-	time.Sleep(10 * time.Millisecond)
-	goto CHECK
-}
-
-func (c *cluster) EnsureSame(t *testing.T) {
-	limit := time.Now().Add(400 * time.Millisecond)
-	first := c.fsms[0]
-
-CHECK:
-	first.Lock()
-	for i, fsm := range c.fsms {
-		if i == 0 {
-			continue
-		}
-		fsm.Lock()
-
-		if len(first.logs) != len(fsm.logs) {
-			fsm.Unlock()
-			if time.Now().After(limit) {
-				t.Fatalf("length mismatch: %d %d",
-					len(first.logs), len(fsm.logs))
-			} else {
-				goto WAIT
-			}
-		}
-
-		for idx := 0; idx < len(first.logs); idx++ {
-			if bytes.Compare(first.logs[idx], fsm.logs[idx]) != 0 {
-				fsm.Unlock()
-				if time.Now().After(limit) {
-					t.Fatalf("log mismatch at index %d", idx)
-				} else {
-					goto WAIT
-				}
-			}
-		}
-		fsm.Unlock()
-	}
-
-	first.Unlock()
-	return
-
-WAIT:
-	first.Unlock()
-	time.Sleep(20 * time.Millisecond)
-	goto CHECK
-}
-
-func raftToPeerSet(r *Raft) map[string]struct{} {
-	peers := make(map[string]struct{})
-	peers[r.localAddr] = struct{}{}
-
-	raftPeers, _ := r.peerStore.Peers()
-	for _, p := range raftPeers {
-		peers[p] = struct{}{}
-	}
-	return peers
-}
-
-func (c *cluster) EnsureSamePeers(t *testing.T) {
-	limit := time.Now().Add(400 * time.Millisecond)
-	peerSet := raftToPeerSet(c.rafts[0])
-
-CHECK:
-	for i, raft := range c.rafts {
-		if i == 0 {
-			continue
-		}
-
-		otherSet := raftToPeerSet(raft)
-		if !reflect.DeepEqual(peerSet, otherSet) {
-			if time.Now().After(limit) {
-				t.Fatalf("peer mismatch: %v %v", peerSet, otherSet)
-			} else {
-				goto WAIT
-			}
-		}
-	}
-	return
-
-WAIT:
-	time.Sleep(20 * time.Millisecond)
-	goto CHECK
-}
-
-func MakeCluster(n int, t *testing.T, conf *Config) *cluster {
-	c := &cluster{}
-	peers := make([]string, 0, n)
-
-	// Setup the stores and transports
-	for i := 0; i < n; i++ {
-		dir, err := ioutil.TempDir("", "raft")
-		if err != nil {
-			t.Fatalf("err: %v ", err)
-		}
-		store := NewInmemStore()
-		c.dirs = append(c.dirs, dir)
-		c.stores = append(c.stores, store)
-		c.fsms = append(c.fsms, &MockFSM{})
-
-		dir2, snap := FileSnapTest(t)
-		c.dirs = append(c.dirs, dir2)
-		c.snaps = append(c.snaps, snap)
-
-		addr, trans := NewInmemTransport()
-		c.trans = append(c.trans, trans)
-		peers = append(peers, addr)
-	}
-
-	// Wire the transports together
-	c.FullyConnect()
-
-	// Create all the rafts
-	for i := 0; i < n; i++ {
-		if conf == nil {
-			conf = inmemConfig()
-		}
-		if n == 1 {
-			conf.EnableSingleNode = true
-		}
-
-		logs := c.stores[i]
-		store := c.stores[i]
-		snap := c.snaps[i]
-		trans := c.trans[i]
-		peerStore := &StaticPeers{StaticPeers: peers}
-
-		raft, err := NewRaft(conf, c.fsms[i], logs, store, snap, peerStore, trans)
-		if err != nil {
-			t.Fatalf("err: %v", err)
-		}
-		c.rafts = append(c.rafts, raft)
-	}
-
-	return c
-}
-
-func MakeClusterNoPeers(n int, t *testing.T, conf *Config) *cluster {
-	c := &cluster{}
-
-	// Setup the stores and transports
-	for i := 0; i < n; i++ {
-		dir, err := ioutil.TempDir("", "raft")
-		if err != nil {
-			t.Fatalf("err: %v ", err)
-		}
-		store := NewInmemStore()
-		c.dirs = append(c.dirs, dir)
-		c.stores = append(c.stores, store)
-		c.fsms = append(c.fsms, &MockFSM{})
-
-		dir2, snap := FileSnapTest(t)
-		c.dirs = append(c.dirs, dir2)
-		c.snaps = append(c.snaps, snap)
-
-		_, trans := NewInmemTransport()
-		c.trans = append(c.trans, trans)
-	}
-
-	// Wire the transports together
-	c.FullyConnect()
-
-	// Create all the rafts
-	for i := 0; i < n; i++ {
-		if conf == nil {
-			conf = inmemConfig()
-		}
-
-		logs := c.stores[i]
-		store := c.stores[i]
-		snap := c.snaps[i]
-		trans := c.trans[i]
-		peerStore := &StaticPeers{}
-
-		raft, err := NewRaft(conf, c.fsms[i], logs, store, snap, peerStore, trans)
-		if err != nil {
-			t.Fatalf("err: %v", err)
-		}
-		c.rafts = append(c.rafts, raft)
-	}
-
-	return c
-}
-
-func TestRaft_StartStop(t *testing.T) {
-	c := MakeCluster(1, t, nil)
-	c.Close()
-}
-
-func TestRaft_AfterShutdown(t *testing.T) {
-	c := MakeCluster(1, t, nil)
-	c.Close()
-	raft := c.rafts[0]
-
-	// Everything should fail now
-	if f := raft.Apply(nil, 0); f.Error() != ErrRaftShutdown {
-		t.Fatalf("should be shutdown: %v", f.Error())
-	}
-	if f := raft.AddPeer(NewInmemAddr()); f.Error() != ErrRaftShutdown {
-		t.Fatalf("should be shutdown: %v", f.Error())
-	}
-	if f := raft.RemovePeer(NewInmemAddr()); f.Error() != ErrRaftShutdown {
-		t.Fatalf("should be shutdown: %v", f.Error())
-	}
-	if f := raft.Snapshot(); f.Error() != ErrRaftShutdown {
-		t.Fatalf("should be shutdown: %v", f.Error())
-	}
-
-	// Should be idempotent
-	raft.Shutdown()
-}
-
-func TestRaft_SingleNode(t *testing.T) {
-	conf := inmemConfig()
-	c := MakeCluster(1, t, conf)
-	defer c.Close()
-	raft := c.rafts[0]
-
-	// Watch leaderCh for change
-	select {
-	case v := <-raft.LeaderCh():
-		if !v {
-			t.Fatalf("should become leader")
-		}
-	case <-time.After(conf.HeartbeatTimeout * 3):
-		t.Fatalf("timeout becoming leader")
-	}
-
-	// Should be leader
-	if s := raft.State(); s != Leader {
-		t.Fatalf("expected leader: %v", s)
-	}
-
-	// Should be able to apply
-	future := raft.Apply([]byte("test"), time.Millisecond)
-	if err := future.Error(); err != nil {
-		t.Fatalf("err: %v", err)
-	}
-
-	// Check the response
-	if future.Response().(int) != 1 {
-		t.Fatalf("bad response: %v", future.Response())
-	}
-
-	// Check the index
-	if idx := future.Index(); idx == 0 {
-		t.Fatalf("bad index: %d", idx)
-	}
-
-	// Check that it is applied to the FSM
-	if len(c.fsms[0].logs) != 1 {
-		t.Fatalf("did not apply to FSM!")
-	}
-}
-
-func TestRaft_TripleNode(t *testing.T) {
-	// Make the cluster
-	c := MakeCluster(3, t, nil)
-	defer c.Close()
-
-	// Should be one leader
-	leader := c.Leader()
-	c.EnsureLeader(t, leader.localAddr)
-
-	// Should be able to apply
-	future := leader.Apply([]byte("test"), time.Millisecond)
-	if err := future.Error(); err != nil {
-		t.Fatalf("err: %v", err)
-	}
-
-	// Wait for replication
-	time.Sleep(30 * time.Millisecond)
-
-	// Check that it is applied to the FSM
-	for _, fsm := range c.fsms {
-		fsm.Lock()
-		num := len(fsm.logs)
-		fsm.Unlock()
-		if num != 1 {
-			t.Fatalf("did not apply to FSM!")
-		}
-	}
-}
-
-func TestRaft_LeaderFail(t *testing.T) {
-	// Make the cluster
-	c := MakeCluster(3, t, nil)
-	defer c.Close()
-
-	// Should be one leader
-	leader := c.Leader()
-
-	// Should be able to apply
-	future := leader.Apply([]byte("test"), time.Millisecond)
-	if err := future.Error(); err != nil {
-		t.Fatalf("err: %v", err)
-	}
-
-	// Wait for replication
-	time.Sleep(30 * time.Millisecond)
-
-	// Disconnect the leader now
-	log.Printf("[INFO] Disconnecting %v", leader)
-	c.Disconnect(leader.localAddr)
-
-	// Wait for new leader
-	limit := time.Now().Add(200 * time.Millisecond)
-	var newLead *Raft
-	for time.Now().Before(limit) && newLead == nil {
-		time.Sleep(10 * time.Millisecond)
-		leaders := c.GetInState(Leader)
-		if len(leaders) == 1 && leaders[0] != leader {
-			newLead = leaders[0]
-		}
-	}
-	if newLead == nil {
-		t.Fatalf("expected new leader")
-	}
-
-	// Ensure the term is greater
-	if newLead.getCurrentTerm() <= leader.getCurrentTerm() {
-		t.Fatalf("expected newer term! %d %d", newLead.getCurrentTerm(), leader.getCurrentTerm())
-	}
-
-	// Apply should work not work on old leader
-	future1 := leader.Apply([]byte("fail"), time.Millisecond)
-
-	// Apply should work on newer leader
-	future2 := newLead.Apply([]byte("apply"), time.Millisecond)
-
-	// Future2 should work
-	if err := future2.Error(); err != nil {
-		t.Fatalf("err: %v", err)
-	}
-
-	// Reconnect the networks
-	log.Printf("[INFO] Reconnecting %v", leader)
-	c.FullyConnect()
-
-	// Future1 should fail
-	if err := future1.Error(); err != ErrLeadershipLost && err != ErrNotLeader {
-		t.Fatalf("err: %v", err)
-	}
-
-	// Wait for log replication
-	c.EnsureSame(t)
-
-	// Check two entries are applied to the FSM
-	for _, fsm := range c.fsms {
-		fsm.Lock()
-		if len(fsm.logs) != 2 {
-			t.Fatalf("did not apply both to FSM! %v", fsm.logs)
-		}
-		if bytes.Compare(fsm.logs[0], []byte("test")) != 0 {
-			t.Fatalf("first entry should be 'test'")
-		}
-		if bytes.Compare(fsm.logs[1], []byte("apply")) != 0 {
-			t.Fatalf("second entry should be 'apply'")
-		}
-		fsm.Unlock()
-	}
-}
-
-func TestRaft_BehindFollower(t *testing.T) {
-	// Make the cluster
-	c := MakeCluster(3, t, nil)
-	defer c.Close()
-
-	// Disconnect one follower
-	leader := c.Leader()
-	followers := c.GetInState(Follower)
-	behind := followers[0]
-	c.Disconnect(behind.localAddr)
-
-	// Commit a lot of things
-	var future Future
-	for i := 0; i < 100; i++ {
-		future = leader.Apply([]byte(fmt.Sprintf("test%d", i)), 0)
-	}
-
-	// Wait for the last future to apply
-	if err := future.Error(); err != nil {
-		t.Fatalf("err: %v", err)
-	} else {
-		log.Printf("[INFO] Finished apply without behind follower")
-	}
-
-	// Check that we have a non zero last contact
-	if behind.LastContact().IsZero() {
-		t.Fatalf("expected previous contact")
-	}
-
-	// Reconnect the behind node
-	c.FullyConnect()
-
-	// Ensure all the logs are the same
-	c.EnsureSame(t)
-
-	// Ensure one leader
-	leader = c.Leader()
-	c.EnsureLeader(t, leader.localAddr)
-}
-
-func TestRaft_ApplyNonLeader(t *testing.T) {
-	// Make the cluster
-	c := MakeCluster(3, t, nil)
-	defer c.Close()
-
-	// Wait for a leader
-	c.Leader()
-	time.Sleep(10 * time.Millisecond)
-
-	// Try to apply to them
-	followers := c.GetInState(Follower)
-	if len(followers) != 2 {
-		t.Fatalf("Expected 2 followers")
-	}
-	follower := followers[0]
-
-	// Try to apply
-	future := follower.Apply([]byte("test"), time.Millisecond)
-
-	if future.Error() != ErrNotLeader {
-		t.Fatalf("should not apply on follower")
-	}
-
-	// Should be cached
-	if future.Error() != ErrNotLeader {
-		t.Fatalf("should not apply on follower")
-	}
-}
-
-func TestRaft_ApplyConcurrent(t *testing.T) {
-	// Make the cluster
-	conf := inmemConfig()
-	conf.HeartbeatTimeout = 80 * time.Millisecond
-	conf.ElectionTimeout = 80 * time.Millisecond
-	c := MakeCluster(3, t, conf)
-	defer c.Close()
-
-	// Wait for a leader
-	leader := c.Leader()
-
-	// Create a wait group
-	var group sync.WaitGroup
-	group.Add(100)
-
-	applyF := func(i int) {
-		defer group.Done()
-		future := leader.Apply([]byte(fmt.Sprintf("test%d", i)), 0)
-		if err := future.Error(); err != nil {
-			t.Fatalf("err: %v", err)
-		}
-	}
-
-	// Concurrently apply
-	for i := 0; i < 100; i++ {
-		go applyF(i)
-	}
-
-	// Wait to finish
-	doneCh := make(chan struct{})
-	go func() {
-		group.Wait()
-		close(doneCh)
-	}()
-	select {
-	case <-doneCh:
-	case <-time.After(time.Second):
-		t.Fatalf("timeout")
-	}
-
-	// Check the FSMs
-	c.EnsureSame(t)
-}
-
-func TestRaft_ApplyConcurrent_Timeout(t *testing.T) {
-	// Make the cluster
-	conf := inmemConfig()
-	conf.HeartbeatTimeout = 80 * time.Millisecond
-	conf.ElectionTimeout = 80 * time.Millisecond
-	c := MakeCluster(1, t, conf)
-	defer c.Close()
-
-	// Wait for a leader
-	leader := c.Leader()
-
-	// Enough enqueues should cause at least one timeout...
-	var didTimeout int32 = 0
-	for i := 0; i < 200; i++ {
-		go func(i int) {
-			future := leader.Apply([]byte(fmt.Sprintf("test%d", i)), time.Microsecond)
-			if future.Error() == ErrEnqueueTimeout {
-				atomic.StoreInt32(&didTimeout, 1)
-			}
-		}(i)
-	}
-
-	// Wait
-	time.Sleep(20 * time.Millisecond)
-
-	// Some should have failed
-	if atomic.LoadInt32(&didTimeout) == 0 {
-		t.Fatalf("expected a timeout")
-	}
-}
-
-func TestRaft_JoinNode(t *testing.T) {
-	// Make a cluster
-	c := MakeCluster(2, t, nil)
-	defer c.Close()
-
-	// Apply a log to this cluster to ensure it is 'newer'
-	var future Future
-	leader := c.Leader()
-	future = leader.Apply([]byte("first"), 0)
-	if err := future.Error(); err != nil {
-		t.Fatalf("err: %v", err)
-	} else {
-		log.Printf("[INFO] Applied log")
-	}
-
-	// Make a new cluster of 1
-	c1 := MakeCluster(1, t, nil)
-
-	// Merge clusters
-	c.Merge(c1)
-	c.FullyConnect()
-
-	// Wait until we have 2 leaders
-	limit := time.Now().Add(200 * time.Millisecond)
-	var leaders []*Raft
-	for time.Now().Before(limit) && len(leaders) != 2 {
-		time.Sleep(10 * time.Millisecond)
-		leaders = c.GetInState(Leader)
-	}
-	if len(leaders) != 2 {
-		t.Fatalf("expected two leader: %v", leaders)
-	}
-
-	// Join the new node in
-	future = leader.AddPeer(c1.rafts[0].localAddr)
-	if err := future.Error(); err != nil {
-		t.Fatalf("err: %v", err)
-	}
-
-	// Wait until we have 2 followers
-	limit = time.Now().Add(200 * time.Millisecond)
-	var followers []*Raft
-	for time.Now().Before(limit) && len(followers) != 2 {
-		time.Sleep(10 * time.Millisecond)
-		followers = c.GetInState(Follower)
-	}
-	if len(followers) != 2 {
-		t.Fatalf("expected two followers: %v", followers)
-	}
-
-	// Check the FSMs
-	c.EnsureSame(t)
-
-	// Check the peers
-	c.EnsureSamePeers(t)
-
-	// Ensure one leader
-	leader = c.Leader()
-	c.EnsureLeader(t, leader.localAddr)
-}
-
-func TestRaft_RemoveFollower(t *testing.T) {
-	// Make a cluster
-	c := MakeCluster(3, t, nil)
-	defer c.Close()
-
-	// Get the leader
-	leader := c.Leader()
-
-	// Wait until we have 2 followers
-	limit := time.Now().Add(200 * time.Millisecond)
-	var followers []*Raft
-	for time.Now().Before(limit) && len(followers) != 2 {
-		time.Sleep(10 * time.Millisecond)
-		followers = c.GetInState(Follower)
-	}
-	if len(followers) != 2 {
-		t.Fatalf("expected two followers: %v", followers)
-	}
-
-	// Remove a follower
-	follower := followers[0]
-	future := leader.RemovePeer(follower.localAddr)
-	if err := future.Error(); err != nil {
-		t.Fatalf("err: %v", err)
-	}
-
-	// Wait a while
-	time.Sleep(20 * time.Millisecond)
-
-	// Other nodes should have fewer peers
-	if peers, _ := leader.peerStore.Peers(); len(peers) != 2 {
-		t.Fatalf("too many peers")
-	}
-	if peers, _ := followers[1].peerStore.Peers(); len(peers) != 2 {
-		t.Fatalf("too many peers")
-	}
-}
-
-func TestRaft_RemoveLeader(t *testing.T) {
-	// Make a cluster
-	c := MakeCluster(3, t, nil)
-	defer c.Close()
-
-	// Get the leader
-	leader := c.Leader()
-
-	// Wait until we have 2 followers
-	limit := time.Now().Add(200 * time.Millisecond)
-	var followers []*Raft
-	for time.Now().Before(limit) && len(followers) != 2 {
-		time.Sleep(10 * time.Millisecond)
-		followers = c.GetInState(Follower)
-	}
-	if len(followers) != 2 {
-		t.Fatalf("expected two followers: %v", followers)
-	}
-
-	// Remove the leader
-	leader.RemovePeer(leader.localAddr)
-
-	// Wait a while
-	time.Sleep(20 * time.Millisecond)
-
-	// Should have a new leader
-	newLeader := c.Leader()
-
-	// Wait a bit for log application
-	time.Sleep(20 * time.Millisecond)
-
-	// Other nodes should have fewer peers
-	if peers, _ := newLeader.peerStore.Peers(); len(peers) != 2 {
-		t.Fatalf("too many peers")
-	}
-
-	// Old leader should be shutdown
-	if leader.State() != Shutdown {
-		t.Fatalf("leader should be shutdown")
-	}
-
-	// Old leader should have no peers
-	if peers, _ := leader.peerStore.Peers(); len(peers) != 1 {
-		t.Fatalf("leader should have no peers")
-	}
-}
-
-func TestRaft_RemoveLeader_NoShutdown(t *testing.T) {
-	// Make a cluster
-	conf := inmemConfig()
-	conf.ShutdownOnRemove = false
-	c := MakeCluster(3, t, conf)
-	defer c.Close()
-
-	// Get the leader
-	leader := c.Leader()
-
-	// Wait until we have 2 followers
-	limit := time.Now().Add(200 * time.Millisecond)
-	var followers []*Raft
-	for time.Now().Before(limit) && len(followers) != 2 {
-		time.Sleep(10 * time.Millisecond)
-		followers = c.GetInState(Follower)
-	}
-	if len(followers) != 2 {
-		t.Fatalf("expected two followers: %v", followers)
-	}
-
-	// Remove the leader
-	leader.RemovePeer(leader.localAddr)
-
-	// Wait a while
-	time.Sleep(20 * time.Millisecond)
-
-	// Should have a new leader
-	newLeader := c.Leader()
-
-	// Wait a bit for log application
-	time.Sleep(20 * time.Millisecond)
-
-	// Other nodes should have fewer peers
-	if peers, _ := newLeader.peerStore.Peers(); len(peers) != 2 {
-		t.Fatalf("too many peers")
-	}
-
-	// Old leader should be a follower
-	if leader.State() != Follower {
-		t.Fatalf("leader should be shutdown")
-	}
-
-	// Old leader should have no peers
-	if peers, _ := leader.peerStore.Peers(); len(peers) != 1 {
-		t.Fatalf("leader should have no peers")
-	}
-}
-
-func TestRaft_RemoveLeader_SplitCluster(t *testing.T) {
-	// Enable operation after a remove
-	conf := inmemConfig()
-	conf.EnableSingleNode = true
-	conf.ShutdownOnRemove = false
-	conf.DisableBootstrapAfterElect = false
-
-	// Make a cluster
-	c := MakeCluster(3, t, conf)
-	defer c.Close()
-
-	// Get the leader
-	leader := c.Leader()
-
-	// Remove the leader
-	leader.RemovePeer(leader.localAddr)
-
-	// Wait until we have 2 leaders
-	limit := time.Now().Add(200 * time.Millisecond)
-	var leaders []*Raft
-	for time.Now().Before(limit) && len(leaders) != 2 {
-		time.Sleep(10 * time.Millisecond)
-		leaders = c.GetInState(Leader)
-	}
-	if len(leaders) != 2 {
-		t.Fatalf("expected two leader: %v", leaders)
-	}
-
-	// Old leader should have no peers
-	if len(leader.peers) != 0 {
-		t.Fatalf("leader should have no peers")
-	}
-}
-
-func TestRaft_AddKnownPeer(t *testing.T) {
-	// Make a cluster
-	c := MakeCluster(3, t, nil)
-	defer c.Close()
-
-	// Get the leader
-	leader := c.Leader()
-	followers := c.GetInState(Follower)
-
-	// Add a follower
-	future := leader.AddPeer(followers[0].localAddr)
-
-	// Should be already added
-	if err := future.Error(); err != ErrKnownPeer {
-		t.Fatalf("err: %v", err)
-	}
-}
-
-func TestRaft_RemoveUnknownPeer(t *testing.T) {
-	// Make a cluster
-	c := MakeCluster(3, t, nil)
-	defer c.Close()
-
-	// Get the leader
-	leader := c.Leader()
-
-	// Remove unknown
-	future := leader.RemovePeer(NewInmemAddr())
-
-	// Should be already added
-	if err := future.Error(); err != ErrUnknownPeer {
-		t.Fatalf("err: %v", err)
-	}
-}
-
-func TestRaft_SnapshotRestore(t *testing.T) {
-	// Make the cluster
-	conf := inmemConfig()
-	conf.TrailingLogs = 10
-	c := MakeCluster(1, t, conf)
-	defer c.Close()
-
-	// Commit a lot of things
-	leader := c.Leader()
-	var future Future
-	for i := 0; i < 100; i++ {
-		future = leader.Apply([]byte(fmt.Sprintf("test%d", i)), 0)
-	}
-
-	// Wait for the last future to apply
-	if err := future.Error(); err != nil {
-		t.Fatalf("err: %v", err)
-	}
-
-	// Take a snapshot
-	snapFuture := leader.Snapshot()
-	if err := snapFuture.Error(); err != nil {
-		t.Fatalf("err: %v", err)
-	}
-
-	// Check for snapshot
-	if snaps, _ := leader.snapshots.List(); len(snaps) != 1 {
-		t.Fatalf("should have a snapshot")
-	}
-
-	// Logs should be trimmed
-	if idx, _ := leader.logs.FirstIndex(); idx != 92 {
-		t.Fatalf("should trim logs to 92: %d", idx)
-	}
-
-	// Shutdown
-	shutdown := leader.Shutdown()
-	if err := shutdown.Error(); err != nil {
-		t.Fatalf("err: %v", err)
-	}
-
-	// Restart the Raft
-	r := leader
-	r, err := NewRaft(r.conf, r.fsm, r.logs, r.stable,
-		r.snapshots, r.peerStore, r.trans)
-	if err != nil {
-		t.Fatalf("err: %v", err)
-	}
-	c.rafts[0] = r
-
-	// We should have restored from the snapshot!
-	if last := r.getLastApplied(); last != 101 {
-		t.Fatalf("bad last: %v", last)
-	}
-}
-
-func TestRaft_SnapshotRestore_PeerChange(t *testing.T) {
-	// Make the cluster
-	conf := inmemConfig()
-	conf.TrailingLogs = 10
-	c := MakeCluster(3, t, conf)
-	defer c.Close()
-
-	// Commit a lot of things
-	leader := c.Leader()
-	var future Future
-	for i := 0; i < 100; i++ {
-		future = leader.Apply([]byte(fmt.Sprintf("test%d", i)), 0)
-	}
-
-	// Wait for the last future to apply
-	if err := future.Error(); err != nil {
-		t.Fatalf("err: %v", err)
-	}
-
-	// Take a snapshot
-	snapFuture := leader.Snapshot()
-	if err := snapFuture.Error(); err != nil {
-		t.Fatalf("err: %v", err)
-	}
-
-	// Shutdown
-	shutdown := leader.Shutdown()
-	if err := shutdown.Error(); err != nil {
-		t.Fatalf("err: %v", err)
-	}
-
-	// Make a separate cluster
-	c2 := MakeClusterNoPeers(2, t, conf)
-	defer c2.Close()
-
-	// Kill the old cluster
-	for _, sec := range c.rafts {
-		if sec != leader {
-			sec.Shutdown()
-		}
-	}
-
-	// Change the peer addresses
-	peers := []string{leader.trans.LocalAddr()}
-	for _, sec := range c2.rafts {
-		peers = append(peers, sec.trans.LocalAddr())
-	}
-
-	// Restart the Raft with new peers
-	r := leader
-	peerStore := &StaticPeers{StaticPeers: peers}
-	r, err := NewRaft(r.conf, r.fsm, r.logs, r.stable,
-		r.snapshots, peerStore, r.trans)
-	if err != nil {
-		t.Fatalf("err: %v", err)
-	}
-	c.rafts[0] = r
-	c2.rafts = append(c2.rafts, r)
-	c2.trans = append(c2.trans, r.trans.(*InmemTransport))
-	c2.fsms = append(c2.fsms, r.fsm.(*MockFSM))
-	c2.FullyConnect()
-
-	// Wait a while
-	time.Sleep(50 * time.Millisecond)
-
-	// Ensure we elect a leader, and that we replicate
-	// to our new followers
-	c2.EnsureSame(t)
-
-	// We should have restored from the snapshot!
-	if last := r.getLastApplied(); last != 102 {
-		t.Fatalf("bad last: %v", last)
-	}
-}
-
-func TestRaft_AutoSnapshot(t *testing.T) {
-	// Make the cluster
-	conf := inmemConfig()
-	conf.SnapshotInterval = 5 * time.Millisecond
-	conf.SnapshotThreshold = 50
-	conf.TrailingLogs = 10
-	c := MakeCluster(1, t, conf)
-	defer c.Close()
-
-	// Commit a lot of things
-	leader := c.Leader()
-	var future Future
-	for i := 0; i < 100; i++ {
-		future = leader.Apply([]byte(fmt.Sprintf("test%d", i)), 0)
-	}
-
-	// Wait for the last future to apply
-	if err := future.Error(); err != nil {
-		t.Fatalf("err: %v", err)
-	}
-
-	// Wait for a snapshot to happen
-	time.Sleep(50 * time.Millisecond)
-
-	// Check for snapshot
-	if snaps, _ := leader.snapshots.List(); len(snaps) == 0 {
-		t.Fatalf("should have a snapshot")
-	}
-}
-
-func TestRaft_SendSnapshotFollower(t *testing.T) {
-	// Make the cluster
-	conf := inmemConfig()
-	conf.TrailingLogs = 10
-	c := MakeCluster(3, t, conf)
-	defer c.Close()
-
-	// Disconnect one follower
-	followers := c.GetInState(Follower)
-	behind := followers[0]
-	c.Disconnect(behind.localAddr)
-
-	// Commit a lot of things
-	leader := c.Leader()
-	var future Future
-	for i := 0; i < 100; i++ {
-		future = leader.Apply([]byte(fmt.Sprintf("test%d", i)), 0)
-	}
-
-	// Wait for the last future to apply
-	if err := future.Error(); err != nil {
-		t.Fatalf("err: %v", err)
-	} else {
-		log.Printf("[INFO] Finished apply without behind follower")
-	}
-
-	// Snapshot, this will truncate logs!
-	for _, r := range c.rafts {
-		future = r.Snapshot()
-		if err := future.Error(); err != nil {
-			t.Fatalf("err: %v", err)
-		}
-	}
-
-	// Reconnect the behind node
-	c.FullyConnect()
-
-	// Ensure all the logs are the same
-	c.EnsureSame(t)
-}
-
-func TestRaft_ReJoinFollower(t *testing.T) {
-	// Enable operation after a remove
-	conf := inmemConfig()
-	conf.ShutdownOnRemove = false
-
-	// Make a cluster
-	c := MakeCluster(3, t, conf)
-	defer c.Close()
-
-	// Get the leader
-	leader := c.Leader()
-
-	// Wait until we have 2 followers
-	limit := time.Now().Add(200 * time.Millisecond)
-	var followers []*Raft
-	for time.Now().Before(limit) && len(followers) != 2 {
-		time.Sleep(10 * time.Millisecond)
-		followers = c.GetInState(Follower)
-	}
-	if len(followers) != 2 {
-		t.Fatalf("expected two followers: %v", followers)
-	}
-
-	// Remove a follower
-	follower := followers[0]
-	future := leader.RemovePeer(follower.localAddr)
-	if err := future.Error(); err != nil {
-		t.Fatalf("err: %v", err)
-	}
-
-	// Wait a while
-	time.Sleep(20 * time.Millisecond)
-
-	// Other nodes should have fewer peers
-	if peers, _ := leader.peerStore.Peers(); len(peers) != 2 {
-		t.Fatalf("too many peers: %v", peers)
-	}
-	if peers, _ := followers[1].peerStore.Peers(); len(peers) != 2 {
-		t.Fatalf("too many peers: %v", peers)
-	}
-
-	// Get the leader
-	time.Sleep(20 * time.Millisecond)
-	leader = c.Leader()
-
-	// Rejoin. The follower will have a higher term than the leader,
-	// this will cause the leader to step down, and a new round of elections
-	// to take place. We should eventually re-stabilize.
-	future = leader.AddPeer(follower.localAddr)
-	if err := future.Error(); err != nil && err != ErrLeadershipLost {
-		t.Fatalf("err: %v", err)
-	}
-
-	// Wait a while
-	time.Sleep(40 * time.Millisecond)
-
-	// Other nodes should have fewer peers
-	if peers, _ := leader.peerStore.Peers(); len(peers) != 3 {
-		t.Fatalf("missing peers: %v", peers)
-	}
-	if peers, _ := followers[1].peerStore.Peers(); len(peers) != 3 {
-		t.Fatalf("missing peers: %v", peers)
-	}
-
-	// Should be a follower now
-	if follower.State() != Follower {
-		t.Fatalf("bad state: %v", follower.State())
-	}
-}
-
-func TestRaft_LeaderLeaseExpire(t *testing.T) {
-	// Make a cluster
-	conf := inmemConfig()
-	c := MakeCluster(2, t, conf)
-	defer c.Close()
-
-	// Get the leader
-	leader := c.Leader()
-
-	// Wait until we have a followers
-	limit := time.Now().Add(200 * time.Millisecond)
-	var followers []*Raft
-	for time.Now().Before(limit) && len(followers) != 1 {
-		time.Sleep(10 * time.Millisecond)
-		followers = c.GetInState(Follower)
-	}
-	if len(followers) != 1 {
-		t.Fatalf("expected a followers: %v", followers)
-	}
-
-	// Disconnect the follower now
-	follower := followers[0]
-	log.Printf("[INFO] Disconnecting %v", follower)
-	c.Disconnect(follower.localAddr)
-
-	// Watch the leaderCh
-	select {
-	case v := <-leader.LeaderCh():
-		if v {
-			t.Fatalf("should step down as leader")
-		}
-	case <-time.After(conf.LeaderLeaseTimeout * 2):
-		t.Fatalf("timeout stepping down as leader")
-	}
-
-	// Should be no leaders
-	if len(c.GetInState(Leader)) != 0 {
-		t.Fatalf("expected step down")
-	}
-
-	// Verify no further contact
-	last := follower.LastContact()
-	time.Sleep(50 * time.Millisecond)
-
-	// Check that last contact has not changed
-	if last != follower.LastContact() {
-		t.Fatalf("unexpected further contact")
-	}
-
-	// Ensure both have cleared their leader
-	if l := leader.Leader(); l != "" {
-		t.Fatalf("bad: %v", l)
-	}
-	if l := follower.Leader(); l != "" {
-		t.Fatalf("bad: %v", l)
-	}
-}
-
-func TestRaft_Barrier(t *testing.T) {
-	// Make the cluster
-	c := MakeCluster(3, t, nil)
-	defer c.Close()
-
-	// Get the leader
-	leader := c.Leader()
-
-	// Commit a lot of things
-	for i := 0; i < 100; i++ {
-		leader.Apply([]byte(fmt.Sprintf("test%d", i)), 0)
-	}
-
-	// Wait for a barrier complete
-	barrier := leader.Barrier(0)
-
-	// Wait for the barrier future to apply
-	if err := barrier.Error(); err != nil {
-		t.Fatalf("err: %v", err)
-	}
-
-	// Ensure all the logs are the same
-	c.EnsureSame(t)
-	if len(c.fsms[0].logs) != 100 {
-		t.Fatalf("Bad log length")
-	}
-}
-
-func TestRaft_VerifyLeader(t *testing.T) {
-	// Make the cluster
-	c := MakeCluster(3, t, nil)
-	defer c.Close()
-
-	// Get the leader
-	leader := c.Leader()
-
-	// Verify we are leader
-	verify := leader.VerifyLeader()
-
-	// Wait for the verify to apply
-	if err := verify.Error(); err != nil {
-		t.Fatalf("err: %v", err)
-	}
-}
-
-func TestRaft_VerifyLeader_Single(t *testing.T) {
-	// Make the cluster
-	c := MakeCluster(1, t, nil)
-	defer c.Close()
-
-	// Get the leader
-	leader := c.Leader()
-
-	// Verify we are leader
-	verify := leader.VerifyLeader()
-
-	// Wait for the verify to apply
-	if err := verify.Error(); err != nil {
-		t.Fatalf("err: %v", err)
-	}
-}
-
-func TestRaft_VerifyLeader_Fail(t *testing.T) {
-	// Make a cluster
-	conf := inmemConfig()
-	c := MakeCluster(2, t, conf)
-	defer c.Close()
-
-	// Get the leader
-	leader := c.Leader()
-
-	// Wait until we have a followers
-	limit := time.Now().Add(200 * time.Millisecond)
-	var followers []*Raft
-	for time.Now().Before(limit) && len(followers) != 1 {
-		time.Sleep(10 * time.Millisecond)
-		followers = c.GetInState(Follower)
-	}
-	if len(followers) != 1 {
-		t.Fatalf("expected a followers: %v", followers)
-	}
-
-	// Force follower to different term
-	follower := followers[0]
-	follower.setCurrentTerm(follower.getCurrentTerm() + 1)
-
-	// Verify we are leader
-	verify := leader.VerifyLeader()
-
-	// Wait for the leader to step down
-	if err := verify.Error(); err != ErrNotLeader && err != ErrLeadershipLost {
-		t.Fatalf("err: %v", err)
-	}
-
-	// Ensure the known leader is cleared
-	if l := leader.Leader(); l != "" {
-		t.Fatalf("bad: %v", l)
-	}
-}
-
-func TestRaft_VerifyLeader_ParitalConnect(t *testing.T) {
-	// Make a cluster
-	conf := inmemConfig()
-	c := MakeCluster(3, t, conf)
-	defer c.Close()
-
-	// Get the leader
-	leader := c.Leader()
-
-	// Wait until we have a followers
-	limit := time.Now().Add(200 * time.Millisecond)
-	var followers []*Raft
-	for time.Now().Before(limit) && len(followers) != 2 {
-		time.Sleep(10 * time.Millisecond)
-		followers = c.GetInState(Follower)
-	}
-	if len(followers) != 2 {
-		t.Fatalf("expected a followers: %v", followers)
-	}
-
-	// Force partial disconnect
-	follower := followers[0]
-	log.Printf("[INFO] Disconnecting %v", follower)
-	c.Disconnect(follower.localAddr)
-
-	// Verify we are leader
-	verify := leader.VerifyLeader()
-
-	// Wait for the leader to step down
-	if err := verify.Error(); err != nil {
-		t.Fatalf("err: %v", err)
-	}
-}
-
-func TestRaft_SettingPeers(t *testing.T) {
-	// Make the cluster
-	c := MakeClusterNoPeers(3, t, nil)
-	defer c.Close()
-
-	peers := make([]string, 0)
-	for _, v := range c.rafts {
-		peers = append(peers, v.localAddr)
-	}
-
-	for _, v := range c.rafts {
-		future := v.SetPeers(peers)
-		if err := future.Error(); err != nil {
-			t.Fatalf("error setting peers: %v", err)
-		}
-	}
-
-	// Wait a while
-	time.Sleep(20 * time.Millisecond)
-
-	// Should have a new leader
-	if leader := c.Leader(); leader == nil {
-		t.Fatalf("no leader?")
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/hashicorp/raft/replication.go b/Godeps/_workspace/src/github.com/hashicorp/raft/replication.go
deleted file mode 100644
index 30541952d..000000000
--- a/Godeps/_workspace/src/github.com/hashicorp/raft/replication.go
+++ /dev/null
@@ -1,513 +0,0 @@
-package raft
-
-import (
-	"errors"
-	"fmt"
-	"sync"
-	"time"
-
-	"github.com/armon/go-metrics"
-)
-
-const (
-	maxFailureScale = 12
-	failureWait     = 10 * time.Millisecond
-)
-
-var (
-	// ErrLogNotFound indicates a given log entry is not available.
-	ErrLogNotFound = errors.New("log not found")
-
-	// ErrPipelineReplicationNotSupported can be returned by the transport to
-	// signal that pipeline replication is not supported in general, and that
-	// no error message should be produced.
-	ErrPipelineReplicationNotSupported = errors.New("pipeline replication not supported")
-)
-
-type followerReplication struct {
-	peer     string
-	inflight *inflight
-
-	stopCh    chan uint64
-	triggerCh chan struct{}
-
-	currentTerm uint64
-	matchIndex  uint64
-	nextIndex   uint64
-
-	lastContact     time.Time
-	lastContactLock sync.RWMutex
-
-	failures uint64
-
-	notifyCh   chan struct{}
-	notify     []*verifyFuture
-	notifyLock sync.Mutex
-
-	// stepDown is used to indicate to the leader that we
-	// should step down based on information from a follower.
-	stepDown chan struct{}
-
-	// allowPipeline is used to control it seems like
-	// pipeline replication should be enabled.
-	allowPipeline bool
-}
-
-// notifyAll is used to notify all the waiting verify futures
-// if the follower believes we are still the leader.
-func (s *followerReplication) notifyAll(leader bool) {
-	// Clear the waiting notifies minimizing lock time
-	s.notifyLock.Lock()
-	n := s.notify
-	s.notify = nil
-	s.notifyLock.Unlock()
-
-	// Submit our votes
-	for _, v := range n {
-		v.vote(leader)
-	}
-}
-
-// LastContact returns the time of last contact.
-func (s *followerReplication) LastContact() time.Time {
-	s.lastContactLock.RLock()
-	last := s.lastContact
-	s.lastContactLock.RUnlock()
-	return last
-}
-
-// setLastContact sets the last contact to the current time.
-func (s *followerReplication) setLastContact() {
-	s.lastContactLock.Lock()
-	s.lastContact = time.Now()
-	s.lastContactLock.Unlock()
-}
-
-// replicate is a long running routine that is used to manage
-// the process of replicating logs to our followers.
-func (r *Raft) replicate(s *followerReplication) {
-	// Start an async heartbeating routing
-	stopHeartbeat := make(chan struct{})
-	defer close(stopHeartbeat)
-	r.goFunc(func() { r.heartbeat(s, stopHeartbeat) })
-
-RPC:
-	shouldStop := false
-	for !shouldStop {
-		select {
-		case maxIndex := <-s.stopCh:
-			// Make a best effort to replicate up to this index
-			if maxIndex > 0 {
-				r.replicateTo(s, maxIndex)
-			}
-			return
-		case <-s.triggerCh:
-			shouldStop = r.replicateTo(s, r.getLastLogIndex())
-		case <-randomTimeout(r.conf.CommitTimeout):
-			shouldStop = r.replicateTo(s, r.getLastLogIndex())
-		}
-
-		// If things looks healthy, switch to pipeline mode
-		if !shouldStop && s.allowPipeline {
-			goto PIPELINE
-		}
-	}
-	return
-
-PIPELINE:
-	// Disable until re-enabled
-	s.allowPipeline = false
-
-	// Replicates using a pipeline for high performance. This method
-	// is not able to gracefully recover from errors, and so we fall back
-	// to standard mode on failure.
-	if err := r.pipelineReplicate(s); err != nil {
-		if err != ErrPipelineReplicationNotSupported {
-			r.logger.Printf("[ERR] raft: Failed to start pipeline replication to %s: %s", s.peer, err)
-		}
-	}
-	goto RPC
-}
-
-// replicateTo is used to replicate the logs up to a given last index.
-// If the follower log is behind, we take care to bring them up to date.
-func (r *Raft) replicateTo(s *followerReplication, lastIndex uint64) (shouldStop bool) {
-	// Create the base request
-	var req AppendEntriesRequest
-	var resp AppendEntriesResponse
-	var start time.Time
-START:
-	// Prevent an excessive retry rate on errors
-	if s.failures > 0 {
-		select {
-		case <-time.After(backoff(failureWait, s.failures, maxFailureScale)):
-		case <-r.shutdownCh:
-		}
-	}
-
-	// Setup the request
-	if err := r.setupAppendEntries(s, &req, s.nextIndex, lastIndex); err == ErrLogNotFound {
-		goto SEND_SNAP
-	} else if err != nil {
-		return
-	}
-
-	// Make the RPC call
-	start = time.Now()
-	if err := r.trans.AppendEntries(s.peer, &req, &resp); err != nil {
-		r.logger.Printf("[ERR] raft: Failed to AppendEntries to %v: %v", s.peer, err)
-		s.failures++
-		return
-	}
-	appendStats(s.peer, start, float32(len(req.Entries)))
-
-	// Check for a newer term, stop running
-	if resp.Term > req.Term {
-		r.handleStaleTerm(s)
-		return true
-	}
-
-	// Update the last contact
-	s.setLastContact()
-
-	// Update s based on success
-	if resp.Success {
-		// Update our replication state
-		updateLastAppended(s, &req)
-
-		// Clear any failures, allow pipelining
-		s.failures = 0
-		s.allowPipeline = true
-	} else {
-		s.nextIndex = max(min(s.nextIndex-1, resp.LastLog+1), 1)
-		s.matchIndex = s.nextIndex - 1
-		s.failures++
-		r.logger.Printf("[WARN] raft: AppendEntries to %v rejected, sending older logs (next: %d)", s.peer, s.nextIndex)
-	}
-
-CHECK_MORE:
-	// Check if there are more logs to replicate
-	if s.nextIndex <= lastIndex {
-		goto START
-	}
-	return
-
-	// SEND_SNAP is used when we fail to get a log, usually because the follower
-	// is too far behind, and we must ship a snapshot down instead
-SEND_SNAP:
-	if stop, err := r.sendLatestSnapshot(s); stop {
-		return true
-	} else if err != nil {
-		r.logger.Printf("[ERR] raft: Failed to send snapshot to %v: %v", s.peer, err)
-		return
-	}
-
-	// Check if there is more to replicate
-	goto CHECK_MORE
-}
-
-// sendLatestSnapshot is used to send the latest snapshot we have
-// down to our follower.
-func (r *Raft) sendLatestSnapshot(s *followerReplication) (bool, error) {
-	// Get the snapshots
-	snapshots, err := r.snapshots.List()
-	if err != nil {
-		r.logger.Printf("[ERR] raft: Failed to list snapshots: %v", err)
-		return false, err
-	}
-
-	// Check we have at least a single snapshot
-	if len(snapshots) == 0 {
-		return false, fmt.Errorf("no snapshots found")
-	}
-
-	// Open the most recent snapshot
-	snapID := snapshots[0].ID
-	meta, snapshot, err := r.snapshots.Open(snapID)
-	if err != nil {
-		r.logger.Printf("[ERR] raft: Failed to open snapshot %v: %v", snapID, err)
-		return false, err
-	}
-	defer snapshot.Close()
-
-	// Setup the request
-	req := InstallSnapshotRequest{
-		Term:         s.currentTerm,
-		Leader:       r.trans.EncodePeer(r.localAddr),
-		LastLogIndex: meta.Index,
-		LastLogTerm:  meta.Term,
-		Peers:        meta.Peers,
-		Size:         meta.Size,
-	}
-
-	// Make the call
-	start := time.Now()
-	var resp InstallSnapshotResponse
-	if err := r.trans.InstallSnapshot(s.peer, &req, &resp, snapshot); err != nil {
-		r.logger.Printf("[ERR] raft: Failed to install snapshot %v: %v", snapID, err)
-		s.failures++
-		return false, err
-	}
-	metrics.MeasureSince([]string{"raft", "replication", "installSnapshot", s.peer}, start)
-
-	// Check for a newer term, stop running
-	if resp.Term > req.Term {
-		r.handleStaleTerm(s)
-		return true, nil
-	}
-
-	// Update the last contact
-	s.setLastContact()
-
-	// Check for success
-	if resp.Success {
-		// Mark any inflight logs as committed
-		s.inflight.CommitRange(s.matchIndex+1, meta.Index)
-
-		// Update the indexes
-		s.matchIndex = meta.Index
-		s.nextIndex = s.matchIndex + 1
-
-		// Clear any failures
-		s.failures = 0
-
-		// Notify we are still leader
-		s.notifyAll(true)
-	} else {
-		s.failures++
-		r.logger.Printf("[WARN] raft: InstallSnapshot to %v rejected", s.peer)
-	}
-	return false, nil
-}
-
-// heartbeat is used to periodically invoke AppendEntries on a peer
-// to ensure they don't time out. This is done async of replicate(),
-// since that routine could potentially be blocked on disk IO.
-func (r *Raft) heartbeat(s *followerReplication, stopCh chan struct{}) {
-	var failures uint64
-	req := AppendEntriesRequest{
-		Term:   s.currentTerm,
-		Leader: r.trans.EncodePeer(r.localAddr),
-	}
-	var resp AppendEntriesResponse
-	for {
-		// Wait for the next heartbeat interval or forced notify
-		select {
-		case <-s.notifyCh:
-		case <-randomTimeout(r.conf.HeartbeatTimeout / 10):
-		case <-stopCh:
-			return
-		}
-
-		start := time.Now()
-		if err := r.trans.AppendEntries(s.peer, &req, &resp); err != nil {
-			r.logger.Printf("[ERR] raft: Failed to heartbeat to %v: %v", s.peer, err)
-			failures++
-			select {
-			case <-time.After(backoff(failureWait, failures, maxFailureScale)):
-			case <-stopCh:
-			}
-		} else {
-			s.setLastContact()
-			failures = 0
-			metrics.MeasureSince([]string{"raft", "replication", "heartbeat", s.peer}, start)
-			s.notifyAll(resp.Success)
-		}
-	}
-}
-
-// pipelineReplicate is used when we have synchronized our state with the follower,
-// and want to switch to a higher performance pipeline mode of replication.
-// We only pipeline AppendEntries commands, and if we ever hit an error, we fall
-// back to the standard replication which can handle more complex situations.
-func (r *Raft) pipelineReplicate(s *followerReplication) error {
-	// Create a new pipeline
-	pipeline, err := r.trans.AppendEntriesPipeline(s.peer)
-	if err != nil {
-		return err
-	}
-	defer pipeline.Close()
-
-	// Log start and stop of pipeline
-	r.logger.Printf("[INFO] raft: pipelining replication to peer %v", s.peer)
-	defer r.logger.Printf("[INFO] raft: aborting pipeline replication to peer %v", s.peer)
-
-	// Create a shutdown and finish channel
-	stopCh := make(chan struct{})
-	finishCh := make(chan struct{})
-
-	// Start a dedicated decoder
-	r.goFunc(func() { r.pipelineDecode(s, pipeline, stopCh, finishCh) })
-
-	// Start pipeline sends at the last good nextIndex
-	nextIndex := s.nextIndex
-
-	shouldStop := false
-SEND:
-	for !shouldStop {
-		select {
-		case <-finishCh:
-			break SEND
-		case maxIndex := <-s.stopCh:
-			if maxIndex > 0 {
-				r.pipelineSend(s, pipeline, &nextIndex, maxIndex)
-			}
-			break SEND
-		case <-s.triggerCh:
-			shouldStop = r.pipelineSend(s, pipeline, &nextIndex, r.getLastLogIndex())
-		case <-randomTimeout(r.conf.CommitTimeout):
-			shouldStop = r.pipelineSend(s, pipeline, &nextIndex, r.getLastLogIndex())
-		}
-	}
-
-	// Stop our decoder, and wait for it to finish
-	close(stopCh)
-	select {
-	case <-finishCh:
-	case <-r.shutdownCh:
-	}
-	return nil
-}
-
-// pipelineSend is used to send data over a pipeline.
-func (r *Raft) pipelineSend(s *followerReplication, p AppendPipeline, nextIdx *uint64, lastIndex uint64) (shouldStop bool) {
-	// Create a new append request
-	req := new(AppendEntriesRequest)
-	if err := r.setupAppendEntries(s, req, *nextIdx, lastIndex); err != nil {
-		return true
-	}
-
-	// Pipeline the append entries
-	if _, err := p.AppendEntries(req, new(AppendEntriesResponse)); err != nil {
-		r.logger.Printf("[ERR] raft: Failed to pipeline AppendEntries to %v: %v", s.peer, err)
-		return true
-	}
-
-	// Increase the next send log to avoid re-sending old logs
-	if n := len(req.Entries); n > 0 {
-		last := req.Entries[n-1]
-		*nextIdx = last.Index + 1
-	}
-	return false
-}
-
-// pipelineDecode is used to decode the responses of pipelined requests.
-func (r *Raft) pipelineDecode(s *followerReplication, p AppendPipeline, stopCh, finishCh chan struct{}) {
-	defer close(finishCh)
-	respCh := p.Consumer()
-	for {
-		select {
-		case ready := <-respCh:
-			req, resp := ready.Request(), ready.Response()
-			appendStats(s.peer, ready.Start(), float32(len(req.Entries)))
-
-			// Check for a newer term, stop running
-			if resp.Term > req.Term {
-				r.handleStaleTerm(s)
-				return
-			}
-
-			// Update the last contact
-			s.setLastContact()
-
-			// Abort pipeline if not successful
-			if !resp.Success {
-				return
-			}
-
-			// Update our replication state
-			updateLastAppended(s, req)
-		case <-stopCh:
-			return
-		}
-	}
-}
-
-// setupAppendEntries is used to setup an append entries request.
-func (r *Raft) setupAppendEntries(s *followerReplication, req *AppendEntriesRequest, nextIndex, lastIndex uint64) error {
-	req.Term = s.currentTerm
-	req.Leader = r.trans.EncodePeer(r.localAddr)
-	req.LeaderCommitIndex = r.getCommitIndex()
-	if err := r.setPreviousLog(req, nextIndex); err != nil {
-		return err
-	}
-	if err := r.setNewLogs(req, nextIndex, lastIndex); err != nil {
-		return err
-	}
-	return nil
-}
-
-// setPreviousLog is used to setup the PrevLogEntry and PrevLogTerm for an
-// AppendEntriesRequest given the next index to replicate.
-func (r *Raft) setPreviousLog(req *AppendEntriesRequest, nextIndex uint64) error {
-	// Guard for the first index, since there is no 0 log entry
-	// Guard against the previous index being a snapshot as well
-	if nextIndex == 1 {
-		req.PrevLogEntry = 0
-		req.PrevLogTerm = 0
-
-	} else if (nextIndex - 1) == r.getLastSnapshotIndex() {
-		req.PrevLogEntry = r.getLastSnapshotIndex()
-		req.PrevLogTerm = r.getLastSnapshotTerm()
-
-	} else {
-		var l Log
-		if err := r.logs.GetLog(nextIndex-1, &l); err != nil {
-			r.logger.Printf("[ERR] raft: Failed to get log at index %d: %v",
-				nextIndex-1, err)
-			return err
-		}
-
-		// Set the previous index and term (0 if nextIndex is 1)
-		req.PrevLogEntry = l.Index
-		req.PrevLogTerm = l.Term
-	}
-	return nil
-}
-
-// setNewLogs is used to setup the logs which should be appended for a request.
-func (r *Raft) setNewLogs(req *AppendEntriesRequest, nextIndex, lastIndex uint64) error {
-	// Append up to MaxAppendEntries or up to the lastIndex
-	req.Entries = make([]*Log, 0, r.conf.MaxAppendEntries)
-	maxIndex := min(nextIndex+uint64(r.conf.MaxAppendEntries)-1, lastIndex)
-	for i := nextIndex; i <= maxIndex; i++ {
-		oldLog := new(Log)
-		if err := r.logs.GetLog(i, oldLog); err != nil {
-			r.logger.Printf("[ERR] raft: Failed to get log at index %d: %v", i, err)
-			return err
-		}
-		req.Entries = append(req.Entries, oldLog)
-	}
-	return nil
-}
-
-// appendStats is used to emit stats about an AppendEntries invocation.
-func appendStats(peer string, start time.Time, logs float32) {
-	metrics.MeasureSince([]string{"raft", "replication", "appendEntries", "rpc", peer}, start)
-	metrics.IncrCounter([]string{"raft", "replication", "appendEntries", "logs", peer}, logs)
-}
-
-// handleStaleTerm is used when a follower indicates that we have a stale term.
-func (r *Raft) handleStaleTerm(s *followerReplication) {
-	r.logger.Printf("[ERR] raft: peer %v has newer term, stopping replication", s.peer)
-	s.notifyAll(false) // No longer leader
-	asyncNotifyCh(s.stepDown)
-}
-
-// updateLastAppended is used to update follower replication state after a successful
-// AppendEntries RPC.
-func updateLastAppended(s *followerReplication, req *AppendEntriesRequest) {
-	// Mark any inflight logs as committed
-	if logs := req.Entries; len(logs) > 0 {
-		first := logs[0]
-		last := logs[len(logs)-1]
-		s.inflight.CommitRange(first.Index, last.Index)
-
-		// Update the indexes
-		s.matchIndex = last.Index
-		s.nextIndex = last.Index + 1
-	}
-
-	// Notify still leader
-	s.notifyAll(true)
-}
diff --git a/Godeps/_workspace/src/github.com/hashicorp/raft/snapshot.go b/Godeps/_workspace/src/github.com/hashicorp/raft/snapshot.go
deleted file mode 100644
index 7151f43ce..000000000
--- a/Godeps/_workspace/src/github.com/hashicorp/raft/snapshot.go
+++ /dev/null
@@ -1,40 +0,0 @@
-package raft
-
-import (
-	"io"
-)
-
-// SnapshotMeta is for metadata of a snapshot.
-type SnapshotMeta struct {
-	ID    string // ID is opaque to the store, and is used for opening
-	Index uint64
-	Term  uint64
-	Peers []byte
-	Size  int64
-}
-
-// SnapshotStore interface is used to allow for flexible implementations
-// of snapshot storage and retrieval. For example, a client could implement
-// a shared state store such as S3, allowing new nodes to restore snapshots
-// without steaming from the leader.
-type SnapshotStore interface {
-	// Create is used to begin a snapshot at a given index and term,
-	// with the current peer set already encoded.
-	Create(index, term uint64, peers []byte) (SnapshotSink, error)
-
-	// List is used to list the available snapshots in the store.
-	// It should return then in descending order, with the highest index first.
-	List() ([]*SnapshotMeta, error)
-
-	// Open takes a snapshot ID and provides a ReadCloser. Once close is
-	// called it is assumed the snapshot is no longer needed.
-	Open(id string) (*SnapshotMeta, io.ReadCloser, error)
-}
-
-// SnapshotSink is returned by StartSnapshot. The FSM will Write state
-// to the sink and call Close on completion. On error, Cancel will be invoked.
-type SnapshotSink interface {
-	io.WriteCloser
-	ID() string
-	Cancel() error
-}
diff --git a/Godeps/_workspace/src/github.com/hashicorp/raft/stable.go b/Godeps/_workspace/src/github.com/hashicorp/raft/stable.go
deleted file mode 100644
index 4588ea8a9..000000000
--- a/Godeps/_workspace/src/github.com/hashicorp/raft/stable.go
+++ /dev/null
@@ -1,15 +0,0 @@
-package raft
-
-// StableStore is used to provide stable storage
-// of key configurations to ensure safety.
-type StableStore interface {
-	Set(key []byte, val []byte) error
-
-	// Get returns the value for key, or an empty byte slice if key was not found.
-	Get(key []byte) ([]byte, error)
-
-	SetUint64(key []byte, val uint64) error
-	
-	// GetUint64 returns the uint64 value for key, or 0 if key was not found.
-	GetUint64(key []byte) (uint64, error)
-}
diff --git a/Godeps/_workspace/src/github.com/hashicorp/raft/state.go b/Godeps/_workspace/src/github.com/hashicorp/raft/state.go
deleted file mode 100644
index 41e80a1b5..000000000
--- a/Godeps/_workspace/src/github.com/hashicorp/raft/state.go
+++ /dev/null
@@ -1,169 +0,0 @@
-package raft
-
-import (
-	"sync/atomic"
-)
-
-// RaftState captures the state of a Raft node: Follower, Candidate, Leader,
-// or Shutdown.
-type RaftState uint32
-
-const (
-	// Follower is the initial state of a Raft node.
-	Follower RaftState = iota
-
-	// Candidate is one of the valid states of a Raft node.
-	Candidate
-
-	// Leader is one of the valid states of a Raft node.
-	Leader
-
-	// Shutdown is the terminal state of a Raft node.
-	Shutdown
-)
-
-func (s RaftState) String() string {
-	switch s {
-	case Follower:
-		return "Follower"
-	case Candidate:
-		return "Candidate"
-	case Leader:
-		return "Leader"
-	case Shutdown:
-		return "Shutdown"
-	default:
-		return "Unknown"
-	}
-}
-
-// raftState is used to maintain various state variables
-// and provides an interface to set/get the variables in a
-// thread safe manner.
-type raftState struct {
-	// The current term, cache of StableStore
-	currentTerm uint64
-
-	// Cache the latest log from LogStore
-	LastLogIndex uint64
-	LastLogTerm  uint64
-
-	// Highest committed log entry
-	commitIndex uint64
-
-	// Last applied log to the FSM
-	lastApplied uint64
-
-	// Cache the latest snapshot index/term
-	lastSnapshotIndex uint64
-	lastSnapshotTerm  uint64
-
-	// Tracks the number of live routines
-	runningRoutines int32
-
-	// The current state
-	state RaftState
-}
-
-func (r *raftState) getState() RaftState {
-	stateAddr := (*uint32)(&r.state)
-	return RaftState(atomic.LoadUint32(stateAddr))
-}
-
-func (r *raftState) setState(s RaftState) {
-	stateAddr := (*uint32)(&r.state)
-	atomic.StoreUint32(stateAddr, uint32(s))
-}
-
-func (r *raftState) getCurrentTerm() uint64 {
-	return atomic.LoadUint64(&r.currentTerm)
-}
-
-func (r *raftState) setCurrentTerm(term uint64) {
-	atomic.StoreUint64(&r.currentTerm, term)
-}
-
-func (r *raftState) getLastLogIndex() uint64 {
-	return atomic.LoadUint64(&r.LastLogIndex)
-}
-
-func (r *raftState) setLastLogIndex(term uint64) {
-	atomic.StoreUint64(&r.LastLogIndex, term)
-}
-
-func (r *raftState) getLastLogTerm() uint64 {
-	return atomic.LoadUint64(&r.LastLogTerm)
-}
-
-func (r *raftState) setLastLogTerm(term uint64) {
-	atomic.StoreUint64(&r.LastLogTerm, term)
-}
-
-func (r *raftState) getCommitIndex() uint64 {
-	return atomic.LoadUint64(&r.commitIndex)
-}
-
-func (r *raftState) setCommitIndex(term uint64) {
-	atomic.StoreUint64(&r.commitIndex, term)
-}
-
-func (r *raftState) getLastApplied() uint64 {
-	return atomic.LoadUint64(&r.lastApplied)
-}
-
-func (r *raftState) setLastApplied(term uint64) {
-	atomic.StoreUint64(&r.lastApplied, term)
-}
-
-func (r *raftState) getLastSnapshotIndex() uint64 {
-	return atomic.LoadUint64(&r.lastSnapshotIndex)
-}
-
-func (r *raftState) setLastSnapshotIndex(term uint64) {
-	atomic.StoreUint64(&r.lastSnapshotIndex, term)
-}
-
-func (r *raftState) getLastSnapshotTerm() uint64 {
-	return atomic.LoadUint64(&r.lastSnapshotTerm)
-}
-
-func (r *raftState) setLastSnapshotTerm(term uint64) {
-	atomic.StoreUint64(&r.lastSnapshotTerm, term)
-}
-
-func (r *raftState) incrRoutines() {
-	atomic.AddInt32(&r.runningRoutines, 1)
-}
-
-func (r *raftState) decrRoutines() {
-	atomic.AddInt32(&r.runningRoutines, -1)
-}
-
-func (r *raftState) getRoutines() int32 {
-	return atomic.LoadInt32(&r.runningRoutines)
-}
-
-// Start a goroutine and properly handle the race between a routine
-// starting and incrementing, and exiting and decrementing.
-func (r *raftState) goFunc(f func()) {
-	r.incrRoutines()
-	go func() {
-		defer r.decrRoutines()
-		f()
-	}()
-}
-
-// getLastIndex returns the last index in stable storage.
-// Either from the last log or from the last snapshot.
-func (r *raftState) getLastIndex() uint64 {
-	return max(r.getLastLogIndex(), r.getLastSnapshotIndex())
-}
-
-// getLastEntry returns the last index and term in stable storage.
-// Either from the last log or from the last snapshot.
-func (r *raftState) getLastEntry() (uint64, uint64) {
-	if r.getLastLogIndex() >= r.getLastSnapshotIndex() {
-		return r.getLastLogIndex(), r.getLastLogTerm()
-	}
-	return r.getLastSnapshotIndex(), r.getLastSnapshotTerm()
-}
diff --git a/Godeps/_workspace/src/github.com/hashicorp/raft/tcp_transport.go b/Godeps/_workspace/src/github.com/hashicorp/raft/tcp_transport.go
deleted file mode 100644
index 1b1ea9c35..000000000
--- a/Godeps/_workspace/src/github.com/hashicorp/raft/tcp_transport.go
+++ /dev/null
@@ -1,80 +0,0 @@
-package raft
-
-import (
-	"errors"
-	"io"
-	"net"
-	"time"
-)
-
-var (
-	errNotAdvertisable = errors.New("local bind address is not advertisable")
-	errNotTCP          = errors.New("local address is not a TCP address")
-)
-
-// TCPStreamLayer implements StreamLayer interface for plain TCP.
-type TCPStreamLayer struct {
-	advertise net.Addr
-	listener  *net.TCPListener
-}
-
-// NewTCPTransport returns a NetworkTransport that is built on top of
-// a TCP streaming transport layer.
-func NewTCPTransport(
-	bindAddr string,
-	advertise net.Addr,
-	maxPool int,
-	timeout time.Duration,
-	logOutput io.Writer,
-) (*NetworkTransport, error) {
-	// Try to bind
-	list, err := net.Listen("tcp", bindAddr)
-	if err != nil {
-		return nil, err
-	}
-
-	// Create stream
-	stream := &TCPStreamLayer{
-		advertise: advertise,
-		listener:  list.(*net.TCPListener),
-	}
-
-	// Verify that we have a usable advertise address
-	addr, ok := stream.Addr().(*net.TCPAddr)
-	if !ok {
-		list.Close()
-		return nil, errNotTCP
-	}
-	if addr.IP.IsUnspecified() {
-		list.Close()
-		return nil, errNotAdvertisable
-	}
-
-	// Create the network transport
-	trans := NewNetworkTransport(stream, maxPool, timeout, logOutput)
-	return trans, nil
-}
-
-// Dial implements the StreamLayer interface.
-func (t *TCPStreamLayer) Dial(address string, timeout time.Duration) (net.Conn, error) {
-	return net.DialTimeout("tcp", address, timeout)
-}
-
-// Accept implements the net.Listener interface.
-func (t *TCPStreamLayer) Accept() (c net.Conn, err error) {
-	return t.listener.Accept()
-}
-
-// Close implements the net.Listener interface.
-func (t *TCPStreamLayer) Close() (err error) {
-	return t.listener.Close()
-}
-
-// Addr implements the net.Listener interface.
-func (t *TCPStreamLayer) Addr() net.Addr {
-	// Use an advertise addr if provided
-	if t.advertise != nil {
-		return t.advertise
-	}
-	return t.listener.Addr()
-}
diff --git a/Godeps/_workspace/src/github.com/hashicorp/raft/tcp_transport_test.go b/Godeps/_workspace/src/github.com/hashicorp/raft/tcp_transport_test.go
deleted file mode 100644
index 22d59da2a..000000000
--- a/Godeps/_workspace/src/github.com/hashicorp/raft/tcp_transport_test.go
+++ /dev/null
@@ -1,24 +0,0 @@
-package raft
-
-import (
-	"net"
-	"testing"
-)
-
-func TestTCPTransport_BadAddr(t *testing.T) {
-	_, err := NewTCPTransport("0.0.0.0:0", nil, 1, 0, nil)
-	if err != errNotAdvertisable {
-		t.Fatalf("err: %v", err)
-	}
-}
-
-func TestTCPTransport_WithAdvertise(t *testing.T) {
-	addr := &net.TCPAddr{IP: []byte{127, 0, 0, 1}, Port: 12345}
-	trans, err := NewTCPTransport("0.0.0.0:0", addr, 1, 0, nil)
-	if err != nil {
-		t.Fatalf("err: %v", err)
-	}
-	if trans.LocalAddr() != "127.0.0.1:12345" {
-		t.Fatalf("bad: %v", trans.LocalAddr())
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/hashicorp/raft/transport.go b/Godeps/_workspace/src/github.com/hashicorp/raft/transport.go
deleted file mode 100644
index 8928de0c2..000000000
--- a/Godeps/_workspace/src/github.com/hashicorp/raft/transport.go
+++ /dev/null
@@ -1,85 +0,0 @@
-package raft
-
-import (
-	"io"
-	"time"
-)
-
-// RPCResponse captures both a response and a potential error.
-type RPCResponse struct {
-	Response interface{}
-	Error    error
-}
-
-// RPC has a command, and provides a response mechanism.
-type RPC struct {
-	Command  interface{}
-	Reader   io.Reader // Set only for InstallSnapshot
-	RespChan chan<- RPCResponse
-}
-
-// Respond is used to respond with a response, error or both
-func (r *RPC) Respond(resp interface{}, err error) {
-	r.RespChan <- RPCResponse{resp, err}
-}
-
-// Transport provides an interface for network transports
-// to allow Raft to communicate with other nodes.
-type Transport interface {
-	// Consumer returns a channel that can be used to
-	// consume and respond to RPC requests.
-	Consumer() <-chan RPC
-
-	// LocalAddr is used to return our local address to distinguish from our peers.
-	LocalAddr() string
-
-	// AppendEntriesPipeline returns an interface that can be used to pipeline
-	// AppendEntries requests.
-	AppendEntriesPipeline(target string) (AppendPipeline, error)
-
-	// AppendEntries sends the appropriate RPC to the target node.
-	AppendEntries(target string, args *AppendEntriesRequest, resp *AppendEntriesResponse) error
-
-	// RequestVote sends the appropriate RPC to the target node.
-	RequestVote(target string, args *RequestVoteRequest, resp *RequestVoteResponse) error
-
-	// InstallSnapshot is used to push a snapshot down to a follower. The data is read from
-	// the ReadCloser and streamed to the client.
-	InstallSnapshot(target string, args *InstallSnapshotRequest, resp *InstallSnapshotResponse, data io.Reader) error
-
-	// EncodePeer is used to serialize a peer name.
-	EncodePeer(string) []byte
-
-	// DecodePeer is used to deserialize a peer name.
-	DecodePeer([]byte) string
-
-	// SetHeartbeatHandler is used to setup a heartbeat handler
-	// as a fast-pass. This is to avoid head-of-line blocking from
-	// disk IO. If a Transport does not support this, it can simply
-	// ignore the call, and push the heartbeat onto the Consumer channel.
-	SetHeartbeatHandler(cb func(rpc RPC))
-}
-
-// AppendPipeline is used for pipelining AppendEntries requests. It is used
-// to increase the replication throughput by masking latency and better
-// utilizing bandwidth.
-type AppendPipeline interface {
-	// AppendEntries is used to add another request to the pipeline.
-	// The send may block which is an effective form of back-pressure.
-	AppendEntries(args *AppendEntriesRequest, resp *AppendEntriesResponse) (AppendFuture, error)
-
-	// Consumer returns a channel that can be used to consume
-	// response futures when they are ready.
-	Consumer() <-chan AppendFuture
-
-	// Closes pipeline and cancels all inflight RPCs
-	Close() error
-}
-
-// AppendFuture is used to return information about a pipelined AppendEntries request.
-type AppendFuture interface {
-	Future
-	Start() time.Time
-	Request() *AppendEntriesRequest
-	Response() *AppendEntriesResponse
-}
diff --git a/Godeps/_workspace/src/github.com/hashicorp/raft/util.go b/Godeps/_workspace/src/github.com/hashicorp/raft/util.go
deleted file mode 100644
index a6642c4c9..000000000
--- a/Godeps/_workspace/src/github.com/hashicorp/raft/util.go
+++ /dev/null
@@ -1,200 +0,0 @@
-package raft
-
-import (
-	"bytes"
-	crand "crypto/rand"
-	"encoding/binary"
-	"fmt"
-	"math"
-	"math/big"
-	"math/rand"
-	"time"
-
-	"github.com/hashicorp/go-msgpack/codec"
-)
-
-func init() {
-	// Ensure we use a high-entropy seed for the psuedo-random generator
-	rand.Seed(newSeed())
-}
-
-// returns an int64 from a crypto random source
-// can be used to seed a source for a math/rand.
-func newSeed() int64 {
-	r, err := crand.Int(crand.Reader, big.NewInt(math.MaxInt64))
-	if err != nil {
-		panic(fmt.Errorf("failed to read random bytes: %v", err))
-	}
-	return r.Int64()
-}
-
-// randomTimeout returns a value that is between the minVal and 2x minVal.
-func randomTimeout(minVal time.Duration) <-chan time.Time {
-	if minVal == 0 {
-		return nil
-	}
-	extra := (time.Duration(rand.Int63()) % minVal)
-	return time.After(minVal + extra)
-}
-
-// min returns the minimum.
-func min(a, b uint64) uint64 {
-	if a <= b {
-		return a
-	}
-	return b
-}
-
-// max returns the maximum.
-func max(a, b uint64) uint64 {
-	if a >= b {
-		return a
-	}
-	return b
-}
-
-// generateUUID is used to generate a random UUID.
-func generateUUID() string {
-	buf := make([]byte, 16)
-	if _, err := crand.Read(buf); err != nil {
-		panic(fmt.Errorf("failed to read random bytes: %v", err))
-	}
-
-	return fmt.Sprintf("%08x-%04x-%04x-%04x-%12x",
-		buf[0:4],
-		buf[4:6],
-		buf[6:8],
-		buf[8:10],
-		buf[10:16])
-}
-
-// asyncNotify is used to do an async channel send to
-// a list of channels. This will not block.
-func asyncNotify(chans []chan struct{}) {
-	for _, ch := range chans {
-		asyncNotifyCh(ch)
-	}
-}
-
-// asyncNotifyCh is used to do an async channel send
-// to a single channel without blocking.
-func asyncNotifyCh(ch chan struct{}) {
-	select {
-	case ch <- struct{}{}:
-	default:
-	}
-}
-
-// asyncNotifyBool is used to do an async notification
-// on a bool channel.
-func asyncNotifyBool(ch chan bool, v bool) {
-	select {
-	case ch <- v:
-	default:
-	}
-}
-
-// ExcludePeer is used to exclude a single peer from a list of peers.
-func ExcludePeer(peers []string, peer string) []string {
-	otherPeers := make([]string, 0, len(peers))
-	for _, p := range peers {
-		if p != peer {
-			otherPeers = append(otherPeers, p)
-		}
-	}
-	return otherPeers
-}
-
-// PeerContained checks if a given peer is contained in a list.
-func PeerContained(peers []string, peer string) bool {
-	for _, p := range peers {
-		if p == peer {
-			return true
-		}
-	}
-	return false
-}
-
-// AddUniquePeer is used to add a peer to a list of existing
-// peers only if it is not already contained.
-func AddUniquePeer(peers []string, peer string) []string {
-	if PeerContained(peers, peer) {
-		return peers
-	}
-	return append(peers, peer)
-}
-
-// encodePeers is used to serialize a list of peers.
-func encodePeers(peers []string, trans Transport) []byte {
-	// Encode each peer
-	var encPeers [][]byte
-	for _, p := range peers {
-		encPeers = append(encPeers, trans.EncodePeer(p))
-	}
-
-	// Encode the entire array
-	buf, err := encodeMsgPack(encPeers)
-	if err != nil {
-		panic(fmt.Errorf("failed to encode peers: %v", err))
-	}
-
-	return buf.Bytes()
-}
-
-// decodePeers is used to deserialize a list of peers.
-func decodePeers(buf []byte, trans Transport) []string {
-	// Decode the buffer first
-	var encPeers [][]byte
-	if err := decodeMsgPack(buf, &encPeers); err != nil {
-		panic(fmt.Errorf("failed to decode peers: %v", err))
-	}
-
-	// Deserialize each peer
-	var peers []string
-	for _, enc := range encPeers {
-		peers = append(peers, trans.DecodePeer(enc))
-	}
-
-	return peers
-}
-
-// Decode reverses the encode operation on a byte slice input.
-func decodeMsgPack(buf []byte, out interface{}) error {
-	r := bytes.NewBuffer(buf)
-	hd := codec.MsgpackHandle{}
-	dec := codec.NewDecoder(r, &hd)
-	return dec.Decode(out)
-}
-
-// Encode writes an encoded object to a new bytes buffer.
-func encodeMsgPack(in interface{}) (*bytes.Buffer, error) {
-	buf := bytes.NewBuffer(nil)
-	hd := codec.MsgpackHandle{}
-	enc := codec.NewEncoder(buf, &hd)
-	err := enc.Encode(in)
-	return buf, err
-}
-
-// Converts bytes to an integer.
-func bytesToUint64(b []byte) uint64 {
-	return binary.BigEndian.Uint64(b)
-}
-
-// Converts a uint64 to a byte slice.
-func uint64ToBytes(u uint64) []byte {
-	buf := make([]byte, 8)
-	binary.BigEndian.PutUint64(buf, u)
-	return buf
-}
-
-// backoff is used to compute an exponential backoff
-// duration. Base time is scaled by the current round,
-// up to some maximum scale factor.
-func backoff(base time.Duration, round, limit uint64) time.Duration {
-	power := min(round, limit)
-	for power > 2 {
-		base *= 2
-		power--
-	}
-	return base
-}
diff --git a/Godeps/_workspace/src/github.com/hashicorp/raft/util_test.go b/Godeps/_workspace/src/github.com/hashicorp/raft/util_test.go
deleted file mode 100644
index 191510972..000000000
--- a/Godeps/_workspace/src/github.com/hashicorp/raft/util_test.go
+++ /dev/null
@@ -1,187 +0,0 @@
-package raft
-
-import (
-	"reflect"
-	"regexp"
-	"testing"
-	"time"
-)
-
-func TestRandomTimeout(t *testing.T) {
-	start := time.Now()
-	timeout := randomTimeout(time.Millisecond)
-
-	select {
-	case <-timeout:
-		diff := time.Now().Sub(start)
-		if diff < time.Millisecond {
-			t.Fatalf("fired early")
-		}
-	case <-time.After(3 * time.Millisecond):
-		t.Fatalf("timeout")
-	}
-}
-
-func TestNewSeed(t *testing.T) {
-	vals := make(map[int64]bool)
-	for i := 0; i < 1000; i++ {
-		seed := newSeed()
-		if _, exists := vals[seed]; exists {
-			t.Fatal("newSeed() return a value it'd previously returned")
-		}
-		vals[seed] = true
-	}
-}
-
-func TestRandomTimeout_NoTime(t *testing.T) {
-	timeout := randomTimeout(0)
-	if timeout != nil {
-		t.Fatalf("expected nil channel")
-	}
-}
-
-func TestMin(t *testing.T) {
-	if min(1, 1) != 1 {
-		t.Fatalf("bad min")
-	}
-	if min(2, 1) != 1 {
-		t.Fatalf("bad min")
-	}
-	if min(1, 2) != 1 {
-		t.Fatalf("bad min")
-	}
-}
-
-func TestMax(t *testing.T) {
-	if max(1, 1) != 1 {
-		t.Fatalf("bad max")
-	}
-	if max(2, 1) != 2 {
-		t.Fatalf("bad max")
-	}
-	if max(1, 2) != 2 {
-		t.Fatalf("bad max")
-	}
-}
-
-func TestGenerateUUID(t *testing.T) {
-	prev := generateUUID()
-	for i := 0; i < 100; i++ {
-		id := generateUUID()
-		if prev == id {
-			t.Fatalf("Should get a new ID!")
-		}
-
-		matched, err := regexp.MatchString(
-			`[\da-f]{8}-[\da-f]{4}-[\da-f]{4}-[\da-f]{4}-[\da-f]{12}`, id)
-		if !matched || err != nil {
-			t.Fatalf("expected match %s %v %s", id, matched, err)
-		}
-	}
-}
-
-func TestAsyncNotify(t *testing.T) {
-	chs := []chan struct{}{
-		make(chan struct{}),
-		make(chan struct{}, 1),
-		make(chan struct{}, 2),
-	}
-
-	// Should not block!
-	asyncNotify(chs)
-	asyncNotify(chs)
-	asyncNotify(chs)
-
-	// Try to read
-	select {
-	case <-chs[0]:
-		t.Fatalf("should not have message!")
-	default:
-	}
-	select {
-	case <-chs[1]:
-	default:
-		t.Fatalf("should have message!")
-	}
-	select {
-	case <-chs[2]:
-	default:
-		t.Fatalf("should have message!")
-	}
-	select {
-	case <-chs[2]:
-	default:
-		t.Fatalf("should have message!")
-	}
-}
-
-func TestExcludePeer(t *testing.T) {
-	peers := []string{NewInmemAddr(), NewInmemAddr(), NewInmemAddr()}
-	peer := peers[2]
-
-	after := ExcludePeer(peers, peer)
-	if len(after) != 2 {
-		t.Fatalf("Bad length")
-	}
-	if after[0] == peer || after[1] == peer {
-		t.Fatalf("should not contain peer")
-	}
-}
-
-func TestPeerContained(t *testing.T) {
-	peers := []string{NewInmemAddr(), NewInmemAddr(), NewInmemAddr()}
-
-	if !PeerContained(peers, peers[2]) {
-		t.Fatalf("Expect contained")
-	}
-	if PeerContained(peers, NewInmemAddr()) {
-		t.Fatalf("unexpected contained")
-	}
-}
-
-func TestAddUniquePeer(t *testing.T) {
-	peers := []string{NewInmemAddr(), NewInmemAddr(), NewInmemAddr()}
-	after := AddUniquePeer(peers, peers[2])
-	if !reflect.DeepEqual(after, peers) {
-		t.Fatalf("unexpected append")
-	}
-	after = AddUniquePeer(peers, NewInmemAddr())
-	if len(after) != 4 {
-		t.Fatalf("expected append")
-	}
-}
-
-func TestEncodeDecodePeers(t *testing.T) {
-	peers := []string{NewInmemAddr(), NewInmemAddr(), NewInmemAddr()}
-	_, trans := NewInmemTransport()
-
-	// Try to encode/decode
-	buf := encodePeers(peers, trans)
-	decoded := decodePeers(buf, trans)
-
-	if !reflect.DeepEqual(peers, decoded) {
-		t.Fatalf("mismatch %v %v", peers, decoded)
-	}
-}
-
-func TestBackoff(t *testing.T) {
-	b := backoff(10*time.Millisecond, 1, 8)
-	if b != 10*time.Millisecond {
-		t.Fatalf("bad: %v", b)
-	}
-
-	b = backoff(20*time.Millisecond, 2, 8)
-	if b != 20*time.Millisecond {
-		t.Fatalf("bad: %v", b)
-	}
-
-	b = backoff(10*time.Millisecond, 8, 8)
-	if b != 640*time.Millisecond {
-		t.Fatalf("bad: %v", b)
-	}
-
-	b = backoff(10*time.Millisecond, 9, 8)
-	if b != 640*time.Millisecond {
-		t.Fatalf("bad: %v", b)
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/.gitignore b/Godeps/_workspace/src/github.com/influxdb/influxdb/.gitignore
deleted file mode 100644
index 50c31e055..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/.gitignore
+++ /dev/null
@@ -1,75 +0,0 @@
-*~
-src/
-
-config.json
-/bin/
-
-TAGS
-
-# vim temp files
-*.swp
-
-*.test
-/query/a.out*
-.DS_Store
-
-# ignore generated files.
-cmd/influxd/version.go
-
-# executables
-
-influx_stress
-**/influx_stress
-!**/influx_stress/
-
-influxd
-**/influxd
-!**/influxd/
-
-influx
-**/influx
-!**/influx/
-
-influxdb
-**/influxdb
-!**/influxdb/
-
-influx_inspect
-**/influx_inspect
-!**/influx_inspect/
-
-/benchmark-tool
-/main
-/benchmark-storage
-godef
-gosym
-gocode
-inspect-raft
-
-# dependencies
-out_rpm/
-packages/
-
-# autconf
-autom4te.cache/
-config.log
-config.status
-
-# log file
-influxdb.log
-benchmark.log
-
-# config file
-config.toml
-
-# test data files
-integration/migration_data/
-
-# goide project files
-.idea
-
-# goconvey config files
-*.goconvey
-
-// Ingnore SourceGraph directory
-.srclib-store/
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/CHANGELOG.md b/Godeps/_workspace/src/github.com/influxdb/influxdb/CHANGELOG.md
deleted file mode 100644
index 3f84419b9..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/CHANGELOG.md
+++ /dev/null
@@ -1,1784 +0,0 @@
-## v0.9.5 [unreleased]
-
-### Release Notes
-- Field names for the internal stats have been changed to be more inline with Go style.
-- 0.9.5 is reverting to Go 1.4.2 due to unresolved issues with Go 1.5.1.
-
-### Features
-- [#4098](https://github.com/influxdb/influxdb/pull/4702): Support 'history' command at CLI
-- [#4098](https://github.com/influxdb/influxdb/issues/4098): Enable `golint` on the code base - uuid subpackage
-- [#4141](https://github.com/influxdb/influxdb/pull/4141): Control whether each query should be logged
-- [#4065](https://github.com/influxdb/influxdb/pull/4065): Added precision support in cmd client. Thanks @sbouchex
-- [#4140](https://github.com/influxdb/influxdb/pull/4140): Make storage engine configurable
-- [#4161](https://github.com/influxdb/influxdb/pull/4161): Implement bottom selector function
-- [#4204](https://github.com/influxdb/influxdb/pull/4204): Allow module-level selection for SHOW STATS
-- [#4208](https://github.com/influxdb/influxdb/pull/4208): Allow module-level selection for SHOW DIAGNOSTICS
-- [#4196](https://github.com/influxdb/influxdb/pull/4196): Export tsdb.Iterator
-- [#4198](https://github.com/influxdb/influxdb/pull/4198): Add basic cluster-service stats
-- [#4262](https://github.com/influxdb/influxdb/pull/4262): Allow configuration of UDP retention policy
-- [#4265](https://github.com/influxdb/influxdb/pull/4265): Add statistics for Hinted-Handoff
-- [#4284](https://github.com/influxdb/influxdb/pull/4284): Add exponential backoff for hinted-handoff failures
-- [#4310](https://github.com/influxdb/influxdb/pull/4310): Support dropping non-Raft nodes. Work mostly by @corylanou
-- [#4348](https://github.com/influxdb/influxdb/pull/4348): Public ApplyTemplate function for graphite parser.
-- [#4178](https://github.com/influxdb/influxdb/pull/4178): Support fields in graphite parser. Thanks @roobert!
-- [#4409](https://github.com/influxdb/influxdb/pull/4409): wire up INTO queries.
-- [#4379](https://github.com/influxdb/influxdb/pull/4379): Auto-create database for UDP input.
-- [#4375](https://github.com/influxdb/influxdb/pull/4375): Add Subscriptions so data can be 'forked' out of InfluxDB to another third party.
-- [#4506](https://github.com/influxdb/influxdb/pull/4506): Register with Enterprise service and upload stats, if token is available.
-- [#4516](https://github.com/influxdb/influxdb/pull/4516): Hinted-handoff refactor, with new statistics and diagnostics
-- [#4501](https://github.com/influxdb/influxdb/pull/4501): Allow filtering SHOW MEASUREMENTS by regex.
-- [#4547](https://github.com/influxdb/influxdb/pull/4547): Allow any node to be dropped, even a raft node (even the leader).
-- [#4600](https://github.com/influxdb/influxdb/pull/4600): ping endpoint can wait for leader
-- [#4648](https://github.com/influxdb/influxdb/pull/4648): UDP Client (v2 client)
-- [#4690](https://github.com/influxdb/influxdb/pull/4690): SHOW SHARDS now includes database and policy. Thanks @pires
-- [#4676](https://github.com/influxdb/influxdb/pull/4676): UDP service listener performance enhancements
-- [#4659](https://github.com/influxdb/influxdb/pull/4659): Support IF EXISTS for DROP DATABASE. Thanks @ch33hau
-- [#4721](https://github.com/influxdb/influxdb/pull/4721): Export tsdb.InterfaceValues
-- [#4681](https://github.com/influxdb/influxdb/pull/4681): Increase default buffer size for collectd and graphite listeners
-- [#4659](https://github.com/influxdb/influxdb/pull/4659): Support IF EXISTS for DROP DATABASE
-- [#4685](https://github.com/influxdb/influxdb/pull/4685): Automatically promote node to raft peer if drop server results in removing a raft peer.
-
-### Bugfixes
-- [#4715](https://github.com/influxdb/influxdb/pull/4715): Fix panic during Raft-close. Fix [issue #4707](https://github.com/influxdb/influxdb/issues/4707). Thanks @oiooj
-- [#4643](https://github.com/influxdb/influxdb/pull/4643): Fix panic during backup restoration. Thanks @oiooj
-- [#4632](https://github.com/influxdb/influxdb/pull/4632): Fix parsing of IPv6 hosts in client package. Thanks @miguelxpn
-- [#4389](https://github.com/influxdb/influxdb/pull/4389): Don't add a new segment file on each hinted-handoff purge cycle.
-- [#4166](https://github.com/influxdb/influxdb/pull/4166): Fix parser error on invalid SHOW
-- [#3457](https://github.com/influxdb/influxdb/issues/3457): [0.9.3] cannot select field names with prefix + "." that match the measurement name
-- [#4704](https://github.com/influxdb/influxdb/pull/4704). Tighten up command parsing within CLI. Thanks @pires
-- [#4225](https://github.com/influxdb/influxdb/pull/4225): Always display diags in name-sorted order
-- [#4111](https://github.com/influxdb/influxdb/pull/4111): Update pre-commit hook for go vet composites
-- [#4136](https://github.com/influxdb/influxdb/pull/4136): Return an error-on-write if target retention policy does not exist. Thanks for the report @ymettier
-- [#4228](https://github.com/influxdb/influxdb/pull/4228): Add build timestamp to version information.
-- [#4124](https://github.com/influxdb/influxdb/issues/4124): Missing defer/recover/panic idiom in HTTPD service
-- [#4238](https://github.com/influxdb/influxdb/pull/4238): Fully disable hinted-handoff service if so requested.
-- [#4165](https://github.com/influxdb/influxdb/pull/4165): Tag all Go runtime stats when writing to internal database.
-- [#4586](https://github.com/influxdb/influxdb/pull/4586): Exit when invalid engine is selected
-- [#4118](https://github.com/influxdb/influxdb/issues/4118): Return consistent, correct result for SHOW MEASUREMENTS with multiple AND conditions
-- [#4191](https://github.com/influxdb/influxdb/pull/4191): Correctly marshal remote mapper responses. Fixes [#4170](https://github.com/influxdb/influxdb/issues/4170)
-- [#4222](https://github.com/influxdb/influxdb/pull/4222): Graphite TCP connections should not block shutdown
-- [#4180](https://github.com/influxdb/influxdb/pull/4180): Cursor & SelectMapper Refactor
-- [#1577](https://github.com/influxdb/influxdb/issues/1577): selectors (e.g. min, max, first, last) should have equivalents to return the actual point
-- [#4264](https://github.com/influxdb/influxdb/issues/4264): Refactor map functions to use list of values
-- [#4278](https://github.com/influxdb/influxdb/pull/4278): Fix error marshalling across the cluster
-- [#4149](https://github.com/influxdb/influxdb/pull/4149): Fix derivative unnecessarily requires aggregate function.  Thanks @peekeri!
-- [#4674](https://github.com/influxdb/influxdb/pull/4674): Fix panic during restore. Thanks @simcap.
-- [#4725](https://github.com/influxdb/influxdb/pull/4725): Don't list deleted shards during SHOW SHARDS.
-- [#4237](https://github.com/influxdb/influxdb/issues/4237): DERIVATIVE() edge conditions
-- [#4263](https://github.com/influxdb/influxdb/issues/4263): derivative does not work when data is missing
-- [#4293](https://github.com/influxdb/influxdb/pull/4293): Ensure shell is invoked when touching PID file. Thanks @christopherjdickson
-- [#4296](https://github.com/influxdb/influxdb/pull/4296): Reject line protocol ending with '-'. Fixes [#4272](https://github.com/influxdb/influxdb/issues/4272)
-- [#4333](https://github.com/influxdb/influxdb/pull/4333): Retry monitor storage creation and storage only on Leader.
-- [#4276](https://github.com/influxdb/influxdb/issues/4276): Walk DropSeriesStatement & check for empty sources
-- [#4465](https://github.com/influxdb/influxdb/pull/4465): Actually display a message if the CLI can't connect to the database.
-- [#4342](https://github.com/influxdb/influxdb/pull/4342): Fix mixing aggregates and math with non-aggregates. Thanks @kostya-sh.
-- [#4349](https://github.com/influxdb/influxdb/issues/4349): If HH can't unmarshal a block, skip that block.
-- [#4502](https://github.com/influxdb/influxdb/pull/4502): Don't crash on Graphite close, if Graphite not fully open. Thanks for the report @ranjib
-- [#4354](https://github.com/influxdb/influxdb/pull/4353): Fully lock node queues during hinted handoff. Fixes one cause of missing data on clusters.
-- [#4357](https://github.com/influxdb/influxdb/issues/4357): Fix similar float values encoding overflow Thanks @dgryski!
-- [#4344](https://github.com/influxdb/influxdb/issues/4344): Make client.Write default to client.precision if none is given.
-- [#3429](https://github.com/influxdb/influxdb/issues/3429): Incorrect parsing of regex containing '/'
-- [#4374](https://github.com/influxdb/influxdb/issues/4374): Add tsm1 quickcheck tests
-- [#4644](https://github.com/influxdb/influxdb/pull/4644): Check for response errors during token check, fixes issue [#4641](https://github.com/influxdb/influxdb/issues/4641)
-- [#4377](https://github.com/influxdb/influxdb/pull/4377): Hinted handoff should not process dropped nodes
-- [#4365](https://github.com/influxdb/influxdb/issues/4365): Prevent panic in DecodeSameTypeBlock
-- [#4280](https://github.com/influxdb/influxdb/issues/4280): Only drop points matching WHERE clause
-- [#4443](https://github.com/influxdb/influxdb/pull/4443): Fix race condition while listing store's shards. Fixes [#4442](https://github.com/influxdb/influxdb/issues/4442)
-- [#4410](https://github.com/influxdb/influxdb/pull/4410): Fix infinite recursion in statement string(). Thanks @kostya-sh
-- [#4360](https://github.com/influxdb/influxdb/issues/4360): Aggregate Selectors overwrite values during post-processing
-- [#4421](https://github.com/influxdb/influxdb/issues/4421): Fix line protocol accepting tags with no values
-- [#4434](https://github.com/influxdb/influxdb/pull/4434): Allow 'E' for scientific values. Fixes [#4433](https://github.com/influxdb/influxdb/issues/4433)
-- [#4431](https://github.com/influxdb/influxdb/issues/4431): Add tsm1 WAL QuickCheck
-- [#4438](https://github.com/influxdb/influxdb/pull/4438): openTSDB service shutdown fixes
-- [#4447](https://github.com/influxdb/influxdb/pull/4447): Fixes to logrotate file. Thanks @linsomniac.
-- [#3820](https://github.com/influxdb/influxdb/issues/3820): Fix js error in admin UI.
-- [#4460](https://github.com/influxdb/influxdb/issues/4460): tsm1 meta lint
-- [#4415](https://github.com/influxdb/influxdb/issues/4415): Selector (like max, min, first, etc) return a string instead of timestamp
-- [#4472](https://github.com/influxdb/influxdb/issues/4472): Fix 'too many points in GROUP BY interval' error
-- [#4475](https://github.com/influxdb/influxdb/issues/4475): Fix SHOW TAG VALUES error message.
-- [#4486](https://github.com/influxdb/influxdb/pull/4486): Fix missing comments for runner package
-- [#4497](https://github.com/influxdb/influxdb/pull/4497): Fix sequence in meta proto
-- [#3367](https://github.com/influxdb/influxdb/issues/3367): Negative timestamps are parsed correctly by the line protocol.
-- [#4563](https://github.com/influxdb/influxdb/pull/4536): Fix broken subscriptions updates.
-- [#4538](https://github.com/influxdb/influxdb/issues/4538): Dropping database under a write load causes panics
-- [#4582](https://github.com/influxdb/influxdb/pull/4582): Correct logging tags in cluster and TCP package. Thanks @oiooj
-- [#4513](https://github.com/influxdb/influxdb/issues/4513): TSM1: panic: runtime error: index out of range
-- [#4521](https://github.com/influxdb/influxdb/issues/4521): TSM1: panic: decode of short block: got 1, exp 9
-- [#4587](https://github.com/influxdb/influxdb/pull/4587): Prevent NaN float values from being stored
-- [#4596](https://github.com/influxdb/influxdb/pull/4596): Skip empty string for start position when parsing line protocol @Thanks @ch33hau
-- [#4610](https://github.com/influxdb/influxdb/pull/4610): Make internal stats names consistent with Go style.
-- [#4625](https://github.com/influxdb/influxdb/pull/4625): Correctly handle bad write requests. Thanks @oiooj.
-- [#4650](https://github.com/influxdb/influxdb/issues/4650): Importer should skip empty lines
-- [#4651](https://github.com/influxdb/influxdb/issues/4651): Importer doesn't flush out last batch
-- [#4602](https://github.com/influxdb/influxdb/issues/4602): Fixes data race between PointsWriter and Subscriber services.
-- [#4691](https://github.com/influxdb/influxdb/issues/4691): Enable toml test `TestConfig_Encode`.
-- [#4283](https://github.com/influxdb/influxdb/pull/4283): Disable HintedHandoff if configuration is not set.
-- [#4703](https://github.com/influxdb/influxdb/pull/4703): Complete lint for cmd/influx. Thanks @pablolmiranda
-
-## v0.9.4 [2015-09-14]
-
-### Release Notes
-With this release InfluxDB is moving to Go 1.5.
-
-### Features
-- [#4050](https://github.com/influxdb/influxdb/pull/4050): Add stats to collectd
-- [#3771](https://github.com/influxdb/influxdb/pull/3771): Close idle Graphite TCP connections
-- [#3755](https://github.com/influxdb/influxdb/issues/3755): Add option to build script. Thanks @fg2it
-- [#3863](https://github.com/influxdb/influxdb/pull/3863): Move to Go 1.5
-- [#3892](https://github.com/influxdb/influxdb/pull/3892): Support IF NOT EXISTS for CREATE DATABASE
-- [#3916](https://github.com/influxdb/influxdb/pull/3916): New statistics and diagnostics support. Graphite first to be instrumented.
-- [#3901](https://github.com/influxdb/influxdb/pull/3901): Add consistency level option to influx cli Thanks @takayuki
-- [#4048](https://github.com/influxdb/influxdb/pull/4048): Add statistics to Continuous Query service
-- [#4049](https://github.com/influxdb/influxdb/pull/4049): Add stats to the UDP input
-- [#3876](https://github.com/influxdb/influxdb/pull/3876): Allow the following syntax in CQs: INTO "1hPolicy".:MEASUREMENT
-- [#3975](https://github.com/influxdb/influxdb/pull/3975): Add shard copy service
-- [#3986](https://github.com/influxdb/influxdb/pull/3986): Support sorting by time desc
-- [#3930](https://github.com/influxdb/influxdb/pull/3930): Wire up TOP aggregate function - fixes [#1821](https://github.com/influxdb/influxdb/issues/1821)
-- [#4045](https://github.com/influxdb/influxdb/pull/4045): Instrument cluster-level points writer
-- [#3996](https://github.com/influxdb/influxdb/pull/3996): Add statistics to httpd package
-- [#4003](https://github.com/influxdb/influxdb/pull/4033): Add logrotate configuration.
-- [#4043](https://github.com/influxdb/influxdb/pull/4043): Add stats and batching to openTSDB input
-- [#4042](https://github.com/influxdb/influxdb/pull/4042): Add pending batches control to batcher
-- [#4006](https://github.com/influxdb/influxdb/pull/4006): Add basic statistics for shards
-- [#4072](https://github.com/influxdb/influxdb/pull/4072): Add statistics for the WAL.
-
-### Bugfixes
-- [#4042](https://github.com/influxdb/influxdb/pull/4042): Set UDP input batching defaults as needed.
-- [#3785](https://github.com/influxdb/influxdb/issues/3785): Invalid time stamp in graphite metric causes panic
-- [#3804](https://github.com/influxdb/influxdb/pull/3804): init.d script fixes, fixes issue 3803.
-- [#3823](https://github.com/influxdb/influxdb/pull/3823): Deterministic ordering for first() and last()
-- [#3869](https://github.com/influxdb/influxdb/issues/3869): Seemingly deadlocked when ingesting metrics via graphite plugin
-- [#3856](https://github.com/influxdb/influxdb/pull/3856): Minor changes to retention enforcement.
-- [#3884](https://github.com/influxdb/influxdb/pull/3884): Fix two panics in WAL that can happen at server startup
-- [#3868](https://github.com/influxdb/influxdb/pull/3868): Add shell option to start the daemon on CentOS. Thanks @SwannCroiset.
-- [#3886](https://github.com/influxdb/influxdb/pull/3886): Prevent write timeouts due to lock contention in WAL
-- [#3574](https://github.com/influxdb/influxdb/issues/3574): Querying data node causes panic
-- [#3913](https://github.com/influxdb/influxdb/issues/3913): Convert meta shard owners to objects
-- [#4026](https://github.com/influxdb/influxdb/pull/4026): Support multiple Graphite inputs. Fixes issue [#3636](https://github.com/influxdb/influxdb/issues/3636)
-- [#3927](https://github.com/influxdb/influxdb/issues/3927): Add WAL lock to prevent timing lock contention
-- [#3928](https://github.com/influxdb/influxdb/issues/3928): Write fails for multiple points when tag starts with quote
-- [#3901](https://github.com/influxdb/influxdb/pull/3901): Unblock relaxed write consistency level Thanks @takayuki!
-- [#3950](https://github.com/influxdb/influxdb/pull/3950): Limit bz1 quickcheck tests to 10 iterations on CI
-- [#3977](https://github.com/influxdb/influxdb/pull/3977): Silence wal logging during testing
-- [#3931](https://github.com/influxdb/influxdb/pull/3931): Don't precreate shard groups entirely in the past
-- [#3960](https://github.com/influxdb/influxdb/issues/3960): possible "catch up" bug with nodes down in a cluster
-- [#3980](https://github.com/influxdb/influxdb/pull/3980): 'service stop' waits until service actually stops. Fixes issue #3548.
-- [#4016](https://github.com/influxdb/influxdb/pull/4016): Shutdown Graphite UDP on SIGTERM.
-- [#4034](https://github.com/influxdb/influxdb/pull/4034): Rollback bolt tx on mapper open error
-- [#3848](https://github.com/influxdb/influxdb/issues/3848): restart influxdb causing panic
-- [#3881](https://github.com/influxdb/influxdb/issues/3881): panic: runtime error: invalid memory address or nil pointer dereference
-- [#3926](https://github.com/influxdb/influxdb/issues/3926): First or last value of `GROUP BY time(x)` is often null. Fixed by [#4038](https://github.com/influxdb/influxdb/pull/4038)
-- [#4053](https://github.com/influxdb/influxdb/pull/4053): Prohibit dropping default retention policy.
-- [#4060](https://github.com/influxdb/influxdb/pull/4060): Don't log EOF error in openTSDB input.
-- [#3978](https://github.com/influxdb/influxdb/issues/3978): [0.9.3] (regression) cannot use GROUP BY * with more than a single field in SELECT clause
-- [#4058](https://github.com/influxdb/influxdb/pull/4058): Disable bz1 recompression
-- [#3902](https://github.com/influxdb/influxdb/issues/3902): [0.9.3] DB should not crash when using invalid expression "GROUP BY time"
-- [#3718](https://github.com/influxdb/influxdb/issues/3718): Derivative query with group by time but no aggregate function should fail parse
-
-## v0.9.3 [2015-08-26]
-
-### Release Notes
-
-There are breaking changes in this release.
- - To store data points as integers you must now append `i` to the number if using the line protocol.
- - If you have a UDP input configured, you should check the UDP section of [the new sample configuration file](https://github.com/influxdb/influxdb/blob/master/etc/config.sample.toml) to learn how to modify existing configuration files, as 0.9.3 now expects multiple UDP inputs.
- - Configuration files must now have an entry for `wal-dir` in the `[data]` section. Check [new sample configuration file](https://github.com/influxdb/influxdb/blob/master/etc/config.sample.toml) for more details.
- - The implicit `GROUP BY *` that was added to every `SELECT *` has been removed. Instead any tags in the data are now part of the columns in the returned query.
-
-Please see the *Features* section below for full details.
-
-### Features
-- [#3376](https://github.com/influxdb/influxdb/pull/3376): Support for remote shard query mapping
-- [#3372](https://github.com/influxdb/influxdb/pull/3372): Support joining nodes to existing cluster
-- [#3426](https://github.com/influxdb/influxdb/pull/3426): Additional logging for continuous queries. Thanks @jhorwit2
-- [#3478](https://github.com/influxdb/influxdb/pull/3478): Support incremental cluster joins
-- [#3519](https://github.com/influxdb/influxdb/pull/3519): **--BREAKING CHANGE--** Update line protocol to require trailing i for field values that are integers
-- [#3529](https://github.com/influxdb/influxdb/pull/3529): Add TLS support for OpenTSDB plugin. Thanks @nathanielc
-- [#3421](https://github.com/influxdb/influxdb/issues/3421): Should update metastore and cluster if IP or hostname changes
-- [#3502](https://github.com/influxdb/influxdb/pull/3502): Importer for 0.8.9 data via the CLI
-- [#3564](https://github.com/influxdb/influxdb/pull/3564): Fix alias, maintain column sort order
-- [#3585](https://github.com/influxdb/influxdb/pull/3585): Additional test coverage for non-existent fields
-- [#3246](https://github.com/influxdb/influxdb/issues/3246): Allow overriding of configuration parameters using environment variables
-- [#3599](https://github.com/influxdb/influxdb/pull/3599): **--BREAKING CHANGE--** Support multiple UDP inputs. Thanks @tpitale
-- [#3636](https://github.com/influxdb/influxdb/pull/3639): Cap auto-created retention policy replica count at 3
-- [#3641](https://github.com/influxdb/influxdb/pull/3641): Logging enhancements and single-node rename
-- [#3635](https://github.com/influxdb/influxdb/pull/3635): Add build branch to version output.
-- [#3115](https://github.com/influxdb/influxdb/pull/3115): Various init.d script improvements. Thanks @KoeSystems.
-- [#3628](https://github.com/influxdb/influxdb/pull/3628): Wildcard expansion of tags and fields for raw queries
-- [#3721](https://github.com/influxdb/influxdb/pull/3721): interpret number literals compared against time as nanoseconds from epoch
-- [#3514](https://github.com/influxdb/influxdb/issues/3514): Implement WAL outside BoltDB with compaction
-- [#3544](https://github.com/influxdb/influxdb/pull/3544): Implement compression on top of BoltDB
-- [#3795](https://github.com/influxdb/influxdb/pull/3795): Throttle import
-- [#3584](https://github.com/influxdb/influxdb/pull/3584): Import/export documenation
-
-### Bugfixes
-- [#3405](https://github.com/influxdb/influxdb/pull/3405): Prevent database panic when fields are missing. Thanks @jhorwit2
-- [#3411](https://github.com/influxdb/influxdb/issues/3411): 500 timeout on write
-- [#3420](https://github.com/influxdb/influxdb/pull/3420): Catch opentsdb malformed tags. Thanks @nathanielc.
-- [#3404](https://github.com/influxdb/influxdb/pull/3404): Added support for escaped single quotes in query string. Thanks @jhorwit2
-- [#3414](https://github.com/influxdb/influxdb/issues/3414): Shard mappers perform query re-writing
-- [#3525](https://github.com/influxdb/influxdb/pull/3525): check if fields are valid during parse time.
-- [#3511](https://github.com/influxdb/influxdb/issues/3511): Sending a large number of tag causes panic
-- [#3288](https://github.com/influxdb/influxdb/issues/3288): Run go fuzz on the line-protocol input
-- [#3545](https://github.com/influxdb/influxdb/issues/3545): Fix parsing string fields with newlines
-- [#3579](https://github.com/influxdb/influxdb/issues/3579): Revert breaking change to `client.NewClient` function
-- [#3580](https://github.com/influxdb/influxdb/issues/3580): Do not allow wildcards with fields in select statements
-- [#3530](https://github.com/influxdb/influxdb/pull/3530): Aliasing a column no longer works
-- [#3436](https://github.com/influxdb/influxdb/issues/3436): Fix panic in hinted handoff queue processor
-- [#3401](https://github.com/influxdb/influxdb/issues/3401): Derivative on non-numeric fields panics db
-- [#3583](https://github.com/influxdb/influxdb/issues/3583): Inserting value in scientific notation with a trailing i causes panic
-- [#3611](https://github.com/influxdb/influxdb/pull/3611): Fix query arithmetic with integers
-- [#3326](https://github.com/influxdb/influxdb/issues/3326): simple regex query fails with cryptic error
-- [#3618](https://github.com/influxdb/influxdb/pull/3618): Fix collectd stats panic on i386. Thanks @richterger
-- [#3625](https://github.com/influxdb/influxdb/pull/3625): Don't panic when aggregate and raw queries are in a single statement
-- [#3629](https://github.com/influxdb/influxdb/pull/3629): Use sensible batching defaults for Graphite.
-- [#3638](https://github.com/influxdb/influxdb/pull/3638): Cluster config fixes and removal of meta.peers config field
-- [#3640](https://github.com/influxdb/influxdb/pull/3640): Shutdown Graphite service when signal received.
-- [#3632](https://github.com/influxdb/influxdb/issues/3632): Make single-node host renames more seamless
-- [#3656](https://github.com/influxdb/influxdb/issues/3656): Silence snapshotter logger for testing
-- [#3651](https://github.com/influxdb/influxdb/pull/3651): Fully remove series when dropped.
-- [#3517](https://github.com/influxdb/influxdb/pull/3517): Batch CQ writes to avoid timeouts. Thanks @dim.
-- [#3522](https://github.com/influxdb/influxdb/pull/3522): Consume CQ results on request timeouts. Thanks @dim.
-- [#3646](https://github.com/influxdb/influxdb/pull/3646): Fix nil FieldCodec panic.
-- [#3672](https://github.com/influxdb/influxdb/pull/3672): Reduce in-memory index by 20%-30%
-- [#3673](https://github.com/influxdb/influxdb/pull/3673): Improve query performance by removing unnecessary tagset sorting.
-- [#3676](https://github.com/influxdb/influxdb/pull/3676): Improve query performance by memomizing mapper output keys.
-- [#3686](https://github.com/influxdb/influxdb/pull/3686): Ensure 'p' parameter is not logged, even on OPTIONS requests.
-- [#3687](https://github.com/influxdb/influxdb/issues/3687): Fix panic: runtime error: makeslice: len out of range in hinted handoff
-- [#3697](https://github.com/influxdb/influxdb/issues/3697):  Correctly merge non-chunked results for same series. Fix issue #3242.
-- [#3708](https://github.com/influxdb/influxdb/issues/3708): Fix double escaping measurement name during cluster replication
-- [#3704](https://github.com/influxdb/influxdb/issues/3704): cluster replication issue for measurement name containing backslash
-- [#3681](https://github.com/influxdb/influxdb/issues/3681): Quoted measurement names fail
-- [#3681](https://github.com/influxdb/influxdb/issues/3682): Fix inserting string value with backslashes
-- [#3735](https://github.com/influxdb/influxdb/issues/3735): Append to small bz1 blocks
-- [#3736](https://github.com/influxdb/influxdb/pull/3736): Update shard group duration with retention policy changes. Thanks for the report @papylhomme
-- [#3539](https://github.com/influxdb/influxdb/issues/3539): parser incorrectly accepts NaN as numerical value, but not always
-- [#3790](https://github.com/influxdb/influxdb/pull/3790): Fix line protocol parsing equals in measurements and NaN values
-- [#3778](https://github.com/influxdb/influxdb/pull/3778): Don't panic if SELECT on time.
-- [#3824](https://github.com/influxdb/influxdb/issues/3824): tsdb.Point.MarshalBinary needs to support all number types
-- [#3828](https://github.com/influxdb/influxdb/pull/3828): Support all number types when decoding a point
-- [#3853](https://github.com/influxdb/influxdb/pull/3853): Use 4KB default block size for bz1
-- [#3607](https://github.com/influxdb/influxdb/issues/3607): Fix unable to query influxdb due to deadlock in metastore.  Thanks @ccutrer!
-
-## v0.9.2 [2015-07-24]
-
-### Features
-- [#3177](https://github.com/influxdb/influxdb/pull/3177): Client supports making HTTPS requests. Thanks @jipperinbham
-- [#3299](https://github.com/influxdb/influxdb/pull/3299): Refactor query engine for distributed query support.
-- [#3334](https://github.com/influxdb/influxdb/pull/3334): Clean shutdown of influxd. Thanks @mcastilho
-
-### Bugfixes
-
-- [#3180](https://github.com/influxdb/influxdb/pull/3180): Log GOMAXPROCS, version, and commit on startup.
-- [#3218](https://github.com/influxdb/influxdb/pull/3218): Allow write timeouts to be configurable.
-- [#3184](https://github.com/influxdb/influxdb/pull/3184): Support basic auth in admin interface. Thanks @jipperinbham!
-- [#3236](https://github.com/influxdb/influxdb/pull/3236): Fix display issues in admin interface.
-- [#3232](https://github.com/influxdb/influxdb/pull/3232): Set logging prefix for metastore.
-- [#3230](https://github.com/influxdb/influxdb/issues/3230): panic: unable to parse bool value
-- [#3245](https://github.com/influxdb/influxdb/issues/3245): Error using graphite plugin with multiple filters
-- [#3223](https://github.com/influxdb/influxdb/issues/323): default graphite template cannot have extra tags
-- [#3255](https://github.com/influxdb/influxdb/pull/3255): Flush WAL on start-up as soon as possible.
-- [#3289](https://github.com/influxdb/influxdb/issues/3289): InfluxDB crashes on floats without decimal
-- [#3298](https://github.com/influxdb/influxdb/pull/3298): Corrected WAL & flush parameters in default config. Thanks @jhorwit2
-- [#3152](https://github.com/influxdb/influxdb/issues/3159): High CPU Usage with unsorted writes
-- [#3307](https://github.com/influxdb/influxdb/pull/3307): Fix regression parsing boolean values True/False
-- [#3304](https://github.com/influxdb/influxdb/pull/3304): Fixed httpd logger to log user from query params. Thanks @jhorwit2
-- [#3332](https://github.com/influxdb/influxdb/pull/3332): Add SLIMIT and SOFFSET to string version of AST.
-- [#3335](https://github.com/influxdb/influxdb/pull/3335): Don't drop all data on DROP DATABASE. Thanks to @PierreF for the report
-- [#2761](https://github.com/influxdb/influxdb/issues/2761): Make SHOW RETENTION POLICIES consistent with other queries.
-- [#3356](https://github.com/influxdb/influxdb/pull/3356): Disregard semicolons after database name in use command. Thanks @timraymond.
-- [#3351](https://github.com/influxdb/influxdb/pull/3351): Handle malformed regex comparisons during parsing. Thanks @rnubel
-- [#3244](https://github.com/influxdb/influxdb/pull/3244): Wire up admin privilege grant and revoke.
-- [#3259](https://github.com/influxdb/influxdb/issues/3259): Respect privileges for queries.
-- [#3256](https://github.com/influxdb/influxdb/pull/3256): Remove unnecessary timeout in WaitForLeader(). Thanks @cannium.
-- [#3380](https://github.com/influxdb/influxdb/issue/3380): Parser fix, only allow ORDER BY ASC and ORDER BY time ASC.
-- [#3319](https://github.com/influxdb/influxdb/issues/3319): restarting process irrevocably BREAKS measurements with spaces
-- [#3453](https://github.com/influxdb/influxdb/issues/3453): Remove outdated `dump` command from CLI.
-- [#3463](https://github.com/influxdb/influxdb/issues/3463): Fix aggregate queries and time precision on where clauses.
-
-## v0.9.1 [2015-07-02]
-
-### Features
-
-- [2650](https://github.com/influxdb/influxdb/pull/2650): Add SHOW GRANTS FOR USER statement. Thanks @n1tr0g.
-- [3125](https://github.com/influxdb/influxdb/pull/3125): Graphite Input Protocol Parsing
-- [2746](https://github.com/influxdb/influxdb/pull/2746): New Admin UI/interface
-- [3036](https://github.com/influxdb/influxdb/pull/3036): Write Ahead Log (WAL)
-- [3014](https://github.com/influxdb/influxdb/issues/3014): Implement Raft snapshots
-
-### Bugfixes
-
-- [3013](https://github.com/influxdb/influxdb/issues/3013): Panic error with inserting values with commas
-- [#2956](https://github.com/influxdb/influxdb/issues/2956): Type mismatch in derivative
-- [#2908](https://github.com/influxdb/influxdb/issues/2908): Field mismatch error messages need to be updated
-- [#2931](https://github.com/influxdb/influxdb/pull/2931): Services and reporting should wait until cluster has leader.
-- [#2943](https://github.com/influxdb/influxdb/issues/2943): Ensure default retention policies are fully replicated
-- [#2948](https://github.com/influxdb/influxdb/issues/2948): Field mismatch error message to include measurement name
-- [#2919](https://github.com/influxdb/influxdb/issues/2919): Unable to insert negative floats
-- [#2935](https://github.com/influxdb/influxdb/issues/2935): Hook CPU and memory profiling back up.
-- [#2960](https://github.com/influxdb/influxdb/issues/2960): Cluster Write Errors.
-- [#2928](https://github.com/influxdb/influxdb/pull/2928): Start work to set InfluxDB version in HTTP response headers. Thanks @neonstalwart.
-- [#2969](https://github.com/influxdb/influxdb/pull/2969): Actually set HTTP version in responses.
-- [#2993](https://github.com/influxdb/influxdb/pull/2993): Don't log each UDP batch.
-- [#2994](https://github.com/influxdb/influxdb/pull/2994): Don't panic during wilcard expansion if no default database specified.
-- [#3002](https://github.com/influxdb/influxdb/pull/3002): Remove measurement from shard's index on DROP MEASUREMENT.
-- [#3021](https://github.com/influxdb/influxdb/pull/3021): Correct set HTTP write trace logging. Thanks @vladlopes.
-- [#3027](https://github.com/influxdb/influxdb/pull/3027): Enforce minimum retention policy duration of 1 hour.
-- [#3030](https://github.com/influxdb/influxdb/pull/3030): Fix excessive logging of shard creation.
-- [#3038](https://github.com/influxdb/influxdb/pull/3038): Don't check deleted shards for precreation. Thanks @vladlopes.
-- [#3033](https://github.com/influxdb/influxdb/pull/3033): Add support for marshaling `uint64` in client.
-- [#3090](https://github.com/influxdb/influxdb/pull/3090): Remove database from TSDB index on DROP DATABASE.
-- [#2944](https://github.com/influxdb/influxdb/issues/2944): Don't require "WHERE time" when creating continuous queries.
-- [#3075](https://github.com/influxdb/influxdb/pull/3075): GROUP BY correctly when different tags have same value.
-- [#3078](https://github.com/influxdb/influxdb/pull/3078): Fix CLI panic on malformed INSERT.
-- [#2102](https://github.com/influxdb/influxdb/issues/2102): Re-work Graphite input and metric processing
-- [#2996](https://github.com/influxdb/influxdb/issues/2996): Graphite Input Parsing
-- [#3136](https://github.com/influxdb/influxdb/pull/3136): Fix various issues with init.d script. Thanks @ miguelcnf.
-- [#2996](https://github.com/influxdb/influxdb/issues/2996): Graphite Input Parsing
-- [#3127](https://github.com/influxdb/influxdb/issues/3127): Trying to insert a number larger than the largest signed 64-bit number kills influxd
-- [#3131](https://github.com/influxdb/influxdb/pull/3131): Copy batch tags to each point before marshalling
-- [#3155](https://github.com/influxdb/influxdb/pull/3155): Instantiate UDP batcher before listening for UDP traffic, otherwise a panic may result.
-- [#2678](https://github.com/influxdb/influxdb/issues/2678): Server allows tags with an empty string for the key and/or value
-- [#3061](https://github.com/influxdb/influxdb/issues/3061): syntactically incorrect line protocol insert panics the database
-- [#2608](https://github.com/influxdb/influxdb/issues/2608): drop measurement while writing points to that measurement has race condition that can panic
-- [#3183](https://github.com/influxdb/influxdb/issues/3183): using line protocol measurement names cannot contain commas
-- [#3193](https://github.com/influxdb/influxdb/pull/3193): Fix panic for SHOW STATS and in collectd
-- [#3102](https://github.com/influxdb/influxdb/issues/3102): Add authentication cache
-- [#3209](https://github.com/influxdb/influxdb/pull/3209): Dump Run() errors to stderr
-- [#3217](https://github.com/influxdb/influxdb/pull/3217): Allow WAL partition flush delay to be configurable.
-
-## v0.9.0 [2015-06-11]
-
-### Bugfixes
-
-- [#2869](https://github.com/influxdb/influxdb/issues/2869): Adding field to existing measurement causes panic
-- [#2849](https://github.com/influxdb/influxdb/issues/2849): RC32: Frequent write errors
-- [#2700](https://github.com/influxdb/influxdb/issues/2700): Incorrect error message in database EncodeFields
-- [#2897](https://github.com/influxdb/influxdb/pull/2897): Ensure target Graphite database exists
-- [#2898](https://github.com/influxdb/influxdb/pull/2898): Ensure target openTSDB database exists
-- [#2895](https://github.com/influxdb/influxdb/pull/2895): Use Graphite input defaults where necessary
-- [#2900](https://github.com/influxdb/influxdb/pull/2900): Use openTSDB input defaults where necessary
-- [#2886](https://github.com/influxdb/influxdb/issues/2886): Refactor backup & restore
-- [#2804](https://github.com/influxdb/influxdb/pull/2804): BREAKING: change time literals to be single quoted in InfluxQL. Thanks @nvcook42!
-- [#2906](https://github.com/influxdb/influxdb/pull/2906): Restrict replication factor to the cluster size
-- [#2905](https://github.com/influxdb/influxdb/pull/2905): Restrict clusters to 3 peers
-- [#2904](https://github.com/influxdb/influxdb/pull/2904): Re-enable server reporting.
-- [#2917](https://github.com/influxdb/influxdb/pull/2917): Fix int64 field values.
-- [#2920](https://github.com/influxdb/influxdb/issues/2920): Ensure collectd database exists
-
-## v0.9.0-rc33 [2015-06-09]
-
-### Bugfixes
-
-- [#2816](https://github.com/influxdb/influxdb/pull/2816): Enable UDP service. Thanks @renan-
-- [#2824](https://github.com/influxdb/influxdb/pull/2824): Add missing call to WaitGroup.Done in execConn. Thanks @liyichao
-- [#2823](https://github.com/influxdb/influxdb/pull/2823): Convert OpenTSDB to a service.
-- [#2838](https://github.com/influxdb/influxdb/pull/2838): Set auto-created retention policy period to infinite.
-- [#2829](https://github.com/influxdb/influxdb/pull/2829): Re-enable Graphite support as a new Service-style component.
-- [#2814](https://github.com/influxdb/influxdb/issues/2814): Convert collectd to a service.
-- [#2852](https://github.com/influxdb/influxdb/pull/2852): Don't panic when altering retention policies. Thanks for the report @huhongbo
-- [#2857](https://github.com/influxdb/influxdb/issues/2857): Fix parsing commas in string field values.
-- [#2833](https://github.com/influxdb/influxdb/pull/2833): Make the default config valid.
-- [#2859](https://github.com/influxdb/influxdb/pull/2859): Fix panic on aggregate functions.
-- [#2878](https://github.com/influxdb/influxdb/pull/2878): Re-enable shard precreation.
-- [2865](https://github.com/influxdb/influxdb/pull/2865) -- Return an empty set of results if database does not exist in shard metadata.
-
-### Features
-- [2858](https://github.com/influxdb/influxdb/pull/2858): Support setting openTSDB write consistency.
-
-## v0.9.0-rc32 [2015-06-07]
-
-### Release Notes
-
-This released introduced an updated write path and clustering design. The data format has also changed, so you'll need to wipe out your data to upgrade from RC31. There should be no other data changes before v0.9.0 is released.
-
-### Features
-- [#1997](https://github.com/influxdb/influxdb/pull/1997): Update SELECT * to return tag values.
-- [#2599](https://github.com/influxdb/influxdb/issues/2599): Add "epoch" URL param and return JSON time values as epoch instead of date strings.
-- [#2682](https://github.com/influxdb/influxdb/issues/2682): Adding pr checklist to CONTRIBUTING.md
-- [#2683](https://github.com/influxdb/influxdb/issues/2683): Add batching support to Graphite inputs.
-- [#2687](https://github.com/influxdb/influxdb/issues/2687): Add batching support to Collectd inputs.
-- [#2696](https://github.com/influxdb/influxdb/pull/2696): Add line protocol. This is now the preferred way to write data.
-- [#2751](https://github.com/influxdb/influxdb/pull/2751): Add UDP input. UDP only supports the line protocol now.
-- [#2684](https://github.com/influxdb/influxdb/pull/2684): Include client timeout configuration. Thanks @vladlopes!
-
-### Bugfixes
-- [#2776](https://github.com/influxdb/influxdb/issues/2776): Re-implement retention policy enforcement.
-- [#2635](https://github.com/influxdb/influxdb/issues/2635): Fix querying against boolean field in WHERE clause.
-- [#2644](https://github.com/influxdb/influxdb/issues/2644): Make SHOW queries work with FROM /<regex>/.
-- [#2501](https://github.com/influxdb/influxdb/issues/2501): Name the FlagSet for the shell and add a version flag. Thanks @neonstalwart
-- [#2647](https://github.com/influxdb/influxdb/issues/2647): Fixes typos in sample config file - thanks @claws!
-
-## v0.9.0-rc31 [2015-05-21]
-
-### Features
-- [#1822](https://github.com/influxdb/influxdb/issues/1822): Wire up DERIVATIVE aggregate
-- [#1477](https://github.com/influxdb/influxdb/issues/1477): Wire up non_negative_derivative function
-- [#2557](https://github.com/influxdb/influxdb/issues/2557): Fix false positive error with `GROUP BY time`
-- [#1891](https://github.com/influxdb/influxdb/issues/1891): Wire up COUNT DISTINCT aggregate
-- [#1989](https://github.com/influxdb/influxdb/issues/1989): Implement `SELECT tagName FROM m`
-
-### Bugfixes
-- [#2545](https://github.com/influxdb/influxdb/pull/2545): Use "value" as the field name for graphite input. Thanks @cannium.
-- [#2558](https://github.com/influxdb/influxdb/pull/2558): Fix client response check - thanks @vladlopes!
-- [#2566](https://github.com/influxdb/influxdb/pull/2566): Wait until each data write has been commited by the Raft cluster.
-- [#2602](https://github.com/influxdb/influxdb/pull/2602): CLI execute command exits without cleaning up liner package.
-- [#2610](https://github.com/influxdb/influxdb/pull/2610): Fix shard group creation
-- [#2596](https://github.com/influxdb/influxdb/pull/2596): RC30: `panic: runtime error: index out of range` when insert data points.
-- [#2592](https://github.com/influxdb/influxdb/pull/2592): Should return an error if user attempts to group by a field.
-- [#2499](https://github.com/influxdb/influxdb/pull/2499): Issuing a select query with tag as a values causes panic.
-- [#2612](https://github.com/influxdb/influxdb/pull/2612): Query planner should validate distinct is passed a field.
-- [#2531](https://github.com/influxdb/influxdb/issues/2531): Fix select with 3 or more terms in where clause.
-- [#2564](https://github.com/influxdb/influxdb/issues/2564): Change "name" to "measurement" in JSON for writes.
-
-## PRs
-- [#2569](https://github.com/influxdb/influxdb/pull/2569): Add derivative functions
-- [#2598](https://github.com/influxdb/influxdb/pull/2598): Implement tag support in SELECT statements
-- [#2624](https://github.com/influxdb/influxdb/pull/2624): Remove references to SeriesID in `DROP SERIES` handlers.
-
-## v0.9.0-rc30 [2015-05-12]
-
-### Release Notes
-
-This release has a breaking API change for writes -- the field previously called `timestamp` has been renamed to `time`.
-
-### Features
-- [#2254](https://github.com/influxdb/influxdb/pull/2254): Add Support for OpenTSDB HTTP interface. Thanks @tcolgate
-- [#2525](https://github.com/influxdb/influxdb/pull/2525): Serve broker diagnostics over HTTP
-- [#2186](https://github.com/influxdb/influxdb/pull/2186): The default status code for queries is now `200 OK`
-- [#2298](https://github.com/influxdb/influxdb/pull/2298): Successful writes now return a status code of `204 No Content` - thanks @neonstalwart!
-- [#2549](https://github.com/influxdb/influxdb/pull/2549): Raft election timeout to 5 seconds, so system is more forgiving of CPU loads.
-- [#2568](https://github.com/influxdb/influxdb/pull/2568): Wire up SELECT DISTINCT.
-
-### Bugfixes
-- [#2535](https://github.com/influxdb/influxdb/pull/2535): Return exit status 0 if influxd already running. Thanks @haim0n.
-- [#2521](https://github.com/influxdb/influxdb/pull/2521): Don't truncate topic data until fully replicated.
-- [#2509](https://github.com/influxdb/influxdb/pull/2509): Parse config file correctly during restore. Thanks @neonstalwart
-- [#2536](https://github.com/influxdb/influxdb/issues/2532): Set leader ID on restart of single-node cluster.
-- [#2448](https://github.com/influxdb/influxdb/pull/2448): Fix inconsistent data type - thanks @cannium!
-- [#2108](https://github.com/influxdb/influxdb/issues/2108): Change `timestamp` to `time` - thanks @neonstalwart!
-- [#2539](https://github.com/influxdb/influxdb/issues/2539): Add additional vote request logging.
-- [#2541](https://github.com/influxdb/influxdb/issues/2541): Update messaging client connection index with every message.
-- [#2542](https://github.com/influxdb/influxdb/issues/2542): Throw parser error for invalid aggregate without where time.
-- [#2548](https://github.com/influxdb/influxdb/issues/2548): Return an error when numeric aggregate applied to non-numeric data.
-- [#2487](https://github.com/influxdb/influxdb/issues/2487): Aggregate query with exact timestamp causes panic. Thanks @neonstalwart!
-- [#2552](https://github.com/influxdb/influxdb/issues/2552): Run CQ that is actually passed into go-routine.
-- [#2553](https://github.com/influxdb/influxdb/issues/2553): Fix race condition during CQ execution.
-- [#2557](https://github.com/influxdb/influxdb/issues/2557): RC30 WHERE time filter Regression.
-
-## v0.9.0-rc29 [2015-05-05]
-
-### Features
-- [#2410](https://github.com/influxdb/influxdb/pull/2410): If needed, brokers respond with data nodes for peer shard replication.
-- [#2469](https://github.com/influxdb/influxdb/pull/2469): Reduce default max topic size from 1GB to 50MB.
-- [#1824](https://github.com/influxdb/influxdb/pull/1824): Wire up MEDIAN aggregate. Thanks @neonstalwart!
-
-### Bugfixes
-- [#2446](https://github.com/influxdb/influxdb/pull/2446): Correctly count number of queries executed. Thanks @neonstalwart
-- [#2452](https://github.com/influxdb/influxdb/issues/2452): Fix panic with shard stats on multiple clusters
-- [#2453](https://github.com/influxdb/influxdb/pull/2453): Do not require snapshot on Log.WriteEntriesTo().
-- [#2460](https://github.com/influxdb/influxdb/issues/2460): Collectd input should use "value" for fields values. Fixes 2412. Thanks @josh-padnick
-- [#2465](https://github.com/influxdb/influxdb/pull/2465): HTTP response logging paniced with chunked requests. Thanks @Jackkoz
-- [#2475](https://github.com/influxdb/influxdb/pull/2475): RLock server when checking if shards groups are required during write.
-- [#2471](https://github.com/influxdb/influxdb/issues/2471): Function calls normalized to be lower case. Fixes percentile not working when called uppercase. Thanks @neonstalwart
-- [#2281](https://github.com/influxdb/influxdb/issues/2281): Fix Bad Escape error when parsing regex
-
-## v0.9.0-rc28 [2015-04-27]
-
-### Features
-- [#2410](https://github.com/influxdb/influxdb/pull/2410) Allow configuration of Raft timers
-- [#2354](https://github.com/influxdb/influxdb/pull/2354) Wire up STDDEV. Thanks @neonstalwart!
-
-### Bugfixes
-- [#2374](https://github.com/influxdb/influxdb/issues/2374): Two different panics during SELECT percentile
-- [#2404](https://github.com/influxdb/influxdb/pull/2404): Mean and percentile function fixes
-- [#2408](https://github.com/influxdb/influxdb/pull/2408): Fix snapshot 500 error
-- [#1896](https://github.com/influxdb/influxdb/issues/1896): Excessive heartbeater logging of "connection refused" on cluster node stop
-- [#2418](https://github.com/influxdb/influxdb/pull/2418): Fix raft node getting stuck in candidate state
-- [#2415](https://github.com/influxdb/influxdb/pull/2415): Raft leader ID now set on election after failover. Thanks @xiaost
-- [#2426](https://github.com/influxdb/influxdb/pull/2426): Fix race condition around listener address in openTSDB server.
-- [#2426](https://github.com/influxdb/influxdb/pull/2426): Fix race condition around listener address in Graphite server.
-- [#2429](https://github.com/influxdb/influxdb/pull/2429): Ensure no field value is null.
-- [#2431](https://github.com/influxdb/influxdb/pull/2431): Always append shard path in diags. Thanks @marcosnils
-- [#2441](https://github.com/influxdb/influxdb/pull/2441): Correctly release server RLock during "drop series".
-- [#2445](https://github.com/influxdb/influxdb/pull/2445): Read locks and data race fixes
-
-## v0.9.0-rc27 [04-23-2015]
-
-### Features
-- [#2398](https://github.com/influxdb/influxdb/pull/2398) Track more stats and report errors for shards.
-
-### Bugfixes
-- [#2370](https://github.com/influxdb/influxdb/pull/2370): Fix data race in openTSDB endpoint.
-- [#2371](https://github.com/influxdb/influxdb/pull/2371): Don't set client to nil when closing broker Fixes #2352
-- [#2372](https://github.com/influxdb/influxdb/pull/2372): Fix data race in graphite endpoint.
-- [#2373](https://github.com/influxdb/influxdb/pull/2373): Actually allow HTTP logging to be controlled.
-- [#2376](https://github.com/influxdb/influxdb/pull/2376): Encode all types of integers. Thanks @jtakkala.
-- [#2376](https://github.com/influxdb/influxdb/pull/2376): Add shard path to existing diags value. Fix issue #2369.
-- [#2386](https://github.com/influxdb/influxdb/pull/2386): Fix shard datanodes stats getting appended too many times
-- [#2393](https://github.com/influxdb/influxdb/pull/2393): Fix default hostname for connecting to cluster.
-- [#2390](https://github.com/influxdb/influxdb/pull/2390): Handle large sums when calculating means - thanks @neonstalwart!
-- [#2391](https://github.com/influxdb/influxdb/pull/2391): Unable to write points through Go client when authentication enabled
-- [#2400](https://github.com/influxdb/influxdb/pull/2400): Always send auth headers for client requests if present
-
-## v0.9.0-rc26 [04-21-2015]
-
-### Features
-- [#2301](https://github.com/influxdb/influxdb/pull/2301): Distributed query load balancing and failover
-- [#2336](https://github.com/influxdb/influxdb/pull/2336): Handle distributed queries when shards != data nodes
-- [#2353](https://github.com/influxdb/influxdb/pull/2353): Distributed Query/Clustering Fixes
-
-### Bugfixes
-- [#2297](https://github.com/influxdb/influxdb/pull/2297): create /var/run during startup. Thanks @neonstalwart.
-- [#2312](https://github.com/influxdb/influxdb/pull/2312): Re-use httpclient for continuous queries
-- [#2318](https://github.com/influxdb/influxdb/pull/2318): Remove pointless use of 'done' channel for collectd.
-- [#2242](https://github.com/influxdb/influxdb/pull/2242): Distributed Query should balance requests
-- [#2243](https://github.com/influxdb/influxdb/pull/2243): Use Limit Reader instead of fixed 1MB/1GB slice for DQ
-- [#2190](https://github.com/influxdb/influxdb/pull/2190): Implement failover to other data nodes for distributed queries
-- [#2324](https://github.com/influxdb/influxdb/issues/2324): Race in Broker.Close()/Broker.RunContinousQueryProcessing()
-- [#2325](https://github.com/influxdb/influxdb/pull/2325): Cluster open fixes
-- [#2326](https://github.com/influxdb/influxdb/pull/2326): Fix parse error in CREATE CONTINUOUS QUERY
-- [#2300](https://github.com/influxdb/influxdb/pull/2300): Refactor integration tests.  Properly close Graphite/OpenTSDB listeners.
-- [#2338](https://github.com/influxdb/influxdb/pull/2338): Fix panic if tag key isn't double quoted when it should have been
-- [#2340](https://github.com/influxdb/influxdb/pull/2340): Fix SHOW DIAGNOSTICS panic if any shard was non-local.
-- [#2351](https://github.com/influxdb/influxdb/pull/2351): Fix data race by rlocking shard during diagnostics.
-- [#2348](https://github.com/influxdb/influxdb/pull/2348): Data node fail to join cluster in 0.9.0rc25
-- [#2343](https://github.com/influxdb/influxdb/pull/2343): Node falls behind Metastore updates
-- [#2334](https://github.com/influxdb/influxdb/pull/2334): Test Partial replication is very problematic
-- [#2272](https://github.com/influxdb/influxdb/pull/2272): clustering: influxdb 0.9.0-rc23 panics when doing a GET with merge_metrics in a
-- [#2350](https://github.com/influxdb/influxdb/pull/2350): Issue fix for :influxd -hostname localhost.
-- [#2367](https://github.com/influxdb/influxdb/pull/2367): PR for issue #2350 - Always use localhost, not host name.
-
-## v0.9.0-rc25 [2015-04-15]
-
-### Bugfixes
-- [#2282](https://github.com/influxdb/influxdb/pull/2282): Use "value" as field name for OpenTSDB input.
-- [#2283](https://github.com/influxdb/influxdb/pull/2283): Fix bug when restarting an entire existing cluster.
-- [#2293](https://github.com/influxdb/influxdb/pull/2293): Open cluster listener before starting broker.
-- [#2287](https://github.com/influxdb/influxdb/pull/2287): Fix data race during SHOW RETENTION POLICIES.
-- [#2288](https://github.com/influxdb/influxdb/pull/2288): Fix expression parsing bug.
-- [#2294](https://github.com/influxdb/influxdb/pull/2294): Fix async response flushing (invalid chunked response error).
-
-## Features
-- [#2276](https://github.com/influxdb/influxdb/pull/2276): Broker topic truncation.
-- [#2292](https://github.com/influxdb/influxdb/pull/2292): Wire up drop CQ statement - thanks @neonstalwart!
-- [#2290](https://github.com/influxdb/influxdb/pull/2290): Allow hostname argument to override default config - thanks @neonstalwart!
-- [#2295](https://github.com/influxdb/influxdb/pull/2295): Use nil as default return value for MapCount - thanks @neonstalwart!
-- [#2246](https://github.com/influxdb/influxdb/pull/2246): Allow HTTP logging to be controlled.
-
-## v0.9.0-rc24 [2015-04-13]
-
-### Bugfixes
-- [#2255](https://github.com/influxdb/influxdb/pull/2255): Fix panic when changing default retention policy.
-- [#2257](https://github.com/influxdb/influxdb/pull/2257): Add "snapshotting" pseudo state & log entry cache.
-- [#2261](https://github.com/influxdb/influxdb/pull/2261): Support int64 value types.
-- [#2191](https://github.com/influxdb/influxdb/pull/2191): Case-insensitive check for "fill"
-- [#2274](https://github.com/influxdb/influxdb/pull/2274): Snapshot and HTTP API endpoints
-- [#2265](https://github.com/influxdb/influxdb/pull/2265): Fix auth for CLI.
-
-## v0.9.0-rc23 [2015-04-11]
-
-### Features
-- [#2202](https://github.com/influxdb/influxdb/pull/2202): Initial implementation of Distributed Queries
-- [#2202](https://github.com/influxdb/influxdb/pull/2202): 64-bit Series IDs. INCOMPATIBLE WITH PREVIOUS DATASTORES.
-
-### Bugfixes
-- [#2225](https://github.com/influxdb/influxdb/pull/2225): Make keywords completely case insensitive
-- [#2228](https://github.com/influxdb/influxdb/pull/2228): Accept keyword default unquoted in ALTER RETENTION POLICY statement
-- [#2236](https://github.com/influxdb/influxdb/pull/2236): Immediate term changes, fix stale write issue, net/http/pprof
-- [#2213](https://github.com/influxdb/influxdb/pull/2213): Seed random number generator for election timeout. Thanks @cannium.
-
-## v0.9.0-rc22 [2015-04-09]
-
-### Features
-- [#2214](https://github.com/influxdb/influxdb/pull/2214): Added the option to influx CLI to execute single command and exit. Thanks @n1tr0g
-
-### Bugfixes
-- [#2223](https://github.com/influxdb/influxdb/pull/2223): Always notify term change on RequestVote
-
-## v0.9.0-rc21 [2015-04-09]
-
-### Features
-- [#870](https://github.com/influxdb/influxdb/pull/870): Add support for OpenTSDB telnet input protocol. Thanks @tcolgate
-- [#2180](https://github.com/influxdb/influxdb/pull/2180): Allow http write handler to decode gzipped body
-- [#2175](https://github.com/influxdb/influxdb/pull/2175): Separate broker and data nodes
-- [#2158](https://github.com/influxdb/influxdb/pull/2158): Allow user password to be changed. Thanks @n1tr0g
-- [#2201](https://github.com/influxdb/influxdb/pull/2201): Bring back config join URLs
-- [#2121](https://github.com/influxdb/influxdb/pull/2121): Parser refactor
-
-### Bugfixes
-- [#2181](https://github.com/influxdb/influxdb/pull/2181): Fix panic on "SHOW DIAGNOSTICS".
-- [#2170](https://github.com/influxdb/influxdb/pull/2170): Make sure queries on missing tags return 200 status.
-- [#2197](https://github.com/influxdb/influxdb/pull/2197): Lock server during Open().
-- [#2200](https://github.com/influxdb/influxdb/pull/2200): Re-enable Continuous Queries.
-- [#2203](https://github.com/influxdb/influxdb/pull/2203): Fix race condition on continuous queries.
-- [#2217](https://github.com/influxdb/influxdb/pull/2217): Only revert to follower if new term is greater.
-- [#2219](https://github.com/influxdb/influxdb/pull/2219): Persist term change to disk when candidate. Thanks @cannium
-
-## v0.9.0-rc20 [2015-04-04]
-
-### Features
-- [#2128](https://github.com/influxdb/influxdb/pull/2128): Data node discovery from brokers
-- [#2142](https://github.com/influxdb/influxdb/pull/2142): Support chunked queries
-- [#2154](https://github.com/influxdb/influxdb/pull/2154): Node redirection
-- [#2168](https://github.com/influxdb/influxdb/pull/2168): Return raft term from vote, add term logging
-
-### Bugfixes
-- [#2147](https://github.com/influxdb/influxdb/pull/2147): Set Go Max procs in a better location
-- [#2137](https://github.com/influxdb/influxdb/pull/2137): Refactor `results` to `response`. Breaking Go Client change.
-- [#2151](https://github.com/influxdb/influxdb/pull/2151): Ignore replay commands on the metastore.
-- [#2152](https://github.com/influxdb/influxdb/issues/2152): Influxd process with stats enabled crashing with 'Unsuported protocol scheme for ""'
-- [#2156](https://github.com/influxdb/influxdb/pull/2156): Propagate error when resolving UDP address in Graphite UDP server.
-- [#2163](https://github.com/influxdb/influxdb/pull/2163): Fix up paths for default data and run storage.
-- [#2164](https://github.com/influxdb/influxdb/pull/2164): Append STDOUT/STDERR in initscript.
-- [#2165](https://github.com/influxdb/influxdb/pull/2165): Better name for config section for stats and diags.
-- [#2165](https://github.com/influxdb/influxdb/pull/2165): Monitoring database and retention policy are not configurable.
-- [#2167](https://github.com/influxdb/influxdb/pull/2167): Add broker log recovery.
-- [#2166](https://github.com/influxdb/influxdb/pull/2166): Don't panic if presented with a field of unknown type.
-- [#2149](https://github.com/influxdb/influxdb/pull/2149): Fix unit tests for win32 when directory doesn't exist.
-- [#2150](https://github.com/influxdb/influxdb/pull/2150): Fix unit tests for win32 when a connection is refused.
-
-## v0.9.0-rc19 [2015-04-01]
-
-### Features
-- [#2143](https://github.com/influxdb/influxdb/pull/2143): Add raft term logging.
-
-### Bugfixes
-- [#2145](https://github.com/influxdb/influxdb/pull/2145): Encode toml durations correctly which fixes default configuration generation `influxd config`.
-
-## v0.9.0-rc18 [2015-03-31]
-
-### Bugfixes
-- [#2100](https://github.com/influxdb/influxdb/pull/2100): Use channel to synchronize collectd shutdown.
-- [#2100](https://github.com/influxdb/influxdb/pull/2100): Synchronize access to shard index.
-- [#2131](https://github.com/influxdb/influxdb/pull/2131): Optimize marshalTags().
-- [#2130](https://github.com/influxdb/influxdb/pull/2130): Make fewer calls to marshalTags().
-- [#2105](https://github.com/influxdb/influxdb/pull/2105): Support != for tag values. Fix issue #2097, thanks to @smonkewitz for bug report.
-- [#2105](https://github.com/influxdb/influxdb/pull/2105): Support !~ tags values.
-- [#2138](https://github.com/influxdb/influxdb/pull/2136): Use map for marshaledTags cache.
-
-## v0.9.0-rc17 [2015-03-29]
-
-### Features
-- [#2076](https://github.com/influxdb/influxdb/pull/2076): Separate stdout and stderr output in init.d script
-- [#2091](https://github.com/influxdb/influxdb/pull/2091): Support disabling snapshot endpoint.
-- [#2081](https://github.com/influxdb/influxdb/pull/2081): Support writing diagnostic data into the internal database.
-- [#2095](https://github.com/influxdb/influxdb/pull/2095): Improved InfluxDB client docs. Thanks @derailed
-
-### Bugfixes
-- [#2093](https://github.com/influxdb/influxdb/pull/2093): Point precision not marshalled correctly. Thanks @derailed
-- [#2084](https://github.com/influxdb/influxdb/pull/2084): Allowing leading underscores in identifiers.
-- [#2080](https://github.com/influxdb/influxdb/pull/2080): Graphite logs in seconds, not milliseconds.
-- [#2101](https://github.com/influxdb/influxdb/pull/2101): SHOW DATABASES should name returned series "databases".
-- [#2104](https://github.com/influxdb/influxdb/pull/2104): Include NEQ when calculating field filters.
-- [#2112](https://github.com/influxdb/influxdb/pull/2112): Set GOMAXPROCS on startup. This may have been causing extra leader elections, which would cause a number of other bugs or instability.
-- [#2111](https://github.com/influxdb/influxdb/pull/2111) and [#2025](https://github.com/influxdb/influxdb/issues/2025): Raft stability fixes. Non-contiguous log error and others.
-- [#2114](https://github.com/influxdb/influxdb/pull/2114): Correctly start influxd on platforms without start-stop-daemon.
-
-## v0.9.0-rc16 [2015-03-24]
-
-### Features
-- [#2058](https://github.com/influxdb/influxdb/pull/2058): Track number of queries executed in stats.
-- [#2059](https://github.com/influxdb/influxdb/pull/2059): Retention policies sorted by name on return to client.
-- [#2061](https://github.com/influxdb/influxdb/pull/2061): Implement SHOW DIAGNOSTICS.
-- [#2064](https://github.com/influxdb/influxdb/pull/2064): Allow init.d script to return influxd version.
-- [#2053](https://github.com/influxdb/influxdb/pull/2053): Implment backup and restore.
-- [#1631](https://github.com/influxdb/influxdb/pull/1631): Wire up DROP CONTINUOUS QUERY.
-
-### Bugfixes
-- [#2037](https://github.com/influxdb/influxdb/pull/2037): Don't check 'configExists' at Run() level.
-- [#2039](https://github.com/influxdb/influxdb/pull/2039): Don't panic if getting current user fails.
-- [#2034](https://github.com/influxdb/influxdb/pull/2034): GROUP BY should require an aggregate.
-- [#2040](https://github.com/influxdb/influxdb/pull/2040): Add missing top-level help for config command.
-- [#2057](https://github.com/influxdb/influxdb/pull/2057): Move racy "in order" test to integration test suite.
-- [#2060](https://github.com/influxdb/influxdb/pull/2060): Reload server shard map on restart.
-- [#2068](https://github.com/influxdb/influxdb/pull/2068): Fix misspelled JSON field.
-- [#2067](https://github.com/influxdb/influxdb/pull/2067): Fixed issue where some queries didn't properly pull back data (introduced in RC15). Fixing intervals for GROUP BY.
-
-## v0.9.0-rc15 [2015-03-19]
-
-### Features
-- [#2000](https://github.com/influxdb/influxdb/pull/2000): Log broker path when broker fails to start. Thanks @gst.
-- [#2007](https://github.com/influxdb/influxdb/pull/2007): Track shard-level stats.
-
-### Bugfixes
-- [#2001](https://github.com/influxdb/influxdb/pull/2001): Ensure measurement not found returns status code 200.
-- [#1985](https://github.com/influxdb/influxdb/pull/1985): Set content-type JSON header before actually writing header. Thanks @dstrek.
-- [#2003](https://github.com/influxdb/influxdb/pull/2003): Set timestamp when writing monitoring stats.
-- [#2004](https://github.com/influxdb/influxdb/pull/2004): Limit group by to MaxGroupByPoints (currently 100,000).
-- [#2016](https://github.com/influxdb/influxdb/pull/2016): Fixing bucket alignment for group by. Thanks @jnutzmann
-- [#2021](https://github.com/influxdb/influxdb/pull/2021): Remove unnecessary formatting from log message. Thanks @simonkern
-
-
-## v0.9.0-rc14 [2015-03-18]
-
-### Bugfixes
-- [#1999](https://github.com/influxdb/influxdb/pull/1999): Return status code 200 for measurement not found errors on show series.
-
-## v0.9.0-rc13 [2015-03-17]
-
-### Features
-- [#1974](https://github.com/influxdb/influxdb/pull/1974): Add time taken for request to the http server logs.
-
-### Bugfixes
-- [#1971](https://github.com/influxdb/influxdb/pull/1971): Fix leader id initialization.
-- [#1975](https://github.com/influxdb/influxdb/pull/1975): Require `q` parameter for query endpoint.
-- [#1969](https://github.com/influxdb/influxdb/pull/1969): Print loaded config.
-- [#1987](https://github.com/influxdb/influxdb/pull/1987): Fix config print startup statement for when no config is provided.
-- [#1990](https://github.com/influxdb/influxdb/pull/1990): Drop measurement was taking too long due to transactions.
-
-## v0.9.0-rc12 [2015-03-15]
-
-### Bugfixes
-- [#1942](https://github.com/influxdb/influxdb/pull/1942): Sort wildcard names.
-- [#1957](https://github.com/influxdb/influxdb/pull/1957): Graphite numbers are always float64.
-- [#1955](https://github.com/influxdb/influxdb/pull/1955): Prohibit creation of databases with no name. Thanks @dullgiulio
-- [#1952](https://github.com/influxdb/influxdb/pull/1952): Handle delete statement with an error. Thanks again to @dullgiulio
-
-### Features
-- [#1935](https://github.com/influxdb/influxdb/pull/1935): Implement stateless broker for Raft.
-- [#1936](https://github.com/influxdb/influxdb/pull/1936): Implement "SHOW STATS" and self-monitoring
-
-### Features
-- [#1909](https://github.com/influxdb/influxdb/pull/1909): Implement a dump command.
-
-## v0.9.0-rc11 [2015-03-13]
-
-### Bugfixes
-- [#1917](https://github.com/influxdb/influxdb/pull/1902): Creating Infinite Retention Policy Failed.
-- [#1758](https://github.com/influxdb/influxdb/pull/1758): Add Graphite Integration Test.
-- [#1929](https://github.com/influxdb/influxdb/pull/1929): Default Retention Policy incorrectly auto created.
-- [#1930](https://github.com/influxdb/influxdb/pull/1930): Auto create database for graphite if not specified.
-- [#1908](https://github.com/influxdb/influxdb/pull/1908): Cosmetic CLI output fixes.
-- [#1931](https://github.com/influxdb/influxdb/pull/1931): Add default column to SHOW RETENTION POLICIES.
-- [#1937](https://github.com/influxdb/influxdb/pull/1937): OFFSET should be allowed to be 0.
-
-### Features
-- [#1902](https://github.com/influxdb/influxdb/pull/1902): Enforce retention policies to have a minimum duration.
-- [#1906](https://github.com/influxdb/influxdb/pull/1906): Add show servers to query language.
-- [#1925](https://github.com/influxdb/influxdb/pull/1925): Add `fill(none)`, `fill(previous)`, and `fill(<num>)` to queries.
-
-## v0.9.0-rc10 [2015-03-09]
-
-### Bugfixes
-- [#1867](https://github.com/influxdb/influxdb/pull/1867): Fix race accessing topic replicas map
-- [#1864](https://github.com/influxdb/influxdb/pull/1864): fix race in startStateLoop
-- [#1753](https://github.com/influxdb/influxdb/pull/1874): Do Not Panic on Missing Dirs
-- [#1877](https://github.com/influxdb/influxdb/pull/1877): Broker clients track broker leader
-- [#1862](https://github.com/influxdb/influxdb/pull/1862): Fix memory leak in `httpd.serveWait`. Thanks @mountkin
-- [#1883](https://github.com/influxdb/influxdb/pull/1883): RLock server during retention policy enforcement. Thanks @grisha
-- [#1868](https://github.com/influxdb/influxdb/pull/1868): Use `BatchPoints` for `client.Write` method. Thanks @vladlopes, @georgmu, @d2g, @evanphx, @akolosov.
-- [#1881](https://github.com/influxdb/influxdb/pull/1881): Update documentation for `client` package.  Misc library tweaks.
-- Fix queries with multiple where clauses on tags, times and fields. Fix queries that have where clauses on fields not in the select
-
-### Features
-- [#1875](https://github.com/influxdb/influxdb/pull/1875): Support trace logging of Raft.
-- [#1895](https://github.com/influxdb/influxdb/pull/1895): Auto-create a retention policy when a database is created.
-- [#1897](https://github.com/influxdb/influxdb/pull/1897): Pre-create shard groups.
-- [#1900](https://github.com/influxdb/influxdb/pull/1900): Change `LIMIT` to `SLIMIT` and implement `LIMIT` and `OFFSET`
-
-## v0.9.0-rc9 [2015-03-06]
-
-### Bugfixes
-- [#1872](https://github.com/influxdb/influxdb/pull/1872): Fix "stale term" errors with raft
-
-## v0.9.0-rc8 [2015-03-05]
-
-### Bugfixes
-- [#1836](https://github.com/influxdb/influxdb/pull/1836): Store each parsed shell command in history file.
-- [#1789](https://github.com/influxdb/influxdb/pull/1789): add --config-files option to fpm command. Thanks @kylezh
-- [#1859](https://github.com/influxdb/influxdb/pull/1859): Queries with a `GROUP BY *` clause were returning a 500 if done against a measurement that didn't exist
-
-### Features
-- [#1755](https://github.com/influxdb/influxdb/pull/1848): Support JSON data ingest over UDP
-- [#1857](https://github.com/influxdb/influxdb/pull/1857): Support retention policies with infinite duration
-- [#1858](https://github.com/influxdb/influxdb/pull/1858): Enable detailed tracing of write path
-
-## v0.9.0-rc7 [2015-03-02]
-
-### Features
-- [#1813](https://github.com/influxdb/influxdb/pull/1813): Queries for missing measurements or fields now return a 200 with an error message in the series JSON.
-- [#1826](https://github.com/influxdb/influxdb/pull/1826), [#1827](https://github.com/influxdb/influxdb/pull/1827): Fixed queries with `WHERE` clauses against fields.
-
-### Bugfixes
-
-- [#1744](https://github.com/influxdb/influxdb/pull/1744): Allow retention policies to be modified without specifying replication factor. Thanks @kylezh
-- [#1809](https://github.com/influxdb/influxdb/pull/1809): Packaging post-install script unconditionally removes init.d symlink. Thanks @sineos
-
-## v0.9.0-rc6 [2015-02-27]
-
-### Bugfixes
-
-- [#1780](https://github.com/influxdb/influxdb/pull/1780): Malformed identifiers get through the parser
-- [#1775](https://github.com/influxdb/influxdb/pull/1775): Panic "index out of range" on some queries
-- [#1744](https://github.com/influxdb/influxdb/pull/1744): Select shard groups which completely encompass time range. Thanks @kylezh.
-
-## v0.9.0-rc5 [2015-02-27]
-
-### Bugfixes
-
-- [#1752](https://github.com/influxdb/influxdb/pull/1752): remove debug log output from collectd.
-- [#1720](https://github.com/influxdb/influxdb/pull/1720): Parse Series IDs as unsigned 32-bits.
-- [#1767](https://github.com/influxdb/influxdb/pull/1767): Drop Series was failing across shards.  Issue #1761.
-- [#1773](https://github.com/influxdb/influxdb/pull/1773): Fix bug when merging series together that have unequal number of points in a group by interval
-- [#1771](https://github.com/influxdb/influxdb/pull/1771): Make `SHOW SERIES` return IDs and support `LIMIT` and `OFFSET`
-
-### Features
-
-- [#1698](https://github.com/influxdb/influxdb/pull/1698): Wire up DROP MEASUREMENT
-
-## v0.9.0-rc4 [2015-02-24]
-
-### Bugfixes
-
-- Fix authentication issue with continuous queries
-- Print version in the log on startup
-
-## v0.9.0-rc3 [2015-02-23]
-
-### Features
-
-- [#1659](https://github.com/influxdb/influxdb/pull/1659): WHERE against regexes: `WHERE =~ '.*asdf'
-- [#1580](https://github.com/influxdb/influxdb/pull/1580): Add support for fields with bool, int, or string data types
-- [#1687](https://github.com/influxdb/influxdb/pull/1687): Change `Rows` to `Series` in results output. BREAKING API CHANGE
-- [#1629](https://github.com/influxdb/influxdb/pull/1629): Add support for `DROP SERIES` queries
-- [#1632](https://github.com/influxdb/influxdb/pull/1632): Add support for `GROUP BY *` to return all series within a measurement
-- [#1689](https://github.com/influxdb/influxdb/pull/1689): Change `SHOW TAG VALUES WITH KEY="foo"` to use the key name in the result. BREAKING API CHANGE
-- [#1699](https://github.com/influxdb/influxdb/pull/1699): Add CPU and memory profiling options to daemon
-- [#1672](https://github.com/influxdb/influxdb/pull/1672): Add index tracking to metastore. Makes downed node recovery actually work
-- [#1591](https://github.com/influxdb/influxdb/pull/1591): Add `spread` aggregate function
-- [#1576](https://github.com/influxdb/influxdb/pull/1576): Add `first` and `last` aggregate functions
-- [#1573](https://github.com/influxdb/influxdb/pull/1573): Add `stddev` aggregate function
-- [#1565](https://github.com/influxdb/influxdb/pull/1565): Add the admin interface back into the server and update for new API
-- [#1562](https://github.com/influxdb/influxdb/pull/1562): Enforce retention policies
-- [#1700](https://github.com/influxdb/influxdb/pull/1700): Change `Values` to `Fields` on writes.  BREAKING API CHANGE
-- [#1706](https://github.com/influxdb/influxdb/pull/1706): Add support for `LIMIT` and `OFFSET`, which work on the number of series returned in a query. To limit the number of data points use a `WHERE time` clause
-
-### Bugfixes
-
-- [#1636](https://github.com/influxdb/influxdb/issues/1636): Don't store number of fields in raw data. THIS IS A BREAKING DATA CHANGE. YOU MUST START WITH A FRESH DATABASE
-- [#1701](https://github.com/influxdb/influxdb/pull/1701), [#1667](https://github.com/influxdb/influxdb/pull/1667), [#1663](https://github.com/influxdb/influxdb/pull/1663), [#1615](https://github.com/influxdb/influxdb/pull/1615): Raft fixes
-- [#1644](https://github.com/influxdb/influxdb/pull/1644): Add batching support for significantly improved write performance
-- [#1704](https://github.com/influxdb/influxdb/pull/1704): Fix queries that pull back raw data (i.e. ones without aggregate functions)
-- [#1718](https://github.com/influxdb/influxdb/pull/1718): Return an error on write if any of the points are don't have at least one field
-- [#1806](https://github.com/influxdb/influxdb/pull/1806): Fix regex parsing.  Change regex syntax to use / delimiters.
-
-
-## v0.9.0-rc1,2 [no public release]
-
-### Features
-
-- Support for tags added
-- New queries for showing measurement names, tag keys, and tag values
-- Renamed shard spaces to retention policies
-- Deprecated matching against regex in favor of explicit writing and querying on retention policies
-- Pure Go InfluxQL parser
-- Switch to BoltDB as underlying datastore
-- BoltDB backed metastore to store schema information
-- Updated HTTP API to only have two endpoints `/query` and `/write`
-- Added all administrative functions to the query language
-- Change cluster architecture to have brokers and data nodes
-- Switch to streaming Raft implementation
-- In memory inverted index of the tag data
-- Pure Go implementation!
-
-## v0.8.6 [2014-11-15]
-
-### Features
-
-- [Issue #973](https://github.com/influxdb/influxdb/issues/973). Support
-  joining using a regex or list of time series
-- [Issue #1068](https://github.com/influxdb/influxdb/issues/1068). Print
-  the processor chain when the query is started
-
-### Bugfixes
-
-- [Issue #584](https://github.com/influxdb/influxdb/issues/584). Don't
-  panic if the process died while initializing
-- [Issue #663](https://github.com/influxdb/influxdb/issues/663). Make
-  sure all sub servies are closed when are stopping InfluxDB
-- [Issue #671](https://github.com/influxdb/influxdb/issues/671). Fix
-  the Makefile package target for Mac OSX
-- [Issue #800](https://github.com/influxdb/influxdb/issues/800). Use
-  su instead of sudo in the init script. This fixes the startup problem
-  on RHEL 6.
-- [Issue #925](https://github.com/influxdb/influxdb/issues/925). Don't
-  generate invalid query strings for single point queries
-- [Issue #943](https://github.com/influxdb/influxdb/issues/943). Don't
-  take two snapshots at the same time
-- [Issue #947](https://github.com/influxdb/influxdb/issues/947). Exit
-  nicely if the daemon doesn't have permission to write to the log.
-- [Issue #959](https://github.com/influxdb/influxdb/issues/959). Stop using
-  closed connections in the protobuf client.
-- [Issue #978](https://github.com/influxdb/influxdb/issues/978). Check
-  for valgrind and mercurial in the configure script
-- [Issue #996](https://github.com/influxdb/influxdb/issues/996). Fill should
-  fill the time range even if no points exists in the given time range
-- [Issue #1008](https://github.com/influxdb/influxdb/issues/1008). Return
-  an appropriate exit status code depending on whether the process exits
-  due to an error or exits gracefully.
-- [Issue #1024](https://github.com/influxdb/influxdb/issues/1024). Hitting
-  open files limit causes influxdb to create shards in loop.
-- [Issue #1069](https://github.com/influxdb/influxdb/issues/1069). Fix
-  deprecated interface endpoint in Admin UI.
-- [Issue #1076](https://github.com/influxdb/influxdb/issues/1076). Fix
-  the timestamps of data points written by the collectd plugin. (Thanks,
-  @renchap for reporting this bug)
-- [Issue #1078](https://github.com/influxdb/influxdb/issues/1078). Make sure
-  we don't resurrect shard directories for shards that have already expired
-- [Issue #1085](https://github.com/influxdb/influxdb/issues/1085). Set
-  the connection string of the local raft node
-- [Issue #1092](https://github.com/influxdb/influxdb/issues/1093). Set
-  the connection string of the local node in the raft snapshot.
-- [Issue #1100](https://github.com/influxdb/influxdb/issues/1100). Removing
-  a non-existent shard space causes the cluster to panic.
-- [Issue #1113](https://github.com/influxdb/influxdb/issues/1113). A nil
-  engine.ProcessorChain causes a panic.
-
-## v0.8.5 [2014-10-27]
-
-### Features
-
-- [Issue #1055](https://github.com/influxdb/influxdb/issues/1055). Allow
-  graphite and collectd input plugins to have separate binding address
-
-### Bugfixes
-
-- [Issue #1058](https://github.com/influxdb/influxdb/issues/1058). Use
-  the query language instead of the continuous query endpoints that
-  were removed in 0.8.4
-- [Issue #1022](https://github.com/influxdb/influxdb/issues/1022). Return
-  an +Inf or NaN instead of panicing when we encounter a divide by zero
-- [Issue #821](https://github.com/influxdb/influxdb/issues/821). Don't
-  scan through points when we hit the limit
-- [Issue #1051](https://github.com/influxdb/influxdb/issues/1051). Fix
-  timestamps when the collectd is used and low resolution timestamps
-  is set.
-
-## v0.8.4 [2014-10-24]
-
-### Bugfixes
-
-- Remove the continuous query api endpoints since the query language
-  has all the features needed to list and delete continuous queries.
-- [Issue #778](https://github.com/influxdb/influxdb/issues/778). Selecting
-  from a non-existent series should give a better error message indicating
-  that the series doesn't exist
-- [Issue #988](https://github.com/influxdb/influxdb/issues/988). Check
-  the arguments of `top()` and `bottom()`
-- [Issue #1021](https://github.com/influxdb/influxdb/issues/1021). Make
-  redirecting to standard output and standard error optional instead of
-  going to `/dev/null`. This can now be configured by setting `$STDOUT`
-  in `/etc/default/influxdb`
-- [Issue #985](https://github.com/influxdb/influxdb/issues/985). Make
-  sure we drop a shard only when there's no one using it. Otherwise, the
-  shard can be closed when another goroutine is writing to it which will
-  cause random errors and possibly corruption of the database.
-
-### Features
-
-- [Issue #1047](https://github.com/influxdb/influxdb/issues/1047). Allow
-  merge() to take a list of series (as opposed to a regex in #72)
-
-## v0.8.4-rc.1 [2014-10-21]
-
-### Bugfixes
-
-- [Issue #1040](https://github.com/influxdb/influxdb/issues/1040). Revert
-  to older raft snapshot if the latest one is corrupted
-- [Issue #1004](https://github.com/influxdb/influxdb/issues/1004). Querying
-  for data outside of existing shards returns an empty response instead of
-  throwing a `Couldn't lookup columns` error
-- [Issue #1020](https://github.com/influxdb/influxdb/issues/1020). Change
-  init script exit codes to conform to the lsb standards. (Thanks, @spuder)
-- [Issue #1011](https://github.com/influxdb/influxdb/issues/1011). Fix
-  the tarball for homebrew so that rocksdb is included and the directory
-  structure is clean
-- [Issue #1007](https://github.com/influxdb/influxdb/issues/1007). Fix
-  the content type when an error occurs and the client requests
-  compression.
-- [Issue #916](https://github.com/influxdb/influxdb/issues/916). Set
-  the ulimit in the init script with a way to override the limit
-- [Issue #742](https://github.com/influxdb/influxdb/issues/742). Fix
-  rocksdb for Mac OSX
-- [Issue #387](https://github.com/influxdb/influxdb/issues/387). Aggregations
-  with group by time(1w), time(1m) and time(1y) (for week, month and
-  year respectively) will cause the start time and end time of the bucket
-  to fall on the logical boundaries of the week, month or year.
-- [Issue #334](https://github.com/influxdb/influxdb/issues/334). Derivative
-  for queries with group by time() and fill(), will take the difference
-  between the first value in the bucket and the first value of the next
-  bucket.
-- [Issue #972](https://github.com/influxdb/influxdb/issues/972). Don't
-  assign duplicate server ids
-
-### Features
-
-- [Issue #722](https://github.com/influxdb/influxdb/issues/722). Add
-  an install target to the Makefile
-- [Issue #1032](https://github.com/influxdb/influxdb/issues/1032). Include
-  the admin ui static assets in the binary
-- [Issue #1019](https://github.com/influxdb/influxdb/issues/1019). Upgrade
-  to rocksdb 3.5.1
-- [Issue #992](https://github.com/influxdb/influxdb/issues/992). Add
-  an input plugin for collectd. (Thanks, @kimor79)
-- [Issue #72](https://github.com/influxdb/influxdb/issues/72). Support merge
-  for multiple series using regex syntax
-
-## v0.8.3 [2014-09-24]
-
-### Bugfixes
-
-- [Issue #885](https://github.com/influxdb/influxdb/issues/885). Multiple
-  queries separated by semicolons work as expected. Queries are process
-  sequentially
-- [Issue #652](https://github.com/influxdb/influxdb/issues/652). Return an
-  error if an invalid column is used in the where clause
-- [Issue #794](https://github.com/influxdb/influxdb/issues/794). Fix case
-  insensitive regex matching
-- [Issue #853](https://github.com/influxdb/influxdb/issues/853). Move
-  cluster config from raft to API.
-- [Issue #714](https://github.com/influxdb/influxdb/issues/714). Don't
-  panic on invalid boolean operators.
-- [Issue #843](https://github.com/influxdb/influxdb/issues/843). Prevent blank database names
-- [Issue #780](https://github.com/influxdb/influxdb/issues/780). Fix
-  fill() for all aggregators
-- [Issue #923](https://github.com/influxdb/influxdb/issues/923). Enclose
-  table names in double quotes in the result of GetQueryString()
-- [Issue #923](https://github.com/influxdb/influxdb/issues/923). Enclose
-  table names in double quotes in the result of GetQueryString()
-- [Issue #967](https://github.com/influxdb/influxdb/issues/967). Return an
-  error if the storage engine can't be created
-- [Issue #954](https://github.com/influxdb/influxdb/issues/954). Don't automatically
-  create shards which was causing too many shards to be created when used with
-  grafana
-- [Issue #939](https://github.com/influxdb/influxdb/issues/939). Aggregation should
-  ignore null values and invalid values, e.g. strings with mean().
-- [Issue #964](https://github.com/influxdb/influxdb/issues/964). Parse
-  big int in queries properly.
-
-## v0.8.2 [2014-09-05]
-
-### Bugfixes
-
-- [Issue #886](https://github.com/influxdb/influxdb/issues/886). Update shard space to not set defaults
-
-- [Issue #867](https://github.com/influxdb/influxdb/issues/867). Add option to return shard space mappings in list series
-
-### Bugfixes
-
-- [Issue #652](https://github.com/influxdb/influxdb/issues/652). Return
-  a meaningful error if an invalid column is used in where clause
-  after joining multiple series
-
-## v0.8.2 [2014-09-08]
-
-### Features
-
-- Added API endpoint to update shard space definitions
-
-### Bugfixes
-
-- [Issue #886](https://github.com/influxdb/influxdb/issues/886). Shard space regexes reset after restart of InfluxDB
-
-## v0.8.1 [2014-09-03]
-
-- [Issue #896](https://github.com/influxdb/influxdb/issues/896). Allow logging to syslog. Thanks @malthe
-
-### Bugfixes
-
-- [Issue #868](https://github.com/influxdb/influxdb/issues/868). Don't panic when upgrading a snapshot from 0.7.x
-- [Issue #887](https://github.com/influxdb/influxdb/issues/887). The first continuous query shouldn't trigger backfill if it had backfill disabled
-- [Issue #674](https://github.com/influxdb/influxdb/issues/674). Graceful exit when config file is invalid. (Thanks, @DavidBord)
-- [Issue #857](https://github.com/influxdb/influxdb/issues/857). More informative list servers api. (Thanks, @oliveagle)
-
-## v0.8.0 [2014-08-22]
-
-### Features
-
-- [Issue #850](https://github.com/influxdb/influxdb/issues/850). Makes the server listing more informative
-
-### Bugfixes
-
-- [Issue #779](https://github.com/influxdb/influxdb/issues/779). Deleting expired shards isn't thread safe.
-- [Issue #860](https://github.com/influxdb/influxdb/issues/860). Load database config should validate shard spaces.
-- [Issue #862](https://github.com/influxdb/influxdb/issues/862). Data migrator should have option to set delay time.
-
-## v0.8.0-rc.5 [2014-08-15]
-
-### Features
-
-- [Issue #376](https://github.com/influxdb/influxdb/issues/376). List series should support regex filtering
-- [Issue #745](https://github.com/influxdb/influxdb/issues/745). Add continuous queries to the database config
-- [Issue #746](https://github.com/influxdb/influxdb/issues/746). Add data migration tool for 0.8.0
-
-### Bugfixes
-
-- [Issue #426](https://github.com/influxdb/influxdb/issues/426). Fill should fill the entire time range that is requested
-- [Issue #740](https://github.com/influxdb/influxdb/issues/740). Don't emit non existent fields when joining series with different fields
-- [Issue #744](https://github.com/influxdb/influxdb/issues/744). Admin site should have all assets locally
-- [Issue #767](https://github.com/influxdb/influxdb/issues/768). Remove shards whenever they expire
-- [Issue #781](https://github.com/influxdb/influxdb/issues/781). Don't emit non existent fields when joining series with different fields
-- [Issue #791](https://github.com/influxdb/influxdb/issues/791). Move database config loader to be an API endpoint
-- [Issue #809](https://github.com/influxdb/influxdb/issues/809). Migration path from 0.7 -> 0.8
-- [Issue #811](https://github.com/influxdb/influxdb/issues/811). Gogoprotobuf removed `ErrWrongType`, which is depended on by Raft
-- [Issue #820](https://github.com/influxdb/influxdb/issues/820). Query non-local shard with time range to avoid getting back points not in time range
-- [Issue #827](https://github.com/influxdb/influxdb/issues/827). Don't leak file descriptors in the WAL
-- [Issue #830](https://github.com/influxdb/influxdb/issues/830). List series should return series in lexicographic sorted order
-- [Issue #831](https://github.com/influxdb/influxdb/issues/831). Move create shard space to be db specific
-
-## v0.8.0-rc.4 [2014-07-29]
-
-### Bugfixes
-
-- [Issue #774](https://github.com/influxdb/influxdb/issues/774). Don't try to parse "inf" shard retention policy
-- [Issue #769](https://github.com/influxdb/influxdb/issues/769). Use retention duration when determining expired shards. (Thanks, @shugo)
-- [Issue #736](https://github.com/influxdb/influxdb/issues/736). Only db admins should be able to drop a series
-- [Issue #713](https://github.com/influxdb/influxdb/issues/713). Null should be a valid fill value
-- [Issue #644](https://github.com/influxdb/influxdb/issues/644). Graphite api should write data in batches to the coordinator
-- [Issue #740](https://github.com/influxdb/influxdb/issues/740). Panic when distinct fields are selected from an inner join
-- [Issue #781](https://github.com/influxdb/influxdb/issues/781). Panic when distinct fields are added after an inner join
-
-## v0.8.0-rc.3 [2014-07-21]
-
-### Bugfixes
-
-- [Issue #752](https://github.com/influxdb/influxdb/issues/752). `./configure` should use goroot to find gofmt
-- [Issue #758](https://github.com/influxdb/influxdb/issues/758). Clarify the reason behind graphite input plugin not starting. (Thanks, @otoolep)
-- [Issue #759](https://github.com/influxdb/influxdb/issues/759). Don't revert the regex in the shard space. (Thanks, @shugo)
-- [Issue #760](https://github.com/influxdb/influxdb/issues/760). Removing a server should remove it from the shard server ids. (Thanks, @shugo)
-- [Issue #772](https://github.com/influxdb/influxdb/issues/772). Add sentinel values to all db. This caused the last key in the db to not be fetched properly.
-
-
-## v0.8.0-rc.2 [2014-07-15]
-
-- This release is to fix a build error in rc1 which caused rocksdb to not be available
-- Bump up the `max-open-files` option to 1000 on all storage engines
-- Lower the `write-buffer-size` to 1000
-
-## v0.8.0-rc.1 [2014-07-15]
-
-### Features
-
-- [Issue #643](https://github.com/influxdb/influxdb/issues/643). Support pretty print json. (Thanks, @otoolep)
-- [Issue #641](https://github.com/influxdb/influxdb/issues/641). Support multiple storage engines
-- [Issue #665](https://github.com/influxdb/influxdb/issues/665). Make build tmp directory configurable in the make file. (Thanks, @dgnorton)
-- [Issue #667](https://github.com/influxdb/influxdb/issues/667). Enable compression on all GET requests and when writing data
-- [Issue #648](https://github.com/influxdb/influxdb/issues/648). Return permissions when listing db users. (Thanks, @nicolai86)
-- [Issue #682](https://github.com/influxdb/influxdb/issues/682). Allow continuous queries to run without backfill (Thanks, @dhammika)
-- [Issue #689](https://github.com/influxdb/influxdb/issues/689). **REQUIRES DATA MIGRATION** Move metadata into raft
-- [Issue #255](https://github.com/influxdb/influxdb/issues/255). Support millisecond precision using `ms` suffix
-- [Issue #95](https://github.com/influxdb/influxdb/issues/95). Drop database should not be synchronous
-- [Issue #571](https://github.com/influxdb/influxdb/issues/571). Add support for arbitrary number of shard spaces and retention policies
-- Default storage engine changed to RocksDB
-
-### Bugfixes
-
-- [Issue #651](https://github.com/influxdb/influxdb/issues/651). Change permissions of symlink which fix some installation issues. (Thanks, @Dieterbe)
-- [Issue #670](https://github.com/influxdb/influxdb/issues/670). Don't warn on missing influxdb user on fresh installs
-- [Issue #676](https://github.com/influxdb/influxdb/issues/676). Allow storing high precision integer values without losing any information
-- [Issue #695](https://github.com/influxdb/influxdb/issues/695). Prevent having duplicate field names in the write payload. (Thanks, @seunglee150)
-- [Issue #731](https://github.com/influxdb/influxdb/issues/731). Don't enable the udp plugin if the `enabled` option is set to false
-- [Issue #733](https://github.com/influxdb/influxdb/issues/733). Print an `INFO` message when the input plugin is disabled
-- [Issue #707](https://github.com/influxdb/influxdb/issues/707). Graphite input plugin should work payload delimited by any whitespace character
-- [Issue #734](https://github.com/influxdb/influxdb/issues/734). Don't buffer non replicated writes
-- [Issue #465](https://github.com/influxdb/influxdb/issues/465). Recreating a currently deleting db or series doesn't bring back the old data anymore
-- [Issue #358](https://github.com/influxdb/influxdb/issues/358). **BREAKING** List series should return as a single series
-- [Issue #499](https://github.com/influxdb/influxdb/issues/499). **BREAKING** Querying non-existent database or series will return an error
-- [Issue #570](https://github.com/influxdb/influxdb/issues/570). InfluxDB crashes during delete/drop of database
-- [Issue #592](https://github.com/influxdb/influxdb/issues/592). Drop series is inefficient
-
-## v0.7.3 [2014-06-13]
-
-### Bugfixes
-
-- [Issue #637](https://github.com/influxdb/influxdb/issues/637). Truncate log files if the last request wasn't written properly
-- [Issue #646](https://github.com/influxdb/influxdb/issues/646). CRITICAL: Duplicate shard ids for new shards if old shards are deleted.
-
-## v0.7.2 [2014-05-30]
-
-### Features
-
-- [Issue #521](https://github.com/influxdb/influxdb/issues/521). MODE works on all datatypes (Thanks, @richthegeek)
-
-### Bugfixes
-
-- [Issue #418](https://github.com/influxdb/influxdb/pull/418). Requests or responses larger than MAX_REQUEST_SIZE break things.
-- [Issue #606](https://github.com/influxdb/influxdb/issues/606). InfluxDB will fail to start with invalid permission if log.txt didn't exist
-- [Issue #602](https://github.com/influxdb/influxdb/issues/602). Merge will fail to work across shards
-
-### Features
-
-## v0.7.1 [2014-05-29]
-
-### Bugfixes
-
-- [Issue #579](https://github.com/influxdb/influxdb/issues/579). Reject writes to nonexistent databases
-- [Issue #597](https://github.com/influxdb/influxdb/issues/597). Force compaction after deleting data
-
-### Features
-
-- [Issue #476](https://github.com/influxdb/influxdb/issues/476). Support ARM architecture
-- [Issue #578](https://github.com/influxdb/influxdb/issues/578). Support aliasing for expressions in parenthesis
-- [Issue #544](https://github.com/influxdb/influxdb/pull/544). Support forcing node removal from a cluster
-- [Issue #591](https://github.com/influxdb/influxdb/pull/591). Support multiple udp input plugins (Thanks, @tpitale)
-- [Issue #600](https://github.com/influxdb/influxdb/pull/600). Report version, os, arch, and raftName once per day.
-
-## v0.7.0 [2014-05-23]
-
-### Bugfixes
-
-- [Issue #557](https://github.com/influxdb/influxdb/issues/557). Group by time(1y) doesn't work while time(365d) works
-- [Issue #547](https://github.com/influxdb/influxdb/issues/547). Add difference function (Thanks, @mboelstra)
-- [Issue #550](https://github.com/influxdb/influxdb/issues/550). Fix tests on 32-bit ARM
-- [Issue #524](https://github.com/influxdb/influxdb/issues/524). Arithmetic operators and where conditions don't play nice together
-- [Issue #561](https://github.com/influxdb/influxdb/issues/561). Fix missing query in parsing errors
-- [Issue #563](https://github.com/influxdb/influxdb/issues/563). Add sample config for graphite over udp
-- [Issue #537](https://github.com/influxdb/influxdb/issues/537). Incorrect query syntax causes internal error
-- [Issue #565](https://github.com/influxdb/influxdb/issues/565). Empty series names shouldn't cause a panic
-- [Issue #575](https://github.com/influxdb/influxdb/issues/575). Single point select doesn't interpret timestamps correctly
-- [Issue #576](https://github.com/influxdb/influxdb/issues/576). We shouldn't set timestamps and sequence numbers when listing cq
-- [Issue #560](https://github.com/influxdb/influxdb/issues/560). Use /dev/urandom instead of /dev/random
-- [Issue #502](https://github.com/influxdb/influxdb/issues/502). Fix a
-  race condition in assigning id to db+series+field (Thanks @ohurvitz
-  for reporting this bug and providing a script to repro)
-
-### Features
-
-- [Issue #567](https://github.com/influxdb/influxdb/issues/567). Allow selecting from multiple series names by separating them with commas (Thanks, @peekeri)
-
-### Deprecated
-
-- [Issue #460](https://github.com/influxdb/influxdb/issues/460). Don't start automatically after installing
-- [Issue #529](https://github.com/influxdb/influxdb/issues/529). Don't run influxdb as root
-- [Issue #443](https://github.com/influxdb/influxdb/issues/443). Use `name` instead of `username` when returning cluster admins
-
-## v0.6.5 [2014-05-19]
-
-### Features
-
-- [Issue #551](https://github.com/influxdb/influxdb/issues/551). Add TOP and BOTTOM aggregate functions (Thanks, @chobie)
-
-### Bugfixes
-
-- [Issue #555](https://github.com/influxdb/influxdb/issues/555). Fix a regression introduced in the raft snapshot format
-
-## v0.6.4 [2014-05-16]
-
-### Features
-
-- Make the write batch size configurable (also applies to deletes)
-- Optimize writing to multiple series
-- [Issue #546](https://github.com/influxdb/influxdb/issues/546). Add UDP support for Graphite API (Thanks, @peekeri)
-
-### Bugfixes
-
-- Fix a bug in shard logic that caused short term shards to be clobbered with long term shards
-- [Issue #489](https://github.com/influxdb/influxdb/issues/489). Remove replication factor from CreateDatabase command
-
-## v0.6.3 [2014-05-13]
-
-### Features
-
-- [Issue #505](https://github.com/influxdb/influxdb/issues/505). Return a version header with http the response (Thanks, @majst01)
-- [Issue #520](https://github.com/influxdb/influxdb/issues/520). Print the version to the log file
-
-### Bugfixes
-
-- [Issue #516](https://github.com/influxdb/influxdb/issues/516). Close WAL log/index files when they aren't being used
-- [Issue #532](https://github.com/influxdb/influxdb/issues/532). Don't log graphite connection EOF as an error
-- [Issue #535](https://github.com/influxdb/influxdb/issues/535). WAL Replay hangs if response isn't received
-- [Issue #538](https://github.com/influxdb/influxdb/issues/538). Don't panic if the same series existed twice in the request with different columns
-- [Issue #536](https://github.com/influxdb/influxdb/issues/536). Joining the cluster after shards are creating shouldn't cause new nodes to panic
-- [Issue #539](https://github.com/influxdb/influxdb/issues/539). count(distinct()) with fill shouldn't panic on empty groups
-- [Issue #534](https://github.com/influxdb/influxdb/issues/534). Create a new series when interpolating
-
-## v0.6.2 [2014-05-09]
-
-### Bugfixes
-
-- [Issue #511](https://github.com/influxdb/influxdb/issues/511). Don't automatically create the database when a db user is created
-- [Issue #512](https://github.com/influxdb/influxdb/issues/512). Group by should respect null values
-- [Issue #518](https://github.com/influxdb/influxdb/issues/518). Filter Infinities and NaNs from the returned json
-- [Issue #522](https://github.com/influxdb/influxdb/issues/522). Committing requests while replaying caused the WAL to skip some log files
-- [Issue #369](https://github.com/influxdb/influxdb/issues/369). Fix some edge cases with WAL recovery
-
-## v0.6.1 [2014-05-06]
-
-### Bugfixes
-
-- [Issue #500](https://github.com/influxdb/influxdb/issues/500). Support `y` suffix in time durations
-- [Issue #501](https://github.com/influxdb/influxdb/issues/501). Writes with invalid payload should be rejected
-- [Issue #507](https://github.com/influxdb/influxdb/issues/507). New cluster admin passwords don't propagate properly to other nodes in a cluster
-- [Issue #508](https://github.com/influxdb/influxdb/issues/508). Don't replay WAL entries for servers with no shards
-- [Issue #464](https://github.com/influxdb/influxdb/issues/464). Admin UI shouldn't draw graphs for string columns
-- [Issue #480](https://github.com/influxdb/influxdb/issues/480). Large values on the y-axis get cut off
-
-## v0.6.0 [2014-05-02]
-
-### Feature
-
-- [Issue #477](https://github.com/influxdb/influxdb/issues/477). Add a udp json interface (Thanks, Julien Ammous)
-- [Issue #491](https://github.com/influxdb/influxdb/issues/491). Make initial root password settable through env variable (Thanks, Edward Muller)
-
-### Bugfixes
-
-- [Issue #469](https://github.com/influxdb/influxdb/issues/469). Drop continuous queries when a database is dropped
-- [Issue #431](https://github.com/influxdb/influxdb/issues/431). Don't log to standard output if a log file is specified in the config file
-- [Issue #483](https://github.com/influxdb/influxdb/issues/483). Return 409 if a database already exist (Thanks, Edward Muller)
-- [Issue #486](https://github.com/influxdb/influxdb/issues/486). Columns used in the target of continuous query shouldn't be inserted in the time series
-- [Issue #490](https://github.com/influxdb/influxdb/issues/490). Database user password's cannot be changed (Thanks, Edward Muller)
-- [Issue #495](https://github.com/influxdb/influxdb/issues/495). Enforce write permissions properly
-
-## v0.5.12 [2014-04-29]
-
-### Bugfixes
-
-- [Issue #419](https://github.com/influxdb/influxdb/issues/419),[Issue #478](https://github.com/influxdb/influxdb/issues/478). Allow hostname, raft and protobuf ports to be changed, without requiring manual intervention from the user
-
-## v0.5.11 [2014-04-25]
-
-### Features
-
-- [Issue #471](https://github.com/influxdb/influxdb/issues/471). Read and write permissions should be settable through the http api
-
-### Bugfixes
-
-- [Issue #323](https://github.com/influxdb/influxdb/issues/323). Continuous queries should guard against data loops
-- [Issue #473](https://github.com/influxdb/influxdb/issues/473). Engine memory optimization
-
-## v0.5.10 [2014-04-22]
-
-### Features
-
-- [Issue #463](https://github.com/influxdb/influxdb/issues/463). Allow series names to use any character (escape by wrapping in double quotes)
-- [Issue #447](https://github.com/influxdb/influxdb/issues/447). Allow @ in usernames
-- [Issue #466](https://github.com/influxdb/influxdb/issues/466). Allow column names to use any character (escape by wrapping in double quotes)
-
-### Bugfixes
-
-- [Issue #458](https://github.com/influxdb/influxdb/issues/458). Continuous queries with group by time() and a column should insert sequence numbers of 1
-- [Issue #457](https://github.com/influxdb/influxdb/issues/457). Deleting series that start with capital letters should work
-
-## v0.5.9 [2014-04-18]
-
-### Bugfixes
-
-- [Issue #446](https://github.com/influxdb/influxdb/issues/446). Check for (de)serialization errors
-- [Issue #456](https://github.com/influxdb/influxdb/issues/456). Continuous queries failed if one of the group by columns had null value
-- [Issue #455](https://github.com/influxdb/influxdb/issues/455). Comparison operators should ignore null values
-
-## v0.5.8 [2014-04-17]
-
-- Renamed config.toml.sample to config.sample.toml
-
-### Bugfixes
-
-- [Issue #244](https://github.com/influxdb/influxdb/issues/244). Reconstruct the query from the ast
-- [Issue #449](https://github.com/influxdb/influxdb/issues/449). Heartbeat timeouts can cause reading from connection to lock up
-- [Issue #451](https://github.com/influxdb/influxdb/issues/451). Reduce the aggregation state that is kept in memory so that
-  aggregation queries over large periods of time don't take insance amount of memory
-
-## v0.5.7 [2014-04-15]
-
-### Features
-
-- Queries are now logged as INFO in the log file before they run
-
-### Bugfixes
-
-- [Issue #328](https://github.com/influxdb/influxdb/issues/328). Join queries with math expressions don't work
-- [Issue #440](https://github.com/influxdb/influxdb/issues/440). Heartbeat timeouts in logs
-- [Issue #442](https://github.com/influxdb/influxdb/issues/442). shouldQuerySequentially didn't work as expected
-  causing count(*) queries on large time series to use
-  lots of memory
-- [Issue #437](https://github.com/influxdb/influxdb/issues/437). Queries with negative constants don't parse properly
-- [Issue #432](https://github.com/influxdb/influxdb/issues/432). Deleted data using a delete query is resurrected after a server restart
-- [Issue #439](https://github.com/influxdb/influxdb/issues/439). Report the right location of the error in the query
-- Fix some bugs with the WAL recovery on startup
-
-## v0.5.6 [2014-04-08]
-
-### Features
-
-- [Issue #310](https://github.com/influxdb/influxdb/issues/310). Request should support multiple timeseries
-- [Issue #416](https://github.com/influxdb/influxdb/issues/416). Improve the time it takes to drop database
-
-### Bugfixes
-
-- [Issue #413](https://github.com/influxdb/influxdb/issues/413). Don't assume that group by interval is greater than a second
-- [Issue #415](https://github.com/influxdb/influxdb/issues/415). Include the database when sending an auth error back to the user
-- [Issue #421](https://github.com/influxdb/influxdb/issues/421). Make read timeout a config option
-- [Issue #392](https://github.com/influxdb/influxdb/issues/392). Different columns in different shards returns invalid results when a query spans those shards
-
-### Bugfixes
-
-## v0.5.5 [2014-04-04]
-
-- Upgrade leveldb 1.10 -> 1.15
-
-  This should be a backward compatible change, but is here for documentation only
-
-### Feature
-
-- Add a command line option to repair corrupted leveldb databases on startup
-- [Issue #401](https://github.com/influxdb/influxdb/issues/401). No limit on the number of columns in the group by clause
-
-### Bugfixes
-
-- [Issue #398](https://github.com/influxdb/influxdb/issues/398). Support now() and NOW() in the query lang
-- [Issue #403](https://github.com/influxdb/influxdb/issues/403). Filtering should work with join queries
-- [Issue #404](https://github.com/influxdb/influxdb/issues/404). Filtering with invalid condition shouldn't crash the server
-- [Issue #405](https://github.com/influxdb/influxdb/issues/405). Percentile shouldn't crash for small number of values
-- [Issue #408](https://github.com/influxdb/influxdb/issues/408). Make InfluxDB recover from internal bugs and panics
-- [Issue #390](https://github.com/influxdb/influxdb/issues/390). Multiple response.WriteHeader when querying as admin
-- [Issue #407](https://github.com/influxdb/influxdb/issues/407). Start processing continuous queries only after the WAL is initialized
-- Close leveldb databases properly if we couldn't create a new Shard. See leveldb\_shard\_datastore\_test:131
-
-## v0.5.4 [2014-04-02]
-
-### Bugfixes
-
-- [Issue #386](https://github.com/influxdb/influxdb/issues/386). Drop series should work with series containing dots
-- [Issue #389](https://github.com/influxdb/influxdb/issues/389). Filtering shouldn't stop prematurely
-- [Issue #341](https://github.com/influxdb/influxdb/issues/341). Make the number of shards that are queried in parallel configurable
-- [Issue #394](https://github.com/influxdb/influxdb/issues/394). Support count(distinct) and count(DISTINCT)
-- [Issue #362](https://github.com/influxdb/influxdb/issues/362). Limit should be enforced after aggregation
-
-## v0.5.3 [2014-03-31]
-
-### Bugfixes
-
-- [Issue #378](https://github.com/influxdb/influxdb/issues/378). Indexing should return if there are no requests added since the last index
-- [Issue #370](https://github.com/influxdb/influxdb/issues/370). Filtering and limit should be enforced on the shards
-- [Issue #379](https://github.com/influxdb/influxdb/issues/379). Boolean columns should be usable in where clauses
-- [Issue #381](https://github.com/influxdb/influxdb/issues/381). Should be able to do deletes as a cluster admin
-
-## v0.5.2 [2014-03-28]
-
-### Bugfixes
-
-- [Issue #342](https://github.com/influxdb/influxdb/issues/342). Data resurrected after a server restart
-- [Issue #367](https://github.com/influxdb/influxdb/issues/367). Influxdb won't start if the api port is commented out
-- [Issue #355](https://github.com/influxdb/influxdb/issues/355). Return an error on wrong time strings
-- [Issue #331](https://github.com/influxdb/influxdb/issues/331). Allow negative time values in the where clause
-- [Issue #371](https://github.com/influxdb/influxdb/issues/371). Seris index isn't deleted when the series is dropped
-- [Issue #360](https://github.com/influxdb/influxdb/issues/360). Store and recover continuous queries
-
-## v0.5.1 [2014-03-24]
-
-### Bugfixes
-
-- Revert the version of goraft due to a bug found in the latest version
-
-## v0.5.0 [2014-03-24]
-
-### Features
-
-- [Issue #293](https://github.com/influxdb/influxdb/pull/293). Implement a Graphite listener
-
-### Bugfixes
-
-- [Issue #340](https://github.com/influxdb/influxdb/issues/340). Writing many requests while replaying seems to cause commits out of order
-
-## v0.5.0-rc.6 [2014-03-20]
-
-### Bugfixes
-
-- Increase raft election timeout to avoid unecessary relections
-- Sort points before writing them to avoid an explosion in the request
-  number when the points are written randomly
-- [Issue #335](https://github.com/influxdb/influxdb/issues/335). Fixes regexp for interpolating more than one column value in continuous queries
-- [Issue #318](https://github.com/influxdb/influxdb/pull/318). Support EXPLAIN queries
-- [Issue #333](https://github.com/influxdb/influxdb/pull/333). Fail
-  when the password is too short or too long instead of passing it to
-  the crypto library
-
-## v0.5.0-rc.5 [2014-03-11]
-
-### Bugfixes
-
-- [Issue #312](https://github.com/influxdb/influxdb/issues/312). WAL should wait for server id to be set before recovering
-- [Issue #301](https://github.com/influxdb/influxdb/issues/301). Use ref counting to guard against race conditions in the shard cache
-- [Issue #319](https://github.com/influxdb/influxdb/issues/319). Propagate engine creation error correctly to the user
-- [Issue #316](https://github.com/influxdb/influxdb/issues/316). Make
-  sure we don't starve goroutines if we get an access denied error
-  from one of the shards
-- [Issue #306](https://github.com/influxdb/influxdb/issues/306). Deleting/Dropping database takes a lot of memory
-- [Issue #302](https://github.com/influxdb/influxdb/issues/302). Should be able to set negative timestamps on points
-- [Issue #327](https://github.com/influxdb/influxdb/issues/327). Make delete queries not use WAL. This addresses #315, #317 and #314
-- [Issue #321](https://github.com/influxdb/influxdb/issues/321). Make sure we split points on shards properly
-
-## v0.5.0-rc.4 [2014-03-07]
-
-### Bugfixes
-
-- [Issue #298](https://github.com/influxdb/influxdb/issues/298). Fix limit when querying multiple shards
-- [Issue #305](https://github.com/influxdb/influxdb/issues/305). Shard ids not unique after restart
-- [Issue #309](https://github.com/influxdb/influxdb/issues/309). Don't relog the requests on the remote server
-- Fix few bugs in the WAL and refactor the way it works (this requires purging the WAL from previous rc)
-
-## v0.5.0-rc.3 [2014-03-03]
-
-### Bugfixes
-- [Issue #69](https://github.com/influxdb/influxdb/issues/69). Support column aliases
-- [Issue #287](https://github.com/influxdb/influxdb/issues/287). Make the lru cache size configurable
-- [Issue #38](https://github.com/influxdb/influxdb/issues/38). Fix a memory leak discussed in this story
-- [Issue #286](https://github.com/influxdb/influxdb/issues/286). Make the number of open shards configurable
-- Make LevelDB use the max open files configuration option.
-
-## v0.5.0-rc.2 [2014-02-27]
-
-### Bugfixes
-
-- [Issue #274](https://github.com/influxdb/influxdb/issues/274). Crash after restart
-- [Issue #277](https://github.com/influxdb/influxdb/issues/277). Ensure duplicate shards won't be created
-- [Issue #279](https://github.com/influxdb/influxdb/issues/279). Limits not working on regex queries
-- [Issue #281](https://github.com/influxdb/influxdb/issues/281). `./influxdb -v` should print the sha when building from source
-- [Issue #283](https://github.com/influxdb/influxdb/issues/283). Dropping shard and restart in cluster causes panic.
-- [Issue #288](https://github.com/influxdb/influxdb/issues/288). Sequence numbers should be unique per server id
-
-## v0.5.0-rc.1 [2014-02-25]
-
-### Bugfixes
-
-- Ensure large deletes don't take too much memory
-- [Issue #240](https://github.com/influxdb/influxdb/pull/240). Unable to query against columns with `.` in the name.
-- [Issue #250](https://github.com/influxdb/influxdb/pull/250). different result between normal and continuous query with "group by" clause
-- [Issue #216](https://github.com/influxdb/influxdb/pull/216). Results with no points should exclude columns and points
-
-### Features
-
-- [Issue #243](https://github.com/influxdb/influxdb/issues/243). Should have endpoint to GET a user's attributes.
-- [Issue #269](https://github.com/influxdb/influxdb/pull/269), [Issue #65](https://github.com/influxdb/influxdb/issues/65) New clustering architecture (see docs), with the side effect that queries can be distributed between multiple shards
-- [Issue #164](https://github.com/influxdb/influxdb/pull/269),[Issue #103](https://github.com/influxdb/influxdb/pull/269),[Issue #166](https://github.com/influxdb/influxdb/pull/269),[Issue #165](https://github.com/influxdb/influxdb/pull/269),[Issue #132](https://github.com/influxdb/influxdb/pull/269) Make request log a log file instead of leveldb with recovery on startup
-
-### Deprecated
-
-- [Issue #189](https://github.com/influxdb/influxdb/issues/189). `/cluster_admins` and `/db/:db/users` return usernames in a `name` key instead of `username` key.
-- [Issue #216](https://github.com/influxdb/influxdb/pull/216). Results with no points should exclude columns and points
-
-## v0.4.4 [2014-02-05]
-
-### Features
-
-- Make the leveldb max open files configurable in the toml file
-
-## v0.4.3 [2014-01-31]
-
-### Bugfixes
-
-- [Issue #225](https://github.com/influxdb/influxdb/issues/225). Remove a hard limit on the points returned by the datastore
-- [Issue #223](https://github.com/influxdb/influxdb/issues/223). Null values caused count(distinct()) to panic
-- [Issue #224](https://github.com/influxdb/influxdb/issues/224). Null values broke replication due to protobuf limitation
-
-## v0.4.1 [2014-01-30]
-
-### Features
-
-- [Issue #193](https://github.com/influxdb/influxdb/issues/193). Allow logging to stdout. Thanks @schmurfy
-- [Issue #190](https://github.com/influxdb/influxdb/pull/190). Add support for SSL.
-- [Issue #194](https://github.com/influxdb/influxdb/pull/194). Should be able to disable Admin interface.
-
-### Bugfixes
-
-- [Issue #33](https://github.com/influxdb/influxdb/issues/33). Don't call WriteHeader more than once per request
-- [Issue #195](https://github.com/influxdb/influxdb/issues/195). Allow the bind address to be configurable, Thanks @schmurfy.
-- [Issue #199](https://github.com/influxdb/influxdb/issues/199). Make the test timeout configurable
-- [Issue #200](https://github.com/influxdb/influxdb/issues/200). Selecting `time` or `sequence_number` silently fail
-- [Issue #215](https://github.com/influxdb/influxdb/pull/215). Server fails to start up after Raft log compaction and restart.
-
-## v0.4.0 [2014-01-17]
-
-## Features
-
-- [Issue #86](https://github.com/influxdb/influxdb/issues/86). Support arithmetic expressions in select clause
-- [Issue #92](https://github.com/influxdb/influxdb/issues/92). Change '==' to '=' and '!=' to '<>'
-- [Issue #88](https://github.com/influxdb/influxdb/issues/88). Support datetime strings
-- [Issue #64](https://github.com/influxdb/influxdb/issues/64). Shard writes and queries across cluster with replay for briefly downed nodes (< 24 hrs)
-- [Issue #78](https://github.com/influxdb/influxdb/issues/78). Sequence numbers persist across restarts so they're not reused
-- [Issue #102](https://github.com/influxdb/influxdb/issues/102). Support expressions in where condition
-- [Issue #101](https://github.com/influxdb/influxdb/issues/101). Support expressions in aggregates
-- [Issue #62](https://github.com/influxdb/influxdb/issues/62). Support updating and deleting column values
-- [Issue #96](https://github.com/influxdb/influxdb/issues/96). Replicate deletes in a cluster
-- [Issue #94](https://github.com/influxdb/influxdb/issues/94). delete queries
-- [Issue #116](https://github.com/influxdb/influxdb/issues/116). Use proper logging
-- [Issue #40](https://github.com/influxdb/influxdb/issues/40). Use TOML instead of JSON in the config file
-- [Issue #99](https://github.com/influxdb/influxdb/issues/99). Support list series in the query language
-- [Issue #149](https://github.com/influxdb/influxdb/issues/149). Cluster admins should be able to perform reads and writes.
-- [Issue #108](https://github.com/influxdb/influxdb/issues/108). Querying one point using `time =`
-- [Issue #114](https://github.com/influxdb/influxdb/issues/114). Servers should periodically check that they're consistent.
-- [Issue #93](https://github.com/influxdb/influxdb/issues/93). Should be able to drop a time series
-- [Issue #177](https://github.com/influxdb/influxdb/issues/177). Support drop series in the query language.
-- [Issue #184](https://github.com/influxdb/influxdb/issues/184). Implement Raft log compaction.
-- [Issue #153](https://github.com/influxdb/influxdb/issues/153). Implement continuous queries
-
-### Bugfixes
-
-- [Issue #90](https://github.com/influxdb/influxdb/issues/90). Group by multiple columns panic
-- [Issue #89](https://github.com/influxdb/influxdb/issues/89). 'Group by' combined with 'where' not working
-- [Issue #106](https://github.com/influxdb/influxdb/issues/106). Don't panic if we only see one point and can't calculate derivative
-- [Issue #105](https://github.com/influxdb/influxdb/issues/105). Panic when using a where clause that reference columns with null values
-- [Issue #61](https://github.com/influxdb/influxdb/issues/61). Remove default limits from queries
-- [Issue #118](https://github.com/influxdb/influxdb/issues/118). Make column names starting with '_' legal
-- [Issue #121](https://github.com/influxdb/influxdb/issues/121). Don't fall back to the cluster admin auth if the db user auth fails
-- [Issue #127](https://github.com/influxdb/influxdb/issues/127). Return error on delete queries with where condition that don't have time
-- [Issue #117](https://github.com/influxdb/influxdb/issues/117). Fill empty groups with default values
-- [Issue #150](https://github.com/influxdb/influxdb/pull/150). Fix parser for when multiple divisions look like a regex.
-- [Issue #158](https://github.com/influxdb/influxdb/issues/158). Logged deletes should be stored with the time range if missing.
-- [Issue #136](https://github.com/influxdb/influxdb/issues/136). Make sure writes are replicated in order to avoid triggering replays
-- [Issue #145](https://github.com/influxdb/influxdb/issues/145). Server fails to join cluster if all starting at same time.
-- [Issue #176](https://github.com/influxdb/influxdb/issues/176). Drop database should take effect on all nodes
-- [Issue #180](https://github.com/influxdb/influxdb/issues/180). Column names not returned when running multi-node cluster and writing more than one point.
-- [Issue #182](https://github.com/influxdb/influxdb/issues/182). Queries with invalid limit clause crash the server
-
-### Deprecated
-
-- deprecate '==' and '!=' in favor of '=' and '<>', respectively
-- deprecate `/dbs` (for listing databases) in favor of a more consistent `/db` endpoint
-- deprecate `username` field for a more consistent `name` field in `/db/:db/users` and `/cluster_admins`
-- deprecate endpoints `/db/:db/admins/:user` in favor of using `/db/:db/users/:user` which should
-  be used to update user flags, password, etc.
-- Querying for column names that don't exist no longer throws an error.
-
-## v0.3.2
-
-## Features
-
-- [Issue #82](https://github.com/influxdb/influxdb/issues/82). Add endpoint for listing available admin interfaces.
-- [Issue #80](https://github.com/influxdb/influxdb/issues/80). Support durations when specifying start and end time
-- [Issue #81](https://github.com/influxdb/influxdb/issues/81). Add support for IN
-
-## Bugfixes
-
-- [Issue #75](https://github.com/influxdb/influxdb/issues/75). Don't allow time series names that start with underscore
-- [Issue #85](https://github.com/influxdb/influxdb/issues/85). Non-existing columns exist after they have been queried before
-
-## v0.3.0
-
-## Features
-
-- [Issue #51](https://github.com/influxdb/influxdb/issues/51). Implement first and last aggregates
-- [Issue #35](https://github.com/influxdb/influxdb/issues/35). Support table aliases in Join Queries
-- [Issue #71](https://github.com/influxdb/influxdb/issues/71). Add WillReturnSingleSeries to the Query
-- [Issue #61](https://github.com/influxdb/influxdb/issues/61). Limit should default to 10k
-- [Issue #59](https://github.com/influxdb/influxdb/issues/59). Add histogram aggregate function
-
-## Bugfixes
-
-- Fix join and merges when the query is a descending order query
-- [Issue #57](https://github.com/influxdb/influxdb/issues/57). Don't panic when type of time != float
-- [Issue #63](https://github.com/influxdb/influxdb/issues/63). Aggregate queries should not have a sequence_number column
-
-## v0.2.0
-
-### Features
-
-- [Issue #37](https://github.com/influxdb/influxdb/issues/37). Support the negation of the regex matcher !~
-- [Issue #47](https://github.com/influxdb/influxdb/issues/47). Spill out query and database detail at the time of bug report
-
-### Bugfixes
-
-- [Issue #36](https://github.com/influxdb/influxdb/issues/36). The regex operator should be =~ not ~=
-- [Issue #39](https://github.com/influxdb/influxdb/issues/39). Return proper content types from the http api
-- [Issue #42](https://github.com/influxdb/influxdb/issues/42). Make the api consistent with the docs
-- [Issue #41](https://github.com/influxdb/influxdb/issues/41). Table/Points not deleted when database is dropped
-- [Issue #45](https://github.com/influxdb/influxdb/issues/45). Aggregation shouldn't mess up the order of the points
-- [Issue #44](https://github.com/influxdb/influxdb/issues/44). Fix crashes on RHEL 5.9
-- [Issue #34](https://github.com/influxdb/influxdb/issues/34). Ascending order always return null for columns that have a null value
-- [Issue #55](https://github.com/influxdb/influxdb/issues/55). Limit should limit the points that match the Where clause
-- [Issue #53](https://github.com/influxdb/influxdb/issues/53). Writing null values via HTTP API fails
-
-### Deprecated
-
-- Preparing to deprecate `/dbs` (for listing databases) in favor of a more consistent `/db` endpoint
-- Preparing to deprecate `username` field for a more consistent `name` field in the `/db/:db/users`
-- Preparing to deprecate endpoints `/db/:db/admins/:user` in favor of using `/db/:db/users/:user` which should
-  be used to update user flags, password, etc.
-
-## v0.1.0
-
-### Features
-
-- [Issue #29](https://github.com/influxdb/influxdb/issues/29). Semicolon is now optional in queries
-- [Issue #31](https://github.com/influxdb/influxdb/issues/31). Support Basic Auth as well as query params for authentication.
-
-### Bugfixes
-
-- Don't allow creating users with empty username
-- [Issue #22](https://github.com/influxdb/influxdb/issues/22). Don't set goroot if it was set
-- [Issue #25](https://github.com/influxdb/influxdb/issues/25). Fix queries that use the median aggregator
-- [Issue #26](https://github.com/influxdb/influxdb/issues/26). Default log and db directories should be in /opt/influxdb/shared/data
-- [Issue #27](https://github.com/influxdb/influxdb/issues/27). Group by should not blow up if the one of the columns in group by has null values
-- [Issue #30](https://github.com/influxdb/influxdb/issues/30). Column indexes/names getting off somehow
-- [Issue #32](https://github.com/influxdb/influxdb/issues/32). Fix many typos in the codebase. Thanks @pborreli
-
-## v0.0.9
-
-#### Features
-
-- Add stddev(...) support
-- Better docs, thanks @auxesis and @d-snp.
-
-#### Bugfixes
-
-- Set PYTHONPATH and CC appropriately on mac os x.
-- [Issue #18](https://github.com/influxdb/influxdb/issues/18). Fix 386 debian and redhat packages
-- [Issue #23](https://github.com/influxdb/influxdb/issues/23). Fix the init scripts on redhat
-
-## v0.0.8
-
-#### Features
-
-- Add a way to reset the root password from the command line.
-- Add distinct(..) and derivative(...) support
-- Print test coverage if running go1.2
-
-#### Bugfixes
-
-- Fix the default admin site path in the .deb and .rpm packages.
-- Fix the configuration filename in the .tar.gz package.
-
-## v0.0.7
-
-#### Features
-
-- include the admin site in the repo to make it easier for newcomers.
-
-## v0.0.6
-
-#### Features
-
-- Add count(distinct(..)) support
-
-#### Bugfixes
-
-- Reuse levigo read/write options.
-
-## v0.0.5
-
-#### Features
-
-- Cache passwords in memory to speed up password verification
-- Add MERGE and INNER JOIN support
-
-#### Bugfixes
-
-- All columns should be returned if `select *` was used
-- Read/Write benchmarks
-
-## v0.0.2
-
-#### Features
-
-- Add an admin UI
-- Deb and RPM packages
-
-#### Bugfixes
-
-- Fix some nil pointer dereferences
-- Cleanup the aggregators implementation
-
-## v0.0.1 [2013-10-22]
-
-  * Initial Release
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/CONTRIBUTING.md b/Godeps/_workspace/src/github.com/influxdb/influxdb/CONTRIBUTING.md
deleted file mode 100644
index d578f1fea..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/CONTRIBUTING.md
+++ /dev/null
@@ -1,250 +0,0 @@
-Contributing to InfluxDB
-========================
-
-Bug reports
----------------
-Before you file an issue, please search existing issues in case it has already been filed, or perhaps even fixed. If you file an issue, please include the following.
-* Full details of your operating system (or distribution) e.g. 64-bit Ubuntu 14.04.
-* The version of InfluxDB you are running
-* Whether you installed it using a pre-built package, or built it from source.
-* A small test case, if applicable, that demonstrates the issues.
-
-Remember the golden rule of bug reports: **The easier you make it for us to reproduce the problem, the faster it will get fixed.**
-If you have never written a bug report before, or if you want to brush up on your bug reporting skills, we recommend reading [Simon Tatham's essay "How to Report Bugs Effectively."](http://www.chiark.greenend.org.uk/~sgtatham/bugs.html)
-
-Test cases should be in the form of `curl` commands. For example:
-```bash
-# create database
-curl -G http://localhost:8086/query --data-urlencode "q=CREATE DATABASE mydb"
-
-# create retention policy
-curl -G http://localhost:8086/query --data-urlencode "q=CREATE RETENTION POLICY myrp ON mydb DURATION 365d REPLICATION 1 DEFAULT"
-
-# write data
-curl -X POST http://localhost:8086/write --data-urlencode "db=mydb" --data-binary "cpu,region=useast,host=server_1,service=redis value=61" 
-
-# Delete a Measurement
-curl -G http://localhost:8086/query  --data-urlencode 'db=mydb' --data-urlencode 'q=DROP MEASUREMENT cpu'
-
-# Query the Measurement
-# Bug: expected it to return no data, but data comes back.
-curl -G http://localhost:8086/query  --data-urlencode 'db=mydb' --data-urlencode 'q=SELECT * from cpu'
-```
-**If you don't include a clear test case like this, your issue may not be investigated, and may even be closed**. If writing the data is too difficult, please zip up your data directory and include a link to it in your bug report.
-
-Please note that issues are *not the place to file general questions* such as "how do I use collectd with InfluxDB?" Questions of this nature should be sent to the [Google Group](https://groups.google.com/forum/#!forum/influxdb), not filed as issues. Issues like this will be closed.
-
-Feature requests
----------------
-We really like to receive feature requests, as it helps us prioritize our work. Please be clear about your requirements, as incomplete feature requests may simply be closed if we don't understand what you would like to see added to InfluxDB.
-
-Contributing to the source code
----------------
-
-InfluxDB follows standard Go project structure. This means that all
-your go development are done in `$GOPATH/src`. GOPATH can be any
-directory under which InfluxDB and all its dependencies will be
-cloned. For more details on recommended go project's structure, see
-[How to Write Go Code](http://golang.org/doc/code.html) and
-[Go: Best Practices for Production Environments](http://peter.bourgon.org/go-in-production/), or you can just follow
-the steps below.
-
-Submitting a pull request
-------------
-To submit a pull request you should fork the InfluxDB repository, and make your change on a feature branch of your fork. Then generate a pull request from your branch against *master* of the InfluxDB repository. Include in your pull request details of your change -- the why *and* the how -- as well as the testing your performed. Also, be sure to run the test suite with your change in place. Changes that cause tests to fail cannot be merged.
-
-There will usually be some back and forth as we finalize the change, but once that completes it may be merged.
-
-To assist in review for the PR, please add the following to your pull request comment:
-
-```md
-- [ ] CHANGELOG.md updated
-- [ ] Rebased/mergable
-- [ ] Tests pass
-- [ ] Sign [CLA](http://influxdb.com/community/cla.html) (if not already signed)
-```
-
-Signing the CLA
----------------
-
-If you are going to be contributing back to InfluxDB please take a
-second to sign our CLA, which can be found
-[on our website](http://influxdb.com/community/cla.html).
-
-Installing Go
--------------
-InfluxDB requires Go 1.4 or greater.
-
-At InfluxDB we find gvm, a Go version manager, useful for installing Go. For instructions
-on how to install it see [the gvm page on github](https://github.com/moovweb/gvm).
-
-After installing gvm you can install and set the default go version by
-running the following:
-
-    gvm install go1.4.2
-    gvm use go1.4.2 --default
-
-Revision Control Systems
--------------
-Go has the ability to import remote packages via revision control systems with the `go get` command.  To ensure that you can retrieve any remote package, be sure to install the following rcs software to your system.
-Currently the project only depends on `git` and `mercurial`.
-
-* [Install Git](http://git-scm.com/book/en/Getting-Started-Installing-Git)
-* [Install Mercurial](http://mercurial.selenic.com/wiki/Download)
-
-Getting the source
-------
-Setup the project structure and fetch the repo like so:
-
-```bash
-    mkdir $HOME/gocodez
-    export GOPATH=$HOME/gocodez
-    go get github.com/influxdb/influxdb
-```
-
-You can add the line `export GOPATH=$HOME/gocodez` to your bash/zsh file to be set for every shell instead of having to manually run it everytime.
-
-Cloning a fork
--------------
-If you wish to work with fork of InfluxDB, your own fork for example, you must still follow the directory structure above. But instead of cloning the main repo, instead clone your fork. Follow the steps below to work with a fork:
-
-```bash
-    export GOPATH=$HOME/gocodez
-    mkdir -p $GOPATH/src/github.com/influxdb
-    cd $GOPATH/src/github.com/influxdb
-    git clone git@github.com:<username>/influxdb
-```
-
-Retaining the directory structure `$GOPATH/src/github.com/influxdb` is necessary so that Go imports work correctly.
-
-Pre-commit checks
--------------
-
-We have a pre-commit hook to make sure code is formatted properly and vetted before you commit any changes. We strongly recommend using the pre-commit hook to guard against accidentally committing unformatted code. To use the pre-commit hook, run the following:
-```bash
-    cd $GOPATH/src/github.com/influxdb/influxdb
-    cp .hooks/pre-commit .git/hooks/
-```
-In case the commit is rejected because it's not formatted you can run
-the following to format the code:
-
-```
-go fmt ./...
-go vet ./...
-```
-
-To install go vet, run the following command:
-```
-go get golang.org/x/tools/cmd/vet
-```
-
-NOTE: If you have not installed mercurial, the above command will fail.  See [Revision Control Systems](#revision-control-systems) above.
-
-For more information on `go vet`, [read the GoDoc](https://godoc.org/golang.org/x/tools/cmd/vet).
-
-Build and Test
------
-
-Make sure you have Go installed and the project structure as shown above. To then build the project, execute the following commands:
-
-```bash
-cd $GOPATH/src/github.com/influxdb
-go get -u -f -t ./...
-go build ./...
-```
-
-To then install the binaries, run the following command. They can be found in `$GOPATH/bin`. Please note that the InfluxDB binary is named `influxd`, not `influxdb`.
-
-```bash
-go install ./...
-```
-
-To set the version and commit flags during the build pass the following to the build command:
-
-```bash
--ldflags="-X main.version $VERSION -X main.branch $BRANCH -X main.commit $COMMIT -X main.buildTime $TIME"
-```
-
-where `$VERSION` is the version, `$BRANCH` is the branch, `$COMMIT` is the git commit hash, and `$TIME` is the build timestamp.
-
-If you want to build packages, see `package.sh` help:
-```bash
-package.sh -h
-```
-
-To run the tests, execute the following command:
-
-```bash
-cd $GOPATH/src/github.com/influxdb/influxdb
-go test -v ./...
-
-# run tests that match some pattern
-go test -run=TestDatabase . -v
-
-# run tests and show coverage
-go test -coverprofile /tmp/cover . && go tool cover -html /tmp/cover
-```
-
-To install go cover, run the following command:
-```
-go get golang.org/x/tools/cmd/cover
-```
-
-Generated Google Protobuf code
------------------
-Most changes to the source do not require that the generated protocol buffer code be changed. But if you need to modify the protocol buffer code, you'll first need to install the protocol buffers toolchain.
-
-First install the [protocol buffer compiler](https://developers.google.com/protocol-buffers/
-) 2.6.1 or later for your OS:
-
-Then install the go plugins:
-
-```bash
-go get github.com/gogo/protobuf/proto
-go get github.com/gogo/protobuf/protoc-gen-gogo
-go get github.com/gogo/protobuf/gogoproto
-```
-
-Finally run, `go generate` after updating any `*.proto` file:
-
-```bash
-go generate ./...
-```
-**Trouleshooting**
-
-If generating the protobuf code is failing for you, check each of the following:
- * Ensure the protobuf library can be found. Make sure that `LD_LIBRRARY_PATH` includes the directory in which the library `libprotoc.so` has been installed.
- * Ensure the command `protoc-gen-gogo`, found in `GOPATH/bin`, is on your path. This can be done by adding `GOPATH/bin` to `PATH`.
-
-Profiling
------
-When troubleshooting problems with CPU or memory the Go toolchain can be helpful. You can start InfluxDB with CPU or memory profiling turned on. For example:
-
-```sh
-# start influx with profiling
-./influxd -cpuprofile influxd.prof
-# run queries, writes, whatever you're testing
-# Quit out of influxd and influxd.prof will then be written.
-# open up pprof to examine the profiling data.
-go tool pprof ./influxd influxd.prof
-# once inside run "web", opens up browser with the CPU graph
-# can also run "web <function name>" to zoom in. Or "list <function name>" to see specific lines
-```
-Note that when you pass the binary to `go tool pprof` *you must specify the path to the binary*.
-
-Use of third-party packages
-------------
-A third-party package is defined as one that is not part of the standard Go distribution. Generally speaking we prefer to minimize our use of third-party packages, and avoid them unless absolutely necessarily. We'll often write a little bit of code rather than pull in a third-party package. Of course, we do use some third-party packages -- most importantly we use [BoltDB](https://github.com/boltdb/bolt) as the storage engine. So to maximise the chance your change will be accepted by us, use only the standard libraries, or the third-party packages we have decided to use.
-
-For rationale, check out the post [The Case Against Third Party Libraries](http://blog.gopheracademy.com/advent-2014/case-against-3pl/).
-
-Continuous Integration testing
------
-InfluxDB uses CircleCI for continuous integration testing. To see how the code is built and tested, check out [this file](https://github.com/influxdb/influxdb/blob/master/circle-test.sh). It closely follows the build and test process outlined above. You can see the exact version of Go InfluxDB uses for testing by consulting that file.
-
-Useful links
-------------
-- [Useful techniques in Go](http://arslan.io/ten-useful-techniques-in-go)
-- [Go in production](http://peter.bourgon.org/go-in-production/)
-- [Principles of designing Go APIs with channels](https://inconshreveable.com/07-08-2014/principles-of-designing-go-apis-with-channels/)
-- [Common mistakes in Golang](http://soryy.com/blog/2014/common-mistakes-with-go-lang/). Especially this section `Loops, Closures, and Local Variables`
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/DOCKER.md b/Godeps/_workspace/src/github.com/influxdb/influxdb/DOCKER.md
deleted file mode 100644
index e78187d9b..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/DOCKER.md
+++ /dev/null
@@ -1,44 +0,0 @@
-# Docker Setup
-========================
-
-This document describes how to build and run a minimal InfluxDB container under Docker.   Currently, it has only been tested for local development and assumes that you have a working docker environment.
-
-## Building Image
-
-To build a docker image for InfluxDB from your current checkout, run the following:
-
-```
-$ ./build-docker.sh
-```
-
-This script uses the `golang:1.5` image to build a fully static binary of `influxd` and then adds it to a minimal `scratch` image.
-
-To build the image using a different version of go:
-
-```
-$ GO_VER=1.4.2 ./build-docker.sh
-```
-
-Available version can be found [here](https://hub.docker.com/_/golang/).
-
-## Single Node Container
-
-This will start an interactive, single-node, that publishes the containers port `8086` and `8088` to the hosts ports `8086` and `8088` respectively.  This is identical to starting `influxd` manually.
-
-```
-$ docker run -it -p 8086:8086 -p 8088:8088 influxdb
-```
-
-## Multi-Node Cluster
-
-This will create a simple 3-node cluster.  The data is stored within the container and will be lost when the container is removed.  This is only useful for test clusters.
-
-The `HOST_IP` env variable should be your host IP if running under linux or the virtualbox VM IP if running under OSX.  On OSX, this would be something like: `$(docker-machine ip dev)` or `$(boot2docker ip)` depending on which docker tool you are using.
-
-```
-$ export HOST_IP=<your host/VM IP>
-$ docker run -it -p 8086:8086 -p 8088:8088 influxdb -hostname $HOST_IP:8088
-$ docker run -it -p 8186:8086 -p 8188:8088 influxdb -hostname $HOST_IP:8188 -join $HOST_IP:8088
-$ docker run -it -p 8286:8086 -p 8288:8088 influxdb -hostname $HOST_IP:8288 -join $HOST_IP:8088
-```
-
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/Dockerfile b/Godeps/_workspace/src/github.com/influxdb/influxdb/Dockerfile
deleted file mode 100644
index d30cd300d..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/Dockerfile
+++ /dev/null
@@ -1,24 +0,0 @@
-FROM busybox:ubuntu-14.04
-
-MAINTAINER Jason Wilder "<jason@influxdb.com>"
-
-# admin, http, udp, cluster, graphite, opentsdb, collectd
-EXPOSE 8083 8086 8086/udp 8088 2003 4242 25826
-
-WORKDIR /app
-
-# copy binary into image
-COPY influxd /app/
-
-# Add influxd to the PATH
-ENV PATH=/app:$PATH
-
-# Generate a default config
-RUN influxd config > /etc/influxdb.toml
-
-# Use /data for all disk storage
-RUN sed -i 's/dir = "\/.*influxdb/dir = "\/data/' /etc/influxdb.toml
-
-VOLUME ["/data"]
-
-ENTRYPOINT ["influxd", "--config", "/etc/influxdb.toml"]
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/Dockerfile_test_ubuntu32 b/Godeps/_workspace/src/github.com/influxdb/influxdb/Dockerfile_test_ubuntu32
deleted file mode 100644
index d67a91a8d..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/Dockerfile_test_ubuntu32
+++ /dev/null
@@ -1,12 +0,0 @@
-FROM 32bit/ubuntu:14.04
-
-RUN apt-get update && apt-get install -y python-software-properties software-properties-common git
-RUN add-apt-repository ppa:evarlast/golang1.4
-RUN apt-get update && apt-get install -y -o Dpkg::Options::="--force-overwrite" golang-go
-
-ENV GOPATH=/root/go
-RUN mkdir -p /root/go/src/github.com/influxdb/influxdb
-RUN mkdir -p /tmp/artifacts
-
-VOLUME /root/go/src/github.com/influxdb/influxdb
-VOLUME /tmp/artifacts
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/LICENSE b/Godeps/_workspace/src/github.com/influxdb/influxdb/LICENSE
deleted file mode 100644
index d50222706..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/LICENSE
+++ /dev/null
@@ -1,20 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2013-2015 Errplane Inc.
-
-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/influxdb/influxdb/LICENSE_OF_DEPENDENCIES.md b/Godeps/_workspace/src/github.com/influxdb/influxdb/LICENSE_OF_DEPENDENCIES.md
deleted file mode 100644
index 7aae45f9d..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/LICENSE_OF_DEPENDENCIES.md
+++ /dev/null
@@ -1,19 +0,0 @@
-# List
-- github.com/gogo/protobuf/proto [BSD LICENSE](https://github.com/gogo/protobuf/blob/master/LICENSE)
-- gopkg.in/fatih/pool.v2 [MIT LICENSE](https://github.com/fatih/pool/blob/v2.0.0/LICENSE)
-- github.com/BurntSushi/toml [WTFPL LICENSE](https://github.com/BurntSushi/toml/blob/master/COPYING)
-- github.com/peterh/liner [MIT LICENSE](https://github.com/peterh/liner/blob/master/COPYING)
-- github.com/davecgh/go-spew/spew [ISC LICENSE](https://github.com/davecgh/go-spew/blob/master/LICENSE)
-- github.com/hashicorp/raft [MPL LICENSE](https://github.com/hashicorp/raft/blob/master/LICENSE)
-- github.com/rakyll/statik/fs [APACHE LICENSE](https://github.com/rakyll/statik/blob/master/LICENSE)
-- github.com/kimor79/gollectd [BSD LICENSE](https://github.com/kimor79/gollectd/blob/master/LICENSE)
-- github.com/bmizerany/pat [MIT LICENSE](https://github.com/bmizerany/pat#license)
-- react 0.13.3 [BSD LICENSE](https://github.com/facebook/react/blob/master/LICENSE)
-- bootstrap 3.3.5 [MIT LICENSE](https://github.com/twbs/bootstrap/blob/master/LICENSE)
-- jquery 2.1.4 [MIT LICENSE](https://github.com/jquery/jquery/blob/master/LICENSE.txt)
-- glyphicons [LICENSE](http://glyphicons.com/license/)
-- github.com/golang/snappy [BSD LICENSE](https://github.com/golang/snappy/blob/master/LICENSE)
-- github.com/boltdb/bolt [MIT LICENSE](https://github.com/boltdb/bolt/blob/master/LICENSE)
-- collectd.org [ISC LICENSE](https://github.com/collectd/go-collectd/blob/master/LICENSE)
-- golang.org/x/crypto/* [BSD LICENSE](https://github.com/golang/crypto/blob/master/LICENSE)
-
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/Makefile b/Godeps/_workspace/src/github.com/influxdb/influxdb/Makefile
deleted file mode 100644
index 66863bf98..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-PACKAGES=$(shell find . -name '*.go' -print0 | xargs -0 -n1 dirname | sort --unique)
-
-default:
-
-metalint: deadcode cyclo aligncheck defercheck structcheck lint errcheck
-
-deadcode:
-	@deadcode $(PACKAGES) 2>&1
-
-cyclo:
-	@gocyclo -over 10 $(PACKAGES)
-
-aligncheck:
-	@aligncheck $(PACKAGES)
-
-defercheck:
-	@defercheck $(PACKAGES)
-
-
-structcheck:
-	@structcheck $(PACKAGES)
-
-lint:
-	@for pkg in $(PACKAGES); do golint $$pkg; done
-
-errcheck:
-	@for pkg in $(PACKAGES); do \
-	  errcheck -ignorepkg=bytes,fmt -ignore=":(Rollback|Close)" $$pkg \
-	done
-
-tools:
-	go get github.com/remyoudompheng/go-misc/deadcode
-	go get github.com/alecthomas/gocyclo
-	go get github.com/opennota/check/...
-	go get github.com/golang/lint/golint
-	go get github.com/kisielk/errcheck
-
-.PHONY: default,metalint,deadcode,cyclo,aligncheck,defercheck,structcheck,lint,errcheck,tools
\ No newline at end of file
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/QUERIES.md b/Godeps/_workspace/src/github.com/influxdb/influxdb/QUERIES.md
deleted file mode 100644
index 46a9eb1da..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/QUERIES.md
+++ /dev/null
@@ -1,180 +0,0 @@
-The top level name is called a measurement. These names can contain any characters. Then there are field names, field values, tag keys and tag values, which can also contain any characters. However, if the measurement, field, or tag contains any character other than [A-Z,a-z,0-9,_], or if it starts with a digit, it must be double-quoted. Therefore anywhere a measurement name, field key, or tag key appears it should be wrapped in double quotes.
-
-# Databases & retention policies
-
-```sql
--- create a database
-CREATE DATABASE <name>
-
--- create a retention policy
-CREATE RETENTION POLICY <rp-name> ON <db-name> DURATION <duration> REPLICATION <n> [DEFAULT]
-
--- alter retention policy
-ALTER RETENTION POLICY <rp-name> ON <db-name> (DURATION <duration> | REPLICATION <n> | DEFAULT)+
-
--- drop a database
-DROP DATABASE <name>
-
--- drop a retention policy
-DROP RETENTION POLICY <rp-name> ON <db-name>
-```
-where `<duration>` is either `INF` for infinite retention, or an integer followed by the desired unit of time: u,ms,s,m,h,d,w for microseconds, milliseconds, seconds, minutes, hours, days, or weeks, respectively. `<replication>` must be an integer.
-
-If present, `DEFAULT` sets the retention policy as the default retention policy for writes and reads.
-
-# Users and permissions
-
-```sql
--- create user
-CREATE USER <name> WITH PASSWORD '<password>'
-
--- grant privilege on a database
-GRANT <privilege> ON <db> TO <user>
-
--- grant cluster admin privileges
-GRANT ALL [PRIVILEGES] TO <user>
-
--- revoke privilege
-REVOKE <privilege> ON <db> FROM <user>
-
--- revoke all privileges for a DB
-REVOKE ALL [PRIVILEGES] ON <db> FROM <user>
-
--- revoke all privileges including cluster admin
-REVOKE ALL [PRIVILEGES] FROM <user>
-
--- combine db creation with privilege assignment (user must already exist)
-CREATE DATABASE <name> GRANT <privilege> TO <user>
-CREATE DATABASE <name> REVOKE <privilege> FROM <user>
-
--- delete a user
-DROP USER <name>
-
-
-```
-where `<privilege> := READ | WRITE | All `. 
-
-Authentication must be enabled in the influxdb.conf file for user permissions to be in effect.
-
-By default, newly created users have no privileges to any databases.
-
-Cluster administration privileges automatically grant full read and write permissions to all databases, regardless of subsequent database-specific privilege revocation statements.
-
-# Select
-
-```sql
-SELECT mean(value) from cpu WHERE host = 'serverA' AND time > now() - 4h GROUP BY time(5m)
-
-SELECT mean(value) from cpu WHERE time > now() - 4h GROUP BY time(5m), region
-```
-
-## Group By
-
-# Delete
-
-# Series
-
-## Destroy
-
-```sql
-DROP MEASUREMENT <name>
-DROP MEASUREMENT cpu WHERE region = 'uswest'
-```
-
-## Show
-
-Show series queries are for pulling out individual series from measurement names and tag data. They're useful for discovery.
-
-```sql
--- show all databases
-SHOW DATABASES
-
--- show measurement names
-SHOW MEASUREMENTS
-SHOW MEASUREMENTS LIMIT 15
-SHOW MEASUREMENTS LIMIT 10 OFFSET 40
-SHOW MEASUREMENTS WHERE service = 'redis'
--- LIMIT and OFFSET can be applied to any of the SHOW type queries
-
--- show all series across all measurements/tagsets
-SHOW SERIES
-
--- get a show of all series for any measurements where tag key region = tak value 'uswest'
-SHOW SERIES WHERE region = 'uswest'
-
-SHOW SERIES FROM cpu_load WHERE region = 'uswest' LIMIT 10
-
--- returns the 100 - 109 rows in the result. In the case of SHOW SERIES, which returns 
--- series split into measurements. Each series counts as a row. So you could see only a 
--- single measurement returned, but 10 series within it.
-SHOW SERIES FROM cpu_load WHERE region = 'uswest' LIMIT 10 OFFSET 100
-
--- show all retention policies on a database
-SHOW RETENTION POLICIES ON mydb
-
--- get a show of all tag keys across all measurements
-SHOW TAG KEYS
-
--- show all the tag keys for a given measurement
-SHOW TAG KEYS FROM cpu
-SHOW TAG KEYS FROM temperature, wind_speed
-
--- show all the tag values. note that a single WHERE TAG KEY = '...' clause is required
-SHOW TAG VALUES WITH TAG KEY = 'region'
-SHOW TAG VALUES FROM cpu WHERE region = 'uswest' WITH TAG KEY = 'host'
-
--- and you can do stuff against fields
-SHOW FIELD KEYS FROM cpu
-
--- but you can't do this
-SHOW FIELD VALUES
--- we don't index field values, so this query should be invalid.
-
--- show all users
-SHOW USERS
-```
-
-Note that `FROM` and `WHERE` are optional clauses in most of the show series queries.
-
-And the show series output looks like this:
-
-```json
-[
-    {
-        "name": "cpu",
-        "columns": ["id", "region", "host"],
-        "values": [
-            1, "uswest", "servera",
-            2, "uswest", "serverb"
-        ]
-    },
-    {
-        "name": "reponse_time",
-        "columns": ["id", "application", "host"],
-        "values": [
-            3, "myRailsApp", "servera"
-        ]
-    }
-]
-```
-
-# Continuous Queries
-
-Continuous queries are going to be inspired by MySQL `TRIGGER` syntax:
-
-http://dev.mysql.com/doc/refman/5.0/en/trigger-syntax.html
-
-Instead of having automatically-assigned ids, named continuous queries allows for some level of duplication prevention,
-particularly in the case where creation is scripted.
-
-## Create
-
-    CREATE CONTINUOUS QUERY <name> AS SELECT ... FROM ...
-
-## Destroy
-
-    DROP CONTINUOUS QUERY <name>
-
-## List
-
-    SHOW CONTINUOUS QUERIES
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/README.md b/Godeps/_workspace/src/github.com/influxdb/influxdb/README.md
deleted file mode 100644
index 94b8547ab..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/README.md
+++ /dev/null
@@ -1,72 +0,0 @@
-# InfluxDB [![Circle CI](https://circleci.com/gh/influxdb/influxdb/tree/master.svg?style=svg)](https://circleci.com/gh/influxdb/influxdb/tree/master)
-
-## An Open-Source, Distributed, Time Series Database
-
-> InfluxDB v0.9.0 is now out. Going forward, the 0.9.x series of releases will not make breaking API changes or breaking changes to the underlying data storage. However, 0.9.0 clustering should be considered an alpha release.
-
-InfluxDB is an open source **distributed time series database** with
-**no external dependencies**. It's useful for recording metrics,
-events, and performing analytics.
-
-## Features
-
-* Built-in [HTTP API](http://influxdb.com/docs/v0.9/concepts/reading_and_writing_data.html) so you don't have to write any server side code to get up and running.
-* Data can be tagged, allowing very flexible querying.
-* SQL-like query language.
-* Clustering is supported out of the box, so that you can scale horizontally to handle your data.
-* Simple to install and manage, and fast to get data in and out.
-* It aims to answer queries in real-time. That means every data point is
-  indexed as it comes in and is immediately available in queries that
-  should return in < 100ms.
-
-## Getting Started
-*The following directions apply only to the 0.9.0 release or building from the source on master.*
-
-### Building
-
-You don't need to build the project to use it - you can use any of our
-[pre-built packages](http://influxdb.com/download/index.html) to install InfluxDB. That's
-the recommended way to get it running. However, if you want to contribute to the core of InfluxDB, you'll need to build.
-For those adventurous enough, you can
-[follow along on our docs](http://github.com/influxdb/influxdb/blob/master/CONTRIBUTING.md).
-
-### Starting InfluxDB
-* `service influxdb start` if you have installed InfluxDB using an official Debian or RPM package.
-* `systemctl start influxdb` if you have installed InfluxDB using an official Debian or RPM package, and are running a distro with `systemd`. For example, Ubuntu 15 or later.
-* `$GOPATH/bin/influxd` if you have built InfluxDB from source.
-
-### Creating your first database
-
-```
-curl -G 'http://localhost:8086/query' --data-urlencode "q=CREATE DATABASE mydb"
-```
-
-### Insert some data
-```
-curl -XPOST 'http://localhost:8086/write?db=mydb' \
--d 'cpu,host=server01,region=uswest load=42 1434055562000000000'
-
-curl -XPOST 'http://localhost:8086/write?db=mydb' \
--d 'cpu,host=server02,region=uswest load=78 1434055562000000000'
-
-curl -XPOST 'http://localhost:8086/write?db=mydb' \
--d 'cpu,host=server03,region=useast load=15.4 1434055562000000000'
-```
-
-### Query for the data
-```JSON
-curl -G http://localhost:8086/query?pretty=true --data-urlencode "db=mydb" \
---data-urlencode "q=SELECT * FROM cpu WHERE host='server01' AND time < now() - 1d"
-```
-
-### Analyze the data
-```JSON
-curl -G http://localhost:8086/query?pretty=true --data-urlencode "db=mydb" \
---data-urlencode "q=SELECT mean(load) FROM cpu WHERE region='uswest'"
-```
-
-## Helpful Links
-
-* Understand the [design goals and motivations of the project](http://influxdb.com/docs/v0.9/introduction/overview.html).
-* Follow the [getting started guide](http://influxdb.com/docs/v0.9/introduction/getting_started.html) to find out how to install InfluxDB, start writing more data, and issue more queries - in just a few minutes.
-* See the  [HTTP API documentation to start writing a library for your favorite language](http://influxdb.com/docs/v0.9/concepts/reading_and_writing_data.html).
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/build-docker.sh b/Godeps/_workspace/src/github.com/influxdb/influxdb/build-docker.sh
deleted file mode 100644
index 0dea62d2a..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/build-docker.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-set -e -x
-
-GO_VER=${GO_VER:-1.5}
-
-docker run -it -v "${GOPATH}":/gopath -v "$(pwd)":/app -e "GOPATH=/gopath" -w /app golang:$GO_VER sh -c 'CGO_ENABLED=0 go build -a --installsuffix cgo --ldflags="-s" -o influxd ./cmd/influxd'
-
-docker build -t influxdb .
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/circle-test.sh b/Godeps/_workspace/src/github.com/influxdb/influxdb/circle-test.sh
deleted file mode 100644
index f4ac8d7db..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/circle-test.sh
+++ /dev/null
@@ -1,99 +0,0 @@
-#!/bin/bash
-#
-# This is the InfluxDB CircleCI test script. Using this script allows total control
-# the environment in which the build and test is run, and matches the official
-# build process for InfluxDB.
-
-BUILD_DIR=$HOME/influxdb-build
-GO_VERSION=go1.4.2
-PARALLELISM="-parallel 256"
-TIMEOUT="-timeout 480s"
-
-# Executes the given statement, and exits if the command returns a non-zero code.
-function exit_if_fail {
-    command=$@
-    echo "Executing '$command'"
-    $command
-    rc=$?
-    if [ $rc -ne 0 ]; then
-        echo "'$command' returned $rc."
-        exit $rc
-    fi
-}
-
-# Check that go fmt has been run.
-function check_go_fmt {
-	fmtcount=`git ls-files | grep '.go$' | xargs gofmt -l 2>&1 | wc -l`
-	if [ $fmtcount -gt 0 ]; then
-	    echo "run 'go fmt ./...' to format your source code."
-	    exit 1
-	fi
-}
-
-# Check that go vet passes.
-function check_go_vet {
-	# Due to the way composites work, vet will fail for some of our tests so we ignore it
-	vetcount=`go tool vet --composites=false ./ 2>&1  | wc -l`
-	if [ $vetcount -gt 0 ]; then
-	    echo "run 'go tool vet --composites=false ./' to see the errors it flags and correct your source code."
-	    exit 1
-	fi
-}
-
-source $HOME/.gvm/scripts/gvm
-exit_if_fail gvm use $GO_VERSION
-
-# Set up the build directory, and then GOPATH.
-exit_if_fail mkdir $BUILD_DIR
-export GOPATH=$BUILD_DIR
-exit_if_fail mkdir -p $GOPATH/src/github.com/influxdb
-
-# Dump some test config to the log.
-echo "Test configuration"
-echo "========================================"
-echo "\$HOME: $HOME"
-echo "\$GOPATH: $GOPATH"
-echo "\$CIRCLE_BRANCH: $CIRCLE_BRANCH"
-
-# Move the checked-out source to a better location.
-exit_if_fail mv $HOME/influxdb $GOPATH/src/github.com/influxdb
-exit_if_fail cd $GOPATH/src/github.com/influxdb/influxdb
-exit_if_fail git branch --set-upstream-to=origin/$CIRCLE_BRANCH $CIRCLE_BRANCH
-
-# Install the code.
-exit_if_fail cd $GOPATH/src/github.com/influxdb/influxdb
-exit_if_fail go get -t -d -v ./...
-exit_if_fail git checkout $CIRCLE_BRANCH # 'go get' switches to master. Who knew? Switch back.
-check_go_fmt
-check_go_vet
-exit_if_fail go build -v ./...
-
-# Run the tests.
-case $CIRCLE_NODE_INDEX in
-    0)
-        go test $PARALLELISM $TIMEOUT -v ./... 2>&1 | tee $CIRCLE_ARTIFACTS/test_logs.txt
-        rc=${PIPESTATUS[0]}
-        ;;
-    1)
-        INFLUXDB_DATA_ENGINE="tsm1" go test $PARALLELISM $TIMEOUT -v ./... 2>&1 | tee $CIRCLE_ARTIFACTS/test_logs.txt
-        rc=${PIPESTATUS[0]}
-        ;;
-    2)
-        # 32bit tests.
-        if [[ -e ~/docker/image.tar ]]; then docker load -i ~/docker/image.tar; fi
-        docker build -f Dockerfile_test_ubuntu32 -t ubuntu-32-influxdb-test .
-        mkdir -p ~/docker; docker save ubuntu-32-influxdb-test > ~/docker/image.tar
-        exit_if_fail docker build -f Dockerfile_test_ubuntu32 -t ubuntu-32-influxdb-test .
-        docker run -v $(pwd):/root/go/src/github.com/influxdb/influxdb -e "CI=${CI}" \
-                        -v ${CIRCLE_ARTIFACTS}:/tmp/artifacts \
-                        -t ubuntu-32-influxdb-test bash \
-                        -c "cd /root/go/src/github.com/influxdb/influxdb && go get -t -d -v ./... && go build -v ./... && go test ${PARALLELISM} ${TIMEOUT} -v ./... 2>&1 | tee /tmp/artifacts/test_logs_i386.txt && exit \${PIPESTATUS[0]}"
-        rc=$?
-        ;;
-    3)
-       GORACE="halt_on_error=1" go test $PARALLELISM $TIMEOUT -v -race ./... 2>&1 | tee $CIRCLE_ARTIFACTS/test_logs_race.txt
-       rc=${PIPESTATUS[0]}
-       ;;
-esac
-
-exit $rc
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/circle.yml b/Godeps/_workspace/src/github.com/influxdb/influxdb/circle.yml
deleted file mode 100644
index 8f616c96f..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/circle.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-machine:
-    services:
-        - docker
-    pre:
-        - bash < <(curl -s -S -L https://raw.githubusercontent.com/moovweb/gvm/master/binscripts/gvm-installer)
-        - source $HOME/.gvm/scripts/gvm; gvm install go1.4.2 --binary
-
-dependencies:
-    override:
-        - mkdir -p ~/docker
-    cache_directories:
-        - "~/docker"
-test:
-    override:
-        - bash circle-test.sh:
-            parallel: true
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/client/README.md b/Godeps/_workspace/src/github.com/influxdb/influxdb/client/README.md
deleted file mode 100644
index 8a041128d..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/client/README.md
+++ /dev/null
@@ -1,256 +0,0 @@
-# InfluxDB Client
-
-[![GoDoc](https://godoc.org/github.com/influxdb/influxdb?status.svg)](http://godoc.org/github.com/influxdb/influxdb/client/v2)
-
-## Description
-
-**NOTE:** The Go client library now has a "v2" version, with the old version
-being deprecated. The new version can be imported at
-`import "github.com/influxdb/influxdb/client/v2"`. It is not backwards-compatible.
-
-A Go client library written and maintained by the **InfluxDB** team.
-This package provides convenience functions to read and write time series data.
-It uses the HTTP protocol to communicate with your **InfluxDB** cluster.
-
-
-## Getting Started
-
-### Connecting To Your Database
-
-Connecting to an **InfluxDB** database is straightforward. You will need a host
-name, a port and the cluster user credentials if applicable. The default port is
-8086. You can customize these settings to your specific installation via the
-**InfluxDB** configuration file.
-
-Thought not necessary for experimentation, you may want to create a new user
-and authenticate the connection to your database.
-
-For more information please check out the
-[Cluster Admin Docs](http://influxdb.com/docs/v0.9/query_language/database_administration.html).
-
-For the impatient, you can create a new admin user _bubba_ by firing off the
-[InfluxDB CLI](https://github.com/influxdb/influxdb/blob/master/cmd/influx/main.go).
-
-```shell
-influx
-> create user bubba with password 'bumblebeetuna'
-> grant all privileges to bubba
-```
-
-And now for good measure set the credentials in you shell environment.
-In the example below we will use $INFLUX_USER and $INFLUX_PWD
-
-Now with the administrivia out of the way, let's connect to our database.
-
-NOTE: If you've opted out of creating a user, you can omit Username and Password in
-the configuration below.
-
-```go
-package main
-
-import
-import (
-	"net/url"
-	"fmt"
-	"log"
-	"os"
-
-	"github.com/influxdb/influxdb/client/v2"
-)
-
-const (
-	MyDB = "square_holes"
-	username = "bubba"
-	password = "bumblebeetuna"
-)
-
-func main() {
-	// Make client
-	u, _ := url.Parse("http://localhost:8086")
-	c := client.NewClient(client.Config{
-		URL: u,
-		Username: username,
-		Password: password,
-	})
-
-	// Create a new point batch
-	bp := client.NewBatchPoints(client.BatchPointsConfig{
-		Database:  MyDB,
-		Precision: "s",
-	})
-
-	// Create a point and add to batch
-	tags := map[string]string{"cpu": "cpu-total"}
-	fields := map[string]interface{}{
-		"idle":   10.1,
-		"system": 53.3,
-		"user":   46.6,
-	}
-	pt := client.NewPoint("cpu_usage", tags, fields, time.Now())
-	bp.AddPoint(pt)
-
-	// Write the batch
-	c.Write(bp)
-}
-
-```
-
-### Inserting Data
-
-Time series data aka *points* are written to the database using batch inserts.
-The mechanism is to create one or more points and then create a batch aka
-*batch points* and write these to a given database and series. A series is a
-combination of a measurement (time/values) and a set of tags.
-
-In this sample we will create a batch of a 1,000 points. Each point has a time and
-a single value as well as 2 tags indicating a shape and color. We write these points
-to a database called _square_holes_ using a measurement named _shapes_.
-
-NOTE: You can specify a RetentionPolicy as part of the batch points. If not
-provided InfluxDB will use the database _default_ retention policy.
-
-```go
-func writePoints(clnt client.Client) {
-	sampleSize := 1000
-	rand.Seed(42)
-
-	bp, _ := client.NewBatchPoints(client.BatchPointsConfig{
-		Database:  "systemstats",
-		Precision: "us",
-	})
-
-	for i := 0; i < sampleSize; i++ {
-		regions := []string{"us-west1", "us-west2", "us-west3", "us-east1"}
-		tags := map[string]string{
-			"cpu":    "cpu-total",
-			"host":   fmt.Sprintf("host%d", rand.Intn(1000)),
-			"region": regions[rand.Intn(len(regions))],
-		}
-
-		idle := rand.Float64() * 100.0
-		fields := map[string]interface{}{
-			"idle": idle,
-			"busy": 100.0 - idle,
-		}
-
-		bp.AddPoint(client.NewPoint(
-			"cpu_usage",
-			tags,
-			fields,
-			time.Now(),
-		))
-	}
-
-	err := clnt.Write(bp)
-	if err != nil {
-		log.Fatal(err)
-	}
-}
-```
-
-
-### Querying Data
-
-One nice advantage of using **InfluxDB** the ability to query your data using familiar
-SQL constructs. In this example we can create a convenience function to query the database
-as follows:
-
-```go
-// queryDB convenience function to query the database
-func queryDB(clnt client.Client, cmd string) (res []client.Result, err error) {
-	q := client.Query{
-		Command:  cmd,
-		Database: MyDB,
-	}
-	if response, err := clnt.Query(q); err == nil {
-		if response.Error() != nil {
-			return res, response.Error()
-		}
-		res = response.Results
-	}
-	return res, nil
-}
-```
-
-#### Creating a Database
-
-```go
-_, err := queryDB(clnt, fmt.Sprintf("CREATE DATABASE %s", MyDB))
-if err != nil {
-	log.Fatal(err)
-}
-```
-
-#### Count Records
-
-```go
-q := fmt.Sprintf("SELECT count(%s) FROM %s", "value", MyMeasurement)
-res, err := queryDB(clnt, q)
-if err != nil {
-	log.Fatal(err)
-}
-count := res[0].Series[0].Values[0][1]
-log.Printf("Found a total of %v records\n", count)
-```
-
-#### Find the last 10 _shapes_ records
-
-```go
-q := fmt.Sprintf("SELECT * FROM %s LIMIT %d", MyMeasurement, 20)
-res, err = queryDB(clnt, q)
-if err != nil {
-	log.Fatal(err)
-}
-
-for i, row := range res[0].Series[0].Values {
-	t, err := time.Parse(time.RFC3339, row[0].(string))
-	if err != nil {
-		log.Fatal(err)
-	}
-	val := row[1].(string)
-	log.Printf("[%2d] %s: %s\n", i, t.Format(time.Stamp), val)
-}
-```
-
-### Using the UDP Client
-
-The **InfluxDB** client also supports writing over UDP.
-
-```go
-func WriteUDP() {
-	// Make client
-	c := client.NewUDPClient("localhost:8089")
-
-	// Create a new point batch
-	bp, _ := client.NewBatchPoints(client.BatchPointsConfig{
-		Precision: "s",
-	})
-
-	// Create a point and add to batch
-	tags := map[string]string{"cpu": "cpu-total"}
-	fields := map[string]interface{}{
-		"idle":   10.1,
-		"system": 53.3,
-		"user":   46.6,
-	}
-	pt, err := client.NewPoint("cpu_usage", tags, fields, time.Now())
-	if err != nil {
-		panic(err.Error())
-	}
-	bp.AddPoint(pt)
-
-	// Write the batch
-	c.Write(bp)
-}
-```
-
-## Go Docs
-
-Please refer to
-[http://godoc.org/github.com/influxdb/influxdb/client/v2](http://godoc.org/github.com/influxdb/influxdb/client/v2)
-for documentation.
-
-## See Also
-
-You can also examine how the client library is used by the
-[InfluxDB CLI](https://github.com/influxdb/influxdb/blob/master/cmd/influx/main.go).
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/client/example_test.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/client/example_test.go
deleted file mode 100644
index e2dc10b71..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/client/example_test.go
+++ /dev/null
@@ -1,113 +0,0 @@
-package client_test
-
-import (
-	"fmt"
-	"log"
-	"math/rand"
-	"net/url"
-	"os"
-	"strconv"
-	"time"
-
-	"github.com/influxdb/influxdb/client"
-)
-
-func ExampleNewClient() {
-	host, err := url.Parse(fmt.Sprintf("http://%s:%d", "localhost", 8086))
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	// NOTE: this assumes you've setup a user and have setup shell env variables,
-	// namely INFLUX_USER/INFLUX_PWD. If not just omit Username/Password below.
-	conf := client.Config{
-		URL:      *host,
-		Username: os.Getenv("INFLUX_USER"),
-		Password: os.Getenv("INFLUX_PWD"),
-	}
-	con, err := client.NewClient(conf)
-	if err != nil {
-		log.Fatal(err)
-	}
-	log.Println("Connection", con)
-}
-
-func ExampleClient_Ping() {
-	host, err := url.Parse(fmt.Sprintf("http://%s:%d", "localhost", 8086))
-	if err != nil {
-		log.Fatal(err)
-	}
-	con, err := client.NewClient(client.Config{URL: *host})
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	dur, ver, err := con.Ping()
-	if err != nil {
-		log.Fatal(err)
-	}
-	log.Printf("Happy as a hippo! %v, %s", dur, ver)
-}
-
-func ExampleClient_Query() {
-	host, err := url.Parse(fmt.Sprintf("http://%s:%d", "localhost", 8086))
-	if err != nil {
-		log.Fatal(err)
-	}
-	con, err := client.NewClient(client.Config{URL: *host})
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	q := client.Query{
-		Command:  "select count(value) from shapes",
-		Database: "square_holes",
-	}
-	if response, err := con.Query(q); err == nil && response.Error() == nil {
-		log.Println(response.Results)
-	}
-}
-
-func ExampleClient_Write() {
-	host, err := url.Parse(fmt.Sprintf("http://%s:%d", "localhost", 8086))
-	if err != nil {
-		log.Fatal(err)
-	}
-	con, err := client.NewClient(client.Config{URL: *host})
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	var (
-		shapes     = []string{"circle", "rectangle", "square", "triangle"}
-		colors     = []string{"red", "blue", "green"}
-		sampleSize = 1000
-		pts        = make([]client.Point, sampleSize)
-	)
-
-	rand.Seed(42)
-	for i := 0; i < sampleSize; i++ {
-		pts[i] = client.Point{
-			Measurement: "shapes",
-			Tags: map[string]string{
-				"color": strconv.Itoa(rand.Intn(len(colors))),
-				"shape": strconv.Itoa(rand.Intn(len(shapes))),
-			},
-			Fields: map[string]interface{}{
-				"value": rand.Intn(sampleSize),
-			},
-			Time:      time.Now(),
-			Precision: "s",
-		}
-	}
-
-	bps := client.BatchPoints{
-		Points:          pts,
-		Database:        "BumbeBeeTuna",
-		RetentionPolicy: "default",
-	}
-	_, err = con.Write(bps)
-	if err != nil {
-		log.Fatal(err)
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/client/influxdb.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/client/influxdb.go
deleted file mode 100644
index 9e0d72717..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/client/influxdb.go
+++ /dev/null
@@ -1,688 +0,0 @@
-package client
-
-import (
-	"bytes"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"io/ioutil"
-	"net"
-	"net/http"
-	"net/url"
-	"strconv"
-	"strings"
-	"time"
-
-	"github.com/influxdb/influxdb/models"
-)
-
-const (
-	// DefaultHost is the default host used to connect to an InfluxDB instance
-	DefaultHost = "localhost"
-
-	// DefaultPort is the default port used to connect to an InfluxDB instance
-	DefaultPort = 8086
-
-	// DefaultTimeout is the default connection timeout used to connect to an InfluxDB instance
-	DefaultTimeout = 0
-)
-
-// Query is used to send a command to the server. Both Command and Database are required.
-type Query struct {
-	Command  string
-	Database string
-}
-
-// ParseConnectionString will parse a string to create a valid connection URL
-func ParseConnectionString(path string, ssl bool) (url.URL, error) {
-	var host string
-	var port int
-
-	h, p, err := net.SplitHostPort(path)
-	if err != nil {
-		if path == "" {
-			host = DefaultHost
-		} else {
-			host = path
-		}
-		// If they didn't specify a port, always use the default port
-		port = DefaultPort
-	} else {
-		host = h
-		port, err = strconv.Atoi(p)
-		if err != nil {
-			return url.URL{}, fmt.Errorf("invalid port number %q: %s\n", path, err)
-		}
-	}
-
-	u := url.URL{
-		Scheme: "http",
-	}
-	if ssl {
-		u.Scheme = "https"
-	}
-
-	u.Host = net.JoinHostPort(host, strconv.Itoa(port))
-
-	return u, nil
-}
-
-// Config is used to specify what server to connect to.
-// URL: The URL of the server connecting to.
-// Username/Password are optional. They will be passed via basic auth if provided.
-// UserAgent: If not provided, will default "InfluxDBClient",
-// Timeout: If not provided, will default to 0 (no timeout)
-type Config struct {
-	URL       url.URL
-	Username  string
-	Password  string
-	UserAgent string
-	Timeout   time.Duration
-	Precision string
-}
-
-// NewConfig will create a config to be used in connecting to the client
-func NewConfig() Config {
-	return Config{
-		Timeout: DefaultTimeout,
-	}
-}
-
-// Client is used to make calls to the server.
-type Client struct {
-	url        url.URL
-	username   string
-	password   string
-	httpClient *http.Client
-	userAgent  string
-	precision  string
-}
-
-const (
-	// ConsistencyOne requires at least one data node acknowledged a write.
-	ConsistencyOne = "one"
-
-	// ConsistencyAll requires all data nodes to acknowledge a write.
-	ConsistencyAll = "all"
-
-	// ConsistencyQuorum requires a quorum of data nodes to acknowledge a write.
-	ConsistencyQuorum = "quorum"
-
-	// ConsistencyAny allows for hinted hand off, potentially no write happened yet.
-	ConsistencyAny = "any"
-)
-
-// NewClient will instantiate and return a connected client to issue commands to the server.
-func NewClient(c Config) (*Client, error) {
-	client := Client{
-		url:        c.URL,
-		username:   c.Username,
-		password:   c.Password,
-		httpClient: &http.Client{Timeout: c.Timeout},
-		userAgent:  c.UserAgent,
-		precision:  c.Precision,
-	}
-	if client.userAgent == "" {
-		client.userAgent = "InfluxDBClient"
-	}
-	return &client, nil
-}
-
-// SetAuth will update the username and passwords
-func (c *Client) SetAuth(u, p string) {
-	c.username = u
-	c.password = p
-}
-
-// SetPrecision will update the precision
-func (c *Client) SetPrecision(precision string) {
-	c.precision = precision
-}
-
-// Query sends a command to the server and returns the Response
-func (c *Client) Query(q Query) (*Response, error) {
-	u := c.url
-
-	u.Path = "query"
-	values := u.Query()
-	values.Set("q", q.Command)
-	values.Set("db", q.Database)
-	if c.precision != "" {
-		values.Set("epoch", c.precision)
-	}
-	u.RawQuery = values.Encode()
-
-	req, err := http.NewRequest("GET", u.String(), nil)
-	if err != nil {
-		return nil, err
-	}
-	req.Header.Set("User-Agent", c.userAgent)
-	if c.username != "" {
-		req.SetBasicAuth(c.username, c.password)
-	}
-
-	resp, err := c.httpClient.Do(req)
-	if err != nil {
-		return nil, err
-	}
-	defer resp.Body.Close()
-
-	var response Response
-	dec := json.NewDecoder(resp.Body)
-	dec.UseNumber()
-	decErr := dec.Decode(&response)
-
-	// ignore this error if we got an invalid status code
-	if decErr != nil && decErr.Error() == "EOF" && resp.StatusCode != http.StatusOK {
-		decErr = nil
-	}
-	// If we got a valid decode error, send that back
-	if decErr != nil {
-		return nil, decErr
-	}
-	// If we don't have an error in our json response, and didn't get StatusOK, then send back an error
-	if resp.StatusCode != http.StatusOK && response.Error() == nil {
-		return &response, fmt.Errorf("received status code %d from server", resp.StatusCode)
-	}
-	return &response, nil
-}
-
-// Write takes BatchPoints and allows for writing of multiple points with defaults
-// If successful, error is nil and Response is nil
-// If an error occurs, Response may contain additional information if populated.
-func (c *Client) Write(bp BatchPoints) (*Response, error) {
-	u := c.url
-	u.Path = "write"
-
-	var b bytes.Buffer
-	for _, p := range bp.Points {
-		if p.Raw != "" {
-			if _, err := b.WriteString(p.Raw); err != nil {
-				return nil, err
-			}
-		} else {
-			for k, v := range bp.Tags {
-				if p.Tags == nil {
-					p.Tags = make(map[string]string, len(bp.Tags))
-				}
-				p.Tags[k] = v
-			}
-
-			if _, err := b.WriteString(p.MarshalString()); err != nil {
-				return nil, err
-			}
-		}
-
-		if err := b.WriteByte('\n'); err != nil {
-			return nil, err
-		}
-	}
-
-	req, err := http.NewRequest("POST", u.String(), &b)
-	if err != nil {
-		return nil, err
-	}
-	req.Header.Set("Content-Type", "")
-	req.Header.Set("User-Agent", c.userAgent)
-	if c.username != "" {
-		req.SetBasicAuth(c.username, c.password)
-	}
-
-	precision := bp.Precision
-	if precision == "" {
-		precision = c.precision
-	}
-
-	params := req.URL.Query()
-	params.Set("db", bp.Database)
-	params.Set("rp", bp.RetentionPolicy)
-	params.Set("precision", precision)
-	params.Set("consistency", bp.WriteConsistency)
-	req.URL.RawQuery = params.Encode()
-
-	resp, err := c.httpClient.Do(req)
-	if err != nil {
-		return nil, err
-	}
-	defer resp.Body.Close()
-
-	var response Response
-	body, err := ioutil.ReadAll(resp.Body)
-	if err != nil {
-		return nil, err
-	}
-
-	if resp.StatusCode != http.StatusNoContent && resp.StatusCode != http.StatusOK {
-		var err = fmt.Errorf(string(body))
-		response.Err = err
-		return &response, err
-	}
-
-	return nil, nil
-}
-
-// WriteLineProtocol takes a string with line returns to delimit each write
-// If successful, error is nil and Response is nil
-// If an error occurs, Response may contain additional information if populated.
-func (c *Client) WriteLineProtocol(data, database, retentionPolicy, precision, writeConsistency string) (*Response, error) {
-	u := c.url
-	u.Path = "write"
-
-	r := strings.NewReader(data)
-
-	req, err := http.NewRequest("POST", u.String(), r)
-	if err != nil {
-		return nil, err
-	}
-	req.Header.Set("Content-Type", "")
-	req.Header.Set("User-Agent", c.userAgent)
-	if c.username != "" {
-		req.SetBasicAuth(c.username, c.password)
-	}
-	params := req.URL.Query()
-	params.Set("db", database)
-	params.Set("rp", retentionPolicy)
-	params.Set("precision", precision)
-	params.Set("consistency", writeConsistency)
-	req.URL.RawQuery = params.Encode()
-
-	resp, err := c.httpClient.Do(req)
-	if err != nil {
-		return nil, err
-	}
-	defer resp.Body.Close()
-
-	var response Response
-	body, err := ioutil.ReadAll(resp.Body)
-	if err != nil {
-		return nil, err
-	}
-
-	if resp.StatusCode != http.StatusNoContent && resp.StatusCode != http.StatusOK {
-		err := fmt.Errorf(string(body))
-		response.Err = err
-		return &response, err
-	}
-
-	return nil, nil
-}
-
-// Ping will check to see if the server is up
-// Ping returns how long the request took, the version of the server it connected to, and an error if one occurred.
-func (c *Client) Ping() (time.Duration, string, error) {
-	now := time.Now()
-	u := c.url
-	u.Path = "ping"
-
-	req, err := http.NewRequest("GET", u.String(), nil)
-	if err != nil {
-		return 0, "", err
-	}
-	req.Header.Set("User-Agent", c.userAgent)
-	if c.username != "" {
-		req.SetBasicAuth(c.username, c.password)
-	}
-
-	resp, err := c.httpClient.Do(req)
-	if err != nil {
-		return 0, "", err
-	}
-	defer resp.Body.Close()
-
-	version := resp.Header.Get("X-Influxdb-Version")
-	return time.Since(now), version, nil
-}
-
-// Structs
-
-// Result represents a resultset returned from a single statement.
-type Result struct {
-	Series []models.Row
-	Err    error
-}
-
-// MarshalJSON encodes the result into JSON.
-func (r *Result) MarshalJSON() ([]byte, error) {
-	// Define a struct that outputs "error" as a string.
-	var o struct {
-		Series []models.Row `json:"series,omitempty"`
-		Err    string       `json:"error,omitempty"`
-	}
-
-	// Copy fields to output struct.
-	o.Series = r.Series
-	if r.Err != nil {
-		o.Err = r.Err.Error()
-	}
-
-	return json.Marshal(&o)
-}
-
-// UnmarshalJSON decodes the data into the Result struct
-func (r *Result) UnmarshalJSON(b []byte) error {
-	var o struct {
-		Series []models.Row `json:"series,omitempty"`
-		Err    string       `json:"error,omitempty"`
-	}
-
-	dec := json.NewDecoder(bytes.NewBuffer(b))
-	dec.UseNumber()
-	err := dec.Decode(&o)
-	if err != nil {
-		return err
-	}
-	r.Series = o.Series
-	if o.Err != "" {
-		r.Err = errors.New(o.Err)
-	}
-	return nil
-}
-
-// Response represents a list of statement results.
-type Response struct {
-	Results []Result
-	Err     error
-}
-
-// MarshalJSON encodes the response into JSON.
-func (r *Response) MarshalJSON() ([]byte, error) {
-	// Define a struct that outputs "error" as a string.
-	var o struct {
-		Results []Result `json:"results,omitempty"`
-		Err     string   `json:"error,omitempty"`
-	}
-
-	// Copy fields to output struct.
-	o.Results = r.Results
-	if r.Err != nil {
-		o.Err = r.Err.Error()
-	}
-
-	return json.Marshal(&o)
-}
-
-// UnmarshalJSON decodes the data into the Response struct
-func (r *Response) UnmarshalJSON(b []byte) error {
-	var o struct {
-		Results []Result `json:"results,omitempty"`
-		Err     string   `json:"error,omitempty"`
-	}
-
-	dec := json.NewDecoder(bytes.NewBuffer(b))
-	dec.UseNumber()
-	err := dec.Decode(&o)
-	if err != nil {
-		return err
-	}
-	r.Results = o.Results
-	if o.Err != "" {
-		r.Err = errors.New(o.Err)
-	}
-	return nil
-}
-
-// Error returns the first error from any statement.
-// Returns nil if no errors occurred on any statements.
-func (r Response) Error() error {
-	if r.Err != nil {
-		return r.Err
-	}
-	for _, result := range r.Results {
-		if result.Err != nil {
-			return result.Err
-		}
-	}
-	return nil
-}
-
-// Point defines the fields that will be written to the database
-// Measurement, Time, and Fields are required
-// Precision can be specified if the time is in epoch format (integer).
-// Valid values for Precision are n, u, ms, s, m, and h
-type Point struct {
-	Measurement string
-	Tags        map[string]string
-	Time        time.Time
-	Fields      map[string]interface{}
-	Precision   string
-	Raw         string
-}
-
-// MarshalJSON will format the time in RFC3339Nano
-// Precision is also ignored as it is only used for writing, not reading
-// Or another way to say it is we always send back in nanosecond precision
-func (p *Point) MarshalJSON() ([]byte, error) {
-	point := struct {
-		Measurement string                 `json:"measurement,omitempty"`
-		Tags        map[string]string      `json:"tags,omitempty"`
-		Time        string                 `json:"time,omitempty"`
-		Fields      map[string]interface{} `json:"fields,omitempty"`
-		Precision   string                 `json:"precision,omitempty"`
-	}{
-		Measurement: p.Measurement,
-		Tags:        p.Tags,
-		Fields:      p.Fields,
-		Precision:   p.Precision,
-	}
-	// Let it omit empty if it's really zero
-	if !p.Time.IsZero() {
-		point.Time = p.Time.UTC().Format(time.RFC3339Nano)
-	}
-	return json.Marshal(&point)
-}
-
-// MarshalString renders string representation of a Point with specified
-// precision. The default precision is nanoseconds.
-func (p *Point) MarshalString() string {
-	pt, err := models.NewPoint(p.Measurement, p.Tags, p.Fields, p.Time)
-	if err != nil {
-		return "# ERROR: " + err.Error() + " " + p.Measurement
-	}
-	if p.Precision == "" || p.Precision == "ns" || p.Precision == "n" {
-		return pt.String()
-	}
-	return pt.PrecisionString(p.Precision)
-}
-
-// UnmarshalJSON decodes the data into the Point struct
-func (p *Point) UnmarshalJSON(b []byte) error {
-	var normal struct {
-		Measurement string                 `json:"measurement"`
-		Tags        map[string]string      `json:"tags"`
-		Time        time.Time              `json:"time"`
-		Precision   string                 `json:"precision"`
-		Fields      map[string]interface{} `json:"fields"`
-	}
-	var epoch struct {
-		Measurement string                 `json:"measurement"`
-		Tags        map[string]string      `json:"tags"`
-		Time        *int64                 `json:"time"`
-		Precision   string                 `json:"precision"`
-		Fields      map[string]interface{} `json:"fields"`
-	}
-
-	if err := func() error {
-		var err error
-		dec := json.NewDecoder(bytes.NewBuffer(b))
-		dec.UseNumber()
-		if err = dec.Decode(&epoch); err != nil {
-			return err
-		}
-		// Convert from epoch to time.Time, but only if Time
-		// was actually set.
-		var ts time.Time
-		if epoch.Time != nil {
-			ts, err = EpochToTime(*epoch.Time, epoch.Precision)
-			if err != nil {
-				return err
-			}
-		}
-		p.Measurement = epoch.Measurement
-		p.Tags = epoch.Tags
-		p.Time = ts
-		p.Precision = epoch.Precision
-		p.Fields = normalizeFields(epoch.Fields)
-		return nil
-	}(); err == nil {
-		return nil
-	}
-
-	dec := json.NewDecoder(bytes.NewBuffer(b))
-	dec.UseNumber()
-	if err := dec.Decode(&normal); err != nil {
-		return err
-	}
-	normal.Time = SetPrecision(normal.Time, normal.Precision)
-	p.Measurement = normal.Measurement
-	p.Tags = normal.Tags
-	p.Time = normal.Time
-	p.Precision = normal.Precision
-	p.Fields = normalizeFields(normal.Fields)
-
-	return nil
-}
-
-// Remove any notion of json.Number
-func normalizeFields(fields map[string]interface{}) map[string]interface{} {
-	newFields := map[string]interface{}{}
-
-	for k, v := range fields {
-		switch v := v.(type) {
-		case json.Number:
-			jv, e := v.Float64()
-			if e != nil {
-				panic(fmt.Sprintf("unable to convert json.Number to float64: %s", e))
-			}
-			newFields[k] = jv
-		default:
-			newFields[k] = v
-		}
-	}
-	return newFields
-}
-
-// BatchPoints is used to send batched data in a single write.
-// Database and Points are required
-// If no retention policy is specified, it will use the databases default retention policy.
-// If tags are specified, they will be "merged" with all points. If a point already has that tag, it will be ignored.
-// If time is specified, it will be applied to any point with an empty time.
-// Precision can be specified if the time is in epoch format (integer).
-// Valid values for Precision are n, u, ms, s, m, and h
-type BatchPoints struct {
-	Points           []Point           `json:"points,omitempty"`
-	Database         string            `json:"database,omitempty"`
-	RetentionPolicy  string            `json:"retentionPolicy,omitempty"`
-	Tags             map[string]string `json:"tags,omitempty"`
-	Time             time.Time         `json:"time,omitempty"`
-	Precision        string            `json:"precision,omitempty"`
-	WriteConsistency string            `json:"-"`
-}
-
-// UnmarshalJSON decodes the data into the BatchPoints struct
-func (bp *BatchPoints) UnmarshalJSON(b []byte) error {
-	var normal struct {
-		Points          []Point           `json:"points"`
-		Database        string            `json:"database"`
-		RetentionPolicy string            `json:"retentionPolicy"`
-		Tags            map[string]string `json:"tags"`
-		Time            time.Time         `json:"time"`
-		Precision       string            `json:"precision"`
-	}
-	var epoch struct {
-		Points          []Point           `json:"points"`
-		Database        string            `json:"database"`
-		RetentionPolicy string            `json:"retentionPolicy"`
-		Tags            map[string]string `json:"tags"`
-		Time            *int64            `json:"time"`
-		Precision       string            `json:"precision"`
-	}
-
-	if err := func() error {
-		var err error
-		if err = json.Unmarshal(b, &epoch); err != nil {
-			return err
-		}
-		// Convert from epoch to time.Time
-		var ts time.Time
-		if epoch.Time != nil {
-			ts, err = EpochToTime(*epoch.Time, epoch.Precision)
-			if err != nil {
-				return err
-			}
-		}
-		bp.Points = epoch.Points
-		bp.Database = epoch.Database
-		bp.RetentionPolicy = epoch.RetentionPolicy
-		bp.Tags = epoch.Tags
-		bp.Time = ts
-		bp.Precision = epoch.Precision
-		return nil
-	}(); err == nil {
-		return nil
-	}
-
-	if err := json.Unmarshal(b, &normal); err != nil {
-		return err
-	}
-	normal.Time = SetPrecision(normal.Time, normal.Precision)
-	bp.Points = normal.Points
-	bp.Database = normal.Database
-	bp.RetentionPolicy = normal.RetentionPolicy
-	bp.Tags = normal.Tags
-	bp.Time = normal.Time
-	bp.Precision = normal.Precision
-
-	return nil
-}
-
-// utility functions
-
-// Addr provides the current url as a string of the server the client is connected to.
-func (c *Client) Addr() string {
-	return c.url.String()
-}
-
-// helper functions
-
-// EpochToTime takes a unix epoch time and uses precision to return back a time.Time
-func EpochToTime(epoch int64, precision string) (time.Time, error) {
-	if precision == "" {
-		precision = "s"
-	}
-	var t time.Time
-	switch precision {
-	case "h":
-		t = time.Unix(0, epoch*int64(time.Hour))
-	case "m":
-		t = time.Unix(0, epoch*int64(time.Minute))
-	case "s":
-		t = time.Unix(0, epoch*int64(time.Second))
-	case "ms":
-		t = time.Unix(0, epoch*int64(time.Millisecond))
-	case "u":
-		t = time.Unix(0, epoch*int64(time.Microsecond))
-	case "n":
-		t = time.Unix(0, epoch)
-	default:
-		return time.Time{}, fmt.Errorf("Unknown precision %q", precision)
-	}
-	return t, nil
-}
-
-// SetPrecision will round a time to the specified precision
-func SetPrecision(t time.Time, precision string) time.Time {
-	switch precision {
-	case "n":
-	case "u":
-		return t.Round(time.Microsecond)
-	case "ms":
-		return t.Round(time.Millisecond)
-	case "s":
-		return t.Round(time.Second)
-	case "m":
-		return t.Round(time.Minute)
-	case "h":
-		return t.Round(time.Hour)
-	}
-	return t
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/client/influxdb_test.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/client/influxdb_test.go
deleted file mode 100644
index 0a1981c83..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/client/influxdb_test.go
+++ /dev/null
@@ -1,560 +0,0 @@
-package client_test
-
-import (
-	"encoding/json"
-	"fmt"
-	"net/http"
-	"net/http/httptest"
-	"net/url"
-	"strings"
-	"testing"
-	"time"
-
-	"github.com/influxdb/influxdb/client"
-)
-
-func BenchmarkUnmarshalJSON2Tags(b *testing.B) {
-	var bp client.BatchPoints
-	data := []byte(`
-{
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-        {
-            "name": "cpu",
-            "tags": {
-                "host": "server01",
-                "region": "us-east1"
-            },
-            "time": 14244733039069373,
-            "precision": "n",
-            "fields": {
-                    "value": 4541770385657154000
-            }
-        }
-    ]
-}
-`)
-
-	for i := 0; i < b.N; i++ {
-		if err := json.Unmarshal(data, &bp); err != nil {
-			b.Errorf("unable to unmarshal nanosecond data: %s", err.Error())
-		}
-		b.SetBytes(int64(len(data)))
-	}
-}
-
-func BenchmarkUnmarshalJSON10Tags(b *testing.B) {
-	var bp client.BatchPoints
-	data := []byte(`
-{
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-        {
-            "name": "cpu",
-            "tags": {
-                "host": "server01",
-                "region": "us-east1",
-                "tag1": "value1",
-                "tag2": "value2",
-                "tag2": "value3",
-                "tag4": "value4",
-                "tag5": "value5",
-                "tag6": "value6",
-                "tag7": "value7",
-                "tag8": "value8"
-            },
-            "time": 14244733039069373,
-            "precision": "n",
-            "fields": {
-                    "value": 4541770385657154000
-            }
-        }
-    ]
-}
-`)
-
-	for i := 0; i < b.N; i++ {
-		if err := json.Unmarshal(data, &bp); err != nil {
-			b.Errorf("unable to unmarshal nanosecond data: %s", err.Error())
-		}
-		b.SetBytes(int64(len(data)))
-	}
-}
-
-func TestNewClient(t *testing.T) {
-	config := client.Config{}
-	_, err := client.NewClient(config)
-	if err != nil {
-		t.Fatalf("unexpected error.  expected %v, actual %v", nil, err)
-	}
-}
-
-func TestClient_Ping(t *testing.T) {
-	ts := emptyTestServer()
-	defer ts.Close()
-
-	u, _ := url.Parse(ts.URL)
-	config := client.Config{URL: *u}
-	c, err := client.NewClient(config)
-	if err != nil {
-		t.Fatalf("unexpected error.  expected %v, actual %v", nil, err)
-	}
-	d, version, err := c.Ping()
-	if err != nil {
-		t.Fatalf("unexpected error.  expected %v, actual %v", nil, err)
-	}
-	if d == 0 {
-		t.Fatalf("expected a duration greater than zero.  actual %v", d)
-	}
-	if version != "x.x" {
-		t.Fatalf("unexpected version.  expected %s,  actual %v", "x.x", version)
-	}
-}
-
-func TestClient_Query(t *testing.T) {
-	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		var data client.Response
-		w.WriteHeader(http.StatusOK)
-		_ = json.NewEncoder(w).Encode(data)
-	}))
-	defer ts.Close()
-
-	u, _ := url.Parse(ts.URL)
-	config := client.Config{URL: *u}
-	c, err := client.NewClient(config)
-	if err != nil {
-		t.Fatalf("unexpected error.  expected %v, actual %v", nil, err)
-	}
-
-	query := client.Query{}
-	_, err = c.Query(query)
-	if err != nil {
-		t.Fatalf("unexpected error.  expected %v, actual %v", nil, err)
-	}
-}
-
-func TestClient_BasicAuth(t *testing.T) {
-	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		u, p, ok := r.BasicAuth()
-
-		if !ok {
-			t.Errorf("basic auth error")
-		}
-		if u != "username" {
-			t.Errorf("unexpected username, expected %q, actual %q", "username", u)
-		}
-		if p != "password" {
-			t.Errorf("unexpected password, expected %q, actual %q", "password", p)
-		}
-		w.WriteHeader(http.StatusNoContent)
-	}))
-	defer ts.Close()
-
-	u, _ := url.Parse(ts.URL)
-	u.User = url.UserPassword("username", "password")
-	config := client.Config{URL: *u, Username: "username", Password: "password"}
-	c, err := client.NewClient(config)
-	if err != nil {
-		t.Fatalf("unexpected error.  expected %v, actual %v", nil, err)
-	}
-
-	_, _, err = c.Ping()
-	if err != nil {
-		t.Fatalf("unexpected error.  expected %v, actual %v", nil, err)
-	}
-}
-
-func TestClient_Write(t *testing.T) {
-	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		var data client.Response
-		w.WriteHeader(http.StatusNoContent)
-		_ = json.NewEncoder(w).Encode(data)
-	}))
-	defer ts.Close()
-
-	u, _ := url.Parse(ts.URL)
-	config := client.Config{URL: *u}
-	c, err := client.NewClient(config)
-	if err != nil {
-		t.Fatalf("unexpected error.  expected %v, actual %v", nil, err)
-	}
-
-	bp := client.BatchPoints{}
-	r, err := c.Write(bp)
-	if err != nil {
-		t.Fatalf("unexpected error.  expected %v, actual %v", nil, err)
-	}
-	if r != nil {
-		t.Fatalf("unexpected response. expected %v, actual %v", nil, r)
-	}
-}
-
-func TestClient_UserAgent(t *testing.T) {
-	receivedUserAgent := ""
-	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		receivedUserAgent = r.UserAgent()
-
-		var data client.Response
-		w.WriteHeader(http.StatusOK)
-		_ = json.NewEncoder(w).Encode(data)
-	}))
-	defer ts.Close()
-
-	_, err := http.Get(ts.URL)
-	if err != nil {
-		t.Fatalf("unexpected error.  expected %v, actual %v", nil, err)
-	}
-
-	tests := []struct {
-		name      string
-		userAgent string
-		expected  string
-	}{
-		{
-			name:      "Empty user agent",
-			userAgent: "",
-			expected:  "InfluxDBClient",
-		},
-		{
-			name:      "Custom user agent",
-			userAgent: "Test Influx Client",
-			expected:  "Test Influx Client",
-		},
-	}
-
-	for _, test := range tests {
-		u, _ := url.Parse(ts.URL)
-		config := client.Config{URL: *u, UserAgent: test.userAgent}
-		c, err := client.NewClient(config)
-		if err != nil {
-			t.Fatalf("unexpected error.  expected %v, actual %v", nil, err)
-		}
-
-		receivedUserAgent = ""
-		query := client.Query{}
-		_, err = c.Query(query)
-		if err != nil {
-			t.Fatalf("unexpected error.  expected %v, actual %v", nil, err)
-		}
-		if !strings.HasPrefix(receivedUserAgent, test.expected) {
-			t.Fatalf("Unexpected user agent. expected %v, actual %v", test.expected, receivedUserAgent)
-		}
-
-		receivedUserAgent = ""
-		bp := client.BatchPoints{}
-		_, err = c.Write(bp)
-		if err != nil {
-			t.Fatalf("unexpected error.  expected %v, actual %v", nil, err)
-		}
-		if !strings.HasPrefix(receivedUserAgent, test.expected) {
-			t.Fatalf("Unexpected user agent. expected %v, actual %v", test.expected, receivedUserAgent)
-		}
-
-		receivedUserAgent = ""
-		_, _, err = c.Ping()
-		if err != nil {
-			t.Fatalf("unexpected error.  expected %v, actual %v", nil, err)
-		}
-		if receivedUserAgent != test.expected {
-			t.Fatalf("Unexpected user agent. expected %v, actual %v", test.expected, receivedUserAgent)
-		}
-	}
-}
-
-func TestPoint_UnmarshalEpoch(t *testing.T) {
-	now := time.Now()
-	tests := []struct {
-		name      string
-		epoch     int64
-		precision string
-		expected  time.Time
-	}{
-		{
-			name:      "nanoseconds",
-			epoch:     now.UnixNano(),
-			precision: "n",
-			expected:  now,
-		},
-		{
-			name:      "microseconds",
-			epoch:     now.Round(time.Microsecond).UnixNano() / int64(time.Microsecond),
-			precision: "u",
-			expected:  now.Round(time.Microsecond),
-		},
-		{
-			name:      "milliseconds",
-			epoch:     now.Round(time.Millisecond).UnixNano() / int64(time.Millisecond),
-			precision: "ms",
-			expected:  now.Round(time.Millisecond),
-		},
-		{
-			name:      "seconds",
-			epoch:     now.Round(time.Second).UnixNano() / int64(time.Second),
-			precision: "s",
-			expected:  now.Round(time.Second),
-		},
-		{
-			name:      "minutes",
-			epoch:     now.Round(time.Minute).UnixNano() / int64(time.Minute),
-			precision: "m",
-			expected:  now.Round(time.Minute),
-		},
-		{
-			name:      "hours",
-			epoch:     now.Round(time.Hour).UnixNano() / int64(time.Hour),
-			precision: "h",
-			expected:  now.Round(time.Hour),
-		},
-		{
-			name:      "max int64",
-			epoch:     9223372036854775807,
-			precision: "n",
-			expected:  time.Unix(0, 9223372036854775807),
-		},
-		{
-			name:      "100 years from now",
-			epoch:     now.Add(time.Hour * 24 * 365 * 100).UnixNano(),
-			precision: "n",
-			expected:  now.Add(time.Hour * 24 * 365 * 100),
-		},
-	}
-
-	for _, test := range tests {
-		t.Logf("testing %q\n", test.name)
-		data := []byte(fmt.Sprintf(`{"time": %d, "precision":"%s"}`, test.epoch, test.precision))
-		t.Logf("json: %s", string(data))
-		var p client.Point
-		err := json.Unmarshal(data, &p)
-		if err != nil {
-			t.Fatalf("unexpected error.  exptected: %v, actual: %v", nil, err)
-		}
-		if !p.Time.Equal(test.expected) {
-			t.Fatalf("Unexpected time.  expected: %v, actual: %v", test.expected, p.Time)
-		}
-	}
-}
-
-func TestPoint_UnmarshalRFC(t *testing.T) {
-	now := time.Now().UTC()
-	tests := []struct {
-		name     string
-		rfc      string
-		now      time.Time
-		expected time.Time
-	}{
-		{
-			name:     "RFC3339Nano",
-			rfc:      time.RFC3339Nano,
-			now:      now,
-			expected: now,
-		},
-		{
-			name:     "RFC3339",
-			rfc:      time.RFC3339,
-			now:      now.Round(time.Second),
-			expected: now.Round(time.Second),
-		},
-	}
-
-	for _, test := range tests {
-		t.Logf("testing %q\n", test.name)
-		ts := test.now.Format(test.rfc)
-		data := []byte(fmt.Sprintf(`{"time": %q}`, ts))
-		t.Logf("json: %s", string(data))
-		var p client.Point
-		err := json.Unmarshal(data, &p)
-		if err != nil {
-			t.Fatalf("unexpected error.  exptected: %v, actual: %v", nil, err)
-		}
-		if !p.Time.Equal(test.expected) {
-			t.Fatalf("Unexpected time.  expected: %v, actual: %v", test.expected, p.Time)
-		}
-	}
-}
-
-func TestPoint_MarshalOmitempty(t *testing.T) {
-	now := time.Now().UTC()
-	tests := []struct {
-		name     string
-		point    client.Point
-		now      time.Time
-		expected string
-	}{
-		{
-			name:     "all empty",
-			point:    client.Point{Measurement: "cpu", Fields: map[string]interface{}{"value": 1.1}},
-			now:      now,
-			expected: `{"measurement":"cpu","fields":{"value":1.1}}`,
-		},
-		{
-			name:     "with time",
-			point:    client.Point{Measurement: "cpu", Fields: map[string]interface{}{"value": 1.1}, Time: now},
-			now:      now,
-			expected: fmt.Sprintf(`{"measurement":"cpu","time":"%s","fields":{"value":1.1}}`, now.Format(time.RFC3339Nano)),
-		},
-		{
-			name:     "with tags",
-			point:    client.Point{Measurement: "cpu", Fields: map[string]interface{}{"value": 1.1}, Tags: map[string]string{"foo": "bar"}},
-			now:      now,
-			expected: `{"measurement":"cpu","tags":{"foo":"bar"},"fields":{"value":1.1}}`,
-		},
-		{
-			name:     "with precision",
-			point:    client.Point{Measurement: "cpu", Fields: map[string]interface{}{"value": 1.1}, Precision: "ms"},
-			now:      now,
-			expected: `{"measurement":"cpu","fields":{"value":1.1},"precision":"ms"}`,
-		},
-	}
-
-	for _, test := range tests {
-		t.Logf("testing %q\n", test.name)
-		b, err := json.Marshal(&test.point)
-		if err != nil {
-			t.Fatalf("unexpected error.  exptected: %v, actual: %v", nil, err)
-		}
-		if test.expected != string(b) {
-			t.Fatalf("Unexpected result.  expected: %v, actual: %v", test.expected, string(b))
-		}
-	}
-}
-
-func TestEpochToTime(t *testing.T) {
-	now := time.Now()
-
-	tests := []struct {
-		name      string
-		epoch     int64
-		precision string
-		expected  time.Time
-	}{
-		{name: "nanoseconds", epoch: now.UnixNano(), precision: "n", expected: now},
-		{name: "microseconds", epoch: now.Round(time.Microsecond).UnixNano() / int64(time.Microsecond), precision: "u", expected: now.Round(time.Microsecond)},
-		{name: "milliseconds", epoch: now.Round(time.Millisecond).UnixNano() / int64(time.Millisecond), precision: "ms", expected: now.Round(time.Millisecond)},
-		{name: "seconds", epoch: now.Round(time.Second).UnixNano() / int64(time.Second), precision: "s", expected: now.Round(time.Second)},
-		{name: "minutes", epoch: now.Round(time.Minute).UnixNano() / int64(time.Minute), precision: "m", expected: now.Round(time.Minute)},
-		{name: "hours", epoch: now.Round(time.Hour).UnixNano() / int64(time.Hour), precision: "h", expected: now.Round(time.Hour)},
-	}
-
-	for _, test := range tests {
-		t.Logf("testing %q\n", test.name)
-		tm, e := client.EpochToTime(test.epoch, test.precision)
-		if e != nil {
-			t.Fatalf("unexpected error: expected %v, actual: %v", nil, e)
-		}
-		if tm != test.expected {
-			t.Fatalf("unexpected time: expected %v, actual %v", test.expected, tm)
-		}
-	}
-}
-
-// helper functions
-
-func emptyTestServer() *httptest.Server {
-	return httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		w.Header().Set("X-Influxdb-Version", "x.x")
-		return
-	}))
-}
-
-// Ensure that data with epoch times can be decoded.
-func TestBatchPoints_Normal(t *testing.T) {
-	var bp client.BatchPoints
-	data := []byte(`
-{
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-        {
-            "name": "cpu",
-            "tags": {
-                "host": "server01"
-            },
-            "time": 14244733039069373,
-            "precision": "n",
-            "values": {
-                    "value": 4541770385657154000
-            }
-        },
-        {
-            "name": "cpu",
-             "tags": {
-                "host": "server01"
-            },
-            "time": 14244733039069380,
-            "precision": "n",
-            "values": {
-                    "value": 7199311900554737000
-            }
-        }
-    ]
-}
-`)
-
-	if err := json.Unmarshal(data, &bp); err != nil {
-		t.Errorf("unable to unmarshal nanosecond data: %s", err.Error())
-	}
-}
-
-func TestClient_Timeout(t *testing.T) {
-	done := make(chan bool)
-	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		<-done
-	}))
-	defer ts.Close()
-	defer func() { done <- true }()
-
-	u, _ := url.Parse(ts.URL)
-	config := client.Config{URL: *u, Timeout: 500 * time.Millisecond}
-	c, err := client.NewClient(config)
-	if err != nil {
-		t.Fatalf("unexpected error.  expected %v, actual %v", nil, err)
-	}
-
-	query := client.Query{}
-	_, err = c.Query(query)
-	if err == nil {
-		t.Fatalf("unexpected success.  expected timeout error")
-	} else if !strings.Contains(err.Error(), "request canceled") &&
-		!strings.Contains(err.Error(), "use of closed network connection") {
-		t.Fatalf("unexpected error.  expected 'request canceled' error, got %v", err)
-	}
-}
-
-func TestClient_NoTimeout(t *testing.T) {
-	if testing.Short() {
-		t.Skip("skipping in short mode")
-	}
-	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		time.Sleep(1 * time.Second)
-		var data client.Response
-		w.WriteHeader(http.StatusOK)
-		_ = json.NewEncoder(w).Encode(data)
-	}))
-	defer ts.Close()
-
-	u, _ := url.Parse(ts.URL)
-	config := client.Config{URL: *u}
-	c, err := client.NewClient(config)
-	if err != nil {
-		t.Fatalf("unexpected error.  expected %v, actual %v", nil, err)
-	}
-
-	query := client.Query{}
-	_, err = c.Query(query)
-	if err != nil {
-		t.Fatalf("unexpected error.  expected %v, actual %v", nil, err)
-	}
-}
-
-func TestClient_ParseConnectionString_IPv6(t *testing.T) {
-	path := "[fdf5:9ede:1875:0:a9ee:a600:8fe3:d495]:8086"
-	u, err := client.ParseConnectionString(path, false)
-	if err != nil {
-		t.Fatalf("unexpected error, expected %v, actual %v", nil, err)
-	}
-	if u.Host != path {
-		t.Fatalf("ipv6 parse failed, expected %s, actual %s", path, u.Host)
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/client/v2/client.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/client/v2/client.go
deleted file mode 100644
index 29f0a458a..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/client/v2/client.go
+++ /dev/null
@@ -1,498 +0,0 @@
-package client
-
-import (
-	"bytes"
-	"crypto/tls"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"io/ioutil"
-	"net"
-	"net/http"
-	"net/url"
-	"time"
-
-	"github.com/influxdb/influxdb/models"
-)
-
-// UDPPayloadSize is a reasonable default payload size for UDP packets that
-// could be travelling over the internet.
-const (
-	UDPPayloadSize = 512
-)
-
-type HTTPConfig struct {
-	// Addr should be of the form "http://host:port"
-	// or "http://[ipv6-host%zone]:port".
-	Addr string
-
-	// Username is the influxdb username, optional
-	Username string
-
-	// Password is the influxdb password, optional
-	Password string
-
-	// UserAgent is the http User Agent, defaults to "InfluxDBClient"
-	UserAgent string
-
-	// Timeout for influxdb writes, defaults to no timeout
-	Timeout time.Duration
-
-	// InsecureSkipVerify gets passed to the http client, if true, it will
-	// skip https certificate verification. Defaults to false
-	InsecureSkipVerify bool
-}
-
-type UDPConfig struct {
-	// Addr should be of the form "udp://host:port"
-	// or "udp://[ipv6-host%zone]:port".
-	Addr string
-
-	// PayloadSize is the maximum size of a UDP client message, optional
-	// Tune this based on your network. Defaults to UDPBufferSize.
-	PayloadSize int
-}
-
-type BatchPointsConfig struct {
-	// Precision is the write precision of the points, defaults to "ns"
-	Precision string
-
-	// Database is the database to write points to
-	Database string
-
-	// RetentionPolicy is the retention policy of the points
-	RetentionPolicy string
-
-	// Write consistency is the number of servers required to confirm write
-	WriteConsistency string
-}
-
-// Client is a client interface for writing & querying the database
-type Client interface {
-	// Write takes a BatchPoints object and writes all Points to InfluxDB.
-	Write(bp BatchPoints) error
-
-	// Query makes an InfluxDB Query on the database. This will fail if using
-	// the UDP client.
-	Query(q Query) (*Response, error)
-
-	// Close releases any resources a Client may be using.
-	Close() error
-}
-
-// NewClient creates a client interface from the given config.
-func NewHTTPClient(conf HTTPConfig) (Client, error) {
-	if conf.UserAgent == "" {
-		conf.UserAgent = "InfluxDBClient"
-	}
-
-	u, err := url.Parse(conf.Addr)
-	if err != nil {
-		return nil, err
-	} else if u.Scheme != "http" && u.Scheme != "https" {
-		m := fmt.Sprintf("Unsupported protocol scheme: %s, your address"+
-			" must start with http:// or https://", u.Scheme)
-		return nil, errors.New(m)
-	}
-
-	tr := &http.Transport{
-		TLSClientConfig: &tls.Config{
-			InsecureSkipVerify: conf.InsecureSkipVerify,
-		},
-	}
-	return &client{
-		url:       u,
-		username:  conf.Username,
-		password:  conf.Password,
-		useragent: conf.UserAgent,
-		httpClient: &http.Client{
-			Timeout:   conf.Timeout,
-			Transport: tr,
-		},
-	}, nil
-}
-
-// Close releases the client's resources.
-func (c *client) Close() error {
-	return nil
-}
-
-// NewUDPClient returns a client interface for writing to an InfluxDB UDP
-// service from the given config.
-func NewUDPClient(conf UDPConfig) (Client, error) {
-	var udpAddr *net.UDPAddr
-	udpAddr, err := net.ResolveUDPAddr("udp", conf.Addr)
-	if err != nil {
-		return nil, err
-	}
-
-	conn, err := net.DialUDP("udp", nil, udpAddr)
-	if err != nil {
-		return nil, err
-	}
-
-	payloadSize := conf.PayloadSize
-	if payloadSize == 0 {
-		payloadSize = UDPPayloadSize
-	}
-
-	return &udpclient{
-		conn:        conn,
-		payloadSize: payloadSize,
-	}, nil
-}
-
-// Close releases the udpclient's resources.
-func (uc *udpclient) Close() error {
-	return uc.conn.Close()
-}
-
-type client struct {
-	url        *url.URL
-	username   string
-	password   string
-	useragent  string
-	httpClient *http.Client
-}
-
-type udpclient struct {
-	conn        *net.UDPConn
-	payloadSize int
-}
-
-// BatchPoints is an interface into a batched grouping of points to write into
-// InfluxDB together. BatchPoints is NOT thread-safe, you must create a separate
-// batch for each goroutine.
-type BatchPoints interface {
-	// AddPoint adds the given point to the Batch of points
-	AddPoint(p *Point)
-	// Points lists the points in the Batch
-	Points() []*Point
-
-	// Precision returns the currently set precision of this Batch
-	Precision() string
-	// SetPrecision sets the precision of this batch.
-	SetPrecision(s string) error
-
-	// Database returns the currently set database of this Batch
-	Database() string
-	// SetDatabase sets the database of this Batch
-	SetDatabase(s string)
-
-	// WriteConsistency returns the currently set write consistency of this Batch
-	WriteConsistency() string
-	// SetWriteConsistency sets the write consistency of this Batch
-	SetWriteConsistency(s string)
-
-	// RetentionPolicy returns the currently set retention policy of this Batch
-	RetentionPolicy() string
-	// SetRetentionPolicy sets the retention policy of this Batch
-	SetRetentionPolicy(s string)
-}
-
-// NewBatchPoints returns a BatchPoints interface based on the given config.
-func NewBatchPoints(conf BatchPointsConfig) (BatchPoints, error) {
-	if conf.Precision == "" {
-		conf.Precision = "ns"
-	}
-	if _, err := time.ParseDuration("1" + conf.Precision); err != nil {
-		return nil, err
-	}
-	bp := &batchpoints{
-		database:         conf.Database,
-		precision:        conf.Precision,
-		retentionPolicy:  conf.RetentionPolicy,
-		writeConsistency: conf.WriteConsistency,
-	}
-	return bp, nil
-}
-
-type batchpoints struct {
-	points           []*Point
-	database         string
-	precision        string
-	retentionPolicy  string
-	writeConsistency string
-}
-
-func (bp *batchpoints) AddPoint(p *Point) {
-	bp.points = append(bp.points, p)
-}
-
-func (bp *batchpoints) Points() []*Point {
-	return bp.points
-}
-
-func (bp *batchpoints) Precision() string {
-	return bp.precision
-}
-
-func (bp *batchpoints) Database() string {
-	return bp.database
-}
-
-func (bp *batchpoints) WriteConsistency() string {
-	return bp.writeConsistency
-}
-
-func (bp *batchpoints) RetentionPolicy() string {
-	return bp.retentionPolicy
-}
-
-func (bp *batchpoints) SetPrecision(p string) error {
-	if _, err := time.ParseDuration("1" + p); err != nil {
-		return err
-	}
-	bp.precision = p
-	return nil
-}
-
-func (bp *batchpoints) SetDatabase(db string) {
-	bp.database = db
-}
-
-func (bp *batchpoints) SetWriteConsistency(wc string) {
-	bp.writeConsistency = wc
-}
-
-func (bp *batchpoints) SetRetentionPolicy(rp string) {
-	bp.retentionPolicy = rp
-}
-
-type Point struct {
-	pt models.Point
-}
-
-// NewPoint returns a point with the given timestamp. If a timestamp is not
-// given, then data is sent to the database without a timestamp, in which case
-// the server will assign local time upon reception. NOTE: it is recommended
-// to send data with a timestamp.
-func NewPoint(
-	name string,
-	tags map[string]string,
-	fields map[string]interface{},
-	t ...time.Time,
-) (*Point, error) {
-	var T time.Time
-	if len(t) > 0 {
-		T = t[0]
-	}
-
-	pt, err := models.NewPoint(name, tags, fields, T)
-	if err != nil {
-		return nil, err
-	}
-	return &Point{
-		pt: pt,
-	}, nil
-}
-
-// String returns a line-protocol string of the Point
-func (p *Point) String() string {
-	return p.pt.String()
-}
-
-// PrecisionString returns a line-protocol string of the Point, at precision
-func (p *Point) PrecisionString(precison string) string {
-	return p.pt.PrecisionString(precison)
-}
-
-// Name returns the measurement name of the point
-func (p *Point) Name() string {
-	return p.pt.Name()
-}
-
-// Name returns the tags associated with the point
-func (p *Point) Tags() map[string]string {
-	return p.pt.Tags()
-}
-
-// Time return the timestamp for the point
-func (p *Point) Time() time.Time {
-	return p.pt.Time()
-}
-
-// UnixNano returns the unix nano time of the point
-func (p *Point) UnixNano() int64 {
-	return p.pt.UnixNano()
-}
-
-// Fields returns the fields for the point
-func (p *Point) Fields() map[string]interface{} {
-	return p.pt.Fields()
-}
-
-func (uc *udpclient) Write(bp BatchPoints) error {
-	var b bytes.Buffer
-	var d time.Duration
-	d, _ = time.ParseDuration("1" + bp.Precision())
-
-	for _, p := range bp.Points() {
-		pointstring := p.pt.RoundedString(d) + "\n"
-
-		// Write and reset the buffer if we reach the max size
-		if b.Len()+len(pointstring) >= uc.payloadSize {
-			if _, err := uc.conn.Write(b.Bytes()); err != nil {
-				return err
-			}
-			b.Reset()
-		}
-
-		if _, err := b.WriteString(pointstring); err != nil {
-			return err
-		}
-	}
-
-	_, err := uc.conn.Write(b.Bytes())
-	return err
-}
-
-func (c *client) Write(bp BatchPoints) error {
-	var b bytes.Buffer
-
-	for _, p := range bp.Points() {
-		if _, err := b.WriteString(p.pt.PrecisionString(bp.Precision())); err != nil {
-			return err
-		}
-
-		if err := b.WriteByte('\n'); err != nil {
-			return err
-		}
-	}
-
-	u := c.url
-	u.Path = "write"
-	req, err := http.NewRequest("POST", u.String(), &b)
-	if err != nil {
-		return err
-	}
-	req.Header.Set("Content-Type", "")
-	req.Header.Set("User-Agent", c.useragent)
-	if c.username != "" {
-		req.SetBasicAuth(c.username, c.password)
-	}
-
-	params := req.URL.Query()
-	params.Set("db", bp.Database())
-	params.Set("rp", bp.RetentionPolicy())
-	params.Set("precision", bp.Precision())
-	params.Set("consistency", bp.WriteConsistency())
-	req.URL.RawQuery = params.Encode()
-
-	resp, err := c.httpClient.Do(req)
-	if err != nil {
-		return err
-	}
-	defer resp.Body.Close()
-
-	body, err := ioutil.ReadAll(resp.Body)
-	if err != nil {
-		return err
-	}
-
-	if resp.StatusCode != http.StatusNoContent && resp.StatusCode != http.StatusOK {
-		var err = fmt.Errorf(string(body))
-		return err
-	}
-
-	return nil
-}
-
-// Query defines a query to send to the server
-type Query struct {
-	Command   string
-	Database  string
-	Precision string
-}
-
-// NewQuery returns a query object
-// database and precision strings can be empty strings if they are not needed
-// for the query.
-func NewQuery(command, database, precision string) Query {
-	return Query{
-		Command:   command,
-		Database:  database,
-		Precision: precision,
-	}
-}
-
-// Response represents a list of statement results.
-type Response struct {
-	Results []Result
-	Err     error
-}
-
-// Error returns the first error from any statement.
-// Returns nil if no errors occurred on any statements.
-func (r *Response) Error() error {
-	if r.Err != nil {
-		return r.Err
-	}
-	for _, result := range r.Results {
-		if result.Err != nil {
-			return result.Err
-		}
-	}
-	return nil
-}
-
-// Result represents a resultset returned from a single statement.
-type Result struct {
-	Series []models.Row
-	Err    error
-}
-
-func (uc *udpclient) Query(q Query) (*Response, error) {
-	return nil, fmt.Errorf("Querying via UDP is not supported")
-}
-
-// Query sends a command to the server and returns the Response
-func (c *client) Query(q Query) (*Response, error) {
-	u := c.url
-	u.Path = "query"
-
-	req, err := http.NewRequest("GET", u.String(), nil)
-	if err != nil {
-		return nil, err
-	}
-	req.Header.Set("Content-Type", "")
-	req.Header.Set("User-Agent", c.useragent)
-	if c.username != "" {
-		req.SetBasicAuth(c.username, c.password)
-	}
-
-	params := req.URL.Query()
-	params.Set("q", q.Command)
-	params.Set("db", q.Database)
-	if q.Precision != "" {
-		params.Set("epoch", q.Precision)
-	}
-	req.URL.RawQuery = params.Encode()
-
-	resp, err := c.httpClient.Do(req)
-	if err != nil {
-		return nil, err
-	}
-	defer resp.Body.Close()
-
-	var response Response
-	dec := json.NewDecoder(resp.Body)
-	dec.UseNumber()
-	decErr := dec.Decode(&response)
-
-	// ignore this error if we got an invalid status code
-	if decErr != nil && decErr.Error() == "EOF" && resp.StatusCode != http.StatusOK {
-		decErr = nil
-	}
-	// If we got a valid decode error, send that back
-	if decErr != nil {
-		return nil, decErr
-	}
-	// If we don't have an error in our json response, and didn't get statusOK
-	// then send back an error
-	if resp.StatusCode != http.StatusOK && response.Error() == nil {
-		return &response, fmt.Errorf("received status code %d from server",
-			resp.StatusCode)
-	}
-	return &response, nil
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/client/v2/client_test.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/client/v2/client_test.go
deleted file mode 100644
index 5f1e908a1..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/client/v2/client_test.go
+++ /dev/null
@@ -1,337 +0,0 @@
-package client
-
-import (
-	"encoding/json"
-	"net/http"
-	"net/http/httptest"
-	"reflect"
-	"strings"
-	"testing"
-	"time"
-)
-
-func TestUDPClient_Query(t *testing.T) {
-	config := UDPConfig{Addr: "localhost:8089"}
-	c, err := NewUDPClient(config)
-	if err != nil {
-		t.Errorf("unexpected error.  expected %v, actual %v", nil, err)
-	}
-	defer c.Close()
-	query := Query{}
-	_, err = c.Query(query)
-	if err == nil {
-		t.Error("Querying UDP client should fail")
-	}
-}
-
-func TestUDPClient_Write(t *testing.T) {
-	config := UDPConfig{Addr: "localhost:8089"}
-	c, err := NewUDPClient(config)
-	if err != nil {
-		t.Errorf("unexpected error.  expected %v, actual %v", nil, err)
-	}
-	defer c.Close()
-
-	bp, err := NewBatchPoints(BatchPointsConfig{})
-	if err != nil {
-		t.Errorf("unexpected error.  expected %v, actual %v", nil, err)
-	}
-
-	fields := make(map[string]interface{})
-	fields["value"] = 1.0
-	pt, _ := NewPoint("cpu", make(map[string]string), fields)
-	bp.AddPoint(pt)
-
-	err = c.Write(bp)
-	if err != nil {
-		t.Errorf("unexpected error.  expected %v, actual %v", nil, err)
-	}
-}
-
-func TestUDPClient_BadAddr(t *testing.T) {
-	config := UDPConfig{Addr: "foobar@wahoo"}
-	c, err := NewUDPClient(config)
-	if err == nil {
-		defer c.Close()
-		t.Error("Expected resolve error")
-	}
-}
-
-func TestClient_Query(t *testing.T) {
-	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		var data Response
-		w.WriteHeader(http.StatusOK)
-		_ = json.NewEncoder(w).Encode(data)
-	}))
-	defer ts.Close()
-
-	config := HTTPConfig{Addr: ts.URL}
-	c, _ := NewHTTPClient(config)
-	defer c.Close()
-
-	query := Query{}
-	_, err := c.Query(query)
-	if err != nil {
-		t.Errorf("unexpected error.  expected %v, actual %v", nil, err)
-	}
-}
-
-func TestClient_BasicAuth(t *testing.T) {
-	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		u, p, ok := r.BasicAuth()
-
-		if !ok {
-			t.Errorf("basic auth error")
-		}
-		if u != "username" {
-			t.Errorf("unexpected username, expected %q, actual %q", "username", u)
-		}
-		if p != "password" {
-			t.Errorf("unexpected password, expected %q, actual %q", "password", p)
-		}
-		var data Response
-		w.WriteHeader(http.StatusOK)
-		_ = json.NewEncoder(w).Encode(data)
-	}))
-	defer ts.Close()
-
-	config := HTTPConfig{Addr: ts.URL, Username: "username", Password: "password"}
-	c, _ := NewHTTPClient(config)
-	defer c.Close()
-
-	query := Query{}
-	_, err := c.Query(query)
-	if err != nil {
-		t.Errorf("unexpected error.  expected %v, actual %v", nil, err)
-	}
-}
-
-func TestClient_Write(t *testing.T) {
-	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		var data Response
-		w.WriteHeader(http.StatusNoContent)
-		_ = json.NewEncoder(w).Encode(data)
-	}))
-	defer ts.Close()
-
-	config := HTTPConfig{Addr: ts.URL}
-	c, _ := NewHTTPClient(config)
-	defer c.Close()
-
-	bp, err := NewBatchPoints(BatchPointsConfig{})
-	if err != nil {
-		t.Errorf("unexpected error.  expected %v, actual %v", nil, err)
-	}
-	err = c.Write(bp)
-	if err != nil {
-		t.Errorf("unexpected error.  expected %v, actual %v", nil, err)
-	}
-}
-
-func TestClient_UserAgent(t *testing.T) {
-	receivedUserAgent := ""
-	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		receivedUserAgent = r.UserAgent()
-
-		var data Response
-		w.WriteHeader(http.StatusOK)
-		_ = json.NewEncoder(w).Encode(data)
-	}))
-	defer ts.Close()
-
-	_, err := http.Get(ts.URL)
-	if err != nil {
-		t.Errorf("unexpected error.  expected %v, actual %v", nil, err)
-	}
-
-	tests := []struct {
-		name      string
-		userAgent string
-		expected  string
-	}{
-		{
-			name:      "Empty user agent",
-			userAgent: "",
-			expected:  "InfluxDBClient",
-		},
-		{
-			name:      "Custom user agent",
-			userAgent: "Test Influx Client",
-			expected:  "Test Influx Client",
-		},
-	}
-
-	for _, test := range tests {
-
-		config := HTTPConfig{Addr: ts.URL, UserAgent: test.userAgent}
-		c, _ := NewHTTPClient(config)
-		defer c.Close()
-
-		receivedUserAgent = ""
-		query := Query{}
-		_, err = c.Query(query)
-		if err != nil {
-			t.Errorf("unexpected error.  expected %v, actual %v", nil, err)
-		}
-		if !strings.HasPrefix(receivedUserAgent, test.expected) {
-			t.Errorf("Unexpected user agent. expected %v, actual %v", test.expected, receivedUserAgent)
-		}
-
-		receivedUserAgent = ""
-		bp, _ := NewBatchPoints(BatchPointsConfig{})
-		err = c.Write(bp)
-		if err != nil {
-			t.Errorf("unexpected error.  expected %v, actual %v", nil, err)
-		}
-		if !strings.HasPrefix(receivedUserAgent, test.expected) {
-			t.Errorf("Unexpected user agent. expected %v, actual %v", test.expected, receivedUserAgent)
-		}
-
-		receivedUserAgent = ""
-		_, err := c.Query(query)
-		if err != nil {
-			t.Errorf("unexpected error.  expected %v, actual %v", nil, err)
-		}
-		if receivedUserAgent != test.expected {
-			t.Errorf("Unexpected user agent. expected %v, actual %v", test.expected, receivedUserAgent)
-		}
-	}
-}
-
-func TestClient_PointString(t *testing.T) {
-	const shortForm = "2006-Jan-02"
-	time1, _ := time.Parse(shortForm, "2013-Feb-03")
-	tags := map[string]string{"cpu": "cpu-total"}
-	fields := map[string]interface{}{"idle": 10.1, "system": 50.9, "user": 39.0}
-	p, _ := NewPoint("cpu_usage", tags, fields, time1)
-
-	s := "cpu_usage,cpu=cpu-total idle=10.1,system=50.9,user=39 1359849600000000000"
-	if p.String() != s {
-		t.Errorf("Point String Error, got %s, expected %s", p.String(), s)
-	}
-
-	s = "cpu_usage,cpu=cpu-total idle=10.1,system=50.9,user=39 1359849600000"
-	if p.PrecisionString("ms") != s {
-		t.Errorf("Point String Error, got %s, expected %s",
-			p.PrecisionString("ms"), s)
-	}
-}
-
-func TestClient_PointWithoutTimeString(t *testing.T) {
-	tags := map[string]string{"cpu": "cpu-total"}
-	fields := map[string]interface{}{"idle": 10.1, "system": 50.9, "user": 39.0}
-	p, _ := NewPoint("cpu_usage", tags, fields)
-
-	s := "cpu_usage,cpu=cpu-total idle=10.1,system=50.9,user=39"
-	if p.String() != s {
-		t.Errorf("Point String Error, got %s, expected %s", p.String(), s)
-	}
-
-	if p.PrecisionString("ms") != s {
-		t.Errorf("Point String Error, got %s, expected %s",
-			p.PrecisionString("ms"), s)
-	}
-}
-
-func TestClient_PointName(t *testing.T) {
-	tags := map[string]string{"cpu": "cpu-total"}
-	fields := map[string]interface{}{"idle": 10.1, "system": 50.9, "user": 39.0}
-	p, _ := NewPoint("cpu_usage", tags, fields)
-
-	exp := "cpu_usage"
-	if p.Name() != exp {
-		t.Errorf("Error, got %s, expected %s",
-			p.Name(), exp)
-	}
-}
-
-func TestClient_PointTags(t *testing.T) {
-	tags := map[string]string{"cpu": "cpu-total"}
-	fields := map[string]interface{}{"idle": 10.1, "system": 50.9, "user": 39.0}
-	p, _ := NewPoint("cpu_usage", tags, fields)
-
-	if !reflect.DeepEqual(tags, p.Tags()) {
-		t.Errorf("Error, got %v, expected %v",
-			p.Tags(), tags)
-	}
-}
-
-func TestClient_PointUnixNano(t *testing.T) {
-	const shortForm = "2006-Jan-02"
-	time1, _ := time.Parse(shortForm, "2013-Feb-03")
-	tags := map[string]string{"cpu": "cpu-total"}
-	fields := map[string]interface{}{"idle": 10.1, "system": 50.9, "user": 39.0}
-	p, _ := NewPoint("cpu_usage", tags, fields, time1)
-
-	exp := int64(1359849600000000000)
-	if p.UnixNano() != exp {
-		t.Errorf("Error, got %d, expected %d",
-			p.UnixNano(), exp)
-	}
-}
-
-func TestClient_PointFields(t *testing.T) {
-	tags := map[string]string{"cpu": "cpu-total"}
-	fields := map[string]interface{}{"idle": 10.1, "system": 50.9, "user": 39.0}
-	p, _ := NewPoint("cpu_usage", tags, fields)
-
-	if !reflect.DeepEqual(fields, p.Fields()) {
-		t.Errorf("Error, got %v, expected %v",
-			p.Fields(), fields)
-	}
-}
-
-func TestBatchPoints_PrecisionError(t *testing.T) {
-	_, err := NewBatchPoints(BatchPointsConfig{Precision: "foobar"})
-	if err == nil {
-		t.Errorf("Precision: foobar should have errored")
-	}
-
-	bp, _ := NewBatchPoints(BatchPointsConfig{Precision: "ns"})
-	err = bp.SetPrecision("foobar")
-	if err == nil {
-		t.Errorf("Precision: foobar should have errored")
-	}
-}
-
-func TestBatchPoints_SettersGetters(t *testing.T) {
-	bp, _ := NewBatchPoints(BatchPointsConfig{
-		Precision:        "ns",
-		Database:         "db",
-		RetentionPolicy:  "rp",
-		WriteConsistency: "wc",
-	})
-	if bp.Precision() != "ns" {
-		t.Errorf("Expected: %s, got %s", bp.Precision(), "ns")
-	}
-	if bp.Database() != "db" {
-		t.Errorf("Expected: %s, got %s", bp.Database(), "db")
-	}
-	if bp.RetentionPolicy() != "rp" {
-		t.Errorf("Expected: %s, got %s", bp.RetentionPolicy(), "rp")
-	}
-	if bp.WriteConsistency() != "wc" {
-		t.Errorf("Expected: %s, got %s", bp.WriteConsistency(), "wc")
-	}
-
-	bp.SetDatabase("db2")
-	bp.SetRetentionPolicy("rp2")
-	bp.SetWriteConsistency("wc2")
-	err := bp.SetPrecision("s")
-	if err != nil {
-		t.Errorf("Did not expect error: %s", err.Error())
-	}
-
-	if bp.Precision() != "s" {
-		t.Errorf("Expected: %s, got %s", bp.Precision(), "s")
-	}
-	if bp.Database() != "db2" {
-		t.Errorf("Expected: %s, got %s", bp.Database(), "db2")
-	}
-	if bp.RetentionPolicy() != "rp2" {
-		t.Errorf("Expected: %s, got %s", bp.RetentionPolicy(), "rp2")
-	}
-	if bp.WriteConsistency() != "wc2" {
-		t.Errorf("Expected: %s, got %s", bp.WriteConsistency(), "wc2")
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/client/v2/example_test.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/client/v2/example_test.go
deleted file mode 100644
index ae899d8ee..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/client/v2/example_test.go
+++ /dev/null
@@ -1,248 +0,0 @@
-package client_test
-
-import (
-	"fmt"
-	"math/rand"
-	"os"
-	"time"
-
-	"github.com/influxdb/influxdb/client/v2"
-)
-
-// Create a new client
-func ExampleClient() {
-	// NOTE: this assumes you've setup a user and have setup shell env variables,
-	// namely INFLUX_USER/INFLUX_PWD. If not just omit Username/Password below.
-	_, err := client.NewHTTPClient(client.HTTPConfig{
-		Addr:     "http://localhost:8086",
-		Username: os.Getenv("INFLUX_USER"),
-		Password: os.Getenv("INFLUX_PWD"),
-	})
-	if err != nil {
-		fmt.Println("Error creating InfluxDB Client: ", err.Error())
-	}
-}
-
-// Write a point using the UDP client
-func ExampleClient_uDP() {
-	// Make client
-	config := client.UDPConfig{Addr: "localhost:8089"}
-	c, err := client.NewUDPClient(config)
-	if err != nil {
-		fmt.Println("Error: ", err.Error())
-	}
-	defer c.Close()
-
-	// Create a new point batch
-	bp, _ := client.NewBatchPoints(client.BatchPointsConfig{
-		Precision: "s",
-	})
-
-	// Create a point and add to batch
-	tags := map[string]string{"cpu": "cpu-total"}
-	fields := map[string]interface{}{
-		"idle":   10.1,
-		"system": 53.3,
-		"user":   46.6,
-	}
-	pt, err := client.NewPoint("cpu_usage", tags, fields, time.Now())
-	if err != nil {
-		fmt.Println("Error: ", err.Error())
-	}
-	bp.AddPoint(pt)
-
-	// Write the batch
-	c.Write(bp)
-}
-
-// Write a point using the HTTP client
-func ExampleClient_write() {
-	// Make client
-	c, err := client.NewHTTPClient(client.HTTPConfig{
-		Addr: "http://localhost:8086",
-	})
-	if err != nil {
-		fmt.Println("Error creating InfluxDB Client: ", err.Error())
-	}
-	defer c.Close()
-
-	// Create a new point batch
-	bp, _ := client.NewBatchPoints(client.BatchPointsConfig{
-		Database:  "BumbleBeeTuna",
-		Precision: "s",
-	})
-
-	// Create a point and add to batch
-	tags := map[string]string{"cpu": "cpu-total"}
-	fields := map[string]interface{}{
-		"idle":   10.1,
-		"system": 53.3,
-		"user":   46.6,
-	}
-	pt, err := client.NewPoint("cpu_usage", tags, fields, time.Now())
-	if err != nil {
-		fmt.Println("Error: ", err.Error())
-	}
-	bp.AddPoint(pt)
-
-	// Write the batch
-	c.Write(bp)
-}
-
-// Create a batch and add a point
-func ExampleBatchPoints() {
-	// Create a new point batch
-	bp, _ := client.NewBatchPoints(client.BatchPointsConfig{
-		Database:  "BumbleBeeTuna",
-		Precision: "s",
-	})
-
-	// Create a point and add to batch
-	tags := map[string]string{"cpu": "cpu-total"}
-	fields := map[string]interface{}{
-		"idle":   10.1,
-		"system": 53.3,
-		"user":   46.6,
-	}
-	pt, err := client.NewPoint("cpu_usage", tags, fields, time.Now())
-	if err != nil {
-		fmt.Println("Error: ", err.Error())
-	}
-	bp.AddPoint(pt)
-}
-
-// Using the BatchPoints setter functions
-func ExampleBatchPoints_setters() {
-	// Create a new point batch
-	bp, _ := client.NewBatchPoints(client.BatchPointsConfig{})
-	bp.SetDatabase("BumbleBeeTuna")
-	bp.SetPrecision("ms")
-
-	// Create a point and add to batch
-	tags := map[string]string{"cpu": "cpu-total"}
-	fields := map[string]interface{}{
-		"idle":   10.1,
-		"system": 53.3,
-		"user":   46.6,
-	}
-	pt, err := client.NewPoint("cpu_usage", tags, fields, time.Now())
-	if err != nil {
-		fmt.Println("Error: ", err.Error())
-	}
-	bp.AddPoint(pt)
-}
-
-// Create a new point with a timestamp
-func ExamplePoint() {
-	tags := map[string]string{"cpu": "cpu-total"}
-	fields := map[string]interface{}{
-		"idle":   10.1,
-		"system": 53.3,
-		"user":   46.6,
-	}
-	pt, err := client.NewPoint("cpu_usage", tags, fields, time.Now())
-	if err == nil {
-		fmt.Println("We created a point: ", pt.String())
-	}
-}
-
-// Create a new point without a timestamp
-func ExamplePoint_withoutTime() {
-	tags := map[string]string{"cpu": "cpu-total"}
-	fields := map[string]interface{}{
-		"idle":   10.1,
-		"system": 53.3,
-		"user":   46.6,
-	}
-	pt, err := client.NewPoint("cpu_usage", tags, fields)
-	if err == nil {
-		fmt.Println("We created a point w/o time: ", pt.String())
-	}
-}
-
-// Write 1000 points
-func ExampleClient_write1000() {
-	sampleSize := 1000
-
-	// Make client
-	c, err := client.NewHTTPClient(client.HTTPConfig{
-		Addr: "http://localhost:8086",
-	})
-	if err != nil {
-		fmt.Println("Error creating InfluxDB Client: ", err.Error())
-	}
-	defer c.Close()
-
-	rand.Seed(42)
-
-	bp, _ := client.NewBatchPoints(client.BatchPointsConfig{
-		Database:  "systemstats",
-		Precision: "us",
-	})
-
-	for i := 0; i < sampleSize; i++ {
-		regions := []string{"us-west1", "us-west2", "us-west3", "us-east1"}
-		tags := map[string]string{
-			"cpu":    "cpu-total",
-			"host":   fmt.Sprintf("host%d", rand.Intn(1000)),
-			"region": regions[rand.Intn(len(regions))],
-		}
-
-		idle := rand.Float64() * 100.0
-		fields := map[string]interface{}{
-			"idle": idle,
-			"busy": 100.0 - idle,
-		}
-
-		pt, err := client.NewPoint(
-			"cpu_usage",
-			tags,
-			fields,
-			time.Now(),
-		)
-		if err != nil {
-			println("Error:", err.Error())
-			continue
-		}
-		bp.AddPoint(pt)
-	}
-
-	err = c.Write(bp)
-	if err != nil {
-		fmt.Println("Error: ", err.Error())
-	}
-}
-
-// Make a Query
-func ExampleClient_query() {
-	// Make client
-	c, err := client.NewHTTPClient(client.HTTPConfig{
-		Addr: "http://localhost:8086",
-	})
-	if err != nil {
-		fmt.Println("Error creating InfluxDB Client: ", err.Error())
-	}
-	defer c.Close()
-
-	q := client.NewQuery("SELECT count(value) FROM shapes", "square_holes", "ns")
-	if response, err := c.Query(q); err == nil && response.Error() == nil {
-		fmt.Println(response.Results)
-	}
-}
-
-// Create a Database with a query
-func ExampleClient_createDatabase() {
-	// Make client
-	c, err := client.NewHTTPClient(client.HTTPConfig{
-		Addr: "http://localhost:8086",
-	})
-	if err != nil {
-		fmt.Println("Error creating InfluxDB Client: ", err.Error())
-	}
-	defer c.Close()
-
-	q := client.NewQuery("CREATE DATABASE telegraf", "", "")
-	if response, err := c.Query(q); err == nil && response.Error() == nil {
-		fmt.Println(response.Results)
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/cluster/balancer.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/cluster/balancer.go
deleted file mode 100644
index cf7efddd2..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/cluster/balancer.go
+++ /dev/null
@@ -1,78 +0,0 @@
-package cluster
-
-import (
-	"math/rand"
-
-	"github.com/influxdb/influxdb/meta"
-)
-
-// Balancer represents a load-balancing algorithm for a set of nodes
-type Balancer interface {
-	// Next returns the next Node according to the balancing method
-	// or nil if there are no nodes available
-	Next() *meta.NodeInfo
-}
-
-type nodeBalancer struct {
-	nodes []meta.NodeInfo // data nodes to balance between
-	p     int             // current node index
-}
-
-// NewNodeBalancer create a shuffled, round-robin balancer so that
-// multiple instances will return nodes in randomized order and each
-// each returned node will be repeated in a cycle
-func NewNodeBalancer(nodes []meta.NodeInfo) Balancer {
-	// make a copy of the node slice so we can randomize it
-	// without affecting the original instance as well as ensure
-	// that each Balancer returns nodes in a different order
-	b := &nodeBalancer{}
-
-	b.nodes = make([]meta.NodeInfo, len(nodes))
-	copy(b.nodes, nodes)
-
-	b.shuffle()
-	return b
-}
-
-// shuffle randomizes the ordering the balancers available nodes
-func (b *nodeBalancer) shuffle() {
-	for i := range b.nodes {
-		j := rand.Intn(i + 1)
-		b.nodes[i], b.nodes[j] = b.nodes[j], b.nodes[i]
-	}
-}
-
-// online returns a slice of the nodes that are online
-func (b *nodeBalancer) online() []meta.NodeInfo {
-	return b.nodes
-	// now := time.Now().UTC()
-	// up := []meta.NodeInfo{}
-	// for _, n := range b.nodes {
-	// 	if n.OfflineUntil.After(now) {
-	// 		continue
-	// 	}
-	// 	up = append(up, n)
-	// }
-	// return up
-}
-
-// Next returns the next available nodes
-func (b *nodeBalancer) Next() *meta.NodeInfo {
-	// only use online nodes
-	up := b.online()
-
-	// no nodes online
-	if len(up) == 0 {
-		return nil
-	}
-
-	// rollover back to the beginning
-	if b.p >= len(up) {
-		b.p = 0
-	}
-
-	d := &up[b.p]
-	b.p++
-
-	return d
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/cluster/balancer_test.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/cluster/balancer_test.go
deleted file mode 100644
index dd4a834cb..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/cluster/balancer_test.go
+++ /dev/null
@@ -1,115 +0,0 @@
-package cluster_test
-
-import (
-	"fmt"
-	"testing"
-
-	"github.com/influxdb/influxdb/cluster"
-	"github.com/influxdb/influxdb/meta"
-)
-
-func NewNodes() []meta.NodeInfo {
-	var nodes []meta.NodeInfo
-	for i := 1; i <= 2; i++ {
-		nodes = append(nodes, meta.NodeInfo{
-			ID:   uint64(i),
-			Host: fmt.Sprintf("localhost:999%d", i),
-		})
-	}
-	return nodes
-}
-
-func TestBalancerEmptyNodes(t *testing.T) {
-	b := cluster.NewNodeBalancer([]meta.NodeInfo{})
-	got := b.Next()
-	if got != nil {
-		t.Errorf("expected nil, got %v", got)
-	}
-}
-
-func TestBalancerUp(t *testing.T) {
-	nodes := NewNodes()
-	b := cluster.NewNodeBalancer(nodes)
-
-	// First node in randomized round-robin order
-	first := b.Next()
-	if first == nil {
-		t.Errorf("expected datanode, got %v", first)
-	}
-
-	// Second node in randomized round-robin order
-	second := b.Next()
-	if second == nil {
-		t.Errorf("expected datanode, got %v", second)
-	}
-
-	// Should never get the same node in order twice
-	if first.ID == second.ID {
-		t.Errorf("expected first != second. got %v = %v", first.ID, second.ID)
-	}
-}
-
-/*
-func TestBalancerDown(t *testing.T) {
-	nodes := NewNodes()
-	b := cluster.NewNodeBalancer(nodes)
-
-	nodes[0].Down()
-
-	// First node in randomized round-robin order
-	first := b.Next()
-	if first == nil {
-		t.Errorf("expected datanode, got %v", first)
-	}
-
-	// Second node should rollover to the first up node
-	second := b.Next()
-	if second == nil {
-		t.Errorf("expected datanode, got %v", second)
-	}
-
-	// Health node should be returned each time
-	if first.ID != 2 && first.ID != second.ID {
-		t.Errorf("expected first != second. got %v = %v", first.ID, second.ID)
-	}
-}
-*/
-
-/*
-func TestBalancerBackUp(t *testing.T) {
-	nodes := newDataNodes()
-	b := cluster.NewNodeBalancer(nodes)
-
-	nodes[0].Down()
-
-	for i := 0; i < 3; i++ {
-		got := b.Next()
-		if got == nil {
-			t.Errorf("expected datanode, got %v", got)
-		}
-
-		if exp := uint64(2); got.ID != exp {
-			t.Errorf("wrong node id: exp %v, got %v", exp, got.ID)
-		}
-	}
-
-	nodes[0].Up()
-
-	// First node in randomized round-robin order
-	first := b.Next()
-	if first == nil {
-		t.Errorf("expected datanode, got %v", first)
-	}
-
-	// Second node should rollover to the first up node
-	second := b.Next()
-	if second == nil {
-		t.Errorf("expected datanode, got %v", second)
-	}
-
-	// Should get both nodes returned
-	if first.ID == second.ID {
-		t.Errorf("expected first != second. got %v = %v", first.ID, second.ID)
-	}
-}
-*/
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/cluster/client_pool.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/cluster/client_pool.go
deleted file mode 100644
index fed7e18e0..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/cluster/client_pool.go
+++ /dev/null
@@ -1,57 +0,0 @@
-package cluster
-
-import (
-	"net"
-	"sync"
-
-	"gopkg.in/fatih/pool.v2"
-)
-
-type clientPool struct {
-	mu   sync.RWMutex
-	pool map[uint64]pool.Pool
-}
-
-func newClientPool() *clientPool {
-	return &clientPool{
-		pool: make(map[uint64]pool.Pool),
-	}
-}
-
-func (c *clientPool) setPool(nodeID uint64, p pool.Pool) {
-	c.mu.Lock()
-	c.pool[nodeID] = p
-	c.mu.Unlock()
-}
-
-func (c *clientPool) getPool(nodeID uint64) (pool.Pool, bool) {
-	c.mu.RLock()
-	p, ok := c.pool[nodeID]
-	c.mu.RUnlock()
-	return p, ok
-}
-
-func (c *clientPool) size() int {
-	c.mu.RLock()
-	var size int
-	for _, p := range c.pool {
-		size += p.Len()
-	}
-	c.mu.RUnlock()
-	return size
-}
-
-func (c *clientPool) conn(nodeID uint64) (net.Conn, error) {
-	c.mu.RLock()
-	conn, err := c.pool[nodeID].Get()
-	c.mu.RUnlock()
-	return conn, err
-}
-
-func (c *clientPool) close() {
-	c.mu.Lock()
-	for _, p := range c.pool {
-		p.Close()
-	}
-	c.mu.Unlock()
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/cluster/config.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/cluster/config.go
deleted file mode 100644
index 3a67b32d0..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/cluster/config.go
+++ /dev/null
@@ -1,35 +0,0 @@
-package cluster
-
-import (
-	"time"
-
-	"github.com/influxdb/influxdb/toml"
-)
-
-const (
-	// DefaultWriteTimeout is the default timeout for a complete write to succeed.
-	DefaultWriteTimeout = 5 * time.Second
-
-	// DefaultShardWriterTimeout is the default timeout set on shard writers.
-	DefaultShardWriterTimeout = 5 * time.Second
-
-	// DefaultShardMapperTimeout is the default timeout set on shard mappers.
-	DefaultShardMapperTimeout = 5 * time.Second
-)
-
-// Config represents the configuration for the clustering service.
-type Config struct {
-	ForceRemoteShardMapping bool          `toml:"force-remote-mapping"`
-	WriteTimeout            toml.Duration `toml:"write-timeout"`
-	ShardWriterTimeout      toml.Duration `toml:"shard-writer-timeout"`
-	ShardMapperTimeout      toml.Duration `toml:"shard-mapper-timeout"`
-}
-
-// NewConfig returns an instance of Config with defaults.
-func NewConfig() Config {
-	return Config{
-		WriteTimeout:       toml.Duration(DefaultWriteTimeout),
-		ShardWriterTimeout: toml.Duration(DefaultShardWriterTimeout),
-		ShardMapperTimeout: toml.Duration(DefaultShardMapperTimeout),
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/cluster/config_test.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/cluster/config_test.go
deleted file mode 100644
index db5e5ddc1..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/cluster/config_test.go
+++ /dev/null
@@ -1,27 +0,0 @@
-package cluster_test
-
-import (
-	"testing"
-	"time"
-
-	"github.com/BurntSushi/toml"
-	"github.com/influxdb/influxdb/cluster"
-)
-
-func TestConfig_Parse(t *testing.T) {
-	// Parse configuration.
-	var c cluster.Config
-	if _, err := toml.Decode(`
-shard-writer-timeout = "10s"
-write-timeout = "20s"
-`, &c); err != nil {
-		t.Fatal(err)
-	}
-
-	// Validate configuration.
-	if time.Duration(c.ShardWriterTimeout) != 10*time.Second {
-		t.Fatalf("unexpected shard-writer timeout: %s", c.ShardWriterTimeout)
-	} else if time.Duration(c.WriteTimeout) != 20*time.Second {
-		t.Fatalf("unexpected write timeout s: %s", c.WriteTimeout)
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/cluster/internal/data.pb.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/cluster/internal/data.pb.go
deleted file mode 100644
index f95463903..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/cluster/internal/data.pb.go
+++ /dev/null
@@ -1,154 +0,0 @@
-// Code generated by protoc-gen-gogo.
-// source: internal/data.proto
-// DO NOT EDIT!
-
-/*
-Package internal is a generated protocol buffer package.
-
-It is generated from these files:
-	internal/data.proto
-
-It has these top-level messages:
-	WriteShardRequest
-	WriteShardResponse
-	MapShardRequest
-	MapShardResponse
-*/
-package internal
-
-import proto "github.com/gogo/protobuf/proto"
-import fmt "fmt"
-import math "math"
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
-
-type WriteShardRequest struct {
-	ShardID          *uint64  `protobuf:"varint,1,req,name=ShardID" json:"ShardID,omitempty"`
-	Points           [][]byte `protobuf:"bytes,2,rep,name=Points" json:"Points,omitempty"`
-	XXX_unrecognized []byte   `json:"-"`
-}
-
-func (m *WriteShardRequest) Reset()         { *m = WriteShardRequest{} }
-func (m *WriteShardRequest) String() string { return proto.CompactTextString(m) }
-func (*WriteShardRequest) ProtoMessage()    {}
-
-func (m *WriteShardRequest) GetShardID() uint64 {
-	if m != nil && m.ShardID != nil {
-		return *m.ShardID
-	}
-	return 0
-}
-
-func (m *WriteShardRequest) GetPoints() [][]byte {
-	if m != nil {
-		return m.Points
-	}
-	return nil
-}
-
-type WriteShardResponse struct {
-	Code             *int32  `protobuf:"varint,1,req,name=Code" json:"Code,omitempty"`
-	Message          *string `protobuf:"bytes,2,opt,name=Message" json:"Message,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *WriteShardResponse) Reset()         { *m = WriteShardResponse{} }
-func (m *WriteShardResponse) String() string { return proto.CompactTextString(m) }
-func (*WriteShardResponse) ProtoMessage()    {}
-
-func (m *WriteShardResponse) GetCode() int32 {
-	if m != nil && m.Code != nil {
-		return *m.Code
-	}
-	return 0
-}
-
-func (m *WriteShardResponse) GetMessage() string {
-	if m != nil && m.Message != nil {
-		return *m.Message
-	}
-	return ""
-}
-
-type MapShardRequest struct {
-	ShardID          *uint64 `protobuf:"varint,1,req,name=ShardID" json:"ShardID,omitempty"`
-	Query            *string `protobuf:"bytes,2,req,name=Query" json:"Query,omitempty"`
-	ChunkSize        *int32  `protobuf:"varint,3,req,name=ChunkSize" json:"ChunkSize,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *MapShardRequest) Reset()         { *m = MapShardRequest{} }
-func (m *MapShardRequest) String() string { return proto.CompactTextString(m) }
-func (*MapShardRequest) ProtoMessage()    {}
-
-func (m *MapShardRequest) GetShardID() uint64 {
-	if m != nil && m.ShardID != nil {
-		return *m.ShardID
-	}
-	return 0
-}
-
-func (m *MapShardRequest) GetQuery() string {
-	if m != nil && m.Query != nil {
-		return *m.Query
-	}
-	return ""
-}
-
-func (m *MapShardRequest) GetChunkSize() int32 {
-	if m != nil && m.ChunkSize != nil {
-		return *m.ChunkSize
-	}
-	return 0
-}
-
-type MapShardResponse struct {
-	Code             *int32   `protobuf:"varint,1,req,name=Code" json:"Code,omitempty"`
-	Message          *string  `protobuf:"bytes,2,opt,name=Message" json:"Message,omitempty"`
-	Data             []byte   `protobuf:"bytes,3,opt,name=Data" json:"Data,omitempty"`
-	TagSets          []string `protobuf:"bytes,4,rep,name=TagSets" json:"TagSets,omitempty"`
-	Fields           []string `protobuf:"bytes,5,rep,name=Fields" json:"Fields,omitempty"`
-	XXX_unrecognized []byte   `json:"-"`
-}
-
-func (m *MapShardResponse) Reset()         { *m = MapShardResponse{} }
-func (m *MapShardResponse) String() string { return proto.CompactTextString(m) }
-func (*MapShardResponse) ProtoMessage()    {}
-
-func (m *MapShardResponse) GetCode() int32 {
-	if m != nil && m.Code != nil {
-		return *m.Code
-	}
-	return 0
-}
-
-func (m *MapShardResponse) GetMessage() string {
-	if m != nil && m.Message != nil {
-		return *m.Message
-	}
-	return ""
-}
-
-func (m *MapShardResponse) GetData() []byte {
-	if m != nil {
-		return m.Data
-	}
-	return nil
-}
-
-func (m *MapShardResponse) GetTagSets() []string {
-	if m != nil {
-		return m.TagSets
-	}
-	return nil
-}
-
-func (m *MapShardResponse) GetFields() []string {
-	if m != nil {
-		return m.Fields
-	}
-	return nil
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/cluster/internal/data.proto b/Godeps/_workspace/src/github.com/influxdb/influxdb/cluster/internal/data.proto
deleted file mode 100644
index fed14bad9..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/cluster/internal/data.proto
+++ /dev/null
@@ -1,25 +0,0 @@
-package internal;
-
-message WriteShardRequest {
-    required uint64 ShardID = 1;
-    repeated bytes Points = 2;
-}
-
-message WriteShardResponse {
-    required int32 Code = 1;
-    optional string Message = 2;
-}
-
-message MapShardRequest {
-    required uint64 ShardID = 1;
-    required string Query = 2;
-    required int32 ChunkSize = 3;
-}
-
-message MapShardResponse {
-    required int32 Code = 1;
-    optional string Message = 2;
-    optional bytes Data = 3;
-    repeated string TagSets = 4;
-    repeated string Fields = 5;
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/cluster/points_writer.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/cluster/points_writer.go
deleted file mode 100644
index 915058902..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/cluster/points_writer.go
+++ /dev/null
@@ -1,394 +0,0 @@
-package cluster
-
-import (
-	"errors"
-	"expvar"
-	"fmt"
-	"log"
-	"os"
-	"strings"
-	"sync"
-	"time"
-
-	"github.com/influxdb/influxdb"
-	"github.com/influxdb/influxdb/meta"
-	"github.com/influxdb/influxdb/models"
-	"github.com/influxdb/influxdb/tsdb"
-)
-
-// ConsistencyLevel represent a required replication criteria before a write can
-// be returned as successful
-type ConsistencyLevel int
-
-// The statistics generated by the "write" mdoule
-const (
-	statWriteReq            = "req"
-	statPointWriteReq       = "pointReq"
-	statPointWriteReqLocal  = "pointReqLocal"
-	statPointWriteReqRemote = "pointReqRemote"
-	statWriteOK             = "writeOk"
-	statWritePartial        = "writePartial"
-	statWriteTimeout        = "writeTimeout"
-	statWriteErr            = "writeError"
-	statWritePointReqHH     = "pointReqHH"
-	statSubWriteOK          = "subWriteOk"
-	statSubWriteDrop        = "subWriteDrop"
-)
-
-const (
-	// ConsistencyLevelAny allows for hinted hand off, potentially no write happened yet
-	ConsistencyLevelAny ConsistencyLevel = iota
-
-	// ConsistencyLevelOne requires at least one data node acknowledged a write
-	ConsistencyLevelOne
-
-	// ConsistencyLevelQuorum requires a quorum of data nodes to acknowledge a write
-	ConsistencyLevelQuorum
-
-	// ConsistencyLevelAll requires all data nodes to acknowledge a write
-	ConsistencyLevelAll
-)
-
-var (
-	// ErrTimeout is returned when a write times out.
-	ErrTimeout = errors.New("timeout")
-
-	// ErrPartialWrite is returned when a write partially succeeds but does
-	// not meet the requested consistency level.
-	ErrPartialWrite = errors.New("partial write")
-
-	// ErrWriteFailed is returned when no writes succeeded.
-	ErrWriteFailed = errors.New("write failed")
-
-	// ErrInvalidConsistencyLevel is returned when parsing the string version
-	// of a consistency level.
-	ErrInvalidConsistencyLevel = errors.New("invalid consistency level")
-)
-
-// ParseConsistencyLevel converts a consistency level string to the corresponding ConsistencyLevel const
-func ParseConsistencyLevel(level string) (ConsistencyLevel, error) {
-	switch strings.ToLower(level) {
-	case "any":
-		return ConsistencyLevelAny, nil
-	case "one":
-		return ConsistencyLevelOne, nil
-	case "quorum":
-		return ConsistencyLevelQuorum, nil
-	case "all":
-		return ConsistencyLevelAll, nil
-	default:
-		return 0, ErrInvalidConsistencyLevel
-	}
-}
-
-// PointsWriter handles writes across multiple local and remote data nodes.
-type PointsWriter struct {
-	mu           sync.RWMutex
-	closing      chan struct{}
-	WriteTimeout time.Duration
-	Logger       *log.Logger
-
-	MetaStore interface {
-		NodeID() uint64
-		Database(name string) (di *meta.DatabaseInfo, err error)
-		RetentionPolicy(database, policy string) (*meta.RetentionPolicyInfo, error)
-		CreateShardGroupIfNotExists(database, policy string, timestamp time.Time) (*meta.ShardGroupInfo, error)
-		ShardOwner(shardID uint64) (string, string, *meta.ShardGroupInfo)
-	}
-
-	TSDBStore interface {
-		CreateShard(database, retentionPolicy string, shardID uint64) error
-		WriteToShard(shardID uint64, points []models.Point) error
-	}
-
-	ShardWriter interface {
-		WriteShard(shardID, ownerID uint64, points []models.Point) error
-	}
-
-	HintedHandoff interface {
-		WriteShard(shardID, ownerID uint64, points []models.Point) error
-	}
-
-	Subscriber interface {
-		Points() chan<- *WritePointsRequest
-	}
-	subPoints chan<- *WritePointsRequest
-
-	statMap *expvar.Map
-}
-
-// NewPointsWriter returns a new instance of PointsWriter for a node.
-func NewPointsWriter() *PointsWriter {
-	return &PointsWriter{
-		closing:      make(chan struct{}),
-		WriteTimeout: DefaultWriteTimeout,
-		Logger:       log.New(os.Stderr, "[write] ", log.LstdFlags),
-		statMap:      influxdb.NewStatistics("write", "write", nil),
-	}
-}
-
-// ShardMapping contains a mapping of a shards to a points.
-type ShardMapping struct {
-	Points map[uint64][]models.Point  // The points associated with a shard ID
-	Shards map[uint64]*meta.ShardInfo // The shards that have been mapped, keyed by shard ID
-}
-
-// NewShardMapping creates an empty ShardMapping
-func NewShardMapping() *ShardMapping {
-	return &ShardMapping{
-		Points: map[uint64][]models.Point{},
-		Shards: map[uint64]*meta.ShardInfo{},
-	}
-}
-
-// MapPoint maps a point to shard
-func (s *ShardMapping) MapPoint(shardInfo *meta.ShardInfo, p models.Point) {
-	points, ok := s.Points[shardInfo.ID]
-	if !ok {
-		s.Points[shardInfo.ID] = []models.Point{p}
-	} else {
-		s.Points[shardInfo.ID] = append(points, p)
-	}
-	s.Shards[shardInfo.ID] = shardInfo
-}
-
-// Open opens the communication channel with the point writer
-func (w *PointsWriter) Open() error {
-	w.mu.Lock()
-	defer w.mu.Unlock()
-	w.closing = make(chan struct{})
-	if w.Subscriber != nil {
-		w.subPoints = w.Subscriber.Points()
-	}
-	return nil
-}
-
-// Close closes the communication channel with the point writer
-func (w *PointsWriter) Close() error {
-	w.mu.Lock()
-	defer w.mu.Unlock()
-	if w.closing != nil {
-		close(w.closing)
-	}
-	if w.subPoints != nil {
-		// 'nil' channels always block so this makes the
-		// select statement in WritePoints hit its default case
-		// dropping any in-flight writes.
-		w.subPoints = nil
-	}
-	return nil
-}
-
-// MapShards maps the points contained in wp to a ShardMapping.  If a point
-// maps to a shard group or shard that does not currently exist, it will be
-// created before returning the mapping.
-func (w *PointsWriter) MapShards(wp *WritePointsRequest) (*ShardMapping, error) {
-
-	// holds the start time ranges for required shard groups
-	timeRanges := map[time.Time]*meta.ShardGroupInfo{}
-
-	rp, err := w.MetaStore.RetentionPolicy(wp.Database, wp.RetentionPolicy)
-	if err != nil {
-		return nil, err
-	}
-	if rp == nil {
-		return nil, influxdb.ErrRetentionPolicyNotFound(wp.RetentionPolicy)
-	}
-
-	for _, p := range wp.Points {
-		timeRanges[p.Time().Truncate(rp.ShardGroupDuration)] = nil
-	}
-
-	// holds all the shard groups and shards that are required for writes
-	for t := range timeRanges {
-		sg, err := w.MetaStore.CreateShardGroupIfNotExists(wp.Database, wp.RetentionPolicy, t)
-		if err != nil {
-			return nil, err
-		}
-		timeRanges[t] = sg
-	}
-
-	mapping := NewShardMapping()
-	for _, p := range wp.Points {
-		sg := timeRanges[p.Time().Truncate(rp.ShardGroupDuration)]
-		sh := sg.ShardFor(p.HashID())
-		mapping.MapPoint(&sh, p)
-	}
-	return mapping, nil
-}
-
-// WritePointsInto is a copy of WritePoints that uses a tsdb structure instead of
-// a cluster structure for information. This is to avoid a circular dependency
-func (w *PointsWriter) WritePointsInto(p *tsdb.IntoWriteRequest) error {
-	req := WritePointsRequest{
-		Database:         p.Database,
-		RetentionPolicy:  p.RetentionPolicy,
-		ConsistencyLevel: ConsistencyLevelAny,
-		Points:           p.Points,
-	}
-	return w.WritePoints(&req)
-}
-
-// WritePoints writes across multiple local and remote data nodes according the consistency level.
-func (w *PointsWriter) WritePoints(p *WritePointsRequest) error {
-	w.statMap.Add(statWriteReq, 1)
-	w.statMap.Add(statPointWriteReq, int64(len(p.Points)))
-
-	if p.RetentionPolicy == "" {
-		db, err := w.MetaStore.Database(p.Database)
-		if err != nil {
-			return err
-		} else if db == nil {
-			return influxdb.ErrDatabaseNotFound(p.Database)
-		}
-		p.RetentionPolicy = db.DefaultRetentionPolicy
-	}
-
-	shardMappings, err := w.MapShards(p)
-	if err != nil {
-		return err
-	}
-
-	// Write each shard in it's own goroutine and return as soon
-	// as one fails.
-	ch := make(chan error, len(shardMappings.Points))
-	for shardID, points := range shardMappings.Points {
-		go func(shard *meta.ShardInfo, database, retentionPolicy string, points []models.Point) {
-			ch <- w.writeToShard(shard, p.Database, p.RetentionPolicy, p.ConsistencyLevel, points)
-		}(shardMappings.Shards[shardID], p.Database, p.RetentionPolicy, points)
-	}
-
-	// Send points to subscriptions if possible.
-	ok := false
-	// We need to lock just in case the channel is about to be nil'ed
-	w.mu.RLock()
-	select {
-	case w.subPoints <- p:
-		ok = true
-	default:
-	}
-	w.mu.RUnlock()
-	if ok {
-		w.statMap.Add(statSubWriteOK, 1)
-	} else {
-		w.statMap.Add(statSubWriteDrop, 1)
-	}
-
-	for range shardMappings.Points {
-		select {
-		case <-w.closing:
-			return ErrWriteFailed
-		case err := <-ch:
-			if err != nil {
-				return err
-			}
-		}
-	}
-	return nil
-}
-
-// writeToShards writes points to a shard and ensures a write consistency level has been met.  If the write
-// partially succeeds, ErrPartialWrite is returned.
-func (w *PointsWriter) writeToShard(shard *meta.ShardInfo, database, retentionPolicy string,
-	consistency ConsistencyLevel, points []models.Point) error {
-	// The required number of writes to achieve the requested consistency level
-	required := len(shard.Owners)
-	switch consistency {
-	case ConsistencyLevelAny, ConsistencyLevelOne:
-		required = 1
-	case ConsistencyLevelQuorum:
-		required = required/2 + 1
-	}
-
-	// response channel for each shard writer go routine
-	type AsyncWriteResult struct {
-		Owner meta.ShardOwner
-		Err   error
-	}
-	ch := make(chan *AsyncWriteResult, len(shard.Owners))
-
-	for _, owner := range shard.Owners {
-		go func(shardID uint64, owner meta.ShardOwner, points []models.Point) {
-			if w.MetaStore.NodeID() == owner.NodeID {
-				w.statMap.Add(statPointWriteReqLocal, int64(len(points)))
-
-				err := w.TSDBStore.WriteToShard(shardID, points)
-				// If we've written to shard that should exist on the current node, but the store has
-				// not actually created this shard, tell it to create it and retry the write
-				if err == tsdb.ErrShardNotFound {
-					err = w.TSDBStore.CreateShard(database, retentionPolicy, shardID)
-					if err != nil {
-						ch <- &AsyncWriteResult{owner, err}
-						return
-					}
-					err = w.TSDBStore.WriteToShard(shardID, points)
-				}
-				ch <- &AsyncWriteResult{owner, err}
-				return
-			}
-
-			w.statMap.Add(statPointWriteReqRemote, int64(len(points)))
-			err := w.ShardWriter.WriteShard(shardID, owner.NodeID, points)
-			if err != nil && tsdb.IsRetryable(err) {
-				// The remote write failed so queue it via hinted handoff
-				w.statMap.Add(statWritePointReqHH, int64(len(points)))
-				hherr := w.HintedHandoff.WriteShard(shardID, owner.NodeID, points)
-
-				// If the write consistency level is ANY, then a successful hinted handoff can
-				// be considered a successful write so send nil to the response channel
-				// otherwise, let the original error propagate to the response channel
-				if hherr == nil && consistency == ConsistencyLevelAny {
-					ch <- &AsyncWriteResult{owner, nil}
-					return
-				}
-			}
-			ch <- &AsyncWriteResult{owner, err}
-
-		}(shard.ID, owner, points)
-	}
-
-	var wrote int
-	timeout := time.After(w.WriteTimeout)
-	var writeError error
-	for range shard.Owners {
-		select {
-		case <-w.closing:
-			return ErrWriteFailed
-		case <-timeout:
-			w.statMap.Add(statWriteTimeout, 1)
-			// return timeout error to caller
-			return ErrTimeout
-		case result := <-ch:
-			// If the write returned an error, continue to the next response
-			if result.Err != nil {
-				w.statMap.Add(statWriteErr, 1)
-				w.Logger.Printf("write failed for shard %d on node %d: %v", shard.ID, result.Owner.NodeID, result.Err)
-
-				// Keep track of the first error we see to return back to the client
-				if writeError == nil {
-					writeError = result.Err
-				}
-				continue
-			}
-
-			wrote++
-
-			// We wrote the required consistency level
-			if wrote >= required {
-				w.statMap.Add(statWriteOK, 1)
-				return nil
-			}
-		}
-	}
-
-	if wrote > 0 {
-		w.statMap.Add(statWritePartial, 1)
-		return ErrPartialWrite
-	}
-
-	if writeError != nil {
-		return fmt.Errorf("write failed: %v", writeError)
-	}
-
-	return ErrWriteFailed
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/cluster/points_writer_test.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/cluster/points_writer_test.go
deleted file mode 100644
index d0f57fbc7..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/cluster/points_writer_test.go
+++ /dev/null
@@ -1,493 +0,0 @@
-package cluster_test
-
-import (
-	"fmt"
-	"sync"
-	"sync/atomic"
-	"testing"
-	"time"
-
-	"github.com/influxdb/influxdb/cluster"
-	"github.com/influxdb/influxdb/meta"
-	"github.com/influxdb/influxdb/models"
-)
-
-// Ensures the points writer maps a single point to a single shard.
-func TestPointsWriter_MapShards_One(t *testing.T) {
-	ms := MetaStore{}
-	rp := NewRetentionPolicy("myp", time.Hour, 3)
-
-	ms.NodeIDFn = func() uint64 { return 1 }
-	ms.RetentionPolicyFn = func(db, retentionPolicy string) (*meta.RetentionPolicyInfo, error) {
-		return rp, nil
-	}
-
-	ms.CreateShardGroupIfNotExistsFn = func(database, policy string, timestamp time.Time) (*meta.ShardGroupInfo, error) {
-		return &rp.ShardGroups[0], nil
-	}
-
-	c := cluster.PointsWriter{MetaStore: ms}
-	pr := &cluster.WritePointsRequest{
-		Database:         "mydb",
-		RetentionPolicy:  "myrp",
-		ConsistencyLevel: cluster.ConsistencyLevelOne,
-	}
-	pr.AddPoint("cpu", 1.0, time.Now(), nil)
-
-	var (
-		shardMappings *cluster.ShardMapping
-		err           error
-	)
-	if shardMappings, err = c.MapShards(pr); err != nil {
-		t.Fatalf("unexpected an error: %v", err)
-	}
-
-	if exp := 1; len(shardMappings.Points) != exp {
-		t.Errorf("MapShards() len mismatch. got %v, exp %v", len(shardMappings.Points), exp)
-	}
-}
-
-// Ensures the points writer maps a multiple points across shard group boundaries.
-func TestPointsWriter_MapShards_Multiple(t *testing.T) {
-	ms := MetaStore{}
-	rp := NewRetentionPolicy("myp", time.Hour, 3)
-	AttachShardGroupInfo(rp, []meta.ShardOwner{
-		{NodeID: 1},
-		{NodeID: 2},
-		{NodeID: 3},
-	})
-	AttachShardGroupInfo(rp, []meta.ShardOwner{
-		{NodeID: 1},
-		{NodeID: 2},
-		{NodeID: 3},
-	})
-
-	ms.NodeIDFn = func() uint64 { return 1 }
-	ms.RetentionPolicyFn = func(db, retentionPolicy string) (*meta.RetentionPolicyInfo, error) {
-		return rp, nil
-	}
-
-	ms.CreateShardGroupIfNotExistsFn = func(database, policy string, timestamp time.Time) (*meta.ShardGroupInfo, error) {
-		for i, sg := range rp.ShardGroups {
-			if timestamp.Equal(sg.StartTime) || timestamp.After(sg.StartTime) && timestamp.Before(sg.EndTime) {
-				return &rp.ShardGroups[i], nil
-			}
-		}
-		panic("should not get here")
-	}
-
-	c := cluster.PointsWriter{MetaStore: ms}
-	pr := &cluster.WritePointsRequest{
-		Database:         "mydb",
-		RetentionPolicy:  "myrp",
-		ConsistencyLevel: cluster.ConsistencyLevelOne,
-	}
-
-	// Three points that range over the shardGroup duration (1h) and should map to two
-	// distinct shards
-	pr.AddPoint("cpu", 1.0, time.Unix(0, 0), nil)
-	pr.AddPoint("cpu", 2.0, time.Unix(0, 0).Add(time.Hour), nil)
-	pr.AddPoint("cpu", 3.0, time.Unix(0, 0).Add(time.Hour+time.Second), nil)
-
-	var (
-		shardMappings *cluster.ShardMapping
-		err           error
-	)
-	if shardMappings, err = c.MapShards(pr); err != nil {
-		t.Fatalf("unexpected an error: %v", err)
-	}
-
-	if exp := 2; len(shardMappings.Points) != exp {
-		t.Errorf("MapShards() len mismatch. got %v, exp %v", len(shardMappings.Points), exp)
-	}
-
-	for _, points := range shardMappings.Points {
-		// First shard shoud have 1 point w/ first point added
-		if len(points) == 1 && points[0].Time() != pr.Points[0].Time() {
-			t.Fatalf("MapShards() value mismatch. got %v, exp %v", points[0].Time(), pr.Points[0].Time())
-		}
-
-		// Second shard shoud have the last two points added
-		if len(points) == 2 && points[0].Time() != pr.Points[1].Time() {
-			t.Fatalf("MapShards() value mismatch. got %v, exp %v", points[0].Time(), pr.Points[1].Time())
-		}
-
-		if len(points) == 2 && points[1].Time() != pr.Points[2].Time() {
-			t.Fatalf("MapShards() value mismatch. got %v, exp %v", points[1].Time(), pr.Points[2].Time())
-		}
-	}
-}
-
-func TestPointsWriter_WritePoints(t *testing.T) {
-	tests := []struct {
-		name            string
-		database        string
-		retentionPolicy string
-		consistency     cluster.ConsistencyLevel
-
-		// the responses returned by each shard write call.  node ID 1 = pos 0
-		err    []error
-		expErr error
-	}{
-		// Consistency one
-		{
-			name:            "write one success",
-			database:        "mydb",
-			retentionPolicy: "myrp",
-			consistency:     cluster.ConsistencyLevelOne,
-			err:             []error{nil, nil, nil},
-			expErr:          nil,
-		},
-		{
-			name:            "write one error",
-			database:        "mydb",
-			retentionPolicy: "myrp",
-			consistency:     cluster.ConsistencyLevelOne,
-			err:             []error{fmt.Errorf("a failure"), fmt.Errorf("a failure"), fmt.Errorf("a failure")},
-			expErr:          fmt.Errorf("write failed: a failure"),
-		},
-
-		// Consistency any
-		{
-			name:            "write any success",
-			database:        "mydb",
-			retentionPolicy: "myrp",
-			consistency:     cluster.ConsistencyLevelAny,
-			err:             []error{fmt.Errorf("a failure"), nil, fmt.Errorf("a failure")},
-			expErr:          nil,
-		},
-		// Consistency all
-		{
-			name:            "write all success",
-			database:        "mydb",
-			retentionPolicy: "myrp",
-			consistency:     cluster.ConsistencyLevelAll,
-			err:             []error{nil, nil, nil},
-			expErr:          nil,
-		},
-		{
-			name:            "write all, 2/3, partial write",
-			database:        "mydb",
-			retentionPolicy: "myrp",
-			consistency:     cluster.ConsistencyLevelAll,
-			err:             []error{nil, fmt.Errorf("a failure"), nil},
-			expErr:          cluster.ErrPartialWrite,
-		},
-		{
-			name:            "write all, 1/3 (failure)",
-			database:        "mydb",
-			retentionPolicy: "myrp",
-			consistency:     cluster.ConsistencyLevelAll,
-			err:             []error{nil, fmt.Errorf("a failure"), fmt.Errorf("a failure")},
-			expErr:          cluster.ErrPartialWrite,
-		},
-
-		// Consistency quorum
-		{
-			name:            "write quorum, 1/3 failure",
-			consistency:     cluster.ConsistencyLevelQuorum,
-			database:        "mydb",
-			retentionPolicy: "myrp",
-			err:             []error{fmt.Errorf("a failure"), fmt.Errorf("a failure"), nil},
-			expErr:          cluster.ErrPartialWrite,
-		},
-		{
-			name:            "write quorum, 2/3 success",
-			database:        "mydb",
-			retentionPolicy: "myrp",
-			consistency:     cluster.ConsistencyLevelQuorum,
-			err:             []error{nil, nil, fmt.Errorf("a failure")},
-			expErr:          nil,
-		},
-		{
-			name:            "write quorum, 3/3 success",
-			database:        "mydb",
-			retentionPolicy: "myrp",
-			consistency:     cluster.ConsistencyLevelQuorum,
-			err:             []error{nil, nil, nil},
-			expErr:          nil,
-		},
-
-		// Error write error
-		{
-			name:            "no writes succeed",
-			database:        "mydb",
-			retentionPolicy: "myrp",
-			consistency:     cluster.ConsistencyLevelOne,
-			err:             []error{fmt.Errorf("a failure"), fmt.Errorf("a failure"), fmt.Errorf("a failure")},
-			expErr:          fmt.Errorf("write failed: a failure"),
-		},
-
-		// Hinted handoff w/ ANY
-		{
-			name:            "hinted handoff write succeed",
-			database:        "mydb",
-			retentionPolicy: "myrp",
-			consistency:     cluster.ConsistencyLevelAny,
-			err:             []error{fmt.Errorf("a failure"), fmt.Errorf("a failure"), fmt.Errorf("a failure")},
-			expErr:          nil,
-		},
-
-		// Write to non-existent database
-		{
-			name:            "write to non-existent database",
-			database:        "doesnt_exist",
-			retentionPolicy: "",
-			consistency:     cluster.ConsistencyLevelAny,
-			err:             []error{nil, nil, nil},
-			expErr:          fmt.Errorf("database not found: doesnt_exist"),
-		},
-	}
-
-	for _, test := range tests {
-
-		pr := &cluster.WritePointsRequest{
-			Database:         test.database,
-			RetentionPolicy:  test.retentionPolicy,
-			ConsistencyLevel: test.consistency,
-		}
-
-		// Three points that range over the shardGroup duration (1h) and should map to two
-		// distinct shards
-		pr.AddPoint("cpu", 1.0, time.Unix(0, 0), nil)
-		pr.AddPoint("cpu", 2.0, time.Unix(0, 0).Add(time.Hour), nil)
-		pr.AddPoint("cpu", 3.0, time.Unix(0, 0).Add(time.Hour+time.Second), nil)
-
-		// copy to prevent data race
-		theTest := test
-		sm := cluster.NewShardMapping()
-		sm.MapPoint(
-			&meta.ShardInfo{ID: uint64(1), Owners: []meta.ShardOwner{
-				{NodeID: 1},
-				{NodeID: 2},
-				{NodeID: 3},
-			}},
-			pr.Points[0])
-		sm.MapPoint(
-			&meta.ShardInfo{ID: uint64(2), Owners: []meta.ShardOwner{
-				{NodeID: 1},
-				{NodeID: 2},
-				{NodeID: 3},
-			}},
-			pr.Points[1])
-		sm.MapPoint(
-			&meta.ShardInfo{ID: uint64(2), Owners: []meta.ShardOwner{
-				{NodeID: 1},
-				{NodeID: 2},
-				{NodeID: 3},
-			}},
-			pr.Points[2])
-
-		// Local cluster.Node ShardWriter
-		// lock on the write increment since these functions get called in parallel
-		var mu sync.Mutex
-		sw := &fakeShardWriter{
-			ShardWriteFn: func(shardID, nodeID uint64, points []models.Point) error {
-				mu.Lock()
-				defer mu.Unlock()
-				return theTest.err[int(nodeID)-1]
-			},
-		}
-
-		store := &fakeStore{
-			WriteFn: func(shardID uint64, points []models.Point) error {
-				mu.Lock()
-				defer mu.Unlock()
-				return theTest.err[0]
-			},
-		}
-
-		hh := &fakeShardWriter{
-			ShardWriteFn: func(shardID, nodeID uint64, points []models.Point) error {
-				return nil
-			},
-		}
-
-		ms := NewMetaStore()
-		ms.DatabaseFn = func(database string) (*meta.DatabaseInfo, error) {
-			return nil, nil
-		}
-		ms.NodeIDFn = func() uint64 { return 1 }
-
-		subPoints := make(chan *cluster.WritePointsRequest, 1)
-		sub := Subscriber{}
-		sub.PointsFn = func() chan<- *cluster.WritePointsRequest {
-			return subPoints
-		}
-
-		c := cluster.NewPointsWriter()
-		c.MetaStore = ms
-		c.ShardWriter = sw
-		c.TSDBStore = store
-		c.HintedHandoff = hh
-		c.Subscriber = sub
-
-		c.Open()
-		defer c.Close()
-
-		err := c.WritePoints(pr)
-		if err == nil && test.expErr != nil {
-			t.Errorf("PointsWriter.WritePoints(): '%s' error: got %v, exp %v", test.name, err, test.expErr)
-		}
-
-		if err != nil && test.expErr == nil {
-			t.Errorf("PointsWriter.WritePoints(): '%s' error: got %v, exp %v", test.name, err, test.expErr)
-		}
-		if err != nil && test.expErr != nil && err.Error() != test.expErr.Error() {
-			t.Errorf("PointsWriter.WritePoints(): '%s' error: got %v, exp %v", test.name, err, test.expErr)
-		}
-		if test.expErr == nil {
-			select {
-			case p := <-subPoints:
-				if p != pr {
-					t.Errorf("PointsWriter.WritePoints(): '%s' error: unexpected WritePointsRequest got %v, exp %v", test.name, p, pr)
-				}
-			default:
-				t.Errorf("PointsWriter.WritePoints(): '%s' error: Subscriber.Points not called", test.name)
-			}
-		}
-	}
-}
-
-var shardID uint64
-
-type fakeShardWriter struct {
-	ShardWriteFn func(shardID, nodeID uint64, points []models.Point) error
-}
-
-func (f *fakeShardWriter) WriteShard(shardID, nodeID uint64, points []models.Point) error {
-	return f.ShardWriteFn(shardID, nodeID, points)
-}
-
-type fakeStore struct {
-	WriteFn       func(shardID uint64, points []models.Point) error
-	CreateShardfn func(database, retentionPolicy string, shardID uint64) error
-}
-
-func (f *fakeStore) WriteToShard(shardID uint64, points []models.Point) error {
-	return f.WriteFn(shardID, points)
-}
-
-func (f *fakeStore) CreateShard(database, retentionPolicy string, shardID uint64) error {
-	return f.CreateShardfn(database, retentionPolicy, shardID)
-}
-
-func NewMetaStore() *MetaStore {
-	ms := &MetaStore{}
-	rp := NewRetentionPolicy("myp", time.Hour, 3)
-	AttachShardGroupInfo(rp, []meta.ShardOwner{
-		{NodeID: 1},
-		{NodeID: 2},
-		{NodeID: 3},
-	})
-	AttachShardGroupInfo(rp, []meta.ShardOwner{
-		{NodeID: 1},
-		{NodeID: 2},
-		{NodeID: 3},
-	})
-
-	ms.RetentionPolicyFn = func(db, retentionPolicy string) (*meta.RetentionPolicyInfo, error) {
-		return rp, nil
-	}
-
-	ms.CreateShardGroupIfNotExistsFn = func(database, policy string, timestamp time.Time) (*meta.ShardGroupInfo, error) {
-		for i, sg := range rp.ShardGroups {
-			if timestamp.Equal(sg.StartTime) || timestamp.After(sg.StartTime) && timestamp.Before(sg.EndTime) {
-				return &rp.ShardGroups[i], nil
-			}
-		}
-		panic("should not get here")
-	}
-	return ms
-}
-
-type MetaStore struct {
-	NodeIDFn                      func() uint64
-	RetentionPolicyFn             func(database, name string) (*meta.RetentionPolicyInfo, error)
-	CreateShardGroupIfNotExistsFn func(database, policy string, timestamp time.Time) (*meta.ShardGroupInfo, error)
-	DatabaseFn                    func(database string) (*meta.DatabaseInfo, error)
-	ShardOwnerFn                  func(shardID uint64) (string, string, *meta.ShardGroupInfo)
-}
-
-func (m MetaStore) NodeID() uint64 { return m.NodeIDFn() }
-
-func (m MetaStore) RetentionPolicy(database, name string) (*meta.RetentionPolicyInfo, error) {
-	return m.RetentionPolicyFn(database, name)
-}
-
-func (m MetaStore) CreateShardGroupIfNotExists(database, policy string, timestamp time.Time) (*meta.ShardGroupInfo, error) {
-	return m.CreateShardGroupIfNotExistsFn(database, policy, timestamp)
-}
-
-func (m MetaStore) Database(database string) (*meta.DatabaseInfo, error) {
-	return m.DatabaseFn(database)
-}
-
-func (m MetaStore) ShardOwner(shardID uint64) (string, string, *meta.ShardGroupInfo) {
-	return m.ShardOwnerFn(shardID)
-}
-
-type Subscriber struct {
-	PointsFn func() chan<- *cluster.WritePointsRequest
-}
-
-func (s Subscriber) Points() chan<- *cluster.WritePointsRequest {
-	return s.PointsFn()
-}
-
-func NewRetentionPolicy(name string, duration time.Duration, nodeCount int) *meta.RetentionPolicyInfo {
-	shards := []meta.ShardInfo{}
-	owners := []meta.ShardOwner{}
-	for i := 1; i <= nodeCount; i++ {
-		owners = append(owners, meta.ShardOwner{NodeID: uint64(i)})
-	}
-
-	// each node is fully replicated with each other
-	shards = append(shards, meta.ShardInfo{
-		ID:     nextShardID(),
-		Owners: owners,
-	})
-
-	rp := &meta.RetentionPolicyInfo{
-		Name:               "myrp",
-		ReplicaN:           nodeCount,
-		Duration:           duration,
-		ShardGroupDuration: duration,
-		ShardGroups: []meta.ShardGroupInfo{
-			meta.ShardGroupInfo{
-				ID:        nextShardID(),
-				StartTime: time.Unix(0, 0),
-				EndTime:   time.Unix(0, 0).Add(duration).Add(-1),
-				Shards:    shards,
-			},
-		},
-	}
-	return rp
-}
-
-func AttachShardGroupInfo(rp *meta.RetentionPolicyInfo, owners []meta.ShardOwner) {
-	var startTime, endTime time.Time
-	if len(rp.ShardGroups) == 0 {
-		startTime = time.Unix(0, 0)
-	} else {
-		startTime = rp.ShardGroups[len(rp.ShardGroups)-1].StartTime.Add(rp.ShardGroupDuration)
-	}
-	endTime = startTime.Add(rp.ShardGroupDuration).Add(-1)
-
-	sh := meta.ShardGroupInfo{
-		ID:        uint64(len(rp.ShardGroups) + 1),
-		StartTime: startTime,
-		EndTime:   endTime,
-		Shards: []meta.ShardInfo{
-			meta.ShardInfo{
-				ID:     nextShardID(),
-				Owners: owners,
-			},
-		},
-	}
-	rp.ShardGroups = append(rp.ShardGroups, sh)
-}
-
-func nextShardID() uint64 {
-	return atomic.AddUint64(&shardID, 1)
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/cluster/rpc.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/cluster/rpc.go
deleted file mode 100644
index defbb4fd5..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/cluster/rpc.go
+++ /dev/null
@@ -1,213 +0,0 @@
-package cluster
-
-import (
-	"fmt"
-	"time"
-
-	"github.com/gogo/protobuf/proto"
-	"github.com/influxdb/influxdb/cluster/internal"
-	"github.com/influxdb/influxdb/models"
-)
-
-//go:generate protoc --gogo_out=. internal/data.proto
-
-// MapShardRequest represents the request to map a remote shard for a query.
-type MapShardRequest struct {
-	pb internal.MapShardRequest
-}
-
-// ShardID of the map request
-func (m *MapShardRequest) ShardID() uint64 { return m.pb.GetShardID() }
-
-// Query returns the Shard map request's query
-func (m *MapShardRequest) Query() string { return m.pb.GetQuery() }
-
-// ChunkSize returns Shard map request's chunk size
-func (m *MapShardRequest) ChunkSize() int32 { return m.pb.GetChunkSize() }
-
-// SetShardID sets the map request's shard id
-func (m *MapShardRequest) SetShardID(id uint64) { m.pb.ShardID = &id }
-
-// SetQuery sets the Shard map request's Query
-func (m *MapShardRequest) SetQuery(query string) { m.pb.Query = &query }
-
-// SetChunkSize sets the Shard map request's chunk size
-func (m *MapShardRequest) SetChunkSize(chunkSize int32) { m.pb.ChunkSize = &chunkSize }
-
-// MarshalBinary encodes the object to a binary format.
-func (m *MapShardRequest) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(&m.pb)
-}
-
-// UnmarshalBinary populates MapShardRequest from a binary format.
-func (m *MapShardRequest) UnmarshalBinary(buf []byte) error {
-	if err := proto.Unmarshal(buf, &m.pb); err != nil {
-		return err
-	}
-	return nil
-}
-
-// MapShardResponse represents the response returned from a remote MapShardRequest call
-type MapShardResponse struct {
-	pb internal.MapShardResponse
-}
-
-// NewMapShardResponse returns the response returned from a remote MapShardRequest call
-func NewMapShardResponse(code int, message string) *MapShardResponse {
-	m := &MapShardResponse{}
-	m.SetCode(code)
-	m.SetMessage(message)
-	return m
-}
-
-// Code returns the Shard map response's code
-func (r *MapShardResponse) Code() int { return int(r.pb.GetCode()) }
-
-// Message returns the the Shard map response's Message
-func (r *MapShardResponse) Message() string { return r.pb.GetMessage() }
-
-// TagSets returns Shard map response's tag sets
-func (r *MapShardResponse) TagSets() []string { return r.pb.GetTagSets() }
-
-// Fields returns the Shard map response's Fields
-func (r *MapShardResponse) Fields() []string { return r.pb.GetFields() }
-
-// Data returns the Shard map response's Data
-func (r *MapShardResponse) Data() []byte { return r.pb.GetData() }
-
-// SetCode sets the Shard map response's code
-func (r *MapShardResponse) SetCode(code int) { r.pb.Code = proto.Int32(int32(code)) }
-
-// SetMessage sets Shard map response's message
-func (r *MapShardResponse) SetMessage(message string) { r.pb.Message = &message }
-
-// SetTagSets sets Shard map response's tagsets
-func (r *MapShardResponse) SetTagSets(tagsets []string) { r.pb.TagSets = tagsets }
-
-// SetFields sets the Shard map response's Fields
-func (r *MapShardResponse) SetFields(fields []string) { r.pb.Fields = fields }
-
-// SetData sets the Shard map response's Data
-func (r *MapShardResponse) SetData(data []byte) { r.pb.Data = data }
-
-// MarshalBinary encodes the object to a binary format.
-func (r *MapShardResponse) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(&r.pb)
-}
-
-// UnmarshalBinary populates WritePointRequest from a binary format.
-func (r *MapShardResponse) UnmarshalBinary(buf []byte) error {
-	if err := proto.Unmarshal(buf, &r.pb); err != nil {
-		return err
-	}
-	return nil
-}
-
-// WritePointsRequest represents a request to write point data to the cluster
-type WritePointsRequest struct {
-	Database         string
-	RetentionPolicy  string
-	ConsistencyLevel ConsistencyLevel
-	Points           []models.Point
-}
-
-// AddPoint adds a point to the WritePointRequest with field key 'value'
-func (w *WritePointsRequest) AddPoint(name string, value interface{}, timestamp time.Time, tags map[string]string) {
-	pt, err := models.NewPoint(
-		name, tags, map[string]interface{}{"value": value}, timestamp,
-	)
-	if err != nil {
-		return
-	}
-	w.Points = append(w.Points, pt)
-}
-
-// WriteShardRequest represents the a request to write a slice of points to a shard
-type WriteShardRequest struct {
-	pb internal.WriteShardRequest
-}
-
-// WriteShardResponse represents the response returned from a remote WriteShardRequest call
-type WriteShardResponse struct {
-	pb internal.WriteShardResponse
-}
-
-// SetShardID sets the ShardID
-func (w *WriteShardRequest) SetShardID(id uint64) { w.pb.ShardID = &id }
-
-// ShardID gets the ShardID
-func (w *WriteShardRequest) ShardID() uint64 { return w.pb.GetShardID() }
-
-// Points returns the time series Points
-func (w *WriteShardRequest) Points() []models.Point { return w.unmarshalPoints() }
-
-// AddPoint adds a new time series point
-func (w *WriteShardRequest) AddPoint(name string, value interface{}, timestamp time.Time, tags map[string]string) {
-	pt, err := models.NewPoint(
-		name, tags, map[string]interface{}{"value": value}, timestamp,
-	)
-	if err != nil {
-		return
-	}
-	w.AddPoints([]models.Point{pt})
-}
-
-// AddPoints adds a new time series point
-func (w *WriteShardRequest) AddPoints(points []models.Point) {
-	for _, p := range points {
-		w.pb.Points = append(w.pb.Points, []byte(p.String()))
-	}
-}
-
-// MarshalBinary encodes the object to a binary format.
-func (w *WriteShardRequest) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(&w.pb)
-}
-
-// UnmarshalBinary populates WritePointRequest from a binary format.
-func (w *WriteShardRequest) UnmarshalBinary(buf []byte) error {
-	if err := proto.Unmarshal(buf, &w.pb); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (w *WriteShardRequest) unmarshalPoints() []models.Point {
-	points := make([]models.Point, len(w.pb.GetPoints()))
-	for i, p := range w.pb.GetPoints() {
-		pt, err := models.ParsePoints(p)
-		if err != nil {
-			// A error here means that one node parsed the point correctly but sent an
-			// unparseable version to another node.  We could log and drop the point and allow
-			// anti-entropy to resolve the discrepancy but this shouldn't ever happen.
-			panic(fmt.Sprintf("failed to parse point: `%v`: %v", string(p), err))
-		}
-		points[i] = pt[0]
-	}
-	return points
-}
-
-// SetCode sets the Code
-func (w *WriteShardResponse) SetCode(code int) { w.pb.Code = proto.Int32(int32(code)) }
-
-// SetMessage sets the Message
-func (w *WriteShardResponse) SetMessage(message string) { w.pb.Message = &message }
-
-// Code returns the Code
-func (w *WriteShardResponse) Code() int { return int(w.pb.GetCode()) }
-
-// Message returns the Message
-func (w *WriteShardResponse) Message() string { return w.pb.GetMessage() }
-
-// MarshalBinary encodes the object to a binary format.
-func (w *WriteShardResponse) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(&w.pb)
-}
-
-// UnmarshalBinary populates WritePointRequest from a binary format.
-func (w *WriteShardResponse) UnmarshalBinary(buf []byte) error {
-	if err := proto.Unmarshal(buf, &w.pb); err != nil {
-		return err
-	}
-	return nil
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/cluster/rpc_test.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/cluster/rpc_test.go
deleted file mode 100644
index 4e42cd5d6..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/cluster/rpc_test.go
+++ /dev/null
@@ -1,110 +0,0 @@
-package cluster
-
-import (
-	"testing"
-	"time"
-)
-
-func TestWriteShardRequestBinary(t *testing.T) {
-	sr := &WriteShardRequest{}
-
-	sr.SetShardID(uint64(1))
-	if exp := uint64(1); sr.ShardID() != exp {
-		t.Fatalf("ShardID mismatch: got %v, exp %v", sr.ShardID(), exp)
-	}
-
-	sr.AddPoint("cpu", 1.0, time.Unix(0, 0), map[string]string{"host": "serverA"})
-	sr.AddPoint("cpu", 2.0, time.Unix(0, 0).Add(time.Hour), nil)
-	sr.AddPoint("cpu_load", 3.0, time.Unix(0, 0).Add(time.Hour+time.Second), nil)
-
-	b, err := sr.MarshalBinary()
-	if err != nil {
-		t.Fatalf("WritePointsRequest.MarshalBinary() failed: %v", err)
-	}
-	if len(b) == 0 {
-		t.Fatalf("WritePointsRequest.MarshalBinary() returned 0 bytes")
-	}
-
-	got := &WriteShardRequest{}
-	if err := got.UnmarshalBinary(b); err != nil {
-		t.Fatalf("WritePointsRequest.UnmarshalMarshalBinary() failed: %v", err)
-	}
-
-	if got.ShardID() != sr.ShardID() {
-		t.Errorf("ShardID mismatch: got %v, exp %v", got.ShardID(), sr.ShardID())
-	}
-
-	if len(got.Points()) != len(sr.Points()) {
-		t.Errorf("Points count mismatch: got %v, exp %v", len(got.Points()), len(sr.Points()))
-	}
-
-	srPoints := sr.Points()
-	gotPoints := got.Points()
-	for i, p := range srPoints {
-		g := gotPoints[i]
-
-		if g.Name() != p.Name() {
-			t.Errorf("Point %d name mismatch: got %v, exp %v", i, g.Name(), p.Name())
-		}
-
-		if !g.Time().Equal(p.Time()) {
-			t.Errorf("Point %d time mismatch: got %v, exp %v", i, g.Time(), p.Time())
-		}
-
-		if g.HashID() != p.HashID() {
-			t.Errorf("Point #%d HashID() mismatch: got %v, exp %v", i, g.HashID(), p.HashID())
-		}
-
-		for k, v := range p.Tags() {
-			if g.Tags()[k] != v {
-				t.Errorf("Point #%d tag mismatch: got %v, exp %v", i, k, v)
-			}
-		}
-
-		if len(p.Fields()) != len(g.Fields()) {
-			t.Errorf("Point %d field count mismatch: got %v, exp %v", i, len(g.Fields()), len(p.Fields()))
-		}
-
-		for j, f := range p.Fields() {
-			if g.Fields()[j] != f {
-				t.Errorf("Point %d field mismatch: got %v, exp %v", i, g.Fields()[j], f)
-			}
-		}
-	}
-}
-
-func TestWriteShardResponseBinary(t *testing.T) {
-	sr := &WriteShardResponse{}
-	sr.SetCode(10)
-	sr.SetMessage("foo")
-	b, err := sr.MarshalBinary()
-
-	if exp := 10; sr.Code() != exp {
-		t.Fatalf("Code mismatch: got %v, exp %v", sr.Code(), exp)
-	}
-
-	if exp := "foo"; sr.Message() != exp {
-		t.Fatalf("Message mismatch: got %v, exp %v", sr.Message(), exp)
-	}
-
-	if err != nil {
-		t.Fatalf("WritePointsResponse.MarshalBinary() failed: %v", err)
-	}
-	if len(b) == 0 {
-		t.Fatalf("WritePointsResponse.MarshalBinary() returned 0 bytes")
-	}
-
-	got := &WriteShardResponse{}
-	if err := got.UnmarshalBinary(b); err != nil {
-		t.Fatalf("WritePointsResponse.UnmarshalMarshalBinary() failed: %v", err)
-	}
-
-	if got.Code() != sr.Code() {
-		t.Errorf("Code mismatch: got %v, exp %v", got.Code(), sr.Code())
-	}
-
-	if got.Message() != sr.Message() {
-		t.Errorf("Message mismatch: got %v, exp %v", got.Message(), sr.Message())
-	}
-
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/cluster/service.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/cluster/service.go
deleted file mode 100644
index 5169a6e33..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/cluster/service.go
+++ /dev/null
@@ -1,371 +0,0 @@
-package cluster
-
-import (
-	"encoding/binary"
-	"encoding/json"
-	"expvar"
-	"fmt"
-	"io"
-	"log"
-	"net"
-	"os"
-	"strings"
-	"sync"
-
-	"github.com/influxdb/influxdb"
-	"github.com/influxdb/influxdb/influxql"
-	"github.com/influxdb/influxdb/meta"
-	"github.com/influxdb/influxdb/models"
-	"github.com/influxdb/influxdb/tsdb"
-)
-
-// MaxMessageSize defines how large a message can be before we reject it
-const MaxMessageSize = 1024 * 1024 * 1024 // 1GB
-
-// MuxHeader is the header byte used in the TCP mux.
-const MuxHeader = 2
-
-// Statistics maintained by the cluster package
-const (
-	writeShardReq       = "writeShardReq"
-	writeShardPointsReq = "writeShardPointsReq"
-	writeShardFail      = "writeShardFail"
-	mapShardReq         = "mapShardReq"
-	mapShardResp        = "mapShardResp"
-)
-
-// Service processes data received over raw TCP connections.
-type Service struct {
-	mu sync.RWMutex
-
-	wg      sync.WaitGroup
-	closing chan struct{}
-
-	Listener net.Listener
-
-	MetaStore interface {
-		ShardOwner(shardID uint64) (string, string, *meta.ShardGroupInfo)
-	}
-
-	TSDBStore interface {
-		CreateShard(database, policy string, shardID uint64) error
-		WriteToShard(shardID uint64, points []models.Point) error
-		CreateMapper(shardID uint64, stmt influxql.Statement, chunkSize int) (tsdb.Mapper, error)
-	}
-
-	Logger  *log.Logger
-	statMap *expvar.Map
-}
-
-// NewService returns a new instance of Service.
-func NewService(c Config) *Service {
-	return &Service{
-		closing: make(chan struct{}),
-		Logger:  log.New(os.Stderr, "[cluster] ", log.LstdFlags),
-		statMap: influxdb.NewStatistics("cluster", "cluster", nil),
-	}
-}
-
-// Open opens the network listener and begins serving requests.
-func (s *Service) Open() error {
-
-	s.Logger.Println("Starting cluster service")
-	// Begin serving conections.
-	s.wg.Add(1)
-	go s.serve()
-
-	return nil
-}
-
-// SetLogger sets the internal logger to the logger passed in.
-func (s *Service) SetLogger(l *log.Logger) {
-	s.Logger = l
-}
-
-// serve accepts connections from the listener and handles them.
-func (s *Service) serve() {
-	defer s.wg.Done()
-
-	for {
-		// Check if the service is shutting down.
-		select {
-		case <-s.closing:
-			return
-		default:
-		}
-
-		// Accept the next connection.
-		conn, err := s.Listener.Accept()
-		if err != nil {
-			if strings.Contains(err.Error(), "connection closed") {
-				s.Logger.Printf("cluster service accept error: %s", err)
-				return
-			}
-			s.Logger.Printf("accept error: %s", err)
-			continue
-		}
-
-		// Delegate connection handling to a separate goroutine.
-		s.wg.Add(1)
-		go func() {
-			defer s.wg.Done()
-			s.handleConn(conn)
-		}()
-	}
-}
-
-// Close shuts down the listener and waits for all connections to finish.
-func (s *Service) Close() error {
-	if s.Listener != nil {
-		s.Listener.Close()
-	}
-
-	// Shut down all handlers.
-	close(s.closing)
-	s.wg.Wait()
-
-	return nil
-}
-
-// handleConn services an individual TCP connection.
-func (s *Service) handleConn(conn net.Conn) {
-	// Ensure connection is closed when service is closed.
-	closing := make(chan struct{})
-	defer close(closing)
-	go func() {
-		select {
-		case <-closing:
-		case <-s.closing:
-		}
-		conn.Close()
-	}()
-
-	s.Logger.Printf("accept remote connection from %v\n", conn.RemoteAddr())
-	defer func() {
-		s.Logger.Printf("close remote connection from %v\n", conn.RemoteAddr())
-	}()
-	for {
-		// Read type-length-value.
-		typ, buf, err := ReadTLV(conn)
-		if err != nil {
-			if strings.HasSuffix(err.Error(), "EOF") {
-				return
-			}
-			s.Logger.Printf("unable to read type-length-value %s", err)
-			return
-		}
-
-		// Delegate message processing by type.
-		switch typ {
-		case writeShardRequestMessage:
-			s.statMap.Add(writeShardReq, 1)
-			err := s.processWriteShardRequest(buf)
-			if err != nil {
-				s.Logger.Printf("process write shard error: %s", err)
-			}
-			s.writeShardResponse(conn, err)
-		case mapShardRequestMessage:
-			s.statMap.Add(mapShardReq, 1)
-			err := s.processMapShardRequest(conn, buf)
-			if err != nil {
-				s.Logger.Printf("process map shard error: %s", err)
-				if err := writeMapShardResponseMessage(conn, NewMapShardResponse(1, err.Error())); err != nil {
-					s.Logger.Printf("process map shard error writing response: %s", err.Error())
-				}
-			}
-		default:
-			s.Logger.Printf("cluster service message type not found: %d", typ)
-		}
-	}
-}
-
-func (s *Service) processWriteShardRequest(buf []byte) error {
-	// Build request
-	var req WriteShardRequest
-	if err := req.UnmarshalBinary(buf); err != nil {
-		return err
-	}
-
-	points := req.Points()
-	s.statMap.Add(writeShardPointsReq, int64(len(points)))
-	err := s.TSDBStore.WriteToShard(req.ShardID(), req.Points())
-
-	// We may have received a write for a shard that we don't have locally because the
-	// sending node may have just created the shard (via the metastore) and the write
-	// arrived before the local store could create the shard.  In this case, we need
-	// to check the metastore to determine what database and retention policy this
-	// shard should reside within.
-	if err == tsdb.ErrShardNotFound {
-
-		// Query the metastore for the owner of this shard
-		database, retentionPolicy, sgi := s.MetaStore.ShardOwner(req.ShardID())
-		if sgi == nil {
-			// If we can't find it, then we need to drop this request
-			// as it is no longer valid.  This could happen if writes were queued via
-			// hinted handoff and delivered after a shard group was deleted.
-			s.Logger.Printf("drop write request: shard=%d. shard group does not exist or was deleted", req.ShardID())
-			return nil
-		}
-
-		err = s.TSDBStore.CreateShard(database, retentionPolicy, req.ShardID())
-		if err != nil {
-			return err
-		}
-		return s.TSDBStore.WriteToShard(req.ShardID(), req.Points())
-	}
-
-	if err != nil {
-		s.statMap.Add(writeShardFail, 1)
-		return fmt.Errorf("write shard %d: %s", req.ShardID(), err)
-	}
-
-	return nil
-}
-
-func (s *Service) writeShardResponse(w io.Writer, e error) {
-	// Build response.
-	var resp WriteShardResponse
-	if e != nil {
-		resp.SetCode(1)
-		resp.SetMessage(e.Error())
-	} else {
-		resp.SetCode(0)
-	}
-
-	// Marshal response to binary.
-	buf, err := resp.MarshalBinary()
-	if err != nil {
-		s.Logger.Printf("error marshalling shard response: %s", err)
-		return
-	}
-
-	// Write to connection.
-	if err := WriteTLV(w, writeShardResponseMessage, buf); err != nil {
-		s.Logger.Printf("write shard response error: %s", err)
-	}
-}
-
-func (s *Service) processMapShardRequest(w io.Writer, buf []byte) error {
-	// Decode request
-	var req MapShardRequest
-	if err := req.UnmarshalBinary(buf); err != nil {
-		return err
-	}
-
-	// Parse the statement.
-	q, err := influxql.ParseQuery(req.Query())
-	if err != nil {
-		return fmt.Errorf("processing map shard: %s", err)
-	} else if len(q.Statements) != 1 {
-		return fmt.Errorf("processing map shard: expected 1 statement but got %d", len(q.Statements))
-	}
-
-	m, err := s.TSDBStore.CreateMapper(req.ShardID(), q.Statements[0], int(req.ChunkSize()))
-	if err != nil {
-		return fmt.Errorf("create mapper: %s", err)
-	}
-	if m == nil {
-		return writeMapShardResponseMessage(w, NewMapShardResponse(0, ""))
-	}
-
-	if err := m.Open(); err != nil {
-		return fmt.Errorf("mapper open: %s", err)
-	}
-	defer m.Close()
-
-	var metaSent bool
-	for {
-		var resp MapShardResponse
-
-		if !metaSent {
-			resp.SetTagSets(m.TagSets())
-			resp.SetFields(m.Fields())
-			metaSent = true
-		}
-
-		chunk, err := m.NextChunk()
-		if err != nil {
-			return fmt.Errorf("next chunk: %s", err)
-		}
-
-		// NOTE: Even if the chunk is nil, we still need to send one
-		// empty response to let the other side know we're out of data.
-
-		if chunk != nil {
-			b, err := json.Marshal(chunk)
-			if err != nil {
-				return fmt.Errorf("encoding: %s", err)
-			}
-			resp.SetData(b)
-		}
-
-		// Write to connection.
-		resp.SetCode(0)
-		if err := writeMapShardResponseMessage(w, &resp); err != nil {
-			return err
-		}
-		s.statMap.Add(mapShardResp, 1)
-
-		if chunk == nil {
-			// All mapper data sent.
-			return nil
-		}
-	}
-}
-
-func writeMapShardResponseMessage(w io.Writer, msg *MapShardResponse) error {
-	buf, err := msg.MarshalBinary()
-	if err != nil {
-		return err
-	}
-	return WriteTLV(w, mapShardResponseMessage, buf)
-}
-
-// ReadTLV reads a type-length-value record from r.
-func ReadTLV(r io.Reader) (byte, []byte, error) {
-	var typ [1]byte
-	if _, err := io.ReadFull(r, typ[:]); err != nil {
-		return 0, nil, fmt.Errorf("read message type: %s", err)
-	}
-
-	// Read the size of the message.
-	var sz int64
-	if err := binary.Read(r, binary.BigEndian, &sz); err != nil {
-		return 0, nil, fmt.Errorf("read message size: %s", err)
-	}
-
-	if sz == 0 {
-		return 0, nil, fmt.Errorf("invalid message size: %d", sz)
-	}
-
-	if sz >= MaxMessageSize {
-		return 0, nil, fmt.Errorf("max message size of %d exceeded: %d", MaxMessageSize, sz)
-	}
-
-	// Read the value.
-	buf := make([]byte, sz)
-	if _, err := io.ReadFull(r, buf); err != nil {
-		return 0, nil, fmt.Errorf("read message value: %s", err)
-	}
-
-	return typ[0], buf, nil
-}
-
-// WriteTLV writes a type-length-value record to w.
-func WriteTLV(w io.Writer, typ byte, buf []byte) error {
-	if _, err := w.Write([]byte{typ}); err != nil {
-		return fmt.Errorf("write message type: %s", err)
-	}
-
-	// Write the size of the message.
-	if err := binary.Write(w, binary.BigEndian, int64(len(buf))); err != nil {
-		return fmt.Errorf("write message size: %s", err)
-	}
-
-	// Write the value.
-	if _, err := w.Write(buf); err != nil {
-		return fmt.Errorf("write message value: %s", err)
-	}
-
-	return nil
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/cluster/service_test.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/cluster/service_test.go
deleted file mode 100644
index 8158c47a6..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/cluster/service_test.go
+++ /dev/null
@@ -1,105 +0,0 @@
-package cluster_test
-
-import (
-	"fmt"
-	"net"
-	"time"
-
-	"github.com/influxdb/influxdb/cluster"
-	"github.com/influxdb/influxdb/influxql"
-	"github.com/influxdb/influxdb/meta"
-	"github.com/influxdb/influxdb/models"
-	"github.com/influxdb/influxdb/tcp"
-	"github.com/influxdb/influxdb/tsdb"
-)
-
-type metaStore struct {
-	host string
-}
-
-func (m *metaStore) Node(nodeID uint64) (*meta.NodeInfo, error) {
-	return &meta.NodeInfo{
-		ID:   nodeID,
-		Host: m.host,
-	}, nil
-}
-
-type testService struct {
-	nodeID           uint64
-	ln               net.Listener
-	muxln            net.Listener
-	writeShardFunc   func(shardID uint64, points []models.Point) error
-	createShardFunc  func(database, policy string, shardID uint64) error
-	createMapperFunc func(shardID uint64, stmt influxql.Statement, chunkSize int) (tsdb.Mapper, error)
-}
-
-func newTestWriteService(f func(shardID uint64, points []models.Point) error) testService {
-	ln, err := net.Listen("tcp", "127.0.0.1:0")
-	if err != nil {
-		panic(err)
-	}
-
-	mux := tcp.NewMux()
-	muxln := mux.Listen(cluster.MuxHeader)
-	go mux.Serve(ln)
-
-	return testService{
-		writeShardFunc: f,
-		ln:             ln,
-		muxln:          muxln,
-	}
-}
-
-func (ts *testService) Close() {
-	if ts.ln != nil {
-		ts.ln.Close()
-	}
-}
-
-type serviceResponses []serviceResponse
-type serviceResponse struct {
-	shardID uint64
-	ownerID uint64
-	points  []models.Point
-}
-
-func (t testService) WriteToShard(shardID uint64, points []models.Point) error {
-	return t.writeShardFunc(shardID, points)
-}
-
-func (t testService) CreateShard(database, policy string, shardID uint64) error {
-	return t.createShardFunc(database, policy, shardID)
-}
-
-func (t testService) CreateMapper(shardID uint64, stmt influxql.Statement, chunkSize int) (tsdb.Mapper, error) {
-	return t.createMapperFunc(shardID, stmt, chunkSize)
-}
-
-func writeShardSuccess(shardID uint64, points []models.Point) error {
-	responses <- &serviceResponse{
-		shardID: shardID,
-		points:  points,
-	}
-	return nil
-}
-
-func writeShardFail(shardID uint64, points []models.Point) error {
-	return fmt.Errorf("failed to write")
-}
-
-var responses = make(chan *serviceResponse, 1024)
-
-func (testService) ResponseN(n int) ([]*serviceResponse, error) {
-	var a []*serviceResponse
-	for {
-		select {
-		case r := <-responses:
-			a = append(a, r)
-			if len(a) == n {
-				return a, nil
-			}
-		case <-time.After(time.Second):
-			return a, fmt.Errorf("unexpected response count: expected: %d, actual: %d", n, len(a))
-		}
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/cluster/shard_mapper.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/cluster/shard_mapper.go
deleted file mode 100644
index b8645f4a7..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/cluster/shard_mapper.go
+++ /dev/null
@@ -1,259 +0,0 @@
-package cluster
-
-import (
-	"encoding/json"
-	"fmt"
-	"math/rand"
-	"net"
-	"time"
-
-	"github.com/influxdb/influxdb/influxql"
-	"github.com/influxdb/influxdb/meta"
-	"github.com/influxdb/influxdb/tsdb"
-)
-
-// ShardMapper is responsible for providing mappers for requested shards. It is
-// responsible for creating those mappers from the local store, or reaching
-// out to another node on the cluster.
-type ShardMapper struct {
-	ForceRemoteMapping bool // All shards treated as remote. Useful for testing.
-
-	MetaStore interface {
-		NodeID() uint64
-		Node(id uint64) (ni *meta.NodeInfo, err error)
-	}
-
-	TSDBStore interface {
-		CreateMapper(shardID uint64, stmt influxql.Statement, chunkSize int) (tsdb.Mapper, error)
-	}
-
-	timeout time.Duration
-	pool    *clientPool
-}
-
-// NewShardMapper returns a mapper of local and remote shards.
-func NewShardMapper(timeout time.Duration) *ShardMapper {
-	return &ShardMapper{
-		pool:    newClientPool(),
-		timeout: timeout,
-	}
-}
-
-// CreateMapper returns a Mapper for the given shard ID.
-func (s *ShardMapper) CreateMapper(sh meta.ShardInfo, stmt influxql.Statement, chunkSize int) (tsdb.Mapper, error) {
-	// Create a remote mapper if the local node doesn't own the shard.
-	if !sh.OwnedBy(s.MetaStore.NodeID()) || s.ForceRemoteMapping {
-		// Pick a node in a pseudo-random manner.
-		conn, err := s.dial(sh.Owners[rand.Intn(len(sh.Owners))].NodeID)
-		if err != nil {
-			return nil, err
-		}
-		conn.SetDeadline(time.Now().Add(s.timeout))
-
-		return NewRemoteMapper(conn, sh.ID, stmt, chunkSize), nil
-	}
-
-	// If it is local then return the mapper from the store.
-	m, err := s.TSDBStore.CreateMapper(sh.ID, stmt, chunkSize)
-	if err != nil {
-		return nil, err
-	}
-
-	return m, nil
-}
-
-func (s *ShardMapper) dial(nodeID uint64) (net.Conn, error) {
-	ni, err := s.MetaStore.Node(nodeID)
-	if err != nil {
-		return nil, err
-	}
-	conn, err := net.Dial("tcp", ni.Host)
-	if err != nil {
-		return nil, err
-	}
-
-	// Write the cluster multiplexing header byte
-	conn.Write([]byte{MuxHeader})
-
-	return conn, nil
-}
-
-// RemoteMapper implements the tsdb.Mapper interface. It connects to a remote node,
-// sends a query, and interprets the stream of data that comes back.
-type RemoteMapper struct {
-	shardID   uint64
-	stmt      influxql.Statement
-	chunkSize int
-
-	tagsets []string
-	fields  []string
-
-	conn             net.Conn
-	bufferedResponse *MapShardResponse
-
-	unmarshallers []tsdb.UnmarshalFunc // Mapping-specific unmarshal functions.
-}
-
-// NewRemoteMapper returns a new remote mapper using the given connection.
-func NewRemoteMapper(c net.Conn, shardID uint64, stmt influxql.Statement, chunkSize int) *RemoteMapper {
-	return &RemoteMapper{
-		conn:      c,
-		shardID:   shardID,
-		stmt:      stmt,
-		chunkSize: chunkSize,
-	}
-}
-
-// Open connects to the remote node and starts receiving data.
-func (r *RemoteMapper) Open() (err error) {
-	defer func() {
-		if err != nil {
-			r.conn.Close()
-		}
-	}()
-
-	// Build Map request.
-	var request MapShardRequest
-	request.SetShardID(r.shardID)
-	request.SetQuery(r.stmt.String())
-	request.SetChunkSize(int32(r.chunkSize))
-
-	// Marshal into protocol buffers.
-	buf, err := request.MarshalBinary()
-	if err != nil {
-		return err
-	}
-
-	// Write request.
-	if err := WriteTLV(r.conn, mapShardRequestMessage, buf); err != nil {
-		return err
-	}
-
-	// Read the response.
-	_, buf, err = ReadTLV(r.conn)
-	if err != nil {
-		return err
-	}
-
-	// Unmarshal response.
-	r.bufferedResponse = &MapShardResponse{}
-	if err := r.bufferedResponse.UnmarshalBinary(buf); err != nil {
-		return err
-	}
-
-	if r.bufferedResponse.Code() != 0 {
-		return fmt.Errorf("error code %d: %s", r.bufferedResponse.Code(), r.bufferedResponse.Message())
-	}
-
-	// Decode the first response to get the TagSets.
-	r.tagsets = r.bufferedResponse.TagSets()
-	r.fields = r.bufferedResponse.Fields()
-
-	// Set up each mapping function for this statement.
-	if stmt, ok := r.stmt.(*influxql.SelectStatement); ok {
-		for _, c := range stmt.FunctionCalls() {
-			fn, err := tsdb.InitializeUnmarshaller(c)
-			if err != nil {
-				return err
-			}
-			r.unmarshallers = append(r.unmarshallers, fn)
-		}
-	}
-
-	return nil
-}
-
-// TagSets returns the TagSets
-func (r *RemoteMapper) TagSets() []string {
-	return r.tagsets
-}
-
-// Fields returns RemoteMapper's Fields
-func (r *RemoteMapper) Fields() []string {
-	return r.fields
-}
-
-// NextChunk returns the next chunk read from the remote node to the client.
-func (r *RemoteMapper) NextChunk() (chunk interface{}, err error) {
-	var response *MapShardResponse
-	if r.bufferedResponse != nil {
-		response = r.bufferedResponse
-		r.bufferedResponse = nil
-	} else {
-		response = &MapShardResponse{}
-
-		// Read the response.
-		_, buf, err := ReadTLV(r.conn)
-		if err != nil {
-			return nil, err
-		}
-
-		// Unmarshal response.
-		if err := response.UnmarshalBinary(buf); err != nil {
-			return nil, err
-		}
-
-		if response.Code() != 0 {
-			return nil, fmt.Errorf("error code %d: %s", response.Code(), response.Message())
-		}
-	}
-
-	if response.Data() == nil {
-		return nil, nil
-	}
-
-	moj := &tsdb.MapperOutputJSON{}
-	if err := json.Unmarshal(response.Data(), moj); err != nil {
-		return nil, err
-	}
-	mvj := []*tsdb.MapperValueJSON{}
-	if err := json.Unmarshal(moj.Values, &mvj); err != nil {
-		return nil, err
-	}
-
-	// Prep the non-JSON version of Mapper output.
-	mo := &tsdb.MapperOutput{
-		Name:   moj.Name,
-		Tags:   moj.Tags,
-		Fields: moj.Fields,
-	}
-
-	if len(mvj) == 1 && len(mvj[0].AggData) > 0 {
-		// The MapperValue is carrying aggregate data, so run it through the
-		// custom unmarshallers for the map functions through which the data
-		// was mapped.
-		aggValues := []interface{}{}
-		for i, b := range mvj[0].AggData {
-			v, err := r.unmarshallers[i](b)
-			if err != nil {
-				return nil, err
-			}
-			aggValues = append(aggValues, v)
-		}
-		mo.Values = []*tsdb.MapperValue{&tsdb.MapperValue{
-			Value: aggValues,
-			Tags:  mvj[0].Tags,
-		}}
-	} else {
-		// Must be raw data instead.
-		for _, v := range mvj {
-			var rawValue interface{}
-			if err := json.Unmarshal(v.RawData, &rawValue); err != nil {
-				return nil, err
-			}
-
-			mo.Values = append(mo.Values, &tsdb.MapperValue{
-				Time:  v.Time,
-				Value: rawValue,
-				Tags:  v.Tags,
-			})
-		}
-	}
-
-	return mo, nil
-}
-
-// Close the Mapper
-func (r *RemoteMapper) Close() {
-	r.conn.Close()
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/cluster/shard_mapper_test.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/cluster/shard_mapper_test.go
deleted file mode 100644
index 3a80f596e..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/cluster/shard_mapper_test.go
+++ /dev/null
@@ -1,110 +0,0 @@
-package cluster
-
-import (
-	"bytes"
-	"encoding/json"
-	"fmt"
-	"io"
-	"net"
-	"testing"
-
-	"github.com/influxdb/influxdb/influxql"
-	"github.com/influxdb/influxdb/tsdb"
-)
-
-// remoteShardResponder implements the remoteShardConn interface.
-type remoteShardResponder struct {
-	net.Conn
-	t       *testing.T
-	rxBytes []byte
-
-	buffer *bytes.Buffer
-}
-
-func newRemoteShardResponder(outputs []*tsdb.MapperOutput, tagsets []string) *remoteShardResponder {
-	r := &remoteShardResponder{}
-	a := make([]byte, 0, 1024)
-	r.buffer = bytes.NewBuffer(a)
-
-	// Pump the outputs in the buffer for later reading.
-	for _, o := range outputs {
-		resp := &MapShardResponse{}
-		resp.SetCode(0)
-		if o != nil {
-			d, _ := json.Marshal(o)
-			resp.SetData(d)
-			resp.SetTagSets(tagsets)
-		}
-
-		g, _ := resp.MarshalBinary()
-		WriteTLV(r.buffer, mapShardResponseMessage, g)
-	}
-
-	return r
-}
-
-func (r remoteShardResponder) Close() error { return nil }
-func (r remoteShardResponder) Read(p []byte) (n int, err error) {
-	return io.ReadFull(r.buffer, p)
-}
-
-func (r remoteShardResponder) Write(p []byte) (n int, err error) {
-	if r.rxBytes == nil {
-		r.rxBytes = make([]byte, 0)
-	}
-	r.rxBytes = append(r.rxBytes, p...)
-	return len(p), nil
-}
-
-// Ensure a RemoteMapper can process valid responses from a remote shard.
-func TestShardWriter_RemoteMapper_Success(t *testing.T) {
-	expTagSets := []string{"tagsetA"}
-	expOutput := &tsdb.MapperOutput{
-		Name: "cpu",
-		Tags: map[string]string{"host": "serverA"},
-	}
-
-	c := newRemoteShardResponder([]*tsdb.MapperOutput{expOutput, nil}, expTagSets)
-
-	r := NewRemoteMapper(c, 1234, mustParseStmt("SELECT * FROM CPU"), 10)
-	if err := r.Open(); err != nil {
-		t.Fatalf("failed to open remote mapper: %s", err.Error())
-	}
-
-	if r.TagSets()[0] != expTagSets[0] {
-		t.Fatalf("incorrect tagsets received, exp %v, got %v", expTagSets, r.TagSets())
-	}
-
-	// Get first chunk from mapper.
-	chunk, err := r.NextChunk()
-	if err != nil {
-		t.Fatalf("failed to get next chunk from mapper: %s", err.Error())
-	}
-	output, ok := chunk.(*tsdb.MapperOutput)
-	if !ok {
-		t.Fatal("chunk is not of expected type")
-	}
-	if output.Name != "cpu" {
-		t.Fatalf("received output incorrect, exp: %v, got %v", expOutput, output)
-	}
-
-	// Next chunk should be nil, indicating no more data.
-	chunk, err = r.NextChunk()
-	if err != nil {
-		t.Fatalf("failed to get next chunk from mapper: %s", err.Error())
-	}
-	if chunk != nil {
-		t.Fatal("received more chunks when none expected")
-	}
-}
-
-// mustParseStmt parses a single statement or panics.
-func mustParseStmt(stmt string) influxql.Statement {
-	q, err := influxql.ParseQuery(stmt)
-	if err != nil {
-		panic(err)
-	} else if len(q.Statements) != 1 {
-		panic(fmt.Sprintf("expected 1 statement but got %d", len(q.Statements)))
-	}
-	return q.Statements[0]
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/cluster/shard_writer.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/cluster/shard_writer.go
deleted file mode 100644
index f6da1023c..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/cluster/shard_writer.go
+++ /dev/null
@@ -1,165 +0,0 @@
-package cluster
-
-import (
-	"fmt"
-	"net"
-	"time"
-
-	"github.com/influxdb/influxdb/meta"
-	"github.com/influxdb/influxdb/models"
-	"gopkg.in/fatih/pool.v2"
-)
-
-const (
-	writeShardRequestMessage byte = iota + 1
-	writeShardResponseMessage
-	mapShardRequestMessage
-	mapShardResponseMessage
-)
-
-// ShardWriter writes a set of points to a shard.
-type ShardWriter struct {
-	pool    *clientPool
-	timeout time.Duration
-
-	MetaStore interface {
-		Node(id uint64) (ni *meta.NodeInfo, err error)
-	}
-}
-
-// NewShardWriter returns a new instance of ShardWriter.
-func NewShardWriter(timeout time.Duration) *ShardWriter {
-	return &ShardWriter{
-		pool:    newClientPool(),
-		timeout: timeout,
-	}
-}
-
-// WriteShard writes time series points to a shard
-func (w *ShardWriter) WriteShard(shardID, ownerID uint64, points []models.Point) error {
-	c, err := w.dial(ownerID)
-	if err != nil {
-		return err
-	}
-
-	conn, ok := c.(*pool.PoolConn)
-	if !ok {
-		panic("wrong connection type")
-	}
-	defer func(conn net.Conn) {
-		conn.Close() // return to pool
-	}(conn)
-
-	// Build write request.
-	var request WriteShardRequest
-	request.SetShardID(shardID)
-	request.AddPoints(points)
-
-	// Marshal into protocol buffers.
-	buf, err := request.MarshalBinary()
-	if err != nil {
-		return err
-	}
-
-	// Write request.
-	conn.SetWriteDeadline(time.Now().Add(w.timeout))
-	if err := WriteTLV(conn, writeShardRequestMessage, buf); err != nil {
-		conn.MarkUnusable()
-		return err
-	}
-
-	// Read the response.
-	conn.SetReadDeadline(time.Now().Add(w.timeout))
-	_, buf, err = ReadTLV(conn)
-	if err != nil {
-		conn.MarkUnusable()
-		return err
-	}
-
-	// Unmarshal response.
-	var response WriteShardResponse
-	if err := response.UnmarshalBinary(buf); err != nil {
-		return err
-	}
-
-	if response.Code() != 0 {
-		return fmt.Errorf("error code %d: %s", response.Code(), response.Message())
-	}
-
-	return nil
-}
-
-func (w *ShardWriter) dial(nodeID uint64) (net.Conn, error) {
-	// If we don't have a connection pool for that addr yet, create one
-	_, ok := w.pool.getPool(nodeID)
-	if !ok {
-		factory := &connFactory{nodeID: nodeID, clientPool: w.pool, timeout: w.timeout}
-		factory.metaStore = w.MetaStore
-
-		p, err := pool.NewChannelPool(1, 3, factory.dial)
-		if err != nil {
-			return nil, err
-		}
-		w.pool.setPool(nodeID, p)
-	}
-	return w.pool.conn(nodeID)
-}
-
-// Close closes ShardWriter's pool
-func (w *ShardWriter) Close() error {
-	if w.pool == nil {
-		return fmt.Errorf("client already closed")
-	}
-	w.pool.close()
-	w.pool = nil
-	return nil
-}
-
-const (
-	maxConnections = 500
-	maxRetries     = 3
-)
-
-var errMaxConnectionsExceeded = fmt.Errorf("can not exceed max connections of %d", maxConnections)
-
-type connFactory struct {
-	nodeID  uint64
-	timeout time.Duration
-
-	clientPool interface {
-		size() int
-	}
-
-	metaStore interface {
-		Node(id uint64) (ni *meta.NodeInfo, err error)
-	}
-}
-
-func (c *connFactory) dial() (net.Conn, error) {
-	if c.clientPool.size() > maxConnections {
-		return nil, errMaxConnectionsExceeded
-	}
-
-	ni, err := c.metaStore.Node(c.nodeID)
-	if err != nil {
-		return nil, err
-	}
-
-	if ni == nil {
-		return nil, fmt.Errorf("node %d does not exist", c.nodeID)
-	}
-
-	conn, err := net.DialTimeout("tcp", ni.Host, c.timeout)
-	if err != nil {
-		return nil, err
-	}
-
-	// Write a marker byte for cluster messages.
-	_, err = conn.Write([]byte{MuxHeader})
-	if err != nil {
-		conn.Close()
-		return nil, err
-	}
-
-	return conn, nil
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/cluster/shard_writer_test.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/cluster/shard_writer_test.go
deleted file mode 100644
index 671342349..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/cluster/shard_writer_test.go
+++ /dev/null
@@ -1,186 +0,0 @@
-package cluster_test
-
-import (
-	"net"
-	"strings"
-	"testing"
-	"time"
-
-	"github.com/influxdb/influxdb/cluster"
-	"github.com/influxdb/influxdb/models"
-)
-
-// Ensure the shard writer can successful write a single request.
-func TestShardWriter_WriteShard_Success(t *testing.T) {
-	ts := newTestWriteService(writeShardSuccess)
-	s := cluster.NewService(cluster.Config{})
-	s.Listener = ts.muxln
-	s.TSDBStore = ts
-	if err := s.Open(); err != nil {
-		t.Fatal(err)
-	}
-	defer s.Close()
-	defer ts.Close()
-
-	w := cluster.NewShardWriter(time.Minute)
-	w.MetaStore = &metaStore{host: ts.ln.Addr().String()}
-
-	// Build a single point.
-	now := time.Now()
-	var points []models.Point
-	points = append(points, models.MustNewPoint("cpu", models.Tags{"host": "server01"}, map[string]interface{}{"value": int64(100)}, now))
-
-	// Write to shard and close.
-	if err := w.WriteShard(1, 2, points); err != nil {
-		t.Fatal(err)
-	} else if err := w.Close(); err != nil {
-		t.Fatal(err)
-	}
-
-	// Validate response.
-	responses, err := ts.ResponseN(1)
-	if err != nil {
-		t.Fatal(err)
-	} else if responses[0].shardID != 1 {
-		t.Fatalf("unexpected shard id: %d", responses[0].shardID)
-	}
-
-	// Validate point.
-	if p := responses[0].points[0]; p.Name() != "cpu" {
-		t.Fatalf("unexpected name: %s", p.Name())
-	} else if p.Fields()["value"] != int64(100) {
-		t.Fatalf("unexpected 'value' field: %d", p.Fields()["value"])
-	} else if p.Tags()["host"] != "server01" {
-		t.Fatalf("unexpected 'host' tag: %s", p.Tags()["host"])
-	} else if p.Time().UnixNano() != now.UnixNano() {
-		t.Fatalf("unexpected time: %s", p.Time())
-	}
-}
-
-// Ensure the shard writer can successful write a multiple requests.
-func TestShardWriter_WriteShard_Multiple(t *testing.T) {
-	ts := newTestWriteService(writeShardSuccess)
-	s := cluster.NewService(cluster.Config{})
-	s.Listener = ts.muxln
-	s.TSDBStore = ts
-	if err := s.Open(); err != nil {
-		t.Fatal(err)
-	}
-	defer s.Close()
-	defer ts.Close()
-
-	w := cluster.NewShardWriter(time.Minute)
-	w.MetaStore = &metaStore{host: ts.ln.Addr().String()}
-
-	// Build a single point.
-	now := time.Now()
-	var points []models.Point
-	points = append(points, models.MustNewPoint("cpu", models.Tags{"host": "server01"}, map[string]interface{}{"value": int64(100)}, now))
-
-	// Write to shard twice and close.
-	if err := w.WriteShard(1, 2, points); err != nil {
-		t.Fatal(err)
-	} else if err := w.WriteShard(1, 2, points); err != nil {
-		t.Fatal(err)
-	} else if err := w.Close(); err != nil {
-		t.Fatal(err)
-	}
-
-	// Validate response.
-	responses, err := ts.ResponseN(1)
-	if err != nil {
-		t.Fatal(err)
-	} else if responses[0].shardID != 1 {
-		t.Fatalf("unexpected shard id: %d", responses[0].shardID)
-	}
-
-	// Validate point.
-	if p := responses[0].points[0]; p.Name() != "cpu" {
-		t.Fatalf("unexpected name: %s", p.Name())
-	} else if p.Fields()["value"] != int64(100) {
-		t.Fatalf("unexpected 'value' field: %d", p.Fields()["value"])
-	} else if p.Tags()["host"] != "server01" {
-		t.Fatalf("unexpected 'host' tag: %s", p.Tags()["host"])
-	} else if p.Time().UnixNano() != now.UnixNano() {
-		t.Fatalf("unexpected time: %s", p.Time())
-	}
-}
-
-// Ensure the shard writer returns an error when the server fails to accept the write.
-func TestShardWriter_WriteShard_Error(t *testing.T) {
-	ts := newTestWriteService(writeShardFail)
-	s := cluster.NewService(cluster.Config{})
-	s.Listener = ts.muxln
-	s.TSDBStore = ts
-	if err := s.Open(); err != nil {
-		t.Fatal(err)
-	}
-	defer s.Close()
-	defer ts.Close()
-
-	w := cluster.NewShardWriter(time.Minute)
-	w.MetaStore = &metaStore{host: ts.ln.Addr().String()}
-	now := time.Now()
-
-	shardID := uint64(1)
-	ownerID := uint64(2)
-	var points []models.Point
-	points = append(points, models.MustNewPoint(
-		"cpu", models.Tags{"host": "server01"}, map[string]interface{}{"value": int64(100)}, now,
-	))
-
-	if err := w.WriteShard(shardID, ownerID, points); err == nil || err.Error() != "error code 1: write shard 1: failed to write" {
-		t.Fatalf("unexpected error: %v", err)
-	}
-}
-
-// Ensure the shard writer returns an error when dialing times out.
-func TestShardWriter_Write_ErrDialTimeout(t *testing.T) {
-	ts := newTestWriteService(writeShardSuccess)
-	s := cluster.NewService(cluster.Config{})
-	s.Listener = ts.muxln
-	s.TSDBStore = ts
-	if err := s.Open(); err != nil {
-		t.Fatal(err)
-	}
-	defer s.Close()
-	defer ts.Close()
-
-	w := cluster.NewShardWriter(time.Nanosecond)
-	w.MetaStore = &metaStore{host: ts.ln.Addr().String()}
-	now := time.Now()
-
-	shardID := uint64(1)
-	ownerID := uint64(2)
-	var points []models.Point
-	points = append(points, models.MustNewPoint(
-		"cpu", models.Tags{"host": "server01"}, map[string]interface{}{"value": int64(100)}, now,
-	))
-
-	if err, exp := w.WriteShard(shardID, ownerID, points), "i/o timeout"; err == nil || !strings.Contains(err.Error(), exp) {
-		t.Fatalf("expected error %v, to contain %s", err, exp)
-	}
-}
-
-// Ensure the shard writer returns an error when reading times out.
-func TestShardWriter_Write_ErrReadTimeout(t *testing.T) {
-	ln, err := net.Listen("tcp", "127.0.0.1:0")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	w := cluster.NewShardWriter(time.Millisecond)
-	w.MetaStore = &metaStore{host: ln.Addr().String()}
-	now := time.Now()
-
-	shardID := uint64(1)
-	ownerID := uint64(2)
-	var points []models.Point
-	points = append(points, models.MustNewPoint(
-		"cpu", models.Tags{"host": "server01"}, map[string]interface{}{"value": int64(100)}, now,
-	))
-
-	if err := w.WriteShard(shardID, ownerID, points); err == nil || !strings.Contains(err.Error(), "i/o timeout") {
-		t.Fatalf("unexpected error: %s", err)
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influx/cli/cli.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influx/cli/cli.go
deleted file mode 100644
index 4ce49cf5d..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influx/cli/cli.go
+++ /dev/null
@@ -1,757 +0,0 @@
-package cli
-
-import (
-	"encoding/csv"
-	"encoding/json"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"net"
-	"net/url"
-	"os"
-	"os/user"
-	"path/filepath"
-	"sort"
-	"strconv"
-	"strings"
-	"text/tabwriter"
-
-	"github.com/influxdb/influxdb/client"
-	"github.com/influxdb/influxdb/cluster"
-	"github.com/influxdb/influxdb/importer/v8"
-	"github.com/peterh/liner"
-)
-
-const (
-	noTokenMsg = "Visit https://enterprise.influxdata.com to register for updates, InfluxDB server management, and monitoring.\n"
-)
-
-type CommandLine struct {
-	Client           *client.Client
-	Line             *liner.State
-	Host             string
-	Port             int
-	Username         string
-	Password         string
-	Database         string
-	Ssl              bool
-	RetentionPolicy  string
-	ClientVersion    string
-	ServerVersion    string
-	Pretty           bool   // controls pretty print for json
-	Format           string // controls the output format.  Valid values are json, csv, or column
-	Precision        string
-	WriteConsistency string
-	Execute          string
-	ShowVersion      bool
-	Import           bool
-	PPS              int // Controls how many points per second the import will allow via throttling
-	Path             string
-	Compressed       bool
-}
-
-func New(version string) *CommandLine {
-	return &CommandLine{ClientVersion: version}
-}
-
-func (c *CommandLine) Run() {
-	var promptForPassword bool
-	// determine if they set the password flag but provided no value
-	for _, v := range os.Args {
-		v = strings.ToLower(v)
-		if (strings.HasPrefix(v, "-password") || strings.HasPrefix(v, "--password")) && c.Password == "" {
-			promptForPassword = true
-			break
-		}
-	}
-
-	c.Line = liner.NewLiner()
-	defer c.Line.Close()
-
-	if promptForPassword {
-		p, e := c.Line.PasswordPrompt("password: ")
-		if e != nil {
-			fmt.Println("Unable to parse password.")
-		} else {
-			c.Password = p
-		}
-	}
-
-	if err := c.Connect(""); err != nil {
-		fmt.Fprintf(os.Stderr,
-			"Failed to connect to %s\nPlease check your connection settings and ensure 'influxd' is running.\n",
-			c.Client.Addr())
-		return
-	}
-
-	if c.Execute == "" && !c.Import {
-		token, err := c.DatabaseToken()
-		if err != nil {
-			fmt.Fprintf(os.Stderr, "Failed to check token: %s\n", err.Error())
-			return
-		}
-		if token == "" {
-			fmt.Printf(noTokenMsg)
-		}
-		fmt.Printf("Connected to %s version %s\n", c.Client.Addr(), c.ServerVersion)
-	}
-
-	if c.Execute != "" {
-		// Modify precision before executing query
-		c.SetPrecision(c.Precision)
-		if err := c.ExecuteQuery(c.Execute); err != nil {
-			c.Line.Close()
-			os.Exit(1)
-		}
-		c.Line.Close()
-		os.Exit(0)
-	}
-
-	if c.Import {
-		path := net.JoinHostPort(c.Host, strconv.Itoa(c.Port))
-		u, e := client.ParseConnectionString(path, c.Ssl)
-		if e != nil {
-			fmt.Println(e)
-			return
-		}
-
-		config := v8.NewConfig()
-		config.Username = c.Username
-		config.Password = c.Password
-		config.Precision = "ns"
-		config.WriteConsistency = "any"
-		config.Path = c.Path
-		config.Version = c.ClientVersion
-		config.URL = u
-		config.Compressed = c.Compressed
-		config.PPS = c.PPS
-		config.Precision = c.Precision
-
-		i := v8.NewImporter(config)
-		if err := i.Import(); err != nil {
-			fmt.Printf("ERROR: %s\n", err)
-			c.Line.Close()
-			os.Exit(1)
-		}
-		c.Line.Close()
-		os.Exit(0)
-	}
-
-	c.Version()
-
-	var historyFile string
-	usr, err := user.Current()
-	// Only load history if we can get the user
-	if err == nil {
-		historyFile = filepath.Join(usr.HomeDir, ".influx_history")
-
-		if f, err := os.Open(historyFile); err == nil {
-			c.Line.ReadHistory(f)
-			f.Close()
-		}
-	}
-
-	for {
-		l, e := c.Line.Prompt("> ")
-		if e != nil {
-			break
-		}
-		if c.ParseCommand(l) {
-			// write out the history
-			if len(historyFile) > 0 {
-				c.Line.AppendHistory(l)
-				if f, err := os.Create(historyFile); err == nil {
-					c.Line.WriteHistory(f)
-					f.Close()
-				}
-			}
-		} else {
-			break // exit main loop
-		}
-	}
-}
-
-func (c *CommandLine) ParseCommand(cmd string) bool {
-	lcmd := strings.TrimSpace(strings.ToLower(cmd))
-
-	split := strings.Split(lcmd, " ")
-	var tokens []string
-	for _, token := range split {
-		if token != "" {
-			tokens = append(tokens, token)
-		}
-	}
-
-	if len(tokens) > 0 {
-		switch tokens[0] {
-		case "":
-			break
-		case "exit":
-			// signal the program to exit
-			return false
-		case "gopher":
-			c.gopher()
-		case "connect":
-			c.Connect(cmd)
-		case "auth":
-			c.SetAuth(cmd)
-		case "help":
-			c.help()
-		case "history":
-			c.history()
-		case "format":
-			c.SetFormat(cmd)
-		case "precision":
-			c.SetPrecision(cmd)
-		case "consistency":
-			c.SetWriteConsistency(cmd)
-		case "settings":
-			c.Settings()
-		case "pretty":
-			c.Pretty = !c.Pretty
-			if c.Pretty {
-				fmt.Println("Pretty print enabled")
-			} else {
-				fmt.Println("Pretty print disabled")
-			}
-		case "use":
-			c.use(cmd)
-		case "insert":
-			c.Insert(cmd)
-		default:
-			c.ExecuteQuery(cmd)
-		}
-	}
-	return true
-}
-
-// Connect connects client to a server
-func (c *CommandLine) Connect(cmd string) error {
-	var cl *client.Client
-	var u url.URL
-
-	// Remove the "connect" keyword if it exists
-	path := strings.TrimSpace(strings.Replace(cmd, "connect", "", -1))
-
-	// If they didn't provide a connection string, use the current settings
-	if path == "" {
-		path = net.JoinHostPort(c.Host, strconv.Itoa(c.Port))
-	}
-
-	var e error
-	u, e = client.ParseConnectionString(path, c.Ssl)
-	if e != nil {
-		return e
-	}
-
-	config := client.NewConfig()
-	config.URL = u
-	config.Username = c.Username
-	config.Password = c.Password
-	config.UserAgent = "InfluxDBShell/" + c.ClientVersion
-	config.Precision = c.Precision
-	cl, err := client.NewClient(config)
-	if err != nil {
-		return fmt.Errorf("Could not create client %s", err)
-	}
-	c.Client = cl
-	if _, v, e := c.Client.Ping(); e != nil {
-		return fmt.Errorf("Failed to connect to %s\n", c.Client.Addr())
-	} else {
-		c.ServerVersion = v
-	}
-
-	_, c.ServerVersion, _ = c.Client.Ping()
-
-	return nil
-}
-
-func (c *CommandLine) SetAuth(cmd string) {
-	// If they pass in the entire command, we should parse it
-	// auth <username> <password>
-	args := strings.Fields(cmd)
-	if len(args) == 3 {
-		args = args[1:]
-	} else {
-		args = []string{}
-	}
-
-	if len(args) == 2 {
-		c.Username = args[0]
-		c.Password = args[1]
-	} else {
-		u, e := c.Line.Prompt("username: ")
-		if e != nil {
-			fmt.Printf("Unable to process input: %s", e)
-			return
-		}
-		c.Username = strings.TrimSpace(u)
-		p, e := c.Line.PasswordPrompt("password: ")
-		if e != nil {
-			fmt.Printf("Unable to process input: %s", e)
-			return
-		}
-		c.Password = p
-	}
-
-	// Update the client as well
-	c.Client.SetAuth(c.Username, c.Password)
-}
-
-func (c *CommandLine) use(cmd string) {
-	args := strings.Split(strings.TrimSuffix(strings.TrimSpace(cmd), ";"), " ")
-	if len(args) != 2 {
-		fmt.Printf("Could not parse database name from %q.\n", cmd)
-		return
-	}
-	d := args[1]
-	c.Database = d
-	fmt.Printf("Using database %s\n", d)
-}
-
-func (c *CommandLine) SetPrecision(cmd string) {
-	// Remove the "precision" keyword if it exists
-	cmd = strings.TrimSpace(strings.Replace(cmd, "precision", "", -1))
-	// normalize cmd
-	cmd = strings.ToLower(cmd)
-
-	switch cmd {
-	case "h", "m", "s", "ms", "u", "ns":
-		c.Precision = cmd
-		c.Client.SetPrecision(c.Precision)
-	case "rfc3339":
-		c.Precision = ""
-		c.Client.SetPrecision(c.Precision)
-	default:
-		fmt.Printf("Unknown precision %q. Please use rfc3339, h, m, s, ms, u or ns.\n", cmd)
-	}
-}
-
-func (c *CommandLine) SetFormat(cmd string) {
-	// Remove the "format" keyword if it exists
-	cmd = strings.TrimSpace(strings.Replace(cmd, "format", "", -1))
-	// normalize cmd
-	cmd = strings.ToLower(cmd)
-
-	switch cmd {
-	case "json", "csv", "column":
-		c.Format = cmd
-	default:
-		fmt.Printf("Unknown format %q. Please use json, csv, or column.\n", cmd)
-	}
-}
-
-func (c *CommandLine) SetWriteConsistency(cmd string) {
-	// Remove the "consistency" keyword if it exists
-	cmd = strings.TrimSpace(strings.Replace(cmd, "consistency", "", -1))
-	// normalize cmd
-	cmd = strings.ToLower(cmd)
-
-	_, err := cluster.ParseConsistencyLevel(cmd)
-	if err != nil {
-		fmt.Printf("Unknown consistency level %q. Please use any, one, quorum, or all.\n", cmd)
-		return
-	}
-	c.WriteConsistency = cmd
-}
-
-// isWhitespace returns true if the rune is a space, tab, or newline.
-func isWhitespace(ch rune) bool { return ch == ' ' || ch == '\t' || ch == '\n' }
-
-// isLetter returns true if the rune is a letter.
-func isLetter(ch rune) bool { return (ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z') }
-
-// isDigit returns true if the rune is a digit.
-func isDigit(ch rune) bool { return (ch >= '0' && ch <= '9') }
-
-// isIdentFirstChar returns true if the rune can be used as the first char in an unquoted identifer.
-func isIdentFirstChar(ch rune) bool { return isLetter(ch) || ch == '_' }
-
-// isIdentChar returns true if the rune can be used in an unquoted identifier.
-func isNotIdentChar(ch rune) bool { return !(isLetter(ch) || isDigit(ch) || ch == '_') }
-
-func parseUnquotedIdentifier(stmt string) (string, string) {
-	if fields := strings.FieldsFunc(stmt, isNotIdentChar); len(fields) > 0 {
-		return fields[0], strings.TrimPrefix(stmt, fields[0])
-	}
-	return "", stmt
-}
-
-func parseDoubleQuotedIdentifier(stmt string) (string, string) {
-	escapeNext := false
-	fields := strings.FieldsFunc(stmt, func(ch rune) bool {
-		if ch == '\\' {
-			escapeNext = true
-		} else if ch == '"' {
-			if !escapeNext {
-				return true
-			}
-			escapeNext = false
-		}
-		return false
-	})
-	if len(fields) > 0 {
-		return fields[0], strings.TrimPrefix(stmt, "\""+fields[0]+"\"")
-	}
-	return "", stmt
-}
-
-func parseNextIdentifier(stmt string) (ident, remainder string) {
-	if len(stmt) > 0 {
-		switch {
-		case isWhitespace(rune(stmt[0])):
-			return parseNextIdentifier(stmt[1:])
-		case isIdentFirstChar(rune(stmt[0])):
-			return parseUnquotedIdentifier(stmt)
-		case stmt[0] == '"':
-			return parseDoubleQuotedIdentifier(stmt)
-		}
-	}
-	return "", stmt
-}
-
-func (c *CommandLine) parseInto(stmt string) string {
-	ident, stmt := parseNextIdentifier(stmt)
-	if strings.HasPrefix(stmt, ".") {
-		c.Database = ident
-		fmt.Printf("Using database %s\n", c.Database)
-		ident, stmt = parseNextIdentifier(stmt[1:])
-	}
-	if strings.HasPrefix(stmt, " ") {
-		c.RetentionPolicy = ident
-		fmt.Printf("Using retention policy %s\n", c.RetentionPolicy)
-		return stmt[1:]
-	}
-	return stmt
-}
-
-func (c *CommandLine) Insert(stmt string) error {
-	i, point := parseNextIdentifier(stmt)
-	if !strings.EqualFold(i, "insert") {
-		fmt.Printf("ERR: found %s, expected INSERT\n", i)
-		return nil
-	}
-	if i, r := parseNextIdentifier(point); strings.EqualFold(i, "into") {
-		point = c.parseInto(r)
-	}
-	_, err := c.Client.Write(client.BatchPoints{
-		Points: []client.Point{
-			client.Point{Raw: point},
-		},
-		Database:         c.Database,
-		RetentionPolicy:  c.RetentionPolicy,
-		Precision:        "n",
-		WriteConsistency: c.WriteConsistency,
-	})
-	if err != nil {
-		fmt.Printf("ERR: %s\n", err)
-		if c.Database == "" {
-			fmt.Println("Note: error may be due to not setting a database or retention policy.")
-			fmt.Println(`Please set a database with the command "use <database>" or`)
-			fmt.Println("INSERT INTO <database>.<retention-policy> <point>")
-		}
-		return err
-	}
-	return nil
-}
-
-func (c *CommandLine) ExecuteQuery(query string) error {
-	response, err := c.Client.Query(client.Query{Command: query, Database: c.Database})
-	if err != nil {
-		fmt.Printf("ERR: %s\n", err)
-		return err
-	}
-	c.FormatResponse(response, os.Stdout)
-	if err := response.Error(); err != nil {
-		fmt.Printf("ERR: %s\n", response.Error())
-		if c.Database == "" {
-			fmt.Println("Warning: It is possible this error is due to not setting a database.")
-			fmt.Println(`Please set a database with the command "use <database>".`)
-		}
-		return err
-	}
-	return nil
-}
-
-func (c *CommandLine) DatabaseToken() (string, error) {
-	response, err := c.Client.Query(client.Query{Command: "SHOW DIAGNOSTICS for 'registration'"})
-	if err != nil {
-		return "", err
-	}
-	if response.Error() != nil || len((*response).Results[0].Series) == 0 {
-		return "", nil
-	}
-
-	// Look for position of "token" column.
-	for i, s := range (*response).Results[0].Series[0].Columns {
-		if s == "token" {
-			return (*response).Results[0].Series[0].Values[0][i].(string), nil
-		}
-	}
-	return "", nil
-}
-
-func (c *CommandLine) FormatResponse(response *client.Response, w io.Writer) {
-	switch c.Format {
-	case "json":
-		c.writeJSON(response, w)
-	case "csv":
-		c.writeCSV(response, w)
-	case "column":
-		c.writeColumns(response, w)
-	default:
-		fmt.Fprintf(w, "Unknown output format %q.\n", c.Format)
-	}
-}
-
-func (c *CommandLine) writeJSON(response *client.Response, w io.Writer) {
-	var data []byte
-	var err error
-	if c.Pretty {
-		data, err = json.MarshalIndent(response, "", "    ")
-	} else {
-		data, err = json.Marshal(response)
-	}
-	if err != nil {
-		fmt.Fprintf(w, "Unable to parse json: %s\n", err)
-		return
-	}
-	fmt.Fprintln(w, string(data))
-}
-
-func (c *CommandLine) writeCSV(response *client.Response, w io.Writer) {
-	csvw := csv.NewWriter(w)
-	for _, result := range response.Results {
-		// Create a tabbed writer for each result as they won't always line up
-		rows := c.formatResults(result, "\t")
-		for _, r := range rows {
-			csvw.Write(strings.Split(r, "\t"))
-		}
-		csvw.Flush()
-	}
-}
-
-func (c *CommandLine) writeColumns(response *client.Response, w io.Writer) {
-	for _, result := range response.Results {
-		// Create a tabbed writer for each result a they won't always line up
-		w := new(tabwriter.Writer)
-		w.Init(os.Stdout, 0, 8, 1, '\t', 0)
-		csv := c.formatResults(result, "\t")
-		for _, r := range csv {
-			fmt.Fprintln(w, r)
-		}
-		w.Flush()
-	}
-}
-
-// formatResults will behave differently if you are formatting for columns or csv
-func (c *CommandLine) formatResults(result client.Result, separator string) []string {
-	rows := []string{}
-	// Create a tabbed writer for each result a they won't always line up
-	for i, row := range result.Series {
-		// gather tags
-		tags := []string{}
-		for k, v := range row.Tags {
-			tags = append(tags, fmt.Sprintf("%s=%s", k, v))
-			sort.Strings(tags)
-		}
-
-		columnNames := []string{}
-
-		// Only put name/tags in a column if format is csv
-		if c.Format == "csv" {
-			if len(tags) > 0 {
-				columnNames = append([]string{"tags"}, columnNames...)
-			}
-
-			if row.Name != "" {
-				columnNames = append([]string{"name"}, columnNames...)
-			}
-		}
-
-		for _, column := range row.Columns {
-			columnNames = append(columnNames, column)
-		}
-
-		// Output a line separator if we have more than one set or results and format is column
-		if i > 0 && c.Format == "column" {
-			rows = append(rows, "")
-		}
-
-		// If we are column format, we break out the name/tag to seperate lines
-		if c.Format == "column" {
-			if row.Name != "" {
-				n := fmt.Sprintf("name: %s", row.Name)
-				rows = append(rows, n)
-				if len(tags) == 0 {
-					l := strings.Repeat("-", len(n))
-					rows = append(rows, l)
-				}
-			}
-			if len(tags) > 0 {
-				t := fmt.Sprintf("tags: %s", (strings.Join(tags, ", ")))
-				rows = append(rows, t)
-			}
-		}
-
-		rows = append(rows, strings.Join(columnNames, separator))
-
-		// if format is column, break tags to their own line/format
-		if c.Format == "column" && len(tags) > 0 {
-			lines := []string{}
-			for _, columnName := range columnNames {
-				lines = append(lines, strings.Repeat("-", len(columnName)))
-			}
-			rows = append(rows, strings.Join(lines, separator))
-		}
-
-		for _, v := range row.Values {
-			var values []string
-			if c.Format == "csv" {
-				if row.Name != "" {
-					values = append(values, row.Name)
-				}
-				if len(tags) > 0 {
-					values = append(values, strings.Join(tags, ","))
-				}
-			}
-
-			for _, vv := range v {
-				values = append(values, interfaceToString(vv))
-			}
-			rows = append(rows, strings.Join(values, separator))
-		}
-		// Outout a line separator if in column format
-		if c.Format == "column" {
-			rows = append(rows, "")
-		}
-	}
-	return rows
-}
-
-func interfaceToString(v interface{}) string {
-	switch t := v.(type) {
-	case nil:
-		return ""
-	case bool:
-		return fmt.Sprintf("%v", v)
-	case int, int8, int16, int32, int64, uint, uint8, uint16, uint32, uint64, uintptr:
-		return fmt.Sprintf("%d", t)
-	case float32, float64:
-		return fmt.Sprintf("%v", t)
-	default:
-		return fmt.Sprintf("%v", t)
-	}
-}
-
-func (c *CommandLine) Settings() {
-	w := new(tabwriter.Writer)
-	w.Init(os.Stdout, 0, 8, 1, '\t', 0)
-	if c.Port > 0 {
-		fmt.Fprintf(w, "Host\t%s:%d\n", c.Host, c.Port)
-	} else {
-		fmt.Fprintf(w, "Host\t%s\n", c.Host)
-	}
-	fmt.Fprintf(w, "Username\t%s\n", c.Username)
-	fmt.Fprintf(w, "Database\t%s\n", c.Database)
-	fmt.Fprintf(w, "Pretty\t%v\n", c.Pretty)
-	fmt.Fprintf(w, "Format\t%s\n", c.Format)
-	fmt.Fprintf(w, "Write Consistency\t%s\n", c.WriteConsistency)
-	fmt.Fprintln(w)
-	w.Flush()
-}
-
-func (c *CommandLine) help() {
-	fmt.Println(`Usage:
-        connect <host:port>   connect to another node
-        auth                  prompt for username and password
-        pretty                toggle pretty print
-        use <db_name>         set current databases
-        format <format>       set the output format: json, csv, or column
-        precision <format>    set the timestamp format: h,m,s,ms,u,ns
-        consistency <level>   set write consistency level: any, one, quorum, or all
-        settings              output the current settings for the shell
-        exit                  quit the influx shell
-
-        show databases        show database names
-        show series           show series information
-        show measurements     show measurement information
-        show tag keys         show tag key information
-        show tag values       show tag value information
-
-        a full list of influxql commands can be found at:
-        https://influxdb.com/docs/v0.9/query_language/spec.html
-`)
-}
-
-func (c *CommandLine) history() {
-	usr, err := user.Current()
-	// Only load history if we can get the user
-	if err == nil {
-		historyFile := filepath.Join(usr.HomeDir, ".influx_history")
-		if history, err := ioutil.ReadFile(historyFile); err == nil {
-			fmt.Print(string(history))
-		}
-	}
-}
-
-func (c *CommandLine) gopher() {
-	fmt.Println(`
-                                          .-::-::://:-::-    .:/++/'
-                                     '://:-''/oo+//++o+/.://o-    ./+:
-                                  .:-.    '++-         .o/ '+yydhy'  o-
-                               .:/.      .h:         :osoys  .smMN-  :/
-                            -/:.'        s-         /MMMymh.   '/y/  s'
-                         -+s:''''        d          -mMMms//     '-/o:
-                       -/++/++/////:.    o:          '... s-        :s.
-                     :+-+s-'       ':/'  's-             /+          'o:
-                   '+-'o:        /ydhsh.  '//.        '-o-             o-
-                  .y. o:        .MMMdm+y    ':+++:::/+:.'               s:
-                .-h/  y-        'sdmds'h -+ydds:::-.'                   'h.
-             .//-.d'  o:          '.' 'dsNMMMNh:.:++'                    :y
-            +y.  'd   's.            .s:mddds:     ++                     o/
-           'N-  odd    'o/.       './o-s-'   .---+++'                      o-
-           'N'  yNd      .://:/:::::. -s   -+/s/./s'                       'o/'
-            so'  .h         ''''       ////s: '+. .s                         +y'
-             os/-.y'                       's' 'y::+                          +d'
-               '.:o/                        -+:-:.'                            so.---.'
-                   o'                                                          'd-.''/s'
-                   .s'                                                          :y.''.y
-                    -s                                                           mo:::'
-                     ::                                                          yh
-                      //                                      ''''               /M'
-                       o+                                    .s///:/.            'N:
-                        :+                                   /:    -s'            ho
-                         's-                               -/s/:+/.+h'            +h
-                           ys'                            ':'    '-.              -d
-                            oh                                                    .h
-                             /o                                                   .s
-                              s.                                                  .h
-                              -y                                                  .d
-                               m/                                                 -h
-                               +d                                                 /o
-                               'N-                                                y:
-                                h:                                                m.
-                                s-                                               -d
-                                o-                                               s+
-                                +-                                              'm'
-                                s/                                              oo--.
-                                y-                                             /s  ':+'
-                                s'                                           'od--' .d:
-                                -+                                         ':o: ':+-/+
-                                 y-                                      .:+-      '
-                                //o-                                 '.:+/.
-                                .-:+/'                           ''-/+/.
-                                    ./:'                    ''.:o+/-'
-                                      .+o:/:/+-'      ''.-+ooo/-'
-                                         o:   -h///++////-.
-                                        /:   .o/
-                                       //+  'y
-                                       ./sooy.
-
-`)
-}
-
-func (c *CommandLine) Version() {
-	fmt.Println("InfluxDB shell " + c.ClientVersion)
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influx/cli/cli_test.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influx/cli/cli_test.go
deleted file mode 100644
index 00755d123..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influx/cli/cli_test.go
+++ /dev/null
@@ -1,238 +0,0 @@
-package cli_test
-
-import (
-	"encoding/json"
-	"net/http"
-	"net/http/httptest"
-	"net/url"
-	"testing"
-
-	"github.com/influxdb/influxdb/client"
-	"github.com/influxdb/influxdb/cmd/influx/cli"
-)
-
-func TestParseCommand_CommandsExist(t *testing.T) {
-	t.Parallel()
-	c := cli.CommandLine{}
-	tests := []struct {
-		cmd string
-	}{
-		{cmd: "gopher"},
-		{cmd: "connect"},
-		{cmd: "help"},
-		{cmd: "pretty"},
-		{cmd: "use"},
-		{cmd: ""}, // test that a blank command just returns
-	}
-	for _, test := range tests {
-		if !c.ParseCommand(test.cmd) {
-			t.Fatalf(`Command failed for %q.`, test.cmd)
-		}
-	}
-}
-
-func TestParseCommand_TogglePretty(t *testing.T) {
-	t.Parallel()
-	c := cli.CommandLine{}
-	if c.Pretty {
-		t.Fatalf(`Pretty should be false.`)
-	}
-	c.ParseCommand("pretty")
-	if !c.Pretty {
-		t.Fatalf(`Pretty should be true.`)
-	}
-	c.ParseCommand("pretty")
-	if c.Pretty {
-		t.Fatalf(`Pretty should be false.`)
-	}
-}
-
-func TestParseCommand_Exit(t *testing.T) {
-	t.Parallel()
-	c := cli.CommandLine{}
-	tests := []struct {
-		cmd string
-	}{
-		{cmd: "exit"},
-		{cmd: " exit"},
-		{cmd: "exit "},
-		{cmd: "Exit "},
-	}
-
-	for _, test := range tests {
-		if c.ParseCommand(test.cmd) {
-			t.Fatalf(`Command "exit" failed for %q.`, test.cmd)
-		}
-	}
-}
-
-func TestParseCommand_Use(t *testing.T) {
-	t.Parallel()
-	c := cli.CommandLine{}
-	tests := []struct {
-		cmd string
-	}{
-		{cmd: "use db"},
-		{cmd: " use db"},
-		{cmd: "use db "},
-		{cmd: "use db;"},
-		{cmd: "use db; "},
-		{cmd: "Use db"},
-	}
-
-	for _, test := range tests {
-		if !c.ParseCommand(test.cmd) {
-			t.Fatalf(`Command "use" failed for %q.`, test.cmd)
-		}
-
-		if c.Database != "db" {
-			t.Fatalf(`Command "use" changed database to %q. Expected db`, c.Database)
-		}
-	}
-}
-
-func TestParseCommand_Consistency(t *testing.T) {
-	t.Parallel()
-	c := cli.CommandLine{}
-	tests := []struct {
-		cmd string
-	}{
-		{cmd: "consistency one"},
-		{cmd: " consistency one"},
-		{cmd: "consistency one "},
-		{cmd: "consistency one;"},
-		{cmd: "consistency one; "},
-		{cmd: "Consistency one"},
-	}
-
-	for _, test := range tests {
-		if !c.ParseCommand(test.cmd) {
-			t.Fatalf(`Command "consistency" failed for %q.`, test.cmd)
-		}
-
-		if c.WriteConsistency != "one" {
-			t.Fatalf(`Command "consistency" changed consistency to %q. Expected one`, c.WriteConsistency)
-		}
-	}
-}
-
-func TestParseCommand_Insert(t *testing.T) {
-	t.Parallel()
-	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		var data client.Response
-		w.WriteHeader(http.StatusNoContent)
-		_ = json.NewEncoder(w).Encode(data)
-	}))
-	defer ts.Close()
-
-	u, _ := url.Parse(ts.URL)
-	config := client.Config{URL: *u}
-	c, err := client.NewClient(config)
-	if err != nil {
-		t.Fatalf("unexpected error.  expected %v, actual %v", nil, err)
-	}
-	m := cli.CommandLine{Client: c}
-
-	tests := []struct {
-		cmd string
-	}{
-		{cmd: "INSERT cpu,host=serverA,region=us-west value=1.0"},
-		{cmd: " INSERT cpu,host=serverA,region=us-west value=1.0"},
-		{cmd: "INSERT   cpu,host=serverA,region=us-west value=1.0"},
-		{cmd: "insert cpu,host=serverA,region=us-west    value=1.0    "},
-		{cmd: "insert"},
-		{cmd: "Insert "},
-		{cmd: "insert c"},
-		{cmd: "insert int"},
-	}
-
-	for _, test := range tests {
-		if !m.ParseCommand(test.cmd) {
-			t.Fatalf(`Command "insert" failed for %q.`, test.cmd)
-		}
-	}
-}
-
-func TestParseCommand_InsertInto(t *testing.T) {
-	t.Parallel()
-	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		var data client.Response
-		w.WriteHeader(http.StatusNoContent)
-		_ = json.NewEncoder(w).Encode(data)
-	}))
-	defer ts.Close()
-
-	u, _ := url.Parse(ts.URL)
-	config := client.Config{URL: *u}
-	c, err := client.NewClient(config)
-	if err != nil {
-		t.Fatalf("unexpected error.  expected %v, actual %v", nil, err)
-	}
-	m := cli.CommandLine{Client: c}
-
-	tests := []struct {
-		cmd, db, rp string
-	}{
-		{
-			cmd: `INSERT INTO test cpu,host=serverA,region=us-west value=1.0`,
-			db:  "",
-			rp:  "test",
-		},
-		{
-			cmd: ` INSERT INTO .test cpu,host=serverA,region=us-west value=1.0`,
-			db:  "",
-			rp:  "test",
-		},
-		{
-			cmd: `INSERT INTO   "test test" cpu,host=serverA,region=us-west value=1.0`,
-			db:  "",
-			rp:  "test test",
-		},
-		{
-			cmd: `Insert iNTO test.test cpu,host=serverA,region=us-west value=1.0`,
-			db:  "test",
-			rp:  "test",
-		},
-		{
-			cmd: `insert into "test test" cpu,host=serverA,region=us-west value=1.0`,
-			db:  "test",
-			rp:  "test test",
-		},
-		{
-			cmd: `insert into "d b"."test test" cpu,host=serverA,region=us-west value=1.0`,
-			db:  "d b",
-			rp:  "test test",
-		},
-	}
-
-	for _, test := range tests {
-		if !m.ParseCommand(test.cmd) {
-			t.Fatalf(`Command "insert into" failed for %q.`, test.cmd)
-		}
-		if m.Database != test.db {
-			t.Fatalf(`Command "insert into" db parsing failed, expected: %q, actual: %q`, test.db, m.Database)
-		}
-		if m.RetentionPolicy != test.rp {
-			t.Fatalf(`Command "insert into" rp parsing failed, expected: %q, actual: %q`, test.rp, m.RetentionPolicy)
-		}
-	}
-}
-
-func TestParseCommand_History(t *testing.T) {
-	t.Parallel()
-	c := cli.CommandLine{}
-	tests := []struct {
-		cmd string
-	}{
-		{cmd: "history"},
-		{cmd: " history"},
-		{cmd: "history "},
-		{cmd: "History "},
-	}
-
-	for _, test := range tests {
-		if !c.ParseCommand(test.cmd) {
-			t.Fatalf(`Command "history" failed for %q.`, test.cmd)
-		}
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influx/main.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influx/main.go
deleted file mode 100644
index debaccb17..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influx/main.go
+++ /dev/null
@@ -1,103 +0,0 @@
-package main
-
-import (
-	"flag"
-	"fmt"
-	"os"
-
-	"github.com/influxdb/influxdb/client"
-	"github.com/influxdb/influxdb/cmd/influx/cli"
-)
-
-// These variables are populated via the Go linker.
-var (
-	version = "0.9"
-)
-
-const (
-	// defaultFormat is the default format of the results when issuing queries
-	defaultFormat = "column"
-
-	// defaultPrecision is the default timestamp format of the results when issuing queries
-	defaultPrecision = "ns"
-
-	// defaultPPS is the default points per second that the import will throttle at
-	// by default it's 0, which means it will not throttle
-	defaultPPS = 0
-)
-
-func main() {
-	c := cli.New(version)
-
-	fs := flag.NewFlagSet("InfluxDB shell version "+version, flag.ExitOnError)
-	fs.StringVar(&c.Host, "host", client.DefaultHost, "Influxdb host to connect to.")
-	fs.IntVar(&c.Port, "port", client.DefaultPort, "Influxdb port to connect to.")
-	fs.StringVar(&c.Username, "username", c.Username, "Username to connect to the server.")
-	fs.StringVar(&c.Password, "password", c.Password, `Password to connect to the server.  Leaving blank will prompt for password (--password="").`)
-	fs.StringVar(&c.Database, "database", c.Database, "Database to connect to the server.")
-	fs.BoolVar(&c.Ssl, "ssl", false, "Use https for connecting to cluster.")
-	fs.StringVar(&c.Format, "format", defaultFormat, "Format specifies the format of the server responses:  json, csv, or column.")
-	fs.StringVar(&c.Precision, "precision", defaultPrecision, "Precision specifies the format of the timestamp:  rfc3339,h,m,s,ms,u or ns.")
-	fs.StringVar(&c.WriteConsistency, "consistency", "any", "Set write consistency level: any, one, quorum, or all.")
-	fs.BoolVar(&c.Pretty, "pretty", false, "Turns on pretty print for the json format.")
-	fs.StringVar(&c.Execute, "execute", c.Execute, "Execute command and quit.")
-	fs.BoolVar(&c.ShowVersion, "version", false, "Displays the InfluxDB version.")
-	fs.BoolVar(&c.Import, "import", false, "Import a previous database.")
-	fs.IntVar(&c.PPS, "pps", defaultPPS, "How many points per second the import will allow.  By default it is zero and will not throttle importing.")
-	fs.StringVar(&c.Path, "path", "", "path to the file to import")
-	fs.BoolVar(&c.Compressed, "compressed", false, "set to true if the import file is compressed")
-
-	// Define our own custom usage to print
-	fs.Usage = func() {
-		fmt.Println(`Usage of influx:
-  -version
-       Display the version and exit.
-  -host 'host name'
-       Host to connect to.
-  -port 'port #'
-       Port to connect to.
-  -database 'database name'
-       Database to connect to the server.
-  -password 'password'
-      Password to connect to the server.  Leaving blank will prompt for password (--password '').
-  -username 'username'
-       Username to connect to the server.
-  -ssl
-        Use https for requests.
-  -execute 'command'
-       Execute command and quit.
-  -format 'json|csv|column'
-       Format specifies the format of the server responses:  json, csv, or column.
-  -precision 'rfc3339|h|m|s|ms|u|ns'
-       Precision specifies the format of the timestamp:  rfc3339, h, m, s, ms, u or ns.
-  -consistency 'any|one|quorum|all'
-       Set write consistency level: any, one, quorum, or all
-  -pretty
-       Turns on pretty print for the json format.
-  -import
-       Import a previous database export from file
-  -pps
-       How many points per second the import will allow.  By default it is zero and will not throttle importing.
-  -path
-       Path to file to import
-  -compressed
-       Set to true if the import file is compressed
-
-Examples:
-
-    # Use influx in a non-interactive mode to query the database "metrics" and pretty print json:
-    $ influx -database 'metrics' -execute 'select * from cpu' -format 'json' -pretty
-
-    # Connect to a specific database on startup and set database context:
-    $ influx -database 'metrics' -host 'localhost' -port '8086'
-`)
-	}
-	fs.Parse(os.Args[1:])
-
-	if c.ShowVersion {
-		c.Version()
-		os.Exit(0)
-	}
-
-	c.Run()
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influx_inspect/info.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influx_inspect/info.go
deleted file mode 100644
index 381486b3e..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influx_inspect/info.go
+++ /dev/null
@@ -1,109 +0,0 @@
-package main
-
-import (
-	"encoding/binary"
-	"fmt"
-	"io/ioutil"
-	"log"
-	"os"
-	"path/filepath"
-	"sort"
-	"strings"
-	"text/tabwriter"
-
-	"github.com/influxdb/influxdb/tsdb"
-)
-
-func cmdInfo(path string) {
-	tstore := tsdb.NewStore(filepath.Join(path, "data"))
-	tstore.Logger = log.New(ioutil.Discard, "", log.LstdFlags)
-	tstore.EngineOptions.Config.Dir = filepath.Join(path, "data")
-	tstore.EngineOptions.Config.WALLoggingEnabled = false
-	tstore.EngineOptions.Config.WALDir = filepath.Join(path, "wal")
-	if err := tstore.Open(); err != nil {
-		fmt.Printf("Failed to open dir: %v\n", err)
-		os.Exit(1)
-	}
-
-	size, err := tstore.DiskSize()
-	if err != nil {
-		fmt.Printf("Failed to determine disk usage: %v\n", err)
-	}
-
-	// Summary stats
-	fmt.Printf("Shards: %d, Indexes: %d, Databases: %d, Disk Size: %d, Series: %d\n\n",
-		tstore.ShardN(), tstore.DatabaseIndexN(), len(tstore.Databases()), size, countSeries(tstore))
-
-	tw := tabwriter.NewWriter(os.Stdout, 16, 8, 0, '\t', 0)
-
-	fmt.Fprintln(tw, strings.Join([]string{"Shard", "DB", "Measurement", "Tags [#K/#V]", "Fields [Name:Type]", "Series"}, "\t"))
-
-	shardIDs := tstore.ShardIDs()
-
-	databases := tstore.Databases()
-	sort.Strings(databases)
-
-	for _, db := range databases {
-		index := tstore.DatabaseIndex(db)
-		measurements := index.Measurements()
-		sort.Sort(measurements)
-		for _, m := range measurements {
-			tags := m.TagKeys()
-			tagValues := 0
-			for _, tag := range tags {
-				tagValues += len(m.TagValues(tag))
-			}
-			fields := m.FieldNames()
-			sort.Strings(fields)
-			series := m.SeriesKeys()
-			sort.Strings(series)
-			sort.Sort(ShardIDs(shardIDs))
-
-			// Sample a point from each measurement to determine the field types
-			for _, shardID := range shardIDs {
-				shard := tstore.Shard(shardID)
-				codec := shard.FieldCodec(m.Name)
-				for _, field := range codec.Fields() {
-					ft := fmt.Sprintf("%s:%s", field.Name, field.Type)
-					fmt.Fprintf(tw, "%d\t%s\t%s\t%d/%d\t%d [%s]\t%d\n", shardID, db, m.Name, len(tags), tagValues,
-						len(fields), ft, len(series))
-
-				}
-
-			}
-		}
-	}
-	tw.Flush()
-}
-
-func countSeries(tstore *tsdb.Store) int {
-	var count int
-	for _, shardID := range tstore.ShardIDs() {
-		shard := tstore.Shard(shardID)
-		cnt, err := shard.SeriesCount()
-		if err != nil {
-			fmt.Printf("series count failed: %v\n", err)
-			continue
-		}
-		count += cnt
-	}
-	return count
-}
-
-func btou64(b []byte) uint64 {
-	return binary.BigEndian.Uint64(b)
-}
-
-// u64tob converts a uint64 into an 8-byte slice.
-func u64tob(v uint64) []byte {
-	b := make([]byte, 8)
-	binary.BigEndian.PutUint64(b, v)
-	return b
-}
-
-// ShardIDs is a collection of UINT 64 that represent shard ids.
-type ShardIDs []uint64
-
-func (a ShardIDs) Len() int           { return len(a) }
-func (a ShardIDs) Less(i, j int) bool { return a[i] < a[j] }
-func (a ShardIDs) Swap(i, j int)      { a[i], a[j] = a[j], a[i] }
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influx_inspect/main.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influx_inspect/main.go
deleted file mode 100644
index 647376b87..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influx_inspect/main.go
+++ /dev/null
@@ -1,87 +0,0 @@
-package main
-
-import (
-	"flag"
-	"fmt"
-	"os"
-
-	_ "github.com/influxdb/influxdb/tsdb/engine"
-)
-
-func usage() {
-	println(`Usage: influx_inspect <command> [options]
-
-Displays detailed information about InfluxDB data files.
-`)
-
-	println(`Commands:
-  info - displays series meta-data for all shards.  Default location [$HOME/.influxdb]
-  dumptsm - dumps low-level details about tsm1 files.`)
-	println()
-}
-
-func main() {
-
-	flag.Usage = usage
-	flag.Parse()
-
-	if len(flag.Args()) == 0 {
-		flag.Usage()
-		os.Exit(0)
-	}
-
-	switch flag.Args()[0] {
-	case "info":
-		var path string
-		fs := flag.NewFlagSet("info", flag.ExitOnError)
-		fs.StringVar(&path, "dir", os.Getenv("HOME")+"/.influxdb", "Root storage path. [$HOME/.influxdb]")
-
-		fs.Usage = func() {
-			println("Usage: influx_inspect info [options]\n\n   Displays series meta-data for all shards..")
-			println()
-			println("Options:")
-			fs.PrintDefaults()
-		}
-
-		if err := fs.Parse(flag.Args()[1:]); err != nil {
-			fmt.Printf("%v", err)
-			os.Exit(1)
-		}
-		cmdInfo(path)
-	case "dumptsm":
-		var dumpAll bool
-		opts := &tsdmDumpOpts{}
-		fs := flag.NewFlagSet("file", flag.ExitOnError)
-		fs.BoolVar(&opts.dumpIndex, "index", false, "Dump raw index data")
-		fs.BoolVar(&opts.dumpBlocks, "blocks", false, "Dump raw block data")
-		fs.BoolVar(&dumpAll, "all", false, "Dump all data. Caution: This may print a lot of information")
-		fs.StringVar(&opts.filterKey, "filter-key", "", "Only display index and block data match this key substring")
-
-		fs.Usage = func() {
-			println("Usage: influx_inspect dumptsm [options] <path>\n\n  Dumps low-level details about tsm1 files.")
-			println()
-			println("Options:")
-			fs.PrintDefaults()
-			os.Exit(0)
-		}
-
-		if err := fs.Parse(flag.Args()[1:]); err != nil {
-			fmt.Printf("%v", err)
-			os.Exit(1)
-		}
-
-		if len(fs.Args()) == 0 || fs.Args()[0] == "" {
-			fmt.Printf("TSM file not specified\n\n")
-			fs.Usage()
-			fs.PrintDefaults()
-			os.Exit(1)
-		}
-		opts.path = fs.Args()[0]
-		opts.dumpBlocks = opts.dumpBlocks || dumpAll || opts.filterKey != ""
-		opts.dumpIndex = opts.dumpIndex || dumpAll || opts.filterKey != ""
-		cmdDumpTsm1(opts)
-	default:
-		flag.Usage()
-		os.Exit(1)
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influx_inspect/tsm.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influx_inspect/tsm.go
deleted file mode 100644
index 6b82b8e6f..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influx_inspect/tsm.go
+++ /dev/null
@@ -1,443 +0,0 @@
-package main
-
-import (
-	"encoding/binary"
-	"encoding/json"
-	"fmt"
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"strconv"
-	"strings"
-	"text/tabwriter"
-	"time"
-
-	"github.com/golang/snappy"
-	"github.com/influxdb/influxdb/tsdb"
-	"github.com/influxdb/influxdb/tsdb/engine/tsm1"
-)
-
-type tsdmDumpOpts struct {
-	dumpIndex  bool
-	dumpBlocks bool
-	filterKey  string
-	path       string
-}
-
-type tsmIndex struct {
-	series  int
-	offset  int64
-	minTime time.Time
-	maxTime time.Time
-	blocks  []*block
-}
-
-type block struct {
-	id     uint64
-	offset int64
-}
-
-type blockStats struct {
-	min, max int
-	counts   [][]int
-}
-
-func (b *blockStats) inc(typ int, enc byte) {
-	for len(b.counts) <= typ {
-		b.counts = append(b.counts, []int{})
-	}
-	for len(b.counts[typ]) <= int(enc) {
-		b.counts[typ] = append(b.counts[typ], 0)
-	}
-	b.counts[typ][enc]++
-}
-
-func (b *blockStats) size(sz int) {
-	if b.min == 0 || sz < b.min {
-		b.min = sz
-	}
-	if b.min == 0 || sz > b.max {
-		b.max = sz
-	}
-}
-
-var (
-	fieldType = []string{
-		"timestamp", "float", "int", "bool", "string",
-	}
-	blockTypes = []string{
-		"float64", "int64", "bool", "string",
-	}
-	timeEnc = []string{
-		"none", "s8b", "rle",
-	}
-	floatEnc = []string{
-		"none", "gor",
-	}
-	intEnc = []string{
-		"none", "s8b", "rle",
-	}
-	boolEnc = []string{
-		"none", "bp",
-	}
-	stringEnc = []string{
-		"none", "snpy",
-	}
-	encDescs = [][]string{
-		timeEnc, floatEnc, intEnc, boolEnc, stringEnc,
-	}
-)
-
-func readFields(path string) (map[string]*tsdb.MeasurementFields, error) {
-	fields := make(map[string]*tsdb.MeasurementFields)
-
-	f, err := os.OpenFile(filepath.Join(path, tsm1.FieldsFileExtension), os.O_RDONLY, 0666)
-	if os.IsNotExist(err) {
-		return fields, nil
-	} else if err != nil {
-		return nil, err
-	}
-	b, err := ioutil.ReadAll(f)
-	if err != nil {
-		return nil, err
-	}
-
-	data, err := snappy.Decode(nil, b)
-	if err != nil {
-		return nil, err
-	}
-
-	if err := json.Unmarshal(data, &fields); err != nil {
-		return nil, err
-	}
-	return fields, nil
-}
-
-func readSeries(path string) (map[string]*tsdb.Series, error) {
-	series := make(map[string]*tsdb.Series)
-
-	f, err := os.OpenFile(filepath.Join(path, tsm1.SeriesFileExtension), os.O_RDONLY, 0666)
-	if os.IsNotExist(err) {
-		return series, nil
-	} else if err != nil {
-		return nil, err
-	}
-	defer f.Close()
-	b, err := ioutil.ReadAll(f)
-	if err != nil {
-		return nil, err
-	}
-
-	data, err := snappy.Decode(nil, b)
-	if err != nil {
-		return nil, err
-	}
-
-	if err := json.Unmarshal(data, &series); err != nil {
-		return nil, err
-	}
-
-	return series, nil
-}
-
-func readIds(path string) (map[string]uint64, error) {
-	f, err := os.OpenFile(filepath.Join(path, tsm1.IDsFileExtension), os.O_RDONLY, 0666)
-	if os.IsNotExist(err) {
-		return nil, nil
-	} else if err != nil {
-		return nil, err
-	}
-	b, err := ioutil.ReadAll(f)
-	if err != nil {
-		return nil, err
-	}
-
-	b, err = snappy.Decode(nil, b)
-	if err != nil {
-		return nil, err
-	}
-
-	ids := make(map[string]uint64)
-	if b != nil {
-		if err := json.Unmarshal(b, &ids); err != nil {
-			return nil, err
-		}
-	}
-	return ids, err
-}
-func readIndex(f *os.File) (*tsmIndex, error) {
-	// Get the file size
-	stat, err := f.Stat()
-	if err != nil {
-		return nil, err
-	}
-
-	// Seek to the series count
-	f.Seek(-4, os.SEEK_END)
-	b := make([]byte, 8)
-	_, err = f.Read(b[:4])
-	if err != nil {
-		return nil, err
-	}
-
-	seriesCount := binary.BigEndian.Uint32(b)
-
-	// Get the min time
-	f.Seek(-20, os.SEEK_END)
-	f.Read(b)
-	minTime := time.Unix(0, int64(btou64(b)))
-
-	// Get max time
-	f.Seek(-12, os.SEEK_END)
-	f.Read(b)
-	maxTime := time.Unix(0, int64(btou64(b)))
-
-	// Figure out where the index starts
-	indexStart := stat.Size() - int64(seriesCount*12+20)
-
-	// Seek to the start of the index
-	f.Seek(indexStart, os.SEEK_SET)
-	count := int(seriesCount)
-	index := &tsmIndex{
-		offset:  indexStart,
-		minTime: minTime,
-		maxTime: maxTime,
-		series:  count,
-	}
-
-	if indexStart < 0 {
-		return nil, fmt.Errorf("index corrupt: offset=%d", indexStart)
-	}
-
-	// Read the index entries
-	for i := 0; i < count; i++ {
-		f.Read(b)
-		id := binary.BigEndian.Uint64(b)
-		f.Read(b[:4])
-		pos := binary.BigEndian.Uint32(b[:4])
-		index.blocks = append(index.blocks, &block{id: id, offset: int64(pos)})
-	}
-
-	return index, nil
-}
-
-func cmdDumpTsm1(opts *tsdmDumpOpts) {
-	var errors []error
-
-	f, err := os.Open(opts.path)
-	if err != nil {
-		println(err.Error())
-		os.Exit(1)
-	}
-
-	// Get the file size
-	stat, err := f.Stat()
-	if err != nil {
-		println(err.Error())
-		os.Exit(1)
-	}
-
-	b := make([]byte, 8)
-	f.Read(b[:4])
-
-	// Verify magic number
-	if binary.BigEndian.Uint32(b[:4]) != 0x16D116D1 {
-		println("Not a tsm1 file.")
-		os.Exit(1)
-	}
-
-	ids, err := readIds(filepath.Dir(opts.path))
-	if err != nil {
-		println("Failed to read series:", err.Error())
-		os.Exit(1)
-	}
-
-	invIds := map[uint64]string{}
-	for k, v := range ids {
-		invIds[v] = k
-	}
-
-	index, err := readIndex(f)
-	if err != nil {
-		println("Failed to readIndex:", err.Error())
-
-		// Create a stubbed out index so we can still try and read the block data directly
-		// w/o panicing ourselves.
-		index = &tsmIndex{
-			minTime: time.Unix(0, 0),
-			maxTime: time.Unix(0, 0),
-			offset:  stat.Size(),
-		}
-	}
-
-	blockStats := &blockStats{}
-
-	println("Summary:")
-	fmt.Printf("  File: %s\n", opts.path)
-	fmt.Printf("  Time Range: %s - %s\n",
-		index.minTime.UTC().Format(time.RFC3339Nano),
-		index.maxTime.UTC().Format(time.RFC3339Nano),
-	)
-	fmt.Printf("  Duration: %s ", index.maxTime.Sub(index.minTime))
-	fmt.Printf("  Series: %d ", index.series)
-	fmt.Printf("  File Size: %d\n", stat.Size())
-	println()
-
-	tw := tabwriter.NewWriter(os.Stdout, 8, 8, 1, '\t', 0)
-	fmt.Fprintln(tw, "  "+strings.Join([]string{"Pos", "ID", "Ofs", "Key", "Field"}, "\t"))
-	for i, block := range index.blocks {
-		key := invIds[block.id]
-		split := strings.Split(key, "#!~#")
-
-		// We dont' know know if we have fields so use an informative default
-		var measurement, field string = "UNKNOWN", "UNKNOWN"
-
-		// We read some IDs from the ids file
-		if len(invIds) > 0 {
-			// Change the default to error until we know we have a valid key
-			measurement = "ERR"
-			field = "ERR"
-
-			// Possible corruption? Try to read as much as we can and point to the problem.
-			if key == "" {
-				errors = append(errors, fmt.Errorf("index pos %d, field id: %d, missing key for id", i, block.id))
-			} else if len(split) < 2 {
-				errors = append(errors, fmt.Errorf("index pos %d, field id: %d, key corrupt: got '%v'", i, block.id, key))
-			} else {
-				measurement = split[0]
-				field = split[1]
-			}
-		}
-
-		if opts.filterKey != "" && !strings.Contains(key, opts.filterKey) {
-			continue
-		}
-		fmt.Fprintln(tw, "  "+strings.Join([]string{
-			strconv.FormatInt(int64(i), 10),
-			strconv.FormatUint(block.id, 10),
-			strconv.FormatInt(int64(block.offset), 10),
-			measurement,
-			field,
-		}, "\t"))
-	}
-
-	if opts.dumpIndex {
-		println("Index:")
-		tw.Flush()
-		println()
-	}
-
-	tw = tabwriter.NewWriter(os.Stdout, 8, 8, 1, '\t', 0)
-	fmt.Fprintln(tw, "  "+strings.Join([]string{"Blk", "Ofs", "Len", "ID", "Type", "Min Time", "Points", "Enc [T/V]", "Len [T/V]"}, "\t"))
-
-	// Staring at 4 because the magic number is 4 bytes
-	i := int64(4)
-	var blockCount, pointCount, blockSize int64
-	indexSize := stat.Size() - index.offset
-
-	// Start at the beginning and read every block
-	for i < index.offset {
-		f.Seek(int64(i), 0)
-
-		f.Read(b)
-		id := btou64(b)
-		f.Read(b[:4])
-		length := binary.BigEndian.Uint32(b[:4])
-		buf := make([]byte, length)
-		f.Read(buf)
-
-		blockSize += int64(len(buf)) + 12
-
-		startTime := time.Unix(0, int64(btou64(buf[:8])))
-		blockType := buf[8]
-
-		encoded := buf[9:]
-
-		var v []tsm1.Value
-		err := tsm1.DecodeBlock(buf, &v)
-		if err != nil {
-			fmt.Printf("error: %v\n", err.Error())
-			os.Exit(1)
-		}
-
-		pointCount += int64(len(v))
-
-		// Length of the timestamp block
-		tsLen, j := binary.Uvarint(encoded)
-
-		// Unpack the timestamp bytes
-		ts := encoded[int(j) : int(j)+int(tsLen)]
-
-		// Unpack the value bytes
-		values := encoded[int(j)+int(tsLen):]
-
-		tsEncoding := timeEnc[int(ts[0]>>4)]
-		vEncoding := encDescs[int(blockType+1)][values[0]>>4]
-
-		typeDesc := blockTypes[blockType]
-
-		blockStats.inc(0, ts[0]>>4)
-		blockStats.inc(int(blockType+1), values[0]>>4)
-		blockStats.size(len(buf))
-
-		if opts.filterKey != "" && !strings.Contains(invIds[id], opts.filterKey) {
-			i += (12 + int64(length))
-			blockCount++
-			continue
-		}
-
-		fmt.Fprintln(tw, "  "+strings.Join([]string{
-			strconv.FormatInt(blockCount, 10),
-			strconv.FormatInt(i, 10),
-			strconv.FormatInt(int64(len(buf)), 10),
-			strconv.FormatUint(id, 10),
-			typeDesc,
-			startTime.UTC().Format(time.RFC3339Nano),
-			strconv.FormatInt(int64(len(v)), 10),
-			fmt.Sprintf("%s/%s", tsEncoding, vEncoding),
-			fmt.Sprintf("%d/%d", len(ts), len(values)),
-		}, "\t"))
-
-		i += (12 + int64(length))
-		blockCount++
-	}
-	if opts.dumpBlocks {
-		println("Blocks:")
-		tw.Flush()
-		println()
-	}
-
-	fmt.Printf("Statistics\n")
-	fmt.Printf("  Blocks:\n")
-	fmt.Printf("    Total: %d Size: %d Min: %d Max: %d Avg: %d\n",
-		blockCount, blockSize, blockStats.min, blockStats.max, blockSize/blockCount)
-	fmt.Printf("  Index:\n")
-	fmt.Printf("    Total: %d Size: %d\n", len(index.blocks), indexSize)
-	fmt.Printf("  Points:\n")
-	fmt.Printf("    Total: %d", pointCount)
-	println()
-
-	println("  Encoding:")
-	for i, counts := range blockStats.counts {
-		if len(counts) == 0 {
-			continue
-		}
-		fmt.Printf("    %s: ", strings.Title(fieldType[i]))
-		for j, v := range counts {
-			fmt.Printf("\t%s: %d (%d%%) ", encDescs[i][j], v, int(float64(v)/float64(blockCount)*100))
-		}
-		println()
-	}
-	fmt.Printf("  Compression:\n")
-	fmt.Printf("    Per block: %0.2f bytes/point\n", float64(blockSize)/float64(pointCount))
-	fmt.Printf("    Total: %0.2f bytes/point\n", float64(stat.Size())/float64(pointCount))
-
-	if len(errors) > 0 {
-		println()
-		fmt.Printf("Errors (%d):\n", len(errors))
-		for _, err := range errors {
-			fmt.Printf("  * %v\n", err)
-		}
-		println()
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influx_stress/examples/100B_FLAT.toml b/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influx_stress/examples/100B_FLAT.toml
deleted file mode 100644
index dfa60b083..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influx_stress/examples/100B_FLAT.toml
+++ /dev/null
@@ -1,30 +0,0 @@
-channel_buffer_size = 100000
-
-[write]
-  concurrency = 10
-  batch_size = 10000
-  batch_interval = "0s"
-  database = "stress"
-  precision = "n"
-  address = "localhost:8086"
-  reset_database = true
-  start_date = "2006-Jan-02"
-
-[[series]]
-  tick = "10s"
-  jitter = false
-  point_count = 1000000 # number of points that will be written for each of the series
-  measurement = "cpu"
-  series_count = 100000
-
-  [[series.tag]]
-    key = "host"
-    value = "server"
-
-  [[series.tag]]
-    key = "location"
-    value = "loc"
-
-  [[series.field]]
-    key = "value"
-    type = "float64-flat"
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influx_stress/examples/100B_STD.toml b/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influx_stress/examples/100B_STD.toml
deleted file mode 100644
index f2de3f0d8..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influx_stress/examples/100B_STD.toml
+++ /dev/null
@@ -1,30 +0,0 @@
-channel_buffer_size = 100000
-
-[write]
-  concurrency = 10
-  batch_size = 10000
-  batch_interval = "0s"
-  database = "stress"
-  precision = "n"
-  address = "localhost:8086"
-  reset_database = true
-  start_date = "2006-Jan-02"
-
-[[series]]
-  tick = "1ns"
-  jitter = true
-  point_count = 1000000 # number of points that will be written for each of the series
-  measurement = "cpu"
-  series_count = 100000
-
-  [[series.tag]]
-    key = "host"
-    value = "server"
-
-  [[series.tag]]
-    key = "location"
-    value = "loc"
-
-  [[series.field]]
-    key = "value"
-    type = "float64"
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influx_stress/examples/100M_FLAT.toml b/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influx_stress/examples/100M_FLAT.toml
deleted file mode 100644
index 7f2c3d03d..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influx_stress/examples/100M_FLAT.toml
+++ /dev/null
@@ -1,47 +0,0 @@
-channel_buffer_size = 100000
-
-[write]
-  concurrency = 10
-  batch_size = 10000
-  batch_interval = "0s"
-  database = "stress"
-  precision = "s"
-  address = "localhost:8086"
-  reset_database = true
-  start_date = "2006-Jan-02"
-
-[[series]]
-  tick = "5s"
-  jitter = false
-  point_count = 10000 # number of points that will be written for each of the series
-  measurement = "cpu"
-  series_count = 10000
-
- # tag_count = 20 # number of "generic" tags on a series (e.g. tag-key-1=tag-value, ... ,tag-key-20=tag-value)
-
-  [[series.tag]]
-    key = "host"
-    value = "server"
-
-  [[series.tag]]
-    key = "location"
-    value = "loc"
-
-  [[series.field]]
-    key = "value"
-    type = "float64"
-
-  # Doesnt work as expected
-##  [[series.field]]
-##    key = "value-2"
-##    type = "float64-inc"
-##
-##  [[series.field]]
-##    key = "value-3"
-##    type = "float64-inc+"
-
- # Has 80% probability of being a constant value
-  [[series.field]]
-    key = "flat_value"
-    type = "float64-flat"
-
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influx_stress/examples/100M_STD.toml b/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influx_stress/examples/100M_STD.toml
deleted file mode 100644
index 8d28f4f1e..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influx_stress/examples/100M_STD.toml
+++ /dev/null
@@ -1,32 +0,0 @@
-channel_buffer_size = 100000
-
-[write]
-  concurrency = 10
-  batch_size = 10000
-  batch_interval = "0s"
-  database = "stress"
-  precision = "s"
-  address = "localhost:8086"
-  reset_database = true
-  start_date = "2006-Jan-02"
-
-[[series]]
-  tick = "5s"
-  jitter = false
-  point_count = 10000 # number of points that will be written for each of the series
-  measurement = "cpu"
-  series_count = 10000
-
- # tag_count = 20 # number of "generic" tags on a series (e.g. tag-key-1=tag-value, ... ,tag-key-20=tag-value)
-
-  [[series.tag]]
-    key = "host"
-    value = "server"
-
-  [[series.tag]]
-    key = "location"
-    value = "loc"
-
-  [[series.field]]
-    key = "value"
-    type = "float64"
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influx_stress/examples/5M_STD.toml b/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influx_stress/examples/5M_STD.toml
deleted file mode 100644
index 6684e9c20..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influx_stress/examples/5M_STD.toml
+++ /dev/null
@@ -1,33 +0,0 @@
-channel_buffer_size = 100000
-
-[write]
-  concurrency = 10
-  batch_size = 5000
-  batch_interval = "0s"
-  database = "stress"
-  precision = "s"
-  address = "localhost:8086"
-  reset_database = true
-  start_date = "2006-Jan-02"
-
-[[series]]
-  tick = "5s"
-  jitter = false
-  point_count = 50 # number of points that will be written for each of the series
-  measurement = "cpu"
-  series_count = 100000
-
- # tag_count = 20 # number of "generic" tags on a series (e.g. tag-key-1=tag-value, ... ,tag-key-20=tag-value)
-
-  [[series.tag]]
-    key = "host"
-    value = "idk"
-
-  [[series.tag]]
-    key = "location"
-    value = "lame"
-
-  [[series.field]]
-    key = "value"
-    type = "float64"
-
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influx_stress/examples/long_form_date.toml b/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influx_stress/examples/long_form_date.toml
deleted file mode 100644
index 38b860204..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influx_stress/examples/long_form_date.toml
+++ /dev/null
@@ -1,34 +0,0 @@
-channel_buffer_size = 100000
-
-[write]
-  concurrency = 10
-  batch_size = 10000
-  batch_interval = "0s"
-  database = "stress"
-  precision = "s"
-  address = "localhost:8086"
-  reset_database = true
-  start_date = "Jan 2, 2006 at 3:04pm (MST)"
-
-[[series]]
-  tick = "5s"
-  jitter = true
-  point_count = 10000 # number of points that will be written for each of the series
-  measurement = "cpu"
-  series_count = 10000
-
- # tag_count = 20 # number of "generic" tags on a series (e.g. tag-key-1=tag-value, ... ,tag-key-20=tag-value)
-
-  [[series.tag]]
-    key = "host"
-    value = "idk"
-
-  [[series.tag]]
-    key = "location"
-    value = "lame"
-
-  [[series.field]]
-    key = "value"
-    type = "float64"
-
-
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influx_stress/examples/moderate_burn.toml b/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influx_stress/examples/moderate_burn.toml
deleted file mode 100644
index ec193278a..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influx_stress/examples/moderate_burn.toml
+++ /dev/null
@@ -1,30 +0,0 @@
-channel_buffer_size = 100
-
-[write]
-  concurrency = 10
-  batch_size = 10000
-  batch_interval = "1s"
-  database = "stress"
-  precision = "n"
-  address = "localhost:8086"
-  reset_database = true
-
-[[series]]
-  tick = "5s"
-  jitter = true
-  point_count = 10000 # number of points that will be written for each of the series
-  measurement = "cpu"
-  series_count = 100000
-
-  [[series.tag]]
-    key = "host"
-    value = "server"
-
-  [[series.tag]]
-    key = "location"
-    value = "loc"
-
-  [[series.field]]
-    key = "value"
-    type = "float64"
-
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influx_stress/examples/template.toml b/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influx_stress/examples/template.toml
deleted file mode 100644
index b188ef4d1..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influx_stress/examples/template.toml
+++ /dev/null
@@ -1,114 +0,0 @@
-# Set the buffer size for the channel
-# that sends points to the influxdb
-# client
-channel_buffer_size = 100000
-
-# Configuration settings for the 
-# stress test
-[write]
-  # How many concurrent writers to the db
-  concurrency = 10
-  # Size of batches that are sent to db
-  batch_size = 5000
-  # Interval between each batch
-  batch_interval = "0s"
-  # Database that is being written to
-  database = "stress"
-  # Precision of points that are being written
-  precision = "n"
-  # Address of the Influxdb instance
-  address = "localhost:8086"
-  # Drop and Create new DB
-  reset_database = true
-  # The date for the first point that is written into influx
-  start_date = "2006-Jan-02"
-
-# Describes the schema for series that will be
-# written
-[[series]]
-  # How much time between each timestamp
-  tick = "5s"
-  # Randomize timestamp a bit
-  jitter = false
-  # number of points that will be written for each of the series
-  point_count = 1000
-  # name of the measurement that will be written
-  measurement = "cpu"
-  series_count = 10000
-
-  # number of "generic" tags on a series (e.g. tag-key-1=tag-value, ... ,tag-key-20=tag-value)
-  # tag_count = 20
-
-  # Defines a tag for a series
-  [[series.tag]]
-    key = "host"
-    value = "idk"
-
-  [[series.tag]]
-    key = "location"
-    value = "lame"
-
-  # Defines a field for a series
-  [[series.field]]
-    key = "value"
-    type = "float64"
-
-  [[series.field]]
-    key = "percent"
-    type = "int"
-
-  [[series.field]]
-    key = "idk"
-    type = "bool"
-
-  [[series.field]]
-    key = "default"
-
-[[series]]
-  tick = "1ns"
-  point_count = 100 # number of points that will be written for each of the series
-  measurement = "mem"
-  series_count = 100000
-
-  [[series.tag]]
-    key = "host"
-    value = "idk"
-
-  [[series.tag]]
-    key = "location"
-    value = "lame"
-
-  [[series.field]]
-    key = "value"
-    type = "float64"
-
-  [[series.field]]
-    key = "loc"
-    type = "float64"
-
-  [[series.field]]
-    key = "sunny"
-    type = "bool"
-
-  [[series.field]]
-    key = "idk"
-    type = "int"
-
-# Generates queries of the form
-# SELECT aggregates(values) FROM measurements WHERE time > current_timespan - offset
-[measurement_query]
-  enabled = true
-  concurrency = 10
-  aggregates = ["mean", "count"]
-  fields = ["value"]
-  offset = "5h"
-
-# Generates queries of the form
-# SELECT aggregates(values) FROM measurements WHERE tag-key='tag-values-1'
-[series_query]
-  enabled = true
-  concurrency = 1
-  aggregates = ["mean", "count"]
-  fields = ["value"]
-  # Interval between queries
-  interval = "50ms"
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influx_stress/influx_stress.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influx_stress/influx_stress.go
deleted file mode 100644
index 608a33dc8..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influx_stress/influx_stress.go
+++ /dev/null
@@ -1,128 +0,0 @@
-package main
-
-import (
-	"flag"
-	"fmt"
-	"runtime"
-	"sort"
-	"time"
-
-	"github.com/influxdb/influxdb/stress"
-)
-
-var (
-	batchSize     = flag.Int("batchsize", 0, "number of points per batch")
-	concurrency   = flag.Int("concurrency", 0, "number of simultaneous writes to run")
-	batchInterval = flag.Duration("batchinterval", 0*time.Second, "duration between batches")
-	database      = flag.String("database", "", "name of database")
-	address       = flag.String("addr", "", "IP address and port of database (e.g., localhost:8086)")
-	precision     = flag.String("precision", "", "The precision that points in the database will be with")
-	test          = flag.String("test", "", "The stress test file")
-)
-
-func main() {
-	var cfg *runner.Config
-	var err error
-
-	runtime.GOMAXPROCS(runtime.NumCPU())
-	flag.Parse()
-
-	if *test == "" {
-		fmt.Println("'-test' flag is required")
-		return
-	}
-
-	cfg, err = runner.DecodeFile(*test)
-	if err != nil {
-		fmt.Println(err)
-		return
-	}
-
-	if *batchSize != 0 {
-		cfg.Write.BatchSize = *batchSize
-	}
-
-	if *concurrency != 0 {
-		cfg.Write.Concurrency = *concurrency
-	}
-
-	if *batchInterval != 0*time.Second {
-		cfg.Write.BatchInterval = batchInterval.String()
-	}
-
-	if *database != "" {
-		cfg.Write.Database = *database
-	}
-
-	if *address != "" {
-		cfg.Write.Address = *address
-	}
-
-	if *precision != "" {
-		cfg.Write.Precision = *precision
-	}
-
-	d := make(chan struct{})
-	seriesQueryResults := make(chan runner.QueryResults)
-
-	if cfg.SeriesQuery.Enabled {
-		go runner.SeriesQuery(cfg, d, seriesQueryResults)
-	}
-
-	measurementQueryResults := make(chan runner.QueryResults)
-
-	ts := make(chan time.Time)
-	if cfg.MeasurementQuery.Enabled {
-		go runner.MeasurementQuery(cfg, ts, measurementQueryResults)
-	}
-
-	// Get the stress results
-	totalPoints, failedRequests, responseTimes, timer := runner.Run(cfg, d, ts)
-
-	sort.Sort(sort.Reverse(sort.Interface(responseTimes)))
-
-	total := int64(0)
-	for _, t := range responseTimes {
-		total += int64(t.Value)
-	}
-	mean := total / int64(len(responseTimes))
-
-	fmt.Printf("Wrote %d points at average rate of %.0f\n", totalPoints, float64(totalPoints)/timer.Elapsed().Seconds())
-	fmt.Printf("%d requests failed for %d total points that didn't get posted.\n", failedRequests, failedRequests**batchSize)
-	fmt.Println("Average response time: ", time.Duration(mean))
-	fmt.Println("Slowest response times:")
-	for _, r := range responseTimes[:100] {
-		fmt.Println(time.Duration(r.Value))
-	}
-
-	// Get series query results
-	if cfg.SeriesQuery.Enabled {
-		qrs := <-seriesQueryResults
-
-		queryTotal := int64(0)
-		for _, qt := range qrs.ResponseTimes {
-			queryTotal += int64(qt.Value)
-		}
-		seriesQueryMean := queryTotal / int64(len(qrs.ResponseTimes))
-
-		fmt.Printf("Queried Series %d times with a average response time of %v milliseconds\n", qrs.TotalQueries, time.Duration(seriesQueryMean).Seconds()*1000)
-
-	}
-
-	// Get measurement query results
-	if cfg.MeasurementQuery.Enabled {
-		qrs := <-measurementQueryResults
-
-		queryTotal := int64(0)
-		for _, qt := range qrs.ResponseTimes {
-			queryTotal += int64(qt.Value)
-		}
-		seriesQueryMean := queryTotal / int64(len(qrs.ResponseTimes))
-
-		fmt.Printf("Queried Measurement %d times with a average response time of %v milliseconds\n", qrs.TotalQueries, time.Duration(seriesQueryMean).Seconds()*1000)
-
-	}
-
-	return
-
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influxd/backup/backup.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influxd/backup/backup.go
deleted file mode 100644
index c88652f75..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influxd/backup/backup.go
+++ /dev/null
@@ -1,170 +0,0 @@
-package backup
-
-import (
-	"encoding/json"
-	"errors"
-	"flag"
-	"fmt"
-	"io"
-	"log"
-	"net"
-	"os"
-
-	"github.com/influxdb/influxdb/services/snapshotter"
-	"github.com/influxdb/influxdb/snapshot"
-)
-
-// Suffix is a suffix added to the backup while it's in-process.
-const Suffix = ".pending"
-
-// Command represents the program execution for "influxd backup".
-type Command struct {
-	// The logger passed to the ticker during execution.
-	Logger *log.Logger
-
-	// Standard input/output, overridden for testing.
-	Stderr io.Writer
-}
-
-// NewCommand returns a new instance of Command with default settings.
-func NewCommand() *Command {
-	return &Command{
-		Stderr: os.Stderr,
-	}
-}
-
-// Run executes the program.
-func (cmd *Command) Run(args ...string) error {
-	// Set up logger.
-	cmd.Logger = log.New(cmd.Stderr, "", log.LstdFlags)
-	cmd.Logger.Printf("influxdb backup")
-
-	// Parse command line arguments.
-	host, path, err := cmd.parseFlags(args)
-	if err != nil {
-		return err
-	}
-
-	// Retrieve snapshot from local file.
-	m, err := snapshot.ReadFileManifest(path)
-	if err != nil && !os.IsNotExist(err) {
-		return fmt.Errorf("read file snapshot: %s", err)
-	}
-
-	// Determine temporary path to download to.
-	tmppath := path + Suffix
-
-	// Calculate path of next backup file.
-	// This uses the path if it doesn't exist.
-	// Otherwise it appends an autoincrementing number.
-	path, err = cmd.nextPath(path)
-	if err != nil {
-		return fmt.Errorf("next path: %s", err)
-	}
-
-	// Retrieve snapshot.
-	if err := cmd.download(host, m, tmppath); err != nil {
-		return fmt.Errorf("download: %s", err)
-	}
-
-	// Rename temporary file to final path.
-	if err := os.Rename(tmppath, path); err != nil {
-		return fmt.Errorf("rename: %s", err)
-	}
-
-	// TODO: Check file integrity.
-
-	// Notify user of completion.
-	cmd.Logger.Println("backup complete")
-
-	return nil
-}
-
-// parseFlags parses and validates the command line arguments.
-func (cmd *Command) parseFlags(args []string) (host string, path string, err error) {
-	fs := flag.NewFlagSet("", flag.ContinueOnError)
-	fs.StringVar(&host, "host", "localhost:8088", "")
-	fs.SetOutput(cmd.Stderr)
-	fs.Usage = cmd.printUsage
-	if err := fs.Parse(args); err != nil {
-		return "", "", err
-	}
-
-	// Ensure that only one arg is specified.
-	if fs.NArg() == 0 {
-		return "", "", errors.New("snapshot path required")
-	} else if fs.NArg() != 1 {
-		return "", "", errors.New("only one snapshot path allowed")
-	}
-	path = fs.Arg(0)
-
-	return host, path, nil
-}
-
-// nextPath returns the next file to write to.
-func (cmd *Command) nextPath(path string) (string, error) {
-	// Use base path if it doesn't exist.
-	if _, err := os.Stat(path); os.IsNotExist(err) {
-		return path, nil
-	} else if err != nil {
-		return "", err
-	}
-
-	// Otherwise iterate through incremental files until one is available.
-	for i := 0; ; i++ {
-		s := fmt.Sprintf(path+".%d", i)
-		if _, err := os.Stat(s); os.IsNotExist(err) {
-			return s, nil
-		} else if err != nil {
-			return "", err
-		}
-	}
-}
-
-// download downloads a snapshot from a host to a given path.
-func (cmd *Command) download(host string, m *snapshot.Manifest, path string) error {
-	// Create local file to write to.
-	f, err := os.Create(path)
-	if err != nil {
-		return fmt.Errorf("open temp file: %s", err)
-	}
-	defer f.Close()
-
-	// Connect to snapshotter service.
-	conn, err := net.Dial("tcp", host)
-	if err != nil {
-		return err
-	}
-	defer conn.Close()
-
-	// Send snapshotter marker byte.
-	if _, err := conn.Write([]byte{snapshotter.MuxHeader}); err != nil {
-		return fmt.Errorf("write snapshot header byte: %s", err)
-	}
-
-	// Write the manifest we currently have.
-	if err := json.NewEncoder(conn).Encode(m); err != nil {
-		return fmt.Errorf("encode snapshot manifest: %s", err)
-	}
-
-	// Read snapshot from the connection.
-	if _, err := io.Copy(f, conn); err != nil {
-		return fmt.Errorf("copy snapshot to file: %s", err)
-	}
-
-	// FIXME(benbjohnson): Verify integrity of snapshot.
-
-	return nil
-}
-
-// printUsage prints the usage message to STDERR.
-func (cmd *Command) printUsage() {
-	fmt.Fprintf(cmd.Stderr, `usage: influxd backup [flags] PATH
-
-backup downloads a snapshot of a data node and saves it to disk.
-
-        -host <host:port>
-                          The host to connect to snapshot.
-                          Defaults to 127.0.0.1:8088.
-`)
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influxd/backup/backup_test.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influxd/backup/backup_test.go
deleted file mode 100644
index 15db96449..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influxd/backup/backup_test.go
+++ /dev/null
@@ -1,125 +0,0 @@
-package backup_test
-
-/*
-import (
-	"bytes"
-	"net/http"
-	"net/http/httptest"
-	"os"
-	"strings"
-	"testing"
-
-	"github.com/influxdb/influxdb"
-	"github.com/influxdb/influxdb/cmd/influxd"
-)
-
-// Ensure the backup can download from the server and save to disk.
-func TestBackupCommand(t *testing.T) {
-	// Mock the backup endpoint.
-	s := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		if r.URL.Path != "/data/snapshot" {
-			t.Fatalf("unexpected url path: %s", r.URL.Path)
-		}
-
-		// Write a simple snapshot to the buffer.
-		sw := influxdb.NewSnapshotWriter()
-		sw.Snapshot = &influxdb.Snapshot{Files: []influxdb.SnapshotFile{
-			{Name: "meta", Size: 5, Index: 10},
-		}}
-		sw.FileWriters["meta"] = influxdb.NopWriteToCloser(bytes.NewBufferString("55555"))
-		if _, err := sw.WriteTo(w); err != nil {
-			t.Fatal(err)
-		}
-	}))
-	defer s.Close()
-
-	// Create a temp path and remove incremental backups at the end.
-	path := tempfile()
-	defer os.Remove(path)
-	defer os.Remove(path + ".0")
-	defer os.Remove(path + ".1")
-
-	// Execute the backup against the mock server.
-	for i := 0; i < 3; i++ {
-		if err := NewBackupCommand().Run("-host", s.URL, path); err != nil {
-			t.Fatal(err)
-		}
-	}
-
-	// Verify snapshot and two incremental snapshots were written.
-	if _, err := os.Stat(path); err != nil {
-		t.Fatalf("snapshot not found: %s", err)
-	} else if _, err = os.Stat(path + ".0"); err != nil {
-		t.Fatalf("incremental snapshot(0) not found: %s", err)
-	} else if _, err = os.Stat(path + ".1"); err != nil {
-		t.Fatalf("incremental snapshot(1) not found: %s", err)
-	}
-}
-
-// Ensure the backup command returns an error if flags cannot be parsed.
-func TestBackupCommand_ErrFlagParse(t *testing.T) {
-	cmd := NewBackupCommand()
-	if err := cmd.Run("-bad-flag"); err == nil || err.Error() != `flag provided but not defined: -bad-flag` {
-		t.Fatal(err)
-	} else if !strings.Contains(cmd.Stderr.String(), "usage") {
-		t.Fatal("usage message not displayed")
-	}
-}
-
-// Ensure the backup command returns an error if the host cannot be parsed.
-func TestBackupCommand_ErrInvalidHostURL(t *testing.T) {
-	if err := NewBackupCommand().Run("-host", "http://%f"); err == nil || err.Error() != `parse host url: parse http://%f: hexadecimal escape in host` {
-		t.Fatal(err)
-	}
-}
-
-// Ensure the backup command returns an error if the output path is not specified.
-func TestBackupCommand_ErrPathRequired(t *testing.T) {
-	if err := NewBackupCommand().Run("-host", "//localhost"); err == nil || err.Error() != `snapshot path required` {
-		t.Fatal(err)
-	}
-}
-
-// Ensure the backup returns an error if it cannot connect to the server.
-func TestBackupCommand_ErrConnectionRefused(t *testing.T) {
-	// Start and immediately stop a server so we have a dead port.
-	s := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {}))
-	s.Close()
-
-	// Execute the backup command.
-	path := tempfile()
-	defer os.Remove(path)
-	if err := NewBackupCommand().Run("-host", s.URL, path); err == nil ||
-		!(strings.Contains(err.Error(), `connection refused`) || strings.Contains(err.Error(), `No connection could be made`)) {
-		t.Fatal(err)
-	}
-}
-
-// Ensure the backup returns any non-200 status codes.
-func TestBackupCommand_ErrServerError(t *testing.T) {
-	s := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		w.WriteHeader(http.StatusInternalServerError)
-	}))
-	defer s.Close()
-
-	// Execute the backup command.
-	path := tempfile()
-	defer os.Remove(path)
-	if err := NewBackupCommand().Run("-host", s.URL, path); err == nil || err.Error() != `download: snapshot error: status=500` {
-		t.Fatal(err)
-	}
-}
-
-// BackupCommand is a test wrapper for main.BackupCommand.
-type BackupCommand struct {
-	*main.BackupCommand
-	Stderr bytes.Buffer
-}
-
-// NewBackupCommand returns a new instance of BackupCommand.
-func NewBackupCommand() *BackupCommand {
-	cmd := &BackupCommand{BackupCommand: main.NewBackupCommand()}
-	cmd.BackupCommand.Stderr = &cmd.Stderr
-	return cmd
-}
-*/
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influxd/help/help.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influxd/help/help.go
deleted file mode 100644
index 3f6bbfb08..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influxd/help/help.go
+++ /dev/null
@@ -1,46 +0,0 @@
-package help
-
-import (
-	"fmt"
-	"io"
-	"os"
-	"strings"
-)
-
-// Command displays help for command-line sub-commands.
-type Command struct {
-	Stdout io.Writer
-}
-
-// NewCommand returns a new instance of Command.
-func NewCommand() *Command {
-	return &Command{
-		Stdout: os.Stdout,
-	}
-}
-
-// Run executes the command.
-func (cmd *Command) Run(args ...string) error {
-	fmt.Fprintln(cmd.Stdout, strings.TrimSpace(usage))
-	return nil
-}
-
-const usage = `
-Configure and start an InfluxDB server.
-
-Usage:
-
-	influxd [[command] [arguments]]
-
-The commands are:
-
-    backup               downloads a snapshot of a data node and saves it to disk
-    config               display the default configuration
-    restore              uses a snapshot of a data node to rebuild a cluster
-    run                  run node with existing configuration
-    version              displays the InfluxDB version
-
-"run" is the default command.
-
-Use "influxd help [command]" for more information about a command.
-`
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influxd/main.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influxd/main.go
deleted file mode 100644
index b528e39d3..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influxd/main.go
+++ /dev/null
@@ -1,205 +0,0 @@
-package main
-
-import (
-	"flag"
-	"fmt"
-	"io"
-	"log"
-	"math/rand"
-	"os"
-	"os/signal"
-	"strings"
-	"syscall"
-	"time"
-
-	"github.com/influxdb/influxdb/cmd/influxd/backup"
-	"github.com/influxdb/influxdb/cmd/influxd/help"
-	"github.com/influxdb/influxdb/cmd/influxd/restore"
-	"github.com/influxdb/influxdb/cmd/influxd/run"
-)
-
-// These variables are populated via the Go linker.
-var (
-	version   = "0.9"
-	commit    string
-	branch    string
-	buildTime string
-)
-
-func init() {
-	// If commit, branch, or build time are not set, make that clear.
-	if commit == "" {
-		commit = "unknown"
-	}
-	if branch == "" {
-		branch = "unknown"
-	}
-	if buildTime == "" {
-		buildTime = "unknown"
-	}
-}
-
-func main() {
-	rand.Seed(time.Now().UnixNano())
-
-	m := NewMain()
-	if err := m.Run(os.Args[1:]...); err != nil {
-		fmt.Fprintln(os.Stderr, err)
-		os.Exit(1)
-	}
-}
-
-// Main represents the program execution.
-type Main struct {
-	Logger *log.Logger
-
-	Stdin  io.Reader
-	Stdout io.Writer
-	Stderr io.Writer
-}
-
-// NewMain return a new instance of Main.
-func NewMain() *Main {
-	return &Main{
-		Logger: log.New(os.Stderr, "[run] ", log.LstdFlags),
-		Stdin:  os.Stdin,
-		Stdout: os.Stdout,
-		Stderr: os.Stderr,
-	}
-}
-
-// Run determines and runs the command specified by the CLI args.
-func (m *Main) Run(args ...string) error {
-	name, args := ParseCommandName(args)
-
-	// Extract name from args.
-	switch name {
-	case "", "run":
-		cmd := run.NewCommand()
-
-		// Tell the server the build details.
-		cmd.Version = version
-		cmd.Commit = commit
-		cmd.Branch = branch
-		cmd.BuildTime = buildTime
-
-		if err := cmd.Run(args...); err != nil {
-			return fmt.Errorf("run: %s", err)
-		}
-
-		signalCh := make(chan os.Signal, 1)
-		signal.Notify(signalCh, os.Interrupt, syscall.SIGTERM)
-		m.Logger.Println("Listening for signals")
-
-		// Block until one of the signals above is received
-		select {
-		case <-signalCh:
-			m.Logger.Println("Signal received, initializing clean shutdown...")
-			go func() {
-				cmd.Close()
-			}()
-		}
-
-		// Block again until another signal is received, a shutdown timeout elapses,
-		// or the Command is gracefully closed
-		m.Logger.Println("Waiting for clean shutdown...")
-		select {
-		case <-signalCh:
-			m.Logger.Println("second signal received, initializing hard shutdown")
-		case <-time.After(time.Second * 30):
-			m.Logger.Println("time limit reached, initializing hard shutdown")
-		case <-cmd.Closed:
-			m.Logger.Println("server shutdown completed")
-		}
-
-		// goodbye.
-
-	case "backup":
-		name := backup.NewCommand()
-		if err := name.Run(args...); err != nil {
-			return fmt.Errorf("backup: %s", err)
-		}
-	case "restore":
-		name := restore.NewCommand()
-		if err := name.Run(args...); err != nil {
-			return fmt.Errorf("restore: %s", err)
-		}
-	case "config":
-		if err := run.NewPrintConfigCommand().Run(args...); err != nil {
-			return fmt.Errorf("config: %s", err)
-		}
-	case "version":
-		if err := NewVersionCommand().Run(args...); err != nil {
-			return fmt.Errorf("version: %s", err)
-		}
-	case "help":
-		if err := help.NewCommand().Run(args...); err != nil {
-			return fmt.Errorf("help: %s", err)
-		}
-	default:
-		return fmt.Errorf(`unknown command "%s"`+"\n"+`Run 'influxd help' for usage`+"\n\n", name)
-	}
-
-	return nil
-}
-
-// ParseCommandName extracts the command name and args from the args list.
-func ParseCommandName(args []string) (string, []string) {
-	// Retrieve command name as first argument.
-	var name string
-	if len(args) > 0 && !strings.HasPrefix(args[0], "-") {
-		name = args[0]
-	}
-
-	// Special case -h immediately following binary name
-	if len(args) > 0 && args[0] == "-h" {
-		name = "help"
-	}
-
-	// If command is "help" and has an argument then rewrite args to use "-h".
-	if name == "help" && len(args) > 1 {
-		args[0], args[1] = args[1], "-h"
-		name = args[0]
-	}
-
-	// If a named command is specified then return it with its arguments.
-	if name != "" {
-		return name, args[1:]
-	}
-	return "", args
-}
-
-// VersionCommand represents the command executed by "influxd version".
-type VersionCommand struct {
-	Stdout io.Writer
-	Stderr io.Writer
-}
-
-// NewVersionCommand return a new instance of VersionCommand.
-func NewVersionCommand() *VersionCommand {
-	return &VersionCommand{
-		Stdout: os.Stdout,
-		Stderr: os.Stderr,
-	}
-}
-
-// Run prints the current version and commit info.
-func (cmd *VersionCommand) Run(args ...string) error {
-	// Parse flags in case -h is specified.
-	fs := flag.NewFlagSet("", flag.ContinueOnError)
-	fs.Usage = func() { fmt.Fprintln(cmd.Stderr, strings.TrimSpace(versionUsage)) }
-	if err := fs.Parse(args); err != nil {
-		return err
-	}
-
-	// Print version info.
-	fmt.Fprintf(cmd.Stdout, "InfluxDB v%s (git: %s %s, built %s)\n", version, branch, commit, buildTime)
-
-	return nil
-}
-
-var versionUsage = `
-usage: version
-
-	version displays the InfluxDB version, build branch and git commit hash
-`
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influxd/restore/restore.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influxd/restore/restore.go
deleted file mode 100644
index 4d22916fa..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influxd/restore/restore.go
+++ /dev/null
@@ -1,260 +0,0 @@
-package restore
-
-import (
-	"bytes"
-	"errors"
-	"flag"
-	"fmt"
-	"io"
-	"net"
-	"os"
-	"path/filepath"
-
-	"github.com/BurntSushi/toml"
-	"github.com/influxdb/influxdb/meta"
-	"github.com/influxdb/influxdb/snapshot"
-	"github.com/influxdb/influxdb/tsdb"
-)
-
-// Command represents the program execution for "influxd restore".
-type Command struct {
-	Stdout io.Writer
-	Stderr io.Writer
-}
-
-// NewCommand returns a new instance of Command with default settings.
-func NewCommand() *Command {
-	return &Command{
-		Stdout: os.Stdout,
-		Stderr: os.Stderr,
-	}
-}
-
-// Run executes the program.
-func (cmd *Command) Run(args ...string) error {
-	config, path, err := cmd.parseFlags(args)
-	if err != nil {
-		return err
-	}
-
-	return cmd.Restore(config, path)
-}
-
-// Restore restores a database snapshot
-func (cmd *Command) Restore(config *Config, path string) error {
-	// Remove meta and data directories.
-	if err := os.RemoveAll(config.Meta.Dir); err != nil {
-		return fmt.Errorf("remove meta dir: %s", err)
-	} else if err := os.RemoveAll(config.Data.Dir); err != nil {
-		return fmt.Errorf("remove data dir: %s", err)
-	}
-
-	// Open snapshot file and all incremental backups.
-	mr, files, err := snapshot.OpenFileMultiReader(path)
-	if err != nil {
-		return fmt.Errorf("open multireader: %s", err)
-	}
-	defer closeAll(files)
-
-	// Unpack files from archive.
-	if err := cmd.unpack(mr, config); err != nil {
-		return fmt.Errorf("unpack: %s", err)
-	}
-
-	// Notify user of completion.
-	fmt.Fprintf(os.Stdout, "restore complete using %s", path)
-	return nil
-}
-
-// parseFlags parses and validates the command line arguments.
-func (cmd *Command) parseFlags(args []string) (*Config, string, error) {
-	fs := flag.NewFlagSet("", flag.ContinueOnError)
-	configPath := fs.String("config", "", "")
-	fs.SetOutput(cmd.Stderr)
-	fs.Usage = cmd.printUsage
-	if err := fs.Parse(args); err != nil {
-		return nil, "", err
-	}
-
-	// Parse configuration file from disk.
-	if *configPath == "" {
-		return nil, "", fmt.Errorf("config required")
-	}
-
-	// Parse config.
-	config := Config{
-		Meta: meta.NewConfig(),
-		Data: tsdb.NewConfig(),
-	}
-	if _, err := toml.DecodeFile(*configPath, &config); err != nil {
-		return nil, "", err
-	}
-
-	// Require output path.
-	path := fs.Arg(0)
-	if path == "" {
-		return nil, "", fmt.Errorf("snapshot path required")
-	}
-
-	return &config, path, nil
-}
-
-func closeAll(a []io.Closer) {
-	for _, c := range a {
-		_ = c.Close()
-	}
-}
-
-// unpack expands the files in the snapshot archive into a directory.
-func (cmd *Command) unpack(mr *snapshot.MultiReader, config *Config) error {
-	// Loop over files and extract.
-	for {
-		// Read entry header.
-		sf, err := mr.Next()
-		if err == io.EOF {
-			break
-		} else if err != nil {
-			return fmt.Errorf("next: entry=%s, err=%s", sf.Name, err)
-		}
-
-		// Log progress.
-		fmt.Fprintf(os.Stdout, "unpacking: %s (%d bytes)\n", sf.Name, sf.Size)
-
-		// Handle meta and tsdb files separately.
-		switch sf.Name {
-		case "meta":
-			if err := cmd.unpackMeta(mr, sf, config); err != nil {
-				return fmt.Errorf("meta: %s", err)
-			}
-		default:
-			if err := cmd.unpackData(mr, sf, config); err != nil {
-				return fmt.Errorf("data: %s", err)
-			}
-		}
-	}
-
-	return nil
-}
-
-// unpackMeta reads the metadata from the snapshot and initializes a raft
-// cluster and replaces the root metadata.
-func (cmd *Command) unpackMeta(mr *snapshot.MultiReader, sf snapshot.File, config *Config) error {
-	// Read meta into buffer.
-	var buf bytes.Buffer
-	if _, err := io.CopyN(&buf, mr, sf.Size); err != nil {
-		return fmt.Errorf("copy: %s", err)
-	}
-
-	// Unpack into metadata.
-	var data meta.Data
-	if err := data.UnmarshalBinary(buf.Bytes()); err != nil {
-		return fmt.Errorf("unmarshal: %s", err)
-	}
-
-	// Copy meta config and remove peers so it starts in single mode.
-	c := config.Meta
-	c.Peers = nil
-
-	// Initialize meta store.
-	store := meta.NewStore(config.Meta)
-	store.RaftListener = newNopListener()
-	store.ExecListener = newNopListener()
-	store.RPCListener = newNopListener()
-
-	// Determine advertised address.
-	_, port, err := net.SplitHostPort(config.Meta.BindAddress)
-	if err != nil {
-		return fmt.Errorf("split bind address: %s", err)
-	}
-	hostport := net.JoinHostPort(config.Meta.Hostname, port)
-
-	// Resolve address.
-	addr, err := net.ResolveTCPAddr("tcp", hostport)
-	if err != nil {
-		return fmt.Errorf("resolve tcp: addr=%s, err=%s", hostport, err)
-	}
-	store.Addr = addr
-	store.RemoteAddr = addr
-
-	// Open the meta store.
-	if err := store.Open(); err != nil {
-		return fmt.Errorf("open store: %s", err)
-	}
-	defer store.Close()
-
-	// Wait for the store to be ready or error.
-	select {
-	case <-store.Ready():
-	case err := <-store.Err():
-		return err
-	}
-
-	// Force set the full metadata.
-	if err := store.SetData(&data); err != nil {
-		return fmt.Errorf("set data: %s", err)
-	}
-
-	return nil
-}
-
-func (cmd *Command) unpackData(mr *snapshot.MultiReader, sf snapshot.File, config *Config) error {
-	path := filepath.Join(config.Data.Dir, sf.Name)
-	// Create parent directory for output file.
-	if err := os.MkdirAll(filepath.Dir(path), 0777); err != nil {
-		return fmt.Errorf("mkdir: entry=%s, err=%s", sf.Name, err)
-	}
-
-	// Create output file.
-	f, err := os.Create(path)
-	if err != nil {
-		return fmt.Errorf("create: entry=%s, err=%s", sf.Name, err)
-	}
-	defer f.Close()
-
-	// Copy contents from reader.
-	if _, err := io.CopyN(f, mr, sf.Size); err != nil {
-		return fmt.Errorf("copy: entry=%s, err=%s", sf.Name, err)
-	}
-
-	return nil
-}
-
-// printUsage prints the usage message to STDERR.
-func (cmd *Command) printUsage() {
-	fmt.Fprintf(cmd.Stderr, `usage: influxd restore [flags] PATH
-
-restore uses a snapshot of a data node to rebuild a cluster.
-
-        -config <path>
-                          Set the path to the configuration file.
-`)
-}
-
-// Config represents a partial config for rebuilding the server.
-type Config struct {
-	Meta *meta.Config `toml:"meta"`
-	Data tsdb.Config  `toml:"data"`
-}
-
-type nopListener struct {
-	closing chan struct{}
-}
-
-func newNopListener() *nopListener {
-	return &nopListener{make(chan struct{})}
-}
-
-func (ln *nopListener) Accept() (net.Conn, error) {
-	<-ln.closing
-	return nil, errors.New("listener closing")
-}
-
-func (ln *nopListener) Close() error {
-	if ln.closing != nil {
-		close(ln.closing)
-		ln.closing = nil
-	}
-	return nil
-}
-
-func (ln *nopListener) Addr() net.Addr { return nil }
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influxd/restore/restore_test.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influxd/restore/restore_test.go
deleted file mode 100644
index f9d974212..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influxd/restore/restore_test.go
+++ /dev/null
@@ -1,155 +0,0 @@
-package restore_test
-
-/*
-import (
-	"bytes"
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"reflect"
-	"testing"
-	"time"
-
-	main "github.com/influxdb/influxdb/cmd/influxd"
-	"github.com/influxdb/influxdb/tsdb"
-)
-
-func newConfig(path string, port int) main.Config {
-	config := main.NewConfig()
-	config.Port = port
-	config.Broker.Enabled = true
-	config.Broker.Dir = filepath.Join(path, "broker")
-
-	config.Data.Enabled = true
-	config.Data.Dir = filepath.Join(path, "data")
-	return *config
-}
-
-// Ensure the restore command can expand a snapshot and bootstrap a broker.
-func TestRestoreCommand(t *testing.T) {
-	if testing.Short() {
-		t.Skip("skipping TestRestoreCommand")
-	}
-
-	now := time.Now()
-
-	// Create root path to server.
-	path := tempfile()
-	defer os.Remove(path)
-
-	// Parse configuration.
-	config := newConfig(path, 8900)
-
-	// Start server.
-	cmd := main.NewRunCommand()
-	node := cmd.Open(&config, "")
-	if node.Broker == nil {
-		t.Fatal("cannot run broker")
-	} else if node.DataNode == nil {
-		t.Fatal("cannot run server")
-	}
-	b := node.Broker
-	s := node.DataNode
-
-	// Create data.
-	if err := s.CreateDatabase("db"); err != nil {
-		t.Fatalf("cannot create database: %s", err)
-	}
-	if index, err := s.WriteSeries("db", "default", []models.Point{tsdb.NewPoint("cpu", nil, map[string]interface{}{"value": float64(100)}, now)}); err != nil {
-		t.Fatalf("cannot write series: %s", err)
-	} else if err = s.Sync(1, index); err != nil {
-		t.Fatalf("shard sync: %s", err)
-	}
-
-	// Create snapshot writer.
-	sw, err := s.CreateSnapshotWriter()
-	if err != nil {
-		t.Fatalf("create snapshot writer: %s", err)
-	}
-
-	// Snapshot to file.
-	sspath := tempfile()
-	f, err := os.Create(sspath)
-	if err != nil {
-		t.Fatal(err)
-	}
-	sw.WriteTo(f)
-	f.Close()
-
-	// Stop server.
-	node.Close()
-
-	// Remove data & broker directories.
-	if err := os.RemoveAll(path); err != nil {
-		t.Fatalf("remove: %s", err)
-	}
-
-	// Execute the restore.
-	if err := NewRestoreCommand().Restore(&config, sspath); err != nil {
-		t.Fatal(err)
-	}
-
-	// Rewrite config to a new port and re-parse.
-	config = newConfig(path, 8910)
-
-	// Restart server.
-	cmd = main.NewRunCommand()
-	node = cmd.Open(&config, "")
-	if b == nil {
-		t.Fatal("cannot run broker")
-	} else if s == nil {
-		t.Fatal("cannot run server")
-	}
-	b = node.Broker
-	s = node.DataNode
-
-	// Write new data.
-	if err := s.CreateDatabase("newdb"); err != nil {
-		t.Fatalf("cannot create new database: %s", err)
-	}
-	if index, err := s.WriteSeries("newdb", "default", []models.Point{tsdb.NewPoint("mem", nil, map[string]interface{}{"value": float64(1000)}, now)}); err != nil {
-		t.Fatalf("cannot write new series: %s", err)
-	} else if err = s.Sync(2, index); err != nil {
-		t.Fatalf("shard sync: %s", err)
-	}
-
-	// Read series data.
-	if v, err := s.ReadSeries("db", "default", "cpu", nil, now); err != nil {
-		t.Fatal(err)
-	} else if !reflect.DeepEqual(v, map[string]interface{}{"value": float64(100)}) {
-		t.Fatalf("read series(0) mismatch: %#v", v)
-	}
-
-	// Read new series data.
-	if v, err := s.ReadSeries("newdb", "default", "mem", nil, now); err != nil {
-		t.Fatal(err)
-	} else if !reflect.DeepEqual(v, map[string]interface{}{"value": float64(1000)}) {
-		t.Fatalf("read series(1) mismatch: %#v", v)
-	}
-
-	// Stop server.
-	node.Close()
-}
-
-// RestoreCommand is a test wrapper for main.RestoreCommand.
-type RestoreCommand struct {
-	*main.RestoreCommand
-	Stderr bytes.Buffer
-}
-
-// NewRestoreCommand returns a new instance of RestoreCommand.
-func NewRestoreCommand() *RestoreCommand {
-	cmd := &RestoreCommand{RestoreCommand: main.NewRestoreCommand()}
-	cmd.RestoreCommand.Stderr = &cmd.Stderr
-	return cmd
-}
-
-// MustReadFile reads data from a file. Panic on error.
-func MustReadFile(filename string) []byte {
-	b, err := ioutil.ReadFile(filename)
-	if err != nil {
-		panic(err.Error())
-	}
-	return b
-}
-*/
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influxd/run/command.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influxd/run/command.go
deleted file mode 100644
index e7974a3f4..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influxd/run/command.go
+++ /dev/null
@@ -1,243 +0,0 @@
-package run
-
-import (
-	"flag"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"log"
-	"os"
-	"path/filepath"
-	"runtime"
-	"strconv"
-	"strings"
-	"time"
-
-	"github.com/BurntSushi/toml"
-)
-
-const logo = `
- 8888888           .d888 888                   8888888b.  888888b.
-   888            d88P"  888                   888  "Y88b 888  "88b
-   888            888    888                   888    888 888  .88P
-   888   88888b.  888888 888 888  888 888  888 888    888 8888888K.
-   888   888 "88b 888    888 888  888  Y8bd8P' 888    888 888  "Y88b
-   888   888  888 888    888 888  888   X88K   888    888 888    888
-   888   888  888 888    888 Y88b 888 .d8""8b. 888  .d88P 888   d88P
- 8888888 888  888 888    888  "Y88888 888  888 8888888P"  8888888P"
-
-`
-
-// Command represents the command executed by "influxd run".
-type Command struct {
-	Version   string
-	Branch    string
-	Commit    string
-	BuildTime string
-
-	closing chan struct{}
-	Closed  chan struct{}
-
-	Stdin  io.Reader
-	Stdout io.Writer
-	Stderr io.Writer
-
-	Server *Server
-}
-
-// NewCommand return a new instance of Command.
-func NewCommand() *Command {
-	return &Command{
-		closing: make(chan struct{}),
-		Closed:  make(chan struct{}),
-		Stdin:   os.Stdin,
-		Stdout:  os.Stdout,
-		Stderr:  os.Stderr,
-	}
-}
-
-// Run parses the config from args and runs the server.
-func (cmd *Command) Run(args ...string) error {
-	// Parse the command line flags.
-	options, err := cmd.ParseFlags(args...)
-	if err != nil {
-		return err
-	}
-
-	// Print sweet InfluxDB logo.
-	fmt.Print(logo)
-
-	// Mark start-up in log.
-	log.Printf("InfluxDB starting, version %s, branch %s, commit %s, built %s",
-		cmd.Version, cmd.Branch, cmd.Commit, cmd.BuildTime)
-	log.Printf("Go version %s, GOMAXPROCS set to %d", runtime.Version(), runtime.GOMAXPROCS(0))
-
-	// Set parallelism.
-	runtime.GOMAXPROCS(runtime.NumCPU())
-
-	// Write the PID file.
-	if err := cmd.writePIDFile(options.PIDFile); err != nil {
-		return fmt.Errorf("write pid file: %s", err)
-	}
-
-	// Turn on block profiling to debug stuck databases
-	runtime.SetBlockProfileRate(int(1 * time.Second))
-
-	// Parse config
-	config, err := cmd.ParseConfig(options.ConfigPath)
-	if err != nil {
-		return fmt.Errorf("parse config: %s", err)
-	}
-
-	// Apply any environment variables on top of the parsed config
-	if err := config.ApplyEnvOverrides(); err != nil {
-		return fmt.Errorf("apply env config: %v", err)
-	}
-
-	// Override config hostname if specified in the command line args.
-	if options.Hostname != "" {
-		config.Meta.Hostname = options.Hostname
-	}
-
-	if options.Join != "" {
-		config.Meta.Peers = strings.Split(options.Join, ",")
-	}
-
-	// Validate the configuration.
-	if err := config.Validate(); err != nil {
-		return fmt.Errorf("%s. To generate a valid configuration file run `influxd config > influxdb.generated.conf`", err)
-	}
-
-	// Create server from config and start it.
-	buildInfo := &BuildInfo{
-		Version: cmd.Version,
-		Commit:  cmd.Commit,
-		Branch:  cmd.Branch,
-		Time:    cmd.BuildTime,
-	}
-	s, err := NewServer(config, buildInfo)
-	if err != nil {
-		return fmt.Errorf("create server: %s", err)
-	}
-	s.CPUProfile = options.CPUProfile
-	s.MemProfile = options.MemProfile
-	if err := s.Open(); err != nil {
-		return fmt.Errorf("open server: %s", err)
-	}
-	cmd.Server = s
-
-	// Begin monitoring the server's error channel.
-	go cmd.monitorServerErrors()
-
-	return nil
-}
-
-// Close shuts down the server.
-func (cmd *Command) Close() error {
-	defer close(cmd.Closed)
-	close(cmd.closing)
-	if cmd.Server != nil {
-		return cmd.Server.Close()
-	}
-	return nil
-}
-
-func (cmd *Command) monitorServerErrors() {
-	logger := log.New(cmd.Stderr, "", log.LstdFlags)
-	for {
-		select {
-		case err := <-cmd.Server.Err():
-			logger.Println(err)
-		case <-cmd.closing:
-			return
-		}
-	}
-}
-
-// ParseFlags parses the command line flags from args and returns an options set.
-func (cmd *Command) ParseFlags(args ...string) (Options, error) {
-	var options Options
-	fs := flag.NewFlagSet("", flag.ContinueOnError)
-	fs.StringVar(&options.ConfigPath, "config", "", "")
-	fs.StringVar(&options.PIDFile, "pidfile", "", "")
-	fs.StringVar(&options.Hostname, "hostname", "", "")
-	fs.StringVar(&options.Join, "join", "", "")
-	fs.StringVar(&options.CPUProfile, "cpuprofile", "", "")
-	fs.StringVar(&options.MemProfile, "memprofile", "", "")
-	fs.Usage = func() { fmt.Fprintln(cmd.Stderr, usage) }
-	if err := fs.Parse(args); err != nil {
-		return Options{}, err
-	}
-	return options, nil
-}
-
-// writePIDFile writes the process ID to path.
-func (cmd *Command) writePIDFile(path string) error {
-	// Ignore if path is not set.
-	if path == "" {
-		return nil
-	}
-
-	// Ensure the required directory structure exists.
-	err := os.MkdirAll(filepath.Dir(path), 0777)
-	if err != nil {
-		return fmt.Errorf("mkdir: %s", err)
-	}
-
-	// Retrieve the PID and write it.
-	pid := strconv.Itoa(os.Getpid())
-	if err := ioutil.WriteFile(path, []byte(pid), 0666); err != nil {
-		return fmt.Errorf("write file: %s", err)
-	}
-
-	return nil
-}
-
-// ParseConfig parses the config at path.
-// Returns a demo configuration if path is blank.
-func (cmd *Command) ParseConfig(path string) (*Config, error) {
-	// Use demo configuration if no config path is specified.
-	if path == "" {
-		log.Println("no configuration provided, using default settings")
-		return NewDemoConfig()
-	}
-
-	log.Printf("Using configuration at: %s\n", path)
-
-	config := NewConfig()
-	if _, err := toml.DecodeFile(path, &config); err != nil {
-		return nil, err
-	}
-
-	return config, nil
-}
-
-var usage = `usage: run [flags]
-
-run starts the broker and data node server. If this is the first time running
-the command then a new cluster will be initialized unless the -join argument
-is used.
-
-        -config <path>
-                          Set the path to the configuration file.
-
-        -hostname <name>
-                          Override the hostname, the 'hostname' configuration
-                          option will be overridden.
-
-        -join <url>
-                          Joins the server to an existing cluster.
-
-        -pidfile <path>
-                          Write process ID to a file.
-`
-
-// Options represents the command line options that can be parsed.
-type Options struct {
-	ConfigPath string
-	PIDFile    string
-	Hostname   string
-	Join       string
-	CPUProfile string
-	MemProfile string
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influxd/run/config.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influxd/run/config.go
deleted file mode 100644
index 92474baaa..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influxd/run/config.go
+++ /dev/null
@@ -1,233 +0,0 @@
-package run
-
-import (
-	"errors"
-	"fmt"
-	"os"
-	"os/user"
-	"path/filepath"
-	"reflect"
-	"strconv"
-	"strings"
-	"time"
-
-	"github.com/influxdb/influxdb/cluster"
-	"github.com/influxdb/influxdb/meta"
-	"github.com/influxdb/influxdb/monitor"
-	"github.com/influxdb/influxdb/services/admin"
-	"github.com/influxdb/influxdb/services/collectd"
-	"github.com/influxdb/influxdb/services/continuous_querier"
-	"github.com/influxdb/influxdb/services/graphite"
-	"github.com/influxdb/influxdb/services/hh"
-	"github.com/influxdb/influxdb/services/httpd"
-	"github.com/influxdb/influxdb/services/opentsdb"
-	"github.com/influxdb/influxdb/services/precreator"
-	"github.com/influxdb/influxdb/services/registration"
-	"github.com/influxdb/influxdb/services/retention"
-	"github.com/influxdb/influxdb/services/subscriber"
-	"github.com/influxdb/influxdb/services/udp"
-	"github.com/influxdb/influxdb/tsdb"
-)
-
-// Config represents the configuration format for the influxd binary.
-type Config struct {
-	Meta         *meta.Config        `toml:"meta"`
-	Data         tsdb.Config         `toml:"data"`
-	Cluster      cluster.Config      `toml:"cluster"`
-	Retention    retention.Config    `toml:"retention"`
-	Registration registration.Config `toml:"registration"`
-	Precreator   precreator.Config   `toml:"shard-precreation"`
-
-	Admin      admin.Config      `toml:"admin"`
-	Monitor    monitor.Config    `toml:"monitor"`
-	Subscriber subscriber.Config `toml:"subscriber"`
-	HTTPD      httpd.Config      `toml:"http"`
-	Graphites  []graphite.Config `toml:"graphite"`
-	Collectd   collectd.Config   `toml:"collectd"`
-	OpenTSDB   opentsdb.Config   `toml:"opentsdb"`
-	UDPs       []udp.Config      `toml:"udp"`
-
-	// Snapshot SnapshotConfig `toml:"snapshot"`
-	ContinuousQuery continuous_querier.Config `toml:"continuous_queries"`
-
-	HintedHandoff hh.Config `toml:"hinted-handoff"`
-
-	// Server reporting
-	ReportingDisabled bool `toml:"reporting-disabled"`
-}
-
-// NewConfig returns an instance of Config with reasonable defaults.
-func NewConfig() *Config {
-	c := &Config{}
-	c.Meta = meta.NewConfig()
-	c.Data = tsdb.NewConfig()
-	c.Cluster = cluster.NewConfig()
-	c.Registration = registration.NewConfig()
-	c.Precreator = precreator.NewConfig()
-
-	c.Admin = admin.NewConfig()
-	c.Monitor = monitor.NewConfig()
-	c.Subscriber = subscriber.NewConfig()
-	c.HTTPD = httpd.NewConfig()
-	c.Collectd = collectd.NewConfig()
-	c.OpenTSDB = opentsdb.NewConfig()
-
-	c.ContinuousQuery = continuous_querier.NewConfig()
-	c.Retention = retention.NewConfig()
-	c.HintedHandoff = hh.NewConfig()
-
-	return c
-}
-
-// NewDemoConfig returns the config that runs when no config is specified.
-func NewDemoConfig() (*Config, error) {
-	c := NewConfig()
-
-	var homeDir string
-	// By default, store meta and data files in current users home directory
-	u, err := user.Current()
-	if err == nil {
-		homeDir = u.HomeDir
-	} else if os.Getenv("HOME") != "" {
-		homeDir = os.Getenv("HOME")
-	} else {
-		return nil, fmt.Errorf("failed to determine current user for storage")
-	}
-
-	c.Meta.Dir = filepath.Join(homeDir, ".influxdb/meta")
-	c.Data.Dir = filepath.Join(homeDir, ".influxdb/data")
-	c.HintedHandoff.Dir = filepath.Join(homeDir, ".influxdb/hh")
-	c.Data.WALDir = filepath.Join(homeDir, ".influxdb/wal")
-
-	c.HintedHandoff.Enabled = true
-	c.Admin.Enabled = true
-
-	return c, nil
-}
-
-// Validate returns an error if the config is invalid.
-func (c *Config) Validate() error {
-	if c.Meta.Dir == "" {
-		return errors.New("Meta.Dir must be specified")
-	} else if c.HintedHandoff.Enabled && c.HintedHandoff.Dir == "" {
-		return errors.New("HintedHandoff.Dir must be specified")
-	}
-
-	if err := c.Data.Validate(); err != nil {
-		return err
-	}
-
-	for _, g := range c.Graphites {
-		if err := g.Validate(); err != nil {
-			return fmt.Errorf("invalid graphite config: %v", err)
-		}
-	}
-	return nil
-}
-
-// ApplyEnvOverrides apply the environment configuration on top of the config.
-func (c *Config) ApplyEnvOverrides() error {
-	return c.applyEnvOverrides("INFLUXDB", reflect.ValueOf(c))
-}
-
-func (c *Config) applyEnvOverrides(prefix string, spec reflect.Value) error {
-	// If we have a pointer, dereference it
-	s := spec
-	if spec.Kind() == reflect.Ptr {
-		s = spec.Elem()
-	}
-
-	// Make sure we have struct
-	if s.Kind() != reflect.Struct {
-		return nil
-	}
-
-	typeOfSpec := s.Type()
-	for i := 0; i < s.NumField(); i++ {
-		f := s.Field(i)
-		// Get the toml tag to determine what env var name to use
-		configName := typeOfSpec.Field(i).Tag.Get("toml")
-		// Replace hyphens with underscores to avoid issues with shells
-		configName = strings.Replace(configName, "-", "_", -1)
-		fieldKey := typeOfSpec.Field(i).Name
-
-		// Skip any fields that we cannot set
-		if f.CanSet() || f.Kind() == reflect.Slice {
-
-			// Use the upper-case prefix and toml name for the env var
-			key := strings.ToUpper(configName)
-			if prefix != "" {
-				key = strings.ToUpper(fmt.Sprintf("%s_%s", prefix, configName))
-			}
-			value := os.Getenv(key)
-
-			// If the type is s slice, apply to each using the index as a suffix
-			// e.g. GRAPHITE_0
-			if f.Kind() == reflect.Slice || f.Kind() == reflect.Array {
-				for i := 0; i < f.Len(); i++ {
-					if err := c.applyEnvOverrides(fmt.Sprintf("%s_%d", key, i), f.Index(i)); err != nil {
-						return err
-					}
-				}
-				continue
-			}
-
-			// If it's a sub-config, recursively apply
-			if f.Kind() == reflect.Struct || f.Kind() == reflect.Ptr {
-				if err := c.applyEnvOverrides(key, f); err != nil {
-					return err
-				}
-				continue
-			}
-
-			// Skip any fields we don't have a value to set
-			if value == "" {
-				continue
-			}
-
-			switch f.Kind() {
-			case reflect.String:
-				f.SetString(value)
-			case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
-
-				var intValue int64
-
-				// Handle toml.Duration
-				if f.Type().Name() == "Duration" {
-					dur, err := time.ParseDuration(value)
-					if err != nil {
-						return fmt.Errorf("failed to apply %v to %v using type %v and value '%v'", key, fieldKey, f.Type().String(), value)
-					}
-					intValue = dur.Nanoseconds()
-				} else {
-					var err error
-					intValue, err = strconv.ParseInt(value, 0, f.Type().Bits())
-					if err != nil {
-						return fmt.Errorf("failed to apply %v to %v using type %v and value '%v'", key, fieldKey, f.Type().String(), value)
-					}
-				}
-
-				f.SetInt(intValue)
-			case reflect.Bool:
-				boolValue, err := strconv.ParseBool(value)
-				if err != nil {
-					return fmt.Errorf("failed to apply %v to %v using type %v and value '%v'", key, fieldKey, f.Type().String(), value)
-
-				}
-				f.SetBool(boolValue)
-			case reflect.Float32, reflect.Float64:
-				floatValue, err := strconv.ParseFloat(value, f.Type().Bits())
-				if err != nil {
-					return fmt.Errorf("failed to apply %v to %v using type %v and value '%v'", key, fieldKey, f.Type().String(), value)
-
-				}
-				f.SetFloat(floatValue)
-			default:
-				if err := c.applyEnvOverrides(key, f); err != nil {
-					return err
-				}
-			}
-		}
-	}
-	return nil
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influxd/run/config_command.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influxd/run/config_command.go
deleted file mode 100644
index 7bb0d4e5b..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influxd/run/config_command.go
+++ /dev/null
@@ -1,83 +0,0 @@
-package run
-
-import (
-	"flag"
-	"fmt"
-	"io"
-	"os"
-
-	"github.com/BurntSushi/toml"
-)
-
-// PrintConfigCommand represents the command executed by "influxd config".
-type PrintConfigCommand struct {
-	Stdin  io.Reader
-	Stdout io.Writer
-	Stderr io.Writer
-}
-
-// NewPrintConfigCommand return a new instance of PrintConfigCommand.
-func NewPrintConfigCommand() *PrintConfigCommand {
-	return &PrintConfigCommand{
-		Stdin:  os.Stdin,
-		Stdout: os.Stdout,
-		Stderr: os.Stderr,
-	}
-}
-
-// Run parses and prints the current config loaded.
-func (cmd *PrintConfigCommand) Run(args ...string) error {
-	// Parse command flags.
-	fs := flag.NewFlagSet("", flag.ContinueOnError)
-	configPath := fs.String("config", "", "")
-	hostname := fs.String("hostname", "", "")
-	fs.Usage = func() { fmt.Fprintln(cmd.Stderr, printConfigUsage) }
-	if err := fs.Parse(args); err != nil {
-		return err
-	}
-
-	// Parse config from path.
-	config, err := cmd.parseConfig(*configPath)
-	if err != nil {
-		return fmt.Errorf("parse config: %s", err)
-	}
-
-	// Apply any environment variables on top of the parsed config
-	if err := config.ApplyEnvOverrides(); err != nil {
-		return fmt.Errorf("apply env config: %v", err)
-	}
-
-	// Override config properties.
-	if *hostname != "" {
-		config.Meta.Hostname = *hostname
-	}
-
-	// Validate the configuration.
-	if err := config.Validate(); err != nil {
-		return fmt.Errorf("%s. To generate a valid configuration file run `influxd config > influxdb.generated.conf`", err)
-	}
-
-	toml.NewEncoder(cmd.Stdout).Encode(config)
-	fmt.Fprint(cmd.Stdout, "\n")
-
-	return nil
-}
-
-// ParseConfig parses the config at path.
-// Returns a demo configuration if path is blank.
-func (cmd *PrintConfigCommand) parseConfig(path string) (*Config, error) {
-	if path == "" {
-		return NewDemoConfig()
-	}
-
-	config := NewConfig()
-	if _, err := toml.DecodeFile(path, &config); err != nil {
-		return nil, err
-	}
-	return config, nil
-}
-
-var printConfigUsage = `usage: config
-
-	config displays the default configuration
-`
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influxd/run/config_test.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influxd/run/config_test.go
deleted file mode 100644
index c3312ef96..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influxd/run/config_test.go
+++ /dev/null
@@ -1,147 +0,0 @@
-package run_test
-
-import (
-	"os"
-	"testing"
-
-	"github.com/BurntSushi/toml"
-	"github.com/influxdb/influxdb/cmd/influxd/run"
-)
-
-// Ensure the configuration can be parsed.
-func TestConfig_Parse(t *testing.T) {
-	// Parse configuration.
-	var c run.Config
-	if _, err := toml.Decode(`
-[meta]
-dir = "/tmp/meta"
-
-[data]
-dir = "/tmp/data"
-
-[cluster]
-
-[admin]
-bind-address = ":8083"
-
-[http]
-bind-address = ":8087"
-
-[[graphite]]
-protocol = "udp"
-
-[[graphite]]
-protocol = "tcp"
-
-[collectd]
-bind-address = ":1000"
-
-[opentsdb]
-bind-address = ":2000"
-
-[[udp]]
-bind-address = ":4444"
-
-[monitoring]
-enabled = true
-
-[subscriber]
-enabled = true
-
-[continuous_queries]
-enabled = true
-`, &c); err != nil {
-		t.Fatal(err)
-	}
-
-	// Validate configuration.
-	if c.Meta.Dir != "/tmp/meta" {
-		t.Fatalf("unexpected meta dir: %s", c.Meta.Dir)
-	} else if c.Data.Dir != "/tmp/data" {
-		t.Fatalf("unexpected data dir: %s", c.Data.Dir)
-	} else if c.Admin.BindAddress != ":8083" {
-		t.Fatalf("unexpected admin bind address: %s", c.Admin.BindAddress)
-	} else if c.HTTPD.BindAddress != ":8087" {
-		t.Fatalf("unexpected api bind address: %s", c.HTTPD.BindAddress)
-	} else if len(c.Graphites) != 2 {
-		t.Fatalf("unexpected graphites count: %d", len(c.Graphites))
-	} else if c.Graphites[0].Protocol != "udp" {
-		t.Fatalf("unexpected graphite protocol(0): %s", c.Graphites[0].Protocol)
-	} else if c.Graphites[1].Protocol != "tcp" {
-		t.Fatalf("unexpected graphite protocol(1): %s", c.Graphites[1].Protocol)
-	} else if c.Collectd.BindAddress != ":1000" {
-		t.Fatalf("unexpected collectd bind address: %s", c.Collectd.BindAddress)
-	} else if c.OpenTSDB.BindAddress != ":2000" {
-		t.Fatalf("unexpected opentsdb bind address: %s", c.OpenTSDB.BindAddress)
-	} else if c.UDPs[0].BindAddress != ":4444" {
-		t.Fatalf("unexpected udp bind address: %s", c.UDPs[0].BindAddress)
-	} else if c.Subscriber.Enabled != true {
-		t.Fatalf("unexpected subscriber enabled: %v", c.Subscriber.Enabled)
-	} else if c.ContinuousQuery.Enabled != true {
-		t.Fatalf("unexpected continuous query enabled: %v", c.ContinuousQuery.Enabled)
-	}
-}
-
-// Ensure the configuration can be parsed.
-func TestConfig_Parse_EnvOverride(t *testing.T) {
-	// Parse configuration.
-	var c run.Config
-	if _, err := toml.Decode(`
-[meta]
-dir = "/tmp/meta"
-
-[data]
-dir = "/tmp/data"
-
-[cluster]
-
-[admin]
-bind-address = ":8083"
-
-[http]
-bind-address = ":8087"
-
-[[graphite]]
-protocol = "udp"
-
-[[graphite]]
-protocol = "tcp"
-
-[collectd]
-bind-address = ":1000"
-
-[opentsdb]
-bind-address = ":2000"
-
-[[udp]]
-bind-address = ":4444"
-
-[monitoring]
-enabled = true
-
-[continuous_queries]
-enabled = true
-`, &c); err != nil {
-		t.Fatal(err)
-	}
-
-	if err := os.Setenv("INFLUXDB_UDP_BIND_ADDRESS", ":1234"); err != nil {
-		t.Fatalf("failed to set env var: %v", err)
-	}
-
-	if err := os.Setenv("INFLUXDB_GRAPHITE_1_PROTOCOL", "udp"); err != nil {
-		t.Fatalf("failed to set env var: %v", err)
-	}
-
-	if err := c.ApplyEnvOverrides(); err != nil {
-		t.Fatalf("failed to apply env overrides: %v", err)
-	}
-
-	if c.UDPs[0].BindAddress != ":4444" {
-		t.Fatalf("unexpected udp bind address: %s", c.UDPs[0].BindAddress)
-	}
-
-	if c.Graphites[1].Protocol != "udp" {
-		t.Fatalf("unexpected graphite protocol(0): %s", c.Graphites[0].Protocol)
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influxd/run/server.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influxd/run/server.go
deleted file mode 100644
index e19b29cd4..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influxd/run/server.go
+++ /dev/null
@@ -1,646 +0,0 @@
-package run
-
-import (
-	"fmt"
-	"log"
-	"net"
-	"os"
-	"runtime"
-	"runtime/pprof"
-	"strings"
-	"time"
-
-	"github.com/influxdb/enterprise-client/v1"
-	"github.com/influxdb/influxdb/cluster"
-	"github.com/influxdb/influxdb/meta"
-	"github.com/influxdb/influxdb/monitor"
-	"github.com/influxdb/influxdb/services/admin"
-	"github.com/influxdb/influxdb/services/collectd"
-	"github.com/influxdb/influxdb/services/continuous_querier"
-	"github.com/influxdb/influxdb/services/copier"
-	"github.com/influxdb/influxdb/services/graphite"
-	"github.com/influxdb/influxdb/services/hh"
-	"github.com/influxdb/influxdb/services/httpd"
-	"github.com/influxdb/influxdb/services/opentsdb"
-	"github.com/influxdb/influxdb/services/precreator"
-	"github.com/influxdb/influxdb/services/registration"
-	"github.com/influxdb/influxdb/services/retention"
-	"github.com/influxdb/influxdb/services/snapshotter"
-	"github.com/influxdb/influxdb/services/subscriber"
-	"github.com/influxdb/influxdb/services/udp"
-	"github.com/influxdb/influxdb/tcp"
-	"github.com/influxdb/influxdb/tsdb"
-	// Initialize the engine packages
-	_ "github.com/influxdb/influxdb/tsdb/engine"
-)
-
-// BuildInfo represents the build details for the server code.
-type BuildInfo struct {
-	Version string
-	Commit  string
-	Branch  string
-	Time    string
-}
-
-// Server represents a container for the metadata and storage data and services.
-// It is built using a Config and it manages the startup and shutdown of all
-// services in the proper order.
-type Server struct {
-	buildInfo BuildInfo
-
-	err     chan error
-	closing chan struct{}
-
-	Hostname    string
-	BindAddress string
-	Listener    net.Listener
-
-	MetaStore     *meta.Store
-	TSDBStore     *tsdb.Store
-	QueryExecutor *tsdb.QueryExecutor
-	PointsWriter  *cluster.PointsWriter
-	ShardWriter   *cluster.ShardWriter
-	ShardMapper   *cluster.ShardMapper
-	HintedHandoff *hh.Service
-	Subscriber    *subscriber.Service
-
-	Services []Service
-
-	// These references are required for the tcp muxer.
-	ClusterService     *cluster.Service
-	SnapshotterService *snapshotter.Service
-	CopierService      *copier.Service
-
-	Monitor *monitor.Monitor
-
-	// Server reporting and registration
-	reportingDisabled bool
-
-	// Profiling
-	CPUProfile string
-	MemProfile string
-}
-
-// NewServer returns a new instance of Server built from a config.
-func NewServer(c *Config, buildInfo *BuildInfo) (*Server, error) {
-	// Construct base meta store and data store.
-	tsdbStore := tsdb.NewStore(c.Data.Dir)
-	tsdbStore.EngineOptions.Config = c.Data
-
-	s := &Server{
-		buildInfo: *buildInfo,
-		err:       make(chan error),
-		closing:   make(chan struct{}),
-
-		Hostname:    c.Meta.Hostname,
-		BindAddress: c.Meta.BindAddress,
-
-		MetaStore: meta.NewStore(c.Meta),
-		TSDBStore: tsdbStore,
-
-		Monitor: monitor.New(c.Monitor),
-
-		reportingDisabled: c.ReportingDisabled,
-	}
-
-	// Copy TSDB configuration.
-	s.TSDBStore.EngineOptions.EngineVersion = c.Data.Engine
-	s.TSDBStore.EngineOptions.MaxWALSize = c.Data.MaxWALSize
-	s.TSDBStore.EngineOptions.WALFlushInterval = time.Duration(c.Data.WALFlushInterval)
-	s.TSDBStore.EngineOptions.WALPartitionFlushDelay = time.Duration(c.Data.WALPartitionFlushDelay)
-
-	// Set the shard mapper
-	s.ShardMapper = cluster.NewShardMapper(time.Duration(c.Cluster.ShardMapperTimeout))
-	s.ShardMapper.ForceRemoteMapping = c.Cluster.ForceRemoteShardMapping
-	s.ShardMapper.MetaStore = s.MetaStore
-	s.ShardMapper.TSDBStore = s.TSDBStore
-
-	// Initialize query executor.
-	s.QueryExecutor = tsdb.NewQueryExecutor(s.TSDBStore)
-	s.QueryExecutor.MetaStore = s.MetaStore
-	s.QueryExecutor.MetaStatementExecutor = &meta.StatementExecutor{Store: s.MetaStore}
-	s.QueryExecutor.MonitorStatementExecutor = &monitor.StatementExecutor{Monitor: s.Monitor}
-	s.QueryExecutor.ShardMapper = s.ShardMapper
-	s.QueryExecutor.QueryLogEnabled = c.Data.QueryLogEnabled
-
-	// Set the shard writer
-	s.ShardWriter = cluster.NewShardWriter(time.Duration(c.Cluster.ShardWriterTimeout))
-	s.ShardWriter.MetaStore = s.MetaStore
-
-	// Create the hinted handoff service
-	s.HintedHandoff = hh.NewService(c.HintedHandoff, s.ShardWriter, s.MetaStore)
-	s.HintedHandoff.Monitor = s.Monitor
-
-	// Create the Subscriber service
-	s.Subscriber = subscriber.NewService(c.Subscriber)
-	s.Subscriber.MetaStore = s.MetaStore
-
-	// Initialize points writer.
-	s.PointsWriter = cluster.NewPointsWriter()
-	s.PointsWriter.WriteTimeout = time.Duration(c.Cluster.WriteTimeout)
-	s.PointsWriter.MetaStore = s.MetaStore
-	s.PointsWriter.TSDBStore = s.TSDBStore
-	s.PointsWriter.ShardWriter = s.ShardWriter
-	s.PointsWriter.HintedHandoff = s.HintedHandoff
-	s.PointsWriter.Subscriber = s.Subscriber
-
-	// needed for executing INTO queries.
-	s.QueryExecutor.IntoWriter = s.PointsWriter
-
-	// Initialize the monitor
-	s.Monitor.Version = s.buildInfo.Version
-	s.Monitor.Commit = s.buildInfo.Commit
-	s.Monitor.Branch = s.buildInfo.Branch
-	s.Monitor.BuildTime = s.buildInfo.Time
-	s.Monitor.MetaStore = s.MetaStore
-	s.Monitor.PointsWriter = s.PointsWriter
-
-	// Append services.
-	s.appendClusterService(c.Cluster)
-	s.appendPrecreatorService(c.Precreator)
-	s.appendRegistrationService(c.Registration)
-	s.appendSnapshotterService()
-	s.appendCopierService()
-	s.appendAdminService(c.Admin)
-	s.appendContinuousQueryService(c.ContinuousQuery)
-	s.appendHTTPDService(c.HTTPD)
-	s.appendCollectdService(c.Collectd)
-	if err := s.appendOpenTSDBService(c.OpenTSDB); err != nil {
-		return nil, err
-	}
-	for _, g := range c.UDPs {
-		s.appendUDPService(g)
-	}
-	s.appendRetentionPolicyService(c.Retention)
-	for _, g := range c.Graphites {
-		if err := s.appendGraphiteService(g); err != nil {
-			return nil, err
-		}
-	}
-
-	return s, nil
-}
-
-func (s *Server) appendClusterService(c cluster.Config) {
-	srv := cluster.NewService(c)
-	srv.TSDBStore = s.TSDBStore
-	srv.MetaStore = s.MetaStore
-	s.Services = append(s.Services, srv)
-	s.ClusterService = srv
-}
-
-func (s *Server) appendSnapshotterService() {
-	srv := snapshotter.NewService()
-	srv.TSDBStore = s.TSDBStore
-	srv.MetaStore = s.MetaStore
-	s.Services = append(s.Services, srv)
-	s.SnapshotterService = srv
-}
-
-func (s *Server) appendCopierService() {
-	srv := copier.NewService()
-	srv.TSDBStore = s.TSDBStore
-	s.Services = append(s.Services, srv)
-	s.CopierService = srv
-}
-
-func (s *Server) appendRetentionPolicyService(c retention.Config) {
-	if !c.Enabled {
-		return
-	}
-	srv := retention.NewService(c)
-	srv.MetaStore = s.MetaStore
-	srv.TSDBStore = s.TSDBStore
-	s.Services = append(s.Services, srv)
-}
-
-func (s *Server) appendAdminService(c admin.Config) {
-	if !c.Enabled {
-		return
-	}
-	srv := admin.NewService(c)
-	s.Services = append(s.Services, srv)
-}
-
-func (s *Server) appendHTTPDService(c httpd.Config) {
-	if !c.Enabled {
-		return
-	}
-	srv := httpd.NewService(c)
-	srv.Handler.MetaStore = s.MetaStore
-	srv.Handler.QueryExecutor = s.QueryExecutor
-	srv.Handler.PointsWriter = s.PointsWriter
-	srv.Handler.Version = s.buildInfo.Version
-
-	// If a ContinuousQuerier service has been started, attach it.
-	for _, srvc := range s.Services {
-		if cqsrvc, ok := srvc.(continuous_querier.ContinuousQuerier); ok {
-			srv.Handler.ContinuousQuerier = cqsrvc
-		}
-	}
-
-	s.Services = append(s.Services, srv)
-}
-
-func (s *Server) appendCollectdService(c collectd.Config) {
-	if !c.Enabled {
-		return
-	}
-	srv := collectd.NewService(c)
-	srv.MetaStore = s.MetaStore
-	srv.PointsWriter = s.PointsWriter
-	s.Services = append(s.Services, srv)
-}
-
-func (s *Server) appendOpenTSDBService(c opentsdb.Config) error {
-	if !c.Enabled {
-		return nil
-	}
-	srv, err := opentsdb.NewService(c)
-	if err != nil {
-		return err
-	}
-	srv.PointsWriter = s.PointsWriter
-	srv.MetaStore = s.MetaStore
-	s.Services = append(s.Services, srv)
-	return nil
-}
-
-func (s *Server) appendGraphiteService(c graphite.Config) error {
-	if !c.Enabled {
-		return nil
-	}
-	srv, err := graphite.NewService(c)
-	if err != nil {
-		return err
-	}
-
-	srv.PointsWriter = s.PointsWriter
-	srv.MetaStore = s.MetaStore
-	srv.Monitor = s.Monitor
-	s.Services = append(s.Services, srv)
-	return nil
-}
-
-func (s *Server) appendPrecreatorService(c precreator.Config) error {
-	if !c.Enabled {
-		return nil
-	}
-	srv, err := precreator.NewService(c)
-	if err != nil {
-		return err
-	}
-
-	srv.MetaStore = s.MetaStore
-	s.Services = append(s.Services, srv)
-	return nil
-}
-
-func (s *Server) appendRegistrationService(c registration.Config) error {
-	if !c.Enabled {
-		return nil
-	}
-	srv, err := registration.NewService(c, s.buildInfo.Version)
-	if err != nil {
-		return err
-	}
-
-	srv.MetaStore = s.MetaStore
-	srv.Monitor = s.Monitor
-	s.Services = append(s.Services, srv)
-	return nil
-}
-
-func (s *Server) appendUDPService(c udp.Config) {
-	if !c.Enabled {
-		return
-	}
-	srv := udp.NewService(c)
-	srv.PointsWriter = s.PointsWriter
-	srv.MetaStore = s.MetaStore
-	s.Services = append(s.Services, srv)
-}
-
-func (s *Server) appendContinuousQueryService(c continuous_querier.Config) {
-	if !c.Enabled {
-		return
-	}
-	srv := continuous_querier.NewService(c)
-	srv.MetaStore = s.MetaStore
-	srv.QueryExecutor = s.QueryExecutor
-	s.Services = append(s.Services, srv)
-}
-
-// Err returns an error channel that multiplexes all out of band errors received from all services.
-func (s *Server) Err() <-chan error { return s.err }
-
-// Open opens the meta and data store and all services.
-func (s *Server) Open() error {
-	if err := func() error {
-		// Start profiling, if set.
-		startProfile(s.CPUProfile, s.MemProfile)
-
-		host, port, err := s.hostAddr()
-		if err != nil {
-			return err
-		}
-
-		hostport := net.JoinHostPort(host, port)
-		addr, err := net.ResolveTCPAddr("tcp", hostport)
-		if err != nil {
-			return fmt.Errorf("resolve tcp: addr=%s, err=%s", hostport, err)
-		}
-		s.MetaStore.Addr = addr
-		s.MetaStore.RemoteAddr = &tcpaddr{hostport}
-
-		// Open shared TCP connection.
-		ln, err := net.Listen("tcp", s.BindAddress)
-		if err != nil {
-			return fmt.Errorf("listen: %s", err)
-		}
-		s.Listener = ln
-
-		// The port 0 is used, we need to retrieve the port assigned by the kernel
-		if strings.HasSuffix(s.BindAddress, ":0") {
-			s.MetaStore.Addr = ln.Addr()
-		}
-
-		// Multiplex listener.
-		mux := tcp.NewMux()
-		s.MetaStore.RaftListener = mux.Listen(meta.MuxRaftHeader)
-		s.MetaStore.ExecListener = mux.Listen(meta.MuxExecHeader)
-		s.MetaStore.RPCListener = mux.Listen(meta.MuxRPCHeader)
-
-		s.ClusterService.Listener = mux.Listen(cluster.MuxHeader)
-		s.SnapshotterService.Listener = mux.Listen(snapshotter.MuxHeader)
-		s.CopierService.Listener = mux.Listen(copier.MuxHeader)
-		go mux.Serve(ln)
-
-		// Open meta store.
-		if err := s.MetaStore.Open(); err != nil {
-			return fmt.Errorf("open meta store: %s", err)
-		}
-		go s.monitorErrorChan(s.MetaStore.Err())
-
-		// Wait for the store to initialize.
-		<-s.MetaStore.Ready()
-
-		// Open TSDB store.
-		if err := s.TSDBStore.Open(); err != nil {
-			return fmt.Errorf("open tsdb store: %s", err)
-		}
-
-		// Open the hinted handoff service
-		if err := s.HintedHandoff.Open(); err != nil {
-			return fmt.Errorf("open hinted handoff: %s", err)
-		}
-
-		// Open the subcriber service
-		if err := s.Subscriber.Open(); err != nil {
-			return fmt.Errorf("open subscriber: %s", err)
-		}
-
-		// Open the points writer service
-		if err := s.PointsWriter.Open(); err != nil {
-			return fmt.Errorf("open points writer: %s", err)
-		}
-
-		// Open the monitor service
-		if err := s.Monitor.Open(); err != nil {
-			return fmt.Errorf("open monitor: %v", err)
-		}
-
-		for _, service := range s.Services {
-			if err := service.Open(); err != nil {
-				return fmt.Errorf("open service: %s", err)
-			}
-		}
-
-		// Start the reporting service, if not disabled.
-		if !s.reportingDisabled {
-			go s.startServerReporting()
-		}
-
-		return nil
-
-	}(); err != nil {
-		s.Close()
-		return err
-	}
-
-	return nil
-}
-
-// Close shuts down the meta and data stores and all services.
-func (s *Server) Close() error {
-	stopProfile()
-
-	// Close the listener first to stop any new connections
-	if s.Listener != nil {
-		s.Listener.Close()
-	}
-
-	// Close services to allow any inflight requests to complete
-	// and prevent new requests from being accepted.
-	for _, service := range s.Services {
-		service.Close()
-	}
-
-	if s.Monitor != nil {
-		s.Monitor.Close()
-	}
-
-	if s.PointsWriter != nil {
-		s.PointsWriter.Close()
-	}
-
-	if s.HintedHandoff != nil {
-		s.HintedHandoff.Close()
-	}
-
-	// Close the TSDBStore, no more reads or writes at this point
-	if s.TSDBStore != nil {
-		s.TSDBStore.Close()
-	}
-
-	if s.Subscriber != nil {
-		s.Subscriber.Close()
-	}
-
-	// Finally close the meta-store since everything else depends on it
-	if s.MetaStore != nil {
-		s.MetaStore.Close()
-	}
-
-	close(s.closing)
-	return nil
-}
-
-// startServerReporting starts periodic server reporting.
-func (s *Server) startServerReporting() {
-	for {
-		select {
-		case <-s.closing:
-			return
-		default:
-		}
-		if err := s.MetaStore.WaitForLeader(30 * time.Second); err != nil {
-			log.Printf("no leader available for reporting: %s", err.Error())
-			time.Sleep(time.Second)
-			continue
-		}
-		s.reportServer()
-		<-time.After(24 * time.Hour)
-	}
-}
-
-// reportServer reports anonymous statistics about the system.
-func (s *Server) reportServer() {
-	dis, err := s.MetaStore.Databases()
-	if err != nil {
-		log.Printf("failed to retrieve databases for reporting: %s", err.Error())
-		return
-	}
-	numDatabases := len(dis)
-
-	numMeasurements := 0
-	numSeries := 0
-	for _, di := range dis {
-		d := s.TSDBStore.DatabaseIndex(di.Name)
-		if d == nil {
-			// No data in this store for this database.
-			continue
-		}
-		m, s := d.MeasurementSeriesCounts()
-		numMeasurements += m
-		numSeries += s
-	}
-
-	clusterID, err := s.MetaStore.ClusterID()
-	if err != nil {
-		log.Printf("failed to retrieve cluster ID for reporting: %s", err.Error())
-		return
-	}
-
-	cl := client.New("")
-	usage := client.Usage{
-		Product: "influxdb",
-		Data: []client.UsageData{
-			{
-				Values: client.Values{
-					"os":               runtime.GOOS,
-					"arch":             runtime.GOARCH,
-					"version":          s.buildInfo.Version,
-					"server_id":        s.MetaStore.NodeID(),
-					"cluster_id":       clusterID,
-					"num_series":       numSeries,
-					"num_measurements": numMeasurements,
-					"num_databases":    numDatabases,
-				},
-			},
-		},
-	}
-
-	log.Printf("Sending anonymous usage statistics to m.influxdb.com")
-
-	go cl.Save(usage)
-}
-
-// monitorErrorChan reads an error channel and resends it through the server.
-func (s *Server) monitorErrorChan(ch <-chan error) {
-	for {
-		select {
-		case err, ok := <-ch:
-			if !ok {
-				return
-			}
-			s.err <- err
-		case <-s.closing:
-			return
-		}
-	}
-}
-
-// hostAddr returns the host and port that remote nodes will use to reach this
-// node.
-func (s *Server) hostAddr() (string, string, error) {
-	// Resolve host to address.
-	_, port, err := net.SplitHostPort(s.BindAddress)
-	if err != nil {
-		return "", "", fmt.Errorf("split bind address: %s", err)
-	}
-
-	host := s.Hostname
-
-	// See if we might have a port that will override the BindAddress port
-	if host != "" && host[len(host)-1] >= '0' && host[len(host)-1] <= '9' && strings.Contains(host, ":") {
-		hostArg, portArg, err := net.SplitHostPort(s.Hostname)
-		if err != nil {
-			return "", "", err
-		}
-
-		if hostArg != "" {
-			host = hostArg
-		}
-
-		if portArg != "" {
-			port = portArg
-		}
-	}
-	return host, port, nil
-}
-
-// Service represents a service attached to the server.
-type Service interface {
-	Open() error
-	Close() error
-}
-
-// prof stores the file locations of active profiles.
-var prof struct {
-	cpu *os.File
-	mem *os.File
-}
-
-// StartProfile initializes the cpu and memory profile, if specified.
-func startProfile(cpuprofile, memprofile string) {
-	if cpuprofile != "" {
-		f, err := os.Create(cpuprofile)
-		if err != nil {
-			log.Fatalf("cpuprofile: %v", err)
-		}
-		log.Printf("writing CPU profile to: %s\n", cpuprofile)
-		prof.cpu = f
-		pprof.StartCPUProfile(prof.cpu)
-	}
-
-	if memprofile != "" {
-		f, err := os.Create(memprofile)
-		if err != nil {
-			log.Fatalf("memprofile: %v", err)
-		}
-		log.Printf("writing mem profile to: %s\n", memprofile)
-		prof.mem = f
-		runtime.MemProfileRate = 4096
-	}
-
-}
-
-// StopProfile closes the cpu and memory profiles if they are running.
-func stopProfile() {
-	if prof.cpu != nil {
-		pprof.StopCPUProfile()
-		prof.cpu.Close()
-		log.Println("CPU profile stopped")
-	}
-	if prof.mem != nil {
-		pprof.Lookup("heap").WriteTo(prof.mem, 0)
-		prof.mem.Close()
-		log.Println("mem profile stopped")
-	}
-}
-
-type tcpaddr struct{ host string }
-
-func (a *tcpaddr) Network() string { return "tcp" }
-func (a *tcpaddr) String() string  { return a.host }
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influxd/run/server_helpers_test.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influxd/run/server_helpers_test.go
deleted file mode 100644
index 620a48f84..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influxd/run/server_helpers_test.go
+++ /dev/null
@@ -1,377 +0,0 @@
-// This package is a set of convenience helpers and structs to make integration testing easier
-package run_test
-
-import (
-	"bytes"
-	"encoding/json"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"log"
-	"math"
-	"net/http"
-	"net/url"
-	"os"
-	"regexp"
-	"strings"
-	"testing"
-	"time"
-
-	"github.com/influxdb/influxdb/cmd/influxd/run"
-	"github.com/influxdb/influxdb/meta"
-	"github.com/influxdb/influxdb/services/httpd"
-	"github.com/influxdb/influxdb/toml"
-)
-
-// Server represents a test wrapper for run.Server.
-type Server struct {
-	*run.Server
-	Config *run.Config
-}
-
-// NewServer returns a new instance of Server.
-func NewServer(c *run.Config) *Server {
-	buildInfo := &run.BuildInfo{
-		Version: "testServer",
-		Commit:  "testCommit",
-		Branch:  "testBranch",
-	}
-	srv, _ := run.NewServer(c, buildInfo)
-	s := Server{
-		Server: srv,
-		Config: c,
-	}
-	s.TSDBStore.EngineOptions.Config = c.Data
-	configureLogging(&s)
-	return &s
-}
-
-// OpenServer opens a test server.
-func OpenServer(c *run.Config, joinURLs string) *Server {
-	s := NewServer(c)
-	configureLogging(s)
-	if err := s.Open(); err != nil {
-		panic(err.Error())
-	}
-	return s
-}
-
-// OpenServerWithVersion opens a test server with a specific version.
-func OpenServerWithVersion(c *run.Config, version string) *Server {
-	buildInfo := &run.BuildInfo{
-		Version: version,
-		Commit:  "",
-		Branch:  "",
-	}
-	srv, _ := run.NewServer(c, buildInfo)
-	s := Server{
-		Server: srv,
-		Config: c,
-	}
-	configureLogging(&s)
-	if err := s.Open(); err != nil {
-		panic(err.Error())
-	}
-
-	return &s
-}
-
-// OpenDefaultServer opens a test server with a default database & retention policy.
-func OpenDefaultServer(c *run.Config, joinURLs string) *Server {
-	s := OpenServer(c, joinURLs)
-	if err := s.CreateDatabaseAndRetentionPolicy("db0", newRetentionPolicyInfo("rp0", 1, 0)); err != nil {
-		panic(err)
-	}
-	if err := s.MetaStore.SetDefaultRetentionPolicy("db0", "rp0"); err != nil {
-		panic(err)
-	}
-	return s
-}
-
-// Close shuts down the server and removes all temporary paths.
-func (s *Server) Close() {
-	s.Server.Close()
-	os.RemoveAll(s.Config.Meta.Dir)
-	os.RemoveAll(s.Config.Data.Dir)
-	os.RemoveAll(s.Config.HintedHandoff.Dir)
-}
-
-// URL returns the base URL for the httpd endpoint.
-func (s *Server) URL() string {
-	for _, service := range s.Services {
-		if service, ok := service.(*httpd.Service); ok {
-			return "http://" + service.Addr().String()
-		}
-	}
-	panic("httpd server not found in services")
-}
-
-// CreateDatabaseAndRetentionPolicy will create the database and retention policy.
-func (s *Server) CreateDatabaseAndRetentionPolicy(db string, rp *meta.RetentionPolicyInfo) error {
-	if _, err := s.MetaStore.CreateDatabase(db); err != nil {
-		return err
-	} else if _, err := s.MetaStore.CreateRetentionPolicy(db, rp); err != nil {
-		return err
-	}
-	return nil
-}
-
-// Query executes a query against the server and returns the results.
-func (s *Server) Query(query string) (results string, err error) {
-	return s.QueryWithParams(query, nil)
-}
-
-// Query executes a query against the server and returns the results.
-func (s *Server) QueryWithParams(query string, values url.Values) (results string, err error) {
-	if values == nil {
-		values = url.Values{}
-	}
-	values.Set("q", query)
-	return s.HTTPGet(s.URL() + "/query?" + values.Encode())
-}
-
-// HTTPGet makes an HTTP GET request to the server and returns the response.
-func (s *Server) HTTPGet(url string) (results string, err error) {
-	resp, err := http.Get(url)
-	if err != nil {
-		return "", err
-	}
-	body := string(MustReadAll(resp.Body))
-	switch resp.StatusCode {
-	case http.StatusBadRequest:
-		if !expectPattern(".*error parsing query*.", body) {
-			return "", fmt.Errorf("unexpected status code: code=%d, body=%s", resp.StatusCode, body)
-		}
-		return body, nil
-	case http.StatusOK:
-		return body, nil
-	default:
-		return "", fmt.Errorf("unexpected status code: code=%d, body=%s", resp.StatusCode, body)
-	}
-}
-
-// HTTPPost makes an HTTP POST request to the server and returns the response.
-func (s *Server) HTTPPost(url string, content []byte) (results string, err error) {
-	buf := bytes.NewBuffer(content)
-	resp, err := http.Post(url, "application/json", buf)
-	if err != nil {
-		return "", err
-	}
-	body := string(MustReadAll(resp.Body))
-	switch resp.StatusCode {
-	case http.StatusBadRequest:
-		if !expectPattern(".*error parsing query*.", body) {
-			return "", fmt.Errorf("unexpected status code: code=%d, body=%s", resp.StatusCode, body)
-		}
-		return body, nil
-	case http.StatusOK, http.StatusNoContent:
-		return body, nil
-	default:
-		return "", fmt.Errorf("unexpected status code: code=%d, body=%s", resp.StatusCode, body)
-	}
-}
-
-// Write executes a write against the server and returns the results.
-func (s *Server) Write(db, rp, body string, params url.Values) (results string, err error) {
-	if params == nil {
-		params = url.Values{}
-	}
-	if params.Get("db") == "" {
-		params.Set("db", db)
-	}
-	if params.Get("rp") == "" {
-		params.Set("rp", rp)
-	}
-	resp, err := http.Post(s.URL()+"/write?"+params.Encode(), "", strings.NewReader(body))
-	if err != nil {
-		return "", err
-	} else if resp.StatusCode != http.StatusOK && resp.StatusCode != http.StatusNoContent {
-		return "", fmt.Errorf("invalid status code: code=%d, body=%s", resp.StatusCode, MustReadAll(resp.Body))
-	}
-	return string(MustReadAll(resp.Body)), nil
-}
-
-// MustWrite executes a write to the server. Panic on error.
-func (s *Server) MustWrite(db, rp, body string, params url.Values) string {
-	results, err := s.Write(db, rp, body, params)
-	if err != nil {
-		panic(err)
-	}
-	return results
-}
-
-// NewConfig returns the default config with temporary paths.
-func NewConfig() *run.Config {
-	c := run.NewConfig()
-	c.ReportingDisabled = true
-	c.Cluster.ShardWriterTimeout = toml.Duration(30 * time.Second)
-	c.Cluster.WriteTimeout = toml.Duration(30 * time.Second)
-	c.Meta.Dir = MustTempFile()
-	c.Meta.BindAddress = "127.0.0.1:0"
-	c.Meta.HeartbeatTimeout = toml.Duration(50 * time.Millisecond)
-	c.Meta.ElectionTimeout = toml.Duration(50 * time.Millisecond)
-	c.Meta.LeaderLeaseTimeout = toml.Duration(50 * time.Millisecond)
-	c.Meta.CommitTimeout = toml.Duration(5 * time.Millisecond)
-
-	c.Data.Dir = MustTempFile()
-	c.Data.WALDir = MustTempFile()
-	c.Data.WALLoggingEnabled = false
-
-	c.HintedHandoff.Dir = MustTempFile()
-
-	c.HTTPD.Enabled = true
-	c.HTTPD.BindAddress = "127.0.0.1:0"
-	c.HTTPD.LogEnabled = testing.Verbose()
-
-	c.Monitor.StoreEnabled = false
-
-	return c
-}
-
-func newRetentionPolicyInfo(name string, rf int, duration time.Duration) *meta.RetentionPolicyInfo {
-	return &meta.RetentionPolicyInfo{Name: name, ReplicaN: rf, Duration: duration}
-}
-
-func maxFloat64() string {
-	maxFloat64, _ := json.Marshal(math.MaxFloat64)
-	return string(maxFloat64)
-}
-
-func maxInt64() string {
-	maxInt64, _ := json.Marshal(^int64(0))
-	return string(maxInt64)
-}
-
-func now() time.Time {
-	return time.Now().UTC()
-}
-
-func yesterday() time.Time {
-	return now().Add(-1 * time.Hour * 24)
-}
-
-func mustParseTime(layout, value string) time.Time {
-	tm, err := time.Parse(layout, value)
-	if err != nil {
-		panic(err)
-	}
-	return tm
-}
-
-// MustReadAll reads r. Panic on error.
-func MustReadAll(r io.Reader) []byte {
-	b, err := ioutil.ReadAll(r)
-	if err != nil {
-		panic(err)
-	}
-	return b
-}
-
-// MustTempFile returns a path to a temporary file.
-func MustTempFile() string {
-	f, err := ioutil.TempFile("", "influxd-")
-	if err != nil {
-		panic(err)
-	}
-	f.Close()
-	os.Remove(f.Name())
-	return f.Name()
-}
-
-func expectPattern(exp, act string) bool {
-	re := regexp.MustCompile(exp)
-	if !re.MatchString(act) {
-		return false
-	}
-	return true
-}
-
-type Query struct {
-	name     string
-	command  string
-	params   url.Values
-	exp, act string
-	pattern  bool
-	skip     bool
-	repeat   int
-}
-
-// Execute runs the command and returns an err if it fails
-func (q *Query) Execute(s *Server) (err error) {
-	if q.params == nil {
-		q.act, err = s.Query(q.command)
-		return
-	}
-	q.act, err = s.QueryWithParams(q.command, q.params)
-	return
-}
-
-func (q *Query) success() bool {
-	if q.pattern {
-		return expectPattern(q.exp, q.act)
-	}
-	return q.exp == q.act
-}
-
-func (q *Query) Error(err error) string {
-	return fmt.Sprintf("%s: %v", q.name, err)
-}
-
-func (q *Query) failureMessage() string {
-	return fmt.Sprintf("%s: unexpected results\nquery:  %s\nexp:    %s\nactual: %s\n", q.name, q.command, q.exp, q.act)
-}
-
-type Test struct {
-	initialized bool
-	write       string
-	params      url.Values
-	db          string
-	rp          string
-	exp         string
-	queries     []*Query
-}
-
-func NewTest(db, rp string) Test {
-	return Test{
-		db: db,
-		rp: rp,
-	}
-}
-
-func (t *Test) addQueries(q ...*Query) {
-	t.queries = append(t.queries, q...)
-}
-
-func (t *Test) init(s *Server) error {
-	if t.write == "" || t.initialized {
-		return nil
-	}
-	t.initialized = true
-	if res, err := s.Write(t.db, t.rp, t.write, t.params); err != nil {
-		return err
-	} else if t.exp != res {
-		return fmt.Errorf("unexpected results\nexp: %s\ngot: %s\n", t.exp, res)
-	}
-	return nil
-}
-
-func configureLogging(s *Server) {
-	// Set the logger to discard unless verbose is on
-	if !testing.Verbose() {
-		type logSetter interface {
-			SetLogger(*log.Logger)
-		}
-		nullLogger := log.New(ioutil.Discard, "", 0)
-		s.MetaStore.Logger = nullLogger
-		s.TSDBStore.Logger = nullLogger
-		s.HintedHandoff.SetLogger(nullLogger)
-		s.Monitor.SetLogger(nullLogger)
-		s.QueryExecutor.SetLogger(nullLogger)
-		s.Subscriber.SetLogger(nullLogger)
-		for _, service := range s.Services {
-			if service, ok := service.(logSetter); ok {
-				service.SetLogger(nullLogger)
-			}
-		}
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influxd/run/server_test.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influxd/run/server_test.go
deleted file mode 100644
index 3f633019a..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influxd/run/server_test.go
+++ /dev/null
@@ -1,5338 +0,0 @@
-package run_test
-
-import (
-	"fmt"
-	"net/http"
-	"net/url"
-	"strconv"
-	"strings"
-	"testing"
-	"time"
-
-	"github.com/influxdb/influxdb/cluster"
-)
-
-// Ensure that HTTP responses include the InfluxDB version.
-func TestServer_HTTPResponseVersion(t *testing.T) {
-	version := "v1234"
-	s := OpenServerWithVersion(NewConfig(), version)
-	defer s.Close()
-
-	resp, _ := http.Get(s.URL() + "/query")
-	got := resp.Header.Get("X-Influxdb-Version")
-	if got != version {
-		t.Errorf("Server responded with incorrect version, exp %s, got %s", version, got)
-	}
-}
-
-// Ensure the database commands work.
-func TestServer_DatabaseCommands(t *testing.T) {
-	t.Parallel()
-	s := OpenServer(NewConfig(), "")
-	defer s.Close()
-
-	test := Test{
-		queries: []*Query{
-			&Query{
-				name:    "create database should succeed",
-				command: `CREATE DATABASE db0`,
-				exp:     `{"results":[{}]}`,
-			},
-			&Query{
-				name:    "create database should error with bad name",
-				command: `CREATE DATABASE 0xdb0`,
-				exp:     `{"error":"error parsing query: found 0, expected identifier at line 1, char 17"}`,
-			},
-			&Query{
-				name:    "show database should succeed",
-				command: `SHOW DATABASES`,
-				exp:     `{"results":[{"series":[{"name":"databases","columns":["name"],"values":[["db0"]]}]}]}`,
-			},
-			&Query{
-				name:    "create database should error if it already exists",
-				command: `CREATE DATABASE db0`,
-				exp:     `{"results":[{"error":"database already exists"}]}`,
-			},
-			&Query{
-				name:    "create database should not error with existing database with IF NOT EXISTS",
-				command: `CREATE DATABASE IF NOT EXISTS db0`,
-				exp:     `{"results":[{}]}`,
-			},
-			&Query{
-				name:    "create database should create non-existing database with IF NOT EXISTS",
-				command: `CREATE DATABASE IF NOT EXISTS db1`,
-				exp:     `{"results":[{}]}`,
-			},
-			&Query{
-				name:    "show database should succeed",
-				command: `SHOW DATABASES`,
-				exp:     `{"results":[{"series":[{"name":"databases","columns":["name"],"values":[["db0"],["db1"]]}]}]}`,
-			},
-			&Query{
-				name:    "drop database db0 should succeed",
-				command: `DROP DATABASE db0`,
-				exp:     `{"results":[{}]}`,
-			},
-			&Query{
-				name:    "drop database db1 should succeed",
-				command: `DROP DATABASE db1`,
-				exp:     `{"results":[{}]}`,
-			},
-			&Query{
-				name:    "drop database should error if it does not exists",
-				command: `DROP DATABASE db1`,
-				exp:     `{"results":[{"error":"database not found: db1"}]}`,
-			},
-			&Query{
-				name:    "drop database should not error with non-existing database db1 WITH IF EXISTS",
-				command: `DROP DATABASE IF EXISTS db1`,
-				exp:     `{"results":[{}]}`,
-			},
-			&Query{
-				name:    "show database should have no results",
-				command: `SHOW DATABASES`,
-				exp:     `{"results":[{"series":[{"name":"databases","columns":["name"]}]}]}`,
-			},
-			&Query{
-				name:    "drop database should error if it doesn't exist",
-				command: `DROP DATABASE db0`,
-				exp:     `{"results":[{"error":"database not found: db0"}]}`,
-			},
-		},
-	}
-
-	for _, query := range test.queries {
-		if query.skip {
-			t.Logf("SKIP:: %s", query.name)
-			continue
-		}
-		if err := query.Execute(s); err != nil {
-			t.Error(query.Error(err))
-		} else if !query.success() {
-			t.Error(query.failureMessage())
-		}
-	}
-}
-
-func TestServer_Query_DropAndRecreateDatabase(t *testing.T) {
-	t.Parallel()
-	s := OpenServer(NewConfig(), "")
-	defer s.Close()
-
-	if err := s.CreateDatabaseAndRetentionPolicy("db0", newRetentionPolicyInfo("rp0", 1, 0)); err != nil {
-		t.Fatal(err)
-	}
-	if err := s.MetaStore.SetDefaultRetentionPolicy("db0", "rp0"); err != nil {
-		t.Fatal(err)
-	}
-
-	writes := []string{
-		fmt.Sprintf(`cpu,host=serverA,region=uswest val=23.2 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:00Z").UnixNano()),
-	}
-
-	test := NewTest("db0", "rp0")
-	test.write = strings.Join(writes, "\n")
-
-	test.addQueries([]*Query{
-		&Query{
-			name:    "Drop database after data write",
-			command: `DROP DATABASE db0`,
-			exp:     `{"results":[{}]}`,
-		},
-		&Query{
-			name:    "Recreate database",
-			command: `CREATE DATABASE db0`,
-			exp:     `{"results":[{}]}`,
-		},
-		&Query{
-			name:    "Recreate retention policy",
-			command: `CREATE RETENTION POLICY rp0 ON db0 DURATION 365d REPLICATION 1 DEFAULT`,
-			exp:     `{"results":[{}]}`,
-		},
-		&Query{
-			name:    "Show measurements after recreate",
-			command: `SHOW MEASUREMENTS`,
-			exp:     `{"results":[{}]}`,
-			params:  url.Values{"db": []string{"db0"}},
-		},
-		&Query{
-			name:    "Query data after recreate",
-			command: `SELECT * FROM cpu`,
-			exp:     `{"results":[{}]}`,
-			params:  url.Values{"db": []string{"db0"}},
-		},
-	}...)
-
-	for i, query := range test.queries {
-		if i == 0 {
-			if err := test.init(s); err != nil {
-				t.Fatalf("test init failed: %s", err)
-			}
-		}
-		if query.skip {
-			t.Logf("SKIP:: %s", query.name)
-			continue
-		}
-		if err := query.Execute(s); err != nil {
-			t.Error(query.Error(err))
-		} else if !query.success() {
-			t.Error(query.failureMessage())
-		}
-	}
-}
-
-func TestServer_Query_DropDatabaseIsolated(t *testing.T) {
-	t.Parallel()
-	s := OpenServer(NewConfig(), "")
-	defer s.Close()
-
-	if err := s.CreateDatabaseAndRetentionPolicy("db0", newRetentionPolicyInfo("rp0", 1, 0)); err != nil {
-		t.Fatal(err)
-	}
-	if err := s.MetaStore.SetDefaultRetentionPolicy("db0", "rp0"); err != nil {
-		t.Fatal(err)
-	}
-	if err := s.CreateDatabaseAndRetentionPolicy("db1", newRetentionPolicyInfo("rp1", 1, 0)); err != nil {
-		t.Fatal(err)
-	}
-
-	writes := []string{
-		fmt.Sprintf(`cpu,host=serverA,region=uswest val=23.2 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:00Z").UnixNano()),
-	}
-
-	test := NewTest("db0", "rp0")
-	test.write = strings.Join(writes, "\n")
-
-	test.addQueries([]*Query{
-		&Query{
-			name:    "Query data from 1st database",
-			command: `SELECT * FROM cpu`,
-			exp:     `{"results":[{"series":[{"name":"cpu","columns":["time","host","region","val"],"values":[["2000-01-01T00:00:00Z","serverA","uswest",23.2]]}]}]}`,
-			params:  url.Values{"db": []string{"db0"}},
-		},
-		&Query{
-			name:    "Query data from 1st database with GROUP BY *",
-			command: `SELECT * FROM cpu GROUP BY *`,
-			exp:     `{"results":[{"series":[{"name":"cpu","tags":{"host":"serverA","region":"uswest"},"columns":["time","val"],"values":[["2000-01-01T00:00:00Z",23.2]]}]}]}`,
-			params:  url.Values{"db": []string{"db0"}},
-		},
-		&Query{
-			name:    "Drop other database",
-			command: `DROP DATABASE db1`,
-			exp:     `{"results":[{}]}`,
-		},
-		&Query{
-			name:    "Query data from 1st database and ensure it's still there",
-			command: `SELECT * FROM cpu`,
-			exp:     `{"results":[{"series":[{"name":"cpu","columns":["time","host","region","val"],"values":[["2000-01-01T00:00:00Z","serverA","uswest",23.2]]}]}]}`,
-			params:  url.Values{"db": []string{"db0"}},
-		},
-		&Query{
-			name:    "Query data from 1st database and ensure it's still there with GROUP BY *",
-			command: `SELECT * FROM cpu GROUP BY *`,
-			exp:     `{"results":[{"series":[{"name":"cpu","tags":{"host":"serverA","region":"uswest"},"columns":["time","val"],"values":[["2000-01-01T00:00:00Z",23.2]]}]}]}`,
-			params:  url.Values{"db": []string{"db0"}},
-		},
-	}...)
-
-	for i, query := range test.queries {
-		if i == 0 {
-			if err := test.init(s); err != nil {
-				t.Fatalf("test init failed: %s", err)
-			}
-		}
-		if query.skip {
-			t.Logf("SKIP:: %s", query.name)
-			continue
-		}
-		if err := query.Execute(s); err != nil {
-			t.Error(query.Error(err))
-		} else if !query.success() {
-			t.Error(query.failureMessage())
-		}
-	}
-}
-
-func TestServer_Query_DropAndRecreateSeries(t *testing.T) {
-	t.Parallel()
-	s := OpenServer(NewConfig(), "")
-	defer s.Close()
-
-	if err := s.CreateDatabaseAndRetentionPolicy("db0", newRetentionPolicyInfo("rp0", 1, 0)); err != nil {
-		t.Fatal(err)
-	}
-	if err := s.MetaStore.SetDefaultRetentionPolicy("db0", "rp0"); err != nil {
-		t.Fatal(err)
-	}
-
-	writes := []string{
-		fmt.Sprintf(`cpu,host=serverA,region=uswest val=23.2 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:00Z").UnixNano()),
-	}
-
-	test := NewTest("db0", "rp0")
-	test.write = strings.Join(writes, "\n")
-
-	test.addQueries([]*Query{
-		&Query{
-			name:    "Show series is present",
-			command: `SHOW SERIES`,
-			exp:     `{"results":[{"series":[{"name":"cpu","columns":["_key","host","region"],"values":[["cpu,host=serverA,region=uswest","serverA","uswest"]]}]}]}`,
-			params:  url.Values{"db": []string{"db0"}},
-		},
-		&Query{
-			name:    "Drop series after data write",
-			command: `DROP SERIES FROM cpu`,
-			exp:     `{"results":[{}]}`,
-			params:  url.Values{"db": []string{"db0"}},
-		},
-		&Query{
-			name:    "Show series is gone",
-			command: `SHOW SERIES`,
-			exp:     `{"results":[{}]}`,
-			params:  url.Values{"db": []string{"db0"}},
-		},
-	}...)
-
-	for i, query := range test.queries {
-		if i == 0 {
-			if err := test.init(s); err != nil {
-				t.Fatalf("test init failed: %s", err)
-			}
-		}
-		if query.skip {
-			t.Logf("SKIP:: %s", query.name)
-			continue
-		}
-		if err := query.Execute(s); err != nil {
-			t.Error(query.Error(err))
-		} else if !query.success() {
-			t.Error(query.failureMessage())
-		}
-	}
-
-	// Re-write data and test again.
-	reTest := NewTest("db0", "rp0")
-	reTest.write = strings.Join(writes, "\n")
-
-	reTest.addQueries([]*Query{
-		&Query{
-			name:    "Show series is present again after re-write",
-			command: `SHOW SERIES`,
-			exp:     `{"results":[{"series":[{"name":"cpu","columns":["_key","host","region"],"values":[["cpu,host=serverA,region=uswest","serverA","uswest"]]}]}]}`,
-			params:  url.Values{"db": []string{"db0"}},
-		},
-	}...)
-
-	for i, query := range reTest.queries {
-		if i == 0 {
-			if err := reTest.init(s); err != nil {
-				t.Fatalf("test init failed: %s", err)
-			}
-		}
-		if query.skip {
-			t.Logf("SKIP:: %s", query.name)
-			continue
-		}
-		if err := query.Execute(s); err != nil {
-			t.Error(query.Error(err))
-		} else if !query.success() {
-			t.Error(query.failureMessage())
-		}
-	}
-}
-
-func TestServer_Query_DropSeriesFromRegex(t *testing.T) {
-	t.Parallel()
-	s := OpenServer(NewConfig(), "")
-	defer s.Close()
-
-	if err := s.CreateDatabaseAndRetentionPolicy("db0", newRetentionPolicyInfo("rp0", 1, 0)); err != nil {
-		t.Fatal(err)
-	}
-	if err := s.MetaStore.SetDefaultRetentionPolicy("db0", "rp0"); err != nil {
-		t.Fatal(err)
-	}
-
-	writes := []string{
-		fmt.Sprintf(`a,host=serverA,region=uswest val=23.2 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:00Z").UnixNano()),
-		fmt.Sprintf(`aa,host=serverA,region=uswest val=23.2 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:00Z").UnixNano()),
-		fmt.Sprintf(`b,host=serverA,region=uswest val=23.2 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:00Z").UnixNano()),
-		fmt.Sprintf(`c,host=serverA,region=uswest val=30.2 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:00Z").UnixNano()),
-	}
-
-	test := NewTest("db0", "rp0")
-	test.write = strings.Join(writes, "\n")
-
-	test.addQueries([]*Query{
-		&Query{
-			name:    "Show series is present",
-			command: `SHOW SERIES`,
-			exp:     `{"results":[{"series":[{"name":"a","columns":["_key","host","region"],"values":[["a,host=serverA,region=uswest","serverA","uswest"]]},{"name":"aa","columns":["_key","host","region"],"values":[["aa,host=serverA,region=uswest","serverA","uswest"]]},{"name":"b","columns":["_key","host","region"],"values":[["b,host=serverA,region=uswest","serverA","uswest"]]},{"name":"c","columns":["_key","host","region"],"values":[["c,host=serverA,region=uswest","serverA","uswest"]]}]}]}`,
-			params:  url.Values{"db": []string{"db0"}},
-		},
-		&Query{
-			name:    "Drop series after data write",
-			command: `DROP SERIES FROM /a.*/`,
-			exp:     `{"results":[{}]}`,
-			params:  url.Values{"db": []string{"db0"}},
-		},
-		&Query{
-			name:    "Show series is gone",
-			command: `SHOW SERIES`,
-			exp:     `{"results":[{"series":[{"name":"b","columns":["_key","host","region"],"values":[["b,host=serverA,region=uswest","serverA","uswest"]]},{"name":"c","columns":["_key","host","region"],"values":[["c,host=serverA,region=uswest","serverA","uswest"]]}]}]}`,
-			params:  url.Values{"db": []string{"db0"}},
-		},
-		&Query{
-			name:    "Drop series from regex that matches no measurements",
-			command: `DROP SERIES FROM /a.*/`,
-			exp:     `{"results":[{}]}`,
-			params:  url.Values{"db": []string{"db0"}},
-		},
-		&Query{
-			name:    "make sure DROP SERIES doesn't delete anything when regex doesn't match",
-			command: `SHOW SERIES`,
-			exp:     `{"results":[{"series":[{"name":"b","columns":["_key","host","region"],"values":[["b,host=serverA,region=uswest","serverA","uswest"]]},{"name":"c","columns":["_key","host","region"],"values":[["c,host=serverA,region=uswest","serverA","uswest"]]}]}]}`,
-			params:  url.Values{"db": []string{"db0"}},
-		},
-		&Query{
-			name:    "Drop series with WHERE field should error",
-			command: `DROP SERIES FROM c WHERE val > 50.0`,
-			exp:     `{"results":[{"error":"DROP SERIES doesn't support fields in WHERE clause"}]}`,
-			params:  url.Values{"db": []string{"db0"}},
-		},
-		&Query{
-			name:    "make sure DROP SERIES with field in WHERE didn't delete data",
-			command: `SHOW SERIES`,
-			exp:     `{"results":[{"series":[{"name":"b","columns":["_key","host","region"],"values":[["b,host=serverA,region=uswest","serverA","uswest"]]},{"name":"c","columns":["_key","host","region"],"values":[["c,host=serverA,region=uswest","serverA","uswest"]]}]}]}`,
-			params:  url.Values{"db": []string{"db0"}},
-		},
-		&Query{
-			name:    "Drop series with WHERE time should error",
-			command: `DROP SERIES FROM c WHERE time > now() - 1d`,
-			exp:     `{"results":[{"error":"DROP SERIES doesn't support time in WHERE clause"}]}`,
-			params:  url.Values{"db": []string{"db0"}},
-		},
-	}...)
-
-	for i, query := range test.queries {
-		if i == 0 {
-			if err := test.init(s); err != nil {
-				t.Fatalf("test init failed: %s", err)
-			}
-		}
-		if query.skip {
-			t.Logf("SKIP:: %s", query.name)
-			continue
-		}
-		if err := query.Execute(s); err != nil {
-			t.Error(query.Error(err))
-		} else if !query.success() {
-			t.Error(query.failureMessage())
-		}
-	}
-}
-
-// Ensure retention policy commands work.
-func TestServer_RetentionPolicyCommands(t *testing.T) {
-	t.Parallel()
-	c := NewConfig()
-	c.Meta.RetentionAutoCreate = false
-	s := OpenServer(c, "")
-	defer s.Close()
-
-	// Create a database.
-	if _, err := s.MetaStore.CreateDatabase("db0"); err != nil {
-		t.Fatal(err)
-	}
-
-	test := Test{
-		queries: []*Query{
-			&Query{
-				name:    "create retention policy should succeed",
-				command: `CREATE RETENTION POLICY rp0 ON db0 DURATION 1h REPLICATION 1`,
-				exp:     `{"results":[{}]}`,
-			},
-			&Query{
-				name:    "create retention policy should error if it already exists",
-				command: `CREATE RETENTION POLICY rp0 ON db0 DURATION 1h REPLICATION 1`,
-				exp:     `{"results":[{"error":"retention policy already exists"}]}`,
-			},
-			&Query{
-				name:    "show retention policy should succeed",
-				command: `SHOW RETENTION POLICIES ON db0`,
-				exp:     `{"results":[{"series":[{"columns":["name","duration","replicaN","default"],"values":[["rp0","1h0m0s",1,false]]}]}]}`,
-			},
-			&Query{
-				name:    "alter retention policy should succeed",
-				command: `ALTER RETENTION POLICY rp0 ON db0 DURATION 2h REPLICATION 3 DEFAULT`,
-				exp:     `{"results":[{}]}`,
-			},
-			&Query{
-				name:    "show retention policy should have new altered information",
-				command: `SHOW RETENTION POLICIES ON db0`,
-				exp:     `{"results":[{"series":[{"columns":["name","duration","replicaN","default"],"values":[["rp0","2h0m0s",3,true]]}]}]}`,
-			},
-			&Query{
-				name:    "dropping default retention policy should not succeed",
-				command: `DROP RETENTION POLICY rp0 ON db0`,
-				exp:     `{"results":[{"error":"retention policy is default"}]}`,
-			},
-			&Query{
-				name:    "show retention policy should still show policy",
-				command: `SHOW RETENTION POLICIES ON db0`,
-				exp:     `{"results":[{"series":[{"columns":["name","duration","replicaN","default"],"values":[["rp0","2h0m0s",3,true]]}]}]}`,
-			},
-			&Query{
-				name:    "create a second non-default retention policy",
-				command: `CREATE RETENTION POLICY rp2 ON db0 DURATION 1h REPLICATION 1`,
-				exp:     `{"results":[{}]}`,
-			},
-			&Query{
-				name:    "show retention policy should show both",
-				command: `SHOW RETENTION POLICIES ON db0`,
-				exp:     `{"results":[{"series":[{"columns":["name","duration","replicaN","default"],"values":[["rp0","2h0m0s",3,true],["rp2","1h0m0s",1,false]]}]}]}`,
-			},
-			&Query{
-				name:    "dropping non-default retention policy succeed",
-				command: `DROP RETENTION POLICY rp2 ON db0`,
-				exp:     `{"results":[{}]}`,
-			},
-			&Query{
-				name:    "show retention policy should show just default",
-				command: `SHOW RETENTION POLICIES ON db0`,
-				exp:     `{"results":[{"series":[{"columns":["name","duration","replicaN","default"],"values":[["rp0","2h0m0s",3,true]]}]}]}`,
-			},
-			&Query{
-				name:    "Ensure retention policy with unacceptable retention cannot be created",
-				command: `CREATE RETENTION POLICY rp3 ON db0 DURATION 1s REPLICATION 1`,
-				exp:     `{"results":[{"error":"retention policy duration must be at least 1h0m0s"}]}`,
-			},
-			&Query{
-				name:    "Check error when deleting retention policy on non-existent database",
-				command: `DROP RETENTION POLICY rp1 ON mydatabase`,
-				exp:     `{"results":[{"error":"database not found"}]}`,
-			},
-		},
-	}
-
-	for _, query := range test.queries {
-		if query.skip {
-			t.Logf("SKIP:: %s", query.name)
-			continue
-		}
-		if err := query.Execute(s); err != nil {
-			t.Error(query.Error(err))
-		} else if !query.success() {
-			t.Error(query.failureMessage())
-		}
-	}
-}
-
-// Ensure the autocreation of retention policy works.
-func TestServer_DatabaseRetentionPolicyAutoCreate(t *testing.T) {
-	t.Parallel()
-	s := OpenServer(NewConfig(), "")
-	defer s.Close()
-
-	test := Test{
-		queries: []*Query{
-			&Query{
-				name:    "create database should succeed",
-				command: `CREATE DATABASE db0`,
-				exp:     `{"results":[{}]}`,
-			},
-			&Query{
-				name:    "show retention policies should return auto-created policy",
-				command: `SHOW RETENTION POLICIES ON db0`,
-				exp:     `{"results":[{"series":[{"columns":["name","duration","replicaN","default"],"values":[["default","0",1,true]]}]}]}`,
-			},
-		},
-	}
-
-	for _, query := range test.queries {
-		if query.skip {
-			t.Logf("SKIP:: %s", query.name)
-			continue
-		}
-		if err := query.Execute(s); err != nil {
-			t.Error(query.Error(err))
-		} else if !query.success() {
-			t.Error(query.failureMessage())
-		}
-	}
-}
-
-// Ensure user commands work.
-func TestServer_UserCommands(t *testing.T) {
-	t.Parallel()
-	s := OpenServer(NewConfig(), "")
-	defer s.Close()
-
-	// Create a database.
-	if _, err := s.MetaStore.CreateDatabase("db0"); err != nil {
-		t.Fatal(err)
-	}
-
-	test := Test{
-		queries: []*Query{
-			&Query{
-				name:    "show users, no actual users",
-				command: `SHOW USERS`,
-				exp:     `{"results":[{"series":[{"columns":["user","admin"]}]}]}`,
-			},
-			&Query{
-				name:    `create user`,
-				command: "CREATE USER jdoe WITH PASSWORD '1337'",
-				exp:     `{"results":[{}]}`,
-			},
-			&Query{
-				name:    "show users, 1 existing user",
-				command: `SHOW USERS`,
-				exp:     `{"results":[{"series":[{"columns":["user","admin"],"values":[["jdoe",false]]}]}]}`,
-			},
-			&Query{
-				name:    "grant all priviledges to jdoe",
-				command: `GRANT ALL PRIVILEGES TO jdoe`,
-				exp:     `{"results":[{}]}`,
-			},
-			&Query{
-				name:    "show users, existing user as admin",
-				command: `SHOW USERS`,
-				exp:     `{"results":[{"series":[{"columns":["user","admin"],"values":[["jdoe",true]]}]}]}`,
-			},
-			&Query{
-				name:    "grant DB privileges to user",
-				command: `GRANT READ ON db0 TO jdoe`,
-				exp:     `{"results":[{}]}`,
-			},
-			&Query{
-				name:    "revoke all privileges",
-				command: `REVOKE ALL PRIVILEGES FROM jdoe`,
-				exp:     `{"results":[{}]}`,
-			},
-			&Query{
-				name:    "bad create user request",
-				command: `CREATE USER 0xBAD WITH PASSWORD pwd1337`,
-				exp:     `{"error":"error parsing query: found 0, expected identifier at line 1, char 13"}`,
-			},
-			&Query{
-				name:    "bad create user request, no name",
-				command: `CREATE USER WITH PASSWORD pwd1337`,
-				exp:     `{"error":"error parsing query: found WITH, expected identifier at line 1, char 13"}`,
-			},
-			&Query{
-				name:    "bad create user request, no password",
-				command: `CREATE USER jdoe`,
-				exp:     `{"error":"error parsing query: found EOF, expected WITH at line 1, char 18"}`,
-			},
-			&Query{
-				name:    "drop user",
-				command: `DROP USER jdoe`,
-				exp:     `{"results":[{}]}`,
-			},
-			&Query{
-				name:    "make sure user was dropped",
-				command: `SHOW USERS`,
-				exp:     `{"results":[{"series":[{"columns":["user","admin"]}]}]}`,
-			},
-			&Query{
-				name:    "delete non existing user",
-				command: `DROP USER noone`,
-				exp:     `{"results":[{"error":"user not found"}]}`,
-			},
-		},
-	}
-
-	for _, query := range test.queries {
-		if query.skip {
-			t.Logf("SKIP:: %s", query.name)
-			continue
-		}
-		if err := query.Execute(s); err != nil {
-			t.Error(fmt.Sprintf("command: %s - err: %s", query.command, query.Error(err)))
-		} else if !query.success() {
-			t.Error(query.failureMessage())
-		}
-	}
-}
-
-// Ensure the server can create a single point via json protocol and read it back.
-func TestServer_Write_JSON(t *testing.T) {
-	t.Parallel()
-	s := OpenServer(NewConfig(), "")
-	defer s.Close()
-
-	if err := s.CreateDatabaseAndRetentionPolicy("db0", newRetentionPolicyInfo("rp0", 1, 1*time.Hour)); err != nil {
-		t.Fatal(err)
-	}
-
-	now := now()
-	if res, err := s.Write("", "", fmt.Sprintf(`{"database" : "db0", "retentionPolicy" : "rp0", "points": [{"measurement": "cpu", "tags": {"host": "server02"},"fields": {"value": 1.0}}],"time":"%s"} `, now.Format(time.RFC3339Nano)), nil); err != nil {
-		t.Fatal(err)
-	} else if exp := ``; exp != res {
-		t.Fatalf("unexpected results\nexp: %s\ngot: %s\n", exp, res)
-	}
-
-	// Verify the data was written.
-	if res, err := s.Query(`SELECT * FROM db0.rp0.cpu GROUP BY *`); err != nil {
-		t.Fatal(err)
-	} else if exp := fmt.Sprintf(`{"results":[{"series":[{"name":"cpu","tags":{"host":"server02"},"columns":["time","value"],"values":[["%s",1]]}]}]}`, now.Format(time.RFC3339Nano)); exp != res {
-		t.Fatalf("unexpected results\nexp: %s\ngot: %s\n", exp, res)
-	}
-}
-
-// Ensure the server can create a single point via line protocol with float type and read it back.
-func TestServer_Write_LineProtocol_Float(t *testing.T) {
-	t.Parallel()
-	s := OpenServer(NewConfig(), "")
-	defer s.Close()
-
-	if err := s.CreateDatabaseAndRetentionPolicy("db0", newRetentionPolicyInfo("rp0", 1, 1*time.Hour)); err != nil {
-		t.Fatal(err)
-	}
-
-	now := now()
-	if res, err := s.Write("db0", "rp0", `cpu,host=server01 value=1.0 `+strconv.FormatInt(now.UnixNano(), 10), nil); err != nil {
-		t.Fatal(err)
-	} else if exp := ``; exp != res {
-		t.Fatalf("unexpected results\nexp: %s\ngot: %s\n", exp, res)
-	}
-
-	// Verify the data was written.
-	if res, err := s.Query(`SELECT * FROM db0.rp0.cpu GROUP BY *`); err != nil {
-		t.Fatal(err)
-	} else if exp := fmt.Sprintf(`{"results":[{"series":[{"name":"cpu","tags":{"host":"server01"},"columns":["time","value"],"values":[["%s",1]]}]}]}`, now.Format(time.RFC3339Nano)); exp != res {
-		t.Fatalf("unexpected results\nexp: %s\ngot: %s\n", exp, res)
-	}
-}
-
-// Ensure the server can create a single point via line protocol with bool type and read it back.
-func TestServer_Write_LineProtocol_Bool(t *testing.T) {
-	t.Parallel()
-	s := OpenServer(NewConfig(), "")
-	defer s.Close()
-
-	if err := s.CreateDatabaseAndRetentionPolicy("db0", newRetentionPolicyInfo("rp0", 1, 1*time.Hour)); err != nil {
-		t.Fatal(err)
-	}
-
-	now := now()
-	if res, err := s.Write("db0", "rp0", `cpu,host=server01 value=true `+strconv.FormatInt(now.UnixNano(), 10), nil); err != nil {
-		t.Fatal(err)
-	} else if exp := ``; exp != res {
-		t.Fatalf("unexpected results\nexp: %s\ngot: %s\n", exp, res)
-	}
-
-	// Verify the data was written.
-	if res, err := s.Query(`SELECT * FROM db0.rp0.cpu GROUP BY *`); err != nil {
-		t.Fatal(err)
-	} else if exp := fmt.Sprintf(`{"results":[{"series":[{"name":"cpu","tags":{"host":"server01"},"columns":["time","value"],"values":[["%s",true]]}]}]}`, now.Format(time.RFC3339Nano)); exp != res {
-		t.Fatalf("unexpected results\nexp: %s\ngot: %s\n", exp, res)
-	}
-}
-
-// Ensure the server can create a single point via line protocol with string type and read it back.
-func TestServer_Write_LineProtocol_String(t *testing.T) {
-	t.Parallel()
-	s := OpenServer(NewConfig(), "")
-	defer s.Close()
-
-	if err := s.CreateDatabaseAndRetentionPolicy("db0", newRetentionPolicyInfo("rp0", 1, 1*time.Hour)); err != nil {
-		t.Fatal(err)
-	}
-
-	now := now()
-	if res, err := s.Write("db0", "rp0", `cpu,host=server01 value="disk full" `+strconv.FormatInt(now.UnixNano(), 10), nil); err != nil {
-		t.Fatal(err)
-	} else if exp := ``; exp != res {
-		t.Fatalf("unexpected results\nexp: %s\ngot: %s\n", exp, res)
-	}
-
-	// Verify the data was written.
-	if res, err := s.Query(`SELECT * FROM db0.rp0.cpu GROUP BY *`); err != nil {
-		t.Fatal(err)
-	} else if exp := fmt.Sprintf(`{"results":[{"series":[{"name":"cpu","tags":{"host":"server01"},"columns":["time","value"],"values":[["%s","disk full"]]}]}]}`, now.Format(time.RFC3339Nano)); exp != res {
-		t.Fatalf("unexpected results\nexp: %s\ngot: %s\n", exp, res)
-	}
-}
-
-// Ensure the server can create a single point via line protocol with integer type and read it back.
-func TestServer_Write_LineProtocol_Integer(t *testing.T) {
-	t.Parallel()
-	s := OpenServer(NewConfig(), "")
-	defer s.Close()
-
-	if err := s.CreateDatabaseAndRetentionPolicy("db0", newRetentionPolicyInfo("rp0", 1, 1*time.Hour)); err != nil {
-		t.Fatal(err)
-	}
-
-	now := now()
-	if res, err := s.Write("db0", "rp0", `cpu,host=server01 value=100 `+strconv.FormatInt(now.UnixNano(), 10), nil); err != nil {
-		t.Fatal(err)
-	} else if exp := ``; exp != res {
-		t.Fatalf("unexpected results\nexp: %s\ngot: %s\n", exp, res)
-	}
-
-	// Verify the data was written.
-	if res, err := s.Query(`SELECT * FROM db0.rp0.cpu GROUP BY *`); err != nil {
-		t.Fatal(err)
-	} else if exp := fmt.Sprintf(`{"results":[{"series":[{"name":"cpu","tags":{"host":"server01"},"columns":["time","value"],"values":[["%s",100]]}]}]}`, now.Format(time.RFC3339Nano)); exp != res {
-		t.Fatalf("unexpected results\nexp: %s\ngot: %s\n", exp, res)
-	}
-}
-
-// Ensure the server returns a partial write response when some points fail to parse. Also validate that
-// the successfully parsed points can be queried.
-func TestServer_Write_LineProtocol_Partial(t *testing.T) {
-	t.Parallel()
-	s := OpenServer(NewConfig(), "")
-	defer s.Close()
-
-	if err := s.CreateDatabaseAndRetentionPolicy("db0", newRetentionPolicyInfo("rp0", 1, 1*time.Hour)); err != nil {
-		t.Fatal(err)
-	}
-
-	now := now()
-	points := []string{
-		"cpu,host=server01 value=100 " + strconv.FormatInt(now.UnixNano(), 10),
-		"cpu,host=server01 value=NaN " + strconv.FormatInt(now.UnixNano(), 20),
-		"cpu,host=server01 value=NaN " + strconv.FormatInt(now.UnixNano(), 30),
-	}
-	if res, err := s.Write("db0", "rp0", strings.Join(points, "\n"), nil); err == nil {
-		t.Fatal("expected error. got nil", err)
-	} else if exp := ``; exp != res {
-		t.Fatalf("unexpected results\nexp: %s\ngot: %s\n", exp, res)
-	} else if exp := "partial write"; !strings.Contains(err.Error(), exp) {
-		t.Fatalf("unexpected error: exp\nexp: %v\ngot: %v", exp, err)
-	}
-
-	// Verify the data was written.
-	if res, err := s.Query(`SELECT * FROM db0.rp0.cpu GROUP BY *`); err != nil {
-		t.Fatal(err)
-	} else if exp := fmt.Sprintf(`{"results":[{"series":[{"name":"cpu","tags":{"host":"server01"},"columns":["time","value"],"values":[["%s",100]]}]}]}`, now.Format(time.RFC3339Nano)); exp != res {
-		t.Fatalf("unexpected results\nexp: %s\ngot: %s\n", exp, res)
-	}
-}
-
-// Ensure the server can query with default databases (via param) and default retention policy
-func TestServer_Query_DefaultDBAndRP(t *testing.T) {
-	t.Parallel()
-	s := OpenServer(NewConfig(), "")
-	defer s.Close()
-
-	if err := s.CreateDatabaseAndRetentionPolicy("db0", newRetentionPolicyInfo("rp0", 1, 1*time.Hour)); err != nil {
-		t.Fatal(err)
-	}
-
-	if err := s.MetaStore.SetDefaultRetentionPolicy("db0", "rp0"); err != nil {
-		t.Fatal(err)
-	}
-
-	test := NewTest("db0", "rp0")
-	test.write = fmt.Sprintf(`cpu value=1.0 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T01:00:00Z").UnixNano())
-
-	test.addQueries([]*Query{
-		&Query{
-			name:    "default db and rp",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT * FROM cpu GROUP BY *`,
-			exp:     `{"results":[{"series":[{"name":"cpu","columns":["time","value"],"values":[["2000-01-01T01:00:00Z",1]]}]}]}`,
-		},
-		&Query{
-			name:    "default rp exists",
-			command: `show retention policies ON db0`,
-			exp:     `{"results":[{"series":[{"columns":["name","duration","replicaN","default"],"values":[["default","0",1,false],["rp0","1h0m0s",1,true]]}]}]}`,
-		},
-		&Query{
-			name:    "default rp",
-			command: `SELECT * FROM db0..cpu GROUP BY *`,
-			exp:     `{"results":[{"series":[{"name":"cpu","columns":["time","value"],"values":[["2000-01-01T01:00:00Z",1]]}]}]}`,
-		},
-		&Query{
-			name:    "default dp",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT * FROM rp0.cpu GROUP BY *`,
-			exp:     `{"results":[{"series":[{"name":"cpu","columns":["time","value"],"values":[["2000-01-01T01:00:00Z",1]]}]}]}`,
-		},
-	}...)
-
-	if err := test.init(s); err != nil {
-		t.Fatalf("test init failed: %s", err)
-	}
-
-	for _, query := range test.queries {
-		if query.skip {
-			t.Logf("SKIP:: %s", query.name)
-			continue
-		}
-		if err := query.Execute(s); err != nil {
-			t.Error(query.Error(err))
-		} else if !query.success() {
-			t.Error(query.failureMessage())
-		}
-	}
-}
-
-// Ensure the server can have a database with multiple measurements.
-func TestServer_Query_Multiple_Measurements(t *testing.T) {
-	t.Parallel()
-	s := OpenServer(NewConfig(), "")
-	defer s.Close()
-
-	if err := s.CreateDatabaseAndRetentionPolicy("db0", newRetentionPolicyInfo("rp0", 1, 1*time.Hour)); err != nil {
-		t.Fatal(err)
-	}
-
-	// Make sure we do writes for measurements that will span across shards
-	writes := []string{
-		fmt.Sprintf("cpu,host=server01 value=100,core=4 %d", mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:00Z").UnixNano()),
-		fmt.Sprintf("cpu1,host=server02 value=50,core=2 %d", mustParseTime(time.RFC3339Nano, "2015-01-01T00:00:00Z").UnixNano()),
-	}
-	test := NewTest("db0", "rp0")
-	test.write = strings.Join(writes, "\n")
-
-	test.addQueries([]*Query{
-		&Query{
-			name:    "measurement in one shard but not another shouldn't panic server",
-			command: `SELECT host,value  FROM db0.rp0.cpu`,
-			exp:     `{"results":[{"series":[{"name":"cpu","columns":["time","host","value"],"values":[["2000-01-01T00:00:00Z","server01",100]]}]}]}`,
-		},
-		&Query{
-			name:    "measurement in one shard but not another shouldn't panic server",
-			command: `SELECT host,value  FROM db0.rp0.cpu GROUP BY host`,
-			exp:     `{"results":[{"series":[{"name":"cpu","tags":{"host":"server01"},"columns":["time","value"],"values":[["2000-01-01T00:00:00Z",100]]}]}]}`,
-		},
-	}...)
-
-	if err := test.init(s); err != nil {
-		t.Fatalf("test init failed: %s", err)
-	}
-
-	for _, query := range test.queries {
-		if query.skip {
-			t.Logf("SKIP:: %s", query.name)
-			continue
-		}
-		if err := query.Execute(s); err != nil {
-			t.Error(query.Error(err))
-		} else if !query.success() {
-			t.Error(query.failureMessage())
-		}
-	}
-}
-
-// Ensure the server correctly supports data with identical tag values.
-func TestServer_Query_IdenticalTagValues(t *testing.T) {
-	t.Parallel()
-	s := OpenServer(NewConfig(), "")
-	defer s.Close()
-
-	if err := s.CreateDatabaseAndRetentionPolicy("db0", newRetentionPolicyInfo("rp0", 1, 1*time.Hour)); err != nil {
-		t.Fatal(err)
-	}
-
-	writes := []string{
-		fmt.Sprintf("cpu,t1=val1 value=1 %d", mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:00Z").UnixNano()),
-		fmt.Sprintf("cpu,t2=val2 value=2 %d", mustParseTime(time.RFC3339Nano, "2000-01-01T00:01:00Z").UnixNano()),
-		fmt.Sprintf("cpu,t1=val2 value=3 %d", mustParseTime(time.RFC3339Nano, "2000-01-01T00:02:00Z").UnixNano()),
-	}
-	test := NewTest("db0", "rp0")
-	test.write = strings.Join(writes, "\n")
-
-	test.addQueries([]*Query{
-		&Query{
-			name:    "measurements with identical tag values - SELECT *, no GROUP BY",
-			command: `SELECT * FROM db0.rp0.cpu GROUP BY *`,
-			exp:     `{"results":[{"series":[{"name":"cpu","tags":{"t1":"val1","t2":""},"columns":["time","value"],"values":[["2000-01-01T00:00:00Z",1]]},{"name":"cpu","tags":{"t1":"val2","t2":""},"columns":["time","value"],"values":[["2000-01-01T00:02:00Z",3]]},{"name":"cpu","tags":{"t1":"","t2":"val2"},"columns":["time","value"],"values":[["2000-01-01T00:01:00Z",2]]}]}]}`,
-		},
-		&Query{
-			name:    "measurements with identical tag values - SELECT *, with GROUP BY",
-			command: `SELECT value FROM db0.rp0.cpu GROUP BY t1,t2`,
-			exp:     `{"results":[{"series":[{"name":"cpu","tags":{"t1":"val1","t2":""},"columns":["time","value"],"values":[["2000-01-01T00:00:00Z",1]]},{"name":"cpu","tags":{"t1":"val2","t2":""},"columns":["time","value"],"values":[["2000-01-01T00:02:00Z",3]]},{"name":"cpu","tags":{"t1":"","t2":"val2"},"columns":["time","value"],"values":[["2000-01-01T00:01:00Z",2]]}]}]}`,
-		},
-		&Query{
-			name:    "measurements with identical tag values - SELECT value no GROUP BY",
-			command: `SELECT value FROM db0.rp0.cpu`,
-			exp:     `{"results":[{"series":[{"name":"cpu","columns":["time","value"],"values":[["2000-01-01T00:00:00Z",1],["2000-01-01T00:01:00Z",2],["2000-01-01T00:02:00Z",3]]}]}]}`,
-		},
-	}...)
-
-	if err := test.init(s); err != nil {
-		t.Fatalf("test init failed: %s", err)
-	}
-
-	for _, query := range test.queries {
-		if query.skip {
-			t.Logf("SKIP:: %s", query.name)
-			continue
-		}
-		if err := query.Execute(s); err != nil {
-			t.Error(query.Error(err))
-		} else if !query.success() {
-			t.Error(query.failureMessage())
-		}
-	}
-}
-
-// Ensure the server can handle a query that involves accessing no shards.
-func TestServer_Query_NoShards(t *testing.T) {
-	t.Parallel()
-	s := OpenServer(NewConfig(), "")
-	defer s.Close()
-
-	if err := s.CreateDatabaseAndRetentionPolicy("db0", newRetentionPolicyInfo("rp0", 1, 1*time.Hour)); err != nil {
-		t.Fatal(err)
-	}
-
-	now := now()
-
-	test := NewTest("db0", "rp0")
-	test.write = `cpu,host=server01 value=1 ` + strconv.FormatInt(now.UnixNano(), 10)
-
-	test.addQueries([]*Query{
-		&Query{
-			name:    "selecting value should succeed",
-			command: `SELECT value FROM db0.rp0.cpu WHERE time < now() - 1d`,
-			exp:     `{"results":[{}]}`,
-		},
-	}...)
-
-	if err := test.init(s); err != nil {
-		t.Fatalf("test init failed: %s", err)
-	}
-
-	for _, query := range test.queries {
-		if query.skip {
-			t.Logf("SKIP:: %s", query.name)
-			continue
-		}
-		if err := query.Execute(s); err != nil {
-			t.Error(query.Error(err))
-		} else if !query.success() {
-			t.Error(query.failureMessage())
-		}
-	}
-}
-
-// Ensure the server can query a non-existent field
-func TestServer_Query_NonExistent(t *testing.T) {
-	t.Parallel()
-	s := OpenServer(NewConfig(), "")
-	defer s.Close()
-
-	if err := s.CreateDatabaseAndRetentionPolicy("db0", newRetentionPolicyInfo("rp0", 1, 1*time.Hour)); err != nil {
-		t.Fatal(err)
-	}
-
-	now := now()
-
-	test := NewTest("db0", "rp0")
-	test.write = `cpu,host=server01 value=1 ` + strconv.FormatInt(now.UnixNano(), 10)
-
-	test.addQueries([]*Query{
-		&Query{
-			name:    "selecting value should succeed",
-			command: `SELECT value FROM db0.rp0.cpu`,
-			exp:     fmt.Sprintf(`{"results":[{"series":[{"name":"cpu","columns":["time","value"],"values":[["%s",1]]}]}]}`, now.Format(time.RFC3339Nano)),
-		},
-		&Query{
-			name:    "selecting non-existent should succeed",
-			command: `SELECT foo FROM db0.rp0.cpu`,
-			exp:     `{"results":[{}]}`,
-		},
-	}...)
-
-	if err := test.init(s); err != nil {
-		t.Fatalf("test init failed: %s", err)
-	}
-
-	for _, query := range test.queries {
-		if query.skip {
-			t.Logf("SKIP:: %s", query.name)
-			continue
-		}
-		if err := query.Execute(s); err != nil {
-			t.Error(query.Error(err))
-		} else if !query.success() {
-			t.Error(query.failureMessage())
-		}
-	}
-}
-
-// Ensure the server can perform basic math
-func TestServer_Query_Math(t *testing.T) {
-	t.Parallel()
-	s := OpenServer(NewConfig(), "")
-	defer s.Close()
-
-	if err := s.CreateDatabaseAndRetentionPolicy("db", newRetentionPolicyInfo("rp", 1, 1*time.Hour)); err != nil {
-		t.Fatal(err)
-	}
-
-	now := now()
-	writes := []string{
-		"float value=42 " + strconv.FormatInt(now.UnixNano(), 10),
-		"integer value=42i " + strconv.FormatInt(now.UnixNano(), 10),
-	}
-
-	test := NewTest("db", "rp")
-	test.write = strings.Join(writes, "\n")
-
-	test.addQueries([]*Query{
-		&Query{
-			name:    "SELECT multiple of float value",
-			command: `SELECT value * 2 from db.rp.float`,
-			exp:     fmt.Sprintf(`{"results":[{"series":[{"name":"float","columns":["time",""],"values":[["%s",84]]}]}]}`, now.Format(time.RFC3339Nano)),
-		},
-		&Query{
-			name:    "SELECT multiple of float value",
-			command: `SELECT 2 * value from db.rp.float`,
-			exp:     fmt.Sprintf(`{"results":[{"series":[{"name":"float","columns":["time",""],"values":[["%s",84]]}]}]}`, now.Format(time.RFC3339Nano)),
-		},
-		&Query{
-			name:    "SELECT multiple of integer value",
-			command: `SELECT value * 2 from db.rp.integer`,
-			exp:     fmt.Sprintf(`{"results":[{"series":[{"name":"integer","columns":["time",""],"values":[["%s",84]]}]}]}`, now.Format(time.RFC3339Nano)),
-		},
-		&Query{
-			name:    "SELECT float multiple of integer value",
-			command: `SELECT value * 2.0 from db.rp.integer`,
-			exp:     fmt.Sprintf(`{"results":[{"series":[{"name":"integer","columns":["time",""],"values":[["%s",84]]}]}]}`, now.Format(time.RFC3339Nano)),
-		},
-	}...)
-
-	if err := test.init(s); err != nil {
-		t.Fatalf("test init failed: %s", err)
-	}
-
-	for _, query := range test.queries {
-		if query.skip {
-			t.Logf("SKIP:: %s", query.name)
-			continue
-		}
-		if err := query.Execute(s); err != nil {
-			t.Error(query.Error(err))
-		} else if !query.success() {
-			t.Error(query.failureMessage())
-		}
-	}
-}
-
-// Ensure the server can query with the count aggregate function
-func TestServer_Query_Count(t *testing.T) {
-	t.Parallel()
-	s := OpenServer(NewConfig(), "")
-	defer s.Close()
-
-	if err := s.CreateDatabaseAndRetentionPolicy("db0", newRetentionPolicyInfo("rp0", 1, 1*time.Hour)); err != nil {
-		t.Fatal(err)
-	}
-
-	now := now()
-
-	test := NewTest("db0", "rp0")
-	test.write = `cpu,host=server01 value=1.0 ` + strconv.FormatInt(now.UnixNano(), 10)
-
-	hour_ago := now.Add(-time.Hour).UTC()
-
-	test.addQueries([]*Query{
-		&Query{
-			name:    "selecting count(value) should succeed",
-			command: `SELECT count(value) FROM db0.rp0.cpu`,
-			exp:     `{"results":[{"series":[{"name":"cpu","columns":["time","count"],"values":[["1970-01-01T00:00:00Z",1]]}]}]}`,
-		},
-		&Query{
-			name:    "selecting count(value) with where time should return result",
-			command: fmt.Sprintf(`SELECT count(value) FROM db0.rp0.cpu WHERE time >= '%s'`, hour_ago.Format(time.RFC3339Nano)),
-			exp:     fmt.Sprintf(`{"results":[{"series":[{"name":"cpu","columns":["time","count"],"values":[["%s",1]]}]}]}`, hour_ago.Format(time.RFC3339Nano)),
-		},
-		&Query{
-			name:    "selecting count(*) should error",
-			command: `SELECT count(*) FROM db0.rp0.cpu`,
-			exp:     `{"error":"error parsing query: expected field argument in count()"}`,
-		},
-	}...)
-
-	if err := test.init(s); err != nil {
-		t.Fatalf("test init failed: %s", err)
-	}
-
-	for _, query := range test.queries {
-		if query.skip {
-			t.Logf("SKIP:: %s", query.name)
-			continue
-		}
-		if err := query.Execute(s); err != nil {
-			t.Error(query.Error(err))
-		} else if !query.success() {
-			t.Error(query.failureMessage())
-		}
-	}
-}
-
-// Ensure the server can query with Now().
-func TestServer_Query_Now(t *testing.T) {
-	t.Parallel()
-	s := OpenServer(NewConfig(), "")
-	defer s.Close()
-
-	if err := s.CreateDatabaseAndRetentionPolicy("db0", newRetentionPolicyInfo("rp0", 1, 1*time.Hour)); err != nil {
-		t.Fatal(err)
-	}
-
-	now := now()
-
-	test := NewTest("db0", "rp0")
-	test.write = `cpu,host=server01 value=1.0 ` + strconv.FormatInt(now.UnixNano(), 10)
-
-	test.addQueries([]*Query{
-		&Query{
-			name:    "where with time < now() should work",
-			command: `SELECT * FROM db0.rp0.cpu where time < now()`,
-			exp:     fmt.Sprintf(`{"results":[{"series":[{"name":"cpu","columns":["time","host","value"],"values":[["%s","server01",1]]}]}]}`, now.Format(time.RFC3339Nano)),
-		},
-		&Query{
-			name:    "where with time < now() and GROUP BY * should work",
-			command: `SELECT * FROM db0.rp0.cpu where time < now() GROUP BY *`,
-			exp:     fmt.Sprintf(`{"results":[{"series":[{"name":"cpu","tags":{"host":"server01"},"columns":["time","value"],"values":[["%s",1]]}]}]}`, now.Format(time.RFC3339Nano)),
-		},
-		&Query{
-			name:    "where with time > now() should return an empty result",
-			command: `SELECT * FROM db0.rp0.cpu where time > now()`,
-			exp:     `{"results":[{}]}`,
-		},
-		&Query{
-			name:    "where with time > now() with GROUP BY * should return an empty result",
-			command: `SELECT * FROM db0.rp0.cpu where time > now() GROUP BY *`,
-			exp:     `{"results":[{}]}`,
-		},
-	}...)
-
-	if err := test.init(s); err != nil {
-		t.Fatalf("test init failed: %s", err)
-	}
-
-	for _, query := range test.queries {
-		if query.skip {
-			t.Logf("SKIP:: %s", query.name)
-			continue
-		}
-		if err := query.Execute(s); err != nil {
-			t.Error(query.Error(err))
-		} else if !query.success() {
-			t.Error(query.failureMessage())
-		}
-	}
-}
-
-// Ensure the server can query with epoch precisions.
-func TestServer_Query_EpochPrecision(t *testing.T) {
-	t.Parallel()
-	s := OpenServer(NewConfig(), "")
-	defer s.Close()
-
-	if err := s.CreateDatabaseAndRetentionPolicy("db0", newRetentionPolicyInfo("rp0", 1, 1*time.Hour)); err != nil {
-		t.Fatal(err)
-	}
-
-	now := now()
-
-	test := NewTest("db0", "rp0")
-	test.write = `cpu,host=server01 value=1.0 ` + strconv.FormatInt(now.UnixNano(), 10)
-
-	test.addQueries([]*Query{
-		&Query{
-			name:    "nanosecond precision",
-			command: `SELECT * FROM db0.rp0.cpu GROUP BY *`,
-			params:  url.Values{"epoch": []string{"n"}},
-			exp:     fmt.Sprintf(`{"results":[{"series":[{"name":"cpu","tags":{"host":"server01"},"columns":["time","value"],"values":[[%d,1]]}]}]}`, now.UnixNano()),
-		},
-		&Query{
-			name:    "microsecond precision",
-			command: `SELECT * FROM db0.rp0.cpu GROUP BY *`,
-			params:  url.Values{"epoch": []string{"u"}},
-			exp:     fmt.Sprintf(`{"results":[{"series":[{"name":"cpu","tags":{"host":"server01"},"columns":["time","value"],"values":[[%d,1]]}]}]}`, now.UnixNano()/int64(time.Microsecond)),
-		},
-		&Query{
-			name:    "millisecond precision",
-			command: `SELECT * FROM db0.rp0.cpu GROUP BY *`,
-			params:  url.Values{"epoch": []string{"ms"}},
-			exp:     fmt.Sprintf(`{"results":[{"series":[{"name":"cpu","tags":{"host":"server01"},"columns":["time","value"],"values":[[%d,1]]}]}]}`, now.UnixNano()/int64(time.Millisecond)),
-		},
-		&Query{
-			name:    "second precision",
-			command: `SELECT * FROM db0.rp0.cpu GROUP BY *`,
-			params:  url.Values{"epoch": []string{"s"}},
-			exp:     fmt.Sprintf(`{"results":[{"series":[{"name":"cpu","tags":{"host":"server01"},"columns":["time","value"],"values":[[%d,1]]}]}]}`, now.UnixNano()/int64(time.Second)),
-		},
-		&Query{
-			name:    "minute precision",
-			command: `SELECT * FROM db0.rp0.cpu GROUP BY *`,
-			params:  url.Values{"epoch": []string{"m"}},
-			exp:     fmt.Sprintf(`{"results":[{"series":[{"name":"cpu","tags":{"host":"server01"},"columns":["time","value"],"values":[[%d,1]]}]}]}`, now.UnixNano()/int64(time.Minute)),
-		},
-		&Query{
-			name:    "hour precision",
-			command: `SELECT * FROM db0.rp0.cpu GROUP BY *`,
-			params:  url.Values{"epoch": []string{"h"}},
-			exp:     fmt.Sprintf(`{"results":[{"series":[{"name":"cpu","tags":{"host":"server01"},"columns":["time","value"],"values":[[%d,1]]}]}]}`, now.UnixNano()/int64(time.Hour)),
-		},
-	}...)
-
-	if err := test.init(s); err != nil {
-		t.Fatalf("test init failed: %s", err)
-	}
-
-	for _, query := range test.queries {
-		if query.skip {
-			t.Logf("SKIP:: %s", query.name)
-			continue
-		}
-		if err := query.Execute(s); err != nil {
-			t.Error(query.Error(err))
-		} else if !query.success() {
-			t.Error(query.failureMessage())
-		}
-	}
-}
-
-// Ensure the server works with tag queries.
-func TestServer_Query_Tags(t *testing.T) {
-	t.Parallel()
-	s := OpenServer(NewConfig(), "")
-	defer s.Close()
-
-	if err := s.CreateDatabaseAndRetentionPolicy("db0", newRetentionPolicyInfo("rp0", 1, 1*time.Hour)); err != nil {
-		t.Fatal(err)
-	}
-
-	now := now()
-
-	writes := []string{
-		fmt.Sprintf("cpu,host=server01 value=100,core=4 %d", now.UnixNano()),
-		fmt.Sprintf("cpu,host=server02 value=50,core=2 %d", now.Add(1).UnixNano()),
-
-		fmt.Sprintf("cpu1,host=server01,region=us-west value=100 %d", mustParseTime(time.RFC3339Nano, "2015-02-28T01:03:36.703820946Z").UnixNano()),
-		fmt.Sprintf("cpu1,host=server02 value=200 %d", mustParseTime(time.RFC3339Nano, "2010-02-28T01:03:37.703820946Z").UnixNano()),
-		fmt.Sprintf("cpu1,host=server03 value=300 %d", mustParseTime(time.RFC3339Nano, "2012-02-28T01:03:38.703820946Z").UnixNano()),
-
-		fmt.Sprintf("cpu2,host=server01 value=100 %d", mustParseTime(time.RFC3339Nano, "2015-02-28T01:03:36.703820946Z").UnixNano()),
-		fmt.Sprintf("cpu2 value=200 %d", mustParseTime(time.RFC3339Nano, "2012-02-28T01:03:38.703820946Z").UnixNano()),
-
-		fmt.Sprintf("cpu3,company=acme01 value=100 %d", mustParseTime(time.RFC3339Nano, "2015-02-28T01:03:36.703820946Z").UnixNano()),
-		fmt.Sprintf("cpu3 value=200 %d", mustParseTime(time.RFC3339Nano, "2012-02-28T01:03:38.703820946Z").UnixNano()),
-
-		fmt.Sprintf("status_code,url=http://www.example.com value=404 %d", mustParseTime(time.RFC3339Nano, "2015-07-22T08:13:54.929026672Z").UnixNano()),
-		fmt.Sprintf("status_code,url=https://influxdb.com value=418 %d", mustParseTime(time.RFC3339Nano, "2015-07-22T09:52:24.914395083Z").UnixNano()),
-	}
-
-	test := NewTest("db0", "rp0")
-	test.write = strings.Join(writes, "\n")
-
-	test.addQueries([]*Query{
-		&Query{
-			name:    "tag without field should return error",
-			command: `SELECT host FROM db0.rp0.cpu`,
-			exp:     `{"results":[{"error":"statement must have at least one field in select clause"}]}`,
-		},
-		&Query{
-			name:    "field with tag should succeed",
-			command: `SELECT host, value FROM db0.rp0.cpu`,
-			exp:     fmt.Sprintf(`{"results":[{"series":[{"name":"cpu","columns":["time","host","value"],"values":[["%s","server01",100],["%s","server02",50]]}]}]}`, now.Format(time.RFC3339Nano), now.Add(1).Format(time.RFC3339Nano)),
-		},
-		&Query{
-			name:    "field with tag and GROUP BY should succeed",
-			command: `SELECT host, value FROM db0.rp0.cpu GROUP BY host`,
-			exp:     fmt.Sprintf(`{"results":[{"series":[{"name":"cpu","tags":{"host":"server01"},"columns":["time","value"],"values":[["%s",100]]},{"name":"cpu","tags":{"host":"server02"},"columns":["time","value"],"values":[["%s",50]]}]}]}`, now.Format(time.RFC3339Nano), now.Add(1).Format(time.RFC3339Nano)),
-		},
-		&Query{
-			name:    "field with two tags should succeed",
-			command: `SELECT host, value, core FROM db0.rp0.cpu`,
-			exp:     fmt.Sprintf(`{"results":[{"series":[{"name":"cpu","columns":["time","host","value","core"],"values":[["%s","server01",100,4],["%s","server02",50,2]]}]}]}`, now.Format(time.RFC3339Nano), now.Add(1).Format(time.RFC3339Nano)),
-		},
-		&Query{
-			name:    "field with two tags and GROUP BY should succeed",
-			command: `SELECT host, value, core FROM db0.rp0.cpu GROUP BY host`,
-			exp:     fmt.Sprintf(`{"results":[{"series":[{"name":"cpu","tags":{"host":"server01"},"columns":["time","value","core"],"values":[["%s",100,4]]},{"name":"cpu","tags":{"host":"server02"},"columns":["time","value","core"],"values":[["%s",50,2]]}]}]}`, now.Format(time.RFC3339Nano), now.Add(1).Format(time.RFC3339Nano)),
-		},
-		&Query{
-			name:    "select * with tags should succeed",
-			command: `SELECT * FROM db0.rp0.cpu`,
-			exp:     fmt.Sprintf(`{"results":[{"series":[{"name":"cpu","columns":["time","core","host","value"],"values":[["%s",4,"server01",100],["%s",2,"server02",50]]}]}]}`, now.Format(time.RFC3339Nano), now.Add(1).Format(time.RFC3339Nano)),
-		},
-		&Query{
-			name:    "select * with tags with GROUP BY * should succeed",
-			command: `SELECT * FROM db0.rp0.cpu GROUP BY *`,
-			exp:     fmt.Sprintf(`{"results":[{"series":[{"name":"cpu","tags":{"host":"server01"},"columns":["time","core","value"],"values":[["%s",4,100]]},{"name":"cpu","tags":{"host":"server02"},"columns":["time","core","value"],"values":[["%s",2,50]]}]}]}`, now.Format(time.RFC3339Nano), now.Add(1).Format(time.RFC3339Nano)),
-		},
-		&Query{
-			name:    "group by tag",
-			command: `SELECT value FROM db0.rp0.cpu GROUP by host`,
-			exp:     fmt.Sprintf(`{"results":[{"series":[{"name":"cpu","tags":{"host":"server01"},"columns":["time","value"],"values":[["%s",100]]},{"name":"cpu","tags":{"host":"server02"},"columns":["time","value"],"values":[["%s",50]]}]}]}`, now.Format(time.RFC3339Nano), now.Add(1).Format(time.RFC3339Nano)),
-		},
-		&Query{
-			name:    "single field (EQ tag value1)",
-			command: `SELECT value FROM db0.rp0.cpu1 WHERE host = 'server01'`,
-			exp:     `{"results":[{"series":[{"name":"cpu1","columns":["time","value"],"values":[["2015-02-28T01:03:36.703820946Z",100]]}]}]}`,
-		},
-		&Query{
-			name:    "single field (2 EQ tags)",
-			command: `SELECT value FROM db0.rp0.cpu1 WHERE host = 'server01' AND region = 'us-west'`,
-			exp:     `{"results":[{"series":[{"name":"cpu1","columns":["time","value"],"values":[["2015-02-28T01:03:36.703820946Z",100]]}]}]}`,
-		},
-		&Query{
-			name:    "single field (OR different tags)",
-			command: `SELECT value FROM db0.rp0.cpu1 WHERE host = 'server03' OR region = 'us-west'`,
-			exp:     `{"results":[{"series":[{"name":"cpu1","columns":["time","value"],"values":[["2012-02-28T01:03:38.703820946Z",300],["2015-02-28T01:03:36.703820946Z",100]]}]}]}`,
-		},
-		&Query{
-			name:    "single field (OR with non-existent tag value)",
-			command: `SELECT value FROM db0.rp0.cpu1 WHERE host = 'server01' OR host = 'server66'`,
-			exp:     `{"results":[{"series":[{"name":"cpu1","columns":["time","value"],"values":[["2015-02-28T01:03:36.703820946Z",100]]}]}]}`,
-		},
-		&Query{
-			name:    "single field (OR with all tag values)",
-			command: `SELECT value FROM db0.rp0.cpu1 WHERE host = 'server01' OR host = 'server02' OR host = 'server03'`,
-			exp:     `{"results":[{"series":[{"name":"cpu1","columns":["time","value"],"values":[["2010-02-28T01:03:37.703820946Z",200],["2012-02-28T01:03:38.703820946Z",300],["2015-02-28T01:03:36.703820946Z",100]]}]}]}`,
-		},
-		&Query{
-			name:    "single field (1 EQ and 1 NEQ tag)",
-			command: `SELECT value FROM db0.rp0.cpu1 WHERE host = 'server01' AND region != 'us-west'`,
-			exp:     `{"results":[{}]}`,
-		},
-		&Query{
-			name:    "single field (EQ tag value2)",
-			command: `SELECT value FROM db0.rp0.cpu1 WHERE host = 'server02'`,
-			exp:     `{"results":[{"series":[{"name":"cpu1","columns":["time","value"],"values":[["2010-02-28T01:03:37.703820946Z",200]]}]}]}`,
-		},
-		&Query{
-			name:    "single field (NEQ tag value1)",
-			command: `SELECT value FROM db0.rp0.cpu1 WHERE host != 'server01'`,
-			exp:     `{"results":[{"series":[{"name":"cpu1","columns":["time","value"],"values":[["2010-02-28T01:03:37.703820946Z",200],["2012-02-28T01:03:38.703820946Z",300]]}]}]}`,
-		},
-		&Query{
-			name:    "single field (NEQ tag value1 AND NEQ tag value2)",
-			command: `SELECT value FROM db0.rp0.cpu1 WHERE host != 'server01' AND host != 'server02'`,
-			exp:     `{"results":[{"series":[{"name":"cpu1","columns":["time","value"],"values":[["2012-02-28T01:03:38.703820946Z",300]]}]}]}`,
-		},
-		&Query{
-			name:    "single field (NEQ tag value1 OR NEQ tag value2)",
-			command: `SELECT value FROM db0.rp0.cpu1 WHERE host != 'server01' OR host != 'server02'`, // Yes, this is always true, but that's the point.
-			exp:     `{"results":[{"series":[{"name":"cpu1","columns":["time","value"],"values":[["2010-02-28T01:03:37.703820946Z",200],["2012-02-28T01:03:38.703820946Z",300],["2015-02-28T01:03:36.703820946Z",100]]}]}]}`,
-		},
-		&Query{
-			name:    "single field (NEQ tag value1 AND NEQ tag value2 AND NEQ tag value3)",
-			command: `SELECT value FROM db0.rp0.cpu1 WHERE host != 'server01' AND host != 'server02' AND host != 'server03'`,
-			exp:     `{"results":[{}]}`,
-		},
-		&Query{
-			name:    "single field (NEQ tag value1, point without any tags)",
-			command: `SELECT value FROM db0.rp0.cpu2 WHERE host != 'server01'`,
-			exp:     `{"results":[{"series":[{"name":"cpu2","columns":["time","value"],"values":[["2012-02-28T01:03:38.703820946Z",200]]}]}]}`,
-		},
-		&Query{
-			name:    "single field (NEQ tag value1, point without any tags)",
-			command: `SELECT value FROM db0.rp0.cpu3 WHERE company !~ /acme01/`,
-			exp:     `{"results":[{"series":[{"name":"cpu3","columns":["time","value"],"values":[["2012-02-28T01:03:38.703820946Z",200]]}]}]}`,
-		},
-		&Query{
-			name:    "single field (regex tag match)",
-			command: `SELECT value FROM db0.rp0.cpu3 WHERE company =~ /acme01/`,
-			exp:     `{"results":[{"series":[{"name":"cpu3","columns":["time","value"],"values":[["2015-02-28T01:03:36.703820946Z",100]]}]}]}`,
-		},
-		&Query{
-			name:    "single field (regex tag match)",
-			command: `SELECT value FROM db0.rp0.cpu3 WHERE company !~ /acme[23]/`,
-			exp:     `{"results":[{"series":[{"name":"cpu3","columns":["time","value"],"values":[["2012-02-28T01:03:38.703820946Z",200],["2015-02-28T01:03:36.703820946Z",100]]}]}]}`,
-		},
-		&Query{
-			name:    "single field (regex tag match with escaping)",
-			command: `SELECT value FROM db0.rp0.status_code WHERE url !~ /https\:\/\/influxdb\.com/`,
-			exp:     `{"results":[{"series":[{"name":"status_code","columns":["time","value"],"values":[["2015-07-22T08:13:54.929026672Z",404]]}]}]}`,
-		},
-		&Query{
-			name:    "single field (regex tag match with escaping)",
-			command: `SELECT value FROM db0.rp0.status_code WHERE url =~ /https\:\/\/influxdb\.com/`,
-			exp:     `{"results":[{"series":[{"name":"status_code","columns":["time","value"],"values":[["2015-07-22T09:52:24.914395083Z",418]]}]}]}`,
-		},
-	}...)
-
-	if err := test.init(s); err != nil {
-		t.Fatalf("test init failed: %s", err)
-	}
-
-	for _, query := range test.queries {
-		if query.skip {
-			t.Logf("SKIP:: %s", query.name)
-			continue
-		}
-		if err := query.Execute(s); err != nil {
-			t.Error(query.Error(err))
-		} else if !query.success() {
-			t.Error(query.failureMessage())
-		}
-	}
-}
-
-// Ensure the server correctly queries with an alias.
-func TestServer_Query_Alias(t *testing.T) {
-	t.Parallel()
-	s := OpenServer(NewConfig(), "")
-	defer s.Close()
-
-	if err := s.CreateDatabaseAndRetentionPolicy("db0", newRetentionPolicyInfo("rp0", 1, 1*time.Hour)); err != nil {
-		t.Fatal(err)
-	}
-
-	writes := []string{
-		fmt.Sprintf("cpu value=1i,steps=3i %d", mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:00Z").UnixNano()),
-		fmt.Sprintf("cpu value=2i,steps=4i %d", mustParseTime(time.RFC3339Nano, "2000-01-01T00:01:00Z").UnixNano()),
-	}
-	test := NewTest("db0", "rp0")
-	test.write = strings.Join(writes, "\n")
-
-	test.addQueries([]*Query{
-		&Query{
-			name:    "baseline query - SELECT * FROM db0.rp0.cpu",
-			command: `SELECT * FROM db0.rp0.cpu`,
-			exp:     `{"results":[{"series":[{"name":"cpu","columns":["time","steps","value"],"values":[["2000-01-01T00:00:00Z",3,1],["2000-01-01T00:01:00Z",4,2]]}]}]}`,
-		},
-		&Query{
-			name:    "basic query with alias - SELECT steps, value as v FROM db0.rp0.cpu",
-			command: `SELECT steps, value as v FROM db0.rp0.cpu`,
-			exp:     `{"results":[{"series":[{"name":"cpu","columns":["time","steps","v"],"values":[["2000-01-01T00:00:00Z",3,1],["2000-01-01T00:01:00Z",4,2]]}]}]}`,
-		},
-		&Query{
-			name:    "double aggregate sum - SELECT sum(value), sum(steps) FROM db0.rp0.cpu",
-			command: `SELECT sum(value), sum(steps) FROM db0.rp0.cpu`,
-			exp:     `{"results":[{"series":[{"name":"cpu","columns":["time","sum","sum"],"values":[["1970-01-01T00:00:00Z",3,7]]}]}]}`,
-		},
-		&Query{
-			name:    "double aggregate sum reverse order - SELECT sum(steps), sum(value) FROM db0.rp0.cpu",
-			command: `SELECT sum(steps), sum(value) FROM db0.rp0.cpu`,
-			exp:     `{"results":[{"series":[{"name":"cpu","columns":["time","sum","sum"],"values":[["1970-01-01T00:00:00Z",7,3]]}]}]}`,
-		},
-		&Query{
-			name:    "double aggregate sum with alias - SELECT sum(value) as sumv, sum(steps) as sums FROM db0.rp0.cpu",
-			command: `SELECT sum(value) as sumv, sum(steps) as sums FROM db0.rp0.cpu`,
-			exp:     `{"results":[{"series":[{"name":"cpu","columns":["time","sumv","sums"],"values":[["1970-01-01T00:00:00Z",3,7]]}]}]}`,
-		},
-		&Query{
-			name:    "double aggregate with same value - SELECT sum(value), mean(value) FROM db0.rp0.cpu",
-			command: `SELECT sum(value), mean(value) FROM db0.rp0.cpu`,
-			exp:     `{"results":[{"series":[{"name":"cpu","columns":["time","sum","mean"],"values":[["1970-01-01T00:00:00Z",3,1.5]]}]}]}`,
-		},
-		&Query{
-			name:    "double aggregate with same value and same alias - SELECT mean(value) as mv, max(value) as mv FROM db0.rp0.cpu",
-			command: `SELECT mean(value) as mv, max(value) as mv FROM db0.rp0.cpu`,
-			exp:     `{"results":[{"series":[{"name":"cpu","columns":["time","mv","mv"],"values":[["1970-01-01T00:00:00Z",1.5,2]]}]}]}`,
-		},
-		&Query{
-			name:    "double aggregate with non-existent field - SELECT mean(value), max(foo) FROM db0.rp0.cpu",
-			command: `SELECT mean(value), max(foo) FROM db0.rp0.cpu`,
-			exp:     `{"results":[{"series":[{"name":"cpu","columns":["time","mean","max"],"values":[["1970-01-01T00:00:00Z",1.5,null]]}]}]}`,
-		},
-	}...)
-
-	if err := test.init(s); err != nil {
-		t.Fatalf("test init failed: %s", err)
-	}
-
-	for _, query := range test.queries {
-		if query.skip {
-			t.Logf("SKIP:: %s", query.name)
-			continue
-		}
-		if err := query.Execute(s); err != nil {
-			t.Error(query.Error(err))
-		} else if !query.success() {
-			t.Error(query.failureMessage())
-		}
-	}
-}
-
-// Ensure the server will succeed and error for common scenarios.
-func TestServer_Query_Common(t *testing.T) {
-	t.Parallel()
-	s := OpenServer(NewConfig(), "")
-	defer s.Close()
-
-	if err := s.CreateDatabaseAndRetentionPolicy("db0", newRetentionPolicyInfo("rp0", 1, 1*time.Hour)); err != nil {
-		t.Fatal(err)
-	}
-
-	now := now()
-
-	test := NewTest("db0", "rp0")
-	test.write = fmt.Sprintf("cpu,host=server01 value=1 %s", strconv.FormatInt(now.UnixNano(), 10))
-
-	test.addQueries([]*Query{
-		&Query{
-			name:    "selecting a from a non-existent database should error",
-			command: `SELECT value FROM db1.rp0.cpu`,
-			exp:     `{"results":[{"error":"database not found: db1"}]}`,
-		},
-		&Query{
-			name:    "selecting a from a non-existent retention policy should error",
-			command: `SELECT value FROM db0.rp1.cpu`,
-			exp:     `{"results":[{"error":"retention policy not found"}]}`,
-		},
-		&Query{
-			name:    "selecting a valid  measurement and field should succeed",
-			command: `SELECT value FROM db0.rp0.cpu`,
-			exp:     fmt.Sprintf(`{"results":[{"series":[{"name":"cpu","columns":["time","value"],"values":[["%s",1]]}]}]}`, now.Format(time.RFC3339Nano)),
-		},
-		&Query{
-			name:    "explicitly selecting time and a valid measurement and field should succeed",
-			command: `SELECT time,value FROM db0.rp0.cpu`,
-			exp:     fmt.Sprintf(`{"results":[{"series":[{"name":"cpu","columns":["time","value"],"values":[["%s",1]]}]}]}`, now.Format(time.RFC3339Nano)),
-		},
-		&Query{
-			name:    "selecting a measurement that doesn't exist should result in empty set",
-			command: `SELECT value FROM db0.rp0.idontexist`,
-			exp:     `{"results":[{}]}`,
-		},
-		&Query{
-			name:    "selecting a field that doesn't exist should result in empty set",
-			command: `SELECT idontexist FROM db0.rp0.cpu`,
-			exp:     `{"results":[{}]}`,
-		},
-		&Query{
-			name:    "selecting wildcard without specifying a database should error",
-			command: `SELECT * FROM cpu`,
-			exp:     `{"results":[{"error":"database name required"}]}`,
-		},
-		&Query{
-			name:    "selecting explicit field without specifying a database should error",
-			command: `SELECT value FROM cpu`,
-			exp:     `{"results":[{"error":"database name required"}]}`,
-		},
-	}...)
-
-	if err := test.init(s); err != nil {
-		t.Fatalf("test init failed: %s", err)
-	}
-
-	for _, query := range test.queries {
-		if query.skip {
-			t.Logf("SKIP:: %s", query.name)
-			continue
-		}
-		if err := query.Execute(s); err != nil {
-			t.Error(query.Error(err))
-		} else if !query.success() {
-			t.Error(query.failureMessage())
-		}
-	}
-}
-
-// Ensure the server can query two points.
-func TestServer_Query_SelectTwoPoints(t *testing.T) {
-	t.Parallel()
-	s := OpenServer(NewConfig(), "")
-	defer s.Close()
-
-	if err := s.CreateDatabaseAndRetentionPolicy("db0", newRetentionPolicyInfo("rp0", 1, 1*time.Hour)); err != nil {
-		t.Fatal(err)
-	}
-
-	now := now()
-
-	test := NewTest("db0", "rp0")
-	test.write = fmt.Sprintf("cpu value=100 %s\ncpu value=200 %s", strconv.FormatInt(now.UnixNano(), 10), strconv.FormatInt(now.Add(1).UnixNano(), 10))
-
-	test.addQueries(
-		&Query{
-			name:    "selecting two points should result in two points",
-			command: `SELECT * FROM db0.rp0.cpu`,
-			exp:     fmt.Sprintf(`{"results":[{"series":[{"name":"cpu","columns":["time","value"],"values":[["%s",100],["%s",200]]}]}]}`, now.Format(time.RFC3339Nano), now.Add(1).Format(time.RFC3339Nano)),
-		},
-		&Query{
-			name:    "selecting two points with GROUP BY * should result in two points",
-			command: `SELECT * FROM db0.rp0.cpu GROUP BY *`,
-			exp:     fmt.Sprintf(`{"results":[{"series":[{"name":"cpu","columns":["time","value"],"values":[["%s",100],["%s",200]]}]}]}`, now.Format(time.RFC3339Nano), now.Add(1).Format(time.RFC3339Nano)),
-		},
-	)
-
-	for i, query := range test.queries {
-		if i == 0 {
-			if err := test.init(s); err != nil {
-				t.Fatalf("test init failed: %s", err)
-			}
-		}
-		if query.skip {
-			t.Logf("SKIP:: %s", query.name)
-			continue
-		}
-		if err := query.Execute(s); err != nil {
-			t.Error(query.Error(err))
-		} else if !query.success() {
-			t.Error(query.failureMessage())
-		}
-	}
-}
-
-// Ensure the server can query two negative points.
-func TestServer_Query_SelectTwoNegativePoints(t *testing.T) {
-	t.Parallel()
-	s := OpenServer(NewConfig(), "")
-	defer s.Close()
-
-	if err := s.CreateDatabaseAndRetentionPolicy("db0", newRetentionPolicyInfo("rp0", 1, 1*time.Hour)); err != nil {
-		t.Fatal(err)
-	}
-
-	now := now()
-
-	test := NewTest("db0", "rp0")
-	test.write = fmt.Sprintf("cpu value=-100 %s\ncpu value=-200 %s", strconv.FormatInt(now.UnixNano(), 10), strconv.FormatInt(now.Add(1).UnixNano(), 10))
-
-	test.addQueries(&Query{
-		name:    "selecting two negative points should succeed",
-		command: `SELECT * FROM db0.rp0.cpu`,
-		exp:     fmt.Sprintf(`{"results":[{"series":[{"name":"cpu","columns":["time","value"],"values":[["%s",-100],["%s",-200]]}]}]}`, now.Format(time.RFC3339Nano), now.Add(1).Format(time.RFC3339Nano)),
-	})
-
-	for i, query := range test.queries {
-		if i == 0 {
-			if err := test.init(s); err != nil {
-				t.Fatalf("test init failed: %s", err)
-			}
-		}
-		if query.skip {
-			t.Logf("SKIP:: %s", query.name)
-			continue
-		}
-		if err := query.Execute(s); err != nil {
-			t.Error(query.Error(err))
-		} else if !query.success() {
-			t.Error(query.failureMessage())
-		}
-	}
-}
-
-// Ensure the server can query with relative time.
-func TestServer_Query_SelectRelativeTime(t *testing.T) {
-	t.Parallel()
-	s := OpenServer(NewConfig(), "")
-	defer s.Close()
-
-	if err := s.CreateDatabaseAndRetentionPolicy("db0", newRetentionPolicyInfo("rp0", 1, 1*time.Hour)); err != nil {
-		t.Fatal(err)
-	}
-
-	now := now()
-	yesterday := yesterday()
-
-	test := NewTest("db0", "rp0")
-	test.write = fmt.Sprintf("cpu,host=server01 value=100 %s\ncpu,host=server01 value=200 %s", strconv.FormatInt(yesterday.UnixNano(), 10), strconv.FormatInt(now.UnixNano(), 10))
-
-	test.addQueries([]*Query{
-		&Query{
-			name:    "single point with time pre-calculated for past time queries yesterday",
-			command: `SELECT * FROM db0.rp0.cpu where time >= '` + yesterday.Add(-1*time.Minute).Format(time.RFC3339Nano) + `' GROUP BY *`,
-			exp:     fmt.Sprintf(`{"results":[{"series":[{"name":"cpu","tags":{"host":"server01"},"columns":["time","value"],"values":[["%s",100],["%s",200]]}]}]}`, yesterday.Format(time.RFC3339Nano), now.Format(time.RFC3339Nano)),
-		},
-		&Query{
-			name:    "single point with time pre-calculated for relative time queries now",
-			command: `SELECT * FROM db0.rp0.cpu where time >= now() - 1m GROUP BY *`,
-			exp:     fmt.Sprintf(`{"results":[{"series":[{"name":"cpu","tags":{"host":"server01"},"columns":["time","value"],"values":[["%s",200]]}]}]}`, now.Format(time.RFC3339Nano)),
-		},
-	}...)
-
-	for i, query := range test.queries {
-		if i == 0 {
-			if err := test.init(s); err != nil {
-				t.Fatalf("test init failed: %s", err)
-			}
-		}
-		if query.skip {
-			t.Logf("SKIP:: %s", query.name)
-			continue
-		}
-		if err := query.Execute(s); err != nil {
-			t.Error(query.Error(err))
-		} else if !query.success() {
-			t.Error(query.failureMessage())
-		}
-	}
-}
-
-// Ensure the server can handle various simple calculus queries.
-func TestServer_Query_SelectRawCalculus(t *testing.T) {
-	t.Parallel()
-	s := OpenServer(NewConfig(), "")
-	defer s.Close()
-
-	if err := s.CreateDatabaseAndRetentionPolicy("db0", newRetentionPolicyInfo("rp0", 1, 1*time.Hour)); err != nil {
-		t.Fatal(err)
-	}
-
-	test := NewTest("db0", "rp0")
-	test.write = fmt.Sprintf("cpu value=210 1278010021000000000\ncpu value=10 1278010022000000000")
-
-	test.addQueries([]*Query{
-		&Query{
-			name:    "calculate single derivate",
-			command: `SELECT derivative(value) from db0.rp0.cpu`,
-			exp:     `{"results":[{"series":[{"name":"cpu","columns":["time","derivative"],"values":[["2010-07-01T18:47:02Z",-200]]}]}]}`,
-		},
-	}...)
-
-	for i, query := range test.queries {
-		if i == 0 {
-			if err := test.init(s); err != nil {
-				t.Fatalf("test init failed: %s", err)
-			}
-		}
-		if query.skip {
-			t.Logf("SKIP:: %s", query.name)
-			continue
-		}
-		if err := query.Execute(s); err != nil {
-			t.Error(query.Error(err))
-		} else if !query.success() {
-			t.Error(query.failureMessage())
-		}
-	}
-}
-
-// mergeMany ensures that when merging many series together and some of them have a different number
-// of points than others in a group by interval the results are correct
-func TestServer_Query_MergeMany(t *testing.T) {
-	t.Parallel()
-	s := OpenServer(NewConfig(), "")
-	defer s.Close()
-
-	// set infinite retention policy as we are inserting data in the past and don't want retention policy enforcement to make this test racy
-	if err := s.CreateDatabaseAndRetentionPolicy("db0", newRetentionPolicyInfo("rp0", 1, 0)); err != nil {
-		t.Fatal(err)
-	}
-
-	test := NewTest("db0", "rp0")
-
-	writes := []string{}
-	for i := 1; i < 11; i++ {
-		for j := 1; j < 5+i%3; j++ {
-			data := fmt.Sprintf(`cpu,host=server_%d value=22 %d`, i, time.Unix(int64(j), int64(0)).UTC().UnixNano())
-			writes = append(writes, data)
-		}
-	}
-	test.write = strings.Join(writes, "\n")
-
-	test.addQueries([]*Query{
-		&Query{
-			name:    "GROUP by time",
-			command: `SELECT count(value) FROM db0.rp0.cpu WHERE time >= '1970-01-01T00:00:01Z' AND time <= '1970-01-01T00:00:06Z' GROUP BY time(1s)`,
-			exp:     `{"results":[{"series":[{"name":"cpu","columns":["time","count"],"values":[["1970-01-01T00:00:01Z",10],["1970-01-01T00:00:02Z",10],["1970-01-01T00:00:03Z",10],["1970-01-01T00:00:04Z",10],["1970-01-01T00:00:05Z",7],["1970-01-01T00:00:06Z",3]]}]}]}`,
-		},
-		&Query{
-			skip:    true,
-			name:    "GROUP by tag - FIXME issue #2875",
-			command: `SELECT count(value) FROM db0.rp0.cpu where time >= '2000-01-01T00:00:00Z' and time <= '2000-01-01T02:00:00Z' group by host`,
-			exp:     `{"results":[{"series":[{"name":"cpu","tags":{"host":"server01"},"columns":["time","count"],"values":[["2000-01-01T00:00:00Z",1]]},{"name":"cpu","tags":{"host":"server02"},"columns":["time","count"],"values":[["2000-01-01T00:00:00Z",1]]},{"name":"cpu","tags":{"host":"server03"},"columns":["time","count"],"values":[["2000-01-01T00:00:00Z",1]]}]}]}`,
-		},
-		&Query{
-			name:    "GROUP by field",
-			command: `SELECT count(value) FROM db0.rp0.cpu group by value`,
-			exp:     `{"results":[{"error":"can not use field in GROUP BY clause: value"}]}`,
-		},
-	}...)
-
-	for i, query := range test.queries {
-		if i == 0 {
-			if err := test.init(s); err != nil {
-				t.Fatalf("test init failed: %s", err)
-			}
-		}
-		if query.skip {
-			t.Logf("SKIP:: %s", query.name)
-			continue
-		}
-		if err := query.Execute(s); err != nil {
-			t.Error(query.Error(err))
-		} else if !query.success() {
-			t.Error(query.failureMessage())
-		}
-	}
-}
-
-func TestServer_Query_SLimitAndSOffset(t *testing.T) {
-	t.Parallel()
-	s := OpenServer(NewConfig(), "")
-	defer s.Close()
-
-	// set infinite retention policy as we are inserting data in the past and don't want retention policy enforcement to make this test racy
-	if err := s.CreateDatabaseAndRetentionPolicy("db0", newRetentionPolicyInfo("rp0", 1, 0)); err != nil {
-		t.Fatal(err)
-	}
-
-	test := NewTest("db0", "rp0")
-
-	writes := []string{}
-	for i := 1; i < 10; i++ {
-		data := fmt.Sprintf(`cpu,region=us-east,host=server-%d value=%d %d`, i, i, time.Unix(int64(i), int64(0)).UnixNano())
-		writes = append(writes, data)
-	}
-	test.write = strings.Join(writes, "\n")
-
-	test.addQueries([]*Query{
-		&Query{
-			name:    "SLIMIT 2 SOFFSET 1",
-			command: `SELECT count(value) FROM db0.rp0.cpu GROUP BY * SLIMIT 2 SOFFSET 1`,
-			exp:     `{"results":[{"series":[{"name":"cpu","tags":{"host":"server-2","region":"us-east"},"columns":["time","count"],"values":[["1970-01-01T00:00:00Z",1]]},{"name":"cpu","tags":{"host":"server-3","region":"us-east"},"columns":["time","count"],"values":[["1970-01-01T00:00:00Z",1]]}]}]}`,
-		},
-		&Query{
-			name:    "SLIMIT 2 SOFFSET 3",
-			command: `SELECT count(value) FROM db0.rp0.cpu GROUP BY * SLIMIT 2 SOFFSET 3`,
-			exp:     `{"results":[{"series":[{"name":"cpu","tags":{"host":"server-4","region":"us-east"},"columns":["time","count"],"values":[["1970-01-01T00:00:00Z",1]]},{"name":"cpu","tags":{"host":"server-5","region":"us-east"},"columns":["time","count"],"values":[["1970-01-01T00:00:00Z",1]]}]}]}`,
-		},
-		&Query{
-			name:    "SLIMIT 3 SOFFSET 8",
-			command: `SELECT count(value) FROM db0.rp0.cpu GROUP BY * SLIMIT 3 SOFFSET 8`,
-			exp:     `{"results":[{"series":[{"name":"cpu","tags":{"host":"server-9","region":"us-east"},"columns":["time","count"],"values":[["1970-01-01T00:00:00Z",1]]}]}]}`,
-		},
-	}...)
-
-	for i, query := range test.queries {
-		if i == 0 {
-			if err := test.init(s); err != nil {
-				t.Fatalf("test init failed: %s", err)
-			}
-		}
-		if query.skip {
-			t.Logf("SKIP:: %s", query.name)
-			continue
-		}
-		if err := query.Execute(s); err != nil {
-			t.Error(query.Error(err))
-		} else if !query.success() {
-			t.Error(query.failureMessage())
-		}
-	}
-}
-
-func TestServer_Query_Regex(t *testing.T) {
-	t.Parallel()
-	s := OpenServer(NewConfig(), "")
-	defer s.Close()
-
-	if err := s.CreateDatabaseAndRetentionPolicy("db0", newRetentionPolicyInfo("rp0", 1, 0)); err != nil {
-		t.Fatal(err)
-	}
-	if err := s.MetaStore.SetDefaultRetentionPolicy("db0", "rp0"); err != nil {
-		t.Fatal(err)
-	}
-
-	writes := []string{
-		fmt.Sprintf(`cpu1,host=server01 value=10 %d`, mustParseTime(time.RFC3339Nano, "2015-02-28T01:03:36.703820946Z").UnixNano()),
-		fmt.Sprintf(`cpu2,host=server01 value=20 %d`, mustParseTime(time.RFC3339Nano, "2015-02-28T01:03:36.703820946Z").UnixNano()),
-		fmt.Sprintf(`cpu3,host=server01 value=30 %d`, mustParseTime(time.RFC3339Nano, "2015-02-28T01:03:36.703820946Z").UnixNano()),
-	}
-
-	test := NewTest("db0", "rp0")
-	test.write = strings.Join(writes, "\n")
-
-	test.addQueries([]*Query{
-		&Query{
-			name:    "default db and rp",
-			command: `SELECT * FROM /cpu[13]/`,
-			params:  url.Values{"db": []string{"db0"}},
-			exp:     `{"results":[{"series":[{"name":"cpu1","columns":["time","host","value"],"values":[["2015-02-28T01:03:36.703820946Z","server01",10]]},{"name":"cpu3","columns":["time","host","value"],"values":[["2015-02-28T01:03:36.703820946Z","server01",30]]}]}]}`,
-		},
-		&Query{
-			name:    "default db and rp with GROUP BY *",
-			command: `SELECT * FROM /cpu[13]/ GROUP BY *`,
-			params:  url.Values{"db": []string{"db0"}},
-			exp:     `{"results":[{"series":[{"name":"cpu1","tags":{"host":"server01"},"columns":["time","value"],"values":[["2015-02-28T01:03:36.703820946Z",10]]},{"name":"cpu3","tags":{"host":"server01"},"columns":["time","value"],"values":[["2015-02-28T01:03:36.703820946Z",30]]}]}]}`,
-		},
-		&Query{
-			name:    "specifying db and rp",
-			command: `SELECT * FROM db0.rp0./cpu[13]/ GROUP BY *`,
-			exp:     `{"results":[{"series":[{"name":"cpu1","tags":{"host":"server01"},"columns":["time","value"],"values":[["2015-02-28T01:03:36.703820946Z",10]]},{"name":"cpu3","tags":{"host":"server01"},"columns":["time","value"],"values":[["2015-02-28T01:03:36.703820946Z",30]]}]}]}`,
-		},
-		&Query{
-			name:    "default db and specified rp",
-			command: `SELECT * FROM rp0./cpu[13]/ GROUP BY *`,
-			params:  url.Values{"db": []string{"db0"}},
-			exp:     `{"results":[{"series":[{"name":"cpu1","tags":{"host":"server01"},"columns":["time","value"],"values":[["2015-02-28T01:03:36.703820946Z",10]]},{"name":"cpu3","tags":{"host":"server01"},"columns":["time","value"],"values":[["2015-02-28T01:03:36.703820946Z",30]]}]}]}`,
-		},
-		&Query{
-			name:    "specified db and default rp",
-			command: `SELECT * FROM db0../cpu[13]/ GROUP BY *`,
-			exp:     `{"results":[{"series":[{"name":"cpu1","tags":{"host":"server01"},"columns":["time","value"],"values":[["2015-02-28T01:03:36.703820946Z",10]]},{"name":"cpu3","tags":{"host":"server01"},"columns":["time","value"],"values":[["2015-02-28T01:03:36.703820946Z",30]]}]}]}`,
-		},
-	}...)
-
-	for i, query := range test.queries {
-		if i == 0 {
-			if err := test.init(s); err != nil {
-				t.Fatalf("test init failed: %s", err)
-			}
-		}
-		if query.skip {
-			t.Logf("SKIP:: %s", query.name)
-			continue
-		}
-		if err := query.Execute(s); err != nil {
-			t.Error(query.Error(err))
-		} else if !query.success() {
-			t.Error(query.failureMessage())
-		}
-	}
-}
-
-func TestServer_Query_Aggregates_Int(t *testing.T) {
-	t.Parallel()
-	s := OpenDefaultServer(NewConfig(), "")
-	defer s.Close()
-
-	test := NewTest("db0", "rp0")
-	test.write = strings.Join([]string{
-		fmt.Sprintf(`int value=45 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:00Z").UnixNano()),
-	}, "\n")
-
-	test.addQueries([]*Query{
-		// int64
-		&Query{
-			name:    "stddev with just one point - int",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT STDDEV(value) FROM int`,
-			exp:     `{"results":[{"series":[{"name":"int","columns":["time","stddev"],"values":[["1970-01-01T00:00:00Z",null]]}]}]}`,
-		},
-	}...)
-
-	for i, query := range test.queries {
-		if i == 0 {
-			if err := test.init(s); err != nil {
-				t.Fatalf("test init failed: %s", err)
-			}
-		}
-		if query.skip {
-			t.Logf("SKIP:: %s", query.name)
-			continue
-		}
-		if err := query.Execute(s); err != nil {
-			t.Error(query.Error(err))
-		} else if !query.success() {
-			t.Error(query.failureMessage())
-		}
-	}
-}
-
-func TestServer_Query_Aggregates_IntMax(t *testing.T) {
-	t.Parallel()
-	s := OpenDefaultServer(NewConfig(), "")
-	defer s.Close()
-
-	test := NewTest("db0", "rp0")
-	test.write = strings.Join([]string{
-		fmt.Sprintf(`intmax value=%s %d`, maxInt64(), mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:00Z").UnixNano()),
-		fmt.Sprintf(`intmax value=%s %d`, maxInt64(), mustParseTime(time.RFC3339Nano, "2000-01-01T01:00:00Z").UnixNano()),
-	}, "\n")
-
-	test.addQueries([]*Query{
-		&Query{
-			name:    "large mean and stddev - int",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT MEAN(value), STDDEV(value) FROM intmax`,
-			exp:     `{"results":[{"series":[{"name":"intmax","columns":["time","mean","stddev"],"values":[["1970-01-01T00:00:00Z",` + maxInt64() + `,0]]}]}]}`,
-		},
-	}...)
-
-	for i, query := range test.queries {
-		if i == 0 {
-			if err := test.init(s); err != nil {
-				t.Fatalf("test init failed: %s", err)
-			}
-		}
-		if query.skip {
-			t.Logf("SKIP:: %s", query.name)
-			continue
-		}
-		if err := query.Execute(s); err != nil {
-			t.Error(query.Error(err))
-		} else if !query.success() {
-			t.Error(query.failureMessage())
-		}
-	}
-}
-
-func TestServer_Query_Aggregates_IntMany(t *testing.T) {
-	t.Parallel()
-	s := OpenDefaultServer(NewConfig(), "")
-	defer s.Close()
-
-	test := NewTest("db0", "rp0")
-	test.write = strings.Join([]string{
-		fmt.Sprintf(`intmany,host=server01 value=2.0 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:00Z").UnixNano()),
-		fmt.Sprintf(`intmany,host=server02 value=4.0 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:10Z").UnixNano()),
-		fmt.Sprintf(`intmany,host=server03 value=4.0 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:20Z").UnixNano()),
-		fmt.Sprintf(`intmany,host=server04 value=4.0 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:30Z").UnixNano()),
-		fmt.Sprintf(`intmany,host=server05 value=5.0 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:40Z").UnixNano()),
-		fmt.Sprintf(`intmany,host=server06 value=5.0 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:50Z").UnixNano()),
-		fmt.Sprintf(`intmany,host=server07 value=7.0 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:01:00Z").UnixNano()),
-		fmt.Sprintf(`intmany,host=server08 value=9.0 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:01:10Z").UnixNano()),
-	}, "\n")
-
-	test.addQueries([]*Query{
-		&Query{
-			name:    "mean and stddev - int",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT MEAN(value), STDDEV(value) FROM intmany WHERE time >= '2000-01-01' AND time < '2000-01-01T00:02:00Z' GROUP BY time(10m)`,
-			exp:     `{"results":[{"series":[{"name":"intmany","columns":["time","mean","stddev"],"values":[["2000-01-01T00:00:00Z",5,2.138089935299395]]}]}]}`,
-		},
-		&Query{
-			name:    "first - int",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT FIRST(value) FROM intmany`,
-			exp:     `{"results":[{"series":[{"name":"intmany","columns":["time","first"],"values":[["2000-01-01T00:00:00Z",2]]}]}]}`,
-		},
-		&Query{
-			name:    "first - int - epoch ms",
-			params:  url.Values{"db": []string{"db0"}, "epoch": []string{"ms"}},
-			command: `SELECT FIRST(value) FROM intmany`,
-			exp:     fmt.Sprintf(`{"results":[{"series":[{"name":"intmany","columns":["time","first"],"values":[[%d,2]]}]}]}`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:00Z").UnixNano()/int64(time.Millisecond)),
-		},
-		&Query{
-			name:    "last - int",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT LAST(value) FROM intmany`,
-			exp:     `{"results":[{"series":[{"name":"intmany","columns":["time","last"],"values":[["2000-01-01T00:01:10Z",9]]}]}]}`,
-		},
-		&Query{
-			name:    "spread - int",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT SPREAD(value) FROM intmany`,
-			exp:     `{"results":[{"series":[{"name":"intmany","columns":["time","spread"],"values":[["1970-01-01T00:00:00Z",7]]}]}]}`,
-		},
-		&Query{
-			name:    "median - even count - int",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT MEDIAN(value) FROM intmany`,
-			exp:     `{"results":[{"series":[{"name":"intmany","columns":["time","median"],"values":[["1970-01-01T00:00:00Z",4.5]]}]}]}`,
-		},
-		&Query{
-			name:    "median - odd count - int",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT MEDIAN(value) FROM intmany where time < '2000-01-01T00:01:10Z'`,
-			exp:     `{"results":[{"series":[{"name":"intmany","columns":["time","median"],"values":[["1970-01-01T00:00:00Z",4]]}]}]}`,
-		},
-		&Query{
-			name:    "distinct as call - int",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT DISTINCT(value) FROM intmany`,
-			exp:     `{"results":[{"series":[{"name":"intmany","columns":["time","distinct"],"values":[["1970-01-01T00:00:00Z",[2,4,5,7,9]]]}]}]}`,
-		},
-		&Query{
-			name:    "distinct alt syntax - int",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT DISTINCT value FROM intmany`,
-			exp:     `{"results":[{"series":[{"name":"intmany","columns":["time","distinct"],"values":[["1970-01-01T00:00:00Z",[2,4,5,7,9]]]}]}]}`,
-		},
-		&Query{
-			name:    "distinct select tag - int",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT DISTINCT(host) FROM intmany`,
-			exp:     `{"results":[{"error":"statement must have at least one field in select clause"}]}`,
-		},
-		&Query{
-			name:    "distinct alt select tag - int",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT DISTINCT host FROM intmany`,
-			exp:     `{"results":[{"error":"statement must have at least one field in select clause"}]}`,
-		},
-		&Query{
-			name:    "count distinct - int",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT COUNT(DISTINCT value) FROM intmany`,
-			exp:     `{"results":[{"series":[{"name":"intmany","columns":["time","count"],"values":[["1970-01-01T00:00:00Z",5]]}]}]}`,
-		},
-		&Query{
-			name:    "count distinct as call - int",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT COUNT(DISTINCT(value)) FROM intmany`,
-			exp:     `{"results":[{"series":[{"name":"intmany","columns":["time","count"],"values":[["1970-01-01T00:00:00Z",5]]}]}]}`,
-		},
-		&Query{
-			name:    "count distinct select tag - int",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT COUNT(DISTINCT host) FROM intmany`,
-			exp:     `{"results":[{"series":[{"name":"intmany","columns":["time","count"],"values":[["1970-01-01T00:00:00Z",0]]}]}]}`,
-		},
-		&Query{
-			name:    "count distinct as call select tag - int",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT COUNT(DISTINCT host) FROM intmany`,
-			exp:     `{"results":[{"series":[{"name":"intmany","columns":["time","count"],"values":[["1970-01-01T00:00:00Z",0]]}]}]}`,
-		},
-	}...)
-
-	for i, query := range test.queries {
-		if i == 0 {
-			if err := test.init(s); err != nil {
-				t.Fatalf("test init failed: %s", err)
-			}
-		}
-		if query.skip {
-			t.Logf("SKIP:: %s", query.name)
-			continue
-		}
-		if err := query.Execute(s); err != nil {
-			t.Error(query.Error(err))
-		} else if !query.success() {
-			t.Error(query.failureMessage())
-		}
-	}
-}
-
-func TestServer_Query_Aggregates_IntMany_GroupBy(t *testing.T) {
-	t.Parallel()
-	s := OpenDefaultServer(NewConfig(), "")
-	defer s.Close()
-
-	test := NewTest("db0", "rp0")
-	test.write = strings.Join([]string{
-		fmt.Sprintf(`intmany,host=server01 value=2.0 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:00Z").UnixNano()),
-		fmt.Sprintf(`intmany,host=server02 value=4.0 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:10Z").UnixNano()),
-		fmt.Sprintf(`intmany,host=server03 value=4.0 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:20Z").UnixNano()),
-		fmt.Sprintf(`intmany,host=server04 value=4.0 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:30Z").UnixNano()),
-		fmt.Sprintf(`intmany,host=server05 value=5.0 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:40Z").UnixNano()),
-		fmt.Sprintf(`intmany,host=server06 value=5.0 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:50Z").UnixNano()),
-		fmt.Sprintf(`intmany,host=server07 value=7.0 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:01:00Z").UnixNano()),
-		fmt.Sprintf(`intmany,host=server08 value=9.0 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:01:10Z").UnixNano()),
-	}, "\n")
-
-	test.addQueries([]*Query{
-		&Query{
-			name:    "max order by time with time specified group by 10s",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT time, max(value) FROM intmany where time >= '2000-01-01T00:00:00Z' AND time <= '2000-01-01T00:01:14Z' group by time(10s)`,
-			exp:     `{"results":[{"series":[{"name":"intmany","columns":["time","max"],"values":[["2000-01-01T00:00:00Z",2],["2000-01-01T00:00:10Z",4],["2000-01-01T00:00:20Z",4],["2000-01-01T00:00:30Z",4],["2000-01-01T00:00:40Z",5],["2000-01-01T00:00:50Z",5],["2000-01-01T00:01:00Z",7],["2000-01-01T00:01:10Z",9]]}]}]}`,
-		},
-		&Query{
-			name:    "max order by time without time specified group by 30s",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT max(value) FROM intmany where time >= '2000-01-01T00:00:00Z' AND time <= '2000-01-01T00:01:14Z' group by time(30s)`,
-			exp:     `{"results":[{"series":[{"name":"intmany","columns":["time","max"],"values":[["2000-01-01T00:00:00Z",4],["2000-01-01T00:00:30Z",5],["2000-01-01T00:01:00Z",9]]}]}]}`,
-		},
-		&Query{
-			name:    "max order by time with time specified group by 30s",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT time, max(value) FROM intmany where time >= '2000-01-01T00:00:00Z' AND time <= '2000-01-01T00:01:14Z' group by time(30s)`,
-			exp:     `{"results":[{"series":[{"name":"intmany","columns":["time","max"],"values":[["2000-01-01T00:00:10Z",4],["2000-01-01T00:00:40Z",5],["2000-01-01T00:01:10Z",9]]}]}]}`,
-		},
-		&Query{
-			name:    "min order by time without time specified group by 15s",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT min(value) FROM intmany where time >= '2000-01-01T00:00:00Z' AND time <= '2000-01-01T00:01:14Z' group by time(15s)`,
-			exp:     `{"results":[{"series":[{"name":"intmany","columns":["time","min"],"values":[["2000-01-01T00:00:00Z",2],["2000-01-01T00:00:15Z",4],["2000-01-01T00:00:30Z",4],["2000-01-01T00:00:45Z",5],["2000-01-01T00:01:00Z",7]]}]}]}`,
-		},
-		&Query{
-			name:    "min order by time with time specified group by 15s",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT time, min(value) FROM intmany where time >= '2000-01-01T00:00:00Z' AND time <= '2000-01-01T00:01:14Z' group by time(15s)`,
-			exp:     `{"results":[{"series":[{"name":"intmany","columns":["time","min"],"values":[["2000-01-01T00:00:00Z",2],["2000-01-01T00:00:20Z",4],["2000-01-01T00:00:30Z",4],["2000-01-01T00:00:50Z",5],["2000-01-01T00:01:00Z",7]]}]}]}`,
-		},
-		&Query{
-			name:    "first order by time without time specified group by 15s",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT first(value) FROM intmany where time >= '2000-01-01T00:00:00Z' AND time <= '2000-01-01T00:01:14Z' group by time(15s)`,
-			exp:     `{"results":[{"series":[{"name":"intmany","columns":["time","first"],"values":[["2000-01-01T00:00:00Z",2],["2000-01-01T00:00:15Z",4],["2000-01-01T00:00:30Z",4],["2000-01-01T00:00:45Z",5],["2000-01-01T00:01:00Z",7]]}]}]}`,
-		},
-		&Query{
-			name:    "first order by time with time specified group by 15s",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT time, first(value) FROM intmany where time >= '2000-01-01T00:00:00Z' AND time <= '2000-01-01T00:01:14Z' group by time(15s)`,
-			exp:     `{"results":[{"series":[{"name":"intmany","columns":["time","first"],"values":[["2000-01-01T00:00:00Z",2],["2000-01-01T00:00:20Z",4],["2000-01-01T00:00:30Z",4],["2000-01-01T00:00:50Z",5],["2000-01-01T00:01:00Z",7]]}]}]}`,
-		},
-		&Query{
-			name:    "last order by time without time specified group by 15s",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT last(value) FROM intmany where time >= '2000-01-01T00:00:00Z' AND time <= '2000-01-01T00:01:14Z' group by time(15s)`,
-			exp:     `{"results":[{"series":[{"name":"intmany","columns":["time","last"],"values":[["2000-01-01T00:00:00Z",4],["2000-01-01T00:00:15Z",4],["2000-01-01T00:00:30Z",5],["2000-01-01T00:00:45Z",5],["2000-01-01T00:01:00Z",9]]}]}]}`,
-		},
-		&Query{
-			name:    "last order by time with time specified group by 15s",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT time, last(value) FROM intmany where time >= '2000-01-01T00:00:00Z' AND time <= '2000-01-01T00:01:14Z' group by time(15s)`,
-			exp:     `{"results":[{"series":[{"name":"intmany","columns":["time","last"],"values":[["2000-01-01T00:00:10Z",4],["2000-01-01T00:00:20Z",4],["2000-01-01T00:00:40Z",5],["2000-01-01T00:00:50Z",5],["2000-01-01T00:01:10Z",9]]}]}]}`,
-		},
-	}...)
-
-	for i, query := range test.queries {
-		if i == 0 {
-			if err := test.init(s); err != nil {
-				t.Fatalf("test init failed: %s", err)
-			}
-		}
-		if query.skip {
-			t.Logf("SKIP:: %s", query.name)
-			continue
-		}
-		if err := query.Execute(s); err != nil {
-			t.Error(query.Error(err))
-		} else if !query.success() {
-			t.Error(query.failureMessage())
-		}
-	}
-}
-
-func TestServer_Query_Aggregates_IntMany_OrderByDesc(t *testing.T) {
-	t.Parallel()
-	s := OpenDefaultServer(NewConfig(), "")
-	defer s.Close()
-
-	test := NewTest("db0", "rp0")
-	test.write = strings.Join([]string{
-		fmt.Sprintf(`intmany,host=server01 value=2.0 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:00Z").UnixNano()),
-		fmt.Sprintf(`intmany,host=server02 value=4.0 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:10Z").UnixNano()),
-		fmt.Sprintf(`intmany,host=server03 value=4.0 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:20Z").UnixNano()),
-		fmt.Sprintf(`intmany,host=server04 value=4.0 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:30Z").UnixNano()),
-		fmt.Sprintf(`intmany,host=server05 value=5.0 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:40Z").UnixNano()),
-		fmt.Sprintf(`intmany,host=server06 value=5.0 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:50Z").UnixNano()),
-		fmt.Sprintf(`intmany,host=server07 value=7.0 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:01:00Z").UnixNano()),
-		fmt.Sprintf(`intmany,host=server08 value=9.0 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:01:10Z").UnixNano()),
-	}, "\n")
-
-	test.addQueries([]*Query{
-		&Query{
-			name:    "aggregate order by time desc",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT max(value) FROM intmany where time >= '2000-01-01T00:00:00Z' AND time <= '2000-01-01T00:01:00Z' group by time(10s) order by time desc`,
-			exp:     `{"results":[{"series":[{"name":"intmany","columns":["time","max"],"values":[["2000-01-01T00:01:00Z",7],["2000-01-01T00:00:50Z",5],["2000-01-01T00:00:40Z",5],["2000-01-01T00:00:30Z",4],["2000-01-01T00:00:20Z",4],["2000-01-01T00:00:10Z",4],["2000-01-01T00:00:00Z",2]]}]}]}`,
-		},
-	}...)
-
-	for i, query := range test.queries {
-		if i == 0 {
-			if err := test.init(s); err != nil {
-				t.Fatalf("test init failed: %s", err)
-			}
-		}
-		if query.skip {
-			t.Logf("SKIP:: %s", query.name)
-			continue
-		}
-		if err := query.Execute(s); err != nil {
-			t.Error(query.Error(err))
-		} else if !query.success() {
-			t.Error(query.failureMessage())
-		}
-	}
-}
-
-func TestServer_Query_Aggregates_IntOverlap(t *testing.T) {
-	t.Parallel()
-	s := OpenDefaultServer(NewConfig(), "")
-	defer s.Close()
-
-	test := NewTest("db0", "rp0")
-	test.write = strings.Join([]string{
-		fmt.Sprintf(`intoverlap,region=us-east value=20 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:00Z").UnixNano()),
-		fmt.Sprintf(`intoverlap,region=us-east value=30 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:10Z").UnixNano()),
-		fmt.Sprintf(`intoverlap,region=us-west value=100 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:00Z").UnixNano()),
-		fmt.Sprintf(`intoverlap,region=us-east otherVal=20 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:03Z").UnixNano()),
-	}, "\n")
-
-	test.addQueries([]*Query{
-		&Query{
-			name:    "aggregation with no interval - int",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT count(value) FROM intoverlap WHERE time = '2000-01-01 00:00:00'`,
-			exp:     `{"results":[{"series":[{"name":"intoverlap","columns":["time","count"],"values":[["2000-01-01T00:00:00Z",2]]}]}]}`,
-		},
-		&Query{
-			name:    "sum - int",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT SUM(value) FROM intoverlap WHERE time >= '2000-01-01 00:00:05' AND time <= '2000-01-01T00:00:10Z' GROUP BY time(10s), region`,
-			exp:     `{"results":[{"series":[{"name":"intoverlap","tags":{"region":"us-east"},"columns":["time","sum"],"values":[["2000-01-01T00:00:00Z",null],["2000-01-01T00:00:10Z",30]]}]}]}`,
-		},
-		&Query{
-			name:    "aggregation with a null field value - int",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT SUM(value) FROM intoverlap GROUP BY region`,
-			exp:     `{"results":[{"series":[{"name":"intoverlap","tags":{"region":"us-east"},"columns":["time","sum"],"values":[["1970-01-01T00:00:00Z",50]]},{"name":"intoverlap","tags":{"region":"us-west"},"columns":["time","sum"],"values":[["1970-01-01T00:00:00Z",100]]}]}]}`,
-		},
-		&Query{
-			name:    "multiple aggregations - int",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT SUM(value), MEAN(value) FROM intoverlap GROUP BY region`,
-			exp:     `{"results":[{"series":[{"name":"intoverlap","tags":{"region":"us-east"},"columns":["time","sum","mean"],"values":[["1970-01-01T00:00:00Z",50,25]]},{"name":"intoverlap","tags":{"region":"us-west"},"columns":["time","sum","mean"],"values":[["1970-01-01T00:00:00Z",100,100]]}]}]}`,
-		},
-		&Query{
-			skip:    true,
-			name:    "multiple aggregations with division - int FIXME issue #2879",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT sum(value), mean(value), sum(value) / mean(value) as div FROM intoverlap GROUP BY region`,
-			exp:     `{"results":[{"series":[{"name":"intoverlap","tags":{"region":"us-east"},"columns":["time","sum","mean","div"],"values":[["1970-01-01T00:00:00Z",50,25,2]]},{"name":"intoverlap","tags":{"region":"us-west"},"columns":["time","div"],"values":[["1970-01-01T00:00:00Z",100,100,1]]}]}]}`,
-		},
-	}...)
-
-	for i, query := range test.queries {
-		if i == 0 {
-			if err := test.init(s); err != nil {
-				t.Fatalf("test init failed: %s", err)
-			}
-		}
-		if query.skip {
-			t.Logf("SKIP:: %s", query.name)
-			continue
-		}
-		if err := query.Execute(s); err != nil {
-			t.Error(query.Error(err))
-		} else if !query.success() {
-			t.Error(query.failureMessage())
-		}
-	}
-}
-
-func TestServer_Query_Aggregates_FloatSingle(t *testing.T) {
-	t.Parallel()
-	s := OpenDefaultServer(NewConfig(), "")
-	defer s.Close()
-
-	test := NewTest("db0", "rp0")
-	test.write = strings.Join([]string{
-		fmt.Sprintf(`floatsingle value=45.0 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:00Z").UnixNano()),
-	}, "\n")
-
-	test.addQueries([]*Query{
-		&Query{
-			name:    "stddev with just one point - float",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT STDDEV(value) FROM floatsingle`,
-			exp:     `{"results":[{"series":[{"name":"floatsingle","columns":["time","stddev"],"values":[["1970-01-01T00:00:00Z",null]]}]}]}`,
-		},
-	}...)
-
-	for i, query := range test.queries {
-		if i == 0 {
-			if err := test.init(s); err != nil {
-				t.Fatalf("test init failed: %s", err)
-			}
-		}
-		if query.skip {
-			t.Logf("SKIP:: %s", query.name)
-			continue
-		}
-		if err := query.Execute(s); err != nil {
-			t.Error(query.Error(err))
-		} else if !query.success() {
-			t.Error(query.failureMessage())
-		}
-	}
-}
-
-func TestServer_Query_Aggregates_FloatMany(t *testing.T) {
-	t.Parallel()
-	s := OpenDefaultServer(NewConfig(), "")
-	defer s.Close()
-
-	test := NewTest("db0", "rp0")
-	test.write = strings.Join([]string{
-		fmt.Sprintf(`floatmany,host=server01 value=2.0 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:00Z").UnixNano()),
-		fmt.Sprintf(`floatmany,host=server02 value=4.0 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:10Z").UnixNano()),
-		fmt.Sprintf(`floatmany,host=server03 value=4.0 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:20Z").UnixNano()),
-		fmt.Sprintf(`floatmany,host=server04 value=4.0 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:30Z").UnixNano()),
-		fmt.Sprintf(`floatmany,host=server05 value=5.0 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:40Z").UnixNano()),
-		fmt.Sprintf(`floatmany,host=server06 value=5.0 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:50Z").UnixNano()),
-		fmt.Sprintf(`floatmany,host=server07 value=7.0 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:01:00Z").UnixNano()),
-		fmt.Sprintf(`floatmany,host=server08 value=9.0 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:01:10Z").UnixNano()),
-	}, "\n")
-
-	test.addQueries([]*Query{
-		&Query{
-			name:    "mean and stddev - float",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT MEAN(value), STDDEV(value) FROM floatmany WHERE time >= '2000-01-01' AND time < '2000-01-01T00:02:00Z' GROUP BY time(10m)`,
-			exp:     `{"results":[{"series":[{"name":"floatmany","columns":["time","mean","stddev"],"values":[["2000-01-01T00:00:00Z",5,2.138089935299395]]}]}]}`,
-		},
-		&Query{
-			name:    "first - float",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT FIRST(value) FROM floatmany`,
-			exp:     `{"results":[{"series":[{"name":"floatmany","columns":["time","first"],"values":[["2000-01-01T00:00:00Z",2]]}]}]}`,
-		},
-		&Query{
-			name:    "last - float",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT LAST(value) FROM floatmany`,
-			exp:     `{"results":[{"series":[{"name":"floatmany","columns":["time","last"],"values":[["2000-01-01T00:01:10Z",9]]}]}]}`,
-		},
-		&Query{
-			name:    "spread - float",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT SPREAD(value) FROM floatmany`,
-			exp:     `{"results":[{"series":[{"name":"floatmany","columns":["time","spread"],"values":[["1970-01-01T00:00:00Z",7]]}]}]}`,
-		},
-		&Query{
-			name:    "median - even count - float",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT MEDIAN(value) FROM floatmany`,
-			exp:     `{"results":[{"series":[{"name":"floatmany","columns":["time","median"],"values":[["1970-01-01T00:00:00Z",4.5]]}]}]}`,
-		},
-		&Query{
-			name:    "median - odd count - float",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT MEDIAN(value) FROM floatmany where time < '2000-01-01T00:01:10Z'`,
-			exp:     `{"results":[{"series":[{"name":"floatmany","columns":["time","median"],"values":[["1970-01-01T00:00:00Z",4]]}]}]}`,
-		},
-		&Query{
-			name:    "distinct as call - float",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT DISTINCT(value) FROM floatmany`,
-			exp:     `{"results":[{"series":[{"name":"floatmany","columns":["time","distinct"],"values":[["1970-01-01T00:00:00Z",[2,4,5,7,9]]]}]}]}`,
-		},
-		&Query{
-			name:    "distinct alt syntax - float",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT DISTINCT value FROM floatmany`,
-			exp:     `{"results":[{"series":[{"name":"floatmany","columns":["time","distinct"],"values":[["1970-01-01T00:00:00Z",[2,4,5,7,9]]]}]}]}`,
-		},
-		&Query{
-			name:    "distinct select tag - float",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT DISTINCT(host) FROM floatmany`,
-			exp:     `{"results":[{"error":"statement must have at least one field in select clause"}]}`,
-		},
-		&Query{
-			name:    "distinct alt select tag - float",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT DISTINCT host FROM floatmany`,
-			exp:     `{"results":[{"error":"statement must have at least one field in select clause"}]}`,
-		},
-		&Query{
-			name:    "count distinct - float",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT COUNT(DISTINCT value) FROM floatmany`,
-			exp:     `{"results":[{"series":[{"name":"floatmany","columns":["time","count"],"values":[["1970-01-01T00:00:00Z",5]]}]}]}`,
-		},
-		&Query{
-			name:    "count distinct as call - float",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT COUNT(DISTINCT(value)) FROM floatmany`,
-			exp:     `{"results":[{"series":[{"name":"floatmany","columns":["time","count"],"values":[["1970-01-01T00:00:00Z",5]]}]}]}`,
-		},
-		&Query{
-			name:    "count distinct select tag - float",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT COUNT(DISTINCT host) FROM floatmany`,
-			exp:     `{"results":[{"series":[{"name":"floatmany","columns":["time","count"],"values":[["1970-01-01T00:00:00Z",0]]}]}]}`,
-		},
-		&Query{
-			name:    "count distinct as call select tag - float",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT COUNT(DISTINCT host) FROM floatmany`,
-			exp:     `{"results":[{"series":[{"name":"floatmany","columns":["time","count"],"values":[["1970-01-01T00:00:00Z",0]]}]}]}`,
-		},
-	}...)
-
-	for i, query := range test.queries {
-		if i == 0 {
-			if err := test.init(s); err != nil {
-				t.Fatalf("test init failed: %s", err)
-			}
-		}
-		if query.skip {
-			t.Logf("SKIP:: %s", query.name)
-			continue
-		}
-		if err := query.Execute(s); err != nil {
-			t.Error(query.Error(err))
-		} else if !query.success() {
-			t.Error(query.failureMessage())
-		}
-	}
-}
-
-func TestServer_Query_Aggregates_FloatOverlap(t *testing.T) {
-	t.Parallel()
-	s := OpenDefaultServer(NewConfig(), "")
-	defer s.Close()
-
-	test := NewTest("db0", "rp0")
-	test.write = strings.Join([]string{
-		fmt.Sprintf(`floatoverlap,region=us-east value=20.0 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:00Z").UnixNano()),
-		fmt.Sprintf(`floatoverlap,region=us-east value=30.0 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:10Z").UnixNano()),
-		fmt.Sprintf(`floatoverlap,region=us-west value=100.0 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:00Z").UnixNano()),
-		fmt.Sprintf(`floatoverlap,region=us-east otherVal=20.0 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:03Z").UnixNano()),
-	}, "\n")
-
-	test.addQueries([]*Query{
-		&Query{
-			name:    "aggregation with no interval - float",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT count(value) FROM floatoverlap WHERE time = '2000-01-01 00:00:00'`,
-			exp:     `{"results":[{"series":[{"name":"floatoverlap","columns":["time","count"],"values":[["2000-01-01T00:00:00Z",2]]}]}]}`,
-		},
-		&Query{
-			name:    "sum - float",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT SUM(value) FROM floatoverlap WHERE time >= '2000-01-01 00:00:05' AND time <= '2000-01-01T00:00:10Z' GROUP BY time(10s), region`,
-			exp:     `{"results":[{"series":[{"name":"floatoverlap","tags":{"region":"us-east"},"columns":["time","sum"],"values":[["2000-01-01T00:00:00Z",null],["2000-01-01T00:00:10Z",30]]}]}]}`,
-		},
-		&Query{
-			name:    "aggregation with a null field value - float",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT SUM(value) FROM floatoverlap GROUP BY region`,
-			exp:     `{"results":[{"series":[{"name":"floatoverlap","tags":{"region":"us-east"},"columns":["time","sum"],"values":[["1970-01-01T00:00:00Z",50]]},{"name":"floatoverlap","tags":{"region":"us-west"},"columns":["time","sum"],"values":[["1970-01-01T00:00:00Z",100]]}]}]}`,
-		},
-		&Query{
-			name:    "multiple aggregations - float",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT SUM(value), MEAN(value) FROM floatoverlap GROUP BY region`,
-			exp:     `{"results":[{"series":[{"name":"floatoverlap","tags":{"region":"us-east"},"columns":["time","sum","mean"],"values":[["1970-01-01T00:00:00Z",50,25]]},{"name":"floatoverlap","tags":{"region":"us-west"},"columns":["time","sum","mean"],"values":[["1970-01-01T00:00:00Z",100,100]]}]}]}`,
-		},
-		&Query{
-			name:    "multiple aggregations with division - float",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT sum(value) / mean(value) as div FROM floatoverlap GROUP BY region`,
-			exp:     `{"results":[{"series":[{"name":"floatoverlap","tags":{"region":"us-east"},"columns":["time","div"],"values":[["1970-01-01T00:00:00Z",2]]},{"name":"floatoverlap","tags":{"region":"us-west"},"columns":["time","div"],"values":[["1970-01-01T00:00:00Z",1]]}]}]}`,
-		},
-	}...)
-
-	for i, query := range test.queries {
-		if i == 0 {
-			if err := test.init(s); err != nil {
-				t.Fatalf("test init failed: %s", err)
-			}
-		}
-		if query.skip {
-			t.Logf("SKIP:: %s", query.name)
-			continue
-		}
-		if err := query.Execute(s); err != nil {
-			t.Error(query.Error(err))
-		} else if !query.success() {
-			t.Error(query.failureMessage())
-		}
-	}
-}
-
-func TestServer_Query_Aggregates_Load(t *testing.T) {
-	t.Parallel()
-	s := OpenDefaultServer(NewConfig(), "")
-	defer s.Close()
-
-	test := NewTest("db0", "rp0")
-	test.write = strings.Join([]string{
-		fmt.Sprintf(`load,region=us-east,host=serverA value=20.0 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:00Z").UnixNano()),
-		fmt.Sprintf(`load,region=us-east,host=serverB value=30.0 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:10Z").UnixNano()),
-		fmt.Sprintf(`load,region=us-west,host=serverC value=100.0 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:00Z").UnixNano()),
-	}, "\n")
-
-	test.addQueries([]*Query{
-		&Query{
-			name:    "group by multiple dimensions",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT sum(value) FROM load GROUP BY region, host`,
-			exp:     `{"results":[{"series":[{"name":"load","tags":{"host":"serverA","region":"us-east"},"columns":["time","sum"],"values":[["1970-01-01T00:00:00Z",20]]},{"name":"load","tags":{"host":"serverB","region":"us-east"},"columns":["time","sum"],"values":[["1970-01-01T00:00:00Z",30]]},{"name":"load","tags":{"host":"serverC","region":"us-west"},"columns":["time","sum"],"values":[["1970-01-01T00:00:00Z",100]]}]}]}`,
-		},
-		&Query{
-			name:    "group by multiple dimensions",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT sum(value)*2 FROM load`,
-			exp:     `{"results":[{"series":[{"name":"load","columns":["time",""],"values":[["1970-01-01T00:00:00Z",300]]}]}]}`,
-		},
-		&Query{
-			name:    "group by multiple dimensions",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT sum(value)/2 FROM load`,
-			exp:     `{"results":[{"series":[{"name":"load","columns":["time",""],"values":[["1970-01-01T00:00:00Z",75]]}]}]}`,
-		},
-	}...)
-
-	for i, query := range test.queries {
-		if i == 0 {
-			if err := test.init(s); err != nil {
-				t.Fatalf("test init failed: %s", err)
-			}
-		}
-		if query.skip {
-			t.Logf("SKIP:: %s", query.name)
-			continue
-		}
-		if err := query.Execute(s); err != nil {
-			t.Error(query.Error(err))
-		} else if !query.success() {
-			t.Error(query.failureMessage())
-		}
-	}
-}
-
-func TestServer_Query_Aggregates_CPU(t *testing.T) {
-	t.Parallel()
-	s := OpenDefaultServer(NewConfig(), "")
-	defer s.Close()
-
-	test := NewTest("db0", "rp0")
-	test.write = strings.Join([]string{
-		fmt.Sprintf(`cpu,region=uk,host=serverZ,service=redis value=20.0 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:03Z").UnixNano()),
-		fmt.Sprintf(`cpu,region=uk,host=serverZ,service=mysql value=30.0 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:03Z").UnixNano()),
-	}, "\n")
-
-	test.addQueries([]*Query{
-		&Query{
-			name:    "aggregation with WHERE and AND",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT sum(value) FROM cpu WHERE region='uk' AND host='serverZ'`,
-			exp:     `{"results":[{"series":[{"name":"cpu","columns":["time","sum"],"values":[["1970-01-01T00:00:00Z",50]]}]}]}`,
-		},
-	}...)
-
-	for i, query := range test.queries {
-		if i == 0 {
-			if err := test.init(s); err != nil {
-				t.Fatalf("test init failed: %s", err)
-			}
-		}
-		if query.skip {
-			t.Logf("SKIP:: %s", query.name)
-			continue
-		}
-		if err := query.Execute(s); err != nil {
-			t.Error(query.Error(err))
-		} else if !query.success() {
-			t.Error(query.failureMessage())
-		}
-	}
-}
-
-func TestServer_Query_Aggregates_String(t *testing.T) {
-	t.Parallel()
-	s := OpenDefaultServer(NewConfig(), "")
-	defer s.Close()
-
-	test := NewTest("db0", "rp0")
-	test.write = strings.Join([]string{
-		fmt.Sprintf(`stringdata value="first" %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:03Z").UnixNano()),
-		fmt.Sprintf(`stringdata value="last" %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:04Z").UnixNano()),
-	}, "\n")
-
-	test.addQueries([]*Query{
-		// strings
-		&Query{
-			name:    "STDDEV on string data - string",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT STDDEV(value) FROM stringdata`,
-			exp:     `{"results":[{"series":[{"name":"stringdata","columns":["time","stddev"],"values":[["1970-01-01T00:00:00Z",null]]}]}]}`,
-		},
-		&Query{
-			name:    "MEAN on string data - string",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT MEAN(value) FROM stringdata`,
-			exp:     `{"results":[{"series":[{"name":"stringdata","columns":["time","mean"],"values":[["1970-01-01T00:00:00Z",0]]}]}]}`,
-		},
-		&Query{
-			name:    "MEDIAN on string data - string",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT MEDIAN(value) FROM stringdata`,
-			exp:     `{"results":[{"series":[{"name":"stringdata","columns":["time","median"],"values":[["1970-01-01T00:00:00Z",null]]}]}]}`,
-		},
-		&Query{
-			name:    "COUNT on string data - string",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT COUNT(value) FROM stringdata`,
-			exp:     `{"results":[{"series":[{"name":"stringdata","columns":["time","count"],"values":[["1970-01-01T00:00:00Z",2]]}]}]}`,
-		},
-		&Query{
-			name:    "FIRST on string data - string",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT FIRST(value) FROM stringdata`,
-			exp:     `{"results":[{"series":[{"name":"stringdata","columns":["time","first"],"values":[["2000-01-01T00:00:03Z","first"]]}]}]}`,
-		},
-		&Query{
-			name:    "LAST on string data - string",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT LAST(value) FROM stringdata`,
-			exp:     `{"results":[{"series":[{"name":"stringdata","columns":["time","last"],"values":[["2000-01-01T00:00:04Z","last"]]}]}]}`,
-		},
-	}...)
-
-	for i, query := range test.queries {
-		if i == 0 {
-			if err := test.init(s); err != nil {
-				t.Fatalf("test init failed: %s", err)
-			}
-		}
-		if query.skip {
-			t.Logf("SKIP:: %s", query.name)
-			continue
-		}
-		if err := query.Execute(s); err != nil {
-			t.Error(query.Error(err))
-		} else if !query.success() {
-			t.Error(query.failureMessage())
-		}
-	}
-}
-
-func TestServer_Query_AggregateSelectors(t *testing.T) {
-	t.Parallel()
-	s := OpenServer(NewConfig(), "")
-	defer s.Close()
-
-	if err := s.CreateDatabaseAndRetentionPolicy("db0", newRetentionPolicyInfo("rp0", 1, 0)); err != nil {
-		t.Fatal(err)
-	}
-	if err := s.MetaStore.SetDefaultRetentionPolicy("db0", "rp0"); err != nil {
-		t.Fatal(err)
-	}
-
-	writes := []string{
-		fmt.Sprintf(`network,host=server01,region=west,core=1 rx=10i,tx=20i,core=2i %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:00Z").UnixNano()),
-		fmt.Sprintf(`network,host=server02,region=west,core=2 rx=40i,tx=50i,core=3i %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:10Z").UnixNano()),
-		fmt.Sprintf(`network,host=server03,region=east,core=3 rx=40i,tx=55i,core=4i %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:20Z").UnixNano()),
-		fmt.Sprintf(`network,host=server04,region=east,core=4 rx=40i,tx=60i,core=1i %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:30Z").UnixNano()),
-		fmt.Sprintf(`network,host=server05,region=west,core=1 rx=50i,tx=70i,core=2i %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:40Z").UnixNano()),
-		fmt.Sprintf(`network,host=server06,region=east,core=2 rx=50i,tx=40i,core=3i %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:50Z").UnixNano()),
-		fmt.Sprintf(`network,host=server07,region=west,core=3 rx=70i,tx=30i,core=4i %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:01:00Z").UnixNano()),
-		fmt.Sprintf(`network,host=server08,region=east,core=4 rx=90i,tx=10i,core=1i %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:01:10Z").UnixNano()),
-		fmt.Sprintf(`network,host=server09,region=east,core=1 rx=5i,tx=4i,core=2i %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:01:20Z").UnixNano()),
-	}
-
-	test := NewTest("db0", "rp0")
-	test.write = strings.Join(writes, "\n")
-
-	test.addQueries([]*Query{
-		&Query{
-			name:    "baseline",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT * FROM network`,
-			exp:     `{"results":[{"series":[{"name":"network","columns":["time","core","host","region","rx","tx"],"values":[["2000-01-01T00:00:00Z",2,"server01","west",10,20],["2000-01-01T00:00:10Z",3,"server02","west",40,50],["2000-01-01T00:00:20Z",4,"server03","east",40,55],["2000-01-01T00:00:30Z",1,"server04","east",40,60],["2000-01-01T00:00:40Z",2,"server05","west",50,70],["2000-01-01T00:00:50Z",3,"server06","east",50,40],["2000-01-01T00:01:00Z",4,"server07","west",70,30],["2000-01-01T00:01:10Z",1,"server08","east",90,10],["2000-01-01T00:01:20Z",2,"server09","east",5,4]]}]}]}`,
-		},
-		&Query{
-			name:    "max - baseline 30s",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT max(rx) FROM network where time >= '2000-01-01T00:00:00Z' AND time <= '2000-01-01T00:01:29Z' group by time(30s)`,
-			exp:     `{"results":[{"series":[{"name":"network","columns":["time","max"],"values":[["2000-01-01T00:00:00Z",40],["2000-01-01T00:00:30Z",50],["2000-01-01T00:01:00Z",90]]}]}]}`,
-		},
-		&Query{
-			name:    "max - baseline 30s - epoch ms",
-			params:  url.Values{"db": []string{"db0"}, "epoch": []string{"ms"}},
-			command: `SELECT max(rx) FROM network where time >= '2000-01-01T00:00:00Z' AND time <= '2000-01-01T00:01:29Z' group by time(30s)`,
-			exp: fmt.Sprintf(
-				`{"results":[{"series":[{"name":"network","columns":["time","max"],"values":[[%d,40],[%d,50],[%d,90]]}]}]}`,
-				mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:00Z").UnixNano()/int64(time.Millisecond),
-				mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:30Z").UnixNano()/int64(time.Millisecond),
-				mustParseTime(time.RFC3339Nano, "2000-01-01T00:01:00Z").UnixNano()/int64(time.Millisecond),
-			),
-		},
-		&Query{
-			name:    "max - tx",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT tx, max(rx) FROM network where time >= '2000-01-01T00:00:00Z' AND time <= '2000-01-01T00:01:29Z' group by time(30s)`,
-			exp:     `{"results":[{"series":[{"name":"network","columns":["time","tx","max"],"values":[["2000-01-01T00:00:00Z",50,40],["2000-01-01T00:00:30Z",70,50],["2000-01-01T00:01:00Z",10,90]]}]}]}`,
-		},
-		&Query{
-			name:    "max - time",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT time, max(rx) FROM network where time >= '2000-01-01T00:00:00Z' AND time <= '2000-01-01T00:01:29Z' group by time(30s)`,
-			exp:     `{"results":[{"series":[{"name":"network","columns":["time","max"],"values":[["2000-01-01T00:00:10Z",40],["2000-01-01T00:00:40Z",50],["2000-01-01T00:01:10Z",90]]}]}]}`,
-		},
-		&Query{
-			name:    "max - time and tx",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT time, tx, max(rx) FROM network where time >= '2000-01-01T00:00:00Z' AND time <= '2000-01-01T00:01:29Z' group by time(30s)`,
-			exp:     `{"results":[{"series":[{"name":"network","columns":["time","tx","max"],"values":[["2000-01-01T00:00:10Z",50,40],["2000-01-01T00:00:40Z",70,50],["2000-01-01T00:01:10Z",10,90]]}]}]}`,
-		},
-		&Query{
-			name:    "min - baseline 30s",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT min(rx) FROM network where time >= '2000-01-01T00:00:00Z' AND time <= '2000-01-01T00:01:29Z' group by time(30s)`,
-			exp:     `{"results":[{"series":[{"name":"network","columns":["time","min"],"values":[["2000-01-01T00:00:00Z",10],["2000-01-01T00:00:30Z",40],["2000-01-01T00:01:00Z",5]]}]}]}`,
-		},
-		&Query{
-			name:    "min - tx",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT tx, min(rx) FROM network where time >= '2000-01-01T00:00:00Z' AND time <= '2000-01-01T00:01:29Z' group by time(30s)`,
-			exp:     `{"results":[{"series":[{"name":"network","columns":["time","tx","min"],"values":[["2000-01-01T00:00:00Z",20,10],["2000-01-01T00:00:30Z",60,40],["2000-01-01T00:01:00Z",4,5]]}]}]}`,
-		},
-		&Query{
-			name:    "min - time",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT time, min(rx) FROM network where time >= '2000-01-01T00:00:00Z' AND time <= '2000-01-01T00:01:29Z' group by time(30s)`,
-			exp:     `{"results":[{"series":[{"name":"network","columns":["time","min"],"values":[["2000-01-01T00:00:00Z",10],["2000-01-01T00:00:30Z",40],["2000-01-01T00:01:20Z",5]]}]}]}`,
-		},
-		&Query{
-			name:    "min - time and tx",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT time, tx, min(rx) FROM network where time >= '2000-01-01T00:00:00Z' AND time <= '2000-01-01T00:01:29Z' group by time(30s)`,
-			exp:     `{"results":[{"series":[{"name":"network","columns":["time","tx","min"],"values":[["2000-01-01T00:00:00Z",20,10],["2000-01-01T00:00:30Z",60,40],["2000-01-01T00:01:20Z",4,5]]}]}]}`,
-		},
-		&Query{
-			name:    "max,min - baseline 30s",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT max(rx), min(rx) FROM network where time >= '2000-01-01T00:00:00Z' AND time <= '2000-01-01T00:01:29Z' group by time(30s)`,
-			exp:     `{"results":[{"series":[{"name":"network","columns":["time","max","min"],"values":[["2000-01-01T00:00:00Z",40,10],["2000-01-01T00:00:30Z",50,40],["2000-01-01T00:01:00Z",90,5]]}]}]}`,
-		},
-		&Query{
-			name:    "first - baseline 30s",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT first(rx) FROM network where time >= '2000-01-01T00:00:00Z' AND time <= '2000-01-01T00:01:29Z' group by time(30s)`,
-			exp:     `{"results":[{"series":[{"name":"network","columns":["time","first"],"values":[["2000-01-01T00:00:00Z",10],["2000-01-01T00:00:30Z",40],["2000-01-01T00:01:00Z",70]]}]}]}`,
-		},
-		&Query{
-			name:    "first - tx",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT time, tx, first(rx) FROM network where time >= '2000-01-01T00:00:00Z' AND time <= '2000-01-01T00:01:29Z' group by time(30s)`,
-			exp:     `{"results":[{"series":[{"name":"network","columns":["time","tx","first"],"values":[["2000-01-01T00:00:00Z",20,10],["2000-01-01T00:00:30Z",60,40],["2000-01-01T00:01:00Z",30,70]]}]}]}`,
-		},
-		&Query{
-			name:    "first - time",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT time, first(rx) FROM network where time >= '2000-01-01T00:00:00Z' AND time <= '2000-01-01T00:01:29Z' group by time(30s)`,
-			exp:     `{"results":[{"series":[{"name":"network","columns":["time","first"],"values":[["2000-01-01T00:00:00Z",10],["2000-01-01T00:00:30Z",40],["2000-01-01T00:01:00Z",70]]}]}]}`,
-		},
-		&Query{
-			name:    "first - time and tx",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT time, tx, first(rx) FROM network where time >= '2000-01-01T00:00:00Z' AND time <= '2000-01-01T00:01:29Z' group by time(30s)`,
-			exp:     `{"results":[{"series":[{"name":"network","columns":["time","tx","first"],"values":[["2000-01-01T00:00:00Z",20,10],["2000-01-01T00:00:30Z",60,40],["2000-01-01T00:01:00Z",30,70]]}]}]}`,
-		},
-		&Query{
-			name:    "last - baseline 30s",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT last(rx) FROM network where time >= '2000-01-01T00:00:00Z' AND time <= '2000-01-01T00:01:29Z' group by time(30s)`,
-			exp:     `{"results":[{"series":[{"name":"network","columns":["time","last"],"values":[["2000-01-01T00:00:00Z",40],["2000-01-01T00:00:30Z",50],["2000-01-01T00:01:00Z",5]]}]}]}`,
-		},
-		&Query{
-			name:    "last - tx",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT tx, last(rx) FROM network where time >= '2000-01-01T00:00:00Z' AND time <= '2000-01-01T00:01:29Z' group by time(30s)`,
-			exp:     `{"results":[{"series":[{"name":"network","columns":["time","tx","last"],"values":[["2000-01-01T00:00:00Z",55,40],["2000-01-01T00:00:30Z",40,50],["2000-01-01T00:01:00Z",4,5]]}]}]}`,
-		},
-		&Query{
-			name:    "last - time",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT time, last(rx) FROM network where time >= '2000-01-01T00:00:00Z' AND time <= '2000-01-01T00:01:29Z' group by time(30s)`,
-			exp:     `{"results":[{"series":[{"name":"network","columns":["time","last"],"values":[["2000-01-01T00:00:20Z",40],["2000-01-01T00:00:50Z",50],["2000-01-01T00:01:20Z",5]]}]}]}`,
-		},
-		&Query{
-			name:    "last - time and tx",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT time, tx, last(rx) FROM network where time >= '2000-01-01T00:00:00Z' AND time <= '2000-01-01T00:01:29Z' group by time(30s)`,
-			exp:     `{"results":[{"series":[{"name":"network","columns":["time","tx","last"],"values":[["2000-01-01T00:00:20Z",55,40],["2000-01-01T00:00:50Z",40,50],["2000-01-01T00:01:20Z",4,5]]}]}]}`,
-		},
-		&Query{
-			name:    "count - baseline 30s",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT count(rx) FROM network where time >= '2000-01-01T00:00:00Z' AND time <= '2000-01-01T00:01:29Z' group by time(30s)`,
-			exp:     `{"results":[{"series":[{"name":"network","columns":["time","count"],"values":[["2000-01-01T00:00:00Z",3],["2000-01-01T00:00:30Z",3],["2000-01-01T00:01:00Z",3]]}]}]}`,
-		},
-		&Query{
-			name:    "count - time",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT time, count(rx) FROM network where time >= '2000-01-01T00:00:00Z' AND time <= '2000-01-01T00:01:29Z' group by time(30s)`,
-			exp:     `{"error":"error parsing query: mixing aggregate and non-aggregate queries is not supported"}`,
-		},
-		&Query{
-			name:    "count - tx",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT tx, count(rx) FROM network where time >= '2000-01-01T00:00:00Z' AND time <= '2000-01-01T00:01:29Z' group by time(30s)`,
-			exp:     `{"error":"error parsing query: mixing aggregate and non-aggregate queries is not supported"}`,
-		},
-		&Query{
-			name:    "distinct - baseline 30s",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT distinct(rx) FROM network where time >= '2000-01-01T00:00:00Z' AND time <= '2000-01-01T00:01:29Z' group by time(30s)`,
-			exp:     `{"results":[{"series":[{"name":"network","columns":["time","distinct"],"values":[["2000-01-01T00:00:00Z",[10,40]],["2000-01-01T00:00:30Z",[40,50]],["2000-01-01T00:01:00Z",[5,70,90]]]}]}]}`,
-		},
-		&Query{
-			name:    "distinct - time",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT time, distinct(rx) FROM network where time >= '2000-01-01T00:00:00Z' AND time <= '2000-01-01T00:01:29Z' group by time(30s)`,
-			exp:     `{"error":"error parsing query: aggregate function distinct() can not be combined with other functions or fields"}`,
-		},
-		&Query{
-			name:    "distinct - tx",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT tx, distinct(rx) FROM network where time >= '2000-01-01T00:00:00Z' AND time <= '2000-01-01T00:01:29Z' group by time(30s)`,
-			exp:     `{"error":"error parsing query: aggregate function distinct() can not be combined with other functions or fields"}`,
-		},
-		&Query{
-			name:    "mean - baseline 30s",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT mean(rx) FROM network where time >= '2000-01-01T00:00:00Z' AND time <= '2000-01-01T00:01:29Z' group by time(30s)`,
-			exp:     `{"results":[{"series":[{"name":"network","columns":["time","mean"],"values":[["2000-01-01T00:00:00Z",30],["2000-01-01T00:00:30Z",46.666666666666664],["2000-01-01T00:01:00Z",55]]}]}]}`,
-		},
-		&Query{
-			name:    "mean - time",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT time, mean(rx) FROM network where time >= '2000-01-01T00:00:00Z' AND time <= '2000-01-01T00:01:29Z' group by time(30s)`,
-			exp:     `{"error":"error parsing query: mixing aggregate and non-aggregate queries is not supported"}`,
-		},
-		&Query{
-			name:    "mean - tx",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT tx, mean(rx) FROM network where time >= '2000-01-01T00:00:00Z' AND time <= '2000-01-01T00:01:29Z' group by time(30s)`,
-			exp:     `{"error":"error parsing query: mixing aggregate and non-aggregate queries is not supported"}`,
-		},
-		&Query{
-			name:    "median - baseline 30s",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT median(rx) FROM network where time >= '2000-01-01T00:00:00Z' AND time <= '2000-01-01T00:01:29Z' group by time(30s)`,
-			exp:     `{"results":[{"series":[{"name":"network","columns":["time","median"],"values":[["2000-01-01T00:00:00Z",40],["2000-01-01T00:00:30Z",50],["2000-01-01T00:01:00Z",70]]}]}]}`,
-		},
-		&Query{
-			name:    "median - time",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT time, median(rx) FROM network where time >= '2000-01-01T00:00:00Z' AND time <= '2000-01-01T00:01:29Z' group by time(30s)`,
-			exp:     `{"error":"error parsing query: mixing aggregate and non-aggregate queries is not supported"}`,
-		},
-		&Query{
-			name:    "median - tx",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT tx, median(rx) FROM network where time >= '2000-01-01T00:00:00Z' AND time <= '2000-01-01T00:01:29Z' group by time(30s)`,
-			exp:     `{"error":"error parsing query: mixing aggregate and non-aggregate queries is not supported"}`,
-		},
-		&Query{
-			name:    "spread - baseline 30s",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT spread(rx) FROM network where time >= '2000-01-01T00:00:00Z' AND time <= '2000-01-01T00:01:29Z' group by time(30s)`,
-			exp:     `{"results":[{"series":[{"name":"network","columns":["time","spread"],"values":[["2000-01-01T00:00:00Z",30],["2000-01-01T00:00:30Z",10],["2000-01-01T00:01:00Z",85]]}]}]}`,
-		},
-		&Query{
-			name:    "spread - time",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT time, spread(rx) FROM network where time >= '2000-01-01T00:00:00Z' AND time <= '2000-01-01T00:01:29Z' group by time(30s)`,
-			exp:     `{"error":"error parsing query: mixing aggregate and non-aggregate queries is not supported"}`,
-		},
-		&Query{
-			name:    "spread - tx",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT tx, spread(rx) FROM network where time >= '2000-01-01T00:00:00Z' AND time <= '2000-01-01T00:01:29Z' group by time(30s)`,
-			exp:     `{"error":"error parsing query: mixing aggregate and non-aggregate queries is not supported"}`,
-		},
-		&Query{
-			name:    "stddev - baseline 30s",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT stddev(rx) FROM network where time >= '2000-01-01T00:00:00Z' AND time <= '2000-01-01T00:01:29Z' group by time(30s)`,
-			exp:     `{"results":[{"series":[{"name":"network","columns":["time","stddev"],"values":[["2000-01-01T00:00:00Z",17.320508075688775],["2000-01-01T00:00:30Z",5.773502691896258],["2000-01-01T00:01:00Z",44.44097208657794]]}]}]}`,
-		},
-		&Query{
-			name:    "stddev - time",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT time, stddev(rx) FROM network where time >= '2000-01-01T00:00:00Z' AND time <= '2000-01-01T00:01:29Z' group by time(30s)`,
-			exp:     `{"error":"error parsing query: mixing aggregate and non-aggregate queries is not supported"}`,
-		},
-		&Query{
-			name:    "stddev - tx",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT tx, stddev(rx) FROM network where time >= '2000-01-01T00:00:00Z' AND time <= '2000-01-01T00:01:29Z' group by time(30s)`,
-			exp:     `{"error":"error parsing query: mixing aggregate and non-aggregate queries is not supported"}`,
-		},
-		&Query{
-			name:    "percentile - baseline 30s",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT percentile(rx, 75) FROM network where time >= '2000-01-01T00:00:00Z' AND time <= '2000-01-01T00:01:29Z' group by time(30s)`,
-			exp:     `{"results":[{"series":[{"name":"network","columns":["time","percentile"],"values":[["2000-01-01T00:00:00Z",40],["2000-01-01T00:00:30Z",50],["2000-01-01T00:01:00Z",70]]}]}]}`,
-		},
-		&Query{
-			name:    "percentile - time",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT time, percentile(rx, 75) FROM network where time >= '2000-01-01T00:00:00Z' AND time <= '2000-01-01T00:01:29Z' group by time(30s)`,
-			exp:     `{"error":"error parsing query: mixing aggregate and non-aggregate queries is not supported"}`,
-		},
-		&Query{
-			name:    "percentile - tx",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT tx, percentile(rx, 75) FROM network where time >= '2000-01-01T00:00:00Z' AND time <= '2000-01-01T00:01:29Z' group by time(30s)`,
-			exp:     `{"error":"error parsing query: mixing aggregate and non-aggregate queries is not supported"}`,
-		},
-	}...)
-
-	for i, query := range test.queries {
-		if i == 0 {
-			if err := test.init(s); err != nil {
-				t.Fatalf("test init failed: %s", err)
-			}
-		}
-		if query.skip {
-			t.Logf("SKIP:: %s", query.name)
-			continue
-		}
-
-		if err := query.Execute(s); err != nil {
-			t.Error(query.Error(err))
-		} else if !query.success() {
-			t.Error(query.failureMessage())
-		}
-	}
-}
-
-func TestServer_Query_TopInt(t *testing.T) {
-	t.Parallel()
-	s := OpenServer(NewConfig(), "")
-	defer s.Close()
-
-	if err := s.CreateDatabaseAndRetentionPolicy("db0", newRetentionPolicyInfo("rp0", 1, 0)); err != nil {
-		t.Fatal(err)
-	}
-	if err := s.MetaStore.SetDefaultRetentionPolicy("db0", "rp0"); err != nil {
-		t.Fatal(err)
-	}
-
-	writes := []string{
-		// cpu data with overlapping duplicate values
-		// hour 0
-		fmt.Sprintf(`cpu,host=server01 value=2.0 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:00Z").UnixNano()),
-		fmt.Sprintf(`cpu,host=server02 value=3.0 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:10Z").UnixNano()),
-		fmt.Sprintf(`cpu,host=server03 value=4.0 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:20Z").UnixNano()),
-		// hour 1
-		fmt.Sprintf(`cpu,host=server04 value=5.0 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T01:00:00Z").UnixNano()),
-		fmt.Sprintf(`cpu,host=server05 value=7.0 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T01:00:10Z").UnixNano()),
-		fmt.Sprintf(`cpu,host=server06 value=6.0 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T01:00:20Z").UnixNano()),
-		// hour 2
-		fmt.Sprintf(`cpu,host=server07 value=7.0 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T02:00:00Z").UnixNano()),
-		fmt.Sprintf(`cpu,host=server08 value=9.0 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T02:00:10Z").UnixNano()),
-
-		// memory data
-		// hour 0
-		fmt.Sprintf(`memory,host=a,service=redis value=1000i %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:00Z").UnixNano()),
-		fmt.Sprintf(`memory,host=b,service=mysql value=2000i %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:00Z").UnixNano()),
-		fmt.Sprintf(`memory,host=b,service=redis value=1500i %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:00Z").UnixNano()),
-		// hour 1
-		fmt.Sprintf(`memory,host=a,service=redis value=1001i %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T01:00:00Z").UnixNano()),
-		fmt.Sprintf(`memory,host=b,service=mysql value=2001i %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T01:00:00Z").UnixNano()),
-		fmt.Sprintf(`memory,host=b,service=redis value=1501i %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T01:00:00Z").UnixNano()),
-		// hour 2
-		fmt.Sprintf(`memory,host=a,service=redis value=1002i %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T02:00:00Z").UnixNano()),
-		fmt.Sprintf(`memory,host=b,service=mysql value=2002i %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T02:00:00Z").UnixNano()),
-		fmt.Sprintf(`memory,host=b,service=redis value=1502i %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T02:00:00Z").UnixNano()),
-	}
-
-	test := NewTest("db0", "rp0")
-	test.write = strings.Join(writes, "\n")
-
-	test.addQueries([]*Query{
-		&Query{
-			name:    "top - cpu",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT TOP(value, 1) FROM cpu`,
-			exp:     `{"results":[{"series":[{"name":"cpu","columns":["time","top"],"values":[["2000-01-01T02:00:10Z",9]]}]}]}`,
-		},
-		&Query{
-			name:    "top - cpu - 2 values",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT TOP(value, 2) FROM cpu`,
-			exp:     `{"results":[{"series":[{"name":"cpu","columns":["time","top"],"values":[["2000-01-01T01:00:10Z",7],["2000-01-01T02:00:10Z",9]]}]}]}`,
-		},
-		&Query{
-			name:    "top - cpu - 3 values - sorts on tie properly",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT TOP(value, 3) FROM cpu`,
-			exp:     `{"results":[{"series":[{"name":"cpu","columns":["time","top"],"values":[["2000-01-01T01:00:10Z",7],["2000-01-01T02:00:00Z",7],["2000-01-01T02:00:10Z",9]]}]}]}`,
-		},
-		&Query{
-			name:    "top - cpu - with tag",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT TOP(value, host, 2) FROM cpu`,
-			exp:     `{"results":[{"series":[{"name":"cpu","columns":["time","top","host"],"values":[["2000-01-01T01:00:10Z",7,"server05"],["2000-01-01T02:00:10Z",9,"server08"]]}]}]}`,
-		},
-		&Query{
-			name:    "top - cpu - 3 values with limit 2",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT TOP(value, 3) FROM cpu limit 2`,
-			exp:     `{"error":"error parsing query: limit (3) in top function can not be larger than the LIMIT (2) in the select statement"}`,
-		},
-		&Query{
-			name:    "top - cpu - hourly",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT TOP(value, 1) FROM cpu where time >= '2000-01-01T00:00:00Z' and time <= '2000-01-01T02:00:10Z' group by time(1h)`,
-			exp:     `{"results":[{"series":[{"name":"cpu","columns":["time","top"],"values":[["2000-01-01T00:00:00Z",4],["2000-01-01T01:00:00Z",7],["2000-01-01T02:00:00Z",9]]}]}]}`,
-		},
-		&Query{
-			name:    "top - cpu - time specified - hourly",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT time, TOP(value, 1) FROM cpu where time >= '2000-01-01T00:00:00Z' and time <= '2000-01-01T02:00:10Z' group by time(1h)`,
-			exp:     `{"results":[{"series":[{"name":"cpu","columns":["time","top"],"values":[["2000-01-01T00:00:20Z",4],["2000-01-01T01:00:10Z",7],["2000-01-01T02:00:10Z",9]]}]}]}`,
-		},
-		&Query{
-			name:    "top - cpu - time specified - hourly - epoch ms",
-			params:  url.Values{"db": []string{"db0"}, "epoch": []string{"ms"}},
-			command: `SELECT time, TOP(value, 1) FROM cpu where time >= '2000-01-01T00:00:00Z' and time <= '2000-01-01T02:00:10Z' group by time(1h)`,
-			exp: fmt.Sprintf(
-				`{"results":[{"series":[{"name":"cpu","columns":["time","top"],"values":[[%d,4],[%d,7],[%d,9]]}]}]}`,
-				mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:20Z").UnixNano()/int64(time.Millisecond),
-				mustParseTime(time.RFC3339Nano, "2000-01-01T01:00:10Z").UnixNano()/int64(time.Millisecond),
-				mustParseTime(time.RFC3339Nano, "2000-01-01T02:00:10Z").UnixNano()/int64(time.Millisecond),
-			),
-		},
-		&Query{
-			name:    "top - cpu - time specified (not first) - hourly",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT TOP(value, 1), time FROM cpu where time >= '2000-01-01T00:00:00Z' and time <= '2000-01-01T02:00:10Z' group by time(1h)`,
-			exp:     `{"results":[{"series":[{"name":"cpu","columns":["time","top"],"values":[["2000-01-01T00:00:20Z",4],["2000-01-01T01:00:10Z",7],["2000-01-01T02:00:10Z",9]]}]}]}`,
-		},
-		&Query{
-			name:    "top - cpu - 2 values hourly",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT TOP(value, 2) FROM cpu where time >= '2000-01-01T00:00:00Z' and time <= '2000-01-01T02:00:10Z' group by time(1h)`,
-			exp:     `{"results":[{"series":[{"name":"cpu","columns":["time","top"],"values":[["2000-01-01T00:00:00Z",4],["2000-01-01T00:00:00Z",3],["2000-01-01T01:00:00Z",7],["2000-01-01T01:00:00Z",6],["2000-01-01T02:00:00Z",9],["2000-01-01T02:00:00Z",7]]}]}]}`,
-		},
-		&Query{
-			name:    "top - cpu - time specified -  2 values hourly",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT TOP(value, 2), time FROM cpu where time >= '2000-01-01T00:00:00Z' and time <= '2000-01-01T02:00:10Z' group by time(1h)`,
-			exp:     `{"results":[{"series":[{"name":"cpu","columns":["time","top"],"values":[["2000-01-01T00:00:10Z",3],["2000-01-01T00:00:20Z",4],["2000-01-01T01:00:10Z",7],["2000-01-01T01:00:20Z",6],["2000-01-01T02:00:00Z",7],["2000-01-01T02:00:10Z",9]]}]}]}`,
-		},
-		&Query{
-			name:    "top - cpu - 3 values hourly - validates that a bucket can have less than limit if no values exist in that time bucket",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT TOP(value, 3) FROM cpu where time >= '2000-01-01T00:00:00Z' and time <= '2000-01-01T02:00:10Z' group by time(1h)`,
-			exp:     `{"results":[{"series":[{"name":"cpu","columns":["time","top"],"values":[["2000-01-01T00:00:00Z",4],["2000-01-01T00:00:00Z",3],["2000-01-01T00:00:00Z",2],["2000-01-01T01:00:00Z",7],["2000-01-01T01:00:00Z",6],["2000-01-01T01:00:00Z",5],["2000-01-01T02:00:00Z",9],["2000-01-01T02:00:00Z",7]]}]}]}`,
-		},
-		&Query{
-			name:    "top - cpu - time specified - 3 values hourly - validates that a bucket can have less than limit if no values exist in that time bucket",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT TOP(value, 3), time FROM cpu where time >= '2000-01-01T00:00:00Z' and time <= '2000-01-01T02:00:10Z' group by time(1h)`,
-			exp:     `{"results":[{"series":[{"name":"cpu","columns":["time","top"],"values":[["2000-01-01T00:00:00Z",2],["2000-01-01T00:00:10Z",3],["2000-01-01T00:00:20Z",4],["2000-01-01T01:00:00Z",5],["2000-01-01T01:00:10Z",7],["2000-01-01T01:00:20Z",6],["2000-01-01T02:00:00Z",7],["2000-01-01T02:00:10Z",9]]}]}]}`,
-		},
-		&Query{
-			name:    "top - memory - 2 values, two tags",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT TOP(value, 2), host, service FROM memory`,
-			exp:     `{"results":[{"series":[{"name":"memory","columns":["time","top","host","service"],"values":[["2000-01-01T01:00:00Z",2001,"b","mysql"],["2000-01-01T02:00:00Z",2002,"b","mysql"]]}]}]}`,
-		},
-		&Query{
-			name:    "top - memory - host tag with limit 2",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT TOP(value, host, 2) FROM memory`,
-			exp:     `{"results":[{"series":[{"name":"memory","columns":["time","top","host"],"values":[["2000-01-01T02:00:00Z",2002,"b"],["2000-01-01T02:00:00Z",1002,"a"]]}]}]}`,
-		},
-		&Query{
-			name:    "top - memory - host tag with limit 2, service tag in select",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT TOP(value, host, 2), service FROM memory`,
-			exp:     `{"results":[{"series":[{"name":"memory","columns":["time","top","host","service"],"values":[["2000-01-01T02:00:00Z",2002,"b","mysql"],["2000-01-01T02:00:00Z",1002,"a","redis"]]}]}]}`,
-		},
-		&Query{
-			name:    "top - memory - service tag with limit 2, host tag in select",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT TOP(value, service, 2), host FROM memory`,
-			exp:     `{"results":[{"series":[{"name":"memory","columns":["time","top","service","host"],"values":[["2000-01-01T02:00:00Z",2002,"mysql","b"],["2000-01-01T02:00:00Z",1502,"redis","b"]]}]}]}`,
-		},
-		&Query{
-			name:    "top - memory - host and service tag with limit 2",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT TOP(value, host, service, 2) FROM memory`,
-			exp:     `{"results":[{"series":[{"name":"memory","columns":["time","top","host","service"],"values":[["2000-01-01T02:00:00Z",2002,"b","mysql"],["2000-01-01T02:00:00Z",1502,"b","redis"]]}]}]}`,
-		},
-		&Query{
-			name:    "top - memory - host tag with limit 2 with service tag in select",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT TOP(value, host, 2), service FROM memory`,
-			exp:     `{"results":[{"series":[{"name":"memory","columns":["time","top","host","service"],"values":[["2000-01-01T02:00:00Z",2002,"b","mysql"],["2000-01-01T02:00:00Z",1002,"a","redis"]]}]}]}`,
-		},
-		&Query{
-			name:    "top - memory - host and service tag with limit 3",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT TOP(value, host, service, 3) FROM memory`,
-			exp:     `{"results":[{"series":[{"name":"memory","columns":["time","top","host","service"],"values":[["2000-01-01T02:00:00Z",2002,"b","mysql"],["2000-01-01T02:00:00Z",1502,"b","redis"],["2000-01-01T02:00:00Z",1002,"a","redis"]]}]}]}`,
-		},
-
-		// TODO
-		// - Test that specifiying fields or tags in the function will rewrite the query to expand them to the fields
-		// - Test that a field can be used in the top function
-		// - Test that asking for a field will come back before a tag if they have the same name for a tag and a field
-		// - Test that `select top(value, host, 2)` when there is only one value for `host` it will only bring back one value
-		// - Test that `select top(value, host, 4) from foo where time > now() - 1d and time < now() group by time(1h)` and host is unique in some time buckets that it returns only the unique ones, and not always 4 values
-
-	}...)
-
-	for i, query := range test.queries {
-		if i == 0 {
-			if err := test.init(s); err != nil {
-				t.Fatalf("test init failed: %s", err)
-			}
-		}
-		if query.skip {
-			t.Logf("SKIP: %s", query.name)
-			continue
-		}
-
-		println(">>>>", query.name)
-		if query.name != `top - memory - host tag with limit 2` { // FIXME: temporary
-			continue
-		}
-		if err := query.Execute(s); err != nil {
-			t.Error(query.Error(err))
-		} else if !query.success() {
-			t.Error(query.failureMessage())
-		}
-	}
-}
-
-// Test various aggregates when different series only have data for the same timestamp.
-func TestServer_Query_Aggregates_IdenticalTime(t *testing.T) {
-	t.Parallel()
-	s := OpenServer(NewConfig(), "")
-	defer s.Close()
-
-	if err := s.CreateDatabaseAndRetentionPolicy("db0", newRetentionPolicyInfo("rp0", 1, 0)); err != nil {
-		t.Fatal(err)
-	}
-	if err := s.MetaStore.SetDefaultRetentionPolicy("db0", "rp0"); err != nil {
-		t.Fatal(err)
-	}
-
-	writes := []string{
-		fmt.Sprintf(`series,host=a value=1 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:00Z").UnixNano()),
-		fmt.Sprintf(`series,host=b value=2 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:00Z").UnixNano()),
-		fmt.Sprintf(`series,host=c value=3 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:00Z").UnixNano()),
-		fmt.Sprintf(`series,host=d value=4 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:00Z").UnixNano()),
-		fmt.Sprintf(`series,host=e value=5 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:00Z").UnixNano()),
-		fmt.Sprintf(`series,host=f value=5 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:00Z").UnixNano()),
-		fmt.Sprintf(`series,host=g value=5 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:00Z").UnixNano()),
-		fmt.Sprintf(`series,host=h value=5 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:00Z").UnixNano()),
-		fmt.Sprintf(`series,host=i value=5 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:00Z").UnixNano()),
-	}
-
-	test := NewTest("db0", "rp0")
-	test.write = strings.Join(writes, "\n")
-
-	test.addQueries([]*Query{
-		&Query{
-			name:    "last from multiple series with identical timestamp",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT last(value) FROM "series"`,
-			exp:     `{"results":[{"series":[{"name":"series","columns":["time","last"],"values":[["2000-01-01T00:00:00Z",5]]}]}]}`,
-			repeat:  100,
-		},
-		&Query{
-			name:    "first from multiple series with identical timestamp",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT first(value) FROM "series"`,
-			exp:     `{"results":[{"series":[{"name":"series","columns":["time","first"],"values":[["2000-01-01T00:00:00Z",5]]}]}]}`,
-			repeat:  100,
-		},
-	}...)
-
-	for i, query := range test.queries {
-		if i == 0 {
-			if err := test.init(s); err != nil {
-				t.Fatalf("test init failed: %s", err)
-			}
-		}
-		if query.skip {
-			t.Logf("SKIP:: %s", query.name)
-			continue
-		}
-		for n := 0; n <= query.repeat; n++ {
-			if err := query.Execute(s); err != nil {
-				t.Error(query.Error(err))
-			} else if !query.success() {
-				t.Error(query.failureMessage())
-			}
-		}
-	}
-}
-
-// This will test that when using a group by, that it observes the time you asked for
-// but will only put the values in the bucket that match the time range
-func TestServer_Query_GroupByTimeCutoffs(t *testing.T) {
-	t.Parallel()
-	s := OpenServer(NewConfig(), "")
-	defer s.Close()
-
-	if err := s.CreateDatabaseAndRetentionPolicy("db0", newRetentionPolicyInfo("rp0", 1, 0)); err != nil {
-		t.Fatal(err)
-	}
-	if err := s.MetaStore.SetDefaultRetentionPolicy("db0", "rp0"); err != nil {
-		t.Fatal(err)
-	}
-
-	writes := []string{
-		fmt.Sprintf(`cpu value=1i %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:00Z").UnixNano()),
-		fmt.Sprintf(`cpu value=2i %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:01Z").UnixNano()),
-		fmt.Sprintf(`cpu value=3i %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:05Z").UnixNano()),
-		fmt.Sprintf(`cpu value=4i %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:08Z").UnixNano()),
-		fmt.Sprintf(`cpu value=5i %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:09Z").UnixNano()),
-		fmt.Sprintf(`cpu value=6i %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:10Z").UnixNano()),
-	}
-	test := NewTest("db0", "rp0")
-	test.write = strings.Join(writes, "\n")
-
-	test.addQueries([]*Query{
-		&Query{
-			name:    "sum all time",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT SUM(value) FROM cpu`,
-			exp:     `{"results":[{"series":[{"name":"cpu","columns":["time","sum"],"values":[["1970-01-01T00:00:00Z",21]]}]}]}`,
-		},
-		&Query{
-			name:    "sum all time grouped by time 5s",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT SUM(value) FROM cpu where time >= '2000-01-01T00:00:00Z' and time <= '2000-01-01T00:00:10Z' group by time(5s)`,
-			exp:     `{"results":[{"series":[{"name":"cpu","columns":["time","sum"],"values":[["2000-01-01T00:00:00Z",3],["2000-01-01T00:00:05Z",12],["2000-01-01T00:00:10Z",6]]}]}]}`,
-		},
-		&Query{
-			name:    "sum all time grouped by time 5s missing first point",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT SUM(value) FROM cpu where time >= '2000-01-01T00:00:01Z' and time <= '2000-01-01T00:00:10Z' group by time(5s)`,
-			exp:     `{"results":[{"series":[{"name":"cpu","columns":["time","sum"],"values":[["2000-01-01T00:00:00Z",2],["2000-01-01T00:00:05Z",12],["2000-01-01T00:00:10Z",6]]}]}]}`,
-		},
-		&Query{
-			name:    "sum all time grouped by time 5s missing first points (null for bucket)",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT SUM(value) FROM cpu where time >= '2000-01-01T00:00:02Z' and time <= '2000-01-01T00:00:10Z' group by time(5s)`,
-			exp:     `{"results":[{"series":[{"name":"cpu","columns":["time","sum"],"values":[["2000-01-01T00:00:00Z",null],["2000-01-01T00:00:05Z",12],["2000-01-01T00:00:10Z",6]]}]}]}`,
-		},
-		&Query{
-			name:    "sum all time grouped by time 5s missing last point - 2 time intervals",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT SUM(value) FROM cpu where time >= '2000-01-01T00:00:00Z' and time <= '2000-01-01T00:00:09Z' group by time(5s)`,
-			exp:     `{"results":[{"series":[{"name":"cpu","columns":["time","sum"],"values":[["2000-01-01T00:00:00Z",3],["2000-01-01T00:00:05Z",12]]}]}]}`,
-		},
-		&Query{
-			name:    "sum all time grouped by time 5s missing last 2 points - 2 time intervals",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT SUM(value) FROM cpu where time >= '2000-01-01T00:00:00Z' and time <= '2000-01-01T00:00:08Z' group by time(5s)`,
-			exp:     `{"results":[{"series":[{"name":"cpu","columns":["time","sum"],"values":[["2000-01-01T00:00:00Z",3],["2000-01-01T00:00:05Z",7]]}]}]}`,
-		},
-	}...)
-
-	for i, query := range test.queries {
-		if i == 0 {
-			if err := test.init(s); err != nil {
-				t.Fatalf("test init failed: %s", err)
-			}
-		}
-		if query.skip {
-			t.Logf("SKIP:: %s", query.name)
-			continue
-		}
-		if err := query.Execute(s); err != nil {
-			t.Error(query.Error(err))
-		} else if !query.success() {
-			t.Error(query.failureMessage())
-		}
-	}
-}
-
-func TestServer_Write_Precision(t *testing.T) {
-	t.Parallel()
-	s := OpenServer(NewConfig(), "")
-	defer s.Close()
-
-	if err := s.CreateDatabaseAndRetentionPolicy("db0", newRetentionPolicyInfo("rp0", 1, 0)); err != nil {
-		t.Fatal(err)
-	}
-	if err := s.MetaStore.SetDefaultRetentionPolicy("db0", "rp0"); err != nil {
-		t.Fatal(err)
-	}
-
-	writes := []struct {
-		write  string
-		params url.Values
-	}{
-		{
-			write: fmt.Sprintf("cpu_n0_precision value=1 %d", mustParseTime(time.RFC3339Nano, "2000-01-01T12:34:56.789012345Z").UnixNano()),
-		},
-		{
-			write:  fmt.Sprintf("cpu_n1_precision value=1.1 %d", mustParseTime(time.RFC3339Nano, "2000-01-01T12:34:56.789012345Z").UnixNano()),
-			params: url.Values{"precision": []string{"n"}},
-		},
-		{
-			write:  fmt.Sprintf("cpu_u_precision value=100 %d", mustParseTime(time.RFC3339Nano, "2000-01-01T12:34:56.789012345Z").Truncate(time.Microsecond).UnixNano()/int64(time.Microsecond)),
-			params: url.Values{"precision": []string{"u"}},
-		},
-		{
-			write:  fmt.Sprintf("cpu_ms_precision value=200 %d", mustParseTime(time.RFC3339Nano, "2000-01-01T12:34:56.789012345Z").Truncate(time.Millisecond).UnixNano()/int64(time.Millisecond)),
-			params: url.Values{"precision": []string{"ms"}},
-		},
-		{
-			write:  fmt.Sprintf("cpu_s_precision value=300 %d", mustParseTime(time.RFC3339Nano, "2000-01-01T12:34:56.789012345Z").Truncate(time.Second).UnixNano()/int64(time.Second)),
-			params: url.Values{"precision": []string{"s"}},
-		},
-		{
-			write:  fmt.Sprintf("cpu_m_precision value=400 %d", mustParseTime(time.RFC3339Nano, "2000-01-01T12:34:56.789012345Z").Truncate(time.Minute).UnixNano()/int64(time.Minute)),
-			params: url.Values{"precision": []string{"m"}},
-		},
-		{
-			write:  fmt.Sprintf("cpu_h_precision value=500 %d", mustParseTime(time.RFC3339Nano, "2000-01-01T12:34:56.789012345Z").Truncate(time.Hour).UnixNano()/int64(time.Hour)),
-			params: url.Values{"precision": []string{"h"}},
-		},
-	}
-
-	test := NewTest("db0", "rp0")
-
-	test.addQueries([]*Query{
-		&Query{
-			name:    "point with nanosecond precision time - no precision specified on write",
-			command: `SELECT * FROM cpu_n0_precision`,
-			params:  url.Values{"db": []string{"db0"}},
-			exp:     `{"results":[{"series":[{"name":"cpu_n0_precision","columns":["time","value"],"values":[["2000-01-01T12:34:56.789012345Z",1]]}]}]}`,
-		},
-		&Query{
-			name:    "point with nanosecond precision time",
-			command: `SELECT * FROM cpu_n1_precision`,
-			params:  url.Values{"db": []string{"db0"}},
-			exp:     `{"results":[{"series":[{"name":"cpu_n1_precision","columns":["time","value"],"values":[["2000-01-01T12:34:56.789012345Z",1.1]]}]}]}`,
-		},
-		&Query{
-			name:    "point with microsecond precision time",
-			command: `SELECT * FROM cpu_u_precision`,
-			params:  url.Values{"db": []string{"db0"}},
-			exp:     `{"results":[{"series":[{"name":"cpu_u_precision","columns":["time","value"],"values":[["2000-01-01T12:34:56.789012Z",100]]}]}]}`,
-		},
-		&Query{
-			name:    "point with millisecond precision time",
-			command: `SELECT * FROM cpu_ms_precision`,
-			params:  url.Values{"db": []string{"db0"}},
-			exp:     `{"results":[{"series":[{"name":"cpu_ms_precision","columns":["time","value"],"values":[["2000-01-01T12:34:56.789Z",200]]}]}]}`,
-		},
-		&Query{
-			name:    "point with second precision time",
-			command: `SELECT * FROM cpu_s_precision`,
-			params:  url.Values{"db": []string{"db0"}},
-			exp:     `{"results":[{"series":[{"name":"cpu_s_precision","columns":["time","value"],"values":[["2000-01-01T12:34:56Z",300]]}]}]}`,
-		},
-		&Query{
-			name:    "point with minute precision time",
-			command: `SELECT * FROM cpu_m_precision`,
-			params:  url.Values{"db": []string{"db0"}},
-			exp:     `{"results":[{"series":[{"name":"cpu_m_precision","columns":["time","value"],"values":[["2000-01-01T12:34:00Z",400]]}]}]}`,
-		},
-		&Query{
-			name:    "point with hour precision time",
-			command: `SELECT * FROM cpu_h_precision`,
-			params:  url.Values{"db": []string{"db0"}},
-			exp:     `{"results":[{"series":[{"name":"cpu_h_precision","columns":["time","value"],"values":[["2000-01-01T12:00:00Z",500]]}]}]}`,
-		},
-	}...)
-
-	// we are doing writes that require parameter changes, so we are fighting the test harness a little to make this happen properly
-	for _, w := range writes {
-		test.write = w.write
-		test.params = w.params
-		test.initialized = false
-		if err := test.init(s); err != nil {
-			t.Fatalf("test init failed: %s", err)
-		}
-	}
-
-	for _, query := range test.queries {
-		if query.skip {
-			t.Logf("SKIP:: %s", query.name)
-			continue
-		}
-		if err := query.Execute(s); err != nil {
-			t.Error(query.Error(err))
-		} else if !query.success() {
-			t.Error(query.failureMessage())
-		}
-	}
-}
-
-func TestServer_Query_Wildcards(t *testing.T) {
-	t.Parallel()
-	s := OpenServer(NewConfig(), "")
-	defer s.Close()
-
-	if err := s.CreateDatabaseAndRetentionPolicy("db0", newRetentionPolicyInfo("rp0", 1, 0)); err != nil {
-		t.Fatal(err)
-	}
-	if err := s.MetaStore.SetDefaultRetentionPolicy("db0", "rp0"); err != nil {
-		t.Fatal(err)
-	}
-
-	writes := []string{
-		fmt.Sprintf(`wildcard,region=us-east value=10 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:00Z").UnixNano()),
-		fmt.Sprintf(`wildcard,region=us-east valx=20 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:10Z").UnixNano()),
-		fmt.Sprintf(`wildcard,region=us-east value=30,valx=40 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:20Z").UnixNano()),
-
-		fmt.Sprintf(`wgroup,region=us-east value=10.0 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:00Z").UnixNano()),
-		fmt.Sprintf(`wgroup,region=us-east value=20.0 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:10Z").UnixNano()),
-		fmt.Sprintf(`wgroup,region=us-west value=30.0 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:20Z").UnixNano()),
-
-		fmt.Sprintf(`m1,region=us-east value=10.0 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:00Z").UnixNano()),
-		fmt.Sprintf(`m2,host=server01 field=20.0 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:01Z").UnixNano()),
-	}
-
-	test := NewTest("db0", "rp0")
-	test.write = strings.Join(writes, "\n")
-
-	test.addQueries([]*Query{
-		&Query{
-			name:    "wildcard",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT * FROM wildcard`,
-			exp:     `{"results":[{"series":[{"name":"wildcard","columns":["time","region","value","valx"],"values":[["2000-01-01T00:00:00Z","us-east",10,null],["2000-01-01T00:00:10Z","us-east",null,20],["2000-01-01T00:00:20Z","us-east",30,40]]}]}]}`,
-		},
-		&Query{
-			name:    "wildcard with group by",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT * FROM wildcard GROUP BY *`,
-			exp:     `{"results":[{"series":[{"name":"wildcard","tags":{"region":"us-east"},"columns":["time","value","valx"],"values":[["2000-01-01T00:00:00Z",10,null],["2000-01-01T00:00:10Z",null,20],["2000-01-01T00:00:20Z",30,40]]}]}]}`,
-		},
-		&Query{
-			name:    "GROUP BY queries",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT mean(value) FROM wgroup GROUP BY *`,
-			exp:     `{"results":[{"series":[{"name":"wgroup","tags":{"region":"us-east"},"columns":["time","mean"],"values":[["1970-01-01T00:00:00Z",15]]},{"name":"wgroup","tags":{"region":"us-west"},"columns":["time","mean"],"values":[["1970-01-01T00:00:00Z",30]]}]}]}`,
-		},
-		&Query{
-			name:    "GROUP BY queries with time",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT mean(value) FROM wgroup WHERE time >= '2000-01-01T00:00:00Z' AND time < '2000-01-01T00:01:00Z' GROUP BY *,TIME(1m)`,
-			exp:     `{"results":[{"series":[{"name":"wgroup","tags":{"region":"us-east"},"columns":["time","mean"],"values":[["2000-01-01T00:00:00Z",15]]},{"name":"wgroup","tags":{"region":"us-west"},"columns":["time","mean"],"values":[["2000-01-01T00:00:00Z",30]]}]}]}`,
-		},
-		&Query{
-			name:    "wildcard and field in select",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT value, * FROM wildcard`,
-			exp:     `{"results":[{"series":[{"name":"wildcard","columns":["time","region","value","valx"],"values":[["2000-01-01T00:00:00Z","us-east",10,null],["2000-01-01T00:00:10Z","us-east",null,20],["2000-01-01T00:00:20Z","us-east",30,40]]}]}]}`,
-		},
-		&Query{
-			name:    "field and wildcard in select",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT value, * FROM wildcard`,
-			exp:     `{"results":[{"series":[{"name":"wildcard","columns":["time","region","value","valx"],"values":[["2000-01-01T00:00:00Z","us-east",10,null],["2000-01-01T00:00:10Z","us-east",null,20],["2000-01-01T00:00:20Z","us-east",30,40]]}]}]}`,
-		},
-		&Query{
-			name:    "field and wildcard in group by",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT * FROM wildcard GROUP BY region, *`,
-			exp:     `{"results":[{"series":[{"name":"wildcard","tags":{"region":"us-east"},"columns":["time","value","valx"],"values":[["2000-01-01T00:00:00Z",10,null],["2000-01-01T00:00:10Z",null,20],["2000-01-01T00:00:20Z",30,40]]}]}]}`,
-		},
-		&Query{
-			name:    "wildcard and field in group by",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT * FROM wildcard GROUP BY *, region`,
-			exp:     `{"results":[{"series":[{"name":"wildcard","tags":{"region":"us-east"},"columns":["time","value","valx"],"values":[["2000-01-01T00:00:00Z",10,null],["2000-01-01T00:00:10Z",null,20],["2000-01-01T00:00:20Z",30,40]]}]}]}`,
-		},
-		&Query{
-			name:    "wildcard with multiple measurements",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT * FROM m1, m2`,
-			exp:     `{"results":[{"series":[{"name":"m1","columns":["time","field","host","region","value"],"values":[["2000-01-01T00:00:00Z",null,null,"us-east",10]]},{"name":"m2","columns":["time","field","host","region","value"],"values":[["2000-01-01T00:00:01Z",20,"server01",null,null]]}]}]}`,
-		},
-		&Query{
-			name:    "wildcard with multiple measurements via regex",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT * FROM /^m.*/`,
-			exp:     `{"results":[{"series":[{"name":"m1","columns":["time","field","host","region","value"],"values":[["2000-01-01T00:00:00Z",null,null,"us-east",10]]},{"name":"m2","columns":["time","field","host","region","value"],"values":[["2000-01-01T00:00:01Z",20,"server01",null,null]]}]}]}`,
-		},
-		&Query{
-			name:    "wildcard with multiple measurements via regex and limit",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT * FROM db0../^m.*/ LIMIT 2`,
-			exp:     `{"results":[{"series":[{"name":"m1","columns":["time","field","host","region","value"],"values":[["2000-01-01T00:00:00Z",null,null,"us-east",10]]},{"name":"m2","columns":["time","field","host","region","value"],"values":[["2000-01-01T00:00:01Z",20,"server01",null,null]]}]}]}`,
-		},
-	}...)
-
-	for i, query := range test.queries {
-		if i == 0 {
-			if err := test.init(s); err != nil {
-				t.Fatalf("test init failed: %s", err)
-			}
-		}
-		if query.skip {
-			t.Logf("SKIP:: %s", query.name)
-			continue
-		}
-
-		if err := query.Execute(s); err != nil {
-			t.Error(query.Error(err))
-		} else if !query.success() {
-			t.Error(query.failureMessage())
-		}
-	}
-}
-
-func TestServer_Query_WildcardExpansion(t *testing.T) {
-	t.Parallel()
-	s := OpenServer(NewConfig(), "")
-	defer s.Close()
-
-	if err := s.CreateDatabaseAndRetentionPolicy("db0", newRetentionPolicyInfo("rp0", 1, 0)); err != nil {
-		t.Fatal(err)
-	}
-	if err := s.MetaStore.SetDefaultRetentionPolicy("db0", "rp0"); err != nil {
-		t.Fatal(err)
-	}
-
-	writes := []string{
-		fmt.Sprintf(`wildcard,region=us-east,host=A value=10,cpu=80 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:00Z").UnixNano()),
-		fmt.Sprintf(`wildcard,region=us-east,host=B value=20,cpu=90 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:10Z").UnixNano()),
-		fmt.Sprintf(`wildcard,region=us-west,host=B value=30,cpu=70 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:20Z").UnixNano()),
-		fmt.Sprintf(`wildcard,region=us-east,host=A value=40,cpu=60 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:30Z").UnixNano()),
-
-		fmt.Sprintf(`dupnames,region=us-east,day=1 value=10,day=3i %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:00Z").UnixNano()),
-		fmt.Sprintf(`dupnames,region=us-east,day=2 value=20,day=2i %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:10Z").UnixNano()),
-		fmt.Sprintf(`dupnames,region=us-west,day=3 value=30,day=1i %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:20Z").UnixNano()),
-	}
-
-	test := NewTest("db0", "rp0")
-	test.write = strings.Join(writes, "\n")
-
-	test.addQueries([]*Query{
-		&Query{
-			name:    "wildcard",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT * FROM wildcard`,
-			exp:     `{"results":[{"series":[{"name":"wildcard","columns":["time","cpu","host","region","value"],"values":[["2000-01-01T00:00:00Z",80,"A","us-east",10],["2000-01-01T00:00:10Z",90,"B","us-east",20],["2000-01-01T00:00:20Z",70,"B","us-west",30],["2000-01-01T00:00:30Z",60,"A","us-east",40]]}]}]}`,
-		},
-		&Query{
-			name:    "no wildcard in select",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT cpu, host, region, value  FROM wildcard`,
-			exp:     `{"results":[{"series":[{"name":"wildcard","columns":["time","cpu","host","region","value"],"values":[["2000-01-01T00:00:00Z",80,"A","us-east",10],["2000-01-01T00:00:10Z",90,"B","us-east",20],["2000-01-01T00:00:20Z",70,"B","us-west",30],["2000-01-01T00:00:30Z",60,"A","us-east",40]]}]}]}`,
-		},
-		&Query{
-			name:    "no wildcard in select, preserve column order",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT host, cpu, region, value  FROM wildcard`,
-			exp:     `{"results":[{"series":[{"name":"wildcard","columns":["time","host","cpu","region","value"],"values":[["2000-01-01T00:00:00Z","A",80,"us-east",10],["2000-01-01T00:00:10Z","B",90,"us-east",20],["2000-01-01T00:00:20Z","B",70,"us-west",30],["2000-01-01T00:00:30Z","A",60,"us-east",40]]}]}]}`,
-		},
-
-		&Query{
-			name:    "only tags, no fields",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT host, region FROM wildcard`,
-			exp:     `{"results":[{"error":"statement must have at least one field in select clause"}]}`,
-		},
-
-		&Query{
-			name:    "no wildcard with alias",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT cpu as c, host as h, region, value  FROM wildcard`,
-			exp:     `{"results":[{"series":[{"name":"wildcard","columns":["time","c","h","region","value"],"values":[["2000-01-01T00:00:00Z",80,"A","us-east",10],["2000-01-01T00:00:10Z",90,"B","us-east",20],["2000-01-01T00:00:20Z",70,"B","us-west",30],["2000-01-01T00:00:30Z",60,"A","us-east",40]]}]}]}`,
-		},
-		&Query{
-			name:    "duplicate tag and field key, always favor field over tag",
-			command: `SELECT * FROM dupnames`,
-			params:  url.Values{"db": []string{"db0"}},
-			exp:     `{"results":[{"series":[{"name":"dupnames","columns":["time","day","region","value"],"values":[["2000-01-01T00:00:00Z",3,"us-east",10],["2000-01-01T00:00:10Z",2,"us-east",20],["2000-01-01T00:00:20Z",1,"us-west",30]]}]}]}`,
-		},
-	}...)
-
-	for i, query := range test.queries {
-		if i == 0 {
-			if err := test.init(s); err != nil {
-				t.Fatalf("test init failed: %s", err)
-			}
-		}
-		if query.skip {
-			t.Logf("SKIP:: %s", query.name)
-			continue
-		}
-		if err := query.Execute(s); err != nil {
-			t.Error(query.Error(err))
-		} else if !query.success() {
-			t.Error(query.failureMessage())
-		}
-	}
-}
-
-func TestServer_Query_AcrossShardsAndFields(t *testing.T) {
-	t.Parallel()
-	s := OpenServer(NewConfig(), "")
-	defer s.Close()
-
-	if err := s.CreateDatabaseAndRetentionPolicy("db0", newRetentionPolicyInfo("rp0", 1, 0)); err != nil {
-		t.Fatal(err)
-	}
-	if err := s.MetaStore.SetDefaultRetentionPolicy("db0", "rp0"); err != nil {
-		t.Fatal(err)
-	}
-
-	writes := []string{
-		fmt.Sprintf(`cpu load=100 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:00Z").UnixNano()),
-		fmt.Sprintf(`cpu load=200 %d`, mustParseTime(time.RFC3339Nano, "2010-01-01T00:00:00Z").UnixNano()),
-		fmt.Sprintf(`cpu core=4 %d`, mustParseTime(time.RFC3339Nano, "2015-01-01T00:00:00Z").UnixNano()),
-	}
-
-	test := NewTest("db0", "rp0")
-	test.write = strings.Join(writes, "\n")
-
-	test.addQueries([]*Query{
-		&Query{
-			name:    "two results for cpu",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT load FROM cpu`,
-			exp:     `{"results":[{"series":[{"name":"cpu","columns":["time","load"],"values":[["2000-01-01T00:00:00Z",100],["2010-01-01T00:00:00Z",200]]}]}]}`,
-		},
-		&Query{
-			name:    "two results for cpu, multi-select",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT core,load FROM cpu`,
-			exp:     `{"results":[{"series":[{"name":"cpu","columns":["time","core","load"],"values":[["2000-01-01T00:00:00Z",null,100],["2010-01-01T00:00:00Z",null,200],["2015-01-01T00:00:00Z",4,null]]}]}]}`,
-		},
-		&Query{
-			name:    "two results for cpu, wildcard select",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT * FROM cpu`,
-			exp:     `{"results":[{"series":[{"name":"cpu","columns":["time","core","load"],"values":[["2000-01-01T00:00:00Z",null,100],["2010-01-01T00:00:00Z",null,200],["2015-01-01T00:00:00Z",4,null]]}]}]}`,
-		},
-		&Query{
-			name:    "one result for core",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT core FROM cpu`,
-			exp:     `{"results":[{"series":[{"name":"cpu","columns":["time","core"],"values":[["2015-01-01T00:00:00Z",4]]}]}]}`,
-		},
-		&Query{
-			name:    "empty result set from non-existent field",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT foo FROM cpu`,
-			exp:     `{"results":[{}]}`,
-		},
-	}...)
-
-	for i, query := range test.queries {
-		if i == 0 {
-			if err := test.init(s); err != nil {
-				t.Fatalf("test init failed: %s", err)
-			}
-		}
-		if query.skip {
-			t.Logf("SKIP:: %s", query.name)
-			continue
-		}
-		if err := query.Execute(s); err != nil {
-			t.Error(query.Error(err))
-		} else if !query.success() {
-			t.Error(query.failureMessage())
-		}
-	}
-}
-
-func TestServer_Query_Where_Fields(t *testing.T) {
-	t.Parallel()
-	s := OpenServer(NewConfig(), "")
-	defer s.Close()
-
-	if err := s.CreateDatabaseAndRetentionPolicy("db0", newRetentionPolicyInfo("rp0", 1, 0)); err != nil {
-		t.Fatal(err)
-	}
-	if err := s.MetaStore.SetDefaultRetentionPolicy("db0", "rp0"); err != nil {
-		t.Fatal(err)
-	}
-
-	writes := []string{
-		fmt.Sprintf(`cpu alert_id="alert",tenant_id="tenant",_cust="johnson brothers" %d`, mustParseTime(time.RFC3339Nano, "2015-02-28T01:03:36.703820946Z").UnixNano()),
-		fmt.Sprintf(`cpu alert_id="alert",tenant_id="tenant",_cust="johnson brothers" %d`, mustParseTime(time.RFC3339Nano, "2015-02-28T01:03:36.703820946Z").UnixNano()),
-
-		fmt.Sprintf(`cpu load=100.0,core=4 %d`, mustParseTime(time.RFC3339Nano, "2009-11-10T23:00:02Z").UnixNano()),
-		fmt.Sprintf(`cpu load=80.0,core=2 %d`, mustParseTime(time.RFC3339Nano, "2009-11-10T23:01:02Z").UnixNano()),
-
-		fmt.Sprintf(`clicks local=true %d`, mustParseTime(time.RFC3339Nano, "2014-11-10T23:00:01Z").UnixNano()),
-		fmt.Sprintf(`clicks local=false %d`, mustParseTime(time.RFC3339Nano, "2014-11-10T23:00:02Z").UnixNano()),
-	}
-
-	test := NewTest("db0", "rp0")
-	test.write = strings.Join(writes, "\n")
-
-	test.addQueries([]*Query{
-		// non type specific
-		&Query{
-			name:    "missing measurement with group by",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT load from missing group by *`,
-			exp:     `{"results":[{}]}`,
-		},
-
-		// string
-		&Query{
-			name:    "single string field",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT alert_id FROM cpu WHERE alert_id='alert'`,
-			exp:     `{"results":[{"series":[{"name":"cpu","columns":["time","alert_id"],"values":[["2015-02-28T01:03:36.703820946Z","alert"]]}]}]}`,
-		},
-		&Query{
-			name:    "string AND query, all fields in SELECT",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT alert_id,tenant_id,_cust FROM cpu WHERE alert_id='alert' AND tenant_id='tenant'`,
-			exp:     `{"results":[{"series":[{"name":"cpu","columns":["time","alert_id","tenant_id","_cust"],"values":[["2015-02-28T01:03:36.703820946Z","alert","tenant","johnson brothers"]]}]}]}`,
-		},
-		&Query{
-			name:    "string AND query, all fields in SELECT, one in parenthesis",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT alert_id,tenant_id FROM cpu WHERE alert_id='alert' AND (tenant_id='tenant')`,
-			exp:     `{"results":[{"series":[{"name":"cpu","columns":["time","alert_id","tenant_id"],"values":[["2015-02-28T01:03:36.703820946Z","alert","tenant"]]}]}]}`,
-		},
-		&Query{
-			name:    "string underscored field",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT alert_id FROM cpu WHERE _cust='johnson brothers'`,
-			exp:     `{"results":[{"series":[{"name":"cpu","columns":["time","alert_id"],"values":[["2015-02-28T01:03:36.703820946Z","alert"]]}]}]}`,
-		},
-		&Query{
-			name:    "string no match",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT alert_id FROM cpu WHERE _cust='acme'`,
-			exp:     `{"results":[{}]}`,
-		},
-
-		// float64
-		&Query{
-			name:    "float64 GT no match",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `select load from cpu where load > 100`,
-			exp:     `{"results":[{}]}`,
-		},
-		&Query{
-			name:    "float64 GTE match one",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `select load from cpu where load >= 100`,
-			exp:     `{"results":[{"series":[{"name":"cpu","columns":["time","load"],"values":[["2009-11-10T23:00:02Z",100]]}]}]}`,
-		},
-		&Query{
-			name:    "float64 EQ match upper bound",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `select load from cpu where load = 100`,
-			exp:     `{"results":[{"series":[{"name":"cpu","columns":["time","load"],"values":[["2009-11-10T23:00:02Z",100]]}]}]}`,
-		},
-		&Query{
-			name:    "float64 LTE match two",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `select load from cpu where load <= 100`,
-			exp:     `{"results":[{"series":[{"name":"cpu","columns":["time","load"],"values":[["2009-11-10T23:00:02Z",100],["2009-11-10T23:01:02Z",80]]}]}]}`,
-		},
-		&Query{
-			name:    "float64 GT match one",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `select load from cpu where load > 99`,
-			exp:     `{"results":[{"series":[{"name":"cpu","columns":["time","load"],"values":[["2009-11-10T23:00:02Z",100]]}]}]}`,
-		},
-		&Query{
-			name:    "float64 EQ no match",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `select load from cpu where load = 99`,
-			exp:     `{"results":[{}]}`,
-		},
-		&Query{
-			name:    "float64 LT match one",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `select load from cpu where load < 99`,
-			exp:     `{"results":[{"series":[{"name":"cpu","columns":["time","load"],"values":[["2009-11-10T23:01:02Z",80]]}]}]}`,
-		},
-		&Query{
-			name:    "float64 LT no match",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `select load from cpu where load < 80`,
-			exp:     `{"results":[{}]}`,
-		},
-		&Query{
-			name:    "float64 NE match one",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `select load from cpu where load != 100`,
-			exp:     `{"results":[{"series":[{"name":"cpu","columns":["time","load"],"values":[["2009-11-10T23:01:02Z",80]]}]}]}`,
-		},
-
-		// int64
-		&Query{
-			name:    "int64 GT no match",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `select core from cpu where core > 4`,
-			exp:     `{"results":[{}]}`,
-		},
-		&Query{
-			name:    "int64 GTE match one",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `select core from cpu where core >= 4`,
-			exp:     `{"results":[{"series":[{"name":"cpu","columns":["time","core"],"values":[["2009-11-10T23:00:02Z",4]]}]}]}`,
-		},
-		&Query{
-			name:    "int64 EQ match upper bound",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `select core from cpu where core = 4`,
-			exp:     `{"results":[{"series":[{"name":"cpu","columns":["time","core"],"values":[["2009-11-10T23:00:02Z",4]]}]}]}`,
-		},
-		&Query{
-			name:    "int64 LTE match two ",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `select core from cpu where core <= 4`,
-			exp:     `{"results":[{"series":[{"name":"cpu","columns":["time","core"],"values":[["2009-11-10T23:00:02Z",4],["2009-11-10T23:01:02Z",2]]}]}]}`,
-		},
-		&Query{
-			name:    "int64 GT match one",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `select core from cpu where core > 3`,
-			exp:     `{"results":[{"series":[{"name":"cpu","columns":["time","core"],"values":[["2009-11-10T23:00:02Z",4]]}]}]}`,
-		},
-		&Query{
-			name:    "int64 EQ no match",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `select core from cpu where core = 3`,
-			exp:     `{"results":[{}]}`,
-		},
-		&Query{
-			name:    "int64 LT match one",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `select core from cpu where core < 3`,
-			exp:     `{"results":[{"series":[{"name":"cpu","columns":["time","core"],"values":[["2009-11-10T23:01:02Z",2]]}]}]}`,
-		},
-		&Query{
-			name:    "int64 LT no match",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `select core from cpu where core < 2`,
-			exp:     `{"results":[{}]}`,
-		},
-		&Query{
-			name:    "int64 NE match one",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `select core from cpu where core != 4`,
-			exp:     `{"results":[{"series":[{"name":"cpu","columns":["time","core"],"values":[["2009-11-10T23:01:02Z",2]]}]}]}`,
-		},
-
-		// bool
-		&Query{
-			name:    "bool EQ match true",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `select local from clicks where local = true`,
-			exp:     `{"results":[{"series":[{"name":"clicks","columns":["time","local"],"values":[["2014-11-10T23:00:01Z",true]]}]}]}`,
-		},
-		&Query{
-			name:    "bool EQ match false",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `select local from clicks where local = false`,
-			exp:     `{"results":[{"series":[{"name":"clicks","columns":["time","local"],"values":[["2014-11-10T23:00:02Z",false]]}]}]}`,
-		},
-
-		&Query{
-			name:    "bool NE match one",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `select local from clicks where local != true`,
-			exp:     `{"results":[{"series":[{"name":"clicks","columns":["time","local"],"values":[["2014-11-10T23:00:02Z",false]]}]}]}`,
-		},
-	}...)
-
-	for i, query := range test.queries {
-		if i == 0 {
-			if err := test.init(s); err != nil {
-				t.Fatalf("test init failed: %s", err)
-			}
-		}
-		if query.skip {
-			t.Logf("SKIP:: %s", query.name)
-			continue
-		}
-
-		if err := query.Execute(s); err != nil {
-			t.Error(query.Error(err))
-		} else if !query.success() {
-			t.Error(query.failureMessage())
-		}
-	}
-}
-
-func TestServer_Query_Where_With_Tags(t *testing.T) {
-	t.Parallel()
-	s := OpenServer(NewConfig(), "")
-	defer s.Close()
-
-	if err := s.CreateDatabaseAndRetentionPolicy("db0", newRetentionPolicyInfo("rp0", 1, 0)); err != nil {
-		t.Fatal(err)
-	}
-	if err := s.MetaStore.SetDefaultRetentionPolicy("db0", "rp0"); err != nil {
-		t.Fatal(err)
-	}
-
-	writes := []string{
-		fmt.Sprintf(`where_events,tennant=paul foo="bar" %d`, mustParseTime(time.RFC3339Nano, "2009-11-10T23:00:02Z").UnixNano()),
-		fmt.Sprintf(`where_events,tennant=paul foo="baz" %d`, mustParseTime(time.RFC3339Nano, "2009-11-10T23:00:03Z").UnixNano()),
-		fmt.Sprintf(`where_events,tennant=paul foo="bat" %d`, mustParseTime(time.RFC3339Nano, "2009-11-10T23:00:04Z").UnixNano()),
-		fmt.Sprintf(`where_events,tennant=todd foo="bar" %d`, mustParseTime(time.RFC3339Nano, "2009-11-10T23:00:05Z").UnixNano()),
-		fmt.Sprintf(`where_events,tennant=david foo="bap" %d`, mustParseTime(time.RFC3339Nano, "2009-11-10T23:00:06Z").UnixNano()),
-	}
-
-	test := NewTest("db0", "rp0")
-	test.write = strings.Join(writes, "\n")
-
-	test.addQueries([]*Query{
-		&Query{
-			name:    "tag field and time",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `select foo from where_events where (tennant = 'paul' OR tennant = 'david') AND time > 1s AND (foo = 'bar' OR foo = 'baz' OR foo = 'bap')`,
-			exp:     `{"results":[{"series":[{"name":"where_events","columns":["time","foo"],"values":[["2009-11-10T23:00:02Z","bar"],["2009-11-10T23:00:03Z","baz"],["2009-11-10T23:00:06Z","bap"]]}]}]}`,
-		},
-		&Query{
-			name:    "where on tag that should be double quoted but isn't",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `show series where data-center = 'foo'`,
-			exp:     `{"results":[{"error":"invalid expression: data - center = 'foo'"}]}`,
-		},
-	}...)
-
-	for i, query := range test.queries {
-		if i == 0 {
-			if err := test.init(s); err != nil {
-				t.Fatalf("test init failed: %s", err)
-			}
-		}
-		if query.skip {
-			t.Logf("SKIP:: %s", query.name)
-			continue
-		}
-		if err := query.Execute(s); err != nil {
-			t.Error(query.Error(err))
-		} else if !query.success() {
-			t.Error(query.failureMessage())
-		}
-	}
-}
-
-func TestServer_Query_LimitAndOffset(t *testing.T) {
-	t.Parallel()
-	s := OpenServer(NewConfig(), "")
-	defer s.Close()
-
-	if err := s.CreateDatabaseAndRetentionPolicy("db0", newRetentionPolicyInfo("rp0", 1, 0)); err != nil {
-		t.Fatal(err)
-	}
-	if err := s.MetaStore.SetDefaultRetentionPolicy("db0", "rp0"); err != nil {
-		t.Fatal(err)
-	}
-
-	writes := []string{
-		fmt.Sprintf(`limited,tennant=paul foo=2 %d`, mustParseTime(time.RFC3339Nano, "2009-11-10T23:00:02Z").UnixNano()),
-		fmt.Sprintf(`limited,tennant=paul foo=3 %d`, mustParseTime(time.RFC3339Nano, "2009-11-10T23:00:03Z").UnixNano()),
-		fmt.Sprintf(`limited,tennant=paul foo=4 %d`, mustParseTime(time.RFC3339Nano, "2009-11-10T23:00:04Z").UnixNano()),
-		fmt.Sprintf(`limited,tennant=todd foo=5 %d`, mustParseTime(time.RFC3339Nano, "2009-11-10T23:00:05Z").UnixNano()),
-	}
-
-	test := NewTest("db0", "rp0")
-	test.write = strings.Join(writes, "\n")
-
-	test.addQueries([]*Query{
-		&Query{
-			name:    "limit on points",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `select foo from "limited" LIMIT 2`,
-			exp:     `{"results":[{"series":[{"name":"limited","columns":["time","foo"],"values":[["2009-11-10T23:00:02Z",2],["2009-11-10T23:00:03Z",3]]}]}]}`,
-		},
-		&Query{
-			name:    "limit higher than the number of data points",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `select foo from "limited" LIMIT 20`,
-			exp:     `{"results":[{"series":[{"name":"limited","columns":["time","foo"],"values":[["2009-11-10T23:00:02Z",2],["2009-11-10T23:00:03Z",3],["2009-11-10T23:00:04Z",4],["2009-11-10T23:00:05Z",5]]}]}]}`,
-		},
-		&Query{
-			name:    "limit and offset",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `select foo from "limited" LIMIT 2 OFFSET 1`,
-			exp:     `{"results":[{"series":[{"name":"limited","columns":["time","foo"],"values":[["2009-11-10T23:00:03Z",3],["2009-11-10T23:00:04Z",4]]}]}]}`,
-		},
-		&Query{
-			name:    "limit + offset equal to total number of points",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `select foo from "limited" LIMIT 3 OFFSET 3`,
-			exp:     `{"results":[{"series":[{"name":"limited","columns":["time","foo"],"values":[["2009-11-10T23:00:05Z",5]]}]}]}`,
-		},
-		&Query{
-			name:    "limit - offset higher than number of points",
-			command: `select foo from "limited" LIMIT 2 OFFSET 20`,
-			exp:     `{"results":[{"series":[{"name":"limited","columns":["time","foo"]}]}]}`,
-			params:  url.Values{"db": []string{"db0"}},
-		},
-		&Query{
-			name:    "limit on points with group by time",
-			command: `select mean(foo) from "limited" WHERE time >= '2009-11-10T23:00:02Z' AND time < '2009-11-10T23:00:06Z' GROUP BY TIME(1s) LIMIT 2`,
-			exp:     `{"results":[{"series":[{"name":"limited","columns":["time","mean"],"values":[["2009-11-10T23:00:02Z",2],["2009-11-10T23:00:03Z",3]]}]}]}`,
-			params:  url.Values{"db": []string{"db0"}},
-		},
-		&Query{
-			name:    "limit higher than the number of data points with group by time",
-			command: `select mean(foo) from "limited" WHERE time >= '2009-11-10T23:00:02Z' AND time < '2009-11-10T23:00:06Z' GROUP BY TIME(1s) LIMIT 20`,
-			exp:     `{"results":[{"series":[{"name":"limited","columns":["time","mean"],"values":[["2009-11-10T23:00:02Z",2],["2009-11-10T23:00:03Z",3],["2009-11-10T23:00:04Z",4],["2009-11-10T23:00:05Z",5]]}]}]}`,
-			params:  url.Values{"db": []string{"db0"}},
-		},
-		&Query{
-			name:    "limit and offset with group by time",
-			command: `select mean(foo) from "limited" WHERE time >= '2009-11-10T23:00:02Z' AND time < '2009-11-10T23:00:06Z' GROUP BY TIME(1s) LIMIT 2 OFFSET 1`,
-			exp:     `{"results":[{"series":[{"name":"limited","columns":["time","mean"],"values":[["2009-11-10T23:00:03Z",3],["2009-11-10T23:00:04Z",4]]}]}]}`,
-			params:  url.Values{"db": []string{"db0"}},
-		},
-		&Query{
-			name:    "limit + offset equal to the  number of points with group by time",
-			command: `select mean(foo) from "limited" WHERE time >= '2009-11-10T23:00:02Z' AND time < '2009-11-10T23:00:06Z' GROUP BY TIME(1s) LIMIT 3 OFFSET 3`,
-			exp:     `{"results":[{"series":[{"name":"limited","columns":["time","mean"],"values":[["2009-11-10T23:00:05Z",5]]}]}]}`,
-			params:  url.Values{"db": []string{"db0"}},
-		},
-		&Query{
-			name:    "limit - offset higher than number of points with group by time",
-			command: `select mean(foo) from "limited" WHERE time >= '2009-11-10T23:00:02Z' AND time < '2009-11-10T23:00:06Z' GROUP BY TIME(1s) LIMIT 2 OFFSET 20`,
-			exp:     `{"results":[{}]}`,
-			params:  url.Values{"db": []string{"db0"}},
-		},
-		&Query{
-			name:    "limit higher than the number of data points should error",
-			command: `select mean(foo)  from "limited"  where  time > '2000-01-01T00:00:00Z' group by time(1s), * fill(0)  limit 2147483647`,
-			exp:     `{"results":[{"error":"too many points in the group by interval. maybe you forgot to specify a where time clause?"}]}`,
-			params:  url.Values{"db": []string{"db0"}},
-		},
-		&Query{
-			name:    "limit1 higher than MaxGroupBy but the number of data points is less than MaxGroupBy",
-			command: `select mean(foo)  from "limited"  where  time >= '2009-11-10T23:00:02Z' and time < '2009-11-10T23:00:03Z' group by time(1s), * fill(0)  limit 2147483647`,
-			exp:     `{"results":[{"series":[{"name":"limited","tags":{"tennant":"paul"},"columns":["time","mean"],"values":[["2009-11-10T23:00:02Z",2]]},{"name":"limited","tags":{"tennant":"todd"},"columns":["time","mean"],"values":[["2009-11-10T23:00:02Z",0]]}]}]}`,
-			params:  url.Values{"db": []string{"db0"}},
-		},
-	}...)
-
-	for i, query := range test.queries {
-		if i == 0 {
-			if err := test.init(s); err != nil {
-				t.Fatalf("test init failed: %s", err)
-			}
-		}
-		if query.skip {
-			t.Logf("SKIP:: %s", query.name)
-			continue
-		}
-		if err := query.Execute(s); err != nil {
-			t.Error(query.Error(err))
-		} else if !query.success() {
-			t.Error(query.failureMessage())
-		}
-	}
-}
-
-func TestServer_Query_Fill(t *testing.T) {
-	t.Parallel()
-	s := OpenServer(NewConfig(), "")
-	defer s.Close()
-
-	if err := s.CreateDatabaseAndRetentionPolicy("db0", newRetentionPolicyInfo("rp0", 1, 0)); err != nil {
-		t.Fatal(err)
-	}
-	if err := s.MetaStore.SetDefaultRetentionPolicy("db0", "rp0"); err != nil {
-		t.Fatal(err)
-	}
-
-	writes := []string{
-		fmt.Sprintf(`fills val=3 %d`, mustParseTime(time.RFC3339Nano, "2009-11-10T23:00:02Z").UnixNano()),
-		fmt.Sprintf(`fills val=5 %d`, mustParseTime(time.RFC3339Nano, "2009-11-10T23:00:03Z").UnixNano()),
-		fmt.Sprintf(`fills val=4 %d`, mustParseTime(time.RFC3339Nano, "2009-11-10T23:00:06Z").UnixNano()),
-		fmt.Sprintf(`fills val=10 %d`, mustParseTime(time.RFC3339Nano, "2009-11-10T23:00:16Z").UnixNano()),
-	}
-
-	test := NewTest("db0", "rp0")
-	test.write = strings.Join(writes, "\n")
-
-	test.addQueries([]*Query{
-		&Query{
-			name:    "fill with value",
-			command: `select mean(val) from fills where time >= '2009-11-10T23:00:00Z' and time < '2009-11-10T23:00:20Z' group by time(5s) FILL(1)`,
-			exp:     `{"results":[{"series":[{"name":"fills","columns":["time","mean"],"values":[["2009-11-10T23:00:00Z",4],["2009-11-10T23:00:05Z",4],["2009-11-10T23:00:10Z",1],["2009-11-10T23:00:15Z",10]]}]}]}`,
-			params:  url.Values{"db": []string{"db0"}},
-		},
-		&Query{
-			name:    "fill with value, WHERE all values match condition",
-			command: `select mean(val) from fills where time >= '2009-11-10T23:00:00Z' and time < '2009-11-10T23:00:20Z' and val < 50 group by time(5s) FILL(1)`,
-			exp:     `{"results":[{"series":[{"name":"fills","columns":["time","mean"],"values":[["2009-11-10T23:00:00Z",4],["2009-11-10T23:00:05Z",4],["2009-11-10T23:00:10Z",1],["2009-11-10T23:00:15Z",10]]}]}]}`,
-			params:  url.Values{"db": []string{"db0"}},
-		},
-		&Query{
-			name:    "fill with value, WHERE no values match condition",
-			command: `select mean(val) from fills where time >= '2009-11-10T23:00:00Z' and time < '2009-11-10T23:00:20Z' and val > 50 group by time(5s) FILL(1)`,
-			exp:     `{"results":[{"series":[{"name":"fills","columns":["time","mean"],"values":[["2009-11-10T23:00:00Z",1],["2009-11-10T23:00:05Z",1],["2009-11-10T23:00:10Z",1],["2009-11-10T23:00:15Z",1]]}]}]}`,
-			params:  url.Values{"db": []string{"db0"}},
-		},
-		&Query{
-			name:    "fill with previous",
-			command: `select mean(val) from fills where time >= '2009-11-10T23:00:00Z' and time < '2009-11-10T23:00:20Z' group by time(5s) FILL(previous)`,
-			exp:     `{"results":[{"series":[{"name":"fills","columns":["time","mean"],"values":[["2009-11-10T23:00:00Z",4],["2009-11-10T23:00:05Z",4],["2009-11-10T23:00:10Z",4],["2009-11-10T23:00:15Z",10]]}]}]}`,
-			params:  url.Values{"db": []string{"db0"}},
-		},
-		&Query{
-			name:    "fill with none, i.e. clear out nulls",
-			command: `select mean(val) from fills where time >= '2009-11-10T23:00:00Z' and time < '2009-11-10T23:00:20Z' group by time(5s) FILL(none)`,
-			exp:     `{"results":[{"series":[{"name":"fills","columns":["time","mean"],"values":[["2009-11-10T23:00:00Z",4],["2009-11-10T23:00:05Z",4],["2009-11-10T23:00:15Z",10]]}]}]}`,
-			params:  url.Values{"db": []string{"db0"}},
-		},
-		&Query{
-			name:    "fill defaults to null",
-			command: `select mean(val) from fills where time >= '2009-11-10T23:00:00Z' and time < '2009-11-10T23:00:20Z' group by time(5s)`,
-			exp:     `{"results":[{"series":[{"name":"fills","columns":["time","mean"],"values":[["2009-11-10T23:00:00Z",4],["2009-11-10T23:00:05Z",4],["2009-11-10T23:00:10Z",null],["2009-11-10T23:00:15Z",10]]}]}]}`,
-			params:  url.Values{"db": []string{"db0"}},
-		},
-		&Query{
-			name:    "fill with count aggregate defaults to null",
-			command: `select count(val) from fills where time >= '2009-11-10T23:00:00Z' and time < '2009-11-10T23:00:20Z' group by time(5s)`,
-			exp:     `{"results":[{"series":[{"name":"fills","columns":["time","count"],"values":[["2009-11-10T23:00:00Z",2],["2009-11-10T23:00:05Z",1],["2009-11-10T23:00:10Z",null],["2009-11-10T23:00:15Z",1]]}]}]}`,
-			params:  url.Values{"db": []string{"db0"}},
-		},
-		&Query{
-			name:    "fill with count aggregate defaults to null, no values match",
-			command: `select count(val) from fills where time >= '2009-11-10T23:00:00Z' and time < '2009-11-10T23:00:20Z' and val > 100 group by time(5s)`,
-			exp:     `{"results":[{"series":[{"name":"fills","columns":["time","count"],"values":[["2009-11-10T23:00:00Z",null],["2009-11-10T23:00:05Z",null],["2009-11-10T23:00:10Z",null],["2009-11-10T23:00:15Z",null]]}]}]}`,
-			params:  url.Values{"db": []string{"db0"}},
-		},
-		&Query{
-			name:    "fill with count aggregate specific value",
-			command: `select count(val) from fills where time >= '2009-11-10T23:00:00Z' and time < '2009-11-10T23:00:20Z' group by time(5s) fill(1234)`,
-			exp:     `{"results":[{"series":[{"name":"fills","columns":["time","count"],"values":[["2009-11-10T23:00:00Z",2],["2009-11-10T23:00:05Z",1],["2009-11-10T23:00:10Z",1234],["2009-11-10T23:00:15Z",1]]}]}]}`,
-			params:  url.Values{"db": []string{"db0"}},
-		},
-	}...)
-
-	for i, query := range test.queries {
-		if i == 0 {
-			if err := test.init(s); err != nil {
-				t.Fatalf("test init failed: %s", err)
-			}
-		}
-		if query.skip {
-			t.Logf("SKIP:: %s", query.name)
-			continue
-		}
-		if err := query.Execute(s); err != nil {
-			t.Error(query.Error(err))
-		} else if !query.success() {
-			t.Error(query.failureMessage())
-		}
-	}
-}
-
-func TestServer_Query_Chunk(t *testing.T) {
-	t.Parallel()
-	s := OpenServer(NewConfig(), "")
-	defer s.Close()
-
-	if err := s.CreateDatabaseAndRetentionPolicy("db0", newRetentionPolicyInfo("rp0", 1, 0)); err != nil {
-		t.Fatal(err)
-	}
-	if err := s.MetaStore.SetDefaultRetentionPolicy("db0", "rp0"); err != nil {
-		t.Fatal(err)
-	}
-
-	writes := make([]string, 10001) // 10,000 is the default chunking size, even when no chunking requested.
-	expectedValues := make([]string, len(writes))
-	for i := 0; i < len(writes); i++ {
-		writes[i] = fmt.Sprintf(`cpu value=%d %d`, i, time.Unix(0, int64(i)).UnixNano())
-		expectedValues[i] = fmt.Sprintf(`["%s",%d]`, time.Unix(0, int64(i)).UTC().Format(time.RFC3339Nano), i)
-	}
-	expected := fmt.Sprintf(`{"results":[{"series":[{"name":"cpu","columns":["time","value"],"values":[%s]}]}]}`, strings.Join(expectedValues, ","))
-
-	test := NewTest("db0", "rp0")
-	test.write = strings.Join(writes, "\n")
-
-	test.addQueries([]*Query{
-		&Query{
-			name:    "SELECT all values, no chunking",
-			command: `SELECT value FROM cpu`,
-			exp:     expected,
-			params:  url.Values{"db": []string{"db0"}},
-		},
-	}...)
-
-	for i, query := range test.queries {
-		if i == 0 {
-			if err := test.init(s); err != nil {
-				t.Fatalf("test init failed: %s", err)
-			}
-		}
-		if query.skip {
-			t.Logf("SKIP:: %s", query.name)
-			continue
-		}
-		if err := query.Execute(s); err != nil {
-			t.Error(query.Error(err))
-		} else if !query.success() {
-			t.Error(query.failureMessage())
-		}
-	}
-
-}
-
-func TestServer_Query_DropAndRecreateMeasurement(t *testing.T) {
-	t.Parallel()
-	s := OpenServer(NewConfig(), "")
-	defer s.Close()
-
-	if err := s.CreateDatabaseAndRetentionPolicy("db0", newRetentionPolicyInfo("rp0", 1, 0)); err != nil {
-		t.Fatal(err)
-	}
-	if err := s.MetaStore.SetDefaultRetentionPolicy("db0", "rp0"); err != nil {
-		t.Fatal(err)
-	}
-
-	writes := []string{
-		fmt.Sprintf(`cpu,host=serverA,region=uswest val=23.2 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:00Z").UnixNano()),
-		fmt.Sprintf(`memory,host=serverB,region=uswest val=33.2 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:01Z").UnixNano()),
-	}
-
-	test := NewTest("db0", "rp0")
-	test.write = strings.Join(writes, "\n")
-
-	test.addQueries([]*Query{
-		&Query{
-			name:    "Drop Measurement, series tags preserved tests",
-			command: `SHOW MEASUREMENTS`,
-			exp:     `{"results":[{"series":[{"name":"measurements","columns":["name"],"values":[["cpu"],["memory"]]}]}]}`,
-			params:  url.Values{"db": []string{"db0"}},
-		},
-		&Query{
-			name:    "show series",
-			command: `SHOW SERIES`,
-			exp:     `{"results":[{"series":[{"name":"cpu","columns":["_key","host","region"],"values":[["cpu,host=serverA,region=uswest","serverA","uswest"]]},{"name":"memory","columns":["_key","host","region"],"values":[["memory,host=serverB,region=uswest","serverB","uswest"]]}]}]}`,
-			params:  url.Values{"db": []string{"db0"}},
-		},
-		&Query{
-			name:    "ensure we can query for memory with both tags",
-			command: `SELECT * FROM memory where region='uswest' and host='serverB' GROUP BY *`,
-			exp:     `{"results":[{"series":[{"name":"memory","tags":{"host":"serverB","region":"uswest"},"columns":["time","val"],"values":[["2000-01-01T00:00:01Z",33.2]]}]}]}`,
-			params:  url.Values{"db": []string{"db0"}},
-		},
-		&Query{
-			name:    "drop measurement cpu",
-			command: `DROP MEASUREMENT cpu`,
-			exp:     `{"results":[{}]}`,
-			params:  url.Values{"db": []string{"db0"}},
-		},
-		&Query{
-			name:    "verify measurements",
-			command: `SHOW MEASUREMENTS`,
-			exp:     `{"results":[{"series":[{"name":"measurements","columns":["name"],"values":[["memory"]]}]}]}`,
-			params:  url.Values{"db": []string{"db0"}},
-		},
-		&Query{
-			name:    "verify series",
-			command: `SHOW SERIES`,
-			exp:     `{"results":[{"series":[{"name":"memory","columns":["_key","host","region"],"values":[["memory,host=serverB,region=uswest","serverB","uswest"]]}]}]}`,
-			params:  url.Values{"db": []string{"db0"}},
-		},
-		&Query{
-			name:    "verify cpu measurement is gone",
-			command: `SELECT * FROM cpu`,
-			exp:     `{"results":[{}]}`,
-			params:  url.Values{"db": []string{"db0"}},
-		},
-		&Query{
-			name:    "verify selecting from a tag 'host' still works",
-			command: `SELECT * FROM memory where host='serverB' GROUP BY *`,
-			exp:     `{"results":[{"series":[{"name":"memory","tags":{"host":"serverB","region":"uswest"},"columns":["time","val"],"values":[["2000-01-01T00:00:01Z",33.2]]}]}]}`,
-			params:  url.Values{"db": []string{"db0"}},
-		},
-		&Query{
-			name:    "verify selecting from a tag 'region' still works",
-			command: `SELECT * FROM memory where region='uswest' GROUP BY *`,
-			exp:     `{"results":[{"series":[{"name":"memory","tags":{"host":"serverB","region":"uswest"},"columns":["time","val"],"values":[["2000-01-01T00:00:01Z",33.2]]}]}]}`,
-			params:  url.Values{"db": []string{"db0"}},
-		},
-		&Query{
-			name:    "verify selecting from a tag 'host' and 'region' still works",
-			command: `SELECT * FROM memory where region='uswest' and host='serverB' GROUP BY *`,
-			exp:     `{"results":[{"series":[{"name":"memory","tags":{"host":"serverB","region":"uswest"},"columns":["time","val"],"values":[["2000-01-01T00:00:01Z",33.2]]}]}]}`,
-			params:  url.Values{"db": []string{"db0"}},
-		},
-		&Query{
-			name:    "Drop non-existant measurement",
-			command: `DROP MEASUREMENT doesntexist`,
-			exp:     `{"results":[{"error":"measurement not found: doesntexist"}]}`,
-			params:  url.Values{"db": []string{"db0"}},
-		},
-	}...)
-
-	// Test that re-inserting the measurement works fine.
-	for i, query := range test.queries {
-		if i == 0 {
-			if err := test.init(s); err != nil {
-				t.Fatalf("test init failed: %s", err)
-			}
-		}
-		if query.skip {
-			t.Logf("SKIP:: %s", query.name)
-			continue
-		}
-		if err := query.Execute(s); err != nil {
-			t.Error(query.Error(err))
-		} else if !query.success() {
-			t.Error(query.failureMessage())
-		}
-	}
-
-	test = NewTest("db0", "rp0")
-	test.write = strings.Join(writes, "\n")
-
-	test.addQueries([]*Query{
-		&Query{
-			name:    "verify measurements after recreation",
-			command: `SHOW MEASUREMENTS`,
-			exp:     `{"results":[{"series":[{"name":"measurements","columns":["name"],"values":[["cpu"],["memory"]]}]}]}`,
-			params:  url.Values{"db": []string{"db0"}},
-		},
-		&Query{
-			name:    "verify cpu measurement has been re-inserted",
-			command: `SELECT * FROM cpu GROUP BY *`,
-			exp:     `{"results":[{"series":[{"name":"cpu","tags":{"host":"serverA","region":"uswest"},"columns":["time","val"],"values":[["2000-01-01T00:00:00Z",23.2]]}]}]}`,
-			params:  url.Values{"db": []string{"db0"}},
-		},
-	}...)
-
-	for i, query := range test.queries {
-		if i == 0 {
-			if err := test.init(s); err != nil {
-				t.Fatalf("test init failed: %s", err)
-			}
-		}
-		if query.skip {
-			t.Logf("SKIP:: %s", query.name)
-			continue
-		}
-		if err := query.Execute(s); err != nil {
-			t.Error(query.Error(err))
-		} else if !query.success() {
-			t.Error(query.failureMessage())
-		}
-	}
-}
-
-func TestServer_Query_ShowSeries(t *testing.T) {
-	t.Parallel()
-	s := OpenServer(NewConfig(), "")
-	defer s.Close()
-
-	if err := s.CreateDatabaseAndRetentionPolicy("db0", newRetentionPolicyInfo("rp0", 1, 0)); err != nil {
-		t.Fatal(err)
-	}
-	if err := s.MetaStore.SetDefaultRetentionPolicy("db0", "rp0"); err != nil {
-		t.Fatal(err)
-	}
-
-	writes := []string{
-		fmt.Sprintf(`cpu,host=server01 value=100 %d`, mustParseTime(time.RFC3339Nano, "2009-11-10T23:00:01Z").UnixNano()),
-		fmt.Sprintf(`cpu,host=server01,region=uswest value=100 %d`, mustParseTime(time.RFC3339Nano, "2009-11-10T23:00:02Z").UnixNano()),
-		fmt.Sprintf(`cpu,host=server01,region=useast value=100 %d`, mustParseTime(time.RFC3339Nano, "2009-11-10T23:00:03Z").UnixNano()),
-		fmt.Sprintf(`cpu,host=server02,region=useast value=100 %d`, mustParseTime(time.RFC3339Nano, "2009-11-10T23:00:04Z").UnixNano()),
-		fmt.Sprintf(`gpu,host=server02,region=useast value=100 %d`, mustParseTime(time.RFC3339Nano, "2009-11-10T23:00:05Z").UnixNano()),
-		fmt.Sprintf(`gpu,host=server03,region=caeast value=100 %d`, mustParseTime(time.RFC3339Nano, "2009-11-10T23:00:06Z").UnixNano()),
-		fmt.Sprintf(`disk,host=server03,region=caeast value=100 %d`, mustParseTime(time.RFC3339Nano, "2009-11-10T23:00:07Z").UnixNano()),
-	}
-
-	test := NewTest("db0", "rp0")
-	test.write = strings.Join(writes, "\n")
-
-	test.addQueries([]*Query{
-		&Query{
-			name:    `show series`,
-			command: "SHOW SERIES",
-			exp:     `{"results":[{"series":[{"name":"cpu","columns":["_key","host","region"],"values":[["cpu,host=server01","server01",""],["cpu,host=server01,region=uswest","server01","uswest"],["cpu,host=server01,region=useast","server01","useast"],["cpu,host=server02,region=useast","server02","useast"]]},{"name":"disk","columns":["_key","host","region"],"values":[["disk,host=server03,region=caeast","server03","caeast"]]},{"name":"gpu","columns":["_key","host","region"],"values":[["gpu,host=server02,region=useast","server02","useast"],["gpu,host=server03,region=caeast","server03","caeast"]]}]}]}`,
-			params:  url.Values{"db": []string{"db0"}},
-		},
-		&Query{
-			name:    `show series from measurement`,
-			command: "SHOW SERIES FROM cpu",
-			exp:     `{"results":[{"series":[{"name":"cpu","columns":["_key","host","region"],"values":[["cpu,host=server01","server01",""],["cpu,host=server01,region=uswest","server01","uswest"],["cpu,host=server01,region=useast","server01","useast"],["cpu,host=server02,region=useast","server02","useast"]]}]}]}`,
-			params:  url.Values{"db": []string{"db0"}},
-		},
-		&Query{
-			name:    `show series from regular expression`,
-			command: "SHOW SERIES FROM /[cg]pu/",
-			exp:     `{"results":[{"series":[{"name":"cpu","columns":["_key","host","region"],"values":[["cpu,host=server01","server01",""],["cpu,host=server01,region=uswest","server01","uswest"],["cpu,host=server01,region=useast","server01","useast"],["cpu,host=server02,region=useast","server02","useast"]]},{"name":"gpu","columns":["_key","host","region"],"values":[["gpu,host=server02,region=useast","server02","useast"],["gpu,host=server03,region=caeast","server03","caeast"]]}]}]}`,
-			params:  url.Values{"db": []string{"db0"}},
-		},
-		&Query{
-			name:    `show series with where tag`,
-			command: "SHOW SERIES WHERE region = 'uswest'",
-			exp:     `{"results":[{"series":[{"name":"cpu","columns":["_key","host","region"],"values":[["cpu,host=server01,region=uswest","server01","uswest"]]}]}]}`,
-			params:  url.Values{"db": []string{"db0"}},
-		},
-		&Query{
-			name:    `show series where tag matches regular expression`,
-			command: "SHOW SERIES WHERE region =~ /ca.*/",
-			exp:     `{"results":[{"series":[{"name":"disk","columns":["_key","host","region"],"values":[["disk,host=server03,region=caeast","server03","caeast"]]},{"name":"gpu","columns":["_key","host","region"],"values":[["gpu,host=server03,region=caeast","server03","caeast"]]}]}]}`,
-			params:  url.Values{"db": []string{"db0"}},
-		},
-		&Query{
-			name:    `show series`,
-			command: "SHOW SERIES WHERE host !~ /server0[12]/",
-			exp:     `{"results":[{"series":[{"name":"disk","columns":["_key","host","region"],"values":[["disk,host=server03,region=caeast","server03","caeast"]]},{"name":"gpu","columns":["_key","host","region"],"values":[["gpu,host=server03,region=caeast","server03","caeast"]]}]}]}`,
-			params:  url.Values{"db": []string{"db0"}},
-		},
-		&Query{
-			name:    `show series with from and where`,
-			command: "SHOW SERIES FROM cpu WHERE region = 'useast'",
-			exp:     `{"results":[{"series":[{"name":"cpu","columns":["_key","host","region"],"values":[["cpu,host=server01,region=useast","server01","useast"],["cpu,host=server02,region=useast","server02","useast"]]}]}]}`,
-			params:  url.Values{"db": []string{"db0"}},
-		},
-		&Query{
-			name:    `show series with WHERE time should fail`,
-			command: "SHOW SERIES WHERE time > now() - 1h",
-			exp:     `{"results":[{"error":"SHOW SERIES doesn't support time in WHERE clause"}]}`,
-			params:  url.Values{"db": []string{"db0"}},
-		},
-		&Query{
-			name:    `show series with WHERE field should fail`,
-			command: "SHOW SERIES WHERE value > 10.0",
-			exp:     `{"results":[{"error":"SHOW SERIES doesn't support fields in WHERE clause"}]}`,
-			params:  url.Values{"db": []string{"db0"}},
-		},
-	}...)
-
-	for i, query := range test.queries {
-		if i == 0 {
-			if err := test.init(s); err != nil {
-				t.Fatalf("test init failed: %s", err)
-			}
-		}
-		if query.skip {
-			t.Logf("SKIP:: %s", query.name)
-			continue
-		}
-		if err := query.Execute(s); err != nil {
-			t.Error(query.Error(err))
-		} else if !query.success() {
-			t.Error(query.failureMessage())
-		}
-	}
-}
-
-func TestServer_Query_ShowMeasurements(t *testing.T) {
-	t.Parallel()
-	s := OpenServer(NewConfig(), "")
-	defer s.Close()
-
-	if err := s.CreateDatabaseAndRetentionPolicy("db0", newRetentionPolicyInfo("rp0", 1, 0)); err != nil {
-		t.Fatal(err)
-	}
-	if err := s.MetaStore.SetDefaultRetentionPolicy("db0", "rp0"); err != nil {
-		t.Fatal(err)
-	}
-
-	writes := []string{
-		fmt.Sprintf(`cpu,host=server01 value=100 %d`, mustParseTime(time.RFC3339Nano, "2009-11-10T23:00:00Z").UnixNano()),
-		fmt.Sprintf(`cpu,host=server01,region=uswest value=100 %d`, mustParseTime(time.RFC3339Nano, "2009-11-10T23:00:00Z").UnixNano()),
-		fmt.Sprintf(`cpu,host=server01,region=useast value=100 %d`, mustParseTime(time.RFC3339Nano, "2009-11-10T23:00:00Z").UnixNano()),
-		fmt.Sprintf(`cpu,host=server02,region=useast value=100 %d`, mustParseTime(time.RFC3339Nano, "2009-11-10T23:00:00Z").UnixNano()),
-		fmt.Sprintf(`gpu,host=server02,region=useast value=100 %d`, mustParseTime(time.RFC3339Nano, "2009-11-10T23:00:00Z").UnixNano()),
-		fmt.Sprintf(`gpu,host=server02,region=caeast value=100 %d`, mustParseTime(time.RFC3339Nano, "2009-11-10T23:00:00Z").UnixNano()),
-		fmt.Sprintf(`other,host=server03,region=caeast value=100 %d`, mustParseTime(time.RFC3339Nano, "2009-11-10T23:00:00Z").UnixNano()),
-	}
-
-	test := NewTest("db0", "rp0")
-	test.write = strings.Join(writes, "\n")
-
-	test.addQueries([]*Query{
-		&Query{
-			name:    `show measurements with limit 2`,
-			command: "SHOW MEASUREMENTS LIMIT 2",
-			exp:     `{"results":[{"series":[{"name":"measurements","columns":["name"],"values":[["cpu"],["gpu"]]}]}]}`,
-			params:  url.Values{"db": []string{"db0"}},
-		},
-		&Query{
-			name:    `show measurements using WITH`,
-			command: "SHOW MEASUREMENTS WITH MEASUREMENT = cpu",
-			exp:     `{"results":[{"series":[{"name":"measurements","columns":["name"],"values":[["cpu"]]}]}]}`,
-			params:  url.Values{"db": []string{"db0"}},
-		},
-		&Query{
-			name:    `show measurements using WITH and regex`,
-			command: "SHOW MEASUREMENTS WITH MEASUREMENT =~ /[cg]pu/",
-			exp:     `{"results":[{"series":[{"name":"measurements","columns":["name"],"values":[["cpu"],["gpu"]]}]}]}`,
-			params:  url.Values{"db": []string{"db0"}},
-		},
-		&Query{
-			name:    `show measurements using WITH and regex - no matches`,
-			command: "SHOW MEASUREMENTS WITH MEASUREMENT =~ /.*zzzzz.*/",
-			exp:     `{"results":[{}]}`,
-			params:  url.Values{"db": []string{"db0"}},
-		},
-		&Query{
-			name:    `show measurements where tag matches regular expression`,
-			command: "SHOW MEASUREMENTS WHERE region =~ /ca.*/",
-			exp:     `{"results":[{"series":[{"name":"measurements","columns":["name"],"values":[["gpu"],["other"]]}]}]}`,
-			params:  url.Values{"db": []string{"db0"}},
-		},
-		&Query{
-			name:    `show measurements where tag does not match a regular expression`,
-			command: "SHOW MEASUREMENTS WHERE region !~ /ca.*/",
-			exp:     `{"results":[{"series":[{"name":"measurements","columns":["name"],"values":[["cpu"]]}]}]}`,
-			params:  url.Values{"db": []string{"db0"}},
-		},
-		&Query{
-			name:    `show measurements with time in WHERE clauses errors`,
-			command: `SHOW MEASUREMENTS WHERE time > now() - 1h`,
-			exp:     `{"results":[{"error":"SHOW MEASUREMENTS doesn't support time in WHERE clause"}]}`,
-			params:  url.Values{"db": []string{"db0"}},
-		},
-	}...)
-
-	for i, query := range test.queries {
-		if i == 0 {
-			if err := test.init(s); err != nil {
-				t.Fatalf("test init failed: %s", err)
-			}
-		}
-		if query.skip {
-			t.Logf("SKIP:: %s", query.name)
-			continue
-		}
-		if err := query.Execute(s); err != nil {
-			t.Error(query.Error(err))
-		} else if !query.success() {
-			t.Error(query.failureMessage())
-		}
-	}
-}
-
-func TestServer_Query_ShowTagKeys(t *testing.T) {
-	t.Parallel()
-	s := OpenServer(NewConfig(), "")
-	defer s.Close()
-
-	if err := s.CreateDatabaseAndRetentionPolicy("db0", newRetentionPolicyInfo("rp0", 1, 0)); err != nil {
-		t.Fatal(err)
-	}
-	if err := s.MetaStore.SetDefaultRetentionPolicy("db0", "rp0"); err != nil {
-		t.Fatal(err)
-	}
-
-	writes := []string{
-		fmt.Sprintf(`cpu,host=server01 value=100 %d`, mustParseTime(time.RFC3339Nano, "2009-11-10T23:00:00Z").UnixNano()),
-		fmt.Sprintf(`cpu,host=server01,region=uswest value=100 %d`, mustParseTime(time.RFC3339Nano, "2009-11-10T23:00:00Z").UnixNano()),
-		fmt.Sprintf(`cpu,host=server01,region=useast value=100 %d`, mustParseTime(time.RFC3339Nano, "2009-11-10T23:00:00Z").UnixNano()),
-		fmt.Sprintf(`cpu,host=server02,region=useast value=100 %d`, mustParseTime(time.RFC3339Nano, "2009-11-10T23:00:00Z").UnixNano()),
-		fmt.Sprintf(`gpu,host=server02,region=useast value=100 %d`, mustParseTime(time.RFC3339Nano, "2009-11-10T23:00:00Z").UnixNano()),
-		fmt.Sprintf(`gpu,host=server03,region=caeast value=100 %d`, mustParseTime(time.RFC3339Nano, "2009-11-10T23:00:00Z").UnixNano()),
-		fmt.Sprintf(`disk,host=server03,region=caeast value=100 %d`, mustParseTime(time.RFC3339Nano, "2009-11-10T23:00:00Z").UnixNano()),
-	}
-
-	test := NewTest("db0", "rp0")
-	test.write = strings.Join(writes, "\n")
-
-	test.addQueries([]*Query{
-		&Query{
-			name:    `show tag keys`,
-			command: "SHOW TAG KEYS",
-			exp:     `{"results":[{"series":[{"name":"cpu","columns":["tagKey"],"values":[["host"],["region"]]},{"name":"disk","columns":["tagKey"],"values":[["host"],["region"]]},{"name":"gpu","columns":["tagKey"],"values":[["host"],["region"]]}]}]}`,
-			params:  url.Values{"db": []string{"db0"}},
-		},
-		&Query{
-			name:    "show tag keys from",
-			command: "SHOW TAG KEYS FROM cpu",
-			exp:     `{"results":[{"series":[{"name":"cpu","columns":["tagKey"],"values":[["host"],["region"]]}]}]}`,
-			params:  url.Values{"db": []string{"db0"}},
-		},
-		&Query{
-			name:    "show tag keys from regex",
-			command: "SHOW TAG KEYS FROM /[cg]pu/",
-			exp:     `{"results":[{"series":[{"name":"cpu","columns":["tagKey"],"values":[["host"],["region"]]},{"name":"gpu","columns":["tagKey"],"values":[["host"],["region"]]}]}]}`,
-			params:  url.Values{"db": []string{"db0"}},
-		},
-		&Query{
-			name:    "show tag keys measurement not found",
-			command: "SHOW TAG KEYS FROM doesntexist",
-			exp:     `{"results":[{}]}`,
-			params:  url.Values{"db": []string{"db0"}},
-		},
-		&Query{
-			name:    "show tag keys with time in WHERE clause errors",
-			command: "SHOW TAG KEYS FROM cpu WHERE time > now() - 1h",
-			exp:     `{"results":[{"error":"SHOW TAG KEYS doesn't support time in WHERE clause"}]}`,
-			params:  url.Values{"db": []string{"db0"}},
-		},
-		&Query{
-			name:    "show tag values with key",
-			command: "SHOW TAG VALUES WITH KEY = host",
-			exp:     `{"results":[{"series":[{"name":"hostTagValues","columns":["host"],"values":[["server01"],["server02"],["server03"]]}]}]}`,
-			params:  url.Values{"db": []string{"db0"}},
-		},
-		&Query{
-			name:    `show tag values with key and where`,
-			command: `SHOW TAG VALUES FROM cpu WITH KEY = host WHERE region = 'uswest'`,
-			exp:     `{"results":[{"series":[{"name":"hostTagValues","columns":["host"],"values":[["server01"]]}]}]}`,
-			params:  url.Values{"db": []string{"db0"}},
-		},
-		&Query{
-			name:    `show tag values with key and where matches regular expression`,
-			command: `SHOW TAG VALUES WITH KEY = host WHERE region =~ /ca.*/`,
-			exp:     `{"results":[{"series":[{"name":"hostTagValues","columns":["host"],"values":[["server03"]]}]}]}`,
-			params:  url.Values{"db": []string{"db0"}},
-		},
-		&Query{
-			name:    `show tag values with key and where does not matche regular expression`,
-			command: `SHOW TAG VALUES WITH KEY = region WHERE host !~ /server0[12]/`,
-			exp:     `{"results":[{"series":[{"name":"regionTagValues","columns":["region"],"values":[["caeast"]]}]}]}`,
-			params:  url.Values{"db": []string{"db0"}},
-		},
-		&Query{
-			name:    `show tag values with key in and where does not matche regular expression`,
-			command: `SHOW TAG VALUES FROM cpu WITH KEY IN (host, region) WHERE region = 'uswest'`,
-			exp:     `{"results":[{"series":[{"name":"hostTagValues","columns":["host"],"values":[["server01"]]},{"name":"regionTagValues","columns":["region"],"values":[["uswest"]]}]}]}`,
-			params:  url.Values{"db": []string{"db0"}},
-		},
-		&Query{
-			name:    `show tag values with key and measurement matches regular expression`,
-			command: `SHOW TAG VALUES FROM /[cg]pu/ WITH KEY = host`,
-			exp:     `{"results":[{"series":[{"name":"hostTagValues","columns":["host"],"values":[["server01"],["server02"],["server03"]]}]}]}`,
-			params:  url.Values{"db": []string{"db0"}},
-		},
-		&Query{
-			name:    `show tag values with key and time in WHERE clause should error`,
-			command: `SHOW TAG VALUES WITH KEY = host WHERE time > now() - 1h`,
-			exp:     `{"results":[{"error":"SHOW TAG VALUES doesn't support time in WHERE clause"}]}`,
-			params:  url.Values{"db": []string{"db0"}},
-		},
-	}...)
-
-	for i, query := range test.queries {
-		if i == 0 {
-			if err := test.init(s); err != nil {
-				t.Fatalf("test init failed: %s", err)
-			}
-		}
-		if query.skip {
-			t.Logf("SKIP:: %s", query.name)
-			continue
-		}
-		if err := query.Execute(s); err != nil {
-			t.Error(query.Error(err))
-		} else if !query.success() {
-			t.Error(query.failureMessage())
-		}
-	}
-}
-
-func TestServer_Query_ShowFieldKeys(t *testing.T) {
-	t.Parallel()
-	s := OpenServer(NewConfig(), "")
-	defer s.Close()
-
-	if err := s.CreateDatabaseAndRetentionPolicy("db0", newRetentionPolicyInfo("rp0", 1, 0)); err != nil {
-		t.Fatal(err)
-	}
-	if err := s.MetaStore.SetDefaultRetentionPolicy("db0", "rp0"); err != nil {
-		t.Fatal(err)
-	}
-
-	writes := []string{
-		fmt.Sprintf(`cpu,host=server01 field1=100 %d`, mustParseTime(time.RFC3339Nano, "2009-11-10T23:00:00Z").UnixNano()),
-		fmt.Sprintf(`cpu,host=server01,region=uswest field1=200,field2=300,field3=400 %d`, mustParseTime(time.RFC3339Nano, "2009-11-10T23:00:00Z").UnixNano()),
-		fmt.Sprintf(`cpu,host=server01,region=useast field1=200,field2=300,field3=400 %d`, mustParseTime(time.RFC3339Nano, "2009-11-10T23:00:00Z").UnixNano()),
-		fmt.Sprintf(`cpu,host=server02,region=useast field1=200,field2=300,field3=400 %d`, mustParseTime(time.RFC3339Nano, "2009-11-10T23:00:00Z").UnixNano()),
-		fmt.Sprintf(`gpu,host=server01,region=useast field4=200,field5=300 %d`, mustParseTime(time.RFC3339Nano, "2009-11-10T23:00:00Z").UnixNano()),
-		fmt.Sprintf(`gpu,host=server03,region=caeast field6=200,field7=300 %d`, mustParseTime(time.RFC3339Nano, "2009-11-10T23:00:00Z").UnixNano()),
-		fmt.Sprintf(`disk,host=server03,region=caeast field8=200,field9=300 %d`, mustParseTime(time.RFC3339Nano, "2009-11-10T23:00:00Z").UnixNano()),
-	}
-
-	test := NewTest("db0", "rp0")
-	test.write = strings.Join(writes, "\n")
-
-	test.addQueries([]*Query{
-		&Query{
-			name:    `show field keys`,
-			command: `SHOW FIELD KEYS`,
-			exp:     `{"results":[{"series":[{"name":"cpu","columns":["fieldKey"],"values":[["field1"],["field2"],["field3"]]},{"name":"disk","columns":["fieldKey"],"values":[["field8"],["field9"]]},{"name":"gpu","columns":["fieldKey"],"values":[["field4"],["field5"],["field6"],["field7"]]}]}]}`,
-			params:  url.Values{"db": []string{"db0"}},
-		},
-		&Query{
-			name:    `show field keys from measurement`,
-			command: `SHOW FIELD KEYS FROM cpu`,
-			exp:     `{"results":[{"series":[{"name":"cpu","columns":["fieldKey"],"values":[["field1"],["field2"],["field3"]]}]}]}`,
-			params:  url.Values{"db": []string{"db0"}},
-		},
-		&Query{
-			name:    `show field keys measurement with regex`,
-			command: `SHOW FIELD KEYS FROM /[cg]pu/`,
-			exp:     `{"results":[{"series":[{"name":"cpu","columns":["fieldKey"],"values":[["field1"],["field2"],["field3"]]},{"name":"gpu","columns":["fieldKey"],"values":[["field4"],["field5"],["field6"],["field7"]]}]}]}`,
-			params:  url.Values{"db": []string{"db0"}},
-		},
-	}...)
-
-	for i, query := range test.queries {
-		if i == 0 {
-			if err := test.init(s); err != nil {
-				t.Fatalf("test init failed: %s", err)
-			}
-		}
-		if query.skip {
-			t.Logf("SKIP:: %s", query.name)
-			continue
-		}
-		if err := query.Execute(s); err != nil {
-			t.Error(query.Error(err))
-		} else if !query.success() {
-			t.Error(query.failureMessage())
-		}
-	}
-}
-
-func TestServer_ContinuousQuery(t *testing.T) {
-	t.Skip()
-	t.Parallel()
-	s := OpenServer(NewConfig(), "")
-	defer s.Close()
-
-	if err := s.CreateDatabaseAndRetentionPolicy("db0", newRetentionPolicyInfo("rp0", 1, 0)); err != nil {
-		t.Fatal(err)
-	}
-	if err := s.MetaStore.SetDefaultRetentionPolicy("db0", "rp0"); err != nil {
-		t.Fatal(err)
-	}
-
-	runTest := func(test *Test, t *testing.T) {
-		for i, query := range test.queries {
-			if i == 0 {
-				if err := test.init(s); err != nil {
-					t.Fatalf("test init failed: %s", err)
-				}
-			}
-			if query.skip {
-				t.Logf("SKIP:: %s", query.name)
-				continue
-			}
-			if err := query.Execute(s); err != nil {
-				t.Error(query.Error(err))
-			} else if !query.success() {
-				t.Error(query.failureMessage())
-			}
-		}
-	}
-
-	// Start times of CQ intervals.
-	interval0 := time.Now().Add(-time.Second).Round(time.Second * 5)
-	interval1 := interval0.Add(-time.Second * 5)
-	interval2 := interval0.Add(-time.Second * 10)
-	interval3 := interval0.Add(-time.Second * 15)
-
-	writes := []string{
-		// Point too far in the past for CQ to pick up.
-		fmt.Sprintf(`cpu,host=server01,region=uswest value=100 %d`, interval3.Add(time.Second).UnixNano()),
-
-		// Points two intervals ago.
-		fmt.Sprintf(`cpu,host=server01 value=100 %d`, interval2.Add(time.Second).UnixNano()),
-		fmt.Sprintf(`cpu,host=server01,region=uswest value=100 %d`, interval2.Add(time.Second*2).UnixNano()),
-		fmt.Sprintf(`cpu,host=server01,region=useast value=100 %d`, interval2.Add(time.Second*3).UnixNano()),
-
-		// Points one interval ago.
-		fmt.Sprintf(`gpu,host=server02,region=useast value=100 %d`, interval1.Add(time.Second).UnixNano()),
-		fmt.Sprintf(`gpu,host=server03,region=caeast value=100 %d`, interval1.Add(time.Second*2).UnixNano()),
-
-		// Points in the current interval.
-		fmt.Sprintf(`gpu,host=server03,region=caeast value=100 %d`, interval0.Add(time.Second).UnixNano()),
-		fmt.Sprintf(`disk,host=server03,region=caeast value=100 %d`, interval0.Add(time.Second*2).UnixNano()),
-	}
-
-	test := NewTest("db0", "rp0")
-	test.write = strings.Join(writes, "\n")
-	test.addQueries([]*Query{
-		&Query{
-			name:    `create another retention policy for CQ to write into`,
-			command: `CREATE RETENTION POLICY rp1 ON db0 DURATION 1h REPLICATION 1`,
-			exp:     `{"results":[{}]}`,
-		},
-		&Query{
-			name:    "create continuous query with backreference",
-			command: `CREATE CONTINUOUS QUERY "cq1" ON db0 BEGIN SELECT count(value) INTO "rp1".:MEASUREMENT FROM /[cg]pu/ GROUP BY time(5s) END`,
-			exp:     `{"results":[{}]}`,
-		},
-		&Query{
-			name:    `create another retention policy for CQ to write into`,
-			command: `CREATE RETENTION POLICY rp2 ON db0 DURATION 1h REPLICATION 1`,
-			exp:     `{"results":[{}]}`,
-		},
-		&Query{
-			name:    "create continuous query with backreference and group by time",
-			command: `CREATE CONTINUOUS QUERY "cq2" ON db0 BEGIN SELECT count(value) INTO "rp2".:MEASUREMENT FROM /[cg]pu/ GROUP BY time(5s), * END`,
-			exp:     `{"results":[{}]}`,
-		},
-		&Query{
-			name:    `show continuous queries`,
-			command: `SHOW CONTINUOUS QUERIES`,
-			exp:     `{"results":[{"series":[{"name":"db0","columns":["name","query"],"values":[["cq1","CREATE CONTINUOUS QUERY cq1 ON db0 BEGIN SELECT count(value) INTO \"db0\".\"rp1\".:MEASUREMENT FROM \"db0\".\"rp0\"./[cg]pu/ GROUP BY time(5s) END"],["cq2","CREATE CONTINUOUS QUERY cq2 ON db0 BEGIN SELECT count(value) INTO \"db0\".\"rp2\".:MEASUREMENT FROM \"db0\".\"rp0\"./[cg]pu/ GROUP BY time(5s), * END"]]}]}]}`,
-		},
-	}...)
-
-	// Run first test to create CQs.
-	runTest(&test, t)
-
-	// Trigger CQs to run.
-	u := fmt.Sprintf("%s/data/process_continuous_queries?time=%d", s.URL(), interval0.UnixNano())
-	if _, err := s.HTTPPost(u, nil); err != nil {
-		t.Fatal(err)
-	}
-
-	// Wait for CQs to run. TODO: fix this ugly hack
-	time.Sleep(time.Second * 5)
-
-	// Setup tests to check the CQ results.
-	test2 := NewTest("db0", "rp1")
-	test2.addQueries([]*Query{
-		&Query{
-			name:    "check results of cq1",
-			command: `SELECT * FROM "rp1"./[cg]pu/`,
-			exp:     `{"results":[{"series":[{"name":"cpu","columns":["time","count","host","region","value"],"values":[["` + interval2.UTC().Format(time.RFC3339Nano) + `",3,null,null,null]]},{"name":"gpu","columns":["time","count","host","region","value"],"values":[["` + interval1.UTC().Format(time.RFC3339Nano) + `",2,null,null,null],["` + interval0.UTC().Format(time.RFC3339Nano) + `",1,null,null,null]]}]}]}`,
-			params:  url.Values{"db": []string{"db0"}},
-		},
-		// TODO: restore this test once this is fixed: https://github.com/influxdb/influxdb/issues/3968
-		&Query{
-			skip:    true,
-			name:    "check results of cq2",
-			command: `SELECT * FROM "rp2"./[cg]pu/`,
-			exp:     `{"results":[{"series":[{"name":"cpu","columns":["time","count","host","region","value"],"values":[["` + interval2.UTC().Format(time.RFC3339Nano) + `",1,"server01","uswest",null],["` + interval2.UTC().Format(time.RFC3339Nano) + `",1,"server01","",null],["` + interval2.UTC().Format(time.RFC3339Nano) + `",1,"server01","useast",null]]},{"name":"gpu","columns":["time","count","host","region","value"],"values":[["` + interval1.UTC().Format(time.RFC3339Nano) + `",1,"server02","useast",null],["` + interval1.UTC().Format(time.RFC3339Nano) + `",1,"server03","caeast",null],["` + interval0.UTC().Format(time.RFC3339Nano) + `",1,"server03","caeast",null]]}]}]}`,
-			params:  url.Values{"db": []string{"db0"}},
-		},
-	}...)
-
-	// Run second test to check CQ results.
-	runTest(&test2, t)
-}
-
-// Tests that a known CQ query with concurrent writes does not deadlock the server
-func TestServer_ContinuousQuery_Deadlock(t *testing.T) {
-
-	// Skip until #3517 & #3522 are merged
-	t.Skip("Skipping CQ deadlock test")
-	if testing.Short() {
-		t.Skip("skipping CQ deadlock test")
-	}
-	t.Parallel()
-	s := OpenServer(NewConfig(), "")
-	defer func() {
-		s.Close()
-		// Nil the server so our deadlock detector goroutine can determine if we completed writes
-		// without timing out
-		s.Server = nil
-	}()
-
-	if err := s.CreateDatabaseAndRetentionPolicy("db0", newRetentionPolicyInfo("rp0", 1, 0)); err != nil {
-		t.Fatal(err)
-	}
-	if err := s.MetaStore.SetDefaultRetentionPolicy("db0", "rp0"); err != nil {
-		t.Fatal(err)
-	}
-
-	test := NewTest("db0", "rp0")
-
-	test.addQueries([]*Query{
-		&Query{
-			name:    "create continuous query",
-			command: `CREATE CONTINUOUS QUERY "my.query" ON db0 BEGIN SELECT sum(visits) as visits INTO test_1m FROM myseries GROUP BY time(1m), host END`,
-			exp:     `{"results":[{}]}`,
-		},
-	}...)
-
-	for i, query := range test.queries {
-		if i == 0 {
-			if err := test.init(s); err != nil {
-				t.Fatalf("test init failed: %s", err)
-			}
-		}
-		if query.skip {
-			t.Logf("SKIP:: %s", query.name)
-			continue
-		}
-		if err := query.Execute(s); err != nil {
-			t.Error(query.Error(err))
-		} else if !query.success() {
-			t.Error(query.failureMessage())
-		}
-	}
-
-	// Deadlock detector.  If the deadlock is fixed, this test should complete all the writes in ~2.5s seconds (with artifical delays
-	// added).  After 10 seconds, if the server has not been closed then we hit the deadlock bug.
-	iterations := 0
-	go func(s *Server) {
-		<-time.After(10 * time.Second)
-
-		// If the server is not nil then the test is still running and stuck.  We panic to avoid
-		// having the whole test suite hang indefinitely.
-		if s.Server != nil {
-			panic("possible deadlock. writes did not complete in time")
-		}
-	}(s)
-
-	for {
-
-		// After the second write, if the deadlock exists, we'll get a write timeout and
-		// all subsequent writes will timeout
-		if iterations > 5 {
-			break
-		}
-		writes := []string{}
-		for i := 0; i < 1000; i++ {
-			writes = append(writes, fmt.Sprintf(`myseries,host=host-%d visits=1i`, i))
-		}
-		write := strings.Join(writes, "\n")
-
-		if _, err := s.Write(test.db, test.rp, write, test.params); err != nil {
-			t.Fatal(err)
-		}
-		iterations += 1
-		time.Sleep(500 * time.Millisecond)
-	}
-}
-
-func TestServer_Query_EvilIdentifiers(t *testing.T) {
-	t.Parallel()
-	s := OpenServer(NewConfig(), "")
-	defer s.Close()
-
-	if err := s.CreateDatabaseAndRetentionPolicy("db0", newRetentionPolicyInfo("rp0", 1, 0)); err != nil {
-		t.Fatal(err)
-	}
-	if err := s.MetaStore.SetDefaultRetentionPolicy("db0", "rp0"); err != nil {
-		t.Fatal(err)
-	}
-
-	test := NewTest("db0", "rp0")
-	test.write = fmt.Sprintf("cpu select=1,in-bytes=2 %d", mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:00Z").UnixNano())
-
-	test.addQueries([]*Query{
-		&Query{
-			name:    `query evil identifiers`,
-			command: `SELECT "select", "in-bytes" FROM cpu`,
-			exp:     `{"results":[{"series":[{"name":"cpu","columns":["time","select","in-bytes"],"values":[["2000-01-01T00:00:00Z",1,2]]}]}]}`,
-			params:  url.Values{"db": []string{"db0"}},
-		},
-	}...)
-
-	for i, query := range test.queries {
-		if i == 0 {
-			if err := test.init(s); err != nil {
-				t.Fatalf("test init failed: %s", err)
-			}
-		}
-		if query.skip {
-			t.Logf("SKIP:: %s", query.name)
-			continue
-		}
-		if err := query.Execute(s); err != nil {
-			t.Error(query.Error(err))
-		} else if !query.success() {
-			t.Error(query.failureMessage())
-		}
-	}
-}
-
-func TestServer_Query_OrderByTime(t *testing.T) {
-	t.Parallel()
-	s := OpenServer(NewConfig(), "")
-	defer s.Close()
-
-	if err := s.CreateDatabaseAndRetentionPolicy("db0", newRetentionPolicyInfo("rp0", 1, 0)); err != nil {
-		t.Fatal(err)
-	}
-	if err := s.MetaStore.SetDefaultRetentionPolicy("db0", "rp0"); err != nil {
-		t.Fatal(err)
-	}
-
-	writes := []string{
-		fmt.Sprintf(`cpu,host=server1 value=1 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:01Z").UnixNano()),
-		fmt.Sprintf(`cpu,host=server1 value=2 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:02Z").UnixNano()),
-		fmt.Sprintf(`cpu,host=server1 value=3 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:03Z").UnixNano()),
-	}
-
-	test := NewTest("db0", "rp0")
-	test.write = strings.Join(writes, "\n")
-
-	test.addQueries([]*Query{
-		&Query{
-			name:    "order on points",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `select value from "cpu" ORDER BY time DESC`,
-			exp:     `{"results":[{"series":[{"name":"cpu","columns":["time","value"],"values":[["2000-01-01T00:00:03Z",3],["2000-01-01T00:00:02Z",2],["2000-01-01T00:00:01Z",1]]}]}]}`,
-		},
-	}...)
-
-	for i, query := range test.queries {
-		if i == 0 {
-			if err := test.init(s); err != nil {
-				t.Fatalf("test init failed: %s", err)
-			}
-		}
-		if query.skip {
-			t.Logf("SKIP:: %s", query.name)
-			continue
-		}
-		if err := query.Execute(s); err != nil {
-			t.Error(query.Error(err))
-		} else if !query.success() {
-			t.Error(query.failureMessage())
-		}
-	}
-}
-
-func TestServer_Query_FieldWithMultiplePeriods(t *testing.T) {
-	t.Parallel()
-	s := OpenServer(NewConfig(), "")
-	defer s.Close()
-
-	if err := s.CreateDatabaseAndRetentionPolicy("db0", newRetentionPolicyInfo("rp0", 1, 0)); err != nil {
-		t.Fatal(err)
-	}
-	if err := s.MetaStore.SetDefaultRetentionPolicy("db0", "rp0"); err != nil {
-		t.Fatal(err)
-	}
-
-	writes := []string{
-		fmt.Sprintf(`cpu foo.bar.baz=1 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:00Z").UnixNano()),
-	}
-
-	test := NewTest("db0", "rp0")
-	test.write = strings.Join(writes, "\n")
-
-	test.addQueries([]*Query{
-		&Query{
-			name:    "baseline",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `select * from cpu`,
-			exp:     `{"results":[{"series":[{"name":"cpu","columns":["time","foo.bar.baz"],"values":[["2000-01-01T00:00:00Z",1]]}]}]}`,
-		},
-		&Query{
-			name:    "select field with periods",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `select "foo.bar.baz" from cpu`,
-			exp:     `{"results":[{"series":[{"name":"cpu","columns":["time","foo.bar.baz"],"values":[["2000-01-01T00:00:00Z",1]]}]}]}`,
-		},
-	}...)
-
-	for i, query := range test.queries {
-		if i == 0 {
-			if err := test.init(s); err != nil {
-				t.Fatalf("test init failed: %s", err)
-			}
-		}
-		if query.skip {
-			t.Logf("SKIP:: %s", query.name)
-			continue
-		}
-		if err := query.Execute(s); err != nil {
-			t.Error(query.Error(err))
-		} else if !query.success() {
-			t.Error(query.failureMessage())
-		}
-	}
-}
-
-func TestServer_Query_FieldWithMultiplePeriodsMeasurementPrefixMatch(t *testing.T) {
-	t.Parallel()
-	s := OpenServer(NewConfig(), "")
-	defer s.Close()
-
-	if err := s.CreateDatabaseAndRetentionPolicy("db0", newRetentionPolicyInfo("rp0", 1, 0)); err != nil {
-		t.Fatal(err)
-	}
-	if err := s.MetaStore.SetDefaultRetentionPolicy("db0", "rp0"); err != nil {
-		t.Fatal(err)
-	}
-
-	writes := []string{
-		fmt.Sprintf(`foo foo.bar.baz=1 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:00Z").UnixNano()),
-	}
-
-	test := NewTest("db0", "rp0")
-	test.write = strings.Join(writes, "\n")
-
-	test.addQueries([]*Query{
-		&Query{
-			name:    "baseline",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `select * from foo`,
-			exp:     `{"results":[{"series":[{"name":"foo","columns":["time","foo.bar.baz"],"values":[["2000-01-01T00:00:00Z",1]]}]}]}`,
-		},
-		&Query{
-			name:    "select field with periods",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `select "foo.bar.baz" from foo`,
-			exp:     `{"results":[{"series":[{"name":"foo","columns":["time","foo.bar.baz"],"values":[["2000-01-01T00:00:00Z",1]]}]}]}`,
-		},
-	}...)
-
-	for i, query := range test.queries {
-		if i == 0 {
-			if err := test.init(s); err != nil {
-				t.Fatalf("test init failed: %s", err)
-			}
-		}
-		if query.skip {
-			t.Logf("SKIP:: %s", query.name)
-			continue
-		}
-		if err := query.Execute(s); err != nil {
-			t.Error(query.Error(err))
-		} else if !query.success() {
-			t.Error(query.failureMessage())
-		}
-	}
-}
-
-func TestServer_Query_IntoTarget(t *testing.T) {
-	t.Parallel()
-	s := OpenServer(NewConfig(), "")
-	defer s.Close()
-
-	if err := s.CreateDatabaseAndRetentionPolicy("db0", newRetentionPolicyInfo("rp0", 1, 0)); err != nil {
-		t.Fatal(err)
-	}
-	if err := s.MetaStore.SetDefaultRetentionPolicy("db0", "rp0"); err != nil {
-		t.Fatal(err)
-	}
-
-	writes := []string{
-		fmt.Sprintf(`foo value=1 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:00Z").UnixNano()),
-		fmt.Sprintf(`foo value=2 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:10Z").UnixNano()),
-		fmt.Sprintf(`foo value=3 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:20Z").UnixNano()),
-		fmt.Sprintf(`foo value=4 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:30Z").UnixNano()),
-		fmt.Sprintf(`foo value=4,foobar=3 %d`, mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:40Z").UnixNano()),
-	}
-
-	test := NewTest("db0", "rp0")
-	test.write = strings.Join(writes, "\n")
-
-	test.addQueries([]*Query{
-		&Query{
-			name:    "into",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT * INTO baz FROM foo`,
-			exp:     `{"results":[{"series":[{"name":"result","columns":["time","written"],"values":[["1970-01-01T00:00:00Z",5]]}]}]}`,
-		},
-		&Query{
-			name:    "confirm results",
-			params:  url.Values{"db": []string{"db0"}},
-			command: `SELECT * FROM baz`,
-			exp:     `{"results":[{"series":[{"name":"baz","columns":["time","foobar","value"],"values":[["2000-01-01T00:00:00Z",null,1],["2000-01-01T00:00:10Z",null,2],["2000-01-01T00:00:20Z",null,3],["2000-01-01T00:00:30Z",null,4],["2000-01-01T00:00:40Z",3,4]]}]}]}`,
-		},
-	}...)
-
-	if err := test.init(s); err != nil {
-		t.Fatalf("test init failed: %s", err)
-	}
-
-	for _, query := range test.queries {
-		if query.skip {
-			t.Logf("SKIP:: %s", query.name)
-			continue
-		}
-		if err := query.Execute(s); err != nil {
-			t.Error(query.Error(err))
-		} else if !query.success() {
-			t.Error(query.failureMessage())
-		}
-	}
-}
-
-// This test reproduced a data race with closing the
-// Subscriber points channel while writes were in-flight in the PointsWriter.
-func TestServer_ConcurrentPointsWriter_Subscriber(t *testing.T) {
-	t.Parallel()
-	s := OpenDefaultServer(NewConfig(), "")
-	defer s.Close()
-
-	// goroutine to write points
-	done := make(chan struct{})
-	go func() {
-		for {
-			select {
-			case <-done:
-				return
-			default:
-				wpr := &cluster.WritePointsRequest{
-					Database:        "db0",
-					RetentionPolicy: "rp0",
-				}
-				s.PointsWriter.WritePoints(wpr)
-			}
-		}
-	}()
-
-	time.Sleep(10 * time.Millisecond)
-
-	close(done)
-	// Race occurs on s.Close()
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influxd/run/server_test.md b/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influxd/run/server_test.md
deleted file mode 100644
index 8df37e333..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/cmd/influxd/run/server_test.md
+++ /dev/null
@@ -1,150 +0,0 @@
-# Server Integration Tests
-
-Currently, the file `server_test.go` has integration tests for single node scenarios.
-At some point we'll need to add cluster tests, and may add them in a different file, or 
-rename `server_test.go` to `server_single_node_test.go` or something like that.
-
-## What is in a test?
-
-Each test is broken apart effectively into the following areas:
-
-- Write sample data
-- Use cases for table driven test, that include a command (typically a query) and an expected result.
-
-When each test runs it does the following:
-
-- init: determines if there are any writes and if so, writes them to the in-memory database
-- queries: iterate through each query, executing the command, and comparing the results to the expected result.
-
-## Idempotent - Allows for parallel tests
-
-Each test should be `idempotent`, meaning that its data will not be affected by other tests, or use cases within the table tests themselves.
-This allows for parallel testing, keeping the test suite total execution time very low.
-
-### Basic sample test
-
-```go
-// Ensure the server can have a database with multiple measurements.
-func TestServer_Query_Multiple_Measurements(t *testing.T) {
-	t.Parallel()
-	s := OpenServer(NewConfig(), "")
-	defer s.Close()
-
-	if err := s.CreateDatabaseAndRetentionPolicy("db0", newRetentionPolicyInfo("rp0", 1, 1*time.Hour)); err != nil {
-		t.Fatal(err)
-	}
-
-	// Make sure we do writes for measurements that will span across shards
-	writes := []string{
-		fmt.Sprintf("cpu,host=server01 value=100,core=4 %d", mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:00Z").UnixNano()),
-		fmt.Sprintf("cpu1,host=server02 value=50,core=2 %d", mustParseTime(time.RFC3339Nano, "2015-01-01T00:00:00Z").UnixNano()),
-	}
-	test := NewTest("db0", "rp0")
-	test.write = strings.Join(writes, "\n")
-
-	test.addQueries([]*Query{
-		&Query{
-			name:    "measurement in one shard but not another shouldn't panic server",
-			command: `SELECT host,value  FROM db0.rp0.cpu`,
-			exp:     `{"results":[{"series":[{"name":"cpu","tags":{"host":"server01"},"columns":["time","value"],"values":[["2000-01-01T00:00:00Z",100]]}]}]}`,
-		},
-	}...)
-
-	if err := test.init(s); err != nil {
-		t.Fatalf("test init failed: %s", err)
-	}
-
-	for _, query := range test.queries {
-		if query.skip {
-			t.Logf("SKIP:: %s", query.name)
-			continue
-		}
-		if err := query.Execute(s); err != nil {
-			t.Error(query.Error(err))
-		} else if !query.success() {
-			t.Error(query.failureMessage())
-		}
-	}
-}
-```
-
-Let's break this down:
-
-In this test, we first tell it to run in parallel with the `t.Parallel()` call.
-
-We then open a new server with:
-
-```go
-s := OpenServer(NewConfig(), "")
-defer s.Close()
-```
-
-If needed, we create a database and default retention policy.  This is usually needed
-when inserting and querying data.  This is not needed if you are testing commands like `CREATE DATABASE`, `SHOW DIAGNOSTICS`, etc.
-
-```go
-if err := s.CreateDatabaseAndRetentionPolicy("db0", newRetentionPolicyInfo("rp0", 1, 1*time.Hour)); err != nil {
-	t.Fatal(err)
-}
-```
-
-Next, set up the write data you need:
-
-```go
-writes := []string{
-	fmt.Sprintf("cpu,host=server01 value=100,core=4 %d", mustParseTime(time.RFC3339Nano, "2000-01-01T00:00:00Z").UnixNano()),
-	fmt.Sprintf("cpu1,host=server02 value=50,core=2 %d", mustParseTime(time.RFC3339Nano, "2015-01-01T00:00:00Z").UnixNano()),
-}
-```
-Create a new test with the database and retention policy:
-
-```go
-test := NewTest("db0", "rp0")
-```
-
-Send in the writes:
-```go
-test.write = strings.Join(writes, "\n")
-```
-
-Add some queries (the second one is mocked out to show how to add more than one):
-
-```go
-test.addQueries([]*Query{
-	&Query{
-		name:    "measurement in one shard but not another shouldn't panic server",
-		command: `SELECT host,value  FROM db0.rp0.cpu`,
-		exp:     `{"results":[{"series":[{"name":"cpu","tags":{"host":"server01"},"columns":["time","value"],"values":[["2000-01-01T00:00:00Z",100]]}]}]}`,
-	},
-	&Query{
-		name:    "another test here...",
-		command: `Some query command`,
-		exp:     `the expected results`,
-	},
-}...)
-```
-
-The rest of the code is boilerplate execution code.  It is purposefully not refactored out to a helper
-to make sure the test failure reports the proper lines for debugging purposes.
-
-#### Running the tests
-
-To run the tests:
-
-```sh
-go test ./cmd/influxd/run -parallel 500 -timeout 10s
-```
-
-#### Running a specific test
-
-```sh
-go test ./cmd/influxd/run -parallel 500 -timeout 10s -run TestServer_Query_Fill
-```
-
-#### Verbose feedback
-
-By default, all logs are silenced when testing.  If you pass in the `-v` flag, the test suite becomes verbose, and enables all logging in the system
-
-```sh
-go test ./cmd/influxd/run -parallel 500 -timeout 10s -run TestServer_Query_Fill -v
-```
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/errors.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/errors.go
deleted file mode 100644
index 7627ee2fd..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/errors.go
+++ /dev/null
@@ -1,45 +0,0 @@
-package influxdb
-
-import (
-	"errors"
-	"fmt"
-	"strings"
-)
-
-var (
-	// ErrFieldsRequired is returned when a point does not any fields.
-	ErrFieldsRequired = errors.New("fields required")
-
-	// ErrFieldTypeConflict is returned when a new field already exists with a different type.
-	ErrFieldTypeConflict = errors.New("field type conflict")
-)
-
-// ErrDatabaseNotFound indicates that a database operation failed on the
-// specified database because the specified database does not exist.
-func ErrDatabaseNotFound(name string) error { return fmt.Errorf("database not found: %s", name) }
-
-// ErrRetentionPolicyNotFound indicates that the named retention policy could
-// not be found in the database.
-func ErrRetentionPolicyNotFound(name string) error {
-	return fmt.Errorf("retention policy not found: %s", name)
-}
-
-// IsClientError indicates whether an error is a known client error.
-func IsClientError(err error) bool {
-	if err == nil {
-		return false
-	}
-
-	if err == ErrFieldsRequired {
-		return true
-	}
-	if err == ErrFieldTypeConflict {
-		return true
-	}
-
-	if strings.Contains(err.Error(), ErrFieldTypeConflict.Error()) {
-		return true
-	}
-
-	return false
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/etc/burn-in/.rvmrc b/Godeps/_workspace/src/github.com/influxdb/influxdb/etc/burn-in/.rvmrc
deleted file mode 100644
index a9c1a9ca3..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/etc/burn-in/.rvmrc
+++ /dev/null
@@ -1 +0,0 @@
-rvm use ruby-2.1.0@burn-in --create
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/etc/burn-in/Gemfile b/Godeps/_workspace/src/github.com/influxdb/influxdb/etc/burn-in/Gemfile
deleted file mode 100644
index b1816e8b6..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/etc/burn-in/Gemfile
+++ /dev/null
@@ -1,4 +0,0 @@
-source 'https://rubygems.org'
-
-gem "colorize"
-gem "influxdb"
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/etc/burn-in/Gemfile.lock b/Godeps/_workspace/src/github.com/influxdb/influxdb/etc/burn-in/Gemfile.lock
deleted file mode 100644
index 9e721c3a7..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/etc/burn-in/Gemfile.lock
+++ /dev/null
@@ -1,14 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    colorize (0.6.0)
-    influxdb (0.0.16)
-      json
-    json (1.8.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  colorize
-  influxdb
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/etc/burn-in/burn-in.rb b/Godeps/_workspace/src/github.com/influxdb/influxdb/etc/burn-in/burn-in.rb
deleted file mode 100644
index 1d44bc2c0..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/etc/burn-in/burn-in.rb
+++ /dev/null
@@ -1,79 +0,0 @@
-require "influxdb"
-require "colorize"
-require "benchmark"
-
-require_relative "log"
-require_relative "random_gaussian"
-
-BATCH_SIZE = 10_000
-
-Log.info "Starting burn-in suite"
-master = InfluxDB::Client.new
-master.delete_database("burn-in") rescue nil
-master.create_database("burn-in")
-master.create_database_user("burn-in", "user", "pass")
-
-master.database = "burn-in"
-# master.query "select * from test1 into test2;"
-# master.query "select count(value) from test1 group by time(1m) into test2;"
-
-influxdb = InfluxDB::Client.new "burn-in", username: "user", password: "pass"
-
-Log.success "Connected to server #{influxdb.host}:#{influxdb.port}"
-
-Log.log "Creating RandomGaussian(500, 25)"
-gaussian = RandomGaussian.new(500, 25)
-point_count = 0
-
-while true
-  Log.log "Generating 10,000 points.."
-  points = []
-  BATCH_SIZE.times do |n|
-    points << {value: gaussian.rand.to_i.abs}
-  end
-  point_count += points.length
-
-  Log.info "Sending points to server.."
-  begin
-    st = Time.now
-    foo = influxdb.write_point("test1", points)
-    et = Time.now
-    Log.log foo.inspect
-    Log.log "#{et-st} seconds elapsed"
-    Log.success "Write successful."
-  rescue => e
-    Log.failure "Write failed:"
-    Log.log e
-  end
-  sleep 0.5
-
-  Log.info "Checking regular points"
-  st = Time.now
-  response = influxdb.query("select count(value) from test1;")
-  et = Time.now
-
-  Log.log "#{et-st} seconds elapsed"
-
-  response_count = response["test1"].first["count"]
-  if point_count == response_count
-    Log.success "Point counts match: #{point_count} == #{response_count}"
-  else
-    Log.failure "Point counts don't match: #{point_count} != #{response_count}"
-  end
-
-  # Log.info "Checking continuous query points for test2"
-  # st = Time.now
-  # response = influxdb.query("select count(value) from test2;")
-  # et = Time.now
-
-  # Log.log "#{et-st} seconds elapsed"
-
-  # response_count = response["test2"].first["count"]
-  # if point_count == response_count
-    # Log.success "Point counts match: #{point_count} == #{response_count}"
-  # else
-    # Log.failure "Point counts don't match: #{point_count} != #{response_count}"
-  # end
-end
-
-
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/etc/burn-in/log.rb b/Godeps/_workspace/src/github.com/influxdb/influxdb/etc/burn-in/log.rb
deleted file mode 100644
index 0f70d7633..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/etc/burn-in/log.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-module Log
-  def self.info(msg)
-    print Time.now.strftime("%r") + " | "
-    puts msg.to_s.colorize(:yellow)
-  end
-
-  def self.success(msg)
-    print Time.now.strftime("%r") + " | "
-    puts msg.to_s.colorize(:green)
-  end
-
-  def self.failure(msg)
-    print Time.now.strftime("%r") + " | "
-    puts msg.to_s.colorize(:red)
-  end
-
-  def self.log(msg)
-    print Time.now.strftime("%r") + " | "
-    puts msg.to_s
-  end
-end
-
-
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/etc/burn-in/random_gaussian.rb b/Godeps/_workspace/src/github.com/influxdb/influxdb/etc/burn-in/random_gaussian.rb
deleted file mode 100644
index 51d6c3c04..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/etc/burn-in/random_gaussian.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-class RandomGaussian
-  def initialize(mean, stddev, rand_helper = lambda { Kernel.rand })
-    @rand_helper = rand_helper
-    @mean = mean
-    @stddev = stddev
-    @valid = false
-    @next = 0
-  end
-
-  def rand
-    if @valid then
-      @valid = false
-      return @next
-    else
-      @valid = true
-      x, y = self.class.gaussian(@mean, @stddev, @rand_helper)
-      @next = y
-      return x
-    end
-  end
-
-  private
-  def self.gaussian(mean, stddev, rand)
-    theta = 2 * Math::PI * rand.call
-    rho = Math.sqrt(-2 * Math.log(1 - rand.call))
-    scale = stddev * rho
-    x = mean + scale * Math.cos(theta)
-    y = mean + scale * Math.sin(theta)
-    return x, y
-  end
-end
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/etc/burn-in/random_points.rb b/Godeps/_workspace/src/github.com/influxdb/influxdb/etc/burn-in/random_points.rb
deleted file mode 100644
index 93bc8314f..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/etc/burn-in/random_points.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-require "influxdb"
-
-ONE_WEEK_IN_SECONDS = 7*24*60*60
-NUM_POINTS = 10_000
-BATCHES = 100
-
-master = InfluxDB::Client.new
-master.delete_database("ctx") rescue nil
-master.create_database("ctx")
-
-influxdb = InfluxDB::Client.new "ctx"
-influxdb.time_precision = "s"
-
-names = ["foo", "bar", "baz", "quu", "qux"]
-
-st = Time.now
-BATCHES.times do |m|
-  points = []
-
-  puts "Writing #{NUM_POINTS} points, time ##{m}.."
-  NUM_POINTS.times do |n|
-    timestamp = Time.now.to_i - rand(ONE_WEEK_IN_SECONDS)
-    points << {value: names.sample, time: timestamp}
-  end
-
-  influxdb.write_point("ct1", points)
-end
-puts st
-puts Time.now
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/etc/config.sample.toml b/Godeps/_workspace/src/github.com/influxdb/influxdb/etc/config.sample.toml
deleted file mode 100644
index 848a0647a..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/etc/config.sample.toml
+++ /dev/null
@@ -1,322 +0,0 @@
-### Welcome to the InfluxDB configuration file.
-
-# Once every 24 hours InfluxDB will report anonymous data to m.influxdb.com
-# The data includes raft id (random 8 bytes), os, arch, version, and metadata.
-# We don't track ip addresses of servers reporting. This is only used
-# to track the number of instances running and the versions, which
-# is very helpful for us.
-# Change this option to true to disable reporting.
-reporting-disabled = false
-
-###
-### Enterprise registration control
-###
-
-[registration]
-# enabled = true
-# url = "https://enterprise.influxdata.com" # The Enterprise server URL
-# token = "" # Registration token for Enterprise server
-
-###
-### [meta]
-###
-### Controls the parameters for the Raft consensus group that stores metadata
-### about the InfluxDB cluster.
-###
-
-[meta]
-  dir = "/var/opt/influxdb/meta"
-  hostname = "localhost"
-  bind-address = ":8088"
-  retention-autocreate = true
-  election-timeout = "1s"
-  heartbeat-timeout = "1s"
-  leader-lease-timeout = "500ms"
-  commit-timeout = "50ms"
-  cluster-tracing = false
-
-  # If enabled, when a Raft cluster loses a peer due to a `DROP SERVER` command,
-  # the leader will automatically ask a non-raft peer node to promote to a raft
-  # peer. This only happens if there is a non-raft peer node available to promote.
-  # This setting only affects the local node, so to ensure if operates correctly, be sure to set
-  # it in the config of every node.
-  raft-promotion-enabled = true
-
-###
-### [data]
-###
-### Controls where the actual shard data for InfluxDB lives and how it is
-### flushed from the WAL. "dir" may need to be changed to a suitable place
-### for your system, but the WAL settings are an advanced configuration. The
-### defaults should work for most systems.
-###
-
-[data]
-  dir = "/var/opt/influxdb/data"
-
-  # Controls the engine type for new shards. Options are b1, bz1, or tsm1.
-  # b1 is the 0.9.2 storage engine, bz1 is the 0.9.3 and 0.9.4 engine.
-  # tsm1 is the 0.9.5 engine and is currenly EXPERIMENTAL. Until 0.9.5 is
-  # actually released data written into a tsm1 engine may be need to be wiped
-  # between upgrades.
-  # engine ="bz1"
-
-  # The following WAL settings are for the b1 storage engine used in 0.9.2. They won't
-  # apply to any new shards created after upgrading to a version > 0.9.3.
-  max-wal-size = 104857600 # Maximum size the WAL can reach before a flush. Defaults to 100MB.
-  wal-flush-interval = "10m" # Maximum time data can sit in WAL before a flush.
-  wal-partition-flush-delay = "2s" # The delay time between each WAL partition being flushed.
-
-  # These are the WAL settings for the storage engine >= 0.9.3
-  wal-dir = "/var/opt/influxdb/wal"
-  wal-enable-logging = true
-
-  # When a series in the WAL in-memory cache reaches this size in bytes it is marked as ready to
-  # flush to the index
-  # wal-ready-series-size = 25600
-
-  # Flush and compact a partition once this ratio of series are over the ready size
-  # wal-compaction-threshold = 0.6
-
-  # Force a flush and compaction if any series in a partition gets above this size in bytes
-  # wal-max-series-size = 2097152
-
-  # Force a flush of all series and full compaction if there have been no writes in this
-  # amount of time. This is useful for ensuring that shards that are cold for writes don't
-  # keep a bunch of data cached in memory and in the WAL.
-  # wal-flush-cold-interval = "10m"
-
-  # Force a partition to flush its largest series if it reaches this approximate size in
-  # bytes. Remember there are 5 partitions so you'll need at least 5x this amount of memory.
-  # The more memory you have, the bigger this can be.
-  # wal-partition-size-threshold = 20971520
-
-  # Whether queries should be logged before execution. Very useful for troubleshooting, but will
-  # log any sensitive data contained within a query.
-  # query-log-enabled = true
-
-###
-### [hinted-handoff]
-###
-### Controls the hinted handoff feature, which allows nodes to temporarily
-### store queued data when one node of a cluster is down for a short period
-### of time.
-###
-
-[hinted-handoff]
-  enabled = true
-  dir = "/var/opt/influxdb/hh"
-  max-size = 1073741824
-  max-age = "168h"
-  retry-rate-limit = 0
-
-  # Hinted handoff will start retrying writes to down nodes at a rate of once per second.
-  # If any error occurs, it will backoff in an exponential manner, until the interval
-  # reaches retry-max-interval. Once writes to all nodes are successfully completed the
-  # interval will reset to retry-interval.
-  retry-interval = "1s"
-  retry-max-interval = "1m"
-
-  # Interval between running checks for data that should be purged. Data is purged from
-  # hinted-handoff queues for two reasons. 1) The data is older than the max age, or
-  # 2) the target node has been dropped from the cluster. Data is never dropped until
-  # it has reached max-age however, for a dropped node or not.
-  purge-interval = "1h"
-
-###
-### [cluster]
-###
-### Controls non-Raft cluster behavior, which generally includes how data is
-### shared across shards.
-###
-
-[cluster]
-  shard-writer-timeout = "10s" # The time within which a shard must respond to write.
-  write-timeout = "5s" # The time within which a write operation must complete on the cluster.
-
-###
-### [retention]
-###
-### Controls the enforcement of retention policies for evicting old data.
-###
-
-[retention]
-  enabled = true
-  check-interval = "30m"
-
-###
-### [shard-precreation]
-###
-### Controls the precreation of shards, so they are created before data arrives.
-### Only shards that will exist in the future, at time of creation, are precreated.
-
-[shard-precreation]
-  enabled = true
-  check-interval = "10m"
-  advance-period = "30m"
-
-###
-### Controls the system self-monitoring, statistics and diagnostics.
-###
-### The internal database for monitoring data is created automatically if
-### if it does not already exist. The target retention within this database
-### is called 'monitor' and is also created with a retention period of 7 days
-### and a replication factor of 1, if it does not exist. In all cases the
-### this retention policy is configured as the default for the database.
-
-[monitor]
-  store-enabled = true # Whether to record statistics internally.
-  store-database = "_internal" # The destination database for recorded statistics
-  store-interval = "10s" # The interval at which to record statistics
-
-###
-### [admin]
-###
-### Controls the availability of the built-in, web-based admin interface. If HTTPS is
-### enabled for the admin interface, HTTPS must also be enabled on the [http] service.
-###
-
-[admin]
-  enabled = true
-  bind-address = ":8083"
-  https-enabled = false
-  https-certificate = "/etc/ssl/influxdb.pem"
-
-###
-### [http]
-###
-### Controls how the HTTP endpoints are configured. These are the primary
-### mechanism for getting data into and out of InfluxDB.
-###
-
-[http]
-  enabled = true
-  bind-address = ":8086"
-  auth-enabled = false
-  log-enabled = true
-  write-tracing = false
-  pprof-enabled = false
-  https-enabled = false
-  https-certificate = "/etc/ssl/influxdb.pem"
-
-###
-### [[graphite]]
-###
-### Controls one or many listeners for Graphite data.
-###
-
-[[graphite]]
-  enabled = false
-  # database = "graphite"
-  # bind-address = ":2003"
-  # protocol = "tcp"
-  # consistency-level = "one"
-  # name-separator = "."
-
-  # These next lines control how batching works. You should have this enabled
-  # otherwise you could get dropped metrics or poor performance. Batching
-  # will buffer points in memory if you have many coming in.
-
-  # batch-size = 1000 # will flush if this many points get buffered
-  # batch-pending = 5 # number of batches that may be pending in memory
-  # batch-timeout = "1s" # will flush at least this often even if we haven't hit buffer limit
-  # udp-read-buffer = 0 # UDP Read buffer size, 0 means OS default. UDP listener will fail if set above OS max.
-
-  ## "name-schema" configures tag names for parsing the metric name from graphite protocol;
-  ## separated by `name-separator`.
-  ## The "measurement" tag is special and the corresponding field will become
-  ## the name of the metric.
-  ## e.g. "type.host.measurement.device" will parse "server.localhost.cpu.cpu0" as
-  ## {
-  ##     measurement: "cpu",
-  ##     tags: {
-  ##         "type": "server",
-  ##         "host": "localhost,
-  ##         "device": "cpu0"
-  ##     }
-  ## }
-  # name-schema = "type.host.measurement.device"
-
-  ## If set to true, when the input metric name has more fields than `name-schema` specified,
-  ## the extra fields will be ignored.
-  ## Otherwise an error will be logged and the metric rejected.
-  # ignore-unnamed = true
-
-###
-### [collectd]
-###
-### Controls the listener for collectd data.
-###
-
-[collectd]
-  enabled = false
-  # bind-address = ""
-  # database = ""
-  # typesdb = ""
-
-  # These next lines control how batching works. You should have this enabled
-  # otherwise you could get dropped metrics or poor performance. Batching
-  # will buffer points in memory if you have many coming in.
-
-  # batch-size = 1000 # will flush if this many points get buffered
-  # batch-pending = 5 # number of batches that may be pending in memory
-  # batch-timeout = "1s" # will flush at least this often even if we haven't hit buffer limit
-  # read-buffer = 0 # UDP Read buffer size, 0 means OS default. UDP listener will fail if set above OS max.
-
-###
-### [opentsdb]
-###
-### Controls the listener for OpenTSDB data.
-###
-
-[opentsdb]
-  enabled = false
-  # bind-address = ":4242"
-  # database = "opentsdb"
-  # retention-policy = ""
-  # consistency-level = "one"
-  # tls-enabled = false
-  # certificate= ""
-
-  # These next lines control how batching works. You should have this enabled
-  # otherwise you could get dropped metrics or poor performance. Only points
-  # metrics received over the telnet protocol undergo batching.
-
-  # batch-size = 1000 # will flush if this many points get buffered
-  # batch-pending = 5 # number of batches that may be pending in memory
-  # batch-timeout = "1s" # will flush at least this often even if we haven't hit buffer limit
-
-###
-### [[udp]]
-###
-### Controls the listeners for InfluxDB line protocol data via UDP.
-###
-
-[[udp]]
-  enabled = false
-  # bind-address = ""
-  # database = "udp"
-  # retention-policy = ""
-
-  # These next lines control how batching works. You should have this enabled
-  # otherwise you could get dropped metrics or poor performance. Batching
-  # will buffer points in memory if you have many coming in.
-
-  # batch-size = 1000 # will flush if this many points get buffered
-  # batch-pending = 5 # number of batches that may be pending in memory
-  # batch-timeout = "1s" # will flush at least this often even if we haven't hit buffer limit
-  # read-buffer = 0 # UDP Read buffer size, 0 means OS default. UDP listener will fail if set above OS max.
-
-###
-### [continuous_queries]
-###
-### Controls how continuous queries are run within InfluxDB.
-###
-
-[continuous_queries]
-  log-enabled = true
-  enabled = true
-  recompute-previous-n = 2
-  recompute-no-older-than = "10m"
-  compute-runs-per-interval = 10
-  compute-no-more-than = "2m"
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/importer/README.md b/Godeps/_workspace/src/github.com/influxdb/influxdb/importer/README.md
deleted file mode 100644
index b8cd9ad8e..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/importer/README.md
+++ /dev/null
@@ -1,193 +0,0 @@
-# Import/Export
-
-## Exporting from 0.8.9
-
-Version `0.8.9` of InfluxDB adds support to export your data to a format that can be imported into `0.9.3` and later.
-
-Note that `0.8.9` can be found here:
-
-```
-http://get.influxdb.org.s3.amazonaws.com/influxdb_0.8.9_amd64.deb
-http://get.influxdb.org.s3.amazonaws.com/influxdb-0.8.9-1.x86_64.rpm
-```
-
-### Design
-
-`0.8.9` exports raw data to a flat file that includes two sections, `DDL` and `DML`.  You can choose to export them independently (see below).
-
-The `DDL` section contains the sql commands to create databases and retention policies.  the `DML` section is [line protocol](https://github.com/influxdb/influxdb/blob/master/tsdb/README.md) and can be directly posted to the [http endpoint](https://influxdb.com/docs/v0.9/guides/writing_data.html) in `0.9`.  Remember that batching is important and we don't recommend batch sizes over 5k.
-
-You need to specify a database and shard group when you export.
-
-To list out your shards, use the following http endpoint:
-
-`/cluster/shard_spaces`
-
-example:
-```sh
-http://username:password@localhost:8086/cluster/shard_spaces
-```
-
-Then, to export a database with then name "metrics" and a shard space with the name "default", issue the following curl command:
-
-```sh
-curl -o export http://username:password@http://localhost:8086/export/metrics/default
-```
-
-Compression is supported, and will result in a significantly smaller file size.
-
-Use the following command for compression:
-```sh
-curl -o export.gz --compressed http://username:password@http://localhost:8086/export/metrics/default
-```
-
-You can also export just the `DDL` with this option:
-
-```sh
-curl -o export.ddl http://username:password@http://localhost:8086/export/metrics/default?l=ddl
-```
-
-Or just the `DML` with this option:
-
-```sh
-curl -o export.dml.gz --compressed http://username:password@http://localhost:8086/export/metrics/default?l=dml
-```
-
-### Assumptions
-
-- Series name mapping follows these [guidelines](https://influxdb.com/docs/v0.8/advanced_topics/schema_design.html)
-- Database name will map directly from `0.8` to `0.9`
-- Shard Spaces map to Retention Policies
-- Shard Space Duration is ignored, as in `0.9` we determine shard size automatically
-- Regex is used to match the correct series names and only exports that data for the database
-- Duration becomes the new Retention Policy duration
-
-- Users are not migrated due to inability to get passwords.  Anyone using users will need to manually set these back up in `0.9`
-
-### Upgrade Recommendations
-
-It's recommended that you upgrade to `0.9.3` first and have all your writes going there.  Then, on the `0.8.X` instances, upgrade to `0.8.9`.
-
-It is important that when exporting you change your config to allow for the http endpoints not timing out.  To do so, make this change in your config:
-
-```toml
-# Configure the http api
-[api]
-read-timeout = "0s"
-```
-
-### Exceptions
-
-If a series can't be exported to tags based on the guidelines mentioned above,
-we will insert the entire series name as the measurement name.  You can either 
-allow that to import into the new InfluxDB instance, or you can do your own 
-data massage on it prior to importing it.
-
-For example, if you have the following series name:
-
-```
-metric.disk.c.host.server01.single
-```
-
-It will export as exactly thta as the measurement name and no tags:
-
-```
-metric.disk.c.host.server01.single
-```
-
-### Export Metrics
-
-When you export, you will now get comments inline in the `DML`:
-
-`# Found 999 Series for export`
-
-As well as count totals for each series exported:
-
-`# Series FOO - Points Exported: 999`
-
-With a total at the bottom:
-
-`# Points Exported: 999`
-
-You can grep the file that was exported at the end to get all the export metrics:
-
-`cat myexport | grep Exported`
-
-## Importing
-
-Version `0.9.3` of InfluxDB adds support to import your data from version `0.8.9`.
-
-## Caveats
-
-For the export/import to work, all requisites have to be met.  For export, all series names in `0.8` should be in the following format:
-
-```
-<tagName>.<tagValue>.<tagName>.<tagValue>.<measurement>
-```
-for example:
-```
-az.us-west-1.host.serverA.cpu
-```
-or any number of tags 
-```
-building.2.temperature
-```
-
-Additionally, the fields need to have a consistent type (all float64, int64, etc) for every write in `0.8`.  Otherwise they have the potential to fail writes in the import.
-See below for more information.
-
-## Running the import command
- 
- To import via the cli, you can specify the following command:
-
- ```sh
- influx -import -path=metrics-default.gz -compressed
- ```
-
- If the file is not compressed you can issue it without the `-compressed` flag:
-
- ```sh
- influx -import -path=metrics-default
- ```
-
- To redirect failed import lines to another file, run this command:
-
- ```sh
- influx -import -path=metrics-default.gz -compressed > failures
- ```
-
- The import will use the line protocol in batches of 5,000 lines per batch when sending data to the server.
- 
-### Throttiling the import
- 
- If you need to throttle the import so the database has time to ingest, you can use the `-pps` flag.  This will limit the points per second that will be sent to the server.
- 
-  ```sh
- influx -import -path=metrics-default.gz -compressed -pps 50000 > failures
- ```
- 
- Which is stating that you don't want MORE than 50,000 points per second to write to the database. Due to the processing that is taking place however, you will likely never get exactly 50,000 pps, more like 35,000 pps, etc. 
-
-## Understanding the results of the import
-
-During the import, a status message will write out for every 100,000 points imported and report stats on the progress of the import:
-
-```
-2015/08/21 14:48:01 Processed 3100000 lines.  Time elapsed: 56.740578415s.  Points per second (PPS): 54634
-```
-
- The batch will give some basic stats when finished:
-
- ```sh
- 2015/07/29 23:15:20 Processed 2 commands
- 2015/07/29 23:15:20 Processed 70207923 inserts
- 2015/07/29 23:15:20 Failed 29785000 inserts
- ```
-
- Most inserts fail due to the following types of error:
-
- ```sh
- 2015/07/29 22:18:28 error writing batch:  write failed: field type conflict: input field "value" on measurement "metric" is type float64, already exists as type integer
- ```
-
- This is due to the fact that in `0.8` a field could get created and saved as int or float types for independent writes.  In `0.9` the field has to have a consistent type.
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/importer/v8/importer.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/importer/v8/importer.go
deleted file mode 100644
index 86e998fcd..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/importer/v8/importer.go
+++ /dev/null
@@ -1,248 +0,0 @@
-package v8
-
-import (
-	"bufio"
-	"compress/gzip"
-	"fmt"
-	"io"
-	"log"
-	"net/url"
-	"os"
-	"strings"
-	"time"
-
-	"github.com/influxdb/influxdb/client"
-)
-
-const batchSize = 5000
-
-// Config is the config used to initialize a Importer importer
-type Config struct {
-	Username         string
-	Password         string
-	URL              url.URL
-	Precision        string
-	WriteConsistency string
-	Path             string
-	Version          string
-	Compressed       bool
-	PPS              int
-}
-
-// NewConfig returns an initialized *Config
-func NewConfig() *Config {
-	return &Config{}
-}
-
-// Importer is the importer used for importing 0.8 data
-type Importer struct {
-	client                *client.Client
-	database              string
-	retentionPolicy       string
-	config                *Config
-	batch                 []string
-	totalInserts          int
-	failedInserts         int
-	totalCommands         int
-	throttlePointsWritten int
-	lastWrite             time.Time
-	throttle              *time.Ticker
-}
-
-// NewImporter will return an intialized Importer struct
-func NewImporter(config *Config) *Importer {
-	return &Importer{
-		config: config,
-		batch:  make([]string, 0, batchSize),
-	}
-}
-
-// Import processes the specified file in the Config and writes the data to the databases in chunks specified by batchSize
-func (i *Importer) Import() error {
-	// Create a client and try to connect
-	config := client.NewConfig()
-	config.URL = i.config.URL
-	config.Username = i.config.Username
-	config.Password = i.config.Password
-	config.UserAgent = fmt.Sprintf("influxDB importer/%s", i.config.Version)
-	cl, err := client.NewClient(config)
-	if err != nil {
-		return fmt.Errorf("could not create client %s", err)
-	}
-	i.client = cl
-	if _, _, e := i.client.Ping(); e != nil {
-		return fmt.Errorf("failed to connect to %s\n", i.client.Addr())
-	}
-
-	// Validate args
-	if i.config.Path == "" {
-		return fmt.Errorf("file argument required")
-	}
-
-	defer func() {
-		if i.totalInserts > 0 {
-			log.Printf("Processed %d commands\n", i.totalCommands)
-			log.Printf("Processed %d inserts\n", i.totalInserts)
-			log.Printf("Failed %d inserts\n", i.failedInserts)
-		}
-	}()
-
-	// Open the file
-	f, err := os.Open(i.config.Path)
-	if err != nil {
-		return err
-	}
-	defer f.Close()
-
-	var r io.Reader
-
-	// If gzipped, wrap in a gzip reader
-	if i.config.Compressed {
-		gr, err := gzip.NewReader(f)
-		if err != nil {
-			return err
-		}
-		defer gr.Close()
-		// Set the reader to the gzip reader
-		r = gr
-	} else {
-		// Standard text file so our reader can just be the file
-		r = f
-	}
-
-	// Get our reader
-	scanner := bufio.NewScanner(r)
-
-	// Process the DDL
-	i.processDDL(scanner)
-
-	// Set up our throttle channel.  Since there is effectively no other activity at this point
-	// the smaller resolution gets us much closer to the requested PPS
-	i.throttle = time.NewTicker(time.Microsecond)
-	defer i.throttle.Stop()
-
-	// Prime the last write
-	i.lastWrite = time.Now()
-
-	// Process the DML
-	i.processDML(scanner)
-
-	// Check if we had any errors scanning the file
-	if err := scanner.Err(); err != nil {
-		return fmt.Errorf("reading standard input: %s", err)
-	}
-
-	return nil
-}
-
-func (i *Importer) processDDL(scanner *bufio.Scanner) {
-	for scanner.Scan() {
-		line := scanner.Text()
-		// If we find the DML token, we are done with DDL
-		if strings.HasPrefix(line, "# DML") {
-			return
-		}
-		if strings.HasPrefix(line, "#") {
-			continue
-		}
-		// Skip blank lines
-		if strings.TrimSpace(line) == "" {
-			continue
-		}
-		i.queryExecutor(line)
-	}
-}
-
-func (i *Importer) processDML(scanner *bufio.Scanner) {
-	start := time.Now()
-	for scanner.Scan() {
-		line := scanner.Text()
-		if strings.HasPrefix(line, "# CONTEXT-DATABASE:") {
-			i.database = strings.TrimSpace(strings.Split(line, ":")[1])
-		}
-		if strings.HasPrefix(line, "# CONTEXT-RETENTION-POLICY:") {
-			i.retentionPolicy = strings.TrimSpace(strings.Split(line, ":")[1])
-		}
-		if strings.HasPrefix(line, "#") {
-			continue
-		}
-		// Skip blank lines
-		if strings.TrimSpace(line) == "" {
-			continue
-		}
-		i.batchAccumulator(line, start)
-	}
-	// Call batchWrite one last time to flush anything out in the batch
-	i.batchWrite()
-}
-
-func (i *Importer) execute(command string) {
-	response, err := i.client.Query(client.Query{Command: command, Database: i.database})
-	if err != nil {
-		log.Printf("error: %s\n", err)
-		return
-	}
-	if err := response.Error(); err != nil {
-		log.Printf("error: %s\n", response.Error())
-	}
-}
-
-func (i *Importer) queryExecutor(command string) {
-	i.totalCommands++
-	i.execute(command)
-}
-
-func (i *Importer) batchAccumulator(line string, start time.Time) {
-	i.batch = append(i.batch, line)
-	if len(i.batch) == batchSize {
-		i.batchWrite()
-		i.batch = i.batch[:0]
-		// Give some status feedback every 100000 lines processed
-		processed := i.totalInserts + i.failedInserts
-		if processed%100000 == 0 {
-			since := time.Since(start)
-			pps := float64(processed) / since.Seconds()
-			log.Printf("Processed %d lines.  Time elapsed: %s.  Points per second (PPS): %d", processed, since.String(), int64(pps))
-		}
-	}
-}
-
-func (i *Importer) batchWrite() {
-	// Accumulate the batch size to see how many points we have written this second
-	i.throttlePointsWritten += len(i.batch)
-
-	// Find out when we last wrote data
-	since := time.Since(i.lastWrite)
-
-	// Check to see if we've exceeded our points per second for the current timeframe
-	var currentPPS int
-	if since.Seconds() > 0 {
-		currentPPS = int(float64(i.throttlePointsWritten) / since.Seconds())
-	} else {
-		currentPPS = i.throttlePointsWritten
-	}
-
-	// If our currentPPS is greater than the PPS specified, then we wait and retry
-	if int(currentPPS) > i.config.PPS && i.config.PPS != 0 {
-		// Wait for the next tick
-		<-i.throttle.C
-
-		// Decrement the batch size back out as it is going to get called again
-		i.throttlePointsWritten -= len(i.batch)
-		i.batchWrite()
-		return
-	}
-
-	_, e := i.client.WriteLineProtocol(strings.Join(i.batch, "\n"), i.database, i.retentionPolicy, i.config.Precision, i.config.WriteConsistency)
-	if e != nil {
-		log.Println("error writing batch: ", e)
-		// Output failed lines to STDOUT so users can capture lines that failed to import
-		fmt.Println(strings.Join(i.batch, "\n"))
-		i.failedInserts += len(i.batch)
-	} else {
-		i.totalInserts += len(i.batch)
-	}
-	i.throttlePointsWritten = 0
-	i.lastWrite = time.Now()
-	return
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/influxql/INFLUXQL.md b/Godeps/_workspace/src/github.com/influxdb/influxdb/influxql/INFLUXQL.md
deleted file mode 100644
index 106b80238..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/influxql/INFLUXQL.md
+++ /dev/null
@@ -1,707 +0,0 @@
-# The Influx Query Language Specification
-
-## Introduction
-
-This is a reference for the Influx Query Language ("InfluxQL").
-
-InfluxQL is a SQL-like query language for interacting with InfluxDB.  It has been lovingly crafted to feel familiar to those coming from other SQL or SQL-like environments while providing features specific to storing and analyzing time series data.
-
-## Notation
-
-The syntax is specified using Extended Backus-Naur Form ("EBNF").  EBNF is the same notation used in the [Go](http://golang.org) programming language specification, which can be found [here](https://golang.org/ref/spec).  Not so coincidentally, InfluxDB is written in Go.
-
-```
-Production  = production_name "=" [ Expression ] "." .
-Expression  = Alternative { "|" Alternative } .
-Alternative = Term { Term } .
-Term        = production_name | token [ "…" token ] | Group | Option | Repetition .
-Group       = "(" Expression ")" .
-Option      = "[" Expression "]" .
-Repetition  = "{" Expression "}" .
-```
-
-Notation operators in order of increasing precedence:
-
-```
-|   alternation
-()  grouping
-[]  option (0 or 1 times)
-{}  repetition (0 to n times)
-```
-
-## Query representation
-
-### Characters
-
-InfluxQL is Unicode text encoded in [UTF-8](http://en.wikipedia.org/wiki/UTF-8).
-
-```
-newline             = /* the Unicode code point U+000A */ .
-unicode_char        = /* an arbitrary Unicode code point except newline */ .
-```
-
-## Letters and digits
-
-Letters are the set of ASCII characters plus the underscore character _ (U+005F) is considered a letter.
-
-Only decimal digits are supported.
-
-```
-letter              = ascii_letter | "_" .
-ascii_letter        = "A" … "Z" | "a" … "z" .
-digit               = "0" … "9" .
-```
-
-## Identifiers
-
-Identifiers are tokens which refer to database names, retention policy names, user names, measurement names, tag keys, and field keys.
-
-The rules:
-
-- double quoted identifiers can contain any unicode character other than a new line
-- double quoted identifiers can contain escaped `"` characters (i.e., `\"`)
-- unquoted identifiers must start with an upper or lowercase ASCII character or "_"
-- unquoted identifiers may contain only ASCII letters, decimal digits, and "_"
-
-```
-identifier          = unquoted_identifier | quoted_identifier .
-unquoted_identifier = ( letter ) { letter | digit } .
-quoted_identifier   = `"` unicode_char { unicode_char } `"` .
-```
-
-#### Examples:
-
-```
-cpu
-_cpu_stats
-"1h"
-"anything really"
-"1_Crazy-1337.identifier>NAME👍"
-```
-
-## Keywords
-
-```
-ALL           ALTER         ANY           AS            ASC           BEGIN
-BY            CREATE        CONTINUOUS    DATABASE      DATABASES     DEFAULT
-DELETE        DESC          DESTINATIONS  DIAGNOSTICS   DISTINCT      DROP
-DURATION      END           EXISTS        EXPLAIN       FIELD         FOR
-FORCE         FROM          GRANT         GRANTS        GROUP         IF
-IN            INF           INNER         INSERT        INTO          KEY
-KEYS          LIMIT         SHOW          MEASUREMENT   MEASUREMENTS  NOT
-OFFSET        ON            ORDER         PASSWORD      POLICY        POLICIES
-PRIVILEGES    QUERIES       QUERY         READ          REPLICATION   RETENTION
-REVOKE        SELECT        SERIES        SERVER        SERVERS       SET
-SHARDS        SLIMIT        SOFFSET       STATS         SUBSCRIPTION  SUBSCRIPTIONS
-TAG           TO            USER          USERS         VALUES        WHERE
-WITH          WRITE
-```
-
-## Literals
-
-### Integers
-
-InfluxQL supports decimal integer literals.  Hexadecimal and octal literals are not currently supported.
-
-```
-int_lit             = ( "1" … "9" ) { digit } .
-```
-
-### Floats
-
-InfluxQL supports floating-point literals.  Exponents are not currently supported.
-
-```
-float_lit           = int_lit "." int_lit .
-```
-
-### Strings
-
-String literals must be surrounded by single quotes. Strings may contain `'` characters as long as they are escaped (i.e., `\'`).
-
-```
-string_lit          = `'` { unicode_char } `'`' .
-```
-
-### Durations
-
-Duration literals specify a length of time.  An integer literal followed immediately (with no spaces) by a duration unit listed below is interpreted as a duration literal.
-
-### Duration units
-| Units  | Meaning                                 |
-|--------|-----------------------------------------|
-| u or µ | microseconds (1 millionth of a second)  |
-| ms     | milliseconds (1 thousandth of a second) |
-| s      | second                                  |
-| m      | minute                                  |
-| h      | hour                                    |
-| d      | day                                     |
-| w      | week                                    |
-
-```
-duration_lit        = int_lit duration_unit .
-duration_unit       = "u" | "µ" | "s" | "h" | "d" | "w" | "ms" .
-```
-
-### Dates & Times
-
-The date and time literal format is not specified in EBNF like the rest of this document.  It is specified using Go's date / time parsing format, which is a reference date written in the format required by InfluxQL.  The reference date time is:
-
-InfluxQL reference date time: January 2nd, 2006 at 3:04:05 PM
-
-```
-time_lit            = "2006-01-02 15:04:05.999999" | "2006-01-02"
-```
-
-### Booleans
-
-```
-bool_lit            = TRUE | FALSE .
-```
-
-### Regular Expressions
-
-```
-regex_lit           = "/" { unicode_char } "/" .
-```
-
-## Queries
-
-A query is composed of one or more statements separated by a semicolon.
-
-```
-query               = statement { ; statement } .
-
-statement           = alter_retention_policy_stmt |
-                      create_continuous_query_stmt |
-                      create_database_stmt |
-                      create_retention_policy_stmt |
-                      create_user_stmt |
-                      create_subscription_stmt |
-                      delete_stmt |
-                      drop_continuous_query_stmt |
-                      drop_database_stmt |
-                      drop_measurement_stmt |
-                      drop_retention_policy_stmt |
-                      drop_series_stmt |
-                      drop_subscription_stmt |
-                      drop_user_stmt |
-                      grant_stmt |
-                      show_continuous_queries_stmt |
-                      show_databases_stmt |
-                      show_field_keys_stmt |
-                      show_measurements_stmt |
-                      show_retention_policies |
-                      show_series_stmt |
-                      show_shards_stmt |
-                      show_subscriptions_stmt|
-                      show_tag_keys_stmt |
-                      show_tag_values_stmt |
-                      show_users_stmt |
-                      revoke_stmt |
-                      select_stmt .
-```
-
-## Statements
-
-### ALTER RETENTION POLICY
-
-```
-alter_retention_policy_stmt  = "ALTER RETENTION POLICY" policy_name "ON"
-                               db_name retention_policy_option
-                               [ retention_policy_option ]
-                               [ retention_policy_option ] .
-
-db_name                      = identifier .
-
-policy_name                  = identifier .
-
-retention_policy_option      = retention_policy_duration |
-                               retention_policy_replication |
-                               "DEFAULT" .
-
-retention_policy_duration    = "DURATION" duration_lit .
-retention_policy_replication = "REPLICATION" int_lit
-```
-
-#### Examples:
-
-```sql
--- Set default retention policy for mydb to 1h.cpu.
-ALTER RETENTION POLICY "1h.cpu" ON mydb DEFAULT;
-
--- Change duration and replication factor.
-ALTER RETENTION POLICY policy1 ON somedb DURATION 1h REPLICATION 4
-```
-
-### CREATE CONTINUOUS QUERY
-
-```
-create_continuous_query_stmt = "CREATE CONTINUOUS QUERY" query_name "ON" db_name
-                               "BEGIN" select_stmt "END" .
-
-query_name                   = identifier .
-```
-
-#### Examples:
-
-```sql
--- selects from default retention policy and writes into 6_months retention policy
-CREATE CONTINUOUS QUERY "10m_event_count"
-ON db_name
-BEGIN
-  SELECT count(value)
-  INTO "6_months".events
-  FROM events
-  GROUP BY time(10m)
-END;
-
--- this selects from the output of one continuous query in one retention policy and outputs to another series in another retention policy
-CREATE CONTINUOUS QUERY "1h_event_count"
-ON db_name
-BEGIN
-  SELECT sum(count) as count
-  INTO "2_years".events
-  FROM "6_months".events
-  GROUP BY time(1h)
-END;
-```
-
-### CREATE DATABASE
-
-```
-create_database_stmt = "CREATE DATABASE" db_name
-```
-
-#### Example:
-
-```sql
-CREATE DATABASE foo
-```
-
-### CREATE RETENTION POLICY
-
-```
-create_retention_policy_stmt = "CREATE RETENTION POLICY" policy_name "ON"
-                               db_name retention_policy_duration
-                               retention_policy_replication
-                               [ "DEFAULT" ] .
-```
-
-#### Examples
-
-```sql
--- Create a retention policy.
-CREATE RETENTION POLICY "10m.events" ON somedb DURATION 10m REPLICATION 2;
-
--- Create a retention policy and set it as the default.
-CREATE RETENTION POLICY "10m.events" ON somedb DURATION 10m REPLICATION 2 DEFAULT;
-```
-
-### CREATE SUBSCRIPTION
-
-```
-create_subscription_stmt = "CREATE SUBSCRIPTION" subscription_name "ON" db_name "." retention_policy "DESTINATIONS" ("ANY"|"ALL") host { "," host} .
-```
-
-#### Examples:
-
-```sql
--- Create a SUBSCRIPTION on database 'mydb' and retention policy 'default' that send data to 'example.com:9090' via UDP.
-CREATE SUBSCRIPTION sub0 ON "mydb"."default" DESTINATIONS ALL 'udp://example.com:9090' ;
-
--- Create a SUBSCRIPTION on database 'mydb' and retention policy 'default' that round robins the data to 'h1.example.com:9090' and 'h2.example.com:9090'.
-CREATE SUBSCRIPTION sub0 ON "mydb"."default" DESTINATIONS ANY 'udp://h1.example.com:9090', 'udp://h2.example.com:9090';
-```
-
-### CREATE USER
-
-```
-create_user_stmt = "CREATE USER" user_name "WITH PASSWORD" password
-                   [ "WITH ALL PRIVILEGES" ] .
-```
-
-#### Examples:
-
-```sql
--- Create a normal database user.
-CREATE USER jdoe WITH PASSWORD '1337password';
-
--- Create a cluster admin.
--- Note: Unlike the GRANT statement, the "PRIVILEGES" keyword is required here.
-CREATE USER jdoe WITH PASSWORD '1337password' WITH ALL PRIVILEGES;
-```
-
-### DELETE
-
-```
-delete_stmt  = "DELETE" from_clause where_clause .
-```
-
-#### Example:
-
-```sql
--- delete data points from the cpu measurement where the region tag
--- equals 'uswest'
-DELETE FROM cpu WHERE region = 'uswest';
-```
-
-### DROP CONTINUOUS QUERY
-
-drop_continuous_query_stmt = "DROP CONTINUOUS QUERY" query_name .
-
-#### Example:
-
-```sql
-DROP CONTINUOUS QUERY myquery;
-```
-
-### DROP DATABASE
-
-drop_database_stmt = "DROP DATABASE" db_name .
-
-#### Example:
-
-```sql
-DROP DATABASE mydb;
-```
-
-### DROP MEASUREMENT
-
-```
-drop_measurement_stmt = "DROP MEASUREMENT" measurement .
-```
-
-#### Examples:
-
-```sql
--- drop the cpu measurement
-DROP MEASUREMENT cpu;
-```
-
-### DROP RETENTION POLICY
-
-```
-drop_retention_policy_stmt = "DROP RETENTION POLICY" policy_name "ON" db_name .
-```
-
-#### Example:
-
-```sql
--- drop the retention policy named 1h.cpu from mydb
-DROP RETENTION POLICY "1h.cpu" ON mydb;
-```
-
-### DROP SERIES
-
-```
-drop_series_stmt = "DROP SERIES" [ from_clause ] [ where_clause ]
-```
-
-#### Example:
-
-```sql
-
-```
-
-### DROP SUBSCRIPTION
-
-```
-drop_subscription_stmt = "DROP SUBSCRIPTION" subscription_name "ON" db_name "." retention_policy .
-```
-
-#### Example:
-
-```sql
-DROP SUBSCRIPTION sub0 ON "mydb"."default";
-
-```
-
-### DROP USER
-
-```
-drop_user_stmt = "DROP USER" user_name .
-```
-
-#### Example:
-
-```sql
-DROP USER jdoe;
-
-```
-
-### GRANT
-
-NOTE: Users can be granted privileges on databases that do not exist.
-
-```
-grant_stmt = "GRANT" privilege [ on_clause ] to_clause
-```
-
-#### Examples:
-
-```sql
--- grant cluster admin privileges
-GRANT ALL TO jdoe;
-
--- grant read access to a database
-GRANT READ ON mydb TO jdoe;
-```
-
-### SHOW CONTINUOUS QUERIES
-
-show_continuous_queries_stmt = "SHOW CONTINUOUS QUERIES"
-
-#### Example:
-
-```sql
--- show all continuous queries
-SHOW CONTINUOUS QUERIES;
-```
-
-### SHOW DATABASES
-
-```
-show_databases_stmt = "SHOW DATABASES" .
-```
-
-#### Example:
-
-```sql
--- show all databases
-SHOW DATABASES;
-```
-
-### SHOW FIELD
-
-show_field_keys_stmt = "SHOW FIELD KEYS" [ from_clause ] .
-
-#### Examples:
-
-```sql
--- show field keys from all measurements
-SHOW FIELD KEYS;
-
--- show field keys from specified measurement
-SHOW FIELD KEYS FROM cpu;
-```
-
-### SHOW MEASUREMENTS
-
-show_measurements_stmt = "SHOW MEASUREMENTS" [ where_clause ] [ group_by_clause ] [ limit_clause ]
-                         [ offset_clause ] .
-
-```sql
--- show all measurements
-SHOW MEASUREMENTS;
-
--- show measurements where region tag = 'uswest' AND host tag = 'serverA'
-SHOW MEASUREMENTS WHERE region = 'uswest' AND host = 'serverA';
-```
-
-### SHOW RETENTION POLICIES
-
-```
-show_retention_policies = "SHOW RETENTION POLICIES ON" db_name .
-```
-
-#### Example:
-
-```sql
--- show all retention policies on a database
-SHOW RETENTION POLICIES ON mydb;
-```
-
-### SHOW SERIES
-
-```
-show_series_stmt = "SHOW SERIES" [ from_clause ] [ where_clause ] [ group_by_clause ]
-                   [ limit_clause ] [ offset_clause ] .
-```
-
-#### Example:
-
-```sql
-
-```
-
-### SHOW SHARDS
-
-```
-show_shards_stmt = "SHOW SHARDS" .
-```
-
-#### Example:
-
-```sql
-SHOW SHARDS;
-```
-
-### SHOW SUBSCRIPTIONS
-
-```
-show_subscriptions_stmt = "SHOW SUBSCRIPTIONS" .
-```
-
-#### Example:
-
-```sql
-SHOW SUBSCRIPTIONS;
-```
-
-### SHOW TAG KEYS
-
-```
-show_tag_keys_stmt = "SHOW TAG KEYS" [ from_clause ] [ where_clause ] [ group_by_clause ]
-                     [ limit_clause ] [ offset_clause ] .
-```
-
-#### Examples:
-
-```sql
--- show all tag keys
-SHOW TAG KEYS;
-
--- show all tag keys from the cpu measurement
-SHOW TAG KEYS FROM cpu;
-
--- show all tag keys from the cpu measurement where the region key = 'uswest'
-SHOW TAG KEYS FROM cpu WHERE region = 'uswest';
-
--- show all tag keys where the host key = 'serverA'
-SHOW TAG KEYS WHERE host = 'serverA';
-```
-
-### SHOW TAG VALUES
-
-```
-show_tag_values_stmt = "SHOW TAG VALUES" [ from_clause ] with_tag_clause [ where_clause ]
-                       [ group_by_clause ] [ limit_clause ] [ offset_clause ] .
-```
-
-#### Examples:
-
-```sql
--- show all tag values across all measurements for the region tag
-SHOW TAG VALUES WITH TAG = 'region';
-
--- show tag values from the cpu measurement for the region tag
-SHOW TAG VALUES FROM cpu WITH TAG = 'region';
-
--- show tag values from the cpu measurement for region & host tag keys where service = 'redis'
-SHOW TAG VALUES FROM cpu WITH TAG IN (region, host) WHERE service = 'redis';
-```
-
-### SHOW USERS
-
-```
-show_users_stmt = "SHOW USERS" .
-```
-
-#### Example:
-
-```sql
--- show all users
-SHOW USERS;
-```
-
-### REVOKE
-
-```
-revoke_stmt = "REVOKE" privilege [ "ON" db_name ] "FROM" user_name
-```
-
-#### Examples:
-
-```sql
--- revoke cluster admin from jdoe
-REVOKE ALL PRIVILEGES FROM jdoe;
-
--- revoke read privileges from jdoe on mydb
-REVOKE READ ON mydb FROM jdoe;
-```
-
-### SELECT
-
-```
-select_stmt = "SELECT" fields from_clause [ into_clause ] [ where_clause ]
-              [ group_by_clause ] [ order_by_clause ] [ limit_clause ]
-              [ offset_clause ] [ slimit_clause ] [ soffset_clause ].
-```
-
-#### Examples:
-
-```sql
--- select mean value from the cpu measurement where region = 'uswest' grouped by 10 minute intervals
-SELECT mean(value) FROM cpu WHERE region = 'uswest' GROUP BY time(10m) fill(0);
-```
-
-## Clauses
-
-```
-from_clause     = "FROM" measurements .
-
-group_by_clause = "GROUP BY" dimensions fill(<option>).
-
-limit_clause    = "LIMIT" int_lit .
-
-offset_clause   = "OFFSET" int_lit .
-
-slimit_clause    = "SLIMIT" int_lit .
-
-soffset_clause   = "SOFFSET" int_lit .
-
-on_clause       = db_name .
-
-order_by_clause = "ORDER BY" sort_fields .
-
-to_clause       = user_name .
-
-where_clause    = "WHERE" expr .
-```
-
-## Expressions
-
-```
-binary_op        = "+" | "-" | "*" | "/" | "AND" | "OR" | "=" | "!=" | "<" |
-                   "<=" | ">" | ">=" .
-
-expr             = unary_expr { binary_op unary_expr } .
-
-unary_expr       = "(" expr ")" | var_ref | time_lit | string_lit | int_lit |
-                   float_lit | bool_lit | duration_lit | regex_lit .
-```
-
-## Other
-
-```
-dimension         = expr .
-
-dimensions        = dimension { "," dimension } .
-
-field            = expr [ alias ] .
-
-fields           = field { "," field } .
-
-measurement      = measurement_name |
-                   ( policy_name "." measurement_name ) |
-                   ( db_name "." [ policy_name ] "." measurement_name ) .
-
-measurements     = measurement { "," measurement } .
-
-measurement_name = identifier .
-
-password         = identifier .
-
-policy_name      = identifier .
-
-privilege        = "ALL" [ "PRIVILEGES" ] | "READ" | "WRITE" .
-
-series_id        = int_lit .
-
-sort_field       = field_key [ ASC | DESC ] .
-
-sort_fields      = sort_field { "," sort_field } .
-
-user_name        = identifier .
-```
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/influxql/NOTES b/Godeps/_workspace/src/github.com/influxdb/influxdb/influxql/NOTES
deleted file mode 100644
index 35de158bf..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/influxql/NOTES
+++ /dev/null
@@ -1,682 +0,0 @@
-SELECT mean(value) FROM cpu
-WHERE service = 'redis'
-GROUP BY region, time(10m)
-
-
-based on group by, get unique tag sets for region
-cpu region=uswest -> get series ids from cpu where <tagset> and <where cond>
-cpu region=useast -> get series ids from cpu where <tagset> and <where cond>
-
-for each shard group in time range {
-  for each group by tagset {
-    shardItrs := map[shard]itr
-    for id := range seriesIds {
-      shard := group.shardForId(id)
-      shardItrs[shard].addId(id)
-    }
-    for _, itr := range shardItrs {
-      itr.tags = tagset
-      itr.name = cpu
-    }
-  }
-}
-
-(host = 'serverA' AND value > 100) OR (region = 'uswest' AND value < 10)
-
-value > 100 OR value < 10  (host=serverA, region=uswest)
-value < 10                 (host!=serverA, region=uswest)
-value > 100
-
-
-filters := make(map[whereCond]seriesIds)
-filters := make(map[uint32]whereCond)
-seriesIds
-
-
-select mean(value) from foo WHERE someField = 'important' group by time(5m)
-
-===================
-
-
-
-select derivative(mean(value))
-from cpu
-group by time(5m)
-
-select mean(value) from cpu group by time(5m)
-select top(10, value) from cpu group by host where time > now() - 1h
-
-this query uses this type of cycle
--------REMOTE HOST ------------- -----HOST THAT GOT QUERY ---
-map -> reduce -> combine -> map  -> reduce -> combine -> user
-
-select mean(value) cpu group by time(5m), host where time > now() -4h
-map -> reduce -> combine -> user
-map -> reduce -> map -> reduce -> combine -> user
-map -> reduce -> combine -> map -> reduce -> combine -> user
-
-
-select value from
-(
-	select mean(value) AS value FROM cpu GROUP BY time(5m)
-)
-
-[
-{
-	name: cpu,
-	tags: {
-		host: servera,
-	},
-	columns: [time, mean],
-	values : [
-		[23423423, 88.8]
-	]
-},
-{
-	name: cpu,
-	tags: {
-		host: serverb,
-	}
-}
-]
-
-
-================================================================================
-
-// list series ->
-/*
-[
-	{
-		"name": "cpu",
-		"columns": ["id", "region", "host"],
-		"values": [
-			1, "uswest", "servera",
-			2, "uswest", "serverb"
-		]
-	},
-	{
-		""
-	}
-]
-
-list series where region = 'uswest'
-
-list tags where name = 'cpu'
-
-list tagKeys where name = 'cpu'
-
-list series where name = 'cpu' and region = 'uswest'
-
-select distinct(region) from cpu
-
-list names
-list tagKeys
-
-list tagValeus where tagKey = 'region' and time > now() -1h
-
-select a.value, b.value from a join b where a.user_id == 100
-  select a.value from a where a.user_id == 100
-  select b.value from b
-
-          3                1              2
-select sum(a.value) + (sum(b.value) / min(b.value)) from a join b group by region
-
-	select suM(a.value) from a group by time(5m)
-	select sum(b.value) from b group by time(5m)
-
-execute sum MR on series [23, 65, 88, 99, 101, 232]
-
-map -> 1 tick per 5m
-reduce -> combines ticks per 5m interval -> outputs
-
-planner -> take reduce output per 5m interval from the two reducers
-           and combine with the join function, which is +
-
-[1,/,2,+,3]
-
-
-
-for v := s[0].Next(); v != nil; v = 2[0].Next() {
-	var result interface{}
-	for i := 1; i < len(s); i += 2 {
-		/ it's an operator
-		if i % 2 == 1 {
-
-		}
-	}
-}
-
-select count(distinct(host)) from cpu where time > now() - 5m
-
-type mapper interface {
-	Map(iterator)
-}
-
-type floatCountMapper struct {}
-func(m *floatCountMapper) Map(i Iterator) {
-	itr := i.(*floatIterator)
-}
-
-type Iterator interface {
-	itr()
-}
-
-type iterator struct {
-	cursor *bolt.Cursor
-	timeBucket time.Time
-	name string
-	seriesID uint32
-	tags map[string]string
-	fieldID uint8
-	where *WhereClause
-}
-
-func (i *intIterator) itr() {}
-func (i *intIterator) Next() (k int64, v float64) {
-	// loop through bolt cursor applying where clause and yield next point
-	// if cursor is at end or time is out of range, yield nil
-}
-
-*/
-
-
-
-
-
-field: ipaddress
-
-select top(10, count, ipaddress) from hits group by time(5m), host
-
-map -> 10 records, <key(time,host)>, <value(count,ipaddresses)>
-
-reducer -> take in all map outputs for each 5m bucket
-  combine them, sort, take out the top 10
-  output -> 10 records, count, ipaddresses, time
-
-
-==========
-
-select top(10, count, host) from hits group by time(5m)
-
-select host, value from cpu where time > now() - 1h
-
-select last(value) from cpu group by time(auto), host fill(previous) where time > now() - 1h
-
-select sum(value) from cpu group by host where time > now() - 1h
-
-
-
-
-
-
-select sum(value) from cpu where time > now() - 1h
-
-select * from a;
-
-[
-{
-	"name": "cpu",
-	"tags": {
-		"host": "servera"
-	},
-	"fields": [
-		"time",
-		"count",
-		"ipaddress"
-	]
-	"values": [
-		[t, v, "123.23.22.2"],
-		[t, v, "192.232.2.2"],
-		
-	]
-},
-{
-	"name": "cpu",
-	"tags": {
-		"host": "serverb"
-	},
-	"values": [
-		[t, v],
-		[t + 1, v],
-		
-	]
-},
-]
-
-[t, v, "servera"]
-[t, v, "serverb"]
-[t+1, v, "servera"]
-[t+1, v, "serverb"]
-
-======
-
-a INNER JOIN b
-
-- planner always has "group by"
-
-select count(errors.value) / count(requests.value) as error_rate
-from errors join requests as "mysuperseries"
-group by time(5m)
-fill(previous)
-where time > now() - 4h
-
-select mean(value) as cpu_mean from cpu group by time(5m) where host = 'servera'
-
-select count(value) from errors group by time(5m) fill(previous) where..
-select count(value) from requests group by time(5m) fill(previ...
-
-{
-	"name": "errors.requests",
-	"tags": {},
-	"fields": ["time", "errors.count", "requests.count"],
-	"values": [
-		[t, n, m]
-	]
-}
-
-
-a MERGE b
-
-a - t
-b - t
-a - t + 1
-b - t + 1
-b - t + 2
-a - t + 3
-
-<cpu, host>
-
-select value from cpu
-select mean(value) from cpu group by time(5m)
-
-select first(value) from cpu
-
-
-=====
-
-1. Group by time
-2. Group by
-3. Raw
-
-======
-
-SELECT sum(value) FROM myseries
-
-host=servera
-host=serverb
-
-{"host":"servera", "value":100}
-{"host":"serverb", "value":"hello!"}
-
-
-series = <name, tags>
-series = seriesID
-
-seriesID -> name
-
-name has_many seriesIDs
-name has_many fields
-
-field -> (type, id)
-
-<seriesName,fieldID> -> (type, id)
-
-
-<seriesID, time> -> fieldValues
-
-
-field
-
-type topMapper struct {
-	count int
-}
-
-func newTopMaper(count int) {
-	
-}
-
-func (t *topCountMapper) Map(i Iterator) {
-	topValues := make(map[string]int)
-	for p := i.Next(); p != nil; p = i.Next() {
-		topValues[p.String()] += 1
-	}
-	for k, v := range topValues {
-	 t.job.Emit(k, v)
-	}
-}
-
-type topCountReducer struct {
-	count int	
-}
-
-func (r *topCountReducer) Reduce(i Iterator) {
-	realzTop10 := make(map[string]int)
-	for v := i.Next(); v != nil; v = i.Next() {
-		top10 := v.(map[string]int)
-		for k, n := range top10 {
-			realzTop10[k] += n
-		}
-	}
-	realyrealTop10 := make(map[string]int)
-	// do sorty magic on reazTop10 and set realyreal
-	r.job.Emit(realyrealTop10)
-}
-
-type Transformer interface {
-	Transform(interface{}) Series
-}
-
-type ReduceOutput struct {
-	values [][]interface{}
-	fieldIDs [] 
-}
-
-// for topCountReducer ReduceOutput would look like
-// values = [t, c, "some string"]
-// fieldIDs = [0, 0, 3]
-
-SELECT val1, val2 FROM abc
-
-
-select mean(value) from cpu where region='uswest' group by time(5m), host
-
-2000 series
-
-200 series to each machine
-
-
-
-================================================================================
-
-
-
-type Mapper interface {
-	Map(Iterator)
-}
-
-
-type countMapper struct {}
-
-// Iterator is the entire series if not an aggregate query
-// or iterator is the entire time bucket if an aggregate query
-func (m *sumMapper) Map(i Iterator) {
-	var sum int
-	for p := i.Next(); p != nil; p = i.Next() {
-		sum += p.Float()
-	}
-	m.Emitter.Emit(k, sum)
-}
-
-type Point interface {
-	String(name)
-	Int(name)
-}
-
-type cursorIterator struct {
-	Cursor *bolt.Cursor
-	FieldID uint8
-	Value []byte
-}
-
-func (i cursorIterator) Next() Point {
-	_, i.Value = i.Cursor.Next()
-	return byteSlicePoint(i.Value)
-}
-
-type byteSlicePoint []byte
-
-func (p byteSlicePoint) String() string {
-	// unmarshal from byte slice.
-}
-
-/*
-{
-	"name": "foo",
-	"fields": {
-		"value": 23.2,
-		"user_id": 23
-	},
-	"tags": {
-
-	}
-}
-*/
-
-
-CNT  ID0  VALUEVALUEVALUEVALUEVALUEVALUEVALUEVALU
-0001 0000 0000 0000 0000 0000 0000 0000 0000 0000
-
-CNT  ID0  ID1  ID2  FLOATFLOA STRINGSTR STRINGSTR
-0002 0001 0002 0003 0000 0000 0000 0000 0000 0000
-
-
-
-// SELECT count() FROM cpu GROUP BY host
-
-// SELECT mean(value) from cpu where region = 'uswest'
-
-// SELECT derivative(value) from redis_key_count GROUP BY time(5m)
-
-
-// SELECT host, mean(value)
-// FROM cpu
-// GROUP BY host
-// HAVING top(20, mean)
-// WHERE time > now() - 1h
-// AND region = 'uswest'
-
-// SELECT ipaddress, count(ipaddress)
-// FROM hits
-// GROUP BY ipaddress
-// HAVING top(10, count)
-// WHERE time > now() - 1h
-
-
-series := meta.DistinctTagValues("cpu", "host")
-
-tye Series struct {
-	name string
-	fields map[uint8]string
-}
-
-type SeriesData struct {
-	ID
-	tags map[string]string
-}
-
-<id, time, value>
-
-mrJobs := make([]*MRJob, 0, len(series))
-for _, s := range series {
-	j := NewMRJob(s)
-	mrJobs = append(mrJobs, j)
-	j.Execute()
-}
-
-for _, j := range mrJobs {
-	// pull in results
-	// construct series object with same tags as series
-}
-
-
-================================================================================
-
-
-
-type Mapper interface {
-	Map(Iterator)
-}
-
-
-type countMapper struct {}
-
-// Iterator is the entire series if not an aggregate query
-// or iterator is the entire time bucket if an aggregate query
-func (m *sumMapper) Map(i Iterator) {
-	var sum int
-	for p := i.Next(); p != nil; p = i.Next() {
-		sum += p.Float()
-	}
-	m.Emitter.Emit(k, sum)
-}
-
-type Point interface {
-	String(name)
-	Int(name)
-}
-
-type cursorIterator struct {
-	Cursor *bolt.Cursor
-	FieldID uint8
-	Value []byte
-}
-
-func (i cursorIterator) Next() Point {
-	_, i.Value = i.Cursor.Next()
-	return byteSlicePoint(i.Value)
-}
-
-type byteSlicePoint []byte
-
-func (p byteSlicePoint) String() string {
-	// unmarshal from byte slice.
-}
-
-/*
-{
-	"name": "foo",
-	"fields": {
-		"value": 23.2,
-		"user_id": 23
-	},
-	"tags": {
-
-	}
-}
-*/
-
-
-CNT  ID0  VALUEVALUEVALUEVALUEVALUEVALUEVALUEVALU
-0001 0000 0000 0000 0000 0000 0000 0000 0000 0000
-
-CNT  ID0  ID1  ID2  FLOATFLOA STRINGSTR STRINGSTR
-0002 0001 0002 0003 0000 0000 0000 0000 0000 0000
-
-
-
-// SELECT count() FROM cpu GROUP BY host
-
-// SELECT mean(value) from cpu where region = 'uswest'
-
-// SELECT derivative(value) from redis_key_count GROUP BY time(5m)
-
-
-// SELECT host, mean(value)
-// FROM cpu
-// GROUP BY host
-// HAVING top(20, mean)
-// WHERE time > now() - 1h
-// AND region = 'uswest'
-
-// SELECT ipaddress, count(ipaddress)
-// FROM hits
-// GROUP BY ipaddress
-// HAVING top(10, count)
-// WHERE time > now() - 1h
-
-
-series := meta.DistinctTagValues("cpu", "host")
-
-mrJobs := make([]*MRJob, 0, len(series))
-for _, s := range series {
-	j := NewMRJob(s)
-	mrJobs = append(mrJobs, j)
-	j.Execute()
-}
-
-for _, j := range mrJobs {
-	// pull in results
-	// construct series object with same tags as series
-}
-
-
-================================================================================
-
-
-type Iterator interface {
-	Next() (interface{}, bool)
-}
-
-type iteratorCounter struct {
-	iterator Iterator
-}
-
-func (iteratorCounter) Next() {
-	
-}
-
-
-SELECT max(a.value), min(a.value), max(b.value)
-FROM a, b
-WHERE a.host = 'influxdb.org'
-
-
-grouper {
-	[]Iterator
-}
-
-
-SELECT max(a.value) FROM a WHERE a.host = 'influxdb.org'   --> 1 value
-SELECT min(a.value) FROM a WHERE a.host = 'influxdb.org'   --> 1 value
-SELECT max(b.value) FROM b                                 --> 1 value
-
-
-SELECT max(a.value) FROM a GROUP BY time WHERE a.host = 'influxdb.org'   --> key,value
-
-
-timeGrouper {
-	[]Iterator
-}
-
-
-type maxMapper struct {
-}
-
-IntervalIterator {
-}
-
-
-
-maxMapper.Map(Iterator) 
-
-
-
-- GROUP BY time
-- GROUP BY time, <tag>
-- GROUP BY <tag>
-
-
-
-
-
-COUNT(field)
-MIN(field)
-MAX(field)
-MEAN(field)
-MODE(field)
-MEDIAN(field)
-COUNT(DISTINCT field)
-PERCENTILE(field, N)
-HISTOGRAM(field [, bucketSize])
-DERIVATIVE(field)
-SUM(field)
-STDDEV(field)
-FIRST(field)
-LAST(field)
-DIFFERENCE(field)
-TOP(field, N)
-BOTTOM(field, N)  <----- multivalue
-
-
-
-================================================================================
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/influxql/ast.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/influxql/ast.go
deleted file mode 100644
index 858998e1c..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/influxql/ast.go
+++ /dev/null
@@ -1,3464 +0,0 @@
-package influxql
-
-import (
-	"bytes"
-	"errors"
-	"fmt"
-	"regexp"
-	"sort"
-	"strconv"
-	"strings"
-	"time"
-
-	"github.com/influxdb/influxdb/pkg/slices"
-)
-
-// DataType represents the primitive data types available in InfluxQL.
-type DataType int
-
-const (
-	// Unknown primitive data type.
-	Unknown DataType = 0
-	// Float means the data type is a float
-	Float = 1
-	// Integer means the data type is a integer
-	Integer = 2
-	// Boolean means the data type is a boolean.
-	Boolean = 3
-	// String means the data type is a string of text.
-	String = 4
-	// Time means the data type is a time.
-	Time = 5
-	// Duration means the data type is a duration of time.
-	Duration = 6
-)
-
-// InspectDataType returns the data type of a given value.
-func InspectDataType(v interface{}) DataType {
-	switch v.(type) {
-	case float64:
-		return Float
-	case int64, int32, int:
-		return Integer
-	case bool:
-		return Boolean
-	case string:
-		return String
-	case time.Time:
-		return Time
-	case time.Duration:
-		return Duration
-	default:
-		return Unknown
-	}
-}
-
-func (d DataType) String() string {
-	switch d {
-	case Float:
-		return "float"
-	case Integer:
-		return "integer"
-	case Boolean:
-		return "boolean"
-	case String:
-		return "string"
-	case Time:
-		return "time"
-	case Duration:
-		return "duration"
-	}
-	return "unknown"
-}
-
-// Node represents a node in the InfluxDB abstract syntax tree.
-type Node interface {
-	node()
-	String() string
-}
-
-func (*Query) node()     {}
-func (Statements) node() {}
-
-func (*AlterRetentionPolicyStatement) node()  {}
-func (*CreateContinuousQueryStatement) node() {}
-func (*CreateDatabaseStatement) node()        {}
-func (*CreateRetentionPolicyStatement) node() {}
-func (*CreateSubscriptionStatement) node()    {}
-func (*CreateUserStatement) node()            {}
-func (*Distinct) node()                       {}
-func (*DeleteStatement) node()                {}
-func (*DropContinuousQueryStatement) node()   {}
-func (*DropDatabaseStatement) node()          {}
-func (*DropMeasurementStatement) node()       {}
-func (*DropRetentionPolicyStatement) node()   {}
-func (*DropSeriesStatement) node()            {}
-func (*DropServerStatement) node()            {}
-func (*DropSubscriptionStatement) node()      {}
-func (*DropUserStatement) node()              {}
-func (*GrantStatement) node()                 {}
-func (*GrantAdminStatement) node()            {}
-func (*RevokeStatement) node()                {}
-func (*RevokeAdminStatement) node()           {}
-func (*SelectStatement) node()                {}
-func (*SetPasswordUserStatement) node()       {}
-func (*ShowContinuousQueriesStatement) node() {}
-func (*ShowGrantsForUserStatement) node()     {}
-func (*ShowServersStatement) node()           {}
-func (*ShowDatabasesStatement) node()         {}
-func (*ShowFieldKeysStatement) node()         {}
-func (*ShowRetentionPoliciesStatement) node() {}
-func (*ShowMeasurementsStatement) node()      {}
-func (*ShowSeriesStatement) node()            {}
-func (*ShowShardsStatement) node()            {}
-func (*ShowStatsStatement) node()             {}
-func (*ShowSubscriptionsStatement) node()     {}
-func (*ShowDiagnosticsStatement) node()       {}
-func (*ShowTagKeysStatement) node()           {}
-func (*ShowTagValuesStatement) node()         {}
-func (*ShowUsersStatement) node()             {}
-
-func (*BinaryExpr) node()      {}
-func (*BooleanLiteral) node()  {}
-func (*Call) node()            {}
-func (*Dimension) node()       {}
-func (Dimensions) node()       {}
-func (*DurationLiteral) node() {}
-func (*Field) node()           {}
-func (Fields) node()           {}
-func (*Measurement) node()     {}
-func (Measurements) node()     {}
-func (*nilLiteral) node()      {}
-func (*NumberLiteral) node()   {}
-func (*ParenExpr) node()       {}
-func (*RegexLiteral) node()    {}
-func (*SortField) node()       {}
-func (SortFields) node()       {}
-func (Sources) node()          {}
-func (*StringLiteral) node()   {}
-func (*Target) node()          {}
-func (*TimeLiteral) node()     {}
-func (*VarRef) node()          {}
-func (*Wildcard) node()        {}
-
-// Query represents a collection of ordered statements.
-type Query struct {
-	Statements Statements
-}
-
-// String returns a string representation of the query.
-func (q *Query) String() string { return q.Statements.String() }
-
-// Statements represents a list of statements.
-type Statements []Statement
-
-// String returns a string representation of the statements.
-func (a Statements) String() string {
-	var str []string
-	for _, stmt := range a {
-		str = append(str, stmt.String())
-	}
-	return strings.Join(str, ";\n")
-}
-
-// Statement represents a single command in InfluxQL.
-type Statement interface {
-	Node
-	stmt()
-	RequiredPrivileges() ExecutionPrivileges
-}
-
-// HasDefaultDatabase provides an interface to get the default database from a Statement.
-type HasDefaultDatabase interface {
-	Node
-	stmt()
-	DefaultDatabase() string
-}
-
-// ExecutionPrivilege is a privilege required for a user to execute
-// a statement on a database or resource.
-type ExecutionPrivilege struct {
-	// Admin privilege required.
-	Admin bool
-
-	// Name of the database.
-	Name string
-
-	// Database privilege required.
-	Privilege Privilege
-}
-
-// ExecutionPrivileges is a list of privileges required to execute a statement.
-type ExecutionPrivileges []ExecutionPrivilege
-
-func (*AlterRetentionPolicyStatement) stmt()  {}
-func (*CreateContinuousQueryStatement) stmt() {}
-func (*CreateDatabaseStatement) stmt()        {}
-func (*CreateRetentionPolicyStatement) stmt() {}
-func (*CreateSubscriptionStatement) stmt()    {}
-func (*CreateUserStatement) stmt()            {}
-func (*DeleteStatement) stmt()                {}
-func (*DropContinuousQueryStatement) stmt()   {}
-func (*DropDatabaseStatement) stmt()          {}
-func (*DropMeasurementStatement) stmt()       {}
-func (*DropRetentionPolicyStatement) stmt()   {}
-func (*DropSeriesStatement) stmt()            {}
-func (*DropServerStatement) stmt()            {}
-func (*DropSubscriptionStatement) stmt()      {}
-func (*DropUserStatement) stmt()              {}
-func (*GrantStatement) stmt()                 {}
-func (*GrantAdminStatement) stmt()            {}
-func (*ShowContinuousQueriesStatement) stmt() {}
-func (*ShowGrantsForUserStatement) stmt()     {}
-func (*ShowServersStatement) stmt()           {}
-func (*ShowDatabasesStatement) stmt()         {}
-func (*ShowFieldKeysStatement) stmt()         {}
-func (*ShowMeasurementsStatement) stmt()      {}
-func (*ShowRetentionPoliciesStatement) stmt() {}
-func (*ShowSeriesStatement) stmt()            {}
-func (*ShowShardsStatement) stmt()            {}
-func (*ShowStatsStatement) stmt()             {}
-func (*ShowSubscriptionsStatement) stmt()     {}
-func (*ShowDiagnosticsStatement) stmt()       {}
-func (*ShowTagKeysStatement) stmt()           {}
-func (*ShowTagValuesStatement) stmt()         {}
-func (*ShowUsersStatement) stmt()             {}
-func (*RevokeStatement) stmt()                {}
-func (*RevokeAdminStatement) stmt()           {}
-func (*SelectStatement) stmt()                {}
-func (*SetPasswordUserStatement) stmt()       {}
-
-// Expr represents an expression that can be evaluated to a value.
-type Expr interface {
-	Node
-	expr()
-}
-
-func (*BinaryExpr) expr()      {}
-func (*BooleanLiteral) expr()  {}
-func (*Call) expr()            {}
-func (*Distinct) expr()        {}
-func (*DurationLiteral) expr() {}
-func (*nilLiteral) expr()      {}
-func (*NumberLiteral) expr()   {}
-func (*ParenExpr) expr()       {}
-func (*RegexLiteral) expr()    {}
-func (*StringLiteral) expr()   {}
-func (*TimeLiteral) expr()     {}
-func (*VarRef) expr()          {}
-func (*Wildcard) expr()        {}
-
-// Source represents a source of data for a statement.
-type Source interface {
-	Node
-	source()
-}
-
-func (*Measurement) source() {}
-
-// Sources represents a list of sources.
-type Sources []Source
-
-// String returns a string representation of a Sources array.
-func (a Sources) String() string {
-	var buf bytes.Buffer
-
-	ubound := len(a) - 1
-	for i, src := range a {
-		_, _ = buf.WriteString(src.String())
-		if i < ubound {
-			_, _ = buf.WriteString(", ")
-		}
-	}
-
-	return buf.String()
-}
-
-// SortField represents a field to sort results by.
-type SortField struct {
-	// Name of the field
-	Name string
-
-	// Sort order.
-	Ascending bool
-}
-
-// String returns a string representation of a sort field
-func (field *SortField) String() string {
-	var buf bytes.Buffer
-	if field.Name != "" {
-		_, _ = buf.WriteString(field.Name)
-		_, _ = buf.WriteString(" ")
-	}
-	if field.Ascending {
-		_, _ = buf.WriteString("ASC")
-	} else {
-		_, _ = buf.WriteString("DESC")
-	}
-	return buf.String()
-}
-
-// SortFields represents an ordered list of ORDER BY fields
-type SortFields []*SortField
-
-// String returns a string representation of sort fields
-func (a SortFields) String() string {
-	fields := make([]string, 0, len(a))
-	for _, field := range a {
-		fields = append(fields, field.String())
-	}
-	return strings.Join(fields, ", ")
-}
-
-// CreateDatabaseStatement represents a command for creating a new database.
-type CreateDatabaseStatement struct {
-	// Name of the database to be created.
-	Name string
-
-	// IfNotExists indicates whether to return without error if the database
-	// already exists.
-	IfNotExists bool
-}
-
-// String returns a string representation of the create database statement.
-func (s *CreateDatabaseStatement) String() string {
-	var buf bytes.Buffer
-	_, _ = buf.WriteString("CREATE DATABASE ")
-	if s.IfNotExists {
-		_, _ = buf.WriteString("IF NOT EXISTS ")
-	}
-	_, _ = buf.WriteString(s.Name)
-	return buf.String()
-}
-
-// RequiredPrivileges returns the privilege required to execute a CreateDatabaseStatement.
-func (s *CreateDatabaseStatement) RequiredPrivileges() ExecutionPrivileges {
-	return ExecutionPrivileges{{Admin: true, Name: "", Privilege: AllPrivileges}}
-}
-
-// DropDatabaseStatement represents a command to drop a database.
-type DropDatabaseStatement struct {
-	// Name of the database to be dropped.
-	Name string
-
-	// IfExists indicates whether to return without error if the database
-	// does not exists.
-	IfExists bool
-}
-
-// String returns a string representation of the drop database statement.
-func (s *DropDatabaseStatement) String() string {
-	var buf bytes.Buffer
-	_, _ = buf.WriteString("DROP DATABASE ")
-	if s.IfExists {
-		_, _ = buf.WriteString("IF EXISTS ")
-	}
-	_, _ = buf.WriteString(s.Name)
-	return buf.String()
-}
-
-// RequiredPrivileges returns the privilege required to execute a DropDatabaseStatement.
-func (s *DropDatabaseStatement) RequiredPrivileges() ExecutionPrivileges {
-	return ExecutionPrivileges{{Admin: true, Name: "", Privilege: AllPrivileges}}
-}
-
-// DropRetentionPolicyStatement represents a command to drop a retention policy from a database.
-type DropRetentionPolicyStatement struct {
-	// Name of the policy to drop.
-	Name string
-
-	// Name of the database to drop the policy from.
-	Database string
-}
-
-// String returns a string representation of the drop retention policy statement.
-func (s *DropRetentionPolicyStatement) String() string {
-	var buf bytes.Buffer
-	_, _ = buf.WriteString("DROP RETENTION POLICY ")
-	_, _ = buf.WriteString(s.Name)
-	_, _ = buf.WriteString(" ON ")
-	_, _ = buf.WriteString(s.Database)
-	return buf.String()
-}
-
-// RequiredPrivileges returns the privilege required to execute a DropRetentionPolicyStatement.
-func (s *DropRetentionPolicyStatement) RequiredPrivileges() ExecutionPrivileges {
-	return ExecutionPrivileges{{Admin: false, Name: s.Database, Privilege: WritePrivilege}}
-}
-
-// CreateUserStatement represents a command for creating a new user.
-type CreateUserStatement struct {
-	// Name of the user to be created.
-	Name string
-
-	// User's password.
-	Password string
-
-	// User's admin privilege.
-	Admin bool
-}
-
-// String returns a string representation of the create user statement.
-func (s *CreateUserStatement) String() string {
-	var buf bytes.Buffer
-	_, _ = buf.WriteString("CREATE USER ")
-	_, _ = buf.WriteString(s.Name)
-	_, _ = buf.WriteString(" WITH PASSWORD ")
-	_, _ = buf.WriteString("[REDACTED]")
-	if s.Admin {
-		_, _ = buf.WriteString(" WITH ALL PRIVILEGES")
-	}
-	return buf.String()
-}
-
-// RequiredPrivileges returns the privilege(s) required to execute a CreateUserStatement.
-func (s *CreateUserStatement) RequiredPrivileges() ExecutionPrivileges {
-	return ExecutionPrivileges{{Admin: true, Name: "", Privilege: AllPrivileges}}
-}
-
-// DropUserStatement represents a command for dropping a user.
-type DropUserStatement struct {
-	// Name of the user to drop.
-	Name string
-}
-
-// String returns a string representation of the drop user statement.
-func (s *DropUserStatement) String() string {
-	var buf bytes.Buffer
-	_, _ = buf.WriteString("DROP USER ")
-	_, _ = buf.WriteString(s.Name)
-	return buf.String()
-}
-
-// RequiredPrivileges returns the privilege(s) required to execute a DropUserStatement.
-func (s *DropUserStatement) RequiredPrivileges() ExecutionPrivileges {
-	return ExecutionPrivileges{{Admin: true, Name: "", Privilege: AllPrivileges}}
-}
-
-// Privilege is a type of action a user can be granted the right to use.
-type Privilege int
-
-const (
-	// NoPrivileges means no privileges required / granted / revoked.
-	NoPrivileges Privilege = iota
-	// ReadPrivilege means read privilege required / granted / revoked.
-	ReadPrivilege
-	// WritePrivilege means write privilege required / granted / revoked.
-	WritePrivilege
-	// AllPrivileges means all privileges required / granted / revoked.
-	AllPrivileges
-)
-
-// NewPrivilege returns an initialized *Privilege.
-func NewPrivilege(p Privilege) *Privilege { return &p }
-
-// String returns a string representation of a Privilege.
-func (p Privilege) String() string {
-	switch p {
-	case NoPrivileges:
-		return "NO PRIVILEGES"
-	case ReadPrivilege:
-		return "READ"
-	case WritePrivilege:
-		return "WRITE"
-	case AllPrivileges:
-		return "ALL PRIVILEGES"
-	}
-	return ""
-}
-
-// GrantStatement represents a command for granting a privilege.
-type GrantStatement struct {
-	// The privilege to be granted.
-	Privilege Privilege
-
-	// Database to grant the privilege to.
-	On string
-
-	// Who to grant the privilege to.
-	User string
-}
-
-// String returns a string representation of the grant statement.
-func (s *GrantStatement) String() string {
-	var buf bytes.Buffer
-	_, _ = buf.WriteString("GRANT ")
-	_, _ = buf.WriteString(s.Privilege.String())
-	_, _ = buf.WriteString(" ON ")
-	_, _ = buf.WriteString(s.On)
-	_, _ = buf.WriteString(" TO ")
-	_, _ = buf.WriteString(s.User)
-	return buf.String()
-}
-
-// RequiredPrivileges returns the privilege required to execute a GrantStatement.
-func (s *GrantStatement) RequiredPrivileges() ExecutionPrivileges {
-	return ExecutionPrivileges{{Admin: true, Name: "", Privilege: AllPrivileges}}
-}
-
-// GrantAdminStatement represents a command for granting admin privilege.
-type GrantAdminStatement struct {
-	// Who to grant the privilege to.
-	User string
-}
-
-// String returns a string representation of the grant admin statement.
-func (s *GrantAdminStatement) String() string {
-	var buf bytes.Buffer
-	_, _ = buf.WriteString("GRANT ALL PRIVILEGES TO ")
-	_, _ = buf.WriteString(s.User)
-	return buf.String()
-}
-
-// RequiredPrivileges returns the privilege required to execute a GrantAdminStatement.
-func (s *GrantAdminStatement) RequiredPrivileges() ExecutionPrivileges {
-	return ExecutionPrivileges{{Admin: true, Name: "", Privilege: AllPrivileges}}
-}
-
-// SetPasswordUserStatement represents a command for changing user password.
-type SetPasswordUserStatement struct {
-	// Plain Password
-	Password string
-
-	// Who to grant the privilege to.
-	Name string
-}
-
-// String returns a string representation of the set password statement.
-func (s *SetPasswordUserStatement) String() string {
-	var buf bytes.Buffer
-	_, _ = buf.WriteString("SET PASSWORD FOR ")
-	_, _ = buf.WriteString(s.Name)
-	_, _ = buf.WriteString(" = ")
-	_, _ = buf.WriteString("[REDACTED]")
-	return buf.String()
-}
-
-// RequiredPrivileges returns the privilege required to execute a SetPasswordUserStatement.
-func (s *SetPasswordUserStatement) RequiredPrivileges() ExecutionPrivileges {
-	return ExecutionPrivileges{{Admin: true, Name: "", Privilege: AllPrivileges}}
-}
-
-// RevokeStatement represents a command to revoke a privilege from a user.
-type RevokeStatement struct {
-	// The privilege to be revoked.
-	Privilege Privilege
-
-	// Database to revoke the privilege from.
-	On string
-
-	// Who to revoke privilege from.
-	User string
-}
-
-// String returns a string representation of the revoke statement.
-func (s *RevokeStatement) String() string {
-	var buf bytes.Buffer
-	_, _ = buf.WriteString("REVOKE ")
-	_, _ = buf.WriteString(s.Privilege.String())
-	_, _ = buf.WriteString(" ON ")
-	_, _ = buf.WriteString(s.On)
-	_, _ = buf.WriteString(" FROM ")
-	_, _ = buf.WriteString(s.User)
-	return buf.String()
-}
-
-// RequiredPrivileges returns the privilege required to execute a RevokeStatement.
-func (s *RevokeStatement) RequiredPrivileges() ExecutionPrivileges {
-	return ExecutionPrivileges{{Admin: true, Name: "", Privilege: AllPrivileges}}
-}
-
-// RevokeAdminStatement represents a command to revoke admin privilege from a user.
-type RevokeAdminStatement struct {
-	// Who to revoke admin privilege from.
-	User string
-}
-
-// String returns a string representation of the revoke admin statement.
-func (s *RevokeAdminStatement) String() string {
-	var buf bytes.Buffer
-	_, _ = buf.WriteString("REVOKE ALL PRIVILEGES FROM ")
-	_, _ = buf.WriteString(s.User)
-	return buf.String()
-}
-
-// RequiredPrivileges returns the privilege required to execute a RevokeAdminStatement.
-func (s *RevokeAdminStatement) RequiredPrivileges() ExecutionPrivileges {
-	return ExecutionPrivileges{{Admin: true, Name: "", Privilege: AllPrivileges}}
-}
-
-// CreateRetentionPolicyStatement represents a command to create a retention policy.
-type CreateRetentionPolicyStatement struct {
-	// Name of policy to create.
-	Name string
-
-	// Name of database this policy belongs to.
-	Database string
-
-	// Duration data written to this policy will be retained.
-	Duration time.Duration
-
-	// Replication factor for data written to this policy.
-	Replication int
-
-	// Should this policy be set as default for the database?
-	Default bool
-}
-
-// String returns a string representation of the create retention policy.
-func (s *CreateRetentionPolicyStatement) String() string {
-	var buf bytes.Buffer
-	_, _ = buf.WriteString("CREATE RETENTION POLICY ")
-	_, _ = buf.WriteString(s.Name)
-	_, _ = buf.WriteString(" ON ")
-	_, _ = buf.WriteString(s.Database)
-	_, _ = buf.WriteString(" DURATION ")
-	_, _ = buf.WriteString(FormatDuration(s.Duration))
-	_, _ = buf.WriteString(" REPLICATION ")
-	_, _ = buf.WriteString(strconv.Itoa(s.Replication))
-	if s.Default {
-		_, _ = buf.WriteString(" DEFAULT")
-	}
-	return buf.String()
-}
-
-// RequiredPrivileges returns the privilege required to execute a CreateRetentionPolicyStatement.
-func (s *CreateRetentionPolicyStatement) RequiredPrivileges() ExecutionPrivileges {
-	return ExecutionPrivileges{{Admin: true, Name: "", Privilege: AllPrivileges}}
-}
-
-// AlterRetentionPolicyStatement represents a command to alter an existing retention policy.
-type AlterRetentionPolicyStatement struct {
-	// Name of policy to alter.
-	Name string
-
-	// Name of the database this policy belongs to.
-	Database string
-
-	// Duration data written to this policy will be retained.
-	Duration *time.Duration
-
-	// Replication factor for data written to this policy.
-	Replication *int
-
-	// Should this policy be set as defalut for the database?
-	Default bool
-}
-
-// String returns a string representation of the alter retention policy statement.
-func (s *AlterRetentionPolicyStatement) String() string {
-	var buf bytes.Buffer
-	_, _ = buf.WriteString("ALTER RETENTION POLICY ")
-	_, _ = buf.WriteString(s.Name)
-	_, _ = buf.WriteString(" ON ")
-	_, _ = buf.WriteString(s.Database)
-
-	if s.Duration != nil {
-		_, _ = buf.WriteString(" DURATION ")
-		_, _ = buf.WriteString(FormatDuration(*s.Duration))
-	}
-
-	if s.Replication != nil {
-		_, _ = buf.WriteString(" REPLICATION ")
-		_, _ = buf.WriteString(strconv.Itoa(*s.Replication))
-	}
-
-	if s.Default {
-		_, _ = buf.WriteString(" DEFAULT")
-	}
-
-	return buf.String()
-}
-
-// RequiredPrivileges returns the privilege required to execute an AlterRetentionPolicyStatement.
-func (s *AlterRetentionPolicyStatement) RequiredPrivileges() ExecutionPrivileges {
-	return ExecutionPrivileges{{Admin: true, Name: "", Privilege: AllPrivileges}}
-}
-
-type FillOption int
-
-const (
-	// NullFill means that empty aggregate windows will just have null values.
-	NullFill FillOption = iota
-	// NoFill means that empty aggregate windows will be purged from the result.
-	NoFill
-	// NumberFill means that empty aggregate windows will be filled with the given number
-	NumberFill
-	// PreviousFill means that empty aggregate windows will be filled with whatever the previous aggregate window had
-	PreviousFill
-)
-
-// SelectStatement represents a command for extracting data from the database.
-type SelectStatement struct {
-	// Expressions returned from the selection.
-	Fields Fields
-
-	// Target (destination) for the result of the select.
-	Target *Target
-
-	// Expressions used for grouping the selection.
-	Dimensions Dimensions
-
-	// Data sources that fields are extracted from.
-	Sources Sources
-
-	// An expression evaluated on data point.
-	Condition Expr
-
-	// Fields to sort results by
-	SortFields SortFields
-
-	// Maximum number of rows to be returned. Unlimited if zero.
-	Limit int
-
-	// Returns rows starting at an offset from the first row.
-	Offset int
-
-	// Maxiumum number of series to be returned. Unlimited if zero.
-	SLimit int
-
-	// Returns series starting at an offset from the first one.
-	SOffset int
-
-	// memoize the group by interval
-	groupByInterval time.Duration
-
-	// if it's a query for raw data values (i.e. not an aggregate)
-	IsRawQuery bool
-
-	// What fill option the select statement uses, if any
-	Fill FillOption
-
-	// The value to fill empty aggregate buckets with, if any
-	FillValue interface{}
-}
-
-// SourceNames returns a list of source names.
-func (s *SelectStatement) SourceNames() []string {
-	a := make([]string, 0, len(s.Sources))
-	for _, src := range s.Sources {
-		switch src := src.(type) {
-		case *Measurement:
-			a = append(a, src.Name)
-		}
-	}
-	return a
-}
-
-// HasDerivative returns true if one of the function calls in the statement is a
-// derivative aggregate
-func (s *SelectStatement) HasDerivative() bool {
-	for _, f := range s.FunctionCalls() {
-		if strings.HasSuffix(f.Name, "derivative") {
-			return true
-		}
-	}
-	return false
-}
-
-// IsSimpleDerivative return true if one of the function call is a derivative function with a
-// variable ref as the first arg
-func (s *SelectStatement) IsSimpleDerivative() bool {
-	for _, f := range s.FunctionCalls() {
-		if strings.HasSuffix(f.Name, "derivative") {
-			// it's nested if the first argument is an aggregate function
-			if _, ok := f.Args[0].(*VarRef); ok {
-				return true
-			}
-		}
-	}
-	return false
-}
-
-// TimeAscending returns true if the time field is sorted in chronological order.
-func (s *SelectStatement) TimeAscending() bool {
-	return len(s.SortFields) == 0 || s.SortFields[0].Ascending
-}
-
-// Clone returns a deep copy of the statement.
-func (s *SelectStatement) Clone() *SelectStatement {
-	clone := &SelectStatement{
-		Fields:     make(Fields, 0, len(s.Fields)),
-		Dimensions: make(Dimensions, 0, len(s.Dimensions)),
-		Sources:    cloneSources(s.Sources),
-		SortFields: make(SortFields, 0, len(s.SortFields)),
-		Condition:  CloneExpr(s.Condition),
-		Limit:      s.Limit,
-		Offset:     s.Offset,
-		SLimit:     s.SLimit,
-		SOffset:    s.SOffset,
-		Fill:       s.Fill,
-		FillValue:  s.FillValue,
-		IsRawQuery: s.IsRawQuery,
-	}
-	if s.Target != nil {
-		clone.Target = &Target{
-			Measurement: &Measurement{
-				Database:        s.Target.Measurement.Database,
-				RetentionPolicy: s.Target.Measurement.RetentionPolicy,
-				Name:            s.Target.Measurement.Name,
-				Regex:           CloneRegexLiteral(s.Target.Measurement.Regex),
-			},
-		}
-	}
-	for _, f := range s.Fields {
-		clone.Fields = append(clone.Fields, &Field{Expr: CloneExpr(f.Expr), Alias: f.Alias})
-	}
-	for _, d := range s.Dimensions {
-		clone.Dimensions = append(clone.Dimensions, &Dimension{Expr: CloneExpr(d.Expr)})
-	}
-	for _, f := range s.SortFields {
-		clone.SortFields = append(clone.SortFields, &SortField{Name: f.Name, Ascending: f.Ascending})
-	}
-	return clone
-}
-
-func cloneSources(sources Sources) Sources {
-	clone := make(Sources, 0, len(sources))
-	for _, s := range sources {
-		clone = append(clone, cloneSource(s))
-	}
-	return clone
-}
-
-func cloneSource(s Source) Source {
-	if s == nil {
-		return nil
-	}
-
-	switch s := s.(type) {
-	case *Measurement:
-		m := &Measurement{Database: s.Database, RetentionPolicy: s.RetentionPolicy, Name: s.Name}
-		if s.Regex != nil {
-			m.Regex = &RegexLiteral{Val: regexp.MustCompile(s.Regex.Val.String())}
-		}
-		return m
-	default:
-		panic("unreachable")
-	}
-}
-
-// RewriteWildcards returns the re-written form of the select statement. Any wildcard query
-// fields are replaced with the supplied fields, and any wildcard GROUP BY fields are replaced
-// with the supplied dimensions.
-func (s *SelectStatement) RewriteWildcards(fields Fields, dimensions Dimensions) *SelectStatement {
-	other := s.Clone()
-	selectWildcard, groupWildcard := false, false
-
-	// Rewrite all wildcard query fields
-	rwFields := make(Fields, 0, len(s.Fields))
-	for _, f := range s.Fields {
-		switch f.Expr.(type) {
-		case *Wildcard:
-			// Sort wildcard fields for consistent output
-			sort.Sort(fields)
-			rwFields = append(rwFields, fields...)
-			selectWildcard = true
-		default:
-			rwFields = append(rwFields, f)
-		}
-	}
-	other.Fields = rwFields
-
-	// Rewrite all wildcard GROUP BY fields
-	rwDimensions := make(Dimensions, 0, len(s.Dimensions))
-	for _, d := range s.Dimensions {
-		switch d.Expr.(type) {
-		case *Wildcard:
-			rwDimensions = append(rwDimensions, dimensions...)
-			groupWildcard = true
-		default:
-			rwDimensions = append(rwDimensions, d)
-		}
-	}
-
-	if selectWildcard && !groupWildcard {
-		rwDimensions = append(rwDimensions, dimensions...)
-	}
-	other.Dimensions = rwDimensions
-
-	return other
-}
-
-// RewriteDistinct rewrites the expression to be a call for map/reduce to work correctly
-// This method assumes all validation has passed
-func (s *SelectStatement) RewriteDistinct() {
-	for i, f := range s.Fields {
-		if d, ok := f.Expr.(*Distinct); ok {
-			s.Fields[i].Expr = d.NewCall()
-			s.IsRawQuery = false
-		}
-	}
-}
-
-// ColumnNames will walk all fields and functions and return the appropriate field names for the select statement
-// while maintaining order of the field names
-func (s *SelectStatement) ColumnNames() []string {
-	// Always set the first column to be time, even if they didn't specify it
-	columnNames := []string{"time"}
-
-	// First walk each field
-	for _, field := range s.Fields {
-		switch f := field.Expr.(type) {
-		case *Call:
-			if f.Name == "top" || f.Name == "bottom" {
-				if len(f.Args) == 2 {
-					columnNames = append(columnNames, f.Name)
-					continue
-				}
-				// We have a special case now where we have to add the column names for the fields TOP or BOTTOM asked for as well
-				columnNames = slices.Union(columnNames, f.Fields(), true)
-				continue
-			}
-			columnNames = append(columnNames, field.Name())
-		default:
-			// time is always first, and we already added it, so ignore it if they asked for it anywhere else.
-			if field.Name() != "time" {
-				columnNames = append(columnNames, field.Name())
-			}
-		}
-	}
-
-	return columnNames
-}
-
-// HasTimeFieldSpecified will walk all fields and determine if the user explicitly asked for time
-// This is needed to determine re-write behaviors for functions like TOP and BOTTOM
-func (s *SelectStatement) HasTimeFieldSpecified() bool {
-	for _, f := range s.Fields {
-		if f.Name() == "time" {
-			return true
-		}
-	}
-	return false
-}
-
-// String returns a string representation of the select statement.
-func (s *SelectStatement) String() string {
-	var buf bytes.Buffer
-	_, _ = buf.WriteString("SELECT ")
-	_, _ = buf.WriteString(s.Fields.String())
-
-	if s.Target != nil {
-		_, _ = buf.WriteString(" ")
-		_, _ = buf.WriteString(s.Target.String())
-	}
-	if len(s.Sources) > 0 {
-		_, _ = buf.WriteString(" FROM ")
-		_, _ = buf.WriteString(s.Sources.String())
-	}
-	if s.Condition != nil {
-		_, _ = buf.WriteString(" WHERE ")
-		_, _ = buf.WriteString(s.Condition.String())
-	}
-	if len(s.Dimensions) > 0 {
-		_, _ = buf.WriteString(" GROUP BY ")
-		_, _ = buf.WriteString(s.Dimensions.String())
-	}
-	switch s.Fill {
-	case NoFill:
-		_, _ = buf.WriteString(" fill(none)")
-	case NumberFill:
-		_, _ = buf.WriteString(fmt.Sprintf(" fill(%v)", s.FillValue))
-	case PreviousFill:
-		_, _ = buf.WriteString(" fill(previous)")
-	}
-	if len(s.SortFields) > 0 {
-		_, _ = buf.WriteString(" ORDER BY ")
-		_, _ = buf.WriteString(s.SortFields.String())
-	}
-	if s.Limit > 0 {
-		_, _ = fmt.Fprintf(&buf, " LIMIT %d", s.Limit)
-	}
-	if s.Offset > 0 {
-		_, _ = buf.WriteString(" OFFSET ")
-		_, _ = buf.WriteString(strconv.Itoa(s.Offset))
-	}
-	if s.SLimit > 0 {
-		_, _ = fmt.Fprintf(&buf, " SLIMIT %d", s.SLimit)
-	}
-	if s.SOffset > 0 {
-		_, _ = fmt.Fprintf(&buf, " SOFFSET %d", s.SOffset)
-	}
-	return buf.String()
-}
-
-// RequiredPrivileges returns the privilege required to execute the SelectStatement.
-func (s *SelectStatement) RequiredPrivileges() ExecutionPrivileges {
-	ep := ExecutionPrivileges{{Admin: false, Name: "", Privilege: ReadPrivilege}}
-
-	if s.Target != nil {
-		p := ExecutionPrivilege{Admin: false, Name: s.Target.Measurement.Database, Privilege: WritePrivilege}
-		ep = append(ep, p)
-	}
-	return ep
-}
-
-// HasWildcard returns whether or not the select statement has at least 1 wildcard
-func (s *SelectStatement) HasWildcard() bool {
-	return s.HasFieldWildcard() || s.HasDimensionWildcard()
-}
-
-// HasFieldWildcard returns whether or not the select statement has at least 1 wildcard in the fields
-func (s *SelectStatement) HasFieldWildcard() bool {
-	for _, f := range s.Fields {
-		_, ok := f.Expr.(*Wildcard)
-		if ok {
-			return true
-		}
-	}
-
-	return false
-}
-
-// HasDimensionWildcard returns whether or not the select statement has
-// at least 1 wildcard in the dimensions aka `GROUP BY`
-func (s *SelectStatement) HasDimensionWildcard() bool {
-	for _, d := range s.Dimensions {
-		_, ok := d.Expr.(*Wildcard)
-		if ok {
-			return true
-		}
-	}
-
-	return false
-}
-
-func (s *SelectStatement) validate(tr targetRequirement) error {
-	if err := s.validateFields(); err != nil {
-		return err
-	}
-
-	if err := s.validateDimensions(); err != nil {
-		return err
-	}
-
-	if err := s.validateDistinct(); err != nil {
-		return err
-	}
-
-	if err := s.validateCountDistinct(); err != nil {
-		return err
-	}
-
-	if err := s.validateAggregates(tr); err != nil {
-		return err
-	}
-
-	if err := s.validateDerivative(); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (s *SelectStatement) validateFields() error {
-	ns := s.NamesInSelect()
-	if len(ns) == 1 && ns[0] == "time" {
-		return fmt.Errorf("at least 1 non-time field must be queried")
-	}
-	return nil
-}
-
-func (s *SelectStatement) validateDimensions() error {
-	var dur time.Duration
-	for _, dim := range s.Dimensions {
-		switch expr := dim.Expr.(type) {
-		case *Call:
-			// Ensure the call is time() and it only has one duration argument.
-			// If we already have a duration
-			if expr.Name != "time" {
-				return errors.New("only time() calls allowed in dimensions")
-			} else if len(expr.Args) != 1 {
-				return errors.New("time dimension expected one argument")
-			} else if lit, ok := expr.Args[0].(*DurationLiteral); !ok {
-				return errors.New("time dimension must have one duration argument")
-			} else if dur != 0 {
-				return errors.New("multiple time dimensions not allowed")
-			} else {
-				dur = lit.Val
-			}
-		case *VarRef:
-			if strings.ToLower(expr.Val) == "time" {
-				return errors.New("time() is a function and expects at least one argument")
-			}
-		case *Wildcard:
-		default:
-			return errors.New("only time and tag dimensions allowed")
-		}
-	}
-	return nil
-}
-
-// validSelectWithAggregate determines if a SELECT statement has the correct
-// combination of aggregate functions combined with selected fields and tags
-// Currently we don't have support for all aggregates, but aggregates that
-// can be combined with fields/tags are:
-//  TOP, BOTTOM, MAX, MIN, FIRST, LAST
-func (s *SelectStatement) validSelectWithAggregate() error {
-	calls := map[string]struct{}{}
-	numAggregates := 0
-	for _, f := range s.Fields {
-		fieldCalls := walkFunctionCalls(f.Expr)
-		for _, c := range fieldCalls {
-			calls[c.Name] = struct{}{}
-		}
-		if len(fieldCalls) != 0 {
-			numAggregates++
-		}
-	}
-	// For TOP, BOTTOM, MAX, MIN, FIRST, LAST (selector functions) it is ok to ask for fields and tags
-	// but only if one function is specified.  Combining multiple functions and fields and tags is not currently supported
-	onlySelectors := true
-	for k := range calls {
-		switch k {
-		case "top", "bottom", "max", "min", "first", "last":
-		default:
-			onlySelectors = false
-			break
-		}
-	}
-	if onlySelectors {
-		// If they only have one selector, they can have as many fields or tags as they want
-		if numAggregates == 1 {
-			return nil
-		}
-		// If they have multiple selectors, they are not allowed to have any other fields or tags specified
-		if numAggregates > 1 && len(s.Fields) != numAggregates {
-			return fmt.Errorf("mixing multiple selector functions with tags or fields is not supported")
-		}
-	}
-
-	if numAggregates != 0 && numAggregates != len(s.Fields) {
-		return fmt.Errorf("mixing aggregate and non-aggregate queries is not supported")
-	}
-	return nil
-}
-
-func (s *SelectStatement) validateAggregates(tr targetRequirement) error {
-	for _, f := range s.Fields {
-		for _, expr := range walkFunctionCalls(f.Expr) {
-			switch expr.Name {
-			case "derivative", "non_negative_derivative":
-				if err := s.validSelectWithAggregate(); err != nil {
-					return err
-				}
-				if min, max, got := 1, 2, len(expr.Args); got > max || got < min {
-					return fmt.Errorf("invalid number of arguments for %s, expected at least %d but no more than %d, got %d", expr.Name, min, max, got)
-				}
-				// Validate that if they have grouping by time, they need a sub-call like min/max, etc.
-				groupByInterval, _ := s.GroupByInterval()
-				if groupByInterval > 0 {
-					if _, ok := expr.Args[0].(*Call); !ok {
-						return fmt.Errorf("aggregate function required inside the call to %s", expr.Name)
-					}
-				}
-
-			case "percentile":
-				if err := s.validSelectWithAggregate(); err != nil {
-					return err
-				}
-				if exp, got := 2, len(expr.Args); got != exp {
-					return fmt.Errorf("invalid number of arguments for %s, expected %d, got %d", expr.Name, exp, got)
-				}
-				_, ok := expr.Args[1].(*NumberLiteral)
-				if !ok {
-					return fmt.Errorf("expected float argument in percentile()")
-				}
-			case "top", "bottom":
-				if exp, got := 2, len(expr.Args); got < exp {
-					return fmt.Errorf("invalid number of arguments for %s, expected at least %d, got %d", expr.Name, exp, got)
-				}
-				if len(expr.Args) > 1 {
-					callLimit, ok := expr.Args[len(expr.Args)-1].(*NumberLiteral)
-					if !ok {
-						return fmt.Errorf("expected integer as last argument in %s(), found %s", expr.Name, expr.Args[len(expr.Args)-1])
-					}
-					// Check if they asked for a limit smaller than what they passed into the call
-					if int64(callLimit.Val) > int64(s.Limit) && s.Limit != 0 {
-						return fmt.Errorf("limit (%d) in %s function can not be larger than the LIMIT (%d) in the select statement", int64(callLimit.Val), expr.Name, int64(s.Limit))
-					}
-
-					for _, v := range expr.Args[:len(expr.Args)-1] {
-						if _, ok := v.(*VarRef); !ok {
-							return fmt.Errorf("only fields or tags are allowed in %s(), found %s", expr.Name, v)
-						}
-					}
-				}
-			default:
-				if err := s.validSelectWithAggregate(); err != nil {
-					return err
-				}
-				if exp, got := 1, len(expr.Args); got != exp {
-					return fmt.Errorf("invalid number of arguments for %s, expected %d, got %d", expr.Name, exp, got)
-				}
-				switch fc := expr.Args[0].(type) {
-				case *VarRef:
-					// do nothing
-				case *Call:
-					if fc.Name != "distinct" {
-						return fmt.Errorf("expected field argument in %s()", expr.Name)
-					}
-				case *Distinct:
-					if expr.Name != "count" {
-						return fmt.Errorf("expected field argument in %s()", expr.Name)
-					}
-				default:
-					return fmt.Errorf("expected field argument in %s()", expr.Name)
-				}
-			}
-		}
-	}
-
-	// Check that we have valid duration and where clauses for aggregates
-
-	// fetch the group by duration
-	groupByDuration, _ := s.GroupByInterval()
-
-	// If we have a group by interval, but no aggregate function, it's an invalid statement
-	if s.IsRawQuery && groupByDuration > 0 {
-		return fmt.Errorf("GROUP BY requires at least one aggregate function")
-	}
-
-	// If we have an aggregate function with a group by time without a where clause, it's an invalid statement
-	if tr == targetNotRequired { // ignore create continuous query statements
-		if !s.IsRawQuery && groupByDuration > 0 && !HasTimeExpr(s.Condition) {
-			return fmt.Errorf("aggregate functions with GROUP BY time require a WHERE time clause")
-		}
-	}
-	return nil
-}
-
-func (s *SelectStatement) HasDistinct() bool {
-	// determine if we have a call named distinct
-	for _, f := range s.Fields {
-		switch c := f.Expr.(type) {
-		case *Call:
-			if c.Name == "distinct" {
-				return true
-			}
-		case *Distinct:
-			return true
-		}
-	}
-	return false
-}
-
-func (s *SelectStatement) validateDistinct() error {
-	if !s.HasDistinct() {
-		return nil
-	}
-
-	if len(s.Fields) > 1 {
-		return fmt.Errorf("aggregate function distinct() can not be combined with other functions or fields")
-	}
-
-	switch c := s.Fields[0].Expr.(type) {
-	case *Call:
-		if len(c.Args) == 0 {
-			return fmt.Errorf("distinct function requires at least one argument")
-		}
-
-		if len(c.Args) != 1 {
-			return fmt.Errorf("distinct function can only have one argument")
-		}
-	}
-	return nil
-}
-
-func (s *SelectStatement) HasCountDistinct() bool {
-	for _, f := range s.Fields {
-		if c, ok := f.Expr.(*Call); ok {
-			if c.Name == "count" {
-				for _, a := range c.Args {
-					if _, ok := a.(*Distinct); ok {
-						return true
-					}
-					if c, ok := a.(*Call); ok {
-						if c.Name == "distinct" {
-							return true
-						}
-					}
-				}
-			}
-		}
-	}
-	return false
-}
-
-func (s *SelectStatement) validateCountDistinct() error {
-	if !s.HasCountDistinct() {
-		return nil
-	}
-
-	valid := func(e Expr) bool {
-		c, ok := e.(*Call)
-		if !ok {
-			return true
-		}
-		if c.Name != "count" {
-			return true
-		}
-		for _, a := range c.Args {
-			if _, ok := a.(*Distinct); ok {
-				return len(c.Args) == 1
-			}
-			if d, ok := a.(*Call); ok {
-				if d.Name == "distinct" {
-					return len(d.Args) == 1
-				}
-			}
-		}
-		return true
-	}
-
-	for _, f := range s.Fields {
-		if !valid(f.Expr) {
-			return fmt.Errorf("count(distinct <field>) can only have one argument")
-		}
-	}
-
-	return nil
-}
-
-func (s *SelectStatement) validateDerivative() error {
-	if !s.HasDerivative() {
-		return nil
-	}
-
-	// If a derivative is requested, it must be the only field in the query. We don't support
-	// multiple fields in combination w/ derivaties yet.
-	if len(s.Fields) != 1 {
-		return fmt.Errorf("derivative cannot be used with other fields")
-	}
-
-	aggr := s.FunctionCalls()
-	if len(aggr) != 1 {
-		return fmt.Errorf("derivative cannot be used with other fields")
-	}
-
-	// Derivative requires two arguments
-	derivativeCall := aggr[0]
-	if len(derivativeCall.Args) == 0 {
-		return fmt.Errorf("derivative requires a field argument")
-	}
-
-	// First arg must be a field or aggr over a field e.g. (mean(field))
-	_, callOk := derivativeCall.Args[0].(*Call)
-	_, varOk := derivativeCall.Args[0].(*VarRef)
-
-	if !(callOk || varOk) {
-		return fmt.Errorf("derivative requires a field argument")
-	}
-
-	// If a duration arg is pased, make sure it's a duration
-	if len(derivativeCall.Args) == 2 {
-		// Second must be a duration .e.g (1h)
-		if _, ok := derivativeCall.Args[1].(*DurationLiteral); !ok {
-			return fmt.Errorf("derivative requires a duration argument")
-		}
-	}
-
-	return nil
-}
-
-// GroupByIterval extracts the time interval, if specified.
-func (s *SelectStatement) GroupByInterval() (time.Duration, error) {
-	// return if we've already pulled it out
-	if s.groupByInterval != 0 {
-		return s.groupByInterval, nil
-	}
-
-	// Ignore if there are no dimensions.
-	if len(s.Dimensions) == 0 {
-		return 0, nil
-	}
-
-	for _, d := range s.Dimensions {
-		if call, ok := d.Expr.(*Call); ok && call.Name == "time" {
-			// Make sure there is exactly one argument.
-			if len(call.Args) != 1 {
-				return 0, errors.New("time dimension expected one argument")
-			}
-
-			// Ensure the argument is a duration.
-			lit, ok := call.Args[0].(*DurationLiteral)
-			if !ok {
-				return 0, errors.New("time dimension must have one duration argument")
-			}
-			s.groupByInterval = lit.Val
-			return lit.Val, nil
-		}
-	}
-	return 0, nil
-}
-
-// SetTimeRange sets the start and end time of the select statement to [start, end). i.e. start inclusive, end exclusive.
-// This is used commonly for continuous queries so the start and end are in buckets.
-func (s *SelectStatement) SetTimeRange(start, end time.Time) error {
-	cond := fmt.Sprintf("time >= '%s' AND time < '%s'", start.UTC().Format(time.RFC3339Nano), end.UTC().Format(time.RFC3339Nano))
-	if s.Condition != nil {
-		cond = fmt.Sprintf("%s AND %s", s.rewriteWithoutTimeDimensions(), cond)
-	}
-
-	expr, err := NewParser(strings.NewReader(cond)).ParseExpr()
-	if err != nil {
-		return err
-	}
-
-	// fold out any previously replaced time dimensios and set the condition
-	s.Condition = Reduce(expr, nil)
-
-	return nil
-}
-
-// rewriteWithoutTimeDimensions will remove any WHERE time... clauses from the select statement
-// This is necessary when setting an explicit time range to override any that previously existed.
-func (s *SelectStatement) rewriteWithoutTimeDimensions() string {
-	n := RewriteFunc(s.Condition, func(n Node) Node {
-		switch n := n.(type) {
-		case *BinaryExpr:
-			if n.LHS.String() == "time" {
-				return &BooleanLiteral{Val: true}
-			}
-			return n
-		case *Call:
-			return &BooleanLiteral{Val: true}
-		default:
-			return n
-		}
-	})
-
-	return n.String()
-}
-
-/*
-
-BinaryExpr
-
-SELECT mean(xxx.value) + avg(yyy.value) FROM xxx JOIN yyy WHERE xxx.host = 123
-
-from xxx where host = 123
-select avg(value) from yyy where host = 123
-
-SELECT xxx.value FROM xxx WHERE xxx.host = 123
-SELECT yyy.value FROM yyy
-
----
-
-SELECT MEAN(xxx.value) + MEAN(cpu.load.value)
-FROM xxx JOIN yyy
-GROUP BY host
-WHERE (xxx.region == "uswest" OR yyy.region == "uswest") AND xxx.otherfield == "XXX"
-
-select * from (
-	select mean + mean from xxx join yyy
-	group by time(5m), host
-) (xxx.region == "uswest" OR yyy.region == "uswest") AND xxx.otherfield == "XXX"
-
-(seriesIDS for xxx.region = 'uswest' union seriesIDs for yyy.regnion = 'uswest') | seriesIDS xxx.otherfield = 'XXX'
-
-WHERE xxx.region == "uswest" AND xxx.otherfield == "XXX"
-WHERE yyy.region == "uswest"
-
-
-*/
-
-// Substatement returns a single-series statement for a given variable reference.
-func (s *SelectStatement) Substatement(ref *VarRef) (*SelectStatement, error) {
-	// Copy dimensions and properties to new statement.
-	other := &SelectStatement{
-		Fields:     Fields{{Expr: ref}},
-		Dimensions: s.Dimensions,
-		Limit:      s.Limit,
-		Offset:     s.Offset,
-		SortFields: s.SortFields,
-	}
-
-	// If there is only one series source then return it with the whole condition.
-	if len(s.Sources) == 1 {
-		other.Sources = s.Sources
-		other.Condition = s.Condition
-		return other, nil
-	}
-
-	// Find the matching source.
-	name := MatchSource(s.Sources, ref.Val)
-	if name == "" {
-		return nil, fmt.Errorf("field source not found: %s", ref.Val)
-	}
-	other.Sources = append(other.Sources, &Measurement{Name: name})
-
-	// Filter out conditions.
-	if s.Condition != nil {
-		other.Condition = filterExprBySource(name, s.Condition)
-	}
-
-	return other, nil
-}
-
-// NamesInWhere returns the field and tag names (idents) referenced in the where clause
-func (s *SelectStatement) NamesInWhere() []string {
-	var a []string
-	if s.Condition != nil {
-		a = walkNames(s.Condition)
-	}
-	return a
-}
-
-// NamesInSelect returns the field and tag names (idents) in the select clause
-func (s *SelectStatement) NamesInSelect() []string {
-	var a []string
-
-	for _, f := range s.Fields {
-		a = append(a, walkNames(f.Expr)...)
-	}
-
-	return a
-}
-
-// NamesInDimension returns the field and tag names (idents) in the group by
-func (s *SelectStatement) NamesInDimension() []string {
-	var a []string
-
-	for _, d := range s.Dimensions {
-		a = append(a, walkNames(d.Expr)...)
-	}
-
-	return a
-}
-
-// LimitTagSets returns a tag set list with SLIMIT and SOFFSET applied.
-func (s *SelectStatement) LimitTagSets(a []*TagSet) []*TagSet {
-	// Ignore if no limit or offset is specified.
-	if s.SLimit == 0 && s.SOffset == 0 {
-		return a
-	}
-
-	// If offset is beyond the number of tag sets then return nil.
-	if s.SOffset > len(a) {
-		return nil
-	}
-
-	// Clamp limit to the max number of tag sets.
-	if s.SOffset+s.SLimit > len(a) {
-		s.SLimit = len(a) - s.SOffset
-	}
-	return a[s.SOffset : s.SOffset+s.SLimit]
-}
-
-// walkNames will walk the Expr and return the database fields
-func walkNames(exp Expr) []string {
-	switch expr := exp.(type) {
-	case *VarRef:
-		return []string{expr.Val}
-	case *Call:
-		if len(expr.Args) == 0 {
-			return nil
-		}
-		lit, ok := expr.Args[0].(*VarRef)
-		if !ok {
-			return nil
-		}
-
-		return []string{lit.Val}
-	case *BinaryExpr:
-		var ret []string
-		ret = append(ret, walkNames(expr.LHS)...)
-		ret = append(ret, walkNames(expr.RHS)...)
-		return ret
-	case *ParenExpr:
-		return walkNames(expr.Expr)
-	}
-
-	return nil
-}
-
-// FunctionCalls returns the Call objects from the query
-func (s *SelectStatement) FunctionCalls() []*Call {
-	var a []*Call
-	for _, f := range s.Fields {
-		a = append(a, walkFunctionCalls(f.Expr)...)
-	}
-	return a
-}
-
-// FunctionCallsByPosition returns the Call objects from the query in the order they appear in the select statement
-func (s *SelectStatement) FunctionCallsByPosition() [][]*Call {
-	var a [][]*Call
-	for _, f := range s.Fields {
-		a = append(a, walkFunctionCalls(f.Expr))
-	}
-	return a
-}
-
-// walkFunctionCalls walks the Field of a query for any function calls made
-func walkFunctionCalls(exp Expr) []*Call {
-	switch expr := exp.(type) {
-	case *VarRef:
-		return nil
-	case *Call:
-		return []*Call{expr}
-	case *BinaryExpr:
-		var ret []*Call
-		ret = append(ret, walkFunctionCalls(expr.LHS)...)
-		ret = append(ret, walkFunctionCalls(expr.RHS)...)
-		return ret
-	case *ParenExpr:
-		return walkFunctionCalls(expr.Expr)
-	}
-
-	return nil
-}
-
-// filters an expression to exclude expressions unrelated to a source.
-func filterExprBySource(name string, expr Expr) Expr {
-	switch expr := expr.(type) {
-	case *VarRef:
-		if !strings.HasPrefix(expr.Val, name) {
-			return nil
-		}
-
-	case *BinaryExpr:
-		lhs := filterExprBySource(name, expr.LHS)
-		rhs := filterExprBySource(name, expr.RHS)
-
-		// If an expr is logical then return either LHS/RHS or both.
-		// If an expr is arithmetic or comparative then require both sides.
-		if expr.Op == AND || expr.Op == OR {
-			if lhs == nil && rhs == nil {
-				return nil
-			} else if lhs != nil && rhs == nil {
-				return lhs
-			} else if lhs == nil && rhs != nil {
-				return rhs
-			}
-		} else {
-			if lhs == nil || rhs == nil {
-				return nil
-			}
-		}
-		return &BinaryExpr{Op: expr.Op, LHS: lhs, RHS: rhs}
-
-	case *ParenExpr:
-		exp := filterExprBySource(name, expr.Expr)
-		if exp == nil {
-			return nil
-		}
-		return &ParenExpr{Expr: exp}
-	}
-	return expr
-}
-
-// MatchSource returns the source name that matches a field name.
-// Returns a blank string if no sources match.
-func MatchSource(sources Sources, name string) string {
-	for _, src := range sources {
-		switch src := src.(type) {
-		case *Measurement:
-			if strings.HasPrefix(name, src.Name) {
-				return src.Name
-			}
-		}
-	}
-	return ""
-}
-
-// Target represents a target (destination) policy, measurement, and DB.
-type Target struct {
-	// Measurement to write into.
-	Measurement *Measurement
-}
-
-// String returns a string representation of the Target.
-func (t *Target) String() string {
-	if t == nil {
-		return ""
-	}
-
-	var buf bytes.Buffer
-	_, _ = buf.WriteString("INTO ")
-	_, _ = buf.WriteString(t.Measurement.String())
-	if t.Measurement.Name == "" {
-		_, _ = buf.WriteString(":MEASUREMENT")
-	}
-
-	return buf.String()
-}
-
-// DeleteStatement represents a command for removing data from the database.
-type DeleteStatement struct {
-	// Data source that values are removed from.
-	Source Source
-
-	// An expression evaluated on data point.
-	Condition Expr
-}
-
-// String returns a string representation of the delete statement.
-func (s *DeleteStatement) String() string {
-	var buf bytes.Buffer
-	_, _ = buf.WriteString("DELETE ")
-	_, _ = buf.WriteString(s.Source.String())
-	if s.Condition != nil {
-		_, _ = buf.WriteString(" WHERE ")
-		_, _ = buf.WriteString(s.Condition.String())
-	}
-	return buf.String()
-}
-
-// RequiredPrivileges returns the privilege required to execute a DeleteStatement.
-func (s *DeleteStatement) RequiredPrivileges() ExecutionPrivileges {
-	return ExecutionPrivileges{{Admin: false, Name: "", Privilege: WritePrivilege}}
-}
-
-// ShowSeriesStatement represents a command for listing series in the database.
-type ShowSeriesStatement struct {
-	// Measurement(s) the series are listed for.
-	Sources Sources
-
-	// An expression evaluated on a series name or tag.
-	Condition Expr
-
-	// Fields to sort results by
-	SortFields SortFields
-
-	// Maximum number of rows to be returned.
-	// Unlimited if zero.
-	Limit int
-
-	// Returns rows starting at an offset from the first row.
-	Offset int
-}
-
-// String returns a string representation of the list series statement.
-func (s *ShowSeriesStatement) String() string {
-	var buf bytes.Buffer
-	_, _ = buf.WriteString("SHOW SERIES")
-
-	if s.Sources != nil {
-		_, _ = buf.WriteString(" FROM ")
-		_, _ = buf.WriteString(s.Sources.String())
-	}
-
-	if s.Condition != nil {
-		_, _ = buf.WriteString(" WHERE ")
-		_, _ = buf.WriteString(s.Condition.String())
-	}
-	if len(s.SortFields) > 0 {
-		_, _ = buf.WriteString(" ORDER BY ")
-		_, _ = buf.WriteString(s.SortFields.String())
-	}
-	if s.Limit > 0 {
-		_, _ = buf.WriteString(" LIMIT ")
-		_, _ = buf.WriteString(strconv.Itoa(s.Limit))
-	}
-	if s.Offset > 0 {
-		_, _ = buf.WriteString(" OFFSET ")
-		_, _ = buf.WriteString(strconv.Itoa(s.Offset))
-	}
-	return buf.String()
-}
-
-// RequiredPrivileges returns the privilege required to execute a ShowSeriesStatement.
-func (s *ShowSeriesStatement) RequiredPrivileges() ExecutionPrivileges {
-	return ExecutionPrivileges{{Admin: false, Name: "", Privilege: ReadPrivilege}}
-}
-
-// DropSeriesStatement represents a command for removing a series from the database.
-type DropSeriesStatement struct {
-	// Data source that fields are extracted from (optional)
-	Sources Sources
-
-	// An expression evaluated on data point (optional)
-	Condition Expr
-}
-
-// String returns a string representation of the drop series statement.
-func (s *DropSeriesStatement) String() string {
-	var buf bytes.Buffer
-	buf.WriteString("DROP SERIES")
-
-	if s.Sources != nil {
-		buf.WriteString(" FROM ")
-		buf.WriteString(s.Sources.String())
-	}
-	if s.Condition != nil {
-		buf.WriteString(" WHERE ")
-		buf.WriteString(s.Condition.String())
-	}
-
-	return buf.String()
-}
-
-// RequiredPrivileges returns the privilege required to execute a DropSeriesStatement.
-func (s DropSeriesStatement) RequiredPrivileges() ExecutionPrivileges {
-	return ExecutionPrivileges{{Admin: false, Name: "", Privilege: WritePrivilege}}
-}
-
-// DropServerStatement represents a command for removing a server from the cluster.
-type DropServerStatement struct {
-	// ID of the node to be dropped.
-	NodeID uint64
-	// Force will force the server to drop even it it means losing data
-	Force bool
-}
-
-// String returns a string representation of the drop series statement.
-func (s *DropServerStatement) String() string {
-	var buf bytes.Buffer
-	_, _ = buf.WriteString("DROP SERVER ")
-	_, _ = buf.WriteString(strconv.FormatUint(s.NodeID, 10))
-	if s.Force {
-		_, _ = buf.WriteString(" FORCE")
-	}
-	return buf.String()
-}
-
-// RequiredPrivileges returns the privilege required to execute a DropServerStatement.
-func (s *DropServerStatement) RequiredPrivileges() ExecutionPrivileges {
-	return ExecutionPrivileges{{Name: "", Privilege: AllPrivileges}}
-}
-
-// ShowContinuousQueriesStatement represents a command for listing continuous queries.
-type ShowContinuousQueriesStatement struct{}
-
-// String returns a string representation of the list continuous queries statement.
-func (s *ShowContinuousQueriesStatement) String() string { return "SHOW CONTINUOUS QUERIES" }
-
-// RequiredPrivileges returns the privilege required to execute a ShowContinuousQueriesStatement.
-func (s *ShowContinuousQueriesStatement) RequiredPrivileges() ExecutionPrivileges {
-	return ExecutionPrivileges{{Admin: false, Name: "", Privilege: ReadPrivilege}}
-}
-
-// ShowGrantsForUserStatement represents a command for listing user privileges.
-type ShowGrantsForUserStatement struct {
-	// Name of the user to display privileges.
-	Name string
-}
-
-// String returns a string representation of the show grants for user.
-func (s *ShowGrantsForUserStatement) String() string {
-	var buf bytes.Buffer
-	_, _ = buf.WriteString("SHOW GRANTS FOR ")
-	_, _ = buf.WriteString(s.Name)
-
-	return buf.String()
-}
-
-// RequiredPrivileges returns the privilege required to execute a ShowGrantsForUserStatement
-func (s *ShowGrantsForUserStatement) RequiredPrivileges() ExecutionPrivileges {
-	return ExecutionPrivileges{{Admin: true, Name: "", Privilege: AllPrivileges}}
-}
-
-// ShowServersStatement represents a command for listing all servers.
-type ShowServersStatement struct{}
-
-// String returns a string representation of the show servers command.
-func (s *ShowServersStatement) String() string { return "SHOW SERVERS" }
-
-// RequiredPrivileges returns the privilege required to execute a ShowServersStatement
-func (s *ShowServersStatement) RequiredPrivileges() ExecutionPrivileges {
-	return ExecutionPrivileges{{Admin: true, Name: "", Privilege: AllPrivileges}}
-}
-
-// ShowDatabasesStatement represents a command for listing all databases in the cluster.
-type ShowDatabasesStatement struct{}
-
-// String returns a string representation of the list databases command.
-func (s *ShowDatabasesStatement) String() string { return "SHOW DATABASES" }
-
-// RequiredPrivileges returns the privilege required to execute a ShowDatabasesStatement
-func (s *ShowDatabasesStatement) RequiredPrivileges() ExecutionPrivileges {
-	return ExecutionPrivileges{{Admin: true, Name: "", Privilege: AllPrivileges}}
-}
-
-// CreateContinuousQueryStatement represents a command for creating a continuous query.
-type CreateContinuousQueryStatement struct {
-	// Name of the continuous query to be created.
-	Name string
-
-	// Name of the database to create the continuous query on.
-	Database string
-
-	// Source of data (SELECT statement).
-	Source *SelectStatement
-}
-
-// String returns a string representation of the statement.
-func (s *CreateContinuousQueryStatement) String() string {
-	return fmt.Sprintf("CREATE CONTINUOUS QUERY %s ON %s BEGIN %s END", QuoteIdent(s.Name), QuoteIdent(s.Database), s.Source.String())
-}
-
-// DefaultDatabase returns the default database from the statement.
-func (s *CreateContinuousQueryStatement) DefaultDatabase() string {
-	return s.Database
-}
-
-// RequiredPrivileges returns the privilege required to execute a CreateContinuousQueryStatement.
-func (s *CreateContinuousQueryStatement) RequiredPrivileges() ExecutionPrivileges {
-	ep := ExecutionPrivileges{{Admin: false, Name: s.Database, Privilege: ReadPrivilege}}
-
-	// Selecting into a database that's different from the source?
-	if s.Source.Target.Measurement.Database != "" {
-		// Change source database privilege requirement to read.
-		ep[0].Privilege = ReadPrivilege
-
-		// Add destination database privilege requirement and set it to write.
-		p := ExecutionPrivilege{
-			Admin:     false,
-			Name:      s.Source.Target.Measurement.Database,
-			Privilege: WritePrivilege,
-		}
-		ep = append(ep, p)
-	}
-
-	return ep
-}
-
-// DropContinuousQueryStatement represents a command for removing a continuous query.
-type DropContinuousQueryStatement struct {
-	Name     string
-	Database string
-}
-
-// String returns a string representation of the statement.
-func (s *DropContinuousQueryStatement) String() string {
-	return fmt.Sprintf("DROP CONTINUOUS QUERY %s", s.Name)
-}
-
-// RequiredPrivileges returns the privilege(s) required to execute a DropContinuousQueryStatement
-func (s *DropContinuousQueryStatement) RequiredPrivileges() ExecutionPrivileges {
-	return ExecutionPrivileges{{Admin: false, Name: "", Privilege: WritePrivilege}}
-}
-
-// ShowMeasurementsStatement represents a command for listing measurements.
-type ShowMeasurementsStatement struct {
-	// Measurement name or regex.
-	Source Source
-
-	// An expression evaluated on data point.
-	Condition Expr
-
-	// Fields to sort results by
-	SortFields SortFields
-
-	// Maximum number of rows to be returned.
-	// Unlimited if zero.
-	Limit int
-
-	// Returns rows starting at an offset from the first row.
-	Offset int
-}
-
-// String returns a string representation of the statement.
-func (s *ShowMeasurementsStatement) String() string {
-	var buf bytes.Buffer
-	_, _ = buf.WriteString("SHOW MEASUREMENTS")
-
-	if s.Condition != nil {
-		_, _ = buf.WriteString(" WHERE ")
-		_, _ = buf.WriteString(s.Condition.String())
-	}
-	if len(s.SortFields) > 0 {
-		_, _ = buf.WriteString(" ORDER BY ")
-		_, _ = buf.WriteString(s.SortFields.String())
-	}
-	if s.Limit > 0 {
-		_, _ = buf.WriteString(" LIMIT ")
-		_, _ = buf.WriteString(strconv.Itoa(s.Limit))
-	}
-	if s.Offset > 0 {
-		_, _ = buf.WriteString(" OFFSET ")
-		_, _ = buf.WriteString(strconv.Itoa(s.Offset))
-	}
-	return buf.String()
-}
-
-// RequiredPrivileges returns the privilege(s) required to execute a ShowMeasurementsStatement
-func (s *ShowMeasurementsStatement) RequiredPrivileges() ExecutionPrivileges {
-	return ExecutionPrivileges{{Admin: false, Name: "", Privilege: ReadPrivilege}}
-}
-
-// DropMeasurementStatement represents a command to drop a measurement.
-type DropMeasurementStatement struct {
-	// Name of the measurement to be dropped.
-	Name string
-}
-
-// String returns a string representation of the drop measurement statement.
-func (s *DropMeasurementStatement) String() string {
-	var buf bytes.Buffer
-	_, _ = buf.WriteString("DROP MEASUREMENT ")
-	_, _ = buf.WriteString(s.Name)
-	return buf.String()
-}
-
-// RequiredPrivileges returns the privilege(s) required to execute a DropMeasurementStatement
-func (s *DropMeasurementStatement) RequiredPrivileges() ExecutionPrivileges {
-	return ExecutionPrivileges{{Admin: true, Name: "", Privilege: AllPrivileges}}
-}
-
-// ShowRetentionPoliciesStatement represents a command for listing retention policies.
-type ShowRetentionPoliciesStatement struct {
-	// Name of the database to list policies for.
-	Database string
-}
-
-// String returns a string representation of a ShowRetentionPoliciesStatement.
-func (s *ShowRetentionPoliciesStatement) String() string {
-	var buf bytes.Buffer
-	_, _ = buf.WriteString("SHOW RETENTION POLICIES ")
-	_, _ = buf.WriteString(s.Database)
-	return buf.String()
-}
-
-// RequiredPrivileges returns the privilege(s) required to execute a ShowRetentionPoliciesStatement
-func (s *ShowRetentionPoliciesStatement) RequiredPrivileges() ExecutionPrivileges {
-	return ExecutionPrivileges{{Admin: false, Name: "", Privilege: ReadPrivilege}}
-}
-
-// ShowStats statement displays statistics for a given module.
-type ShowStatsStatement struct {
-	// Module
-	Module string
-}
-
-// String returns a string representation of a ShowStatsStatement.
-func (s *ShowStatsStatement) String() string {
-	var buf bytes.Buffer
-	_, _ = buf.WriteString("SHOW STATS ")
-	if s.Module != "" {
-		_, _ = buf.WriteString("FOR ")
-		_, _ = buf.WriteString(s.Module)
-	}
-	return buf.String()
-}
-
-// RequiredPrivileges returns the privilege(s) required to execute a ShowStatsStatement
-func (s *ShowStatsStatement) RequiredPrivileges() ExecutionPrivileges {
-	return ExecutionPrivileges{{Admin: true, Name: "", Privilege: AllPrivileges}}
-}
-
-// ShowShardsStatement represents a command for displaying shards in the cluster.
-type ShowShardsStatement struct{}
-
-// String returns a string representation.
-func (s *ShowShardsStatement) String() string { return "SHOW SHARDS" }
-
-// RequiredPrivileges returns the privileges required to execute the statement.
-func (s *ShowShardsStatement) RequiredPrivileges() ExecutionPrivileges {
-	return ExecutionPrivileges{{Admin: true, Name: "", Privilege: AllPrivileges}}
-}
-
-// ShowDiagnosticsStatement represents a command for show node diagnostics.
-type ShowDiagnosticsStatement struct {
-	// Module
-	Module string
-}
-
-// String returns a string representation of the ShowDiagnosticsStatement.
-func (s *ShowDiagnosticsStatement) String() string {
-	var buf bytes.Buffer
-	_, _ = buf.WriteString("SHOW DIAGNOSTICS ")
-	if s.Module != "" {
-		_, _ = buf.WriteString("FOR ")
-		_, _ = buf.WriteString(s.Module)
-	}
-	return buf.String()
-}
-
-// RequiredPrivileges returns the privilege required to execute a ShowDiagnosticsStatement
-func (s *ShowDiagnosticsStatement) RequiredPrivileges() ExecutionPrivileges {
-	return ExecutionPrivileges{{Admin: true, Name: "", Privilege: AllPrivileges}}
-}
-
-// CreateSubscriptionStatement represents a command to add a subscription to the incoming data stream
-type CreateSubscriptionStatement struct {
-	Name            string
-	Database        string
-	RetentionPolicy string
-	Destinations    []string
-	Mode            string
-}
-
-// String returns a string representation of the CreateSubscriptionStatement.
-func (s *CreateSubscriptionStatement) String() string {
-	var destinations bytes.Buffer
-	for i, dest := range s.Destinations {
-		if i != 0 {
-			destinations.Write([]byte(`, `))
-		}
-		destinations.Write([]byte(`'`))
-		destinations.Write([]byte(dest))
-		destinations.Write([]byte(`'`))
-	}
-	return fmt.Sprintf(`CREATE SUBSCRIPTION "%s" ON "%s"."%s" DESTINATIONS %s %s `, s.Name, s.Database, s.RetentionPolicy, s.Mode, string(destinations.Bytes()))
-}
-
-// RequiredPrivileges returns the privilege required to execute a CreateSubscriptionStatement
-func (s *CreateSubscriptionStatement) RequiredPrivileges() ExecutionPrivileges {
-	return ExecutionPrivileges{{Admin: true, Name: "", Privilege: AllPrivileges}}
-}
-
-// DropSubscriptionStatement represents a command to drop a subscription to the incoming data stream.
-type DropSubscriptionStatement struct {
-	Name            string
-	Database        string
-	RetentionPolicy string
-}
-
-// String returns a string representation of the DropSubscriptionStatement.
-func (s *DropSubscriptionStatement) String() string {
-	return fmt.Sprintf(`DROP SUBSCRIPTION "%s" ON "%s"."%s"`, s.Name, s.Database, s.RetentionPolicy)
-}
-
-// RequiredPrivileges returns the privilege required to execute a DropSubscriptionStatement
-func (s *DropSubscriptionStatement) RequiredPrivileges() ExecutionPrivileges {
-	return ExecutionPrivileges{{Admin: true, Name: "", Privilege: AllPrivileges}}
-}
-
-// ShowSubscriptionsStatement represents a command to show a list of subscriptions.
-type ShowSubscriptionsStatement struct {
-}
-
-// String returns a string representation of the ShowSubscriptionStatement.
-func (s *ShowSubscriptionsStatement) String() string {
-	return "SHOW SUBSCRIPTIONS"
-}
-
-// RequiredPrivileges returns the privilege required to execute a ShowSubscriptionStatement
-func (s *ShowSubscriptionsStatement) RequiredPrivileges() ExecutionPrivileges {
-	return ExecutionPrivileges{{Admin: true, Name: "", Privilege: AllPrivileges}}
-}
-
-// ShowTagKeysStatement represents a command for listing tag keys.
-type ShowTagKeysStatement struct {
-	// Data sources that fields are extracted from.
-	Sources Sources
-
-	// An expression evaluated on data point.
-	Condition Expr
-
-	// Fields to sort results by
-	SortFields SortFields
-
-	// Maximum number of tag keys per measurement. Unlimited if zero.
-	Limit int
-
-	// Returns tag keys starting at an offset from the first row.
-	Offset int
-
-	// Maxiumum number of series to be returned. Unlimited if zero.
-	SLimit int
-
-	// Returns series starting at an offset from the first one.
-	SOffset int
-}
-
-// String returns a string representation of the statement.
-func (s *ShowTagKeysStatement) String() string {
-	var buf bytes.Buffer
-	_, _ = buf.WriteString("SHOW TAG KEYS")
-
-	if s.Sources != nil {
-		_, _ = buf.WriteString(" FROM ")
-		_, _ = buf.WriteString(s.Sources.String())
-	}
-	if s.Condition != nil {
-		_, _ = buf.WriteString(" WHERE ")
-		_, _ = buf.WriteString(s.Condition.String())
-	}
-	if len(s.SortFields) > 0 {
-		_, _ = buf.WriteString(" ORDER BY ")
-		_, _ = buf.WriteString(s.SortFields.String())
-	}
-	if s.Limit > 0 {
-		_, _ = buf.WriteString(" LIMIT ")
-		_, _ = buf.WriteString(strconv.Itoa(s.Limit))
-	}
-	if s.Offset > 0 {
-		_, _ = buf.WriteString(" OFFSET ")
-		_, _ = buf.WriteString(strconv.Itoa(s.Offset))
-	}
-	if s.SLimit > 0 {
-		_, _ = buf.WriteString(" SLIMIT ")
-		_, _ = buf.WriteString(strconv.Itoa(s.SLimit))
-	}
-	if s.SOffset > 0 {
-		_, _ = buf.WriteString(" SOFFSET ")
-		_, _ = buf.WriteString(strconv.Itoa(s.SOffset))
-	}
-	return buf.String()
-}
-
-// RequiredPrivileges returns the privilege(s) required to execute a ShowTagKeysStatement
-func (s *ShowTagKeysStatement) RequiredPrivileges() ExecutionPrivileges {
-	return ExecutionPrivileges{{Admin: false, Name: "", Privilege: ReadPrivilege}}
-}
-
-// ShowTagValuesStatement represents a command for listing tag values.
-type ShowTagValuesStatement struct {
-	// Data source that fields are extracted from.
-	Sources Sources
-
-	// Tag key(s) to pull values from.
-	TagKeys []string
-
-	// An expression evaluated on data point.
-	Condition Expr
-
-	// Fields to sort results by
-	SortFields SortFields
-
-	// Maximum number of rows to be returned.
-	// Unlimited if zero.
-	Limit int
-
-	// Returns rows starting at an offset from the first row.
-	Offset int
-}
-
-// String returns a string representation of the statement.
-func (s *ShowTagValuesStatement) String() string {
-	var buf bytes.Buffer
-	_, _ = buf.WriteString("SHOW TAG VALUES")
-
-	if s.Sources != nil {
-		_, _ = buf.WriteString(" FROM ")
-		_, _ = buf.WriteString(s.Sources.String())
-	}
-	if s.Condition != nil {
-		_, _ = buf.WriteString(" WHERE ")
-		_, _ = buf.WriteString(s.Condition.String())
-	}
-	if len(s.SortFields) > 0 {
-		_, _ = buf.WriteString(" ORDER BY ")
-		_, _ = buf.WriteString(s.SortFields.String())
-	}
-	if s.Limit > 0 {
-		_, _ = buf.WriteString(" LIMIT ")
-		_, _ = buf.WriteString(strconv.Itoa(s.Limit))
-	}
-	if s.Offset > 0 {
-		_, _ = buf.WriteString(" OFFSET ")
-		_, _ = buf.WriteString(strconv.Itoa(s.Offset))
-	}
-	return buf.String()
-}
-
-// RequiredPrivileges returns the privilege(s) required to execute a ShowTagValuesStatement
-func (s *ShowTagValuesStatement) RequiredPrivileges() ExecutionPrivileges {
-	return ExecutionPrivileges{{Admin: false, Name: "", Privilege: ReadPrivilege}}
-}
-
-// ShowUsersStatement represents a command for listing users.
-type ShowUsersStatement struct{}
-
-// String returns a string representation of the ShowUsersStatement.
-func (s *ShowUsersStatement) String() string {
-	return "SHOW USERS"
-}
-
-// RequiredPrivileges returns the privilege(s) required to execute a ShowUsersStatement
-func (s *ShowUsersStatement) RequiredPrivileges() ExecutionPrivileges {
-	return ExecutionPrivileges{{Admin: true, Name: "", Privilege: AllPrivileges}}
-}
-
-// ShowFieldKeysStatement represents a command for listing field keys.
-type ShowFieldKeysStatement struct {
-	// Data sources that fields are extracted from.
-	Sources Sources
-
-	// Fields to sort results by
-	SortFields SortFields
-
-	// Maximum number of rows to be returned.
-	// Unlimited if zero.
-	Limit int
-
-	// Returns rows starting at an offset from the first row.
-	Offset int
-}
-
-// String returns a string representation of the statement.
-func (s *ShowFieldKeysStatement) String() string {
-	var buf bytes.Buffer
-	_, _ = buf.WriteString("SHOW FIELD KEYS")
-
-	if s.Sources != nil {
-		_, _ = buf.WriteString(" FROM ")
-		_, _ = buf.WriteString(s.Sources.String())
-	}
-	if len(s.SortFields) > 0 {
-		_, _ = buf.WriteString(" ORDER BY ")
-		_, _ = buf.WriteString(s.SortFields.String())
-	}
-	if s.Limit > 0 {
-		_, _ = buf.WriteString(" LIMIT ")
-		_, _ = buf.WriteString(strconv.Itoa(s.Limit))
-	}
-	if s.Offset > 0 {
-		_, _ = buf.WriteString(" OFFSET ")
-		_, _ = buf.WriteString(strconv.Itoa(s.Offset))
-	}
-	return buf.String()
-}
-
-// RequiredPrivileges returns the privilege(s) required to execute a ShowFieldKeysStatement
-func (s *ShowFieldKeysStatement) RequiredPrivileges() ExecutionPrivileges {
-	return ExecutionPrivileges{{Admin: false, Name: "", Privilege: ReadPrivilege}}
-}
-
-// Fields represents a list of fields.
-type Fields []*Field
-
-// AliasNames returns a list of calculated field names in
-// order of alias, function name, then field.
-func (a Fields) AliasNames() []string {
-	names := []string{}
-	for _, f := range a {
-		names = append(names, f.Name())
-	}
-	return names
-}
-
-// Names returns a list of raw field names.
-func (a Fields) Names() []string {
-	names := []string{}
-	for _, f := range a {
-		var name string
-		switch expr := f.Expr.(type) {
-		case *Call:
-			name = expr.Name
-		case *VarRef:
-			name = expr.Val
-		}
-		names = append(names, name)
-	}
-	return names
-}
-
-// String returns a string representation of the fields.
-func (a Fields) String() string {
-	var str []string
-	for _, f := range a {
-		str = append(str, f.String())
-	}
-	return strings.Join(str, ", ")
-}
-
-// Field represents an expression retrieved from a select statement.
-type Field struct {
-	Expr  Expr
-	Alias string
-}
-
-// Name returns the name of the field. Returns alias, if set.
-// Otherwise uses the function name or variable name.
-func (f *Field) Name() string {
-	// Return alias, if set.
-	if f.Alias != "" {
-		return f.Alias
-	}
-
-	// Return the function name or variable name, if available.
-	switch expr := f.Expr.(type) {
-	case *Call:
-		return expr.Name
-	case *VarRef:
-		return expr.Val
-	}
-
-	// Otherwise return a blank name.
-	return ""
-}
-
-// String returns a string representation of the field.
-func (f *Field) String() string {
-	str := f.Expr.String()
-
-	if f.Alias == "" {
-		return str
-	}
-	return fmt.Sprintf("%s AS %s", str, fmt.Sprintf(`"%s"`, f.Alias))
-}
-
-// Sort Interface for Fields
-func (f Fields) Len() int           { return len(f) }
-func (f Fields) Less(i, j int) bool { return f[i].Name() < f[j].Name() }
-func (f Fields) Swap(i, j int)      { f[i], f[j] = f[j], f[i] }
-
-// Dimensions represents a list of dimensions.
-type Dimensions []*Dimension
-
-// String returns a string representation of the dimensions.
-func (a Dimensions) String() string {
-	var str []string
-	for _, d := range a {
-		str = append(str, d.String())
-	}
-	return strings.Join(str, ", ")
-}
-
-// Normalize returns the interval and tag dimensions separately.
-// Returns 0 if no time interval is specified.
-func (a Dimensions) Normalize() (time.Duration, []string) {
-	var dur time.Duration
-	var tags []string
-
-	for _, dim := range a {
-		switch expr := dim.Expr.(type) {
-		case *Call:
-			lit, _ := expr.Args[0].(*DurationLiteral)
-			dur = lit.Val
-		case *VarRef:
-			tags = append(tags, expr.Val)
-		}
-	}
-
-	return dur, tags
-}
-
-// Dimension represents an expression that a select statement is grouped by.
-type Dimension struct {
-	Expr Expr
-}
-
-// String returns a string representation of the dimension.
-func (d *Dimension) String() string { return d.Expr.String() }
-
-// Measurements represents a list of measurements.
-type Measurements []*Measurement
-
-// String returns a string representation of the measurements.
-func (a Measurements) String() string {
-	var str []string
-	for _, m := range a {
-		str = append(str, m.String())
-	}
-	return strings.Join(str, ", ")
-}
-
-// Measurement represents a single measurement used as a datasource.
-type Measurement struct {
-	Database        string
-	RetentionPolicy string
-	Name            string
-	Regex           *RegexLiteral
-	IsTarget        bool
-}
-
-// String returns a string representation of the measurement.
-func (m *Measurement) String() string {
-	var buf bytes.Buffer
-	if m.Database != "" {
-		_, _ = buf.WriteString(`"`)
-		_, _ = buf.WriteString(m.Database)
-		_, _ = buf.WriteString(`".`)
-	}
-
-	if m.RetentionPolicy != "" {
-		_, _ = buf.WriteString(`"`)
-		_, _ = buf.WriteString(m.RetentionPolicy)
-		_, _ = buf.WriteString(`"`)
-	}
-
-	if m.Database != "" || m.RetentionPolicy != "" {
-		_, _ = buf.WriteString(`.`)
-	}
-
-	if m.Name != "" {
-		_, _ = buf.WriteString(QuoteIdent(m.Name))
-	} else if m.Regex != nil {
-		_, _ = buf.WriteString(m.Regex.String())
-	}
-
-	return buf.String()
-}
-
-// VarRef represents a reference to a variable.
-type VarRef struct {
-	Val string
-}
-
-// String returns a string representation of the variable reference.
-func (r *VarRef) String() string {
-	return QuoteIdent(r.Val)
-}
-
-// Call represents a function call.
-type Call struct {
-	Name string
-	Args []Expr
-}
-
-// String returns a string representation of the call.
-func (c *Call) String() string {
-	// Join arguments.
-	var str []string
-	for _, arg := range c.Args {
-		str = append(str, arg.String())
-	}
-
-	// Write function name and args.
-	return fmt.Sprintf("%s(%s)", c.Name, strings.Join(str, ", "))
-}
-
-// Fields will extract any field names from the call.  Only specific calls support this.
-func (c *Call) Fields() []string {
-	switch c.Name {
-	case "top", "bottom":
-		// maintain the order the user specified in the query
-		keyMap := make(map[string]struct{})
-		keys := []string{}
-		for i, a := range c.Args {
-			if i == 0 {
-				// special case, first argument is always the name of the function regardless of the field name
-				keys = append(keys, c.Name)
-				continue
-			}
-			switch v := a.(type) {
-			case *VarRef:
-				if _, ok := keyMap[v.Val]; !ok {
-					keyMap[v.Val] = struct{}{}
-					keys = append(keys, v.Val)
-				}
-			}
-		}
-		return keys
-	case "min", "max", "first", "last", "sum", "mean":
-		// maintain the order the user specified in the query
-		keyMap := make(map[string]struct{})
-		keys := []string{}
-		for _, a := range c.Args {
-			switch v := a.(type) {
-			case *VarRef:
-				if _, ok := keyMap[v.Val]; !ok {
-					keyMap[v.Val] = struct{}{}
-					keys = append(keys, v.Val)
-				}
-			}
-		}
-		return keys
-	default:
-		panic(fmt.Sprintf("*call.Fields is unable to provide information on %s", c.Name))
-	}
-}
-
-// Distinct represents a DISTINCT expression.
-type Distinct struct {
-	// Identifier following DISTINCT
-	Val string
-}
-
-// String returns a string representation of the expression.
-func (d *Distinct) String() string {
-	return fmt.Sprintf("DISTINCT %s", d.Val)
-}
-
-// NewCall returns a new call expression from this expressions.
-func (d *Distinct) NewCall() *Call {
-	return &Call{
-		Name: "distinct",
-		Args: []Expr{
-			&VarRef{Val: d.Val},
-		},
-	}
-}
-
-// NumberLiteral represents a numeric literal.
-type NumberLiteral struct {
-	Val float64
-}
-
-// String returns a string representation of the literal.
-func (l *NumberLiteral) String() string { return strconv.FormatFloat(l.Val, 'f', 3, 64) }
-
-// BooleanLiteral represents a boolean literal.
-type BooleanLiteral struct {
-	Val bool
-}
-
-// String returns a string representation of the literal.
-func (l *BooleanLiteral) String() string {
-	if l.Val {
-		return "true"
-	}
-	return "false"
-}
-
-// isTrueLiteral returns true if the expression is a literal "true" value.
-func isTrueLiteral(expr Expr) bool {
-	if expr, ok := expr.(*BooleanLiteral); ok {
-		return expr.Val == true
-	}
-	return false
-}
-
-// isFalseLiteral returns true if the expression is a literal "false" value.
-func isFalseLiteral(expr Expr) bool {
-	if expr, ok := expr.(*BooleanLiteral); ok {
-		return expr.Val == false
-	}
-	return false
-}
-
-// StringLiteral represents a string literal.
-type StringLiteral struct {
-	Val string
-}
-
-// String returns a string representation of the literal.
-func (l *StringLiteral) String() string { return QuoteString(l.Val) }
-
-// TimeLiteral represents a point-in-time literal.
-type TimeLiteral struct {
-	Val time.Time
-}
-
-// String returns a string representation of the literal.
-func (l *TimeLiteral) String() string {
-	return `'` + l.Val.UTC().Format(time.RFC3339Nano) + `'`
-}
-
-// DurationLiteral represents a duration literal.
-type DurationLiteral struct {
-	Val time.Duration
-}
-
-// String returns a string representation of the literal.
-func (l *DurationLiteral) String() string { return FormatDuration(l.Val) }
-
-// nilLiteral represents a nil literal.
-// This is not available to the query language itself. It's only used internally.
-type nilLiteral struct{}
-
-// String returns a string representation of the literal.
-func (l *nilLiteral) String() string { return `nil` }
-
-// BinaryExpr represents an operation between two expressions.
-type BinaryExpr struct {
-	Op  Token
-	LHS Expr
-	RHS Expr
-}
-
-// String returns a string representation of the binary expression.
-func (e *BinaryExpr) String() string {
-	return fmt.Sprintf("%s %s %s", e.LHS.String(), e.Op.String(), e.RHS.String())
-}
-
-// ParenExpr represents a parenthesized expression.
-type ParenExpr struct {
-	Expr Expr
-}
-
-// String returns a string representation of the parenthesized expression.
-func (e *ParenExpr) String() string { return fmt.Sprintf("(%s)", e.Expr.String()) }
-
-// RegexLiteral represents a regular expression.
-type RegexLiteral struct {
-	Val *regexp.Regexp
-}
-
-// String returns a string representation of the literal.
-func (r *RegexLiteral) String() string {
-	if r.Val != nil {
-		return fmt.Sprintf("/%s/", strings.Replace(r.Val.String(), `/`, `\/`, -1))
-	}
-	return ""
-}
-
-// CloneRegexLiteral returns a clone of the RegexLiteral.
-func CloneRegexLiteral(r *RegexLiteral) *RegexLiteral {
-	if r == nil {
-		return nil
-	}
-
-	clone := &RegexLiteral{}
-	if r.Val != nil {
-		clone.Val = regexp.MustCompile(r.Val.String())
-	}
-
-	return clone
-}
-
-// Wildcard represents a wild card expression.
-type Wildcard struct{}
-
-// String returns a string representation of the wildcard.
-func (e *Wildcard) String() string { return "*" }
-
-// CloneExpr returns a deep copy of the expression.
-func CloneExpr(expr Expr) Expr {
-	if expr == nil {
-		return nil
-	}
-	switch expr := expr.(type) {
-	case *BinaryExpr:
-		return &BinaryExpr{Op: expr.Op, LHS: CloneExpr(expr.LHS), RHS: CloneExpr(expr.RHS)}
-	case *BooleanLiteral:
-		return &BooleanLiteral{Val: expr.Val}
-	case *Call:
-		args := make([]Expr, len(expr.Args))
-		for i, arg := range expr.Args {
-			args[i] = CloneExpr(arg)
-		}
-		return &Call{Name: expr.Name, Args: args}
-	case *Distinct:
-		return &Distinct{Val: expr.Val}
-	case *DurationLiteral:
-		return &DurationLiteral{Val: expr.Val}
-	case *NumberLiteral:
-		return &NumberLiteral{Val: expr.Val}
-	case *ParenExpr:
-		return &ParenExpr{Expr: CloneExpr(expr.Expr)}
-	case *RegexLiteral:
-		return &RegexLiteral{Val: expr.Val}
-	case *StringLiteral:
-		return &StringLiteral{Val: expr.Val}
-	case *TimeLiteral:
-		return &TimeLiteral{Val: expr.Val}
-	case *VarRef:
-		return &VarRef{Val: expr.Val}
-	case *Wildcard:
-		return &Wildcard{}
-	}
-	panic("unreachable")
-}
-
-// HasTimeExpr returns true if the expression has a time term.
-func HasTimeExpr(expr Expr) bool {
-	switch n := expr.(type) {
-	case *BinaryExpr:
-		if n.Op == AND || n.Op == OR {
-			return HasTimeExpr(n.LHS) || HasTimeExpr(n.RHS)
-		}
-		if ref, ok := n.LHS.(*VarRef); ok && strings.ToLower(ref.Val) == "time" {
-			return true
-		}
-		return false
-	case *ParenExpr:
-		// walk down the tree
-		return HasTimeExpr(n.Expr)
-	default:
-		return false
-	}
-}
-
-// OnlyTimeExpr returns true if the expression only has time constraints.
-func OnlyTimeExpr(expr Expr) bool {
-	if expr == nil {
-		return false
-	}
-	switch n := expr.(type) {
-	case *BinaryExpr:
-		if n.Op == AND || n.Op == OR {
-			return OnlyTimeExpr(n.LHS) && OnlyTimeExpr(n.RHS)
-		}
-		if ref, ok := n.LHS.(*VarRef); ok && strings.ToLower(ref.Val) == "time" {
-			return true
-		}
-		return false
-	case *ParenExpr:
-		// walk down the tree
-		return OnlyTimeExpr(n.Expr)
-	default:
-		return false
-	}
-}
-
-// TimeRange returns the minimum and maximum times specified by an expression.
-// Returns zero times if there is no bound.
-func TimeRange(expr Expr) (min, max time.Time) {
-	WalkFunc(expr, func(n Node) {
-		if n, ok := n.(*BinaryExpr); ok {
-			// Extract literal expression & operator on LHS.
-			// Check for "time" on the left-hand side first.
-			// Otherwise check for for the right-hand side and flip the operator.
-			value, op := timeExprValue(n.LHS, n.RHS), n.Op
-			if value.IsZero() {
-				if value = timeExprValue(n.RHS, n.LHS); value.IsZero() {
-					return
-				} else if op == LT {
-					op = GT
-				} else if op == LTE {
-					op = GTE
-				} else if op == GT {
-					op = LT
-				} else if op == GTE {
-					op = LTE
-				}
-			}
-
-			// Update the min/max depending on the operator.
-			// The GT & LT update the value by +/- 1ns not make them "not equal".
-			switch op {
-			case GT:
-				if min.IsZero() || value.After(min) {
-					min = value.Add(time.Nanosecond)
-				}
-			case GTE:
-				if min.IsZero() || value.After(min) {
-					min = value
-				}
-			case LT:
-				if max.IsZero() || value.Before(max) {
-					max = value.Add(-time.Nanosecond)
-				}
-			case LTE:
-				if max.IsZero() || value.Before(max) {
-					max = value
-				}
-			case EQ:
-				if min.IsZero() || value.After(min) {
-					min = value
-				}
-				if max.IsZero() || value.Before(max) {
-					max = value
-				}
-			}
-		}
-	})
-	return
-}
-
-// TimeRange returns the minimum and maximum times, as epoch nano, specified by
-// and expression. If there is no lower bound, the start of the epoch is returned
-// for minimum. If there is no higher bound, now is returned for maximum.
-func TimeRangeAsEpochNano(expr Expr) (min, max int64) {
-	tmin, tmax := TimeRange(expr)
-	if tmin.IsZero() {
-		min = time.Unix(0, 0).UnixNano()
-	} else {
-		min = tmin.UnixNano()
-	}
-	if tmax.IsZero() {
-		max = time.Now().UnixNano()
-	} else {
-		max = tmax.UnixNano()
-	}
-	return
-}
-
-// timeExprValue returns the time literal value of a "time == <TimeLiteral>" expression.
-// Returns zero time if the expression is not a time expression.
-func timeExprValue(ref Expr, lit Expr) time.Time {
-	if ref, ok := ref.(*VarRef); ok && strings.ToLower(ref.Val) == "time" {
-		switch lit := lit.(type) {
-		case *TimeLiteral:
-			return lit.Val
-		case *DurationLiteral:
-			return time.Unix(0, int64(lit.Val)).UTC()
-		case *NumberLiteral:
-			return time.Unix(0, int64(lit.Val)).UTC()
-		}
-	}
-	return time.Time{}
-}
-
-// Visitor can be called by Walk to traverse an AST hierarchy.
-// The Visit() function is called once per node.
-type Visitor interface {
-	Visit(Node) Visitor
-}
-
-// Walk traverses a node hierarchy in depth-first order.
-func Walk(v Visitor, node Node) {
-	if node == nil {
-		return
-	}
-
-	if v = v.Visit(node); v == nil {
-		return
-	}
-
-	switch n := node.(type) {
-	case *BinaryExpr:
-		Walk(v, n.LHS)
-		Walk(v, n.RHS)
-
-	case *Call:
-		for _, expr := range n.Args {
-			Walk(v, expr)
-		}
-
-	case *CreateContinuousQueryStatement:
-		Walk(v, n.Source)
-
-	case *Dimension:
-		Walk(v, n.Expr)
-
-	case Dimensions:
-		for _, c := range n {
-			Walk(v, c)
-		}
-
-	case *DropSeriesStatement:
-		Walk(v, n.Sources)
-		Walk(v, n.Condition)
-
-	case *Field:
-		Walk(v, n.Expr)
-
-	case Fields:
-		for _, c := range n {
-			Walk(v, c)
-		}
-
-	case *ParenExpr:
-		Walk(v, n.Expr)
-
-	case *Query:
-		Walk(v, n.Statements)
-
-	case *SelectStatement:
-		Walk(v, n.Fields)
-		Walk(v, n.Target)
-		Walk(v, n.Dimensions)
-		Walk(v, n.Sources)
-		Walk(v, n.Condition)
-		Walk(v, n.SortFields)
-
-	case *ShowSeriesStatement:
-		Walk(v, n.Sources)
-		Walk(v, n.Condition)
-
-	case *ShowTagKeysStatement:
-		Walk(v, n.Sources)
-		Walk(v, n.Condition)
-		Walk(v, n.SortFields)
-
-	case *ShowTagValuesStatement:
-		Walk(v, n.Sources)
-		Walk(v, n.Condition)
-		Walk(v, n.SortFields)
-
-	case *ShowFieldKeysStatement:
-		Walk(v, n.Sources)
-		Walk(v, n.SortFields)
-
-	case SortFields:
-		for _, sf := range n {
-			Walk(v, sf)
-		}
-
-	case Sources:
-		for _, s := range n {
-			Walk(v, s)
-		}
-
-	case Statements:
-		for _, s := range n {
-			Walk(v, s)
-		}
-
-	case *Target:
-		if n != nil {
-			Walk(v, n.Measurement)
-		}
-	}
-}
-
-// WalkFunc traverses a node hierarchy in depth-first order.
-func WalkFunc(node Node, fn func(Node)) {
-	Walk(walkFuncVisitor(fn), node)
-}
-
-type walkFuncVisitor func(Node)
-
-func (fn walkFuncVisitor) Visit(n Node) Visitor { fn(n); return fn }
-
-// Rewriter can be called by Rewrite to replace nodes in the AST hierarchy.
-// The Rewrite() function is called once per node.
-type Rewriter interface {
-	Rewrite(Node) Node
-}
-
-// Rewrite recursively invokes the rewriter to replace each node.
-// Nodes are traversed depth-first and rewritten from leaf to root.
-func Rewrite(r Rewriter, node Node) Node {
-	switch n := node.(type) {
-	case *Query:
-		n.Statements = Rewrite(r, n.Statements).(Statements)
-
-	case Statements:
-		for i, s := range n {
-			n[i] = Rewrite(r, s).(Statement)
-		}
-
-	case *SelectStatement:
-		n.Fields = Rewrite(r, n.Fields).(Fields)
-		n.Dimensions = Rewrite(r, n.Dimensions).(Dimensions)
-		n.Sources = Rewrite(r, n.Sources).(Sources)
-		n.Condition = Rewrite(r, n.Condition).(Expr)
-
-	case Fields:
-		for i, f := range n {
-			n[i] = Rewrite(r, f).(*Field)
-		}
-
-	case *Field:
-		n.Expr = Rewrite(r, n.Expr).(Expr)
-
-	case Dimensions:
-		for i, d := range n {
-			n[i] = Rewrite(r, d).(*Dimension)
-		}
-
-	case *Dimension:
-		n.Expr = Rewrite(r, n.Expr).(Expr)
-
-	case *BinaryExpr:
-		n.LHS = Rewrite(r, n.LHS).(Expr)
-		n.RHS = Rewrite(r, n.RHS).(Expr)
-
-	case *ParenExpr:
-		n.Expr = Rewrite(r, n.Expr).(Expr)
-
-	case *Call:
-		for i, expr := range n.Args {
-			n.Args[i] = Rewrite(r, expr).(Expr)
-		}
-	}
-
-	return r.Rewrite(node)
-}
-
-// RewriteFunc rewrites a node hierarchy.
-func RewriteFunc(node Node, fn func(Node) Node) Node {
-	return Rewrite(rewriterFunc(fn), node)
-}
-
-type rewriterFunc func(Node) Node
-
-func (fn rewriterFunc) Rewrite(n Node) Node { return fn(n) }
-
-// Eval evaluates expr against a map.
-func Eval(expr Expr, m map[string]interface{}) interface{} {
-	if expr == nil {
-		return nil
-	}
-
-	switch expr := expr.(type) {
-	case *BinaryExpr:
-		return evalBinaryExpr(expr, m)
-	case *BooleanLiteral:
-		return expr.Val
-	case *NumberLiteral:
-		return expr.Val
-	case *ParenExpr:
-		return Eval(expr.Expr, m)
-	case *StringLiteral:
-		return expr.Val
-	case *VarRef:
-		return m[expr.Val]
-	default:
-		return nil
-	}
-}
-
-func evalBinaryExpr(expr *BinaryExpr, m map[string]interface{}) interface{} {
-	lhs := Eval(expr.LHS, m)
-	rhs := Eval(expr.RHS, m)
-
-	// Evaluate if both sides are simple types.
-	switch lhs := lhs.(type) {
-	case bool:
-		rhs, _ := rhs.(bool)
-		switch expr.Op {
-		case AND:
-			return lhs && rhs
-		case OR:
-			return lhs || rhs
-		case EQ:
-			return lhs == rhs
-		case NEQ:
-			return lhs != rhs
-		}
-	case float64:
-		rhs, _ := rhs.(float64)
-		switch expr.Op {
-		case EQ:
-			return lhs == rhs
-		case NEQ:
-			return lhs != rhs
-		case LT:
-			return lhs < rhs
-		case LTE:
-			return lhs <= rhs
-		case GT:
-			return lhs > rhs
-		case GTE:
-			return lhs >= rhs
-		case ADD:
-			return lhs + rhs
-		case SUB:
-			return lhs - rhs
-		case MUL:
-			return lhs * rhs
-		case DIV:
-			if rhs == 0 {
-				return float64(0)
-			}
-			return lhs / rhs
-		}
-	case int64:
-		// we parse all number literals as float 64, so we have to convert from
-		// an interface to the float64, then cast to an int64 for comparison
-		rhsf, _ := rhs.(float64)
-		rhs := int64(rhsf)
-		switch expr.Op {
-		case EQ:
-			return lhs == rhs
-		case NEQ:
-			return lhs != rhs
-		case LT:
-			return lhs < rhs
-		case LTE:
-			return lhs <= rhs
-		case GT:
-			return lhs > rhs
-		case GTE:
-			return lhs >= rhs
-		case ADD:
-			return lhs + rhs
-		case SUB:
-			return lhs - rhs
-		case MUL:
-			return lhs * rhs
-		case DIV:
-			if rhs == 0 {
-				return int64(0)
-			}
-			return lhs / rhs
-		}
-	case string:
-		rhs, _ := rhs.(string)
-		switch expr.Op {
-		case EQ:
-			return lhs == rhs
-		case NEQ:
-			return lhs != rhs
-		}
-	}
-	return nil
-}
-
-// EvalBool evaluates expr and returns true if result is a boolean true.
-// Otherwise returns false.
-func EvalBool(expr Expr, m map[string]interface{}) bool {
-	v, _ := Eval(expr, m).(bool)
-	return v
-}
-
-// Reduce evaluates expr using the available values in valuer.
-// References that don't exist in valuer are ignored.
-func Reduce(expr Expr, valuer Valuer) Expr {
-	expr = reduce(expr, valuer)
-
-	// Unwrap parens at top level.
-	if expr, ok := expr.(*ParenExpr); ok {
-		return expr.Expr
-	}
-	return expr
-}
-
-func reduce(expr Expr, valuer Valuer) Expr {
-	if expr == nil {
-		return nil
-	}
-
-	switch expr := expr.(type) {
-	case *BinaryExpr:
-		return reduceBinaryExpr(expr, valuer)
-	case *Call:
-		return reduceCall(expr, valuer)
-	case *ParenExpr:
-		return reduceParenExpr(expr, valuer)
-	case *VarRef:
-		return reduceVarRef(expr, valuer)
-	default:
-		return CloneExpr(expr)
-	}
-}
-
-func reduceBinaryExpr(expr *BinaryExpr, valuer Valuer) Expr {
-	// Reduce both sides first.
-	op := expr.Op
-	lhs := reduce(expr.LHS, valuer)
-	rhs := reduce(expr.RHS, valuer)
-
-	// Do not evaluate if one side is nil.
-	if lhs == nil || rhs == nil {
-		return &BinaryExpr{LHS: lhs, RHS: rhs, Op: expr.Op}
-	}
-
-	// If we have a logical operator (AND, OR) and one side is a boolean literal
-	// then we need to have special handling.
-	if op == AND {
-		if isFalseLiteral(lhs) || isFalseLiteral(rhs) {
-			return &BooleanLiteral{Val: false}
-		} else if isTrueLiteral(lhs) {
-			return rhs
-		} else if isTrueLiteral(rhs) {
-			return lhs
-		}
-	} else if op == OR {
-		if isTrueLiteral(lhs) || isTrueLiteral(rhs) {
-			return &BooleanLiteral{Val: true}
-		} else if isFalseLiteral(lhs) {
-			return rhs
-		} else if isFalseLiteral(rhs) {
-			return lhs
-		}
-	}
-
-	// Evaluate if both sides are simple types.
-	switch lhs := lhs.(type) {
-	case *BooleanLiteral:
-		return reduceBinaryExprBooleanLHS(op, lhs, rhs)
-	case *DurationLiteral:
-		return reduceBinaryExprDurationLHS(op, lhs, rhs)
-	case *nilLiteral:
-		return reduceBinaryExprNilLHS(op, lhs, rhs)
-	case *NumberLiteral:
-		return reduceBinaryExprNumberLHS(op, lhs, rhs)
-	case *StringLiteral:
-		return reduceBinaryExprStringLHS(op, lhs, rhs)
-	case *TimeLiteral:
-		return reduceBinaryExprTimeLHS(op, lhs, rhs)
-	default:
-		return &BinaryExpr{Op: op, LHS: lhs, RHS: rhs}
-	}
-}
-
-func reduceBinaryExprBooleanLHS(op Token, lhs *BooleanLiteral, rhs Expr) Expr {
-	switch rhs := rhs.(type) {
-	case *BooleanLiteral:
-		switch op {
-		case EQ:
-			return &BooleanLiteral{Val: lhs.Val == rhs.Val}
-		case NEQ:
-			return &BooleanLiteral{Val: lhs.Val != rhs.Val}
-		case AND:
-			return &BooleanLiteral{Val: lhs.Val && rhs.Val}
-		case OR:
-			return &BooleanLiteral{Val: lhs.Val || rhs.Val}
-		}
-	case *nilLiteral:
-		return &BooleanLiteral{Val: false}
-	}
-	return &BinaryExpr{Op: op, LHS: lhs, RHS: rhs}
-}
-
-func reduceBinaryExprDurationLHS(op Token, lhs *DurationLiteral, rhs Expr) Expr {
-	switch rhs := rhs.(type) {
-	case *DurationLiteral:
-		switch op {
-		case ADD:
-			return &DurationLiteral{Val: lhs.Val + rhs.Val}
-		case SUB:
-			return &DurationLiteral{Val: lhs.Val - rhs.Val}
-		case EQ:
-			return &BooleanLiteral{Val: lhs.Val == rhs.Val}
-		case NEQ:
-			return &BooleanLiteral{Val: lhs.Val != rhs.Val}
-		case GT:
-			return &BooleanLiteral{Val: lhs.Val > rhs.Val}
-		case GTE:
-			return &BooleanLiteral{Val: lhs.Val >= rhs.Val}
-		case LT:
-			return &BooleanLiteral{Val: lhs.Val < rhs.Val}
-		case LTE:
-			return &BooleanLiteral{Val: lhs.Val <= rhs.Val}
-		}
-	case *NumberLiteral:
-		switch op {
-		case MUL:
-			return &DurationLiteral{Val: lhs.Val * time.Duration(rhs.Val)}
-		case DIV:
-			if rhs.Val == 0 {
-				return &DurationLiteral{Val: 0}
-			}
-			return &DurationLiteral{Val: lhs.Val / time.Duration(rhs.Val)}
-		}
-	case *TimeLiteral:
-		switch op {
-		case ADD:
-			return &TimeLiteral{Val: rhs.Val.Add(lhs.Val)}
-		}
-	case *nilLiteral:
-		return &BooleanLiteral{Val: false}
-	}
-	return &BinaryExpr{Op: op, LHS: lhs, RHS: rhs}
-}
-
-func reduceBinaryExprNilLHS(op Token, lhs *nilLiteral, rhs Expr) Expr {
-	switch op {
-	case EQ, NEQ:
-		return &BooleanLiteral{Val: false}
-	}
-	return &BinaryExpr{Op: op, LHS: lhs, RHS: rhs}
-}
-
-func reduceBinaryExprNumberLHS(op Token, lhs *NumberLiteral, rhs Expr) Expr {
-	switch rhs := rhs.(type) {
-	case *NumberLiteral:
-		switch op {
-		case ADD:
-			return &NumberLiteral{Val: lhs.Val + rhs.Val}
-		case SUB:
-			return &NumberLiteral{Val: lhs.Val - rhs.Val}
-		case MUL:
-			return &NumberLiteral{Val: lhs.Val * rhs.Val}
-		case DIV:
-			if rhs.Val == 0 {
-				return &NumberLiteral{Val: 0}
-			}
-			return &NumberLiteral{Val: lhs.Val / rhs.Val}
-		case EQ:
-			return &BooleanLiteral{Val: lhs.Val == rhs.Val}
-		case NEQ:
-			return &BooleanLiteral{Val: lhs.Val != rhs.Val}
-		case GT:
-			return &BooleanLiteral{Val: lhs.Val > rhs.Val}
-		case GTE:
-			return &BooleanLiteral{Val: lhs.Val >= rhs.Val}
-		case LT:
-			return &BooleanLiteral{Val: lhs.Val < rhs.Val}
-		case LTE:
-			return &BooleanLiteral{Val: lhs.Val <= rhs.Val}
-		}
-	case *nilLiteral:
-		return &BooleanLiteral{Val: false}
-	}
-	return &BinaryExpr{Op: op, LHS: lhs, RHS: rhs}
-}
-
-func reduceBinaryExprStringLHS(op Token, lhs *StringLiteral, rhs Expr) Expr {
-	switch rhs := rhs.(type) {
-	case *StringLiteral:
-		switch op {
-		case EQ:
-			return &BooleanLiteral{Val: lhs.Val == rhs.Val}
-		case NEQ:
-			return &BooleanLiteral{Val: lhs.Val != rhs.Val}
-		case ADD:
-			return &StringLiteral{Val: lhs.Val + rhs.Val}
-		}
-	case *nilLiteral:
-		switch op {
-		case EQ, NEQ:
-			return &BooleanLiteral{Val: false}
-		}
-	}
-	return &BinaryExpr{Op: op, LHS: lhs, RHS: rhs}
-}
-
-func reduceBinaryExprTimeLHS(op Token, lhs *TimeLiteral, rhs Expr) Expr {
-	switch rhs := rhs.(type) {
-	case *DurationLiteral:
-		switch op {
-		case ADD:
-			return &TimeLiteral{Val: lhs.Val.Add(rhs.Val)}
-		case SUB:
-			return &TimeLiteral{Val: lhs.Val.Add(-rhs.Val)}
-		}
-	case *TimeLiteral:
-		switch op {
-		case SUB:
-			return &DurationLiteral{Val: lhs.Val.Sub(rhs.Val)}
-		case EQ:
-			return &BooleanLiteral{Val: lhs.Val.Equal(rhs.Val)}
-		case NEQ:
-			return &BooleanLiteral{Val: !lhs.Val.Equal(rhs.Val)}
-		case GT:
-			return &BooleanLiteral{Val: lhs.Val.After(rhs.Val)}
-		case GTE:
-			return &BooleanLiteral{Val: lhs.Val.After(rhs.Val) || lhs.Val.Equal(rhs.Val)}
-		case LT:
-			return &BooleanLiteral{Val: lhs.Val.Before(rhs.Val)}
-		case LTE:
-			return &BooleanLiteral{Val: lhs.Val.Before(rhs.Val) || lhs.Val.Equal(rhs.Val)}
-		}
-	case *nilLiteral:
-		return &BooleanLiteral{Val: false}
-	}
-	return &BinaryExpr{Op: op, LHS: lhs, RHS: rhs}
-}
-
-func reduceCall(expr *Call, valuer Valuer) Expr {
-	// Evaluate "now()" if valuer is set.
-	if expr.Name == "now" && len(expr.Args) == 0 && valuer != nil {
-		if v, ok := valuer.Value("now()"); ok {
-			v, _ := v.(time.Time)
-			return &TimeLiteral{Val: v}
-		}
-	}
-
-	// Otherwise reduce arguments.
-	args := make([]Expr, len(expr.Args))
-	for i, arg := range expr.Args {
-		args[i] = reduce(arg, valuer)
-	}
-	return &Call{Name: expr.Name, Args: args}
-}
-
-func reduceParenExpr(expr *ParenExpr, valuer Valuer) Expr {
-	subexpr := reduce(expr.Expr, valuer)
-	if subexpr, ok := subexpr.(*BinaryExpr); ok {
-		return &ParenExpr{Expr: subexpr}
-	}
-	return subexpr
-}
-
-func reduceVarRef(expr *VarRef, valuer Valuer) Expr {
-	// Ignore if there is no valuer.
-	if valuer == nil {
-		return &VarRef{Val: expr.Val}
-	}
-
-	// Retrieve the value of the ref.
-	// Ignore if the value doesn't exist.
-	v, ok := valuer.Value(expr.Val)
-	if !ok {
-		return &VarRef{Val: expr.Val}
-	}
-
-	// Return the value as a literal.
-	switch v := v.(type) {
-	case bool:
-		return &BooleanLiteral{Val: v}
-	case time.Duration:
-		return &DurationLiteral{Val: v}
-	case float64:
-		return &NumberLiteral{Val: v}
-	case string:
-		return &StringLiteral{Val: v}
-	case time.Time:
-		return &TimeLiteral{Val: v}
-	default:
-		return &nilLiteral{}
-	}
-}
-
-// Valuer is the interface that wraps the Value() method.
-//
-// Value returns the value and existence flag for a given key.
-type Valuer interface {
-	Value(key string) (interface{}, bool)
-}
-
-// nowValuer returns only the value for "now()".
-type NowValuer struct {
-	Now time.Time
-}
-
-func (v *NowValuer) Value(key string) (interface{}, bool) {
-	if key == "now()" {
-		return v.Now, true
-	}
-	return nil, false
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/influxql/ast_test.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/influxql/ast_test.go
deleted file mode 100644
index 430c9a847..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/influxql/ast_test.go
+++ /dev/null
@@ -1,762 +0,0 @@
-package influxql_test
-
-import (
-	"fmt"
-	"reflect"
-	"strings"
-	"testing"
-	"time"
-
-	"github.com/influxdb/influxdb/influxql"
-)
-
-// Ensure a value's data type can be retrieved.
-func TestInspectDataType(t *testing.T) {
-	for i, tt := range []struct {
-		v   interface{}
-		typ influxql.DataType
-	}{
-		{float64(100), influxql.Float},
-	} {
-		if typ := influxql.InspectDataType(tt.v); tt.typ != typ {
-			t.Errorf("%d. %v (%s): unexpected type: %s", i, tt.v, tt.typ, typ)
-			continue
-		}
-	}
-}
-
-// Ensure the SELECT statement can extract substatements.
-func TestSelectStatement_Substatement(t *testing.T) {
-	var tests = []struct {
-		stmt string
-		expr *influxql.VarRef
-		sub  string
-		err  string
-	}{
-		// 0. Single series
-		{
-			stmt: `SELECT value FROM myseries WHERE value > 1`,
-			expr: &influxql.VarRef{Val: "value"},
-			sub:  `SELECT value FROM myseries WHERE value > 1.000`,
-		},
-
-		// 1. Simple join
-		{
-			stmt: `SELECT sum(aa.value) + sum(bb.value) FROM aa, bb`,
-			expr: &influxql.VarRef{Val: "aa.value"},
-			sub:  `SELECT "aa.value" FROM aa`,
-		},
-
-		// 2. Simple merge
-		{
-			stmt: `SELECT sum(aa.value) + sum(bb.value) FROM aa, bb`,
-			expr: &influxql.VarRef{Val: "bb.value"},
-			sub:  `SELECT "bb.value" FROM bb`,
-		},
-
-		// 3. Join with condition
-		{
-			stmt: `SELECT sum(aa.value) + sum(bb.value) FROM aa, bb WHERE aa.host = 'servera' AND bb.host = 'serverb'`,
-			expr: &influxql.VarRef{Val: "bb.value"},
-			sub:  `SELECT "bb.value" FROM bb WHERE "bb.host" = 'serverb'`,
-		},
-
-		// 4. Join with complex condition
-		{
-			stmt: `SELECT sum(aa.value) + sum(bb.value) FROM aa, bb WHERE aa.host = 'servera' AND (bb.host = 'serverb' OR bb.host = 'serverc') AND 1 = 2`,
-			expr: &influxql.VarRef{Val: "bb.value"},
-			sub:  `SELECT "bb.value" FROM bb WHERE ("bb.host" = 'serverb' OR "bb.host" = 'serverc') AND 1.000 = 2.000`,
-		},
-
-		// 5. 4 with different condition order
-		{
-			stmt: `SELECT sum(aa.value) + sum(bb.value) FROM aa, bb WHERE ((bb.host = 'serverb' OR bb.host = 'serverc') AND aa.host = 'servera') AND 1 = 2`,
-			expr: &influxql.VarRef{Val: "bb.value"},
-			sub:  `SELECT "bb.value" FROM bb WHERE (("bb.host" = 'serverb' OR "bb.host" = 'serverc')) AND 1.000 = 2.000`,
-		},
-	}
-
-	for i, tt := range tests {
-		// Parse statement.
-		stmt, err := influxql.NewParser(strings.NewReader(tt.stmt)).ParseStatement()
-		if err != nil {
-			t.Fatalf("invalid statement: %q: %s", tt.stmt, err)
-		}
-
-		// Extract substatement.
-		sub, err := stmt.(*influxql.SelectStatement).Substatement(tt.expr)
-		if err != nil {
-			t.Errorf("%d. %q: unexpected error: %s", i, tt.stmt, err)
-			continue
-		}
-		if substr := sub.String(); tt.sub != substr {
-			t.Errorf("%d. %q: unexpected substatement:\n\nexp=%s\n\ngot=%s\n\n", i, tt.stmt, tt.sub, substr)
-			continue
-		}
-	}
-}
-
-// Ensure the SELECT statement can extract GROUP BY interval.
-func TestSelectStatement_GroupByInterval(t *testing.T) {
-	q := "SELECT sum(value) from foo  where time < now() GROUP BY time(10m)"
-	stmt, err := influxql.NewParser(strings.NewReader(q)).ParseStatement()
-	if err != nil {
-		t.Fatalf("invalid statement: %q: %s", stmt, err)
-	}
-
-	s := stmt.(*influxql.SelectStatement)
-	d, err := s.GroupByInterval()
-	if d != 10*time.Minute {
-		t.Fatalf("group by interval not equal:\nexp=%s\ngot=%s", 10*time.Minute, d)
-	}
-	if err != nil {
-		t.Fatalf("error parsing group by interval: %s", err.Error())
-	}
-}
-
-// Ensure the SELECT statement can have its start and end time set
-func TestSelectStatement_SetTimeRange(t *testing.T) {
-	q := "SELECT sum(value) from foo where time < now() GROUP BY time(10m)"
-	stmt, err := influxql.NewParser(strings.NewReader(q)).ParseStatement()
-	if err != nil {
-		t.Fatalf("invalid statement: %q: %s", stmt, err)
-	}
-
-	s := stmt.(*influxql.SelectStatement)
-	min, max := influxql.TimeRange(s.Condition)
-	start := time.Now().Add(-20 * time.Hour).Round(time.Second).UTC()
-	end := time.Now().Add(10 * time.Hour).Round(time.Second).UTC()
-	s.SetTimeRange(start, end)
-	min, max = influxql.TimeRange(s.Condition)
-
-	if min != start {
-		t.Fatalf("start time wasn't set properly.\n  exp: %s\n  got: %s", start, min)
-	}
-	// the end range is actually one nanosecond before the given one since end is exclusive
-	end = end.Add(-time.Nanosecond)
-	if max != end {
-		t.Fatalf("end time wasn't set properly.\n  exp: %s\n  got: %s", end, max)
-	}
-
-	// ensure we can set a time on a select that already has one set
-	start = time.Now().Add(-20 * time.Hour).Round(time.Second).UTC()
-	end = time.Now().Add(10 * time.Hour).Round(time.Second).UTC()
-	q = fmt.Sprintf("SELECT sum(value) from foo WHERE time >= %ds and time <= %ds GROUP BY time(10m)", start.Unix(), end.Unix())
-	stmt, err = influxql.NewParser(strings.NewReader(q)).ParseStatement()
-	if err != nil {
-		t.Fatalf("invalid statement: %q: %s", stmt, err)
-	}
-
-	s = stmt.(*influxql.SelectStatement)
-	min, max = influxql.TimeRange(s.Condition)
-	if start != min || end != max {
-		t.Fatalf("start and end times weren't equal:\n  exp: %s\n  got: %s\n  exp: %s\n  got:%s\n", start, min, end, max)
-	}
-
-	// update and ensure it saves it
-	start = time.Now().Add(-40 * time.Hour).Round(time.Second).UTC()
-	end = time.Now().Add(20 * time.Hour).Round(time.Second).UTC()
-	s.SetTimeRange(start, end)
-	min, max = influxql.TimeRange(s.Condition)
-
-	// TODO: right now the SetTimeRange can't override the start time if it's more recent than what they're trying to set it to.
-	//       shouldn't matter for our purposes with continuous queries, but fix this later
-
-	if min != start {
-		t.Fatalf("start time wasn't set properly.\n  exp: %s\n  got: %s", start, min)
-	}
-	// the end range is actually one nanosecond before the given one since end is exclusive
-	end = end.Add(-time.Nanosecond)
-	if max != end {
-		t.Fatalf("end time wasn't set properly.\n  exp: %s\n  got: %s", end, max)
-	}
-
-	// ensure that when we set a time range other where clause conditions are still there
-	q = "SELECT sum(value) from foo WHERE foo = 'bar' and time < now() GROUP BY time(10m)"
-	stmt, err = influxql.NewParser(strings.NewReader(q)).ParseStatement()
-	if err != nil {
-		t.Fatalf("invalid statement: %q: %s", stmt, err)
-	}
-
-	s = stmt.(*influxql.SelectStatement)
-
-	// update and ensure it saves it
-	start = time.Now().Add(-40 * time.Hour).Round(time.Second).UTC()
-	end = time.Now().Add(20 * time.Hour).Round(time.Second).UTC()
-	s.SetTimeRange(start, end)
-	min, max = influxql.TimeRange(s.Condition)
-
-	if min != start {
-		t.Fatalf("start time wasn't set properly.\n  exp: %s\n  got: %s", start, min)
-	}
-	// the end range is actually one nanosecond before the given one since end is exclusive
-	end = end.Add(-time.Nanosecond)
-	if max != end {
-		t.Fatalf("end time wasn't set properly.\n  exp: %s\n  got: %s", end, max)
-	}
-
-	// ensure the where clause is there
-	hasWhere := false
-	influxql.WalkFunc(s.Condition, func(n influxql.Node) {
-		if ex, ok := n.(*influxql.BinaryExpr); ok {
-			if lhs, ok := ex.LHS.(*influxql.VarRef); ok {
-				if lhs.Val == "foo" {
-					if rhs, ok := ex.RHS.(*influxql.StringLiteral); ok {
-						if rhs.Val == "bar" {
-							hasWhere = true
-						}
-					}
-				}
-			}
-		}
-	})
-	if !hasWhere {
-		t.Fatal("set time range cleared out the where clause")
-	}
-}
-
-// Ensure the idents from the select clause can come out
-func TestSelect_NamesInSelect(t *testing.T) {
-	s := MustParseSelectStatement("select count(asdf), count(bar) from cpu")
-	a := s.NamesInSelect()
-	if !reflect.DeepEqual(a, []string{"asdf", "bar"}) {
-		t.Fatal("expected names asdf and bar")
-	}
-}
-
-// Ensure the idents from the where clause can come out
-func TestSelect_NamesInWhere(t *testing.T) {
-	s := MustParseSelectStatement("select * from cpu where time > 23s AND (asdf = 'jkl' OR (foo = 'bar' AND baz = 'bar'))")
-	a := s.NamesInWhere()
-	if !reflect.DeepEqual(a, []string{"time", "asdf", "foo", "baz"}) {
-		t.Fatalf("exp: time,asdf,foo,baz\ngot: %s\n", strings.Join(a, ","))
-	}
-}
-
-func TestSelectStatement_HasWildcard(t *testing.T) {
-	var tests = []struct {
-		stmt     string
-		wildcard bool
-	}{
-		// No wildcards
-		{
-			stmt:     `SELECT value FROM cpu`,
-			wildcard: false,
-		},
-
-		// Query wildcard
-		{
-			stmt:     `SELECT * FROM cpu`,
-			wildcard: true,
-		},
-
-		// No GROUP BY wildcards
-		{
-			stmt:     `SELECT value FROM cpu GROUP BY host`,
-			wildcard: false,
-		},
-
-		// No GROUP BY wildcards, time only
-		{
-			stmt:     `SELECT mean(value) FROM cpu where time < now() GROUP BY time(5ms)`,
-			wildcard: false,
-		},
-
-		// GROUP BY wildcard
-		{
-			stmt:     `SELECT value FROM cpu GROUP BY *`,
-			wildcard: true,
-		},
-
-		// GROUP BY wildcard with time
-		{
-			stmt:     `SELECT mean(value) FROM cpu where time < now() GROUP BY *,time(1m)`,
-			wildcard: true,
-		},
-
-		// GROUP BY wildcard with explicit
-		{
-			stmt:     `SELECT value FROM cpu GROUP BY *,host`,
-			wildcard: true,
-		},
-
-		// GROUP BY multiple wildcards
-		{
-			stmt:     `SELECT value FROM cpu GROUP BY *,*`,
-			wildcard: true,
-		},
-
-		// Combo
-		{
-			stmt:     `SELECT * FROM cpu GROUP BY *`,
-			wildcard: true,
-		},
-	}
-
-	for i, tt := range tests {
-		// Parse statement.
-		t.Logf("index: %d, statement: %s", i, tt.stmt)
-		stmt, err := influxql.NewParser(strings.NewReader(tt.stmt)).ParseStatement()
-		if err != nil {
-			t.Fatalf("invalid statement: %q: %s", tt.stmt, err)
-		}
-
-		// Test wildcard detection.
-		if w := stmt.(*influxql.SelectStatement).HasWildcard(); tt.wildcard != w {
-			t.Errorf("%d. %q: unexpected wildcard detection:\n\nexp=%v\n\ngot=%v\n\n", i, tt.stmt, tt.wildcard, w)
-			continue
-		}
-	}
-}
-
-// Test SELECT statement wildcard rewrite.
-func TestSelectStatement_RewriteWildcards(t *testing.T) {
-	var fields = influxql.Fields{
-		&influxql.Field{Expr: &influxql.VarRef{Val: "value1"}},
-		&influxql.Field{Expr: &influxql.VarRef{Val: "value2"}},
-	}
-	var dimensions = influxql.Dimensions{
-		&influxql.Dimension{Expr: &influxql.VarRef{Val: "host"}},
-		&influxql.Dimension{Expr: &influxql.VarRef{Val: "region"}},
-	}
-
-	var tests = []struct {
-		stmt    string
-		rewrite string
-	}{
-		// No wildcards
-		{
-			stmt:    `SELECT value FROM cpu`,
-			rewrite: `SELECT value FROM cpu`,
-		},
-
-		// Query wildcard
-		{
-			stmt:    `SELECT * FROM cpu`,
-			rewrite: `SELECT value1, value2 FROM cpu GROUP BY host, region`,
-		},
-
-		// Parser fundamentally prohibits multiple query sources
-
-		// Query wildcard with explicit
-		// {
-		//	stmt:    `SELECT *,value1 FROM cpu`,
-		//		rewrite: `SELECT value1, value2, value1 FROM cpu`,
-		//	},
-
-		// Query multiple wildcards
-		//	{
-		//			stmt:    `SELECT *,* FROM cpu`,
-		//			rewrite: `SELECT value1,value2,value1,value2 FROM cpu`,
-		//  },
-
-		// No GROUP BY wildcards
-		{
-			stmt:    `SELECT value FROM cpu GROUP BY host`,
-			rewrite: `SELECT value FROM cpu GROUP BY host`,
-		},
-
-		// No GROUP BY wildcards, time only
-		{
-			stmt:    `SELECT mean(value) FROM cpu where time < now() GROUP BY time(5ms)`,
-			rewrite: `SELECT mean(value) FROM cpu WHERE time < now() GROUP BY time(5ms)`,
-		},
-
-		// GROUP BY wildcard
-		{
-			stmt:    `SELECT value FROM cpu GROUP BY *`,
-			rewrite: `SELECT value FROM cpu GROUP BY host, region`,
-		},
-
-		// GROUP BY wildcard with time
-		{
-			stmt:    `SELECT mean(value) FROM cpu where time < now() GROUP BY *,time(1m)`,
-			rewrite: `SELECT mean(value) FROM cpu WHERE time < now() GROUP BY host, region, time(1m)`,
-		},
-
-		// GROUP BY wildarde with fill
-		{
-			stmt:    `SELECT mean(value) FROM cpu where time < now() GROUP BY *,time(1m) fill(0)`,
-			rewrite: `SELECT mean(value) FROM cpu WHERE time < now() GROUP BY host, region, time(1m) fill(0)`,
-		},
-
-		// GROUP BY wildcard with explicit
-		{
-			stmt:    `SELECT value FROM cpu GROUP BY *,host`,
-			rewrite: `SELECT value FROM cpu GROUP BY host, region, host`,
-		},
-
-		// GROUP BY multiple wildcards
-		{
-			stmt:    `SELECT value FROM cpu GROUP BY *,*`,
-			rewrite: `SELECT value FROM cpu GROUP BY host, region, host, region`,
-		},
-
-		// Combo
-		{
-			stmt:    `SELECT * FROM cpu GROUP BY *`,
-			rewrite: `SELECT value1, value2 FROM cpu GROUP BY host, region`,
-		},
-	}
-
-	for i, tt := range tests {
-		t.Logf("index: %d, statement: %s", i, tt.stmt)
-		// Parse statement.
-		stmt, err := influxql.NewParser(strings.NewReader(tt.stmt)).ParseStatement()
-		if err != nil {
-			t.Fatalf("invalid statement: %q: %s", tt.stmt, err)
-		}
-
-		// Rewrite statement.
-		rw := stmt.(*influxql.SelectStatement).RewriteWildcards(fields, dimensions)
-		if rw == nil {
-			t.Errorf("%d. %q: unexpected nil statement", i, tt.stmt)
-			continue
-		}
-		if rw := rw.String(); tt.rewrite != rw {
-			t.Errorf("%d. %q: unexpected rewrite:\n\nexp=%s\n\ngot=%s\n\n", i, tt.stmt, tt.rewrite, rw)
-			continue
-		}
-	}
-}
-
-// Ensure that the IsRawQuery flag gets set properly
-func TestSelectStatement_IsRawQuerySet(t *testing.T) {
-	var tests = []struct {
-		stmt  string
-		isRaw bool
-	}{
-		{
-			stmt:  "select * from foo",
-			isRaw: true,
-		},
-		{
-			stmt:  "select value1,value2 from foo",
-			isRaw: true,
-		},
-		{
-			stmt:  "select value1,value2 from foo, time(10m)",
-			isRaw: true,
-		},
-		{
-			stmt:  "select mean(value) from foo where time < now() group by time(5m)",
-			isRaw: false,
-		},
-		{
-			stmt:  "select mean(value) from foo group by bar",
-			isRaw: false,
-		},
-		{
-			stmt:  "select mean(value) from foo group by *",
-			isRaw: false,
-		},
-		{
-			stmt:  "select mean(value) from foo group by *",
-			isRaw: false,
-		},
-	}
-
-	for i, tt := range tests {
-		t.Logf("index: %d, statement: %s", i, tt.stmt)
-		s := MustParseSelectStatement(tt.stmt)
-		if s.IsRawQuery != tt.isRaw {
-			t.Errorf("'%s', IsRawQuery should be %v", tt.stmt, tt.isRaw)
-		}
-	}
-}
-
-// Ensure the time range of an expression can be extracted.
-func TestTimeRange(t *testing.T) {
-	for i, tt := range []struct {
-		expr     string
-		min, max string
-	}{
-		// LHS VarRef
-		{expr: `time > '2000-01-01 00:00:00'`, min: `2000-01-01T00:00:00.000000001Z`, max: `0001-01-01T00:00:00Z`},
-		{expr: `time >= '2000-01-01 00:00:00'`, min: `2000-01-01T00:00:00Z`, max: `0001-01-01T00:00:00Z`},
-		{expr: `time < '2000-01-01 00:00:00'`, min: `0001-01-01T00:00:00Z`, max: `1999-12-31T23:59:59.999999999Z`},
-		{expr: `time <= '2000-01-01 00:00:00'`, min: `0001-01-01T00:00:00Z`, max: `2000-01-01T00:00:00Z`},
-
-		// RHS VarRef
-		{expr: `'2000-01-01 00:00:00' > time`, min: `0001-01-01T00:00:00Z`, max: `1999-12-31T23:59:59.999999999Z`},
-		{expr: `'2000-01-01 00:00:00' >= time`, min: `0001-01-01T00:00:00Z`, max: `2000-01-01T00:00:00Z`},
-		{expr: `'2000-01-01 00:00:00' < time`, min: `2000-01-01T00:00:00.000000001Z`, max: `0001-01-01T00:00:00Z`},
-		{expr: `'2000-01-01 00:00:00' <= time`, min: `2000-01-01T00:00:00Z`, max: `0001-01-01T00:00:00Z`},
-
-		// number literal
-		{expr: `time < 10`, min: `0001-01-01T00:00:00Z`, max: `1970-01-01T00:00:00.000000009Z`},
-
-		// Equality
-		{expr: `time = '2000-01-01 00:00:00'`, min: `2000-01-01T00:00:00Z`, max: `2000-01-01T00:00:00Z`},
-
-		// Multiple time expressions.
-		{expr: `time >= '2000-01-01 00:00:00' AND time < '2000-01-02 00:00:00'`, min: `2000-01-01T00:00:00Z`, max: `2000-01-01T23:59:59.999999999Z`},
-
-		// Min/max crossover
-		{expr: `time >= '2000-01-01 00:00:00' AND time <= '1999-01-01 00:00:00'`, min: `2000-01-01T00:00:00Z`, max: `1999-01-01T00:00:00Z`},
-
-		// Absolute time
-		{expr: `time = 1388534400s`, min: `2014-01-01T00:00:00Z`, max: `2014-01-01T00:00:00Z`},
-
-		// Non-comparative expressions.
-		{expr: `time`, min: `0001-01-01T00:00:00Z`, max: `0001-01-01T00:00:00Z`},
-		{expr: `time + 2`, min: `0001-01-01T00:00:00Z`, max: `0001-01-01T00:00:00Z`},
-		{expr: `time - '2000-01-01 00:00:00'`, min: `0001-01-01T00:00:00Z`, max: `0001-01-01T00:00:00Z`},
-		{expr: `time AND '2000-01-01 00:00:00'`, min: `0001-01-01T00:00:00Z`, max: `0001-01-01T00:00:00Z`},
-	} {
-		// Extract time range.
-		expr := MustParseExpr(tt.expr)
-		min, max := influxql.TimeRange(expr)
-
-		// Compare with expected min/max.
-		if min := min.Format(time.RFC3339Nano); tt.min != min {
-			t.Errorf("%d. %s: unexpected min:\n\nexp=%s\n\ngot=%s\n\n", i, tt.expr, tt.min, min)
-			continue
-		}
-		if max := max.Format(time.RFC3339Nano); tt.max != max {
-			t.Errorf("%d. %s: unexpected max:\n\nexp=%s\n\ngot=%s\n\n", i, tt.expr, tt.max, max)
-			continue
-		}
-	}
-}
-
-// Ensure that we see if a where clause has only time limitations
-func TestOnlyTimeExpr(t *testing.T) {
-	var tests = []struct {
-		stmt string
-		exp  bool
-	}{
-		{
-			stmt: `SELECT value FROM myseries WHERE value > 1`,
-			exp:  false,
-		},
-		{
-			stmt: `SELECT value FROM foo WHERE time >= '2000-01-01T00:00:05Z'`,
-			exp:  true,
-		},
-		{
-			stmt: `SELECT value FROM foo WHERE time >= '2000-01-01T00:00:05Z' AND time < '2000-01-01T00:00:05Z'`,
-			exp:  true,
-		},
-		{
-			stmt: `SELECT value FROM foo WHERE time >= '2000-01-01T00:00:05Z' AND asdf = 'bar'`,
-			exp:  false,
-		},
-		{
-			stmt: `SELECT value FROM foo WHERE asdf = 'jkl' AND (time >= '2000-01-01T00:00:05Z' AND time < '2000-01-01T00:00:05Z')`,
-			exp:  false,
-		},
-	}
-
-	for i, tt := range tests {
-		// Parse statement.
-		stmt, err := influxql.NewParser(strings.NewReader(tt.stmt)).ParseStatement()
-		if err != nil {
-			t.Fatalf("invalid statement: %q: %s", tt.stmt, err)
-		}
-		if influxql.OnlyTimeExpr(stmt.(*influxql.SelectStatement).Condition) != tt.exp {
-			t.Fatalf("%d. expected statement to return only time dimension to be %t: %s", i, tt.exp, tt.stmt)
-		}
-	}
-}
-
-// Ensure an AST node can be rewritten.
-func TestRewrite(t *testing.T) {
-	expr := MustParseExpr(`time > 1 OR foo = 2`)
-
-	// Flip LHS & RHS in all binary expressions.
-	act := influxql.RewriteFunc(expr, func(n influxql.Node) influxql.Node {
-		switch n := n.(type) {
-		case *influxql.BinaryExpr:
-			return &influxql.BinaryExpr{Op: n.Op, LHS: n.RHS, RHS: n.LHS}
-		default:
-			return n
-		}
-	})
-
-	// Verify that everything is flipped.
-	if act := act.String(); act != `2.000 = foo OR 1.000 > time` {
-		t.Fatalf("unexpected result: %s", act)
-	}
-}
-
-// Ensure that the String() value of a statement is parseable
-func TestParseString(t *testing.T) {
-	var tests = []struct {
-		stmt string
-	}{
-		{
-			stmt: `SELECT "cpu load" FROM myseries`,
-		},
-		{
-			stmt: `SELECT "cpu load" FROM "my series"`,
-		},
-		{
-			stmt: `SELECT "cpu\"load" FROM myseries`,
-		},
-		{
-			stmt: `SELECT "cpu'load" FROM myseries`,
-		},
-		{
-			stmt: `SELECT "cpu load" FROM "my\"series"`,
-		},
-		{
-			stmt: `SELECT * FROM myseries`,
-		},
-	}
-
-	for _, tt := range tests {
-		// Parse statement.
-		stmt, err := influxql.NewParser(strings.NewReader(tt.stmt)).ParseStatement()
-		if err != nil {
-			t.Fatalf("invalid statement: %q: %s", tt.stmt, err)
-		}
-
-		_, err = influxql.NewParser(strings.NewReader(stmt.String())).ParseStatement()
-		if err != nil {
-			t.Fatalf("failed to parse string: %v\norig: %v\ngot: %v", err, tt.stmt, stmt.String())
-		}
-	}
-}
-
-// Ensure an expression can be reduced.
-func TestEval(t *testing.T) {
-	for i, tt := range []struct {
-		in   string
-		out  interface{}
-		data map[string]interface{}
-	}{
-		// Number literals.
-		{in: `1 + 2`, out: float64(3)},
-		{in: `(foo*2) + ( (4/2) + (3 * 5) - 0.5 )`, out: float64(26.5), data: map[string]interface{}{"foo": float64(5)}},
-		{in: `foo / 2`, out: float64(2), data: map[string]interface{}{"foo": float64(4)}},
-		{in: `4 = 4`, out: true},
-		{in: `4 <> 4`, out: false},
-		{in: `6 > 4`, out: true},
-		{in: `4 >= 4`, out: true},
-		{in: `4 < 6`, out: true},
-		{in: `4 <= 4`, out: true},
-		{in: `4 AND 5`, out: nil},
-
-		// Boolean literals.
-		{in: `true AND false`, out: false},
-		{in: `true OR false`, out: true},
-
-		// String literals.
-		{in: `'foo' = 'bar'`, out: false},
-		{in: `'foo' = 'foo'`, out: true},
-
-		// Variable references.
-		{in: `foo`, out: "bar", data: map[string]interface{}{"foo": "bar"}},
-		{in: `foo = 'bar'`, out: true, data: map[string]interface{}{"foo": "bar"}},
-		{in: `foo = 'bar'`, out: nil, data: map[string]interface{}{"foo": nil}},
-		{in: `foo <> 'bar'`, out: true, data: map[string]interface{}{"foo": "xxx"}},
-	} {
-		// Evaluate expression.
-		out := influxql.Eval(MustParseExpr(tt.in), tt.data)
-
-		// Compare with expected output.
-		if !reflect.DeepEqual(tt.out, out) {
-			t.Errorf("%d. %s: unexpected output:\n\nexp=%#v\n\ngot=%#v\n\n", i, tt.in, tt.out, out)
-			continue
-		}
-	}
-}
-
-// Ensure an expression can be reduced.
-func TestReduce(t *testing.T) {
-	now := mustParseTime("2000-01-01T00:00:00Z")
-
-	for i, tt := range []struct {
-		in   string
-		out  string
-		data Valuer
-	}{
-		// Number literals.
-		{in: `1 + 2`, out: `3.000`},
-		{in: `(foo*2) + ( (4/2) + (3 * 5) - 0.5 )`, out: `(foo * 2.000) + 16.500`},
-		{in: `foo(bar(2 + 3), 4)`, out: `foo(bar(5.000), 4.000)`},
-		{in: `4 / 0`, out: `0.000`},
-		{in: `4 = 4`, out: `true`},
-		{in: `4 <> 4`, out: `false`},
-		{in: `6 > 4`, out: `true`},
-		{in: `4 >= 4`, out: `true`},
-		{in: `4 < 6`, out: `true`},
-		{in: `4 <= 4`, out: `true`},
-		{in: `4 AND 5`, out: `4.000 AND 5.000`},
-
-		// Boolean literals.
-		{in: `true AND false`, out: `false`},
-		{in: `true OR false`, out: `true`},
-		{in: `true OR (foo = bar AND 1 > 2)`, out: `true`},
-		{in: `(foo = bar AND 1 > 2) OR true`, out: `true`},
-		{in: `false OR (foo = bar AND 1 > 2)`, out: `false`},
-		{in: `(foo = bar AND 1 > 2) OR false`, out: `false`},
-		{in: `true = false`, out: `false`},
-		{in: `true <> false`, out: `true`},
-		{in: `true + false`, out: `true + false`},
-
-		// Time literals.
-		{in: `now() + 2h`, out: `'2000-01-01T02:00:00Z'`, data: map[string]interface{}{"now()": now}},
-		{in: `now() / 2h`, out: `'2000-01-01T00:00:00Z' / 2h`, data: map[string]interface{}{"now()": now}},
-		{in: `4µ + now()`, out: `'2000-01-01T00:00:00.000004Z'`, data: map[string]interface{}{"now()": now}},
-		{in: `now() = now()`, out: `true`, data: map[string]interface{}{"now()": now}},
-		{in: `now() <> now()`, out: `false`, data: map[string]interface{}{"now()": now}},
-		{in: `now() < now() + 1h`, out: `true`, data: map[string]interface{}{"now()": now}},
-		{in: `now() <= now() + 1h`, out: `true`, data: map[string]interface{}{"now()": now}},
-		{in: `now() >= now() - 1h`, out: `true`, data: map[string]interface{}{"now()": now}},
-		{in: `now() > now() - 1h`, out: `true`, data: map[string]interface{}{"now()": now}},
-		{in: `now() - (now() - 60s)`, out: `1m`, data: map[string]interface{}{"now()": now}},
-		{in: `now() AND now()`, out: `'2000-01-01T00:00:00Z' AND '2000-01-01T00:00:00Z'`, data: map[string]interface{}{"now()": now}},
-		{in: `now()`, out: `now()`},
-
-		// Duration literals.
-		{in: `10m + 1h - 60s`, out: `69m`},
-		{in: `(10m / 2) * 5`, out: `25m`},
-		{in: `60s = 1m`, out: `true`},
-		{in: `60s <> 1m`, out: `false`},
-		{in: `60s < 1h`, out: `true`},
-		{in: `60s <= 1h`, out: `true`},
-		{in: `60s > 12s`, out: `true`},
-		{in: `60s >= 1m`, out: `true`},
-		{in: `60s AND 1m`, out: `1m AND 1m`},
-		{in: `60m / 0`, out: `0s`},
-		{in: `60m + 50`, out: `1h + 50.000`},
-
-		// String literals.
-		{in: `'foo' + 'bar'`, out: `'foobar'`},
-
-		// Variable references.
-		{in: `foo`, out: `'bar'`, data: map[string]interface{}{"foo": "bar"}},
-		{in: `foo = 'bar'`, out: `true`, data: map[string]interface{}{"foo": "bar"}},
-		{in: `foo = 'bar'`, out: `false`, data: map[string]interface{}{"foo": nil}},
-		{in: `foo <> 'bar'`, out: `false`, data: map[string]interface{}{"foo": nil}},
-	} {
-		// Fold expression.
-		expr := influxql.Reduce(MustParseExpr(tt.in), tt.data)
-
-		// Compare with expected output.
-		if out := expr.String(); tt.out != out {
-			t.Errorf("%d. %s: unexpected expr:\n\nexp=%s\n\ngot=%s\n\n", i, tt.in, tt.out, out)
-			continue
-		}
-	}
-}
-
-// Valuer represents a simple wrapper around a map to implement the influxql.Valuer interface.
-type Valuer map[string]interface{}
-
-// Value returns the value and existence of a key.
-func (o Valuer) Value(key string) (v interface{}, ok bool) {
-	v, ok = o[key]
-	return
-}
-
-// mustParseTime parses an IS0-8601 string. Panic on error.
-func mustParseTime(s string) time.Time {
-	t, err := time.Parse(time.RFC3339, s)
-	if err != nil {
-		panic(err.Error())
-	}
-	return t
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/influxql/doc.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/influxql/doc.go
deleted file mode 100644
index f93da4b45..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/influxql/doc.go
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
-Package influxql implements a parser for the InfluxDB query language.
-
-InfluxQL is a DML and DDL language for the InfluxDB time series database.
-It provides the ability to query for aggregate statistics as well as create
-and configure the InfluxDB server.
-
-Selecting data
-
-The SELECT query is used for retrieving data from one or more series. It allows
-for a list of columns followed by a list of series to select from.
-
-	SELECT value FROM cpu_load
-
-You can also add a a conditional expression to limit the results of the query:
-
-	SELECT value FROM cpu_load WHERE host = 'influxdb.com'
-
-Two or more series can be combined into a single query and executed together:
-
-	SELECT cpu0.value + cpu1.value
-	FROM cpu_load AS cpu0 INNER JOIN cpu_load cpu1 ON cpu0.host = cpu1.host
-
-Limits and ordering can be set on selection queries as well:
-
-	SELECT value FROM cpu_load LIMIT 100 ORDER DESC;
-
-
-Removing data
-
-The DELETE query is available to remove time series data points from the
-database. This query will delete "cpu_load" values older than an hour:
-
-	DELETE FROM cpu_load WHERE time < now() - 1h
-
-
-Continuous Queries
-
-Queries can be run indefinitely on the server in order to generate new series.
-This is done by running a "SELECT INTO" query. For example, this query computes
-the hourly mean for cpu_load and stores it into a "cpu_load" series in the
-"daily" shard space.
-
-	SELECT mean(value) AS value FROM cpu_load GROUP BY 1h
-	INTO daily.cpu_load
-
-If there is existing data on the source series then this query will be run for
-all historic data. To only execute the query on new incoming data you can append
-"NO BACKFILL" to the end of the query:
-
-	SELECT mean(value) AS value FROM cpu_load GROUP BY 1h
-	INTO daily.cpu_load NO BACKFILL
-
-Continuous queries will return an id that can be used to remove them in the
-future. To remove a continous query, use the DROP CONTINUOUS QUERY statement:
-
-	DROP CONTINUOUS QUERY 12
-
-You can also list all continuous queries by running:
-
-	LIST CONTINUOUS QUERIES
-
-*/
-package influxql
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/influxql/parser.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/influxql/parser.go
deleted file mode 100644
index c13a6b46b..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/influxql/parser.go
+++ /dev/null
@@ -1,2524 +0,0 @@
-package influxql
-
-import (
-	"bytes"
-	"errors"
-	"fmt"
-	"io"
-	"math"
-	"regexp"
-	"sort"
-	"strconv"
-	"strings"
-	"time"
-)
-
-const (
-	// DateFormat represents the format for date literals.
-	DateFormat = "2006-01-02"
-
-	// DateTimeFormat represents the format for date time literals.
-	DateTimeFormat = "2006-01-02 15:04:05.999999"
-)
-
-// Parser represents an InfluxQL parser.
-type Parser struct {
-	s *bufScanner
-}
-
-// NewParser returns a new instance of Parser.
-func NewParser(r io.Reader) *Parser {
-	return &Parser{s: newBufScanner(r)}
-}
-
-// ParseQuery parses a query string and returns its AST representation.
-func ParseQuery(s string) (*Query, error) { return NewParser(strings.NewReader(s)).ParseQuery() }
-
-// ParseStatement parses a statement string and returns its AST representation.
-func ParseStatement(s string) (Statement, error) {
-	return NewParser(strings.NewReader(s)).ParseStatement()
-}
-
-// MustParseStatement parses a statement string and returns its AST. Panic on error.
-func MustParseStatement(s string) Statement {
-	stmt, err := ParseStatement(s)
-	if err != nil {
-		panic(err.Error())
-	}
-	return stmt
-}
-
-// ParseExpr parses an expression string and returns its AST representation.
-func ParseExpr(s string) (Expr, error) { return NewParser(strings.NewReader(s)).ParseExpr() }
-
-// ParseQuery parses an InfluxQL string and returns a Query AST object.
-func (p *Parser) ParseQuery() (*Query, error) {
-	var statements Statements
-	var semi bool
-
-	for {
-		if tok, _, _ := p.scanIgnoreWhitespace(); tok == EOF {
-			return &Query{Statements: statements}, nil
-		} else if !semi && tok == SEMICOLON {
-			semi = true
-		} else {
-			p.unscan()
-			s, err := p.ParseStatement()
-			if err != nil {
-				return nil, err
-			}
-			statements = append(statements, s)
-			semi = false
-		}
-	}
-}
-
-// ParseStatement parses an InfluxQL string and returns a Statement AST object.
-func (p *Parser) ParseStatement() (Statement, error) {
-	// Inspect the first token.
-	tok, pos, lit := p.scanIgnoreWhitespace()
-	switch tok {
-	case SELECT:
-		return p.parseSelectStatement(targetNotRequired)
-	case DELETE:
-		return p.parseDeleteStatement()
-	case SHOW:
-		return p.parseShowStatement()
-	case CREATE:
-		return p.parseCreateStatement()
-	case DROP:
-		return p.parseDropStatement()
-	case GRANT:
-		return p.parseGrantStatement()
-	case REVOKE:
-		return p.parseRevokeStatement()
-	case ALTER:
-		return p.parseAlterStatement()
-	case SET:
-		return p.parseSetPasswordUserStatement()
-	default:
-		return nil, newParseError(tokstr(tok, lit), []string{"SELECT", "DELETE", "SHOW", "CREATE", "DROP", "GRANT", "REVOKE", "ALTER", "SET"}, pos)
-	}
-}
-
-// parseShowStatement parses a string and returns a list statement.
-// This function assumes the SHOW token has already been consumed.
-func (p *Parser) parseShowStatement() (Statement, error) {
-	tok, pos, lit := p.scanIgnoreWhitespace()
-	switch tok {
-	case CONTINUOUS:
-		return p.parseShowContinuousQueriesStatement()
-	case GRANTS:
-		return p.parseGrantsForUserStatement()
-	case DATABASES:
-		return p.parseShowDatabasesStatement()
-	case SERVERS:
-		return p.parseShowServersStatement()
-	case FIELD:
-		tok, pos, lit := p.scanIgnoreWhitespace()
-		if tok == KEYS {
-			return p.parseShowFieldKeysStatement()
-		}
-		return nil, newParseError(tokstr(tok, lit), []string{"KEYS", "VALUES"}, pos)
-	case MEASUREMENTS:
-		return p.parseShowMeasurementsStatement()
-	case RETENTION:
-		tok, pos, lit := p.scanIgnoreWhitespace()
-		if tok == POLICIES {
-			return p.parseShowRetentionPoliciesStatement()
-		}
-		return nil, newParseError(tokstr(tok, lit), []string{"POLICIES"}, pos)
-	case SERIES:
-		return p.parseShowSeriesStatement()
-	case SHARDS:
-		return p.parseShowShardsStatement()
-	case STATS:
-		return p.parseShowStatsStatement()
-	case DIAGNOSTICS:
-		return p.parseShowDiagnosticsStatement()
-	case TAG:
-		tok, pos, lit := p.scanIgnoreWhitespace()
-		if tok == KEYS {
-			return p.parseShowTagKeysStatement()
-		} else if tok == VALUES {
-			return p.parseShowTagValuesStatement()
-		}
-		return nil, newParseError(tokstr(tok, lit), []string{"KEYS", "VALUES"}, pos)
-	case USERS:
-		return p.parseShowUsersStatement()
-	case SUBSCRIPTIONS:
-		return p.parseShowSubscriptionsStatement()
-	}
-
-	showQueryKeywords := []string{
-		"CONTINUOUS",
-		"DATABASES",
-		"FIELD",
-		"GRANTS",
-		"MEASUREMENTS",
-		"RETENTION",
-		"SERIES",
-		"SERVERS",
-		"TAG",
-		"USERS",
-		"STATS",
-		"DIAGNOSTICS",
-		"SHARDS",
-		"SUBSCRIPTIONS",
-	}
-	sort.Strings(showQueryKeywords)
-
-	return nil, newParseError(tokstr(tok, lit), showQueryKeywords, pos)
-}
-
-// parseCreateStatement parses a string and returns a create statement.
-// This function assumes the CREATE token has already been consumed.
-func (p *Parser) parseCreateStatement() (Statement, error) {
-	tok, pos, lit := p.scanIgnoreWhitespace()
-	if tok == CONTINUOUS {
-		return p.parseCreateContinuousQueryStatement()
-	} else if tok == DATABASE {
-		return p.parseCreateDatabaseStatement()
-	} else if tok == USER {
-		return p.parseCreateUserStatement()
-	} else if tok == RETENTION {
-		tok, pos, lit = p.scanIgnoreWhitespace()
-		if tok != POLICY {
-			return nil, newParseError(tokstr(tok, lit), []string{"POLICY"}, pos)
-		}
-		return p.parseCreateRetentionPolicyStatement()
-	} else if tok == SUBSCRIPTION {
-		return p.parseCreateSubscriptionStatement()
-	}
-
-	return nil, newParseError(tokstr(tok, lit), []string{"CONTINUOUS", "DATABASE", "USER", "RETENTION", "SUBSCRIPTION"}, pos)
-}
-
-// parseDropStatement parses a string and returns a drop statement.
-// This function assumes the DROP token has already been consumed.
-func (p *Parser) parseDropStatement() (Statement, error) {
-	tok, pos, lit := p.scanIgnoreWhitespace()
-	if tok == SERIES {
-		return p.parseDropSeriesStatement()
-	} else if tok == MEASUREMENT {
-		return p.parseDropMeasurementStatement()
-	} else if tok == CONTINUOUS {
-		return p.parseDropContinuousQueryStatement()
-	} else if tok == DATABASE {
-		return p.parseDropDatabaseStatement()
-	} else if tok == RETENTION {
-		if tok, pos, lit := p.scanIgnoreWhitespace(); tok != POLICY {
-			return nil, newParseError(tokstr(tok, lit), []string{"POLICY"}, pos)
-		}
-		return p.parseDropRetentionPolicyStatement()
-	} else if tok == USER {
-		return p.parseDropUserStatement()
-	} else if tok == SERVER {
-		return p.parseDropServerStatement()
-	} else if tok == SUBSCRIPTION {
-		return p.parseDropSubscriptionStatement()
-	}
-
-	return nil, newParseError(tokstr(tok, lit), []string{"SERIES", "CONTINUOUS", "MEASUREMENT", "SERVER", "SUBSCRIPTION"}, pos)
-}
-
-// parseAlterStatement parses a string and returns an alter statement.
-// This function assumes the ALTER token has already been consumed.
-func (p *Parser) parseAlterStatement() (Statement, error) {
-	tok, pos, lit := p.scanIgnoreWhitespace()
-	if tok == RETENTION {
-		if tok, pos, lit = p.scanIgnoreWhitespace(); tok != POLICY {
-			return nil, newParseError(tokstr(tok, lit), []string{"POLICY"}, pos)
-		}
-		return p.parseAlterRetentionPolicyStatement()
-	}
-
-	return nil, newParseError(tokstr(tok, lit), []string{"RETENTION"}, pos)
-}
-
-// parseSetPasswordUserStatement parses a string and returns a set statement.
-// This function assumes the SET token has already been consumed.
-func (p *Parser) parseSetPasswordUserStatement() (*SetPasswordUserStatement, error) {
-	stmt := &SetPasswordUserStatement{}
-
-	// Consume the required PASSWORD FOR tokens.
-	if err := p.parseTokens([]Token{PASSWORD, FOR}); err != nil {
-		return nil, err
-	}
-
-	// Parse username
-	ident, err := p.parseIdent()
-
-	if err != nil {
-		return nil, err
-	}
-	stmt.Name = ident
-
-	// Consume the required = token.
-	if tok, pos, lit := p.scanIgnoreWhitespace(); tok != EQ {
-		return nil, newParseError(tokstr(tok, lit), []string{"="}, pos)
-	}
-
-	// Parse new user's password
-	if ident, err = p.parseString(); err != nil {
-		return nil, err
-	}
-	stmt.Password = ident
-
-	return stmt, nil
-}
-
-// parseCreateSubscriptionStatement parses a string and returns a CreatesubScriptionStatement.
-// This function assumes the "CREATE SUBSCRIPTION" tokens have already been consumed.
-func (p *Parser) parseCreateSubscriptionStatement() (*CreateSubscriptionStatement, error) {
-	stmt := &CreateSubscriptionStatement{}
-
-	// Read the id of the subscription to create.
-	ident, err := p.parseIdent()
-	if err != nil {
-		return nil, err
-	}
-	stmt.Name = ident
-
-	// Expect an "ON" keyword.
-	if tok, pos, lit := p.scanIgnoreWhitespace(); tok != ON {
-		return nil, newParseError(tokstr(tok, lit), []string{"ON"}, pos)
-	}
-
-	// Read the name of the database.
-	if ident, err = p.parseIdent(); err != nil {
-		return nil, err
-	}
-	stmt.Database = ident
-
-	if tok, pos, lit := p.scan(); tok != DOT {
-		return nil, newParseError(tokstr(tok, lit), []string{"."}, pos)
-	}
-
-	// Read the name of the retention policy.
-	if ident, err = p.parseIdent(); err != nil {
-		return nil, err
-	}
-	stmt.RetentionPolicy = ident
-
-	// Expect a "DESTINATIONS" keyword.
-	if tok, pos, lit := p.scanIgnoreWhitespace(); tok != DESTINATIONS {
-		return nil, newParseError(tokstr(tok, lit), []string{"DESTINATIONS"}, pos)
-	}
-
-	// Expect one of "ANY ALL" keywords.
-	if tok, pos, lit := p.scanIgnoreWhitespace(); tok == ALL || tok == ANY {
-		stmt.Mode = tokens[tok]
-	} else {
-		return nil, newParseError(tokstr(tok, lit), []string{"ALL", "ANY"}, pos)
-	}
-
-	// Read list of destinations.
-	var destinations []string
-	if destinations, err = p.parseStringList(); err != nil {
-		return nil, err
-	}
-	stmt.Destinations = destinations
-
-	return stmt, nil
-}
-
-// parseCreateRetentionPolicyStatement parses a string and returns a create retention policy statement.
-// This function assumes the CREATE RETENTION POLICY tokens have already been consumed.
-func (p *Parser) parseCreateRetentionPolicyStatement() (*CreateRetentionPolicyStatement, error) {
-	stmt := &CreateRetentionPolicyStatement{}
-
-	// Parse the retention policy name.
-	ident, err := p.parseIdent()
-	if err != nil {
-		return nil, err
-	}
-	stmt.Name = ident
-
-	// Consume the required ON token.
-	if tok, pos, lit := p.scanIgnoreWhitespace(); tok != ON {
-		return nil, newParseError(tokstr(tok, lit), []string{"ON"}, pos)
-	}
-
-	// Parse the database name.
-	ident, err = p.parseIdent()
-	if err != nil {
-		return nil, err
-	}
-	stmt.Database = ident
-
-	// Parse required DURATION token.
-	tok, pos, lit := p.scanIgnoreWhitespace()
-	if tok != DURATION {
-		return nil, newParseError(tokstr(tok, lit), []string{"DURATION"}, pos)
-	}
-
-	// Parse duration value
-	d, err := p.parseDuration()
-	if err != nil {
-		return nil, err
-	}
-	stmt.Duration = d
-
-	// Parse required REPLICATION token.
-	if tok, pos, lit = p.scanIgnoreWhitespace(); tok != REPLICATION {
-		return nil, newParseError(tokstr(tok, lit), []string{"REPLICATION"}, pos)
-	}
-
-	// Parse replication value.
-	n, err := p.parseInt(1, math.MaxInt32)
-	if err != nil {
-		return nil, err
-	}
-	stmt.Replication = n
-
-	// Parse optional DEFAULT token.
-	if tok, pos, lit = p.scanIgnoreWhitespace(); tok == DEFAULT {
-		stmt.Default = true
-	} else if tok != EOF && tok != SEMICOLON {
-		return nil, newParseError(tokstr(tok, lit), []string{"DEFAULT"}, pos)
-	}
-
-	return stmt, nil
-}
-
-// parseAlterRetentionPolicyStatement parses a string and returns an alter retention policy statement.
-// This function assumes the ALTER RETENTION POLICY tokens have already been consumed.
-func (p *Parser) parseAlterRetentionPolicyStatement() (*AlterRetentionPolicyStatement, error) {
-	stmt := &AlterRetentionPolicyStatement{}
-
-	// Parse the retention policy name.
-	tok, pos, lit := p.scanIgnoreWhitespace()
-	if tok == DEFAULT {
-		stmt.Name = "default"
-	} else if tok == IDENT {
-		stmt.Name = lit
-	} else {
-		return nil, newParseError(tokstr(tok, lit), []string{"identifier"}, pos)
-	}
-
-	// Consume the required ON token.
-	if tok, pos, lit = p.scanIgnoreWhitespace(); tok != ON {
-		return nil, newParseError(tokstr(tok, lit), []string{"ON"}, pos)
-	}
-
-	// Parse the database name.
-	ident, err := p.parseIdent()
-	if err != nil {
-		return nil, err
-	}
-	stmt.Database = ident
-
-	// Loop through option tokens (DURATION, REPLICATION, DEFAULT, etc.).
-	maxNumOptions := 3
-Loop:
-	for i := 0; i < maxNumOptions; i++ {
-		tok, pos, lit := p.scanIgnoreWhitespace()
-		switch tok {
-		case DURATION:
-			d, err := p.parseDuration()
-			if err != nil {
-				return nil, err
-			}
-			stmt.Duration = &d
-		case REPLICATION:
-			n, err := p.parseInt(1, math.MaxInt32)
-			if err != nil {
-				return nil, err
-			}
-			stmt.Replication = &n
-		case DEFAULT:
-			stmt.Default = true
-		default:
-			if i < 1 {
-				return nil, newParseError(tokstr(tok, lit), []string{"DURATION", "RETENTION", "DEFAULT"}, pos)
-			}
-			p.unscan()
-			break Loop
-		}
-	}
-
-	return stmt, nil
-}
-
-// parseInt parses a string and returns an integer literal.
-func (p *Parser) parseInt(min, max int) (int, error) {
-	tok, pos, lit := p.scanIgnoreWhitespace()
-	if tok != NUMBER {
-		return 0, newParseError(tokstr(tok, lit), []string{"number"}, pos)
-	}
-
-	// Return an error if the number has a fractional part.
-	if strings.Contains(lit, ".") {
-		return 0, &ParseError{Message: "number must be an integer", Pos: pos}
-	}
-
-	// Convert string to int.
-	n, err := strconv.Atoi(lit)
-	if err != nil {
-		return 0, &ParseError{Message: err.Error(), Pos: pos}
-	} else if min > n || n > max {
-		return 0, &ParseError{
-			Message: fmt.Sprintf("invalid value %d: must be %d <= n <= %d", n, min, max),
-			Pos:     pos,
-		}
-	}
-
-	return n, nil
-}
-
-// parseUInt32 parses a string and returns a 32-bit unsigned integer literal.
-func (p *Parser) parseUInt32() (uint32, error) {
-	tok, pos, lit := p.scanIgnoreWhitespace()
-	if tok != NUMBER {
-		return 0, newParseError(tokstr(tok, lit), []string{"number"}, pos)
-	}
-
-	// Convert string to unsigned 32-bit integer
-	n, err := strconv.ParseUint(lit, 10, 32)
-	if err != nil {
-		return 0, &ParseError{Message: err.Error(), Pos: pos}
-	}
-
-	return uint32(n), nil
-}
-
-// parseUInt64 parses a string and returns a 64-bit unsigned integer literal.
-func (p *Parser) parseUInt64() (uint64, error) {
-	tok, pos, lit := p.scanIgnoreWhitespace()
-	if tok != NUMBER {
-		return 0, newParseError(tokstr(tok, lit), []string{"number"}, pos)
-	}
-
-	// Convert string to unsigned 64-bit integer
-	n, err := strconv.ParseUint(lit, 10, 64)
-	if err != nil {
-		return 0, &ParseError{Message: err.Error(), Pos: pos}
-	}
-
-	return uint64(n), nil
-}
-
-// parseDuration parses a string and returns a duration literal.
-// This function assumes the DURATION token has already been consumed.
-func (p *Parser) parseDuration() (time.Duration, error) {
-	tok, pos, lit := p.scanIgnoreWhitespace()
-	if tok != DURATION_VAL && tok != INF {
-		return 0, newParseError(tokstr(tok, lit), []string{"duration"}, pos)
-	}
-
-	if tok == INF {
-		return 0, nil
-	}
-
-	d, err := ParseDuration(lit)
-	if err != nil {
-		return 0, &ParseError{Message: err.Error(), Pos: pos}
-	}
-
-	return d, nil
-}
-
-// parseIdent parses an identifier.
-func (p *Parser) parseIdent() (string, error) {
-	tok, pos, lit := p.scanIgnoreWhitespace()
-	if tok != IDENT {
-		return "", newParseError(tokstr(tok, lit), []string{"identifier"}, pos)
-	}
-	return lit, nil
-}
-
-// parseIdentList parses a comma delimited list of identifiers.
-func (p *Parser) parseIdentList() ([]string, error) {
-	// Parse first (required) identifier.
-	ident, err := p.parseIdent()
-	if err != nil {
-		return nil, err
-	}
-	idents := []string{ident}
-
-	// Parse remaining (optional) identifiers.
-	for {
-		if tok, _, _ := p.scanIgnoreWhitespace(); tok != COMMA {
-			p.unscan()
-			return idents, nil
-		}
-
-		if ident, err = p.parseIdent(); err != nil {
-			return nil, err
-		}
-
-		idents = append(idents, ident)
-	}
-}
-
-// parseSegmentedIdents parses a segmented identifiers.
-// e.g.,  "db"."rp".measurement  or  "db"..measurement
-func (p *Parser) parseSegmentedIdents() ([]string, error) {
-	ident, err := p.parseIdent()
-	if err != nil {
-		return nil, err
-	}
-	idents := []string{ident}
-
-	// Parse remaining (optional) identifiers.
-	for {
-		if tok, _, _ := p.scan(); tok != DOT {
-			// No more segments so we're done.
-			p.unscan()
-			break
-		}
-
-		if ch := p.peekRune(); ch == '/' {
-			// Next segment is a regex so we're done.
-			break
-		} else if ch == ':' {
-			// Next segment is context-specific so let caller handle it.
-			break
-		} else if ch == '.' {
-			// Add an empty identifier.
-			idents = append(idents, "")
-			continue
-		}
-
-		// Parse the next identifier.
-		if ident, err = p.parseIdent(); err != nil {
-			return nil, err
-		}
-
-		idents = append(idents, ident)
-	}
-
-	if len(idents) > 3 {
-		msg := fmt.Sprintf("too many segments in %s", QuoteIdent(idents...))
-		return nil, &ParseError{Message: msg}
-	}
-
-	return idents, nil
-}
-
-// parserString parses a string.
-func (p *Parser) parseString() (string, error) {
-	tok, pos, lit := p.scanIgnoreWhitespace()
-	if tok != STRING {
-		return "", newParseError(tokstr(tok, lit), []string{"string"}, pos)
-	}
-	return lit, nil
-}
-
-// parserString parses a string.
-func (p *Parser) parseStringList() ([]string, error) {
-	// Parse first (required) string.
-	str, err := p.parseString()
-	if err != nil {
-		return nil, err
-	}
-	strs := []string{str}
-
-	// Parse remaining (optional) strings.
-	for {
-		if tok, _, _ := p.scanIgnoreWhitespace(); tok != COMMA {
-			p.unscan()
-			return strs, nil
-		}
-
-		if str, err = p.parseString(); err != nil {
-			return nil, err
-		}
-
-		strs = append(strs, str)
-	}
-}
-
-// parseRevokeStatement parses a string and returns a revoke statement.
-// This function assumes the REVOKE token has already been consumed.
-func (p *Parser) parseRevokeStatement() (Statement, error) {
-	// Parse the privilege to be revoked.
-	priv, err := p.parsePrivilege()
-	if err != nil {
-		return nil, err
-	}
-
-	// Check for ON or FROM clauses.
-	tok, pos, lit := p.scanIgnoreWhitespace()
-	if tok == ON {
-		stmt, err := p.parseRevokeOnStatement()
-		if err != nil {
-			return nil, err
-		}
-		stmt.Privilege = priv
-		return stmt, nil
-	} else if tok == FROM {
-		// Admin privilege is only revoked on ALL PRIVILEGES.
-		if priv != AllPrivileges {
-			return nil, newParseError(tokstr(tok, lit), []string{"ON"}, pos)
-		}
-		return p.parseRevokeAdminStatement()
-	}
-
-	// Only ON or FROM clauses are allowed after privilege.
-	if priv == AllPrivileges {
-		return nil, newParseError(tokstr(tok, lit), []string{"ON", "FROM"}, pos)
-	}
-	return nil, newParseError(tokstr(tok, lit), []string{"ON"}, pos)
-}
-
-// parseRevokeOnStatement parses a string and returns a revoke statement.
-// This function assumes the [PRIVILEGE] ON tokens have already been consumed.
-func (p *Parser) parseRevokeOnStatement() (*RevokeStatement, error) {
-	stmt := &RevokeStatement{}
-
-	// Parse the name of the database.
-	lit, err := p.parseIdent()
-	if err != nil {
-		return nil, err
-	}
-	stmt.On = lit
-
-	// Parse FROM clause.
-	tok, pos, lit := p.scanIgnoreWhitespace()
-
-	// Check for required FROM token.
-	if tok != FROM {
-		return nil, newParseError(tokstr(tok, lit), []string{"FROM"}, pos)
-	}
-
-	// Parse the name of the user.
-	lit, err = p.parseIdent()
-	if err != nil {
-		return nil, err
-	}
-	stmt.User = lit
-
-	return stmt, nil
-}
-
-// parseRevokeAdminStatement parses a string and returns a revoke admin statement.
-// This function assumes the ALL [PRVILEGES] FROM token has already been consumed.
-func (p *Parser) parseRevokeAdminStatement() (*RevokeAdminStatement, error) {
-	// Admin privilege is always false when revoke admin clause is called.
-	stmt := &RevokeAdminStatement{}
-
-	// Parse the name of the user.
-	lit, err := p.parseIdent()
-	if err != nil {
-		return nil, err
-	}
-	stmt.User = lit
-
-	return stmt, nil
-}
-
-// parseGrantStatement parses a string and returns a grant statement.
-// This function assumes the GRANT token has already been consumed.
-func (p *Parser) parseGrantStatement() (Statement, error) {
-	// Parse the privilege to be granted.
-	priv, err := p.parsePrivilege()
-	if err != nil {
-		return nil, err
-	}
-
-	// Check for ON or TO clauses.
-	tok, pos, lit := p.scanIgnoreWhitespace()
-	if tok == ON {
-		stmt, err := p.parseGrantOnStatement()
-		if err != nil {
-			return nil, err
-		}
-		stmt.Privilege = priv
-		return stmt, nil
-	} else if tok == TO {
-		// Admin privilege is only granted on ALL PRIVILEGES.
-		if priv != AllPrivileges {
-			return nil, newParseError(tokstr(tok, lit), []string{"ON"}, pos)
-		}
-		return p.parseGrantAdminStatement()
-	}
-
-	// Only ON or TO clauses are allowed after privilege.
-	if priv == AllPrivileges {
-		return nil, newParseError(tokstr(tok, lit), []string{"ON", "TO"}, pos)
-	}
-	return nil, newParseError(tokstr(tok, lit), []string{"ON"}, pos)
-}
-
-// parseGrantOnStatement parses a string and returns a grant statement.
-// This function assumes the [PRIVILEGE] ON tokens have already been consumed.
-func (p *Parser) parseGrantOnStatement() (*GrantStatement, error) {
-	stmt := &GrantStatement{}
-
-	// Parse the name of the database.
-	lit, err := p.parseIdent()
-	if err != nil {
-		return nil, err
-	}
-	stmt.On = lit
-
-	// Parse TO clause.
-	tok, pos, lit := p.scanIgnoreWhitespace()
-
-	// Check for required TO token.
-	if tok != TO {
-		return nil, newParseError(tokstr(tok, lit), []string{"TO"}, pos)
-	}
-
-	// Parse the name of the user.
-	lit, err = p.parseIdent()
-	if err != nil {
-		return nil, err
-	}
-	stmt.User = lit
-
-	return stmt, nil
-}
-
-// parseGrantAdminStatement parses a string and returns a grant admin statement.
-// This function assumes the ALL [PRVILEGES] TO tokens have already been consumed.
-func (p *Parser) parseGrantAdminStatement() (*GrantAdminStatement, error) {
-	// Admin privilege is always true when grant admin clause is called.
-	stmt := &GrantAdminStatement{}
-
-	// Parse the name of the user.
-	lit, err := p.parseIdent()
-	if err != nil {
-		return nil, err
-	}
-	stmt.User = lit
-
-	return stmt, nil
-}
-
-// parsePrivilege parses a string and returns a Privilege
-func (p *Parser) parsePrivilege() (Privilege, error) {
-	tok, pos, lit := p.scanIgnoreWhitespace()
-	switch tok {
-	case READ:
-		return ReadPrivilege, nil
-	case WRITE:
-		return WritePrivilege, nil
-	case ALL:
-		// Consume optional PRIVILEGES token
-		tok, pos, lit = p.scanIgnoreWhitespace()
-		if tok != PRIVILEGES {
-			p.unscan()
-		}
-		return AllPrivileges, nil
-	}
-	return 0, newParseError(tokstr(tok, lit), []string{"READ", "WRITE", "ALL [PRIVILEGES]"}, pos)
-}
-
-// parseSelectStatement parses a select string and returns a Statement AST object.
-// This function assumes the SELECT token has already been consumed.
-func (p *Parser) parseSelectStatement(tr targetRequirement) (*SelectStatement, error) {
-	stmt := &SelectStatement{}
-	var err error
-
-	// Parse fields: "FIELD+".
-	if stmt.Fields, err = p.parseFields(); err != nil {
-		return nil, err
-	}
-
-	// Parse target: "INTO"
-	if stmt.Target, err = p.parseTarget(tr); err != nil {
-		return nil, err
-	}
-
-	// Parse source: "FROM".
-	if tok, pos, lit := p.scanIgnoreWhitespace(); tok != FROM {
-		return nil, newParseError(tokstr(tok, lit), []string{"FROM"}, pos)
-	}
-	if stmt.Sources, err = p.parseSources(); err != nil {
-		return nil, err
-	}
-
-	// Parse condition: "WHERE EXPR".
-	if stmt.Condition, err = p.parseCondition(); err != nil {
-		return nil, err
-	}
-
-	// Parse dimensions: "GROUP BY DIMENSION+".
-	if stmt.Dimensions, err = p.parseDimensions(); err != nil {
-		return nil, err
-	}
-
-	// Parse fill options: "fill(<option>)"
-	if stmt.Fill, stmt.FillValue, err = p.parseFill(); err != nil {
-		return nil, err
-	}
-
-	// Parse sort: "ORDER BY FIELD+".
-	if stmt.SortFields, err = p.parseOrderBy(); err != nil {
-		return nil, err
-	}
-
-	// Parse limit: "LIMIT <n>".
-	if stmt.Limit, err = p.parseOptionalTokenAndInt(LIMIT); err != nil {
-		return nil, err
-	}
-
-	// Parse offset: "OFFSET <n>".
-	if stmt.Offset, err = p.parseOptionalTokenAndInt(OFFSET); err != nil {
-		return nil, err
-	}
-
-	// Parse series limit: "SLIMIT <n>".
-	if stmt.SLimit, err = p.parseOptionalTokenAndInt(SLIMIT); err != nil {
-		return nil, err
-	}
-
-	// Parse series offset: "SOFFSET <n>".
-	if stmt.SOffset, err = p.parseOptionalTokenAndInt(SOFFSET); err != nil {
-		return nil, err
-	}
-
-	// Set if the query is a raw data query or one with an aggregate
-	stmt.IsRawQuery = true
-	WalkFunc(stmt.Fields, func(n Node) {
-		if _, ok := n.(*Call); ok {
-			stmt.IsRawQuery = false
-		}
-	})
-
-	if err := stmt.validate(tr); err != nil {
-		return nil, err
-	}
-
-	return stmt, nil
-}
-
-// targetRequirement specifies whether or not a target clause is required.
-type targetRequirement int
-
-const (
-	targetRequired targetRequirement = iota
-	targetNotRequired
-)
-
-// parseTarget parses a string and returns a Target.
-func (p *Parser) parseTarget(tr targetRequirement) (*Target, error) {
-	if tok, pos, lit := p.scanIgnoreWhitespace(); tok != INTO {
-		if tr == targetRequired {
-			return nil, newParseError(tokstr(tok, lit), []string{"INTO"}, pos)
-		}
-		p.unscan()
-		return nil, nil
-	}
-
-	// db, rp, and / or measurement
-	idents, err := p.parseSegmentedIdents()
-	if err != nil {
-		return nil, err
-	}
-
-	if len(idents) < 3 {
-		// Check for source measurement reference.
-		if ch := p.peekRune(); ch == ':' {
-			if err := p.parseTokens([]Token{COLON, MEASUREMENT}); err != nil {
-				return nil, err
-			}
-			// Append empty measurement name.
-			idents = append(idents, "")
-		}
-	}
-
-	t := &Target{Measurement: &Measurement{IsTarget: true}}
-
-	switch len(idents) {
-	case 1:
-		t.Measurement.Name = idents[0]
-	case 2:
-		t.Measurement.RetentionPolicy = idents[0]
-		t.Measurement.Name = idents[1]
-	case 3:
-		t.Measurement.Database = idents[0]
-		t.Measurement.RetentionPolicy = idents[1]
-		t.Measurement.Name = idents[2]
-	}
-
-	return t, nil
-}
-
-// parseDeleteStatement parses a delete string and returns a DeleteStatement.
-// This function assumes the DELETE token has already been consumed.
-func (p *Parser) parseDeleteStatement() (*DeleteStatement, error) {
-	stmt := &DeleteStatement{}
-
-	// Parse source
-	if tok, pos, lit := p.scanIgnoreWhitespace(); tok != FROM {
-		return nil, newParseError(tokstr(tok, lit), []string{"FROM"}, pos)
-	}
-	source, err := p.parseSource()
-	if err != nil {
-		return nil, err
-	}
-	stmt.Source = source
-
-	// Parse condition: "WHERE EXPR".
-	condition, err := p.parseCondition()
-	if err != nil {
-		return nil, err
-	}
-	stmt.Condition = condition
-
-	return stmt, nil
-}
-
-// parseShowSeriesStatement parses a string and returns a ShowSeriesStatement.
-// This function assumes the "SHOW SERIES" tokens have already been consumed.
-func (p *Parser) parseShowSeriesStatement() (*ShowSeriesStatement, error) {
-	stmt := &ShowSeriesStatement{}
-	var err error
-
-	// Parse optional FROM.
-	if tok, _, _ := p.scanIgnoreWhitespace(); tok == FROM {
-		if stmt.Sources, err = p.parseSources(); err != nil {
-			return nil, err
-		}
-	} else {
-		p.unscan()
-	}
-
-	// Parse condition: "WHERE EXPR".
-	if stmt.Condition, err = p.parseCondition(); err != nil {
-		return nil, err
-	}
-
-	// Parse sort: "ORDER BY FIELD+".
-	if stmt.SortFields, err = p.parseOrderBy(); err != nil {
-		return nil, err
-	}
-
-	// Parse limit: "LIMIT <n>".
-	if stmt.Limit, err = p.parseOptionalTokenAndInt(LIMIT); err != nil {
-		return nil, err
-	}
-
-	// Parse offset: "OFFSET <n>".
-	if stmt.Offset, err = p.parseOptionalTokenAndInt(OFFSET); err != nil {
-		return nil, err
-	}
-
-	return stmt, nil
-}
-
-// parseShowMeasurementsStatement parses a string and returns a ShowSeriesStatement.
-// This function assumes the "SHOW MEASUREMENTS" tokens have already been consumed.
-func (p *Parser) parseShowMeasurementsStatement() (*ShowMeasurementsStatement, error) {
-	stmt := &ShowMeasurementsStatement{}
-	var err error
-
-	// Parse optional WITH clause.
-	if tok, _, _ := p.scanIgnoreWhitespace(); tok == WITH {
-		// Parse required MEASUREMENT token.
-		if err := p.parseTokens([]Token{MEASUREMENT}); err != nil {
-			return nil, err
-		}
-
-		// Parse required operator: = or =~.
-		tok, pos, lit := p.scanIgnoreWhitespace()
-		switch tok {
-		case EQ, EQREGEX:
-			// Parse required source (measurement name or regex).
-			if stmt.Source, err = p.parseSource(); err != nil {
-				return nil, err
-			}
-		default:
-			return nil, newParseError(tokstr(tok, lit), []string{"=", "=~"}, pos)
-		}
-	} else {
-		// Not a WITH clause so put the token back.
-		p.unscan()
-	}
-
-	// Parse condition: "WHERE EXPR".
-	if stmt.Condition, err = p.parseCondition(); err != nil {
-		return nil, err
-	}
-
-	// Parse sort: "ORDER BY FIELD+".
-	if stmt.SortFields, err = p.parseOrderBy(); err != nil {
-		return nil, err
-	}
-
-	// Parse limit: "LIMIT <n>".
-	if stmt.Limit, err = p.parseOptionalTokenAndInt(LIMIT); err != nil {
-		return nil, err
-	}
-
-	// Parse offset: "OFFSET <n>".
-	if stmt.Offset, err = p.parseOptionalTokenAndInt(OFFSET); err != nil {
-		return nil, err
-	}
-
-	return stmt, nil
-}
-
-// parseShowRetentionPoliciesStatement parses a string and returns a ShowRetentionPoliciesStatement.
-// This function assumes the "SHOW RETENTION POLICIES" tokens have been consumed.
-func (p *Parser) parseShowRetentionPoliciesStatement() (*ShowRetentionPoliciesStatement, error) {
-	stmt := &ShowRetentionPoliciesStatement{}
-
-	// Expect an "ON" keyword.
-	if tok, pos, lit := p.scanIgnoreWhitespace(); tok != ON {
-		return nil, newParseError(tokstr(tok, lit), []string{"ON"}, pos)
-	}
-
-	// Parse the database.
-	ident, err := p.parseIdent()
-	if err != nil {
-		return nil, err
-	}
-	stmt.Database = ident
-
-	return stmt, nil
-}
-
-// parseShowTagKeysStatement parses a string and returns a ShowSeriesStatement.
-// This function assumes the "SHOW TAG KEYS" tokens have already been consumed.
-func (p *Parser) parseShowTagKeysStatement() (*ShowTagKeysStatement, error) {
-	stmt := &ShowTagKeysStatement{}
-	var err error
-
-	// Parse optional source.
-	if tok, _, _ := p.scanIgnoreWhitespace(); tok == FROM {
-		if stmt.Sources, err = p.parseSources(); err != nil {
-			return nil, err
-		}
-	} else {
-		p.unscan()
-	}
-
-	// Parse condition: "WHERE EXPR".
-	if stmt.Condition, err = p.parseCondition(); err != nil {
-		return nil, err
-	}
-
-	// Parse sort: "ORDER BY FIELD+".
-	if stmt.SortFields, err = p.parseOrderBy(); err != nil {
-		return nil, err
-	}
-
-	// Parse limit: "LIMIT <n>".
-	if stmt.Limit, err = p.parseOptionalTokenAndInt(LIMIT); err != nil {
-		return nil, err
-	}
-
-	// Parse offset: "OFFSET <n>".
-	if stmt.Offset, err = p.parseOptionalTokenAndInt(OFFSET); err != nil {
-		return nil, err
-	}
-
-	// Parse series limit: "SLIMIT <n>".
-	if stmt.SLimit, err = p.parseOptionalTokenAndInt(SLIMIT); err != nil {
-		return nil, err
-	}
-
-	// Parse series offset: "SOFFSET <n>".
-	if stmt.SOffset, err = p.parseOptionalTokenAndInt(SOFFSET); err != nil {
-		return nil, err
-	}
-
-	return stmt, nil
-}
-
-// parseShowTagValuesStatement parses a string and returns a ShowSeriesStatement.
-// This function assumes the "SHOW TAG VALUES" tokens have already been consumed.
-func (p *Parser) parseShowTagValuesStatement() (*ShowTagValuesStatement, error) {
-	stmt := &ShowTagValuesStatement{}
-	var err error
-
-	// Parse optional source.
-	if tok, _, _ := p.scanIgnoreWhitespace(); tok == FROM {
-		if stmt.Sources, err = p.parseSources(); err != nil {
-			return nil, err
-		}
-	} else {
-		p.unscan()
-	}
-
-	// Parse required WITH KEY.
-	if stmt.TagKeys, err = p.parseTagKeys(); err != nil {
-		return nil, err
-	}
-
-	// Parse condition: "WHERE EXPR".
-	if stmt.Condition, err = p.parseCondition(); err != nil {
-		return nil, err
-	}
-
-	// Parse sort: "ORDER BY FIELD+".
-	if stmt.SortFields, err = p.parseOrderBy(); err != nil {
-		return nil, err
-	}
-
-	// Parse limit: "LIMIT <n>".
-	if stmt.Limit, err = p.parseOptionalTokenAndInt(LIMIT); err != nil {
-		return nil, err
-	}
-
-	// Parse offset: "OFFSET <n>".
-	if stmt.Offset, err = p.parseOptionalTokenAndInt(OFFSET); err != nil {
-		return nil, err
-	}
-
-	return stmt, nil
-}
-
-// parseTagKeys parses a string and returns a list of tag keys.
-func (p *Parser) parseTagKeys() ([]string, error) {
-	var err error
-
-	// Parse required WITH KEY tokens.
-	if err := p.parseTokens([]Token{WITH, KEY}); err != nil {
-		return nil, err
-	}
-
-	var tagKeys []string
-
-	// Parse required IN or EQ token.
-	if tok, pos, lit := p.scanIgnoreWhitespace(); tok == IN {
-		// Parse required ( token.
-		if tok, pos, lit = p.scanIgnoreWhitespace(); tok != LPAREN {
-			return nil, newParseError(tokstr(tok, lit), []string{"("}, pos)
-		}
-
-		// Parse tag key list.
-		if tagKeys, err = p.parseIdentList(); err != nil {
-			return nil, err
-		}
-
-		// Parse required ) token.
-		if tok, pos, lit = p.scanIgnoreWhitespace(); tok != RPAREN {
-			return nil, newParseError(tokstr(tok, lit), []string{"("}, pos)
-		}
-	} else if tok == EQ {
-		// Parse required tag key.
-		ident, err := p.parseIdent()
-		if err != nil {
-			return nil, err
-		}
-		tagKeys = append(tagKeys, ident)
-	} else {
-		return nil, newParseError(tokstr(tok, lit), []string{"IN", "="}, pos)
-	}
-
-	return tagKeys, nil
-}
-
-// parseShowUsersStatement parses a string and returns a ShowUsersStatement.
-// This function assumes the "SHOW USERS" tokens have been consumed.
-func (p *Parser) parseShowUsersStatement() (*ShowUsersStatement, error) {
-	return &ShowUsersStatement{}, nil
-}
-
-// parseShowSubscriptionsStatement parses a string and returns a ShowSubscriptionsStatement
-// This function assumes the "SHOW SUBSCRIPTIONS" tokens have been consumed.
-func (p *Parser) parseShowSubscriptionsStatement() (*ShowSubscriptionsStatement, error) {
-	stmt := &ShowSubscriptionsStatement{}
-	return stmt, nil
-}
-
-// parseShowFieldKeysStatement parses a string and returns a ShowSeriesStatement.
-// This function assumes the "SHOW FIELD KEYS" tokens have already been consumed.
-func (p *Parser) parseShowFieldKeysStatement() (*ShowFieldKeysStatement, error) {
-	stmt := &ShowFieldKeysStatement{}
-	var err error
-
-	// Parse optional source.
-	if tok, _, _ := p.scanIgnoreWhitespace(); tok == FROM {
-		if stmt.Sources, err = p.parseSources(); err != nil {
-			return nil, err
-		}
-	} else {
-		p.unscan()
-	}
-
-	// Parse sort: "ORDER BY FIELD+".
-	if stmt.SortFields, err = p.parseOrderBy(); err != nil {
-		return nil, err
-	}
-
-	// Parse limit: "LIMIT <n>".
-	if stmt.Limit, err = p.parseOptionalTokenAndInt(LIMIT); err != nil {
-		return nil, err
-	}
-
-	// Parse offset: "OFFSET <n>".
-	if stmt.Offset, err = p.parseOptionalTokenAndInt(OFFSET); err != nil {
-		return nil, err
-	}
-
-	return stmt, nil
-}
-
-// parseDropMeasurementStatement parses a string and returns a DropMeasurementStatement.
-// This function assumes the "DROP MEASUREMENT" tokens have already been consumed.
-func (p *Parser) parseDropMeasurementStatement() (*DropMeasurementStatement, error) {
-	stmt := &DropMeasurementStatement{}
-
-	// Parse the name of the measurement to be dropped.
-	lit, err := p.parseIdent()
-	if err != nil {
-		return nil, err
-	}
-	stmt.Name = lit
-
-	return stmt, nil
-}
-
-// parseDropSeriesStatement parses a string and returns a DropSeriesStatement.
-// This function assumes the "DROP SERIES" tokens have already been consumed.
-func (p *Parser) parseDropSeriesStatement() (*DropSeriesStatement, error) {
-	stmt := &DropSeriesStatement{}
-	var err error
-
-	tok, pos, lit := p.scanIgnoreWhitespace()
-
-	if tok == FROM {
-		// Parse source.
-		if stmt.Sources, err = p.parseSources(); err != nil {
-			return nil, err
-		}
-	} else {
-		p.unscan()
-	}
-
-	// Parse condition: "WHERE EXPR".
-	if stmt.Condition, err = p.parseCondition(); err != nil {
-		return nil, err
-	}
-
-	// If they didn't provide a FROM or a WHERE, this query is invalid
-	if stmt.Condition == nil && stmt.Sources == nil {
-		return nil, newParseError(tokstr(tok, lit), []string{"FROM", "WHERE"}, pos)
-	}
-
-	return stmt, nil
-}
-
-// parseDropServerStatement parses a string and returns a DropServerStatement.
-// This function assumes the "DROP SERVER" tokens have already been consumed.
-func (p *Parser) parseDropServerStatement() (*DropServerStatement, error) {
-	s := &DropServerStatement{}
-	var err error
-
-	// Parse the server's ID.
-	if s.NodeID, err = p.parseUInt64(); err != nil {
-		return nil, err
-	}
-
-	// Parse optional FORCE token.
-	if tok, pos, lit := p.scanIgnoreWhitespace(); tok == FORCE {
-		s.Force = true
-	} else if tok != EOF && tok != SEMICOLON {
-		return nil, newParseError(tokstr(tok, lit), []string{"FORCE"}, pos)
-	}
-
-	return s, nil
-}
-
-// parseShowContinuousQueriesStatement parses a string and returns a ShowContinuousQueriesStatement.
-// This function assumes the "SHOW CONTINUOUS" tokens have already been consumed.
-func (p *Parser) parseShowContinuousQueriesStatement() (*ShowContinuousQueriesStatement, error) {
-	stmt := &ShowContinuousQueriesStatement{}
-
-	// Expect a "QUERIES" token.
-	if tok, pos, lit := p.scanIgnoreWhitespace(); tok != QUERIES {
-		return nil, newParseError(tokstr(tok, lit), []string{"QUERIES"}, pos)
-	}
-
-	return stmt, nil
-}
-
-// parseShowServersStatement parses a string and returns a ShowServersStatement.
-// This function assumes the "SHOW SERVERS" tokens have already been consumed.
-func (p *Parser) parseShowServersStatement() (*ShowServersStatement, error) {
-	stmt := &ShowServersStatement{}
-	return stmt, nil
-}
-
-// parseGrantsForUserStatement parses a string and returns a ShowGrantsForUserStatement.
-// This function assumes the "SHOW GRANTS" tokens have already been consumed.
-func (p *Parser) parseGrantsForUserStatement() (*ShowGrantsForUserStatement, error) {
-	stmt := &ShowGrantsForUserStatement{}
-
-	// Expect a "FOR" token.
-	if tok, pos, lit := p.scanIgnoreWhitespace(); tok != FOR {
-		return nil, newParseError(tokstr(tok, lit), []string{"FOR"}, pos)
-	}
-
-	// Parse the name of the user to be displayed.
-	lit, err := p.parseIdent()
-	if err != nil {
-		return nil, err
-	}
-	stmt.Name = lit
-
-	return stmt, nil
-}
-
-// parseShowDatabasesStatement parses a string and returns a ShowDatabasesStatement.
-// This function assumes the "SHOW DATABASE" tokens have already been consumed.
-func (p *Parser) parseShowDatabasesStatement() (*ShowDatabasesStatement, error) {
-	stmt := &ShowDatabasesStatement{}
-	return stmt, nil
-}
-
-// parseCreateContinuousQueriesStatement parses a string and returns a CreateContinuousQueryStatement.
-// This function assumes the "CREATE CONTINUOUS" tokens have already been consumed.
-func (p *Parser) parseCreateContinuousQueryStatement() (*CreateContinuousQueryStatement, error) {
-	stmt := &CreateContinuousQueryStatement{}
-
-	// Expect a "QUERY" token.
-	if tok, pos, lit := p.scanIgnoreWhitespace(); tok != QUERY {
-		return nil, newParseError(tokstr(tok, lit), []string{"QUERY"}, pos)
-	}
-
-	// Read the id of the query to create.
-	ident, err := p.parseIdent()
-	if err != nil {
-		return nil, err
-	}
-	stmt.Name = ident
-
-	// Expect an "ON" keyword.
-	if tok, pos, lit := p.scanIgnoreWhitespace(); tok != ON {
-		return nil, newParseError(tokstr(tok, lit), []string{"ON"}, pos)
-	}
-
-	// Read the name of the database to create the query on.
-	if ident, err = p.parseIdent(); err != nil {
-		return nil, err
-	}
-	stmt.Database = ident
-
-	// Expect a "BEGIN SELECT" tokens.
-	if err := p.parseTokens([]Token{BEGIN, SELECT}); err != nil {
-		return nil, err
-	}
-
-	// Read the select statement to be used as the source.
-	source, err := p.parseSelectStatement(targetRequired)
-	if err != nil {
-		return nil, err
-	}
-	stmt.Source = source
-
-	// validate that the statement has a non-zero group by interval if it is aggregated
-	if !source.IsRawQuery {
-		d, err := source.GroupByInterval()
-		if d == 0 || err != nil {
-			// rewind so we can output an error with some info
-			p.unscan() // unscan the whitespace
-			p.unscan() // unscan the last token
-			tok, pos, lit := p.scanIgnoreWhitespace()
-			expected := []string{"GROUP BY time(...)"}
-			if err != nil {
-				expected = append(expected, err.Error())
-			}
-			return nil, newParseError(tokstr(tok, lit), expected, pos)
-		}
-	}
-
-	// Expect a "END" keyword.
-	if tok, pos, lit := p.scanIgnoreWhitespace(); tok != END {
-		return nil, newParseError(tokstr(tok, lit), []string{"END"}, pos)
-	}
-
-	return stmt, nil
-}
-
-// parseCreateDatabaseStatement parses a string and returns a CreateDatabaseStatement.
-// This function assumes the "CREATE DATABASE" tokens have already been consumed.
-func (p *Parser) parseCreateDatabaseStatement() (*CreateDatabaseStatement, error) {
-	stmt := &CreateDatabaseStatement{}
-
-	// Look for "IF NOT EXISTS"
-	if tok, _, _ := p.scanIgnoreWhitespace(); tok == IF {
-		if err := p.parseTokens([]Token{NOT, EXISTS}); err != nil {
-			return nil, err
-		}
-		stmt.IfNotExists = true
-	} else {
-		p.unscan()
-	}
-
-	// Parse the name of the database to be created.
-	lit, err := p.parseIdent()
-	if err != nil {
-		return nil, err
-	}
-	stmt.Name = lit
-
-	return stmt, nil
-}
-
-// parseDropDatabaseStatement parses a string and returns a DropDatabaseStatement.
-// This function assumes the DROP DATABASE tokens have already been consumed.
-func (p *Parser) parseDropDatabaseStatement() (*DropDatabaseStatement, error) {
-	stmt := &DropDatabaseStatement{}
-
-	// Look for "IF EXISTS"
-	if tok, _, _ := p.scanIgnoreWhitespace(); tok == IF {
-		if err := p.parseTokens([]Token{EXISTS}); err != nil {
-			return nil, err
-		}
-		stmt.IfExists = true
-	} else {
-		p.unscan()
-	}
-
-	// Parse the name of the database to be dropped.
-	lit, err := p.parseIdent()
-	if err != nil {
-		return nil, err
-	}
-	stmt.Name = lit
-
-	return stmt, nil
-}
-
-// parseDropSubscriptionStatement parses a string and returns a DropSubscriptionStatement.
-// This function assumes the "DROP SUBSCRIPTION" tokens have already been consumed.
-func (p *Parser) parseDropSubscriptionStatement() (*DropSubscriptionStatement, error) {
-	stmt := &DropSubscriptionStatement{}
-
-	// Read the id of the subscription to drop.
-	ident, err := p.parseIdent()
-	if err != nil {
-		return nil, err
-	}
-	stmt.Name = ident
-
-	// Expect an "ON" keyword.
-	if tok, pos, lit := p.scanIgnoreWhitespace(); tok != ON {
-		return nil, newParseError(tokstr(tok, lit), []string{"ON"}, pos)
-	}
-
-	// Read the name of the database.
-	if ident, err = p.parseIdent(); err != nil {
-		return nil, err
-	}
-	stmt.Database = ident
-
-	if tok, pos, lit := p.scan(); tok != DOT {
-		return nil, newParseError(tokstr(tok, lit), []string{"."}, pos)
-	}
-
-	// Read the name of the retention policy.
-	if ident, err = p.parseIdent(); err != nil {
-		return nil, err
-	}
-	stmt.RetentionPolicy = ident
-
-	return stmt, nil
-}
-
-// parseDropRetentionPolicyStatement parses a string and returns a DropRetentionPolicyStatement.
-// This function assumes the DROP RETENTION POLICY tokens have been consumed.
-func (p *Parser) parseDropRetentionPolicyStatement() (*DropRetentionPolicyStatement, error) {
-	stmt := &DropRetentionPolicyStatement{}
-
-	// Parse the policy name.
-	ident, err := p.parseIdent()
-	if err != nil {
-		return nil, err
-	}
-	stmt.Name = ident
-
-	// Consume the required ON token.
-	if tok, pos, lit := p.scanIgnoreWhitespace(); tok != ON {
-		return nil, newParseError(tokstr(tok, lit), []string{"ON"}, pos)
-	}
-
-	// Parse the database name.
-	if stmt.Database, err = p.parseIdent(); err != nil {
-		return nil, err
-	}
-
-	return stmt, nil
-}
-
-// parseCreateUserStatement parses a string and returns a CreateUserStatement.
-// This function assumes the "CREATE USER" tokens have already been consumed.
-func (p *Parser) parseCreateUserStatement() (*CreateUserStatement, error) {
-	stmt := &CreateUserStatement{}
-
-	// Parse name of the user to be created.
-	ident, err := p.parseIdent()
-	if err != nil {
-		return nil, err
-	}
-	stmt.Name = ident
-
-	// Consume "WITH PASSWORD" tokens
-	if err := p.parseTokens([]Token{WITH, PASSWORD}); err != nil {
-		return nil, err
-	}
-
-	// Parse new user's password
-	if ident, err = p.parseString(); err != nil {
-		return nil, err
-	}
-	stmt.Password = ident
-
-	// Check for option WITH clause.
-	if tok, _, _ := p.scanIgnoreWhitespace(); tok != WITH {
-		p.unscan()
-		return stmt, nil
-	}
-
-	// "WITH ALL PRIVILEGES" grants the new user admin privilege.
-	// Only admin privilege can be set on user creation.
-	if err := p.parseTokens([]Token{ALL, PRIVILEGES}); err != nil {
-		return nil, err
-	}
-	stmt.Admin = true
-
-	return stmt, nil
-}
-
-// parseDropUserStatement parses a string and returns a DropUserStatement.
-// This function assumes the DROP USER tokens have already been consumed.
-func (p *Parser) parseDropUserStatement() (*DropUserStatement, error) {
-	stmt := &DropUserStatement{}
-
-	// Parse the name of the user to be dropped.
-	lit, err := p.parseIdent()
-	if err != nil {
-		return nil, err
-	}
-	stmt.Name = lit
-
-	return stmt, nil
-}
-
-// parseRetentionPolicy parses a string and returns a retention policy name.
-// This function assumes the "WITH" token has already been consumed.
-func (p *Parser) parseRetentionPolicy() (name string, dfault bool, err error) {
-	// Check for optional DEFAULT token.
-	tok, pos, lit := p.scanIgnoreWhitespace()
-	if tok == DEFAULT {
-		dfault = true
-		tok, pos, lit = p.scanIgnoreWhitespace()
-	}
-
-	// Check for required RETENTION token.
-	if tok != RETENTION {
-		err = newParseError(tokstr(tok, lit), []string{"RETENTION"}, pos)
-		return
-	}
-
-	// Check of required POLICY token.
-	if tok, pos, lit = p.scanIgnoreWhitespace(); tok != POLICY {
-		err = newParseError(tokstr(tok, lit), []string{"POLICY"}, pos)
-		return
-	}
-
-	// Parse retention policy name.
-	name, err = p.parseIdent()
-	if err != nil {
-		return
-	}
-
-	return
-}
-
-// parseShowShardsStatement parses a string for "SHOW SHARDS" statement.
-// This function assumes the "SHOW SHARDS" tokens have already been consumed.
-func (p *Parser) parseShowShardsStatement() (*ShowShardsStatement, error) {
-	return &ShowShardsStatement{}, nil
-}
-
-// parseShowStatsStatement parses a string and returns a ShowStatsStatement.
-// This function assumes the "SHOW STATS" tokens have already been consumed.
-func (p *Parser) parseShowStatsStatement() (*ShowStatsStatement, error) {
-	stmt := &ShowStatsStatement{}
-	var err error
-
-	if tok, _, _ := p.scanIgnoreWhitespace(); tok == FOR {
-		stmt.Module, err = p.parseString()
-	} else {
-		p.unscan()
-	}
-
-	return stmt, err
-}
-
-// parseShowDiagnostics parses a string and returns a ShowDiagnosticsStatement.
-func (p *Parser) parseShowDiagnosticsStatement() (*ShowDiagnosticsStatement, error) {
-	stmt := &ShowDiagnosticsStatement{}
-	var err error
-
-	if tok, _, _ := p.scanIgnoreWhitespace(); tok == FOR {
-		stmt.Module, err = p.parseString()
-	} else {
-		p.unscan()
-	}
-
-	return stmt, err
-}
-
-// parseDropContinuousQueriesStatement parses a string and returns a DropContinuousQueryStatement.
-// This function assumes the "DROP CONTINUOUS" tokens have already been consumed.
-func (p *Parser) parseDropContinuousQueryStatement() (*DropContinuousQueryStatement, error) {
-	stmt := &DropContinuousQueryStatement{}
-
-	// Expect a "QUERY" token.
-	if tok, pos, lit := p.scanIgnoreWhitespace(); tok != QUERY {
-		return nil, newParseError(tokstr(tok, lit), []string{"QUERY"}, pos)
-	}
-
-	// Read the id of the query to drop.
-	ident, err := p.parseIdent()
-	if err != nil {
-		return nil, err
-	}
-	stmt.Name = ident
-
-	// Expect an "ON" keyword.
-	if tok, pos, lit := p.scanIgnoreWhitespace(); tok != ON {
-		return nil, newParseError(tokstr(tok, lit), []string{"ON"}, pos)
-	}
-
-	// Read the name of the database to remove the query from.
-	if ident, err = p.parseIdent(); err != nil {
-		return nil, err
-	}
-	stmt.Database = ident
-
-	return stmt, nil
-}
-
-// parseFields parses a list of one or more fields.
-func (p *Parser) parseFields() (Fields, error) {
-	var fields Fields
-
-	for {
-		// Parse the field.
-		f, err := p.parseField()
-		if err != nil {
-			return nil, err
-		}
-
-		// Add new field.
-		fields = append(fields, f)
-
-		// If there's not a comma next then stop parsing fields.
-		if tok, _, _ := p.scan(); tok != COMMA {
-			p.unscan()
-			break
-		}
-	}
-	return fields, nil
-}
-
-// parseField parses a single field.
-func (p *Parser) parseField() (*Field, error) {
-	f := &Field{}
-
-	_, pos, _ := p.scanIgnoreWhitespace()
-	p.unscan()
-	// Parse the expression first.
-	expr, err := p.ParseExpr()
-	if err != nil {
-		return nil, err
-	}
-	var c validateField
-	Walk(&c, expr)
-	if c.foundInvalid {
-		return nil, fmt.Errorf("invalid operator %s in SELECT clause at line %d, char %d; operator is intended for WHERE clause", c.badToken, pos.Line+1, pos.Char+1)
-	}
-	f.Expr = expr
-
-	// Parse the alias if the current and next tokens are "WS AS".
-	alias, err := p.parseAlias()
-	if err != nil {
-		return nil, err
-	}
-	f.Alias = alias
-
-	// Consume all trailing whitespace.
-	p.consumeWhitespace()
-
-	return f, nil
-}
-
-// validateField checks if the Expr is a valid field. We disallow all binary expression
-// that return a boolean
-type validateField struct {
-	foundInvalid bool
-	badToken     Token
-}
-
-func (c *validateField) Visit(n Node) Visitor {
-	e, ok := n.(*BinaryExpr)
-	if !ok {
-		return c
-	}
-
-	switch e.Op {
-	case EQ, NEQ, EQREGEX,
-		NEQREGEX, LT, LTE, GT, GTE,
-		AND, OR:
-		c.foundInvalid = true
-		c.badToken = e.Op
-		return nil
-	}
-	return c
-}
-
-// parseAlias parses the "AS (IDENT|STRING)" alias for fields and dimensions.
-func (p *Parser) parseAlias() (string, error) {
-	// Check if the next token is "AS". If not, then unscan and exit.
-	if tok, _, _ := p.scanIgnoreWhitespace(); tok != AS {
-		p.unscan()
-		return "", nil
-	}
-
-	// Then we should have the alias identifier.
-	lit, err := p.parseIdent()
-	if err != nil {
-		return "", err
-	}
-	return lit, nil
-}
-
-// parseSources parses a comma delimited list of sources.
-func (p *Parser) parseSources() (Sources, error) {
-	var sources Sources
-
-	for {
-		s, err := p.parseSource()
-		if err != nil {
-			return nil, err
-		}
-		sources = append(sources, s)
-
-		if tok, _, _ := p.scanIgnoreWhitespace(); tok != COMMA {
-			p.unscan()
-			break
-		}
-	}
-
-	return sources, nil
-}
-
-// peekRune returns the next rune that would be read by the scanner.
-func (p *Parser) peekRune() rune {
-	r, _, _ := p.s.s.r.ReadRune()
-	if r != eof {
-		_ = p.s.s.r.UnreadRune()
-	}
-
-	return r
-}
-
-func (p *Parser) parseSource() (Source, error) {
-	m := &Measurement{}
-
-	// Attempt to parse a regex.
-	re, err := p.parseRegex()
-	if err != nil {
-		return nil, err
-	} else if re != nil {
-		m.Regex = re
-		// Regex is always last so we're done.
-		return m, nil
-	}
-
-	// Didn't find a regex so parse segmented identifiers.
-	idents, err := p.parseSegmentedIdents()
-	if err != nil {
-		return nil, err
-	}
-
-	// If we already have the max allowed idents, we're done.
-	if len(idents) == 3 {
-		m.Database, m.RetentionPolicy, m.Name = idents[0], idents[1], idents[2]
-		return m, nil
-	}
-	// Check again for regex.
-	re, err = p.parseRegex()
-	if err != nil {
-		return nil, err
-	} else if re != nil {
-		m.Regex = re
-	}
-
-	// Assign identifiers to their proper locations.
-	switch len(idents) {
-	case 1:
-		if re != nil {
-			m.RetentionPolicy = idents[0]
-		} else {
-			m.Name = idents[0]
-		}
-	case 2:
-		if re != nil {
-			m.Database, m.RetentionPolicy = idents[0], idents[1]
-		} else {
-			m.RetentionPolicy, m.Name = idents[0], idents[1]
-		}
-	}
-
-	return m, nil
-}
-
-// parseCondition parses the "WHERE" clause of the query, if it exists.
-func (p *Parser) parseCondition() (Expr, error) {
-	// Check if the WHERE token exists.
-	if tok, _, _ := p.scanIgnoreWhitespace(); tok != WHERE {
-		p.unscan()
-		return nil, nil
-	}
-
-	// Scan the identifier for the source.
-	expr, err := p.ParseExpr()
-	if err != nil {
-		return nil, err
-	}
-
-	return expr, nil
-}
-
-// parseDimensions parses the "GROUP BY" clause of the query, if it exists.
-func (p *Parser) parseDimensions() (Dimensions, error) {
-	// If the next token is not GROUP then exit.
-	if tok, _, _ := p.scanIgnoreWhitespace(); tok != GROUP {
-		p.unscan()
-		return nil, nil
-	}
-
-	// Now the next token should be "BY".
-	if tok, pos, lit := p.scanIgnoreWhitespace(); tok != BY {
-		return nil, newParseError(tokstr(tok, lit), []string{"BY"}, pos)
-	}
-
-	var dimensions Dimensions
-	for {
-		// Parse the dimension.
-		d, err := p.parseDimension()
-		if err != nil {
-			return nil, err
-		}
-
-		// Add new dimension.
-		dimensions = append(dimensions, d)
-
-		// If there's not a comma next then stop parsing dimensions.
-		if tok, _, _ := p.scan(); tok != COMMA {
-			p.unscan()
-			break
-		}
-	}
-	return dimensions, nil
-}
-
-// parseDimension parses a single dimension.
-func (p *Parser) parseDimension() (*Dimension, error) {
-	// Parse the expression first.
-	expr, err := p.ParseExpr()
-	if err != nil {
-		return nil, err
-	}
-
-	// Consume all trailing whitespace.
-	p.consumeWhitespace()
-
-	return &Dimension{Expr: expr}, nil
-}
-
-// parseFill parses the fill call and its options.
-func (p *Parser) parseFill() (FillOption, interface{}, error) {
-	// Parse the expression first.
-	expr, err := p.ParseExpr()
-	if err != nil {
-		p.unscan()
-		return NullFill, nil, nil
-	}
-	lit, ok := expr.(*Call)
-	if !ok {
-		p.unscan()
-		return NullFill, nil, nil
-	}
-	if strings.ToLower(lit.Name) != "fill" {
-		p.unscan()
-		return NullFill, nil, nil
-	}
-	if len(lit.Args) != 1 {
-		return NullFill, nil, errors.New("fill requires an argument, e.g.: 0, null, none, previous")
-	}
-	switch lit.Args[0].String() {
-	case "null":
-		return NullFill, nil, nil
-	case "none":
-		return NoFill, nil, nil
-	case "previous":
-		return PreviousFill, nil, nil
-	default:
-		num, ok := lit.Args[0].(*NumberLiteral)
-		if !ok {
-			return NullFill, nil, fmt.Errorf("expected number argument in fill()")
-		}
-		return NumberFill, num.Val, nil
-	}
-}
-
-// parseOptionalTokenAndInt parses the specified token followed
-// by an int, if it exists.
-func (p *Parser) parseOptionalTokenAndInt(t Token) (int, error) {
-	// Check if the token exists.
-	if tok, _, _ := p.scanIgnoreWhitespace(); tok != t {
-		p.unscan()
-		return 0, nil
-	}
-
-	// Scan the number.
-	tok, pos, lit := p.scanIgnoreWhitespace()
-	if tok != NUMBER {
-		return 0, newParseError(tokstr(tok, lit), []string{"number"}, pos)
-	}
-
-	// Return an error if the number has a fractional part.
-	if strings.Contains(lit, ".") {
-		msg := fmt.Sprintf("fractional parts not allowed in %s", t.String())
-		return 0, &ParseError{Message: msg, Pos: pos}
-	}
-
-	// Parse number.
-	n, _ := strconv.ParseInt(lit, 10, 64)
-
-	if n < 0 {
-		msg := fmt.Sprintf("%s must be >= 0", t.String())
-		return 0, &ParseError{Message: msg, Pos: pos}
-	}
-
-	return int(n), nil
-}
-
-// parseOrderBy parses the "ORDER BY" clause of a query, if it exists.
-func (p *Parser) parseOrderBy() (SortFields, error) {
-	// Return nil result and nil error if no ORDER token at this position.
-	if tok, _, _ := p.scanIgnoreWhitespace(); tok != ORDER {
-		p.unscan()
-		return nil, nil
-	}
-
-	// Parse the required BY token.
-	if tok, pos, lit := p.scanIgnoreWhitespace(); tok != BY {
-		return nil, newParseError(tokstr(tok, lit), []string{"BY"}, pos)
-	}
-
-	// Parse the ORDER BY fields.
-	fields, err := p.parseSortFields()
-	if err != nil {
-		return nil, err
-	}
-
-	return fields, nil
-}
-
-// parseSortFields parses the sort fields for an ORDER BY clause.
-func (p *Parser) parseSortFields() (SortFields, error) {
-	var fields SortFields
-
-	tok, pos, lit := p.scanIgnoreWhitespace()
-
-	switch tok {
-	// The first field after an order by may not have a field name (e.g. ORDER BY ASC)
-	case ASC, DESC:
-		fields = append(fields, &SortField{Ascending: (tok == ASC)})
-	// If it's a token, parse it as a sort field.  At least one is required.
-	case IDENT:
-		p.unscan()
-		field, err := p.parseSortField()
-		if err != nil {
-			return nil, err
-		}
-
-		if lit != "time" {
-			return nil, errors.New("only ORDER BY time supported at this time")
-		}
-
-		fields = append(fields, field)
-	// Parse error...
-	default:
-		return nil, newParseError(tokstr(tok, lit), []string{"identifier", "ASC", "DESC"}, pos)
-	}
-
-	// Parse additional fields.
-	for {
-		tok, _, _ := p.scanIgnoreWhitespace()
-
-		if tok != COMMA {
-			p.unscan()
-			break
-		}
-
-		field, err := p.parseSortField()
-		if err != nil {
-			return nil, err
-		}
-
-		fields = append(fields, field)
-	}
-
-	if len(fields) > 1 {
-		return nil, errors.New("only ORDER BY time supported at this time")
-	}
-
-	return fields, nil
-}
-
-// parseSortField parses one field of an ORDER BY clause.
-func (p *Parser) parseSortField() (*SortField, error) {
-	field := &SortField{}
-
-	// Parse sort field name.
-	ident, err := p.parseIdent()
-	if err != nil {
-		return nil, err
-	}
-	field.Name = ident
-
-	// Check for optional ASC or DESC clause. Default is ASC.
-	tok, _, _ := p.scanIgnoreWhitespace()
-	if tok != ASC && tok != DESC {
-		p.unscan()
-		tok = ASC
-	}
-	field.Ascending = (tok == ASC)
-
-	return field, nil
-}
-
-// parseVarRef parses a reference to a measurement or field.
-func (p *Parser) parseVarRef() (*VarRef, error) {
-	// Parse the segments of the variable ref.
-	segments, err := p.parseSegmentedIdents()
-	if err != nil {
-		return nil, err
-	}
-
-	vr := &VarRef{Val: strings.Join(segments, ".")}
-
-	return vr, nil
-}
-
-// ParseExpr parses an expression.
-func (p *Parser) ParseExpr() (Expr, error) {
-	var err error
-	// Dummy root node.
-	root := &BinaryExpr{}
-
-	// Parse a non-binary expression type to start.
-	// This variable will always be the root of the expression tree.
-	root.RHS, err = p.parseUnaryExpr()
-	if err != nil {
-		return nil, err
-	}
-
-	// Loop over operations and unary exprs and build a tree based on precendence.
-	for {
-		// If the next token is NOT an operator then return the expression.
-		op, _, _ := p.scanIgnoreWhitespace()
-		if !op.isOperator() {
-			p.unscan()
-			return root.RHS, nil
-		}
-
-		// Otherwise parse the next expression.
-		var rhs Expr
-		if IsRegexOp(op) {
-			// RHS of a regex operator must be a regular expression.
-			p.consumeWhitespace()
-			if rhs, err = p.parseRegex(); err != nil {
-				return nil, err
-			}
-			// parseRegex can return an empty type, but we need it to be present
-			if rhs.(*RegexLiteral) == nil {
-				tok, pos, lit := p.scanIgnoreWhitespace()
-				return nil, newParseError(tokstr(tok, lit), []string{"regex"}, pos)
-			}
-		} else {
-			if rhs, err = p.parseUnaryExpr(); err != nil {
-				return nil, err
-			}
-		}
-
-		// Find the right spot in the tree to add the new expression by
-		// descending the RHS of the expression tree until we reach the last
-		// BinaryExpr or a BinaryExpr whose RHS has an operator with
-		// precedence >= the operator being added.
-		for node := root; ; {
-			r, ok := node.RHS.(*BinaryExpr)
-			if !ok || r.Op.Precedence() >= op.Precedence() {
-				// Add the new expression here and break.
-				node.RHS = &BinaryExpr{LHS: node.RHS, RHS: rhs, Op: op}
-				break
-			}
-			node = r
-		}
-	}
-}
-
-// parseUnaryExpr parses an non-binary expression.
-func (p *Parser) parseUnaryExpr() (Expr, error) {
-	// If the first token is a LPAREN then parse it as its own grouped expression.
-	if tok, _, _ := p.scanIgnoreWhitespace(); tok == LPAREN {
-		expr, err := p.ParseExpr()
-		if err != nil {
-			return nil, err
-		}
-
-		// Expect an RPAREN at the end.
-		if tok, pos, lit := p.scanIgnoreWhitespace(); tok != RPAREN {
-			return nil, newParseError(tokstr(tok, lit), []string{")"}, pos)
-		}
-
-		return &ParenExpr{Expr: expr}, nil
-	}
-	p.unscan()
-
-	// Read next token.
-	tok, pos, lit := p.scanIgnoreWhitespace()
-	switch tok {
-	case IDENT:
-		// If the next immediate token is a left parentheses, parse as function call.
-		// Otherwise parse as a variable reference.
-		if tok0, _, _ := p.scan(); tok0 == LPAREN {
-			return p.parseCall(lit)
-		}
-
-		p.unscan() // unscan the last token (wasn't an LPAREN)
-		p.unscan() // unscan the IDENT token
-
-		// Parse it as a VarRef.
-		return p.parseVarRef()
-	case DISTINCT:
-		// If the next immediate token is a left parentheses, parse as function call.
-		// Otherwise parse as a Distinct expression.
-		tok0, pos, lit := p.scan()
-		if tok0 == LPAREN {
-			return p.parseCall("distinct")
-		} else if tok0 == WS {
-			tok1, pos, lit := p.scanIgnoreWhitespace()
-			if tok1 != IDENT {
-				return nil, newParseError(tokstr(tok1, lit), []string{"identifier"}, pos)
-			}
-			return &Distinct{Val: lit}, nil
-		}
-
-		return nil, newParseError(tokstr(tok0, lit), []string{"(", "identifier"}, pos)
-	case STRING:
-		// If literal looks like a date time then parse it as a time literal.
-		if isDateTimeString(lit) {
-			t, err := time.Parse(DateTimeFormat, lit)
-			if err != nil {
-				// try to parse it as an RFCNano time
-				t, err := time.Parse(time.RFC3339Nano, lit)
-				if err != nil {
-					return nil, &ParseError{Message: "unable to parse datetime", Pos: pos}
-				}
-				return &TimeLiteral{Val: t}, nil
-			}
-			return &TimeLiteral{Val: t}, nil
-		} else if isDateString(lit) {
-			t, err := time.Parse(DateFormat, lit)
-			if err != nil {
-				return nil, &ParseError{Message: "unable to parse date", Pos: pos}
-			}
-			return &TimeLiteral{Val: t}, nil
-		}
-		return &StringLiteral{Val: lit}, nil
-	case NUMBER:
-		v, err := strconv.ParseFloat(lit, 64)
-		if err != nil {
-			return nil, &ParseError{Message: "unable to parse number", Pos: pos}
-		}
-		return &NumberLiteral{Val: v}, nil
-	case TRUE, FALSE:
-		return &BooleanLiteral{Val: (tok == TRUE)}, nil
-	case DURATION_VAL:
-		v, _ := ParseDuration(lit)
-		return &DurationLiteral{Val: v}, nil
-	case MUL:
-		return &Wildcard{}, nil
-	case REGEX:
-		re, err := regexp.Compile(lit)
-		if err != nil {
-			return nil, &ParseError{Message: err.Error(), Pos: pos}
-		}
-		return &RegexLiteral{Val: re}, nil
-	default:
-		return nil, newParseError(tokstr(tok, lit), []string{"identifier", "string", "number", "bool"}, pos)
-	}
-}
-
-// parseRegex parses a regular expression.
-func (p *Parser) parseRegex() (*RegexLiteral, error) {
-	nextRune := p.peekRune()
-	if isWhitespace(nextRune) {
-		p.consumeWhitespace()
-	}
-
-	// If the next character is not a '/', then return nils.
-	nextRune = p.peekRune()
-	if nextRune != '/' {
-		return nil, nil
-	}
-
-	tok, pos, lit := p.s.ScanRegex()
-
-	if tok == BADESCAPE {
-		msg := fmt.Sprintf("bad escape: %s", lit)
-		return nil, &ParseError{Message: msg, Pos: pos}
-	} else if tok == BADREGEX {
-		msg := fmt.Sprintf("bad regex: %s", lit)
-		return nil, &ParseError{Message: msg, Pos: pos}
-	} else if tok != REGEX {
-		return nil, newParseError(tokstr(tok, lit), []string{"regex"}, pos)
-	}
-
-	re, err := regexp.Compile(lit)
-	if err != nil {
-		return nil, &ParseError{Message: err.Error(), Pos: pos}
-	}
-
-	return &RegexLiteral{Val: re}, nil
-}
-
-// parseCall parses a function call.
-// This function assumes the function name and LPAREN have been consumed.
-func (p *Parser) parseCall(name string) (*Call, error) {
-	name = strings.ToLower(name)
-	// If there's a right paren then just return immediately.
-	if tok, _, _ := p.scan(); tok == RPAREN {
-		return &Call{Name: name}, nil
-	}
-	p.unscan()
-
-	// Otherwise parse function call arguments.
-	var args []Expr
-	for {
-		// Parse an expression argument.
-		arg, err := p.ParseExpr()
-		if err != nil {
-			return nil, err
-		}
-		args = append(args, arg)
-
-		// If there's not a comma next then stop parsing arguments.
-		if tok, _, _ := p.scan(); tok != COMMA {
-			p.unscan()
-			break
-		}
-	}
-
-	// There should be a right parentheses at the end.
-	if tok, pos, lit := p.scan(); tok != RPAREN {
-		return nil, newParseError(tokstr(tok, lit), []string{")"}, pos)
-	}
-
-	return &Call{Name: name, Args: args}, nil
-}
-
-// scan returns the next token from the underlying scanner.
-func (p *Parser) scan() (tok Token, pos Pos, lit string) { return p.s.Scan() }
-
-// scanIgnoreWhitespace scans the next non-whitespace token.
-func (p *Parser) scanIgnoreWhitespace() (tok Token, pos Pos, lit string) {
-	tok, pos, lit = p.scan()
-	if tok == WS {
-		tok, pos, lit = p.scan()
-	}
-	return
-}
-
-// consumeWhitespace scans the next token if it's whitespace.
-func (p *Parser) consumeWhitespace() {
-	if tok, _, _ := p.scan(); tok != WS {
-		p.unscan()
-	}
-}
-
-// unscan pushes the previously read token back onto the buffer.
-func (p *Parser) unscan() { p.s.Unscan() }
-
-// ParseDuration parses a time duration from a string.
-func ParseDuration(s string) (time.Duration, error) {
-	// Return an error if the string is blank.
-	if len(s) == 0 {
-		return 0, ErrInvalidDuration
-	}
-
-	// If there's only character then it must be a digit (in microseconds).
-	if len(s) == 1 {
-		if n, err := strconv.ParseInt(s, 10, 64); err == nil {
-			return time.Duration(n) * time.Microsecond, nil
-		}
-		return 0, ErrInvalidDuration
-	}
-
-	// Split string into individual runes.
-	a := split(s)
-
-	// Extract the unit of measure.
-	// If the last character is a digit then parse the whole string as microseconds.
-	// If the last two characters are "ms" the parse as milliseconds.
-	// Otherwise just use the last character as the unit of measure.
-	var num, uom string
-	if isDigit(rune(a[len(a)-1])) {
-		num, uom = s, "u"
-	} else if len(s) > 2 && s[len(s)-2:] == "ms" {
-		num, uom = string(a[:len(a)-2]), "ms"
-	} else {
-		num, uom = string(a[:len(a)-1]), string(a[len(a)-1:])
-	}
-
-	// Parse the numeric part.
-	n, err := strconv.ParseInt(num, 10, 64)
-	if err != nil {
-		return 0, ErrInvalidDuration
-	}
-
-	// Multiply by the unit of measure.
-	switch uom {
-	case "u", "µ":
-		return time.Duration(n) * time.Microsecond, nil
-	case "ms":
-		return time.Duration(n) * time.Millisecond, nil
-	case "s":
-		return time.Duration(n) * time.Second, nil
-	case "m":
-		return time.Duration(n) * time.Minute, nil
-	case "h":
-		return time.Duration(n) * time.Hour, nil
-	case "d":
-		return time.Duration(n) * 24 * time.Hour, nil
-	case "w":
-		return time.Duration(n) * 7 * 24 * time.Hour, nil
-	default:
-		return 0, ErrInvalidDuration
-	}
-}
-
-// FormatDuration formats a duration to a string.
-func FormatDuration(d time.Duration) string {
-	if d == 0 {
-		return "0s"
-	} else if d%(7*24*time.Hour) == 0 {
-		return fmt.Sprintf("%dw", d/(7*24*time.Hour))
-	} else if d%(24*time.Hour) == 0 {
-		return fmt.Sprintf("%dd", d/(24*time.Hour))
-	} else if d%time.Hour == 0 {
-		return fmt.Sprintf("%dh", d/time.Hour)
-	} else if d%time.Minute == 0 {
-		return fmt.Sprintf("%dm", d/time.Minute)
-	} else if d%time.Second == 0 {
-		return fmt.Sprintf("%ds", d/time.Second)
-	} else if d%time.Millisecond == 0 {
-		return fmt.Sprintf("%dms", d/time.Millisecond)
-	}
-	return fmt.Sprintf("%d", d/time.Microsecond)
-}
-
-// parseTokens consumes an expected sequence of tokens.
-func (p *Parser) parseTokens(toks []Token) error {
-	for _, expected := range toks {
-		if tok, pos, lit := p.scanIgnoreWhitespace(); tok != expected {
-			return newParseError(tokstr(tok, lit), []string{tokens[expected]}, pos)
-		}
-	}
-	return nil
-}
-
-// QuoteString returns a quoted string.
-func QuoteString(s string) string {
-	return `'` + strings.NewReplacer("\n", `\n`, `\`, `\\`, `'`, `\'`).Replace(s) + `'`
-}
-
-// QuoteIdent returns a quoted identifier from multiple bare identifiers.
-func QuoteIdent(segments ...string) string {
-	r := strings.NewReplacer("\n", `\n`, `\`, `\\`, `"`, `\"`)
-
-	var buf bytes.Buffer
-	for i, segment := range segments {
-		needQuote := IdentNeedsQuotes(segment) ||
-			((i < len(segments)-1) && segment != "") // not last segment && not ""
-
-		if needQuote {
-			_ = buf.WriteByte('"')
-		}
-
-		_, _ = buf.WriteString(r.Replace(segment))
-
-		if needQuote {
-			_ = buf.WriteByte('"')
-		}
-
-		if i < len(segments)-1 {
-			_ = buf.WriteByte('.')
-		}
-	}
-	return buf.String()
-}
-
-// IdentNeedsQuotes returns true if the ident string given would require quotes.
-func IdentNeedsQuotes(ident string) bool {
-	// check if this identifier is a keyword
-	tok := Lookup(ident)
-	if tok != IDENT {
-		return true
-	}
-	for i, r := range ident {
-		if i == 0 && !isIdentFirstChar(r) {
-			return true
-		} else if i > 0 && !isIdentChar(r) {
-			return true
-		}
-	}
-	return false
-}
-
-// split splits a string into a slice of runes.
-func split(s string) (a []rune) {
-	for _, ch := range s {
-		a = append(a, ch)
-	}
-	return
-}
-
-// isDateString returns true if the string looks like a date-only time literal.
-func isDateString(s string) bool { return dateStringRegexp.MatchString(s) }
-
-// isDateTimeString returns true if the string looks like a date+time time literal.
-func isDateTimeString(s string) bool { return dateTimeStringRegexp.MatchString(s) }
-
-var dateStringRegexp = regexp.MustCompile(`^\d{4}-\d{2}-\d{2}$`)
-var dateTimeStringRegexp = regexp.MustCompile(`^\d{4}-\d{2}-\d{2}.+`)
-
-// ErrInvalidDuration is returned when parsing a malformatted duration.
-var ErrInvalidDuration = errors.New("invalid duration")
-
-// ParseError represents an error that occurred during parsing.
-type ParseError struct {
-	Message  string
-	Found    string
-	Expected []string
-	Pos      Pos
-}
-
-// newParseError returns a new instance of ParseError.
-func newParseError(found string, expected []string, pos Pos) *ParseError {
-	return &ParseError{Found: found, Expected: expected, Pos: pos}
-}
-
-// Error returns the string representation of the error.
-func (e *ParseError) Error() string {
-	if e.Message != "" {
-		return fmt.Sprintf("%s at line %d, char %d", e.Message, e.Pos.Line+1, e.Pos.Char+1)
-	}
-	return fmt.Sprintf("found %s, expected %s at line %d, char %d", e.Found, strings.Join(e.Expected, ", "), e.Pos.Line+1, e.Pos.Char+1)
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/influxql/parser_test.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/influxql/parser_test.go
deleted file mode 100644
index 9a021be54..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/influxql/parser_test.go
+++ /dev/null
@@ -1,2169 +0,0 @@
-package influxql_test
-
-import (
-	"encoding/json"
-	"fmt"
-	"reflect"
-	"regexp"
-	"strings"
-	"testing"
-	"time"
-
-	"github.com/influxdb/influxdb/influxql"
-)
-
-// Ensure the parser can parse a multi-statement query.
-func TestParser_ParseQuery(t *testing.T) {
-	s := `SELECT a FROM b; SELECT c FROM d`
-	q, err := influxql.NewParser(strings.NewReader(s)).ParseQuery()
-	if err != nil {
-		t.Fatalf("unexpected error: %s", err)
-	} else if len(q.Statements) != 2 {
-		t.Fatalf("unexpected statement count: %d", len(q.Statements))
-	}
-}
-
-func TestParser_ParseQuery_TrailingSemicolon(t *testing.T) {
-	s := `SELECT value FROM cpu;`
-	q, err := influxql.NewParser(strings.NewReader(s)).ParseQuery()
-	if err != nil {
-		t.Fatalf("unexpected error: %s", err)
-	} else if len(q.Statements) != 1 {
-		t.Fatalf("unexpected statement count: %d", len(q.Statements))
-	}
-}
-
-// Ensure the parser can parse an empty query.
-func TestParser_ParseQuery_Empty(t *testing.T) {
-	q, err := influxql.NewParser(strings.NewReader(``)).ParseQuery()
-	if err != nil {
-		t.Fatalf("unexpected error: %s", err)
-	} else if len(q.Statements) != 0 {
-		t.Fatalf("unexpected statement count: %d", len(q.Statements))
-	}
-}
-
-// Ensure the parser can return an error from an malformed statement.
-func TestParser_ParseQuery_ParseError(t *testing.T) {
-	_, err := influxql.NewParser(strings.NewReader(`SELECT`)).ParseQuery()
-	if err == nil || err.Error() != `found EOF, expected identifier, string, number, bool at line 1, char 8` {
-		t.Fatalf("unexpected error: %s", err)
-	}
-}
-
-// Ensure the parser can parse strings into Statement ASTs.
-func TestParser_ParseStatement(t *testing.T) {
-	// For use in various tests.
-	now := time.Now()
-
-	var tests = []struct {
-		skip bool
-		s    string
-		stmt influxql.Statement
-		err  string
-	}{
-		// SELECT * statement
-		{
-			s: `SELECT * FROM myseries`,
-			stmt: &influxql.SelectStatement{
-				IsRawQuery: true,
-				Fields: []*influxql.Field{
-					{Expr: &influxql.Wildcard{}},
-				},
-				Sources: []influxql.Source{&influxql.Measurement{Name: "myseries"}},
-			},
-		},
-		{
-			s: `SELECT * FROM myseries GROUP BY *`,
-			stmt: &influxql.SelectStatement{
-				IsRawQuery: true,
-				Fields: []*influxql.Field{
-					{Expr: &influxql.Wildcard{}},
-				},
-				Sources:    []influxql.Source{&influxql.Measurement{Name: "myseries"}},
-				Dimensions: []*influxql.Dimension{{Expr: &influxql.Wildcard{}}},
-			},
-		},
-		{
-			s: `SELECT field1, * FROM myseries GROUP BY *`,
-			stmt: &influxql.SelectStatement{
-				IsRawQuery: true,
-				Fields: []*influxql.Field{
-					{Expr: &influxql.VarRef{Val: "field1"}},
-					{Expr: &influxql.Wildcard{}},
-				},
-				Sources:    []influxql.Source{&influxql.Measurement{Name: "myseries"}},
-				Dimensions: []*influxql.Dimension{{Expr: &influxql.Wildcard{}}},
-			},
-		},
-		{
-			s: `SELECT *, field1 FROM myseries GROUP BY *`,
-			stmt: &influxql.SelectStatement{
-				IsRawQuery: true,
-				Fields: []*influxql.Field{
-					{Expr: &influxql.Wildcard{}},
-					{Expr: &influxql.VarRef{Val: "field1"}},
-				},
-				Sources:    []influxql.Source{&influxql.Measurement{Name: "myseries"}},
-				Dimensions: []*influxql.Dimension{{Expr: &influxql.Wildcard{}}},
-			},
-		},
-
-		// SELECT statement
-		{
-			s: fmt.Sprintf(`SELECT mean(field1), sum(field2) ,count(field3) AS field_x FROM myseries WHERE host = 'hosta.influxdb.org' and time > '%s' GROUP BY time(10h) ORDER BY DESC LIMIT 20 OFFSET 10;`, now.UTC().Format(time.RFC3339Nano)),
-			stmt: &influxql.SelectStatement{
-				IsRawQuery: false,
-				Fields: []*influxql.Field{
-					{Expr: &influxql.Call{Name: "mean", Args: []influxql.Expr{&influxql.VarRef{Val: "field1"}}}},
-					{Expr: &influxql.Call{Name: "sum", Args: []influxql.Expr{&influxql.VarRef{Val: "field2"}}}},
-					{Expr: &influxql.Call{Name: "count", Args: []influxql.Expr{&influxql.VarRef{Val: "field3"}}}, Alias: "field_x"},
-				},
-				Sources: []influxql.Source{&influxql.Measurement{Name: "myseries"}},
-				Condition: &influxql.BinaryExpr{
-					Op: influxql.AND,
-					LHS: &influxql.BinaryExpr{
-						Op:  influxql.EQ,
-						LHS: &influxql.VarRef{Val: "host"},
-						RHS: &influxql.StringLiteral{Val: "hosta.influxdb.org"},
-					},
-					RHS: &influxql.BinaryExpr{
-						Op:  influxql.GT,
-						LHS: &influxql.VarRef{Val: "time"},
-						RHS: &influxql.TimeLiteral{Val: now.UTC()},
-					},
-				},
-				Dimensions: []*influxql.Dimension{{Expr: &influxql.Call{Name: "time", Args: []influxql.Expr{&influxql.DurationLiteral{Val: 10 * time.Hour}}}}},
-				SortFields: []*influxql.SortField{
-					{Ascending: false},
-				},
-				Limit:  20,
-				Offset: 10,
-			},
-		},
-		{
-			s: `SELECT "foo.bar.baz" AS foo FROM myseries`,
-			stmt: &influxql.SelectStatement{
-				IsRawQuery: true,
-				Fields: []*influxql.Field{
-					{Expr: &influxql.VarRef{Val: "foo.bar.baz"}, Alias: "foo"},
-				},
-				Sources: []influxql.Source{&influxql.Measurement{Name: "myseries"}},
-			},
-		},
-		{
-			s: `SELECT "foo.bar.baz" AS foo FROM foo`,
-			stmt: &influxql.SelectStatement{
-				IsRawQuery: true,
-				Fields: []*influxql.Field{
-					{Expr: &influxql.VarRef{Val: "foo.bar.baz"}, Alias: "foo"},
-				},
-				Sources: []influxql.Source{&influxql.Measurement{Name: "foo"}},
-			},
-		},
-
-		// derivative
-		{
-			s: `SELECT derivative(field1, 1h) FROM myseries;`,
-			stmt: &influxql.SelectStatement{
-				IsRawQuery: false,
-				Fields: []*influxql.Field{
-					{Expr: &influxql.Call{Name: "derivative", Args: []influxql.Expr{&influxql.VarRef{Val: "field1"}, &influxql.DurationLiteral{Val: time.Hour}}}},
-				},
-				Sources: []influxql.Source{&influxql.Measurement{Name: "myseries"}},
-			},
-		},
-
-		{
-			s: fmt.Sprintf(`SELECT derivative(field1, 1h) FROM myseries WHERE time > '%s'`, now.UTC().Format(time.RFC3339Nano)),
-			stmt: &influxql.SelectStatement{
-				IsRawQuery: false,
-				Fields: []*influxql.Field{
-					{Expr: &influxql.Call{Name: "derivative", Args: []influxql.Expr{&influxql.VarRef{Val: "field1"}, &influxql.DurationLiteral{Val: time.Hour}}}},
-				},
-				Sources: []influxql.Source{&influxql.Measurement{Name: "myseries"}},
-				Condition: &influxql.BinaryExpr{
-					Op:  influxql.GT,
-					LHS: &influxql.VarRef{Val: "time"},
-					RHS: &influxql.TimeLiteral{Val: now.UTC()},
-				},
-			},
-		},
-
-		{
-			s: `SELECT derivative(mean(field1), 1h) FROM myseries;`,
-			stmt: &influxql.SelectStatement{
-				IsRawQuery: false,
-				Fields: []*influxql.Field{
-					{Expr: &influxql.Call{Name: "derivative", Args: []influxql.Expr{&influxql.Call{Name: "mean", Args: []influxql.Expr{&influxql.VarRef{Val: "field1"}}}, &influxql.DurationLiteral{Val: time.Hour}}}},
-				},
-				Sources: []influxql.Source{&influxql.Measurement{Name: "myseries"}},
-			},
-		},
-
-		{
-			s: `SELECT derivative(mean(field1)) FROM myseries;`,
-			stmt: &influxql.SelectStatement{
-				IsRawQuery: false,
-				Fields: []*influxql.Field{
-					{Expr: &influxql.Call{Name: "derivative", Args: []influxql.Expr{&influxql.Call{Name: "mean", Args: []influxql.Expr{&influxql.VarRef{Val: "field1"}}}}}},
-				},
-				Sources: []influxql.Source{&influxql.Measurement{Name: "myseries"}},
-			},
-		},
-
-		// SELECT statement (lowercase)
-		{
-			s: `select my_field from myseries`,
-			stmt: &influxql.SelectStatement{
-				IsRawQuery: true,
-				Fields:     []*influxql.Field{{Expr: &influxql.VarRef{Val: "my_field"}}},
-				Sources:    []influxql.Source{&influxql.Measurement{Name: "myseries"}},
-			},
-		},
-
-		// SELECT statement (lowercase) with quoted field
-		{
-			s: `select 'my_field' from myseries`,
-			stmt: &influxql.SelectStatement{
-				IsRawQuery: true,
-				Fields:     []*influxql.Field{{Expr: &influxql.StringLiteral{Val: "my_field"}}},
-				Sources:    []influxql.Source{&influxql.Measurement{Name: "myseries"}},
-			},
-		},
-
-		// SELECT statement with multiple ORDER BY fields
-		{
-			skip: true,
-			s:    `SELECT field1 FROM myseries ORDER BY ASC, field1, field2 DESC LIMIT 10`,
-			stmt: &influxql.SelectStatement{
-				IsRawQuery: true,
-				Fields:     []*influxql.Field{{Expr: &influxql.VarRef{Val: "field1"}}},
-				Sources:    []influxql.Source{&influxql.Measurement{Name: "myseries"}},
-				SortFields: []*influxql.SortField{
-					{Ascending: true},
-					{Name: "field1"},
-					{Name: "field2"},
-				},
-				Limit: 10,
-			},
-		},
-
-		// SELECT statement with SLIMIT and SOFFSET
-		{
-			s: `SELECT field1 FROM myseries SLIMIT 10 SOFFSET 5`,
-			stmt: &influxql.SelectStatement{
-				IsRawQuery: true,
-				Fields:     []*influxql.Field{{Expr: &influxql.VarRef{Val: "field1"}}},
-				Sources:    []influxql.Source{&influxql.Measurement{Name: "myseries"}},
-				SLimit:     10,
-				SOffset:    5,
-			},
-		},
-
-		// SELECT * FROM cpu WHERE host = 'serverC' AND region =~ /.*west.*/
-		{
-			s: `SELECT * FROM cpu WHERE host = 'serverC' AND region =~ /.*west.*/`,
-			stmt: &influxql.SelectStatement{
-				IsRawQuery: true,
-				Fields:     []*influxql.Field{{Expr: &influxql.Wildcard{}}},
-				Sources:    []influxql.Source{&influxql.Measurement{Name: "cpu"}},
-				Condition: &influxql.BinaryExpr{
-					Op: influxql.AND,
-					LHS: &influxql.BinaryExpr{
-						Op:  influxql.EQ,
-						LHS: &influxql.VarRef{Val: "host"},
-						RHS: &influxql.StringLiteral{Val: "serverC"},
-					},
-					RHS: &influxql.BinaryExpr{
-						Op:  influxql.EQREGEX,
-						LHS: &influxql.VarRef{Val: "region"},
-						RHS: &influxql.RegexLiteral{Val: regexp.MustCompile(".*west.*")},
-					},
-				},
-			},
-		},
-
-		// select percentile statements
-		{
-			s: `select percentile("field1", 2.0) from cpu`,
-			stmt: &influxql.SelectStatement{
-				IsRawQuery: false,
-				Fields: []*influxql.Field{
-					{Expr: &influxql.Call{Name: "percentile", Args: []influxql.Expr{&influxql.VarRef{Val: "field1"}, &influxql.NumberLiteral{Val: 2.0}}}},
-				},
-				Sources: []influxql.Source{&influxql.Measurement{Name: "cpu"}},
-			},
-		},
-
-		// select top statements
-		{
-			s: `select top("field1", 2) from cpu`,
-			stmt: &influxql.SelectStatement{
-				IsRawQuery: false,
-				Fields: []*influxql.Field{
-					{Expr: &influxql.Call{Name: "top", Args: []influxql.Expr{&influxql.VarRef{Val: "field1"}, &influxql.NumberLiteral{Val: 2}}}},
-				},
-				Sources: []influxql.Source{&influxql.Measurement{Name: "cpu"}},
-			},
-		},
-
-		{
-			s: `select top(field1, 2) from cpu`,
-			stmt: &influxql.SelectStatement{
-				IsRawQuery: false,
-				Fields: []*influxql.Field{
-					{Expr: &influxql.Call{Name: "top", Args: []influxql.Expr{&influxql.VarRef{Val: "field1"}, &influxql.NumberLiteral{Val: 2}}}},
-				},
-				Sources: []influxql.Source{&influxql.Measurement{Name: "cpu"}},
-			},
-		},
-
-		{
-			s: `select top(field1, 2), tag1 from cpu`,
-			stmt: &influxql.SelectStatement{
-				IsRawQuery: false,
-				Fields: []*influxql.Field{
-					{Expr: &influxql.Call{Name: "top", Args: []influxql.Expr{&influxql.VarRef{Val: "field1"}, &influxql.NumberLiteral{Val: 2}}}},
-					{Expr: &influxql.VarRef{Val: "tag1"}},
-				},
-				Sources: []influxql.Source{&influxql.Measurement{Name: "cpu"}},
-			},
-		},
-
-		{
-			s: `select top(field1, tag1, 2), tag1 from cpu`,
-			stmt: &influxql.SelectStatement{
-				IsRawQuery: false,
-				Fields: []*influxql.Field{
-					{Expr: &influxql.Call{Name: "top", Args: []influxql.Expr{&influxql.VarRef{Val: "field1"}, &influxql.VarRef{Val: "tag1"}, &influxql.NumberLiteral{Val: 2}}}},
-					{Expr: &influxql.VarRef{Val: "tag1"}},
-				},
-				Sources: []influxql.Source{&influxql.Measurement{Name: "cpu"}},
-			},
-		},
-
-		// select distinct statements
-		{
-			s: `select distinct(field1) from cpu`,
-			stmt: &influxql.SelectStatement{
-				IsRawQuery: false,
-				Fields: []*influxql.Field{
-					{Expr: &influxql.Call{Name: "distinct", Args: []influxql.Expr{&influxql.VarRef{Val: "field1"}}}},
-				},
-				Sources: []influxql.Source{&influxql.Measurement{Name: "cpu"}},
-			},
-		},
-
-		{
-			s: `select distinct field2 from network`,
-			stmt: &influxql.SelectStatement{
-				IsRawQuery: true,
-				Fields: []*influxql.Field{
-					{Expr: &influxql.Distinct{Val: "field2"}},
-				},
-				Sources: []influxql.Source{&influxql.Measurement{Name: "network"}},
-			},
-		},
-
-		{
-			s: `select count(distinct field3) from metrics`,
-			stmt: &influxql.SelectStatement{
-				IsRawQuery: false,
-				Fields: []*influxql.Field{
-					{Expr: &influxql.Call{Name: "count", Args: []influxql.Expr{&influxql.Distinct{Val: "field3"}}}},
-				},
-				Sources: []influxql.Source{&influxql.Measurement{Name: "metrics"}},
-			},
-		},
-
-		{
-			s: `select count(distinct field3), sum(field4) from metrics`,
-			stmt: &influxql.SelectStatement{
-				IsRawQuery: false,
-				Fields: []*influxql.Field{
-					{Expr: &influxql.Call{Name: "count", Args: []influxql.Expr{&influxql.Distinct{Val: "field3"}}}},
-					{Expr: &influxql.Call{Name: "sum", Args: []influxql.Expr{&influxql.VarRef{Val: "field4"}}}},
-				},
-				Sources: []influxql.Source{&influxql.Measurement{Name: "metrics"}},
-			},
-		},
-
-		{
-			s: `select count(distinct(field3)), sum(field4) from metrics`,
-			stmt: &influxql.SelectStatement{
-				IsRawQuery: false,
-				Fields: []*influxql.Field{
-					{Expr: &influxql.Call{Name: "count", Args: []influxql.Expr{&influxql.Call{Name: "distinct", Args: []influxql.Expr{&influxql.VarRef{Val: "field3"}}}}}},
-					{Expr: &influxql.Call{Name: "sum", Args: []influxql.Expr{&influxql.VarRef{Val: "field4"}}}},
-				},
-				Sources: []influxql.Source{&influxql.Measurement{Name: "metrics"}},
-			},
-		},
-
-		// SELECT * FROM WHERE time
-		{
-			s: fmt.Sprintf(`SELECT * FROM cpu WHERE time > '%s'`, now.UTC().Format(time.RFC3339Nano)),
-			stmt: &influxql.SelectStatement{
-				IsRawQuery: true,
-				Fields:     []*influxql.Field{{Expr: &influxql.Wildcard{}}},
-				Sources:    []influxql.Source{&influxql.Measurement{Name: "cpu"}},
-				Condition: &influxql.BinaryExpr{
-					Op:  influxql.GT,
-					LHS: &influxql.VarRef{Val: "time"},
-					RHS: &influxql.TimeLiteral{Val: now.UTC()},
-				},
-			},
-		},
-
-		// SELECT * FROM WHERE field comparisons
-		{
-			s: `SELECT * FROM cpu WHERE load > 100`,
-			stmt: &influxql.SelectStatement{
-				IsRawQuery: true,
-				Fields:     []*influxql.Field{{Expr: &influxql.Wildcard{}}},
-				Sources:    []influxql.Source{&influxql.Measurement{Name: "cpu"}},
-				Condition: &influxql.BinaryExpr{
-					Op:  influxql.GT,
-					LHS: &influxql.VarRef{Val: "load"},
-					RHS: &influxql.NumberLiteral{Val: 100},
-				},
-			},
-		},
-		{
-			s: `SELECT * FROM cpu WHERE load >= 100`,
-			stmt: &influxql.SelectStatement{
-				IsRawQuery: true,
-				Fields:     []*influxql.Field{{Expr: &influxql.Wildcard{}}},
-				Sources:    []influxql.Source{&influxql.Measurement{Name: "cpu"}},
-				Condition: &influxql.BinaryExpr{
-					Op:  influxql.GTE,
-					LHS: &influxql.VarRef{Val: "load"},
-					RHS: &influxql.NumberLiteral{Val: 100},
-				},
-			},
-		},
-		{
-			s: `SELECT * FROM cpu WHERE load = 100`,
-			stmt: &influxql.SelectStatement{
-				IsRawQuery: true,
-				Fields:     []*influxql.Field{{Expr: &influxql.Wildcard{}}},
-				Sources:    []influxql.Source{&influxql.Measurement{Name: "cpu"}},
-				Condition: &influxql.BinaryExpr{
-					Op:  influxql.EQ,
-					LHS: &influxql.VarRef{Val: "load"},
-					RHS: &influxql.NumberLiteral{Val: 100},
-				},
-			},
-		},
-		{
-			s: `SELECT * FROM cpu WHERE load <= 100`,
-			stmt: &influxql.SelectStatement{
-				IsRawQuery: true,
-				Fields:     []*influxql.Field{{Expr: &influxql.Wildcard{}}},
-				Sources:    []influxql.Source{&influxql.Measurement{Name: "cpu"}},
-				Condition: &influxql.BinaryExpr{
-					Op:  influxql.LTE,
-					LHS: &influxql.VarRef{Val: "load"},
-					RHS: &influxql.NumberLiteral{Val: 100},
-				},
-			},
-		},
-		{
-			s: `SELECT * FROM cpu WHERE load < 100`,
-			stmt: &influxql.SelectStatement{
-				IsRawQuery: true,
-				Fields:     []*influxql.Field{{Expr: &influxql.Wildcard{}}},
-				Sources:    []influxql.Source{&influxql.Measurement{Name: "cpu"}},
-				Condition: &influxql.BinaryExpr{
-					Op:  influxql.LT,
-					LHS: &influxql.VarRef{Val: "load"},
-					RHS: &influxql.NumberLiteral{Val: 100},
-				},
-			},
-		},
-		{
-			s: `SELECT * FROM cpu WHERE load != 100`,
-			stmt: &influxql.SelectStatement{
-				IsRawQuery: true,
-				Fields:     []*influxql.Field{{Expr: &influxql.Wildcard{}}},
-				Sources:    []influxql.Source{&influxql.Measurement{Name: "cpu"}},
-				Condition: &influxql.BinaryExpr{
-					Op:  influxql.NEQ,
-					LHS: &influxql.VarRef{Val: "load"},
-					RHS: &influxql.NumberLiteral{Val: 100},
-				},
-			},
-		},
-
-		// SELECT * FROM /<regex>/
-		{
-			s: `SELECT * FROM /cpu.*/`,
-			stmt: &influxql.SelectStatement{
-				IsRawQuery: true,
-				Fields:     []*influxql.Field{{Expr: &influxql.Wildcard{}}},
-				Sources: []influxql.Source{&influxql.Measurement{
-					Regex: &influxql.RegexLiteral{Val: regexp.MustCompile("cpu.*")}},
-				},
-			},
-		},
-
-		// SELECT * FROM "db"."rp"./<regex>/
-		{
-			s: `SELECT * FROM "db"."rp"./cpu.*/`,
-			stmt: &influxql.SelectStatement{
-				IsRawQuery: true,
-				Fields:     []*influxql.Field{{Expr: &influxql.Wildcard{}}},
-				Sources: []influxql.Source{&influxql.Measurement{
-					Database:        `db`,
-					RetentionPolicy: `rp`,
-					Regex:           &influxql.RegexLiteral{Val: regexp.MustCompile("cpu.*")}},
-				},
-			},
-		},
-
-		// SELECT * FROM "db"../<regex>/
-		{
-			s: `SELECT * FROM "db"../cpu.*/`,
-			stmt: &influxql.SelectStatement{
-				IsRawQuery: true,
-				Fields:     []*influxql.Field{{Expr: &influxql.Wildcard{}}},
-				Sources: []influxql.Source{&influxql.Measurement{
-					Database: `db`,
-					Regex:    &influxql.RegexLiteral{Val: regexp.MustCompile("cpu.*")}},
-				},
-			},
-		},
-
-		// SELECT * FROM "rp"./<regex>/
-		{
-			s: `SELECT * FROM "rp"./cpu.*/`,
-			stmt: &influxql.SelectStatement{
-				IsRawQuery: true,
-				Fields:     []*influxql.Field{{Expr: &influxql.Wildcard{}}},
-				Sources: []influxql.Source{&influxql.Measurement{
-					RetentionPolicy: `rp`,
-					Regex:           &influxql.RegexLiteral{Val: regexp.MustCompile("cpu.*")}},
-				},
-			},
-		},
-
-		// SELECT statement with group by
-		{
-			s: `SELECT sum(value) FROM "kbps" WHERE time > now() - 120s AND deliveryservice='steam-dns' and cachegroup = 'total' GROUP BY time(60s)`,
-			stmt: &influxql.SelectStatement{
-				IsRawQuery: false,
-				Fields: []*influxql.Field{
-					{Expr: &influxql.Call{Name: "sum", Args: []influxql.Expr{&influxql.VarRef{Val: "value"}}}},
-				},
-				Sources:    []influxql.Source{&influxql.Measurement{Name: "kbps"}},
-				Dimensions: []*influxql.Dimension{{Expr: &influxql.Call{Name: "time", Args: []influxql.Expr{&influxql.DurationLiteral{Val: 60 * time.Second}}}}},
-				Condition: &influxql.BinaryExpr{ // 1
-					Op: influxql.AND,
-					LHS: &influxql.BinaryExpr{ // 2
-						Op: influxql.AND,
-						LHS: &influxql.BinaryExpr{ //3
-							Op:  influxql.GT,
-							LHS: &influxql.VarRef{Val: "time"},
-							RHS: &influxql.BinaryExpr{
-								Op:  influxql.SUB,
-								LHS: &influxql.Call{Name: "now"},
-								RHS: &influxql.DurationLiteral{Val: mustParseDuration("120s")},
-							},
-						},
-						RHS: &influxql.BinaryExpr{
-							Op:  influxql.EQ,
-							LHS: &influxql.VarRef{Val: "deliveryservice"},
-							RHS: &influxql.StringLiteral{Val: "steam-dns"},
-						},
-					},
-					RHS: &influxql.BinaryExpr{
-						Op:  influxql.EQ,
-						LHS: &influxql.VarRef{Val: "cachegroup"},
-						RHS: &influxql.StringLiteral{Val: "total"},
-					},
-				},
-			},
-		},
-
-		// SELECT statement with fill
-		{
-			s: fmt.Sprintf(`SELECT mean(value) FROM cpu where time < '%s' GROUP BY time(5m) fill(1)`, now.UTC().Format(time.RFC3339Nano)),
-			stmt: &influxql.SelectStatement{
-				Fields: []*influxql.Field{{
-					Expr: &influxql.Call{
-						Name: "mean",
-						Args: []influxql.Expr{&influxql.VarRef{Val: "value"}}}}},
-				Sources: []influxql.Source{&influxql.Measurement{Name: "cpu"}},
-				Condition: &influxql.BinaryExpr{
-					Op:  influxql.LT,
-					LHS: &influxql.VarRef{Val: "time"},
-					RHS: &influxql.TimeLiteral{Val: now.UTC()},
-				},
-				Dimensions: []*influxql.Dimension{{Expr: &influxql.Call{Name: "time", Args: []influxql.Expr{&influxql.DurationLiteral{Val: 5 * time.Minute}}}}},
-				Fill:       influxql.NumberFill,
-				FillValue:  float64(1),
-			},
-		},
-
-		// SELECT statement with FILL(none) -- check case insensitivity
-		{
-			s: fmt.Sprintf(`SELECT mean(value) FROM cpu where time < '%s' GROUP BY time(5m) FILL(none)`, now.UTC().Format(time.RFC3339Nano)),
-			stmt: &influxql.SelectStatement{
-				Fields: []*influxql.Field{{
-					Expr: &influxql.Call{
-						Name: "mean",
-						Args: []influxql.Expr{&influxql.VarRef{Val: "value"}}}}},
-				Sources: []influxql.Source{&influxql.Measurement{Name: "cpu"}},
-				Condition: &influxql.BinaryExpr{
-					Op:  influxql.LT,
-					LHS: &influxql.VarRef{Val: "time"},
-					RHS: &influxql.TimeLiteral{Val: now.UTC()},
-				},
-				Dimensions: []*influxql.Dimension{{Expr: &influxql.Call{Name: "time", Args: []influxql.Expr{&influxql.DurationLiteral{Val: 5 * time.Minute}}}}},
-				Fill:       influxql.NoFill,
-			},
-		},
-
-		// SELECT statement with previous fill
-		{
-			s: fmt.Sprintf(`SELECT mean(value) FROM cpu where time < '%s' GROUP BY time(5m) FILL(previous)`, now.UTC().Format(time.RFC3339Nano)),
-			stmt: &influxql.SelectStatement{
-				Fields: []*influxql.Field{{
-					Expr: &influxql.Call{
-						Name: "mean",
-						Args: []influxql.Expr{&influxql.VarRef{Val: "value"}}}}},
-				Sources: []influxql.Source{&influxql.Measurement{Name: "cpu"}},
-				Condition: &influxql.BinaryExpr{
-					Op:  influxql.LT,
-					LHS: &influxql.VarRef{Val: "time"},
-					RHS: &influxql.TimeLiteral{Val: now.UTC()},
-				},
-				Dimensions: []*influxql.Dimension{{Expr: &influxql.Call{Name: "time", Args: []influxql.Expr{&influxql.DurationLiteral{Val: 5 * time.Minute}}}}},
-				Fill:       influxql.PreviousFill,
-			},
-		},
-
-		// DELETE statement
-		{
-			s: `DELETE FROM myseries WHERE host = 'hosta.influxdb.org'`,
-			stmt: &influxql.DeleteStatement{
-				Source: &influxql.Measurement{Name: "myseries"},
-				Condition: &influxql.BinaryExpr{
-					Op:  influxql.EQ,
-					LHS: &influxql.VarRef{Val: "host"},
-					RHS: &influxql.StringLiteral{Val: "hosta.influxdb.org"},
-				},
-			},
-		},
-
-		// SHOW SERVERS
-		{
-			s:    `SHOW SERVERS`,
-			stmt: &influxql.ShowServersStatement{},
-		},
-
-		// SHOW GRANTS
-		{
-			s:    `SHOW GRANTS FOR jdoe`,
-			stmt: &influxql.ShowGrantsForUserStatement{Name: "jdoe"},
-		},
-
-		// SHOW DATABASES
-		{
-			s:    `SHOW DATABASES`,
-			stmt: &influxql.ShowDatabasesStatement{},
-		},
-
-		// SHOW SERIES statement
-		{
-			s:    `SHOW SERIES`,
-			stmt: &influxql.ShowSeriesStatement{},
-		},
-
-		// SHOW SERIES FROM
-		{
-			s: `SHOW SERIES FROM cpu`,
-			stmt: &influxql.ShowSeriesStatement{
-				Sources: []influxql.Source{&influxql.Measurement{Name: "cpu"}},
-			},
-		},
-
-		// SHOW SERIES FROM /<regex>/
-		{
-			s: `SHOW SERIES FROM /[cg]pu/`,
-			stmt: &influxql.ShowSeriesStatement{
-				Sources: []influxql.Source{
-					&influxql.Measurement{
-						Regex: &influxql.RegexLiteral{Val: regexp.MustCompile(`[cg]pu`)},
-					},
-				},
-			},
-		},
-
-		// SHOW SERIES with OFFSET 0
-		{
-			s:    `SHOW SERIES OFFSET 0`,
-			stmt: &influxql.ShowSeriesStatement{Offset: 0},
-		},
-
-		// SHOW SERIES with LIMIT 2 OFFSET 0
-		{
-			s:    `SHOW SERIES LIMIT 2 OFFSET 0`,
-			stmt: &influxql.ShowSeriesStatement{Offset: 0, Limit: 2},
-		},
-
-		// SHOW SERIES WHERE with ORDER BY and LIMIT
-		{
-			skip: true,
-			s:    `SHOW SERIES WHERE region = 'order by desc' ORDER BY DESC, field1, field2 DESC LIMIT 10`,
-			stmt: &influxql.ShowSeriesStatement{
-				Condition: &influxql.BinaryExpr{
-					Op:  influxql.EQ,
-					LHS: &influxql.VarRef{Val: "region"},
-					RHS: &influxql.StringLiteral{Val: "order by desc"},
-				},
-				SortFields: []*influxql.SortField{
-					&influxql.SortField{Ascending: false},
-					&influxql.SortField{Name: "field1", Ascending: true},
-					&influxql.SortField{Name: "field2"},
-				},
-				Limit: 10,
-			},
-		},
-
-		// SHOW MEASUREMENTS WHERE with ORDER BY and LIMIT
-		{
-			skip: true,
-			s:    `SHOW MEASUREMENTS WHERE region = 'uswest' ORDER BY ASC, field1, field2 DESC LIMIT 10`,
-			stmt: &influxql.ShowMeasurementsStatement{
-				Condition: &influxql.BinaryExpr{
-					Op:  influxql.EQ,
-					LHS: &influxql.VarRef{Val: "region"},
-					RHS: &influxql.StringLiteral{Val: "uswest"},
-				},
-				SortFields: []*influxql.SortField{
-					{Ascending: true},
-					{Name: "field1"},
-					{Name: "field2"},
-				},
-				Limit: 10,
-			},
-		},
-
-		// SHOW MEASUREMENTS WITH MEASUREMENT = cpu
-		{
-			s: `SHOW MEASUREMENTS WITH MEASUREMENT = cpu`,
-			stmt: &influxql.ShowMeasurementsStatement{
-				Source: &influxql.Measurement{Name: "cpu"},
-			},
-		},
-
-		// SHOW MEASUREMENTS WITH MEASUREMENT =~ /regex/
-		{
-			s: `SHOW MEASUREMENTS WITH MEASUREMENT =~ /[cg]pu/`,
-			stmt: &influxql.ShowMeasurementsStatement{
-				Source: &influxql.Measurement{
-					Regex: &influxql.RegexLiteral{Val: regexp.MustCompile(`[cg]pu`)},
-				},
-			},
-		},
-
-		// SHOW RETENTION POLICIES
-		{
-			s: `SHOW RETENTION POLICIES ON mydb`,
-			stmt: &influxql.ShowRetentionPoliciesStatement{
-				Database: "mydb",
-			},
-		},
-
-		// SHOW TAG KEYS
-		{
-			s: `SHOW TAG KEYS FROM src`,
-			stmt: &influxql.ShowTagKeysStatement{
-				Sources: []influxql.Source{&influxql.Measurement{Name: "src"}},
-			},
-		},
-
-		// SHOW TAG KEYS with LIMIT
-		{
-			s: `SHOW TAG KEYS FROM src LIMIT 2`,
-			stmt: &influxql.ShowTagKeysStatement{
-				Sources: []influxql.Source{&influxql.Measurement{Name: "src"}},
-				Limit:   2,
-			},
-		},
-
-		// SHOW TAG KEYS with OFFSET
-		{
-			s: `SHOW TAG KEYS FROM src OFFSET 1`,
-			stmt: &influxql.ShowTagKeysStatement{
-				Sources: []influxql.Source{&influxql.Measurement{Name: "src"}},
-				Offset:  1,
-			},
-		},
-
-		// SHOW TAG KEYS with LIMIT and OFFSET
-		{
-			s: `SHOW TAG KEYS FROM src LIMIT 2 OFFSET 1`,
-			stmt: &influxql.ShowTagKeysStatement{
-				Sources: []influxql.Source{&influxql.Measurement{Name: "src"}},
-				Limit:   2,
-				Offset:  1,
-			},
-		},
-
-		// SHOW TAG KEYS with SLIMIT
-		{
-			s: `SHOW TAG KEYS FROM src SLIMIT 2`,
-			stmt: &influxql.ShowTagKeysStatement{
-				Sources: []influxql.Source{&influxql.Measurement{Name: "src"}},
-				SLimit:  2,
-			},
-		},
-
-		// SHOW TAG KEYS with SOFFSET
-		{
-			s: `SHOW TAG KEYS FROM src SOFFSET 1`,
-			stmt: &influxql.ShowTagKeysStatement{
-				Sources: []influxql.Source{&influxql.Measurement{Name: "src"}},
-				SOffset: 1,
-			},
-		},
-
-		// SHOW TAG KEYS with SLIMIT and SOFFSET
-		{
-			s: `SHOW TAG KEYS FROM src SLIMIT 2 SOFFSET 1`,
-			stmt: &influxql.ShowTagKeysStatement{
-				Sources: []influxql.Source{&influxql.Measurement{Name: "src"}},
-				SLimit:  2,
-				SOffset: 1,
-			},
-		},
-
-		// SHOW TAG KEYS with LIMIT, OFFSET, SLIMIT, and SOFFSET
-		{
-			s: `SHOW TAG KEYS FROM src LIMIT 4 OFFSET 3 SLIMIT 2 SOFFSET 1`,
-			stmt: &influxql.ShowTagKeysStatement{
-				Sources: []influxql.Source{&influxql.Measurement{Name: "src"}},
-				Limit:   4,
-				Offset:  3,
-				SLimit:  2,
-				SOffset: 1,
-			},
-		},
-
-		// SHOW TAG KEYS FROM /<regex>/
-		{
-			s: `SHOW TAG KEYS FROM /[cg]pu/`,
-			stmt: &influxql.ShowTagKeysStatement{
-				Sources: []influxql.Source{
-					&influxql.Measurement{
-						Regex: &influxql.RegexLiteral{Val: regexp.MustCompile(`[cg]pu`)},
-					},
-				},
-			},
-		},
-
-		// SHOW TAG KEYS
-		{
-			skip: true,
-			s:    `SHOW TAG KEYS FROM src WHERE region = 'uswest' ORDER BY ASC, field1, field2 DESC LIMIT 10`,
-			stmt: &influxql.ShowTagKeysStatement{
-				Sources: []influxql.Source{&influxql.Measurement{Name: "src"}},
-				Condition: &influxql.BinaryExpr{
-					Op:  influxql.EQ,
-					LHS: &influxql.VarRef{Val: "region"},
-					RHS: &influxql.StringLiteral{Val: "uswest"},
-				},
-				SortFields: []*influxql.SortField{
-					{Ascending: true},
-					{Name: "field1"},
-					{Name: "field2"},
-				},
-				Limit: 10,
-			},
-		},
-
-		// SHOW TAG VALUES FROM ... WITH KEY = ...
-		{
-			skip: true,
-			s:    `SHOW TAG VALUES FROM src WITH KEY = region WHERE region = 'uswest' ORDER BY ASC, field1, field2 DESC LIMIT 10`,
-			stmt: &influxql.ShowTagValuesStatement{
-				Sources: []influxql.Source{&influxql.Measurement{Name: "src"}},
-				TagKeys: []string{"region"},
-				Condition: &influxql.BinaryExpr{
-					Op:  influxql.EQ,
-					LHS: &influxql.VarRef{Val: "region"},
-					RHS: &influxql.StringLiteral{Val: "uswest"},
-				},
-				SortFields: []*influxql.SortField{
-					{Ascending: true},
-					{Name: "field1"},
-					{Name: "field2"},
-				},
-				Limit: 10,
-			},
-		},
-
-		// SHOW TAG VALUES FROM ... WITH KEY IN...
-		{
-			s: `SHOW TAG VALUES FROM cpu WITH KEY IN (region, host) WHERE region = 'uswest'`,
-			stmt: &influxql.ShowTagValuesStatement{
-				Sources: []influxql.Source{&influxql.Measurement{Name: "cpu"}},
-				TagKeys: []string{"region", "host"},
-				Condition: &influxql.BinaryExpr{
-					Op:  influxql.EQ,
-					LHS: &influxql.VarRef{Val: "region"},
-					RHS: &influxql.StringLiteral{Val: "uswest"},
-				},
-			},
-		},
-
-		// SHOW TAG VALUES ... AND TAG KEY =
-		{
-			s: `SHOW TAG VALUES FROM cpu WITH KEY IN (region,service,host)WHERE region = 'uswest'`,
-			stmt: &influxql.ShowTagValuesStatement{
-				Sources: []influxql.Source{&influxql.Measurement{Name: "cpu"}},
-				TagKeys: []string{"region", "service", "host"},
-				Condition: &influxql.BinaryExpr{
-					Op:  influxql.EQ,
-					LHS: &influxql.VarRef{Val: "region"},
-					RHS: &influxql.StringLiteral{Val: "uswest"},
-				},
-			},
-		},
-
-		// SHOW TAG VALUES WITH KEY = ...
-		{
-			s: `SHOW TAG VALUES WITH KEY = host WHERE region = 'uswest'`,
-			stmt: &influxql.ShowTagValuesStatement{
-				TagKeys: []string{"host"},
-				Condition: &influxql.BinaryExpr{
-					Op:  influxql.EQ,
-					LHS: &influxql.VarRef{Val: "region"},
-					RHS: &influxql.StringLiteral{Val: "uswest"},
-				},
-			},
-		},
-
-		// SHOW TAG VALUES FROM /<regex>/ WITH KEY = ...
-		{
-			s: `SHOW TAG VALUES FROM /[cg]pu/ WITH KEY = host`,
-			stmt: &influxql.ShowTagValuesStatement{
-				Sources: []influxql.Source{
-					&influxql.Measurement{
-						Regex: &influxql.RegexLiteral{Val: regexp.MustCompile(`[cg]pu`)},
-					},
-				},
-				TagKeys: []string{"host"},
-			},
-		},
-
-		// SHOW TAG VALUES WITH KEY = "..."
-		{
-			s: `SHOW TAG VALUES WITH KEY = "host" WHERE region = 'uswest'`,
-			stmt: &influxql.ShowTagValuesStatement{
-				TagKeys: []string{`host`},
-				Condition: &influxql.BinaryExpr{
-					Op:  influxql.EQ,
-					LHS: &influxql.VarRef{Val: "region"},
-					RHS: &influxql.StringLiteral{Val: "uswest"},
-				},
-			},
-		},
-
-		// SHOW USERS
-		{
-			s:    `SHOW USERS`,
-			stmt: &influxql.ShowUsersStatement{},
-		},
-
-		// SHOW FIELD KEYS
-		{
-			skip: true,
-			s:    `SHOW FIELD KEYS FROM src ORDER BY ASC, field1, field2 DESC LIMIT 10`,
-			stmt: &influxql.ShowFieldKeysStatement{
-				Sources: []influxql.Source{&influxql.Measurement{Name: "src"}},
-				SortFields: []*influxql.SortField{
-					{Ascending: true},
-					{Name: "field1"},
-					{Name: "field2"},
-				},
-				Limit: 10,
-			},
-		},
-		{
-			s: `SHOW FIELD KEYS FROM /[cg]pu/`,
-			stmt: &influxql.ShowFieldKeysStatement{
-				Sources: []influxql.Source{
-					&influxql.Measurement{
-						Regex: &influxql.RegexLiteral{Val: regexp.MustCompile(`[cg]pu`)},
-					},
-				},
-			},
-		},
-
-		// DROP SERIES statement
-		{
-			s:    `DROP SERIES FROM src`,
-			stmt: &influxql.DropSeriesStatement{Sources: []influxql.Source{&influxql.Measurement{Name: "src"}}},
-		},
-		{
-			s: `DROP SERIES WHERE host = 'hosta.influxdb.org'`,
-			stmt: &influxql.DropSeriesStatement{
-				Condition: &influxql.BinaryExpr{
-					Op:  influxql.EQ,
-					LHS: &influxql.VarRef{Val: "host"},
-					RHS: &influxql.StringLiteral{Val: "hosta.influxdb.org"},
-				},
-			},
-		},
-		{
-			s: `DROP SERIES FROM src WHERE host = 'hosta.influxdb.org'`,
-			stmt: &influxql.DropSeriesStatement{
-				Sources: []influxql.Source{&influxql.Measurement{Name: "src"}},
-				Condition: &influxql.BinaryExpr{
-					Op:  influxql.EQ,
-					LHS: &influxql.VarRef{Val: "host"},
-					RHS: &influxql.StringLiteral{Val: "hosta.influxdb.org"},
-				},
-			},
-		},
-
-		// DROP SERVER statement
-		{
-			s:    `DROP SERVER 123`,
-			stmt: &influxql.DropServerStatement{NodeID: 123},
-		},
-		{
-			s:    `DROP SERVER 123 FORCE`,
-			stmt: &influxql.DropServerStatement{NodeID: 123, Force: true},
-		},
-
-		// SHOW CONTINUOUS QUERIES statement
-		{
-			s:    `SHOW CONTINUOUS QUERIES`,
-			stmt: &influxql.ShowContinuousQueriesStatement{},
-		},
-
-		// CREATE CONTINUOUS QUERY ... INTO <measurement>
-		{
-			s: `CREATE CONTINUOUS QUERY myquery ON testdb BEGIN SELECT count(field1) INTO measure1 FROM myseries GROUP BY time(5m) END`,
-			stmt: &influxql.CreateContinuousQueryStatement{
-				Name:     "myquery",
-				Database: "testdb",
-				Source: &influxql.SelectStatement{
-					Fields:  []*influxql.Field{{Expr: &influxql.Call{Name: "count", Args: []influxql.Expr{&influxql.VarRef{Val: "field1"}}}}},
-					Target:  &influxql.Target{Measurement: &influxql.Measurement{Name: "measure1", IsTarget: true}},
-					Sources: []influxql.Source{&influxql.Measurement{Name: "myseries"}},
-					Dimensions: []*influxql.Dimension{
-						{
-							Expr: &influxql.Call{
-								Name: "time",
-								Args: []influxql.Expr{
-									&influxql.DurationLiteral{Val: 5 * time.Minute},
-								},
-							},
-						},
-					},
-				},
-			},
-		},
-
-		{
-			s: `create continuous query "this.is-a.test" on segments begin select * into measure1 from cpu_load_short end`,
-			stmt: &influxql.CreateContinuousQueryStatement{
-				Name:     "this.is-a.test",
-				Database: "segments",
-				Source: &influxql.SelectStatement{
-					IsRawQuery: true,
-					Fields:     []*influxql.Field{{Expr: &influxql.Wildcard{}}},
-					Target:     &influxql.Target{Measurement: &influxql.Measurement{Name: "measure1", IsTarget: true}},
-					Sources:    []influxql.Source{&influxql.Measurement{Name: "cpu_load_short"}},
-				},
-			},
-		},
-
-		// CREATE CONTINUOUS QUERY ... INTO <retention-policy>.<measurement>
-		{
-			s: `CREATE CONTINUOUS QUERY myquery ON testdb BEGIN SELECT count(field1) INTO "1h.policy1"."cpu.load" FROM myseries GROUP BY time(5m) END`,
-			stmt: &influxql.CreateContinuousQueryStatement{
-				Name:     "myquery",
-				Database: "testdb",
-				Source: &influxql.SelectStatement{
-					Fields: []*influxql.Field{{Expr: &influxql.Call{Name: "count", Args: []influxql.Expr{&influxql.VarRef{Val: "field1"}}}}},
-					Target: &influxql.Target{
-						Measurement: &influxql.Measurement{RetentionPolicy: "1h.policy1", Name: "cpu.load", IsTarget: true},
-					},
-					Sources: []influxql.Source{&influxql.Measurement{Name: "myseries"}},
-					Dimensions: []*influxql.Dimension{
-						{
-							Expr: &influxql.Call{
-								Name: "time",
-								Args: []influxql.Expr{
-									&influxql.DurationLiteral{Val: 5 * time.Minute},
-								},
-							},
-						},
-					},
-				},
-			},
-		},
-
-		// CREATE CONTINUOUS QUERY for non-aggregate SELECT stmts
-		{
-			s: `CREATE CONTINUOUS QUERY myquery ON testdb BEGIN SELECT value INTO "policy1"."value" FROM myseries END`,
-			stmt: &influxql.CreateContinuousQueryStatement{
-				Name:     "myquery",
-				Database: "testdb",
-				Source: &influxql.SelectStatement{
-					IsRawQuery: true,
-					Fields:     []*influxql.Field{{Expr: &influxql.VarRef{Val: "value"}}},
-					Target: &influxql.Target{
-						Measurement: &influxql.Measurement{RetentionPolicy: "policy1", Name: "value", IsTarget: true},
-					},
-					Sources: []influxql.Source{&influxql.Measurement{Name: "myseries"}},
-				},
-			},
-		},
-
-		// CREATE CONTINUOUS QUERY for non-aggregate SELECT stmts with multiple values
-		{
-			s: `CREATE CONTINUOUS QUERY myquery ON testdb BEGIN SELECT transmit_rx, transmit_tx INTO "policy1"."network" FROM myseries END`,
-			stmt: &influxql.CreateContinuousQueryStatement{
-				Name:     "myquery",
-				Database: "testdb",
-				Source: &influxql.SelectStatement{
-					IsRawQuery: true,
-					Fields: []*influxql.Field{{Expr: &influxql.VarRef{Val: "transmit_rx"}},
-						{Expr: &influxql.VarRef{Val: "transmit_tx"}}},
-					Target: &influxql.Target{
-						Measurement: &influxql.Measurement{RetentionPolicy: "policy1", Name: "network", IsTarget: true},
-					},
-					Sources: []influxql.Source{&influxql.Measurement{Name: "myseries"}},
-				},
-			},
-		},
-
-		// CREATE CONTINUOUS QUERY with backreference measurement name
-		{
-			s: `CREATE CONTINUOUS QUERY myquery ON testdb BEGIN SELECT mean(value) INTO "policy1".:measurement FROM /^[a-z]+.*/ GROUP BY time(1m) END`,
-			stmt: &influxql.CreateContinuousQueryStatement{
-				Name:     "myquery",
-				Database: "testdb",
-				Source: &influxql.SelectStatement{
-					Fields: []*influxql.Field{{Expr: &influxql.Call{Name: "mean", Args: []influxql.Expr{&influxql.VarRef{Val: "value"}}}}},
-					Target: &influxql.Target{
-						Measurement: &influxql.Measurement{RetentionPolicy: "policy1", IsTarget: true},
-					},
-					Sources: []influxql.Source{&influxql.Measurement{Regex: &influxql.RegexLiteral{Val: regexp.MustCompile(`^[a-z]+.*`)}}},
-					Dimensions: []*influxql.Dimension{
-						{
-							Expr: &influxql.Call{
-								Name: "time",
-								Args: []influxql.Expr{
-									&influxql.DurationLiteral{Val: 1 * time.Minute},
-								},
-							},
-						},
-					},
-				},
-			},
-		},
-
-		// CREATE DATABASE statement
-		{
-			s: `CREATE DATABASE testdb`,
-			stmt: &influxql.CreateDatabaseStatement{
-				Name:        "testdb",
-				IfNotExists: false,
-			},
-		},
-		{
-			s: `CREATE DATABASE IF NOT EXISTS testdb`,
-			stmt: &influxql.CreateDatabaseStatement{
-				Name:        "testdb",
-				IfNotExists: true,
-			},
-		},
-
-		// CREATE USER statement
-		{
-			s: `CREATE USER testuser WITH PASSWORD 'pwd1337'`,
-			stmt: &influxql.CreateUserStatement{
-				Name:     "testuser",
-				Password: "pwd1337",
-			},
-		},
-
-		// CREATE USER ... WITH ALL PRIVILEGES
-		{
-			s: `CREATE USER testuser WITH PASSWORD 'pwd1337' WITH ALL PRIVILEGES`,
-			stmt: &influxql.CreateUserStatement{
-				Name:     "testuser",
-				Password: "pwd1337",
-				Admin:    true,
-			},
-		},
-
-		// SET PASSWORD FOR USER
-		{
-			s: `SET PASSWORD FOR testuser = 'pwd1337'`,
-			stmt: &influxql.SetPasswordUserStatement{
-				Name:     "testuser",
-				Password: "pwd1337",
-			},
-		},
-
-		// DROP CONTINUOUS QUERY statement
-		{
-			s:    `DROP CONTINUOUS QUERY myquery ON foo`,
-			stmt: &influxql.DropContinuousQueryStatement{Name: "myquery", Database: "foo"},
-		},
-
-		// DROP DATABASE statement
-		{
-			s: `DROP DATABASE testdb`,
-			stmt: &influxql.DropDatabaseStatement{
-				Name:     "testdb",
-				IfExists: false,
-			},
-		},
-		{
-			s: `DROP DATABASE IF EXISTS testdb`,
-			stmt: &influxql.DropDatabaseStatement{
-				Name:     "testdb",
-				IfExists: true,
-			},
-		},
-
-		// DROP MEASUREMENT statement
-		{
-			s:    `DROP MEASUREMENT cpu`,
-			stmt: &influxql.DropMeasurementStatement{Name: "cpu"},
-		},
-
-		// DROP RETENTION POLICY
-		{
-			s: `DROP RETENTION POLICY "1h.cpu" ON mydb`,
-			stmt: &influxql.DropRetentionPolicyStatement{
-				Name:     `1h.cpu`,
-				Database: `mydb`,
-			},
-		},
-
-		// DROP USER statement
-		{
-			s:    `DROP USER jdoe`,
-			stmt: &influxql.DropUserStatement{Name: "jdoe"},
-		},
-
-		// GRANT READ
-		{
-			s: `GRANT READ ON testdb TO jdoe`,
-			stmt: &influxql.GrantStatement{
-				Privilege: influxql.ReadPrivilege,
-				On:        "testdb",
-				User:      "jdoe",
-			},
-		},
-
-		// GRANT WRITE
-		{
-			s: `GRANT WRITE ON testdb TO jdoe`,
-			stmt: &influxql.GrantStatement{
-				Privilege: influxql.WritePrivilege,
-				On:        "testdb",
-				User:      "jdoe",
-			},
-		},
-
-		// GRANT ALL
-		{
-			s: `GRANT ALL ON testdb TO jdoe`,
-			stmt: &influxql.GrantStatement{
-				Privilege: influxql.AllPrivileges,
-				On:        "testdb",
-				User:      "jdoe",
-			},
-		},
-
-		// GRANT ALL PRIVILEGES
-		{
-			s: `GRANT ALL PRIVILEGES ON testdb TO jdoe`,
-			stmt: &influxql.GrantStatement{
-				Privilege: influxql.AllPrivileges,
-				On:        "testdb",
-				User:      "jdoe",
-			},
-		},
-
-		// GRANT ALL admin privilege
-		{
-			s: `GRANT ALL TO jdoe`,
-			stmt: &influxql.GrantAdminStatement{
-				User: "jdoe",
-			},
-		},
-
-		// GRANT ALL PRVILEGES admin privilege
-		{
-			s: `GRANT ALL PRIVILEGES TO jdoe`,
-			stmt: &influxql.GrantAdminStatement{
-				User: "jdoe",
-			},
-		},
-
-		// REVOKE READ
-		{
-			s: `REVOKE READ on testdb FROM jdoe`,
-			stmt: &influxql.RevokeStatement{
-				Privilege: influxql.ReadPrivilege,
-				On:        "testdb",
-				User:      "jdoe",
-			},
-		},
-
-		// REVOKE WRITE
-		{
-			s: `REVOKE WRITE ON testdb FROM jdoe`,
-			stmt: &influxql.RevokeStatement{
-				Privilege: influxql.WritePrivilege,
-				On:        "testdb",
-				User:      "jdoe",
-			},
-		},
-
-		// REVOKE ALL
-		{
-			s: `REVOKE ALL ON testdb FROM jdoe`,
-			stmt: &influxql.RevokeStatement{
-				Privilege: influxql.AllPrivileges,
-				On:        "testdb",
-				User:      "jdoe",
-			},
-		},
-
-		// REVOKE ALL PRIVILEGES
-		{
-			s: `REVOKE ALL PRIVILEGES ON testdb FROM jdoe`,
-			stmt: &influxql.RevokeStatement{
-				Privilege: influxql.AllPrivileges,
-				On:        "testdb",
-				User:      "jdoe",
-			},
-		},
-
-		// REVOKE ALL admin privilege
-		{
-			s: `REVOKE ALL FROM jdoe`,
-			stmt: &influxql.RevokeAdminStatement{
-				User: "jdoe",
-			},
-		},
-
-		// REVOKE ALL PRIVILEGES admin privilege
-		{
-			s: `REVOKE ALL PRIVILEGES FROM jdoe`,
-			stmt: &influxql.RevokeAdminStatement{
-				User: "jdoe",
-			},
-		},
-
-		// CREATE RETENTION POLICY
-		{
-			s: `CREATE RETENTION POLICY policy1 ON testdb DURATION 1h REPLICATION 2`,
-			stmt: &influxql.CreateRetentionPolicyStatement{
-				Name:        "policy1",
-				Database:    "testdb",
-				Duration:    time.Hour,
-				Replication: 2,
-			},
-		},
-
-		// CREATE RETENTION POLICY with infinite retention
-		{
-			s: `CREATE RETENTION POLICY policy1 ON testdb DURATION INF REPLICATION 2`,
-			stmt: &influxql.CreateRetentionPolicyStatement{
-				Name:        "policy1",
-				Database:    "testdb",
-				Duration:    0,
-				Replication: 2,
-			},
-		},
-
-		// CREATE RETENTION POLICY ... DEFAULT
-		{
-			s: `CREATE RETENTION POLICY policy1 ON testdb DURATION 2m REPLICATION 4 DEFAULT`,
-			stmt: &influxql.CreateRetentionPolicyStatement{
-				Name:        "policy1",
-				Database:    "testdb",
-				Duration:    2 * time.Minute,
-				Replication: 4,
-				Default:     true,
-			},
-		},
-
-		// ALTER RETENTION POLICY
-		{
-			s:    `ALTER RETENTION POLICY policy1 ON testdb DURATION 1m REPLICATION 4 DEFAULT`,
-			stmt: newAlterRetentionPolicyStatement("policy1", "testdb", time.Minute, 4, true),
-		},
-
-		// ALTER RETENTION POLICY with options in reverse order
-		{
-			s:    `ALTER RETENTION POLICY policy1 ON testdb DEFAULT REPLICATION 4 DURATION 1m`,
-			stmt: newAlterRetentionPolicyStatement("policy1", "testdb", time.Minute, 4, true),
-		},
-
-		// ALTER RETENTION POLICY with infinite retention
-		{
-			s:    `ALTER RETENTION POLICY policy1 ON testdb DEFAULT REPLICATION 4 DURATION INF`,
-			stmt: newAlterRetentionPolicyStatement("policy1", "testdb", 0, 4, true),
-		},
-
-		// ALTER RETENTION POLICY without optional DURATION
-		{
-			s:    `ALTER RETENTION POLICY policy1 ON testdb DEFAULT REPLICATION 4`,
-			stmt: newAlterRetentionPolicyStatement("policy1", "testdb", -1, 4, true),
-		},
-
-		// ALTER RETENTION POLICY without optional REPLICATION
-		{
-			s:    `ALTER RETENTION POLICY policy1 ON testdb DEFAULT`,
-			stmt: newAlterRetentionPolicyStatement("policy1", "testdb", -1, -1, true),
-		},
-
-		// ALTER RETENTION POLICY without optional DEFAULT
-		{
-			s:    `ALTER RETENTION POLICY policy1 ON testdb REPLICATION 4`,
-			stmt: newAlterRetentionPolicyStatement("policy1", "testdb", -1, 4, false),
-		},
-		// ALTER default retention policy unquoted
-		{
-			s:    `ALTER RETENTION POLICY default ON testdb REPLICATION 4`,
-			stmt: newAlterRetentionPolicyStatement("default", "testdb", -1, 4, false),
-		},
-
-		// SHOW STATS
-		{
-			s: `SHOW STATS`,
-			stmt: &influxql.ShowStatsStatement{
-				Module: "",
-			},
-		},
-		{
-			s: `SHOW STATS FOR 'cluster'`,
-			stmt: &influxql.ShowStatsStatement{
-				Module: "cluster",
-			},
-		},
-
-		// SHOW SHARDS
-		{
-			s:    `SHOW SHARDS`,
-			stmt: &influxql.ShowShardsStatement{},
-		},
-
-		// SHOW DIAGNOSTICS
-		{
-			s:    `SHOW DIAGNOSTICS`,
-			stmt: &influxql.ShowDiagnosticsStatement{},
-		},
-		{
-			s: `SHOW DIAGNOSTICS FOR 'build'`,
-			stmt: &influxql.ShowDiagnosticsStatement{
-				Module: "build",
-			},
-		},
-
-		// CREATE SUBSCRIPTION
-		{
-			s: `CREATE SUBSCRIPTION "name" ON "db"."rp" DESTINATIONS ANY 'udp://host1:9093', 'udp://host2:9093'`,
-			stmt: &influxql.CreateSubscriptionStatement{
-				Name:            "name",
-				Database:        "db",
-				RetentionPolicy: "rp",
-				Destinations:    []string{"udp://host1:9093", "udp://host2:9093"},
-				Mode:            "ANY",
-			},
-		},
-
-		// DROP SUBSCRIPTION
-		{
-			s: `DROP SUBSCRIPTION "name" ON "db"."rp"`,
-			stmt: &influxql.DropSubscriptionStatement{
-				Name:            "name",
-				Database:        "db",
-				RetentionPolicy: "rp",
-			},
-		},
-
-		// SHOW SUBSCRIPTIONS
-		{
-			s:    `SHOW SUBSCRIPTIONS`,
-			stmt: &influxql.ShowSubscriptionsStatement{},
-		},
-
-		// Errors
-		{s: ``, err: `found EOF, expected SELECT, DELETE, SHOW, CREATE, DROP, GRANT, REVOKE, ALTER, SET at line 1, char 1`},
-		{s: `SELECT`, err: `found EOF, expected identifier, string, number, bool at line 1, char 8`},
-		{s: `SELECT time FROM myseries`, err: `at least 1 non-time field must be queried`},
-		{s: `blah blah`, err: `found blah, expected SELECT, DELETE, SHOW, CREATE, DROP, GRANT, REVOKE, ALTER, SET at line 1, char 1`},
-		{s: `SELECT field1 X`, err: `found X, expected FROM at line 1, char 15`},
-		{s: `SELECT field1 FROM "series" WHERE X +;`, err: `found ;, expected identifier, string, number, bool at line 1, char 38`},
-		{s: `SELECT field1 FROM myseries GROUP`, err: `found EOF, expected BY at line 1, char 35`},
-		{s: `SELECT field1 FROM myseries LIMIT`, err: `found EOF, expected number at line 1, char 35`},
-		{s: `SELECT field1 FROM myseries LIMIT 10.5`, err: `fractional parts not allowed in LIMIT at line 1, char 35`},
-		{s: `SELECT top() FROM myseries`, err: `invalid number of arguments for top, expected at least 2, got 0`},
-		{s: `SELECT top(field1) FROM myseries`, err: `invalid number of arguments for top, expected at least 2, got 1`},
-		{s: `SELECT top(field1,foo) FROM myseries`, err: `expected integer as last argument in top(), found foo`},
-		{s: `SELECT top(field1,host,'server',foo) FROM myseries`, err: `expected integer as last argument in top(), found foo`},
-		{s: `SELECT top(field1,5,'server',2) FROM myseries`, err: `only fields or tags are allowed in top(), found 5.000`},
-		{s: `SELECT top(field1,max(foo),'server',2) FROM myseries`, err: `only fields or tags are allowed in top(), found max(foo)`},
-		{s: `SELECT bottom() FROM myseries`, err: `invalid number of arguments for bottom, expected at least 2, got 0`},
-		{s: `SELECT bottom(field1) FROM myseries`, err: `invalid number of arguments for bottom, expected at least 2, got 1`},
-		{s: `SELECT bottom(field1,foo) FROM myseries`, err: `expected integer as last argument in bottom(), found foo`},
-		{s: `SELECT bottom(field1,host,'server',foo) FROM myseries`, err: `expected integer as last argument in bottom(), found foo`},
-		{s: `SELECT bottom(field1,5,'server',2) FROM myseries`, err: `only fields or tags are allowed in bottom(), found 5.000`},
-		{s: `SELECT bottom(field1,max(foo),'server',2) FROM myseries`, err: `only fields or tags are allowed in bottom(), found max(foo)`},
-		{s: `SELECT percentile() FROM myseries`, err: `invalid number of arguments for percentile, expected 2, got 0`},
-		{s: `SELECT percentile(field1) FROM myseries`, err: `invalid number of arguments for percentile, expected 2, got 1`},
-		{s: `SELECT percentile(field1, foo) FROM myseries`, err: `expected float argument in percentile()`},
-		{s: `SELECT field1 FROM myseries OFFSET`, err: `found EOF, expected number at line 1, char 36`},
-		{s: `SELECT field1 FROM myseries OFFSET 10.5`, err: `fractional parts not allowed in OFFSET at line 1, char 36`},
-		{s: `SELECT field1 FROM myseries ORDER`, err: `found EOF, expected BY at line 1, char 35`},
-		{s: `SELECT field1 FROM myseries ORDER BY`, err: `found EOF, expected identifier, ASC, DESC at line 1, char 38`},
-		{s: `SELECT field1 FROM myseries ORDER BY /`, err: `found /, expected identifier, ASC, DESC at line 1, char 38`},
-		{s: `SELECT field1 FROM myseries ORDER BY 1`, err: `found 1, expected identifier, ASC, DESC at line 1, char 38`},
-		{s: `SELECT field1 FROM myseries ORDER BY time ASC,`, err: `found EOF, expected identifier at line 1, char 47`},
-		{s: `SELECT field1 FROM myseries ORDER BY time, field1`, err: `only ORDER BY time supported at this time`},
-		{s: `SELECT field1 AS`, err: `found EOF, expected identifier at line 1, char 18`},
-		{s: `SELECT field1 FROM foo group by time(1s)`, err: `GROUP BY requires at least one aggregate function`},
-		{s: `SELECT count(value), value FROM foo`, err: `mixing aggregate and non-aggregate queries is not supported`},
-		{s: `SELECT count(value)/10, value FROM foo`, err: `mixing aggregate and non-aggregate queries is not supported`},
-		{s: `SELECT count(value) FROM foo group by time(1s)`, err: `aggregate functions with GROUP BY time require a WHERE time clause`},
-		{s: `SELECT count(value) FROM foo group by time(1s) where host = 'hosta.influxdb.org'`, err: `aggregate functions with GROUP BY time require a WHERE time clause`},
-		{s: `SELECT count(value) FROM foo group by time`, err: `time() is a function and expects at least one argument`},
-		{s: `SELECT count(value) FROM foo group by 'time'`, err: `only time and tag dimensions allowed`},
-		{s: `SELECT count(value) FROM foo where time > now() and time < now() group by time()`, err: `time dimension expected one argument`},
-		{s: `SELECT count(value) FROM foo where time > now() and time < now() group by time(b)`, err: `time dimension must have one duration argument`},
-		{s: `SELECT count(value) FROM foo where time > now() and time < now() group by time(1s), time(2s)`, err: `multiple time dimensions not allowed`},
-		{s: `SELECT field1 FROM 12`, err: `found 12, expected identifier at line 1, char 20`},
-		{s: `SELECT 1000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 FROM myseries`, err: `unable to parse number at line 1, char 8`},
-		{s: `SELECT 10.5h FROM myseries`, err: `found h, expected FROM at line 1, char 12`},
-		{s: `SELECT distinct(field1), sum(field1) FROM myseries`, err: `aggregate function distinct() can not be combined with other functions or fields`},
-		{s: `SELECT distinct(field1), field2 FROM myseries`, err: `aggregate function distinct() can not be combined with other functions or fields`},
-		{s: `SELECT distinct(field1, field2) FROM myseries`, err: `distinct function can only have one argument`},
-		{s: `SELECT distinct() FROM myseries`, err: `distinct function requires at least one argument`},
-		{s: `SELECT distinct FROM myseries`, err: `found FROM, expected identifier at line 1, char 17`},
-		{s: `SELECT distinct field1, field2 FROM myseries`, err: `aggregate function distinct() can not be combined with other functions or fields`},
-		{s: `SELECT count(distinct) FROM myseries`, err: `found ), expected (, identifier at line 1, char 22`},
-		{s: `SELECT count(distinct field1, field2) FROM myseries`, err: `count(distinct <field>) can only have one argument`},
-		{s: `select count(distinct(too, many, arguments)) from myseries`, err: `count(distinct <field>) can only have one argument`},
-		{s: `select count() from myseries`, err: `invalid number of arguments for count, expected 1, got 0`},
-		{s: `SELECT derivative(), field1 FROM myseries`, err: `mixing aggregate and non-aggregate queries is not supported`},
-		{s: `select derivative() from myseries`, err: `invalid number of arguments for derivative, expected at least 1 but no more than 2, got 0`},
-		{s: `select derivative(mean(value), 1h, 3) from myseries`, err: `invalid number of arguments for derivative, expected at least 1 but no more than 2, got 3`},
-		{s: `SELECT derivative(value) FROM myseries group by time(1h)`, err: `aggregate function required inside the call to derivative`},
-		{s: `SELECT non_negative_derivative(), field1 FROM myseries`, err: `mixing aggregate and non-aggregate queries is not supported`},
-		{s: `select non_negative_derivative() from myseries`, err: `invalid number of arguments for non_negative_derivative, expected at least 1 but no more than 2, got 0`},
-		{s: `select non_negative_derivative(mean(value), 1h, 3) from myseries`, err: `invalid number of arguments for non_negative_derivative, expected at least 1 but no more than 2, got 3`},
-		{s: `SELECT non_negative_derivative(value) FROM myseries group by time(1h)`, err: `aggregate function required inside the call to non_negative_derivative`},
-		{s: `SELECT field1 from myseries WHERE host =~ 'asd' LIMIT 1`, err: `found asd, expected regex at line 1, char 42`},
-		{s: `SELECT value > 2 FROM cpu`, err: `invalid operator > in SELECT clause at line 1, char 8; operator is intended for WHERE clause`},
-		{s: `SELECT value = 2 FROM cpu`, err: `invalid operator = in SELECT clause at line 1, char 8; operator is intended for WHERE clause`},
-		{s: `SELECT s =~ /foo/ FROM cpu`, err: `invalid operator =~ in SELECT clause at line 1, char 8; operator is intended for WHERE clause`},
-		{s: `DELETE`, err: `found EOF, expected FROM at line 1, char 8`},
-		{s: `DELETE FROM`, err: `found EOF, expected identifier at line 1, char 13`},
-		{s: `DELETE FROM myseries WHERE`, err: `found EOF, expected identifier, string, number, bool at line 1, char 28`},
-		{s: `DROP MEASUREMENT`, err: `found EOF, expected identifier at line 1, char 18`},
-		{s: `DROP SERIES`, err: `found EOF, expected FROM, WHERE at line 1, char 13`},
-		{s: `DROP SERIES FROM`, err: `found EOF, expected identifier at line 1, char 18`},
-		{s: `DROP SERIES FROM src WHERE`, err: `found EOF, expected identifier, string, number, bool at line 1, char 28`},
-		{s: `DROP SERVER`, err: `found EOF, expected number at line 1, char 13`},
-		{s: `DROP SERVER abc`, err: `found abc, expected number at line 1, char 13`},
-		{s: `DROP SERVER 1 1`, err: `found 1, expected FORCE at line 1, char 15`},
-		{s: `SHOW CONTINUOUS`, err: `found EOF, expected QUERIES at line 1, char 17`},
-		{s: `SHOW RETENTION`, err: `found EOF, expected POLICIES at line 1, char 16`},
-		{s: `SHOW RETENTION ON`, err: `found ON, expected POLICIES at line 1, char 16`},
-		{s: `SHOW RETENTION POLICIES`, err: `found EOF, expected ON at line 1, char 25`},
-		{s: `SHOW RETENTION POLICIES mydb`, err: `found mydb, expected ON at line 1, char 25`},
-		{s: `SHOW RETENTION POLICIES ON`, err: `found EOF, expected identifier at line 1, char 28`},
-		{s: `SHOW FOO`, err: `found FOO, expected CONTINUOUS, DATABASES, DIAGNOSTICS, FIELD, GRANTS, MEASUREMENTS, RETENTION, SERIES, SERVERS, SHARDS, STATS, SUBSCRIPTIONS, TAG, USERS at line 1, char 6`},
-		{s: `SHOW STATS FOR`, err: `found EOF, expected string at line 1, char 16`},
-		{s: `SHOW DIAGNOSTICS FOR`, err: `found EOF, expected string at line 1, char 22`},
-		{s: `SHOW GRANTS`, err: `found EOF, expected FOR at line 1, char 13`},
-		{s: `SHOW GRANTS FOR`, err: `found EOF, expected identifier at line 1, char 17`},
-		{s: `DROP CONTINUOUS`, err: `found EOF, expected QUERY at line 1, char 17`},
-		{s: `DROP CONTINUOUS QUERY`, err: `found EOF, expected identifier at line 1, char 23`},
-		{s: `DROP CONTINUOUS QUERY myquery`, err: `found EOF, expected ON at line 1, char 31`},
-		{s: `DROP CONTINUOUS QUERY myquery ON`, err: `found EOF, expected identifier at line 1, char 34`},
-		{s: `CREATE CONTINUOUS`, err: `found EOF, expected QUERY at line 1, char 19`},
-		{s: `CREATE CONTINUOUS QUERY`, err: `found EOF, expected identifier at line 1, char 25`},
-		{s: `DROP FOO`, err: `found FOO, expected SERIES, CONTINUOUS, MEASUREMENT, SERVER, SUBSCRIPTION at line 1, char 6`},
-		{s: `CREATE FOO`, err: `found FOO, expected CONTINUOUS, DATABASE, USER, RETENTION, SUBSCRIPTION at line 1, char 8`},
-		{s: `CREATE DATABASE`, err: `found EOF, expected identifier at line 1, char 17`},
-		{s: `CREATE DATABASE IF`, err: `found EOF, expected NOT at line 1, char 20`},
-		{s: `CREATE DATABASE IF NOT`, err: `found EOF, expected EXISTS at line 1, char 24`},
-		{s: `CREATE DATABASE IF NOT EXISTS`, err: `found EOF, expected identifier at line 1, char 31`},
-		{s: `DROP DATABASE`, err: `found EOF, expected identifier at line 1, char 15`},
-		{s: `DROP DATABASE IF`, err: `found EOF, expected EXISTS at line 1, char 18`},
-		{s: `DROP DATABASE IF EXISTS`, err: `found EOF, expected identifier at line 1, char 25`},
-		{s: `DROP RETENTION`, err: `found EOF, expected POLICY at line 1, char 16`},
-		{s: `DROP RETENTION POLICY`, err: `found EOF, expected identifier at line 1, char 23`},
-		{s: `DROP RETENTION POLICY "1h.cpu"`, err: `found EOF, expected ON at line 1, char 31`},
-		{s: `DROP RETENTION POLICY "1h.cpu" ON`, err: `found EOF, expected identifier at line 1, char 35`},
-		{s: `DROP USER`, err: `found EOF, expected identifier at line 1, char 11`},
-		{s: `DROP SUBSCRIPTION`, err: `found EOF, expected identifier at line 1, char 19`},
-		{s: `DROP SUBSCRIPTION "name"`, err: `found EOF, expected ON at line 1, char 25`},
-		{s: `DROP SUBSCRIPTION "name" ON `, err: `found EOF, expected identifier at line 1, char 30`},
-		{s: `DROP SUBSCRIPTION "name" ON "db"`, err: `found EOF, expected . at line 1, char 33`},
-		{s: `DROP SUBSCRIPTION "name" ON "db".`, err: `found EOF, expected identifier at line 1, char 34`},
-		{s: `CREATE USER testuser`, err: `found EOF, expected WITH at line 1, char 22`},
-		{s: `CREATE USER testuser WITH`, err: `found EOF, expected PASSWORD at line 1, char 27`},
-		{s: `CREATE USER testuser WITH PASSWORD`, err: `found EOF, expected string at line 1, char 36`},
-		{s: `CREATE USER testuser WITH PASSWORD 'pwd' WITH`, err: `found EOF, expected ALL at line 1, char 47`},
-		{s: `CREATE USER testuser WITH PASSWORD 'pwd' WITH ALL`, err: `found EOF, expected PRIVILEGES at line 1, char 51`},
-		{s: `CREATE SUBSCRIPTION`, err: `found EOF, expected identifier at line 1, char 21`},
-		{s: `CREATE SUBSCRIPTION "name"`, err: `found EOF, expected ON at line 1, char 27`},
-		{s: `CREATE SUBSCRIPTION "name" ON `, err: `found EOF, expected identifier at line 1, char 32`},
-		{s: `CREATE SUBSCRIPTION "name" ON "db"`, err: `found EOF, expected . at line 1, char 35`},
-		{s: `CREATE SUBSCRIPTION "name" ON "db".`, err: `found EOF, expected identifier at line 1, char 36`},
-		{s: `CREATE SUBSCRIPTION "name" ON "db"."rp"`, err: `found EOF, expected DESTINATIONS at line 1, char 40`},
-		{s: `CREATE SUBSCRIPTION "name" ON "db"."rp" DESTINATIONS`, err: `found EOF, expected ALL, ANY at line 1, char 54`},
-		{s: `CREATE SUBSCRIPTION "name" ON "db"."rp" DESTINATIONS ALL `, err: `found EOF, expected string at line 1, char 59`},
-		{s: `GRANT`, err: `found EOF, expected READ, WRITE, ALL [PRIVILEGES] at line 1, char 7`},
-		{s: `GRANT BOGUS`, err: `found BOGUS, expected READ, WRITE, ALL [PRIVILEGES] at line 1, char 7`},
-		{s: `GRANT READ`, err: `found EOF, expected ON at line 1, char 12`},
-		{s: `GRANT READ FROM`, err: `found FROM, expected ON at line 1, char 12`},
-		{s: `GRANT READ ON`, err: `found EOF, expected identifier at line 1, char 15`},
-		{s: `GRANT READ ON TO`, err: `found TO, expected identifier at line 1, char 15`},
-		{s: `GRANT READ ON testdb`, err: `found EOF, expected TO at line 1, char 22`},
-		{s: `GRANT READ ON testdb TO`, err: `found EOF, expected identifier at line 1, char 25`},
-		{s: `GRANT READ TO`, err: `found TO, expected ON at line 1, char 12`},
-		{s: `GRANT WRITE`, err: `found EOF, expected ON at line 1, char 13`},
-		{s: `GRANT WRITE FROM`, err: `found FROM, expected ON at line 1, char 13`},
-		{s: `GRANT WRITE ON`, err: `found EOF, expected identifier at line 1, char 16`},
-		{s: `GRANT WRITE ON TO`, err: `found TO, expected identifier at line 1, char 16`},
-		{s: `GRANT WRITE ON testdb`, err: `found EOF, expected TO at line 1, char 23`},
-		{s: `GRANT WRITE ON testdb TO`, err: `found EOF, expected identifier at line 1, char 26`},
-		{s: `GRANT WRITE TO`, err: `found TO, expected ON at line 1, char 13`},
-		{s: `GRANT ALL`, err: `found EOF, expected ON, TO at line 1, char 11`},
-		{s: `GRANT ALL PRIVILEGES`, err: `found EOF, expected ON, TO at line 1, char 22`},
-		{s: `GRANT ALL FROM`, err: `found FROM, expected ON, TO at line 1, char 11`},
-		{s: `GRANT ALL PRIVILEGES FROM`, err: `found FROM, expected ON, TO at line 1, char 22`},
-		{s: `GRANT ALL ON`, err: `found EOF, expected identifier at line 1, char 14`},
-		{s: `GRANT ALL PRIVILEGES ON`, err: `found EOF, expected identifier at line 1, char 25`},
-		{s: `GRANT ALL ON TO`, err: `found TO, expected identifier at line 1, char 14`},
-		{s: `GRANT ALL PRIVILEGES ON TO`, err: `found TO, expected identifier at line 1, char 25`},
-		{s: `GRANT ALL ON testdb`, err: `found EOF, expected TO at line 1, char 21`},
-		{s: `GRANT ALL PRIVILEGES ON testdb`, err: `found EOF, expected TO at line 1, char 32`},
-		{s: `GRANT ALL ON testdb FROM`, err: `found FROM, expected TO at line 1, char 21`},
-		{s: `GRANT ALL PRIVILEGES ON testdb FROM`, err: `found FROM, expected TO at line 1, char 32`},
-		{s: `GRANT ALL ON testdb TO`, err: `found EOF, expected identifier at line 1, char 24`},
-		{s: `GRANT ALL PRIVILEGES ON testdb TO`, err: `found EOF, expected identifier at line 1, char 35`},
-		{s: `GRANT ALL TO`, err: `found EOF, expected identifier at line 1, char 14`},
-		{s: `GRANT ALL PRIVILEGES TO`, err: `found EOF, expected identifier at line 1, char 25`},
-		{s: `REVOKE`, err: `found EOF, expected READ, WRITE, ALL [PRIVILEGES] at line 1, char 8`},
-		{s: `REVOKE BOGUS`, err: `found BOGUS, expected READ, WRITE, ALL [PRIVILEGES] at line 1, char 8`},
-		{s: `REVOKE READ`, err: `found EOF, expected ON at line 1, char 13`},
-		{s: `REVOKE READ TO`, err: `found TO, expected ON at line 1, char 13`},
-		{s: `REVOKE READ ON`, err: `found EOF, expected identifier at line 1, char 16`},
-		{s: `REVOKE READ ON FROM`, err: `found FROM, expected identifier at line 1, char 16`},
-		{s: `REVOKE READ ON testdb`, err: `found EOF, expected FROM at line 1, char 23`},
-		{s: `REVOKE READ ON testdb FROM`, err: `found EOF, expected identifier at line 1, char 28`},
-		{s: `REVOKE READ FROM`, err: `found FROM, expected ON at line 1, char 13`},
-		{s: `REVOKE WRITE`, err: `found EOF, expected ON at line 1, char 14`},
-		{s: `REVOKE WRITE TO`, err: `found TO, expected ON at line 1, char 14`},
-		{s: `REVOKE WRITE ON`, err: `found EOF, expected identifier at line 1, char 17`},
-		{s: `REVOKE WRITE ON FROM`, err: `found FROM, expected identifier at line 1, char 17`},
-		{s: `REVOKE WRITE ON testdb`, err: `found EOF, expected FROM at line 1, char 24`},
-		{s: `REVOKE WRITE ON testdb FROM`, err: `found EOF, expected identifier at line 1, char 29`},
-		{s: `REVOKE WRITE FROM`, err: `found FROM, expected ON at line 1, char 14`},
-		{s: `REVOKE ALL`, err: `found EOF, expected ON, FROM at line 1, char 12`},
-		{s: `REVOKE ALL PRIVILEGES`, err: `found EOF, expected ON, FROM at line 1, char 23`},
-		{s: `REVOKE ALL TO`, err: `found TO, expected ON, FROM at line 1, char 12`},
-		{s: `REVOKE ALL PRIVILEGES TO`, err: `found TO, expected ON, FROM at line 1, char 23`},
-		{s: `REVOKE ALL ON`, err: `found EOF, expected identifier at line 1, char 15`},
-		{s: `REVOKE ALL PRIVILEGES ON`, err: `found EOF, expected identifier at line 1, char 26`},
-		{s: `REVOKE ALL ON FROM`, err: `found FROM, expected identifier at line 1, char 15`},
-		{s: `REVOKE ALL PRIVILEGES ON FROM`, err: `found FROM, expected identifier at line 1, char 26`},
-		{s: `REVOKE ALL ON testdb`, err: `found EOF, expected FROM at line 1, char 22`},
-		{s: `REVOKE ALL PRIVILEGES ON testdb`, err: `found EOF, expected FROM at line 1, char 33`},
-		{s: `REVOKE ALL ON testdb TO`, err: `found TO, expected FROM at line 1, char 22`},
-		{s: `REVOKE ALL PRIVILEGES ON testdb TO`, err: `found TO, expected FROM at line 1, char 33`},
-		{s: `REVOKE ALL ON testdb FROM`, err: `found EOF, expected identifier at line 1, char 27`},
-		{s: `REVOKE ALL PRIVILEGES ON testdb FROM`, err: `found EOF, expected identifier at line 1, char 38`},
-		{s: `REVOKE ALL FROM`, err: `found EOF, expected identifier at line 1, char 17`},
-		{s: `REVOKE ALL PRIVILEGES FROM`, err: `found EOF, expected identifier at line 1, char 28`},
-		{s: `CREATE RETENTION`, err: `found EOF, expected POLICY at line 1, char 18`},
-		{s: `CREATE RETENTION POLICY`, err: `found EOF, expected identifier at line 1, char 25`},
-		{s: `CREATE RETENTION POLICY policy1`, err: `found EOF, expected ON at line 1, char 33`},
-		{s: `CREATE RETENTION POLICY policy1 ON`, err: `found EOF, expected identifier at line 1, char 36`},
-		{s: `CREATE RETENTION POLICY policy1 ON testdb`, err: `found EOF, expected DURATION at line 1, char 43`},
-		{s: `CREATE RETENTION POLICY policy1 ON testdb DURATION`, err: `found EOF, expected duration at line 1, char 52`},
-		{s: `CREATE RETENTION POLICY policy1 ON testdb DURATION bad`, err: `found bad, expected duration at line 1, char 52`},
-		{s: `CREATE RETENTION POLICY policy1 ON testdb DURATION 1h`, err: `found EOF, expected REPLICATION at line 1, char 54`},
-		{s: `CREATE RETENTION POLICY policy1 ON testdb DURATION 1h REPLICATION`, err: `found EOF, expected number at line 1, char 67`},
-		{s: `CREATE RETENTION POLICY policy1 ON testdb DURATION 1h REPLICATION 3.14`, err: `number must be an integer at line 1, char 67`},
-		{s: `CREATE RETENTION POLICY policy1 ON testdb DURATION 1h REPLICATION 0`, err: `invalid value 0: must be 1 <= n <= 2147483647 at line 1, char 67`},
-		{s: `CREATE RETENTION POLICY policy1 ON testdb DURATION 1h REPLICATION bad`, err: `found bad, expected number at line 1, char 67`},
-		{s: `CREATE RETENTION POLICY policy1 ON testdb DURATION 1h REPLICATION 1 foo`, err: `found foo, expected DEFAULT at line 1, char 69`},
-		{s: `ALTER`, err: `found EOF, expected RETENTION at line 1, char 7`},
-		{s: `ALTER RETENTION`, err: `found EOF, expected POLICY at line 1, char 17`},
-		{s: `ALTER RETENTION POLICY`, err: `found EOF, expected identifier at line 1, char 24`},
-		{s: `ALTER RETENTION POLICY policy1`, err: `found EOF, expected ON at line 1, char 32`}, {s: `ALTER RETENTION POLICY policy1 ON`, err: `found EOF, expected identifier at line 1, char 35`},
-		{s: `ALTER RETENTION POLICY policy1 ON testdb`, err: `found EOF, expected DURATION, RETENTION, DEFAULT at line 1, char 42`},
-		{s: `SET`, err: `found EOF, expected PASSWORD at line 1, char 5`},
-		{s: `SET PASSWORD`, err: `found EOF, expected FOR at line 1, char 14`},
-		{s: `SET PASSWORD something`, err: `found something, expected FOR at line 1, char 14`},
-		{s: `SET PASSWORD FOR`, err: `found EOF, expected identifier at line 1, char 18`},
-		{s: `SET PASSWORD FOR dejan`, err: `found EOF, expected = at line 1, char 24`},
-		{s: `SET PASSWORD FOR dejan =`, err: `found EOF, expected string at line 1, char 25`},
-		{s: `SET PASSWORD FOR dejan = bla`, err: `found bla, expected string at line 1, char 26`},
-	}
-
-	for i, tt := range tests {
-		if tt.skip {
-			t.Logf("skipping test of '%s'", tt.s)
-			continue
-		}
-		stmt, err := influxql.NewParser(strings.NewReader(tt.s)).ParseStatement()
-
-		// We are memoizing a field so for testing we need to...
-		if s, ok := tt.stmt.(*influxql.SelectStatement); ok {
-			s.GroupByInterval()
-		} else if st, ok := stmt.(*influxql.CreateContinuousQueryStatement); ok { // if it's a CQ, there is a non-exported field that gets memoized during parsing that needs to be set
-			if st != nil && st.Source != nil {
-				tt.stmt.(*influxql.CreateContinuousQueryStatement).Source.GroupByInterval()
-			}
-		}
-
-		if !reflect.DeepEqual(tt.err, errstring(err)) {
-			t.Errorf("%d. %q: error mismatch:\n  exp=%s\n  got=%s\n\n", i, tt.s, tt.err, err)
-		} else if tt.err == "" && !reflect.DeepEqual(tt.stmt, stmt) {
-			t.Logf("\n# %s\nexp=%s\ngot=%s\n", tt.s, mustMarshalJSON(tt.stmt), mustMarshalJSON(stmt))
-			t.Logf("\nSQL exp=%s\nSQL got=%s\n", tt.stmt.String(), stmt.String())
-			t.Errorf("%d. %q\n\nstmt mismatch:\n\nexp=%#v\n\ngot=%#v\n\n", i, tt.s, tt.stmt, stmt)
-		}
-	}
-}
-
-// Ensure the parser can parse expressions into an AST.
-func TestParser_ParseExpr(t *testing.T) {
-	var tests = []struct {
-		s    string
-		expr influxql.Expr
-		err  string
-	}{
-		// Primitives
-		{s: `100`, expr: &influxql.NumberLiteral{Val: 100}},
-		{s: `'foo bar'`, expr: &influxql.StringLiteral{Val: "foo bar"}},
-		{s: `true`, expr: &influxql.BooleanLiteral{Val: true}},
-		{s: `false`, expr: &influxql.BooleanLiteral{Val: false}},
-		{s: `my_ident`, expr: &influxql.VarRef{Val: "my_ident"}},
-		{s: `'2000-01-01 00:00:00'`, expr: &influxql.TimeLiteral{Val: mustParseTime("2000-01-01T00:00:00Z")}},
-		{s: `'2000-01-01 00:00:00.232'`, expr: &influxql.TimeLiteral{Val: mustParseTime("2000-01-01T00:00:00.232Z")}},
-		{s: `'2000-01-32 00:00:00'`, err: `unable to parse datetime at line 1, char 1`},
-		{s: `'2000-01-01'`, expr: &influxql.TimeLiteral{Val: mustParseTime("2000-01-01T00:00:00Z")}},
-		{s: `'2000-01-99'`, err: `unable to parse date at line 1, char 1`},
-
-		// Simple binary expression
-		{
-			s: `1 + 2`,
-			expr: &influxql.BinaryExpr{
-				Op:  influxql.ADD,
-				LHS: &influxql.NumberLiteral{Val: 1},
-				RHS: &influxql.NumberLiteral{Val: 2},
-			},
-		},
-
-		// Binary expression with LHS precedence
-		{
-			s: `1 * 2 + 3`,
-			expr: &influxql.BinaryExpr{
-				Op: influxql.ADD,
-				LHS: &influxql.BinaryExpr{
-					Op:  influxql.MUL,
-					LHS: &influxql.NumberLiteral{Val: 1},
-					RHS: &influxql.NumberLiteral{Val: 2},
-				},
-				RHS: &influxql.NumberLiteral{Val: 3},
-			},
-		},
-
-		// Binary expression with RHS precedence
-		{
-			s: `1 + 2 * 3`,
-			expr: &influxql.BinaryExpr{
-				Op:  influxql.ADD,
-				LHS: &influxql.NumberLiteral{Val: 1},
-				RHS: &influxql.BinaryExpr{
-					Op:  influxql.MUL,
-					LHS: &influxql.NumberLiteral{Val: 2},
-					RHS: &influxql.NumberLiteral{Val: 3},
-				},
-			},
-		},
-
-		// Binary expression with LHS paren group.
-		{
-			s: `(1 + 2) * 3`,
-			expr: &influxql.BinaryExpr{
-				Op: influxql.MUL,
-				LHS: &influxql.ParenExpr{
-					Expr: &influxql.BinaryExpr{
-						Op:  influxql.ADD,
-						LHS: &influxql.NumberLiteral{Val: 1},
-						RHS: &influxql.NumberLiteral{Val: 2},
-					},
-				},
-				RHS: &influxql.NumberLiteral{Val: 3},
-			},
-		},
-
-		// Binary expression with no precedence, tests left associativity.
-		{
-			s: `1 * 2 * 3`,
-			expr: &influxql.BinaryExpr{
-				Op: influxql.MUL,
-				LHS: &influxql.BinaryExpr{
-					Op:  influxql.MUL,
-					LHS: &influxql.NumberLiteral{Val: 1},
-					RHS: &influxql.NumberLiteral{Val: 2},
-				},
-				RHS: &influxql.NumberLiteral{Val: 3},
-			},
-		},
-
-		// Binary expression with regex.
-		{
-			s: `region =~ /us.*/`,
-			expr: &influxql.BinaryExpr{
-				Op:  influxql.EQREGEX,
-				LHS: &influxql.VarRef{Val: "region"},
-				RHS: &influxql.RegexLiteral{Val: regexp.MustCompile(`us.*`)},
-			},
-		},
-
-		// Binary expression with quoted '/' regex.
-		{
-			s: `url =~ /http\:\/\/www\.example\.com/`,
-			expr: &influxql.BinaryExpr{
-				Op:  influxql.EQREGEX,
-				LHS: &influxql.VarRef{Val: "url"},
-				RHS: &influxql.RegexLiteral{Val: regexp.MustCompile(`http\://www\.example\.com`)},
-			},
-		},
-
-		// Complex binary expression.
-		{
-			s: `value + 3 < 30 AND 1 + 2 OR true`,
-			expr: &influxql.BinaryExpr{
-				Op: influxql.OR,
-				LHS: &influxql.BinaryExpr{
-					Op: influxql.AND,
-					LHS: &influxql.BinaryExpr{
-						Op: influxql.LT,
-						LHS: &influxql.BinaryExpr{
-							Op:  influxql.ADD,
-							LHS: &influxql.VarRef{Val: "value"},
-							RHS: &influxql.NumberLiteral{Val: 3},
-						},
-						RHS: &influxql.NumberLiteral{Val: 30},
-					},
-					RHS: &influxql.BinaryExpr{
-						Op:  influxql.ADD,
-						LHS: &influxql.NumberLiteral{Val: 1},
-						RHS: &influxql.NumberLiteral{Val: 2},
-					},
-				},
-				RHS: &influxql.BooleanLiteral{Val: true},
-			},
-		},
-
-		// Complex binary expression.
-		{
-			s: `time > now() - 1d AND time < now() + 1d`,
-			expr: &influxql.BinaryExpr{
-				Op: influxql.AND,
-				LHS: &influxql.BinaryExpr{
-					Op:  influxql.GT,
-					LHS: &influxql.VarRef{Val: "time"},
-					RHS: &influxql.BinaryExpr{
-						Op:  influxql.SUB,
-						LHS: &influxql.Call{Name: "now"},
-						RHS: &influxql.DurationLiteral{Val: mustParseDuration("1d")},
-					},
-				},
-				RHS: &influxql.BinaryExpr{
-					Op:  influxql.LT,
-					LHS: &influxql.VarRef{Val: "time"},
-					RHS: &influxql.BinaryExpr{
-						Op:  influxql.ADD,
-						LHS: &influxql.Call{Name: "now"},
-						RHS: &influxql.DurationLiteral{Val: mustParseDuration("1d")},
-					},
-				},
-			},
-		},
-
-		// Function call (empty)
-		{
-			s: `my_func()`,
-			expr: &influxql.Call{
-				Name: "my_func",
-			},
-		},
-
-		// Function call (multi-arg)
-		{
-			s: `my_func(1, 2 + 3)`,
-			expr: &influxql.Call{
-				Name: "my_func",
-				Args: []influxql.Expr{
-					&influxql.NumberLiteral{Val: 1},
-					&influxql.BinaryExpr{
-						Op:  influxql.ADD,
-						LHS: &influxql.NumberLiteral{Val: 2},
-						RHS: &influxql.NumberLiteral{Val: 3},
-					},
-				},
-			},
-		},
-	}
-
-	for i, tt := range tests {
-		expr, err := influxql.NewParser(strings.NewReader(tt.s)).ParseExpr()
-		if !reflect.DeepEqual(tt.err, errstring(err)) {
-			t.Errorf("%d. %q: error mismatch:\n  exp=%s\n  got=%s\n\n", i, tt.s, tt.err, err)
-		} else if tt.err == "" && !reflect.DeepEqual(tt.expr, expr) {
-			t.Errorf("%d. %q\n\nexpr mismatch:\n\nexp=%#v\n\ngot=%#v\n\n", i, tt.s, tt.expr, expr)
-		}
-	}
-}
-
-// Ensure a time duration can be parsed.
-func TestParseDuration(t *testing.T) {
-	var tests = []struct {
-		s   string
-		d   time.Duration
-		err string
-	}{
-		{s: `3`, d: 3 * time.Microsecond},
-		{s: `1000`, d: 1000 * time.Microsecond},
-		{s: `10u`, d: 10 * time.Microsecond},
-		{s: `10µ`, d: 10 * time.Microsecond},
-		{s: `15ms`, d: 15 * time.Millisecond},
-		{s: `100s`, d: 100 * time.Second},
-		{s: `2m`, d: 2 * time.Minute},
-		{s: `2h`, d: 2 * time.Hour},
-		{s: `2d`, d: 2 * 24 * time.Hour},
-		{s: `2w`, d: 2 * 7 * 24 * time.Hour},
-
-		{s: ``, err: "invalid duration"},
-		{s: `w`, err: "invalid duration"},
-		{s: `1.2w`, err: "invalid duration"},
-		{s: `10x`, err: "invalid duration"},
-	}
-
-	for i, tt := range tests {
-		d, err := influxql.ParseDuration(tt.s)
-		if !reflect.DeepEqual(tt.err, errstring(err)) {
-			t.Errorf("%d. %q: error mismatch:\n  exp=%s\n  got=%s\n\n", i, tt.s, tt.err, err)
-		} else if tt.d != d {
-			t.Errorf("%d. %q\n\nduration mismatch:\n\nexp=%#v\n\ngot=%#v\n\n", i, tt.s, tt.d, d)
-		}
-	}
-}
-
-// Ensure a time duration can be formatted.
-func TestFormatDuration(t *testing.T) {
-	var tests = []struct {
-		d time.Duration
-		s string
-	}{
-		{d: 3 * time.Microsecond, s: `3`},
-		{d: 1001 * time.Microsecond, s: `1001`},
-		{d: 15 * time.Millisecond, s: `15ms`},
-		{d: 100 * time.Second, s: `100s`},
-		{d: 2 * time.Minute, s: `2m`},
-		{d: 2 * time.Hour, s: `2h`},
-		{d: 2 * 24 * time.Hour, s: `2d`},
-		{d: 2 * 7 * 24 * time.Hour, s: `2w`},
-	}
-
-	for i, tt := range tests {
-		s := influxql.FormatDuration(tt.d)
-		if tt.s != s {
-			t.Errorf("%d. %v: mismatch: %s != %s", i, tt.d, tt.s, s)
-		}
-	}
-}
-
-// Ensure a string can be quoted.
-func TestQuote(t *testing.T) {
-	for i, tt := range []struct {
-		in  string
-		out string
-	}{
-		{``, `''`},
-		{`foo`, `'foo'`},
-		{"foo\nbar", `'foo\nbar'`},
-		{`foo bar\\`, `'foo bar\\\\'`},
-		{`'foo'`, `'\'foo\''`},
-	} {
-		if out := influxql.QuoteString(tt.in); tt.out != out {
-			t.Errorf("%d. %s: mismatch: %s != %s", i, tt.in, tt.out, out)
-		}
-	}
-}
-
-// Ensure an identifier's segments can be quoted.
-func TestQuoteIdent(t *testing.T) {
-	for i, tt := range []struct {
-		ident []string
-		s     string
-	}{
-		{[]string{``}, ``},
-		{[]string{`select`}, `"select"`},
-		{[]string{`in-bytes`}, `"in-bytes"`},
-		{[]string{`foo`, `bar`}, `"foo".bar`},
-		{[]string{`foo`, ``, `bar`}, `"foo"..bar`},
-		{[]string{`foo bar`, `baz`}, `"foo bar".baz`},
-		{[]string{`foo.bar`, `baz`}, `"foo.bar".baz`},
-		{[]string{`foo.bar`, `rp`, `baz`}, `"foo.bar"."rp".baz`},
-		{[]string{`foo.bar`, `rp`, `1baz`}, `"foo.bar"."rp"."1baz"`},
-	} {
-		if s := influxql.QuoteIdent(tt.ident...); tt.s != s {
-			t.Errorf("%d. %s: mismatch: %s != %s", i, tt.ident, tt.s, s)
-		}
-	}
-}
-
-// Ensure DropSeriesStatement can convert to a string
-func TestDropSeriesStatement_String(t *testing.T) {
-	var tests = []struct {
-		s    string
-		stmt influxql.Statement
-	}{
-		{
-			s:    `DROP SERIES FROM src`,
-			stmt: &influxql.DropSeriesStatement{Sources: []influxql.Source{&influxql.Measurement{Name: "src"}}},
-		},
-		{
-			s: `DROP SERIES FROM src WHERE host = 'hosta.influxdb.org'`,
-			stmt: &influxql.DropSeriesStatement{
-				Sources: []influxql.Source{&influxql.Measurement{Name: "src"}},
-				Condition: &influxql.BinaryExpr{
-					Op:  influxql.EQ,
-					LHS: &influxql.VarRef{Val: "host"},
-					RHS: &influxql.StringLiteral{Val: "hosta.influxdb.org"},
-				},
-			},
-		},
-		{
-			s: `DROP SERIES FROM src WHERE host = 'hosta.influxdb.org'`,
-			stmt: &influxql.DropSeriesStatement{
-				Sources: []influxql.Source{&influxql.Measurement{Name: "src"}},
-				Condition: &influxql.BinaryExpr{
-					Op:  influxql.EQ,
-					LHS: &influxql.VarRef{Val: "host"},
-					RHS: &influxql.StringLiteral{Val: "hosta.influxdb.org"},
-				},
-			},
-		},
-		{
-			s: `DROP SERIES WHERE host = 'hosta.influxdb.org'`,
-			stmt: &influxql.DropSeriesStatement{
-				Condition: &influxql.BinaryExpr{
-					Op:  influxql.EQ,
-					LHS: &influxql.VarRef{Val: "host"},
-					RHS: &influxql.StringLiteral{Val: "hosta.influxdb.org"},
-				},
-			},
-		},
-	}
-
-	for _, test := range tests {
-		s := test.stmt.String()
-		if s != test.s {
-			t.Errorf("error rendering string. expected %s, actual: %s", test.s, s)
-		}
-	}
-}
-
-func BenchmarkParserParseStatement(b *testing.B) {
-	b.ReportAllocs()
-	s := `SELECT field FROM "series" WHERE value > 10`
-	for i := 0; i < b.N; i++ {
-		if stmt, err := influxql.NewParser(strings.NewReader(s)).ParseStatement(); err != nil {
-			b.Fatalf("unexpected error: %s", err)
-		} else if stmt == nil {
-			b.Fatalf("expected statement: %s", stmt)
-		}
-	}
-	b.SetBytes(int64(len(s)))
-}
-
-// MustParseSelectStatement parses a select statement. Panic on error.
-func MustParseSelectStatement(s string) *influxql.SelectStatement {
-	stmt, err := influxql.NewParser(strings.NewReader(s)).ParseStatement()
-	panicIfErr(err)
-	return stmt.(*influxql.SelectStatement)
-}
-
-// MustParseExpr parses an expression. Panic on error.
-func MustParseExpr(s string) influxql.Expr {
-	expr, err := influxql.NewParser(strings.NewReader(s)).ParseExpr()
-	panicIfErr(err)
-	return expr
-}
-
-// errstring converts an error to its string representation.
-func errstring(err error) string {
-	if err != nil {
-		return err.Error()
-	}
-	return ""
-}
-
-// newAlterRetentionPolicyStatement creates an initialized AlterRetentionPolicyStatement.
-func newAlterRetentionPolicyStatement(name string, DB string, d time.Duration, replication int, dfault bool) *influxql.AlterRetentionPolicyStatement {
-	stmt := &influxql.AlterRetentionPolicyStatement{
-		Name:     name,
-		Database: DB,
-		Default:  dfault,
-	}
-
-	if d > -1 {
-		stmt.Duration = &d
-	}
-
-	if replication > -1 {
-		stmt.Replication = &replication
-	}
-
-	return stmt
-}
-
-// mustMarshalJSON encodes a value to JSON.
-func mustMarshalJSON(v interface{}) []byte {
-	b, err := json.Marshal(v)
-	panicIfErr(err)
-	return b
-}
-
-func mustParseDuration(s string) time.Duration {
-	d, err := influxql.ParseDuration(s)
-	panicIfErr(err)
-	return d
-}
-
-func panicIfErr(err error) {
-	if err != nil {
-		panic(err)
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/influxql/result.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/influxql/result.go
deleted file mode 100644
index b6a749ccf..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/influxql/result.go
+++ /dev/null
@@ -1,183 +0,0 @@
-package influxql
-
-import (
-	"encoding/json"
-	"errors"
-
-	"github.com/influxdb/influxdb/models"
-)
-
-// TagSet is a fundamental concept within the query system. It represents a composite series,
-// composed of multiple individual series that share a set of tag attributes.
-type TagSet struct {
-	Tags       map[string]string
-	Filters    []Expr
-	SeriesKeys []string
-	Key        []byte
-}
-
-// AddFilter adds a series-level filter to the Tagset.
-func (t *TagSet) AddFilter(key string, filter Expr) {
-	t.SeriesKeys = append(t.SeriesKeys, key)
-	t.Filters = append(t.Filters, filter)
-}
-
-// Rows represents a list of rows that can be sorted consistently by name/tag.
-// Result represents a resultset returned from a single statement.
-type Result struct {
-	// StatementID is just the statement's position in the query. It's used
-	// to combine statement results if they're being buffered in memory.
-	StatementID int `json:"-"`
-	Series      models.Rows
-	Err         error
-}
-
-// MarshalJSON encodes the result into JSON.
-func (r *Result) MarshalJSON() ([]byte, error) {
-	// Define a struct that outputs "error" as a string.
-	var o struct {
-		Series []*models.Row `json:"series,omitempty"`
-		Err    string        `json:"error,omitempty"`
-	}
-
-	// Copy fields to output struct.
-	o.Series = r.Series
-	if r.Err != nil {
-		o.Err = r.Err.Error()
-	}
-
-	return json.Marshal(&o)
-}
-
-// UnmarshalJSON decodes the data into the Result struct
-func (r *Result) UnmarshalJSON(b []byte) error {
-	var o struct {
-		Series []*models.Row `json:"series,omitempty"`
-		Err    string        `json:"error,omitempty"`
-	}
-
-	err := json.Unmarshal(b, &o)
-	if err != nil {
-		return err
-	}
-	r.Series = o.Series
-	if o.Err != "" {
-		r.Err = errors.New(o.Err)
-	}
-	return nil
-}
-
-func GetProcessor(expr Expr, startIndex int) (Processor, int) {
-	switch expr := expr.(type) {
-	case *VarRef:
-		return newEchoProcessor(startIndex), startIndex + 1
-	case *Call:
-		return newEchoProcessor(startIndex), startIndex + 1
-	case *BinaryExpr:
-		return getBinaryProcessor(expr, startIndex)
-	case *ParenExpr:
-		return GetProcessor(expr.Expr, startIndex)
-	case *NumberLiteral:
-		return newLiteralProcessor(expr.Val), startIndex
-	case *StringLiteral:
-		return newLiteralProcessor(expr.Val), startIndex
-	case *BooleanLiteral:
-		return newLiteralProcessor(expr.Val), startIndex
-	case *TimeLiteral:
-		return newLiteralProcessor(expr.Val), startIndex
-	case *DurationLiteral:
-		return newLiteralProcessor(expr.Val), startIndex
-	}
-	panic("unreachable")
-}
-
-type Processor func(values []interface{}) interface{}
-
-func newEchoProcessor(index int) Processor {
-	return func(values []interface{}) interface{} {
-		return values[index]
-	}
-}
-
-func newLiteralProcessor(val interface{}) Processor {
-	return func(values []interface{}) interface{} {
-		return val
-	}
-}
-
-func getBinaryProcessor(expr *BinaryExpr, startIndex int) (Processor, int) {
-	lhs, index := GetProcessor(expr.LHS, startIndex)
-	rhs, index := GetProcessor(expr.RHS, index)
-
-	return newBinaryExprEvaluator(expr.Op, lhs, rhs), index
-}
-
-func newBinaryExprEvaluator(op Token, lhs, rhs Processor) Processor {
-	switch op {
-	case ADD:
-		return func(values []interface{}) interface{} {
-			l := lhs(values)
-			r := rhs(values)
-			if lf, rf, ok := processorValuesAsFloat64(l, r); ok {
-				return lf + rf
-			}
-			return nil
-		}
-	case SUB:
-		return func(values []interface{}) interface{} {
-			l := lhs(values)
-			r := rhs(values)
-			if lf, rf, ok := processorValuesAsFloat64(l, r); ok {
-				return lf - rf
-			}
-			return nil
-		}
-	case MUL:
-		return func(values []interface{}) interface{} {
-			l := lhs(values)
-			r := rhs(values)
-			if lf, rf, ok := processorValuesAsFloat64(l, r); ok {
-				return lf * rf
-			}
-			return nil
-		}
-	case DIV:
-		return func(values []interface{}) interface{} {
-			l := lhs(values)
-			r := rhs(values)
-			if lf, rf, ok := processorValuesAsFloat64(l, r); ok {
-				return lf / rf
-			}
-			return nil
-		}
-	default:
-		// we shouldn't get here, but give them back nils if it goes this way
-		return func(values []interface{}) interface{} {
-			return nil
-		}
-	}
-}
-
-func processorValuesAsFloat64(lhs interface{}, rhs interface{}) (float64, float64, bool) {
-	var lf float64
-	var rf float64
-	var ok bool
-
-	lf, ok = lhs.(float64)
-	if !ok {
-		var li int64
-		if li, ok = lhs.(int64); !ok {
-			return 0, 0, false
-		}
-		lf = float64(li)
-	}
-	rf, ok = rhs.(float64)
-	if !ok {
-		var ri int64
-		if ri, ok = rhs.(int64); !ok {
-			return 0, 0, false
-		}
-		rf = float64(ri)
-	}
-	return lf, rf, true
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/influxql/scanner.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/influxql/scanner.go
deleted file mode 100644
index d071c8571..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/influxql/scanner.go
+++ /dev/null
@@ -1,565 +0,0 @@
-package influxql
-
-import (
-	"bufio"
-	"bytes"
-	"errors"
-	"fmt"
-	"io"
-	"strings"
-)
-
-// Scanner represents a lexical scanner for InfluxQL.
-type Scanner struct {
-	r *reader
-}
-
-// NewScanner returns a new instance of Scanner.
-func NewScanner(r io.Reader) *Scanner {
-	return &Scanner{r: &reader{r: bufio.NewReader(r)}}
-}
-
-// Scan returns the next token and position from the underlying reader.
-// Also returns the literal text read for strings, numbers, and duration tokens
-// since these token types can have different literal representations.
-func (s *Scanner) Scan() (tok Token, pos Pos, lit string) {
-	// Read next code point.
-	ch0, pos := s.r.read()
-
-	// If we see whitespace then consume all contiguous whitespace.
-	// If we see a letter, or certain acceptable special characters, then consume
-	// as an ident or reserved word.
-	if isWhitespace(ch0) {
-		return s.scanWhitespace()
-	} else if isLetter(ch0) || ch0 == '_' {
-		s.r.unread()
-		return s.scanIdent()
-	} else if isDigit(ch0) {
-		return s.scanNumber()
-	}
-
-	// Otherwise parse individual characters.
-	switch ch0 {
-	case eof:
-		return EOF, pos, ""
-	case '"':
-		s.r.unread()
-		return s.scanIdent()
-	case '\'':
-		return s.scanString()
-	case '.':
-		ch1, _ := s.r.read()
-		s.r.unread()
-		if isDigit(ch1) {
-			return s.scanNumber()
-		}
-		return DOT, pos, ""
-	case '+', '-':
-		return s.scanNumber()
-	case '*':
-		return MUL, pos, ""
-	case '/':
-		return DIV, pos, ""
-	case '=':
-		if ch1, _ := s.r.read(); ch1 == '~' {
-			return EQREGEX, pos, ""
-		}
-		s.r.unread()
-		return EQ, pos, ""
-	case '!':
-		if ch1, _ := s.r.read(); ch1 == '=' {
-			return NEQ, pos, ""
-		} else if ch1 == '~' {
-			return NEQREGEX, pos, ""
-		}
-		s.r.unread()
-	case '>':
-		if ch1, _ := s.r.read(); ch1 == '=' {
-			return GTE, pos, ""
-		}
-		s.r.unread()
-		return GT, pos, ""
-	case '<':
-		if ch1, _ := s.r.read(); ch1 == '=' {
-			return LTE, pos, ""
-		} else if ch1 == '>' {
-			return NEQ, pos, ""
-		}
-		s.r.unread()
-		return LT, pos, ""
-	case '(':
-		return LPAREN, pos, ""
-	case ')':
-		return RPAREN, pos, ""
-	case ',':
-		return COMMA, pos, ""
-	case ';':
-		return SEMICOLON, pos, ""
-	case ':':
-		return COLON, pos, ""
-	}
-
-	return ILLEGAL, pos, string(ch0)
-}
-
-// scanWhitespace consumes the current rune and all contiguous whitespace.
-func (s *Scanner) scanWhitespace() (tok Token, pos Pos, lit string) {
-	// Create a buffer and read the current character into it.
-	var buf bytes.Buffer
-	ch, pos := s.r.curr()
-	_, _ = buf.WriteRune(ch)
-
-	// Read every subsequent whitespace character into the buffer.
-	// Non-whitespace characters and EOF will cause the loop to exit.
-	for {
-		ch, _ = s.r.read()
-		if ch == eof {
-			break
-		} else if !isWhitespace(ch) {
-			s.r.unread()
-			break
-		} else {
-			_, _ = buf.WriteRune(ch)
-		}
-	}
-
-	return WS, pos, buf.String()
-}
-
-func (s *Scanner) scanIdent() (tok Token, pos Pos, lit string) {
-	// Save the starting position of the identifier.
-	_, pos = s.r.read()
-	s.r.unread()
-
-	var buf bytes.Buffer
-	for {
-		if ch, _ := s.r.read(); ch == eof {
-			break
-		} else if ch == '"' {
-			tok0, pos0, lit0 := s.scanString()
-			if tok0 == BADSTRING || tok0 == BADESCAPE {
-				return tok0, pos0, lit0
-			}
-			return IDENT, pos, lit0
-		} else if isIdentChar(ch) {
-			s.r.unread()
-			buf.WriteString(ScanBareIdent(s.r))
-		} else {
-			s.r.unread()
-			break
-		}
-	}
-	lit = buf.String()
-
-	// If the literal matches a keyword then return that keyword.
-	if tok = Lookup(lit); tok != IDENT {
-		return tok, pos, ""
-	}
-
-	return IDENT, pos, lit
-}
-
-// scanString consumes a contiguous string of non-quote characters.
-// Quote characters can be consumed if they're first escaped with a backslash.
-func (s *Scanner) scanString() (tok Token, pos Pos, lit string) {
-	s.r.unread()
-	_, pos = s.r.curr()
-
-	var err error
-	lit, err = ScanString(s.r)
-	if err == errBadString {
-		return BADSTRING, pos, lit
-	} else if err == errBadEscape {
-		_, pos = s.r.curr()
-		return BADESCAPE, pos, lit
-	}
-	return STRING, pos, lit
-}
-
-func (s *Scanner) ScanRegex() (tok Token, pos Pos, lit string) {
-	_, pos = s.r.curr()
-
-	// Start & end sentinels.
-	start, end := '/', '/'
-	// Valid escape chars.
-	escapes := map[rune]rune{'/': '/'}
-
-	b, err := ScanDelimited(s.r, start, end, escapes, true)
-
-	if err == errBadEscape {
-		_, pos = s.r.curr()
-		return BADESCAPE, pos, lit
-	} else if err != nil {
-		return BADREGEX, pos, lit
-	}
-	return REGEX, pos, string(b)
-}
-
-// scanNumber consumes anything that looks like the start of a number.
-// Numbers start with a digit, full stop, plus sign or minus sign.
-// This function can return non-number tokens if a scan is a false positive.
-// For example, a minus sign followed by a letter will just return a minus sign.
-func (s *Scanner) scanNumber() (tok Token, pos Pos, lit string) {
-	var buf bytes.Buffer
-
-	// Check if the initial rune is a "+" or "-".
-	ch, pos := s.r.curr()
-	if ch == '+' || ch == '-' {
-		// Peek at the next two runes.
-		ch1, _ := s.r.read()
-		ch2, _ := s.r.read()
-		s.r.unread()
-		s.r.unread()
-
-		// This rune must be followed by a digit or a full stop and a digit.
-		if isDigit(ch1) || (ch1 == '.' && isDigit(ch2)) {
-			_, _ = buf.WriteRune(ch)
-		} else if ch == '+' {
-			return ADD, pos, ""
-		} else if ch == '-' {
-			return SUB, pos, ""
-		}
-	} else if ch == '.' {
-		// Peek and see if the next rune is a digit.
-		ch1, _ := s.r.read()
-		s.r.unread()
-		if !isDigit(ch1) {
-			return ILLEGAL, pos, "."
-		}
-
-		// Unread the full stop so we can read it later.
-		s.r.unread()
-	} else {
-		s.r.unread()
-	}
-
-	// Read as many digits as possible.
-	_, _ = buf.WriteString(s.scanDigits())
-
-	// If next code points are a full stop and digit then consume them.
-	if ch0, _ := s.r.read(); ch0 == '.' {
-		if ch1, _ := s.r.read(); isDigit(ch1) {
-			_, _ = buf.WriteRune(ch0)
-			_, _ = buf.WriteRune(ch1)
-			_, _ = buf.WriteString(s.scanDigits())
-		} else {
-			s.r.unread()
-			s.r.unread()
-		}
-	} else {
-		s.r.unread()
-	}
-
-	// Attempt to read as a duration if it doesn't have a fractional part.
-	if !strings.Contains(buf.String(), ".") {
-		// If the next rune is a duration unit (u,µ,ms,s) then return a duration token
-		if ch0, _ := s.r.read(); ch0 == 'u' || ch0 == 'µ' || ch0 == 's' || ch0 == 'h' || ch0 == 'd' || ch0 == 'w' {
-			_, _ = buf.WriteRune(ch0)
-			return DURATION_VAL, pos, buf.String()
-		} else if ch0 == 'm' {
-			_, _ = buf.WriteRune(ch0)
-			if ch1, _ := s.r.read(); ch1 == 's' {
-				_, _ = buf.WriteRune(ch1)
-			} else {
-				s.r.unread()
-			}
-			return DURATION_VAL, pos, buf.String()
-		}
-		s.r.unread()
-	}
-	return NUMBER, pos, buf.String()
-}
-
-// scanDigits consume a contiguous series of digits.
-func (s *Scanner) scanDigits() string {
-	var buf bytes.Buffer
-	for {
-		ch, _ := s.r.read()
-		if !isDigit(ch) {
-			s.r.unread()
-			break
-		}
-		_, _ = buf.WriteRune(ch)
-	}
-	return buf.String()
-}
-
-// isWhitespace returns true if the rune is a space, tab, or newline.
-func isWhitespace(ch rune) bool { return ch == ' ' || ch == '\t' || ch == '\n' }
-
-// isLetter returns true if the rune is a letter.
-func isLetter(ch rune) bool { return (ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z') }
-
-// isDigit returns true if the rune is a digit.
-func isDigit(ch rune) bool { return (ch >= '0' && ch <= '9') }
-
-// isIdentChar returns true if the rune can be used in an unquoted identifier.
-func isIdentChar(ch rune) bool { return isLetter(ch) || isDigit(ch) || ch == '_' }
-
-// isIdentFirstChar returns true if the rune can be used as the first char in an unquoted identifer.
-func isIdentFirstChar(ch rune) bool { return isLetter(ch) || ch == '_' }
-
-// bufScanner represents a wrapper for scanner to add a buffer.
-// It provides a fixed-length circular buffer that can be unread.
-type bufScanner struct {
-	s   *Scanner
-	i   int // buffer index
-	n   int // buffer size
-	buf [3]struct {
-		tok Token
-		pos Pos
-		lit string
-	}
-}
-
-// newBufScanner returns a new buffered scanner for a reader.
-func newBufScanner(r io.Reader) *bufScanner {
-	return &bufScanner{s: NewScanner(r)}
-}
-
-// Scan reads the next token from the scanner.
-func (s *bufScanner) Scan() (tok Token, pos Pos, lit string) {
-	return s.scanFunc(s.s.Scan)
-}
-
-// ScanRegex reads a regex token from the scanner.
-func (s *bufScanner) ScanRegex() (tok Token, pos Pos, lit string) {
-	return s.scanFunc(s.s.ScanRegex)
-}
-
-// scanFunc uses the provided function to scan the next token.
-func (s *bufScanner) scanFunc(scan func() (Token, Pos, string)) (tok Token, pos Pos, lit string) {
-	// If we have unread tokens then read them off the buffer first.
-	if s.n > 0 {
-		s.n--
-		return s.curr()
-	}
-
-	// Move buffer position forward and save the token.
-	s.i = (s.i + 1) % len(s.buf)
-	buf := &s.buf[s.i]
-	buf.tok, buf.pos, buf.lit = scan()
-
-	return s.curr()
-}
-
-// Unscan pushes the previously token back onto the buffer.
-func (s *bufScanner) Unscan() { s.n++ }
-
-// curr returns the last read token.
-func (s *bufScanner) curr() (tok Token, pos Pos, lit string) {
-	buf := &s.buf[(s.i-s.n+len(s.buf))%len(s.buf)]
-	return buf.tok, buf.pos, buf.lit
-}
-
-// reader represents a buffered rune reader used by the scanner.
-// It provides a fixed-length circular buffer that can be unread.
-type reader struct {
-	r   io.RuneScanner
-	i   int // buffer index
-	n   int // buffer char count
-	pos Pos // last read rune position
-	buf [3]struct {
-		ch  rune
-		pos Pos
-	}
-	eof bool // true if reader has ever seen eof.
-}
-
-// ReadRune reads the next rune from the reader.
-// This is a wrapper function to implement the io.RuneReader interface.
-// Note that this function does not return size.
-func (r *reader) ReadRune() (ch rune, size int, err error) {
-	ch, _ = r.read()
-	if ch == eof {
-		err = io.EOF
-	}
-	return
-}
-
-// UnreadRune pushes the previously read rune back onto the buffer.
-// This is a wrapper function to implement the io.RuneScanner interface.
-func (r *reader) UnreadRune() error {
-	r.unread()
-	return nil
-}
-
-// read reads the next rune from the reader.
-func (r *reader) read() (ch rune, pos Pos) {
-	// If we have unread characters then read them off the buffer first.
-	if r.n > 0 {
-		r.n--
-		return r.curr()
-	}
-
-	// Read next rune from underlying reader.
-	// Any error (including io.EOF) should return as EOF.
-	ch, _, err := r.r.ReadRune()
-	if err != nil {
-		ch = eof
-	} else if ch == '\r' {
-		if ch, _, err := r.r.ReadRune(); err != nil {
-			// nop
-		} else if ch != '\n' {
-			_ = r.r.UnreadRune()
-		}
-		ch = '\n'
-	}
-
-	// Save character and position to the buffer.
-	r.i = (r.i + 1) % len(r.buf)
-	buf := &r.buf[r.i]
-	buf.ch, buf.pos = ch, r.pos
-
-	// Update position.
-	// Only count EOF once.
-	if ch == '\n' {
-		r.pos.Line++
-		r.pos.Char = 0
-	} else if !r.eof {
-		r.pos.Char++
-	}
-
-	// Mark the reader as EOF.
-	// This is used so we don't double count EOF characters.
-	if ch == eof {
-		r.eof = true
-	}
-
-	return r.curr()
-}
-
-// unread pushes the previously read rune back onto the buffer.
-func (r *reader) unread() {
-	r.n++
-}
-
-// curr returns the last read character and position.
-func (r *reader) curr() (ch rune, pos Pos) {
-	i := (r.i - r.n + len(r.buf)) % len(r.buf)
-	buf := &r.buf[i]
-	return buf.ch, buf.pos
-}
-
-// eof is a marker code point to signify that the reader can't read any more.
-const eof = rune(0)
-
-func ScanDelimited(r io.RuneScanner, start, end rune, escapes map[rune]rune, escapesPassThru bool) ([]byte, error) {
-	// Scan start delimiter.
-	if ch, _, err := r.ReadRune(); err != nil {
-		return nil, err
-	} else if ch != start {
-		return nil, fmt.Errorf("expected %s; found %s", string(start), string(ch))
-	}
-
-	var buf bytes.Buffer
-	for {
-		ch0, _, err := r.ReadRune()
-		if ch0 == end {
-			return buf.Bytes(), nil
-		} else if err != nil {
-			return buf.Bytes(), err
-		} else if ch0 == '\n' {
-			return nil, errors.New("delimited text contains new line")
-		} else if ch0 == '\\' {
-			// If the next character is an escape then write the escaped char.
-			// If it's not a valid escape then return an error.
-			ch1, _, err := r.ReadRune()
-			if err != nil {
-				return nil, err
-			}
-
-			c, ok := escapes[ch1]
-			if !ok {
-				if escapesPassThru {
-					// Unread ch1 (char after the \)
-					_ = r.UnreadRune()
-					// Write ch0 (\) to the output buffer.
-					_, _ = buf.WriteRune(ch0)
-					continue
-				} else {
-					buf.Reset()
-					_, _ = buf.WriteRune(ch0)
-					_, _ = buf.WriteRune(ch1)
-					return buf.Bytes(), errBadEscape
-				}
-			}
-
-			_, _ = buf.WriteRune(c)
-		} else {
-			_, _ = buf.WriteRune(ch0)
-		}
-	}
-}
-
-// ScanString reads a quoted string from a rune reader.
-func ScanString(r io.RuneScanner) (string, error) {
-	ending, _, err := r.ReadRune()
-	if err != nil {
-		return "", errBadString
-	}
-
-	var buf bytes.Buffer
-	for {
-		ch0, _, err := r.ReadRune()
-		if ch0 == ending {
-			return buf.String(), nil
-		} else if err != nil || ch0 == '\n' {
-			return buf.String(), errBadString
-		} else if ch0 == '\\' {
-			// If the next character is an escape then write the escaped char.
-			// If it's not a valid escape then return an error.
-			ch1, _, _ := r.ReadRune()
-			if ch1 == 'n' {
-				_, _ = buf.WriteRune('\n')
-			} else if ch1 == '\\' {
-				_, _ = buf.WriteRune('\\')
-			} else if ch1 == '"' {
-				_, _ = buf.WriteRune('"')
-			} else if ch1 == '\'' {
-				_, _ = buf.WriteRune('\'')
-			} else {
-				return string(ch0) + string(ch1), errBadEscape
-			}
-		} else {
-			_, _ = buf.WriteRune(ch0)
-		}
-	}
-}
-
-var errBadString = errors.New("bad string")
-var errBadEscape = errors.New("bad escape")
-var errBadRegex = errors.New("bad regex")
-
-// ScanBareIdent reads bare identifier from a rune reader.
-func ScanBareIdent(r io.RuneScanner) string {
-	// Read every ident character into the buffer.
-	// Non-ident characters and EOF will cause the loop to exit.
-	var buf bytes.Buffer
-	for {
-		ch, _, err := r.ReadRune()
-		if err != nil {
-			break
-		} else if !isIdentChar(ch) {
-			r.UnreadRune()
-			break
-		} else {
-			_, _ = buf.WriteRune(ch)
-		}
-	}
-	return buf.String()
-}
-
-var errInvalidIdentifier = errors.New("invalid identifier")
-
-// IsRegexOp returns true if the operator accepts a regex operand.
-func IsRegexOp(t Token) bool {
-	return (t == EQREGEX || t == NEQREGEX)
-}
-
-// assert will panic with a given formatted message if the given condition is false.
-func assert(condition bool, msg string, v ...interface{}) {
-	if !condition {
-		panic(fmt.Sprintf("assert failed: "+msg, v...))
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/influxql/scanner_test.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/influxql/scanner_test.go
deleted file mode 100644
index 7778fc438..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/influxql/scanner_test.go
+++ /dev/null
@@ -1,292 +0,0 @@
-package influxql_test
-
-import (
-	"reflect"
-	"strings"
-	"testing"
-
-	"github.com/influxdb/influxdb/influxql"
-)
-
-// Ensure the scanner can scan tokens correctly.
-func TestScanner_Scan(t *testing.T) {
-	var tests = []struct {
-		s   string
-		tok influxql.Token
-		lit string
-		pos influxql.Pos
-	}{
-		// Special tokens (EOF, ILLEGAL, WS)
-		{s: ``, tok: influxql.EOF},
-		{s: `#`, tok: influxql.ILLEGAL, lit: `#`},
-		{s: ` `, tok: influxql.WS, lit: " "},
-		{s: "\t", tok: influxql.WS, lit: "\t"},
-		{s: "\n", tok: influxql.WS, lit: "\n"},
-		{s: "\r", tok: influxql.WS, lit: "\n"},
-		{s: "\r\n", tok: influxql.WS, lit: "\n"},
-		{s: "\rX", tok: influxql.WS, lit: "\n"},
-		{s: "\n\r", tok: influxql.WS, lit: "\n\n"},
-		{s: " \n\t \r\n\t", tok: influxql.WS, lit: " \n\t \n\t"},
-		{s: " foo", tok: influxql.WS, lit: " "},
-
-		// Numeric operators
-		{s: `+`, tok: influxql.ADD},
-		{s: `-`, tok: influxql.SUB},
-		{s: `*`, tok: influxql.MUL},
-		{s: `/`, tok: influxql.DIV},
-
-		// Logical operators
-		{s: `AND`, tok: influxql.AND},
-		{s: `and`, tok: influxql.AND},
-		{s: `OR`, tok: influxql.OR},
-		{s: `or`, tok: influxql.OR},
-
-		{s: `=`, tok: influxql.EQ},
-		{s: `<>`, tok: influxql.NEQ},
-		{s: `! `, tok: influxql.ILLEGAL, lit: "!"},
-		{s: `<`, tok: influxql.LT},
-		{s: `<=`, tok: influxql.LTE},
-		{s: `>`, tok: influxql.GT},
-		{s: `>=`, tok: influxql.GTE},
-
-		// Misc tokens
-		{s: `(`, tok: influxql.LPAREN},
-		{s: `)`, tok: influxql.RPAREN},
-		{s: `,`, tok: influxql.COMMA},
-		{s: `;`, tok: influxql.SEMICOLON},
-		{s: `.`, tok: influxql.DOT},
-		{s: `=~`, tok: influxql.EQREGEX},
-		{s: `!~`, tok: influxql.NEQREGEX},
-
-		// Identifiers
-		{s: `foo`, tok: influxql.IDENT, lit: `foo`},
-		{s: `_foo`, tok: influxql.IDENT, lit: `_foo`},
-		{s: `Zx12_3U_-`, tok: influxql.IDENT, lit: `Zx12_3U_`},
-		{s: `"foo"`, tok: influxql.IDENT, lit: `foo`},
-		{s: `"foo\\bar"`, tok: influxql.IDENT, lit: `foo\bar`},
-		{s: `"foo\bar"`, tok: influxql.BADESCAPE, lit: `\b`, pos: influxql.Pos{Line: 0, Char: 5}},
-		{s: `"foo\"bar\""`, tok: influxql.IDENT, lit: `foo"bar"`},
-		{s: `test"`, tok: influxql.BADSTRING, lit: "", pos: influxql.Pos{Line: 0, Char: 3}},
-		{s: `"test`, tok: influxql.BADSTRING, lit: `test`},
-
-		{s: `true`, tok: influxql.TRUE},
-		{s: `false`, tok: influxql.FALSE},
-
-		// Strings
-		{s: `'testing 123!'`, tok: influxql.STRING, lit: `testing 123!`},
-		{s: `'foo\nbar'`, tok: influxql.STRING, lit: "foo\nbar"},
-		{s: `'foo\\bar'`, tok: influxql.STRING, lit: "foo\\bar"},
-		{s: `'test`, tok: influxql.BADSTRING, lit: `test`},
-		{s: "'test\nfoo", tok: influxql.BADSTRING, lit: `test`},
-		{s: `'test\g'`, tok: influxql.BADESCAPE, lit: `\g`, pos: influxql.Pos{Line: 0, Char: 6}},
-
-		// Numbers
-		{s: `100`, tok: influxql.NUMBER, lit: `100`},
-		{s: `100.23`, tok: influxql.NUMBER, lit: `100.23`},
-		{s: `+100.23`, tok: influxql.NUMBER, lit: `+100.23`},
-		{s: `-100.23`, tok: influxql.NUMBER, lit: `-100.23`},
-		{s: `-100.`, tok: influxql.NUMBER, lit: `-100`},
-		{s: `.23`, tok: influxql.NUMBER, lit: `.23`},
-		{s: `+.23`, tok: influxql.NUMBER, lit: `+.23`},
-		{s: `-.23`, tok: influxql.NUMBER, lit: `-.23`},
-		//{s: `.`, tok: influxql.ILLEGAL, lit: `.`},
-		{s: `-.`, tok: influxql.SUB, lit: ``},
-		{s: `+.`, tok: influxql.ADD, lit: ``},
-		{s: `10.3s`, tok: influxql.NUMBER, lit: `10.3`},
-
-		// Durations
-		{s: `10u`, tok: influxql.DURATION_VAL, lit: `10u`},
-		{s: `10µ`, tok: influxql.DURATION_VAL, lit: `10µ`},
-		{s: `10ms`, tok: influxql.DURATION_VAL, lit: `10ms`},
-		{s: `-1s`, tok: influxql.DURATION_VAL, lit: `-1s`},
-		{s: `10m`, tok: influxql.DURATION_VAL, lit: `10m`},
-		{s: `10h`, tok: influxql.DURATION_VAL, lit: `10h`},
-		{s: `10d`, tok: influxql.DURATION_VAL, lit: `10d`},
-		{s: `10w`, tok: influxql.DURATION_VAL, lit: `10w`},
-		{s: `10x`, tok: influxql.NUMBER, lit: `10`}, // non-duration unit
-
-		// Keywords
-		{s: `ALL`, tok: influxql.ALL},
-		{s: `ALTER`, tok: influxql.ALTER},
-		{s: `AS`, tok: influxql.AS},
-		{s: `ASC`, tok: influxql.ASC},
-		{s: `BEGIN`, tok: influxql.BEGIN},
-		{s: `BY`, tok: influxql.BY},
-		{s: `CREATE`, tok: influxql.CREATE},
-		{s: `CONTINUOUS`, tok: influxql.CONTINUOUS},
-		{s: `DATABASE`, tok: influxql.DATABASE},
-		{s: `DATABASES`, tok: influxql.DATABASES},
-		{s: `DEFAULT`, tok: influxql.DEFAULT},
-		{s: `DELETE`, tok: influxql.DELETE},
-		{s: `DESC`, tok: influxql.DESC},
-		{s: `DROP`, tok: influxql.DROP},
-		{s: `DURATION`, tok: influxql.DURATION},
-		{s: `END`, tok: influxql.END},
-		{s: `EXISTS`, tok: influxql.EXISTS},
-		{s: `EXPLAIN`, tok: influxql.EXPLAIN},
-		{s: `FIELD`, tok: influxql.FIELD},
-		{s: `FROM`, tok: influxql.FROM},
-		{s: `GRANT`, tok: influxql.GRANT},
-		{s: `GROUP`, tok: influxql.GROUP},
-		{s: `IF`, tok: influxql.IF},
-		{s: `INNER`, tok: influxql.INNER},
-		{s: `INSERT`, tok: influxql.INSERT},
-		{s: `INTO`, tok: influxql.INTO},
-		{s: `KEY`, tok: influxql.KEY},
-		{s: `KEYS`, tok: influxql.KEYS},
-		{s: `LIMIT`, tok: influxql.LIMIT},
-		{s: `SHOW`, tok: influxql.SHOW},
-		{s: `SHARDS`, tok: influxql.SHARDS},
-		{s: `MEASUREMENT`, tok: influxql.MEASUREMENT},
-		{s: `MEASUREMENTS`, tok: influxql.MEASUREMENTS},
-		{s: `NOT`, tok: influxql.NOT},
-		{s: `OFFSET`, tok: influxql.OFFSET},
-		{s: `ON`, tok: influxql.ON},
-		{s: `ORDER`, tok: influxql.ORDER},
-		{s: `PASSWORD`, tok: influxql.PASSWORD},
-		{s: `POLICY`, tok: influxql.POLICY},
-		{s: `POLICIES`, tok: influxql.POLICIES},
-		{s: `PRIVILEGES`, tok: influxql.PRIVILEGES},
-		{s: `QUERIES`, tok: influxql.QUERIES},
-		{s: `QUERY`, tok: influxql.QUERY},
-		{s: `READ`, tok: influxql.READ},
-		{s: `RETENTION`, tok: influxql.RETENTION},
-		{s: `REVOKE`, tok: influxql.REVOKE},
-		{s: `SELECT`, tok: influxql.SELECT},
-		{s: `SERIES`, tok: influxql.SERIES},
-		{s: `SERVER`, tok: influxql.SERVER},
-		{s: `SERVERS`, tok: influxql.SERVERS},
-		{s: `TAG`, tok: influxql.TAG},
-		{s: `TO`, tok: influxql.TO},
-		{s: `USER`, tok: influxql.USER},
-		{s: `USERS`, tok: influxql.USERS},
-		{s: `VALUES`, tok: influxql.VALUES},
-		{s: `WHERE`, tok: influxql.WHERE},
-		{s: `WITH`, tok: influxql.WITH},
-		{s: `WRITE`, tok: influxql.WRITE},
-		{s: `explain`, tok: influxql.EXPLAIN}, // case insensitive
-		{s: `seLECT`, tok: influxql.SELECT},   // case insensitive
-	}
-
-	for i, tt := range tests {
-		s := influxql.NewScanner(strings.NewReader(tt.s))
-		tok, pos, lit := s.Scan()
-		if tt.tok != tok {
-			t.Errorf("%d. %q token mismatch: exp=%q got=%q <%q>", i, tt.s, tt.tok, tok, lit)
-		} else if tt.pos.Line != pos.Line || tt.pos.Char != pos.Char {
-			t.Errorf("%d. %q pos mismatch: exp=%#v got=%#v", i, tt.s, tt.pos, pos)
-		} else if tt.lit != lit {
-			t.Errorf("%d. %q literal mismatch: exp=%q got=%q", i, tt.s, tt.lit, lit)
-		}
-	}
-}
-
-// Ensure the scanner can scan a series of tokens correctly.
-func TestScanner_Scan_Multi(t *testing.T) {
-	type result struct {
-		tok influxql.Token
-		pos influxql.Pos
-		lit string
-	}
-	exp := []result{
-		{tok: influxql.SELECT, pos: influxql.Pos{Line: 0, Char: 0}, lit: ""},
-		{tok: influxql.WS, pos: influxql.Pos{Line: 0, Char: 6}, lit: " "},
-		{tok: influxql.IDENT, pos: influxql.Pos{Line: 0, Char: 7}, lit: "value"},
-		{tok: influxql.WS, pos: influxql.Pos{Line: 0, Char: 12}, lit: " "},
-		{tok: influxql.FROM, pos: influxql.Pos{Line: 0, Char: 13}, lit: ""},
-		{tok: influxql.WS, pos: influxql.Pos{Line: 0, Char: 17}, lit: " "},
-		{tok: influxql.IDENT, pos: influxql.Pos{Line: 0, Char: 18}, lit: "myseries"},
-		{tok: influxql.WS, pos: influxql.Pos{Line: 0, Char: 26}, lit: " "},
-		{tok: influxql.WHERE, pos: influxql.Pos{Line: 0, Char: 27}, lit: ""},
-		{tok: influxql.WS, pos: influxql.Pos{Line: 0, Char: 32}, lit: " "},
-		{tok: influxql.IDENT, pos: influxql.Pos{Line: 0, Char: 33}, lit: "a"},
-		{tok: influxql.WS, pos: influxql.Pos{Line: 0, Char: 34}, lit: " "},
-		{tok: influxql.EQ, pos: influxql.Pos{Line: 0, Char: 35}, lit: ""},
-		{tok: influxql.WS, pos: influxql.Pos{Line: 0, Char: 36}, lit: " "},
-		{tok: influxql.STRING, pos: influxql.Pos{Line: 0, Char: 36}, lit: "b"},
-		{tok: influxql.EOF, pos: influxql.Pos{Line: 0, Char: 40}, lit: ""},
-	}
-
-	// Create a scanner.
-	v := `SELECT value from myseries WHERE a = 'b'`
-	s := influxql.NewScanner(strings.NewReader(v))
-
-	// Continually scan until we reach the end.
-	var act []result
-	for {
-		tok, pos, lit := s.Scan()
-		act = append(act, result{tok, pos, lit})
-		if tok == influxql.EOF {
-			break
-		}
-	}
-
-	// Verify the token counts match.
-	if len(exp) != len(act) {
-		t.Fatalf("token count mismatch: exp=%d, got=%d", len(exp), len(act))
-	}
-
-	// Verify each token matches.
-	for i := range exp {
-		if !reflect.DeepEqual(exp[i], act[i]) {
-			t.Fatalf("%d. token mismatch:\n\nexp=%#v\n\ngot=%#v", i, exp[i], act[i])
-		}
-	}
-}
-
-// Ensure the library can correctly scan strings.
-func TestScanString(t *testing.T) {
-	var tests = []struct {
-		in  string
-		out string
-		err string
-	}{
-		{in: `""`, out: ``},
-		{in: `"foo bar"`, out: `foo bar`},
-		{in: `'foo bar'`, out: `foo bar`},
-		{in: `"foo\nbar"`, out: "foo\nbar"},
-		{in: `"foo\\bar"`, out: `foo\bar`},
-		{in: `"foo\"bar"`, out: `foo"bar`},
-		{in: `'foo\'bar'`, out: `foo'bar`},
-
-		{in: `"foo` + "\n", out: `foo`, err: "bad string"}, // newline in string
-		{in: `"foo`, out: `foo`, err: "bad string"},        // unclosed quotes
-		{in: `"foo\xbar"`, out: `\x`, err: "bad escape"},   // invalid escape
-	}
-
-	for i, tt := range tests {
-		out, err := influxql.ScanString(strings.NewReader(tt.in))
-		if tt.err != errstring(err) {
-			t.Errorf("%d. %s: error: exp=%s, got=%s", i, tt.in, tt.err, err)
-		} else if tt.out != out {
-			t.Errorf("%d. %s: out: exp=%s, got=%s", i, tt.in, tt.out, out)
-		}
-	}
-}
-
-// Test scanning regex
-func TestScanRegex(t *testing.T) {
-	var tests = []struct {
-		in  string
-		tok influxql.Token
-		lit string
-		err string
-	}{
-		{in: `/^payments\./`, tok: influxql.REGEX, lit: `^payments\.`},
-		{in: `/foo\/bar/`, tok: influxql.REGEX, lit: `foo/bar`},
-		{in: `/foo\\/bar/`, tok: influxql.REGEX, lit: `foo\/bar`},
-		{in: `/foo\\bar/`, tok: influxql.REGEX, lit: `foo\\bar`},
-		{in: `/http\:\/\/www\.example\.com/`, tok: influxql.REGEX, lit: `http\://www\.example\.com`},
-	}
-
-	for i, tt := range tests {
-		s := influxql.NewScanner(strings.NewReader(tt.in))
-		tok, _, lit := s.ScanRegex()
-		if tok != tt.tok {
-			t.Errorf("%d. %s: error:\n\texp=%s\n\tgot=%s\n", i, tt.in, tt.tok.String(), tok.String())
-		}
-		if lit != tt.lit {
-			t.Errorf("%d. %s: error:\n\texp=%s\n\tgot=%s\n", i, tt.in, tt.lit, lit)
-		}
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/influxql/token.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/influxql/token.go
deleted file mode 100644
index 08205b326..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/influxql/token.go
+++ /dev/null
@@ -1,314 +0,0 @@
-package influxql
-
-import (
-	"strings"
-)
-
-// Token is a lexical token of the InfluxQL language.
-type Token int
-
-const (
-	// Special tokens
-	ILLEGAL Token = iota
-	EOF
-	WS
-
-	literal_beg
-	// Literals
-	IDENT        // main
-	NUMBER       // 12345.67
-	DURATION_VAL // 13h
-	STRING       // "abc"
-	BADSTRING    // "abc
-	BADESCAPE    // \q
-	TRUE         // true
-	FALSE        // false
-	REGEX        // Regular expressions
-	BADREGEX     // `.*
-	literal_end
-
-	operator_beg
-	// Operators
-	ADD // +
-	SUB // -
-	MUL // *
-	DIV // /
-
-	AND // AND
-	OR  // OR
-
-	EQ       // =
-	NEQ      // !=
-	EQREGEX  // =~
-	NEQREGEX // !~
-	LT       // <
-	LTE      // <=
-	GT       // >
-	GTE      // >=
-	operator_end
-
-	LPAREN    // (
-	RPAREN    // )
-	COMMA     // ,
-	COLON     // :
-	SEMICOLON // ;
-	DOT       // .
-
-	keyword_beg
-	// Keywords
-	ALL
-	ALTER
-	ANY
-	AS
-	ASC
-	BEGIN
-	BY
-	CREATE
-	CONTINUOUS
-	DATABASE
-	DATABASES
-	DEFAULT
-	DELETE
-	DESC
-	DESTINATIONS
-	DIAGNOSTICS
-	DISTINCT
-	DROP
-	DURATION
-	END
-	EXISTS
-	EXPLAIN
-	FIELD
-	FOR
-	FORCE
-	FROM
-	GRANT
-	GRANTS
-	GROUP
-	IF
-	IN
-	INF
-	INNER
-	INSERT
-	INTO
-	KEY
-	KEYS
-	LIMIT
-	MEASUREMENT
-	MEASUREMENTS
-	NOT
-	OFFSET
-	ON
-	ORDER
-	PASSWORD
-	POLICY
-	POLICIES
-	PRIVILEGES
-	QUERIES
-	QUERY
-	READ
-	REPLICATION
-	RETENTION
-	REVOKE
-	SELECT
-	SERIES
-	SERVER
-	SERVERS
-	SET
-	SHOW
-	SHARDS
-	SLIMIT
-	SOFFSET
-	STATS
-	SUBSCRIPTION
-	SUBSCRIPTIONS
-	TAG
-	TO
-	USER
-	USERS
-	VALUES
-	WHERE
-	WITH
-	WRITE
-	keyword_end
-)
-
-var tokens = [...]string{
-	ILLEGAL: "ILLEGAL",
-	EOF:     "EOF",
-	WS:      "WS",
-
-	IDENT:        "IDENT",
-	NUMBER:       "NUMBER",
-	DURATION_VAL: "DURATION_VAL",
-	STRING:       "STRING",
-	BADSTRING:    "BADSTRING",
-	BADESCAPE:    "BADESCAPE",
-	TRUE:         "TRUE",
-	FALSE:        "FALSE",
-	REGEX:        "REGEX",
-
-	ADD: "+",
-	SUB: "-",
-	MUL: "*",
-	DIV: "/",
-
-	AND: "AND",
-	OR:  "OR",
-
-	EQ:       "=",
-	NEQ:      "!=",
-	EQREGEX:  "=~",
-	NEQREGEX: "!~",
-	LT:       "<",
-	LTE:      "<=",
-	GT:       ">",
-	GTE:      ">=",
-
-	LPAREN:    "(",
-	RPAREN:    ")",
-	COMMA:     ",",
-	COLON:     ":",
-	SEMICOLON: ";",
-	DOT:       ".",
-
-	ALL:           "ALL",
-	ALTER:         "ALTER",
-	ANY:           "ANY",
-	AS:            "AS",
-	ASC:           "ASC",
-	BEGIN:         "BEGIN",
-	BY:            "BY",
-	CREATE:        "CREATE",
-	CONTINUOUS:    "CONTINUOUS",
-	DATABASE:      "DATABASE",
-	DATABASES:     "DATABASES",
-	DEFAULT:       "DEFAULT",
-	DELETE:        "DELETE",
-	DESC:          "DESC",
-	DESTINATIONS:  "DESTINATIONS",
-	DIAGNOSTICS:   "DIAGNOSTICS",
-	DISTINCT:      "DISTINCT",
-	DROP:          "DROP",
-	DURATION:      "DURATION",
-	END:           "END",
-	EXISTS:        "EXISTS",
-	EXPLAIN:       "EXPLAIN",
-	FIELD:         "FIELD",
-	FOR:           "FOR",
-	FORCE:         "FORCE",
-	FROM:          "FROM",
-	GRANT:         "GRANT",
-	GRANTS:        "GRANTS",
-	GROUP:         "GROUP",
-	IF:            "IF",
-	IN:            "IN",
-	INF:           "INF",
-	INNER:         "INNER",
-	INSERT:        "INSERT",
-	INTO:          "INTO",
-	KEY:           "KEY",
-	KEYS:          "KEYS",
-	LIMIT:         "LIMIT",
-	MEASUREMENT:   "MEASUREMENT",
-	MEASUREMENTS:  "MEASUREMENTS",
-	NOT:           "NOT",
-	OFFSET:        "OFFSET",
-	ON:            "ON",
-	ORDER:         "ORDER",
-	PASSWORD:      "PASSWORD",
-	POLICY:        "POLICY",
-	POLICIES:      "POLICIES",
-	PRIVILEGES:    "PRIVILEGES",
-	QUERIES:       "QUERIES",
-	QUERY:         "QUERY",
-	READ:          "READ",
-	REPLICATION:   "REPLICATION",
-	RETENTION:     "RETENTION",
-	REVOKE:        "REVOKE",
-	SELECT:        "SELECT",
-	SERIES:        "SERIES",
-	SERVER:        "SERVER",
-	SERVERS:       "SERVERS",
-	SET:           "SET",
-	SHOW:          "SHOW",
-	SHARDS:        "SHARDS",
-	SLIMIT:        "SLIMIT",
-	SOFFSET:       "SOFFSET",
-	STATS:         "STATS",
-	SUBSCRIPTION:  "SUBSCRIPTION",
-	SUBSCRIPTIONS: "SUBSCRIPTIONS",
-	TAG:           "TAG",
-	TO:            "TO",
-	USER:          "USER",
-	USERS:         "USERS",
-	VALUES:        "VALUES",
-	WHERE:         "WHERE",
-	WITH:          "WITH",
-	WRITE:         "WRITE",
-}
-
-var keywords map[string]Token
-
-func init() {
-	keywords = make(map[string]Token)
-	for tok := keyword_beg + 1; tok < keyword_end; tok++ {
-		keywords[strings.ToLower(tokens[tok])] = tok
-	}
-	for _, tok := range []Token{AND, OR} {
-		keywords[strings.ToLower(tokens[tok])] = tok
-	}
-	keywords["true"] = TRUE
-	keywords["false"] = FALSE
-}
-
-// String returns the string representation of the token.
-func (tok Token) String() string {
-	if tok >= 0 && tok < Token(len(tokens)) {
-		return tokens[tok]
-	}
-	return ""
-}
-
-// Precedence returns the operator precedence of the binary operator token.
-func (tok Token) Precedence() int {
-	switch tok {
-	case OR:
-		return 1
-	case AND:
-		return 2
-	case EQ, NEQ, EQREGEX, NEQREGEX, LT, LTE, GT, GTE:
-		return 3
-	case ADD, SUB:
-		return 4
-	case MUL, DIV:
-		return 5
-	}
-	return 0
-}
-
-// isOperator returns true for operator tokens.
-func (tok Token) isOperator() bool { return tok > operator_beg && tok < operator_end }
-
-// tokstr returns a literal if provided, otherwise returns the token string.
-func tokstr(tok Token, lit string) string {
-	if lit != "" {
-		return lit
-	}
-	return tok.String()
-}
-
-// Lookup returns the token associated with a given string.
-func Lookup(ident string) Token {
-	if tok, ok := keywords[strings.ToLower(ident)]; ok {
-		return tok
-	}
-	return IDENT
-}
-
-// Pos specifies the line and character position of a token.
-// The Char and Line are both zero-based indexes.
-type Pos struct {
-	Line int
-	Char int
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/influxvar.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/influxvar.go
deleted file mode 100644
index 58455515a..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/influxvar.go
+++ /dev/null
@@ -1,45 +0,0 @@
-package influxdb
-
-import (
-	"expvar"
-	"sync"
-)
-
-var expvarMu sync.Mutex
-
-// NewStatistics returns an expvar-based map with the given key. Within that map
-// is another map. Within there "name" is the Measurement name, "tags" are the tags,
-// and values are placed at the key "values".
-func NewStatistics(key, name string, tags map[string]string) *expvar.Map {
-	expvarMu.Lock()
-	defer expvarMu.Unlock()
-
-	// Add expvar for this service.
-	var v expvar.Var
-	if v = expvar.Get(key); v == nil {
-		v = expvar.NewMap(key)
-	}
-	m := v.(*expvar.Map)
-
-	// Set the name
-	nameVar := &expvar.String{}
-	nameVar.Set(name)
-	m.Set("name", nameVar)
-
-	// Set the tags
-	tagsVar := &expvar.Map{}
-	tagsVar.Init()
-	for k, v := range tags {
-		value := &expvar.String{}
-		value.Set(v)
-		tagsVar.Set(k, value)
-	}
-	m.Set("tags", tagsVar)
-
-	// Create and set the values entry used for actual stats.
-	statMap := &expvar.Map{}
-	statMap.Init()
-	m.Set("values", statMap)
-
-	return statMap
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/meta/config.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/meta/config.go
deleted file mode 100644
index 62b9b4cda..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/meta/config.go
+++ /dev/null
@@ -1,59 +0,0 @@
-package meta
-
-import (
-	"time"
-
-	"github.com/influxdb/influxdb/toml"
-)
-
-const (
-	// DefaultHostname is the default hostname if one is not provided.
-	DefaultHostname = "localhost"
-
-	// DefaultBindAddress is the default address to bind to.
-	DefaultBindAddress = ":8088"
-
-	// DefaultHeartbeatTimeout is the default heartbeat timeout for the store.
-	DefaultHeartbeatTimeout = 1000 * time.Millisecond
-
-	// DefaultElectionTimeout is the default election timeout for the store.
-	DefaultElectionTimeout = 1000 * time.Millisecond
-
-	// DefaultLeaderLeaseTimeout is the default leader lease for the store.
-	DefaultLeaderLeaseTimeout = 500 * time.Millisecond
-
-	// DefaultCommitTimeout is the default commit timeout for the store.
-	DefaultCommitTimeout = 50 * time.Millisecond
-
-	// DefaultRaftPromotionEnabled is the default for auto promoting a node to a raft node when needed
-	DefaultRaftPromotionEnabled = true
-)
-
-// Config represents the meta configuration.
-type Config struct {
-	Dir                  string        `toml:"dir"`
-	Hostname             string        `toml:"hostname"`
-	BindAddress          string        `toml:"bind-address"`
-	Peers                []string      `toml:"-"`
-	RetentionAutoCreate  bool          `toml:"retention-autocreate"`
-	ElectionTimeout      toml.Duration `toml:"election-timeout"`
-	HeartbeatTimeout     toml.Duration `toml:"heartbeat-timeout"`
-	LeaderLeaseTimeout   toml.Duration `toml:"leader-lease-timeout"`
-	CommitTimeout        toml.Duration `toml:"commit-timeout"`
-	ClusterTracing       bool          `toml:"cluster-tracing"`
-	RaftPromotionEnabled bool          `toml:"raft-promotion-enabled"`
-}
-
-// NewConfig builds a new configuration with default values.
-func NewConfig() *Config {
-	return &Config{
-		Hostname:             DefaultHostname,
-		BindAddress:          DefaultBindAddress,
-		RetentionAutoCreate:  true,
-		ElectionTimeout:      toml.Duration(DefaultElectionTimeout),
-		HeartbeatTimeout:     toml.Duration(DefaultHeartbeatTimeout),
-		LeaderLeaseTimeout:   toml.Duration(DefaultLeaderLeaseTimeout),
-		CommitTimeout:        toml.Duration(DefaultCommitTimeout),
-		RaftPromotionEnabled: DefaultRaftPromotionEnabled,
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/meta/config_test.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/meta/config_test.go
deleted file mode 100644
index 8032ebb74..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/meta/config_test.go
+++ /dev/null
@@ -1,39 +0,0 @@
-package meta_test
-
-import (
-	"testing"
-	"time"
-
-	"github.com/BurntSushi/toml"
-	"github.com/influxdb/influxdb/meta"
-)
-
-func TestConfig_Parse(t *testing.T) {
-	// Parse configuration.
-	var c meta.Config
-	if _, err := toml.Decode(`
-dir = "/tmp/foo"
-election-timeout = "10s"
-heartbeat-timeout = "20s"
-leader-lease-timeout = "30h"
-commit-timeout = "40m"
-raft-promotion-enabled = false
-`, &c); err != nil {
-		t.Fatal(err)
-	}
-
-	// Validate configuration.
-	if c.Dir != "/tmp/foo" {
-		t.Fatalf("unexpected dir: %s", c.Dir)
-	} else if time.Duration(c.ElectionTimeout) != 10*time.Second {
-		t.Fatalf("unexpected election timeout: %v", c.ElectionTimeout)
-	} else if time.Duration(c.HeartbeatTimeout) != 20*time.Second {
-		t.Fatalf("unexpected heartbeat timeout: %v", c.HeartbeatTimeout)
-	} else if time.Duration(c.LeaderLeaseTimeout) != 30*time.Hour {
-		t.Fatalf("unexpected leader lease timeout: %v", c.LeaderLeaseTimeout)
-	} else if time.Duration(c.CommitTimeout) != 40*time.Minute {
-		t.Fatalf("unexpected commit timeout: %v", c.CommitTimeout)
-	} else if c.RaftPromotionEnabled {
-		t.Fatalf("unexpected raft promotion enabled: %v", c.RaftPromotionEnabled)
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/meta/data.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/meta/data.go
deleted file mode 100644
index 0d934c561..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/meta/data.go
+++ /dev/null
@@ -1,1294 +0,0 @@
-package meta
-
-import (
-	"sort"
-	"time"
-
-	"github.com/gogo/protobuf/proto"
-	"github.com/influxdb/influxdb/influxql"
-	"github.com/influxdb/influxdb/meta/internal"
-)
-
-//go:generate protoc --gogo_out=. internal/meta.proto
-
-const (
-	// DefaultRetentionPolicyReplicaN is the default value of RetentionPolicyInfo.ReplicaN.
-	DefaultRetentionPolicyReplicaN = 1
-
-	// DefaultRetentionPolicyDuration is the default value of RetentionPolicyInfo.Duration.
-	DefaultRetentionPolicyDuration = 7 * (24 * time.Hour)
-
-	// MinRetentionPolicyDuration represents the minimum duration for a policy.
-	MinRetentionPolicyDuration = time.Hour
-)
-
-// Data represents the top level collection of all metadata.
-type Data struct {
-	Term      uint64 // associated raft term
-	Index     uint64 // associated raft index
-	ClusterID uint64
-	Nodes     []NodeInfo
-	Databases []DatabaseInfo
-	Users     []UserInfo
-
-	MaxNodeID       uint64
-	MaxShardGroupID uint64
-	MaxShardID      uint64
-}
-
-// Node returns a node by id.
-func (data *Data) Node(id uint64) *NodeInfo {
-	for i := range data.Nodes {
-		if data.Nodes[i].ID == id {
-			return &data.Nodes[i]
-		}
-	}
-	return nil
-}
-
-// NodeByHost returns a node by hostname.
-func (data *Data) NodeByHost(host string) *NodeInfo {
-	for i := range data.Nodes {
-		if data.Nodes[i].Host == host {
-			return &data.Nodes[i]
-		}
-	}
-	return nil
-}
-
-// CreateNode adds a node to the metadata.
-func (data *Data) CreateNode(host string) error {
-	// Ensure a node with the same host doesn't already exist.
-	if data.NodeByHost(host) != nil {
-		return ErrNodeExists
-	}
-
-	// Append new node.
-	data.MaxNodeID++
-	data.Nodes = append(data.Nodes, NodeInfo{
-		ID:   data.MaxNodeID,
-		Host: host,
-	})
-
-	return nil
-}
-
-// DeleteNode removes a node from the metadata.
-func (data *Data) DeleteNode(id uint64, force bool) error {
-	// Node has to be larger than 0 to be real
-	if id == 0 {
-		return ErrNodeIDRequired
-	}
-	// Is this a valid node?
-	nodeInfo := data.Node(id)
-	if nodeInfo == nil {
-		return ErrNodeNotFound
-	}
-
-	// Am I the only node?  If so, nothing to do
-	if len(data.Nodes) == 1 {
-		return ErrNodeUnableToDropFinalNode
-	}
-
-	// Determine if there are any any non-replicated nodes and force was not specified
-	if !force {
-		for _, d := range data.Databases {
-			for _, rp := range d.RetentionPolicies {
-				// ignore replicated retention policies
-				if rp.ReplicaN > 1 {
-					continue
-				}
-				for _, sg := range rp.ShardGroups {
-					for _, s := range sg.Shards {
-						if s.OwnedBy(id) && len(s.Owners) == 1 {
-							return ErrShardNotReplicated
-						}
-					}
-				}
-			}
-		}
-	}
-
-	// Remove node id from all shard infos
-	for di, d := range data.Databases {
-		for ri, rp := range d.RetentionPolicies {
-			for sgi, sg := range rp.ShardGroups {
-				for si, s := range sg.Shards {
-					if s.OwnedBy(id) {
-						var owners []ShardOwner
-						for _, o := range s.Owners {
-							if o.NodeID != id {
-								owners = append(owners, o)
-							}
-						}
-						data.Databases[di].RetentionPolicies[ri].ShardGroups[sgi].Shards[si].Owners = owners
-					}
-				}
-			}
-		}
-	}
-
-	// Remove this node from the in memory nodes
-	var nodes []NodeInfo
-	for _, n := range data.Nodes {
-		if n.ID == id {
-			continue
-		}
-		nodes = append(nodes, n)
-	}
-	data.Nodes = nodes
-
-	return nil
-}
-
-// Database returns a database by name.
-func (data *Data) Database(name string) *DatabaseInfo {
-	for i := range data.Databases {
-		if data.Databases[i].Name == name {
-			return &data.Databases[i]
-		}
-	}
-	return nil
-}
-
-// CreateDatabase creates a new database.
-// Returns an error if name is blank or if a database with the same name already exists.
-func (data *Data) CreateDatabase(name string) error {
-	if name == "" {
-		return ErrDatabaseNameRequired
-	} else if data.Database(name) != nil {
-		return ErrDatabaseExists
-	}
-
-	// Append new node.
-	data.Databases = append(data.Databases, DatabaseInfo{Name: name})
-
-	return nil
-}
-
-// DropDatabase removes a database by name.
-func (data *Data) DropDatabase(name string) error {
-	for i := range data.Databases {
-		if data.Databases[i].Name == name {
-			data.Databases = append(data.Databases[:i], data.Databases[i+1:]...)
-			return nil
-		}
-	}
-	return ErrDatabaseNotFound
-}
-
-// RetentionPolicy returns a retention policy for a database by name.
-func (data *Data) RetentionPolicy(database, name string) (*RetentionPolicyInfo, error) {
-	di := data.Database(database)
-	if di == nil {
-		return nil, ErrDatabaseNotFound
-	}
-
-	for i := range di.RetentionPolicies {
-		if di.RetentionPolicies[i].Name == name {
-			return &di.RetentionPolicies[i], nil
-		}
-	}
-	return nil, nil
-}
-
-// CreateRetentionPolicy creates a new retention policy on a database.
-// Returns an error if name is blank or if a database does not exist.
-func (data *Data) CreateRetentionPolicy(database string, rpi *RetentionPolicyInfo) error {
-	// Validate retention policy.
-	if rpi.Name == "" {
-		return ErrRetentionPolicyNameRequired
-	} else if rpi.ReplicaN < 1 {
-		return ErrReplicationFactorTooLow
-	}
-
-	// Find database.
-	di := data.Database(database)
-	if di == nil {
-		return ErrDatabaseNotFound
-	} else if di.RetentionPolicy(rpi.Name) != nil {
-		return ErrRetentionPolicyExists
-	}
-
-	// Append new policy.
-	di.RetentionPolicies = append(di.RetentionPolicies, RetentionPolicyInfo{
-		Name:               rpi.Name,
-		Duration:           rpi.Duration,
-		ShardGroupDuration: shardGroupDuration(rpi.Duration),
-		ReplicaN:           rpi.ReplicaN,
-	})
-
-	return nil
-}
-
-// DropRetentionPolicy removes a retention policy from a database by name.
-func (data *Data) DropRetentionPolicy(database, name string) error {
-	// Find database.
-	di := data.Database(database)
-	if di == nil {
-		return ErrDatabaseNotFound
-	}
-
-	// Prohibit dropping the default retention policy.
-	if di.DefaultRetentionPolicy == name {
-		return ErrRetentionPolicyDefault
-	}
-
-	// Remove from list.
-	for i := range di.RetentionPolicies {
-		if di.RetentionPolicies[i].Name == name {
-			di.RetentionPolicies = append(di.RetentionPolicies[:i], di.RetentionPolicies[i+1:]...)
-			return nil
-		}
-	}
-	return ErrRetentionPolicyNotFound
-}
-
-// UpdateRetentionPolicy updates an existing retention policy.
-func (data *Data) UpdateRetentionPolicy(database, name string, rpu *RetentionPolicyUpdate) error {
-	// Find database.
-	di := data.Database(database)
-	if di == nil {
-		return ErrDatabaseNotFound
-	}
-
-	// Find policy.
-	rpi := di.RetentionPolicy(name)
-	if rpi == nil {
-		return ErrRetentionPolicyNotFound
-	}
-
-	// Ensure new policy doesn't match an existing policy.
-	if rpu.Name != nil && *rpu.Name != name && di.RetentionPolicy(*rpu.Name) != nil {
-		return ErrRetentionPolicyNameExists
-	}
-
-	// Enforce duration of at least MinRetentionPolicyDuration
-	if rpu.Duration != nil && *rpu.Duration < MinRetentionPolicyDuration && *rpu.Duration != 0 {
-		return ErrRetentionPolicyDurationTooLow
-	}
-
-	// Update fields.
-	if rpu.Name != nil {
-		rpi.Name = *rpu.Name
-	}
-	if rpu.Duration != nil {
-		rpi.Duration = *rpu.Duration
-		rpi.ShardGroupDuration = shardGroupDuration(rpi.Duration)
-	}
-	if rpu.ReplicaN != nil {
-		rpi.ReplicaN = *rpu.ReplicaN
-	}
-
-	return nil
-}
-
-// SetDefaultRetentionPolicy sets the default retention policy for a database.
-func (data *Data) SetDefaultRetentionPolicy(database, name string) error {
-	// Find database and verify policy exists.
-	di := data.Database(database)
-	if di == nil {
-		return ErrDatabaseNotFound
-	} else if di.RetentionPolicy(name) == nil {
-		return ErrRetentionPolicyNotFound
-	}
-
-	// Set default policy.
-	di.DefaultRetentionPolicy = name
-
-	return nil
-}
-
-// ShardGroups returns a list of all shard groups on a database and policy.
-func (data *Data) ShardGroups(database, policy string) ([]ShardGroupInfo, error) {
-	// Find retention policy.
-	rpi, err := data.RetentionPolicy(database, policy)
-	if err != nil {
-		return nil, err
-	} else if rpi == nil {
-		return nil, ErrRetentionPolicyNotFound
-	}
-	groups := make([]ShardGroupInfo, 0, len(rpi.ShardGroups))
-	for _, g := range rpi.ShardGroups {
-		if g.Deleted() {
-			continue
-		}
-		groups = append(groups, g)
-	}
-	return groups, nil
-}
-
-// ShardGroupsByTimeRange returns a list of all shard groups on a database and policy that may contain data
-// for the specified time range. Shard groups are sorted by start time.
-func (data *Data) ShardGroupsByTimeRange(database, policy string, tmin, tmax time.Time) ([]ShardGroupInfo, error) {
-	// Find retention policy.
-	rpi, err := data.RetentionPolicy(database, policy)
-	if err != nil {
-		return nil, err
-	} else if rpi == nil {
-		return nil, ErrRetentionPolicyNotFound
-	}
-	groups := make([]ShardGroupInfo, 0, len(rpi.ShardGroups))
-	for _, g := range rpi.ShardGroups {
-		if g.Deleted() || !g.Overlaps(tmin, tmax) {
-			continue
-		}
-		groups = append(groups, g)
-	}
-	return groups, nil
-}
-
-// ShardGroupByTimestamp returns the shard group on a database and policy for a given timestamp.
-func (data *Data) ShardGroupByTimestamp(database, policy string, timestamp time.Time) (*ShardGroupInfo, error) {
-	// Find retention policy.
-	rpi, err := data.RetentionPolicy(database, policy)
-	if err != nil {
-		return nil, err
-	} else if rpi == nil {
-		return nil, ErrRetentionPolicyNotFound
-	}
-
-	return rpi.ShardGroupByTimestamp(timestamp), nil
-}
-
-// CreateShardGroup creates a shard group on a database and policy for a given timestamp.
-func (data *Data) CreateShardGroup(database, policy string, timestamp time.Time) error {
-	// Ensure there are nodes in the metadata.
-	if len(data.Nodes) == 0 {
-		return ErrNodesRequired
-	}
-
-	// Find retention policy.
-	rpi, err := data.RetentionPolicy(database, policy)
-	if err != nil {
-		return err
-	} else if rpi == nil {
-		return ErrRetentionPolicyNotFound
-	}
-
-	// Verify that shard group doesn't already exist for this timestamp.
-	if rpi.ShardGroupByTimestamp(timestamp) != nil {
-		return ErrShardGroupExists
-	}
-
-	// Require at least one replica but no more replicas than nodes.
-	replicaN := rpi.ReplicaN
-	if replicaN == 0 {
-		replicaN = 1
-	} else if replicaN > len(data.Nodes) {
-		replicaN = len(data.Nodes)
-	}
-
-	// Determine shard count by node count divided by replication factor.
-	// This will ensure nodes will get distributed across nodes evenly and
-	// replicated the correct number of times.
-	shardN := len(data.Nodes) / replicaN
-
-	// Create the shard group.
-	data.MaxShardGroupID++
-	sgi := ShardGroupInfo{}
-	sgi.ID = data.MaxShardGroupID
-	sgi.StartTime = timestamp.Truncate(rpi.ShardGroupDuration).UTC()
-	sgi.EndTime = sgi.StartTime.Add(rpi.ShardGroupDuration).UTC()
-
-	// Create shards on the group.
-	sgi.Shards = make([]ShardInfo, shardN)
-	for i := range sgi.Shards {
-		data.MaxShardID++
-		sgi.Shards[i] = ShardInfo{ID: data.MaxShardID}
-	}
-
-	// Assign data nodes to shards via round robin.
-	// Start from a repeatably "random" place in the node list.
-	nodeIndex := int(data.Index % uint64(len(data.Nodes)))
-	for i := range sgi.Shards {
-		si := &sgi.Shards[i]
-		for j := 0; j < replicaN; j++ {
-			nodeID := data.Nodes[nodeIndex%len(data.Nodes)].ID
-			si.Owners = append(si.Owners, ShardOwner{NodeID: nodeID})
-			nodeIndex++
-		}
-	}
-
-	// Retention policy has a new shard group, so update the policy. Shard
-	// Groups must be stored in sorted order, as other parts of the system
-	// assume this to be the case.
-	rpi.ShardGroups = append(rpi.ShardGroups, sgi)
-	sort.Sort(ShardGroupInfos(rpi.ShardGroups))
-
-	return nil
-}
-
-// DeleteShardGroup removes a shard group from a database and retention policy by id.
-func (data *Data) DeleteShardGroup(database, policy string, id uint64) error {
-	// Find retention policy.
-	rpi, err := data.RetentionPolicy(database, policy)
-	if err != nil {
-		return err
-	} else if rpi == nil {
-		return ErrRetentionPolicyNotFound
-	}
-
-	// Find shard group by ID and set its deletion timestamp.
-	for i := range rpi.ShardGroups {
-		if rpi.ShardGroups[i].ID == id {
-			rpi.ShardGroups[i].DeletedAt = time.Now().UTC()
-			return nil
-		}
-	}
-
-	return ErrShardGroupNotFound
-}
-
-// CreateContinuousQuery adds a named continuous query to a database.
-func (data *Data) CreateContinuousQuery(database, name, query string) error {
-	di := data.Database(database)
-	if di == nil {
-		return ErrDatabaseNotFound
-	}
-
-	// Ensure the name doesn't already exist.
-	for i := range di.ContinuousQueries {
-		if di.ContinuousQueries[i].Name == name {
-			return ErrContinuousQueryExists
-		}
-	}
-
-	// Append new query.
-	di.ContinuousQueries = append(di.ContinuousQueries, ContinuousQueryInfo{
-		Name:  name,
-		Query: query,
-	})
-
-	return nil
-}
-
-// DropContinuousQuery removes a continuous query.
-func (data *Data) DropContinuousQuery(database, name string) error {
-	di := data.Database(database)
-	if di == nil {
-		return ErrDatabaseNotFound
-	}
-
-	for i := range di.ContinuousQueries {
-		if di.ContinuousQueries[i].Name == name {
-			di.ContinuousQueries = append(di.ContinuousQueries[:i], di.ContinuousQueries[i+1:]...)
-			return nil
-		}
-	}
-	return ErrContinuousQueryNotFound
-}
-
-// CreateSubscription adds a named subscription to a database and retention policy.
-func (data *Data) CreateSubscription(database, rp, name, mode string, destinations []string) error {
-	rpi, err := data.RetentionPolicy(database, rp)
-	if err != nil {
-		return err
-	}
-	if rpi == nil {
-		return ErrRetentionPolicyNotFound
-	}
-
-	// Ensure the name doesn't already exist.
-	for i := range rpi.Subscriptions {
-		if rpi.Subscriptions[i].Name == name {
-			return ErrSubscriptionExists
-		}
-	}
-
-	// Append new query.
-	rpi.Subscriptions = append(rpi.Subscriptions, SubscriptionInfo{
-		Name:         name,
-		Mode:         mode,
-		Destinations: destinations,
-	})
-
-	return nil
-}
-
-// DropSubscription removes a subscription.
-func (data *Data) DropSubscription(database, rp, name string) error {
-	rpi, err := data.RetentionPolicy(database, rp)
-	if err != nil {
-		return err
-	}
-
-	for i := range rpi.Subscriptions {
-		if rpi.Subscriptions[i].Name == name {
-			rpi.Subscriptions = append(rpi.Subscriptions[:i], rpi.Subscriptions[i+1:]...)
-			return nil
-		}
-	}
-	return ErrSubscriptionNotFound
-}
-
-// User returns a user by username.
-func (data *Data) User(username string) *UserInfo {
-	for i := range data.Users {
-		if data.Users[i].Name == username {
-			return &data.Users[i]
-		}
-	}
-	return nil
-}
-
-// CreateUser creates a new user.
-func (data *Data) CreateUser(name, hash string, admin bool) error {
-	// Ensure the user doesn't already exist.
-	if name == "" {
-		return ErrUsernameRequired
-	} else if data.User(name) != nil {
-		return ErrUserExists
-	}
-
-	// Append new user.
-	data.Users = append(data.Users, UserInfo{
-		Name:  name,
-		Hash:  hash,
-		Admin: admin,
-	})
-
-	return nil
-}
-
-// DropUser removes an existing user by name.
-func (data *Data) DropUser(name string) error {
-	for i := range data.Users {
-		if data.Users[i].Name == name {
-			data.Users = append(data.Users[:i], data.Users[i+1:]...)
-			return nil
-		}
-	}
-	return ErrUserNotFound
-}
-
-// UpdateUser updates the password hash of an existing user.
-func (data *Data) UpdateUser(name, hash string) error {
-	for i := range data.Users {
-		if data.Users[i].Name == name {
-			data.Users[i].Hash = hash
-			return nil
-		}
-	}
-	return ErrUserNotFound
-}
-
-// SetPrivilege sets a privilege for a user on a database.
-func (data *Data) SetPrivilege(name, database string, p influxql.Privilege) error {
-	ui := data.User(name)
-	if ui == nil {
-		return ErrUserNotFound
-	}
-
-	if ui.Privileges == nil {
-		ui.Privileges = make(map[string]influxql.Privilege)
-	}
-	ui.Privileges[database] = p
-
-	return nil
-}
-
-// SetAdminPrivilege sets the admin privilege for a user.
-func (data *Data) SetAdminPrivilege(name string, admin bool) error {
-	ui := data.User(name)
-	if ui == nil {
-		return ErrUserNotFound
-	}
-
-	ui.Admin = admin
-
-	return nil
-}
-
-// UserPrivileges gets the privileges for a user.
-func (data *Data) UserPrivileges(name string) (map[string]influxql.Privilege, error) {
-	ui := data.User(name)
-	if ui == nil {
-		return nil, ErrUserNotFound
-	}
-
-	return ui.Privileges, nil
-}
-
-// UserPrivilege gets the privilege for a user on a database.
-func (data *Data) UserPrivilege(name, database string) (*influxql.Privilege, error) {
-	ui := data.User(name)
-	if ui == nil {
-		return nil, ErrUserNotFound
-	}
-
-	for db, p := range ui.Privileges {
-		if db == database {
-			return &p, nil
-		}
-	}
-
-	return influxql.NewPrivilege(influxql.NoPrivileges), nil
-}
-
-// Clone returns a copy of data with a new version.
-func (data *Data) Clone() *Data {
-	other := *data
-
-	// Copy nodes.
-	if data.Nodes != nil {
-		other.Nodes = make([]NodeInfo, len(data.Nodes))
-		for i := range data.Nodes {
-			other.Nodes[i] = data.Nodes[i].clone()
-		}
-	}
-
-	// Deep copy databases.
-	if data.Databases != nil {
-		other.Databases = make([]DatabaseInfo, len(data.Databases))
-		for i := range data.Databases {
-			other.Databases[i] = data.Databases[i].clone()
-		}
-	}
-
-	// Copy users.
-	if data.Users != nil {
-		other.Users = make([]UserInfo, len(data.Users))
-		for i := range data.Users {
-			other.Users[i] = data.Users[i].clone()
-		}
-	}
-
-	return &other
-}
-
-// marshal serializes to a protobuf representation.
-func (data *Data) marshal() *internal.Data {
-	pb := &internal.Data{
-		Term:      proto.Uint64(data.Term),
-		Index:     proto.Uint64(data.Index),
-		ClusterID: proto.Uint64(data.ClusterID),
-
-		MaxNodeID:       proto.Uint64(data.MaxNodeID),
-		MaxShardGroupID: proto.Uint64(data.MaxShardGroupID),
-		MaxShardID:      proto.Uint64(data.MaxShardID),
-	}
-
-	pb.Nodes = make([]*internal.NodeInfo, len(data.Nodes))
-	for i := range data.Nodes {
-		pb.Nodes[i] = data.Nodes[i].marshal()
-	}
-
-	pb.Databases = make([]*internal.DatabaseInfo, len(data.Databases))
-	for i := range data.Databases {
-		pb.Databases[i] = data.Databases[i].marshal()
-	}
-
-	pb.Users = make([]*internal.UserInfo, len(data.Users))
-	for i := range data.Users {
-		pb.Users[i] = data.Users[i].marshal()
-	}
-
-	return pb
-}
-
-// unmarshal deserializes from a protobuf representation.
-func (data *Data) unmarshal(pb *internal.Data) {
-	data.Term = pb.GetTerm()
-	data.Index = pb.GetIndex()
-	data.ClusterID = pb.GetClusterID()
-
-	data.MaxNodeID = pb.GetMaxNodeID()
-	data.MaxShardGroupID = pb.GetMaxShardGroupID()
-	data.MaxShardID = pb.GetMaxShardID()
-
-	data.Nodes = make([]NodeInfo, len(pb.GetNodes()))
-	for i, x := range pb.GetNodes() {
-		data.Nodes[i].unmarshal(x)
-	}
-
-	data.Databases = make([]DatabaseInfo, len(pb.GetDatabases()))
-	for i, x := range pb.GetDatabases() {
-		data.Databases[i].unmarshal(x)
-	}
-
-	data.Users = make([]UserInfo, len(pb.GetUsers()))
-	for i, x := range pb.GetUsers() {
-		data.Users[i].unmarshal(x)
-	}
-}
-
-// MarshalBinary encodes the metadata to a binary format.
-func (data *Data) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(data.marshal())
-}
-
-// UnmarshalBinary decodes the object from a binary format.
-func (data *Data) UnmarshalBinary(buf []byte) error {
-	var pb internal.Data
-	if err := proto.Unmarshal(buf, &pb); err != nil {
-		return err
-	}
-	data.unmarshal(&pb)
-	return nil
-}
-
-// NodeInfo represents information about a single node in the cluster.
-type NodeInfo struct {
-	ID   uint64
-	Host string
-}
-
-// clone returns a deep copy of ni.
-func (ni NodeInfo) clone() NodeInfo { return ni }
-
-// marshal serializes to a protobuf representation.
-func (ni NodeInfo) marshal() *internal.NodeInfo {
-	pb := &internal.NodeInfo{}
-	pb.ID = proto.Uint64(ni.ID)
-	pb.Host = proto.String(ni.Host)
-	return pb
-}
-
-// unmarshal deserializes from a protobuf representation.
-func (ni *NodeInfo) unmarshal(pb *internal.NodeInfo) {
-	ni.ID = pb.GetID()
-	ni.Host = pb.GetHost()
-}
-
-// NodeInfos is a slice of NodeInfo used for sorting
-type NodeInfos []NodeInfo
-
-func (n NodeInfos) Len() int           { return len(n) }
-func (n NodeInfos) Swap(i, j int)      { n[i], n[j] = n[j], n[i] }
-func (n NodeInfos) Less(i, j int) bool { return n[i].ID < n[j].ID }
-
-// DatabaseInfo represents information about a database in the system.
-type DatabaseInfo struct {
-	Name                   string
-	DefaultRetentionPolicy string
-	RetentionPolicies      []RetentionPolicyInfo
-	ContinuousQueries      []ContinuousQueryInfo
-}
-
-// RetentionPolicy returns a retention policy by name.
-func (di DatabaseInfo) RetentionPolicy(name string) *RetentionPolicyInfo {
-	for i := range di.RetentionPolicies {
-		if di.RetentionPolicies[i].Name == name {
-			return &di.RetentionPolicies[i]
-		}
-	}
-	return nil
-}
-
-// ShardInfos returns a list of all shards' info for the database.
-func (di DatabaseInfo) ShardInfos() []ShardInfo {
-	shards := map[uint64]*ShardInfo{}
-	for i := range di.RetentionPolicies {
-		for j := range di.RetentionPolicies[i].ShardGroups {
-			sg := di.RetentionPolicies[i].ShardGroups[j]
-			// Skip deleted shard groups
-			if sg.Deleted() {
-				continue
-			}
-			for k := range sg.Shards {
-				si := &di.RetentionPolicies[i].ShardGroups[j].Shards[k]
-				shards[si.ID] = si
-			}
-		}
-	}
-
-	infos := make([]ShardInfo, 0, len(shards))
-	for _, info := range shards {
-		infos = append(infos, *info)
-	}
-
-	return infos
-}
-
-// clone returns a deep copy of di.
-func (di DatabaseInfo) clone() DatabaseInfo {
-	other := di
-
-	if di.RetentionPolicies != nil {
-		other.RetentionPolicies = make([]RetentionPolicyInfo, len(di.RetentionPolicies))
-		for i := range di.RetentionPolicies {
-			other.RetentionPolicies[i] = di.RetentionPolicies[i].clone()
-		}
-	}
-
-	// Copy continuous queries.
-	if di.ContinuousQueries != nil {
-		other.ContinuousQueries = make([]ContinuousQueryInfo, len(di.ContinuousQueries))
-		for i := range di.ContinuousQueries {
-			other.ContinuousQueries[i] = di.ContinuousQueries[i].clone()
-		}
-	}
-
-	return other
-}
-
-// marshal serializes to a protobuf representation.
-func (di DatabaseInfo) marshal() *internal.DatabaseInfo {
-	pb := &internal.DatabaseInfo{}
-	pb.Name = proto.String(di.Name)
-	pb.DefaultRetentionPolicy = proto.String(di.DefaultRetentionPolicy)
-
-	pb.RetentionPolicies = make([]*internal.RetentionPolicyInfo, len(di.RetentionPolicies))
-	for i := range di.RetentionPolicies {
-		pb.RetentionPolicies[i] = di.RetentionPolicies[i].marshal()
-	}
-
-	pb.ContinuousQueries = make([]*internal.ContinuousQueryInfo, len(di.ContinuousQueries))
-	for i := range di.ContinuousQueries {
-		pb.ContinuousQueries[i] = di.ContinuousQueries[i].marshal()
-	}
-	return pb
-}
-
-// unmarshal deserializes from a protobuf representation.
-func (di *DatabaseInfo) unmarshal(pb *internal.DatabaseInfo) {
-	di.Name = pb.GetName()
-	di.DefaultRetentionPolicy = pb.GetDefaultRetentionPolicy()
-
-	if len(pb.GetRetentionPolicies()) > 0 {
-		di.RetentionPolicies = make([]RetentionPolicyInfo, len(pb.GetRetentionPolicies()))
-		for i, x := range pb.GetRetentionPolicies() {
-			di.RetentionPolicies[i].unmarshal(x)
-		}
-	}
-
-	if len(pb.GetContinuousQueries()) > 0 {
-		di.ContinuousQueries = make([]ContinuousQueryInfo, len(pb.GetContinuousQueries()))
-		for i, x := range pb.GetContinuousQueries() {
-			di.ContinuousQueries[i].unmarshal(x)
-		}
-	}
-}
-
-// RetentionPolicyInfo represents metadata about a retention policy.
-type RetentionPolicyInfo struct {
-	Name               string
-	ReplicaN           int
-	Duration           time.Duration
-	ShardGroupDuration time.Duration
-	ShardGroups        []ShardGroupInfo
-	Subscriptions      []SubscriptionInfo
-}
-
-// NewRetentionPolicyInfo returns a new instance of RetentionPolicyInfo with defaults set.
-func NewRetentionPolicyInfo(name string) *RetentionPolicyInfo {
-	return &RetentionPolicyInfo{
-		Name:     name,
-		ReplicaN: DefaultRetentionPolicyReplicaN,
-		Duration: DefaultRetentionPolicyDuration,
-	}
-}
-
-// ShardGroupByTimestamp returns the shard group in the policy that contains the timestamp.
-func (rpi *RetentionPolicyInfo) ShardGroupByTimestamp(timestamp time.Time) *ShardGroupInfo {
-	for i := range rpi.ShardGroups {
-		if rpi.ShardGroups[i].Contains(timestamp) && !rpi.ShardGroups[i].Deleted() {
-			return &rpi.ShardGroups[i]
-		}
-	}
-	return nil
-}
-
-// ExpiredShardGroups returns the Shard Groups which are considered expired, for the given time.
-func (rpi *RetentionPolicyInfo) ExpiredShardGroups(t time.Time) []*ShardGroupInfo {
-	var groups = make([]*ShardGroupInfo, 0)
-	for i := range rpi.ShardGroups {
-		if rpi.ShardGroups[i].Deleted() {
-			continue
-		}
-		if rpi.Duration != 0 && rpi.ShardGroups[i].EndTime.Add(rpi.Duration).Before(t) {
-			groups = append(groups, &rpi.ShardGroups[i])
-		}
-	}
-	return groups
-}
-
-// DeletedShardGroups returns the Shard Groups which are marked as deleted.
-func (rpi *RetentionPolicyInfo) DeletedShardGroups() []*ShardGroupInfo {
-	var groups = make([]*ShardGroupInfo, 0)
-	for i := range rpi.ShardGroups {
-		if rpi.ShardGroups[i].Deleted() {
-			groups = append(groups, &rpi.ShardGroups[i])
-		}
-	}
-	return groups
-}
-
-// marshal serializes to a protobuf representation.
-func (rpi *RetentionPolicyInfo) marshal() *internal.RetentionPolicyInfo {
-	pb := &internal.RetentionPolicyInfo{
-		Name:               proto.String(rpi.Name),
-		ReplicaN:           proto.Uint32(uint32(rpi.ReplicaN)),
-		Duration:           proto.Int64(int64(rpi.Duration)),
-		ShardGroupDuration: proto.Int64(int64(rpi.ShardGroupDuration)),
-	}
-
-	pb.ShardGroups = make([]*internal.ShardGroupInfo, len(rpi.ShardGroups))
-	for i, sgi := range rpi.ShardGroups {
-		pb.ShardGroups[i] = sgi.marshal()
-	}
-
-	return pb
-}
-
-// unmarshal deserializes from a protobuf representation.
-func (rpi *RetentionPolicyInfo) unmarshal(pb *internal.RetentionPolicyInfo) {
-	rpi.Name = pb.GetName()
-	rpi.ReplicaN = int(pb.GetReplicaN())
-	rpi.Duration = time.Duration(pb.GetDuration())
-	rpi.ShardGroupDuration = time.Duration(pb.GetShardGroupDuration())
-
-	if len(pb.GetShardGroups()) > 0 {
-		rpi.ShardGroups = make([]ShardGroupInfo, len(pb.GetShardGroups()))
-		for i, x := range pb.GetShardGroups() {
-			rpi.ShardGroups[i].unmarshal(x)
-		}
-	}
-	if len(pb.GetSubscriptions()) > 0 {
-		rpi.Subscriptions = make([]SubscriptionInfo, len(pb.GetSubscriptions()))
-		for i, x := range pb.GetSubscriptions() {
-			rpi.Subscriptions[i].unmarshal(x)
-		}
-	}
-}
-
-// clone returns a deep copy of rpi.
-func (rpi RetentionPolicyInfo) clone() RetentionPolicyInfo {
-	other := rpi
-
-	if rpi.ShardGroups != nil {
-		other.ShardGroups = make([]ShardGroupInfo, len(rpi.ShardGroups))
-		for i := range rpi.ShardGroups {
-			other.ShardGroups[i] = rpi.ShardGroups[i].clone()
-		}
-	}
-
-	return other
-}
-
-// shardGroupDuration returns the duration for a shard group based on a policy duration.
-func shardGroupDuration(d time.Duration) time.Duration {
-	if d >= 180*24*time.Hour || d == 0 { // 6 months or 0
-		return 7 * 24 * time.Hour
-	} else if d >= 2*24*time.Hour { // 2 days
-		return 1 * 24 * time.Hour
-	}
-	return 1 * time.Hour
-}
-
-// ShardGroupInfo represents metadata about a shard group. The DeletedAt field is important
-// because it makes it clear that a ShardGroup has been marked as deleted, and allow the system
-// to be sure that a ShardGroup is not simply missing. If the DeletedAt is set, the system can
-// safely delete any associated shards.
-type ShardGroupInfo struct {
-	ID        uint64
-	StartTime time.Time
-	EndTime   time.Time
-	DeletedAt time.Time
-	Shards    []ShardInfo
-}
-
-// ShardGroupInfos is a collection of ShardGroupInfo
-type ShardGroupInfos []ShardGroupInfo
-
-func (a ShardGroupInfos) Len() int           { return len(a) }
-func (a ShardGroupInfos) Less(i, j int) bool { return a[i].StartTime.Before(a[j].StartTime) }
-func (a ShardGroupInfos) Swap(i, j int)      { a[i], a[j] = a[j], a[i] }
-
-// Contains return true if the shard group contains data for the timestamp.
-func (sgi *ShardGroupInfo) Contains(timestamp time.Time) bool {
-	return !sgi.StartTime.After(timestamp) && sgi.EndTime.After(timestamp)
-}
-
-// Overlaps return whether the shard group contains data for the time range between min and max
-func (sgi *ShardGroupInfo) Overlaps(min, max time.Time) bool {
-	return !sgi.StartTime.After(max) && sgi.EndTime.After(min)
-}
-
-// Deleted returns whether this ShardGroup has been deleted.
-func (sgi *ShardGroupInfo) Deleted() bool {
-	return !sgi.DeletedAt.IsZero()
-}
-
-// clone returns a deep copy of sgi.
-func (sgi ShardGroupInfo) clone() ShardGroupInfo {
-	other := sgi
-
-	if sgi.Shards != nil {
-		other.Shards = make([]ShardInfo, len(sgi.Shards))
-		for i := range sgi.Shards {
-			other.Shards[i] = sgi.Shards[i].clone()
-		}
-	}
-
-	return other
-}
-
-// ShardFor returns the ShardInfo for a Point hash
-func (sgi *ShardGroupInfo) ShardFor(hash uint64) ShardInfo {
-	return sgi.Shards[hash%uint64(len(sgi.Shards))]
-}
-
-// marshal serializes to a protobuf representation.
-func (sgi *ShardGroupInfo) marshal() *internal.ShardGroupInfo {
-	pb := &internal.ShardGroupInfo{
-		ID:        proto.Uint64(sgi.ID),
-		StartTime: proto.Int64(MarshalTime(sgi.StartTime)),
-		EndTime:   proto.Int64(MarshalTime(sgi.EndTime)),
-		DeletedAt: proto.Int64(MarshalTime(sgi.DeletedAt)),
-	}
-
-	pb.Shards = make([]*internal.ShardInfo, len(sgi.Shards))
-	for i := range sgi.Shards {
-		pb.Shards[i] = sgi.Shards[i].marshal()
-	}
-
-	return pb
-}
-
-// unmarshal deserializes from a protobuf representation.
-func (sgi *ShardGroupInfo) unmarshal(pb *internal.ShardGroupInfo) {
-	sgi.ID = pb.GetID()
-	sgi.StartTime = UnmarshalTime(pb.GetStartTime())
-	sgi.EndTime = UnmarshalTime(pb.GetEndTime())
-	sgi.DeletedAt = UnmarshalTime(pb.GetDeletedAt())
-
-	if len(pb.GetShards()) > 0 {
-		sgi.Shards = make([]ShardInfo, len(pb.GetShards()))
-		for i, x := range pb.GetShards() {
-			sgi.Shards[i].unmarshal(x)
-		}
-	}
-}
-
-// ShardInfo represents metadata about a shard.
-type ShardInfo struct {
-	ID     uint64
-	Owners []ShardOwner
-}
-
-// OwnedBy returns whether the shard's owner IDs includes nodeID.
-func (si ShardInfo) OwnedBy(nodeID uint64) bool {
-	for _, so := range si.Owners {
-		if so.NodeID == nodeID {
-			return true
-		}
-	}
-	return false
-}
-
-// clone returns a deep copy of si.
-func (si ShardInfo) clone() ShardInfo {
-	other := si
-
-	if si.Owners != nil {
-		other.Owners = make([]ShardOwner, len(si.Owners))
-		for i := range si.Owners {
-			other.Owners[i] = si.Owners[i].clone()
-		}
-	}
-
-	return other
-}
-
-// marshal serializes to a protobuf representation.
-func (si ShardInfo) marshal() *internal.ShardInfo {
-	pb := &internal.ShardInfo{
-		ID: proto.Uint64(si.ID),
-	}
-
-	pb.Owners = make([]*internal.ShardOwner, len(si.Owners))
-	for i := range si.Owners {
-		pb.Owners[i] = si.Owners[i].marshal()
-	}
-
-	return pb
-}
-
-// UnmarshalBinary decodes the object from a binary format.
-func (si *ShardInfo) UnmarshalBinary(buf []byte) error {
-	var pb internal.ShardInfo
-	if err := proto.Unmarshal(buf, &pb); err != nil {
-		return err
-	}
-	si.unmarshal(&pb)
-	return nil
-}
-
-// unmarshal deserializes from a protobuf representation.
-func (si *ShardInfo) unmarshal(pb *internal.ShardInfo) {
-	si.ID = pb.GetID()
-
-	// If deprecated "OwnerIDs" exists then convert it to "Owners" format.
-	if len(pb.GetOwnerIDs()) > 0 {
-		si.Owners = make([]ShardOwner, len(pb.GetOwnerIDs()))
-		for i, x := range pb.GetOwnerIDs() {
-			si.Owners[i].unmarshal(&internal.ShardOwner{
-				NodeID: proto.Uint64(x),
-			})
-		}
-	} else if len(pb.GetOwners()) > 0 {
-		si.Owners = make([]ShardOwner, len(pb.GetOwners()))
-		for i, x := range pb.GetOwners() {
-			si.Owners[i].unmarshal(x)
-		}
-	}
-}
-
-// SubscriptionInfo hold the subscription information
-type SubscriptionInfo struct {
-	Name         string
-	Mode         string
-	Destinations []string
-}
-
-// marshal serializes to a protobuf representation.
-func (si SubscriptionInfo) marshal() *internal.SubscriptionInfo {
-	pb := &internal.SubscriptionInfo{
-		Name: proto.String(si.Name),
-		Mode: proto.String(si.Mode),
-	}
-
-	pb.Destinations = make([]string, len(si.Destinations))
-	for i := range si.Destinations {
-		pb.Destinations[i] = si.Destinations[i]
-	}
-	return pb
-}
-
-// unmarshal deserializes from a protobuf representation.
-func (si *SubscriptionInfo) unmarshal(pb *internal.SubscriptionInfo) {
-	si.Name = pb.GetName()
-	si.Mode = pb.GetMode()
-
-	if len(pb.GetDestinations()) > 0 {
-		si.Destinations = make([]string, len(pb.GetDestinations()))
-		for i, h := range pb.GetDestinations() {
-			si.Destinations[i] = h
-		}
-	}
-}
-
-// ShardOwner represents a node that owns a shard.
-type ShardOwner struct {
-	NodeID uint64
-}
-
-// clone returns a deep copy of so.
-func (so ShardOwner) clone() ShardOwner {
-	return so
-}
-
-// marshal serializes to a protobuf representation.
-func (so ShardOwner) marshal() *internal.ShardOwner {
-	return &internal.ShardOwner{
-		NodeID: proto.Uint64(so.NodeID),
-	}
-}
-
-// unmarshal deserializes from a protobuf representation.
-func (so *ShardOwner) unmarshal(pb *internal.ShardOwner) {
-	so.NodeID = pb.GetNodeID()
-}
-
-// ContinuousQueryInfo represents metadata about a continuous query.
-type ContinuousQueryInfo struct {
-	Name  string
-	Query string
-}
-
-// clone returns a deep copy of cqi.
-func (cqi ContinuousQueryInfo) clone() ContinuousQueryInfo { return cqi }
-
-// marshal serializes to a protobuf representation.
-func (cqi ContinuousQueryInfo) marshal() *internal.ContinuousQueryInfo {
-	return &internal.ContinuousQueryInfo{
-		Name:  proto.String(cqi.Name),
-		Query: proto.String(cqi.Query),
-	}
-}
-
-// unmarshal deserializes from a protobuf representation.
-func (cqi *ContinuousQueryInfo) unmarshal(pb *internal.ContinuousQueryInfo) {
-	cqi.Name = pb.GetName()
-	cqi.Query = pb.GetQuery()
-}
-
-// UserInfo represents metadata about a user in the system.
-type UserInfo struct {
-	Name       string
-	Hash       string
-	Admin      bool
-	Privileges map[string]influxql.Privilege
-}
-
-// Authorize returns true if the user is authorized and false if not.
-func (ui *UserInfo) Authorize(privilege influxql.Privilege, database string) bool {
-	if ui.Admin {
-		return true
-	}
-	p, ok := ui.Privileges[database]
-	return ok && (p == privilege || p == influxql.AllPrivileges)
-}
-
-// clone returns a deep copy of si.
-func (ui UserInfo) clone() UserInfo {
-	other := ui
-
-	if ui.Privileges != nil {
-		other.Privileges = make(map[string]influxql.Privilege)
-		for k, v := range ui.Privileges {
-			other.Privileges[k] = v
-		}
-	}
-
-	return other
-}
-
-// marshal serializes to a protobuf representation.
-func (ui UserInfo) marshal() *internal.UserInfo {
-	pb := &internal.UserInfo{
-		Name:  proto.String(ui.Name),
-		Hash:  proto.String(ui.Hash),
-		Admin: proto.Bool(ui.Admin),
-	}
-
-	for database, privilege := range ui.Privileges {
-		pb.Privileges = append(pb.Privileges, &internal.UserPrivilege{
-			Database:  proto.String(database),
-			Privilege: proto.Int32(int32(privilege)),
-		})
-	}
-
-	return pb
-}
-
-// unmarshal deserializes from a protobuf representation.
-func (ui *UserInfo) unmarshal(pb *internal.UserInfo) {
-	ui.Name = pb.GetName()
-	ui.Hash = pb.GetHash()
-	ui.Admin = pb.GetAdmin()
-
-	ui.Privileges = make(map[string]influxql.Privilege)
-	for _, p := range pb.GetPrivileges() {
-		ui.Privileges[p.GetDatabase()] = influxql.Privilege(p.GetPrivilege())
-	}
-}
-
-// MarshalTime converts t to nanoseconds since epoch. A zero time returns 0.
-func MarshalTime(t time.Time) int64 {
-	if t.IsZero() {
-		return 0
-	}
-	return t.UnixNano()
-}
-
-// UnmarshalTime converts nanoseconds since epoch to time.
-// A zero value returns a zero time.
-func UnmarshalTime(v int64) time.Time {
-	if v == 0 {
-		return time.Time{}
-	}
-	return time.Unix(0, v).UTC()
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/meta/data_test.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/meta/data_test.go
deleted file mode 100644
index ed994bbb6..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/meta/data_test.go
+++ /dev/null
@@ -1,819 +0,0 @@
-package meta_test
-
-// import "github.com/davecgh/go-spew/spew"
-
-import (
-	"fmt"
-	"reflect"
-	"testing"
-	"time"
-
-	"github.com/davecgh/go-spew/spew"
-	"github.com/gogo/protobuf/proto"
-	"github.com/influxdb/influxdb/influxql"
-	"github.com/influxdb/influxdb/meta"
-	"github.com/influxdb/influxdb/meta/internal"
-)
-
-// Ensure a node can be created.
-func TestData_CreateNode(t *testing.T) {
-	var data meta.Data
-	if err := data.CreateNode("host0"); err != nil {
-		t.Fatal(err)
-	} else if !reflect.DeepEqual(data.Nodes, []meta.NodeInfo{{ID: 1, Host: "host0"}}) {
-		t.Fatalf("unexpected node: %#v", data.Nodes[0])
-	}
-}
-
-// Ensure a node can be removed.
-func TestData_DeleteNode_Basic(t *testing.T) {
-	var data meta.Data
-	if err := data.CreateNode("host0"); err != nil {
-		t.Fatal(err)
-	} else if err = data.CreateNode("host1"); err != nil {
-		t.Fatal(err)
-	} else if err := data.CreateNode("host2"); err != nil {
-		t.Fatal(err)
-	}
-
-	if err := data.DeleteNode(1, false); err != nil {
-		t.Fatal(err)
-	} else if len(data.Nodes) != 2 {
-		t.Fatalf("unexpected node count: %d", len(data.Nodes))
-	} else if data.Nodes[0] != (meta.NodeInfo{ID: 2, Host: "host1"}) {
-		t.Fatalf("unexpected node: %#v", data.Nodes[0])
-	} else if data.Nodes[1] != (meta.NodeInfo{ID: 3, Host: "host2"}) {
-		t.Fatalf("unexpected node: %#v", data.Nodes[1])
-	}
-}
-
-// Ensure a node can be removed with shard info in play
-func TestData_DeleteNode_Shards(t *testing.T) {
-	var data meta.Data
-	if err := data.CreateNode("host0"); err != nil {
-		t.Fatal(err)
-	} else if err = data.CreateNode("host1"); err != nil {
-		t.Fatal(err)
-	} else if err := data.CreateNode("host2"); err != nil {
-		t.Fatal(err)
-	} else if err := data.CreateNode("host3"); err != nil {
-		t.Fatal(err)
-	}
-
-	if err := data.CreateDatabase("mydb"); err != nil {
-		t.Fatal(err)
-	}
-
-	rpi := &meta.RetentionPolicyInfo{
-		Name:     "myrp",
-		ReplicaN: 3,
-	}
-	if err := data.CreateRetentionPolicy("mydb", rpi); err != nil {
-		t.Fatal(err)
-	}
-	if err := data.CreateShardGroup("mydb", "myrp", time.Now()); err != nil {
-		t.Fatal(err)
-	}
-	if len(data.Databases[0].RetentionPolicies[0].ShardGroups[0].Shards[0].Owners) != 3 {
-		t.Fatal("wrong number of shard owners")
-	}
-	if err := data.DeleteNode(2, false); err != nil {
-		t.Fatal(err)
-	}
-	if got, exp := len(data.Databases[0].RetentionPolicies[0].ShardGroups[0].Shards[0].Owners), 2; exp != got {
-		t.Fatalf("wrong number of shard owners, got %d, exp %d", got, exp)
-	}
-	for _, s := range data.Databases[0].RetentionPolicies[0].ShardGroups[0].Shards {
-		if s.OwnedBy(2) {
-			t.Fatal("shard still owned by delted node")
-		}
-	}
-}
-
-// Ensure a database can be created.
-func TestData_CreateDatabase(t *testing.T) {
-	var data meta.Data
-	if err := data.CreateDatabase("db0"); err != nil {
-		t.Fatal(err)
-	} else if !reflect.DeepEqual(data.Databases, []meta.DatabaseInfo{{Name: "db0"}}) {
-		t.Fatalf("unexpected databases: %#v", data.Databases)
-	}
-}
-
-// Ensure that creating a database without a name returns an error.
-func TestData_CreateDatabase_ErrNameRequired(t *testing.T) {
-	var data meta.Data
-	if err := data.CreateDatabase(""); err != meta.ErrDatabaseNameRequired {
-		t.Fatalf("unexpected error: %s", err)
-	}
-}
-
-// Ensure that creating an already existing database returns an error.
-func TestData_CreateDatabase_ErrDatabaseExists(t *testing.T) {
-	var data meta.Data
-	if err := data.CreateDatabase("db0"); err != nil {
-		t.Fatal(err)
-	}
-	if err := data.CreateDatabase("db0"); err != meta.ErrDatabaseExists {
-		t.Fatalf("unexpected error: %s", err)
-	}
-}
-
-// Ensure a database can be removed.
-func TestData_DropDatabase(t *testing.T) {
-	var data meta.Data
-	for i := 0; i < 3; i++ {
-		if err := data.CreateDatabase(fmt.Sprintf("db%d", i)); err != nil {
-			t.Fatal(err)
-		}
-	}
-
-	if err := data.DropDatabase("db1"); err != nil {
-		t.Fatal(err)
-	} else if !reflect.DeepEqual(data.Databases, []meta.DatabaseInfo{{Name: "db0"}, {Name: "db2"}}) {
-		t.Fatalf("unexpected databases: %#v", data.Databases)
-	}
-}
-
-// Ensure a retention policy can be created.
-func TestData_CreateRetentionPolicy(t *testing.T) {
-	data := meta.Data{Nodes: []meta.NodeInfo{{ID: 1}, {ID: 2}}}
-	if err := data.CreateDatabase("db0"); err != nil {
-		t.Fatal(err)
-	}
-
-	// Create policy.
-	if err := data.CreateRetentionPolicy("db0", &meta.RetentionPolicyInfo{
-		Name:     "rp0",
-		ReplicaN: 2,
-		Duration: 4 * time.Hour,
-	}); err != nil {
-		t.Fatal(err)
-	}
-
-	// Verify policy exists.
-	if !reflect.DeepEqual(data.Databases[0].RetentionPolicies, []meta.RetentionPolicyInfo{
-		{
-			Name:               "rp0",
-			ReplicaN:           2,
-			Duration:           4 * time.Hour,
-			ShardGroupDuration: 1 * time.Hour,
-		},
-	}) {
-		t.Fatalf("unexpected policies: %#v", data.Databases[0].RetentionPolicies)
-	}
-}
-
-// Ensure that creating a policy without a name returns an error.
-func TestData_CreateRetentionPolicy_ErrNameRequired(t *testing.T) {
-	data := meta.Data{Nodes: []meta.NodeInfo{{ID: 1}}}
-	if err := data.CreateRetentionPolicy("db0", &meta.RetentionPolicyInfo{Name: ""}); err != meta.ErrRetentionPolicyNameRequired {
-		t.Fatalf("unexpected error: %s", err)
-	}
-}
-
-// Ensure that creating a policy with a replication factor less than 1 returns an error.
-func TestData_CreateRetentionPolicy_ErrReplicationFactorTooLow(t *testing.T) {
-	data := meta.Data{Nodes: []meta.NodeInfo{{ID: 1}}}
-	if err := data.CreateRetentionPolicy("db0", &meta.RetentionPolicyInfo{Name: "rp0", ReplicaN: 0}); err != meta.ErrReplicationFactorTooLow {
-		t.Fatalf("unexpected error: %s", err)
-	}
-}
-
-// Ensure that creating a retention policy on a non-existent database returns an error.
-func TestData_CreateRetentionPolicy_ErrDatabaseNotFound(t *testing.T) {
-	data := meta.Data{Nodes: []meta.NodeInfo{{ID: 1}}}
-	if err := data.CreateRetentionPolicy("db0", &meta.RetentionPolicyInfo{Name: "rp0", ReplicaN: 1}); err != meta.ErrDatabaseNotFound {
-		t.Fatalf("unexpected error: %s", err)
-	}
-}
-
-// Ensure that creating an already existing policy returns an error.
-func TestData_CreateRetentionPolicy_ErrRetentionPolicyExists(t *testing.T) {
-	var data meta.Data
-	if err := data.CreateDatabase("db0"); err != nil {
-		t.Fatal(err)
-	} else if err = data.CreateRetentionPolicy("db0", &meta.RetentionPolicyInfo{Name: "rp0", ReplicaN: 1}); err != nil {
-		t.Fatal(err)
-	}
-	if err := data.CreateRetentionPolicy("db0", &meta.RetentionPolicyInfo{Name: "rp0", ReplicaN: 1}); err != meta.ErrRetentionPolicyExists {
-		t.Fatalf("unexpected error: %s", err)
-	}
-}
-
-// Ensure that a retention policy can be updated.
-func TestData_UpdateRetentionPolicy(t *testing.T) {
-	var data meta.Data
-	if err := data.CreateDatabase("db0"); err != nil {
-		t.Fatal(err)
-	} else if err = data.CreateRetentionPolicy("db0", &meta.RetentionPolicyInfo{Name: "rp0", ReplicaN: 1}); err != nil {
-		t.Fatal(err)
-	}
-
-	// Update the policy.
-	var rpu meta.RetentionPolicyUpdate
-	rpu.SetName("rp1")
-	rpu.SetDuration(10 * time.Hour)
-	rpu.SetReplicaN(3)
-	if err := data.UpdateRetentionPolicy("db0", "rp0", &rpu); err != nil {
-		t.Fatal(err)
-	}
-
-	// Verify the policy was changed.
-	if rpi, _ := data.RetentionPolicy("db0", "rp1"); !reflect.DeepEqual(rpi, &meta.RetentionPolicyInfo{
-		Name:               "rp1",
-		Duration:           10 * time.Hour,
-		ShardGroupDuration: 3600000000000,
-		ReplicaN:           3,
-	}) {
-		t.Fatalf("unexpected policy: %#v", rpi)
-	}
-}
-
-// Ensure a retention policy can be removed.
-func TestData_DropRetentionPolicy(t *testing.T) {
-	var data meta.Data
-	if err := data.CreateDatabase("db0"); err != nil {
-		t.Fatal(err)
-	} else if err = data.CreateRetentionPolicy("db0", &meta.RetentionPolicyInfo{Name: "rp0", ReplicaN: 1}); err != nil {
-		t.Fatal(err)
-	}
-
-	if err := data.DropRetentionPolicy("db0", "rp0"); err != nil {
-		t.Fatal(err)
-	} else if len(data.Databases[0].RetentionPolicies) != 0 {
-		t.Fatalf("unexpected policies: %#v", data.Databases[0].RetentionPolicies)
-	}
-}
-
-// Ensure an error is returned when deleting a policy from a non-existent database.
-func TestData_DropRetentionPolicy_ErrDatabaseNotFound(t *testing.T) {
-	var data meta.Data
-	if err := data.DropRetentionPolicy("db0", "rp0"); err != meta.ErrDatabaseNotFound {
-		t.Fatal(err)
-	}
-}
-
-// Ensure an error is returned when deleting a non-existent policy.
-func TestData_DropRetentionPolicy_ErrRetentionPolicyNotFound(t *testing.T) {
-	var data meta.Data
-	if err := data.CreateDatabase("db0"); err != nil {
-		t.Fatal(err)
-	}
-	if err := data.DropRetentionPolicy("db0", "rp0"); err != meta.ErrRetentionPolicyNotFound {
-		t.Fatal(err)
-	}
-}
-
-// Ensure that a retention policy can be retrieved.
-func TestData_RetentionPolicy(t *testing.T) {
-	var data meta.Data
-	if err := data.CreateDatabase("db0"); err != nil {
-		t.Fatal(err)
-	} else if err = data.CreateRetentionPolicy("db0", &meta.RetentionPolicyInfo{Name: "rp0", ReplicaN: 1}); err != nil {
-		t.Fatal(err)
-	} else if err = data.CreateRetentionPolicy("db0", &meta.RetentionPolicyInfo{Name: "rp1", ReplicaN: 1}); err != nil {
-		t.Fatal(err)
-	}
-
-	if rpi, err := data.RetentionPolicy("db0", "rp0"); err != nil {
-		t.Fatal(err)
-	} else if !reflect.DeepEqual(rpi, &meta.RetentionPolicyInfo{
-		Name:               "rp0",
-		ShardGroupDuration: 604800000000000,
-		ReplicaN:           1,
-	}) {
-		t.Fatalf("unexpected value: %#v", rpi)
-	}
-}
-
-// Ensure that retrieving a policy from a non-existent database returns an error.
-func TestData_RetentionPolicy_ErrDatabaseNotFound(t *testing.T) {
-	var data meta.Data
-	if _, err := data.RetentionPolicy("db0", "rp0"); err != meta.ErrDatabaseNotFound {
-		t.Fatal(err)
-	}
-}
-
-// Ensure that a default retention policy can be set.
-func TestData_SetDefaultRetentionPolicy(t *testing.T) {
-	var data meta.Data
-	if err := data.CreateDatabase("db0"); err != nil {
-		t.Fatal(err)
-	} else if err = data.CreateRetentionPolicy("db0", &meta.RetentionPolicyInfo{Name: "rp0", ReplicaN: 1}); err != nil {
-		t.Fatal(err)
-	}
-
-	// Verify there is no default policy on the database initially.
-	if name := data.Database("db0").DefaultRetentionPolicy; name != "" {
-		t.Fatalf("unexpected initial default retention policy: %s", name)
-	}
-
-	// Set the default policy.
-	if err := data.SetDefaultRetentionPolicy("db0", "rp0"); err != nil {
-		t.Fatal(err)
-	}
-
-	// Verify the default policy is now set.
-	if name := data.Database("db0").DefaultRetentionPolicy; name != "rp0" {
-		t.Fatalf("unexpected default retention policy: %s", name)
-	}
-}
-
-// Ensure that a shard group can be created on a database for a given timestamp.
-func TestData_CreateShardGroup(t *testing.T) {
-	var data meta.Data
-	if err := data.CreateNode("node0"); err != nil {
-		t.Fatal(err)
-	} else if err = data.CreateNode("node1"); err != nil {
-		t.Fatal(err)
-	} else if err = data.CreateDatabase("db0"); err != nil {
-		t.Fatal(err)
-	} else if err = data.CreateRetentionPolicy("db0", &meta.RetentionPolicyInfo{Name: "rp0", ReplicaN: 2, Duration: 1 * time.Hour}); err != nil {
-		t.Fatal(err)
-	}
-
-	// Create shard group.
-	if err := data.CreateShardGroup("db0", "rp0", time.Date(2000, time.January, 1, 0, 0, 0, 0, time.UTC)); err != nil {
-		t.Fatal(err)
-	}
-
-	// Verify the shard group was created.
-	if sgi, _ := data.ShardGroupByTimestamp("db0", "rp0", time.Date(2000, time.January, 1, 0, 0, 0, 0, time.UTC)); !reflect.DeepEqual(sgi, &meta.ShardGroupInfo{
-		ID:        1,
-		StartTime: time.Date(2000, time.January, 1, 0, 0, 0, 0, time.UTC),
-		EndTime:   time.Date(2000, time.January, 1, 1, 0, 0, 0, time.UTC),
-		Shards: []meta.ShardInfo{
-			{
-				ID: 1,
-				Owners: []meta.ShardOwner{
-					{NodeID: 1},
-					{NodeID: 2},
-				},
-			},
-		},
-	}) {
-		t.Fatalf("unexpected shard group: %#v", sgi)
-	} else if !sgi.Shards[0].OwnedBy(1) || !sgi.Shards[0].OwnedBy(2) || sgi.Shards[0].OwnedBy(3) {
-		// Verify shard is correctly owned-by the node.
-		t.Fatalf("new shard is not owned by correct node")
-	}
-}
-
-// Ensure that a shard group is correctly detected as expired.
-func TestData_ShardGroupExpiredDeleted(t *testing.T) {
-	var data meta.Data
-	if err := data.CreateNode("node0"); err != nil {
-		t.Fatal(err)
-	} else if err = data.CreateNode("node1"); err != nil {
-		t.Fatal(err)
-	} else if err = data.CreateDatabase("db0"); err != nil {
-		t.Fatal(err)
-	} else if err = data.CreateRetentionPolicy("db0", &meta.RetentionPolicyInfo{Name: "rp0", ReplicaN: 2, Duration: 1 * time.Hour}); err != nil {
-		t.Fatal(err)
-	}
-
-	// Create shard groups.
-	if err := data.CreateShardGroup("db0", "rp0", time.Date(2000, time.January, 1, 0, 0, 0, 0, time.UTC)); err != nil {
-		t.Fatal(err)
-	}
-	if err := data.CreateShardGroup("db0", "rp0", time.Date(2001, time.January, 1, 0, 0, 0, 0, time.UTC)); err != nil {
-		t.Fatal(err)
-	}
-
-	// Check expiration.
-	rp, _ := data.RetentionPolicy("db0", "rp0")
-	groups := rp.ExpiredShardGroups(time.Date(2001, time.January, 1, 0, 0, 0, 0, time.UTC))
-	if len(groups) != 1 {
-		t.Fatalf("wrong number of expired shard groups returned, got %d, exp 1", len(groups))
-	}
-	if groups[0].StartTime != time.Date(2000, time.January, 1, 0, 0, 0, 0, time.UTC) {
-		t.Fatal("wrong shard group marked as expired")
-	}
-
-	// Check deletion.
-	if err := data.DeleteShardGroup("db0", "rp0", groups[0].ID); err != nil {
-		t.Fatal(err)
-	}
-	groups = rp.DeletedShardGroups()
-	if len(groups) != 1 {
-		t.Fatalf("wrong number of deleted shard groups returned, got %d, exp 1", len(groups))
-	}
-	if groups[0].StartTime != time.Date(2000, time.January, 1, 0, 0, 0, 0, time.UTC) {
-		t.Fatal("wrong shard group marked as expired")
-	}
-
-}
-
-// Test shard group selection.
-func TestShardGroup_Overlaps(t *testing.T) {
-	// Make a shard group 1 hour in duration
-	startTime, _ := time.Parse(time.RFC3339, "2000-01-01T00:00:00Z")
-	endTime := startTime.Add(time.Hour)
-	g := &meta.ShardGroupInfo{StartTime: startTime, EndTime: endTime}
-
-	if !g.Overlaps(g.StartTime.Add(-time.Minute), g.EndTime) {
-		t.Fatal("shard group not selected when min before start time")
-	}
-
-	if !g.Overlaps(g.StartTime.Add(-time.Minute), g.StartTime) {
-		t.Fatal("shard group not selected when min before start time and max equals start time")
-	}
-
-	if !g.Overlaps(g.StartTime, g.EndTime.Add(time.Minute)) {
-		t.Fatal("shard group not selected when max after after end time")
-	}
-
-	if !g.Overlaps(g.StartTime.Add(-time.Minute), g.EndTime.Add(time.Minute)) {
-		t.Fatal("shard group not selected when min before start time and when max after end time")
-	}
-
-	if !g.Overlaps(g.StartTime.Add(time.Minute), g.EndTime.Add(-time.Minute)) {
-		t.Fatal("shard group not selected when min after start time and when max before end time")
-	}
-
-	if !g.Overlaps(g.StartTime, g.EndTime) {
-		t.Fatal("shard group not selected when min at start time and when max at end time")
-	}
-
-	if !g.Overlaps(g.StartTime, g.StartTime) {
-		t.Fatal("shard group not selected when min and max set to start time")
-	}
-
-	if !g.Overlaps(g.StartTime.Add(1*time.Minute), g.EndTime.Add(24*time.Hour)) {
-		t.Fatal("shard group selected when both min in range")
-	}
-
-	if g.Overlaps(g.EndTime, g.EndTime) {
-		t.Fatal("shard group selected when min and max set to end time")
-	}
-
-	if g.Overlaps(g.StartTime.Add(-10*time.Hour), g.EndTime.Add(-9*time.Hour)) {
-		t.Fatal("shard group selected when both min and max before shard times")
-	}
-
-	if g.Overlaps(g.StartTime.Add(24*time.Hour), g.EndTime.Add(25*time.Hour)) {
-		t.Fatal("shard group selected when both min and max after shard times")
-	}
-
-}
-
-// Ensure a shard group can be removed by ID.
-func TestData_DeleteShardGroup(t *testing.T) {
-	var data meta.Data
-	if err := data.CreateNode("node0"); err != nil {
-		t.Fatal(err)
-	} else if err := data.CreateDatabase("db0"); err != nil {
-		t.Fatal(err)
-	} else if err = data.CreateRetentionPolicy("db0", &meta.RetentionPolicyInfo{Name: "rp0", ReplicaN: 1}); err != nil {
-		t.Fatal(err)
-	} else if err := data.CreateShardGroup("db0", "rp0", time.Date(2000, time.January, 1, 0, 0, 0, 0, time.UTC)); err != nil {
-		t.Fatal(err)
-	}
-
-	if err := data.DeleteShardGroup("db0", "rp0", 1); err != nil {
-		t.Fatal(err)
-	}
-	if sg := data.Databases[0].RetentionPolicies[0].ShardGroups[0]; !sg.Deleted() {
-		t.Fatalf("shard group not correctly flagged as deleted")
-	}
-}
-
-// Ensure a continuous query can be created.
-func TestData_CreateContinuousQuery(t *testing.T) {
-	var data meta.Data
-	if err := data.CreateDatabase("db0"); err != nil {
-		t.Fatal(err)
-	} else if err := data.CreateContinuousQuery("db0", "cq0", "SELECT count() FROM foo"); err != nil {
-		t.Fatal(err)
-	} else if !reflect.DeepEqual(data.Databases[0].ContinuousQueries, []meta.ContinuousQueryInfo{
-		{Name: "cq0", Query: "SELECT count() FROM foo"},
-	}) {
-		t.Fatalf("unexpected queries: %#v", data.Databases[0].ContinuousQueries)
-	}
-}
-
-// Ensure a continuous query can be removed.
-func TestData_DropContinuousQuery(t *testing.T) {
-	var data meta.Data
-	if err := data.CreateDatabase("db0"); err != nil {
-		t.Fatal(err)
-	} else if err := data.CreateContinuousQuery("db0", "cq0", "SELECT count() FROM foo"); err != nil {
-		t.Fatal(err)
-	} else if err = data.CreateContinuousQuery("db0", "cq1", "SELECT count() FROM bar"); err != nil {
-		t.Fatal(err)
-	}
-
-	if err := data.DropContinuousQuery("db0", "cq0"); err != nil {
-		t.Fatal(err)
-	} else if !reflect.DeepEqual(data.Databases[0].ContinuousQueries, []meta.ContinuousQueryInfo{
-		{Name: "cq1", Query: "SELECT count() FROM bar"},
-	}) {
-		t.Fatalf("unexpected queries: %#v", data.Databases[0].ContinuousQueries)
-	}
-}
-
-// Ensure a subscription can be created.
-func TestData_CreateSubscription(t *testing.T) {
-	var data meta.Data
-	rpi := &meta.RetentionPolicyInfo{
-		Name:     "rp0",
-		ReplicaN: 3,
-	}
-	if err := data.CreateDatabase("db0"); err != nil {
-		t.Fatal(err)
-	} else if err := data.CreateRetentionPolicy("db0", rpi); err != nil {
-		t.Fatal(err)
-	} else if err := data.CreateSubscription("db0", "rp0", "s0", "ANY", []string{"udp://h0:1234", "udp://h1:1234"}); err != nil {
-		t.Fatal(err)
-	} else if !reflect.DeepEqual(data.Databases[0].RetentionPolicies[0].Subscriptions, []meta.SubscriptionInfo{
-		{Name: "s0", Mode: "ANY", Destinations: []string{"udp://h0:1234", "udp://h1:1234"}},
-	}) {
-		t.Fatalf("unexpected subscriptions: %#v", data.Databases[0].RetentionPolicies[0].Subscriptions)
-	}
-}
-
-// Ensure a subscription can be removed.
-func TestData_DropSubscription(t *testing.T) {
-	var data meta.Data
-	rpi := &meta.RetentionPolicyInfo{
-		Name:     "rp0",
-		ReplicaN: 3,
-	}
-	if err := data.CreateDatabase("db0"); err != nil {
-		t.Fatal(err)
-	} else if err := data.CreateRetentionPolicy("db0", rpi); err != nil {
-		t.Fatal(err)
-	} else if err := data.CreateSubscription("db0", "rp0", "s0", "ANY", []string{"udp://h0:1234", "udp://h1:1234"}); err != nil {
-		t.Fatal(err)
-	} else if err := data.CreateSubscription("db0", "rp0", "s1", "ALL", []string{"udp://h0:1234", "udp://h1:1234"}); err != nil {
-		t.Fatal(err)
-	}
-
-	if err := data.DropSubscription("db0", "rp0", "s0"); err != nil {
-		t.Fatal(err)
-	} else if !reflect.DeepEqual(data.Databases[0].RetentionPolicies[0].Subscriptions, []meta.SubscriptionInfo{
-		{Name: "s1", Mode: "ALL", Destinations: []string{"udp://h0:1234", "udp://h1:1234"}},
-	}) {
-		t.Fatalf("unexpected subscriptions: %#v", data.Databases[0].RetentionPolicies[0].Subscriptions)
-	}
-}
-
-// Ensure a user can be created.
-func TestData_CreateUser(t *testing.T) {
-	var data meta.Data
-	if err := data.CreateUser("susy", "ABC123", true); err != nil {
-		t.Fatal(err)
-	} else if !reflect.DeepEqual(data.Users, []meta.UserInfo{
-		{Name: "susy", Hash: "ABC123", Admin: true},
-	}) {
-		t.Fatalf("unexpected users: %#v", data.Users)
-	}
-}
-
-// Ensure that creating a user with no username returns an error.
-func TestData_CreateUser_ErrUsernameRequired(t *testing.T) {
-	var data meta.Data
-	if err := data.CreateUser("", "", false); err != meta.ErrUsernameRequired {
-		t.Fatal(err)
-	}
-}
-
-// Ensure that creating the same user twice returns an error.
-func TestData_CreateUser_ErrUserExists(t *testing.T) {
-	var data meta.Data
-	if err := data.CreateUser("susy", "", false); err != nil {
-		t.Fatal(err)
-	}
-	if err := data.CreateUser("susy", "", false); err != meta.ErrUserExists {
-		t.Fatal(err)
-	}
-}
-
-// Ensure a user can be removed.
-func TestData_DropUser(t *testing.T) {
-	var data meta.Data
-	if err := data.CreateUser("susy", "", false); err != nil {
-		t.Fatal(err)
-	} else if err := data.CreateUser("bob", "", false); err != nil {
-		t.Fatal(err)
-	}
-
-	if err := data.DropUser("bob"); err != nil {
-		t.Fatal(err)
-	} else if !reflect.DeepEqual(data.Users, []meta.UserInfo{
-		{Name: "susy"},
-	}) {
-		t.Fatalf("unexpected users: %#v", data.Users)
-	}
-}
-
-// Ensure that removing a non-existent user returns an error.
-func TestData_DropUser_ErrUserNotFound(t *testing.T) {
-	var data meta.Data
-	if err := data.DropUser("bob"); err != meta.ErrUserNotFound {
-		t.Fatal(err)
-	}
-}
-
-// Ensure a user can be updated.
-func TestData_UpdateUser(t *testing.T) {
-	var data meta.Data
-	if err := data.CreateUser("susy", "", false); err != nil {
-		t.Fatal(err)
-	} else if err := data.CreateUser("bob", "", false); err != nil {
-		t.Fatal(err)
-	}
-
-	// Update password hash.
-	if err := data.UpdateUser("bob", "XXX"); err != nil {
-		t.Fatal(err)
-	} else if !reflect.DeepEqual(data.User("bob"), &meta.UserInfo{Name: "bob", Hash: "XXX"}) {
-		t.Fatalf("unexpected user: %#v", data.User("bob"))
-	}
-}
-
-// Ensure that updating a non-existent user returns an error.
-func TestData_UpdateUser_ErrUserNotFound(t *testing.T) {
-	var data meta.Data
-	if err := data.UpdateUser("bob", "ZZZ"); err != meta.ErrUserNotFound {
-		t.Fatal(err)
-	}
-}
-
-// Ensure the data can be deeply copied.
-func TestData_Clone(t *testing.T) {
-	data := meta.Data{
-		Term:  10,
-		Index: 20,
-		Nodes: []meta.NodeInfo{
-			{ID: 1, Host: "host0"},
-			{ID: 2, Host: "host1"},
-		},
-		Databases: []meta.DatabaseInfo{
-			{
-				Name: "db0",
-				DefaultRetentionPolicy: "default",
-				RetentionPolicies: []meta.RetentionPolicyInfo{
-					{
-						Name:               "rp0",
-						ReplicaN:           3,
-						Duration:           10 * time.Second,
-						ShardGroupDuration: 3 * time.Millisecond,
-						ShardGroups: []meta.ShardGroupInfo{
-							{
-								ID:        100,
-								StartTime: time.Date(2000, time.January, 1, 0, 0, 0, 0, time.UTC),
-								EndTime:   time.Date(2000, time.February, 1, 0, 0, 0, 0, time.UTC),
-								Shards: []meta.ShardInfo{
-									{
-										ID: 200,
-										Owners: []meta.ShardOwner{
-											{NodeID: 1},
-											{NodeID: 3},
-											{NodeID: 4},
-										},
-									},
-								},
-							},
-						},
-					},
-				},
-				ContinuousQueries: []meta.ContinuousQueryInfo{
-					{Query: "SELECT count() FROM foo"},
-				},
-			},
-		},
-		Users: []meta.UserInfo{
-			{
-				Name:       "susy",
-				Hash:       "ABC123",
-				Admin:      true,
-				Privileges: map[string]influxql.Privilege{"db0": influxql.AllPrivileges},
-			},
-		},
-	}
-
-	// Copy the root structure.
-	other := data.Clone()
-
-	if !reflect.DeepEqual(data.Nodes, other.Nodes) {
-		t.Fatalf("unexpected cloned nodes: %#v", other.Nodes)
-	} else if !reflect.DeepEqual(data.Databases, other.Databases) {
-		t.Fatalf("unexpected cloned databases: %#v", other.Databases)
-	} else if !reflect.DeepEqual(data.Users, other.Users) {
-		t.Fatalf("unexpected cloned users: %#v", other.Users)
-	}
-
-	// Ensure that changing data in the clone does not affect the original.
-	other.Databases[0].RetentionPolicies[0].ShardGroups[0].Shards[0].Owners[1].NodeID = 9
-	if v := data.Databases[0].RetentionPolicies[0].ShardGroups[0].Shards[0].Owners[1].NodeID; v != 3 {
-		t.Fatalf("editing clone changed original: %v", v)
-	}
-}
-
-// Ensure the data can be marshaled and unmarshaled.
-func TestData_MarshalBinary(t *testing.T) {
-	data := meta.Data{
-		Term:  10,
-		Index: 20,
-		Nodes: []meta.NodeInfo{
-			{ID: 1, Host: "host0"},
-			{ID: 2, Host: "host1"},
-		},
-		Databases: []meta.DatabaseInfo{
-			{
-				Name: "db0",
-				DefaultRetentionPolicy: "default",
-				RetentionPolicies: []meta.RetentionPolicyInfo{
-					{
-						Name:               "rp0",
-						ReplicaN:           3,
-						Duration:           10 * time.Second,
-						ShardGroupDuration: 3 * time.Millisecond,
-						ShardGroups: []meta.ShardGroupInfo{
-							{
-								ID:        100,
-								StartTime: time.Date(2000, time.January, 1, 0, 0, 0, 0, time.UTC),
-								EndTime:   time.Date(2000, time.February, 1, 0, 0, 0, 0, time.UTC),
-								Shards: []meta.ShardInfo{
-									{
-										ID: 200,
-										Owners: []meta.ShardOwner{
-											{NodeID: 1},
-											{NodeID: 3},
-											{NodeID: 4},
-										},
-									},
-								},
-							},
-						},
-					},
-				},
-				ContinuousQueries: []meta.ContinuousQueryInfo{
-					{Query: "SELECT count() FROM foo"},
-				},
-			},
-		},
-		Users: []meta.UserInfo{
-			{
-				Name:       "susy",
-				Hash:       "ABC123",
-				Admin:      true,
-				Privileges: map[string]influxql.Privilege{"db0": influxql.AllPrivileges},
-			},
-		},
-	}
-
-	// Marshal the data struture.
-	buf, err := data.MarshalBinary()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// Unmarshal into new data.
-	var other meta.Data
-	if err := other.UnmarshalBinary(buf); err != nil {
-		t.Fatal(err)
-	}
-
-	if !reflect.DeepEqual(data.Nodes, other.Nodes) {
-		t.Fatalf("unexpected nodes: %#v", other.Nodes)
-	} else if !reflect.DeepEqual(data.Databases, other.Databases) {
-		spew.Dump(data.Databases)
-		spew.Dump(other.Databases)
-		t.Fatalf("unexpected databases: %#v", other.Databases)
-	} else if !reflect.DeepEqual(data.Users, other.Users) {
-		t.Fatalf("unexpected users: %#v", other.Users)
-	}
-}
-
-// Ensure shards with deprecated "OwnerIDs" can be decoded.
-func TestShardInfo_UnmarshalBinary_OwnerIDs(t *testing.T) {
-	// Encode deprecated form to bytes.
-	buf, err := proto.Marshal(&internal.ShardInfo{
-		ID:       proto.Uint64(1),
-		OwnerIDs: []uint64{10, 20, 30},
-	})
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// Decode deprecated form.
-	var si meta.ShardInfo
-	if err := si.UnmarshalBinary(buf); err != nil {
-		t.Fatal(err)
-	}
-
-	// Verify data is migrated correctly.
-	if !reflect.DeepEqual(si, meta.ShardInfo{
-		ID: 1,
-		Owners: []meta.ShardOwner{
-			{NodeID: 10},
-			{NodeID: 20},
-			{NodeID: 30},
-		},
-	}) {
-		t.Fatalf("unexpected shard info: %s", spew.Sdump(si))
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/meta/errors.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/meta/errors.go
deleted file mode 100644
index e32af0552..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/meta/errors.go
+++ /dev/null
@@ -1,132 +0,0 @@
-package meta
-
-import (
-	"errors"
-	"fmt"
-)
-
-var (
-	// ErrStoreOpen is returned when opening an already open store.
-	ErrStoreOpen = newError("store already open")
-
-	// ErrStoreClosed is returned when closing an already closed store.
-	ErrStoreClosed = newError("raft store already closed")
-
-	// ErrTooManyPeers is returned when more than 3 peers are used.
-	ErrTooManyPeers = newError("too many peers; influxdb v0.9.0 is limited to 3 nodes in a cluster")
-)
-
-var (
-	// ErrNodeExists is returned when creating an already existing node.
-	ErrNodeExists = newError("node already exists")
-
-	// ErrNodeNotFound is returned when mutating a node that doesn't exist.
-	ErrNodeNotFound = newError("node not found")
-
-	// ErrNodesRequired is returned when at least one node is required for an operation.
-	// This occurs when creating a shard group.
-	ErrNodesRequired = newError("at least one node required")
-
-	// ErrNodeIDRequired is returned when using a zero node id.
-	ErrNodeIDRequired = newError("node id must be greater than 0")
-
-	// ErrNodeUnableToDropFinalNode is returned if the node being dropped is the last
-	// node in the cluster
-	ErrNodeUnableToDropFinalNode = newError("unable to drop the final node in a cluster")
-)
-
-var (
-	// ErrDatabaseExists is returned when creating an already existing database.
-	ErrDatabaseExists = newError("database already exists")
-
-	// ErrDatabaseNotFound is returned when mutating a database that doesn't exist.
-	ErrDatabaseNotFound = newError("database not found")
-
-	// ErrDatabaseNameRequired is returned when creating a database without a name.
-	ErrDatabaseNameRequired = newError("database name required")
-)
-
-var (
-	// ErrRetentionPolicyExists is returned when creating an already existing policy.
-	ErrRetentionPolicyExists = newError("retention policy already exists")
-
-	// ErrRetentionPolicyDefault is returned when attempting a prohibited operation
-	// on a default retention policy.
-	ErrRetentionPolicyDefault = newError("retention policy is default")
-
-	// ErrRetentionPolicyNotFound is returned when mutating a policy that doesn't exist.
-	ErrRetentionPolicyNotFound = newError("retention policy not found")
-
-	// ErrRetentionPolicyNameRequired is returned when creating a policy without a name.
-	ErrRetentionPolicyNameRequired = newError("retention policy name required")
-
-	// ErrRetentionPolicyNameExists is returned when renaming a policy to
-	// the same name as another existing policy.
-	ErrRetentionPolicyNameExists = newError("retention policy name already exists")
-
-	// ErrRetentionPolicyDurationTooLow is returned when updating a retention
-	// policy that has a duration lower than the allowed minimum.
-	ErrRetentionPolicyDurationTooLow = newError(fmt.Sprintf("retention policy duration must be at least %s",
-		MinRetentionPolicyDuration))
-
-	// ErrReplicationFactorTooLow is returned when the replication factor is not in an
-	// acceptable range.
-	ErrReplicationFactorTooLow = newError("replication factor must be greater than 0")
-)
-
-var (
-	// ErrShardGroupExists is returned when creating an already existing shard group.
-	ErrShardGroupExists = newError("shard group already exists")
-
-	// ErrShardGroupNotFound is returned when mutating a shard group that doesn't exist.
-	ErrShardGroupNotFound = newError("shard group not found")
-
-	// ErrShardNotReplicated is returned if the node requested to be dropped has
-	// the last copy of a shard present and the force keyword was not used
-	ErrShardNotReplicated = newError("shard not replicated")
-)
-
-var (
-	// ErrContinuousQueryExists is returned when creating an already existing continuous query.
-	ErrContinuousQueryExists = newError("continuous query already exists")
-
-	// ErrContinuousQueryNotFound is returned when removing a continuous query that doesn't exist.
-	ErrContinuousQueryNotFound = newError("continuous query not found")
-)
-
-var (
-	// ErrSubscriptionExists is returned when creating an already existing subscription.
-	ErrSubscriptionExists = newError("subscription already exists")
-
-	// ErrSubscriptionNotFound is returned when removing a subscription that doesn't exist.
-	ErrSubscriptionNotFound = newError("subscription not found")
-)
-
-var (
-	// ErrUserExists is returned when creating an already existing user.
-	ErrUserExists = newError("user already exists")
-
-	// ErrUserNotFound is returned when mutating a user that doesn't exist.
-	ErrUserNotFound = newError("user not found")
-
-	// ErrUsernameRequired is returned when creating a user without a username.
-	ErrUsernameRequired = newError("username required")
-)
-
-// errLookup stores a mapping of error strings to well defined error types.
-var errLookup = make(map[string]error)
-
-func newError(msg string) error {
-	err := errors.New(msg)
-	errLookup[err.Error()] = err
-	return err
-}
-
-// lookupError returns a known error reference, if one exists.
-// Otherwise returns err.
-func lookupError(err error) error {
-	if e, ok := errLookup[err.Error()]; ok {
-		return e
-	}
-	return err
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/meta/internal/meta.pb.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/meta/internal/meta.pb.go
deleted file mode 100644
index f4d23e578..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/meta/internal/meta.pb.go
+++ /dev/null
@@ -1,1689 +0,0 @@
-// Code generated by protoc-gen-gogo.
-// source: internal/meta.proto
-// DO NOT EDIT!
-
-/*
-Package internal is a generated protocol buffer package.
-
-It is generated from these files:
-	internal/meta.proto
-
-It has these top-level messages:
-	Data
-	NodeInfo
-	DatabaseInfo
-	RetentionPolicyInfo
-	ShardGroupInfo
-	ShardInfo
-	SubscriptionInfo
-	ShardOwner
-	ContinuousQueryInfo
-	UserInfo
-	UserPrivilege
-	Command
-	CreateNodeCommand
-	DeleteNodeCommand
-	CreateDatabaseCommand
-	DropDatabaseCommand
-	CreateRetentionPolicyCommand
-	DropRetentionPolicyCommand
-	SetDefaultRetentionPolicyCommand
-	UpdateRetentionPolicyCommand
-	CreateShardGroupCommand
-	DeleteShardGroupCommand
-	CreateContinuousQueryCommand
-	DropContinuousQueryCommand
-	CreateUserCommand
-	DropUserCommand
-	UpdateUserCommand
-	SetPrivilegeCommand
-	SetDataCommand
-	SetAdminPrivilegeCommand
-	UpdateNodeCommand
-	CreateSubscriptionCommand
-	DropSubscriptionCommand
-	RemovePeerCommand
-	Response
-	ResponseHeader
-	ErrorResponse
-	FetchDataRequest
-	FetchDataResponse
-	JoinRequest
-	JoinResponse
-	PromoteRaftRequest
-	PromoteRaftResponse
-*/
-package internal
-
-import proto "github.com/gogo/protobuf/proto"
-import fmt "fmt"
-import math "math"
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
-
-type RPCType int32
-
-const (
-	RPCType_Error       RPCType = 1
-	RPCType_FetchData   RPCType = 2
-	RPCType_Join        RPCType = 3
-	RPCType_PromoteRaft RPCType = 4
-)
-
-var RPCType_name = map[int32]string{
-	1: "Error",
-	2: "FetchData",
-	3: "Join",
-	4: "PromoteRaft",
-}
-var RPCType_value = map[string]int32{
-	"Error":       1,
-	"FetchData":   2,
-	"Join":        3,
-	"PromoteRaft": 4,
-}
-
-func (x RPCType) Enum() *RPCType {
-	p := new(RPCType)
-	*p = x
-	return p
-}
-func (x RPCType) String() string {
-	return proto.EnumName(RPCType_name, int32(x))
-}
-func (x *RPCType) UnmarshalJSON(data []byte) error {
-	value, err := proto.UnmarshalJSONEnum(RPCType_value, data, "RPCType")
-	if err != nil {
-		return err
-	}
-	*x = RPCType(value)
-	return nil
-}
-
-type Command_Type int32
-
-const (
-	Command_CreateNodeCommand                Command_Type = 1
-	Command_DeleteNodeCommand                Command_Type = 2
-	Command_CreateDatabaseCommand            Command_Type = 3
-	Command_DropDatabaseCommand              Command_Type = 4
-	Command_CreateRetentionPolicyCommand     Command_Type = 5
-	Command_DropRetentionPolicyCommand       Command_Type = 6
-	Command_SetDefaultRetentionPolicyCommand Command_Type = 7
-	Command_UpdateRetentionPolicyCommand     Command_Type = 8
-	Command_CreateShardGroupCommand          Command_Type = 9
-	Command_DeleteShardGroupCommand          Command_Type = 10
-	Command_CreateContinuousQueryCommand     Command_Type = 11
-	Command_DropContinuousQueryCommand       Command_Type = 12
-	Command_CreateUserCommand                Command_Type = 13
-	Command_DropUserCommand                  Command_Type = 14
-	Command_UpdateUserCommand                Command_Type = 15
-	Command_SetPrivilegeCommand              Command_Type = 16
-	Command_SetDataCommand                   Command_Type = 17
-	Command_SetAdminPrivilegeCommand         Command_Type = 18
-	Command_UpdateNodeCommand                Command_Type = 19
-	Command_CreateSubscriptionCommand        Command_Type = 21
-	Command_DropSubscriptionCommand          Command_Type = 22
-	Command_RemovePeerCommand                Command_Type = 23
-)
-
-var Command_Type_name = map[int32]string{
-	1:  "CreateNodeCommand",
-	2:  "DeleteNodeCommand",
-	3:  "CreateDatabaseCommand",
-	4:  "DropDatabaseCommand",
-	5:  "CreateRetentionPolicyCommand",
-	6:  "DropRetentionPolicyCommand",
-	7:  "SetDefaultRetentionPolicyCommand",
-	8:  "UpdateRetentionPolicyCommand",
-	9:  "CreateShardGroupCommand",
-	10: "DeleteShardGroupCommand",
-	11: "CreateContinuousQueryCommand",
-	12: "DropContinuousQueryCommand",
-	13: "CreateUserCommand",
-	14: "DropUserCommand",
-	15: "UpdateUserCommand",
-	16: "SetPrivilegeCommand",
-	17: "SetDataCommand",
-	18: "SetAdminPrivilegeCommand",
-	19: "UpdateNodeCommand",
-	21: "CreateSubscriptionCommand",
-	22: "DropSubscriptionCommand",
-	23: "RemovePeerCommand",
-}
-var Command_Type_value = map[string]int32{
-	"CreateNodeCommand":                1,
-	"DeleteNodeCommand":                2,
-	"CreateDatabaseCommand":            3,
-	"DropDatabaseCommand":              4,
-	"CreateRetentionPolicyCommand":     5,
-	"DropRetentionPolicyCommand":       6,
-	"SetDefaultRetentionPolicyCommand": 7,
-	"UpdateRetentionPolicyCommand":     8,
-	"CreateShardGroupCommand":          9,
-	"DeleteShardGroupCommand":          10,
-	"CreateContinuousQueryCommand":     11,
-	"DropContinuousQueryCommand":       12,
-	"CreateUserCommand":                13,
-	"DropUserCommand":                  14,
-	"UpdateUserCommand":                15,
-	"SetPrivilegeCommand":              16,
-	"SetDataCommand":                   17,
-	"SetAdminPrivilegeCommand":         18,
-	"UpdateNodeCommand":                19,
-	"CreateSubscriptionCommand":        21,
-	"DropSubscriptionCommand":          22,
-	"RemovePeerCommand":                23,
-}
-
-func (x Command_Type) Enum() *Command_Type {
-	p := new(Command_Type)
-	*p = x
-	return p
-}
-func (x Command_Type) String() string {
-	return proto.EnumName(Command_Type_name, int32(x))
-}
-func (x *Command_Type) UnmarshalJSON(data []byte) error {
-	value, err := proto.UnmarshalJSONEnum(Command_Type_value, data, "Command_Type")
-	if err != nil {
-		return err
-	}
-	*x = Command_Type(value)
-	return nil
-}
-
-type Data struct {
-	Term             *uint64         `protobuf:"varint,1,req,name=Term" json:"Term,omitempty"`
-	Index            *uint64         `protobuf:"varint,2,req,name=Index" json:"Index,omitempty"`
-	ClusterID        *uint64         `protobuf:"varint,3,req,name=ClusterID" json:"ClusterID,omitempty"`
-	Nodes            []*NodeInfo     `protobuf:"bytes,4,rep,name=Nodes" json:"Nodes,omitempty"`
-	Databases        []*DatabaseInfo `protobuf:"bytes,5,rep,name=Databases" json:"Databases,omitempty"`
-	Users            []*UserInfo     `protobuf:"bytes,6,rep,name=Users" json:"Users,omitempty"`
-	MaxNodeID        *uint64         `protobuf:"varint,7,req,name=MaxNodeID" json:"MaxNodeID,omitempty"`
-	MaxShardGroupID  *uint64         `protobuf:"varint,8,req,name=MaxShardGroupID" json:"MaxShardGroupID,omitempty"`
-	MaxShardID       *uint64         `protobuf:"varint,9,req,name=MaxShardID" json:"MaxShardID,omitempty"`
-	XXX_unrecognized []byte          `json:"-"`
-}
-
-func (m *Data) Reset()         { *m = Data{} }
-func (m *Data) String() string { return proto.CompactTextString(m) }
-func (*Data) ProtoMessage()    {}
-
-func (m *Data) GetTerm() uint64 {
-	if m != nil && m.Term != nil {
-		return *m.Term
-	}
-	return 0
-}
-
-func (m *Data) GetIndex() uint64 {
-	if m != nil && m.Index != nil {
-		return *m.Index
-	}
-	return 0
-}
-
-func (m *Data) GetClusterID() uint64 {
-	if m != nil && m.ClusterID != nil {
-		return *m.ClusterID
-	}
-	return 0
-}
-
-func (m *Data) GetNodes() []*NodeInfo {
-	if m != nil {
-		return m.Nodes
-	}
-	return nil
-}
-
-func (m *Data) GetDatabases() []*DatabaseInfo {
-	if m != nil {
-		return m.Databases
-	}
-	return nil
-}
-
-func (m *Data) GetUsers() []*UserInfo {
-	if m != nil {
-		return m.Users
-	}
-	return nil
-}
-
-func (m *Data) GetMaxNodeID() uint64 {
-	if m != nil && m.MaxNodeID != nil {
-		return *m.MaxNodeID
-	}
-	return 0
-}
-
-func (m *Data) GetMaxShardGroupID() uint64 {
-	if m != nil && m.MaxShardGroupID != nil {
-		return *m.MaxShardGroupID
-	}
-	return 0
-}
-
-func (m *Data) GetMaxShardID() uint64 {
-	if m != nil && m.MaxShardID != nil {
-		return *m.MaxShardID
-	}
-	return 0
-}
-
-type NodeInfo struct {
-	ID               *uint64 `protobuf:"varint,1,req,name=ID" json:"ID,omitempty"`
-	Host             *string `protobuf:"bytes,2,req,name=Host" json:"Host,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *NodeInfo) Reset()         { *m = NodeInfo{} }
-func (m *NodeInfo) String() string { return proto.CompactTextString(m) }
-func (*NodeInfo) ProtoMessage()    {}
-
-func (m *NodeInfo) GetID() uint64 {
-	if m != nil && m.ID != nil {
-		return *m.ID
-	}
-	return 0
-}
-
-func (m *NodeInfo) GetHost() string {
-	if m != nil && m.Host != nil {
-		return *m.Host
-	}
-	return ""
-}
-
-type DatabaseInfo struct {
-	Name                   *string                `protobuf:"bytes,1,req,name=Name" json:"Name,omitempty"`
-	DefaultRetentionPolicy *string                `protobuf:"bytes,2,req,name=DefaultRetentionPolicy" json:"DefaultRetentionPolicy,omitempty"`
-	RetentionPolicies      []*RetentionPolicyInfo `protobuf:"bytes,3,rep,name=RetentionPolicies" json:"RetentionPolicies,omitempty"`
-	ContinuousQueries      []*ContinuousQueryInfo `protobuf:"bytes,4,rep,name=ContinuousQueries" json:"ContinuousQueries,omitempty"`
-	XXX_unrecognized       []byte                 `json:"-"`
-}
-
-func (m *DatabaseInfo) Reset()         { *m = DatabaseInfo{} }
-func (m *DatabaseInfo) String() string { return proto.CompactTextString(m) }
-func (*DatabaseInfo) ProtoMessage()    {}
-
-func (m *DatabaseInfo) GetName() string {
-	if m != nil && m.Name != nil {
-		return *m.Name
-	}
-	return ""
-}
-
-func (m *DatabaseInfo) GetDefaultRetentionPolicy() string {
-	if m != nil && m.DefaultRetentionPolicy != nil {
-		return *m.DefaultRetentionPolicy
-	}
-	return ""
-}
-
-func (m *DatabaseInfo) GetRetentionPolicies() []*RetentionPolicyInfo {
-	if m != nil {
-		return m.RetentionPolicies
-	}
-	return nil
-}
-
-func (m *DatabaseInfo) GetContinuousQueries() []*ContinuousQueryInfo {
-	if m != nil {
-		return m.ContinuousQueries
-	}
-	return nil
-}
-
-type RetentionPolicyInfo struct {
-	Name               *string             `protobuf:"bytes,1,req,name=Name" json:"Name,omitempty"`
-	Duration           *int64              `protobuf:"varint,2,req,name=Duration" json:"Duration,omitempty"`
-	ShardGroupDuration *int64              `protobuf:"varint,3,req,name=ShardGroupDuration" json:"ShardGroupDuration,omitempty"`
-	ReplicaN           *uint32             `protobuf:"varint,4,req,name=ReplicaN" json:"ReplicaN,omitempty"`
-	ShardGroups        []*ShardGroupInfo   `protobuf:"bytes,5,rep,name=ShardGroups" json:"ShardGroups,omitempty"`
-	Subscriptions      []*SubscriptionInfo `protobuf:"bytes,6,rep,name=Subscriptions" json:"Subscriptions,omitempty"`
-	XXX_unrecognized   []byte              `json:"-"`
-}
-
-func (m *RetentionPolicyInfo) Reset()         { *m = RetentionPolicyInfo{} }
-func (m *RetentionPolicyInfo) String() string { return proto.CompactTextString(m) }
-func (*RetentionPolicyInfo) ProtoMessage()    {}
-
-func (m *RetentionPolicyInfo) GetName() string {
-	if m != nil && m.Name != nil {
-		return *m.Name
-	}
-	return ""
-}
-
-func (m *RetentionPolicyInfo) GetDuration() int64 {
-	if m != nil && m.Duration != nil {
-		return *m.Duration
-	}
-	return 0
-}
-
-func (m *RetentionPolicyInfo) GetShardGroupDuration() int64 {
-	if m != nil && m.ShardGroupDuration != nil {
-		return *m.ShardGroupDuration
-	}
-	return 0
-}
-
-func (m *RetentionPolicyInfo) GetReplicaN() uint32 {
-	if m != nil && m.ReplicaN != nil {
-		return *m.ReplicaN
-	}
-	return 0
-}
-
-func (m *RetentionPolicyInfo) GetShardGroups() []*ShardGroupInfo {
-	if m != nil {
-		return m.ShardGroups
-	}
-	return nil
-}
-
-func (m *RetentionPolicyInfo) GetSubscriptions() []*SubscriptionInfo {
-	if m != nil {
-		return m.Subscriptions
-	}
-	return nil
-}
-
-type ShardGroupInfo struct {
-	ID               *uint64      `protobuf:"varint,1,req,name=ID" json:"ID,omitempty"`
-	StartTime        *int64       `protobuf:"varint,2,req,name=StartTime" json:"StartTime,omitempty"`
-	EndTime          *int64       `protobuf:"varint,3,req,name=EndTime" json:"EndTime,omitempty"`
-	DeletedAt        *int64       `protobuf:"varint,4,req,name=DeletedAt" json:"DeletedAt,omitempty"`
-	Shards           []*ShardInfo `protobuf:"bytes,5,rep,name=Shards" json:"Shards,omitempty"`
-	XXX_unrecognized []byte       `json:"-"`
-}
-
-func (m *ShardGroupInfo) Reset()         { *m = ShardGroupInfo{} }
-func (m *ShardGroupInfo) String() string { return proto.CompactTextString(m) }
-func (*ShardGroupInfo) ProtoMessage()    {}
-
-func (m *ShardGroupInfo) GetID() uint64 {
-	if m != nil && m.ID != nil {
-		return *m.ID
-	}
-	return 0
-}
-
-func (m *ShardGroupInfo) GetStartTime() int64 {
-	if m != nil && m.StartTime != nil {
-		return *m.StartTime
-	}
-	return 0
-}
-
-func (m *ShardGroupInfo) GetEndTime() int64 {
-	if m != nil && m.EndTime != nil {
-		return *m.EndTime
-	}
-	return 0
-}
-
-func (m *ShardGroupInfo) GetDeletedAt() int64 {
-	if m != nil && m.DeletedAt != nil {
-		return *m.DeletedAt
-	}
-	return 0
-}
-
-func (m *ShardGroupInfo) GetShards() []*ShardInfo {
-	if m != nil {
-		return m.Shards
-	}
-	return nil
-}
-
-type ShardInfo struct {
-	ID               *uint64       `protobuf:"varint,1,req,name=ID" json:"ID,omitempty"`
-	OwnerIDs         []uint64      `protobuf:"varint,2,rep,name=OwnerIDs" json:"OwnerIDs,omitempty"`
-	Owners           []*ShardOwner `protobuf:"bytes,3,rep,name=Owners" json:"Owners,omitempty"`
-	XXX_unrecognized []byte        `json:"-"`
-}
-
-func (m *ShardInfo) Reset()         { *m = ShardInfo{} }
-func (m *ShardInfo) String() string { return proto.CompactTextString(m) }
-func (*ShardInfo) ProtoMessage()    {}
-
-func (m *ShardInfo) GetID() uint64 {
-	if m != nil && m.ID != nil {
-		return *m.ID
-	}
-	return 0
-}
-
-func (m *ShardInfo) GetOwnerIDs() []uint64 {
-	if m != nil {
-		return m.OwnerIDs
-	}
-	return nil
-}
-
-func (m *ShardInfo) GetOwners() []*ShardOwner {
-	if m != nil {
-		return m.Owners
-	}
-	return nil
-}
-
-type SubscriptionInfo struct {
-	Name             *string  `protobuf:"bytes,1,req,name=Name" json:"Name,omitempty"`
-	Mode             *string  `protobuf:"bytes,2,req,name=Mode" json:"Mode,omitempty"`
-	Destinations     []string `protobuf:"bytes,3,rep,name=Destinations" json:"Destinations,omitempty"`
-	XXX_unrecognized []byte   `json:"-"`
-}
-
-func (m *SubscriptionInfo) Reset()         { *m = SubscriptionInfo{} }
-func (m *SubscriptionInfo) String() string { return proto.CompactTextString(m) }
-func (*SubscriptionInfo) ProtoMessage()    {}
-
-func (m *SubscriptionInfo) GetName() string {
-	if m != nil && m.Name != nil {
-		return *m.Name
-	}
-	return ""
-}
-
-func (m *SubscriptionInfo) GetMode() string {
-	if m != nil && m.Mode != nil {
-		return *m.Mode
-	}
-	return ""
-}
-
-func (m *SubscriptionInfo) GetDestinations() []string {
-	if m != nil {
-		return m.Destinations
-	}
-	return nil
-}
-
-type ShardOwner struct {
-	NodeID           *uint64 `protobuf:"varint,1,req,name=NodeID" json:"NodeID,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *ShardOwner) Reset()         { *m = ShardOwner{} }
-func (m *ShardOwner) String() string { return proto.CompactTextString(m) }
-func (*ShardOwner) ProtoMessage()    {}
-
-func (m *ShardOwner) GetNodeID() uint64 {
-	if m != nil && m.NodeID != nil {
-		return *m.NodeID
-	}
-	return 0
-}
-
-type ContinuousQueryInfo struct {
-	Name             *string `protobuf:"bytes,1,req,name=Name" json:"Name,omitempty"`
-	Query            *string `protobuf:"bytes,2,req,name=Query" json:"Query,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *ContinuousQueryInfo) Reset()         { *m = ContinuousQueryInfo{} }
-func (m *ContinuousQueryInfo) String() string { return proto.CompactTextString(m) }
-func (*ContinuousQueryInfo) ProtoMessage()    {}
-
-func (m *ContinuousQueryInfo) GetName() string {
-	if m != nil && m.Name != nil {
-		return *m.Name
-	}
-	return ""
-}
-
-func (m *ContinuousQueryInfo) GetQuery() string {
-	if m != nil && m.Query != nil {
-		return *m.Query
-	}
-	return ""
-}
-
-type UserInfo struct {
-	Name             *string          `protobuf:"bytes,1,req,name=Name" json:"Name,omitempty"`
-	Hash             *string          `protobuf:"bytes,2,req,name=Hash" json:"Hash,omitempty"`
-	Admin            *bool            `protobuf:"varint,3,req,name=Admin" json:"Admin,omitempty"`
-	Privileges       []*UserPrivilege `protobuf:"bytes,4,rep,name=Privileges" json:"Privileges,omitempty"`
-	XXX_unrecognized []byte           `json:"-"`
-}
-
-func (m *UserInfo) Reset()         { *m = UserInfo{} }
-func (m *UserInfo) String() string { return proto.CompactTextString(m) }
-func (*UserInfo) ProtoMessage()    {}
-
-func (m *UserInfo) GetName() string {
-	if m != nil && m.Name != nil {
-		return *m.Name
-	}
-	return ""
-}
-
-func (m *UserInfo) GetHash() string {
-	if m != nil && m.Hash != nil {
-		return *m.Hash
-	}
-	return ""
-}
-
-func (m *UserInfo) GetAdmin() bool {
-	if m != nil && m.Admin != nil {
-		return *m.Admin
-	}
-	return false
-}
-
-func (m *UserInfo) GetPrivileges() []*UserPrivilege {
-	if m != nil {
-		return m.Privileges
-	}
-	return nil
-}
-
-type UserPrivilege struct {
-	Database         *string `protobuf:"bytes,1,req,name=Database" json:"Database,omitempty"`
-	Privilege        *int32  `protobuf:"varint,2,req,name=Privilege" json:"Privilege,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *UserPrivilege) Reset()         { *m = UserPrivilege{} }
-func (m *UserPrivilege) String() string { return proto.CompactTextString(m) }
-func (*UserPrivilege) ProtoMessage()    {}
-
-func (m *UserPrivilege) GetDatabase() string {
-	if m != nil && m.Database != nil {
-		return *m.Database
-	}
-	return ""
-}
-
-func (m *UserPrivilege) GetPrivilege() int32 {
-	if m != nil && m.Privilege != nil {
-		return *m.Privilege
-	}
-	return 0
-}
-
-type Command struct {
-	Type             *Command_Type             `protobuf:"varint,1,req,name=type,enum=internal.Command_Type" json:"type,omitempty"`
-	XXX_extensions   map[int32]proto.Extension `json:"-"`
-	XXX_unrecognized []byte                    `json:"-"`
-}
-
-func (m *Command) Reset()         { *m = Command{} }
-func (m *Command) String() string { return proto.CompactTextString(m) }
-func (*Command) ProtoMessage()    {}
-
-var extRange_Command = []proto.ExtensionRange{
-	{100, 536870911},
-}
-
-func (*Command) ExtensionRangeArray() []proto.ExtensionRange {
-	return extRange_Command
-}
-func (m *Command) ExtensionMap() map[int32]proto.Extension {
-	if m.XXX_extensions == nil {
-		m.XXX_extensions = make(map[int32]proto.Extension)
-	}
-	return m.XXX_extensions
-}
-
-func (m *Command) GetType() Command_Type {
-	if m != nil && m.Type != nil {
-		return *m.Type
-	}
-	return Command_CreateNodeCommand
-}
-
-type CreateNodeCommand struct {
-	Host             *string `protobuf:"bytes,1,req,name=Host" json:"Host,omitempty"`
-	Rand             *uint64 `protobuf:"varint,2,req,name=Rand" json:"Rand,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *CreateNodeCommand) Reset()         { *m = CreateNodeCommand{} }
-func (m *CreateNodeCommand) String() string { return proto.CompactTextString(m) }
-func (*CreateNodeCommand) ProtoMessage()    {}
-
-func (m *CreateNodeCommand) GetHost() string {
-	if m != nil && m.Host != nil {
-		return *m.Host
-	}
-	return ""
-}
-
-func (m *CreateNodeCommand) GetRand() uint64 {
-	if m != nil && m.Rand != nil {
-		return *m.Rand
-	}
-	return 0
-}
-
-var E_CreateNodeCommand_Command = &proto.ExtensionDesc{
-	ExtendedType:  (*Command)(nil),
-	ExtensionType: (*CreateNodeCommand)(nil),
-	Field:         101,
-	Name:          "internal.CreateNodeCommand.command",
-	Tag:           "bytes,101,opt,name=command",
-}
-
-type DeleteNodeCommand struct {
-	ID               *uint64 `protobuf:"varint,1,req,name=ID" json:"ID,omitempty"`
-	Force            *bool   `protobuf:"varint,2,req,name=Force" json:"Force,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *DeleteNodeCommand) Reset()         { *m = DeleteNodeCommand{} }
-func (m *DeleteNodeCommand) String() string { return proto.CompactTextString(m) }
-func (*DeleteNodeCommand) ProtoMessage()    {}
-
-func (m *DeleteNodeCommand) GetID() uint64 {
-	if m != nil && m.ID != nil {
-		return *m.ID
-	}
-	return 0
-}
-
-func (m *DeleteNodeCommand) GetForce() bool {
-	if m != nil && m.Force != nil {
-		return *m.Force
-	}
-	return false
-}
-
-var E_DeleteNodeCommand_Command = &proto.ExtensionDesc{
-	ExtendedType:  (*Command)(nil),
-	ExtensionType: (*DeleteNodeCommand)(nil),
-	Field:         102,
-	Name:          "internal.DeleteNodeCommand.command",
-	Tag:           "bytes,102,opt,name=command",
-}
-
-type CreateDatabaseCommand struct {
-	Name             *string `protobuf:"bytes,1,req,name=Name" json:"Name,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *CreateDatabaseCommand) Reset()         { *m = CreateDatabaseCommand{} }
-func (m *CreateDatabaseCommand) String() string { return proto.CompactTextString(m) }
-func (*CreateDatabaseCommand) ProtoMessage()    {}
-
-func (m *CreateDatabaseCommand) GetName() string {
-	if m != nil && m.Name != nil {
-		return *m.Name
-	}
-	return ""
-}
-
-var E_CreateDatabaseCommand_Command = &proto.ExtensionDesc{
-	ExtendedType:  (*Command)(nil),
-	ExtensionType: (*CreateDatabaseCommand)(nil),
-	Field:         103,
-	Name:          "internal.CreateDatabaseCommand.command",
-	Tag:           "bytes,103,opt,name=command",
-}
-
-type DropDatabaseCommand struct {
-	Name             *string `protobuf:"bytes,1,req,name=Name" json:"Name,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *DropDatabaseCommand) Reset()         { *m = DropDatabaseCommand{} }
-func (m *DropDatabaseCommand) String() string { return proto.CompactTextString(m) }
-func (*DropDatabaseCommand) ProtoMessage()    {}
-
-func (m *DropDatabaseCommand) GetName() string {
-	if m != nil && m.Name != nil {
-		return *m.Name
-	}
-	return ""
-}
-
-var E_DropDatabaseCommand_Command = &proto.ExtensionDesc{
-	ExtendedType:  (*Command)(nil),
-	ExtensionType: (*DropDatabaseCommand)(nil),
-	Field:         104,
-	Name:          "internal.DropDatabaseCommand.command",
-	Tag:           "bytes,104,opt,name=command",
-}
-
-type CreateRetentionPolicyCommand struct {
-	Database         *string              `protobuf:"bytes,1,req,name=Database" json:"Database,omitempty"`
-	RetentionPolicy  *RetentionPolicyInfo `protobuf:"bytes,2,req,name=RetentionPolicy" json:"RetentionPolicy,omitempty"`
-	XXX_unrecognized []byte               `json:"-"`
-}
-
-func (m *CreateRetentionPolicyCommand) Reset()         { *m = CreateRetentionPolicyCommand{} }
-func (m *CreateRetentionPolicyCommand) String() string { return proto.CompactTextString(m) }
-func (*CreateRetentionPolicyCommand) ProtoMessage()    {}
-
-func (m *CreateRetentionPolicyCommand) GetDatabase() string {
-	if m != nil && m.Database != nil {
-		return *m.Database
-	}
-	return ""
-}
-
-func (m *CreateRetentionPolicyCommand) GetRetentionPolicy() *RetentionPolicyInfo {
-	if m != nil {
-		return m.RetentionPolicy
-	}
-	return nil
-}
-
-var E_CreateRetentionPolicyCommand_Command = &proto.ExtensionDesc{
-	ExtendedType:  (*Command)(nil),
-	ExtensionType: (*CreateRetentionPolicyCommand)(nil),
-	Field:         105,
-	Name:          "internal.CreateRetentionPolicyCommand.command",
-	Tag:           "bytes,105,opt,name=command",
-}
-
-type DropRetentionPolicyCommand struct {
-	Database         *string `protobuf:"bytes,1,req,name=Database" json:"Database,omitempty"`
-	Name             *string `protobuf:"bytes,2,req,name=Name" json:"Name,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *DropRetentionPolicyCommand) Reset()         { *m = DropRetentionPolicyCommand{} }
-func (m *DropRetentionPolicyCommand) String() string { return proto.CompactTextString(m) }
-func (*DropRetentionPolicyCommand) ProtoMessage()    {}
-
-func (m *DropRetentionPolicyCommand) GetDatabase() string {
-	if m != nil && m.Database != nil {
-		return *m.Database
-	}
-	return ""
-}
-
-func (m *DropRetentionPolicyCommand) GetName() string {
-	if m != nil && m.Name != nil {
-		return *m.Name
-	}
-	return ""
-}
-
-var E_DropRetentionPolicyCommand_Command = &proto.ExtensionDesc{
-	ExtendedType:  (*Command)(nil),
-	ExtensionType: (*DropRetentionPolicyCommand)(nil),
-	Field:         106,
-	Name:          "internal.DropRetentionPolicyCommand.command",
-	Tag:           "bytes,106,opt,name=command",
-}
-
-type SetDefaultRetentionPolicyCommand struct {
-	Database         *string `protobuf:"bytes,1,req,name=Database" json:"Database,omitempty"`
-	Name             *string `protobuf:"bytes,2,req,name=Name" json:"Name,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *SetDefaultRetentionPolicyCommand) Reset()         { *m = SetDefaultRetentionPolicyCommand{} }
-func (m *SetDefaultRetentionPolicyCommand) String() string { return proto.CompactTextString(m) }
-func (*SetDefaultRetentionPolicyCommand) ProtoMessage()    {}
-
-func (m *SetDefaultRetentionPolicyCommand) GetDatabase() string {
-	if m != nil && m.Database != nil {
-		return *m.Database
-	}
-	return ""
-}
-
-func (m *SetDefaultRetentionPolicyCommand) GetName() string {
-	if m != nil && m.Name != nil {
-		return *m.Name
-	}
-	return ""
-}
-
-var E_SetDefaultRetentionPolicyCommand_Command = &proto.ExtensionDesc{
-	ExtendedType:  (*Command)(nil),
-	ExtensionType: (*SetDefaultRetentionPolicyCommand)(nil),
-	Field:         107,
-	Name:          "internal.SetDefaultRetentionPolicyCommand.command",
-	Tag:           "bytes,107,opt,name=command",
-}
-
-type UpdateRetentionPolicyCommand struct {
-	Database         *string `protobuf:"bytes,1,req,name=Database" json:"Database,omitempty"`
-	Name             *string `protobuf:"bytes,2,req,name=Name" json:"Name,omitempty"`
-	NewName          *string `protobuf:"bytes,3,opt,name=NewName" json:"NewName,omitempty"`
-	Duration         *int64  `protobuf:"varint,4,opt,name=Duration" json:"Duration,omitempty"`
-	ReplicaN         *uint32 `protobuf:"varint,5,opt,name=ReplicaN" json:"ReplicaN,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *UpdateRetentionPolicyCommand) Reset()         { *m = UpdateRetentionPolicyCommand{} }
-func (m *UpdateRetentionPolicyCommand) String() string { return proto.CompactTextString(m) }
-func (*UpdateRetentionPolicyCommand) ProtoMessage()    {}
-
-func (m *UpdateRetentionPolicyCommand) GetDatabase() string {
-	if m != nil && m.Database != nil {
-		return *m.Database
-	}
-	return ""
-}
-
-func (m *UpdateRetentionPolicyCommand) GetName() string {
-	if m != nil && m.Name != nil {
-		return *m.Name
-	}
-	return ""
-}
-
-func (m *UpdateRetentionPolicyCommand) GetNewName() string {
-	if m != nil && m.NewName != nil {
-		return *m.NewName
-	}
-	return ""
-}
-
-func (m *UpdateRetentionPolicyCommand) GetDuration() int64 {
-	if m != nil && m.Duration != nil {
-		return *m.Duration
-	}
-	return 0
-}
-
-func (m *UpdateRetentionPolicyCommand) GetReplicaN() uint32 {
-	if m != nil && m.ReplicaN != nil {
-		return *m.ReplicaN
-	}
-	return 0
-}
-
-var E_UpdateRetentionPolicyCommand_Command = &proto.ExtensionDesc{
-	ExtendedType:  (*Command)(nil),
-	ExtensionType: (*UpdateRetentionPolicyCommand)(nil),
-	Field:         108,
-	Name:          "internal.UpdateRetentionPolicyCommand.command",
-	Tag:           "bytes,108,opt,name=command",
-}
-
-type CreateShardGroupCommand struct {
-	Database         *string `protobuf:"bytes,1,req,name=Database" json:"Database,omitempty"`
-	Policy           *string `protobuf:"bytes,2,req,name=Policy" json:"Policy,omitempty"`
-	Timestamp        *int64  `protobuf:"varint,3,req,name=Timestamp" json:"Timestamp,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *CreateShardGroupCommand) Reset()         { *m = CreateShardGroupCommand{} }
-func (m *CreateShardGroupCommand) String() string { return proto.CompactTextString(m) }
-func (*CreateShardGroupCommand) ProtoMessage()    {}
-
-func (m *CreateShardGroupCommand) GetDatabase() string {
-	if m != nil && m.Database != nil {
-		return *m.Database
-	}
-	return ""
-}
-
-func (m *CreateShardGroupCommand) GetPolicy() string {
-	if m != nil && m.Policy != nil {
-		return *m.Policy
-	}
-	return ""
-}
-
-func (m *CreateShardGroupCommand) GetTimestamp() int64 {
-	if m != nil && m.Timestamp != nil {
-		return *m.Timestamp
-	}
-	return 0
-}
-
-var E_CreateShardGroupCommand_Command = &proto.ExtensionDesc{
-	ExtendedType:  (*Command)(nil),
-	ExtensionType: (*CreateShardGroupCommand)(nil),
-	Field:         109,
-	Name:          "internal.CreateShardGroupCommand.command",
-	Tag:           "bytes,109,opt,name=command",
-}
-
-type DeleteShardGroupCommand struct {
-	Database         *string `protobuf:"bytes,1,req,name=Database" json:"Database,omitempty"`
-	Policy           *string `protobuf:"bytes,2,req,name=Policy" json:"Policy,omitempty"`
-	ShardGroupID     *uint64 `protobuf:"varint,3,req,name=ShardGroupID" json:"ShardGroupID,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *DeleteShardGroupCommand) Reset()         { *m = DeleteShardGroupCommand{} }
-func (m *DeleteShardGroupCommand) String() string { return proto.CompactTextString(m) }
-func (*DeleteShardGroupCommand) ProtoMessage()    {}
-
-func (m *DeleteShardGroupCommand) GetDatabase() string {
-	if m != nil && m.Database != nil {
-		return *m.Database
-	}
-	return ""
-}
-
-func (m *DeleteShardGroupCommand) GetPolicy() string {
-	if m != nil && m.Policy != nil {
-		return *m.Policy
-	}
-	return ""
-}
-
-func (m *DeleteShardGroupCommand) GetShardGroupID() uint64 {
-	if m != nil && m.ShardGroupID != nil {
-		return *m.ShardGroupID
-	}
-	return 0
-}
-
-var E_DeleteShardGroupCommand_Command = &proto.ExtensionDesc{
-	ExtendedType:  (*Command)(nil),
-	ExtensionType: (*DeleteShardGroupCommand)(nil),
-	Field:         110,
-	Name:          "internal.DeleteShardGroupCommand.command",
-	Tag:           "bytes,110,opt,name=command",
-}
-
-type CreateContinuousQueryCommand struct {
-	Database         *string `protobuf:"bytes,1,req,name=Database" json:"Database,omitempty"`
-	Name             *string `protobuf:"bytes,2,req,name=Name" json:"Name,omitempty"`
-	Query            *string `protobuf:"bytes,3,req,name=Query" json:"Query,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *CreateContinuousQueryCommand) Reset()         { *m = CreateContinuousQueryCommand{} }
-func (m *CreateContinuousQueryCommand) String() string { return proto.CompactTextString(m) }
-func (*CreateContinuousQueryCommand) ProtoMessage()    {}
-
-func (m *CreateContinuousQueryCommand) GetDatabase() string {
-	if m != nil && m.Database != nil {
-		return *m.Database
-	}
-	return ""
-}
-
-func (m *CreateContinuousQueryCommand) GetName() string {
-	if m != nil && m.Name != nil {
-		return *m.Name
-	}
-	return ""
-}
-
-func (m *CreateContinuousQueryCommand) GetQuery() string {
-	if m != nil && m.Query != nil {
-		return *m.Query
-	}
-	return ""
-}
-
-var E_CreateContinuousQueryCommand_Command = &proto.ExtensionDesc{
-	ExtendedType:  (*Command)(nil),
-	ExtensionType: (*CreateContinuousQueryCommand)(nil),
-	Field:         111,
-	Name:          "internal.CreateContinuousQueryCommand.command",
-	Tag:           "bytes,111,opt,name=command",
-}
-
-type DropContinuousQueryCommand struct {
-	Database         *string `protobuf:"bytes,1,req,name=Database" json:"Database,omitempty"`
-	Name             *string `protobuf:"bytes,2,req,name=Name" json:"Name,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *DropContinuousQueryCommand) Reset()         { *m = DropContinuousQueryCommand{} }
-func (m *DropContinuousQueryCommand) String() string { return proto.CompactTextString(m) }
-func (*DropContinuousQueryCommand) ProtoMessage()    {}
-
-func (m *DropContinuousQueryCommand) GetDatabase() string {
-	if m != nil && m.Database != nil {
-		return *m.Database
-	}
-	return ""
-}
-
-func (m *DropContinuousQueryCommand) GetName() string {
-	if m != nil && m.Name != nil {
-		return *m.Name
-	}
-	return ""
-}
-
-var E_DropContinuousQueryCommand_Command = &proto.ExtensionDesc{
-	ExtendedType:  (*Command)(nil),
-	ExtensionType: (*DropContinuousQueryCommand)(nil),
-	Field:         112,
-	Name:          "internal.DropContinuousQueryCommand.command",
-	Tag:           "bytes,112,opt,name=command",
-}
-
-type CreateUserCommand struct {
-	Name             *string `protobuf:"bytes,1,req,name=Name" json:"Name,omitempty"`
-	Hash             *string `protobuf:"bytes,2,req,name=Hash" json:"Hash,omitempty"`
-	Admin            *bool   `protobuf:"varint,3,req,name=Admin" json:"Admin,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *CreateUserCommand) Reset()         { *m = CreateUserCommand{} }
-func (m *CreateUserCommand) String() string { return proto.CompactTextString(m) }
-func (*CreateUserCommand) ProtoMessage()    {}
-
-func (m *CreateUserCommand) GetName() string {
-	if m != nil && m.Name != nil {
-		return *m.Name
-	}
-	return ""
-}
-
-func (m *CreateUserCommand) GetHash() string {
-	if m != nil && m.Hash != nil {
-		return *m.Hash
-	}
-	return ""
-}
-
-func (m *CreateUserCommand) GetAdmin() bool {
-	if m != nil && m.Admin != nil {
-		return *m.Admin
-	}
-	return false
-}
-
-var E_CreateUserCommand_Command = &proto.ExtensionDesc{
-	ExtendedType:  (*Command)(nil),
-	ExtensionType: (*CreateUserCommand)(nil),
-	Field:         113,
-	Name:          "internal.CreateUserCommand.command",
-	Tag:           "bytes,113,opt,name=command",
-}
-
-type DropUserCommand struct {
-	Name             *string `protobuf:"bytes,1,req,name=Name" json:"Name,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *DropUserCommand) Reset()         { *m = DropUserCommand{} }
-func (m *DropUserCommand) String() string { return proto.CompactTextString(m) }
-func (*DropUserCommand) ProtoMessage()    {}
-
-func (m *DropUserCommand) GetName() string {
-	if m != nil && m.Name != nil {
-		return *m.Name
-	}
-	return ""
-}
-
-var E_DropUserCommand_Command = &proto.ExtensionDesc{
-	ExtendedType:  (*Command)(nil),
-	ExtensionType: (*DropUserCommand)(nil),
-	Field:         114,
-	Name:          "internal.DropUserCommand.command",
-	Tag:           "bytes,114,opt,name=command",
-}
-
-type UpdateUserCommand struct {
-	Name             *string `protobuf:"bytes,1,req,name=Name" json:"Name,omitempty"`
-	Hash             *string `protobuf:"bytes,2,req,name=Hash" json:"Hash,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *UpdateUserCommand) Reset()         { *m = UpdateUserCommand{} }
-func (m *UpdateUserCommand) String() string { return proto.CompactTextString(m) }
-func (*UpdateUserCommand) ProtoMessage()    {}
-
-func (m *UpdateUserCommand) GetName() string {
-	if m != nil && m.Name != nil {
-		return *m.Name
-	}
-	return ""
-}
-
-func (m *UpdateUserCommand) GetHash() string {
-	if m != nil && m.Hash != nil {
-		return *m.Hash
-	}
-	return ""
-}
-
-var E_UpdateUserCommand_Command = &proto.ExtensionDesc{
-	ExtendedType:  (*Command)(nil),
-	ExtensionType: (*UpdateUserCommand)(nil),
-	Field:         115,
-	Name:          "internal.UpdateUserCommand.command",
-	Tag:           "bytes,115,opt,name=command",
-}
-
-type SetPrivilegeCommand struct {
-	Username         *string `protobuf:"bytes,1,req,name=Username" json:"Username,omitempty"`
-	Database         *string `protobuf:"bytes,2,req,name=Database" json:"Database,omitempty"`
-	Privilege        *int32  `protobuf:"varint,3,req,name=Privilege" json:"Privilege,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *SetPrivilegeCommand) Reset()         { *m = SetPrivilegeCommand{} }
-func (m *SetPrivilegeCommand) String() string { return proto.CompactTextString(m) }
-func (*SetPrivilegeCommand) ProtoMessage()    {}
-
-func (m *SetPrivilegeCommand) GetUsername() string {
-	if m != nil && m.Username != nil {
-		return *m.Username
-	}
-	return ""
-}
-
-func (m *SetPrivilegeCommand) GetDatabase() string {
-	if m != nil && m.Database != nil {
-		return *m.Database
-	}
-	return ""
-}
-
-func (m *SetPrivilegeCommand) GetPrivilege() int32 {
-	if m != nil && m.Privilege != nil {
-		return *m.Privilege
-	}
-	return 0
-}
-
-var E_SetPrivilegeCommand_Command = &proto.ExtensionDesc{
-	ExtendedType:  (*Command)(nil),
-	ExtensionType: (*SetPrivilegeCommand)(nil),
-	Field:         116,
-	Name:          "internal.SetPrivilegeCommand.command",
-	Tag:           "bytes,116,opt,name=command",
-}
-
-type SetDataCommand struct {
-	Data             *Data  `protobuf:"bytes,1,req,name=Data" json:"Data,omitempty"`
-	XXX_unrecognized []byte `json:"-"`
-}
-
-func (m *SetDataCommand) Reset()         { *m = SetDataCommand{} }
-func (m *SetDataCommand) String() string { return proto.CompactTextString(m) }
-func (*SetDataCommand) ProtoMessage()    {}
-
-func (m *SetDataCommand) GetData() *Data {
-	if m != nil {
-		return m.Data
-	}
-	return nil
-}
-
-var E_SetDataCommand_Command = &proto.ExtensionDesc{
-	ExtendedType:  (*Command)(nil),
-	ExtensionType: (*SetDataCommand)(nil),
-	Field:         117,
-	Name:          "internal.SetDataCommand.command",
-	Tag:           "bytes,117,opt,name=command",
-}
-
-type SetAdminPrivilegeCommand struct {
-	Username         *string `protobuf:"bytes,1,req,name=Username" json:"Username,omitempty"`
-	Admin            *bool   `protobuf:"varint,2,req,name=Admin" json:"Admin,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *SetAdminPrivilegeCommand) Reset()         { *m = SetAdminPrivilegeCommand{} }
-func (m *SetAdminPrivilegeCommand) String() string { return proto.CompactTextString(m) }
-func (*SetAdminPrivilegeCommand) ProtoMessage()    {}
-
-func (m *SetAdminPrivilegeCommand) GetUsername() string {
-	if m != nil && m.Username != nil {
-		return *m.Username
-	}
-	return ""
-}
-
-func (m *SetAdminPrivilegeCommand) GetAdmin() bool {
-	if m != nil && m.Admin != nil {
-		return *m.Admin
-	}
-	return false
-}
-
-var E_SetAdminPrivilegeCommand_Command = &proto.ExtensionDesc{
-	ExtendedType:  (*Command)(nil),
-	ExtensionType: (*SetAdminPrivilegeCommand)(nil),
-	Field:         118,
-	Name:          "internal.SetAdminPrivilegeCommand.command",
-	Tag:           "bytes,118,opt,name=command",
-}
-
-type UpdateNodeCommand struct {
-	ID               *uint64 `protobuf:"varint,1,req,name=ID" json:"ID,omitempty"`
-	Host             *string `protobuf:"bytes,2,req,name=Host" json:"Host,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *UpdateNodeCommand) Reset()         { *m = UpdateNodeCommand{} }
-func (m *UpdateNodeCommand) String() string { return proto.CompactTextString(m) }
-func (*UpdateNodeCommand) ProtoMessage()    {}
-
-func (m *UpdateNodeCommand) GetID() uint64 {
-	if m != nil && m.ID != nil {
-		return *m.ID
-	}
-	return 0
-}
-
-func (m *UpdateNodeCommand) GetHost() string {
-	if m != nil && m.Host != nil {
-		return *m.Host
-	}
-	return ""
-}
-
-var E_UpdateNodeCommand_Command = &proto.ExtensionDesc{
-	ExtendedType:  (*Command)(nil),
-	ExtensionType: (*UpdateNodeCommand)(nil),
-	Field:         119,
-	Name:          "internal.UpdateNodeCommand.command",
-	Tag:           "bytes,119,opt,name=command",
-}
-
-type CreateSubscriptionCommand struct {
-	Name             *string  `protobuf:"bytes,1,req,name=Name" json:"Name,omitempty"`
-	Database         *string  `protobuf:"bytes,2,req,name=Database" json:"Database,omitempty"`
-	RetentionPolicy  *string  `protobuf:"bytes,3,req,name=RetentionPolicy" json:"RetentionPolicy,omitempty"`
-	Mode             *string  `protobuf:"bytes,4,req,name=Mode" json:"Mode,omitempty"`
-	Destinations     []string `protobuf:"bytes,5,rep,name=Destinations" json:"Destinations,omitempty"`
-	XXX_unrecognized []byte   `json:"-"`
-}
-
-func (m *CreateSubscriptionCommand) Reset()         { *m = CreateSubscriptionCommand{} }
-func (m *CreateSubscriptionCommand) String() string { return proto.CompactTextString(m) }
-func (*CreateSubscriptionCommand) ProtoMessage()    {}
-
-func (m *CreateSubscriptionCommand) GetName() string {
-	if m != nil && m.Name != nil {
-		return *m.Name
-	}
-	return ""
-}
-
-func (m *CreateSubscriptionCommand) GetDatabase() string {
-	if m != nil && m.Database != nil {
-		return *m.Database
-	}
-	return ""
-}
-
-func (m *CreateSubscriptionCommand) GetRetentionPolicy() string {
-	if m != nil && m.RetentionPolicy != nil {
-		return *m.RetentionPolicy
-	}
-	return ""
-}
-
-func (m *CreateSubscriptionCommand) GetMode() string {
-	if m != nil && m.Mode != nil {
-		return *m.Mode
-	}
-	return ""
-}
-
-func (m *CreateSubscriptionCommand) GetDestinations() []string {
-	if m != nil {
-		return m.Destinations
-	}
-	return nil
-}
-
-var E_CreateSubscriptionCommand_Command = &proto.ExtensionDesc{
-	ExtendedType:  (*Command)(nil),
-	ExtensionType: (*CreateSubscriptionCommand)(nil),
-	Field:         121,
-	Name:          "internal.CreateSubscriptionCommand.command",
-	Tag:           "bytes,121,opt,name=command",
-}
-
-type DropSubscriptionCommand struct {
-	Name             *string `protobuf:"bytes,1,req,name=Name" json:"Name,omitempty"`
-	Database         *string `protobuf:"bytes,2,req,name=Database" json:"Database,omitempty"`
-	RetentionPolicy  *string `protobuf:"bytes,3,req,name=RetentionPolicy" json:"RetentionPolicy,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *DropSubscriptionCommand) Reset()         { *m = DropSubscriptionCommand{} }
-func (m *DropSubscriptionCommand) String() string { return proto.CompactTextString(m) }
-func (*DropSubscriptionCommand) ProtoMessage()    {}
-
-func (m *DropSubscriptionCommand) GetName() string {
-	if m != nil && m.Name != nil {
-		return *m.Name
-	}
-	return ""
-}
-
-func (m *DropSubscriptionCommand) GetDatabase() string {
-	if m != nil && m.Database != nil {
-		return *m.Database
-	}
-	return ""
-}
-
-func (m *DropSubscriptionCommand) GetRetentionPolicy() string {
-	if m != nil && m.RetentionPolicy != nil {
-		return *m.RetentionPolicy
-	}
-	return ""
-}
-
-var E_DropSubscriptionCommand_Command = &proto.ExtensionDesc{
-	ExtendedType:  (*Command)(nil),
-	ExtensionType: (*DropSubscriptionCommand)(nil),
-	Field:         122,
-	Name:          "internal.DropSubscriptionCommand.command",
-	Tag:           "bytes,122,opt,name=command",
-}
-
-type RemovePeerCommand struct {
-	ID               *uint64 `protobuf:"varint,1,req,name=ID" json:"ID,omitempty"`
-	Addr             *string `protobuf:"bytes,2,req,name=Addr" json:"Addr,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *RemovePeerCommand) Reset()         { *m = RemovePeerCommand{} }
-func (m *RemovePeerCommand) String() string { return proto.CompactTextString(m) }
-func (*RemovePeerCommand) ProtoMessage()    {}
-
-func (m *RemovePeerCommand) GetID() uint64 {
-	if m != nil && m.ID != nil {
-		return *m.ID
-	}
-	return 0
-}
-
-func (m *RemovePeerCommand) GetAddr() string {
-	if m != nil && m.Addr != nil {
-		return *m.Addr
-	}
-	return ""
-}
-
-var E_RemovePeerCommand_Command = &proto.ExtensionDesc{
-	ExtendedType:  (*Command)(nil),
-	ExtensionType: (*RemovePeerCommand)(nil),
-	Field:         123,
-	Name:          "internal.RemovePeerCommand.command",
-	Tag:           "bytes,123,opt,name=command",
-}
-
-type Response struct {
-	OK               *bool   `protobuf:"varint,1,req,name=OK" json:"OK,omitempty"`
-	Error            *string `protobuf:"bytes,2,opt,name=Error" json:"Error,omitempty"`
-	Index            *uint64 `protobuf:"varint,3,opt,name=Index" json:"Index,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *Response) Reset()         { *m = Response{} }
-func (m *Response) String() string { return proto.CompactTextString(m) }
-func (*Response) ProtoMessage()    {}
-
-func (m *Response) GetOK() bool {
-	if m != nil && m.OK != nil {
-		return *m.OK
-	}
-	return false
-}
-
-func (m *Response) GetError() string {
-	if m != nil && m.Error != nil {
-		return *m.Error
-	}
-	return ""
-}
-
-func (m *Response) GetIndex() uint64 {
-	if m != nil && m.Index != nil {
-		return *m.Index
-	}
-	return 0
-}
-
-type ResponseHeader struct {
-	OK               *bool   `protobuf:"varint,1,req,name=OK" json:"OK,omitempty"`
-	Error            *string `protobuf:"bytes,2,opt,name=Error" json:"Error,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *ResponseHeader) Reset()         { *m = ResponseHeader{} }
-func (m *ResponseHeader) String() string { return proto.CompactTextString(m) }
-func (*ResponseHeader) ProtoMessage()    {}
-
-func (m *ResponseHeader) GetOK() bool {
-	if m != nil && m.OK != nil {
-		return *m.OK
-	}
-	return false
-}
-
-func (m *ResponseHeader) GetError() string {
-	if m != nil && m.Error != nil {
-		return *m.Error
-	}
-	return ""
-}
-
-type ErrorResponse struct {
-	Header           *ResponseHeader `protobuf:"bytes,1,req,name=Header" json:"Header,omitempty"`
-	XXX_unrecognized []byte          `json:"-"`
-}
-
-func (m *ErrorResponse) Reset()         { *m = ErrorResponse{} }
-func (m *ErrorResponse) String() string { return proto.CompactTextString(m) }
-func (*ErrorResponse) ProtoMessage()    {}
-
-func (m *ErrorResponse) GetHeader() *ResponseHeader {
-	if m != nil {
-		return m.Header
-	}
-	return nil
-}
-
-type FetchDataRequest struct {
-	Index            *uint64 `protobuf:"varint,1,req,name=Index" json:"Index,omitempty"`
-	Term             *uint64 `protobuf:"varint,2,req,name=Term" json:"Term,omitempty"`
-	Blocking         *bool   `protobuf:"varint,3,opt,name=Blocking,def=0" json:"Blocking,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *FetchDataRequest) Reset()         { *m = FetchDataRequest{} }
-func (m *FetchDataRequest) String() string { return proto.CompactTextString(m) }
-func (*FetchDataRequest) ProtoMessage()    {}
-
-const Default_FetchDataRequest_Blocking bool = false
-
-func (m *FetchDataRequest) GetIndex() uint64 {
-	if m != nil && m.Index != nil {
-		return *m.Index
-	}
-	return 0
-}
-
-func (m *FetchDataRequest) GetTerm() uint64 {
-	if m != nil && m.Term != nil {
-		return *m.Term
-	}
-	return 0
-}
-
-func (m *FetchDataRequest) GetBlocking() bool {
-	if m != nil && m.Blocking != nil {
-		return *m.Blocking
-	}
-	return Default_FetchDataRequest_Blocking
-}
-
-type FetchDataResponse struct {
-	Header           *ResponseHeader `protobuf:"bytes,1,req,name=Header" json:"Header,omitempty"`
-	Index            *uint64         `protobuf:"varint,2,req,name=Index" json:"Index,omitempty"`
-	Term             *uint64         `protobuf:"varint,3,req,name=Term" json:"Term,omitempty"`
-	Data             []byte          `protobuf:"bytes,4,opt,name=Data" json:"Data,omitempty"`
-	XXX_unrecognized []byte          `json:"-"`
-}
-
-func (m *FetchDataResponse) Reset()         { *m = FetchDataResponse{} }
-func (m *FetchDataResponse) String() string { return proto.CompactTextString(m) }
-func (*FetchDataResponse) ProtoMessage()    {}
-
-func (m *FetchDataResponse) GetHeader() *ResponseHeader {
-	if m != nil {
-		return m.Header
-	}
-	return nil
-}
-
-func (m *FetchDataResponse) GetIndex() uint64 {
-	if m != nil && m.Index != nil {
-		return *m.Index
-	}
-	return 0
-}
-
-func (m *FetchDataResponse) GetTerm() uint64 {
-	if m != nil && m.Term != nil {
-		return *m.Term
-	}
-	return 0
-}
-
-func (m *FetchDataResponse) GetData() []byte {
-	if m != nil {
-		return m.Data
-	}
-	return nil
-}
-
-type JoinRequest struct {
-	Addr             *string `protobuf:"bytes,1,req,name=Addr" json:"Addr,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *JoinRequest) Reset()         { *m = JoinRequest{} }
-func (m *JoinRequest) String() string { return proto.CompactTextString(m) }
-func (*JoinRequest) ProtoMessage()    {}
-
-func (m *JoinRequest) GetAddr() string {
-	if m != nil && m.Addr != nil {
-		return *m.Addr
-	}
-	return ""
-}
-
-type JoinResponse struct {
-	Header           *ResponseHeader `protobuf:"bytes,1,req,name=Header" json:"Header,omitempty"`
-	EnableRaft       *bool           `protobuf:"varint,2,opt,name=EnableRaft" json:"EnableRaft,omitempty"`
-	RaftNodes        []string        `protobuf:"bytes,3,rep,name=RaftNodes" json:"RaftNodes,omitempty"`
-	NodeID           *uint64         `protobuf:"varint,4,opt,name=NodeID" json:"NodeID,omitempty"`
-	XXX_unrecognized []byte          `json:"-"`
-}
-
-func (m *JoinResponse) Reset()         { *m = JoinResponse{} }
-func (m *JoinResponse) String() string { return proto.CompactTextString(m) }
-func (*JoinResponse) ProtoMessage()    {}
-
-func (m *JoinResponse) GetHeader() *ResponseHeader {
-	if m != nil {
-		return m.Header
-	}
-	return nil
-}
-
-func (m *JoinResponse) GetEnableRaft() bool {
-	if m != nil && m.EnableRaft != nil {
-		return *m.EnableRaft
-	}
-	return false
-}
-
-func (m *JoinResponse) GetRaftNodes() []string {
-	if m != nil {
-		return m.RaftNodes
-	}
-	return nil
-}
-
-func (m *JoinResponse) GetNodeID() uint64 {
-	if m != nil && m.NodeID != nil {
-		return *m.NodeID
-	}
-	return 0
-}
-
-type PromoteRaftRequest struct {
-	Addr             *string  `protobuf:"bytes,1,req,name=Addr" json:"Addr,omitempty"`
-	RaftNodes        []string `protobuf:"bytes,2,rep,name=RaftNodes" json:"RaftNodes,omitempty"`
-	XXX_unrecognized []byte   `json:"-"`
-}
-
-func (m *PromoteRaftRequest) Reset()         { *m = PromoteRaftRequest{} }
-func (m *PromoteRaftRequest) String() string { return proto.CompactTextString(m) }
-func (*PromoteRaftRequest) ProtoMessage()    {}
-
-func (m *PromoteRaftRequest) GetAddr() string {
-	if m != nil && m.Addr != nil {
-		return *m.Addr
-	}
-	return ""
-}
-
-func (m *PromoteRaftRequest) GetRaftNodes() []string {
-	if m != nil {
-		return m.RaftNodes
-	}
-	return nil
-}
-
-type PromoteRaftResponse struct {
-	Header           *ResponseHeader `protobuf:"bytes,1,req,name=Header" json:"Header,omitempty"`
-	Success          *bool           `protobuf:"varint,2,opt,name=Success" json:"Success,omitempty"`
-	XXX_unrecognized []byte          `json:"-"`
-}
-
-func (m *PromoteRaftResponse) Reset()         { *m = PromoteRaftResponse{} }
-func (m *PromoteRaftResponse) String() string { return proto.CompactTextString(m) }
-func (*PromoteRaftResponse) ProtoMessage()    {}
-
-func (m *PromoteRaftResponse) GetHeader() *ResponseHeader {
-	if m != nil {
-		return m.Header
-	}
-	return nil
-}
-
-func (m *PromoteRaftResponse) GetSuccess() bool {
-	if m != nil && m.Success != nil {
-		return *m.Success
-	}
-	return false
-}
-
-func init() {
-	proto.RegisterEnum("internal.RPCType", RPCType_name, RPCType_value)
-	proto.RegisterEnum("internal.Command_Type", Command_Type_name, Command_Type_value)
-	proto.RegisterExtension(E_CreateNodeCommand_Command)
-	proto.RegisterExtension(E_DeleteNodeCommand_Command)
-	proto.RegisterExtension(E_CreateDatabaseCommand_Command)
-	proto.RegisterExtension(E_DropDatabaseCommand_Command)
-	proto.RegisterExtension(E_CreateRetentionPolicyCommand_Command)
-	proto.RegisterExtension(E_DropRetentionPolicyCommand_Command)
-	proto.RegisterExtension(E_SetDefaultRetentionPolicyCommand_Command)
-	proto.RegisterExtension(E_UpdateRetentionPolicyCommand_Command)
-	proto.RegisterExtension(E_CreateShardGroupCommand_Command)
-	proto.RegisterExtension(E_DeleteShardGroupCommand_Command)
-	proto.RegisterExtension(E_CreateContinuousQueryCommand_Command)
-	proto.RegisterExtension(E_DropContinuousQueryCommand_Command)
-	proto.RegisterExtension(E_CreateUserCommand_Command)
-	proto.RegisterExtension(E_DropUserCommand_Command)
-	proto.RegisterExtension(E_UpdateUserCommand_Command)
-	proto.RegisterExtension(E_SetPrivilegeCommand_Command)
-	proto.RegisterExtension(E_SetDataCommand_Command)
-	proto.RegisterExtension(E_SetAdminPrivilegeCommand_Command)
-	proto.RegisterExtension(E_UpdateNodeCommand_Command)
-	proto.RegisterExtension(E_CreateSubscriptionCommand_Command)
-	proto.RegisterExtension(E_DropSubscriptionCommand_Command)
-	proto.RegisterExtension(E_RemovePeerCommand_Command)
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/meta/internal/meta.proto b/Godeps/_workspace/src/github.com/influxdb/influxdb/meta/internal/meta.proto
deleted file mode 100644
index 2308d6a3d..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/meta/internal/meta.proto
+++ /dev/null
@@ -1,377 +0,0 @@
-package internal;
-
-//========================================================================
-//
-// Metadata
-//
-//========================================================================
-
-message Data {
-	required uint64 Term = 1;
-	required uint64 Index = 2;
-	required uint64 ClusterID = 3;
-
-	repeated NodeInfo Nodes = 4;
-	repeated DatabaseInfo Databases = 5;
-	repeated UserInfo Users = 6;
-
-	required uint64 MaxNodeID = 7;
-	required uint64 MaxShardGroupID = 8;
-	required uint64 MaxShardID = 9;
-}
-
-message NodeInfo {
-	required uint64 ID = 1;
-	required string Host = 2;
-}
-
-message DatabaseInfo {
-	required string Name = 1;
-	required string DefaultRetentionPolicy = 2;
-	repeated RetentionPolicyInfo RetentionPolicies = 3;
-	repeated ContinuousQueryInfo ContinuousQueries = 4;
-}
-
-message RetentionPolicyInfo {
-	required string Name = 1;
-	required int64 Duration = 2;
-	required int64 ShardGroupDuration = 3;
-	required uint32 ReplicaN = 4;
-	repeated ShardGroupInfo ShardGroups = 5;
-	repeated SubscriptionInfo Subscriptions = 6;
-}
-
-message ShardGroupInfo {
-	required uint64 ID = 1;
-	required int64 StartTime = 2;
-	required int64 EndTime = 3;
-	required int64 DeletedAt = 4;
-	repeated ShardInfo Shards = 5;
-}
-
-message ShardInfo {
-    required uint64 ID = 1;
-    repeated uint64 OwnerIDs = 2 [deprecated=true];
-    repeated ShardOwner Owners = 3;
-}
-
-message SubscriptionInfo{
-	required string Name = 1;
-	required string Mode = 2;
-	repeated string Destinations = 3;
-}
-
-message ShardOwner {
-    required uint64 NodeID = 1;
-}
-
-message ContinuousQueryInfo {
-	required string Name = 1;
-	required string Query = 2;
-}
-
-message UserInfo {
-	required string Name = 1;
-	required string Hash = 2;
-	required bool Admin = 3;
-	repeated UserPrivilege Privileges = 4;
-}
-
-message UserPrivilege {
-	required string Database = 1;
-	required int32 Privilege = 2;
-}
-
-
-//========================================================================
-//
-// COMMANDS
-//
-//========================================================================
-
-message Command {
-    extensions 100 to max;
-
-    enum Type {
-		CreateNodeCommand                = 1;
-		DeleteNodeCommand                = 2;
-		CreateDatabaseCommand            = 3;
-		DropDatabaseCommand              = 4;
-		CreateRetentionPolicyCommand     = 5;
-		DropRetentionPolicyCommand       = 6;
-		SetDefaultRetentionPolicyCommand = 7;
-		UpdateRetentionPolicyCommand     = 8;
-		CreateShardGroupCommand          = 9;
-		DeleteShardGroupCommand          = 10;
-		CreateContinuousQueryCommand     = 11;
-		DropContinuousQueryCommand       = 12;
-		CreateUserCommand                = 13;
-		DropUserCommand                  = 14;
-		UpdateUserCommand                = 15;
-		SetPrivilegeCommand              = 16;
-		SetDataCommand                   = 17;
-		SetAdminPrivilegeCommand         = 18;
-		UpdateNodeCommand                = 19;
-		CreateSubscriptionCommand        = 21;
-		DropSubscriptionCommand          = 22;
-		RemovePeerCommand                = 23;
-    }
-
-    required Type type = 1;
-}
-
-message CreateNodeCommand {
-    extend Command {
-        optional CreateNodeCommand command = 101;
-    }
-	required string Host = 1;
-	required uint64 Rand = 2;
-}
-
-message DeleteNodeCommand {
-    extend Command {
-        optional DeleteNodeCommand command = 102;
-    }
-	required uint64 ID = 1;
-	required bool Force = 2;
-}
-
-message CreateDatabaseCommand {
-    extend Command {
-        optional CreateDatabaseCommand command = 103;
-    }
-	required string Name = 1;
-}
-
-message DropDatabaseCommand {
-    extend Command {
-        optional DropDatabaseCommand command = 104;
-    }
-	required string Name = 1;
-}
-
-message CreateRetentionPolicyCommand {
-    extend Command {
-        optional CreateRetentionPolicyCommand command = 105;
-    }
-	required string Database = 1;
-	required RetentionPolicyInfo RetentionPolicy = 2;
-}
-
-message DropRetentionPolicyCommand {
-    extend Command {
-        optional DropRetentionPolicyCommand command = 106;
-    }
-	required string Database = 1;
-	required string Name = 2;
-}
-
-message SetDefaultRetentionPolicyCommand {
-    extend Command {
-        optional SetDefaultRetentionPolicyCommand command = 107;
-    }
-	required string Database = 1;
-	required string Name = 2;
-}
-
-message UpdateRetentionPolicyCommand {
-    extend Command {
-        optional UpdateRetentionPolicyCommand command = 108;
-    }
-	required string Database = 1;
-	required string Name = 2;
-	optional string NewName = 3;
-	optional int64 Duration = 4;
-	optional uint32 ReplicaN = 5;
-}
-
-message CreateShardGroupCommand {
-    extend Command {
-        optional CreateShardGroupCommand command = 109;
-    }
-    required string Database = 1;
-    required string Policy = 2;
-    required int64 Timestamp = 3;
-}
-
-message DeleteShardGroupCommand {
-    extend Command {
-        optional DeleteShardGroupCommand command = 110;
-    }
-    required string Database = 1;
-    required string Policy = 2;
-    required uint64 ShardGroupID = 3;
-}
-
-message CreateContinuousQueryCommand {
-    extend Command {
-        optional CreateContinuousQueryCommand command = 111;
-    }
-    required string Database = 1;
-    required string Name = 2;
-    required string Query = 3;
-}
-
-message DropContinuousQueryCommand {
-    extend Command {
-        optional DropContinuousQueryCommand command = 112;
-    }
-    required string Database = 1;
-    required string Name = 2;
-}
-
-message CreateUserCommand {
-    extend Command {
-        optional CreateUserCommand command = 113;
-    }
-    required string Name = 1;
-    required string Hash = 2;
-    required bool Admin = 3;
-}
-
-message DropUserCommand {
-    extend Command {
-        optional DropUserCommand command = 114;
-    }
-    required string Name = 1;
-}
-
-message UpdateUserCommand {
-    extend Command {
-        optional UpdateUserCommand command = 115;
-    }
-    required string Name = 1;
-    required string Hash = 2;
-}
-
-message SetPrivilegeCommand {
-    extend Command {
-        optional SetPrivilegeCommand command = 116;
-    }
-    required string Username = 1;
-    required string Database = 2;
-    required int32 Privilege = 3;
-}
-
-message SetDataCommand {
-    extend Command {
-        optional SetDataCommand command = 117;
-    }
-    required Data Data = 1;
-}
-
-message SetAdminPrivilegeCommand {
-    extend Command {
-        optional SetAdminPrivilegeCommand command = 118;
-    }
-    required string Username = 1;
-    required bool Admin = 2;
-}
-
-message UpdateNodeCommand {
-    extend Command {
-        optional UpdateNodeCommand command = 119;
-    }
-    required uint64 ID = 1;
-    required string Host = 2;
-}
-
-message CreateSubscriptionCommand {
-    extend Command {
-        optional CreateSubscriptionCommand command = 121;
-    }
-    required string Name = 1;
-    required string Database = 2;
-    required string RetentionPolicy = 3;
-    required string Mode = 4;
-    repeated string Destinations = 5;
-
-}
-
-message DropSubscriptionCommand {
-    extend Command {
-        optional DropSubscriptionCommand command = 122;
-    }
-    required string Name = 1;
-    required string Database = 2;
-    required string RetentionPolicy = 3;
-}
-
-message RemovePeerCommand {
-    extend Command {
-        optional RemovePeerCommand command = 123;
-    }
-	required uint64 ID = 1;
-	required string Addr = 2;
-}
-
-message Response {
-	required bool OK = 1;
-	optional string Error = 2;
-	optional uint64 Index = 3;
-}
-
-
-//========================================================================
-//
-// RPC - higher-level cluster communication operations
-//
-//========================================================================
-
-enum RPCType {
-    Error = 1;
-    FetchData = 2;
-    Join = 3;
-    PromoteRaft = 4;
-}
-
-message ResponseHeader {
-    required bool OK = 1;
-    optional string Error = 2;
-}
-
-message ErrorResponse {
-    required ResponseHeader Header = 1;
-}
-
-message FetchDataRequest {
-    required uint64 Index = 1;
-    required uint64 Term = 2;
-    optional bool Blocking = 3 [default = false];
-}
-
-message FetchDataResponse {
-    required ResponseHeader Header = 1;
-    required uint64 Index = 2;
-    required uint64 Term = 3;
-    optional bytes Data = 4;
-}
-
-message JoinRequest {
-    required string Addr = 1;
-}
-
-message JoinResponse {
-    required ResponseHeader Header = 1;
-
-    // Indicates that this node should take part in the raft cluster.
-    optional bool EnableRaft = 2;
-
-    // The addresses of raft peers to use if joining as a raft member. If not joining
-    // as a raft member, these are the nodes running raft.
-    repeated string RaftNodes = 3;
-
-    // The node ID assigned to the requesting node.
-    optional uint64 NodeID = 4;
-}
-
-message PromoteRaftRequest {
-    required string Addr = 1;
-    repeated string RaftNodes = 2;
-}
-
-message PromoteRaftResponse {
-    required ResponseHeader Header = 1;
-
-    optional bool Success = 2;
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/meta/proxy.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/meta/proxy.go
deleted file mode 100644
index bb0fa75ab..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/meta/proxy.go
+++ /dev/null
@@ -1,62 +0,0 @@
-package meta
-
-import (
-	"io"
-	"net"
-)
-
-// proxy brokers a connection from src to dst
-func proxy(dst, src *net.TCPConn) error {
-	// channels to wait on the close event for each connection
-	serverClosed := make(chan struct{}, 1)
-	clientClosed := make(chan struct{}, 1)
-	errors := make(chan error, 1)
-
-	go broker(dst, src, clientClosed, errors)
-	go broker(src, dst, serverClosed, errors)
-
-	// wait for one half of the proxy to exit, then trigger a shutdown of the
-	// other half by calling CloseRead(). This will break the read loop in the
-	// broker and allow us to fully close the connection cleanly without a
-	// "use of closed network connection" error.
-	var waitFor chan struct{}
-	select {
-	case <-clientClosed:
-		// the client closed first and any more packets from the server aren't
-		// useful, so we can optionally SetLinger(0) here to recycle the port
-		// faster.
-		dst.SetLinger(0)
-		dst.CloseRead()
-		waitFor = serverClosed
-	case <-serverClosed:
-		src.CloseRead()
-		waitFor = clientClosed
-	case err := <-errors:
-		src.CloseRead()
-		dst.SetLinger(0)
-		dst.CloseRead()
-		return err
-	}
-
-	// Wait for the other connection to close.
-	<-waitFor
-	return nil
-}
-
-// This does the actual data transfer.
-// The broker only closes the Read side.
-func broker(dst, src net.Conn, srcClosed chan struct{}, errors chan error) {
-	// We can handle errors in a finer-grained manner by inlining io.Copy (it's
-	// simple, and we drop the ReaderFrom or WriterTo checks for
-	// net.Conn->net.Conn transfers, which aren't needed). This would also let
-	// us adjust buffersize.
-	_, err := io.Copy(dst, src)
-
-	if err != nil {
-		errors <- err
-	}
-	if err := src.Close(); err != nil {
-		errors <- err
-	}
-	srcClosed <- struct{}{}
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/meta/rpc.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/meta/rpc.go
deleted file mode 100644
index e2edab792..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/meta/rpc.go
+++ /dev/null
@@ -1,536 +0,0 @@
-package meta
-
-import (
-	"encoding/binary"
-	"errors"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"log"
-	"net"
-	"time"
-
-	"github.com/gogo/protobuf/proto"
-	"github.com/hashicorp/raft"
-	"github.com/influxdb/influxdb/meta/internal"
-)
-
-// Max size of a message before we treat the size as invalid
-const (
-	MaxMessageSize    = 1024 * 1024 * 1024
-	leaderDialTimeout = 10 * time.Second
-)
-
-// rpc handles request/response style messaging between cluster nodes
-type rpc struct {
-	logger         *log.Logger
-	tracingEnabled bool
-
-	store interface {
-		cachedData() *Data
-		enableLocalRaft() error
-		IsLeader() bool
-		Leader() string
-		Peers() ([]string, error)
-		SetPeers(addrs []string) error
-		AddPeer(host string) error
-		CreateNode(host string) (*NodeInfo, error)
-		NodeByHost(host string) (*NodeInfo, error)
-		WaitForDataChanged() error
-	}
-}
-
-// JoinResult defines the join result structure.
-type JoinResult struct {
-	RaftEnabled bool
-	RaftNodes   []string
-	NodeID      uint64
-}
-
-// Reply defines the interface for Reply objects.
-type Reply interface {
-	GetHeader() *internal.ResponseHeader
-}
-
-// proxyLeader proxies the connection to the current raft leader
-func (r *rpc) proxyLeader(conn *net.TCPConn, buf []byte) {
-	if r.store.Leader() == "" {
-		r.sendError(conn, "no leader detected during proxyLeader")
-		return
-	}
-
-	leaderConn, err := net.DialTimeout("tcp", r.store.Leader(), leaderDialTimeout)
-	if err != nil {
-		r.sendError(conn, fmt.Sprintf("dial leader: %v", err))
-		return
-	}
-	defer leaderConn.Close()
-
-	leaderConn.Write([]byte{MuxRPCHeader})
-	// re-write the original message to the leader
-	leaderConn.Write(buf)
-	if err := proxy(leaderConn.(*net.TCPConn), conn); err != nil {
-		r.sendError(conn, fmt.Sprintf("leader proxy error: %v", err))
-	}
-}
-
-// handleRPCConn reads a command from the connection and executes it.
-func (r *rpc) handleRPCConn(conn net.Conn) {
-	defer conn.Close()
-	// RPC connections should execute on the leader.  If we are not the leader,
-	// proxy the connection to the leader so that clients an connect to any node
-	// in the cluster.
-	r.traceCluster("rpc connection from: %v", conn.RemoteAddr())
-
-	// Read and execute request.
-	typ, buf, err := r.readMessage(conn)
-	// Handle unexpected RPC errors
-	if err != nil {
-		r.sendError(conn, err.Error())
-		return
-	}
-
-	if !r.store.IsLeader() && typ != internal.RPCType_PromoteRaft {
-		r.proxyLeader(conn.(*net.TCPConn), pack(typ, buf))
-		return
-	}
-
-	typ, resp, err := r.executeMessage(conn, typ, buf)
-
-	// Handle unexpected RPC errors
-	if err != nil {
-		r.sendError(conn, err.Error())
-		return
-	}
-
-	// Set the status header and error message
-	if reply, ok := resp.(Reply); ok {
-		reply.GetHeader().OK = proto.Bool(err == nil)
-		if err != nil {
-			reply.GetHeader().Error = proto.String(err.Error())
-		}
-	}
-
-	r.sendResponse(conn, typ, resp)
-}
-
-func (r *rpc) readMessage(conn net.Conn) (internal.RPCType, []byte, error) {
-	// Read request size.
-	var sz uint64
-	if err := binary.Read(conn, binary.BigEndian, &sz); err != nil {
-		return internal.RPCType_Error, nil, fmt.Errorf("read size: %s", err)
-	}
-
-	if sz == 0 {
-		return internal.RPCType_Error, nil, fmt.Errorf("invalid message size: %d", sz)
-	}
-
-	if sz >= MaxMessageSize {
-		return internal.RPCType_Error, nil, fmt.Errorf("max message size of %d exceeded: %d", MaxMessageSize, sz)
-	}
-
-	// Read request.
-	buf := make([]byte, sz)
-	if _, err := io.ReadFull(conn, buf); err != nil {
-		return internal.RPCType_Error, nil, fmt.Errorf("read request: %s", err)
-	}
-
-	// Determine the RPC type
-	rpcType := internal.RPCType(btou64(buf[0:8]))
-	buf = buf[8:]
-
-	r.traceCluster("recv %v request on: %v", rpcType, conn.RemoteAddr())
-	return rpcType, buf, nil
-}
-
-func (r *rpc) executeMessage(conn net.Conn, rpcType internal.RPCType, buf []byte) (internal.RPCType, proto.Message, error) {
-	switch rpcType {
-	case internal.RPCType_FetchData:
-		var req internal.FetchDataRequest
-		if err := proto.Unmarshal(buf, &req); err != nil {
-			return internal.RPCType_Error, nil, fmt.Errorf("fetch request unmarshal: %v", err)
-		}
-		resp, err := r.handleFetchData(&req)
-		return rpcType, resp, err
-	case internal.RPCType_Join:
-		var req internal.JoinRequest
-		if err := proto.Unmarshal(buf, &req); err != nil {
-			return internal.RPCType_Error, nil, fmt.Errorf("join request unmarshal: %v", err)
-		}
-		resp, err := r.handleJoinRequest(&req)
-		return rpcType, resp, err
-	case internal.RPCType_PromoteRaft:
-		var req internal.PromoteRaftRequest
-		if err := proto.Unmarshal(buf, &req); err != nil {
-			return internal.RPCType_Error, nil, fmt.Errorf("promote to raft request unmarshal: %v", err)
-		}
-		resp, err := r.handlePromoteRaftRequest(&req)
-		return rpcType, resp, err
-	default:
-		return internal.RPCType_Error, nil, fmt.Errorf("unknown rpc type:%v", rpcType)
-	}
-}
-
-func (r *rpc) sendResponse(conn net.Conn, typ internal.RPCType, resp proto.Message) {
-	// Marshal the response back to a protobuf
-	buf, err := proto.Marshal(resp)
-	if err != nil {
-		r.logger.Printf("unable to marshal response: %v", err)
-		return
-	}
-
-	// Encode response back to connection.
-	if _, err := conn.Write(pack(typ, buf)); err != nil {
-		r.logger.Printf("unable to write rpc response: %s", err)
-	}
-}
-
-func (r *rpc) sendError(conn net.Conn, msg string) {
-	r.traceCluster(msg)
-	resp := &internal.ErrorResponse{
-		Header: &internal.ResponseHeader{
-			OK:    proto.Bool(false),
-			Error: proto.String(msg),
-		},
-	}
-
-	r.sendResponse(conn, internal.RPCType_Error, resp)
-}
-
-// handleFetchData handles a request for the current nodes meta data
-func (r *rpc) handleFetchData(req *internal.FetchDataRequest) (*internal.FetchDataResponse, error) {
-	var (
-		b    []byte
-		data *Data
-		err  error
-	)
-
-	for {
-		data = r.store.cachedData()
-		if data.Index != req.GetIndex() {
-			b, err = data.MarshalBinary()
-			if err != nil {
-				return nil, err
-			}
-			break
-		}
-
-		if !req.GetBlocking() {
-			break
-		}
-
-		if err := r.store.WaitForDataChanged(); err != nil {
-			return nil, err
-		}
-	}
-
-	return &internal.FetchDataResponse{
-		Header: &internal.ResponseHeader{
-			OK: proto.Bool(true),
-		},
-		Index: proto.Uint64(data.Index),
-		Term:  proto.Uint64(data.Term),
-		Data:  b}, nil
-}
-
-// handleJoinRequest handles a request to join the cluster
-func (r *rpc) handleJoinRequest(req *internal.JoinRequest) (*internal.JoinResponse, error) {
-	r.traceCluster("join request from: %v", *req.Addr)
-
-	node, err := func() (*NodeInfo, error) {
-
-		// attempt to create the node
-		node, err := r.store.CreateNode(*req.Addr)
-		// if it exists, return the existing node
-		if err == ErrNodeExists {
-			node, err = r.store.NodeByHost(*req.Addr)
-			if err != nil {
-				return node, err
-			}
-			r.logger.Printf("existing node re-joined: id=%v addr=%v", node.ID, node.Host)
-		} else if err != nil {
-			return nil, fmt.Errorf("create node: %v", err)
-		}
-
-		peers, err := r.store.Peers()
-		if err != nil {
-			return nil, fmt.Errorf("list peers: %v", err)
-		}
-
-		// If we have less than 3 nodes, add them as raft peers if they are not
-		// already a peer
-		if len(peers) < MaxRaftNodes && !raft.PeerContained(peers, *req.Addr) {
-			r.logger.Printf("adding new raft peer: nodeId=%v addr=%v", node.ID, *req.Addr)
-			if err = r.store.AddPeer(*req.Addr); err != nil {
-				return node, fmt.Errorf("add peer: %v", err)
-			}
-		}
-		return node, err
-	}()
-
-	nodeID := uint64(0)
-	if node != nil {
-		nodeID = node.ID
-	}
-
-	if err != nil {
-		return nil, err
-	}
-
-	// get the current raft peers
-	peers, err := r.store.Peers()
-	if err != nil {
-		return nil, fmt.Errorf("list peers: %v", err)
-	}
-
-	return &internal.JoinResponse{
-		Header: &internal.ResponseHeader{
-			OK: proto.Bool(true),
-		},
-		EnableRaft: proto.Bool(raft.PeerContained(peers, *req.Addr)),
-		RaftNodes:  peers,
-		NodeID:     proto.Uint64(nodeID),
-	}, err
-}
-
-func (r *rpc) handlePromoteRaftRequest(req *internal.PromoteRaftRequest) (*internal.PromoteRaftResponse, error) {
-	r.traceCluster("promote raft request from: %v", *req.Addr)
-
-	// Need to set the local store peers to match what we are about to join
-	if err := r.store.SetPeers(req.RaftNodes); err != nil {
-		return nil, err
-	}
-
-	if err := r.store.enableLocalRaft(); err != nil {
-		return nil, err
-	}
-
-	if !contains(req.RaftNodes, *req.Addr) {
-		req.RaftNodes = append(req.RaftNodes, *req.Addr)
-	}
-
-	if err := r.store.SetPeers(req.RaftNodes); err != nil {
-		return nil, err
-	}
-
-	return &internal.PromoteRaftResponse{
-		Header: &internal.ResponseHeader{
-			OK: proto.Bool(true),
-		},
-		Success: proto.Bool(true),
-	}, nil
-}
-
-// pack returns a TLV style byte slice encoding the size of the payload, the RPC type
-// and the RPC data
-func pack(typ internal.RPCType, b []byte) []byte {
-	buf := u64tob(uint64(len(b)) + 8)
-	buf = append(buf, u64tob(uint64(typ))...)
-	buf = append(buf, b...)
-	return buf
-}
-
-// fetchMetaData returns the latest copy of the meta store data from the current
-// leader.
-func (r *rpc) fetchMetaData(blocking bool) (*Data, error) {
-	assert(r.store != nil, "store is nil")
-
-	// Retrieve the current known leader.
-	leader := r.store.Leader()
-	if leader == "" {
-		return nil, errors.New("no leader detected during fetchMetaData")
-	}
-
-	var index, term uint64
-	data := r.store.cachedData()
-	if data != nil {
-		index = data.Index
-		term = data.Index
-	}
-	resp, err := r.call(leader, &internal.FetchDataRequest{
-		Index:    proto.Uint64(index),
-		Term:     proto.Uint64(term),
-		Blocking: proto.Bool(blocking),
-	})
-	if err != nil {
-		return nil, err
-	}
-
-	switch t := resp.(type) {
-	case *internal.FetchDataResponse:
-		// If data is nil, then the term and index we sent matches the leader
-		if t.GetData() == nil {
-			return nil, nil
-		}
-		ms := &Data{}
-		if err := ms.UnmarshalBinary(t.GetData()); err != nil {
-			return nil, fmt.Errorf("rpc unmarshal metadata: %v", err)
-		}
-		return ms, nil
-	case *internal.ErrorResponse:
-		return nil, fmt.Errorf("rpc failed: %s", t.GetHeader().GetError())
-	default:
-		return nil, fmt.Errorf("rpc failed: unknown response type: %v", t.String())
-	}
-}
-
-// join attempts to join a cluster at remoteAddr using localAddr as the current
-// node's cluster address
-func (r *rpc) join(localAddr, remoteAddr string) (*JoinResult, error) {
-	req := &internal.JoinRequest{
-		Addr: proto.String(localAddr),
-	}
-
-	resp, err := r.call(remoteAddr, req)
-	if err != nil {
-		return nil, err
-	}
-
-	switch t := resp.(type) {
-	case *internal.JoinResponse:
-		return &JoinResult{
-			RaftEnabled: t.GetEnableRaft(),
-			RaftNodes:   t.GetRaftNodes(),
-			NodeID:      t.GetNodeID(),
-		}, nil
-	case *internal.ErrorResponse:
-		return nil, fmt.Errorf("rpc failed: %s", t.GetHeader().GetError())
-	default:
-		return nil, fmt.Errorf("rpc failed: unknown response type: %v", t.String())
-	}
-}
-
-// enableRaft attempts to promote a node at remoteAddr using localAddr as the current
-// node's cluster address
-func (r *rpc) enableRaft(addr string, peers []string) error {
-	req := &internal.PromoteRaftRequest{
-		Addr:      proto.String(addr),
-		RaftNodes: peers,
-	}
-
-	resp, err := r.call(addr, req)
-	if err != nil {
-		return err
-	}
-
-	switch t := resp.(type) {
-	case *internal.PromoteRaftResponse:
-		return nil
-	case *internal.ErrorResponse:
-		return fmt.Errorf("rpc failed: %s", t.GetHeader().GetError())
-	default:
-		return fmt.Errorf("rpc failed: unknown response type: %v", t.String())
-	}
-}
-
-// call sends an encoded request to the remote leader and returns
-// an encoded response value.
-func (r *rpc) call(dest string, req proto.Message) (proto.Message, error) {
-	// Determine type of request
-	var rpcType internal.RPCType
-	switch t := req.(type) {
-	case *internal.JoinRequest:
-		rpcType = internal.RPCType_Join
-	case *internal.FetchDataRequest:
-		rpcType = internal.RPCType_FetchData
-	case *internal.PromoteRaftRequest:
-		rpcType = internal.RPCType_PromoteRaft
-	default:
-		return nil, fmt.Errorf("unknown rpc request type: %v", t)
-	}
-
-	// Create a connection to the leader.
-	conn, err := net.DialTimeout("tcp", dest, leaderDialTimeout)
-	if err != nil {
-		return nil, fmt.Errorf("rpc dial: %v", err)
-	}
-	defer conn.Close()
-
-	// Write a marker byte for rpc messages.
-	_, err = conn.Write([]byte{MuxRPCHeader})
-	if err != nil {
-		return nil, err
-	}
-
-	b, err := proto.Marshal(req)
-	if err != nil {
-		return nil, fmt.Errorf("rpc marshal: %v", err)
-	}
-
-	// Write request size & bytes.
-	if _, err := conn.Write(pack(rpcType, b)); err != nil {
-		return nil, fmt.Errorf("write %v rpc: %s", rpcType, err)
-	}
-
-	data, err := ioutil.ReadAll(conn)
-	if err != nil {
-		return nil, fmt.Errorf("read %v rpc: %v", rpcType, err)
-	}
-
-	// Should always have a size and type
-	if exp := 16; len(data) < exp {
-		r.traceCluster("recv: %v", string(data))
-		return nil, fmt.Errorf("rpc %v failed: short read: got %v, exp %v", rpcType, len(data), exp)
-	}
-
-	sz := btou64(data[0:8])
-	if len(data[8:]) != int(sz) {
-		r.traceCluster("recv: %v", string(data))
-		return nil, fmt.Errorf("rpc %v failed: short read: got %v, exp %v", rpcType, len(data[8:]), sz)
-	}
-
-	// See what response type we got back, could get a general error response
-	rpcType = internal.RPCType(btou64(data[8:16]))
-	data = data[16:]
-
-	var resp proto.Message
-	switch rpcType {
-	case internal.RPCType_Join:
-		resp = &internal.JoinResponse{}
-	case internal.RPCType_FetchData:
-		resp = &internal.FetchDataResponse{}
-	case internal.RPCType_Error:
-		resp = &internal.ErrorResponse{}
-	case internal.RPCType_PromoteRaft:
-		resp = &internal.PromoteRaftResponse{}
-	default:
-		return nil, fmt.Errorf("unknown rpc response type: %v", rpcType)
-	}
-
-	if err := proto.Unmarshal(data, resp); err != nil {
-		return nil, fmt.Errorf("rpc unmarshal: %v", err)
-	}
-
-	if reply, ok := resp.(Reply); ok {
-		if !reply.GetHeader().GetOK() {
-			return nil, fmt.Errorf("rpc %v failed: %s", rpcType, reply.GetHeader().GetError())
-		}
-	}
-
-	return resp, nil
-}
-
-func (r *rpc) traceCluster(msg string, args ...interface{}) {
-	if r.tracingEnabled {
-		r.logger.Printf("rpc: "+msg, args...)
-	}
-}
-
-func u64tob(v uint64) []byte {
-	b := make([]byte, 8)
-	binary.BigEndian.PutUint64(b, v)
-	return b
-}
-
-func btou64(b []byte) uint64 {
-	return binary.BigEndian.Uint64(b)
-}
-
-func contains(s []string, e string) bool {
-	for _, a := range s {
-		if a == e {
-			return true
-		}
-	}
-	return false
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/meta/rpc_test.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/meta/rpc_test.go
deleted file mode 100644
index 76e77f867..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/meta/rpc_test.go
+++ /dev/null
@@ -1,248 +0,0 @@
-package meta
-
-import (
-	"net"
-	"sync"
-	"testing"
-)
-
-func TestRPCFetchData(t *testing.T) {
-
-	serverRPC := &rpc{
-		store: &fakeStore{
-			md: &Data{Index: 99},
-		},
-	}
-
-	srv := newTestServer(t, serverRPC)
-	defer srv.Close()
-	go srv.Serve()
-
-	// Wait for the RPC server to be ready
-	<-srv.Ready
-
-	// create a new RPC with no existing meta.Data cache
-	clientRPC := &rpc{
-		store: &fakeStore{
-			leader: srv.Listener.Addr().String(),
-		},
-	}
-
-	// fetch the servers meta-data
-	md, err := clientRPC.fetchMetaData(false)
-	if err != nil {
-		t.Fatalf("failed to fetchMetaData: %v", err)
-	}
-
-	if md == nil {
-		t.Fatalf("meta-data is nil")
-	}
-
-	if exp := uint64(99); md.Index != exp {
-		t.Fatalf("meta-data mismatch. got %v, exp %v", md.Index, exp)
-	}
-}
-
-func TestRPCFetchDataMatchesLeader(t *testing.T) {
-	serverRPC := &rpc{
-		store: &fakeStore{
-			md: &Data{Index: 99},
-		},
-	}
-
-	srv := newTestServer(t, serverRPC)
-	defer srv.Close()
-	go srv.Serve()
-
-	// Wait for the RPC server to be ready
-	<-srv.Ready
-
-	// create a new RPC with a matching index as the server
-	clientRPC := &rpc{
-		store: &fakeStore{
-			leader: srv.Listener.Addr().String(),
-			md:     &Data{Index: 99},
-		},
-	}
-
-	// fetch the servers meta-data
-	md, err := clientRPC.fetchMetaData(false)
-	if err != nil {
-		t.Fatalf("failed to fetchMetaData: %v", err)
-	}
-
-	if md != nil {
-		t.Fatalf("meta-data is not nil")
-	}
-}
-
-func TestRPCFetchDataMatchesBlocking(t *testing.T) {
-	fs := &fakeStore{
-		md:        &Data{Index: 99},
-		blockChan: make(chan struct{}),
-	}
-	serverRPC := &rpc{
-		store: fs,
-	}
-
-	srv := newTestServer(t, serverRPC)
-	defer srv.Close()
-	go srv.Serve()
-
-	// Wait for the RPC server to be ready
-	<-srv.Ready
-
-	// create a new RPC with a matching index as the server
-	clientRPC := &rpc{
-		store: &fakeStore{
-			leader: srv.Listener.Addr().String(),
-			md:     &Data{Index: 99},
-		},
-	}
-
-	// Kick off the fetching block
-	var wg sync.WaitGroup
-	wg.Add(1)
-	go func() {
-		defer wg.Done()
-		// fetch the servers meta-data
-		md, err := clientRPC.fetchMetaData(true)
-		if err != nil {
-			t.Fatalf("failed to fetchMetaData: %v", err)
-		}
-
-		if md == nil {
-			t.Fatalf("meta-data is nil")
-		}
-
-		if exp := uint64(100); md.Index != exp {
-			t.Fatalf("meta-data mismatch. got %v, exp %v", md.Index, exp)
-		}
-	}()
-
-	// Simulate the rmote index changing and unblocking
-	fs.mu.Lock()
-	fs.md = &Data{Index: 100}
-	fs.mu.Unlock()
-	close(fs.blockChan)
-	wg.Wait()
-}
-
-func TestRPCJoin(t *testing.T) {
-	fs := &fakeStore{
-		leader:    "1.2.3.4:1234",
-		md:        &Data{Index: 99},
-		newNodeID: uint64(100),
-		blockChan: make(chan struct{}),
-	}
-	serverRPC := &rpc{
-		store: fs,
-	}
-
-	srv := newTestServer(t, serverRPC)
-	defer srv.Close()
-	go srv.Serve()
-
-	// Wait for the RPC server to be ready
-	<-srv.Ready
-
-	// create a new RPC with a matching index as the server
-	clientRPC := &rpc{
-		store: &fakeStore{
-			leader: srv.Listener.Addr().String(),
-			md:     &Data{Index: 99},
-		},
-	}
-
-	res, err := clientRPC.join("1.2.3.4:1234", srv.Listener.Addr().String())
-	if err != nil {
-		t.Fatalf("failed to join: %v", err)
-	}
-
-	if exp := true; res.RaftEnabled != true {
-		t.Fatalf("raft enabled mismatch: got %v, exp %v", res.RaftEnabled, exp)
-	}
-
-	if exp := 1; len(res.RaftNodes) != exp {
-		t.Fatalf("raft peer mismatch: got %v, exp %v", len(res.RaftNodes), exp)
-	}
-
-	if exp := "1.2.3.4:1234"; res.RaftNodes[0] != exp {
-		t.Fatalf("raft peer mismatch: got %v, exp %v", res.RaftNodes[0], exp)
-	}
-
-	if exp := uint64(100); res.NodeID != exp {
-		t.Fatalf("node id mismatch. got %v, exp %v", res.NodeID, exp)
-	}
-}
-
-type fakeStore struct {
-	mu        sync.RWMutex
-	leader    string
-	newNodeID uint64
-	md        *Data
-	blockChan chan struct{}
-}
-
-type testServer struct {
-	Listener net.Listener
-	Ready    chan struct{}
-	rpc      *rpc
-	t        *testing.T
-}
-
-func newTestServer(t *testing.T, rpc *rpc) *testServer {
-	ln, err := net.Listen("tcp", "127.0.0.1:0")
-	if err != nil {
-		t.Fatalf("failed to listen: %v", err)
-	}
-	return &testServer{
-		Listener: ln,
-		Ready:    make(chan struct{}),
-		rpc:      rpc,
-	}
-}
-
-func (s *testServer) Close() {
-	s.Listener.Close()
-}
-
-func (s *testServer) Serve() {
-	close(s.Ready)
-	conn, err := s.Listener.Accept()
-	if err != nil {
-		s.t.Fatalf("failed to accept: %v", err)
-	}
-
-	// Demux...
-	b := make([]byte, 1)
-	if _, err := conn.Read(b); err != nil {
-		s.t.Fatalf("failed to demux: %v", err)
-	}
-	s.rpc.handleRPCConn(conn)
-}
-
-func (f *fakeStore) cachedData() *Data {
-	f.mu.RLock()
-	defer f.mu.RUnlock()
-	return f.md
-}
-
-func (f *fakeStore) IsLeader() bool            { return true }
-func (f *fakeStore) Leader() string            { return f.leader }
-func (f *fakeStore) Peers() ([]string, error)  { return []string{f.leader}, nil }
-func (f *fakeStore) AddPeer(host string) error { return nil }
-func (f *fakeStore) CreateNode(host string) (*NodeInfo, error) {
-	return &NodeInfo{ID: f.newNodeID, Host: host}, nil
-}
-func (f *fakeStore) NodeByHost(host string) (*NodeInfo, error) { return nil, nil }
-func (f *fakeStore) WaitForDataChanged() error {
-	<-f.blockChan
-	return nil
-}
-func (f *fakeStore) enableLocalRaft() error {
-	return nil
-}
-func (f *fakeStore) SetPeers(addrs []string) error {
-	return nil
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/meta/state.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/meta/state.go
deleted file mode 100644
index 77c941b67..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/meta/state.go
+++ /dev/null
@@ -1,514 +0,0 @@
-package meta
-
-import (
-	"bytes"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"io/ioutil"
-	"math/rand"
-	"os"
-	"path/filepath"
-	"sync"
-	"time"
-
-	"github.com/hashicorp/raft"
-	"github.com/hashicorp/raft-boltdb"
-)
-
-// raftState abstracts the interaction of the raft consensus layer
-// across local or remote nodes.  It is a form of the state design pattern and allows
-// the meta.Store to change its behavior with the raft layer at runtime.
-type raftState interface {
-	open() error
-	remove() error
-	initialize() error
-	leader() string
-	isLeader() bool
-	sync(index uint64, timeout time.Duration) error
-	setPeers(addrs []string) error
-	addPeer(addr string) error
-	removePeer(addr string) error
-	peers() ([]string, error)
-	invalidate() error
-	close() error
-	lastIndex() uint64
-	apply(b []byte) error
-	snapshot() error
-	isLocal() bool
-}
-
-// localRaft is a consensus strategy that uses a local raft implementation for
-// consensus operations.
-type localRaft struct {
-	wg        sync.WaitGroup
-	closing   chan struct{}
-	store     *Store
-	raft      *raft.Raft
-	transport *raft.NetworkTransport
-	peerStore raft.PeerStore
-	raftStore *raftboltdb.BoltStore
-	raftLayer *raftLayer
-}
-
-func (r *localRaft) remove() error {
-	if err := os.RemoveAll(filepath.Join(r.store.path, "raft.db")); err != nil {
-		return err
-	}
-	if err := os.RemoveAll(filepath.Join(r.store.path, "peers.json")); err != nil {
-		return err
-	}
-	if err := os.RemoveAll(filepath.Join(r.store.path, "snapshots")); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (r *localRaft) updateMetaData(ms *Data) {
-	if ms == nil {
-		return
-	}
-
-	updated := false
-	r.store.mu.RLock()
-	if ms.Index > r.store.data.Index {
-		updated = true
-	}
-	r.store.mu.RUnlock()
-
-	if updated {
-		r.store.Logger.Printf("Updating metastore to term=%v index=%v", ms.Term, ms.Index)
-		r.store.mu.Lock()
-		r.store.data = ms
-		// Signal any blocked goroutines that the meta store has been updated
-		r.store.notifyChanged()
-		r.store.mu.Unlock()
-	}
-}
-
-func (r *localRaft) invalidate() error {
-	if r.store.IsLeader() {
-		return nil
-	}
-
-	ms, err := r.store.rpc.fetchMetaData(false)
-	if err != nil {
-		return fmt.Errorf("error fetching meta data: %s", err)
-	}
-
-	r.updateMetaData(ms)
-	return nil
-}
-
-func (r *localRaft) open() error {
-	r.closing = make(chan struct{})
-
-	s := r.store
-	// Setup raft configuration.
-	config := raft.DefaultConfig()
-	config.LogOutput = ioutil.Discard
-
-	if s.clusterTracingEnabled {
-		config.Logger = s.Logger
-	}
-	config.HeartbeatTimeout = s.HeartbeatTimeout
-	config.ElectionTimeout = s.ElectionTimeout
-	config.LeaderLeaseTimeout = s.LeaderLeaseTimeout
-	config.CommitTimeout = s.CommitTimeout
-	// Since we actually never call `removePeer` this is safe.
-	// If in the future we decide to call remove peer we have to re-evaluate how to handle this
-	config.ShutdownOnRemove = false
-
-	// If no peers are set in the config or there is one and we are it, then start as a single server.
-	if len(s.peers) <= 1 {
-		config.EnableSingleNode = true
-		// Ensure we can always become the leader
-		config.DisableBootstrapAfterElect = false
-	}
-
-	// Build raft layer to multiplex listener.
-	r.raftLayer = newRaftLayer(s.RaftListener, s.RemoteAddr)
-
-	// Create a transport layer
-	r.transport = raft.NewNetworkTransport(r.raftLayer, 3, 10*time.Second, config.LogOutput)
-
-	// Create peer storage.
-	r.peerStore = raft.NewJSONPeers(s.path, r.transport)
-
-	peers, err := r.peerStore.Peers()
-	if err != nil {
-		return err
-	}
-
-	// For single-node clusters, we can update the raft peers before we start the cluster if the hostname
-	// has changed.
-	if config.EnableSingleNode {
-		if err := r.peerStore.SetPeers([]string{s.RemoteAddr.String()}); err != nil {
-			return err
-		}
-		peers = []string{s.RemoteAddr.String()}
-	}
-
-	// If we have multiple nodes in the cluster, make sure our address is in the raft peers or
-	// we won't be able to boot into the cluster because the other peers will reject our new hostname.  This
-	// is difficult to resolve automatically because we need to have all the raft peers agree on the current members
-	// of the cluster before we can change them.
-	if len(peers) > 0 && !raft.PeerContained(peers, s.RemoteAddr.String()) {
-		s.Logger.Printf("%s is not in the list of raft peers. Please update %v/peers.json on all raft nodes to have the same contents.", s.RemoteAddr.String(), s.Path())
-		return fmt.Errorf("peers out of sync: %v not in %v", s.RemoteAddr.String(), peers)
-	}
-
-	// Create the log store and stable store.
-	store, err := raftboltdb.NewBoltStore(filepath.Join(s.path, "raft.db"))
-	if err != nil {
-		return fmt.Errorf("new bolt store: %s", err)
-	}
-	r.raftStore = store
-
-	// Create the snapshot store.
-	snapshots, err := raft.NewFileSnapshotStore(s.path, raftSnapshotsRetained, os.Stderr)
-	if err != nil {
-		return fmt.Errorf("file snapshot store: %s", err)
-	}
-
-	// Create raft log.
-	ra, err := raft.NewRaft(config, (*storeFSM)(s), store, store, snapshots, r.peerStore, r.transport)
-	if err != nil {
-		return fmt.Errorf("new raft: %s", err)
-	}
-	r.raft = ra
-
-	r.wg.Add(1)
-	go r.logLeaderChanges()
-
-	return nil
-}
-
-func (r *localRaft) logLeaderChanges() {
-	defer r.wg.Done()
-	// Logs our current state (Node at 1.2.3.4:8088 [Follower])
-	r.store.Logger.Printf(r.raft.String())
-	for {
-		select {
-		case <-r.closing:
-			return
-		case <-r.raft.LeaderCh():
-			peers, err := r.peers()
-			if err != nil {
-				r.store.Logger.Printf("failed to lookup peers: %v", err)
-			}
-			r.store.Logger.Printf("%v. peers=%v", r.raft.String(), peers)
-		}
-	}
-}
-
-func (r *localRaft) close() error {
-	close(r.closing)
-	r.wg.Wait()
-
-	if r.transport != nil {
-		r.transport.Close()
-		r.transport = nil
-	}
-
-	// Shutdown raft.
-	if r.raft != nil {
-		if err := r.raft.Shutdown().Error(); err != nil {
-			return err
-		}
-		r.raft = nil
-	}
-
-	if r.raftStore != nil {
-		r.raftStore.Close()
-		r.raftStore = nil
-	}
-
-	return nil
-}
-
-func (r *localRaft) initialize() error {
-	s := r.store
-	// If we have committed entries then the store is already in the cluster.
-	if index, err := r.raftStore.LastIndex(); err != nil {
-		return fmt.Errorf("last index: %s", err)
-	} else if index > 0 {
-		return nil
-	}
-
-	// Force set peers.
-	if err := r.setPeers(s.peers); err != nil {
-		return fmt.Errorf("set raft peers: %s", err)
-	}
-
-	return nil
-}
-
-// apply applies a serialized command to the raft log.
-func (r *localRaft) apply(b []byte) error {
-	// Apply to raft log.
-	f := r.raft.Apply(b, 0)
-	if err := f.Error(); err != nil {
-		return err
-	}
-
-	// Return response if it's an error.
-	// No other non-nil objects should be returned.
-	resp := f.Response()
-	if err, ok := resp.(error); ok {
-		return lookupError(err)
-	}
-	assert(resp == nil, "unexpected response: %#v", resp)
-
-	return nil
-}
-
-func (r *localRaft) lastIndex() uint64 {
-	return r.raft.LastIndex()
-}
-
-func (r *localRaft) sync(index uint64, timeout time.Duration) error {
-	ticker := time.NewTicker(100 * time.Millisecond)
-	defer ticker.Stop()
-
-	timer := time.NewTimer(timeout)
-	defer timer.Stop()
-
-	for {
-		// Wait for next tick or timeout.
-		select {
-		case <-ticker.C:
-		case <-timer.C:
-			return errors.New("timeout")
-		}
-
-		// Compare index against current metadata.
-		r.store.mu.Lock()
-		ok := (r.store.data.Index >= index)
-		r.store.mu.Unlock()
-
-		// Exit if we are at least at the given index.
-		if ok {
-			return nil
-		}
-	}
-}
-
-func (r *localRaft) snapshot() error {
-	future := r.raft.Snapshot()
-	return future.Error()
-}
-
-// addPeer adds addr to the list of peers in the cluster.
-func (r *localRaft) addPeer(addr string) error {
-	peers, err := r.peerStore.Peers()
-	if err != nil {
-		return err
-	}
-
-	if len(peers) >= 3 {
-		return nil
-	}
-
-	if fut := r.raft.AddPeer(addr); fut.Error() != nil {
-		return fut.Error()
-	}
-	return nil
-}
-
-// removePeer removes addr from the list of peers in the cluster.
-func (r *localRaft) removePeer(addr string) error {
-	// Only do this on the leader
-	if !r.isLeader() {
-		return errors.New("not the leader")
-	}
-	if fut := r.raft.RemovePeer(addr); fut.Error() != nil {
-		return fut.Error()
-	}
-	return nil
-}
-
-// setPeers sets a list of peers in the cluster.
-func (r *localRaft) setPeers(addrs []string) error {
-	return r.raft.SetPeers(addrs).Error()
-}
-
-func (r *localRaft) peers() ([]string, error) {
-	return r.peerStore.Peers()
-}
-
-func (r *localRaft) leader() string {
-	if r.raft == nil {
-		return ""
-	}
-
-	return r.raft.Leader()
-}
-
-func (r *localRaft) isLeader() bool {
-	if r.raft == nil {
-		return false
-	}
-	return r.raft.State() == raft.Leader
-}
-
-func (r *localRaft) isLocal() bool {
-	return true
-}
-
-// remoteRaft is a consensus strategy that uses a remote raft cluster for
-// consensus operations.
-type remoteRaft struct {
-	store *Store
-}
-
-func (r *remoteRaft) remove() error {
-	return nil
-}
-
-func (r *remoteRaft) updateMetaData(ms *Data) {
-	if ms == nil {
-		return
-	}
-
-	updated := false
-	r.store.mu.RLock()
-	if ms.Index > r.store.data.Index {
-		updated = true
-	}
-	r.store.mu.RUnlock()
-
-	if updated {
-		r.store.Logger.Printf("Updating metastore to term=%v index=%v", ms.Term, ms.Index)
-		r.store.mu.Lock()
-		r.store.data = ms
-		// Signal any blocked goroutines that the meta store has been updated
-		r.store.notifyChanged()
-		r.store.mu.Unlock()
-	}
-}
-
-func (r *remoteRaft) invalidate() error {
-	ms, err := r.store.rpc.fetchMetaData(false)
-	if err != nil {
-		return fmt.Errorf("error fetching meta data: %s", err)
-	}
-
-	r.updateMetaData(ms)
-	return nil
-}
-
-func (r *remoteRaft) setPeers(addrs []string) error {
-	// Convert to JSON
-	var buf bytes.Buffer
-	enc := json.NewEncoder(&buf)
-	if err := enc.Encode(addrs); err != nil {
-		return err
-	}
-
-	// Write out as JSON
-	return ioutil.WriteFile(filepath.Join(r.store.path, "peers.json"), buf.Bytes(), 0755)
-}
-
-// addPeer adds addr to the list of peers in the cluster.
-func (r *remoteRaft) addPeer(addr string) error {
-	return fmt.Errorf("cannot add peer using remote raft")
-}
-
-// removePeer does nothing for remoteRaft.
-func (r *remoteRaft) removePeer(addr string) error {
-	return nil
-}
-
-func (r *remoteRaft) peers() ([]string, error) {
-	return readPeersJSON(filepath.Join(r.store.path, "peers.json"))
-}
-
-func (r *remoteRaft) open() error {
-	if err := r.setPeers(r.store.peers); err != nil {
-		return err
-	}
-
-	go func() {
-		for {
-			select {
-			case <-r.store.closing:
-				return
-			default:
-			}
-
-			ms, err := r.store.rpc.fetchMetaData(true)
-			if err != nil {
-				r.store.Logger.Printf("fetch metastore: %v", err)
-				time.Sleep(time.Second)
-				continue
-			}
-			r.updateMetaData(ms)
-		}
-	}()
-	return nil
-}
-
-func (r *remoteRaft) close() error {
-	return nil
-}
-
-// apply applies a serialized command to the raft log.
-func (r *remoteRaft) apply(b []byte) error {
-	return fmt.Errorf("cannot apply log while in remote raft state")
-}
-
-func (r *remoteRaft) initialize() error {
-	return nil
-}
-
-func (r *remoteRaft) leader() string {
-	if len(r.store.peers) == 0 {
-		return ""
-	}
-
-	return r.store.peers[rand.Intn(len(r.store.peers))]
-}
-
-func (r *remoteRaft) isLeader() bool {
-	return false
-}
-
-func (r *remoteRaft) isLocal() bool {
-	return false
-}
-
-func (r *remoteRaft) lastIndex() uint64 {
-	return r.store.cachedData().Index
-}
-
-func (r *remoteRaft) sync(index uint64, timeout time.Duration) error {
-	//FIXME: jwilder: check index and timeout
-	return r.store.invalidate()
-}
-
-func (r *remoteRaft) snapshot() error {
-	return fmt.Errorf("cannot snapshot while in remote raft state")
-}
-
-func readPeersJSON(path string) ([]string, error) {
-	// Read the file
-	buf, err := ioutil.ReadFile(path)
-	if err != nil && !os.IsNotExist(err) {
-		return nil, err
-	}
-
-	// Check for no peers
-	if len(buf) == 0 {
-		return nil, nil
-	}
-
-	// Decode the peers
-	var peers []string
-	dec := json.NewDecoder(bytes.NewReader(buf))
-	if err := dec.Decode(&peers); err != nil {
-		return nil, err
-	}
-
-	return peers, nil
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/meta/statement_executor.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/meta/statement_executor.go
deleted file mode 100644
index 9727784f8..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/meta/statement_executor.go
+++ /dev/null
@@ -1,410 +0,0 @@
-package meta
-
-import (
-	"bytes"
-	"fmt"
-	"strconv"
-	"time"
-
-	"github.com/influxdb/influxdb/influxql"
-	"github.com/influxdb/influxdb/models"
-)
-
-// StatementExecutor translates InfluxQL queries to meta store methods.
-type StatementExecutor struct {
-	Store interface {
-		Node(id uint64) (ni *NodeInfo, err error)
-		Nodes() ([]NodeInfo, error)
-		Peers() ([]string, error)
-		Leader() string
-
-		DeleteNode(nodeID uint64, force bool) error
-		Database(name string) (*DatabaseInfo, error)
-		Databases() ([]DatabaseInfo, error)
-		CreateDatabase(name string) (*DatabaseInfo, error)
-		DropDatabase(name string) error
-
-		DefaultRetentionPolicy(database string) (*RetentionPolicyInfo, error)
-		CreateRetentionPolicy(database string, rpi *RetentionPolicyInfo) (*RetentionPolicyInfo, error)
-		UpdateRetentionPolicy(database, name string, rpu *RetentionPolicyUpdate) error
-		SetDefaultRetentionPolicy(database, name string) error
-		DropRetentionPolicy(database, name string) error
-
-		Users() ([]UserInfo, error)
-		CreateUser(name, password string, admin bool) (*UserInfo, error)
-		UpdateUser(name, password string) error
-		DropUser(name string) error
-		SetPrivilege(username, database string, p influxql.Privilege) error
-		SetAdminPrivilege(username string, admin bool) error
-		UserPrivileges(username string) (map[string]influxql.Privilege, error)
-		UserPrivilege(username, database string) (*influxql.Privilege, error)
-
-		CreateContinuousQuery(database, name, query string) error
-		DropContinuousQuery(database, name string) error
-
-		CreateSubscription(database, rp, name, mode string, destinations []string) error
-		DropSubscription(database, rp, name string) error
-	}
-}
-
-// ExecuteStatement executes stmt against the meta store as user.
-func (e *StatementExecutor) ExecuteStatement(stmt influxql.Statement) *influxql.Result {
-	switch stmt := stmt.(type) {
-	case *influxql.CreateDatabaseStatement:
-		return e.executeCreateDatabaseStatement(stmt)
-	case *influxql.DropDatabaseStatement:
-		return e.executeDropDatabaseStatement(stmt)
-	case *influxql.ShowDatabasesStatement:
-		return e.executeShowDatabasesStatement(stmt)
-	case *influxql.ShowGrantsForUserStatement:
-		return e.executeShowGrantsForUserStatement(stmt)
-	case *influxql.ShowServersStatement:
-		return e.executeShowServersStatement(stmt)
-	case *influxql.CreateUserStatement:
-		return e.executeCreateUserStatement(stmt)
-	case *influxql.SetPasswordUserStatement:
-		return e.executeSetPasswordUserStatement(stmt)
-	case *influxql.DropUserStatement:
-		return e.executeDropUserStatement(stmt)
-	case *influxql.ShowUsersStatement:
-		return e.executeShowUsersStatement(stmt)
-	case *influxql.GrantStatement:
-		return e.executeGrantStatement(stmt)
-	case *influxql.GrantAdminStatement:
-		return e.executeGrantAdminStatement(stmt)
-	case *influxql.RevokeStatement:
-		return e.executeRevokeStatement(stmt)
-	case *influxql.RevokeAdminStatement:
-		return e.executeRevokeAdminStatement(stmt)
-	case *influxql.CreateRetentionPolicyStatement:
-		return e.executeCreateRetentionPolicyStatement(stmt)
-	case *influxql.AlterRetentionPolicyStatement:
-		return e.executeAlterRetentionPolicyStatement(stmt)
-	case *influxql.DropRetentionPolicyStatement:
-		return e.executeDropRetentionPolicyStatement(stmt)
-	case *influxql.ShowRetentionPoliciesStatement:
-		return e.executeShowRetentionPoliciesStatement(stmt)
-	case *influxql.CreateContinuousQueryStatement:
-		return e.executeCreateContinuousQueryStatement(stmt)
-	case *influxql.DropContinuousQueryStatement:
-		return e.executeDropContinuousQueryStatement(stmt)
-	case *influxql.ShowContinuousQueriesStatement:
-		return e.executeShowContinuousQueriesStatement(stmt)
-	case *influxql.ShowShardsStatement:
-		return e.executeShowShardsStatement(stmt)
-	case *influxql.ShowStatsStatement:
-		return e.executeShowStatsStatement(stmt)
-	case *influxql.DropServerStatement:
-		return e.executeDropServerStatement(stmt)
-	case *influxql.CreateSubscriptionStatement:
-		return e.executeCreateSubscriptionStatement(stmt)
-	case *influxql.DropSubscriptionStatement:
-		return e.executeDropSubscriptionStatement(stmt)
-	case *influxql.ShowSubscriptionsStatement:
-		return e.executeShowSubscriptionsStatement(stmt)
-	default:
-		panic(fmt.Sprintf("unsupported statement type: %T", stmt))
-	}
-}
-
-func (e *StatementExecutor) executeCreateDatabaseStatement(q *influxql.CreateDatabaseStatement) *influxql.Result {
-	_, err := e.Store.CreateDatabase(q.Name)
-	if err == ErrDatabaseExists && q.IfNotExists {
-		err = nil
-	}
-	return &influxql.Result{Err: err}
-}
-
-func (e *StatementExecutor) executeDropDatabaseStatement(q *influxql.DropDatabaseStatement) *influxql.Result {
-	return &influxql.Result{Err: e.Store.DropDatabase(q.Name)}
-}
-
-func (e *StatementExecutor) executeShowDatabasesStatement(q *influxql.ShowDatabasesStatement) *influxql.Result {
-	dis, err := e.Store.Databases()
-	if err != nil {
-		return &influxql.Result{Err: err}
-	}
-
-	row := &models.Row{Name: "databases", Columns: []string{"name"}}
-	for _, di := range dis {
-		row.Values = append(row.Values, []interface{}{di.Name})
-	}
-	return &influxql.Result{Series: []*models.Row{row}}
-}
-
-func (e *StatementExecutor) executeShowGrantsForUserStatement(q *influxql.ShowGrantsForUserStatement) *influxql.Result {
-	priv, err := e.Store.UserPrivileges(q.Name)
-	if err != nil {
-		return &influxql.Result{Err: err}
-	}
-
-	row := &models.Row{Columns: []string{"database", "privilege"}}
-	for d, p := range priv {
-		row.Values = append(row.Values, []interface{}{d, p.String()})
-	}
-	return &influxql.Result{Series: []*models.Row{row}}
-}
-
-func (e *StatementExecutor) executeShowServersStatement(q *influxql.ShowServersStatement) *influxql.Result {
-	nis, err := e.Store.Nodes()
-	if err != nil {
-		return &influxql.Result{Err: err}
-	}
-
-	peers, err := e.Store.Peers()
-	if err != nil {
-		return &influxql.Result{Err: err}
-	}
-
-	leader := e.Store.Leader()
-
-	row := &models.Row{Columns: []string{"id", "cluster_addr", "raft", "raft-leader"}}
-	for _, ni := range nis {
-		row.Values = append(row.Values, []interface{}{ni.ID, ni.Host, contains(peers, ni.Host), leader == ni.Host})
-	}
-	return &influxql.Result{Series: []*models.Row{row}}
-}
-
-func (e *StatementExecutor) executeDropServerStatement(q *influxql.DropServerStatement) *influxql.Result {
-	ni, err := e.Store.Node(q.NodeID)
-	if err != nil {
-		return &influxql.Result{Err: err}
-	}
-	if ni == nil {
-		return &influxql.Result{Err: ErrNodeNotFound}
-	}
-
-	err = e.Store.DeleteNode(q.NodeID, q.Force)
-	return &influxql.Result{Err: err}
-}
-
-func (e *StatementExecutor) executeCreateUserStatement(q *influxql.CreateUserStatement) *influxql.Result {
-	_, err := e.Store.CreateUser(q.Name, q.Password, q.Admin)
-	return &influxql.Result{Err: err}
-}
-
-func (e *StatementExecutor) executeSetPasswordUserStatement(q *influxql.SetPasswordUserStatement) *influxql.Result {
-	return &influxql.Result{Err: e.Store.UpdateUser(q.Name, q.Password)}
-}
-
-func (e *StatementExecutor) executeDropUserStatement(q *influxql.DropUserStatement) *influxql.Result {
-	return &influxql.Result{Err: e.Store.DropUser(q.Name)}
-}
-
-func (e *StatementExecutor) executeShowUsersStatement(q *influxql.ShowUsersStatement) *influxql.Result {
-	uis, err := e.Store.Users()
-	if err != nil {
-		return &influxql.Result{Err: err}
-	}
-
-	row := &models.Row{Columns: []string{"user", "admin"}}
-	for _, ui := range uis {
-		row.Values = append(row.Values, []interface{}{ui.Name, ui.Admin})
-	}
-	return &influxql.Result{Series: []*models.Row{row}}
-}
-
-func (e *StatementExecutor) executeGrantStatement(stmt *influxql.GrantStatement) *influxql.Result {
-	return &influxql.Result{Err: e.Store.SetPrivilege(stmt.User, stmt.On, stmt.Privilege)}
-}
-
-func (e *StatementExecutor) executeGrantAdminStatement(stmt *influxql.GrantAdminStatement) *influxql.Result {
-	return &influxql.Result{Err: e.Store.SetAdminPrivilege(stmt.User, true)}
-}
-
-func (e *StatementExecutor) executeRevokeStatement(stmt *influxql.RevokeStatement) *influxql.Result {
-	priv := influxql.NoPrivileges
-
-	// Revoking all privileges means there's no need to look at existing user privileges.
-	if stmt.Privilege != influxql.AllPrivileges {
-		p, err := e.Store.UserPrivilege(stmt.User, stmt.On)
-		if err != nil {
-			return &influxql.Result{Err: err}
-		}
-		// Bit clear (AND NOT) the user's privilege with the revoked privilege.
-		priv = *p &^ stmt.Privilege
-	}
-
-	return &influxql.Result{Err: e.Store.SetPrivilege(stmt.User, stmt.On, priv)}
-}
-
-func (e *StatementExecutor) executeRevokeAdminStatement(stmt *influxql.RevokeAdminStatement) *influxql.Result {
-	return &influxql.Result{Err: e.Store.SetAdminPrivilege(stmt.User, false)}
-}
-
-func (e *StatementExecutor) executeCreateRetentionPolicyStatement(stmt *influxql.CreateRetentionPolicyStatement) *influxql.Result {
-	rpi := NewRetentionPolicyInfo(stmt.Name)
-	rpi.Duration = stmt.Duration
-	rpi.ReplicaN = stmt.Replication
-
-	// Create new retention policy.
-	_, err := e.Store.CreateRetentionPolicy(stmt.Database, rpi)
-	if err != nil {
-		return &influxql.Result{Err: err}
-	}
-
-	// If requested, set new policy as the default.
-	if stmt.Default {
-		err = e.Store.SetDefaultRetentionPolicy(stmt.Database, stmt.Name)
-	}
-
-	return &influxql.Result{Err: err}
-}
-
-func (e *StatementExecutor) executeAlterRetentionPolicyStatement(stmt *influxql.AlterRetentionPolicyStatement) *influxql.Result {
-	rpu := &RetentionPolicyUpdate{
-		Duration: stmt.Duration,
-		ReplicaN: stmt.Replication,
-	}
-
-	// Update the retention policy.
-	err := e.Store.UpdateRetentionPolicy(stmt.Database, stmt.Name, rpu)
-	if err != nil {
-		return &influxql.Result{Err: err}
-	}
-
-	// If requested, set as default retention policy.
-	if stmt.Default {
-		err = e.Store.SetDefaultRetentionPolicy(stmt.Database, stmt.Name)
-	}
-
-	return &influxql.Result{Err: err}
-}
-
-func (e *StatementExecutor) executeDropRetentionPolicyStatement(q *influxql.DropRetentionPolicyStatement) *influxql.Result {
-	return &influxql.Result{Err: e.Store.DropRetentionPolicy(q.Database, q.Name)}
-}
-
-func (e *StatementExecutor) executeShowRetentionPoliciesStatement(q *influxql.ShowRetentionPoliciesStatement) *influxql.Result {
-	di, err := e.Store.Database(q.Database)
-	if err != nil {
-		return &influxql.Result{Err: err}
-	} else if di == nil {
-		return &influxql.Result{Err: ErrDatabaseNotFound}
-	}
-
-	row := &models.Row{Columns: []string{"name", "duration", "replicaN", "default"}}
-	for _, rpi := range di.RetentionPolicies {
-		row.Values = append(row.Values, []interface{}{rpi.Name, rpi.Duration.String(), rpi.ReplicaN, di.DefaultRetentionPolicy == rpi.Name})
-	}
-	return &influxql.Result{Series: []*models.Row{row}}
-}
-
-func (e *StatementExecutor) executeCreateContinuousQueryStatement(q *influxql.CreateContinuousQueryStatement) *influxql.Result {
-	return &influxql.Result{
-		Err: e.Store.CreateContinuousQuery(q.Database, q.Name, q.String()),
-	}
-}
-
-func (e *StatementExecutor) executeDropContinuousQueryStatement(q *influxql.DropContinuousQueryStatement) *influxql.Result {
-	return &influxql.Result{
-		Err: e.Store.DropContinuousQuery(q.Database, q.Name),
-	}
-}
-
-func (e *StatementExecutor) executeShowContinuousQueriesStatement(stmt *influxql.ShowContinuousQueriesStatement) *influxql.Result {
-	dis, err := e.Store.Databases()
-	if err != nil {
-		return &influxql.Result{Err: err}
-	}
-
-	rows := []*models.Row{}
-	for _, di := range dis {
-		row := &models.Row{Columns: []string{"name", "query"}, Name: di.Name}
-		for _, cqi := range di.ContinuousQueries {
-			row.Values = append(row.Values, []interface{}{cqi.Name, cqi.Query})
-		}
-		rows = append(rows, row)
-	}
-	return &influxql.Result{Series: rows}
-}
-
-func (e *StatementExecutor) executeCreateSubscriptionStatement(q *influxql.CreateSubscriptionStatement) *influxql.Result {
-	return &influxql.Result{
-		Err: e.Store.CreateSubscription(q.Database, q.RetentionPolicy, q.Name, q.Mode, q.Destinations),
-	}
-}
-
-func (e *StatementExecutor) executeDropSubscriptionStatement(q *influxql.DropSubscriptionStatement) *influxql.Result {
-	return &influxql.Result{
-		Err: e.Store.DropSubscription(q.Database, q.RetentionPolicy, q.Name),
-	}
-}
-
-func (e *StatementExecutor) executeShowSubscriptionsStatement(stmt *influxql.ShowSubscriptionsStatement) *influxql.Result {
-	dis, err := e.Store.Databases()
-	if err != nil {
-		return &influxql.Result{Err: err}
-	}
-
-	rows := []*models.Row{}
-	for _, di := range dis {
-		row := &models.Row{Columns: []string{"retention_policy", "name", "mode", "destinations"}, Name: di.Name}
-		for _, rpi := range di.RetentionPolicies {
-			for _, si := range rpi.Subscriptions {
-				row.Values = append(row.Values, []interface{}{rpi.Name, si.Name, si.Mode, si.Destinations})
-			}
-		}
-		if len(row.Values) > 0 {
-			rows = append(rows, row)
-		}
-	}
-	return &influxql.Result{Series: rows}
-}
-
-func (e *StatementExecutor) executeShowShardsStatement(stmt *influxql.ShowShardsStatement) *influxql.Result {
-	dis, err := e.Store.Databases()
-	if err != nil {
-		return &influxql.Result{Err: err}
-	}
-
-	rows := []*models.Row{}
-	for _, di := range dis {
-		row := &models.Row{Columns: []string{"id", "database", "retention_policy", "shard_group", "start_time", "end_time", "expiry_time", "owners"}, Name: di.Name}
-		for _, rpi := range di.RetentionPolicies {
-			for _, sgi := range rpi.ShardGroups {
-				// Shards associated with deleted shard groups are effectively deleted.
-				// Don't list them.
-				if sgi.Deleted() {
-					continue
-				}
-
-				for _, si := range sgi.Shards {
-					ownerIDs := make([]uint64, len(si.Owners))
-					for i, owner := range si.Owners {
-						ownerIDs[i] = owner.NodeID
-					}
-
-					row.Values = append(row.Values, []interface{}{
-						si.ID,
-						di.Name,
-						rpi.Name,
-						sgi.ID,
-						sgi.StartTime.UTC().Format(time.RFC3339),
-						sgi.EndTime.UTC().Format(time.RFC3339),
-						sgi.EndTime.Add(rpi.Duration).UTC().Format(time.RFC3339),
-						joinUint64(ownerIDs),
-					})
-				}
-			}
-		}
-		rows = append(rows, row)
-	}
-	return &influxql.Result{Series: rows}
-}
-
-func (e *StatementExecutor) executeShowStatsStatement(stmt *influxql.ShowStatsStatement) *influxql.Result {
-	return &influxql.Result{Err: fmt.Errorf("SHOW STATS is not implemented yet")}
-}
-
-// joinUint64 returns a comma-delimited string of uint64 numbers.
-func joinUint64(a []uint64) string {
-	var buf bytes.Buffer
-	for i, x := range a {
-		buf.WriteString(strconv.FormatUint(x, 10))
-		if i < len(a)-1 {
-			buf.WriteRune(',')
-		}
-	}
-	return buf.String()
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/meta/statement_executor_test.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/meta/statement_executor_test.go
deleted file mode 100644
index f8c7e2f10..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/meta/statement_executor_test.go
+++ /dev/null
@@ -1,1174 +0,0 @@
-package meta_test
-
-import (
-	"errors"
-	"reflect"
-	"testing"
-	"time"
-
-	"github.com/davecgh/go-spew/spew"
-	"github.com/influxdb/influxdb/influxql"
-	"github.com/influxdb/influxdb/meta"
-	"github.com/influxdb/influxdb/models"
-)
-
-// Ensure a CREATE DATABASE statement can be executed.
-func TestStatementExecutor_ExecuteStatement_CreateDatabase(t *testing.T) {
-	e := NewStatementExecutor()
-	e.Store.CreateDatabaseFn = func(name string) (*meta.DatabaseInfo, error) {
-		if name != "foo" {
-			t.Fatalf("unexpected name: %s", name)
-		}
-		return &meta.DatabaseInfo{Name: name}, nil
-	}
-
-	if res := e.ExecuteStatement(influxql.MustParseStatement(`CREATE DATABASE foo`)); res.Err != nil {
-		t.Fatal(res.Err)
-	} else if res.Series != nil {
-		t.Fatalf("unexpected rows: %#v", res.Series)
-	}
-}
-
-// Ensure a DROP DATABASE statement can be executed.
-func TestStatementExecutor_ExecuteStatement_DropDatabase(t *testing.T) {
-	e := NewStatementExecutor()
-	e.Store.DropDatabaseFn = func(name string) error {
-		if name != "foo" {
-			t.Fatalf("unexpected name: %s", name)
-		}
-		return nil
-	}
-
-	if res := e.ExecuteStatement(influxql.MustParseStatement(`DROP DATABASE foo`)); res.Err != nil {
-		t.Fatal(res.Err)
-	} else if res.Series != nil {
-		t.Fatalf("unexpected rows: %#v", res.Series)
-	}
-}
-
-// Ensure a SHOW DATABASES statement can be executed.
-func TestStatementExecutor_ExecuteStatement_ShowDatabases(t *testing.T) {
-	e := NewStatementExecutor()
-	e.Store.DatabasesFn = func() ([]meta.DatabaseInfo, error) {
-		return []meta.DatabaseInfo{
-			{Name: "foo"},
-			{Name: "bar"},
-		}, nil
-	}
-
-	if res := e.ExecuteStatement(influxql.MustParseStatement(`SHOW DATABASES`)); res.Err != nil {
-		t.Fatal(res.Err)
-	} else if !reflect.DeepEqual(res.Series, models.Rows{
-		{
-			Name:    "databases",
-			Columns: []string{"name"},
-			Values: [][]interface{}{
-				{"foo"},
-				{"bar"},
-			},
-		},
-	}) {
-		t.Fatalf("unexpected rows: %s", spew.Sdump(res.Series))
-	}
-}
-
-// Ensure a SHOW DATABASES statement returns errors from the store.
-func TestStatementExecutor_ExecuteStatement_ShowDatabases_Err(t *testing.T) {
-	e := NewStatementExecutor()
-	e.Store.DatabasesFn = func() ([]meta.DatabaseInfo, error) {
-		return nil, errors.New("marker")
-	}
-
-	if res := e.ExecuteStatement(influxql.MustParseStatement(`SHOW DATABASES`)); res.Err == nil || res.Err.Error() != "marker" {
-		t.Fatalf("unexpected error: %s", res.Err)
-	}
-}
-
-// Ensure a SHOW GRANTS FOR statement can be executed.
-func TestStatementExecutor_ExecuteStatement_ShowGrantsFor(t *testing.T) {
-	t.Skip("Intermittent test failure: issue 3028")
-	e := NewStatementExecutor()
-	e.Store.UserPrivilegesFn = func(username string) (map[string]influxql.Privilege, error) {
-		if username != "dejan" {
-			t.Fatalf("unexpected username: %s", username)
-		}
-		return map[string]influxql.Privilege{
-			"dejan": influxql.ReadPrivilege,
-			"golja": influxql.WritePrivilege,
-		}, nil
-	}
-
-	if res := e.ExecuteStatement(influxql.MustParseStatement(`SHOW GRANTS FOR dejan`)); res.Err != nil {
-		t.Fatal(res.Err)
-	} else if !reflect.DeepEqual(res.Series, models.Rows{
-		{
-			Columns: []string{"database", "privilege"},
-			Values: [][]interface{}{
-				{"dejan", "READ"},
-				{"golja", "WRITE"},
-			},
-		},
-	}) {
-		t.Fatalf("unexpected rows: %s", spew.Sdump(res.Series))
-	}
-}
-
-// Ensure a SHOW SERVERS statement can be executed.
-func TestStatementExecutor_ExecuteStatement_ShowServers(t *testing.T) {
-	e := NewStatementExecutor()
-	e.Store.NodesFn = func() ([]meta.NodeInfo, error) {
-		return []meta.NodeInfo{
-			{ID: 1, Host: "node0"},
-			{ID: 2, Host: "node1"},
-		}, nil
-	}
-	e.Store.PeersFn = func() ([]string, error) {
-		return []string{"node0"}, nil
-	}
-	e.Store.LeaderFn = func() string {
-		return "node0"
-	}
-
-	if res := e.ExecuteStatement(influxql.MustParseStatement(`SHOW SERVERS`)); res.Err != nil {
-		t.Fatal(res.Err)
-	} else if !reflect.DeepEqual(res.Series, models.Rows{
-		{
-			Columns: []string{"id", "cluster_addr", "raft", "raft-leader"},
-			Values: [][]interface{}{
-				{uint64(1), "node0", true, true},
-				{uint64(2), "node1", false, false},
-			},
-		},
-	}) {
-		t.Fatalf("unexpected rows: %s", spew.Sdump(res.Series))
-	}
-}
-
-// Ensure a DROP SERVER statement can be executed.
-func TestStatementExecutor_ExecuteStatement_DropServer(t *testing.T) {
-	e := NewStatementExecutor()
-	e.Store.PeersFn = func() ([]string, error) {
-		return []string{"node1"}, nil
-	}
-
-	// Ensure non-existent nodes do not cause a problem.
-	e.Store.NodeFn = func(id uint64) (*meta.NodeInfo, error) {
-		return nil, nil
-	}
-	if res := e.ExecuteStatement(influxql.MustParseStatement(`DROP SERVER 666`)); res.Err != meta.ErrNodeNotFound {
-		t.Fatalf("unexpected error: %s", res.Err)
-	}
-
-	// Make a node exist.
-	e.Store.NodeFn = func(id uint64) (*meta.NodeInfo, error) {
-		return &meta.NodeInfo{
-			ID: 1, Host: "node1",
-		}, nil
-	}
-
-	e.Store.DeleteNodeFn = func(id uint64, force bool) error {
-		return nil
-	}
-
-	// Ensure Raft nodes can be dropped.
-	if res := e.ExecuteStatement(influxql.MustParseStatement(`DROP SERVER 1`)); res.Err != nil {
-		t.Fatalf("unexpected error: %s", res.Err)
-	}
-
-	// Ensure non-Raft nodes can be dropped.
-	e.Store.PeersFn = func() ([]string, error) {
-		return []string{"node2"}, nil
-	}
-	e.Store.DeleteNodeFn = func(id uint64, force bool) error {
-		return nil
-	}
-	if res := e.ExecuteStatement(influxql.MustParseStatement(`DROP SERVER 1`)); res.Err != nil {
-		t.Fatalf("unexpected error: %s", res.Err)
-	}
-}
-
-// Ensure a SHOW SERVERS statement returns errors from the store.
-func TestStatementExecutor_ExecuteStatement_ShowServers_Err(t *testing.T) {
-	e := NewStatementExecutor()
-	e.Store.NodesFn = func() ([]meta.NodeInfo, error) {
-		return nil, errors.New("marker")
-	}
-
-	if res := e.ExecuteStatement(influxql.MustParseStatement(`SHOW SERVERS`)); res.Err == nil || res.Err.Error() != "marker" {
-		t.Fatalf("unexpected error: %s", res.Err)
-	}
-}
-
-// Ensure a CREATE USER statement can be executed.
-func TestStatementExecutor_ExecuteStatement_CreateUser(t *testing.T) {
-	e := NewStatementExecutor()
-	e.Store.CreateUserFn = func(name, password string, admin bool) (*meta.UserInfo, error) {
-		if name != "susy" {
-			t.Fatalf("unexpected name: %s", name)
-		} else if password != "pass" {
-			t.Fatalf("unexpected password: %s", password)
-		} else if admin != true {
-			t.Fatalf("unexpected admin: %v", admin)
-		}
-		return &meta.UserInfo{Name: name, Admin: admin}, nil
-	}
-
-	if res := e.ExecuteStatement(influxql.MustParseStatement(`CREATE USER susy WITH PASSWORD 'pass' WITH ALL PRIVILEGES`)); res.Err != nil {
-		t.Fatal(res.Err)
-	} else if res.Series != nil {
-		t.Fatalf("unexpected rows: %#v", res.Series)
-	}
-}
-
-// Ensure a CREATE USER statement returns errors from the store.
-func TestStatementExecutor_ExecuteStatement_CreateUser_Err(t *testing.T) {
-	e := NewStatementExecutor()
-	e.Store.CreateUserFn = func(name, password string, admin bool) (*meta.UserInfo, error) {
-		return nil, errors.New("marker")
-	}
-
-	if res := e.ExecuteStatement(influxql.MustParseStatement(`CREATE USER susy WITH PASSWORD 'pass'`)); res.Err == nil || res.Err.Error() != "marker" {
-		t.Fatalf("unexpected error: %s", res.Err)
-	}
-}
-
-// Ensure a SET PASSWORD statement can be executed.
-func TestStatementExecutor_ExecuteStatement_SetPassword(t *testing.T) {
-	e := NewStatementExecutor()
-	e.Store.UpdateUserFn = func(name, password string) error {
-		if name != "susy" {
-			t.Fatalf("unexpected name: %s", name)
-		} else if password != "pass" {
-			t.Fatalf("unexpected password: %s", password)
-		}
-		return nil
-	}
-
-	if res := e.ExecuteStatement(influxql.MustParseStatement(`SET PASSWORD FOR susy = 'pass' WITH ALL PRIVILEGES`)); res.Err != nil {
-		t.Fatal(res.Err)
-	} else if res.Series != nil {
-		t.Fatalf("unexpected rows: %#v", res.Series)
-	}
-}
-
-// Ensure a SET PASSWORD statement returns errors from the store.
-func TestStatementExecutor_ExecuteStatement_SetPassword_Err(t *testing.T) {
-	e := NewStatementExecutor()
-	e.Store.UpdateUserFn = func(name, password string) error {
-		return errors.New("marker")
-	}
-
-	if res := e.ExecuteStatement(influxql.MustParseStatement(`SET PASSWORD FOR susy = 'pass'`)); res.Err == nil || res.Err.Error() != "marker" {
-		t.Fatalf("unexpected error: %s", res.Err)
-	}
-}
-
-// Ensure a DROP USER statement can be executed.
-func TestStatementExecutor_ExecuteStatement_DropUser(t *testing.T) {
-	e := NewStatementExecutor()
-	e.Store.DropUserFn = func(name string) error {
-		if name != "susy" {
-			t.Fatalf("unexpected name: %s", name)
-		}
-		return nil
-	}
-
-	if res := e.ExecuteStatement(influxql.MustParseStatement(`DROP USER susy`)); res.Err != nil {
-		t.Fatal(res.Err)
-	} else if res.Series != nil {
-		t.Fatalf("unexpected rows: %#v", res.Series)
-	}
-}
-
-// Ensure a DROP USER statement returns errors from the store.
-func TestStatementExecutor_ExecuteStatement_DropUser_Err(t *testing.T) {
-	e := NewStatementExecutor()
-	e.Store.DropUserFn = func(name string) error {
-		return errors.New("marker")
-	}
-
-	if res := e.ExecuteStatement(influxql.MustParseStatement(`DROP USER susy`)); res.Err == nil || res.Err.Error() != "marker" {
-		t.Fatalf("unexpected error: %s", res.Err)
-	}
-}
-
-// Ensure a SHOW USERS statement can be executed.
-func TestStatementExecutor_ExecuteStatement_ShowUsers(t *testing.T) {
-	e := NewStatementExecutor()
-	e.Store.UsersFn = func() ([]meta.UserInfo, error) {
-		return []meta.UserInfo{
-			{Name: "susy", Admin: true},
-			{Name: "bob", Admin: false},
-		}, nil
-	}
-
-	if res := e.ExecuteStatement(influxql.MustParseStatement(`SHOW USERS`)); res.Err != nil {
-		t.Fatal(res.Err)
-	} else if !reflect.DeepEqual(res.Series, models.Rows{
-		{
-			Columns: []string{"user", "admin"},
-			Values: [][]interface{}{
-				{"susy", true},
-				{"bob", false},
-			},
-		},
-	}) {
-		t.Fatalf("unexpected rows: %s", spew.Sdump(res.Series))
-	}
-}
-
-// Ensure a SHOW USERS statement returns an error from the store.
-func TestStatementExecutor_ExecuteStatement_ShowUsers_Err(t *testing.T) {
-	e := NewStatementExecutor()
-	e.Store.UsersFn = func() ([]meta.UserInfo, error) {
-		return nil, errors.New("marker")
-	}
-
-	if res := e.ExecuteStatement(influxql.MustParseStatement(`SHOW USERS`)); res.Err == nil || res.Err.Error() != "marker" {
-		t.Fatalf("unexpected error: %s", res.Err)
-	}
-}
-
-// Ensure a GRANT statement can be executed.
-func TestStatementExecutor_ExecuteStatement_Grant(t *testing.T) {
-	e := NewStatementExecutor()
-	e.Store.SetPrivilegeFn = func(username, database string, p influxql.Privilege) error {
-		if username != "susy" {
-			t.Fatalf("unexpected username: %s", username)
-		} else if database != "foo" {
-			t.Fatalf("unexpected database: %s", database)
-		} else if p != influxql.WritePrivilege {
-			t.Fatalf("unexpected privilege: %s", p)
-		}
-		return nil
-	}
-
-	if res := e.ExecuteStatement(influxql.MustParseStatement(`GRANT WRITE ON foo TO susy`)); res.Err != nil {
-		t.Fatal(res.Err)
-	} else if res.Series != nil {
-		t.Fatalf("unexpected rows: %#v", res.Series)
-	}
-}
-
-// Ensure a GRANT statement returns errors from the store.
-func TestStatementExecutor_ExecuteStatement_Grant_Err(t *testing.T) {
-	e := NewStatementExecutor()
-	e.Store.SetPrivilegeFn = func(username, database string, p influxql.Privilege) error {
-		return errors.New("marker")
-	}
-
-	if res := e.ExecuteStatement(influxql.MustParseStatement(`GRANT READ ON foo TO susy`)); res.Err == nil || res.Err.Error() != "marker" {
-		t.Fatalf("unexpected error: %s", res.Err)
-	}
-}
-
-// Ensure a GRANT statement for admin privilege can be executed.
-func TestStatementExecutor_ExecuteStatement_GrantAdmin(t *testing.T) {
-	e := NewStatementExecutor()
-	e.Store.SetAdminPrivilegeFn = func(username string, admin bool) error {
-		if username != "susy" {
-			t.Fatalf("unexpected username: %s", username)
-		} else if admin != true {
-			t.Fatalf("unexpected admin privilege: %t", admin)
-		}
-		return nil
-	}
-
-	if res := e.ExecuteStatement(influxql.MustParseStatement(`GRANT ALL TO susy`)); res.Err != nil {
-		t.Fatal(res.Err)
-	} else if res.Series != nil {
-		t.Fatalf("unexpected rows: %#v", res.Series)
-	}
-}
-
-// Ensure a GRANT statement for admin privilege returns errors from the store.
-func TestStatementExecutor_ExecuteStatement_GrantAdmin_Err(t *testing.T) {
-	e := NewStatementExecutor()
-	e.Store.SetAdminPrivilegeFn = func(username string, admin bool) error {
-		return errors.New("marker")
-	}
-
-	if res := e.ExecuteStatement(influxql.MustParseStatement(`GRANT ALL PRIVILEGES TO susy`)); res.Err == nil || res.Err.Error() != "marker" {
-		t.Fatalf("unexpected error: %s", res.Err)
-	}
-}
-
-// Ensure a REVOKE statement can be executed.
-func TestStatementExecutor_ExecuteStatement_Revoke(t *testing.T) {
-	e := NewStatementExecutor()
-	e.Store.SetPrivilegeFn = func(username, database string, p influxql.Privilege) error {
-		if username != "susy" {
-			t.Fatalf("unexpected username: %s", username)
-		} else if database != "foo" {
-			t.Fatalf("unexpected database: %s", database)
-		} else if p != influxql.NoPrivileges {
-			t.Fatalf("unexpected privilege: %s", p)
-		}
-		return nil
-	}
-
-	if res := e.ExecuteStatement(influxql.MustParseStatement(`REVOKE ALL PRIVILEGES ON foo FROM susy`)); res.Err != nil {
-		t.Fatal(res.Err)
-	} else if res.Series != nil {
-		t.Fatalf("unexpected rows: %#v", res.Series)
-	}
-}
-
-// Ensure a REVOKE statement returns errors from the store.
-func TestStatementExecutor_ExecuteStatement_Revoke_Err(t *testing.T) {
-	e := NewStatementExecutor()
-	e.Store.SetPrivilegeFn = func(username, database string, p influxql.Privilege) error {
-		return errors.New("marker")
-	}
-
-	if res := e.ExecuteStatement(influxql.MustParseStatement(`REVOKE ALL PRIVILEGES ON foo FROM susy`)); res.Err == nil || res.Err.Error() != "marker" {
-		t.Fatalf("unexpected error: %s", res.Err)
-	}
-}
-
-// Ensure a REVOKE statement for admin privilege can be executed.
-func TestStatementExecutor_ExecuteStatement_RevokeAdmin(t *testing.T) {
-	e := NewStatementExecutor()
-	e.Store.SetAdminPrivilegeFn = func(username string, admin bool) error {
-		if username != "susy" {
-			t.Fatalf("unexpected username: %s", username)
-		} else if admin != false {
-			t.Fatalf("unexpected admin privilege: %t", admin)
-		}
-		return nil
-	}
-
-	if res := e.ExecuteStatement(influxql.MustParseStatement(`REVOKE ALL PRIVILEGES FROM susy`)); res.Err != nil {
-		t.Fatal(res.Err)
-	} else if res.Series != nil {
-		t.Fatalf("unexpected rows: %#v", res.Series)
-	}
-}
-
-// Ensure a REVOKE statement for admin privilege returns errors from the store.
-func TestStatementExecutor_ExecuteStatement_RevokeAdmin_Err(t *testing.T) {
-	e := NewStatementExecutor()
-	e.Store.SetAdminPrivilegeFn = func(username string, admin bool) error {
-		return errors.New("marker")
-	}
-
-	if res := e.ExecuteStatement(influxql.MustParseStatement(`REVOKE ALL PRIVILEGES FROM susy`)); res.Err == nil || res.Err.Error() != "marker" {
-		t.Fatalf("unexpected error: %s", res.Err)
-	}
-}
-
-// Ensure a CREATE RETENTION POLICY statement can be executed.
-func TestStatementExecutor_ExecuteStatement_CreateRetentionPolicy(t *testing.T) {
-	e := NewStatementExecutor()
-	e.Store.CreateRetentionPolicyFn = func(database string, rpi *meta.RetentionPolicyInfo) (*meta.RetentionPolicyInfo, error) {
-		if database != "foo" {
-			t.Fatalf("unexpected database: %s", database)
-		} else if rpi.Name != "rp0" {
-			t.Fatalf("unexpected name: %s", rpi.Name)
-		} else if rpi.Duration != 2*time.Hour {
-			t.Fatalf("unexpected duration: %v", rpi.Duration)
-		} else if rpi.ReplicaN != 3 {
-			t.Fatalf("unexpected replication factor: %v", rpi.ReplicaN)
-		}
-		return nil, nil
-	}
-	e.Store.SetDefaultRetentionPolicyFn = func(database, name string) error {
-		if database != "foo" {
-			t.Fatalf("unexpected database: %s", database)
-		} else if name != "rp0" {
-			t.Fatalf("unexpected name: %s", name)
-		}
-		return nil
-	}
-
-	if res := e.ExecuteStatement(influxql.MustParseStatement(`CREATE RETENTION POLICY rp0 ON foo DURATION 2h REPLICATION 3 DEFAULT`)); res.Err != nil {
-		t.Fatal(res.Err)
-	} else if res.Series != nil {
-		t.Fatalf("unexpected rows: %#v", res.Series)
-	}
-}
-
-// Ensure a CREATE RETENTION POLICY statement returns errors from the store.
-func TestStatementExecutor_ExecuteStatement_CreateRetentionPolicy_Err(t *testing.T) {
-	e := NewStatementExecutor()
-	e.Store.CreateRetentionPolicyFn = func(database string, rpi *meta.RetentionPolicyInfo) (*meta.RetentionPolicyInfo, error) {
-		return nil, errors.New("marker")
-	}
-
-	if res := e.ExecuteStatement(influxql.MustParseStatement(`CREATE RETENTION POLICY rp0 ON foo DURATION 2h REPLICATION 1`)); res.Err == nil || res.Err.Error() != "marker" {
-		t.Fatalf("unexpected error: %s", res.Err)
-	}
-}
-
-// Ensure an ALTER RETENTION POLICY statement can execute.
-func TestStatementExecutor_ExecuteStatement_AlterRetentionPolicy(t *testing.T) {
-	e := NewStatementExecutor()
-	e.Store.UpdateRetentionPolicyFn = func(database, name string, rpu *meta.RetentionPolicyUpdate) error {
-		if database != "foo" {
-			t.Fatalf("unexpected database: %s", database)
-		} else if name != "rp0" {
-			t.Fatalf("unexpected name: %s", name)
-		} else if rpu.Duration != nil && *rpu.Duration != 7*24*time.Hour {
-			t.Fatalf("unexpected duration: %v", *rpu.Duration)
-		} else if rpu.ReplicaN != nil && *rpu.ReplicaN != 2 {
-			t.Fatalf("unexpected replication factor: %v", *rpu.ReplicaN)
-		}
-		return nil
-	}
-	e.Store.SetDefaultRetentionPolicyFn = func(database, name string) error {
-		if database != "foo" {
-			t.Fatalf("unexpected database: %s", database)
-		} else if name != "rp0" {
-			t.Fatalf("unexpected name: %s", name)
-		}
-		return nil
-	}
-
-	stmt := influxql.MustParseStatement(`ALTER RETENTION POLICY rp0 ON foo DURATION 7d REPLICATION 2 DEFAULT`)
-	if res := e.ExecuteStatement(stmt); res.Err != nil {
-		t.Fatalf("unexpected error: %s", res.Err)
-	}
-
-	stmt = influxql.MustParseStatement(`ALTER RETENTION POLICY rp0 ON foo DURATION 7d`)
-	if res := e.ExecuteStatement(stmt); res.Err != nil {
-		t.Fatalf("unexpected error: %s", res.Err)
-	}
-
-	stmt = influxql.MustParseStatement(`ALTER RETENTION POLICY rp0 ON foo REPLICATION 2`)
-	if res := e.ExecuteStatement(stmt); res.Err != nil {
-		t.Fatalf("unexpected error: %s", res.Err)
-	}
-}
-
-// Ensure a ALTER RETENTION POLICY statement returns errors from the store.
-func TestStatementExecutor_ExecuteStatement_AlterRetentionPolicy_Err(t *testing.T) {
-	e := NewStatementExecutor()
-	e.Store.UpdateRetentionPolicyFn = func(database, name string, rpu *meta.RetentionPolicyUpdate) error {
-		return errors.New("marker")
-	}
-
-	stmt := influxql.MustParseStatement(`ALTER RETENTION POLICY rp0 ON foo DURATION 1m REPLICATION 4 DEFAULT`)
-	if res := e.ExecuteStatement(stmt); res.Err == nil || res.Err.Error() != "marker" {
-		t.Fatalf("unexpected error: %s", res.Err)
-	}
-}
-
-// Ensure a ALTER RETENTION POLICY statement returns errors from the store.
-func TestStatementExecutor_ExecuteStatement_AlterRetentionPolicy_ErrSetDefault(t *testing.T) {
-	e := NewStatementExecutor()
-	e.Store.UpdateRetentionPolicyFn = func(database, name string, rpu *meta.RetentionPolicyUpdate) error {
-		return nil
-	}
-	e.Store.SetDefaultRetentionPolicyFn = func(database, name string) error {
-		return errors.New("marker")
-	}
-
-	stmt := influxql.MustParseStatement(`ALTER RETENTION POLICY rp0 ON foo DURATION 1m REPLICATION 4 DEFAULT`)
-	if res := e.ExecuteStatement(stmt); res.Err == nil || res.Err.Error() != "marker" {
-		t.Fatalf("unexpected error: %s", res.Err)
-	}
-}
-
-// Ensure a DROP RETENTION POLICY statement can execute.
-func TestStatementExecutor_ExecuteStatement_DropRetentionPolicy(t *testing.T) {
-	e := NewStatementExecutor()
-	e.Store.DropRetentionPolicyFn = func(database, name string) error {
-		if database != "foo" {
-			t.Fatalf("unexpected database: %s", database)
-		} else if name != "rp0" {
-			t.Fatalf("unexpected name: %s", name)
-		}
-		return nil
-	}
-
-	stmt := influxql.MustParseStatement(`DROP RETENTION POLICY rp0 ON foo`)
-	if res := e.ExecuteStatement(stmt); res.Err != nil {
-		t.Fatalf("unexpected error: %s", res.Err)
-	}
-}
-
-// Ensure a DROP RETENTION POLICY statement returns errors from the store.
-func TestStatementExecutor_ExecuteStatement_DropRetentionPolicy_Err(t *testing.T) {
-	e := NewStatementExecutor()
-	e.Store.DropRetentionPolicyFn = func(database, name string) error {
-		return errors.New("marker")
-	}
-
-	stmt := influxql.MustParseStatement(`DROP RETENTION POLICY rp0 ON foo`)
-	if res := e.ExecuteStatement(stmt); res.Err == nil || res.Err.Error() != "marker" {
-		t.Fatalf("unexpected error: %s", res.Err)
-	}
-}
-
-// Ensure a SHOW RETENTION POLICIES statement can be executed.
-func TestStatementExecutor_ExecuteStatement_ShowRetentionPolicies(t *testing.T) {
-	e := NewStatementExecutor()
-	e.Store.DatabaseFn = func(name string) (*meta.DatabaseInfo, error) {
-		if name != "db0" {
-			t.Fatalf("unexpected name: %s", name)
-		}
-		return &meta.DatabaseInfo{
-			Name: name,
-			DefaultRetentionPolicy: "rp1",
-			RetentionPolicies: []meta.RetentionPolicyInfo{
-				{
-					Name:     "rp0",
-					Duration: 2 * time.Hour,
-					ReplicaN: 3,
-				},
-				{
-					Name:     "rp1",
-					Duration: 24 * time.Hour,
-					ReplicaN: 1,
-				},
-			},
-		}, nil
-	}
-
-	if res := e.ExecuteStatement(influxql.MustParseStatement(`SHOW RETENTION POLICIES ON db0`)); res.Err != nil {
-		t.Fatal(res.Err)
-	} else if !reflect.DeepEqual(res.Series, models.Rows{
-		{
-			Columns: []string{"name", "duration", "replicaN", "default"},
-			Values: [][]interface{}{
-				{"rp0", "2h0m0s", 3, false},
-				{"rp1", "24h0m0s", 1, true},
-			},
-		},
-	}) {
-		t.Fatalf("unexpected rows: %s", spew.Sdump(res.Series))
-	}
-}
-
-// Ensure a SHOW RETENTION POLICIES statement can return an error from the store.
-func TestStatementExecutor_ExecuteStatement_ShowRetentionPolicies_Err(t *testing.T) {
-	e := NewStatementExecutor()
-	e.Store.DatabaseFn = func(name string) (*meta.DatabaseInfo, error) {
-		return nil, errors.New("marker")
-	}
-
-	if res := e.ExecuteStatement(influxql.MustParseStatement(`SHOW RETENTION POLICIES ON db0`)); res.Err == nil || res.Err.Error() != "marker" {
-		t.Fatalf("unexpected error: %s", res.Err)
-	}
-}
-
-// Ensure a SHOW RETENTION POLICIES statement can return an error if the database doesn't exist.
-func TestStatementExecutor_ExecuteStatement_ShowRetentionPolicies_ErrDatabaseNotFound(t *testing.T) {
-	e := NewStatementExecutor()
-	e.Store.DatabaseFn = func(name string) (*meta.DatabaseInfo, error) {
-		return nil, nil
-	}
-
-	if res := e.ExecuteStatement(influxql.MustParseStatement(`SHOW RETENTION POLICIES ON db0`)); res.Err != meta.ErrDatabaseNotFound {
-		t.Fatalf("unexpected error: %s", res.Err)
-	}
-}
-
-// Ensure a CREATE CONTINUOUS QUERY statement can be executed.
-func TestStatementExecutor_ExecuteStatement_CreateContinuousQuery(t *testing.T) {
-	e := NewStatementExecutor()
-	e.Store.CreateContinuousQueryFn = func(database, name, query string) error {
-		if database != "db0" {
-			t.Fatalf("unexpected database: %s", database)
-		} else if name != "cq0" {
-			t.Fatalf("unexpected name: %s", name)
-		} else if query != `CREATE CONTINUOUS QUERY cq0 ON db0 BEGIN SELECT count(field1) INTO db1 FROM db0 GROUP BY time(1h) END` {
-			t.Fatalf("unexpected query: %s", query)
-		}
-		return nil
-	}
-
-	stmt := influxql.MustParseStatement(`CREATE CONTINUOUS QUERY cq0 ON db0 BEGIN SELECT count(field1) INTO db1 FROM db0 GROUP BY time(1h) END`)
-	if res := e.ExecuteStatement(stmt); res.Err != nil {
-		t.Fatal(res.Err)
-	} else if res.Series != nil {
-		t.Fatalf("unexpected rows: %#v", res.Series)
-	}
-}
-
-// Ensure a CREATE CONTINUOUS QUERY statement can return an error from the store.
-func TestStatementExecutor_ExecuteStatement_CreateContinuousQuery_Err(t *testing.T) {
-	e := NewStatementExecutor()
-	e.Store.CreateContinuousQueryFn = func(database, name, query string) error {
-		return errors.New("marker")
-	}
-
-	stmt := influxql.MustParseStatement(`CREATE CONTINUOUS QUERY cq0 ON db0 BEGIN SELECT count(field1) INTO db1 FROM db0 GROUP BY time(1h) END`)
-	if res := e.ExecuteStatement(stmt); res.Err == nil || res.Err.Error() != "marker" {
-		t.Fatalf("unexpected error: %s", res.Err)
-	}
-}
-
-// Ensure a DROP CONTINUOUS QUERY statement can be executed.
-func TestStatementExecutor_ExecuteStatement_DropContinuousQuery(t *testing.T) {
-	e := NewStatementExecutor()
-	e.Store.DropContinuousQueryFn = func(database, name string) error {
-		if database != "db0" {
-			t.Fatalf("unexpected database: %s", database)
-		} else if name != "cq0" {
-			t.Fatalf("unexpected name: %s", name)
-		}
-		return nil
-	}
-
-	stmt := influxql.MustParseStatement(`DROP CONTINUOUS QUERY cq0 ON db0`)
-	if res := e.ExecuteStatement(stmt); res.Err != nil {
-		t.Fatal(res.Err)
-	} else if res.Series != nil {
-		t.Fatalf("unexpected rows: %#v", res.Series)
-	}
-}
-
-// Ensure a DROP CONTINUOUS QUERY statement can return an error from the store.
-func TestStatementExecutor_ExecuteStatement_DropContinuousQuery_Err(t *testing.T) {
-	e := NewStatementExecutor()
-	e.Store.DropContinuousQueryFn = func(database, name string) error {
-		return errors.New("marker")
-	}
-
-	stmt := influxql.MustParseStatement(`DROP CONTINUOUS QUERY cq0 ON db0`)
-	if res := e.ExecuteStatement(stmt); res.Err == nil || res.Err.Error() != "marker" {
-		t.Fatalf("unexpected error: %s", res.Err)
-	}
-}
-
-// Ensure a SHOW CONTINUOUS QUERIES statement can be executed.
-func TestStatementExecutor_ExecuteStatement_ShowContinuousQueries(t *testing.T) {
-	e := NewStatementExecutor()
-	e.Store.DatabasesFn = func() ([]meta.DatabaseInfo, error) {
-		return []meta.DatabaseInfo{
-			{
-				Name: "db0",
-				ContinuousQueries: []meta.ContinuousQueryInfo{
-					{Name: "cq0", Query: "SELECT count(field1) INTO db1 FROM db0"},
-					{Name: "cq1", Query: "SELECT count(field1) INTO db2 FROM db0"},
-				},
-			},
-			{
-				Name: "db1",
-				ContinuousQueries: []meta.ContinuousQueryInfo{
-					{Name: "cq2", Query: "SELECT count(field1) INTO db3 FROM db1"},
-				},
-			},
-		}, nil
-	}
-
-	stmt := influxql.MustParseStatement(`SHOW CONTINUOUS QUERIES`)
-	if res := e.ExecuteStatement(stmt); res.Err != nil {
-		t.Fatal(res.Err)
-	} else if !reflect.DeepEqual(res.Series, models.Rows{
-		{
-			Name:    "db0",
-			Columns: []string{"name", "query"},
-			Values: [][]interface{}{
-				{"cq0", "SELECT count(field1) INTO db1 FROM db0"},
-				{"cq1", "SELECT count(field1) INTO db2 FROM db0"},
-			},
-		},
-		{
-			Name:    "db1",
-			Columns: []string{"name", "query"},
-			Values: [][]interface{}{
-				{"cq2", "SELECT count(field1) INTO db3 FROM db1"},
-			},
-		},
-	}) {
-		t.Fatalf("unexpected rows: %s", spew.Sdump(res.Series))
-	}
-}
-
-// Ensure a SHOW CONTINUOUS QUERIES statement can return an error from the store.
-func TestStatementExecutor_ExecuteStatement_ShowContinuousQueries_Err(t *testing.T) {
-	e := NewStatementExecutor()
-	e.Store.DatabasesFn = func() ([]meta.DatabaseInfo, error) {
-		return nil, errors.New("marker")
-	}
-
-	stmt := influxql.MustParseStatement(`SHOW CONTINUOUS QUERIES`)
-	if res := e.ExecuteStatement(stmt); res.Err == nil || res.Err.Error() != "marker" {
-		t.Fatal(res.Err)
-	}
-}
-
-// Ensure a CREATE SUBSCRIPTION statement can be executed.
-func TestStatementExecutor_ExecuteStatement_CreateSubscription(t *testing.T) {
-	e := NewStatementExecutor()
-	e.Store.CreateSubscriptionFn = func(database, rp, name, mode string, destinations []string) error {
-		if database != "db0" {
-			t.Fatalf("unexpected database: %s", database)
-		} else if rp != "rp0" {
-			t.Fatalf("unexpected rp: %s", rp)
-		} else if name != "s0" {
-			t.Fatalf("unexpected name: %s", name)
-		} else if mode != "ANY" {
-			t.Fatalf("unexpected mode: %s", mode)
-		} else if len(destinations) != 2 {
-			t.Fatalf("unexpected destinations: %s", destinations)
-		} else if destinations[0] != "udp://h0:1234" {
-			t.Fatalf("unexpected destinations[0]: %s", destinations[0])
-		} else if destinations[1] != "udp://h1:1234" {
-			t.Fatalf("unexpected destinations[1]: %s", destinations[1])
-		}
-		return nil
-	}
-
-	stmt := influxql.MustParseStatement(`CREATE SUBSCRIPTION s0 ON db0.rp0 DESTINATIONS ANY 'udp://h0:1234', 'udp://h1:1234'`)
-	if res := e.ExecuteStatement(stmt); res.Err != nil {
-		t.Fatal(res.Err)
-	} else if res.Series != nil {
-		t.Fatalf("unexpected rows: %#v", res.Series)
-	}
-}
-
-// Ensure a CREATE SUBSCRIPTION statement can return an error from the store.
-func TestStatementExecutor_ExecuteStatement_CreateSubscription_Err(t *testing.T) {
-	e := NewStatementExecutor()
-	e.Store.CreateSubscriptionFn = func(database, rp, name, mode string, destinations []string) error {
-		return errors.New("marker")
-	}
-
-	stmt := influxql.MustParseStatement(`CREATE SUBSCRIPTION s0 ON db0.rp0 DESTINATIONS ANY 'udp://h0:1234', 'udp://h1:1234'`)
-	if res := e.ExecuteStatement(stmt); res.Err == nil || res.Err.Error() != "marker" {
-		t.Fatalf("unexpected error: %s", res.Err)
-	}
-}
-
-// Ensure a DROP SUBSCRIPTION statement can be executed.
-func TestStatementExecutor_ExecuteStatement_DropSubscription(t *testing.T) {
-	e := NewStatementExecutor()
-	e.Store.DropSubscriptionFn = func(database, rp, name string) error {
-		if database != "db0" {
-			t.Fatalf("unexpected database: %s", database)
-		} else if rp != "rp0" {
-			t.Fatalf("unexpected rp: %s", rp)
-		} else if name != "s0" {
-			t.Fatalf("unexpected name: %s", name)
-		}
-		return nil
-	}
-
-	stmt := influxql.MustParseStatement(`DROP SUBSCRIPTION s0 ON db0.rp0`)
-	if res := e.ExecuteStatement(stmt); res.Err != nil {
-		t.Fatal(res.Err)
-	} else if res.Series != nil {
-		t.Fatalf("unexpected rows: %#v", res.Series)
-	}
-}
-
-// Ensure a DROP SUBSCRIPTION statement can return an error from the store.
-func TestStatementExecutor_ExecuteStatement_DropSubscription_Err(t *testing.T) {
-	e := NewStatementExecutor()
-	e.Store.DropSubscriptionFn = func(database, rp, name string) error {
-		return errors.New("marker")
-	}
-
-	stmt := influxql.MustParseStatement(`DROP SUBSCRIPTION s0 ON db0.rp0`)
-	if res := e.ExecuteStatement(stmt); res.Err == nil || res.Err.Error() != "marker" {
-		t.Fatalf("unexpected error: %s", res.Err)
-	}
-}
-
-// Ensure a SHOW SUBSCRIPTIONS statement can be executed.
-func TestStatementExecutor_ExecuteStatement_ShowSubscriptions(t *testing.T) {
-	e := NewStatementExecutor()
-	e.Store.DatabasesFn = func() ([]meta.DatabaseInfo, error) {
-		return []meta.DatabaseInfo{
-			{
-				Name: "db0",
-				RetentionPolicies: []meta.RetentionPolicyInfo{
-					{
-						Name: "rp0",
-						Subscriptions: []meta.SubscriptionInfo{
-							{Name: "s0", Mode: "ALL", Destinations: []string{"udp://h0:1234", "udp://h1:1234"}},
-							{Name: "s1", Mode: "ANY", Destinations: []string{"udp://h2:1234", "udp://h3:1234"}},
-						},
-					},
-					{
-						Name: "rp1",
-						Subscriptions: []meta.SubscriptionInfo{
-							{Name: "s2", Mode: "ALL", Destinations: []string{"udp://h4:1234", "udp://h5:1234"}},
-						},
-					},
-				},
-			},
-			{
-				Name: "db1",
-				RetentionPolicies: []meta.RetentionPolicyInfo{
-					{
-						Name: "rp2",
-						Subscriptions: []meta.SubscriptionInfo{
-							{Name: "s3", Mode: "ANY", Destinations: []string{"udp://h6:1234", "udp://h7:1234"}},
-						},
-					},
-				},
-			},
-		}, nil
-	}
-
-	stmt := influxql.MustParseStatement(`SHOW SUBSCRIPTIONS`)
-	if res := e.ExecuteStatement(stmt); res.Err != nil {
-		t.Fatal(res.Err)
-	} else if !reflect.DeepEqual(res.Series, models.Rows{
-		{
-			Name:    "db0",
-			Columns: []string{"retention_policy", "name", "mode", "destinations"},
-			Values: [][]interface{}{
-				{"rp0", "s0", "ALL", []string{"udp://h0:1234", "udp://h1:1234"}},
-				{"rp0", "s1", "ANY", []string{"udp://h2:1234", "udp://h3:1234"}},
-				{"rp1", "s2", "ALL", []string{"udp://h4:1234", "udp://h5:1234"}},
-			},
-		},
-		{
-			Name:    "db1",
-			Columns: []string{"retention_policy", "name", "mode", "destinations"},
-			Values: [][]interface{}{
-				{"rp2", "s3", "ANY", []string{"udp://h6:1234", "udp://h7:1234"}},
-			},
-		},
-	}) {
-		t.Fatalf("unexpected rows: %s", spew.Sdump(res.Series))
-	}
-}
-
-// Ensure a SHOW SUBSCRIPTIONS statement can return an error from the store.
-func TestStatementExecutor_ExecuteStatement_ShowSubscriptions_Err(t *testing.T) {
-	e := NewStatementExecutor()
-	e.Store.DatabasesFn = func() ([]meta.DatabaseInfo, error) {
-		return nil, errors.New("marker")
-	}
-
-	stmt := influxql.MustParseStatement(`SHOW SUBSCRIPTIONS`)
-	if res := e.ExecuteStatement(stmt); res.Err == nil || res.Err.Error() != "marker" {
-		t.Fatal(res.Err)
-	}
-}
-
-// Ensure that executing an unsupported statement will panic.
-func TestStatementExecutor_ExecuteStatement_Unsupported(t *testing.T) {
-	var panicked bool
-	func() {
-		defer func() {
-			if r := recover(); r != nil {
-				panicked = true
-			}
-		}()
-
-		// Execute a SELECT statement.
-		NewStatementExecutor().ExecuteStatement(
-			influxql.MustParseStatement(`SELECT count(field1) FROM db0`),
-		)
-	}()
-
-	// Ensure that the executor panicked.
-	if !panicked {
-		t.Fatal("executor did not panic")
-	}
-}
-
-// Ensure a SHOW SHARDS statement can be executed.
-func TestStatementExecutor_ExecuteStatement_ShowShards(t *testing.T) {
-	e := NewStatementExecutor()
-	e.Store.DatabasesFn = func() ([]meta.DatabaseInfo, error) {
-		return []meta.DatabaseInfo{
-			{
-				Name: "foo",
-				RetentionPolicies: []meta.RetentionPolicyInfo{
-					{
-						Name:     "rpi_foo",
-						Duration: time.Second,
-						ShardGroups: []meta.ShardGroupInfo{
-							{
-								ID:        66,
-								StartTime: time.Unix(0, 0),
-								EndTime:   time.Unix(1, 0),
-								Shards: []meta.ShardInfo{
-									{
-										ID: 1,
-										Owners: []meta.ShardOwner{
-											{NodeID: 1},
-											{NodeID: 2},
-											{NodeID: 3},
-										},
-									},
-									{
-										ID: 2,
-									},
-								},
-							},
-						},
-					},
-				},
-			},
-		}, nil
-	}
-
-	if res := e.ExecuteStatement(influxql.MustParseStatement(`SHOW SHARDS`)); res.Err != nil {
-		t.Fatal(res.Err)
-	} else if !reflect.DeepEqual(res.Series, models.Rows{
-		{
-			Name:    "foo",
-			Columns: []string{"id", "database", "retention_policy", "shard_group", "start_time", "end_time", "expiry_time", "owners"},
-			Values: [][]interface{}{
-				{uint64(1), "foo", "rpi_foo", uint64(66), "1970-01-01T00:00:00Z", "1970-01-01T00:00:01Z", "1970-01-01T00:00:02Z", "1,2,3"},
-				{uint64(2), "foo", "rpi_foo", uint64(66), "1970-01-01T00:00:00Z", "1970-01-01T00:00:01Z", "1970-01-01T00:00:02Z", ""},
-			},
-		},
-	}) {
-		t.Fatalf("unexpected rows: %s", spew.Sdump(res.Series))
-	}
-}
-
-// StatementExecutor represents a test wrapper for meta.StatementExecutor.
-type StatementExecutor struct {
-	*meta.StatementExecutor
-	Store StatementExecutorStore
-}
-
-// NewStatementExecutor returns a new instance of StatementExecutor with a mock store.
-func NewStatementExecutor() *StatementExecutor {
-	e := &StatementExecutor{}
-	e.StatementExecutor = &meta.StatementExecutor{Store: &e.Store}
-	return e
-}
-
-// StatementExecutorStore represents a mock implementation of StatementExecutor.Store.
-type StatementExecutorStore struct {
-	NodeFn                      func(id uint64) (*meta.NodeInfo, error)
-	NodesFn                     func() ([]meta.NodeInfo, error)
-	PeersFn                     func() ([]string, error)
-	LeaderFn                    func() string
-	DatabaseFn                  func(name string) (*meta.DatabaseInfo, error)
-	DatabasesFn                 func() ([]meta.DatabaseInfo, error)
-	CreateDatabaseFn            func(name string) (*meta.DatabaseInfo, error)
-	DropDatabaseFn              func(name string) error
-	DeleteNodeFn                func(nodeID uint64, force bool) error
-	DefaultRetentionPolicyFn    func(database string) (*meta.RetentionPolicyInfo, error)
-	CreateRetentionPolicyFn     func(database string, rpi *meta.RetentionPolicyInfo) (*meta.RetentionPolicyInfo, error)
-	UpdateRetentionPolicyFn     func(database, name string, rpu *meta.RetentionPolicyUpdate) error
-	SetDefaultRetentionPolicyFn func(database, name string) error
-	DropRetentionPolicyFn       func(database, name string) error
-	UsersFn                     func() ([]meta.UserInfo, error)
-	CreateUserFn                func(name, password string, admin bool) (*meta.UserInfo, error)
-	UpdateUserFn                func(name, password string) error
-	DropUserFn                  func(name string) error
-	SetPrivilegeFn              func(username, database string, p influxql.Privilege) error
-	SetAdminPrivilegeFn         func(username string, admin bool) error
-	UserPrivilegesFn            func(username string) (map[string]influxql.Privilege, error)
-	UserPrivilegeFn             func(username, database string) (*influxql.Privilege, error)
-	ContinuousQueriesFn         func() ([]meta.ContinuousQueryInfo, error)
-	CreateContinuousQueryFn     func(database, name, query string) error
-	DropContinuousQueryFn       func(database, name string) error
-	CreateSubscriptionFn        func(database, rp, name, typ string, hosts []string) error
-	DropSubscriptionFn          func(database, rp, name string) error
-}
-
-func (s *StatementExecutorStore) Node(id uint64) (*meta.NodeInfo, error) {
-	return s.NodeFn(id)
-}
-
-func (s *StatementExecutorStore) Nodes() ([]meta.NodeInfo, error) {
-	return s.NodesFn()
-}
-
-func (s *StatementExecutorStore) Peers() ([]string, error) {
-	return s.PeersFn()
-}
-
-func (s *StatementExecutorStore) Leader() string {
-	if s.LeaderFn != nil {
-		return s.LeaderFn()
-	}
-	return ""
-}
-
-func (s *StatementExecutorStore) DeleteNode(nodeID uint64, force bool) error {
-	return s.DeleteNodeFn(nodeID, force)
-}
-
-func (s *StatementExecutorStore) Database(name string) (*meta.DatabaseInfo, error) {
-	return s.DatabaseFn(name)
-}
-
-func (s *StatementExecutorStore) Databases() ([]meta.DatabaseInfo, error) {
-	return s.DatabasesFn()
-}
-
-func (s *StatementExecutorStore) CreateDatabase(name string) (*meta.DatabaseInfo, error) {
-	return s.CreateDatabaseFn(name)
-}
-
-func (s *StatementExecutorStore) DropDatabase(name string) error {
-	return s.DropDatabaseFn(name)
-}
-
-func (s *StatementExecutorStore) DefaultRetentionPolicy(database string) (*meta.RetentionPolicyInfo, error) {
-	return s.DefaultRetentionPolicyFn(database)
-}
-
-func (s *StatementExecutorStore) CreateRetentionPolicy(database string, rpi *meta.RetentionPolicyInfo) (*meta.RetentionPolicyInfo, error) {
-	return s.CreateRetentionPolicyFn(database, rpi)
-}
-
-func (s *StatementExecutorStore) UpdateRetentionPolicy(database, name string, rpu *meta.RetentionPolicyUpdate) error {
-	return s.UpdateRetentionPolicyFn(database, name, rpu)
-}
-
-func (s *StatementExecutorStore) SetDefaultRetentionPolicy(database, name string) error {
-	return s.SetDefaultRetentionPolicyFn(database, name)
-}
-
-func (s *StatementExecutorStore) DropRetentionPolicy(database, name string) error {
-	return s.DropRetentionPolicyFn(database, name)
-}
-
-func (s *StatementExecutorStore) Users() ([]meta.UserInfo, error) {
-	return s.UsersFn()
-}
-
-func (s *StatementExecutorStore) CreateUser(name, password string, admin bool) (*meta.UserInfo, error) {
-	return s.CreateUserFn(name, password, admin)
-}
-
-func (s *StatementExecutorStore) UpdateUser(name, password string) error {
-	return s.UpdateUserFn(name, password)
-}
-
-func (s *StatementExecutorStore) DropUser(name string) error {
-	return s.DropUserFn(name)
-}
-
-func (s *StatementExecutorStore) SetPrivilege(username, database string, p influxql.Privilege) error {
-	return s.SetPrivilegeFn(username, database, p)
-}
-
-func (s *StatementExecutorStore) SetAdminPrivilege(username string, admin bool) error {
-	return s.SetAdminPrivilegeFn(username, admin)
-}
-
-func (s *StatementExecutorStore) UserPrivileges(username string) (map[string]influxql.Privilege, error) {
-	return s.UserPrivilegesFn(username)
-}
-
-func (s *StatementExecutorStore) UserPrivilege(username, database string) (*influxql.Privilege, error) {
-	return s.UserPrivilegeFn(username, database)
-}
-
-func (s *StatementExecutorStore) ContinuousQueries() ([]meta.ContinuousQueryInfo, error) {
-	return s.ContinuousQueriesFn()
-}
-
-func (s *StatementExecutorStore) CreateContinuousQuery(database, name, query string) error {
-	return s.CreateContinuousQueryFn(database, name, query)
-}
-
-func (s *StatementExecutorStore) DropContinuousQuery(database, name string) error {
-	return s.DropContinuousQueryFn(database, name)
-}
-
-func (s *StatementExecutorStore) CreateSubscription(database, rp, name, typ string, hosts []string) error {
-	return s.CreateSubscriptionFn(database, rp, name, typ, hosts)
-}
-
-func (s *StatementExecutorStore) DropSubscription(database, rp, name string) error {
-	return s.DropSubscriptionFn(database, rp, name)
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/meta/store.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/meta/store.go
deleted file mode 100644
index be2ac0a2a..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/meta/store.go
+++ /dev/null
@@ -1,2324 +0,0 @@
-package meta
-
-import (
-	"bytes"
-	crand "crypto/rand"
-	"crypto/sha256"
-	"encoding/binary"
-	"errors"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"log"
-	"math/rand"
-	"net"
-	"os"
-	"path/filepath"
-	"sort"
-	"strconv"
-	"strings"
-	"sync"
-	"time"
-
-	"github.com/gogo/protobuf/proto"
-	"github.com/hashicorp/raft"
-	"github.com/influxdb/influxdb/influxql"
-	"github.com/influxdb/influxdb/meta/internal"
-	"golang.org/x/crypto/bcrypt"
-)
-
-// tcp.Mux header bytes.
-const (
-	MuxRaftHeader = 0
-	MuxExecHeader = 1
-	MuxRPCHeader  = 5
-
-	// SaltBytes is the number of bytes used for salts
-	SaltBytes = 32
-
-	DefaultSyncNodeDelay = time.Second
-)
-
-// ExecMagic is the first 4 bytes sent to a remote exec connection to verify
-// that it is coming from a remote exec client connection.
-const ExecMagic = "EXEC"
-
-// Retention policy settings.
-const (
-	AutoCreateRetentionPolicyName   = "default"
-	AutoCreateRetentionPolicyPeriod = 0
-
-	// MaxAutoCreatedRetentionPolicyReplicaN is the maximum replication factor that will
-	// be set for auto-created retention policies.
-	MaxAutoCreatedRetentionPolicyReplicaN = 3
-)
-
-// Raft configuration.
-const (
-	raftLogCacheSize      = 512
-	raftSnapshotsRetained = 2
-	raftTransportMaxPool  = 3
-	raftTransportTimeout  = 10 * time.Second
-	MaxRaftNodes          = 3
-)
-
-// Store represents a raft-backed metastore.
-type Store struct {
-	mu     sync.RWMutex
-	path   string
-	opened bool
-
-	id uint64 // local node id
-
-	// All peers in cluster. Used during bootstrapping.
-	peers []string
-
-	data *Data
-
-	rpc *rpc
-
-	// The address used by other nodes to reach this node.
-	RemoteAddr net.Addr
-
-	raftState raftState
-
-	ready   chan struct{}
-	err     chan error
-	closing chan struct{}
-	wg      sync.WaitGroup
-	changed chan struct{}
-
-	// clusterTracingEnabled controls whether low-level cluster communication is logged.
-	// Useful for troubleshooting
-	clusterTracingEnabled bool
-
-	retentionAutoCreate bool
-
-	// The listeners to accept raft and remote exec connections from.
-	RaftListener net.Listener
-	ExecListener net.Listener
-
-	// The listener for higher-level, cluster operations
-	RPCListener net.Listener
-
-	// The advertised hostname of the store.
-	Addr net.Addr
-
-	// The amount of time before a follower starts a new election.
-	HeartbeatTimeout time.Duration
-
-	// The amount of time before a candidate starts a new election.
-	ElectionTimeout time.Duration
-
-	// The amount of time without communication to the cluster before a
-	// leader steps down to a follower state.
-	LeaderLeaseTimeout time.Duration
-
-	// The amount of time without an apply before sending a heartbeat.
-	CommitTimeout time.Duration
-
-	// Authentication cache.
-	authCache map[string]authUser
-
-	// hashPassword generates a cryptographically secure hash for password.
-	// Returns an error if the password is invalid or a hash cannot be generated.
-	hashPassword HashPasswordFn
-
-	// raftPromotionEnabled determines if non-raft nodes should be automatically
-	// promoted to a raft node to self-heal a raft cluster
-	raftPromotionEnabled bool
-
-	Logger *log.Logger
-}
-
-type authUser struct {
-	salt []byte
-	hash []byte
-}
-
-// NewStore returns a new instance of Store.
-func NewStore(c *Config) *Store {
-	s := &Store{
-		path:  c.Dir,
-		peers: c.Peers,
-		data:  &Data{},
-
-		ready:   make(chan struct{}),
-		err:     make(chan error),
-		closing: make(chan struct{}),
-		changed: make(chan struct{}),
-
-		clusterTracingEnabled: c.ClusterTracing,
-		retentionAutoCreate:   c.RetentionAutoCreate,
-		raftPromotionEnabled:  c.RaftPromotionEnabled,
-
-		HeartbeatTimeout:   time.Duration(c.HeartbeatTimeout),
-		ElectionTimeout:    time.Duration(c.ElectionTimeout),
-		LeaderLeaseTimeout: time.Duration(c.LeaderLeaseTimeout),
-		CommitTimeout:      time.Duration(c.CommitTimeout),
-		authCache:          make(map[string]authUser, 0),
-		hashPassword: func(password string) ([]byte, error) {
-			return bcrypt.GenerateFromPassword([]byte(password), BcryptCost)
-		},
-		Logger: log.New(os.Stderr, "[metastore] ", log.LstdFlags),
-	}
-
-	s.raftState = &localRaft{store: s}
-	s.rpc = &rpc{
-		store:          s,
-		tracingEnabled: c.ClusterTracing,
-		logger:         s.Logger,
-	}
-	return s
-}
-
-// Path returns the root path when open.
-// Returns an empty string when the store is closed.
-func (s *Store) Path() string { return s.path }
-
-// IDPath returns the path to the local node ID file.
-func (s *Store) IDPath() string { return filepath.Join(s.path, "id") }
-
-// Open opens and initializes the raft store.
-func (s *Store) Open() error {
-	// Verify that no more than 3 peers.
-	// https://github.com/influxdb/influxdb/issues/2750
-	if len(s.peers) > MaxRaftNodes {
-		return ErrTooManyPeers
-	}
-
-	// Verify listeners are set.
-	if s.RaftListener == nil {
-		panic("Store.RaftListener not set")
-	} else if s.ExecListener == nil {
-		panic("Store.ExecListener not set")
-	} else if s.RPCListener == nil {
-		panic("Store.RPCListener not set")
-	}
-
-	s.Logger.Printf("Using data dir: %v", s.Path())
-
-	if err := func() error {
-		s.mu.Lock()
-		defer s.mu.Unlock()
-
-		// Check if store has already been opened.
-		if s.opened {
-			return ErrStoreOpen
-		}
-		s.opened = true
-
-		// load our raft state
-		if err := s.loadState(); err != nil {
-			return err
-		}
-
-		// Create the root directory if it doesn't already exist.
-		if err := s.createRootDir(); err != nil {
-			return fmt.Errorf("mkdir all: %s", err)
-		}
-
-		// Open the raft store.
-		if err := s.openRaft(); err != nil {
-			return fmt.Errorf("raft: %s", err)
-		}
-
-		// Initialize the store, if necessary.
-		if err := s.initialize(); err != nil {
-			return fmt.Errorf("initialize raft: %s", err)
-		}
-
-		// Load existing ID, if exists.
-		if err := s.readID(); err != nil {
-			return fmt.Errorf("read id: %s", err)
-		}
-
-		return nil
-	}(); err != nil {
-		return err
-	}
-
-	// Begin serving listener.
-	s.wg.Add(1)
-	go s.serveExecListener()
-
-	s.wg.Add(1)
-	go s.serveRPCListener()
-
-	// Join an existing cluster if we needed
-	if err := s.joinCluster(); err != nil {
-		return fmt.Errorf("join: %v", err)
-	}
-
-	// If the ID doesn't exist then create a new node.
-	if s.id == 0 {
-		go s.init()
-	} else {
-		go s.syncNodeInfo()
-		close(s.ready)
-	}
-
-	// Wait for a leader to be elected so we know the raft log is loaded
-	// and up to date
-	<-s.ready
-	if err := s.WaitForLeader(0); err != nil {
-		return err
-	}
-
-	if s.raftPromotionEnabled {
-		s.wg.Add(1)
-		s.Logger.Printf("spun up monitoring for %d", s.NodeID())
-		go s.monitorPeerHealth()
-	}
-
-	return nil
-}
-
-// syncNodeInfo continuously tries to update the current nodes hostname
-// in the meta store.  It will retry until successful.
-func (s *Store) syncNodeInfo() error {
-	<-s.ready
-
-	for {
-		if err := func() error {
-			if err := s.WaitForLeader(0); err != nil {
-				return err
-			}
-
-			ni, err := s.Node(s.id)
-			if err != nil {
-				return err
-			}
-
-			if ni == nil {
-				return ErrNodeNotFound
-			}
-
-			if ni.Host == s.RemoteAddr.String() {
-				s.Logger.Printf("Updated node id=%d hostname=%v", s.id, s.RemoteAddr.String())
-				return nil
-			}
-
-			_, err = s.UpdateNode(s.id, s.RemoteAddr.String())
-			if err != nil {
-				return err
-			}
-			return nil
-		}(); err != nil {
-			// If we get an error, the cluster has not stabilized so just try again
-			time.Sleep(DefaultSyncNodeDelay)
-			continue
-		}
-		return nil
-	}
-}
-
-// loadState sets the appropriate raftState from our persistent storage
-func (s *Store) loadState() error {
-	peers, err := readPeersJSON(filepath.Join(s.path, "peers.json"))
-	if err != nil {
-		return err
-	}
-
-	// If we have existing peers, use those.  This will override what's in the
-	// config.
-	if len(peers) > 0 {
-		s.peers = peers
-	}
-
-	// if no peers on disk, we need to start raft in order to initialize a new
-	// cluster or join an existing one.
-	if len(peers) == 0 {
-		s.raftState = &localRaft{store: s}
-		// if we have a raft database, (maybe restored), we should start raft locally
-	} else if _, err := os.Stat(filepath.Join(s.path, "raft.db")); err == nil {
-		s.raftState = &localRaft{store: s}
-		// otherwise, we should use remote raft
-	} else {
-		s.raftState = &remoteRaft{store: s}
-	}
-	return nil
-}
-
-func (s *Store) joinCluster() error {
-
-	// No join options, so nothing to do
-	if len(s.peers) == 0 {
-		return nil
-	}
-
-	// We already have a node ID so were already part of a cluster,
-	// don't join again so we can use our existing state.
-	if s.id != 0 {
-		s.Logger.Printf("Skipping cluster join: already member of cluster: nodeId=%v raftEnabled=%v peers=%v",
-			s.id, raft.PeerContained(s.peers, s.RemoteAddr.String()), s.peers)
-		return nil
-	}
-
-	s.Logger.Printf("Joining cluster at: %v", s.peers)
-	for {
-		for _, join := range s.peers {
-			res, err := s.rpc.join(s.RemoteAddr.String(), join)
-			if err != nil {
-				s.Logger.Printf("Join node %v failed: %v: retrying...", join, err)
-				continue
-			}
-
-			s.Logger.Printf("Joined remote node %v", join)
-			s.Logger.Printf("nodeId=%v raftEnabled=%v peers=%v", res.NodeID, res.RaftEnabled, res.RaftNodes)
-
-			s.peers = res.RaftNodes
-			s.id = res.NodeID
-
-			if err := s.writeNodeID(res.NodeID); err != nil {
-				s.Logger.Printf("Write node id failed: %v", err)
-				break
-			}
-
-			if !res.RaftEnabled {
-				// Shutdown our local raft and transition to a remote raft state
-				if err := s.enableRemoteRaft(); err != nil {
-					s.Logger.Printf("Enable remote raft failed: %v", err)
-					break
-				}
-			}
-			return nil
-		}
-		time.Sleep(time.Second)
-	}
-}
-
-func (s *Store) enableLocalRaft() error {
-	s.mu.Lock()
-	defer s.mu.Unlock()
-
-	if _, ok := s.raftState.(*localRaft); ok {
-		return nil
-	}
-	s.Logger.Printf("Switching to local raft")
-
-	lr := &localRaft{store: s}
-	return s.changeState(lr)
-}
-
-func (s *Store) enableRemoteRaft() error {
-	if _, ok := s.raftState.(*remoteRaft); ok {
-		return nil
-	}
-
-	s.Logger.Printf("Switching to remote raft")
-	rr := &remoteRaft{store: s}
-	return s.changeState(rr)
-}
-
-func (s *Store) changeState(state raftState) error {
-	if s.raftState != nil {
-		if err := s.raftState.close(); err != nil {
-			return err
-		}
-
-		// Clear out any persistent state
-		if err := s.raftState.remove(); err != nil {
-			return err
-		}
-	}
-	s.raftState = state
-
-	if err := s.raftState.open(); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-// monitorPeerHealth periodically checks if we have a node that can be promoted to a
-// raft peer to fill any missing slots.
-// This function runs in a separate goroutine.
-func (s *Store) monitorPeerHealth() {
-	defer s.wg.Done()
-
-	ticker := time.NewTicker(1 * time.Second)
-	defer ticker.Stop()
-
-	for {
-		// Wait for next tick or timeout.
-		select {
-		case <-ticker.C:
-		case <-s.closing:
-			return
-		}
-		if err := s.promoteNodeToPeer(); err != nil {
-			s.Logger.Printf("error promoting node to raft peer: %s", err)
-		}
-	}
-}
-
-func (s *Store) promoteNodeToPeer() error {
-	// Only do this if you are the leader
-
-	if !s.IsLeader() {
-		return nil
-	}
-
-	s.mu.Lock()
-	defer s.mu.Unlock()
-
-	peers, err := s.raftState.peers()
-	if err != nil {
-		return err
-	}
-
-	nodes := s.data.Nodes
-	var nonraft NodeInfos
-	for _, n := range nodes {
-		if contains(peers, n.Host) {
-			continue
-		}
-		nonraft = append(nonraft, n)
-	}
-
-	// Check to see if any action is required or possible
-	if len(peers) >= 3 || len(nonraft) == 0 {
-		return nil
-	}
-
-	// Sort the nodes
-	sort.Sort(nonraft)
-
-	// Get the lowest node for a deterministic outcome
-	n := nonraft[0]
-	// Set peers on the leader now to the new peers
-	if err := s.AddPeer(n.Host); err != nil {
-		return fmt.Errorf("unable to add raft peer %s on leader: %s", n.Host, err)
-	}
-
-	// add node to peers list
-	peers = append(peers, n.Host)
-	if err := s.rpc.enableRaft(n.Host, peers); err != nil {
-		return fmt.Errorf("error notifying raft peer: %s", err)
-	}
-	s.Logger.Printf("promoted nodeID %d, host %s to raft peer", n.ID, n.Host)
-
-	return nil
-}
-
-// openRaft initializes the raft store.
-func (s *Store) openRaft() error {
-	return s.raftState.open()
-}
-
-// initialize attempts to bootstrap the raft store if there are no committed entries.
-func (s *Store) initialize() error {
-	return s.raftState.initialize()
-}
-
-// Close closes the store and shuts down the node in the cluster.
-func (s *Store) Close() error {
-	s.mu.Lock()
-	defer s.mu.Unlock()
-	return s.close()
-}
-
-// WaitForDataChanged will block the current goroutine until the metastore index has
-// be updated.
-func (s *Store) WaitForDataChanged() error {
-	s.mu.RLock()
-	changed := s.changed
-	s.mu.RUnlock()
-
-	for {
-		select {
-		case <-s.closing:
-			return errors.New("closing")
-		case <-changed:
-			return nil
-		}
-	}
-}
-
-func (s *Store) close() error {
-	// Check if store has already been closed.
-	if !s.opened {
-		return ErrStoreClosed
-	}
-	s.opened = false
-
-	// Close our exec listener
-	if err := s.ExecListener.Close(); err != nil {
-		s.Logger.Printf("error closing ExecListener %s", err)
-	}
-
-	// Close our RPC listener
-	if err := s.RPCListener.Close(); err != nil {
-		s.Logger.Printf("error closing ExecListener %s", err)
-	}
-
-	if s.raftState != nil {
-		s.raftState.close()
-	}
-
-	// Because a go routine could of already fired in the time we acquired the lock
-	// it could then try to acquire another lock, and will deadlock.
-	// For that reason, we will release our lock and signal the close so that
-	// all go routines can exit cleanly and fullfill their contract to the wait group.
-	s.mu.Unlock()
-	// Notify goroutines of close.
-	close(s.closing)
-	s.wg.Wait()
-
-	// Now that all go routines are cleaned up, w lock to do final clean up and exit
-	s.mu.Lock()
-
-	s.raftState = nil
-
-	return nil
-}
-
-// readID reads the local node ID from the ID file.
-func (s *Store) readID() error {
-	b, err := ioutil.ReadFile(s.IDPath())
-	if os.IsNotExist(err) {
-		s.id = 0
-		return nil
-	} else if err != nil {
-		return fmt.Errorf("read file: %s", err)
-	}
-
-	id, err := strconv.ParseUint(string(b), 10, 64)
-	if err != nil {
-		return fmt.Errorf("parse id: %s", err)
-	}
-	s.id = id
-
-	return nil
-}
-
-// init initializes the store in a separate goroutine.
-// This occurs when the store first creates or joins a cluster.
-// The ready channel is closed once the store is initialized.
-func (s *Store) init() {
-	// Create a node for this store.
-	if err := s.createLocalNode(); err != nil {
-		s.err <- fmt.Errorf("create local node: %s", err)
-		return
-	}
-
-	// Notify the ready channel.
-	close(s.ready)
-}
-
-// createLocalNode creates the node for this local instance.
-// Writes the id of the node to file on success.
-func (s *Store) createLocalNode() error {
-	// Wait for leader.
-	if err := s.WaitForLeader(0); err != nil {
-		return fmt.Errorf("wait for leader: %s", err)
-	}
-
-	// Create new node.
-	ni, err := s.CreateNode(s.RemoteAddr.String())
-	if err != nil {
-		return fmt.Errorf("create node: %s", err)
-	}
-
-	// Write node id to file.
-	if err := s.writeNodeID(ni.ID); err != nil {
-		return fmt.Errorf("write file: %s", err)
-	}
-
-	// Set ID locally.
-	s.mu.Lock()
-	s.id = ni.ID
-	s.mu.Unlock()
-
-	s.Logger.Printf("Created local node: id=%d, host=%s", s.id, s.RemoteAddr)
-
-	return nil
-}
-
-func (s *Store) createRootDir() error {
-	return os.MkdirAll(s.path, 0777)
-}
-
-func (s *Store) writeNodeID(id uint64) error {
-	if err := s.createRootDir(); err != nil {
-		return err
-	}
-	return ioutil.WriteFile(s.IDPath(), []byte(strconv.FormatUint(id, 10)), 0666)
-}
-
-// Snapshot saves a snapshot of the current state.
-func (s *Store) Snapshot() error {
-	return s.raftState.snapshot()
-}
-
-// WaitForLeader sleeps until a leader is found or a timeout occurs.
-// timeout == 0 means to wait forever.
-func (s *Store) WaitForLeader(timeout time.Duration) error {
-	// Begin timeout timer.
-	timer := time.NewTimer(timeout)
-	defer timer.Stop()
-
-	// Continually check for leader until timeout.
-	ticker := time.NewTicker(100 * time.Millisecond)
-	defer ticker.Stop()
-	for {
-		select {
-		case <-s.closing:
-			return errors.New("closing")
-		case <-timer.C:
-			if timeout != 0 {
-				return errors.New("timeout")
-			}
-		case <-ticker.C:
-			if s.Leader() != "" {
-				return nil
-			}
-		}
-	}
-}
-
-// Ready returns a channel that is closed once the store is initialized.
-func (s *Store) Ready() <-chan struct{} { return s.ready }
-
-// Err returns a channel for all out-of-band errors.
-func (s *Store) Err() <-chan error { return s.err }
-
-// IsLeader returns true if the store is currently the leader.
-func (s *Store) IsLeader() bool {
-	s.mu.RLock()
-	defer s.mu.RUnlock()
-	return s.raftState.isLeader()
-}
-
-// IsLocal returns true if the store is currently participating in local raft.
-func (s *Store) IsLocal() bool {
-	s.mu.RLock()
-	defer s.mu.RUnlock()
-	return s.raftState.isLocal()
-}
-
-// Leader returns what the store thinks is the current leader. An empty
-// string indicates no leader exists.
-func (s *Store) Leader() string {
-	s.mu.RLock()
-	defer s.mu.RUnlock()
-	if s.raftState == nil {
-		return ""
-	}
-	return s.raftState.leader()
-}
-
-// SetPeers sets a list of peers in the cluster.
-func (s *Store) SetPeers(addrs []string) error {
-	return s.raftState.setPeers(addrs)
-}
-
-// AddPeer adds addr to the list of peers in the cluster.
-func (s *Store) AddPeer(addr string) error {
-	return s.raftState.addPeer(addr)
-}
-
-// Peers returns the list of peers in the cluster.
-func (s *Store) Peers() ([]string, error) {
-	s.mu.RLock()
-	defer s.mu.RUnlock()
-	return s.raftState.peers()
-}
-
-// serveExecListener processes remote exec connections.
-// This function runs in a separate goroutine.
-func (s *Store) serveExecListener() {
-	defer s.wg.Done()
-
-	for {
-		// Accept next TCP connection.
-		var err error
-		conn, err := s.ExecListener.Accept()
-		if err != nil {
-			if strings.Contains(err.Error(), "connection closed") {
-				return
-			}
-			s.Logger.Printf("temporary accept error: %s", err)
-			continue
-		}
-
-		// Handle connection in a separate goroutine.
-		s.wg.Add(1)
-		go s.handleExecConn(conn)
-
-		select {
-		case <-s.closing:
-			return
-		default:
-		}
-	}
-}
-
-// handleExecConn reads a command from the connection and executes it.
-func (s *Store) handleExecConn(conn net.Conn) {
-	defer s.wg.Done()
-
-	// Nodes not part of the raft cluster may initiate remote exec commands
-	// but may not know who the current leader of the cluster.  If we are not
-	// the leader, proxy the request to the current leader.
-	if !s.IsLeader() {
-
-		if s.Leader() == s.RemoteAddr.String() {
-			s.Logger.Printf("No leader")
-			return
-		}
-
-		leaderConn, err := net.DialTimeout("tcp", s.Leader(), 10*time.Second)
-		if err != nil {
-			s.Logger.Printf("Dial leader: %v", err)
-			return
-		}
-		defer leaderConn.Close()
-		leaderConn.Write([]byte{MuxExecHeader})
-
-		if err := proxy(leaderConn.(*net.TCPConn), conn.(*net.TCPConn)); err != nil {
-			s.Logger.Printf("Leader proxy error: %v", err)
-		}
-		conn.Close()
-		return
-	}
-
-	// Read and execute command.
-	err := func() error {
-		// Read marker message.
-		b := make([]byte, 4)
-		if _, err := io.ReadFull(conn, b); err != nil {
-			return fmt.Errorf("read magic: %s", err)
-		} else if string(b) != ExecMagic {
-			return fmt.Errorf("invalid exec magic: %q", string(b))
-		}
-
-		// Read command size.
-		var sz uint64
-		if err := binary.Read(conn, binary.BigEndian, &sz); err != nil {
-			return fmt.Errorf("read size: %s", err)
-		}
-
-		// Read command.
-		buf := make([]byte, sz)
-		if _, err := io.ReadFull(conn, buf); err != nil {
-			return fmt.Errorf("read command: %s", err)
-		}
-
-		// Ensure command can be deserialized before applying.
-		if err := proto.Unmarshal(buf, &internal.Command{}); err != nil {
-			return fmt.Errorf("unable to unmarshal command: %s", err)
-		}
-
-		// Apply against the raft log.
-		if err := s.apply(buf); err != nil {
-			return err
-		}
-		return nil
-	}()
-
-	// Build response message.
-	var resp internal.Response
-	resp.OK = proto.Bool(err == nil)
-	resp.Index = proto.Uint64(s.raftState.lastIndex())
-	if err != nil {
-		resp.Error = proto.String(err.Error())
-	}
-
-	// Encode response back to connection.
-	if b, err := proto.Marshal(&resp); err != nil {
-		panic(err)
-	} else if err = binary.Write(conn, binary.BigEndian, uint64(len(b))); err != nil {
-		s.Logger.Printf("Unable to write exec response size: %s", err)
-	} else if _, err = conn.Write(b); err != nil {
-		s.Logger.Printf("Unable to write exec response: %s", err)
-	}
-	conn.Close()
-}
-
-// serveRPCListener processes remote exec connections.
-// This function runs in a separate goroutine.
-func (s *Store) serveRPCListener() {
-	defer s.wg.Done()
-
-	for {
-		// Accept next TCP connection.
-		conn, err := s.RPCListener.Accept()
-		if err != nil {
-			if strings.Contains(err.Error(), "connection closed") {
-				return
-			}
-
-			s.Logger.Printf("temporary accept error: %s", err)
-			continue
-		}
-
-		// Handle connection in a separate goroutine.
-		s.wg.Add(1)
-		go func() {
-			defer s.wg.Done()
-			s.rpc.handleRPCConn(conn)
-		}()
-
-		select {
-		case <-s.closing:
-			return
-		default:
-		}
-	}
-}
-
-// MarshalBinary encodes the store's data to a binary protobuf format.
-func (s *Store) MarshalBinary() ([]byte, error) {
-	s.mu.RLock()
-	defer s.mu.RUnlock()
-	return s.data.MarshalBinary()
-}
-
-// ClusterID returns the unique identifier for the cluster.
-// This is generated once a node has been created.
-func (s *Store) ClusterID() (id uint64, err error) {
-	err = s.read(func(data *Data) error {
-		id = data.ClusterID
-		return nil
-	})
-	return
-}
-
-// NodeID returns the identifier for the local node.
-// Panics if the node has not joined the cluster.
-func (s *Store) NodeID() uint64 { return s.id }
-
-// Node returns a node by id.
-func (s *Store) Node(id uint64) (ni *NodeInfo, err error) {
-	err = s.read(func(data *Data) error {
-		ni = data.Node(id)
-		if ni == nil {
-			return errInvalidate
-		}
-		return nil
-	})
-	return
-}
-
-// NodeByHost returns a node by hostname.
-func (s *Store) NodeByHost(host string) (ni *NodeInfo, err error) {
-	err = s.read(func(data *Data) error {
-		ni = data.NodeByHost(host)
-		if ni == nil {
-			return errInvalidate
-		}
-		return nil
-	})
-	return
-}
-
-// Nodes returns a list of all nodes.
-func (s *Store) Nodes() (a []NodeInfo, err error) {
-	err = s.read(func(data *Data) error {
-		a = data.Nodes
-		return nil
-	})
-	return
-}
-
-// CreateNode creates a new node in the store.
-func (s *Store) CreateNode(host string) (*NodeInfo, error) {
-	if err := s.exec(internal.Command_CreateNodeCommand, internal.E_CreateNodeCommand_Command,
-		&internal.CreateNodeCommand{
-			Host: proto.String(host),
-			Rand: proto.Uint64(uint64(rand.Int63())),
-		},
-	); err != nil {
-		return nil, err
-	}
-	return s.NodeByHost(host)
-}
-
-// UpdateNode updates an existing node in the store.
-func (s *Store) UpdateNode(id uint64, host string) (*NodeInfo, error) {
-	if err := s.exec(internal.Command_UpdateNodeCommand, internal.E_UpdateNodeCommand_Command,
-		&internal.UpdateNodeCommand{
-			ID:   proto.Uint64(id),
-			Host: proto.String(host),
-		},
-	); err != nil {
-		return nil, err
-	}
-	return s.NodeByHost(host)
-}
-
-// DeleteNode removes a node from the metastore by id.
-func (s *Store) DeleteNode(id uint64, force bool) error {
-	ni := s.data.Node(id)
-	if ni == nil {
-		return ErrNodeNotFound
-	}
-
-	err := s.exec(internal.Command_DeleteNodeCommand, internal.E_DeleteNodeCommand_Command,
-		&internal.DeleteNodeCommand{
-			ID:    proto.Uint64(id),
-			Force: proto.Bool(force),
-		},
-	)
-	if err != nil {
-		return err
-	}
-
-	// Need to send a second message to remove the peer
-	return s.exec(internal.Command_RemovePeerCommand, internal.E_RemovePeerCommand_Command,
-		&internal.RemovePeerCommand{
-			ID:   proto.Uint64(id),
-			Addr: proto.String(ni.Host),
-		},
-	)
-}
-
-// Database returns a database by name.
-func (s *Store) Database(name string) (di *DatabaseInfo, err error) {
-	err = s.read(func(data *Data) error {
-		di = data.Database(name)
-		if di == nil {
-			return errInvalidate
-		}
-		return nil
-	})
-	return
-}
-
-// Databases returns a list of all databases.
-func (s *Store) Databases() (dis []DatabaseInfo, err error) {
-	err = s.read(func(data *Data) error {
-		dis = data.Databases
-		return nil
-	})
-	return
-}
-
-// CreateDatabase creates a new database in the store.
-func (s *Store) CreateDatabase(name string) (*DatabaseInfo, error) {
-	if err := s.exec(internal.Command_CreateDatabaseCommand, internal.E_CreateDatabaseCommand_Command,
-		&internal.CreateDatabaseCommand{
-			Name: proto.String(name),
-		},
-	); err != nil {
-		return nil, err
-	}
-	s.Logger.Printf("database '%s' created", name)
-
-	if s.retentionAutoCreate {
-		// Read node count.
-		// Retention policies must be fully replicated.
-		var nodeN int
-		if err := s.read(func(data *Data) error {
-			nodeN = len(data.Nodes)
-			return nil
-		}); err != nil {
-			return nil, fmt.Errorf("read: %s", err)
-		}
-
-		if nodeN > MaxAutoCreatedRetentionPolicyReplicaN {
-			nodeN = MaxAutoCreatedRetentionPolicyReplicaN
-		}
-
-		// Create a retention policy.
-		rpi := NewRetentionPolicyInfo(AutoCreateRetentionPolicyName)
-		rpi.ReplicaN = nodeN
-		rpi.Duration = AutoCreateRetentionPolicyPeriod
-		if _, err := s.CreateRetentionPolicy(name, rpi); err != nil {
-			return nil, err
-		}
-
-		// Set it as the default retention policy.
-		if err := s.SetDefaultRetentionPolicy(name, AutoCreateRetentionPolicyName); err != nil {
-			return nil, err
-		}
-	}
-
-	return s.Database(name)
-}
-
-// CreateDatabaseIfNotExists creates a new database in the store if it doesn't already exist.
-func (s *Store) CreateDatabaseIfNotExists(name string) (*DatabaseInfo, error) {
-	// Try to find database locally first.
-	if di, err := s.Database(name); err != nil {
-		return nil, err
-	} else if di != nil {
-		return di, nil
-	}
-
-	// Attempt to create database.
-	di, err := s.CreateDatabase(name)
-	if err == ErrDatabaseExists {
-		return s.Database(name)
-	}
-	return di, err
-}
-
-// DropDatabase removes a database from the metastore by name.
-func (s *Store) DropDatabase(name string) error {
-	return s.exec(internal.Command_DropDatabaseCommand, internal.E_DropDatabaseCommand_Command,
-		&internal.DropDatabaseCommand{
-			Name: proto.String(name),
-		},
-	)
-}
-
-// RetentionPolicy returns a retention policy for a database by name.
-func (s *Store) RetentionPolicy(database, name string) (rpi *RetentionPolicyInfo, err error) {
-	err = s.read(func(data *Data) error {
-		rpi, err = data.RetentionPolicy(database, name)
-		if err != nil {
-			return err
-		} else if rpi == nil {
-			return errInvalidate
-		}
-		return nil
-	})
-	return
-}
-
-// DefaultRetentionPolicy returns the default retention policy for a database.
-func (s *Store) DefaultRetentionPolicy(database string) (rpi *RetentionPolicyInfo, err error) {
-	err = s.read(func(data *Data) error {
-		di := data.Database(database)
-		if di == nil {
-			return ErrDatabaseNotFound
-		}
-
-		for i := range di.RetentionPolicies {
-			if di.RetentionPolicies[i].Name == di.DefaultRetentionPolicy {
-				rpi = &di.RetentionPolicies[i]
-				return nil
-			}
-		}
-		return errInvalidate
-	})
-	return
-}
-
-// RetentionPolicies returns a list of all retention policies for a database.
-func (s *Store) RetentionPolicies(database string) (a []RetentionPolicyInfo, err error) {
-	err = s.read(func(data *Data) error {
-		di := data.Database(database)
-		if di != nil {
-			return ErrDatabaseNotFound
-		}
-		a = di.RetentionPolicies
-		return nil
-	})
-	return
-}
-
-// CreateRetentionPolicy creates a new retention policy for a database.
-func (s *Store) CreateRetentionPolicy(database string, rpi *RetentionPolicyInfo) (*RetentionPolicyInfo, error) {
-	if rpi.Duration < MinRetentionPolicyDuration && rpi.Duration != 0 {
-		return nil, ErrRetentionPolicyDurationTooLow
-	}
-	if err := s.exec(internal.Command_CreateRetentionPolicyCommand, internal.E_CreateRetentionPolicyCommand_Command,
-		&internal.CreateRetentionPolicyCommand{
-			Database:        proto.String(database),
-			RetentionPolicy: rpi.marshal(),
-		},
-	); err != nil {
-		return nil, err
-	}
-
-	s.Logger.Printf("retention policy '%s' for database '%s' created", rpi.Name, database)
-	return s.RetentionPolicy(database, rpi.Name)
-}
-
-// CreateRetentionPolicyIfNotExists creates a new policy in the store if it doesn't already exist.
-func (s *Store) CreateRetentionPolicyIfNotExists(database string, rpi *RetentionPolicyInfo) (*RetentionPolicyInfo, error) {
-	// Try to find policy locally first.
-	if rpi, err := s.RetentionPolicy(database, rpi.Name); err != nil {
-		return nil, err
-	} else if rpi != nil {
-		return rpi, nil
-	}
-
-	// Attempt to create policy.
-	other, err := s.CreateRetentionPolicy(database, rpi)
-	if err == ErrRetentionPolicyExists {
-		return s.RetentionPolicy(database, rpi.Name)
-	}
-	return other, err
-}
-
-// SetDefaultRetentionPolicy sets the default retention policy for a database.
-func (s *Store) SetDefaultRetentionPolicy(database, name string) error {
-	return s.exec(internal.Command_SetDefaultRetentionPolicyCommand, internal.E_SetDefaultRetentionPolicyCommand_Command,
-		&internal.SetDefaultRetentionPolicyCommand{
-			Database: proto.String(database),
-			Name:     proto.String(name),
-		},
-	)
-}
-
-// UpdateRetentionPolicy updates an existing retention policy.
-func (s *Store) UpdateRetentionPolicy(database, name string, rpu *RetentionPolicyUpdate) error {
-	var newName *string
-	if rpu.Name != nil {
-		newName = rpu.Name
-	}
-
-	var duration *int64
-	if rpu.Duration != nil {
-		value := int64(*rpu.Duration)
-		duration = &value
-	}
-
-	var replicaN *uint32
-	if rpu.ReplicaN != nil {
-		value := uint32(*rpu.ReplicaN)
-		replicaN = &value
-	}
-
-	return s.exec(internal.Command_UpdateRetentionPolicyCommand, internal.E_UpdateRetentionPolicyCommand_Command,
-		&internal.UpdateRetentionPolicyCommand{
-			Database: proto.String(database),
-			Name:     proto.String(name),
-			NewName:  newName,
-			Duration: duration,
-			ReplicaN: replicaN,
-		},
-	)
-}
-
-// DropRetentionPolicy removes a policy from a database by name.
-func (s *Store) DropRetentionPolicy(database, name string) error {
-	return s.exec(internal.Command_DropRetentionPolicyCommand, internal.E_DropRetentionPolicyCommand_Command,
-		&internal.DropRetentionPolicyCommand{
-			Database: proto.String(database),
-			Name:     proto.String(name),
-		},
-	)
-}
-
-// CreateShardGroup creates a new shard group in a retention policy for a given time.
-func (s *Store) CreateShardGroup(database, policy string, timestamp time.Time) (*ShardGroupInfo, error) {
-	if err := s.exec(internal.Command_CreateShardGroupCommand, internal.E_CreateShardGroupCommand_Command,
-		&internal.CreateShardGroupCommand{
-			Database:  proto.String(database),
-			Policy:    proto.String(policy),
-			Timestamp: proto.Int64(timestamp.UnixNano()),
-		},
-	); err != nil {
-		return nil, err
-	}
-
-	return s.ShardGroupByTimestamp(database, policy, timestamp)
-}
-
-// CreateShardGroupIfNotExists creates a new shard group if one doesn't already exist.
-func (s *Store) CreateShardGroupIfNotExists(database, policy string, timestamp time.Time) (*ShardGroupInfo, error) {
-	// Try to find shard group locally first.
-	if sgi, err := s.ShardGroupByTimestamp(database, policy, timestamp); err != nil {
-		return nil, err
-	} else if sgi != nil && !sgi.Deleted() {
-		return sgi, nil
-	}
-
-	// Attempt to create database.
-	sgi, err := s.CreateShardGroup(database, policy, timestamp)
-	if err == ErrShardGroupExists {
-		return s.ShardGroupByTimestamp(database, policy, timestamp)
-	}
-	return sgi, err
-}
-
-// DeleteShardGroup removes an existing shard group from a policy by ID.
-func (s *Store) DeleteShardGroup(database, policy string, id uint64) error {
-	return s.exec(internal.Command_DeleteShardGroupCommand, internal.E_DeleteShardGroupCommand_Command,
-		&internal.DeleteShardGroupCommand{
-			Database:     proto.String(database),
-			Policy:       proto.String(policy),
-			ShardGroupID: proto.Uint64(id),
-		},
-	)
-}
-
-// ShardGroups returns a list of all shard groups for a policy by timestamp.
-func (s *Store) ShardGroups(database, policy string) (a []ShardGroupInfo, err error) {
-	err = s.read(func(data *Data) error {
-		a, err = data.ShardGroups(database, policy)
-		if err != nil {
-			return err
-		}
-		return nil
-	})
-	return
-}
-
-// ShardGroupsByTimeRange returns a slice of ShardGroups that may contain data for the given time range. ShardGroups
-// are sorted by start time.
-func (s *Store) ShardGroupsByTimeRange(database, policy string, tmin, tmax time.Time) (a []ShardGroupInfo, err error) {
-	err = s.read(func(data *Data) error {
-		a, err = data.ShardGroupsByTimeRange(database, policy, tmin, tmax)
-		if err != nil {
-			return err
-		} else if a == nil {
-			return errInvalidate
-		}
-		return nil
-	})
-	return
-}
-
-// VisitRetentionPolicies calls the given function with full retention policy details.
-func (s *Store) VisitRetentionPolicies(f func(d DatabaseInfo, r RetentionPolicyInfo)) {
-	s.read(func(data *Data) error {
-		for _, di := range data.Databases {
-			for _, rp := range di.RetentionPolicies {
-				f(di, rp)
-			}
-		}
-		return nil
-	})
-	return
-}
-
-// ShardGroupByTimestamp returns a shard group for a policy by timestamp.
-func (s *Store) ShardGroupByTimestamp(database, policy string, timestamp time.Time) (sgi *ShardGroupInfo, err error) {
-	err = s.read(func(data *Data) error {
-		sgi, err = data.ShardGroupByTimestamp(database, policy, timestamp)
-		if err != nil {
-			return err
-		} else if sgi == nil {
-			return errInvalidate
-		}
-		return nil
-	})
-	return
-}
-
-// ShardOwner looks up for a specific shard and return the shard group information
-// related with the shard.
-func (s *Store) ShardOwner(shardID uint64) (database, policy string, sgi *ShardGroupInfo) {
-	s.read(func(data *Data) error {
-		for _, dbi := range data.Databases {
-			for _, rpi := range dbi.RetentionPolicies {
-				for _, g := range rpi.ShardGroups {
-					if g.Deleted() {
-						continue
-					}
-
-					for _, sh := range g.Shards {
-						if sh.ID == shardID {
-							database = dbi.Name
-							policy = rpi.Name
-							sgi = &g
-							return nil
-						}
-					}
-				}
-			}
-		}
-		return errInvalidate
-	})
-	return
-}
-
-// CreateContinuousQuery creates a new continuous query on the store.
-func (s *Store) CreateContinuousQuery(database, name, query string) error {
-	return s.exec(internal.Command_CreateContinuousQueryCommand, internal.E_CreateContinuousQueryCommand_Command,
-		&internal.CreateContinuousQueryCommand{
-			Database: proto.String(database),
-			Name:     proto.String(name),
-			Query:    proto.String(query),
-		},
-	)
-}
-
-// DropContinuousQuery removes a continuous query from the store.
-func (s *Store) DropContinuousQuery(database, name string) error {
-	return s.exec(internal.Command_DropContinuousQueryCommand, internal.E_DropContinuousQueryCommand_Command,
-		&internal.DropContinuousQueryCommand{
-			Database: proto.String(database),
-			Name:     proto.String(name),
-		},
-	)
-}
-
-// CreateSubscription creates a new subscription on the store.
-func (s *Store) CreateSubscription(database, rp, name, mode string, destinations []string) error {
-	return s.exec(internal.Command_CreateSubscriptionCommand, internal.E_CreateSubscriptionCommand_Command,
-		&internal.CreateSubscriptionCommand{
-			Database:        proto.String(database),
-			RetentionPolicy: proto.String(rp),
-			Name:            proto.String(name),
-			Mode:            proto.String(mode),
-			Destinations:    destinations,
-		},
-	)
-}
-
-// DropSubscription removes a subscription from the store.
-func (s *Store) DropSubscription(database, rp, name string) error {
-	return s.exec(internal.Command_DropSubscriptionCommand, internal.E_DropSubscriptionCommand_Command,
-		&internal.DropSubscriptionCommand{
-			Database:        proto.String(database),
-			RetentionPolicy: proto.String(rp),
-			Name:            proto.String(name),
-		},
-	)
-}
-
-// User returns a user by name.
-func (s *Store) User(name string) (ui *UserInfo, err error) {
-	err = s.read(func(data *Data) error {
-		ui = data.User(name)
-		if ui == nil {
-			return errInvalidate
-		}
-		return nil
-	})
-	return
-}
-
-// Users returns a list of all users.
-func (s *Store) Users() (a []UserInfo, err error) {
-	err = s.read(func(data *Data) error {
-		a = data.Users
-		return nil
-	})
-	return
-}
-
-// AdminUserExists returns true if an admin user exists on the system.
-func (s *Store) AdminUserExists() (exists bool, err error) {
-	err = s.read(func(data *Data) error {
-		for i := range data.Users {
-			if data.Users[i].Admin {
-				exists = true
-				break
-			}
-		}
-		return nil
-	})
-	return
-}
-
-// ErrAuthenticate is returned when authentication fails.
-var ErrAuthenticate = errors.New("authentication failed")
-
-// Authenticate retrieves a user with a matching username and password.
-func (s *Store) Authenticate(username, password string) (ui *UserInfo, err error) {
-	err = s.read(func(data *Data) error {
-		s.mu.Lock()
-		defer s.mu.Unlock()
-
-		// Find user.
-		u := data.User(username)
-		if u == nil {
-			return ErrUserNotFound
-		}
-
-		// Check the local auth cache first.
-		if au, ok := s.authCache[username]; ok {
-			// verify the password using the cached salt and hash
-			hashed, err := s.hashWithSalt(au.salt, password)
-			if err != nil {
-				return err
-			}
-
-			if bytes.Equal(hashed, au.hash) {
-				ui = u
-				return nil
-			}
-			return ErrAuthenticate
-		}
-
-		// Compare password with user hash.
-		if err := bcrypt.CompareHashAndPassword([]byte(u.Hash), []byte(password)); err != nil {
-			return ErrAuthenticate
-		}
-
-		// generate a salt and hash of the password for the cache
-		salt, hashed, err := s.saltedHash(password)
-		if err != nil {
-			return err
-		}
-		s.authCache[username] = authUser{salt: salt, hash: hashed}
-
-		ui = u
-		return nil
-	})
-	return
-}
-
-// hashWithSalt returns a salted hash of password using salt
-func (s *Store) hashWithSalt(salt []byte, password string) ([]byte, error) {
-	hasher := sha256.New()
-	hasher.Write(append(salt, []byte(password)...))
-	return hasher.Sum(nil), nil
-}
-
-// saltedHash returns a salt and salted hash of password
-func (s *Store) saltedHash(password string) (salt, hash []byte, err error) {
-	salt = make([]byte, SaltBytes)
-	_, err = io.ReadFull(crand.Reader, salt)
-	if err != nil {
-		return
-	}
-
-	hash, err = s.hashWithSalt(salt, password)
-	return
-}
-
-// CreateUser creates a new user in the store.
-func (s *Store) CreateUser(name, password string, admin bool) (*UserInfo, error) {
-	// Hash the password before serializing it.
-	hash, err := s.hashPassword(password)
-	if err != nil {
-		return nil, err
-	}
-
-	// Serialize command and send it to the leader.
-	if err := s.exec(internal.Command_CreateUserCommand, internal.E_CreateUserCommand_Command,
-		&internal.CreateUserCommand{
-			Name:  proto.String(name),
-			Hash:  proto.String(string(hash)),
-			Admin: proto.Bool(admin),
-		},
-	); err != nil {
-		return nil, err
-	}
-	return s.User(name)
-}
-
-// DropUser removes a user from the metastore by name.
-func (s *Store) DropUser(name string) error {
-	return s.exec(internal.Command_DropUserCommand, internal.E_DropUserCommand_Command,
-		&internal.DropUserCommand{
-			Name: proto.String(name),
-		},
-	)
-}
-
-// UpdateUser updates an existing user in the store.
-func (s *Store) UpdateUser(name, password string) error {
-	// Hash the password before serializing it.
-	hash, err := s.hashPassword(password)
-	if err != nil {
-		return err
-	}
-
-	// Serialize command and send it to the leader.
-	return s.exec(internal.Command_UpdateUserCommand, internal.E_UpdateUserCommand_Command,
-		&internal.UpdateUserCommand{
-			Name: proto.String(name),
-			Hash: proto.String(string(hash)),
-		},
-	)
-}
-
-// SetPrivilege sets a privilege for a user on a database.
-func (s *Store) SetPrivilege(username, database string, p influxql.Privilege) error {
-	return s.exec(internal.Command_SetPrivilegeCommand, internal.E_SetPrivilegeCommand_Command,
-		&internal.SetPrivilegeCommand{
-			Username:  proto.String(username),
-			Database:  proto.String(database),
-			Privilege: proto.Int32(int32(p)),
-		},
-	)
-}
-
-// SetAdminPrivilege sets the admin privilege for a user on a database.
-func (s *Store) SetAdminPrivilege(username string, admin bool) error {
-	return s.exec(internal.Command_SetAdminPrivilegeCommand, internal.E_SetAdminPrivilegeCommand_Command,
-		&internal.SetAdminPrivilegeCommand{
-			Username: proto.String(username),
-			Admin:    proto.Bool(admin),
-		},
-	)
-}
-
-// UserPrivileges returns a list of all databases.
-func (s *Store) UserPrivileges(username string) (p map[string]influxql.Privilege, err error) {
-	err = s.read(func(data *Data) error {
-		p, err = data.UserPrivileges(username)
-		return err
-	})
-	return
-}
-
-// UserPrivilege returns the privilege for a database.
-func (s *Store) UserPrivilege(username, database string) (p *influxql.Privilege, err error) {
-	err = s.read(func(data *Data) error {
-		p, err = data.UserPrivilege(username, database)
-		return err
-	})
-	return
-}
-
-// UserCount returns the number of users defined in the cluster.
-func (s *Store) UserCount() (count int, err error) {
-	err = s.read(func(data *Data) error {
-		count = len(data.Users)
-		return nil
-	})
-	return
-}
-
-// PrecreateShardGroups creates shard groups whose endtime is before the 'to' time passed in, but
-// is yet to expire before 'from'. This is to avoid the need for these shards to be created when data
-// for the corresponding time range arrives. Shard creation involves Raft consensus, and precreation
-// avoids taking the hit at write-time.
-func (s *Store) PrecreateShardGroups(from, to time.Time) error {
-	s.read(func(data *Data) error {
-		for _, di := range data.Databases {
-			for _, rp := range di.RetentionPolicies {
-				if len(rp.ShardGroups) == 0 {
-					// No data was ever written to this group, or all groups have been deleted.
-					continue
-				}
-				g := rp.ShardGroups[len(rp.ShardGroups)-1] // Get the last group in time.
-				if !g.Deleted() && g.EndTime.Before(to) && g.EndTime.After(from) {
-					// Group is not deleted, will end before the future time, but is still yet to expire.
-					// This last check is important, so the system doesn't create shards groups wholly
-					// in the past.
-
-					// Create successive shard group.
-					nextShardGroupTime := g.EndTime.Add(1 * time.Nanosecond)
-					if newGroup, err := s.CreateShardGroupIfNotExists(di.Name, rp.Name, nextShardGroupTime); err != nil {
-						s.Logger.Printf("failed to precreate successive shard group for group %d: %s",
-							g.ID, err.Error())
-					} else {
-						s.Logger.Printf("new shard group %d successfully precreated for database %s, retention policy %s",
-							newGroup.ID, di.Name, rp.Name)
-					}
-				}
-			}
-		}
-		return nil
-	})
-	return nil
-}
-
-// SetData force overwrites the root data.
-// This should only be used when restoring a snapshot.
-func (s *Store) SetData(data *Data) error {
-	return s.exec(internal.Command_SetDataCommand, internal.E_SetDataCommand_Command,
-		&internal.SetDataCommand{
-			Data: data.marshal(),
-		},
-	)
-}
-
-// read executes a function with the current metadata.
-// If an error is returned then the cache is invalidated and retried.
-//
-// The error returned by the retry is passed through to the original caller
-// unless the error is errInvalidate. A nil error is passed through when
-// errInvalidate is returned.
-func (s *Store) read(fn func(*Data) error) error {
-	// First use the cached metadata.
-	s.mu.RLock()
-	data := s.data
-	s.mu.RUnlock()
-
-	// Execute fn against cached data.
-	// Return immediately if there was no error.
-	if err := fn(data); err == nil {
-		return nil
-	}
-
-	// If an error occurred then invalidate cache and retry.
-	if err := s.invalidate(); err != nil {
-		return err
-	}
-
-	// Re-read the metadata.
-	s.mu.RLock()
-	data = s.data
-	s.mu.RUnlock()
-
-	// Passthrough error unless it is a cache invalidation.
-	if err := fn(data); err != nil && err != errInvalidate {
-		return err
-	}
-
-	return nil
-}
-
-// errInvalidate is returned to read() when the cache should be invalidated
-// but an error should not be passed through to the caller.
-var errInvalidate = errors.New("invalidate cache")
-
-func (s *Store) invalidate() error {
-	return s.raftState.invalidate()
-}
-
-func (s *Store) exec(typ internal.Command_Type, desc *proto.ExtensionDesc, value interface{}) error {
-	// Create command.
-	cmd := &internal.Command{Type: &typ}
-	err := proto.SetExtension(cmd, desc, value)
-	assert(err == nil, "proto.SetExtension: %s", err)
-
-	// Marshal to a byte slice.
-	b, err := proto.Marshal(cmd)
-	assert(err == nil, "proto.Marshal: %s", err)
-
-	// Apply the command if this is the leader.
-	// Otherwise remotely execute the command against the current leader.
-	if s.raftState.isLeader() {
-		return s.apply(b)
-	}
-	return s.remoteExec(b)
-}
-
-// apply applies a serialized command to the raft log.
-func (s *Store) apply(b []byte) error {
-	return s.raftState.apply(b)
-}
-
-// remoteExec sends an encoded command to the remote leader.
-func (s *Store) remoteExec(b []byte) error {
-	// Retrieve the current known leader.
-	leader := s.raftState.leader()
-	if leader == "" {
-		return errors.New("no leader detected during remoteExec")
-	}
-
-	// Create a connection to the leader.
-	conn, err := net.DialTimeout("tcp", leader, 10*time.Second)
-	if err != nil {
-		return err
-	}
-	defer conn.Close()
-
-	// Write a marker byte for exec messages.
-	_, err = conn.Write([]byte{MuxExecHeader})
-	if err != nil {
-		return err
-	}
-
-	// Write a marker message.
-	_, err = conn.Write([]byte(ExecMagic))
-	if err != nil {
-		return err
-	}
-
-	// Write command size & bytes.
-	if err := binary.Write(conn, binary.BigEndian, uint64(len(b))); err != nil {
-		return fmt.Errorf("write command size: %s", err)
-	} else if _, err := conn.Write(b); err != nil {
-		return fmt.Errorf("write command: %s", err)
-	}
-
-	// Read response bytes.
-	var sz uint64
-	if err := binary.Read(conn, binary.BigEndian, &sz); err != nil {
-		return fmt.Errorf("read response size: %s", err)
-	}
-	buf := make([]byte, sz)
-	if _, err := io.ReadFull(conn, buf); err != nil {
-		return fmt.Errorf("read response: %s", err)
-	}
-
-	// Unmarshal response.
-	var resp internal.Response
-	if err := proto.Unmarshal(buf, &resp); err != nil {
-		return fmt.Errorf("unmarshal response: %s", err)
-	} else if !resp.GetOK() {
-		return lookupError(fmt.Errorf(resp.GetError()))
-	}
-
-	// Wait for local FSM to sync to index.
-	if err := s.sync(resp.GetIndex(), 5*time.Second); err != nil {
-		return fmt.Errorf("sync: %s", err)
-	}
-
-	return nil
-}
-
-// sync polls the state machine until it reaches a given index.
-func (s *Store) sync(index uint64, timeout time.Duration) error {
-	return s.raftState.sync(index, timeout)
-}
-
-func (s *Store) cachedData() *Data {
-	s.mu.RLock()
-	defer s.mu.RUnlock()
-	return s.data.Clone()
-}
-
-// BcryptCost is the cost associated with generating password with Bcrypt.
-// This setting is lowered during testing to improve test suite performance.
-var BcryptCost = 10
-
-// HashPasswordFn represnets a password hashing function.
-type HashPasswordFn func(password string) ([]byte, error)
-
-// GetHashPasswordFn returns the current password hashing function.
-func (s *Store) GetHashPasswordFn() HashPasswordFn {
-	s.mu.RLock()
-	defer s.mu.RUnlock()
-	return s.hashPassword
-}
-
-// SetHashPasswordFn sets the password hashing function.
-func (s *Store) SetHashPasswordFn(fn HashPasswordFn) {
-	s.mu.Lock()
-	defer s.mu.Unlock()
-	s.hashPassword = fn
-}
-
-// notifiyChanged will close a changed channel which brooadcasts to all waiting
-// goroutines that the meta store has been updated.  Callers are responsible for locking
-// the meta store before calling this.
-func (s *Store) notifyChanged() {
-	close(s.changed)
-	s.changed = make(chan struct{})
-}
-
-// storeFSM represents the finite state machine used by Store to interact with Raft.
-type storeFSM Store
-
-func (fsm *storeFSM) Apply(l *raft.Log) interface{} {
-	var cmd internal.Command
-	if err := proto.Unmarshal(l.Data, &cmd); err != nil {
-		panic(fmt.Errorf("cannot marshal command: %x", l.Data))
-	}
-
-	// Lock the store.
-	s := (*Store)(fsm)
-	s.mu.Lock()
-	defer s.mu.Unlock()
-
-	err := func() interface{} {
-		switch cmd.GetType() {
-		case internal.Command_RemovePeerCommand:
-			return fsm.applyRemovePeerCommand(&cmd)
-		case internal.Command_CreateNodeCommand:
-			return fsm.applyCreateNodeCommand(&cmd)
-		case internal.Command_DeleteNodeCommand:
-			return fsm.applyDeleteNodeCommand(&cmd)
-		case internal.Command_CreateDatabaseCommand:
-			return fsm.applyCreateDatabaseCommand(&cmd)
-		case internal.Command_DropDatabaseCommand:
-			return fsm.applyDropDatabaseCommand(&cmd)
-		case internal.Command_CreateRetentionPolicyCommand:
-			return fsm.applyCreateRetentionPolicyCommand(&cmd)
-		case internal.Command_DropRetentionPolicyCommand:
-			return fsm.applyDropRetentionPolicyCommand(&cmd)
-		case internal.Command_SetDefaultRetentionPolicyCommand:
-			return fsm.applySetDefaultRetentionPolicyCommand(&cmd)
-		case internal.Command_UpdateRetentionPolicyCommand:
-			return fsm.applyUpdateRetentionPolicyCommand(&cmd)
-		case internal.Command_CreateShardGroupCommand:
-			return fsm.applyCreateShardGroupCommand(&cmd)
-		case internal.Command_DeleteShardGroupCommand:
-			return fsm.applyDeleteShardGroupCommand(&cmd)
-		case internal.Command_CreateContinuousQueryCommand:
-			return fsm.applyCreateContinuousQueryCommand(&cmd)
-		case internal.Command_DropContinuousQueryCommand:
-			return fsm.applyDropContinuousQueryCommand(&cmd)
-		case internal.Command_CreateSubscriptionCommand:
-			return fsm.applyCreateSubscriptionCommand(&cmd)
-		case internal.Command_DropSubscriptionCommand:
-			return fsm.applyDropSubscriptionCommand(&cmd)
-		case internal.Command_CreateUserCommand:
-			return fsm.applyCreateUserCommand(&cmd)
-		case internal.Command_DropUserCommand:
-			return fsm.applyDropUserCommand(&cmd)
-		case internal.Command_UpdateUserCommand:
-			return fsm.applyUpdateUserCommand(&cmd)
-		case internal.Command_SetPrivilegeCommand:
-			return fsm.applySetPrivilegeCommand(&cmd)
-		case internal.Command_SetAdminPrivilegeCommand:
-			return fsm.applySetAdminPrivilegeCommand(&cmd)
-		case internal.Command_SetDataCommand:
-			return fsm.applySetDataCommand(&cmd)
-		case internal.Command_UpdateNodeCommand:
-			return fsm.applyUpdateNodeCommand(&cmd)
-		default:
-			panic(fmt.Errorf("cannot apply command: %x", l.Data))
-		}
-	}()
-
-	// Copy term and index to new metadata.
-	fsm.data.Term = l.Term
-	fsm.data.Index = l.Index
-	s.notifyChanged()
-
-	return err
-}
-
-func (fsm *storeFSM) applyRemovePeerCommand(cmd *internal.Command) interface{} {
-	ext, _ := proto.GetExtension(cmd, internal.E_RemovePeerCommand_Command)
-	v := ext.(*internal.RemovePeerCommand)
-
-	id := v.GetID()
-	addr := v.GetAddr()
-
-	// Only do this if you are the leader
-	if fsm.raftState.isLeader() {
-		//Remove that node from the peer
-		fsm.Logger.Printf("removing peer for node id %d, %s", id, addr)
-		if err := fsm.raftState.removePeer(addr); err != nil {
-			fsm.Logger.Printf("error removing peer: %s", err)
-		}
-	}
-
-	// If this is the node being shutdown, close raft
-	if fsm.id == id {
-		fsm.Logger.Printf("shutting down raft for %s", addr)
-		if err := fsm.raftState.close(); err != nil {
-			fsm.Logger.Printf("failed to shut down raft: %s", err)
-		}
-	}
-
-	return nil
-}
-
-func (fsm *storeFSM) applyCreateNodeCommand(cmd *internal.Command) interface{} {
-	ext, _ := proto.GetExtension(cmd, internal.E_CreateNodeCommand_Command)
-	v := ext.(*internal.CreateNodeCommand)
-
-	// Copy data and update.
-	other := fsm.data.Clone()
-	if err := other.CreateNode(v.GetHost()); err != nil {
-		return err
-	}
-
-	// If the cluster ID hasn't been set then use the command's random number.
-	if other.ClusterID == 0 {
-		other.ClusterID = uint64(v.GetRand())
-	}
-
-	fsm.data = other
-	return nil
-}
-
-func (fsm *storeFSM) applyUpdateNodeCommand(cmd *internal.Command) interface{} {
-	ext, _ := proto.GetExtension(cmd, internal.E_UpdateNodeCommand_Command)
-	v := ext.(*internal.UpdateNodeCommand)
-
-	// Copy data and update.
-	other := fsm.data.Clone()
-	ni := other.Node(v.GetID())
-	if ni == nil {
-		return ErrNodeNotFound
-	}
-
-	ni.Host = v.GetHost()
-
-	fsm.data = other
-	return nil
-}
-
-func (fsm *storeFSM) applyDeleteNodeCommand(cmd *internal.Command) interface{} {
-	ext, _ := proto.GetExtension(cmd, internal.E_DeleteNodeCommand_Command)
-	v := ext.(*internal.DeleteNodeCommand)
-
-	// Copy data and update.
-	other := fsm.data.Clone()
-	if err := other.DeleteNode(v.GetID(), v.GetForce()); err != nil {
-		return err
-	}
-	fsm.data = other
-
-	id := v.GetID()
-	fsm.Logger.Printf("node '%d' removed", id)
-
-	return nil
-}
-
-func (fsm *storeFSM) applyCreateDatabaseCommand(cmd *internal.Command) interface{} {
-	ext, _ := proto.GetExtension(cmd, internal.E_CreateDatabaseCommand_Command)
-	v := ext.(*internal.CreateDatabaseCommand)
-
-	// Copy data and update.
-	other := fsm.data.Clone()
-	if err := other.CreateDatabase(v.GetName()); err != nil {
-		return err
-	}
-	fsm.data = other
-
-	return nil
-}
-
-func (fsm *storeFSM) applyDropDatabaseCommand(cmd *internal.Command) interface{} {
-	ext, _ := proto.GetExtension(cmd, internal.E_DropDatabaseCommand_Command)
-	v := ext.(*internal.DropDatabaseCommand)
-
-	// Copy data and update.
-	other := fsm.data.Clone()
-	if err := other.DropDatabase(v.GetName()); err != nil {
-		return err
-	}
-	fsm.data = other
-
-	return nil
-}
-
-func (fsm *storeFSM) applyCreateRetentionPolicyCommand(cmd *internal.Command) interface{} {
-	ext, _ := proto.GetExtension(cmd, internal.E_CreateRetentionPolicyCommand_Command)
-	v := ext.(*internal.CreateRetentionPolicyCommand)
-	pb := v.GetRetentionPolicy()
-
-	// Copy data and update.
-	other := fsm.data.Clone()
-	if err := other.CreateRetentionPolicy(v.GetDatabase(),
-		&RetentionPolicyInfo{
-			Name:               pb.GetName(),
-			ReplicaN:           int(pb.GetReplicaN()),
-			Duration:           time.Duration(pb.GetDuration()),
-			ShardGroupDuration: time.Duration(pb.GetShardGroupDuration()),
-		}); err != nil {
-		return err
-	}
-	fsm.data = other
-
-	return nil
-}
-
-func (fsm *storeFSM) applyDropRetentionPolicyCommand(cmd *internal.Command) interface{} {
-	ext, _ := proto.GetExtension(cmd, internal.E_DropRetentionPolicyCommand_Command)
-	v := ext.(*internal.DropRetentionPolicyCommand)
-
-	// Copy data and update.
-	other := fsm.data.Clone()
-	if err := other.DropRetentionPolicy(v.GetDatabase(), v.GetName()); err != nil {
-		return err
-	}
-	fsm.data = other
-
-	return nil
-}
-
-func (fsm *storeFSM) applySetDefaultRetentionPolicyCommand(cmd *internal.Command) interface{} {
-	ext, _ := proto.GetExtension(cmd, internal.E_SetDefaultRetentionPolicyCommand_Command)
-	v := ext.(*internal.SetDefaultRetentionPolicyCommand)
-
-	// Copy data and update.
-	other := fsm.data.Clone()
-	if err := other.SetDefaultRetentionPolicy(v.GetDatabase(), v.GetName()); err != nil {
-		return err
-	}
-	fsm.data = other
-
-	return nil
-}
-
-func (fsm *storeFSM) applyUpdateRetentionPolicyCommand(cmd *internal.Command) interface{} {
-	ext, _ := proto.GetExtension(cmd, internal.E_UpdateRetentionPolicyCommand_Command)
-	v := ext.(*internal.UpdateRetentionPolicyCommand)
-
-	// Create update object.
-	rpu := RetentionPolicyUpdate{Name: v.NewName}
-	if v.Duration != nil {
-		value := time.Duration(v.GetDuration())
-		rpu.Duration = &value
-	}
-	if v.ReplicaN != nil {
-		value := int(v.GetReplicaN())
-		rpu.ReplicaN = &value
-	}
-
-	// Copy data and update.
-	other := fsm.data.Clone()
-	if err := other.UpdateRetentionPolicy(v.GetDatabase(), v.GetName(), &rpu); err != nil {
-		return err
-	}
-	fsm.data = other
-
-	return nil
-}
-
-func (fsm *storeFSM) applyCreateShardGroupCommand(cmd *internal.Command) interface{} {
-	ext, _ := proto.GetExtension(cmd, internal.E_CreateShardGroupCommand_Command)
-	v := ext.(*internal.CreateShardGroupCommand)
-
-	// Copy data and update.
-	other := fsm.data.Clone()
-	if err := other.CreateShardGroup(v.GetDatabase(), v.GetPolicy(), time.Unix(0, v.GetTimestamp())); err != nil {
-		return err
-	}
-	fsm.data = other
-
-	return nil
-}
-
-func (fsm *storeFSM) applyDeleteShardGroupCommand(cmd *internal.Command) interface{} {
-	ext, _ := proto.GetExtension(cmd, internal.E_DeleteShardGroupCommand_Command)
-	v := ext.(*internal.DeleteShardGroupCommand)
-
-	// Copy data and update.
-	other := fsm.data.Clone()
-	if err := other.DeleteShardGroup(v.GetDatabase(), v.GetPolicy(), v.GetShardGroupID()); err != nil {
-		return err
-	}
-	fsm.data = other
-
-	return nil
-}
-
-func (fsm *storeFSM) applyCreateContinuousQueryCommand(cmd *internal.Command) interface{} {
-	ext, _ := proto.GetExtension(cmd, internal.E_CreateContinuousQueryCommand_Command)
-	v := ext.(*internal.CreateContinuousQueryCommand)
-
-	// Copy data and update.
-	other := fsm.data.Clone()
-	if err := other.CreateContinuousQuery(v.GetDatabase(), v.GetName(), v.GetQuery()); err != nil {
-		return err
-	}
-	fsm.data = other
-
-	return nil
-}
-
-func (fsm *storeFSM) applyDropContinuousQueryCommand(cmd *internal.Command) interface{} {
-	ext, _ := proto.GetExtension(cmd, internal.E_DropContinuousQueryCommand_Command)
-	v := ext.(*internal.DropContinuousQueryCommand)
-
-	// Copy data and update.
-	other := fsm.data.Clone()
-	if err := other.DropContinuousQuery(v.GetDatabase(), v.GetName()); err != nil {
-		return err
-	}
-	fsm.data = other
-
-	return nil
-}
-
-func (fsm *storeFSM) applyCreateSubscriptionCommand(cmd *internal.Command) interface{} {
-	ext, _ := proto.GetExtension(cmd, internal.E_CreateSubscriptionCommand_Command)
-	v := ext.(*internal.CreateSubscriptionCommand)
-
-	// Copy data and update.
-	other := fsm.data.Clone()
-	if err := other.CreateSubscription(v.GetDatabase(), v.GetRetentionPolicy(), v.GetName(), v.GetMode(), v.GetDestinations()); err != nil {
-		return err
-	}
-	fsm.data = other
-
-	return nil
-}
-
-func (fsm *storeFSM) applyDropSubscriptionCommand(cmd *internal.Command) interface{} {
-	ext, _ := proto.GetExtension(cmd, internal.E_DropSubscriptionCommand_Command)
-	v := ext.(*internal.DropSubscriptionCommand)
-
-	// Copy data and update.
-	other := fsm.data.Clone()
-	if err := other.DropSubscription(v.GetDatabase(), v.GetRetentionPolicy(), v.GetName()); err != nil {
-		return err
-	}
-	fsm.data = other
-
-	return nil
-}
-
-func (fsm *storeFSM) applyCreateUserCommand(cmd *internal.Command) interface{} {
-	ext, _ := proto.GetExtension(cmd, internal.E_CreateUserCommand_Command)
-	v := ext.(*internal.CreateUserCommand)
-
-	// Copy data and update.
-	other := fsm.data.Clone()
-	if err := other.CreateUser(v.GetName(), v.GetHash(), v.GetAdmin()); err != nil {
-		return err
-	}
-	fsm.data = other
-
-	return nil
-}
-
-func (fsm *storeFSM) applyDropUserCommand(cmd *internal.Command) interface{} {
-	ext, _ := proto.GetExtension(cmd, internal.E_DropUserCommand_Command)
-	v := ext.(*internal.DropUserCommand)
-
-	// Copy data and update.
-	other := fsm.data.Clone()
-	if err := other.DropUser(v.GetName()); err != nil {
-		return err
-	}
-	fsm.data = other
-	delete(fsm.authCache, v.GetName())
-	return nil
-}
-
-func (fsm *storeFSM) applyUpdateUserCommand(cmd *internal.Command) interface{} {
-	ext, _ := proto.GetExtension(cmd, internal.E_UpdateUserCommand_Command)
-	v := ext.(*internal.UpdateUserCommand)
-
-	// Copy data and update.
-	other := fsm.data.Clone()
-	if err := other.UpdateUser(v.GetName(), v.GetHash()); err != nil {
-		return err
-	}
-	fsm.data = other
-	delete(fsm.authCache, v.GetName())
-	return nil
-}
-
-func (fsm *storeFSM) applySetPrivilegeCommand(cmd *internal.Command) interface{} {
-	ext, _ := proto.GetExtension(cmd, internal.E_SetPrivilegeCommand_Command)
-	v := ext.(*internal.SetPrivilegeCommand)
-
-	// Copy data and update.
-	other := fsm.data.Clone()
-	if err := other.SetPrivilege(v.GetUsername(), v.GetDatabase(), influxql.Privilege(v.GetPrivilege())); err != nil {
-		return err
-	}
-	fsm.data = other
-	return nil
-}
-
-func (fsm *storeFSM) applySetAdminPrivilegeCommand(cmd *internal.Command) interface{} {
-	ext, _ := proto.GetExtension(cmd, internal.E_SetAdminPrivilegeCommand_Command)
-	v := ext.(*internal.SetAdminPrivilegeCommand)
-
-	// Copy data and update.
-	other := fsm.data.Clone()
-	if err := other.SetAdminPrivilege(v.GetUsername(), v.GetAdmin()); err != nil {
-		return err
-	}
-	fsm.data = other
-	return nil
-}
-
-func (fsm *storeFSM) applySetDataCommand(cmd *internal.Command) interface{} {
-	ext, _ := proto.GetExtension(cmd, internal.E_SetDataCommand_Command)
-	v := ext.(*internal.SetDataCommand)
-
-	// Overwrite data.
-	fsm.data = &Data{}
-	fsm.data.unmarshal(v.GetData())
-
-	return nil
-}
-
-func (fsm *storeFSM) Snapshot() (raft.FSMSnapshot, error) {
-	s := (*Store)(fsm)
-	s.mu.Lock()
-	defer s.mu.Unlock()
-
-	return &storeFSMSnapshot{Data: (*Store)(fsm).data}, nil
-}
-
-func (fsm *storeFSM) Restore(r io.ReadCloser) error {
-	// Read all bytes.
-	b, err := ioutil.ReadAll(r)
-	if err != nil {
-		return err
-	}
-
-	// Decode metadata.
-	data := &Data{}
-	if err := data.UnmarshalBinary(b); err != nil {
-		return err
-	}
-
-	// Set metadata on store.
-	// NOTE: No lock because Hashicorp Raft doesn't call Restore concurrently
-	// with any other function.
-	fsm.data = data
-
-	return nil
-}
-
-type storeFSMSnapshot struct {
-	Data *Data
-}
-
-func (s *storeFSMSnapshot) Persist(sink raft.SnapshotSink) error {
-	err := func() error {
-		// Encode data.
-		p, err := s.Data.MarshalBinary()
-		if err != nil {
-			return err
-		}
-
-		// Write data to sink.
-		if _, err := sink.Write(p); err != nil {
-			return err
-		}
-
-		// Close the sink.
-		if err := sink.Close(); err != nil {
-			return err
-		}
-
-		return nil
-	}()
-
-	if err != nil {
-		sink.Cancel()
-		return err
-	}
-
-	return nil
-}
-
-// Release is invoked when we are finished with the snapshot
-func (s *storeFSMSnapshot) Release() {}
-
-// raftLayer wraps the connection so it can be re-used for forwarding.
-type raftLayer struct {
-	ln     net.Listener
-	addr   net.Addr
-	conn   chan net.Conn
-	closed chan struct{}
-}
-
-// newRaftLayer returns a new instance of raftLayer.
-func newRaftLayer(ln net.Listener, addr net.Addr) *raftLayer {
-	return &raftLayer{
-		ln:     ln,
-		addr:   addr,
-		conn:   make(chan net.Conn),
-		closed: make(chan struct{}),
-	}
-}
-
-// Addr returns the local address for the layer.
-func (l *raftLayer) Addr() net.Addr { return l.addr }
-
-// Dial creates a new network connection.
-func (l *raftLayer) Dial(addr string, timeout time.Duration) (net.Conn, error) {
-	conn, err := net.DialTimeout("tcp", addr, timeout)
-	if err != nil {
-		return nil, err
-	}
-
-	// Write a marker byte for raft messages.
-	_, err = conn.Write([]byte{MuxRaftHeader})
-	if err != nil {
-		conn.Close()
-		return nil, err
-	}
-	return conn, err
-}
-
-// Accept waits for the next connection.
-func (l *raftLayer) Accept() (net.Conn, error) { return l.ln.Accept() }
-
-// Close closes the layer.
-func (l *raftLayer) Close() error { return l.ln.Close() }
-
-// RetentionPolicyUpdate represents retention policy fields to be updated.
-type RetentionPolicyUpdate struct {
-	Name     *string
-	Duration *time.Duration
-	ReplicaN *int
-}
-
-// SetName sets the RetentionPolicyUpdate.Name
-func (rpu *RetentionPolicyUpdate) SetName(v string) { rpu.Name = &v }
-
-// SetDuration sets the RetentionPolicyUpdate.Duration
-func (rpu *RetentionPolicyUpdate) SetDuration(v time.Duration) { rpu.Duration = &v }
-
-// SetReplicaN sets the RetentionPolicyUpdate.ReplicaN
-func (rpu *RetentionPolicyUpdate) SetReplicaN(v int) { rpu.ReplicaN = &v }
-
-// assert will panic with a given formatted message if the given condition is false.
-func assert(condition bool, msg string, v ...interface{}) {
-	if !condition {
-		panic(fmt.Sprintf("assert failed: "+msg, v...))
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/meta/store_test.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/meta/store_test.go
deleted file mode 100644
index 7a56ec303..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/meta/store_test.go
+++ /dev/null
@@ -1,1406 +0,0 @@
-package meta_test
-
-import (
-	"bytes"
-	"fmt"
-	"io/ioutil"
-	"log"
-	"net"
-	"os"
-	"path/filepath"
-	"reflect"
-	"sort"
-	"strconv"
-	"sync"
-	"testing"
-	"time"
-
-	"github.com/influxdb/influxdb/meta"
-	"github.com/influxdb/influxdb/tcp"
-	"github.com/influxdb/influxdb/toml"
-	"golang.org/x/crypto/bcrypt"
-)
-
-// Ensure the store returns an error
-func TestStore_Open_ErrStoreOpen(t *testing.T) {
-	t.Parallel()
-	s := MustOpenStore()
-	defer s.Close()
-
-	if err := s.Store.Open(); err != meta.ErrStoreOpen {
-		t.Fatalf("unexpected error: %s", err)
-	}
-}
-
-// Ensure that opening a store with more than 3 peers returns an error.
-func TestStore_Open_ErrTooManyPeers(t *testing.T) {
-	t.Parallel()
-	config := NewConfig(MustTempFile())
-	config.Peers = []string{"localhost:9000", "localhost:9001", "localhost:9002", "localhost:9003"}
-	s := NewStore(config)
-	if err := s.Open(); err != meta.ErrTooManyPeers {
-		t.Fatalf("unexpected error: %s", err)
-	}
-}
-
-// Ensure the store can create a new node.
-func TestStore_CreateNode(t *testing.T) {
-	t.Parallel()
-	s := MustOpenStore()
-	defer s.Close()
-
-	// Create node.
-	if ni, err := s.CreateNode("host0"); err != nil {
-		t.Fatal(err)
-	} else if *ni != (meta.NodeInfo{ID: 2, Host: "host0"}) {
-		t.Fatalf("unexpected node: %#v", ni)
-	}
-
-	// Ensure cluster id is set.
-	clusterID, err := s.ClusterID()
-	if err != nil {
-		t.Fatal(err)
-	} else if clusterID == 0 {
-		t.Fatal("expected cluster id to be set")
-	}
-
-	// Create another node.
-	if ni, err := s.CreateNode("host1"); err != nil {
-		t.Fatal(err)
-	} else if *ni != (meta.NodeInfo{ID: 3, Host: "host1"}) {
-		t.Fatalf("unexpected node: %#v", ni)
-	}
-
-	// Ensure cluster id remains the same.
-	if id, err := s.ClusterID(); err != nil {
-		t.Fatal(err)
-	} else if id != clusterID {
-		t.Fatalf("cluster id changed: %d", id)
-	}
-}
-
-// Ensure that creating an existing node returns an error.
-func TestStore_CreateNode_ErrNodeExists(t *testing.T) {
-	t.Parallel()
-	s := MustOpenStore()
-	defer s.Close()
-
-	// Create node.
-	if _, err := s.CreateNode("host0"); err != nil {
-		t.Fatal(err)
-	}
-
-	// Create it again.
-	if _, err := s.CreateNode("host0"); err != meta.ErrNodeExists {
-		t.Fatalf("unexpected error: %s", err)
-	}
-}
-
-// Ensure the store can find a node by ID.
-func TestStore_Node(t *testing.T) {
-	t.Parallel()
-	s := MustOpenStore()
-	defer s.Close()
-
-	// Create nodes.
-	for i := 0; i < 3; i++ {
-		if _, err := s.CreateNode(fmt.Sprintf("host%d", i)); err != nil {
-			t.Fatal(err)
-		}
-	}
-
-	// Find second node.
-	if ni, err := s.Node(3); err != nil {
-		t.Fatal(err)
-	} else if *ni != (meta.NodeInfo{ID: 3, Host: "host1"}) {
-		t.Fatalf("unexpected node: %#v", ni)
-	}
-}
-
-// Ensure the store can find a node by host.
-func TestStore_NodeByHost(t *testing.T) {
-	t.Parallel()
-	s := MustOpenStore()
-	defer s.Close()
-
-	// Create nodes.
-	for i := 0; i < 3; i++ {
-		if _, err := s.CreateNode(fmt.Sprintf("host%d", i)); err != nil {
-			t.Fatal(err)
-		}
-	}
-
-	// Find second node.
-	if ni, err := s.NodeByHost("host1"); err != nil {
-		t.Fatal(err)
-	} else if *ni != (meta.NodeInfo{ID: 3, Host: "host1"}) {
-		t.Fatalf("unexpected node: %#v", ni)
-	}
-}
-
-// Ensure the store can delete an existing node.
-func TestStore_DeleteNode(t *testing.T) {
-	t.Parallel()
-	s := MustOpenStore()
-	defer s.Close()
-
-	// Create nodes.
-	for i := 0; i < 3; i++ {
-		if _, err := s.CreateNode(fmt.Sprintf("host%d", i)); err != nil {
-			t.Fatal(err)
-		}
-	}
-
-	// Remove second node.
-	if err := s.DeleteNode(3, false); err != nil {
-		t.Fatal(err)
-	}
-
-	// Ensure remaining nodes are correct.
-	if ni, _ := s.Node(2); *ni != (meta.NodeInfo{ID: 2, Host: "host0"}) {
-		t.Fatalf("unexpected node(1): %#v", ni)
-	}
-	if ni, _ := s.Node(3); ni != nil {
-		t.Fatalf("unexpected node(2): %#v", ni)
-	}
-	if ni, _ := s.Node(4); *ni != (meta.NodeInfo{ID: 4, Host: "host2"}) {
-		t.Fatalf("unexpected node(3): %#v", ni)
-	}
-}
-
-// Ensure the store returns an error when deleting a node that doesn't exist.
-func TestStore_DeleteNode_ErrNodeNotFound(t *testing.T) {
-	t.Parallel()
-	s := MustOpenStore()
-	defer s.Close()
-
-	if err := s.DeleteNode(2, false); err != meta.ErrNodeNotFound {
-		t.Fatalf("unexpected error: %s", err)
-	}
-}
-
-// Ensure the store can create a new database.
-func TestStore_CreateDatabase(t *testing.T) {
-	t.Parallel()
-	s := MustOpenStore()
-	defer s.Close()
-
-	// Create database.
-	if di, err := s.CreateDatabase("db0"); err != nil {
-		t.Fatal(err)
-	} else if !reflect.DeepEqual(di, &meta.DatabaseInfo{Name: "db0"}) {
-		t.Fatalf("unexpected database: %#v", di)
-	}
-
-	// Create another database.
-	if di, err := s.CreateDatabase("db1"); err != nil {
-		t.Fatal(err)
-	} else if !reflect.DeepEqual(di, &meta.DatabaseInfo{Name: "db1"}) {
-		t.Fatalf("unexpected database: %#v", di)
-	}
-}
-
-// Ensure the store can delete an existing database.
-func TestStore_DropDatabase(t *testing.T) {
-	t.Parallel()
-	s := MustOpenStore()
-	defer s.Close()
-
-	// Create databases.
-	for i := 0; i < 3; i++ {
-		if _, err := s.CreateDatabase(fmt.Sprintf("db%d", i)); err != nil {
-			t.Fatal(err)
-		}
-	}
-
-	// Remove a database.
-	if err := s.DropDatabase("db1"); err != nil {
-		t.Fatal(err)
-	}
-
-	// Ensure remaining nodes are correct.
-	exp := &meta.DatabaseInfo{Name: "db0"}
-	if di, _ := s.Database("db0"); !reflect.DeepEqual(di, exp) {
-		t.Fatalf("unexpected database(0): \ngot: %#v\nexp: %#v", di, exp)
-
-	}
-	if di, _ := s.Database("db1"); di != nil {
-		t.Fatalf("unexpected database(1): %#v", di)
-	}
-
-	exp = &meta.DatabaseInfo{Name: "db2"}
-	if di, _ := s.Database("db2"); !reflect.DeepEqual(di, exp) {
-		t.Fatalf("unexpected database(2): \ngot: %#v\nexp: %#v", di, exp)
-	}
-}
-
-// Ensure the store returns an error when dropping a database that doesn't exist.
-func TestStore_DropDatabase_ErrDatabaseNotFound(t *testing.T) {
-	t.Parallel()
-	s := MustOpenStore()
-	defer s.Close()
-
-	if err := s.DropDatabase("no_such_database"); err != meta.ErrDatabaseNotFound {
-		t.Fatalf("unexpected error: %s", err)
-	}
-}
-
-// Ensure the store can create a retention policy on a database.
-func TestStore_CreateRetentionPolicy(t *testing.T) {
-	t.Parallel()
-	s := MustOpenStore()
-	defer s.Close()
-
-	// Create an additional nodes and database.
-	if _, err := s.CreateNode("hostX"); err != nil {
-		t.Fatal(err)
-	} else if _, err := s.CreateDatabase("db0"); err != nil {
-		t.Fatal(err)
-	}
-
-	// Create policy on database.
-	if rpi, err := s.CreateRetentionPolicy("db0", &meta.RetentionPolicyInfo{
-		Name:     "rp0",
-		ReplicaN: 2,
-		Duration: 48 * time.Hour,
-	}); err != nil {
-		t.Fatal(err)
-	} else if !reflect.DeepEqual(rpi, &meta.RetentionPolicyInfo{
-		Name:               "rp0",
-		ReplicaN:           2,
-		Duration:           48 * time.Hour,
-		ShardGroupDuration: 24 * time.Hour,
-	}) {
-		t.Fatalf("unexpected policy: %#v", rpi)
-	}
-}
-
-// Ensure the store can create and get a retention policy on a database.
-func TestStore_CreateAndGetRetentionPolicy(t *testing.T) {
-	t.Parallel()
-	s := MustOpenStore()
-	defer s.Close()
-
-	// Create an additional nodes and database.
-	if _, err := s.CreateNode("hostX"); err != nil {
-		t.Fatal(err)
-	} else if _, err := s.CreateDatabase("db0"); err != nil {
-		t.Fatal(err)
-	}
-
-	// Create policy on database.
-	if _, err := s.CreateRetentionPolicy("db0", &meta.RetentionPolicyInfo{
-		Name:     "rp0",
-		ReplicaN: 2,
-		Duration: 48 * time.Hour,
-	}); err != nil {
-		t.Fatal(err)
-	}
-
-	// Get the policy on database.
-	if rpi, err := s.RetentionPolicy("db0", "rp0"); err != nil {
-		t.Fatal(err)
-	} else if !reflect.DeepEqual(rpi, &meta.RetentionPolicyInfo{
-		Name:               "rp0",
-		ReplicaN:           2,
-		Duration:           48 * time.Hour,
-		ShardGroupDuration: 24 * time.Hour,
-	}) {
-		t.Fatalf("unexpected policy: %#v", rpi)
-	}
-
-	// Get non-existent policies.
-	if _, err := s.RetentionPolicy("db0", "rp0"); err != nil {
-		t.Fatal(err)
-	}
-
-}
-
-// Ensure the store can delete a retention policy.
-func TestStore_DropRetentionPolicy(t *testing.T) {
-	t.Parallel()
-	s := MustOpenStore()
-	defer s.Close()
-
-	// Create database.
-	if _, err := s.CreateDatabase("db0"); err != nil {
-		t.Fatal(err)
-	}
-
-	// Create policies.
-	for i := 0; i < 3; i++ {
-		if _, err := s.CreateRetentionPolicy("db0", &meta.RetentionPolicyInfo{Name: fmt.Sprintf("rp%d", i), ReplicaN: 1}); err != nil {
-			t.Fatal(err)
-		}
-	}
-
-	// Remove a policy.
-	if err := s.DropRetentionPolicy("db0", "rp1"); err != nil {
-		t.Fatal(err)
-	}
-
-	// Ensure remaining policies are correct.
-	if rpi, _ := s.RetentionPolicy("db0", "rp0"); !reflect.DeepEqual(rpi, &meta.RetentionPolicyInfo{Name: "rp0", ReplicaN: 1, ShardGroupDuration: 7 * 24 * time.Hour}) {
-		t.Fatalf("unexpected policy(0): %#v", rpi)
-	}
-	if rpi, _ := s.RetentionPolicy("db0", "rp1"); rpi != nil {
-		t.Fatalf("unexpected policy(1): %#v", rpi)
-	}
-	exp := &meta.RetentionPolicyInfo{Name: "rp2", ReplicaN: 1, ShardGroupDuration: 7 * 24 * time.Hour}
-	if rpi, _ := s.RetentionPolicy("db0", "rp2"); !reflect.DeepEqual(rpi, exp) {
-		t.Fatalf("unexpected policy(2): \ngot: %#v\nexp: %#v", rpi, exp)
-	}
-}
-
-// Ensure the store can set the default retention policy on a database.
-func TestStore_SetDefaultRetentionPolicy(t *testing.T) {
-	t.Parallel()
-	s := MustOpenStore()
-	defer s.Close()
-
-	// Create database.
-	if _, err := s.CreateDatabase("db0"); err != nil {
-		t.Fatal(err)
-	} else if _, err := s.CreateRetentionPolicy("db0", &meta.RetentionPolicyInfo{Name: "rp0", ReplicaN: 1}); err != nil {
-		t.Fatal(err)
-	}
-
-	// Set default policy.
-	if err := s.SetDefaultRetentionPolicy("db0", "rp0"); err != nil {
-		t.Fatal(err)
-	}
-
-	// Ensure default policy is set.
-	if di, _ := s.Database("db0"); di.DefaultRetentionPolicy != "rp0" {
-		t.Fatalf("unexpected default retention policy: %s", di.DefaultRetentionPolicy)
-	}
-}
-
-// Ensure the store can update a retention policy.
-func TestStore_UpdateRetentionPolicy(t *testing.T) {
-	t.Parallel()
-	s := MustOpenStore()
-	defer s.Close()
-
-	// Create database.
-	if _, err := s.CreateDatabase("db0"); err != nil {
-		t.Fatal(err)
-	} else if _, err := s.CreateRetentionPolicy("db0", &meta.RetentionPolicyInfo{Name: "rp0", ReplicaN: 1}); err != nil {
-		t.Fatal(err)
-	}
-
-	// Update policy.
-	var rpu meta.RetentionPolicyUpdate
-	rpu.SetName("rp1")
-	rpu.SetDuration(10 * time.Hour)
-	if err := s.UpdateRetentionPolicy("db0", "rp0", &rpu); err != nil {
-		t.Fatal(err)
-	}
-
-	// Ensure policy is updated.
-	if rpi, err := s.RetentionPolicy("db0", "rp1"); err != nil {
-		t.Fatal(err)
-	} else if !reflect.DeepEqual(rpi, &meta.RetentionPolicyInfo{
-		Name:               "rp1",
-		Duration:           10 * time.Hour,
-		ShardGroupDuration: 1 * time.Hour,
-		ReplicaN:           1,
-	}) {
-		t.Fatalf("unexpected policy: %#v", rpi)
-	}
-}
-
-// Ensure the store can create a shard group on a retention policy.
-func TestStore_CreateShardGroup(t *testing.T) {
-	t.Parallel()
-	s := MustOpenStore()
-	defer s.Close()
-
-	// Create node & database.
-	if _, err := s.CreateNode("host0"); err != nil {
-		t.Fatal(err)
-	} else if _, err := s.CreateDatabase("db0"); err != nil {
-		t.Fatal(err)
-	} else if _, err = s.CreateRetentionPolicy("db0", &meta.RetentionPolicyInfo{Name: "rp0", ReplicaN: 2, Duration: 1 * time.Hour}); err != nil {
-		t.Fatal(err)
-	}
-
-	// Create policy on database.
-	if sgi, err := s.CreateShardGroup("db0", "rp0", time.Date(2000, time.January, 1, 0, 0, 0, 0, time.UTC)); err != nil {
-		t.Fatal(err)
-	} else if sgi.ID != 1 {
-		t.Fatalf("unexpected shard group: %#v", sgi)
-	}
-
-}
-
-func TestStore_ShardGroupsRetrieval(t *testing.T) {
-	t.Parallel()
-	s := MustOpenStore()
-	defer s.Close()
-
-	// Create resources for testing.
-	if _, err := s.CreateNode("host0"); err != nil {
-		t.Fatal(err)
-	} else if _, err := s.CreateDatabase("db0"); err != nil {
-		t.Fatal(err)
-	} else if _, err = s.CreateRetentionPolicy("db0", &meta.RetentionPolicyInfo{Name: "rp0", ReplicaN: 2, Duration: 1 * time.Hour}); err != nil {
-		t.Fatal(err)
-	}
-	if sgi, err := s.CreateShardGroup("db0", "rp0", time.Date(2000, time.January, 1, 0, 0, 0, 0, time.UTC)); err != nil {
-		t.Fatal(err)
-	} else if sgi.ID != 1 {
-		t.Fatalf("unexpected shard group: %#v", sgi)
-	}
-
-	// Function to compare actual and expected. Works on integers only, as results require sorting.
-	assertShardGroupsInTimeRange := func(database, policy string, actualGroups []meta.ShardGroupInfo, expectedGroupIDs []int) {
-		if len(actualGroups) != len(expectedGroupIDs) {
-			t.Fatalf(("number of actual groups (%d) does not equal number expected groups (%d)"), len(actualGroups), len(expectedGroupIDs))
-		}
-
-		actualGroupIDs := []int{}
-		for i := range actualGroups {
-			actualGroupIDs = append(actualGroupIDs, int(actualGroups[i].ID))
-		}
-
-		sort.Ints(actualGroupIDs)
-		sort.Ints(expectedGroupIDs)
-		for i := range actualGroupIDs {
-			if actualGroupIDs[i] != expectedGroupIDs[i] {
-				t.Fatalf("actual group IDs (%v) does not match expected group IDs (%v)", actualGroupIDs, expectedGroupIDs)
-			}
-		}
-	}
-
-	// Check that it is returned correctly when requested.
-	if sgs, err := s.ShardGroups("db0", "rp0"); err != nil {
-		t.Fatal(err)
-	} else {
-		assertShardGroupsInTimeRange("db0", "rp0", sgs, []int{1})
-	}
-
-	if sgs, err := s.ShardGroupsByTimeRange("db0", "rp0", time.Date(1999, time.January, 1, 0, 0, 0, 0, time.UTC), time.Date(1999, time.January, 2, 0, 0, 0, 0, time.UTC)); err != nil {
-		t.Fatal(err)
-	} else {
-		assertShardGroupsInTimeRange("db0", "rp0", sgs, []int{})
-	}
-	if sgs, err := s.ShardGroupsByTimeRange("db0", "rp0", time.Date(2000, time.January, 1, 0, 0, 0, 0, time.UTC), time.Date(2001, time.January, 1, 0, 0, 0, 0, time.UTC)); err != nil {
-		t.Fatal(err)
-	} else {
-		assertShardGroupsInTimeRange("db0", "rp0", sgs, []int{1})
-	}
-	if sgs, err := s.ShardGroupsByTimeRange("db0", "rp0", time.Date(1999, time.January, 1, 0, 0, 0, 0, time.UTC), time.Date(2001, time.January, 1, 0, 0, 0, 0, time.UTC)); err != nil {
-		t.Fatal(err)
-	} else {
-		assertShardGroupsInTimeRange("db0", "rp0", sgs, []int{1})
-	}
-	if sgs, err := s.ShardGroupsByTimeRange("db0", "rp0", time.Date(2002, time.January, 1, 0, 0, 0, 0, time.UTC), time.Date(2002, time.January, 2, 0, 0, 0, 0, time.UTC)); err != nil {
-		t.Fatal(err)
-	} else {
-		assertShardGroupsInTimeRange("db0", "rp0", sgs, []int{})
-	}
-}
-
-// Ensure the store can delete an existing shard group.
-func TestStore_DeleteShardGroup(t *testing.T) {
-	t.Parallel()
-	s := MustOpenStore()
-	defer s.Close()
-
-	// Create node, database, policy, & group.
-	if _, err := s.CreateNode("host0"); err != nil {
-		t.Fatal(err)
-	} else if _, err := s.CreateDatabase("db0"); err != nil {
-		t.Fatal(err)
-	} else if _, err = s.CreateRetentionPolicy("db0", &meta.RetentionPolicyInfo{Name: "rp0", ReplicaN: 2, Duration: 1 * time.Hour}); err != nil {
-		t.Fatal(err)
-	} else if _, err := s.CreateShardGroup("db0", "rp0", time.Date(2000, time.January, 1, 0, 0, 0, 0, time.UTC)); err != nil {
-		t.Fatal(err)
-	}
-
-	// Remove policy from database.
-	if err := s.DeleteShardGroup("db0", "rp0", 1); err != nil {
-		t.Fatal(err)
-	}
-}
-
-// Ensure the store correctly precreates shard groups.
-func TestStore_PrecreateShardGroup(t *testing.T) {
-	t.Parallel()
-	s := MustOpenStore()
-	defer s.Close()
-
-	// Create node, database, policy, & groups.
-	if _, err := s.CreateNode("host0"); err != nil {
-		t.Fatal(err)
-	} else if _, err := s.CreateDatabase("db0"); err != nil {
-		t.Fatal(err)
-	} else if _, err = s.CreateRetentionPolicy("db0", &meta.RetentionPolicyInfo{Name: "rp0", ReplicaN: 2, Duration: 1 * time.Hour}); err != nil {
-		t.Fatal(err)
-	} else if _, err = s.CreateRetentionPolicy("db0", &meta.RetentionPolicyInfo{Name: "rp1", ReplicaN: 2, Duration: 1 * time.Hour}); err != nil {
-		t.Fatal(err)
-	} else if _, err = s.CreateRetentionPolicy("db0", &meta.RetentionPolicyInfo{Name: "rp2", ReplicaN: 2, Duration: 1 * time.Hour}); err != nil {
-		t.Fatal(err)
-	} else if _, err := s.CreateShardGroup("db0", "rp0", time.Date(2001, time.January, 1, 1, 0, 0, 0, time.UTC)); err != nil {
-		t.Fatal(err)
-	} else if _, err := s.CreateShardGroup("db0", "rp1", time.Date(2000, time.January, 1, 1, 0, 0, 0, time.UTC)); err != nil {
-		t.Fatal(err)
-	}
-
-	if err := s.PrecreateShardGroups(time.Date(2001, time.January, 1, 0, 0, 0, 0, time.UTC), time.Date(2001, time.January, 1, 3, 0, 0, 0, time.UTC)); err != nil {
-		t.Fatal(err)
-	}
-
-	// rp0 should undergo precreation.
-	groups, err := s.ShardGroups("db0", "rp0")
-	if err != nil {
-		t.Fatal(err)
-	}
-	if len(groups) != 2 {
-		t.Fatalf("shard group precreation failed to create new shard group for rp0")
-	}
-	if groups[1].StartTime != time.Date(2001, time.January, 1, 2, 0, 0, 0, time.UTC) {
-		t.Fatalf("precreated shard group has wrong start time, exp %s, got %s",
-			time.Date(2000, time.January, 1, 1, 0, 0, 0, time.UTC), groups[1].StartTime)
-	}
-
-	// rp1 should not undergo precreation since it is completely in the past.
-	groups, err = s.ShardGroups("db0", "rp1")
-	if err != nil {
-		t.Fatal(err)
-	}
-	if len(groups) != 1 {
-		t.Fatalf("shard group precreation created new shard group for rp1")
-	}
-
-	// rp2 should not undergo precreation since it has no shards.
-	groups, err = s.ShardGroups("db0", "rp2")
-	if err != nil {
-		t.Fatal(err)
-	}
-	if len(groups) != 0 {
-		t.Fatalf("shard group precreation created new shard group for rp2")
-	}
-}
-
-// Ensure the store can create a new continuous query.
-func TestStore_CreateContinuousQuery(t *testing.T) {
-	t.Parallel()
-	s := MustOpenStore()
-	defer s.Close()
-
-	// Create query.
-	if _, err := s.CreateDatabase("db0"); err != nil {
-		t.Fatal(err)
-	} else if err := s.CreateContinuousQuery("db0", "cq0", "SELECT count() FROM foo"); err != nil {
-		t.Fatal(err)
-	}
-}
-
-// Ensure that creating an existing continuous query returns an error.
-func TestStore_CreateContinuousQuery_ErrContinuousQueryExists(t *testing.T) {
-	t.Parallel()
-	s := MustOpenStore()
-	defer s.Close()
-
-	// Create continuous query.
-	if _, err := s.CreateDatabase("db0"); err != nil {
-		t.Fatal(err)
-	} else if err := s.CreateContinuousQuery("db0", "cq0", "SELECT count() FROM foo"); err != nil {
-		t.Fatal(err)
-	}
-
-	// Create it again.
-	if err := s.CreateContinuousQuery("db0", "cq0", "SELECT count() FROM foo"); err != meta.ErrContinuousQueryExists {
-		t.Fatalf("unexpected error: %s", err)
-	}
-}
-
-// Ensure the store can delete a continuous query.
-func TestStore_DropContinuousQuery(t *testing.T) {
-	t.Parallel()
-	s := MustOpenStore()
-	defer s.Close()
-
-	// Create queries.
-	if _, err := s.CreateDatabase("db0"); err != nil {
-		t.Fatal(err)
-	} else if err := s.CreateContinuousQuery("db0", "cq0", "SELECT count() FROM foo"); err != nil {
-		t.Fatal(err)
-	} else if err = s.CreateContinuousQuery("db0", "cq1", "SELECT count() FROM bar"); err != nil {
-		t.Fatal(err)
-	} else if err = s.CreateContinuousQuery("db0", "cq2", "SELECT count() FROM baz"); err != nil {
-		t.Fatal(err)
-	}
-
-	// Remove one of the queries.
-	if err := s.DropContinuousQuery("db0", "cq1"); err != nil {
-		t.Fatal(err)
-	}
-
-	// Ensure the resulting queries are correct.
-	if di, err := s.Database("db0"); err != nil {
-		t.Fatal(err)
-	} else if !reflect.DeepEqual(di.ContinuousQueries, []meta.ContinuousQueryInfo{
-		{Name: "cq0", Query: "SELECT count() FROM foo"},
-		{Name: "cq2", Query: "SELECT count() FROM baz"},
-	}) {
-		t.Fatalf("unexpected queries: %#v", di.ContinuousQueries)
-	}
-}
-
-// Ensure the store can create a new subscription.
-func TestStore_CreateSubscription(t *testing.T) {
-	t.Parallel()
-	s := MustOpenStore()
-	defer s.Close()
-
-	// Create subscription.
-	rpi := &meta.RetentionPolicyInfo{
-		Name:     "rp0",
-		ReplicaN: 3,
-	}
-	if _, err := s.CreateDatabase("db0"); err != nil {
-		t.Fatal(err)
-	} else if _, err := s.CreateRetentionPolicy("db0", rpi); err != nil {
-		t.Fatal(err)
-	} else if err := s.CreateSubscription("db0", "rp0", "s0", "t0", []string{"h0", "h1"}); err != nil {
-		t.Fatal(err)
-	}
-}
-
-// Ensure that creating an existing subscription returns an error.
-func TestStore_CreateSubscription_ErrSubscriptionExists(t *testing.T) {
-	t.Parallel()
-	s := MustOpenStore()
-	defer s.Close()
-
-	// Create subscription.
-	rpi := &meta.RetentionPolicyInfo{
-		Name:     "rp0",
-		ReplicaN: 3,
-	}
-	if _, err := s.CreateDatabase("db0"); err != nil {
-		t.Fatal(err)
-	} else if _, err := s.CreateRetentionPolicy("db0", rpi); err != nil {
-		t.Fatal(err)
-	} else if err := s.CreateSubscription("db0", "rp0", "s0", "t0", []string{"h0", "h1"}); err != nil {
-		t.Fatal(err)
-	}
-
-	// Create it again.
-	if err := s.CreateSubscription("db0", "rp0", "s0", "t0", []string{"h0", "h1"}); err != meta.ErrSubscriptionExists {
-		t.Fatalf("unexpected error: %s", err)
-	}
-}
-
-// Ensure the store can delete a subscription.
-func TestStore_DropSubscription(t *testing.T) {
-	t.Parallel()
-	s := MustOpenStore()
-	defer s.Close()
-
-	// Create subscription.
-	rpi := &meta.RetentionPolicyInfo{
-		Name:     "rp0",
-		ReplicaN: 3,
-	}
-	if _, err := s.CreateDatabase("db0"); err != nil {
-		t.Fatal(err)
-	} else if _, err := s.CreateRetentionPolicy("db0", rpi); err != nil {
-		t.Fatal(err)
-	} else if err := s.CreateSubscription("db0", "rp0", "s0", "ANY", []string{"udp://h0:1234", "udp://h1:1234"}); err != nil {
-		t.Fatal(err)
-	} else if err := s.CreateSubscription("db0", "rp0", "s1", "ALL", []string{"udp://h0:1234", "udp://h1:1234"}); err != nil {
-		t.Fatal(err)
-	} else if err := s.CreateSubscription("db0", "rp0", "s2", "ANY", []string{"udp://h0:1234", "udp://h1:1234"}); err != nil {
-		t.Fatal(err)
-	}
-
-	// Remove one of the subscriptions.
-	if err := s.DropSubscription("db0", "rp0", "s0"); err != nil {
-		t.Fatal(err)
-	}
-
-	// Ensure the resulting subscriptions are correct.
-	if rpi, err := s.RetentionPolicy("db0", "rp0"); err != nil {
-		t.Fatal(err)
-	} else if !reflect.DeepEqual(rpi.Subscriptions, []meta.SubscriptionInfo{
-		{Name: "s1", Mode: "ALL", Destinations: []string{"udp://h0:1234", "udp://h1:1234"}},
-		{Name: "s2", Mode: "ANY", Destinations: []string{"udp://h0:1234", "udp://h1:1234"}},
-	}) {
-		t.Fatalf("unexpected subscriptions: %#v", rpi.Subscriptions)
-	}
-}
-
-// Ensure the store can create a user.
-func TestStore_CreateUser(t *testing.T) {
-	t.Parallel()
-	s := MustOpenStore()
-	defer s.Close()
-
-	// Create user.
-	if ui, err := s.CreateUser("susy", "pass", true); err != nil {
-		t.Fatal(err)
-	} else if ui.Name != "susy" || ui.Hash == "" || ui.Admin != true {
-		t.Fatalf("unexpected user: %#v", ui)
-	}
-}
-
-// Ensure the store can remove a user.
-func TestStore_DropUser(t *testing.T) {
-	t.Parallel()
-	s := MustOpenStore()
-	defer s.Close()
-
-	// Create users.
-	if _, err := s.CreateUser("susy", "pass", true); err != nil {
-		t.Fatal(err)
-	} else if _, err := s.CreateUser("bob", "pass", true); err != nil {
-		t.Fatal(err)
-	}
-
-	// Remove user.
-	if err := s.DropUser("bob"); err != nil {
-		t.Fatal(err)
-	}
-
-	// Verify user was removed.
-	if a, err := s.Users(); err != nil {
-		t.Fatal(err)
-	} else if len(a) != 1 {
-		t.Fatalf("unexpected user count: %d", len(a))
-	} else if a[0].Name != "susy" {
-		t.Fatalf("unexpected user: %s", a[0].Name)
-	}
-}
-
-// Ensure the store can update a user.
-func TestStore_UpdateUser(t *testing.T) {
-	t.Parallel()
-	s := MustOpenStore()
-	defer s.Close()
-
-	// Create users.
-	if _, err := s.CreateUser("susy", "pass", true); err != nil {
-		t.Fatal(err)
-	} else if _, err := s.CreateUser("bob", "pass", true); err != nil {
-		t.Fatal(err)
-	}
-
-	// Store password hash for bob.
-	ui, err := s.User("bob")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// Update user.
-	if err := s.UpdateUser("bob", "XXX"); err != nil {
-		t.Fatal(err)
-	}
-
-	// Verify password hash was updated.
-	if other, err := s.User("bob"); err != nil {
-		t.Fatal(err)
-	} else if ui.Hash == other.Hash {
-		t.Fatal("password hash did not change")
-	}
-}
-
-// Ensure Authentication works.
-func TestStore_Authentication(t *testing.T) {
-	t.Parallel()
-
-	if testing.Short() {
-		t.SkipNow()
-	}
-
-	s := MustOpenStore()
-	defer s.Close()
-
-	// Set the password hash function to the real thing for this test.
-	s.SetHashPasswordFn(func(password string) ([]byte, error) {
-		return bcrypt.GenerateFromPassword([]byte(password), 4)
-	})
-
-	// Create user.
-	s.CreateUser("susy", "pass", true)
-
-	// Authenticate user.
-	if ui, err := s.Authenticate("susy", "pass"); err != nil {
-		t.Fatal(err)
-	} else if ui.Name != "susy" {
-		t.Fatalf(`expected "susy", got "%s"`, ui.Name)
-	}
-
-	// Update user's password.
-	s.UpdateUser("susy", "pass2")
-
-	// Make sure authentication with old password does NOT work.
-	if _, err := s.Authenticate("susy", "pass"); err == nil {
-		t.Fatal("expected authentication error")
-	}
-
-	// Authenticate user with new password
-	if ui, err := s.Authenticate("susy", "pass2"); err != nil {
-		t.Fatal(err)
-	} else if ui.Name != "susy" {
-		t.Fatalf(`expected "susy", got "%s"`, ui.Name)
-	}
-
-	// Drop user.
-	s.DropUser("susy")
-
-	// Make sure authentication with both old passwords does NOT work.
-	if _, err := s.Authenticate("susy", "pass"); err == nil {
-		t.Fatal("expected authentication error")
-	} else if _, err := s.Authenticate("susy", "pass2"); err == nil {
-		t.Fatal("expected authentication error")
-	}
-}
-
-// Ensure the store can return the count of users in it.
-func TestStore_UserCount(t *testing.T) {
-	t.Parallel()
-	s := MustOpenStore()
-	defer s.Close()
-
-	if count, err := s.UserCount(); count != 0 && err != nil {
-		t.Fatalf("expected user count to be 0 but was %d", count)
-	}
-
-	// Create users.
-	if _, err := s.CreateUser("susy", "pass", true); err != nil {
-		t.Fatal(err)
-	} else if _, err := s.CreateUser("bob", "pass", true); err != nil {
-		t.Fatal(err)
-	}
-
-	if count, err := s.UserCount(); count != 2 && err != nil {
-		t.Fatalf("expected user count to be 2 but was %d", count)
-	}
-}
-
-// Ensure the store can take a snapshot.
-func TestStore_Snapshot_And_Restore(t *testing.T) {
-	t.Parallel()
-
-	s := MustOpenStore()
-	s.LeaveFiles = true
-	addr := s.RemoteAddr.String()
-
-	// Create a bunch of databases in the Store
-	nDatabases := 5
-	for n := 0; n < nDatabases; n++ {
-		s.CreateDatabase(fmt.Sprintf("db%d", n))
-	}
-
-	// Test taking a snapshot.
-	if err := s.Store.Snapshot(); err != nil {
-		t.Fatal(err)
-	}
-
-	s.Close()
-
-	// Allow the kernel to free up the port so we can re-use it again
-	time.Sleep(100 * time.Millisecond)
-
-	// Test restoring the snapshot taken above.
-	existingDataPath := s.Path()
-	s = MustOpenStoreWithPath(addr, existingDataPath)
-	defer s.Close()
-
-	// Wait until the server is ready.
-	select {
-	case err := <-s.Err():
-		panic(err)
-	case <-s.Ready():
-	}
-
-	// Make sure all the data we added to the Store is still there.
-	for n := 0; n < nDatabases; n++ {
-		name := fmt.Sprintf("db%d", n)
-		if dbi, err := s.Database(name); err != nil {
-			t.Fatal(err)
-		} else if dbi == nil {
-			t.Fatalf("database not found: %s", name)
-		} else if dbi.Name != name {
-			t.Fatal(name)
-		}
-	}
-}
-
-// Ensure a multi-node cluster can start, join the cluster, and replicate commands.
-func TestCluster_Open(t *testing.T) {
-	c := MustOpenCluster(3)
-	defer c.Close()
-
-	// Check that one node is leader and two are followers.
-	if s := c.Leader(); s == nil {
-		t.Fatal("no leader found")
-	}
-
-	// ensure all the nodes see the same metastore data
-	assertDatabaseReplicated(t, c)
-}
-
-// Ensure a multi-node cluster can start, join the cluster, and the first three members are raft nodes.
-func TestCluster_OpenRaft(t *testing.T) {
-	// Start a single node.
-	c := MustOpenCluster(1)
-	defer c.Close()
-
-	// Check that the node becomes leader.
-	if s := c.Leader(); s == nil {
-		t.Fatal("no leader found")
-	}
-
-	// Add 5 more nodes.
-	for i := 0; i < 5; i++ {
-		if err := c.Join(); err != nil {
-			t.Fatalf("failed to join cluster: %v", err)
-		}
-	}
-
-	// ensure we have 3 raft nodes
-	assertRaftPeerNodes(t, c, 3)
-
-	// ensure all the nodes see the same metastore data
-	assertDatabaseReplicated(t, c)
-}
-
-// Ensure a multi-node cluster can restart
-func TestCluster_Restart(t *testing.T) {
-	t.Skip("ISSUE https://github.com/influxdb/influxdb/issues/4723")
-	// Start a single node.
-	c := MustOpenCluster(1)
-	defer c.Close()
-
-	// Check that one node is leader.
-	if s := c.Leader(); s == nil {
-		t.Fatal("no leader found")
-	}
-
-	// Add 5 more nodes, 2 should become raft peers, 3 remote raft clients
-	for i := 0; i < 5; i++ {
-		if err := c.Join(); err != nil {
-			t.Fatalf("failed to join cluster: %v", err)
-		}
-	}
-
-	// The tests use a host assigned listener port.  We need to re-use
-	// the original ports when the new cluster is restarted so that the existing
-	// peer store addresses can be reached.
-	addrs := []string{}
-
-	// Make sure we keep files on disk when we shutdown as well as record the
-	// current cluster IP addresses
-	for _, s := range c.Stores {
-		s.LeaveFiles = true
-		addrs = append(addrs, s.Addr.String())
-	}
-
-	// Stop the cluster
-	if err := c.Close(); err != nil {
-		t.Fatalf("failed to close cluster: %v", err)
-	}
-
-	// Wait a bit to avoid spurious port in use conflict errors from trying to
-	// start the new cluster to fast
-	time.Sleep(100 * time.Millisecond)
-
-	// Re-create the cluster nodes from existing disk paths and addresses
-	stores := []*Store{}
-	storeChan := make(chan *Store)
-	for i, s := range c.Stores {
-
-		// Need to start each instance asynchronously because they have existing raft peers
-		// store.  Starting one will block indefinitely because it will not be able to become
-		// leader until another peer is available to hold an election.
-		go func(addr, path string) {
-			store := MustOpenStoreWithPath(addr, path)
-			storeChan <- store
-		}(addrs[i], s.Path())
-
-	}
-
-	// Collect up our restart meta-stores
-	for range c.Stores {
-		store := <-storeChan
-		stores = append(stores, store)
-	}
-
-	c.Stores = stores
-
-	// Wait for the cluster to stabilize
-	if err := c.WaitForLeader(); err != nil {
-		t.Fatal("no leader found")
-	}
-
-	// ensure we have 3 raft nodes
-	assertRaftPeerNodes(t, c, 3)
-
-	// ensure all the nodes see the same metastore data
-	assertDatabaseReplicated(t, c)
-	var wg sync.WaitGroup
-	wg.Add(len(c.Stores))
-	for _, s := range c.Stores {
-		go func(s *Store) {
-			defer wg.Done()
-			if err := s.Close(); err != nil {
-				t.Fatalf("error closing store %s", err)
-			}
-		}(s)
-	}
-	wg.Wait()
-}
-
-// Ensure a multi-node cluster can start, join the cluster, and the first three members are raft nodes., then add a 4th non raft
-// Remove a raft node, ensure the 4th promotes to raft
-func TestCluster_ReplaceRaft(t *testing.T) {
-	t.Parallel()
-	// Start a single node.
-	c := MustOpenCluster(1)
-	defer c.Close()
-
-	// Check that the node becomes leader.
-	if s := c.Leader(); s == nil {
-		t.Fatal("no leader found")
-	}
-
-	// Add 2 more nodes.
-	for i := 0; i < 2; i++ {
-		if err := c.Join(); err != nil {
-			t.Fatalf("failed to join cluster: %v", err)
-		}
-	}
-
-	// sleep to let them become raft
-	time.Sleep(time.Second)
-
-	// ensure we have 3 raft nodes
-	for _, s := range c.Stores {
-		if !s.IsLocal() {
-			t.Fatalf("node %d is not a local raft instance.", s.NodeID())
-		}
-	}
-
-	// ensure all the nodes see the same metastore data
-	assertDatabaseReplicated(t, c)
-
-	// Add another node
-	if err := c.Join(); err != nil {
-		t.Fatalf("failed to join cluster: %v", err)
-	}
-
-	var leader, follower *Store
-
-	// find a non-leader node
-	for _, s := range c.Stores {
-		if s.IsLeader() {
-			leader = s
-		}
-		// Find any follower to remove
-		if !s.IsLeader() && s.IsLocal() {
-			follower = s
-		}
-		if leader != nil && follower != nil {
-			break
-		}
-	}
-
-	// drop the node
-	if err := leader.DeleteNode(follower.NodeID(), true); err != nil {
-		t.Fatal(err)
-	}
-	if err := c.Remove(follower.NodeID()); err != nil {
-		t.Fatal(err)
-	}
-
-	// sleep to let them become raft
-	time.Sleep(1 * time.Second)
-
-	// ensure we have 3 raft nodes
-	for _, s := range c.Stores {
-		if !s.IsLocal() {
-			t.Fatalf("node %d is not a local raft instance.", s.NodeID())
-		}
-	}
-}
-
-// Store is a test wrapper for meta.Store.
-type Store struct {
-	*meta.Store
-	BindAddress string
-	Listener    net.Listener
-	Stderr      bytes.Buffer
-	LeaveFiles  bool // set to true to leave temporary files on close
-}
-
-// NewStore returns a new test wrapper for Store.
-func NewStore(c *meta.Config) *Store {
-	s := &Store{
-		Store: meta.NewStore(c),
-	}
-	if !testing.Verbose() {
-		s.Logger = log.New(&s.Stderr, "", log.LstdFlags)
-	}
-	s.SetHashPasswordFn(mockHashPassword)
-	return s
-}
-
-// MustOpenStore opens a store in a temporary path. Panic on error.
-func MustOpenStore() *Store {
-	return MustOpenStoreWithPath("", MustTempFile())
-}
-
-// MustOpenStoreWith opens a store from a given path. Panic on error.
-func MustOpenStoreWithPath(addr, path string) *Store {
-	c := NewConfig(path)
-	s := NewStore(c)
-	if addr != "" {
-		s.BindAddress = addr
-	}
-	if err := s.Open(); err != nil {
-		panic(err)
-	}
-
-	// Wait until the server is ready.
-	select {
-	case err := <-s.Err():
-		panic(err)
-	case <-s.Ready():
-	}
-
-	return s
-}
-
-// Open opens the store on a random TCP port.
-func (s *Store) Open() error {
-
-	addr := "127.0.0.1:0"
-	if s.BindAddress != "" {
-		addr = s.BindAddress
-	}
-	// Open a TCP port.
-	ln, err := net.Listen("tcp", addr)
-	if err != nil {
-		return fmt.Errorf("listen: %s", err)
-	}
-	s.Addr = ln.Addr()
-	s.Listener = ln
-	s.RemoteAddr = s.Addr
-
-	// Wrap listener in a muxer.
-	mux := tcp.NewMux()
-	s.RaftListener = mux.Listen(meta.MuxRaftHeader)
-	s.ExecListener = mux.Listen(meta.MuxExecHeader)
-	s.RPCListener = mux.Listen(meta.MuxRPCHeader)
-
-	go mux.Serve(ln)
-
-	// Open store.
-	if err := s.Store.Open(); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-// Close shuts down the store and removes all data from the path.
-func (s *Store) Close() error {
-	if s.Listener != nil {
-		s.Listener.Close()
-	}
-	if !s.LeaveFiles {
-		defer os.RemoveAll(s.Path())
-	}
-	return s.Store.Close()
-}
-
-// NewConfig returns the default test configuration.
-func NewConfig(path string) *meta.Config {
-	return &meta.Config{
-		Dir:                  path,
-		Hostname:             "localhost",
-		BindAddress:          "127.0.0.1:0",
-		HeartbeatTimeout:     toml.Duration(500 * time.Millisecond),
-		ElectionTimeout:      toml.Duration(500 * time.Millisecond),
-		LeaderLeaseTimeout:   toml.Duration(500 * time.Millisecond),
-		CommitTimeout:        toml.Duration(5 * time.Millisecond),
-		RaftPromotionEnabled: true,
-	}
-}
-
-// Cluster represents a group of stores joined as a raft cluster.
-type Cluster struct {
-	path   string
-	Stores []*Store
-	n      int
-}
-
-// NewCluster returns a cluster of n stores within path.
-func NewCluster(path string, n int) *Cluster {
-	c := &Cluster{path: path, n: n}
-	config := NewConfig(filepath.Join(path, strconv.Itoa(0)))
-	s := NewStore(config)
-	c.Stores = append(c.Stores, s)
-	return c
-}
-
-// MustOpenCluster opens a cluster in a temporary path. Panic on error.
-func MustOpenCluster(n int) *Cluster {
-	c := NewCluster(MustTempFile(), n)
-	if err := c.Open(); err != nil {
-		panic(err.Error())
-	}
-
-	// Wait for all stores to be ready.
-	for i, s := range c.Stores {
-		select {
-		case err := <-s.Err():
-			panic(fmt.Sprintf("store: i=%d, addr=%s, err=%s", i, s.Addr.String(), err))
-		case <-s.Ready():
-		}
-	}
-	return c
-}
-
-func (c *Cluster) Join() error {
-	config := NewConfig(filepath.Join(c.path, strconv.Itoa(len(c.Stores))))
-	config.Peers = []string{c.Stores[0].Addr.String()}
-	s := NewStore(config)
-	if err := s.Open(); err != nil {
-		return err
-	}
-	select {
-	case err := <-s.Err():
-		panic(fmt.Sprintf("store: i=%d, addr=%s, err=%s", len(c.Stores), s.Addr.String(), err))
-	case <-s.Ready():
-	}
-
-	c.Stores = append(c.Stores, s)
-	return nil
-}
-
-func (c *Cluster) Remove(nodeID uint64) error {
-	for i, s := range c.Stores {
-		if s.NodeID() == nodeID {
-			// This could hang for a variety of reasons, so don't wait for it
-			go s.Close()
-			c.Stores = append(c.Stores[:i], c.Stores[i+1:]...)
-		}
-	}
-	return nil
-}
-
-// Open opens and initializes all stores in the cluster.
-func (c *Cluster) Open() error {
-	if err := func() error {
-
-		if err := c.Stores[0].Open(); err != nil {
-			return err
-		}
-
-		for i := 1; i < c.n; i++ {
-			if err := c.Join(); err != nil {
-				panic(fmt.Sprintf("failed to add new cluster node: %v", err))
-			}
-		}
-
-		return nil
-	}(); err != nil {
-		c.Close()
-		return err
-	}
-	return nil
-}
-
-// Close shuts down all stores.
-func (c *Cluster) Close() error {
-	var wg sync.WaitGroup
-	wg.Add(len(c.Stores))
-
-	for _, s := range c.Stores {
-		go func(s *Store) {
-			defer wg.Done()
-			s.Close()
-		}(s)
-	}
-	wg.Wait()
-	return nil
-}
-
-func (c *Cluster) WaitForLeader() error {
-	for _, s := range c.Stores {
-		if err := s.WaitForLeader(5 * time.Second); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-// Leader returns the store that is currently leader.
-func (c *Cluster) Leader() *Store {
-	for _, s := range c.Stores {
-		if s.IsLeader() {
-			return s
-		}
-	}
-	return nil
-}
-
-// MustTempFile returns the path to a non-existent temporary file.
-func MustTempFile() string {
-	f, _ := ioutil.TempFile("", "influxdb-meta-")
-	f.Close()
-	os.Remove(f.Name())
-	return f.Name()
-}
-
-// mockHashPassword is used for most tests to avoid slow calls to bcrypt.
-func mockHashPassword(password string) ([]byte, error) {
-	return []byte(password), nil
-}
-
-// assertRaftPeerNodes counts the number of nodes running with a local raft
-// database and asserts that the count is equal to n
-func assertRaftPeerNodes(t *testing.T, c *Cluster, n int) {
-	// Ensure we have the required number of raft nodes
-	raftCount := 0
-	for _, s := range c.Stores {
-		if _, err := os.Stat(filepath.Join(s.Path(), "raft.db")); err == nil {
-			raftCount += 1
-		}
-	}
-
-	if raftCount != n {
-		t.Errorf("raft nodes mismatch: got %v, exp %v", raftCount, n)
-	}
-}
-
-// assertDatabaseReplicated creates a new database named after each node and
-// then verifies that each node can see all the created databases from their
-// local meta data
-func assertDatabaseReplicated(t *testing.T, c *Cluster) {
-	// Add a database to each node.
-	for i, s := range c.Stores {
-		if di, err := s.CreateDatabase(fmt.Sprintf("db%d", i)); err != nil {
-			t.Fatal(err)
-		} else if di == nil {
-			t.Fatal("expected database")
-		}
-	}
-
-	// Verify that each store has all databases.
-	for i := 0; i < len(c.Stores); i++ {
-		for _, s := range c.Stores {
-			if di, err := s.Database(fmt.Sprintf("db%d", i)); err != nil {
-				t.Fatal(err)
-			} else if di == nil {
-				t.Fatal("expected database")
-			}
-		}
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/models/points.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/models/points.go
deleted file mode 100644
index 6cdaba37f..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/models/points.go
+++ /dev/null
@@ -1,1385 +0,0 @@
-package models
-
-import (
-	"bytes"
-	"fmt"
-	"hash/fnv"
-	"math"
-	"sort"
-	"strconv"
-	"strings"
-	"time"
-
-	"github.com/influxdb/influxdb/pkg/escape"
-)
-
-var (
-	measurementEscapeCodes = map[byte][]byte{
-		',': []byte(`\,`),
-		' ': []byte(`\ `),
-	}
-
-	tagEscapeCodes = map[byte][]byte{
-		',': []byte(`\,`),
-		' ': []byte(`\ `),
-		'=': []byte(`\=`),
-	}
-)
-
-// Point defines the values that will be written to the database
-type Point interface {
-	Name() string
-	SetName(string)
-
-	Tags() Tags
-	AddTag(key, value string)
-	SetTags(tags Tags)
-
-	Fields() Fields
-	AddField(name string, value interface{})
-
-	Time() time.Time
-	SetTime(t time.Time)
-	UnixNano() int64
-
-	HashID() uint64
-	Key() []byte
-
-	Data() []byte
-	SetData(buf []byte)
-
-	// String returns a string representation of the point object, if there is a
-	// timestamp associated with the point then it will be specified with the default
-	// precision of nanoseconds
-	String() string
-
-	// PrecisionString returns a string representation of the point object, if there
-	// is a timestamp associated with the point then it will be specified in the
-	// given unit
-	PrecisionString(precision string) string
-
-	// RoundedString returns a string representation of the point object, if there
-	// is a timestamp associated with the point, then it will be rounded to the
-	// given duration
-	RoundedString(d time.Duration) string
-}
-
-// Points represents a sortable list of points by timestamp.
-type Points []Point
-
-func (a Points) Len() int           { return len(a) }
-func (a Points) Less(i, j int) bool { return a[i].Time().Before(a[j].Time()) }
-func (a Points) Swap(i, j int)      { a[i], a[j] = a[j], a[i] }
-
-// point is the default implementation of Point.
-type point struct {
-	time time.Time
-
-	// text encoding of measurement and tags
-	// key must always be stored sorted by tags, if the original line was not sorted,
-	// we need to resort it
-	key []byte
-
-	// text encoding of field data
-	fields []byte
-
-	// text encoding of timestamp
-	ts []byte
-
-	// binary encoded field data
-	data []byte
-
-	// cached version of parsed fields from data
-	cachedFields map[string]interface{}
-
-	// cached version of parsed name from key
-	cachedName string
-}
-
-const (
-	// the number of characters for the largest possible int64 (9223372036854775807)
-	maxInt64Digits = 19
-
-	// the number of characters for the smallest possible int64 (-9223372036854775808)
-	minInt64Digits = 20
-
-	// the number of characters required for the largest float64 before a range check
-	// would occur during parsing
-	maxFloat64Digits = 25
-
-	// the number of characters required for smallest float64 before a range check occur
-	// would occur during parsing
-	minFloat64Digits = 27
-)
-
-var ()
-
-func ParsePointsString(buf string) ([]Point, error) {
-	return ParsePoints([]byte(buf))
-}
-
-// ParsePoints returns a slice of Points from a text representation of a point
-// with each point separated by newlines.  If any points fail to parse, a non-nil error
-// will be returned in addition to the points that parsed successfully.
-func ParsePoints(buf []byte) ([]Point, error) {
-	return ParsePointsWithPrecision(buf, time.Now().UTC(), "n")
-}
-
-func ParsePointsWithPrecision(buf []byte, defaultTime time.Time, precision string) ([]Point, error) {
-	points := []Point{}
-	var (
-		pos    int
-		block  []byte
-		failed []string
-	)
-	for {
-		pos, block = scanLine(buf, pos)
-		pos += 1
-
-		if len(block) == 0 {
-			break
-		}
-
-		// lines which start with '#' are comments
-		start := skipWhitespace(block, 0)
-
-		// If line is all whitespace, just skip it
-		if start >= len(block) {
-			continue
-		}
-
-		if block[start] == '#' {
-			continue
-		}
-
-		// strip the newline if one is present
-		if block[len(block)-1] == '\n' {
-			block = block[:len(block)-1]
-		}
-
-		pt, err := parsePoint(block[start:len(block)], defaultTime, precision)
-		if err != nil {
-			failed = append(failed, fmt.Sprintf("unable to parse '%s': %v", string(block[start:len(block)]), err))
-		} else {
-			points = append(points, pt)
-		}
-
-		if pos >= len(buf) {
-			break
-		}
-
-	}
-	if len(failed) > 0 {
-		return points, fmt.Errorf("%s", strings.Join(failed, "\n"))
-	}
-	return points, nil
-
-}
-
-func parsePoint(buf []byte, defaultTime time.Time, precision string) (Point, error) {
-	// scan the first block which is measurement[,tag1=value1,tag2=value=2...]
-	pos, key, err := scanKey(buf, 0)
-	if err != nil {
-		return nil, err
-	}
-
-	// measurement name is required
-	if len(key) == 0 {
-		return nil, fmt.Errorf("missing measurement")
-	}
-
-	// scan the second block is which is field1=value1[,field2=value2,...]
-	pos, fields, err := scanFields(buf, pos)
-	if err != nil {
-		return nil, err
-	}
-
-	// at least one field is required
-	if len(fields) == 0 {
-		return nil, fmt.Errorf("missing fields")
-	}
-
-	// scan the last block which is an optional integer timestamp
-	pos, ts, err := scanTime(buf, pos)
-
-	if err != nil {
-		return nil, err
-	}
-
-	pt := &point{
-		key:    key,
-		fields: fields,
-		ts:     ts,
-	}
-
-	if len(ts) == 0 {
-		pt.time = defaultTime
-		pt.SetPrecision(precision)
-	} else {
-		ts, err := strconv.ParseInt(string(ts), 10, 64)
-		if err != nil {
-			return nil, err
-		}
-		pt.time = time.Unix(0, ts*pt.GetPrecisionMultiplier(precision)).UTC()
-	}
-	return pt, nil
-}
-
-// scanKey scans buf starting at i for the measurement and tag portion of the point.
-// It returns the ending position and the byte slice of key within buf.  If there
-// are tags, they will be sorted if they are not already.
-func scanKey(buf []byte, i int) (int, []byte, error) {
-	start := skipWhitespace(buf, i)
-
-	i = start
-
-	// Determines whether the tags are sort, assume they are
-	sorted := true
-
-	// indices holds the indexes within buf of the start of each tag.  For example,
-	// a buf of 'cpu,host=a,region=b,zone=c' would have indices slice of [4,11,20]
-	// which indicates that the first tag starts at buf[4], seconds at buf[11], and
-	// last at buf[20]
-	indices := make([]int, 100)
-
-	// tracks how many commas we've seen so we know how many values are indices.
-	// Since indices is an arbitrarily large slice,
-	// we need to know how many values in the buffer are in use.
-	commas := 0
-
-	// tracks whether we've see an '='
-	equals := 0
-
-	// loop over each byte in buf
-	for {
-		// reached the end of buf?
-		if i >= len(buf) {
-			if equals == 0 && commas > 0 {
-				return i, buf[start:i], fmt.Errorf("missing tag value")
-			}
-
-			break
-		}
-
-		// equals is special in the tags section.  It must be escaped if part of a tag key or value.
-		// It does not need to be escaped if part of the measurement.
-		if buf[i] == '=' && commas > 0 {
-			if i-1 < 0 || i-2 < 0 {
-				return i, buf[start:i], fmt.Errorf("missing tag key")
-			}
-
-			// Check for "cpu,=value" but allow "cpu,a\,=value"
-			if buf[i-1] == ',' && buf[i-2] != '\\' {
-				return i, buf[start:i], fmt.Errorf("missing tag key")
-			}
-
-			// Check for "cpu,\ =value"
-			if buf[i-1] == ' ' && buf[i-2] != '\\' {
-				return i, buf[start:i], fmt.Errorf("missing tag key")
-			}
-
-			i += 1
-			equals += 1
-
-			// Check for "cpu,a=1,b= value=1" or "cpu,a=1,b=,c=foo value=1"
-			if i < len(buf) && (buf[i] == ' ' || buf[i] == ',') {
-				return i, buf[start:i], fmt.Errorf("missing tag value")
-			}
-			continue
-		}
-
-		// escaped character
-		if buf[i] == '\\' {
-			i += 2
-			continue
-		}
-
-		// At a tag separator (comma), track it's location
-		if buf[i] == ',' {
-			if equals == 0 && commas > 0 {
-				return i, buf[start:i], fmt.Errorf("missing tag value")
-			}
-			i += 1
-
-			// grow our indices slice if we have too many tags
-			if commas >= len(indices) {
-				newIndics := make([]int, cap(indices)*2)
-				copy(newIndics, indices)
-				indices = newIndics
-			}
-			indices[commas] = i
-			commas += 1
-
-			// Check for "cpu, value=1"
-			if i < len(buf) && buf[i] == ' ' {
-				return i, buf[start:i], fmt.Errorf("missing tag key")
-			}
-			continue
-		}
-
-		// reached end of the block? (next block would be fields)
-		if buf[i] == ' ' {
-			// check for "cpu,tag value=1"
-			if equals == 0 && commas > 0 {
-				return i, buf[start:i], fmt.Errorf("missing tag value")
-			}
-			if equals > 0 && commas-1 != equals-1 {
-				return i, buf[start:i], fmt.Errorf("missing tag value")
-			}
-
-			// grow our indices slice if we have too many tags
-			if commas >= len(indices) {
-				newIndics := make([]int, cap(indices)*2)
-				copy(newIndics, indices)
-				indices = newIndics
-			}
-
-			indices[commas] = i + 1
-			break
-		}
-
-		i += 1
-	}
-
-	// check that all field sections had key and values (e.g. prevent "a=1,b"
-	// We're using commas -1 because there should always be a comma after measurement
-	if equals > 0 && commas-1 != equals-1 {
-		return i, buf[start:i], fmt.Errorf("invalid tag format")
-	}
-
-	// This check makes sure we actually received fields from the user. #3379
-	// This will catch invalid syntax such as: `cpu,host=serverA,region=us-west`
-	if i >= len(buf) {
-		return i, buf[start:i], fmt.Errorf("missing fields")
-	}
-
-	// Now we know where the key region is within buf, and the locations of tags, we
-	// need to determine if duplicate tags exist and if the tags are sorted.  This iterates
-	// 1/2 of the list comparing each end with each other, walking towards the center from
-	// both sides.
-	for j := 0; j < commas/2; j++ {
-		// get the left and right tags
-		_, left := scanTo(buf[indices[j]:indices[j+1]-1], 0, '=')
-		_, right := scanTo(buf[indices[commas-j-1]:indices[commas-j]-1], 0, '=')
-
-		// If the tags are equal, then there are duplicate tags, and we should abort
-		if bytes.Equal(left, right) {
-			return i, buf[start:i], fmt.Errorf("duplicate tags")
-		}
-
-		// If left is greater than right, the tags are not sorted.  We must continue
-		// since their could be duplicate tags still.
-		if bytes.Compare(left, right) > 0 {
-			sorted = false
-		}
-	}
-
-	// If the tags are not sorted, then sort them.  This sort is inline and
-	// uses the tag indices we created earlier.  The actual buffer is not sorted, the
-	// indices are using the buffer for value comparison.  After the indices are sorted,
-	// the buffer is reconstructed from the sorted indices.
-	if !sorted && commas > 0 {
-		// Get the measurement name for later
-		measurement := buf[start : indices[0]-1]
-
-		// Sort the indices
-		indices := indices[:commas]
-		insertionSort(0, commas, buf, indices)
-
-		// Create a new key using the measurement and sorted indices
-		b := make([]byte, len(buf[start:i]))
-		pos := copy(b, measurement)
-		for _, i := range indices {
-			b[pos] = ','
-			pos += 1
-			_, v := scanToSpaceOr(buf, i, ',')
-			pos += copy(b[pos:], v)
-		}
-
-		return i, b, nil
-	}
-
-	return i, buf[start:i], nil
-}
-
-func insertionSort(l, r int, buf []byte, indices []int) {
-	for i := l + 1; i < r; i++ {
-		for j := i; j > l && less(buf, indices, j, j-1); j-- {
-			indices[j], indices[j-1] = indices[j-1], indices[j]
-		}
-	}
-}
-
-func less(buf []byte, indices []int, i, j int) bool {
-	// This grabs the tag names for i & j, it ignores the values
-	_, a := scanTo(buf, indices[i], '=')
-	_, b := scanTo(buf, indices[j], '=')
-	return bytes.Compare(a, b) < 0
-}
-
-func isFieldEscapeChar(b byte) bool {
-	for c := range escape.Codes {
-		if c == b {
-			return true
-		}
-	}
-	return false
-}
-
-// scanFields scans buf, starting at i for the fields section of a point.  It returns
-// the ending position and the byte slice of the fields within buf
-func scanFields(buf []byte, i int) (int, []byte, error) {
-	start := skipWhitespace(buf, i)
-	i = start
-	quoted := false
-
-	// tracks how many '=' we've seen
-	equals := 0
-
-	// tracks how many commas we've seen
-	commas := 0
-
-	for {
-		// reached the end of buf?
-		if i >= len(buf) {
-			break
-		}
-
-		// escaped characters?
-		if buf[i] == '\\' && i+1 < len(buf) {
-
-			// Is this an escape char within a string field? Only " and \ are allowed.
-			if quoted && (buf[i+1] == '"' || buf[i+1] == '\\') {
-				i += 2
-				continue
-				// Non-string field escaped chars
-			} else if !quoted && isFieldEscapeChar(buf[i+1]) {
-				i += 2
-				continue
-			}
-		}
-
-		// If the value is quoted, scan until we get to the end quote
-		if buf[i] == '"' {
-			quoted = !quoted
-			i += 1
-			continue
-		}
-
-		// If we see an =, ensure that there is at least on char before and after it
-		if buf[i] == '=' && !quoted {
-			equals += 1
-
-			// check for "... =123" but allow "a\ =123"
-			if buf[i-1] == ' ' && buf[i-2] != '\\' {
-				return i, buf[start:i], fmt.Errorf("missing field key")
-			}
-
-			// check for "...a=123,=456" but allow "a=123,a\,=456"
-			if buf[i-1] == ',' && buf[i-2] != '\\' {
-				return i, buf[start:i], fmt.Errorf("missing field key")
-			}
-
-			// check for "... value="
-			if i+1 >= len(buf) {
-				return i, buf[start:i], fmt.Errorf("missing field value")
-			}
-
-			// check for "... value=,value2=..."
-			if buf[i+1] == ',' || buf[i+1] == ' ' {
-				return i, buf[start:i], fmt.Errorf("missing field value")
-			}
-
-			if isNumeric(buf[i+1]) || buf[i+1] == '-' || buf[i+1] == 'N' || buf[i+1] == 'n' {
-				var err error
-				i, err = scanNumber(buf, i+1)
-				if err != nil {
-					return i, buf[start:i], err
-				}
-				continue
-			}
-			// If next byte is not a double-quote, the value must be a boolean
-			if buf[i+1] != '"' {
-				var err error
-				i, _, err = scanBoolean(buf, i+1)
-				if err != nil {
-					return i, buf[start:i], err
-				}
-				continue
-			}
-		}
-
-		if buf[i] == ',' && !quoted {
-			commas += 1
-		}
-
-		// reached end of block?
-		if buf[i] == ' ' && !quoted {
-			break
-		}
-		i += 1
-	}
-
-	if quoted {
-		return i, buf[start:i], fmt.Errorf("unbalanced quotes")
-	}
-
-	// check that all field sections had key and values (e.g. prevent "a=1,b"
-	if equals == 0 || commas != equals-1 {
-		return i, buf[start:i], fmt.Errorf("invalid field format")
-	}
-
-	return i, buf[start:i], nil
-}
-
-// scanTime scans buf, starting at i for the time section of a point.  It returns
-// the ending position and the byte slice of the fields within buf and error if the
-// timestamp is not in the correct numeric format
-func scanTime(buf []byte, i int) (int, []byte, error) {
-	start := skipWhitespace(buf, i)
-	i = start
-	for {
-		// reached the end of buf?
-		if i >= len(buf) {
-			break
-		}
-
-		// Timestamps should be integers, make sure they are so we don't need to actually
-		// parse the timestamp until needed
-		if buf[i] < '0' || buf[i] > '9' {
-			// Handle negative timestamps
-			if i == start && buf[i] == '-' {
-				i += 1
-				continue
-			}
-			return i, buf[start:i], fmt.Errorf("bad timestamp")
-		}
-
-		// reached end of block?
-		if buf[i] == '\n' {
-			break
-		}
-		i += 1
-	}
-	return i, buf[start:i], nil
-}
-
-func isNumeric(b byte) bool {
-	return (b >= '0' && b <= '9') || b == '.'
-}
-
-// scanNumber returns the end position within buf, start at i after
-// scanning over buf for an integer, or float.  It returns an
-// error if a invalid number is scanned.
-func scanNumber(buf []byte, i int) (int, error) {
-	start := i
-	var isInt bool
-
-	// Is negative number?
-	if i < len(buf) && buf[i] == '-' {
-		i += 1
-		// There must be more characters now, as just '-' is illegal.
-		if i == len(buf) {
-			return i, fmt.Errorf("invalid number")
-		}
-	}
-
-	// how many decimal points we've see
-	decimals := 0
-
-	// indicates the number is float in scientific notation
-	scientific := false
-
-	for {
-		if i >= len(buf) {
-			break
-		}
-
-		if buf[i] == ',' || buf[i] == ' ' {
-			break
-		}
-
-		if buf[i] == 'i' && i > start && !isInt {
-			isInt = true
-			i += 1
-			continue
-		}
-
-		if buf[i] == '.' {
-			decimals += 1
-		}
-
-		// Can't have more than 1 decimal (e.g. 1.1.1 should fail)
-		if decimals > 1 {
-			return i, fmt.Errorf("invalid number")
-		}
-
-		// `e` is valid for floats but not as the first char
-		if i > start && (buf[i] == 'e' || buf[i] == 'E') {
-			scientific = true
-			i += 1
-			continue
-		}
-
-		// + and - are only valid at this point if they follow an e (scientific notation)
-		if (buf[i] == '+' || buf[i] == '-') && (buf[i-1] == 'e' || buf[i-1] == 'E') {
-			i += 1
-			continue
-		}
-
-		// NaN is an unsupported value
-		if i+2 < len(buf) && (buf[i] == 'N' || buf[i] == 'n') {
-			return i, fmt.Errorf("invalid number")
-		}
-
-		if !isNumeric(buf[i]) {
-			return i, fmt.Errorf("invalid number")
-		}
-		i += 1
-	}
-	if isInt && (decimals > 0 || scientific) {
-		return i, fmt.Errorf("invalid number")
-	}
-
-	// It's more common that numbers will be within min/max range for their type but we need to prevent
-	// out or range numbers from being parsed successfully.  This uses some simple heuristics to decide
-	// if we should parse the number to the actual type.  It does not do it all the time because it incurs
-	// extra allocations and we end up converting the type again when writing points to disk.
-	if isInt {
-		// Make sure the last char is an 'i' for integers (e.g. 9i10 is not valid)
-		if buf[i-1] != 'i' {
-			return i, fmt.Errorf("invalid number")
-		}
-		// Parse the int to check bounds the number of digits could be larger than the max range
-		// We subtract 1 from the index to remove the `i` from our tests
-		if len(buf[start:i-1]) >= maxInt64Digits || len(buf[start:i-1]) >= minInt64Digits {
-			if _, err := strconv.ParseInt(string(buf[start:i-1]), 10, 64); err != nil {
-				return i, fmt.Errorf("unable to parse integer %s: %s", buf[start:i-1], err)
-			}
-		}
-	} else {
-		// Parse the float to check bounds if it's scientific or the number of digits could be larger than the max range
-		if scientific || len(buf[start:i]) >= maxFloat64Digits || len(buf[start:i]) >= minFloat64Digits {
-			if _, err := strconv.ParseFloat(string(buf[start:i]), 10); err != nil {
-				return i, fmt.Errorf("invalid float")
-			}
-		}
-	}
-
-	return i, nil
-}
-
-// scanBoolean returns the end position within buf, start at i after
-// scanning over buf for boolean. Valid values for a boolean are
-// t, T, true, TRUE, f, F, false, FALSE.  It returns an error if a invalid boolean
-// is scanned.
-func scanBoolean(buf []byte, i int) (int, []byte, error) {
-	start := i
-
-	if i < len(buf) && (buf[i] != 't' && buf[i] != 'f' && buf[i] != 'T' && buf[i] != 'F') {
-		return i, buf[start:i], fmt.Errorf("invalid boolean")
-	}
-
-	i += 1
-	for {
-		if i >= len(buf) {
-			break
-		}
-
-		if buf[i] == ',' || buf[i] == ' ' {
-			break
-		}
-		i += 1
-	}
-
-	// Single char bool (t, T, f, F) is ok
-	if i-start == 1 {
-		return i, buf[start:i], nil
-	}
-
-	// length must be 4 for true or TRUE
-	if (buf[start] == 't' || buf[start] == 'T') && i-start != 4 {
-		return i, buf[start:i], fmt.Errorf("invalid boolean")
-	}
-
-	// length must be 5 for false or FALSE
-	if (buf[start] == 'f' || buf[start] == 'F') && i-start != 5 {
-		return i, buf[start:i], fmt.Errorf("invalid boolean")
-	}
-
-	// Otherwise
-	valid := false
-	switch buf[start] {
-	case 't':
-		valid = bytes.Equal(buf[start:i], []byte("true"))
-	case 'f':
-		valid = bytes.Equal(buf[start:i], []byte("false"))
-	case 'T':
-		valid = bytes.Equal(buf[start:i], []byte("TRUE")) || bytes.Equal(buf[start:i], []byte("True"))
-	case 'F':
-		valid = bytes.Equal(buf[start:i], []byte("FALSE")) || bytes.Equal(buf[start:i], []byte("False"))
-	}
-
-	if !valid {
-		return i, buf[start:i], fmt.Errorf("invalid boolean")
-	}
-
-	return i, buf[start:i], nil
-
-}
-
-// skipWhitespace returns the end position within buf, starting at i after
-// scanning over spaces in tags
-func skipWhitespace(buf []byte, i int) int {
-	for i < len(buf) {
-		if buf[i] != ' ' && buf[i] != '\t' && buf[i] != 0 {
-			break
-		}
-		i++
-	}
-	return i
-}
-
-// scanLine returns the end position in buf and the next line found within
-// buf.
-func scanLine(buf []byte, i int) (int, []byte) {
-	start := i
-	quoted := false
-	fields := false
-	for {
-		// reached the end of buf?
-		if i >= len(buf) {
-			break
-		}
-
-		if buf[i] == ' ' {
-			fields = true
-		}
-
-		// If we see a double quote, makes sure it is not escaped
-		if fields && buf[i] == '"' && (i-1 > 0 && buf[i-1] != '\\') {
-			i += 1
-			quoted = !quoted
-			continue
-		}
-
-		if buf[i] == '\n' && !quoted {
-			break
-		}
-
-		i += 1
-	}
-
-	return i, buf[start:i]
-}
-
-// scanTo returns the end position in buf and the next consecutive block
-// of bytes, starting from i and ending with stop byte.  If there are leading
-// spaces or escaped chars, they are skipped.
-func scanTo(buf []byte, i int, stop byte) (int, []byte) {
-	start := i
-	for {
-		// reached the end of buf?
-		if i >= len(buf) {
-			break
-		}
-
-		if buf[i] == '\\' {
-			i += 2
-			continue
-		}
-
-		// reached end of block?
-		if buf[i] == stop {
-			break
-		}
-		i += 1
-	}
-
-	return i, buf[start:i]
-}
-
-// scanTo returns the end position in buf and the next consecutive block
-// of bytes, starting from i and ending with stop byte.  If there are leading
-// spaces, they are skipped.
-func scanToSpaceOr(buf []byte, i int, stop byte) (int, []byte) {
-	start := i
-	for {
-		// reached the end of buf?
-		if i >= len(buf) {
-			break
-		}
-
-		if buf[i] == '\\' {
-			i += 2
-			continue
-		}
-		// reached end of block?
-		if buf[i] == stop || buf[i] == ' ' {
-			break
-		}
-		i += 1
-	}
-
-	return i, buf[start:i]
-}
-
-func scanTagValue(buf []byte, i int) (int, []byte) {
-	start := i
-	for {
-		if i >= len(buf) {
-			break
-		}
-
-		if buf[i] == '\\' {
-			i += 2
-			continue
-		}
-
-		if buf[i] == ',' {
-			break
-		}
-		i += 1
-	}
-	return i, buf[start:i]
-}
-
-func scanFieldValue(buf []byte, i int) (int, []byte) {
-	start := i
-	quoted := false
-	for {
-		if i >= len(buf) {
-			break
-		}
-
-		// Only escape char for a field value is a double-quote
-		if buf[i] == '\\' && i+1 < len(buf) && buf[i+1] == '"' {
-			i += 2
-			continue
-		}
-
-		// Quoted value? (e.g. string)
-		if buf[i] == '"' {
-			i += 1
-			quoted = !quoted
-			continue
-		}
-
-		if buf[i] == ',' && !quoted {
-			break
-		}
-		i += 1
-	}
-	return i, buf[start:i]
-}
-
-func escapeMeasurement(in []byte) []byte {
-	for b, esc := range measurementEscapeCodes {
-		in = bytes.Replace(in, []byte{b}, esc, -1)
-	}
-	return in
-}
-
-func unescapeMeasurement(in []byte) []byte {
-	for b, esc := range measurementEscapeCodes {
-		in = bytes.Replace(in, esc, []byte{b}, -1)
-	}
-	return in
-}
-
-func escapeTag(in []byte) []byte {
-	for b, esc := range tagEscapeCodes {
-		in = bytes.Replace(in, []byte{b}, esc, -1)
-	}
-	return in
-}
-
-func unescapeTag(in []byte) []byte {
-	for b, esc := range tagEscapeCodes {
-		in = bytes.Replace(in, esc, []byte{b}, -1)
-	}
-	return in
-}
-
-// escapeStringField returns a copy of in with any double quotes or
-// backslashes with escaped values
-func escapeStringField(in string) string {
-	var out []byte
-	i := 0
-	for {
-		if i >= len(in) {
-			break
-		}
-		// escape double-quotes
-		if in[i] == '\\' {
-			out = append(out, '\\')
-			out = append(out, '\\')
-			i += 1
-			continue
-		}
-		// escape double-quotes
-		if in[i] == '"' {
-			out = append(out, '\\')
-			out = append(out, '"')
-			i += 1
-			continue
-		}
-		out = append(out, in[i])
-		i += 1
-
-	}
-	return string(out)
-}
-
-// unescapeStringField returns a copy of in with any escaped double-quotes
-// or backslashes unescaped
-func unescapeStringField(in string) string {
-	var out []byte
-	i := 0
-	for {
-		if i >= len(in) {
-			break
-		}
-		// unescape backslashes
-		if in[i] == '\\' && i+1 < len(in) && in[i+1] == '\\' {
-			out = append(out, '\\')
-			i += 2
-			continue
-		}
-		// unescape double-quotes
-		if in[i] == '\\' && i+1 < len(in) && in[i+1] == '"' {
-			out = append(out, '"')
-			i += 2
-			continue
-		}
-		out = append(out, in[i])
-		i += 1
-
-	}
-	return string(out)
-}
-
-// NewPoint returns a new point with the given measurement name, tags, fields and timestamp.  If
-// an unsupported field value (NaN) is passed, this function returns an error.
-func NewPoint(name string, tags Tags, fields Fields, time time.Time) (Point, error) {
-	for key, value := range fields {
-		if fv, ok := value.(float64); ok {
-			// Ensure the caller validates and handles invalid field values
-			if math.IsNaN(fv) {
-				return nil, fmt.Errorf("NaN is an unsupported value for field %s", key)
-			}
-		}
-	}
-
-	return &point{
-		key:    MakeKey([]byte(name), tags),
-		time:   time,
-		fields: fields.MarshalBinary(),
-	}, nil
-}
-
-// NewPoint returns a new point with the given measurement name, tags, fields and timestamp.  If
-// an unsupported field value (NaN) is passed, this function panics.
-func MustNewPoint(name string, tags Tags, fields Fields, time time.Time) Point {
-	pt, err := NewPoint(name, tags, fields, time)
-	if err != nil {
-		panic(err.Error())
-	}
-	return pt
-}
-
-func (p *point) Data() []byte {
-	return p.data
-}
-
-func (p *point) SetData(b []byte) {
-	p.data = b
-}
-
-func (p *point) Key() []byte {
-	return p.key
-}
-
-func (p *point) name() []byte {
-	_, name := scanTo(p.key, 0, ',')
-	return name
-}
-
-// Name return the measurement name for the point
-func (p *point) Name() string {
-	if p.cachedName != "" {
-		return p.cachedName
-	}
-	p.cachedName = string(escape.Unescape(p.name()))
-	return p.cachedName
-}
-
-// SetName updates the measurement name for the point
-func (p *point) SetName(name string) {
-	p.cachedName = ""
-	p.key = MakeKey([]byte(name), p.Tags())
-}
-
-// Time return the timestamp for the point
-func (p *point) Time() time.Time {
-	return p.time
-}
-
-// SetTime updates the timestamp for the point
-func (p *point) SetTime(t time.Time) {
-	p.time = t
-}
-
-// Tags returns the tag set for the point
-func (p *point) Tags() Tags {
-	tags := map[string]string{}
-
-	if len(p.key) != 0 {
-		pos, name := scanTo(p.key, 0, ',')
-
-		// it's an empyt key, so there are no tags
-		if len(name) == 0 {
-			return tags
-		}
-
-		i := pos + 1
-		var key, value []byte
-		for {
-			if i >= len(p.key) {
-				break
-			}
-			i, key = scanTo(p.key, i, '=')
-			i, value = scanTagValue(p.key, i+1)
-
-			if len(value) == 0 {
-				continue
-			}
-
-			tags[string(unescapeTag(key))] = string(unescapeTag(value))
-
-			i += 1
-		}
-	}
-	return tags
-}
-
-func MakeKey(name []byte, tags Tags) []byte {
-	// unescape the name and then re-escape it to avoid double escaping.
-	// The key should always be stored in escaped form.
-	return append(escapeMeasurement(unescapeMeasurement(name)), tags.HashKey()...)
-}
-
-// SetTags replaces the tags for the point
-func (p *point) SetTags(tags Tags) {
-	p.key = MakeKey([]byte(p.Name()), tags)
-}
-
-// AddTag adds or replaces a tag value for a point
-func (p *point) AddTag(key, value string) {
-	tags := p.Tags()
-	tags[key] = value
-	p.key = MakeKey([]byte(p.Name()), tags)
-}
-
-// Fields returns the fields for the point
-func (p *point) Fields() Fields {
-	if p.cachedFields != nil {
-		return p.cachedFields
-	}
-	p.cachedFields = p.unmarshalBinary()
-	return p.cachedFields
-}
-
-// AddField adds or replaces a field value for a point
-func (p *point) AddField(name string, value interface{}) {
-	fields := p.Fields()
-	fields[name] = value
-	p.fields = fields.MarshalBinary()
-	p.cachedFields = nil
-}
-
-// SetPrecision will round a time to the specified precision
-func (p *point) SetPrecision(precision string) {
-	switch precision {
-	case "n":
-	case "u":
-		p.SetTime(p.Time().Truncate(time.Microsecond))
-	case "ms":
-		p.SetTime(p.Time().Truncate(time.Millisecond))
-	case "s":
-		p.SetTime(p.Time().Truncate(time.Second))
-	case "m":
-		p.SetTime(p.Time().Truncate(time.Minute))
-	case "h":
-		p.SetTime(p.Time().Truncate(time.Hour))
-	}
-}
-
-// GetPrecisionMultiplier will return a multiplier for the precision specified
-func (p *point) GetPrecisionMultiplier(precision string) int64 {
-	d := time.Nanosecond
-	switch precision {
-	case "u":
-		d = time.Microsecond
-	case "ms":
-		d = time.Millisecond
-	case "s":
-		d = time.Second
-	case "m":
-		d = time.Minute
-	case "h":
-		d = time.Hour
-	}
-	return int64(d)
-}
-
-func (p *point) String() string {
-	if p.Time().IsZero() {
-		return fmt.Sprintf("%s %s", p.Key(), string(p.fields))
-	}
-	return fmt.Sprintf("%s %s %d", p.Key(), string(p.fields), p.UnixNano())
-}
-
-func (p *point) PrecisionString(precision string) string {
-	if p.Time().IsZero() {
-		return fmt.Sprintf("%s %s", p.Key(), string(p.fields))
-	}
-	return fmt.Sprintf("%s %s %d", p.Key(), string(p.fields),
-		p.UnixNano()/p.GetPrecisionMultiplier(precision))
-}
-
-func (p *point) RoundedString(d time.Duration) string {
-	if p.Time().IsZero() {
-		return fmt.Sprintf("%s %s", p.Key(), string(p.fields))
-	}
-	return fmt.Sprintf("%s %s %d", p.Key(), string(p.fields),
-		p.time.Round(d).UnixNano())
-}
-
-func (p *point) unmarshalBinary() Fields {
-	return newFieldsFromBinary(p.fields)
-}
-
-func (p *point) HashID() uint64 {
-	h := fnv.New64a()
-	h.Write(p.key)
-	sum := h.Sum64()
-	return sum
-}
-
-func (p *point) UnixNano() int64 {
-	return p.Time().UnixNano()
-}
-
-type Tags map[string]string
-
-func (t Tags) HashKey() []byte {
-	// Empty maps marshal to empty bytes.
-	if len(t) == 0 {
-		return nil
-	}
-
-	escaped := Tags{}
-	for k, v := range t {
-		ek := escapeTag([]byte(k))
-		ev := escapeTag([]byte(v))
-
-		if len(ev) > 0 {
-			escaped[string(ek)] = string(ev)
-		}
-	}
-
-	// Extract keys and determine final size.
-	sz := len(escaped) + (len(escaped) * 2) // separators
-	keys := make([]string, len(escaped)+1)
-	i := 0
-	for k, v := range escaped {
-		keys[i] = k
-		i += 1
-		sz += len(k) + len(v)
-	}
-	keys = keys[:i]
-	sort.Strings(keys)
-	// Generate marshaled bytes.
-	b := make([]byte, sz)
-	buf := b
-	idx := 0
-	for _, k := range keys {
-		buf[idx] = ','
-		idx += 1
-		copy(buf[idx:idx+len(k)], k)
-		idx += len(k)
-		buf[idx] = '='
-		idx += 1
-		v := escaped[k]
-		copy(buf[idx:idx+len(v)], v)
-		idx += len(v)
-	}
-	return b[:idx]
-}
-
-type Fields map[string]interface{}
-
-func parseNumber(val []byte) (interface{}, error) {
-	if val[len(val)-1] == 'i' {
-		val = val[:len(val)-1]
-		return strconv.ParseInt(string(val), 10, 64)
-	}
-	for i := 0; i < len(val); i++ {
-		// If there is a decimal or an N (NaN), I (Inf), parse as float
-		if val[i] == '.' || val[i] == 'N' || val[i] == 'n' || val[i] == 'I' || val[i] == 'i' || val[i] == 'e' {
-			return strconv.ParseFloat(string(val), 64)
-		}
-		if val[i] < '0' && val[i] > '9' {
-			return string(val), nil
-		}
-	}
-	return strconv.ParseFloat(string(val), 64)
-}
-
-func newFieldsFromBinary(buf []byte) Fields {
-	fields := Fields{}
-	var (
-		i              int
-		name, valueBuf []byte
-		value          interface{}
-		err            error
-	)
-	for {
-		if i >= len(buf) {
-			break
-		}
-
-		i, name = scanTo(buf, i, '=')
-		if len(name) == 0 {
-			continue
-		}
-		name = escape.Unescape(name)
-
-		i, valueBuf = scanFieldValue(buf, i+1)
-		if len(valueBuf) == 0 {
-			fields[string(name)] = nil
-			continue
-		}
-
-		// If the first char is a double-quote, then unmarshal as string
-		if valueBuf[0] == '"' {
-			value = unescapeStringField(string(valueBuf[1 : len(valueBuf)-1]))
-			// Check for numeric characters and special NaN or Inf
-		} else if (valueBuf[0] >= '0' && valueBuf[0] <= '9') || valueBuf[0] == '-' || valueBuf[0] == '+' || valueBuf[0] == '.' ||
-			valueBuf[0] == 'N' || valueBuf[0] == 'n' || // NaN
-			valueBuf[0] == 'I' || valueBuf[0] == 'i' { // Inf
-
-			value, err = parseNumber(valueBuf)
-			if err != nil {
-				panic(fmt.Sprintf("unable to parse number value '%v': %v", string(valueBuf), err))
-			}
-
-			// Otherwise parse it as bool
-		} else {
-			value, err = strconv.ParseBool(string(valueBuf))
-			if err != nil {
-				panic(fmt.Sprintf("unable to parse bool value '%v': %v\n", string(valueBuf), err))
-			}
-		}
-		fields[string(name)] = value
-		i += 1
-	}
-	return fields
-}
-
-// MarshalBinary encodes all the fields to their proper type and returns the binary
-// represenation
-// NOTE: uint64 is specifically not supported due to potential overflow when we decode
-// again later to an int64
-func (p Fields) MarshalBinary() []byte {
-	b := []byte{}
-	keys := make([]string, len(p))
-	i := 0
-	for k, _ := range p {
-		keys[i] = k
-		i += 1
-	}
-	sort.Strings(keys)
-
-	for _, k := range keys {
-		v := p[k]
-		b = append(b, []byte(escape.String(k))...)
-		b = append(b, '=')
-		switch t := v.(type) {
-		case int:
-			b = append(b, []byte(strconv.FormatInt(int64(t), 10))...)
-			b = append(b, 'i')
-		case int8:
-			b = append(b, []byte(strconv.FormatInt(int64(t), 10))...)
-			b = append(b, 'i')
-		case int16:
-			b = append(b, []byte(strconv.FormatInt(int64(t), 10))...)
-			b = append(b, 'i')
-		case int32:
-			b = append(b, []byte(strconv.FormatInt(int64(t), 10))...)
-			b = append(b, 'i')
-		case int64:
-			b = append(b, []byte(strconv.FormatInt(t, 10))...)
-			b = append(b, 'i')
-		case uint:
-			b = append(b, []byte(strconv.FormatInt(int64(t), 10))...)
-			b = append(b, 'i')
-		case uint8:
-			b = append(b, []byte(strconv.FormatInt(int64(t), 10))...)
-			b = append(b, 'i')
-		case uint16:
-			b = append(b, []byte(strconv.FormatInt(int64(t), 10))...)
-			b = append(b, 'i')
-		case uint32:
-			b = append(b, []byte(strconv.FormatInt(int64(t), 10))...)
-			b = append(b, 'i')
-		case float32:
-			val := []byte(strconv.FormatFloat(float64(t), 'f', -1, 32))
-			b = append(b, val...)
-		case float64:
-			val := []byte(strconv.FormatFloat(t, 'f', -1, 64))
-			b = append(b, val...)
-		case bool:
-			b = append(b, []byte(strconv.FormatBool(t))...)
-		case []byte:
-			b = append(b, t...)
-		case string:
-			b = append(b, '"')
-			b = append(b, []byte(escapeStringField(t))...)
-			b = append(b, '"')
-		case nil:
-			// skip
-		default:
-			// Can't determine the type, so convert to string
-			b = append(b, '"')
-			b = append(b, []byte(escapeStringField(fmt.Sprintf("%v", v)))...)
-			b = append(b, '"')
-
-		}
-		b = append(b, ',')
-	}
-	if len(b) > 0 {
-		return b[0 : len(b)-1]
-	}
-	return b
-}
-
-type indexedSlice struct {
-	indices []int
-	b       []byte
-}
-
-func (s *indexedSlice) Less(i, j int) bool {
-	_, a := scanTo(s.b, s.indices[i], '=')
-	_, b := scanTo(s.b, s.indices[j], '=')
-	return bytes.Compare(a, b) < 0
-}
-
-func (s *indexedSlice) Swap(i, j int) {
-	s.indices[i], s.indices[j] = s.indices[j], s.indices[i]
-}
-
-func (s *indexedSlice) Len() int {
-	return len(s.indices)
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/models/points_test.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/models/points_test.go
deleted file mode 100644
index d4b9f498f..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/models/points_test.go
+++ /dev/null
@@ -1,1575 +0,0 @@
-package models_test
-
-import (
-	"bytes"
-	"fmt"
-	"math"
-	"math/rand"
-	"reflect"
-	"strconv"
-	"strings"
-	"testing"
-	"time"
-
-	"github.com/influxdb/influxdb/models"
-)
-
-var (
-	tags       = models.Tags{"foo": "bar", "apple": "orange", "host": "serverA", "region": "uswest"}
-	maxFloat64 = strconv.FormatFloat(math.MaxFloat64, 'f', 1, 64)
-	minFloat64 = strconv.FormatFloat(-math.MaxFloat64, 'f', 1, 64)
-)
-
-func TestMarshal(t *testing.T) {
-	got := tags.HashKey()
-	if exp := ",apple=orange,foo=bar,host=serverA,region=uswest"; string(got) != exp {
-		t.Log("got: ", string(got))
-		t.Log("exp: ", exp)
-		t.Error("invalid match")
-	}
-}
-
-func BenchmarkMarshal(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		tags.HashKey()
-	}
-}
-
-func BenchmarkParsePointNoTags(b *testing.B) {
-	line := `cpu value=1i 1000000000`
-	for i := 0; i < b.N; i++ {
-		models.ParsePoints([]byte(line))
-		b.SetBytes(int64(len(line)))
-	}
-}
-
-func BenchmarkParsePointsTagsSorted2(b *testing.B) {
-	line := `cpu,host=serverA,region=us-west value=1i 1000000000`
-	for i := 0; i < b.N; i++ {
-		models.ParsePoints([]byte(line))
-		b.SetBytes(int64(len(line)))
-	}
-}
-
-func BenchmarkParsePointsTagsSorted5(b *testing.B) {
-	line := `cpu,env=prod,host=serverA,region=us-west,target=servers,zone=1c value=1i 1000000000`
-	for i := 0; i < b.N; i++ {
-		models.ParsePoints([]byte(line))
-		b.SetBytes(int64(len(line)))
-	}
-}
-
-func BenchmarkParsePointsTagsSorted10(b *testing.B) {
-	line := `cpu,env=prod,host=serverA,region=us-west,tag1=value1,tag2=value2,tag3=value3,tag4=value4,tag5=value5,target=servers,zone=1c value=1i 1000000000`
-	for i := 0; i < b.N; i++ {
-		models.ParsePoints([]byte(line))
-		b.SetBytes(int64(len(line)))
-	}
-}
-
-func BenchmarkParsePointsTagsUnSorted2(b *testing.B) {
-	line := `cpu,region=us-west,host=serverA value=1i 1000000000`
-	for i := 0; i < b.N; i++ {
-		pt, _ := models.ParsePoints([]byte(line))
-		b.SetBytes(int64(len(line)))
-		pt[0].Key()
-	}
-}
-
-func BenchmarkParsePointsTagsUnSorted5(b *testing.B) {
-	line := `cpu,region=us-west,host=serverA,env=prod,target=servers,zone=1c value=1i 1000000000`
-	for i := 0; i < b.N; i++ {
-		pt, _ := models.ParsePoints([]byte(line))
-		b.SetBytes(int64(len(line)))
-		pt[0].Key()
-	}
-}
-
-func BenchmarkParsePointsTagsUnSorted10(b *testing.B) {
-	line := `cpu,region=us-west,host=serverA,env=prod,target=servers,zone=1c,tag1=value1,tag2=value2,tag3=value3,tag4=value4,tag5=value5 value=1i 1000000000`
-	for i := 0; i < b.N; i++ {
-		pt, _ := models.ParsePoints([]byte(line))
-		b.SetBytes(int64(len(line)))
-		pt[0].Key()
-	}
-}
-
-func test(t *testing.T, line string, point models.Point) {
-	pts, err := models.ParsePointsWithPrecision([]byte(line), time.Unix(0, 0), "n")
-	if err != nil {
-		t.Fatalf(`ParsePoints("%s") mismatch. got %v, exp nil`, line, err)
-	}
-
-	if exp := 1; len(pts) != exp {
-		t.Fatalf(`ParsePoints("%s") len mismatch. got %d, exp %d`, line, len(pts), exp)
-	}
-
-	if exp := point.Key(); !bytes.Equal(pts[0].Key(), exp) {
-		t.Errorf("ParsePoints(\"%s\") key mismatch.\ngot %v\nexp %v", line, string(pts[0].Key()), string(exp))
-	}
-
-	if exp := len(point.Tags()); len(pts[0].Tags()) != exp {
-		t.Errorf(`ParsePoints("%s") tags mismatch. got %v, exp %v`, line, pts[0].Tags(), exp)
-	}
-
-	for tag, value := range point.Tags() {
-		if pts[0].Tags()[tag] != value {
-			t.Errorf(`ParsePoints("%s") tags mismatch. got %v, exp %v`, line, pts[0].Tags()[tag], value)
-		}
-	}
-
-	for name, value := range point.Fields() {
-		val := pts[0].Fields()[name]
-		expfval, ok := val.(float64)
-
-		if ok && math.IsNaN(expfval) {
-			gotfval, ok := value.(float64)
-			if ok && !math.IsNaN(gotfval) {
-				t.Errorf(`ParsePoints("%s") field '%s' mismatch. exp NaN`, line, name)
-			}
-		} else if !reflect.DeepEqual(pts[0].Fields()[name], value) {
-			t.Errorf(`ParsePoints("%s") field '%s' mismatch. got %v, exp %v`, line, name, pts[0].Fields()[name], value)
-		}
-	}
-
-	if !pts[0].Time().Equal(point.Time()) {
-		t.Errorf(`ParsePoints("%s") time mismatch. got %v, exp %v`, line, pts[0].Time(), point.Time())
-	}
-
-	if !strings.HasPrefix(pts[0].String(), line) {
-		t.Errorf("ParsePoints string mismatch.\ngot: %v\nexp: %v", pts[0].String(), line)
-	}
-}
-
-func TestParsePointNoValue(t *testing.T) {
-	pts, err := models.ParsePointsString("")
-	if err != nil {
-		t.Errorf(`ParsePoints("%s") mismatch. got %v, exp nil`, "", err)
-	}
-
-	if exp := 0; len(pts) != exp {
-		t.Errorf(`ParsePoints("%s") len mismatch. got %v, exp %v`, "", len(pts), exp)
-	}
-}
-
-func TestParsePointWhitespaceValue(t *testing.T) {
-	pts, err := models.ParsePointsString(" ")
-	if err != nil {
-		t.Errorf(`ParsePoints("%s") mismatch. got %v, exp nil`, "", err)
-	}
-
-	if exp := 0; len(pts) != exp {
-		t.Errorf(`ParsePoints("%s") len mismatch. got %v, exp %v`, "", len(pts), exp)
-	}
-}
-
-func TestParsePointSingleEquals(t *testing.T) {
-	pts, err := models.ParsePointsString("=")
-	if err == nil {
-		t.Errorf(`ParsePoints("%s") mismatch. expected error`, "=")
-	}
-
-	if exp := 0; len(pts) != exp {
-		t.Errorf(`ParsePoints("%s") len mismatch. got %v, exp %v`, "", len(pts), exp)
-	}
-}
-
-func TestParsePointNoFields(t *testing.T) {
-	_, err := models.ParsePointsString("cpu_load_short,host=server01,region=us-west")
-	if err == nil {
-		t.Errorf(`ParsePoints("%s") mismatch. got nil, exp error`, "cpu_load_short,host=server01,region=us-west")
-	}
-
-	_, err = models.ParsePointsString("cpu")
-	if err == nil {
-		t.Errorf(`ParsePoints("%s") mismatch. got nil, exp error`, "cpu")
-	}
-
-	_, err = models.ParsePointsString("cpu,")
-	if err == nil {
-		t.Errorf(`ParsePoints("%s") mismatch. got nil, exp error`, "cpu,")
-	}
-
-	_, err = models.ParsePointsString("cpu, value=1")
-	if err == nil {
-		t.Errorf(`ParsePoints("%s") mismatch. got nil, exp error`, "cpu, value=1")
-	}
-
-	_, err = models.ParsePointsString("cpu,,, value=1")
-	if err == nil {
-		t.Errorf(`ParsePoints("%s") mismatch. got nil, exp error`, "cpu,,, value=1")
-	}
-}
-
-func TestParsePointNoTimestamp(t *testing.T) {
-	test(t, "cpu value=1", models.MustNewPoint("cpu", nil, nil, time.Unix(0, 0)))
-}
-
-func TestParsePointMissingQuote(t *testing.T) {
-	_, err := models.ParsePointsString(`cpu,host=serverA value="test`)
-	if err == nil {
-		t.Errorf(`ParsePoints("%s") mismatch. got nil, exp error`, "cpu")
-	}
-}
-
-func TestParsePointMissingTagKey(t *testing.T) {
-	_, err := models.ParsePointsString(`cpu,host=serverA,=us-east value=1i`)
-	if err == nil {
-		t.Errorf(`ParsePoints("%s") mismatch. got nil, exp error`, `cpu,host=serverA,=us-east value=1i`)
-	}
-
-	_, err = models.ParsePointsString(`cpu,host=serverAa\,,=us-east value=1i`)
-	if err == nil {
-		t.Errorf(`ParsePoints("%s") mismatch. got nil, exp error`, `cpu,host=serverAa\,,=us-east value=1i`)
-	}
-
-	_, err = models.ParsePointsString(`cpu,host=serverA\,,=us-east value=1i`)
-	if err == nil {
-		t.Errorf(`ParsePoints("%s") mismatch. got nil, exp error`, `cpu,host=serverA\,,=us-east value=1i`)
-	}
-
-	_, err = models.ParsePointsString(`cpu,host=serverA,\ =us-east value=1i`)
-	if err != nil {
-		t.Errorf(`ParsePoints("%s") mismatch. got %v, exp nil`, `cpu,host=serverA,\ =us-east value=1i`, err)
-	}
-}
-
-func TestParsePointMissingTagValue(t *testing.T) {
-	_, err := models.ParsePointsString(`cpu,host value=1i`)
-	if err == nil {
-		t.Errorf(`ParsePoints("%s") mismatch. got nil, exp error`, `cpu,host value=1i`)
-	}
-
-	_, err = models.ParsePointsString(`cpu,host=serverA,region value=1i`)
-	if err == nil {
-		t.Errorf(`ParsePoints("%s") mismatch. got nil, exp error`, `cpu,host=serverA,region value=1i`)
-	}
-	_, err = models.ParsePointsString(`cpu,host=serverA,region= value=1i`)
-	if err == nil {
-		t.Errorf(`ParsePoints("%s") mismatch. got nil, exp error`, `cpu,host=serverA,region= value=1i`)
-	}
-	_, err = models.ParsePointsString(`cpu,host=serverA,region=,zone=us-west value=1i`)
-	if err == nil {
-		t.Errorf(`ParsePoints("%s") mismatch. got nil, exp error`, `cpu,host=serverA,region=,zone=us-west value=1i`)
-	}
-}
-
-func TestParsePointMissingFieldName(t *testing.T) {
-	_, err := models.ParsePointsString(`cpu,host=serverA,region=us-west =`)
-	if err == nil {
-		t.Errorf(`ParsePoints("%s") mismatch. got nil, exp error`, `cpu,host=serverA,region=us-west =`)
-	}
-
-	_, err = models.ParsePointsString(`cpu,host=serverA,region=us-west =123i`)
-	if err == nil {
-		t.Errorf(`ParsePoints("%s") mismatch. got nil, exp error`, `cpu,host=serverA,region=us-west =123i`)
-	}
-
-	_, err = models.ParsePointsString(`cpu,host=serverA,region=us-west a\ =123i`)
-	if err != nil {
-		t.Errorf(`ParsePoints("%s") mismatch. got nil, exp error`, `cpu,host=serverA,region=us-west a\ =123i`)
-	}
-	_, err = models.ParsePointsString(`cpu,host=serverA,region=us-west value=123i,=456i`)
-	if err == nil {
-		t.Errorf(`ParsePoints("%s") mismatch. got nil, exp error`, `cpu,host=serverA,region=us-west value=123i,=456i`)
-	}
-}
-
-func TestParsePointMissingFieldValue(t *testing.T) {
-	_, err := models.ParsePointsString(`cpu,host=serverA,region=us-west value=`)
-	if err == nil {
-		t.Errorf(`ParsePoints("%s") mismatch. got nil, exp error`, `cpu,host=serverA,region=us-west value=`)
-	}
-
-	_, err = models.ParsePointsString(`cpu,host=serverA,region=us-west value= 1000000000i`)
-	if err == nil {
-		t.Errorf(`ParsePoints("%s") mismatch. got nil, exp error`, `cpu,host=serverA,region=us-west value= 1000000000i`)
-	}
-
-	_, err = models.ParsePointsString(`cpu,host=serverA,region=us-west value=,value2=1i`)
-	if err == nil {
-		t.Errorf(`ParsePoints("%s") mismatch. got nil, exp error`, `cpu,host=serverA,region=us-west value=,value2=1i`)
-	}
-
-	_, err = models.ParsePointsString(`cpu,host=server01,region=us-west 1434055562000000000i`)
-	if err == nil {
-		t.Errorf(`ParsePoints("%s") mismatch. got nil, exp error`, `cpu,host=server01,region=us-west 1434055562000000000i`)
-	}
-
-	_, err = models.ParsePointsString(`cpu,host=server01,region=us-west value=1i,b`)
-	if err == nil {
-		t.Errorf(`ParsePoints("%s") mismatch. got nil, exp error`, `cpu,host=server01,region=us-west value=1i,b`)
-	}
-}
-
-func TestParsePointBadNumber(t *testing.T) {
-	_, err := models.ParsePointsString(`cpu,host=serverA,region=us-west value=1a`)
-	if err == nil {
-		t.Errorf(`ParsePoints("%s") mismatch. got nil, exp error`, `cpu,host=serverA,region=us-west value=1a`)
-	}
-	_, err = models.ParsePointsString(`cpu,host=serverA,region=us-west value=1ii`)
-	if err == nil {
-		t.Errorf(`ParsePoints("%s") mismatch. got nil, exp error`, `cpu,host=serverA,region=us-west value=1ii`)
-	}
-	_, err = models.ParsePointsString(`cpu,host=serverA,region=us-west value=1.0i`)
-	if err == nil {
-		t.Errorf(`ParsePoints("%s") mismatch. got nil, exp error`, `cpu,host=serverA,region=us-west value=1.0i`)
-	}
-}
-
-func TestParsePointMaxInt64(t *testing.T) {
-	// out of range
-	_, err := models.ParsePointsString(`cpu,host=serverA,region=us-west value=9223372036854775808i`)
-	exp := `unable to parse 'cpu,host=serverA,region=us-west value=9223372036854775808i': unable to parse integer 9223372036854775808: strconv.ParseInt: parsing "9223372036854775808": value out of range`
-	if err == nil || (err != nil && err.Error() != exp) {
-		t.Fatalf("Error mismatch:\nexp: %s\ngot: %v", exp, err)
-	}
-
-	// max int
-	p, err := models.ParsePointsString(`cpu,host=serverA,region=us-west value=9223372036854775807i`)
-	if err != nil {
-		t.Fatalf(`ParsePoints("%s") mismatch. got %v, exp nil`, `cpu,host=serverA,region=us-west value=9223372036854775807i`, err)
-	}
-	if exp, got := int64(9223372036854775807), p[0].Fields()["value"].(int64); exp != got {
-		t.Fatalf("ParsePoints Value mismatch. \nexp: %v\ngot: %v", exp, got)
-	}
-
-	// leading zeros
-	_, err = models.ParsePointsString(`cpu,host=serverA,region=us-west value=0009223372036854775807i`)
-	if err != nil {
-		t.Fatalf(`ParsePoints("%s") mismatch. got %v, exp nil`, `cpu,host=serverA,region=us-west value=0009223372036854775807i`, err)
-	}
-}
-
-func TestParsePointMinInt64(t *testing.T) {
-	// out of range
-	_, err := models.ParsePointsString(`cpu,host=serverA,region=us-west value=-9223372036854775809i`)
-	if err == nil {
-		t.Errorf(`ParsePoints("%s") mismatch. got nil, exp error`, `cpu,host=serverA,region=us-west value=-9223372036854775809i`)
-	}
-
-	// min int
-	_, err = models.ParsePointsString(`cpu,host=serverA,region=us-west value=-9223372036854775808i`)
-	if err != nil {
-		t.Errorf(`ParsePoints("%s") mismatch. got %v, exp nil`, `cpu,host=serverA,region=us-west value=-9223372036854775808i`, err)
-	}
-
-	// leading zeros
-	_, err = models.ParsePointsString(`cpu,host=serverA,region=us-west value=-0009223372036854775808i`)
-	if err != nil {
-		t.Errorf(`ParsePoints("%s") mismatch. got %v, exp nil`, `cpu,host=serverA,region=us-west value=-0009223372036854775808i`, err)
-	}
-}
-
-func TestParsePointMaxFloat64(t *testing.T) {
-	// out of range
-	_, err := models.ParsePointsString(fmt.Sprintf(`cpu,host=serverA,region=us-west value=%s`, "1"+string(maxFloat64)))
-	if err == nil {
-		t.Errorf(`ParsePoints("%s") mismatch. got nil, exp error`, `cpu,host=serverA,region=us-west value=...`)
-	}
-
-	// max float
-	_, err = models.ParsePointsString(fmt.Sprintf(`cpu,host=serverA,region=us-west value=%s`, string(maxFloat64)))
-	if err != nil {
-		t.Errorf(`ParsePoints("%s") mismatch. got %v, exp nil`, `cpu,host=serverA,region=us-west value=9223372036854775807`, err)
-	}
-
-	// leading zeros
-	_, err = models.ParsePointsString(fmt.Sprintf(`cpu,host=serverA,region=us-west value=%s`, "0000"+string(maxFloat64)))
-	if err != nil {
-		t.Errorf(`ParsePoints("%s") mismatch. got %v, exp nil`, `cpu,host=serverA,region=us-west value=0009223372036854775807`, err)
-	}
-}
-
-func TestParsePointMinFloat64(t *testing.T) {
-	// out of range
-	_, err := models.ParsePointsString(fmt.Sprintf(`cpu,host=serverA,region=us-west value=%s`, "-1"+string(minFloat64)[1:]))
-	if err == nil {
-		t.Errorf(`ParsePoints("%s") mismatch. got nil, exp error`, `cpu,host=serverA,region=us-west value=...`)
-	}
-
-	// min float
-	_, err = models.ParsePointsString(fmt.Sprintf(`cpu,host=serverA,region=us-west value=%s`, string(minFloat64)))
-	if err != nil {
-		t.Errorf(`ParsePoints("%s") mismatch. got %v, exp nil`, `cpu,host=serverA,region=us-west value=...`, err)
-	}
-
-	// leading zeros
-	_, err = models.ParsePointsString(fmt.Sprintf(`cpu,host=serverA,region=us-west value=%s`, "-0000000"+string(minFloat64)[1:]))
-	if err != nil {
-		t.Errorf(`ParsePoints("%s") mismatch. got %v, exp nil`, `cpu,host=serverA,region=us-west value=...`, err)
-	}
-}
-
-func TestParsePointNumberNonNumeric(t *testing.T) {
-	_, err := models.ParsePointsString(`cpu,host=serverA,region=us-west value=.1a`)
-	if err == nil {
-		t.Errorf(`ParsePoints("%s") mismatch. got nil, exp error`, `cpu,host=serverA,region=us-west value=.1a`)
-	}
-}
-
-func TestParsePointNegativeWrongPlace(t *testing.T) {
-	_, err := models.ParsePointsString(`cpu,host=serverA,region=us-west value=0.-1`)
-	if err == nil {
-		t.Errorf(`ParsePoints("%s") mismatch. got nil, exp error`, `cpu,host=serverA,region=us-west value=0.-1`)
-	}
-}
-
-func TestParsePointOnlyNegativeSign(t *testing.T) {
-	_, err := models.ParsePointsString(`cpu,host=serverA,region=us-west value=-`)
-	if err == nil {
-		t.Errorf(`ParsePoints("%s") mismatch. got nil, exp error`, `cpu,host=serverA,region=us-west value=-`)
-	}
-}
-
-func TestParsePointFloatMultipleDecimals(t *testing.T) {
-	_, err := models.ParsePointsString(`cpu,host=serverA,region=us-west value=1.1.1`)
-	if err == nil {
-		t.Errorf(`ParsePoints("%s") mismatch. got nil, exp error`, `cpu,host=serverA,region=us-west value=1.1.1`)
-	}
-}
-
-func TestParsePointInteger(t *testing.T) {
-	_, err := models.ParsePointsString(`cpu,host=serverA,region=us-west value=1i`)
-	if err != nil {
-		t.Errorf(`ParsePoints("%s") mismatch. got %v, exp nil`, `cpu,host=serverA,region=us-west value=1i`, err)
-	}
-}
-
-func TestParsePointNegativeInteger(t *testing.T) {
-	_, err := models.ParsePointsString(`cpu,host=serverA,region=us-west value=-1i`)
-	if err != nil {
-		t.Errorf(`ParsePoints("%s") mismatch. got %v, exp nil`, `cpu,host=serverA,region=us-west value=-1i`, err)
-	}
-}
-
-func TestParsePointNegativeFloat(t *testing.T) {
-	_, err := models.ParsePointsString(`cpu,host=serverA,region=us-west value=-1.0`)
-	if err != nil {
-		t.Errorf(`ParsePoints("%s") mismatch. got %v, exp nil`, `cpu,host=serverA,region=us-west value=-1.0`, err)
-	}
-}
-
-func TestParsePointFloatNoLeadingDigit(t *testing.T) {
-	_, err := models.ParsePointsString(`cpu,host=serverA,region=us-west value=.1`)
-	if err != nil {
-		t.Errorf(`ParsePoints("%s") mismatch. got %v, exp nil`, `cpu,host=serverA,region=us-west value=-1.0`, err)
-	}
-}
-
-func TestParsePointFloatScientific(t *testing.T) {
-	_, err := models.ParsePointsString(`cpu,host=serverA,region=us-west value=1.0e4`)
-	if err != nil {
-		t.Errorf(`ParsePoints("%s") mismatch. got %v, exp nil`, `cpu,host=serverA,region=us-west value=1.0e4`, err)
-	}
-
-	pts, err := models.ParsePointsString(`cpu,host=serverA,region=us-west value=1e4`)
-	if err != nil {
-		t.Errorf(`ParsePoints("%s") mismatch. got %v, exp nil`, `cpu,host=serverA,region=us-west value=1.0e4`, err)
-	}
-
-	if pts[0].Fields()["value"] != 1e4 {
-		t.Errorf(`ParsePoints("%s") mismatch. got %v, exp nil`, `cpu,host=serverA,region=us-west value=1e4`, err)
-	}
-}
-
-func TestParsePointFloatScientificUpper(t *testing.T) {
-	_, err := models.ParsePointsString(`cpu,host=serverA,region=us-west value=1.0E4`)
-	if err != nil {
-		t.Errorf(`ParsePoints("%s") mismatch. got %v, exp nil`, `cpu,host=serverA,region=us-west value=1.0E4`, err)
-	}
-
-	pts, err := models.ParsePointsString(`cpu,host=serverA,region=us-west value=1E4`)
-	if err != nil {
-		t.Errorf(`ParsePoints("%s") mismatch. got %v, exp nil`, `cpu,host=serverA,region=us-west value=1.0E4`, err)
-	}
-
-	if pts[0].Fields()["value"] != 1e4 {
-		t.Errorf(`ParsePoints("%s") mismatch. got %v, exp nil`, `cpu,host=serverA,region=us-west value=1E4`, err)
-	}
-}
-
-func TestParsePointFloatScientificDecimal(t *testing.T) {
-	_, err := models.ParsePointsString(`cpu,host=serverA,region=us-west value=1.0e-4`)
-	if err != nil {
-		t.Errorf(`ParsePoints("%s") mismatch. got %v, exp nil`, `cpu,host=serverA,region=us-west value=1.0e-4`, err)
-	}
-}
-
-func TestParsePointFloatNegativeScientific(t *testing.T) {
-	_, err := models.ParsePointsString(`cpu,host=serverA,region=us-west value=-1.0e-4`)
-	if err != nil {
-		t.Errorf(`ParsePoints("%s") mismatch. got %v, exp nil`, `cpu,host=serverA,region=us-west value=-1.0e-4`, err)
-	}
-}
-
-func TestParsePointBooleanInvalid(t *testing.T) {
-	_, err := models.ParsePointsString(`cpu,host=serverA,region=us-west value=a`)
-	if err == nil {
-		t.Errorf(`ParsePoints("%s") mismatch. got nil, exp error`, `cpu,host=serverA,region=us-west value=a`)
-	}
-}
-
-func TestParsePointScientificIntInvalid(t *testing.T) {
-	_, err := models.ParsePointsString(`cpu,host=serverA,region=us-west value=9ie10`)
-	if err == nil {
-		t.Errorf(`ParsePoints("%s") mismatch. got nil, exp error`, `cpu,host=serverA,region=us-west value=9ie10`)
-	}
-
-	_, err = models.ParsePointsString(`cpu,host=serverA,region=us-west value=9e10i`)
-	if err == nil {
-		t.Errorf(`ParsePoints("%s") mismatch. got nil, exp error`, `cpu,host=serverA,region=us-west value=9e10i`)
-	}
-
-}
-
-func TestParsePointUnescape(t *testing.T) {
-	test(t, `foo\,bar value=1i`,
-		models.MustNewPoint(
-			"foo,bar", // comma in the name
-			models.Tags{},
-			models.Fields{
-				"value": 1,
-			},
-			time.Unix(0, 0)))
-
-	// commas in measurement name
-	test(t, `cpu\,main,regions=east\,west value=1.0`,
-		models.MustNewPoint(
-			"cpu,main", // comma in the name
-			models.Tags{
-				"regions": "east,west",
-			},
-			models.Fields{
-				"value": 1.0,
-			},
-			time.Unix(0, 0)))
-
-	// spaces in measurement name
-	test(t, `cpu\ load,region=east value=1.0`,
-		models.MustNewPoint(
-			"cpu load", // space in the name
-			models.Tags{
-				"region": "east",
-			},
-			models.Fields{
-				"value": 1.0,
-			},
-			time.Unix(0, 0)))
-
-	// commas in tag names
-	test(t, `cpu,region\,zone=east value=1.0`,
-		models.MustNewPoint("cpu",
-			models.Tags{
-				"region,zone": "east", // comma in the tag key
-			},
-			models.Fields{
-				"value": 1.0,
-			},
-			time.Unix(0, 0)))
-
-	// spaces in tag names
-	test(t, `cpu,region\ zone=east value=1.0`,
-		models.MustNewPoint("cpu",
-			models.Tags{
-				"region zone": "east", // comma in the tag key
-			},
-			models.Fields{
-				"value": 1.0,
-			},
-			time.Unix(0, 0)))
-
-	// commas in tag values
-	test(t, `cpu,regions=east\,west value=1.0`,
-		models.MustNewPoint("cpu",
-			models.Tags{
-				"regions": "east,west", // comma in the tag value
-			},
-			models.Fields{
-				"value": 1.0,
-			},
-			time.Unix(0, 0)))
-
-	// spaces in tag values
-	test(t, `cpu,regions=east\ west value=1.0`,
-		models.MustNewPoint("cpu",
-			models.Tags{
-				"regions": "east west", // comma in the tag value
-			},
-			models.Fields{
-				"value": 1.0,
-			},
-			time.Unix(0, 0)))
-
-	// commas in field keys
-	test(t, `cpu,regions=east value\,ms=1.0`,
-		models.MustNewPoint("cpu",
-			models.Tags{
-				"regions": "east",
-			},
-			models.Fields{
-				"value,ms": 1.0, // comma in the field keys
-			},
-			time.Unix(0, 0)))
-
-	// spaces in field keys
-	test(t, `cpu,regions=east value\ ms=1.0`,
-		models.MustNewPoint("cpu",
-			models.Tags{
-				"regions": "east",
-			},
-			models.Fields{
-				"value ms": 1.0, // comma in the field keys
-			},
-			time.Unix(0, 0)))
-
-	// tag with no value
-	test(t, `cpu,regions=east value="1"`,
-		models.MustNewPoint("cpu",
-			models.Tags{
-				"regions": "east",
-				"foobar":  "",
-			},
-			models.Fields{
-				"value": "1",
-			},
-			time.Unix(0, 0)))
-
-	// commas in field values
-	test(t, `cpu,regions=east value="1,0"`,
-		models.MustNewPoint("cpu",
-			models.Tags{
-				"regions": "east",
-			},
-			models.Fields{
-				"value": "1,0", // comma in the field value
-			},
-			time.Unix(0, 0)))
-
-	// random character escaped
-	test(t, `cpu,regions=eas\t value=1.0`,
-		models.MustNewPoint(
-			"cpu",
-			models.Tags{
-				"regions": "eas\\t",
-			},
-			models.Fields{
-				"value": 1.0,
-			},
-			time.Unix(0, 0)))
-
-	// field keys using escape char.
-	test(t, `cpu \a=1i`,
-		models.MustNewPoint(
-			"cpu",
-			models.Tags{},
-			models.Fields{
-				"\\a": 1, // Left as parsed since it's not a known escape sequence.
-			},
-			time.Unix(0, 0)))
-
-	// measurement, tag and tag value with equals
-	test(t, `cpu=load,equals\=foo=tag\=value value=1i`,
-		models.MustNewPoint(
-			"cpu=load", // Not escaped
-			models.Tags{
-				"equals=foo": "tag=value", // Tag and value unescaped
-			},
-			models.Fields{
-				"value": 1,
-			},
-			time.Unix(0, 0)))
-
-}
-
-func TestParsePointWithTags(t *testing.T) {
-	test(t,
-		"cpu,host=serverA,region=us-east value=1.0 1000000000",
-		models.MustNewPoint("cpu",
-			models.Tags{"host": "serverA", "region": "us-east"},
-			models.Fields{"value": 1.0}, time.Unix(1, 0)))
-}
-
-func TestParsPointWithDuplicateTags(t *testing.T) {
-	_, err := models.ParsePoints([]byte(`cpu,host=serverA,host=serverB value=1i 1000000000`))
-	if err == nil {
-		t.Fatalf(`ParsePoint() expected error. got nil`)
-	}
-}
-
-func TestParsePointWithStringField(t *testing.T) {
-	test(t, `cpu,host=serverA,region=us-east value=1.0,str="foo",str2="bar" 1000000000`,
-		models.MustNewPoint("cpu",
-			models.Tags{
-				"host":   "serverA",
-				"region": "us-east",
-			},
-			models.Fields{
-				"value": 1.0,
-				"str":   "foo",
-				"str2":  "bar",
-			},
-			time.Unix(1, 0)),
-	)
-
-	test(t, `cpu,host=serverA,region=us-east str="foo \" bar" 1000000000`,
-		models.MustNewPoint("cpu",
-			models.Tags{
-				"host":   "serverA",
-				"region": "us-east",
-			},
-			models.Fields{
-				"str": `foo " bar`,
-			},
-			time.Unix(1, 0)),
-	)
-
-}
-
-func TestParsePointWithStringWithSpaces(t *testing.T) {
-	test(t, `cpu,host=serverA,region=us-east value=1.0,str="foo bar" 1000000000`,
-		models.MustNewPoint(
-			"cpu",
-			models.Tags{
-				"host":   "serverA",
-				"region": "us-east",
-			},
-			models.Fields{
-				"value": 1.0,
-				"str":   "foo bar", // spaces in string value
-			},
-			time.Unix(1, 0)),
-	)
-}
-
-func TestParsePointWithStringWithNewline(t *testing.T) {
-	test(t, "cpu,host=serverA,region=us-east value=1.0,str=\"foo\nbar\" 1000000000",
-		models.MustNewPoint(
-			"cpu",
-			models.Tags{
-				"host":   "serverA",
-				"region": "us-east",
-			},
-			models.Fields{
-				"value": 1.0,
-				"str":   "foo\nbar", // newline in string value
-			},
-			time.Unix(1, 0)),
-	)
-}
-
-func TestParsePointWithStringWithCommas(t *testing.T) {
-	// escaped comma
-	test(t, `cpu,host=serverA,region=us-east value=1.0,str="foo\,bar" 1000000000`,
-		models.MustNewPoint(
-			"cpu",
-			models.Tags{
-				"host":   "serverA",
-				"region": "us-east",
-			},
-			models.Fields{
-				"value": 1.0,
-				"str":   `foo\,bar`, // commas in string value
-			},
-			time.Unix(1, 0)),
-	)
-
-	// non-escaped comma
-	test(t, `cpu,host=serverA,region=us-east value=1.0,str="foo,bar" 1000000000`,
-		models.MustNewPoint(
-			"cpu",
-			models.Tags{
-				"host":   "serverA",
-				"region": "us-east",
-			},
-			models.Fields{
-				"value": 1.0,
-				"str":   "foo,bar", // commas in string value
-			},
-			time.Unix(1, 0)),
-	)
-}
-
-func TestParsePointQuotedMeasurement(t *testing.T) {
-	// non-escaped comma
-	test(t, `"cpu",host=serverA,region=us-east value=1.0 1000000000`,
-		models.MustNewPoint(
-			`"cpu"`,
-			models.Tags{
-				"host":   "serverA",
-				"region": "us-east",
-			},
-			models.Fields{
-				"value": 1.0,
-			},
-			time.Unix(1, 0)),
-	)
-}
-
-func TestParsePointQuotedTags(t *testing.T) {
-	test(t, `cpu,"host"="serverA",region=us-east value=1.0 1000000000`,
-		models.MustNewPoint(
-			"cpu",
-			models.Tags{
-				`"host"`: `"serverA"`,
-				"region": "us-east",
-			},
-			models.Fields{
-				"value": 1.0,
-			},
-			time.Unix(1, 0)),
-	)
-}
-
-func TestParsePointsUnbalancedQuotedTags(t *testing.T) {
-	pts, err := models.ParsePointsString("baz,mytag=\"a x=1 1441103862125\nbaz,mytag=a z=1 1441103862126")
-	if err != nil {
-		t.Fatalf("ParsePoints failed: %v", err)
-	}
-
-	if exp := 2; len(pts) != exp {
-		t.Fatalf("ParsePoints count mismatch. got %v, exp %v", len(pts), exp)
-	}
-
-	// Expected " in the tag value
-	exp := models.MustNewPoint("baz", models.Tags{"mytag": `"a`},
-		models.Fields{"x": float64(1)}, time.Unix(0, 1441103862125))
-
-	if pts[0].String() != exp.String() {
-		t.Errorf("Point mismatch:\ngot: %v\nexp: %v", pts[0].String(), exp.String())
-	}
-
-	// Expected two points to ensure we did not overscan the line
-	exp = models.MustNewPoint("baz", models.Tags{"mytag": `a`},
-		models.Fields{"z": float64(1)}, time.Unix(0, 1441103862126))
-
-	if pts[1].String() != exp.String() {
-		t.Errorf("Point mismatch:\ngot: %v\nexp: %v", pts[1].String(), exp.String())
-	}
-
-}
-
-func TestParsePointEscapedStringsAndCommas(t *testing.T) {
-	// non-escaped comma and quotes
-	test(t, `cpu,host=serverA,region=us-east value="{Hello\"{,}\" World}" 1000000000`,
-		models.MustNewPoint(
-			"cpu",
-			models.Tags{
-				"host":   "serverA",
-				"region": "us-east",
-			},
-			models.Fields{
-				"value": `{Hello"{,}" World}`,
-			},
-			time.Unix(1, 0)),
-	)
-
-	// escaped comma and quotes
-	test(t, `cpu,host=serverA,region=us-east value="{Hello\"{\,}\" World}" 1000000000`,
-		models.MustNewPoint(
-			"cpu",
-			models.Tags{
-				"host":   "serverA",
-				"region": "us-east",
-			},
-			models.Fields{
-				"value": `{Hello"{\,}" World}`,
-			},
-			time.Unix(1, 0)),
-	)
-}
-
-func TestParsePointWithStringWithEquals(t *testing.T) {
-	test(t, `cpu,host=serverA,region=us-east str="foo=bar",value=1.0 1000000000`,
-		models.MustNewPoint(
-			"cpu",
-			models.Tags{
-				"host":   "serverA",
-				"region": "us-east",
-			},
-			models.Fields{
-				"value": 1.0,
-				"str":   "foo=bar", // spaces in string value
-			},
-			time.Unix(1, 0)),
-	)
-}
-
-func TestParsePointWithStringWithBackslash(t *testing.T) {
-	test(t, `cpu value="test\\\"" 1000000000`,
-		models.MustNewPoint(
-			"cpu",
-			models.Tags{},
-			models.Fields{
-				"value": `test\"`,
-			},
-			time.Unix(1, 0)),
-	)
-
-	test(t, `cpu value="test\\" 1000000000`,
-		models.MustNewPoint(
-			"cpu",
-			models.Tags{},
-			models.Fields{
-				"value": `test\`,
-			},
-			time.Unix(1, 0)),
-	)
-
-	test(t, `cpu value="test\\\"" 1000000000`,
-		models.MustNewPoint(
-			"cpu",
-			models.Tags{},
-			models.Fields{
-				"value": `test\"`,
-			},
-			time.Unix(1, 0)),
-	)
-
-	test(t, `cpu value="test\"" 1000000000`,
-		models.MustNewPoint(
-			"cpu",
-			models.Tags{},
-			models.Fields{
-				"value": `test"`,
-			},
-			time.Unix(1, 0)),
-	)
-}
-
-func TestParsePointWithBoolField(t *testing.T) {
-	test(t, `cpu,host=serverA,region=us-east true=true,t=t,T=T,TRUE=TRUE,True=True,false=false,f=f,F=F,FALSE=FALSE,False=False 1000000000`,
-		models.MustNewPoint(
-			"cpu",
-			models.Tags{
-				"host":   "serverA",
-				"region": "us-east",
-			},
-			models.Fields{
-				"t":     true,
-				"T":     true,
-				"true":  true,
-				"True":  true,
-				"TRUE":  true,
-				"f":     false,
-				"F":     false,
-				"false": false,
-				"False": false,
-				"FALSE": false,
-			},
-			time.Unix(1, 0)),
-	)
-}
-
-func TestParsePointUnicodeString(t *testing.T) {
-	test(t, `cpu,host=serverA,region=us-east value="wè" 1000000000`,
-		models.MustNewPoint(
-			"cpu",
-			models.Tags{
-				"host":   "serverA",
-				"region": "us-east",
-			},
-			models.Fields{
-				"value": "wè",
-			},
-			time.Unix(1, 0)),
-	)
-}
-
-func TestParsePointNegativeTimestamp(t *testing.T) {
-	test(t, `cpu value=1 -1`,
-		models.MustNewPoint(
-			"cpu",
-			models.Tags{},
-			models.Fields{
-				"value": 1.0,
-			},
-			time.Unix(0, -1)),
-	)
-}
-
-func TestParsePointMaxTimestamp(t *testing.T) {
-	test(t, `cpu value=1 9223372036854775807`,
-		models.MustNewPoint(
-			"cpu",
-			models.Tags{},
-			models.Fields{
-				"value": 1.0,
-			},
-			time.Unix(0, int64(1<<63-1))),
-	)
-}
-
-func TestParsePointMinTimestamp(t *testing.T) {
-	test(t, `cpu value=1 -9223372036854775807`,
-		models.MustNewPoint(
-			"cpu",
-			models.Tags{},
-			models.Fields{
-				"value": 1.0,
-			},
-			time.Unix(0, -int64(1<<63-1))),
-	)
-}
-
-func TestParsePointInvalidTimestamp(t *testing.T) {
-	_, err := models.ParsePointsString("cpu value=1 9223372036854775808")
-	if err == nil {
-		t.Fatalf("ParsePoints failed: %v", err)
-	}
-	_, err = models.ParsePointsString("cpu value=1 -92233720368547758078")
-	if err == nil {
-		t.Fatalf("ParsePoints failed: %v", err)
-	}
-	_, err = models.ParsePointsString("cpu value=1 -")
-	if err == nil {
-		t.Fatalf("ParsePoints failed: %v", err)
-	}
-	_, err = models.ParsePointsString("cpu value=1 -/")
-	if err == nil {
-		t.Fatalf("ParsePoints failed: %v", err)
-	}
-	_, err = models.ParsePointsString("cpu value=1 -1?")
-	if err == nil {
-		t.Fatalf("ParsePoints failed: %v", err)
-	}
-	_, err = models.ParsePointsString("cpu value=1 1-")
-	if err == nil {
-		t.Fatalf("ParsePoints failed: %v", err)
-	}
-}
-
-func TestNewPointFloatWithoutDecimal(t *testing.T) {
-	test(t, `cpu value=1 1000000000`,
-		models.MustNewPoint(
-			"cpu",
-			models.Tags{},
-			models.Fields{
-				"value": 1.0,
-			},
-			time.Unix(1, 0)),
-	)
-}
-func TestNewPointNegativeFloat(t *testing.T) {
-	test(t, `cpu value=-0.64 1000000000`,
-		models.MustNewPoint(
-			"cpu",
-			models.Tags{},
-			models.Fields{
-				"value": -0.64,
-			},
-			time.Unix(1, 0)),
-	)
-}
-
-func TestNewPointFloatNoDecimal(t *testing.T) {
-	test(t, `cpu value=1. 1000000000`,
-		models.MustNewPoint(
-			"cpu",
-			models.Tags{},
-			models.Fields{
-				"value": 1.0,
-			},
-			time.Unix(1, 0)),
-	)
-}
-
-func TestNewPointFloatScientific(t *testing.T) {
-	test(t, `cpu value=6.632243e+06 1000000000`,
-		models.MustNewPoint(
-			"cpu",
-			models.Tags{},
-			models.Fields{
-				"value": float64(6632243),
-			},
-			time.Unix(1, 0)),
-	)
-}
-
-func TestNewPointLargeInteger(t *testing.T) {
-	test(t, `cpu value=6632243i 1000000000`,
-		models.MustNewPoint(
-			"cpu",
-			models.Tags{},
-			models.Fields{
-				"value": 6632243, // if incorrectly encoded as a float, it would show up as 6.632243e+06
-			},
-			time.Unix(1, 0)),
-	)
-}
-
-func TestParsePointNaN(t *testing.T) {
-	_, err := models.ParsePointsString("cpu value=NaN 1000000000")
-	if err == nil {
-		t.Fatalf("ParsePoints expected error, got nil")
-	}
-
-	_, err = models.ParsePointsString("cpu value=nAn 1000000000")
-	if err == nil {
-		t.Fatalf("ParsePoints expected error, got nil")
-	}
-
-	_, err = models.ParsePointsString("cpu value=NaN")
-	if err == nil {
-		t.Fatalf("ParsePoints expected error, got nil")
-	}
-}
-
-func TestNewPointLargeNumberOfTags(t *testing.T) {
-	tags := ""
-	for i := 0; i < 255; i++ {
-		tags += fmt.Sprintf(",tag%d=value%d", i, i)
-	}
-
-	pt, err := models.ParsePointsString(fmt.Sprintf("cpu%s value=1", tags))
-	if err != nil {
-		t.Fatalf("ParsePoints() with max tags failed: %v", err)
-	}
-
-	if len(pt[0].Tags()) != 255 {
-		t.Fatalf("ParsePoints() with max tags failed: %v", err)
-	}
-}
-
-func TestParsePointIntsFloats(t *testing.T) {
-	pts, err := models.ParsePoints([]byte(`cpu,host=serverA,region=us-east int=10i,float=11.0,float2=12.1 1000000000`))
-	if err != nil {
-		t.Fatalf(`ParsePoints() failed. got %s`, err)
-	}
-
-	if exp := 1; len(pts) != exp {
-		t.Errorf("ParsePoint() len mismatch: got %v, exp %v", len(pts), exp)
-	}
-	pt := pts[0]
-
-	if _, ok := pt.Fields()["int"].(int64); !ok {
-		t.Errorf("ParsePoint() int field mismatch: got %T, exp %T", pt.Fields()["int"], int64(10))
-	}
-
-	if _, ok := pt.Fields()["float"].(float64); !ok {
-		t.Errorf("ParsePoint() float field mismatch: got %T, exp %T", pt.Fields()["float64"], float64(11.0))
-	}
-
-	if _, ok := pt.Fields()["float2"].(float64); !ok {
-		t.Errorf("ParsePoint() float field mismatch: got %T, exp %T", pt.Fields()["float64"], float64(12.1))
-	}
-}
-
-func TestParsePointKeyUnsorted(t *testing.T) {
-	pts, err := models.ParsePoints([]byte("cpu,last=1,first=2 value=1i"))
-	if err != nil {
-		t.Fatalf(`ParsePoints() failed. got %s`, err)
-	}
-
-	if exp := 1; len(pts) != exp {
-		t.Errorf("ParsePoint() len mismatch: got %v, exp %v", len(pts), exp)
-	}
-	pt := pts[0]
-
-	if exp := "cpu,first=2,last=1"; string(pt.Key()) != exp {
-		t.Errorf("ParsePoint key not sorted. got %v, exp %v", pt.Key(), exp)
-	}
-}
-
-func TestParsePointToString(t *testing.T) {
-	line := `cpu,host=serverA,region=us-east bool=false,float=11,float2=12.123,int=10i,str="string val" 1000000000`
-	pts, err := models.ParsePoints([]byte(line))
-	if err != nil {
-		t.Fatalf(`ParsePoints() failed. got %s`, err)
-	}
-	if exp := 1; len(pts) != exp {
-		t.Errorf("ParsePoint() len mismatch: got %v, exp %v", len(pts), exp)
-	}
-	pt := pts[0]
-
-	got := pt.String()
-	if line != got {
-		t.Errorf("ParsePoint() to string mismatch:\n got %v\n exp %v", got, line)
-	}
-
-	pt = models.MustNewPoint("cpu", models.Tags{"host": "serverA", "region": "us-east"},
-		models.Fields{"int": 10, "float": float64(11.0), "float2": float64(12.123), "bool": false, "str": "string val"},
-		time.Unix(1, 0))
-
-	got = pt.String()
-	if line != got {
-		t.Errorf("NewPoint() to string mismatch:\n got %v\n exp %v", got, line)
-	}
-}
-
-func TestParsePointsWithPrecision(t *testing.T) {
-	tests := []struct {
-		name      string
-		line      string
-		precision string
-		exp       string
-	}{
-		{
-			name:      "nanosecond by default",
-			line:      `cpu,host=serverA,region=us-east value=1.0 946730096789012345`,
-			precision: "",
-			exp:       "cpu,host=serverA,region=us-east value=1.0 946730096789012345",
-		},
-		{
-			name:      "nanosecond",
-			line:      `cpu,host=serverA,region=us-east value=1.0 946730096789012345`,
-			precision: "n",
-			exp:       "cpu,host=serverA,region=us-east value=1.0 946730096789012345",
-		},
-		{
-			name:      "microsecond",
-			line:      `cpu,host=serverA,region=us-east value=1.0 946730096789012`,
-			precision: "u",
-			exp:       "cpu,host=serverA,region=us-east value=1.0 946730096789012000",
-		},
-		{
-			name:      "millisecond",
-			line:      `cpu,host=serverA,region=us-east value=1.0 946730096789`,
-			precision: "ms",
-			exp:       "cpu,host=serverA,region=us-east value=1.0 946730096789000000",
-		},
-		{
-			name:      "second",
-			line:      `cpu,host=serverA,region=us-east value=1.0 946730096`,
-			precision: "s",
-			exp:       "cpu,host=serverA,region=us-east value=1.0 946730096000000000",
-		},
-		{
-			name:      "minute",
-			line:      `cpu,host=serverA,region=us-east value=1.0 15778834`,
-			precision: "m",
-			exp:       "cpu,host=serverA,region=us-east value=1.0 946730040000000000",
-		},
-		{
-			name:      "hour",
-			line:      `cpu,host=serverA,region=us-east value=1.0 262980`,
-			precision: "h",
-			exp:       "cpu,host=serverA,region=us-east value=1.0 946728000000000000",
-		},
-	}
-	for _, test := range tests {
-		pts, err := models.ParsePointsWithPrecision([]byte(test.line), time.Now().UTC(), test.precision)
-		if err != nil {
-			t.Fatalf(`%s: ParsePoints() failed. got %s`, test.name, err)
-		}
-		if exp := 1; len(pts) != exp {
-			t.Errorf("%s: ParsePoint() len mismatch: got %v, exp %v", test.name, len(pts), exp)
-		}
-		pt := pts[0]
-
-		got := pt.String()
-		if got != test.exp {
-			t.Errorf("%s: ParsePoint() to string mismatch:\n got %v\n exp %v", test.name, got, test.exp)
-		}
-	}
-}
-
-func TestParsePointsWithPrecisionNoTime(t *testing.T) {
-	line := `cpu,host=serverA,region=us-east value=1.0`
-	tm, _ := time.Parse(time.RFC3339Nano, "2000-01-01T12:34:56.789012345Z")
-	tests := []struct {
-		name      string
-		precision string
-		exp       string
-	}{
-		{
-			name:      "no precision",
-			precision: "",
-			exp:       "cpu,host=serverA,region=us-east value=1.0 946730096789012345",
-		},
-		{
-			name:      "nanosecond precision",
-			precision: "n",
-			exp:       "cpu,host=serverA,region=us-east value=1.0 946730096789012345",
-		},
-		{
-			name:      "microsecond precision",
-			precision: "u",
-			exp:       "cpu,host=serverA,region=us-east value=1.0 946730096789012000",
-		},
-		{
-			name:      "millisecond precision",
-			precision: "ms",
-			exp:       "cpu,host=serverA,region=us-east value=1.0 946730096789000000",
-		},
-		{
-			name:      "second precision",
-			precision: "s",
-			exp:       "cpu,host=serverA,region=us-east value=1.0 946730096000000000",
-		},
-		{
-			name:      "minute precision",
-			precision: "m",
-			exp:       "cpu,host=serverA,region=us-east value=1.0 946730040000000000",
-		},
-		{
-			name:      "hour precision",
-			precision: "h",
-			exp:       "cpu,host=serverA,region=us-east value=1.0 946728000000000000",
-		},
-	}
-
-	for _, test := range tests {
-		pts, err := models.ParsePointsWithPrecision([]byte(line), tm, test.precision)
-		if err != nil {
-			t.Fatalf(`%s: ParsePoints() failed. got %s`, test.name, err)
-		}
-		if exp := 1; len(pts) != exp {
-			t.Errorf("%s: ParsePoint() len mismatch: got %v, exp %v", test.name, len(pts), exp)
-		}
-		pt := pts[0]
-
-		got := pt.String()
-		if got != test.exp {
-			t.Errorf("%s: ParsePoint() to string mismatch:\n got %v\n exp %v", test.name, got, test.exp)
-		}
-	}
-}
-
-func TestParsePointsWithPrecisionComments(t *testing.T) {
-	tests := []struct {
-		name      string
-		batch     string
-		exp       string
-		lenPoints int
-	}{
-		{
-			name:      "comment only",
-			batch:     `# comment only`,
-			exp:       "cpu,host=serverA,region=us-east value=1.0 946730096789012345",
-			lenPoints: 0,
-		},
-		{
-			name: "point with comment above",
-			batch: `# a point is below
-cpu,host=serverA,region=us-east value=1.0 946730096789012345`,
-			exp:       "cpu,host=serverA,region=us-east value=1.0 946730096789012345",
-			lenPoints: 1,
-		},
-		{
-			name: "point with comment below",
-			batch: `cpu,host=serverA,region=us-east value=1.0 946730096789012345
-# end of points`,
-			exp:       "cpu,host=serverA,region=us-east value=1.0 946730096789012345",
-			lenPoints: 1,
-		},
-		{
-			name: "indented comment",
-			batch: `	# a point is below
-cpu,host=serverA,region=us-east value=1.0 946730096789012345`,
-			exp:       "cpu,host=serverA,region=us-east value=1.0 946730096789012345",
-			lenPoints: 1,
-		},
-	}
-	for _, test := range tests {
-		pts, err := models.ParsePointsWithPrecision([]byte(test.batch), time.Now().UTC(), "")
-		if err != nil {
-			t.Fatalf(`%s: ParsePoints() failed. got %s`, test.name, err)
-		}
-		pointsLength := len(pts)
-		if exp := test.lenPoints; pointsLength != exp {
-			t.Errorf("%s: ParsePoint() len mismatch: got %v, exp %v", test.name, pointsLength, exp)
-		}
-
-		if pointsLength > 0 {
-			pt := pts[0]
-
-			got := pt.String()
-			if got != test.exp {
-				t.Errorf("%s: ParsePoint() to string mismatch:\n got %v\n exp %v", test.name, got, test.exp)
-			}
-		}
-	}
-}
-
-func TestNewPointEscaped(t *testing.T) {
-	// commas
-	pt := models.MustNewPoint("cpu,main", models.Tags{"tag,bar": "value"}, models.Fields{"name,bar": 1.0}, time.Unix(0, 0))
-	if exp := `cpu\,main,tag\,bar=value name\,bar=1 0`; pt.String() != exp {
-		t.Errorf("NewPoint().String() mismatch.\ngot %v\nexp %v", pt.String(), exp)
-	}
-
-	// spaces
-	pt = models.MustNewPoint("cpu main", models.Tags{"tag bar": "value"}, models.Fields{"name bar": 1.0}, time.Unix(0, 0))
-	if exp := `cpu\ main,tag\ bar=value name\ bar=1 0`; pt.String() != exp {
-		t.Errorf("NewPoint().String() mismatch.\ngot %v\nexp %v", pt.String(), exp)
-	}
-
-	// equals
-	pt = models.MustNewPoint("cpu=main", models.Tags{"tag=bar": "value=foo"}, models.Fields{"name=bar": 1.0}, time.Unix(0, 0))
-	if exp := `cpu=main,tag\=bar=value\=foo name\=bar=1 0`; pt.String() != exp {
-		t.Errorf("NewPoint().String() mismatch.\ngot %v\nexp %v", pt.String(), exp)
-	}
-}
-
-func TestNewPointUnhandledType(t *testing.T) {
-	// nil value
-	pt := models.MustNewPoint("cpu", nil, models.Fields{"value": nil}, time.Unix(0, 0))
-	if exp := `cpu value= 0`; pt.String() != exp {
-		t.Errorf("NewPoint().String() mismatch.\ngot %v\nexp %v", pt.String(), exp)
-	}
-
-	// unsupported type gets stored as string
-	now := time.Unix(0, 0).UTC()
-	pt = models.MustNewPoint("cpu", nil, models.Fields{"value": now}, time.Unix(0, 0))
-	if exp := `cpu value="1970-01-01 00:00:00 +0000 UTC" 0`; pt.String() != exp {
-		t.Errorf("NewPoint().String() mismatch.\ngot %v\nexp %v", pt.String(), exp)
-	}
-
-	if exp := "1970-01-01 00:00:00 +0000 UTC"; pt.Fields()["value"] != exp {
-		t.Errorf("NewPoint().String() mismatch.\ngot %v\nexp %v", pt.String(), exp)
-	}
-}
-
-func TestMakeKeyEscaped(t *testing.T) {
-	if exp, got := `cpu\ load`, models.MakeKey([]byte(`cpu\ load`), models.Tags{}); string(got) != exp {
-		t.Errorf("MakeKey() mismatch.\ngot %v\nexp %v", got, exp)
-	}
-
-	if exp, got := `cpu\ load`, models.MakeKey([]byte(`cpu load`), models.Tags{}); string(got) != exp {
-		t.Errorf("MakeKey() mismatch.\ngot %v\nexp %v", got, exp)
-	}
-
-	if exp, got := `cpu\,load`, models.MakeKey([]byte(`cpu\,load`), models.Tags{}); string(got) != exp {
-		t.Errorf("MakeKey() mismatch.\ngot %v\nexp %v", got, exp)
-	}
-
-	if exp, got := `cpu\,load`, models.MakeKey([]byte(`cpu,load`), models.Tags{}); string(got) != exp {
-		t.Errorf("MakeKey() mismatch.\ngot %v\nexp %v", got, exp)
-	}
-
-}
-
-func TestPrecisionString(t *testing.T) {
-	tags := map[string]interface{}{"value": float64(1)}
-	tm, _ := time.Parse(time.RFC3339Nano, "2000-01-01T12:34:56.789012345Z")
-	tests := []struct {
-		name      string
-		precision string
-		exp       string
-	}{
-		{
-			name:      "no precision",
-			precision: "",
-			exp:       "cpu value=1 946730096789012345",
-		},
-		{
-			name:      "nanosecond precision",
-			precision: "ns",
-			exp:       "cpu value=1 946730096789012345",
-		},
-		{
-			name:      "microsecond precision",
-			precision: "u",
-			exp:       "cpu value=1 946730096789012",
-		},
-		{
-			name:      "millisecond precision",
-			precision: "ms",
-			exp:       "cpu value=1 946730096789",
-		},
-		{
-			name:      "second precision",
-			precision: "s",
-			exp:       "cpu value=1 946730096",
-		},
-		{
-			name:      "minute precision",
-			precision: "m",
-			exp:       "cpu value=1 15778834",
-		},
-		{
-			name:      "hour precision",
-			precision: "h",
-			exp:       "cpu value=1 262980",
-		},
-	}
-
-	for _, test := range tests {
-		pt := models.MustNewPoint("cpu", nil, tags, tm)
-		act := pt.PrecisionString(test.precision)
-
-		if act != test.exp {
-			t.Errorf("%s: PrecisionString() mismatch:\n actual:	%v\n exp:		%v",
-				test.name, act, test.exp)
-		}
-	}
-}
-
-func TestRoundedString(t *testing.T) {
-	tags := map[string]interface{}{"value": float64(1)}
-	tm, _ := time.Parse(time.RFC3339Nano, "2000-01-01T12:34:56.789012345Z")
-	tests := []struct {
-		name      string
-		precision time.Duration
-		exp       string
-	}{
-		{
-			name:      "no precision",
-			precision: time.Duration(0),
-			exp:       "cpu value=1 946730096789012345",
-		},
-		{
-			name:      "nanosecond precision",
-			precision: time.Nanosecond,
-			exp:       "cpu value=1 946730096789012345",
-		},
-		{
-			name:      "microsecond precision",
-			precision: time.Microsecond,
-			exp:       "cpu value=1 946730096789012000",
-		},
-		{
-			name:      "millisecond precision",
-			precision: time.Millisecond,
-			exp:       "cpu value=1 946730096789000000",
-		},
-		{
-			name:      "second precision",
-			precision: time.Second,
-			exp:       "cpu value=1 946730097000000000",
-		},
-		{
-			name:      "minute precision",
-			precision: time.Minute,
-			exp:       "cpu value=1 946730100000000000",
-		},
-		{
-			name:      "hour precision",
-			precision: time.Hour,
-			exp:       "cpu value=1 946731600000000000",
-		},
-	}
-
-	for _, test := range tests {
-		pt := models.MustNewPoint("cpu", nil, tags, tm)
-		act := pt.RoundedString(test.precision)
-
-		if act != test.exp {
-			t.Errorf("%s: RoundedString() mismatch:\n actual:	%v\n exp:		%v",
-				test.name, act, test.exp)
-		}
-	}
-}
-
-func TestParsePointsStringWithExtraBuffer(t *testing.T) {
-	b := make([]byte, 70*5000)
-	buf := bytes.NewBuffer(b)
-	key := "cpu,host=A,region=uswest"
-	buf.WriteString(fmt.Sprintf("%s value=%.3f 1\n", key, rand.Float64()))
-
-	points, err := models.ParsePointsString(buf.String())
-	if err != nil {
-		t.Fatalf("failed to write points: %s", err.Error())
-	}
-
-	pointKey := string(points[0].Key())
-
-	if len(key) != len(pointKey) {
-		t.Fatalf("expected length of both keys are same but got %d and %d", len(key), len(pointKey))
-	}
-
-	if key != pointKey {
-		t.Fatalf("expected both keys are same but got %s and %s", key, pointKey)
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/models/rows.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/models/rows.go
deleted file mode 100644
index a4350faa7..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/models/rows.go
+++ /dev/null
@@ -1,59 +0,0 @@
-package models
-
-import (
-	"hash/fnv"
-	"sort"
-)
-
-// Row represents a single row returned from the execution of a statement.
-type Row struct {
-	Name    string            `json:"name,omitempty"`
-	Tags    map[string]string `json:"tags,omitempty"`
-	Columns []string          `json:"columns,omitempty"`
-	Values  [][]interface{}   `json:"values,omitempty"`
-	Err     error             `json:"err,omitempty"`
-}
-
-// SameSeries returns true if r contains values for the same series as o.
-func (r *Row) SameSeries(o *Row) bool {
-	return r.tagsHash() == o.tagsHash() && r.Name == o.Name
-}
-
-// tagsHash returns a hash of tag key/value pairs.
-func (r *Row) tagsHash() uint64 {
-	h := fnv.New64a()
-	keys := r.tagsKeys()
-	for _, k := range keys {
-		h.Write([]byte(k))
-		h.Write([]byte(r.Tags[k]))
-	}
-	return h.Sum64()
-}
-
-// tagKeys returns a sorted list of tag keys.
-func (r *Row) tagsKeys() []string {
-	a := make([]string, 0, len(r.Tags))
-	for k := range r.Tags {
-		a = append(a, k)
-	}
-	sort.Strings(a)
-	return a
-}
-
-type Rows []*Row
-
-func (p Rows) Len() int { return len(p) }
-
-func (p Rows) Less(i, j int) bool {
-	// Sort by name first.
-	if p[i].Name != p[j].Name {
-		return p[i].Name < p[j].Name
-	}
-
-	// Sort by tag set hash. Tags don't have a meaningful sort order so we
-	// just compute a hash and sort by that instead. This allows the tests
-	// to receive rows in a predictable order every time.
-	return p[i].tagsHash() < p[j].tagsHash()
-}
-
-func (p Rows) Swap(i, j int) { p[i], p[j] = p[j], p[i] }
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/monitor/README.md b/Godeps/_workspace/src/github.com/influxdb/influxdb/monitor/README.md
deleted file mode 100644
index 1218c9f2a..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/monitor/README.md
+++ /dev/null
@@ -1,73 +0,0 @@
-# System Monitoring
-_This functionality should be considered experimental and is subject to change._
-
-_System Monitoring_ means all statistical and diagnostic information made availabe to the user of InfluxDB system, about the system itself. Its purpose is to assist with troubleshooting and performance analysis of the database itself.
-
-## Statistics vs. Diagnostics
-A distinction is made between _statistics_ and _diagnostics_ for the purposes of monitoring. Generally a statistical quality is something that is being counted, and for which it makes sense to store persistently for historical analysis. Diagnostic information is not necessarily numerical, and may not make sense to store.
-
-An example of statistical information would be the number of points received over UDP, or the number of queries executed. Examples of diagnostic information would be a list of current Graphite TCP connections, the version of InfluxDB, or the uptime of the process.
-
-## System Statistics
-`SHOW STATS [FOR <module>]` displays statisics about subsystems within the running `influxd` process. Statistics include points received, points indexed, bytes written to disk, TCP connections handled etc. These statistics are all zero when the InfluxDB process starts. If _module_ is specified, it must be single-quoted. For example `SHOW STATS FOR 'httpd'`.
-
-All statistics are written, by default, by each node to a "monitor" database within the InfluxDB system, allowing analysis of aggregated statistical data using the standard InfluxQL language. This allows users to track the performance of their system. Importantly, this allows cluster-level statistics to be viewed, since by querying the monitor database, statistics from all nodes may be queried. This can be a very powerful approach for troubleshooting your InfluxDB system and understanding its behaviour.
-
-## System Diagnostics
-`SHOW DIAGNOSTICS [FOR <module>]` displays various diagnostic information about the `influxd` process. This information is not stored persistently within the InfluxDB system. If _module_ is specified, it must be single-quoted. For example `SHOW STATS FOR 'build'`.
-
-## Standard expvar support
-All statistical information is available at HTTP API endpoint `/debug/vars`, in [expvar](https://golang.org/pkg/expvar/) format, allowing external systems to monitor an InfluxDB node. By default, the full path to this endpoint is `http://localhost:8086/debug/vars`.
-
-## Configuration
-The `monitor` module allows the following configuration:
-
- * Whether to write statistical and diagnostic information to an InfluxDB system. This is enabled by default.
- * The name of the database to where this information should be written. Defaults to `_internal`. The information is written to the default retention policy for the given database.
- * The name of the retention policy, along with full configuration control of the retention policy, if the default retention policy is not suitable.
- * The rate at which this information should be written. The default rate is once every 10 seconds.
-
-# Design and Implementation
-
-A new module named `monitor` supports all basic statistics and diagnostic functionality. This includes:
-
- * Allowing other modules to register statistics and diagnostics information, allowing it to be accessed on demand by the `monitor` module.
- * Serving the statistics and diagnostic information to the user, in response to commands such as `SHOW DIAGNOSTICS`.
- * Expose standard Go runtime information such as garbage collection statistics.
- * Make all collected expvar data via HTTP, for collection by 3rd-party tools.
- * Writing the statistical information to the "monitor" database, for query purposes.
-
-## Registering statistics and diagnostics
-
-To export statistical information with the `monitor` system, code simply calls `influxdb.NewStatistics()` and receives an `expvar.Map` instance in response. This object can then be used to store statistics.
-
-For example, if you have a component called `Service`, you can statistics like so:
-
-```
-import (
-     "expvar"
-     "github.com/influxdb/influxdb"
-)
-.
-.
-.
-.
-type Service struct {
-  ....some other fields....
-  statMap *expvar.Map         /// Add a map of type *expvar.Map. Check GoDocs for how to use this.
-}
-
-
-func NewService() *Service {
-  s = &NewService{}
-  s.statMap = NewStatistics(key, name, tags)
-}
-```
-When calling `NewStatistics` `key` should be unique for the Service instance (if a network service, the protocol and binding port are good to include in the key). `name` will be the name of the Measurement used to store these statistics. Finally, when these statistics are written to the `monitor` database, all points will be tagged with `tags`. A value of nil for `tags` is legal. 
-
-To register diagnostic information, `monitor.RegisterDiagnosticsClient` is called, passing a `influxdb.monitor.DiagsClient` object to `monitor`. Implementing the `influxdb.monitor.DiagsClient` interface requires that your component have function returning diagnostic information in specific form, so that it can be displayed by the `monitor` system.
-
-## expvar
-Statistical information is gathered by each package using [expvar](https://golang.org/pkg/expvar). Each package registers a map using its package name.
-
-Due to the nature of `expvar`, statistical information is reset to its initial state when a server is restarted.
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/monitor/build_info.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/monitor/build_info.go
deleted file mode 100644
index d65ae5a45..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/monitor/build_info.go
+++ /dev/null
@@ -1,20 +0,0 @@
-package monitor
-
-// system captures build diagnostics
-type build struct {
-	Version string
-	Commit  string
-	Branch  string
-	Time    string
-}
-
-func (b *build) Diagnostics() (*Diagnostic, error) {
-	diagnostics := map[string]interface{}{
-		"Version":    b.Version,
-		"Commit":     b.Commit,
-		"Branch":     b.Branch,
-		"Build Time": b.Time,
-	}
-
-	return DiagnosticFromMap(diagnostics), nil
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/monitor/config.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/monitor/config.go
deleted file mode 100644
index a5a78bf28..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/monitor/config.go
+++ /dev/null
@@ -1,35 +0,0 @@
-package monitor
-
-import (
-	"time"
-
-	"github.com/influxdb/influxdb/toml"
-)
-
-const (
-	// DefaultStoreEnabled is whether the system writes gathered information in
-	// an InfluxDB system for historical analysis.
-	DefaultStoreEnabled = true
-
-	// DefaultStoreDatabase is the name of the database where gathered information is written
-	DefaultStoreDatabase = "_internal"
-
-	// DefaultStoreInterval is the period between storing gathered information.
-	DefaultStoreInterval = 10 * time.Second
-)
-
-// Config represents the configuration for the monitor service.
-type Config struct {
-	StoreEnabled  bool          `toml:"store-enabled"`
-	StoreDatabase string        `toml:"store-database"`
-	StoreInterval toml.Duration `toml:"store-interval"`
-}
-
-// NewConfig returns an instance of Config with defaults.
-func NewConfig() Config {
-	return Config{
-		StoreEnabled:  true,
-		StoreDatabase: DefaultStoreDatabase,
-		StoreInterval: toml.Duration(DefaultStoreInterval),
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/monitor/config_test.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/monitor/config_test.go
deleted file mode 100644
index ee62e7346..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/monitor/config_test.go
+++ /dev/null
@@ -1,30 +0,0 @@
-package monitor_test
-
-import (
-	"testing"
-	"time"
-
-	"github.com/BurntSushi/toml"
-	"github.com/influxdb/influxdb/monitor"
-)
-
-func TestConfig_Parse(t *testing.T) {
-	// Parse configuration.
-	var c monitor.Config
-	if _, err := toml.Decode(`
-store-enabled=true
-store-database="the_db"
-store-interval="10m"
-`, &c); err != nil {
-		t.Fatal(err)
-	}
-
-	// Validate configuration.
-	if !c.StoreEnabled {
-		t.Fatalf("unexpected store-enabled: %v", c.StoreEnabled)
-	} else if c.StoreDatabase != "the_db" {
-		t.Fatalf("unexpected store-database: %s", c.StoreDatabase)
-	} else if time.Duration(c.StoreInterval) != 10*time.Minute {
-		t.Fatalf("unexpected store-interval:  %s", c.StoreInterval)
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/monitor/go_runtime.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/monitor/go_runtime.go
deleted file mode 100644
index f45f4fce2..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/monitor/go_runtime.go
+++ /dev/null
@@ -1,19 +0,0 @@
-package monitor
-
-import (
-	"runtime"
-)
-
-// goRuntime captures Go runtime diagnostics
-type goRuntime struct{}
-
-func (g *goRuntime) Diagnostics() (*Diagnostic, error) {
-	diagnostics := map[string]interface{}{
-		"GOARCH":     runtime.GOARCH,
-		"GOOS":       runtime.GOOS,
-		"GOMAXPROCS": runtime.GOMAXPROCS(-1),
-		"version":    runtime.Version(),
-	}
-
-	return DiagnosticFromMap(diagnostics), nil
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/monitor/network.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/monitor/network.go
deleted file mode 100644
index 80c0f6c9c..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/monitor/network.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package monitor
-
-import (
-	"os"
-)
-
-// network captures network diagnostics
-type network struct{}
-
-func (n *network) Diagnostics() (*Diagnostic, error) {
-	h, err := os.Hostname()
-	if err != nil {
-		return nil, err
-	}
-
-	diagnostics := map[string]interface{}{
-		"hostname": h,
-	}
-
-	return DiagnosticFromMap(diagnostics), nil
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/monitor/service.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/monitor/service.go
deleted file mode 100644
index 4e0285b39..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/monitor/service.go
+++ /dev/null
@@ -1,439 +0,0 @@
-package monitor
-
-import (
-	"expvar"
-	"fmt"
-	"log"
-	"os"
-	"runtime"
-	"sort"
-	"strconv"
-	"sync"
-	"time"
-
-	"github.com/influxdb/influxdb/cluster"
-	"github.com/influxdb/influxdb/meta"
-	"github.com/influxdb/influxdb/models"
-)
-
-const leaderWaitTimeout = 30 * time.Second
-
-const (
-	MonitorRetentionPolicy         = "monitor"
-	MonitorRetentionPolicyDuration = 7 * 24 * time.Hour
-)
-
-// DiagsClient is the interface modules implement if they register diags with monitor.
-type DiagsClient interface {
-	Diagnostics() (*Diagnostic, error)
-}
-
-// The DiagsClientFunc type is an adapter to allow the use of
-// ordinary functions as Diagnostis clients.
-type DiagsClientFunc func() (*Diagnostic, error)
-
-// Diagnostics calls f().
-func (f DiagsClientFunc) Diagnostics() (*Diagnostic, error) {
-	return f()
-}
-
-// Diagnostic represents a table of diagnostic information. The first value
-// is the name of the columns, the second is a slice of interface slices containing
-// the values for each column, by row. This information is never written to an InfluxDB
-// system and is display-only. An example showing, say, connections follows:
-//
-//     source_ip    source_port       dest_ip     dest_port
-//     182.1.0.2    2890              127.0.0.1   38901
-//     174.33.1.2   2924              127.0.0.1   38902
-type Diagnostic struct {
-	Columns []string
-	Rows    [][]interface{}
-}
-
-func NewDiagnostic(columns []string) *Diagnostic {
-	return &Diagnostic{
-		Columns: columns,
-		Rows:    make([][]interface{}, 0),
-	}
-}
-
-func (d *Diagnostic) AddRow(r []interface{}) {
-	d.Rows = append(d.Rows, r)
-}
-
-// Monitor represents an instance of the monitor system.
-type Monitor struct {
-	// Build information for diagnostics.
-	Version   string
-	Commit    string
-	Branch    string
-	BuildTime string
-
-	wg   sync.WaitGroup
-	done chan struct{}
-	mu   sync.Mutex
-
-	diagRegistrations map[string]DiagsClient
-
-	storeCreated           bool
-	storeEnabled           bool
-	storeDatabase          string
-	storeRetentionPolicy   string
-	storeRetentionDuration time.Duration
-	storeReplicationFactor int
-	storeAddress           string
-	storeInterval          time.Duration
-
-	MetaStore interface {
-		ClusterID() (uint64, error)
-		NodeID() uint64
-		WaitForLeader(d time.Duration) error
-		IsLeader() bool
-		CreateDatabaseIfNotExists(name string) (*meta.DatabaseInfo, error)
-		CreateRetentionPolicyIfNotExists(database string, rpi *meta.RetentionPolicyInfo) (*meta.RetentionPolicyInfo, error)
-		SetDefaultRetentionPolicy(database, name string) error
-		DropRetentionPolicy(database, name string) error
-	}
-
-	PointsWriter interface {
-		WritePoints(p *cluster.WritePointsRequest) error
-	}
-
-	Logger *log.Logger
-}
-
-// New returns a new instance of the monitor system.
-func New(c Config) *Monitor {
-	return &Monitor{
-		done:              make(chan struct{}),
-		diagRegistrations: make(map[string]DiagsClient),
-		storeEnabled:      c.StoreEnabled,
-		storeDatabase:     c.StoreDatabase,
-		storeInterval:     time.Duration(c.StoreInterval),
-		Logger:            log.New(os.Stderr, "[monitor] ", log.LstdFlags),
-	}
-}
-
-// Open opens the monitoring system, using the given clusterID, node ID, and hostname
-// for identification purpose.
-func (m *Monitor) Open() error {
-	m.Logger.Printf("Starting monitor system")
-
-	// Self-register various stats and diagnostics.
-	m.RegisterDiagnosticsClient("build", &build{
-		Version: m.Version,
-		Commit:  m.Commit,
-		Branch:  m.Branch,
-		Time:    m.BuildTime,
-	})
-	m.RegisterDiagnosticsClient("runtime", &goRuntime{})
-	m.RegisterDiagnosticsClient("network", &network{})
-	m.RegisterDiagnosticsClient("system", &system{})
-
-	// If enabled, record stats in a InfluxDB system.
-	if m.storeEnabled {
-
-		// Start periodic writes to system.
-		m.wg.Add(1)
-		go m.storeStatistics()
-	}
-
-	return nil
-}
-
-// Close closes the monitor system.
-func (m *Monitor) Close() {
-	m.Logger.Println("shutting down monitor system")
-	close(m.done)
-	m.wg.Wait()
-	m.done = nil
-}
-
-// SetLogger sets the internal logger to the logger passed in.
-func (m *Monitor) SetLogger(l *log.Logger) {
-	m.Logger = l
-}
-
-// RegisterDiagnosticsClient registers a diagnostics client with the given name and tags.
-func (m *Monitor) RegisterDiagnosticsClient(name string, client DiagsClient) {
-	m.mu.Lock()
-	defer m.mu.Unlock()
-	m.diagRegistrations[name] = client
-	m.Logger.Printf(`'%s' registered for diagnostics monitoring`, name)
-}
-
-// DeregisterDiagnosticsClient deregisters a diagnostics client by name.
-func (m *Monitor) DeregisterDiagnosticsClient(name string) {
-	m.mu.Lock()
-	defer m.mu.Unlock()
-	delete(m.diagRegistrations, name)
-}
-
-// Statistics returns the combined statistics for all expvar data. The given
-// tags are added to each of the returned statistics.
-func (m *Monitor) Statistics(tags map[string]string) ([]*Statistic, error) {
-	statistics := make([]*Statistic, 0)
-
-	expvar.Do(func(kv expvar.KeyValue) {
-		// Skip built-in expvar stats.
-		if kv.Key == "memstats" || kv.Key == "cmdline" {
-			return
-		}
-
-		statistic := &Statistic{
-			Tags:   make(map[string]string),
-			Values: make(map[string]interface{}),
-		}
-
-		// Add any supplied tags.
-		for k, v := range tags {
-			statistic.Tags[k] = v
-		}
-
-		// Every other top-level expvar value is a map.
-		m := kv.Value.(*expvar.Map)
-
-		m.Do(func(subKV expvar.KeyValue) {
-			switch subKV.Key {
-			case "name":
-				// straight to string name.
-				u, err := strconv.Unquote(subKV.Value.String())
-				if err != nil {
-					return
-				}
-				statistic.Name = u
-			case "tags":
-				// string-string tags map.
-				n := subKV.Value.(*expvar.Map)
-				n.Do(func(t expvar.KeyValue) {
-					u, err := strconv.Unquote(t.Value.String())
-					if err != nil {
-						return
-					}
-					statistic.Tags[t.Key] = u
-				})
-			case "values":
-				// string-interface map.
-				n := subKV.Value.(*expvar.Map)
-				n.Do(func(kv expvar.KeyValue) {
-					var f interface{}
-					var err error
-					switch v := kv.Value.(type) {
-					case *expvar.Float:
-						f, err = strconv.ParseFloat(v.String(), 64)
-						if err != nil {
-							return
-						}
-					case *expvar.Int:
-						f, err = strconv.ParseInt(v.String(), 10, 64)
-						if err != nil {
-							return
-						}
-					default:
-						return
-					}
-					statistic.Values[kv.Key] = f
-				})
-			}
-		})
-
-		// If a registered client has no field data, don't include it in the results
-		if len(statistic.Values) == 0 {
-			return
-		}
-
-		statistics = append(statistics, statistic)
-	})
-
-	// Add Go memstats.
-	statistic := &Statistic{
-		Name:   "runtime",
-		Tags:   make(map[string]string),
-		Values: make(map[string]interface{}),
-	}
-
-	// Add any supplied tags to Go memstats
-	for k, v := range tags {
-		statistic.Tags[k] = v
-	}
-
-	var rt runtime.MemStats
-	runtime.ReadMemStats(&rt)
-	statistic.Values = map[string]interface{}{
-		"Alloc":        int64(rt.Alloc),
-		"TotalAlloc":   int64(rt.TotalAlloc),
-		"Sys":          int64(rt.Sys),
-		"Lookups":      int64(rt.Lookups),
-		"Mallocs":      int64(rt.Mallocs),
-		"Frees":        int64(rt.Frees),
-		"HeapAlloc":    int64(rt.HeapAlloc),
-		"HeapSys":      int64(rt.HeapSys),
-		"HeapIdle":     int64(rt.HeapIdle),
-		"HeapInUse":    int64(rt.HeapInuse),
-		"HeapReleased": int64(rt.HeapReleased),
-		"HeapObjects":  int64(rt.HeapObjects),
-		"PauseTotalNs": int64(rt.PauseTotalNs),
-		"NumGC":        int64(rt.NumGC),
-		"NumGoroutine": int64(runtime.NumGoroutine()),
-	}
-	statistics = append(statistics, statistic)
-
-	return statistics, nil
-}
-
-func (m *Monitor) Diagnostics() (map[string]*Diagnostic, error) {
-	m.mu.Lock()
-	defer m.mu.Unlock()
-
-	diags := make(map[string]*Diagnostic, len(m.diagRegistrations))
-	for k, v := range m.diagRegistrations {
-		d, err := v.Diagnostics()
-		if err != nil {
-			continue
-		}
-		diags[k] = d
-	}
-	return diags, nil
-}
-
-// createInternalStorage ensures the internal storage has been created.
-func (m *Monitor) createInternalStorage() {
-	if !m.MetaStore.IsLeader() || m.storeCreated {
-		return
-	}
-
-	if _, err := m.MetaStore.CreateDatabaseIfNotExists(m.storeDatabase); err != nil {
-		m.Logger.Printf("failed to create database '%s', failed to create storage: %s",
-			m.storeDatabase, err.Error())
-		return
-	}
-
-	rpi := meta.NewRetentionPolicyInfo(MonitorRetentionPolicy)
-	rpi.Duration = MonitorRetentionPolicyDuration
-	rpi.ReplicaN = 1
-	if _, err := m.MetaStore.CreateRetentionPolicyIfNotExists(m.storeDatabase, rpi); err != nil {
-		m.Logger.Printf("failed to create retention policy '%s', failed to create internal storage: %s",
-			rpi.Name, err.Error())
-		return
-	}
-
-	if err := m.MetaStore.SetDefaultRetentionPolicy(m.storeDatabase, rpi.Name); err != nil {
-		m.Logger.Printf("failed to set default retention policy on '%s', failed to create internal storage: %s",
-			m.storeDatabase, err.Error())
-		return
-	}
-
-	if err := m.MetaStore.DropRetentionPolicy(m.storeDatabase, "default"); err != nil && err != meta.ErrRetentionPolicyNotFound {
-		m.Logger.Printf("failed to delete retention policy 'default', failed to created internal storage: %s", err.Error())
-		return
-	}
-
-	// Mark storage creation complete.
-	m.storeCreated = true
-}
-
-// storeStatistics writes the statistics to an InfluxDB system.
-func (m *Monitor) storeStatistics() {
-	defer m.wg.Done()
-	m.Logger.Printf("Storing statistics in database '%s' retention policy '%s', at interval %s",
-		m.storeDatabase, m.storeRetentionPolicy, m.storeInterval)
-
-	if err := m.MetaStore.WaitForLeader(leaderWaitTimeout); err != nil {
-		m.Logger.Printf("failed to detect a cluster leader, terminating storage: %s", err.Error())
-		return
-	}
-
-	// Get cluster-level metadata. Nothing different is going to happen if errors occur.
-	clusterID, _ := m.MetaStore.ClusterID()
-	nodeID := m.MetaStore.NodeID()
-	hostname, _ := os.Hostname()
-	clusterTags := map[string]string{
-		"clusterID": fmt.Sprintf("%d", clusterID),
-		"nodeID":    fmt.Sprintf("%d", nodeID),
-		"hostname":  hostname,
-	}
-
-	tick := time.NewTicker(m.storeInterval)
-	defer tick.Stop()
-	for {
-		select {
-		case <-tick.C:
-			m.createInternalStorage()
-
-			stats, err := m.Statistics(clusterTags)
-			if err != nil {
-				m.Logger.Printf("failed to retrieve registered statistics: %s", err)
-				continue
-			}
-
-			points := make(models.Points, 0, len(stats))
-			for _, s := range stats {
-				pt, err := models.NewPoint(s.Name, s.Tags, s.Values, time.Now().Truncate(time.Second))
-				if err != nil {
-					m.Logger.Printf("Dropping point %v: %v", s.Name, err)
-					continue
-				}
-				points = append(points, pt)
-			}
-
-			err = m.PointsWriter.WritePoints(&cluster.WritePointsRequest{
-				Database:         m.storeDatabase,
-				RetentionPolicy:  m.storeRetentionPolicy,
-				ConsistencyLevel: cluster.ConsistencyLevelOne,
-				Points:           points,
-			})
-			if err != nil {
-				m.Logger.Printf("failed to store statistics: %s", err)
-			}
-		case <-m.done:
-			m.Logger.Printf("terminating storage of statistics")
-			return
-		}
-
-	}
-}
-
-// Statistic represents the information returned by a single monitor client.
-type Statistic struct {
-	Name   string                 `json:"name"`
-	Tags   map[string]string      `json:"tags"`
-	Values map[string]interface{} `json:"values"`
-}
-
-// newStatistic returns a new statistic object.
-func newStatistic(name string, tags map[string]string, values map[string]interface{}) *Statistic {
-	return &Statistic{
-		Name:   name,
-		Tags:   tags,
-		Values: values,
-	}
-}
-
-// valueNames returns a sorted list of the value names, if any.
-func (s *Statistic) valueNames() []string {
-	a := make([]string, 0, len(s.Values))
-	for k, _ := range s.Values {
-		a = append(a, k)
-	}
-	sort.Strings(a)
-	return a
-}
-
-// DiagnosticFromMap returns a Diagnostic from a map.
-func DiagnosticFromMap(m map[string]interface{}) *Diagnostic {
-	// Display columns in deterministic order.
-	sortedKeys := make([]string, 0, len(m))
-	for k, _ := range m {
-		sortedKeys = append(sortedKeys, k)
-	}
-	sort.Strings(sortedKeys)
-
-	d := NewDiagnostic(sortedKeys)
-	row := make([]interface{}, len(sortedKeys))
-	for i, k := range sortedKeys {
-		row[i] = m[k]
-	}
-	d.AddRow(row)
-
-	return d
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/monitor/service_test.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/monitor/service_test.go
deleted file mode 100644
index 776e59a57..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/monitor/service_test.go
+++ /dev/null
@@ -1,72 +0,0 @@
-package monitor
-
-import (
-	"strings"
-	"testing"
-	"time"
-
-	"github.com/influxdb/influxdb"
-	"github.com/influxdb/influxdb/influxql"
-	"github.com/influxdb/influxdb/meta"
-)
-
-// Test that a registered stats client results in the correct SHOW STATS output.
-func Test_RegisterStats(t *testing.T) {
-	monitor := openMonitor(t)
-	executor := &StatementExecutor{Monitor: monitor}
-
-	// Register stats without tags.
-	statMap := influxdb.NewStatistics("foo", "foo", nil)
-	statMap.Add("bar", 1)
-	statMap.AddFloat("qux", 2.4)
-	json := executeShowStatsJSON(t, executor)
-	if !strings.Contains(json, `"columns":["bar","qux"],"values":[[1,2.4]]`) || !strings.Contains(json, `"name":"foo"`) {
-		t.Fatalf("SHOW STATS response incorrect, got: %s\n", json)
-	}
-
-	// Register a client with tags.
-	statMap = influxdb.NewStatistics("bar", "baz", map[string]string{"proto": "tcp"})
-	statMap.Add("bar", 1)
-	statMap.AddFloat("qux", 2.4)
-	json = executeShowStatsJSON(t, executor)
-	if !strings.Contains(json, `"columns":["bar","qux"],"values":[[1,2.4]]`) ||
-		!strings.Contains(json, `"name":"baz"`) ||
-		!strings.Contains(json, `"proto":"tcp"`) {
-		t.Fatalf("SHOW STATS response incorrect, got: %s\n", json)
-
-	}
-}
-
-type mockMetastore struct{}
-
-func (m *mockMetastore) ClusterID() (uint64, error)                            { return 1, nil }
-func (m *mockMetastore) NodeID() uint64                                        { return 2 }
-func (m *mockMetastore) WaitForLeader(d time.Duration) error                   { return nil }
-func (m *mockMetastore) IsLeader() bool                                        { return true }
-func (m *mockMetastore) SetDefaultRetentionPolicy(database, name string) error { return nil }
-func (m *mockMetastore) DropRetentionPolicy(database, name string) error       { return nil }
-func (m *mockMetastore) CreateDatabaseIfNotExists(name string) (*meta.DatabaseInfo, error) {
-	return nil, nil
-}
-func (m *mockMetastore) CreateRetentionPolicyIfNotExists(database string, rpi *meta.RetentionPolicyInfo) (*meta.RetentionPolicyInfo, error) {
-	return nil, nil
-}
-
-func openMonitor(t *testing.T) *Monitor {
-	monitor := New(NewConfig())
-	monitor.MetaStore = &mockMetastore{}
-	err := monitor.Open()
-	if err != nil {
-		t.Fatalf("failed to open monitor: %s", err.Error())
-	}
-	return monitor
-}
-
-func executeShowStatsJSON(t *testing.T, s *StatementExecutor) string {
-	r := s.ExecuteStatement(&influxql.ShowStatsStatement{})
-	b, err := r.MarshalJSON()
-	if err != nil {
-		t.Fatalf("failed to decode SHOW STATS response: %s", err.Error())
-	}
-	return string(b)
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/monitor/statement_executor.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/monitor/statement_executor.go
deleted file mode 100644
index 450fc4894..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/monitor/statement_executor.go
+++ /dev/null
@@ -1,81 +0,0 @@
-package monitor
-
-import (
-	"fmt"
-	"sort"
-
-	"github.com/influxdb/influxdb/influxql"
-	"github.com/influxdb/influxdb/models"
-)
-
-// StatementExecutor translates InfluxQL queries to Monitor methods.
-type StatementExecutor struct {
-	Monitor interface {
-		Statistics(map[string]string) ([]*Statistic, error)
-		Diagnostics() (map[string]*Diagnostic, error)
-	}
-}
-
-// ExecuteStatement executes monitor-related query statements.
-func (s *StatementExecutor) ExecuteStatement(stmt influxql.Statement) *influxql.Result {
-	switch stmt := stmt.(type) {
-	case *influxql.ShowStatsStatement:
-		return s.executeShowStatistics(stmt.Module)
-	case *influxql.ShowDiagnosticsStatement:
-		return s.executeShowDiagnostics(stmt.Module)
-	default:
-		panic(fmt.Sprintf("unsupported statement type: %T", stmt))
-	}
-}
-
-func (s *StatementExecutor) executeShowStatistics(module string) *influxql.Result {
-	stats, err := s.Monitor.Statistics(nil)
-	if err != nil {
-		return &influxql.Result{Err: err}
-	}
-	rows := make([]*models.Row, 0)
-
-	for _, stat := range stats {
-		if module != "" && stat.Name != module {
-			continue
-		}
-		row := &models.Row{Name: stat.Name, Tags: stat.Tags}
-
-		values := make([]interface{}, 0, len(stat.Values))
-		for _, k := range stat.valueNames() {
-			row.Columns = append(row.Columns, k)
-			values = append(values, stat.Values[k])
-		}
-		row.Values = [][]interface{}{values}
-		rows = append(rows, row)
-	}
-	return &influxql.Result{Series: rows}
-}
-
-func (s *StatementExecutor) executeShowDiagnostics(module string) *influxql.Result {
-	diags, err := s.Monitor.Diagnostics()
-	if err != nil {
-		return &influxql.Result{Err: err}
-	}
-	rows := make([]*models.Row, 0, len(diags))
-
-	// Get a sorted list of diagnostics keys.
-	sortedKeys := make([]string, 0, len(diags))
-	for k, _ := range diags {
-		sortedKeys = append(sortedKeys, k)
-	}
-	sort.Strings(sortedKeys)
-
-	for _, k := range sortedKeys {
-		if module != "" && k != module {
-			continue
-		}
-
-		row := &models.Row{Name: k}
-
-		row.Columns = diags[k].Columns
-		row.Values = diags[k].Rows
-		rows = append(rows, row)
-	}
-	return &influxql.Result{Series: rows}
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/monitor/system.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/monitor/system.go
deleted file mode 100644
index 1f113f176..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/monitor/system.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package monitor
-
-import (
-	"os"
-	"time"
-)
-
-var startTime time.Time
-
-func init() {
-	startTime = time.Now().UTC()
-}
-
-// system captures system-level diagnostics
-type system struct{}
-
-func (s *system) Diagnostics() (*Diagnostic, error) {
-	diagnostics := map[string]interface{}{
-		"PID":         os.Getpid(),
-		"currentTime": time.Now().UTC(),
-		"started":     startTime,
-		"uptime":      time.Since(startTime).String(),
-	}
-
-	return DiagnosticFromMap(diagnostics), nil
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/nightly.sh b/Godeps/_workspace/src/github.com/influxdb/influxdb/nightly.sh
deleted file mode 100644
index edd50d2a4..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/nightly.sh
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/bin/bash
-
-SWAKS="/root/swaks"
-
-# Bump this whenever a release branch is created from master
-MASTER_VERSION=0.9.5
-
-# send_failure_notification sends an e-mail with a build failure notification.
-function send_failure_notification {
-    smtp=$1
-    user=$2
-    password=$3
-    to=$4
-    version=$5
-    $SWAKS --auth \
-        --server $smtp \
-        --au $user \
-        --ap $password \
-        --to $to \
-        --h-Subject: "Nightly build has FAILED" \
-        --body "The nightly build has failed, version: $version"
-}
-
-if [ $# -lt 4 ]; then
-    echo "$0 <smtp server> <user> <password> <to> [RACE_ENABLED]"
-    exit 1
-fi
-SMTP=$1
-USER=$2
-PASSWORD=$3
-TO=$4
-RACE_ENABLED=$5
-
-if [ -n "$RACE_ENABLED" ]; then
-    race="-x"
-    echo "Race-detection build enabled."
-fi
-
-REPO_DIR=`mktemp -d`
-echo "Using $REPO_DIR for all work..."
-
-cd $REPO_DIR
-export GOPATH=`pwd`
-mkdir -p $GOPATH/src/github.com/influxdb
-cd $GOPATH/src/github.com/influxdb
-git clone https://github.com/influxdb/influxdb.git
-
-cd $GOPATH/src/github.com/influxdb/influxdb
-VERSION="$MASTER_VERSION-nightly-`git log --pretty=format:'%h' -n 1`"
-NIGHTLY_BUILD=true ./package.sh $race $VERSION
-
-if [ $? -ne 0 ]; then
-    # Send notification e-mail.
-    send_failure_notification $SMTP $USER $PASSWORD $TO $VERSION
-fi
-
-rm -rf $REPO_DIR
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/package.sh b/Godeps/_workspace/src/github.com/influxdb/influxdb/package.sh
deleted file mode 100644
index 70e41c426..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/package.sh
+++ /dev/null
@@ -1,612 +0,0 @@
-#!/usr/bin/env bash
-
-###########################################################################
-# Packaging script which creates debian and RPM packages. It optionally
-# tags the repo with the given version.
-#
-# Requirements: GOPATH must be set. 'fpm' must be on the path, and the AWS
-# CLI tools must also be installed.
-#
-#    https://github.com/jordansissel/fpm
-#    http://aws.amazon.com/cli/
-#
-# Packaging process: to package a build, simple execute:
-#
-#    package.sh <version>
-#
-# where <version> is the desired version. If generation of a debian and RPM
-# package is successful, the script will offer to tag the repo using the
-# supplied version string.
-#
-# See package.sh -h for options
-#
-# AWS upload: the script will also offer to upload the packages to S3. If
-# this option is selected, the credentials should be present in the file
-# ~/aws.conf. The contents should be of the form:
-#
-#    [default]
-#    aws_access_key_id=<access ID>
-#    aws_secret_access_key=<secret key>
-#    region = us-east-1
-#
-# Trim the leading spaces when creating the file. The script will exit if
-# S3 upload is requested, but this file does not exist.
-
-[ -z $DEBUG ] || set -x
-
-AWS_FILE=~/aws.conf
-
-INSTALL_ROOT_DIR=/opt/influxdb
-INFLUXDB_LOG_DIR=/var/log/influxdb
-INFLUXDB_DATA_DIR=/var/opt/influxdb
-CONFIG_ROOT_DIR=/etc/opt/influxdb
-LOGROTATE_DIR=/etc/logrotate.d
-
-SAMPLE_CONFIGURATION=etc/config.sample.toml
-INITD_SCRIPT=scripts/init.sh
-SYSTEMD_SCRIPT=scripts/influxdb.service
-LOGROTATE=scripts/logrotate
-
-TMP_WORK_DIR=`mktemp -d`
-POST_INSTALL_PATH=`mktemp`
-POST_UNINSTALL_PATH=`mktemp`
-ARCH=`uname -i`
-LICENSE=MIT
-URL=influxdb.com
-MAINTAINER=support@influxdb.com
-VENDOR=Influxdb
-DESCRIPTION="Distributed time-series database"
-
-# Allow path to FPM to be set by environment variables. Some execution contexts
-# like cron don't have PATH set correctly to pick it up.
-if [ -z "$FPM" ]; then
-    FPM=`which fpm`
-fi
-
-GO_VERSION="go1.4.2"
-GOPATH_INSTALL=
-BINS=(
-    influxd
-    influx
-    influx_stress
-    influx_inspect
-    )
-
-###########################################################################
-# Helper functions.
-
-# usage prints simple usage information.
-usage() {
-    cat << EOF >&2
-$0 [-h] [-p|-w] [-t <dist>] [-r <number>] <version>
-
-    <version> should be a dotted version such as 0.9.5.
-
-    -r release candidate number, if any.
-       Example: -r 7
-    -p just build packages
-    -x build with race-detection enabled
-    -w build packages for current working directory
-       imply -p
-    -t <dist>
-       build package for <dist>
-       <dist> can be rpm, tar or deb
-       can have multiple -t
-
-    Examples:
-
-        $0 0.9.5 -r 9 # Creates 0.9.5-rc9
-        $0 0.9.4      # Creates 0.9.4
-
-EOF
-    cleanup_exit $1
-}
-
-# full_version echoes the full version string, given a version and an optiona;l
-# RC number. If the just the version is present, that is echoed. If the RC is
-# also provided, then "rc" and the number is concatenated with the version.
-# For example, 0.9.4rc4 would be returned if version was 0.9.4 and the RC number
-# was 4.
-full_version() {
-    version=$1
-    rc=$2
-    if [ -z "$rc" ]; then
-        echo $version
-    else
-        echo ${version}-rc${rc}
-    fi
-}
-
-# rpm_release echoes the RPM release or "iteration" given an RC number.
-rpm_release() {
-    rc=$1
-    if [ -z "$rc" ]; then
-        echo 1
-    else
-        echo 0.1.rc${rc}
-    fi
-}
-
-# cleanup_exit removes all resources created during the process and exits with
-# the supplied returned code.
-cleanup_exit() {
-    rm -r $TMP_WORK_DIR
-    rm $POST_INSTALL_PATH
-    rm $POST_UNINSTALL_PATH
-    exit $1
-}
-
-# current_branch echos the current git branch.
-current_branch() {
-    echo `git rev-parse --abbrev-ref HEAD`
-}
-
-# check_gopath sanity checks the value of the GOPATH env variable, and determines
-# the path where build artifacts are installed. GOPATH may be a colon-delimited
-# list of directories.
-check_gopath() {
-    [ -z "$GOPATH" ] && echo "GOPATH is not set." && cleanup_exit 1
-    GOPATH_INSTALL=`echo $GOPATH | cut -d ':' -f 1`
-    [ ! -d "$GOPATH_INSTALL" ] && echo "GOPATH_INSTALL is not a directory." && cleanup_exit 1
-    echo "GOPATH ($GOPATH) looks sane, using $GOPATH_INSTALL for installation."
-}
-
-check_gvm() {
-    if [ -n "$GOPATH" ]; then
-        existing_gopath=$GOPATH
-    fi
-
-    source $HOME/.gvm/scripts/gvm
-    which gvm
-    if [ $? -ne 0 ]; then
-        echo "gvm not found -- aborting."
-        cleanup_exit $1
-    fi
-    gvm use $GO_VERSION
-    if [ $? -ne 0 ]; then
-        echo "gvm cannot find Go version $GO_VERSION -- aborting."
-        cleanup_exit $1
-    fi
-
-    # Keep any existing GOPATH set.
-    if [ -n "$existing_gopath" ]; then
-        GOPATH=$existing_gopath
-    fi
-}
-
-# check_clean_tree ensures that no source file is locally modified.
-check_clean_tree() {
-    modified=$(git ls-files --modified | wc -l)
-    if [ $modified -ne 0 ]; then
-        echo "The source tree is not clean -- aborting."
-        cleanup_exit 1
-    fi
-    echo "Git tree is clean."
-}
-
-# update_tree ensures the tree is in-sync with the repo.
-update_tree() {
-    git pull origin $TARGET_BRANCH
-    if [ $? -ne 0 ]; then
-        echo "Failed to pull latest code -- aborting."
-        cleanup_exit 1
-    fi
-    git fetch --tags
-    if [ $? -ne 0 ]; then
-        echo "Failed to fetch tags -- aborting."
-        cleanup_exit 1
-    fi
-    echo "Git tree updated successfully."
-}
-
-# check_tag_exists checks if the existing release already exists in the tags.
-check_tag_exists () {
-    version=$1
-    git tag | grep -q "^v$version$"
-    if [ $? -eq 0 ]; then
-        echo "Proposed version $version already exists as a tag -- aborting."
-        cleanup_exit 1
-    fi
-}
-
-# make_dir_tree creates the directory structure within the packages.
-make_dir_tree() {
-    work_dir=$1
-    version=$2
-    mkdir -p $work_dir/$INSTALL_ROOT_DIR/versions/$version/scripts
-    if [ $? -ne 0 ]; then
-        echo "Failed to create installation directory -- aborting."
-        cleanup_exit 1
-    fi
-    mkdir -p $work_dir/$CONFIG_ROOT_DIR
-    if [ $? -ne 0 ]; then
-        echo "Failed to create configuration directory -- aborting."
-        cleanup_exit 1
-    fi
-    mkdir -p $work_dir/$LOGROTATE_DIR
-    if [ $? -ne 0 ]; then
-        echo "Failed to create logrotate directory -- aborting."
-        cleanup_exit 1
-    fi
-}
-
-# do_build builds the code. The version and commit must be passed in.
-do_build() {
-    for b in ${BINS[*]}; do
-        rm -f $GOPATH_INSTALL/bin/$b
-    done
-
-    if [ -n "$WORKING_DIR" ]; then
-        STASH=`git stash create -a`
-        if [ $? -ne 0 ]; then
-            echo "WARNING: failed to stash uncommited local changes"
-        fi
-        git reset --hard
-    fi
-
-    go get -u -f -d ./...
-    if [ $? -ne 0 ]; then
-        echo "WARNING: failed to 'go get' packages."
-    fi
-
-    git checkout $TARGET_BRANCH # go get switches to master, so ensure we're back.
-
-    if [ -n "$WORKING_DIR" ]; then
-        git stash apply $STASH
-        if [ $? -ne 0 ]; then #and apply previous uncommited local changes
-            echo "WARNING: failed to restore uncommited local changes"
-        fi
-    fi
-
-    version=$1
-    commit=`git rev-parse HEAD`
-    branch=`current_branch`
-    if [ $? -ne 0 ]; then
-        echo "Unable to retrieve current commit -- aborting"
-        cleanup_exit 1
-    fi
-
-    date=`date -u --iso-8601=seconds`
-    go install $RACE -a -ldflags="-X main.version $version -X main.branch $branch -X main.commit $commit -X main.buildTime $date" ./...
-    if [ $? -ne 0 ]; then
-        echo "Build failed, unable to create package -- aborting"
-        cleanup_exit 1
-    fi
-    echo "Build completed successfully."
-}
-
-# generate_postinstall_script creates the post-install script for the
-# package. It must be passed the version.
-generate_postinstall_script() {
-    version=$1
-    cat  <<EOF >$POST_INSTALL_PATH
-#!/bin/sh
-rm -f $INSTALL_ROOT_DIR/influxd
-rm -f $INSTALL_ROOT_DIR/influx
-rm -f $INSTALL_ROOT_DIR/init.sh
-ln -s $INSTALL_ROOT_DIR/versions/$version/influxd $INSTALL_ROOT_DIR/influxd
-ln -s $INSTALL_ROOT_DIR/versions/$version/influx $INSTALL_ROOT_DIR/influx
-ln -s $INSTALL_ROOT_DIR/versions/$version/influx_inspect $INSTALL_ROOT_DIR/influx_inspect
-ln -s $INSTALL_ROOT_DIR/versions/$version/influx_stress $INSTALL_ROOT_DIR/influx_stress
-ln -s $INSTALL_ROOT_DIR/versions/$version/scripts/init.sh $INSTALL_ROOT_DIR/init.sh
-
-if ! id influxdb >/dev/null 2>&1; then
-        useradd --system -U -M influxdb
-fi
-
-# Systemd
-if which systemctl > /dev/null 2>&1 ; then
-    cp $INSTALL_ROOT_DIR/versions/$version/scripts/influxdb.service \
-        /lib/systemd/system/influxdb.service
-    systemctl enable influxdb
-
-# Sysv
-else
-    rm -f /etc/init.d/influxdb
-    ln -sfn $INSTALL_ROOT_DIR/init.sh /etc/init.d/influxdb
-    chmod +x /etc/init.d/influxdb
-    if which update-rc.d > /dev/null 2>&1 ; then
-        update-rc.d -f influxdb remove
-        update-rc.d influxdb defaults
-    else
-        chkconfig --add influxdb
-    fi
-fi
-
-chown -R -L influxdb:influxdb $INSTALL_ROOT_DIR
-chmod -R a+rX $INSTALL_ROOT_DIR
-
-mkdir -p $INFLUXDB_LOG_DIR
-chown -R -L influxdb:influxdb $INFLUXDB_LOG_DIR
-mkdir -p $INFLUXDB_DATA_DIR
-chown -R -L influxdb:influxdb $INFLUXDB_DATA_DIR
-EOF
-    echo "Post-install script created successfully at $POST_INSTALL_PATH"
-}
-
-###########################################################################
-# Process options
-while :
-do
-  case $1 in
-    -h | --help)
-	    usage 0
-	    ;;
-
-    -p | --packages-only)
-	    PACKAGES_ONLY="PACKAGES_ONLY"
-	    shift
-	    ;;
-
-    -t | --target)
-        case "$2" in
-            'tar') TAR_WANTED="gz"
-                 ;;
-            'deb') DEB_WANTED="deb"
-                 ;;
-            'rpm') RPM_WANTED="rpm"
-                 ;;
-            *)
-                 echo "Unknown target distribution $2"
-                 usage 1
-                 ;;
-        esac
-        shift 2
-        ;;
-
-    -r)
-        RC=$2
-        if [ -z "$RC" ]; then
-            echo "RC number required"
-        fi
-        shift 2
-        ;;
-
-    -x)
-        RACE="-race"
-        shift
-        ;;
-
-    -w | --working-directory)
-	PACKAGES_ONLY="PACKAGES_ONLY"
-        WORKING_DIR="WORKING_DIR"
-	    shift
-	    ;;
-
-    -*)
-        echo "Unknown option $1"
-        usage 1
-        ;;
-
-    ?*)
-        if [ -z $VERSION ]; then
-           VERSION=$1
-           shift
-        else
-           echo "$1 : aborting version already set to $VERSION"
-           usage 1
-        fi
-
-        echo $VERSION | grep -i '[r|c]' 2>&1 >/dev/null
-        if [ $? -ne 1 -a -z "$NIGHTLY_BUILD" ]; then
-            echo
-            echo "$VERSION contains reference to RC - specify RC separately"
-            echo
-            usage 1
-        fi
-        ;;
-
-     *) break
-  esac
-done
-
-if [ -z "$DEB_WANTED$RPM_WANTED$TAR_WANTED" ]; then
-  TAR_WANTED="gz"
-  DEB_WANTED="deb"
-  RPM_WANTED="rpm"
-fi
-
-if [ -z "$VERSION" ]; then
-  echo -e "Missing version"
-  usage 1
-fi
-
-###########################################################################
-# Start the packaging process.
-
-echo -e "\nStarting package process...\n"
-
-# Ensure the current is correct.
-TARGET_BRANCH=`current_branch`
-if [ -z "$NIGHTLY_BUILD" -a -z "$PACKAGES_ONLY" ]; then
-echo -n "Current branch is $TARGET_BRANCH. Start packaging this branch? [Y/n] "
-    read response
-    response=`echo $response | tr 'A-Z' 'a-z'`
-    if [ "x$response" == "xn" ]; then
-        echo "Packaging aborted."
-        cleanup_exit 1
-    fi
-fi
-
-check_gvm
-check_gopath
-if [ -z "$NIGHTLY_BUILD" -a -z "$PACKAGES_ONLY" ]; then
-       check_clean_tree
-       update_tree
-       check_tag_exists `full_version $VERSION $RC`
-fi
-
-do_build `full_version $VERSION $RC`
-make_dir_tree $TMP_WORK_DIR `full_version $VERSION $RC`
-
-###########################################################################
-# Copy the assets to the installation directories.
-
-for b in ${BINS[*]}; do
-    cp $GOPATH_INSTALL/bin/$b $TMP_WORK_DIR/$INSTALL_ROOT_DIR/versions/`full_version $VERSION $RC`
-    if [ $? -ne 0 ]; then
-        echo "Failed to copy binaries to packaging directory -- aborting."
-        cleanup_exit 1
-    fi
-done
-echo "${BINS[*]} copied to $TMP_WORK_DIR/$INSTALL_ROOT_DIR/versions/`full_version $VERSION $RC`"
-
-cp $INITD_SCRIPT $TMP_WORK_DIR/$INSTALL_ROOT_DIR/versions/`full_version $VERSION $RC`/scripts
-if [ $? -ne 0 ]; then
-    echo "Failed to copy init.d script to packaging directory -- aborting."
-    cleanup_exit 1
-fi
-echo "$INITD_SCRIPT copied to $TMP_WORK_DIR/$INSTALL_ROOT_DIR/versions/`full_version $VERSION $RC`/scripts"
-
-cp $SYSTEMD_SCRIPT $TMP_WORK_DIR/$INSTALL_ROOT_DIR/versions/`full_version $VERSION $RC`/scripts
-if [ $? -ne 0 ]; then
-    echo "Failed to copy systemd script to packaging directory -- aborting."
-    cleanup_exit 1
-fi
-echo "$SYSTEMD_SCRIPT copied to $TMP_WORK_DIR/$INSTALL_ROOT_DIR/versions/`full_version $VERSION $RC`/scripts"
-
-cp $SAMPLE_CONFIGURATION $TMP_WORK_DIR/$CONFIG_ROOT_DIR/influxdb.conf
-if [ $? -ne 0 ]; then
-    echo "Failed to copy $SAMPLE_CONFIGURATION to packaging directory -- aborting."
-    cleanup_exit 1
-fi
-
-install -m 644 $LOGROTATE $TMP_WORK_DIR/$LOGROTATE_DIR/influxdb
-if [ $? -ne 0 ]; then
-    echo "Failed to copy logrotate configuration to packaging directory -- aborting."
-    cleanup_exit 1
-fi
-
-generate_postinstall_script `full_version $VERSION $RC`
-
-###########################################################################
-# Create the actual packages.
-
-if [ -z "$NIGHTLY_BUILD" -a -z "$PACKAGES_ONLY" ]; then
-    echo -n "Commence creation of $ARCH packages, version `full_version $VERSION $RC`? [Y/n] "
-    read response
-    response=`echo $response | tr 'A-Z' 'a-z'`
-    if [ "x$response" == "xn" ]; then
-        echo "Packaging aborted."
-        cleanup_exit 1
-    fi
-fi
-
-COMMON_FPM_ARGS="\
---log error \
--C $TMP_WORK_DIR \
---vendor $VENDOR \
---url $URL \
---license $LICENSE \
---maintainer $MAINTAINER \
---after-install $POST_INSTALL_PATH \
---after-remove $POST_UNINSTALL_PATH \
---name influxdb${RACE} \
---config-files $CONFIG_ROOT_DIR \
---config-files $LOGROTATE_DIR"
-
-if [ -n "$DEB_WANTED" ]; then
-    $FPM -s dir -t deb $deb_args --description "$DESCRIPTION" $COMMON_FPM_ARGS --version `full_version $VERSION $RC` .
-    if [ $? -ne 0 ]; then
-        echo "Failed to create Debian package -- aborting."
-        cleanup_exit 1
-    fi
-    echo "Debian package created successfully."
-fi
-
-if [ -n "$TAR_WANTED" ]; then
-    if [ -n "$RACE" ]; then
-        # Tweak race prefix for tarball.
-        race="race_"
-    fi
-    $FPM -s dir -t tar --prefix influxdb_$race`full_version $VERSION $RC`_${ARCH} -p influxdb_$race`full_version $VERSION $RC`_${ARCH}.tar.gz --description "$DESCRIPTION" $COMMON_FPM_ARGS --version `full_version $VERSION $RC ` .
-    if [ $? -ne 0 ]; then
-        echo "Failed to create Tar package -- aborting."
-        cleanup_exit 1
-    fi
-    echo "Tar package created successfully."
-fi
-
-if [ -n "$RPM_WANTED" ]; then
-    $rpm_args $FPM -s dir -t rpm --description "$DESCRIPTION" $COMMON_FPM_ARGS --depends coreutils --version $VERSION --iteration `rpm_release $RC` .
-    if [ $? -ne 0 ]; then
-        echo "Failed to create RPM package -- aborting."
-        cleanup_exit 1
-    fi
-    echo "RPM package created successfully."
-fi
-
-###########################################################################
-# Offer to tag the repo.
-
-if [ -z "$NIGHTLY_BUILD" -a -z "$PACKAGES_ONLY" ]; then
-    echo -n "Tag source tree with v`full_version $VERSION $RC` and push to repo? [y/N] "
-    read response
-    response=`echo $response | tr 'A-Z' 'a-z'`
-    if [ "x$response" == "xy" ]; then
-        echo "Creating tag v`full_version $VERSION $RC` and pushing to repo"
-        git tag v`full_version $VERSION $RC`
-        if [ $? -ne 0 ]; then
-            echo "Failed to create tag v`full_version $VERSION $RC` -- aborting"
-            cleanup_exit 1
-        fi
-        echo "Tag v`full_version $VERSION $RC` created"
-        git push origin v`full_version $VERSION $RC`
-        if [ $? -ne 0 ]; then
-            echo "Failed to push tag v`full_version $VERSION $RC` to repo -- aborting"
-            cleanup_exit 1
-        fi
-        echo "Tag v`full_version $VERSION $RC` pushed to repo"
-    else
-        echo "Not creating tag v`full_version $VERSION $RC`."
-    fi
-fi
-
-###########################################################################
-# Offer to publish the packages.
-
-if [ -z "$NIGHTLY_BUILD" -a -z "$PACKAGES_ONLY" ]; then
-    echo -n "Publish packages to S3? [y/N] "
-    read response
-    response=`echo $response | tr 'A-Z' 'a-z'`
-fi
-
-if [ "x$response" == "xy" -o -n "$NIGHTLY_BUILD" ]; then
-    echo "Publishing packages to S3."
-    if [ ! -e "$AWS_FILE" ]; then
-        echo "$AWS_FILE does not exist -- aborting."
-        cleanup_exit 1
-    fi
-
-    for filepath in `ls *.{$DEB_WANTED,$RPM_WANTED,$TAR_WANTED} 2> /dev/null`; do
-        filename=`basename $filepath`
-
-        if [ -n "$NIGHTLY_BUILD" ]; then
-            # Replace the version string in the filename with "nightly".
-            v=`full_version $VERSION $RC`
-            v_underscored=`echo "$v" | tr - _`
-            v_rpm=$VERSION-`rpm_release $RC`
-
-            # It's ok to run each of these since only 1 will match, leaving
-            # filename untouched otherwise.
-            filename=`echo $filename | sed s/$v/nightly/`
-            filename=`echo $filename | sed s/$v_underscored/nightly/`
-            filename=`echo $filename | sed s/$v_rpm/nightly-1/`
-        fi
-
-        AWS_CONFIG_FILE=$AWS_FILE aws s3 cp $filepath s3://influxdb/$filename --acl public-read --region us-east-1
-        if [ $? -ne 0 ]; then
-            echo "Upload failed ($filename) -- aborting".
-            cleanup_exit 1
-        fi
-        echo "$filename uploaded"
-    done
-else
-    echo "Not publishing packages to S3."
-fi
-
-###########################################################################
-# All done.
-
-echo -e "\nPackaging process complete."
-cleanup_exit 0
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/pkg/READEME.md b/Godeps/_workspace/src/github.com/influxdb/influxdb/pkg/READEME.md
deleted file mode 100644
index 1c73a9e85..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/pkg/READEME.md
+++ /dev/null
@@ -1,5 +0,0 @@
-pkg/ is a collection of utility packages used by the InfluxDB project without being specific to its internals.
-
-Utility packages are kept separate from the InfluxDB core codebase to keep it as small and concise as possible.  If some utilities grow larger and their APIs stabilize, they may be moved to their own repository under the InfluxDB organization, to facilitate re-use by other projects. However that is not the priority.
-
-Because utility packages are small and neatly separated from the rest of the codebase, they are a good place to start for aspiring maintainers and contributors. Get in touch if you want to help maintain them!
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/pkg/escape/bytes.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/pkg/escape/bytes.go
deleted file mode 100644
index 15e9cf29d..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/pkg/escape/bytes.go
+++ /dev/null
@@ -1,45 +0,0 @@
-package escape
-
-import "bytes"
-
-func Bytes(in []byte) []byte {
-	for b, esc := range Codes {
-		in = bytes.Replace(in, []byte{b}, esc, -1)
-	}
-	return in
-}
-
-func Unescape(in []byte) []byte {
-	i := 0
-	inLen := len(in)
-	var out []byte
-
-	for {
-		if i >= inLen {
-			break
-		}
-		if in[i] == '\\' && i+1 < inLen {
-			switch in[i+1] {
-			case ',':
-				out = append(out, ',')
-				i += 2
-				continue
-			case '"':
-				out = append(out, '"')
-				i += 2
-				continue
-			case ' ':
-				out = append(out, ' ')
-				i += 2
-				continue
-			case '=':
-				out = append(out, '=')
-				i += 2
-				continue
-			}
-		}
-		out = append(out, in[i])
-		i += 1
-	}
-	return out
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/pkg/escape/bytes_test.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/pkg/escape/bytes_test.go
deleted file mode 100644
index 118ea9668..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/pkg/escape/bytes_test.go
+++ /dev/null
@@ -1,45 +0,0 @@
-package escape
-
-import (
-	"reflect"
-	"testing"
-)
-
-func TestUnescape(t *testing.T) {
-	tests := []struct {
-		in  []byte
-		out []byte
-	}{
-		{
-			[]byte(nil),
-			[]byte(nil),
-		},
-
-		{
-			[]byte(""),
-			[]byte(nil),
-		},
-
-		{
-			[]byte("\\,\\\"\\ \\="),
-			[]byte(",\" ="),
-		},
-
-		{
-			[]byte("\\\\"),
-			[]byte("\\\\"),
-		},
-
-		{
-			[]byte("plain and simple"),
-			[]byte("plain and simple"),
-		},
-	}
-
-	for ii, tt := range tests {
-		got := Unescape(tt.in)
-		if !reflect.DeepEqual(got, tt.out) {
-			t.Errorf("[%d] Unescape(%#v) = %#v, expected %#v", ii, string(tt.in), string(got), string(tt.out))
-		}
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/pkg/escape/strings.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/pkg/escape/strings.go
deleted file mode 100644
index 330fbf422..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/pkg/escape/strings.go
+++ /dev/null
@@ -1,34 +0,0 @@
-package escape
-
-import "strings"
-
-var (
-	Codes = map[byte][]byte{
-		',': []byte(`\,`),
-		'"': []byte(`\"`),
-		' ': []byte(`\ `),
-		'=': []byte(`\=`),
-	}
-
-	codesStr = map[string]string{}
-)
-
-func init() {
-	for k, v := range Codes {
-		codesStr[string(k)] = string(v)
-	}
-}
-
-func UnescapeString(in string) string {
-	for b, esc := range codesStr {
-		in = strings.Replace(in, esc, b, -1)
-	}
-	return in
-}
-
-func String(in string) string {
-	for b, esc := range codesStr {
-		in = strings.Replace(in, b, esc, -1)
-	}
-	return in
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/pkg/slices/strings.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/pkg/slices/strings.go
deleted file mode 100644
index 094d4a32e..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/pkg/slices/strings.go
+++ /dev/null
@@ -1,40 +0,0 @@
-package slices
-
-import "strings"
-
-// Union combines two string sets
-func Union(setA, setB []string, ignoreCase bool) []string {
-	for _, b := range setB {
-		if ignoreCase {
-			if !ExistsIgnoreCase(setA, b) {
-				setA = append(setA, b)
-			}
-			continue
-		}
-		if !Exists(setA, b) {
-			setA = append(setA, b)
-		}
-	}
-	return setA
-}
-
-// Exists checks if a string is in a set
-func Exists(set []string, find string) bool {
-	for _, s := range set {
-		if s == find {
-			return true
-		}
-	}
-	return false
-}
-
-// ExistsIgnoreCase checks if a string is in a set but ignores its case
-func ExistsIgnoreCase(set []string, find string) bool {
-	find = strings.ToLower(find)
-	for _, s := range set {
-		if strings.ToLower(s) == find {
-			return true
-		}
-	}
-	return false
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/scripts/influxdb.service b/Godeps/_workspace/src/github.com/influxdb/influxdb/scripts/influxdb.service
deleted file mode 100644
index e8633acb0..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/scripts/influxdb.service
+++ /dev/null
@@ -1,19 +0,0 @@
-# If you modify this, please also make sure to edit init.sh
-
-[Unit]
-Description=InfluxDB is an open-source, distributed, time series database
-Documentation=https://influxdb.com/docs/
-After=network.target
-
-[Service]
-User=influxdb
-Group=influxdb
-LimitNOFILE=65536
-EnvironmentFile=-/etc/default/influxdb
-ExecStart=/opt/influxdb/influxd -config /etc/opt/influxdb/influxdb.conf $INFLUXD_OPTS
-KillMode=process
-Restart=on-failure
-
-[Install]
-WantedBy=multi-user.target
-Alias=influxd.service
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/scripts/init.sh b/Godeps/_workspace/src/github.com/influxdb/influxdb/scripts/init.sh
deleted file mode 100644
index cbee4ce3a..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/scripts/init.sh
+++ /dev/null
@@ -1,218 +0,0 @@
-#! /usr/bin/env bash
-
-### BEGIN INIT INFO
-# Provides:          influxd
-# Required-Start:    $all
-# Required-Stop:     $remote_fs $syslog
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: Start influxd at boot time
-### END INIT INFO
-
-# If you modify this, please make sure to also edit influxdb.service
-# this init script supports three different variations:
-#  1. New lsb that define start-stop-daemon
-#  2. Old lsb that don't have start-stop-daemon but define, log, pidofproc and killproc
-#  3. Centos installations without lsb-core installed
-#
-# In the third case we have to define our own functions which are very dumb
-# and expect the args to be positioned correctly.
-
-# Command-line options that can be set in /etc/default/influxdb.  These will override
-# any config file values. Example: "-join http://1.2.3.4:8086"
-DEFAULT=/etc/default/influxdb
-
-# Daemon options
-INFLUXD_OPTS=
-
-# Process name ( For display )
-NAME=influxdb
-
-# User and group
-USER=influxdb
-GROUP=influxdb
-
-# Daemon name, where is the actual executable
-# If the daemon is not there, then exit.
-DAEMON=/opt/influxdb/influxd
-[ -x $DAEMON ] || exit 5
-
-# Configuration file
-CONFIG=/etc/opt/influxdb/influxdb.conf
-
-# PID file for the daemon
-PIDFILE=/var/run/influxdb/influxd.pid
-PIDDIR=`dirname $PIDFILE`
-if [ ! -d "$PIDDIR" ]; then
-    mkdir -p $PIDDIR
-    chown $USER:$GROUP $PIDDIR
-fi
-
-# Max open files
-OPEN_FILE_LIMIT=65536
-
-if [ -r /lib/lsb/init-functions ]; then
-    source /lib/lsb/init-functions
-fi
-
-# Logging
-if [ -z "$STDOUT" ]; then
-    STDOUT=/dev/null
-fi
-
-if [ ! -f "$STDOUT" ]; then
-    mkdir -p $(dirname $STDOUT)
-fi
-
-if [ -z "$STDERR" ]; then
-    STDERR=/var/log/influxdb/influxd.log
-fi
-
-if [ ! -f "$STDERR" ]; then
-    mkdir -p $(dirname $STDERR)
-fi
-
-# Overwrite init script variables with /etc/default/influxdb values
-if [ -r $DEFAULT ]; then
-    source $DEFAULT
-fi
-
-function pidofproc() {
-    if [ $# -ne 3 ]; then
-        echo "Expected three arguments, e.g. $0 -p pidfile daemon-name"
-    fi
-
-    PID=`pgrep -f $3`
-    local PIDFILE=`cat $2`
-
-    if [ "x$PIDFILE" == "x" ]; then
-        return 1
-    fi
-
-    if [ "x$PID" != "x" -a "$PIDFILE" == "$PID" ]; then
-        return 0
-    fi
-
-    return 1
-}
-
-function killproc() {
-    if [ $# -ne 3 ]; then
-        echo "Expected three arguments, e.g. $0 -p pidfile signal"
-    fi
-
-    PID=`cat $2`
-
-    /bin/kill -s $3 $PID
-    while true; do
-        pidof `basename $DAEMON` >/dev/null
-        if [ $? -ne 0 ]; then
-            return 0
-        fi
-
-        sleep 1
-        n=$(expr $n + 1)
-        if [ $n -eq 30 ]; then
-            /bin/kill -s SIGKILL $PID
-            return 0
-        fi
-    done
-}
-
-function log_failure_msg() {
-    echo "$@" "[ FAILED ]"
-}
-
-function log_success_msg() {
-    echo "$@" "[ OK ]"
-}
-
-case $1 in
-    start)
-        # Check if config file exist
-        if [ ! -r $CONFIG ]; then
-            log_failure_msg "config file doesn't exists"
-            exit 4
-        fi
-
-        # Checked the PID file exists and check the actual status of process
-        if [ -e $PIDFILE ]; then
-            pidofproc -p $PIDFILE $DAEMON > /dev/null 2>&1 && STATUS="0" || STATUS="$?"
-            # If the status is SUCCESS then don't need to start again.
-            if [ "x$STATUS" = "x0" ]; then
-                log_failure_msg "$NAME process is running"
-                exit 0 # Exit
-            fi
-        # if PID file does not exist, check if writable
-        else
-            su -s /bin/sh -c "touch $PIDFILE" $USER > /dev/null 2>&1
-            if [ $? -ne 0 ]; then
-                log_failure_msg "$PIDFILE not writable, check permissions"
-                exit 5
-            fi
-        fi
-
-        # Bump the file limits, before launching the daemon. These will carry over to
-        # launched processes.
-        ulimit -n $OPEN_FILE_LIMIT
-        if [ $? -ne 0 ]; then
-            log_failure_msg "set open file limit to $OPEN_FILE_LIMIT"
-            exit 1
-        fi
-
-        log_success_msg "Starting the process" "$NAME"
-        if which start-stop-daemon > /dev/null 2>&1; then
-            start-stop-daemon --chuid $GROUP:$USER --start --quiet --pidfile $PIDFILE --exec $DAEMON -- -pidfile $PIDFILE -config $CONFIG $INFLUXD_OPTS >>$STDOUT 2>>$STDERR &
-        else
-            su -s /bin/sh -c "nohup $DAEMON -pidfile $PIDFILE -config $CONFIG $INFLUXD_OPTS >>$STDOUT 2>>$STDERR &" $USER
-        fi
-        log_success_msg "$NAME process was started"
-        ;;
-
-    stop)
-        # Stop the daemon.
-        if [ -e $PIDFILE ]; then
-            pidofproc -p $PIDFILE $DAEMON > /dev/null 2>&1 && STATUS="0" || STATUS="$?"
-            if [ "$STATUS" = 0 ]; then
-                if killproc -p $PIDFILE SIGTERM && /bin/rm -rf $PIDFILE; then
-                    log_success_msg "$NAME process was stopped"
-                else
-                    log_failure_msg "$NAME failed to stop service"
-                fi
-            fi
-        else
-            log_failure_msg "$NAME process is not running"
-        fi
-        ;;
-
-    restart)
-        # Restart the daemon.
-        $0 stop && sleep 2 && $0 start
-        ;;
-
-    status)
-        # Check the status of the process.
-        if [ -e $PIDFILE ]; then
-            if pidofproc -p $PIDFILE $DAEMON > /dev/null; then
-                log_success_msg "$NAME Process is running"
-                exit 0
-            else
-                log_failure_msg "$NAME Process is not running"
-                exit 1
-            fi
-        else
-            log_failure_msg "$NAME Process is not running"
-            exit 3
-        fi
-        ;;
-
-    version)
-        $DAEMON version
-        ;;
-
-    *)
-        # For invalid arguments, print the usage message.
-        echo "Usage: $0 {start|stop|restart|status|version}"
-        exit 2
-        ;;
-esac
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/scripts/logrotate b/Godeps/_workspace/src/github.com/influxdb/influxdb/scripts/logrotate
deleted file mode 100644
index de410d48c..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/scripts/logrotate
+++ /dev/null
@@ -1,8 +0,0 @@
-/var/log/influxdb/influxd.log {
-    daily
-    rotate 7
-    missingok
-    dateext
-    copytruncate
-    compress
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/admin/config.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/services/admin/config.go
deleted file mode 100644
index e3c91f8fc..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/admin/config.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package admin
-
-const (
-	// DefaultBindAddress is the default bind address for the HTTP server.
-	DefaultBindAddress = ":8083"
-)
-
-type Config struct {
-	Enabled          bool   `toml:"enabled"`
-	BindAddress      string `toml:"bind-address"`
-	HTTPSEnabled     bool   `toml:"https-enabled"`
-	HTTPSCertificate string `toml:"https-certificate"`
-}
-
-func NewConfig() Config {
-	return Config{
-		BindAddress:      DefaultBindAddress,
-		HTTPSEnabled:     false,
-		HTTPSCertificate: "/etc/ssl/influxdb.pem",
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/admin/config_test.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/services/admin/config_test.go
deleted file mode 100644
index 1ad2e19dd..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/admin/config_test.go
+++ /dev/null
@@ -1,32 +0,0 @@
-package admin_test
-
-import (
-	"testing"
-
-	"github.com/BurntSushi/toml"
-	"github.com/influxdb/influxdb/services/admin"
-)
-
-func TestConfig_Parse(t *testing.T) {
-	// Parse configuration.
-	var c admin.Config
-	if _, err := toml.Decode(`
-enabled = true
-bind-address = ":8083"
-https-enabled = true
-https-certificate = "/dev/null"
-`, &c); err != nil {
-		t.Fatal(err)
-	}
-
-	// Validate configuration.
-	if c.Enabled != true {
-		t.Fatalf("unexpected enabled: %v", c.Enabled)
-	} else if c.BindAddress != ":8083" {
-		t.Fatalf("unexpected bind address: %s", c.BindAddress)
-	} else if c.HTTPSEnabled != true {
-		t.Fatalf("unexpected https enabled: %v", c.HTTPSEnabled)
-	} else if c.HTTPSCertificate != "/dev/null" {
-		t.Fatalf("unexpected https certificate: %v", c.HTTPSCertificate)
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/admin/service.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/services/admin/service.go
deleted file mode 100644
index 0f174b093..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/admin/service.go
+++ /dev/null
@@ -1,111 +0,0 @@
-package admin
-
-import (
-	"crypto/tls"
-	"fmt"
-	"log"
-	"net"
-	"net/http"
-	"os"
-	"strings"
-
-	// Register static assets via statik.
-	_ "github.com/influxdb/influxdb/statik"
-	"github.com/rakyll/statik/fs"
-)
-
-// Service manages the listener for an admin endpoint.
-type Service struct {
-	listener net.Listener
-	addr     string
-	https    bool
-	cert     string
-	err      chan error
-
-	logger *log.Logger
-}
-
-// NewService returns a new instance of Service.
-func NewService(c Config) *Service {
-	return &Service{
-		addr:   c.BindAddress,
-		https:  c.HTTPSEnabled,
-		cert:   c.HTTPSCertificate,
-		err:    make(chan error),
-		logger: log.New(os.Stderr, "[admin] ", log.LstdFlags),
-	}
-}
-
-// Open starts the service
-func (s *Service) Open() error {
-	s.logger.Printf("Starting admin service")
-
-	// Open listener.
-	if s.https {
-		cert, err := tls.LoadX509KeyPair(s.cert, s.cert)
-		if err != nil {
-			return err
-		}
-
-		listener, err := tls.Listen("tcp", s.addr, &tls.Config{
-			Certificates: []tls.Certificate{cert},
-		})
-		if err != nil {
-			return err
-		}
-
-		s.logger.Println("Listening on HTTPS:", listener.Addr().String())
-		s.listener = listener
-	} else {
-		listener, err := net.Listen("tcp", s.addr)
-		if err != nil {
-			return err
-		}
-
-		s.logger.Println("Listening on HTTP:", listener.Addr().String())
-		s.listener = listener
-	}
-
-	// Begin listening for requests in a separate goroutine.
-	go s.serve()
-	return nil
-}
-
-// Close closes the underlying listener.
-func (s *Service) Close() error {
-	if s.listener != nil {
-		return s.listener.Close()
-	}
-	return nil
-}
-
-// SetLogger sets the internal logger to the logger passed in.
-func (s *Service) SetLogger(l *log.Logger) {
-	s.logger = l
-}
-
-// Err returns a channel for fatal errors that occur on the listener.
-func (s *Service) Err() <-chan error { return s.err }
-
-// Addr returns the listener's address. Returns nil if listener is closed.
-func (s *Service) Addr() net.Addr {
-	if s.listener != nil {
-		return s.listener.Addr()
-	}
-	return nil
-}
-
-// serve serves the handler from the listener.
-func (s *Service) serve() {
-	// Instantiate file system from embedded admin.
-	statikFS, err := fs.New()
-	if err != nil {
-		panic(err)
-	}
-
-	// Run file system handler on listener.
-	err = http.Serve(s.listener, http.FileServer(statikFS))
-	if err != nil && !strings.Contains(err.Error(), "closed") {
-		s.err <- fmt.Errorf("listener error: addr=%s, err=%s", s.Addr(), err)
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/admin/service_test.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/services/admin/service_test.go
deleted file mode 100644
index 497b12ea3..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/admin/service_test.go
+++ /dev/null
@@ -1,33 +0,0 @@
-package admin_test
-
-import (
-	"io/ioutil"
-	"net/http"
-	"testing"
-
-	"github.com/influxdb/influxdb/services/admin"
-)
-
-// Ensure service can serve the root index page of the admin.
-func TestService_Index(t *testing.T) {
-	// Start service on random port.
-	s := admin.NewService(admin.Config{BindAddress: "127.0.0.1:0"})
-	if err := s.Open(); err != nil {
-		t.Fatal(err)
-	}
-	defer s.Close()
-
-	// Request root index page.
-	resp, err := http.Get("http://" + s.Addr().String())
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer resp.Body.Close()
-
-	// Validate status code and body.
-	if resp.StatusCode != http.StatusOK {
-		t.Fatalf("unexpected status: %d", resp.StatusCode)
-	} else if _, err := ioutil.ReadAll(resp.Body); err != nil {
-		t.Fatalf("unable to read body: %s", err)
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/collectd/README.md b/Godeps/_workspace/src/github.com/influxdb/influxdb/services/collectd/README.md
deleted file mode 100644
index 6ab1342de..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/collectd/README.md
+++ /dev/null
@@ -1,35 +0,0 @@
-# The collectd Input
-
-The _collectd_ input allows InfluxDB to accept data transmitted in collectd native format. This data is transmitted over UDP.
-
-## A note on UDP/IP OS Buffer sizes
-
-If you're running Linux or FreeBSD, please adjust your OS UDP buffer
-size limit, [see here for more details.](../udp/README.md#a-note-on-udpip-os-buffer-sizes)
-
-## Configuration
-
-Each collectd input allows the binding address, target database, and target retention policy to be set. If the database does not exist, it will be created automatically when the input is initialized. If the retention policy is not configured, then the default retention policy for the database is used. However if the retention policy is set, the retention policy must be explicitly created. The input will not automatically create it.
-
-Each collectd input also performs internal batching of the points it receives, as batched writes to the database are more efficient. The default batch size is 1000, pending batch factor is 5, with a batch timeout of 1 second. This means the input will write batches of maximum size 1000, but if a batch has not reached 1000 points within 1 second of the first point being added to a batch, it will emit that batch regardless of size. The pending batch factor controls how many batches can be in memory at once, allowing the input to transmit a batch, while still building other batches.
-
-The path to the collectd types database file may also be set
-
-## Large UDP packets
-
-Please note that UDP packages larger than the standard size of 1452 are dropped at the time of ingestion, so be sure to set `MaxPacketSize` to 1452 in the collectd configuration.
-
-## Config Example
-
-```
-[collectd]
-  enabled = false
-  bind-address = ":25826" # the bind address
-  database = "collectd" # Name of the database that will be written to
-  retention-policy = ""
-  batch-size = 5000 # will flush if this many points get buffered
-  batch-pending = 10 # number of batches that may be pending in memory
-  batch-timeout = "10s"
-  read-buffer = 0 # UDP read buffer size, 0 means to use OS default
-  typesdb = "/usr/share/collectd/types.db"
-```
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/collectd/collectd_test.conf b/Godeps/_workspace/src/github.com/influxdb/influxdb/services/collectd/collectd_test.conf
deleted file mode 100644
index 97cc4cc08..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/collectd/collectd_test.conf
+++ /dev/null
@@ -1,209 +0,0 @@
-absolute		value:ABSOLUTE:0:U
-apache_bytes		value:DERIVE:0:U
-apache_connections	value:GAUGE:0:65535
-apache_idle_workers	value:GAUGE:0:65535
-apache_requests		value:DERIVE:0:U
-apache_scoreboard	value:GAUGE:0:65535
-ath_nodes		value:GAUGE:0:65535
-ath_stat		value:DERIVE:0:U
-backends		value:GAUGE:0:65535
-bitrate			value:GAUGE:0:4294967295
-bytes			value:GAUGE:0:U
-cache_eviction		value:DERIVE:0:U
-cache_operation		value:DERIVE:0:U
-cache_ratio		value:GAUGE:0:100
-cache_result		value:DERIVE:0:U
-cache_size		value:GAUGE:0:U
-charge			value:GAUGE:0:U
-compression_ratio	value:GAUGE:0:2
-compression		uncompressed:DERIVE:0:U, compressed:DERIVE:0:U
-connections		value:DERIVE:0:U
-conntrack		value:GAUGE:0:4294967295
-contextswitch		value:DERIVE:0:U
-counter			value:COUNTER:U:U
-cpufreq			value:GAUGE:0:U
-cpu			value:DERIVE:0:U
-current_connections	value:GAUGE:0:U
-current_sessions	value:GAUGE:0:U
-current			value:GAUGE:U:U
-delay			value:GAUGE:-1000000:1000000
-derive			value:DERIVE:0:U
-df_complex		value:GAUGE:0:U
-df_inodes		value:GAUGE:0:U
-df			used:GAUGE:0:1125899906842623, free:GAUGE:0:1125899906842623
-disk_latency		read:GAUGE:0:U, write:GAUGE:0:U
-disk_merged		read:DERIVE:0:U, write:DERIVE:0:U
-disk_octets		read:DERIVE:0:U, write:DERIVE:0:U
-disk_ops_complex	value:DERIVE:0:U
-disk_ops		read:DERIVE:0:U, write:DERIVE:0:U
-disk_time		read:DERIVE:0:U, write:DERIVE:0:U
-dns_answer		value:DERIVE:0:U
-dns_notify		value:DERIVE:0:U
-dns_octets		queries:DERIVE:0:U, responses:DERIVE:0:U
-dns_opcode		value:DERIVE:0:U
-dns_qtype_cached	value:GAUGE:0:4294967295
-dns_qtype		value:DERIVE:0:U
-dns_query		value:DERIVE:0:U
-dns_question		value:DERIVE:0:U
-dns_rcode		value:DERIVE:0:U
-dns_reject		value:DERIVE:0:U
-dns_request		value:DERIVE:0:U
-dns_resolver		value:DERIVE:0:U
-dns_response		value:DERIVE:0:U
-dns_transfer		value:DERIVE:0:U
-dns_update		value:DERIVE:0:U
-dns_zops		value:DERIVE:0:U
-duration		seconds:GAUGE:0:U
-email_check		value:GAUGE:0:U
-email_count		value:GAUGE:0:U
-email_size		value:GAUGE:0:U
-entropy			value:GAUGE:0:4294967295
-fanspeed		value:GAUGE:0:U
-file_size		value:GAUGE:0:U
-files			value:GAUGE:0:U
-flow			value:GAUGE:0:U
-fork_rate		value:DERIVE:0:U
-frequency_offset	value:GAUGE:-1000000:1000000
-frequency		value:GAUGE:0:U
-fscache_stat		value:DERIVE:0:U
-gauge			value:GAUGE:U:U
-hash_collisions		value:DERIVE:0:U
-http_request_methods	value:DERIVE:0:U
-http_requests		value:DERIVE:0:U
-http_response_codes	value:DERIVE:0:U
-humidity		value:GAUGE:0:100
-if_collisions		value:DERIVE:0:U
-if_dropped		rx:DERIVE:0:U, tx:DERIVE:0:U
-if_errors		rx:DERIVE:0:U, tx:DERIVE:0:U
-if_multicast		value:DERIVE:0:U
-if_octets		rx:DERIVE:0:U, tx:DERIVE:0:U
-if_packets		rx:DERIVE:0:U, tx:DERIVE:0:U
-if_rx_errors		value:DERIVE:0:U
-if_rx_octets		value:DERIVE:0:U
-if_tx_errors		value:DERIVE:0:U
-if_tx_octets		value:DERIVE:0:U
-invocations		value:DERIVE:0:U
-io_octets		rx:DERIVE:0:U, tx:DERIVE:0:U
-io_packets		rx:DERIVE:0:U, tx:DERIVE:0:U
-ipt_bytes		value:DERIVE:0:U
-ipt_packets		value:DERIVE:0:U
-irq			value:DERIVE:0:U
-latency			value:GAUGE:0:U
-links			value:GAUGE:0:U
-load			shortterm:GAUGE:0:5000, midterm:GAUGE:0:5000, longterm:GAUGE:0:5000
-md_disks		value:GAUGE:0:U
-memcached_command	value:DERIVE:0:U
-memcached_connections	value:GAUGE:0:U
-memcached_items		value:GAUGE:0:U
-memcached_octets	rx:DERIVE:0:U, tx:DERIVE:0:U
-memcached_ops		value:DERIVE:0:U
-memory			value:GAUGE:0:281474976710656
-multimeter		value:GAUGE:U:U
-mutex_operations	value:DERIVE:0:U
-mysql_commands		value:DERIVE:0:U
-mysql_handler		value:DERIVE:0:U
-mysql_locks		value:DERIVE:0:U
-mysql_log_position	value:DERIVE:0:U
-mysql_octets		rx:DERIVE:0:U, tx:DERIVE:0:U
-nfs_procedure		value:DERIVE:0:U
-nginx_connections	value:GAUGE:0:U
-nginx_requests		value:DERIVE:0:U
-node_octets		rx:DERIVE:0:U, tx:DERIVE:0:U
-node_rssi		value:GAUGE:0:255
-node_stat		value:DERIVE:0:U
-node_tx_rate		value:GAUGE:0:127
-objects			value:GAUGE:0:U
-operations		value:DERIVE:0:U
-percent			value:GAUGE:0:100.1
-percent_bytes		value:GAUGE:0:100.1
-percent_inodes		value:GAUGE:0:100.1
-pf_counters		value:DERIVE:0:U
-pf_limits		value:DERIVE:0:U
-pf_source		value:DERIVE:0:U
-pf_states		value:GAUGE:0:U
-pf_state		value:DERIVE:0:U
-pg_blks			value:DERIVE:0:U
-pg_db_size		value:GAUGE:0:U
-pg_n_tup_c		value:DERIVE:0:U
-pg_n_tup_g		value:GAUGE:0:U
-pg_numbackends		value:GAUGE:0:U
-pg_scan			value:DERIVE:0:U
-pg_xact			value:DERIVE:0:U
-ping_droprate		value:GAUGE:0:100
-ping_stddev		value:GAUGE:0:65535
-ping			value:GAUGE:0:65535
-players			value:GAUGE:0:1000000
-power			value:GAUGE:0:U
-protocol_counter	value:DERIVE:0:U
-ps_code			value:GAUGE:0:9223372036854775807
-ps_count		processes:GAUGE:0:1000000, threads:GAUGE:0:1000000
-ps_cputime		user:DERIVE:0:U, syst:DERIVE:0:U
-ps_data			value:GAUGE:0:9223372036854775807
-ps_disk_octets		read:DERIVE:0:U, write:DERIVE:0:U
-ps_disk_ops		read:DERIVE:0:U, write:DERIVE:0:U
-ps_pagefaults		minflt:DERIVE:0:U, majflt:DERIVE:0:U
-ps_rss			value:GAUGE:0:9223372036854775807
-ps_stacksize		value:GAUGE:0:9223372036854775807
-ps_state		value:GAUGE:0:65535
-ps_vm			value:GAUGE:0:9223372036854775807
-queue_length		value:GAUGE:0:U
-records			value:GAUGE:0:U
-requests		value:GAUGE:0:U
-response_time		value:GAUGE:0:U
-response_code		value:GAUGE:0:U
-route_etx		value:GAUGE:0:U
-route_metric		value:GAUGE:0:U
-routes			value:GAUGE:0:U
-serial_octets		rx:DERIVE:0:U, tx:DERIVE:0:U
-signal_noise		value:GAUGE:U:0
-signal_power		value:GAUGE:U:0
-signal_quality		value:GAUGE:0:U
-snr			value:GAUGE:0:U
-spam_check		value:GAUGE:0:U
-spam_score		value:GAUGE:U:U
-spl			value:GAUGE:U:U
-swap_io			value:DERIVE:0:U
-swap			value:GAUGE:0:1099511627776
-tcp_connections		value:GAUGE:0:4294967295
-temperature		value:GAUGE:U:U
-threads			value:GAUGE:0:U
-time_dispersion		value:GAUGE:-1000000:1000000
-timeleft		value:GAUGE:0:U
-time_offset		value:GAUGE:-1000000:1000000
-total_bytes		value:DERIVE:0:U
-total_connections	value:DERIVE:0:U
-total_objects		value:DERIVE:0:U
-total_operations	value:DERIVE:0:U
-total_requests		value:DERIVE:0:U
-total_sessions		value:DERIVE:0:U
-total_threads		value:DERIVE:0:U
-total_time_in_ms	value:DERIVE:0:U
-total_values		value:DERIVE:0:U
-uptime			value:GAUGE:0:4294967295
-users			value:GAUGE:0:65535
-vcl			value:GAUGE:0:65535
-vcpu			value:GAUGE:0:U
-virt_cpu_total		value:DERIVE:0:U
-virt_vcpu		value:DERIVE:0:U
-vmpage_action		value:DERIVE:0:U
-vmpage_faults		minflt:DERIVE:0:U, majflt:DERIVE:0:U
-vmpage_io		in:DERIVE:0:U, out:DERIVE:0:U
-vmpage_number		value:GAUGE:0:4294967295
-volatile_changes	value:GAUGE:0:U
-voltage_threshold	value:GAUGE:U:U, threshold:GAUGE:U:U
-voltage			value:GAUGE:U:U
-vs_memory		value:GAUGE:0:9223372036854775807
-vs_processes		value:GAUGE:0:65535
-vs_threads		value:GAUGE:0:65535
-
-#
-# Legacy types
-# (required for the v5 upgrade target)
-#
-arc_counts		demand_data:COUNTER:0:U, demand_metadata:COUNTER:0:U, prefetch_data:COUNTER:0:U, prefetch_metadata:COUNTER:0:U
-arc_l2_bytes		read:COUNTER:0:U, write:COUNTER:0:U
-arc_l2_size		value:GAUGE:0:U
-arc_ratio		value:GAUGE:0:U
-arc_size		current:GAUGE:0:U, target:GAUGE:0:U, minlimit:GAUGE:0:U, maxlimit:GAUGE:0:U
-mysql_qcache		hits:COUNTER:0:U, inserts:COUNTER:0:U, not_cached:COUNTER:0:U, lowmem_prunes:COUNTER:0:U, queries_in_cache:GAUGE:0:U
-mysql_threads		running:GAUGE:0:U, connected:GAUGE:0:U, cached:GAUGE:0:U, created:COUNTER:0:U
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/collectd/config.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/services/collectd/config.go
deleted file mode 100644
index a243458ae..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/collectd/config.go
+++ /dev/null
@@ -1,69 +0,0 @@
-package collectd
-
-import (
-	"time"
-
-	"github.com/influxdb/influxdb/toml"
-)
-
-const (
-	// DefaultBindAddress is the default port to bind to
-	DefaultBindAddress = ":25826"
-
-	// DefaultDatabase is the default DB to write to
-	DefaultDatabase = "collectd"
-
-	// DefaultRetentionPolicy is the default retention policy of the writes
-	DefaultRetentionPolicy = ""
-
-	// DefaultBatchSize is the default write batch size.
-	DefaultBatchSize = 5000
-
-	// DefaultBatchPending is the default number of pending write batches.
-	DefaultBatchPending = 10
-
-	// DefaultBatchTimeout is the default batch timeout.
-	DefaultBatchDuration = toml.Duration(10 * time.Second)
-
-	DefaultTypesDB = "/usr/share/collectd/types.db"
-
-	// DefaultReadBuffer is the default buffer size for the UDP listener.
-	// Sets the size of the operating system's receive buffer associated with
-	// the UDP traffic. Keep in mind that the OS must be able
-	// to handle the number set here or the UDP listener will error and exit.
-	//
-	// DefaultReadBuffer = 0 means to use the OS default, which is usually too
-	// small for high UDP performance.
-	//
-	// Increasing OS buffer limits:
-	//     Linux:      sudo sysctl -w net.core.rmem_max=<read-buffer>
-	//     BSD/Darwin: sudo sysctl -w kern.ipc.maxsockbuf=<read-buffer>
-	DefaultReadBuffer = 0
-)
-
-// Config represents a configuration for the collectd service.
-type Config struct {
-	Enabled         bool          `toml:"enabled"`
-	BindAddress     string        `toml:"bind-address"`
-	Database        string        `toml:"database"`
-	RetentionPolicy string        `toml:"retention-policy"`
-	BatchSize       int           `toml:"batch-size"`
-	BatchPending    int           `toml:"batch-pending"`
-	BatchDuration   toml.Duration `toml:"batch-timeout"`
-	ReadBuffer      int           `toml:"read-buffer"`
-	TypesDB         string        `toml:"typesdb"`
-}
-
-// NewConfig returns a new instance of Config with defaults.
-func NewConfig() Config {
-	return Config{
-		BindAddress:     DefaultBindAddress,
-		Database:        DefaultDatabase,
-		RetentionPolicy: DefaultRetentionPolicy,
-		ReadBuffer:      DefaultReadBuffer,
-		BatchSize:       DefaultBatchSize,
-		BatchPending:    DefaultBatchPending,
-		BatchDuration:   DefaultBatchDuration,
-		TypesDB:         DefaultTypesDB,
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/collectd/config_test.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/services/collectd/config_test.go
deleted file mode 100644
index c419dcfa9..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/collectd/config_test.go
+++ /dev/null
@@ -1,32 +0,0 @@
-package collectd_test
-
-import (
-	"testing"
-
-	"github.com/BurntSushi/toml"
-	"github.com/influxdb/influxdb/services/collectd"
-)
-
-func TestConfig_Parse(t *testing.T) {
-	// Parse configuration.
-	var c collectd.Config
-	if _, err := toml.Decode(`
-enabled = true
-bind-address = ":9000"
-database = "xxx"
-typesdb = "yyy"
-`, &c); err != nil {
-		t.Fatal(err)
-	}
-
-	// Validate configuration.
-	if c.Enabled != true {
-		t.Fatalf("unexpected enabled: %v", c.Enabled)
-	} else if c.BindAddress != ":9000" {
-		t.Fatalf("unexpected bind address: %s", c.BindAddress)
-	} else if c.Database != "xxx" {
-		t.Fatalf("unexpected database: %s", c.Database)
-	} else if c.TypesDB != "yyy" {
-		t.Fatalf("unexpected types db: %s", c.TypesDB)
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/collectd/service.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/services/collectd/service.go
deleted file mode 100644
index e8bf39d22..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/collectd/service.go
+++ /dev/null
@@ -1,320 +0,0 @@
-package collectd
-
-import (
-	"expvar"
-	"fmt"
-	"log"
-	"net"
-	"os"
-	"strings"
-	"sync"
-	"time"
-
-	"github.com/influxdb/influxdb"
-	"github.com/influxdb/influxdb/cluster"
-	"github.com/influxdb/influxdb/meta"
-	"github.com/influxdb/influxdb/models"
-	"github.com/influxdb/influxdb/tsdb"
-	"github.com/kimor79/gollectd"
-)
-
-const leaderWaitTimeout = 30 * time.Second
-
-// statistics gathered by the collectd service.
-const (
-	statPointsReceived      = "pointsRx"
-	statBytesReceived       = "bytesRx"
-	statPointsParseFail     = "pointsParseFail"
-	statReadFail            = "readFail"
-	statBatchesTrasmitted   = "batchesTx"
-	statPointsTransmitted   = "pointsTx"
-	statBatchesTransmitFail = "batchesTxFail"
-)
-
-// pointsWriter is an internal interface to make testing easier.
-type pointsWriter interface {
-	WritePoints(p *cluster.WritePointsRequest) error
-}
-
-// metaStore is an internal interface to make testing easier.
-type metaStore interface {
-	WaitForLeader(d time.Duration) error
-	CreateDatabaseIfNotExists(name string) (*meta.DatabaseInfo, error)
-}
-
-// Service represents a UDP server which receives metrics in collectd's binary
-// protocol and stores them in InfluxDB.
-type Service struct {
-	Config       *Config
-	MetaStore    metaStore
-	PointsWriter pointsWriter
-	Logger       *log.Logger
-
-	wg      sync.WaitGroup
-	err     chan error
-	stop    chan struct{}
-	conn    *net.UDPConn
-	batcher *tsdb.PointBatcher
-	typesdb gollectd.Types
-	addr    net.Addr
-
-	// expvar-based stats.
-	statMap *expvar.Map
-}
-
-// NewService returns a new instance of the collectd service.
-func NewService(c Config) *Service {
-	s := &Service{
-		Config: &c,
-		Logger: log.New(os.Stderr, "[collectd] ", log.LstdFlags),
-		err:    make(chan error),
-	}
-
-	return s
-}
-
-// Open starts the service.
-func (s *Service) Open() error {
-	s.Logger.Printf("Starting collectd service")
-
-	// Configure expvar monitoring. It's OK to do this even if the service fails to open and
-	// should be done before any data could arrive for the service.
-	key := strings.Join([]string{"collectd", s.Config.BindAddress}, ":")
-	tags := map[string]string{"bind": s.Config.BindAddress}
-	s.statMap = influxdb.NewStatistics(key, "collectd", tags)
-
-	if s.Config.BindAddress == "" {
-		return fmt.Errorf("bind address is blank")
-	} else if s.Config.Database == "" {
-		return fmt.Errorf("database name is blank")
-	} else if s.PointsWriter == nil {
-		return fmt.Errorf("PointsWriter is nil")
-	}
-
-	if err := s.MetaStore.WaitForLeader(leaderWaitTimeout); err != nil {
-		s.Logger.Printf("Failed to detect a cluster leader: %s", err.Error())
-		return err
-	}
-
-	if _, err := s.MetaStore.CreateDatabaseIfNotExists(s.Config.Database); err != nil {
-		s.Logger.Printf("Failed to ensure target database %s exists: %s", s.Config.Database, err.Error())
-		return err
-	}
-
-	if s.typesdb == nil {
-		// Open collectd types.
-		typesdb, err := gollectd.TypesDBFile(s.Config.TypesDB)
-		if err != nil {
-			return fmt.Errorf("Open(): %s", err)
-		}
-		s.typesdb = typesdb
-	}
-
-	// Resolve our address.
-	addr, err := net.ResolveUDPAddr("udp", s.Config.BindAddress)
-	if err != nil {
-		return fmt.Errorf("unable to resolve UDP address: %s", err)
-	}
-	s.addr = addr
-
-	// Start listening
-	conn, err := net.ListenUDP("udp", addr)
-	if err != nil {
-		return fmt.Errorf("unable to listen on UDP: %s", err)
-	}
-
-	if s.Config.ReadBuffer != 0 {
-		err = conn.SetReadBuffer(s.Config.ReadBuffer)
-		if err != nil {
-			return fmt.Errorf("unable to set UDP read buffer to %d: %s",
-				s.Config.ReadBuffer, err)
-		}
-	}
-	s.conn = conn
-
-	s.Logger.Println("Listening on UDP: ", conn.LocalAddr().String())
-
-	// Start the points batcher.
-	s.batcher = tsdb.NewPointBatcher(s.Config.BatchSize, s.Config.BatchPending, time.Duration(s.Config.BatchDuration))
-	s.batcher.Start()
-
-	// Create channel and wait group for signalling goroutines to stop.
-	s.stop = make(chan struct{})
-	s.wg.Add(2)
-
-	// Start goroutines that process collectd packets.
-	go s.serve()
-	go s.writePoints()
-
-	return nil
-}
-
-// Close stops the service.
-func (s *Service) Close() error {
-	// Close the connection, and wait for the goroutine to exit.
-	if s.stop != nil {
-		close(s.stop)
-	}
-	if s.conn != nil {
-		s.conn.Close()
-	}
-	if s.batcher != nil {
-		s.batcher.Stop()
-	}
-	s.wg.Wait()
-
-	// Release all remaining resources.
-	s.stop = nil
-	s.conn = nil
-	s.batcher = nil
-	s.Logger.Println("collectd UDP closed")
-	return nil
-}
-
-// SetLogger sets the internal logger to the logger passed in.
-func (s *Service) SetLogger(l *log.Logger) {
-	s.Logger = l
-}
-
-// SetTypes sets collectd types db.
-func (s *Service) SetTypes(types string) (err error) {
-	s.typesdb, err = gollectd.TypesDB([]byte(types))
-	return
-}
-
-// Err returns a channel for fatal errors that occur on go routines.
-func (s *Service) Err() chan error { return s.err }
-
-// Addr returns the listener's address. Returns nil if listener is closed.
-func (s *Service) Addr() net.Addr {
-	return s.conn.LocalAddr()
-}
-
-func (s *Service) serve() {
-	defer s.wg.Done()
-
-	// From https://collectd.org/wiki/index.php/Binary_protocol
-	//   1024 bytes (payload only, not including UDP / IP headers)
-	//   In versions 4.0 through 4.7, the receive buffer has a fixed size
-	//   of 1024 bytes. When longer packets are received, the trailing data
-	//   is simply ignored. Since version 4.8, the buffer size can be
-	//   configured. Version 5.0 will increase the default buffer size to
-	//   1452 bytes (the maximum payload size when using UDP/IPv6 over
-	//   Ethernet).
-	buffer := make([]byte, 1452)
-
-	for {
-		select {
-		case <-s.stop:
-			// We closed the connection, time to go.
-			return
-		default:
-			// Keep processing.
-		}
-
-		n, _, err := s.conn.ReadFromUDP(buffer)
-		if err != nil {
-			s.statMap.Add(statReadFail, 1)
-			s.Logger.Printf("collectd ReadFromUDP error: %s", err)
-			continue
-		}
-		if n > 0 {
-			s.statMap.Add(statBytesReceived, int64(n))
-			s.handleMessage(buffer[:n])
-		}
-	}
-}
-
-func (s *Service) handleMessage(buffer []byte) {
-	packets, err := gollectd.Packets(buffer, s.typesdb)
-	if err != nil {
-		s.statMap.Add(statPointsParseFail, 1)
-		s.Logger.Printf("Collectd parse error: %s", err)
-		return
-	}
-	for _, packet := range *packets {
-		points := Unmarshal(&packet)
-		for _, p := range points {
-			s.batcher.In() <- p
-		}
-		s.statMap.Add(statPointsReceived, int64(len(points)))
-	}
-}
-
-func (s *Service) writePoints() {
-	defer s.wg.Done()
-
-	for {
-		select {
-		case <-s.stop:
-			return
-		case batch := <-s.batcher.Out():
-			if err := s.PointsWriter.WritePoints(&cluster.WritePointsRequest{
-				Database:         s.Config.Database,
-				RetentionPolicy:  s.Config.RetentionPolicy,
-				ConsistencyLevel: cluster.ConsistencyLevelAny,
-				Points:           batch,
-			}); err == nil {
-				s.statMap.Add(statBatchesTrasmitted, 1)
-				s.statMap.Add(statPointsTransmitted, int64(len(batch)))
-			} else {
-				s.Logger.Printf("failed to write point batch to database %q: %s", s.Config.Database, err)
-				s.statMap.Add(statBatchesTransmitFail, 1)
-			}
-		}
-	}
-}
-
-// Unmarshal translates a collectd packet into InfluxDB data points.
-func Unmarshal(packet *gollectd.Packet) []models.Point {
-	// Prefer high resolution timestamp.
-	var timestamp time.Time
-	if packet.TimeHR > 0 {
-		// TimeHR is "near" nanosecond measurement, but not exactly nanasecond time
-		// Since we store time in microseconds, we round here (mostly so tests will work easier)
-		sec := packet.TimeHR >> 30
-		// Shifting, masking, and dividing by 1 billion to get nanoseconds.
-		nsec := ((packet.TimeHR & 0x3FFFFFFF) << 30) / 1000 / 1000 / 1000
-		timestamp = time.Unix(int64(sec), int64(nsec)).UTC().Round(time.Microsecond)
-	} else {
-		// If we don't have high resolution time, fall back to basic unix time
-		timestamp = time.Unix(int64(packet.Time), 0).UTC()
-	}
-
-	var points []models.Point
-	for i := range packet.Values {
-		name := fmt.Sprintf("%s_%s", packet.Plugin, packet.Values[i].Name)
-		tags := make(map[string]string)
-		fields := make(map[string]interface{})
-
-		fields["value"] = packet.Values[i].Value
-
-		if packet.Hostname != "" {
-			tags["host"] = packet.Hostname
-		}
-		if packet.PluginInstance != "" {
-			tags["instance"] = packet.PluginInstance
-		}
-		if packet.Type != "" {
-			tags["type"] = packet.Type
-		}
-		if packet.TypeInstance != "" {
-			tags["type_instance"] = packet.TypeInstance
-		}
-		p, err := models.NewPoint(name, tags, fields, timestamp)
-		// Drop points values of NaN since they are not supported
-		if err != nil {
-			continue
-		}
-
-		points = append(points, p)
-	}
-	return points
-}
-
-// assert will panic with a given formatted message if the given condition is false.
-func assert(condition bool, msg string, v ...interface{}) {
-	if !condition {
-		panic(fmt.Sprintf("assert failed: "+msg, v...))
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/collectd/service_test.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/services/collectd/service_test.go
deleted file mode 100644
index 5699a7507..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/collectd/service_test.go
+++ /dev/null
@@ -1,501 +0,0 @@
-package collectd
-
-import (
-	"encoding/hex"
-	"errors"
-	"io/ioutil"
-	"log"
-	"net"
-	"testing"
-	"time"
-
-	"github.com/influxdb/influxdb/cluster"
-	"github.com/influxdb/influxdb/meta"
-	"github.com/influxdb/influxdb/models"
-	"github.com/influxdb/influxdb/toml"
-)
-
-// Test that the service checks / creates the target database on startup.
-func TestService_CreatesDatabase(t *testing.T) {
-	t.Parallel()
-
-	s := newTestService(1, time.Second)
-
-	createDatabaseCalled := false
-
-	ms := &testMetaStore{}
-	ms.CreateDatabaseIfNotExistsFn = func(name string) (*meta.DatabaseInfo, error) {
-		if name != s.Config.Database {
-			t.Errorf("\n\texp = %s\n\tgot = %s\n", s.Config.Database, name)
-		}
-		createDatabaseCalled = true
-		return nil, nil
-	}
-	s.Service.MetaStore = ms
-
-	s.Open()
-	s.Close()
-
-	if !createDatabaseCalled {
-		t.Errorf("CreateDatabaseIfNotExists should have been called when the service opened.")
-	}
-}
-
-// Test that the collectd service correctly batches points by BatchSize.
-func TestService_BatchSize(t *testing.T) {
-	t.Parallel()
-
-	totalPoints := len(expPoints)
-
-	// Batch sizes that totalTestPoints divide evenly by.
-	batchSizes := []int{1, 2, 13}
-
-	for _, batchSize := range batchSizes {
-		func() {
-			s := newTestService(batchSize, time.Second)
-
-			pointCh := make(chan models.Point)
-			s.MetaStore.CreateDatabaseIfNotExistsFn = func(name string) (*meta.DatabaseInfo, error) { return nil, nil }
-			s.PointsWriter.WritePointsFn = func(req *cluster.WritePointsRequest) error {
-				if len(req.Points) != batchSize {
-					t.Errorf("\n\texp = %d\n\tgot = %d\n", batchSize, len(req.Points))
-				}
-
-				for _, p := range req.Points {
-					pointCh <- p
-				}
-				return nil
-			}
-
-			if err := s.Open(); err != nil {
-				t.Fatal(err)
-			}
-			defer func() { t.Log("closing service"); s.Close() }()
-
-			// Get the address & port the service is listening on for collectd data.
-			addr := s.Addr()
-			conn, err := net.Dial("udp", addr.String())
-			if err != nil {
-				t.Fatal(err)
-			}
-
-			// Send the test data to the service.
-			if n, err := conn.Write(testData); err != nil {
-				t.Fatal(err)
-			} else if n != len(testData) {
-				t.Fatalf("only sent %d of %d bytes", n, len(testData))
-			}
-
-			points := []models.Point{}
-		Loop:
-			for {
-				select {
-				case p := <-pointCh:
-					points = append(points, p)
-					if len(points) == totalPoints {
-						break Loop
-					}
-				case <-time.After(time.Second):
-					t.Logf("exp %d points, got %d", totalPoints, len(points))
-					t.Fatal("timed out waiting for points from collectd service")
-				}
-			}
-
-			if len(points) != totalPoints {
-				t.Fatalf("exp %d points, got %d", totalPoints, len(points))
-			}
-
-			for i, exp := range expPoints {
-				got := points[i].String()
-				if got != exp {
-					t.Fatalf("\n\texp = %s\n\tgot = %s\n", exp, got)
-				}
-			}
-		}()
-	}
-}
-
-// Test that the collectd service correctly batches points using BatchDuration.
-func TestService_BatchDuration(t *testing.T) {
-	t.Parallel()
-
-	totalPoints := len(expPoints)
-
-	s := newTestService(5000, 250*time.Millisecond)
-
-	pointCh := make(chan models.Point, 1000)
-	s.MetaStore.CreateDatabaseIfNotExistsFn = func(name string) (*meta.DatabaseInfo, error) { return nil, nil }
-	s.PointsWriter.WritePointsFn = func(req *cluster.WritePointsRequest) error {
-		for _, p := range req.Points {
-			pointCh <- p
-		}
-		return nil
-	}
-
-	if err := s.Open(); err != nil {
-		t.Fatal(err)
-	}
-	defer func() { t.Log("closing service"); s.Close() }()
-
-	// Get the address & port the service is listening on for collectd data.
-	addr := s.Addr()
-	conn, err := net.Dial("udp", addr.String())
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// Send the test data to the service.
-	if n, err := conn.Write(testData); err != nil {
-		t.Fatal(err)
-	} else if n != len(testData) {
-		t.Fatalf("only sent %d of %d bytes", n, len(testData))
-	}
-
-	points := []models.Point{}
-Loop:
-	for {
-		select {
-		case p := <-pointCh:
-			points = append(points, p)
-			if len(points) == totalPoints {
-				break Loop
-			}
-		case <-time.After(time.Second):
-			t.Logf("exp %d points, got %d", totalPoints, len(points))
-			t.Fatal("timed out waiting for points from collectd service")
-		}
-	}
-
-	if len(points) != totalPoints {
-		t.Fatalf("exp %d points, got %d", totalPoints, len(points))
-	}
-
-	for i, exp := range expPoints {
-		got := points[i].String()
-		if got != exp {
-			t.Fatalf("\n\texp = %s\n\tgot = %s\n", exp, got)
-		}
-	}
-}
-
-type testService struct {
-	*Service
-	MetaStore    testMetaStore
-	PointsWriter testPointsWriter
-}
-
-func newTestService(batchSize int, batchDuration time.Duration) *testService {
-	s := &testService{
-		Service: NewService(Config{
-			BindAddress:   "127.0.0.1:0",
-			Database:      "collectd_test",
-			BatchSize:     batchSize,
-			BatchDuration: toml.Duration(batchDuration),
-		}),
-	}
-	s.Service.PointsWriter = &s.PointsWriter
-	s.Service.MetaStore = &s.MetaStore
-
-	// Set the collectd types using test string.
-	if err := s.SetTypes(typesDBText); err != nil {
-		panic(err)
-	}
-
-	if !testing.Verbose() {
-		s.Logger = log.New(ioutil.Discard, "", log.LstdFlags)
-	}
-
-	return s
-}
-
-type testPointsWriter struct {
-	WritePointsFn func(*cluster.WritePointsRequest) error
-}
-
-func (w *testPointsWriter) WritePoints(p *cluster.WritePointsRequest) error {
-	return w.WritePointsFn(p)
-}
-
-type testMetaStore struct {
-	CreateDatabaseIfNotExistsFn func(name string) (*meta.DatabaseInfo, error)
-	//DatabaseFn func(name string) (*meta.DatabaseInfo, error)
-}
-
-func (ms *testMetaStore) CreateDatabaseIfNotExists(name string) (*meta.DatabaseInfo, error) {
-	return ms.CreateDatabaseIfNotExistsFn(name)
-}
-
-func (ms *testMetaStore) WaitForLeader(d time.Duration) error {
-	return nil
-}
-
-func wait(c chan struct{}, d time.Duration) (err error) {
-	select {
-	case <-c:
-	case <-time.After(d):
-		err = errors.New("timed out")
-	}
-	return
-}
-
-func waitInt(c chan int, d time.Duration) (i int, err error) {
-	select {
-	case i = <-c:
-	case <-time.After(d):
-		err = errors.New("timed out")
-	}
-	return
-}
-
-func check(err error) {
-	if err != nil {
-		panic(err)
-	}
-}
-
-// Raw data sent by collectd, captured using Wireshark.
-var testData = func() []byte {
-	b, err := hex.DecodeString("000000167066312d36322d3231302d39342d313733000001000c00000000544928ff0007000c00000000000000050002000c656e74726f7079000004000c656e74726f7079000006000f0001010000000000007240000200086370750000030006310000040008637075000005000969646c65000006000f0001000000000000a674620005000977616974000006000f0001000000000000000000000200076466000003000500000400076466000005000d6c6976652d636f7700000600180002010100000000a090b641000000a0cb6a2742000200086370750000030006310000040008637075000005000e696e74657272757074000006000f00010000000000000000fe0005000c736f6674697271000006000f000100000000000000000000020007646600000300050000040007646600000500096c6976650000060018000201010000000000000000000000e0ec972742000200086370750000030006310000040008637075000005000a737465616c000006000f00010000000000000000000003000632000005000975736572000006000f0001000000000000005f36000500096e696365000006000f0001000000000000000ad80002000e696e746572666163650000030005000004000e69665f6f6374657473000005000b64756d6d79300000060018000200000000000000000000000000000000041a000200076466000004000764660000050008746d70000006001800020101000000000000f240000000a0ea972742000200086370750000030006320000040008637075000005000b73797374656d000006000f00010000000000000045d30002000e696e746572666163650000030005000004000f69665f7061636b657473000005000b64756d6d79300000060018000200000000000000000000000000000000000f000200086370750000030006320000040008637075000005000969646c65000006000f0001000000000000a66480000200076466000003000500000400076466000005000d72756e2d6c6f636b000006001800020101000000000000000000000000000054410002000e696e74657266616365000004000e69665f6572726f7273000005000b64756d6d793000000600180002000000000000000000000000000000000000000200086370750000030006320000040008637075000005000977616974000006000f00010000000000000000000005000e696e74657272757074000006000f0001000000000000000132")
-	check(err)
-	return b
-}()
-
-var expPoints = []string{
-	"entropy_value,host=pf1-62-210-94-173,type=entropy value=288 1414080767000000000",
-	"cpu_value,host=pf1-62-210-94-173,instance=1,type=cpu,type_instance=idle value=10908770 1414080767000000000",
-	"cpu_value,host=pf1-62-210-94-173,instance=1,type=cpu,type_instance=wait value=0 1414080767000000000",
-	"df_used,host=pf1-62-210-94-173,type=df,type_instance=live-cow value=378576896 1414080767000000000",
-	"df_free,host=pf1-62-210-94-173,type=df,type_instance=live-cow value=50287988736 1414080767000000000",
-	"cpu_value,host=pf1-62-210-94-173,instance=1,type=cpu,type_instance=interrupt value=254 1414080767000000000",
-	"cpu_value,host=pf1-62-210-94-173,instance=1,type=cpu,type_instance=softirq value=0 1414080767000000000",
-	"df_used,host=pf1-62-210-94-173,type=df,type_instance=live value=0 1414080767000000000",
-	"df_free,host=pf1-62-210-94-173,type=df,type_instance=live value=50666565632 1414080767000000000",
-	"cpu_value,host=pf1-62-210-94-173,instance=1,type=cpu,type_instance=steal value=0 1414080767000000000",
-	"cpu_value,host=pf1-62-210-94-173,instance=2,type=cpu,type_instance=user value=24374 1414080767000000000",
-	"cpu_value,host=pf1-62-210-94-173,instance=2,type=cpu,type_instance=nice value=2776 1414080767000000000",
-	"interface_rx,host=pf1-62-210-94-173,type=if_octets,type_instance=dummy0 value=0 1414080767000000000",
-	"interface_tx,host=pf1-62-210-94-173,type=if_octets,type_instance=dummy0 value=1050 1414080767000000000",
-	"df_used,host=pf1-62-210-94-173,type=df,type_instance=tmp value=73728 1414080767000000000",
-	"df_free,host=pf1-62-210-94-173,type=df,type_instance=tmp value=50666491904 1414080767000000000",
-	"cpu_value,host=pf1-62-210-94-173,instance=2,type=cpu,type_instance=system value=17875 1414080767000000000",
-	"interface_rx,host=pf1-62-210-94-173,type=if_packets,type_instance=dummy0 value=0 1414080767000000000",
-	"interface_tx,host=pf1-62-210-94-173,type=if_packets,type_instance=dummy0 value=15 1414080767000000000",
-	"cpu_value,host=pf1-62-210-94-173,instance=2,type=cpu,type_instance=idle value=10904704 1414080767000000000",
-	"df_used,host=pf1-62-210-94-173,type=df,type_instance=run-lock value=0 1414080767000000000",
-	"df_free,host=pf1-62-210-94-173,type=df,type_instance=run-lock value=5242880 1414080767000000000",
-	"interface_rx,host=pf1-62-210-94-173,type=if_errors,type_instance=dummy0 value=0 1414080767000000000",
-	"interface_tx,host=pf1-62-210-94-173,type=if_errors,type_instance=dummy0 value=0 1414080767000000000",
-	"cpu_value,host=pf1-62-210-94-173,instance=2,type=cpu,type_instance=wait value=0 1414080767000000000",
-	"cpu_value,host=pf1-62-210-94-173,instance=2,type=cpu,type_instance=interrupt value=306 1414080767000000000",
-}
-
-// Taken from /usr/share/collectd/types.db on a Ubuntu system
-var typesDBText = `
-absolute		value:ABSOLUTE:0:U
-apache_bytes		value:DERIVE:0:U
-apache_connections	value:GAUGE:0:65535
-apache_idle_workers	value:GAUGE:0:65535
-apache_requests		value:DERIVE:0:U
-apache_scoreboard	value:GAUGE:0:65535
-ath_nodes		value:GAUGE:0:65535
-ath_stat		value:DERIVE:0:U
-backends		value:GAUGE:0:65535
-bitrate			value:GAUGE:0:4294967295
-bytes			value:GAUGE:0:U
-cache_eviction		value:DERIVE:0:U
-cache_operation		value:DERIVE:0:U
-cache_ratio		value:GAUGE:0:100
-cache_result		value:DERIVE:0:U
-cache_size		value:GAUGE:0:4294967295
-charge			value:GAUGE:0:U
-compression_ratio	value:GAUGE:0:2
-compression		uncompressed:DERIVE:0:U, compressed:DERIVE:0:U
-connections		value:DERIVE:0:U
-conntrack		value:GAUGE:0:4294967295
-contextswitch		value:DERIVE:0:U
-counter			value:COUNTER:U:U
-cpufreq			value:GAUGE:0:U
-cpu			value:DERIVE:0:U
-current_connections	value:GAUGE:0:U
-current_sessions	value:GAUGE:0:U
-current			value:GAUGE:U:U
-delay			value:GAUGE:-1000000:1000000
-derive			value:DERIVE:0:U
-df_complex		value:GAUGE:0:U
-df_inodes		value:GAUGE:0:U
-df			used:GAUGE:0:1125899906842623, free:GAUGE:0:1125899906842623
-disk_latency		read:GAUGE:0:U, write:GAUGE:0:U
-disk_merged		read:DERIVE:0:U, write:DERIVE:0:U
-disk_octets		read:DERIVE:0:U, write:DERIVE:0:U
-disk_ops_complex	value:DERIVE:0:U
-disk_ops		read:DERIVE:0:U, write:DERIVE:0:U
-disk_time		read:DERIVE:0:U, write:DERIVE:0:U
-dns_answer		value:DERIVE:0:U
-dns_notify		value:DERIVE:0:U
-dns_octets		queries:DERIVE:0:U, responses:DERIVE:0:U
-dns_opcode		value:DERIVE:0:U
-dns_qtype_cached	value:GAUGE:0:4294967295
-dns_qtype		value:DERIVE:0:U
-dns_query		value:DERIVE:0:U
-dns_question		value:DERIVE:0:U
-dns_rcode		value:DERIVE:0:U
-dns_reject		value:DERIVE:0:U
-dns_request		value:DERIVE:0:U
-dns_resolver		value:DERIVE:0:U
-dns_response		value:DERIVE:0:U
-dns_transfer		value:DERIVE:0:U
-dns_update		value:DERIVE:0:U
-dns_zops		value:DERIVE:0:U
-duration		seconds:GAUGE:0:U
-email_check		value:GAUGE:0:U
-email_count		value:GAUGE:0:U
-email_size		value:GAUGE:0:U
-entropy			value:GAUGE:0:4294967295
-fanspeed		value:GAUGE:0:U
-file_size		value:GAUGE:0:U
-files			value:GAUGE:0:U
-fork_rate		value:DERIVE:0:U
-frequency_offset	value:GAUGE:-1000000:1000000
-frequency		value:GAUGE:0:U
-fscache_stat		value:DERIVE:0:U
-gauge			value:GAUGE:U:U
-hash_collisions		value:DERIVE:0:U
-http_request_methods	value:DERIVE:0:U
-http_requests		value:DERIVE:0:U
-http_response_codes	value:DERIVE:0:U
-humidity		value:GAUGE:0:100
-if_collisions		value:DERIVE:0:U
-if_dropped		rx:DERIVE:0:U, tx:DERIVE:0:U
-if_errors		rx:DERIVE:0:U, tx:DERIVE:0:U
-if_multicast		value:DERIVE:0:U
-if_octets		rx:DERIVE:0:U, tx:DERIVE:0:U
-if_packets		rx:DERIVE:0:U, tx:DERIVE:0:U
-if_rx_errors		value:DERIVE:0:U
-if_rx_octets		value:DERIVE:0:U
-if_tx_errors		value:DERIVE:0:U
-if_tx_octets		value:DERIVE:0:U
-invocations		value:DERIVE:0:U
-io_octets		rx:DERIVE:0:U, tx:DERIVE:0:U
-io_packets		rx:DERIVE:0:U, tx:DERIVE:0:U
-ipt_bytes		value:DERIVE:0:U
-ipt_packets		value:DERIVE:0:U
-irq			value:DERIVE:0:U
-latency			value:GAUGE:0:U
-links			value:GAUGE:0:U
-load			shortterm:GAUGE:0:5000, midterm:GAUGE:0:5000, longterm:GAUGE:0:5000
-md_disks		value:GAUGE:0:U
-memcached_command	value:DERIVE:0:U
-memcached_connections	value:GAUGE:0:U
-memcached_items		value:GAUGE:0:U
-memcached_octets	rx:DERIVE:0:U, tx:DERIVE:0:U
-memcached_ops		value:DERIVE:0:U
-memory			value:GAUGE:0:281474976710656
-multimeter		value:GAUGE:U:U
-mutex_operations	value:DERIVE:0:U
-mysql_commands		value:DERIVE:0:U
-mysql_handler		value:DERIVE:0:U
-mysql_locks		value:DERIVE:0:U
-mysql_log_position	value:DERIVE:0:U
-mysql_octets		rx:DERIVE:0:U, tx:DERIVE:0:U
-nfs_procedure		value:DERIVE:0:U
-nginx_connections	value:GAUGE:0:U
-nginx_requests		value:DERIVE:0:U
-node_octets		rx:DERIVE:0:U, tx:DERIVE:0:U
-node_rssi		value:GAUGE:0:255
-node_stat		value:DERIVE:0:U
-node_tx_rate		value:GAUGE:0:127
-objects			value:GAUGE:0:U
-operations		value:DERIVE:0:U
-percent			value:GAUGE:0:100.1
-percent_bytes		value:GAUGE:0:100.1
-percent_inodes		value:GAUGE:0:100.1
-pf_counters		value:DERIVE:0:U
-pf_limits		value:DERIVE:0:U
-pf_source		value:DERIVE:0:U
-pf_states		value:GAUGE:0:U
-pf_state		value:DERIVE:0:U
-pg_blks			value:DERIVE:0:U
-pg_db_size		value:GAUGE:0:U
-pg_n_tup_c		value:DERIVE:0:U
-pg_n_tup_g		value:GAUGE:0:U
-pg_numbackends		value:GAUGE:0:U
-pg_scan			value:DERIVE:0:U
-pg_xact			value:DERIVE:0:U
-ping_droprate		value:GAUGE:0:100
-ping_stddev		value:GAUGE:0:65535
-ping			value:GAUGE:0:65535
-players			value:GAUGE:0:1000000
-power			value:GAUGE:0:U
-protocol_counter	value:DERIVE:0:U
-ps_code			value:GAUGE:0:9223372036854775807
-ps_count		processes:GAUGE:0:1000000, threads:GAUGE:0:1000000
-ps_cputime		user:DERIVE:0:U, syst:DERIVE:0:U
-ps_data			value:GAUGE:0:9223372036854775807
-ps_disk_octets		read:DERIVE:0:U, write:DERIVE:0:U
-ps_disk_ops		read:DERIVE:0:U, write:DERIVE:0:U
-ps_pagefaults		minflt:DERIVE:0:U, majflt:DERIVE:0:U
-ps_rss			value:GAUGE:0:9223372036854775807
-ps_stacksize		value:GAUGE:0:9223372036854775807
-ps_state		value:GAUGE:0:65535
-ps_vm			value:GAUGE:0:9223372036854775807
-queue_length		value:GAUGE:0:U
-records			value:GAUGE:0:U
-requests		value:GAUGE:0:U
-response_time		value:GAUGE:0:U
-response_code		value:GAUGE:0:U
-route_etx		value:GAUGE:0:U
-route_metric		value:GAUGE:0:U
-routes			value:GAUGE:0:U
-serial_octets		rx:DERIVE:0:U, tx:DERIVE:0:U
-signal_noise		value:GAUGE:U:0
-signal_power		value:GAUGE:U:0
-signal_quality		value:GAUGE:0:U
-snr			value:GAUGE:0:U
-spam_check		value:GAUGE:0:U
-spam_score		value:GAUGE:U:U
-spl			value:GAUGE:U:U
-swap_io			value:DERIVE:0:U
-swap			value:GAUGE:0:1099511627776
-tcp_connections		value:GAUGE:0:4294967295
-temperature		value:GAUGE:U:U
-threads			value:GAUGE:0:U
-time_dispersion		value:GAUGE:-1000000:1000000
-timeleft		value:GAUGE:0:U
-time_offset		value:GAUGE:-1000000:1000000
-total_bytes		value:DERIVE:0:U
-total_connections	value:DERIVE:0:U
-total_objects		value:DERIVE:0:U
-total_operations	value:DERIVE:0:U
-total_requests		value:DERIVE:0:U
-total_sessions		value:DERIVE:0:U
-total_threads		value:DERIVE:0:U
-total_time_in_ms	value:DERIVE:0:U
-total_values		value:DERIVE:0:U
-uptime			value:GAUGE:0:4294967295
-users			value:GAUGE:0:65535
-vcl			value:GAUGE:0:65535
-vcpu			value:GAUGE:0:U
-virt_cpu_total		value:DERIVE:0:U
-virt_vcpu		value:DERIVE:0:U
-vmpage_action		value:DERIVE:0:U
-vmpage_faults		minflt:DERIVE:0:U, majflt:DERIVE:0:U
-vmpage_io		in:DERIVE:0:U, out:DERIVE:0:U
-vmpage_number		value:GAUGE:0:4294967295
-volatile_changes	value:GAUGE:0:U
-voltage_threshold	value:GAUGE:U:U, threshold:GAUGE:U:U
-voltage			value:GAUGE:U:U
-vs_memory		value:GAUGE:0:9223372036854775807
-vs_processes		value:GAUGE:0:65535
-vs_threads		value:GAUGE:0:65535
-#
-# Legacy types
-# (required for the v5 upgrade target)
-#
-arc_counts		demand_data:COUNTER:0:U, demand_metadata:COUNTER:0:U, prefetch_data:COUNTER:0:U, prefetch_metadata:COUNTER:0:U
-arc_l2_bytes		read:COUNTER:0:U, write:COUNTER:0:U
-arc_l2_size		value:GAUGE:0:U
-arc_ratio		value:GAUGE:0:U
-arc_size		current:GAUGE:0:U, target:GAUGE:0:U, minlimit:GAUGE:0:U, maxlimit:GAUGE:0:U
-mysql_qcache		hits:COUNTER:0:U, inserts:COUNTER:0:U, not_cached:COUNTER:0:U, lowmem_prunes:COUNTER:0:U, queries_in_cache:GAUGE:0:U
-mysql_threads		running:GAUGE:0:U, connected:GAUGE:0:U, cached:GAUGE:0:U, created:COUNTER:0:U
-`
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/collectd/test_client/README.md b/Godeps/_workspace/src/github.com/influxdb/influxdb/services/collectd/test_client/README.md
deleted file mode 100644
index 90de2b2b6..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/collectd/test_client/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-collectD Client
-============
-This directory contains code for generating collectd load.
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/collectd/test_client/client.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/services/collectd/test_client/client.go
deleted file mode 100644
index 790f5e871..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/collectd/test_client/client.go
+++ /dev/null
@@ -1,71 +0,0 @@
-package main
-
-import (
-	"collectd.org/api"
-	"collectd.org/network"
-
-	"flag"
-	"fmt"
-	"math/rand"
-	"os"
-	"strconv"
-	"time"
-)
-
-var nMeasurments = flag.Int("m", 1, "Number of measurements")
-var tagVariance = flag.Int("v", 1, "Number of values per tag. Client is fixed at one tag")
-var rate = flag.Int("r", 1, "Number of points per second")
-var total = flag.Int("t", -1, "Total number of points to send (default is no limit)")
-var host = flag.String("u", "127.0.0.1:25826", "Destination host in the form host:port")
-
-func main() {
-	flag.Parse()
-
-	conn, err := network.Dial(*host, network.ClientOptions{})
-	if err != nil {
-		fmt.Println(err)
-		os.Exit(1)
-	}
-	defer conn.Close()
-
-	rateLimiter := make(chan int, *rate)
-
-	go func() {
-		ticker := time.NewTicker(time.Second)
-		for {
-			select {
-			case <-ticker.C:
-				for i := 0; i < *rate; i++ {
-					rateLimiter <- i
-				}
-			}
-		}
-	}()
-
-	nSent := 0
-	for {
-		if nSent >= *total && *total > 0 {
-			break
-		}
-		<-rateLimiter
-
-		vl := api.ValueList{
-			Identifier: api.Identifier{
-				Host:   "tagvalue" + strconv.Itoa(int(rand.Int31n(int32(*tagVariance)))),
-				Plugin: "golang" + strconv.Itoa(int(rand.Int31n(int32(*nMeasurments)))),
-				Type:   "gauge",
-			},
-			Time:     time.Now(),
-			Interval: 10 * time.Second,
-			Values:   []api.Value{api.Gauge(42.0)},
-		}
-		if err := conn.Write(vl); err != nil {
-			fmt.Println(err)
-			os.Exit(1)
-		}
-		conn.Flush()
-		nSent = nSent + 1
-	}
-
-	fmt.Println("Number of points sent:", nSent)
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/continuous_querier/config.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/services/continuous_querier/config.go
deleted file mode 100644
index 1549a816b..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/continuous_querier/config.go
+++ /dev/null
@@ -1,65 +0,0 @@
-package continuous_querier
-
-import (
-	"time"
-
-	"github.com/influxdb/influxdb/toml"
-)
-
-const (
-	DefaultRecomputePreviousN = 2
-
-	DefaultRecomputeNoOlderThan = 10 * time.Minute
-
-	DefaultComputeRunsPerInterval = 10
-
-	DefaultComputeNoMoreThan = 2 * time.Minute
-)
-
-// Config represents a configuration for the continuous query service.
-type Config struct {
-	// Enables logging in CQ service to display when CQ's are processed and how many points are wrote.
-	LogEnabled bool `toml:"log-enabled"`
-
-	// If this flag is set to false, both the brokers and data nodes should ignore any CQ processing.
-	Enabled bool `toml:"enabled"`
-
-	// when continuous queries are run we'll automatically recompute previous intervals
-	// in case lagged data came in. Set to zero if you never have lagged data. We do
-	// it this way because invalidating previously computed intervals would be insanely hard
-	// and expensive.
-	RecomputePreviousN int `toml:"recompute-previous-n"`
-
-	// The RecomputePreviousN setting provides guidance for how far back to recompute, the RecomputeNoOlderThan
-	// setting sets a ceiling on how far back in time it will go. For example, if you have 2 PreviousN
-	// and have this set to 10m, then we'd only compute the previous two intervals for any
-	// CQs that have a group by time <= 5m. For all others, we'd only recompute the previous window
-	RecomputeNoOlderThan toml.Duration `toml:"recompute-no-older-than"`
-
-	// ComputeRunsPerInterval will determine how many times the current and previous N intervals
-	// will be computed. The group by time will be divided by this and it will get computed  this many times:
-	// group by time seconds / runs per interval
-	// This will give partial results for current group by intervals and will determine how long it will
-	// be until lagged data is recomputed. For example, if this number is 10 and the group by time is 10m, it
-	// will be a minute past the previous 10m bucket of time before lagged data is picked up
-	ComputeRunsPerInterval int `toml:"compute-runs-per-interval"`
-
-	// ComputeNoMoreThan paired with the RunsPerInterval will determine the ceiling of how many times smaller
-	// group by times will be computed. For example, if you have RunsPerInterval set to 10 and this setting
-	// to 1m. Then for a group by time(1m) will actually only get computed once per interval (and once per PreviousN).
-	// If you have a group by time(5m) then you'll get five computes per interval. Any group by time window larger
-	// than 10m will get computed 10 times for each interval.
-	ComputeNoMoreThan toml.Duration `toml:"compute-no-more-than"`
-}
-
-// NewConfig returns a new instance of Config with defaults.
-func NewConfig() Config {
-	return Config{
-		LogEnabled:             true,
-		Enabled:                true,
-		RecomputePreviousN:     DefaultRecomputePreviousN,
-		RecomputeNoOlderThan:   toml.Duration(DefaultRecomputeNoOlderThan),
-		ComputeRunsPerInterval: DefaultComputeRunsPerInterval,
-		ComputeNoMoreThan:      toml.Duration(DefaultComputeNoMoreThan),
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/continuous_querier/config_test.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/services/continuous_querier/config_test.go
deleted file mode 100644
index 2a0edc4f2..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/continuous_querier/config_test.go
+++ /dev/null
@@ -1,36 +0,0 @@
-package continuous_querier_test
-
-import (
-	"testing"
-	"time"
-
-	"github.com/BurntSushi/toml"
-	"github.com/influxdb/influxdb/services/continuous_querier"
-)
-
-func TestConfig_Parse(t *testing.T) {
-	// Parse configuration.
-	var c continuous_querier.Config
-	if _, err := toml.Decode(`
-recompute-previous-n = 1
-recompute-no-older-than = "10s"
-compute-runs-per-interval = 2
-compute-no-more-than = "20s"
-enabled = true
-`, &c); err != nil {
-		t.Fatal(err)
-	}
-
-	// Validate configuration.
-	if c.RecomputePreviousN != 1 {
-		t.Fatalf("unexpected recompute previous n: %d", c.RecomputePreviousN)
-	} else if time.Duration(c.RecomputeNoOlderThan) != 10*time.Second {
-		t.Fatalf("unexpected recompute no older than: %v", c.RecomputeNoOlderThan)
-	} else if c.ComputeRunsPerInterval != 2 {
-		t.Fatalf("unexpected compute runs per interval: %d", c.ComputeRunsPerInterval)
-	} else if time.Duration(c.ComputeNoMoreThan) != 20*time.Second {
-		t.Fatalf("unexpected compute no more than: %v", c.ComputeNoMoreThan)
-	} else if c.Enabled != true {
-		t.Fatalf("unexpected enabled: %v", c.Enabled)
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/continuous_querier/continuous_queries.md b/Godeps/_workspace/src/github.com/influxdb/influxdb/services/continuous_querier/continuous_queries.md
deleted file mode 100644
index bd14b5161..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/continuous_querier/continuous_queries.md
+++ /dev/null
@@ -1,236 +0,0 @@
-# Continuous Queries
-
-This document lays out continuous queries and a proposed architecture for how they'll work within an InfluxDB cluster.
-
-## Definition of Continuous Queries
-
-Continuous queries serve two purposes in InfluxDB:
-
-1. Combining many series into a single series (i.e. removing 1 or more tag dimensions to make queries more efficient)
-2. Aggregating and downsampling series
-
-The purpose of both types of continuous queries is to duplicate or downsample data automatically in the background to make querying thier results fast and efficient. Think of them as another way to create indexes on data.
-
-Generally, there are continuous queries that create copyies of data into another measurement or tagset and queries that downsample and aggregate data. The only difference between the two types is if the query has a `GROUP BY time` clause.
-
-Before we get to the continuous query examples, we need to define the `INTO` syntax of queries.
-
-### INTO
-
-`INTO` is a method for running a query and having it output into either another measurement name, retention policy, or database. The syntax looks like this:
-
-```sql
-SELECT *
-INTO [<retention policy>.]<measurement> [ON <database>]
-FROM <measurement>
-[WHERE ...]
-[GROUP BY ...]
-```
-
-The syntax states that the retention policy, database, where clause, and group by clause are all optional. If a retention policy isn't specified, the database's default retention policy will be written into. If the database isn't specified, the database the query is running from will be written into.
-
-By selecting specific fields, `INTO` can merge many series into one that will go into a new either a new measurement, retention policy, or database. For example:
-
-```sql
-SELECT mean(value) as value, region
-INTO "1h.cpu_load"
-FROM cpu_load
-GROUP BY time(1h), region
-```
-
-That will give 1h summaries of the mean value of the `cpu_load` for each `region`. Specifying `region` in the `GROUP BY` clause is unnecessary since having it in the `SELECT` clause forces it to be grouped by that tag, we've just included it in the example for clarity.
-
-With `SELECT ... INTO`, fields will be written as fields and tags will be written as tags.
-
-### Continuous Query Syntax
-
-The `INTO` queries run once. Continuous queries will turn `INTO` queries into something that run in the background in the cluster. They're kind of like triggers in SQL.
-
-```sql
-CREATE CONTINUOUS QUERY "1h_cpu_load"
-ON database_name
-BEGIN
-  SELECT mean(value) as value, region
-  INTO "1h.cpu_load"
-  FROM cpu_load
-  GROUP BY time(1h), region
-END
-```
-
-Or chain them together:
-
-```sql
-CREATE CONTINUOUS QUERY "10m_event_count"
-ON database_name
-BEGIN
-  SELECT count(value)
-  INTO "10m.events"
-  FROM events
-  GROUP BY time(10m)
-END
-
--- this selects from the output of one continuous query and outputs to another series
-CREATE CONTINUOUS QUERY "1h_event_count"
-ON database_name
-BEGIN
-  SELECT sum(count) as count
-  INTO "1h.events"
-  FROM events
-  GROUP BY time(1h)
-END
-```
-
-Or multiple aggregations from all series in a measurement. This example assumes you have a retention policy named `1h`.
-
-```sql
-CREATE CONTINUOUS QUERY "1h_cpu_load"
-ON database_name
-BEGIN
-  SELECT mean(value), percentile(80, value) as percentile_80, percentile(95, value) as percentile_95
-  INTO "1h.cpu_load"
-  FROM cpu_load
-  GROUP BY time(1h), *
-END
-```
-
-The `GROUP BY *` indicates that we want to group by the tagset of the points written in. The same tags will be written to the output series. The multiple aggregates in the `SELECT` clause (percentile, mean) will be written in as fields to the resulting series.
-
-Showing what continuous queries we have:
-
-```sql
-LIST CONTINUOUS QUERIES
-```
-
-Dropping continuous queries:
-
-```sql
-DROP CONTINUOUS QUERY <name>
-ON <database>
-```
-
-### Security
-
-To create or drop a continuous query, the user must be an admin.
-
-### Limitations
-
-In order to prevent cycles and endless copying of data, the following limitation is enforced on continuous queries at create time:
-
-*The output of a continuous query must go to either a different measurement or to a different retention policy.*
-
-In theory they'd still be able to create a cycle with multiple continuous queries. We should check for these and disallow.
-
-## Proposed Architecture
-
-Continuous queries should be stored in the metastore cluster wide. That is, they amount to database schema that should be stored in every server in a cluster.
-
-Continuous queries will have to be handled in a different way for two different use cases: those that simply copy data (CQs without a group by time) and those that aggregate and downsample data (those with a group by time).
-
-### No group by time
-
-For CQs that have no `GROUP BY time` clause, they should be evaluated at the data node as part of the write. The single write should create any other writes for the CQ and submit those in the same request to the brokers to ensure that all writes succeed (both the original and the new CQ writes) or none do.
-
-I imagine the process going something like this:
-
-1. Convert the data point into its compact form `<series id><time><values>`
-2. For each CQ on the measurement and retention policy without a group by time:
-3. Run the data point through a special query engine that will output 0 or 1 data point
-4. Goto #1 for each newly generated data point
-5. Write all the data points in a single call to the brokers
-6. Return success to the user
-
-Note that for the generated data points, we need to go through and run this process against them since they can feed into different retention policies, measurements, and new tagsets. On #3 I mention that the output will either be a data point or not. That's because of `WHERE` clauses on the query. However, it will never be more than a single data point.
-
-I mention that we'll need a special query engine for these types of queries. In this case, they never have an aggregate function. Any query with an aggregate function also has a group by time, and these queries by definition don't have that.
-
-The only thing we have to worry about is which fields are being selected, and what the where clause looks like. We should be able to put the raw data point through a simple transform function that either outputs another raw points or doesn't.
-
-I think this transform function be something separate from the regular query planner and engine. It can be in `influxQL` but it should be something fairly simply since the only purpose of these types of queries is to either filter some data out and output to a new series or transform into a new series by dropping tags.
-
-### Has group by time
-
-CQs that have a `GROUP BY time` (or aggregate CQs) will need to be handled differently.
-
-One key point on continuous queries with a group by time is that all their writes should always be `overwrite = true`. That is, they should only have a single data point for each timestamp. This distinction means that continuous queries for previous blocks of time can be safely run multiple times without duplicating data (i.e. they're idempotent).
-
-There are two different ideas I have for how CQs with group by time could be handled. The first is through periodic updates handled by the Raft Leader. The second would be to expand out writes for each CQ and handle them on the data node.
-
-#### Periodic Updates
-
-In this approach the management of how CQs run in a cluster will be centrally located on the Raft Leader. It will be responsible for orchestrating which data nodes run CQs and when.
-
-The naive approach would be to have the leader hand out each CQ for a block of time periodically. The leader could also rerun CQ for periods of time that have recently passed. This would be an easy way to handle the "lagging data" problem, but it's not precise.
-
-Unfortunately, there's no easy way to tell cluster wide if there were data points written in an already passed window of time for a CQ. We might be able to add this at the data nodes and have them track it, but it would be quite a bit more work.
-
-The easy way would just be to have CQs re-execute for periods that recently passed and have some user-configurable window of time that they stop checking after. Then we could give the user the ability to recalculate CQs ranges of time if they need to correct for some problem that occurred or the loading of a bunch of historical data.
-
-With this approach, we'd have the metadata in the database store the last time each CQ was run. Whenever the Raft leader sent out a command to a data node to handle a CQ, the data node would use this metadata to determine which windows of time it should compute.
-
-This approach is like what exists in 0.8, with the exception that it will automatically catch data that is lagged behind in a small window of time and give the user the ability to force recalculation.
-
-#### Expanding writes
-
-When a write comes into a data node, we could have it evaluated against group by CQs in addition to the non-group by ones. It would then create writes that would then go through the brokers. When the CQ writes arrive at the data nodes, they would have to handle each write differently depending on if it was a write to a raw series or if it was a CQ write.
-
-Let's lay out a concrete example.
-
-```sql
-CREATE CONTINUOUS QUERY "10m_cpu_by_region"
-ON foo
-BEGIN
-  SELECT mean(value)
-  INTO cpu_by_region
-  FROM cpu
-  GROUP BY time(10m), region
-END
-```
-
-In this example we write values into `cpu` with the tags `region` and `host`.
-
-Here's another example CQ:
-
-```sql
-CREATE CONTINUOUS QUERY "1h_cpu"
-ON foo
-BEGIN
-  SELECT mean(value)
-  INTO "1h.cpu"
-  FROM raw.cpu
-  GROUP BY time(10m), *
-END
-```
-
-That would output one series into the `1h` retention policy for the `cpu` measurement for every series from the `raw` retention policy and the `cpu` measurement.
-
-Both of these examples would be handled the same way despite one being a big merge of a bunch of series into one and the other being an aggregation of series in a 1-to-1 mapping.
-
-Say we're collecting data for two hosts in a single region. Then we'd have two distinct series like this:
-
-```
-1 - cpu host=serverA region=uswest
-2 - cpu host=serverB region=uswest
-```
-
-Whenever a write came into a server, we'd look at the continuous queries and see if we needed to create new writes. If we had the two CQ examples above, we'd have to expand a single write into two more writes (one for each CQ).
-
-The first CQ would have to create a new series:
-
-```
-3 - cpu_by_region region=uswest
-```
-
-The second CQ would use the same series id as the write, but would send it to another retention policy (and thus shard).
-
-We'd need to keep track of which series + retention policy combinations were the result of a CQ. When the data nodes get writes replicated downward, they would have to handle them like this:
-
-1. If write is normal, write through
-2. If write is CQ write, compute based on existing values, write to DB
-
-#### Approach tradeoffs
-
-The first approach of periodically running queries would almost certainly be the easiest to implement quickly. It also has the added advantage of not putting additional load on the brokers by ballooning up the number of writes that go through the system.
-
-The second approach is appealing because it would be accurate regardless of when writes come in. However, it would take more work and cause the number of writes going through the brokers to be multiplied by the number of continuous queries, which might not scale to where we need.
-
-Also, if the data nodes write for every single update, the load on the underlying storage engine would go up significantly as well.
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/continuous_querier/service.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/services/continuous_querier/service.go
deleted file mode 100644
index e25891d2a..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/continuous_querier/service.go
+++ /dev/null
@@ -1,404 +0,0 @@
-package continuous_querier
-
-import (
-	"errors"
-	"expvar"
-	"fmt"
-	"log"
-	"os"
-	"strings"
-	"sync"
-	"time"
-
-	"github.com/influxdb/influxdb"
-	"github.com/influxdb/influxdb/influxql"
-	"github.com/influxdb/influxdb/meta"
-	"github.com/influxdb/influxdb/tsdb"
-)
-
-const (
-	// When planning a select statement, passing zero tells it not to chunk results. Only applies to raw queries
-	NoChunkingSize = 0
-)
-
-// Statistics for the CQ service.
-const (
-	statQueryOK       = "queryOk"
-	statQueryFail     = "queryFail"
-	statPointsWritten = "pointsWritten"
-)
-
-// ContinuousQuerier represents a service that executes continuous queries.
-type ContinuousQuerier interface {
-	// Run executes the named query in the named database.  Blank database or name matches all.
-	Run(database, name string, t time.Time) error
-}
-
-// queryExecutor is an internal interface to make testing easier.
-type queryExecutor interface {
-	ExecuteQuery(query *influxql.Query, database string, chunkSize int) (<-chan *influxql.Result, error)
-}
-
-// metaStore is an internal interface to make testing easier.
-type metaStore interface {
-	IsLeader() bool
-	Databases() ([]meta.DatabaseInfo, error)
-	Database(name string) (*meta.DatabaseInfo, error)
-}
-
-// RunRequest is a request to run one or more CQs.
-type RunRequest struct {
-	// Now tells the CQ serivce what the current time is.
-	Now time.Time
-	// CQs tells the CQ service which queries to run.
-	// If nil, all queries will be run.
-	CQs []string
-}
-
-// matches returns true if the CQ matches one of the requested CQs.
-func (rr *RunRequest) matches(cq *meta.ContinuousQueryInfo) bool {
-	if rr.CQs == nil {
-		return true
-	}
-	for _, q := range rr.CQs {
-		if q == cq.Name {
-			return true
-		}
-	}
-	return false
-}
-
-// Service manages continuous query execution.
-type Service struct {
-	MetaStore     metaStore
-	QueryExecutor queryExecutor
-	Config        *Config
-	RunInterval   time.Duration
-	// RunCh can be used by clients to signal service to run CQs.
-	RunCh          chan *RunRequest
-	Logger         *log.Logger
-	loggingEnabled bool
-	statMap        *expvar.Map
-	// lastRuns maps CQ name to last time it was run.
-	mu       sync.RWMutex
-	lastRuns map[string]time.Time
-	stop     chan struct{}
-	wg       *sync.WaitGroup
-}
-
-// NewService returns a new instance of Service.
-func NewService(c Config) *Service {
-	s := &Service{
-		Config:         &c,
-		RunInterval:    time.Second,
-		RunCh:          make(chan *RunRequest),
-		loggingEnabled: c.LogEnabled,
-		statMap:        influxdb.NewStatistics("cq", "cq", nil),
-		Logger:         log.New(os.Stderr, "[continuous_querier] ", log.LstdFlags),
-		lastRuns:       map[string]time.Time{},
-	}
-
-	return s
-}
-
-// Open starts the service.
-func (s *Service) Open() error {
-	s.Logger.Println("Starting continuous query service")
-
-	if s.stop != nil {
-		return nil
-	}
-
-	assert(s.MetaStore != nil, "MetaStore is nil")
-	assert(s.QueryExecutor != nil, "QueryExecutor is nil")
-
-	s.stop = make(chan struct{})
-	s.wg = &sync.WaitGroup{}
-	s.wg.Add(1)
-	go s.backgroundLoop()
-	return nil
-}
-
-// Close stops the service.
-func (s *Service) Close() error {
-	if s.stop == nil {
-		return nil
-	}
-	close(s.stop)
-	s.wg.Wait()
-	s.wg = nil
-	s.stop = nil
-	return nil
-}
-
-// SetLogger sets the internal logger to the logger passed in.
-func (s *Service) SetLogger(l *log.Logger) {
-	s.Logger = l
-}
-
-// Run runs the specified continuous query, or all CQs if none is specified.
-func (s *Service) Run(database, name string, t time.Time) error {
-	var dbs []meta.DatabaseInfo
-
-	if database != "" {
-		// Find the requested database.
-		db, err := s.MetaStore.Database(database)
-		if err != nil {
-			return err
-		} else if db == nil {
-			return tsdb.ErrDatabaseNotFound(database)
-		}
-		dbs = append(dbs, *db)
-	} else {
-		// Get all databases.
-		var err error
-		dbs, err = s.MetaStore.Databases()
-		if err != nil {
-			return err
-		}
-	}
-
-	// Loop through databases.
-	s.mu.Lock()
-	defer s.mu.Unlock()
-	for _, db := range dbs {
-		// Loop through CQs in each DB executing the ones that match name.
-		for _, cq := range db.ContinuousQueries {
-			if name == "" || cq.Name == name {
-				// Reset the last run time for the CQ.
-				s.lastRuns[cq.Name] = time.Time{}
-			}
-		}
-	}
-
-	// Signal the background routine to run CQs.
-	s.RunCh <- &RunRequest{Now: t}
-
-	return nil
-}
-
-// backgroundLoop runs on a go routine and periodically executes CQs.
-func (s *Service) backgroundLoop() {
-	defer s.wg.Done()
-	for {
-		select {
-		case <-s.stop:
-			s.Logger.Println("continuous query service terminating")
-			return
-		case req := <-s.RunCh:
-			if s.MetaStore.IsLeader() {
-				s.Logger.Printf("running continuous queries by request for time: %v", req.Now.UnixNano())
-				s.runContinuousQueries(req)
-			}
-		case <-time.After(s.RunInterval):
-			if s.MetaStore.IsLeader() {
-				s.runContinuousQueries(&RunRequest{Now: time.Now()})
-			}
-		}
-	}
-}
-
-// runContinuousQueries gets CQs from the meta store and runs them.
-func (s *Service) runContinuousQueries(req *RunRequest) {
-	// Get list of all databases.
-	dbs, err := s.MetaStore.Databases()
-	if err != nil {
-		s.Logger.Println("error getting databases")
-		return
-	}
-	// Loop through all databases executing CQs.
-	for _, db := range dbs {
-		// TODO: distribute across nodes
-		for _, cq := range db.ContinuousQueries {
-			if !req.matches(&cq) {
-				continue
-			}
-			if err := s.ExecuteContinuousQuery(&db, &cq, req.Now); err != nil {
-				s.Logger.Printf("error executing query: %s: err = %s", cq.Query, err)
-				s.statMap.Add(statQueryFail, 1)
-			} else {
-				s.statMap.Add(statQueryOK, 1)
-			}
-		}
-	}
-}
-
-// ExecuteContinuousQuery executes a single CQ.
-func (s *Service) ExecuteContinuousQuery(dbi *meta.DatabaseInfo, cqi *meta.ContinuousQueryInfo, now time.Time) error {
-	// TODO: re-enable stats
-	//s.stats.Inc("continuousQueryExecuted")
-
-	// Local wrapper / helper.
-	cq, err := NewContinuousQuery(dbi.Name, cqi)
-	if err != nil {
-		return err
-	}
-
-	// Get the last time this CQ was run from the service's cache.
-	s.mu.Lock()
-	defer s.mu.Unlock()
-	cq.LastRun = s.lastRuns[cqi.Name]
-
-	// Set the retention policy to default if it wasn't specified in the query.
-	if cq.intoRP() == "" {
-		cq.setIntoRP(dbi.DefaultRetentionPolicy)
-	}
-
-	// See if this query needs to be run.
-	computeNoMoreThan := time.Duration(s.Config.ComputeNoMoreThan)
-	run, err := cq.shouldRunContinuousQuery(s.Config.ComputeRunsPerInterval, computeNoMoreThan)
-	if err != nil {
-		return err
-	} else if !run {
-		return nil
-	}
-
-	// We're about to run the query so store the time.
-	lastRun := time.Now()
-	cq.LastRun = lastRun
-	s.lastRuns[cqi.Name] = lastRun
-
-	// Get the group by interval.
-	interval, err := cq.q.GroupByInterval()
-	if err != nil {
-		return err
-	} else if interval == 0 {
-		return nil
-	}
-
-	// Calculate and set the time range for the query.
-	startTime := now.Round(interval)
-	if startTime.UnixNano() > now.UnixNano() {
-		startTime = startTime.Add(-interval)
-	}
-
-	if err := cq.q.SetTimeRange(startTime, startTime.Add(interval)); err != nil {
-		s.Logger.Printf("error setting time range: %s\n", err)
-	}
-
-	if s.loggingEnabled {
-		s.Logger.Printf("executing continuous query %s", cq.Info.Name)
-	}
-
-	// Do the actual processing of the query & writing of results.
-	if err := s.runContinuousQueryAndWriteResult(cq); err != nil {
-		s.Logger.Printf("error: %s. running: %s\n", err, cq.q.String())
-		return err
-	}
-
-	recomputeNoOlderThan := time.Duration(s.Config.RecomputeNoOlderThan)
-
-	for i := 0; i < s.Config.RecomputePreviousN; i++ {
-		// if we're already more time past the previous window than we're going to look back, stop
-		if now.Sub(startTime) > recomputeNoOlderThan {
-			return nil
-		}
-		newStartTime := startTime.Add(-interval)
-
-		if err := cq.q.SetTimeRange(newStartTime, startTime); err != nil {
-			s.Logger.Printf("error setting time range: %s\n", err)
-			return err
-		}
-
-		if err := s.runContinuousQueryAndWriteResult(cq); err != nil {
-			s.Logger.Printf("error during recompute previous: %s. running: %s\n", err, cq.q.String())
-			return err
-		}
-
-		startTime = newStartTime
-	}
-	return nil
-}
-
-// runContinuousQueryAndWriteResult will run the query against the cluster and write the results back in
-func (s *Service) runContinuousQueryAndWriteResult(cq *ContinuousQuery) error {
-	// Wrap the CQ's inner SELECT statement in a Query for the QueryExecutor.
-	q := &influxql.Query{
-		Statements: influxql.Statements([]influxql.Statement{cq.q}),
-	}
-
-	// Execute the SELECT.
-	ch, err := s.QueryExecutor.ExecuteQuery(q, cq.Database, NoChunkingSize)
-	if err != nil {
-		return err
-	}
-	// There is only one statement, so we will only ever receive one result
-	res, ok := <-ch
-	if !ok {
-		panic("result channel was closed")
-	}
-	if res.Err != nil {
-		return res.Err
-	}
-	return nil
-}
-
-// ContinuousQuery is a local wrapper / helper around continuous queries.
-type ContinuousQuery struct {
-	Database string
-	Info     *meta.ContinuousQueryInfo
-	LastRun  time.Time
-	q        *influxql.SelectStatement
-}
-
-func (cq *ContinuousQuery) intoRP() string      { return cq.q.Target.Measurement.RetentionPolicy }
-func (cq *ContinuousQuery) setIntoRP(rp string) { cq.q.Target.Measurement.RetentionPolicy = rp }
-
-// NewContinuousQuery returns a ContinuousQuery object with a parsed influxql.CreateContinuousQueryStatement
-func NewContinuousQuery(database string, cqi *meta.ContinuousQueryInfo) (*ContinuousQuery, error) {
-	stmt, err := influxql.NewParser(strings.NewReader(cqi.Query)).ParseStatement()
-	if err != nil {
-		return nil, err
-	}
-
-	q, ok := stmt.(*influxql.CreateContinuousQueryStatement)
-	if !ok || q.Source.Target == nil || q.Source.Target.Measurement == nil {
-		return nil, errors.New("query isn't a valid continuous query")
-	}
-
-	cquery := &ContinuousQuery{
-		Database: database,
-		Info:     cqi,
-		q:        q.Source,
-	}
-
-	return cquery, nil
-}
-
-// shouldRunContinuousQuery returns true if the CQ should be schedule to run. It will use the
-// lastRunTime of the CQ and the rules for when to run set through the config to determine
-// if this CQ should be run
-func (cq *ContinuousQuery) shouldRunContinuousQuery(runsPerInterval int, noMoreThan time.Duration) (bool, error) {
-	// if it's not aggregated we don't run it
-	if cq.q.IsRawQuery {
-		return false, errors.New("continuous queries must be aggregate queries")
-	}
-
-	// since it's aggregated we need to figure how often it should be run
-	interval, err := cq.q.GroupByInterval()
-	if err != nil {
-		return false, err
-	}
-
-	// determine how often we should run this continuous query.
-	// group by time / the number of times to compute
-	computeEvery := time.Duration(interval.Nanoseconds()/int64(runsPerInterval)) * time.Nanosecond
-	// make sure we're running no more frequently than the setting in the config
-	if computeEvery < noMoreThan {
-		computeEvery = noMoreThan
-	}
-
-	// if we've passed the amount of time since the last run, do it up
-	if cq.LastRun.Add(computeEvery).UnixNano() <= time.Now().UnixNano() {
-		return true, nil
-	}
-
-	return false, nil
-}
-
-// assert will panic with a given formatted message if the given condition is false.
-func assert(condition bool, msg string, v ...interface{}) {
-	if !condition {
-		panic(fmt.Sprintf("assert failed: "+msg, v...))
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/continuous_querier/service_test.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/services/continuous_querier/service_test.go
deleted file mode 100644
index 546e04636..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/continuous_querier/service_test.go
+++ /dev/null
@@ -1,458 +0,0 @@
-package continuous_querier
-
-import (
-	"errors"
-	"fmt"
-	"io/ioutil"
-	"log"
-	"sync"
-	"testing"
-	"time"
-
-	"github.com/influxdb/influxdb/cluster"
-	"github.com/influxdb/influxdb/influxql"
-	"github.com/influxdb/influxdb/meta"
-	"github.com/influxdb/influxdb/models"
-)
-
-var (
-	expectedErr   = errors.New("expected error")
-	unexpectedErr = errors.New("unexpected error")
-)
-
-// Test closing never opened, open, open already open, close, and close already closed.
-func TestOpenAndClose(t *testing.T) {
-	s := NewTestService(t)
-
-	if err := s.Close(); err != nil {
-		t.Error(err)
-	} else if err = s.Open(); err != nil {
-		t.Error(err)
-	} else if err = s.Open(); err != nil {
-		t.Error(err)
-	} else if err = s.Close(); err != nil {
-		t.Error(err)
-	} else if err = s.Close(); err != nil {
-		t.Error(err)
-	}
-}
-
-// Test Run method.
-func TestContinuousQueryService_Run(t *testing.T) {
-	s := NewTestService(t)
-
-	// Set RunInterval high so we can trigger using Run method.
-	s.RunInterval = 10 * time.Minute
-
-	// Only want one call to ExecuteQueryFn per CQ.
-	s.Config.RecomputePreviousN = 0
-
-	done := make(chan struct{})
-	expectCallCnt := 3
-	callCnt := 0
-
-	// Set a callback for ExecuteQuery.
-	qe := s.QueryExecutor.(*QueryExecutor)
-	qe.ExecuteQueryFn = func(query *influxql.Query, database string, chunkSize int) (<-chan *influxql.Result, error) {
-		callCnt++
-		if callCnt >= expectCallCnt {
-			done <- struct{}{}
-		}
-		dummych := make(chan *influxql.Result, 1)
-		dummych <- &influxql.Result{}
-		return dummych, nil
-	}
-
-	s.Open()
-	// Trigger service to run all CQs.
-	s.Run("", "", time.Now())
-	// Shouldn't time out.
-	if err := wait(done, 100*time.Millisecond); err != nil {
-		t.Error(err)
-	}
-	// This time it should timeout because ExecuteQuery should not get called again.
-	if err := wait(done, 100*time.Millisecond); err == nil {
-		t.Error("too many queries executed")
-	}
-	s.Close()
-
-	// Now test just one query.
-	expectCallCnt = 1
-	callCnt = 0
-	s.Open()
-	s.Run("db", "cq", time.Now())
-	// Shouldn't time out.
-	if err := wait(done, 100*time.Millisecond); err != nil {
-		t.Error(err)
-	}
-	// This time it should timeout because ExecuteQuery should not get called again.
-	if err := wait(done, 100*time.Millisecond); err == nil {
-		t.Error("too many queries executed")
-	}
-	s.Close()
-}
-
-// Test service when not the cluster leader (CQs shouldn't run).
-func TestContinuousQueryService_NotLeader(t *testing.T) {
-	s := NewTestService(t)
-	// Set RunInterval high so we can test triggering with the RunCh below.
-	s.RunInterval = 10 * time.Second
-	s.MetaStore.(*MetaStore).Leader = false
-
-	done := make(chan struct{})
-	qe := s.QueryExecutor.(*QueryExecutor)
-	// Set a callback for ExecuteQuery. Shouldn't get called because we're not the leader.
-	qe.ExecuteQueryFn = func(query *influxql.Query, database string, chunkSize int) (<-chan *influxql.Result, error) {
-		done <- struct{}{}
-		return nil, unexpectedErr
-	}
-
-	s.Open()
-	// Trigger service to run CQs.
-	s.RunCh <- &RunRequest{Now: time.Now()}
-	// Expect timeout error because ExecuteQuery callback wasn't called.
-	if err := wait(done, 100*time.Millisecond); err == nil {
-		t.Error(err)
-	}
-	s.Close()
-}
-
-// Test service behavior when meta store fails to get databases.
-func TestContinuousQueryService_MetaStoreFailsToGetDatabases(t *testing.T) {
-	s := NewTestService(t)
-	// Set RunInterval high so we can test triggering with the RunCh below.
-	s.RunInterval = 10 * time.Second
-	s.MetaStore.(*MetaStore).Err = expectedErr
-
-	done := make(chan struct{})
-	qe := s.QueryExecutor.(*QueryExecutor)
-	// Set ExecuteQuery callback, which shouldn't get called because of meta store failure.
-	qe.ExecuteQueryFn = func(query *influxql.Query, database string, chunkSize int) (<-chan *influxql.Result, error) {
-		done <- struct{}{}
-		return nil, unexpectedErr
-	}
-
-	s.Open()
-	// Trigger service to run CQs.
-	s.RunCh <- &RunRequest{Now: time.Now()}
-	// Expect timeout error because ExecuteQuery callback wasn't called.
-	if err := wait(done, 100*time.Millisecond); err == nil {
-		t.Error(err)
-	}
-	s.Close()
-}
-
-// Test ExecuteContinuousQuery with invalid queries.
-func TestExecuteContinuousQuery_InvalidQueries(t *testing.T) {
-	s := NewTestService(t)
-	dbis, _ := s.MetaStore.Databases()
-	dbi := dbis[0]
-	cqi := dbi.ContinuousQueries[0]
-
-	cqi.Query = `this is not a query`
-	err := s.ExecuteContinuousQuery(&dbi, &cqi, time.Now())
-	if err == nil {
-		t.Error("expected error but got nil")
-	}
-
-	// Valid query but invalid continuous query.
-	cqi.Query = `SELECT * FROM cpu`
-	err = s.ExecuteContinuousQuery(&dbi, &cqi, time.Now())
-	if err == nil {
-		t.Error("expected error but got nil")
-	}
-
-	// Group by requires aggregate.
-	cqi.Query = `SELECT value INTO other_value FROM cpu WHERE time > now() - 1h GROUP BY time(1s)`
-	err = s.ExecuteContinuousQuery(&dbi, &cqi, time.Now())
-	if err == nil {
-		t.Error("expected error but got nil")
-	}
-}
-
-// Test ExecuteContinuousQuery when QueryExecutor returns an error.
-func TestExecuteContinuousQuery_QueryExecutor_Error(t *testing.T) {
-	s := NewTestService(t)
-	qe := s.QueryExecutor.(*QueryExecutor)
-	qe.Err = expectedErr
-
-	dbis, _ := s.MetaStore.Databases()
-	dbi := dbis[0]
-	cqi := dbi.ContinuousQueries[0]
-
-	err := s.ExecuteContinuousQuery(&dbi, &cqi, time.Now())
-	if err != expectedErr {
-		t.Errorf("exp = %s, got = %v", expectedErr, err)
-	}
-}
-
-// NewTestService returns a new *Service with default mock object members.
-func NewTestService(t *testing.T) *Service {
-	s := NewService(NewConfig())
-	ms := NewMetaStore(t)
-	s.MetaStore = ms
-	s.QueryExecutor = NewQueryExecutor(t)
-	s.RunInterval = time.Millisecond
-
-	// Set Logger to write to dev/null so stdout isn't polluted.
-	if !testing.Verbose() {
-		s.Logger = log.New(ioutil.Discard, "", log.LstdFlags)
-	}
-
-	// Add a couple test databases and CQs.
-	ms.CreateDatabase("db", "rp")
-	ms.CreateContinuousQuery("db", "cq", `CREATE CONTINUOUS QUERY cq ON db BEGIN SELECT count(cpu) INTO cpu_count FROM cpu WHERE time > now() - 1h GROUP BY time(1s) END`)
-	ms.CreateDatabase("db2", "default")
-	ms.CreateContinuousQuery("db2", "cq2", `CREATE CONTINUOUS QUERY cq2 ON db2 BEGIN SELECT mean(value) INTO cpu_mean FROM cpu WHERE time > now() - 10m GROUP BY time(1m) END`)
-	ms.CreateDatabase("db3", "default")
-	ms.CreateContinuousQuery("db3", "cq3", `CREATE CONTINUOUS QUERY cq3 ON db3 BEGIN SELECT mean(value) INTO "1hAverages".:MEASUREMENT FROM /cpu[0-9]?/ GROUP BY time(10s) END`)
-
-	return s
-}
-
-// MetaStore is a mock meta store.
-type MetaStore struct {
-	mu            sync.RWMutex
-	Leader        bool
-	DatabaseInfos []meta.DatabaseInfo
-	Err           error
-	t             *testing.T
-}
-
-// NewMetaStore returns a *MetaStore.
-func NewMetaStore(t *testing.T) *MetaStore {
-	return &MetaStore{
-		Leader: true,
-		t:      t,
-	}
-}
-
-// IsLeader returns true if the node is the cluster leader.
-func (ms *MetaStore) IsLeader() bool {
-	ms.mu.RLock()
-	defer ms.mu.RUnlock()
-	return ms.Leader
-}
-
-// Databases returns a list of database info about each database in the cluster.
-func (ms *MetaStore) Databases() ([]meta.DatabaseInfo, error) {
-	ms.mu.RLock()
-	defer ms.mu.RUnlock()
-	return ms.DatabaseInfos, ms.Err
-}
-
-// Database returns a single database by name.
-func (ms *MetaStore) Database(name string) (*meta.DatabaseInfo, error) {
-	ms.mu.RLock()
-	defer ms.mu.RUnlock()
-	return ms.database(name)
-}
-
-func (ms *MetaStore) database(name string) (*meta.DatabaseInfo, error) {
-	if ms.Err != nil {
-		return nil, ms.Err
-	}
-	for i := range ms.DatabaseInfos {
-		if ms.DatabaseInfos[i].Name == name {
-			return &ms.DatabaseInfos[i], nil
-		}
-	}
-	return nil, fmt.Errorf("database not found: %s", name)
-}
-
-// CreateDatabase adds a new database to the meta store.
-func (ms *MetaStore) CreateDatabase(name, defaultRetentionPolicy string) error {
-	ms.mu.Lock()
-	defer ms.mu.Unlock()
-	if ms.Err != nil {
-		return ms.Err
-	}
-
-	// See if the database already exists.
-	for _, dbi := range ms.DatabaseInfos {
-		if dbi.Name == name {
-			return fmt.Errorf("database already exists: %s", name)
-		}
-	}
-
-	// Create database.
-	ms.DatabaseInfos = append(ms.DatabaseInfos, meta.DatabaseInfo{
-		Name: name,
-		DefaultRetentionPolicy: defaultRetentionPolicy,
-	})
-
-	return nil
-}
-
-// CreateContinuousQuery adds a CQ to the meta store.
-func (ms *MetaStore) CreateContinuousQuery(database, name, query string) error {
-	ms.mu.Lock()
-	defer ms.mu.Unlock()
-	if ms.Err != nil {
-		return ms.Err
-	}
-
-	dbi, err := ms.database(database)
-	if err != nil {
-		return err
-	} else if dbi == nil {
-		return fmt.Errorf("database not found: %s", database)
-	}
-
-	// See if CQ already exists.
-	for _, cqi := range dbi.ContinuousQueries {
-		if cqi.Name == name {
-			return fmt.Errorf("continuous query already exists: %s", name)
-		}
-	}
-
-	// Create a new CQ and store it.
-	dbi.ContinuousQueries = append(dbi.ContinuousQueries, meta.ContinuousQueryInfo{
-		Name:  name,
-		Query: query,
-	})
-
-	return nil
-}
-
-// QueryExecutor is a mock query executor.
-type QueryExecutor struct {
-	ExecuteQueryFn func(query *influxql.Query, database string, chunkSize int) (<-chan *influxql.Result, error)
-	Results        []*influxql.Result
-	ResultInterval time.Duration
-	Err            error
-	ErrAfterResult int
-	t              *testing.T
-}
-
-// NewQueryExecutor returns a *QueryExecutor.
-func NewQueryExecutor(t *testing.T) *QueryExecutor {
-	return &QueryExecutor{
-		ErrAfterResult: -1,
-		t:              t,
-	}
-}
-
-// ExecuteQuery returns a channel that the caller can read query results from.
-func (qe *QueryExecutor) ExecuteQuery(query *influxql.Query, database string, chunkSize int) (<-chan *influxql.Result, error) {
-
-	// If the test set a callback, call it.
-	if qe.ExecuteQueryFn != nil {
-		if _, err := qe.ExecuteQueryFn(query, database, chunkSize); err != nil {
-			return nil, err
-		}
-	}
-
-	// Are we supposed to error immediately?
-	if qe.ErrAfterResult == -1 && qe.Err != nil {
-		return nil, qe.Err
-	}
-
-	ch := make(chan *influxql.Result)
-
-	// Start a go routine to send results and / or error.
-	go func() {
-		n := 0
-		for i, r := range qe.Results {
-			if i == qe.ErrAfterResult-1 {
-				qe.t.Logf("ExecuteQuery(): ErrAfterResult %d", qe.ErrAfterResult-1)
-				ch <- &influxql.Result{Err: qe.Err}
-				close(ch)
-				return
-			}
-			ch <- r
-			n++
-			time.Sleep(qe.ResultInterval)
-		}
-		qe.t.Logf("ExecuteQuery(): all (%d) results sent", n)
-		if n == 0 {
-			ch <- &influxql.Result{Err: qe.Err}
-		}
-		close(ch)
-	}()
-
-	return ch, nil
-}
-
-// PointsWriter is a mock points writer.
-type PointsWriter struct {
-	WritePointsFn   func(p *cluster.WritePointsRequest) error
-	Err             error
-	PointsPerSecond int
-	t               *testing.T
-}
-
-// NewPointsWriter returns a new *PointsWriter.
-func NewPointsWriter(t *testing.T) *PointsWriter {
-	return &PointsWriter{
-		PointsPerSecond: 25000,
-		t:               t,
-	}
-}
-
-// WritePoints mocks writing points.
-func (pw *PointsWriter) WritePoints(p *cluster.WritePointsRequest) error {
-	// If the test set a callback, call it.
-	if pw.WritePointsFn != nil {
-		if err := pw.WritePointsFn(p); err != nil {
-			return err
-		}
-	}
-
-	if pw.Err != nil {
-		return pw.Err
-	}
-	ns := time.Duration((1 / pw.PointsPerSecond) * 1000000000)
-	time.Sleep(ns)
-	return nil
-}
-
-// genResult generates a dummy query result.
-func genResult(rowCnt, valCnt int) *influxql.Result {
-	rows := make(models.Rows, 0, rowCnt)
-	now := time.Now()
-	for n := 0; n < rowCnt; n++ {
-		vals := make([][]interface{}, 0, valCnt)
-		for m := 0; m < valCnt; m++ {
-			vals = append(vals, []interface{}{now, float64(m)})
-			now.Add(time.Second)
-		}
-		row := &models.Row{
-			Name:    "cpu",
-			Tags:    map[string]string{"host": "server01"},
-			Columns: []string{"time", "value"},
-			Values:  vals,
-		}
-		if len(rows) > 0 {
-			row.Name = fmt.Sprintf("cpu%d", len(rows)+1)
-		}
-		rows = append(rows, row)
-	}
-	return &influxql.Result{
-		Series: rows,
-	}
-}
-
-func wait(c chan struct{}, d time.Duration) (err error) {
-	select {
-	case <-c:
-	case <-time.After(d):
-		err = errors.New("timed out")
-	}
-	return
-}
-
-func waitInt(c chan int, d time.Duration) (i int, err error) {
-	select {
-	case i = <-c:
-	case <-time.After(d):
-		err = errors.New("timed out")
-	}
-	return
-}
-
-func check(err error) {
-	if err != nil {
-		panic(err)
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/copier/internal/internal.pb.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/services/copier/internal/internal.pb.go
deleted file mode 100644
index 68caa62fb..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/copier/internal/internal.pb.go
+++ /dev/null
@@ -1,56 +0,0 @@
-// Code generated by protoc-gen-gogo.
-// source: internal/internal.proto
-// DO NOT EDIT!
-
-/*
-Package internal is a generated protocol buffer package.
-
-It is generated from these files:
-	internal/internal.proto
-
-It has these top-level messages:
-	Request
-	Response
-*/
-package internal
-
-import proto "github.com/gogo/protobuf/proto"
-import fmt "fmt"
-import math "math"
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
-
-type Request struct {
-	ShardID          *uint64 `protobuf:"varint,1,req,name=ShardID" json:"ShardID,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *Request) Reset()         { *m = Request{} }
-func (m *Request) String() string { return proto.CompactTextString(m) }
-func (*Request) ProtoMessage()    {}
-
-func (m *Request) GetShardID() uint64 {
-	if m != nil && m.ShardID != nil {
-		return *m.ShardID
-	}
-	return 0
-}
-
-type Response struct {
-	Error            *string `protobuf:"bytes,1,opt,name=Error" json:"Error,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *Response) Reset()         { *m = Response{} }
-func (m *Response) String() string { return proto.CompactTextString(m) }
-func (*Response) ProtoMessage()    {}
-
-func (m *Response) GetError() string {
-	if m != nil && m.Error != nil {
-		return *m.Error
-	}
-	return ""
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/copier/internal/internal.proto b/Godeps/_workspace/src/github.com/influxdb/influxdb/services/copier/internal/internal.proto
deleted file mode 100644
index fb14c6812..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/copier/internal/internal.proto
+++ /dev/null
@@ -1,9 +0,0 @@
-package internal;
-
-message Request {
-    required uint64 ShardID = 1;
-}
-
-message Response {
-    optional string Error = 1;
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/copier/service.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/services/copier/service.go
deleted file mode 100644
index e245fac72..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/copier/service.go
+++ /dev/null
@@ -1,261 +0,0 @@
-package copier
-
-import (
-	"encoding/binary"
-	"errors"
-	"fmt"
-	"io"
-	"log"
-	"net"
-	"os"
-	"strings"
-	"sync"
-
-	"github.com/gogo/protobuf/proto"
-	"github.com/influxdb/influxdb/services/copier/internal"
-	"github.com/influxdb/influxdb/tcp"
-	"github.com/influxdb/influxdb/tsdb"
-)
-
-//go:generate protoc --gogo_out=. internal/internal.proto
-
-// MuxHeader is the header byte used for the TCP muxer.
-const MuxHeader = 6
-
-// Service manages the listener for the endpoint.
-type Service struct {
-	wg  sync.WaitGroup
-	err chan error
-
-	TSDBStore interface {
-		Shard(id uint64) *tsdb.Shard
-	}
-
-	Listener net.Listener
-	Logger   *log.Logger
-}
-
-// NewService returns a new instance of Service.
-func NewService() *Service {
-	return &Service{
-		err:    make(chan error),
-		Logger: log.New(os.Stderr, "[copier] ", log.LstdFlags),
-	}
-}
-
-// Open starts the service.
-func (s *Service) Open() error {
-	s.Logger.Println("Starting copier service")
-
-	s.wg.Add(1)
-	go s.serve()
-	return nil
-}
-
-// Close implements the Service interface.
-func (s *Service) Close() error {
-	if s.Listener != nil {
-		s.Listener.Close()
-	}
-	s.wg.Wait()
-	return nil
-}
-
-// SetLogger sets the internal logger to the logger passed in.
-func (s *Service) SetLogger(l *log.Logger) {
-	s.Logger = l
-}
-
-// Err returns a channel for fatal out-of-band errors.
-func (s *Service) Err() <-chan error { return s.err }
-
-// serve serves shard copy requests from the listener.
-func (s *Service) serve() {
-	defer s.wg.Done()
-
-	for {
-		// Wait for next connection.
-		conn, err := s.Listener.Accept()
-		if err != nil && strings.Contains(err.Error(), "connection closed") {
-			s.Logger.Println("copier listener closed")
-			return
-		} else if err != nil {
-			s.Logger.Println("error accepting copier request: ", err.Error())
-			continue
-		}
-
-		// Handle connection in separate goroutine.
-		s.wg.Add(1)
-		go func(conn net.Conn) {
-			defer s.wg.Done()
-			defer conn.Close()
-			if err := s.handleConn(conn); err != nil {
-				s.Logger.Println(err)
-			}
-		}(conn)
-	}
-}
-
-// handleConn processes conn. This is run in a separate goroutine.
-func (s *Service) handleConn(conn net.Conn) error {
-	// Read request from connection.
-	req, err := s.readRequest(conn)
-	if err != nil {
-		return fmt.Errorf("read request: %s", err)
-	}
-
-	// Retrieve shard.
-	sh := s.TSDBStore.Shard(req.GetShardID())
-
-	// Return error response if the shard doesn't exist.
-	if sh == nil {
-		if err := s.writeResponse(conn, &internal.Response{
-			Error: proto.String(fmt.Sprintf("shard not found: id=%d", req.GetShardID())),
-		}); err != nil {
-			return fmt.Errorf("write error response: %s", err)
-		}
-		return nil
-	}
-
-	// Write successful response.
-	if err := s.writeResponse(conn, &internal.Response{}); err != nil {
-		return fmt.Errorf("write response: %s", err)
-	}
-
-	// Write shard to response.
-	if _, err := sh.WriteTo(conn); err != nil {
-		return fmt.Errorf("write shard: %s", err)
-	}
-
-	return nil
-}
-
-// readRequest reads and unmarshals a Request from r.
-func (s *Service) readRequest(r io.Reader) (*internal.Request, error) {
-	// Read request length.
-	var n uint32
-	if err := binary.Read(r, binary.BigEndian, &n); err != nil {
-		return nil, fmt.Errorf("read request length: %s", err)
-	}
-
-	// Read body.
-	buf := make([]byte, n)
-	if _, err := io.ReadFull(r, buf); err != nil {
-		return nil, fmt.Errorf("read request: %s", err)
-	}
-
-	// Unmarshal request.
-	req := &internal.Request{}
-	if err := proto.Unmarshal(buf, req); err != nil {
-		return nil, fmt.Errorf("unmarshal request: %s", err)
-	}
-
-	return req, nil
-}
-
-// writeResponse marshals and writes a Response to w.
-func (s *Service) writeResponse(w io.Writer, resp *internal.Response) error {
-	// Marshal the response to a byte slice.
-	buf, err := proto.Marshal(resp)
-	if err != nil {
-		return fmt.Errorf("marshal error: %s", err)
-	}
-
-	// Write response length to writer.
-	if err := binary.Write(w, binary.BigEndian, uint32(len(buf))); err != nil {
-		return fmt.Errorf("write response length error: %s", err)
-	}
-
-	// Write body to writer.
-	if _, err := w.Write(buf); err != nil {
-		return fmt.Errorf("write body error: %s", err)
-	}
-
-	return nil
-}
-
-// Client represents a client for connecting remotely to a copier service.
-type Client struct {
-	host string
-}
-
-// NewClient return a new instance of Client.
-func NewClient(host string) *Client {
-	return &Client{
-		host: host,
-	}
-}
-
-// ShardReader returns a reader for streaming shard data.
-// Returned ReadCloser must be closed by the caller.
-func (c *Client) ShardReader(id uint64) (io.ReadCloser, error) {
-	// Connect to remote server.
-	conn, err := tcp.Dial("tcp", c.host, MuxHeader)
-	if err != nil {
-		return nil, err
-	}
-
-	// Send request to server.
-	if err := c.writeRequest(conn, &internal.Request{ShardID: proto.Uint64(id)}); err != nil {
-		return nil, fmt.Errorf("write request: %s", err)
-	}
-
-	// Read response from the server.
-	resp, err := c.readResponse(conn)
-	if err != nil {
-		return nil, fmt.Errorf("read response: %s", err)
-	}
-
-	// If there was an error then return it and close connection.
-	if resp.GetError() != "" {
-		conn.Close()
-		return nil, errors.New(resp.GetError())
-	}
-
-	// Returning remaining stream for caller to consume.
-	return conn, nil
-}
-
-// writeRequest marshals and writes req to w.
-func (c *Client) writeRequest(w io.Writer, req *internal.Request) error {
-	// Marshal request.
-	buf, err := proto.Marshal(req)
-	if err != nil {
-		return fmt.Errorf("marshal request: %s", err)
-	}
-
-	// Write request length.
-	if err := binary.Write(w, binary.BigEndian, uint32(len(buf))); err != nil {
-		return fmt.Errorf("write request length: %s", err)
-	}
-
-	// Send request to server.
-	if _, err := w.Write(buf); err != nil {
-		return fmt.Errorf("write request body: %s", err)
-	}
-
-	return nil
-}
-
-// readResponse reads and unmarshals a Response from r.
-func (c *Client) readResponse(r io.Reader) (*internal.Response, error) {
-	// Read response length.
-	var n uint32
-	if err := binary.Read(r, binary.BigEndian, &n); err != nil {
-		return nil, fmt.Errorf("read response length: %s", err)
-	}
-
-	// Read response.
-	buf := make([]byte, n)
-	if _, err := io.ReadFull(r, buf); err != nil {
-		return nil, fmt.Errorf("read response: %s", err)
-	}
-
-	// Unmarshal response.
-	resp := &internal.Response{}
-	if err := proto.Unmarshal(buf, resp); err != nil {
-		return nil, fmt.Errorf("unmarshal response: %s", err)
-	}
-
-	return resp, nil
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/copier/service_test.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/services/copier/service_test.go
deleted file mode 100644
index ce1151d3c..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/copier/service_test.go
+++ /dev/null
@@ -1,185 +0,0 @@
-package copier_test
-
-import (
-	"bytes"
-	"encoding/binary"
-	"io"
-	"io/ioutil"
-	"log"
-	"net"
-	"os"
-	"path/filepath"
-	"testing"
-
-	"github.com/influxdb/influxdb/services/copier"
-	"github.com/influxdb/influxdb/tcp"
-	"github.com/influxdb/influxdb/tsdb"
-	_ "github.com/influxdb/influxdb/tsdb/engine"
-)
-
-// Ensure the service can return shard data.
-func TestService_handleConn(t *testing.T) {
-	t.Skip("not implemented for tsm1 engine")
-	s := MustOpenService()
-	defer s.Close()
-
-	// Mock shard.
-	sh := MustOpenShard(123)
-	defer sh.Close()
-	s.TSDBStore.ShardFn = func(id uint64) *tsdb.Shard {
-		if id != 123 {
-			t.Fatalf("unexpected id: %d", id)
-		}
-		return sh.Shard
-	}
-
-	// Create client and request shard from service.
-	c := copier.NewClient(s.Addr().String())
-	r, err := c.ShardReader(123)
-	if err != nil {
-		t.Fatal(err)
-	} else if r == nil {
-		t.Fatal("expected reader")
-	}
-	defer r.Close()
-
-	// Slurp from reader.
-	var n uint64
-	if err := binary.Read(r, binary.BigEndian, &n); err != nil {
-		t.Fatal(err)
-	}
-	buf := make([]byte, n)
-	if _, err := io.ReadFull(r, buf); err != nil {
-		t.Fatal(err)
-	}
-
-	// Read database from disk.
-	exp, err := ioutil.ReadFile(sh.Path())
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// Trim expected bytes since bolt won't read beyond the HWM.
-	exp = exp[0:len(buf)]
-
-	// Compare disk and reader contents.
-	if !bytes.Equal(exp, buf) {
-		t.Fatalf("data mismatch: exp=len(%d), got=len(%d)", len(exp), len(buf))
-	}
-}
-
-// Ensure the service can return an error to the client.
-func TestService_handleConn_Error(t *testing.T) {
-	s := MustOpenService()
-	defer s.Close()
-
-	// Mock missing shard.
-	s.TSDBStore.ShardFn = func(id uint64) *tsdb.Shard { return nil }
-
-	// Create client and request shard from service.
-	c := copier.NewClient(s.Addr().String())
-	r, err := c.ShardReader(123)
-	if err == nil || err.Error() != `shard not found: id=123` {
-		t.Fatalf("unexpected error: %s", err)
-	} else if r != nil {
-		t.Fatal("expected nil reader")
-	}
-}
-
-// Service represents a test wrapper for copier.Service.
-type Service struct {
-	*copier.Service
-
-	ln        net.Listener
-	TSDBStore ServiceTSDBStore
-}
-
-// NewService returns a new instance of Service.
-func NewService() *Service {
-	s := &Service{
-		Service: copier.NewService(),
-	}
-	s.Service.TSDBStore = &s.TSDBStore
-
-	if !testing.Verbose() {
-		s.SetLogger(log.New(ioutil.Discard, "", 0))
-	}
-	return s
-}
-
-// MustOpenService returns a new, opened service. Panic on error.
-func MustOpenService() *Service {
-	// Open randomly assigned port.
-	ln, err := net.Listen("tcp", "127.0.0.1:0")
-	if err != nil {
-		panic(err)
-	}
-
-	// Start muxer.
-	mux := tcp.NewMux()
-
-	// Create new service and attach mux'd listener.
-	s := NewService()
-	s.ln = ln
-	s.Listener = mux.Listen(copier.MuxHeader)
-	go mux.Serve(ln)
-
-	if err := s.Open(); err != nil {
-		panic(err)
-	}
-
-	return s
-}
-
-// Close shuts down the service and the attached listener.
-func (s *Service) Close() error {
-	s.ln.Close()
-	err := s.Service.Close()
-	return err
-}
-
-// Addr returns the address of the service.
-func (s *Service) Addr() net.Addr { return s.ln.Addr() }
-
-// ServiceTSDBStore is a mock that implements copier.Service.TSDBStore.
-type ServiceTSDBStore struct {
-	ShardFn func(id uint64) *tsdb.Shard
-}
-
-func (ss *ServiceTSDBStore) Shard(id uint64) *tsdb.Shard { return ss.ShardFn(id) }
-
-// Shard is a test wrapper for tsdb.Shard.
-type Shard struct {
-	*tsdb.Shard
-	path string
-}
-
-// MustOpenShard returns a temporary, opened shard.
-func MustOpenShard(id uint64) *Shard {
-	path, err := ioutil.TempDir("", "copier-")
-	if err != nil {
-		panic(err)
-	}
-
-	sh := &Shard{
-		Shard: tsdb.NewShard(id,
-			tsdb.NewDatabaseIndex(),
-			filepath.Join(path, "data"),
-			filepath.Join(path, "wal"),
-			tsdb.NewEngineOptions(),
-		),
-		path: path,
-	}
-	if err := sh.Open(); err != nil {
-		sh.Close()
-		panic(err)
-	}
-
-	return sh
-}
-
-func (sh *Shard) Close() error {
-	err := sh.Shard.Close()
-	os.RemoveAll(sh.Path())
-	return err
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/graphite/README.md b/Godeps/_workspace/src/github.com/influxdb/influxdb/services/graphite/README.md
deleted file mode 100644
index 5c2cb6925..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/graphite/README.md
+++ /dev/null
@@ -1,194 +0,0 @@
-# The graphite Input
-
-## A note on UDP/IP OS Buffer sizes
-
-If you're using UDP input and running Linux or FreeBSD, please adjust your UDP buffer
-size limit, [see here for more details.](../udp/README.md#a-note-on-udpip-os-buffer-sizes)
-
-## Configuration
-
-Each Graphite input allows the binding address, target database, and protocol to be set. If the database does not exist, it will be created automatically when the input is initialized. The write-consistency-level can also be set. If any write operations do not meet the configured consistency guarantees, an error will occur and the data will not be indexed. The default consistency-level is `ONE`.
-
-Each Graphite input also performs internal batching of the points it receives, as batched writes to the database are more efficient. The default _batch size_ is 1000, _pending batch_ factor is 5, with a _batch timeout_ of 1 second. This means the input will write batches of maximum size 1000, but if a batch has not reached 1000 points within 1 second of the first point being added to a batch, it will emit that batch regardless of size. The pending batch factor controls how many batches can be in memory at once, allowing the input to transmit a batch, while still building other batches.
-
-## Parsing Metrics
-
-The graphite plugin allows measurements to be saved using the graphite line protocol. By default, enabling the graphite plugin will allow you to collect metrics and store them using the metric name as the measurement.  If you send a metric named `servers.localhost.cpu.loadavg.10`, it will store the full metric name as the measurement with no extracted tags.
-
-While this default setup works, it is not the ideal way to store measurements in InfluxDB since it does not take advantage of tags.  It also will not perform optimally with a large dataset sizes since queries will be forced to use regexes which is known to not scale well.
-
-To extract tags from metrics, one or more templates must be configured to parse metrics into tags and measurements.
-
-## Templates
-
-Templates allow matching parts of a metric name to be used as tag keys in the stored metric.  They have a similar format to graphite metric names.  The values in between the separators are used as the tag keys.  The location of the tag key that matches the same position as the graphite metric section is used as the value.  If there is no value, the graphite portion is skipped.
-
-The special value _measurement_ is used to define the measurement name.  It can have a trailing `*` to indicate that the remainder of the metric should be used.  If a _measurement_ is not specified, the full metric name is used.
-
-### Basic Matching
-
-`servers.localhost.cpu.loadavg.10`
-* Template: `.host.resource.measurement*`
-* Output:  _measurement_ =`loadavg.10` _tags_ =`host=localhost resource=cpu`
-
-### Multiple Measurement Matching
-
-The _measurement_ can be specified multiple times in a template to provide more control over the measurement name.  Multiple values
-will be joined together using the _Separator_ config variable.  By default, this value is `.`.
-
-`servers.localhost.cpu.cpu0.user`
-* Template: `.host.measurement.cpu.measurement`
-* Output: _measurement_ = `cpu.user` _tags_ = `host=localhost cpu=cpu0`
-
-Since '.' requires queries on measurements to be double-quoted, you may want to set this to `_` to simplify querying parsed metrics.
-
-`servers.localhost.cpu.cpu0.user`
-* Separator: `_`
-* Template: `.host.measurement.cpu.measurement`
-* Output: _measurement_ = `cpu_user` _tags_ = `host=localhost cpu=cpu0`
-
-### Adding Tags
-
-Additional tags can be added to a metric that don't exist on the received metric.  You can add additional tags by specifying them after the pattern.  Tags have the same format as the line protocol.  Multiple tags are separated by commas.
-
-`servers.localhost.cpu.loadavg.10`
-* Template: `.host.resource.measurement* region=us-west,zone=1a`
-* Output:  _measurement_ = `loadavg.10` _tags_ = `host=localhost resource=cpu region=us-west zone=1a`
-
-### Fields
-
-A field key can be specified by using the keyword _field_. By default if no _field_ keyword is specified then the metric will be written to a field named _value_.
-
-When using the current default engine _BZ1_, it's recommended to use a single field per value for performance reasons.
-
-When using the _TSM1_ engine it's possible to amend measurement metrics with additional fields, e.g:
-
-Input:
-```
-sensu.metric.net.server0.eth0.rx_packets 461295119435 1444234982
-sensu.metric.net.server0.eth0.tx_bytes 1093086493388480 1444234982
-sensu.metric.net.server0.eth0.rx_bytes 1015633926034834 1444234982
-sensu.metric.net.server0.eth0.tx_errors 0 1444234982
-sensu.metric.net.server0.eth0.rx_errors 0 1444234982
-sensu.metric.net.server0.eth0.tx_dropped 0 1444234982
-sensu.metric.net.server0.eth0.rx_dropped 0 1444234982
-```
-
-With template:
-```
-sensu.metric.* ..measurement.host.interface.field
-```
-
-Becomes database entry:
-```
-> select * from net
-name: net
----------
-time      host  interface rx_bytes    rx_dropped  rx_errors rx_packets    tx_bytes    tx_dropped  tx_errors
-1444234982000000000 server0  eth0    1.015633926034834e+15 0   0   4.61295119435e+11 1.09308649338848e+15  0 0
-```
-
-## Multiple Templates
-
-One template may not match all metrics.  For example, using multiple plugins with diamond will produce metrics in different formats.  If you need to use multiple templates, you'll need to define a prefix filter that must match before the template can be applied.
-
-### Filters
-
-Filters have a similar format to templates but work more like wildcard expressions.  When multiple filters would match a metric, the more specific one is chosen.  Filters are configured by adding them before the template.
-
-For example,
-
-```
-servers.localhost.cpu.loadavg.10
-servers.host123.elasticsearch.cache_hits 100
-servers.host456.mysql.tx_count 10
-servers.host789.prod.mysql.tx_count 10
-```
-* `servers.*` would match all values
-* `servers.*.mysql` would match `servers.host456.mysql.tx_count 10`
-* `servers.localhost.*` would match `servers.localhost.cpu.loadavg`
-* `servers.*.*.mysql` would match `servers.host789.prod.mysql.tx_count 10`
-
-## Default Templates
-
-If no template filters are defined or you want to just have one basic template, you can define a default template.  This template will apply to any metric that has not already matched a filter.
-
-```
-dev.http.requests.200
-prod.myapp.errors.count
-dev.db.queries.count
-```
-
-* `env.app.measurement*` would create
-  * _measurement_=`requests.200` _tags_=`env=dev,app=http`
-  * _measurement_= `errors.count` _tags_=`env=prod,app=myapp`
-  * _measurement_=`queries.count` _tags_=`env=dev,app=db`
-
-## Global Tags
-
-If you need to add the same set of tags to all metrics, you can define them globally at the plugin level and not within each template description.
-
-## Minimal Config
-```
-[[graphite]]
-  enabled = true
-  # bind-address = ":2003"
-  # protocol = "tcp"
-  # consistency-level = "one"
-
-  ### If matching multiple measurement files, this string will be used to join the matched values.
-  # separator = "."
-
-  ### Default tags that will be added to all metrics.  These can be overridden at the template level
-  ### or by tags extracted from metric
-  # tags = ["region=us-east", "zone=1c"]
-
-  ### Each template line requires a template pattern.  It can have an optional
-  ### filter before the template and separated by spaces.  It can also have optional extra
-  ### tags following the template.  Multiple tags should be separated by commas and no spaces
-  ### similar to the line protocol format.  The can be only one default template.
-  # templates = [
-  #   "*.app env.service.resource.measurement",
-  #   # Default template
-  #   "server.*",
- #]
-```
-
-## Customized Config
-```
-[[graphite]]
-   enabled = true
-   separator = "_"
-   tags = ["region=us-east", "zone=1c"]
-   templates = [
-     # filter + template
-     "*.app env.service.resource.measurement",
-
-     # filter + template + extra tag
-     "stats.* .host.measurement* region=us-west,agent=sensu",
-
-     # filter + template with field key
-     "stats.* .host.measurement.field",
-
-     # default template. Ignore the first graphite component "servers"
-     ".measurement*",
- ]
-```
-
-## Two graphite listener, UDP & TCP, Config
-
-```
-[[graphite]]
-  enabled = true
-  bind-address = ":2003"
-  protocol = "tcp"
-  # consistency-level = "one"
-
-[[graphite]]
-  enabled = true
-  bind-address = ":2004" # the bind address
-  protocol = "udp" # protocol to read via
-  udp-read-buffer = 8388608 # (8*1024*1024) UDP read buffer size
-```
-
-
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/graphite/config.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/services/graphite/config.go
deleted file mode 100644
index a92f37eeb..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/graphite/config.go
+++ /dev/null
@@ -1,238 +0,0 @@
-package graphite
-
-import (
-	"fmt"
-	"strings"
-	"time"
-
-	"github.com/influxdb/influxdb/models"
-	"github.com/influxdb/influxdb/toml"
-)
-
-const (
-	// DefaultBindAddress is the default binding interface if none is specified.
-	DefaultBindAddress = ":2003"
-
-	// DefaultDatabase is the default database if none is specified.
-	DefaultDatabase = "graphite"
-
-	// DefaultProtocol is the default IP protocol used by the Graphite input.
-	DefaultProtocol = "tcp"
-
-	// DefaultConsistencyLevel is the default write consistency for the Graphite input.
-	DefaultConsistencyLevel = "one"
-
-	// DefaultSeparator is the default join character to use when joining multiple
-	// measurment parts in a template.
-	DefaultSeparator = "."
-
-	// DefaultBatchSize is the default write batch size.
-	DefaultBatchSize = 5000
-
-	// DefaultBatchPending is the default number of pending write batches.
-	DefaultBatchPending = 10
-
-	// DefaultBatchTimeout is the default Graphite batch timeout.
-	DefaultBatchTimeout = time.Second
-
-	// DefaultUDPReadBuffer is the default buffer size for the UDP listener.
-	// Sets the size of the operating system's receive buffer associated with
-	// the UDP traffic. Keep in mind that the OS must be able
-	// to handle the number set here or the UDP listener will error and exit.
-	//
-	// DefaultReadBuffer = 0 means to use the OS default, which is usually too
-	// small for high UDP performance.
-	//
-	// Increasing OS buffer limits:
-	//     Linux:      sudo sysctl -w net.core.rmem_max=<read-buffer>
-	//     BSD/Darwin: sudo sysctl -w kern.ipc.maxsockbuf=<read-buffer>
-	DefaultUDPReadBuffer = 0
-)
-
-// Config represents the configuration for Graphite endpoints.
-type Config struct {
-	BindAddress      string        `toml:"bind-address"`
-	Database         string        `toml:"database"`
-	Enabled          bool          `toml:"enabled"`
-	Protocol         string        `toml:"protocol"`
-	BatchSize        int           `toml:"batch-size"`
-	BatchPending     int           `toml:"batch-pending"`
-	BatchTimeout     toml.Duration `toml:"batch-timeout"`
-	ConsistencyLevel string        `toml:"consistency-level"`
-	Templates        []string      `toml:"templates"`
-	Tags             []string      `toml:"tags"`
-	Separator        string        `toml:"separator"`
-	UDPReadBuffer    int           `toml:"udp-read-buffer"`
-}
-
-// WithDefaults takes the given config and returns a new config with any required
-// default values set.
-func (c *Config) WithDefaults() *Config {
-	d := *c
-	if d.BindAddress == "" {
-		d.BindAddress = DefaultBindAddress
-	}
-	if d.Database == "" {
-		d.Database = DefaultDatabase
-	}
-	if d.Protocol == "" {
-		d.Protocol = DefaultProtocol
-	}
-	if d.BatchSize == 0 {
-		d.BatchSize = DefaultBatchSize
-	}
-	if d.BatchPending == 0 {
-		d.BatchPending = DefaultBatchPending
-	}
-	if d.BatchTimeout == 0 {
-		d.BatchTimeout = toml.Duration(DefaultBatchTimeout)
-	}
-	if d.ConsistencyLevel == "" {
-		d.ConsistencyLevel = DefaultConsistencyLevel
-	}
-	if d.Separator == "" {
-		d.Separator = DefaultSeparator
-	}
-	if d.UDPReadBuffer == 0 {
-		d.UDPReadBuffer = DefaultUDPReadBuffer
-	}
-	return &d
-}
-
-func (c *Config) DefaultTags() models.Tags {
-	tags := models.Tags{}
-	for _, t := range c.Tags {
-		parts := strings.Split(t, "=")
-		tags[parts[0]] = parts[1]
-	}
-	return tags
-}
-
-func (c *Config) Validate() error {
-	if err := c.validateTemplates(); err != nil {
-		return err
-	}
-
-	if err := c.validateTags(); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (c *Config) validateTemplates() error {
-	// map to keep track of filters we see
-	filters := map[string]struct{}{}
-
-	for i, t := range c.Templates {
-		parts := strings.Fields(t)
-		// Ensure template string is non-empty
-		if len(parts) == 0 {
-			return fmt.Errorf("missing template at position: %d", i)
-		}
-		if len(parts) == 1 && parts[0] == "" {
-			return fmt.Errorf("missing template at position: %d", i)
-		}
-
-		if len(parts) > 3 {
-			return fmt.Errorf("invalid template format: '%s'", t)
-		}
-
-		template := t
-		filter := ""
-		tags := ""
-		if len(parts) >= 2 {
-			// We could have <filter> <template>  or <template> <tags>.  Equals is only allowed in
-			// tags section.
-			if strings.Contains(parts[1], "=") {
-				template = parts[0]
-				tags = parts[1]
-			} else {
-				filter = parts[0]
-				template = parts[1]
-			}
-		}
-
-		if len(parts) == 3 {
-			tags = parts[2]
-		}
-
-		// Validate the template has one and only one measurement
-		if err := c.validateTemplate(template); err != nil {
-			return err
-		}
-
-		// Prevent duplicate filters in the config
-		if _, ok := filters[filter]; ok {
-			return fmt.Errorf("duplicate filter '%s' found at position: %d", filter, i)
-		}
-		filters[filter] = struct{}{}
-
-		if filter != "" {
-			// Validate filter expression is valid
-			if err := c.validateFilter(filter); err != nil {
-				return err
-			}
-		}
-
-		if tags != "" {
-			// Validate tags
-			for _, tagStr := range strings.Split(tags, ",") {
-				if err := c.validateTag(tagStr); err != nil {
-					return err
-				}
-			}
-		}
-	}
-	return nil
-}
-
-func (c *Config) validateTags() error {
-	for _, t := range c.Tags {
-		if err := c.validateTag(t); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func (c *Config) validateTemplate(template string) error {
-	hasMeasurement := false
-	for _, p := range strings.Split(template, ".") {
-		if p == "measurement" || p == "measurement*" {
-			hasMeasurement = true
-		}
-	}
-
-	if !hasMeasurement {
-		return fmt.Errorf("no measurement in template `%s`", template)
-	}
-
-	return nil
-}
-
-func (c *Config) validateFilter(filter string) error {
-	for _, p := range strings.Split(filter, ".") {
-		if p == "" {
-			return fmt.Errorf("filter contains blank section: %s", filter)
-		}
-
-		if strings.Contains(p, "*") && p != "*" {
-			return fmt.Errorf("invalid filter wildcard section: %s", filter)
-		}
-	}
-	return nil
-}
-
-func (c *Config) validateTag(keyValue string) error {
-	parts := strings.Split(keyValue, "=")
-	if len(parts) != 2 {
-		return fmt.Errorf("invalid template tags: '%s'", keyValue)
-	}
-
-	if parts[0] == "" || parts[1] == "" {
-		return fmt.Errorf("invalid template tags: %s'", keyValue)
-	}
-
-	return nil
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/graphite/config_test.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/services/graphite/config_test.go
deleted file mode 100644
index e9efc6466..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/graphite/config_test.go
+++ /dev/null
@@ -1,167 +0,0 @@
-package graphite_test
-
-import (
-	"testing"
-	"time"
-
-	"github.com/BurntSushi/toml"
-	"github.com/influxdb/influxdb/services/graphite"
-)
-
-func TestConfig_Parse(t *testing.T) {
-	// Parse configuration.
-	var c graphite.Config
-	if _, err := toml.Decode(`
-bind-address = ":8080"
-database = "mydb"
-enabled = true
-protocol = "tcp"
-batch-size=100
-batch-pending=77
-batch-timeout="1s"
-consistency-level="one"
-templates=["servers.* .host.measurement*"]
-tags=["region=us-east"]
-`, &c); err != nil {
-		t.Fatal(err)
-	}
-
-	// Validate configuration.
-	if c.BindAddress != ":8080" {
-		t.Fatalf("unexpected bind address: %s", c.BindAddress)
-	} else if c.Database != "mydb" {
-		t.Fatalf("unexpected database selected: %s", c.Database)
-	} else if c.Enabled != true {
-		t.Fatalf("unexpected graphite enabled: %v", c.Enabled)
-	} else if c.Protocol != "tcp" {
-		t.Fatalf("unexpected graphite protocol: %s", c.Protocol)
-	} else if c.BatchSize != 100 {
-		t.Fatalf("unexpected graphite batch size: %d", c.BatchSize)
-	} else if c.BatchPending != 77 {
-		t.Fatalf("unexpected graphite batch pending: %d", c.BatchPending)
-	} else if time.Duration(c.BatchTimeout) != time.Second {
-		t.Fatalf("unexpected graphite batch timeout: %v", c.BatchTimeout)
-	} else if c.ConsistencyLevel != "one" {
-		t.Fatalf("unexpected graphite consistency setting: %s", c.ConsistencyLevel)
-	}
-
-	if len(c.Templates) != 1 && c.Templates[0] != "servers.* .host.measurement*" {
-		t.Fatalf("unexpected graphite templates setting: %v", c.Templates)
-	}
-	if len(c.Tags) != 1 && c.Tags[0] != "regsion=us-east" {
-		t.Fatalf("unexpected graphite templates setting: %v", c.Tags)
-	}
-}
-
-func TestConfigValidateEmptyTemplate(t *testing.T) {
-	c := &graphite.Config{}
-	c.Templates = []string{""}
-	if err := c.Validate(); err == nil {
-		t.Errorf("config validate expected error. got nil")
-	}
-
-	c.Templates = []string{"     "}
-	if err := c.Validate(); err == nil {
-		t.Errorf("config validate expected error. got nil")
-	}
-}
-
-func TestConfigValidateTooManyField(t *testing.T) {
-	c := &graphite.Config{}
-	c.Templates = []string{"a measurement b c"}
-	if err := c.Validate(); err == nil {
-		t.Errorf("config validate expected error. got nil")
-	}
-}
-
-func TestConfigValidateTemplatePatterns(t *testing.T) {
-	c := &graphite.Config{}
-	c.Templates = []string{"*measurement"}
-	if err := c.Validate(); err == nil {
-		t.Errorf("config validate expected error. got nil")
-	}
-
-	c.Templates = []string{".host.region"}
-	if err := c.Validate(); err == nil {
-		t.Errorf("config validate expected error. got nil")
-	}
-}
-
-func TestConfigValidateFilter(t *testing.T) {
-	c := &graphite.Config{}
-	c.Templates = []string{".server measurement*"}
-	if err := c.Validate(); err == nil {
-		t.Errorf("config validate expected error. got nil")
-	}
-
-	c.Templates = []string{".    .server measurement*"}
-	if err := c.Validate(); err == nil {
-		t.Errorf("config validate expected error. got nil")
-	}
-
-	c.Templates = []string{"server* measurement*"}
-	if err := c.Validate(); err == nil {
-		t.Errorf("config validate expected error. got nil")
-	}
-}
-
-func TestConfigValidateTemplateTags(t *testing.T) {
-	c := &graphite.Config{}
-	c.Templates = []string{"*.server measurement* foo"}
-	if err := c.Validate(); err == nil {
-		t.Errorf("config validate expected error. got nil")
-	}
-
-	c.Templates = []string{"*.server measurement* foo=bar="}
-	if err := c.Validate(); err == nil {
-		t.Errorf("config validate expected error. got nil")
-	}
-
-	c.Templates = []string{"*.server measurement* foo=bar,"}
-	if err := c.Validate(); err == nil {
-		t.Errorf("config validate expected error. got nil")
-	}
-
-	c.Templates = []string{"*.server measurement* ="}
-	if err := c.Validate(); err == nil {
-		t.Errorf("config validate expected error. got nil")
-	}
-}
-
-func TestConfigValidateDefaultTags(t *testing.T) {
-	c := &graphite.Config{}
-	c.Tags = []string{"foo"}
-	if err := c.Validate(); err == nil {
-		t.Errorf("config validate expected error. got nil")
-	}
-
-	c.Tags = []string{"foo=bar="}
-	if err := c.Validate(); err == nil {
-		t.Errorf("config validate expected error. got nil")
-	}
-
-	c.Tags = []string{"foo=bar", ""}
-	if err := c.Validate(); err == nil {
-		t.Errorf("config validate expected error. got nil")
-	}
-
-	c.Tags = []string{"="}
-	if err := c.Validate(); err == nil {
-		t.Errorf("config validate expected error. got nil")
-	}
-}
-
-func TestConfigValidateFilterDuplicates(t *testing.T) {
-	c := &graphite.Config{}
-	c.Templates = []string{"foo measurement*", "foo .host.measurement"}
-	if err := c.Validate(); err == nil {
-		t.Errorf("config validate expected error. got nil")
-	}
-
-	// duplicate default templates
-	c.Templates = []string{"measurement*", ".host.measurement"}
-	if err := c.Validate(); err == nil {
-		t.Errorf("config validate expected error. got nil")
-	}
-
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/graphite/parser.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/services/graphite/parser.go
deleted file mode 100644
index e41054a37..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/graphite/parser.go
+++ /dev/null
@@ -1,388 +0,0 @@
-package graphite
-
-import (
-	"fmt"
-	"math"
-	"sort"
-	"strconv"
-	"strings"
-	"time"
-
-	"github.com/influxdb/influxdb/models"
-)
-
-var (
-	defaultTemplate *template
-	MinDate         = time.Date(1901, 12, 13, 0, 0, 0, 0, time.UTC)
-	MaxDate         = time.Date(2038, 1, 19, 0, 0, 0, 0, time.UTC)
-)
-
-func init() {
-	var err error
-	defaultTemplate, err = NewTemplate("measurement*", nil, DefaultSeparator)
-	if err != nil {
-		panic(err)
-	}
-}
-
-// Parser encapsulates a Graphite Parser.
-type Parser struct {
-	matcher *matcher
-	tags    models.Tags
-}
-
-// Options are configurable values that can be provided to a Parser
-type Options struct {
-	Separator   string
-	Templates   []string
-	DefaultTags models.Tags
-}
-
-// NewParserWithOptions returns a graphite parser using the given options
-func NewParserWithOptions(options Options) (*Parser, error) {
-
-	matcher := newMatcher()
-	matcher.AddDefaultTemplate(defaultTemplate)
-
-	for _, pattern := range options.Templates {
-
-		template := pattern
-		filter := ""
-		// Format is [filter] <template> [tag1=value1,tag2=value2]
-		parts := strings.Fields(pattern)
-		if len(parts) < 1 {
-			continue
-		} else if len(parts) >= 2 {
-			if strings.Contains(parts[1], "=") {
-				template = parts[0]
-			} else {
-				filter = parts[0]
-				template = parts[1]
-			}
-		}
-
-		// Parse out the default tags specific to this template
-		tags := models.Tags{}
-		if strings.Contains(parts[len(parts)-1], "=") {
-			tagStrs := strings.Split(parts[len(parts)-1], ",")
-			for _, kv := range tagStrs {
-				parts := strings.Split(kv, "=")
-				tags[parts[0]] = parts[1]
-			}
-		}
-
-		tmpl, err := NewTemplate(template, tags, options.Separator)
-		if err != nil {
-			return nil, err
-		}
-		matcher.Add(filter, tmpl)
-	}
-	return &Parser{matcher: matcher, tags: options.DefaultTags}, nil
-}
-
-// NewParser returns a GraphiteParser instance.
-func NewParser(templates []string, defaultTags models.Tags) (*Parser, error) {
-	return NewParserWithOptions(
-		Options{
-			Templates:   templates,
-			DefaultTags: defaultTags,
-			Separator:   DefaultSeparator,
-		})
-}
-
-// Parse performs Graphite parsing of a single line.
-func (p *Parser) Parse(line string) (models.Point, error) {
-	// Break into 3 fields (name, value, timestamp).
-	fields := strings.Fields(line)
-	if len(fields) != 2 && len(fields) != 3 {
-		return nil, fmt.Errorf("received %q which doesn't have required fields", line)
-	}
-
-	// decode the name and tags
-	template := p.matcher.Match(fields[0])
-	measurement, tags, field, err := template.Apply(fields[0])
-	if err != nil {
-		return nil, err
-	}
-
-	// Could not extract measurement, use the raw value
-	if measurement == "" {
-		measurement = fields[0]
-	}
-
-	// Parse value.
-	v, err := strconv.ParseFloat(fields[1], 64)
-	if err != nil {
-		return nil, fmt.Errorf(`field "%s" value: %s`, fields[0], err)
-	}
-
-	if math.IsNaN(v) || math.IsInf(v, 0) {
-		return nil, fmt.Errorf(`field "%s" value: '%v" is unsupported`, fields[0], v)
-	}
-
-	fieldValues := map[string]interface{}{}
-	if field != "" {
-		fieldValues[field] = v
-	} else {
-		fieldValues["value"] = v
-	}
-
-	// If no 3rd field, use now as timestamp
-	timestamp := time.Now().UTC()
-
-	if len(fields) == 3 {
-		// Parse timestamp.
-		unixTime, err := strconv.ParseFloat(fields[2], 64)
-		if err != nil {
-			return nil, fmt.Errorf(`field "%s" time: %s`, fields[0], err)
-		}
-
-		// -1 is a special value that gets converted to current UTC time
-		// See https://github.com/graphite-project/carbon/issues/54
-		if unixTime != float64(-1) {
-			// Check if we have fractional seconds
-			timestamp = time.Unix(int64(unixTime), int64((unixTime-math.Floor(unixTime))*float64(time.Second)))
-			if timestamp.Before(MinDate) || timestamp.After(MaxDate) {
-				return nil, fmt.Errorf("timestamp out of range")
-			}
-		}
-	}
-
-	// Set the default tags on the point if they are not already set
-	for k, v := range p.tags {
-		if _, ok := tags[k]; !ok {
-			tags[k] = v
-		}
-	}
-	return models.NewPoint(measurement, tags, fieldValues, timestamp)
-}
-
-// Apply extracts the template fields form the given line and returns the
-// measurement name and tags
-func (p *Parser) ApplyTemplate(line string) (string, map[string]string, string, error) {
-	// Break line into fields (name, value, timestamp), only name is used
-	fields := strings.Fields(line)
-	if len(fields) == 0 {
-		return "", make(map[string]string), "", nil
-	}
-	// decode the name and tags
-	template := p.matcher.Match(fields[0])
-	name, tags, field, err := template.Apply(fields[0])
-	// Set the default tags on the point if they are not already set
-	for k, v := range p.tags {
-		if _, ok := tags[k]; !ok {
-			tags[k] = v
-		}
-	}
-	return name, tags, field, err
-}
-
-// template represents a pattern and tags to map a graphite metric string to a influxdb Point
-type template struct {
-	tags              []string
-	defaultTags       models.Tags
-	greedyMeasurement bool
-	separator         string
-}
-
-func NewTemplate(pattern string, defaultTags models.Tags, separator string) (*template, error) {
-	tags := strings.Split(pattern, ".")
-	hasMeasurement := false
-	template := &template{tags: tags, defaultTags: defaultTags, separator: separator}
-
-	for _, tag := range tags {
-		if strings.HasPrefix(tag, "measurement") {
-			hasMeasurement = true
-		}
-		if tag == "measurement*" {
-			template.greedyMeasurement = true
-		}
-	}
-
-	if !hasMeasurement {
-		return nil, fmt.Errorf("no measurement specified for template. %q", pattern)
-	}
-
-	return template, nil
-}
-
-// Apply extracts the template fields form the given line and returns the measurement
-// name and tags
-func (t *template) Apply(line string) (string, map[string]string, string, error) {
-	fields := strings.Split(line, ".")
-	var (
-		measurement []string
-		tags        = make(map[string]string)
-		field       string
-	)
-
-	// Set any default tags
-	for k, v := range t.defaultTags {
-		tags[k] = v
-	}
-
-	for i, tag := range t.tags {
-		if i >= len(fields) {
-			continue
-		}
-
-		if tag == "measurement" {
-			measurement = append(measurement, fields[i])
-		} else if tag == "field" {
-			if len(field) != 0 {
-				return "", nil, "", fmt.Errorf("'field' can only be used once in each template: %q", line)
-			} else {
-				field = fields[i]
-			}
-		} else if tag == "measurement*" {
-			measurement = append(measurement, fields[i:]...)
-			break
-		} else if tag != "" {
-			tags[tag] = fields[i]
-		}
-	}
-
-	return strings.Join(measurement, t.separator), tags, field, nil
-}
-
-// matcher determines which template should be applied to a given metric
-// based on a filter tree.
-type matcher struct {
-	root            *node
-	defaultTemplate *template
-}
-
-func newMatcher() *matcher {
-	return &matcher{
-		root: &node{},
-	}
-}
-
-// Add inserts the template in the filter tree based the given filter
-func (m *matcher) Add(filter string, template *template) {
-	if filter == "" {
-		m.AddDefaultTemplate(template)
-		return
-	}
-	m.root.Insert(filter, template)
-}
-
-func (m *matcher) AddDefaultTemplate(template *template) {
-	m.defaultTemplate = template
-}
-
-// Match returns the template that matches the given graphite line
-func (m *matcher) Match(line string) *template {
-	tmpl := m.root.Search(line)
-	if tmpl != nil {
-		return tmpl
-	}
-
-	return m.defaultTemplate
-}
-
-// node is an item in a sorted k-ary tree.  Each child is sorted by its value.
-// The special value of "*", is always last.
-type node struct {
-	value    string
-	children nodes
-	template *template
-}
-
-func (n *node) insert(values []string, template *template) {
-	// Add the end, set the template
-	if len(values) == 0 {
-		n.template = template
-		return
-	}
-
-	// See if the the current element already exists in the tree. If so, insert the
-	// into that sub-tree
-	for _, v := range n.children {
-		if v.value == values[0] {
-			v.insert(values[1:], template)
-			return
-		}
-	}
-
-	// New element, add it to the tree and sort the children
-	newNode := &node{value: values[0]}
-	n.children = append(n.children, newNode)
-	sort.Sort(&n.children)
-
-	// Now insert the rest of the tree into the new element
-	newNode.insert(values[1:], template)
-}
-
-// Insert inserts the given string template into the tree.  The filter string is separated
-// on "." and each part is used as the path in the tree.
-func (n *node) Insert(filter string, template *template) {
-	n.insert(strings.Split(filter, "."), template)
-}
-
-func (n *node) search(lineParts []string) *template {
-	// Nothing to search
-	if len(lineParts) == 0 || len(n.children) == 0 {
-		return n.template
-	}
-
-	// If last element is a wildcard, don't include in this search since it's sorted
-	// to the end but lexicographically it would not always be and sort.Search assumes
-	// the slice is sorted.
-	length := len(n.children)
-	if n.children[length-1].value == "*" {
-		length -= 1
-	}
-
-	// Find the index of child with an exact match
-	i := sort.Search(length, func(i int) bool {
-		return n.children[i].value >= lineParts[0]
-	})
-
-	// Found an exact match, so search that child sub-tree
-	if i < len(n.children) && n.children[i].value == lineParts[0] {
-		return n.children[i].search(lineParts[1:])
-	}
-	// Not an exact match, see if we have a wildcard child to search
-	if n.children[len(n.children)-1].value == "*" {
-		return n.children[len(n.children)-1].search(lineParts[1:])
-	}
-	return n.template
-}
-
-func (n *node) Search(line string) *template {
-	return n.search(strings.Split(line, "."))
-}
-
-type nodes []*node
-
-// Less returns a boolean indicating whether the filter at position j
-// is less than the filter at position k.  Filters are order by string
-// comparison of each component parts.  A wildcard value "*" is never
-// less than a non-wildcard value.
-//
-// For example, the filters:
-//             "*.*"
-//             "servers.*"
-//             "servers.localhost"
-//             "*.localhost"
-//
-// Would be sorted as:
-//             "servers.localhost"
-//             "servers.*"
-//             "*.localhost"
-//             "*.*"
-func (n *nodes) Less(j, k int) bool {
-	if (*n)[j].value == "*" && (*n)[k].value != "*" {
-		return false
-	}
-
-	if (*n)[j].value != "*" && (*n)[k].value == "*" {
-		return true
-	}
-
-	return (*n)[j].value < (*n)[k].value
-}
-
-func (n *nodes) Swap(i, j int) { (*n)[i], (*n)[j] = (*n)[j], (*n)[i] }
-func (n *nodes) Len() int      { return len(*n) }
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/graphite/parser_test.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/services/graphite/parser_test.go
deleted file mode 100644
index aa77eed7f..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/graphite/parser_test.go
+++ /dev/null
@@ -1,663 +0,0 @@
-package graphite_test
-
-import (
-	"strconv"
-	"testing"
-	"time"
-
-	"github.com/influxdb/influxdb/models"
-	"github.com/influxdb/influxdb/services/graphite"
-)
-
-func BenchmarkParse(b *testing.B) {
-	p, err := graphite.NewParser([]string{
-		"*.* .wrong.measurement*",
-		"servers.* .host.measurement*",
-		"servers.localhost .host.measurement*",
-		"*.localhost .host.measurement*",
-		"*.*.cpu .host.measurement*",
-		"a.b.c .host.measurement*",
-		"influxd.*.foo .host.measurement*",
-		"prod.*.mem .host.measurement*",
-	}, nil)
-
-	if err != nil {
-		b.Fatalf("unexpected error creating parser, got %v", err)
-	}
-
-	for i := 0; i < b.N; i++ {
-		p.Parse("servers.localhost.cpu.load 11 1435077219")
-	}
-}
-
-func TestTemplateApply(t *testing.T) {
-	var tests = []struct {
-		test        string
-		input       string
-		template    string
-		measurement string
-		tags        map[string]string
-		err         string
-	}{
-		{
-			test:        "metric only",
-			input:       "cpu",
-			template:    "measurement",
-			measurement: "cpu",
-		},
-		{
-			test:        "metric with single series",
-			input:       "cpu.server01",
-			template:    "measurement.hostname",
-			measurement: "cpu",
-			tags:        map[string]string{"hostname": "server01"},
-		},
-		{
-			test:        "metric with multiple series",
-			input:       "cpu.us-west.server01",
-			template:    "measurement.region.hostname",
-			measurement: "cpu",
-			tags:        map[string]string{"hostname": "server01", "region": "us-west"},
-		},
-		{
-			test: "no metric",
-			tags: make(map[string]string),
-			err:  `no measurement specified for template. ""`,
-		},
-		{
-			test:        "ignore unnamed",
-			input:       "foo.cpu",
-			template:    "measurement",
-			measurement: "foo",
-			tags:        make(map[string]string),
-		},
-		{
-			test:        "name shorter than template",
-			input:       "foo",
-			template:    "measurement.A.B.C",
-			measurement: "foo",
-			tags:        make(map[string]string),
-		},
-		{
-			test:        "wildcard measurement at end",
-			input:       "prod.us-west.server01.cpu.load",
-			template:    "env.zone.host.measurement*",
-			measurement: "cpu.load",
-			tags:        map[string]string{"env": "prod", "zone": "us-west", "host": "server01"},
-		},
-		{
-			test:        "skip fields",
-			input:       "ignore.us-west.ignore-this-too.cpu.load",
-			template:    ".zone..measurement*",
-			measurement: "cpu.load",
-			tags:        map[string]string{"zone": "us-west"},
-		},
-	}
-
-	for _, test := range tests {
-		tmpl, err := graphite.NewTemplate(test.template, nil, graphite.DefaultSeparator)
-		if errstr(err) != test.err {
-			t.Fatalf("err does not match.  expected %v, got %v", test.err, err)
-		}
-		if err != nil {
-			// If we erred out,it was intended and the following tests won't work
-			continue
-		}
-
-		measurement, tags, _, _ := tmpl.Apply(test.input)
-		if measurement != test.measurement {
-			t.Fatalf("name parse failer.  expected %v, got %v", test.measurement, measurement)
-		}
-		if len(tags) != len(test.tags) {
-			t.Fatalf("unexpected number of tags.  expected %v, got %v", test.tags, tags)
-		}
-		for k, v := range test.tags {
-			if tags[k] != v {
-				t.Fatalf("unexpected tag value for tags[%s].  expected %q, got %q", k, v, tags[k])
-			}
-		}
-	}
-}
-
-func TestParseMissingMeasurement(t *testing.T) {
-	_, err := graphite.NewParser([]string{"a.b.c"}, nil)
-	if err == nil {
-		t.Fatalf("expected error creating parser, got nil")
-	}
-}
-
-func TestParse(t *testing.T) {
-	testTime := time.Now().Round(time.Second)
-	epochTime := testTime.Unix()
-	strTime := strconv.FormatInt(epochTime, 10)
-
-	var tests = []struct {
-		test        string
-		input       string
-		measurement string
-		tags        map[string]string
-		value       float64
-		time        time.Time
-		template    string
-		err         string
-	}{
-		{
-			test:        "normal case",
-			input:       `cpu.foo.bar 50 ` + strTime,
-			template:    "measurement.foo.bar",
-			measurement: "cpu",
-			tags: map[string]string{
-				"foo": "foo",
-				"bar": "bar",
-			},
-			value: 50,
-			time:  testTime,
-		},
-		{
-			test:        "metric only with float value",
-			input:       `cpu 50.554 ` + strTime,
-			measurement: "cpu",
-			template:    "measurement",
-			value:       50.554,
-			time:        testTime,
-		},
-		{
-			test:     "missing metric",
-			input:    `1419972457825`,
-			template: "measurement",
-			err:      `received "1419972457825" which doesn't have required fields`,
-		},
-		{
-			test:     "should error parsing invalid float",
-			input:    `cpu 50.554z 1419972457825`,
-			template: "measurement",
-			err:      `field "cpu" value: strconv.ParseFloat: parsing "50.554z": invalid syntax`,
-		},
-		{
-			test:     "should error parsing invalid int",
-			input:    `cpu 50z 1419972457825`,
-			template: "measurement",
-			err:      `field "cpu" value: strconv.ParseFloat: parsing "50z": invalid syntax`,
-		},
-		{
-			test:     "should error parsing invalid time",
-			input:    `cpu 50.554 14199724z57825`,
-			template: "measurement",
-			err:      `field "cpu" time: strconv.ParseFloat: parsing "14199724z57825": invalid syntax`,
-		},
-	}
-
-	for _, test := range tests {
-		p, err := graphite.NewParser([]string{test.template}, nil)
-		if err != nil {
-			t.Fatalf("unexpected error creating graphite parser: %v", err)
-		}
-
-		point, err := p.Parse(test.input)
-		if errstr(err) != test.err {
-			t.Fatalf("err does not match.  expected %v, got %v", test.err, err)
-		}
-		if err != nil {
-			// If we erred out,it was intended and the following tests won't work
-			continue
-		}
-		if point.Name() != test.measurement {
-			t.Fatalf("name parse failer.  expected %v, got %v", test.measurement, point.Name())
-		}
-		if len(point.Tags()) != len(test.tags) {
-			t.Fatalf("tags len mismatch.  expected %d, got %d", len(test.tags), len(point.Tags()))
-		}
-		f := point.Fields()["value"].(float64)
-		if point.Fields()["value"] != f {
-			t.Fatalf("floatValue value mismatch.  expected %v, got %v", test.value, f)
-		}
-		if point.Time().UnixNano()/1000000 != test.time.UnixNano()/1000000 {
-			t.Fatalf("time value mismatch.  expected %v, got %v", test.time.UnixNano(), point.Time().UnixNano())
-		}
-	}
-}
-
-func TestParseNaN(t *testing.T) {
-	p, err := graphite.NewParser([]string{"measurement*"}, nil)
-	if err != nil {
-		t.Fatalf("unexpected error creating parser, got %v", err)
-	}
-
-	_, err = p.Parse("servers.localhost.cpu_load NaN 1435077219")
-	if err == nil {
-		t.Fatalf("expected error. got nil")
-	}
-}
-
-func TestFilterMatchDefault(t *testing.T) {
-	p, err := graphite.NewParser([]string{"servers.localhost .host.measurement*"}, nil)
-	if err != nil {
-		t.Fatalf("unexpected error creating parser, got %v", err)
-	}
-
-	exp := models.MustNewPoint("miss.servers.localhost.cpu_load",
-		models.Tags{},
-		models.Fields{"value": float64(11)},
-		time.Unix(1435077219, 0))
-
-	pt, err := p.Parse("miss.servers.localhost.cpu_load 11 1435077219")
-	if err != nil {
-		t.Fatalf("parse error: %v", err)
-	}
-
-	if exp.String() != pt.String() {
-		t.Errorf("parse mismatch: got %v, exp %v", pt.String(), exp.String())
-	}
-}
-
-func TestFilterMatchMultipleMeasurement(t *testing.T) {
-	p, err := graphite.NewParser([]string{"servers.localhost .host.measurement.measurement*"}, nil)
-	if err != nil {
-		t.Fatalf("unexpected error creating parser, got %v", err)
-	}
-
-	exp := models.MustNewPoint("cpu.cpu_load.10",
-		models.Tags{"host": "localhost"},
-		models.Fields{"value": float64(11)},
-		time.Unix(1435077219, 0))
-
-	pt, err := p.Parse("servers.localhost.cpu.cpu_load.10 11 1435077219")
-	if err != nil {
-		t.Fatalf("parse error: %v", err)
-	}
-
-	if exp.String() != pt.String() {
-		t.Errorf("parse mismatch: got %v, exp %v", pt.String(), exp.String())
-	}
-}
-
-func TestFilterMatchMultipleMeasurementSeparator(t *testing.T) {
-	p, err := graphite.NewParserWithOptions(graphite.Options{
-		Templates: []string{"servers.localhost .host.measurement.measurement*"},
-		Separator: "_",
-	})
-	if err != nil {
-		t.Fatalf("unexpected error creating parser, got %v", err)
-	}
-
-	exp := models.MustNewPoint("cpu_cpu_load_10",
-		models.Tags{"host": "localhost"},
-		models.Fields{"value": float64(11)},
-		time.Unix(1435077219, 0))
-
-	pt, err := p.Parse("servers.localhost.cpu.cpu_load.10 11 1435077219")
-	if err != nil {
-		t.Fatalf("parse error: %v", err)
-	}
-
-	if exp.String() != pt.String() {
-		t.Errorf("parse mismatch: got %v, exp %v", pt.String(), exp.String())
-	}
-}
-
-func TestFilterMatchSingle(t *testing.T) {
-	p, err := graphite.NewParser([]string{"servers.localhost .host.measurement*"}, nil)
-	if err != nil {
-		t.Fatalf("unexpected error creating parser, got %v", err)
-	}
-
-	exp := models.MustNewPoint("cpu_load",
-		models.Tags{"host": "localhost"},
-		models.Fields{"value": float64(11)},
-		time.Unix(1435077219, 0))
-
-	pt, err := p.Parse("servers.localhost.cpu_load 11 1435077219")
-	if err != nil {
-		t.Fatalf("parse error: %v", err)
-	}
-
-	if exp.String() != pt.String() {
-		t.Errorf("parse mismatch: got %v, exp %v", pt.String(), exp.String())
-	}
-}
-
-func TestParseNoMatch(t *testing.T) {
-	p, err := graphite.NewParser([]string{"servers.*.cpu .host.measurement.cpu.measurement"}, nil)
-	if err != nil {
-		t.Fatalf("unexpected error creating parser, got %v", err)
-	}
-
-	exp := models.MustNewPoint("servers.localhost.memory.VmallocChunk",
-		models.Tags{},
-		models.Fields{"value": float64(11)},
-		time.Unix(1435077219, 0))
-
-	pt, err := p.Parse("servers.localhost.memory.VmallocChunk 11 1435077219")
-	if err != nil {
-		t.Fatalf("parse error: %v", err)
-	}
-
-	if exp.String() != pt.String() {
-		t.Errorf("parse mismatch: got %v, exp %v", pt.String(), exp.String())
-	}
-}
-
-func TestFilterMatchWildcard(t *testing.T) {
-	p, err := graphite.NewParser([]string{"servers.* .host.measurement*"}, nil)
-	if err != nil {
-		t.Fatalf("unexpected error creating parser, got %v", err)
-	}
-
-	exp := models.MustNewPoint("cpu_load",
-		models.Tags{"host": "localhost"},
-		models.Fields{"value": float64(11)},
-		time.Unix(1435077219, 0))
-
-	pt, err := p.Parse("servers.localhost.cpu_load 11 1435077219")
-	if err != nil {
-		t.Fatalf("parse error: %v", err)
-	}
-
-	if exp.String() != pt.String() {
-		t.Errorf("parse mismatch: got %v, exp %v", pt.String(), exp.String())
-	}
-}
-
-func TestFilterMatchExactBeforeWildcard(t *testing.T) {
-	p, err := graphite.NewParser([]string{
-		"servers.* .wrong.measurement*",
-		"servers.localhost .host.measurement*"}, nil)
-	if err != nil {
-		t.Fatalf("unexpected error creating parser, got %v", err)
-	}
-
-	exp := models.MustNewPoint("cpu_load",
-		models.Tags{"host": "localhost"},
-		models.Fields{"value": float64(11)},
-		time.Unix(1435077219, 0))
-
-	pt, err := p.Parse("servers.localhost.cpu_load 11 1435077219")
-	if err != nil {
-		t.Fatalf("parse error: %v", err)
-	}
-
-	if exp.String() != pt.String() {
-		t.Errorf("parse mismatch: got %v, exp %v", pt.String(), exp.String())
-	}
-}
-
-func TestFilterMatchMostLongestFilter(t *testing.T) {
-	p, err := graphite.NewParser([]string{
-		"*.* .wrong.measurement*",
-		"servers.* .wrong.measurement*",
-		"servers.localhost .wrong.measurement*",
-		"servers.localhost.cpu .host.resource.measurement*", // should match this
-		"*.localhost .wrong.measurement*",
-	}, nil)
-
-	if err != nil {
-		t.Fatalf("unexpected error creating parser, got %v", err)
-	}
-
-	exp := models.MustNewPoint("cpu_load",
-		models.Tags{"host": "localhost", "resource": "cpu"},
-		models.Fields{"value": float64(11)},
-		time.Unix(1435077219, 0))
-
-	pt, err := p.Parse("servers.localhost.cpu.cpu_load 11 1435077219")
-	if err != nil {
-		t.Fatalf("parse error: %v", err)
-	}
-
-	if exp.String() != pt.String() {
-		t.Errorf("parse mismatch: got %v, exp %v", pt.String(), exp.String())
-	}
-}
-
-func TestFilterMatchMultipleWildcards(t *testing.T) {
-	p, err := graphite.NewParser([]string{
-		"*.* .wrong.measurement*",
-		"servers.* .host.measurement*", // should match this
-		"servers.localhost .wrong.measurement*",
-		"*.localhost .wrong.measurement*",
-	}, nil)
-
-	if err != nil {
-		t.Fatalf("unexpected error creating parser, got %v", err)
-	}
-
-	exp := models.MustNewPoint("cpu_load",
-		models.Tags{"host": "server01"},
-		models.Fields{"value": float64(11)},
-		time.Unix(1435077219, 0))
-
-	pt, err := p.Parse("servers.server01.cpu_load 11 1435077219")
-	if err != nil {
-		t.Fatalf("parse error: %v", err)
-	}
-
-	if exp.String() != pt.String() {
-		t.Errorf("parse mismatch: got %v, exp %v", pt.String(), exp.String())
-	}
-}
-
-func TestParseDefaultTags(t *testing.T) {
-	p, err := graphite.NewParser([]string{"servers.localhost .host.measurement*"}, models.Tags{
-		"region": "us-east",
-		"zone":   "1c",
-		"host":   "should not set",
-	})
-	if err != nil {
-		t.Fatalf("unexpected error creating parser, got %v", err)
-	}
-
-	exp := models.MustNewPoint("cpu_load",
-		models.Tags{"host": "localhost", "region": "us-east", "zone": "1c"},
-		models.Fields{"value": float64(11)},
-		time.Unix(1435077219, 0))
-
-	pt, err := p.Parse("servers.localhost.cpu_load 11 1435077219")
-	if err != nil {
-		t.Fatalf("parse error: %v", err)
-	}
-
-	if exp.String() != pt.String() {
-		t.Errorf("parse mismatch: got %v, exp %v", pt.String(), exp.String())
-	}
-}
-
-func TestParseDefaultTemplateTags(t *testing.T) {
-	p, err := graphite.NewParser([]string{"servers.localhost .host.measurement* zone=1c"}, models.Tags{
-		"region": "us-east",
-		"host":   "should not set",
-	})
-	if err != nil {
-		t.Fatalf("unexpected error creating parser, got %v", err)
-	}
-
-	exp := models.MustNewPoint("cpu_load",
-		models.Tags{"host": "localhost", "region": "us-east", "zone": "1c"},
-		models.Fields{"value": float64(11)},
-		time.Unix(1435077219, 0))
-
-	pt, err := p.Parse("servers.localhost.cpu_load 11 1435077219")
-	if err != nil {
-		t.Fatalf("parse error: %v", err)
-	}
-
-	if exp.String() != pt.String() {
-		t.Errorf("parse mismatch: got %v, exp %v", pt.String(), exp.String())
-	}
-}
-
-func TestParseDefaultTemplateTagsOverridGlobal(t *testing.T) {
-	p, err := graphite.NewParser([]string{"servers.localhost .host.measurement* zone=1c,region=us-east"}, models.Tags{
-		"region": "shot not be set",
-		"host":   "should not set",
-	})
-	if err != nil {
-		t.Fatalf("unexpected error creating parser, got %v", err)
-	}
-
-	exp := models.MustNewPoint("cpu_load",
-		models.Tags{"host": "localhost", "region": "us-east", "zone": "1c"},
-		models.Fields{"value": float64(11)},
-		time.Unix(1435077219, 0))
-
-	pt, err := p.Parse("servers.localhost.cpu_load 11 1435077219")
-	if err != nil {
-		t.Fatalf("parse error: %v", err)
-	}
-
-	if exp.String() != pt.String() {
-		t.Errorf("parse mismatch: got %v, exp %v", pt.String(), exp.String())
-	}
-}
-
-func TestParseTemplateWhitespace(t *testing.T) {
-	p, err := graphite.NewParser([]string{"servers.localhost        .host.measurement*           zone=1c"}, models.Tags{
-		"region": "us-east",
-		"host":   "should not set",
-	})
-	if err != nil {
-		t.Fatalf("unexpected error creating parser, got %v", err)
-	}
-
-	exp := models.MustNewPoint("cpu_load",
-		models.Tags{"host": "localhost", "region": "us-east", "zone": "1c"},
-		models.Fields{"value": float64(11)},
-		time.Unix(1435077219, 0))
-
-	pt, err := p.Parse("servers.localhost.cpu_load 11 1435077219")
-	if err != nil {
-		t.Fatalf("parse error: %v", err)
-	}
-
-	if exp.String() != pt.String() {
-		t.Errorf("parse mismatch: got %v, exp %v", pt.String(), exp.String())
-	}
-}
-
-// Test basic functionality of ApplyTemplate
-func TestApplyTemplate(t *testing.T) {
-	o := graphite.Options{
-		Separator: "_",
-		Templates: []string{"current.* measurement.measurement"},
-	}
-	p, err := graphite.NewParserWithOptions(o)
-	if err != nil {
-		t.Fatalf("unexpected error creating parser, got %v", err)
-	}
-
-	measurement, _, _, _ := p.ApplyTemplate("current.users")
-	if measurement != "current_users" {
-		t.Errorf("Parser.ApplyTemplate unexpected result. got %s, exp %s",
-			measurement, "current_users")
-	}
-}
-
-// Test basic functionality of ApplyTemplate
-func TestApplyTemplateNoMatch(t *testing.T) {
-	o := graphite.Options{
-		Separator: "_",
-		Templates: []string{"foo.bar measurement.measurement"},
-	}
-	p, err := graphite.NewParserWithOptions(o)
-	if err != nil {
-		t.Fatalf("unexpected error creating parser, got %v", err)
-	}
-
-	measurement, _, _, _ := p.ApplyTemplate("current.users")
-	if measurement != "current.users" {
-		t.Errorf("Parser.ApplyTemplate unexpected result. got %s, exp %s",
-			measurement, "current.users")
-	}
-}
-
-// Test that most specific template is chosen
-func TestApplyTemplateSpecific(t *testing.T) {
-	o := graphite.Options{
-		Separator: "_",
-		Templates: []string{
-			"current.* measurement.measurement",
-			"current.*.* measurement.measurement.service",
-		},
-	}
-	p, err := graphite.NewParserWithOptions(o)
-	if err != nil {
-		t.Fatalf("unexpected error creating parser, got %v", err)
-	}
-
-	measurement, tags, _, _ := p.ApplyTemplate("current.users.facebook")
-	if measurement != "current_users" {
-		t.Errorf("Parser.ApplyTemplate unexpected result. got %s, exp %s",
-			measurement, "current_users")
-	}
-	service, ok := tags["service"]
-	if !ok {
-		t.Error("Expected for template to apply a 'service' tag, but not found")
-	}
-	if service != "facebook" {
-		t.Errorf("Expected service='facebook' tag, got service='%s'", service)
-	}
-}
-
-func TestApplyTemplateTags(t *testing.T) {
-	o := graphite.Options{
-		Separator: "_",
-		Templates: []string{"current.* measurement.measurement region=us-west"},
-	}
-	p, err := graphite.NewParserWithOptions(o)
-	if err != nil {
-		t.Fatalf("unexpected error creating parser, got %v", err)
-	}
-
-	measurement, tags, _, _ := p.ApplyTemplate("current.users")
-	if measurement != "current_users" {
-		t.Errorf("Parser.ApplyTemplate unexpected result. got %s, exp %s",
-			measurement, "current_users")
-	}
-
-	region, ok := tags["region"]
-	if !ok {
-		t.Error("Expected for template to apply a 'region' tag, but not found")
-	}
-	if region != "us-west" {
-		t.Errorf("Expected region='us-west' tag, got region='%s'", region)
-	}
-}
-
-func TestApplyTemplateField(t *testing.T) {
-	o := graphite.Options{
-		Separator: "_",
-		Templates: []string{"current.* measurement.measurement.field"},
-	}
-	p, err := graphite.NewParserWithOptions(o)
-	if err != nil {
-		t.Fatalf("unexpected error creating parser, got %v", err)
-	}
-
-	measurement, _, field, err := p.ApplyTemplate("current.users.logged_in")
-
-	if measurement != "current_users" {
-		t.Errorf("Parser.ApplyTemplate unexpected result. got %s, exp %s",
-			measurement, "current_users")
-	}
-
-	if field != "logged_in" {
-		t.Errorf("Parser.ApplyTemplate unexpected result. got %s, exp %s",
-			field, "logged_in")
-	}
-}
-
-func TestApplyTemplateFieldError(t *testing.T) {
-	o := graphite.Options{
-		Separator: "_",
-		Templates: []string{"current.* measurement.field.field"},
-	}
-	p, err := graphite.NewParserWithOptions(o)
-	if err != nil {
-		t.Fatalf("unexpected error creating parser, got %v", err)
-	}
-
-	_, _, _, err = p.ApplyTemplate("current.users.logged_in")
-	if err == nil {
-		t.Errorf("Parser.ApplyTemplate unexpected result. got %s, exp %s", err,
-			"'field' can only be used once in each template: current.users.logged_in")
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/graphite/service.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/services/graphite/service.go
deleted file mode 100644
index a0d46bdf1..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/graphite/service.go
+++ /dev/null
@@ -1,383 +0,0 @@
-package graphite
-
-import (
-	"bufio"
-	"expvar"
-	"fmt"
-	"log"
-	"net"
-	"os"
-	"strings"
-	"sync"
-	"time"
-
-	"github.com/influxdb/influxdb"
-	"github.com/influxdb/influxdb/cluster"
-	"github.com/influxdb/influxdb/meta"
-	"github.com/influxdb/influxdb/monitor"
-	"github.com/influxdb/influxdb/tsdb"
-)
-
-const (
-	udpBufferSize     = 65536
-	leaderWaitTimeout = 30 * time.Second
-)
-
-// statistics gathered by the graphite package.
-const (
-	statPointsReceived      = "pointsRx"
-	statBytesReceived       = "bytesRx"
-	statPointsParseFail     = "pointsParseFail"
-	statPointsUnsupported   = "pointsUnsupportedFail"
-	statBatchesTrasmitted   = "batchesTx"
-	statPointsTransmitted   = "pointsTx"
-	statBatchesTransmitFail = "batchesTxFail"
-	statConnectionsActive   = "connsActive"
-	statConnectionsHandled  = "connsHandled"
-)
-
-type tcpConnection struct {
-	conn        net.Conn
-	connectTime time.Time
-}
-
-func (c *tcpConnection) Close() {
-	c.conn.Close()
-}
-
-type Service struct {
-	mu sync.Mutex
-
-	bindAddress      string
-	database         string
-	protocol         string
-	batchSize        int
-	batchPending     int
-	batchTimeout     time.Duration
-	consistencyLevel cluster.ConsistencyLevel
-	udpReadBuffer    int
-
-	batcher *tsdb.PointBatcher
-	parser  *Parser
-
-	logger           *log.Logger
-	statMap          *expvar.Map
-	tcpConnectionsMu sync.Mutex
-	tcpConnections   map[string]*tcpConnection
-
-	ln      net.Listener
-	addr    net.Addr
-	udpConn *net.UDPConn
-
-	wg   sync.WaitGroup
-	done chan struct{}
-
-	Monitor interface {
-		RegisterDiagnosticsClient(name string, client monitor.DiagsClient)
-		DeregisterDiagnosticsClient(name string)
-	}
-	PointsWriter interface {
-		WritePoints(p *cluster.WritePointsRequest) error
-	}
-	MetaStore interface {
-		WaitForLeader(d time.Duration) error
-		CreateDatabaseIfNotExists(name string) (*meta.DatabaseInfo, error)
-	}
-}
-
-// NewService returns an instance of the Graphite service.
-func NewService(c Config) (*Service, error) {
-	// Use defaults where necessary.
-	d := c.WithDefaults()
-
-	s := Service{
-		bindAddress:    d.BindAddress,
-		database:       d.Database,
-		protocol:       d.Protocol,
-		batchSize:      d.BatchSize,
-		batchPending:   d.BatchPending,
-		udpReadBuffer:  d.UDPReadBuffer,
-		batchTimeout:   time.Duration(d.BatchTimeout),
-		logger:         log.New(os.Stderr, "[graphite] ", log.LstdFlags),
-		tcpConnections: make(map[string]*tcpConnection),
-		done:           make(chan struct{}),
-	}
-
-	consistencyLevel, err := cluster.ParseConsistencyLevel(d.ConsistencyLevel)
-	if err != nil {
-		return nil, err
-	}
-	s.consistencyLevel = consistencyLevel
-
-	parser, err := NewParserWithOptions(Options{
-		Templates:   d.Templates,
-		DefaultTags: d.DefaultTags(),
-		Separator:   d.Separator})
-
-	if err != nil {
-		return nil, err
-	}
-	s.parser = parser
-
-	return &s, nil
-}
-
-// Open starts the Graphite input processing data.
-func (s *Service) Open() error {
-	s.mu.Lock()
-	defer s.mu.Unlock()
-
-	s.logger.Printf("Starting graphite service, batch size %d, batch timeout %s", s.batchSize, s.batchTimeout)
-
-	// Configure expvar monitoring. It's OK to do this even if the service fails to open and
-	// should be done before any data could arrive for the service.
-	key := strings.Join([]string{"graphite", s.protocol, s.bindAddress}, ":")
-	tags := map[string]string{"proto": s.protocol, "bind": s.bindAddress}
-	s.statMap = influxdb.NewStatistics(key, "graphite", tags)
-
-	// Register diagnostics if a Monitor service is available.
-	if s.Monitor != nil {
-		s.Monitor.RegisterDiagnosticsClient(key, s)
-	}
-
-	if err := s.MetaStore.WaitForLeader(leaderWaitTimeout); err != nil {
-		s.logger.Printf("Failed to detect a cluster leader: %s", err.Error())
-		return err
-	}
-
-	if _, err := s.MetaStore.CreateDatabaseIfNotExists(s.database); err != nil {
-		s.logger.Printf("Failed to ensure target database %s exists: %s", s.database, err.Error())
-		return err
-	}
-
-	s.batcher = tsdb.NewPointBatcher(s.batchSize, s.batchPending, s.batchTimeout)
-	s.batcher.Start()
-
-	// Start processing batches.
-	s.wg.Add(1)
-	go s.processBatches(s.batcher)
-
-	var err error
-	if strings.ToLower(s.protocol) == "tcp" {
-		s.addr, err = s.openTCPServer()
-	} else if strings.ToLower(s.protocol) == "udp" {
-		s.addr, err = s.openUDPServer()
-	} else {
-		return fmt.Errorf("unrecognized Graphite input protocol %s", s.protocol)
-	}
-	if err != nil {
-		return err
-	}
-
-	s.logger.Printf("Listening on %s: %s", strings.ToUpper(s.protocol), s.addr.String())
-	return nil
-}
-func (s *Service) closeAllConnections() {
-	s.tcpConnectionsMu.Lock()
-	defer s.tcpConnectionsMu.Unlock()
-	for _, c := range s.tcpConnections {
-		c.Close()
-	}
-}
-
-// Close stops all data processing on the Graphite input.
-func (s *Service) Close() error {
-	s.mu.Lock()
-	defer s.mu.Unlock()
-
-	s.closeAllConnections()
-
-	if s.ln != nil {
-		s.ln.Close()
-	}
-	if s.udpConn != nil {
-		s.udpConn.Close()
-	}
-
-	if s.batcher != nil {
-		s.batcher.Stop()
-	}
-	close(s.done)
-	s.wg.Wait()
-	s.done = nil
-
-	return nil
-}
-
-// SetLogger sets the internal logger to the logger passed in.
-func (s *Service) SetLogger(l *log.Logger) {
-	s.logger = l
-}
-
-func (s *Service) Addr() net.Addr {
-	return s.addr
-}
-
-// openTCPServer opens the Graphite input in TCP mode and starts processing data.
-func (s *Service) openTCPServer() (net.Addr, error) {
-	ln, err := net.Listen("tcp", s.bindAddress)
-	if err != nil {
-		return nil, err
-	}
-	s.ln = ln
-
-	s.wg.Add(1)
-	go func() {
-		defer s.wg.Done()
-		for {
-			conn, err := s.ln.Accept()
-			if opErr, ok := err.(*net.OpError); ok && !opErr.Temporary() {
-				s.logger.Println("graphite TCP listener closed")
-				return
-			}
-			if err != nil {
-				s.logger.Println("error accepting TCP connection", err.Error())
-				continue
-			}
-
-			s.wg.Add(1)
-			go s.handleTCPConnection(conn)
-		}
-	}()
-	return ln.Addr(), nil
-}
-
-// handleTCPConnection services an individual TCP connection for the Graphite input.
-func (s *Service) handleTCPConnection(conn net.Conn) {
-	defer s.wg.Done()
-	defer conn.Close()
-	defer s.statMap.Add(statConnectionsActive, -1)
-	defer s.untrackConnection(conn)
-	s.statMap.Add(statConnectionsActive, 1)
-	s.statMap.Add(statConnectionsHandled, 1)
-	s.trackConnection(conn)
-
-	reader := bufio.NewReader(conn)
-
-	for {
-		// Read up to the next newline.
-		buf, err := reader.ReadBytes('\n')
-		if err != nil {
-			return
-		}
-
-		// Trim the buffer, even though there should be no padding
-		line := strings.TrimSpace(string(buf))
-
-		s.statMap.Add(statPointsReceived, 1)
-		s.statMap.Add(statBytesReceived, int64(len(buf)))
-		s.handleLine(line)
-	}
-}
-
-func (s *Service) trackConnection(c net.Conn) {
-	s.tcpConnectionsMu.Lock()
-	defer s.tcpConnectionsMu.Unlock()
-	s.tcpConnections[c.RemoteAddr().String()] = &tcpConnection{
-		conn:        c,
-		connectTime: time.Now().UTC(),
-	}
-}
-func (s *Service) untrackConnection(c net.Conn) {
-	s.tcpConnectionsMu.Lock()
-	defer s.tcpConnectionsMu.Unlock()
-	delete(s.tcpConnections, c.RemoteAddr().String())
-}
-
-// openUDPServer opens the Graphite input in UDP mode and starts processing incoming data.
-func (s *Service) openUDPServer() (net.Addr, error) {
-	addr, err := net.ResolveUDPAddr("udp", s.bindAddress)
-	if err != nil {
-		return nil, err
-	}
-
-	s.udpConn, err = net.ListenUDP("udp", addr)
-	if err != nil {
-		return nil, err
-	}
-
-	if s.udpReadBuffer != 0 {
-		err = s.udpConn.SetReadBuffer(s.udpReadBuffer)
-		if err != nil {
-			return nil, fmt.Errorf("unable to set UDP read buffer to %d: %s",
-				s.udpReadBuffer, err)
-		}
-	}
-
-	buf := make([]byte, udpBufferSize)
-	s.wg.Add(1)
-	go func() {
-		defer s.wg.Done()
-		for {
-			n, _, err := s.udpConn.ReadFromUDP(buf)
-			if err != nil {
-				s.udpConn.Close()
-				return
-			}
-
-			lines := strings.Split(string(buf[:n]), "\n")
-			for _, line := range lines {
-				s.handleLine(line)
-			}
-			s.statMap.Add(statPointsReceived, int64(len(lines)))
-			s.statMap.Add(statBytesReceived, int64(n))
-		}
-	}()
-	return s.udpConn.LocalAddr(), nil
-}
-
-func (s *Service) handleLine(line string) {
-	if line == "" {
-		return
-	}
-
-	// Parse it.
-	point, err := s.parser.Parse(line)
-	if err != nil {
-		s.logger.Printf("unable to parse line: %s: %s", line, err)
-		s.statMap.Add(statPointsParseFail, 1)
-		return
-	}
-
-	s.batcher.In() <- point
-}
-
-// processBatches continually drains the given batcher and writes the batches to the database.
-func (s *Service) processBatches(batcher *tsdb.PointBatcher) {
-	defer s.wg.Done()
-	for {
-		select {
-		case batch := <-batcher.Out():
-			if err := s.PointsWriter.WritePoints(&cluster.WritePointsRequest{
-				Database:         s.database,
-				RetentionPolicy:  "",
-				ConsistencyLevel: s.consistencyLevel,
-				Points:           batch,
-			}); err == nil {
-				s.statMap.Add(statBatchesTrasmitted, 1)
-				s.statMap.Add(statPointsTransmitted, int64(len(batch)))
-			} else {
-				s.logger.Printf("failed to write point batch to database %q: %s", s.database, err)
-				s.statMap.Add(statBatchesTransmitFail, 1)
-			}
-
-		case <-s.done:
-			return
-		}
-	}
-}
-
-func (s *Service) Diagnostics() (*monitor.Diagnostic, error) {
-	s.tcpConnectionsMu.Lock()
-	defer s.tcpConnectionsMu.Unlock()
-
-	d := &monitor.Diagnostic{
-		Columns: []string{"local", "remote", "connect time"},
-		Rows:    make([][]interface{}, 0, len(s.tcpConnections)),
-	}
-	for _, v := range s.tcpConnections {
-		_ = v
-		d.Rows = append(d.Rows, []interface{}{v.conn.LocalAddr().String(), v.conn.RemoteAddr().String(), v.connectTime})
-	}
-	return d, nil
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/graphite/service_test.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/services/graphite/service_test.go
deleted file mode 100644
index 7415f6cbf..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/graphite/service_test.go
+++ /dev/null
@@ -1,184 +0,0 @@
-package graphite_test
-
-import (
-	"fmt"
-	"net"
-	"sync"
-	"testing"
-	"time"
-
-	"github.com/influxdb/influxdb/cluster"
-	"github.com/influxdb/influxdb/meta"
-	"github.com/influxdb/influxdb/models"
-	"github.com/influxdb/influxdb/services/graphite"
-	"github.com/influxdb/influxdb/toml"
-)
-
-func Test_ServerGraphiteTCP(t *testing.T) {
-	t.Parallel()
-
-	now := time.Now().UTC().Round(time.Second)
-
-	config := graphite.Config{}
-	config.Database = "graphitedb"
-	config.BatchSize = 0 // No batching.
-	config.BatchTimeout = toml.Duration(time.Second)
-	config.BindAddress = ":0"
-
-	service, err := graphite.NewService(config)
-	if err != nil {
-		t.Fatalf("failed to create Graphite service: %s", err.Error())
-	}
-
-	// Allow test to wait until points are written.
-	var wg sync.WaitGroup
-	wg.Add(1)
-
-	pointsWriter := PointsWriter{
-		WritePointsFn: func(req *cluster.WritePointsRequest) error {
-			defer wg.Done()
-
-			pt, _ := models.NewPoint(
-				"cpu",
-				map[string]string{},
-				map[string]interface{}{"value": 23.456},
-				time.Unix(now.Unix(), 0))
-
-			if req.Database != "graphitedb" {
-				t.Fatalf("unexpected database: %s", req.Database)
-			} else if req.RetentionPolicy != "" {
-				t.Fatalf("unexpected retention policy: %s", req.RetentionPolicy)
-			} else if req.Points[0].String() != pt.String() {
-			}
-			return nil
-		},
-	}
-	service.PointsWriter = &pointsWriter
-	dbCreator := DatabaseCreator{}
-	service.MetaStore = &dbCreator
-
-	if err := service.Open(); err != nil {
-		t.Fatalf("failed to open Graphite service: %s", err.Error())
-	}
-
-	if !dbCreator.Created {
-		t.Fatalf("failed to create target database")
-	}
-
-	// Connect to the graphite endpoint we just spun up
-	_, port, _ := net.SplitHostPort(service.Addr().String())
-	conn, err := net.Dial("tcp", "127.0.0.1:"+port)
-	if err != nil {
-		t.Fatal(err)
-	}
-	data := []byte(`cpu 23.456 `)
-	data = append(data, []byte(fmt.Sprintf("%d", now.Unix()))...)
-	data = append(data, '\n')
-	_, err = conn.Write(data)
-	conn.Close()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	wg.Wait()
-}
-
-func Test_ServerGraphiteUDP(t *testing.T) {
-	t.Parallel()
-
-	now := time.Now().UTC().Round(time.Second)
-
-	config := graphite.Config{}
-	config.Database = "graphitedb"
-	config.BatchSize = 0 // No batching.
-	config.BatchTimeout = toml.Duration(time.Second)
-	config.BindAddress = ":10000"
-	config.Protocol = "udp"
-
-	service, err := graphite.NewService(config)
-	if err != nil {
-		t.Fatalf("failed to create Graphite service: %s", err.Error())
-	}
-
-	// Allow test to wait until points are written.
-	var wg sync.WaitGroup
-	wg.Add(1)
-
-	pointsWriter := PointsWriter{
-		WritePointsFn: func(req *cluster.WritePointsRequest) error {
-			defer wg.Done()
-
-			pt, _ := models.NewPoint(
-				"cpu",
-				map[string]string{},
-				map[string]interface{}{"value": 23.456},
-				time.Unix(now.Unix(), 0))
-			if req.Database != "graphitedb" {
-				t.Fatalf("unexpected database: %s", req.Database)
-			} else if req.RetentionPolicy != "" {
-				t.Fatalf("unexpected retention policy: %s", req.RetentionPolicy)
-			} else if req.Points[0].String() != pt.String() {
-				t.Fatalf("unexpected points: %#v", req.Points[0].String())
-			}
-			return nil
-		},
-	}
-	service.PointsWriter = &pointsWriter
-	dbCreator := DatabaseCreator{}
-	service.MetaStore = &dbCreator
-
-	if err := service.Open(); err != nil {
-		t.Fatalf("failed to open Graphite service: %s", err.Error())
-	}
-
-	if !dbCreator.Created {
-		t.Fatalf("failed to create target database")
-	}
-
-	// Connect to the graphite endpoint we just spun up
-	_, port, _ := net.SplitHostPort(service.Addr().String())
-	conn, err := net.Dial("udp", "127.0.0.1:"+port)
-	if err != nil {
-		t.Fatal(err)
-	}
-	data := []byte(`cpu 23.456 `)
-	data = append(data, []byte(fmt.Sprintf("%d", now.Unix()))...)
-	data = append(data, '\n')
-	_, err = conn.Write(data)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	wg.Wait()
-	conn.Close()
-}
-
-// PointsWriter represents a mock impl of PointsWriter.
-type PointsWriter struct {
-	WritePointsFn func(*cluster.WritePointsRequest) error
-}
-
-func (w *PointsWriter) WritePoints(p *cluster.WritePointsRequest) error {
-	return w.WritePointsFn(p)
-}
-
-type DatabaseCreator struct {
-	Created bool
-}
-
-func (d *DatabaseCreator) CreateDatabaseIfNotExists(name string) (*meta.DatabaseInfo, error) {
-	d.Created = true
-	return nil, nil
-}
-
-func (d *DatabaseCreator) WaitForLeader(t time.Duration) error {
-	return nil
-}
-
-// Test Helpers
-func errstr(err error) string {
-	if err != nil {
-		return err.Error()
-	}
-	return ""
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/hh/config.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/services/hh/config.go
deleted file mode 100644
index 43725e38b..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/hh/config.go
+++ /dev/null
@@ -1,58 +0,0 @@
-package hh
-
-import (
-	"time"
-
-	"github.com/influxdb/influxdb/toml"
-)
-
-const (
-	// DefaultMaxSize is the default maximum size of all hinted handoff queues in bytes.
-	DefaultMaxSize = 1024 * 1024 * 1024
-
-	// DefaultMaxAge is the default maximum amount of time that a hinted handoff write
-	// can stay in the queue.  After this time, the write will be purged.
-	DefaultMaxAge = 7 * 24 * time.Hour
-
-	// DefaultRetryRateLimit is the default rate that hinted handoffs will be retried.
-	// The rate is in bytes per second and applies across all nodes when retried.   A
-	// value of 0 disables the rate limit.
-	DefaultRetryRateLimit = 0
-
-	// DefaultRetryInterval is the default amount of time the system waits before
-	// attempting to flush hinted handoff queues. With each failure of a hinted
-	// handoff write, this retry interval increases exponentially until it reaches
-	// the maximum
-	DefaultRetryInterval = time.Second
-
-	// DefaultRetryMaxInterval is the maximum the hinted handoff retry interval
-	// will ever be.
-	DefaultRetryMaxInterval = time.Minute
-
-	// DefaultPurgeInterval is the amount of time the system waits before attempting
-	// to purge hinted handoff data due to age or inactive nodes.
-	DefaultPurgeInterval = time.Hour
-)
-
-type Config struct {
-	Enabled          bool          `toml:"enabled"`
-	Dir              string        `toml:"dir"`
-	MaxSize          int64         `toml:"max-size"`
-	MaxAge           toml.Duration `toml:"max-age"`
-	RetryRateLimit   int64         `toml:"retry-rate-limit"`
-	RetryInterval    toml.Duration `toml:"retry-interval"`
-	RetryMaxInterval toml.Duration `toml:"retry-max-interval"`
-	PurgeInterval    toml.Duration `toml:"purge-interval"`
-}
-
-func NewConfig() Config {
-	return Config{
-		Enabled:          false,
-		MaxSize:          DefaultMaxSize,
-		MaxAge:           toml.Duration(DefaultMaxAge),
-		RetryRateLimit:   DefaultRetryRateLimit,
-		RetryInterval:    toml.Duration(DefaultRetryInterval),
-		RetryMaxInterval: toml.Duration(DefaultRetryMaxInterval),
-		PurgeInterval:    toml.Duration(DefaultPurgeInterval),
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/hh/config_test.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/services/hh/config_test.go
deleted file mode 100644
index f9fbfe172..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/hh/config_test.go
+++ /dev/null
@@ -1,73 +0,0 @@
-package hh_test
-
-import (
-	"testing"
-	"time"
-
-	"github.com/BurntSushi/toml"
-	"github.com/influxdb/influxdb/services/hh"
-)
-
-func TestConfigParse(t *testing.T) {
-	// Parse configuration.
-	var c hh.Config
-	if _, err := toml.Decode(`
-enabled = false
-retry-interval = "10m"
-retry-max-interval = "100m"
-max-size=2048
-max-age="20m"
-retry-rate-limit=1000
-purge-interval = "1h"
-`, &c); err != nil {
-		t.Fatal(err)
-	}
-
-	// Validate configuration.
-	if exp := true; c.Enabled == true {
-		t.Fatalf("unexpected enabled: got %v, exp %v", c.Enabled, exp)
-	}
-
-	if exp := 10 * time.Minute; c.RetryInterval.String() != exp.String() {
-		t.Fatalf("unexpected retry interval: got %v, exp %v", c.RetryInterval, exp)
-	}
-
-	if exp := 100 * time.Minute; c.RetryMaxInterval.String() != exp.String() {
-		t.Fatalf("unexpected retry max interval: got %v, exp %v", c.RetryMaxInterval, exp)
-	}
-
-	if exp := 20 * time.Minute; c.MaxAge.String() != exp.String() {
-		t.Fatalf("unexpected max age: got %v, exp %v", c.MaxAge, exp)
-	}
-
-	if exp := int64(2048); c.MaxSize != exp {
-		t.Fatalf("unexpected retry interval: got %v, exp %v", c.MaxSize, exp)
-	}
-
-	if exp := int64(1000); c.RetryRateLimit != exp {
-		t.Fatalf("unexpected retry rate limit: got %v, exp %v", c.RetryRateLimit, exp)
-	}
-
-	if exp := time.Hour; c.PurgeInterval.String() != exp.String() {
-		t.Fatalf("unexpected purge interval: got %v, exp %v", c.PurgeInterval, exp)
-	}
-
-}
-
-func TestDefaultDisabled(t *testing.T) {
-	// Parse empty configuration.
-	var c hh.Config
-	if _, err := toml.Decode(``, &c); err != nil {
-		t.Fatal(err)
-	}
-
-	if exp := false; c.Enabled == true {
-		t.Fatalf("unexpected default Enabled value: got %v, exp %v", c.Enabled, exp)
-	}
-
-	// Default configuration.
-	c = hh.NewConfig()
-	if exp := false; c.Enabled == true {
-		t.Fatalf("unexpected default enabled value: got %v, exp %v", c.Enabled, exp)
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/hh/doc.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/services/hh/doc.go
deleted file mode 100644
index eeedacbad..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/hh/doc.go
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
-Package hh implements a hinted handoff for writes
-
-*/
-package hh
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/hh/limiter.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/services/hh/limiter.go
deleted file mode 100644
index b2a69f90d..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/hh/limiter.go
+++ /dev/null
@@ -1,61 +0,0 @@
-package hh
-
-import "time"
-
-type limiter struct {
-	count int64
-	limit int64
-	start time.Time
-	delay float64
-}
-
-// NewRateLimiter returns a new limiter configured to restrict a process to the limit per second.
-// limit is the maximum amount that can be used per second.  The limit should be > 0.  A limit
-// <= 0, will not limit the processes.
-func NewRateLimiter(limit int64) *limiter {
-	return &limiter{
-		start: time.Now(),
-		limit: limit,
-		delay: 0.5,
-	}
-}
-
-// Update updates the amount used
-func (t *limiter) Update(count int) {
-	t.count += int64(count)
-}
-
-// Delay returns the amount of time, up to 1 second, that caller should wait
-// to maintain the configured rate
-func (t *limiter) Delay() time.Duration {
-	if t.limit > 0 {
-
-		delta := time.Now().Sub(t.start).Seconds()
-		rate := int64(float64(t.count) / delta)
-
-		// Determine how far off from the max rate we are
-		delayAdj := float64((t.limit - rate)) / float64(t.limit)
-
-		// Don't adjust by more than 1 second at a time
-		delayAdj = t.clamp(delayAdj, -1, 1)
-
-		t.delay -= delayAdj
-		if t.delay < 0 {
-			t.delay = 0
-		}
-
-		return time.Duration(t.delay) * time.Second
-	}
-	return time.Duration(0)
-}
-
-func (t *limiter) clamp(value, min, max float64) float64 {
-	if value < min {
-		return min
-	}
-
-	if value > max {
-		return max
-	}
-	return value
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/hh/limiter_test.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/services/hh/limiter_test.go
deleted file mode 100644
index 5edb6e0bb..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/hh/limiter_test.go
+++ /dev/null
@@ -1,47 +0,0 @@
-package hh
-
-import (
-	"testing"
-	"time"
-)
-
-func TestLimiter(t *testing.T) {
-	l := NewRateLimiter(0)
-	l.Update(500)
-	if l.Delay().Nanoseconds() != 0 {
-		t.Errorf("limiter with no limit mismatch: got %v, exp 0", l.Delay())
-	}
-}
-
-func TestLimiterWithinLimit(t *testing.T) {
-	if testing.Short() {
-		t.Skip("Shipping TestLimiterWithinLimit")
-	}
-
-	l := NewRateLimiter(1000)
-	for i := 0; i < 100; i++ {
-		// 50 ever 100ms = 500/s which should be within the rate
-		l.Update(50)
-		l.Delay()
-		time.Sleep(100 * time.Millisecond)
-	}
-
-	// Should not have any delay
-	delay := l.Delay().Seconds()
-	if exp := int(0); int(delay) != exp {
-		t.Errorf("limiter rate mismatch: got %v, exp %v", int(delay), exp)
-	}
-
-}
-
-func TestLimiterExceeded(t *testing.T) {
-	l := NewRateLimiter(1000)
-	for i := 0; i < 10; i++ {
-		l.Update(200)
-		l.Delay()
-	}
-	delay := l.Delay().Seconds()
-	if int(delay) == 0 {
-		t.Errorf("limiter rate mismatch. expected non-zero delay")
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/hh/node_processor.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/services/hh/node_processor.go
deleted file mode 100644
index f2315efcf..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/hh/node_processor.go
+++ /dev/null
@@ -1,293 +0,0 @@
-package hh
-
-import (
-	"encoding/binary"
-	"expvar"
-	"fmt"
-	"io"
-	"log"
-	"os"
-	"strings"
-	"sync"
-	"time"
-
-	"github.com/influxdb/influxdb"
-	"github.com/influxdb/influxdb/models"
-)
-
-// NodeProcessor encapsulates a queue of hinted-handoff data for a node, and the
-// transmission of the data to the node.
-type NodeProcessor struct {
-	PurgeInterval    time.Duration // Interval between periodic purge checks
-	RetryInterval    time.Duration // Interval between periodic write-to-node attempts.
-	RetryMaxInterval time.Duration // Max interval between periodic write-to-node attempts.
-	MaxSize          int64         // Maximum size an underlying queue can get.
-	MaxAge           time.Duration // Maximum age queue data can get before purging.
-	RetryRateLimit   int64         // Limits the rate data is sent to node.
-	nodeID           uint64
-	dir              string
-
-	mu   sync.RWMutex
-	wg   sync.WaitGroup
-	done chan struct{}
-
-	queue  *queue
-	meta   metaStore
-	writer shardWriter
-
-	statMap *expvar.Map
-	Logger  *log.Logger
-}
-
-// NewNodeProcessor returns a new NodeProcessor for the given node, using dir for
-// the hinted-handoff data.
-func NewNodeProcessor(nodeID uint64, dir string, w shardWriter, m metaStore) *NodeProcessor {
-	key := strings.Join([]string{"hh_processor", dir}, ":")
-	tags := map[string]string{"node": fmt.Sprintf("%d", nodeID), "path": dir}
-
-	return &NodeProcessor{
-		PurgeInterval:    DefaultPurgeInterval,
-		RetryInterval:    DefaultRetryInterval,
-		RetryMaxInterval: DefaultRetryMaxInterval,
-		MaxSize:          DefaultMaxSize,
-		MaxAge:           DefaultMaxAge,
-		nodeID:           nodeID,
-		dir:              dir,
-		writer:           w,
-		meta:             m,
-		statMap:          influxdb.NewStatistics(key, "hh_processor", tags),
-		Logger:           log.New(os.Stderr, "[handoff] ", log.LstdFlags),
-	}
-}
-
-// Open opens the NodeProcessor. It will read and write data present in dir, and
-// start transmitting data to the node. A NodeProcessor must be opened before it
-// can accept hinted data.
-func (n *NodeProcessor) Open() error {
-	n.mu.Lock()
-	defer n.mu.Unlock()
-
-	if n.done != nil {
-		// Already open.
-		return nil
-	}
-	n.done = make(chan struct{})
-
-	// Create the queue directory if it doesn't already exist.
-	if err := os.MkdirAll(n.dir, 0700); err != nil {
-		return fmt.Errorf("mkdir all: %s", err)
-	}
-
-	// Create the queue of hinted-handoff data.
-	queue, err := newQueue(n.dir, n.MaxSize)
-	if err != nil {
-		return err
-	}
-	if err := queue.Open(); err != nil {
-		return err
-	}
-	n.queue = queue
-
-	n.wg.Add(1)
-	go n.run()
-
-	return nil
-}
-
-// Close closes the NodeProcessor, terminating all data tranmission to the node.
-// When closed it will not accept hinted-handoff data.
-func (n *NodeProcessor) Close() error {
-	n.mu.Lock()
-	defer n.mu.Unlock()
-
-	if n.done == nil {
-		// Already closed.
-		return nil
-	}
-
-	close(n.done)
-	n.wg.Wait()
-	n.done = nil
-
-	return n.queue.Close()
-}
-
-// Purge deletes all hinted-handoff data under management by a NodeProcessor.
-// The NodeProcessor should be in the closed state before calling this function.
-func (n *NodeProcessor) Purge() error {
-	n.mu.Lock()
-	defer n.mu.Unlock()
-
-	if n.done != nil {
-		return fmt.Errorf("node processor is open")
-	}
-
-	return os.RemoveAll(n.dir)
-}
-
-// WriteShard writes hinted-handoff data for the given shard and node. Since it may manipulate
-// hinted-handoff queues, and be called concurrently, it takes a lock during queue access.
-func (n *NodeProcessor) WriteShard(shardID uint64, points []models.Point) error {
-	n.mu.RLock()
-	defer n.mu.RUnlock()
-
-	if n.done == nil {
-		return fmt.Errorf("node processor is closed")
-	}
-
-	n.statMap.Add(writeShardReq, 1)
-	n.statMap.Add(writeShardReqPoints, int64(len(points)))
-
-	b := marshalWrite(shardID, points)
-	return n.queue.Append(b)
-}
-
-// LastModified returns the time the NodeProcessor last receieved hinted-handoff data.
-func (n *NodeProcessor) LastModified() (time.Time, error) {
-	t, err := n.queue.LastModified()
-	if err != nil {
-		return time.Time{}, err
-	}
-	return t.UTC(), nil
-}
-
-// run attempts to send any existing hinted handoff data to the target node. It also purges
-// any hinted handoff data older than the configured time.
-func (n *NodeProcessor) run() {
-	defer n.wg.Done()
-
-	currInterval := time.Duration(n.RetryInterval)
-	if currInterval > time.Duration(n.RetryMaxInterval) {
-		currInterval = time.Duration(n.RetryMaxInterval)
-	}
-
-	for {
-		select {
-		case <-n.done:
-			return
-
-		case <-time.After(n.PurgeInterval):
-			if err := n.queue.PurgeOlderThan(time.Now().Add(-n.MaxAge)); err != nil {
-				n.Logger.Printf("failed to purge for node %d: %s", n.nodeID, err.Error())
-			}
-
-		case <-time.After(currInterval):
-			limiter := NewRateLimiter(n.RetryRateLimit)
-			for {
-				c, err := n.SendWrite()
-				if err != nil {
-					if err == io.EOF {
-						// No more data, return to configured interval
-						currInterval = time.Duration(n.RetryInterval)
-					} else {
-						currInterval = currInterval * 2
-						if currInterval > time.Duration(n.RetryMaxInterval) {
-							currInterval = time.Duration(n.RetryMaxInterval)
-						}
-					}
-					break
-				}
-
-				// Success! Ensure backoff is cancelled.
-				currInterval = time.Duration(n.RetryInterval)
-
-				// Update how many bytes we've sent
-				limiter.Update(c)
-
-				// Block to maintain the throughput rate
-				time.Sleep(limiter.Delay())
-			}
-		}
-	}
-}
-
-// SendWrite attempts to sent the current block of hinted data to the target node. If successful,
-// it returns the number of bytes it sent and advances to the next block. Otherwise returns EOF
-// when there is no more data or the node is inactive.
-func (n *NodeProcessor) SendWrite() (int, error) {
-	n.mu.RLock()
-	defer n.mu.RUnlock()
-
-	active, err := n.Active()
-	if err != nil {
-		return 0, err
-	}
-	if !active {
-		return 0, io.EOF
-	}
-
-	// Get the current block from the queue
-	buf, err := n.queue.Current()
-	if err != nil {
-		return 0, err
-	}
-
-	// unmarshal the byte slice back to shard ID and points
-	shardID, points, err := unmarshalWrite(buf)
-	if err != nil {
-		n.Logger.Printf("unmarshal write failed: %v", err)
-		// Try to skip it.
-		if err := n.queue.Advance(); err != nil {
-			n.Logger.Printf("failed to advance queue for node %d: %s", n.nodeID, err.Error())
-		}
-		return 0, err
-	}
-
-	if err := n.writer.WriteShard(shardID, n.nodeID, points); err != nil {
-		n.statMap.Add(writeNodeReqFail, 1)
-		return 0, err
-	}
-	n.statMap.Add(writeNodeReq, 1)
-	n.statMap.Add(writeNodeReqPoints, int64(len(points)))
-
-	if err := n.queue.Advance(); err != nil {
-		n.Logger.Printf("failed to advance queue for node %d: %s", n.nodeID, err.Error())
-	}
-
-	return len(buf), nil
-}
-
-func (n *NodeProcessor) Head() string {
-	qp, err := n.queue.Position()
-	if err != nil {
-		return ""
-	}
-	return qp.head
-}
-
-func (n *NodeProcessor) Tail() string {
-	qp, err := n.queue.Position()
-	if err != nil {
-		return ""
-	}
-	return qp.tail
-}
-
-// Active returns whether this node processor is for a currently active node.
-func (n *NodeProcessor) Active() (bool, error) {
-	nio, err := n.meta.Node(n.nodeID)
-	if err != nil {
-		n.Logger.Printf("failed to determine if node %d is active: %s", n.nodeID, err.Error())
-		return false, err
-	}
-	return nio != nil, nil
-}
-
-func marshalWrite(shardID uint64, points []models.Point) []byte {
-	b := make([]byte, 8)
-	binary.BigEndian.PutUint64(b, shardID)
-	for _, p := range points {
-		b = append(b, []byte(p.String())...)
-		b = append(b, '\n')
-	}
-	return b
-}
-
-func unmarshalWrite(b []byte) (uint64, []models.Point, error) {
-	if len(b) < 8 {
-		return 0, nil, fmt.Errorf("too short: len = %d", len(b))
-	}
-	ownerID := binary.BigEndian.Uint64(b[:8])
-	points, err := models.ParsePoints(b[8:])
-	return ownerID, points, err
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/hh/node_processor_test.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/services/hh/node_processor_test.go
deleted file mode 100644
index 404765e14..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/hh/node_processor_test.go
+++ /dev/null
@@ -1,155 +0,0 @@
-package hh
-
-import (
-	"io"
-	"io/ioutil"
-	"os"
-	"testing"
-	"time"
-
-	"github.com/influxdb/influxdb/meta"
-	"github.com/influxdb/influxdb/models"
-)
-
-type fakeShardWriter struct {
-	ShardWriteFn func(shardID, nodeID uint64, points []models.Point) error
-}
-
-func (f *fakeShardWriter) WriteShard(shardID, nodeID uint64, points []models.Point) error {
-	return f.ShardWriteFn(shardID, nodeID, points)
-}
-
-type fakeMetaStore struct {
-	NodeFn func(nodeID uint64) (*meta.NodeInfo, error)
-}
-
-func (f *fakeMetaStore) Node(nodeID uint64) (*meta.NodeInfo, error) {
-	return f.NodeFn(nodeID)
-}
-
-func TestNodeProcessorSendBlock(t *testing.T) {
-	dir, err := ioutil.TempDir("", "node_processor_test")
-	if err != nil {
-		t.Fatalf("failed to create temp dir: %v", err)
-	}
-
-	// expected data to be queue and sent to the shardWriter
-	var expShardID, expNodeID, count = uint64(100), uint64(200), 0
-	pt := models.MustNewPoint("cpu", models.Tags{"foo": "bar"}, models.Fields{"value": 1.0}, time.Unix(0, 0))
-
-	sh := &fakeShardWriter{
-		ShardWriteFn: func(shardID, nodeID uint64, points []models.Point) error {
-			count += 1
-			if shardID != expShardID {
-				t.Errorf("SendWrite() shardID mismatch: got %v, exp %v", shardID, expShardID)
-			}
-			if nodeID != expNodeID {
-				t.Errorf("SendWrite() nodeID mismatch: got %v, exp %v", nodeID, expNodeID)
-			}
-
-			if exp := 1; len(points) != exp {
-				t.Fatalf("SendWrite() points mismatch: got %v, exp %v", len(points), exp)
-			}
-
-			if points[0].String() != pt.String() {
-				t.Fatalf("SendWrite() points mismatch:\n got %v\n exp %v", points[0].String(), pt.String())
-			}
-
-			return nil
-		},
-	}
-	metastore := &fakeMetaStore{
-		NodeFn: func(nodeID uint64) (*meta.NodeInfo, error) {
-			if nodeID == expNodeID {
-				return &meta.NodeInfo{}, nil
-			}
-			return nil, nil
-		},
-	}
-
-	n := NewNodeProcessor(expNodeID, dir, sh, metastore)
-	if n == nil {
-		t.Fatalf("Failed to create node processor: %v", err)
-	}
-
-	if err := n.Open(); err != nil {
-		t.Fatalf("Failed to open node processor: %v", err)
-	}
-
-	// Check the active state.
-	active, err := n.Active()
-	if err != nil {
-		t.Fatalf("Failed to check node processor state: %v", err)
-	}
-	if !active {
-		t.Fatalf("Node processor state is unexpected value of: %v", active)
-	}
-
-	// This should queue a write for the active node.
-	if err := n.WriteShard(expShardID, []models.Point{pt}); err != nil {
-		t.Fatalf("SendWrite() failed to write points: %v", err)
-	}
-
-	// This should send the write to the shard writer
-	if _, err := n.SendWrite(); err != nil {
-		t.Fatalf("SendWrite() failed to write points: %v", err)
-	}
-
-	if exp := 1; count != exp {
-		t.Fatalf("SendWrite() write count mismatch: got %v, exp %v", count, exp)
-	}
-
-	// All data should have been handled so no writes should be sent again
-	if _, err := n.SendWrite(); err != nil && err != io.EOF {
-		t.Fatalf("SendWrite() failed to write points: %v", err)
-	}
-
-	// Count should stay the same
-	if exp := 1; count != exp {
-		t.Fatalf("SendWrite() write count mismatch: got %v, exp %v", count, exp)
-	}
-
-	// Make the node inactive.
-	sh.ShardWriteFn = func(shardID, nodeID uint64, points []models.Point) error {
-		t.Fatalf("write sent to inactive node")
-		return nil
-	}
-	metastore.NodeFn = func(nodeID uint64) (*meta.NodeInfo, error) {
-		return nil, nil
-	}
-
-	// Check the active state.
-	active, err = n.Active()
-	if err != nil {
-		t.Fatalf("Failed to check node processor state: %v", err)
-	}
-	if active {
-		t.Fatalf("Node processor state is unexpected value of: %v", active)
-	}
-
-	// This should queue a write for the node.
-	if err := n.WriteShard(expShardID, []models.Point{pt}); err != nil {
-		t.Fatalf("SendWrite() failed to write points: %v", err)
-	}
-
-	// This should not send the write to the shard writer since the node is inactive.
-	if _, err := n.SendWrite(); err != nil && err != io.EOF {
-		t.Fatalf("SendWrite() failed to write points: %v", err)
-	}
-
-	if exp := 1; count != exp {
-		t.Fatalf("SendWrite() write count mismatch: got %v, exp %v", count, exp)
-	}
-
-	if err := n.Close(); err != nil {
-		t.Fatalf("Failed to close node processor: %v", err)
-	}
-
-	// Confirm that purging works ok.
-	if err := n.Purge(); err != nil {
-		t.Fatalf("Failed to purge node processor: %v", err)
-	}
-	if _, err := os.Stat(dir); !os.IsNotExist(err) {
-		t.Fatalf("Node processor directory still present after purge")
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/hh/queue.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/services/hh/queue.go
deleted file mode 100644
index 19c004fcc..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/hh/queue.go
+++ /dev/null
@@ -1,717 +0,0 @@
-package hh
-
-import (
-	"encoding/binary"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"strconv"
-	"sync"
-	"time"
-)
-
-var (
-	ErrNotOpen     = fmt.Errorf("queue not open")
-	ErrQueueFull   = fmt.Errorf("queue is full")
-	ErrSegmentFull = fmt.Errorf("segment is full")
-)
-
-const (
-	defaultSegmentSize = 10 * 1024 * 1024
-	footerSize         = 8
-)
-
-// queue is a bounded, disk-backed, append-only type that combines queue and
-// log semantics.  byte slices can be appended and read back in-order.
-// The queue maintains a pointer to the current head
-// byte slice and can re-read from the head until it has been advanced.
-//
-// Internally, the queue writes byte slices to multiple segment files so
-// that disk space can be reclaimed. When a segment file is larger than
-// the max segment size, a new file is created.   Segments are removed
-// after their head pointer has advanced past the last entry.  The first
-// segment is the head, and the last segment is the tail.  Reads are from
-// the head segment and writes tail segment.
-//
-// queues can have a max size configured such that when the size of all
-// segments on disk exceeds the size, write will fail.
-//
-// ┌─────┐
-// │Head │
-// ├─────┘
-// │
-// ▼
-// ┌─────────────────┐ ┌─────────────────┐┌─────────────────┐
-// │Segment 1 - 10MB │ │Segment 2 - 10MB ││Segment 3 - 10MB │
-// └─────────────────┘ └─────────────────┘└─────────────────┘
-//                                                          ▲
-//                                                          │
-//                                                          │
-//                                                     ┌─────┐
-//                                                     │Tail │
-//                                                     └─────┘
-type queue struct {
-	mu sync.RWMutex
-
-	// Directory to create segments
-	dir string
-
-	// The head and tail segments.  Reads are from the beginning of head,
-	// writes are appended to the tail.
-	head, tail *segment
-
-	// The maximum size in bytes of a segment file before a new one should be created
-	maxSegmentSize int64
-
-	// The maximum size allowed in bytes of all segments before writes will return
-	// an error
-	maxSize int64
-
-	// The segments that exist on disk
-	segments segments
-}
-type queuePos struct {
-	head string
-	tail string
-}
-
-type segments []*segment
-
-// newQueue create a queue that will store segments in dir and that will
-// consume more than maxSize on disk.
-func newQueue(dir string, maxSize int64) (*queue, error) {
-	return &queue{
-		dir:            dir,
-		maxSegmentSize: defaultSegmentSize,
-		maxSize:        maxSize,
-		segments:       segments{},
-	}, nil
-}
-
-// Open opens the queue for reading and writing
-func (l *queue) Open() error {
-	l.mu.Lock()
-	defer l.mu.Unlock()
-
-	segments, err := l.loadSegments()
-	if err != nil {
-		return err
-	}
-	l.segments = segments
-
-	if len(l.segments) == 0 {
-		_, err := l.addSegment()
-		if err != nil {
-			return err
-		}
-	}
-
-	l.head = l.segments[0]
-	l.tail = l.segments[len(l.segments)-1]
-
-	// If the head has been fully advanced and the segment size is modified,
-	// existing segments an get stuck and never allow clients to advance further.
-	// This advances the segment if the current head is already at the end.
-	_, err = l.head.current()
-	if err == io.EOF {
-		return l.trimHead()
-	}
-
-	return nil
-}
-
-// Close stops the queue for reading and writing
-func (l *queue) Close() error {
-	l.mu.Lock()
-	defer l.mu.Unlock()
-
-	for _, s := range l.segments {
-		if err := s.close(); err != nil {
-			return err
-		}
-	}
-	l.head = nil
-	l.tail = nil
-	l.segments = nil
-	return nil
-}
-
-// Remove removes all underlying file-based resources for the queue.
-// It is an error to call this on an open queue.
-func (l *queue) Remove() error {
-	l.mu.Lock()
-	defer l.mu.Unlock()
-
-	if l.head != nil || l.tail != nil || l.segments != nil {
-		return fmt.Errorf("queue is open")
-	}
-
-	return os.RemoveAll(l.dir)
-}
-
-// SetMaxSegmentSize updates the max segment size for new and existing
-// segments.
-func (l *queue) SetMaxSegmentSize(size int64) error {
-	l.mu.Lock()
-	defer l.mu.Unlock()
-
-	l.maxSegmentSize = size
-
-	for _, s := range l.segments {
-		s.SetMaxSegmentSize(size)
-	}
-
-	if l.tail.diskUsage() >= l.maxSegmentSize {
-		segment, err := l.addSegment()
-		if err != nil {
-			return err
-		}
-		l.tail = segment
-	}
-	return nil
-}
-
-func (l *queue) PurgeOlderThan(when time.Time) error {
-	l.mu.Lock()
-	defer l.mu.Unlock()
-
-	if len(l.segments) == 0 {
-		return nil
-	}
-
-	cutoff := when.Truncate(time.Second)
-	for {
-		mod, err := l.head.lastModified()
-		if err != nil {
-			return err
-		}
-
-		if mod.After(cutoff) || mod.Equal(cutoff) {
-			return nil
-		}
-
-		// If this is the last segment, first append a new one allowing
-		// trimming to proceed.
-		if len(l.segments) == 1 {
-			_, err := l.addSegment()
-			if err != nil {
-				return err
-			}
-		}
-
-		if err := l.trimHead(); err != nil {
-			return err
-		}
-	}
-}
-
-// LastModified returns the last time the queue was modified.
-func (l *queue) LastModified() (time.Time, error) {
-	l.mu.RLock()
-	defer l.mu.RUnlock()
-
-	if l.tail != nil {
-		return l.tail.lastModified()
-	}
-	return time.Time{}.UTC(), nil
-}
-
-func (l *queue) Position() (*queuePos, error) {
-	l.mu.RLock()
-	defer l.mu.RUnlock()
-
-	qp := &queuePos{}
-	if l.head != nil {
-		qp.head = fmt.Sprintf("%s:%d", l.head.path, l.head.pos)
-	}
-	if l.tail != nil {
-		qp.tail = fmt.Sprintf("%s:%d", l.tail.path, l.tail.filePos())
-	}
-	return qp, nil
-}
-
-// diskUsage returns the total size on disk used by the queue
-func (l *queue) diskUsage() int64 {
-	var size int64
-	for _, s := range l.segments {
-		size += s.diskUsage()
-	}
-	return size
-}
-
-// addSegment creates a new empty segment file
-func (l *queue) addSegment() (*segment, error) {
-	nextID, err := l.nextSegmentID()
-	if err != nil {
-		return nil, err
-	}
-
-	segment, err := newSegment(filepath.Join(l.dir, strconv.FormatUint(nextID, 10)), l.maxSegmentSize)
-	if err != nil {
-		return nil, err
-	}
-
-	l.segments = append(l.segments, segment)
-	return segment, nil
-}
-
-// loadSegments loads all segments on disk
-func (l *queue) loadSegments() (segments, error) {
-	segments := []*segment{}
-
-	files, err := ioutil.ReadDir(l.dir)
-	if err != nil {
-		return segments, err
-	}
-
-	for _, segment := range files {
-		// Segments should be files.  Skip anything that is not a dir.
-		if segment.IsDir() {
-			continue
-		}
-
-		// Segments file names are all numeric
-		_, err := strconv.ParseUint(segment.Name(), 10, 64)
-		if err != nil {
-			continue
-		}
-
-		segment, err := newSegment(filepath.Join(l.dir, segment.Name()), l.maxSegmentSize)
-		if err != nil {
-			return segments, err
-		}
-
-		segments = append(segments, segment)
-	}
-	return segments, nil
-}
-
-// nextSegmentID returns the next segment ID that is free
-func (l *queue) nextSegmentID() (uint64, error) {
-	segments, err := ioutil.ReadDir(l.dir)
-	if err != nil {
-		return 0, err
-	}
-
-	var maxID uint64
-	for _, segment := range segments {
-		// Segments should be files.  Skip anything that is not a dir.
-		if segment.IsDir() {
-			continue
-		}
-
-		// Segments file names are all numeric
-		segmentID, err := strconv.ParseUint(segment.Name(), 10, 64)
-		if err != nil {
-			continue
-		}
-
-		if segmentID > maxID {
-			maxID = segmentID
-		}
-	}
-
-	return maxID + 1, nil
-}
-
-// Append appends a byte slice to the end of the queue
-func (l *queue) Append(b []byte) error {
-	l.mu.Lock()
-	defer l.mu.Unlock()
-
-	if l.tail == nil {
-		return ErrNotOpen
-	}
-
-	if l.diskUsage()+int64(len(b)) > l.maxSize {
-		return ErrQueueFull
-	}
-
-	// Append the entry to the tail, if the segment is full,
-	// try to create new segment and retry the append
-	if err := l.tail.append(b); err == ErrSegmentFull {
-		segment, err := l.addSegment()
-		if err != nil {
-			return err
-		}
-		l.tail = segment
-		return l.tail.append(b)
-	}
-	return nil
-}
-
-// Current returns the current byte slice at the head of the queue
-func (l *queue) Current() ([]byte, error) {
-	if l.head == nil {
-		return nil, ErrNotOpen
-	}
-
-	return l.head.current()
-}
-
-// Advance moves the head point to the next byte slice in the queue
-func (l *queue) Advance() error {
-	l.mu.Lock()
-	defer l.mu.Unlock()
-	if l.head == nil {
-		return ErrNotOpen
-	}
-
-	err := l.head.advance()
-	if err == io.EOF {
-		if err := l.trimHead(); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (l *queue) trimHead() error {
-	if len(l.segments) > 1 {
-		l.segments = l.segments[1:]
-
-		if err := l.head.close(); err != nil {
-			return err
-		}
-		if err := os.Remove(l.head.path); err != nil {
-			return err
-		}
-		l.head = l.segments[0]
-	}
-	return nil
-}
-
-// Segment is a queue using a single file.  The structure of a segment is a series
-// lengths + block with a single footer point to the position in the segment of the
-// current head block.
-//
-// ┌──────────────────────────┐ ┌──────────────────────────┐ ┌────────────┐
-// │         Block 1          │ │         Block 2          │ │   Footer   │
-// └──────────────────────────┘ └──────────────────────────┘ └────────────┘
-// ┌────────────┐┌────────────┐ ┌────────────┐┌────────────┐ ┌────────────┐
-// │Block 1 Len ││Block 1 Body│ │Block 2 Len ││Block 2 Body│ │Head Offset │
-// │  8 bytes   ││  N bytes   │ │  8 bytes   ││  N bytes   │ │  8 bytes   │
-// └────────────┘└────────────┘ └────────────┘└────────────┘ └────────────┘
-//
-// The footer holds the pointer to the head entry at the end of the segment to allow writes
-// to seek to the end and write sequentially (vs having to seek back to the beginning of
-// the segment to update the head pointer).  Reads must seek to the end then back into the
-// segment offset stored in the footer.
-//
-// Segments store arbitrary byte slices and leave the serialization to the caller.  Segments
-// are created with a max size and will block writes when the segment is full.
-type segment struct {
-	mu sync.RWMutex
-
-	size int64
-	file *os.File
-	path string
-
-	pos         int64
-	currentSize int64
-	maxSize     int64
-}
-
-func newSegment(path string, maxSize int64) (*segment, error) {
-	f, err := os.OpenFile(path, os.O_CREATE|os.O_RDWR, 0600)
-	if err != nil {
-		return nil, err
-	}
-
-	stats, err := os.Stat(path)
-	if err != nil {
-		return nil, err
-	}
-
-	s := &segment{file: f, path: path, size: stats.Size(), maxSize: maxSize}
-
-	if err := s.open(); err != nil {
-		return nil, err
-	}
-
-	return s, nil
-}
-
-func (l *segment) open() error {
-	l.mu.Lock()
-	defer l.mu.Unlock()
-
-	// If it's a new segment then write the location of the current record in this segment
-	if l.size == 0 {
-		l.pos = 0
-		l.currentSize = 0
-
-		if err := l.writeUint64(uint64(l.pos)); err != nil {
-			return err
-		}
-
-		if err := l.file.Sync(); err != nil {
-			return err
-		}
-
-		l.size = footerSize
-
-		return nil
-	}
-
-	// Existing segment so read the current position and the size of the current block
-	if err := l.seekEnd(-footerSize); err != nil {
-		return err
-	}
-
-	pos, err := l.readUint64()
-	if err != nil {
-		return err
-	}
-	l.pos = int64(pos)
-
-	if err := l.seekToCurrent(); err != nil {
-		return err
-	}
-
-	// If we're at the end of the segment, don't read the current block size,
-	// it's 0.
-	if l.pos < l.size-footerSize {
-		currentSize, err := l.readUint64()
-		if err != nil {
-			return err
-		}
-		l.currentSize = int64(currentSize)
-	}
-
-	return nil
-}
-
-// append adds byte slice to the end of segment
-func (l *segment) append(b []byte) error {
-	l.mu.Lock()
-	defer l.mu.Unlock()
-
-	if l.file == nil {
-		return ErrNotOpen
-	}
-
-	if l.size+int64(len(b)) > l.maxSize {
-		return ErrSegmentFull
-	}
-
-	if err := l.seekEnd(-footerSize); err != nil {
-		return err
-	}
-
-	if err := l.writeUint64(uint64(len(b))); err != nil {
-		return err
-	}
-
-	if err := l.writeBytes(b); err != nil {
-		return err
-	}
-
-	if err := l.writeUint64(uint64(l.pos)); err != nil {
-		return err
-	}
-
-	if err := l.file.Sync(); err != nil {
-		return err
-	}
-
-	if l.currentSize == 0 {
-		l.currentSize = int64(len(b))
-	}
-
-	l.size += int64(len(b)) + 8 // uint64 for slice length
-
-	return nil
-}
-
-// current returns byte slice that the current segment points
-func (l *segment) current() ([]byte, error) {
-	l.mu.Lock()
-	defer l.mu.Unlock()
-
-	if int64(l.pos) == l.size-8 {
-		return nil, io.EOF
-	}
-
-	if err := l.seekToCurrent(); err != nil {
-		return nil, err
-	}
-
-	// read the record size
-	sz, err := l.readUint64()
-	if err != nil {
-		return nil, err
-	}
-	l.currentSize = int64(sz)
-
-	if int64(sz) > l.maxSize {
-		return nil, fmt.Errorf("record size out of range: max %d: got %d", l.maxSize, sz)
-	}
-
-	b := make([]byte, sz)
-	if err := l.readBytes(b); err != nil {
-		return nil, err
-	}
-
-	return b, nil
-}
-
-// advance advances the current value pointer
-func (l *segment) advance() error {
-	l.mu.Lock()
-	defer l.mu.Unlock()
-
-	if l.file == nil {
-		return ErrNotOpen
-	}
-
-	// If we're at the end of the file, can't advance
-	if int64(l.pos) == l.size-footerSize {
-		l.currentSize = 0
-		return io.EOF
-	}
-
-	if err := l.seekEnd(-footerSize); err != nil {
-		return err
-	}
-
-	pos := l.pos + l.currentSize + 8
-	if err := l.writeUint64(uint64(pos)); err != nil {
-		return err
-	}
-
-	if err := l.file.Sync(); err != nil {
-		return err
-	}
-	l.pos = pos
-
-	if err := l.seekToCurrent(); err != nil {
-		return err
-	}
-
-	sz, err := l.readUint64()
-	if err != nil {
-		return err
-	}
-	l.currentSize = int64(sz)
-
-	if int64(l.pos) == l.size-footerSize {
-		l.currentSize = 0
-		return io.EOF
-	}
-
-	return nil
-}
-
-func (l *segment) close() error {
-	l.mu.Lock()
-	defer l.mu.Unlock()
-	if err := l.file.Close(); err != nil {
-		return err
-	}
-	l.file = nil
-	return nil
-}
-
-func (l *segment) lastModified() (time.Time, error) {
-	l.mu.RLock()
-	defer l.mu.RUnlock()
-
-	stats, err := os.Stat(l.file.Name())
-	if err != nil {
-		return time.Time{}, err
-	}
-	return stats.ModTime().UTC(), nil
-}
-
-func (l *segment) diskUsage() int64 {
-	l.mu.RLock()
-	defer l.mu.RUnlock()
-	return l.size
-}
-
-func (l *segment) SetMaxSegmentSize(size int64) {
-	l.mu.Lock()
-	defer l.mu.Unlock()
-	l.maxSize = size
-}
-
-func (l *segment) seekToCurrent() error {
-	return l.seek(int64(l.pos))
-}
-
-func (l *segment) seek(pos int64) error {
-	n, err := l.file.Seek(pos, os.SEEK_SET)
-	if err != nil {
-		return err
-	}
-
-	if n != pos {
-		return fmt.Errorf("bad seek. exp %v, got %v", 0, n)
-	}
-
-	return nil
-}
-
-func (l *segment) seekEnd(pos int64) error {
-	_, err := l.file.Seek(pos, os.SEEK_END)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (l *segment) filePos() int64 {
-	n, _ := l.file.Seek(0, os.SEEK_CUR)
-	return n
-}
-
-func (l *segment) readUint64() (uint64, error) {
-	b := make([]byte, 8)
-	if err := l.readBytes(b); err != nil {
-		return 0, err
-	}
-	return btou64(b), nil
-}
-
-func (l *segment) writeUint64(sz uint64) error {
-	return l.writeBytes(u64tob(sz))
-}
-
-func (l *segment) writeBytes(b []byte) error {
-	n, err := l.file.Write(b)
-	if err != nil {
-		return err
-	}
-
-	if n != len(b) {
-		return fmt.Errorf("short write. got %d, exp %d", n, len(b))
-	}
-	return nil
-}
-
-func (l *segment) readBytes(b []byte) error {
-	n, err := l.file.Read(b)
-	if err != nil {
-		return err
-	}
-
-	if n != len(b) {
-		return fmt.Errorf("bad read. exp %v, got %v", 0, n)
-	}
-	return nil
-}
-
-func u64tob(v uint64) []byte {
-	b := make([]byte, 8)
-	binary.BigEndian.PutUint64(b, v)
-	return b
-}
-
-func btou64(b []byte) uint64 {
-	return binary.BigEndian.Uint64(b)
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/hh/queue_test.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/services/hh/queue_test.go
deleted file mode 100644
index fd9f5b14b..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/hh/queue_test.go
+++ /dev/null
@@ -1,327 +0,0 @@
-package hh
-
-import (
-	"fmt"
-	"io"
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"testing"
-	"time"
-)
-
-func BenchmarkQueueAppend(b *testing.B) {
-	dir, err := ioutil.TempDir("", "hh_queue")
-	if err != nil {
-		b.Fatalf("failed to create temp dir: %v", err)
-	}
-	defer os.RemoveAll(dir)
-
-	q, err := newQueue(dir, 1024*1024*1024)
-	if err != nil {
-		b.Fatalf("failed to create queue: %v", err)
-	}
-
-	if err := q.Open(); err != nil {
-		b.Fatalf("failed to open queue: %v", err)
-	}
-
-	for i := 0; i < b.N; i++ {
-		if err := q.Append([]byte(fmt.Sprintf("%d", i))); err != nil {
-			println(q.diskUsage())
-			b.Fatalf("Queue.Append failed: %v", err)
-		}
-	}
-}
-
-func TestQueueAppendOne(t *testing.T) {
-	dir, err := ioutil.TempDir("", "hh_queue")
-	if err != nil {
-		t.Fatalf("failed to create temp dir: %v", err)
-	}
-	defer os.RemoveAll(dir)
-
-	q, err := newQueue(dir, 1024)
-	if err != nil {
-		t.Fatalf("failed to create queue: %v", err)
-	}
-
-	if err := q.Open(); err != nil {
-		t.Fatalf("failed to open queue: %v", err)
-	}
-
-	if err := q.Append([]byte("test")); err != nil {
-		t.Fatalf("Queue.Append failed: %v", err)
-	}
-
-	exp := filepath.Join(dir, "1")
-	stats, err := os.Stat(exp)
-	if os.IsNotExist(err) {
-		t.Fatalf("Queue.Append file not exists. exp %v to exist", exp)
-	}
-
-	// 8 byte header ptr + 8 byte record len + record len
-	if exp := int64(8 + 8 + 4); stats.Size() != exp {
-		t.Fatalf("Queue.Append file size mismatch. got %v, exp %v", stats.Size(), exp)
-	}
-
-	cur, err := q.Current()
-	if err != nil {
-		t.Fatalf("Queue.Current failed: %v", err)
-	}
-
-	if exp := "test"; string(cur) != exp {
-		t.Errorf("Queue.Current mismatch: got %v, exp %v", string(cur), exp)
-	}
-}
-
-func TestQueueAppendMultiple(t *testing.T) {
-	dir, err := ioutil.TempDir("", "hh_queue")
-	if err != nil {
-		t.Fatalf("failed to create temp dir: %v", err)
-	}
-	defer os.RemoveAll(dir)
-
-	q, err := newQueue(dir, 1024)
-	if err != nil {
-		t.Fatalf("failed to create queue: %v", err)
-	}
-
-	if err := q.Open(); err != nil {
-		t.Fatalf("failed to open queue: %v", err)
-	}
-
-	if err := q.Append([]byte("one")); err != nil {
-		t.Fatalf("Queue.Append failed: %v", err)
-	}
-
-	if err := q.Append([]byte("two")); err != nil {
-		t.Fatalf("Queue.Append failed: %v", err)
-	}
-
-	for _, exp := range []string{"one", "two"} {
-		cur, err := q.Current()
-		if err != nil {
-			t.Fatalf("Queue.Current failed: %v", err)
-		}
-
-		if string(cur) != exp {
-			t.Errorf("Queue.Current mismatch: got %v, exp %v", string(cur), exp)
-		}
-
-		if err := q.Advance(); err != nil {
-			t.Fatalf("Queue.Advance failed: %v", err)
-		}
-	}
-}
-
-func TestQueueAdvancePastEnd(t *testing.T) {
-	dir, err := ioutil.TempDir("", "hh_queue")
-	if err != nil {
-		t.Fatalf("failed to create temp dir: %v", err)
-	}
-	defer os.RemoveAll(dir)
-
-	// create the queue
-	q, err := newQueue(dir, 1024)
-	if err != nil {
-		t.Fatalf("failed to create queue: %v", err)
-	}
-
-	if err := q.Open(); err != nil {
-		t.Fatalf("failed to open queue: %v", err)
-	}
-
-	// append one entry, should go to the first segment
-	if err := q.Append([]byte("one")); err != nil {
-		t.Fatalf("Queue.Append failed: %v", err)
-	}
-
-	// set the segment size low to force a new segment to be created
-	q.SetMaxSegmentSize(12)
-
-	// Should go into a new segment
-	if err := q.Append([]byte("two")); err != nil {
-		t.Fatalf("Queue.Append failed: %v", err)
-	}
-
-	// should read from first segment
-	cur, err := q.Current()
-	if err != nil {
-		t.Fatalf("Queue.Current failed: %v", err)
-	}
-
-	if exp := "one"; string(cur) != exp {
-		t.Errorf("Queue.Current mismatch: got %v, exp %v", string(cur), exp)
-	}
-
-	if err := q.Advance(); err != nil {
-		t.Fatalf("Queue.Advance failed: %v", err)
-	}
-
-	// ensure the first segment file is removed since we've advanced past the end
-	_, err = os.Stat(filepath.Join(dir, "1"))
-	if !os.IsNotExist(err) {
-		t.Fatalf("Queue.Advance should have removed the segment")
-	}
-
-	// should read from second segment
-	cur, err = q.Current()
-	if err != nil {
-		t.Fatalf("Queue.Current failed: %v", err)
-	}
-
-	if exp := "two"; string(cur) != exp {
-		t.Errorf("Queue.Current mismatch: got %v, exp %v", string(cur), exp)
-	}
-
-	_, err = os.Stat(filepath.Join(dir, "2"))
-	if os.IsNotExist(err) {
-		t.Fatalf("Queue.Advance should have removed the segment")
-	}
-
-	if err := q.Advance(); err != nil {
-		t.Fatalf("Queue.Advance failed: %v", err)
-	}
-
-	cur, err = q.Current()
-	if err != io.EOF {
-		t.Fatalf("Queue.Current should have returned error")
-	}
-}
-
-func TestQueueFull(t *testing.T) {
-	dir, err := ioutil.TempDir("", "hh_queue")
-	if err != nil {
-		t.Fatalf("failed to create temp dir: %v", err)
-	}
-	defer os.RemoveAll(dir)
-
-	// create the queue
-	q, err := newQueue(dir, 10)
-	if err != nil {
-		t.Fatalf("failed to create queue: %v", err)
-	}
-
-	if err := q.Open(); err != nil {
-		t.Fatalf("failed to open queue: %v", err)
-	}
-
-	if err := q.Append([]byte("one")); err != ErrQueueFull {
-		t.Fatalf("Queue.Append expected to return queue full")
-	}
-}
-
-func TestQueueReopen(t *testing.T) {
-	dir, err := ioutil.TempDir("", "hh_queue")
-	if err != nil {
-		t.Fatalf("failed to create temp dir: %v", err)
-	}
-	defer os.RemoveAll(dir)
-
-	// create the queue
-	q, err := newQueue(dir, 1024)
-	if err != nil {
-		t.Fatalf("failed to create queue: %v", err)
-	}
-
-	if err := q.Open(); err != nil {
-		t.Fatalf("failed to open queue: %v", err)
-	}
-
-	if err := q.Append([]byte("one")); err != nil {
-		t.Fatalf("Queue.Append failed: %v", err)
-	}
-
-	cur, err := q.Current()
-	if err != nil {
-		t.Fatalf("Queue.Current failed: %v", err)
-	}
-
-	if exp := "one"; string(cur) != exp {
-		t.Errorf("Queue.Current mismatch: got %v, exp %v", string(cur), exp)
-	}
-
-	// close and re-open the queue
-	if err := q.Close(); err != nil {
-		t.Fatalf("Queue.Close failed: %v", err)
-	}
-
-	if err := q.Open(); err != nil {
-		t.Fatalf("failed to re-open queue: %v", err)
-	}
-
-	// Make sure we can read back the last current value
-	cur, err = q.Current()
-	if err != nil {
-		t.Fatalf("Queue.Current failed: %v", err)
-	}
-
-	if exp := "one"; string(cur) != exp {
-		t.Errorf("Queue.Current mismatch: got %v, exp %v", string(cur), exp)
-	}
-
-	if err := q.Append([]byte("two")); err != nil {
-		t.Fatalf("Queue.Append failed: %v", err)
-	}
-
-	if err := q.Advance(); err != nil {
-		t.Fatalf("Queue.Advance failed: %v", err)
-	}
-
-	cur, err = q.Current()
-	if err != nil {
-		t.Fatalf("Queue.Current failed: %v", err)
-	}
-
-	if exp := "two"; string(cur) != exp {
-		t.Errorf("Queue.Current mismatch: got %v, exp %v", string(cur), exp)
-	}
-}
-
-func TestPurgeQueue(t *testing.T) {
-	if testing.Short() {
-		t.Skip("Skipping purge queue")
-	}
-
-	dir, err := ioutil.TempDir("", "hh_queue")
-	if err != nil {
-		t.Fatalf("failed to create temp dir: %v", err)
-	}
-	defer os.RemoveAll(dir)
-
-	// create the queue
-	q, err := newQueue(dir, 1024)
-	if err != nil {
-		t.Fatalf("failed to create queue: %v", err)
-	}
-
-	if err := q.Open(); err != nil {
-		t.Fatalf("failed to open queue: %v", err)
-	}
-
-	if err := q.Append([]byte("one")); err != nil {
-		t.Fatalf("Queue.Append failed: %v", err)
-	}
-
-	cur, err := q.Current()
-	if err != nil {
-		t.Fatalf("Queue.Current failed: %v", err)
-	}
-
-	if exp := "one"; string(cur) != exp {
-		t.Errorf("Queue.Current mismatch: got %v, exp %v", string(cur), exp)
-	}
-
-	time.Sleep(time.Second)
-
-	if err := q.PurgeOlderThan(time.Now()); err != nil {
-		t.Errorf("Queue.PurgeOlderThan failed: %v", err)
-	}
-
-	_, err = q.Current()
-	if err != io.EOF {
-		t.Fatalf("Queue.Current expected io.EOF, got: %v", err)
-	}
-
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/hh/service.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/services/hh/service.go
deleted file mode 100644
index 514a9c889..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/hh/service.go
+++ /dev/null
@@ -1,270 +0,0 @@
-package hh
-
-import (
-	"expvar"
-	"fmt"
-	"io/ioutil"
-	"log"
-	"os"
-	"path/filepath"
-	"strconv"
-	"strings"
-	"sync"
-	"time"
-
-	"github.com/influxdb/influxdb"
-	"github.com/influxdb/influxdb/meta"
-	"github.com/influxdb/influxdb/models"
-	"github.com/influxdb/influxdb/monitor"
-)
-
-var ErrHintedHandoffDisabled = fmt.Errorf("hinted handoff disabled")
-
-const (
-	writeShardReq       = "writeShardReq"
-	writeShardReqPoints = "writeShardReqPoints"
-	writeNodeReq        = "writeNodeReq"
-	writeNodeReqFail    = "writeNodeReqFail"
-	writeNodeReqPoints  = "writeNodeReqPoints"
-)
-
-type Service struct {
-	mu      sync.RWMutex
-	wg      sync.WaitGroup
-	closing chan struct{}
-
-	processors map[uint64]*NodeProcessor
-
-	statMap *expvar.Map
-	Logger  *log.Logger
-	cfg     Config
-
-	shardWriter shardWriter
-	metastore   metaStore
-
-	Monitor interface {
-		RegisterDiagnosticsClient(name string, client monitor.DiagsClient)
-		DeregisterDiagnosticsClient(name string)
-	}
-}
-
-type shardWriter interface {
-	WriteShard(shardID, ownerID uint64, points []models.Point) error
-}
-
-type metaStore interface {
-	Node(id uint64) (ni *meta.NodeInfo, err error)
-}
-
-// NewService returns a new instance of Service.
-func NewService(c Config, w shardWriter, m metaStore) *Service {
-	key := strings.Join([]string{"hh", c.Dir}, ":")
-	tags := map[string]string{"path": c.Dir}
-
-	return &Service{
-		cfg:         c,
-		closing:     make(chan struct{}),
-		processors:  make(map[uint64]*NodeProcessor),
-		statMap:     influxdb.NewStatistics(key, "hh", tags),
-		Logger:      log.New(os.Stderr, "[handoff] ", log.LstdFlags),
-		shardWriter: w,
-		metastore:   m,
-	}
-}
-
-func (s *Service) Open() error {
-	s.mu.Lock()
-	defer s.mu.Unlock()
-	if !s.cfg.Enabled {
-		// Allow Open to proceed, but don't do anything.
-		return nil
-	}
-	s.Logger.Printf("Starting hinted handoff service")
-	s.closing = make(chan struct{})
-
-	// Register diagnostics if a Monitor service is available.
-	if s.Monitor != nil {
-		s.Monitor.RegisterDiagnosticsClient("hh", s)
-	}
-
-	// Create the root directory if it doesn't already exist.
-	s.Logger.Printf("Using data dir: %v", s.cfg.Dir)
-	if err := os.MkdirAll(s.cfg.Dir, 0700); err != nil {
-		return fmt.Errorf("mkdir all: %s", err)
-	}
-
-	// Create a node processor for each node directory.
-	files, err := ioutil.ReadDir(s.cfg.Dir)
-	if err != nil {
-		return err
-	}
-
-	for _, file := range files {
-		nodeID, err := strconv.ParseUint(file.Name(), 10, 64)
-		if err != nil {
-			// Not a number? Skip it.
-			continue
-		}
-
-		n := NewNodeProcessor(nodeID, s.pathforNode(nodeID), s.shardWriter, s.metastore)
-		if err := n.Open(); err != nil {
-			return err
-		}
-		s.processors[nodeID] = n
-	}
-
-	s.wg.Add(1)
-	go s.purgeInactiveProcessors()
-
-	return nil
-}
-
-func (s *Service) Close() error {
-	s.Logger.Println("shutting down hh service")
-	s.mu.Lock()
-	defer s.mu.Unlock()
-
-	for _, p := range s.processors {
-		if err := p.Close(); err != nil {
-			return err
-		}
-	}
-
-	if s.closing != nil {
-		close(s.closing)
-	}
-	s.wg.Wait()
-	s.closing = nil
-
-	return nil
-}
-
-// SetLogger sets the internal logger to the logger passed in.
-func (s *Service) SetLogger(l *log.Logger) {
-	s.Logger = l
-}
-
-// WriteShard queues the points write for shardID to node ownerID to handoff queue
-func (s *Service) WriteShard(shardID, ownerID uint64, points []models.Point) error {
-	if !s.cfg.Enabled {
-		return ErrHintedHandoffDisabled
-	}
-	s.statMap.Add(writeShardReq, 1)
-	s.statMap.Add(writeShardReqPoints, int64(len(points)))
-
-	s.mu.RLock()
-	processor, ok := s.processors[ownerID]
-	s.mu.RUnlock()
-	if !ok {
-		if err := func() error {
-			// Check again under write-lock.
-			s.mu.Lock()
-			defer s.mu.Unlock()
-
-			processor, ok = s.processors[ownerID]
-			if !ok {
-				processor = NewNodeProcessor(ownerID, s.pathforNode(ownerID), s.shardWriter, s.metastore)
-				if err := processor.Open(); err != nil {
-					return err
-				}
-				s.processors[ownerID] = processor
-			}
-			return nil
-		}(); err != nil {
-			return err
-		}
-	}
-
-	if err := processor.WriteShard(shardID, points); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-// Diagnostics returns diagnostic information.
-func (s *Service) Diagnostics() (*monitor.Diagnostic, error) {
-	s.mu.RLock()
-	defer s.mu.RUnlock()
-
-	d := &monitor.Diagnostic{
-		Columns: []string{"node", "active", "last modified", "head", "tail"},
-		Rows:    make([][]interface{}, 0, len(s.processors)),
-	}
-
-	for k, v := range s.processors {
-		lm, err := v.LastModified()
-		if err != nil {
-			return nil, err
-		}
-
-		active := "no"
-		b, err := v.Active()
-		if err != nil {
-			return nil, err
-		}
-		if b {
-			active = "yes"
-		}
-
-		d.Rows = append(d.Rows, []interface{}{k, active, lm, v.Head(), v.Tail()})
-	}
-	return d, nil
-}
-
-// purgeInactiveProcessors will cause the service to remove processors for inactive nodes.
-func (s *Service) purgeInactiveProcessors() {
-	defer s.wg.Done()
-	ticker := time.NewTicker(time.Duration(s.cfg.PurgeInterval))
-	defer ticker.Stop()
-
-	for {
-		select {
-		case <-s.closing:
-			return
-		case <-ticker.C:
-			func() {
-				s.mu.Lock()
-				defer s.mu.Unlock()
-
-				for k, v := range s.processors {
-					lm, err := v.LastModified()
-					if err != nil {
-						s.Logger.Printf("failed to determine LastModified for processor %d: %s", k, err.Error())
-						continue
-					}
-
-					active, err := v.Active()
-					if err != nil {
-						s.Logger.Printf("failed to determine if node %d is active: %s", k, err.Error())
-						continue
-					}
-					if active {
-						// Node is active.
-						continue
-					}
-
-					if !lm.Before(time.Now().Add(-time.Duration(s.cfg.MaxAge))) {
-						// Node processor contains too-young data.
-						continue
-					}
-
-					if err := v.Close(); err != nil {
-						s.Logger.Printf("failed to close node processor %d: %s", k, err.Error())
-						continue
-					}
-					if err := v.Purge(); err != nil {
-						s.Logger.Printf("failed to purge node processor %d: %s", k, err.Error())
-						continue
-					}
-					delete(s.processors, k)
-				}
-			}()
-		}
-	}
-}
-
-// pathforNode returns the directory for HH data, for the given node.
-func (s *Service) pathforNode(nodeID uint64) string {
-	return filepath.Join(s.cfg.Dir, fmt.Sprintf("%d", nodeID))
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/httpd/config.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/services/httpd/config.go
deleted file mode 100644
index 83724e3b9..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/httpd/config.go
+++ /dev/null
@@ -1,22 +0,0 @@
-package httpd
-
-type Config struct {
-	Enabled          bool   `toml:"enabled"`
-	BindAddress      string `toml:"bind-address"`
-	AuthEnabled      bool   `toml:"auth-enabled"`
-	LogEnabled       bool   `toml:"log-enabled"`
-	WriteTracing     bool   `toml:"write-tracing"`
-	PprofEnabled     bool   `toml:"pprof-enabled"`
-	HTTPSEnabled     bool   `toml:"https-enabled"`
-	HTTPSCertificate string `toml:"https-certificate"`
-}
-
-func NewConfig() Config {
-	return Config{
-		Enabled:          true,
-		BindAddress:      ":8086",
-		LogEnabled:       true,
-		HTTPSEnabled:     false,
-		HTTPSCertificate: "/etc/ssl/influxdb.pem",
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/httpd/config_test.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/services/httpd/config_test.go
deleted file mode 100644
index 9a8d034cd..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/httpd/config_test.go
+++ /dev/null
@@ -1,52 +0,0 @@
-package httpd_test
-
-import (
-	"testing"
-
-	"github.com/BurntSushi/toml"
-	"github.com/influxdb/influxdb/services/httpd"
-)
-
-func TestConfig_Parse(t *testing.T) {
-	// Parse configuration.
-	var c httpd.Config
-	if _, err := toml.Decode(`
-enabled = true
-bind-address = ":8080"
-auth-enabled = true
-log-enabled = true
-write-tracing = true
-pprof-enabled = true
-https-enabled = true
-https-certificate = "/dev/null"
-`, &c); err != nil {
-		t.Fatal(err)
-	}
-
-	// Validate configuration.
-	if c.Enabled != true {
-		t.Fatalf("unexpected enabled: %v", c.Enabled)
-	} else if c.BindAddress != ":8080" {
-		t.Fatalf("unexpected bind address: %s", c.BindAddress)
-	} else if c.AuthEnabled != true {
-		t.Fatalf("unexpected auth enabled: %v", c.AuthEnabled)
-	} else if c.LogEnabled != true {
-		t.Fatalf("unexpected log enabled: %v", c.LogEnabled)
-	} else if c.WriteTracing != true {
-		t.Fatalf("unexpected write tracing: %v", c.WriteTracing)
-	} else if c.PprofEnabled != true {
-		t.Fatalf("unexpected pprof enabled: %v", c.PprofEnabled)
-	} else if c.HTTPSEnabled != true {
-		t.Fatalf("unexpected https enabled: %v", c.HTTPSEnabled)
-	} else if c.HTTPSCertificate != "/dev/null" {
-		t.Fatalf("unexpected https certificate: %v", c.HTTPSCertificate)
-	}
-}
-
-func TestConfig_WriteTracing(t *testing.T) {
-	c := httpd.Config{WriteTracing: true}
-	s := httpd.NewService(c)
-	if !s.Handler.WriteTrace {
-		t.Fatalf("write tracing was not set")
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/httpd/handler.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/services/httpd/handler.go
deleted file mode 100644
index 0631e2535..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/httpd/handler.go
+++ /dev/null
@@ -1,940 +0,0 @@
-package httpd
-
-import (
-	"bytes"
-	"compress/gzip"
-	"encoding/json"
-	"errors"
-	"expvar"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"log"
-	"net/http"
-	"net/http/pprof"
-	"os"
-	"strconv"
-	"strings"
-	"time"
-
-	"github.com/bmizerany/pat"
-	"github.com/influxdb/influxdb"
-	"github.com/influxdb/influxdb/client"
-	"github.com/influxdb/influxdb/cluster"
-	"github.com/influxdb/influxdb/influxql"
-	"github.com/influxdb/influxdb/meta"
-	"github.com/influxdb/influxdb/models"
-	"github.com/influxdb/influxdb/services/continuous_querier"
-	"github.com/influxdb/influxdb/uuid"
-)
-
-const (
-	// With raw data queries, mappers will read up to this amount before sending results back to the engine.
-	// This is the default size in the number of values returned in a raw query. Could be many more bytes depending on fields returned.
-	DefaultChunkSize = 10000
-)
-
-// TODO: Standard response headers (see: HeaderHandler)
-// TODO: Compression (see: CompressionHeaderHandler)
-
-// TODO: Check HTTP response codes: 400, 401, 403, 409.
-
-type route struct {
-	name        string
-	method      string
-	pattern     string
-	gzipped     bool
-	log         bool
-	handlerFunc interface{}
-}
-
-// Handler represents an HTTP handler for the InfluxDB server.
-type Handler struct {
-	mux                   *pat.PatternServeMux
-	requireAuthentication bool
-	Version               string
-
-	MetaStore interface {
-		WaitForLeader(timeout time.Duration) error
-		Database(name string) (*meta.DatabaseInfo, error)
-		Authenticate(username, password string) (ui *meta.UserInfo, err error)
-		Users() ([]meta.UserInfo, error)
-	}
-
-	QueryExecutor interface {
-		Authorize(u *meta.UserInfo, q *influxql.Query, db string) error
-		ExecuteQuery(q *influxql.Query, db string, chunkSize int) (<-chan *influxql.Result, error)
-	}
-
-	PointsWriter interface {
-		WritePoints(p *cluster.WritePointsRequest) error
-	}
-
-	ContinuousQuerier continuous_querier.ContinuousQuerier
-
-	Logger         *log.Logger
-	loggingEnabled bool // Log every HTTP access.
-	WriteTrace     bool // Detailed logging of write path
-	statMap        *expvar.Map
-}
-
-// NewHandler returns a new instance of handler with routes.
-func NewHandler(requireAuthentication, loggingEnabled, writeTrace bool, statMap *expvar.Map) *Handler {
-	h := &Handler{
-		mux: pat.New(),
-		requireAuthentication: requireAuthentication,
-		Logger:                log.New(os.Stderr, "[http] ", log.LstdFlags),
-		loggingEnabled:        loggingEnabled,
-		WriteTrace:            writeTrace,
-		statMap:               statMap,
-	}
-
-	h.SetRoutes([]route{
-		route{
-			"query", // Satisfy CORS checks.
-			"OPTIONS", "/query", true, true, h.serveOptions,
-		},
-		route{
-			"query", // Query serving route.
-			"GET", "/query", true, true, h.serveQuery,
-		},
-		route{
-			"write", // Satisfy CORS checks.
-			"OPTIONS", "/write", true, true, h.serveOptions,
-		},
-		route{
-			"write", // Data-ingest route.
-			"POST", "/write", true, true, h.serveWrite,
-		},
-		route{ // Ping
-			"ping",
-			"GET", "/ping", true, true, h.servePing,
-		},
-		route{ // Ping
-			"ping-head",
-			"HEAD", "/ping", true, true, h.servePing,
-		},
-		route{ // Tell data node to run CQs that should be run
-			"process_continuous_queries",
-			"POST", "/data/process_continuous_queries", false, false, h.serveProcessContinuousQueries,
-		},
-	})
-
-	return h
-}
-
-func (h *Handler) SetRoutes(routes []route) {
-	for _, r := range routes {
-		var handler http.Handler
-
-		// If it's a handler func that requires authorization, wrap it in authorization
-		if hf, ok := r.handlerFunc.(func(http.ResponseWriter, *http.Request, *meta.UserInfo)); ok {
-			handler = authenticate(hf, h, h.requireAuthentication)
-		}
-		// This is a normal handler signature and does not require authorization
-		if hf, ok := r.handlerFunc.(func(http.ResponseWriter, *http.Request)); ok {
-			handler = http.HandlerFunc(hf)
-		}
-
-		if r.gzipped {
-			handler = gzipFilter(handler)
-		}
-		handler = versionHeader(handler, h)
-		handler = cors(handler)
-		handler = requestID(handler)
-		if h.loggingEnabled && r.log {
-			handler = logging(handler, r.name, h.Logger)
-		}
-		handler = recovery(handler, r.name, h.Logger) // make sure recovery is always last
-
-		h.mux.Add(r.method, r.pattern, handler)
-	}
-}
-
-// ServeHTTP responds to HTTP request to the handler.
-func (h *Handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
-	h.statMap.Add(statRequest, 1)
-
-	// FIXME(benbjohnson): Add pprof enabled flag.
-	if strings.HasPrefix(r.URL.Path, "/debug/pprof") {
-		switch r.URL.Path {
-		case "/debug/pprof/cmdline":
-			pprof.Cmdline(w, r)
-		case "/debug/pprof/profile":
-			pprof.Profile(w, r)
-		case "/debug/pprof/symbol":
-			pprof.Symbol(w, r)
-		default:
-			pprof.Index(w, r)
-		}
-	} else if strings.HasPrefix(r.URL.Path, "/debug/vars") {
-		serveExpvar(w, r)
-	} else {
-		h.mux.ServeHTTP(w, r)
-	}
-}
-
-func (h *Handler) serveProcessContinuousQueries(w http.ResponseWriter, r *http.Request, user *meta.UserInfo) {
-	h.statMap.Add(statCQRequest, 1)
-
-	// If the continuous query service isn't configured, return 404.
-	if h.ContinuousQuerier == nil {
-		w.WriteHeader(http.StatusNotImplemented)
-		return
-	}
-
-	q := r.URL.Query()
-
-	// Get the database name (blank means all databases).
-	db := q.Get("db")
-	// Get the name of the CQ to run (blank means run all).
-	name := q.Get("name")
-	// Get the time for which the CQ should be evaluated.
-	t := time.Now()
-	var err error
-	s := q.Get("time")
-	if s != "" {
-		t, err = time.Parse(time.RFC3339Nano, s)
-		if err != nil {
-			// Try parsing as an int64 nanosecond timestamp.
-			i, err := strconv.ParseInt(s, 10, 64)
-			if err != nil {
-				w.WriteHeader(http.StatusBadRequest)
-				return
-			}
-			t = time.Unix(0, i)
-		}
-	}
-
-	// Pass the request to the CQ service.
-	if err := h.ContinuousQuerier.Run(db, name, t); err != nil {
-		w.WriteHeader(http.StatusBadRequest)
-		return
-	}
-
-	w.WriteHeader(http.StatusNoContent)
-}
-
-// serveQuery parses an incoming query and, if valid, executes the query.
-func (h *Handler) serveQuery(w http.ResponseWriter, r *http.Request, user *meta.UserInfo) {
-	h.statMap.Add(statQueryRequest, 1)
-
-	q := r.URL.Query()
-	pretty := q.Get("pretty") == "true"
-
-	qp := strings.TrimSpace(q.Get("q"))
-	if qp == "" {
-		httpError(w, `missing required parameter "q"`, pretty, http.StatusBadRequest)
-		return
-	}
-
-	epoch := strings.TrimSpace(q.Get("epoch"))
-
-	p := influxql.NewParser(strings.NewReader(qp))
-	db := q.Get("db")
-
-	// Parse query from query string.
-	query, err := p.ParseQuery()
-	if err != nil {
-		httpError(w, "error parsing query: "+err.Error(), pretty, http.StatusBadRequest)
-		return
-	}
-
-	// Sanitize statements with passwords.
-	for _, s := range query.Statements {
-		switch stmt := s.(type) {
-		case *influxql.CreateUserStatement:
-			sanitize(r, stmt.Password)
-		case *influxql.SetPasswordUserStatement:
-			sanitize(r, stmt.Password)
-		}
-	}
-
-	// Check authorization.
-	if h.requireAuthentication {
-		err = h.QueryExecutor.Authorize(user, query, db)
-		if err != nil {
-			httpError(w, "error authorizing query: "+err.Error(), pretty, http.StatusUnauthorized)
-			return
-		}
-	}
-
-	// Parse chunk size. Use default if not provided or unparsable.
-	chunked := (q.Get("chunked") == "true")
-	chunkSize := DefaultChunkSize
-	if chunked {
-		if n, err := strconv.ParseInt(q.Get("chunk_size"), 10, 64); err == nil {
-			chunkSize = int(n)
-		}
-	}
-
-	// Execute query.
-	w.Header().Add("content-type", "application/json")
-	results, err := h.QueryExecutor.ExecuteQuery(query, db, chunkSize)
-
-	if err != nil {
-		w.WriteHeader(http.StatusInternalServerError)
-		return
-	}
-
-	// if we're not chunking, this will be the in memory buffer for all results before sending to client
-	resp := Response{Results: make([]*influxql.Result, 0)}
-
-	// Status header is OK once this point is reached.
-	w.WriteHeader(http.StatusOK)
-
-	// pull all results from the channel
-	for r := range results {
-		// Ignore nil results.
-		if r == nil {
-			continue
-		}
-
-		// if requested, convert result timestamps to epoch
-		if epoch != "" {
-			convertToEpoch(r, epoch)
-		}
-
-		// Write out result immediately if chunked.
-		if chunked {
-			n, _ := w.Write(MarshalJSON(Response{
-				Results: []*influxql.Result{r},
-			}, pretty))
-			h.statMap.Add(statQueryRequestBytesTransmitted, int64(n))
-			w.(http.Flusher).Flush()
-			continue
-		}
-
-		// It's not chunked so buffer results in memory.
-		// Results for statements need to be combined together.
-		// We need to check if this new result is for the same statement as
-		// the last result, or for the next statement
-		l := len(resp.Results)
-		if l == 0 {
-			resp.Results = append(resp.Results, r)
-		} else if resp.Results[l-1].StatementID == r.StatementID {
-			cr := resp.Results[l-1]
-			lastSeries := cr.Series[len(cr.Series)-1]
-			rowsMerged := 0
-
-			for _, row := range r.Series {
-				if !lastSeries.SameSeries(row) {
-					// Next row is for a different series than last.
-					break
-				}
-				// Values are for the same series, so append them.
-				lastSeries.Values = append(lastSeries.Values, row.Values...)
-				rowsMerged++
-			}
-
-			// Append remaining rows as new rows.
-			r.Series = r.Series[rowsMerged:]
-			cr.Series = append(cr.Series, r.Series...)
-		} else {
-			resp.Results = append(resp.Results, r)
-		}
-	}
-
-	// If it's not chunked we buffered everything in memory, so write it out
-	if !chunked {
-		n, _ := w.Write(MarshalJSON(resp, pretty))
-		h.statMap.Add(statQueryRequestBytesTransmitted, int64(n))
-	}
-}
-
-func (h *Handler) serveWrite(w http.ResponseWriter, r *http.Request, user *meta.UserInfo) {
-	h.statMap.Add(statWriteRequest, 1)
-
-	// Handle gzip decoding of the body
-	body := r.Body
-	if r.Header.Get("Content-encoding") == "gzip" {
-		b, err := gzip.NewReader(r.Body)
-		if err != nil {
-			h.writeError(w, influxql.Result{Err: err}, http.StatusBadRequest)
-			return
-		}
-		body = b
-	}
-	defer body.Close()
-
-	b, err := ioutil.ReadAll(body)
-	if err != nil {
-		if h.WriteTrace {
-			h.Logger.Print("write handler unable to read bytes from request body")
-		}
-		h.writeError(w, influxql.Result{Err: err}, http.StatusBadRequest)
-		return
-	}
-	h.statMap.Add(statWriteRequestBytesReceived, int64(len(b)))
-	if h.WriteTrace {
-		h.Logger.Printf("write body received by handler: %s", string(b))
-	}
-
-	if r.Header.Get("Content-Type") == "application/json" {
-		h.serveWriteJSON(w, r, b, user)
-		return
-	}
-	h.serveWriteLine(w, r, b, user)
-}
-
-// serveWriteJSON receives incoming series data in JSON and writes it to the database.
-func (h *Handler) serveWriteJSON(w http.ResponseWriter, r *http.Request, body []byte, user *meta.UserInfo) {
-	var bp client.BatchPoints
-	var dec *json.Decoder
-
-	dec = json.NewDecoder(bytes.NewReader(body))
-
-	if err := dec.Decode(&bp); err != nil {
-		if err.Error() == "EOF" {
-			w.WriteHeader(http.StatusOK)
-			return
-		}
-		resultError(w, influxql.Result{Err: err}, http.StatusBadRequest)
-		return
-	}
-
-	if bp.Database == "" {
-		resultError(w, influxql.Result{Err: fmt.Errorf("database is required")}, http.StatusBadRequest)
-		return
-	}
-
-	if di, err := h.MetaStore.Database(bp.Database); err != nil {
-		resultError(w, influxql.Result{Err: fmt.Errorf("metastore database error: %s", err)}, http.StatusInternalServerError)
-		return
-	} else if di == nil {
-		resultError(w, influxql.Result{Err: fmt.Errorf("database not found: %q", bp.Database)}, http.StatusNotFound)
-		return
-	}
-
-	if h.requireAuthentication && user == nil {
-		resultError(w, influxql.Result{Err: fmt.Errorf("user is required to write to database %q", bp.Database)}, http.StatusUnauthorized)
-		return
-	}
-
-	if h.requireAuthentication && !user.Authorize(influxql.WritePrivilege, bp.Database) {
-		resultError(w, influxql.Result{Err: fmt.Errorf("%q user is not authorized to write to database %q", user.Name, bp.Database)}, http.StatusUnauthorized)
-		return
-	}
-
-	points, err := NormalizeBatchPoints(bp)
-	if err != nil {
-		resultError(w, influxql.Result{Err: err}, http.StatusBadRequest)
-		return
-	}
-
-	// Convert the json batch struct to a points writer struct
-	if err := h.PointsWriter.WritePoints(&cluster.WritePointsRequest{
-		Database:         bp.Database,
-		RetentionPolicy:  bp.RetentionPolicy,
-		ConsistencyLevel: cluster.ConsistencyLevelOne,
-		Points:           points,
-	}); err != nil {
-		h.statMap.Add(statPointsWrittenFail, int64(len(points)))
-		if influxdb.IsClientError(err) {
-			h.writeError(w, influxql.Result{Err: err}, http.StatusBadRequest)
-		} else {
-			h.writeError(w, influxql.Result{Err: err}, http.StatusInternalServerError)
-		}
-		return
-	}
-	h.statMap.Add(statPointsWrittenOK, int64(len(points)))
-
-	w.WriteHeader(http.StatusNoContent)
-}
-
-func (h *Handler) writeError(w http.ResponseWriter, result influxql.Result, statusCode int) {
-	w.WriteHeader(statusCode)
-	w.Write([]byte(result.Err.Error()))
-	w.Write([]byte("\n"))
-}
-
-// serveWriteLine receives incoming series data in line protocol format and writes it to the database.
-func (h *Handler) serveWriteLine(w http.ResponseWriter, r *http.Request, body []byte, user *meta.UserInfo) {
-	// Some clients may not set the content-type header appropriately and send JSON with a non-json
-	// content-type.  If the body looks JSON, try to handle it as as JSON instead
-	if len(body) > 0 {
-		var i int
-		for {
-			// JSON requests must start w/ an opening bracket
-			if body[i] == '{' {
-				h.serveWriteJSON(w, r, body, user)
-				return
-			}
-
-			// check that the byte is in the standard ascii code range
-			if body[i] > 32 || i >= len(body)-1 {
-				break
-			}
-			i += 1
-		}
-	}
-
-	precision := r.FormValue("precision")
-	if precision == "" {
-		precision = "n"
-	}
-
-	points, parseError := models.ParsePointsWithPrecision(body, time.Now().UTC(), precision)
-	// Not points parsed correctly so return the error now
-	if parseError != nil && len(points) == 0 {
-		if parseError.Error() == "EOF" {
-			w.WriteHeader(http.StatusOK)
-			return
-		}
-		h.writeError(w, influxql.Result{Err: parseError}, http.StatusBadRequest)
-		return
-	}
-
-	database := r.FormValue("db")
-	if database == "" {
-		h.writeError(w, influxql.Result{Err: fmt.Errorf("database is required")}, http.StatusBadRequest)
-		return
-	}
-
-	if di, err := h.MetaStore.Database(database); err != nil {
-		h.writeError(w, influxql.Result{Err: fmt.Errorf("metastore database error: %s", err)}, http.StatusInternalServerError)
-		return
-	} else if di == nil {
-		h.writeError(w, influxql.Result{Err: fmt.Errorf("database not found: %q", database)}, http.StatusNotFound)
-		return
-	}
-
-	if h.requireAuthentication && user == nil {
-		h.writeError(w, influxql.Result{Err: fmt.Errorf("user is required to write to database %q", database)}, http.StatusUnauthorized)
-		return
-	}
-
-	if h.requireAuthentication && !user.Authorize(influxql.WritePrivilege, database) {
-		h.writeError(w, influxql.Result{Err: fmt.Errorf("%q user is not authorized to write to database %q", user.Name, database)}, http.StatusUnauthorized)
-		return
-	}
-
-	// Determine required consistency level.
-	consistency := cluster.ConsistencyLevelOne
-	switch r.Form.Get("consistency") {
-	case "all":
-		consistency = cluster.ConsistencyLevelAll
-	case "any":
-		consistency = cluster.ConsistencyLevelAny
-	case "one":
-		consistency = cluster.ConsistencyLevelOne
-	case "quorum":
-		consistency = cluster.ConsistencyLevelQuorum
-	}
-
-	// Write points.
-	if err := h.PointsWriter.WritePoints(&cluster.WritePointsRequest{
-		Database:         database,
-		RetentionPolicy:  r.FormValue("rp"),
-		ConsistencyLevel: consistency,
-		Points:           points,
-	}); influxdb.IsClientError(err) {
-		h.statMap.Add(statPointsWrittenFail, int64(len(points)))
-		h.writeError(w, influxql.Result{Err: err}, http.StatusBadRequest)
-		return
-	} else if err != nil {
-		h.statMap.Add(statPointsWrittenFail, int64(len(points)))
-		h.writeError(w, influxql.Result{Err: err}, http.StatusInternalServerError)
-		return
-	} else if parseError != nil {
-		// We wrote some of the points
-		h.statMap.Add(statPointsWrittenOK, int64(len(points)))
-		// The other points failed to parse which means the client sent invalid line protocol.  We return a 400
-		// response code as well as the lines that failed to parse.
-		h.writeError(w, influxql.Result{Err: fmt.Errorf("partial write:\n%v", parseError)}, http.StatusBadRequest)
-		return
-	}
-
-	h.statMap.Add(statPointsWrittenOK, int64(len(points)))
-	w.WriteHeader(http.StatusNoContent)
-}
-
-// serveOptions returns an empty response to comply with OPTIONS pre-flight requests
-func (h *Handler) serveOptions(w http.ResponseWriter, r *http.Request) {
-	w.WriteHeader(http.StatusNoContent)
-}
-
-// servePing returns a simple response to let the client know the server is running.
-func (h *Handler) servePing(w http.ResponseWriter, r *http.Request) {
-	q := r.URL.Query()
-	wfl := q.Get("wait_for_leader")
-
-	if wfl != "" {
-		d, err := time.ParseDuration(wfl)
-		if err != nil {
-			w.WriteHeader(http.StatusBadRequest)
-			return
-		}
-		if err := h.MetaStore.WaitForLeader(d); err != nil {
-			w.WriteHeader(http.StatusServiceUnavailable)
-			return
-		}
-	}
-
-	h.statMap.Add(statPingRequest, 1)
-	w.WriteHeader(http.StatusNoContent)
-}
-
-// convertToEpoch converts result timestamps from time.Time to the specified epoch.
-func convertToEpoch(r *influxql.Result, epoch string) {
-	divisor := int64(1)
-
-	switch epoch {
-	case "u":
-		divisor = int64(time.Microsecond)
-	case "ms":
-		divisor = int64(time.Millisecond)
-	case "s":
-		divisor = int64(time.Second)
-	case "m":
-		divisor = int64(time.Minute)
-	case "h":
-		divisor = int64(time.Hour)
-	}
-
-	for _, s := range r.Series {
-		for _, v := range s.Values {
-			if ts, ok := v[0].(time.Time); ok {
-				v[0] = ts.UnixNano() / divisor
-			}
-		}
-	}
-}
-
-// MarshalJSON will marshal v to JSON. Pretty prints if pretty is true.
-func MarshalJSON(v interface{}, pretty bool) []byte {
-	var b []byte
-	var err error
-	if pretty {
-		b, err = json.MarshalIndent(v, "", "    ")
-	} else {
-		b, err = json.Marshal(v)
-	}
-
-	if err != nil {
-		return []byte(err.Error())
-	}
-	return b
-}
-
-type Point struct {
-	Name   string                 `json:"name"`
-	Time   time.Time              `json:"time"`
-	Tags   map[string]string      `json:"tags"`
-	Fields map[string]interface{} `json:"fields"`
-}
-
-type Batch struct {
-	Database        string  `json:"database"`
-	RetentionPolicy string  `json:"retentionPolicy"`
-	Points          []Point `json:"points"`
-}
-
-// serveExpvar serves registered expvar information over HTTP.
-func serveExpvar(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")
-}
-
-// httpError writes an error to the client in a standard format.
-func httpError(w http.ResponseWriter, error string, pretty bool, code int) {
-	w.Header().Add("content-type", "application/json")
-	w.WriteHeader(code)
-
-	response := Response{Err: errors.New(error)}
-	var b []byte
-	if pretty {
-		b, _ = json.MarshalIndent(response, "", "    ")
-	} else {
-		b, _ = json.Marshal(response)
-	}
-	w.Write(b)
-}
-
-func resultError(w http.ResponseWriter, result influxql.Result, code int) {
-	w.Header().Add("content-type", "application/json")
-	w.WriteHeader(code)
-	_ = json.NewEncoder(w).Encode(&result)
-}
-
-// Filters and filter helpers
-
-// parseCredentials returns the username and password encoded in
-// a request. The credentials may be present as URL query params, or as
-// a Basic Authentication header.
-// as params: http://127.0.0.1/query?u=username&p=password
-// as basic auth: http://username:password@127.0.0.1
-func parseCredentials(r *http.Request) (string, string, error) {
-	q := r.URL.Query()
-
-	if u, p := q.Get("u"), q.Get("p"); u != "" && p != "" {
-		return u, p, nil
-	}
-	if u, p, ok := r.BasicAuth(); ok {
-		return u, p, nil
-	}
-	return "", "", fmt.Errorf("unable to parse Basic Auth credentials")
-}
-
-// authenticate wraps a handler and ensures that if user credentials are passed in
-// an attempt is made to authenticate that user. If authentication fails, an error is returned.
-//
-// There is one exception: if there are no users in the system, authentication is not required. This
-// is to facilitate bootstrapping of a system with authentication enabled.
-func authenticate(inner func(http.ResponseWriter, *http.Request, *meta.UserInfo), h *Handler, requireAuthentication bool) http.Handler {
-	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		// Return early if we are not authenticating
-		if !requireAuthentication {
-			inner(w, r, nil)
-			return
-		}
-		var user *meta.UserInfo
-
-		// Retrieve user list.
-		uis, err := h.MetaStore.Users()
-		if err != nil {
-			httpError(w, err.Error(), false, http.StatusInternalServerError)
-			return
-		}
-
-		// TODO corylanou: never allow this in the future without users
-		if requireAuthentication && len(uis) > 0 {
-			username, password, err := parseCredentials(r)
-			if err != nil {
-				h.statMap.Add(statAuthFail, 1)
-				httpError(w, err.Error(), false, http.StatusUnauthorized)
-				return
-			}
-			if username == "" {
-				h.statMap.Add(statAuthFail, 1)
-				httpError(w, "username required", false, http.StatusUnauthorized)
-				return
-			}
-
-			user, err = h.MetaStore.Authenticate(username, password)
-			if err != nil {
-				h.statMap.Add(statAuthFail, 1)
-				httpError(w, err.Error(), false, http.StatusUnauthorized)
-				return
-			}
-		}
-		inner(w, r, user)
-	})
-}
-
-type gzipResponseWriter struct {
-	io.Writer
-	http.ResponseWriter
-}
-
-func (w gzipResponseWriter) Write(b []byte) (int, error) {
-	return w.Writer.Write(b)
-}
-
-func (w gzipResponseWriter) Flush() {
-	w.Writer.(*gzip.Writer).Flush()
-}
-
-// determines if the client can accept compressed responses, and encodes accordingly
-func gzipFilter(inner http.Handler) http.Handler {
-	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		if !strings.Contains(r.Header.Get("Accept-Encoding"), "gzip") {
-			inner.ServeHTTP(w, r)
-			return
-		}
-		w.Header().Set("Content-Encoding", "gzip")
-		gz := gzip.NewWriter(w)
-		defer gz.Close()
-		gzw := gzipResponseWriter{Writer: gz, ResponseWriter: w}
-		inner.ServeHTTP(gzw, r)
-	})
-}
-
-// versionHeader takes a HTTP handler and returns a HTTP handler
-// and adds the X-INFLUXBD-VERSION header to outgoing responses.
-func versionHeader(inner http.Handler, h *Handler) http.Handler {
-	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		w.Header().Add("X-InfluxDB-Version", h.Version)
-		inner.ServeHTTP(w, r)
-	})
-}
-
-// cors responds to incoming requests and adds the appropriate cors headers
-// TODO: corylanou: add the ability to configure this in our config
-func cors(inner http.Handler) http.Handler {
-	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		if origin := r.Header.Get("Origin"); origin != "" {
-			w.Header().Set(`Access-Control-Allow-Origin`, origin)
-			w.Header().Set(`Access-Control-Allow-Methods`, strings.Join([]string{
-				`DELETE`,
-				`GET`,
-				`OPTIONS`,
-				`POST`,
-				`PUT`,
-			}, ", "))
-
-			w.Header().Set(`Access-Control-Allow-Headers`, strings.Join([]string{
-				`Accept`,
-				`Accept-Encoding`,
-				`Authorization`,
-				`Content-Length`,
-				`Content-Type`,
-				`X-CSRF-Token`,
-				`X-HTTP-Method-Override`,
-			}, ", "))
-		}
-
-		if r.Method == "OPTIONS" {
-			return
-		}
-
-		inner.ServeHTTP(w, r)
-	})
-}
-
-func requestID(inner http.Handler) http.Handler {
-	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		uid := uuid.TimeUUID()
-		r.Header.Set("Request-Id", uid.String())
-		w.Header().Set("Request-Id", r.Header.Get("Request-Id"))
-
-		inner.ServeHTTP(w, r)
-	})
-}
-
-func logging(inner http.Handler, name string, weblog *log.Logger) http.Handler {
-	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		start := time.Now()
-		l := &responseLogger{w: w}
-		inner.ServeHTTP(l, r)
-		logLine := buildLogLine(l, r, start)
-		weblog.Println(logLine)
-	})
-}
-
-func recovery(inner http.Handler, name string, weblog *log.Logger) http.Handler {
-	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		start := time.Now()
-		l := &responseLogger{w: w}
-
-		defer func() {
-			if err := recover(); err != nil {
-				logLine := buildLogLine(l, r, start)
-				logLine = fmt.Sprintf(`%s [panic:%s]`, logLine, err)
-				weblog.Println(logLine)
-			}
-		}()
-
-		inner.ServeHTTP(l, r)
-	})
-}
-
-// Response represents a list of statement results.
-type Response struct {
-	Results []*influxql.Result
-	Err     error
-}
-
-// MarshalJSON encodes a Response struct into JSON.
-func (r Response) MarshalJSON() ([]byte, error) {
-	// Define a struct that outputs "error" as a string.
-	var o struct {
-		Results []*influxql.Result `json:"results,omitempty"`
-		Err     string             `json:"error,omitempty"`
-	}
-
-	// Copy fields to output struct.
-	o.Results = r.Results
-	if r.Err != nil {
-		o.Err = r.Err.Error()
-	}
-
-	return json.Marshal(&o)
-}
-
-// UnmarshalJSON decodes the data into the Response struct
-func (r *Response) UnmarshalJSON(b []byte) error {
-	var o struct {
-		Results []*influxql.Result `json:"results,omitempty"`
-		Err     string             `json:"error,omitempty"`
-	}
-
-	err := json.Unmarshal(b, &o)
-	if err != nil {
-		return err
-	}
-	r.Results = o.Results
-	if o.Err != "" {
-		r.Err = errors.New(o.Err)
-	}
-	return nil
-}
-
-// Error returns the first error from any statement.
-// Returns nil if no errors occurred on any statements.
-func (r *Response) Error() error {
-	if r.Err != nil {
-		return r.Err
-	}
-	for _, rr := range r.Results {
-		if rr.Err != nil {
-			return rr.Err
-		}
-	}
-	return nil
-}
-
-// NormalizeBatchPoints returns a slice of Points, created by populating individual
-// points within the batch, which do not have times or tags, with the top-level
-// values.
-func NormalizeBatchPoints(bp client.BatchPoints) ([]models.Point, error) {
-	points := []models.Point{}
-	for _, p := range bp.Points {
-		if p.Time.IsZero() {
-			if bp.Time.IsZero() {
-				p.Time = time.Now()
-			} else {
-				p.Time = bp.Time
-			}
-		}
-		if p.Precision == "" && bp.Precision != "" {
-			p.Precision = bp.Precision
-		}
-		p.Time = client.SetPrecision(p.Time, p.Precision)
-		if len(bp.Tags) > 0 {
-			if p.Tags == nil {
-				p.Tags = make(map[string]string)
-			}
-			for k := range bp.Tags {
-				if p.Tags[k] == "" {
-					p.Tags[k] = bp.Tags[k]
-				}
-			}
-		}
-
-		if p.Measurement == "" {
-			return points, fmt.Errorf("missing measurement")
-		}
-
-		if len(p.Fields) == 0 {
-			return points, fmt.Errorf("missing fields")
-		}
-		// Need to convert from a client.Point to a influxdb.Point
-		pt, err := models.NewPoint(p.Measurement, p.Tags, p.Fields, p.Time)
-		if err != nil {
-			return points, err
-		}
-		points = append(points, pt)
-	}
-
-	return points, nil
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/httpd/handler_test.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/services/httpd/handler_test.go
deleted file mode 100644
index ba9ec98da..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/httpd/handler_test.go
+++ /dev/null
@@ -1,549 +0,0 @@
-package httpd_test
-
-import (
-	"bytes"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"io"
-	"net/http"
-	"net/http/httptest"
-	"reflect"
-	"regexp"
-	"testing"
-	"time"
-
-	"github.com/influxdb/influxdb"
-	"github.com/influxdb/influxdb/client"
-	"github.com/influxdb/influxdb/influxql"
-	"github.com/influxdb/influxdb/meta"
-	"github.com/influxdb/influxdb/models"
-	"github.com/influxdb/influxdb/services/httpd"
-	"github.com/influxdb/influxdb/tsdb"
-)
-
-func TestBatchWrite_UnmarshalEpoch(t *testing.T) {
-	now := time.Now().UTC()
-	tests := []struct {
-		name      string
-		epoch     int64
-		precision string
-		expected  time.Time
-	}{
-		{
-			name:      "nanoseconds",
-			epoch:     now.UnixNano(),
-			precision: "n",
-			expected:  now,
-		},
-		{
-			name:      "microseconds",
-			epoch:     now.Round(time.Microsecond).UnixNano() / int64(time.Microsecond),
-			precision: "u",
-			expected:  now.Round(time.Microsecond),
-		},
-		{
-			name:      "milliseconds",
-			epoch:     now.Round(time.Millisecond).UnixNano() / int64(time.Millisecond),
-			precision: "ms",
-			expected:  now.Round(time.Millisecond),
-		},
-		{
-			name:      "seconds",
-			epoch:     now.Round(time.Second).UnixNano() / int64(time.Second),
-			precision: "s",
-			expected:  now.Round(time.Second),
-		},
-		{
-			name:      "minutes",
-			epoch:     now.Round(time.Minute).UnixNano() / int64(time.Minute),
-			precision: "m",
-			expected:  now.Round(time.Minute),
-		},
-		{
-			name:      "hours",
-			epoch:     now.Round(time.Hour).UnixNano() / int64(time.Hour),
-			precision: "h",
-			expected:  now.Round(time.Hour),
-		},
-		{
-			name:      "max int64",
-			epoch:     9223372036854775807,
-			precision: "n",
-			expected:  time.Unix(0, 9223372036854775807),
-		},
-		{
-			name:      "100 years from now",
-			epoch:     now.Add(time.Hour * 24 * 365 * 100).UnixNano(),
-			precision: "n",
-			expected:  now.Add(time.Hour * 24 * 365 * 100),
-		},
-	}
-
-	for _, test := range tests {
-		t.Logf("testing %q\n", test.name)
-		data := []byte(fmt.Sprintf(`{"time": %d, "precision":"%s"}`, test.epoch, test.precision))
-		t.Logf("json: %s", string(data))
-		var bp client.BatchPoints
-		err := json.Unmarshal(data, &bp)
-		if err != nil {
-			t.Fatalf("unexpected error.  expected: %v, actual: %v", nil, err)
-		}
-		if !bp.Time.Equal(test.expected) {
-			t.Fatalf("Unexpected time.  expected: %v, actual: %v", test.expected, bp.Time)
-		}
-	}
-}
-
-func TestBatchWrite_UnmarshalRFC(t *testing.T) {
-	now := time.Now()
-	tests := []struct {
-		name     string
-		rfc      string
-		now      time.Time
-		expected time.Time
-	}{
-		{
-			name:     "RFC3339Nano",
-			rfc:      time.RFC3339Nano,
-			now:      now,
-			expected: now,
-		},
-		{
-			name:     "RFC3339",
-			rfc:      time.RFC3339,
-			now:      now.Round(time.Second),
-			expected: now.Round(time.Second),
-		},
-	}
-
-	for _, test := range tests {
-		t.Logf("testing %q\n", test.name)
-		ts := test.now.Format(test.rfc)
-		data := []byte(fmt.Sprintf(`{"time": %q}`, ts))
-		t.Logf("json: %s", string(data))
-		var bp client.BatchPoints
-		err := json.Unmarshal(data, &bp)
-		if err != nil {
-			t.Fatalf("unexpected error.  exptected: %v, actual: %v", nil, err)
-		}
-		if !bp.Time.Equal(test.expected) {
-			t.Fatalf("Unexpected time.  expected: %v, actual: %v", test.expected, bp.Time)
-		}
-	}
-}
-
-// Ensure the handler returns results from a query (including nil results).
-func TestHandler_Query(t *testing.T) {
-	h := NewHandler(false)
-	h.QueryExecutor.ExecuteQueryFn = func(q *influxql.Query, db string, chunkSize int) (<-chan *influxql.Result, error) {
-		if q.String() != `SELECT * FROM bar` {
-			t.Fatalf("unexpected query: %s", q.String())
-		} else if db != `foo` {
-			t.Fatalf("unexpected db: %s", db)
-		}
-		return NewResultChan(
-			&influxql.Result{StatementID: 1, Series: models.Rows([]*models.Row{{Name: "series0"}})},
-			&influxql.Result{StatementID: 2, Series: models.Rows([]*models.Row{{Name: "series1"}})},
-			nil,
-		), nil
-	}
-
-	w := httptest.NewRecorder()
-	h.ServeHTTP(w, MustNewJSONRequest("GET", "/query?db=foo&q=SELECT+*+FROM+bar", nil))
-	if w.Code != http.StatusOK {
-		t.Fatalf("unexpected status: %d", w.Code)
-	} else if w.Body.String() != `{"results":[{"series":[{"name":"series0"}]},{"series":[{"name":"series1"}]}]}` {
-		t.Fatalf("unexpected body: %s", w.Body.String())
-	}
-}
-
-// Ensure the handler returns results from a query (including nil results).
-func TestHandler_QueryRegex(t *testing.T) {
-	h := NewHandler(false)
-	h.QueryExecutor.ExecuteQueryFn = func(q *influxql.Query, db string, chunkSize int) (<-chan *influxql.Result, error) {
-		if q.String() != `SELECT * FROM test WHERE url =~ /http\:\/\/www.akamai\.com/` {
-			t.Fatalf("unexpected query: %s", q.String())
-		} else if db != `test` {
-			t.Fatalf("unexpected db: %s", db)
-		}
-		return NewResultChan(
-			nil,
-		), nil
-	}
-
-	w := httptest.NewRecorder()
-	h.ServeHTTP(w, MustNewRequest("GET", "/query?db=test&q=SELECT%20%2A%20FROM%20test%20WHERE%20url%20%3D~%20%2Fhttp%5C%3A%5C%2F%5C%2Fwww.akamai%5C.com%2F", nil))
-}
-
-// Ensure the handler merges results from the same statement.
-func TestHandler_Query_MergeResults(t *testing.T) {
-	h := NewHandler(false)
-	h.QueryExecutor.ExecuteQueryFn = func(q *influxql.Query, db string, chunkSize int) (<-chan *influxql.Result, error) {
-		return NewResultChan(
-			&influxql.Result{StatementID: 1, Series: models.Rows([]*models.Row{{Name: "series0"}})},
-			&influxql.Result{StatementID: 1, Series: models.Rows([]*models.Row{{Name: "series1"}})},
-		), nil
-	}
-
-	w := httptest.NewRecorder()
-	h.ServeHTTP(w, MustNewJSONRequest("GET", "/query?db=foo&q=SELECT+*+FROM+bar", nil))
-	if w.Code != http.StatusOK {
-		t.Fatalf("unexpected status: %d", w.Code)
-	} else if w.Body.String() != `{"results":[{"series":[{"name":"series0"},{"name":"series1"}]}]}` {
-		t.Fatalf("unexpected body: %s", w.Body.String())
-	}
-}
-
-// Ensure the handler can parse chunked and chunk size query parameters.
-func TestHandler_Query_Chunked(t *testing.T) {
-	h := NewHandler(false)
-	h.QueryExecutor.ExecuteQueryFn = func(q *influxql.Query, db string, chunkSize int) (<-chan *influxql.Result, error) {
-		if chunkSize != 2 {
-			t.Fatalf("unexpected chunk size: %d", chunkSize)
-		}
-		return NewResultChan(
-			&influxql.Result{StatementID: 1, Series: models.Rows([]*models.Row{{Name: "series0"}})},
-			&influxql.Result{StatementID: 1, Series: models.Rows([]*models.Row{{Name: "series1"}})},
-		), nil
-	}
-
-	w := httptest.NewRecorder()
-	h.ServeHTTP(w, MustNewJSONRequest("GET", "/query?db=foo&q=SELECT+*+FROM+bar&chunked=true&chunk_size=2", nil))
-	if w.Code != http.StatusOK {
-		t.Fatalf("unexpected status: %d", w.Code)
-	} else if w.Body.String() != `{"results":[{"series":[{"name":"series0"}]}]}{"results":[{"series":[{"name":"series1"}]}]}` {
-		t.Fatalf("unexpected body: %s", w.Body.String())
-	}
-}
-
-// Ensure the handler returns a status 400 if the query is not passed in.
-func TestHandler_Query_ErrQueryRequired(t *testing.T) {
-	h := NewHandler(false)
-	w := httptest.NewRecorder()
-	h.ServeHTTP(w, MustNewJSONRequest("GET", "/query", nil))
-	if w.Code != http.StatusBadRequest {
-		t.Fatalf("unexpected status: %d", w.Code)
-	} else if w.Body.String() != `{"error":"missing required parameter \"q\""}` {
-		t.Fatalf("unexpected body: %s", w.Body.String())
-	}
-}
-
-// Ensure the handler returns a status 400 if the query cannot be parsed.
-func TestHandler_Query_ErrInvalidQuery(t *testing.T) {
-	h := NewHandler(false)
-	w := httptest.NewRecorder()
-	h.ServeHTTP(w, MustNewJSONRequest("GET", "/query?q=SELECT", nil))
-	if w.Code != http.StatusBadRequest {
-		t.Fatalf("unexpected status: %d", w.Code)
-	} else if w.Body.String() != `{"error":"error parsing query: found EOF, expected identifier, string, number, bool at line 1, char 8"}` {
-		t.Fatalf("unexpected body: %s", w.Body.String())
-	}
-}
-
-// Ensure the handler returns a status 401 if the user is not authorized.
-// func TestHandler_Query_ErrUnauthorized(t *testing.T) {
-// 	h := NewHandler(false)
-// 	h.QueryExecutor.AuthorizeFn = func(u *meta.UserInfo, q *influxql.Query, db string) error {
-// 		return errors.New("marker")
-// 	}
-
-// 	w := httptest.NewRecorder()
-// 	h.ServeHTTP(w, MustNewJSONRequest("GET", "/query?u=bar&db=foo&q=SHOW+SERIES+FROM+bar", nil))
-// 	if w.Code != http.StatusUnauthorized {
-// 		t.Fatalf("unexpected status: %d", w.Code)
-// 	}
-// }
-
-// Ensure the handler returns a status 500 if an error is returned from the query executor.
-func TestHandler_Query_ErrExecuteQuery(t *testing.T) {
-	h := NewHandler(false)
-	h.QueryExecutor.ExecuteQueryFn = func(q *influxql.Query, db string, chunkSize int) (<-chan *influxql.Result, error) {
-		return nil, errors.New("marker")
-	}
-
-	w := httptest.NewRecorder()
-	h.ServeHTTP(w, MustNewJSONRequest("GET", "/query?db=foo&q=SHOW+SERIES+FROM+bar", nil))
-	if w.Code != http.StatusInternalServerError {
-		t.Fatalf("unexpected status: %d", w.Code)
-	}
-}
-
-// Ensure the handler returns a status 200 if an error is returned in the result.
-func TestHandler_Query_ErrResult(t *testing.T) {
-	h := NewHandler(false)
-	h.QueryExecutor.ExecuteQueryFn = func(q *influxql.Query, db string, chunkSize int) (<-chan *influxql.Result, error) {
-		return NewResultChan(&influxql.Result{Err: errors.New("measurement not found")}), nil
-	}
-
-	w := httptest.NewRecorder()
-	h.ServeHTTP(w, MustNewJSONRequest("GET", "/query?db=foo&q=SHOW+SERIES+from+bin", nil))
-	if w.Code != http.StatusOK {
-		t.Fatalf("unexpected status: %d", w.Code)
-	} else if w.Body.String() != `{"results":[{"error":"measurement not found"}]}` {
-		t.Fatalf("unexpected body: %s", w.Body.String())
-	}
-}
-
-// Ensure the handler handles ping requests correctly.
-func TestHandler_Ping(t *testing.T) {
-	h := NewHandler(false)
-	w := httptest.NewRecorder()
-	h.ServeHTTP(w, MustNewRequest("GET", "/ping", nil))
-	if w.Code != http.StatusNoContent {
-		t.Fatalf("unexpected status: %d", w.Code)
-	}
-	h.ServeHTTP(w, MustNewRequest("HEAD", "/ping", nil))
-	if w.Code != http.StatusNoContent {
-		t.Fatalf("unexpected status: %d", w.Code)
-	}
-}
-
-// Ensure the handler handles ping requests correctly, when waiting for leader.
-func TestHandler_PingWaitForLeader(t *testing.T) {
-	h := NewHandler(false)
-	w := httptest.NewRecorder()
-	h.ServeHTTP(w, MustNewRequest("GET", "/ping?wait_for_leader=1s", nil))
-	if w.Code != http.StatusNoContent {
-		t.Fatalf("unexpected status: %d", w.Code)
-	}
-	h.ServeHTTP(w, MustNewRequest("HEAD", "/ping?wait_for_leader=1s", nil))
-	if w.Code != http.StatusNoContent {
-		t.Fatalf("unexpected status: %d", w.Code)
-	}
-}
-
-// Ensure the handler handles ping requests correctly, when timeout expires waiting for leader.
-func TestHandler_PingWaitForLeaderTimeout(t *testing.T) {
-	h := NewHandler(false)
-	h.MetaStore.WaitForLeaderFn = func(d time.Duration) error {
-		return fmt.Errorf("timeout")
-	}
-	w := httptest.NewRecorder()
-	h.ServeHTTP(w, MustNewRequest("GET", "/ping?wait_for_leader=1s", nil))
-	if w.Code != http.StatusServiceUnavailable {
-		t.Fatalf("unexpected status: %d", w.Code)
-	}
-	h.ServeHTTP(w, MustNewRequest("HEAD", "/ping?wait_for_leader=1s", nil))
-	if w.Code != http.StatusServiceUnavailable {
-		t.Fatalf("unexpected status: %d", w.Code)
-	}
-}
-
-// Ensure the handler handles bad ping requests
-func TestHandler_PingWaitForLeaderBadRequest(t *testing.T) {
-	h := NewHandler(false)
-	w := httptest.NewRecorder()
-	h.ServeHTTP(w, MustNewRequest("GET", "/ping?wait_for_leader=1xxx", nil))
-	if w.Code != http.StatusBadRequest {
-		t.Fatalf("unexpected status: %d", w.Code)
-	}
-	h.ServeHTTP(w, MustNewRequest("HEAD", "/ping?wait_for_leader=abc", nil))
-	if w.Code != http.StatusBadRequest {
-		t.Fatalf("unexpected status: %d", w.Code)
-	}
-}
-
-// Ensure write endpoint can handle bad requests
-func TestHandler_HandleBadRequestBody(t *testing.T) {
-	b := bytes.NewReader(make([]byte, 10))
-	h := NewHandler(false)
-	w := httptest.NewRecorder()
-	h.ServeHTTP(w, MustNewRequest("POST", "/write", b))
-	if w.Code != http.StatusBadRequest {
-		t.Fatalf("unexpected status: %d", w.Code)
-	}
-}
-
-func TestMarshalJSON_NoPretty(t *testing.T) {
-	if b := httpd.MarshalJSON(struct {
-		Name string `json:"name"`
-	}{Name: "foo"}, false); string(b) != `{"name":"foo"}` {
-		t.Fatalf("unexpected bytes: %s", b)
-	}
-}
-
-func TestMarshalJSON_Pretty(t *testing.T) {
-	if b := httpd.MarshalJSON(struct {
-		Name string `json:"name"`
-	}{Name: "foo"}, true); string(b) != "{\n    \"name\": \"foo\"\n}" {
-		t.Fatalf("unexpected bytes: %q", string(b))
-	}
-}
-
-func TestMarshalJSON_Error(t *testing.T) {
-	if b := httpd.MarshalJSON(&invalidJSON{}, true); string(b) != "json: error calling MarshalJSON for type *httpd_test.invalidJSON: marker" {
-		t.Fatalf("unexpected bytes: %q", string(b))
-	}
-}
-
-type invalidJSON struct{}
-
-func (*invalidJSON) MarshalJSON() ([]byte, error) { return nil, errors.New("marker") }
-
-func TestNormalizeBatchPoints(t *testing.T) {
-	now := time.Now()
-	tests := []struct {
-		name string
-		bp   client.BatchPoints
-		p    []models.Point
-		err  string
-	}{
-		{
-			name: "default",
-			bp: client.BatchPoints{
-				Points: []client.Point{
-					{Measurement: "cpu", Tags: map[string]string{"region": "useast"}, Time: now, Fields: map[string]interface{}{"value": 1.0}},
-				},
-			},
-			p: []models.Point{
-				models.MustNewPoint("cpu", map[string]string{"region": "useast"}, map[string]interface{}{"value": 1.0}, now),
-			},
-		},
-		{
-			name: "merge time",
-			bp: client.BatchPoints{
-				Time: now,
-				Points: []client.Point{
-					{Measurement: "cpu", Tags: map[string]string{"region": "useast"}, Fields: map[string]interface{}{"value": 1.0}},
-				},
-			},
-			p: []models.Point{
-				models.MustNewPoint("cpu", map[string]string{"region": "useast"}, map[string]interface{}{"value": 1.0}, now),
-			},
-		},
-		{
-			name: "merge tags",
-			bp: client.BatchPoints{
-				Tags: map[string]string{"day": "monday"},
-				Points: []client.Point{
-					{Measurement: "cpu", Tags: map[string]string{"region": "useast"}, Time: now, Fields: map[string]interface{}{"value": 1.0}},
-					{Measurement: "memory", Time: now, Fields: map[string]interface{}{"value": 2.0}},
-				},
-			},
-			p: []models.Point{
-				models.MustNewPoint("cpu", map[string]string{"day": "monday", "region": "useast"}, map[string]interface{}{"value": 1.0}, now),
-				models.MustNewPoint("memory", map[string]string{"day": "monday"}, map[string]interface{}{"value": 2.0}, now),
-			},
-		},
-	}
-
-	for _, test := range tests {
-		t.Logf("running test %q", test.name)
-		p, e := httpd.NormalizeBatchPoints(test.bp)
-		if test.err == "" && e != nil {
-			t.Errorf("unexpected error %v", e)
-		} else if test.err != "" && e == nil {
-			t.Errorf("expected error %s, got <nil>", test.err)
-		} else if e != nil && test.err != e.Error() {
-			t.Errorf("unexpected error. expected: %s, got %v", test.err, e)
-		}
-		if !reflect.DeepEqual(p, test.p) {
-			t.Logf("expected: %+v", test.p)
-			t.Logf("got:      %+v", p)
-			t.Error("failed to normalize.")
-		}
-	}
-}
-
-// NewHandler represents a test wrapper for httpd.Handler.
-type Handler struct {
-	*httpd.Handler
-	MetaStore     HandlerMetaStore
-	QueryExecutor HandlerQueryExecutor
-	TSDBStore     HandlerTSDBStore
-}
-
-// NewHandler returns a new instance of Handler.
-func NewHandler(requireAuthentication bool) *Handler {
-	statMap := influxdb.NewStatistics("httpd", "httpd", nil)
-	h := &Handler{
-		Handler: httpd.NewHandler(requireAuthentication, true, false, statMap),
-	}
-	h.Handler.MetaStore = &h.MetaStore
-	h.Handler.QueryExecutor = &h.QueryExecutor
-	h.Handler.Version = "0.0.0"
-	return h
-}
-
-// HandlerMetaStore is a mock implementation of Handler.MetaStore.
-type HandlerMetaStore struct {
-	WaitForLeaderFn func(d time.Duration) error
-	DatabaseFn      func(name string) (*meta.DatabaseInfo, error)
-	AuthenticateFn  func(username, password string) (ui *meta.UserInfo, err error)
-	UsersFn         func() ([]meta.UserInfo, error)
-}
-
-func (s *HandlerMetaStore) WaitForLeader(d time.Duration) error {
-	if s.WaitForLeaderFn == nil {
-		// Default behaviour is to assume there is a leader.
-		return nil
-	}
-	return s.WaitForLeaderFn(d)
-}
-
-func (s *HandlerMetaStore) Database(name string) (*meta.DatabaseInfo, error) {
-	return s.DatabaseFn(name)
-}
-
-func (s *HandlerMetaStore) Authenticate(username, password string) (ui *meta.UserInfo, err error) {
-	return s.AuthenticateFn(username, password)
-}
-
-func (s *HandlerMetaStore) Users() ([]meta.UserInfo, error) {
-	return s.UsersFn()
-}
-
-// HandlerQueryExecutor is a mock implementation of Handler.QueryExecutor.
-type HandlerQueryExecutor struct {
-	AuthorizeFn    func(u *meta.UserInfo, q *influxql.Query, db string) error
-	ExecuteQueryFn func(q *influxql.Query, db string, chunkSize int) (<-chan *influxql.Result, error)
-}
-
-func (e *HandlerQueryExecutor) Authorize(u *meta.UserInfo, q *influxql.Query, db string) error {
-	return e.AuthorizeFn(u, q, db)
-}
-
-func (e *HandlerQueryExecutor) ExecuteQuery(q *influxql.Query, db string, chunkSize int) (<-chan *influxql.Result, error) {
-	return e.ExecuteQueryFn(q, db, chunkSize)
-}
-
-// HandlerTSDBStore is a mock implementation of Handler.TSDBStore
-type HandlerTSDBStore struct {
-	CreateMapperFn func(shardID uint64, query string, chunkSize int) (tsdb.Mapper, error)
-}
-
-func (h *HandlerTSDBStore) CreateMapper(shardID uint64, query string, chunkSize int) (tsdb.Mapper, error) {
-	return h.CreateMapperFn(shardID, query, chunkSize)
-}
-
-// MustNewRequest returns a new HTTP request. Panic on error.
-func MustNewRequest(method, urlStr string, body io.Reader) *http.Request {
-	r, err := http.NewRequest(method, urlStr, body)
-	if err != nil {
-		panic(err.Error())
-	}
-	return r
-}
-
-// MustNewRequest returns a new HTTP request with the content type set. Panic on error.
-func MustNewJSONRequest(method, urlStr string, body io.Reader) *http.Request {
-	r := MustNewRequest(method, urlStr, body)
-	r.Header.Set("Content-Type", "application/json")
-	return r
-}
-
-// matchRegex returns true if a s matches pattern.
-func matchRegex(pattern, s string) bool {
-	return regexp.MustCompile(pattern).MatchString(s)
-}
-
-// NewResultChan returns a channel that sends all results and then closes.
-func NewResultChan(results ...*influxql.Result) <-chan *influxql.Result {
-	ch := make(chan *influxql.Result, len(results))
-	for _, r := range results {
-		ch <- r
-	}
-	close(ch)
-	return ch
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/httpd/response_logger.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/services/httpd/response_logger.go
deleted file mode 100644
index a6b8acb36..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/httpd/response_logger.go
+++ /dev/null
@@ -1,153 +0,0 @@
-package httpd
-
-import (
-	"fmt"
-	"net"
-	"net/http"
-	"strconv"
-	"strings"
-	"time"
-)
-
-type loggingResponseWriter interface {
-	http.ResponseWriter
-	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) Flush() {
-	l.w.(http.Flusher).Flush()
-}
-
-func (l *responseLogger) Write(b []byte) (int, error) {
-	if l.status == 0 {
-		// Set status if WriteHeader has not been called
-		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 {
-	if l.status == 0 {
-		// This can happen if we never actually write data, but only set response headers.
-		l.status = http.StatusOK
-	}
-	return l.status
-}
-
-func (l *responseLogger) Size() int {
-	return l.size
-}
-
-// redact any occurrence of a password parameter, 'p'
-func redactPassword(r *http.Request) {
-	q := r.URL.Query()
-	if p := q.Get("p"); p != "" {
-		q.Set("p", "[REDACTED]")
-		r.URL.RawQuery = q.Encode()
-	}
-}
-
-// Common Log Format: http://en.wikipedia.org/wiki/Common_Log_Format
-
-// buildLogLine creates a common log format
-// in addition to the common fields, we also append referrer, user agent and request ID
-func buildLogLine(l *responseLogger, r *http.Request, start time.Time) string {
-
-	redactPassword(r)
-
-	username := parseUsername(r)
-
-	host, _, err := net.SplitHostPort(r.RemoteAddr)
-
-	if err != nil {
-		host = r.RemoteAddr
-	}
-
-	uri := r.URL.RequestURI()
-
-	referer := r.Referer()
-
-	userAgent := r.UserAgent()
-
-	fields := []string{
-		host,
-		"-",
-		detect(username, "-"),
-		fmt.Sprintf("[%s]", start.Format("02/Jan/2006:15:04:05 -0700")),
-		r.Method,
-		uri,
-		r.Proto,
-		detect(strconv.Itoa(l.Status()), "-"),
-		strconv.Itoa(l.Size()),
-		detect(referer, "-"),
-		detect(userAgent, "-"),
-		r.Header.Get("Request-Id"),
-		fmt.Sprintf("%s", time.Since(start)),
-	}
-
-	return strings.Join(fields, " ")
-}
-
-// detect detects the first presense of a non blank string and returns it
-func detect(values ...string) string {
-	for _, v := range values {
-		if v != "" {
-			return v
-		}
-	}
-	return ""
-}
-
-// parses the username either from the url or auth header
-func parseUsername(r *http.Request) string {
-	var (
-		username = ""
-		url      = r.URL
-	)
-
-	// get username from the url if passed there
-	if url.User != nil {
-		if name := url.User.Username(); name != "" {
-			username = name
-		}
-	}
-
-	// Try to get the username from the query param 'u'
-	q := url.Query()
-	if u := q.Get("u"); u != "" {
-		username = u
-	}
-
-	// Try to get it from the authorization header if set there
-	if username == "" {
-		if u, _, ok := r.BasicAuth(); ok {
-			username = u
-		}
-	}
-	return username
-}
-
-// Sanitize passwords from query string for logging.
-func sanitize(r *http.Request, s string) {
-	r.URL.RawQuery = strings.Replace(r.URL.RawQuery, s, "[REDACTED]", -1)
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/httpd/service.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/services/httpd/service.go
deleted file mode 100644
index 0c063af20..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/httpd/service.go
+++ /dev/null
@@ -1,137 +0,0 @@
-package httpd
-
-import (
-	"crypto/tls"
-	"expvar"
-	"fmt"
-	"log"
-	"net"
-	"net/http"
-	"os"
-	"strings"
-
-	"github.com/influxdb/influxdb"
-)
-
-// statistics gathered by the httpd package.
-const (
-	statRequest                      = "req"               // Number of HTTP requests served
-	statCQRequest                    = "cqReq"             // Number of CQ-execute requests served
-	statQueryRequest                 = "queryReq"          // Number of query requests served
-	statWriteRequest                 = "writeReq"          // Number of write requests serverd
-	statPingRequest                  = "pingReq"           // Number of ping requests served
-	statWriteRequestBytesReceived    = "writeReqBytes"     // Sum of all bytes in write requests
-	statQueryRequestBytesTransmitted = "queryRespBytes"    // Sum of all bytes returned in query reponses
-	statPointsWrittenOK              = "pointsWritteOk"    // Number of points written OK
-	statPointsWrittenFail            = "pointsWrittenFail" // Number of points that failed to be written
-	statAuthFail                     = "authFail"          // Number of authentication failures
-)
-
-// Service manages the listener and handler for an HTTP endpoint.
-type Service struct {
-	ln    net.Listener
-	addr  string
-	https bool
-	cert  string
-	err   chan error
-
-	Handler *Handler
-
-	Logger  *log.Logger
-	statMap *expvar.Map
-}
-
-// NewService returns a new instance of Service.
-func NewService(c Config) *Service {
-	// Configure expvar monitoring. It's OK to do this even if the service fails to open and
-	// should be done before any data could arrive for the service.
-	key := strings.Join([]string{"httpd", c.BindAddress}, ":")
-	tags := map[string]string{"bind": c.BindAddress}
-	statMap := influxdb.NewStatistics(key, "httpd", tags)
-
-	s := &Service{
-		addr:  c.BindAddress,
-		https: c.HTTPSEnabled,
-		cert:  c.HTTPSCertificate,
-		err:   make(chan error),
-		Handler: NewHandler(
-			c.AuthEnabled,
-			c.LogEnabled,
-			c.WriteTracing,
-			statMap,
-		),
-		Logger: log.New(os.Stderr, "[httpd] ", log.LstdFlags),
-	}
-	s.Handler.Logger = s.Logger
-	return s
-}
-
-// Open starts the service
-func (s *Service) Open() error {
-	s.Logger.Println("Starting HTTP service")
-	s.Logger.Println("Authentication enabled:", s.Handler.requireAuthentication)
-
-	// Open listener.
-	if s.https {
-		cert, err := tls.LoadX509KeyPair(s.cert, s.cert)
-		if err != nil {
-			return err
-		}
-
-		listener, err := tls.Listen("tcp", s.addr, &tls.Config{
-			Certificates: []tls.Certificate{cert},
-		})
-		if err != nil {
-			return err
-		}
-
-		s.Logger.Println("Listening on HTTPS:", listener.Addr().String())
-		s.ln = listener
-	} else {
-		listener, err := net.Listen("tcp", s.addr)
-		if err != nil {
-			return err
-		}
-
-		s.Logger.Println("Listening on HTTP:", listener.Addr().String())
-		s.ln = listener
-	}
-
-	// Begin listening for requests in a separate goroutine.
-	go s.serve()
-	return nil
-}
-
-// Close closes the underlying listener.
-func (s *Service) Close() error {
-	if s.ln != nil {
-		return s.ln.Close()
-	}
-	return nil
-}
-
-// SetLogger sets the internal logger to the logger passed in.
-func (s *Service) SetLogger(l *log.Logger) {
-	s.Logger = l
-}
-
-// Err returns a channel for fatal errors that occur on the listener.
-func (s *Service) Err() <-chan error { return s.err }
-
-// Addr returns the listener's address. Returns nil if listener is closed.
-func (s *Service) Addr() net.Addr {
-	if s.ln != nil {
-		return s.ln.Addr()
-	}
-	return nil
-}
-
-// serve serves the handler from the listener.
-func (s *Service) serve() {
-	// The listener was closed so exit
-	// See https://github.com/golang/go/issues/4373
-	err := http.Serve(s.ln, s.Handler)
-	if err != nil && !strings.Contains(err.Error(), "closed") {
-		s.err <- fmt.Errorf("listener failed: addr=%s, err=%s", s.Addr(), err)
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/opentsdb/README.md b/Godeps/_workspace/src/github.com/influxdb/influxdb/services/opentsdb/README.md
deleted file mode 100644
index fe84a3065..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/opentsdb/README.md
+++ /dev/null
@@ -1,10 +0,0 @@
-openTSDB Input
-============
-InfluxDB supports both the telnet and HTTP openTSDB protocol. This means that InfluxDB can act as a drop-in replacement for your openTSDB system.
-
-## Configuration
-The openTSDB input allows the binding address, target database, and target retention policy within that database, to be set. If the database does not exist, it will be created automatically when the input is initialized. If you also decide to configure retention policy (without configuration the input will use the auto-created default retention policy), both the database and retention policy must already exist.
-
-The write-consistency-level can also be set. If any write operations do not meet the configured consistency guarantees, an error will occur and the data will not be indexed. The default consistency-level is `ONE`.
-
-The openTSDB input also performs internal batching of the points it receives, as batched writes to the database are more efficient. The default _batch size_ is 1000, _pending batch_ factor is 5, with a _batch timeout_ of 1 second. This means the input will write batches of maximum size 1000, but if a batch has not reached 1000 points within 1 second of the first point being added to a batch, it will emit that batch regardless of size. The pending batch factor controls how many batches can be in memory at once, allowing the input to transmit a batch, while still building other batches.
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/opentsdb/config.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/services/opentsdb/config.go
deleted file mode 100644
index 5c17ba675..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/opentsdb/config.go
+++ /dev/null
@@ -1,57 +0,0 @@
-package opentsdb
-
-import (
-	"time"
-
-	"github.com/influxdb/influxdb/toml"
-)
-
-const (
-	// DefaultBindAddress is the default address that the service binds to.
-	DefaultBindAddress = ":4242"
-
-	// DefaultDatabase is the default database used for writes.
-	DefaultDatabase = "opentsdb"
-
-	// DefaultRetentionPolicy is the default retention policy used for writes.
-	DefaultRetentionPolicy = ""
-
-	// DefaultConsistencyLevel is the default write consistency level.
-	DefaultConsistencyLevel = "one"
-
-	// DefaultBatchSize is the default Graphite batch size.
-	DefaultBatchSize = 1000
-
-	// DefaultBatchTimeout is the default Graphite batch timeout.
-	DefaultBatchTimeout = time.Second
-
-	// DefaultBatchPending is the default number of batches that can be in the queue.
-	DefaultBatchPending = 5
-)
-
-type Config struct {
-	Enabled          bool          `toml:"enabled"`
-	BindAddress      string        `toml:"bind-address"`
-	Database         string        `toml:"database"`
-	RetentionPolicy  string        `toml:"retention-policy"`
-	ConsistencyLevel string        `toml:"consistency-level"`
-	TLSEnabled       bool          `toml:"tls-enabled"`
-	Certificate      string        `toml:"certificate"`
-	BatchSize        int           `toml:"batch-size"`
-	BatchPending     int           `toml:"batch-pending"`
-	BatchTimeout     toml.Duration `toml:"batch-timeout"`
-}
-
-func NewConfig() Config {
-	return Config{
-		BindAddress:      DefaultBindAddress,
-		Database:         DefaultDatabase,
-		RetentionPolicy:  DefaultRetentionPolicy,
-		ConsistencyLevel: DefaultConsistencyLevel,
-		TLSEnabled:       false,
-		Certificate:      "/etc/ssl/influxdb.pem",
-		BatchSize:        DefaultBatchSize,
-		BatchPending:     DefaultBatchPending,
-		BatchTimeout:     toml.Duration(DefaultBatchTimeout),
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/opentsdb/config_test.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/services/opentsdb/config_test.go
deleted file mode 100644
index 53d9e3a80..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/opentsdb/config_test.go
+++ /dev/null
@@ -1,38 +0,0 @@
-package opentsdb_test
-
-import (
-	"testing"
-
-	"github.com/BurntSushi/toml"
-	"github.com/influxdb/influxdb/services/opentsdb"
-)
-
-func TestConfig_Parse(t *testing.T) {
-	// Parse configuration.
-	var c opentsdb.Config
-	if _, err := toml.Decode(`
-enabled = true
-bind-address = ":9000"
-database = "xxx"
-consistency-level ="all"
-tls-enabled = true
-certificate = "/etc/ssl/cert.pem"
-`, &c); err != nil {
-		t.Fatal(err)
-	}
-
-	// Validate configuration.
-	if c.Enabled != true {
-		t.Fatalf("unexpected enabled: %v", c.Enabled)
-	} else if c.BindAddress != ":9000" {
-		t.Fatalf("unexpected bind address: %s", c.BindAddress)
-	} else if c.Database != "xxx" {
-		t.Fatalf("unexpected database: %s", c.Database)
-	} else if c.ConsistencyLevel != "all" {
-		t.Fatalf("unexpected consistency-level: %s", c.ConsistencyLevel)
-	} else if c.TLSEnabled != true {
-		t.Fatalf("unexpected tls-enabled: %v", c.TLSEnabled)
-	} else if c.Certificate != "/etc/ssl/cert.pem" {
-		t.Fatalf("unexpected certificate: %s", c.Certificate)
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/opentsdb/handler.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/services/opentsdb/handler.go
deleted file mode 100644
index d011c05c8..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/opentsdb/handler.go
+++ /dev/null
@@ -1,186 +0,0 @@
-package opentsdb
-
-import (
-	"bufio"
-	"compress/gzip"
-	"encoding/json"
-	"errors"
-	"io"
-	"log"
-	"net"
-	"net/http"
-	"time"
-
-	"github.com/influxdb/influxdb"
-	"github.com/influxdb/influxdb/cluster"
-	"github.com/influxdb/influxdb/models"
-)
-
-type Handler struct {
-	Database         string
-	RetentionPolicy  string
-	ConsistencyLevel cluster.ConsistencyLevel
-
-	PointsWriter interface {
-		WritePoints(p *cluster.WritePointsRequest) error
-	}
-
-	Logger *log.Logger
-}
-
-func (h *Handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
-	switch r.URL.Path {
-	case "/api/metadata/put":
-		w.WriteHeader(http.StatusNoContent)
-	case "/api/put":
-		h.servePut(w, r)
-	default:
-		http.NotFound(w, r)
-	}
-}
-
-// ServeHTTP implements OpenTSDB's HTTP /api/put endpoint
-func (h *Handler) servePut(w http.ResponseWriter, r *http.Request) {
-	defer r.Body.Close()
-
-	// Require POST method.
-	if r.Method != "POST" {
-		http.Error(w, http.StatusText(http.StatusMethodNotAllowed), http.StatusMethodNotAllowed)
-		return
-	}
-
-	// Wrap reader if it's gzip encoded.
-	var br *bufio.Reader
-	if r.Header.Get("Content-Encoding") == "gzip" {
-		zr, err := gzip.NewReader(r.Body)
-		if err != nil {
-			http.Error(w, "could not read gzip, "+err.Error(), http.StatusBadRequest)
-			return
-		}
-
-		br = bufio.NewReader(zr)
-	} else {
-		br = bufio.NewReader(r.Body)
-	}
-
-	// Lookahead at the first byte.
-	f, err := br.Peek(1)
-	if err != nil || len(f) != 1 {
-		http.Error(w, "peek error: "+err.Error(), http.StatusBadRequest)
-		return
-	}
-
-	// Peek to see if this is a JSON array.
-	var multi bool
-	switch f[0] {
-	case '{':
-	case '[':
-		multi = true
-	default:
-		http.Error(w, "expected JSON array or hash", http.StatusBadRequest)
-		return
-	}
-
-	// Decode JSON data into slice of points.
-	dps := make([]point, 1)
-	if dec := json.NewDecoder(br); multi {
-		if err = dec.Decode(&dps); err != nil {
-			http.Error(w, "json array decode error", http.StatusBadRequest)
-			return
-		}
-	} else {
-		if err = dec.Decode(&dps[0]); err != nil {
-			http.Error(w, "json object decode error", http.StatusBadRequest)
-			return
-		}
-	}
-
-	// Convert points into TSDB points.
-	points := make([]models.Point, 0, len(dps))
-	for i := range dps {
-		p := dps[i]
-
-		// Convert timestamp to Go time.
-		// If time value is over a billion then it's microseconds.
-		var ts time.Time
-		if p.Time < 10000000000 {
-			ts = time.Unix(p.Time, 0)
-		} else {
-			ts = time.Unix(p.Time/1000, (p.Time%1000)*1000)
-		}
-
-		pt, err := models.NewPoint(p.Metric, p.Tags, map[string]interface{}{"value": p.Value}, ts)
-		if err != nil {
-			h.Logger.Printf("Dropping point %v: %v", p.Metric, err)
-			continue
-		}
-		points = append(points, pt)
-	}
-
-	// Write points.
-	if err := h.PointsWriter.WritePoints(&cluster.WritePointsRequest{
-		Database:         h.Database,
-		RetentionPolicy:  h.RetentionPolicy,
-		ConsistencyLevel: h.ConsistencyLevel,
-		Points:           points,
-	}); influxdb.IsClientError(err) {
-		h.Logger.Println("write series error: ", err)
-		http.Error(w, "write series error: "+err.Error(), http.StatusBadRequest)
-		return
-	} else if err != nil {
-		h.Logger.Println("write series error: ", err)
-		http.Error(w, "write series error: "+err.Error(), http.StatusInternalServerError)
-		return
-	}
-
-	w.WriteHeader(http.StatusNoContent)
-}
-
-// chanListener represents a listener that receives connections through a channel.
-type chanListener struct {
-	addr net.Addr
-	ch   chan net.Conn
-}
-
-// newChanListener returns a new instance of chanListener.
-func newChanListener(addr net.Addr) *chanListener {
-	return &chanListener{
-		addr: addr,
-		ch:   make(chan net.Conn),
-	}
-}
-
-func (ln *chanListener) Accept() (net.Conn, error) {
-	conn, ok := <-ln.ch
-	if !ok {
-		return nil, errors.New("network connection closed")
-	}
-	log.Println("TSDB listener accept ", conn)
-	return conn, nil
-}
-
-// Close closes the connection channel.
-func (ln *chanListener) Close() error {
-	close(ln.ch)
-	return nil
-}
-
-// Addr returns the network address of the listener.
-func (ln *chanListener) Addr() net.Addr { return ln.addr }
-
-// readerConn represents a net.Conn with an assignable reader.
-type readerConn struct {
-	net.Conn
-	r io.Reader
-}
-
-// Read implements the io.Reader interface.
-func (conn *readerConn) Read(b []byte) (n int, err error) { return conn.r.Read(b) }
-
-// point represents an incoming JSON data point.
-type point struct {
-	Metric string            `json:"metric"`
-	Time   int64             `json:"timestamp"`
-	Value  float64           `json:"value"`
-	Tags   map[string]string `json:"tags,omitempty"`
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/opentsdb/service.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/services/opentsdb/service.go
deleted file mode 100644
index 5de12341b..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/opentsdb/service.go
+++ /dev/null
@@ -1,383 +0,0 @@
-package opentsdb
-
-import (
-	"bufio"
-	"bytes"
-	"crypto/tls"
-	"expvar"
-	"io"
-	"log"
-	"net"
-	"net/http"
-	"net/textproto"
-	"os"
-	"strconv"
-	"strings"
-	"sync"
-	"time"
-
-	"github.com/influxdb/influxdb"
-	"github.com/influxdb/influxdb/cluster"
-	"github.com/influxdb/influxdb/meta"
-	"github.com/influxdb/influxdb/models"
-	"github.com/influxdb/influxdb/tsdb"
-)
-
-const leaderWaitTimeout = 30 * time.Second
-
-// statistics gathered by the openTSDB package.
-const (
-	statHTTPConnectionsHandled   = "httpConnsHandled"
-	statTelnetConnectionsActive  = "tlConnsActive"
-	statTelnetConnectionsHandled = "tlConnsHandled"
-	statTelnetPointsReceived     = "tlPointsRx"
-	statTelnetBytesReceived      = "tlBytesRx"
-	statTelnetReadError          = "tlReadErr"
-	statTelnetBadLine            = "tlBadLine"
-	statTelnetBadTime            = "tlBadTime"
-	statTelnetBadTag             = "tlBadTag"
-	statTelnetBadFloat           = "tlBadFloat"
-	statBatchesTrasmitted        = "batchesTx"
-	statPointsTransmitted        = "pointsTx"
-	statBatchesTransmitFail      = "batchesTxFail"
-	statConnectionsActive        = "connsActive"
-	statConnectionsHandled       = "connsHandled"
-)
-
-// Service manages the listener and handler for an HTTP endpoint.
-type Service struct {
-	ln     net.Listener  // main listener
-	httpln *chanListener // http channel-based listener
-
-	mu   sync.Mutex
-	wg   sync.WaitGroup
-	done chan struct{}
-	err  chan error
-	tls  bool
-	cert string
-
-	BindAddress      string
-	Database         string
-	RetentionPolicy  string
-	ConsistencyLevel cluster.ConsistencyLevel
-
-	PointsWriter interface {
-		WritePoints(p *cluster.WritePointsRequest) error
-	}
-	MetaStore interface {
-		WaitForLeader(d time.Duration) error
-		CreateDatabaseIfNotExists(name string) (*meta.DatabaseInfo, error)
-	}
-
-	// Points received over the telnet protocol are batched.
-	batchSize    int
-	batchPending int
-	batchTimeout time.Duration
-	batcher      *tsdb.PointBatcher
-
-	Logger  *log.Logger
-	statMap *expvar.Map
-}
-
-// NewService returns a new instance of Service.
-func NewService(c Config) (*Service, error) {
-	consistencyLevel, err := cluster.ParseConsistencyLevel(c.ConsistencyLevel)
-	if err != nil {
-		return nil, err
-	}
-
-	s := &Service{
-		done:             make(chan struct{}),
-		tls:              c.TLSEnabled,
-		cert:             c.Certificate,
-		err:              make(chan error),
-		BindAddress:      c.BindAddress,
-		Database:         c.Database,
-		RetentionPolicy:  c.RetentionPolicy,
-		ConsistencyLevel: consistencyLevel,
-		batchSize:        c.BatchSize,
-		batchPending:     c.BatchPending,
-		batchTimeout:     time.Duration(c.BatchTimeout),
-		Logger:           log.New(os.Stderr, "[opentsdb] ", log.LstdFlags),
-	}
-	return s, nil
-}
-
-// Open starts the service
-func (s *Service) Open() error {
-	s.mu.Lock()
-	defer s.mu.Unlock()
-
-	s.Logger.Println("Starting OpenTSDB service")
-
-	// Configure expvar monitoring. It's OK to do this even if the service fails to open and
-	// should be done before any data could arrive for the service.
-	key := strings.Join([]string{"opentsdb", s.BindAddress}, ":")
-	tags := map[string]string{"bind": s.BindAddress}
-	s.statMap = influxdb.NewStatistics(key, "opentsdb", tags)
-
-	if err := s.MetaStore.WaitForLeader(leaderWaitTimeout); err != nil {
-		s.Logger.Printf("Failed to detect a cluster leader: %s", err.Error())
-		return err
-	}
-
-	if _, err := s.MetaStore.CreateDatabaseIfNotExists(s.Database); err != nil {
-		s.Logger.Printf("Failed to ensure target database %s exists: %s", s.Database, err.Error())
-		return err
-	}
-
-	s.batcher = tsdb.NewPointBatcher(s.batchSize, s.batchPending, s.batchTimeout)
-	s.batcher.Start()
-
-	// Start processing batches.
-	s.wg.Add(1)
-	go s.processBatches(s.batcher)
-
-	// Open listener.
-	if s.tls {
-		cert, err := tls.LoadX509KeyPair(s.cert, s.cert)
-		if err != nil {
-			return err
-		}
-
-		listener, err := tls.Listen("tcp", s.BindAddress, &tls.Config{
-			Certificates: []tls.Certificate{cert},
-		})
-		if err != nil {
-			return err
-		}
-
-		s.Logger.Println("Listening on TLS:", listener.Addr().String())
-		s.ln = listener
-	} else {
-		listener, err := net.Listen("tcp", s.BindAddress)
-		if err != nil {
-			return err
-		}
-
-		s.Logger.Println("Listening on:", listener.Addr().String())
-		s.ln = listener
-	}
-	s.httpln = newChanListener(s.ln.Addr())
-
-	// Begin listening for connections.
-	s.wg.Add(2)
-	go s.serveHTTP()
-	go s.serve()
-
-	return nil
-}
-
-// Close closes the openTSDB service
-func (s *Service) Close() error {
-	s.mu.Lock()
-	defer s.mu.Unlock()
-
-	if s.ln != nil {
-		return s.ln.Close()
-	}
-
-	if s.batcher != nil {
-		s.batcher.Stop()
-	}
-	close(s.done)
-	s.wg.Wait()
-	return nil
-}
-
-// SetLogger sets the internal logger to the logger passed in.
-func (s *Service) SetLogger(l *log.Logger) { s.Logger = l }
-
-// Err returns a channel for fatal errors that occur on the listener.
-func (s *Service) Err() <-chan error { return s.err }
-
-// Addr returns the listener's address. Returns nil if listener is closed.
-func (s *Service) Addr() net.Addr {
-	if s.ln == nil {
-		return nil
-	}
-	return s.ln.Addr()
-}
-
-// serve serves the handler from the listener.
-func (s *Service) serve() {
-	defer s.wg.Done()
-
-	for {
-		// Wait for next connection.
-		conn, err := s.ln.Accept()
-		if opErr, ok := err.(*net.OpError); ok && !opErr.Temporary() {
-			s.Logger.Println("openTSDB TCP listener closed")
-			return
-		} else if err != nil {
-			s.Logger.Println("error accepting openTSDB: ", err.Error())
-			continue
-		}
-
-		// Handle connection in separate goroutine.
-		go s.handleConn(conn)
-	}
-}
-
-// handleConn processes conn. This is run in a separate goroutine.
-func (s *Service) handleConn(conn net.Conn) {
-	defer s.statMap.Add(statConnectionsActive, -1)
-	s.statMap.Add(statConnectionsActive, 1)
-	s.statMap.Add(statConnectionsHandled, 1)
-
-	// Read header into buffer to check if it's HTTP.
-	var buf bytes.Buffer
-	r := bufio.NewReader(io.TeeReader(conn, &buf))
-
-	// Attempt to parse connection as HTTP.
-	_, err := http.ReadRequest(r)
-
-	// Rebuild connection from buffer and remaining connection data.
-	bufr := bufio.NewReader(io.MultiReader(&buf, conn))
-	conn = &readerConn{Conn: conn, r: bufr}
-
-	// If no HTTP parsing error occurred then process as HTTP.
-	if err == nil {
-		s.statMap.Add(statHTTPConnectionsHandled, 1)
-		s.httpln.ch <- conn
-		return
-	}
-
-	// Otherwise handle in telnet format.
-	s.wg.Add(1)
-	s.handleTelnetConn(conn)
-}
-
-// handleTelnetConn accepts OpenTSDB's telnet protocol.
-// Each telnet command consists of a line of the form:
-//   put sys.cpu.user 1356998400 42.5 host=webserver01 cpu=0
-func (s *Service) handleTelnetConn(conn net.Conn) {
-	defer conn.Close()
-	defer s.wg.Done()
-	defer s.statMap.Add(statTelnetConnectionsActive, -1)
-	s.statMap.Add(statTelnetConnectionsActive, 1)
-	s.statMap.Add(statTelnetConnectionsHandled, 1)
-
-	// Get connection details.
-	remoteAddr := conn.RemoteAddr().String()
-
-	// Wrap connection in a text protocol reader.
-	r := textproto.NewReader(bufio.NewReader(conn))
-	for {
-		line, err := r.ReadLine()
-		if err != nil {
-			if err != io.EOF {
-				s.statMap.Add(statTelnetReadError, 1)
-				s.Logger.Println("error reading from openTSDB connection", err.Error())
-			}
-			return
-		}
-		s.statMap.Add(statTelnetPointsReceived, 1)
-		s.statMap.Add(statTelnetBytesReceived, int64(len(line)))
-
-		inputStrs := strings.Fields(line)
-
-		if len(inputStrs) == 1 && inputStrs[0] == "version" {
-			conn.Write([]byte("InfluxDB TSDB proxy"))
-			continue
-		}
-
-		if len(inputStrs) < 4 || inputStrs[0] != "put" {
-			s.statMap.Add(statTelnetBadLine, 1)
-			s.Logger.Printf("malformed line '%s' from %s", line, remoteAddr)
-			continue
-		}
-
-		measurement := inputStrs[1]
-		tsStr := inputStrs[2]
-		valueStr := inputStrs[3]
-		tagStrs := inputStrs[4:]
-
-		var t time.Time
-		ts, err := strconv.ParseInt(tsStr, 10, 64)
-		if err != nil {
-			s.statMap.Add(statTelnetBadTime, 1)
-			s.Logger.Printf("malformed time '%s' from %s", tsStr, remoteAddr)
-		}
-
-		switch len(tsStr) {
-		case 10:
-			t = time.Unix(ts, 0)
-			break
-		case 13:
-			t = time.Unix(ts/1000, (ts%1000)*1000)
-			break
-		default:
-			s.statMap.Add(statTelnetBadTime, 1)
-			s.Logger.Printf("bad time '%s' must be 10 or 13 chars, from %s ", tsStr, remoteAddr)
-			continue
-		}
-
-		tags := make(map[string]string)
-		for t := range tagStrs {
-			parts := strings.SplitN(tagStrs[t], "=", 2)
-			if len(parts) != 2 || parts[0] == "" || parts[1] == "" {
-				s.statMap.Add(statTelnetBadTag, 1)
-				s.Logger.Printf("malformed tag data '%v' from %s", tagStrs[t], remoteAddr)
-				continue
-			}
-			k := parts[0]
-
-			tags[k] = parts[1]
-		}
-
-		fields := make(map[string]interface{})
-		fv, err := strconv.ParseFloat(valueStr, 64)
-		if err != nil {
-			s.statMap.Add(statTelnetBadFloat, 1)
-			s.Logger.Printf("bad float '%s' from %s", valueStr, remoteAddr)
-			continue
-		}
-		fields["value"] = fv
-
-		pt, err := models.NewPoint(measurement, tags, fields, t)
-		if err != nil {
-			s.statMap.Add(statTelnetBadFloat, 1)
-			s.Logger.Printf("bad float '%s' from %s", valueStr, remoteAddr)
-			continue
-		}
-		s.batcher.In() <- pt
-	}
-}
-
-// serveHTTP handles connections in HTTP format.
-func (s *Service) serveHTTP() {
-	srv := &http.Server{Handler: &Handler{
-		Database:         s.Database,
-		RetentionPolicy:  s.RetentionPolicy,
-		ConsistencyLevel: s.ConsistencyLevel,
-		PointsWriter:     s.PointsWriter,
-		Logger:           s.Logger,
-	}}
-	srv.Serve(s.httpln)
-}
-
-// processBatches continually drains the given batcher and writes the batches to the database.
-func (s *Service) processBatches(batcher *tsdb.PointBatcher) {
-	defer s.wg.Done()
-	for {
-		select {
-		case batch := <-batcher.Out():
-			if err := s.PointsWriter.WritePoints(&cluster.WritePointsRequest{
-				Database:         s.Database,
-				RetentionPolicy:  s.RetentionPolicy,
-				ConsistencyLevel: s.ConsistencyLevel,
-				Points:           batch,
-			}); err == nil {
-				s.statMap.Add(statBatchesTrasmitted, 1)
-				s.statMap.Add(statPointsTransmitted, int64(len(batch)))
-			} else {
-				s.Logger.Printf("failed to write point batch to database %q: %s", s.Database, err)
-				s.statMap.Add(statBatchesTransmitFail, 1)
-			}
-
-		case <-s.done:
-			return
-		}
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/opentsdb/service_test.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/services/opentsdb/service_test.go
deleted file mode 100644
index 4d979486a..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/opentsdb/service_test.go
+++ /dev/null
@@ -1,167 +0,0 @@
-package opentsdb_test
-
-import (
-	"io/ioutil"
-	"log"
-	"net"
-	"net/http"
-	"reflect"
-	"strings"
-	"sync/atomic"
-	"testing"
-	"time"
-
-	"github.com/davecgh/go-spew/spew"
-	"github.com/influxdb/influxdb/cluster"
-	"github.com/influxdb/influxdb/meta"
-	"github.com/influxdb/influxdb/models"
-	"github.com/influxdb/influxdb/services/opentsdb"
-)
-
-// Ensure a point can be written via the telnet protocol.
-func TestService_Telnet(t *testing.T) {
-	t.Parallel()
-
-	s := NewService("db0")
-	if err := s.Open(); err != nil {
-		t.Fatal(err)
-	}
-	defer s.Close()
-
-	// Mock points writer.
-	var called int32
-	s.PointsWriter.WritePointsFn = func(req *cluster.WritePointsRequest) error {
-		atomic.StoreInt32(&called, 1)
-
-		if req.Database != "db0" {
-			t.Fatalf("unexpected database: %s", req.Database)
-		} else if req.RetentionPolicy != "" {
-			t.Fatalf("unexpected retention policy: %s", req.RetentionPolicy)
-		} else if !reflect.DeepEqual(req.Points, []models.Point{
-			models.MustNewPoint(
-				"sys.cpu.user",
-				map[string]string{"host": "webserver01", "cpu": "0"},
-				map[string]interface{}{"value": 42.5},
-				time.Unix(1356998400, 0),
-			),
-		}) {
-			spew.Dump(req.Points)
-			t.Fatalf("unexpected points: %#v", req.Points)
-		}
-		return nil
-	}
-
-	// Open connection to the service.
-	conn, err := net.Dial("tcp", s.Addr().String())
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer conn.Close()
-
-	// Write telnet data and close.
-	if _, err := conn.Write([]byte("put sys.cpu.user 1356998400 42.5 host=webserver01 cpu=0")); err != nil {
-		t.Fatal(err)
-	}
-	if err := conn.Close(); err != nil {
-		t.Fatal(err)
-	}
-	time.Sleep(10 * time.Millisecond)
-
-	// Verify that the writer was called.
-	if atomic.LoadInt32(&called) == 0 {
-		t.Fatal("points writer not called")
-	}
-}
-
-// Ensure a point can be written via the HTTP protocol.
-func TestService_HTTP(t *testing.T) {
-	t.Parallel()
-
-	s := NewService("db0")
-	if err := s.Open(); err != nil {
-		t.Fatal(err)
-	}
-	defer s.Close()
-
-	// Mock points writer.
-	var called bool
-	s.PointsWriter.WritePointsFn = func(req *cluster.WritePointsRequest) error {
-		called = true
-		if req.Database != "db0" {
-			t.Fatalf("unexpected database: %s", req.Database)
-		} else if req.RetentionPolicy != "" {
-			t.Fatalf("unexpected retention policy: %s", req.RetentionPolicy)
-		} else if !reflect.DeepEqual(req.Points, []models.Point{
-			models.MustNewPoint(
-				"sys.cpu.nice",
-				map[string]string{"dc": "lga", "host": "web01"},
-				map[string]interface{}{"value": 18.0},
-				time.Unix(1346846400, 0),
-			),
-		}) {
-			spew.Dump(req.Points)
-			t.Fatalf("unexpected points: %#v", req.Points)
-		}
-		return nil
-	}
-
-	// Write HTTP request to server.
-	resp, err := http.Post("http://"+s.Addr().String()+"/api/put", "application/json", strings.NewReader(`{"metric":"sys.cpu.nice", "timestamp":1346846400, "value":18, "tags":{"host":"web01", "dc":"lga"}}`))
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer resp.Body.Close()
-
-	// Verify status and body.
-	if resp.StatusCode != http.StatusNoContent {
-		t.Fatalf("unexpected status code: %d", resp.StatusCode)
-	}
-
-	// Verify that the writer was called.
-	if !called {
-		t.Fatal("points writer not called")
-	}
-}
-
-type Service struct {
-	*opentsdb.Service
-	PointsWriter PointsWriter
-}
-
-// NewService returns a new instance of Service.
-func NewService(database string) *Service {
-	srv, _ := opentsdb.NewService(opentsdb.Config{
-		BindAddress:      "127.0.0.1:0",
-		Database:         database,
-		ConsistencyLevel: "one",
-	})
-	s := &Service{Service: srv}
-	s.Service.PointsWriter = &s.PointsWriter
-	s.Service.MetaStore = &DatabaseCreator{}
-
-	if !testing.Verbose() {
-		s.Logger = log.New(ioutil.Discard, "", log.LstdFlags)
-	}
-
-	return s
-}
-
-// PointsWriter represents a mock impl of PointsWriter.
-type PointsWriter struct {
-	WritePointsFn func(*cluster.WritePointsRequest) error
-}
-
-func (w *PointsWriter) WritePoints(p *cluster.WritePointsRequest) error {
-	return w.WritePointsFn(p)
-}
-
-type DatabaseCreator struct {
-}
-
-func (d *DatabaseCreator) CreateDatabaseIfNotExists(name string) (*meta.DatabaseInfo, error) {
-	return nil, nil
-}
-
-func (d *DatabaseCreator) WaitForLeader(t time.Duration) error {
-	return nil
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/precreator/README.md b/Godeps/_workspace/src/github.com/influxdb/influxdb/services/precreator/README.md
deleted file mode 100644
index 8830b7310..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/precreator/README.md
+++ /dev/null
@@ -1,13 +0,0 @@
-Shard Precreation
-============
-
-During normal operation when InfluxDB receives time-series data, it writes the data to files known as _shards_. Each shard only contains data for a specific range of time. Therefore, before data can be accepted by the system, the shards must exist and InfluxDB always checks that the required shards exist for every incoming data point. If the required shards do not exist, InfluxDB will create those shards. Because this requires a cluster to reach consensus, the process is not instantaneous and can temporarily impact write-throughput.
-
-Since almost all time-series data is written sequentially in time, the system has an excellent idea of the timestamps of future data. Shard precreation takes advantage of this fact by creating required shards ahead of time, thereby ensuring the required shards exist by the time new time-series data actually arrives. Write-throughput is therefore not affected when data is first received for a range of time that would normally trigger shard creation.
-
-Note that the shard-existence check must remain in place in the code, even with shard precreation. This is because while most data is written sequentially in time, this is not always the case. Data may be written with timestamps in the past, or farther in the future than shard precreation handles.
-
-## Configuration
-Shard precreation can be disabled if necessary, though this is not recommended. If it is disabled, then shards will be only be created when explicitly needed.
-
-The interval between runs of the shard precreation service, as well as the time-in-advance the shards are created, are also configurable. The defaults should work for most deployments.
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/precreator/config.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/services/precreator/config.go
deleted file mode 100644
index af0f34b16..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/precreator/config.go
+++ /dev/null
@@ -1,32 +0,0 @@
-package precreator
-
-import (
-	"time"
-
-	"github.com/influxdb/influxdb/toml"
-)
-
-const (
-	// DefaultCheckInterval is the shard precreation check time if none is specified.
-	DefaultCheckInterval = 10 * time.Minute
-
-	// DefaultAdvancePeriod is the default period ahead of the endtime of a shard group
-	// that its successor group is created.
-	DefaultAdvancePeriod = 30 * time.Minute
-)
-
-// Config represents the configuration for shard precreation.
-type Config struct {
-	Enabled       bool          `toml:"enabled"`
-	CheckInterval toml.Duration `toml:"check-interval"`
-	AdvancePeriod toml.Duration `toml:"advance-period"`
-}
-
-// NewConfig returns a new Config with defaults.
-func NewConfig() Config {
-	return Config{
-		Enabled:       true,
-		CheckInterval: toml.Duration(DefaultCheckInterval),
-		AdvancePeriod: toml.Duration(DefaultAdvancePeriod),
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/precreator/config_test.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/services/precreator/config_test.go
deleted file mode 100644
index e24767283..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/precreator/config_test.go
+++ /dev/null
@@ -1,31 +0,0 @@
-package precreator_test
-
-import (
-	"testing"
-	"time"
-
-	"github.com/BurntSushi/toml"
-	"github.com/influxdb/influxdb/services/precreator"
-)
-
-func TestConfig_Parse(t *testing.T) {
-	// Parse configuration.
-	var c precreator.Config
-	if _, err := toml.Decode(`
-enabled = true
-check-interval = "2m"
-advance-period = "10m"
-`, &c); err != nil {
-
-		t.Fatal(err)
-	}
-
-	// Validate configuration.
-	if !c.Enabled {
-		t.Fatalf("unexpected enabled state: %v", c.Enabled)
-	} else if time.Duration(c.CheckInterval) != 2*time.Minute {
-		t.Fatalf("unexpected check interval: %s", c.CheckInterval)
-	} else if time.Duration(c.AdvancePeriod) != 10*time.Minute {
-		t.Fatalf("unexpected advance period: %s", c.AdvancePeriod)
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/precreator/service.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/services/precreator/service.go
deleted file mode 100644
index 9643a3ea2..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/precreator/service.go
+++ /dev/null
@@ -1,100 +0,0 @@
-package precreator
-
-import (
-	"log"
-	"os"
-	"sync"
-	"time"
-)
-
-type Service struct {
-	checkInterval time.Duration
-	advancePeriod time.Duration
-
-	Logger *log.Logger
-
-	done chan struct{}
-	wg   sync.WaitGroup
-
-	MetaStore interface {
-		IsLeader() bool
-		PrecreateShardGroups(now, cutoff time.Time) error
-	}
-}
-
-// NewService returns an instance of the precreation service.
-func NewService(c Config) (*Service, error) {
-	s := Service{
-		checkInterval: time.Duration(c.CheckInterval),
-		advancePeriod: time.Duration(c.AdvancePeriod),
-		Logger:        log.New(os.Stderr, "[shard-precreation] ", log.LstdFlags),
-	}
-
-	return &s, nil
-}
-
-// SetLogger sets the internal logger to the logger passed in.
-func (s *Service) SetLogger(l *log.Logger) {
-	s.Logger = l
-}
-
-// Open starts the precreation service.
-func (s *Service) Open() error {
-	if s.done != nil {
-		return nil
-	}
-
-	s.Logger.Printf("Starting precreation service with check interval of %s, advance period of %s",
-		s.checkInterval, s.advancePeriod)
-
-	s.done = make(chan struct{})
-
-	s.wg.Add(1)
-	go s.runPrecreation()
-	return nil
-}
-
-// Close stops the precreation service.
-func (s *Service) Close() error {
-	if s.done == nil {
-		return nil
-	}
-
-	close(s.done)
-	s.wg.Wait()
-	s.done = nil
-
-	return nil
-}
-
-// runPrecreation continually checks if resources need precreation.
-func (s *Service) runPrecreation() {
-	defer s.wg.Done()
-
-	for {
-		select {
-		case <-time.After(s.checkInterval):
-			// Only run this on the leader, but always allow the loop to check
-			// as the leader can change.
-			if !s.MetaStore.IsLeader() {
-				continue
-			}
-
-			if err := s.precreate(time.Now().UTC()); err != nil {
-				s.Logger.Printf("failed to precreate shards: %s", err.Error())
-			}
-		case <-s.done:
-			s.Logger.Println("Precreation service terminating")
-			return
-		}
-	}
-}
-
-// precreate performs actual resource precreation.
-func (s *Service) precreate(now time.Time) error {
-	cutoff := now.Add(s.advancePeriod).UTC()
-	if err := s.MetaStore.PrecreateShardGroups(now, cutoff); err != nil {
-		return err
-	}
-	return nil
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/precreator/service_test.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/services/precreator/service_test.go
deleted file mode 100644
index d8667ba4c..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/precreator/service_test.go
+++ /dev/null
@@ -1,59 +0,0 @@
-package precreator
-
-import (
-	"sync"
-	"testing"
-	"time"
-
-	"github.com/influxdb/influxdb/toml"
-)
-
-func Test_ShardPrecreation(t *testing.T) {
-	t.Parallel()
-
-	now := time.Now().UTC()
-	advancePeriod := 5 * time.Minute
-
-	// A test metastaore which returns 2 shard groups, only 1 of which requires a successor.
-	var wg sync.WaitGroup
-	wg.Add(1)
-	ms := metaStore{
-		PrecreateShardGroupsFn: func(v, u time.Time) error {
-			wg.Done()
-			if u != now.Add(advancePeriod) {
-				t.Fatalf("precreation called with wrong time, got %s, exp %s", u, now)
-			}
-			return nil
-		},
-	}
-
-	srv, err := NewService(Config{
-		CheckInterval: toml.Duration(time.Minute),
-		AdvancePeriod: toml.Duration(advancePeriod),
-	})
-	if err != nil {
-		t.Fatalf("failed to create shard precreation service: %s", err.Error())
-	}
-	srv.MetaStore = ms
-
-	err = srv.precreate(now)
-	if err != nil {
-		t.Fatalf("failed to precreate shards: %s", err.Error())
-	}
-
-	wg.Wait() // Ensure metastore test function is called.
-	return
-}
-
-// PointsWriter represents a mock impl of PointsWriter.
-type metaStore struct {
-	PrecreateShardGroupsFn func(now, cutoff time.Time) error
-}
-
-func (m metaStore) IsLeader() bool {
-	return true
-}
-
-func (m metaStore) PrecreateShardGroups(now, cutoff time.Time) error {
-	return m.PrecreateShardGroupsFn(now, cutoff)
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/registration/config.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/services/registration/config.go
deleted file mode 100644
index 7140c72fe..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/registration/config.go
+++ /dev/null
@@ -1,27 +0,0 @@
-package registration
-
-import (
-	"time"
-
-	"github.com/influxdb/influxdb/toml"
-)
-
-const (
-	DefaultURL           = "https://enterprise.influxdata.com"
-	DefaultStatsInterval = time.Minute
-)
-
-type Config struct {
-	Enabled       bool          `toml:"enabled"`
-	URL           string        `toml:"url"`
-	Token         string        `toml:"token"`
-	StatsInterval toml.Duration `toml:"stats-interval"`
-}
-
-func NewConfig() Config {
-	return Config{
-		Enabled:       true,
-		URL:           DefaultURL,
-		StatsInterval: toml.Duration(DefaultStatsInterval),
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/registration/config_test.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/services/registration/config_test.go
deleted file mode 100644
index 43840cb34..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/registration/config_test.go
+++ /dev/null
@@ -1,33 +0,0 @@
-package registration_test
-
-import (
-	"testing"
-	"time"
-
-	"github.com/BurntSushi/toml"
-	"github.com/influxdb/influxdb/services/registration"
-)
-
-func TestConfig_Parse(t *testing.T) {
-	// Parse configuration.
-	var c registration.Config
-	if _, err := toml.Decode(`
-enabled = true
-url = "a.b.c"
-token = "1234"
-stats-interval = "1s"
-`, &c); err != nil {
-		t.Fatal(err)
-	}
-
-	// Validate configuration.
-	if c.Enabled != true {
-		t.Fatalf("unexpected enabled state: %v", c.Enabled)
-	} else if c.URL != "a.b.c" {
-		t.Fatalf("unexpected Enterprise URL: %s", c.URL)
-	} else if c.Token != "1234" {
-		t.Fatalf("unexpected Enterprise URL: %s", c.URL)
-	} else if time.Duration(c.StatsInterval) != time.Second {
-		t.Fatalf("unexpected stats interval: %v", c.StatsInterval)
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/registration/service.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/services/registration/service.go
deleted file mode 100644
index ce19ac758..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/registration/service.go
+++ /dev/null
@@ -1,204 +0,0 @@
-package registration
-
-import (
-	"fmt"
-	"log"
-	"net/url"
-	"os"
-	"sync"
-	"time"
-
-	"github.com/influxdb/enterprise-client/v1"
-	"github.com/influxdb/influxdb/monitor"
-)
-
-// Service represents the registration service.
-type Service struct {
-	MetaStore interface {
-		ClusterID() (uint64, error)
-		NodeID() uint64
-	}
-	Monitor interface {
-		Statistics(tags map[string]string) ([]*monitor.Statistic, error)
-		RegisterDiagnosticsClient(name string, client monitor.DiagsClient)
-	}
-
-	enabled       bool
-	url           *url.URL
-	token         string
-	statsInterval time.Duration
-	version       string
-	mu            sync.Mutex
-	lastContact   time.Time
-
-	wg   sync.WaitGroup
-	done chan struct{}
-
-	logger *log.Logger
-}
-
-// NewService returns a configured registration service.
-func NewService(c Config, version string) (*Service, error) {
-	url, err := url.Parse(c.URL)
-	if err != nil {
-		return nil, err
-	}
-
-	return &Service{
-		enabled:       c.Enabled,
-		url:           url,
-		token:         c.Token,
-		statsInterval: time.Duration(c.StatsInterval),
-		version:       version,
-		done:          make(chan struct{}),
-		logger:        log.New(os.Stderr, "[registration] ", log.LstdFlags),
-	}, nil
-}
-
-// Open starts retention policy enforcement.
-func (s *Service) Open() error {
-	if !s.enabled {
-		return nil
-	}
-
-	s.logger.Println("Starting registration service")
-	if err := s.registerServer(); err != nil {
-		return err
-	}
-
-	// Register diagnostics if a Monitor service is available.
-	if s.Monitor != nil {
-		s.Monitor.RegisterDiagnosticsClient("registration", s)
-	}
-
-	s.wg.Add(1)
-	go s.reportStats()
-
-	return nil
-}
-
-// Close stops retention policy enforcement.
-func (s *Service) Close() error {
-	s.logger.Println("registration service terminating")
-	close(s.done)
-	s.wg.Wait()
-	return nil
-}
-
-func (s *Service) Diagnostics() (*monitor.Diagnostic, error) {
-	diagnostics := map[string]interface{}{
-		"URL":          s.url.String(),
-		"token":        s.token,
-		"last_contact": s.getLastContact().String(),
-	}
-
-	return monitor.DiagnosticFromMap(diagnostics), nil
-}
-
-// registerServer registers the server.
-func (s *Service) registerServer() error {
-	if !s.enabled || s.token == "" {
-		return nil
-	}
-
-	cl := client.New(s.token)
-	cl.URL = s.url.String()
-
-	clusterID, err := s.MetaStore.ClusterID()
-	if err != nil {
-		s.logger.Printf("failed to retrieve cluster ID for registration: %s", err.Error())
-		return err
-	}
-	hostname, err := os.Hostname()
-	if err != nil {
-		return err
-	}
-
-	server := client.Server{
-		ClusterID: fmt.Sprintf("%d", clusterID),
-		ServerID:  fmt.Sprintf("%d", s.MetaStore.NodeID()),
-		Host:      hostname,
-		Product:   "influxdb",
-		Version:   s.version,
-	}
-
-	s.wg.Add(1)
-	go func() {
-		defer s.wg.Done()
-
-		resp, err := cl.Save(server)
-
-		if err != nil {
-			s.logger.Printf("failed to register server with %s: received code %s, error: %s", s.url.String(), resp.Status, err)
-			return
-		}
-		s.updateLastContact(time.Now().UTC())
-	}()
-	return nil
-}
-
-func (s *Service) reportStats() {
-	defer s.wg.Done()
-	if s.token == "" {
-		// No reporting, for now, without token.
-		return
-	}
-
-	cl := client.New(s.token)
-	cl.URL = s.url.String()
-
-	clusterID, err := s.MetaStore.ClusterID()
-	if err != nil {
-		s.logger.Printf("failed to retrieve cluster ID for registration -- aborting stats upload: %s", err.Error())
-		return
-	}
-
-	t := time.NewTicker(s.statsInterval)
-	for {
-		select {
-		case <-t.C:
-			stats, err := s.Monitor.Statistics(nil)
-			if err != nil {
-				s.logger.Printf("failed to retrieve statistics: %s", err.Error())
-				continue
-			}
-
-			st := client.Stats{
-				Product:   "influxdb",
-				ClusterID: fmt.Sprintf("%d", clusterID),
-				ServerID:  fmt.Sprintf("%d", s.MetaStore.NodeID()),
-			}
-			data := make([]client.StatsData, len(stats))
-			for i, x := range stats {
-				data[i] = client.StatsData{
-					Name:   x.Name,
-					Tags:   x.Tags,
-					Values: x.Values,
-				}
-			}
-			st.Data = data
-
-			resp, err := cl.Save(st)
-			if err != nil {
-				s.logger.Printf("failed to post statistics to Enterprise: repsonse code: %d: error: %s", resp.StatusCode, err)
-				continue
-			}
-			s.updateLastContact(time.Now().UTC())
-
-		case <-s.done:
-			return
-		}
-	}
-}
-
-func (s *Service) updateLastContact(t time.Time) {
-	s.mu.Lock()
-	defer s.mu.Unlock()
-	s.lastContact = t
-}
-
-func (s *Service) getLastContact() time.Time {
-	s.mu.Lock()
-	defer s.mu.Unlock()
-	return s.lastContact
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/retention/config.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/services/retention/config.go
deleted file mode 100644
index 10822fccd..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/retention/config.go
+++ /dev/null
@@ -1,16 +0,0 @@
-package retention
-
-import (
-	"time"
-
-	"github.com/influxdb/influxdb/toml"
-)
-
-type Config struct {
-	Enabled       bool          `toml:"enabled"`
-	CheckInterval toml.Duration `toml:"check-interval"`
-}
-
-func NewConfig() Config {
-	return Config{Enabled: true, CheckInterval: toml.Duration(30 * time.Minute)}
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/retention/config_test.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/services/retention/config_test.go
deleted file mode 100644
index c1bbca90d..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/retention/config_test.go
+++ /dev/null
@@ -1,27 +0,0 @@
-package retention_test
-
-import (
-	"testing"
-	"time"
-
-	"github.com/BurntSushi/toml"
-	"github.com/influxdb/influxdb/services/retention"
-)
-
-func TestConfig_Parse(t *testing.T) {
-	// Parse configuration.
-	var c retention.Config
-	if _, err := toml.Decode(`
-enabled = true
-check-interval = "1s"
-`, &c); err != nil {
-		t.Fatal(err)
-	}
-
-	// Validate configuration.
-	if c.Enabled != true {
-		t.Fatalf("unexpected enabled state: %v", c.Enabled)
-	} else if time.Duration(c.CheckInterval) != time.Second {
-		t.Fatalf("unexpected check interval: %v", c.CheckInterval)
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/retention/service.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/services/retention/service.go
deleted file mode 100644
index 0ec03e69a..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/retention/service.go
+++ /dev/null
@@ -1,135 +0,0 @@
-package retention
-
-import (
-	"log"
-	"os"
-	"sync"
-	"time"
-
-	"github.com/influxdb/influxdb/meta"
-)
-
-// Service represents the retention policy enforcement service.
-type Service struct {
-	MetaStore interface {
-		IsLeader() bool
-		VisitRetentionPolicies(f func(d meta.DatabaseInfo, r meta.RetentionPolicyInfo))
-		DeleteShardGroup(database, policy string, id uint64) error
-	}
-	TSDBStore interface {
-		ShardIDs() []uint64
-		DeleteShard(shardID uint64) error
-	}
-
-	enabled       bool
-	checkInterval time.Duration
-	wg            sync.WaitGroup
-	done          chan struct{}
-
-	logger *log.Logger
-}
-
-// NewService returns a configured retention policy enforcement service.
-func NewService(c Config) *Service {
-	return &Service{
-		checkInterval: time.Duration(c.CheckInterval),
-		done:          make(chan struct{}),
-		logger:        log.New(os.Stderr, "[retention] ", log.LstdFlags),
-	}
-}
-
-// Open starts retention policy enforcement.
-func (s *Service) Open() error {
-	s.logger.Println("Starting retention policy enforcement service with check interval of", s.checkInterval)
-	s.wg.Add(2)
-	go s.deleteShardGroups()
-	go s.deleteShards()
-	return nil
-}
-
-// Close stops retention policy enforcement.
-func (s *Service) Close() error {
-	s.logger.Println("retention policy enforcement terminating")
-	close(s.done)
-	s.wg.Wait()
-	return nil
-}
-
-// SetLogger sets the internal logger to the logger passed in.
-func (s *Service) SetLogger(l *log.Logger) {
-	s.logger = l
-}
-
-func (s *Service) deleteShardGroups() {
-	defer s.wg.Done()
-
-	ticker := time.NewTicker(s.checkInterval)
-	defer ticker.Stop()
-	for {
-		select {
-		case <-s.done:
-			return
-
-		case <-ticker.C:
-			// Only run this on the leader, but always allow the loop to check
-			// as the leader can change.
-			if !s.MetaStore.IsLeader() {
-				continue
-			}
-			s.logger.Println("retention policy enforcement check commencing")
-
-			s.MetaStore.VisitRetentionPolicies(func(d meta.DatabaseInfo, r meta.RetentionPolicyInfo) {
-				for _, g := range r.ExpiredShardGroups(time.Now().UTC()) {
-					if err := s.MetaStore.DeleteShardGroup(d.Name, r.Name, g.ID); err != nil {
-						s.logger.Printf("failed to delete shard group %d from database %s, retention policy %s: %s",
-							g.ID, d.Name, r.Name, err.Error())
-					} else {
-						s.logger.Printf("deleted shard group %d from database %s, retention policy %s",
-							g.ID, d.Name, r.Name)
-					}
-				}
-			})
-		}
-	}
-}
-
-func (s *Service) deleteShards() {
-	defer s.wg.Done()
-
-	ticker := time.NewTicker(s.checkInterval)
-	defer ticker.Stop()
-	for {
-		select {
-		case <-s.done:
-			return
-
-		case <-ticker.C:
-			s.logger.Println("retention policy shard deletion check commencing")
-
-			type deletionInfo struct {
-				db string
-				rp string
-			}
-			deletedShardIDs := make(map[uint64]deletionInfo, 0)
-			s.MetaStore.VisitRetentionPolicies(func(d meta.DatabaseInfo, r meta.RetentionPolicyInfo) {
-				for _, g := range r.DeletedShardGroups() {
-					for _, sh := range g.Shards {
-						deletedShardIDs[sh.ID] = deletionInfo{db: d.Name, rp: r.Name}
-					}
-				}
-			})
-
-			for _, id := range s.TSDBStore.ShardIDs() {
-				if di, ok := deletedShardIDs[id]; ok {
-					if err := s.TSDBStore.DeleteShard(id); err != nil {
-						s.logger.Printf("failed to delete shard ID %d from database %s, retention policy %s: %s",
-							id, di.db, di.rp, err.Error())
-						continue
-					}
-					s.logger.Printf("shard ID %d from database %s, retention policy %s, deleted",
-						id, di.db, di.rp)
-				}
-			}
-		}
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/snapshotter/service.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/services/snapshotter/service.go
deleted file mode 100644
index ed649238c..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/snapshotter/service.go
+++ /dev/null
@@ -1,145 +0,0 @@
-package snapshotter
-
-import (
-	"encoding"
-	"encoding/json"
-	"fmt"
-	"log"
-	"net"
-	"os"
-	"strings"
-	"sync"
-
-	"github.com/influxdb/influxdb/snapshot"
-	"github.com/influxdb/influxdb/tsdb"
-)
-
-// MuxHeader is the header byte used for the TCP muxer.
-const MuxHeader = 3
-
-// Service manages the listener for the snapshot endpoint.
-type Service struct {
-	wg  sync.WaitGroup
-	err chan error
-
-	MetaStore interface {
-		encoding.BinaryMarshaler
-	}
-
-	TSDBStore *tsdb.Store
-
-	Listener net.Listener
-	Logger   *log.Logger
-}
-
-// NewService returns a new instance of Service.
-func NewService() *Service {
-	return &Service{
-		err:    make(chan error),
-		Logger: log.New(os.Stderr, "[snapshot] ", log.LstdFlags),
-	}
-}
-
-// Open starts the service.
-func (s *Service) Open() error {
-	s.Logger.Println("Starting snapshot service")
-
-	s.wg.Add(1)
-	go s.serve()
-	return nil
-}
-
-// Close implements the Service interface.
-func (s *Service) Close() error {
-	if s.Listener != nil {
-		s.Listener.Close()
-	}
-	s.wg.Wait()
-	return nil
-}
-
-// SetLogger sets the internal logger to the logger passed in.
-func (s *Service) SetLogger(l *log.Logger) {
-	s.Logger = l
-}
-
-// Err returns a channel for fatal out-of-band errors.
-func (s *Service) Err() <-chan error { return s.err }
-
-// serve serves snapshot requests from the listener.
-func (s *Service) serve() {
-	defer s.wg.Done()
-
-	for {
-		// Wait for next connection.
-		conn, err := s.Listener.Accept()
-		if err != nil && strings.Contains(err.Error(), "connection closed") {
-			s.Logger.Println("snapshot listener closed")
-			return
-		} else if err != nil {
-			s.Logger.Println("error accepting snapshot request: ", err.Error())
-			continue
-		}
-
-		// Handle connection in separate goroutine.
-		s.wg.Add(1)
-		go func(conn net.Conn) {
-			defer s.wg.Done()
-			defer conn.Close()
-			if err := s.handleConn(conn); err != nil {
-				s.Logger.Println(err)
-			}
-		}(conn)
-	}
-}
-
-// handleConn processes conn. This is run in a separate goroutine.
-func (s *Service) handleConn(conn net.Conn) error {
-	// Read manifest from connection.
-	m, err := s.readManifest(conn)
-	if err != nil {
-		return fmt.Errorf("read manifest: %s", err)
-	}
-
-	// Write snapshot to connection.
-	if err := s.writeSnapshot(conn, m); err != nil {
-		return fmt.Errorf("write snapshot: %s", err)
-	}
-
-	return nil
-}
-
-// readManifest reads the manifest size and contents from conn.
-// Unmarshals the bytes and returns a manifest object.
-func (s *Service) readManifest(conn net.Conn) (snapshot.Manifest, error) {
-	var m snapshot.Manifest
-	if err := json.NewDecoder(conn).Decode(&m); err != nil {
-		return m, err
-	}
-	return m, nil
-}
-
-// writeSnapshot creates a snapshot writer, trims the manifest, and writes to conn.
-func (s *Service) writeSnapshot(conn net.Conn, prev snapshot.Manifest) error {
-	// Retrieve and serialize the current meta data.
-	buf, err := s.MetaStore.MarshalBinary()
-	if err != nil {
-		return fmt.Errorf("marshal meta: %s", err)
-	}
-
-	// Build a snapshot writer.
-	sw, err := tsdb.NewSnapshotWriter(buf, s.TSDBStore)
-	if err != nil {
-		return fmt.Errorf("create snapshot writer: %s", err)
-	}
-
-	// Trim old files from snapshot.
-	sw.Manifest = sw.Manifest.Diff(&prev)
-
-	// Write snapshot out to connection.
-	if _, err := sw.WriteTo(conn); err != nil {
-		return fmt.Errorf("write to: %s", err)
-	}
-
-	return nil
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/snapshotter/service_test.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/services/snapshotter/service_test.go
deleted file mode 100644
index 704407e3c..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/snapshotter/service_test.go
+++ /dev/null
@@ -1 +0,0 @@
-package snapshotter_test
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/subscriber/config.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/services/subscriber/config.go
deleted file mode 100644
index c336cd70f..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/subscriber/config.go
+++ /dev/null
@@ -1,10 +0,0 @@
-package subscriber
-
-type Config struct {
-	// Whether to enable to Subscriber service
-	Enabled bool `toml:"enabled"`
-}
-
-func NewConfig() Config {
-	return Config{Enabled: true}
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/subscriber/config_test.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/services/subscriber/config_test.go
deleted file mode 100644
index 7d633a3f7..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/subscriber/config_test.go
+++ /dev/null
@@ -1,23 +0,0 @@
-package subscriber_test
-
-import (
-	"testing"
-
-	"github.com/BurntSushi/toml"
-	"github.com/influxdb/influxdb/services/subscriber"
-)
-
-func TestConfig_Parse(t *testing.T) {
-	// Parse configuration.
-	var c subscriber.Config
-	if _, err := toml.Decode(`
-enabled = false
-`, &c); err != nil {
-		t.Fatal(err)
-	}
-
-	// Validate configuration.
-	if c.Enabled != false {
-		t.Fatalf("unexpected enabled state: %v", c.Enabled)
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/subscriber/service.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/services/subscriber/service.go
deleted file mode 100644
index 961defc7e..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/subscriber/service.go
+++ /dev/null
@@ -1,269 +0,0 @@
-package subscriber
-
-import (
-	"expvar"
-	"fmt"
-	"log"
-	"net/url"
-	"os"
-	"strings"
-	"sync"
-
-	"github.com/influxdb/influxdb"
-	"github.com/influxdb/influxdb/cluster"
-	"github.com/influxdb/influxdb/meta"
-)
-
-// Statistics for the Subscriber service.
-const (
-	statPointsWritten = "pointsWritten"
-	statWriteFailures = "writeFailures"
-)
-
-type PointsWriter interface {
-	WritePoints(p *cluster.WritePointsRequest) error
-}
-
-// unique set that identifies a given subscription
-type subEntry struct {
-	db   string
-	rp   string
-	name string
-}
-
-// The Subscriber service manages forking the incoming data from InfluxDB
-// to defined third party destinations.
-// Subscriptions are defined per database and retention policy.
-type Service struct {
-	subs      map[subEntry]PointsWriter
-	MetaStore interface {
-		Databases() ([]meta.DatabaseInfo, error)
-		WaitForDataChanged() error
-	}
-	NewPointsWriter func(u url.URL) (PointsWriter, error)
-	Logger          *log.Logger
-	statMap         *expvar.Map
-	points          chan *cluster.WritePointsRequest
-	wg              sync.WaitGroup
-	closed          bool
-	mu              sync.Mutex
-}
-
-func NewService(c Config) *Service {
-	return &Service{
-		subs:            make(map[subEntry]PointsWriter),
-		NewPointsWriter: newPointsWriter,
-		Logger:          log.New(os.Stderr, "[subscriber] ", log.LstdFlags),
-		statMap:         influxdb.NewStatistics("subscriber", "subscriber", nil),
-		points:          make(chan *cluster.WritePointsRequest),
-		closed:          true,
-	}
-}
-
-func (s *Service) Open() error {
-	s.mu.Lock()
-	defer s.mu.Unlock()
-
-	if s.MetaStore == nil {
-		panic("no meta store")
-	}
-
-	s.closed = false
-
-	// Perform initial update
-	s.Update()
-
-	s.wg.Add(1)
-	go s.writePoints()
-	// Do not wait for this goroutine since it block until a meta change occurs.
-	go s.waitForMetaUpdates()
-
-	s.Logger.Println("opened service")
-	return nil
-}
-
-func (s *Service) Close() error {
-	s.mu.Lock()
-	defer s.mu.Unlock()
-	close(s.points)
-	s.closed = true
-	s.wg.Wait()
-	s.Logger.Println("closed service")
-	return nil
-}
-
-// SetLogger sets the internal logger to the logger passed in.
-func (s *Service) SetLogger(l *log.Logger) {
-	s.Logger = l
-}
-
-func (s *Service) waitForMetaUpdates() {
-	for {
-		err := s.MetaStore.WaitForDataChanged()
-		if err != nil {
-			s.Logger.Printf("error while waiting for meta data changes, err: %v\n", err)
-			return
-		} else {
-			//Check that we haven't been closed before performing update.
-			s.mu.Lock()
-			if s.closed {
-				s.mu.Unlock()
-				s.Logger.Println("service closed not updating")
-				return
-			}
-			s.mu.Unlock()
-			s.Update()
-		}
-	}
-
-}
-
-// start new and stop deleted subscriptions.
-func (s *Service) Update() error {
-	dbis, err := s.MetaStore.Databases()
-	if err != nil {
-		return err
-	}
-	allEntries := make(map[subEntry]bool, 0)
-	// Add in new subscriptions
-	for _, dbi := range dbis {
-		for _, rpi := range dbi.RetentionPolicies {
-			for _, si := range rpi.Subscriptions {
-				se := subEntry{
-					db:   dbi.Name,
-					rp:   rpi.Name,
-					name: si.Name,
-				}
-				allEntries[se] = true
-				if _, ok := s.subs[se]; ok {
-					continue
-				}
-				sub, err := s.createSubscription(se, si.Mode, si.Destinations)
-				if err != nil {
-					return err
-				}
-				s.subs[se] = sub
-			}
-		}
-	}
-
-	// Remove deleted subs
-	for se := range s.subs {
-		if !allEntries[se] {
-			delete(s.subs, se)
-			s.Logger.Println("deleted old subscription for", se.db, se.rp)
-		}
-	}
-
-	return nil
-}
-
-func (s *Service) createSubscription(se subEntry, mode string, destinations []string) (PointsWriter, error) {
-	var bm BalanceMode
-	switch mode {
-	case "ALL":
-		bm = ALL
-	case "ANY":
-		bm = ANY
-	default:
-		return nil, fmt.Errorf("unknown balance mode %q", mode)
-	}
-	writers := make([]PointsWriter, len(destinations))
-	statMaps := make([]*expvar.Map, len(writers))
-	for i, dest := range destinations {
-		u, err := url.Parse(dest)
-		if err != nil {
-			return nil, err
-		}
-		w, err := s.NewPointsWriter(*u)
-		if err != nil {
-			return nil, err
-		}
-		writers[i] = w
-		tags := map[string]string{
-			"database":         se.db,
-			"retention_policy": se.rp,
-			"name":             se.name,
-			"mode":             mode,
-			"destination":      dest,
-		}
-		key := strings.Join([]string{"subscriber", se.db, se.rp, se.name, dest}, ":")
-		statMaps[i] = influxdb.NewStatistics(key, "subscriber", tags)
-	}
-	s.Logger.Println("created new subscription for", se.db, se.rp)
-	return &balancewriter{
-		bm:       bm,
-		writers:  writers,
-		statMaps: statMaps,
-	}, nil
-}
-
-// Return channel into which write point requests can be sent.
-func (s *Service) Points() chan<- *cluster.WritePointsRequest {
-	return s.points
-}
-
-// read points off chan and write them
-func (s *Service) writePoints() {
-	defer s.wg.Done()
-	for p := range s.points {
-		for se, sub := range s.subs {
-			if p.Database == se.db && p.RetentionPolicy == se.rp {
-				err := sub.WritePoints(p)
-				if err != nil {
-					s.Logger.Println(err)
-					s.statMap.Add(statWriteFailures, 1)
-				}
-			}
-		}
-		s.statMap.Add(statPointsWritten, int64(len(p.Points)))
-	}
-}
-
-type BalanceMode int
-
-const (
-	ALL BalanceMode = iota
-	ANY
-)
-
-// balances writes across PointsWriters according to BalanceMode
-type balancewriter struct {
-	bm       BalanceMode
-	writers  []PointsWriter
-	statMaps []*expvar.Map
-	i        int
-}
-
-func (b *balancewriter) WritePoints(p *cluster.WritePointsRequest) error {
-	var lastErr error
-	for range b.writers {
-		// round robin through destinations.
-		i := b.i
-		w := b.writers[i]
-		b.i = (b.i + 1) % len(b.writers)
-
-		// write points to destination.
-		err := w.WritePoints(p)
-		if err != nil {
-			lastErr = err
-			b.statMaps[i].Add(statWriteFailures, 1)
-		} else {
-			b.statMaps[i].Add(statPointsWritten, int64(len(p.Points)))
-			if b.bm == ANY {
-				break
-			}
-		}
-	}
-	return lastErr
-}
-
-// Creates a PointsWriter from the given URL
-func newPointsWriter(u url.URL) (PointsWriter, error) {
-	switch u.Scheme {
-	case "udp":
-		return NewUDP(u.Host), nil
-	default:
-		return nil, fmt.Errorf("unknown destination scheme %s", u.Scheme)
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/subscriber/service_test.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/services/subscriber/service_test.go
deleted file mode 100644
index 6b3ee2904..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/subscriber/service_test.go
+++ /dev/null
@@ -1,448 +0,0 @@
-package subscriber_test
-
-import (
-	"net/url"
-	"testing"
-	"time"
-
-	"github.com/influxdb/influxdb/cluster"
-	"github.com/influxdb/influxdb/meta"
-	"github.com/influxdb/influxdb/services/subscriber"
-)
-
-type MetaStore struct {
-	DatabasesFn          func() ([]meta.DatabaseInfo, error)
-	WaitForDataChangedFn func() error
-}
-
-func (m MetaStore) Databases() ([]meta.DatabaseInfo, error) {
-	return m.DatabasesFn()
-}
-
-func (m MetaStore) WaitForDataChanged() error {
-	return m.WaitForDataChangedFn()
-}
-
-type Subscription struct {
-	WritePointsFn func(*cluster.WritePointsRequest) error
-}
-
-func (s Subscription) WritePoints(p *cluster.WritePointsRequest) error {
-	return s.WritePointsFn(p)
-}
-
-func TestService_IgnoreNonMatch(t *testing.T) {
-	dataChanged := make(chan bool)
-	ms := MetaStore{}
-	ms.WaitForDataChangedFn = func() error {
-		<-dataChanged
-		return nil
-	}
-	ms.DatabasesFn = func() ([]meta.DatabaseInfo, error) {
-		return []meta.DatabaseInfo{
-			{
-				Name: "db0",
-				RetentionPolicies: []meta.RetentionPolicyInfo{
-					{
-						Name: "rp0",
-						Subscriptions: []meta.SubscriptionInfo{
-							{Name: "s0", Mode: "ANY", Destinations: []string{"udp://h0:9093", "udp://h1:9093"}},
-						},
-					},
-				},
-			},
-		}, nil
-	}
-
-	prs := make(chan *cluster.WritePointsRequest, 2)
-	urls := make(chan url.URL, 2)
-	newPointsWriter := func(u url.URL) (subscriber.PointsWriter, error) {
-		sub := Subscription{}
-		sub.WritePointsFn = func(p *cluster.WritePointsRequest) error {
-			prs <- p
-			return nil
-		}
-		urls <- u
-		return sub, nil
-	}
-
-	s := subscriber.NewService(subscriber.NewConfig())
-	s.MetaStore = ms
-	s.NewPointsWriter = newPointsWriter
-	s.Open()
-	defer s.Close()
-
-	// Signal that data has changed
-	dataChanged <- true
-
-	for _, expURLStr := range []string{"udp://h0:9093", "udp://h1:9093"} {
-		var u url.URL
-		expURL, _ := url.Parse(expURLStr)
-		select {
-		case u = <-urls:
-		case <-time.After(10 * time.Millisecond):
-			t.Fatal("expected urls")
-		}
-		if expURL.String() != u.String() {
-			t.Fatalf("unexpected url: got %s exp %s", u.String(), expURL.String())
-		}
-	}
-
-	// Write points that don't match any subscription.
-	s.Points() <- &cluster.WritePointsRequest{
-		Database:        "db1",
-		RetentionPolicy: "rp0",
-	}
-	s.Points() <- &cluster.WritePointsRequest{
-		Database:        "db0",
-		RetentionPolicy: "rp2",
-	}
-
-	// Shouldn't get any prs back
-	select {
-	case pr := <-prs:
-		t.Fatalf("unexpected points request %v", pr)
-	default:
-	}
-	close(dataChanged)
-}
-
-func TestService_ModeALL(t *testing.T) {
-	dataChanged := make(chan bool)
-	ms := MetaStore{}
-	ms.WaitForDataChangedFn = func() error {
-		<-dataChanged
-		return nil
-	}
-	ms.DatabasesFn = func() ([]meta.DatabaseInfo, error) {
-		return []meta.DatabaseInfo{
-			{
-				Name: "db0",
-				RetentionPolicies: []meta.RetentionPolicyInfo{
-					{
-						Name: "rp0",
-						Subscriptions: []meta.SubscriptionInfo{
-							{Name: "s0", Mode: "ALL", Destinations: []string{"udp://h0:9093", "udp://h1:9093"}},
-						},
-					},
-				},
-			},
-		}, nil
-	}
-
-	prs := make(chan *cluster.WritePointsRequest, 2)
-	urls := make(chan url.URL, 2)
-	newPointsWriter := func(u url.URL) (subscriber.PointsWriter, error) {
-		sub := Subscription{}
-		sub.WritePointsFn = func(p *cluster.WritePointsRequest) error {
-			prs <- p
-			return nil
-		}
-		urls <- u
-		return sub, nil
-	}
-
-	s := subscriber.NewService(subscriber.NewConfig())
-	s.MetaStore = ms
-	s.NewPointsWriter = newPointsWriter
-	s.Open()
-	defer s.Close()
-
-	// Signal that data has changed
-	dataChanged <- true
-
-	for _, expURLStr := range []string{"udp://h0:9093", "udp://h1:9093"} {
-		var u url.URL
-		expURL, _ := url.Parse(expURLStr)
-		select {
-		case u = <-urls:
-		case <-time.After(10 * time.Millisecond):
-			t.Fatal("expected urls")
-		}
-		if expURL.String() != u.String() {
-			t.Fatalf("unexpected url: got %s exp %s", u.String(), expURL.String())
-		}
-	}
-
-	// Write points that match subscription with mode ALL
-	expPR := &cluster.WritePointsRequest{
-		Database:        "db0",
-		RetentionPolicy: "rp0",
-	}
-	s.Points() <- expPR
-
-	// Should get pr back twice
-	for i := 0; i < 2; i++ {
-		var pr *cluster.WritePointsRequest
-		select {
-		case pr = <-prs:
-		case <-time.After(10 * time.Millisecond):
-			t.Fatalf("expected points request: got %d exp 2", i)
-		}
-		if pr != expPR {
-			t.Errorf("unexpected points request: got %v, exp %v", pr, expPR)
-		}
-	}
-	close(dataChanged)
-}
-
-func TestService_ModeANY(t *testing.T) {
-	dataChanged := make(chan bool)
-	ms := MetaStore{}
-	ms.WaitForDataChangedFn = func() error {
-		<-dataChanged
-		return nil
-	}
-	ms.DatabasesFn = func() ([]meta.DatabaseInfo, error) {
-		return []meta.DatabaseInfo{
-			{
-				Name: "db0",
-				RetentionPolicies: []meta.RetentionPolicyInfo{
-					{
-						Name: "rp0",
-						Subscriptions: []meta.SubscriptionInfo{
-							{Name: "s0", Mode: "ANY", Destinations: []string{"udp://h0:9093", "udp://h1:9093"}},
-						},
-					},
-				},
-			},
-		}, nil
-	}
-
-	prs := make(chan *cluster.WritePointsRequest, 2)
-	urls := make(chan url.URL, 2)
-	newPointsWriter := func(u url.URL) (subscriber.PointsWriter, error) {
-		sub := Subscription{}
-		sub.WritePointsFn = func(p *cluster.WritePointsRequest) error {
-			prs <- p
-			return nil
-		}
-		urls <- u
-		return sub, nil
-	}
-
-	s := subscriber.NewService(subscriber.NewConfig())
-	s.MetaStore = ms
-	s.NewPointsWriter = newPointsWriter
-	s.Open()
-	defer s.Close()
-
-	// Signal that data has changed
-	dataChanged <- true
-
-	for _, expURLStr := range []string{"udp://h0:9093", "udp://h1:9093"} {
-		var u url.URL
-		expURL, _ := url.Parse(expURLStr)
-		select {
-		case u = <-urls:
-		case <-time.After(10 * time.Millisecond):
-			t.Fatal("expected urls")
-		}
-		if expURL.String() != u.String() {
-			t.Fatalf("unexpected url: got %s exp %s", u.String(), expURL.String())
-		}
-	}
-	// Write points that match subscription with mode ANY
-	expPR := &cluster.WritePointsRequest{
-		Database:        "db0",
-		RetentionPolicy: "rp0",
-	}
-	s.Points() <- expPR
-
-	// Validate we get the pr back just once
-	var pr *cluster.WritePointsRequest
-	select {
-	case pr = <-prs:
-	case <-time.After(10 * time.Millisecond):
-		t.Fatal("expected points request")
-	}
-	if pr != expPR {
-		t.Errorf("unexpected points request: got %v, exp %v", pr, expPR)
-	}
-
-	// shouldn't get it a second time
-	select {
-	case pr = <-prs:
-		t.Fatalf("unexpected points request %v", pr)
-	default:
-	}
-	close(dataChanged)
-}
-
-func TestService_Multiple(t *testing.T) {
-	dataChanged := make(chan bool)
-	ms := MetaStore{}
-	ms.WaitForDataChangedFn = func() error {
-		<-dataChanged
-		return nil
-	}
-	ms.DatabasesFn = func() ([]meta.DatabaseInfo, error) {
-		return []meta.DatabaseInfo{
-			{
-				Name: "db0",
-				RetentionPolicies: []meta.RetentionPolicyInfo{
-					{
-						Name: "rp0",
-						Subscriptions: []meta.SubscriptionInfo{
-							{Name: "s0", Mode: "ANY", Destinations: []string{"udp://h0:9093", "udp://h1:9093"}},
-						},
-					},
-					{
-						Name: "rp1",
-						Subscriptions: []meta.SubscriptionInfo{
-							{Name: "s1", Mode: "ALL", Destinations: []string{"udp://h2:9093", "udp://h3:9093"}},
-						},
-					},
-				},
-			},
-		}, nil
-	}
-
-	prs := make(chan *cluster.WritePointsRequest, 4)
-	urls := make(chan url.URL, 4)
-	newPointsWriter := func(u url.URL) (subscriber.PointsWriter, error) {
-		sub := Subscription{}
-		sub.WritePointsFn = func(p *cluster.WritePointsRequest) error {
-			prs <- p
-			return nil
-		}
-		urls <- u
-		return sub, nil
-	}
-
-	s := subscriber.NewService(subscriber.NewConfig())
-	s.MetaStore = ms
-	s.NewPointsWriter = newPointsWriter
-	s.Open()
-	defer s.Close()
-
-	// Signal that data has changed
-	dataChanged <- true
-
-	for _, expURLStr := range []string{"udp://h0:9093", "udp://h1:9093", "udp://h2:9093", "udp://h3:9093"} {
-		var u url.URL
-		expURL, _ := url.Parse(expURLStr)
-		select {
-		case u = <-urls:
-		case <-time.After(10 * time.Millisecond):
-			t.Fatal("expected urls")
-		}
-		if expURL.String() != u.String() {
-			t.Fatalf("unexpected url: got %s exp %s", u.String(), expURL.String())
-		}
-	}
-
-	// Write points that don't match any subscription.
-	s.Points() <- &cluster.WritePointsRequest{
-		Database:        "db1",
-		RetentionPolicy: "rp0",
-	}
-	s.Points() <- &cluster.WritePointsRequest{
-		Database:        "db0",
-		RetentionPolicy: "rp2",
-	}
-
-	// Write points that match subscription with mode ANY
-	expPR := &cluster.WritePointsRequest{
-		Database:        "db0",
-		RetentionPolicy: "rp0",
-	}
-	s.Points() <- expPR
-
-	// Validate we get the pr back just once
-	var pr *cluster.WritePointsRequest
-	select {
-	case pr = <-prs:
-	case <-time.After(10 * time.Millisecond):
-		t.Fatal("expected points request")
-	}
-	if pr != expPR {
-		t.Errorf("unexpected points request: got %v, exp %v", pr, expPR)
-	}
-
-	// shouldn't get it a second time
-	select {
-	case pr = <-prs:
-		t.Fatalf("unexpected points request %v", pr)
-	default:
-	}
-
-	// Write points that match subscription with mode ALL
-	expPR = &cluster.WritePointsRequest{
-		Database:        "db0",
-		RetentionPolicy: "rp1",
-	}
-	s.Points() <- expPR
-
-	// Should get pr back twice
-	for i := 0; i < 2; i++ {
-		select {
-		case pr = <-prs:
-		case <-time.After(10 * time.Millisecond):
-			t.Fatalf("expected points request: got %d exp 2", i)
-		}
-		if pr != expPR {
-			t.Errorf("unexpected points request: got %v, exp %v", pr, expPR)
-		}
-	}
-	close(dataChanged)
-}
-
-func TestService_WaitForDataChanged(t *testing.T) {
-	dataChanged := make(chan bool)
-	ms := MetaStore{}
-	ms.WaitForDataChangedFn = func() error {
-		<-dataChanged
-		return nil
-	}
-	calls := make(chan bool, 2)
-	ms.DatabasesFn = func() ([]meta.DatabaseInfo, error) {
-		calls <- true
-		return nil, nil
-	}
-
-	s := subscriber.NewService(subscriber.NewConfig())
-	s.MetaStore = ms
-	// Explicitly closed below for testing
-	s.Open()
-
-	// Should be called once during open
-	select {
-	case <-calls:
-	case <-time.After(10 * time.Millisecond):
-		t.Fatal("expected call")
-	}
-
-	select {
-	case <-calls:
-		t.Fatal("unexpected call")
-	case <-time.After(time.Millisecond):
-	}
-
-	// Signal that data has changed
-	dataChanged <- true
-
-	// Should be called once more after data changed
-	select {
-	case <-calls:
-	case <-time.After(10 * time.Millisecond):
-		t.Fatal("expected call")
-	}
-
-	select {
-	case <-calls:
-		t.Fatal("unexpected call")
-	case <-time.After(time.Millisecond):
-	}
-
-	//Close service ensure not called
-	s.Close()
-	dataChanged <- true
-	select {
-	case <-calls:
-		t.Fatal("unexpected call")
-	case <-time.After(time.Millisecond):
-	}
-
-	close(dataChanged)
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/subscriber/udp.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/services/subscriber/udp.go
deleted file mode 100644
index c6534d804..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/subscriber/udp.go
+++ /dev/null
@@ -1,40 +0,0 @@
-package subscriber
-
-import (
-	"net"
-
-	"github.com/influxdb/influxdb/cluster"
-)
-
-// Writes points over UDP using the line protocol
-type UDP struct {
-	addr string
-}
-
-func NewUDP(addr string) *UDP {
-	return &UDP{addr: addr}
-}
-
-func (u *UDP) WritePoints(p *cluster.WritePointsRequest) (err error) {
-	var addr *net.UDPAddr
-	var con *net.UDPConn
-	addr, err = net.ResolveUDPAddr("udp", u.addr)
-	if err != nil {
-		return
-	}
-
-	con, err = net.DialUDP("udp", nil, addr)
-	if err != nil {
-		return
-	}
-	defer con.Close()
-
-	for _, p := range p.Points {
-		_, err = con.Write([]byte(p.String()))
-		if err != nil {
-			return
-		}
-
-	}
-	return
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/udp/README.md b/Godeps/_workspace/src/github.com/influxdb/influxdb/services/udp/README.md
deleted file mode 100644
index 73df83fb5..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/udp/README.md
+++ /dev/null
@@ -1,125 +0,0 @@
-# The UDP Input
-
-## A note on UDP/IP OS Buffer sizes
-
-Some OSes (most notably, Linux) place very restricive limits on the performance
-of UDP protocols. It is _highly_ recommended that you increase these OS limits to
-at least 8MB before trying to run large amounts of UDP traffic to your instance.
-8MB is just a recommendation, and should be adjusted to be inline with your
-`read-buffer` plugin setting.
-
-### Linux
-Check the current UDP/IP receive buffer limit by typing the following commands:
-
-```
-sysctl net.core.rmem_max
-```
-
-If the values are less than 8388608 bytes you should add the following lines to the /etc/sysctl.conf file:
-
-```
-net.core.rmem_max=8388608
-```
-
-Changes to /etc/sysctl.conf do not take effect until reboot.  To update the values immediately, type the following commands as root:
-
-```
-sysctl -w net.core.rmem_max=8388608
-```
-
-### BSD/Darwin
-
-On BSD/Darwin systems you need to add about a 15% padding to the kernel limit
-socket buffer. Meaning if you want an 8MB buffer (8388608 bytes) you need to set
-the kernel limit to `8388608*1.15 = 9646900`. This is not documented anywhere but
-happens
-[in the kernel here.](https://github.com/freebsd/freebsd/blob/master/sys/kern/uipc_sockbuf.c#L63-L64)
-
-Check the current UDP/IP buffer limit by typing the following command:
-
-```
-sysctl kern.ipc.maxsockbuf
-```
-
-If the value is less than 9646900 bytes you should add the following lines to the /etc/sysctl.conf file (create it if necessary):
-
-```
-kern.ipc.maxsockbuf=9646900
-```
-
-Changes to /etc/sysctl.conf do not take effect until reboot.  To update the values immediately, type the following commands as root:
-
-```
-sysctl -w kern.ipc.maxsockbuf=9646900
-```
-
-### Using the read-buffer option for the UDP listener
-
-The `read-buffer` option allows users to set the buffer size for the UDP listener.
-It Sets the size of the operating system's receive buffer associated with
-the UDP traffic. Keep in mind that the OS must be able
-to handle the number set here or the UDP listener will error and exit.
-
-`read-buffer = 0` means to use the OS default, which is usually too
-small for high UDP performance.
-
-## Configuration
-
-Each UDP input allows the binding address, target database, and target retention policy to be set. If the database does not exist, it will be created automatically when the input is initialized. If the retention policy is not configured, then the default retention policy for the database is used. However if the retention policy is set, the retention policy must be explicitly created. The input will not automatically create it.
-
-Each UDP input also performs internal batching of the points it receives, as batched writes to the database are more efficient. The default _batch size_ is 1000, _pending batch_ factor is 5, with a _batch timeout_ of 1 second. This means the input will write batches of maximum size 1000, but if a batch has not reached 1000 points within 1 second of the first point being added to a batch, it will emit that batch regardless of size. The pending batch factor controls how many batches can be in memory at once, allowing the input to transmit a batch, while still building other batches.
-
-## Processing
-
-The UDP input can receive up to 64KB per read, and splits the received data by newline. Each part is then interpreted as line-protocol encoded points, and parsed accordingly.
-
-## UDP is connectionless
-
-Since UDP is a connectionless protocol there is no way to signal to the data source if any error occurs, and if data has even been successfully indexed. This should be kept in mind when deciding if and when to use the UDP input. The built-in UDP statistics are useful for monitoring the UDP inputs.
-
-## Config Examples
-
-One UDP listener
-
-```
-# influxd.conf
-...
-[[udp]]
-  enabled = true
-  bind-address = ":8089" # the bind address
-  database = "telegraf" # Name of the database that will be written to
-  batch-size = 5000 # will flush if this many points get buffered
-  batch-timeout = "1s" # will flush at least this often even if the batch-size is not reached
-  batch-pending = 10 # number of batches that may be pending in memory
-  read-buffer = 0 # UDP read buffer, 0 means to use OS default
-...
-```
-
-Multiple UDP listeners
-
-```
-# influxd.conf
-...
-[[udp]]
-  # Default UDP for Telegraf
-  enabled = true
-  bind-address = ":8089" # the bind address
-  database = "telegraf" # Name of the database that will be written to
-  batch-size = 5000 # will flush if this many points get buffered
-  batch-timeout = "1s" # will flush at least this often even if the batch-size is not reached
-  batch-pending = 10 # number of batches that may be pending in memory
-  read-buffer = 0 # UDP read buffer size, 0 means to use OS default
-
-[[udp]]
-  # High-traffic UDP
-  enabled = true
-  bind-address = ":80891" # the bind address
-  database = "mymetrics" # Name of the database that will be written to
-  batch-size = 5000 # will flush if this many points get buffered
-  batch-timeout = "1s" # will flush at least this often even if the batch-size is not reached
-  batch-pending = 100 # number of batches that may be pending in memory
-  read-buffer = 8388608 # (8*1024*1024) UDP read buffer size
-...
-```
-
-
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/udp/config.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/services/udp/config.go
deleted file mode 100644
index 08fb5c8be..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/udp/config.go
+++ /dev/null
@@ -1,68 +0,0 @@
-package udp
-
-import (
-	"time"
-
-	"github.com/influxdb/influxdb/toml"
-)
-
-const (
-	// DefaultDatabase is the default database for UDP traffic.
-	DefaultDatabase = "udp"
-
-	// DefaultBatchSize is the default UDP batch size.
-	DefaultBatchSize = 5000
-
-	// DefaultBatchPending is the default number of pending UDP batches.
-	DefaultBatchPending = 10
-
-	// DefaultBatchTimeout is the default UDP batch timeout.
-	DefaultBatchTimeout = time.Second
-
-	// DefaultReadBuffer is the default buffer size for the UDP listener.
-	// Sets the size of the operating system's receive buffer associated with
-	// the UDP traffic. Keep in mind that the OS must be able
-	// to handle the number set here or the UDP listener will error and exit.
-	//
-	// DefaultReadBuffer = 0 means to use the OS default, which is usually too
-	// small for high UDP performance.
-	//
-	// Increasing OS buffer limits:
-	//     Linux:      sudo sysctl -w net.core.rmem_max=<read-buffer>
-	//     BSD/Darwin: sudo sysctl -w kern.ipc.maxsockbuf=<read-buffer>
-	DefaultReadBuffer = 0
-)
-
-type Config struct {
-	Enabled     bool   `toml:"enabled"`
-	BindAddress string `toml:"bind-address"`
-
-	Database        string        `toml:"database"`
-	RetentionPolicy string        `toml:"retention-policy"`
-	BatchSize       int           `toml:"batch-size"`
-	BatchPending    int           `toml:"batch-pending"`
-	ReadBuffer      int           `toml:"read-buffer"`
-	BatchTimeout    toml.Duration `toml:"batch-timeout"`
-}
-
-// WithDefaults takes the given config and returns a new config with any required
-// default values set.
-func (c *Config) WithDefaults() *Config {
-	d := *c
-	if d.Database == "" {
-		d.Database = DefaultDatabase
-	}
-	if d.BatchSize == 0 {
-		d.BatchSize = DefaultBatchSize
-	}
-	if d.BatchPending == 0 {
-		d.BatchPending = DefaultBatchPending
-	}
-	if d.BatchTimeout == 0 {
-		d.BatchTimeout = toml.Duration(DefaultBatchTimeout)
-	}
-	if d.ReadBuffer == 0 {
-		d.ReadBuffer = DefaultReadBuffer
-	}
-	return &d
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/udp/config_test.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/services/udp/config_test.go
deleted file mode 100644
index aeeea1458..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/udp/config_test.go
+++ /dev/null
@@ -1,42 +0,0 @@
-package udp_test
-
-import (
-	"testing"
-	"time"
-
-	"github.com/BurntSushi/toml"
-	"github.com/influxdb/influxdb/services/udp"
-)
-
-func TestConfig_Parse(t *testing.T) {
-	// Parse configuration.
-	var c udp.Config
-	if _, err := toml.Decode(`
-enabled = true
-bind-address = ":4444"
-database = "awesomedb"
-retention-policy = "awesomerp"
-batch-size = 100
-batch-pending = 9
-batch-timeout = "10ms"
-`, &c); err != nil {
-		t.Fatal(err)
-	}
-
-	// Validate configuration.
-	if c.Enabled != true {
-		t.Fatalf("unexpected enabled: %v", c.Enabled)
-	} else if c.BindAddress != ":4444" {
-		t.Fatalf("unexpected bind address: %s", c.BindAddress)
-	} else if c.Database != "awesomedb" {
-		t.Fatalf("unexpected database: %s", c.Database)
-	} else if c.RetentionPolicy != "awesomerp" {
-		t.Fatalf("unexpected retention policy: %s", c.RetentionPolicy)
-	} else if c.BatchSize != 100 {
-		t.Fatalf("unexpected batch size: %d", c.BatchSize)
-	} else if c.BatchPending != 9 {
-		t.Fatalf("unexpected batch pending: %d", c.BatchPending)
-	} else if time.Duration(c.BatchTimeout) != (10 * time.Millisecond) {
-		t.Fatalf("unexpected batch timeout: %v", c.BatchTimeout)
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/udp/service.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/services/udp/service.go
deleted file mode 100644
index d28738810..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/services/udp/service.go
+++ /dev/null
@@ -1,226 +0,0 @@
-package udp
-
-import (
-	"errors"
-	"expvar"
-	"log"
-	"net"
-	"os"
-	"strings"
-	"sync"
-	"time"
-
-	"github.com/influxdb/influxdb"
-	"github.com/influxdb/influxdb/cluster"
-	"github.com/influxdb/influxdb/meta"
-	"github.com/influxdb/influxdb/models"
-	"github.com/influxdb/influxdb/tsdb"
-)
-
-const (
-	// Maximum UDP packet size
-	// see https://en.wikipedia.org/wiki/User_Datagram_Protocol#Packet_structure
-	UDPBufferSize = 65536
-
-	// Arbitrary, testing indicated that this doesn't typically get over 10
-	parserChanLen = 1000
-)
-
-// statistics gathered by the UDP package.
-const (
-	statPointsReceived      = "pointsRx"
-	statBytesReceived       = "bytesRx"
-	statPointsParseFail     = "pointsParseFail"
-	statReadFail            = "readFail"
-	statBatchesTrasmitted   = "batchesTx"
-	statPointsTransmitted   = "pointsTx"
-	statBatchesTransmitFail = "batchesTxFail"
-)
-
-//
-// Service represents here an UDP service
-// that will listen for incoming packets
-// formatted with the inline protocol
-//
-type Service struct {
-	conn *net.UDPConn
-	addr *net.UDPAddr
-	wg   sync.WaitGroup
-	done chan struct{}
-
-	parserChan chan []byte
-	batcher    *tsdb.PointBatcher
-	config     Config
-
-	PointsWriter interface {
-		WritePoints(p *cluster.WritePointsRequest) error
-	}
-
-	MetaStore interface {
-		CreateDatabaseIfNotExists(name string) (*meta.DatabaseInfo, error)
-	}
-
-	Logger  *log.Logger
-	statMap *expvar.Map
-}
-
-func NewService(c Config) *Service {
-	d := *c.WithDefaults()
-	return &Service{
-		config:     d,
-		done:       make(chan struct{}),
-		parserChan: make(chan []byte, parserChanLen),
-		batcher:    tsdb.NewPointBatcher(d.BatchSize, d.BatchPending, time.Duration(d.BatchTimeout)),
-		Logger:     log.New(os.Stderr, "[udp] ", log.LstdFlags),
-	}
-}
-
-func (s *Service) Open() (err error) {
-	// Configure expvar monitoring. It's OK to do this even if the service fails to open and
-	// should be done before any data could arrive for the service.
-	key := strings.Join([]string{"udp", s.config.BindAddress}, ":")
-	tags := map[string]string{"bind": s.config.BindAddress}
-	s.statMap = influxdb.NewStatistics(key, "udp", tags)
-
-	if s.config.BindAddress == "" {
-		return errors.New("bind address has to be specified in config")
-	}
-	if s.config.Database == "" {
-		return errors.New("database has to be specified in config")
-	}
-
-	if _, err := s.MetaStore.CreateDatabaseIfNotExists(s.config.Database); err != nil {
-		return errors.New("Failed to ensure target database exists")
-	}
-
-	s.addr, err = net.ResolveUDPAddr("udp", s.config.BindAddress)
-	if err != nil {
-		s.Logger.Printf("Failed to resolve UDP address %s: %s", s.config.BindAddress, err)
-		return err
-	}
-
-	s.conn, err = net.ListenUDP("udp", s.addr)
-	if err != nil {
-		s.Logger.Printf("Failed to set up UDP listener at address %s: %s", s.addr, err)
-		return err
-	}
-
-	if s.config.ReadBuffer != 0 {
-		err = s.conn.SetReadBuffer(s.config.ReadBuffer)
-		if err != nil {
-			s.Logger.Printf("Failed to set UDP read buffer to %d: %s",
-				s.config.ReadBuffer, err)
-			return err
-		}
-	}
-
-	s.Logger.Printf("Started listening on UDP: %s", s.config.BindAddress)
-
-	s.wg.Add(3)
-	go s.serve()
-	go s.parser()
-	go s.writer()
-
-	return nil
-}
-
-func (s *Service) writer() {
-	defer s.wg.Done()
-
-	for {
-		select {
-		case batch := <-s.batcher.Out():
-			if err := s.PointsWriter.WritePoints(&cluster.WritePointsRequest{
-				Database:         s.config.Database,
-				RetentionPolicy:  s.config.RetentionPolicy,
-				ConsistencyLevel: cluster.ConsistencyLevelOne,
-				Points:           batch,
-			}); err == nil {
-				s.statMap.Add(statBatchesTrasmitted, 1)
-				s.statMap.Add(statPointsTransmitted, int64(len(batch)))
-			} else {
-				s.Logger.Printf("failed to write point batch to database %q: %s", s.config.Database, err)
-				s.statMap.Add(statBatchesTransmitFail, 1)
-			}
-
-		case <-s.done:
-			return
-		}
-	}
-}
-
-func (s *Service) serve() {
-	defer s.wg.Done()
-
-	s.batcher.Start()
-	for {
-
-		select {
-		case <-s.done:
-			// We closed the connection, time to go.
-			return
-		default:
-			// Keep processing.
-			buf := make([]byte, UDPBufferSize)
-			n, _, err := s.conn.ReadFromUDP(buf)
-			if err != nil {
-				s.statMap.Add(statReadFail, 1)
-				s.Logger.Printf("Failed to read UDP message: %s", err)
-				continue
-			}
-			s.statMap.Add(statBytesReceived, int64(n))
-			s.parserChan <- buf[:n]
-		}
-	}
-}
-
-func (s *Service) parser() {
-	defer s.wg.Done()
-
-	for {
-		select {
-		case <-s.done:
-			return
-		case buf := <-s.parserChan:
-			points, err := models.ParsePoints(buf)
-			if err != nil {
-				s.statMap.Add(statPointsParseFail, 1)
-				s.Logger.Printf("Failed to parse points: %s", err)
-				return
-			}
-
-			for _, point := range points {
-				s.batcher.In() <- point
-			}
-			s.statMap.Add(statPointsReceived, int64(len(points)))
-		}
-	}
-}
-
-func (s *Service) Close() error {
-	if s.conn == nil {
-		return errors.New("Service already closed")
-	}
-
-	s.conn.Close()
-	s.batcher.Flush()
-	close(s.done)
-	s.wg.Wait()
-
-	// Release all remaining resources.
-	s.done = nil
-	s.conn = nil
-
-	s.Logger.Print("Service closed")
-
-	return nil
-}
-
-// SetLogger sets the internal logger to the logger passed in.
-func (s *Service) SetLogger(l *log.Logger) {
-	s.Logger = l
-}
-
-func (s *Service) Addr() net.Addr {
-	return s.addr
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/shared/admin/README.md b/Godeps/_workspace/src/github.com/influxdb/influxdb/shared/admin/README.md
deleted file mode 100644
index dd1ed2606..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/shared/admin/README.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# InfluxDB Admin Interface
-
-This is the built-in admin interface that ships with InfluxDB. An emphasis has been placed on making it minimalistic and able to be bundled with the server without adding lots of overhead or preprocessing steps.
-
-## Building
-
-The only step required to bundle this with InfluxDB is to create a compressed file system using `statik` as follows:
-
-```
-go get github.com/rakyll/statik
-$GOPATH/bin/statik -src=./shared/admin
-go fmt statik/statik.go
-```
-
-That should update the file located at `statik/statik.go`, which will get automatically build into the InfluxDB binary when it is compiled. This step should also be completed in any pull requests that make modifications to the admin interface, as it won't be run as a separate step in the release process.
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/shared/admin/css/admin.css b/Godeps/_workspace/src/github.com/influxdb/influxdb/shared/admin/css/admin.css
deleted file mode 100644
index aaab04c9b..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/shared/admin/css/admin.css
+++ /dev/null
@@ -1,87 +0,0 @@
-body {
-    padding-top: 70px;
-    /* Required padding for .navbar-fixed-top. Remove if using .navbar-static-top. Change if height of navigation changes. */
-}
-
-html,
-body {
-    height: 100%;
-    /* The html and body elements cannot have any padding or margin. */
-}
-
-code {
-    display: block;
-}
-
-#settings {
-    display: none;
-}
-
-#settings form > div {
-    margin-right: 20px;
-}
-
-#settings form input#port {
-    width: 80px;
-}
-
-#settings form label {
-    padding-right: 5px;
-}
-
-div#content {
-    margin-bottom: -10px;
-}
-
-div#table h2 {
-  color: #999;
-  margin-top: -8px;
-  font-size: 16px
-}
-
-textarea#content-data {
-    font-family: "Courier New";
-    height: 200px;
-}
-
-div#query-alerts {
-    margin-top: 30px;
-}
-
-div#modal-error, div#modal-success, div#query-error, div#query-success {
-    display: none; 
-}
-
-/* Wrapper for page content to push down footer */
-#wrap {
-    min-height: 100%;
-    height: auto !important;
-    height: 100%;
-    /* Negative indent footer by it's height */
-    margin: 0 auto -60px;
-}
-
-/* Set the fixed height of the footer here */
-#push,
-#footer {
-    height: 60px;
-}
-#footer {
-    background-color: #f5f5f5;
-    border-top: 1px solid #dfdfdf;
-}
-
-#footer p {
-    margin: 20px 0;
-}
-
-/* Lastly, apply responsive CSS fixes as necessary */
-@media (max-width: 767px) {
-    #footer {
-      margin-left: -20px;
-      margin-right: -20px;
-      padding-left: 20px;
-      padding-right: 20px;
-    }
-}
-
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/shared/admin/css/bootstrap.css b/Godeps/_workspace/src/github.com/influxdb/influxdb/shared/admin/css/bootstrap.css
deleted file mode 100644
index fb15e3d69..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/shared/admin/css/bootstrap.css
+++ /dev/null
@@ -1,6584 +0,0 @@
-/*!
- * Bootstrap v3.3.4 (http://getbootstrap.com)
- * Copyright 2011-2015 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- */
-
-/*! normalize.css v3.0.2 | MIT License | git.io/normalize */
-html {
-  font-family: sans-serif;
-  -webkit-text-size-adjust: 100%;
-      -ms-text-size-adjust: 100%;
-}
-body {
-  margin: 0;
-}
-article,
-aside,
-details,
-figcaption,
-figure,
-footer,
-header,
-hgroup,
-main,
-menu,
-nav,
-section,
-summary {
-  display: block;
-}
-audio,
-canvas,
-progress,
-video {
-  display: inline-block;
-  vertical-align: baseline;
-}
-audio:not([controls]) {
-  display: none;
-  height: 0;
-}
-[hidden],
-template {
-  display: none;
-}
-a {
-  background-color: transparent;
-}
-a:active,
-a:hover {
-  outline: 0;
-}
-abbr[title] {
-  border-bottom: 1px dotted;
-}
-b,
-strong {
-  font-weight: bold;
-}
-dfn {
-  font-style: italic;
-}
-h1 {
-  margin: .67em 0;
-  font-size: 2em;
-}
-mark {
-  color: #000;
-  background: #ff0;
-}
-small {
-  font-size: 80%;
-}
-sub,
-sup {
-  position: relative;
-  font-size: 75%;
-  line-height: 0;
-  vertical-align: baseline;
-}
-sup {
-  top: -.5em;
-}
-sub {
-  bottom: -.25em;
-}
-img {
-  border: 0;
-}
-svg:not(:root) {
-  overflow: hidden;
-}
-figure {
-  margin: 1em 40px;
-}
-hr {
-  height: 0;
-  -webkit-box-sizing: content-box;
-     -moz-box-sizing: content-box;
-          box-sizing: content-box;
-}
-pre {
-  overflow: auto;
-}
-code,
-kbd,
-pre,
-samp {
-  font-family: monospace, monospace;
-  font-size: 1em;
-}
-button,
-input,
-optgroup,
-select,
-textarea {
-  margin: 0;
-  font: inherit;
-  color: inherit;
-}
-button {
-  overflow: visible;
-}
-button,
-select {
-  text-transform: none;
-}
-button,
-html input[type="button"],
-input[type="reset"],
-input[type="submit"] {
-  -webkit-appearance: button;
-  cursor: pointer;
-}
-button[disabled],
-html input[disabled] {
-  cursor: default;
-}
-button::-moz-focus-inner,
-input::-moz-focus-inner {
-  padding: 0;
-  border: 0;
-}
-input {
-  line-height: normal;
-}
-input[type="checkbox"],
-input[type="radio"] {
-  -webkit-box-sizing: border-box;
-     -moz-box-sizing: border-box;
-          box-sizing: border-box;
-  padding: 0;
-}
-input[type="number"]::-webkit-inner-spin-button,
-input[type="number"]::-webkit-outer-spin-button {
-  height: auto;
-}
-input[type="search"] {
-  -webkit-box-sizing: content-box;
-     -moz-box-sizing: content-box;
-          box-sizing: content-box;
-  -webkit-appearance: textfield;
-}
-input[type="search"]::-webkit-search-cancel-button,
-input[type="search"]::-webkit-search-decoration {
-  -webkit-appearance: none;
-}
-fieldset {
-  padding: .35em .625em .75em;
-  margin: 0 2px;
-  border: 1px solid #c0c0c0;
-}
-legend {
-  padding: 0;
-  border: 0;
-}
-textarea {
-  overflow: auto;
-}
-optgroup {
-  font-weight: bold;
-}
-table {
-  border-spacing: 0;
-  border-collapse: collapse;
-}
-td,
-th {
-  padding: 0;
-}
-/*! Source: https://github.com/h5bp/html5-boilerplate/blob/master/src/css/main.css */
-@media print {
-  *,
-  *:before,
-  *:after {
-    color: #000 !important;
-    text-shadow: none !important;
-    background: transparent !important;
-    -webkit-box-shadow: none !important;
-            box-shadow: none !important;
-  }
-  a,
-  a:visited {
-    text-decoration: underline;
-  }
-  a[href]:after {
-    content: " (" attr(href) ")";
-  }
-  abbr[title]:after {
-    content: " (" attr(title) ")";
-  }
-  a[href^="#"]:after,
-  a[href^="javascript:"]:after {
-    content: "";
-  }
-  pre,
-  blockquote {
-    border: 1px solid #999;
-
-    page-break-inside: avoid;
-  }
-  thead {
-    display: table-header-group;
-  }
-  tr,
-  img {
-    page-break-inside: avoid;
-  }
-  img {
-    max-width: 100% !important;
-  }
-  p,
-  h2,
-  h3 {
-    orphans: 3;
-    widows: 3;
-  }
-  h2,
-  h3 {
-    page-break-after: avoid;
-  }
-  select {
-    background: #fff !important;
-  }
-  .navbar {
-    display: none;
-  }
-  .btn > .caret,
-  .dropup > .btn > .caret {
-    border-top-color: #000 !important;
-  }
-  .label {
-    border: 1px solid #000;
-  }
-  .table {
-    border-collapse: collapse !important;
-  }
-  .table td,
-  .table th {
-    background-color: #fff !important;
-  }
-  .table-bordered th,
-  .table-bordered td {
-    border: 1px solid #ddd !important;
-  }
-}
-@font-face {
-  font-family: 'Glyphicons Halflings';
-
-  src: url('../fonts/glyphicons-halflings-regular.eot');
-  src: url('../fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'), url('../fonts/glyphicons-halflings-regular.woff2') format('woff2'), url('../fonts/glyphicons-halflings-regular.woff') format('woff'), url('../fonts/glyphicons-halflings-regular.ttf') format('truetype'), url('../fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg');
-}
-.glyphicon {
-  position: relative;
-  top: 1px;
-  display: inline-block;
-  font-family: 'Glyphicons Halflings';
-  font-style: normal;
-  font-weight: normal;
-  line-height: 1;
-
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-}
-.glyphicon-asterisk:before {
-  content: "\2a";
-}
-.glyphicon-plus:before {
-  content: "\2b";
-}
-.glyphicon-euro:before,
-.glyphicon-eur:before {
-  content: "\20ac";
-}
-.glyphicon-minus:before {
-  content: "\2212";
-}
-.glyphicon-cloud:before {
-  content: "\2601";
-}
-.glyphicon-envelope:before {
-  content: "\2709";
-}
-.glyphicon-pencil:before {
-  content: "\270f";
-}
-.glyphicon-glass:before {
-  content: "\e001";
-}
-.glyphicon-music:before {
-  content: "\e002";
-}
-.glyphicon-search:before {
-  content: "\e003";
-}
-.glyphicon-heart:before {
-  content: "\e005";
-}
-.glyphicon-star:before {
-  content: "\e006";
-}
-.glyphicon-star-empty:before {
-  content: "\e007";
-}
-.glyphicon-user:before {
-  content: "\e008";
-}
-.glyphicon-film:before {
-  content: "\e009";
-}
-.glyphicon-th-large:before {
-  content: "\e010";
-}
-.glyphicon-th:before {
-  content: "\e011";
-}
-.glyphicon-th-list:before {
-  content: "\e012";
-}
-.glyphicon-ok:before {
-  content: "\e013";
-}
-.glyphicon-remove:before {
-  content: "\e014";
-}
-.glyphicon-zoom-in:before {
-  content: "\e015";
-}
-.glyphicon-zoom-out:before {
-  content: "\e016";
-}
-.glyphicon-off:before {
-  content: "\e017";
-}
-.glyphicon-signal:before {
-  content: "\e018";
-}
-.glyphicon-cog:before {
-  content: "\e019";
-}
-.glyphicon-trash:before {
-  content: "\e020";
-}
-.glyphicon-home:before {
-  content: "\e021";
-}
-.glyphicon-file:before {
-  content: "\e022";
-}
-.glyphicon-time:before {
-  content: "\e023";
-}
-.glyphicon-road:before {
-  content: "\e024";
-}
-.glyphicon-download-alt:before {
-  content: "\e025";
-}
-.glyphicon-download:before {
-  content: "\e026";
-}
-.glyphicon-upload:before {
-  content: "\e027";
-}
-.glyphicon-inbox:before {
-  content: "\e028";
-}
-.glyphicon-play-circle:before {
-  content: "\e029";
-}
-.glyphicon-repeat:before {
-  content: "\e030";
-}
-.glyphicon-refresh:before {
-  content: "\e031";
-}
-.glyphicon-list-alt:before {
-  content: "\e032";
-}
-.glyphicon-lock:before {
-  content: "\e033";
-}
-.glyphicon-flag:before {
-  content: "\e034";
-}
-.glyphicon-headphones:before {
-  content: "\e035";
-}
-.glyphicon-volume-off:before {
-  content: "\e036";
-}
-.glyphicon-volume-down:before {
-  content: "\e037";
-}
-.glyphicon-volume-up:before {
-  content: "\e038";
-}
-.glyphicon-qrcode:before {
-  content: "\e039";
-}
-.glyphicon-barcode:before {
-  content: "\e040";
-}
-.glyphicon-tag:before {
-  content: "\e041";
-}
-.glyphicon-tags:before {
-  content: "\e042";
-}
-.glyphicon-book:before {
-  content: "\e043";
-}
-.glyphicon-bookmark:before {
-  content: "\e044";
-}
-.glyphicon-print:before {
-  content: "\e045";
-}
-.glyphicon-camera:before {
-  content: "\e046";
-}
-.glyphicon-font:before {
-  content: "\e047";
-}
-.glyphicon-bold:before {
-  content: "\e048";
-}
-.glyphicon-italic:before {
-  content: "\e049";
-}
-.glyphicon-text-height:before {
-  content: "\e050";
-}
-.glyphicon-text-width:before {
-  content: "\e051";
-}
-.glyphicon-align-left:before {
-  content: "\e052";
-}
-.glyphicon-align-center:before {
-  content: "\e053";
-}
-.glyphicon-align-right:before {
-  content: "\e054";
-}
-.glyphicon-align-justify:before {
-  content: "\e055";
-}
-.glyphicon-list:before {
-  content: "\e056";
-}
-.glyphicon-indent-left:before {
-  content: "\e057";
-}
-.glyphicon-indent-right:before {
-  content: "\e058";
-}
-.glyphicon-facetime-video:before {
-  content: "\e059";
-}
-.glyphicon-picture:before {
-  content: "\e060";
-}
-.glyphicon-map-marker:before {
-  content: "\e062";
-}
-.glyphicon-adjust:before {
-  content: "\e063";
-}
-.glyphicon-tint:before {
-  content: "\e064";
-}
-.glyphicon-edit:before {
-  content: "\e065";
-}
-.glyphicon-share:before {
-  content: "\e066";
-}
-.glyphicon-check:before {
-  content: "\e067";
-}
-.glyphicon-move:before {
-  content: "\e068";
-}
-.glyphicon-step-backward:before {
-  content: "\e069";
-}
-.glyphicon-fast-backward:before {
-  content: "\e070";
-}
-.glyphicon-backward:before {
-  content: "\e071";
-}
-.glyphicon-play:before {
-  content: "\e072";
-}
-.glyphicon-pause:before {
-  content: "\e073";
-}
-.glyphicon-stop:before {
-  content: "\e074";
-}
-.glyphicon-forward:before {
-  content: "\e075";
-}
-.glyphicon-fast-forward:before {
-  content: "\e076";
-}
-.glyphicon-step-forward:before {
-  content: "\e077";
-}
-.glyphicon-eject:before {
-  content: "\e078";
-}
-.glyphicon-chevron-left:before {
-  content: "\e079";
-}
-.glyphicon-chevron-right:before {
-  content: "\e080";
-}
-.glyphicon-plus-sign:before {
-  content: "\e081";
-}
-.glyphicon-minus-sign:before {
-  content: "\e082";
-}
-.glyphicon-remove-sign:before {
-  content: "\e083";
-}
-.glyphicon-ok-sign:before {
-  content: "\e084";
-}
-.glyphicon-question-sign:before {
-  content: "\e085";
-}
-.glyphicon-info-sign:before {
-  content: "\e086";
-}
-.glyphicon-screenshot:before {
-  content: "\e087";
-}
-.glyphicon-remove-circle:before {
-  content: "\e088";
-}
-.glyphicon-ok-circle:before {
-  content: "\e089";
-}
-.glyphicon-ban-circle:before {
-  content: "\e090";
-}
-.glyphicon-arrow-left:before {
-  content: "\e091";
-}
-.glyphicon-arrow-right:before {
-  content: "\e092";
-}
-.glyphicon-arrow-up:before {
-  content: "\e093";
-}
-.glyphicon-arrow-down:before {
-  content: "\e094";
-}
-.glyphicon-share-alt:before {
-  content: "\e095";
-}
-.glyphicon-resize-full:before {
-  content: "\e096";
-}
-.glyphicon-resize-small:before {
-  content: "\e097";
-}
-.glyphicon-exclamation-sign:before {
-  content: "\e101";
-}
-.glyphicon-gift:before {
-  content: "\e102";
-}
-.glyphicon-leaf:before {
-  content: "\e103";
-}
-.glyphicon-fire:before {
-  content: "\e104";
-}
-.glyphicon-eye-open:before {
-  content: "\e105";
-}
-.glyphicon-eye-close:before {
-  content: "\e106";
-}
-.glyphicon-warning-sign:before {
-  content: "\e107";
-}
-.glyphicon-plane:before {
-  content: "\e108";
-}
-.glyphicon-calendar:before {
-  content: "\e109";
-}
-.glyphicon-random:before {
-  content: "\e110";
-}
-.glyphicon-comment:before {
-  content: "\e111";
-}
-.glyphicon-magnet:before {
-  content: "\e112";
-}
-.glyphicon-chevron-up:before {
-  content: "\e113";
-}
-.glyphicon-chevron-down:before {
-  content: "\e114";
-}
-.glyphicon-retweet:before {
-  content: "\e115";
-}
-.glyphicon-shopping-cart:before {
-  content: "\e116";
-}
-.glyphicon-folder-close:before {
-  content: "\e117";
-}
-.glyphicon-folder-open:before {
-  content: "\e118";
-}
-.glyphicon-resize-vertical:before {
-  content: "\e119";
-}
-.glyphicon-resize-horizontal:before {
-  content: "\e120";
-}
-.glyphicon-hdd:before {
-  content: "\e121";
-}
-.glyphicon-bullhorn:before {
-  content: "\e122";
-}
-.glyphicon-bell:before {
-  content: "\e123";
-}
-.glyphicon-certificate:before {
-  content: "\e124";
-}
-.glyphicon-thumbs-up:before {
-  content: "\e125";
-}
-.glyphicon-thumbs-down:before {
-  content: "\e126";
-}
-.glyphicon-hand-right:before {
-  content: "\e127";
-}
-.glyphicon-hand-left:before {
-  content: "\e128";
-}
-.glyphicon-hand-up:before {
-  content: "\e129";
-}
-.glyphicon-hand-down:before {
-  content: "\e130";
-}
-.glyphicon-circle-arrow-right:before {
-  content: "\e131";
-}
-.glyphicon-circle-arrow-left:before {
-  content: "\e132";
-}
-.glyphicon-circle-arrow-up:before {
-  content: "\e133";
-}
-.glyphicon-circle-arrow-down:before {
-  content: "\e134";
-}
-.glyphicon-globe:before {
-  content: "\e135";
-}
-.glyphicon-wrench:before {
-  content: "\e136";
-}
-.glyphicon-tasks:before {
-  content: "\e137";
-}
-.glyphicon-filter:before {
-  content: "\e138";
-}
-.glyphicon-briefcase:before {
-  content: "\e139";
-}
-.glyphicon-fullscreen:before {
-  content: "\e140";
-}
-.glyphicon-dashboard:before {
-  content: "\e141";
-}
-.glyphicon-paperclip:before {
-  content: "\e142";
-}
-.glyphicon-heart-empty:before {
-  content: "\e143";
-}
-.glyphicon-link:before {
-  content: "\e144";
-}
-.glyphicon-phone:before {
-  content: "\e145";
-}
-.glyphicon-pushpin:before {
-  content: "\e146";
-}
-.glyphicon-usd:before {
-  content: "\e148";
-}
-.glyphicon-gbp:before {
-  content: "\e149";
-}
-.glyphicon-sort:before {
-  content: "\e150";
-}
-.glyphicon-sort-by-alphabet:before {
-  content: "\e151";
-}
-.glyphicon-sort-by-alphabet-alt:before {
-  content: "\e152";
-}
-.glyphicon-sort-by-order:before {
-  content: "\e153";
-}
-.glyphicon-sort-by-order-alt:before {
-  content: "\e154";
-}
-.glyphicon-sort-by-attributes:before {
-  content: "\e155";
-}
-.glyphicon-sort-by-attributes-alt:before {
-  content: "\e156";
-}
-.glyphicon-unchecked:before {
-  content: "\e157";
-}
-.glyphicon-expand:before {
-  content: "\e158";
-}
-.glyphicon-collapse-down:before {
-  content: "\e159";
-}
-.glyphicon-collapse-up:before {
-  content: "\e160";
-}
-.glyphicon-log-in:before {
-  content: "\e161";
-}
-.glyphicon-flash:before {
-  content: "\e162";
-}
-.glyphicon-log-out:before {
-  content: "\e163";
-}
-.glyphicon-new-window:before {
-  content: "\e164";
-}
-.glyphicon-record:before {
-  content: "\e165";
-}
-.glyphicon-save:before {
-  content: "\e166";
-}
-.glyphicon-open:before {
-  content: "\e167";
-}
-.glyphicon-saved:before {
-  content: "\e168";
-}
-.glyphicon-import:before {
-  content: "\e169";
-}
-.glyphicon-export:before {
-  content: "\e170";
-}
-.glyphicon-send:before {
-  content: "\e171";
-}
-.glyphicon-floppy-disk:before {
-  content: "\e172";
-}
-.glyphicon-floppy-saved:before {
-  content: "\e173";
-}
-.glyphicon-floppy-remove:before {
-  content: "\e174";
-}
-.glyphicon-floppy-save:before {
-  content: "\e175";
-}
-.glyphicon-floppy-open:before {
-  content: "\e176";
-}
-.glyphicon-credit-card:before {
-  content: "\e177";
-}
-.glyphicon-transfer:before {
-  content: "\e178";
-}
-.glyphicon-cutlery:before {
-  content: "\e179";
-}
-.glyphicon-header:before {
-  content: "\e180";
-}
-.glyphicon-compressed:before {
-  content: "\e181";
-}
-.glyphicon-earphone:before {
-  content: "\e182";
-}
-.glyphicon-phone-alt:before {
-  content: "\e183";
-}
-.glyphicon-tower:before {
-  content: "\e184";
-}
-.glyphicon-stats:before {
-  content: "\e185";
-}
-.glyphicon-sd-video:before {
-  content: "\e186";
-}
-.glyphicon-hd-video:before {
-  content: "\e187";
-}
-.glyphicon-subtitles:before {
-  content: "\e188";
-}
-.glyphicon-sound-stereo:before {
-  content: "\e189";
-}
-.glyphicon-sound-dolby:before {
-  content: "\e190";
-}
-.glyphicon-sound-5-1:before {
-  content: "\e191";
-}
-.glyphicon-sound-6-1:before {
-  content: "\e192";
-}
-.glyphicon-sound-7-1:before {
-  content: "\e193";
-}
-.glyphicon-copyright-mark:before {
-  content: "\e194";
-}
-.glyphicon-registration-mark:before {
-  content: "\e195";
-}
-.glyphicon-cloud-download:before {
-  content: "\e197";
-}
-.glyphicon-cloud-upload:before {
-  content: "\e198";
-}
-.glyphicon-tree-conifer:before {
-  content: "\e199";
-}
-.glyphicon-tree-deciduous:before {
-  content: "\e200";
-}
-.glyphicon-cd:before {
-  content: "\e201";
-}
-.glyphicon-save-file:before {
-  content: "\e202";
-}
-.glyphicon-open-file:before {
-  content: "\e203";
-}
-.glyphicon-level-up:before {
-  content: "\e204";
-}
-.glyphicon-copy:before {
-  content: "\e205";
-}
-.glyphicon-paste:before {
-  content: "\e206";
-}
-.glyphicon-alert:before {
-  content: "\e209";
-}
-.glyphicon-equalizer:before {
-  content: "\e210";
-}
-.glyphicon-king:before {
-  content: "\e211";
-}
-.glyphicon-queen:before {
-  content: "\e212";
-}
-.glyphicon-pawn:before {
-  content: "\e213";
-}
-.glyphicon-bishop:before {
-  content: "\e214";
-}
-.glyphicon-knight:before {
-  content: "\e215";
-}
-.glyphicon-baby-formula:before {
-  content: "\e216";
-}
-.glyphicon-tent:before {
-  content: "\26fa";
-}
-.glyphicon-blackboard:before {
-  content: "\e218";
-}
-.glyphicon-bed:before {
-  content: "\e219";
-}
-.glyphicon-apple:before {
-  content: "\f8ff";
-}
-.glyphicon-erase:before {
-  content: "\e221";
-}
-.glyphicon-hourglass:before {
-  content: "\231b";
-}
-.glyphicon-lamp:before {
-  content: "\e223";
-}
-.glyphicon-duplicate:before {
-  content: "\e224";
-}
-.glyphicon-piggy-bank:before {
-  content: "\e225";
-}
-.glyphicon-scissors:before {
-  content: "\e226";
-}
-.glyphicon-bitcoin:before {
-  content: "\e227";
-}
-.glyphicon-btc:before {
-  content: "\e227";
-}
-.glyphicon-xbt:before {
-  content: "\e227";
-}
-.glyphicon-yen:before {
-  content: "\00a5";
-}
-.glyphicon-jpy:before {
-  content: "\00a5";
-}
-.glyphicon-ruble:before {
-  content: "\20bd";
-}
-.glyphicon-rub:before {
-  content: "\20bd";
-}
-.glyphicon-scale:before {
-  content: "\e230";
-}
-.glyphicon-ice-lolly:before {
-  content: "\e231";
-}
-.glyphicon-ice-lolly-tasted:before {
-  content: "\e232";
-}
-.glyphicon-education:before {
-  content: "\e233";
-}
-.glyphicon-option-horizontal:before {
-  content: "\e234";
-}
-.glyphicon-option-vertical:before {
-  content: "\e235";
-}
-.glyphicon-menu-hamburger:before {
-  content: "\e236";
-}
-.glyphicon-modal-window:before {
-  content: "\e237";
-}
-.glyphicon-oil:before {
-  content: "\e238";
-}
-.glyphicon-grain:before {
-  content: "\e239";
-}
-.glyphicon-sunglasses:before {
-  content: "\e240";
-}
-.glyphicon-text-size:before {
-  content: "\e241";
-}
-.glyphicon-text-color:before {
-  content: "\e242";
-}
-.glyphicon-text-background:before {
-  content: "\e243";
-}
-.glyphicon-object-align-top:before {
-  content: "\e244";
-}
-.glyphicon-object-align-bottom:before {
-  content: "\e245";
-}
-.glyphicon-object-align-horizontal:before {
-  content: "\e246";
-}
-.glyphicon-object-align-left:before {
-  content: "\e247";
-}
-.glyphicon-object-align-vertical:before {
-  content: "\e248";
-}
-.glyphicon-object-align-right:before {
-  content: "\e249";
-}
-.glyphicon-triangle-right:before {
-  content: "\e250";
-}
-.glyphicon-triangle-left:before {
-  content: "\e251";
-}
-.glyphicon-triangle-bottom:before {
-  content: "\e252";
-}
-.glyphicon-triangle-top:before {
-  content: "\e253";
-}
-.glyphicon-console:before {
-  content: "\e254";
-}
-.glyphicon-superscript:before {
-  content: "\e255";
-}
-.glyphicon-subscript:before {
-  content: "\e256";
-}
-.glyphicon-menu-left:before {
-  content: "\e257";
-}
-.glyphicon-menu-right:before {
-  content: "\e258";
-}
-.glyphicon-menu-down:before {
-  content: "\e259";
-}
-.glyphicon-menu-up:before {
-  content: "\e260";
-}
-* {
-  -webkit-box-sizing: border-box;
-     -moz-box-sizing: border-box;
-          box-sizing: border-box;
-}
-*:before,
-*:after {
-  -webkit-box-sizing: border-box;
-     -moz-box-sizing: border-box;
-          box-sizing: border-box;
-}
-html {
-  font-size: 10px;
-
-  -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
-}
-body {
-  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
-  font-size: 14px;
-  line-height: 1.42857143;
-  color: #333;
-  background-color: #fff;
-}
-input,
-button,
-select,
-textarea {
-  font-family: inherit;
-  font-size: inherit;
-  line-height: inherit;
-}
-a {
-  color: #337ab7;
-  text-decoration: none;
-}
-a:hover,
-a:focus {
-  color: #23527c;
-  text-decoration: underline;
-}
-a:focus {
-  outline: thin dotted;
-  outline: 5px auto -webkit-focus-ring-color;
-  outline-offset: -2px;
-}
-figure {
-  margin: 0;
-}
-img {
-  vertical-align: middle;
-}
-.img-responsive,
-.thumbnail > img,
-.thumbnail a > img,
-.carousel-inner > .item > img,
-.carousel-inner > .item > a > img {
-  display: block;
-  max-width: 100%;
-  height: auto;
-}
-.img-rounded {
-  border-radius: 6px;
-}
-.img-thumbnail {
-  display: inline-block;
-  max-width: 100%;
-  height: auto;
-  padding: 4px;
-  line-height: 1.42857143;
-  background-color: #fff;
-  border: 1px solid #ddd;
-  border-radius: 4px;
-  -webkit-transition: all .2s ease-in-out;
-       -o-transition: all .2s ease-in-out;
-          transition: all .2s ease-in-out;
-}
-.img-circle {
-  border-radius: 50%;
-}
-hr {
-  margin-top: 20px;
-  margin-bottom: 20px;
-  border: 0;
-  border-top: 1px solid #eee;
-}
-.sr-only {
-  position: absolute;
-  width: 1px;
-  height: 1px;
-  padding: 0;
-  margin: -1px;
-  overflow: hidden;
-  clip: rect(0, 0, 0, 0);
-  border: 0;
-}
-.sr-only-focusable:active,
-.sr-only-focusable:focus {
-  position: static;
-  width: auto;
-  height: auto;
-  margin: 0;
-  overflow: visible;
-  clip: auto;
-}
-[role="button"] {
-  cursor: pointer;
-}
-h1,
-h2,
-h3,
-h4,
-h5,
-h6,
-.h1,
-.h2,
-.h3,
-.h4,
-.h5,
-.h6 {
-  font-family: inherit;
-  font-weight: 500;
-  line-height: 1.1;
-  color: inherit;
-}
-h1 small,
-h2 small,
-h3 small,
-h4 small,
-h5 small,
-h6 small,
-.h1 small,
-.h2 small,
-.h3 small,
-.h4 small,
-.h5 small,
-.h6 small,
-h1 .small,
-h2 .small,
-h3 .small,
-h4 .small,
-h5 .small,
-h6 .small,
-.h1 .small,
-.h2 .small,
-.h3 .small,
-.h4 .small,
-.h5 .small,
-.h6 .small {
-  font-weight: normal;
-  line-height: 1;
-  color: #777;
-}
-h1,
-.h1,
-h2,
-.h2,
-h3,
-.h3 {
-  margin-top: 20px;
-  margin-bottom: 10px;
-}
-h1 small,
-.h1 small,
-h2 small,
-.h2 small,
-h3 small,
-.h3 small,
-h1 .small,
-.h1 .small,
-h2 .small,
-.h2 .small,
-h3 .small,
-.h3 .small {
-  font-size: 65%;
-}
-h4,
-.h4,
-h5,
-.h5,
-h6,
-.h6 {
-  margin-top: 10px;
-  margin-bottom: 10px;
-}
-h4 small,
-.h4 small,
-h5 small,
-.h5 small,
-h6 small,
-.h6 small,
-h4 .small,
-.h4 .small,
-h5 .small,
-.h5 .small,
-h6 .small,
-.h6 .small {
-  font-size: 75%;
-}
-h1,
-.h1 {
-  font-size: 36px;
-}
-h2,
-.h2 {
-  font-size: 30px;
-}
-h3,
-.h3 {
-  font-size: 24px;
-}
-h4,
-.h4 {
-  font-size: 18px;
-}
-h5,
-.h5 {
-  font-size: 14px;
-}
-h6,
-.h6 {
-  font-size: 12px;
-}
-p {
-  margin: 0 0 10px;
-}
-.lead {
-  margin-bottom: 20px;
-  font-size: 16px;
-  font-weight: 300;
-  line-height: 1.4;
-}
-@media (min-width: 768px) {
-  .lead {
-    font-size: 21px;
-  }
-}
-small,
-.small {
-  font-size: 85%;
-}
-mark,
-.mark {
-  padding: .2em;
-  background-color: #fcf8e3;
-}
-.text-left {
-  text-align: left;
-}
-.text-right {
-  text-align: right;
-}
-.text-center {
-  text-align: center;
-}
-.text-justify {
-  text-align: justify;
-}
-.text-nowrap {
-  white-space: nowrap;
-}
-.text-lowercase {
-  text-transform: lowercase;
-}
-.text-uppercase {
-  text-transform: uppercase;
-}
-.text-capitalize {
-  text-transform: capitalize;
-}
-.text-muted {
-  color: #777;
-}
-.text-primary {
-  color: #337ab7;
-}
-a.text-primary:hover {
-  color: #286090;
-}
-.text-success {
-  color: #3c763d;
-}
-a.text-success:hover {
-  color: #2b542c;
-}
-.text-info {
-  color: #31708f;
-}
-a.text-info:hover {
-  color: #245269;
-}
-.text-warning {
-  color: #8a6d3b;
-}
-a.text-warning:hover {
-  color: #66512c;
-}
-.text-danger {
-  color: #a94442;
-}
-a.text-danger:hover {
-  color: #843534;
-}
-.bg-primary {
-  color: #fff;
-  background-color: #337ab7;
-}
-a.bg-primary:hover {
-  background-color: #286090;
-}
-.bg-success {
-  background-color: #dff0d8;
-}
-a.bg-success:hover {
-  background-color: #c1e2b3;
-}
-.bg-info {
-  background-color: #d9edf7;
-}
-a.bg-info:hover {
-  background-color: #afd9ee;
-}
-.bg-warning {
-  background-color: #fcf8e3;
-}
-a.bg-warning:hover {
-  background-color: #f7ecb5;
-}
-.bg-danger {
-  background-color: #f2dede;
-}
-a.bg-danger:hover {
-  background-color: #e4b9b9;
-}
-.page-header {
-  padding-bottom: 9px;
-  margin: 40px 0 20px;
-  border-bottom: 1px solid #eee;
-}
-ul,
-ol {
-  margin-top: 0;
-  margin-bottom: 10px;
-}
-ul ul,
-ol ul,
-ul ol,
-ol ol {
-  margin-bottom: 0;
-}
-.list-unstyled {
-  padding-left: 0;
-  list-style: none;
-}
-.list-inline {
-  padding-left: 0;
-  margin-left: -5px;
-  list-style: none;
-}
-.list-inline > li {
-  display: inline-block;
-  padding-right: 5px;
-  padding-left: 5px;
-}
-dl {
-  margin-top: 0;
-  margin-bottom: 20px;
-}
-dt,
-dd {
-  line-height: 1.42857143;
-}
-dt {
-  font-weight: bold;
-}
-dd {
-  margin-left: 0;
-}
-@media (min-width: 768px) {
-  .dl-horizontal dt {
-    float: left;
-    width: 160px;
-    overflow: hidden;
-    clear: left;
-    text-align: right;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-  }
-  .dl-horizontal dd {
-    margin-left: 180px;
-  }
-}
-abbr[title],
-abbr[data-original-title] {
-  cursor: help;
-  border-bottom: 1px dotted #777;
-}
-.initialism {
-  font-size: 90%;
-  text-transform: uppercase;
-}
-blockquote {
-  padding: 10px 20px;
-  margin: 0 0 20px;
-  font-size: 17.5px;
-  border-left: 5px solid #eee;
-}
-blockquote p:last-child,
-blockquote ul:last-child,
-blockquote ol:last-child {
-  margin-bottom: 0;
-}
-blockquote footer,
-blockquote small,
-blockquote .small {
-  display: block;
-  font-size: 80%;
-  line-height: 1.42857143;
-  color: #777;
-}
-blockquote footer:before,
-blockquote small:before,
-blockquote .small:before {
-  content: '\2014 \00A0';
-}
-.blockquote-reverse,
-blockquote.pull-right {
-  padding-right: 15px;
-  padding-left: 0;
-  text-align: right;
-  border-right: 5px solid #eee;
-  border-left: 0;
-}
-.blockquote-reverse footer:before,
-blockquote.pull-right footer:before,
-.blockquote-reverse small:before,
-blockquote.pull-right small:before,
-.blockquote-reverse .small:before,
-blockquote.pull-right .small:before {
-  content: '';
-}
-.blockquote-reverse footer:after,
-blockquote.pull-right footer:after,
-.blockquote-reverse small:after,
-blockquote.pull-right small:after,
-.blockquote-reverse .small:after,
-blockquote.pull-right .small:after {
-  content: '\00A0 \2014';
-}
-address {
-  margin-bottom: 20px;
-  font-style: normal;
-  line-height: 1.42857143;
-}
-code,
-kbd,
-pre,
-samp {
-  font-family: Menlo, Monaco, Consolas, "Courier New", monospace;
-}
-code {
-  padding: 2px 4px;
-  font-size: 90%;
-  color: #c7254e;
-  background-color: #f9f2f4;
-  border-radius: 4px;
-}
-kbd {
-  padding: 2px 4px;
-  font-size: 90%;
-  color: #fff;
-  background-color: #333;
-  border-radius: 3px;
-  -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, .25);
-          box-shadow: inset 0 -1px 0 rgba(0, 0, 0, .25);
-}
-kbd kbd {
-  padding: 0;
-  font-size: 100%;
-  font-weight: bold;
-  -webkit-box-shadow: none;
-          box-shadow: none;
-}
-pre {
-  display: block;
-  padding: 9.5px;
-  margin: 0 0 10px;
-  font-size: 13px;
-  line-height: 1.42857143;
-  color: #333;
-  word-break: break-all;
-  word-wrap: break-word;
-  background-color: #f5f5f5;
-  border: 1px solid #ccc;
-  border-radius: 4px;
-}
-pre code {
-  padding: 0;
-  font-size: inherit;
-  color: inherit;
-  white-space: pre-wrap;
-  background-color: transparent;
-  border-radius: 0;
-}
-.pre-scrollable {
-  max-height: 340px;
-  overflow-y: scroll;
-}
-.container {
-  padding-right: 15px;
-  padding-left: 15px;
-  margin-right: auto;
-  margin-left: auto;
-}
-@media (min-width: 768px) {
-  .container {
-    width: 750px;
-  }
-}
-@media (min-width: 992px) {
-  .container {
-    width: 970px;
-  }
-}
-@media (min-width: 1200px) {
-  .container {
-    width: 1170px;
-  }
-}
-.container-fluid {
-  padding-right: 15px;
-  padding-left: 15px;
-  margin-right: auto;
-  margin-left: auto;
-}
-.row {
-  margin-right: -15px;
-  margin-left: -15px;
-}
-.col-xs-1, .col-sm-1, .col-md-1, .col-lg-1, .col-xs-2, .col-sm-2, .col-md-2, .col-lg-2, .col-xs-3, .col-sm-3, .col-md-3, .col-lg-3, .col-xs-4, .col-sm-4, .col-md-4, .col-lg-4, .col-xs-5, .col-sm-5, .col-md-5, .col-lg-5, .col-xs-6, .col-sm-6, .col-md-6, .col-lg-6, .col-xs-7, .col-sm-7, .col-md-7, .col-lg-7, .col-xs-8, .col-sm-8, .col-md-8, .col-lg-8, .col-xs-9, .col-sm-9, .col-md-9, .col-lg-9, .col-xs-10, .col-sm-10, .col-md-10, .col-lg-10, .col-xs-11, .col-sm-11, .col-md-11, .col-lg-11, .col-xs-12, .col-sm-12, .col-md-12, .col-lg-12 {
-  position: relative;
-  min-height: 1px;
-  padding-right: 15px;
-  padding-left: 15px;
-}
-.col-xs-1, .col-xs-2, .col-xs-3, .col-xs-4, .col-xs-5, .col-xs-6, .col-xs-7, .col-xs-8, .col-xs-9, .col-xs-10, .col-xs-11, .col-xs-12 {
-  float: left;
-}
-.col-xs-12 {
-  width: 100%;
-}
-.col-xs-11 {
-  width: 91.66666667%;
-}
-.col-xs-10 {
-  width: 83.33333333%;
-}
-.col-xs-9 {
-  width: 75%;
-}
-.col-xs-8 {
-  width: 66.66666667%;
-}
-.col-xs-7 {
-  width: 58.33333333%;
-}
-.col-xs-6 {
-  width: 50%;
-}
-.col-xs-5 {
-  width: 41.66666667%;
-}
-.col-xs-4 {
-  width: 33.33333333%;
-}
-.col-xs-3 {
-  width: 25%;
-}
-.col-xs-2 {
-  width: 16.66666667%;
-}
-.col-xs-1 {
-  width: 8.33333333%;
-}
-.col-xs-pull-12 {
-  right: 100%;
-}
-.col-xs-pull-11 {
-  right: 91.66666667%;
-}
-.col-xs-pull-10 {
-  right: 83.33333333%;
-}
-.col-xs-pull-9 {
-  right: 75%;
-}
-.col-xs-pull-8 {
-  right: 66.66666667%;
-}
-.col-xs-pull-7 {
-  right: 58.33333333%;
-}
-.col-xs-pull-6 {
-  right: 50%;
-}
-.col-xs-pull-5 {
-  right: 41.66666667%;
-}
-.col-xs-pull-4 {
-  right: 33.33333333%;
-}
-.col-xs-pull-3 {
-  right: 25%;
-}
-.col-xs-pull-2 {
-  right: 16.66666667%;
-}
-.col-xs-pull-1 {
-  right: 8.33333333%;
-}
-.col-xs-pull-0 {
-  right: auto;
-}
-.col-xs-push-12 {
-  left: 100%;
-}
-.col-xs-push-11 {
-  left: 91.66666667%;
-}
-.col-xs-push-10 {
-  left: 83.33333333%;
-}
-.col-xs-push-9 {
-  left: 75%;
-}
-.col-xs-push-8 {
-  left: 66.66666667%;
-}
-.col-xs-push-7 {
-  left: 58.33333333%;
-}
-.col-xs-push-6 {
-  left: 50%;
-}
-.col-xs-push-5 {
-  left: 41.66666667%;
-}
-.col-xs-push-4 {
-  left: 33.33333333%;
-}
-.col-xs-push-3 {
-  left: 25%;
-}
-.col-xs-push-2 {
-  left: 16.66666667%;
-}
-.col-xs-push-1 {
-  left: 8.33333333%;
-}
-.col-xs-push-0 {
-  left: auto;
-}
-.col-xs-offset-12 {
-  margin-left: 100%;
-}
-.col-xs-offset-11 {
-  margin-left: 91.66666667%;
-}
-.col-xs-offset-10 {
-  margin-left: 83.33333333%;
-}
-.col-xs-offset-9 {
-  margin-left: 75%;
-}
-.col-xs-offset-8 {
-  margin-left: 66.66666667%;
-}
-.col-xs-offset-7 {
-  margin-left: 58.33333333%;
-}
-.col-xs-offset-6 {
-  margin-left: 50%;
-}
-.col-xs-offset-5 {
-  margin-left: 41.66666667%;
-}
-.col-xs-offset-4 {
-  margin-left: 33.33333333%;
-}
-.col-xs-offset-3 {
-  margin-left: 25%;
-}
-.col-xs-offset-2 {
-  margin-left: 16.66666667%;
-}
-.col-xs-offset-1 {
-  margin-left: 8.33333333%;
-}
-.col-xs-offset-0 {
-  margin-left: 0;
-}
-@media (min-width: 768px) {
-  .col-sm-1, .col-sm-2, .col-sm-3, .col-sm-4, .col-sm-5, .col-sm-6, .col-sm-7, .col-sm-8, .col-sm-9, .col-sm-10, .col-sm-11, .col-sm-12 {
-    float: left;
-  }
-  .col-sm-12 {
-    width: 100%;
-  }
-  .col-sm-11 {
-    width: 91.66666667%;
-  }
-  .col-sm-10 {
-    width: 83.33333333%;
-  }
-  .col-sm-9 {
-    width: 75%;
-  }
-  .col-sm-8 {
-    width: 66.66666667%;
-  }
-  .col-sm-7 {
-    width: 58.33333333%;
-  }
-  .col-sm-6 {
-    width: 50%;
-  }
-  .col-sm-5 {
-    width: 41.66666667%;
-  }
-  .col-sm-4 {
-    width: 33.33333333%;
-  }
-  .col-sm-3 {
-    width: 25%;
-  }
-  .col-sm-2 {
-    width: 16.66666667%;
-  }
-  .col-sm-1 {
-    width: 8.33333333%;
-  }
-  .col-sm-pull-12 {
-    right: 100%;
-  }
-  .col-sm-pull-11 {
-    right: 91.66666667%;
-  }
-  .col-sm-pull-10 {
-    right: 83.33333333%;
-  }
-  .col-sm-pull-9 {
-    right: 75%;
-  }
-  .col-sm-pull-8 {
-    right: 66.66666667%;
-  }
-  .col-sm-pull-7 {
-    right: 58.33333333%;
-  }
-  .col-sm-pull-6 {
-    right: 50%;
-  }
-  .col-sm-pull-5 {
-    right: 41.66666667%;
-  }
-  .col-sm-pull-4 {
-    right: 33.33333333%;
-  }
-  .col-sm-pull-3 {
-    right: 25%;
-  }
-  .col-sm-pull-2 {
-    right: 16.66666667%;
-  }
-  .col-sm-pull-1 {
-    right: 8.33333333%;
-  }
-  .col-sm-pull-0 {
-    right: auto;
-  }
-  .col-sm-push-12 {
-    left: 100%;
-  }
-  .col-sm-push-11 {
-    left: 91.66666667%;
-  }
-  .col-sm-push-10 {
-    left: 83.33333333%;
-  }
-  .col-sm-push-9 {
-    left: 75%;
-  }
-  .col-sm-push-8 {
-    left: 66.66666667%;
-  }
-  .col-sm-push-7 {
-    left: 58.33333333%;
-  }
-  .col-sm-push-6 {
-    left: 50%;
-  }
-  .col-sm-push-5 {
-    left: 41.66666667%;
-  }
-  .col-sm-push-4 {
-    left: 33.33333333%;
-  }
-  .col-sm-push-3 {
-    left: 25%;
-  }
-  .col-sm-push-2 {
-    left: 16.66666667%;
-  }
-  .col-sm-push-1 {
-    left: 8.33333333%;
-  }
-  .col-sm-push-0 {
-    left: auto;
-  }
-  .col-sm-offset-12 {
-    margin-left: 100%;
-  }
-  .col-sm-offset-11 {
-    margin-left: 91.66666667%;
-  }
-  .col-sm-offset-10 {
-    margin-left: 83.33333333%;
-  }
-  .col-sm-offset-9 {
-    margin-left: 75%;
-  }
-  .col-sm-offset-8 {
-    margin-left: 66.66666667%;
-  }
-  .col-sm-offset-7 {
-    margin-left: 58.33333333%;
-  }
-  .col-sm-offset-6 {
-    margin-left: 50%;
-  }
-  .col-sm-offset-5 {
-    margin-left: 41.66666667%;
-  }
-  .col-sm-offset-4 {
-    margin-left: 33.33333333%;
-  }
-  .col-sm-offset-3 {
-    margin-left: 25%;
-  }
-  .col-sm-offset-2 {
-    margin-left: 16.66666667%;
-  }
-  .col-sm-offset-1 {
-    margin-left: 8.33333333%;
-  }
-  .col-sm-offset-0 {
-    margin-left: 0;
-  }
-}
-@media (min-width: 992px) {
-  .col-md-1, .col-md-2, .col-md-3, .col-md-4, .col-md-5, .col-md-6, .col-md-7, .col-md-8, .col-md-9, .col-md-10, .col-md-11, .col-md-12 {
-    float: left;
-  }
-  .col-md-12 {
-    width: 100%;
-  }
-  .col-md-11 {
-    width: 91.66666667%;
-  }
-  .col-md-10 {
-    width: 83.33333333%;
-  }
-  .col-md-9 {
-    width: 75%;
-  }
-  .col-md-8 {
-    width: 66.66666667%;
-  }
-  .col-md-7 {
-    width: 58.33333333%;
-  }
-  .col-md-6 {
-    width: 50%;
-  }
-  .col-md-5 {
-    width: 41.66666667%;
-  }
-  .col-md-4 {
-    width: 33.33333333%;
-  }
-  .col-md-3 {
-    width: 25%;
-  }
-  .col-md-2 {
-    width: 16.66666667%;
-  }
-  .col-md-1 {
-    width: 8.33333333%;
-  }
-  .col-md-pull-12 {
-    right: 100%;
-  }
-  .col-md-pull-11 {
-    right: 91.66666667%;
-  }
-  .col-md-pull-10 {
-    right: 83.33333333%;
-  }
-  .col-md-pull-9 {
-    right: 75%;
-  }
-  .col-md-pull-8 {
-    right: 66.66666667%;
-  }
-  .col-md-pull-7 {
-    right: 58.33333333%;
-  }
-  .col-md-pull-6 {
-    right: 50%;
-  }
-  .col-md-pull-5 {
-    right: 41.66666667%;
-  }
-  .col-md-pull-4 {
-    right: 33.33333333%;
-  }
-  .col-md-pull-3 {
-    right: 25%;
-  }
-  .col-md-pull-2 {
-    right: 16.66666667%;
-  }
-  .col-md-pull-1 {
-    right: 8.33333333%;
-  }
-  .col-md-pull-0 {
-    right: auto;
-  }
-  .col-md-push-12 {
-    left: 100%;
-  }
-  .col-md-push-11 {
-    left: 91.66666667%;
-  }
-  .col-md-push-10 {
-    left: 83.33333333%;
-  }
-  .col-md-push-9 {
-    left: 75%;
-  }
-  .col-md-push-8 {
-    left: 66.66666667%;
-  }
-  .col-md-push-7 {
-    left: 58.33333333%;
-  }
-  .col-md-push-6 {
-    left: 50%;
-  }
-  .col-md-push-5 {
-    left: 41.66666667%;
-  }
-  .col-md-push-4 {
-    left: 33.33333333%;
-  }
-  .col-md-push-3 {
-    left: 25%;
-  }
-  .col-md-push-2 {
-    left: 16.66666667%;
-  }
-  .col-md-push-1 {
-    left: 8.33333333%;
-  }
-  .col-md-push-0 {
-    left: auto;
-  }
-  .col-md-offset-12 {
-    margin-left: 100%;
-  }
-  .col-md-offset-11 {
-    margin-left: 91.66666667%;
-  }
-  .col-md-offset-10 {
-    margin-left: 83.33333333%;
-  }
-  .col-md-offset-9 {
-    margin-left: 75%;
-  }
-  .col-md-offset-8 {
-    margin-left: 66.66666667%;
-  }
-  .col-md-offset-7 {
-    margin-left: 58.33333333%;
-  }
-  .col-md-offset-6 {
-    margin-left: 50%;
-  }
-  .col-md-offset-5 {
-    margin-left: 41.66666667%;
-  }
-  .col-md-offset-4 {
-    margin-left: 33.33333333%;
-  }
-  .col-md-offset-3 {
-    margin-left: 25%;
-  }
-  .col-md-offset-2 {
-    margin-left: 16.66666667%;
-  }
-  .col-md-offset-1 {
-    margin-left: 8.33333333%;
-  }
-  .col-md-offset-0 {
-    margin-left: 0;
-  }
-}
-@media (min-width: 1200px) {
-  .col-lg-1, .col-lg-2, .col-lg-3, .col-lg-4, .col-lg-5, .col-lg-6, .col-lg-7, .col-lg-8, .col-lg-9, .col-lg-10, .col-lg-11, .col-lg-12 {
-    float: left;
-  }
-  .col-lg-12 {
-    width: 100%;
-  }
-  .col-lg-11 {
-    width: 91.66666667%;
-  }
-  .col-lg-10 {
-    width: 83.33333333%;
-  }
-  .col-lg-9 {
-    width: 75%;
-  }
-  .col-lg-8 {
-    width: 66.66666667%;
-  }
-  .col-lg-7 {
-    width: 58.33333333%;
-  }
-  .col-lg-6 {
-    width: 50%;
-  }
-  .col-lg-5 {
-    width: 41.66666667%;
-  }
-  .col-lg-4 {
-    width: 33.33333333%;
-  }
-  .col-lg-3 {
-    width: 25%;
-  }
-  .col-lg-2 {
-    width: 16.66666667%;
-  }
-  .col-lg-1 {
-    width: 8.33333333%;
-  }
-  .col-lg-pull-12 {
-    right: 100%;
-  }
-  .col-lg-pull-11 {
-    right: 91.66666667%;
-  }
-  .col-lg-pull-10 {
-    right: 83.33333333%;
-  }
-  .col-lg-pull-9 {
-    right: 75%;
-  }
-  .col-lg-pull-8 {
-    right: 66.66666667%;
-  }
-  .col-lg-pull-7 {
-    right: 58.33333333%;
-  }
-  .col-lg-pull-6 {
-    right: 50%;
-  }
-  .col-lg-pull-5 {
-    right: 41.66666667%;
-  }
-  .col-lg-pull-4 {
-    right: 33.33333333%;
-  }
-  .col-lg-pull-3 {
-    right: 25%;
-  }
-  .col-lg-pull-2 {
-    right: 16.66666667%;
-  }
-  .col-lg-pull-1 {
-    right: 8.33333333%;
-  }
-  .col-lg-pull-0 {
-    right: auto;
-  }
-  .col-lg-push-12 {
-    left: 100%;
-  }
-  .col-lg-push-11 {
-    left: 91.66666667%;
-  }
-  .col-lg-push-10 {
-    left: 83.33333333%;
-  }
-  .col-lg-push-9 {
-    left: 75%;
-  }
-  .col-lg-push-8 {
-    left: 66.66666667%;
-  }
-  .col-lg-push-7 {
-    left: 58.33333333%;
-  }
-  .col-lg-push-6 {
-    left: 50%;
-  }
-  .col-lg-push-5 {
-    left: 41.66666667%;
-  }
-  .col-lg-push-4 {
-    left: 33.33333333%;
-  }
-  .col-lg-push-3 {
-    left: 25%;
-  }
-  .col-lg-push-2 {
-    left: 16.66666667%;
-  }
-  .col-lg-push-1 {
-    left: 8.33333333%;
-  }
-  .col-lg-push-0 {
-    left: auto;
-  }
-  .col-lg-offset-12 {
-    margin-left: 100%;
-  }
-  .col-lg-offset-11 {
-    margin-left: 91.66666667%;
-  }
-  .col-lg-offset-10 {
-    margin-left: 83.33333333%;
-  }
-  .col-lg-offset-9 {
-    margin-left: 75%;
-  }
-  .col-lg-offset-8 {
-    margin-left: 66.66666667%;
-  }
-  .col-lg-offset-7 {
-    margin-left: 58.33333333%;
-  }
-  .col-lg-offset-6 {
-    margin-left: 50%;
-  }
-  .col-lg-offset-5 {
-    margin-left: 41.66666667%;
-  }
-  .col-lg-offset-4 {
-    margin-left: 33.33333333%;
-  }
-  .col-lg-offset-3 {
-    margin-left: 25%;
-  }
-  .col-lg-offset-2 {
-    margin-left: 16.66666667%;
-  }
-  .col-lg-offset-1 {
-    margin-left: 8.33333333%;
-  }
-  .col-lg-offset-0 {
-    margin-left: 0;
-  }
-}
-table {
-  background-color: transparent;
-}
-caption {
-  padding-top: 8px;
-  padding-bottom: 8px;
-  color: #777;
-  text-align: left;
-}
-th {
-  text-align: left;
-}
-.table {
-  width: 100%;
-  max-width: 100%;
-  margin-bottom: 20px;
-}
-.table > thead > tr > th,
-.table > tbody > tr > th,
-.table > tfoot > tr > th,
-.table > thead > tr > td,
-.table > tbody > tr > td,
-.table > tfoot > tr > td {
-  padding: 8px;
-  line-height: 1.42857143;
-  vertical-align: top;
-  border-top: 1px solid #ddd;
-}
-.table > thead > tr > th {
-  vertical-align: bottom;
-  border-bottom: 2px solid #ddd;
-}
-.table > caption + thead > tr:first-child > th,
-.table > colgroup + thead > tr:first-child > th,
-.table > thead:first-child > tr:first-child > th,
-.table > caption + thead > tr:first-child > td,
-.table > colgroup + thead > tr:first-child > td,
-.table > thead:first-child > tr:first-child > td {
-  border-top: 0;
-}
-.table > tbody + tbody {
-  border-top: 2px solid #ddd;
-}
-.table .table {
-  background-color: #fff;
-}
-.table-condensed > thead > tr > th,
-.table-condensed > tbody > tr > th,
-.table-condensed > tfoot > tr > th,
-.table-condensed > thead > tr > td,
-.table-condensed > tbody > tr > td,
-.table-condensed > tfoot > tr > td {
-  padding: 5px;
-}
-.table-bordered {
-  border: 1px solid #ddd;
-}
-.table-bordered > thead > tr > th,
-.table-bordered > tbody > tr > th,
-.table-bordered > tfoot > tr > th,
-.table-bordered > thead > tr > td,
-.table-bordered > tbody > tr > td,
-.table-bordered > tfoot > tr > td {
-  border: 1px solid #ddd;
-}
-.table-bordered > thead > tr > th,
-.table-bordered > thead > tr > td {
-  border-bottom-width: 2px;
-}
-.table-striped > tbody > tr:nth-of-type(odd) {
-  background-color: #f9f9f9;
-}
-.table-hover > tbody > tr:hover {
-  background-color: #f5f5f5;
-}
-table col[class*="col-"] {
-  position: static;
-  display: table-column;
-  float: none;
-}
-table td[class*="col-"],
-table th[class*="col-"] {
-  position: static;
-  display: table-cell;
-  float: none;
-}
-.table > thead > tr > td.active,
-.table > tbody > tr > td.active,
-.table > tfoot > tr > td.active,
-.table > thead > tr > th.active,
-.table > tbody > tr > th.active,
-.table > tfoot > tr > th.active,
-.table > thead > tr.active > td,
-.table > tbody > tr.active > td,
-.table > tfoot > tr.active > td,
-.table > thead > tr.active > th,
-.table > tbody > tr.active > th,
-.table > tfoot > tr.active > th {
-  background-color: #f5f5f5;
-}
-.table-hover > tbody > tr > td.active:hover,
-.table-hover > tbody > tr > th.active:hover,
-.table-hover > tbody > tr.active:hover > td,
-.table-hover > tbody > tr:hover > .active,
-.table-hover > tbody > tr.active:hover > th {
-  background-color: #e8e8e8;
-}
-.table > thead > tr > td.success,
-.table > tbody > tr > td.success,
-.table > tfoot > tr > td.success,
-.table > thead > tr > th.success,
-.table > tbody > tr > th.success,
-.table > tfoot > tr > th.success,
-.table > thead > tr.success > td,
-.table > tbody > tr.success > td,
-.table > tfoot > tr.success > td,
-.table > thead > tr.success > th,
-.table > tbody > tr.success > th,
-.table > tfoot > tr.success > th {
-  background-color: #dff0d8;
-}
-.table-hover > tbody > tr > td.success:hover,
-.table-hover > tbody > tr > th.success:hover,
-.table-hover > tbody > tr.success:hover > td,
-.table-hover > tbody > tr:hover > .success,
-.table-hover > tbody > tr.success:hover > th {
-  background-color: #d0e9c6;
-}
-.table > thead > tr > td.info,
-.table > tbody > tr > td.info,
-.table > tfoot > tr > td.info,
-.table > thead > tr > th.info,
-.table > tbody > tr > th.info,
-.table > tfoot > tr > th.info,
-.table > thead > tr.info > td,
-.table > tbody > tr.info > td,
-.table > tfoot > tr.info > td,
-.table > thead > tr.info > th,
-.table > tbody > tr.info > th,
-.table > tfoot > tr.info > th {
-  background-color: #d9edf7;
-}
-.table-hover > tbody > tr > td.info:hover,
-.table-hover > tbody > tr > th.info:hover,
-.table-hover > tbody > tr.info:hover > td,
-.table-hover > tbody > tr:hover > .info,
-.table-hover > tbody > tr.info:hover > th {
-  background-color: #c4e3f3;
-}
-.table > thead > tr > td.warning,
-.table > tbody > tr > td.warning,
-.table > tfoot > tr > td.warning,
-.table > thead > tr > th.warning,
-.table > tbody > tr > th.warning,
-.table > tfoot > tr > th.warning,
-.table > thead > tr.warning > td,
-.table > tbody > tr.warning > td,
-.table > tfoot > tr.warning > td,
-.table > thead > tr.warning > th,
-.table > tbody > tr.warning > th,
-.table > tfoot > tr.warning > th {
-  background-color: #fcf8e3;
-}
-.table-hover > tbody > tr > td.warning:hover,
-.table-hover > tbody > tr > th.warning:hover,
-.table-hover > tbody > tr.warning:hover > td,
-.table-hover > tbody > tr:hover > .warning,
-.table-hover > tbody > tr.warning:hover > th {
-  background-color: #faf2cc;
-}
-.table > thead > tr > td.danger,
-.table > tbody > tr > td.danger,
-.table > tfoot > tr > td.danger,
-.table > thead > tr > th.danger,
-.table > tbody > tr > th.danger,
-.table > tfoot > tr > th.danger,
-.table > thead > tr.danger > td,
-.table > tbody > tr.danger > td,
-.table > tfoot > tr.danger > td,
-.table > thead > tr.danger > th,
-.table > tbody > tr.danger > th,
-.table > tfoot > tr.danger > th {
-  background-color: #f2dede;
-}
-.table-hover > tbody > tr > td.danger:hover,
-.table-hover > tbody > tr > th.danger:hover,
-.table-hover > tbody > tr.danger:hover > td,
-.table-hover > tbody > tr:hover > .danger,
-.table-hover > tbody > tr.danger:hover > th {
-  background-color: #ebcccc;
-}
-.table-responsive {
-  min-height: .01%;
-  overflow-x: auto;
-}
-@media screen and (max-width: 767px) {
-  .table-responsive {
-    width: 100%;
-    margin-bottom: 15px;
-    overflow-y: hidden;
-    -ms-overflow-style: -ms-autohiding-scrollbar;
-    border: 1px solid #ddd;
-  }
-  .table-responsive > .table {
-    margin-bottom: 0;
-  }
-  .table-responsive > .table > thead > tr > th,
-  .table-responsive > .table > tbody > tr > th,
-  .table-responsive > .table > tfoot > tr > th,
-  .table-responsive > .table > thead > tr > td,
-  .table-responsive > .table > tbody > tr > td,
-  .table-responsive > .table > tfoot > tr > td {
-    white-space: nowrap;
-  }
-  .table-responsive > .table-bordered {
-    border: 0;
-  }
-  .table-responsive > .table-bordered > thead > tr > th:first-child,
-  .table-responsive > .table-bordered > tbody > tr > th:first-child,
-  .table-responsive > .table-bordered > tfoot > tr > th:first-child,
-  .table-responsive > .table-bordered > thead > tr > td:first-child,
-  .table-responsive > .table-bordered > tbody > tr > td:first-child,
-  .table-responsive > .table-bordered > tfoot > tr > td:first-child {
-    border-left: 0;
-  }
-  .table-responsive > .table-bordered > thead > tr > th:last-child,
-  .table-responsive > .table-bordered > tbody > tr > th:last-child,
-  .table-responsive > .table-bordered > tfoot > tr > th:last-child,
-  .table-responsive > .table-bordered > thead > tr > td:last-child,
-  .table-responsive > .table-bordered > tbody > tr > td:last-child,
-  .table-responsive > .table-bordered > tfoot > tr > td:last-child {
-    border-right: 0;
-  }
-  .table-responsive > .table-bordered > tbody > tr:last-child > th,
-  .table-responsive > .table-bordered > tfoot > tr:last-child > th,
-  .table-responsive > .table-bordered > tbody > tr:last-child > td,
-  .table-responsive > .table-bordered > tfoot > tr:last-child > td {
-    border-bottom: 0;
-  }
-}
-fieldset {
-  min-width: 0;
-  padding: 0;
-  margin: 0;
-  border: 0;
-}
-legend {
-  display: block;
-  width: 100%;
-  padding: 0;
-  margin-bottom: 20px;
-  font-size: 21px;
-  line-height: inherit;
-  color: #333;
-  border: 0;
-  border-bottom: 1px solid #e5e5e5;
-}
-label {
-  display: inline-block;
-  max-width: 100%;
-  margin-bottom: 5px;
-  font-weight: bold;
-}
-input[type="search"] {
-  -webkit-box-sizing: border-box;
-     -moz-box-sizing: border-box;
-          box-sizing: border-box;
-}
-input[type="radio"],
-input[type="checkbox"] {
-  margin: 4px 0 0;
-  margin-top: 1px \9;
-  line-height: normal;
-}
-input[type="file"] {
-  display: block;
-}
-input[type="range"] {
-  display: block;
-  width: 100%;
-}
-select[multiple],
-select[size] {
-  height: auto;
-}
-input[type="file"]:focus,
-input[type="radio"]:focus,
-input[type="checkbox"]:focus {
-  outline: thin dotted;
-  outline: 5px auto -webkit-focus-ring-color;
-  outline-offset: -2px;
-}
-output {
-  display: block;
-  padding-top: 7px;
-  font-size: 14px;
-  line-height: 1.42857143;
-  color: #555;
-}
-.form-control {
-  display: block;
-  width: 100%;
-  height: 34px;
-  padding: 6px 12px;
-  font-size: 14px;
-  line-height: 1.42857143;
-  color: #555;
-  background-color: #fff;
-  background-image: none;
-  border: 1px solid #ccc;
-  border-radius: 4px;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
-          box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
-  -webkit-transition: border-color ease-in-out .15s, -webkit-box-shadow ease-in-out .15s;
-       -o-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
-          transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
-}
-.form-control:focus {
-  border-color: #66afe9;
-  outline: 0;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, .6);
-          box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, .6);
-}
-.form-control::-moz-placeholder {
-  color: #999;
-  opacity: 1;
-}
-.form-control:-ms-input-placeholder {
-  color: #999;
-}
-.form-control::-webkit-input-placeholder {
-  color: #999;
-}
-.form-control[disabled],
-.form-control[readonly],
-fieldset[disabled] .form-control {
-  background-color: #eee;
-  opacity: 1;
-}
-.form-control[disabled],
-fieldset[disabled] .form-control {
-  cursor: not-allowed;
-}
-textarea.form-control {
-  height: auto;
-}
-input[type="search"] {
-  -webkit-appearance: none;
-}
-@media screen and (-webkit-min-device-pixel-ratio: 0) {
-  input[type="date"],
-  input[type="time"],
-  input[type="datetime-local"],
-  input[type="month"] {
-    line-height: 34px;
-  }
-  input[type="date"].input-sm,
-  input[type="time"].input-sm,
-  input[type="datetime-local"].input-sm,
-  input[type="month"].input-sm,
-  .input-group-sm input[type="date"],
-  .input-group-sm input[type="time"],
-  .input-group-sm input[type="datetime-local"],
-  .input-group-sm input[type="month"] {
-    line-height: 30px;
-  }
-  input[type="date"].input-lg,
-  input[type="time"].input-lg,
-  input[type="datetime-local"].input-lg,
-  input[type="month"].input-lg,
-  .input-group-lg input[type="date"],
-  .input-group-lg input[type="time"],
-  .input-group-lg input[type="datetime-local"],
-  .input-group-lg input[type="month"] {
-    line-height: 46px;
-  }
-}
-.form-group {
-  margin-bottom: 15px;
-}
-.radio,
-.checkbox {
-  position: relative;
-  display: block;
-  margin-top: 10px;
-  margin-bottom: 10px;
-}
-.radio label,
-.checkbox label {
-  min-height: 20px;
-  padding-left: 20px;
-  margin-bottom: 0;
-  font-weight: normal;
-  cursor: pointer;
-}
-.radio input[type="radio"],
-.radio-inline input[type="radio"],
-.checkbox input[type="checkbox"],
-.checkbox-inline input[type="checkbox"] {
-  position: absolute;
-  margin-top: 4px \9;
-  margin-left: -20px;
-}
-.radio + .radio,
-.checkbox + .checkbox {
-  margin-top: -5px;
-}
-.radio-inline,
-.checkbox-inline {
-  position: relative;
-  display: inline-block;
-  padding-left: 20px;
-  margin-bottom: 0;
-  font-weight: normal;
-  vertical-align: middle;
-  cursor: pointer;
-}
-.radio-inline + .radio-inline,
-.checkbox-inline + .checkbox-inline {
-  margin-top: 0;
-  margin-left: 10px;
-}
-input[type="radio"][disabled],
-input[type="checkbox"][disabled],
-input[type="radio"].disabled,
-input[type="checkbox"].disabled,
-fieldset[disabled] input[type="radio"],
-fieldset[disabled] input[type="checkbox"] {
-  cursor: not-allowed;
-}
-.radio-inline.disabled,
-.checkbox-inline.disabled,
-fieldset[disabled] .radio-inline,
-fieldset[disabled] .checkbox-inline {
-  cursor: not-allowed;
-}
-.radio.disabled label,
-.checkbox.disabled label,
-fieldset[disabled] .radio label,
-fieldset[disabled] .checkbox label {
-  cursor: not-allowed;
-}
-.form-control-static {
-  min-height: 34px;
-  padding-top: 7px;
-  padding-bottom: 7px;
-  margin-bottom: 0;
-}
-.form-control-static.input-lg,
-.form-control-static.input-sm {
-  padding-right: 0;
-  padding-left: 0;
-}
-.input-sm {
-  height: 30px;
-  padding: 5px 10px;
-  font-size: 12px;
-  line-height: 1.5;
-  border-radius: 3px;
-}
-select.input-sm {
-  height: 30px;
-  line-height: 30px;
-}
-textarea.input-sm,
-select[multiple].input-sm {
-  height: auto;
-}
-.form-group-sm .form-control {
-  height: 30px;
-  padding: 5px 10px;
-  font-size: 12px;
-  line-height: 1.5;
-  border-radius: 3px;
-}
-select.form-group-sm .form-control {
-  height: 30px;
-  line-height: 30px;
-}
-textarea.form-group-sm .form-control,
-select[multiple].form-group-sm .form-control {
-  height: auto;
-}
-.form-group-sm .form-control-static {
-  height: 30px;
-  min-height: 32px;
-  padding: 5px 10px;
-  font-size: 12px;
-  line-height: 1.5;
-}
-.input-lg {
-  height: 46px;
-  padding: 10px 16px;
-  font-size: 18px;
-  line-height: 1.3333333;
-  border-radius: 6px;
-}
-select.input-lg {
-  height: 46px;
-  line-height: 46px;
-}
-textarea.input-lg,
-select[multiple].input-lg {
-  height: auto;
-}
-.form-group-lg .form-control {
-  height: 46px;
-  padding: 10px 16px;
-  font-size: 18px;
-  line-height: 1.3333333;
-  border-radius: 6px;
-}
-select.form-group-lg .form-control {
-  height: 46px;
-  line-height: 46px;
-}
-textarea.form-group-lg .form-control,
-select[multiple].form-group-lg .form-control {
-  height: auto;
-}
-.form-group-lg .form-control-static {
-  height: 46px;
-  min-height: 38px;
-  padding: 10px 16px;
-  font-size: 18px;
-  line-height: 1.3333333;
-}
-.has-feedback {
-  position: relative;
-}
-.has-feedback .form-control {
-  padding-right: 42.5px;
-}
-.form-control-feedback {
-  position: absolute;
-  top: 0;
-  right: 0;
-  z-index: 2;
-  display: block;
-  width: 34px;
-  height: 34px;
-  line-height: 34px;
-  text-align: center;
-  pointer-events: none;
-}
-.input-lg + .form-control-feedback {
-  width: 46px;
-  height: 46px;
-  line-height: 46px;
-}
-.input-sm + .form-control-feedback {
-  width: 30px;
-  height: 30px;
-  line-height: 30px;
-}
-.has-success .help-block,
-.has-success .control-label,
-.has-success .radio,
-.has-success .checkbox,
-.has-success .radio-inline,
-.has-success .checkbox-inline,
-.has-success.radio label,
-.has-success.checkbox label,
-.has-success.radio-inline label,
-.has-success.checkbox-inline label {
-  color: #3c763d;
-}
-.has-success .form-control {
-  border-color: #3c763d;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
-          box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
-}
-.has-success .form-control:focus {
-  border-color: #2b542c;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 6px #67b168;
-          box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 6px #67b168;
-}
-.has-success .input-group-addon {
-  color: #3c763d;
-  background-color: #dff0d8;
-  border-color: #3c763d;
-}
-.has-success .form-control-feedback {
-  color: #3c763d;
-}
-.has-warning .help-block,
-.has-warning .control-label,
-.has-warning .radio,
-.has-warning .checkbox,
-.has-warning .radio-inline,
-.has-warning .checkbox-inline,
-.has-warning.radio label,
-.has-warning.checkbox label,
-.has-warning.radio-inline label,
-.has-warning.checkbox-inline label {
-  color: #8a6d3b;
-}
-.has-warning .form-control {
-  border-color: #8a6d3b;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
-          box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
-}
-.has-warning .form-control:focus {
-  border-color: #66512c;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 6px #c0a16b;
-          box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 6px #c0a16b;
-}
-.has-warning .input-group-addon {
-  color: #8a6d3b;
-  background-color: #fcf8e3;
-  border-color: #8a6d3b;
-}
-.has-warning .form-control-feedback {
-  color: #8a6d3b;
-}
-.has-error .help-block,
-.has-error .control-label,
-.has-error .radio,
-.has-error .checkbox,
-.has-error .radio-inline,
-.has-error .checkbox-inline,
-.has-error.radio label,
-.has-error.checkbox label,
-.has-error.radio-inline label,
-.has-error.checkbox-inline label {
-  color: #a94442;
-}
-.has-error .form-control {
-  border-color: #a94442;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
-          box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
-}
-.has-error .form-control:focus {
-  border-color: #843534;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 6px #ce8483;
-          box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 6px #ce8483;
-}
-.has-error .input-group-addon {
-  color: #a94442;
-  background-color: #f2dede;
-  border-color: #a94442;
-}
-.has-error .form-control-feedback {
-  color: #a94442;
-}
-.has-feedback label ~ .form-control-feedback {
-  top: 25px;
-}
-.has-feedback label.sr-only ~ .form-control-feedback {
-  top: 0;
-}
-.help-block {
-  display: block;
-  margin-top: 5px;
-  margin-bottom: 10px;
-  color: #737373;
-}
-@media (min-width: 768px) {
-  .form-inline .form-group {
-    display: inline-block;
-    margin-bottom: 0;
-    vertical-align: middle;
-  }
-  .form-inline .form-control {
-    display: inline-block;
-    width: auto;
-    vertical-align: middle;
-  }
-  .form-inline .form-control-static {
-    display: inline-block;
-  }
-  .form-inline .input-group {
-    display: inline-table;
-    vertical-align: middle;
-  }
-  .form-inline .input-group .input-group-addon,
-  .form-inline .input-group .input-group-btn,
-  .form-inline .input-group .form-control {
-    width: auto;
-  }
-  .form-inline .input-group > .form-control {
-    width: 100%;
-  }
-  .form-inline .control-label {
-    margin-bottom: 0;
-    vertical-align: middle;
-  }
-  .form-inline .radio,
-  .form-inline .checkbox {
-    display: inline-block;
-    margin-top: 0;
-    margin-bottom: 0;
-    vertical-align: middle;
-  }
-  .form-inline .radio label,
-  .form-inline .checkbox label {
-    padding-left: 0;
-  }
-  .form-inline .radio input[type="radio"],
-  .form-inline .checkbox input[type="checkbox"] {
-    position: relative;
-    margin-left: 0;
-  }
-  .form-inline .has-feedback .form-control-feedback {
-    top: 0;
-  }
-}
-.form-horizontal .radio,
-.form-horizontal .checkbox,
-.form-horizontal .radio-inline,
-.form-horizontal .checkbox-inline {
-  padding-top: 7px;
-  margin-top: 0;
-  margin-bottom: 0;
-}
-.form-horizontal .radio,
-.form-horizontal .checkbox {
-  min-height: 27px;
-}
-.form-horizontal .form-group {
-  margin-right: -15px;
-  margin-left: -15px;
-}
-@media (min-width: 768px) {
-  .form-horizontal .control-label {
-    padding-top: 7px;
-    margin-bottom: 0;
-    text-align: right;
-  }
-}
-.form-horizontal .has-feedback .form-control-feedback {
-  right: 15px;
-}
-@media (min-width: 768px) {
-  .form-horizontal .form-group-lg .control-label {
-    padding-top: 14.333333px;
-  }
-}
-@media (min-width: 768px) {
-  .form-horizontal .form-group-sm .control-label {
-    padding-top: 6px;
-  }
-}
-.btn {
-  display: inline-block;
-  padding: 6px 12px;
-  margin-bottom: 0;
-  font-size: 14px;
-  font-weight: normal;
-  line-height: 1.42857143;
-  text-align: center;
-  white-space: nowrap;
-  vertical-align: middle;
-  -ms-touch-action: manipulation;
-      touch-action: manipulation;
-  cursor: pointer;
-  -webkit-user-select: none;
-     -moz-user-select: none;
-      -ms-user-select: none;
-          user-select: none;
-  background-image: none;
-  border: 1px solid transparent;
-  border-radius: 4px;
-}
-.btn:focus,
-.btn:active:focus,
-.btn.active:focus,
-.btn.focus,
-.btn:active.focus,
-.btn.active.focus {
-  outline: thin dotted;
-  outline: 5px auto -webkit-focus-ring-color;
-  outline-offset: -2px;
-}
-.btn:hover,
-.btn:focus,
-.btn.focus {
-  color: #333;
-  text-decoration: none;
-}
-.btn:active,
-.btn.active {
-  background-image: none;
-  outline: 0;
-  -webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125);
-          box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125);
-}
-.btn.disabled,
-.btn[disabled],
-fieldset[disabled] .btn {
-  pointer-events: none;
-  cursor: not-allowed;
-  filter: alpha(opacity=65);
-  -webkit-box-shadow: none;
-          box-shadow: none;
-  opacity: .65;
-}
-.btn-default {
-  color: #333;
-  background-color: #fff;
-  border-color: #ccc;
-}
-.btn-default:hover,
-.btn-default:focus,
-.btn-default.focus,
-.btn-default:active,
-.btn-default.active,
-.open > .dropdown-toggle.btn-default {
-  color: #333;
-  background-color: #e6e6e6;
-  border-color: #adadad;
-}
-.btn-default:active,
-.btn-default.active,
-.open > .dropdown-toggle.btn-default {
-  background-image: none;
-}
-.btn-default.disabled,
-.btn-default[disabled],
-fieldset[disabled] .btn-default,
-.btn-default.disabled:hover,
-.btn-default[disabled]:hover,
-fieldset[disabled] .btn-default:hover,
-.btn-default.disabled:focus,
-.btn-default[disabled]:focus,
-fieldset[disabled] .btn-default:focus,
-.btn-default.disabled.focus,
-.btn-default[disabled].focus,
-fieldset[disabled] .btn-default.focus,
-.btn-default.disabled:active,
-.btn-default[disabled]:active,
-fieldset[disabled] .btn-default:active,
-.btn-default.disabled.active,
-.btn-default[disabled].active,
-fieldset[disabled] .btn-default.active {
-  background-color: #fff;
-  border-color: #ccc;
-}
-.btn-default .badge {
-  color: #fff;
-  background-color: #333;
-}
-.btn-primary {
-  color: #fff;
-  background-color: #337ab7;
-  border-color: #2e6da4;
-}
-.btn-primary:hover,
-.btn-primary:focus,
-.btn-primary.focus,
-.btn-primary:active,
-.btn-primary.active,
-.open > .dropdown-toggle.btn-primary {
-  color: #fff;
-  background-color: #286090;
-  border-color: #204d74;
-}
-.btn-primary:active,
-.btn-primary.active,
-.open > .dropdown-toggle.btn-primary {
-  background-image: none;
-}
-.btn-primary.disabled,
-.btn-primary[disabled],
-fieldset[disabled] .btn-primary,
-.btn-primary.disabled:hover,
-.btn-primary[disabled]:hover,
-fieldset[disabled] .btn-primary:hover,
-.btn-primary.disabled:focus,
-.btn-primary[disabled]:focus,
-fieldset[disabled] .btn-primary:focus,
-.btn-primary.disabled.focus,
-.btn-primary[disabled].focus,
-fieldset[disabled] .btn-primary.focus,
-.btn-primary.disabled:active,
-.btn-primary[disabled]:active,
-fieldset[disabled] .btn-primary:active,
-.btn-primary.disabled.active,
-.btn-primary[disabled].active,
-fieldset[disabled] .btn-primary.active {
-  background-color: #337ab7;
-  border-color: #2e6da4;
-}
-.btn-primary .badge {
-  color: #337ab7;
-  background-color: #fff;
-}
-.btn-success {
-  color: #fff;
-  background-color: #5cb85c;
-  border-color: #4cae4c;
-}
-.btn-success:hover,
-.btn-success:focus,
-.btn-success.focus,
-.btn-success:active,
-.btn-success.active,
-.open > .dropdown-toggle.btn-success {
-  color: #fff;
-  background-color: #449d44;
-  border-color: #398439;
-}
-.btn-success:active,
-.btn-success.active,
-.open > .dropdown-toggle.btn-success {
-  background-image: none;
-}
-.btn-success.disabled,
-.btn-success[disabled],
-fieldset[disabled] .btn-success,
-.btn-success.disabled:hover,
-.btn-success[disabled]:hover,
-fieldset[disabled] .btn-success:hover,
-.btn-success.disabled:focus,
-.btn-success[disabled]:focus,
-fieldset[disabled] .btn-success:focus,
-.btn-success.disabled.focus,
-.btn-success[disabled].focus,
-fieldset[disabled] .btn-success.focus,
-.btn-success.disabled:active,
-.btn-success[disabled]:active,
-fieldset[disabled] .btn-success:active,
-.btn-success.disabled.active,
-.btn-success[disabled].active,
-fieldset[disabled] .btn-success.active {
-  background-color: #5cb85c;
-  border-color: #4cae4c;
-}
-.btn-success .badge {
-  color: #5cb85c;
-  background-color: #fff;
-}
-.btn-info {
-  color: #fff;
-  background-color: #5bc0de;
-  border-color: #46b8da;
-}
-.btn-info:hover,
-.btn-info:focus,
-.btn-info.focus,
-.btn-info:active,
-.btn-info.active,
-.open > .dropdown-toggle.btn-info {
-  color: #fff;
-  background-color: #31b0d5;
-  border-color: #269abc;
-}
-.btn-info:active,
-.btn-info.active,
-.open > .dropdown-toggle.btn-info {
-  background-image: none;
-}
-.btn-info.disabled,
-.btn-info[disabled],
-fieldset[disabled] .btn-info,
-.btn-info.disabled:hover,
-.btn-info[disabled]:hover,
-fieldset[disabled] .btn-info:hover,
-.btn-info.disabled:focus,
-.btn-info[disabled]:focus,
-fieldset[disabled] .btn-info:focus,
-.btn-info.disabled.focus,
-.btn-info[disabled].focus,
-fieldset[disabled] .btn-info.focus,
-.btn-info.disabled:active,
-.btn-info[disabled]:active,
-fieldset[disabled] .btn-info:active,
-.btn-info.disabled.active,
-.btn-info[disabled].active,
-fieldset[disabled] .btn-info.active {
-  background-color: #5bc0de;
-  border-color: #46b8da;
-}
-.btn-info .badge {
-  color: #5bc0de;
-  background-color: #fff;
-}
-.btn-warning {
-  color: #fff;
-  background-color: #f0ad4e;
-  border-color: #eea236;
-}
-.btn-warning:hover,
-.btn-warning:focus,
-.btn-warning.focus,
-.btn-warning:active,
-.btn-warning.active,
-.open > .dropdown-toggle.btn-warning {
-  color: #fff;
-  background-color: #ec971f;
-  border-color: #d58512;
-}
-.btn-warning:active,
-.btn-warning.active,
-.open > .dropdown-toggle.btn-warning {
-  background-image: none;
-}
-.btn-warning.disabled,
-.btn-warning[disabled],
-fieldset[disabled] .btn-warning,
-.btn-warning.disabled:hover,
-.btn-warning[disabled]:hover,
-fieldset[disabled] .btn-warning:hover,
-.btn-warning.disabled:focus,
-.btn-warning[disabled]:focus,
-fieldset[disabled] .btn-warning:focus,
-.btn-warning.disabled.focus,
-.btn-warning[disabled].focus,
-fieldset[disabled] .btn-warning.focus,
-.btn-warning.disabled:active,
-.btn-warning[disabled]:active,
-fieldset[disabled] .btn-warning:active,
-.btn-warning.disabled.active,
-.btn-warning[disabled].active,
-fieldset[disabled] .btn-warning.active {
-  background-color: #f0ad4e;
-  border-color: #eea236;
-}
-.btn-warning .badge {
-  color: #f0ad4e;
-  background-color: #fff;
-}
-.btn-danger {
-  color: #fff;
-  background-color: #d9534f;
-  border-color: #d43f3a;
-}
-.btn-danger:hover,
-.btn-danger:focus,
-.btn-danger.focus,
-.btn-danger:active,
-.btn-danger.active,
-.open > .dropdown-toggle.btn-danger {
-  color: #fff;
-  background-color: #c9302c;
-  border-color: #ac2925;
-}
-.btn-danger:active,
-.btn-danger.active,
-.open > .dropdown-toggle.btn-danger {
-  background-image: none;
-}
-.btn-danger.disabled,
-.btn-danger[disabled],
-fieldset[disabled] .btn-danger,
-.btn-danger.disabled:hover,
-.btn-danger[disabled]:hover,
-fieldset[disabled] .btn-danger:hover,
-.btn-danger.disabled:focus,
-.btn-danger[disabled]:focus,
-fieldset[disabled] .btn-danger:focus,
-.btn-danger.disabled.focus,
-.btn-danger[disabled].focus,
-fieldset[disabled] .btn-danger.focus,
-.btn-danger.disabled:active,
-.btn-danger[disabled]:active,
-fieldset[disabled] .btn-danger:active,
-.btn-danger.disabled.active,
-.btn-danger[disabled].active,
-fieldset[disabled] .btn-danger.active {
-  background-color: #d9534f;
-  border-color: #d43f3a;
-}
-.btn-danger .badge {
-  color: #d9534f;
-  background-color: #fff;
-}
-.btn-link {
-  font-weight: normal;
-  color: #337ab7;
-  border-radius: 0;
-}
-.btn-link,
-.btn-link:active,
-.btn-link.active,
-.btn-link[disabled],
-fieldset[disabled] .btn-link {
-  background-color: transparent;
-  -webkit-box-shadow: none;
-          box-shadow: none;
-}
-.btn-link,
-.btn-link:hover,
-.btn-link:focus,
-.btn-link:active {
-  border-color: transparent;
-}
-.btn-link:hover,
-.btn-link:focus {
-  color: #23527c;
-  text-decoration: underline;
-  background-color: transparent;
-}
-.btn-link[disabled]:hover,
-fieldset[disabled] .btn-link:hover,
-.btn-link[disabled]:focus,
-fieldset[disabled] .btn-link:focus {
-  color: #777;
-  text-decoration: none;
-}
-.btn-lg,
-.btn-group-lg > .btn {
-  padding: 10px 16px;
-  font-size: 18px;
-  line-height: 1.3333333;
-  border-radius: 6px;
-}
-.btn-sm,
-.btn-group-sm > .btn {
-  padding: 5px 10px;
-  font-size: 12px;
-  line-height: 1.5;
-  border-radius: 3px;
-}
-.btn-xs,
-.btn-group-xs > .btn {
-  padding: 1px 5px;
-  font-size: 12px;
-  line-height: 1.5;
-  border-radius: 3px;
-}
-.btn-block {
-  display: block;
-  width: 100%;
-}
-.btn-block + .btn-block {
-  margin-top: 5px;
-}
-input[type="submit"].btn-block,
-input[type="reset"].btn-block,
-input[type="button"].btn-block {
-  width: 100%;
-}
-.fade {
-  opacity: 0;
-  -webkit-transition: opacity .15s linear;
-       -o-transition: opacity .15s linear;
-          transition: opacity .15s linear;
-}
-.fade.in {
-  opacity: 1;
-}
-.collapse {
-  display: none;
-}
-.collapse.in {
-  display: block;
-}
-tr.collapse.in {
-  display: table-row;
-}
-tbody.collapse.in {
-  display: table-row-group;
-}
-.collapsing {
-  position: relative;
-  height: 0;
-  overflow: hidden;
-  -webkit-transition-timing-function: ease;
-       -o-transition-timing-function: ease;
-          transition-timing-function: ease;
-  -webkit-transition-duration: .35s;
-       -o-transition-duration: .35s;
-          transition-duration: .35s;
-  -webkit-transition-property: height, visibility;
-       -o-transition-property: height, visibility;
-          transition-property: height, visibility;
-}
-.caret {
-  display: inline-block;
-  width: 0;
-  height: 0;
-  margin-left: 2px;
-  vertical-align: middle;
-  border-top: 4px dashed;
-  border-right: 4px solid transparent;
-  border-left: 4px solid transparent;
-}
-.dropup,
-.dropdown {
-  position: relative;
-}
-.dropdown-toggle:focus {
-  outline: 0;
-}
-.dropdown-menu {
-  position: absolute;
-  top: 100%;
-  left: 0;
-  z-index: 1000;
-  display: none;
-  float: left;
-  min-width: 160px;
-  padding: 5px 0;
-  margin: 2px 0 0;
-  font-size: 14px;
-  text-align: left;
-  list-style: none;
-  background-color: #fff;
-  -webkit-background-clip: padding-box;
-          background-clip: padding-box;
-  border: 1px solid #ccc;
-  border: 1px solid rgba(0, 0, 0, .15);
-  border-radius: 4px;
-  -webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, .175);
-          box-shadow: 0 6px 12px rgba(0, 0, 0, .175);
-}
-.dropdown-menu.pull-right {
-  right: 0;
-  left: auto;
-}
-.dropdown-menu .divider {
-  height: 1px;
-  margin: 9px 0;
-  overflow: hidden;
-  background-color: #e5e5e5;
-}
-.dropdown-menu > li > a {
-  display: block;
-  padding: 3px 20px;
-  clear: both;
-  font-weight: normal;
-  line-height: 1.42857143;
-  color: #333;
-  white-space: nowrap;
-}
-.dropdown-menu > li > a:hover,
-.dropdown-menu > li > a:focus {
-  color: #262626;
-  text-decoration: none;
-  background-color: #f5f5f5;
-}
-.dropdown-menu > .active > a,
-.dropdown-menu > .active > a:hover,
-.dropdown-menu > .active > a:focus {
-  color: #fff;
-  text-decoration: none;
-  background-color: #337ab7;
-  outline: 0;
-}
-.dropdown-menu > .disabled > a,
-.dropdown-menu > .disabled > a:hover,
-.dropdown-menu > .disabled > a:focus {
-  color: #777;
-}
-.dropdown-menu > .disabled > a:hover,
-.dropdown-menu > .disabled > a:focus {
-  text-decoration: none;
-  cursor: not-allowed;
-  background-color: transparent;
-  background-image: none;
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
-}
-.open > .dropdown-menu {
-  display: block;
-}
-.open > a {
-  outline: 0;
-}
-.dropdown-menu-right {
-  right: 0;
-  left: auto;
-}
-.dropdown-menu-left {
-  right: auto;
-  left: 0;
-}
-.dropdown-header {
-  display: block;
-  padding: 3px 20px;
-  font-size: 12px;
-  line-height: 1.42857143;
-  color: #777;
-  white-space: nowrap;
-}
-.dropdown-backdrop {
-  position: fixed;
-  top: 0;
-  right: 0;
-  bottom: 0;
-  left: 0;
-  z-index: 990;
-}
-.pull-right > .dropdown-menu {
-  right: 0;
-  left: auto;
-}
-.dropup .caret,
-.navbar-fixed-bottom .dropdown .caret {
-  content: "";
-  border-top: 0;
-  border-bottom: 4px solid;
-}
-.dropup .dropdown-menu,
-.navbar-fixed-bottom .dropdown .dropdown-menu {
-  top: auto;
-  bottom: 100%;
-  margin-bottom: 2px;
-}
-@media (min-width: 768px) {
-  .navbar-right .dropdown-menu {
-    right: 0;
-    left: auto;
-  }
-  .navbar-right .dropdown-menu-left {
-    right: auto;
-    left: 0;
-  }
-}
-.btn-group,
-.btn-group-vertical {
-  position: relative;
-  display: inline-block;
-  vertical-align: middle;
-}
-.btn-group > .btn,
-.btn-group-vertical > .btn {
-  position: relative;
-  float: left;
-}
-.btn-group > .btn:hover,
-.btn-group-vertical > .btn:hover,
-.btn-group > .btn:focus,
-.btn-group-vertical > .btn:focus,
-.btn-group > .btn:active,
-.btn-group-vertical > .btn:active,
-.btn-group > .btn.active,
-.btn-group-vertical > .btn.active {
-  z-index: 2;
-}
-.btn-group .btn + .btn,
-.btn-group .btn + .btn-group,
-.btn-group .btn-group + .btn,
-.btn-group .btn-group + .btn-group {
-  margin-left: -1px;
-}
-.btn-toolbar {
-  margin-left: -5px;
-}
-.btn-toolbar .btn-group,
-.btn-toolbar .input-group {
-  float: left;
-}
-.btn-toolbar > .btn,
-.btn-toolbar > .btn-group,
-.btn-toolbar > .input-group {
-  margin-left: 5px;
-}
-.btn-group > .btn:not(:first-child):not(:last-child):not(.dropdown-toggle) {
-  border-radius: 0;
-}
-.btn-group > .btn:first-child {
-  margin-left: 0;
-}
-.btn-group > .btn:first-child:not(:last-child):not(.dropdown-toggle) {
-  border-top-right-radius: 0;
-  border-bottom-right-radius: 0;
-}
-.btn-group > .btn:last-child:not(:first-child),
-.btn-group > .dropdown-toggle:not(:first-child) {
-  border-top-left-radius: 0;
-  border-bottom-left-radius: 0;
-}
-.btn-group > .btn-group {
-  float: left;
-}
-.btn-group > .btn-group:not(:first-child):not(:last-child) > .btn {
-  border-radius: 0;
-}
-.btn-group > .btn-group:first-child:not(:last-child) > .btn:last-child,
-.btn-group > .btn-group:first-child:not(:last-child) > .dropdown-toggle {
-  border-top-right-radius: 0;
-  border-bottom-right-radius: 0;
-}
-.btn-group > .btn-group:last-child:not(:first-child) > .btn:first-child {
-  border-top-left-radius: 0;
-  border-bottom-left-radius: 0;
-}
-.btn-group .dropdown-toggle:active,
-.btn-group.open .dropdown-toggle {
-  outline: 0;
-}
-.btn-group > .btn + .dropdown-toggle {
-  padding-right: 8px;
-  padding-left: 8px;
-}
-.btn-group > .btn-lg + .dropdown-toggle {
-  padding-right: 12px;
-  padding-left: 12px;
-}
-.btn-group.open .dropdown-toggle {
-  -webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125);
-          box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125);
-}
-.btn-group.open .dropdown-toggle.btn-link {
-  -webkit-box-shadow: none;
-          box-shadow: none;
-}
-.btn .caret {
-  margin-left: 0;
-}
-.btn-lg .caret {
-  border-width: 5px 5px 0;
-  border-bottom-width: 0;
-}
-.dropup .btn-lg .caret {
-  border-width: 0 5px 5px;
-}
-.btn-group-vertical > .btn,
-.btn-group-vertical > .btn-group,
-.btn-group-vertical > .btn-group > .btn {
-  display: block;
-  float: none;
-  width: 100%;
-  max-width: 100%;
-}
-.btn-group-vertical > .btn-group > .btn {
-  float: none;
-}
-.btn-group-vertical > .btn + .btn,
-.btn-group-vertical > .btn + .btn-group,
-.btn-group-vertical > .btn-group + .btn,
-.btn-group-vertical > .btn-group + .btn-group {
-  margin-top: -1px;
-  margin-left: 0;
-}
-.btn-group-vertical > .btn:not(:first-child):not(:last-child) {
-  border-radius: 0;
-}
-.btn-group-vertical > .btn:first-child:not(:last-child) {
-  border-top-right-radius: 4px;
-  border-bottom-right-radius: 0;
-  border-bottom-left-radius: 0;
-}
-.btn-group-vertical > .btn:last-child:not(:first-child) {
-  border-top-left-radius: 0;
-  border-top-right-radius: 0;
-  border-bottom-left-radius: 4px;
-}
-.btn-group-vertical > .btn-group:not(:first-child):not(:last-child) > .btn {
-  border-radius: 0;
-}
-.btn-group-vertical > .btn-group:first-child:not(:last-child) > .btn:last-child,
-.btn-group-vertical > .btn-group:first-child:not(:last-child) > .dropdown-toggle {
-  border-bottom-right-radius: 0;
-  border-bottom-left-radius: 0;
-}
-.btn-group-vertical > .btn-group:last-child:not(:first-child) > .btn:first-child {
-  border-top-left-radius: 0;
-  border-top-right-radius: 0;
-}
-.btn-group-justified {
-  display: table;
-  width: 100%;
-  table-layout: fixed;
-  border-collapse: separate;
-}
-.btn-group-justified > .btn,
-.btn-group-justified > .btn-group {
-  display: table-cell;
-  float: none;
-  width: 1%;
-}
-.btn-group-justified > .btn-group .btn {
-  width: 100%;
-}
-.btn-group-justified > .btn-group .dropdown-menu {
-  left: auto;
-}
-[data-toggle="buttons"] > .btn input[type="radio"],
-[data-toggle="buttons"] > .btn-group > .btn input[type="radio"],
-[data-toggle="buttons"] > .btn input[type="checkbox"],
-[data-toggle="buttons"] > .btn-group > .btn input[type="checkbox"] {
-  position: absolute;
-  clip: rect(0, 0, 0, 0);
-  pointer-events: none;
-}
-.input-group {
-  position: relative;
-  display: table;
-  border-collapse: separate;
-}
-.input-group[class*="col-"] {
-  float: none;
-  padding-right: 0;
-  padding-left: 0;
-}
-.input-group .form-control {
-  position: relative;
-  z-index: 2;
-  float: left;
-  width: 100%;
-  margin-bottom: 0;
-}
-.input-group-lg > .form-control,
-.input-group-lg > .input-group-addon,
-.input-group-lg > .input-group-btn > .btn {
-  height: 46px;
-  padding: 10px 16px;
-  font-size: 18px;
-  line-height: 1.3333333;
-  border-radius: 6px;
-}
-select.input-group-lg > .form-control,
-select.input-group-lg > .input-group-addon,
-select.input-group-lg > .input-group-btn > .btn {
-  height: 46px;
-  line-height: 46px;
-}
-textarea.input-group-lg > .form-control,
-textarea.input-group-lg > .input-group-addon,
-textarea.input-group-lg > .input-group-btn > .btn,
-select[multiple].input-group-lg > .form-control,
-select[multiple].input-group-lg > .input-group-addon,
-select[multiple].input-group-lg > .input-group-btn > .btn {
-  height: auto;
-}
-.input-group-sm > .form-control,
-.input-group-sm > .input-group-addon,
-.input-group-sm > .input-group-btn > .btn {
-  height: 30px;
-  padding: 5px 10px;
-  font-size: 12px;
-  line-height: 1.5;
-  border-radius: 3px;
-}
-select.input-group-sm > .form-control,
-select.input-group-sm > .input-group-addon,
-select.input-group-sm > .input-group-btn > .btn {
-  height: 30px;
-  line-height: 30px;
-}
-textarea.input-group-sm > .form-control,
-textarea.input-group-sm > .input-group-addon,
-textarea.input-group-sm > .input-group-btn > .btn,
-select[multiple].input-group-sm > .form-control,
-select[multiple].input-group-sm > .input-group-addon,
-select[multiple].input-group-sm > .input-group-btn > .btn {
-  height: auto;
-}
-.input-group-addon,
-.input-group-btn,
-.input-group .form-control {
-  display: table-cell;
-}
-.input-group-addon:not(:first-child):not(:last-child),
-.input-group-btn:not(:first-child):not(:last-child),
-.input-group .form-control:not(:first-child):not(:last-child) {
-  border-radius: 0;
-}
-.input-group-addon,
-.input-group-btn {
-  width: 1%;
-  white-space: nowrap;
-  vertical-align: middle;
-}
-.input-group-addon {
-  padding: 6px 12px;
-  font-size: 14px;
-  font-weight: normal;
-  line-height: 1;
-  color: #555;
-  text-align: center;
-  background-color: #eee;
-  border: 1px solid #ccc;
-  border-radius: 4px;
-}
-.input-group-addon.input-sm {
-  padding: 5px 10px;
-  font-size: 12px;
-  border-radius: 3px;
-}
-.input-group-addon.input-lg {
-  padding: 10px 16px;
-  font-size: 18px;
-  border-radius: 6px;
-}
-.input-group-addon input[type="radio"],
-.input-group-addon input[type="checkbox"] {
-  margin-top: 0;
-}
-.input-group .form-control:first-child,
-.input-group-addon:first-child,
-.input-group-btn:first-child > .btn,
-.input-group-btn:first-child > .btn-group > .btn,
-.input-group-btn:first-child > .dropdown-toggle,
-.input-group-btn:last-child > .btn:not(:last-child):not(.dropdown-toggle),
-.input-group-btn:last-child > .btn-group:not(:last-child) > .btn {
-  border-top-right-radius: 0;
-  border-bottom-right-radius: 0;
-}
-.input-group-addon:first-child {
-  border-right: 0;
-}
-.input-group .form-control:last-child,
-.input-group-addon:last-child,
-.input-group-btn:last-child > .btn,
-.input-group-btn:last-child > .btn-group > .btn,
-.input-group-btn:last-child > .dropdown-toggle,
-.input-group-btn:first-child > .btn:not(:first-child),
-.input-group-btn:first-child > .btn-group:not(:first-child) > .btn {
-  border-top-left-radius: 0;
-  border-bottom-left-radius: 0;
-}
-.input-group-addon:last-child {
-  border-left: 0;
-}
-.input-group-btn {
-  position: relative;
-  font-size: 0;
-  white-space: nowrap;
-}
-.input-group-btn > .btn {
-  position: relative;
-}
-.input-group-btn > .btn + .btn {
-  margin-left: -1px;
-}
-.input-group-btn > .btn:hover,
-.input-group-btn > .btn:focus,
-.input-group-btn > .btn:active {
-  z-index: 2;
-}
-.input-group-btn:first-child > .btn,
-.input-group-btn:first-child > .btn-group {
-  margin-right: -1px;
-}
-.input-group-btn:last-child > .btn,
-.input-group-btn:last-child > .btn-group {
-  margin-left: -1px;
-}
-.nav {
-  padding-left: 0;
-  margin-bottom: 0;
-  list-style: none;
-}
-.nav > li {
-  position: relative;
-  display: block;
-}
-.nav > li > a {
-  position: relative;
-  display: block;
-  padding: 10px 15px;
-}
-.nav > li > a:hover,
-.nav > li > a:focus {
-  text-decoration: none;
-  background-color: #eee;
-}
-.nav > li.disabled > a {
-  color: #777;
-}
-.nav > li.disabled > a:hover,
-.nav > li.disabled > a:focus {
-  color: #777;
-  text-decoration: none;
-  cursor: not-allowed;
-  background-color: transparent;
-}
-.nav .open > a,
-.nav .open > a:hover,
-.nav .open > a:focus {
-  background-color: #eee;
-  border-color: #337ab7;
-}
-.nav .nav-divider {
-  height: 1px;
-  margin: 9px 0;
-  overflow: hidden;
-  background-color: #e5e5e5;
-}
-.nav > li > a > img {
-  max-width: none;
-}
-.nav-tabs {
-  border-bottom: 1px solid #ddd;
-}
-.nav-tabs > li {
-  float: left;
-  margin-bottom: -1px;
-}
-.nav-tabs > li > a {
-  margin-right: 2px;
-  line-height: 1.42857143;
-  border: 1px solid transparent;
-  border-radius: 4px 4px 0 0;
-}
-.nav-tabs > li > a:hover {
-  border-color: #eee #eee #ddd;
-}
-.nav-tabs > li.active > a,
-.nav-tabs > li.active > a:hover,
-.nav-tabs > li.active > a:focus {
-  color: #555;
-  cursor: default;
-  background-color: #fff;
-  border: 1px solid #ddd;
-  border-bottom-color: transparent;
-}
-.nav-tabs.nav-justified {
-  width: 100%;
-  border-bottom: 0;
-}
-.nav-tabs.nav-justified > li {
-  float: none;
-}
-.nav-tabs.nav-justified > li > a {
-  margin-bottom: 5px;
-  text-align: center;
-}
-.nav-tabs.nav-justified > .dropdown .dropdown-menu {
-  top: auto;
-  left: auto;
-}
-@media (min-width: 768px) {
-  .nav-tabs.nav-justified > li {
-    display: table-cell;
-    width: 1%;
-  }
-  .nav-tabs.nav-justified > li > a {
-    margin-bottom: 0;
-  }
-}
-.nav-tabs.nav-justified > li > a {
-  margin-right: 0;
-  border-radius: 4px;
-}
-.nav-tabs.nav-justified > .active > a,
-.nav-tabs.nav-justified > .active > a:hover,
-.nav-tabs.nav-justified > .active > a:focus {
-  border: 1px solid #ddd;
-}
-@media (min-width: 768px) {
-  .nav-tabs.nav-justified > li > a {
-    border-bottom: 1px solid #ddd;
-    border-radius: 4px 4px 0 0;
-  }
-  .nav-tabs.nav-justified > .active > a,
-  .nav-tabs.nav-justified > .active > a:hover,
-  .nav-tabs.nav-justified > .active > a:focus {
-    border-bottom-color: #fff;
-  }
-}
-.nav-pills > li {
-  float: left;
-}
-.nav-pills > li > a {
-  border-radius: 4px;
-}
-.nav-pills > li + li {
-  margin-left: 2px;
-}
-.nav-pills > li.active > a,
-.nav-pills > li.active > a:hover,
-.nav-pills > li.active > a:focus {
-  color: #fff;
-  background-color: #337ab7;
-}
-.nav-stacked > li {
-  float: none;
-}
-.nav-stacked > li + li {
-  margin-top: 2px;
-  margin-left: 0;
-}
-.nav-justified {
-  width: 100%;
-}
-.nav-justified > li {
-  float: none;
-}
-.nav-justified > li > a {
-  margin-bottom: 5px;
-  text-align: center;
-}
-.nav-justified > .dropdown .dropdown-menu {
-  top: auto;
-  left: auto;
-}
-@media (min-width: 768px) {
-  .nav-justified > li {
-    display: table-cell;
-    width: 1%;
-  }
-  .nav-justified > li > a {
-    margin-bottom: 0;
-  }
-}
-.nav-tabs-justified {
-  border-bottom: 0;
-}
-.nav-tabs-justified > li > a {
-  margin-right: 0;
-  border-radius: 4px;
-}
-.nav-tabs-justified > .active > a,
-.nav-tabs-justified > .active > a:hover,
-.nav-tabs-justified > .active > a:focus {
-  border: 1px solid #ddd;
-}
-@media (min-width: 768px) {
-  .nav-tabs-justified > li > a {
-    border-bottom: 1px solid #ddd;
-    border-radius: 4px 4px 0 0;
-  }
-  .nav-tabs-justified > .active > a,
-  .nav-tabs-justified > .active > a:hover,
-  .nav-tabs-justified > .active > a:focus {
-    border-bottom-color: #fff;
-  }
-}
-.tab-content > .tab-pane {
-  display: none;
-}
-.tab-content > .active {
-  display: block;
-}
-.nav-tabs .dropdown-menu {
-  margin-top: -1px;
-  border-top-left-radius: 0;
-  border-top-right-radius: 0;
-}
-.navbar {
-  position: relative;
-  min-height: 50px;
-  margin-bottom: 20px;
-  border: 1px solid transparent;
-}
-@media (min-width: 768px) {
-  .navbar {
-    border-radius: 4px;
-  }
-}
-@media (min-width: 768px) {
-  .navbar-header {
-    float: left;
-  }
-}
-.navbar-collapse {
-  padding-right: 15px;
-  padding-left: 15px;
-  overflow-x: visible;
-  -webkit-overflow-scrolling: touch;
-  border-top: 1px solid transparent;
-  -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, .1);
-          box-shadow: inset 0 1px 0 rgba(255, 255, 255, .1);
-}
-.navbar-collapse.in {
-  overflow-y: auto;
-}
-@media (min-width: 768px) {
-  .navbar-collapse {
-    width: auto;
-    border-top: 0;
-    -webkit-box-shadow: none;
-            box-shadow: none;
-  }
-  .navbar-collapse.collapse {
-    display: block !important;
-    height: auto !important;
-    padding-bottom: 0;
-    overflow: visible !important;
-  }
-  .navbar-collapse.in {
-    overflow-y: visible;
-  }
-  .navbar-fixed-top .navbar-collapse,
-  .navbar-static-top .navbar-collapse,
-  .navbar-fixed-bottom .navbar-collapse {
-    padding-right: 0;
-    padding-left: 0;
-  }
-}
-.navbar-fixed-top .navbar-collapse,
-.navbar-fixed-bottom .navbar-collapse {
-  max-height: 340px;
-}
-@media (max-device-width: 480px) and (orientation: landscape) {
-  .navbar-fixed-top .navbar-collapse,
-  .navbar-fixed-bottom .navbar-collapse {
-    max-height: 200px;
-  }
-}
-.container > .navbar-header,
-.container-fluid > .navbar-header,
-.container > .navbar-collapse,
-.container-fluid > .navbar-collapse {
-  margin-right: -15px;
-  margin-left: -15px;
-}
-@media (min-width: 768px) {
-  .container > .navbar-header,
-  .container-fluid > .navbar-header,
-  .container > .navbar-collapse,
-  .container-fluid > .navbar-collapse {
-    margin-right: 0;
-    margin-left: 0;
-  }
-}
-.navbar-static-top {
-  z-index: 1000;
-  border-width: 0 0 1px;
-}
-@media (min-width: 768px) {
-  .navbar-static-top {
-    border-radius: 0;
-  }
-}
-.navbar-fixed-top,
-.navbar-fixed-bottom {
-  position: fixed;
-  right: 0;
-  left: 0;
-  z-index: 1030;
-}
-@media (min-width: 768px) {
-  .navbar-fixed-top,
-  .navbar-fixed-bottom {
-    border-radius: 0;
-  }
-}
-.navbar-fixed-top {
-  top: 0;
-  border-width: 0 0 1px;
-}
-.navbar-fixed-bottom {
-  bottom: 0;
-  margin-bottom: 0;
-  border-width: 1px 0 0;
-}
-.navbar-brand {
-  float: left;
-  height: 50px;
-  padding: 15px 15px;
-  font-size: 18px;
-  line-height: 20px;
-}
-.navbar-brand:hover,
-.navbar-brand:focus {
-  text-decoration: none;
-}
-.navbar-brand > img {
-  display: block;
-}
-@media (min-width: 768px) {
-  .navbar > .container .navbar-brand,
-  .navbar > .container-fluid .navbar-brand {
-    margin-left: -15px;
-  }
-}
-.navbar-toggle {
-  position: relative;
-  float: right;
-  padding: 9px 10px;
-  margin-top: 8px;
-  margin-right: 15px;
-  margin-bottom: 8px;
-  background-color: transparent;
-  background-image: none;
-  border: 1px solid transparent;
-  border-radius: 4px;
-}
-.navbar-toggle:focus {
-  outline: 0;
-}
-.navbar-toggle .icon-bar {
-  display: block;
-  width: 22px;
-  height: 2px;
-  border-radius: 1px;
-}
-.navbar-toggle .icon-bar + .icon-bar {
-  margin-top: 4px;
-}
-@media (min-width: 768px) {
-  .navbar-toggle {
-    display: none;
-  }
-}
-.navbar-nav {
-  margin: 7.5px -15px;
-}
-.navbar-nav > li > a {
-  padding-top: 10px;
-  padding-bottom: 10px;
-  line-height: 20px;
-}
-@media (max-width: 767px) {
-  .navbar-nav .open .dropdown-menu {
-    position: static;
-    float: none;
-    width: auto;
-    margin-top: 0;
-    background-color: transparent;
-    border: 0;
-    -webkit-box-shadow: none;
-            box-shadow: none;
-  }
-  .navbar-nav .open .dropdown-menu > li > a,
-  .navbar-nav .open .dropdown-menu .dropdown-header {
-    padding: 5px 15px 5px 25px;
-  }
-  .navbar-nav .open .dropdown-menu > li > a {
-    line-height: 20px;
-  }
-  .navbar-nav .open .dropdown-menu > li > a:hover,
-  .navbar-nav .open .dropdown-menu > li > a:focus {
-    background-image: none;
-  }
-}
-@media (min-width: 768px) {
-  .navbar-nav {
-    float: left;
-    margin: 0;
-  }
-  .navbar-nav > li {
-    float: left;
-  }
-  .navbar-nav > li > a {
-    padding-top: 15px;
-    padding-bottom: 15px;
-  }
-}
-.navbar-form {
-  padding: 10px 15px;
-  margin-top: 8px;
-  margin-right: -15px;
-  margin-bottom: 8px;
-  margin-left: -15px;
-  border-top: 1px solid transparent;
-  border-bottom: 1px solid transparent;
-  -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, .1), 0 1px 0 rgba(255, 255, 255, .1);
-          box-shadow: inset 0 1px 0 rgba(255, 255, 255, .1), 0 1px 0 rgba(255, 255, 255, .1);
-}
-@media (min-width: 768px) {
-  .navbar-form .form-group {
-    display: inline-block;
-    margin-bottom: 0;
-    vertical-align: middle;
-  }
-  .navbar-form .form-control {
-    display: inline-block;
-    width: auto;
-    vertical-align: middle;
-  }
-  .navbar-form .form-control-static {
-    display: inline-block;
-  }
-  .navbar-form .input-group {
-    display: inline-table;
-    vertical-align: middle;
-  }
-  .navbar-form .input-group .input-group-addon,
-  .navbar-form .input-group .input-group-btn,
-  .navbar-form .input-group .form-control {
-    width: auto;
-  }
-  .navbar-form .input-group > .form-control {
-    width: 100%;
-  }
-  .navbar-form .control-label {
-    margin-bottom: 0;
-    vertical-align: middle;
-  }
-  .navbar-form .radio,
-  .navbar-form .checkbox {
-    display: inline-block;
-    margin-top: 0;
-    margin-bottom: 0;
-    vertical-align: middle;
-  }
-  .navbar-form .radio label,
-  .navbar-form .checkbox label {
-    padding-left: 0;
-  }
-  .navbar-form .radio input[type="radio"],
-  .navbar-form .checkbox input[type="checkbox"] {
-    position: relative;
-    margin-left: 0;
-  }
-  .navbar-form .has-feedback .form-control-feedback {
-    top: 0;
-  }
-}
-@media (max-width: 767px) {
-  .navbar-form .form-group {
-    margin-bottom: 5px;
-  }
-  .navbar-form .form-group:last-child {
-    margin-bottom: 0;
-  }
-}
-@media (min-width: 768px) {
-  .navbar-form {
-    width: auto;
-    padding-top: 0;
-    padding-bottom: 0;
-    margin-right: 0;
-    margin-left: 0;
-    border: 0;
-    -webkit-box-shadow: none;
-            box-shadow: none;
-  }
-}
-.navbar-nav > li > .dropdown-menu {
-  margin-top: 0;
-  border-top-left-radius: 0;
-  border-top-right-radius: 0;
-}
-.navbar-fixed-bottom .navbar-nav > li > .dropdown-menu {
-  margin-bottom: 0;
-  border-top-left-radius: 4px;
-  border-top-right-radius: 4px;
-  border-bottom-right-radius: 0;
-  border-bottom-left-radius: 0;
-}
-.navbar-btn {
-  margin-top: 8px;
-  margin-bottom: 8px;
-}
-.navbar-btn.btn-sm {
-  margin-top: 10px;
-  margin-bottom: 10px;
-}
-.navbar-btn.btn-xs {
-  margin-top: 14px;
-  margin-bottom: 14px;
-}
-.navbar-text {
-  margin-top: 15px;
-  margin-bottom: 15px;
-}
-@media (min-width: 768px) {
-  .navbar-text {
-    float: left;
-    margin-right: 15px;
-    margin-left: 15px;
-  }
-}
-@media (min-width: 768px) {
-  .navbar-left {
-    float: left !important;
-  }
-  .navbar-right {
-    float: right !important;
-    margin-right: -15px;
-  }
-  .navbar-right ~ .navbar-right {
-    margin-right: 0;
-  }
-}
-.navbar-default {
-  background-color: #f8f8f8;
-  border-color: #e7e7e7;
-}
-.navbar-default .navbar-brand {
-  color: #777;
-}
-.navbar-default .navbar-brand:hover,
-.navbar-default .navbar-brand:focus {
-  color: #5e5e5e;
-  background-color: transparent;
-}
-.navbar-default .navbar-text {
-  color: #777;
-}
-.navbar-default .navbar-nav > li > a {
-  color: #777;
-}
-.navbar-default .navbar-nav > li > a:hover,
-.navbar-default .navbar-nav > li > a:focus {
-  color: #333;
-  background-color: transparent;
-}
-.navbar-default .navbar-nav > .active > a,
-.navbar-default .navbar-nav > .active > a:hover,
-.navbar-default .navbar-nav > .active > a:focus {
-  color: #555;
-  background-color: #e7e7e7;
-}
-.navbar-default .navbar-nav > .disabled > a,
-.navbar-default .navbar-nav > .disabled > a:hover,
-.navbar-default .navbar-nav > .disabled > a:focus {
-  color: #ccc;
-  background-color: transparent;
-}
-.navbar-default .navbar-toggle {
-  border-color: #ddd;
-}
-.navbar-default .navbar-toggle:hover,
-.navbar-default .navbar-toggle:focus {
-  background-color: #ddd;
-}
-.navbar-default .navbar-toggle .icon-bar {
-  background-color: #888;
-}
-.navbar-default .navbar-collapse,
-.navbar-default .navbar-form {
-  border-color: #e7e7e7;
-}
-.navbar-default .navbar-nav > .open > a,
-.navbar-default .navbar-nav > .open > a:hover,
-.navbar-default .navbar-nav > .open > a:focus {
-  color: #555;
-  background-color: #e7e7e7;
-}
-@media (max-width: 767px) {
-  .navbar-default .navbar-nav .open .dropdown-menu > li > a {
-    color: #777;
-  }
-  .navbar-default .navbar-nav .open .dropdown-menu > li > a:hover,
-  .navbar-default .navbar-nav .open .dropdown-menu > li > a:focus {
-    color: #333;
-    background-color: transparent;
-  }
-  .navbar-default .navbar-nav .open .dropdown-menu > .active > a,
-  .navbar-default .navbar-nav .open .dropdown-menu > .active > a:hover,
-  .navbar-default .navbar-nav .open .dropdown-menu > .active > a:focus {
-    color: #555;
-    background-color: #e7e7e7;
-  }
-  .navbar-default .navbar-nav .open .dropdown-menu > .disabled > a,
-  .navbar-default .navbar-nav .open .dropdown-menu > .disabled > a:hover,
-  .navbar-default .navbar-nav .open .dropdown-menu > .disabled > a:focus {
-    color: #ccc;
-    background-color: transparent;
-  }
-}
-.navbar-default .navbar-link {
-  color: #777;
-}
-.navbar-default .navbar-link:hover {
-  color: #333;
-}
-.navbar-default .btn-link {
-  color: #777;
-}
-.navbar-default .btn-link:hover,
-.navbar-default .btn-link:focus {
-  color: #333;
-}
-.navbar-default .btn-link[disabled]:hover,
-fieldset[disabled] .navbar-default .btn-link:hover,
-.navbar-default .btn-link[disabled]:focus,
-fieldset[disabled] .navbar-default .btn-link:focus {
-  color: #ccc;
-}
-.navbar-inverse {
-  background-color: #222;
-  border-color: #080808;
-}
-.navbar-inverse .navbar-brand {
-  color: #9d9d9d;
-}
-.navbar-inverse .navbar-brand:hover,
-.navbar-inverse .navbar-brand:focus {
-  color: #fff;
-  background-color: transparent;
-}
-.navbar-inverse .navbar-text {
-  color: #9d9d9d;
-}
-.navbar-inverse .navbar-nav > li > a {
-  color: #9d9d9d;
-}
-.navbar-inverse .navbar-nav > li > a:hover,
-.navbar-inverse .navbar-nav > li > a:focus {
-  color: #fff;
-  background-color: transparent;
-}
-.navbar-inverse .navbar-nav > .active > a,
-.navbar-inverse .navbar-nav > .active > a:hover,
-.navbar-inverse .navbar-nav > .active > a:focus {
-  color: #fff;
-  background-color: #080808;
-}
-.navbar-inverse .navbar-nav > .disabled > a,
-.navbar-inverse .navbar-nav > .disabled > a:hover,
-.navbar-inverse .navbar-nav > .disabled > a:focus {
-  color: #444;
-  background-color: transparent;
-}
-.navbar-inverse .navbar-toggle {
-  border-color: #333;
-}
-.navbar-inverse .navbar-toggle:hover,
-.navbar-inverse .navbar-toggle:focus {
-  background-color: #333;
-}
-.navbar-inverse .navbar-toggle .icon-bar {
-  background-color: #fff;
-}
-.navbar-inverse .navbar-collapse,
-.navbar-inverse .navbar-form {
-  border-color: #101010;
-}
-.navbar-inverse .navbar-nav > .open > a,
-.navbar-inverse .navbar-nav > .open > a:hover,
-.navbar-inverse .navbar-nav > .open > a:focus {
-  color: #fff;
-  background-color: #080808;
-}
-@media (max-width: 767px) {
-  .navbar-inverse .navbar-nav .open .dropdown-menu > .dropdown-header {
-    border-color: #080808;
-  }
-  .navbar-inverse .navbar-nav .open .dropdown-menu .divider {
-    background-color: #080808;
-  }
-  .navbar-inverse .navbar-nav .open .dropdown-menu > li > a {
-    color: #9d9d9d;
-  }
-  .navbar-inverse .navbar-nav .open .dropdown-menu > li > a:hover,
-  .navbar-inverse .navbar-nav .open .dropdown-menu > li > a:focus {
-    color: #fff;
-    background-color: transparent;
-  }
-  .navbar-inverse .navbar-nav .open .dropdown-menu > .active > a,
-  .navbar-inverse .navbar-nav .open .dropdown-menu > .active > a:hover,
-  .navbar-inverse .navbar-nav .open .dropdown-menu > .active > a:focus {
-    color: #fff;
-    background-color: #080808;
-  }
-  .navbar-inverse .navbar-nav .open .dropdown-menu > .disabled > a,
-  .navbar-inverse .navbar-nav .open .dropdown-menu > .disabled > a:hover,
-  .navbar-inverse .navbar-nav .open .dropdown-menu > .disabled > a:focus {
-    color: #444;
-    background-color: transparent;
-  }
-}
-.navbar-inverse .navbar-link {
-  color: #9d9d9d;
-}
-.navbar-inverse .navbar-link:hover {
-  color: #fff;
-}
-.navbar-inverse .btn-link {
-  color: #9d9d9d;
-}
-.navbar-inverse .btn-link:hover,
-.navbar-inverse .btn-link:focus {
-  color: #fff;
-}
-.navbar-inverse .btn-link[disabled]:hover,
-fieldset[disabled] .navbar-inverse .btn-link:hover,
-.navbar-inverse .btn-link[disabled]:focus,
-fieldset[disabled] .navbar-inverse .btn-link:focus {
-  color: #444;
-}
-.breadcrumb {
-  padding: 8px 15px;
-  margin-bottom: 20px;
-  list-style: none;
-  background-color: #f5f5f5;
-  border-radius: 4px;
-}
-.breadcrumb > li {
-  display: inline-block;
-}
-.breadcrumb > li + li:before {
-  padding: 0 5px;
-  color: #ccc;
-  content: "/\00a0";
-}
-.breadcrumb > .active {
-  color: #777;
-}
-.pagination {
-  display: inline-block;
-  padding-left: 0;
-  margin: 20px 0;
-  border-radius: 4px;
-}
-.pagination > li {
-  display: inline;
-}
-.pagination > li > a,
-.pagination > li > span {
-  position: relative;
-  float: left;
-  padding: 6px 12px;
-  margin-left: -1px;
-  line-height: 1.42857143;
-  color: #337ab7;
-  text-decoration: none;
-  background-color: #fff;
-  border: 1px solid #ddd;
-}
-.pagination > li:first-child > a,
-.pagination > li:first-child > span {
-  margin-left: 0;
-  border-top-left-radius: 4px;
-  border-bottom-left-radius: 4px;
-}
-.pagination > li:last-child > a,
-.pagination > li:last-child > span {
-  border-top-right-radius: 4px;
-  border-bottom-right-radius: 4px;
-}
-.pagination > li > a:hover,
-.pagination > li > span:hover,
-.pagination > li > a:focus,
-.pagination > li > span:focus {
-  color: #23527c;
-  background-color: #eee;
-  border-color: #ddd;
-}
-.pagination > .active > a,
-.pagination > .active > span,
-.pagination > .active > a:hover,
-.pagination > .active > span:hover,
-.pagination > .active > a:focus,
-.pagination > .active > span:focus {
-  z-index: 2;
-  color: #fff;
-  cursor: default;
-  background-color: #337ab7;
-  border-color: #337ab7;
-}
-.pagination > .disabled > span,
-.pagination > .disabled > span:hover,
-.pagination > .disabled > span:focus,
-.pagination > .disabled > a,
-.pagination > .disabled > a:hover,
-.pagination > .disabled > a:focus {
-  color: #777;
-  cursor: not-allowed;
-  background-color: #fff;
-  border-color: #ddd;
-}
-.pagination-lg > li > a,
-.pagination-lg > li > span {
-  padding: 10px 16px;
-  font-size: 18px;
-}
-.pagination-lg > li:first-child > a,
-.pagination-lg > li:first-child > span {
-  border-top-left-radius: 6px;
-  border-bottom-left-radius: 6px;
-}
-.pagination-lg > li:last-child > a,
-.pagination-lg > li:last-child > span {
-  border-top-right-radius: 6px;
-  border-bottom-right-radius: 6px;
-}
-.pagination-sm > li > a,
-.pagination-sm > li > span {
-  padding: 5px 10px;
-  font-size: 12px;
-}
-.pagination-sm > li:first-child > a,
-.pagination-sm > li:first-child > span {
-  border-top-left-radius: 3px;
-  border-bottom-left-radius: 3px;
-}
-.pagination-sm > li:last-child > a,
-.pagination-sm > li:last-child > span {
-  border-top-right-radius: 3px;
-  border-bottom-right-radius: 3px;
-}
-.pager {
-  padding-left: 0;
-  margin: 20px 0;
-  text-align: center;
-  list-style: none;
-}
-.pager li {
-  display: inline;
-}
-.pager li > a,
-.pager li > span {
-  display: inline-block;
-  padding: 5px 14px;
-  background-color: #fff;
-  border: 1px solid #ddd;
-  border-radius: 15px;
-}
-.pager li > a:hover,
-.pager li > a:focus {
-  text-decoration: none;
-  background-color: #eee;
-}
-.pager .next > a,
-.pager .next > span {
-  float: right;
-}
-.pager .previous > a,
-.pager .previous > span {
-  float: left;
-}
-.pager .disabled > a,
-.pager .disabled > a:hover,
-.pager .disabled > a:focus,
-.pager .disabled > span {
-  color: #777;
-  cursor: not-allowed;
-  background-color: #fff;
-}
-.label {
-  display: inline;
-  padding: .2em .6em .3em;
-  font-size: 75%;
-  font-weight: bold;
-  line-height: 1;
-  color: #fff;
-  text-align: center;
-  white-space: nowrap;
-  vertical-align: baseline;
-  border-radius: .25em;
-}
-a.label:hover,
-a.label:focus {
-  color: #fff;
-  text-decoration: none;
-  cursor: pointer;
-}
-.label:empty {
-  display: none;
-}
-.btn .label {
-  position: relative;
-  top: -1px;
-}
-.label-default {
-  background-color: #777;
-}
-.label-default[href]:hover,
-.label-default[href]:focus {
-  background-color: #5e5e5e;
-}
-.label-primary {
-  background-color: #337ab7;
-}
-.label-primary[href]:hover,
-.label-primary[href]:focus {
-  background-color: #286090;
-}
-.label-success {
-  background-color: #5cb85c;
-}
-.label-success[href]:hover,
-.label-success[href]:focus {
-  background-color: #449d44;
-}
-.label-info {
-  background-color: #5bc0de;
-}
-.label-info[href]:hover,
-.label-info[href]:focus {
-  background-color: #31b0d5;
-}
-.label-warning {
-  background-color: #f0ad4e;
-}
-.label-warning[href]:hover,
-.label-warning[href]:focus {
-  background-color: #ec971f;
-}
-.label-danger {
-  background-color: #d9534f;
-}
-.label-danger[href]:hover,
-.label-danger[href]:focus {
-  background-color: #c9302c;
-}
-.badge {
-  display: inline-block;
-  min-width: 10px;
-  padding: 3px 7px;
-  font-size: 12px;
-  font-weight: bold;
-  line-height: 1;
-  color: #fff;
-  text-align: center;
-  white-space: nowrap;
-  vertical-align: baseline;
-  background-color: #777;
-  border-radius: 10px;
-}
-.badge:empty {
-  display: none;
-}
-.btn .badge {
-  position: relative;
-  top: -1px;
-}
-.btn-xs .badge,
-.btn-group-xs > .btn .badge {
-  top: 0;
-  padding: 1px 5px;
-}
-a.badge:hover,
-a.badge:focus {
-  color: #fff;
-  text-decoration: none;
-  cursor: pointer;
-}
-.list-group-item.active > .badge,
-.nav-pills > .active > a > .badge {
-  color: #337ab7;
-  background-color: #fff;
-}
-.list-group-item > .badge {
-  float: right;
-}
-.list-group-item > .badge + .badge {
-  margin-right: 5px;
-}
-.nav-pills > li > a > .badge {
-  margin-left: 3px;
-}
-.jumbotron {
-  padding: 30px 15px;
-  margin-bottom: 30px;
-  color: inherit;
-  background-color: #eee;
-}
-.jumbotron h1,
-.jumbotron .h1 {
-  color: inherit;
-}
-.jumbotron p {
-  margin-bottom: 15px;
-  font-size: 21px;
-  font-weight: 200;
-}
-.jumbotron > hr {
-  border-top-color: #d5d5d5;
-}
-.container .jumbotron,
-.container-fluid .jumbotron {
-  border-radius: 6px;
-}
-.jumbotron .container {
-  max-width: 100%;
-}
-@media screen and (min-width: 768px) {
-  .jumbotron {
-    padding: 48px 0;
-  }
-  .container .jumbotron,
-  .container-fluid .jumbotron {
-    padding-right: 60px;
-    padding-left: 60px;
-  }
-  .jumbotron h1,
-  .jumbotron .h1 {
-    font-size: 63px;
-  }
-}
-.thumbnail {
-  display: block;
-  padding: 4px;
-  margin-bottom: 20px;
-  line-height: 1.42857143;
-  background-color: #fff;
-  border: 1px solid #ddd;
-  border-radius: 4px;
-  -webkit-transition: border .2s ease-in-out;
-       -o-transition: border .2s ease-in-out;
-          transition: border .2s ease-in-out;
-}
-.thumbnail > img,
-.thumbnail a > img {
-  margin-right: auto;
-  margin-left: auto;
-}
-a.thumbnail:hover,
-a.thumbnail:focus,
-a.thumbnail.active {
-  border-color: #337ab7;
-}
-.thumbnail .caption {
-  padding: 9px;
-  color: #333;
-}
-.alert {
-  padding: 15px;
-  margin-bottom: 20px;
-  border: 1px solid transparent;
-  border-radius: 4px;
-}
-.alert h4 {
-  margin-top: 0;
-  color: inherit;
-}
-.alert .alert-link {
-  font-weight: bold;
-}
-.alert > p,
-.alert > ul {
-  margin-bottom: 0;
-}
-.alert > p + p {
-  margin-top: 5px;
-}
-.alert-dismissable,
-.alert-dismissible {
-  padding-right: 35px;
-}
-.alert-dismissable .close,
-.alert-dismissible .close {
-  position: relative;
-  top: -2px;
-  right: -21px;
-  color: inherit;
-}
-.alert-success {
-  color: #3c763d;
-  background-color: #dff0d8;
-  border-color: #d6e9c6;
-}
-.alert-success hr {
-  border-top-color: #c9e2b3;
-}
-.alert-success .alert-link {
-  color: #2b542c;
-}
-.alert-info {
-  color: #31708f;
-  background-color: #d9edf7;
-  border-color: #bce8f1;
-}
-.alert-info hr {
-  border-top-color: #a6e1ec;
-}
-.alert-info .alert-link {
-  color: #245269;
-}
-.alert-warning {
-  color: #8a6d3b;
-  background-color: #fcf8e3;
-  border-color: #faebcc;
-}
-.alert-warning hr {
-  border-top-color: #f7e1b5;
-}
-.alert-warning .alert-link {
-  color: #66512c;
-}
-.alert-danger {
-  color: #a94442;
-  background-color: #f2dede;
-  border-color: #ebccd1;
-}
-.alert-danger hr {
-  border-top-color: #e4b9c0;
-}
-.alert-danger .alert-link {
-  color: #843534;
-}
-@-webkit-keyframes progress-bar-stripes {
-  from {
-    background-position: 40px 0;
-  }
-  to {
-    background-position: 0 0;
-  }
-}
-@-o-keyframes progress-bar-stripes {
-  from {
-    background-position: 40px 0;
-  }
-  to {
-    background-position: 0 0;
-  }
-}
-@keyframes progress-bar-stripes {
-  from {
-    background-position: 40px 0;
-  }
-  to {
-    background-position: 0 0;
-  }
-}
-.progress {
-  height: 20px;
-  margin-bottom: 20px;
-  overflow: hidden;
-  background-color: #f5f5f5;
-  border-radius: 4px;
-  -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, .1);
-          box-shadow: inset 0 1px 2px rgba(0, 0, 0, .1);
-}
-.progress-bar {
-  float: left;
-  width: 0;
-  height: 100%;
-  font-size: 12px;
-  line-height: 20px;
-  color: #fff;
-  text-align: center;
-  background-color: #337ab7;
-  -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, .15);
-          box-shadow: inset 0 -1px 0 rgba(0, 0, 0, .15);
-  -webkit-transition: width .6s ease;
-       -o-transition: width .6s ease;
-          transition: width .6s ease;
-}
-.progress-striped .progress-bar,
-.progress-bar-striped {
-  background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
-  background-image:      -o-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
-  background-image:         linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
-  -webkit-background-size: 40px 40px;
-          background-size: 40px 40px;
-}
-.progress.active .progress-bar,
-.progress-bar.active {
-  -webkit-animation: progress-bar-stripes 2s linear infinite;
-       -o-animation: progress-bar-stripes 2s linear infinite;
-          animation: progress-bar-stripes 2s linear infinite;
-}
-.progress-bar-success {
-  background-color: #5cb85c;
-}
-.progress-striped .progress-bar-success {
-  background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
-  background-image:      -o-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
-  background-image:         linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
-}
-.progress-bar-info {
-  background-color: #5bc0de;
-}
-.progress-striped .progress-bar-info {
-  background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
-  background-image:      -o-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
-  background-image:         linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
-}
-.progress-bar-warning {
-  background-color: #f0ad4e;
-}
-.progress-striped .progress-bar-warning {
-  background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
-  background-image:      -o-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
-  background-image:         linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
-}
-.progress-bar-danger {
-  background-color: #d9534f;
-}
-.progress-striped .progress-bar-danger {
-  background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
-  background-image:      -o-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
-  background-image:         linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
-}
-.media {
-  margin-top: 15px;
-}
-.media:first-child {
-  margin-top: 0;
-}
-.media,
-.media-body {
-  overflow: hidden;
-  zoom: 1;
-}
-.media-body {
-  width: 10000px;
-}
-.media-object {
-  display: block;
-}
-.media-right,
-.media > .pull-right {
-  padding-left: 10px;
-}
-.media-left,
-.media > .pull-left {
-  padding-right: 10px;
-}
-.media-left,
-.media-right,
-.media-body {
-  display: table-cell;
-  vertical-align: top;
-}
-.media-middle {
-  vertical-align: middle;
-}
-.media-bottom {
-  vertical-align: bottom;
-}
-.media-heading {
-  margin-top: 0;
-  margin-bottom: 5px;
-}
-.media-list {
-  padding-left: 0;
-  list-style: none;
-}
-.list-group {
-  padding-left: 0;
-  margin-bottom: 20px;
-}
-.list-group-item {
-  position: relative;
-  display: block;
-  padding: 10px 15px;
-  margin-bottom: -1px;
-  background-color: #fff;
-  border: 1px solid #ddd;
-}
-.list-group-item:first-child {
-  border-top-left-radius: 4px;
-  border-top-right-radius: 4px;
-}
-.list-group-item:last-child {
-  margin-bottom: 0;
-  border-bottom-right-radius: 4px;
-  border-bottom-left-radius: 4px;
-}
-a.list-group-item {
-  color: #555;
-}
-a.list-group-item .list-group-item-heading {
-  color: #333;
-}
-a.list-group-item:hover,
-a.list-group-item:focus {
-  color: #555;
-  text-decoration: none;
-  background-color: #f5f5f5;
-}
-.list-group-item.disabled,
-.list-group-item.disabled:hover,
-.list-group-item.disabled:focus {
-  color: #777;
-  cursor: not-allowed;
-  background-color: #eee;
-}
-.list-group-item.disabled .list-group-item-heading,
-.list-group-item.disabled:hover .list-group-item-heading,
-.list-group-item.disabled:focus .list-group-item-heading {
-  color: inherit;
-}
-.list-group-item.disabled .list-group-item-text,
-.list-group-item.disabled:hover .list-group-item-text,
-.list-group-item.disabled:focus .list-group-item-text {
-  color: #777;
-}
-.list-group-item.active,
-.list-group-item.active:hover,
-.list-group-item.active:focus {
-  z-index: 2;
-  color: #fff;
-  background-color: #337ab7;
-  border-color: #337ab7;
-}
-.list-group-item.active .list-group-item-heading,
-.list-group-item.active:hover .list-group-item-heading,
-.list-group-item.active:focus .list-group-item-heading,
-.list-group-item.active .list-group-item-heading > small,
-.list-group-item.active:hover .list-group-item-heading > small,
-.list-group-item.active:focus .list-group-item-heading > small,
-.list-group-item.active .list-group-item-heading > .small,
-.list-group-item.active:hover .list-group-item-heading > .small,
-.list-group-item.active:focus .list-group-item-heading > .small {
-  color: inherit;
-}
-.list-group-item.active .list-group-item-text,
-.list-group-item.active:hover .list-group-item-text,
-.list-group-item.active:focus .list-group-item-text {
-  color: #c7ddef;
-}
-.list-group-item-success {
-  color: #3c763d;
-  background-color: #dff0d8;
-}
-a.list-group-item-success {
-  color: #3c763d;
-}
-a.list-group-item-success .list-group-item-heading {
-  color: inherit;
-}
-a.list-group-item-success:hover,
-a.list-group-item-success:focus {
-  color: #3c763d;
-  background-color: #d0e9c6;
-}
-a.list-group-item-success.active,
-a.list-group-item-success.active:hover,
-a.list-group-item-success.active:focus {
-  color: #fff;
-  background-color: #3c763d;
-  border-color: #3c763d;
-}
-.list-group-item-info {
-  color: #31708f;
-  background-color: #d9edf7;
-}
-a.list-group-item-info {
-  color: #31708f;
-}
-a.list-group-item-info .list-group-item-heading {
-  color: inherit;
-}
-a.list-group-item-info:hover,
-a.list-group-item-info:focus {
-  color: #31708f;
-  background-color: #c4e3f3;
-}
-a.list-group-item-info.active,
-a.list-group-item-info.active:hover,
-a.list-group-item-info.active:focus {
-  color: #fff;
-  background-color: #31708f;
-  border-color: #31708f;
-}
-.list-group-item-warning {
-  color: #8a6d3b;
-  background-color: #fcf8e3;
-}
-a.list-group-item-warning {
-  color: #8a6d3b;
-}
-a.list-group-item-warning .list-group-item-heading {
-  color: inherit;
-}
-a.list-group-item-warning:hover,
-a.list-group-item-warning:focus {
-  color: #8a6d3b;
-  background-color: #faf2cc;
-}
-a.list-group-item-warning.active,
-a.list-group-item-warning.active:hover,
-a.list-group-item-warning.active:focus {
-  color: #fff;
-  background-color: #8a6d3b;
-  border-color: #8a6d3b;
-}
-.list-group-item-danger {
-  color: #a94442;
-  background-color: #f2dede;
-}
-a.list-group-item-danger {
-  color: #a94442;
-}
-a.list-group-item-danger .list-group-item-heading {
-  color: inherit;
-}
-a.list-group-item-danger:hover,
-a.list-group-item-danger:focus {
-  color: #a94442;
-  background-color: #ebcccc;
-}
-a.list-group-item-danger.active,
-a.list-group-item-danger.active:hover,
-a.list-group-item-danger.active:focus {
-  color: #fff;
-  background-color: #a94442;
-  border-color: #a94442;
-}
-.list-group-item-heading {
-  margin-top: 0;
-  margin-bottom: 5px;
-}
-.list-group-item-text {
-  margin-bottom: 0;
-  line-height: 1.3;
-}
-.panel {
-  margin-bottom: 20px;
-  background-color: #fff;
-  border: 1px solid transparent;
-  border-radius: 4px;
-  -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, .05);
-          box-shadow: 0 1px 1px rgba(0, 0, 0, .05);
-}
-.panel-body {
-  padding: 15px;
-}
-.panel-heading {
-  padding: 10px 15px;
-  border-bottom: 1px solid transparent;
-  border-top-left-radius: 3px;
-  border-top-right-radius: 3px;
-}
-.panel-heading > .dropdown .dropdown-toggle {
-  color: inherit;
-}
-.panel-title {
-  margin-top: 0;
-  margin-bottom: 0;
-  font-size: 16px;
-  color: inherit;
-}
-.panel-title > a,
-.panel-title > small,
-.panel-title > .small,
-.panel-title > small > a,
-.panel-title > .small > a {
-  color: inherit;
-}
-.panel-footer {
-  padding: 10px 15px;
-  background-color: #f5f5f5;
-  border-top: 1px solid #ddd;
-  border-bottom-right-radius: 3px;
-  border-bottom-left-radius: 3px;
-}
-.panel > .list-group,
-.panel > .panel-collapse > .list-group {
-  margin-bottom: 0;
-}
-.panel > .list-group .list-group-item,
-.panel > .panel-collapse > .list-group .list-group-item {
-  border-width: 1px 0;
-  border-radius: 0;
-}
-.panel > .list-group:first-child .list-group-item:first-child,
-.panel > .panel-collapse > .list-group:first-child .list-group-item:first-child {
-  border-top: 0;
-  border-top-left-radius: 3px;
-  border-top-right-radius: 3px;
-}
-.panel > .list-group:last-child .list-group-item:last-child,
-.panel > .panel-collapse > .list-group:last-child .list-group-item:last-child {
-  border-bottom: 0;
-  border-bottom-right-radius: 3px;
-  border-bottom-left-radius: 3px;
-}
-.panel-heading + .list-group .list-group-item:first-child {
-  border-top-width: 0;
-}
-.list-group + .panel-footer {
-  border-top-width: 0;
-}
-.panel > .table,
-.panel > .table-responsive > .table,
-.panel > .panel-collapse > .table {
-  margin-bottom: 0;
-}
-.panel > .table caption,
-.panel > .table-responsive > .table caption,
-.panel > .panel-collapse > .table caption {
-  padding-right: 15px;
-  padding-left: 15px;
-}
-.panel > .table:first-child,
-.panel > .table-responsive:first-child > .table:first-child {
-  border-top-left-radius: 3px;
-  border-top-right-radius: 3px;
-}
-.panel > .table:first-child > thead:first-child > tr:first-child,
-.panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child,
-.panel > .table:first-child > tbody:first-child > tr:first-child,
-.panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child {
-  border-top-left-radius: 3px;
-  border-top-right-radius: 3px;
-}
-.panel > .table:first-child > thead:first-child > tr:first-child td:first-child,
-.panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child td:first-child,
-.panel > .table:first-child > tbody:first-child > tr:first-child td:first-child,
-.panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child td:first-child,
-.panel > .table:first-child > thead:first-child > tr:first-child th:first-child,
-.panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child th:first-child,
-.panel > .table:first-child > tbody:first-child > tr:first-child th:first-child,
-.panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child th:first-child {
-  border-top-left-radius: 3px;
-}
-.panel > .table:first-child > thead:first-child > tr:first-child td:last-child,
-.panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child td:last-child,
-.panel > .table:first-child > tbody:first-child > tr:first-child td:last-child,
-.panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child td:last-child,
-.panel > .table:first-child > thead:first-child > tr:first-child th:last-child,
-.panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child th:last-child,
-.panel > .table:first-child > tbody:first-child > tr:first-child th:last-child,
-.panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child th:last-child {
-  border-top-right-radius: 3px;
-}
-.panel > .table:last-child,
-.panel > .table-responsive:last-child > .table:last-child {
-  border-bottom-right-radius: 3px;
-  border-bottom-left-radius: 3px;
-}
-.panel > .table:last-child > tbody:last-child > tr:last-child,
-.panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child,
-.panel > .table:last-child > tfoot:last-child > tr:last-child,
-.panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child {
-  border-bottom-right-radius: 3px;
-  border-bottom-left-radius: 3px;
-}
-.panel > .table:last-child > tbody:last-child > tr:last-child td:first-child,
-.panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child td:first-child,
-.panel > .table:last-child > tfoot:last-child > tr:last-child td:first-child,
-.panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child td:first-child,
-.panel > .table:last-child > tbody:last-child > tr:last-child th:first-child,
-.panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child th:first-child,
-.panel > .table:last-child > tfoot:last-child > tr:last-child th:first-child,
-.panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child th:first-child {
-  border-bottom-left-radius: 3px;
-}
-.panel > .table:last-child > tbody:last-child > tr:last-child td:last-child,
-.panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child td:last-child,
-.panel > .table:last-child > tfoot:last-child > tr:last-child td:last-child,
-.panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child td:last-child,
-.panel > .table:last-child > tbody:last-child > tr:last-child th:last-child,
-.panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child th:last-child,
-.panel > .table:last-child > tfoot:last-child > tr:last-child th:last-child,
-.panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child th:last-child {
-  border-bottom-right-radius: 3px;
-}
-.panel > .panel-body + .table,
-.panel > .panel-body + .table-responsive,
-.panel > .table + .panel-body,
-.panel > .table-responsive + .panel-body {
-  border-top: 1px solid #ddd;
-}
-.panel > .table > tbody:first-child > tr:first-child th,
-.panel > .table > tbody:first-child > tr:first-child td {
-  border-top: 0;
-}
-.panel > .table-bordered,
-.panel > .table-responsive > .table-bordered {
-  border: 0;
-}
-.panel > .table-bordered > thead > tr > th:first-child,
-.panel > .table-responsive > .table-bordered > thead > tr > th:first-child,
-.panel > .table-bordered > tbody > tr > th:first-child,
-.panel > .table-responsive > .table-bordered > tbody > tr > th:first-child,
-.panel > .table-bordered > tfoot > tr > th:first-child,
-.panel > .table-responsive > .table-bordered > tfoot > tr > th:first-child,
-.panel > .table-bordered > thead > tr > td:first-child,
-.panel > .table-responsive > .table-bordered > thead > tr > td:first-child,
-.panel > .table-bordered > tbody > tr > td:first-child,
-.panel > .table-responsive > .table-bordered > tbody > tr > td:first-child,
-.panel > .table-bordered > tfoot > tr > td:first-child,
-.panel > .table-responsive > .table-bordered > tfoot > tr > td:first-child {
-  border-left: 0;
-}
-.panel > .table-bordered > thead > tr > th:last-child,
-.panel > .table-responsive > .table-bordered > thead > tr > th:last-child,
-.panel > .table-bordered > tbody > tr > th:last-child,
-.panel > .table-responsive > .table-bordered > tbody > tr > th:last-child,
-.panel > .table-bordered > tfoot > tr > th:last-child,
-.panel > .table-responsive > .table-bordered > tfoot > tr > th:last-child,
-.panel > .table-bordered > thead > tr > td:last-child,
-.panel > .table-responsive > .table-bordered > thead > tr > td:last-child,
-.panel > .table-bordered > tbody > tr > td:last-child,
-.panel > .table-responsive > .table-bordered > tbody > tr > td:last-child,
-.panel > .table-bordered > tfoot > tr > td:last-child,
-.panel > .table-responsive > .table-bordered > tfoot > tr > td:last-child {
-  border-right: 0;
-}
-.panel > .table-bordered > thead > tr:first-child > td,
-.panel > .table-responsive > .table-bordered > thead > tr:first-child > td,
-.panel > .table-bordered > tbody > tr:first-child > td,
-.panel > .table-responsive > .table-bordered > tbody > tr:first-child > td,
-.panel > .table-bordered > thead > tr:first-child > th,
-.panel > .table-responsive > .table-bordered > thead > tr:first-child > th,
-.panel > .table-bordered > tbody > tr:first-child > th,
-.panel > .table-responsive > .table-bordered > tbody > tr:first-child > th {
-  border-bottom: 0;
-}
-.panel > .table-bordered > tbody > tr:last-child > td,
-.panel > .table-responsive > .table-bordered > tbody > tr:last-child > td,
-.panel > .table-bordered > tfoot > tr:last-child > td,
-.panel > .table-responsive > .table-bordered > tfoot > tr:last-child > td,
-.panel > .table-bordered > tbody > tr:last-child > th,
-.panel > .table-responsive > .table-bordered > tbody > tr:last-child > th,
-.panel > .table-bordered > tfoot > tr:last-child > th,
-.panel > .table-responsive > .table-bordered > tfoot > tr:last-child > th {
-  border-bottom: 0;
-}
-.panel > .table-responsive {
-  margin-bottom: 0;
-  border: 0;
-}
-.panel-group {
-  margin-bottom: 20px;
-}
-.panel-group .panel {
-  margin-bottom: 0;
-  border-radius: 4px;
-}
-.panel-group .panel + .panel {
-  margin-top: 5px;
-}
-.panel-group .panel-heading {
-  border-bottom: 0;
-}
-.panel-group .panel-heading + .panel-collapse > .panel-body,
-.panel-group .panel-heading + .panel-collapse > .list-group {
-  border-top: 1px solid #ddd;
-}
-.panel-group .panel-footer {
-  border-top: 0;
-}
-.panel-group .panel-footer + .panel-collapse .panel-body {
-  border-bottom: 1px solid #ddd;
-}
-.panel-default {
-  border-color: #ddd;
-}
-.panel-default > .panel-heading {
-  color: #333;
-  background-color: #f5f5f5;
-  border-color: #ddd;
-}
-.panel-default > .panel-heading + .panel-collapse > .panel-body {
-  border-top-color: #ddd;
-}
-.panel-default > .panel-heading .badge {
-  color: #f5f5f5;
-  background-color: #333;
-}
-.panel-default > .panel-footer + .panel-collapse > .panel-body {
-  border-bottom-color: #ddd;
-}
-.panel-primary {
-  border-color: #337ab7;
-}
-.panel-primary > .panel-heading {
-  color: #fff;
-  background-color: #337ab7;
-  border-color: #337ab7;
-}
-.panel-primary > .panel-heading + .panel-collapse > .panel-body {
-  border-top-color: #337ab7;
-}
-.panel-primary > .panel-heading .badge {
-  color: #337ab7;
-  background-color: #fff;
-}
-.panel-primary > .panel-footer + .panel-collapse > .panel-body {
-  border-bottom-color: #337ab7;
-}
-.panel-success {
-  border-color: #d6e9c6;
-}
-.panel-success > .panel-heading {
-  color: #3c763d;
-  background-color: #dff0d8;
-  border-color: #d6e9c6;
-}
-.panel-success > .panel-heading + .panel-collapse > .panel-body {
-  border-top-color: #d6e9c6;
-}
-.panel-success > .panel-heading .badge {
-  color: #dff0d8;
-  background-color: #3c763d;
-}
-.panel-success > .panel-footer + .panel-collapse > .panel-body {
-  border-bottom-color: #d6e9c6;
-}
-.panel-info {
-  border-color: #bce8f1;
-}
-.panel-info > .panel-heading {
-  color: #31708f;
-  background-color: #d9edf7;
-  border-color: #bce8f1;
-}
-.panel-info > .panel-heading + .panel-collapse > .panel-body {
-  border-top-color: #bce8f1;
-}
-.panel-info > .panel-heading .badge {
-  color: #d9edf7;
-  background-color: #31708f;
-}
-.panel-info > .panel-footer + .panel-collapse > .panel-body {
-  border-bottom-color: #bce8f1;
-}
-.panel-warning {
-  border-color: #faebcc;
-}
-.panel-warning > .panel-heading {
-  color: #8a6d3b;
-  background-color: #fcf8e3;
-  border-color: #faebcc;
-}
-.panel-warning > .panel-heading + .panel-collapse > .panel-body {
-  border-top-color: #faebcc;
-}
-.panel-warning > .panel-heading .badge {
-  color: #fcf8e3;
-  background-color: #8a6d3b;
-}
-.panel-warning > .panel-footer + .panel-collapse > .panel-body {
-  border-bottom-color: #faebcc;
-}
-.panel-danger {
-  border-color: #ebccd1;
-}
-.panel-danger > .panel-heading {
-  color: #a94442;
-  background-color: #f2dede;
-  border-color: #ebccd1;
-}
-.panel-danger > .panel-heading + .panel-collapse > .panel-body {
-  border-top-color: #ebccd1;
-}
-.panel-danger > .panel-heading .badge {
-  color: #f2dede;
-  background-color: #a94442;
-}
-.panel-danger > .panel-footer + .panel-collapse > .panel-body {
-  border-bottom-color: #ebccd1;
-}
-.embed-responsive {
-  position: relative;
-  display: block;
-  height: 0;
-  padding: 0;
-  overflow: hidden;
-}
-.embed-responsive .embed-responsive-item,
-.embed-responsive iframe,
-.embed-responsive embed,
-.embed-responsive object,
-.embed-responsive video {
-  position: absolute;
-  top: 0;
-  bottom: 0;
-  left: 0;
-  width: 100%;
-  height: 100%;
-  border: 0;
-}
-.embed-responsive-16by9 {
-  padding-bottom: 56.25%;
-}
-.embed-responsive-4by3 {
-  padding-bottom: 75%;
-}
-.well {
-  min-height: 20px;
-  padding: 19px;
-  margin-bottom: 20px;
-  background-color: #f5f5f5;
-  border: 1px solid #e3e3e3;
-  border-radius: 4px;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .05);
-          box-shadow: inset 0 1px 1px rgba(0, 0, 0, .05);
-}
-.well blockquote {
-  border-color: #ddd;
-  border-color: rgba(0, 0, 0, .15);
-}
-.well-lg {
-  padding: 24px;
-  border-radius: 6px;
-}
-.well-sm {
-  padding: 9px;
-  border-radius: 3px;
-}
-.close {
-  float: right;
-  font-size: 21px;
-  font-weight: bold;
-  line-height: 1;
-  color: #000;
-  text-shadow: 0 1px 0 #fff;
-  filter: alpha(opacity=20);
-  opacity: .2;
-}
-.close:hover,
-.close:focus {
-  color: #000;
-  text-decoration: none;
-  cursor: pointer;
-  filter: alpha(opacity=50);
-  opacity: .5;
-}
-button.close {
-  -webkit-appearance: none;
-  padding: 0;
-  cursor: pointer;
-  background: transparent;
-  border: 0;
-}
-.modal-open {
-  overflow: hidden;
-}
-.modal {
-  position: fixed;
-  top: 0;
-  right: 0;
-  bottom: 0;
-  left: 0;
-  z-index: 1050;
-  display: none;
-  overflow: hidden;
-  -webkit-overflow-scrolling: touch;
-  outline: 0;
-}
-.modal.fade .modal-dialog {
-  -webkit-transition: -webkit-transform .3s ease-out;
-       -o-transition:      -o-transform .3s ease-out;
-          transition:         transform .3s ease-out;
-  -webkit-transform: translate(0, -25%);
-      -ms-transform: translate(0, -25%);
-       -o-transform: translate(0, -25%);
-          transform: translate(0, -25%);
-}
-.modal.in .modal-dialog {
-  -webkit-transform: translate(0, 0);
-      -ms-transform: translate(0, 0);
-       -o-transform: translate(0, 0);
-          transform: translate(0, 0);
-}
-.modal-open .modal {
-  overflow-x: hidden;
-  overflow-y: auto;
-}
-.modal-dialog {
-  position: relative;
-  width: auto;
-  margin: 10px;
-}
-.modal-content {
-  position: relative;
-  background-color: #fff;
-  -webkit-background-clip: padding-box;
-          background-clip: padding-box;
-  border: 1px solid #999;
-  border: 1px solid rgba(0, 0, 0, .2);
-  border-radius: 6px;
-  outline: 0;
-  -webkit-box-shadow: 0 3px 9px rgba(0, 0, 0, .5);
-          box-shadow: 0 3px 9px rgba(0, 0, 0, .5);
-}
-.modal-backdrop {
-  position: fixed;
-  top: 0;
-  right: 0;
-  bottom: 0;
-  left: 0;
-  z-index: 1040;
-  background-color: #000;
-}
-.modal-backdrop.fade {
-  filter: alpha(opacity=0);
-  opacity: 0;
-}
-.modal-backdrop.in {
-  filter: alpha(opacity=50);
-  opacity: .5;
-}
-.modal-header {
-  min-height: 16.42857143px;
-  padding: 15px;
-  border-bottom: 1px solid #e5e5e5;
-}
-.modal-header .close {
-  margin-top: -2px;
-}
-.modal-title {
-  margin: 0;
-  line-height: 1.42857143;
-}
-.modal-body {
-  position: relative;
-  padding: 15px;
-}
-.modal-footer {
-  padding: 15px;
-  text-align: right;
-  border-top: 1px solid #e5e5e5;
-}
-.modal-footer .btn + .btn {
-  margin-bottom: 0;
-  margin-left: 5px;
-}
-.modal-footer .btn-group .btn + .btn {
-  margin-left: -1px;
-}
-.modal-footer .btn-block + .btn-block {
-  margin-left: 0;
-}
-.modal-scrollbar-measure {
-  position: absolute;
-  top: -9999px;
-  width: 50px;
-  height: 50px;
-  overflow: scroll;
-}
-@media (min-width: 768px) {
-  .modal-dialog {
-    width: 600px;
-    margin: 30px auto;
-  }
-  .modal-content {
-    -webkit-box-shadow: 0 5px 15px rgba(0, 0, 0, .5);
-            box-shadow: 0 5px 15px rgba(0, 0, 0, .5);
-  }
-  .modal-sm {
-    width: 300px;
-  }
-}
-@media (min-width: 992px) {
-  .modal-lg {
-    width: 900px;
-  }
-}
-.tooltip {
-  position: absolute;
-  z-index: 1070;
-  display: block;
-  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
-  font-size: 12px;
-  font-weight: normal;
-  line-height: 1.4;
-  filter: alpha(opacity=0);
-  opacity: 0;
-}
-.tooltip.in {
-  filter: alpha(opacity=90);
-  opacity: .9;
-}
-.tooltip.top {
-  padding: 5px 0;
-  margin-top: -3px;
-}
-.tooltip.right {
-  padding: 0 5px;
-  margin-left: 3px;
-}
-.tooltip.bottom {
-  padding: 5px 0;
-  margin-top: 3px;
-}
-.tooltip.left {
-  padding: 0 5px;
-  margin-left: -3px;
-}
-.tooltip-inner {
-  max-width: 200px;
-  padding: 3px 8px;
-  color: #fff;
-  text-align: center;
-  text-decoration: none;
-  background-color: #000;
-  border-radius: 4px;
-}
-.tooltip-arrow {
-  position: absolute;
-  width: 0;
-  height: 0;
-  border-color: transparent;
-  border-style: solid;
-}
-.tooltip.top .tooltip-arrow {
-  bottom: 0;
-  left: 50%;
-  margin-left: -5px;
-  border-width: 5px 5px 0;
-  border-top-color: #000;
-}
-.tooltip.top-left .tooltip-arrow {
-  right: 5px;
-  bottom: 0;
-  margin-bottom: -5px;
-  border-width: 5px 5px 0;
-  border-top-color: #000;
-}
-.tooltip.top-right .tooltip-arrow {
-  bottom: 0;
-  left: 5px;
-  margin-bottom: -5px;
-  border-width: 5px 5px 0;
-  border-top-color: #000;
-}
-.tooltip.right .tooltip-arrow {
-  top: 50%;
-  left: 0;
-  margin-top: -5px;
-  border-width: 5px 5px 5px 0;
-  border-right-color: #000;
-}
-.tooltip.left .tooltip-arrow {
-  top: 50%;
-  right: 0;
-  margin-top: -5px;
-  border-width: 5px 0 5px 5px;
-  border-left-color: #000;
-}
-.tooltip.bottom .tooltip-arrow {
-  top: 0;
-  left: 50%;
-  margin-left: -5px;
-  border-width: 0 5px 5px;
-  border-bottom-color: #000;
-}
-.tooltip.bottom-left .tooltip-arrow {
-  top: 0;
-  right: 5px;
-  margin-top: -5px;
-  border-width: 0 5px 5px;
-  border-bottom-color: #000;
-}
-.tooltip.bottom-right .tooltip-arrow {
-  top: 0;
-  left: 5px;
-  margin-top: -5px;
-  border-width: 0 5px 5px;
-  border-bottom-color: #000;
-}
-.popover {
-  position: absolute;
-  top: 0;
-  left: 0;
-  z-index: 1060;
-  display: none;
-  max-width: 276px;
-  padding: 1px;
-  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
-  font-size: 14px;
-  font-weight: normal;
-  line-height: 1.42857143;
-  text-align: left;
-  white-space: normal;
-  background-color: #fff;
-  -webkit-background-clip: padding-box;
-          background-clip: padding-box;
-  border: 1px solid #ccc;
-  border: 1px solid rgba(0, 0, 0, .2);
-  border-radius: 6px;
-  -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, .2);
-          box-shadow: 0 5px 10px rgba(0, 0, 0, .2);
-}
-.popover.top {
-  margin-top: -10px;
-}
-.popover.right {
-  margin-left: 10px;
-}
-.popover.bottom {
-  margin-top: 10px;
-}
-.popover.left {
-  margin-left: -10px;
-}
-.popover-title {
-  padding: 8px 14px;
-  margin: 0;
-  font-size: 14px;
-  background-color: #f7f7f7;
-  border-bottom: 1px solid #ebebeb;
-  border-radius: 5px 5px 0 0;
-}
-.popover-content {
-  padding: 9px 14px;
-}
-.popover > .arrow,
-.popover > .arrow:after {
-  position: absolute;
-  display: block;
-  width: 0;
-  height: 0;
-  border-color: transparent;
-  border-style: solid;
-}
-.popover > .arrow {
-  border-width: 11px;
-}
-.popover > .arrow:after {
-  content: "";
-  border-width: 10px;
-}
-.popover.top > .arrow {
-  bottom: -11px;
-  left: 50%;
-  margin-left: -11px;
-  border-top-color: #999;
-  border-top-color: rgba(0, 0, 0, .25);
-  border-bottom-width: 0;
-}
-.popover.top > .arrow:after {
-  bottom: 1px;
-  margin-left: -10px;
-  content: " ";
-  border-top-color: #fff;
-  border-bottom-width: 0;
-}
-.popover.right > .arrow {
-  top: 50%;
-  left: -11px;
-  margin-top: -11px;
-  border-right-color: #999;
-  border-right-color: rgba(0, 0, 0, .25);
-  border-left-width: 0;
-}
-.popover.right > .arrow:after {
-  bottom: -10px;
-  left: 1px;
-  content: " ";
-  border-right-color: #fff;
-  border-left-width: 0;
-}
-.popover.bottom > .arrow {
-  top: -11px;
-  left: 50%;
-  margin-left: -11px;
-  border-top-width: 0;
-  border-bottom-color: #999;
-  border-bottom-color: rgba(0, 0, 0, .25);
-}
-.popover.bottom > .arrow:after {
-  top: 1px;
-  margin-left: -10px;
-  content: " ";
-  border-top-width: 0;
-  border-bottom-color: #fff;
-}
-.popover.left > .arrow {
-  top: 50%;
-  right: -11px;
-  margin-top: -11px;
-  border-right-width: 0;
-  border-left-color: #999;
-  border-left-color: rgba(0, 0, 0, .25);
-}
-.popover.left > .arrow:after {
-  right: 1px;
-  bottom: -10px;
-  content: " ";
-  border-right-width: 0;
-  border-left-color: #fff;
-}
-.carousel {
-  position: relative;
-}
-.carousel-inner {
-  position: relative;
-  width: 100%;
-  overflow: hidden;
-}
-.carousel-inner > .item {
-  position: relative;
-  display: none;
-  -webkit-transition: .6s ease-in-out left;
-       -o-transition: .6s ease-in-out left;
-          transition: .6s ease-in-out left;
-}
-.carousel-inner > .item > img,
-.carousel-inner > .item > a > img {
-  line-height: 1;
-}
-@media all and (transform-3d), (-webkit-transform-3d) {
-  .carousel-inner > .item {
-    -webkit-transition: -webkit-transform .6s ease-in-out;
-         -o-transition:      -o-transform .6s ease-in-out;
-            transition:         transform .6s ease-in-out;
-
-    -webkit-backface-visibility: hidden;
-            backface-visibility: hidden;
-    -webkit-perspective: 1000;
-            perspective: 1000;
-  }
-  .carousel-inner > .item.next,
-  .carousel-inner > .item.active.right {
-    left: 0;
-    -webkit-transform: translate3d(100%, 0, 0);
-            transform: translate3d(100%, 0, 0);
-  }
-  .carousel-inner > .item.prev,
-  .carousel-inner > .item.active.left {
-    left: 0;
-    -webkit-transform: translate3d(-100%, 0, 0);
-            transform: translate3d(-100%, 0, 0);
-  }
-  .carousel-inner > .item.next.left,
-  .carousel-inner > .item.prev.right,
-  .carousel-inner > .item.active {
-    left: 0;
-    -webkit-transform: translate3d(0, 0, 0);
-            transform: translate3d(0, 0, 0);
-  }
-}
-.carousel-inner > .active,
-.carousel-inner > .next,
-.carousel-inner > .prev {
-  display: block;
-}
-.carousel-inner > .active {
-  left: 0;
-}
-.carousel-inner > .next,
-.carousel-inner > .prev {
-  position: absolute;
-  top: 0;
-  width: 100%;
-}
-.carousel-inner > .next {
-  left: 100%;
-}
-.carousel-inner > .prev {
-  left: -100%;
-}
-.carousel-inner > .next.left,
-.carousel-inner > .prev.right {
-  left: 0;
-}
-.carousel-inner > .active.left {
-  left: -100%;
-}
-.carousel-inner > .active.right {
-  left: 100%;
-}
-.carousel-control {
-  position: absolute;
-  top: 0;
-  bottom: 0;
-  left: 0;
-  width: 15%;
-  font-size: 20px;
-  color: #fff;
-  text-align: center;
-  text-shadow: 0 1px 2px rgba(0, 0, 0, .6);
-  filter: alpha(opacity=50);
-  opacity: .5;
-}
-.carousel-control.left {
-  background-image: -webkit-linear-gradient(left, rgba(0, 0, 0, .5) 0%, rgba(0, 0, 0, .0001) 100%);
-  background-image:      -o-linear-gradient(left, rgba(0, 0, 0, .5) 0%, rgba(0, 0, 0, .0001) 100%);
-  background-image: -webkit-gradient(linear, left top, right top, from(rgba(0, 0, 0, .5)), to(rgba(0, 0, 0, .0001)));
-  background-image:         linear-gradient(to right, rgba(0, 0, 0, .5) 0%, rgba(0, 0, 0, .0001) 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#80000000', endColorstr='#00000000', GradientType=1);
-  background-repeat: repeat-x;
-}
-.carousel-control.right {
-  right: 0;
-  left: auto;
-  background-image: -webkit-linear-gradient(left, rgba(0, 0, 0, .0001) 0%, rgba(0, 0, 0, .5) 100%);
-  background-image:      -o-linear-gradient(left, rgba(0, 0, 0, .0001) 0%, rgba(0, 0, 0, .5) 100%);
-  background-image: -webkit-gradient(linear, left top, right top, from(rgba(0, 0, 0, .0001)), to(rgba(0, 0, 0, .5)));
-  background-image:         linear-gradient(to right, rgba(0, 0, 0, .0001) 0%, rgba(0, 0, 0, .5) 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#80000000', GradientType=1);
-  background-repeat: repeat-x;
-}
-.carousel-control:hover,
-.carousel-control:focus {
-  color: #fff;
-  text-decoration: none;
-  filter: alpha(opacity=90);
-  outline: 0;
-  opacity: .9;
-}
-.carousel-control .icon-prev,
-.carousel-control .icon-next,
-.carousel-control .glyphicon-chevron-left,
-.carousel-control .glyphicon-chevron-right {
-  position: absolute;
-  top: 50%;
-  z-index: 5;
-  display: inline-block;
-}
-.carousel-control .icon-prev,
-.carousel-control .glyphicon-chevron-left {
-  left: 50%;
-  margin-left: -10px;
-}
-.carousel-control .icon-next,
-.carousel-control .glyphicon-chevron-right {
-  right: 50%;
-  margin-right: -10px;
-}
-.carousel-control .icon-prev,
-.carousel-control .icon-next {
-  width: 20px;
-  height: 20px;
-  margin-top: -10px;
-  font-family: serif;
-  line-height: 1;
-}
-.carousel-control .icon-prev:before {
-  content: '\2039';
-}
-.carousel-control .icon-next:before {
-  content: '\203a';
-}
-.carousel-indicators {
-  position: absolute;
-  bottom: 10px;
-  left: 50%;
-  z-index: 15;
-  width: 60%;
-  padding-left: 0;
-  margin-left: -30%;
-  text-align: center;
-  list-style: none;
-}
-.carousel-indicators li {
-  display: inline-block;
-  width: 10px;
-  height: 10px;
-  margin: 1px;
-  text-indent: -999px;
-  cursor: pointer;
-  background-color: #000 \9;
-  background-color: rgba(0, 0, 0, 0);
-  border: 1px solid #fff;
-  border-radius: 10px;
-}
-.carousel-indicators .active {
-  width: 12px;
-  height: 12px;
-  margin: 0;
-  background-color: #fff;
-}
-.carousel-caption {
-  position: absolute;
-  right: 15%;
-  bottom: 20px;
-  left: 15%;
-  z-index: 10;
-  padding-top: 20px;
-  padding-bottom: 20px;
-  color: #fff;
-  text-align: center;
-  text-shadow: 0 1px 2px rgba(0, 0, 0, .6);
-}
-.carousel-caption .btn {
-  text-shadow: none;
-}
-@media screen and (min-width: 768px) {
-  .carousel-control .glyphicon-chevron-left,
-  .carousel-control .glyphicon-chevron-right,
-  .carousel-control .icon-prev,
-  .carousel-control .icon-next {
-    width: 30px;
-    height: 30px;
-    margin-top: -15px;
-    font-size: 30px;
-  }
-  .carousel-control .glyphicon-chevron-left,
-  .carousel-control .icon-prev {
-    margin-left: -15px;
-  }
-  .carousel-control .glyphicon-chevron-right,
-  .carousel-control .icon-next {
-    margin-right: -15px;
-  }
-  .carousel-caption {
-    right: 20%;
-    left: 20%;
-    padding-bottom: 30px;
-  }
-  .carousel-indicators {
-    bottom: 20px;
-  }
-}
-.clearfix:before,
-.clearfix:after,
-.dl-horizontal dd:before,
-.dl-horizontal dd:after,
-.container:before,
-.container:after,
-.container-fluid:before,
-.container-fluid:after,
-.row:before,
-.row:after,
-.form-horizontal .form-group:before,
-.form-horizontal .form-group:after,
-.btn-toolbar:before,
-.btn-toolbar:after,
-.btn-group-vertical > .btn-group:before,
-.btn-group-vertical > .btn-group:after,
-.nav:before,
-.nav:after,
-.navbar:before,
-.navbar:after,
-.navbar-header:before,
-.navbar-header:after,
-.navbar-collapse:before,
-.navbar-collapse:after,
-.pager:before,
-.pager:after,
-.panel-body:before,
-.panel-body:after,
-.modal-footer:before,
-.modal-footer:after {
-  display: table;
-  content: " ";
-}
-.clearfix:after,
-.dl-horizontal dd:after,
-.container:after,
-.container-fluid:after,
-.row:after,
-.form-horizontal .form-group:after,
-.btn-toolbar:after,
-.btn-group-vertical > .btn-group:after,
-.nav:after,
-.navbar:after,
-.navbar-header:after,
-.navbar-collapse:after,
-.pager:after,
-.panel-body:after,
-.modal-footer:after {
-  clear: both;
-}
-.center-block {
-  display: block;
-  margin-right: auto;
-  margin-left: auto;
-}
-.pull-right {
-  float: right !important;
-}
-.pull-left {
-  float: left !important;
-}
-.hide {
-  display: none !important;
-}
-.show {
-  display: block !important;
-}
-.invisible {
-  visibility: hidden;
-}
-.text-hide {
-  font: 0/0 a;
-  color: transparent;
-  text-shadow: none;
-  background-color: transparent;
-  border: 0;
-}
-.hidden {
-  display: none !important;
-}
-.affix {
-  position: fixed;
-}
-@-ms-viewport {
-  width: device-width;
-}
-.visible-xs,
-.visible-sm,
-.visible-md,
-.visible-lg {
-  display: none !important;
-}
-.visible-xs-block,
-.visible-xs-inline,
-.visible-xs-inline-block,
-.visible-sm-block,
-.visible-sm-inline,
-.visible-sm-inline-block,
-.visible-md-block,
-.visible-md-inline,
-.visible-md-inline-block,
-.visible-lg-block,
-.visible-lg-inline,
-.visible-lg-inline-block {
-  display: none !important;
-}
-@media (max-width: 767px) {
-  .visible-xs {
-    display: block !important;
-  }
-  table.visible-xs {
-    display: table;
-  }
-  tr.visible-xs {
-    display: table-row !important;
-  }
-  th.visible-xs,
-  td.visible-xs {
-    display: table-cell !important;
-  }
-}
-@media (max-width: 767px) {
-  .visible-xs-block {
-    display: block !important;
-  }
-}
-@media (max-width: 767px) {
-  .visible-xs-inline {
-    display: inline !important;
-  }
-}
-@media (max-width: 767px) {
-  .visible-xs-inline-block {
-    display: inline-block !important;
-  }
-}
-@media (min-width: 768px) and (max-width: 991px) {
-  .visible-sm {
-    display: block !important;
-  }
-  table.visible-sm {
-    display: table;
-  }
-  tr.visible-sm {
-    display: table-row !important;
-  }
-  th.visible-sm,
-  td.visible-sm {
-    display: table-cell !important;
-  }
-}
-@media (min-width: 768px) and (max-width: 991px) {
-  .visible-sm-block {
-    display: block !important;
-  }
-}
-@media (min-width: 768px) and (max-width: 991px) {
-  .visible-sm-inline {
-    display: inline !important;
-  }
-}
-@media (min-width: 768px) and (max-width: 991px) {
-  .visible-sm-inline-block {
-    display: inline-block !important;
-  }
-}
-@media (min-width: 992px) and (max-width: 1199px) {
-  .visible-md {
-    display: block !important;
-  }
-  table.visible-md {
-    display: table;
-  }
-  tr.visible-md {
-    display: table-row !important;
-  }
-  th.visible-md,
-  td.visible-md {
-    display: table-cell !important;
-  }
-}
-@media (min-width: 992px) and (max-width: 1199px) {
-  .visible-md-block {
-    display: block !important;
-  }
-}
-@media (min-width: 992px) and (max-width: 1199px) {
-  .visible-md-inline {
-    display: inline !important;
-  }
-}
-@media (min-width: 992px) and (max-width: 1199px) {
-  .visible-md-inline-block {
-    display: inline-block !important;
-  }
-}
-@media (min-width: 1200px) {
-  .visible-lg {
-    display: block !important;
-  }
-  table.visible-lg {
-    display: table;
-  }
-  tr.visible-lg {
-    display: table-row !important;
-  }
-  th.visible-lg,
-  td.visible-lg {
-    display: table-cell !important;
-  }
-}
-@media (min-width: 1200px) {
-  .visible-lg-block {
-    display: block !important;
-  }
-}
-@media (min-width: 1200px) {
-  .visible-lg-inline {
-    display: inline !important;
-  }
-}
-@media (min-width: 1200px) {
-  .visible-lg-inline-block {
-    display: inline-block !important;
-  }
-}
-@media (max-width: 767px) {
-  .hidden-xs {
-    display: none !important;
-  }
-}
-@media (min-width: 768px) and (max-width: 991px) {
-  .hidden-sm {
-    display: none !important;
-  }
-}
-@media (min-width: 992px) and (max-width: 1199px) {
-  .hidden-md {
-    display: none !important;
-  }
-}
-@media (min-width: 1200px) {
-  .hidden-lg {
-    display: none !important;
-  }
-}
-.visible-print {
-  display: none !important;
-}
-@media print {
-  .visible-print {
-    display: block !important;
-  }
-  table.visible-print {
-    display: table;
-  }
-  tr.visible-print {
-    display: table-row !important;
-  }
-  th.visible-print,
-  td.visible-print {
-    display: table-cell !important;
-  }
-}
-.visible-print-block {
-  display: none !important;
-}
-@media print {
-  .visible-print-block {
-    display: block !important;
-  }
-}
-.visible-print-inline {
-  display: none !important;
-}
-@media print {
-  .visible-print-inline {
-    display: inline !important;
-  }
-}
-.visible-print-inline-block {
-  display: none !important;
-}
-@media print {
-  .visible-print-inline-block {
-    display: inline-block !important;
-  }
-}
-@media print {
-  .hidden-print {
-    display: none !important;
-  }
-}
-/*# sourceMappingURL=bootstrap.css.map */
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/shared/admin/css/dropdowns-enhancement.css b/Godeps/_workspace/src/github.com/influxdb/influxdb/shared/admin/css/dropdowns-enhancement.css
deleted file mode 100644
index 3816a7da1..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/shared/admin/css/dropdowns-enhancement.css
+++ /dev/null
@@ -1,294 +0,0 @@
-.dropdown-menu > li > label {
-  display: block;
-  padding: 3px 20px;
-  clear: both;
-  font-weight: normal;
-  line-height: 1.42857143;
-  color: #333333;
-  white-space: nowrap;
-}
-.dropdown-menu > li > label:hover,
-.dropdown-menu > li > label:focus {
-  text-decoration: none;
-  color: #262626;
-  background-color: #f5f5f5;
-}
-.dropdown-menu > li > input:checked ~ label,
-.dropdown-menu > li > input:checked ~ label:hover,
-.dropdown-menu > li > input:checked ~ label:focus,
-.dropdown-menu > .active > label,
-.dropdown-menu > .active > label:hover,
-.dropdown-menu > .active > label:focus {
-  color: #ffffff;
-  text-decoration: none;
-  outline: 0;
-  background-color: #428bca;
-}
-.dropdown-menu > li > input[disabled] ~ label,
-.dropdown-menu > li > input[disabled] ~ label:hover,
-.dropdown-menu > li > input[disabled] ~ label:focus,
-.dropdown-menu > .disabled > label,
-.dropdown-menu > .disabled > label:hover,
-.dropdown-menu > .disabled > label:focus {
-  color: #999999;
-}
-.dropdown-menu > li > input[disabled] ~ label:hover,
-.dropdown-menu > li > input[disabled] ~ label:focus,
-.dropdown-menu > .disabled > label:hover,
-.dropdown-menu > .disabled > label:focus {
-  text-decoration: none;
-  background-color: transparent;
-  background-image: none;
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
-  cursor: not-allowed;
-}
-.dropdown-menu > li > label {
-  margin-bottom: 0;
-  cursor: pointer;
-}
-.dropdown-menu > li > input[type="radio"],
-.dropdown-menu > li > input[type="checkbox"] {
-  display: none;
-  position: absolute;
-  top: -9999em;
-  left: -9999em;
-}
-.dropdown-menu > li > label:focus,
-.dropdown-menu > li > input:focus ~ label {
-  outline: thin dotted;
-  outline: 5px auto -webkit-focus-ring-color;
-  outline-offset: -2px;
-}
-.dropdown-menu.pull-right {
-  right: 0;
-  left: auto;
-}
-.dropdown-menu.pull-top {
-  bottom: 100%;
-  top: auto;
-  margin: 0 0 2px;
-  -webkit-box-shadow: 0 -6px 12px rgba(0, 0, 0, 0.175);
-  box-shadow: 0 -6px 12px rgba(0, 0, 0, 0.175);
-}
-.dropdown-menu.pull-center {
-  right: 50%;
-  left: auto;
-}
-.dropdown-menu.pull-middle {
-  right: 100%;
-  margin: 0 2px 0 0;
-  box-shadow: -5px 0 10px rgba(0, 0, 0, 0.2);
-  left: auto;
-}
-.dropdown-menu.pull-middle.pull-right {
-  right: auto;
-  left: 100%;
-  margin: 0 0 0 2px;
-  box-shadow: 5px 0 10px rgba(0, 0, 0, 0.2);
-}
-.dropdown-menu.pull-middle.pull-center {
-  right: 50%;
-  margin: 0;
-  box-shadow: 0 0 10px rgba(0, 0, 0, 0.2);
-}
-.dropdown-menu.bullet {
-  margin-top: 8px;
-}
-.dropdown-menu.bullet:before {
-  width: 0;
-  height: 0;
-  content: '';
-  display: inline-block;
-  position: absolute;
-  border-color: transparent;
-  border-style: solid;
-  -webkit-transform: rotate(360deg);
-  border-width: 0 7px 7px;
-  border-bottom-color: #cccccc;
-  border-bottom-color: rgba(0, 0, 0, 0.15);
-  top: -7px;
-  left: 9px;
-}
-.dropdown-menu.bullet:after {
-  width: 0;
-  height: 0;
-  content: '';
-  display: inline-block;
-  position: absolute;
-  border-color: transparent;
-  border-style: solid;
-  -webkit-transform: rotate(360deg);
-  border-width: 0 6px 6px;
-  border-bottom-color: #ffffff;
-  top: -6px;
-  left: 10px;
-}
-.dropdown-menu.bullet.pull-right:before {
-  left: auto;
-  right: 9px;
-}
-.dropdown-menu.bullet.pull-right:after {
-  left: auto;
-  right: 10px;
-}
-.dropdown-menu.bullet.pull-top {
-  margin-top: 0;
-  margin-bottom: 8px;
-}
-.dropdown-menu.bullet.pull-top:before {
-  top: auto;
-  bottom: -7px;
-  border-bottom-width: 0;
-  border-top-width: 7px;
-  border-top-color: #cccccc;
-  border-top-color: rgba(0, 0, 0, 0.15);
-}
-.dropdown-menu.bullet.pull-top:after {
-  top: auto;
-  bottom: -6px;
-  border-bottom: none;
-  border-top-width: 6px;
-  border-top-color: #ffffff;
-}
-.dropdown-menu.bullet.pull-center:before {
-  left: auto;
-  right: 50%;
-  margin-right: -7px;
-}
-.dropdown-menu.bullet.pull-center:after {
-  left: auto;
-  right: 50%;
-  margin-right: -6px;
-}
-.dropdown-menu.bullet.pull-middle {
-  margin-right: 8px;
-}
-.dropdown-menu.bullet.pull-middle:before {
-  top: 50%;
-  left: 100%;
-  right: auto;
-  margin-top: -7px;
-  border-right-width: 0;
-  border-bottom-color: transparent;
-  border-top-width: 7px;
-  border-left-color: #cccccc;
-  border-left-color: rgba(0, 0, 0, 0.15);
-}
-.dropdown-menu.bullet.pull-middle:after {
-  top: 50%;
-  left: 100%;
-  right: auto;
-  margin-top: -6px;
-  border-right-width: 0;
-  border-bottom-color: transparent;
-  border-top-width: 6px;
-  border-left-color: #ffffff;
-}
-.dropdown-menu.bullet.pull-middle.pull-right {
-  margin-right: 0;
-  margin-left: 8px;
-}
-.dropdown-menu.bullet.pull-middle.pull-right:before {
-  left: -7px;
-  border-left-width: 0;
-  border-right-width: 7px;
-  border-right-color: #cccccc;
-  border-right-color: rgba(0, 0, 0, 0.15);
-}
-.dropdown-menu.bullet.pull-middle.pull-right:after {
-  left: -6px;
-  border-left-width: 0;
-  border-right-width: 6px;
-  border-right-color: #ffffff;
-}
-.dropdown-menu.bullet.pull-middle.pull-center {
-  margin-left: 0;
-  margin-right: 0;
-}
-.dropdown-menu.bullet.pull-middle.pull-center:before {
-  border: none;
-  display: none;
-}
-.dropdown-menu.bullet.pull-middle.pull-center:after {
-  border: none;
-  display: none;
-}
-.dropdown-submenu {
-  position: relative;
-}
-.dropdown-submenu > .dropdown-menu {
-  top: 0;
-  left: 100%;
-  margin-top: -6px;
-  margin-left: -1px;
-  border-top-left-radius: 0;
-}
-.dropdown-submenu > a:before {
-  display: block;
-  float: right;
-  width: 0;
-  height: 0;
-  content: "";
-  margin-top: 6px;
-  margin-right: -8px;
-  border-width: 4px 0 4px 4px;
-  border-style: solid;
-  border-left-style: dashed;
-  border-top-color: transparent;
-  border-bottom-color: transparent;
-}
-@media (max-width: 767px) {
-  .navbar-nav .dropdown-submenu > a:before {
-    margin-top: 8px;
-    border-color: inherit;
-    border-style: solid;
-    border-width: 4px 4px 0;
-    border-left-color: transparent;
-    border-right-color: transparent;
-  }
-  .navbar-nav .dropdown-submenu > a {
-    padding-left: 40px;
-  }
-  .navbar-nav > .open > .dropdown-menu > .dropdown-submenu > .dropdown-menu > li > a,
-  .navbar-nav > .open > .dropdown-menu > .dropdown-submenu > .dropdown-menu > li > label {
-    padding-left: 35px;
-  }
-  .navbar-nav > .open > .dropdown-menu > .dropdown-submenu > .dropdown-menu > li > .dropdown-menu > li > a,
-  .navbar-nav > .open > .dropdown-menu > .dropdown-submenu > .dropdown-menu > li > .dropdown-menu > li > label {
-    padding-left: 45px;
-  }
-  .navbar-nav > .open > .dropdown-menu > .dropdown-submenu > .dropdown-menu > li > .dropdown-menu > li > .dropdown-menu > li > a,
-  .navbar-nav > .open > .dropdown-menu > .dropdown-submenu > .dropdown-menu > li > .dropdown-menu > li > .dropdown-menu > li > label {
-    padding-left: 55px;
-  }
-  .navbar-nav > .open > .dropdown-menu > .dropdown-submenu > .dropdown-menu > li > .dropdown-menu > li > .dropdown-menu > li > .dropdown-menu > li > a,
-  .navbar-nav > .open > .dropdown-menu > .dropdown-submenu > .dropdown-menu > li > .dropdown-menu > li > .dropdown-menu > li > .dropdown-menu > li > label {
-    padding-left: 65px;
-  }
-  .navbar-nav > .open > .dropdown-menu > .dropdown-submenu > .dropdown-menu > li > .dropdown-menu > li > .dropdown-menu > li > .dropdown-menu > li > .dropdown-menu > li > a,
-  .navbar-nav > .open > .dropdown-menu > .dropdown-submenu > .dropdown-menu > li > .dropdown-menu > li > .dropdown-menu > li > .dropdown-menu > li > .dropdown-menu > li > label {
-    padding-left: 75px;
-  }
-}
-.navbar-default .navbar-nav .open > .dropdown-menu > .dropdown-submenu.open > a,
-.navbar-default .navbar-nav .open > .dropdown-menu > .dropdown-submenu.open > a:hover,
-.navbar-default .navbar-nav .open > .dropdown-menu > .dropdown-submenu.open > a:focus {
-  background-color: #e7e7e7;
-  color: #555555;
-}
-@media (max-width: 767px) {
-  .navbar-default .navbar-nav .open > .dropdown-menu > .dropdown-submenu.open > a:before {
-    border-top-color: #555555;
-  }
-}
-.navbar-inverse .navbar-nav .open > .dropdown-menu > .dropdown-submenu.open > a,
-.navbar-inverse .navbar-nav .open > .dropdown-menu > .dropdown-submenu.open > a:hover,
-.navbar-inverse .navbar-nav .open > .dropdown-menu > .dropdown-submenu.open > a:focus {
-  background-color: #080808;
-  color: #ffffff;
-}
-@media (max-width: 767px) {
-  .navbar-inverse .navbar-nav .open > .dropdown-menu > .dropdown-submenu.open > a:before {
-    border-top-color: #ffffff;
-  }
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/shared/admin/fonts/glyphicons-halflings-regular.eot b/Godeps/_workspace/src/github.com/influxdb/influxdb/shared/admin/fonts/glyphicons-halflings-regular.eot
deleted file mode 100644
index b93a4953f..000000000
Binary files a/Godeps/_workspace/src/github.com/influxdb/influxdb/shared/admin/fonts/glyphicons-halflings-regular.eot and /dev/null differ
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/shared/admin/fonts/glyphicons-halflings-regular.svg b/Godeps/_workspace/src/github.com/influxdb/influxdb/shared/admin/fonts/glyphicons-halflings-regular.svg
deleted file mode 100644
index 94fb5490a..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/shared/admin/fonts/glyphicons-halflings-regular.svg
+++ /dev/null
@@ -1,288 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
-<svg xmlns="http://www.w3.org/2000/svg">
-<metadata></metadata>
-<defs>
-<font id="glyphicons_halflingsregular" horiz-adv-x="1200" >
-<font-face units-per-em="1200" ascent="960" descent="-240" />
-<missing-glyph horiz-adv-x="500" />
-<glyph horiz-adv-x="0" />
-<glyph horiz-adv-x="400" />
-<glyph unicode=" " />
-<glyph unicode="*" d="M600 1100q15 0 34 -1.5t30 -3.5l11 -1q10 -2 17.5 -10.5t7.5 -18.5v-224l158 158q7 7 18 8t19 -6l106 -106q7 -8 6 -19t-8 -18l-158 -158h224q10 0 18.5 -7.5t10.5 -17.5q6 -41 6 -75q0 -15 -1.5 -34t-3.5 -30l-1 -11q-2 -10 -10.5 -17.5t-18.5 -7.5h-224l158 -158 q7 -7 8 -18t-6 -19l-106 -106q-8 -7 -19 -6t-18 8l-158 158v-224q0 -10 -7.5 -18.5t-17.5 -10.5q-41 -6 -75 -6q-15 0 -34 1.5t-30 3.5l-11 1q-10 2 -17.5 10.5t-7.5 18.5v224l-158 -158q-7 -7 -18 -8t-19 6l-106 106q-7 8 -6 19t8 18l158 158h-224q-10 0 -18.5 7.5 t-10.5 17.5q-6 41 -6 75q0 15 1.5 34t3.5 30l1 11q2 10 10.5 17.5t18.5 7.5h224l-158 158q-7 7 -8 18t6 19l106 106q8 7 19 6t18 -8l158 -158v224q0 10 7.5 18.5t17.5 10.5q41 6 75 6z" />
-<glyph unicode="+" d="M450 1100h200q21 0 35.5 -14.5t14.5 -35.5v-350h350q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-350v-350q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v350h-350q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5 h350v350q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xa0;" />
-<glyph unicode="&#xa5;" d="M825 1100h250q10 0 12.5 -5t-5.5 -13l-364 -364q-6 -6 -11 -18h268q10 0 13 -6t-3 -14l-120 -160q-6 -8 -18 -14t-22 -6h-125v-100h275q10 0 13 -6t-3 -14l-120 -160q-6 -8 -18 -14t-22 -6h-125v-174q0 -11 -7.5 -18.5t-18.5 -7.5h-148q-11 0 -18.5 7.5t-7.5 18.5v174 h-275q-10 0 -13 6t3 14l120 160q6 8 18 14t22 6h125v100h-275q-10 0 -13 6t3 14l120 160q6 8 18 14t22 6h118q-5 12 -11 18l-364 364q-8 8 -5.5 13t12.5 5h250q25 0 43 -18l164 -164q8 -8 18 -8t18 8l164 164q18 18 43 18z" />
-<glyph unicode="&#x2000;" horiz-adv-x="650" />
-<glyph unicode="&#x2001;" horiz-adv-x="1300" />
-<glyph unicode="&#x2002;" horiz-adv-x="650" />
-<glyph unicode="&#x2003;" horiz-adv-x="1300" />
-<glyph unicode="&#x2004;" horiz-adv-x="433" />
-<glyph unicode="&#x2005;" horiz-adv-x="325" />
-<glyph unicode="&#x2006;" horiz-adv-x="216" />
-<glyph unicode="&#x2007;" horiz-adv-x="216" />
-<glyph unicode="&#x2008;" horiz-adv-x="162" />
-<glyph unicode="&#x2009;" horiz-adv-x="260" />
-<glyph unicode="&#x200a;" horiz-adv-x="72" />
-<glyph unicode="&#x202f;" horiz-adv-x="260" />
-<glyph unicode="&#x205f;" horiz-adv-x="325" />
-<glyph unicode="&#x20ac;" d="M744 1198q242 0 354 -189q60 -104 66 -209h-181q0 45 -17.5 82.5t-43.5 61.5t-58 40.5t-60.5 24t-51.5 7.5q-19 0 -40.5 -5.5t-49.5 -20.5t-53 -38t-49 -62.5t-39 -89.5h379l-100 -100h-300q-6 -50 -6 -100h406l-100 -100h-300q9 -74 33 -132t52.5 -91t61.5 -54.5t59 -29 t47 -7.5q22 0 50.5 7.5t60.5 24.5t58 41t43.5 61t17.5 80h174q-30 -171 -128 -278q-107 -117 -274 -117q-206 0 -324 158q-36 48 -69 133t-45 204h-217l100 100h112q1 47 6 100h-218l100 100h134q20 87 51 153.5t62 103.5q117 141 297 141z" />
-<glyph unicode="&#x20bd;" d="M428 1200h350q67 0 120 -13t86 -31t57 -49.5t35 -56.5t17 -64.5t6.5 -60.5t0.5 -57v-16.5v-16.5q0 -36 -0.5 -57t-6.5 -61t-17 -65t-35 -57t-57 -50.5t-86 -31.5t-120 -13h-178l-2 -100h288q10 0 13 -6t-3 -14l-120 -160q-6 -8 -18 -14t-22 -6h-138v-175q0 -11 -5.5 -18 t-15.5 -7h-149q-10 0 -17.5 7.5t-7.5 17.5v175h-267q-10 0 -13 6t3 14l120 160q6 8 18 14t22 6h117v100h-267q-10 0 -13 6t3 14l120 160q6 8 18 14t22 6h117v475q0 10 7.5 17.5t17.5 7.5zM600 1000v-300h203q64 0 86.5 33t22.5 119q0 84 -22.5 116t-86.5 32h-203z" />
-<glyph unicode="&#x2212;" d="M250 700h800q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#x231b;" d="M1000 1200v-150q0 -21 -14.5 -35.5t-35.5 -14.5h-50v-100q0 -91 -49.5 -165.5t-130.5 -109.5q81 -35 130.5 -109.5t49.5 -165.5v-150h50q21 0 35.5 -14.5t14.5 -35.5v-150h-800v150q0 21 14.5 35.5t35.5 14.5h50v150q0 91 49.5 165.5t130.5 109.5q-81 35 -130.5 109.5 t-49.5 165.5v100h-50q-21 0 -35.5 14.5t-14.5 35.5v150h800zM400 1000v-100q0 -60 32.5 -109.5t87.5 -73.5q28 -12 44 -37t16 -55t-16 -55t-44 -37q-55 -24 -87.5 -73.5t-32.5 -109.5v-150h400v150q0 60 -32.5 109.5t-87.5 73.5q-28 12 -44 37t-16 55t16 55t44 37 q55 24 87.5 73.5t32.5 109.5v100h-400z" />
-<glyph unicode="&#x25fc;" horiz-adv-x="500" d="M0 0z" />
-<glyph unicode="&#x2601;" d="M503 1089q110 0 200.5 -59.5t134.5 -156.5q44 14 90 14q120 0 205 -86.5t85 -206.5q0 -121 -85 -207.5t-205 -86.5h-750q-79 0 -135.5 57t-56.5 137q0 69 42.5 122.5t108.5 67.5q-2 12 -2 37q0 153 108 260.5t260 107.5z" />
-<glyph unicode="&#x26fa;" d="M774 1193.5q16 -9.5 20.5 -27t-5.5 -33.5l-136 -187l467 -746h30q20 0 35 -18.5t15 -39.5v-42h-1200v42q0 21 15 39.5t35 18.5h30l468 746l-135 183q-10 16 -5.5 34t20.5 28t34 5.5t28 -20.5l111 -148l112 150q9 16 27 20.5t34 -5zM600 200h377l-182 112l-195 534v-646z " />
-<glyph unicode="&#x2709;" d="M25 1100h1150q10 0 12.5 -5t-5.5 -13l-564 -567q-8 -8 -18 -8t-18 8l-564 567q-8 8 -5.5 13t12.5 5zM18 882l264 -264q8 -8 8 -18t-8 -18l-264 -264q-8 -8 -13 -5.5t-5 12.5v550q0 10 5 12.5t13 -5.5zM918 618l264 264q8 8 13 5.5t5 -12.5v-550q0 -10 -5 -12.5t-13 5.5 l-264 264q-8 8 -8 18t8 18zM818 482l364 -364q8 -8 5.5 -13t-12.5 -5h-1150q-10 0 -12.5 5t5.5 13l364 364q8 8 18 8t18 -8l164 -164q8 -8 18 -8t18 8l164 164q8 8 18 8t18 -8z" />
-<glyph unicode="&#x270f;" d="M1011 1210q19 0 33 -13l153 -153q13 -14 13 -33t-13 -33l-99 -92l-214 214l95 96q13 14 32 14zM1013 800l-615 -614l-214 214l614 614zM317 96l-333 -112l110 335z" />
-<glyph unicode="&#xe001;" d="M700 650v-550h250q21 0 35.5 -14.5t14.5 -35.5v-50h-800v50q0 21 14.5 35.5t35.5 14.5h250v550l-500 550h1200z" />
-<glyph unicode="&#xe002;" d="M368 1017l645 163q39 15 63 0t24 -49v-831q0 -55 -41.5 -95.5t-111.5 -63.5q-79 -25 -147 -4.5t-86 75t25.5 111.5t122.5 82q72 24 138 8v521l-600 -155v-606q0 -42 -44 -90t-109 -69q-79 -26 -147 -5.5t-86 75.5t25.5 111.5t122.5 82.5q72 24 138 7v639q0 38 14.5 59 t53.5 34z" />
-<glyph unicode="&#xe003;" d="M500 1191q100 0 191 -39t156.5 -104.5t104.5 -156.5t39 -191l-1 -2l1 -5q0 -141 -78 -262l275 -274q23 -26 22.5 -44.5t-22.5 -42.5l-59 -58q-26 -20 -46.5 -20t-39.5 20l-275 274q-119 -77 -261 -77l-5 1l-2 -1q-100 0 -191 39t-156.5 104.5t-104.5 156.5t-39 191 t39 191t104.5 156.5t156.5 104.5t191 39zM500 1022q-88 0 -162 -43t-117 -117t-43 -162t43 -162t117 -117t162 -43t162 43t117 117t43 162t-43 162t-117 117t-162 43z" />
-<glyph unicode="&#xe005;" d="M649 949q48 68 109.5 104t121.5 38.5t118.5 -20t102.5 -64t71 -100.5t27 -123q0 -57 -33.5 -117.5t-94 -124.5t-126.5 -127.5t-150 -152.5t-146 -174q-62 85 -145.5 174t-150 152.5t-126.5 127.5t-93.5 124.5t-33.5 117.5q0 64 28 123t73 100.5t104 64t119 20 t120.5 -38.5t104.5 -104z" />
-<glyph unicode="&#xe006;" d="M407 800l131 353q7 19 17.5 19t17.5 -19l129 -353h421q21 0 24 -8.5t-14 -20.5l-342 -249l130 -401q7 -20 -0.5 -25.5t-24.5 6.5l-343 246l-342 -247q-17 -12 -24.5 -6.5t-0.5 25.5l130 400l-347 251q-17 12 -14 20.5t23 8.5h429z" />
-<glyph unicode="&#xe007;" d="M407 800l131 353q7 19 17.5 19t17.5 -19l129 -353h421q21 0 24 -8.5t-14 -20.5l-342 -249l130 -401q7 -20 -0.5 -25.5t-24.5 6.5l-343 246l-342 -247q-17 -12 -24.5 -6.5t-0.5 25.5l130 400l-347 251q-17 12 -14 20.5t23 8.5h429zM477 700h-240l197 -142l-74 -226 l193 139l195 -140l-74 229l192 140h-234l-78 211z" />
-<glyph unicode="&#xe008;" d="M600 1200q124 0 212 -88t88 -212v-250q0 -46 -31 -98t-69 -52v-75q0 -10 6 -21.5t15 -17.5l358 -230q9 -5 15 -16.5t6 -21.5v-93q0 -10 -7.5 -17.5t-17.5 -7.5h-1150q-10 0 -17.5 7.5t-7.5 17.5v93q0 10 6 21.5t15 16.5l358 230q9 6 15 17.5t6 21.5v75q-38 0 -69 52 t-31 98v250q0 124 88 212t212 88z" />
-<glyph unicode="&#xe009;" d="M25 1100h1150q10 0 17.5 -7.5t7.5 -17.5v-1050q0 -10 -7.5 -17.5t-17.5 -7.5h-1150q-10 0 -17.5 7.5t-7.5 17.5v1050q0 10 7.5 17.5t17.5 7.5zM100 1000v-100h100v100h-100zM875 1000h-550q-10 0 -17.5 -7.5t-7.5 -17.5v-350q0 -10 7.5 -17.5t17.5 -7.5h550 q10 0 17.5 7.5t7.5 17.5v350q0 10 -7.5 17.5t-17.5 7.5zM1000 1000v-100h100v100h-100zM100 800v-100h100v100h-100zM1000 800v-100h100v100h-100zM100 600v-100h100v100h-100zM1000 600v-100h100v100h-100zM875 500h-550q-10 0 -17.5 -7.5t-7.5 -17.5v-350q0 -10 7.5 -17.5 t17.5 -7.5h550q10 0 17.5 7.5t7.5 17.5v350q0 10 -7.5 17.5t-17.5 7.5zM100 400v-100h100v100h-100zM1000 400v-100h100v100h-100zM100 200v-100h100v100h-100zM1000 200v-100h100v100h-100z" />
-<glyph unicode="&#xe010;" d="M50 1100h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM650 1100h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v400 q0 21 14.5 35.5t35.5 14.5zM50 500h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM650 500h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400 q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xe011;" d="M50 1100h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM450 1100h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200 q0 21 14.5 35.5t35.5 14.5zM850 1100h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM50 700h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200 q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM450 700h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM850 700h200q21 0 35.5 -14.5t14.5 -35.5v-200 q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM50 300h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM450 300h200 q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM850 300h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5 t35.5 14.5z" />
-<glyph unicode="&#xe012;" d="M50 1100h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM450 1100h700q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-700q-21 0 -35.5 14.5t-14.5 35.5v200 q0 21 14.5 35.5t35.5 14.5zM50 700h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM450 700h700q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-700 q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM50 300h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM450 300h700q21 0 35.5 -14.5t14.5 -35.5v-200 q0 -21 -14.5 -35.5t-35.5 -14.5h-700q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xe013;" d="M465 477l571 571q8 8 18 8t17 -8l177 -177q8 -7 8 -17t-8 -18l-783 -784q-7 -8 -17.5 -8t-17.5 8l-384 384q-8 8 -8 18t8 17l177 177q7 8 17 8t18 -8l171 -171q7 -7 18 -7t18 7z" />
-<glyph unicode="&#xe014;" d="M904 1083l178 -179q8 -8 8 -18.5t-8 -17.5l-267 -268l267 -268q8 -7 8 -17.5t-8 -18.5l-178 -178q-8 -8 -18.5 -8t-17.5 8l-268 267l-268 -267q-7 -8 -17.5 -8t-18.5 8l-178 178q-8 8 -8 18.5t8 17.5l267 268l-267 268q-8 7 -8 17.5t8 18.5l178 178q8 8 18.5 8t17.5 -8 l268 -267l268 268q7 7 17.5 7t18.5 -7z" />
-<glyph unicode="&#xe015;" d="M507 1177q98 0 187.5 -38.5t154.5 -103.5t103.5 -154.5t38.5 -187.5q0 -141 -78 -262l300 -299q8 -8 8 -18.5t-8 -18.5l-109 -108q-7 -8 -17.5 -8t-18.5 8l-300 299q-119 -77 -261 -77q-98 0 -188 38.5t-154.5 103t-103 154.5t-38.5 188t38.5 187.5t103 154.5 t154.5 103.5t188 38.5zM506.5 1023q-89.5 0 -165.5 -44t-120 -120.5t-44 -166t44 -165.5t120 -120t165.5 -44t166 44t120.5 120t44 165.5t-44 166t-120.5 120.5t-166 44zM425 900h150q10 0 17.5 -7.5t7.5 -17.5v-75h75q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5 t-17.5 -7.5h-75v-75q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v75h-75q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5h75v75q0 10 7.5 17.5t17.5 7.5z" />
-<glyph unicode="&#xe016;" d="M507 1177q98 0 187.5 -38.5t154.5 -103.5t103.5 -154.5t38.5 -187.5q0 -141 -78 -262l300 -299q8 -8 8 -18.5t-8 -18.5l-109 -108q-7 -8 -17.5 -8t-18.5 8l-300 299q-119 -77 -261 -77q-98 0 -188 38.5t-154.5 103t-103 154.5t-38.5 188t38.5 187.5t103 154.5 t154.5 103.5t188 38.5zM506.5 1023q-89.5 0 -165.5 -44t-120 -120.5t-44 -166t44 -165.5t120 -120t165.5 -44t166 44t120.5 120t44 165.5t-44 166t-120.5 120.5t-166 44zM325 800h350q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-350q-10 0 -17.5 7.5 t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5z" />
-<glyph unicode="&#xe017;" d="M550 1200h100q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM800 975v166q167 -62 272 -209.5t105 -331.5q0 -117 -45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5 t-184.5 123t-123 184.5t-45.5 224q0 184 105 331.5t272 209.5v-166q-103 -55 -165 -155t-62 -220q0 -116 57 -214.5t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5q0 120 -62 220t-165 155z" />
-<glyph unicode="&#xe018;" d="M1025 1200h150q10 0 17.5 -7.5t7.5 -17.5v-1150q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v1150q0 10 7.5 17.5t17.5 7.5zM725 800h150q10 0 17.5 -7.5t7.5 -17.5v-750q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v750 q0 10 7.5 17.5t17.5 7.5zM425 500h150q10 0 17.5 -7.5t7.5 -17.5v-450q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v450q0 10 7.5 17.5t17.5 7.5zM125 300h150q10 0 17.5 -7.5t7.5 -17.5v-250q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5 v250q0 10 7.5 17.5t17.5 7.5z" />
-<glyph unicode="&#xe019;" d="M600 1174q33 0 74 -5l38 -152l5 -1q49 -14 94 -39l5 -2l134 80q61 -48 104 -105l-80 -134l3 -5q25 -44 39 -93l1 -6l152 -38q5 -43 5 -73q0 -34 -5 -74l-152 -38l-1 -6q-15 -49 -39 -93l-3 -5l80 -134q-48 -61 -104 -105l-134 81l-5 -3q-44 -25 -94 -39l-5 -2l-38 -151 q-43 -5 -74 -5q-33 0 -74 5l-38 151l-5 2q-49 14 -94 39l-5 3l-134 -81q-60 48 -104 105l80 134l-3 5q-25 45 -38 93l-2 6l-151 38q-6 42 -6 74q0 33 6 73l151 38l2 6q13 48 38 93l3 5l-80 134q47 61 105 105l133 -80l5 2q45 25 94 39l5 1l38 152q43 5 74 5zM600 815 q-89 0 -152 -63t-63 -151.5t63 -151.5t152 -63t152 63t63 151.5t-63 151.5t-152 63z" />
-<glyph unicode="&#xe020;" d="M500 1300h300q41 0 70.5 -29.5t29.5 -70.5v-100h275q10 0 17.5 -7.5t7.5 -17.5v-75h-1100v75q0 10 7.5 17.5t17.5 7.5h275v100q0 41 29.5 70.5t70.5 29.5zM500 1200v-100h300v100h-300zM1100 900v-800q0 -41 -29.5 -70.5t-70.5 -29.5h-700q-41 0 -70.5 29.5t-29.5 70.5 v800h900zM300 800v-700h100v700h-100zM500 800v-700h100v700h-100zM700 800v-700h100v700h-100zM900 800v-700h100v700h-100z" />
-<glyph unicode="&#xe021;" d="M18 618l620 608q8 7 18.5 7t17.5 -7l608 -608q8 -8 5.5 -13t-12.5 -5h-175v-575q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v375h-300v-375q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v575h-175q-10 0 -12.5 5t5.5 13z" />
-<glyph unicode="&#xe022;" d="M600 1200v-400q0 -41 29.5 -70.5t70.5 -29.5h300v-650q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v1100q0 21 14.5 35.5t35.5 14.5h450zM1000 800h-250q-21 0 -35.5 14.5t-14.5 35.5v250z" />
-<glyph unicode="&#xe023;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5t-57 214.5t-155.5 155.5t-214.5 57zM525 900h50q10 0 17.5 -7.5t7.5 -17.5v-275h175q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v350q0 10 7.5 17.5t17.5 7.5z" />
-<glyph unicode="&#xe024;" d="M1300 0h-538l-41 400h-242l-41 -400h-538l431 1200h209l-21 -300h162l-20 300h208zM515 800l-27 -300h224l-27 300h-170z" />
-<glyph unicode="&#xe025;" d="M550 1200h200q21 0 35.5 -14.5t14.5 -35.5v-450h191q20 0 25.5 -11.5t-7.5 -27.5l-327 -400q-13 -16 -32 -16t-32 16l-327 400q-13 16 -7.5 27.5t25.5 11.5h191v450q0 21 14.5 35.5t35.5 14.5zM1125 400h50q10 0 17.5 -7.5t7.5 -17.5v-350q0 -10 -7.5 -17.5t-17.5 -7.5 h-1050q-10 0 -17.5 7.5t-7.5 17.5v350q0 10 7.5 17.5t17.5 7.5h50q10 0 17.5 -7.5t7.5 -17.5v-175h900v175q0 10 7.5 17.5t17.5 7.5z" />
-<glyph unicode="&#xe026;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5t-57 214.5t-155.5 155.5t-214.5 57zM525 900h150q10 0 17.5 -7.5t7.5 -17.5v-275h137q21 0 26 -11.5t-8 -27.5l-223 -275q-13 -16 -32 -16t-32 16l-223 275q-13 16 -8 27.5t26 11.5h137v275q0 10 7.5 17.5t17.5 7.5z " />
-<glyph unicode="&#xe027;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5t-57 214.5t-155.5 155.5t-214.5 57zM632 914l223 -275q13 -16 8 -27.5t-26 -11.5h-137v-275q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v275h-137q-21 0 -26 11.5t8 27.5l223 275q13 16 32 16 t32 -16z" />
-<glyph unicode="&#xe028;" d="M225 1200h750q10 0 19.5 -7t12.5 -17l186 -652q7 -24 7 -49v-425q0 -12 -4 -27t-9 -17q-12 -6 -37 -6h-1100q-12 0 -27 4t-17 8q-6 13 -6 38l1 425q0 25 7 49l185 652q3 10 12.5 17t19.5 7zM878 1000h-556q-10 0 -19 -7t-11 -18l-87 -450q-2 -11 4 -18t16 -7h150 q10 0 19.5 -7t11.5 -17l38 -152q2 -10 11.5 -17t19.5 -7h250q10 0 19.5 7t11.5 17l38 152q2 10 11.5 17t19.5 7h150q10 0 16 7t4 18l-87 450q-2 11 -11 18t-19 7z" />
-<glyph unicode="&#xe029;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5t-57 214.5t-155.5 155.5t-214.5 57zM540 820l253 -190q17 -12 17 -30t-17 -30l-253 -190q-16 -12 -28 -6.5t-12 26.5v400q0 21 12 26.5t28 -6.5z" />
-<glyph unicode="&#xe030;" d="M947 1060l135 135q7 7 12.5 5t5.5 -13v-362q0 -10 -7.5 -17.5t-17.5 -7.5h-362q-11 0 -13 5.5t5 12.5l133 133q-109 76 -238 76q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5h150q0 -117 -45.5 -224 t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5q192 0 347 -117z" />
-<glyph unicode="&#xe031;" d="M947 1060l135 135q7 7 12.5 5t5.5 -13v-361q0 -11 -7.5 -18.5t-18.5 -7.5h-361q-11 0 -13 5.5t5 12.5l134 134q-110 75 -239 75q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5h-150q0 117 45.5 224t123 184.5t184.5 123t224 45.5q192 0 347 -117zM1027 600h150 q0 -117 -45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5q-192 0 -348 118l-134 -134q-7 -8 -12.5 -5.5t-5.5 12.5v360q0 11 7.5 18.5t18.5 7.5h360q10 0 12.5 -5.5t-5.5 -12.5l-133 -133q110 -76 240 -76q116 0 214.5 57t155.5 155.5t57 214.5z" />
-<glyph unicode="&#xe032;" d="M125 1200h1050q10 0 17.5 -7.5t7.5 -17.5v-1150q0 -10 -7.5 -17.5t-17.5 -7.5h-1050q-10 0 -17.5 7.5t-7.5 17.5v1150q0 10 7.5 17.5t17.5 7.5zM1075 1000h-850q-10 0 -17.5 -7.5t-7.5 -17.5v-850q0 -10 7.5 -17.5t17.5 -7.5h850q10 0 17.5 7.5t7.5 17.5v850 q0 10 -7.5 17.5t-17.5 7.5zM325 900h50q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-50q-10 0 -17.5 7.5t-7.5 17.5v50q0 10 7.5 17.5t17.5 7.5zM525 900h450q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-450q-10 0 -17.5 7.5t-7.5 17.5v50 q0 10 7.5 17.5t17.5 7.5zM325 700h50q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-50q-10 0 -17.5 7.5t-7.5 17.5v50q0 10 7.5 17.5t17.5 7.5zM525 700h450q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-450q-10 0 -17.5 7.5t-7.5 17.5v50 q0 10 7.5 17.5t17.5 7.5zM325 500h50q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-50q-10 0 -17.5 7.5t-7.5 17.5v50q0 10 7.5 17.5t17.5 7.5zM525 500h450q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-450q-10 0 -17.5 7.5t-7.5 17.5v50 q0 10 7.5 17.5t17.5 7.5zM325 300h50q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-50q-10 0 -17.5 7.5t-7.5 17.5v50q0 10 7.5 17.5t17.5 7.5zM525 300h450q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-450q-10 0 -17.5 7.5t-7.5 17.5v50 q0 10 7.5 17.5t17.5 7.5z" />
-<glyph unicode="&#xe033;" d="M900 800v200q0 83 -58.5 141.5t-141.5 58.5h-300q-82 0 -141 -59t-59 -141v-200h-100q-41 0 -70.5 -29.5t-29.5 -70.5v-600q0 -41 29.5 -70.5t70.5 -29.5h900q41 0 70.5 29.5t29.5 70.5v600q0 41 -29.5 70.5t-70.5 29.5h-100zM400 800v150q0 21 15 35.5t35 14.5h200 q20 0 35 -14.5t15 -35.5v-150h-300z" />
-<glyph unicode="&#xe034;" d="M125 1100h50q10 0 17.5 -7.5t7.5 -17.5v-1075h-100v1075q0 10 7.5 17.5t17.5 7.5zM1075 1052q4 0 9 -2q16 -6 16 -23v-421q0 -6 -3 -12q-33 -59 -66.5 -99t-65.5 -58t-56.5 -24.5t-52.5 -6.5q-26 0 -57.5 6.5t-52.5 13.5t-60 21q-41 15 -63 22.5t-57.5 15t-65.5 7.5 q-85 0 -160 -57q-7 -5 -15 -5q-6 0 -11 3q-14 7 -14 22v438q22 55 82 98.5t119 46.5q23 2 43 0.5t43 -7t32.5 -8.5t38 -13t32.5 -11q41 -14 63.5 -21t57 -14t63.5 -7q103 0 183 87q7 8 18 8z" />
-<glyph unicode="&#xe035;" d="M600 1175q116 0 227 -49.5t192.5 -131t131 -192.5t49.5 -227v-300q0 -10 -7.5 -17.5t-17.5 -7.5h-50q-10 0 -17.5 7.5t-7.5 17.5v300q0 127 -70.5 231.5t-184.5 161.5t-245 57t-245 -57t-184.5 -161.5t-70.5 -231.5v-300q0 -10 -7.5 -17.5t-17.5 -7.5h-50 q-10 0 -17.5 7.5t-7.5 17.5v300q0 116 49.5 227t131 192.5t192.5 131t227 49.5zM220 500h160q8 0 14 -6t6 -14v-460q0 -8 -6 -14t-14 -6h-160q-8 0 -14 6t-6 14v460q0 8 6 14t14 6zM820 500h160q8 0 14 -6t6 -14v-460q0 -8 -6 -14t-14 -6h-160q-8 0 -14 6t-6 14v460 q0 8 6 14t14 6z" />
-<glyph unicode="&#xe036;" d="M321 814l258 172q9 6 15 2.5t6 -13.5v-750q0 -10 -6 -13.5t-15 2.5l-258 172q-21 14 -46 14h-250q-10 0 -17.5 7.5t-7.5 17.5v350q0 10 7.5 17.5t17.5 7.5h250q25 0 46 14zM900 668l120 120q7 7 17 7t17 -7l34 -34q7 -7 7 -17t-7 -17l-120 -120l120 -120q7 -7 7 -17 t-7 -17l-34 -34q-7 -7 -17 -7t-17 7l-120 119l-120 -119q-7 -7 -17 -7t-17 7l-34 34q-7 7 -7 17t7 17l119 120l-119 120q-7 7 -7 17t7 17l34 34q7 8 17 8t17 -8z" />
-<glyph unicode="&#xe037;" d="M321 814l258 172q9 6 15 2.5t6 -13.5v-750q0 -10 -6 -13.5t-15 2.5l-258 172q-21 14 -46 14h-250q-10 0 -17.5 7.5t-7.5 17.5v350q0 10 7.5 17.5t17.5 7.5h250q25 0 46 14zM766 900h4q10 -1 16 -10q96 -129 96 -290q0 -154 -90 -281q-6 -9 -17 -10l-3 -1q-9 0 -16 6 l-29 23q-7 7 -8.5 16.5t4.5 17.5q72 103 72 229q0 132 -78 238q-6 8 -4.5 18t9.5 17l29 22q7 5 15 5z" />
-<glyph unicode="&#xe038;" d="M967 1004h3q11 -1 17 -10q135 -179 135 -396q0 -105 -34 -206.5t-98 -185.5q-7 -9 -17 -10h-3q-9 0 -16 6l-42 34q-8 6 -9 16t5 18q111 150 111 328q0 90 -29.5 176t-84.5 157q-6 9 -5 19t10 16l42 33q7 5 15 5zM321 814l258 172q9 6 15 2.5t6 -13.5v-750q0 -10 -6 -13.5 t-15 2.5l-258 172q-21 14 -46 14h-250q-10 0 -17.5 7.5t-7.5 17.5v350q0 10 7.5 17.5t17.5 7.5h250q25 0 46 14zM766 900h4q10 -1 16 -10q96 -129 96 -290q0 -154 -90 -281q-6 -9 -17 -10l-3 -1q-9 0 -16 6l-29 23q-7 7 -8.5 16.5t4.5 17.5q72 103 72 229q0 132 -78 238 q-6 8 -4.5 18.5t9.5 16.5l29 22q7 5 15 5z" />
-<glyph unicode="&#xe039;" d="M500 900h100v-100h-100v-100h-400v-100h-100v600h500v-300zM1200 700h-200v-100h200v-200h-300v300h-200v300h-100v200h600v-500zM100 1100v-300h300v300h-300zM800 1100v-300h300v300h-300zM300 900h-100v100h100v-100zM1000 900h-100v100h100v-100zM300 500h200v-500 h-500v500h200v100h100v-100zM800 300h200v-100h-100v-100h-200v100h-100v100h100v200h-200v100h300v-300zM100 400v-300h300v300h-300zM300 200h-100v100h100v-100zM1200 200h-100v100h100v-100zM700 0h-100v100h100v-100zM1200 0h-300v100h300v-100z" />
-<glyph unicode="&#xe040;" d="M100 200h-100v1000h100v-1000zM300 200h-100v1000h100v-1000zM700 200h-200v1000h200v-1000zM900 200h-100v1000h100v-1000zM1200 200h-200v1000h200v-1000zM400 0h-300v100h300v-100zM600 0h-100v91h100v-91zM800 0h-100v91h100v-91zM1100 0h-200v91h200v-91z" />
-<glyph unicode="&#xe041;" d="M500 1200l682 -682q8 -8 8 -18t-8 -18l-464 -464q-8 -8 -18 -8t-18 8l-682 682l1 475q0 10 7.5 17.5t17.5 7.5h474zM319.5 1024.5q-29.5 29.5 -71 29.5t-71 -29.5t-29.5 -71.5t29.5 -71.5t71 -29.5t71 29.5t29.5 71.5t-29.5 71.5z" />
-<glyph unicode="&#xe042;" d="M500 1200l682 -682q8 -8 8 -18t-8 -18l-464 -464q-8 -8 -18 -8t-18 8l-682 682l1 475q0 10 7.5 17.5t17.5 7.5h474zM800 1200l682 -682q8 -8 8 -18t-8 -18l-464 -464q-8 -8 -18 -8t-18 8l-56 56l424 426l-700 700h150zM319.5 1024.5q-29.5 29.5 -71 29.5t-71 -29.5 t-29.5 -71.5t29.5 -71.5t71 -29.5t71 29.5t29.5 71.5t-29.5 71.5z" />
-<glyph unicode="&#xe043;" d="M300 1200h825q75 0 75 -75v-900q0 -25 -18 -43l-64 -64q-8 -8 -13 -5.5t-5 12.5v950q0 10 -7.5 17.5t-17.5 7.5h-700q-25 0 -43 -18l-64 -64q-8 -8 -5.5 -13t12.5 -5h700q10 0 17.5 -7.5t7.5 -17.5v-950q0 -10 -7.5 -17.5t-17.5 -7.5h-850q-10 0 -17.5 7.5t-7.5 17.5v975 q0 25 18 43l139 139q18 18 43 18z" />
-<glyph unicode="&#xe044;" d="M250 1200h800q21 0 35.5 -14.5t14.5 -35.5v-1150l-450 444l-450 -445v1151q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xe045;" d="M822 1200h-444q-11 0 -19 -7.5t-9 -17.5l-78 -301q-7 -24 7 -45l57 -108q6 -9 17.5 -15t21.5 -6h450q10 0 21.5 6t17.5 15l62 108q14 21 7 45l-83 301q-1 10 -9 17.5t-19 7.5zM1175 800h-150q-10 0 -21 -6.5t-15 -15.5l-78 -156q-4 -9 -15 -15.5t-21 -6.5h-550 q-10 0 -21 6.5t-15 15.5l-78 156q-4 9 -15 15.5t-21 6.5h-150q-10 0 -17.5 -7.5t-7.5 -17.5v-650q0 -10 7.5 -17.5t17.5 -7.5h150q10 0 17.5 7.5t7.5 17.5v150q0 10 7.5 17.5t17.5 7.5h750q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 7.5 -17.5t17.5 -7.5h150q10 0 17.5 7.5 t7.5 17.5v650q0 10 -7.5 17.5t-17.5 7.5zM850 200h-500q-10 0 -19.5 -7t-11.5 -17l-38 -152q-2 -10 3.5 -17t15.5 -7h600q10 0 15.5 7t3.5 17l-38 152q-2 10 -11.5 17t-19.5 7z" />
-<glyph unicode="&#xe046;" d="M500 1100h200q56 0 102.5 -20.5t72.5 -50t44 -59t25 -50.5l6 -20h150q41 0 70.5 -29.5t29.5 -70.5v-600q0 -41 -29.5 -70.5t-70.5 -29.5h-1000q-41 0 -70.5 29.5t-29.5 70.5v600q0 41 29.5 70.5t70.5 29.5h150q2 8 6.5 21.5t24 48t45 61t72 48t102.5 21.5zM900 800v-100 h100v100h-100zM600 730q-95 0 -162.5 -67.5t-67.5 -162.5t67.5 -162.5t162.5 -67.5t162.5 67.5t67.5 162.5t-67.5 162.5t-162.5 67.5zM600 603q43 0 73 -30t30 -73t-30 -73t-73 -30t-73 30t-30 73t30 73t73 30z" />
-<glyph unicode="&#xe047;" d="M681 1199l385 -998q20 -50 60 -92q18 -19 36.5 -29.5t27.5 -11.5l10 -2v-66h-417v66q53 0 75 43.5t5 88.5l-82 222h-391q-58 -145 -92 -234q-11 -34 -6.5 -57t25.5 -37t46 -20t55 -6v-66h-365v66q56 24 84 52q12 12 25 30.5t20 31.5l7 13l399 1006h93zM416 521h340 l-162 457z" />
-<glyph unicode="&#xe048;" d="M753 641q5 -1 14.5 -4.5t36 -15.5t50.5 -26.5t53.5 -40t50.5 -54.5t35.5 -70t14.5 -87q0 -67 -27.5 -125.5t-71.5 -97.5t-98.5 -66.5t-108.5 -40.5t-102 -13h-500v89q41 7 70.5 32.5t29.5 65.5v827q0 24 -0.5 34t-3.5 24t-8.5 19.5t-17 13.5t-28 12.5t-42.5 11.5v71 l471 -1q57 0 115.5 -20.5t108 -57t80.5 -94t31 -124.5q0 -51 -15.5 -96.5t-38 -74.5t-45 -50.5t-38.5 -30.5zM400 700h139q78 0 130.5 48.5t52.5 122.5q0 41 -8.5 70.5t-29.5 55.5t-62.5 39.5t-103.5 13.5h-118v-350zM400 200h216q80 0 121 50.5t41 130.5q0 90 -62.5 154.5 t-156.5 64.5h-159v-400z" />
-<glyph unicode="&#xe049;" d="M877 1200l2 -57q-83 -19 -116 -45.5t-40 -66.5l-132 -839q-9 -49 13 -69t96 -26v-97h-500v97q186 16 200 98l173 832q3 17 3 30t-1.5 22.5t-9 17.5t-13.5 12.5t-21.5 10t-26 8.5t-33.5 10q-13 3 -19 5v57h425z" />
-<glyph unicode="&#xe050;" d="M1300 900h-50q0 21 -4 37t-9.5 26.5t-18 17.5t-22 11t-28.5 5.5t-31 2t-37 0.5h-200v-850q0 -22 25 -34.5t50 -13.5l25 -2v-100h-400v100q4 0 11 0.5t24 3t30 7t24 15t11 24.5v850h-200q-25 0 -37 -0.5t-31 -2t-28.5 -5.5t-22 -11t-18 -17.5t-9.5 -26.5t-4 -37h-50v300 h1000v-300zM175 1000h-75v-800h75l-125 -167l-125 167h75v800h-75l125 167z" />
-<glyph unicode="&#xe051;" d="M1100 900h-50q0 21 -4 37t-9.5 26.5t-18 17.5t-22 11t-28.5 5.5t-31 2t-37 0.5h-200v-650q0 -22 25 -34.5t50 -13.5l25 -2v-100h-400v100q4 0 11 0.5t24 3t30 7t24 15t11 24.5v650h-200q-25 0 -37 -0.5t-31 -2t-28.5 -5.5t-22 -11t-18 -17.5t-9.5 -26.5t-4 -37h-50v300 h1000v-300zM1167 50l-167 -125v75h-800v-75l-167 125l167 125v-75h800v75z" />
-<glyph unicode="&#xe052;" d="M50 1100h600q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-600q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 800h1000q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1000q-21 0 -35.5 14.5t-14.5 35.5v100 q0 21 14.5 35.5t35.5 14.5zM50 500h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 200h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100 q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xe053;" d="M250 1100h700q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-700q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 800h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v100 q0 21 14.5 35.5t35.5 14.5zM250 500h700q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-700q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 200h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100 q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xe054;" d="M500 950v100q0 21 14.5 35.5t35.5 14.5h600q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-600q-21 0 -35.5 14.5t-14.5 35.5zM100 650v100q0 21 14.5 35.5t35.5 14.5h1000q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1000 q-21 0 -35.5 14.5t-14.5 35.5zM300 350v100q0 21 14.5 35.5t35.5 14.5h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5zM0 50v100q0 21 14.5 35.5t35.5 14.5h1100q21 0 35.5 -14.5t14.5 -35.5v-100 q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5z" />
-<glyph unicode="&#xe055;" d="M50 1100h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 800h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v100 q0 21 14.5 35.5t35.5 14.5zM50 500h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 200h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100 q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xe056;" d="M50 1100h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM350 1100h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v100 q0 21 14.5 35.5t35.5 14.5zM50 800h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM350 800h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-800 q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 500h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM350 500h800q21 0 35.5 -14.5t14.5 -35.5v-100 q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 200h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM350 200h800 q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xe057;" d="M400 0h-100v1100h100v-1100zM550 1100h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM550 800h500q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-500 q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM267 550l-167 -125v75h-200v100h200v75zM550 500h300q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-300q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM550 200h600 q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-600q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xe058;" d="M50 1100h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM900 0h-100v1100h100v-1100zM50 800h500q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-500 q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM1100 600h200v-100h-200v-75l-167 125l167 125v-75zM50 500h300q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-300q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 200h600 q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-600q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xe059;" d="M75 1000h750q31 0 53 -22t22 -53v-650q0 -31 -22 -53t-53 -22h-750q-31 0 -53 22t-22 53v650q0 31 22 53t53 22zM1200 300l-300 300l300 300v-600z" />
-<glyph unicode="&#xe060;" d="M44 1100h1112q18 0 31 -13t13 -31v-1012q0 -18 -13 -31t-31 -13h-1112q-18 0 -31 13t-13 31v1012q0 18 13 31t31 13zM100 1000v-737l247 182l298 -131l-74 156l293 318l236 -288v500h-1000zM342 884q56 0 95 -39t39 -94.5t-39 -95t-95 -39.5t-95 39.5t-39 95t39 94.5 t95 39z" />
-<glyph unicode="&#xe062;" d="M648 1169q117 0 216 -60t156.5 -161t57.5 -218q0 -115 -70 -258q-69 -109 -158 -225.5t-143 -179.5l-54 -62q-9 8 -25.5 24.5t-63.5 67.5t-91 103t-98.5 128t-95.5 148q-60 132 -60 249q0 88 34 169.5t91.5 142t137 96.5t166.5 36zM652.5 974q-91.5 0 -156.5 -65 t-65 -157t65 -156.5t156.5 -64.5t156.5 64.5t65 156.5t-65 157t-156.5 65z" />
-<glyph unicode="&#xe063;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 173v854q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57z" />
-<glyph unicode="&#xe064;" d="M554 1295q21 -72 57.5 -143.5t76 -130t83 -118t82.5 -117t70 -116t49.5 -126t18.5 -136.5q0 -71 -25.5 -135t-68.5 -111t-99 -82t-118.5 -54t-125.5 -23q-84 5 -161.5 34t-139.5 78.5t-99 125t-37 164.5q0 69 18 136.5t49.5 126.5t69.5 116.5t81.5 117.5t83.5 119 t76.5 131t58.5 143zM344 710q-23 -33 -43.5 -70.5t-40.5 -102.5t-17 -123q1 -37 14.5 -69.5t30 -52t41 -37t38.5 -24.5t33 -15q21 -7 32 -1t13 22l6 34q2 10 -2.5 22t-13.5 19q-5 4 -14 12t-29.5 40.5t-32.5 73.5q-26 89 6 271q2 11 -6 11q-8 1 -15 -10z" />
-<glyph unicode="&#xe065;" d="M1000 1013l108 115q2 1 5 2t13 2t20.5 -1t25 -9.5t28.5 -21.5q22 -22 27 -43t0 -32l-6 -10l-108 -115zM350 1100h400q50 0 105 -13l-187 -187h-368q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v182l200 200v-332 q0 -165 -93.5 -257.5t-256.5 -92.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400q0 165 92.5 257.5t257.5 92.5zM1009 803l-362 -362l-161 -50l55 170l355 355z" />
-<glyph unicode="&#xe066;" d="M350 1100h361q-164 -146 -216 -200h-195q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5l200 153v-103q0 -165 -92.5 -257.5t-257.5 -92.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400q0 165 92.5 257.5t257.5 92.5z M824 1073l339 -301q8 -7 8 -17.5t-8 -17.5l-340 -306q-7 -6 -12.5 -4t-6.5 11v203q-26 1 -54.5 0t-78.5 -7.5t-92 -17.5t-86 -35t-70 -57q10 59 33 108t51.5 81.5t65 58.5t68.5 40.5t67 24.5t56 13.5t40 4.5v210q1 10 6.5 12.5t13.5 -4.5z" />
-<glyph unicode="&#xe067;" d="M350 1100h350q60 0 127 -23l-178 -177h-349q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v69l200 200v-219q0 -165 -92.5 -257.5t-257.5 -92.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400q0 165 92.5 257.5t257.5 92.5z M643 639l395 395q7 7 17.5 7t17.5 -7l101 -101q7 -7 7 -17.5t-7 -17.5l-531 -532q-7 -7 -17.5 -7t-17.5 7l-248 248q-7 7 -7 17.5t7 17.5l101 101q7 7 17.5 7t17.5 -7l111 -111q8 -7 18 -7t18 7z" />
-<glyph unicode="&#xe068;" d="M318 918l264 264q8 8 18 8t18 -8l260 -264q7 -8 4.5 -13t-12.5 -5h-170v-200h200v173q0 10 5 12t13 -5l264 -260q8 -7 8 -17.5t-8 -17.5l-264 -265q-8 -7 -13 -5t-5 12v173h-200v-200h170q10 0 12.5 -5t-4.5 -13l-260 -264q-8 -8 -18 -8t-18 8l-264 264q-8 8 -5.5 13 t12.5 5h175v200h-200v-173q0 -10 -5 -12t-13 5l-264 265q-8 7 -8 17.5t8 17.5l264 260q8 7 13 5t5 -12v-173h200v200h-175q-10 0 -12.5 5t5.5 13z" />
-<glyph unicode="&#xe069;" d="M250 1100h100q21 0 35.5 -14.5t14.5 -35.5v-438l464 453q15 14 25.5 10t10.5 -25v-1000q0 -21 -10.5 -25t-25.5 10l-464 453v-438q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v1000q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xe070;" d="M50 1100h100q21 0 35.5 -14.5t14.5 -35.5v-438l464 453q15 14 25.5 10t10.5 -25v-438l464 453q15 14 25.5 10t10.5 -25v-1000q0 -21 -10.5 -25t-25.5 10l-464 453v-438q0 -21 -10.5 -25t-25.5 10l-464 453v-438q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5 t-14.5 35.5v1000q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xe071;" d="M1200 1050v-1000q0 -21 -10.5 -25t-25.5 10l-464 453v-438q0 -21 -10.5 -25t-25.5 10l-492 480q-15 14 -15 35t15 35l492 480q15 14 25.5 10t10.5 -25v-438l464 453q15 14 25.5 10t10.5 -25z" />
-<glyph unicode="&#xe072;" d="M243 1074l814 -498q18 -11 18 -26t-18 -26l-814 -498q-18 -11 -30.5 -4t-12.5 28v1000q0 21 12.5 28t30.5 -4z" />
-<glyph unicode="&#xe073;" d="M250 1000h200q21 0 35.5 -14.5t14.5 -35.5v-800q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v800q0 21 14.5 35.5t35.5 14.5zM650 1000h200q21 0 35.5 -14.5t14.5 -35.5v-800q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v800 q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xe074;" d="M1100 950v-800q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v800q0 21 14.5 35.5t35.5 14.5h800q21 0 35.5 -14.5t14.5 -35.5z" />
-<glyph unicode="&#xe075;" d="M500 612v438q0 21 10.5 25t25.5 -10l492 -480q15 -14 15 -35t-15 -35l-492 -480q-15 -14 -25.5 -10t-10.5 25v438l-464 -453q-15 -14 -25.5 -10t-10.5 25v1000q0 21 10.5 25t25.5 -10z" />
-<glyph unicode="&#xe076;" d="M1048 1102l100 1q20 0 35 -14.5t15 -35.5l5 -1000q0 -21 -14.5 -35.5t-35.5 -14.5l-100 -1q-21 0 -35.5 14.5t-14.5 35.5l-2 437l-463 -454q-14 -15 -24.5 -10.5t-10.5 25.5l-2 437l-462 -455q-15 -14 -25.5 -9.5t-10.5 24.5l-5 1000q0 21 10.5 25.5t25.5 -10.5l466 -450 l-2 438q0 20 10.5 24.5t25.5 -9.5l466 -451l-2 438q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xe077;" d="M850 1100h100q21 0 35.5 -14.5t14.5 -35.5v-1000q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v438l-464 -453q-15 -14 -25.5 -10t-10.5 25v1000q0 21 10.5 25t25.5 -10l464 -453v438q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xe078;" d="M686 1081l501 -540q15 -15 10.5 -26t-26.5 -11h-1042q-22 0 -26.5 11t10.5 26l501 540q15 15 36 15t36 -15zM150 400h1000q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1000q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xe079;" d="M885 900l-352 -353l352 -353l-197 -198l-552 552l552 550z" />
-<glyph unicode="&#xe080;" d="M1064 547l-551 -551l-198 198l353 353l-353 353l198 198z" />
-<glyph unicode="&#xe081;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM650 900h-100q-21 0 -35.5 -14.5t-14.5 -35.5v-150h-150 q-21 0 -35.5 -14.5t-14.5 -35.5v-100q0 -21 14.5 -35.5t35.5 -14.5h150v-150q0 -21 14.5 -35.5t35.5 -14.5h100q21 0 35.5 14.5t14.5 35.5v150h150q21 0 35.5 14.5t14.5 35.5v100q0 21 -14.5 35.5t-35.5 14.5h-150v150q0 21 -14.5 35.5t-35.5 14.5z" />
-<glyph unicode="&#xe082;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM850 700h-500q-21 0 -35.5 -14.5t-14.5 -35.5v-100q0 -21 14.5 -35.5 t35.5 -14.5h500q21 0 35.5 14.5t14.5 35.5v100q0 21 -14.5 35.5t-35.5 14.5z" />
-<glyph unicode="&#xe083;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM741.5 913q-12.5 0 -21.5 -9l-120 -120l-120 120q-9 9 -21.5 9 t-21.5 -9l-141 -141q-9 -9 -9 -21.5t9 -21.5l120 -120l-120 -120q-9 -9 -9 -21.5t9 -21.5l141 -141q9 -9 21.5 -9t21.5 9l120 120l120 -120q9 -9 21.5 -9t21.5 9l141 141q9 9 9 21.5t-9 21.5l-120 120l120 120q9 9 9 21.5t-9 21.5l-141 141q-9 9 -21.5 9z" />
-<glyph unicode="&#xe084;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM546 623l-84 85q-7 7 -17.5 7t-18.5 -7l-139 -139q-7 -8 -7 -18t7 -18 l242 -241q7 -8 17.5 -8t17.5 8l375 375q7 7 7 17.5t-7 18.5l-139 139q-7 7 -17.5 7t-17.5 -7z" />
-<glyph unicode="&#xe085;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM588 941q-29 0 -59 -5.5t-63 -20.5t-58 -38.5t-41.5 -63t-16.5 -89.5 q0 -25 20 -25h131q30 -5 35 11q6 20 20.5 28t45.5 8q20 0 31.5 -10.5t11.5 -28.5q0 -23 -7 -34t-26 -18q-1 0 -13.5 -4t-19.5 -7.5t-20 -10.5t-22 -17t-18.5 -24t-15.5 -35t-8 -46q-1 -8 5.5 -16.5t20.5 -8.5h173q7 0 22 8t35 28t37.5 48t29.5 74t12 100q0 47 -17 83 t-42.5 57t-59.5 34.5t-64 18t-59 4.5zM675 400h-150q-10 0 -17.5 -7.5t-7.5 -17.5v-150q0 -10 7.5 -17.5t17.5 -7.5h150q10 0 17.5 7.5t7.5 17.5v150q0 10 -7.5 17.5t-17.5 7.5z" />
-<glyph unicode="&#xe086;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM675 1000h-150q-10 0 -17.5 -7.5t-7.5 -17.5v-150q0 -10 7.5 -17.5 t17.5 -7.5h150q10 0 17.5 7.5t7.5 17.5v150q0 10 -7.5 17.5t-17.5 7.5zM675 700h-250q-10 0 -17.5 -7.5t-7.5 -17.5v-50q0 -10 7.5 -17.5t17.5 -7.5h75v-200h-75q-10 0 -17.5 -7.5t-7.5 -17.5v-50q0 -10 7.5 -17.5t17.5 -7.5h350q10 0 17.5 7.5t7.5 17.5v50q0 10 -7.5 17.5 t-17.5 7.5h-75v275q0 10 -7.5 17.5t-17.5 7.5z" />
-<glyph unicode="&#xe087;" d="M525 1200h150q10 0 17.5 -7.5t7.5 -17.5v-194q103 -27 178.5 -102.5t102.5 -178.5h194q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-194q-27 -103 -102.5 -178.5t-178.5 -102.5v-194q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v194 q-103 27 -178.5 102.5t-102.5 178.5h-194q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5h194q27 103 102.5 178.5t178.5 102.5v194q0 10 7.5 17.5t17.5 7.5zM700 893v-168q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v168q-68 -23 -119 -74 t-74 -119h168q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-168q23 -68 74 -119t119 -74v168q0 10 7.5 17.5t17.5 7.5h150q10 0 17.5 -7.5t7.5 -17.5v-168q68 23 119 74t74 119h-168q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5h168 q-23 68 -74 119t-119 74z" />
-<glyph unicode="&#xe088;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5t-57 214.5t-155.5 155.5t-214.5 57zM759 823l64 -64q7 -7 7 -17.5t-7 -17.5l-124 -124l124 -124q7 -7 7 -17.5t-7 -17.5l-64 -64q-7 -7 -17.5 -7t-17.5 7l-124 124l-124 -124q-7 -7 -17.5 -7t-17.5 7l-64 64 q-7 7 -7 17.5t7 17.5l124 124l-124 124q-7 7 -7 17.5t7 17.5l64 64q7 7 17.5 7t17.5 -7l124 -124l124 124q7 7 17.5 7t17.5 -7z" />
-<glyph unicode="&#xe089;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5t-57 214.5t-155.5 155.5t-214.5 57zM782 788l106 -106q7 -7 7 -17.5t-7 -17.5l-320 -321q-8 -7 -18 -7t-18 7l-202 203q-8 7 -8 17.5t8 17.5l106 106q7 8 17.5 8t17.5 -8l79 -79l197 197q7 7 17.5 7t17.5 -7z" />
-<glyph unicode="&#xe090;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5q0 -120 65 -225 l587 587q-105 65 -225 65zM965 819l-584 -584q104 -62 219 -62q116 0 214.5 57t155.5 155.5t57 214.5q0 115 -62 219z" />
-<glyph unicode="&#xe091;" d="M39 582l522 427q16 13 27.5 8t11.5 -26v-291h550q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-550v-291q0 -21 -11.5 -26t-27.5 8l-522 427q-16 13 -16 32t16 32z" />
-<glyph unicode="&#xe092;" d="M639 1009l522 -427q16 -13 16 -32t-16 -32l-522 -427q-16 -13 -27.5 -8t-11.5 26v291h-550q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5h550v291q0 21 11.5 26t27.5 -8z" />
-<glyph unicode="&#xe093;" d="M682 1161l427 -522q13 -16 8 -27.5t-26 -11.5h-291v-550q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v550h-291q-21 0 -26 11.5t8 27.5l427 522q13 16 32 16t32 -16z" />
-<glyph unicode="&#xe094;" d="M550 1200h200q21 0 35.5 -14.5t14.5 -35.5v-550h291q21 0 26 -11.5t-8 -27.5l-427 -522q-13 -16 -32 -16t-32 16l-427 522q-13 16 -8 27.5t26 11.5h291v550q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xe095;" d="M639 1109l522 -427q16 -13 16 -32t-16 -32l-522 -427q-16 -13 -27.5 -8t-11.5 26v291q-94 -2 -182 -20t-170.5 -52t-147 -92.5t-100.5 -135.5q5 105 27 193.5t67.5 167t113 135t167 91.5t225.5 42v262q0 21 11.5 26t27.5 -8z" />
-<glyph unicode="&#xe096;" d="M850 1200h300q21 0 35.5 -14.5t14.5 -35.5v-300q0 -21 -10.5 -25t-24.5 10l-94 94l-249 -249q-8 -7 -18 -7t-18 7l-106 106q-7 8 -7 18t7 18l249 249l-94 94q-14 14 -10 24.5t25 10.5zM350 0h-300q-21 0 -35.5 14.5t-14.5 35.5v300q0 21 10.5 25t24.5 -10l94 -94l249 249 q8 7 18 7t18 -7l106 -106q7 -8 7 -18t-7 -18l-249 -249l94 -94q14 -14 10 -24.5t-25 -10.5z" />
-<glyph unicode="&#xe097;" d="M1014 1120l106 -106q7 -8 7 -18t-7 -18l-249 -249l94 -94q14 -14 10 -24.5t-25 -10.5h-300q-21 0 -35.5 14.5t-14.5 35.5v300q0 21 10.5 25t24.5 -10l94 -94l249 249q8 7 18 7t18 -7zM250 600h300q21 0 35.5 -14.5t14.5 -35.5v-300q0 -21 -10.5 -25t-24.5 10l-94 94 l-249 -249q-8 -7 -18 -7t-18 7l-106 106q-7 8 -7 18t7 18l249 249l-94 94q-14 14 -10 24.5t25 10.5z" />
-<glyph unicode="&#xe101;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM704 900h-208q-20 0 -32 -14.5t-8 -34.5l58 -302q4 -20 21.5 -34.5 t37.5 -14.5h54q20 0 37.5 14.5t21.5 34.5l58 302q4 20 -8 34.5t-32 14.5zM675 400h-150q-10 0 -17.5 -7.5t-7.5 -17.5v-150q0 -10 7.5 -17.5t17.5 -7.5h150q10 0 17.5 7.5t7.5 17.5v150q0 10 -7.5 17.5t-17.5 7.5z" />
-<glyph unicode="&#xe102;" d="M260 1200q9 0 19 -2t15 -4l5 -2q22 -10 44 -23l196 -118q21 -13 36 -24q29 -21 37 -12q11 13 49 35l196 118q22 13 45 23q17 7 38 7q23 0 47 -16.5t37 -33.5l13 -16q14 -21 18 -45l25 -123l8 -44q1 -9 8.5 -14.5t17.5 -5.5h61q10 0 17.5 -7.5t7.5 -17.5v-50 q0 -10 -7.5 -17.5t-17.5 -7.5h-50q-10 0 -17.5 -7.5t-7.5 -17.5v-175h-400v300h-200v-300h-400v175q0 10 -7.5 17.5t-17.5 7.5h-50q-10 0 -17.5 7.5t-7.5 17.5v50q0 10 7.5 17.5t17.5 7.5h61q11 0 18 3t7 8q0 4 9 52l25 128q5 25 19 45q2 3 5 7t13.5 15t21.5 19.5t26.5 15.5 t29.5 7zM915 1079l-166 -162q-7 -7 -5 -12t12 -5h219q10 0 15 7t2 17l-51 149q-3 10 -11 12t-15 -6zM463 917l-177 157q-8 7 -16 5t-11 -12l-51 -143q-3 -10 2 -17t15 -7h231q11 0 12.5 5t-5.5 12zM500 0h-375q-10 0 -17.5 7.5t-7.5 17.5v375h400v-400zM1100 400v-375 q0 -10 -7.5 -17.5t-17.5 -7.5h-375v400h400z" />
-<glyph unicode="&#xe103;" d="M1165 1190q8 3 21 -6.5t13 -17.5q-2 -178 -24.5 -323.5t-55.5 -245.5t-87 -174.5t-102.5 -118.5t-118 -68.5t-118.5 -33t-120 -4.5t-105 9.5t-90 16.5q-61 12 -78 11q-4 1 -12.5 0t-34 -14.5t-52.5 -40.5l-153 -153q-26 -24 -37 -14.5t-11 43.5q0 64 42 102q8 8 50.5 45 t66.5 58q19 17 35 47t13 61q-9 55 -10 102.5t7 111t37 130t78 129.5q39 51 80 88t89.5 63.5t94.5 45t113.5 36t129 31t157.5 37t182 47.5zM1116 1098q-8 9 -22.5 -3t-45.5 -50q-38 -47 -119 -103.5t-142 -89.5l-62 -33q-56 -30 -102 -57t-104 -68t-102.5 -80.5t-85.5 -91 t-64 -104.5q-24 -56 -31 -86t2 -32t31.5 17.5t55.5 59.5q25 30 94 75.5t125.5 77.5t147.5 81q70 37 118.5 69t102 79.5t99 111t86.5 148.5q22 50 24 60t-6 19z" />
-<glyph unicode="&#xe104;" d="M653 1231q-39 -67 -54.5 -131t-10.5 -114.5t24.5 -96.5t47.5 -80t63.5 -62.5t68.5 -46.5t65 -30q-4 7 -17.5 35t-18.5 39.5t-17 39.5t-17 43t-13 42t-9.5 44.5t-2 42t4 43t13.5 39t23 38.5q96 -42 165 -107.5t105 -138t52 -156t13 -159t-19 -149.5q-13 -55 -44 -106.5 t-68 -87t-78.5 -64.5t-72.5 -45t-53 -22q-72 -22 -127 -11q-31 6 -13 19q6 3 17 7q13 5 32.5 21t41 44t38.5 63.5t21.5 81.5t-6.5 94.5t-50 107t-104 115.5q10 -104 -0.5 -189t-37 -140.5t-65 -93t-84 -52t-93.5 -11t-95 24.5q-80 36 -131.5 114t-53.5 171q-2 23 0 49.5 t4.5 52.5t13.5 56t27.5 60t46 64.5t69.5 68.5q-8 -53 -5 -102.5t17.5 -90t34 -68.5t44.5 -39t49 -2q31 13 38.5 36t-4.5 55t-29 64.5t-36 75t-26 75.5q-15 85 2 161.5t53.5 128.5t85.5 92.5t93.5 61t81.5 25.5z" />
-<glyph unicode="&#xe105;" d="M600 1094q82 0 160.5 -22.5t140 -59t116.5 -82.5t94.5 -95t68 -95t42.5 -82.5t14 -57.5t-14 -57.5t-43 -82.5t-68.5 -95t-94.5 -95t-116.5 -82.5t-140 -59t-159.5 -22.5t-159.5 22.5t-140 59t-116.5 82.5t-94.5 95t-68.5 95t-43 82.5t-14 57.5t14 57.5t42.5 82.5t68 95 t94.5 95t116.5 82.5t140 59t160.5 22.5zM888 829q-15 15 -18 12t5 -22q25 -57 25 -119q0 -124 -88 -212t-212 -88t-212 88t-88 212q0 59 23 114q8 19 4.5 22t-17.5 -12q-70 -69 -160 -184q-13 -16 -15 -40.5t9 -42.5q22 -36 47 -71t70 -82t92.5 -81t113 -58.5t133.5 -24.5 t133.5 24t113 58.5t92.5 81.5t70 81.5t47 70.5q11 18 9 42.5t-14 41.5q-90 117 -163 189zM448 727l-35 -36q-15 -15 -19.5 -38.5t4.5 -41.5q37 -68 93 -116q16 -13 38.5 -11t36.5 17l35 34q14 15 12.5 33.5t-16.5 33.5q-44 44 -89 117q-11 18 -28 20t-32 -12z" />
-<glyph unicode="&#xe106;" d="M592 0h-148l31 120q-91 20 -175.5 68.5t-143.5 106.5t-103.5 119t-66.5 110t-22 76q0 21 14 57.5t42.5 82.5t68 95t94.5 95t116.5 82.5t140 59t160.5 22.5q61 0 126 -15l32 121h148zM944 770l47 181q108 -85 176.5 -192t68.5 -159q0 -26 -19.5 -71t-59.5 -102t-93 -112 t-129 -104.5t-158 -75.5l46 173q77 49 136 117t97 131q11 18 9 42.5t-14 41.5q-54 70 -107 130zM310 824q-70 -69 -160 -184q-13 -16 -15 -40.5t9 -42.5q18 -30 39 -60t57 -70.5t74 -73t90 -61t105 -41.5l41 154q-107 18 -178.5 101.5t-71.5 193.5q0 59 23 114q8 19 4.5 22 t-17.5 -12zM448 727l-35 -36q-15 -15 -19.5 -38.5t4.5 -41.5q37 -68 93 -116q16 -13 38.5 -11t36.5 17l12 11l22 86l-3 4q-44 44 -89 117q-11 18 -28 20t-32 -12z" />
-<glyph unicode="&#xe107;" d="M-90 100l642 1066q20 31 48 28.5t48 -35.5l642 -1056q21 -32 7.5 -67.5t-50.5 -35.5h-1294q-37 0 -50.5 34t7.5 66zM155 200h345v75q0 10 7.5 17.5t17.5 7.5h150q10 0 17.5 -7.5t7.5 -17.5v-75h345l-445 723zM496 700h208q20 0 32 -14.5t8 -34.5l-58 -252 q-4 -20 -21.5 -34.5t-37.5 -14.5h-54q-20 0 -37.5 14.5t-21.5 34.5l-58 252q-4 20 8 34.5t32 14.5z" />
-<glyph unicode="&#xe108;" d="M650 1200q62 0 106 -44t44 -106v-339l363 -325q15 -14 26 -38.5t11 -44.5v-41q0 -20 -12 -26.5t-29 5.5l-359 249v-263q100 -93 100 -113v-64q0 -21 -13 -29t-32 1l-205 128l-205 -128q-19 -9 -32 -1t-13 29v64q0 20 100 113v263l-359 -249q-17 -12 -29 -5.5t-12 26.5v41 q0 20 11 44.5t26 38.5l363 325v339q0 62 44 106t106 44z" />
-<glyph unicode="&#xe109;" d="M850 1200h100q21 0 35.5 -14.5t14.5 -35.5v-50h50q21 0 35.5 -14.5t14.5 -35.5v-150h-1100v150q0 21 14.5 35.5t35.5 14.5h50v50q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-50h500v50q0 21 14.5 35.5t35.5 14.5zM1100 800v-750q0 -21 -14.5 -35.5 t-35.5 -14.5h-1000q-21 0 -35.5 14.5t-14.5 35.5v750h1100zM100 600v-100h100v100h-100zM300 600v-100h100v100h-100zM500 600v-100h100v100h-100zM700 600v-100h100v100h-100zM900 600v-100h100v100h-100zM100 400v-100h100v100h-100zM300 400v-100h100v100h-100zM500 400 v-100h100v100h-100zM700 400v-100h100v100h-100zM900 400v-100h100v100h-100zM100 200v-100h100v100h-100zM300 200v-100h100v100h-100zM500 200v-100h100v100h-100zM700 200v-100h100v100h-100zM900 200v-100h100v100h-100z" />
-<glyph unicode="&#xe110;" d="M1135 1165l249 -230q15 -14 15 -35t-15 -35l-249 -230q-14 -14 -24.5 -10t-10.5 25v150h-159l-600 -600h-291q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h209l600 600h241v150q0 21 10.5 25t24.5 -10zM522 819l-141 -141l-122 122h-209q-21 0 -35.5 14.5 t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h291zM1135 565l249 -230q15 -14 15 -35t-15 -35l-249 -230q-14 -14 -24.5 -10t-10.5 25v150h-241l-181 181l141 141l122 -122h159v150q0 21 10.5 25t24.5 -10z" />
-<glyph unicode="&#xe111;" d="M100 1100h1000q41 0 70.5 -29.5t29.5 -70.5v-600q0 -41 -29.5 -70.5t-70.5 -29.5h-596l-304 -300v300h-100q-41 0 -70.5 29.5t-29.5 70.5v600q0 41 29.5 70.5t70.5 29.5z" />
-<glyph unicode="&#xe112;" d="M150 1200h200q21 0 35.5 -14.5t14.5 -35.5v-250h-300v250q0 21 14.5 35.5t35.5 14.5zM850 1200h200q21 0 35.5 -14.5t14.5 -35.5v-250h-300v250q0 21 14.5 35.5t35.5 14.5zM1100 800v-300q0 -41 -3 -77.5t-15 -89.5t-32 -96t-58 -89t-89 -77t-129 -51t-174 -20t-174 20 t-129 51t-89 77t-58 89t-32 96t-15 89.5t-3 77.5v300h300v-250v-27v-42.5t1.5 -41t5 -38t10 -35t16.5 -30t25.5 -24.5t35 -19t46.5 -12t60 -4t60 4.5t46.5 12.5t35 19.5t25 25.5t17 30.5t10 35t5 38t2 40.5t-0.5 42v25v250h300z" />
-<glyph unicode="&#xe113;" d="M1100 411l-198 -199l-353 353l-353 -353l-197 199l551 551z" />
-<glyph unicode="&#xe114;" d="M1101 789l-550 -551l-551 551l198 199l353 -353l353 353z" />
-<glyph unicode="&#xe115;" d="M404 1000h746q21 0 35.5 -14.5t14.5 -35.5v-551h150q21 0 25 -10.5t-10 -24.5l-230 -249q-14 -15 -35 -15t-35 15l-230 249q-14 14 -10 24.5t25 10.5h150v401h-381zM135 984l230 -249q14 -14 10 -24.5t-25 -10.5h-150v-400h385l215 -200h-750q-21 0 -35.5 14.5 t-14.5 35.5v550h-150q-21 0 -25 10.5t10 24.5l230 249q14 15 35 15t35 -15z" />
-<glyph unicode="&#xe116;" d="M56 1200h94q17 0 31 -11t18 -27l38 -162h896q24 0 39 -18.5t10 -42.5l-100 -475q-5 -21 -27 -42.5t-55 -21.5h-633l48 -200h535q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-50v-50q0 -21 -14.5 -35.5t-35.5 -14.5t-35.5 14.5t-14.5 35.5v50h-300v-50 q0 -21 -14.5 -35.5t-35.5 -14.5t-35.5 14.5t-14.5 35.5v50h-31q-18 0 -32.5 10t-20.5 19l-5 10l-201 961h-54q-20 0 -35 14.5t-15 35.5t15 35.5t35 14.5z" />
-<glyph unicode="&#xe117;" d="M1200 1000v-100h-1200v100h200q0 41 29.5 70.5t70.5 29.5h300q41 0 70.5 -29.5t29.5 -70.5h500zM0 800h1200v-800h-1200v800z" />
-<glyph unicode="&#xe118;" d="M200 800l-200 -400v600h200q0 41 29.5 70.5t70.5 29.5h300q42 0 71 -29.5t29 -70.5h500v-200h-1000zM1500 700l-300 -700h-1200l300 700h1200z" />
-<glyph unicode="&#xe119;" d="M635 1184l230 -249q14 -14 10 -24.5t-25 -10.5h-150v-601h150q21 0 25 -10.5t-10 -24.5l-230 -249q-14 -15 -35 -15t-35 15l-230 249q-14 14 -10 24.5t25 10.5h150v601h-150q-21 0 -25 10.5t10 24.5l230 249q14 15 35 15t35 -15z" />
-<glyph unicode="&#xe120;" d="M936 864l249 -229q14 -15 14 -35.5t-14 -35.5l-249 -229q-15 -15 -25.5 -10.5t-10.5 24.5v151h-600v-151q0 -20 -10.5 -24.5t-25.5 10.5l-249 229q-14 15 -14 35.5t14 35.5l249 229q15 15 25.5 10.5t10.5 -25.5v-149h600v149q0 21 10.5 25.5t25.5 -10.5z" />
-<glyph unicode="&#xe121;" d="M1169 400l-172 732q-5 23 -23 45.5t-38 22.5h-672q-20 0 -38 -20t-23 -41l-172 -739h1138zM1100 300h-1000q-41 0 -70.5 -29.5t-29.5 -70.5v-100q0 -41 29.5 -70.5t70.5 -29.5h1000q41 0 70.5 29.5t29.5 70.5v100q0 41 -29.5 70.5t-70.5 29.5zM800 100v100h100v-100h-100 zM1000 100v100h100v-100h-100z" />
-<glyph unicode="&#xe122;" d="M1150 1100q21 0 35.5 -14.5t14.5 -35.5v-850q0 -21 -14.5 -35.5t-35.5 -14.5t-35.5 14.5t-14.5 35.5v850q0 21 14.5 35.5t35.5 14.5zM1000 200l-675 200h-38l47 -276q3 -16 -5.5 -20t-29.5 -4h-7h-84q-20 0 -34.5 14t-18.5 35q-55 337 -55 351v250v6q0 16 1 23.5t6.5 14 t17.5 6.5h200l675 250v-850zM0 750v-250q-4 0 -11 0.5t-24 6t-30 15t-24 30t-11 48.5v50q0 26 10.5 46t25 30t29 16t25.5 7z" />
-<glyph unicode="&#xe123;" d="M553 1200h94q20 0 29 -10.5t3 -29.5l-18 -37q83 -19 144 -82.5t76 -140.5l63 -327l118 -173h17q19 0 33 -14.5t14 -35t-13 -40.5t-31 -27q-8 -4 -23 -9.5t-65 -19.5t-103 -25t-132.5 -20t-158.5 -9q-57 0 -115 5t-104 12t-88.5 15.5t-73.5 17.5t-54.5 16t-35.5 12l-11 4 q-18 8 -31 28t-13 40.5t14 35t33 14.5h17l118 173l63 327q15 77 76 140t144 83l-18 32q-6 19 3.5 32t28.5 13zM498 110q50 -6 102 -6q53 0 102 6q-12 -49 -39.5 -79.5t-62.5 -30.5t-63 30.5t-39 79.5z" />
-<glyph unicode="&#xe124;" d="M800 946l224 78l-78 -224l234 -45l-180 -155l180 -155l-234 -45l78 -224l-224 78l-45 -234l-155 180l-155 -180l-45 234l-224 -78l78 224l-234 45l180 155l-180 155l234 45l-78 224l224 -78l45 234l155 -180l155 180z" />
-<glyph unicode="&#xe125;" d="M650 1200h50q40 0 70 -40.5t30 -84.5v-150l-28 -125h328q40 0 70 -40.5t30 -84.5v-100q0 -45 -29 -74l-238 -344q-16 -24 -38 -40.5t-45 -16.5h-250q-7 0 -42 25t-66 50l-31 25h-61q-45 0 -72.5 18t-27.5 57v400q0 36 20 63l145 196l96 198q13 28 37.5 48t51.5 20z M650 1100l-100 -212l-150 -213v-375h100l136 -100h214l250 375v125h-450l50 225v175h-50zM50 800h100q21 0 35.5 -14.5t14.5 -35.5v-500q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v500q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xe126;" d="M600 1100h250q23 0 45 -16.5t38 -40.5l238 -344q29 -29 29 -74v-100q0 -44 -30 -84.5t-70 -40.5h-328q28 -118 28 -125v-150q0 -44 -30 -84.5t-70 -40.5h-50q-27 0 -51.5 20t-37.5 48l-96 198l-145 196q-20 27 -20 63v400q0 39 27.5 57t72.5 18h61q124 100 139 100z M50 1000h100q21 0 35.5 -14.5t14.5 -35.5v-500q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v500q0 21 14.5 35.5t35.5 14.5zM636 1000l-136 -100h-100v-375l150 -213l100 -212h50v175l-50 225h450v125l-250 375h-214z" />
-<glyph unicode="&#xe127;" d="M356 873l363 230q31 16 53 -6l110 -112q13 -13 13.5 -32t-11.5 -34l-84 -121h302q84 0 138 -38t54 -110t-55 -111t-139 -39h-106l-131 -339q-6 -21 -19.5 -41t-28.5 -20h-342q-7 0 -90 81t-83 94v525q0 17 14 35.5t28 28.5zM400 792v-503l100 -89h293l131 339 q6 21 19.5 41t28.5 20h203q21 0 30.5 25t0.5 50t-31 25h-456h-7h-6h-5.5t-6 0.5t-5 1.5t-5 2t-4 2.5t-4 4t-2.5 4.5q-12 25 5 47l146 183l-86 83zM50 800h100q21 0 35.5 -14.5t14.5 -35.5v-500q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v500 q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xe128;" d="M475 1103l366 -230q2 -1 6 -3.5t14 -10.5t18 -16.5t14.5 -20t6.5 -22.5v-525q0 -13 -86 -94t-93 -81h-342q-15 0 -28.5 20t-19.5 41l-131 339h-106q-85 0 -139.5 39t-54.5 111t54 110t138 38h302l-85 121q-11 15 -10.5 34t13.5 32l110 112q22 22 53 6zM370 945l146 -183 q17 -22 5 -47q-2 -2 -3.5 -4.5t-4 -4t-4 -2.5t-5 -2t-5 -1.5t-6 -0.5h-6h-6.5h-6h-475v-100h221q15 0 29 -20t20 -41l130 -339h294l106 89v503l-342 236zM1050 800h100q21 0 35.5 -14.5t14.5 -35.5v-500q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5 v500q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xe129;" d="M550 1294q72 0 111 -55t39 -139v-106l339 -131q21 -6 41 -19.5t20 -28.5v-342q0 -7 -81 -90t-94 -83h-525q-17 0 -35.5 14t-28.5 28l-9 14l-230 363q-16 31 6 53l112 110q13 13 32 13.5t34 -11.5l121 -84v302q0 84 38 138t110 54zM600 972v203q0 21 -25 30.5t-50 0.5 t-25 -31v-456v-7v-6v-5.5t-0.5 -6t-1.5 -5t-2 -5t-2.5 -4t-4 -4t-4.5 -2.5q-25 -12 -47 5l-183 146l-83 -86l236 -339h503l89 100v293l-339 131q-21 6 -41 19.5t-20 28.5zM450 200h500q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-500 q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xe130;" d="M350 1100h500q21 0 35.5 14.5t14.5 35.5v100q0 21 -14.5 35.5t-35.5 14.5h-500q-21 0 -35.5 -14.5t-14.5 -35.5v-100q0 -21 14.5 -35.5t35.5 -14.5zM600 306v-106q0 -84 -39 -139t-111 -55t-110 54t-38 138v302l-121 -84q-15 -12 -34 -11.5t-32 13.5l-112 110 q-22 22 -6 53l230 363q1 2 3.5 6t10.5 13.5t16.5 17t20 13.5t22.5 6h525q13 0 94 -83t81 -90v-342q0 -15 -20 -28.5t-41 -19.5zM308 900l-236 -339l83 -86l183 146q22 17 47 5q2 -1 4.5 -2.5t4 -4t2.5 -4t2 -5t1.5 -5t0.5 -6v-5.5v-6v-7v-456q0 -22 25 -31t50 0.5t25 30.5 v203q0 15 20 28.5t41 19.5l339 131v293l-89 100h-503z" />
-<glyph unicode="&#xe131;" d="M600 1178q118 0 225 -45.5t184.5 -123t123 -184.5t45.5 -225t-45.5 -225t-123 -184.5t-184.5 -123t-225 -45.5t-225 45.5t-184.5 123t-123 184.5t-45.5 225t45.5 225t123 184.5t184.5 123t225 45.5zM914 632l-275 223q-16 13 -27.5 8t-11.5 -26v-137h-275 q-10 0 -17.5 -7.5t-7.5 -17.5v-150q0 -10 7.5 -17.5t17.5 -7.5h275v-137q0 -21 11.5 -26t27.5 8l275 223q16 13 16 32t-16 32z" />
-<glyph unicode="&#xe132;" d="M600 1178q118 0 225 -45.5t184.5 -123t123 -184.5t45.5 -225t-45.5 -225t-123 -184.5t-184.5 -123t-225 -45.5t-225 45.5t-184.5 123t-123 184.5t-45.5 225t45.5 225t123 184.5t184.5 123t225 45.5zM561 855l-275 -223q-16 -13 -16 -32t16 -32l275 -223q16 -13 27.5 -8 t11.5 26v137h275q10 0 17.5 7.5t7.5 17.5v150q0 10 -7.5 17.5t-17.5 7.5h-275v137q0 21 -11.5 26t-27.5 -8z" />
-<glyph unicode="&#xe133;" d="M600 1178q118 0 225 -45.5t184.5 -123t123 -184.5t45.5 -225t-45.5 -225t-123 -184.5t-184.5 -123t-225 -45.5t-225 45.5t-184.5 123t-123 184.5t-45.5 225t45.5 225t123 184.5t184.5 123t225 45.5zM855 639l-223 275q-13 16 -32 16t-32 -16l-223 -275q-13 -16 -8 -27.5 t26 -11.5h137v-275q0 -10 7.5 -17.5t17.5 -7.5h150q10 0 17.5 7.5t7.5 17.5v275h137q21 0 26 11.5t-8 27.5z" />
-<glyph unicode="&#xe134;" d="M600 1178q118 0 225 -45.5t184.5 -123t123 -184.5t45.5 -225t-45.5 -225t-123 -184.5t-184.5 -123t-225 -45.5t-225 45.5t-184.5 123t-123 184.5t-45.5 225t45.5 225t123 184.5t184.5 123t225 45.5zM675 900h-150q-10 0 -17.5 -7.5t-7.5 -17.5v-275h-137q-21 0 -26 -11.5 t8 -27.5l223 -275q13 -16 32 -16t32 16l223 275q13 16 8 27.5t-26 11.5h-137v275q0 10 -7.5 17.5t-17.5 7.5z" />
-<glyph unicode="&#xe135;" d="M600 1176q116 0 222.5 -46t184 -123.5t123.5 -184t46 -222.5t-46 -222.5t-123.5 -184t-184 -123.5t-222.5 -46t-222.5 46t-184 123.5t-123.5 184t-46 222.5t46 222.5t123.5 184t184 123.5t222.5 46zM627 1101q-15 -12 -36.5 -20.5t-35.5 -12t-43 -8t-39 -6.5 q-15 -3 -45.5 0t-45.5 -2q-20 -7 -51.5 -26.5t-34.5 -34.5q-3 -11 6.5 -22.5t8.5 -18.5q-3 -34 -27.5 -91t-29.5 -79q-9 -34 5 -93t8 -87q0 -9 17 -44.5t16 -59.5q12 0 23 -5t23.5 -15t19.5 -14q16 -8 33 -15t40.5 -15t34.5 -12q21 -9 52.5 -32t60 -38t57.5 -11 q7 -15 -3 -34t-22.5 -40t-9.5 -38q13 -21 23 -34.5t27.5 -27.5t36.5 -18q0 -7 -3.5 -16t-3.5 -14t5 -17q104 -2 221 112q30 29 46.5 47t34.5 49t21 63q-13 8 -37 8.5t-36 7.5q-15 7 -49.5 15t-51.5 19q-18 0 -41 -0.5t-43 -1.5t-42 -6.5t-38 -16.5q-51 -35 -66 -12 q-4 1 -3.5 25.5t0.5 25.5q-6 13 -26.5 17.5t-24.5 6.5q1 15 -0.5 30.5t-7 28t-18.5 11.5t-31 -21q-23 -25 -42 4q-19 28 -8 58q6 16 22 22q6 -1 26 -1.5t33.5 -4t19.5 -13.5q7 -12 18 -24t21.5 -20.5t20 -15t15.5 -10.5l5 -3q2 12 7.5 30.5t8 34.5t-0.5 32q-3 18 3.5 29 t18 22.5t15.5 24.5q6 14 10.5 35t8 31t15.5 22.5t34 22.5q-6 18 10 36q8 0 24 -1.5t24.5 -1.5t20 4.5t20.5 15.5q-10 23 -31 42.5t-37.5 29.5t-49 27t-43.5 23q0 1 2 8t3 11.5t1.5 10.5t-1 9.5t-4.5 4.5q31 -13 58.5 -14.5t38.5 2.5l12 5q5 28 -9.5 46t-36.5 24t-50 15 t-41 20q-18 -4 -37 0zM613 994q0 -17 8 -42t17 -45t9 -23q-8 1 -39.5 5.5t-52.5 10t-37 16.5q3 11 16 29.5t16 25.5q10 -10 19 -10t14 6t13.5 14.5t16.5 12.5z" />
-<glyph unicode="&#xe136;" d="M756 1157q164 92 306 -9l-259 -138l145 -232l251 126q6 -89 -34 -156.5t-117 -110.5q-60 -34 -127 -39.5t-126 16.5l-596 -596q-15 -16 -36.5 -16t-36.5 16l-111 110q-15 15 -15 36.5t15 37.5l600 599q-34 101 5.5 201.5t135.5 154.5z" />
-<glyph unicode="&#xe137;" horiz-adv-x="1220" d="M100 1196h1000q41 0 70.5 -29.5t29.5 -70.5v-100q0 -41 -29.5 -70.5t-70.5 -29.5h-1000q-41 0 -70.5 29.5t-29.5 70.5v100q0 41 29.5 70.5t70.5 29.5zM1100 1096h-200v-100h200v100zM100 796h1000q41 0 70.5 -29.5t29.5 -70.5v-100q0 -41 -29.5 -70.5t-70.5 -29.5h-1000 q-41 0 -70.5 29.5t-29.5 70.5v100q0 41 29.5 70.5t70.5 29.5zM1100 696h-500v-100h500v100zM100 396h1000q41 0 70.5 -29.5t29.5 -70.5v-100q0 -41 -29.5 -70.5t-70.5 -29.5h-1000q-41 0 -70.5 29.5t-29.5 70.5v100q0 41 29.5 70.5t70.5 29.5zM1100 296h-300v-100h300v100z " />
-<glyph unicode="&#xe138;" d="M150 1200h900q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-900q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM700 500v-300l-200 -200v500l-350 500h900z" />
-<glyph unicode="&#xe139;" d="M500 1200h200q41 0 70.5 -29.5t29.5 -70.5v-100h300q41 0 70.5 -29.5t29.5 -70.5v-400h-500v100h-200v-100h-500v400q0 41 29.5 70.5t70.5 29.5h300v100q0 41 29.5 70.5t70.5 29.5zM500 1100v-100h200v100h-200zM1200 400v-200q0 -41 -29.5 -70.5t-70.5 -29.5h-1000 q-41 0 -70.5 29.5t-29.5 70.5v200h1200z" />
-<glyph unicode="&#xe140;" d="M50 1200h300q21 0 25 -10.5t-10 -24.5l-94 -94l199 -199q7 -8 7 -18t-7 -18l-106 -106q-8 -7 -18 -7t-18 7l-199 199l-94 -94q-14 -14 -24.5 -10t-10.5 25v300q0 21 14.5 35.5t35.5 14.5zM850 1200h300q21 0 35.5 -14.5t14.5 -35.5v-300q0 -21 -10.5 -25t-24.5 10l-94 94 l-199 -199q-8 -7 -18 -7t-18 7l-106 106q-7 8 -7 18t7 18l199 199l-94 94q-14 14 -10 24.5t25 10.5zM364 470l106 -106q7 -8 7 -18t-7 -18l-199 -199l94 -94q14 -14 10 -24.5t-25 -10.5h-300q-21 0 -35.5 14.5t-14.5 35.5v300q0 21 10.5 25t24.5 -10l94 -94l199 199 q8 7 18 7t18 -7zM1071 271l94 94q14 14 24.5 10t10.5 -25v-300q0 -21 -14.5 -35.5t-35.5 -14.5h-300q-21 0 -25 10.5t10 24.5l94 94l-199 199q-7 8 -7 18t7 18l106 106q8 7 18 7t18 -7z" />
-<glyph unicode="&#xe141;" d="M596 1192q121 0 231.5 -47.5t190 -127t127 -190t47.5 -231.5t-47.5 -231.5t-127 -190.5t-190 -127t-231.5 -47t-231.5 47t-190.5 127t-127 190.5t-47 231.5t47 231.5t127 190t190.5 127t231.5 47.5zM596 1010q-112 0 -207.5 -55.5t-151 -151t-55.5 -207.5t55.5 -207.5 t151 -151t207.5 -55.5t207.5 55.5t151 151t55.5 207.5t-55.5 207.5t-151 151t-207.5 55.5zM454.5 905q22.5 0 38.5 -16t16 -38.5t-16 -39t-38.5 -16.5t-38.5 16.5t-16 39t16 38.5t38.5 16zM754.5 905q22.5 0 38.5 -16t16 -38.5t-16 -39t-38 -16.5q-14 0 -29 10l-55 -145 q17 -23 17 -51q0 -36 -25.5 -61.5t-61.5 -25.5t-61.5 25.5t-25.5 61.5q0 32 20.5 56.5t51.5 29.5l122 126l1 1q-9 14 -9 28q0 23 16 39t38.5 16zM345.5 709q22.5 0 38.5 -16t16 -38.5t-16 -38.5t-38.5 -16t-38.5 16t-16 38.5t16 38.5t38.5 16zM854.5 709q22.5 0 38.5 -16 t16 -38.5t-16 -38.5t-38.5 -16t-38.5 16t-16 38.5t16 38.5t38.5 16z" />
-<glyph unicode="&#xe142;" d="M546 173l469 470q91 91 99 192q7 98 -52 175.5t-154 94.5q-22 4 -47 4q-34 0 -66.5 -10t-56.5 -23t-55.5 -38t-48 -41.5t-48.5 -47.5q-376 -375 -391 -390q-30 -27 -45 -41.5t-37.5 -41t-32 -46.5t-16 -47.5t-1.5 -56.5q9 -62 53.5 -95t99.5 -33q74 0 125 51l548 548 q36 36 20 75q-7 16 -21.5 26t-32.5 10q-26 0 -50 -23q-13 -12 -39 -38l-341 -338q-15 -15 -35.5 -15.5t-34.5 13.5t-14 34.5t14 34.5q327 333 361 367q35 35 67.5 51.5t78.5 16.5q14 0 29 -1q44 -8 74.5 -35.5t43.5 -68.5q14 -47 2 -96.5t-47 -84.5q-12 -11 -32 -32 t-79.5 -81t-114.5 -115t-124.5 -123.5t-123 -119.5t-96.5 -89t-57 -45q-56 -27 -120 -27q-70 0 -129 32t-93 89q-48 78 -35 173t81 163l511 511q71 72 111 96q91 55 198 55q80 0 152 -33q78 -36 129.5 -103t66.5 -154q17 -93 -11 -183.5t-94 -156.5l-482 -476 q-15 -15 -36 -16t-37 14t-17.5 34t14.5 35z" />
-<glyph unicode="&#xe143;" d="M649 949q48 68 109.5 104t121.5 38.5t118.5 -20t102.5 -64t71 -100.5t27 -123q0 -57 -33.5 -117.5t-94 -124.5t-126.5 -127.5t-150 -152.5t-146 -174q-62 85 -145.5 174t-150 152.5t-126.5 127.5t-93.5 124.5t-33.5 117.5q0 64 28 123t73 100.5t104 64t119 20 t120.5 -38.5t104.5 -104zM896 972q-33 0 -64.5 -19t-56.5 -46t-47.5 -53.5t-43.5 -45.5t-37.5 -19t-36 19t-40 45.5t-43 53.5t-54 46t-65.5 19q-67 0 -122.5 -55.5t-55.5 -132.5q0 -23 13.5 -51t46 -65t57.5 -63t76 -75l22 -22q15 -14 44 -44t50.5 -51t46 -44t41 -35t23 -12 t23.5 12t42.5 36t46 44t52.5 52t44 43q4 4 12 13q43 41 63.5 62t52 55t46 55t26 46t11.5 44q0 79 -53 133.5t-120 54.5z" />
-<glyph unicode="&#xe144;" d="M776.5 1214q93.5 0 159.5 -66l141 -141q66 -66 66 -160q0 -42 -28 -95.5t-62 -87.5l-29 -29q-31 53 -77 99l-18 18l95 95l-247 248l-389 -389l212 -212l-105 -106l-19 18l-141 141q-66 66 -66 159t66 159l283 283q65 66 158.5 66zM600 706l105 105q10 -8 19 -17l141 -141 q66 -66 66 -159t-66 -159l-283 -283q-66 -66 -159 -66t-159 66l-141 141q-66 66 -66 159.5t66 159.5l55 55q29 -55 75 -102l18 -17l-95 -95l247 -248l389 389z" />
-<glyph unicode="&#xe145;" d="M603 1200q85 0 162 -15t127 -38t79 -48t29 -46v-953q0 -41 -29.5 -70.5t-70.5 -29.5h-600q-41 0 -70.5 29.5t-29.5 70.5v953q0 21 30 46.5t81 48t129 37.5t163 15zM300 1000v-700h600v700h-600zM600 254q-43 0 -73.5 -30.5t-30.5 -73.5t30.5 -73.5t73.5 -30.5t73.5 30.5 t30.5 73.5t-30.5 73.5t-73.5 30.5z" />
-<glyph unicode="&#xe146;" d="M902 1185l283 -282q15 -15 15 -36t-14.5 -35.5t-35.5 -14.5t-35 15l-36 35l-279 -267v-300l-212 210l-308 -307l-280 -203l203 280l307 308l-210 212h300l267 279l-35 36q-15 14 -15 35t14.5 35.5t35.5 14.5t35 -15z" />
-<glyph unicode="&#xe148;" d="M700 1248v-78q38 -5 72.5 -14.5t75.5 -31.5t71 -53.5t52 -84t24 -118.5h-159q-4 36 -10.5 59t-21 45t-40 35.5t-64.5 20.5v-307l64 -13q34 -7 64 -16.5t70 -32t67.5 -52.5t47.5 -80t20 -112q0 -139 -89 -224t-244 -97v-77h-100v79q-150 16 -237 103q-40 40 -52.5 93.5 t-15.5 139.5h139q5 -77 48.5 -126t117.5 -65v335l-27 8q-46 14 -79 26.5t-72 36t-63 52t-40 72.5t-16 98q0 70 25 126t67.5 92t94.5 57t110 27v77h100zM600 754v274q-29 -4 -50 -11t-42 -21.5t-31.5 -41.5t-10.5 -65q0 -29 7 -50.5t16.5 -34t28.5 -22.5t31.5 -14t37.5 -10 q9 -3 13 -4zM700 547v-310q22 2 42.5 6.5t45 15.5t41.5 27t29 42t12 59.5t-12.5 59.5t-38 44.5t-53 31t-66.5 24.5z" />
-<glyph unicode="&#xe149;" d="M561 1197q84 0 160.5 -40t123.5 -109.5t47 -147.5h-153q0 40 -19.5 71.5t-49.5 48.5t-59.5 26t-55.5 9q-37 0 -79 -14.5t-62 -35.5q-41 -44 -41 -101q0 -26 13.5 -63t26.5 -61t37 -66q6 -9 9 -14h241v-100h-197q8 -50 -2.5 -115t-31.5 -95q-45 -62 -99 -112 q34 10 83 17.5t71 7.5q32 1 102 -16t104 -17q83 0 136 30l50 -147q-31 -19 -58 -30.5t-55 -15.5t-42 -4.5t-46 -0.5q-23 0 -76 17t-111 32.5t-96 11.5q-39 -3 -82 -16t-67 -25l-23 -11l-55 145q4 3 16 11t15.5 10.5t13 9t15.5 12t14.5 14t17.5 18.5q48 55 54 126.5 t-30 142.5h-221v100h166q-23 47 -44 104q-7 20 -12 41.5t-6 55.5t6 66.5t29.5 70.5t58.5 71q97 88 263 88z" />
-<glyph unicode="&#xe150;" d="M400 300h150q21 0 25 -11t-10 -25l-230 -250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM935 1184l230 -249q14 -14 10 -24.5t-25 -10.5h-150v-900h-200v900h-150q-21 0 -25 10.5t10 24.5l230 249q14 15 35 15t35 -15z" />
-<glyph unicode="&#xe151;" d="M1000 700h-100v100h-100v-100h-100v500h300v-500zM400 300h150q21 0 25 -11t-10 -25l-230 -250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM801 1100v-200h100v200h-100zM1000 350l-200 -250h200v-100h-300v150l200 250h-200v100h300v-150z " />
-<glyph unicode="&#xe152;" d="M400 300h150q21 0 25 -11t-10 -25l-230 -250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM1000 1050l-200 -250h200v-100h-300v150l200 250h-200v100h300v-150zM1000 0h-100v100h-100v-100h-100v500h300v-500zM801 400v-200h100v200h-100z " />
-<glyph unicode="&#xe153;" d="M400 300h150q21 0 25 -11t-10 -25l-230 -250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM1000 700h-100v400h-100v100h200v-500zM1100 0h-100v100h-200v400h300v-500zM901 400v-200h100v200h-100z" />
-<glyph unicode="&#xe154;" d="M400 300h150q21 0 25 -11t-10 -25l-230 -250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM1100 700h-100v100h-200v400h300v-500zM901 1100v-200h100v200h-100zM1000 0h-100v400h-100v100h200v-500z" />
-<glyph unicode="&#xe155;" d="M400 300h150q21 0 25 -11t-10 -25l-230 -250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM900 1000h-200v200h200v-200zM1000 700h-300v200h300v-200zM1100 400h-400v200h400v-200zM1200 100h-500v200h500v-200z" />
-<glyph unicode="&#xe156;" d="M400 300h150q21 0 25 -11t-10 -25l-230 -250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM1200 1000h-500v200h500v-200zM1100 700h-400v200h400v-200zM1000 400h-300v200h300v-200zM900 100h-200v200h200v-200z" />
-<glyph unicode="&#xe157;" d="M350 1100h400q162 0 256 -93.5t94 -256.5v-400q0 -165 -93.5 -257.5t-256.5 -92.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400q0 165 92.5 257.5t257.5 92.5zM800 900h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5 v500q0 41 -29.5 70.5t-70.5 29.5z" />
-<glyph unicode="&#xe158;" d="M350 1100h400q165 0 257.5 -92.5t92.5 -257.5v-400q0 -165 -92.5 -257.5t-257.5 -92.5h-400q-163 0 -256.5 92.5t-93.5 257.5v400q0 163 94 256.5t256 93.5zM800 900h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5 v500q0 41 -29.5 70.5t-70.5 29.5zM440 770l253 -190q17 -12 17 -30t-17 -30l-253 -190q-16 -12 -28 -6.5t-12 26.5v400q0 21 12 26.5t28 -6.5z" />
-<glyph unicode="&#xe159;" d="M350 1100h400q163 0 256.5 -94t93.5 -256v-400q0 -165 -92.5 -257.5t-257.5 -92.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400q0 163 92.5 256.5t257.5 93.5zM800 900h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5 v500q0 41 -29.5 70.5t-70.5 29.5zM350 700h400q21 0 26.5 -12t-6.5 -28l-190 -253q-12 -17 -30 -17t-30 17l-190 253q-12 16 -6.5 28t26.5 12z" />
-<glyph unicode="&#xe160;" d="M350 1100h400q165 0 257.5 -92.5t92.5 -257.5v-400q0 -163 -92.5 -256.5t-257.5 -93.5h-400q-163 0 -256.5 94t-93.5 256v400q0 165 92.5 257.5t257.5 92.5zM800 900h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5 v500q0 41 -29.5 70.5t-70.5 29.5zM580 693l190 -253q12 -16 6.5 -28t-26.5 -12h-400q-21 0 -26.5 12t6.5 28l190 253q12 17 30 17t30 -17z" />
-<glyph unicode="&#xe161;" d="M550 1100h400q165 0 257.5 -92.5t92.5 -257.5v-400q0 -165 -92.5 -257.5t-257.5 -92.5h-400q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h450q41 0 70.5 29.5t29.5 70.5v500q0 41 -29.5 70.5t-70.5 29.5h-450q-21 0 -35.5 14.5t-14.5 35.5v100 q0 21 14.5 35.5t35.5 14.5zM338 867l324 -284q16 -14 16 -33t-16 -33l-324 -284q-16 -14 -27 -9t-11 26v150h-250q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5h250v150q0 21 11 26t27 -9z" />
-<glyph unicode="&#xe162;" d="M793 1182l9 -9q8 -10 5 -27q-3 -11 -79 -225.5t-78 -221.5l300 1q24 0 32.5 -17.5t-5.5 -35.5q-1 0 -133.5 -155t-267 -312.5t-138.5 -162.5q-12 -15 -26 -15h-9l-9 8q-9 11 -4 32q2 9 42 123.5t79 224.5l39 110h-302q-23 0 -31 19q-10 21 6 41q75 86 209.5 237.5 t228 257t98.5 111.5q9 16 25 16h9z" />
-<glyph unicode="&#xe163;" d="M350 1100h400q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-450q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h450q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400 q0 165 92.5 257.5t257.5 92.5zM938 867l324 -284q16 -14 16 -33t-16 -33l-324 -284q-16 -14 -27 -9t-11 26v150h-250q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5h250v150q0 21 11 26t27 -9z" />
-<glyph unicode="&#xe164;" d="M750 1200h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -10.5 -25t-24.5 10l-109 109l-312 -312q-15 -15 -35.5 -15t-35.5 15l-141 141q-15 15 -15 35.5t15 35.5l312 312l-109 109q-14 14 -10 24.5t25 10.5zM456 900h-156q-41 0 -70.5 -29.5t-29.5 -70.5v-500 q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v148l200 200v-298q0 -165 -93.5 -257.5t-256.5 -92.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400q0 165 92.5 257.5t257.5 92.5h300z" />
-<glyph unicode="&#xe165;" d="M600 1186q119 0 227.5 -46.5t187 -125t125 -187t46.5 -227.5t-46.5 -227.5t-125 -187t-187 -125t-227.5 -46.5t-227.5 46.5t-187 125t-125 187t-46.5 227.5t46.5 227.5t125 187t187 125t227.5 46.5zM600 1022q-115 0 -212 -56.5t-153.5 -153.5t-56.5 -212t56.5 -212 t153.5 -153.5t212 -56.5t212 56.5t153.5 153.5t56.5 212t-56.5 212t-153.5 153.5t-212 56.5zM600 794q80 0 137 -57t57 -137t-57 -137t-137 -57t-137 57t-57 137t57 137t137 57z" />
-<glyph unicode="&#xe166;" d="M450 1200h200q21 0 35.5 -14.5t14.5 -35.5v-350h245q20 0 25 -11t-9 -26l-383 -426q-14 -15 -33.5 -15t-32.5 15l-379 426q-13 15 -8.5 26t25.5 11h250v350q0 21 14.5 35.5t35.5 14.5zM50 300h1000q21 0 35.5 -14.5t14.5 -35.5v-250h-1100v250q0 21 14.5 35.5t35.5 14.5z M900 200v-50h100v50h-100z" />
-<glyph unicode="&#xe167;" d="M583 1182l378 -435q14 -15 9 -31t-26 -16h-244v-250q0 -20 -17 -35t-39 -15h-200q-20 0 -32 14.5t-12 35.5v250h-250q-20 0 -25.5 16.5t8.5 31.5l383 431q14 16 33.5 17t33.5 -14zM50 300h1000q21 0 35.5 -14.5t14.5 -35.5v-250h-1100v250q0 21 14.5 35.5t35.5 14.5z M900 200v-50h100v50h-100z" />
-<glyph unicode="&#xe168;" d="M396 723l369 369q7 7 17.5 7t17.5 -7l139 -139q7 -8 7 -18.5t-7 -17.5l-525 -525q-7 -8 -17.5 -8t-17.5 8l-292 291q-7 8 -7 18t7 18l139 139q8 7 18.5 7t17.5 -7zM50 300h1000q21 0 35.5 -14.5t14.5 -35.5v-250h-1100v250q0 21 14.5 35.5t35.5 14.5zM900 200v-50h100v50 h-100z" />
-<glyph unicode="&#xe169;" d="M135 1023l142 142q14 14 35 14t35 -14l77 -77l-212 -212l-77 76q-14 15 -14 36t14 35zM655 855l210 210q14 14 24.5 10t10.5 -25l-2 -599q-1 -20 -15.5 -35t-35.5 -15l-597 -1q-21 0 -25 10.5t10 24.5l208 208l-154 155l212 212zM50 300h1000q21 0 35.5 -14.5t14.5 -35.5 v-250h-1100v250q0 21 14.5 35.5t35.5 14.5zM900 200v-50h100v50h-100z" />
-<glyph unicode="&#xe170;" d="M350 1200l599 -2q20 -1 35 -15.5t15 -35.5l1 -597q0 -21 -10.5 -25t-24.5 10l-208 208l-155 -154l-212 212l155 154l-210 210q-14 14 -10 24.5t25 10.5zM524 512l-76 -77q-15 -14 -36 -14t-35 14l-142 142q-14 14 -14 35t14 35l77 77zM50 300h1000q21 0 35.5 -14.5 t14.5 -35.5v-250h-1100v250q0 21 14.5 35.5t35.5 14.5zM900 200v-50h100v50h-100z" />
-<glyph unicode="&#xe171;" d="M1200 103l-483 276l-314 -399v423h-399l1196 796v-1096zM483 424v-230l683 953z" />
-<glyph unicode="&#xe172;" d="M1100 1000v-850q0 -21 -14.5 -35.5t-35.5 -14.5h-150v400h-700v-400h-150q-21 0 -35.5 14.5t-14.5 35.5v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100zM700 1000h-100v200h100v-200z" />
-<glyph unicode="&#xe173;" d="M1100 1000l-2 -149l-299 -299l-95 95q-9 9 -21.5 9t-21.5 -9l-149 -147h-312v-400h-150q-21 0 -35.5 14.5t-14.5 35.5v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100zM700 1000h-100v200h100v-200zM1132 638l106 -106q7 -7 7 -17.5t-7 -17.5l-420 -421q-8 -7 -18 -7 t-18 7l-202 203q-8 7 -8 17.5t8 17.5l106 106q7 8 17.5 8t17.5 -8l79 -79l297 297q7 7 17.5 7t17.5 -7z" />
-<glyph unicode="&#xe174;" d="M1100 1000v-269l-103 -103l-134 134q-15 15 -33.5 16.5t-34.5 -12.5l-266 -266h-329v-400h-150q-21 0 -35.5 14.5t-14.5 35.5v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100zM700 1000h-100v200h100v-200zM1202 572l70 -70q15 -15 15 -35.5t-15 -35.5l-131 -131 l131 -131q15 -15 15 -35.5t-15 -35.5l-70 -70q-15 -15 -35.5 -15t-35.5 15l-131 131l-131 -131q-15 -15 -35.5 -15t-35.5 15l-70 70q-15 15 -15 35.5t15 35.5l131 131l-131 131q-15 15 -15 35.5t15 35.5l70 70q15 15 35.5 15t35.5 -15l131 -131l131 131q15 15 35.5 15 t35.5 -15z" />
-<glyph unicode="&#xe175;" d="M1100 1000v-300h-350q-21 0 -35.5 -14.5t-14.5 -35.5v-150h-500v-400h-150q-21 0 -35.5 14.5t-14.5 35.5v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100zM700 1000h-100v200h100v-200zM850 600h100q21 0 35.5 -14.5t14.5 -35.5v-250h150q21 0 25 -10.5t-10 -24.5 l-230 -230q-14 -14 -35 -14t-35 14l-230 230q-14 14 -10 24.5t25 10.5h150v250q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xe176;" d="M1100 1000v-400l-165 165q-14 15 -35 15t-35 -15l-263 -265h-402v-400h-150q-21 0 -35.5 14.5t-14.5 35.5v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100zM700 1000h-100v200h100v-200zM935 565l230 -229q14 -15 10 -25.5t-25 -10.5h-150v-250q0 -20 -14.5 -35 t-35.5 -15h-100q-21 0 -35.5 15t-14.5 35v250h-150q-21 0 -25 10.5t10 25.5l230 229q14 15 35 15t35 -15z" />
-<glyph unicode="&#xe177;" d="M50 1100h1100q21 0 35.5 -14.5t14.5 -35.5v-150h-1200v150q0 21 14.5 35.5t35.5 14.5zM1200 800v-550q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v550h1200zM100 500v-200h400v200h-400z" />
-<glyph unicode="&#xe178;" d="M935 1165l248 -230q14 -14 14 -35t-14 -35l-248 -230q-14 -14 -24.5 -10t-10.5 25v150h-400v200h400v150q0 21 10.5 25t24.5 -10zM200 800h-50q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h50v-200zM400 800h-100v200h100v-200zM18 435l247 230 q14 14 24.5 10t10.5 -25v-150h400v-200h-400v-150q0 -21 -10.5 -25t-24.5 10l-247 230q-15 14 -15 35t15 35zM900 300h-100v200h100v-200zM1000 500h51q20 0 34.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-34.5 -14.5h-51v200z" />
-<glyph unicode="&#xe179;" d="M862 1073l276 116q25 18 43.5 8t18.5 -41v-1106q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v397q-4 1 -11 5t-24 17.5t-30 29t-24 42t-11 56.5v359q0 31 18.5 65t43.5 52zM550 1200q22 0 34.5 -12.5t14.5 -24.5l1 -13v-450q0 -28 -10.5 -59.5 t-25 -56t-29 -45t-25.5 -31.5l-10 -11v-447q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v447q-4 4 -11 11.5t-24 30.5t-30 46t-24 55t-11 60v450q0 2 0.5 5.5t4 12t8.5 15t14.5 12t22.5 5.5q20 0 32.5 -12.5t14.5 -24.5l3 -13v-350h100v350v5.5t2.5 12 t7 15t15 12t25.5 5.5q23 0 35.5 -12.5t13.5 -24.5l1 -13v-350h100v350q0 2 0.5 5.5t3 12t7 15t15 12t24.5 5.5z" />
-<glyph unicode="&#xe180;" d="M1200 1100v-56q-4 0 -11 -0.5t-24 -3t-30 -7.5t-24 -15t-11 -24v-888q0 -22 25 -34.5t50 -13.5l25 -2v-56h-400v56q75 0 87.5 6.5t12.5 43.5v394h-500v-394q0 -37 12.5 -43.5t87.5 -6.5v-56h-400v56q4 0 11 0.5t24 3t30 7.5t24 15t11 24v888q0 22 -25 34.5t-50 13.5 l-25 2v56h400v-56q-75 0 -87.5 -6.5t-12.5 -43.5v-394h500v394q0 37 -12.5 43.5t-87.5 6.5v56h400z" />
-<glyph unicode="&#xe181;" d="M675 1000h375q21 0 35.5 -14.5t14.5 -35.5v-150h-105l-295 -98v98l-200 200h-400l100 100h375zM100 900h300q41 0 70.5 -29.5t29.5 -70.5v-500q0 -41 -29.5 -70.5t-70.5 -29.5h-300q-41 0 -70.5 29.5t-29.5 70.5v500q0 41 29.5 70.5t70.5 29.5zM100 800v-200h300v200 h-300zM1100 535l-400 -133v163l400 133v-163zM100 500v-200h300v200h-300zM1100 398v-248q0 -21 -14.5 -35.5t-35.5 -14.5h-375l-100 -100h-375l-100 100h400l200 200h105z" />
-<glyph unicode="&#xe182;" d="M17 1007l162 162q17 17 40 14t37 -22l139 -194q14 -20 11 -44.5t-20 -41.5l-119 -118q102 -142 228 -268t267 -227l119 118q17 17 42.5 19t44.5 -12l192 -136q19 -14 22.5 -37.5t-13.5 -40.5l-163 -162q-3 -1 -9.5 -1t-29.5 2t-47.5 6t-62.5 14.5t-77.5 26.5t-90 42.5 t-101.5 60t-111 83t-119 108.5q-74 74 -133.5 150.5t-94.5 138.5t-60 119.5t-34.5 100t-15 74.5t-4.5 48z" />
-<glyph unicode="&#xe183;" d="M600 1100q92 0 175 -10.5t141.5 -27t108.5 -36.5t81.5 -40t53.5 -37t31 -27l9 -10v-200q0 -21 -14.5 -33t-34.5 -9l-202 34q-20 3 -34.5 20t-14.5 38v146q-141 24 -300 24t-300 -24v-146q0 -21 -14.5 -38t-34.5 -20l-202 -34q-20 -3 -34.5 9t-14.5 33v200q3 4 9.5 10.5 t31 26t54 37.5t80.5 39.5t109 37.5t141 26.5t175 10.5zM600 795q56 0 97 -9.5t60 -23.5t30 -28t12 -24l1 -10v-50l365 -303q14 -15 24.5 -40t10.5 -45v-212q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v212q0 20 10.5 45t24.5 40l365 303v50 q0 4 1 10.5t12 23t30 29t60 22.5t97 10z" />
-<glyph unicode="&#xe184;" d="M1100 700l-200 -200h-600l-200 200v500h200v-200h200v200h200v-200h200v200h200v-500zM250 400h700q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-12l137 -100h-950l137 100h-12q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM50 100h1100q21 0 35.5 -14.5 t14.5 -35.5v-50h-1200v50q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xe185;" d="M700 1100h-100q-41 0 -70.5 -29.5t-29.5 -70.5v-1000h300v1000q0 41 -29.5 70.5t-70.5 29.5zM1100 800h-100q-41 0 -70.5 -29.5t-29.5 -70.5v-700h300v700q0 41 -29.5 70.5t-70.5 29.5zM400 0h-300v400q0 41 29.5 70.5t70.5 29.5h100q41 0 70.5 -29.5t29.5 -70.5v-400z " />
-<glyph unicode="&#xe186;" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM500 700h-200v-100h200v-300h-300v100h200v100h-200v300h300v-100zM900 700v-300l-100 -100h-200v500h200z M700 700v-300h100v300h-100z" />
-<glyph unicode="&#xe187;" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM500 300h-100v200h-100v-200h-100v500h100v-200h100v200h100v-500zM900 700v-300l-100 -100h-200v500h200z M700 700v-300h100v300h-100z" />
-<glyph unicode="&#xe188;" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM500 700h-200v-300h200v-100h-300v500h300v-100zM900 700h-200v-300h200v-100h-300v500h300v-100z" />
-<glyph unicode="&#xe189;" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM500 400l-300 150l300 150v-300zM900 550l-300 -150v300z" />
-<glyph unicode="&#xe190;" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM900 300h-700v500h700v-500zM800 700h-130q-38 0 -66.5 -43t-28.5 -108t27 -107t68 -42h130v300zM300 700v-300 h130q41 0 68 42t27 107t-28.5 108t-66.5 43h-130z" />
-<glyph unicode="&#xe191;" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM500 700h-200v-100h200v-300h-300v100h200v100h-200v300h300v-100zM900 300h-100v400h-100v100h200v-500z M700 300h-100v100h100v-100z" />
-<glyph unicode="&#xe192;" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM300 700h200v-400h-300v500h100v-100zM900 300h-100v400h-100v100h200v-500zM300 600v-200h100v200h-100z M700 300h-100v100h100v-100z" />
-<glyph unicode="&#xe193;" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM500 500l-199 -200h-100v50l199 200v150h-200v100h300v-300zM900 300h-100v400h-100v100h200v-500zM701 300h-100 v100h100v-100z" />
-<glyph unicode="&#xe194;" d="M600 1191q120 0 229.5 -47t188.5 -126t126 -188.5t47 -229.5t-47 -229.5t-126 -188.5t-188.5 -126t-229.5 -47t-229.5 47t-188.5 126t-126 188.5t-47 229.5t47 229.5t126 188.5t188.5 126t229.5 47zM600 1021q-114 0 -211 -56.5t-153.5 -153.5t-56.5 -211t56.5 -211 t153.5 -153.5t211 -56.5t211 56.5t153.5 153.5t56.5 211t-56.5 211t-153.5 153.5t-211 56.5zM800 700h-300v-200h300v-100h-300l-100 100v200l100 100h300v-100z" />
-<glyph unicode="&#xe195;" d="M600 1191q120 0 229.5 -47t188.5 -126t126 -188.5t47 -229.5t-47 -229.5t-126 -188.5t-188.5 -126t-229.5 -47t-229.5 47t-188.5 126t-126 188.5t-47 229.5t47 229.5t126 188.5t188.5 126t229.5 47zM600 1021q-114 0 -211 -56.5t-153.5 -153.5t-56.5 -211t56.5 -211 t153.5 -153.5t211 -56.5t211 56.5t153.5 153.5t56.5 211t-56.5 211t-153.5 153.5t-211 56.5zM800 700v-100l-50 -50l100 -100v-50h-100l-100 100h-150v-100h-100v400h300zM500 700v-100h200v100h-200z" />
-<glyph unicode="&#xe197;" d="M503 1089q110 0 200.5 -59.5t134.5 -156.5q44 14 90 14q120 0 205 -86.5t85 -207t-85 -207t-205 -86.5h-128v250q0 21 -14.5 35.5t-35.5 14.5h-300q-21 0 -35.5 -14.5t-14.5 -35.5v-250h-222q-80 0 -136 57.5t-56 136.5q0 69 43 122.5t108 67.5q-2 19 -2 37q0 100 49 185 t134 134t185 49zM525 500h150q10 0 17.5 -7.5t7.5 -17.5v-275h137q21 0 26 -11.5t-8 -27.5l-223 -244q-13 -16 -32 -16t-32 16l-223 244q-13 16 -8 27.5t26 11.5h137v275q0 10 7.5 17.5t17.5 7.5z" />
-<glyph unicode="&#xe198;" d="M502 1089q110 0 201 -59.5t135 -156.5q43 15 89 15q121 0 206 -86.5t86 -206.5q0 -99 -60 -181t-150 -110l-378 360q-13 16 -31.5 16t-31.5 -16l-381 -365h-9q-79 0 -135.5 57.5t-56.5 136.5q0 69 43 122.5t108 67.5q-2 19 -2 38q0 100 49 184.5t133.5 134t184.5 49.5z M632 467l223 -228q13 -16 8 -27.5t-26 -11.5h-137v-275q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v275h-137q-21 0 -26 11.5t8 27.5q199 204 223 228q19 19 31.5 19t32.5 -19z" />
-<glyph unicode="&#xe199;" d="M700 100v100h400l-270 300h170l-270 300h170l-300 333l-300 -333h170l-270 -300h170l-270 -300h400v-100h-50q-21 0 -35.5 -14.5t-14.5 -35.5v-50h400v50q0 21 -14.5 35.5t-35.5 14.5h-50z" />
-<glyph unicode="&#xe200;" d="M600 1179q94 0 167.5 -56.5t99.5 -145.5q89 -6 150.5 -71.5t61.5 -155.5q0 -61 -29.5 -112.5t-79.5 -82.5q9 -29 9 -55q0 -74 -52.5 -126.5t-126.5 -52.5q-55 0 -100 30v-251q21 0 35.5 -14.5t14.5 -35.5v-50h-300v50q0 21 14.5 35.5t35.5 14.5v251q-45 -30 -100 -30 q-74 0 -126.5 52.5t-52.5 126.5q0 18 4 38q-47 21 -75.5 65t-28.5 97q0 74 52.5 126.5t126.5 52.5q5 0 23 -2q0 2 -1 10t-1 13q0 116 81.5 197.5t197.5 81.5z" />
-<glyph unicode="&#xe201;" d="M1010 1010q111 -111 150.5 -260.5t0 -299t-150.5 -260.5q-83 -83 -191.5 -126.5t-218.5 -43.5t-218.5 43.5t-191.5 126.5q-111 111 -150.5 260.5t0 299t150.5 260.5q83 83 191.5 126.5t218.5 43.5t218.5 -43.5t191.5 -126.5zM476 1065q-4 0 -8 -1q-121 -34 -209.5 -122.5 t-122.5 -209.5q-4 -12 2.5 -23t18.5 -14l36 -9q3 -1 7 -1q23 0 29 22q27 96 98 166q70 71 166 98q11 3 17.5 13.5t3.5 22.5l-9 35q-3 13 -14 19q-7 4 -15 4zM512 920q-4 0 -9 -2q-80 -24 -138.5 -82.5t-82.5 -138.5q-4 -13 2 -24t19 -14l34 -9q4 -1 8 -1q22 0 28 21 q18 58 58.5 98.5t97.5 58.5q12 3 18 13.5t3 21.5l-9 35q-3 12 -14 19q-7 4 -15 4zM719.5 719.5q-49.5 49.5 -119.5 49.5t-119.5 -49.5t-49.5 -119.5t49.5 -119.5t119.5 -49.5t119.5 49.5t49.5 119.5t-49.5 119.5zM855 551q-22 0 -28 -21q-18 -58 -58.5 -98.5t-98.5 -57.5 q-11 -4 -17 -14.5t-3 -21.5l9 -35q3 -12 14 -19q7 -4 15 -4q4 0 9 2q80 24 138.5 82.5t82.5 138.5q4 13 -2.5 24t-18.5 14l-34 9q-4 1 -8 1zM1000 515q-23 0 -29 -22q-27 -96 -98 -166q-70 -71 -166 -98q-11 -3 -17.5 -13.5t-3.5 -22.5l9 -35q3 -13 14 -19q7 -4 15 -4 q4 0 8 1q121 34 209.5 122.5t122.5 209.5q4 12 -2.5 23t-18.5 14l-36 9q-3 1 -7 1z" />
-<glyph unicode="&#xe202;" d="M700 800h300v-380h-180v200h-340v-200h-380v755q0 10 7.5 17.5t17.5 7.5h575v-400zM1000 900h-200v200zM700 300h162l-212 -212l-212 212h162v200h100v-200zM520 0h-395q-10 0 -17.5 7.5t-7.5 17.5v395zM1000 220v-195q0 -10 -7.5 -17.5t-17.5 -7.5h-195z" />
-<glyph unicode="&#xe203;" d="M700 800h300v-520l-350 350l-550 -550v1095q0 10 7.5 17.5t17.5 7.5h575v-400zM1000 900h-200v200zM862 200h-162v-200h-100v200h-162l212 212zM480 0h-355q-10 0 -17.5 7.5t-7.5 17.5v55h380v-80zM1000 80v-55q0 -10 -7.5 -17.5t-17.5 -7.5h-155v80h180z" />
-<glyph unicode="&#xe204;" d="M1162 800h-162v-200h100l100 -100h-300v300h-162l212 212zM200 800h200q27 0 40 -2t29.5 -10.5t23.5 -30t7 -57.5h300v-100h-600l-200 -350v450h100q0 36 7 57.5t23.5 30t29.5 10.5t40 2zM800 400h240l-240 -400h-800l300 500h500v-100z" />
-<glyph unicode="&#xe205;" d="M650 1100h100q21 0 35.5 -14.5t14.5 -35.5v-50h50q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-300q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h50v50q0 21 14.5 35.5t35.5 14.5zM1000 850v150q41 0 70.5 -29.5t29.5 -70.5v-800 q0 -41 -29.5 -70.5t-70.5 -29.5h-600q-1 0 -20 4l246 246l-326 326v324q0 41 29.5 70.5t70.5 29.5v-150q0 -62 44 -106t106 -44h300q62 0 106 44t44 106zM412 250l-212 -212v162h-200v100h200v162z" />
-<glyph unicode="&#xe206;" d="M450 1100h100q21 0 35.5 -14.5t14.5 -35.5v-50h50q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-300q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h50v50q0 21 14.5 35.5t35.5 14.5zM800 850v150q41 0 70.5 -29.5t29.5 -70.5v-500 h-200v-300h200q0 -36 -7 -57.5t-23.5 -30t-29.5 -10.5t-40 -2h-600q-41 0 -70.5 29.5t-29.5 70.5v800q0 41 29.5 70.5t70.5 29.5v-150q0 -62 44 -106t106 -44h300q62 0 106 44t44 106zM1212 250l-212 -212v162h-200v100h200v162z" />
-<glyph unicode="&#xe209;" d="M658 1197l637 -1104q23 -38 7 -65.5t-60 -27.5h-1276q-44 0 -60 27.5t7 65.5l637 1104q22 39 54 39t54 -39zM704 800h-208q-20 0 -32 -14.5t-8 -34.5l58 -302q4 -20 21.5 -34.5t37.5 -14.5h54q20 0 37.5 14.5t21.5 34.5l58 302q4 20 -8 34.5t-32 14.5zM500 300v-100h200 v100h-200z" />
-<glyph unicode="&#xe210;" d="M425 1100h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5zM425 800h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5 t17.5 7.5zM825 800h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5zM25 500h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v150 q0 10 7.5 17.5t17.5 7.5zM425 500h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5zM825 500h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5 v150q0 10 7.5 17.5t17.5 7.5zM25 200h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5zM425 200h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5 t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5zM825 200h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5z" />
-<glyph unicode="&#xe211;" d="M700 1200h100v-200h-100v-100h350q62 0 86.5 -39.5t-3.5 -94.5l-66 -132q-41 -83 -81 -134h-772q-40 51 -81 134l-66 132q-28 55 -3.5 94.5t86.5 39.5h350v100h-100v200h100v100h200v-100zM250 400h700q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-12l137 -100 h-950l138 100h-13q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM50 100h1100q21 0 35.5 -14.5t14.5 -35.5v-50h-1200v50q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xe212;" d="M600 1300q40 0 68.5 -29.5t28.5 -70.5h-194q0 41 28.5 70.5t68.5 29.5zM443 1100h314q18 -37 18 -75q0 -8 -3 -25h328q41 0 44.5 -16.5t-30.5 -38.5l-175 -145h-678l-178 145q-34 22 -29 38.5t46 16.5h328q-3 17 -3 25q0 38 18 75zM250 700h700q21 0 35.5 -14.5 t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-150v-200l275 -200h-950l275 200v200h-150q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM50 100h1100q21 0 35.5 -14.5t14.5 -35.5v-50h-1200v50q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xe213;" d="M600 1181q75 0 128 -53t53 -128t-53 -128t-128 -53t-128 53t-53 128t53 128t128 53zM602 798h46q34 0 55.5 -28.5t21.5 -86.5q0 -76 39 -183h-324q39 107 39 183q0 58 21.5 86.5t56.5 28.5h45zM250 400h700q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-13 l138 -100h-950l137 100h-12q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM50 100h1100q21 0 35.5 -14.5t14.5 -35.5v-50h-1200v50q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xe214;" d="M600 1300q47 0 92.5 -53.5t71 -123t25.5 -123.5q0 -78 -55.5 -133.5t-133.5 -55.5t-133.5 55.5t-55.5 133.5q0 62 34 143l144 -143l111 111l-163 163q34 26 63 26zM602 798h46q34 0 55.5 -28.5t21.5 -86.5q0 -76 39 -183h-324q39 107 39 183q0 58 21.5 86.5t56.5 28.5h45 zM250 400h700q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-13l138 -100h-950l137 100h-12q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM50 100h1100q21 0 35.5 -14.5t14.5 -35.5v-50h-1200v50q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xe215;" d="M600 1200l300 -161v-139h-300q0 -57 18.5 -108t50 -91.5t63 -72t70 -67.5t57.5 -61h-530q-60 83 -90.5 177.5t-30.5 178.5t33 164.5t87.5 139.5t126 96.5t145.5 41.5v-98zM250 400h700q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-13l138 -100h-950l137 100 h-12q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM50 100h1100q21 0 35.5 -14.5t14.5 -35.5v-50h-1200v50q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xe216;" d="M600 1300q41 0 70.5 -29.5t29.5 -70.5v-78q46 -26 73 -72t27 -100v-50h-400v50q0 54 27 100t73 72v78q0 41 29.5 70.5t70.5 29.5zM400 800h400q54 0 100 -27t72 -73h-172v-100h200v-100h-200v-100h200v-100h-200v-100h200q0 -83 -58.5 -141.5t-141.5 -58.5h-400 q-83 0 -141.5 58.5t-58.5 141.5v400q0 83 58.5 141.5t141.5 58.5z" />
-<glyph unicode="&#xe218;" d="M150 1100h900q21 0 35.5 -14.5t14.5 -35.5v-500q0 -21 -14.5 -35.5t-35.5 -14.5h-900q-21 0 -35.5 14.5t-14.5 35.5v500q0 21 14.5 35.5t35.5 14.5zM125 400h950q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-283l224 -224q13 -13 13 -31.5t-13 -32 t-31.5 -13.5t-31.5 13l-88 88h-524l-87 -88q-13 -13 -32 -13t-32 13.5t-13 32t13 31.5l224 224h-289q-10 0 -17.5 7.5t-7.5 17.5v50q0 10 7.5 17.5t17.5 7.5zM541 300l-100 -100h324l-100 100h-124z" />
-<glyph unicode="&#xe219;" d="M200 1100h800q83 0 141.5 -58.5t58.5 -141.5v-200h-100q0 41 -29.5 70.5t-70.5 29.5h-250q-41 0 -70.5 -29.5t-29.5 -70.5h-100q0 41 -29.5 70.5t-70.5 29.5h-250q-41 0 -70.5 -29.5t-29.5 -70.5h-100v200q0 83 58.5 141.5t141.5 58.5zM100 600h1000q41 0 70.5 -29.5 t29.5 -70.5v-300h-1200v300q0 41 29.5 70.5t70.5 29.5zM300 100v-50q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v50h200zM1100 100v-50q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v50h200z" />
-<glyph unicode="&#xe221;" d="M480 1165l682 -683q31 -31 31 -75.5t-31 -75.5l-131 -131h-481l-517 518q-32 31 -32 75.5t32 75.5l295 296q31 31 75.5 31t76.5 -31zM108 794l342 -342l303 304l-341 341zM250 100h800q21 0 35.5 -14.5t14.5 -35.5v-50h-900v50q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xe223;" d="M1057 647l-189 506q-8 19 -27.5 33t-40.5 14h-400q-21 0 -40.5 -14t-27.5 -33l-189 -506q-8 -19 1.5 -33t30.5 -14h625v-150q0 -21 14.5 -35.5t35.5 -14.5t35.5 14.5t14.5 35.5v150h125q21 0 30.5 14t1.5 33zM897 0h-595v50q0 21 14.5 35.5t35.5 14.5h50v50 q0 21 14.5 35.5t35.5 14.5h48v300h200v-300h47q21 0 35.5 -14.5t14.5 -35.5v-50h50q21 0 35.5 -14.5t14.5 -35.5v-50z" />
-<glyph unicode="&#xe224;" d="M900 800h300v-575q0 -10 -7.5 -17.5t-17.5 -7.5h-375v591l-300 300v84q0 10 7.5 17.5t17.5 7.5h375v-400zM1200 900h-200v200zM400 600h300v-575q0 -10 -7.5 -17.5t-17.5 -7.5h-650q-10 0 -17.5 7.5t-7.5 17.5v950q0 10 7.5 17.5t17.5 7.5h375v-400zM700 700h-200v200z " />
-<glyph unicode="&#xe225;" d="M484 1095h195q75 0 146 -32.5t124 -86t89.5 -122.5t48.5 -142q18 -14 35 -20q31 -10 64.5 6.5t43.5 48.5q10 34 -15 71q-19 27 -9 43q5 8 12.5 11t19 -1t23.5 -16q41 -44 39 -105q-3 -63 -46 -106.5t-104 -43.5h-62q-7 -55 -35 -117t-56 -100l-39 -234q-3 -20 -20 -34.5 t-38 -14.5h-100q-21 0 -33 14.5t-9 34.5l12 70q-49 -14 -91 -14h-195q-24 0 -65 8l-11 -64q-3 -20 -20 -34.5t-38 -14.5h-100q-21 0 -33 14.5t-9 34.5l26 157q-84 74 -128 175l-159 53q-19 7 -33 26t-14 40v50q0 21 14.5 35.5t35.5 14.5h124q11 87 56 166l-111 95 q-16 14 -12.5 23.5t24.5 9.5h203q116 101 250 101zM675 1000h-250q-10 0 -17.5 -7.5t-7.5 -17.5v-50q0 -10 7.5 -17.5t17.5 -7.5h250q10 0 17.5 7.5t7.5 17.5v50q0 10 -7.5 17.5t-17.5 7.5z" />
-<glyph unicode="&#xe226;" d="M641 900l423 247q19 8 42 2.5t37 -21.5l32 -38q14 -15 12.5 -36t-17.5 -34l-139 -120h-390zM50 1100h106q67 0 103 -17t66 -71l102 -212h823q21 0 35.5 -14.5t14.5 -35.5v-50q0 -21 -14 -40t-33 -26l-737 -132q-23 -4 -40 6t-26 25q-42 67 -100 67h-300q-62 0 -106 44 t-44 106v200q0 62 44 106t106 44zM173 928h-80q-19 0 -28 -14t-9 -35v-56q0 -51 42 -51h134q16 0 21.5 8t5.5 24q0 11 -16 45t-27 51q-18 28 -43 28zM550 727q-32 0 -54.5 -22.5t-22.5 -54.5t22.5 -54.5t54.5 -22.5t54.5 22.5t22.5 54.5t-22.5 54.5t-54.5 22.5zM130 389 l152 130q18 19 34 24t31 -3.5t24.5 -17.5t25.5 -28q28 -35 50.5 -51t48.5 -13l63 5l48 -179q13 -61 -3.5 -97.5t-67.5 -79.5l-80 -69q-47 -40 -109 -35.5t-103 51.5l-130 151q-40 47 -35.5 109.5t51.5 102.5zM380 377l-102 -88q-31 -27 2 -65l37 -43q13 -15 27.5 -19.5 t31.5 6.5l61 53q19 16 14 49q-2 20 -12 56t-17 45q-11 12 -19 14t-23 -8z" />
-<glyph unicode="&#xe227;" d="M625 1200h150q10 0 17.5 -7.5t7.5 -17.5v-109q79 -33 131 -87.5t53 -128.5q1 -46 -15 -84.5t-39 -61t-46 -38t-39 -21.5l-17 -6q6 0 15 -1.5t35 -9t50 -17.5t53 -30t50 -45t35.5 -64t14.5 -84q0 -59 -11.5 -105.5t-28.5 -76.5t-44 -51t-49.5 -31.5t-54.5 -16t-49.5 -6.5 t-43.5 -1v-75q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v75h-100v-75q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v75h-175q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5h75v600h-75q-10 0 -17.5 7.5t-7.5 17.5v150 q0 10 7.5 17.5t17.5 7.5h175v75q0 10 7.5 17.5t17.5 7.5h150q10 0 17.5 -7.5t7.5 -17.5v-75h100v75q0 10 7.5 17.5t17.5 7.5zM400 900v-200h263q28 0 48.5 10.5t30 25t15 29t5.5 25.5l1 10q0 4 -0.5 11t-6 24t-15 30t-30 24t-48.5 11h-263zM400 500v-200h363q28 0 48.5 10.5 t30 25t15 29t5.5 25.5l1 10q0 4 -0.5 11t-6 24t-15 30t-30 24t-48.5 11h-363z" />
-<glyph unicode="&#xe230;" d="M212 1198h780q86 0 147 -61t61 -147v-416q0 -51 -18 -142.5t-36 -157.5l-18 -66q-29 -87 -93.5 -146.5t-146.5 -59.5h-572q-82 0 -147 59t-93 147q-8 28 -20 73t-32 143.5t-20 149.5v416q0 86 61 147t147 61zM600 1045q-70 0 -132.5 -11.5t-105.5 -30.5t-78.5 -41.5 t-57 -45t-36 -41t-20.5 -30.5l-6 -12l156 -243h560l156 243q-2 5 -6 12.5t-20 29.5t-36.5 42t-57 44.5t-79 42t-105 29.5t-132.5 12zM762 703h-157l195 261z" />
-<glyph unicode="&#xe231;" d="M475 1300h150q103 0 189 -86t86 -189v-500q0 -41 -42 -83t-83 -42h-450q-41 0 -83 42t-42 83v500q0 103 86 189t189 86zM700 300v-225q0 -21 -27 -48t-48 -27h-150q-21 0 -48 27t-27 48v225h300z" />
-<glyph unicode="&#xe232;" d="M475 1300h96q0 -150 89.5 -239.5t239.5 -89.5v-446q0 -41 -42 -83t-83 -42h-450q-41 0 -83 42t-42 83v500q0 103 86 189t189 86zM700 300v-225q0 -21 -27 -48t-48 -27h-150q-21 0 -48 27t-27 48v225h300z" />
-<glyph unicode="&#xe233;" d="M1294 767l-638 -283l-378 170l-78 -60v-224l100 -150v-199l-150 148l-150 -149v200l100 150v250q0 4 -0.5 10.5t0 9.5t1 8t3 8t6.5 6l47 40l-147 65l642 283zM1000 380l-350 -166l-350 166v147l350 -165l350 165v-147z" />
-<glyph unicode="&#xe234;" d="M250 800q62 0 106 -44t44 -106t-44 -106t-106 -44t-106 44t-44 106t44 106t106 44zM650 800q62 0 106 -44t44 -106t-44 -106t-106 -44t-106 44t-44 106t44 106t106 44zM1050 800q62 0 106 -44t44 -106t-44 -106t-106 -44t-106 44t-44 106t44 106t106 44z" />
-<glyph unicode="&#xe235;" d="M550 1100q62 0 106 -44t44 -106t-44 -106t-106 -44t-106 44t-44 106t44 106t106 44zM550 700q62 0 106 -44t44 -106t-44 -106t-106 -44t-106 44t-44 106t44 106t106 44zM550 300q62 0 106 -44t44 -106t-44 -106t-106 -44t-106 44t-44 106t44 106t106 44z" />
-<glyph unicode="&#xe236;" d="M125 1100h950q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-950q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5zM125 700h950q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-950q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5 t17.5 7.5zM125 300h950q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-950q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5z" />
-<glyph unicode="&#xe237;" d="M350 1200h500q162 0 256 -93.5t94 -256.5v-500q0 -165 -93.5 -257.5t-256.5 -92.5h-500q-165 0 -257.5 92.5t-92.5 257.5v500q0 165 92.5 257.5t257.5 92.5zM900 1000h-600q-41 0 -70.5 -29.5t-29.5 -70.5v-600q0 -41 29.5 -70.5t70.5 -29.5h600q41 0 70.5 29.5 t29.5 70.5v600q0 41 -29.5 70.5t-70.5 29.5zM350 900h500q21 0 35.5 -14.5t14.5 -35.5v-300q0 -21 -14.5 -35.5t-35.5 -14.5h-500q-21 0 -35.5 14.5t-14.5 35.5v300q0 21 14.5 35.5t35.5 14.5zM400 800v-200h400v200h-400z" />
-<glyph unicode="&#xe238;" d="M150 1100h1000q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-50v-200h50q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-50v-200h50q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-50v-200h50q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5 t-35.5 -14.5h-1000q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5h50v200h-50q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5h50v200h-50q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5h50v200h-50q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xe239;" d="M650 1187q87 -67 118.5 -156t0 -178t-118.5 -155q-87 66 -118.5 155t0 178t118.5 156zM300 800q124 0 212 -88t88 -212q-124 0 -212 88t-88 212zM1000 800q0 -124 -88 -212t-212 -88q0 124 88 212t212 88zM300 500q124 0 212 -88t88 -212q-124 0 -212 88t-88 212z M1000 500q0 -124 -88 -212t-212 -88q0 124 88 212t212 88zM700 199v-144q0 -21 -14.5 -35.5t-35.5 -14.5t-35.5 14.5t-14.5 35.5v142q40 -4 43 -4q17 0 57 6z" />
-<glyph unicode="&#xe240;" d="M745 878l69 19q25 6 45 -12l298 -295q11 -11 15 -26.5t-2 -30.5q-5 -14 -18 -23.5t-28 -9.5h-8q1 0 1 -13q0 -29 -2 -56t-8.5 -62t-20 -63t-33 -53t-51 -39t-72.5 -14h-146q-184 0 -184 288q0 24 10 47q-20 4 -62 4t-63 -4q11 -24 11 -47q0 -288 -184 -288h-142 q-48 0 -84.5 21t-56 51t-32 71.5t-16 75t-3.5 68.5q0 13 2 13h-7q-15 0 -27.5 9.5t-18.5 23.5q-6 15 -2 30.5t15 25.5l298 296q20 18 46 11l76 -19q20 -5 30.5 -22.5t5.5 -37.5t-22.5 -31t-37.5 -5l-51 12l-182 -193h891l-182 193l-44 -12q-20 -5 -37.5 6t-22.5 31t6 37.5 t31 22.5z" />
-<glyph unicode="&#xe241;" d="M1200 900h-50q0 21 -4 37t-9.5 26.5t-18 17.5t-22 11t-28.5 5.5t-31 2t-37 0.5h-200v-850q0 -22 25 -34.5t50 -13.5l25 -2v-100h-400v100q4 0 11 0.5t24 3t30 7t24 15t11 24.5v850h-200q-25 0 -37 -0.5t-31 -2t-28.5 -5.5t-22 -11t-18 -17.5t-9.5 -26.5t-4 -37h-50v300 h1000v-300zM500 450h-25q0 15 -4 24.5t-9 14.5t-17 7.5t-20 3t-25 0.5h-100v-425q0 -11 12.5 -17.5t25.5 -7.5h12v-50h-200v50q50 0 50 25v425h-100q-17 0 -25 -0.5t-20 -3t-17 -7.5t-9 -14.5t-4 -24.5h-25v150h500v-150z" />
-<glyph unicode="&#xe242;" d="M1000 300v50q-25 0 -55 32q-14 14 -25 31t-16 27l-4 11l-289 747h-69l-300 -754q-18 -35 -39 -56q-9 -9 -24.5 -18.5t-26.5 -14.5l-11 -5v-50h273v50q-49 0 -78.5 21.5t-11.5 67.5l69 176h293l61 -166q13 -34 -3.5 -66.5t-55.5 -32.5v-50h312zM412 691l134 342l121 -342 h-255zM1100 150v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1000q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h1000q21 0 35.5 -14.5t14.5 -35.5z" />
-<glyph unicode="&#xe243;" d="M50 1200h1100q21 0 35.5 -14.5t14.5 -35.5v-1100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v1100q0 21 14.5 35.5t35.5 14.5zM611 1118h-70q-13 0 -18 -12l-299 -753q-17 -32 -35 -51q-18 -18 -56 -34q-12 -5 -12 -18v-50q0 -8 5.5 -14t14.5 -6 h273q8 0 14 6t6 14v50q0 8 -6 14t-14 6q-55 0 -71 23q-10 14 0 39l63 163h266l57 -153q11 -31 -6 -55q-12 -17 -36 -17q-8 0 -14 -6t-6 -14v-50q0 -8 6 -14t14 -6h313q8 0 14 6t6 14v50q0 7 -5.5 13t-13.5 7q-17 0 -42 25q-25 27 -40 63h-1l-288 748q-5 12 -19 12zM639 611 h-197l103 264z" />
-<glyph unicode="&#xe244;" d="M1200 1100h-1200v100h1200v-100zM50 1000h400q21 0 35.5 -14.5t14.5 -35.5v-900q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v900q0 21 14.5 35.5t35.5 14.5zM650 1000h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400 q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM700 900v-300h300v300h-300z" />
-<glyph unicode="&#xe245;" d="M50 1200h400q21 0 35.5 -14.5t14.5 -35.5v-900q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v900q0 21 14.5 35.5t35.5 14.5zM650 700h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v400 q0 21 14.5 35.5t35.5 14.5zM700 600v-300h300v300h-300zM1200 0h-1200v100h1200v-100z" />
-<glyph unicode="&#xe246;" d="M50 1000h400q21 0 35.5 -14.5t14.5 -35.5v-350h100v150q0 21 14.5 35.5t35.5 14.5h400q21 0 35.5 -14.5t14.5 -35.5v-150h100v-100h-100v-150q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v150h-100v-350q0 -21 -14.5 -35.5t-35.5 -14.5h-400 q-21 0 -35.5 14.5t-14.5 35.5v800q0 21 14.5 35.5t35.5 14.5zM700 700v-300h300v300h-300z" />
-<glyph unicode="&#xe247;" d="M100 0h-100v1200h100v-1200zM250 1100h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM300 1000v-300h300v300h-300zM250 500h900q21 0 35.5 -14.5t14.5 -35.5v-400 q0 -21 -14.5 -35.5t-35.5 -14.5h-900q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xe248;" d="M600 1100h150q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-150v-100h450q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-900q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5h350v100h-150q-21 0 -35.5 14.5 t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5h150v100h100v-100zM400 1000v-300h300v300h-300z" />
-<glyph unicode="&#xe249;" d="M1200 0h-100v1200h100v-1200zM550 1100h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM600 1000v-300h300v300h-300zM50 500h900q21 0 35.5 -14.5t14.5 -35.5v-400 q0 -21 -14.5 -35.5t-35.5 -14.5h-900q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xe250;" d="M865 565l-494 -494q-23 -23 -41 -23q-14 0 -22 13.5t-8 38.5v1000q0 25 8 38.5t22 13.5q18 0 41 -23l494 -494q14 -14 14 -35t-14 -35z" />
-<glyph unicode="&#xe251;" d="M335 635l494 494q29 29 50 20.5t21 -49.5v-1000q0 -41 -21 -49.5t-50 20.5l-494 494q-14 14 -14 35t14 35z" />
-<glyph unicode="&#xe252;" d="M100 900h1000q41 0 49.5 -21t-20.5 -50l-494 -494q-14 -14 -35 -14t-35 14l-494 494q-29 29 -20.5 50t49.5 21z" />
-<glyph unicode="&#xe253;" d="M635 865l494 -494q29 -29 20.5 -50t-49.5 -21h-1000q-41 0 -49.5 21t20.5 50l494 494q14 14 35 14t35 -14z" />
-<glyph unicode="&#xe254;" d="M700 741v-182l-692 -323v221l413 193l-413 193v221zM1200 0h-800v200h800v-200z" />
-<glyph unicode="&#xe255;" d="M1200 900h-200v-100h200v-100h-300v300h200v100h-200v100h300v-300zM0 700h50q0 21 4 37t9.5 26.5t18 17.5t22 11t28.5 5.5t31 2t37 0.5h100v-550q0 -22 -25 -34.5t-50 -13.5l-25 -2v-100h400v100q-4 0 -11 0.5t-24 3t-30 7t-24 15t-11 24.5v550h100q25 0 37 -0.5t31 -2 t28.5 -5.5t22 -11t18 -17.5t9.5 -26.5t4 -37h50v300h-800v-300z" />
-<glyph unicode="&#xe256;" d="M800 700h-50q0 21 -4 37t-9.5 26.5t-18 17.5t-22 11t-28.5 5.5t-31 2t-37 0.5h-100v-550q0 -22 25 -34.5t50 -14.5l25 -1v-100h-400v100q4 0 11 0.5t24 3t30 7t24 15t11 24.5v550h-100q-25 0 -37 -0.5t-31 -2t-28.5 -5.5t-22 -11t-18 -17.5t-9.5 -26.5t-4 -37h-50v300 h800v-300zM1100 200h-200v-100h200v-100h-300v300h200v100h-200v100h300v-300z" />
-<glyph unicode="&#xe257;" d="M701 1098h160q16 0 21 -11t-7 -23l-464 -464l464 -464q12 -12 7 -23t-21 -11h-160q-13 0 -23 9l-471 471q-7 8 -7 18t7 18l471 471q10 9 23 9z" />
-<glyph unicode="&#xe258;" d="M339 1098h160q13 0 23 -9l471 -471q7 -8 7 -18t-7 -18l-471 -471q-10 -9 -23 -9h-160q-16 0 -21 11t7 23l464 464l-464 464q-12 12 -7 23t21 11z" />
-<glyph unicode="&#xe259;" d="M1087 882q11 -5 11 -21v-160q0 -13 -9 -23l-471 -471q-8 -7 -18 -7t-18 7l-471 471q-9 10 -9 23v160q0 16 11 21t23 -7l464 -464l464 464q12 12 23 7z" />
-<glyph unicode="&#xe260;" d="M618 993l471 -471q9 -10 9 -23v-160q0 -16 -11 -21t-23 7l-464 464l-464 -464q-12 -12 -23 -7t-11 21v160q0 13 9 23l471 471q8 7 18 7t18 -7z" />
-<glyph unicode="&#xf8ff;" d="M1000 1200q0 -124 -88 -212t-212 -88q0 124 88 212t212 88zM450 1000h100q21 0 40 -14t26 -33l79 -194q5 1 16 3q34 6 54 9.5t60 7t65.5 1t61 -10t56.5 -23t42.5 -42t29 -64t5 -92t-19.5 -121.5q-1 -7 -3 -19.5t-11 -50t-20.5 -73t-32.5 -81.5t-46.5 -83t-64 -70 t-82.5 -50q-13 -5 -42 -5t-65.5 2.5t-47.5 2.5q-14 0 -49.5 -3.5t-63 -3.5t-43.5 7q-57 25 -104.5 78.5t-75 111.5t-46.5 112t-26 90l-7 35q-15 63 -18 115t4.5 88.5t26 64t39.5 43.5t52 25.5t58.5 13t62.5 2t59.5 -4.5t55.5 -8l-147 192q-12 18 -5.5 30t27.5 12z" />
-<glyph unicode="&#x1f511;" d="M250 1200h600q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-150v-500l-255 -178q-19 -9 -32 -1t-13 29v650h-150q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM400 1100v-100h300v100h-300z" />
-<glyph unicode="&#x1f6aa;" d="M250 1200h750q39 0 69.5 -40.5t30.5 -84.5v-933l-700 -117v950l600 125h-700v-1000h-100v1025q0 23 15.5 49t34.5 26zM500 525v-100l100 20v100z" />
-</font>
-</defs></svg> 
\ No newline at end of file
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/shared/admin/fonts/glyphicons-halflings-regular.ttf b/Godeps/_workspace/src/github.com/influxdb/influxdb/shared/admin/fonts/glyphicons-halflings-regular.ttf
deleted file mode 100644
index 1413fc609..000000000
Binary files a/Godeps/_workspace/src/github.com/influxdb/influxdb/shared/admin/fonts/glyphicons-halflings-regular.ttf and /dev/null differ
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/shared/admin/fonts/glyphicons-halflings-regular.woff b/Godeps/_workspace/src/github.com/influxdb/influxdb/shared/admin/fonts/glyphicons-halflings-regular.woff
deleted file mode 100644
index 9e612858f..000000000
Binary files a/Godeps/_workspace/src/github.com/influxdb/influxdb/shared/admin/fonts/glyphicons-halflings-regular.woff and /dev/null differ
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/shared/admin/fonts/glyphicons-halflings-regular.woff2 b/Godeps/_workspace/src/github.com/influxdb/influxdb/shared/admin/fonts/glyphicons-halflings-regular.woff2
deleted file mode 100644
index 64539b54c..000000000
Binary files a/Godeps/_workspace/src/github.com/influxdb/influxdb/shared/admin/fonts/glyphicons-halflings-regular.woff2 and /dev/null differ
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/shared/admin/img/influxdb-light400.png b/Godeps/_workspace/src/github.com/influxdb/influxdb/shared/admin/img/influxdb-light400.png
deleted file mode 100644
index c5cef420a..000000000
Binary files a/Godeps/_workspace/src/github.com/influxdb/influxdb/shared/admin/img/influxdb-light400.png and /dev/null differ
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/shared/admin/index.html b/Godeps/_workspace/src/github.com/influxdb/influxdb/shared/admin/index.html
deleted file mode 100644
index e69c4d321..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/shared/admin/index.html
+++ /dev/null
@@ -1,198 +0,0 @@
-<!doctype html>
-<html lang="en">
-<head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <meta name="description" content="">
-    <meta name="author" content="">
-
-    <title>InfluxDB - Admin Interface</title>
-
-    <!-- Bootstrap Core CSS -->
-    <link href="css/bootstrap.css" rel="stylesheet">
-    <link href="css/dropdowns-enhancement.css" rel="stylesheet">
-    <link href="css/admin.css" rel="stylesheet">
-
-</head>
-
-<body>
-    <div id="wrap">
-        <!-- Navigation -->
-        <nav class="navbar navbar-inverse navbar-fixed-top" role="navigation">
-            <div class="container">
-                <!-- Brand and toggle get grouped for better mobile display -->
-                <div class="navbar-header">
-                    <a class="navbar-brand" href="#">
-                        <img src="img/influxdb-light400.png" style="height:28px; margin-top:-4px;" />
-                    </a>
-                </div>
-                <!-- Collect the nav links, forms, and other content for toggling -->
-                <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
-                    <ul class="nav navbar-nav">
-                        <li>
-                            <a href="#" data-toggle="modal" data-target="#myModal">Write Data</a>
-                        </li>
-                    </ul>
-
-
-                    <ul class="nav navbar-nav navbar-right">
-                        <li class="dropdown">
-                            <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"><span>Database:</span> <span id="content-current-database">&hellip;</span> <span class="caret"></span></a>
-                            <ul class="dropdown-menu" id="content-database-list">
-                                <!-- Available databases will go here -->
-                            </ul>
-                        </li>
-
-                        <li>
-                            <a href="#" id="action-settings"><i class="glyphicon glyphicon-cog"></i></a>
-                        </li>
-                    </ul>
-                </div>
-                <!-- /.navbar-collapse -->
-
-            </div>
-            <!-- /.container -->
-        </nav>
-
-
-        <!-- Page Content -->
-        <div class="container">
-
-            <!-- Settings Pane -->
-            <div id="settings">
-                <div class="panel panel-info">
-                    <div class="panel-heading">
-                        <h3 class="panel-title">Connection Settings</h3>
-                    </div>
-                    <div class="panel-body">
-                        <form class="form-inline" id="form-settings">
-                            <div class="form-group">
-                                <label for="hostname">Host</label>
-                                <input type="text" class="form-control" id="hostname" placeholder="localhost">
-                            </div>
-
-                            <div class="form-group">
-                                <label for="port">Port</label>
-                                <input type="text" class="form-control" id="port" placeholder="8086" />
-                            </div>
-
-                            <div class="form-group">
-                                <label for="username">Username</label>
-                                <input type="text" class="form-control" id="username" placeholder="">
-                            </div>
-
-                            <div class="form-group">
-                                <label for="password">Password</label>
-                                <input type="text" class="form-control" id="password" placeholder="">
-                            </div>
-
-                            <div class="checkbox form-group">
-                                <label>
-                                    <input type="checkbox" id="ssl"> SSL
-                                </label>
-                            </div>
-                            <div class="form-group">
-                                <button type="submit" class="btn btn-default">Save</button>
-                            </div>
-                        </form>
-                    </div>
-                </div>
-            </div>
-
-          <div id="queries"></div>
-            <div class="row">
-                <div class="col-sm-12" id="content">
-                    <form id="query-form">
-                        <div class="form-group">
-                            <div class="input-group">
-                                <label class="input-group-addon">Query: </label>
-                                <input type="text" class="form-control" id="query" style="width:100%">
-                            </div>
-                        </div>
-                    </form>
-                </div>
-            </div>
-            <div class="row">
-                <div class="col-sm-12" id="content">
-
-                    <div class="dropdown text-right" id="template-container">
-                        <button class="btn btn-default dropdown-toggle" id="dropdown-templates" data-toggle="dropdown">Query Templates <span class="caret"></span> </button>
-                        <ul class="dropdown-menu pull-right" id="action-template">
-                          <li><label data-query="SHOW DATABASES">Show Databases</label></li>
-                          <li><label data-query="CREATE DATABASE &quot;db_name&quot;">Create Database</label></li>
-                          <li><label data-query="DROP DATABASE &quot;db_name&quot;">Drop Database</label></li>
-                          <li class="divider"></li>
-                          <li><label data-query="SHOW MEASUREMENTS">Show Measurements</label></li>
-                          <li><label data-query="SHOW TAG KEYS FROM &quot;measurement_name&quot;">Show Tag Keys</label></li>
-                          <li><label data-query="SHOW TAG VALUES FROM &quot;measurement_name&quot; WITH KEY = &quot;tag_key&quot;">Show Tag Values</label></li>
-                          <li class="divider"></li>
-                          <li><label data-query="SHOW RETENTION POLICIES ON &quot;db_name&quot;">Show Retention Policies</label></li>
-                          <li><label data-query="CREATE RETENTION POLICY &quot;rp_name&quot; ON &quot;db_name&quot; DURATION 30d REPLICATION 1 DEFAULT">Create Retention Policy</label></li>
-                          <li><label data-query="DROP RETENTION POLICY &quot;rp_name&quot;">Drop Retention Policy</label></li>
-                          <li class="divider"></li>
-                          <li><label data-query="SHOW USERS">Show Users</label></li>
-                          <li><label data-query="CREATE USER &quot;username&quot; WITH PASSWORD 'password'">Create User</label></li>
-                          <li><label data-query="CREATE USER &quot;username&quot; WITH PASSWORD 'password' WITH ALL PRIVILEGES">Create Admin User</label></li>
-                          <li><label data-query="DROP USER &quot;username&quot;">Drop User</label></li>
-                        </ul>
-                    </div>
-                </div>
-            </div>
-
-            <div class="row" id="query-alerts">
-                <div class="col-sm-12">
-                    <div class="alert alert-danger" id="query-error"></div>
-                    <div class="alert alert-success" id="query-success"></div>
-                    <div class="alert alert-warning" id="database-warning"></div>
-                </div>
-                <div class="col-sm-12" id="alert"></div>
-            </div>
-
-            <div class="row">
-                <div class="col-sm-12" id="table"></div>
-            </div>
-
-            <div id="push"></div>
-        </div>
-    </div>
-
-    <!-- /.container -->
-    <div id="footer">
-      <div class="container">
-          <p class="text-muted text-right credit"><b>InfluxDB</b> v0.9.3</p>
-      </div>
-    </div>
-
-    <!-- Modal -->
-    <div class="modal fade" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
-      <div class="modal-dialog" role="document">
-        <div class="modal-content">
-          <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-            <h4 class="modal-title" id="myModalLabel">Write Data to InfluxDB</h4>
-          </div>
-          <div class="modal-body">
-              <form>
-                  <div class="form-group">
-                      <textarea class="form-control" id="content-data"></textarea>
-                  </div>
-              </form>
-              <div class="alert alert-danger" role="alert" id="modal-error"></div>
-              <div class="alert alert-success" role="alert" id="modal-success"></div>
-          </div>
-          <div class="modal-footer">
-            <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
-            <button type="button" class="btn btn-primary" id="action-send">Send Data</button>
-          </div>
-        </div>
-      </div>
-    </div>
-
-    <script src="js/vendor/react-0.13.3.min.js"></script>
-    <script src="js/vendor/jquery-2.1.4.min.js"></script>
-    <script src="js/vendor/bootstrap-3.3.5.min.js"></script>
-    <script src="js/admin.js"></script>
-</body>
-
-</html>
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/shared/admin/js/admin.js b/Godeps/_workspace/src/github.com/influxdb/influxdb/shared/admin/js/admin.js
deleted file mode 100644
index 7a2442ee9..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/shared/admin/js/admin.js
+++ /dev/null
@@ -1,466 +0,0 @@
-// allow the user to store recent queries for quick retrieval
-var recentQueries = [];
-var queryPointer = null;
-
-// keep track of the databases that exist on the server
-var availableDatabases = [];
-var currentlySelectedDatabase = null;
-
-// connection settings for the server, with sensible defaults
-var connectionSettings = {
-    hostname: (window.location.hostname ? window.location.hostname: "localhost"),
-    port: "8086",
-    username: "",
-    password: "",
-    ssl: ('https:' == window.location.protocol ? true : false)
-}
-
-var connectionString = function() {
-    var protocol = (connectionSettings.ssl ? "https" : "http");
-    var host = connectionSettings.hostname + ":" + connectionSettings.port;
-
-    if (connectionSettings.username !== "") {
-        $.ajaxSetup({
-            headers: {
-                'Authorization': "Basic " + btoa(connectionSettings.username + ":" + connectionSettings.password)
-            }
-        });
-    }
-
-    return protocol + "://" + host;
-}
-
-var getSeriesFromJSON = function(data) {
-    var results = data.results[0].series;
-    return results;
-}
-
-// gets settings from the browser's localStorage and sets defaults if they aren't found
-var loadSettings = function() {
-    var cs = localStorage.getItem("connectionSettings");
-
-    if (cs != null) { connectionSettings = JSON.parse(cs); }
-
-    document.getElementById('hostname').value = connectionSettings.hostname;
-    document.getElementById('port').value = connectionSettings.port;
-    document.getElementById('username').value = connectionSettings.username;
-    document.getElementById('password').value = connectionSettings.password;
-    document.getElementById('ssl').checked = connectionSettings.ssl;
-
-    getDatabases();
-}
-
-var updateSettings = function() {
-    var hostname = document.getElementById('hostname').value;
-    var port = document.getElementById('port').value;
-    var username = document.getElementById('username').value;
-    var password = document.getElementById('password').value;
-    var ssl = document.getElementById('ssl').checked;
-
-    if (hostname == "") { hostname = "localhost"; }
-
-    if (port == "") { port = "8086"; }
-
-    connectionSettings.hostname = hostname;
-    connectionSettings.port     = port;
-    connectionSettings.username = username;
-    connectionSettings.password = password;
-    connectionSettings.ssl      = ssl;
-
-    localStorage.setItem("connectionSettings", JSON.stringify(connectionSettings));
-
-    getDatabases();
-}
-
-var showSettings = function() {
-    $("#settings").show();
-    $("input#query").prop('disabled', true);
-}
-
-var hideSettings = function() {
-    $("#settings").hide();
-    $("input#query").prop('disabled', false);
-}
-
-// hide errors within the Write Data modal
-var hideModalError = function() {
-    $("div#modal-error").empty().hide();
-}
-
-// show errors within the Write Data modal
-var showModalError = function(message) {
-    hideModalSuccess();
-
-    $("div#modal-error").html("<p>" + message + "</p>").show();
-}
-
-// hide success messages within the Write Data modal
-var hideModalSuccess = function() {
-    $("div#modal-success").empty().hide();
-}
-
-// show success messages within the Write Data modal
-var showModalSuccess = function(message) {
-    hideModalError();
-
-    $("div#modal-success").html("<p>" + message + "</p>").show();
-}
-
-// hide errors from queries
-var hideQueryError = function() {
-    $("div#query-error").empty().hide();
-}
-
-// show errors from queries
-var showQueryError = function(message) {
-    hideQuerySuccess();
-
-    $("div#query-error").html("<p>" + message + "</p>").show();
-}
-
-// hide success messages from queries
-var hideQuerySuccess = function() {
-    $("div#query-success").empty().hide();
-}
-
-// show success messages from queries
-var showQuerySuccess = function(message) {
-    hideQueryError();
-
-    $("div#query-success").html("<p>" + message + "</p>").show();
-}
-
-// hide warning from database lookup
-var hideDatabaseWarning = function() {
-    $("div#database-warning").empty().hide();
-}
-
-// show warning from database lookup
-var showDatabaseWarning = function(message) {
-    $("div#database-warning").html("<p>" + message + "</p>").show();
-}
-
-// clear out the results table
-var clearResults = function() {
-    $("div#table").empty();
-}
-
-// handle submissions of the query bar
-var handleSubmit = function(e) {
-    var queryElement = document.getElementById('query');
-    var q = queryElement.value;
-
-    clearResults();
-
-    if (q == "") { return };
-
-    var query = $.get(connectionString() + "/query", {q: q, db: currentlySelectedDatabase}, function() {
-        hideQueryError();
-        hideQuerySuccess();
-    });
-
-    recentQueries.push(q);
-    queryPointer = recentQueries.length - 1;
-
-    query.fail(handleRequestError);
-
-    query.done(function (data) {
-        var firstRow = data.results[0];
-        if (firstRow.error) {
-            showQueryError("Server returned error: " + firstRow.error);
-            return
-        }
-
-        var series = getSeriesFromJSON(data);
-
-        if (series == null) {
-            showQuerySuccess("Success! (no results to display)");
-            getDatabases();
-            return
-        }
-
-        var values = series[0].values;
-
-        if ((values == null) || (values.length == 0)) {
-            showQueryError("Query returned no results!");
-        } else {
-            availableDatabases = values.map(function(value) {
-                return value[0];
-            });
-
-            hideDatabaseWarning();
-            React.render(
-              React.createElement(DataTable, {series: series}),
-              document.getElementById('table')
-            );
-        }
-    });
-
-    if (e != null) { e.preventDefault(); }
-    return false;
-};
-
-var handleRequestError = function(e) {
-    var errorText = e.status + " " + e.statusText;
-    showDatabaseWarning("Unable to fetch list of databases.");
-
-    if ("responseText" in e) {
-        try { errorText = "Server returned error: " + JSON.parse(e.responseText).error; } catch(e) {}
-    }
-
-    if (e.status == 400) {
-        hideSettings();
-    } else if (e.status == 401) {
-        if (errorText.indexOf("error authorizing query") > -1) {
-            hideSettings();
-            $("input#query").val("CREATE USER <username> WITH PASSWORD '<password>' WITH ALL PRIVILEGES").focus();
-        } else {
-            showSettings();
-            $("input#username").focus();
-        }
-    } else {
-        showSettings();
-        $("input#hostname").focus();
-        showDatabaseWarning("Hint: the InfluxDB API runs on port 8086 by default");
-        errorText = e.status + " " + e.statusText + " - Could not connect to " + connectionString();
-    }
-    showQueryError(errorText);
-};
-
-var handleKeypress = function(e) {
-    var queryElement = document.getElementById('query');
-
-    // key press == enter
-    if (e.keyCode == 13) {
-        e.preventDefault();
-        handleSubmit();
-        return false;
-    }
-
-    // if we don't have any recent queries, ignore the arrow keys
-    if (recentQueries.length == 0 ) { return }
-
-    // key press == up arrow
-    if (e.keyCode == 38) {
-        // TODO: stash the current query, if there is one?
-        if (queryPointer == recentQueries.length - 1) {
-            // this is buggy.
-            //recentQueries.push(queryElement.value);
-            //queryPointer = recentQueries.length - 1;
-        }
-
-        if (queryPointer != null && queryPointer > 0) {
-            queryPointer -= 1;
-            queryElement.value = recentQueries[queryPointer];
-        }
-    }
-
-    // key press == down arrow
-    if (e.keyCode == 40) {
-        if (queryPointer != null && queryPointer < recentQueries.length - 1) {
-            queryPointer += 1;
-            queryElement.value = recentQueries[queryPointer];
-        }
-    }
-};
-
-var QueryError = React.createClass({
-    render: function() {
-        return React.createElement("div", {className: "alert alert-danger"}, this.props.message)
-    }
-});
-
-var stringifyTags = function(tags) {
-    var tagStrings = [];
-
-    for(var index in tags) {
-        tagStrings.push(index + ":" + tags[index]);
-    }
-
-    return tagStrings.join(", ");
-}
-
-var DataTable = React.createClass({
-  render: function() {
-    var tables = this.props.series.map(function(series) {
-        return React.createElement("div", null,
-            React.createElement("h1", null, series.name),
-            React.createElement("h2", null, stringifyTags(series.tags)),
-            React.createElement("table", {className: "table"},
-                React.createElement(TableHeader, {data: series.columns}),
-                React.createElement(TableBody, {data: series})
-            )
-        );
-    });
-
-    return React.createElement("div", null, tables);
-  }
-});
-
-var TableHeader = React.createClass({
-    render: function() {
-        var headers = this.props.data.map(function(column) {
-            return React.createElement("th", null, column);
-        });
-
-        return React.createElement("tr", null, headers);
-    }
-});
-
-var TableBody = React.createClass({
-    render: function() {
-        if (this.props.data.values) {
-            var tableRows = this.props.data.values.map(function (row) {
-                return React.createElement(TableRow, {data: row});
-            });
-        }
-
-        return React.createElement("tbody", null, tableRows);
-    }
-});
-
-var TableRow = React.createClass({
-    render: function() {
-        var tableData = this.props.data.map(function (data, index) {
-            if (index == 0) {
-                return React.createElement("td", {className: "timestamp"}, null, data);
-            } else {
-                return React.createElement("td", null, pretty(data));
-            }
-        });
-
-        return React.createElement("tr", null, tableData);
-    }
-});
-
-var pretty = function(val) {
-    if (typeof val == 'string') {
-        return "\"" + val + "\"";
-    } else if (typeof val == 'boolean' ){
-        return val.toString();
-    } else {
-        return val;
-    }
-}
-
-var chooseDatabase = function (databaseName) {
-    currentlySelectedDatabase = databaseName;
-    document.getElementById("content-current-database").innerHTML = currentlySelectedDatabase;
-}
-
-var getDatabases = function () {
-    var q = "SHOW DATABASES";
-    var query = $.get(connectionString() + "/query", {q: q, db: currentlySelectedDatabase});
-
-    query.fail(handleRequestError);
-
-    query.done(function (data) {
-        hideSettings();
-        hideDatabaseWarning();
-
-        var firstRow = data.results[0];
-        if (firstRow.error) {
-            showDatabaseWarning(firstRow.error);
-            return;
-        }
-
-        var series = getSeriesFromJSON(data);
-        var values = series[0].values;
-
-        if ((values == null) || (values.length == 0)) {
-            availableDatabases = [];
-            updateDatabaseList();
-
-            showDatabaseWarning("No databases found.")
-        } else {
-            availableDatabases = values.map(function(value) {
-                return value[0];
-            }).sort();
-
-            if (currentlySelectedDatabase == null) {
-                chooseDatabase(availableDatabases[0]);
-            } else if (availableDatabases.indexOf(currentlySelectedDatabase) == -1) {
-                chooseDatabase(availableDatabases[0]);
-            }
-            updateDatabaseList();
-        }
-    });
-}
-
-var updateDatabaseList = function() {
-    var databaseList = $("ul#content-database-list");
-
-    databaseList.empty();
-    availableDatabases.forEach(function(database) {
-        var li = $("<li><a href=\"#\">" + database + "</a></li>");
-        databaseList.append(li);
-    });
-
-    if (availableDatabases.length == 0) {
-        document.getElementById("content-current-database").innerHTML = "&hellip;";
-    }
-}
-
-// when the page is ready, start everything up
-$(document).ready(function () {
-    loadSettings();
-
-    // bind to the settings cog in the navbar
-    $("#action-settings").click(function (e) {
-        $("#settings").toggle();
-    });
-
-    // bind to the save button in the settings form
-    $("#form-settings").submit(function (e) {
-        updateSettings();
-    });
-
-    // bind to the items in the query template dropdown
-    $("ul#action-template label").click(function (e) {
-        var el = $(e.target);
-        $("input#query").val(el.data("query")).focus();
-    });
-
-    $("ul#content-database-list").on("click", function(e) {
-        if (e.target.tagName != "A") { return; }
-
-        chooseDatabase(e.target.innerHTML);
-        e.preventDefault();
-    })
-
-    // load the Write Data modal
-    $("button#action-send").click(function (e) {
-        var data = $("textarea#content-data").val();
-
-        var startTime = new Date().getTime();
-        var write = $.post(connectionString() + "/write?db=" + currentlySelectedDatabase, data, function() {
-        });
-
-        write.fail(function (e) {
-            if (e.status == 400) {
-                showModalError("Failed to write: " + e.responseText)
-            }
-            else {
-                showModalError("Failed to contact server: " + e.statusText)
-            }
-        });
-
-        write.done(function (data) {
-            var endTime = new Date().getTime();
-            var elapsed = endTime - startTime;
-            showModalSuccess("Write succeeded. (" + elapsed + "ms)");
-        });
-
-    });
-
-    // handle submit actions on the query bar
-    var form = document.getElementById('query-form');
-    form.addEventListener("submit", handleSubmit);
-
-    // handle keypresses on the query bar so we can get arrow keys and enter
-    var query = document.getElementById('query');
-    query.addEventListener("keydown", handleKeypress);
-
-    // make sure we start out with the query bar in focus
-    document.getElementById('query').focus();
-})
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/shared/admin/js/vendor/bootstrap-3.3.5.min.js b/Godeps/_workspace/src/github.com/influxdb/influxdb/shared/admin/js/vendor/bootstrap-3.3.5.min.js
deleted file mode 100644
index 133aeecb9..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/shared/admin/js/vendor/bootstrap-3.3.5.min.js
+++ /dev/null
@@ -1,7 +0,0 @@
-/*!
- * Bootstrap v3.3.5 (http://getbootstrap.com)
- * Copyright 2011-2015 Twitter, Inc.
- * Licensed under the MIT license
- */
-if("undefined"==typeof jQuery)throw new Error("Bootstrap's JavaScript requires jQuery");+function(a){"use strict";var b=a.fn.jquery.split(" ")[0].split(".");if(b[0]<2&&b[1]<9||1==b[0]&&9==b[1]&&b[2]<1)throw new Error("Bootstrap's JavaScript requires jQuery version 1.9.1 or higher")}(jQuery),+function(a){"use strict";function b(){var a=document.createElement("bootstrap"),b={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd otransitionend",transition:"transitionend"};for(var c in b)if(void 0!==a.style[c])return{end:b[c]};return!1}a.fn.emulateTransitionEnd=function(b){var c=!1,d=this;a(this).one("bsTransitionEnd",function(){c=!0});var e=function(){c||a(d).trigger(a.support.transition.end)};return setTimeout(e,b),this},a(function(){a.support.transition=b(),a.support.transition&&(a.event.special.bsTransitionEnd={bindType:a.support.transition.end,delegateType:a.support.transition.end,handle:function(b){return a(b.target).is(this)?b.handleObj.handler.apply(this,arguments):void 0}})})}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var c=a(this),e=c.data("bs.alert");e||c.data("bs.alert",e=new d(this)),"string"==typeof b&&e[b].call(c)})}var c='[data-dismiss="alert"]',d=function(b){a(b).on("click",c,this.close)};d.VERSION="3.3.5",d.TRANSITION_DURATION=150,d.prototype.close=function(b){function c(){g.detach().trigger("closed.bs.alert").remove()}var e=a(this),f=e.attr("data-target");f||(f=e.attr("href"),f=f&&f.replace(/.*(?=#[^\s]*$)/,""));var g=a(f);b&&b.preventDefault(),g.length||(g=e.closest(".alert")),g.trigger(b=a.Event("close.bs.alert")),b.isDefaultPrevented()||(g.removeClass("in"),a.support.transition&&g.hasClass("fade")?g.one("bsTransitionEnd",c).emulateTransitionEnd(d.TRANSITION_DURATION):c())};var e=a.fn.alert;a.fn.alert=b,a.fn.alert.Constructor=d,a.fn.alert.noConflict=function(){return a.fn.alert=e,this},a(document).on("click.bs.alert.data-api",c,d.prototype.close)}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.button"),f="object"==typeof b&&b;e||d.data("bs.button",e=new c(this,f)),"toggle"==b?e.toggle():b&&e.setState(b)})}var c=function(b,d){this.$element=a(b),this.options=a.extend({},c.DEFAULTS,d),this.isLoading=!1};c.VERSION="3.3.5",c.DEFAULTS={loadingText:"loading..."},c.prototype.setState=function(b){var c="disabled",d=this.$element,e=d.is("input")?"val":"html",f=d.data();b+="Text",null==f.resetText&&d.data("resetText",d[e]()),setTimeout(a.proxy(function(){d[e](null==f[b]?this.options[b]:f[b]),"loadingText"==b?(this.isLoading=!0,d.addClass(c).attr(c,c)):this.isLoading&&(this.isLoading=!1,d.removeClass(c).removeAttr(c))},this),0)},c.prototype.toggle=function(){var a=!0,b=this.$element.closest('[data-toggle="buttons"]');if(b.length){var c=this.$element.find("input");"radio"==c.prop("type")?(c.prop("checked")&&(a=!1),b.find(".active").removeClass("active"),this.$element.addClass("active")):"checkbox"==c.prop("type")&&(c.prop("checked")!==this.$element.hasClass("active")&&(a=!1),this.$element.toggleClass("active")),c.prop("checked",this.$element.hasClass("active")),a&&c.trigger("change")}else this.$element.attr("aria-pressed",!this.$element.hasClass("active")),this.$element.toggleClass("active")};var d=a.fn.button;a.fn.button=b,a.fn.button.Constructor=c,a.fn.button.noConflict=function(){return a.fn.button=d,this},a(document).on("click.bs.button.data-api",'[data-toggle^="button"]',function(c){var d=a(c.target);d.hasClass("btn")||(d=d.closest(".btn")),b.call(d,"toggle"),a(c.target).is('input[type="radio"]')||a(c.target).is('input[type="checkbox"]')||c.preventDefault()}).on("focus.bs.button.data-api blur.bs.button.data-api",'[data-toggle^="button"]',function(b){a(b.target).closest(".btn").toggleClass("focus",/^focus(in)?$/.test(b.type))})}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.carousel"),f=a.extend({},c.DEFAULTS,d.data(),"object"==typeof b&&b),g="string"==typeof b?b:f.slide;e||d.data("bs.carousel",e=new c(this,f)),"number"==typeof b?e.to(b):g?e[g]():f.interval&&e.pause().cycle()})}var c=function(b,c){this.$element=a(b),this.$indicators=this.$element.find(".carousel-indicators"),this.options=c,this.paused=null,this.sliding=null,this.interval=null,this.$active=null,this.$items=null,this.options.keyboard&&this.$element.on("keydown.bs.carousel",a.proxy(this.keydown,this)),"hover"==this.options.pause&&!("ontouchstart"in document.documentElement)&&this.$element.on("mouseenter.bs.carousel",a.proxy(this.pause,this)).on("mouseleave.bs.carousel",a.proxy(this.cycle,this))};c.VERSION="3.3.5",c.TRANSITION_DURATION=600,c.DEFAULTS={interval:5e3,pause:"hover",wrap:!0,keyboard:!0},c.prototype.keydown=function(a){if(!/input|textarea/i.test(a.target.tagName)){switch(a.which){case 37:this.prev();break;case 39:this.next();break;default:return}a.preventDefault()}},c.prototype.cycle=function(b){return b||(this.paused=!1),this.interval&&clearInterval(this.interval),this.options.interval&&!this.paused&&(this.interval=setInterval(a.proxy(this.next,this),this.options.interval)),this},c.prototype.getItemIndex=function(a){return this.$items=a.parent().children(".item"),this.$items.index(a||this.$active)},c.prototype.getItemForDirection=function(a,b){var c=this.getItemIndex(b),d="prev"==a&&0===c||"next"==a&&c==this.$items.length-1;if(d&&!this.options.wrap)return b;var e="prev"==a?-1:1,f=(c+e)%this.$items.length;return this.$items.eq(f)},c.prototype.to=function(a){var b=this,c=this.getItemIndex(this.$active=this.$element.find(".item.active"));return a>this.$items.length-1||0>a?void 0:this.sliding?this.$element.one("slid.bs.carousel",function(){b.to(a)}):c==a?this.pause().cycle():this.slide(a>c?"next":"prev",this.$items.eq(a))},c.prototype.pause=function(b){return b||(this.paused=!0),this.$element.find(".next, .prev").length&&a.support.transition&&(this.$element.trigger(a.support.transition.end),this.cycle(!0)),this.interval=clearInterval(this.interval),this},c.prototype.next=function(){return this.sliding?void 0:this.slide("next")},c.prototype.prev=function(){return this.sliding?void 0:this.slide("prev")},c.prototype.slide=function(b,d){var e=this.$element.find(".item.active"),f=d||this.getItemForDirection(b,e),g=this.interval,h="next"==b?"left":"right",i=this;if(f.hasClass("active"))return this.sliding=!1;var j=f[0],k=a.Event("slide.bs.carousel",{relatedTarget:j,direction:h});if(this.$element.trigger(k),!k.isDefaultPrevented()){if(this.sliding=!0,g&&this.pause(),this.$indicators.length){this.$indicators.find(".active").removeClass("active");var l=a(this.$indicators.children()[this.getItemIndex(f)]);l&&l.addClass("active")}var m=a.Event("slid.bs.carousel",{relatedTarget:j,direction:h});return a.support.transition&&this.$element.hasClass("slide")?(f.addClass(b),f[0].offsetWidth,e.addClass(h),f.addClass(h),e.one("bsTransitionEnd",function(){f.removeClass([b,h].join(" ")).addClass("active"),e.removeClass(["active",h].join(" ")),i.sliding=!1,setTimeout(function(){i.$element.trigger(m)},0)}).emulateTransitionEnd(c.TRANSITION_DURATION)):(e.removeClass("active"),f.addClass("active"),this.sliding=!1,this.$element.trigger(m)),g&&this.cycle(),this}};var d=a.fn.carousel;a.fn.carousel=b,a.fn.carousel.Constructor=c,a.fn.carousel.noConflict=function(){return a.fn.carousel=d,this};var e=function(c){var d,e=a(this),f=a(e.attr("data-target")||(d=e.attr("href"))&&d.replace(/.*(?=#[^\s]+$)/,""));if(f.hasClass("carousel")){var g=a.extend({},f.data(),e.data()),h=e.attr("data-slide-to");h&&(g.interval=!1),b.call(f,g),h&&f.data("bs.carousel").to(h),c.preventDefault()}};a(document).on("click.bs.carousel.data-api","[data-slide]",e).on("click.bs.carousel.data-api","[data-slide-to]",e),a(window).on("load",function(){a('[data-ride="carousel"]').each(function(){var c=a(this);b.call(c,c.data())})})}(jQuery),+function(a){"use strict";function b(b){var c,d=b.attr("data-target")||(c=b.attr("href"))&&c.replace(/.*(?=#[^\s]+$)/,"");return a(d)}function c(b){return this.each(function(){var c=a(this),e=c.data("bs.collapse"),f=a.extend({},d.DEFAULTS,c.data(),"object"==typeof b&&b);!e&&f.toggle&&/show|hide/.test(b)&&(f.toggle=!1),e||c.data("bs.collapse",e=new d(this,f)),"string"==typeof b&&e[b]()})}var d=function(b,c){this.$element=a(b),this.options=a.extend({},d.DEFAULTS,c),this.$trigger=a('[data-toggle="collapse"][href="#'+b.id+'"],[data-toggle="collapse"][data-target="#'+b.id+'"]'),this.transitioning=null,this.options.parent?this.$parent=this.getParent():this.addAriaAndCollapsedClass(this.$element,this.$trigger),this.options.toggle&&this.toggle()};d.VERSION="3.3.5",d.TRANSITION_DURATION=350,d.DEFAULTS={toggle:!0},d.prototype.dimension=function(){var a=this.$element.hasClass("width");return a?"width":"height"},d.prototype.show=function(){if(!this.transitioning&&!this.$element.hasClass("in")){var b,e=this.$parent&&this.$parent.children(".panel").children(".in, .collapsing");if(!(e&&e.length&&(b=e.data("bs.collapse"),b&&b.transitioning))){var f=a.Event("show.bs.collapse");if(this.$element.trigger(f),!f.isDefaultPrevented()){e&&e.length&&(c.call(e,"hide"),b||e.data("bs.collapse",null));var g=this.dimension();this.$element.removeClass("collapse").addClass("collapsing")[g](0).attr("aria-expanded",!0),this.$trigger.removeClass("collapsed").attr("aria-expanded",!0),this.transitioning=1;var h=function(){this.$element.removeClass("collapsing").addClass("collapse in")[g](""),this.transitioning=0,this.$element.trigger("shown.bs.collapse")};if(!a.support.transition)return h.call(this);var i=a.camelCase(["scroll",g].join("-"));this.$element.one("bsTransitionEnd",a.proxy(h,this)).emulateTransitionEnd(d.TRANSITION_DURATION)[g](this.$element[0][i])}}}},d.prototype.hide=function(){if(!this.transitioning&&this.$element.hasClass("in")){var b=a.Event("hide.bs.collapse");if(this.$element.trigger(b),!b.isDefaultPrevented()){var c=this.dimension();this.$element[c](this.$element[c]())[0].offsetHeight,this.$element.addClass("collapsing").removeClass("collapse in").attr("aria-expanded",!1),this.$trigger.addClass("collapsed").attr("aria-expanded",!1),this.transitioning=1;var e=function(){this.transitioning=0,this.$element.removeClass("collapsing").addClass("collapse").trigger("hidden.bs.collapse")};return a.support.transition?void this.$element[c](0).one("bsTransitionEnd",a.proxy(e,this)).emulateTransitionEnd(d.TRANSITION_DURATION):e.call(this)}}},d.prototype.toggle=function(){this[this.$element.hasClass("in")?"hide":"show"]()},d.prototype.getParent=function(){return a(this.options.parent).find('[data-toggle="collapse"][data-parent="'+this.options.parent+'"]').each(a.proxy(function(c,d){var e=a(d);this.addAriaAndCollapsedClass(b(e),e)},this)).end()},d.prototype.addAriaAndCollapsedClass=function(a,b){var c=a.hasClass("in");a.attr("aria-expanded",c),b.toggleClass("collapsed",!c).attr("aria-expanded",c)};var e=a.fn.collapse;a.fn.collapse=c,a.fn.collapse.Constructor=d,a.fn.collapse.noConflict=function(){return a.fn.collapse=e,this},a(document).on("click.bs.collapse.data-api",'[data-toggle="collapse"]',function(d){var e=a(this);e.attr("data-target")||d.preventDefault();var f=b(e),g=f.data("bs.collapse"),h=g?"toggle":e.data();c.call(f,h)})}(jQuery),+function(a){"use strict";function b(b){var c=b.attr("data-target");c||(c=b.attr("href"),c=c&&/#[A-Za-z]/.test(c)&&c.replace(/.*(?=#[^\s]*$)/,""));var d=c&&a(c);return d&&d.length?d:b.parent()}function c(c){c&&3===c.which||(a(e).remove(),a(f).each(function(){var d=a(this),e=b(d),f={relatedTarget:this};e.hasClass("open")&&(c&&"click"==c.type&&/input|textarea/i.test(c.target.tagName)&&a.contains(e[0],c.target)||(e.trigger(c=a.Event("hide.bs.dropdown",f)),c.isDefaultPrevented()||(d.attr("aria-expanded","false"),e.removeClass("open").trigger("hidden.bs.dropdown",f))))}))}function d(b){return this.each(function(){var c=a(this),d=c.data("bs.dropdown");d||c.data("bs.dropdown",d=new g(this)),"string"==typeof b&&d[b].call(c)})}var e=".dropdown-backdrop",f='[data-toggle="dropdown"]',g=function(b){a(b).on("click.bs.dropdown",this.toggle)};g.VERSION="3.3.5",g.prototype.toggle=function(d){var e=a(this);if(!e.is(".disabled, :disabled")){var f=b(e),g=f.hasClass("open");if(c(),!g){"ontouchstart"in document.documentElement&&!f.closest(".navbar-nav").length&&a(document.createElement("div")).addClass("dropdown-backdrop").insertAfter(a(this)).on("click",c);var h={relatedTarget:this};if(f.trigger(d=a.Event("show.bs.dropdown",h)),d.isDefaultPrevented())return;e.trigger("focus").attr("aria-expanded","true"),f.toggleClass("open").trigger("shown.bs.dropdown",h)}return!1}},g.prototype.keydown=function(c){if(/(38|40|27|32)/.test(c.which)&&!/input|textarea/i.test(c.target.tagName)){var d=a(this);if(c.preventDefault(),c.stopPropagation(),!d.is(".disabled, :disabled")){var e=b(d),g=e.hasClass("open");if(!g&&27!=c.which||g&&27==c.which)return 27==c.which&&e.find(f).trigger("focus"),d.trigger("click");var h=" li:not(.disabled):visible a",i=e.find(".dropdown-menu"+h);if(i.length){var j=i.index(c.target);38==c.which&&j>0&&j--,40==c.which&&j<i.length-1&&j++,~j||(j=0),i.eq(j).trigger("focus")}}}};var h=a.fn.dropdown;a.fn.dropdown=d,a.fn.dropdown.Constructor=g,a.fn.dropdown.noConflict=function(){return a.fn.dropdown=h,this},a(document).on("click.bs.dropdown.data-api",c).on("click.bs.dropdown.data-api",".dropdown form",function(a){a.stopPropagation()}).on("click.bs.dropdown.data-api",f,g.prototype.toggle).on("keydown.bs.dropdown.data-api",f,g.prototype.keydown).on("keydown.bs.dropdown.data-api",".dropdown-menu",g.prototype.keydown)}(jQuery),+function(a){"use strict";function b(b,d){return this.each(function(){var e=a(this),f=e.data("bs.modal"),g=a.extend({},c.DEFAULTS,e.data(),"object"==typeof b&&b);f||e.data("bs.modal",f=new c(this,g)),"string"==typeof b?f[b](d):g.show&&f.show(d)})}var c=function(b,c){this.options=c,this.$body=a(document.body),this.$element=a(b),this.$dialog=this.$element.find(".modal-dialog"),this.$backdrop=null,this.isShown=null,this.originalBodyPad=null,this.scrollbarWidth=0,this.ignoreBackdropClick=!1,this.options.remote&&this.$element.find(".modal-content").load(this.options.remote,a.proxy(function(){this.$element.trigger("loaded.bs.modal")},this))};c.VERSION="3.3.5",c.TRANSITION_DURATION=300,c.BACKDROP_TRANSITION_DURATION=150,c.DEFAULTS={backdrop:!0,keyboard:!0,show:!0},c.prototype.toggle=function(a){return this.isShown?this.hide():this.show(a)},c.prototype.show=function(b){var d=this,e=a.Event("show.bs.modal",{relatedTarget:b});this.$element.trigger(e),this.isShown||e.isDefaultPrevented()||(this.isShown=!0,this.checkScrollbar(),this.setScrollbar(),this.$body.addClass("modal-open"),this.escape(),this.resize(),this.$element.on("click.dismiss.bs.modal",'[data-dismiss="modal"]',a.proxy(this.hide,this)),this.$dialog.on("mousedown.dismiss.bs.modal",function(){d.$element.one("mouseup.dismiss.bs.modal",function(b){a(b.target).is(d.$element)&&(d.ignoreBackdropClick=!0)})}),this.backdrop(function(){var e=a.support.transition&&d.$element.hasClass("fade");d.$element.parent().length||d.$element.appendTo(d.$body),d.$element.show().scrollTop(0),d.adjustDialog(),e&&d.$element[0].offsetWidth,d.$element.addClass("in"),d.enforceFocus();var f=a.Event("shown.bs.modal",{relatedTarget:b});e?d.$dialog.one("bsTransitionEnd",function(){d.$element.trigger("focus").trigger(f)}).emulateTransitionEnd(c.TRANSITION_DURATION):d.$element.trigger("focus").trigger(f)}))},c.prototype.hide=function(b){b&&b.preventDefault(),b=a.Event("hide.bs.modal"),this.$element.trigger(b),this.isShown&&!b.isDefaultPrevented()&&(this.isShown=!1,this.escape(),this.resize(),a(document).off("focusin.bs.modal"),this.$element.removeClass("in").off("click.dismiss.bs.modal").off("mouseup.dismiss.bs.modal"),this.$dialog.off("mousedown.dismiss.bs.modal"),a.support.transition&&this.$element.hasClass("fade")?this.$element.one("bsTransitionEnd",a.proxy(this.hideModal,this)).emulateTransitionEnd(c.TRANSITION_DURATION):this.hideModal())},c.prototype.enforceFocus=function(){a(document).off("focusin.bs.modal").on("focusin.bs.modal",a.proxy(function(a){this.$element[0]===a.target||this.$element.has(a.target).length||this.$element.trigger("focus")},this))},c.prototype.escape=function(){this.isShown&&this.options.keyboard?this.$element.on("keydown.dismiss.bs.modal",a.proxy(function(a){27==a.which&&this.hide()},this)):this.isShown||this.$element.off("keydown.dismiss.bs.modal")},c.prototype.resize=function(){this.isShown?a(window).on("resize.bs.modal",a.proxy(this.handleUpdate,this)):a(window).off("resize.bs.modal")},c.prototype.hideModal=function(){var a=this;this.$element.hide(),this.backdrop(function(){a.$body.removeClass("modal-open"),a.resetAdjustments(),a.resetScrollbar(),a.$element.trigger("hidden.bs.modal")})},c.prototype.removeBackdrop=function(){this.$backdrop&&this.$backdrop.remove(),this.$backdrop=null},c.prototype.backdrop=function(b){var d=this,e=this.$element.hasClass("fade")?"fade":"";if(this.isShown&&this.options.backdrop){var f=a.support.transition&&e;if(this.$backdrop=a(document.createElement("div")).addClass("modal-backdrop "+e).appendTo(this.$body),this.$element.on("click.dismiss.bs.modal",a.proxy(function(a){return this.ignoreBackdropClick?void(this.ignoreBackdropClick=!1):void(a.target===a.currentTarget&&("static"==this.options.backdrop?this.$element[0].focus():this.hide()))},this)),f&&this.$backdrop[0].offsetWidth,this.$backdrop.addClass("in"),!b)return;f?this.$backdrop.one("bsTransitionEnd",b).emulateTransitionEnd(c.BACKDROP_TRANSITION_DURATION):b()}else if(!this.isShown&&this.$backdrop){this.$backdrop.removeClass("in");var g=function(){d.removeBackdrop(),b&&b()};a.support.transition&&this.$element.hasClass("fade")?this.$backdrop.one("bsTransitionEnd",g).emulateTransitionEnd(c.BACKDROP_TRANSITION_DURATION):g()}else b&&b()},c.prototype.handleUpdate=function(){this.adjustDialog()},c.prototype.adjustDialog=function(){var a=this.$element[0].scrollHeight>document.documentElement.clientHeight;this.$element.css({paddingLeft:!this.bodyIsOverflowing&&a?this.scrollbarWidth:"",paddingRight:this.bodyIsOverflowing&&!a?this.scrollbarWidth:""})},c.prototype.resetAdjustments=function(){this.$element.css({paddingLeft:"",paddingRight:""})},c.prototype.checkScrollbar=function(){var a=window.innerWidth;if(!a){var b=document.documentElement.getBoundingClientRect();a=b.right-Math.abs(b.left)}this.bodyIsOverflowing=document.body.clientWidth<a,this.scrollbarWidth=this.measureScrollbar()},c.prototype.setScrollbar=function(){var a=parseInt(this.$body.css("padding-right")||0,10);this.originalBodyPad=document.body.style.paddingRight||"",this.bodyIsOverflowing&&this.$body.css("padding-right",a+this.scrollbarWidth)},c.prototype.resetScrollbar=function(){this.$body.css("padding-right",this.originalBodyPad)},c.prototype.measureScrollbar=function(){var a=document.createElement("div");a.className="modal-scrollbar-measure",this.$body.append(a);var b=a.offsetWidth-a.clientWidth;return this.$body[0].removeChild(a),b};var d=a.fn.modal;a.fn.modal=b,a.fn.modal.Constructor=c,a.fn.modal.noConflict=function(){return a.fn.modal=d,this},a(document).on("click.bs.modal.data-api",'[data-toggle="modal"]',function(c){var d=a(this),e=d.attr("href"),f=a(d.attr("data-target")||e&&e.replace(/.*(?=#[^\s]+$)/,"")),g=f.data("bs.modal")?"toggle":a.extend({remote:!/#/.test(e)&&e},f.data(),d.data());d.is("a")&&c.preventDefault(),f.one("show.bs.modal",function(a){a.isDefaultPrevented()||f.one("hidden.bs.modal",function(){d.is(":visible")&&d.trigger("focus")})}),b.call(f,g,this)})}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.tooltip"),f="object"==typeof b&&b;(e||!/destroy|hide/.test(b))&&(e||d.data("bs.tooltip",e=new c(this,f)),"string"==typeof b&&e[b]())})}var c=function(a,b){this.type=null,this.options=null,this.enabled=null,this.timeout=null,this.hoverState=null,this.$element=null,this.inState=null,this.init("tooltip",a,b)};c.VERSION="3.3.5",c.TRANSITION_DURATION=150,c.DEFAULTS={animation:!0,placement:"top",selector:!1,template:'<div class="tooltip" role="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>',trigger:"hover focus",title:"",delay:0,html:!1,container:!1,viewport:{selector:"body",padding:0}},c.prototype.init=function(b,c,d){if(this.enabled=!0,this.type=b,this.$element=a(c),this.options=this.getOptions(d),this.$viewport=this.options.viewport&&a(a.isFunction(this.options.viewport)?this.options.viewport.call(this,this.$element):this.options.viewport.selector||this.options.viewport),this.inState={click:!1,hover:!1,focus:!1},this.$element[0]instanceof document.constructor&&!this.options.selector)throw new Error("`selector` option must be specified when initializing "+this.type+" on the window.document object!");for(var e=this.options.trigger.split(" "),f=e.length;f--;){var g=e[f];if("click"==g)this.$element.on("click."+this.type,this.options.selector,a.proxy(this.toggle,this));else if("manual"!=g){var h="hover"==g?"mouseenter":"focusin",i="hover"==g?"mouseleave":"focusout";this.$element.on(h+"."+this.type,this.options.selector,a.proxy(this.enter,this)),this.$element.on(i+"."+this.type,this.options.selector,a.proxy(this.leave,this))}}this.options.selector?this._options=a.extend({},this.options,{trigger:"manual",selector:""}):this.fixTitle()},c.prototype.getDefaults=function(){return c.DEFAULTS},c.prototype.getOptions=function(b){return b=a.extend({},this.getDefaults(),this.$element.data(),b),b.delay&&"number"==typeof b.delay&&(b.delay={show:b.delay,hide:b.delay}),b},c.prototype.getDelegateOptions=function(){var b={},c=this.getDefaults();return this._options&&a.each(this._options,function(a,d){c[a]!=d&&(b[a]=d)}),b},c.prototype.enter=function(b){var c=b instanceof this.constructor?b:a(b.currentTarget).data("bs."+this.type);return c||(c=new this.constructor(b.currentTarget,this.getDelegateOptions()),a(b.currentTarget).data("bs."+this.type,c)),b instanceof a.Event&&(c.inState["focusin"==b.type?"focus":"hover"]=!0),c.tip().hasClass("in")||"in"==c.hoverState?void(c.hoverState="in"):(clearTimeout(c.timeout),c.hoverState="in",c.options.delay&&c.options.delay.show?void(c.timeout=setTimeout(function(){"in"==c.hoverState&&c.show()},c.options.delay.show)):c.show())},c.prototype.isInStateTrue=function(){for(var a in this.inState)if(this.inState[a])return!0;return!1},c.prototype.leave=function(b){var c=b instanceof this.constructor?b:a(b.currentTarget).data("bs."+this.type);return c||(c=new this.constructor(b.currentTarget,this.getDelegateOptions()),a(b.currentTarget).data("bs."+this.type,c)),b instanceof a.Event&&(c.inState["focusout"==b.type?"focus":"hover"]=!1),c.isInStateTrue()?void 0:(clearTimeout(c.timeout),c.hoverState="out",c.options.delay&&c.options.delay.hide?void(c.timeout=setTimeout(function(){"out"==c.hoverState&&c.hide()},c.options.delay.hide)):c.hide())},c.prototype.show=function(){var b=a.Event("show.bs."+this.type);if(this.hasContent()&&this.enabled){this.$element.trigger(b);var d=a.contains(this.$element[0].ownerDocument.documentElement,this.$element[0]);if(b.isDefaultPrevented()||!d)return;var e=this,f=this.tip(),g=this.getUID(this.type);this.setContent(),f.attr("id",g),this.$element.attr("aria-describedby",g),this.options.animation&&f.addClass("fade");var h="function"==typeof this.options.placement?this.options.placement.call(this,f[0],this.$element[0]):this.options.placement,i=/\s?auto?\s?/i,j=i.test(h);j&&(h=h.replace(i,"")||"top"),f.detach().css({top:0,left:0,display:"block"}).addClass(h).data("bs."+this.type,this),this.options.container?f.appendTo(this.options.container):f.insertAfter(this.$element),this.$element.trigger("inserted.bs."+this.type);var k=this.getPosition(),l=f[0].offsetWidth,m=f[0].offsetHeight;if(j){var n=h,o=this.getPosition(this.$viewport);h="bottom"==h&&k.bottom+m>o.bottom?"top":"top"==h&&k.top-m<o.top?"bottom":"right"==h&&k.right+l>o.width?"left":"left"==h&&k.left-l<o.left?"right":h,f.removeClass(n).addClass(h)}var p=this.getCalculatedOffset(h,k,l,m);this.applyPlacement(p,h);var q=function(){var a=e.hoverState;e.$element.trigger("shown.bs."+e.type),e.hoverState=null,"out"==a&&e.leave(e)};a.support.transition&&this.$tip.hasClass("fade")?f.one("bsTransitionEnd",q).emulateTransitionEnd(c.TRANSITION_DURATION):q()}},c.prototype.applyPlacement=function(b,c){var d=this.tip(),e=d[0].offsetWidth,f=d[0].offsetHeight,g=parseInt(d.css("margin-top"),10),h=parseInt(d.css("margin-left"),10);isNaN(g)&&(g=0),isNaN(h)&&(h=0),b.top+=g,b.left+=h,a.offset.setOffset(d[0],a.extend({using:function(a){d.css({top:Math.round(a.top),left:Math.round(a.left)})}},b),0),d.addClass("in");var i=d[0].offsetWidth,j=d[0].offsetHeight;"top"==c&&j!=f&&(b.top=b.top+f-j);var k=this.getViewportAdjustedDelta(c,b,i,j);k.left?b.left+=k.left:b.top+=k.top;var l=/top|bottom/.test(c),m=l?2*k.left-e+i:2*k.top-f+j,n=l?"offsetWidth":"offsetHeight";d.offset(b),this.replaceArrow(m,d[0][n],l)},c.prototype.replaceArrow=function(a,b,c){this.arrow().css(c?"left":"top",50*(1-a/b)+"%").css(c?"top":"left","")},c.prototype.setContent=function(){var a=this.tip(),b=this.getTitle();a.find(".tooltip-inner")[this.options.html?"html":"text"](b),a.removeClass("fade in top bottom left right")},c.prototype.hide=function(b){function d(){"in"!=e.hoverState&&f.detach(),e.$element.removeAttr("aria-describedby").trigger("hidden.bs."+e.type),b&&b()}var e=this,f=a(this.$tip),g=a.Event("hide.bs."+this.type);return this.$element.trigger(g),g.isDefaultPrevented()?void 0:(f.removeClass("in"),a.support.transition&&f.hasClass("fade")?f.one("bsTransitionEnd",d).emulateTransitionEnd(c.TRANSITION_DURATION):d(),this.hoverState=null,this)},c.prototype.fixTitle=function(){var a=this.$element;(a.attr("title")||"string"!=typeof a.attr("data-original-title"))&&a.attr("data-original-title",a.attr("title")||"").attr("title","")},c.prototype.hasContent=function(){return this.getTitle()},c.prototype.getPosition=function(b){b=b||this.$element;var c=b[0],d="BODY"==c.tagName,e=c.getBoundingClientRect();null==e.width&&(e=a.extend({},e,{width:e.right-e.left,height:e.bottom-e.top}));var f=d?{top:0,left:0}:b.offset(),g={scroll:d?document.documentElement.scrollTop||document.body.scrollTop:b.scrollTop()},h=d?{width:a(window).width(),height:a(window).height()}:null;return a.extend({},e,g,h,f)},c.prototype.getCalculatedOffset=function(a,b,c,d){return"bottom"==a?{top:b.top+b.height,left:b.left+b.width/2-c/2}:"top"==a?{top:b.top-d,left:b.left+b.width/2-c/2}:"left"==a?{top:b.top+b.height/2-d/2,left:b.left-c}:{top:b.top+b.height/2-d/2,left:b.left+b.width}},c.prototype.getViewportAdjustedDelta=function(a,b,c,d){var e={top:0,left:0};if(!this.$viewport)return e;var f=this.options.viewport&&this.options.viewport.padding||0,g=this.getPosition(this.$viewport);if(/right|left/.test(a)){var h=b.top-f-g.scroll,i=b.top+f-g.scroll+d;h<g.top?e.top=g.top-h:i>g.top+g.height&&(e.top=g.top+g.height-i)}else{var j=b.left-f,k=b.left+f+c;j<g.left?e.left=g.left-j:k>g.right&&(e.left=g.left+g.width-k)}return e},c.prototype.getTitle=function(){var a,b=this.$element,c=this.options;return a=b.attr("data-original-title")||("function"==typeof c.title?c.title.call(b[0]):c.title)},c.prototype.getUID=function(a){do a+=~~(1e6*Math.random());while(document.getElementById(a));return a},c.prototype.tip=function(){if(!this.$tip&&(this.$tip=a(this.options.template),1!=this.$tip.length))throw new Error(this.type+" `template` option must consist of exactly 1 top-level element!");return this.$tip},c.prototype.arrow=function(){return this.$arrow=this.$arrow||this.tip().find(".tooltip-arrow")},c.prototype.enable=function(){this.enabled=!0},c.prototype.disable=function(){this.enabled=!1},c.prototype.toggleEnabled=function(){this.enabled=!this.enabled},c.prototype.toggle=function(b){var c=this;b&&(c=a(b.currentTarget).data("bs."+this.type),c||(c=new this.constructor(b.currentTarget,this.getDelegateOptions()),a(b.currentTarget).data("bs."+this.type,c))),b?(c.inState.click=!c.inState.click,c.isInStateTrue()?c.enter(c):c.leave(c)):c.tip().hasClass("in")?c.leave(c):c.enter(c)},c.prototype.destroy=function(){var a=this;clearTimeout(this.timeout),this.hide(function(){a.$element.off("."+a.type).removeData("bs."+a.type),a.$tip&&a.$tip.detach(),a.$tip=null,a.$arrow=null,a.$viewport=null})};var d=a.fn.tooltip;a.fn.tooltip=b,a.fn.tooltip.Constructor=c,a.fn.tooltip.noConflict=function(){return a.fn.tooltip=d,this}}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.popover"),f="object"==typeof b&&b;(e||!/destroy|hide/.test(b))&&(e||d.data("bs.popover",e=new c(this,f)),"string"==typeof b&&e[b]())})}var c=function(a,b){this.init("popover",a,b)};if(!a.fn.tooltip)throw new Error("Popover requires tooltip.js");c.VERSION="3.3.5",c.DEFAULTS=a.extend({},a.fn.tooltip.Constructor.DEFAULTS,{placement:"right",trigger:"click",content:"",template:'<div class="popover" role="tooltip"><div class="arrow"></div><h3 class="popover-title"></h3><div class="popover-content"></div></div>'}),c.prototype=a.extend({},a.fn.tooltip.Constructor.prototype),c.prototype.constructor=c,c.prototype.getDefaults=function(){return c.DEFAULTS},c.prototype.setContent=function(){var a=this.tip(),b=this.getTitle(),c=this.getContent();a.find(".popover-title")[this.options.html?"html":"text"](b),a.find(".popover-content").children().detach().end()[this.options.html?"string"==typeof c?"html":"append":"text"](c),a.removeClass("fade top bottom left right in"),a.find(".popover-title").html()||a.find(".popover-title").hide()},c.prototype.hasContent=function(){return this.getTitle()||this.getContent()},c.prototype.getContent=function(){var a=this.$element,b=this.options;return a.attr("data-content")||("function"==typeof b.content?b.content.call(a[0]):b.content)},c.prototype.arrow=function(){return this.$arrow=this.$arrow||this.tip().find(".arrow")};var d=a.fn.popover;a.fn.popover=b,a.fn.popover.Constructor=c,a.fn.popover.noConflict=function(){return a.fn.popover=d,this}}(jQuery),+function(a){"use strict";function b(c,d){this.$body=a(document.body),this.$scrollElement=a(a(c).is(document.body)?window:c),this.options=a.extend({},b.DEFAULTS,d),this.selector=(this.options.target||"")+" .nav li > a",this.offsets=[],this.targets=[],this.activeTarget=null,this.scrollHeight=0,this.$scrollElement.on("scroll.bs.scrollspy",a.proxy(this.process,this)),this.refresh(),this.process()}function c(c){return this.each(function(){var d=a(this),e=d.data("bs.scrollspy"),f="object"==typeof c&&c;e||d.data("bs.scrollspy",e=new b(this,f)),"string"==typeof c&&e[c]()})}b.VERSION="3.3.5",b.DEFAULTS={offset:10},b.prototype.getScrollHeight=function(){return this.$scrollElement[0].scrollHeight||Math.max(this.$body[0].scrollHeight,document.documentElement.scrollHeight)},b.prototype.refresh=function(){var b=this,c="offset",d=0;this.offsets=[],this.targets=[],this.scrollHeight=this.getScrollHeight(),a.isWindow(this.$scrollElement[0])||(c="position",d=this.$scrollElement.scrollTop()),this.$body.find(this.selector).map(function(){var b=a(this),e=b.data("target")||b.attr("href"),f=/^#./.test(e)&&a(e);return f&&f.length&&f.is(":visible")&&[[f[c]().top+d,e]]||null}).sort(function(a,b){return a[0]-b[0]}).each(function(){b.offsets.push(this[0]),b.targets.push(this[1])})},b.prototype.process=function(){var a,b=this.$scrollElement.scrollTop()+this.options.offset,c=this.getScrollHeight(),d=this.options.offset+c-this.$scrollElement.height(),e=this.offsets,f=this.targets,g=this.activeTarget;if(this.scrollHeight!=c&&this.refresh(),b>=d)return g!=(a=f[f.length-1])&&this.activate(a);if(g&&b<e[0])return this.activeTarget=null,this.clear();for(a=e.length;a--;)g!=f[a]&&b>=e[a]&&(void 0===e[a+1]||b<e[a+1])&&this.activate(f[a])},b.prototype.activate=function(b){this.activeTarget=b,this.clear();var c=this.selector+'[data-target="'+b+'"],'+this.selector+'[href="'+b+'"]',d=a(c).parents("li").addClass("active");d.parent(".dropdown-menu").length&&(d=d.closest("li.dropdown").addClass("active")),
-d.trigger("activate.bs.scrollspy")},b.prototype.clear=function(){a(this.selector).parentsUntil(this.options.target,".active").removeClass("active")};var d=a.fn.scrollspy;a.fn.scrollspy=c,a.fn.scrollspy.Constructor=b,a.fn.scrollspy.noConflict=function(){return a.fn.scrollspy=d,this},a(window).on("load.bs.scrollspy.data-api",function(){a('[data-spy="scroll"]').each(function(){var b=a(this);c.call(b,b.data())})})}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.tab");e||d.data("bs.tab",e=new c(this)),"string"==typeof b&&e[b]()})}var c=function(b){this.element=a(b)};c.VERSION="3.3.5",c.TRANSITION_DURATION=150,c.prototype.show=function(){var b=this.element,c=b.closest("ul:not(.dropdown-menu)"),d=b.data("target");if(d||(d=b.attr("href"),d=d&&d.replace(/.*(?=#[^\s]*$)/,"")),!b.parent("li").hasClass("active")){var e=c.find(".active:last a"),f=a.Event("hide.bs.tab",{relatedTarget:b[0]}),g=a.Event("show.bs.tab",{relatedTarget:e[0]});if(e.trigger(f),b.trigger(g),!g.isDefaultPrevented()&&!f.isDefaultPrevented()){var h=a(d);this.activate(b.closest("li"),c),this.activate(h,h.parent(),function(){e.trigger({type:"hidden.bs.tab",relatedTarget:b[0]}),b.trigger({type:"shown.bs.tab",relatedTarget:e[0]})})}}},c.prototype.activate=function(b,d,e){function f(){g.removeClass("active").find("> .dropdown-menu > .active").removeClass("active").end().find('[data-toggle="tab"]').attr("aria-expanded",!1),b.addClass("active").find('[data-toggle="tab"]').attr("aria-expanded",!0),h?(b[0].offsetWidth,b.addClass("in")):b.removeClass("fade"),b.parent(".dropdown-menu").length&&b.closest("li.dropdown").addClass("active").end().find('[data-toggle="tab"]').attr("aria-expanded",!0),e&&e()}var g=d.find("> .active"),h=e&&a.support.transition&&(g.length&&g.hasClass("fade")||!!d.find("> .fade").length);g.length&&h?g.one("bsTransitionEnd",f).emulateTransitionEnd(c.TRANSITION_DURATION):f(),g.removeClass("in")};var d=a.fn.tab;a.fn.tab=b,a.fn.tab.Constructor=c,a.fn.tab.noConflict=function(){return a.fn.tab=d,this};var e=function(c){c.preventDefault(),b.call(a(this),"show")};a(document).on("click.bs.tab.data-api",'[data-toggle="tab"]',e).on("click.bs.tab.data-api",'[data-toggle="pill"]',e)}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.affix"),f="object"==typeof b&&b;e||d.data("bs.affix",e=new c(this,f)),"string"==typeof b&&e[b]()})}var c=function(b,d){this.options=a.extend({},c.DEFAULTS,d),this.$target=a(this.options.target).on("scroll.bs.affix.data-api",a.proxy(this.checkPosition,this)).on("click.bs.affix.data-api",a.proxy(this.checkPositionWithEventLoop,this)),this.$element=a(b),this.affixed=null,this.unpin=null,this.pinnedOffset=null,this.checkPosition()};c.VERSION="3.3.5",c.RESET="affix affix-top affix-bottom",c.DEFAULTS={offset:0,target:window},c.prototype.getState=function(a,b,c,d){var e=this.$target.scrollTop(),f=this.$element.offset(),g=this.$target.height();if(null!=c&&"top"==this.affixed)return c>e?"top":!1;if("bottom"==this.affixed)return null!=c?e+this.unpin<=f.top?!1:"bottom":a-d>=e+g?!1:"bottom";var h=null==this.affixed,i=h?e:f.top,j=h?g:b;return null!=c&&c>=e?"top":null!=d&&i+j>=a-d?"bottom":!1},c.prototype.getPinnedOffset=function(){if(this.pinnedOffset)return this.pinnedOffset;this.$element.removeClass(c.RESET).addClass("affix");var a=this.$target.scrollTop(),b=this.$element.offset();return this.pinnedOffset=b.top-a},c.prototype.checkPositionWithEventLoop=function(){setTimeout(a.proxy(this.checkPosition,this),1)},c.prototype.checkPosition=function(){if(this.$element.is(":visible")){var b=this.$element.height(),d=this.options.offset,e=d.top,f=d.bottom,g=Math.max(a(document).height(),a(document.body).height());"object"!=typeof d&&(f=e=d),"function"==typeof e&&(e=d.top(this.$element)),"function"==typeof f&&(f=d.bottom(this.$element));var h=this.getState(g,b,e,f);if(this.affixed!=h){null!=this.unpin&&this.$element.css("top","");var i="affix"+(h?"-"+h:""),j=a.Event(i+".bs.affix");if(this.$element.trigger(j),j.isDefaultPrevented())return;this.affixed=h,this.unpin="bottom"==h?this.getPinnedOffset():null,this.$element.removeClass(c.RESET).addClass(i).trigger(i.replace("affix","affixed")+".bs.affix")}"bottom"==h&&this.$element.offset({top:g-b-f})}};var d=a.fn.affix;a.fn.affix=b,a.fn.affix.Constructor=c,a.fn.affix.noConflict=function(){return a.fn.affix=d,this},a(window).on("load",function(){a('[data-spy="affix"]').each(function(){var c=a(this),d=c.data();d.offset=d.offset||{},null!=d.offsetBottom&&(d.offset.bottom=d.offsetBottom),null!=d.offsetTop&&(d.offset.top=d.offsetTop),b.call(c,d)})})}(jQuery);
\ No newline at end of file
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/shared/admin/js/vendor/jquery-2.1.4.min.js b/Godeps/_workspace/src/github.com/influxdb/influxdb/shared/admin/js/vendor/jquery-2.1.4.min.js
deleted file mode 100644
index 49990d6e1..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/shared/admin/js/vendor/jquery-2.1.4.min.js
+++ /dev/null
@@ -1,4 +0,0 @@
-/*! jQuery v2.1.4 | (c) 2005, 2015 jQuery Foundation, Inc. | jquery.org/license */
-!function(a,b){"object"==typeof module&&"object"==typeof module.exports?module.exports=a.document?b(a,!0):function(a){if(!a.document)throw new Error("jQuery requires a window with a document");return b(a)}:b(a)}("undefined"!=typeof window?window:this,function(a,b){var c=[],d=c.slice,e=c.concat,f=c.push,g=c.indexOf,h={},i=h.toString,j=h.hasOwnProperty,k={},l=a.document,m="2.1.4",n=function(a,b){return new n.fn.init(a,b)},o=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,p=/^-ms-/,q=/-([\da-z])/gi,r=function(a,b){return b.toUpperCase()};n.fn=n.prototype={jquery:m,constructor:n,selector:"",length:0,toArray:function(){return d.call(this)},get:function(a){return null!=a?0>a?this[a+this.length]:this[a]:d.call(this)},pushStack:function(a){var b=n.merge(this.constructor(),a);return b.prevObject=this,b.context=this.context,b},each:function(a,b){return n.each(this,a,b)},map:function(a){return this.pushStack(n.map(this,function(b,c){return a.call(b,c,b)}))},slice:function(){return this.pushStack(d.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(a){var b=this.length,c=+a+(0>a?b:0);return this.pushStack(c>=0&&b>c?[this[c]]:[])},end:function(){return this.prevObject||this.constructor(null)},push:f,sort:c.sort,splice:c.splice},n.extend=n.fn.extend=function(){var a,b,c,d,e,f,g=arguments[0]||{},h=1,i=arguments.length,j=!1;for("boolean"==typeof g&&(j=g,g=arguments[h]||{},h++),"object"==typeof g||n.isFunction(g)||(g={}),h===i&&(g=this,h--);i>h;h++)if(null!=(a=arguments[h]))for(b in a)c=g[b],d=a[b],g!==d&&(j&&d&&(n.isPlainObject(d)||(e=n.isArray(d)))?(e?(e=!1,f=c&&n.isArray(c)?c:[]):f=c&&n.isPlainObject(c)?c:{},g[b]=n.extend(j,f,d)):void 0!==d&&(g[b]=d));return g},n.extend({expando:"jQuery"+(m+Math.random()).replace(/\D/g,""),isReady:!0,error:function(a){throw new Error(a)},noop:function(){},isFunction:function(a){return"function"===n.type(a)},isArray:Array.isArray,isWindow:function(a){return null!=a&&a===a.window},isNumeric:function(a){return!n.isArray(a)&&a-parseFloat(a)+1>=0},isPlainObject:function(a){return"object"!==n.type(a)||a.nodeType||n.isWindow(a)?!1:a.constructor&&!j.call(a.constructor.prototype,"isPrototypeOf")?!1:!0},isEmptyObject:function(a){var b;for(b in a)return!1;return!0},type:function(a){return null==a?a+"":"object"==typeof a||"function"==typeof a?h[i.call(a)]||"object":typeof a},globalEval:function(a){var b,c=eval;a=n.trim(a),a&&(1===a.indexOf("use strict")?(b=l.createElement("script"),b.text=a,l.head.appendChild(b).parentNode.removeChild(b)):c(a))},camelCase:function(a){return a.replace(p,"ms-").replace(q,r)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toLowerCase()===b.toLowerCase()},each:function(a,b,c){var d,e=0,f=a.length,g=s(a);if(c){if(g){for(;f>e;e++)if(d=b.apply(a[e],c),d===!1)break}else for(e in a)if(d=b.apply(a[e],c),d===!1)break}else if(g){for(;f>e;e++)if(d=b.call(a[e],e,a[e]),d===!1)break}else for(e in a)if(d=b.call(a[e],e,a[e]),d===!1)break;return a},trim:function(a){return null==a?"":(a+"").replace(o,"")},makeArray:function(a,b){var c=b||[];return null!=a&&(s(Object(a))?n.merge(c,"string"==typeof a?[a]:a):f.call(c,a)),c},inArray:function(a,b,c){return null==b?-1:g.call(b,a,c)},merge:function(a,b){for(var c=+b.length,d=0,e=a.length;c>d;d++)a[e++]=b[d];return a.length=e,a},grep:function(a,b,c){for(var d,e=[],f=0,g=a.length,h=!c;g>f;f++)d=!b(a[f],f),d!==h&&e.push(a[f]);return e},map:function(a,b,c){var d,f=0,g=a.length,h=s(a),i=[];if(h)for(;g>f;f++)d=b(a[f],f,c),null!=d&&i.push(d);else for(f in a)d=b(a[f],f,c),null!=d&&i.push(d);return e.apply([],i)},guid:1,proxy:function(a,b){var c,e,f;return"string"==typeof b&&(c=a[b],b=a,a=c),n.isFunction(a)?(e=d.call(arguments,2),f=function(){return a.apply(b||this,e.concat(d.call(arguments)))},f.guid=a.guid=a.guid||n.guid++,f):void 0},now:Date.now,support:k}),n.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(a,b){h["[object "+b+"]"]=b.toLowerCase()});function s(a){var b="length"in a&&a.length,c=n.type(a);return"function"===c||n.isWindow(a)?!1:1===a.nodeType&&b?!0:"array"===c||0===b||"number"==typeof b&&b>0&&b-1 in a}var t=function(a){var b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u="sizzle"+1*new Date,v=a.document,w=0,x=0,y=ha(),z=ha(),A=ha(),B=function(a,b){return a===b&&(l=!0),0},C=1<<31,D={}.hasOwnProperty,E=[],F=E.pop,G=E.push,H=E.push,I=E.slice,J=function(a,b){for(var c=0,d=a.length;d>c;c++)if(a[c]===b)return c;return-1},K="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",L="[\\x20\\t\\r\\n\\f]",M="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",N=M.replace("w","w#"),O="\\["+L+"*("+M+")(?:"+L+"*([*^$|!~]?=)"+L+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+N+"))|)"+L+"*\\]",P=":("+M+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+O+")*)|.*)\\)|)",Q=new RegExp(L+"+","g"),R=new RegExp("^"+L+"+|((?:^|[^\\\\])(?:\\\\.)*)"+L+"+$","g"),S=new RegExp("^"+L+"*,"+L+"*"),T=new RegExp("^"+L+"*([>+~]|"+L+")"+L+"*"),U=new RegExp("="+L+"*([^\\]'\"]*?)"+L+"*\\]","g"),V=new RegExp(P),W=new RegExp("^"+N+"$"),X={ID:new RegExp("^#("+M+")"),CLASS:new RegExp("^\\.("+M+")"),TAG:new RegExp("^("+M.replace("w","w*")+")"),ATTR:new RegExp("^"+O),PSEUDO:new RegExp("^"+P),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+L+"*(even|odd|(([+-]|)(\\d*)n|)"+L+"*(?:([+-]|)"+L+"*(\\d+)|))"+L+"*\\)|)","i"),bool:new RegExp("^(?:"+K+")$","i"),needsContext:new RegExp("^"+L+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+L+"*((?:-\\d)?\\d*)"+L+"*\\)|)(?=[^-]|$)","i")},Y=/^(?:input|select|textarea|button)$/i,Z=/^h\d$/i,$=/^[^{]+\{\s*\[native \w/,_=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,aa=/[+~]/,ba=/'|\\/g,ca=new RegExp("\\\\([\\da-f]{1,6}"+L+"?|("+L+")|.)","ig"),da=function(a,b,c){var d="0x"+b-65536;return d!==d||c?b:0>d?String.fromCharCode(d+65536):String.fromCharCode(d>>10|55296,1023&d|56320)},ea=function(){m()};try{H.apply(E=I.call(v.childNodes),v.childNodes),E[v.childNodes.length].nodeType}catch(fa){H={apply:E.length?function(a,b){G.apply(a,I.call(b))}:function(a,b){var c=a.length,d=0;while(a[c++]=b[d++]);a.length=c-1}}}function ga(a,b,d,e){var f,h,j,k,l,o,r,s,w,x;if((b?b.ownerDocument||b:v)!==n&&m(b),b=b||n,d=d||[],k=b.nodeType,"string"!=typeof a||!a||1!==k&&9!==k&&11!==k)return d;if(!e&&p){if(11!==k&&(f=_.exec(a)))if(j=f[1]){if(9===k){if(h=b.getElementById(j),!h||!h.parentNode)return d;if(h.id===j)return d.push(h),d}else if(b.ownerDocument&&(h=b.ownerDocument.getElementById(j))&&t(b,h)&&h.id===j)return d.push(h),d}else{if(f[2])return H.apply(d,b.getElementsByTagName(a)),d;if((j=f[3])&&c.getElementsByClassName)return H.apply(d,b.getElementsByClassName(j)),d}if(c.qsa&&(!q||!q.test(a))){if(s=r=u,w=b,x=1!==k&&a,1===k&&"object"!==b.nodeName.toLowerCase()){o=g(a),(r=b.getAttribute("id"))?s=r.replace(ba,"\\$&"):b.setAttribute("id",s),s="[id='"+s+"'] ",l=o.length;while(l--)o[l]=s+ra(o[l]);w=aa.test(a)&&pa(b.parentNode)||b,x=o.join(",")}if(x)try{return H.apply(d,w.querySelectorAll(x)),d}catch(y){}finally{r||b.removeAttribute("id")}}}return i(a.replace(R,"$1"),b,d,e)}function ha(){var a=[];function b(c,e){return a.push(c+" ")>d.cacheLength&&delete b[a.shift()],b[c+" "]=e}return b}function ia(a){return a[u]=!0,a}function ja(a){var b=n.createElement("div");try{return!!a(b)}catch(c){return!1}finally{b.parentNode&&b.parentNode.removeChild(b),b=null}}function ka(a,b){var c=a.split("|"),e=a.length;while(e--)d.attrHandle[c[e]]=b}function la(a,b){var c=b&&a,d=c&&1===a.nodeType&&1===b.nodeType&&(~b.sourceIndex||C)-(~a.sourceIndex||C);if(d)return d;if(c)while(c=c.nextSibling)if(c===b)return-1;return a?1:-1}function ma(a){return function(b){var c=b.nodeName.toLowerCase();return"input"===c&&b.type===a}}function na(a){return function(b){var c=b.nodeName.toLowerCase();return("input"===c||"button"===c)&&b.type===a}}function oa(a){return ia(function(b){return b=+b,ia(function(c,d){var e,f=a([],c.length,b),g=f.length;while(g--)c[e=f[g]]&&(c[e]=!(d[e]=c[e]))})})}function pa(a){return a&&"undefined"!=typeof a.getElementsByTagName&&a}c=ga.support={},f=ga.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return b?"HTML"!==b.nodeName:!1},m=ga.setDocument=function(a){var b,e,g=a?a.ownerDocument||a:v;return g!==n&&9===g.nodeType&&g.documentElement?(n=g,o=g.documentElement,e=g.defaultView,e&&e!==e.top&&(e.addEventListener?e.addEventListener("unload",ea,!1):e.attachEvent&&e.attachEvent("onunload",ea)),p=!f(g),c.attributes=ja(function(a){return a.className="i",!a.getAttribute("className")}),c.getElementsByTagName=ja(function(a){return a.appendChild(g.createComment("")),!a.getElementsByTagName("*").length}),c.getElementsByClassName=$.test(g.getElementsByClassName),c.getById=ja(function(a){return o.appendChild(a).id=u,!g.getElementsByName||!g.getElementsByName(u).length}),c.getById?(d.find.ID=function(a,b){if("undefined"!=typeof b.getElementById&&p){var c=b.getElementById(a);return c&&c.parentNode?[c]:[]}},d.filter.ID=function(a){var b=a.replace(ca,da);return function(a){return a.getAttribute("id")===b}}):(delete d.find.ID,d.filter.ID=function(a){var b=a.replace(ca,da);return function(a){var c="undefined"!=typeof a.getAttributeNode&&a.getAttributeNode("id");return c&&c.value===b}}),d.find.TAG=c.getElementsByTagName?function(a,b){return"undefined"!=typeof b.getElementsByTagName?b.getElementsByTagName(a):c.qsa?b.querySelectorAll(a):void 0}:function(a,b){var c,d=[],e=0,f=b.getElementsByTagName(a);if("*"===a){while(c=f[e++])1===c.nodeType&&d.push(c);return d}return f},d.find.CLASS=c.getElementsByClassName&&function(a,b){return p?b.getElementsByClassName(a):void 0},r=[],q=[],(c.qsa=$.test(g.querySelectorAll))&&(ja(function(a){o.appendChild(a).innerHTML="<a id='"+u+"'></a><select id='"+u+"-\f]' msallowcapture=''><option selected=''></option></select>",a.querySelectorAll("[msallowcapture^='']").length&&q.push("[*^$]="+L+"*(?:''|\"\")"),a.querySelectorAll("[selected]").length||q.push("\\["+L+"*(?:value|"+K+")"),a.querySelectorAll("[id~="+u+"-]").length||q.push("~="),a.querySelectorAll(":checked").length||q.push(":checked"),a.querySelectorAll("a#"+u+"+*").length||q.push(".#.+[+~]")}),ja(function(a){var b=g.createElement("input");b.setAttribute("type","hidden"),a.appendChild(b).setAttribute("name","D"),a.querySelectorAll("[name=d]").length&&q.push("name"+L+"*[*^$|!~]?="),a.querySelectorAll(":enabled").length||q.push(":enabled",":disabled"),a.querySelectorAll("*,:x"),q.push(",.*:")})),(c.matchesSelector=$.test(s=o.matches||o.webkitMatchesSelector||o.mozMatchesSelector||o.oMatchesSelector||o.msMatchesSelector))&&ja(function(a){c.disconnectedMatch=s.call(a,"div"),s.call(a,"[s!='']:x"),r.push("!=",P)}),q=q.length&&new RegExp(q.join("|")),r=r.length&&new RegExp(r.join("|")),b=$.test(o.compareDocumentPosition),t=b||$.test(o.contains)?function(a,b){var c=9===a.nodeType?a.documentElement:a,d=b&&b.parentNode;return a===d||!(!d||1!==d.nodeType||!(c.contains?c.contains(d):a.compareDocumentPosition&&16&a.compareDocumentPosition(d)))}:function(a,b){if(b)while(b=b.parentNode)if(b===a)return!0;return!1},B=b?function(a,b){if(a===b)return l=!0,0;var d=!a.compareDocumentPosition-!b.compareDocumentPosition;return d?d:(d=(a.ownerDocument||a)===(b.ownerDocument||b)?a.compareDocumentPosition(b):1,1&d||!c.sortDetached&&b.compareDocumentPosition(a)===d?a===g||a.ownerDocument===v&&t(v,a)?-1:b===g||b.ownerDocument===v&&t(v,b)?1:k?J(k,a)-J(k,b):0:4&d?-1:1)}:function(a,b){if(a===b)return l=!0,0;var c,d=0,e=a.parentNode,f=b.parentNode,h=[a],i=[b];if(!e||!f)return a===g?-1:b===g?1:e?-1:f?1:k?J(k,a)-J(k,b):0;if(e===f)return la(a,b);c=a;while(c=c.parentNode)h.unshift(c);c=b;while(c=c.parentNode)i.unshift(c);while(h[d]===i[d])d++;return d?la(h[d],i[d]):h[d]===v?-1:i[d]===v?1:0},g):n},ga.matches=function(a,b){return ga(a,null,null,b)},ga.matchesSelector=function(a,b){if((a.ownerDocument||a)!==n&&m(a),b=b.replace(U,"='$1']"),!(!c.matchesSelector||!p||r&&r.test(b)||q&&q.test(b)))try{var d=s.call(a,b);if(d||c.disconnectedMatch||a.document&&11!==a.document.nodeType)return d}catch(e){}return ga(b,n,null,[a]).length>0},ga.contains=function(a,b){return(a.ownerDocument||a)!==n&&m(a),t(a,b)},ga.attr=function(a,b){(a.ownerDocument||a)!==n&&m(a);var e=d.attrHandle[b.toLowerCase()],f=e&&D.call(d.attrHandle,b.toLowerCase())?e(a,b,!p):void 0;return void 0!==f?f:c.attributes||!p?a.getAttribute(b):(f=a.getAttributeNode(b))&&f.specified?f.value:null},ga.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)},ga.uniqueSort=function(a){var b,d=[],e=0,f=0;if(l=!c.detectDuplicates,k=!c.sortStable&&a.slice(0),a.sort(B),l){while(b=a[f++])b===a[f]&&(e=d.push(f));while(e--)a.splice(d[e],1)}return k=null,a},e=ga.getText=function(a){var b,c="",d=0,f=a.nodeType;if(f){if(1===f||9===f||11===f){if("string"==typeof a.textContent)return a.textContent;for(a=a.firstChild;a;a=a.nextSibling)c+=e(a)}else if(3===f||4===f)return a.nodeValue}else while(b=a[d++])c+=e(b);return c},d=ga.selectors={cacheLength:50,createPseudo:ia,match:X,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(a){return a[1]=a[1].replace(ca,da),a[3]=(a[3]||a[4]||a[5]||"").replace(ca,da),"~="===a[2]&&(a[3]=" "+a[3]+" "),a.slice(0,4)},CHILD:function(a){return a[1]=a[1].toLowerCase(),"nth"===a[1].slice(0,3)?(a[3]||ga.error(a[0]),a[4]=+(a[4]?a[5]+(a[6]||1):2*("even"===a[3]||"odd"===a[3])),a[5]=+(a[7]+a[8]||"odd"===a[3])):a[3]&&ga.error(a[0]),a},PSEUDO:function(a){var b,c=!a[6]&&a[2];return X.CHILD.test(a[0])?null:(a[3]?a[2]=a[4]||a[5]||"":c&&V.test(c)&&(b=g(c,!0))&&(b=c.indexOf(")",c.length-b)-c.length)&&(a[0]=a[0].slice(0,b),a[2]=c.slice(0,b)),a.slice(0,3))}},filter:{TAG:function(a){var b=a.replace(ca,da).toLowerCase();return"*"===a?function(){return!0}:function(a){return a.nodeName&&a.nodeName.toLowerCase()===b}},CLASS:function(a){var b=y[a+" "];return b||(b=new RegExp("(^|"+L+")"+a+"("+L+"|$)"))&&y(a,function(a){return b.test("string"==typeof a.className&&a.className||"undefined"!=typeof a.getAttribute&&a.getAttribute("class")||"")})},ATTR:function(a,b,c){return function(d){var e=ga.attr(d,a);return null==e?"!="===b:b?(e+="","="===b?e===c:"!="===b?e!==c:"^="===b?c&&0===e.indexOf(c):"*="===b?c&&e.indexOf(c)>-1:"$="===b?c&&e.slice(-c.length)===c:"~="===b?(" "+e.replace(Q," ")+" ").indexOf(c)>-1:"|="===b?e===c||e.slice(0,c.length+1)===c+"-":!1):!0}},CHILD:function(a,b,c,d,e){var f="nth"!==a.slice(0,3),g="last"!==a.slice(-4),h="of-type"===b;return 1===d&&0===e?function(a){return!!a.parentNode}:function(b,c,i){var j,k,l,m,n,o,p=f!==g?"nextSibling":"previousSibling",q=b.parentNode,r=h&&b.nodeName.toLowerCase(),s=!i&&!h;if(q){if(f){while(p){l=b;while(l=l[p])if(h?l.nodeName.toLowerCase()===r:1===l.nodeType)return!1;o=p="only"===a&&!o&&"nextSibling"}return!0}if(o=[g?q.firstChild:q.lastChild],g&&s){k=q[u]||(q[u]={}),j=k[a]||[],n=j[0]===w&&j[1],m=j[0]===w&&j[2],l=n&&q.childNodes[n];while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if(1===l.nodeType&&++m&&l===b){k[a]=[w,n,m];break}}else if(s&&(j=(b[u]||(b[u]={}))[a])&&j[0]===w)m=j[1];else while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if((h?l.nodeName.toLowerCase()===r:1===l.nodeType)&&++m&&(s&&((l[u]||(l[u]={}))[a]=[w,m]),l===b))break;return m-=e,m===d||m%d===0&&m/d>=0}}},PSEUDO:function(a,b){var c,e=d.pseudos[a]||d.setFilters[a.toLowerCase()]||ga.error("unsupported pseudo: "+a);return e[u]?e(b):e.length>1?(c=[a,a,"",b],d.setFilters.hasOwnProperty(a.toLowerCase())?ia(function(a,c){var d,f=e(a,b),g=f.length;while(g--)d=J(a,f[g]),a[d]=!(c[d]=f[g])}):function(a){return e(a,0,c)}):e}},pseudos:{not:ia(function(a){var b=[],c=[],d=h(a.replace(R,"$1"));return d[u]?ia(function(a,b,c,e){var f,g=d(a,null,e,[]),h=a.length;while(h--)(f=g[h])&&(a[h]=!(b[h]=f))}):function(a,e,f){return b[0]=a,d(b,null,f,c),b[0]=null,!c.pop()}}),has:ia(function(a){return function(b){return ga(a,b).length>0}}),contains:ia(function(a){return a=a.replace(ca,da),function(b){return(b.textContent||b.innerText||e(b)).indexOf(a)>-1}}),lang:ia(function(a){return W.test(a||"")||ga.error("unsupported lang: "+a),a=a.replace(ca,da).toLowerCase(),function(b){var c;do if(c=p?b.lang:b.getAttribute("xml:lang")||b.getAttribute("lang"))return c=c.toLowerCase(),c===a||0===c.indexOf(a+"-");while((b=b.parentNode)&&1===b.nodeType);return!1}}),target:function(b){var c=a.location&&a.location.hash;return c&&c.slice(1)===b.id},root:function(a){return a===o},focus:function(a){return a===n.activeElement&&(!n.hasFocus||n.hasFocus())&&!!(a.type||a.href||~a.tabIndex)},enabled:function(a){return a.disabled===!1},disabled:function(a){return a.disabled===!0},checked:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&!!a.checked||"option"===b&&!!a.selected},selected:function(a){return a.parentNode&&a.parentNode.selectedIndex,a.selected===!0},empty:function(a){for(a=a.firstChild;a;a=a.nextSibling)if(a.nodeType<6)return!1;return!0},parent:function(a){return!d.pseudos.empty(a)},header:function(a){return Z.test(a.nodeName)},input:function(a){return Y.test(a.nodeName)},button:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&"button"===a.type||"button"===b},text:function(a){var b;return"input"===a.nodeName.toLowerCase()&&"text"===a.type&&(null==(b=a.getAttribute("type"))||"text"===b.toLowerCase())},first:oa(function(){return[0]}),last:oa(function(a,b){return[b-1]}),eq:oa(function(a,b,c){return[0>c?c+b:c]}),even:oa(function(a,b){for(var c=0;b>c;c+=2)a.push(c);return a}),odd:oa(function(a,b){for(var c=1;b>c;c+=2)a.push(c);return a}),lt:oa(function(a,b,c){for(var d=0>c?c+b:c;--d>=0;)a.push(d);return a}),gt:oa(function(a,b,c){for(var d=0>c?c+b:c;++d<b;)a.push(d);return a})}},d.pseudos.nth=d.pseudos.eq;for(b in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})d.pseudos[b]=ma(b);for(b in{submit:!0,reset:!0})d.pseudos[b]=na(b);function qa(){}qa.prototype=d.filters=d.pseudos,d.setFilters=new qa,g=ga.tokenize=function(a,b){var c,e,f,g,h,i,j,k=z[a+" "];if(k)return b?0:k.slice(0);h=a,i=[],j=d.preFilter;while(h){(!c||(e=S.exec(h)))&&(e&&(h=h.slice(e[0].length)||h),i.push(f=[])),c=!1,(e=T.exec(h))&&(c=e.shift(),f.push({value:c,type:e[0].replace(R," ")}),h=h.slice(c.length));for(g in d.filter)!(e=X[g].exec(h))||j[g]&&!(e=j[g](e))||(c=e.shift(),f.push({value:c,type:g,matches:e}),h=h.slice(c.length));if(!c)break}return b?h.length:h?ga.error(a):z(a,i).slice(0)};function ra(a){for(var b=0,c=a.length,d="";c>b;b++)d+=a[b].value;return d}function sa(a,b,c){var d=b.dir,e=c&&"parentNode"===d,f=x++;return b.first?function(b,c,f){while(b=b[d])if(1===b.nodeType||e)return a(b,c,f)}:function(b,c,g){var h,i,j=[w,f];if(g){while(b=b[d])if((1===b.nodeType||e)&&a(b,c,g))return!0}else while(b=b[d])if(1===b.nodeType||e){if(i=b[u]||(b[u]={}),(h=i[d])&&h[0]===w&&h[1]===f)return j[2]=h[2];if(i[d]=j,j[2]=a(b,c,g))return!0}}}function ta(a){return a.length>1?function(b,c,d){var e=a.length;while(e--)if(!a[e](b,c,d))return!1;return!0}:a[0]}function ua(a,b,c){for(var d=0,e=b.length;e>d;d++)ga(a,b[d],c);return c}function va(a,b,c,d,e){for(var f,g=[],h=0,i=a.length,j=null!=b;i>h;h++)(f=a[h])&&(!c||c(f,d,e))&&(g.push(f),j&&b.push(h));return g}function wa(a,b,c,d,e,f){return d&&!d[u]&&(d=wa(d)),e&&!e[u]&&(e=wa(e,f)),ia(function(f,g,h,i){var j,k,l,m=[],n=[],o=g.length,p=f||ua(b||"*",h.nodeType?[h]:h,[]),q=!a||!f&&b?p:va(p,m,a,h,i),r=c?e||(f?a:o||d)?[]:g:q;if(c&&c(q,r,h,i),d){j=va(r,n),d(j,[],h,i),k=j.length;while(k--)(l=j[k])&&(r[n[k]]=!(q[n[k]]=l))}if(f){if(e||a){if(e){j=[],k=r.length;while(k--)(l=r[k])&&j.push(q[k]=l);e(null,r=[],j,i)}k=r.length;while(k--)(l=r[k])&&(j=e?J(f,l):m[k])>-1&&(f[j]=!(g[j]=l))}}else r=va(r===g?r.splice(o,r.length):r),e?e(null,g,r,i):H.apply(g,r)})}function xa(a){for(var b,c,e,f=a.length,g=d.relative[a[0].type],h=g||d.relative[" "],i=g?1:0,k=sa(function(a){return a===b},h,!0),l=sa(function(a){return J(b,a)>-1},h,!0),m=[function(a,c,d){var e=!g&&(d||c!==j)||((b=c).nodeType?k(a,c,d):l(a,c,d));return b=null,e}];f>i;i++)if(c=d.relative[a[i].type])m=[sa(ta(m),c)];else{if(c=d.filter[a[i].type].apply(null,a[i].matches),c[u]){for(e=++i;f>e;e++)if(d.relative[a[e].type])break;return wa(i>1&&ta(m),i>1&&ra(a.slice(0,i-1).concat({value:" "===a[i-2].type?"*":""})).replace(R,"$1"),c,e>i&&xa(a.slice(i,e)),f>e&&xa(a=a.slice(e)),f>e&&ra(a))}m.push(c)}return ta(m)}function ya(a,b){var c=b.length>0,e=a.length>0,f=function(f,g,h,i,k){var l,m,o,p=0,q="0",r=f&&[],s=[],t=j,u=f||e&&d.find.TAG("*",k),v=w+=null==t?1:Math.random()||.1,x=u.length;for(k&&(j=g!==n&&g);q!==x&&null!=(l=u[q]);q++){if(e&&l){m=0;while(o=a[m++])if(o(l,g,h)){i.push(l);break}k&&(w=v)}c&&((l=!o&&l)&&p--,f&&r.push(l))}if(p+=q,c&&q!==p){m=0;while(o=b[m++])o(r,s,g,h);if(f){if(p>0)while(q--)r[q]||s[q]||(s[q]=F.call(i));s=va(s)}H.apply(i,s),k&&!f&&s.length>0&&p+b.length>1&&ga.uniqueSort(i)}return k&&(w=v,j=t),r};return c?ia(f):f}return h=ga.compile=function(a,b){var c,d=[],e=[],f=A[a+" "];if(!f){b||(b=g(a)),c=b.length;while(c--)f=xa(b[c]),f[u]?d.push(f):e.push(f);f=A(a,ya(e,d)),f.selector=a}return f},i=ga.select=function(a,b,e,f){var i,j,k,l,m,n="function"==typeof a&&a,o=!f&&g(a=n.selector||a);if(e=e||[],1===o.length){if(j=o[0]=o[0].slice(0),j.length>2&&"ID"===(k=j[0]).type&&c.getById&&9===b.nodeType&&p&&d.relative[j[1].type]){if(b=(d.find.ID(k.matches[0].replace(ca,da),b)||[])[0],!b)return e;n&&(b=b.parentNode),a=a.slice(j.shift().value.length)}i=X.needsContext.test(a)?0:j.length;while(i--){if(k=j[i],d.relative[l=k.type])break;if((m=d.find[l])&&(f=m(k.matches[0].replace(ca,da),aa.test(j[0].type)&&pa(b.parentNode)||b))){if(j.splice(i,1),a=f.length&&ra(j),!a)return H.apply(e,f),e;break}}}return(n||h(a,o))(f,b,!p,e,aa.test(a)&&pa(b.parentNode)||b),e},c.sortStable=u.split("").sort(B).join("")===u,c.detectDuplicates=!!l,m(),c.sortDetached=ja(function(a){return 1&a.compareDocumentPosition(n.createElement("div"))}),ja(function(a){return a.innerHTML="<a href='#'></a>","#"===a.firstChild.getAttribute("href")})||ka("type|href|height|width",function(a,b,c){return c?void 0:a.getAttribute(b,"type"===b.toLowerCase()?1:2)}),c.attributes&&ja(function(a){return a.innerHTML="<input/>",a.firstChild.setAttribute("value",""),""===a.firstChild.getAttribute("value")})||ka("value",function(a,b,c){return c||"input"!==a.nodeName.toLowerCase()?void 0:a.defaultValue}),ja(function(a){return null==a.getAttribute("disabled")})||ka(K,function(a,b,c){var d;return c?void 0:a[b]===!0?b.toLowerCase():(d=a.getAttributeNode(b))&&d.specified?d.value:null}),ga}(a);n.find=t,n.expr=t.selectors,n.expr[":"]=n.expr.pseudos,n.unique=t.uniqueSort,n.text=t.getText,n.isXMLDoc=t.isXML,n.contains=t.contains;var u=n.expr.match.needsContext,v=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,w=/^.[^:#\[\.,]*$/;function x(a,b,c){if(n.isFunction(b))return n.grep(a,function(a,d){return!!b.call(a,d,a)!==c});if(b.nodeType)return n.grep(a,function(a){return a===b!==c});if("string"==typeof b){if(w.test(b))return n.filter(b,a,c);b=n.filter(b,a)}return n.grep(a,function(a){return g.call(b,a)>=0!==c})}n.filter=function(a,b,c){var d=b[0];return c&&(a=":not("+a+")"),1===b.length&&1===d.nodeType?n.find.matchesSelector(d,a)?[d]:[]:n.find.matches(a,n.grep(b,function(a){return 1===a.nodeType}))},n.fn.extend({find:function(a){var b,c=this.length,d=[],e=this;if("string"!=typeof a)return this.pushStack(n(a).filter(function(){for(b=0;c>b;b++)if(n.contains(e[b],this))return!0}));for(b=0;c>b;b++)n.find(a,e[b],d);return d=this.pushStack(c>1?n.unique(d):d),d.selector=this.selector?this.selector+" "+a:a,d},filter:function(a){return this.pushStack(x(this,a||[],!1))},not:function(a){return this.pushStack(x(this,a||[],!0))},is:function(a){return!!x(this,"string"==typeof a&&u.test(a)?n(a):a||[],!1).length}});var y,z=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,A=n.fn.init=function(a,b){var c,d;if(!a)return this;if("string"==typeof a){if(c="<"===a[0]&&">"===a[a.length-1]&&a.length>=3?[null,a,null]:z.exec(a),!c||!c[1]&&b)return!b||b.jquery?(b||y).find(a):this.constructor(b).find(a);if(c[1]){if(b=b instanceof n?b[0]:b,n.merge(this,n.parseHTML(c[1],b&&b.nodeType?b.ownerDocument||b:l,!0)),v.test(c[1])&&n.isPlainObject(b))for(c in b)n.isFunction(this[c])?this[c](b[c]):this.attr(c,b[c]);return this}return d=l.getElementById(c[2]),d&&d.parentNode&&(this.length=1,this[0]=d),this.context=l,this.selector=a,this}return a.nodeType?(this.context=this[0]=a,this.length=1,this):n.isFunction(a)?"undefined"!=typeof y.ready?y.ready(a):a(n):(void 0!==a.selector&&(this.selector=a.selector,this.context=a.context),n.makeArray(a,this))};A.prototype=n.fn,y=n(l);var B=/^(?:parents|prev(?:Until|All))/,C={children:!0,contents:!0,next:!0,prev:!0};n.extend({dir:function(a,b,c){var d=[],e=void 0!==c;while((a=a[b])&&9!==a.nodeType)if(1===a.nodeType){if(e&&n(a).is(c))break;d.push(a)}return d},sibling:function(a,b){for(var c=[];a;a=a.nextSibling)1===a.nodeType&&a!==b&&c.push(a);return c}}),n.fn.extend({has:function(a){var b=n(a,this),c=b.length;return this.filter(function(){for(var a=0;c>a;a++)if(n.contains(this,b[a]))return!0})},closest:function(a,b){for(var c,d=0,e=this.length,f=[],g=u.test(a)||"string"!=typeof a?n(a,b||this.context):0;e>d;d++)for(c=this[d];c&&c!==b;c=c.parentNode)if(c.nodeType<11&&(g?g.index(c)>-1:1===c.nodeType&&n.find.matchesSelector(c,a))){f.push(c);break}return this.pushStack(f.length>1?n.unique(f):f)},index:function(a){return a?"string"==typeof a?g.call(n(a),this[0]):g.call(this,a.jquery?a[0]:a):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(a,b){return this.pushStack(n.unique(n.merge(this.get(),n(a,b))))},addBack:function(a){return this.add(null==a?this.prevObject:this.prevObject.filter(a))}});function D(a,b){while((a=a[b])&&1!==a.nodeType);return a}n.each({parent:function(a){var b=a.parentNode;return b&&11!==b.nodeType?b:null},parents:function(a){return n.dir(a,"parentNode")},parentsUntil:function(a,b,c){return n.dir(a,"parentNode",c)},next:function(a){return D(a,"nextSibling")},prev:function(a){return D(a,"previousSibling")},nextAll:function(a){return n.dir(a,"nextSibling")},prevAll:function(a){return n.dir(a,"previousSibling")},nextUntil:function(a,b,c){return n.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return n.dir(a,"previousSibling",c)},siblings:function(a){return n.sibling((a.parentNode||{}).firstChild,a)},children:function(a){return n.sibling(a.firstChild)},contents:function(a){return a.contentDocument||n.merge([],a.childNodes)}},function(a,b){n.fn[a]=function(c,d){var e=n.map(this,b,c);return"Until"!==a.slice(-5)&&(d=c),d&&"string"==typeof d&&(e=n.filter(d,e)),this.length>1&&(C[a]||n.unique(e),B.test(a)&&e.reverse()),this.pushStack(e)}});var E=/\S+/g,F={};function G(a){var b=F[a]={};return n.each(a.match(E)||[],function(a,c){b[c]=!0}),b}n.Callbacks=function(a){a="string"==typeof a?F[a]||G(a):n.extend({},a);var b,c,d,e,f,g,h=[],i=!a.once&&[],j=function(l){for(b=a.memory&&l,c=!0,g=e||0,e=0,f=h.length,d=!0;h&&f>g;g++)if(h[g].apply(l[0],l[1])===!1&&a.stopOnFalse){b=!1;break}d=!1,h&&(i?i.length&&j(i.shift()):b?h=[]:k.disable())},k={add:function(){if(h){var c=h.length;!function g(b){n.each(b,function(b,c){var d=n.type(c);"function"===d?a.unique&&k.has(c)||h.push(c):c&&c.length&&"string"!==d&&g(c)})}(arguments),d?f=h.length:b&&(e=c,j(b))}return this},remove:function(){return h&&n.each(arguments,function(a,b){var c;while((c=n.inArray(b,h,c))>-1)h.splice(c,1),d&&(f>=c&&f--,g>=c&&g--)}),this},has:function(a){return a?n.inArray(a,h)>-1:!(!h||!h.length)},empty:function(){return h=[],f=0,this},disable:function(){return h=i=b=void 0,this},disabled:function(){return!h},lock:function(){return i=void 0,b||k.disable(),this},locked:function(){return!i},fireWith:function(a,b){return!h||c&&!i||(b=b||[],b=[a,b.slice?b.slice():b],d?i.push(b):j(b)),this},fire:function(){return k.fireWith(this,arguments),this},fired:function(){return!!c}};return k},n.extend({Deferred:function(a){var b=[["resolve","done",n.Callbacks("once memory"),"resolved"],["reject","fail",n.Callbacks("once memory"),"rejected"],["notify","progress",n.Callbacks("memory")]],c="pending",d={state:function(){return c},always:function(){return e.done(arguments).fail(arguments),this},then:function(){var a=arguments;return n.Deferred(function(c){n.each(b,function(b,f){var g=n.isFunction(a[b])&&a[b];e[f[1]](function(){var a=g&&g.apply(this,arguments);a&&n.isFunction(a.promise)?a.promise().done(c.resolve).fail(c.reject).progress(c.notify):c[f[0]+"With"](this===d?c.promise():this,g?[a]:arguments)})}),a=null}).promise()},promise:function(a){return null!=a?n.extend(a,d):d}},e={};return d.pipe=d.then,n.each(b,function(a,f){var g=f[2],h=f[3];d[f[1]]=g.add,h&&g.add(function(){c=h},b[1^a][2].disable,b[2][2].lock),e[f[0]]=function(){return e[f[0]+"With"](this===e?d:this,arguments),this},e[f[0]+"With"]=g.fireWith}),d.promise(e),a&&a.call(e,e),e},when:function(a){var b=0,c=d.call(arguments),e=c.length,f=1!==e||a&&n.isFunction(a.promise)?e:0,g=1===f?a:n.Deferred(),h=function(a,b,c){return function(e){b[a]=this,c[a]=arguments.length>1?d.call(arguments):e,c===i?g.notifyWith(b,c):--f||g.resolveWith(b,c)}},i,j,k;if(e>1)for(i=new Array(e),j=new Array(e),k=new Array(e);e>b;b++)c[b]&&n.isFunction(c[b].promise)?c[b].promise().done(h(b,k,c)).fail(g.reject).progress(h(b,j,i)):--f;return f||g.resolveWith(k,c),g.promise()}});var H;n.fn.ready=function(a){return n.ready.promise().done(a),this},n.extend({isReady:!1,readyWait:1,holdReady:function(a){a?n.readyWait++:n.ready(!0)},ready:function(a){(a===!0?--n.readyWait:n.isReady)||(n.isReady=!0,a!==!0&&--n.readyWait>0||(H.resolveWith(l,[n]),n.fn.triggerHandler&&(n(l).triggerHandler("ready"),n(l).off("ready"))))}});function I(){l.removeEventListener("DOMContentLoaded",I,!1),a.removeEventListener("load",I,!1),n.ready()}n.ready.promise=function(b){return H||(H=n.Deferred(),"complete"===l.readyState?setTimeout(n.ready):(l.addEventListener("DOMContentLoaded",I,!1),a.addEventListener("load",I,!1))),H.promise(b)},n.ready.promise();var J=n.access=function(a,b,c,d,e,f,g){var h=0,i=a.length,j=null==c;if("object"===n.type(c)){e=!0;for(h in c)n.access(a,b,h,c[h],!0,f,g)}else if(void 0!==d&&(e=!0,n.isFunction(d)||(g=!0),j&&(g?(b.call(a,d),b=null):(j=b,b=function(a,b,c){return j.call(n(a),c)})),b))for(;i>h;h++)b(a[h],c,g?d:d.call(a[h],h,b(a[h],c)));return e?a:j?b.call(a):i?b(a[0],c):f};n.acceptData=function(a){return 1===a.nodeType||9===a.nodeType||!+a.nodeType};function K(){Object.defineProperty(this.cache={},0,{get:function(){return{}}}),this.expando=n.expando+K.uid++}K.uid=1,K.accepts=n.acceptData,K.prototype={key:function(a){if(!K.accepts(a))return 0;var b={},c=a[this.expando];if(!c){c=K.uid++;try{b[this.expando]={value:c},Object.defineProperties(a,b)}catch(d){b[this.expando]=c,n.extend(a,b)}}return this.cache[c]||(this.cache[c]={}),c},set:function(a,b,c){var d,e=this.key(a),f=this.cache[e];if("string"==typeof b)f[b]=c;else if(n.isEmptyObject(f))n.extend(this.cache[e],b);else for(d in b)f[d]=b[d];return f},get:function(a,b){var c=this.cache[this.key(a)];return void 0===b?c:c[b]},access:function(a,b,c){var d;return void 0===b||b&&"string"==typeof b&&void 0===c?(d=this.get(a,b),void 0!==d?d:this.get(a,n.camelCase(b))):(this.set(a,b,c),void 0!==c?c:b)},remove:function(a,b){var c,d,e,f=this.key(a),g=this.cache[f];if(void 0===b)this.cache[f]={};else{n.isArray(b)?d=b.concat(b.map(n.camelCase)):(e=n.camelCase(b),b in g?d=[b,e]:(d=e,d=d in g?[d]:d.match(E)||[])),c=d.length;while(c--)delete g[d[c]]}},hasData:function(a){return!n.isEmptyObject(this.cache[a[this.expando]]||{})},discard:function(a){a[this.expando]&&delete this.cache[a[this.expando]]}};var L=new K,M=new K,N=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,O=/([A-Z])/g;function P(a,b,c){var d;if(void 0===c&&1===a.nodeType)if(d="data-"+b.replace(O,"-$1").toLowerCase(),c=a.getAttribute(d),"string"==typeof c){try{c="true"===c?!0:"false"===c?!1:"null"===c?null:+c+""===c?+c:N.test(c)?n.parseJSON(c):c}catch(e){}M.set(a,b,c)}else c=void 0;return c}n.extend({hasData:function(a){return M.hasData(a)||L.hasData(a)},data:function(a,b,c){
-return M.access(a,b,c)},removeData:function(a,b){M.remove(a,b)},_data:function(a,b,c){return L.access(a,b,c)},_removeData:function(a,b){L.remove(a,b)}}),n.fn.extend({data:function(a,b){var c,d,e,f=this[0],g=f&&f.attributes;if(void 0===a){if(this.length&&(e=M.get(f),1===f.nodeType&&!L.get(f,"hasDataAttrs"))){c=g.length;while(c--)g[c]&&(d=g[c].name,0===d.indexOf("data-")&&(d=n.camelCase(d.slice(5)),P(f,d,e[d])));L.set(f,"hasDataAttrs",!0)}return e}return"object"==typeof a?this.each(function(){M.set(this,a)}):J(this,function(b){var c,d=n.camelCase(a);if(f&&void 0===b){if(c=M.get(f,a),void 0!==c)return c;if(c=M.get(f,d),void 0!==c)return c;if(c=P(f,d,void 0),void 0!==c)return c}else this.each(function(){var c=M.get(this,d);M.set(this,d,b),-1!==a.indexOf("-")&&void 0!==c&&M.set(this,a,b)})},null,b,arguments.length>1,null,!0)},removeData:function(a){return this.each(function(){M.remove(this,a)})}}),n.extend({queue:function(a,b,c){var d;return a?(b=(b||"fx")+"queue",d=L.get(a,b),c&&(!d||n.isArray(c)?d=L.access(a,b,n.makeArray(c)):d.push(c)),d||[]):void 0},dequeue:function(a,b){b=b||"fx";var c=n.queue(a,b),d=c.length,e=c.shift(),f=n._queueHooks(a,b),g=function(){n.dequeue(a,b)};"inprogress"===e&&(e=c.shift(),d--),e&&("fx"===b&&c.unshift("inprogress"),delete f.stop,e.call(a,g,f)),!d&&f&&f.empty.fire()},_queueHooks:function(a,b){var c=b+"queueHooks";return L.get(a,c)||L.access(a,c,{empty:n.Callbacks("once memory").add(function(){L.remove(a,[b+"queue",c])})})}}),n.fn.extend({queue:function(a,b){var c=2;return"string"!=typeof a&&(b=a,a="fx",c--),arguments.length<c?n.queue(this[0],a):void 0===b?this:this.each(function(){var c=n.queue(this,a,b);n._queueHooks(this,a),"fx"===a&&"inprogress"!==c[0]&&n.dequeue(this,a)})},dequeue:function(a){return this.each(function(){n.dequeue(this,a)})},clearQueue:function(a){return this.queue(a||"fx",[])},promise:function(a,b){var c,d=1,e=n.Deferred(),f=this,g=this.length,h=function(){--d||e.resolveWith(f,[f])};"string"!=typeof a&&(b=a,a=void 0),a=a||"fx";while(g--)c=L.get(f[g],a+"queueHooks"),c&&c.empty&&(d++,c.empty.add(h));return h(),e.promise(b)}});var Q=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,R=["Top","Right","Bottom","Left"],S=function(a,b){return a=b||a,"none"===n.css(a,"display")||!n.contains(a.ownerDocument,a)},T=/^(?:checkbox|radio)$/i;!function(){var a=l.createDocumentFragment(),b=a.appendChild(l.createElement("div")),c=l.createElement("input");c.setAttribute("type","radio"),c.setAttribute("checked","checked"),c.setAttribute("name","t"),b.appendChild(c),k.checkClone=b.cloneNode(!0).cloneNode(!0).lastChild.checked,b.innerHTML="<textarea>x</textarea>",k.noCloneChecked=!!b.cloneNode(!0).lastChild.defaultValue}();var U="undefined";k.focusinBubbles="onfocusin"in a;var V=/^key/,W=/^(?:mouse|pointer|contextmenu)|click/,X=/^(?:focusinfocus|focusoutblur)$/,Y=/^([^.]*)(?:\.(.+)|)$/;function Z(){return!0}function $(){return!1}function _(){try{return l.activeElement}catch(a){}}n.event={global:{},add:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,o,p,q,r=L.get(a);if(r){c.handler&&(f=c,c=f.handler,e=f.selector),c.guid||(c.guid=n.guid++),(i=r.events)||(i=r.events={}),(g=r.handle)||(g=r.handle=function(b){return typeof n!==U&&n.event.triggered!==b.type?n.event.dispatch.apply(a,arguments):void 0}),b=(b||"").match(E)||[""],j=b.length;while(j--)h=Y.exec(b[j])||[],o=q=h[1],p=(h[2]||"").split(".").sort(),o&&(l=n.event.special[o]||{},o=(e?l.delegateType:l.bindType)||o,l=n.event.special[o]||{},k=n.extend({type:o,origType:q,data:d,handler:c,guid:c.guid,selector:e,needsContext:e&&n.expr.match.needsContext.test(e),namespace:p.join(".")},f),(m=i[o])||(m=i[o]=[],m.delegateCount=0,l.setup&&l.setup.call(a,d,p,g)!==!1||a.addEventListener&&a.addEventListener(o,g,!1)),l.add&&(l.add.call(a,k),k.handler.guid||(k.handler.guid=c.guid)),e?m.splice(m.delegateCount++,0,k):m.push(k),n.event.global[o]=!0)}},remove:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,o,p,q,r=L.hasData(a)&&L.get(a);if(r&&(i=r.events)){b=(b||"").match(E)||[""],j=b.length;while(j--)if(h=Y.exec(b[j])||[],o=q=h[1],p=(h[2]||"").split(".").sort(),o){l=n.event.special[o]||{},o=(d?l.delegateType:l.bindType)||o,m=i[o]||[],h=h[2]&&new RegExp("(^|\\.)"+p.join("\\.(?:.*\\.|)")+"(\\.|$)"),g=f=m.length;while(f--)k=m[f],!e&&q!==k.origType||c&&c.guid!==k.guid||h&&!h.test(k.namespace)||d&&d!==k.selector&&("**"!==d||!k.selector)||(m.splice(f,1),k.selector&&m.delegateCount--,l.remove&&l.remove.call(a,k));g&&!m.length&&(l.teardown&&l.teardown.call(a,p,r.handle)!==!1||n.removeEvent(a,o,r.handle),delete i[o])}else for(o in i)n.event.remove(a,o+b[j],c,d,!0);n.isEmptyObject(i)&&(delete r.handle,L.remove(a,"events"))}},trigger:function(b,c,d,e){var f,g,h,i,k,m,o,p=[d||l],q=j.call(b,"type")?b.type:b,r=j.call(b,"namespace")?b.namespace.split("."):[];if(g=h=d=d||l,3!==d.nodeType&&8!==d.nodeType&&!X.test(q+n.event.triggered)&&(q.indexOf(".")>=0&&(r=q.split("."),q=r.shift(),r.sort()),k=q.indexOf(":")<0&&"on"+q,b=b[n.expando]?b:new n.Event(q,"object"==typeof b&&b),b.isTrigger=e?2:3,b.namespace=r.join("."),b.namespace_re=b.namespace?new RegExp("(^|\\.)"+r.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,b.result=void 0,b.target||(b.target=d),c=null==c?[b]:n.makeArray(c,[b]),o=n.event.special[q]||{},e||!o.trigger||o.trigger.apply(d,c)!==!1)){if(!e&&!o.noBubble&&!n.isWindow(d)){for(i=o.delegateType||q,X.test(i+q)||(g=g.parentNode);g;g=g.parentNode)p.push(g),h=g;h===(d.ownerDocument||l)&&p.push(h.defaultView||h.parentWindow||a)}f=0;while((g=p[f++])&&!b.isPropagationStopped())b.type=f>1?i:o.bindType||q,m=(L.get(g,"events")||{})[b.type]&&L.get(g,"handle"),m&&m.apply(g,c),m=k&&g[k],m&&m.apply&&n.acceptData(g)&&(b.result=m.apply(g,c),b.result===!1&&b.preventDefault());return b.type=q,e||b.isDefaultPrevented()||o._default&&o._default.apply(p.pop(),c)!==!1||!n.acceptData(d)||k&&n.isFunction(d[q])&&!n.isWindow(d)&&(h=d[k],h&&(d[k]=null),n.event.triggered=q,d[q](),n.event.triggered=void 0,h&&(d[k]=h)),b.result}},dispatch:function(a){a=n.event.fix(a);var b,c,e,f,g,h=[],i=d.call(arguments),j=(L.get(this,"events")||{})[a.type]||[],k=n.event.special[a.type]||{};if(i[0]=a,a.delegateTarget=this,!k.preDispatch||k.preDispatch.call(this,a)!==!1){h=n.event.handlers.call(this,a,j),b=0;while((f=h[b++])&&!a.isPropagationStopped()){a.currentTarget=f.elem,c=0;while((g=f.handlers[c++])&&!a.isImmediatePropagationStopped())(!a.namespace_re||a.namespace_re.test(g.namespace))&&(a.handleObj=g,a.data=g.data,e=((n.event.special[g.origType]||{}).handle||g.handler).apply(f.elem,i),void 0!==e&&(a.result=e)===!1&&(a.preventDefault(),a.stopPropagation()))}return k.postDispatch&&k.postDispatch.call(this,a),a.result}},handlers:function(a,b){var c,d,e,f,g=[],h=b.delegateCount,i=a.target;if(h&&i.nodeType&&(!a.button||"click"!==a.type))for(;i!==this;i=i.parentNode||this)if(i.disabled!==!0||"click"!==a.type){for(d=[],c=0;h>c;c++)f=b[c],e=f.selector+" ",void 0===d[e]&&(d[e]=f.needsContext?n(e,this).index(i)>=0:n.find(e,this,null,[i]).length),d[e]&&d.push(f);d.length&&g.push({elem:i,handlers:d})}return h<b.length&&g.push({elem:this,handlers:b.slice(h)}),g},props:"altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(a,b){return null==a.which&&(a.which=null!=b.charCode?b.charCode:b.keyCode),a}},mouseHooks:{props:"button buttons clientX clientY offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(a,b){var c,d,e,f=b.button;return null==a.pageX&&null!=b.clientX&&(c=a.target.ownerDocument||l,d=c.documentElement,e=c.body,a.pageX=b.clientX+(d&&d.scrollLeft||e&&e.scrollLeft||0)-(d&&d.clientLeft||e&&e.clientLeft||0),a.pageY=b.clientY+(d&&d.scrollTop||e&&e.scrollTop||0)-(d&&d.clientTop||e&&e.clientTop||0)),a.which||void 0===f||(a.which=1&f?1:2&f?3:4&f?2:0),a}},fix:function(a){if(a[n.expando])return a;var b,c,d,e=a.type,f=a,g=this.fixHooks[e];g||(this.fixHooks[e]=g=W.test(e)?this.mouseHooks:V.test(e)?this.keyHooks:{}),d=g.props?this.props.concat(g.props):this.props,a=new n.Event(f),b=d.length;while(b--)c=d[b],a[c]=f[c];return a.target||(a.target=l),3===a.target.nodeType&&(a.target=a.target.parentNode),g.filter?g.filter(a,f):a},special:{load:{noBubble:!0},focus:{trigger:function(){return this!==_()&&this.focus?(this.focus(),!1):void 0},delegateType:"focusin"},blur:{trigger:function(){return this===_()&&this.blur?(this.blur(),!1):void 0},delegateType:"focusout"},click:{trigger:function(){return"checkbox"===this.type&&this.click&&n.nodeName(this,"input")?(this.click(),!1):void 0},_default:function(a){return n.nodeName(a.target,"a")}},beforeunload:{postDispatch:function(a){void 0!==a.result&&a.originalEvent&&(a.originalEvent.returnValue=a.result)}}},simulate:function(a,b,c,d){var e=n.extend(new n.Event,c,{type:a,isSimulated:!0,originalEvent:{}});d?n.event.trigger(e,null,b):n.event.dispatch.call(b,e),e.isDefaultPrevented()&&c.preventDefault()}},n.removeEvent=function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c,!1)},n.Event=function(a,b){return this instanceof n.Event?(a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||void 0===a.defaultPrevented&&a.returnValue===!1?Z:$):this.type=a,b&&n.extend(this,b),this.timeStamp=a&&a.timeStamp||n.now(),void(this[n.expando]=!0)):new n.Event(a,b)},n.Event.prototype={isDefaultPrevented:$,isPropagationStopped:$,isImmediatePropagationStopped:$,preventDefault:function(){var a=this.originalEvent;this.isDefaultPrevented=Z,a&&a.preventDefault&&a.preventDefault()},stopPropagation:function(){var a=this.originalEvent;this.isPropagationStopped=Z,a&&a.stopPropagation&&a.stopPropagation()},stopImmediatePropagation:function(){var a=this.originalEvent;this.isImmediatePropagationStopped=Z,a&&a.stopImmediatePropagation&&a.stopImmediatePropagation(),this.stopPropagation()}},n.each({mouseenter:"mouseover",mouseleave:"mouseout",pointerenter:"pointerover",pointerleave:"pointerout"},function(a,b){n.event.special[a]={delegateType:b,bindType:b,handle:function(a){var c,d=this,e=a.relatedTarget,f=a.handleObj;return(!e||e!==d&&!n.contains(d,e))&&(a.type=f.origType,c=f.handler.apply(this,arguments),a.type=b),c}}}),k.focusinBubbles||n.each({focus:"focusin",blur:"focusout"},function(a,b){var c=function(a){n.event.simulate(b,a.target,n.event.fix(a),!0)};n.event.special[b]={setup:function(){var d=this.ownerDocument||this,e=L.access(d,b);e||d.addEventListener(a,c,!0),L.access(d,b,(e||0)+1)},teardown:function(){var d=this.ownerDocument||this,e=L.access(d,b)-1;e?L.access(d,b,e):(d.removeEventListener(a,c,!0),L.remove(d,b))}}}),n.fn.extend({on:function(a,b,c,d,e){var f,g;if("object"==typeof a){"string"!=typeof b&&(c=c||b,b=void 0);for(g in a)this.on(g,b,c,a[g],e);return this}if(null==c&&null==d?(d=b,c=b=void 0):null==d&&("string"==typeof b?(d=c,c=void 0):(d=c,c=b,b=void 0)),d===!1)d=$;else if(!d)return this;return 1===e&&(f=d,d=function(a){return n().off(a),f.apply(this,arguments)},d.guid=f.guid||(f.guid=n.guid++)),this.each(function(){n.event.add(this,a,d,c,b)})},one:function(a,b,c,d){return this.on(a,b,c,d,1)},off:function(a,b,c){var d,e;if(a&&a.preventDefault&&a.handleObj)return d=a.handleObj,n(a.delegateTarget).off(d.namespace?d.origType+"."+d.namespace:d.origType,d.selector,d.handler),this;if("object"==typeof a){for(e in a)this.off(e,b,a[e]);return this}return(b===!1||"function"==typeof b)&&(c=b,b=void 0),c===!1&&(c=$),this.each(function(){n.event.remove(this,a,c,b)})},trigger:function(a,b){return this.each(function(){n.event.trigger(a,b,this)})},triggerHandler:function(a,b){var c=this[0];return c?n.event.trigger(a,b,c,!0):void 0}});var aa=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,ba=/<([\w:]+)/,ca=/<|&#?\w+;/,da=/<(?:script|style|link)/i,ea=/checked\s*(?:[^=]|=\s*.checked.)/i,fa=/^$|\/(?:java|ecma)script/i,ga=/^true\/(.*)/,ha=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g,ia={option:[1,"<select multiple='multiple'>","</select>"],thead:[1,"<table>","</table>"],col:[2,"<table><colgroup>","</colgroup></table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:[0,"",""]};ia.optgroup=ia.option,ia.tbody=ia.tfoot=ia.colgroup=ia.caption=ia.thead,ia.th=ia.td;function ja(a,b){return n.nodeName(a,"table")&&n.nodeName(11!==b.nodeType?b:b.firstChild,"tr")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function ka(a){return a.type=(null!==a.getAttribute("type"))+"/"+a.type,a}function la(a){var b=ga.exec(a.type);return b?a.type=b[1]:a.removeAttribute("type"),a}function ma(a,b){for(var c=0,d=a.length;d>c;c++)L.set(a[c],"globalEval",!b||L.get(b[c],"globalEval"))}function na(a,b){var c,d,e,f,g,h,i,j;if(1===b.nodeType){if(L.hasData(a)&&(f=L.access(a),g=L.set(b,f),j=f.events)){delete g.handle,g.events={};for(e in j)for(c=0,d=j[e].length;d>c;c++)n.event.add(b,e,j[e][c])}M.hasData(a)&&(h=M.access(a),i=n.extend({},h),M.set(b,i))}}function oa(a,b){var c=a.getElementsByTagName?a.getElementsByTagName(b||"*"):a.querySelectorAll?a.querySelectorAll(b||"*"):[];return void 0===b||b&&n.nodeName(a,b)?n.merge([a],c):c}function pa(a,b){var c=b.nodeName.toLowerCase();"input"===c&&T.test(a.type)?b.checked=a.checked:("input"===c||"textarea"===c)&&(b.defaultValue=a.defaultValue)}n.extend({clone:function(a,b,c){var d,e,f,g,h=a.cloneNode(!0),i=n.contains(a.ownerDocument,a);if(!(k.noCloneChecked||1!==a.nodeType&&11!==a.nodeType||n.isXMLDoc(a)))for(g=oa(h),f=oa(a),d=0,e=f.length;e>d;d++)pa(f[d],g[d]);if(b)if(c)for(f=f||oa(a),g=g||oa(h),d=0,e=f.length;e>d;d++)na(f[d],g[d]);else na(a,h);return g=oa(h,"script"),g.length>0&&ma(g,!i&&oa(a,"script")),h},buildFragment:function(a,b,c,d){for(var e,f,g,h,i,j,k=b.createDocumentFragment(),l=[],m=0,o=a.length;o>m;m++)if(e=a[m],e||0===e)if("object"===n.type(e))n.merge(l,e.nodeType?[e]:e);else if(ca.test(e)){f=f||k.appendChild(b.createElement("div")),g=(ba.exec(e)||["",""])[1].toLowerCase(),h=ia[g]||ia._default,f.innerHTML=h[1]+e.replace(aa,"<$1></$2>")+h[2],j=h[0];while(j--)f=f.lastChild;n.merge(l,f.childNodes),f=k.firstChild,f.textContent=""}else l.push(b.createTextNode(e));k.textContent="",m=0;while(e=l[m++])if((!d||-1===n.inArray(e,d))&&(i=n.contains(e.ownerDocument,e),f=oa(k.appendChild(e),"script"),i&&ma(f),c)){j=0;while(e=f[j++])fa.test(e.type||"")&&c.push(e)}return k},cleanData:function(a){for(var b,c,d,e,f=n.event.special,g=0;void 0!==(c=a[g]);g++){if(n.acceptData(c)&&(e=c[L.expando],e&&(b=L.cache[e]))){if(b.events)for(d in b.events)f[d]?n.event.remove(c,d):n.removeEvent(c,d,b.handle);L.cache[e]&&delete L.cache[e]}delete M.cache[c[M.expando]]}}}),n.fn.extend({text:function(a){return J(this,function(a){return void 0===a?n.text(this):this.empty().each(function(){(1===this.nodeType||11===this.nodeType||9===this.nodeType)&&(this.textContent=a)})},null,a,arguments.length)},append:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=ja(this,a);b.appendChild(a)}})},prepend:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=ja(this,a);b.insertBefore(a,b.firstChild)}})},before:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this)})},after:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this.nextSibling)})},remove:function(a,b){for(var c,d=a?n.filter(a,this):this,e=0;null!=(c=d[e]);e++)b||1!==c.nodeType||n.cleanData(oa(c)),c.parentNode&&(b&&n.contains(c.ownerDocument,c)&&ma(oa(c,"script")),c.parentNode.removeChild(c));return this},empty:function(){for(var a,b=0;null!=(a=this[b]);b++)1===a.nodeType&&(n.cleanData(oa(a,!1)),a.textContent="");return this},clone:function(a,b){return a=null==a?!1:a,b=null==b?a:b,this.map(function(){return n.clone(this,a,b)})},html:function(a){return J(this,function(a){var b=this[0]||{},c=0,d=this.length;if(void 0===a&&1===b.nodeType)return b.innerHTML;if("string"==typeof a&&!da.test(a)&&!ia[(ba.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(aa,"<$1></$2>");try{for(;d>c;c++)b=this[c]||{},1===b.nodeType&&(n.cleanData(oa(b,!1)),b.innerHTML=a);b=0}catch(e){}}b&&this.empty().append(a)},null,a,arguments.length)},replaceWith:function(){var a=arguments[0];return this.domManip(arguments,function(b){a=this.parentNode,n.cleanData(oa(this)),a&&a.replaceChild(b,this)}),a&&(a.length||a.nodeType)?this:this.remove()},detach:function(a){return this.remove(a,!0)},domManip:function(a,b){a=e.apply([],a);var c,d,f,g,h,i,j=0,l=this.length,m=this,o=l-1,p=a[0],q=n.isFunction(p);if(q||l>1&&"string"==typeof p&&!k.checkClone&&ea.test(p))return this.each(function(c){var d=m.eq(c);q&&(a[0]=p.call(this,c,d.html())),d.domManip(a,b)});if(l&&(c=n.buildFragment(a,this[0].ownerDocument,!1,this),d=c.firstChild,1===c.childNodes.length&&(c=d),d)){for(f=n.map(oa(c,"script"),ka),g=f.length;l>j;j++)h=c,j!==o&&(h=n.clone(h,!0,!0),g&&n.merge(f,oa(h,"script"))),b.call(this[j],h,j);if(g)for(i=f[f.length-1].ownerDocument,n.map(f,la),j=0;g>j;j++)h=f[j],fa.test(h.type||"")&&!L.access(h,"globalEval")&&n.contains(i,h)&&(h.src?n._evalUrl&&n._evalUrl(h.src):n.globalEval(h.textContent.replace(ha,"")))}return this}}),n.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){n.fn[a]=function(a){for(var c,d=[],e=n(a),g=e.length-1,h=0;g>=h;h++)c=h===g?this:this.clone(!0),n(e[h])[b](c),f.apply(d,c.get());return this.pushStack(d)}});var qa,ra={};function sa(b,c){var d,e=n(c.createElement(b)).appendTo(c.body),f=a.getDefaultComputedStyle&&(d=a.getDefaultComputedStyle(e[0]))?d.display:n.css(e[0],"display");return e.detach(),f}function ta(a){var b=l,c=ra[a];return c||(c=sa(a,b),"none"!==c&&c||(qa=(qa||n("<iframe frameborder='0' width='0' height='0'/>")).appendTo(b.documentElement),b=qa[0].contentDocument,b.write(),b.close(),c=sa(a,b),qa.detach()),ra[a]=c),c}var ua=/^margin/,va=new RegExp("^("+Q+")(?!px)[a-z%]+$","i"),wa=function(b){return b.ownerDocument.defaultView.opener?b.ownerDocument.defaultView.getComputedStyle(b,null):a.getComputedStyle(b,null)};function xa(a,b,c){var d,e,f,g,h=a.style;return c=c||wa(a),c&&(g=c.getPropertyValue(b)||c[b]),c&&(""!==g||n.contains(a.ownerDocument,a)||(g=n.style(a,b)),va.test(g)&&ua.test(b)&&(d=h.width,e=h.minWidth,f=h.maxWidth,h.minWidth=h.maxWidth=h.width=g,g=c.width,h.width=d,h.minWidth=e,h.maxWidth=f)),void 0!==g?g+"":g}function ya(a,b){return{get:function(){return a()?void delete this.get:(this.get=b).apply(this,arguments)}}}!function(){var b,c,d=l.documentElement,e=l.createElement("div"),f=l.createElement("div");if(f.style){f.style.backgroundClip="content-box",f.cloneNode(!0).style.backgroundClip="",k.clearCloneStyle="content-box"===f.style.backgroundClip,e.style.cssText="border:0;width:0;height:0;top:0;left:-9999px;margin-top:1px;position:absolute",e.appendChild(f);function g(){f.style.cssText="-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;display:block;margin-top:1%;top:1%;border:1px;padding:1px;width:4px;position:absolute",f.innerHTML="",d.appendChild(e);var g=a.getComputedStyle(f,null);b="1%"!==g.top,c="4px"===g.width,d.removeChild(e)}a.getComputedStyle&&n.extend(k,{pixelPosition:function(){return g(),b},boxSizingReliable:function(){return null==c&&g(),c},reliableMarginRight:function(){var b,c=f.appendChild(l.createElement("div"));return c.style.cssText=f.style.cssText="-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;display:block;margin:0;border:0;padding:0",c.style.marginRight=c.style.width="0",f.style.width="1px",d.appendChild(e),b=!parseFloat(a.getComputedStyle(c,null).marginRight),d.removeChild(e),f.removeChild(c),b}})}}(),n.swap=function(a,b,c,d){var e,f,g={};for(f in b)g[f]=a.style[f],a.style[f]=b[f];e=c.apply(a,d||[]);for(f in b)a.style[f]=g[f];return e};var za=/^(none|table(?!-c[ea]).+)/,Aa=new RegExp("^("+Q+")(.*)$","i"),Ba=new RegExp("^([+-])=("+Q+")","i"),Ca={position:"absolute",visibility:"hidden",display:"block"},Da={letterSpacing:"0",fontWeight:"400"},Ea=["Webkit","O","Moz","ms"];function Fa(a,b){if(b in a)return b;var c=b[0].toUpperCase()+b.slice(1),d=b,e=Ea.length;while(e--)if(b=Ea[e]+c,b in a)return b;return d}function Ga(a,b,c){var d=Aa.exec(b);return d?Math.max(0,d[1]-(c||0))+(d[2]||"px"):b}function Ha(a,b,c,d,e){for(var f=c===(d?"border":"content")?4:"width"===b?1:0,g=0;4>f;f+=2)"margin"===c&&(g+=n.css(a,c+R[f],!0,e)),d?("content"===c&&(g-=n.css(a,"padding"+R[f],!0,e)),"margin"!==c&&(g-=n.css(a,"border"+R[f]+"Width",!0,e))):(g+=n.css(a,"padding"+R[f],!0,e),"padding"!==c&&(g+=n.css(a,"border"+R[f]+"Width",!0,e)));return g}function Ia(a,b,c){var d=!0,e="width"===b?a.offsetWidth:a.offsetHeight,f=wa(a),g="border-box"===n.css(a,"boxSizing",!1,f);if(0>=e||null==e){if(e=xa(a,b,f),(0>e||null==e)&&(e=a.style[b]),va.test(e))return e;d=g&&(k.boxSizingReliable()||e===a.style[b]),e=parseFloat(e)||0}return e+Ha(a,b,c||(g?"border":"content"),d,f)+"px"}function Ja(a,b){for(var c,d,e,f=[],g=0,h=a.length;h>g;g++)d=a[g],d.style&&(f[g]=L.get(d,"olddisplay"),c=d.style.display,b?(f[g]||"none"!==c||(d.style.display=""),""===d.style.display&&S(d)&&(f[g]=L.access(d,"olddisplay",ta(d.nodeName)))):(e=S(d),"none"===c&&e||L.set(d,"olddisplay",e?c:n.css(d,"display"))));for(g=0;h>g;g++)d=a[g],d.style&&(b&&"none"!==d.style.display&&""!==d.style.display||(d.style.display=b?f[g]||"":"none"));return a}n.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=xa(a,"opacity");return""===c?"1":c}}}},cssNumber:{columnCount:!0,fillOpacity:!0,flexGrow:!0,flexShrink:!0,fontWeight:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":"cssFloat"},style:function(a,b,c,d){if(a&&3!==a.nodeType&&8!==a.nodeType&&a.style){var e,f,g,h=n.camelCase(b),i=a.style;return b=n.cssProps[h]||(n.cssProps[h]=Fa(i,h)),g=n.cssHooks[b]||n.cssHooks[h],void 0===c?g&&"get"in g&&void 0!==(e=g.get(a,!1,d))?e:i[b]:(f=typeof c,"string"===f&&(e=Ba.exec(c))&&(c=(e[1]+1)*e[2]+parseFloat(n.css(a,b)),f="number"),null!=c&&c===c&&("number"!==f||n.cssNumber[h]||(c+="px"),k.clearCloneStyle||""!==c||0!==b.indexOf("background")||(i[b]="inherit"),g&&"set"in g&&void 0===(c=g.set(a,c,d))||(i[b]=c)),void 0)}},css:function(a,b,c,d){var e,f,g,h=n.camelCase(b);return b=n.cssProps[h]||(n.cssProps[h]=Fa(a.style,h)),g=n.cssHooks[b]||n.cssHooks[h],g&&"get"in g&&(e=g.get(a,!0,c)),void 0===e&&(e=xa(a,b,d)),"normal"===e&&b in Da&&(e=Da[b]),""===c||c?(f=parseFloat(e),c===!0||n.isNumeric(f)?f||0:e):e}}),n.each(["height","width"],function(a,b){n.cssHooks[b]={get:function(a,c,d){return c?za.test(n.css(a,"display"))&&0===a.offsetWidth?n.swap(a,Ca,function(){return Ia(a,b,d)}):Ia(a,b,d):void 0},set:function(a,c,d){var e=d&&wa(a);return Ga(a,c,d?Ha(a,b,d,"border-box"===n.css(a,"boxSizing",!1,e),e):0)}}}),n.cssHooks.marginRight=ya(k.reliableMarginRight,function(a,b){return b?n.swap(a,{display:"inline-block"},xa,[a,"marginRight"]):void 0}),n.each({margin:"",padding:"",border:"Width"},function(a,b){n.cssHooks[a+b]={expand:function(c){for(var d=0,e={},f="string"==typeof c?c.split(" "):[c];4>d;d++)e[a+R[d]+b]=f[d]||f[d-2]||f[0];return e}},ua.test(a)||(n.cssHooks[a+b].set=Ga)}),n.fn.extend({css:function(a,b){return J(this,function(a,b,c){var d,e,f={},g=0;if(n.isArray(b)){for(d=wa(a),e=b.length;e>g;g++)f[b[g]]=n.css(a,b[g],!1,d);return f}return void 0!==c?n.style(a,b,c):n.css(a,b)},a,b,arguments.length>1)},show:function(){return Ja(this,!0)},hide:function(){return Ja(this)},toggle:function(a){return"boolean"==typeof a?a?this.show():this.hide():this.each(function(){S(this)?n(this).show():n(this).hide()})}});function Ka(a,b,c,d,e){return new Ka.prototype.init(a,b,c,d,e)}n.Tween=Ka,Ka.prototype={constructor:Ka,init:function(a,b,c,d,e,f){this.elem=a,this.prop=c,this.easing=e||"swing",this.options=b,this.start=this.now=this.cur(),this.end=d,this.unit=f||(n.cssNumber[c]?"":"px")},cur:function(){var a=Ka.propHooks[this.prop];return a&&a.get?a.get(this):Ka.propHooks._default.get(this)},run:function(a){var b,c=Ka.propHooks[this.prop];return this.options.duration?this.pos=b=n.easing[this.easing](a,this.options.duration*a,0,1,this.options.duration):this.pos=b=a,this.now=(this.end-this.start)*b+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),c&&c.set?c.set(this):Ka.propHooks._default.set(this),this}},Ka.prototype.init.prototype=Ka.prototype,Ka.propHooks={_default:{get:function(a){var b;return null==a.elem[a.prop]||a.elem.style&&null!=a.elem.style[a.prop]?(b=n.css(a.elem,a.prop,""),b&&"auto"!==b?b:0):a.elem[a.prop]},set:function(a){n.fx.step[a.prop]?n.fx.step[a.prop](a):a.elem.style&&(null!=a.elem.style[n.cssProps[a.prop]]||n.cssHooks[a.prop])?n.style(a.elem,a.prop,a.now+a.unit):a.elem[a.prop]=a.now}}},Ka.propHooks.scrollTop=Ka.propHooks.scrollLeft={set:function(a){a.elem.nodeType&&a.elem.parentNode&&(a.elem[a.prop]=a.now)}},n.easing={linear:function(a){return a},swing:function(a){return.5-Math.cos(a*Math.PI)/2}},n.fx=Ka.prototype.init,n.fx.step={};var La,Ma,Na=/^(?:toggle|show|hide)$/,Oa=new RegExp("^(?:([+-])=|)("+Q+")([a-z%]*)$","i"),Pa=/queueHooks$/,Qa=[Va],Ra={"*":[function(a,b){var c=this.createTween(a,b),d=c.cur(),e=Oa.exec(b),f=e&&e[3]||(n.cssNumber[a]?"":"px"),g=(n.cssNumber[a]||"px"!==f&&+d)&&Oa.exec(n.css(c.elem,a)),h=1,i=20;if(g&&g[3]!==f){f=f||g[3],e=e||[],g=+d||1;do h=h||".5",g/=h,n.style(c.elem,a,g+f);while(h!==(h=c.cur()/d)&&1!==h&&--i)}return e&&(g=c.start=+g||+d||0,c.unit=f,c.end=e[1]?g+(e[1]+1)*e[2]:+e[2]),c}]};function Sa(){return setTimeout(function(){La=void 0}),La=n.now()}function Ta(a,b){var c,d=0,e={height:a};for(b=b?1:0;4>d;d+=2-b)c=R[d],e["margin"+c]=e["padding"+c]=a;return b&&(e.opacity=e.width=a),e}function Ua(a,b,c){for(var d,e=(Ra[b]||[]).concat(Ra["*"]),f=0,g=e.length;g>f;f++)if(d=e[f].call(c,b,a))return d}function Va(a,b,c){var d,e,f,g,h,i,j,k,l=this,m={},o=a.style,p=a.nodeType&&S(a),q=L.get(a,"fxshow");c.queue||(h=n._queueHooks(a,"fx"),null==h.unqueued&&(h.unqueued=0,i=h.empty.fire,h.empty.fire=function(){h.unqueued||i()}),h.unqueued++,l.always(function(){l.always(function(){h.unqueued--,n.queue(a,"fx").length||h.empty.fire()})})),1===a.nodeType&&("height"in b||"width"in b)&&(c.overflow=[o.overflow,o.overflowX,o.overflowY],j=n.css(a,"display"),k="none"===j?L.get(a,"olddisplay")||ta(a.nodeName):j,"inline"===k&&"none"===n.css(a,"float")&&(o.display="inline-block")),c.overflow&&(o.overflow="hidden",l.always(function(){o.overflow=c.overflow[0],o.overflowX=c.overflow[1],o.overflowY=c.overflow[2]}));for(d in b)if(e=b[d],Na.exec(e)){if(delete b[d],f=f||"toggle"===e,e===(p?"hide":"show")){if("show"!==e||!q||void 0===q[d])continue;p=!0}m[d]=q&&q[d]||n.style(a,d)}else j=void 0;if(n.isEmptyObject(m))"inline"===("none"===j?ta(a.nodeName):j)&&(o.display=j);else{q?"hidden"in q&&(p=q.hidden):q=L.access(a,"fxshow",{}),f&&(q.hidden=!p),p?n(a).show():l.done(function(){n(a).hide()}),l.done(function(){var b;L.remove(a,"fxshow");for(b in m)n.style(a,b,m[b])});for(d in m)g=Ua(p?q[d]:0,d,l),d in q||(q[d]=g.start,p&&(g.end=g.start,g.start="width"===d||"height"===d?1:0))}}function Wa(a,b){var c,d,e,f,g;for(c in a)if(d=n.camelCase(c),e=b[d],f=a[c],n.isArray(f)&&(e=f[1],f=a[c]=f[0]),c!==d&&(a[d]=f,delete a[c]),g=n.cssHooks[d],g&&"expand"in g){f=g.expand(f),delete a[d];for(c in f)c in a||(a[c]=f[c],b[c]=e)}else b[d]=e}function Xa(a,b,c){var d,e,f=0,g=Qa.length,h=n.Deferred().always(function(){delete i.elem}),i=function(){if(e)return!1;for(var b=La||Sa(),c=Math.max(0,j.startTime+j.duration-b),d=c/j.duration||0,f=1-d,g=0,i=j.tweens.length;i>g;g++)j.tweens[g].run(f);return h.notifyWith(a,[j,f,c]),1>f&&i?c:(h.resolveWith(a,[j]),!1)},j=h.promise({elem:a,props:n.extend({},b),opts:n.extend(!0,{specialEasing:{}},c),originalProperties:b,originalOptions:c,startTime:La||Sa(),duration:c.duration,tweens:[],createTween:function(b,c){var d=n.Tween(a,j.opts,b,c,j.opts.specialEasing[b]||j.opts.easing);return j.tweens.push(d),d},stop:function(b){var c=0,d=b?j.tweens.length:0;if(e)return this;for(e=!0;d>c;c++)j.tweens[c].run(1);return b?h.resolveWith(a,[j,b]):h.rejectWith(a,[j,b]),this}}),k=j.props;for(Wa(k,j.opts.specialEasing);g>f;f++)if(d=Qa[f].call(j,a,k,j.opts))return d;return n.map(k,Ua,j),n.isFunction(j.opts.start)&&j.opts.start.call(a,j),n.fx.timer(n.extend(i,{elem:a,anim:j,queue:j.opts.queue})),j.progress(j.opts.progress).done(j.opts.done,j.opts.complete).fail(j.opts.fail).always(j.opts.always)}n.Animation=n.extend(Xa,{tweener:function(a,b){n.isFunction(a)?(b=a,a=["*"]):a=a.split(" ");for(var c,d=0,e=a.length;e>d;d++)c=a[d],Ra[c]=Ra[c]||[],Ra[c].unshift(b)},prefilter:function(a,b){b?Qa.unshift(a):Qa.push(a)}}),n.speed=function(a,b,c){var d=a&&"object"==typeof a?n.extend({},a):{complete:c||!c&&b||n.isFunction(a)&&a,duration:a,easing:c&&b||b&&!n.isFunction(b)&&b};return d.duration=n.fx.off?0:"number"==typeof d.duration?d.duration:d.duration in n.fx.speeds?n.fx.speeds[d.duration]:n.fx.speeds._default,(null==d.queue||d.queue===!0)&&(d.queue="fx"),d.old=d.complete,d.complete=function(){n.isFunction(d.old)&&d.old.call(this),d.queue&&n.dequeue(this,d.queue)},d},n.fn.extend({fadeTo:function(a,b,c,d){return this.filter(S).css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,d){var e=n.isEmptyObject(a),f=n.speed(b,c,d),g=function(){var b=Xa(this,n.extend({},a),f);(e||L.get(this,"finish"))&&b.stop(!0)};return g.finish=g,e||f.queue===!1?this.each(g):this.queue(f.queue,g)},stop:function(a,b,c){var d=function(a){var b=a.stop;delete a.stop,b(c)};return"string"!=typeof a&&(c=b,b=a,a=void 0),b&&a!==!1&&this.queue(a||"fx",[]),this.each(function(){var b=!0,e=null!=a&&a+"queueHooks",f=n.timers,g=L.get(this);if(e)g[e]&&g[e].stop&&d(g[e]);else for(e in g)g[e]&&g[e].stop&&Pa.test(e)&&d(g[e]);for(e=f.length;e--;)f[e].elem!==this||null!=a&&f[e].queue!==a||(f[e].anim.stop(c),b=!1,f.splice(e,1));(b||!c)&&n.dequeue(this,a)})},finish:function(a){return a!==!1&&(a=a||"fx"),this.each(function(){var b,c=L.get(this),d=c[a+"queue"],e=c[a+"queueHooks"],f=n.timers,g=d?d.length:0;for(c.finish=!0,n.queue(this,a,[]),e&&e.stop&&e.stop.call(this,!0),b=f.length;b--;)f[b].elem===this&&f[b].queue===a&&(f[b].anim.stop(!0),f.splice(b,1));for(b=0;g>b;b++)d[b]&&d[b].finish&&d[b].finish.call(this);delete c.finish})}}),n.each(["toggle","show","hide"],function(a,b){var c=n.fn[b];n.fn[b]=function(a,d,e){return null==a||"boolean"==typeof a?c.apply(this,arguments):this.animate(Ta(b,!0),a,d,e)}}),n.each({slideDown:Ta("show"),slideUp:Ta("hide"),slideToggle:Ta("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){n.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),n.timers=[],n.fx.tick=function(){var a,b=0,c=n.timers;for(La=n.now();b<c.length;b++)a=c[b],a()||c[b]!==a||c.splice(b--,1);c.length||n.fx.stop(),La=void 0},n.fx.timer=function(a){n.timers.push(a),a()?n.fx.start():n.timers.pop()},n.fx.interval=13,n.fx.start=function(){Ma||(Ma=setInterval(n.fx.tick,n.fx.interval))},n.fx.stop=function(){clearInterval(Ma),Ma=null},n.fx.speeds={slow:600,fast:200,_default:400},n.fn.delay=function(a,b){return a=n.fx?n.fx.speeds[a]||a:a,b=b||"fx",this.queue(b,function(b,c){var d=setTimeout(b,a);c.stop=function(){clearTimeout(d)}})},function(){var a=l.createElement("input"),b=l.createElement("select"),c=b.appendChild(l.createElement("option"));a.type="checkbox",k.checkOn=""!==a.value,k.optSelected=c.selected,b.disabled=!0,k.optDisabled=!c.disabled,a=l.createElement("input"),a.value="t",a.type="radio",k.radioValue="t"===a.value}();var Ya,Za,$a=n.expr.attrHandle;n.fn.extend({attr:function(a,b){return J(this,n.attr,a,b,arguments.length>1)},removeAttr:function(a){return this.each(function(){n.removeAttr(this,a)})}}),n.extend({attr:function(a,b,c){var d,e,f=a.nodeType;if(a&&3!==f&&8!==f&&2!==f)return typeof a.getAttribute===U?n.prop(a,b,c):(1===f&&n.isXMLDoc(a)||(b=b.toLowerCase(),d=n.attrHooks[b]||(n.expr.match.bool.test(b)?Za:Ya)),
-void 0===c?d&&"get"in d&&null!==(e=d.get(a,b))?e:(e=n.find.attr(a,b),null==e?void 0:e):null!==c?d&&"set"in d&&void 0!==(e=d.set(a,c,b))?e:(a.setAttribute(b,c+""),c):void n.removeAttr(a,b))},removeAttr:function(a,b){var c,d,e=0,f=b&&b.match(E);if(f&&1===a.nodeType)while(c=f[e++])d=n.propFix[c]||c,n.expr.match.bool.test(c)&&(a[d]=!1),a.removeAttribute(c)},attrHooks:{type:{set:function(a,b){if(!k.radioValue&&"radio"===b&&n.nodeName(a,"input")){var c=a.value;return a.setAttribute("type",b),c&&(a.value=c),b}}}}}),Za={set:function(a,b,c){return b===!1?n.removeAttr(a,c):a.setAttribute(c,c),c}},n.each(n.expr.match.bool.source.match(/\w+/g),function(a,b){var c=$a[b]||n.find.attr;$a[b]=function(a,b,d){var e,f;return d||(f=$a[b],$a[b]=e,e=null!=c(a,b,d)?b.toLowerCase():null,$a[b]=f),e}});var _a=/^(?:input|select|textarea|button)$/i;n.fn.extend({prop:function(a,b){return J(this,n.prop,a,b,arguments.length>1)},removeProp:function(a){return this.each(function(){delete this[n.propFix[a]||a]})}}),n.extend({propFix:{"for":"htmlFor","class":"className"},prop:function(a,b,c){var d,e,f,g=a.nodeType;if(a&&3!==g&&8!==g&&2!==g)return f=1!==g||!n.isXMLDoc(a),f&&(b=n.propFix[b]||b,e=n.propHooks[b]),void 0!==c?e&&"set"in e&&void 0!==(d=e.set(a,c,b))?d:a[b]=c:e&&"get"in e&&null!==(d=e.get(a,b))?d:a[b]},propHooks:{tabIndex:{get:function(a){return a.hasAttribute("tabindex")||_a.test(a.nodeName)||a.href?a.tabIndex:-1}}}}),k.optSelected||(n.propHooks.selected={get:function(a){var b=a.parentNode;return b&&b.parentNode&&b.parentNode.selectedIndex,null}}),n.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){n.propFix[this.toLowerCase()]=this});var ab=/[\t\r\n\f]/g;n.fn.extend({addClass:function(a){var b,c,d,e,f,g,h="string"==typeof a&&a,i=0,j=this.length;if(n.isFunction(a))return this.each(function(b){n(this).addClass(a.call(this,b,this.className))});if(h)for(b=(a||"").match(E)||[];j>i;i++)if(c=this[i],d=1===c.nodeType&&(c.className?(" "+c.className+" ").replace(ab," "):" ")){f=0;while(e=b[f++])d.indexOf(" "+e+" ")<0&&(d+=e+" ");g=n.trim(d),c.className!==g&&(c.className=g)}return this},removeClass:function(a){var b,c,d,e,f,g,h=0===arguments.length||"string"==typeof a&&a,i=0,j=this.length;if(n.isFunction(a))return this.each(function(b){n(this).removeClass(a.call(this,b,this.className))});if(h)for(b=(a||"").match(E)||[];j>i;i++)if(c=this[i],d=1===c.nodeType&&(c.className?(" "+c.className+" ").replace(ab," "):"")){f=0;while(e=b[f++])while(d.indexOf(" "+e+" ")>=0)d=d.replace(" "+e+" "," ");g=a?n.trim(d):"",c.className!==g&&(c.className=g)}return this},toggleClass:function(a,b){var c=typeof a;return"boolean"==typeof b&&"string"===c?b?this.addClass(a):this.removeClass(a):this.each(n.isFunction(a)?function(c){n(this).toggleClass(a.call(this,c,this.className,b),b)}:function(){if("string"===c){var b,d=0,e=n(this),f=a.match(E)||[];while(b=f[d++])e.hasClass(b)?e.removeClass(b):e.addClass(b)}else(c===U||"boolean"===c)&&(this.className&&L.set(this,"__className__",this.className),this.className=this.className||a===!1?"":L.get(this,"__className__")||"")})},hasClass:function(a){for(var b=" "+a+" ",c=0,d=this.length;d>c;c++)if(1===this[c].nodeType&&(" "+this[c].className+" ").replace(ab," ").indexOf(b)>=0)return!0;return!1}});var bb=/\r/g;n.fn.extend({val:function(a){var b,c,d,e=this[0];{if(arguments.length)return d=n.isFunction(a),this.each(function(c){var e;1===this.nodeType&&(e=d?a.call(this,c,n(this).val()):a,null==e?e="":"number"==typeof e?e+="":n.isArray(e)&&(e=n.map(e,function(a){return null==a?"":a+""})),b=n.valHooks[this.type]||n.valHooks[this.nodeName.toLowerCase()],b&&"set"in b&&void 0!==b.set(this,e,"value")||(this.value=e))});if(e)return b=n.valHooks[e.type]||n.valHooks[e.nodeName.toLowerCase()],b&&"get"in b&&void 0!==(c=b.get(e,"value"))?c:(c=e.value,"string"==typeof c?c.replace(bb,""):null==c?"":c)}}}),n.extend({valHooks:{option:{get:function(a){var b=n.find.attr(a,"value");return null!=b?b:n.trim(n.text(a))}},select:{get:function(a){for(var b,c,d=a.options,e=a.selectedIndex,f="select-one"===a.type||0>e,g=f?null:[],h=f?e+1:d.length,i=0>e?h:f?e:0;h>i;i++)if(c=d[i],!(!c.selected&&i!==e||(k.optDisabled?c.disabled:null!==c.getAttribute("disabled"))||c.parentNode.disabled&&n.nodeName(c.parentNode,"optgroup"))){if(b=n(c).val(),f)return b;g.push(b)}return g},set:function(a,b){var c,d,e=a.options,f=n.makeArray(b),g=e.length;while(g--)d=e[g],(d.selected=n.inArray(d.value,f)>=0)&&(c=!0);return c||(a.selectedIndex=-1),f}}}}),n.each(["radio","checkbox"],function(){n.valHooks[this]={set:function(a,b){return n.isArray(b)?a.checked=n.inArray(n(a).val(),b)>=0:void 0}},k.checkOn||(n.valHooks[this].get=function(a){return null===a.getAttribute("value")?"on":a.value})}),n.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(a,b){n.fn[b]=function(a,c){return arguments.length>0?this.on(b,null,a,c):this.trigger(b)}}),n.fn.extend({hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)},bind:function(a,b,c){return this.on(a,null,b,c)},unbind:function(a,b){return this.off(a,null,b)},delegate:function(a,b,c,d){return this.on(b,a,c,d)},undelegate:function(a,b,c){return 1===arguments.length?this.off(a,"**"):this.off(b,a||"**",c)}});var cb=n.now(),db=/\?/;n.parseJSON=function(a){return JSON.parse(a+"")},n.parseXML=function(a){var b,c;if(!a||"string"!=typeof a)return null;try{c=new DOMParser,b=c.parseFromString(a,"text/xml")}catch(d){b=void 0}return(!b||b.getElementsByTagName("parsererror").length)&&n.error("Invalid XML: "+a),b};var eb=/#.*$/,fb=/([?&])_=[^&]*/,gb=/^(.*?):[ \t]*([^\r\n]*)$/gm,hb=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,ib=/^(?:GET|HEAD)$/,jb=/^\/\//,kb=/^([\w.+-]+:)(?:\/\/(?:[^\/?#]*@|)([^\/?#:]*)(?::(\d+)|)|)/,lb={},mb={},nb="*/".concat("*"),ob=a.location.href,pb=kb.exec(ob.toLowerCase())||[];function qb(a){return function(b,c){"string"!=typeof b&&(c=b,b="*");var d,e=0,f=b.toLowerCase().match(E)||[];if(n.isFunction(c))while(d=f[e++])"+"===d[0]?(d=d.slice(1)||"*",(a[d]=a[d]||[]).unshift(c)):(a[d]=a[d]||[]).push(c)}}function rb(a,b,c,d){var e={},f=a===mb;function g(h){var i;return e[h]=!0,n.each(a[h]||[],function(a,h){var j=h(b,c,d);return"string"!=typeof j||f||e[j]?f?!(i=j):void 0:(b.dataTypes.unshift(j),g(j),!1)}),i}return g(b.dataTypes[0])||!e["*"]&&g("*")}function sb(a,b){var c,d,e=n.ajaxSettings.flatOptions||{};for(c in b)void 0!==b[c]&&((e[c]?a:d||(d={}))[c]=b[c]);return d&&n.extend(!0,a,d),a}function tb(a,b,c){var d,e,f,g,h=a.contents,i=a.dataTypes;while("*"===i[0])i.shift(),void 0===d&&(d=a.mimeType||b.getResponseHeader("Content-Type"));if(d)for(e in h)if(h[e]&&h[e].test(d)){i.unshift(e);break}if(i[0]in c)f=i[0];else{for(e in c){if(!i[0]||a.converters[e+" "+i[0]]){f=e;break}g||(g=e)}f=f||g}return f?(f!==i[0]&&i.unshift(f),c[f]):void 0}function ub(a,b,c,d){var e,f,g,h,i,j={},k=a.dataTypes.slice();if(k[1])for(g in a.converters)j[g.toLowerCase()]=a.converters[g];f=k.shift();while(f)if(a.responseFields[f]&&(c[a.responseFields[f]]=b),!i&&d&&a.dataFilter&&(b=a.dataFilter(b,a.dataType)),i=f,f=k.shift())if("*"===f)f=i;else if("*"!==i&&i!==f){if(g=j[i+" "+f]||j["* "+f],!g)for(e in j)if(h=e.split(" "),h[1]===f&&(g=j[i+" "+h[0]]||j["* "+h[0]])){g===!0?g=j[e]:j[e]!==!0&&(f=h[0],k.unshift(h[1]));break}if(g!==!0)if(g&&a["throws"])b=g(b);else try{b=g(b)}catch(l){return{state:"parsererror",error:g?l:"No conversion from "+i+" to "+f}}}return{state:"success",data:b}}n.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:ob,type:"GET",isLocal:hb.test(pb[1]),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":nb,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":n.parseJSON,"text xml":n.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(a,b){return b?sb(sb(a,n.ajaxSettings),b):sb(n.ajaxSettings,a)},ajaxPrefilter:qb(lb),ajaxTransport:qb(mb),ajax:function(a,b){"object"==typeof a&&(b=a,a=void 0),b=b||{};var c,d,e,f,g,h,i,j,k=n.ajaxSetup({},b),l=k.context||k,m=k.context&&(l.nodeType||l.jquery)?n(l):n.event,o=n.Deferred(),p=n.Callbacks("once memory"),q=k.statusCode||{},r={},s={},t=0,u="canceled",v={readyState:0,getResponseHeader:function(a){var b;if(2===t){if(!f){f={};while(b=gb.exec(e))f[b[1].toLowerCase()]=b[2]}b=f[a.toLowerCase()]}return null==b?null:b},getAllResponseHeaders:function(){return 2===t?e:null},setRequestHeader:function(a,b){var c=a.toLowerCase();return t||(a=s[c]=s[c]||a,r[a]=b),this},overrideMimeType:function(a){return t||(k.mimeType=a),this},statusCode:function(a){var b;if(a)if(2>t)for(b in a)q[b]=[q[b],a[b]];else v.always(a[v.status]);return this},abort:function(a){var b=a||u;return c&&c.abort(b),x(0,b),this}};if(o.promise(v).complete=p.add,v.success=v.done,v.error=v.fail,k.url=((a||k.url||ob)+"").replace(eb,"").replace(jb,pb[1]+"//"),k.type=b.method||b.type||k.method||k.type,k.dataTypes=n.trim(k.dataType||"*").toLowerCase().match(E)||[""],null==k.crossDomain&&(h=kb.exec(k.url.toLowerCase()),k.crossDomain=!(!h||h[1]===pb[1]&&h[2]===pb[2]&&(h[3]||("http:"===h[1]?"80":"443"))===(pb[3]||("http:"===pb[1]?"80":"443")))),k.data&&k.processData&&"string"!=typeof k.data&&(k.data=n.param(k.data,k.traditional)),rb(lb,k,b,v),2===t)return v;i=n.event&&k.global,i&&0===n.active++&&n.event.trigger("ajaxStart"),k.type=k.type.toUpperCase(),k.hasContent=!ib.test(k.type),d=k.url,k.hasContent||(k.data&&(d=k.url+=(db.test(d)?"&":"?")+k.data,delete k.data),k.cache===!1&&(k.url=fb.test(d)?d.replace(fb,"$1_="+cb++):d+(db.test(d)?"&":"?")+"_="+cb++)),k.ifModified&&(n.lastModified[d]&&v.setRequestHeader("If-Modified-Since",n.lastModified[d]),n.etag[d]&&v.setRequestHeader("If-None-Match",n.etag[d])),(k.data&&k.hasContent&&k.contentType!==!1||b.contentType)&&v.setRequestHeader("Content-Type",k.contentType),v.setRequestHeader("Accept",k.dataTypes[0]&&k.accepts[k.dataTypes[0]]?k.accepts[k.dataTypes[0]]+("*"!==k.dataTypes[0]?", "+nb+"; q=0.01":""):k.accepts["*"]);for(j in k.headers)v.setRequestHeader(j,k.headers[j]);if(k.beforeSend&&(k.beforeSend.call(l,v,k)===!1||2===t))return v.abort();u="abort";for(j in{success:1,error:1,complete:1})v[j](k[j]);if(c=rb(mb,k,b,v)){v.readyState=1,i&&m.trigger("ajaxSend",[v,k]),k.async&&k.timeout>0&&(g=setTimeout(function(){v.abort("timeout")},k.timeout));try{t=1,c.send(r,x)}catch(w){if(!(2>t))throw w;x(-1,w)}}else x(-1,"No Transport");function x(a,b,f,h){var j,r,s,u,w,x=b;2!==t&&(t=2,g&&clearTimeout(g),c=void 0,e=h||"",v.readyState=a>0?4:0,j=a>=200&&300>a||304===a,f&&(u=tb(k,v,f)),u=ub(k,u,v,j),j?(k.ifModified&&(w=v.getResponseHeader("Last-Modified"),w&&(n.lastModified[d]=w),w=v.getResponseHeader("etag"),w&&(n.etag[d]=w)),204===a||"HEAD"===k.type?x="nocontent":304===a?x="notmodified":(x=u.state,r=u.data,s=u.error,j=!s)):(s=x,(a||!x)&&(x="error",0>a&&(a=0))),v.status=a,v.statusText=(b||x)+"",j?o.resolveWith(l,[r,x,v]):o.rejectWith(l,[v,x,s]),v.statusCode(q),q=void 0,i&&m.trigger(j?"ajaxSuccess":"ajaxError",[v,k,j?r:s]),p.fireWith(l,[v,x]),i&&(m.trigger("ajaxComplete",[v,k]),--n.active||n.event.trigger("ajaxStop")))}return v},getJSON:function(a,b,c){return n.get(a,b,c,"json")},getScript:function(a,b){return n.get(a,void 0,b,"script")}}),n.each(["get","post"],function(a,b){n[b]=function(a,c,d,e){return n.isFunction(c)&&(e=e||d,d=c,c=void 0),n.ajax({url:a,type:b,dataType:e,data:c,success:d})}}),n._evalUrl=function(a){return n.ajax({url:a,type:"GET",dataType:"script",async:!1,global:!1,"throws":!0})},n.fn.extend({wrapAll:function(a){var b;return n.isFunction(a)?this.each(function(b){n(this).wrapAll(a.call(this,b))}):(this[0]&&(b=n(a,this[0].ownerDocument).eq(0).clone(!0),this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstElementChild)a=a.firstElementChild;return a}).append(this)),this)},wrapInner:function(a){return this.each(n.isFunction(a)?function(b){n(this).wrapInner(a.call(this,b))}:function(){var b=n(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=n.isFunction(a);return this.each(function(c){n(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){n.nodeName(this,"body")||n(this).replaceWith(this.childNodes)}).end()}}),n.expr.filters.hidden=function(a){return a.offsetWidth<=0&&a.offsetHeight<=0},n.expr.filters.visible=function(a){return!n.expr.filters.hidden(a)};var vb=/%20/g,wb=/\[\]$/,xb=/\r?\n/g,yb=/^(?:submit|button|image|reset|file)$/i,zb=/^(?:input|select|textarea|keygen)/i;function Ab(a,b,c,d){var e;if(n.isArray(b))n.each(b,function(b,e){c||wb.test(a)?d(a,e):Ab(a+"["+("object"==typeof e?b:"")+"]",e,c,d)});else if(c||"object"!==n.type(b))d(a,b);else for(e in b)Ab(a+"["+e+"]",b[e],c,d)}n.param=function(a,b){var c,d=[],e=function(a,b){b=n.isFunction(b)?b():null==b?"":b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};if(void 0===b&&(b=n.ajaxSettings&&n.ajaxSettings.traditional),n.isArray(a)||a.jquery&&!n.isPlainObject(a))n.each(a,function(){e(this.name,this.value)});else for(c in a)Ab(c,a[c],b,e);return d.join("&").replace(vb,"+")},n.fn.extend({serialize:function(){return n.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var a=n.prop(this,"elements");return a?n.makeArray(a):this}).filter(function(){var a=this.type;return this.name&&!n(this).is(":disabled")&&zb.test(this.nodeName)&&!yb.test(a)&&(this.checked||!T.test(a))}).map(function(a,b){var c=n(this).val();return null==c?null:n.isArray(c)?n.map(c,function(a){return{name:b.name,value:a.replace(xb,"\r\n")}}):{name:b.name,value:c.replace(xb,"\r\n")}}).get()}}),n.ajaxSettings.xhr=function(){try{return new XMLHttpRequest}catch(a){}};var Bb=0,Cb={},Db={0:200,1223:204},Eb=n.ajaxSettings.xhr();a.attachEvent&&a.attachEvent("onunload",function(){for(var a in Cb)Cb[a]()}),k.cors=!!Eb&&"withCredentials"in Eb,k.ajax=Eb=!!Eb,n.ajaxTransport(function(a){var b;return k.cors||Eb&&!a.crossDomain?{send:function(c,d){var e,f=a.xhr(),g=++Bb;if(f.open(a.type,a.url,a.async,a.username,a.password),a.xhrFields)for(e in a.xhrFields)f[e]=a.xhrFields[e];a.mimeType&&f.overrideMimeType&&f.overrideMimeType(a.mimeType),a.crossDomain||c["X-Requested-With"]||(c["X-Requested-With"]="XMLHttpRequest");for(e in c)f.setRequestHeader(e,c[e]);b=function(a){return function(){b&&(delete Cb[g],b=f.onload=f.onerror=null,"abort"===a?f.abort():"error"===a?d(f.status,f.statusText):d(Db[f.status]||f.status,f.statusText,"string"==typeof f.responseText?{text:f.responseText}:void 0,f.getAllResponseHeaders()))}},f.onload=b(),f.onerror=b("error"),b=Cb[g]=b("abort");try{f.send(a.hasContent&&a.data||null)}catch(h){if(b)throw h}},abort:function(){b&&b()}}:void 0}),n.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/(?:java|ecma)script/},converters:{"text script":function(a){return n.globalEval(a),a}}}),n.ajaxPrefilter("script",function(a){void 0===a.cache&&(a.cache=!1),a.crossDomain&&(a.type="GET")}),n.ajaxTransport("script",function(a){if(a.crossDomain){var b,c;return{send:function(d,e){b=n("<script>").prop({async:!0,charset:a.scriptCharset,src:a.url}).on("load error",c=function(a){b.remove(),c=null,a&&e("error"===a.type?404:200,a.type)}),l.head.appendChild(b[0])},abort:function(){c&&c()}}}});var Fb=[],Gb=/(=)\?(?=&|$)|\?\?/;n.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var a=Fb.pop()||n.expando+"_"+cb++;return this[a]=!0,a}}),n.ajaxPrefilter("json jsonp",function(b,c,d){var e,f,g,h=b.jsonp!==!1&&(Gb.test(b.url)?"url":"string"==typeof b.data&&!(b.contentType||"").indexOf("application/x-www-form-urlencoded")&&Gb.test(b.data)&&"data");return h||"jsonp"===b.dataTypes[0]?(e=b.jsonpCallback=n.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,h?b[h]=b[h].replace(Gb,"$1"+e):b.jsonp!==!1&&(b.url+=(db.test(b.url)?"&":"?")+b.jsonp+"="+e),b.converters["script json"]=function(){return g||n.error(e+" was not called"),g[0]},b.dataTypes[0]="json",f=a[e],a[e]=function(){g=arguments},d.always(function(){a[e]=f,b[e]&&(b.jsonpCallback=c.jsonpCallback,Fb.push(e)),g&&n.isFunction(f)&&f(g[0]),g=f=void 0}),"script"):void 0}),n.parseHTML=function(a,b,c){if(!a||"string"!=typeof a)return null;"boolean"==typeof b&&(c=b,b=!1),b=b||l;var d=v.exec(a),e=!c&&[];return d?[b.createElement(d[1])]:(d=n.buildFragment([a],b,e),e&&e.length&&n(e).remove(),n.merge([],d.childNodes))};var Hb=n.fn.load;n.fn.load=function(a,b,c){if("string"!=typeof a&&Hb)return Hb.apply(this,arguments);var d,e,f,g=this,h=a.indexOf(" ");return h>=0&&(d=n.trim(a.slice(h)),a=a.slice(0,h)),n.isFunction(b)?(c=b,b=void 0):b&&"object"==typeof b&&(e="POST"),g.length>0&&n.ajax({url:a,type:e,dataType:"html",data:b}).done(function(a){f=arguments,g.html(d?n("<div>").append(n.parseHTML(a)).find(d):a)}).complete(c&&function(a,b){g.each(c,f||[a.responseText,b,a])}),this},n.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(a,b){n.fn[b]=function(a){return this.on(b,a)}}),n.expr.filters.animated=function(a){return n.grep(n.timers,function(b){return a===b.elem}).length};var Ib=a.document.documentElement;function Jb(a){return n.isWindow(a)?a:9===a.nodeType&&a.defaultView}n.offset={setOffset:function(a,b,c){var d,e,f,g,h,i,j,k=n.css(a,"position"),l=n(a),m={};"static"===k&&(a.style.position="relative"),h=l.offset(),f=n.css(a,"top"),i=n.css(a,"left"),j=("absolute"===k||"fixed"===k)&&(f+i).indexOf("auto")>-1,j?(d=l.position(),g=d.top,e=d.left):(g=parseFloat(f)||0,e=parseFloat(i)||0),n.isFunction(b)&&(b=b.call(a,c,h)),null!=b.top&&(m.top=b.top-h.top+g),null!=b.left&&(m.left=b.left-h.left+e),"using"in b?b.using.call(a,m):l.css(m)}},n.fn.extend({offset:function(a){if(arguments.length)return void 0===a?this:this.each(function(b){n.offset.setOffset(this,a,b)});var b,c,d=this[0],e={top:0,left:0},f=d&&d.ownerDocument;if(f)return b=f.documentElement,n.contains(b,d)?(typeof d.getBoundingClientRect!==U&&(e=d.getBoundingClientRect()),c=Jb(f),{top:e.top+c.pageYOffset-b.clientTop,left:e.left+c.pageXOffset-b.clientLeft}):e},position:function(){if(this[0]){var a,b,c=this[0],d={top:0,left:0};return"fixed"===n.css(c,"position")?b=c.getBoundingClientRect():(a=this.offsetParent(),b=this.offset(),n.nodeName(a[0],"html")||(d=a.offset()),d.top+=n.css(a[0],"borderTopWidth",!0),d.left+=n.css(a[0],"borderLeftWidth",!0)),{top:b.top-d.top-n.css(c,"marginTop",!0),left:b.left-d.left-n.css(c,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||Ib;while(a&&!n.nodeName(a,"html")&&"static"===n.css(a,"position"))a=a.offsetParent;return a||Ib})}}),n.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(b,c){var d="pageYOffset"===c;n.fn[b]=function(e){return J(this,function(b,e,f){var g=Jb(b);return void 0===f?g?g[c]:b[e]:void(g?g.scrollTo(d?a.pageXOffset:f,d?f:a.pageYOffset):b[e]=f)},b,e,arguments.length,null)}}),n.each(["top","left"],function(a,b){n.cssHooks[b]=ya(k.pixelPosition,function(a,c){return c?(c=xa(a,b),va.test(c)?n(a).position()[b]+"px":c):void 0})}),n.each({Height:"height",Width:"width"},function(a,b){n.each({padding:"inner"+a,content:b,"":"outer"+a},function(c,d){n.fn[d]=function(d,e){var f=arguments.length&&(c||"boolean"!=typeof d),g=c||(d===!0||e===!0?"margin":"border");return J(this,function(b,c,d){var e;return n.isWindow(b)?b.document.documentElement["client"+a]:9===b.nodeType?(e=b.documentElement,Math.max(b.body["scroll"+a],e["scroll"+a],b.body["offset"+a],e["offset"+a],e["client"+a])):void 0===d?n.css(b,c,g):n.style(b,c,d,g)},b,f?d:void 0,f,null)}})}),n.fn.size=function(){return this.length},n.fn.andSelf=n.fn.addBack,"function"==typeof define&&define.amd&&define("jquery",[],function(){return n});var Kb=a.jQuery,Lb=a.$;return n.noConflict=function(b){return a.$===n&&(a.$=Lb),b&&a.jQuery===n&&(a.jQuery=Kb),n},typeof b===U&&(a.jQuery=a.$=n),n});
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/shared/admin/js/vendor/react-0.13.3.min.js b/Godeps/_workspace/src/github.com/influxdb/influxdb/shared/admin/js/vendor/react-0.13.3.min.js
deleted file mode 100644
index 64aca4baa..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/shared/admin/js/vendor/react-0.13.3.min.js
+++ /dev/null
@@ -1,16 +0,0 @@
-/**
- * React v0.13.3
- *
- * Copyright 2013-2015, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- *
- */
-!function(e){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=e();else if("function"==typeof define&&define.amd)define([],e);else{var t;t="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:this,t.React=e()}}(function(){return function e(t,n,r){function o(a,u){if(!n[a]){if(!t[a]){var s="function"==typeof require&&require;if(!u&&s)return s(a,!0);if(i)return i(a,!0);var l=new Error("Cannot find module '"+a+"'");throw l.code="MODULE_NOT_FOUND",l}var c=n[a]={exports:{}};t[a][0].call(c.exports,function(e){var n=t[a][1][e];return o(n?n:e)},c,c.exports,e,t,n,r)}return n[a].exports}for(var i="function"==typeof require&&require,a=0;a<r.length;a++)o(r[a]);return o}({1:[function(e,t,n){"use strict";var r=e(19),o=e(32),i=e(34),a=e(33),u=e(38),s=e(39),l=e(55),c=(e(56),e(40)),p=e(51),d=e(54),f=e(64),h=e(68),m=e(73),v=e(76),g=e(79),y=e(82),C=e(27),E=e(115),b=e(142);d.inject();var _=l.createElement,x=l.createFactory,D=l.cloneElement,M=m.measure("React","render",h.render),N={Children:{map:o.map,forEach:o.forEach,count:o.count,only:b},Component:i,DOM:c,PropTypes:v,initializeTouchEvents:function(e){r.useTouchEvents=e},createClass:a.createClass,createElement:_,cloneElement:D,createFactory:x,createMixin:function(e){return e},constructAndRenderComponent:h.constructAndRenderComponent,constructAndRenderComponentByID:h.constructAndRenderComponentByID,findDOMNode:E,render:M,renderToString:y.renderToString,renderToStaticMarkup:y.renderToStaticMarkup,unmountComponentAtNode:h.unmountComponentAtNode,isValidElement:l.isValidElement,withContext:u.withContext,__spread:C};"undefined"!=typeof __REACT_DEVTOOLS_GLOBAL_HOOK__&&"function"==typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.inject&&__REACT_DEVTOOLS_GLOBAL_HOOK__.inject({CurrentOwner:s,InstanceHandles:f,Mount:h,Reconciler:g,TextComponent:p});N.version="0.13.3",t.exports=N},{115:115,142:142,19:19,27:27,32:32,33:33,34:34,38:38,39:39,40:40,51:51,54:54,55:55,56:56,64:64,68:68,73:73,76:76,79:79,82:82}],2:[function(e,t,n){"use strict";var r=e(117),o={componentDidMount:function(){this.props.autoFocus&&r(this.getDOMNode())}};t.exports=o},{117:117}],3:[function(e,t,n){"use strict";function r(){var e=window.opera;return"object"==typeof e&&"function"==typeof e.version&&parseInt(e.version(),10)<=12}function o(e){return(e.ctrlKey||e.altKey||e.metaKey)&&!(e.ctrlKey&&e.altKey)}function i(e){switch(e){case T.topCompositionStart:return P.compositionStart;case T.topCompositionEnd:return P.compositionEnd;case T.topCompositionUpdate:return P.compositionUpdate}}function a(e,t){return e===T.topKeyDown&&t.keyCode===b}function u(e,t){switch(e){case T.topKeyUp:return-1!==E.indexOf(t.keyCode);case T.topKeyDown:return t.keyCode!==b;case T.topKeyPress:case T.topMouseDown:case T.topBlur:return!0;default:return!1}}function s(e){var t=e.detail;return"object"==typeof t&&"data"in t?t.data:null}function l(e,t,n,r){var o,l;if(_?o=i(e):w?u(e,r)&&(o=P.compositionEnd):a(e,r)&&(o=P.compositionStart),!o)return null;M&&(w||o!==P.compositionStart?o===P.compositionEnd&&w&&(l=w.getData()):w=v.getPooled(t));var c=g.getPooled(o,n,r);if(l)c.data=l;else{var p=s(r);null!==p&&(c.data=p)}return h.accumulateTwoPhaseDispatches(c),c}function c(e,t){switch(e){case T.topCompositionEnd:return s(t);case T.topKeyPress:var n=t.which;return n!==N?null:(R=!0,I);case T.topTextInput:var r=t.data;return r===I&&R?null:r;default:return null}}function p(e,t){if(w){if(e===T.topCompositionEnd||u(e,t)){var n=w.getData();return v.release(w),w=null,n}return null}switch(e){case T.topPaste:return null;case T.topKeyPress:return t.which&&!o(t)?String.fromCharCode(t.which):null;case T.topCompositionEnd:return M?null:t.data;default:return null}}function d(e,t,n,r){var o;if(o=D?c(e,r):p(e,r),!o)return null;var i=y.getPooled(P.beforeInput,n,r);return i.data=o,h.accumulateTwoPhaseDispatches(i),i}var f=e(15),h=e(20),m=e(21),v=e(22),g=e(91),y=e(95),C=e(139),E=[9,13,27,32],b=229,_=m.canUseDOM&&"CompositionEvent"in window,x=null;m.canUseDOM&&"documentMode"in document&&(x=document.documentMode);var D=m.canUseDOM&&"TextEvent"in window&&!x&&!r(),M=m.canUseDOM&&(!_||x&&x>8&&11>=x),N=32,I=String.fromCharCode(N),T=f.topLevelTypes,P={beforeInput:{phasedRegistrationNames:{bubbled:C({onBeforeInput:null}),captured:C({onBeforeInputCapture:null})},dependencies:[T.topCompositionEnd,T.topKeyPress,T.topTextInput,T.topPaste]},compositionEnd:{phasedRegistrationNames:{bubbled:C({onCompositionEnd:null}),captured:C({onCompositionEndCapture:null})},dependencies:[T.topBlur,T.topCompositionEnd,T.topKeyDown,T.topKeyPress,T.topKeyUp,T.topMouseDown]},compositionStart:{phasedRegistrationNames:{bubbled:C({onCompositionStart:null}),captured:C({onCompositionStartCapture:null})},dependencies:[T.topBlur,T.topCompositionStart,T.topKeyDown,T.topKeyPress,T.topKeyUp,T.topMouseDown]},compositionUpdate:{phasedRegistrationNames:{bubbled:C({onCompositionUpdate:null}),captured:C({onCompositionUpdateCapture:null})},dependencies:[T.topBlur,T.topCompositionUpdate,T.topKeyDown,T.topKeyPress,T.topKeyUp,T.topMouseDown]}},R=!1,w=null,O={eventTypes:P,extractEvents:function(e,t,n,r){return[l(e,t,n,r),d(e,t,n,r)]}};t.exports=O},{139:139,15:15,20:20,21:21,22:22,91:91,95:95}],4:[function(e,t,n){"use strict";function r(e,t){return e+t.charAt(0).toUpperCase()+t.substring(1)}var o={boxFlex:!0,boxFlexGroup:!0,columnCount:!0,flex:!0,flexGrow:!0,flexPositive:!0,flexShrink:!0,flexNegative:!0,fontWeight:!0,lineClamp:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0,fillOpacity:!0,strokeDashoffset:!0,strokeOpacity:!0,strokeWidth:!0},i=["Webkit","ms","Moz","O"];Object.keys(o).forEach(function(e){i.forEach(function(t){o[r(t,e)]=o[e]})});var a={background:{backgroundImage:!0,backgroundPosition:!0,backgroundRepeat:!0,backgroundColor:!0},border:{borderWidth:!0,borderStyle:!0,borderColor:!0},borderBottom:{borderBottomWidth:!0,borderBottomStyle:!0,borderBottomColor:!0},borderLeft:{borderLeftWidth:!0,borderLeftStyle:!0,borderLeftColor:!0},borderRight:{borderRightWidth:!0,borderRightStyle:!0,borderRightColor:!0},borderTop:{borderTopWidth:!0,borderTopStyle:!0,borderTopColor:!0},font:{fontStyle:!0,fontVariant:!0,fontWeight:!0,fontSize:!0,lineHeight:!0,fontFamily:!0}},u={isUnitlessNumber:o,shorthandPropertyExpansions:a};t.exports=u},{}],5:[function(e,t,n){"use strict";var r=e(4),o=e(21),i=(e(106),e(111)),a=e(131),u=e(141),s=(e(150),u(function(e){return a(e)})),l="cssFloat";o.canUseDOM&&void 0===document.documentElement.style.cssFloat&&(l="styleFloat");var c={createMarkupForStyles:function(e){var t="";for(var n in e)if(e.hasOwnProperty(n)){var r=e[n];null!=r&&(t+=s(n)+":",t+=i(n,r)+";")}return t||null},setValueForStyles:function(e,t){var n=e.style;for(var o in t)if(t.hasOwnProperty(o)){var a=i(o,t[o]);if("float"===o&&(o=l),a)n[o]=a;else{var u=r.shorthandPropertyExpansions[o];if(u)for(var s in u)n[s]="";else n[o]=""}}}};t.exports=c},{106:106,111:111,131:131,141:141,150:150,21:21,4:4}],6:[function(e,t,n){"use strict";function r(){this._callbacks=null,this._contexts=null}var o=e(28),i=e(27),a=e(133);i(r.prototype,{enqueue:function(e,t){this._callbacks=this._callbacks||[],this._contexts=this._contexts||[],this._callbacks.push(e),this._contexts.push(t)},notifyAll:function(){var e=this._callbacks,t=this._contexts;if(e){a(e.length===t.length),this._callbacks=null,this._contexts=null;for(var n=0,r=e.length;r>n;n++)e[n].call(t[n]);e.length=0,t.length=0}},reset:function(){this._callbacks=null,this._contexts=null},destructor:function(){this.reset()}}),o.addPoolingTo(r),t.exports=r},{133:133,27:27,28:28}],7:[function(e,t,n){"use strict";function r(e){return"SELECT"===e.nodeName||"INPUT"===e.nodeName&&"file"===e.type}function o(e){var t=x.getPooled(T.change,R,e);E.accumulateTwoPhaseDispatches(t),_.batchedUpdates(i,t)}function i(e){C.enqueueEvents(e),C.processEventQueue()}function a(e,t){P=e,R=t,P.attachEvent("onchange",o)}function u(){P&&(P.detachEvent("onchange",o),P=null,R=null)}function s(e,t,n){return e===I.topChange?n:void 0}function l(e,t,n){e===I.topFocus?(u(),a(t,n)):e===I.topBlur&&u()}function c(e,t){P=e,R=t,w=e.value,O=Object.getOwnPropertyDescriptor(e.constructor.prototype,"value"),Object.defineProperty(P,"value",k),P.attachEvent("onpropertychange",d)}function p(){P&&(delete P.value,P.detachEvent("onpropertychange",d),P=null,R=null,w=null,O=null)}function d(e){if("value"===e.propertyName){var t=e.srcElement.value;t!==w&&(w=t,o(e))}}function f(e,t,n){return e===I.topInput?n:void 0}function h(e,t,n){e===I.topFocus?(p(),c(t,n)):e===I.topBlur&&p()}function m(e,t,n){return e!==I.topSelectionChange&&e!==I.topKeyUp&&e!==I.topKeyDown||!P||P.value===w?void 0:(w=P.value,R)}function v(e){return"INPUT"===e.nodeName&&("checkbox"===e.type||"radio"===e.type)}function g(e,t,n){return e===I.topClick?n:void 0}var y=e(15),C=e(17),E=e(20),b=e(21),_=e(85),x=e(93),D=e(134),M=e(136),N=e(139),I=y.topLevelTypes,T={change:{phasedRegistrationNames:{bubbled:N({onChange:null}),captured:N({onChangeCapture:null})},dependencies:[I.topBlur,I.topChange,I.topClick,I.topFocus,I.topInput,I.topKeyDown,I.topKeyUp,I.topSelectionChange]}},P=null,R=null,w=null,O=null,S=!1;b.canUseDOM&&(S=D("change")&&(!("documentMode"in document)||document.documentMode>8));var A=!1;b.canUseDOM&&(A=D("input")&&(!("documentMode"in document)||document.documentMode>9));var k={get:function(){return O.get.call(this)},set:function(e){w=""+e,O.set.call(this,e)}},L={eventTypes:T,extractEvents:function(e,t,n,o){var i,a;if(r(t)?S?i=s:a=l:M(t)?A?i=f:(i=m,a=h):v(t)&&(i=g),i){var u=i(e,t,n);if(u){var c=x.getPooled(T.change,u,o);return E.accumulateTwoPhaseDispatches(c),c}}a&&a(e,t,n)}};t.exports=L},{134:134,136:136,139:139,15:15,17:17,20:20,21:21,85:85,93:93}],8:[function(e,t,n){"use strict";var r=0,o={createReactRootIndex:function(){return r++}};t.exports=o},{}],9:[function(e,t,n){"use strict";function r(e,t,n){e.insertBefore(t,e.childNodes[n]||null)}var o=e(12),i=e(70),a=e(145),u=e(133),s={dangerouslyReplaceNodeWithMarkup:o.dangerouslyReplaceNodeWithMarkup,updateTextContent:a,processUpdates:function(e,t){for(var n,s=null,l=null,c=0;c<e.length;c++)if(n=e[c],n.type===i.MOVE_EXISTING||n.type===i.REMOVE_NODE){var p=n.fromIndex,d=n.parentNode.childNodes[p],f=n.parentID;u(d),s=s||{},s[f]=s[f]||[],s[f][p]=d,l=l||[],l.push(d)}var h=o.dangerouslyRenderMarkup(t);if(l)for(var m=0;m<l.length;m++)l[m].parentNode.removeChild(l[m]);for(var v=0;v<e.length;v++)switch(n=e[v],n.type){case i.INSERT_MARKUP:r(n.parentNode,h[n.markupIndex],n.toIndex);break;case i.MOVE_EXISTING:r(n.parentNode,s[n.parentID][n.fromIndex],n.toIndex);break;case i.TEXT_CONTENT:a(n.parentNode,n.textContent);break;case i.REMOVE_NODE:}}};t.exports=s},{12:12,133:133,145:145,70:70}],10:[function(e,t,n){"use strict";function r(e,t){return(e&t)===t}var o=e(133),i={MUST_USE_ATTRIBUTE:1,MUST_USE_PROPERTY:2,HAS_SIDE_EFFECTS:4,HAS_BOOLEAN_VALUE:8,HAS_NUMERIC_VALUE:16,HAS_POSITIVE_NUMERIC_VALUE:48,HAS_OVERLOADED_BOOLEAN_VALUE:64,injectDOMPropertyConfig:function(e){var t=e.Properties||{},n=e.DOMAttributeNames||{},a=e.DOMPropertyNames||{},s=e.DOMMutationMethods||{};e.isCustomAttribute&&u._isCustomAttributeFunctions.push(e.isCustomAttribute);for(var l in t){o(!u.isStandardName.hasOwnProperty(l)),u.isStandardName[l]=!0;var c=l.toLowerCase();if(u.getPossibleStandardName[c]=l,n.hasOwnProperty(l)){var p=n[l];u.getPossibleStandardName[p]=l,u.getAttributeName[l]=p}else u.getAttributeName[l]=c;u.getPropertyName[l]=a.hasOwnProperty(l)?a[l]:l,s.hasOwnProperty(l)?u.getMutationMethod[l]=s[l]:u.getMutationMethod[l]=null;var d=t[l];u.mustUseAttribute[l]=r(d,i.MUST_USE_ATTRIBUTE),u.mustUseProperty[l]=r(d,i.MUST_USE_PROPERTY),u.hasSideEffects[l]=r(d,i.HAS_SIDE_EFFECTS),u.hasBooleanValue[l]=r(d,i.HAS_BOOLEAN_VALUE),u.hasNumericValue[l]=r(d,i.HAS_NUMERIC_VALUE),u.hasPositiveNumericValue[l]=r(d,i.HAS_POSITIVE_NUMERIC_VALUE),u.hasOverloadedBooleanValue[l]=r(d,i.HAS_OVERLOADED_BOOLEAN_VALUE),o(!u.mustUseAttribute[l]||!u.mustUseProperty[l]),o(u.mustUseProperty[l]||!u.hasSideEffects[l]),o(!!u.hasBooleanValue[l]+!!u.hasNumericValue[l]+!!u.hasOverloadedBooleanValue[l]<=1)}}},a={},u={ID_ATTRIBUTE_NAME:"data-reactid",isStandardName:{},getPossibleStandardName:{},getAttributeName:{},getPropertyName:{},getMutationMethod:{},mustUseAttribute:{},mustUseProperty:{},hasSideEffects:{},hasBooleanValue:{},hasNumericValue:{},hasPositiveNumericValue:{},hasOverloadedBooleanValue:{},_isCustomAttributeFunctions:[],isCustomAttribute:function(e){for(var t=0;t<u._isCustomAttributeFunctions.length;t++){var n=u._isCustomAttributeFunctions[t];if(n(e))return!0}return!1},getDefaultValueForProperty:function(e,t){var n,r=a[e];return r||(a[e]=r={}),t in r||(n=document.createElement(e),r[t]=n[t]),r[t]},injection:i};t.exports=u},{133:133}],11:[function(e,t,n){"use strict";function r(e,t){return null==t||o.hasBooleanValue[e]&&!t||o.hasNumericValue[e]&&isNaN(t)||o.hasPositiveNumericValue[e]&&1>t||o.hasOverloadedBooleanValue[e]&&t===!1}var o=e(10),i=e(143),a=(e(150),{createMarkupForID:function(e){return o.ID_ATTRIBUTE_NAME+"="+i(e)},createMarkupForProperty:function(e,t){if(o.isStandardName.hasOwnProperty(e)&&o.isStandardName[e]){if(r(e,t))return"";var n=o.getAttributeName[e];return o.hasBooleanValue[e]||o.hasOverloadedBooleanValue[e]&&t===!0?n:n+"="+i(t)}return o.isCustomAttribute(e)?null==t?"":e+"="+i(t):null},setValueForProperty:function(e,t,n){if(o.isStandardName.hasOwnProperty(t)&&o.isStandardName[t]){var i=o.getMutationMethod[t];if(i)i(e,n);else if(r(t,n))this.deleteValueForProperty(e,t);else if(o.mustUseAttribute[t])e.setAttribute(o.getAttributeName[t],""+n);else{var a=o.getPropertyName[t];o.hasSideEffects[t]&&""+e[a]==""+n||(e[a]=n)}}else o.isCustomAttribute(t)&&(null==n?e.removeAttribute(t):e.setAttribute(t,""+n))},deleteValueForProperty:function(e,t){if(o.isStandardName.hasOwnProperty(t)&&o.isStandardName[t]){var n=o.getMutationMethod[t];if(n)n(e,void 0);else if(o.mustUseAttribute[t])e.removeAttribute(o.getAttributeName[t]);else{var r=o.getPropertyName[t],i=o.getDefaultValueForProperty(e.nodeName,r);o.hasSideEffects[t]&&""+e[r]===i||(e[r]=i)}}else o.isCustomAttribute(t)&&e.removeAttribute(t)}});t.exports=a},{10:10,143:143,150:150}],12:[function(e,t,n){"use strict";function r(e){return e.substring(1,e.indexOf(" "))}var o=e(21),i=e(110),a=e(112),u=e(125),s=e(133),l=/^(<[^ \/>]+)/,c="data-danger-index",p={dangerouslyRenderMarkup:function(e){s(o.canUseDOM);for(var t,n={},p=0;p<e.length;p++)s(e[p]),t=r(e[p]),t=u(t)?t:"*",n[t]=n[t]||[],n[t][p]=e[p];var d=[],f=0;for(t in n)if(n.hasOwnProperty(t)){var h,m=n[t];for(h in m)if(m.hasOwnProperty(h)){var v=m[h];m[h]=v.replace(l,"$1 "+c+'="'+h+'" ')}for(var g=i(m.join(""),a),y=0;y<g.length;++y){var C=g[y];C.hasAttribute&&C.hasAttribute(c)&&(h=+C.getAttribute(c),C.removeAttribute(c),s(!d.hasOwnProperty(h)),d[h]=C,f+=1)}}return s(f===d.length),s(d.length===e.length),d},dangerouslyReplaceNodeWithMarkup:function(e,t){s(o.canUseDOM),s(t),s("html"!==e.tagName.toLowerCase());var n=i(t,a)[0];e.parentNode.replaceChild(n,e)}};t.exports=p},{110:110,112:112,125:125,133:133,21:21}],13:[function(e,t,n){"use strict";var r=e(139),o=[r({ResponderEventPlugin:null}),r({SimpleEventPlugin:null}),r({TapEventPlugin:null}),r({EnterLeaveEventPlugin:null}),r({ChangeEventPlugin:null}),r({SelectEventPlugin:null}),r({BeforeInputEventPlugin:null}),r({AnalyticsEventPlugin:null}),r({MobileSafariClickEventPlugin:null})];t.exports=o},{139:139}],14:[function(e,t,n){"use strict";var r=e(15),o=e(20),i=e(97),a=e(68),u=e(139),s=r.topLevelTypes,l=a.getFirstReactDOM,c={mouseEnter:{registrationName:u({onMouseEnter:null}),dependencies:[s.topMouseOut,s.topMouseOver]},mouseLeave:{registrationName:u({onMouseLeave:null}),dependencies:[s.topMouseOut,s.topMouseOver]}},p=[null,null],d={eventTypes:c,extractEvents:function(e,t,n,r){if(e===s.topMouseOver&&(r.relatedTarget||r.fromElement))return null;if(e!==s.topMouseOut&&e!==s.topMouseOver)return null;var u;if(t.window===t)u=t;else{var d=t.ownerDocument;u=d?d.defaultView||d.parentWindow:window}var f,h;if(e===s.topMouseOut?(f=t,h=l(r.relatedTarget||r.toElement)||u):(f=u,h=t),f===h)return null;var m=f?a.getID(f):"",v=h?a.getID(h):"",g=i.getPooled(c.mouseLeave,m,r);g.type="mouseleave",g.target=f,g.relatedTarget=h;var y=i.getPooled(c.mouseEnter,v,r);return y.type="mouseenter",y.target=h,y.relatedTarget=f,o.accumulateEnterLeaveDispatches(g,y,m,v),p[0]=g,p[1]=y,p}};t.exports=d},{139:139,15:15,20:20,68:68,97:97}],15:[function(e,t,n){"use strict";var r=e(138),o=r({bubbled:null,captured:null}),i=r({topBlur:null,topChange:null,topClick:null,topCompositionEnd:null,topCompositionStart:null,topCompositionUpdate:null,topContextMenu:null,topCopy:null,topCut:null,topDoubleClick:null,topDrag:null,topDragEnd:null,topDragEnter:null,topDragExit:null,topDragLeave:null,topDragOver:null,topDragStart:null,topDrop:null,topError:null,topFocus:null,topInput:null,topKeyDown:null,topKeyPress:null,topKeyUp:null,topLoad:null,topMouseDown:null,topMouseMove:null,topMouseOut:null,topMouseOver:null,topMouseUp:null,topPaste:null,topReset:null,topScroll:null,topSelectionChange:null,topSubmit:null,topTextInput:null,topTouchCancel:null,topTouchEnd:null,topTouchMove:null,topTouchStart:null,topWheel:null}),a={topLevelTypes:i,PropagationPhases:o};t.exports=a},{138:138}],16:[function(e,t,n){var r=e(112),o={listen:function(e,t,n){return e.addEventListener?(e.addEventListener(t,n,!1),{remove:function(){e.removeEventListener(t,n,!1)}}):e.attachEvent?(e.attachEvent("on"+t,n),{remove:function(){e.detachEvent("on"+t,n)}}):void 0},capture:function(e,t,n){return e.addEventListener?(e.addEventListener(t,n,!0),{remove:function(){e.removeEventListener(t,n,!0)}}):{remove:r}},registerDefault:function(){}};t.exports=o},{112:112}],17:[function(e,t,n){"use strict";var r=e(18),o=e(19),i=e(103),a=e(118),u=e(133),s={},l=null,c=function(e){if(e){var t=o.executeDispatch,n=r.getPluginModuleForEvent(e);n&&n.executeDispatch&&(t=n.executeDispatch),o.executeDispatchesInOrder(e,t),e.isPersistent()||e.constructor.release(e)}},p=null,d={injection:{injectMount:o.injection.injectMount,injectInstanceHandle:function(e){p=e},getInstanceHandle:function(){return p},injectEventPluginOrder:r.injectEventPluginOrder,injectEventPluginsByName:r.injectEventPluginsByName},eventNameDispatchConfigs:r.eventNameDispatchConfigs,registrationNameModules:r.registrationNameModules,putListener:function(e,t,n){u(!n||"function"==typeof n);var r=s[t]||(s[t]={});r[e]=n},getListener:function(e,t){var n=s[t];return n&&n[e]},deleteListener:function(e,t){var n=s[t];n&&delete n[e]},deleteAllListeners:function(e){for(var t in s)delete s[t][e]},extractEvents:function(e,t,n,o){for(var a,u=r.plugins,s=0,l=u.length;l>s;s++){var c=u[s];if(c){var p=c.extractEvents(e,t,n,o);p&&(a=i(a,p))}}return a},enqueueEvents:function(e){e&&(l=i(l,e))},processEventQueue:function(){var e=l;l=null,a(e,c),u(!l)},__purge:function(){s={}},__getListenerBank:function(){return s}};t.exports=d},{103:103,118:118,133:133,18:18,19:19}],18:[function(e,t,n){"use strict";function r(){if(u)for(var e in s){var t=s[e],n=u.indexOf(e);if(a(n>-1),!l.plugins[n]){a(t.extractEvents),l.plugins[n]=t;var r=t.eventTypes;for(var i in r)a(o(r[i],t,i))}}}function o(e,t,n){a(!l.eventNameDispatchConfigs.hasOwnProperty(n)),l.eventNameDispatchConfigs[n]=e;var r=e.phasedRegistrationNames;if(r){for(var o in r)if(r.hasOwnProperty(o)){var u=r[o];i(u,t,n)}return!0}return e.registrationName?(i(e.registrationName,t,n),!0):!1}function i(e,t,n){a(!l.registrationNameModules[e]),l.registrationNameModules[e]=t,l.registrationNameDependencies[e]=t.eventTypes[n].dependencies}var a=e(133),u=null,s={},l={plugins:[],eventNameDispatchConfigs:{},registrationNameModules:{},registrationNameDependencies:{},injectEventPluginOrder:function(e){a(!u),u=Array.prototype.slice.call(e),r()},injectEventPluginsByName:function(e){var t=!1;for(var n in e)if(e.hasOwnProperty(n)){var o=e[n];s.hasOwnProperty(n)&&s[n]===o||(a(!s[n]),s[n]=o,t=!0)}t&&r()},getPluginModuleForEvent:function(e){var t=e.dispatchConfig;if(t.registrationName)return l.registrationNameModules[t.registrationName]||null;for(var n in t.phasedRegistrationNames)if(t.phasedRegistrationNames.hasOwnProperty(n)){var r=l.registrationNameModules[t.phasedRegistrationNames[n]];if(r)return r}return null},_resetEventPlugins:function(){u=null;for(var e in s)s.hasOwnProperty(e)&&delete s[e];l.plugins.length=0;var t=l.eventNameDispatchConfigs;for(var n in t)t.hasOwnProperty(n)&&delete t[n];var r=l.registrationNameModules;for(var o in r)r.hasOwnProperty(o)&&delete r[o]}};t.exports=l},{133:133}],19:[function(e,t,n){"use strict";function r(e){return e===v.topMouseUp||e===v.topTouchEnd||e===v.topTouchCancel}function o(e){return e===v.topMouseMove||e===v.topTouchMove}function i(e){return e===v.topMouseDown||e===v.topTouchStart}function a(e,t){var n=e._dispatchListeners,r=e._dispatchIDs;if(Array.isArray(n))for(var o=0;o<n.length&&!e.isPropagationStopped();o++)t(e,n[o],r[o]);else n&&t(e,n,r)}function u(e,t,n){e.currentTarget=m.Mount.getNode(n);var r=t(e,n);return e.currentTarget=null,r}function s(e,t){a(e,t),e._dispatchListeners=null,e._dispatchIDs=null}function l(e){var t=e._dispatchListeners,n=e._dispatchIDs;if(Array.isArray(t)){for(var r=0;r<t.length&&!e.isPropagationStopped();r++)if(t[r](e,n[r]))return n[r]}else if(t&&t(e,n))return n;return null}function c(e){var t=l(e);return e._dispatchIDs=null,e._dispatchListeners=null,t}function p(e){var t=e._dispatchListeners,n=e._dispatchIDs;h(!Array.isArray(t));var r=t?t(e,n):null;return e._dispatchListeners=null,e._dispatchIDs=null,r}function d(e){return!!e._dispatchListeners}var f=e(15),h=e(133),m={Mount:null,injectMount:function(e){m.Mount=e}},v=f.topLevelTypes,g={isEndish:r,isMoveish:o,isStartish:i,executeDirectDispatch:p,executeDispatch:u,executeDispatchesInOrder:s,executeDispatchesInOrderStopAtTrue:c,hasDispatches:d,injection:m,useTouchEvents:!1};t.exports=g},{133:133,15:15}],20:[function(e,t,n){"use strict";function r(e,t,n){var r=t.dispatchConfig.phasedRegistrationNames[n];return v(e,r)}function o(e,t,n){var o=t?m.bubbled:m.captured,i=r(e,n,o);i&&(n._dispatchListeners=f(n._dispatchListeners,i),n._dispatchIDs=f(n._dispatchIDs,e))}function i(e){e&&e.dispatchConfig.phasedRegistrationNames&&d.injection.getInstanceHandle().traverseTwoPhase(e.dispatchMarker,o,e)}function a(e,t,n){if(n&&n.dispatchConfig.registrationName){var r=n.dispatchConfig.registrationName,o=v(e,r);o&&(n._dispatchListeners=f(n._dispatchListeners,o),n._dispatchIDs=f(n._dispatchIDs,e))}}function u(e){e&&e.dispatchConfig.registrationName&&a(e.dispatchMarker,null,e)}function s(e){h(e,i)}function l(e,t,n,r){d.injection.getInstanceHandle().traverseEnterLeave(n,r,a,e,t)}function c(e){h(e,u)}var p=e(15),d=e(17),f=e(103),h=e(118),m=p.PropagationPhases,v=d.getListener,g={accumulateTwoPhaseDispatches:s,accumulateDirectDispatches:c,accumulateEnterLeaveDispatches:l};t.exports=g},{103:103,118:118,15:15,17:17}],21:[function(e,t,n){"use strict";var r=!("undefined"==typeof window||!window.document||!window.document.createElement),o={canUseDOM:r,canUseWorkers:"undefined"!=typeof Worker,canUseEventListeners:r&&!(!window.addEventListener&&!window.attachEvent),canUseViewport:r&&!!window.screen,isInWorker:!r};t.exports=o},{}],22:[function(e,t,n){"use strict";function r(e){this._root=e,this._startText=this.getText(),this._fallbackText=null}var o=e(28),i=e(27),a=e(128);i(r.prototype,{getText:function(){return"value"in this._root?this._root.value:this._root[a()]},getData:function(){if(this._fallbackText)return this._fallbackText;var e,t,n=this._startText,r=n.length,o=this.getText(),i=o.length;for(e=0;r>e&&n[e]===o[e];e++);var a=r-e;for(t=1;a>=t&&n[r-t]===o[i-t];t++);var u=t>1?1-t:void 0;return this._fallbackText=o.slice(e,u),this._fallbackText}}),o.addPoolingTo(r),t.exports=r},{128:128,27:27,28:28}],23:[function(e,t,n){"use strict";var r,o=e(10),i=e(21),a=o.injection.MUST_USE_ATTRIBUTE,u=o.injection.MUST_USE_PROPERTY,s=o.injection.HAS_BOOLEAN_VALUE,l=o.injection.HAS_SIDE_EFFECTS,c=o.injection.HAS_NUMERIC_VALUE,p=o.injection.HAS_POSITIVE_NUMERIC_VALUE,d=o.injection.HAS_OVERLOADED_BOOLEAN_VALUE;if(i.canUseDOM){var f=document.implementation;r=f&&f.hasFeature&&f.hasFeature("http://www.w3.org/TR/SVG11/feature#BasicStructure","1.1")}var h={isCustomAttribute:RegExp.prototype.test.bind(/^(data|aria)-[a-z_][a-z\d_.\-]*$/),Properties:{accept:null,acceptCharset:null,accessKey:null,action:null,allowFullScreen:a|s,allowTransparency:a,alt:null,async:s,autoComplete:null,autoPlay:s,cellPadding:null,cellSpacing:null,charSet:a,checked:u|s,classID:a,className:r?a:u,cols:a|p,colSpan:null,content:null,contentEditable:null,contextMenu:a,controls:u|s,coords:null,crossOrigin:null,data:null,dateTime:a,defer:s,dir:null,disabled:a|s,download:d,draggable:null,encType:null,form:a,formAction:a,formEncType:a,formMethod:a,formNoValidate:s,formTarget:a,frameBorder:a,headers:null,height:a,hidden:a|s,high:null,href:null,hrefLang:null,htmlFor:null,httpEquiv:null,icon:null,id:u,label:null,lang:null,list:a,loop:u|s,low:null,manifest:a,marginHeight:null,marginWidth:null,max:null,maxLength:a,media:a,mediaGroup:null,method:null,min:null,multiple:u|s,muted:u|s,name:null,noValidate:s,open:s,optimum:null,pattern:null,placeholder:null,poster:null,preload:null,radioGroup:null,readOnly:u|s,rel:null,required:s,role:a,rows:a|p,rowSpan:null,sandbox:null,scope:null,scoped:s,scrolling:null,seamless:a|s,selected:u|s,shape:null,size:a|p,sizes:a,span:p,spellCheck:null,src:null,srcDoc:u,srcSet:a,start:c,step:null,style:null,tabIndex:null,target:null,title:null,type:null,useMap:null,value:u|l,width:a,wmode:a,autoCapitalize:null,autoCorrect:null,itemProp:a,itemScope:a|s,itemType:a,itemID:a,itemRef:a,property:null,unselectable:a},DOMAttributeNames:{acceptCharset:"accept-charset",className:"class",htmlFor:"for",httpEquiv:"http-equiv"},DOMPropertyNames:{autoCapitalize:"autocapitalize",autoComplete:"autocomplete",autoCorrect:"autocorrect",autoFocus:"autofocus",autoPlay:"autoplay",encType:"encoding",hrefLang:"hreflang",radioGroup:"radiogroup",spellCheck:"spellcheck",srcDoc:"srcdoc",srcSet:"srcset"}};t.exports=h},{10:10,21:21}],24:[function(e,t,n){"use strict";function r(e){l(null==e.props.checkedLink||null==e.props.valueLink)}function o(e){r(e),l(null==e.props.value&&null==e.props.onChange)}function i(e){r(e),l(null==e.props.checked&&null==e.props.onChange)}function a(e){this.props.valueLink.requestChange(e.target.value)}function u(e){this.props.checkedLink.requestChange(e.target.checked)}var s=e(76),l=e(133),c={button:!0,checkbox:!0,image:!0,hidden:!0,radio:!0,reset:!0,submit:!0},p={Mixin:{propTypes:{value:function(e,t,n){return!e[t]||c[e.type]||e.onChange||e.readOnly||e.disabled?null:new Error("You provided a `value` prop to a form field without an `onChange` handler. This will render a read-only field. If the field should be mutable use `defaultValue`. Otherwise, set either `onChange` or `readOnly`.")},checked:function(e,t,n){return!e[t]||e.onChange||e.readOnly||e.disabled?null:new Error("You provided a `checked` prop to a form field without an `onChange` handler. This will render a read-only field. If the field should be mutable use `defaultChecked`. Otherwise, set either `onChange` or `readOnly`.")},onChange:s.func}},getValue:function(e){return e.props.valueLink?(o(e),e.props.valueLink.value):e.props.value},getChecked:function(e){return e.props.checkedLink?(i(e),e.props.checkedLink.value):e.props.checked},getOnChange:function(e){return e.props.valueLink?(o(e),a):e.props.checkedLink?(i(e),u):e.props.onChange}};t.exports=p},{133:133,76:76}],25:[function(e,t,n){"use strict";function r(e){e.remove()}var o=e(30),i=e(103),a=e(118),u=e(133),s={trapBubbledEvent:function(e,t){u(this.isMounted());var n=this.getDOMNode();u(n);var r=o.trapBubbledEvent(e,t,n);this._localEventListeners=i(this._localEventListeners,r)},componentWillUnmount:function(){this._localEventListeners&&a(this._localEventListeners,r)}};t.exports=s},{103:103,118:118,133:133,30:30}],26:[function(e,t,n){"use strict";var r=e(15),o=e(112),i=r.topLevelTypes,a={eventTypes:null,extractEvents:function(e,t,n,r){if(e===i.topTouchStart){var a=r.target;a&&!a.onclick&&(a.onclick=o)}}};t.exports=a},{112:112,15:15}],27:[function(e,t,n){"use strict";function r(e,t){if(null==e)throw new TypeError("Object.assign target cannot be null or undefined");for(var n=Object(e),r=Object.prototype.hasOwnProperty,o=1;o<arguments.length;o++){var i=arguments[o];if(null!=i){var a=Object(i);for(var u in a)r.call(a,u)&&(n[u]=a[u])}}return n}t.exports=r},{}],28:[function(e,t,n){"use strict";var r=e(133),o=function(e){var t=this;if(t.instancePool.length){var n=t.instancePool.pop();return t.call(n,e),n}return new t(e)},i=function(e,t){var n=this;if(n.instancePool.length){var r=n.instancePool.pop();return n.call(r,e,t),r}return new n(e,t)},a=function(e,t,n){var r=this;if(r.instancePool.length){var o=r.instancePool.pop();return r.call(o,e,t,n),o}return new r(e,t,n)},u=function(e,t,n,r,o){var i=this;if(i.instancePool.length){var a=i.instancePool.pop();return i.call(a,e,t,n,r,o),a}return new i(e,t,n,r,o)},s=function(e){var t=this;r(e instanceof t),e.destructor&&e.destructor(),t.instancePool.length<t.poolSize&&t.instancePool.push(e)},l=10,c=o,p=function(e,t){var n=e;return n.instancePool=[],n.getPooled=t||c,n.poolSize||(n.poolSize=l),n.release=s,n},d={addPoolingTo:p,oneArgumentPooler:o,twoArgumentPooler:i,threeArgumentPooler:a,fiveArgumentPooler:u};t.exports=d},{133:133}],29:[function(e,t,n){"use strict";var r=e(115),o={getDOMNode:function(){return r(this)}};t.exports=o},{115:115}],30:[function(e,t,n){"use strict";function r(e){return Object.prototype.hasOwnProperty.call(e,m)||(e[m]=f++,p[e[m]]={}),p[e[m]]}var o=e(15),i=e(17),a=e(18),u=e(59),s=e(102),l=e(27),c=e(134),p={},d=!1,f=0,h={topBlur:"blur",topChange:"change",topClick:"click",topCompositionEnd:"compositionend",topCompositionStart:"compositionstart",topCompositionUpdate:"compositionupdate",topContextMenu:"contextmenu",topCopy:"copy",topCut:"cut",topDoubleClick:"dblclick",topDrag:"drag",topDragEnd:"dragend",topDragEnter:"dragenter",topDragExit:"dragexit",topDragLeave:"dragleave",topDragOver:"dragover",topDragStart:"dragstart",topDrop:"drop",topFocus:"focus",topInput:"input",topKeyDown:"keydown",topKeyPress:"keypress",topKeyUp:"keyup",topMouseDown:"mousedown",topMouseMove:"mousemove",topMouseOut:"mouseout",topMouseOver:"mouseover",topMouseUp:"mouseup",topPaste:"paste",topScroll:"scroll",topSelectionChange:"selectionchange",topTextInput:"textInput",topTouchCancel:"touchcancel",topTouchEnd:"touchend",topTouchMove:"touchmove",topTouchStart:"touchstart",topWheel:"wheel"},m="_reactListenersID"+String(Math.random()).slice(2),v=l({},u,{ReactEventListener:null,injection:{injectReactEventListener:function(e){e.setHandleTopLevel(v.handleTopLevel),v.ReactEventListener=e}},setEnabled:function(e){v.ReactEventListener&&v.ReactEventListener.setEnabled(e)},isEnabled:function(){return!(!v.ReactEventListener||!v.ReactEventListener.isEnabled())},listenTo:function(e,t){for(var n=t,i=r(n),u=a.registrationNameDependencies[e],s=o.topLevelTypes,l=0,p=u.length;p>l;l++){var d=u[l];i.hasOwnProperty(d)&&i[d]||(d===s.topWheel?c("wheel")?v.ReactEventListener.trapBubbledEvent(s.topWheel,"wheel",n):c("mousewheel")?v.ReactEventListener.trapBubbledEvent(s.topWheel,"mousewheel",n):v.ReactEventListener.trapBubbledEvent(s.topWheel,"DOMMouseScroll",n):d===s.topScroll?c("scroll",!0)?v.ReactEventListener.trapCapturedEvent(s.topScroll,"scroll",n):v.ReactEventListener.trapBubbledEvent(s.topScroll,"scroll",v.ReactEventListener.WINDOW_HANDLE):d===s.topFocus||d===s.topBlur?(c("focus",!0)?(v.ReactEventListener.trapCapturedEvent(s.topFocus,"focus",n),v.ReactEventListener.trapCapturedEvent(s.topBlur,"blur",n)):c("focusin")&&(v.ReactEventListener.trapBubbledEvent(s.topFocus,"focusin",n),v.ReactEventListener.trapBubbledEvent(s.topBlur,"focusout",n)),i[s.topBlur]=!0,i[s.topFocus]=!0):h.hasOwnProperty(d)&&v.ReactEventListener.trapBubbledEvent(d,h[d],n),i[d]=!0)}},trapBubbledEvent:function(e,t,n){
-return v.ReactEventListener.trapBubbledEvent(e,t,n)},trapCapturedEvent:function(e,t,n){return v.ReactEventListener.trapCapturedEvent(e,t,n)},ensureScrollValueMonitoring:function(){if(!d){var e=s.refreshScrollValues;v.ReactEventListener.monitorScrollValue(e),d=!0}},eventNameDispatchConfigs:i.eventNameDispatchConfigs,registrationNameModules:i.registrationNameModules,putListener:i.putListener,getListener:i.getListener,deleteListener:i.deleteListener,deleteAllListeners:i.deleteAllListeners});t.exports=v},{102:102,134:134,15:15,17:17,18:18,27:27,59:59}],31:[function(e,t,n){"use strict";var r=e(79),o=e(116),i=e(132),a=e(147),u={instantiateChildren:function(e,t,n){var r=o(e);for(var a in r)if(r.hasOwnProperty(a)){var u=r[a],s=i(u,null);r[a]=s}return r},updateChildren:function(e,t,n,u){var s=o(t);if(!s&&!e)return null;var l;for(l in s)if(s.hasOwnProperty(l)){var c=e&&e[l],p=c&&c._currentElement,d=s[l];if(a(p,d))r.receiveComponent(c,d,n,u),s[l]=c;else{c&&r.unmountComponent(c,l);var f=i(d,null);s[l]=f}}for(l in e)!e.hasOwnProperty(l)||s&&s.hasOwnProperty(l)||r.unmountComponent(e[l]);return s},unmountChildren:function(e){for(var t in e){var n=e[t];r.unmountComponent(n)}}};t.exports=u},{116:116,132:132,147:147,79:79}],32:[function(e,t,n){"use strict";function r(e,t){this.forEachFunction=e,this.forEachContext=t}function o(e,t,n,r){var o=e;o.forEachFunction.call(o.forEachContext,t,r)}function i(e,t,n){if(null==e)return e;var i=r.getPooled(t,n);f(e,o,i),r.release(i)}function a(e,t,n){this.mapResult=e,this.mapFunction=t,this.mapContext=n}function u(e,t,n,r){var o=e,i=o.mapResult,a=!i.hasOwnProperty(n);if(a){var u=o.mapFunction.call(o.mapContext,t,r);i[n]=u}}function s(e,t,n){if(null==e)return e;var r={},o=a.getPooled(r,t,n);return f(e,u,o),a.release(o),d.create(r)}function l(e,t,n,r){return null}function c(e,t){return f(e,l,null)}var p=e(28),d=e(61),f=e(149),h=(e(150),p.twoArgumentPooler),m=p.threeArgumentPooler;p.addPoolingTo(r,h),p.addPoolingTo(a,m);var v={forEach:i,map:s,count:c};t.exports=v},{149:149,150:150,28:28,61:61}],33:[function(e,t,n){"use strict";function r(e,t){var n=D.hasOwnProperty(t)?D[t]:null;N.hasOwnProperty(t)&&y(n===_.OVERRIDE_BASE),e.hasOwnProperty(t)&&y(n===_.DEFINE_MANY||n===_.DEFINE_MANY_MERGED)}function o(e,t){if(t){y("function"!=typeof t),y(!d.isValidElement(t));var n=e.prototype;t.hasOwnProperty(b)&&M.mixins(e,t.mixins);for(var o in t)if(t.hasOwnProperty(o)&&o!==b){var i=t[o];if(r(n,o),M.hasOwnProperty(o))M[o](e,i);else{var a=D.hasOwnProperty(o),l=n.hasOwnProperty(o),c=i&&i.__reactDontBind,p="function"==typeof i,f=p&&!a&&!l&&!c;if(f)n.__reactAutoBindMap||(n.__reactAutoBindMap={}),n.__reactAutoBindMap[o]=i,n[o]=i;else if(l){var h=D[o];y(a&&(h===_.DEFINE_MANY_MERGED||h===_.DEFINE_MANY)),h===_.DEFINE_MANY_MERGED?n[o]=u(n[o],i):h===_.DEFINE_MANY&&(n[o]=s(n[o],i))}else n[o]=i}}}}function i(e,t){if(t)for(var n in t){var r=t[n];if(t.hasOwnProperty(n)){var o=n in M;y(!o);var i=n in e;y(!i),e[n]=r}}}function a(e,t){y(e&&t&&"object"==typeof e&&"object"==typeof t);for(var n in t)t.hasOwnProperty(n)&&(y(void 0===e[n]),e[n]=t[n]);return e}function u(e,t){return function(){var n=e.apply(this,arguments),r=t.apply(this,arguments);if(null==n)return r;if(null==r)return n;var o={};return a(o,n),a(o,r),o}}function s(e,t){return function(){e.apply(this,arguments),t.apply(this,arguments)}}function l(e,t){var n=t.bind(e);return n}function c(e){for(var t in e.__reactAutoBindMap)if(e.__reactAutoBindMap.hasOwnProperty(t)){var n=e.__reactAutoBindMap[t];e[t]=l(e,f.guard(n,e.constructor.displayName+"."+t))}}var p=e(34),d=(e(39),e(55)),f=e(58),h=e(65),m=e(66),v=(e(75),e(74),e(84)),g=e(27),y=e(133),C=e(138),E=e(139),b=(e(150),E({mixins:null})),_=C({DEFINE_ONCE:null,DEFINE_MANY:null,OVERRIDE_BASE:null,DEFINE_MANY_MERGED:null}),x=[],D={mixins:_.DEFINE_MANY,statics:_.DEFINE_MANY,propTypes:_.DEFINE_MANY,contextTypes:_.DEFINE_MANY,childContextTypes:_.DEFINE_MANY,getDefaultProps:_.DEFINE_MANY_MERGED,getInitialState:_.DEFINE_MANY_MERGED,getChildContext:_.DEFINE_MANY_MERGED,render:_.DEFINE_ONCE,componentWillMount:_.DEFINE_MANY,componentDidMount:_.DEFINE_MANY,componentWillReceiveProps:_.DEFINE_MANY,shouldComponentUpdate:_.DEFINE_ONCE,componentWillUpdate:_.DEFINE_MANY,componentDidUpdate:_.DEFINE_MANY,componentWillUnmount:_.DEFINE_MANY,updateComponent:_.OVERRIDE_BASE},M={displayName:function(e,t){e.displayName=t},mixins:function(e,t){if(t)for(var n=0;n<t.length;n++)o(e,t[n])},childContextTypes:function(e,t){e.childContextTypes=g({},e.childContextTypes,t)},contextTypes:function(e,t){e.contextTypes=g({},e.contextTypes,t)},getDefaultProps:function(e,t){e.getDefaultProps?e.getDefaultProps=u(e.getDefaultProps,t):e.getDefaultProps=t},propTypes:function(e,t){e.propTypes=g({},e.propTypes,t)},statics:function(e,t){i(e,t)}},N={replaceState:function(e,t){v.enqueueReplaceState(this,e),t&&v.enqueueCallback(this,t)},isMounted:function(){var e=h.get(this);return e&&e!==m.currentlyMountingInstance},setProps:function(e,t){v.enqueueSetProps(this,e),t&&v.enqueueCallback(this,t)},replaceProps:function(e,t){v.enqueueReplaceProps(this,e),t&&v.enqueueCallback(this,t)}},I=function(){};g(I.prototype,p.prototype,N);var T={createClass:function(e){var t=function(e,t){this.__reactAutoBindMap&&c(this),this.props=e,this.context=t,this.state=null;var n=this.getInitialState?this.getInitialState():null;y("object"==typeof n&&!Array.isArray(n)),this.state=n};t.prototype=new I,t.prototype.constructor=t,x.forEach(o.bind(null,t)),o(t,e),t.getDefaultProps&&(t.defaultProps=t.getDefaultProps()),y(t.prototype.render);for(var n in D)t.prototype[n]||(t.prototype[n]=null);return t.type=t,t},injection:{injectMixin:function(e){x.push(e)}}};t.exports=T},{133:133,138:138,139:139,150:150,27:27,34:34,39:39,55:55,58:58,65:65,66:66,74:74,75:75,84:84}],34:[function(e,t,n){"use strict";function r(e,t){this.props=e,this.context=t}{var o=e(84),i=e(133);e(150)}r.prototype.setState=function(e,t){i("object"==typeof e||"function"==typeof e||null==e),o.enqueueSetState(this,e),t&&o.enqueueCallback(this,t)},r.prototype.forceUpdate=function(e){o.enqueueForceUpdate(this),e&&o.enqueueCallback(this,e)};t.exports=r},{133:133,150:150,84:84}],35:[function(e,t,n){"use strict";var r=e(44),o=e(68),i={processChildrenUpdates:r.dangerouslyProcessChildrenUpdates,replaceNodeWithMarkupByID:r.dangerouslyReplaceNodeWithMarkupByID,unmountIDFromEnvironment:function(e){o.purgeID(e)}};t.exports=i},{44:44,68:68}],36:[function(e,t,n){"use strict";var r=e(133),o=!1,i={unmountIDFromEnvironment:null,replaceNodeWithMarkupByID:null,processChildrenUpdates:null,injection:{injectEnvironment:function(e){r(!o),i.unmountIDFromEnvironment=e.unmountIDFromEnvironment,i.replaceNodeWithMarkupByID=e.replaceNodeWithMarkupByID,i.processChildrenUpdates=e.processChildrenUpdates,o=!0}}};t.exports=i},{133:133}],37:[function(e,t,n){"use strict";function r(e){var t=e._currentElement._owner||null;if(t){var n=t.getName();if(n)return" Check the render method of `"+n+"`."}return""}var o=e(36),i=e(38),a=e(39),u=e(55),s=(e(56),e(65)),l=e(66),c=e(71),p=e(73),d=e(75),f=(e(74),e(79)),h=e(85),m=e(27),v=e(113),g=e(133),y=e(147),C=(e(150),1),E={construct:function(e){this._currentElement=e,this._rootNodeID=null,this._instance=null,this._pendingElement=null,this._pendingStateQueue=null,this._pendingReplaceState=!1,this._pendingForceUpdate=!1,this._renderedComponent=null,this._context=null,this._mountOrder=0,this._isTopLevel=!1,this._pendingCallbacks=null},mountComponent:function(e,t,n){this._context=n,this._mountOrder=C++,this._rootNodeID=e;var r=this._processProps(this._currentElement.props),o=this._processContext(this._currentElement._context),i=c.getComponentClassForElement(this._currentElement),a=new i(r,o);a.props=r,a.context=o,a.refs=v,this._instance=a,s.set(a,this);var u=a.state;void 0===u&&(a.state=u=null),g("object"==typeof u&&!Array.isArray(u)),this._pendingStateQueue=null,this._pendingReplaceState=!1,this._pendingForceUpdate=!1;var p,d,h=l.currentlyMountingInstance;l.currentlyMountingInstance=this;try{a.componentWillMount&&(a.componentWillMount(),this._pendingStateQueue&&(a.state=this._processPendingState(a.props,a.context))),p=this._getValidatedChildContext(n),d=this._renderValidatedComponent(p)}finally{l.currentlyMountingInstance=h}this._renderedComponent=this._instantiateReactComponent(d,this._currentElement.type);var m=f.mountComponent(this._renderedComponent,e,t,this._mergeChildContext(n,p));return a.componentDidMount&&t.getReactMountReady().enqueue(a.componentDidMount,a),m},unmountComponent:function(){var e=this._instance;if(e.componentWillUnmount){var t=l.currentlyUnmountingInstance;l.currentlyUnmountingInstance=this;try{e.componentWillUnmount()}finally{l.currentlyUnmountingInstance=t}}f.unmountComponent(this._renderedComponent),this._renderedComponent=null,this._pendingStateQueue=null,this._pendingReplaceState=!1,this._pendingForceUpdate=!1,this._pendingCallbacks=null,this._pendingElement=null,this._context=null,this._rootNodeID=null,s.remove(e)},_setPropsInternal:function(e,t){var n=this._pendingElement||this._currentElement;this._pendingElement=u.cloneAndReplaceProps(n,m({},n.props,e)),h.enqueueUpdate(this,t)},_maskContext:function(e){var t=null;if("string"==typeof this._currentElement.type)return v;var n=this._currentElement.type.contextTypes;if(!n)return v;t={};for(var r in n)t[r]=e[r];return t},_processContext:function(e){var t=this._maskContext(e);return t},_getValidatedChildContext:function(e){var t=this._instance,n=t.getChildContext&&t.getChildContext();if(n){g("object"==typeof t.constructor.childContextTypes);for(var r in n)g(r in t.constructor.childContextTypes);return n}return null},_mergeChildContext:function(e,t){return t?m({},e,t):e},_processProps:function(e){return e},_checkPropTypes:function(e,t,n){var o=this.getName();for(var i in e)if(e.hasOwnProperty(i)){var a;try{g("function"==typeof e[i]),a=e[i](t,i,o,n)}catch(u){a=u}a instanceof Error&&(r(this),n===d.prop)}},receiveComponent:function(e,t,n){var r=this._currentElement,o=this._context;this._pendingElement=null,this.updateComponent(t,r,e,o,n)},performUpdateIfNecessary:function(e){null!=this._pendingElement&&f.receiveComponent(this,this._pendingElement||this._currentElement,e,this._context),(null!==this._pendingStateQueue||this._pendingForceUpdate)&&this.updateComponent(e,this._currentElement,this._currentElement,this._context,this._context)},_warnIfContextsDiffer:function(e,t){e=this._maskContext(e),t=this._maskContext(t);for(var n=Object.keys(t).sort(),r=(this.getName()||"ReactCompositeComponent",0);r<n.length;r++)n[r]},updateComponent:function(e,t,n,r,o){var i=this._instance,a=i.context,u=i.props;t!==n&&(a=this._processContext(n._context),u=this._processProps(n.props),i.componentWillReceiveProps&&i.componentWillReceiveProps(u,a));var s=this._processPendingState(u,a),l=this._pendingForceUpdate||!i.shouldComponentUpdate||i.shouldComponentUpdate(u,s,a);l?(this._pendingForceUpdate=!1,this._performComponentUpdate(n,u,s,a,e,o)):(this._currentElement=n,this._context=o,i.props=u,i.state=s,i.context=a)},_processPendingState:function(e,t){var n=this._instance,r=this._pendingStateQueue,o=this._pendingReplaceState;if(this._pendingReplaceState=!1,this._pendingStateQueue=null,!r)return n.state;if(o&&1===r.length)return r[0];for(var i=m({},o?r[0]:n.state),a=o?1:0;a<r.length;a++){var u=r[a];m(i,"function"==typeof u?u.call(n,i,e,t):u)}return i},_performComponentUpdate:function(e,t,n,r,o,i){var a=this._instance,u=a.props,s=a.state,l=a.context;a.componentWillUpdate&&a.componentWillUpdate(t,n,r),this._currentElement=e,this._context=i,a.props=t,a.state=n,a.context=r,this._updateRenderedComponent(o,i),a.componentDidUpdate&&o.getReactMountReady().enqueue(a.componentDidUpdate.bind(a,u,s,l),a)},_updateRenderedComponent:function(e,t){var n=this._renderedComponent,r=n._currentElement,o=this._getValidatedChildContext(),i=this._renderValidatedComponent(o);if(y(r,i))f.receiveComponent(n,i,e,this._mergeChildContext(t,o));else{var a=this._rootNodeID,u=n._rootNodeID;f.unmountComponent(n),this._renderedComponent=this._instantiateReactComponent(i,this._currentElement.type);var s=f.mountComponent(this._renderedComponent,a,e,this._mergeChildContext(t,o));this._replaceNodeWithMarkupByID(u,s)}},_replaceNodeWithMarkupByID:function(e,t){o.replaceNodeWithMarkupByID(e,t)},_renderValidatedComponentWithoutOwnerOrContext:function(){var e=this._instance,t=e.render();return t},_renderValidatedComponent:function(e){var t,n=i.current;i.current=this._mergeChildContext(this._currentElement._context,e),a.current=this;try{t=this._renderValidatedComponentWithoutOwnerOrContext()}finally{i.current=n,a.current=null}return g(null===t||t===!1||u.isValidElement(t)),t},attachRef:function(e,t){var n=this.getPublicInstance(),r=n.refs===v?n.refs={}:n.refs;r[e]=t.getPublicInstance()},detachRef:function(e){var t=this.getPublicInstance().refs;delete t[e]},getName:function(){var e=this._currentElement.type,t=this._instance&&this._instance.constructor;return e.displayName||t&&t.displayName||e.name||t&&t.name||null},getPublicInstance:function(){return this._instance},_instantiateReactComponent:null};p.measureMethods(E,"ReactCompositeComponent",{mountComponent:"mountComponent",updateComponent:"updateComponent",_renderValidatedComponent:"_renderValidatedComponent"});var b={Mixin:E};t.exports=b},{113:113,133:133,147:147,150:150,27:27,36:36,38:38,39:39,55:55,56:56,65:65,66:66,71:71,73:73,74:74,75:75,79:79,85:85}],38:[function(e,t,n){"use strict";var r=e(27),o=e(113),i=(e(150),{current:o,withContext:function(e,t){var n,o=i.current;i.current=r({},o,e);try{n=t()}finally{i.current=o}return n}});t.exports=i},{113:113,150:150,27:27}],39:[function(e,t,n){"use strict";var r={current:null};t.exports=r},{}],40:[function(e,t,n){"use strict";function r(e){return o.createFactory(e)}var o=e(55),i=(e(56),e(140)),a=i({a:"a",abbr:"abbr",address:"address",area:"area",article:"article",aside:"aside",audio:"audio",b:"b",base:"base",bdi:"bdi",bdo:"bdo",big:"big",blockquote:"blockquote",body:"body",br:"br",button:"button",canvas:"canvas",caption:"caption",cite:"cite",code:"code",col:"col",colgroup:"colgroup",data:"data",datalist:"datalist",dd:"dd",del:"del",details:"details",dfn:"dfn",dialog:"dialog",div:"div",dl:"dl",dt:"dt",em:"em",embed:"embed",fieldset:"fieldset",figcaption:"figcaption",figure:"figure",footer:"footer",form:"form",h1:"h1",h2:"h2",h3:"h3",h4:"h4",h5:"h5",h6:"h6",head:"head",header:"header",hr:"hr",html:"html",i:"i",iframe:"iframe",img:"img",input:"input",ins:"ins",kbd:"kbd",keygen:"keygen",label:"label",legend:"legend",li:"li",link:"link",main:"main",map:"map",mark:"mark",menu:"menu",menuitem:"menuitem",meta:"meta",meter:"meter",nav:"nav",noscript:"noscript",object:"object",ol:"ol",optgroup:"optgroup",option:"option",output:"output",p:"p",param:"param",picture:"picture",pre:"pre",progress:"progress",q:"q",rp:"rp",rt:"rt",ruby:"ruby",s:"s",samp:"samp",script:"script",section:"section",select:"select",small:"small",source:"source",span:"span",strong:"strong",style:"style",sub:"sub",summary:"summary",sup:"sup",table:"table",tbody:"tbody",td:"td",textarea:"textarea",tfoot:"tfoot",th:"th",thead:"thead",time:"time",title:"title",tr:"tr",track:"track",u:"u",ul:"ul","var":"var",video:"video",wbr:"wbr",circle:"circle",clipPath:"clipPath",defs:"defs",ellipse:"ellipse",g:"g",line:"line",linearGradient:"linearGradient",mask:"mask",path:"path",pattern:"pattern",polygon:"polygon",polyline:"polyline",radialGradient:"radialGradient",rect:"rect",stop:"stop",svg:"svg",text:"text",tspan:"tspan"},r);t.exports=a},{140:140,55:55,56:56}],41:[function(e,t,n){"use strict";var r=e(2),o=e(29),i=e(33),a=e(55),u=e(138),s=a.createFactory("button"),l=u({onClick:!0,onDoubleClick:!0,onMouseDown:!0,onMouseMove:!0,onMouseUp:!0,onClickCapture:!0,onDoubleClickCapture:!0,onMouseDownCapture:!0,onMouseMoveCapture:!0,onMouseUpCapture:!0}),c=i.createClass({displayName:"ReactDOMButton",tagName:"BUTTON",mixins:[r,o],render:function(){var e={};for(var t in this.props)!this.props.hasOwnProperty(t)||this.props.disabled&&l[t]||(e[t]=this.props[t]);return s(e,this.props.children)}});t.exports=c},{138:138,2:2,29:29,33:33,55:55}],42:[function(e,t,n){"use strict";function r(e){e&&(null!=e.dangerouslySetInnerHTML&&(g(null==e.children),g("object"==typeof e.dangerouslySetInnerHTML&&"__html"in e.dangerouslySetInnerHTML)),g(null==e.style||"object"==typeof e.style))}function o(e,t,n,r){var o=d.findReactContainerForID(e);if(o){var i=o.nodeType===D?o.ownerDocument:o;E(t,i)}r.getPutListenerQueue().enqueuePutListener(e,t,n)}function i(e){P.call(T,e)||(g(I.test(e)),T[e]=!0)}function a(e){i(e),this._tag=e,this._renderedChildren=null,this._previousStyleCopy=null,this._rootNodeID=null}var u=e(5),s=e(10),l=e(11),c=e(30),p=e(35),d=e(68),f=e(69),h=e(73),m=e(27),v=e(114),g=e(133),y=(e(134),e(139)),C=(e(150),c.deleteListener),E=c.listenTo,b=c.registrationNameModules,_={string:!0,number:!0},x=y({style:null}),D=1,M=null,N={area:!0,base:!0,br:!0,col:!0,embed:!0,hr:!0,img:!0,input:!0,keygen:!0,link:!0,meta:!0,param:!0,source:!0,track:!0,wbr:!0},I=/^[a-zA-Z][a-zA-Z:_\.\-\d]*$/,T={},P={}.hasOwnProperty;a.displayName="ReactDOMComponent",a.Mixin={construct:function(e){this._currentElement=e},mountComponent:function(e,t,n){this._rootNodeID=e,r(this._currentElement.props);var o=N[this._tag]?"":"</"+this._tag+">";return this._createOpenTagMarkupAndPutListeners(t)+this._createContentMarkup(t,n)+o},_createOpenTagMarkupAndPutListeners:function(e){var t=this._currentElement.props,n="<"+this._tag;for(var r in t)if(t.hasOwnProperty(r)){var i=t[r];if(null!=i)if(b.hasOwnProperty(r))o(this._rootNodeID,r,i,e);else{r===x&&(i&&(i=this._previousStyleCopy=m({},t.style)),i=u.createMarkupForStyles(i));var a=l.createMarkupForProperty(r,i);a&&(n+=" "+a)}}if(e.renderToStaticMarkup)return n+">";var s=l.createMarkupForID(this._rootNodeID);return n+" "+s+">"},_createContentMarkup:function(e,t){var n="";("listing"===this._tag||"pre"===this._tag||"textarea"===this._tag)&&(n="\n");var r=this._currentElement.props,o=r.dangerouslySetInnerHTML;if(null!=o){if(null!=o.__html)return n+o.__html}else{var i=_[typeof r.children]?r.children:null,a=null!=i?null:r.children;if(null!=i)return n+v(i);if(null!=a){var u=this.mountChildren(a,e,t);return n+u.join("")}}return n},receiveComponent:function(e,t,n){var r=this._currentElement;this._currentElement=e,this.updateComponent(t,r,e,n)},updateComponent:function(e,t,n,o){r(this._currentElement.props),this._updateDOMProperties(t.props,e),this._updateDOMChildren(t.props,e,o)},_updateDOMProperties:function(e,t){var n,r,i,a=this._currentElement.props;for(n in e)if(!a.hasOwnProperty(n)&&e.hasOwnProperty(n))if(n===x){var u=this._previousStyleCopy;for(r in u)u.hasOwnProperty(r)&&(i=i||{},i[r]="");this._previousStyleCopy=null}else b.hasOwnProperty(n)?C(this._rootNodeID,n):(s.isStandardName[n]||s.isCustomAttribute(n))&&M.deletePropertyByID(this._rootNodeID,n);for(n in a){var l=a[n],c=n===x?this._previousStyleCopy:e[n];if(a.hasOwnProperty(n)&&l!==c)if(n===x)if(l?l=this._previousStyleCopy=m({},l):this._previousStyleCopy=null,c){for(r in c)!c.hasOwnProperty(r)||l&&l.hasOwnProperty(r)||(i=i||{},i[r]="");for(r in l)l.hasOwnProperty(r)&&c[r]!==l[r]&&(i=i||{},i[r]=l[r])}else i=l;else b.hasOwnProperty(n)?o(this._rootNodeID,n,l,t):(s.isStandardName[n]||s.isCustomAttribute(n))&&M.updatePropertyByID(this._rootNodeID,n,l)}i&&M.updateStylesByID(this._rootNodeID,i)},_updateDOMChildren:function(e,t,n){var r=this._currentElement.props,o=_[typeof e.children]?e.children:null,i=_[typeof r.children]?r.children:null,a=e.dangerouslySetInnerHTML&&e.dangerouslySetInnerHTML.__html,u=r.dangerouslySetInnerHTML&&r.dangerouslySetInnerHTML.__html,s=null!=o?null:e.children,l=null!=i?null:r.children,c=null!=o||null!=a,p=null!=i||null!=u;null!=s&&null==l?this.updateChildren(null,t,n):c&&!p&&this.updateTextContent(""),null!=i?o!==i&&this.updateTextContent(""+i):null!=u?a!==u&&M.updateInnerHTMLByID(this._rootNodeID,u):null!=l&&this.updateChildren(l,t,n)},unmountComponent:function(){this.unmountChildren(),c.deleteAllListeners(this._rootNodeID),p.unmountIDFromEnvironment(this._rootNodeID),this._rootNodeID=null}},h.measureMethods(a,"ReactDOMComponent",{mountComponent:"mountComponent",updateComponent:"updateComponent"}),m(a.prototype,a.Mixin,f.Mixin),a.injection={injectIDOperations:function(e){a.BackendIDOperations=M=e}},t.exports=a},{10:10,11:11,114:114,133:133,134:134,139:139,150:150,27:27,30:30,35:35,5:5,68:68,69:69,73:73}],43:[function(e,t,n){"use strict";var r=e(15),o=e(25),i=e(29),a=e(33),u=e(55),s=u.createFactory("form"),l=a.createClass({displayName:"ReactDOMForm",tagName:"FORM",mixins:[i,o],render:function(){return s(this.props)},componentDidMount:function(){this.trapBubbledEvent(r.topLevelTypes.topReset,"reset"),this.trapBubbledEvent(r.topLevelTypes.topSubmit,"submit")}});t.exports=l},{15:15,25:25,29:29,33:33,55:55}],44:[function(e,t,n){"use strict";var r=e(5),o=e(9),i=e(11),a=e(68),u=e(73),s=e(133),l=e(144),c={dangerouslySetInnerHTML:"`dangerouslySetInnerHTML` must be set using `updateInnerHTMLByID()`.",style:"`style` must be set using `updateStylesByID()`."},p={updatePropertyByID:function(e,t,n){var r=a.getNode(e);s(!c.hasOwnProperty(t)),null!=n?i.setValueForProperty(r,t,n):i.deleteValueForProperty(r,t)},deletePropertyByID:function(e,t,n){var r=a.getNode(e);s(!c.hasOwnProperty(t)),i.deleteValueForProperty(r,t,n)},updateStylesByID:function(e,t){var n=a.getNode(e);r.setValueForStyles(n,t)},updateInnerHTMLByID:function(e,t){var n=a.getNode(e);l(n,t)},updateTextContentByID:function(e,t){var n=a.getNode(e);o.updateTextContent(n,t)},dangerouslyReplaceNodeWithMarkupByID:function(e,t){var n=a.getNode(e);o.dangerouslyReplaceNodeWithMarkup(n,t)},dangerouslyProcessChildrenUpdates:function(e,t){for(var n=0;n<e.length;n++)e[n].parentNode=a.getNode(e[n].parentID);o.processUpdates(e,t)}};u.measureMethods(p,"ReactDOMIDOperations",{updatePropertyByID:"updatePropertyByID",deletePropertyByID:"deletePropertyByID",updateStylesByID:"updateStylesByID",updateInnerHTMLByID:"updateInnerHTMLByID",updateTextContentByID:"updateTextContentByID",dangerouslyReplaceNodeWithMarkupByID:"dangerouslyReplaceNodeWithMarkupByID",dangerouslyProcessChildrenUpdates:"dangerouslyProcessChildrenUpdates"}),t.exports=p},{11:11,133:133,144:144,5:5,68:68,73:73,9:9}],45:[function(e,t,n){"use strict";var r=e(15),o=e(25),i=e(29),a=e(33),u=e(55),s=u.createFactory("iframe"),l=a.createClass({displayName:"ReactDOMIframe",tagName:"IFRAME",mixins:[i,o],render:function(){return s(this.props)},componentDidMount:function(){this.trapBubbledEvent(r.topLevelTypes.topLoad,"load")}});t.exports=l},{15:15,25:25,29:29,33:33,55:55}],46:[function(e,t,n){"use strict";var r=e(15),o=e(25),i=e(29),a=e(33),u=e(55),s=u.createFactory("img"),l=a.createClass({displayName:"ReactDOMImg",tagName:"IMG",mixins:[i,o],render:function(){return s(this.props)},componentDidMount:function(){this.trapBubbledEvent(r.topLevelTypes.topLoad,"load"),this.trapBubbledEvent(r.topLevelTypes.topError,"error")}});t.exports=l},{15:15,25:25,29:29,33:33,55:55}],47:[function(e,t,n){"use strict";function r(){this.isMounted()&&this.forceUpdate()}var o=e(2),i=e(11),a=e(24),u=e(29),s=e(33),l=e(55),c=e(68),p=e(85),d=e(27),f=e(133),h=l.createFactory("input"),m={},v=s.createClass({displayName:"ReactDOMInput",tagName:"INPUT",mixins:[o,a.Mixin,u],getInitialState:function(){var e=this.props.defaultValue;return{initialChecked:this.props.defaultChecked||!1,initialValue:null!=e?e:null}},render:function(){var e=d({},this.props);e.defaultChecked=null,e.defaultValue=null;var t=a.getValue(this);e.value=null!=t?t:this.state.initialValue;var n=a.getChecked(this);return e.checked=null!=n?n:this.state.initialChecked,e.onChange=this._handleChange,h(e,this.props.children)},componentDidMount:function(){var e=c.getID(this.getDOMNode());m[e]=this},componentWillUnmount:function(){var e=this.getDOMNode(),t=c.getID(e);delete m[t]},componentDidUpdate:function(e,t,n){var r=this.getDOMNode();null!=this.props.checked&&i.setValueForProperty(r,"checked",this.props.checked||!1);var o=a.getValue(this);null!=o&&i.setValueForProperty(r,"value",""+o)},_handleChange:function(e){var t,n=a.getOnChange(this);n&&(t=n.call(this,e)),p.asap(r,this);var o=this.props.name;if("radio"===this.props.type&&null!=o){for(var i=this.getDOMNode(),u=i;u.parentNode;)u=u.parentNode;for(var s=u.querySelectorAll("input[name="+JSON.stringify(""+o)+'][type="radio"]'),l=0,d=s.length;d>l;l++){var h=s[l];if(h!==i&&h.form===i.form){var v=c.getID(h);f(v);var g=m[v];f(g),p.asap(r,g)}}}return t}});t.exports=v},{11:11,133:133,2:2,24:24,27:27,29:29,33:33,55:55,68:68,85:85}],48:[function(e,t,n){"use strict";var r=e(29),o=e(33),i=e(55),a=(e(150),i.createFactory("option")),u=o.createClass({displayName:"ReactDOMOption",tagName:"OPTION",mixins:[r],componentWillMount:function(){},render:function(){return a(this.props,this.props.children)}});t.exports=u},{150:150,29:29,33:33,55:55}],49:[function(e,t,n){"use strict";function r(){if(this._pendingUpdate){this._pendingUpdate=!1;var e=u.getValue(this);null!=e&&this.isMounted()&&i(this,e)}}function o(e,t,n){if(null==e[t])return null;if(e.multiple){if(!Array.isArray(e[t]))return new Error("The `"+t+"` prop supplied to <select> must be an array if `multiple` is true.")}else if(Array.isArray(e[t]))return new Error("The `"+t+"` prop supplied to <select> must be a scalar value if `multiple` is false.")}function i(e,t){var n,r,o,i=e.getDOMNode().options;if(e.props.multiple){for(n={},r=0,o=t.length;o>r;r++)n[""+t[r]]=!0;for(r=0,o=i.length;o>r;r++){var a=n.hasOwnProperty(i[r].value);i[r].selected!==a&&(i[r].selected=a)}}else{for(n=""+t,r=0,o=i.length;o>r;r++)if(i[r].value===n)return void(i[r].selected=!0);i.length&&(i[0].selected=!0)}}var a=e(2),u=e(24),s=e(29),l=e(33),c=e(55),p=e(85),d=e(27),f=c.createFactory("select"),h=l.createClass({displayName:"ReactDOMSelect",tagName:"SELECT",mixins:[a,u.Mixin,s],propTypes:{defaultValue:o,value:o},render:function(){var e=d({},this.props);return e.onChange=this._handleChange,e.value=null,f(e,this.props.children)},componentWillMount:function(){this._pendingUpdate=!1},componentDidMount:function(){var e=u.getValue(this);null!=e?i(this,e):null!=this.props.defaultValue&&i(this,this.props.defaultValue)},componentDidUpdate:function(e){var t=u.getValue(this);null!=t?(this._pendingUpdate=!1,i(this,t)):!e.multiple!=!this.props.multiple&&(null!=this.props.defaultValue?i(this,this.props.defaultValue):i(this,this.props.multiple?[]:""))},_handleChange:function(e){var t,n=u.getOnChange(this);return n&&(t=n.call(this,e)),this._pendingUpdate=!0,p.asap(r,this),t}});t.exports=h},{2:2,24:24,27:27,29:29,33:33,55:55,85:85}],50:[function(e,t,n){"use strict";function r(e,t,n,r){return e===n&&t===r}function o(e){var t=document.selection,n=t.createRange(),r=n.text.length,o=n.duplicate();o.moveToElementText(e),o.setEndPoint("EndToStart",n);var i=o.text.length,a=i+r;return{start:i,end:a}}function i(e){var t=window.getSelection&&window.getSelection();if(!t||0===t.rangeCount)return null;var n=t.anchorNode,o=t.anchorOffset,i=t.focusNode,a=t.focusOffset,u=t.getRangeAt(0),s=r(t.anchorNode,t.anchorOffset,t.focusNode,t.focusOffset),l=s?0:u.toString().length,c=u.cloneRange();c.selectNodeContents(e),c.setEnd(u.startContainer,u.startOffset);var p=r(c.startContainer,c.startOffset,c.endContainer,c.endOffset),d=p?0:c.toString().length,f=d+l,h=document.createRange();h.setStart(n,o),h.setEnd(i,a);var m=h.collapsed;return{start:m?f:d,end:m?d:f}}function a(e,t){var n,r,o=document.selection.createRange().duplicate();"undefined"==typeof t.end?(n=t.start,r=n):t.start>t.end?(n=t.end,r=t.start):(n=t.start,r=t.end),o.moveToElementText(e),o.moveStart("character",n),o.setEndPoint("EndToStart",o),o.moveEnd("character",r-n),o.select()}function u(e,t){if(window.getSelection){var n=window.getSelection(),r=e[c()].length,o=Math.min(t.start,r),i="undefined"==typeof t.end?o:Math.min(t.end,r);if(!n.extend&&o>i){var a=i;i=o,o=a}var u=l(e,o),s=l(e,i);if(u&&s){var p=document.createRange();p.setStart(u.node,u.offset),n.removeAllRanges(),o>i?(n.addRange(p),n.extend(s.node,s.offset)):(p.setEnd(s.node,s.offset),n.addRange(p))}}}var s=e(21),l=e(126),c=e(128),p=s.canUseDOM&&"selection"in document&&!("getSelection"in window),d={getOffsets:p?o:i,setOffsets:p?a:u};t.exports=d},{126:126,128:128,21:21}],51:[function(e,t,n){"use strict";var r=e(11),o=e(35),i=e(42),a=e(27),u=e(114),s=function(e){};a(s.prototype,{construct:function(e){this._currentElement=e,this._stringText=""+e,this._rootNodeID=null,this._mountIndex=0},mountComponent:function(e,t,n){this._rootNodeID=e;var o=u(this._stringText);return t.renderToStaticMarkup?o:"<span "+r.createMarkupForID(e)+">"+o+"</span>"},receiveComponent:function(e,t){if(e!==this._currentElement){this._currentElement=e;var n=""+e;n!==this._stringText&&(this._stringText=n,i.BackendIDOperations.updateTextContentByID(this._rootNodeID,n))}},unmountComponent:function(){o.unmountIDFromEnvironment(this._rootNodeID)}}),t.exports=s},{11:11,114:114,27:27,35:35,42:42}],52:[function(e,t,n){"use strict";function r(){this.isMounted()&&this.forceUpdate()}var o=e(2),i=e(11),a=e(24),u=e(29),s=e(33),l=e(55),c=e(85),p=e(27),d=e(133),f=(e(150),l.createFactory("textarea")),h=s.createClass({displayName:"ReactDOMTextarea",tagName:"TEXTAREA",mixins:[o,a.Mixin,u],getInitialState:function(){var e=this.props.defaultValue,t=this.props.children;null!=t&&(d(null==e),Array.isArray(t)&&(d(t.length<=1),t=t[0]),e=""+t),null==e&&(e="");var n=a.getValue(this);return{initialValue:""+(null!=n?n:e)}},render:function(){var e=p({},this.props);return d(null==e.dangerouslySetInnerHTML),e.defaultValue=null,e.value=null,e.onChange=this._handleChange,f(e,this.state.initialValue)},componentDidUpdate:function(e,t,n){var r=a.getValue(this);if(null!=r){var o=this.getDOMNode();i.setValueForProperty(o,"value",""+r)}},_handleChange:function(e){var t,n=a.getOnChange(this);return n&&(t=n.call(this,e)),c.asap(r,this),t}});t.exports=h},{11:11,133:133,150:150,2:2,24:24,27:27,29:29,33:33,55:55,85:85}],53:[function(e,t,n){"use strict";function r(){this.reinitializeTransaction()}var o=e(85),i=e(101),a=e(27),u=e(112),s={initialize:u,close:function(){d.isBatchingUpdates=!1}},l={initialize:u,close:o.flushBatchedUpdates.bind(o)},c=[l,s];a(r.prototype,i.Mixin,{getTransactionWrappers:function(){return c}});var p=new r,d={isBatchingUpdates:!1,batchedUpdates:function(e,t,n,r,o){var i=d.isBatchingUpdates;d.isBatchingUpdates=!0,i?e(t,n,r,o):p.perform(e,null,t,n,r,o)}};t.exports=d},{101:101,112:112,27:27,85:85}],54:[function(e,t,n){"use strict";function r(e){return h.createClass({tagName:e.toUpperCase(),render:function(){return new T(e,null,null,null,null,this.props)}})}function o(){R.EventEmitter.injectReactEventListener(P),R.EventPluginHub.injectEventPluginOrder(s),R.EventPluginHub.injectInstanceHandle(w),R.EventPluginHub.injectMount(O),R.EventPluginHub.injectEventPluginsByName({SimpleEventPlugin:L,EnterLeaveEventPlugin:l,ChangeEventPlugin:a,MobileSafariClickEventPlugin:d,SelectEventPlugin:A,BeforeInputEventPlugin:i}),R.NativeComponent.injectGenericComponentClass(g),R.NativeComponent.injectTextComponentClass(I),R.NativeComponent.injectAutoWrapper(r),R.Class.injectMixin(f),R.NativeComponent.injectComponentClasses({button:y,form:C,iframe:_,img:E,input:x,option:D,select:M,textarea:N,html:F("html"),head:F("head"),body:F("body")}),R.DOMProperty.injectDOMPropertyConfig(p),R.DOMProperty.injectDOMPropertyConfig(U),R.EmptyComponent.injectEmptyComponent("noscript"),R.Updates.injectReconcileTransaction(S),R.Updates.injectBatchingStrategy(v),R.RootIndex.injectCreateReactRootIndex(c.canUseDOM?u.createReactRootIndex:k.createReactRootIndex),R.Component.injectEnvironment(m),R.DOMComponent.injectIDOperations(b)}var i=e(3),a=e(7),u=e(8),s=e(13),l=e(14),c=e(21),p=e(23),d=e(26),f=e(29),h=e(33),m=e(35),v=e(53),g=e(42),y=e(41),C=e(43),E=e(46),b=e(44),_=e(45),x=e(47),D=e(48),M=e(49),N=e(52),I=e(51),T=e(55),P=e(60),R=e(62),w=e(64),O=e(68),S=e(78),A=e(87),k=e(88),L=e(89),U=e(86),F=e(109);
-
-t.exports={inject:o}},{109:109,13:13,14:14,21:21,23:23,26:26,29:29,3:3,33:33,35:35,41:41,42:42,43:43,44:44,45:45,46:46,47:47,48:48,49:49,51:51,52:52,53:53,55:55,60:60,62:62,64:64,68:68,7:7,78:78,8:8,86:86,87:87,88:88,89:89}],55:[function(e,t,n){"use strict";var r=e(38),o=e(39),i=e(27),a=(e(150),{key:!0,ref:!0}),u=function(e,t,n,r,o,i){this.type=e,this.key=t,this.ref=n,this._owner=r,this._context=o,this.props=i};u.prototype={_isReactElement:!0},u.createElement=function(e,t,n){var i,s={},l=null,c=null;if(null!=t){c=void 0===t.ref?null:t.ref,l=void 0===t.key?null:""+t.key;for(i in t)t.hasOwnProperty(i)&&!a.hasOwnProperty(i)&&(s[i]=t[i])}var p=arguments.length-2;if(1===p)s.children=n;else if(p>1){for(var d=Array(p),f=0;p>f;f++)d[f]=arguments[f+2];s.children=d}if(e&&e.defaultProps){var h=e.defaultProps;for(i in h)"undefined"==typeof s[i]&&(s[i]=h[i])}return new u(e,l,c,o.current,r.current,s)},u.createFactory=function(e){var t=u.createElement.bind(null,e);return t.type=e,t},u.cloneAndReplaceProps=function(e,t){var n=new u(e.type,e.key,e.ref,e._owner,e._context,t);return n},u.cloneElement=function(e,t,n){var r,s=i({},e.props),l=e.key,c=e.ref,p=e._owner;if(null!=t){void 0!==t.ref&&(c=t.ref,p=o.current),void 0!==t.key&&(l=""+t.key);for(r in t)t.hasOwnProperty(r)&&!a.hasOwnProperty(r)&&(s[r]=t[r])}var d=arguments.length-2;if(1===d)s.children=n;else if(d>1){for(var f=Array(d),h=0;d>h;h++)f[h]=arguments[h+2];s.children=f}return new u(e.type,l,c,p,e._context,s)},u.isValidElement=function(e){var t=!(!e||!e._isReactElement);return t},t.exports=u},{150:150,27:27,38:38,39:39}],56:[function(e,t,n){"use strict";function r(){if(y.current){var e=y.current.getName();if(e)return" Check the render method of `"+e+"`."}return""}function o(e){var t=e&&e.getPublicInstance();if(!t)return void 0;var n=t.constructor;return n?n.displayName||n.name||void 0:void 0}function i(){var e=y.current;return e&&o(e)||void 0}function a(e,t){e._store.validated||null!=e.key||(e._store.validated=!0,s('Each child in an array or iterator should have a unique "key" prop.',e,t))}function u(e,t,n){D.test(e)&&s("Child objects should have non-numeric keys so ordering is preserved.",t,n)}function s(e,t,n){var r=i(),a="string"==typeof n?n:n.displayName||n.name,u=r||a,s=_[e]||(_[e]={});if(!s.hasOwnProperty(u)){s[u]=!0;var l="";if(t&&t._owner&&t._owner!==y.current){var c=o(t._owner);l=" It was passed a child from "+c+"."}}}function l(e,t){if(Array.isArray(e))for(var n=0;n<e.length;n++){var r=e[n];m.isValidElement(r)&&a(r,t)}else if(m.isValidElement(e))e._store.validated=!0;else if(e){var o=E(e);if(o){if(o!==e.entries)for(var i,s=o.call(e);!(i=s.next()).done;)m.isValidElement(i.value)&&a(i.value,t)}else if("object"==typeof e){var l=v.extractIfFragment(e);for(var c in l)l.hasOwnProperty(c)&&u(c,l[c],t)}}}function c(e,t,n,o){for(var i in t)if(t.hasOwnProperty(i)){var a;try{b("function"==typeof t[i]),a=t[i](n,i,e,o)}catch(u){a=u}a instanceof Error&&!(a.message in x)&&(x[a.message]=!0,r(this))}}function p(e,t){var n=t.type,r="string"==typeof n?n:n.displayName,o=t._owner?t._owner.getPublicInstance().constructor.displayName:null,i=e+"|"+r+"|"+o;if(!M.hasOwnProperty(i)){M[i]=!0;var a="";r&&(a=" <"+r+" />");var u="";o&&(u=" The element was created by "+o+".")}}function d(e,t){return e!==e?t!==t:0===e&&0===t?1/e===1/t:e===t}function f(e){if(e._store){var t=e._store.originalProps,n=e.props;for(var r in n)n.hasOwnProperty(r)&&(t.hasOwnProperty(r)&&d(t[r],n[r])||(p(r,e),t[r]=n[r]))}}function h(e){if(null!=e.type){var t=C.getComponentClassForElement(e),n=t.displayName||t.name;t.propTypes&&c(n,t.propTypes,e.props,g.prop),"function"==typeof t.getDefaultProps}}var m=e(55),v=e(61),g=e(75),y=(e(74),e(39)),C=e(71),E=e(124),b=e(133),_=(e(150),{}),x={},D=/^\d+$/,M={},N={checkAndWarnForMutatedProps:f,createElement:function(e,t,n){var r=m.createElement.apply(this,arguments);if(null==r)return r;for(var o=2;o<arguments.length;o++)l(arguments[o],e);return h(r),r},createFactory:function(e){var t=N.createElement.bind(null,e);return t.type=e,t},cloneElement:function(e,t,n){for(var r=m.cloneElement.apply(this,arguments),o=2;o<arguments.length;o++)l(arguments[o],r.type);return h(r),r}};t.exports=N},{124:124,133:133,150:150,39:39,55:55,61:61,71:71,74:74,75:75}],57:[function(e,t,n){"use strict";function r(e){c[e]=!0}function o(e){delete c[e]}function i(e){return!!c[e]}var a,u=e(55),s=e(65),l=e(133),c={},p={injectEmptyComponent:function(e){a=u.createFactory(e)}},d=function(){};d.prototype.componentDidMount=function(){var e=s.get(this);e&&r(e._rootNodeID)},d.prototype.componentWillUnmount=function(){var e=s.get(this);e&&o(e._rootNodeID)},d.prototype.render=function(){return l(a),a()};var f=u.createElement(d),h={emptyElement:f,injection:p,isNullComponentID:i};t.exports=h},{133:133,55:55,65:65}],58:[function(e,t,n){"use strict";var r={guard:function(e,t){return e}};t.exports=r},{}],59:[function(e,t,n){"use strict";function r(e){o.enqueueEvents(e),o.processEventQueue()}var o=e(17),i={handleTopLevel:function(e,t,n,i){var a=o.extractEvents(e,t,n,i);r(a)}};t.exports=i},{17:17}],60:[function(e,t,n){"use strict";function r(e){var t=p.getID(e),n=c.getReactRootIDFromNodeID(t),r=p.findReactContainerForID(n),o=p.getFirstReactDOM(r);return o}function o(e,t){this.topLevelType=e,this.nativeEvent=t,this.ancestors=[]}function i(e){for(var t=p.getFirstReactDOM(h(e.nativeEvent))||window,n=t;n;)e.ancestors.push(n),n=r(n);for(var o=0,i=e.ancestors.length;i>o;o++){t=e.ancestors[o];var a=p.getID(t)||"";v._handleTopLevel(e.topLevelType,t,a,e.nativeEvent)}}function a(e){var t=m(window);e(t)}var u=e(16),s=e(21),l=e(28),c=e(64),p=e(68),d=e(85),f=e(27),h=e(123),m=e(129);f(o.prototype,{destructor:function(){this.topLevelType=null,this.nativeEvent=null,this.ancestors.length=0}}),l.addPoolingTo(o,l.twoArgumentPooler);var v={_enabled:!0,_handleTopLevel:null,WINDOW_HANDLE:s.canUseDOM?window:null,setHandleTopLevel:function(e){v._handleTopLevel=e},setEnabled:function(e){v._enabled=!!e},isEnabled:function(){return v._enabled},trapBubbledEvent:function(e,t,n){var r=n;return r?u.listen(r,t,v.dispatchEvent.bind(null,e)):null},trapCapturedEvent:function(e,t,n){var r=n;return r?u.capture(r,t,v.dispatchEvent.bind(null,e)):null},monitorScrollValue:function(e){var t=a.bind(null,e);u.listen(window,"scroll",t)},dispatchEvent:function(e,t){if(v._enabled){var n=o.getPooled(e,t);try{d.batchedUpdates(i,n)}finally{o.release(n)}}}};t.exports=v},{123:123,129:129,16:16,21:21,27:27,28:28,64:64,68:68,85:85}],61:[function(e,t,n){"use strict";var r=(e(55),e(150),{create:function(e){return e},extract:function(e){return e},extractIfFragment:function(e){return e}});t.exports=r},{150:150,55:55}],62:[function(e,t,n){"use strict";var r=e(10),o=e(17),i=e(36),a=e(33),u=e(57),s=e(30),l=e(71),c=e(42),p=e(73),d=e(81),f=e(85),h={Component:i.injection,Class:a.injection,DOMComponent:c.injection,DOMProperty:r.injection,EmptyComponent:u.injection,EventPluginHub:o.injection,EventEmitter:s.injection,NativeComponent:l.injection,Perf:p.injection,RootIndex:d.injection,Updates:f.injection};t.exports=h},{10:10,17:17,30:30,33:33,36:36,42:42,57:57,71:71,73:73,81:81,85:85}],63:[function(e,t,n){"use strict";function r(e){return i(document.documentElement,e)}var o=e(50),i=e(107),a=e(117),u=e(119),s={hasSelectionCapabilities:function(e){return e&&("INPUT"===e.nodeName&&"text"===e.type||"TEXTAREA"===e.nodeName||"true"===e.contentEditable)},getSelectionInformation:function(){var e=u();return{focusedElem:e,selectionRange:s.hasSelectionCapabilities(e)?s.getSelection(e):null}},restoreSelection:function(e){var t=u(),n=e.focusedElem,o=e.selectionRange;t!==n&&r(n)&&(s.hasSelectionCapabilities(n)&&s.setSelection(n,o),a(n))},getSelection:function(e){var t;if("selectionStart"in e)t={start:e.selectionStart,end:e.selectionEnd};else if(document.selection&&"INPUT"===e.nodeName){var n=document.selection.createRange();n.parentElement()===e&&(t={start:-n.moveStart("character",-e.value.length),end:-n.moveEnd("character",-e.value.length)})}else t=o.getOffsets(e);return t||{start:0,end:0}},setSelection:function(e,t){var n=t.start,r=t.end;if("undefined"==typeof r&&(r=n),"selectionStart"in e)e.selectionStart=n,e.selectionEnd=Math.min(r,e.value.length);else if(document.selection&&"INPUT"===e.nodeName){var i=e.createTextRange();i.collapse(!0),i.moveStart("character",n),i.moveEnd("character",r-n),i.select()}else o.setOffsets(e,t)}};t.exports=s},{107:107,117:117,119:119,50:50}],64:[function(e,t,n){"use strict";function r(e){return f+e.toString(36)}function o(e,t){return e.charAt(t)===f||t===e.length}function i(e){return""===e||e.charAt(0)===f&&e.charAt(e.length-1)!==f}function a(e,t){return 0===t.indexOf(e)&&o(t,e.length)}function u(e){return e?e.substr(0,e.lastIndexOf(f)):""}function s(e,t){if(d(i(e)&&i(t)),d(a(e,t)),e===t)return e;var n,r=e.length+h;for(n=r;n<t.length&&!o(t,n);n++);return t.substr(0,n)}function l(e,t){var n=Math.min(e.length,t.length);if(0===n)return"";for(var r=0,a=0;n>=a;a++)if(o(e,a)&&o(t,a))r=a;else if(e.charAt(a)!==t.charAt(a))break;var u=e.substr(0,r);return d(i(u)),u}function c(e,t,n,r,o,i){e=e||"",t=t||"",d(e!==t);var l=a(t,e);d(l||a(e,t));for(var c=0,p=l?u:s,f=e;;f=p(f,t)){var h;if(o&&f===e||i&&f===t||(h=n(f,l,r)),h===!1||f===t)break;d(c++<m)}}var p=e(81),d=e(133),f=".",h=f.length,m=100,v={createReactRootID:function(){return r(p.createReactRootIndex())},createReactID:function(e,t){return e+t},getReactRootIDFromNodeID:function(e){if(e&&e.charAt(0)===f&&e.length>1){var t=e.indexOf(f,1);return t>-1?e.substr(0,t):e}return null},traverseEnterLeave:function(e,t,n,r,o){var i=l(e,t);i!==e&&c(e,i,n,r,!1,!0),i!==t&&c(i,t,n,o,!0,!1)},traverseTwoPhase:function(e,t,n){e&&(c("",e,t,n,!0,!1),c(e,"",t,n,!1,!0))},traverseAncestors:function(e,t,n){c("",e,t,n,!0,!1)},_getFirstCommonAncestorID:l,_getNextDescendantID:s,isAncestorIDOf:a,SEPARATOR:f};t.exports=v},{133:133,81:81}],65:[function(e,t,n){"use strict";var r={remove:function(e){e._reactInternalInstance=void 0},get:function(e){return e._reactInternalInstance},has:function(e){return void 0!==e._reactInternalInstance},set:function(e,t){e._reactInternalInstance=t}};t.exports=r},{}],66:[function(e,t,n){"use strict";var r={currentlyMountingInstance:null,currentlyUnmountingInstance:null};t.exports=r},{}],67:[function(e,t,n){"use strict";var r=e(104),o={CHECKSUM_ATTR_NAME:"data-react-checksum",addChecksumToMarkup:function(e){var t=r(e);return e.replace(">"," "+o.CHECKSUM_ATTR_NAME+'="'+t+'">')},canReuseMarkup:function(e,t){var n=t.getAttribute(o.CHECKSUM_ATTR_NAME);n=n&&parseInt(n,10);var i=r(e);return i===n}};t.exports=o},{104:104}],68:[function(e,t,n){"use strict";function r(e,t){for(var n=Math.min(e.length,t.length),r=0;n>r;r++)if(e.charAt(r)!==t.charAt(r))return r;return e.length===t.length?-1:n}function o(e){var t=P(e);return t&&K.getID(t)}function i(e){var t=a(e);if(t)if(L.hasOwnProperty(t)){var n=L[t];n!==e&&(w(!c(n,t)),L[t]=e)}else L[t]=e;return t}function a(e){return e&&e.getAttribute&&e.getAttribute(k)||""}function u(e,t){var n=a(e);n!==t&&delete L[n],e.setAttribute(k,t),L[t]=e}function s(e){return L.hasOwnProperty(e)&&c(L[e],e)||(L[e]=K.findReactNodeByID(e)),L[e]}function l(e){var t=b.get(e)._rootNodeID;return C.isNullComponentID(t)?null:(L.hasOwnProperty(t)&&c(L[t],t)||(L[t]=K.findReactNodeByID(t)),L[t])}function c(e,t){if(e){w(a(e)===t);var n=K.findReactContainerForID(t);if(n&&T(n,e))return!0}return!1}function p(e){delete L[e]}function d(e){var t=L[e];return t&&c(t,e)?void(W=t):!1}function f(e){W=null,E.traverseAncestors(e,d);var t=W;return W=null,t}function h(e,t,n,r,o){var i=D.mountComponent(e,t,r,I);e._isTopLevel=!0,K._mountImageIntoNode(i,n,o)}function m(e,t,n,r){var o=N.ReactReconcileTransaction.getPooled();o.perform(h,null,e,t,n,o,r),N.ReactReconcileTransaction.release(o)}var v=e(10),g=e(30),y=(e(39),e(55)),C=(e(56),e(57)),E=e(64),b=e(65),_=e(67),x=e(73),D=e(79),M=e(84),N=e(85),I=e(113),T=e(107),P=e(127),R=e(132),w=e(133),O=e(144),S=e(147),A=(e(150),E.SEPARATOR),k=v.ID_ATTRIBUTE_NAME,L={},U=1,F=9,B={},V={},j=[],W=null,K={_instancesByReactRootID:B,scrollMonitor:function(e,t){t()},_updateRootComponent:function(e,t,n,r){return K.scrollMonitor(n,function(){M.enqueueElementInternal(e,t),r&&M.enqueueCallbackInternal(e,r)}),e},_registerComponent:function(e,t){w(t&&(t.nodeType===U||t.nodeType===F)),g.ensureScrollValueMonitoring();var n=K.registerContainer(t);return B[n]=e,n},_renderNewRootComponent:function(e,t,n){var r=R(e,null),o=K._registerComponent(r,t);return N.batchedUpdates(m,r,o,t,n),r},render:function(e,t,n){w(y.isValidElement(e));var r=B[o(t)];if(r){var i=r._currentElement;if(S(i,e))return K._updateRootComponent(r,e,t,n).getPublicInstance();K.unmountComponentAtNode(t)}var a=P(t),u=a&&K.isRenderedByReact(a),s=u&&!r,l=K._renderNewRootComponent(e,t,s).getPublicInstance();return n&&n.call(l),l},constructAndRenderComponent:function(e,t,n){var r=y.createElement(e,t);return K.render(r,n)},constructAndRenderComponentByID:function(e,t,n){var r=document.getElementById(n);return w(r),K.constructAndRenderComponent(e,t,r)},registerContainer:function(e){var t=o(e);return t&&(t=E.getReactRootIDFromNodeID(t)),t||(t=E.createReactRootID()),V[t]=e,t},unmountComponentAtNode:function(e){w(e&&(e.nodeType===U||e.nodeType===F));var t=o(e),n=B[t];return n?(K.unmountComponentFromNode(n,e),delete B[t],delete V[t],!0):!1},unmountComponentFromNode:function(e,t){for(D.unmountComponent(e),t.nodeType===F&&(t=t.documentElement);t.lastChild;)t.removeChild(t.lastChild)},findReactContainerForID:function(e){var t=E.getReactRootIDFromNodeID(e),n=V[t];return n},findReactNodeByID:function(e){var t=K.findReactContainerForID(e);return K.findComponentRoot(t,e)},isRenderedByReact:function(e){if(1!==e.nodeType)return!1;var t=K.getID(e);return t?t.charAt(0)===A:!1},getFirstReactDOM:function(e){for(var t=e;t&&t.parentNode!==t;){if(K.isRenderedByReact(t))return t;t=t.parentNode}return null},findComponentRoot:function(e,t){var n=j,r=0,o=f(t)||e;for(n[0]=o.firstChild,n.length=1;r<n.length;){for(var i,a=n[r++];a;){var u=K.getID(a);u?t===u?i=a:E.isAncestorIDOf(u,t)&&(n.length=r=0,n.push(a.firstChild)):n.push(a.firstChild),a=a.nextSibling}if(i)return n.length=0,i}n.length=0,w(!1)},_mountImageIntoNode:function(e,t,n){if(w(t&&(t.nodeType===U||t.nodeType===F)),n){var o=P(t);if(_.canReuseMarkup(e,o))return;var i=o.getAttribute(_.CHECKSUM_ATTR_NAME);o.removeAttribute(_.CHECKSUM_ATTR_NAME);var a=o.outerHTML;o.setAttribute(_.CHECKSUM_ATTR_NAME,i);var u=r(e,a);" (client) "+e.substring(u-20,u+20)+"\n (server) "+a.substring(u-20,u+20),w(t.nodeType!==F)}w(t.nodeType!==F),O(t,e)},getReactRootID:o,getID:i,setID:u,getNode:s,getNodeFromInstance:l,purgeID:p};x.measureMethods(K,"ReactMount",{_renderNewRootComponent:"_renderNewRootComponent",_mountImageIntoNode:"_mountImageIntoNode"}),t.exports=K},{10:10,107:107,113:113,127:127,132:132,133:133,144:144,147:147,150:150,30:30,39:39,55:55,56:56,57:57,64:64,65:65,67:67,73:73,79:79,84:84,85:85}],69:[function(e,t,n){"use strict";function r(e,t,n){h.push({parentID:e,parentNode:null,type:c.INSERT_MARKUP,markupIndex:m.push(t)-1,textContent:null,fromIndex:null,toIndex:n})}function o(e,t,n){h.push({parentID:e,parentNode:null,type:c.MOVE_EXISTING,markupIndex:null,textContent:null,fromIndex:t,toIndex:n})}function i(e,t){h.push({parentID:e,parentNode:null,type:c.REMOVE_NODE,markupIndex:null,textContent:null,fromIndex:t,toIndex:null})}function a(e,t){h.push({parentID:e,parentNode:null,type:c.TEXT_CONTENT,markupIndex:null,textContent:t,fromIndex:null,toIndex:null})}function u(){h.length&&(l.processChildrenUpdates(h,m),s())}function s(){h.length=0,m.length=0}var l=e(36),c=e(70),p=e(79),d=e(31),f=0,h=[],m=[],v={Mixin:{mountChildren:function(e,t,n){var r=d.instantiateChildren(e,t,n);this._renderedChildren=r;var o=[],i=0;for(var a in r)if(r.hasOwnProperty(a)){var u=r[a],s=this._rootNodeID+a,l=p.mountComponent(u,s,t,n);u._mountIndex=i,o.push(l),i++}return o},updateTextContent:function(e){f++;var t=!0;try{var n=this._renderedChildren;d.unmountChildren(n);for(var r in n)n.hasOwnProperty(r)&&this._unmountChildByName(n[r],r);this.setTextContent(e),t=!1}finally{f--,f||(t?s():u())}},updateChildren:function(e,t,n){f++;var r=!0;try{this._updateChildren(e,t,n),r=!1}finally{f--,f||(r?s():u())}},_updateChildren:function(e,t,n){var r=this._renderedChildren,o=d.updateChildren(r,e,t,n);if(this._renderedChildren=o,o||r){var i,a=0,u=0;for(i in o)if(o.hasOwnProperty(i)){var s=r&&r[i],l=o[i];s===l?(this.moveChild(s,u,a),a=Math.max(s._mountIndex,a),s._mountIndex=u):(s&&(a=Math.max(s._mountIndex,a),this._unmountChildByName(s,i)),this._mountChildByNameAtIndex(l,i,u,t,n)),u++}for(i in r)!r.hasOwnProperty(i)||o&&o.hasOwnProperty(i)||this._unmountChildByName(r[i],i)}},unmountChildren:function(){var e=this._renderedChildren;d.unmountChildren(e),this._renderedChildren=null},moveChild:function(e,t,n){e._mountIndex<n&&o(this._rootNodeID,e._mountIndex,t)},createChild:function(e,t){r(this._rootNodeID,t,e._mountIndex)},removeChild:function(e){i(this._rootNodeID,e._mountIndex)},setTextContent:function(e){a(this._rootNodeID,e)},_mountChildByNameAtIndex:function(e,t,n,r,o){var i=this._rootNodeID+t,a=p.mountComponent(e,i,r,o);e._mountIndex=n,this.createChild(e,a)},_unmountChildByName:function(e,t){this.removeChild(e),e._mountIndex=null}}};t.exports=v},{31:31,36:36,70:70,79:79}],70:[function(e,t,n){"use strict";var r=e(138),o=r({INSERT_MARKUP:null,MOVE_EXISTING:null,REMOVE_NODE:null,TEXT_CONTENT:null});t.exports=o},{138:138}],71:[function(e,t,n){"use strict";function r(e){if("function"==typeof e.type)return e.type;var t=e.type,n=p[t];return null==n&&(p[t]=n=l(t)),n}function o(e){return s(c),new c(e.type,e.props)}function i(e){return new d(e)}function a(e){return e instanceof d}var u=e(27),s=e(133),l=null,c=null,p={},d=null,f={injectGenericComponentClass:function(e){c=e},injectTextComponentClass:function(e){d=e},injectComponentClasses:function(e){u(p,e)},injectAutoWrapper:function(e){l=e}},h={getComponentClassForElement:r,createInternalComponent:o,createInstanceForText:i,isTextComponent:a,injection:f};t.exports=h},{133:133,27:27}],72:[function(e,t,n){"use strict";var r=e(133),o={isValidOwner:function(e){return!(!e||"function"!=typeof e.attachRef||"function"!=typeof e.detachRef)},addComponentAsRefTo:function(e,t,n){r(o.isValidOwner(n)),n.attachRef(t,e)},removeComponentAsRefFrom:function(e,t,n){r(o.isValidOwner(n)),n.getPublicInstance().refs[t]===e.getPublicInstance()&&n.detachRef(t)}};t.exports=o},{133:133}],73:[function(e,t,n){"use strict";function r(e,t,n){return n}var o={enableMeasure:!1,storedMeasure:r,measureMethods:function(e,t,n){},measure:function(e,t,n){return n},injection:{injectMeasure:function(e){o.storedMeasure=e}}};t.exports=o},{}],74:[function(e,t,n){"use strict";var r={};t.exports=r},{}],75:[function(e,t,n){"use strict";var r=e(138),o=r({prop:null,context:null,childContext:null});t.exports=o},{138:138}],76:[function(e,t,n){"use strict";function r(e){function t(t,n,r,o,i){if(o=o||b,null==n[r]){var a=C[i];return t?new Error("Required "+a+" `"+r+"` was not specified in "+("`"+o+"`.")):null}return e(n,r,o,i)}var n=t.bind(null,!1);return n.isRequired=t.bind(null,!0),n}function o(e){function t(t,n,r,o){var i=t[n],a=m(i);if(a!==e){var u=C[o],s=v(i);return new Error("Invalid "+u+" `"+n+"` of type `"+s+"` "+("supplied to `"+r+"`, expected `"+e+"`."))}return null}return r(t)}function i(){return r(E.thatReturns(null))}function a(e){function t(t,n,r,o){var i=t[n];if(!Array.isArray(i)){var a=C[o],u=m(i);return new Error("Invalid "+a+" `"+n+"` of type "+("`"+u+"` supplied to `"+r+"`, expected an array."))}for(var s=0;s<i.length;s++){var l=e(i,s,r,o);if(l instanceof Error)return l}return null}return r(t)}function u(){function e(e,t,n,r){if(!g.isValidElement(e[t])){var o=C[r];return new Error("Invalid "+o+" `"+t+"` supplied to "+("`"+n+"`, expected a ReactElement."))}return null}return r(e)}function s(e){function t(t,n,r,o){if(!(t[n]instanceof e)){var i=C[o],a=e.name||b;return new Error("Invalid "+i+" `"+n+"` supplied to "+("`"+r+"`, expected instance of `"+a+"`."))}return null}return r(t)}function l(e){function t(t,n,r,o){for(var i=t[n],a=0;a<e.length;a++)if(i===e[a])return null;var u=C[o],s=JSON.stringify(e);return new Error("Invalid "+u+" `"+n+"` of value `"+i+"` "+("supplied to `"+r+"`, expected one of "+s+"."))}return r(t)}function c(e){function t(t,n,r,o){var i=t[n],a=m(i);if("object"!==a){var u=C[o];return new Error("Invalid "+u+" `"+n+"` of type "+("`"+a+"` supplied to `"+r+"`, expected an object."))}for(var s in i)if(i.hasOwnProperty(s)){var l=e(i,s,r,o);if(l instanceof Error)return l}return null}return r(t)}function p(e){function t(t,n,r,o){for(var i=0;i<e.length;i++){var a=e[i];if(null==a(t,n,r,o))return null}var u=C[o];return new Error("Invalid "+u+" `"+n+"` supplied to "+("`"+r+"`."))}return r(t)}function d(){function e(e,t,n,r){if(!h(e[t])){var o=C[r];return new Error("Invalid "+o+" `"+t+"` supplied to "+("`"+n+"`, expected a ReactNode."))}return null}return r(e)}function f(e){function t(t,n,r,o){var i=t[n],a=m(i);if("object"!==a){var u=C[o];return new Error("Invalid "+u+" `"+n+"` of type `"+a+"` "+("supplied to `"+r+"`, expected `object`."))}for(var s in e){var l=e[s];if(l){var c=l(i,s,r,o);if(c)return c}}return null}return r(t)}function h(e){switch(typeof e){case"number":case"string":case"undefined":return!0;case"boolean":return!e;case"object":if(Array.isArray(e))return e.every(h);if(null===e||g.isValidElement(e))return!0;e=y.extractIfFragment(e);for(var t in e)if(!h(e[t]))return!1;return!0;default:return!1}}function m(e){var t=typeof e;return Array.isArray(e)?"array":e instanceof RegExp?"object":t}function v(e){var t=m(e);if("object"===t){if(e instanceof Date)return"date";if(e instanceof RegExp)return"regexp"}return t}var g=e(55),y=e(61),C=e(74),E=e(112),b="<<anonymous>>",_=u(),x=d(),D={array:o("array"),bool:o("boolean"),func:o("function"),number:o("number"),object:o("object"),string:o("string"),any:i(),arrayOf:a,element:_,instanceOf:s,node:x,objectOf:c,oneOf:l,oneOfType:p,shape:f};t.exports=D},{112:112,55:55,61:61,74:74}],77:[function(e,t,n){"use strict";function r(){this.listenersToPut=[]}var o=e(28),i=e(30),a=e(27);a(r.prototype,{enqueuePutListener:function(e,t,n){this.listenersToPut.push({rootNodeID:e,propKey:t,propValue:n})},putListeners:function(){for(var e=0;e<this.listenersToPut.length;e++){var t=this.listenersToPut[e];i.putListener(t.rootNodeID,t.propKey,t.propValue)}},reset:function(){this.listenersToPut.length=0},destructor:function(){this.reset()}}),o.addPoolingTo(r),t.exports=r},{27:27,28:28,30:30}],78:[function(e,t,n){"use strict";function r(){this.reinitializeTransaction(),this.renderToStaticMarkup=!1,this.reactMountReady=o.getPooled(null),this.putListenerQueue=s.getPooled()}var o=e(6),i=e(28),a=e(30),u=e(63),s=e(77),l=e(101),c=e(27),p={initialize:u.getSelectionInformation,close:u.restoreSelection},d={initialize:function(){var e=a.isEnabled();return a.setEnabled(!1),e},close:function(e){a.setEnabled(e)}},f={initialize:function(){this.reactMountReady.reset()},close:function(){this.reactMountReady.notifyAll()}},h={initialize:function(){this.putListenerQueue.reset()},close:function(){this.putListenerQueue.putListeners()}},m=[h,p,d,f],v={getTransactionWrappers:function(){return m},getReactMountReady:function(){return this.reactMountReady},getPutListenerQueue:function(){return this.putListenerQueue},destructor:function(){o.release(this.reactMountReady),this.reactMountReady=null,s.release(this.putListenerQueue),this.putListenerQueue=null}};c(r.prototype,l.Mixin,v),i.addPoolingTo(r),t.exports=r},{101:101,27:27,28:28,30:30,6:6,63:63,77:77}],79:[function(e,t,n){"use strict";function r(){o.attachRefs(this,this._currentElement)}var o=e(80),i=(e(56),{mountComponent:function(e,t,n,o){var i=e.mountComponent(t,n,o);return n.getReactMountReady().enqueue(r,e),i},unmountComponent:function(e){o.detachRefs(e,e._currentElement),e.unmountComponent()},receiveComponent:function(e,t,n,i){var a=e._currentElement;if(t!==a||null==t._owner){var u=o.shouldUpdateRefs(a,t);u&&o.detachRefs(e,a),e.receiveComponent(t,n,i),u&&n.getReactMountReady().enqueue(r,e)}},performUpdateIfNecessary:function(e,t){e.performUpdateIfNecessary(t)}});t.exports=i},{56:56,80:80}],80:[function(e,t,n){"use strict";function r(e,t,n){"function"==typeof e?e(t.getPublicInstance()):i.addComponentAsRefTo(t,e,n)}function o(e,t,n){"function"==typeof e?e(null):i.removeComponentAsRefFrom(t,e,n)}var i=e(72),a={};a.attachRefs=function(e,t){var n=t.ref;null!=n&&r(n,e,t._owner)},a.shouldUpdateRefs=function(e,t){return t._owner!==e._owner||t.ref!==e.ref},a.detachRefs=function(e,t){var n=t.ref;null!=n&&o(n,e,t._owner)},t.exports=a},{72:72}],81:[function(e,t,n){"use strict";var r={injectCreateReactRootIndex:function(e){o.createReactRootIndex=e}},o={createReactRootIndex:null,injection:r};t.exports=o},{}],82:[function(e,t,n){"use strict";function r(e){p(i.isValidElement(e));var t;try{var n=a.createReactRootID();return t=s.getPooled(!1),t.perform(function(){var r=c(e,null),o=r.mountComponent(n,t,l);return u.addChecksumToMarkup(o)},null)}finally{s.release(t)}}function o(e){p(i.isValidElement(e));var t;try{var n=a.createReactRootID();return t=s.getPooled(!0),t.perform(function(){var r=c(e,null);return r.mountComponent(n,t,l)},null)}finally{s.release(t)}}var i=e(55),a=e(64),u=e(67),s=e(83),l=e(113),c=e(132),p=e(133);t.exports={renderToString:r,renderToStaticMarkup:o}},{113:113,132:132,133:133,55:55,64:64,67:67,83:83}],83:[function(e,t,n){"use strict";function r(e){this.reinitializeTransaction(),this.renderToStaticMarkup=e,this.reactMountReady=i.getPooled(null),this.putListenerQueue=a.getPooled()}var o=e(28),i=e(6),a=e(77),u=e(101),s=e(27),l=e(112),c={initialize:function(){this.reactMountReady.reset()},close:l},p={initialize:function(){this.putListenerQueue.reset()},close:l},d=[p,c],f={getTransactionWrappers:function(){return d},getReactMountReady:function(){return this.reactMountReady},getPutListenerQueue:function(){return this.putListenerQueue},destructor:function(){i.release(this.reactMountReady),this.reactMountReady=null,a.release(this.putListenerQueue),this.putListenerQueue=null}};s(r.prototype,u.Mixin,f),o.addPoolingTo(r),t.exports=r},{101:101,112:112,27:27,28:28,6:6,77:77}],84:[function(e,t,n){"use strict";function r(e){e!==i.currentlyMountingInstance&&l.enqueueUpdate(e)}function o(e,t){p(null==a.current);var n=s.get(e);return n?n===i.currentlyUnmountingInstance?null:n:null}var i=e(66),a=e(39),u=e(55),s=e(65),l=e(85),c=e(27),p=e(133),d=(e(150),{enqueueCallback:function(e,t){p("function"==typeof t);var n=o(e);return n&&n!==i.currentlyMountingInstance?(n._pendingCallbacks?n._pendingCallbacks.push(t):n._pendingCallbacks=[t],void r(n)):null},enqueueCallbackInternal:function(e,t){p("function"==typeof t),e._pendingCallbacks?e._pendingCallbacks.push(t):e._pendingCallbacks=[t],r(e)},enqueueForceUpdate:function(e){var t=o(e,"forceUpdate");t&&(t._pendingForceUpdate=!0,r(t))},enqueueReplaceState:function(e,t){var n=o(e,"replaceState");n&&(n._pendingStateQueue=[t],n._pendingReplaceState=!0,r(n))},enqueueSetState:function(e,t){var n=o(e,"setState");if(n){var i=n._pendingStateQueue||(n._pendingStateQueue=[]);i.push(t),r(n)}},enqueueSetProps:function(e,t){var n=o(e,"setProps");if(n){p(n._isTopLevel);var i=n._pendingElement||n._currentElement,a=c({},i.props,t);n._pendingElement=u.cloneAndReplaceProps(i,a),r(n)}},enqueueReplaceProps:function(e,t){var n=o(e,"replaceProps");if(n){p(n._isTopLevel);var i=n._pendingElement||n._currentElement;n._pendingElement=u.cloneAndReplaceProps(i,t),r(n)}},enqueueElementInternal:function(e,t){e._pendingElement=t,r(e)}});t.exports=d},{133:133,150:150,27:27,39:39,55:55,65:65,66:66,85:85}],85:[function(e,t,n){"use strict";function r(){v(N.ReactReconcileTransaction&&E)}function o(){this.reinitializeTransaction(),this.dirtyComponentsLength=null,this.callbackQueue=c.getPooled(),this.reconcileTransaction=N.ReactReconcileTransaction.getPooled()}function i(e,t,n,o,i){r(),E.batchedUpdates(e,t,n,o,i)}function a(e,t){return e._mountOrder-t._mountOrder}function u(e){var t=e.dirtyComponentsLength;v(t===g.length),g.sort(a);for(var n=0;t>n;n++){var r=g[n],o=r._pendingCallbacks;if(r._pendingCallbacks=null,f.performUpdateIfNecessary(r,e.reconcileTransaction),o)for(var i=0;i<o.length;i++)e.callbackQueue.enqueue(o[i],r.getPublicInstance())}}function s(e){return r(),E.isBatchingUpdates?void g.push(e):void E.batchedUpdates(s,e)}function l(e,t){v(E.isBatchingUpdates),y.enqueue(e,t),C=!0}var c=e(6),p=e(28),d=(e(39),e(73)),f=e(79),h=e(101),m=e(27),v=e(133),g=(e(150),[]),y=c.getPooled(),C=!1,E=null,b={initialize:function(){this.dirtyComponentsLength=g.length},close:function(){this.dirtyComponentsLength!==g.length?(g.splice(0,this.dirtyComponentsLength),D()):g.length=0}},_={initialize:function(){this.callbackQueue.reset()},close:function(){this.callbackQueue.notifyAll()}},x=[b,_];m(o.prototype,h.Mixin,{getTransactionWrappers:function(){return x},destructor:function(){this.dirtyComponentsLength=null,c.release(this.callbackQueue),this.callbackQueue=null,N.ReactReconcileTransaction.release(this.reconcileTransaction),this.reconcileTransaction=null},perform:function(e,t,n){return h.Mixin.perform.call(this,this.reconcileTransaction.perform,this.reconcileTransaction,e,t,n)}}),p.addPoolingTo(o);var D=function(){for(;g.length||C;){if(g.length){var e=o.getPooled();e.perform(u,null,e),o.release(e)}if(C){C=!1;var t=y;y=c.getPooled(),t.notifyAll(),c.release(t)}}};D=d.measure("ReactUpdates","flushBatchedUpdates",D);var M={injectReconcileTransaction:function(e){v(e),N.ReactReconcileTransaction=e},injectBatchingStrategy:function(e){v(e),v("function"==typeof e.batchedUpdates),v("boolean"==typeof e.isBatchingUpdates),E=e}},N={ReactReconcileTransaction:null,batchedUpdates:i,enqueueUpdate:s,flushBatchedUpdates:D,injection:M,asap:l};t.exports=N},{101:101,133:133,150:150,27:27,28:28,39:39,6:6,73:73,79:79}],86:[function(e,t,n){"use strict";var r=e(10),o=r.injection.MUST_USE_ATTRIBUTE,i={Properties:{clipPath:o,cx:o,cy:o,d:o,dx:o,dy:o,fill:o,fillOpacity:o,fontFamily:o,fontSize:o,fx:o,fy:o,gradientTransform:o,gradientUnits:o,markerEnd:o,markerMid:o,markerStart:o,offset:o,opacity:o,patternContentUnits:o,patternUnits:o,points:o,preserveAspectRatio:o,r:o,rx:o,ry:o,spreadMethod:o,stopColor:o,stopOpacity:o,stroke:o,strokeDasharray:o,strokeLinecap:o,strokeOpacity:o,strokeWidth:o,textAnchor:o,transform:o,version:o,viewBox:o,x1:o,x2:o,x:o,y1:o,y2:o,y:o},DOMAttributeNames:{clipPath:"clip-path",fillOpacity:"fill-opacity",fontFamily:"font-family",fontSize:"font-size",gradientTransform:"gradientTransform",gradientUnits:"gradientUnits",markerEnd:"marker-end",markerMid:"marker-mid",markerStart:"marker-start",patternContentUnits:"patternContentUnits",patternUnits:"patternUnits",preserveAspectRatio:"preserveAspectRatio",spreadMethod:"spreadMethod",stopColor:"stop-color",stopOpacity:"stop-opacity",strokeDasharray:"stroke-dasharray",strokeLinecap:"stroke-linecap",strokeOpacity:"stroke-opacity",strokeWidth:"stroke-width",textAnchor:"text-anchor",viewBox:"viewBox"}};t.exports=i},{10:10}],87:[function(e,t,n){"use strict";function r(e){if("selectionStart"in e&&u.hasSelectionCapabilities(e))return{start:e.selectionStart,end:e.selectionEnd};if(window.getSelection){var t=window.getSelection();return{anchorNode:t.anchorNode,anchorOffset:t.anchorOffset,focusNode:t.focusNode,focusOffset:t.focusOffset}}if(document.selection){var n=document.selection.createRange();return{parentElement:n.parentElement(),text:n.text,top:n.boundingTop,left:n.boundingLeft}}}function o(e){if(y||null==m||m!==l())return null;var t=r(m);if(!g||!d(g,t)){g=t;var n=s.getPooled(h.select,v,e);return n.type="select",n.target=m,a.accumulateTwoPhaseDispatches(n),n}}var i=e(15),a=e(20),u=e(63),s=e(93),l=e(119),c=e(136),p=e(139),d=e(146),f=i.topLevelTypes,h={select:{phasedRegistrationNames:{bubbled:p({onSelect:null}),captured:p({onSelectCapture:null})},dependencies:[f.topBlur,f.topContextMenu,f.topFocus,f.topKeyDown,f.topMouseDown,f.topMouseUp,f.topSelectionChange]
-}},m=null,v=null,g=null,y=!1,C={eventTypes:h,extractEvents:function(e,t,n,r){switch(e){case f.topFocus:(c(t)||"true"===t.contentEditable)&&(m=t,v=n,g=null);break;case f.topBlur:m=null,v=null,g=null;break;case f.topMouseDown:y=!0;break;case f.topContextMenu:case f.topMouseUp:return y=!1,o(r);case f.topSelectionChange:case f.topKeyDown:case f.topKeyUp:return o(r)}}};t.exports=C},{119:119,136:136,139:139,146:146,15:15,20:20,63:63,93:93}],88:[function(e,t,n){"use strict";var r=Math.pow(2,53),o={createReactRootIndex:function(){return Math.ceil(Math.random()*r)}};t.exports=o},{}],89:[function(e,t,n){"use strict";var r=e(15),o=e(19),i=e(20),a=e(90),u=e(93),s=e(94),l=e(96),c=e(97),p=e(92),d=e(98),f=e(99),h=e(100),m=e(120),v=e(133),g=e(139),y=(e(150),r.topLevelTypes),C={blur:{phasedRegistrationNames:{bubbled:g({onBlur:!0}),captured:g({onBlurCapture:!0})}},click:{phasedRegistrationNames:{bubbled:g({onClick:!0}),captured:g({onClickCapture:!0})}},contextMenu:{phasedRegistrationNames:{bubbled:g({onContextMenu:!0}),captured:g({onContextMenuCapture:!0})}},copy:{phasedRegistrationNames:{bubbled:g({onCopy:!0}),captured:g({onCopyCapture:!0})}},cut:{phasedRegistrationNames:{bubbled:g({onCut:!0}),captured:g({onCutCapture:!0})}},doubleClick:{phasedRegistrationNames:{bubbled:g({onDoubleClick:!0}),captured:g({onDoubleClickCapture:!0})}},drag:{phasedRegistrationNames:{bubbled:g({onDrag:!0}),captured:g({onDragCapture:!0})}},dragEnd:{phasedRegistrationNames:{bubbled:g({onDragEnd:!0}),captured:g({onDragEndCapture:!0})}},dragEnter:{phasedRegistrationNames:{bubbled:g({onDragEnter:!0}),captured:g({onDragEnterCapture:!0})}},dragExit:{phasedRegistrationNames:{bubbled:g({onDragExit:!0}),captured:g({onDragExitCapture:!0})}},dragLeave:{phasedRegistrationNames:{bubbled:g({onDragLeave:!0}),captured:g({onDragLeaveCapture:!0})}},dragOver:{phasedRegistrationNames:{bubbled:g({onDragOver:!0}),captured:g({onDragOverCapture:!0})}},dragStart:{phasedRegistrationNames:{bubbled:g({onDragStart:!0}),captured:g({onDragStartCapture:!0})}},drop:{phasedRegistrationNames:{bubbled:g({onDrop:!0}),captured:g({onDropCapture:!0})}},focus:{phasedRegistrationNames:{bubbled:g({onFocus:!0}),captured:g({onFocusCapture:!0})}},input:{phasedRegistrationNames:{bubbled:g({onInput:!0}),captured:g({onInputCapture:!0})}},keyDown:{phasedRegistrationNames:{bubbled:g({onKeyDown:!0}),captured:g({onKeyDownCapture:!0})}},keyPress:{phasedRegistrationNames:{bubbled:g({onKeyPress:!0}),captured:g({onKeyPressCapture:!0})}},keyUp:{phasedRegistrationNames:{bubbled:g({onKeyUp:!0}),captured:g({onKeyUpCapture:!0})}},load:{phasedRegistrationNames:{bubbled:g({onLoad:!0}),captured:g({onLoadCapture:!0})}},error:{phasedRegistrationNames:{bubbled:g({onError:!0}),captured:g({onErrorCapture:!0})}},mouseDown:{phasedRegistrationNames:{bubbled:g({onMouseDown:!0}),captured:g({onMouseDownCapture:!0})}},mouseMove:{phasedRegistrationNames:{bubbled:g({onMouseMove:!0}),captured:g({onMouseMoveCapture:!0})}},mouseOut:{phasedRegistrationNames:{bubbled:g({onMouseOut:!0}),captured:g({onMouseOutCapture:!0})}},mouseOver:{phasedRegistrationNames:{bubbled:g({onMouseOver:!0}),captured:g({onMouseOverCapture:!0})}},mouseUp:{phasedRegistrationNames:{bubbled:g({onMouseUp:!0}),captured:g({onMouseUpCapture:!0})}},paste:{phasedRegistrationNames:{bubbled:g({onPaste:!0}),captured:g({onPasteCapture:!0})}},reset:{phasedRegistrationNames:{bubbled:g({onReset:!0}),captured:g({onResetCapture:!0})}},scroll:{phasedRegistrationNames:{bubbled:g({onScroll:!0}),captured:g({onScrollCapture:!0})}},submit:{phasedRegistrationNames:{bubbled:g({onSubmit:!0}),captured:g({onSubmitCapture:!0})}},touchCancel:{phasedRegistrationNames:{bubbled:g({onTouchCancel:!0}),captured:g({onTouchCancelCapture:!0})}},touchEnd:{phasedRegistrationNames:{bubbled:g({onTouchEnd:!0}),captured:g({onTouchEndCapture:!0})}},touchMove:{phasedRegistrationNames:{bubbled:g({onTouchMove:!0}),captured:g({onTouchMoveCapture:!0})}},touchStart:{phasedRegistrationNames:{bubbled:g({onTouchStart:!0}),captured:g({onTouchStartCapture:!0})}},wheel:{phasedRegistrationNames:{bubbled:g({onWheel:!0}),captured:g({onWheelCapture:!0})}}},E={topBlur:C.blur,topClick:C.click,topContextMenu:C.contextMenu,topCopy:C.copy,topCut:C.cut,topDoubleClick:C.doubleClick,topDrag:C.drag,topDragEnd:C.dragEnd,topDragEnter:C.dragEnter,topDragExit:C.dragExit,topDragLeave:C.dragLeave,topDragOver:C.dragOver,topDragStart:C.dragStart,topDrop:C.drop,topError:C.error,topFocus:C.focus,topInput:C.input,topKeyDown:C.keyDown,topKeyPress:C.keyPress,topKeyUp:C.keyUp,topLoad:C.load,topMouseDown:C.mouseDown,topMouseMove:C.mouseMove,topMouseOut:C.mouseOut,topMouseOver:C.mouseOver,topMouseUp:C.mouseUp,topPaste:C.paste,topReset:C.reset,topScroll:C.scroll,topSubmit:C.submit,topTouchCancel:C.touchCancel,topTouchEnd:C.touchEnd,topTouchMove:C.touchMove,topTouchStart:C.touchStart,topWheel:C.wheel};for(var b in E)E[b].dependencies=[b];var _={eventTypes:C,executeDispatch:function(e,t,n){var r=o.executeDispatch(e,t,n);r===!1&&(e.stopPropagation(),e.preventDefault())},extractEvents:function(e,t,n,r){var o=E[e];if(!o)return null;var g;switch(e){case y.topInput:case y.topLoad:case y.topError:case y.topReset:case y.topSubmit:g=u;break;case y.topKeyPress:if(0===m(r))return null;case y.topKeyDown:case y.topKeyUp:g=l;break;case y.topBlur:case y.topFocus:g=s;break;case y.topClick:if(2===r.button)return null;case y.topContextMenu:case y.topDoubleClick:case y.topMouseDown:case y.topMouseMove:case y.topMouseOut:case y.topMouseOver:case y.topMouseUp:g=c;break;case y.topDrag:case y.topDragEnd:case y.topDragEnter:case y.topDragExit:case y.topDragLeave:case y.topDragOver:case y.topDragStart:case y.topDrop:g=p;break;case y.topTouchCancel:case y.topTouchEnd:case y.topTouchMove:case y.topTouchStart:g=d;break;case y.topScroll:g=f;break;case y.topWheel:g=h;break;case y.topCopy:case y.topCut:case y.topPaste:g=a}v(g);var C=g.getPooled(o,n,r);return i.accumulateTwoPhaseDispatches(C),C}};t.exports=_},{100:100,120:120,133:133,139:139,15:15,150:150,19:19,20:20,90:90,92:92,93:93,94:94,96:96,97:97,98:98,99:99}],90:[function(e,t,n){"use strict";function r(e,t,n){o.call(this,e,t,n)}var o=e(93),i={clipboardData:function(e){return"clipboardData"in e?e.clipboardData:window.clipboardData}};o.augmentClass(r,i),t.exports=r},{93:93}],91:[function(e,t,n){"use strict";function r(e,t,n){o.call(this,e,t,n)}var o=e(93),i={data:null};o.augmentClass(r,i),t.exports=r},{93:93}],92:[function(e,t,n){"use strict";function r(e,t,n){o.call(this,e,t,n)}var o=e(97),i={dataTransfer:null};o.augmentClass(r,i),t.exports=r},{97:97}],93:[function(e,t,n){"use strict";function r(e,t,n){this.dispatchConfig=e,this.dispatchMarker=t,this.nativeEvent=n;var r=this.constructor.Interface;for(var o in r)if(r.hasOwnProperty(o)){var i=r[o];i?this[o]=i(n):this[o]=n[o]}var u=null!=n.defaultPrevented?n.defaultPrevented:n.returnValue===!1;u?this.isDefaultPrevented=a.thatReturnsTrue:this.isDefaultPrevented=a.thatReturnsFalse,this.isPropagationStopped=a.thatReturnsFalse}var o=e(28),i=e(27),a=e(112),u=e(123),s={type:null,target:u,currentTarget:a.thatReturnsNull,eventPhase:null,bubbles:null,cancelable:null,timeStamp:function(e){return e.timeStamp||Date.now()},defaultPrevented:null,isTrusted:null};i(r.prototype,{preventDefault:function(){this.defaultPrevented=!0;var e=this.nativeEvent;e.preventDefault?e.preventDefault():e.returnValue=!1,this.isDefaultPrevented=a.thatReturnsTrue},stopPropagation:function(){var e=this.nativeEvent;e.stopPropagation?e.stopPropagation():e.cancelBubble=!0,this.isPropagationStopped=a.thatReturnsTrue},persist:function(){this.isPersistent=a.thatReturnsTrue},isPersistent:a.thatReturnsFalse,destructor:function(){var e=this.constructor.Interface;for(var t in e)this[t]=null;this.dispatchConfig=null,this.dispatchMarker=null,this.nativeEvent=null}}),r.Interface=s,r.augmentClass=function(e,t){var n=this,r=Object.create(n.prototype);i(r,e.prototype),e.prototype=r,e.prototype.constructor=e,e.Interface=i({},n.Interface,t),e.augmentClass=n.augmentClass,o.addPoolingTo(e,o.threeArgumentPooler)},o.addPoolingTo(r,o.threeArgumentPooler),t.exports=r},{112:112,123:123,27:27,28:28}],94:[function(e,t,n){"use strict";function r(e,t,n){o.call(this,e,t,n)}var o=e(99),i={relatedTarget:null};o.augmentClass(r,i),t.exports=r},{99:99}],95:[function(e,t,n){"use strict";function r(e,t,n){o.call(this,e,t,n)}var o=e(93),i={data:null};o.augmentClass(r,i),t.exports=r},{93:93}],96:[function(e,t,n){"use strict";function r(e,t,n){o.call(this,e,t,n)}var o=e(99),i=e(120),a=e(121),u=e(122),s={key:a,location:null,ctrlKey:null,shiftKey:null,altKey:null,metaKey:null,repeat:null,locale:null,getModifierState:u,charCode:function(e){return"keypress"===e.type?i(e):0},keyCode:function(e){return"keydown"===e.type||"keyup"===e.type?e.keyCode:0},which:function(e){return"keypress"===e.type?i(e):"keydown"===e.type||"keyup"===e.type?e.keyCode:0}};o.augmentClass(r,s),t.exports=r},{120:120,121:121,122:122,99:99}],97:[function(e,t,n){"use strict";function r(e,t,n){o.call(this,e,t,n)}var o=e(99),i=e(102),a=e(122),u={screenX:null,screenY:null,clientX:null,clientY:null,ctrlKey:null,shiftKey:null,altKey:null,metaKey:null,getModifierState:a,button:function(e){var t=e.button;return"which"in e?t:2===t?2:4===t?1:0},buttons:null,relatedTarget:function(e){return e.relatedTarget||(e.fromElement===e.srcElement?e.toElement:e.fromElement)},pageX:function(e){return"pageX"in e?e.pageX:e.clientX+i.currentScrollLeft},pageY:function(e){return"pageY"in e?e.pageY:e.clientY+i.currentScrollTop}};o.augmentClass(r,u),t.exports=r},{102:102,122:122,99:99}],98:[function(e,t,n){"use strict";function r(e,t,n){o.call(this,e,t,n)}var o=e(99),i=e(122),a={touches:null,targetTouches:null,changedTouches:null,altKey:null,metaKey:null,ctrlKey:null,shiftKey:null,getModifierState:i};o.augmentClass(r,a),t.exports=r},{122:122,99:99}],99:[function(e,t,n){"use strict";function r(e,t,n){o.call(this,e,t,n)}var o=e(93),i=e(123),a={view:function(e){if(e.view)return e.view;var t=i(e);if(null!=t&&t.window===t)return t;var n=t.ownerDocument;return n?n.defaultView||n.parentWindow:window},detail:function(e){return e.detail||0}};o.augmentClass(r,a),t.exports=r},{123:123,93:93}],100:[function(e,t,n){"use strict";function r(e,t,n){o.call(this,e,t,n)}var o=e(97),i={deltaX:function(e){return"deltaX"in e?e.deltaX:"wheelDeltaX"in e?-e.wheelDeltaX:0},deltaY:function(e){return"deltaY"in e?e.deltaY:"wheelDeltaY"in e?-e.wheelDeltaY:"wheelDelta"in e?-e.wheelDelta:0},deltaZ:null,deltaMode:null};o.augmentClass(r,i),t.exports=r},{97:97}],101:[function(e,t,n){"use strict";var r=e(133),o={reinitializeTransaction:function(){this.transactionWrappers=this.getTransactionWrappers(),this.wrapperInitData?this.wrapperInitData.length=0:this.wrapperInitData=[],this._isInTransaction=!1},_isInTransaction:!1,getTransactionWrappers:null,isInTransaction:function(){return!!this._isInTransaction},perform:function(e,t,n,o,i,a,u,s){r(!this.isInTransaction());var l,c;try{this._isInTransaction=!0,l=!0,this.initializeAll(0),c=e.call(t,n,o,i,a,u,s),l=!1}finally{try{if(l)try{this.closeAll(0)}catch(p){}else this.closeAll(0)}finally{this._isInTransaction=!1}}return c},initializeAll:function(e){for(var t=this.transactionWrappers,n=e;n<t.length;n++){var r=t[n];try{this.wrapperInitData[n]=i.OBSERVED_ERROR,this.wrapperInitData[n]=r.initialize?r.initialize.call(this):null}finally{if(this.wrapperInitData[n]===i.OBSERVED_ERROR)try{this.initializeAll(n+1)}catch(o){}}}},closeAll:function(e){r(this.isInTransaction());for(var t=this.transactionWrappers,n=e;n<t.length;n++){var o,a=t[n],u=this.wrapperInitData[n];try{o=!0,u!==i.OBSERVED_ERROR&&a.close&&a.close.call(this,u),o=!1}finally{if(o)try{this.closeAll(n+1)}catch(s){}}}this.wrapperInitData.length=0}},i={Mixin:o,OBSERVED_ERROR:{}};t.exports=i},{133:133}],102:[function(e,t,n){"use strict";var r={currentScrollLeft:0,currentScrollTop:0,refreshScrollValues:function(e){r.currentScrollLeft=e.x,r.currentScrollTop=e.y}};t.exports=r},{}],103:[function(e,t,n){"use strict";function r(e,t){if(o(null!=t),null==e)return t;var n=Array.isArray(e),r=Array.isArray(t);return n&&r?(e.push.apply(e,t),e):n?(e.push(t),e):r?[e].concat(t):[e,t]}var o=e(133);t.exports=r},{133:133}],104:[function(e,t,n){"use strict";function r(e){for(var t=1,n=0,r=0;r<e.length;r++)t=(t+e.charCodeAt(r))%o,n=(n+t)%o;return t|n<<16}var o=65521;t.exports=r},{}],105:[function(e,t,n){function r(e){return e.replace(o,function(e,t){return t.toUpperCase()})}var o=/-(.)/g;t.exports=r},{}],106:[function(e,t,n){"use strict";function r(e){return o(e.replace(i,"ms-"))}var o=e(105),i=/^-ms-/;t.exports=r},{105:105}],107:[function(e,t,n){function r(e,t){return e&&t?e===t?!0:o(e)?!1:o(t)?r(e,t.parentNode):e.contains?e.contains(t):e.compareDocumentPosition?!!(16&e.compareDocumentPosition(t)):!1:!1}var o=e(137);t.exports=r},{137:137}],108:[function(e,t,n){function r(e){return!!e&&("object"==typeof e||"function"==typeof e)&&"length"in e&&!("setInterval"in e)&&"number"!=typeof e.nodeType&&(Array.isArray(e)||"callee"in e||"item"in e)}function o(e){return r(e)?Array.isArray(e)?e.slice():i(e):[e]}var i=e(148);t.exports=o},{148:148}],109:[function(e,t,n){"use strict";function r(e){var t=i.createFactory(e),n=o.createClass({tagName:e.toUpperCase(),displayName:"ReactFullPageComponent"+e,componentWillUnmount:function(){a(!1)},render:function(){return t(this.props)}});return n}var o=e(33),i=e(55),a=e(133);t.exports=r},{133:133,33:33,55:55}],110:[function(e,t,n){function r(e){var t=e.match(c);return t&&t[1].toLowerCase()}function o(e,t){var n=l;s(!!l);var o=r(e),i=o&&u(o);if(i){n.innerHTML=i[1]+e+i[2];for(var c=i[0];c--;)n=n.lastChild}else n.innerHTML=e;var p=n.getElementsByTagName("script");p.length&&(s(t),a(p).forEach(t));for(var d=a(n.childNodes);n.lastChild;)n.removeChild(n.lastChild);return d}var i=e(21),a=e(108),u=e(125),s=e(133),l=i.canUseDOM?document.createElement("div"):null,c=/^\s*<(\w+)/;t.exports=o},{108:108,125:125,133:133,21:21}],111:[function(e,t,n){"use strict";function r(e,t){var n=null==t||"boolean"==typeof t||""===t;if(n)return"";var r=isNaN(t);return r||0===t||i.hasOwnProperty(e)&&i[e]?""+t:("string"==typeof t&&(t=t.trim()),t+"px")}var o=e(4),i=o.isUnitlessNumber;t.exports=r},{4:4}],112:[function(e,t,n){function r(e){return function(){return e}}function o(){}o.thatReturns=r,o.thatReturnsFalse=r(!1),o.thatReturnsTrue=r(!0),o.thatReturnsNull=r(null),o.thatReturnsThis=function(){return this},o.thatReturnsArgument=function(e){return e},t.exports=o},{}],113:[function(e,t,n){"use strict";var r={};t.exports=r},{}],114:[function(e,t,n){"use strict";function r(e){return i[e]}function o(e){return(""+e).replace(a,r)}var i={"&":"&amp;",">":"&gt;","<":"&lt;",'"':"&quot;","'":"&#x27;"},a=/[&><"']/g;t.exports=o},{}],115:[function(e,t,n){"use strict";function r(e){return null==e?null:u(e)?e:o.has(e)?i.getNodeFromInstance(e):(a(null==e.render||"function"!=typeof e.render),void a(!1))}{var o=(e(39),e(65)),i=e(68),a=e(133),u=e(135);e(150)}t.exports=r},{133:133,135:135,150:150,39:39,65:65,68:68}],116:[function(e,t,n){"use strict";function r(e,t,n){var r=e,o=!r.hasOwnProperty(n);o&&null!=t&&(r[n]=t)}function o(e){if(null==e)return e;var t={};return i(e,r,t),t}{var i=e(149);e(150)}t.exports=o},{149:149,150:150}],117:[function(e,t,n){"use strict";function r(e){try{e.focus()}catch(t){}}t.exports=r},{}],118:[function(e,t,n){"use strict";var r=function(e,t,n){Array.isArray(e)?e.forEach(t,n):e&&t.call(n,e)};t.exports=r},{}],119:[function(e,t,n){function r(){try{return document.activeElement||document.body}catch(e){return document.body}}t.exports=r},{}],120:[function(e,t,n){"use strict";function r(e){var t,n=e.keyCode;return"charCode"in e?(t=e.charCode,0===t&&13===n&&(t=13)):t=n,t>=32||13===t?t:0}t.exports=r},{}],121:[function(e,t,n){"use strict";function r(e){if(e.key){var t=i[e.key]||e.key;if("Unidentified"!==t)return t}if("keypress"===e.type){var n=o(e);return 13===n?"Enter":String.fromCharCode(n)}return"keydown"===e.type||"keyup"===e.type?a[e.keyCode]||"Unidentified":""}var o=e(120),i={Esc:"Escape",Spacebar:" ",Left:"ArrowLeft",Up:"ArrowUp",Right:"ArrowRight",Down:"ArrowDown",Del:"Delete",Win:"OS",Menu:"ContextMenu",Apps:"ContextMenu",Scroll:"ScrollLock",MozPrintableKey:"Unidentified"},a={8:"Backspace",9:"Tab",12:"Clear",13:"Enter",16:"Shift",17:"Control",18:"Alt",19:"Pause",20:"CapsLock",27:"Escape",32:" ",33:"PageUp",34:"PageDown",35:"End",36:"Home",37:"ArrowLeft",38:"ArrowUp",39:"ArrowRight",40:"ArrowDown",45:"Insert",46:"Delete",112:"F1",113:"F2",114:"F3",115:"F4",116:"F5",117:"F6",118:"F7",119:"F8",120:"F9",121:"F10",122:"F11",123:"F12",144:"NumLock",145:"ScrollLock",224:"Meta"};t.exports=r},{120:120}],122:[function(e,t,n){"use strict";function r(e){var t=this,n=t.nativeEvent;if(n.getModifierState)return n.getModifierState(e);var r=i[e];return r?!!n[r]:!1}function o(e){return r}var i={Alt:"altKey",Control:"ctrlKey",Meta:"metaKey",Shift:"shiftKey"};t.exports=o},{}],123:[function(e,t,n){"use strict";function r(e){var t=e.target||e.srcElement||window;return 3===t.nodeType?t.parentNode:t}t.exports=r},{}],124:[function(e,t,n){"use strict";function r(e){var t=e&&(o&&e[o]||e[i]);return"function"==typeof t?t:void 0}var o="function"==typeof Symbol&&Symbol.iterator,i="@@iterator";t.exports=r},{}],125:[function(e,t,n){function r(e){return i(!!a),d.hasOwnProperty(e)||(e="*"),u.hasOwnProperty(e)||("*"===e?a.innerHTML="<link />":a.innerHTML="<"+e+"></"+e+">",u[e]=!a.firstChild),u[e]?d[e]:null}var o=e(21),i=e(133),a=o.canUseDOM?document.createElement("div"):null,u={circle:!0,clipPath:!0,defs:!0,ellipse:!0,g:!0,line:!0,linearGradient:!0,path:!0,polygon:!0,polyline:!0,radialGradient:!0,rect:!0,stop:!0,text:!0},s=[1,'<select multiple="true">',"</select>"],l=[1,"<table>","</table>"],c=[3,"<table><tbody><tr>","</tr></tbody></table>"],p=[1,"<svg>","</svg>"],d={"*":[1,"?<div>","</div>"],area:[1,"<map>","</map>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],legend:[1,"<fieldset>","</fieldset>"],param:[1,"<object>","</object>"],tr:[2,"<table><tbody>","</tbody></table>"],optgroup:s,option:s,caption:l,colgroup:l,tbody:l,tfoot:l,thead:l,td:c,th:c,circle:p,clipPath:p,defs:p,ellipse:p,g:p,line:p,linearGradient:p,path:p,polygon:p,polyline:p,radialGradient:p,rect:p,stop:p,text:p};t.exports=r},{133:133,21:21}],126:[function(e,t,n){"use strict";function r(e){for(;e&&e.firstChild;)e=e.firstChild;return e}function o(e){for(;e;){if(e.nextSibling)return e.nextSibling;e=e.parentNode}}function i(e,t){for(var n=r(e),i=0,a=0;n;){if(3===n.nodeType){if(a=i+n.textContent.length,t>=i&&a>=t)return{node:n,offset:t-i};i=a}n=r(o(n))}}t.exports=i},{}],127:[function(e,t,n){"use strict";function r(e){return e?e.nodeType===o?e.documentElement:e.firstChild:null}var o=9;t.exports=r},{}],128:[function(e,t,n){"use strict";function r(){return!i&&o.canUseDOM&&(i="textContent"in document.documentElement?"textContent":"innerText"),i}var o=e(21),i=null;t.exports=r},{21:21}],129:[function(e,t,n){"use strict";function r(e){return e===window?{x:window.pageXOffset||document.documentElement.scrollLeft,y:window.pageYOffset||document.documentElement.scrollTop}:{x:e.scrollLeft,y:e.scrollTop}}t.exports=r},{}],130:[function(e,t,n){function r(e){return e.replace(o,"-$1").toLowerCase()}var o=/([A-Z])/g;t.exports=r},{}],131:[function(e,t,n){"use strict";function r(e){return o(e).replace(i,"-ms-")}var o=e(130),i=/^ms-/;t.exports=r},{130:130}],132:[function(e,t,n){"use strict";function r(e){return"function"==typeof e&&"undefined"!=typeof e.prototype&&"function"==typeof e.prototype.mountComponent&&"function"==typeof e.prototype.receiveComponent}function o(e,t){var n;if((null===e||e===!1)&&(e=a.emptyElement),"object"==typeof e){var o=e;n=t===o.type&&"string"==typeof o.type?u.createInternalComponent(o):r(o.type)?new o.type(o):new c}else"string"==typeof e||"number"==typeof e?n=u.createInstanceForText(e):l(!1);return n.construct(e),n._mountIndex=0,n._mountImage=null,n}var i=e(37),a=e(57),u=e(71),s=e(27),l=e(133),c=(e(150),function(){});s(c.prototype,i.Mixin,{_instantiateReactComponent:o}),t.exports=o},{133:133,150:150,27:27,37:37,57:57,71:71}],133:[function(e,t,n){"use strict";var r=function(e,t,n,r,o,i,a,u){if(!e){var s;if(void 0===t)s=new Error("Minified exception occurred; use the non-minified dev environment for the full error message and additional helpful warnings.");else{var l=[n,r,o,i,a,u],c=0;s=new Error("Invariant Violation: "+t.replace(/%s/g,function(){return l[c++]}))}throw s.framesToPop=1,s}};t.exports=r},{}],134:[function(e,t,n){"use strict";function r(e,t){if(!i.canUseDOM||t&&!("addEventListener"in document))return!1;var n="on"+e,r=n in document;if(!r){var a=document.createElement("div");a.setAttribute(n,"return;"),r="function"==typeof a[n]}return!r&&o&&"wheel"===e&&(r=document.implementation.hasFeature("Events.wheel","3.0")),r}var o,i=e(21);i.canUseDOM&&(o=document.implementation&&document.implementation.hasFeature&&document.implementation.hasFeature("","")!==!0),t.exports=r},{21:21}],135:[function(e,t,n){function r(e){return!(!e||!("function"==typeof Node?e instanceof Node:"object"==typeof e&&"number"==typeof e.nodeType&&"string"==typeof e.nodeName))}t.exports=r},{}],136:[function(e,t,n){"use strict";function r(e){return e&&("INPUT"===e.nodeName&&o[e.type]||"TEXTAREA"===e.nodeName)}var o={color:!0,date:!0,datetime:!0,"datetime-local":!0,email:!0,month:!0,number:!0,password:!0,range:!0,search:!0,tel:!0,text:!0,time:!0,url:!0,week:!0};t.exports=r},{}],137:[function(e,t,n){function r(e){return o(e)&&3==e.nodeType}var o=e(135);t.exports=r},{135:135}],138:[function(e,t,n){"use strict";var r=e(133),o=function(e){var t,n={};r(e instanceof Object&&!Array.isArray(e));for(t in e)e.hasOwnProperty(t)&&(n[t]=t);return n};t.exports=o},{133:133}],139:[function(e,t,n){var r=function(e){var t;for(t in e)if(e.hasOwnProperty(t))return t;return null};t.exports=r},{}],140:[function(e,t,n){"use strict";function r(e,t,n){if(!e)return null;var r={};for(var i in e)o.call(e,i)&&(r[i]=t.call(n,e[i],i,e));return r}var o=Object.prototype.hasOwnProperty;t.exports=r},{}],141:[function(e,t,n){"use strict";function r(e){var t={};return function(n){return t.hasOwnProperty(n)||(t[n]=e.call(this,n)),t[n]}}t.exports=r},{}],142:[function(e,t,n){"use strict";function r(e){return i(o.isValidElement(e)),e}var o=e(55),i=e(133);t.exports=r},{133:133,55:55}],143:[function(e,t,n){"use strict";function r(e){return'"'+o(e)+'"'}var o=e(114);t.exports=r},{114:114}],144:[function(e,t,n){"use strict";var r=e(21),o=/^[ \r\n\t\f]/,i=/<(!--|link|noscript|meta|script|style)[ \r\n\t\f\/>]/,a=function(e,t){e.innerHTML=t};if("undefined"!=typeof MSApp&&MSApp.execUnsafeLocalFunction&&(a=function(e,t){MSApp.execUnsafeLocalFunction(function(){e.innerHTML=t})}),r.canUseDOM){var u=document.createElement("div");u.innerHTML=" ",""===u.innerHTML&&(a=function(e,t){if(e.parentNode&&e.parentNode.replaceChild(e,e),o.test(t)||"<"===t[0]&&i.test(t)){e.innerHTML="\ufeff"+t;var n=e.firstChild;1===n.data.length?e.removeChild(n):n.deleteData(0,1)}else e.innerHTML=t})}t.exports=a},{21:21}],145:[function(e,t,n){"use strict";var r=e(21),o=e(114),i=e(144),a=function(e,t){e.textContent=t};r.canUseDOM&&("textContent"in document.documentElement||(a=function(e,t){i(e,o(t))})),t.exports=a},{114:114,144:144,21:21}],146:[function(e,t,n){"use strict";function r(e,t){if(e===t)return!0;var n;for(n in e)if(e.hasOwnProperty(n)&&(!t.hasOwnProperty(n)||e[n]!==t[n]))return!1;for(n in t)if(t.hasOwnProperty(n)&&!e.hasOwnProperty(n))return!1;return!0}t.exports=r},{}],147:[function(e,t,n){"use strict";function r(e,t){if(null!=e&&null!=t){var n=typeof e,r=typeof t;if("string"===n||"number"===n)return"string"===r||"number"===r;if("object"===r&&e.type===t.type&&e.key===t.key){var o=e._owner===t._owner;return o}}return!1}e(150);t.exports=r},{150:150}],148:[function(e,t,n){function r(e){var t=e.length;if(o(!Array.isArray(e)&&("object"==typeof e||"function"==typeof e)),o("number"==typeof t),o(0===t||t-1 in e),e.hasOwnProperty)try{return Array.prototype.slice.call(e)}catch(n){}for(var r=Array(t),i=0;t>i;i++)r[i]=e[i];return r}var o=e(133);t.exports=r},{133:133}],149:[function(e,t,n){"use strict";function r(e){return v[e]}function o(e,t){return e&&null!=e.key?a(e.key):t.toString(36)}function i(e){return(""+e).replace(g,r)}function a(e){return"$"+i(e)}function u(e,t,n,r,i){var s=typeof e;if(("undefined"===s||"boolean"===s)&&(e=null),null===e||"string"===s||"number"===s||l.isValidElement(e))return r(i,e,""===t?h+o(e,0):t,n),1;var p,v,g,y=0;if(Array.isArray(e))for(var C=0;C<e.length;C++)p=e[C],v=(""!==t?t+m:h)+o(p,C),g=n+y,y+=u(p,v,g,r,i);else{var E=d(e);if(E){var b,_=E.call(e);if(E!==e.entries)for(var x=0;!(b=_.next()).done;)p=b.value,v=(""!==t?t+m:h)+o(p,x++),g=n+y,y+=u(p,v,g,r,i);else for(;!(b=_.next()).done;){var D=b.value;D&&(p=D[1],v=(""!==t?t+m:h)+a(D[0])+m+o(p,0),g=n+y,y+=u(p,v,g,r,i))}}else if("object"===s){f(1!==e.nodeType);var M=c.extract(e);for(var N in M)M.hasOwnProperty(N)&&(p=M[N],v=(""!==t?t+m:h)+a(N)+m+o(p,0),g=n+y,y+=u(p,v,g,r,i))}}return y}function s(e,t,n){return null==e?0:u(e,"",0,t,n)}var l=e(55),c=e(61),p=e(64),d=e(124),f=e(133),h=(e(150),p.SEPARATOR),m=":",v={"=":"=0",".":"=1",":":"=2"},g=/[=.:]/g;t.exports=s},{124:124,133:133,150:150,55:55,61:61,64:64}],150:[function(e,t,n){"use strict";var r=e(112),o=r;t.exports=o},{112:112}]},{},[1])(1)});
\ No newline at end of file
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/snapshot/snapshot.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/snapshot/snapshot.go
deleted file mode 100644
index b08e62fee..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/snapshot/snapshot.go
+++ /dev/null
@@ -1,529 +0,0 @@
-package snapshot
-
-import (
-	"archive/tar"
-	"encoding/json"
-	"fmt"
-	"io"
-	"os"
-	"sort"
-	"time"
-)
-
-// manifestName is the name of the manifest file in the snapshot.
-const manifestName = "manifest"
-
-// Manifest represents a list of files in a snapshot.
-type Manifest struct {
-	Files []File `json:"files"`
-}
-
-// Diff returns a Manifest of files that are newer in m than other.
-func (m *Manifest) Diff(other *Manifest) *Manifest {
-	diff := &Manifest{}
-
-	// Find versions of files that are newer in m.
-loop:
-	for _, a := range m.Files {
-		// Try to find a newer version of the file in other.
-		// If found then don't append this file and move to the next file.
-		for _, b := range other.Files {
-			if a.Name != b.Name {
-				continue
-			} else if !a.ModTime.After(b.ModTime) {
-				continue loop
-			} else {
-				break
-			}
-		}
-
-		// Append the newest version.
-		diff.Files = append(diff.Files, a)
-	}
-
-	// Sort files.
-	sort.Sort(Files(diff.Files))
-
-	return diff
-}
-
-// Merge returns a Manifest that combines m with other.
-// Only the newest file between the two snapshots is returned.
-func (m *Manifest) Merge(other *Manifest) *Manifest {
-	ret := &Manifest{}
-	ret.Files = make([]File, len(m.Files))
-	copy(ret.Files, m.Files)
-
-	// Update/insert versions of files that are newer in other.
-loop:
-	for _, a := range other.Files {
-		for i, b := range ret.Files {
-			// Ignore if it doesn't match.
-			if a.Name != b.Name {
-				continue
-			}
-
-			// Update if it's newer and then start the next file.
-			if a.ModTime.After(b.ModTime) {
-				ret.Files[i] = a
-			}
-			continue loop
-		}
-
-		// If the file wasn't found then append it.
-		ret.Files = append(ret.Files, a)
-	}
-
-	// Sort files.
-	sort.Sort(Files(ret.Files))
-
-	return ret
-}
-
-// File represents a single file in a manifest.
-type File struct {
-	Name    string    `json:"name"`         // filename
-	Size    int64     `json:"size"`         // file size
-	ModTime time.Time `json:"lastModified"` // last modified time
-}
-
-// Files represents a sortable list of files.
-type Files []File
-
-func (p Files) Len() int           { return len(p) }
-func (p Files) Less(i, j int) bool { return p[i].Name < p[j].Name }
-func (p Files) Swap(i, j int)      { p[i], p[j] = p[j], p[i] }
-
-// Reader reads a snapshot from a Reader.
-// This type is not safe for concurrent use.
-type Reader struct {
-	tr       *tar.Reader
-	manifest *Manifest
-}
-
-// NewReader returns a new Reader reading from r.
-func NewReader(r io.Reader) *Reader {
-	return &Reader{
-		tr: tar.NewReader(r),
-	}
-}
-
-// Manifest returns the snapshot manifest.
-func (sr *Reader) Manifest() (*Manifest, error) {
-	if err := sr.readManifest(); err != nil {
-		return nil, err
-	}
-	return sr.manifest, nil
-}
-
-// readManifest reads the first entry from the snapshot and materializes the snapshot.
-// This is skipped if the snapshot manifest has already been read.
-func (sr *Reader) readManifest() error {
-	// Already read, ignore.
-	if sr.manifest != nil {
-		return nil
-	}
-
-	// Read manifest header.
-	hdr, err := sr.tr.Next()
-	if err != nil {
-		return fmt.Errorf("snapshot header: %s", err)
-	} else if hdr.Name != manifestName {
-		return fmt.Errorf("invalid snapshot header: expected manifest")
-	}
-
-	// Materialize manifest.
-	var manifest Manifest
-	if err := json.NewDecoder(sr.tr).Decode(&manifest); err != nil {
-		return fmt.Errorf("decode manifest: %s", err)
-	}
-	sr.manifest = &manifest
-
-	return nil
-}
-
-// Next returns the next file in the snapshot.
-func (sr *Reader) Next() (File, error) {
-	// Read manifest if it hasn't been read yet.
-	if err := sr.readManifest(); err != nil {
-		return File{}, err
-	}
-
-	// Read next header.
-	hdr, err := sr.tr.Next()
-	if err != nil {
-		return File{}, err
-	}
-
-	// Match header to file in snapshot.
-	for i := range sr.manifest.Files {
-		if sr.manifest.Files[i].Name == hdr.Name {
-			return sr.manifest.Files[i], nil
-		}
-	}
-
-	// Return error if file is not in the manifest.
-	return File{}, fmt.Errorf("snapshot entry not found in manifest: %s", hdr.Name)
-}
-
-// Read reads the current entry in the snapshot.
-func (sr *Reader) Read(b []byte) (n int, err error) {
-	// Read manifest if it hasn't been read yet.
-	if err := sr.readManifest(); err != nil {
-		return 0, err
-	}
-
-	// Pass read through to the tar reader.
-	return sr.tr.Read(b)
-}
-
-// MultiReader reads from a collection of snapshots.
-// Only files with the highest index are read from the reader.
-// This type is not safe for concurrent use.
-type MultiReader struct {
-	readers []*Reader // underlying snapshot readers
-	files   []*File   // current file for each reader
-
-	manifest *Manifest // combined manifest from all readers
-	index    int       // index of file in snapshot to read
-	curr     *Reader   // current reader
-}
-
-// NewMultiReader returns a new MultiReader reading from a list of readers.
-func NewMultiReader(readers ...io.Reader) *MultiReader {
-	r := &MultiReader{
-		readers: make([]*Reader, len(readers)),
-		files:   make([]*File, len(readers)),
-		index:   -1,
-	}
-	for i := range readers {
-		r.readers[i] = NewReader(readers[i])
-	}
-	return r
-}
-
-// Manifest returns the combined manifest from all readers.
-func (ssr *MultiReader) Manifest() (*Manifest, error) {
-	// Use manifest if it's already been calculated.
-	if ssr.manifest != nil {
-		return ssr.manifest, nil
-	}
-
-	// Build manifest from other readers.
-	ss := &Manifest{}
-	for i, sr := range ssr.readers {
-		other, err := sr.Manifest()
-		if err != nil {
-			return nil, fmt.Errorf("manifest: idx=%d, err=%s", i, err)
-		}
-		ss = ss.Merge(other)
-	}
-
-	// Cache manifest and return.
-	ssr.manifest = ss
-	return ss, nil
-}
-
-// Next returns the next file in the reader.
-func (ssr *MultiReader) Next() (File, error) {
-	ss, err := ssr.Manifest()
-	if err != nil {
-		return File{}, fmt.Errorf("manifest: %s", err)
-	}
-
-	// Return EOF if there are no more files in snapshot.
-	if ssr.index == len(ss.Files)-1 {
-		ssr.curr = nil
-		return File{}, io.EOF
-	}
-
-	// Queue up next files.
-	if err := ssr.nextFiles(); err != nil {
-		return File{}, fmt.Errorf("next files: %s", err)
-	}
-
-	// Increment the file index.
-	ssr.index++
-	sf := ss.Files[ssr.index]
-
-	// Find the matching reader. Clear other readers.
-	var sr *Reader
-	for i, f := range ssr.files {
-		if f == nil || f.Name != sf.Name {
-			continue
-		}
-
-		// Set reader to the first match.
-		if sr == nil && *f == sf {
-			sr = ssr.readers[i]
-		}
-		ssr.files[i] = nil
-	}
-
-	// Return an error if file doesn't match.
-	// This shouldn't happen unless the underlying snapshot is altered.
-	if sr == nil {
-		return File{}, fmt.Errorf("snaphot file not found in readers: %s", sf.Name)
-	}
-
-	// Set current reader.
-	ssr.curr = sr
-
-	// Return file.
-	return sf, nil
-}
-
-// nextFiles queues up a next file for all readers.
-func (ssr *MultiReader) nextFiles() error {
-	for i, sr := range ssr.readers {
-		if ssr.files[i] == nil {
-			// Read next file.
-			sf, err := sr.Next()
-			if err == io.EOF {
-				ssr.files[i] = nil
-				continue
-			} else if err != nil {
-				return fmt.Errorf("next: reader=%d, err=%s", i, err)
-			}
-
-			// Cache file.
-			ssr.files[i] = &sf
-		}
-	}
-
-	return nil
-}
-
-// nextIndex returns the index of the next reader to read from.
-// Returns -1 if all readers are at EOF.
-func (ssr *MultiReader) nextIndex() int {
-	// Find the next file by name and lowest index.
-	index := -1
-	for i, f := range ssr.files {
-		if f == nil {
-			continue
-		} else if index == -1 {
-			index = i
-		} else if f.Name < ssr.files[index].Name {
-			index = i
-		} else if f.Name == ssr.files[index].Name && f.ModTime.After(ssr.files[index].ModTime) {
-			index = i
-		}
-	}
-	return index
-}
-
-// Read reads the current entry in the reader.
-func (ssr *MultiReader) Read(b []byte) (n int, err error) {
-	if ssr.curr == nil {
-		return 0, io.EOF
-	}
-	return ssr.curr.Read(b)
-}
-
-// OpenFileMultiReader returns a MultiReader based on the path of the base snapshot.
-// Returns the underlying files which need to be closed separately.
-func OpenFileMultiReader(path string) (*MultiReader, []io.Closer, error) {
-	var readers []io.Reader
-	var closers []io.Closer
-	if err := func() error {
-		// Open original snapshot file.
-		f, err := os.Open(path)
-		if os.IsNotExist(err) {
-			return err
-		} else if err != nil {
-			return fmt.Errorf("open snapshot: %s", err)
-		}
-		readers = append(readers, f)
-		closers = append(closers, f)
-
-		// Open all incremental snapshots.
-		for i := 0; ; i++ {
-			filename := path + fmt.Sprintf(".%d", i)
-			f, err := os.Open(filename)
-			if os.IsNotExist(err) {
-				break
-			} else if err != nil {
-				return fmt.Errorf("open incremental snapshot: file=%s, err=%s", filename, err)
-			}
-			readers = append(readers, f)
-			closers = append(closers, f)
-		}
-
-		return nil
-	}(); err != nil {
-		closeAll(closers)
-		return nil, nil, err
-	}
-
-	return NewMultiReader(readers...), nil, nil
-}
-
-// ReadFileManifest returns a Manifest for a given base snapshot path.
-// This merges all incremental backup manifests as well.
-func ReadFileManifest(path string) (*Manifest, error) {
-	// Open a multi-snapshot reader.
-	ssr, files, err := OpenFileMultiReader(path)
-	if os.IsNotExist(err) {
-		return nil, err
-	} else if err != nil {
-		return nil, fmt.Errorf("open file multi reader: %s", err)
-	}
-	defer closeAll(files)
-
-	// Read manifest.
-	ss, err := ssr.Manifest()
-	if err != nil {
-		return nil, fmt.Errorf("manifest: %s", err)
-	}
-
-	return ss, nil
-}
-
-func closeAll(a []io.Closer) {
-	for _, c := range a {
-		_ = c.Close()
-	}
-}
-
-// Writer writes a snapshot and the underlying files to disk as a tar archive.
-type Writer struct {
-	// The manifest to write from.
-	// Removing files from the manifest after creation will cause those files to be ignored.
-	Manifest *Manifest
-
-	// Writers for each file by filename.
-	// Writers will be closed as they're processed and will close by the end of WriteTo().
-	FileWriters map[string]FileWriter
-}
-
-// NewWriter returns a new instance of Writer.
-func NewWriter() *Writer {
-	return &Writer{
-		Manifest:    &Manifest{},
-		FileWriters: make(map[string]FileWriter),
-	}
-}
-
-// Close closes all file writers on the snapshot.
-func (sw *Writer) Close() error {
-	for _, fw := range sw.FileWriters {
-		_ = fw.Close()
-	}
-	return nil
-}
-
-// closeUnusedWriters closes all file writers not on the manifest.
-// This allows transactions on these files to be short lived.
-func (sw *Writer) closeUnusedWriters() {
-loop:
-	for name, fw := range sw.FileWriters {
-		// Find writer in manifest.
-		for _, f := range sw.Manifest.Files {
-			if f.Name == name {
-				continue loop
-			}
-		}
-
-		// If not found then close it.
-		_ = fw.Close()
-	}
-}
-
-// WriteTo writes the snapshot to the writer.
-// File writers are closed as they are written.
-// This function will always return n == 0.
-func (sw *Writer) WriteTo(w io.Writer) (n int64, err error) {
-	// Close any file writers that aren't required.
-	sw.closeUnusedWriters()
-
-	// Sort manifest files.
-	// This is required for combining multiple snapshots together.
-	sort.Sort(Files(sw.Manifest.Files))
-
-	// Begin writing a tar file to the output.
-	tw := tar.NewWriter(w)
-	defer tw.Close()
-
-	// Write manifest file.
-	if err := sw.writeManifestTo(tw); err != nil {
-		return 0, fmt.Errorf("write manifest: %s", err)
-	}
-
-	// Write each backup file.
-	for _, f := range sw.Manifest.Files {
-		if err := sw.writeFileTo(tw, &f); err != nil {
-			return 0, fmt.Errorf("write file: %s", err)
-		}
-	}
-
-	// Close tar writer and check error.
-	if err := tw.Close(); err != nil {
-		return 0, fmt.Errorf("tar close: %s", err)
-	}
-
-	return 0, nil
-}
-
-// writeManifestTo writes a manifest to the archive.
-func (sw *Writer) writeManifestTo(tw *tar.Writer) error {
-	// Convert manifest to JSON.
-	b, err := json.Marshal(sw.Manifest)
-	if err != nil {
-		return fmt.Errorf("marshal json: %s", err)
-	}
-
-	// Write header & file.
-	if err := tw.WriteHeader(&tar.Header{
-		Name:    manifestName,
-		Size:    int64(len(b)),
-		Mode:    0666,
-		ModTime: time.Now(),
-	}); err != nil {
-		return fmt.Errorf("write header: %s", err)
-	}
-	if _, err := tw.Write(b); err != nil {
-		return fmt.Errorf("write: %s", err)
-	}
-
-	return nil
-}
-
-// writeFileTo writes a single file to the archive.
-func (sw *Writer) writeFileTo(tw *tar.Writer, f *File) error {
-	// Retrieve the file writer by filename.
-	fw := sw.FileWriters[f.Name]
-	if fw == nil {
-		return fmt.Errorf("file writer not found: name=%s", f.Name)
-	}
-
-	// Write file header.
-	if err := tw.WriteHeader(&tar.Header{
-		Name:    f.Name,
-		Size:    f.Size,
-		Mode:    0666,
-		ModTime: time.Now(),
-	}); err != nil {
-		return fmt.Errorf("write header: file=%s, err=%s", f.Name, err)
-	}
-
-	// Copy the database to the writer.
-	if nn, err := fw.WriteTo(tw); err != nil {
-		return fmt.Errorf("write: file=%s, err=%s", f.Name, err)
-	} else if nn != f.Size {
-		return fmt.Errorf("short write: file=%s", f.Name)
-	}
-
-	// Close the writer.
-	if err := fw.Close(); err != nil {
-		return fmt.Errorf("close: file=%s, err=%s", f.Name, err)
-	}
-
-	return nil
-}
-
-// FileWriter is the interface used for writing a file to a snapshot.
-type FileWriter interface {
-	io.WriterTo
-	io.Closer
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/snapshot/snapshot_test.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/snapshot/snapshot_test.go
deleted file mode 100644
index 62328624b..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/snapshot/snapshot_test.go
+++ /dev/null
@@ -1,293 +0,0 @@
-package snapshot_test
-
-import (
-	"bytes"
-	"io"
-	"io/ioutil"
-	"reflect"
-	"testing"
-	"time"
-
-	"github.com/influxdb/influxdb/snapshot"
-)
-
-// Ensure a manifest can be diff'd so that only newer files are retrieved.
-func TestManifest_Diff(t *testing.T) {
-	for i, tt := range []struct {
-		s      *snapshot.Manifest
-		other  *snapshot.Manifest
-		result *snapshot.Manifest
-	}{
-		// 0. Mixed higher, lower, equal indices.
-		{
-			s: &snapshot.Manifest{Files: []snapshot.File{
-				{Name: "a", ModTime: time.Date(2000, time.January, 1, 0, 0, 0, 0, time.UTC)}, // remove: older
-				{Name: "b", ModTime: time.Date(2000, time.January, 1, 0, 0, 0, 0, time.UTC)}, // remove: equal date
-				{Name: "c", ModTime: time.Date(2000, time.January, 1, 0, 0, 0, 0, time.UTC)}, // keep: newer
-				{Name: "d", ModTime: time.Date(2000, time.January, 1, 0, 0, 0, 0, time.UTC)}, // keep: newer
-			}},
-			other: &snapshot.Manifest{Files: []snapshot.File{
-				{Name: "a", ModTime: time.Date(2001, time.January, 1, 0, 0, 0, 0, time.UTC)},
-				{Name: "b", ModTime: time.Date(2000, time.January, 1, 0, 0, 0, 0, time.UTC)},
-				{Name: "c", ModTime: time.Date(1999, time.January, 1, 0, 0, 0, 0, time.UTC)},
-				{Name: "d", ModTime: time.Date(1999, time.January, 1, 0, 0, 0, 0, time.UTC)},
-			}},
-			result: &snapshot.Manifest{Files: []snapshot.File{
-				{Name: "c", ModTime: time.Date(2000, time.January, 1, 0, 0, 0, 0, time.UTC)},
-				{Name: "d", ModTime: time.Date(2000, time.January, 1, 0, 0, 0, 0, time.UTC)},
-			}},
-		},
-
-		// 1. Files in other-only should not be added to diff.
-		{
-			s: &snapshot.Manifest{Files: []snapshot.File{
-				{Name: "a", ModTime: time.Date(2000, time.January, 1, 0, 0, 0, 0, time.UTC)},
-			}},
-			other: &snapshot.Manifest{Files: []snapshot.File{
-				{Name: "a", ModTime: time.Date(1999, time.January, 1, 0, 0, 0, 0, time.UTC)},
-				{Name: "b", ModTime: time.Date(2000, time.January, 1, 0, 0, 0, 0, time.UTC)},
-			}},
-			result: &snapshot.Manifest{Files: []snapshot.File{
-				{Name: "a", ModTime: time.Date(2000, time.January, 1, 0, 0, 0, 0, time.UTC)},
-			}},
-		},
-
-		// 2. Files in s-only should be added to diff.
-		{
-			s: &snapshot.Manifest{Files: []snapshot.File{
-				{Name: "a", ModTime: time.Date(2000, time.January, 1, 0, 0, 0, 0, time.UTC)},
-			}},
-			other: &snapshot.Manifest{Files: []snapshot.File{}},
-			result: &snapshot.Manifest{Files: []snapshot.File{
-				{Name: "a", ModTime: time.Date(2000, time.January, 1, 0, 0, 0, 0, time.UTC)},
-			}},
-		},
-
-		// 3. Empty snapshots should return empty diffs.
-		{
-			s:      &snapshot.Manifest{Files: []snapshot.File{}},
-			other:  &snapshot.Manifest{Files: []snapshot.File{}},
-			result: &snapshot.Manifest{Files: nil},
-		},
-	} {
-		result := tt.s.Diff(tt.other)
-		if !reflect.DeepEqual(tt.result, result) {
-			t.Errorf("%d. mismatch:\n\nexp=%#v\n\ngot=%#v", i, tt.result, result)
-		}
-	}
-}
-
-// Ensure a snapshot can be merged so that the newest files from the two snapshots are returned.
-func TestSnapshot_Merge(t *testing.T) {
-	for i, tt := range []struct {
-		s      *snapshot.Manifest
-		other  *snapshot.Manifest
-		result *snapshot.Manifest
-	}{
-		// 0. Mixed higher, lower, equal indices.
-		{
-			s: &snapshot.Manifest{Files: []snapshot.File{
-				{Name: "a", Size: 10, ModTime: time.Date(1999, time.January, 1, 0, 0, 0, 0, time.UTC)},
-				{Name: "b", Size: 10, ModTime: time.Date(2000, time.January, 1, 0, 0, 0, 0, time.UTC)}, // keep: same, first
-				{Name: "c", Size: 10, ModTime: time.Date(2000, time.January, 1, 0, 0, 0, 0, time.UTC)}, // keep: higher
-				{Name: "e", Size: 10, ModTime: time.Date(2000, time.January, 1, 0, 0, 0, 0, time.UTC)}, // keep: higher
-			}},
-			other: &snapshot.Manifest{Files: []snapshot.File{
-				{Name: "a", Size: 20, ModTime: time.Date(2000, time.January, 1, 0, 0, 0, 0, time.UTC)}, // keep: higher
-				{Name: "b", Size: 20, ModTime: time.Date(2000, time.January, 1, 0, 0, 0, 0, time.UTC)},
-				{Name: "c", Size: 20, ModTime: time.Date(1999, time.January, 1, 0, 0, 0, 0, time.UTC)},
-				{Name: "d", Size: 20, ModTime: time.Date(2000, time.January, 1, 0, 0, 0, 0, time.UTC)}, // keep: new
-				{Name: "e", Size: 20, ModTime: time.Date(1999, time.January, 1, 0, 0, 0, 0, time.UTC)},
-			}},
-			result: &snapshot.Manifest{Files: []snapshot.File{
-				{Name: "a", Size: 20, ModTime: time.Date(2000, time.January, 1, 0, 0, 0, 0, time.UTC)},
-				{Name: "b", Size: 10, ModTime: time.Date(2000, time.January, 1, 0, 0, 0, 0, time.UTC)},
-				{Name: "c", Size: 10, ModTime: time.Date(2000, time.January, 1, 0, 0, 0, 0, time.UTC)},
-				{Name: "d", Size: 20, ModTime: time.Date(2000, time.January, 1, 0, 0, 0, 0, time.UTC)},
-				{Name: "e", Size: 10, ModTime: time.Date(2000, time.January, 1, 0, 0, 0, 0, time.UTC)},
-			}},
-		},
-	} {
-		result := tt.s.Merge(tt.other)
-		if !reflect.DeepEqual(tt.result, result) {
-			t.Errorf("%d. mismatch:\n\nexp=%#v\n\ngot=%#v", i, tt.result, result)
-		}
-	}
-}
-
-// Ensure a writer can write a set of files to an archive
-func TestWriter(t *testing.T) {
-	// Create a new writer with a snapshot and file writers.
-	sw := snapshot.NewWriter()
-	sw.Manifest.Files = []snapshot.File{
-		{Name: "meta", Size: 3, ModTime: time.Date(2000, time.January, 1, 0, 0, 0, 0, time.UTC)},
-		{Name: "shards/1", Size: 5, ModTime: time.Date(2000, time.February, 1, 0, 0, 0, 0, time.UTC)},
-	}
-	sw.FileWriters["meta"] = &bufCloser{Buffer: *bytes.NewBufferString("foo")}
-	sw.FileWriters["shards/1"] = &bufCloser{Buffer: *bytes.NewBufferString("55555")}
-
-	// Write the snapshot to a buffer.
-	var buf bytes.Buffer
-	if _, err := sw.WriteTo(&buf); err != nil {
-		t.Fatal(err)
-	}
-
-	// Ensure file writers are closed as they're writing.
-	if !sw.FileWriters["meta"].(*bufCloser).closed {
-		t.Fatal("meta file writer not closed")
-	} else if !sw.FileWriters["shards/1"].(*bufCloser).closed {
-		t.Fatal("shards/1 file writer not closed")
-	}
-
-	// Close writer.
-	if err := sw.Close(); err != nil {
-		t.Fatal(err)
-	}
-
-	// Read snapshot from buffer.
-	sr := snapshot.NewReader(&buf)
-
-	// Read the manifest.
-	if ss, err := sr.Manifest(); err != nil {
-		t.Fatalf("unexpected error(manifest): %s", err)
-	} else if !reflect.DeepEqual(sw.Manifest, ss) {
-		t.Fatalf("manifest mismatch:\n\nexp=%#v\n\ngot=%#v", sw.Manifest, ss)
-	}
-
-	// Next should be the meta file.
-	if f, err := sr.Next(); err != nil {
-		t.Fatalf("unexpected error(meta): %s", err)
-	} else if !reflect.DeepEqual(f, snapshot.File{Name: "meta", Size: 3, ModTime: time.Date(2000, time.January, 1, 0, 0, 0, 0, time.UTC)}) {
-		t.Fatalf("file mismatch(meta): %#v", f)
-	} else if b := MustReadAll(sr); string(b) != `foo` {
-		t.Fatalf("unexpected file(meta): %s", b)
-	}
-
-	// Next should be the shard file.
-	if f, err := sr.Next(); err != nil {
-		t.Fatalf("unexpected error(shards/1): %s", err)
-	} else if !reflect.DeepEqual(f, snapshot.File{Name: "shards/1", Size: 5, ModTime: time.Date(2000, time.February, 1, 0, 0, 0, 0, time.UTC)}) {
-		t.Fatalf("file mismatch(shards/1): %#v", f)
-	} else if b := MustReadAll(sr); string(b) != `55555` {
-		t.Fatalf("unexpected file(shards/1): %s", b)
-	}
-
-	// Check for end of snapshot.
-	if _, err := sr.Next(); err != io.EOF {
-		t.Fatalf("expected EOF: %s", err)
-	}
-}
-
-// Ensure a writer closes unused file writers.
-func TestWriter_CloseUnused(t *testing.T) {
-	// Create a new writer with a manifest and file writers.
-	sw := snapshot.NewWriter()
-	sw.Manifest.Files = []snapshot.File{
-		{Name: "meta", Size: 3},
-	}
-	sw.FileWriters["meta"] = &bufCloser{Buffer: *bytes.NewBufferString("foo")}
-	sw.FileWriters["other"] = &bufCloser{Buffer: *bytes.NewBufferString("55555")}
-
-	// Write the snapshot to a buffer.
-	var buf bytes.Buffer
-	if _, err := sw.WriteTo(&buf); err != nil {
-		t.Fatal(err)
-	}
-
-	// Ensure other writer is closed.
-	// This should happen at the beginning of the write so that it doesn't have
-	// to wait until the close of the whole writer.
-	if !sw.FileWriters["other"].(*bufCloser).closed {
-		t.Fatal("'other' file writer not closed")
-	}
-}
-
-// Ensure a MultiReader can read from multiple snapshots.
-func TestMultiReader(t *testing.T) {
-	var sw *snapshot.Writer
-	bufs := make([]bytes.Buffer, 2)
-
-	// Snapshot #1
-	sw = snapshot.NewWriter()
-	sw.Manifest.Files = []snapshot.File{
-		{Name: "meta", Size: 3, ModTime: time.Date(2000, time.January, 1, 0, 0, 0, 0, time.UTC)},
-		{Name: "shards/1", Size: 5, ModTime: time.Date(2000, time.February, 1, 0, 0, 0, 0, time.UTC)},
-	}
-	sw.FileWriters["meta"] = &bufCloser{Buffer: *bytes.NewBufferString("foo")}
-	sw.FileWriters["shards/1"] = &bufCloser{Buffer: *bytes.NewBufferString("55555")}
-	if _, err := sw.WriteTo(&bufs[0]); err != nil {
-		t.Fatal(err)
-	} else if err = sw.Close(); err != nil {
-		t.Fatal(err)
-	}
-
-	// Snapshot #2
-	sw = snapshot.NewWriter()
-	sw.Manifest.Files = []snapshot.File{
-		{Name: "meta", Size: 3, ModTime: time.Date(2001, time.January, 1, 0, 0, 0, 0, time.UTC)},
-		{Name: "shards/2", Size: 6, ModTime: time.Date(2000, time.January, 1, 0, 0, 0, 0, time.UTC)},
-	}
-	sw.FileWriters["meta"] = &bufCloser{Buffer: *bytes.NewBufferString("bar")}
-	sw.FileWriters["shards/2"] = &bufCloser{Buffer: *bytes.NewBufferString("666666")}
-	if _, err := sw.WriteTo(&bufs[1]); err != nil {
-		t.Fatal(err)
-	} else if err = sw.Close(); err != nil {
-		t.Fatal(err)
-	}
-
-	// Read and merge snapshots.
-	ssr := snapshot.NewMultiReader(&bufs[0], &bufs[1])
-
-	// Next should be the second meta file.
-	if f, err := ssr.Next(); err != nil {
-		t.Fatalf("unexpected error(meta): %s", err)
-	} else if !reflect.DeepEqual(f, snapshot.File{Name: "meta", Size: 3, ModTime: time.Date(2001, time.January, 1, 0, 0, 0, 0, time.UTC)}) {
-		t.Fatalf("file mismatch(meta): %#v", f)
-	} else if b := MustReadAll(ssr); string(b) != `bar` {
-		t.Fatalf("unexpected file(meta): %s", b)
-	}
-
-	// Next should be shards/1.
-	if f, err := ssr.Next(); err != nil {
-		t.Fatalf("unexpected error(shards/1): %s", err)
-	} else if !reflect.DeepEqual(f, snapshot.File{Name: "shards/1", Size: 5, ModTime: time.Date(2000, time.February, 1, 0, 0, 0, 0, time.UTC)}) {
-		t.Fatalf("file mismatch(shards/1): %#v", f)
-	} else if b := MustReadAll(ssr); string(b) != `55555` {
-		t.Fatalf("unexpected file(shards/1): %s", b)
-	}
-
-	// Next should be shards/2.
-	if f, err := ssr.Next(); err != nil {
-		t.Fatalf("unexpected error(shards/2): %s", err)
-	} else if !reflect.DeepEqual(f, snapshot.File{Name: "shards/2", Size: 6, ModTime: time.Date(2000, time.January, 1, 0, 0, 0, 0, time.UTC)}) {
-		t.Fatalf("file mismatch(shards/2): %#v", f)
-	} else if b := MustReadAll(ssr); string(b) != `666666` {
-		t.Fatalf("unexpected file(shards/2): %s", b)
-	}
-
-	// Check for end of snapshot.
-	if _, err := ssr.Next(); err != io.EOF {
-		t.Fatalf("expected EOF: %s", err)
-	}
-}
-
-// bufCloser adds a Close() method to a bytes.Buffer
-type bufCloser struct {
-	bytes.Buffer
-	closed bool
-}
-
-// Close marks the buffer as closed.
-func (b *bufCloser) Close() error {
-	b.closed = true
-	return nil
-}
-
-// Reads all data from the reader. Panic on error.
-func MustReadAll(r io.Reader) []byte {
-	b, err := ioutil.ReadAll(r)
-	if err != nil {
-		panic(err.Error())
-	}
-	return b
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/statik/statik.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/statik/statik.go
deleted file mode 100644
index 15c94e26b..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/statik/statik.go
+++ /dev/null
@@ -1,10 +0,0 @@
-package statik
-
-import (
-	"github.com/rakyll/statik/fs"
-)
-
-func init() {
-	data := "PK\x03\x04\x14\x00\x08\x00\x00\x00W\x9a5G\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00	\x00\x00\x00README.md# InfluxDB Admin Interface\n\nThis is the built-in admin interface that ships with InfluxDB. An emphasis has been placed on making it minimalistic and able to be bundled with the server without adding lots of overhead or preprocessing steps.\n\n## Building\n\nThe only step required to bundle this with InfluxDB is to create a compressed file system using `statik` as follows:\n\n```\ngo get github.com/rakyll/statik\n$GOPATH/bin/statik -src=./shared/admin\ngo fmt statik/statik.go\n```\n\nThat should update the file located at `statik/statik.go`, which will get automatically build into the InfluxDB binary when it is compiled. This step should also be completed in any pull requests that make modifications to the admin interface, as it won't be run as a separate step in the release process.\nPK\x07\x08Hx6\x84\x0e\x03\x00\x00\x0e\x03\x00\x00PK\x03\x04\x14\x00\x08\x00\x00\x00W\x9a5G\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x0d\x00\x00\x00css/admin.cssbody {\n    padding-top: 70px;\n    /* Required padding for .navbar-fixed-top. Remove if using .navbar-static-top. Change if height of navigation changes. */\n}\n\nhtml,\nbody {\n    height: 100%;\n    /* The html and body elements cannot have any padding or margin. */\n}\n\ncode {\n    display: block;\n}\n\n#settings {\n    display: none;\n}\n\n#settings form > div {\n    margin-right: 20px;\n}\n\n#settings form input#port {\n    width: 80px;\n}\n\n#settings form label {\n    padding-right: 5px;\n}\n\ndiv#content {\n    margin-bottom: -10px;\n}\n\ndiv#table h2 {\n  color: #999;\n  margin-top: -8px;\n  font-size: 16px\n}\n\ntextarea#content-data {\n    font-family: \"Courier New\";\n    height: 200px;\n}\n\ndiv#query-alerts {\n    margin-top: 30px;\n}\n\ndiv#modal-error, div#modal-success, div#query-error, div#query-success {\n    display: none; \n}\n\n/* Wrapper for page content to push down footer */\n#wrap {\n    min-height: 100%;\n    height: auto !important;\n    height: 100%;\n    /* Negative indent footer by it's height */\n    margin: 0 auto -60px;\n}\n\n/* Set the fixed height of the footer here */\n#push,\n#footer {\n    height: 60px;\n}\n#footer {\n    background-color: #f5f5f5;\n    border-top: 1px solid #dfdfdf;\n}\n\n#footer p {\n    margin: 20px 0;\n}\n\n/* Lastly, apply responsive CSS fixes as necessary */\n@media (max-width: 767px) {\n    #footer {\n      margin-left: -20px;\n      margin-right: -20px;\n      padding-left: 20px;\n      padding-right: 20px;\n    }\n}\n\nPK\x07\x08\x9c\x84U>\x8e\x05\x00\x00\x8e\x05\x00\x00PK\x03\x04\x14\x00\x08\x00\x00\x00W\x9a5G\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x11\x00\x00\x00css/bootstrap.css/*!\n * Bootstrap v3.3.4 (http://getbootstrap.com)\n * Copyright 2011-2015 Twitter, Inc.\n * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)\n */\n\n/*! normalize.css v3.0.2 | MIT License | git.io/normalize */\nhtml {\n  font-family: sans-serif;\n  -webkit-text-size-adjust: 100%;\n      -ms-text-size-adjust: 100%;\n}\nbody {\n  margin: 0;\n}\narticle,\naside,\ndetails,\nfigcaption,\nfigure,\nfooter,\nheader,\nhgroup,\nmain,\nmenu,\nnav,\nsection,\nsummary {\n  display: block;\n}\naudio,\ncanvas,\nprogress,\nvideo {\n  display: inline-block;\n  vertical-align: baseline;\n}\naudio:not([controls]) {\n  display: none;\n  height: 0;\n}\n[hidden],\ntemplate {\n  display: none;\n}\na {\n  background-color: transparent;\n}\na:active,\na:hover {\n  outline: 0;\n}\nabbr[title] {\n  border-bottom: 1px dotted;\n}\nb,\nstrong {\n  font-weight: bold;\n}\ndfn {\n  font-style: italic;\n}\nh1 {\n  margin: .67em 0;\n  font-size: 2em;\n}\nmark {\n  color: #000;\n  background: #ff0;\n}\nsmall {\n  font-size: 80%;\n}\nsub,\nsup {\n  position: relative;\n  font-size: 75%;\n  line-height: 0;\n  vertical-align: baseline;\n}\nsup {\n  top: -.5em;\n}\nsub {\n  bottom: -.25em;\n}\nimg {\n  border: 0;\n}\nsvg:not(:root) {\n  overflow: hidden;\n}\nfigure {\n  margin: 1em 40px;\n}\nhr {\n  height: 0;\n  -webkit-box-sizing: content-box;\n     -moz-box-sizing: content-box;\n          box-sizing: content-box;\n}\npre {\n  overflow: auto;\n}\ncode,\nkbd,\npre,\nsamp {\n  font-family: monospace, monospace;\n  font-size: 1em;\n}\nbutton,\ninput,\noptgroup,\nselect,\ntextarea {\n  margin: 0;\n  font: inherit;\n  color: inherit;\n}\nbutton {\n  overflow: visible;\n}\nbutton,\nselect {\n  text-transform: none;\n}\nbutton,\nhtml input[type=\"button\"],\ninput[type=\"reset\"],\ninput[type=\"submit\"] {\n  -webkit-appearance: button;\n  cursor: pointer;\n}\nbutton[disabled],\nhtml input[disabled] {\n  cursor: default;\n}\nbutton::-moz-focus-inner,\ninput::-moz-focus-inner {\n  padding: 0;\n  border: 0;\n}\ninput {\n  line-height: normal;\n}\ninput[type=\"checkbox\"],\ninput[type=\"radio\"] {\n  -webkit-box-sizing: border-box;\n     -moz-box-sizing: border-box;\n          box-sizing: border-box;\n  padding: 0;\n}\ninput[type=\"number\"]::-webkit-inner-spin-button,\ninput[type=\"number\"]::-webkit-outer-spin-button {\n  height: auto;\n}\ninput[type=\"search\"] {\n  -webkit-box-sizing: content-box;\n     -moz-box-sizing: content-box;\n          box-sizing: content-box;\n  -webkit-appearance: textfield;\n}\ninput[type=\"search\"]::-webkit-search-cancel-button,\ninput[type=\"search\"]::-webkit-search-decoration {\n  -webkit-appearance: none;\n}\nfieldset {\n  padding: .35em .625em .75em;\n  margin: 0 2px;\n  border: 1px solid #c0c0c0;\n}\nlegend {\n  padding: 0;\n  border: 0;\n}\ntextarea {\n  overflow: auto;\n}\noptgroup {\n  font-weight: bold;\n}\ntable {\n  border-spacing: 0;\n  border-collapse: collapse;\n}\ntd,\nth {\n  padding: 0;\n}\n/*! Source: https://github.com/h5bp/html5-boilerplate/blob/master/src/css/main.css */\n@media print {\n  *,\n  *:before,\n  *:after {\n    color: #000 !important;\n    text-shadow: none !important;\n    background: transparent !important;\n    -webkit-box-shadow: none !important;\n            box-shadow: none !important;\n  }\n  a,\n  a:visited {\n    text-decoration: underline;\n  }\n  a[href]:after {\n    content: \" (\" attr(href) \")\";\n  }\n  abbr[title]:after {\n    content: \" (\" attr(title) \")\";\n  }\n  a[href^=\"#\"]:after,\n  a[href^=\"javascript:\"]:after {\n    content: \"\";\n  }\n  pre,\n  blockquote {\n    border: 1px solid #999;\n\n    page-break-inside: avoid;\n  }\n  thead {\n    display: table-header-group;\n  }\n  tr,\n  img {\n    page-break-inside: avoid;\n  }\n  img {\n    max-width: 100% !important;\n  }\n  p,\n  h2,\n  h3 {\n    orphans: 3;\n    widows: 3;\n  }\n  h2,\n  h3 {\n    page-break-after: avoid;\n  }\n  select {\n    background: #fff !important;\n  }\n  .navbar {\n    display: none;\n  }\n  .btn > .caret,\n  .dropup > .btn > .caret {\n    border-top-color: #000 !important;\n  }\n  .label {\n    border: 1px solid #000;\n  }\n  .table {\n    border-collapse: collapse !important;\n  }\n  .table td,\n  .table th {\n    background-color: #fff !important;\n  }\n  .table-bordered th,\n  .table-bordered td {\n    border: 1px solid #ddd !important;\n  }\n}\n@font-face {\n  font-family: 'Glyphicons Halflings';\n\n  src: url('../fonts/glyphicons-halflings-regular.eot');\n  src: url('../fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'), url('../fonts/glyphicons-halflings-regular.woff2') format('woff2'), url('../fonts/glyphicons-halflings-regular.woff') format('woff'), url('../fonts/glyphicons-halflings-regular.ttf') format('truetype'), url('../fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg');\n}\n.glyphicon {\n  position: relative;\n  top: 1px;\n  display: inline-block;\n  font-family: 'Glyphicons Halflings';\n  font-style: normal;\n  font-weight: normal;\n  line-height: 1;\n\n  -webkit-font-smoothing: antialiased;\n  -moz-osx-font-smoothing: grayscale;\n}\n.glyphicon-asterisk:before {\n  content: \"\\2a\";\n}\n.glyphicon-plus:before {\n  content: \"\\2b\";\n}\n.glyphicon-euro:before,\n.glyphicon-eur:before {\n  content: \"\\20ac\";\n}\n.glyphicon-minus:before {\n  content: \"\\2212\";\n}\n.glyphicon-cloud:before {\n  content: \"\\2601\";\n}\n.glyphicon-envelope:before {\n  content: \"\\2709\";\n}\n.glyphicon-pencil:before {\n  content: \"\\270f\";\n}\n.glyphicon-glass:before {\n  content: \"\\e001\";\n}\n.glyphicon-music:before {\n  content: \"\\e002\";\n}\n.glyphicon-search:before {\n  content: \"\\e003\";\n}\n.glyphicon-heart:before {\n  content: \"\\e005\";\n}\n.glyphicon-star:before {\n  content: \"\\e006\";\n}\n.glyphicon-star-empty:before {\n  content: \"\\e007\";\n}\n.glyphicon-user:before {\n  content: \"\\e008\";\n}\n.glyphicon-film:before {\n  content: \"\\e009\";\n}\n.glyphicon-th-large:before {\n  content: \"\\e010\";\n}\n.glyphicon-th:before {\n  content: \"\\e011\";\n}\n.glyphicon-th-list:before {\n  content: \"\\e012\";\n}\n.glyphicon-ok:before {\n  content: \"\\e013\";\n}\n.glyphicon-remove:before {\n  content: \"\\e014\";\n}\n.glyphicon-zoom-in:before {\n  content: \"\\e015\";\n}\n.glyphicon-zoom-out:before {\n  content: \"\\e016\";\n}\n.glyphicon-off:before {\n  content: \"\\e017\";\n}\n.glyphicon-signal:before {\n  content: \"\\e018\";\n}\n.glyphicon-cog:before {\n  content: \"\\e019\";\n}\n.glyphicon-trash:before {\n  content: \"\\e020\";\n}\n.glyphicon-home:before {\n  content: \"\\e021\";\n}\n.glyphicon-file:before {\n  content: \"\\e022\";\n}\n.glyphicon-time:before {\n  content: \"\\e023\";\n}\n.glyphicon-road:before {\n  content: \"\\e024\";\n}\n.glyphicon-download-alt:before {\n  content: \"\\e025\";\n}\n.glyphicon-download:before {\n  content: \"\\e026\";\n}\n.glyphicon-upload:before {\n  content: \"\\e027\";\n}\n.glyphicon-inbox:before {\n  content: \"\\e028\";\n}\n.glyphicon-play-circle:before {\n  content: \"\\e029\";\n}\n.glyphicon-repeat:before {\n  content: \"\\e030\";\n}\n.glyphicon-refresh:before {\n  content: \"\\e031\";\n}\n.glyphicon-list-alt:before {\n  content: \"\\e032\";\n}\n.glyphicon-lock:before {\n  content: \"\\e033\";\n}\n.glyphicon-flag:before {\n  content: \"\\e034\";\n}\n.glyphicon-headphones:before {\n  content: \"\\e035\";\n}\n.glyphicon-volume-off:before {\n  content: \"\\e036\";\n}\n.glyphicon-volume-down:before {\n  content: \"\\e037\";\n}\n.glyphicon-volume-up:before {\n  content: \"\\e038\";\n}\n.glyphicon-qrcode:before {\n  content: \"\\e039\";\n}\n.glyphicon-barcode:before {\n  content: \"\\e040\";\n}\n.glyphicon-tag:before {\n  content: \"\\e041\";\n}\n.glyphicon-tags:before {\n  content: \"\\e042\";\n}\n.glyphicon-book:before {\n  content: \"\\e043\";\n}\n.glyphicon-bookmark:before {\n  content: \"\\e044\";\n}\n.glyphicon-print:before {\n  content: \"\\e045\";\n}\n.glyphicon-camera:before {\n  content: \"\\e046\";\n}\n.glyphicon-font:before {\n  content: \"\\e047\";\n}\n.glyphicon-bold:before {\n  content: \"\\e048\";\n}\n.glyphicon-italic:before {\n  content: \"\\e049\";\n}\n.glyphicon-text-height:before {\n  content: \"\\e050\";\n}\n.glyphicon-text-width:before {\n  content: \"\\e051\";\n}\n.glyphicon-align-left:before {\n  content: \"\\e052\";\n}\n.glyphicon-align-center:before {\n  content: \"\\e053\";\n}\n.glyphicon-align-right:before {\n  content: \"\\e054\";\n}\n.glyphicon-align-justify:before {\n  content: \"\\e055\";\n}\n.glyphicon-list:before {\n  content: \"\\e056\";\n}\n.glyphicon-indent-left:before {\n  content: \"\\e057\";\n}\n.glyphicon-indent-right:before {\n  content: \"\\e058\";\n}\n.glyphicon-facetime-video:before {\n  content: \"\\e059\";\n}\n.glyphicon-picture:before {\n  content: \"\\e060\";\n}\n.glyphicon-map-marker:before {\n  content: \"\\e062\";\n}\n.glyphicon-adjust:before {\n  content: \"\\e063\";\n}\n.glyphicon-tint:before {\n  content: \"\\e064\";\n}\n.glyphicon-edit:before {\n  content: \"\\e065\";\n}\n.glyphicon-share:before {\n  content: \"\\e066\";\n}\n.glyphicon-check:before {\n  content: \"\\e067\";\n}\n.glyphicon-move:before {\n  content: \"\\e068\";\n}\n.glyphicon-step-backward:before {\n  content: \"\\e069\";\n}\n.glyphicon-fast-backward:before {\n  content: \"\\e070\";\n}\n.glyphicon-backward:before {\n  content: \"\\e071\";\n}\n.glyphicon-play:before {\n  content: \"\\e072\";\n}\n.glyphicon-pause:before {\n  content: \"\\e073\";\n}\n.glyphicon-stop:before {\n  content: \"\\e074\";\n}\n.glyphicon-forward:before {\n  content: \"\\e075\";\n}\n.glyphicon-fast-forward:before {\n  content: \"\\e076\";\n}\n.glyphicon-step-forward:before {\n  content: \"\\e077\";\n}\n.glyphicon-eject:before {\n  content: \"\\e078\";\n}\n.glyphicon-chevron-left:before {\n  content: \"\\e079\";\n}\n.glyphicon-chevron-right:before {\n  content: \"\\e080\";\n}\n.glyphicon-plus-sign:before {\n  content: \"\\e081\";\n}\n.glyphicon-minus-sign:before {\n  content: \"\\e082\";\n}\n.glyphicon-remove-sign:before {\n  content: \"\\e083\";\n}\n.glyphicon-ok-sign:before {\n  content: \"\\e084\";\n}\n.glyphicon-question-sign:before {\n  content: \"\\e085\";\n}\n.glyphicon-info-sign:before {\n  content: \"\\e086\";\n}\n.glyphicon-screenshot:before {\n  content: \"\\e087\";\n}\n.glyphicon-remove-circle:before {\n  content: \"\\e088\";\n}\n.glyphicon-ok-circle:before {\n  content: \"\\e089\";\n}\n.glyphicon-ban-circle:before {\n  content: \"\\e090\";\n}\n.glyphicon-arrow-left:before {\n  content: \"\\e091\";\n}\n.glyphicon-arrow-right:before {\n  content: \"\\e092\";\n}\n.glyphicon-arrow-up:before {\n  content: \"\\e093\";\n}\n.glyphicon-arrow-down:before {\n  content: \"\\e094\";\n}\n.glyphicon-share-alt:before {\n  content: \"\\e095\";\n}\n.glyphicon-resize-full:before {\n  content: \"\\e096\";\n}\n.glyphicon-resize-small:before {\n  content: \"\\e097\";\n}\n.glyphicon-exclamation-sign:before {\n  content: \"\\e101\";\n}\n.glyphicon-gift:before {\n  content: \"\\e102\";\n}\n.glyphicon-leaf:before {\n  content: \"\\e103\";\n}\n.glyphicon-fire:before {\n  content: \"\\e104\";\n}\n.glyphicon-eye-open:before {\n  content: \"\\e105\";\n}\n.glyphicon-eye-close:before {\n  content: \"\\e106\";\n}\n.glyphicon-warning-sign:before {\n  content: \"\\e107\";\n}\n.glyphicon-plane:before {\n  content: \"\\e108\";\n}\n.glyphicon-calendar:before {\n  content: \"\\e109\";\n}\n.glyphicon-random:before {\n  content: \"\\e110\";\n}\n.glyphicon-comment:before {\n  content: \"\\e111\";\n}\n.glyphicon-magnet:before {\n  content: \"\\e112\";\n}\n.glyphicon-chevron-up:before {\n  content: \"\\e113\";\n}\n.glyphicon-chevron-down:before {\n  content: \"\\e114\";\n}\n.glyphicon-retweet:before {\n  content: \"\\e115\";\n}\n.glyphicon-shopping-cart:before {\n  content: \"\\e116\";\n}\n.glyphicon-folder-close:before {\n  content: \"\\e117\";\n}\n.glyphicon-folder-open:before {\n  content: \"\\e118\";\n}\n.glyphicon-resize-vertical:before {\n  content: \"\\e119\";\n}\n.glyphicon-resize-horizontal:before {\n  content: \"\\e120\";\n}\n.glyphicon-hdd:before {\n  content: \"\\e121\";\n}\n.glyphicon-bullhorn:before {\n  content: \"\\e122\";\n}\n.glyphicon-bell:before {\n  content: \"\\e123\";\n}\n.glyphicon-certificate:before {\n  content: \"\\e124\";\n}\n.glyphicon-thumbs-up:before {\n  content: \"\\e125\";\n}\n.glyphicon-thumbs-down:before {\n  content: \"\\e126\";\n}\n.glyphicon-hand-right:before {\n  content: \"\\e127\";\n}\n.glyphicon-hand-left:before {\n  content: \"\\e128\";\n}\n.glyphicon-hand-up:before {\n  content: \"\\e129\";\n}\n.glyphicon-hand-down:before {\n  content: \"\\e130\";\n}\n.glyphicon-circle-arrow-right:before {\n  content: \"\\e131\";\n}\n.glyphicon-circle-arrow-left:before {\n  content: \"\\e132\";\n}\n.glyphicon-circle-arrow-up:before {\n  content: \"\\e133\";\n}\n.glyphicon-circle-arrow-down:before {\n  content: \"\\e134\";\n}\n.glyphicon-globe:before {\n  content: \"\\e135\";\n}\n.glyphicon-wrench:before {\n  content: \"\\e136\";\n}\n.glyphicon-tasks:before {\n  content: \"\\e137\";\n}\n.glyphicon-filter:before {\n  content: \"\\e138\";\n}\n.glyphicon-briefcase:before {\n  content: \"\\e139\";\n}\n.glyphicon-fullscreen:before {\n  content: \"\\e140\";\n}\n.glyphicon-dashboard:before {\n  content: \"\\e141\";\n}\n.glyphicon-paperclip:before {\n  content: \"\\e142\";\n}\n.glyphicon-heart-empty:before {\n  content: \"\\e143\";\n}\n.glyphicon-link:before {\n  content: \"\\e144\";\n}\n.glyphicon-phone:before {\n  content: \"\\e145\";\n}\n.glyphicon-pushpin:before {\n  content: \"\\e146\";\n}\n.glyphicon-usd:before {\n  content: \"\\e148\";\n}\n.glyphicon-gbp:before {\n  content: \"\\e149\";\n}\n.glyphicon-sort:before {\n  content: \"\\e150\";\n}\n.glyphicon-sort-by-alphabet:before {\n  content: \"\\e151\";\n}\n.glyphicon-sort-by-alphabet-alt:before {\n  content: \"\\e152\";\n}\n.glyphicon-sort-by-order:before {\n  content: \"\\e153\";\n}\n.glyphicon-sort-by-order-alt:before {\n  content: \"\\e154\";\n}\n.glyphicon-sort-by-attributes:before {\n  content: \"\\e155\";\n}\n.glyphicon-sort-by-attributes-alt:before {\n  content: \"\\e156\";\n}\n.glyphicon-unchecked:before {\n  content: \"\\e157\";\n}\n.glyphicon-expand:before {\n  content: \"\\e158\";\n}\n.glyphicon-collapse-down:before {\n  content: \"\\e159\";\n}\n.glyphicon-collapse-up:before {\n  content: \"\\e160\";\n}\n.glyphicon-log-in:before {\n  content: \"\\e161\";\n}\n.glyphicon-flash:before {\n  content: \"\\e162\";\n}\n.glyphicon-log-out:before {\n  content: \"\\e163\";\n}\n.glyphicon-new-window:before {\n  content: \"\\e164\";\n}\n.glyphicon-record:before {\n  content: \"\\e165\";\n}\n.glyphicon-save:before {\n  content: \"\\e166\";\n}\n.glyphicon-open:before {\n  content: \"\\e167\";\n}\n.glyphicon-saved:before {\n  content: \"\\e168\";\n}\n.glyphicon-import:before {\n  content: \"\\e169\";\n}\n.glyphicon-export:before {\n  content: \"\\e170\";\n}\n.glyphicon-send:before {\n  content: \"\\e171\";\n}\n.glyphicon-floppy-disk:before {\n  content: \"\\e172\";\n}\n.glyphicon-floppy-saved:before {\n  content: \"\\e173\";\n}\n.glyphicon-floppy-remove:before {\n  content: \"\\e174\";\n}\n.glyphicon-floppy-save:before {\n  content: \"\\e175\";\n}\n.glyphicon-floppy-open:before {\n  content: \"\\e176\";\n}\n.glyphicon-credit-card:before {\n  content: \"\\e177\";\n}\n.glyphicon-transfer:before {\n  content: \"\\e178\";\n}\n.glyphicon-cutlery:before {\n  content: \"\\e179\";\n}\n.glyphicon-header:before {\n  content: \"\\e180\";\n}\n.glyphicon-compressed:before {\n  content: \"\\e181\";\n}\n.glyphicon-earphone:before {\n  content: \"\\e182\";\n}\n.glyphicon-phone-alt:before {\n  content: \"\\e183\";\n}\n.glyphicon-tower:before {\n  content: \"\\e184\";\n}\n.glyphicon-stats:before {\n  content: \"\\e185\";\n}\n.glyphicon-sd-video:before {\n  content: \"\\e186\";\n}\n.glyphicon-hd-video:before {\n  content: \"\\e187\";\n}\n.glyphicon-subtitles:before {\n  content: \"\\e188\";\n}\n.glyphicon-sound-stereo:before {\n  content: \"\\e189\";\n}\n.glyphicon-sound-dolby:before {\n  content: \"\\e190\";\n}\n.glyphicon-sound-5-1:before {\n  content: \"\\e191\";\n}\n.glyphicon-sound-6-1:before {\n  content: \"\\e192\";\n}\n.glyphicon-sound-7-1:before {\n  content: \"\\e193\";\n}\n.glyphicon-copyright-mark:before {\n  content: \"\\e194\";\n}\n.glyphicon-registration-mark:before {\n  content: \"\\e195\";\n}\n.glyphicon-cloud-download:before {\n  content: \"\\e197\";\n}\n.glyphicon-cloud-upload:before {\n  content: \"\\e198\";\n}\n.glyphicon-tree-conifer:before {\n  content: \"\\e199\";\n}\n.glyphicon-tree-deciduous:before {\n  content: \"\\e200\";\n}\n.glyphicon-cd:before {\n  content: \"\\e201\";\n}\n.glyphicon-save-file:before {\n  content: \"\\e202\";\n}\n.glyphicon-open-file:before {\n  content: \"\\e203\";\n}\n.glyphicon-level-up:before {\n  content: \"\\e204\";\n}\n.glyphicon-copy:before {\n  content: \"\\e205\";\n}\n.glyphicon-paste:before {\n  content: \"\\e206\";\n}\n.glyphicon-alert:before {\n  content: \"\\e209\";\n}\n.glyphicon-equalizer:before {\n  content: \"\\e210\";\n}\n.glyphicon-king:before {\n  content: \"\\e211\";\n}\n.glyphicon-queen:before {\n  content: \"\\e212\";\n}\n.glyphicon-pawn:before {\n  content: \"\\e213\";\n}\n.glyphicon-bishop:before {\n  content: \"\\e214\";\n}\n.glyphicon-knight:before {\n  content: \"\\e215\";\n}\n.glyphicon-baby-formula:before {\n  content: \"\\e216\";\n}\n.glyphicon-tent:before {\n  content: \"\\26fa\";\n}\n.glyphicon-blackboard:before {\n  content: \"\\e218\";\n}\n.glyphicon-bed:before {\n  content: \"\\e219\";\n}\n.glyphicon-apple:before {\n  content: \"\\f8ff\";\n}\n.glyphicon-erase:before {\n  content: \"\\e221\";\n}\n.glyphicon-hourglass:before {\n  content: \"\\231b\";\n}\n.glyphicon-lamp:before {\n  content: \"\\e223\";\n}\n.glyphicon-duplicate:before {\n  content: \"\\e224\";\n}\n.glyphicon-piggy-bank:before {\n  content: \"\\e225\";\n}\n.glyphicon-scissors:before {\n  content: \"\\e226\";\n}\n.glyphicon-bitcoin:before {\n  content: \"\\e227\";\n}\n.glyphicon-btc:before {\n  content: \"\\e227\";\n}\n.glyphicon-xbt:before {\n  content: \"\\e227\";\n}\n.glyphicon-yen:before {\n  content: \"\\00a5\";\n}\n.glyphicon-jpy:before {\n  content: \"\\00a5\";\n}\n.glyphicon-ruble:before {\n  content: \"\\20bd\";\n}\n.glyphicon-rub:before {\n  content: \"\\20bd\";\n}\n.glyphicon-scale:before {\n  content: \"\\e230\";\n}\n.glyphicon-ice-lolly:before {\n  content: \"\\e231\";\n}\n.glyphicon-ice-lolly-tasted:before {\n  content: \"\\e232\";\n}\n.glyphicon-education:before {\n  content: \"\\e233\";\n}\n.glyphicon-option-horizontal:before {\n  content: \"\\e234\";\n}\n.glyphicon-option-vertical:before {\n  content: \"\\e235\";\n}\n.glyphicon-menu-hamburger:before {\n  content: \"\\e236\";\n}\n.glyphicon-modal-window:before {\n  content: \"\\e237\";\n}\n.glyphicon-oil:before {\n  content: \"\\e238\";\n}\n.glyphicon-grain:before {\n  content: \"\\e239\";\n}\n.glyphicon-sunglasses:before {\n  content: \"\\e240\";\n}\n.glyphicon-text-size:before {\n  content: \"\\e241\";\n}\n.glyphicon-text-color:before {\n  content: \"\\e242\";\n}\n.glyphicon-text-background:before {\n  content: \"\\e243\";\n}\n.glyphicon-object-align-top:before {\n  content: \"\\e244\";\n}\n.glyphicon-object-align-bottom:before {\n  content: \"\\e245\";\n}\n.glyphicon-object-align-horizontal:before {\n  content: \"\\e246\";\n}\n.glyphicon-object-align-left:before {\n  content: \"\\e247\";\n}\n.glyphicon-object-align-vertical:before {\n  content: \"\\e248\";\n}\n.glyphicon-object-align-right:before {\n  content: \"\\e249\";\n}\n.glyphicon-triangle-right:before {\n  content: \"\\e250\";\n}\n.glyphicon-triangle-left:before {\n  content: \"\\e251\";\n}\n.glyphicon-triangle-bottom:before {\n  content: \"\\e252\";\n}\n.glyphicon-triangle-top:before {\n  content: \"\\e253\";\n}\n.glyphicon-console:before {\n  content: \"\\e254\";\n}\n.glyphicon-superscript:before {\n  content: \"\\e255\";\n}\n.glyphicon-subscript:before {\n  content: \"\\e256\";\n}\n.glyphicon-menu-left:before {\n  content: \"\\e257\";\n}\n.glyphicon-menu-right:before {\n  content: \"\\e258\";\n}\n.glyphicon-menu-down:before {\n  content: \"\\e259\";\n}\n.glyphicon-menu-up:before {\n  content: \"\\e260\";\n}\n* {\n  -webkit-box-sizing: border-box;\n     -moz-box-sizing: border-box;\n          box-sizing: border-box;\n}\n*:before,\n*:after {\n  -webkit-box-sizing: border-box;\n     -moz-box-sizing: border-box;\n          box-sizing: border-box;\n}\nhtml {\n  font-size: 10px;\n\n  -webkit-tap-highlight-color: rgba(0, 0, 0, 0);\n}\nbody {\n  font-family: \"Helvetica Neue\", Helvetica, Arial, sans-serif;\n  font-size: 14px;\n  line-height: 1.42857143;\n  color: #333;\n  background-color: #fff;\n}\ninput,\nbutton,\nselect,\ntextarea {\n  font-family: inherit;\n  font-size: inherit;\n  line-height: inherit;\n}\na {\n  color: #337ab7;\n  text-decoration: none;\n}\na:hover,\na:focus {\n  color: #23527c;\n  text-decoration: underline;\n}\na:focus {\n  outline: thin dotted;\n  outline: 5px auto -webkit-focus-ring-color;\n  outline-offset: -2px;\n}\nfigure {\n  margin: 0;\n}\nimg {\n  vertical-align: middle;\n}\n.img-responsive,\n.thumbnail > img,\n.thumbnail a > img,\n.carousel-inner > .item > img,\n.carousel-inner > .item > a > img {\n  display: block;\n  max-width: 100%;\n  height: auto;\n}\n.img-rounded {\n  border-radius: 6px;\n}\n.img-thumbnail {\n  display: inline-block;\n  max-width: 100%;\n  height: auto;\n  padding: 4px;\n  line-height: 1.42857143;\n  background-color: #fff;\n  border: 1px solid #ddd;\n  border-radius: 4px;\n  -webkit-transition: all .2s ease-in-out;\n       -o-transition: all .2s ease-in-out;\n          transition: all .2s ease-in-out;\n}\n.img-circle {\n  border-radius: 50%;\n}\nhr {\n  margin-top: 20px;\n  margin-bottom: 20px;\n  border: 0;\n  border-top: 1px solid #eee;\n}\n.sr-only {\n  position: absolute;\n  width: 1px;\n  height: 1px;\n  padding: 0;\n  margin: -1px;\n  overflow: hidden;\n  clip: rect(0, 0, 0, 0);\n  border: 0;\n}\n.sr-only-focusable:active,\n.sr-only-focusable:focus {\n  position: static;\n  width: auto;\n  height: auto;\n  margin: 0;\n  overflow: visible;\n  clip: auto;\n}\n[role=\"button\"] {\n  cursor: pointer;\n}\nh1,\nh2,\nh3,\nh4,\nh5,\nh6,\n.h1,\n.h2,\n.h3,\n.h4,\n.h5,\n.h6 {\n  font-family: inherit;\n  font-weight: 500;\n  line-height: 1.1;\n  color: inherit;\n}\nh1 small,\nh2 small,\nh3 small,\nh4 small,\nh5 small,\nh6 small,\n.h1 small,\n.h2 small,\n.h3 small,\n.h4 small,\n.h5 small,\n.h6 small,\nh1 .small,\nh2 .small,\nh3 .small,\nh4 .small,\nh5 .small,\nh6 .small,\n.h1 .small,\n.h2 .small,\n.h3 .small,\n.h4 .small,\n.h5 .small,\n.h6 .small {\n  font-weight: normal;\n  line-height: 1;\n  color: #777;\n}\nh1,\n.h1,\nh2,\n.h2,\nh3,\n.h3 {\n  margin-top: 20px;\n  margin-bottom: 10px;\n}\nh1 small,\n.h1 small,\nh2 small,\n.h2 small,\nh3 small,\n.h3 small,\nh1 .small,\n.h1 .small,\nh2 .small,\n.h2 .small,\nh3 .small,\n.h3 .small {\n  font-size: 65%;\n}\nh4,\n.h4,\nh5,\n.h5,\nh6,\n.h6 {\n  margin-top: 10px;\n  margin-bottom: 10px;\n}\nh4 small,\n.h4 small,\nh5 small,\n.h5 small,\nh6 small,\n.h6 small,\nh4 .small,\n.h4 .small,\nh5 .small,\n.h5 .small,\nh6 .small,\n.h6 .small {\n  font-size: 75%;\n}\nh1,\n.h1 {\n  font-size: 36px;\n}\nh2,\n.h2 {\n  font-size: 30px;\n}\nh3,\n.h3 {\n  font-size: 24px;\n}\nh4,\n.h4 {\n  font-size: 18px;\n}\nh5,\n.h5 {\n  font-size: 14px;\n}\nh6,\n.h6 {\n  font-size: 12px;\n}\np {\n  margin: 0 0 10px;\n}\n.lead {\n  margin-bottom: 20px;\n  font-size: 16px;\n  font-weight: 300;\n  line-height: 1.4;\n}\n@media (min-width: 768px) {\n  .lead {\n    font-size: 21px;\n  }\n}\nsmall,\n.small {\n  font-size: 85%;\n}\nmark,\n.mark {\n  padding: .2em;\n  background-color: #fcf8e3;\n}\n.text-left {\n  text-align: left;\n}\n.text-right {\n  text-align: right;\n}\n.text-center {\n  text-align: center;\n}\n.text-justify {\n  text-align: justify;\n}\n.text-nowrap {\n  white-space: nowrap;\n}\n.text-lowercase {\n  text-transform: lowercase;\n}\n.text-uppercase {\n  text-transform: uppercase;\n}\n.text-capitalize {\n  text-transform: capitalize;\n}\n.text-muted {\n  color: #777;\n}\n.text-primary {\n  color: #337ab7;\n}\na.text-primary:hover {\n  color: #286090;\n}\n.text-success {\n  color: #3c763d;\n}\na.text-success:hover {\n  color: #2b542c;\n}\n.text-info {\n  color: #31708f;\n}\na.text-info:hover {\n  color: #245269;\n}\n.text-warning {\n  color: #8a6d3b;\n}\na.text-warning:hover {\n  color: #66512c;\n}\n.text-danger {\n  color: #a94442;\n}\na.text-danger:hover {\n  color: #843534;\n}\n.bg-primary {\n  color: #fff;\n  background-color: #337ab7;\n}\na.bg-primary:hover {\n  background-color: #286090;\n}\n.bg-success {\n  background-color: #dff0d8;\n}\na.bg-success:hover {\n  background-color: #c1e2b3;\n}\n.bg-info {\n  background-color: #d9edf7;\n}\na.bg-info:hover {\n  background-color: #afd9ee;\n}\n.bg-warning {\n  background-color: #fcf8e3;\n}\na.bg-warning:hover {\n  background-color: #f7ecb5;\n}\n.bg-danger {\n  background-color: #f2dede;\n}\na.bg-danger:hover {\n  background-color: #e4b9b9;\n}\n.page-header {\n  padding-bottom: 9px;\n  margin: 40px 0 20px;\n  border-bottom: 1px solid #eee;\n}\nul,\nol {\n  margin-top: 0;\n  margin-bottom: 10px;\n}\nul ul,\nol ul,\nul ol,\nol ol {\n  margin-bottom: 0;\n}\n.list-unstyled {\n  padding-left: 0;\n  list-style: none;\n}\n.list-inline {\n  padding-left: 0;\n  margin-left: -5px;\n  list-style: none;\n}\n.list-inline > li {\n  display: inline-block;\n  padding-right: 5px;\n  padding-left: 5px;\n}\ndl {\n  margin-top: 0;\n  margin-bottom: 20px;\n}\ndt,\ndd {\n  line-height: 1.42857143;\n}\ndt {\n  font-weight: bold;\n}\ndd {\n  margin-left: 0;\n}\n@media (min-width: 768px) {\n  .dl-horizontal dt {\n    float: left;\n    width: 160px;\n    overflow: hidden;\n    clear: left;\n    text-align: right;\n    text-overflow: ellipsis;\n    white-space: nowrap;\n  }\n  .dl-horizontal dd {\n    margin-left: 180px;\n  }\n}\nabbr[title],\nabbr[data-original-title] {\n  cursor: help;\n  border-bottom: 1px dotted #777;\n}\n.initialism {\n  font-size: 90%;\n  text-transform: uppercase;\n}\nblockquote {\n  padding: 10px 20px;\n  margin: 0 0 20px;\n  font-size: 17.5px;\n  border-left: 5px solid #eee;\n}\nblockquote p:last-child,\nblockquote ul:last-child,\nblockquote ol:last-child {\n  margin-bottom: 0;\n}\nblockquote footer,\nblockquote small,\nblockquote .small {\n  display: block;\n  font-size: 80%;\n  line-height: 1.42857143;\n  color: #777;\n}\nblockquote footer:before,\nblockquote small:before,\nblockquote .small:before {\n  content: '\\2014 \\00A0';\n}\n.blockquote-reverse,\nblockquote.pull-right {\n  padding-right: 15px;\n  padding-left: 0;\n  text-align: right;\n  border-right: 5px solid #eee;\n  border-left: 0;\n}\n.blockquote-reverse footer:before,\nblockquote.pull-right footer:before,\n.blockquote-reverse small:before,\nblockquote.pull-right small:before,\n.blockquote-reverse .small:before,\nblockquote.pull-right .small:before {\n  content: '';\n}\n.blockquote-reverse footer:after,\nblockquote.pull-right footer:after,\n.blockquote-reverse small:after,\nblockquote.pull-right small:after,\n.blockquote-reverse .small:after,\nblockquote.pull-right .small:after {\n  content: '\\00A0 \\2014';\n}\naddress {\n  margin-bottom: 20px;\n  font-style: normal;\n  line-height: 1.42857143;\n}\ncode,\nkbd,\npre,\nsamp {\n  font-family: Menlo, Monaco, Consolas, \"Courier New\", monospace;\n}\ncode {\n  padding: 2px 4px;\n  font-size: 90%;\n  color: #c7254e;\n  background-color: #f9f2f4;\n  border-radius: 4px;\n}\nkbd {\n  padding: 2px 4px;\n  font-size: 90%;\n  color: #fff;\n  background-color: #333;\n  border-radius: 3px;\n  -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, .25);\n          box-shadow: inset 0 -1px 0 rgba(0, 0, 0, .25);\n}\nkbd kbd {\n  padding: 0;\n  font-size: 100%;\n  font-weight: bold;\n  -webkit-box-shadow: none;\n          box-shadow: none;\n}\npre {\n  display: block;\n  padding: 9.5px;\n  margin: 0 0 10px;\n  font-size: 13px;\n  line-height: 1.42857143;\n  color: #333;\n  word-break: break-all;\n  word-wrap: break-word;\n  background-color: #f5f5f5;\n  border: 1px solid #ccc;\n  border-radius: 4px;\n}\npre code {\n  padding: 0;\n  font-size: inherit;\n  color: inherit;\n  white-space: pre-wrap;\n  background-color: transparent;\n  border-radius: 0;\n}\n.pre-scrollable {\n  max-height: 340px;\n  overflow-y: scroll;\n}\n.container {\n  padding-right: 15px;\n  padding-left: 15px;\n  margin-right: auto;\n  margin-left: auto;\n}\n@media (min-width: 768px) {\n  .container {\n    width: 750px;\n  }\n}\n@media (min-width: 992px) {\n  .container {\n    width: 970px;\n  }\n}\n@media (min-width: 1200px) {\n  .container {\n    width: 1170px;\n  }\n}\n.container-fluid {\n  padding-right: 15px;\n  padding-left: 15px;\n  margin-right: auto;\n  margin-left: auto;\n}\n.row {\n  margin-right: -15px;\n  margin-left: -15px;\n}\n.col-xs-1, .col-sm-1, .col-md-1, .col-lg-1, .col-xs-2, .col-sm-2, .col-md-2, .col-lg-2, .col-xs-3, .col-sm-3, .col-md-3, .col-lg-3, .col-xs-4, .col-sm-4, .col-md-4, .col-lg-4, .col-xs-5, .col-sm-5, .col-md-5, .col-lg-5, .col-xs-6, .col-sm-6, .col-md-6, .col-lg-6, .col-xs-7, .col-sm-7, .col-md-7, .col-lg-7, .col-xs-8, .col-sm-8, .col-md-8, .col-lg-8, .col-xs-9, .col-sm-9, .col-md-9, .col-lg-9, .col-xs-10, .col-sm-10, .col-md-10, .col-lg-10, .col-xs-11, .col-sm-11, .col-md-11, .col-lg-11, .col-xs-12, .col-sm-12, .col-md-12, .col-lg-12 {\n  position: relative;\n  min-height: 1px;\n  padding-right: 15px;\n  padding-left: 15px;\n}\n.col-xs-1, .col-xs-2, .col-xs-3, .col-xs-4, .col-xs-5, .col-xs-6, .col-xs-7, .col-xs-8, .col-xs-9, .col-xs-10, .col-xs-11, .col-xs-12 {\n  float: left;\n}\n.col-xs-12 {\n  width: 100%;\n}\n.col-xs-11 {\n  width: 91.66666667%;\n}\n.col-xs-10 {\n  width: 83.33333333%;\n}\n.col-xs-9 {\n  width: 75%;\n}\n.col-xs-8 {\n  width: 66.66666667%;\n}\n.col-xs-7 {\n  width: 58.33333333%;\n}\n.col-xs-6 {\n  width: 50%;\n}\n.col-xs-5 {\n  width: 41.66666667%;\n}\n.col-xs-4 {\n  width: 33.33333333%;\n}\n.col-xs-3 {\n  width: 25%;\n}\n.col-xs-2 {\n  width: 16.66666667%;\n}\n.col-xs-1 {\n  width: 8.33333333%;\n}\n.col-xs-pull-12 {\n  right: 100%;\n}\n.col-xs-pull-11 {\n  right: 91.66666667%;\n}\n.col-xs-pull-10 {\n  right: 83.33333333%;\n}\n.col-xs-pull-9 {\n  right: 75%;\n}\n.col-xs-pull-8 {\n  right: 66.66666667%;\n}\n.col-xs-pull-7 {\n  right: 58.33333333%;\n}\n.col-xs-pull-6 {\n  right: 50%;\n}\n.col-xs-pull-5 {\n  right: 41.66666667%;\n}\n.col-xs-pull-4 {\n  right: 33.33333333%;\n}\n.col-xs-pull-3 {\n  right: 25%;\n}\n.col-xs-pull-2 {\n  right: 16.66666667%;\n}\n.col-xs-pull-1 {\n  right: 8.33333333%;\n}\n.col-xs-pull-0 {\n  right: auto;\n}\n.col-xs-push-12 {\n  left: 100%;\n}\n.col-xs-push-11 {\n  left: 91.66666667%;\n}\n.col-xs-push-10 {\n  left: 83.33333333%;\n}\n.col-xs-push-9 {\n  left: 75%;\n}\n.col-xs-push-8 {\n  left: 66.66666667%;\n}\n.col-xs-push-7 {\n  left: 58.33333333%;\n}\n.col-xs-push-6 {\n  left: 50%;\n}\n.col-xs-push-5 {\n  left: 41.66666667%;\n}\n.col-xs-push-4 {\n  left: 33.33333333%;\n}\n.col-xs-push-3 {\n  left: 25%;\n}\n.col-xs-push-2 {\n  left: 16.66666667%;\n}\n.col-xs-push-1 {\n  left: 8.33333333%;\n}\n.col-xs-push-0 {\n  left: auto;\n}\n.col-xs-offset-12 {\n  margin-left: 100%;\n}\n.col-xs-offset-11 {\n  margin-left: 91.66666667%;\n}\n.col-xs-offset-10 {\n  margin-left: 83.33333333%;\n}\n.col-xs-offset-9 {\n  margin-left: 75%;\n}\n.col-xs-offset-8 {\n  margin-left: 66.66666667%;\n}\n.col-xs-offset-7 {\n  margin-left: 58.33333333%;\n}\n.col-xs-offset-6 {\n  margin-left: 50%;\n}\n.col-xs-offset-5 {\n  margin-left: 41.66666667%;\n}\n.col-xs-offset-4 {\n  margin-left: 33.33333333%;\n}\n.col-xs-offset-3 {\n  margin-left: 25%;\n}\n.col-xs-offset-2 {\n  margin-left: 16.66666667%;\n}\n.col-xs-offset-1 {\n  margin-left: 8.33333333%;\n}\n.col-xs-offset-0 {\n  margin-left: 0;\n}\n@media (min-width: 768px) {\n  .col-sm-1, .col-sm-2, .col-sm-3, .col-sm-4, .col-sm-5, .col-sm-6, .col-sm-7, .col-sm-8, .col-sm-9, .col-sm-10, .col-sm-11, .col-sm-12 {\n    float: left;\n  }\n  .col-sm-12 {\n    width: 100%;\n  }\n  .col-sm-11 {\n    width: 91.66666667%;\n  }\n  .col-sm-10 {\n    width: 83.33333333%;\n  }\n  .col-sm-9 {\n    width: 75%;\n  }\n  .col-sm-8 {\n    width: 66.66666667%;\n  }\n  .col-sm-7 {\n    width: 58.33333333%;\n  }\n  .col-sm-6 {\n    width: 50%;\n  }\n  .col-sm-5 {\n    width: 41.66666667%;\n  }\n  .col-sm-4 {\n    width: 33.33333333%;\n  }\n  .col-sm-3 {\n    width: 25%;\n  }\n  .col-sm-2 {\n    width: 16.66666667%;\n  }\n  .col-sm-1 {\n    width: 8.33333333%;\n  }\n  .col-sm-pull-12 {\n    right: 100%;\n  }\n  .col-sm-pull-11 {\n    right: 91.66666667%;\n  }\n  .col-sm-pull-10 {\n    right: 83.33333333%;\n  }\n  .col-sm-pull-9 {\n    right: 75%;\n  }\n  .col-sm-pull-8 {\n    right: 66.66666667%;\n  }\n  .col-sm-pull-7 {\n    right: 58.33333333%;\n  }\n  .col-sm-pull-6 {\n    right: 50%;\n  }\n  .col-sm-pull-5 {\n    right: 41.66666667%;\n  }\n  .col-sm-pull-4 {\n    right: 33.33333333%;\n  }\n  .col-sm-pull-3 {\n    right: 25%;\n  }\n  .col-sm-pull-2 {\n    right: 16.66666667%;\n  }\n  .col-sm-pull-1 {\n    right: 8.33333333%;\n  }\n  .col-sm-pull-0 {\n    right: auto;\n  }\n  .col-sm-push-12 {\n    left: 100%;\n  }\n  .col-sm-push-11 {\n    left: 91.66666667%;\n  }\n  .col-sm-push-10 {\n    left: 83.33333333%;\n  }\n  .col-sm-push-9 {\n    left: 75%;\n  }\n  .col-sm-push-8 {\n    left: 66.66666667%;\n  }\n  .col-sm-push-7 {\n    left: 58.33333333%;\n  }\n  .col-sm-push-6 {\n    left: 50%;\n  }\n  .col-sm-push-5 {\n    left: 41.66666667%;\n  }\n  .col-sm-push-4 {\n    left: 33.33333333%;\n  }\n  .col-sm-push-3 {\n    left: 25%;\n  }\n  .col-sm-push-2 {\n    left: 16.66666667%;\n  }\n  .col-sm-push-1 {\n    left: 8.33333333%;\n  }\n  .col-sm-push-0 {\n    left: auto;\n  }\n  .col-sm-offset-12 {\n    margin-left: 100%;\n  }\n  .col-sm-offset-11 {\n    margin-left: 91.66666667%;\n  }\n  .col-sm-offset-10 {\n    margin-left: 83.33333333%;\n  }\n  .col-sm-offset-9 {\n    margin-left: 75%;\n  }\n  .col-sm-offset-8 {\n    margin-left: 66.66666667%;\n  }\n  .col-sm-offset-7 {\n    margin-left: 58.33333333%;\n  }\n  .col-sm-offset-6 {\n    margin-left: 50%;\n  }\n  .col-sm-offset-5 {\n    margin-left: 41.66666667%;\n  }\n  .col-sm-offset-4 {\n    margin-left: 33.33333333%;\n  }\n  .col-sm-offset-3 {\n    margin-left: 25%;\n  }\n  .col-sm-offset-2 {\n    margin-left: 16.66666667%;\n  }\n  .col-sm-offset-1 {\n    margin-left: 8.33333333%;\n  }\n  .col-sm-offset-0 {\n    margin-left: 0;\n  }\n}\n@media (min-width: 992px) {\n  .col-md-1, .col-md-2, .col-md-3, .col-md-4, .col-md-5, .col-md-6, .col-md-7, .col-md-8, .col-md-9, .col-md-10, .col-md-11, .col-md-12 {\n    float: left;\n  }\n  .col-md-12 {\n    width: 100%;\n  }\n  .col-md-11 {\n    width: 91.66666667%;\n  }\n  .col-md-10 {\n    width: 83.33333333%;\n  }\n  .col-md-9 {\n    width: 75%;\n  }\n  .col-md-8 {\n    width: 66.66666667%;\n  }\n  .col-md-7 {\n    width: 58.33333333%;\n  }\n  .col-md-6 {\n    width: 50%;\n  }\n  .col-md-5 {\n    width: 41.66666667%;\n  }\n  .col-md-4 {\n    width: 33.33333333%;\n  }\n  .col-md-3 {\n    width: 25%;\n  }\n  .col-md-2 {\n    width: 16.66666667%;\n  }\n  .col-md-1 {\n    width: 8.33333333%;\n  }\n  .col-md-pull-12 {\n    right: 100%;\n  }\n  .col-md-pull-11 {\n    right: 91.66666667%;\n  }\n  .col-md-pull-10 {\n    right: 83.33333333%;\n  }\n  .col-md-pull-9 {\n    right: 75%;\n  }\n  .col-md-pull-8 {\n    right: 66.66666667%;\n  }\n  .col-md-pull-7 {\n    right: 58.33333333%;\n  }\n  .col-md-pull-6 {\n    right: 50%;\n  }\n  .col-md-pull-5 {\n    right: 41.66666667%;\n  }\n  .col-md-pull-4 {\n    right: 33.33333333%;\n  }\n  .col-md-pull-3 {\n    right: 25%;\n  }\n  .col-md-pull-2 {\n    right: 16.66666667%;\n  }\n  .col-md-pull-1 {\n    right: 8.33333333%;\n  }\n  .col-md-pull-0 {\n    right: auto;\n  }\n  .col-md-push-12 {\n    left: 100%;\n  }\n  .col-md-push-11 {\n    left: 91.66666667%;\n  }\n  .col-md-push-10 {\n    left: 83.33333333%;\n  }\n  .col-md-push-9 {\n    left: 75%;\n  }\n  .col-md-push-8 {\n    left: 66.66666667%;\n  }\n  .col-md-push-7 {\n    left: 58.33333333%;\n  }\n  .col-md-push-6 {\n    left: 50%;\n  }\n  .col-md-push-5 {\n    left: 41.66666667%;\n  }\n  .col-md-push-4 {\n    left: 33.33333333%;\n  }\n  .col-md-push-3 {\n    left: 25%;\n  }\n  .col-md-push-2 {\n    left: 16.66666667%;\n  }\n  .col-md-push-1 {\n    left: 8.33333333%;\n  }\n  .col-md-push-0 {\n    left: auto;\n  }\n  .col-md-offset-12 {\n    margin-left: 100%;\n  }\n  .col-md-offset-11 {\n    margin-left: 91.66666667%;\n  }\n  .col-md-offset-10 {\n    margin-left: 83.33333333%;\n  }\n  .col-md-offset-9 {\n    margin-left: 75%;\n  }\n  .col-md-offset-8 {\n    margin-left: 66.66666667%;\n  }\n  .col-md-offset-7 {\n    margin-left: 58.33333333%;\n  }\n  .col-md-offset-6 {\n    margin-left: 50%;\n  }\n  .col-md-offset-5 {\n    margin-left: 41.66666667%;\n  }\n  .col-md-offset-4 {\n    margin-left: 33.33333333%;\n  }\n  .col-md-offset-3 {\n    margin-left: 25%;\n  }\n  .col-md-offset-2 {\n    margin-left: 16.66666667%;\n  }\n  .col-md-offset-1 {\n    margin-left: 8.33333333%;\n  }\n  .col-md-offset-0 {\n    margin-left: 0;\n  }\n}\n@media (min-width: 1200px) {\n  .col-lg-1, .col-lg-2, .col-lg-3, .col-lg-4, .col-lg-5, .col-lg-6, .col-lg-7, .col-lg-8, .col-lg-9, .col-lg-10, .col-lg-11, .col-lg-12 {\n    float: left;\n  }\n  .col-lg-12 {\n    width: 100%;\n  }\n  .col-lg-11 {\n    width: 91.66666667%;\n  }\n  .col-lg-10 {\n    width: 83.33333333%;\n  }\n  .col-lg-9 {\n    width: 75%;\n  }\n  .col-lg-8 {\n    width: 66.66666667%;\n  }\n  .col-lg-7 {\n    width: 58.33333333%;\n  }\n  .col-lg-6 {\n    width: 50%;\n  }\n  .col-lg-5 {\n    width: 41.66666667%;\n  }\n  .col-lg-4 {\n    width: 33.33333333%;\n  }\n  .col-lg-3 {\n    width: 25%;\n  }\n  .col-lg-2 {\n    width: 16.66666667%;\n  }\n  .col-lg-1 {\n    width: 8.33333333%;\n  }\n  .col-lg-pull-12 {\n    right: 100%;\n  }\n  .col-lg-pull-11 {\n    right: 91.66666667%;\n  }\n  .col-lg-pull-10 {\n    right: 83.33333333%;\n  }\n  .col-lg-pull-9 {\n    right: 75%;\n  }\n  .col-lg-pull-8 {\n    right: 66.66666667%;\n  }\n  .col-lg-pull-7 {\n    right: 58.33333333%;\n  }\n  .col-lg-pull-6 {\n    right: 50%;\n  }\n  .col-lg-pull-5 {\n    right: 41.66666667%;\n  }\n  .col-lg-pull-4 {\n    right: 33.33333333%;\n  }\n  .col-lg-pull-3 {\n    right: 25%;\n  }\n  .col-lg-pull-2 {\n    right: 16.66666667%;\n  }\n  .col-lg-pull-1 {\n    right: 8.33333333%;\n  }\n  .col-lg-pull-0 {\n    right: auto;\n  }\n  .col-lg-push-12 {\n    left: 100%;\n  }\n  .col-lg-push-11 {\n    left: 91.66666667%;\n  }\n  .col-lg-push-10 {\n    left: 83.33333333%;\n  }\n  .col-lg-push-9 {\n    left: 75%;\n  }\n  .col-lg-push-8 {\n    left: 66.66666667%;\n  }\n  .col-lg-push-7 {\n    left: 58.33333333%;\n  }\n  .col-lg-push-6 {\n    left: 50%;\n  }\n  .col-lg-push-5 {\n    left: 41.66666667%;\n  }\n  .col-lg-push-4 {\n    left: 33.33333333%;\n  }\n  .col-lg-push-3 {\n    left: 25%;\n  }\n  .col-lg-push-2 {\n    left: 16.66666667%;\n  }\n  .col-lg-push-1 {\n    left: 8.33333333%;\n  }\n  .col-lg-push-0 {\n    left: auto;\n  }\n  .col-lg-offset-12 {\n    margin-left: 100%;\n  }\n  .col-lg-offset-11 {\n    margin-left: 91.66666667%;\n  }\n  .col-lg-offset-10 {\n    margin-left: 83.33333333%;\n  }\n  .col-lg-offset-9 {\n    margin-left: 75%;\n  }\n  .col-lg-offset-8 {\n    margin-left: 66.66666667%;\n  }\n  .col-lg-offset-7 {\n    margin-left: 58.33333333%;\n  }\n  .col-lg-offset-6 {\n    margin-left: 50%;\n  }\n  .col-lg-offset-5 {\n    margin-left: 41.66666667%;\n  }\n  .col-lg-offset-4 {\n    margin-left: 33.33333333%;\n  }\n  .col-lg-offset-3 {\n    margin-left: 25%;\n  }\n  .col-lg-offset-2 {\n    margin-left: 16.66666667%;\n  }\n  .col-lg-offset-1 {\n    margin-left: 8.33333333%;\n  }\n  .col-lg-offset-0 {\n    margin-left: 0;\n  }\n}\ntable {\n  background-color: transparent;\n}\ncaption {\n  padding-top: 8px;\n  padding-bottom: 8px;\n  color: #777;\n  text-align: left;\n}\nth {\n  text-align: left;\n}\n.table {\n  width: 100%;\n  max-width: 100%;\n  margin-bottom: 20px;\n}\n.table > thead > tr > th,\n.table > tbody > tr > th,\n.table > tfoot > tr > th,\n.table > thead > tr > td,\n.table > tbody > tr > td,\n.table > tfoot > tr > td {\n  padding: 8px;\n  line-height: 1.42857143;\n  vertical-align: top;\n  border-top: 1px solid #ddd;\n}\n.table > thead > tr > th {\n  vertical-align: bottom;\n  border-bottom: 2px solid #ddd;\n}\n.table > caption + thead > tr:first-child > th,\n.table > colgroup + thead > tr:first-child > th,\n.table > thead:first-child > tr:first-child > th,\n.table > caption + thead > tr:first-child > td,\n.table > colgroup + thead > tr:first-child > td,\n.table > thead:first-child > tr:first-child > td {\n  border-top: 0;\n}\n.table > tbody + tbody {\n  border-top: 2px solid #ddd;\n}\n.table .table {\n  background-color: #fff;\n}\n.table-condensed > thead > tr > th,\n.table-condensed > tbody > tr > th,\n.table-condensed > tfoot > tr > th,\n.table-condensed > thead > tr > td,\n.table-condensed > tbody > tr > td,\n.table-condensed > tfoot > tr > td {\n  padding: 5px;\n}\n.table-bordered {\n  border: 1px solid #ddd;\n}\n.table-bordered > thead > tr > th,\n.table-bordered > tbody > tr > th,\n.table-bordered > tfoot > tr > th,\n.table-bordered > thead > tr > td,\n.table-bordered > tbody > tr > td,\n.table-bordered > tfoot > tr > td {\n  border: 1px solid #ddd;\n}\n.table-bordered > thead > tr > th,\n.table-bordered > thead > tr > td {\n  border-bottom-width: 2px;\n}\n.table-striped > tbody > tr:nth-of-type(odd) {\n  background-color: #f9f9f9;\n}\n.table-hover > tbody > tr:hover {\n  background-color: #f5f5f5;\n}\ntable col[class*=\"col-\"] {\n  position: static;\n  display: table-column;\n  float: none;\n}\ntable td[class*=\"col-\"],\ntable th[class*=\"col-\"] {\n  position: static;\n  display: table-cell;\n  float: none;\n}\n.table > thead > tr > td.active,\n.table > tbody > tr > td.active,\n.table > tfoot > tr > td.active,\n.table > thead > tr > th.active,\n.table > tbody > tr > th.active,\n.table > tfoot > tr > th.active,\n.table > thead > tr.active > td,\n.table > tbody > tr.active > td,\n.table > tfoot > tr.active > td,\n.table > thead > tr.active > th,\n.table > tbody > tr.active > th,\n.table > tfoot > tr.active > th {\n  background-color: #f5f5f5;\n}\n.table-hover > tbody > tr > td.active:hover,\n.table-hover > tbody > tr > th.active:hover,\n.table-hover > tbody > tr.active:hover > td,\n.table-hover > tbody > tr:hover > .active,\n.table-hover > tbody > tr.active:hover > th {\n  background-color: #e8e8e8;\n}\n.table > thead > tr > td.success,\n.table > tbody > tr > td.success,\n.table > tfoot > tr > td.success,\n.table > thead > tr > th.success,\n.table > tbody > tr > th.success,\n.table > tfoot > tr > th.success,\n.table > thead > tr.success > td,\n.table > tbody > tr.success > td,\n.table > tfoot > tr.success > td,\n.table > thead > tr.success > th,\n.table > tbody > tr.success > th,\n.table > tfoot > tr.success > th {\n  background-color: #dff0d8;\n}\n.table-hover > tbody > tr > td.success:hover,\n.table-hover > tbody > tr > th.success:hover,\n.table-hover > tbody > tr.success:hover > td,\n.table-hover > tbody > tr:hover > .success,\n.table-hover > tbody > tr.success:hover > th {\n  background-color: #d0e9c6;\n}\n.table > thead > tr > td.info,\n.table > tbody > tr > td.info,\n.table > tfoot > tr > td.info,\n.table > thead > tr > th.info,\n.table > tbody > tr > th.info,\n.table > tfoot > tr > th.info,\n.table > thead > tr.info > td,\n.table > tbody > tr.info > td,\n.table > tfoot > tr.info > td,\n.table > thead > tr.info > th,\n.table > tbody > tr.info > th,\n.table > tfoot > tr.info > th {\n  background-color: #d9edf7;\n}\n.table-hover > tbody > tr > td.info:hover,\n.table-hover > tbody > tr > th.info:hover,\n.table-hover > tbody > tr.info:hover > td,\n.table-hover > tbody > tr:hover > .info,\n.table-hover > tbody > tr.info:hover > th {\n  background-color: #c4e3f3;\n}\n.table > thead > tr > td.warning,\n.table > tbody > tr > td.warning,\n.table > tfoot > tr > td.warning,\n.table > thead > tr > th.warning,\n.table > tbody > tr > th.warning,\n.table > tfoot > tr > th.warning,\n.table > thead > tr.warning > td,\n.table > tbody > tr.warning > td,\n.table > tfoot > tr.warning > td,\n.table > thead > tr.warning > th,\n.table > tbody > tr.warning > th,\n.table > tfoot > tr.warning > th {\n  background-color: #fcf8e3;\n}\n.table-hover > tbody > tr > td.warning:hover,\n.table-hover > tbody > tr > th.warning:hover,\n.table-hover > tbody > tr.warning:hover > td,\n.table-hover > tbody > tr:hover > .warning,\n.table-hover > tbody > tr.warning:hover > th {\n  background-color: #faf2cc;\n}\n.table > thead > tr > td.danger,\n.table > tbody > tr > td.danger,\n.table > tfoot > tr > td.danger,\n.table > thead > tr > th.danger,\n.table > tbody > tr > th.danger,\n.table > tfoot > tr > th.danger,\n.table > thead > tr.danger > td,\n.table > tbody > tr.danger > td,\n.table > tfoot > tr.danger > td,\n.table > thead > tr.danger > th,\n.table > tbody > tr.danger > th,\n.table > tfoot > tr.danger > th {\n  background-color: #f2dede;\n}\n.table-hover > tbody > tr > td.danger:hover,\n.table-hover > tbody > tr > th.danger:hover,\n.table-hover > tbody > tr.danger:hover > td,\n.table-hover > tbody > tr:hover > .danger,\n.table-hover > tbody > tr.danger:hover > th {\n  background-color: #ebcccc;\n}\n.table-responsive {\n  min-height: .01%;\n  overflow-x: auto;\n}\n@media screen and (max-width: 767px) {\n  .table-responsive {\n    width: 100%;\n    margin-bottom: 15px;\n    overflow-y: hidden;\n    -ms-overflow-style: -ms-autohiding-scrollbar;\n    border: 1px solid #ddd;\n  }\n  .table-responsive > .table {\n    margin-bottom: 0;\n  }\n  .table-responsive > .table > thead > tr > th,\n  .table-responsive > .table > tbody > tr > th,\n  .table-responsive > .table > tfoot > tr > th,\n  .table-responsive > .table > thead > tr > td,\n  .table-responsive > .table > tbody > tr > td,\n  .table-responsive > .table > tfoot > tr > td {\n    white-space: nowrap;\n  }\n  .table-responsive > .table-bordered {\n    border: 0;\n  }\n  .table-responsive > .table-bordered > thead > tr > th:first-child,\n  .table-responsive > .table-bordered > tbody > tr > th:first-child,\n  .table-responsive > .table-bordered > tfoot > tr > th:first-child,\n  .table-responsive > .table-bordered > thead > tr > td:first-child,\n  .table-responsive > .table-bordered > tbody > tr > td:first-child,\n  .table-responsive > .table-bordered > tfoot > tr > td:first-child {\n    border-left: 0;\n  }\n  .table-responsive > .table-bordered > thead > tr > th:last-child,\n  .table-responsive > .table-bordered > tbody > tr > th:last-child,\n  .table-responsive > .table-bordered > tfoot > tr > th:last-child,\n  .table-responsive > .table-bordered > thead > tr > td:last-child,\n  .table-responsive > .table-bordered > tbody > tr > td:last-child,\n  .table-responsive > .table-bordered > tfoot > tr > td:last-child {\n    border-right: 0;\n  }\n  .table-responsive > .table-bordered > tbody > tr:last-child > th,\n  .table-responsive > .table-bordered > tfoot > tr:last-child > th,\n  .table-responsive > .table-bordered > tbody > tr:last-child > td,\n  .table-responsive > .table-bordered > tfoot > tr:last-child > td {\n    border-bottom: 0;\n  }\n}\nfieldset {\n  min-width: 0;\n  padding: 0;\n  margin: 0;\n  border: 0;\n}\nlegend {\n  display: block;\n  width: 100%;\n  padding: 0;\n  margin-bottom: 20px;\n  font-size: 21px;\n  line-height: inherit;\n  color: #333;\n  border: 0;\n  border-bottom: 1px solid #e5e5e5;\n}\nlabel {\n  display: inline-block;\n  max-width: 100%;\n  margin-bottom: 5px;\n  font-weight: bold;\n}\ninput[type=\"search\"] {\n  -webkit-box-sizing: border-box;\n     -moz-box-sizing: border-box;\n          box-sizing: border-box;\n}\ninput[type=\"radio\"],\ninput[type=\"checkbox\"] {\n  margin: 4px 0 0;\n  margin-top: 1px \\9;\n  line-height: normal;\n}\ninput[type=\"file\"] {\n  display: block;\n}\ninput[type=\"range\"] {\n  display: block;\n  width: 100%;\n}\nselect[multiple],\nselect[size] {\n  height: auto;\n}\ninput[type=\"file\"]:focus,\ninput[type=\"radio\"]:focus,\ninput[type=\"checkbox\"]:focus {\n  outline: thin dotted;\n  outline: 5px auto -webkit-focus-ring-color;\n  outline-offset: -2px;\n}\noutput {\n  display: block;\n  padding-top: 7px;\n  font-size: 14px;\n  line-height: 1.42857143;\n  color: #555;\n}\n.form-control {\n  display: block;\n  width: 100%;\n  height: 34px;\n  padding: 6px 12px;\n  font-size: 14px;\n  line-height: 1.42857143;\n  color: #555;\n  background-color: #fff;\n  background-image: none;\n  border: 1px solid #ccc;\n  border-radius: 4px;\n  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);\n          box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);\n  -webkit-transition: border-color ease-in-out .15s, -webkit-box-shadow ease-in-out .15s;\n       -o-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;\n          transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;\n}\n.form-control:focus {\n  border-color: #66afe9;\n  outline: 0;\n  -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, .6);\n          box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, .6);\n}\n.form-control::-moz-placeholder {\n  color: #999;\n  opacity: 1;\n}\n.form-control:-ms-input-placeholder {\n  color: #999;\n}\n.form-control::-webkit-input-placeholder {\n  color: #999;\n}\n.form-control[disabled],\n.form-control[readonly],\nfieldset[disabled] .form-control {\n  background-color: #eee;\n  opacity: 1;\n}\n.form-control[disabled],\nfieldset[disabled] .form-control {\n  cursor: not-allowed;\n}\ntextarea.form-control {\n  height: auto;\n}\ninput[type=\"search\"] {\n  -webkit-appearance: none;\n}\n@media screen and (-webkit-min-device-pixel-ratio: 0) {\n  input[type=\"date\"],\n  input[type=\"time\"],\n  input[type=\"datetime-local\"],\n  input[type=\"month\"] {\n    line-height: 34px;\n  }\n  input[type=\"date\"].input-sm,\n  input[type=\"time\"].input-sm,\n  input[type=\"datetime-local\"].input-sm,\n  input[type=\"month\"].input-sm,\n  .input-group-sm input[type=\"date\"],\n  .input-group-sm input[type=\"time\"],\n  .input-group-sm input[type=\"datetime-local\"],\n  .input-group-sm input[type=\"month\"] {\n    line-height: 30px;\n  }\n  input[type=\"date\"].input-lg,\n  input[type=\"time\"].input-lg,\n  input[type=\"datetime-local\"].input-lg,\n  input[type=\"month\"].input-lg,\n  .input-group-lg input[type=\"date\"],\n  .input-group-lg input[type=\"time\"],\n  .input-group-lg input[type=\"datetime-local\"],\n  .input-group-lg input[type=\"month\"] {\n    line-height: 46px;\n  }\n}\n.form-group {\n  margin-bottom: 15px;\n}\n.radio,\n.checkbox {\n  position: relative;\n  display: block;\n  margin-top: 10px;\n  margin-bottom: 10px;\n}\n.radio label,\n.checkbox label {\n  min-height: 20px;\n  padding-left: 20px;\n  margin-bottom: 0;\n  font-weight: normal;\n  cursor: pointer;\n}\n.radio input[type=\"radio\"],\n.radio-inline input[type=\"radio\"],\n.checkbox input[type=\"checkbox\"],\n.checkbox-inline input[type=\"checkbox\"] {\n  position: absolute;\n  margin-top: 4px \\9;\n  margin-left: -20px;\n}\n.radio + .radio,\n.checkbox + .checkbox {\n  margin-top: -5px;\n}\n.radio-inline,\n.checkbox-inline {\n  position: relative;\n  display: inline-block;\n  padding-left: 20px;\n  margin-bottom: 0;\n  font-weight: normal;\n  vertical-align: middle;\n  cursor: pointer;\n}\n.radio-inline + .radio-inline,\n.checkbox-inline + .checkbox-inline {\n  margin-top: 0;\n  margin-left: 10px;\n}\ninput[type=\"radio\"][disabled],\ninput[type=\"checkbox\"][disabled],\ninput[type=\"radio\"].disabled,\ninput[type=\"checkbox\"].disabled,\nfieldset[disabled] input[type=\"radio\"],\nfieldset[disabled] input[type=\"checkbox\"] {\n  cursor: not-allowed;\n}\n.radio-inline.disabled,\n.checkbox-inline.disabled,\nfieldset[disabled] .radio-inline,\nfieldset[disabled] .checkbox-inline {\n  cursor: not-allowed;\n}\n.radio.disabled label,\n.checkbox.disabled label,\nfieldset[disabled] .radio label,\nfieldset[disabled] .checkbox label {\n  cursor: not-allowed;\n}\n.form-control-static {\n  min-height: 34px;\n  padding-top: 7px;\n  padding-bottom: 7px;\n  margin-bottom: 0;\n}\n.form-control-static.input-lg,\n.form-control-static.input-sm {\n  padding-right: 0;\n  padding-left: 0;\n}\n.input-sm {\n  height: 30px;\n  padding: 5px 10px;\n  font-size: 12px;\n  line-height: 1.5;\n  border-radius: 3px;\n}\nselect.input-sm {\n  height: 30px;\n  line-height: 30px;\n}\ntextarea.input-sm,\nselect[multiple].input-sm {\n  height: auto;\n}\n.form-group-sm .form-control {\n  height: 30px;\n  padding: 5px 10px;\n  font-size: 12px;\n  line-height: 1.5;\n  border-radius: 3px;\n}\nselect.form-group-sm .form-control {\n  height: 30px;\n  line-height: 30px;\n}\ntextarea.form-group-sm .form-control,\nselect[multiple].form-group-sm .form-control {\n  height: auto;\n}\n.form-group-sm .form-control-static {\n  height: 30px;\n  min-height: 32px;\n  padding: 5px 10px;\n  font-size: 12px;\n  line-height: 1.5;\n}\n.input-lg {\n  height: 46px;\n  padding: 10px 16px;\n  font-size: 18px;\n  line-height: 1.3333333;\n  border-radius: 6px;\n}\nselect.input-lg {\n  height: 46px;\n  line-height: 46px;\n}\ntextarea.input-lg,\nselect[multiple].input-lg {\n  height: auto;\n}\n.form-group-lg .form-control {\n  height: 46px;\n  padding: 10px 16px;\n  font-size: 18px;\n  line-height: 1.3333333;\n  border-radius: 6px;\n}\nselect.form-group-lg .form-control {\n  height: 46px;\n  line-height: 46px;\n}\ntextarea.form-group-lg .form-control,\nselect[multiple].form-group-lg .form-control {\n  height: auto;\n}\n.form-group-lg .form-control-static {\n  height: 46px;\n  min-height: 38px;\n  padding: 10px 16px;\n  font-size: 18px;\n  line-height: 1.3333333;\n}\n.has-feedback {\n  position: relative;\n}\n.has-feedback .form-control {\n  padding-right: 42.5px;\n}\n.form-control-feedback {\n  position: absolute;\n  top: 0;\n  right: 0;\n  z-index: 2;\n  display: block;\n  width: 34px;\n  height: 34px;\n  line-height: 34px;\n  text-align: center;\n  pointer-events: none;\n}\n.input-lg + .form-control-feedback {\n  width: 46px;\n  height: 46px;\n  line-height: 46px;\n}\n.input-sm + .form-control-feedback {\n  width: 30px;\n  height: 30px;\n  line-height: 30px;\n}\n.has-success .help-block,\n.has-success .control-label,\n.has-success .radio,\n.has-success .checkbox,\n.has-success .radio-inline,\n.has-success .checkbox-inline,\n.has-success.radio label,\n.has-success.checkbox label,\n.has-success.radio-inline label,\n.has-success.checkbox-inline label {\n  color: #3c763d;\n}\n.has-success .form-control {\n  border-color: #3c763d;\n  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);\n          box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);\n}\n.has-success .form-control:focus {\n  border-color: #2b542c;\n  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 6px #67b168;\n          box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 6px #67b168;\n}\n.has-success .input-group-addon {\n  color: #3c763d;\n  background-color: #dff0d8;\n  border-color: #3c763d;\n}\n.has-success .form-control-feedback {\n  color: #3c763d;\n}\n.has-warning .help-block,\n.has-warning .control-label,\n.has-warning .radio,\n.has-warning .checkbox,\n.has-warning .radio-inline,\n.has-warning .checkbox-inline,\n.has-warning.radio label,\n.has-warning.checkbox label,\n.has-warning.radio-inline label,\n.has-warning.checkbox-inline label {\n  color: #8a6d3b;\n}\n.has-warning .form-control {\n  border-color: #8a6d3b;\n  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);\n          box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);\n}\n.has-warning .form-control:focus {\n  border-color: #66512c;\n  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 6px #c0a16b;\n          box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 6px #c0a16b;\n}\n.has-warning .input-group-addon {\n  color: #8a6d3b;\n  background-color: #fcf8e3;\n  border-color: #8a6d3b;\n}\n.has-warning .form-control-feedback {\n  color: #8a6d3b;\n}\n.has-error .help-block,\n.has-error .control-label,\n.has-error .radio,\n.has-error .checkbox,\n.has-error .radio-inline,\n.has-error .checkbox-inline,\n.has-error.radio label,\n.has-error.checkbox label,\n.has-error.radio-inline label,\n.has-error.checkbox-inline label {\n  color: #a94442;\n}\n.has-error .form-control {\n  border-color: #a94442;\n  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);\n          box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);\n}\n.has-error .form-control:focus {\n  border-color: #843534;\n  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 6px #ce8483;\n          box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 6px #ce8483;\n}\n.has-error .input-group-addon {\n  color: #a94442;\n  background-color: #f2dede;\n  border-color: #a94442;\n}\n.has-error .form-control-feedback {\n  color: #a94442;\n}\n.has-feedback label ~ .form-control-feedback {\n  top: 25px;\n}\n.has-feedback label.sr-only ~ .form-control-feedback {\n  top: 0;\n}\n.help-block {\n  display: block;\n  margin-top: 5px;\n  margin-bottom: 10px;\n  color: #737373;\n}\n@media (min-width: 768px) {\n  .form-inline .form-group {\n    display: inline-block;\n    margin-bottom: 0;\n    vertical-align: middle;\n  }\n  .form-inline .form-control {\n    display: inline-block;\n    width: auto;\n    vertical-align: middle;\n  }\n  .form-inline .form-control-static {\n    display: inline-block;\n  }\n  .form-inline .input-group {\n    display: inline-table;\n    vertical-align: middle;\n  }\n  .form-inline .input-group .input-group-addon,\n  .form-inline .input-group .input-group-btn,\n  .form-inline .input-group .form-control {\n    width: auto;\n  }\n  .form-inline .input-group > .form-control {\n    width: 100%;\n  }\n  .form-inline .control-label {\n    margin-bottom: 0;\n    vertical-align: middle;\n  }\n  .form-inline .radio,\n  .form-inline .checkbox {\n    display: inline-block;\n    margin-top: 0;\n    margin-bottom: 0;\n    vertical-align: middle;\n  }\n  .form-inline .radio label,\n  .form-inline .checkbox label {\n    padding-left: 0;\n  }\n  .form-inline .radio input[type=\"radio\"],\n  .form-inline .checkbox input[type=\"checkbox\"] {\n    position: relative;\n    margin-left: 0;\n  }\n  .form-inline .has-feedback .form-control-feedback {\n    top: 0;\n  }\n}\n.form-horizontal .radio,\n.form-horizontal .checkbox,\n.form-horizontal .radio-inline,\n.form-horizontal .checkbox-inline {\n  padding-top: 7px;\n  margin-top: 0;\n  margin-bottom: 0;\n}\n.form-horizontal .radio,\n.form-horizontal .checkbox {\n  min-height: 27px;\n}\n.form-horizontal .form-group {\n  margin-right: -15px;\n  margin-left: -15px;\n}\n@media (min-width: 768px) {\n  .form-horizontal .control-label {\n    padding-top: 7px;\n    margin-bottom: 0;\n    text-align: right;\n  }\n}\n.form-horizontal .has-feedback .form-control-feedback {\n  right: 15px;\n}\n@media (min-width: 768px) {\n  .form-horizontal .form-group-lg .control-label {\n    padding-top: 14.333333px;\n  }\n}\n@media (min-width: 768px) {\n  .form-horizontal .form-group-sm .control-label {\n    padding-top: 6px;\n  }\n}\n.btn {\n  display: inline-block;\n  padding: 6px 12px;\n  margin-bottom: 0;\n  font-size: 14px;\n  font-weight: normal;\n  line-height: 1.42857143;\n  text-align: center;\n  white-space: nowrap;\n  vertical-align: middle;\n  -ms-touch-action: manipulation;\n      touch-action: manipulation;\n  cursor: pointer;\n  -webkit-user-select: none;\n     -moz-user-select: none;\n      -ms-user-select: none;\n          user-select: none;\n  background-image: none;\n  border: 1px solid transparent;\n  border-radius: 4px;\n}\n.btn:focus,\n.btn:active:focus,\n.btn.active:focus,\n.btn.focus,\n.btn:active.focus,\n.btn.active.focus {\n  outline: thin dotted;\n  outline: 5px auto -webkit-focus-ring-color;\n  outline-offset: -2px;\n}\n.btn:hover,\n.btn:focus,\n.btn.focus {\n  color: #333;\n  text-decoration: none;\n}\n.btn:active,\n.btn.active {\n  background-image: none;\n  outline: 0;\n  -webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125);\n          box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125);\n}\n.btn.disabled,\n.btn[disabled],\nfieldset[disabled] .btn {\n  pointer-events: none;\n  cursor: not-allowed;\n  filter: alpha(opacity=65);\n  -webkit-box-shadow: none;\n          box-shadow: none;\n  opacity: .65;\n}\n.btn-default {\n  color: #333;\n  background-color: #fff;\n  border-color: #ccc;\n}\n.btn-default:hover,\n.btn-default:focus,\n.btn-default.focus,\n.btn-default:active,\n.btn-default.active,\n.open > .dropdown-toggle.btn-default {\n  color: #333;\n  background-color: #e6e6e6;\n  border-color: #adadad;\n}\n.btn-default:active,\n.btn-default.active,\n.open > .dropdown-toggle.btn-default {\n  background-image: none;\n}\n.btn-default.disabled,\n.btn-default[disabled],\nfieldset[disabled] .btn-default,\n.btn-default.disabled:hover,\n.btn-default[disabled]:hover,\nfieldset[disabled] .btn-default:hover,\n.btn-default.disabled:focus,\n.btn-default[disabled]:focus,\nfieldset[disabled] .btn-default:focus,\n.btn-default.disabled.focus,\n.btn-default[disabled].focus,\nfieldset[disabled] .btn-default.focus,\n.btn-default.disabled:active,\n.btn-default[disabled]:active,\nfieldset[disabled] .btn-default:active,\n.btn-default.disabled.active,\n.btn-default[disabled].active,\nfieldset[disabled] .btn-default.active {\n  background-color: #fff;\n  border-color: #ccc;\n}\n.btn-default .badge {\n  color: #fff;\n  background-color: #333;\n}\n.btn-primary {\n  color: #fff;\n  background-color: #337ab7;\n  border-color: #2e6da4;\n}\n.btn-primary:hover,\n.btn-primary:focus,\n.btn-primary.focus,\n.btn-primary:active,\n.btn-primary.active,\n.open > .dropdown-toggle.btn-primary {\n  color: #fff;\n  background-color: #286090;\n  border-color: #204d74;\n}\n.btn-primary:active,\n.btn-primary.active,\n.open > .dropdown-toggle.btn-primary {\n  background-image: none;\n}\n.btn-primary.disabled,\n.btn-primary[disabled],\nfieldset[disabled] .btn-primary,\n.btn-primary.disabled:hover,\n.btn-primary[disabled]:hover,\nfieldset[disabled] .btn-primary:hover,\n.btn-primary.disabled:focus,\n.btn-primary[disabled]:focus,\nfieldset[disabled] .btn-primary:focus,\n.btn-primary.disabled.focus,\n.btn-primary[disabled].focus,\nfieldset[disabled] .btn-primary.focus,\n.btn-primary.disabled:active,\n.btn-primary[disabled]:active,\nfieldset[disabled] .btn-primary:active,\n.btn-primary.disabled.active,\n.btn-primary[disabled].active,\nfieldset[disabled] .btn-primary.active {\n  background-color: #337ab7;\n  border-color: #2e6da4;\n}\n.btn-primary .badge {\n  color: #337ab7;\n  background-color: #fff;\n}\n.btn-success {\n  color: #fff;\n  background-color: #5cb85c;\n  border-color: #4cae4c;\n}\n.btn-success:hover,\n.btn-success:focus,\n.btn-success.focus,\n.btn-success:active,\n.btn-success.active,\n.open > .dropdown-toggle.btn-success {\n  color: #fff;\n  background-color: #449d44;\n  border-color: #398439;\n}\n.btn-success:active,\n.btn-success.active,\n.open > .dropdown-toggle.btn-success {\n  background-image: none;\n}\n.btn-success.disabled,\n.btn-success[disabled],\nfieldset[disabled] .btn-success,\n.btn-success.disabled:hover,\n.btn-success[disabled]:hover,\nfieldset[disabled] .btn-success:hover,\n.btn-success.disabled:focus,\n.btn-success[disabled]:focus,\nfieldset[disabled] .btn-success:focus,\n.btn-success.disabled.focus,\n.btn-success[disabled].focus,\nfieldset[disabled] .btn-success.focus,\n.btn-success.disabled:active,\n.btn-success[disabled]:active,\nfieldset[disabled] .btn-success:active,\n.btn-success.disabled.active,\n.btn-success[disabled].active,\nfieldset[disabled] .btn-success.active {\n  background-color: #5cb85c;\n  border-color: #4cae4c;\n}\n.btn-success .badge {\n  color: #5cb85c;\n  background-color: #fff;\n}\n.btn-info {\n  color: #fff;\n  background-color: #5bc0de;\n  border-color: #46b8da;\n}\n.btn-info:hover,\n.btn-info:focus,\n.btn-info.focus,\n.btn-info:active,\n.btn-info.active,\n.open > .dropdown-toggle.btn-info {\n  color: #fff;\n  background-color: #31b0d5;\n  border-color: #269abc;\n}\n.btn-info:active,\n.btn-info.active,\n.open > .dropdown-toggle.btn-info {\n  background-image: none;\n}\n.btn-info.disabled,\n.btn-info[disabled],\nfieldset[disabled] .btn-info,\n.btn-info.disabled:hover,\n.btn-info[disabled]:hover,\nfieldset[disabled] .btn-info:hover,\n.btn-info.disabled:focus,\n.btn-info[disabled]:focus,\nfieldset[disabled] .btn-info:focus,\n.btn-info.disabled.focus,\n.btn-info[disabled].focus,\nfieldset[disabled] .btn-info.focus,\n.btn-info.disabled:active,\n.btn-info[disabled]:active,\nfieldset[disabled] .btn-info:active,\n.btn-info.disabled.active,\n.btn-info[disabled].active,\nfieldset[disabled] .btn-info.active {\n  background-color: #5bc0de;\n  border-color: #46b8da;\n}\n.btn-info .badge {\n  color: #5bc0de;\n  background-color: #fff;\n}\n.btn-warning {\n  color: #fff;\n  background-color: #f0ad4e;\n  border-color: #eea236;\n}\n.btn-warning:hover,\n.btn-warning:focus,\n.btn-warning.focus,\n.btn-warning:active,\n.btn-warning.active,\n.open > .dropdown-toggle.btn-warning {\n  color: #fff;\n  background-color: #ec971f;\n  border-color: #d58512;\n}\n.btn-warning:active,\n.btn-warning.active,\n.open > .dropdown-toggle.btn-warning {\n  background-image: none;\n}\n.btn-warning.disabled,\n.btn-warning[disabled],\nfieldset[disabled] .btn-warning,\n.btn-warning.disabled:hover,\n.btn-warning[disabled]:hover,\nfieldset[disabled] .btn-warning:hover,\n.btn-warning.disabled:focus,\n.btn-warning[disabled]:focus,\nfieldset[disabled] .btn-warning:focus,\n.btn-warning.disabled.focus,\n.btn-warning[disabled].focus,\nfieldset[disabled] .btn-warning.focus,\n.btn-warning.disabled:active,\n.btn-warning[disabled]:active,\nfieldset[disabled] .btn-warning:active,\n.btn-warning.disabled.active,\n.btn-warning[disabled].active,\nfieldset[disabled] .btn-warning.active {\n  background-color: #f0ad4e;\n  border-color: #eea236;\n}\n.btn-warning .badge {\n  color: #f0ad4e;\n  background-color: #fff;\n}\n.btn-danger {\n  color: #fff;\n  background-color: #d9534f;\n  border-color: #d43f3a;\n}\n.btn-danger:hover,\n.btn-danger:focus,\n.btn-danger.focus,\n.btn-danger:active,\n.btn-danger.active,\n.open > .dropdown-toggle.btn-danger {\n  color: #fff;\n  background-color: #c9302c;\n  border-color: #ac2925;\n}\n.btn-danger:active,\n.btn-danger.active,\n.open > .dropdown-toggle.btn-danger {\n  background-image: none;\n}\n.btn-danger.disabled,\n.btn-danger[disabled],\nfieldset[disabled] .btn-danger,\n.btn-danger.disabled:hover,\n.btn-danger[disabled]:hover,\nfieldset[disabled] .btn-danger:hover,\n.btn-danger.disabled:focus,\n.btn-danger[disabled]:focus,\nfieldset[disabled] .btn-danger:focus,\n.btn-danger.disabled.focus,\n.btn-danger[disabled].focus,\nfieldset[disabled] .btn-danger.focus,\n.btn-danger.disabled:active,\n.btn-danger[disabled]:active,\nfieldset[disabled] .btn-danger:active,\n.btn-danger.disabled.active,\n.btn-danger[disabled].active,\nfieldset[disabled] .btn-danger.active {\n  background-color: #d9534f;\n  border-color: #d43f3a;\n}\n.btn-danger .badge {\n  color: #d9534f;\n  background-color: #fff;\n}\n.btn-link {\n  font-weight: normal;\n  color: #337ab7;\n  border-radius: 0;\n}\n.btn-link,\n.btn-link:active,\n.btn-link.active,\n.btn-link[disabled],\nfieldset[disabled] .btn-link {\n  background-color: transparent;\n  -webkit-box-shadow: none;\n          box-shadow: none;\n}\n.btn-link,\n.btn-link:hover,\n.btn-link:focus,\n.btn-link:active {\n  border-color: transparent;\n}\n.btn-link:hover,\n.btn-link:focus {\n  color: #23527c;\n  text-decoration: underline;\n  background-color: transparent;\n}\n.btn-link[disabled]:hover,\nfieldset[disabled] .btn-link:hover,\n.btn-link[disabled]:focus,\nfieldset[disabled] .btn-link:focus {\n  color: #777;\n  text-decoration: none;\n}\n.btn-lg,\n.btn-group-lg > .btn {\n  padding: 10px 16px;\n  font-size: 18px;\n  line-height: 1.3333333;\n  border-radius: 6px;\n}\n.btn-sm,\n.btn-group-sm > .btn {\n  padding: 5px 10px;\n  font-size: 12px;\n  line-height: 1.5;\n  border-radius: 3px;\n}\n.btn-xs,\n.btn-group-xs > .btn {\n  padding: 1px 5px;\n  font-size: 12px;\n  line-height: 1.5;\n  border-radius: 3px;\n}\n.btn-block {\n  display: block;\n  width: 100%;\n}\n.btn-block + .btn-block {\n  margin-top: 5px;\n}\ninput[type=\"submit\"].btn-block,\ninput[type=\"reset\"].btn-block,\ninput[type=\"button\"].btn-block {\n  width: 100%;\n}\n.fade {\n  opacity: 0;\n  -webkit-transition: opacity .15s linear;\n       -o-transition: opacity .15s linear;\n          transition: opacity .15s linear;\n}\n.fade.in {\n  opacity: 1;\n}\n.collapse {\n  display: none;\n}\n.collapse.in {\n  display: block;\n}\ntr.collapse.in {\n  display: table-row;\n}\ntbody.collapse.in {\n  display: table-row-group;\n}\n.collapsing {\n  position: relative;\n  height: 0;\n  overflow: hidden;\n  -webkit-transition-timing-function: ease;\n       -o-transition-timing-function: ease;\n          transition-timing-function: ease;\n  -webkit-transition-duration: .35s;\n       -o-transition-duration: .35s;\n          transition-duration: .35s;\n  -webkit-transition-property: height, visibility;\n       -o-transition-property: height, visibility;\n          transition-property: height, visibility;\n}\n.caret {\n  display: inline-block;\n  width: 0;\n  height: 0;\n  margin-left: 2px;\n  vertical-align: middle;\n  border-top: 4px dashed;\n  border-right: 4px solid transparent;\n  border-left: 4px solid transparent;\n}\n.dropup,\n.dropdown {\n  position: relative;\n}\n.dropdown-toggle:focus {\n  outline: 0;\n}\n.dropdown-menu {\n  position: absolute;\n  top: 100%;\n  left: 0;\n  z-index: 1000;\n  display: none;\n  float: left;\n  min-width: 160px;\n  padding: 5px 0;\n  margin: 2px 0 0;\n  font-size: 14px;\n  text-align: left;\n  list-style: none;\n  background-color: #fff;\n  -webkit-background-clip: padding-box;\n          background-clip: padding-box;\n  border: 1px solid #ccc;\n  border: 1px solid rgba(0, 0, 0, .15);\n  border-radius: 4px;\n  -webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, .175);\n          box-shadow: 0 6px 12px rgba(0, 0, 0, .175);\n}\n.dropdown-menu.pull-right {\n  right: 0;\n  left: auto;\n}\n.dropdown-menu .divider {\n  height: 1px;\n  margin: 9px 0;\n  overflow: hidden;\n  background-color: #e5e5e5;\n}\n.dropdown-menu > li > a {\n  display: block;\n  padding: 3px 20px;\n  clear: both;\n  font-weight: normal;\n  line-height: 1.42857143;\n  color: #333;\n  white-space: nowrap;\n}\n.dropdown-menu > li > a:hover,\n.dropdown-menu > li > a:focus {\n  color: #262626;\n  text-decoration: none;\n  background-color: #f5f5f5;\n}\n.dropdown-menu > .active > a,\n.dropdown-menu > .active > a:hover,\n.dropdown-menu > .active > a:focus {\n  color: #fff;\n  text-decoration: none;\n  background-color: #337ab7;\n  outline: 0;\n}\n.dropdown-menu > .disabled > a,\n.dropdown-menu > .disabled > a:hover,\n.dropdown-menu > .disabled > a:focus {\n  color: #777;\n}\n.dropdown-menu > .disabled > a:hover,\n.dropdown-menu > .disabled > a:focus {\n  text-decoration: none;\n  cursor: not-allowed;\n  background-color: transparent;\n  background-image: none;\n  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);\n}\n.open > .dropdown-menu {\n  display: block;\n}\n.open > a {\n  outline: 0;\n}\n.dropdown-menu-right {\n  right: 0;\n  left: auto;\n}\n.dropdown-menu-left {\n  right: auto;\n  left: 0;\n}\n.dropdown-header {\n  display: block;\n  padding: 3px 20px;\n  font-size: 12px;\n  line-height: 1.42857143;\n  color: #777;\n  white-space: nowrap;\n}\n.dropdown-backdrop {\n  position: fixed;\n  top: 0;\n  right: 0;\n  bottom: 0;\n  left: 0;\n  z-index: 990;\n}\n.pull-right > .dropdown-menu {\n  right: 0;\n  left: auto;\n}\n.dropup .caret,\n.navbar-fixed-bottom .dropdown .caret {\n  content: \"\";\n  border-top: 0;\n  border-bottom: 4px solid;\n}\n.dropup .dropdown-menu,\n.navbar-fixed-bottom .dropdown .dropdown-menu {\n  top: auto;\n  bottom: 100%;\n  margin-bottom: 2px;\n}\n@media (min-width: 768px) {\n  .navbar-right .dropdown-menu {\n    right: 0;\n    left: auto;\n  }\n  .navbar-right .dropdown-menu-left {\n    right: auto;\n    left: 0;\n  }\n}\n.btn-group,\n.btn-group-vertical {\n  position: relative;\n  display: inline-block;\n  vertical-align: middle;\n}\n.btn-group > .btn,\n.btn-group-vertical > .btn {\n  position: relative;\n  float: left;\n}\n.btn-group > .btn:hover,\n.btn-group-vertical > .btn:hover,\n.btn-group > .btn:focus,\n.btn-group-vertical > .btn:focus,\n.btn-group > .btn:active,\n.btn-group-vertical > .btn:active,\n.btn-group > .btn.active,\n.btn-group-vertical > .btn.active {\n  z-index: 2;\n}\n.btn-group .btn + .btn,\n.btn-group .btn + .btn-group,\n.btn-group .btn-group + .btn,\n.btn-group .btn-group + .btn-group {\n  margin-left: -1px;\n}\n.btn-toolbar {\n  margin-left: -5px;\n}\n.btn-toolbar .btn-group,\n.btn-toolbar .input-group {\n  float: left;\n}\n.btn-toolbar > .btn,\n.btn-toolbar > .btn-group,\n.btn-toolbar > .input-group {\n  margin-left: 5px;\n}\n.btn-group > .btn:not(:first-child):not(:last-child):not(.dropdown-toggle) {\n  border-radius: 0;\n}\n.btn-group > .btn:first-child {\n  margin-left: 0;\n}\n.btn-group > .btn:first-child:not(:last-child):not(.dropdown-toggle) {\n  border-top-right-radius: 0;\n  border-bottom-right-radius: 0;\n}\n.btn-group > .btn:last-child:not(:first-child),\n.btn-group > .dropdown-toggle:not(:first-child) {\n  border-top-left-radius: 0;\n  border-bottom-left-radius: 0;\n}\n.btn-group > .btn-group {\n  float: left;\n}\n.btn-group > .btn-group:not(:first-child):not(:last-child) > .btn {\n  border-radius: 0;\n}\n.btn-group > .btn-group:first-child:not(:last-child) > .btn:last-child,\n.btn-group > .btn-group:first-child:not(:last-child) > .dropdown-toggle {\n  border-top-right-radius: 0;\n  border-bottom-right-radius: 0;\n}\n.btn-group > .btn-group:last-child:not(:first-child) > .btn:first-child {\n  border-top-left-radius: 0;\n  border-bottom-left-radius: 0;\n}\n.btn-group .dropdown-toggle:active,\n.btn-group.open .dropdown-toggle {\n  outline: 0;\n}\n.btn-group > .btn + .dropdown-toggle {\n  padding-right: 8px;\n  padding-left: 8px;\n}\n.btn-group > .btn-lg + .dropdown-toggle {\n  padding-right: 12px;\n  padding-left: 12px;\n}\n.btn-group.open .dropdown-toggle {\n  -webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125);\n          box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125);\n}\n.btn-group.open .dropdown-toggle.btn-link {\n  -webkit-box-shadow: none;\n          box-shadow: none;\n}\n.btn .caret {\n  margin-left: 0;\n}\n.btn-lg .caret {\n  border-width: 5px 5px 0;\n  border-bottom-width: 0;\n}\n.dropup .btn-lg .caret {\n  border-width: 0 5px 5px;\n}\n.btn-group-vertical > .btn,\n.btn-group-vertical > .btn-group,\n.btn-group-vertical > .btn-group > .btn {\n  display: block;\n  float: none;\n  width: 100%;\n  max-width: 100%;\n}\n.btn-group-vertical > .btn-group > .btn {\n  float: none;\n}\n.btn-group-vertical > .btn + .btn,\n.btn-group-vertical > .btn + .btn-group,\n.btn-group-vertical > .btn-group + .btn,\n.btn-group-vertical > .btn-group + .btn-group {\n  margin-top: -1px;\n  margin-left: 0;\n}\n.btn-group-vertical > .btn:not(:first-child):not(:last-child) {\n  border-radius: 0;\n}\n.btn-group-vertical > .btn:first-child:not(:last-child) {\n  border-top-right-radius: 4px;\n  border-bottom-right-radius: 0;\n  border-bottom-left-radius: 0;\n}\n.btn-group-vertical > .btn:last-child:not(:first-child) {\n  border-top-left-radius: 0;\n  border-top-right-radius: 0;\n  border-bottom-left-radius: 4px;\n}\n.btn-group-vertical > .btn-group:not(:first-child):not(:last-child) > .btn {\n  border-radius: 0;\n}\n.btn-group-vertical > .btn-group:first-child:not(:last-child) > .btn:last-child,\n.btn-group-vertical > .btn-group:first-child:not(:last-child) > .dropdown-toggle {\n  border-bottom-right-radius: 0;\n  border-bottom-left-radius: 0;\n}\n.btn-group-vertical > .btn-group:last-child:not(:first-child) > .btn:first-child {\n  border-top-left-radius: 0;\n  border-top-right-radius: 0;\n}\n.btn-group-justified {\n  display: table;\n  width: 100%;\n  table-layout: fixed;\n  border-collapse: separate;\n}\n.btn-group-justified > .btn,\n.btn-group-justified > .btn-group {\n  display: table-cell;\n  float: none;\n  width: 1%;\n}\n.btn-group-justified > .btn-group .btn {\n  width: 100%;\n}\n.btn-group-justified > .btn-group .dropdown-menu {\n  left: auto;\n}\n[data-toggle=\"buttons\"] > .btn input[type=\"radio\"],\n[data-toggle=\"buttons\"] > .btn-group > .btn input[type=\"radio\"],\n[data-toggle=\"buttons\"] > .btn input[type=\"checkbox\"],\n[data-toggle=\"buttons\"] > .btn-group > .btn input[type=\"checkbox\"] {\n  position: absolute;\n  clip: rect(0, 0, 0, 0);\n  pointer-events: none;\n}\n.input-group {\n  position: relative;\n  display: table;\n  border-collapse: separate;\n}\n.input-group[class*=\"col-\"] {\n  float: none;\n  padding-right: 0;\n  padding-left: 0;\n}\n.input-group .form-control {\n  position: relative;\n  z-index: 2;\n  float: left;\n  width: 100%;\n  margin-bottom: 0;\n}\n.input-group-lg > .form-control,\n.input-group-lg > .input-group-addon,\n.input-group-lg > .input-group-btn > .btn {\n  height: 46px;\n  padding: 10px 16px;\n  font-size: 18px;\n  line-height: 1.3333333;\n  border-radius: 6px;\n}\nselect.input-group-lg > .form-control,\nselect.input-group-lg > .input-group-addon,\nselect.input-group-lg > .input-group-btn > .btn {\n  height: 46px;\n  line-height: 46px;\n}\ntextarea.input-group-lg > .form-control,\ntextarea.input-group-lg > .input-group-addon,\ntextarea.input-group-lg > .input-group-btn > .btn,\nselect[multiple].input-group-lg > .form-control,\nselect[multiple].input-group-lg > .input-group-addon,\nselect[multiple].input-group-lg > .input-group-btn > .btn {\n  height: auto;\n}\n.input-group-sm > .form-control,\n.input-group-sm > .input-group-addon,\n.input-group-sm > .input-group-btn > .btn {\n  height: 30px;\n  padding: 5px 10px;\n  font-size: 12px;\n  line-height: 1.5;\n  border-radius: 3px;\n}\nselect.input-group-sm > .form-control,\nselect.input-group-sm > .input-group-addon,\nselect.input-group-sm > .input-group-btn > .btn {\n  height: 30px;\n  line-height: 30px;\n}\ntextarea.input-group-sm > .form-control,\ntextarea.input-group-sm > .input-group-addon,\ntextarea.input-group-sm > .input-group-btn > .btn,\nselect[multiple].input-group-sm > .form-control,\nselect[multiple].input-group-sm > .input-group-addon,\nselect[multiple].input-group-sm > .input-group-btn > .btn {\n  height: auto;\n}\n.input-group-addon,\n.input-group-btn,\n.input-group .form-control {\n  display: table-cell;\n}\n.input-group-addon:not(:first-child):not(:last-child),\n.input-group-btn:not(:first-child):not(:last-child),\n.input-group .form-control:not(:first-child):not(:last-child) {\n  border-radius: 0;\n}\n.input-group-addon,\n.input-group-btn {\n  width: 1%;\n  white-space: nowrap;\n  vertical-align: middle;\n}\n.input-group-addon {\n  padding: 6px 12px;\n  font-size: 14px;\n  font-weight: normal;\n  line-height: 1;\n  color: #555;\n  text-align: center;\n  background-color: #eee;\n  border: 1px solid #ccc;\n  border-radius: 4px;\n}\n.input-group-addon.input-sm {\n  padding: 5px 10px;\n  font-size: 12px;\n  border-radius: 3px;\n}\n.input-group-addon.input-lg {\n  padding: 10px 16px;\n  font-size: 18px;\n  border-radius: 6px;\n}\n.input-group-addon input[type=\"radio\"],\n.input-group-addon input[type=\"checkbox\"] {\n  margin-top: 0;\n}\n.input-group .form-control:first-child,\n.input-group-addon:first-child,\n.input-group-btn:first-child > .btn,\n.input-group-btn:first-child > .btn-group > .btn,\n.input-group-btn:first-child > .dropdown-toggle,\n.input-group-btn:last-child > .btn:not(:last-child):not(.dropdown-toggle),\n.input-group-btn:last-child > .btn-group:not(:last-child) > .btn {\n  border-top-right-radius: 0;\n  border-bottom-right-radius: 0;\n}\n.input-group-addon:first-child {\n  border-right: 0;\n}\n.input-group .form-control:last-child,\n.input-group-addon:last-child,\n.input-group-btn:last-child > .btn,\n.input-group-btn:last-child > .btn-group > .btn,\n.input-group-btn:last-child > .dropdown-toggle,\n.input-group-btn:first-child > .btn:not(:first-child),\n.input-group-btn:first-child > .btn-group:not(:first-child) > .btn {\n  border-top-left-radius: 0;\n  border-bottom-left-radius: 0;\n}\n.input-group-addon:last-child {\n  border-left: 0;\n}\n.input-group-btn {\n  position: relative;\n  font-size: 0;\n  white-space: nowrap;\n}\n.input-group-btn > .btn {\n  position: relative;\n}\n.input-group-btn > .btn + .btn {\n  margin-left: -1px;\n}\n.input-group-btn > .btn:hover,\n.input-group-btn > .btn:focus,\n.input-group-btn > .btn:active {\n  z-index: 2;\n}\n.input-group-btn:first-child > .btn,\n.input-group-btn:first-child > .btn-group {\n  margin-right: -1px;\n}\n.input-group-btn:last-child > .btn,\n.input-group-btn:last-child > .btn-group {\n  margin-left: -1px;\n}\n.nav {\n  padding-left: 0;\n  margin-bottom: 0;\n  list-style: none;\n}\n.nav > li {\n  position: relative;\n  display: block;\n}\n.nav > li > a {\n  position: relative;\n  display: block;\n  padding: 10px 15px;\n}\n.nav > li > a:hover,\n.nav > li > a:focus {\n  text-decoration: none;\n  background-color: #eee;\n}\n.nav > li.disabled > a {\n  color: #777;\n}\n.nav > li.disabled > a:hover,\n.nav > li.disabled > a:focus {\n  color: #777;\n  text-decoration: none;\n  cursor: not-allowed;\n  background-color: transparent;\n}\n.nav .open > a,\n.nav .open > a:hover,\n.nav .open > a:focus {\n  background-color: #eee;\n  border-color: #337ab7;\n}\n.nav .nav-divider {\n  height: 1px;\n  margin: 9px 0;\n  overflow: hidden;\n  background-color: #e5e5e5;\n}\n.nav > li > a > img {\n  max-width: none;\n}\n.nav-tabs {\n  border-bottom: 1px solid #ddd;\n}\n.nav-tabs > li {\n  float: left;\n  margin-bottom: -1px;\n}\n.nav-tabs > li > a {\n  margin-right: 2px;\n  line-height: 1.42857143;\n  border: 1px solid transparent;\n  border-radius: 4px 4px 0 0;\n}\n.nav-tabs > li > a:hover {\n  border-color: #eee #eee #ddd;\n}\n.nav-tabs > li.active > a,\n.nav-tabs > li.active > a:hover,\n.nav-tabs > li.active > a:focus {\n  color: #555;\n  cursor: default;\n  background-color: #fff;\n  border: 1px solid #ddd;\n  border-bottom-color: transparent;\n}\n.nav-tabs.nav-justified {\n  width: 100%;\n  border-bottom: 0;\n}\n.nav-tabs.nav-justified > li {\n  float: none;\n}\n.nav-tabs.nav-justified > li > a {\n  margin-bottom: 5px;\n  text-align: center;\n}\n.nav-tabs.nav-justified > .dropdown .dropdown-menu {\n  top: auto;\n  left: auto;\n}\n@media (min-width: 768px) {\n  .nav-tabs.nav-justified > li {\n    display: table-cell;\n    width: 1%;\n  }\n  .nav-tabs.nav-justified > li > a {\n    margin-bottom: 0;\n  }\n}\n.nav-tabs.nav-justified > li > a {\n  margin-right: 0;\n  border-radius: 4px;\n}\n.nav-tabs.nav-justified > .active > a,\n.nav-tabs.nav-justified > .active > a:hover,\n.nav-tabs.nav-justified > .active > a:focus {\n  border: 1px solid #ddd;\n}\n@media (min-width: 768px) {\n  .nav-tabs.nav-justified > li > a {\n    border-bottom: 1px solid #ddd;\n    border-radius: 4px 4px 0 0;\n  }\n  .nav-tabs.nav-justified > .active > a,\n  .nav-tabs.nav-justified > .active > a:hover,\n  .nav-tabs.nav-justified > .active > a:focus {\n    border-bottom-color: #fff;\n  }\n}\n.nav-pills > li {\n  float: left;\n}\n.nav-pills > li > a {\n  border-radius: 4px;\n}\n.nav-pills > li + li {\n  margin-left: 2px;\n}\n.nav-pills > li.active > a,\n.nav-pills > li.active > a:hover,\n.nav-pills > li.active > a:focus {\n  color: #fff;\n  background-color: #337ab7;\n}\n.nav-stacked > li {\n  float: none;\n}\n.nav-stacked > li + li {\n  margin-top: 2px;\n  margin-left: 0;\n}\n.nav-justified {\n  width: 100%;\n}\n.nav-justified > li {\n  float: none;\n}\n.nav-justified > li > a {\n  margin-bottom: 5px;\n  text-align: center;\n}\n.nav-justified > .dropdown .dropdown-menu {\n  top: auto;\n  left: auto;\n}\n@media (min-width: 768px) {\n  .nav-justified > li {\n    display: table-cell;\n    width: 1%;\n  }\n  .nav-justified > li > a {\n    margin-bottom: 0;\n  }\n}\n.nav-tabs-justified {\n  border-bottom: 0;\n}\n.nav-tabs-justified > li > a {\n  margin-right: 0;\n  border-radius: 4px;\n}\n.nav-tabs-justified > .active > a,\n.nav-tabs-justified > .active > a:hover,\n.nav-tabs-justified > .active > a:focus {\n  border: 1px solid #ddd;\n}\n@media (min-width: 768px) {\n  .nav-tabs-justified > li > a {\n    border-bottom: 1px solid #ddd;\n    border-radius: 4px 4px 0 0;\n  }\n  .nav-tabs-justified > .active > a,\n  .nav-tabs-justified > .active > a:hover,\n  .nav-tabs-justified > .active > a:focus {\n    border-bottom-color: #fff;\n  }\n}\n.tab-content > .tab-pane {\n  display: none;\n}\n.tab-content > .active {\n  display: block;\n}\n.nav-tabs .dropdown-menu {\n  margin-top: -1px;\n  border-top-left-radius: 0;\n  border-top-right-radius: 0;\n}\n.navbar {\n  position: relative;\n  min-height: 50px;\n  margin-bottom: 20px;\n  border: 1px solid transparent;\n}\n@media (min-width: 768px) {\n  .navbar {\n    border-radius: 4px;\n  }\n}\n@media (min-width: 768px) {\n  .navbar-header {\n    float: left;\n  }\n}\n.navbar-collapse {\n  padding-right: 15px;\n  padding-left: 15px;\n  overflow-x: visible;\n  -webkit-overflow-scrolling: touch;\n  border-top: 1px solid transparent;\n  -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, .1);\n          box-shadow: inset 0 1px 0 rgba(255, 255, 255, .1);\n}\n.navbar-collapse.in {\n  overflow-y: auto;\n}\n@media (min-width: 768px) {\n  .navbar-collapse {\n    width: auto;\n    border-top: 0;\n    -webkit-box-shadow: none;\n            box-shadow: none;\n  }\n  .navbar-collapse.collapse {\n    display: block !important;\n    height: auto !important;\n    padding-bottom: 0;\n    overflow: visible !important;\n  }\n  .navbar-collapse.in {\n    overflow-y: visible;\n  }\n  .navbar-fixed-top .navbar-collapse,\n  .navbar-static-top .navbar-collapse,\n  .navbar-fixed-bottom .navbar-collapse {\n    padding-right: 0;\n    padding-left: 0;\n  }\n}\n.navbar-fixed-top .navbar-collapse,\n.navbar-fixed-bottom .navbar-collapse {\n  max-height: 340px;\n}\n@media (max-device-width: 480px) and (orientation: landscape) {\n  .navbar-fixed-top .navbar-collapse,\n  .navbar-fixed-bottom .navbar-collapse {\n    max-height: 200px;\n  }\n}\n.container > .navbar-header,\n.container-fluid > .navbar-header,\n.container > .navbar-collapse,\n.container-fluid > .navbar-collapse {\n  margin-right: -15px;\n  margin-left: -15px;\n}\n@media (min-width: 768px) {\n  .container > .navbar-header,\n  .container-fluid > .navbar-header,\n  .container > .navbar-collapse,\n  .container-fluid > .navbar-collapse {\n    margin-right: 0;\n    margin-left: 0;\n  }\n}\n.navbar-static-top {\n  z-index: 1000;\n  border-width: 0 0 1px;\n}\n@media (min-width: 768px) {\n  .navbar-static-top {\n    border-radius: 0;\n  }\n}\n.navbar-fixed-top,\n.navbar-fixed-bottom {\n  position: fixed;\n  right: 0;\n  left: 0;\n  z-index: 1030;\n}\n@media (min-width: 768px) {\n  .navbar-fixed-top,\n  .navbar-fixed-bottom {\n    border-radius: 0;\n  }\n}\n.navbar-fixed-top {\n  top: 0;\n  border-width: 0 0 1px;\n}\n.navbar-fixed-bottom {\n  bottom: 0;\n  margin-bottom: 0;\n  border-width: 1px 0 0;\n}\n.navbar-brand {\n  float: left;\n  height: 50px;\n  padding: 15px 15px;\n  font-size: 18px;\n  line-height: 20px;\n}\n.navbar-brand:hover,\n.navbar-brand:focus {\n  text-decoration: none;\n}\n.navbar-brand > img {\n  display: block;\n}\n@media (min-width: 768px) {\n  .navbar > .container .navbar-brand,\n  .navbar > .container-fluid .navbar-brand {\n    margin-left: -15px;\n  }\n}\n.navbar-toggle {\n  position: relative;\n  float: right;\n  padding: 9px 10px;\n  margin-top: 8px;\n  margin-right: 15px;\n  margin-bottom: 8px;\n  background-color: transparent;\n  background-image: none;\n  border: 1px solid transparent;\n  border-radius: 4px;\n}\n.navbar-toggle:focus {\n  outline: 0;\n}\n.navbar-toggle .icon-bar {\n  display: block;\n  width: 22px;\n  height: 2px;\n  border-radius: 1px;\n}\n.navbar-toggle .icon-bar + .icon-bar {\n  margin-top: 4px;\n}\n@media (min-width: 768px) {\n  .navbar-toggle {\n    display: none;\n  }\n}\n.navbar-nav {\n  margin: 7.5px -15px;\n}\n.navbar-nav > li > a {\n  padding-top: 10px;\n  padding-bottom: 10px;\n  line-height: 20px;\n}\n@media (max-width: 767px) {\n  .navbar-nav .open .dropdown-menu {\n    position: static;\n    float: none;\n    width: auto;\n    margin-top: 0;\n    background-color: transparent;\n    border: 0;\n    -webkit-box-shadow: none;\n            box-shadow: none;\n  }\n  .navbar-nav .open .dropdown-menu > li > a,\n  .navbar-nav .open .dropdown-menu .dropdown-header {\n    padding: 5px 15px 5px 25px;\n  }\n  .navbar-nav .open .dropdown-menu > li > a {\n    line-height: 20px;\n  }\n  .navbar-nav .open .dropdown-menu > li > a:hover,\n  .navbar-nav .open .dropdown-menu > li > a:focus {\n    background-image: none;\n  }\n}\n@media (min-width: 768px) {\n  .navbar-nav {\n    float: left;\n    margin: 0;\n  }\n  .navbar-nav > li {\n    float: left;\n  }\n  .navbar-nav > li > a {\n    padding-top: 15px;\n    padding-bottom: 15px;\n  }\n}\n.navbar-form {\n  padding: 10px 15px;\n  margin-top: 8px;\n  margin-right: -15px;\n  margin-bottom: 8px;\n  margin-left: -15px;\n  border-top: 1px solid transparent;\n  border-bottom: 1px solid transparent;\n  -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, .1), 0 1px 0 rgba(255, 255, 255, .1);\n          box-shadow: inset 0 1px 0 rgba(255, 255, 255, .1), 0 1px 0 rgba(255, 255, 255, .1);\n}\n@media (min-width: 768px) {\n  .navbar-form .form-group {\n    display: inline-block;\n    margin-bottom: 0;\n    vertical-align: middle;\n  }\n  .navbar-form .form-control {\n    display: inline-block;\n    width: auto;\n    vertical-align: middle;\n  }\n  .navbar-form .form-control-static {\n    display: inline-block;\n  }\n  .navbar-form .input-group {\n    display: inline-table;\n    vertical-align: middle;\n  }\n  .navbar-form .input-group .input-group-addon,\n  .navbar-form .input-group .input-group-btn,\n  .navbar-form .input-group .form-control {\n    width: auto;\n  }\n  .navbar-form .input-group > .form-control {\n    width: 100%;\n  }\n  .navbar-form .control-label {\n    margin-bottom: 0;\n    vertical-align: middle;\n  }\n  .navbar-form .radio,\n  .navbar-form .checkbox {\n    display: inline-block;\n    margin-top: 0;\n    margin-bottom: 0;\n    vertical-align: middle;\n  }\n  .navbar-form .radio label,\n  .navbar-form .checkbox label {\n    padding-left: 0;\n  }\n  .navbar-form .radio input[type=\"radio\"],\n  .navbar-form .checkbox input[type=\"checkbox\"] {\n    position: relative;\n    margin-left: 0;\n  }\n  .navbar-form .has-feedback .form-control-feedback {\n    top: 0;\n  }\n}\n@media (max-width: 767px) {\n  .navbar-form .form-group {\n    margin-bottom: 5px;\n  }\n  .navbar-form .form-group:last-child {\n    margin-bottom: 0;\n  }\n}\n@media (min-width: 768px) {\n  .navbar-form {\n    width: auto;\n    padding-top: 0;\n    padding-bottom: 0;\n    margin-right: 0;\n    margin-left: 0;\n    border: 0;\n    -webkit-box-shadow: none;\n            box-shadow: none;\n  }\n}\n.navbar-nav > li > .dropdown-menu {\n  margin-top: 0;\n  border-top-left-radius: 0;\n  border-top-right-radius: 0;\n}\n.navbar-fixed-bottom .navbar-nav > li > .dropdown-menu {\n  margin-bottom: 0;\n  border-top-left-radius: 4px;\n  border-top-right-radius: 4px;\n  border-bottom-right-radius: 0;\n  border-bottom-left-radius: 0;\n}\n.navbar-btn {\n  margin-top: 8px;\n  margin-bottom: 8px;\n}\n.navbar-btn.btn-sm {\n  margin-top: 10px;\n  margin-bottom: 10px;\n}\n.navbar-btn.btn-xs {\n  margin-top: 14px;\n  margin-bottom: 14px;\n}\n.navbar-text {\n  margin-top: 15px;\n  margin-bottom: 15px;\n}\n@media (min-width: 768px) {\n  .navbar-text {\n    float: left;\n    margin-right: 15px;\n    margin-left: 15px;\n  }\n}\n@media (min-width: 768px) {\n  .navbar-left {\n    float: left !important;\n  }\n  .navbar-right {\n    float: right !important;\n    margin-right: -15px;\n  }\n  .navbar-right ~ .navbar-right {\n    margin-right: 0;\n  }\n}\n.navbar-default {\n  background-color: #f8f8f8;\n  border-color: #e7e7e7;\n}\n.navbar-default .navbar-brand {\n  color: #777;\n}\n.navbar-default .navbar-brand:hover,\n.navbar-default .navbar-brand:focus {\n  color: #5e5e5e;\n  background-color: transparent;\n}\n.navbar-default .navbar-text {\n  color: #777;\n}\n.navbar-default .navbar-nav > li > a {\n  color: #777;\n}\n.navbar-default .navbar-nav > li > a:hover,\n.navbar-default .navbar-nav > li > a:focus {\n  color: #333;\n  background-color: transparent;\n}\n.navbar-default .navbar-nav > .active > a,\n.navbar-default .navbar-nav > .active > a:hover,\n.navbar-default .navbar-nav > .active > a:focus {\n  color: #555;\n  background-color: #e7e7e7;\n}\n.navbar-default .navbar-nav > .disabled > a,\n.navbar-default .navbar-nav > .disabled > a:hover,\n.navbar-default .navbar-nav > .disabled > a:focus {\n  color: #ccc;\n  background-color: transparent;\n}\n.navbar-default .navbar-toggle {\n  border-color: #ddd;\n}\n.navbar-default .navbar-toggle:hover,\n.navbar-default .navbar-toggle:focus {\n  background-color: #ddd;\n}\n.navbar-default .navbar-toggle .icon-bar {\n  background-color: #888;\n}\n.navbar-default .navbar-collapse,\n.navbar-default .navbar-form {\n  border-color: #e7e7e7;\n}\n.navbar-default .navbar-nav > .open > a,\n.navbar-default .navbar-nav > .open > a:hover,\n.navbar-default .navbar-nav > .open > a:focus {\n  color: #555;\n  background-color: #e7e7e7;\n}\n@media (max-width: 767px) {\n  .navbar-default .navbar-nav .open .dropdown-menu > li > a {\n    color: #777;\n  }\n  .navbar-default .navbar-nav .open .dropdown-menu > li > a:hover,\n  .navbar-default .navbar-nav .open .dropdown-menu > li > a:focus {\n    color: #333;\n    background-color: transparent;\n  }\n  .navbar-default .navbar-nav .open .dropdown-menu > .active > a,\n  .navbar-default .navbar-nav .open .dropdown-menu > .active > a:hover,\n  .navbar-default .navbar-nav .open .dropdown-menu > .active > a:focus {\n    color: #555;\n    background-color: #e7e7e7;\n  }\n  .navbar-default .navbar-nav .open .dropdown-menu > .disabled > a,\n  .navbar-default .navbar-nav .open .dropdown-menu > .disabled > a:hover,\n  .navbar-default .navbar-nav .open .dropdown-menu > .disabled > a:focus {\n    color: #ccc;\n    background-color: transparent;\n  }\n}\n.navbar-default .navbar-link {\n  color: #777;\n}\n.navbar-default .navbar-link:hover {\n  color: #333;\n}\n.navbar-default .btn-link {\n  color: #777;\n}\n.navbar-default .btn-link:hover,\n.navbar-default .btn-link:focus {\n  color: #333;\n}\n.navbar-default .btn-link[disabled]:hover,\nfieldset[disabled] .navbar-default .btn-link:hover,\n.navbar-default .btn-link[disabled]:focus,\nfieldset[disabled] .navbar-default .btn-link:focus {\n  color: #ccc;\n}\n.navbar-inverse {\n  background-color: #222;\n  border-color: #080808;\n}\n.navbar-inverse .navbar-brand {\n  color: #9d9d9d;\n}\n.navbar-inverse .navbar-brand:hover,\n.navbar-inverse .navbar-brand:focus {\n  color: #fff;\n  background-color: transparent;\n}\n.navbar-inverse .navbar-text {\n  color: #9d9d9d;\n}\n.navbar-inverse .navbar-nav > li > a {\n  color: #9d9d9d;\n}\n.navbar-inverse .navbar-nav > li > a:hover,\n.navbar-inverse .navbar-nav > li > a:focus {\n  color: #fff;\n  background-color: transparent;\n}\n.navbar-inverse .navbar-nav > .active > a,\n.navbar-inverse .navbar-nav > .active > a:hover,\n.navbar-inverse .navbar-nav > .active > a:focus {\n  color: #fff;\n  background-color: #080808;\n}\n.navbar-inverse .navbar-nav > .disabled > a,\n.navbar-inverse .navbar-nav > .disabled > a:hover,\n.navbar-inverse .navbar-nav > .disabled > a:focus {\n  color: #444;\n  background-color: transparent;\n}\n.navbar-inverse .navbar-toggle {\n  border-color: #333;\n}\n.navbar-inverse .navbar-toggle:hover,\n.navbar-inverse .navbar-toggle:focus {\n  background-color: #333;\n}\n.navbar-inverse .navbar-toggle .icon-bar {\n  background-color: #fff;\n}\n.navbar-inverse .navbar-collapse,\n.navbar-inverse .navbar-form {\n  border-color: #101010;\n}\n.navbar-inverse .navbar-nav > .open > a,\n.navbar-inverse .navbar-nav > .open > a:hover,\n.navbar-inverse .navbar-nav > .open > a:focus {\n  color: #fff;\n  background-color: #080808;\n}\n@media (max-width: 767px) {\n  .navbar-inverse .navbar-nav .open .dropdown-menu > .dropdown-header {\n    border-color: #080808;\n  }\n  .navbar-inverse .navbar-nav .open .dropdown-menu .divider {\n    background-color: #080808;\n  }\n  .navbar-inverse .navbar-nav .open .dropdown-menu > li > a {\n    color: #9d9d9d;\n  }\n  .navbar-inverse .navbar-nav .open .dropdown-menu > li > a:hover,\n  .navbar-inverse .navbar-nav .open .dropdown-menu > li > a:focus {\n    color: #fff;\n    background-color: transparent;\n  }\n  .navbar-inverse .navbar-nav .open .dropdown-menu > .active > a,\n  .navbar-inverse .navbar-nav .open .dropdown-menu > .active > a:hover,\n  .navbar-inverse .navbar-nav .open .dropdown-menu > .active > a:focus {\n    color: #fff;\n    background-color: #080808;\n  }\n  .navbar-inverse .navbar-nav .open .dropdown-menu > .disabled > a,\n  .navbar-inverse .navbar-nav .open .dropdown-menu > .disabled > a:hover,\n  .navbar-inverse .navbar-nav .open .dropdown-menu > .disabled > a:focus {\n    color: #444;\n    background-color: transparent;\n  }\n}\n.navbar-inverse .navbar-link {\n  color: #9d9d9d;\n}\n.navbar-inverse .navbar-link:hover {\n  color: #fff;\n}\n.navbar-inverse .btn-link {\n  color: #9d9d9d;\n}\n.navbar-inverse .btn-link:hover,\n.navbar-inverse .btn-link:focus {\n  color: #fff;\n}\n.navbar-inverse .btn-link[disabled]:hover,\nfieldset[disabled] .navbar-inverse .btn-link:hover,\n.navbar-inverse .btn-link[disabled]:focus,\nfieldset[disabled] .navbar-inverse .btn-link:focus {\n  color: #444;\n}\n.breadcrumb {\n  padding: 8px 15px;\n  margin-bottom: 20px;\n  list-style: none;\n  background-color: #f5f5f5;\n  border-radius: 4px;\n}\n.breadcrumb > li {\n  display: inline-block;\n}\n.breadcrumb > li + li:before {\n  padding: 0 5px;\n  color: #ccc;\n  content: \"/\\00a0\";\n}\n.breadcrumb > .active {\n  color: #777;\n}\n.pagination {\n  display: inline-block;\n  padding-left: 0;\n  margin: 20px 0;\n  border-radius: 4px;\n}\n.pagination > li {\n  display: inline;\n}\n.pagination > li > a,\n.pagination > li > span {\n  position: relative;\n  float: left;\n  padding: 6px 12px;\n  margin-left: -1px;\n  line-height: 1.42857143;\n  color: #337ab7;\n  text-decoration: none;\n  background-color: #fff;\n  border: 1px solid #ddd;\n}\n.pagination > li:first-child > a,\n.pagination > li:first-child > span {\n  margin-left: 0;\n  border-top-left-radius: 4px;\n  border-bottom-left-radius: 4px;\n}\n.pagination > li:last-child > a,\n.pagination > li:last-child > span {\n  border-top-right-radius: 4px;\n  border-bottom-right-radius: 4px;\n}\n.pagination > li > a:hover,\n.pagination > li > span:hover,\n.pagination > li > a:focus,\n.pagination > li > span:focus {\n  color: #23527c;\n  background-color: #eee;\n  border-color: #ddd;\n}\n.pagination > .active > a,\n.pagination > .active > span,\n.pagination > .active > a:hover,\n.pagination > .active > span:hover,\n.pagination > .active > a:focus,\n.pagination > .active > span:focus {\n  z-index: 2;\n  color: #fff;\n  cursor: default;\n  background-color: #337ab7;\n  border-color: #337ab7;\n}\n.pagination > .disabled > span,\n.pagination > .disabled > span:hover,\n.pagination > .disabled > span:focus,\n.pagination > .disabled > a,\n.pagination > .disabled > a:hover,\n.pagination > .disabled > a:focus {\n  color: #777;\n  cursor: not-allowed;\n  background-color: #fff;\n  border-color: #ddd;\n}\n.pagination-lg > li > a,\n.pagination-lg > li > span {\n  padding: 10px 16px;\n  font-size: 18px;\n}\n.pagination-lg > li:first-child > a,\n.pagination-lg > li:first-child > span {\n  border-top-left-radius: 6px;\n  border-bottom-left-radius: 6px;\n}\n.pagination-lg > li:last-child > a,\n.pagination-lg > li:last-child > span {\n  border-top-right-radius: 6px;\n  border-bottom-right-radius: 6px;\n}\n.pagination-sm > li > a,\n.pagination-sm > li > span {\n  padding: 5px 10px;\n  font-size: 12px;\n}\n.pagination-sm > li:first-child > a,\n.pagination-sm > li:first-child > span {\n  border-top-left-radius: 3px;\n  border-bottom-left-radius: 3px;\n}\n.pagination-sm > li:last-child > a,\n.pagination-sm > li:last-child > span {\n  border-top-right-radius: 3px;\n  border-bottom-right-radius: 3px;\n}\n.pager {\n  padding-left: 0;\n  margin: 20px 0;\n  text-align: center;\n  list-style: none;\n}\n.pager li {\n  display: inline;\n}\n.pager li > a,\n.pager li > span {\n  display: inline-block;\n  padding: 5px 14px;\n  background-color: #fff;\n  border: 1px solid #ddd;\n  border-radius: 15px;\n}\n.pager li > a:hover,\n.pager li > a:focus {\n  text-decoration: none;\n  background-color: #eee;\n}\n.pager .next > a,\n.pager .next > span {\n  float: right;\n}\n.pager .previous > a,\n.pager .previous > span {\n  float: left;\n}\n.pager .disabled > a,\n.pager .disabled > a:hover,\n.pager .disabled > a:focus,\n.pager .disabled > span {\n  color: #777;\n  cursor: not-allowed;\n  background-color: #fff;\n}\n.label {\n  display: inline;\n  padding: .2em .6em .3em;\n  font-size: 75%;\n  font-weight: bold;\n  line-height: 1;\n  color: #fff;\n  text-align: center;\n  white-space: nowrap;\n  vertical-align: baseline;\n  border-radius: .25em;\n}\na.label:hover,\na.label:focus {\n  color: #fff;\n  text-decoration: none;\n  cursor: pointer;\n}\n.label:empty {\n  display: none;\n}\n.btn .label {\n  position: relative;\n  top: -1px;\n}\n.label-default {\n  background-color: #777;\n}\n.label-default[href]:hover,\n.label-default[href]:focus {\n  background-color: #5e5e5e;\n}\n.label-primary {\n  background-color: #337ab7;\n}\n.label-primary[href]:hover,\n.label-primary[href]:focus {\n  background-color: #286090;\n}\n.label-success {\n  background-color: #5cb85c;\n}\n.label-success[href]:hover,\n.label-success[href]:focus {\n  background-color: #449d44;\n}\n.label-info {\n  background-color: #5bc0de;\n}\n.label-info[href]:hover,\n.label-info[href]:focus {\n  background-color: #31b0d5;\n}\n.label-warning {\n  background-color: #f0ad4e;\n}\n.label-warning[href]:hover,\n.label-warning[href]:focus {\n  background-color: #ec971f;\n}\n.label-danger {\n  background-color: #d9534f;\n}\n.label-danger[href]:hover,\n.label-danger[href]:focus {\n  background-color: #c9302c;\n}\n.badge {\n  display: inline-block;\n  min-width: 10px;\n  padding: 3px 7px;\n  font-size: 12px;\n  font-weight: bold;\n  line-height: 1;\n  color: #fff;\n  text-align: center;\n  white-space: nowrap;\n  vertical-align: baseline;\n  background-color: #777;\n  border-radius: 10px;\n}\n.badge:empty {\n  display: none;\n}\n.btn .badge {\n  position: relative;\n  top: -1px;\n}\n.btn-xs .badge,\n.btn-group-xs > .btn .badge {\n  top: 0;\n  padding: 1px 5px;\n}\na.badge:hover,\na.badge:focus {\n  color: #fff;\n  text-decoration: none;\n  cursor: pointer;\n}\n.list-group-item.active > .badge,\n.nav-pills > .active > a > .badge {\n  color: #337ab7;\n  background-color: #fff;\n}\n.list-group-item > .badge {\n  float: right;\n}\n.list-group-item > .badge + .badge {\n  margin-right: 5px;\n}\n.nav-pills > li > a > .badge {\n  margin-left: 3px;\n}\n.jumbotron {\n  padding: 30px 15px;\n  margin-bottom: 30px;\n  color: inherit;\n  background-color: #eee;\n}\n.jumbotron h1,\n.jumbotron .h1 {\n  color: inherit;\n}\n.jumbotron p {\n  margin-bottom: 15px;\n  font-size: 21px;\n  font-weight: 200;\n}\n.jumbotron > hr {\n  border-top-color: #d5d5d5;\n}\n.container .jumbotron,\n.container-fluid .jumbotron {\n  border-radius: 6px;\n}\n.jumbotron .container {\n  max-width: 100%;\n}\n@media screen and (min-width: 768px) {\n  .jumbotron {\n    padding: 48px 0;\n  }\n  .container .jumbotron,\n  .container-fluid .jumbotron {\n    padding-right: 60px;\n    padding-left: 60px;\n  }\n  .jumbotron h1,\n  .jumbotron .h1 {\n    font-size: 63px;\n  }\n}\n.thumbnail {\n  display: block;\n  padding: 4px;\n  margin-bottom: 20px;\n  line-height: 1.42857143;\n  background-color: #fff;\n  border: 1px solid #ddd;\n  border-radius: 4px;\n  -webkit-transition: border .2s ease-in-out;\n       -o-transition: border .2s ease-in-out;\n          transition: border .2s ease-in-out;\n}\n.thumbnail > img,\n.thumbnail a > img {\n  margin-right: auto;\n  margin-left: auto;\n}\na.thumbnail:hover,\na.thumbnail:focus,\na.thumbnail.active {\n  border-color: #337ab7;\n}\n.thumbnail .caption {\n  padding: 9px;\n  color: #333;\n}\n.alert {\n  padding: 15px;\n  margin-bottom: 20px;\n  border: 1px solid transparent;\n  border-radius: 4px;\n}\n.alert h4 {\n  margin-top: 0;\n  color: inherit;\n}\n.alert .alert-link {\n  font-weight: bold;\n}\n.alert > p,\n.alert > ul {\n  margin-bottom: 0;\n}\n.alert > p + p {\n  margin-top: 5px;\n}\n.alert-dismissable,\n.alert-dismissible {\n  padding-right: 35px;\n}\n.alert-dismissable .close,\n.alert-dismissible .close {\n  position: relative;\n  top: -2px;\n  right: -21px;\n  color: inherit;\n}\n.alert-success {\n  color: #3c763d;\n  background-color: #dff0d8;\n  border-color: #d6e9c6;\n}\n.alert-success hr {\n  border-top-color: #c9e2b3;\n}\n.alert-success .alert-link {\n  color: #2b542c;\n}\n.alert-info {\n  color: #31708f;\n  background-color: #d9edf7;\n  border-color: #bce8f1;\n}\n.alert-info hr {\n  border-top-color: #a6e1ec;\n}\n.alert-info .alert-link {\n  color: #245269;\n}\n.alert-warning {\n  color: #8a6d3b;\n  background-color: #fcf8e3;\n  border-color: #faebcc;\n}\n.alert-warning hr {\n  border-top-color: #f7e1b5;\n}\n.alert-warning .alert-link {\n  color: #66512c;\n}\n.alert-danger {\n  color: #a94442;\n  background-color: #f2dede;\n  border-color: #ebccd1;\n}\n.alert-danger hr {\n  border-top-color: #e4b9c0;\n}\n.alert-danger .alert-link {\n  color: #843534;\n}\n@-webkit-keyframes progress-bar-stripes {\n  from {\n    background-position: 40px 0;\n  }\n  to {\n    background-position: 0 0;\n  }\n}\n@-o-keyframes progress-bar-stripes {\n  from {\n    background-position: 40px 0;\n  }\n  to {\n    background-position: 0 0;\n  }\n}\n@keyframes progress-bar-stripes {\n  from {\n    background-position: 40px 0;\n  }\n  to {\n    background-position: 0 0;\n  }\n}\n.progress {\n  height: 20px;\n  margin-bottom: 20px;\n  overflow: hidden;\n  background-color: #f5f5f5;\n  border-radius: 4px;\n  -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, .1);\n          box-shadow: inset 0 1px 2px rgba(0, 0, 0, .1);\n}\n.progress-bar {\n  float: left;\n  width: 0;\n  height: 100%;\n  font-size: 12px;\n  line-height: 20px;\n  color: #fff;\n  text-align: center;\n  background-color: #337ab7;\n  -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, .15);\n          box-shadow: inset 0 -1px 0 rgba(0, 0, 0, .15);\n  -webkit-transition: width .6s ease;\n       -o-transition: width .6s ease;\n          transition: width .6s ease;\n}\n.progress-striped .progress-bar,\n.progress-bar-striped {\n  background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);\n  background-image:      -o-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);\n  background-image:         linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);\n  -webkit-background-size: 40px 40px;\n          background-size: 40px 40px;\n}\n.progress.active .progress-bar,\n.progress-bar.active {\n  -webkit-animation: progress-bar-stripes 2s linear infinite;\n       -o-animation: progress-bar-stripes 2s linear infinite;\n          animation: progress-bar-stripes 2s linear infinite;\n}\n.progress-bar-success {\n  background-color: #5cb85c;\n}\n.progress-striped .progress-bar-success {\n  background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);\n  background-image:      -o-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);\n  background-image:         linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);\n}\n.progress-bar-info {\n  background-color: #5bc0de;\n}\n.progress-striped .progress-bar-info {\n  background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);\n  background-image:      -o-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);\n  background-image:         linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);\n}\n.progress-bar-warning {\n  background-color: #f0ad4e;\n}\n.progress-striped .progress-bar-warning {\n  background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);\n  background-image:      -o-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);\n  background-image:         linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);\n}\n.progress-bar-danger {\n  background-color: #d9534f;\n}\n.progress-striped .progress-bar-danger {\n  background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);\n  background-image:      -o-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);\n  background-image:         linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);\n}\n.media {\n  margin-top: 15px;\n}\n.media:first-child {\n  margin-top: 0;\n}\n.media,\n.media-body {\n  overflow: hidden;\n  zoom: 1;\n}\n.media-body {\n  width: 10000px;\n}\n.media-object {\n  display: block;\n}\n.media-right,\n.media > .pull-right {\n  padding-left: 10px;\n}\n.media-left,\n.media > .pull-left {\n  padding-right: 10px;\n}\n.media-left,\n.media-right,\n.media-body {\n  display: table-cell;\n  vertical-align: top;\n}\n.media-middle {\n  vertical-align: middle;\n}\n.media-bottom {\n  vertical-align: bottom;\n}\n.media-heading {\n  margin-top: 0;\n  margin-bottom: 5px;\n}\n.media-list {\n  padding-left: 0;\n  list-style: none;\n}\n.list-group {\n  padding-left: 0;\n  margin-bottom: 20px;\n}\n.list-group-item {\n  position: relative;\n  display: block;\n  padding: 10px 15px;\n  margin-bottom: -1px;\n  background-color: #fff;\n  border: 1px solid #ddd;\n}\n.list-group-item:first-child {\n  border-top-left-radius: 4px;\n  border-top-right-radius: 4px;\n}\n.list-group-item:last-child {\n  margin-bottom: 0;\n  border-bottom-right-radius: 4px;\n  border-bottom-left-radius: 4px;\n}\na.list-group-item {\n  color: #555;\n}\na.list-group-item .list-group-item-heading {\n  color: #333;\n}\na.list-group-item:hover,\na.list-group-item:focus {\n  color: #555;\n  text-decoration: none;\n  background-color: #f5f5f5;\n}\n.list-group-item.disabled,\n.list-group-item.disabled:hover,\n.list-group-item.disabled:focus {\n  color: #777;\n  cursor: not-allowed;\n  background-color: #eee;\n}\n.list-group-item.disabled .list-group-item-heading,\n.list-group-item.disabled:hover .list-group-item-heading,\n.list-group-item.disabled:focus .list-group-item-heading {\n  color: inherit;\n}\n.list-group-item.disabled .list-group-item-text,\n.list-group-item.disabled:hover .list-group-item-text,\n.list-group-item.disabled:focus .list-group-item-text {\n  color: #777;\n}\n.list-group-item.active,\n.list-group-item.active:hover,\n.list-group-item.active:focus {\n  z-index: 2;\n  color: #fff;\n  background-color: #337ab7;\n  border-color: #337ab7;\n}\n.list-group-item.active .list-group-item-heading,\n.list-group-item.active:hover .list-group-item-heading,\n.list-group-item.active:focus .list-group-item-heading,\n.list-group-item.active .list-group-item-heading > small,\n.list-group-item.active:hover .list-group-item-heading > small,\n.list-group-item.active:focus .list-group-item-heading > small,\n.list-group-item.active .list-group-item-heading > .small,\n.list-group-item.active:hover .list-group-item-heading > .small,\n.list-group-item.active:focus .list-group-item-heading > .small {\n  color: inherit;\n}\n.list-group-item.active .list-group-item-text,\n.list-group-item.active:hover .list-group-item-text,\n.list-group-item.active:focus .list-group-item-text {\n  color: #c7ddef;\n}\n.list-group-item-success {\n  color: #3c763d;\n  background-color: #dff0d8;\n}\na.list-group-item-success {\n  color: #3c763d;\n}\na.list-group-item-success .list-group-item-heading {\n  color: inherit;\n}\na.list-group-item-success:hover,\na.list-group-item-success:focus {\n  color: #3c763d;\n  background-color: #d0e9c6;\n}\na.list-group-item-success.active,\na.list-group-item-success.active:hover,\na.list-group-item-success.active:focus {\n  color: #fff;\n  background-color: #3c763d;\n  border-color: #3c763d;\n}\n.list-group-item-info {\n  color: #31708f;\n  background-color: #d9edf7;\n}\na.list-group-item-info {\n  color: #31708f;\n}\na.list-group-item-info .list-group-item-heading {\n  color: inherit;\n}\na.list-group-item-info:hover,\na.list-group-item-info:focus {\n  color: #31708f;\n  background-color: #c4e3f3;\n}\na.list-group-item-info.active,\na.list-group-item-info.active:hover,\na.list-group-item-info.active:focus {\n  color: #fff;\n  background-color: #31708f;\n  border-color: #31708f;\n}\n.list-group-item-warning {\n  color: #8a6d3b;\n  background-color: #fcf8e3;\n}\na.list-group-item-warning {\n  color: #8a6d3b;\n}\na.list-group-item-warning .list-group-item-heading {\n  color: inherit;\n}\na.list-group-item-warning:hover,\na.list-group-item-warning:focus {\n  color: #8a6d3b;\n  background-color: #faf2cc;\n}\na.list-group-item-warning.active,\na.list-group-item-warning.active:hover,\na.list-group-item-warning.active:focus {\n  color: #fff;\n  background-color: #8a6d3b;\n  border-color: #8a6d3b;\n}\n.list-group-item-danger {\n  color: #a94442;\n  background-color: #f2dede;\n}\na.list-group-item-danger {\n  color: #a94442;\n}\na.list-group-item-danger .list-group-item-heading {\n  color: inherit;\n}\na.list-group-item-danger:hover,\na.list-group-item-danger:focus {\n  color: #a94442;\n  background-color: #ebcccc;\n}\na.list-group-item-danger.active,\na.list-group-item-danger.active:hover,\na.list-group-item-danger.active:focus {\n  color: #fff;\n  background-color: #a94442;\n  border-color: #a94442;\n}\n.list-group-item-heading {\n  margin-top: 0;\n  margin-bottom: 5px;\n}\n.list-group-item-text {\n  margin-bottom: 0;\n  line-height: 1.3;\n}\n.panel {\n  margin-bottom: 20px;\n  background-color: #fff;\n  border: 1px solid transparent;\n  border-radius: 4px;\n  -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, .05);\n          box-shadow: 0 1px 1px rgba(0, 0, 0, .05);\n}\n.panel-body {\n  padding: 15px;\n}\n.panel-heading {\n  padding: 10px 15px;\n  border-bottom: 1px solid transparent;\n  border-top-left-radius: 3px;\n  border-top-right-radius: 3px;\n}\n.panel-heading > .dropdown .dropdown-toggle {\n  color: inherit;\n}\n.panel-title {\n  margin-top: 0;\n  margin-bottom: 0;\n  font-size: 16px;\n  color: inherit;\n}\n.panel-title > a,\n.panel-title > small,\n.panel-title > .small,\n.panel-title > small > a,\n.panel-title > .small > a {\n  color: inherit;\n}\n.panel-footer {\n  padding: 10px 15px;\n  background-color: #f5f5f5;\n  border-top: 1px solid #ddd;\n  border-bottom-right-radius: 3px;\n  border-bottom-left-radius: 3px;\n}\n.panel > .list-group,\n.panel > .panel-collapse > .list-group {\n  margin-bottom: 0;\n}\n.panel > .list-group .list-group-item,\n.panel > .panel-collapse > .list-group .list-group-item {\n  border-width: 1px 0;\n  border-radius: 0;\n}\n.panel > .list-group:first-child .list-group-item:first-child,\n.panel > .panel-collapse > .list-group:first-child .list-group-item:first-child {\n  border-top: 0;\n  border-top-left-radius: 3px;\n  border-top-right-radius: 3px;\n}\n.panel > .list-group:last-child .list-group-item:last-child,\n.panel > .panel-collapse > .list-group:last-child .list-group-item:last-child {\n  border-bottom: 0;\n  border-bottom-right-radius: 3px;\n  border-bottom-left-radius: 3px;\n}\n.panel-heading + .list-group .list-group-item:first-child {\n  border-top-width: 0;\n}\n.list-group + .panel-footer {\n  border-top-width: 0;\n}\n.panel > .table,\n.panel > .table-responsive > .table,\n.panel > .panel-collapse > .table {\n  margin-bottom: 0;\n}\n.panel > .table caption,\n.panel > .table-responsive > .table caption,\n.panel > .panel-collapse > .table caption {\n  padding-right: 15px;\n  padding-left: 15px;\n}\n.panel > .table:first-child,\n.panel > .table-responsive:first-child > .table:first-child {\n  border-top-left-radius: 3px;\n  border-top-right-radius: 3px;\n}\n.panel > .table:first-child > thead:first-child > tr:first-child,\n.panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child,\n.panel > .table:first-child > tbody:first-child > tr:first-child,\n.panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child {\n  border-top-left-radius: 3px;\n  border-top-right-radius: 3px;\n}\n.panel > .table:first-child > thead:first-child > tr:first-child td:first-child,\n.panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child td:first-child,\n.panel > .table:first-child > tbody:first-child > tr:first-child td:first-child,\n.panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child td:first-child,\n.panel > .table:first-child > thead:first-child > tr:first-child th:first-child,\n.panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child th:first-child,\n.panel > .table:first-child > tbody:first-child > tr:first-child th:first-child,\n.panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child th:first-child {\n  border-top-left-radius: 3px;\n}\n.panel > .table:first-child > thead:first-child > tr:first-child td:last-child,\n.panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child td:last-child,\n.panel > .table:first-child > tbody:first-child > tr:first-child td:last-child,\n.panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child td:last-child,\n.panel > .table:first-child > thead:first-child > tr:first-child th:last-child,\n.panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child th:last-child,\n.panel > .table:first-child > tbody:first-child > tr:first-child th:last-child,\n.panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child th:last-child {\n  border-top-right-radius: 3px;\n}\n.panel > .table:last-child,\n.panel > .table-responsive:last-child > .table:last-child {\n  border-bottom-right-radius: 3px;\n  border-bottom-left-radius: 3px;\n}\n.panel > .table:last-child > tbody:last-child > tr:last-child,\n.panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child,\n.panel > .table:last-child > tfoot:last-child > tr:last-child,\n.panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child {\n  border-bottom-right-radius: 3px;\n  border-bottom-left-radius: 3px;\n}\n.panel > .table:last-child > tbody:last-child > tr:last-child td:first-child,\n.panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child td:first-child,\n.panel > .table:last-child > tfoot:last-child > tr:last-child td:first-child,\n.panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child td:first-child,\n.panel > .table:last-child > tbody:last-child > tr:last-child th:first-child,\n.panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child th:first-child,\n.panel > .table:last-child > tfoot:last-child > tr:last-child th:first-child,\n.panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child th:first-child {\n  border-bottom-left-radius: 3px;\n}\n.panel > .table:last-child > tbody:last-child > tr:last-child td:last-child,\n.panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child td:last-child,\n.panel > .table:last-child > tfoot:last-child > tr:last-child td:last-child,\n.panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child td:last-child,\n.panel > .table:last-child > tbody:last-child > tr:last-child th:last-child,\n.panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child th:last-child,\n.panel > .table:last-child > tfoot:last-child > tr:last-child th:last-child,\n.panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child th:last-child {\n  border-bottom-right-radius: 3px;\n}\n.panel > .panel-body + .table,\n.panel > .panel-body + .table-responsive,\n.panel > .table + .panel-body,\n.panel > .table-responsive + .panel-body {\n  border-top: 1px solid #ddd;\n}\n.panel > .table > tbody:first-child > tr:first-child th,\n.panel > .table > tbody:first-child > tr:first-child td {\n  border-top: 0;\n}\n.panel > .table-bordered,\n.panel > .table-responsive > .table-bordered {\n  border: 0;\n}\n.panel > .table-bordered > thead > tr > th:first-child,\n.panel > .table-responsive > .table-bordered > thead > tr > th:first-child,\n.panel > .table-bordered > tbody > tr > th:first-child,\n.panel > .table-responsive > .table-bordered > tbody > tr > th:first-child,\n.panel > .table-bordered > tfoot > tr > th:first-child,\n.panel > .table-responsive > .table-bordered > tfoot > tr > th:first-child,\n.panel > .table-bordered > thead > tr > td:first-child,\n.panel > .table-responsive > .table-bordered > thead > tr > td:first-child,\n.panel > .table-bordered > tbody > tr > td:first-child,\n.panel > .table-responsive > .table-bordered > tbody > tr > td:first-child,\n.panel > .table-bordered > tfoot > tr > td:first-child,\n.panel > .table-responsive > .table-bordered > tfoot > tr > td:first-child {\n  border-left: 0;\n}\n.panel > .table-bordered > thead > tr > th:last-child,\n.panel > .table-responsive > .table-bordered > thead > tr > th:last-child,\n.panel > .table-bordered > tbody > tr > th:last-child,\n.panel > .table-responsive > .table-bordered > tbody > tr > th:last-child,\n.panel > .table-bordered > tfoot > tr > th:last-child,\n.panel > .table-responsive > .table-bordered > tfoot > tr > th:last-child,\n.panel > .table-bordered > thead > tr > td:last-child,\n.panel > .table-responsive > .table-bordered > thead > tr > td:last-child,\n.panel > .table-bordered > tbody > tr > td:last-child,\n.panel > .table-responsive > .table-bordered > tbody > tr > td:last-child,\n.panel > .table-bordered > tfoot > tr > td:last-child,\n.panel > .table-responsive > .table-bordered > tfoot > tr > td:last-child {\n  border-right: 0;\n}\n.panel > .table-bordered > thead > tr:first-child > td,\n.panel > .table-responsive > .table-bordered > thead > tr:first-child > td,\n.panel > .table-bordered > tbody > tr:first-child > td,\n.panel > .table-responsive > .table-bordered > tbody > tr:first-child > td,\n.panel > .table-bordered > thead > tr:first-child > th,\n.panel > .table-responsive > .table-bordered > thead > tr:first-child > th,\n.panel > .table-bordered > tbody > tr:first-child > th,\n.panel > .table-responsive > .table-bordered > tbody > tr:first-child > th {\n  border-bottom: 0;\n}\n.panel > .table-bordered > tbody > tr:last-child > td,\n.panel > .table-responsive > .table-bordered > tbody > tr:last-child > td,\n.panel > .table-bordered > tfoot > tr:last-child > td,\n.panel > .table-responsive > .table-bordered > tfoot > tr:last-child > td,\n.panel > .table-bordered > tbody > tr:last-child > th,\n.panel > .table-responsive > .table-bordered > tbody > tr:last-child > th,\n.panel > .table-bordered > tfoot > tr:last-child > th,\n.panel > .table-responsive > .table-bordered > tfoot > tr:last-child > th {\n  border-bottom: 0;\n}\n.panel > .table-responsive {\n  margin-bottom: 0;\n  border: 0;\n}\n.panel-group {\n  margin-bottom: 20px;\n}\n.panel-group .panel {\n  margin-bottom: 0;\n  border-radius: 4px;\n}\n.panel-group .panel + .panel {\n  margin-top: 5px;\n}\n.panel-group .panel-heading {\n  border-bottom: 0;\n}\n.panel-group .panel-heading + .panel-collapse > .panel-body,\n.panel-group .panel-heading + .panel-collapse > .list-group {\n  border-top: 1px solid #ddd;\n}\n.panel-group .panel-footer {\n  border-top: 0;\n}\n.panel-group .panel-footer + .panel-collapse .panel-body {\n  border-bottom: 1px solid #ddd;\n}\n.panel-default {\n  border-color: #ddd;\n}\n.panel-default > .panel-heading {\n  color: #333;\n  background-color: #f5f5f5;\n  border-color: #ddd;\n}\n.panel-default > .panel-heading + .panel-collapse > .panel-body {\n  border-top-color: #ddd;\n}\n.panel-default > .panel-heading .badge {\n  color: #f5f5f5;\n  background-color: #333;\n}\n.panel-default > .panel-footer + .panel-collapse > .panel-body {\n  border-bottom-color: #ddd;\n}\n.panel-primary {\n  border-color: #337ab7;\n}\n.panel-primary > .panel-heading {\n  color: #fff;\n  background-color: #337ab7;\n  border-color: #337ab7;\n}\n.panel-primary > .panel-heading + .panel-collapse > .panel-body {\n  border-top-color: #337ab7;\n}\n.panel-primary > .panel-heading .badge {\n  color: #337ab7;\n  background-color: #fff;\n}\n.panel-primary > .panel-footer + .panel-collapse > .panel-body {\n  border-bottom-color: #337ab7;\n}\n.panel-success {\n  border-color: #d6e9c6;\n}\n.panel-success > .panel-heading {\n  color: #3c763d;\n  background-color: #dff0d8;\n  border-color: #d6e9c6;\n}\n.panel-success > .panel-heading + .panel-collapse > .panel-body {\n  border-top-color: #d6e9c6;\n}\n.panel-success > .panel-heading .badge {\n  color: #dff0d8;\n  background-color: #3c763d;\n}\n.panel-success > .panel-footer + .panel-collapse > .panel-body {\n  border-bottom-color: #d6e9c6;\n}\n.panel-info {\n  border-color: #bce8f1;\n}\n.panel-info > .panel-heading {\n  color: #31708f;\n  background-color: #d9edf7;\n  border-color: #bce8f1;\n}\n.panel-info > .panel-heading + .panel-collapse > .panel-body {\n  border-top-color: #bce8f1;\n}\n.panel-info > .panel-heading .badge {\n  color: #d9edf7;\n  background-color: #31708f;\n}\n.panel-info > .panel-footer + .panel-collapse > .panel-body {\n  border-bottom-color: #bce8f1;\n}\n.panel-warning {\n  border-color: #faebcc;\n}\n.panel-warning > .panel-heading {\n  color: #8a6d3b;\n  background-color: #fcf8e3;\n  border-color: #faebcc;\n}\n.panel-warning > .panel-heading + .panel-collapse > .panel-body {\n  border-top-color: #faebcc;\n}\n.panel-warning > .panel-heading .badge {\n  color: #fcf8e3;\n  background-color: #8a6d3b;\n}\n.panel-warning > .panel-footer + .panel-collapse > .panel-body {\n  border-bottom-color: #faebcc;\n}\n.panel-danger {\n  border-color: #ebccd1;\n}\n.panel-danger > .panel-heading {\n  color: #a94442;\n  background-color: #f2dede;\n  border-color: #ebccd1;\n}\n.panel-danger > .panel-heading + .panel-collapse > .panel-body {\n  border-top-color: #ebccd1;\n}\n.panel-danger > .panel-heading .badge {\n  color: #f2dede;\n  background-color: #a94442;\n}\n.panel-danger > .panel-footer + .panel-collapse > .panel-body {\n  border-bottom-color: #ebccd1;\n}\n.embed-responsive {\n  position: relative;\n  display: block;\n  height: 0;\n  padding: 0;\n  overflow: hidden;\n}\n.embed-responsive .embed-responsive-item,\n.embed-responsive iframe,\n.embed-responsive embed,\n.embed-responsive object,\n.embed-responsive video {\n  position: absolute;\n  top: 0;\n  bottom: 0;\n  left: 0;\n  width: 100%;\n  height: 100%;\n  border: 0;\n}\n.embed-responsive-16by9 {\n  padding-bottom: 56.25%;\n}\n.embed-responsive-4by3 {\n  padding-bottom: 75%;\n}\n.well {\n  min-height: 20px;\n  padding: 19px;\n  margin-bottom: 20px;\n  background-color: #f5f5f5;\n  border: 1px solid #e3e3e3;\n  border-radius: 4px;\n  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .05);\n          box-shadow: inset 0 1px 1px rgba(0, 0, 0, .05);\n}\n.well blockquote {\n  border-color: #ddd;\n  border-color: rgba(0, 0, 0, .15);\n}\n.well-lg {\n  padding: 24px;\n  border-radius: 6px;\n}\n.well-sm {\n  padding: 9px;\n  border-radius: 3px;\n}\n.close {\n  float: right;\n  font-size: 21px;\n  font-weight: bold;\n  line-height: 1;\n  color: #000;\n  text-shadow: 0 1px 0 #fff;\n  filter: alpha(opacity=20);\n  opacity: .2;\n}\n.close:hover,\n.close:focus {\n  color: #000;\n  text-decoration: none;\n  cursor: pointer;\n  filter: alpha(opacity=50);\n  opacity: .5;\n}\nbutton.close {\n  -webkit-appearance: none;\n  padding: 0;\n  cursor: pointer;\n  background: transparent;\n  border: 0;\n}\n.modal-open {\n  overflow: hidden;\n}\n.modal {\n  position: fixed;\n  top: 0;\n  right: 0;\n  bottom: 0;\n  left: 0;\n  z-index: 1050;\n  display: none;\n  overflow: hidden;\n  -webkit-overflow-scrolling: touch;\n  outline: 0;\n}\n.modal.fade .modal-dialog {\n  -webkit-transition: -webkit-transform .3s ease-out;\n       -o-transition:      -o-transform .3s ease-out;\n          transition:         transform .3s ease-out;\n  -webkit-transform: translate(0, -25%);\n      -ms-transform: translate(0, -25%);\n       -o-transform: translate(0, -25%);\n          transform: translate(0, -25%);\n}\n.modal.in .modal-dialog {\n  -webkit-transform: translate(0, 0);\n      -ms-transform: translate(0, 0);\n       -o-transform: translate(0, 0);\n          transform: translate(0, 0);\n}\n.modal-open .modal {\n  overflow-x: hidden;\n  overflow-y: auto;\n}\n.modal-dialog {\n  position: relative;\n  width: auto;\n  margin: 10px;\n}\n.modal-content {\n  position: relative;\n  background-color: #fff;\n  -webkit-background-clip: padding-box;\n          background-clip: padding-box;\n  border: 1px solid #999;\n  border: 1px solid rgba(0, 0, 0, .2);\n  border-radius: 6px;\n  outline: 0;\n  -webkit-box-shadow: 0 3px 9px rgba(0, 0, 0, .5);\n          box-shadow: 0 3px 9px rgba(0, 0, 0, .5);\n}\n.modal-backdrop {\n  position: fixed;\n  top: 0;\n  right: 0;\n  bottom: 0;\n  left: 0;\n  z-index: 1040;\n  background-color: #000;\n}\n.modal-backdrop.fade {\n  filter: alpha(opacity=0);\n  opacity: 0;\n}\n.modal-backdrop.in {\n  filter: alpha(opacity=50);\n  opacity: .5;\n}\n.modal-header {\n  min-height: 16.42857143px;\n  padding: 15px;\n  border-bottom: 1px solid #e5e5e5;\n}\n.modal-header .close {\n  margin-top: -2px;\n}\n.modal-title {\n  margin: 0;\n  line-height: 1.42857143;\n}\n.modal-body {\n  position: relative;\n  padding: 15px;\n}\n.modal-footer {\n  padding: 15px;\n  text-align: right;\n  border-top: 1px solid #e5e5e5;\n}\n.modal-footer .btn + .btn {\n  margin-bottom: 0;\n  margin-left: 5px;\n}\n.modal-footer .btn-group .btn + .btn {\n  margin-left: -1px;\n}\n.modal-footer .btn-block + .btn-block {\n  margin-left: 0;\n}\n.modal-scrollbar-measure {\n  position: absolute;\n  top: -9999px;\n  width: 50px;\n  height: 50px;\n  overflow: scroll;\n}\n@media (min-width: 768px) {\n  .modal-dialog {\n    width: 600px;\n    margin: 30px auto;\n  }\n  .modal-content {\n    -webkit-box-shadow: 0 5px 15px rgba(0, 0, 0, .5);\n            box-shadow: 0 5px 15px rgba(0, 0, 0, .5);\n  }\n  .modal-sm {\n    width: 300px;\n  }\n}\n@media (min-width: 992px) {\n  .modal-lg {\n    width: 900px;\n  }\n}\n.tooltip {\n  position: absolute;\n  z-index: 1070;\n  display: block;\n  font-family: \"Helvetica Neue\", Helvetica, Arial, sans-serif;\n  font-size: 12px;\n  font-weight: normal;\n  line-height: 1.4;\n  filter: alpha(opacity=0);\n  opacity: 0;\n}\n.tooltip.in {\n  filter: alpha(opacity=90);\n  opacity: .9;\n}\n.tooltip.top {\n  padding: 5px 0;\n  margin-top: -3px;\n}\n.tooltip.right {\n  padding: 0 5px;\n  margin-left: 3px;\n}\n.tooltip.bottom {\n  padding: 5px 0;\n  margin-top: 3px;\n}\n.tooltip.left {\n  padding: 0 5px;\n  margin-left: -3px;\n}\n.tooltip-inner {\n  max-width: 200px;\n  padding: 3px 8px;\n  color: #fff;\n  text-align: center;\n  text-decoration: none;\n  background-color: #000;\n  border-radius: 4px;\n}\n.tooltip-arrow {\n  position: absolute;\n  width: 0;\n  height: 0;\n  border-color: transparent;\n  border-style: solid;\n}\n.tooltip.top .tooltip-arrow {\n  bottom: 0;\n  left: 50%;\n  margin-left: -5px;\n  border-width: 5px 5px 0;\n  border-top-color: #000;\n}\n.tooltip.top-left .tooltip-arrow {\n  right: 5px;\n  bottom: 0;\n  margin-bottom: -5px;\n  border-width: 5px 5px 0;\n  border-top-color: #000;\n}\n.tooltip.top-right .tooltip-arrow {\n  bottom: 0;\n  left: 5px;\n  margin-bottom: -5px;\n  border-width: 5px 5px 0;\n  border-top-color: #000;\n}\n.tooltip.right .tooltip-arrow {\n  top: 50%;\n  left: 0;\n  margin-top: -5px;\n  border-width: 5px 5px 5px 0;\n  border-right-color: #000;\n}\n.tooltip.left .tooltip-arrow {\n  top: 50%;\n  right: 0;\n  margin-top: -5px;\n  border-width: 5px 0 5px 5px;\n  border-left-color: #000;\n}\n.tooltip.bottom .tooltip-arrow {\n  top: 0;\n  left: 50%;\n  margin-left: -5px;\n  border-width: 0 5px 5px;\n  border-bottom-color: #000;\n}\n.tooltip.bottom-left .tooltip-arrow {\n  top: 0;\n  right: 5px;\n  margin-top: -5px;\n  border-width: 0 5px 5px;\n  border-bottom-color: #000;\n}\n.tooltip.bottom-right .tooltip-arrow {\n  top: 0;\n  left: 5px;\n  margin-top: -5px;\n  border-width: 0 5px 5px;\n  border-bottom-color: #000;\n}\n.popover {\n  position: absolute;\n  top: 0;\n  left: 0;\n  z-index: 1060;\n  display: none;\n  max-width: 276px;\n  padding: 1px;\n  font-family: \"Helvetica Neue\", Helvetica, Arial, sans-serif;\n  font-size: 14px;\n  font-weight: normal;\n  line-height: 1.42857143;\n  text-align: left;\n  white-space: normal;\n  background-color: #fff;\n  -webkit-background-clip: padding-box;\n          background-clip: padding-box;\n  border: 1px solid #ccc;\n  border: 1px solid rgba(0, 0, 0, .2);\n  border-radius: 6px;\n  -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, .2);\n          box-shadow: 0 5px 10px rgba(0, 0, 0, .2);\n}\n.popover.top {\n  margin-top: -10px;\n}\n.popover.right {\n  margin-left: 10px;\n}\n.popover.bottom {\n  margin-top: 10px;\n}\n.popover.left {\n  margin-left: -10px;\n}\n.popover-title {\n  padding: 8px 14px;\n  margin: 0;\n  font-size: 14px;\n  background-color: #f7f7f7;\n  border-bottom: 1px solid #ebebeb;\n  border-radius: 5px 5px 0 0;\n}\n.popover-content {\n  padding: 9px 14px;\n}\n.popover > .arrow,\n.popover > .arrow:after {\n  position: absolute;\n  display: block;\n  width: 0;\n  height: 0;\n  border-color: transparent;\n  border-style: solid;\n}\n.popover > .arrow {\n  border-width: 11px;\n}\n.popover > .arrow:after {\n  content: \"\";\n  border-width: 10px;\n}\n.popover.top > .arrow {\n  bottom: -11px;\n  left: 50%;\n  margin-left: -11px;\n  border-top-color: #999;\n  border-top-color: rgba(0, 0, 0, .25);\n  border-bottom-width: 0;\n}\n.popover.top > .arrow:after {\n  bottom: 1px;\n  margin-left: -10px;\n  content: \" \";\n  border-top-color: #fff;\n  border-bottom-width: 0;\n}\n.popover.right > .arrow {\n  top: 50%;\n  left: -11px;\n  margin-top: -11px;\n  border-right-color: #999;\n  border-right-color: rgba(0, 0, 0, .25);\n  border-left-width: 0;\n}\n.popover.right > .arrow:after {\n  bottom: -10px;\n  left: 1px;\n  content: \" \";\n  border-right-color: #fff;\n  border-left-width: 0;\n}\n.popover.bottom > .arrow {\n  top: -11px;\n  left: 50%;\n  margin-left: -11px;\n  border-top-width: 0;\n  border-bottom-color: #999;\n  border-bottom-color: rgba(0, 0, 0, .25);\n}\n.popover.bottom > .arrow:after {\n  top: 1px;\n  margin-left: -10px;\n  content: \" \";\n  border-top-width: 0;\n  border-bottom-color: #fff;\n}\n.popover.left > .arrow {\n  top: 50%;\n  right: -11px;\n  margin-top: -11px;\n  border-right-width: 0;\n  border-left-color: #999;\n  border-left-color: rgba(0, 0, 0, .25);\n}\n.popover.left > .arrow:after {\n  right: 1px;\n  bottom: -10px;\n  content: \" \";\n  border-right-width: 0;\n  border-left-color: #fff;\n}\n.carousel {\n  position: relative;\n}\n.carousel-inner {\n  position: relative;\n  width: 100%;\n  overflow: hidden;\n}\n.carousel-inner > .item {\n  position: relative;\n  display: none;\n  -webkit-transition: .6s ease-in-out left;\n       -o-transition: .6s ease-in-out left;\n          transition: .6s ease-in-out left;\n}\n.carousel-inner > .item > img,\n.carousel-inner > .item > a > img {\n  line-height: 1;\n}\n@media all and (transform-3d), (-webkit-transform-3d) {\n  .carousel-inner > .item {\n    -webkit-transition: -webkit-transform .6s ease-in-out;\n         -o-transition:      -o-transform .6s ease-in-out;\n            transition:         transform .6s ease-in-out;\n\n    -webkit-backface-visibility: hidden;\n            backface-visibility: hidden;\n    -webkit-perspective: 1000;\n            perspective: 1000;\n  }\n  .carousel-inner > .item.next,\n  .carousel-inner > .item.active.right {\n    left: 0;\n    -webkit-transform: translate3d(100%, 0, 0);\n            transform: translate3d(100%, 0, 0);\n  }\n  .carousel-inner > .item.prev,\n  .carousel-inner > .item.active.left {\n    left: 0;\n    -webkit-transform: translate3d(-100%, 0, 0);\n            transform: translate3d(-100%, 0, 0);\n  }\n  .carousel-inner > .item.next.left,\n  .carousel-inner > .item.prev.right,\n  .carousel-inner > .item.active {\n    left: 0;\n    -webkit-transform: translate3d(0, 0, 0);\n            transform: translate3d(0, 0, 0);\n  }\n}\n.carousel-inner > .active,\n.carousel-inner > .next,\n.carousel-inner > .prev {\n  display: block;\n}\n.carousel-inner > .active {\n  left: 0;\n}\n.carousel-inner > .next,\n.carousel-inner > .prev {\n  position: absolute;\n  top: 0;\n  width: 100%;\n}\n.carousel-inner > .next {\n  left: 100%;\n}\n.carousel-inner > .prev {\n  left: -100%;\n}\n.carousel-inner > .next.left,\n.carousel-inner > .prev.right {\n  left: 0;\n}\n.carousel-inner > .active.left {\n  left: -100%;\n}\n.carousel-inner > .active.right {\n  left: 100%;\n}\n.carousel-control {\n  position: absolute;\n  top: 0;\n  bottom: 0;\n  left: 0;\n  width: 15%;\n  font-size: 20px;\n  color: #fff;\n  text-align: center;\n  text-shadow: 0 1px 2px rgba(0, 0, 0, .6);\n  filter: alpha(opacity=50);\n  opacity: .5;\n}\n.carousel-control.left {\n  background-image: -webkit-linear-gradient(left, rgba(0, 0, 0, .5) 0%, rgba(0, 0, 0, .0001) 100%);\n  background-image:      -o-linear-gradient(left, rgba(0, 0, 0, .5) 0%, rgba(0, 0, 0, .0001) 100%);\n  background-image: -webkit-gradient(linear, left top, right top, from(rgba(0, 0, 0, .5)), to(rgba(0, 0, 0, .0001)));\n  background-image:         linear-gradient(to right, rgba(0, 0, 0, .5) 0%, rgba(0, 0, 0, .0001) 100%);\n  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#80000000', endColorstr='#00000000', GradientType=1);\n  background-repeat: repeat-x;\n}\n.carousel-control.right {\n  right: 0;\n  left: auto;\n  background-image: -webkit-linear-gradient(left, rgba(0, 0, 0, .0001) 0%, rgba(0, 0, 0, .5) 100%);\n  background-image:      -o-linear-gradient(left, rgba(0, 0, 0, .0001) 0%, rgba(0, 0, 0, .5) 100%);\n  background-image: -webkit-gradient(linear, left top, right top, from(rgba(0, 0, 0, .0001)), to(rgba(0, 0, 0, .5)));\n  background-image:         linear-gradient(to right, rgba(0, 0, 0, .0001) 0%, rgba(0, 0, 0, .5) 100%);\n  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#80000000', GradientType=1);\n  background-repeat: repeat-x;\n}\n.carousel-control:hover,\n.carousel-control:focus {\n  color: #fff;\n  text-decoration: none;\n  filter: alpha(opacity=90);\n  outline: 0;\n  opacity: .9;\n}\n.carousel-control .icon-prev,\n.carousel-control .icon-next,\n.carousel-control .glyphicon-chevron-left,\n.carousel-control .glyphicon-chevron-right {\n  position: absolute;\n  top: 50%;\n  z-index: 5;\n  display: inline-block;\n}\n.carousel-control .icon-prev,\n.carousel-control .glyphicon-chevron-left {\n  left: 50%;\n  margin-left: -10px;\n}\n.carousel-control .icon-next,\n.carousel-control .glyphicon-chevron-right {\n  right: 50%;\n  margin-right: -10px;\n}\n.carousel-control .icon-prev,\n.carousel-control .icon-next {\n  width: 20px;\n  height: 20px;\n  margin-top: -10px;\n  font-family: serif;\n  line-height: 1;\n}\n.carousel-control .icon-prev:before {\n  content: '\\2039';\n}\n.carousel-control .icon-next:before {\n  content: '\\203a';\n}\n.carousel-indicators {\n  position: absolute;\n  bottom: 10px;\n  left: 50%;\n  z-index: 15;\n  width: 60%;\n  padding-left: 0;\n  margin-left: -30%;\n  text-align: center;\n  list-style: none;\n}\n.carousel-indicators li {\n  display: inline-block;\n  width: 10px;\n  height: 10px;\n  margin: 1px;\n  text-indent: -999px;\n  cursor: pointer;\n  background-color: #000 \\9;\n  background-color: rgba(0, 0, 0, 0);\n  border: 1px solid #fff;\n  border-radius: 10px;\n}\n.carousel-indicators .active {\n  width: 12px;\n  height: 12px;\n  margin: 0;\n  background-color: #fff;\n}\n.carousel-caption {\n  position: absolute;\n  right: 15%;\n  bottom: 20px;\n  left: 15%;\n  z-index: 10;\n  padding-top: 20px;\n  padding-bottom: 20px;\n  color: #fff;\n  text-align: center;\n  text-shadow: 0 1px 2px rgba(0, 0, 0, .6);\n}\n.carousel-caption .btn {\n  text-shadow: none;\n}\n@media screen and (min-width: 768px) {\n  .carousel-control .glyphicon-chevron-left,\n  .carousel-control .glyphicon-chevron-right,\n  .carousel-control .icon-prev,\n  .carousel-control .icon-next {\n    width: 30px;\n    height: 30px;\n    margin-top: -15px;\n    font-size: 30px;\n  }\n  .carousel-control .glyphicon-chevron-left,\n  .carousel-control .icon-prev {\n    margin-left: -15px;\n  }\n  .carousel-control .glyphicon-chevron-right,\n  .carousel-control .icon-next {\n    margin-right: -15px;\n  }\n  .carousel-caption {\n    right: 20%;\n    left: 20%;\n    padding-bottom: 30px;\n  }\n  .carousel-indicators {\n    bottom: 20px;\n  }\n}\n.clearfix:before,\n.clearfix:after,\n.dl-horizontal dd:before,\n.dl-horizontal dd:after,\n.container:before,\n.container:after,\n.container-fluid:before,\n.container-fluid:after,\n.row:before,\n.row:after,\n.form-horizontal .form-group:before,\n.form-horizontal .form-group:after,\n.btn-toolbar:before,\n.btn-toolbar:after,\n.btn-group-vertical > .btn-group:before,\n.btn-group-vertical > .btn-group:after,\n.nav:before,\n.nav:after,\n.navbar:before,\n.navbar:after,\n.navbar-header:before,\n.navbar-header:after,\n.navbar-collapse:before,\n.navbar-collapse:after,\n.pager:before,\n.pager:after,\n.panel-body:before,\n.panel-body:after,\n.modal-footer:before,\n.modal-footer:after {\n  display: table;\n  content: \" \";\n}\n.clearfix:after,\n.dl-horizontal dd:after,\n.container:after,\n.container-fluid:after,\n.row:after,\n.form-horizontal .form-group:after,\n.btn-toolbar:after,\n.btn-group-vertical > .btn-group:after,\n.nav:after,\n.navbar:after,\n.navbar-header:after,\n.navbar-collapse:after,\n.pager:after,\n.panel-body:after,\n.modal-footer:after {\n  clear: both;\n}\n.center-block {\n  display: block;\n  margin-right: auto;\n  margin-left: auto;\n}\n.pull-right {\n  float: right !important;\n}\n.pull-left {\n  float: left !important;\n}\n.hide {\n  display: none !important;\n}\n.show {\n  display: block !important;\n}\n.invisible {\n  visibility: hidden;\n}\n.text-hide {\n  font: 0/0 a;\n  color: transparent;\n  text-shadow: none;\n  background-color: transparent;\n  border: 0;\n}\n.hidden {\n  display: none !important;\n}\n.affix {\n  position: fixed;\n}\n@-ms-viewport {\n  width: device-width;\n}\n.visible-xs,\n.visible-sm,\n.visible-md,\n.visible-lg {\n  display: none !important;\n}\n.visible-xs-block,\n.visible-xs-inline,\n.visible-xs-inline-block,\n.visible-sm-block,\n.visible-sm-inline,\n.visible-sm-inline-block,\n.visible-md-block,\n.visible-md-inline,\n.visible-md-inline-block,\n.visible-lg-block,\n.visible-lg-inline,\n.visible-lg-inline-block {\n  display: none !important;\n}\n@media (max-width: 767px) {\n  .visible-xs {\n    display: block !important;\n  }\n  table.visible-xs {\n    display: table;\n  }\n  tr.visible-xs {\n    display: table-row !important;\n  }\n  th.visible-xs,\n  td.visible-xs {\n    display: table-cell !important;\n  }\n}\n@media (max-width: 767px) {\n  .visible-xs-block {\n    display: block !important;\n  }\n}\n@media (max-width: 767px) {\n  .visible-xs-inline {\n    display: inline !important;\n  }\n}\n@media (max-width: 767px) {\n  .visible-xs-inline-block {\n    display: inline-block !important;\n  }\n}\n@media (min-width: 768px) and (max-width: 991px) {\n  .visible-sm {\n    display: block !important;\n  }\n  table.visible-sm {\n    display: table;\n  }\n  tr.visible-sm {\n    display: table-row !important;\n  }\n  th.visible-sm,\n  td.visible-sm {\n    display: table-cell !important;\n  }\n}\n@media (min-width: 768px) and (max-width: 991px) {\n  .visible-sm-block {\n    display: block !important;\n  }\n}\n@media (min-width: 768px) and (max-width: 991px) {\n  .visible-sm-inline {\n    display: inline !important;\n  }\n}\n@media (min-width: 768px) and (max-width: 991px) {\n  .visible-sm-inline-block {\n    display: inline-block !important;\n  }\n}\n@media (min-width: 992px) and (max-width: 1199px) {\n  .visible-md {\n    display: block !important;\n  }\n  table.visible-md {\n    display: table;\n  }\n  tr.visible-md {\n    display: table-row !important;\n  }\n  th.visible-md,\n  td.visible-md {\n    display: table-cell !important;\n  }\n}\n@media (min-width: 992px) and (max-width: 1199px) {\n  .visible-md-block {\n    display: block !important;\n  }\n}\n@media (min-width: 992px) and (max-width: 1199px) {\n  .visible-md-inline {\n    display: inline !important;\n  }\n}\n@media (min-width: 992px) and (max-width: 1199px) {\n  .visible-md-inline-block {\n    display: inline-block !important;\n  }\n}\n@media (min-width: 1200px) {\n  .visible-lg {\n    display: block !important;\n  }\n  table.visible-lg {\n    display: table;\n  }\n  tr.visible-lg {\n    display: table-row !important;\n  }\n  th.visible-lg,\n  td.visible-lg {\n    display: table-cell !important;\n  }\n}\n@media (min-width: 1200px) {\n  .visible-lg-block {\n    display: block !important;\n  }\n}\n@media (min-width: 1200px) {\n  .visible-lg-inline {\n    display: inline !important;\n  }\n}\n@media (min-width: 1200px) {\n  .visible-lg-inline-block {\n    display: inline-block !important;\n  }\n}\n@media (max-width: 767px) {\n  .hidden-xs {\n    display: none !important;\n  }\n}\n@media (min-width: 768px) and (max-width: 991px) {\n  .hidden-sm {\n    display: none !important;\n  }\n}\n@media (min-width: 992px) and (max-width: 1199px) {\n  .hidden-md {\n    display: none !important;\n  }\n}\n@media (min-width: 1200px) {\n  .hidden-lg {\n    display: none !important;\n  }\n}\n.visible-print {\n  display: none !important;\n}\n@media print {\n  .visible-print {\n    display: block !important;\n  }\n  table.visible-print {\n    display: table;\n  }\n  tr.visible-print {\n    display: table-row !important;\n  }\n  th.visible-print,\n  td.visible-print {\n    display: table-cell !important;\n  }\n}\n.visible-print-block {\n  display: none !important;\n}\n@media print {\n  .visible-print-block {\n    display: block !important;\n  }\n}\n.visible-print-inline {\n  display: none !important;\n}\n@media print {\n  .visible-print-inline {\n    display: inline !important;\n  }\n}\n.visible-print-inline-block {\n  display: none !important;\n}\n@media print {\n  .visible-print-inline-block {\n    display: inline-block !important;\n  }\n}\n@media print {\n  .hidden-print {\n    display: none !important;\n  }\n}\n/*# sourceMappingURL=bootstrap.css.map */\nPK\x07\x08\xbeO[\x0b6)\x02\x006)\x02\x00PK\x03\x04\x14\x00\x08\x00\x00\x00W\x9a5G\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x1d\x00\x00\x00css/dropdowns-enhancement.css.dropdown-menu > li > label {\n  display: block;\n  padding: 3px 20px;\n  clear: both;\n  font-weight: normal;\n  line-height: 1.42857143;\n  color: #333333;\n  white-space: nowrap;\n}\n.dropdown-menu > li > label:hover,\n.dropdown-menu > li > label:focus {\n  text-decoration: none;\n  color: #262626;\n  background-color: #f5f5f5;\n}\n.dropdown-menu > li > input:checked ~ label,\n.dropdown-menu > li > input:checked ~ label:hover,\n.dropdown-menu > li > input:checked ~ label:focus,\n.dropdown-menu > .active > label,\n.dropdown-menu > .active > label:hover,\n.dropdown-menu > .active > label:focus {\n  color: #ffffff;\n  text-decoration: none;\n  outline: 0;\n  background-color: #428bca;\n}\n.dropdown-menu > li > input[disabled] ~ label,\n.dropdown-menu > li > input[disabled] ~ label:hover,\n.dropdown-menu > li > input[disabled] ~ label:focus,\n.dropdown-menu > .disabled > label,\n.dropdown-menu > .disabled > label:hover,\n.dropdown-menu > .disabled > label:focus {\n  color: #999999;\n}\n.dropdown-menu > li > input[disabled] ~ label:hover,\n.dropdown-menu > li > input[disabled] ~ label:focus,\n.dropdown-menu > .disabled > label:hover,\n.dropdown-menu > .disabled > label:focus {\n  text-decoration: none;\n  background-color: transparent;\n  background-image: none;\n  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);\n  cursor: not-allowed;\n}\n.dropdown-menu > li > label {\n  margin-bottom: 0;\n  cursor: pointer;\n}\n.dropdown-menu > li > input[type=\"radio\"],\n.dropdown-menu > li > input[type=\"checkbox\"] {\n  display: none;\n  position: absolute;\n  top: -9999em;\n  left: -9999em;\n}\n.dropdown-menu > li > label:focus,\n.dropdown-menu > li > input:focus ~ label {\n  outline: thin dotted;\n  outline: 5px auto -webkit-focus-ring-color;\n  outline-offset: -2px;\n}\n.dropdown-menu.pull-right {\n  right: 0;\n  left: auto;\n}\n.dropdown-menu.pull-top {\n  bottom: 100%;\n  top: auto;\n  margin: 0 0 2px;\n  -webkit-box-shadow: 0 -6px 12px rgba(0, 0, 0, 0.175);\n  box-shadow: 0 -6px 12px rgba(0, 0, 0, 0.175);\n}\n.dropdown-menu.pull-center {\n  right: 50%;\n  left: auto;\n}\n.dropdown-menu.pull-middle {\n  right: 100%;\n  margin: 0 2px 0 0;\n  box-shadow: -5px 0 10px rgba(0, 0, 0, 0.2);\n  left: auto;\n}\n.dropdown-menu.pull-middle.pull-right {\n  right: auto;\n  left: 100%;\n  margin: 0 0 0 2px;\n  box-shadow: 5px 0 10px rgba(0, 0, 0, 0.2);\n}\n.dropdown-menu.pull-middle.pull-center {\n  right: 50%;\n  margin: 0;\n  box-shadow: 0 0 10px rgba(0, 0, 0, 0.2);\n}\n.dropdown-menu.bullet {\n  margin-top: 8px;\n}\n.dropdown-menu.bullet:before {\n  width: 0;\n  height: 0;\n  content: '';\n  display: inline-block;\n  position: absolute;\n  border-color: transparent;\n  border-style: solid;\n  -webkit-transform: rotate(360deg);\n  border-width: 0 7px 7px;\n  border-bottom-color: #cccccc;\n  border-bottom-color: rgba(0, 0, 0, 0.15);\n  top: -7px;\n  left: 9px;\n}\n.dropdown-menu.bullet:after {\n  width: 0;\n  height: 0;\n  content: '';\n  display: inline-block;\n  position: absolute;\n  border-color: transparent;\n  border-style: solid;\n  -webkit-transform: rotate(360deg);\n  border-width: 0 6px 6px;\n  border-bottom-color: #ffffff;\n  top: -6px;\n  left: 10px;\n}\n.dropdown-menu.bullet.pull-right:before {\n  left: auto;\n  right: 9px;\n}\n.dropdown-menu.bullet.pull-right:after {\n  left: auto;\n  right: 10px;\n}\n.dropdown-menu.bullet.pull-top {\n  margin-top: 0;\n  margin-bottom: 8px;\n}\n.dropdown-menu.bullet.pull-top:before {\n  top: auto;\n  bottom: -7px;\n  border-bottom-width: 0;\n  border-top-width: 7px;\n  border-top-color: #cccccc;\n  border-top-color: rgba(0, 0, 0, 0.15);\n}\n.dropdown-menu.bullet.pull-top:after {\n  top: auto;\n  bottom: -6px;\n  border-bottom: none;\n  border-top-width: 6px;\n  border-top-color: #ffffff;\n}\n.dropdown-menu.bullet.pull-center:before {\n  left: auto;\n  right: 50%;\n  margin-right: -7px;\n}\n.dropdown-menu.bullet.pull-center:after {\n  left: auto;\n  right: 50%;\n  margin-right: -6px;\n}\n.dropdown-menu.bullet.pull-middle {\n  margin-right: 8px;\n}\n.dropdown-menu.bullet.pull-middle:before {\n  top: 50%;\n  left: 100%;\n  right: auto;\n  margin-top: -7px;\n  border-right-width: 0;\n  border-bottom-color: transparent;\n  border-top-width: 7px;\n  border-left-color: #cccccc;\n  border-left-color: rgba(0, 0, 0, 0.15);\n}\n.dropdown-menu.bullet.pull-middle:after {\n  top: 50%;\n  left: 100%;\n  right: auto;\n  margin-top: -6px;\n  border-right-width: 0;\n  border-bottom-color: transparent;\n  border-top-width: 6px;\n  border-left-color: #ffffff;\n}\n.dropdown-menu.bullet.pull-middle.pull-right {\n  margin-right: 0;\n  margin-left: 8px;\n}\n.dropdown-menu.bullet.pull-middle.pull-right:before {\n  left: -7px;\n  border-left-width: 0;\n  border-right-width: 7px;\n  border-right-color: #cccccc;\n  border-right-color: rgba(0, 0, 0, 0.15);\n}\n.dropdown-menu.bullet.pull-middle.pull-right:after {\n  left: -6px;\n  border-left-width: 0;\n  border-right-width: 6px;\n  border-right-color: #ffffff;\n}\n.dropdown-menu.bullet.pull-middle.pull-center {\n  margin-left: 0;\n  margin-right: 0;\n}\n.dropdown-menu.bullet.pull-middle.pull-center:before {\n  border: none;\n  display: none;\n}\n.dropdown-menu.bullet.pull-middle.pull-center:after {\n  border: none;\n  display: none;\n}\n.dropdown-submenu {\n  position: relative;\n}\n.dropdown-submenu > .dropdown-menu {\n  top: 0;\n  left: 100%;\n  margin-top: -6px;\n  margin-left: -1px;\n  border-top-left-radius: 0;\n}\n.dropdown-submenu > a:before {\n  display: block;\n  float: right;\n  width: 0;\n  height: 0;\n  content: \"\";\n  margin-top: 6px;\n  margin-right: -8px;\n  border-width: 4px 0 4px 4px;\n  border-style: solid;\n  border-left-style: dashed;\n  border-top-color: transparent;\n  border-bottom-color: transparent;\n}\n@media (max-width: 767px) {\n  .navbar-nav .dropdown-submenu > a:before {\n    margin-top: 8px;\n    border-color: inherit;\n    border-style: solid;\n    border-width: 4px 4px 0;\n    border-left-color: transparent;\n    border-right-color: transparent;\n  }\n  .navbar-nav .dropdown-submenu > a {\n    padding-left: 40px;\n  }\n  .navbar-nav > .open > .dropdown-menu > .dropdown-submenu > .dropdown-menu > li > a,\n  .navbar-nav > .open > .dropdown-menu > .dropdown-submenu > .dropdown-menu > li > label {\n    padding-left: 35px;\n  }\n  .navbar-nav > .open > .dropdown-menu > .dropdown-submenu > .dropdown-menu > li > .dropdown-menu > li > a,\n  .navbar-nav > .open > .dropdown-menu > .dropdown-submenu > .dropdown-menu > li > .dropdown-menu > li > label {\n    padding-left: 45px;\n  }\n  .navbar-nav > .open > .dropdown-menu > .dropdown-submenu > .dropdown-menu > li > .dropdown-menu > li > .dropdown-menu > li > a,\n  .navbar-nav > .open > .dropdown-menu > .dropdown-submenu > .dropdown-menu > li > .dropdown-menu > li > .dropdown-menu > li > label {\n    padding-left: 55px;\n  }\n  .navbar-nav > .open > .dropdown-menu > .dropdown-submenu > .dropdown-menu > li > .dropdown-menu > li > .dropdown-menu > li > .dropdown-menu > li > a,\n  .navbar-nav > .open > .dropdown-menu > .dropdown-submenu > .dropdown-menu > li > .dropdown-menu > li > .dropdown-menu > li > .dropdown-menu > li > label {\n    padding-left: 65px;\n  }\n  .navbar-nav > .open > .dropdown-menu > .dropdown-submenu > .dropdown-menu > li > .dropdown-menu > li > .dropdown-menu > li > .dropdown-menu > li > .dropdown-menu > li > a,\n  .navbar-nav > .open > .dropdown-menu > .dropdown-submenu > .dropdown-menu > li > .dropdown-menu > li > .dropdown-menu > li > .dropdown-menu > li > .dropdown-menu > li > label {\n    padding-left: 75px;\n  }\n}\n.navbar-default .navbar-nav .open > .dropdown-menu > .dropdown-submenu.open > a,\n.navbar-default .navbar-nav .open > .dropdown-menu > .dropdown-submenu.open > a:hover,\n.navbar-default .navbar-nav .open > .dropdown-menu > .dropdown-submenu.open > a:focus {\n  background-color: #e7e7e7;\n  color: #555555;\n}\n@media (max-width: 767px) {\n  .navbar-default .navbar-nav .open > .dropdown-menu > .dropdown-submenu.open > a:before {\n    border-top-color: #555555;\n  }\n}\n.navbar-inverse .navbar-nav .open > .dropdown-menu > .dropdown-submenu.open > a,\n.navbar-inverse .navbar-nav .open > .dropdown-menu > .dropdown-submenu.open > a:hover,\n.navbar-inverse .navbar-nav .open > .dropdown-menu > .dropdown-submenu.open > a:focus {\n  background-color: #080808;\n  color: #ffffff;\n}\n@media (max-width: 767px) {\n  .navbar-inverse .navbar-nav .open > .dropdown-menu > .dropdown-submenu.open > a:before {\n    border-top-color: #ffffff;\n  }\n}\nPK\x07\x08\x9a\x90:SN \x00\x00N \x00\x00PK\x03\x04\x14\x00\x08\x00\x00\x00W\x9a5G\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00&\x00\x00\x00fonts/glyphicons-halflings-regular.eot\x9fN\x00\x00AM\x00\x00\x02\x00\x02\x00\x04\x00\x00\x00\x00\x00\x05\x00\x00\x00\x00\x00\x00\x00\x01\x00\x90\x01\x00\x00\x04\x00LP\x00\x00\x00\x00\x00\x00\x00\x02\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00'\x12\x7f,\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00(\x00G\x00L\x00Y\x00P\x00H\x00I\x00C\x00O\x00N\x00S\x00 \x00H\x00a\x00l\x00f\x00l\x00i\x00n\x00g\x00s\x00\x00\x00\x0e\x00R\x00e\x00g\x00u\x00l\x00a\x00r\x00\x00\x00x\x00V\x00e\x00r\x00s\x00i\x00o\x00n\x00 \x001\x00.\x000\x000\x009\x00;\x00P\x00S\x00 \x000\x000\x001\x00.\x000\x000\x009\x00;\x00h\x00o\x00t\x00c\x00o\x00n\x00v\x00 \x001\x00.\x000\x00.\x007\x000\x00;\x00m\x00a\x00k\x00e\x00o\x00t\x00f\x00.\x00l\x00i\x00b\x002\x00.\x005\x00.\x005\x008\x003\x002\x009\x00\x00\x008\x00G\x00L\x00Y\x00P\x00H\x00I\x00C\x00O\x00N\x00S\x00 \x00H\x00a\x00l\x00f\x00l\x00i\x00n\x00g\x00s\x00 \x00R\x00e\x00g\x00u\x00l\x00a\x00r\x00\x00\x00\x00\x00BSGP\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x03\x00\xa9\xdc\x00M\x13\x00M\x19\x00F\xee\x14\xcd\xe9\x8c\xcf\xd2\x11\xd9\xa3(u\x1b\xca\x8c<\x010D\xe3B/X\x0d\xefN\xef\x0b\x88\x00CC\xea^\xc7\x05\x0crmR2sk\xc9\xcbPJ\"5+\x96gl\xe9W*i\xd5W\x96/E\xee\x91\x9c\xd3\x054#\xac\xd4\xa3U\xa6~\xb2f\x10\x89\x91\x1bUD\xdc\xc4\xb9\xf7\x88\xab\xb1\xe0J\xb71\xe1/!\xfe\xfe/\x9e\xba\xcas\xaa\x027\x19\x92\x93k\x8a\x95\x94\x07\x06(\xba\x88\xa1h\x1fN\xf8\xe98o\x90\xedd$yq\x8e\xb91\xb3\xe2\xd69\x16\x83@\x11-\x89\x82HG\x92\x01\xf4\x18\xb5S\"\xf8Fj\xf4\x04\xd8\xa06C3\x94\xa4&\x9e\x87\xc1\x1e\xf8\xaaW51\xc1\xd3\x1b\xdc\xd7B\x9f\xafa\xcb\xeaQaR\x86U/\xf5\xb6{*\xbf\x82\xcb\xef\x00\x82=\x96@d\xf4\xf8h$\xa1\x1e1\xc9T\xdb\x97nc+c\x92\xdeA\xa1\xa7\xbc	\x17\x95Z\xc9\x80\xa4@Q\xd1c\xada\x1a\x87\xd5\xdel\xf7\x902>\xcaK\xb0\xc8\x04\x01m\xf3' \x0b\x93\xcb\x19C\x87HM\xc4\xacfB\x89X\x8d,\xbeY\x01\x17\xf2\xc2p\xa8e\xa2\x90\n\xee\x8d\xb8U\xf8\xd8\x01\x1e*\xd2\x94\x1az\xff\nm\x82\xcb\xcbi\x16\x10O1nE\xc6.\x10\x9b\x84\xe4\x0dhx!aC\nXT\xda\x14V\xa2\xc5\x16\xa9\xc2\x8b\x96\x0c\x97\x07\xe9R\x1d\xa5\x9a\x1e%\xa5\x04\x04|I\xe4\xa0H\xf0\x90\xc5\xd5P\x835\"\xc5b\x92N\xb2\x10\x11\xb5=\xe2\xf8\x83r\xd9/_\xe5R\x8c\x9b\x94\x99_\x0b\xe0%\xd2\x84\x8duz\xc9\xe9\xd2\x98\xd65\x922\xc4\xa1\xd2\xe3\x05P\xda)\x9e\xd4\xfe\x11\x9e\x1b\xc6\xc3F\x837S\x8b\x01q\x84F\xc0{n\xe1i\x14a\x81\x02\xb7\xb8@D\x11\xd0s\x88;\x9a\x18\x1f}9\x1b\xe2\xac\xa5?\xc5\xba\x91\x06\x19\xa7\xc2\x0b\x0cR{\xa6Tk\xed;\xde\xb5\xc7\x9c\xd7U\\N\x9eZ\xf8\x9bQ-\xbb^\xd4s\x90\x7f7\xf2f\x0b0\x19\x98\xca\xc6S3A\x0c\xdc\x0d_n\x90\x81`W\x1c7P\x7f\x12p\x98\xbb\xf4\xe0\x08i\xab\xed\xb3!\xf0g\xd8/\xe0_p\xbb\xc1\xd2\x04Z\x80-=\xc3\xd7\xa5~WZ#/\xe14 KF\x00`\xb4 \xbb\x8c\x01z\xdf\x02\xd20\x07\xdb|	D\x82\x06\x14\xd1\xb5\x00\xec\x00\x82&d\xc3\xa4I\x89\xb4\x8e\xfc\xc3\x8f\xc1;\xb7M\xec\x94{'\xb6om\x86\x94m\xa2\x0bI\x0b\x11\x06!w\x1ci9|H:\xa7\xdb\xa7\xc0\xbb\xe7\xf7\xca\xfe\xbe{\x15\xfb~\xf6\xb9\xfdq\x04\xba\xb8\xa9O\xf8\xe5\xf4\xee\xa9\xa0\x0f\xfa\x9b,\x98 \x82L]&\x84J0\xf1\x95\xd99/\x03\xed\x0f9&\xccY\xf8\x0c\xe8\x93\xb0{;\xf7\xfa'\xc03`\x1c\x92e\x00\x7f@v\x14H\x0f\x84y\x08DZ$\xba\x00\x843\x81\xcb\x03\x88Dx28\x0c\x04\x05\x83W\x80 Cx5x\x18\x08w\x07\x82B`\xa3$C$'\xe3\xcaEl\x85\x1cy\xa0\xd5h\xbf\xeb\x1c\xd4\x80\x0d\x0bDJ\n$(p\x9d\x06\xbd\x07\xeeQA\x94A\xdc\x89A\x96@'\xc7$\x0dh\x03p\x1c\xca0\xceV\x120 `\x9d\xbas\xbe\xaae\xd2$\xc94$\"t2=f\xb4\x984\x84A\x84{Tk\x96\x070|r\x18H\xa4\xf6\x10\xc4\xd0\x02\xa3\xef`\x1bL&\xb1\xb4s\xd4h\xa6]\x01\x94\xa7A<\xa3\x1a\xa1\x8b\xb2`R\xb4'\xa3\x02\x95!\x83\x8b\x811N\xa6\x01;\xa3\x12_\x8at3\xdb#\xa0 \xe2\xf2\xeb\xfa\x18\xd8\xeaV\xe3\x05\xea\x0b*ve\xd1F`E\x7f O$\x8e{)\xd9W=p:\xae\xde\xd6\x11F`\x8a\xbe2\x1a\xc6\xc42\xda\x93C\xeb\xc1\x8c\xd2^\xd7.\xca\x15\xc4\x87\x03\x98\xa1\xf8\x96\xf8G\x08\xfe<<?\xa2\x18\xe9\xe7~z\xd0\x1b\xba\xa2\xa9\xe5\x02\x1a\xa5>\xfb.p\x1e\xe7Ne2\xea\x8b\xef\xd6\xb4\xba\xde+Y\xecs\x16\xdbl:\xc2\xc3\xcb\xbc\xef\xb5\x0c\xdc\xabu5\xa9\xa6\xde\xee\xd0t\xc0u\x95^8\xbe\xcc6\xe8\xf3\x1f\x07\xc8\x84Tmy\xf0Q\xc9%\x16\xfeu~\xf4\xf2\x9a%~1r\xd2\x98a\xfdw\xdf\x9a^\x90\xf9_\xa9Z\xa3\x8dZ\x9da\xa2\x83\xb20!\xd9\xe8\x05\x8d\xa1\xb7\xfaN\xf6`\xa5.\x8e\x0duq\xc0\xb1\xe7\xeaYB\xa5\\\x99\x1b\xa8\xf3\x85\x84\xca\x11\xe1\xa8\x80\xd4\x15\xea\x85\x13[\x07e\xf0\x8b\xee\xee\xfe:@\xa0\xeaJ'E\x17\xdb\x81,\xaf3\x1f\x1dubj@\x8dp\xa8\xc1\xc6\xe4\x17\xf0\x13\xb4f\xa8\xc9\xdf\x15\xf3\x7f\xee\xb5\xb7eW9(	\xf3\x1b\xba\xe5\x02\xa0\xb4\xde\x85\x89\xb3\xe6=\x8b\x17l\x94G\x1e\xa6\xe0\x017\x12g\x10j\x1a \xe2S\x83M6\xc6\x01\xb0\xa0\xf40\x83\xff9\xf2\xa7\x96O\xcb\x91\xa8\x9d\xfc\xed\x8dl\xa7\xaeB\xbc\x0e\x07a\xaa\xdd\x81\xf2\xaf\xa0\x0b\x83<\xa6\xe7\x02\x01\x9e\xc7B\xd5\x99(\x04VRAp\xa1f\xf9^\xb0\xfa\xaf+g9\xa0q\xd3\xdd\x0e\xb9\x8d\x8aM\xc6t\x1c\x18]\x04\x1d\xbb\xd8\xaa\x81p\xebE\x8d\x95r\x07@]\x87@\x1e\xf3\x0f\xa9V\x8d\x9fkV\xa5\n\x05u\x13\xea\x1a\xe4d\xe9^\xd1\x11X \x8d\x15\xe5\x96\x06\x97R@?E\x1d\xd5\xf6Y2\xf4\xa8\x98\x1c\xc9\xef]#\xe0\xc7\xbc\x9a4\x03\xc0J\xde\xe5K\xf6\xc1\x07\xe4\xd6'\xc3\xc1\xbed\xb2\xe2PC|m\xe3m\xe5n\xe4#\xbe\x82\x10\x07$+48u'\x11\x85\x90\xe7e&\xfb\xbf\x80[n[L\x11\xe1\xc8\x1d\xf9\x92\x9e\xb1%{BCD\xdaL:\x01^!\xa0\x8b\x82\xd3b\xc6\x99:&\xc9\xff\x0f\x88\xee\x82g3\x93-3\xd0\xf8u\xb4\xe8\x7f\xad\xc7\xe6\xd0\xf0\xb9\x83b\x0diLZ\xe9\xda\x82W\x82FS\xc9\xe4Id\xcd\x02\xf1\xa16.\x91k5P\xee\x84\x04l7\x9e7\xfcUz\x92T:N\xfdN\xa1\x91\x97.\xfd\"\x80\xaa\xe5\xfc)\x89\xc5\x19\x97\xec\x92['\xdf|U\"\x0fA\x1c\x83\x04\x80\xb3\x97\x82I\x95\x81\xdbv\xa9w\xd0\xdb\xd8p\xeb\x99\xed\xadt\xb9dk\x82\x88\x9e9\xd8\x08\x9b\x8a\xe5\xab\xab\xcd9\x00n\xa8D\x8bmq\xb9\x977I\x18|6\x9bK\x03bc\x83]\xb6\x06M\xf4\x93\x19\x12\xa9\xb2\xc4\xce\xf7\x97\xe8\xb6\x12B\x8dA\x90\x80B\xf8\xc8\xaa\x06\x00_\xf4J\xbaT\x0c\xd9\xfc\x08\x18\x01q \xd0\x07 \x1e6@\x97\xa7\x84\xb8F\x8d\x97\x87\x83\x9ehd`G\xae\x8fT\xeb\x14\xf1\xb7:M\x1e\x7f\xc57'\xe0\x85L,\xe9\x17Ih\x97\xc6FP	\xbb\xca~j\x00\xbd\x06\x8a\x8c\xed\xc4\x0c\xac$\xc2\xa1\xc2\x84 \xc43\x99hA\x13\xdd\xe4\x00\x81\x92-S\x8c^\xfb\xda\x86\x90\x85\x06\xd0\xe4-%qe\xcf\x14\xec\xeb~\xc0\xc6Qq\xab\xa7\x16\xacln\"i\xbe\x9e\x07&\x90\x91\x07\xe6\xd1Qe?Fl\x0eK\xef\xa8\"\xfaAs\x14\xc0(\xdd3\x1dY;\"\xa1L\x9e\xda\xd4e\x80t\xe5\x1c'\xc4Rz<MW!\xac\xdfS\x8a3$r\x05Z\x19\x16:\x88\x92b\xa5-\x0e^\x1c\xc7\x84/\x83$Q\xfd\xb7q\x0f\xf5J\x04B'Wd\xe1GAO\xb3\xa8\xca\xe3`.\xcd(	\xdf\x11\x9e\xb1\x08o\xa4\x1d3\x14\xf6B0\xf8\xcc\xca\xc9\x91\xf81\xe5\xa0\xccp\x0e(\xae\xc4\xed(*\x96o\xf5^\xc9\xc7\xaak\x93\x86J`v\xf1\x8c\x07\xe2\xb1[\x91\x06\x8b\xa1C|9\x04\x18\x9c=\xf0\xd9\xe5\xe9#\x84\x9cA\xf6\xc2Q\x98\x89\xe3#\x0e \xa2\xf2\xc97;\x05\x0e.]L:\x11\xee\xbf\xc4\xcf\xb8c\xae\xe7\x80\xd0d\x9f\x12\x0f\xc2\xeai\x80\x88Es\x02r\xaf\xa1\x08\x8f\xe2\xf36?\xe6}\x1d\xaf\x86\x14e\xc7@H-\x9a\x00b\xbb\x85\xd1\xc6\x96C\xb61;\xae\x94\x99\xe8.\x0d\x11\x00\x14v.\x0b\xb1\xc9\xbe$`T\xee\xab\xb8\x91\xf9\xf6\x1f\xc2\xfc\xf9 JW\xbc\xc4\xdc\xd9%B\xcbZ\xafI04\xc4\xd9\xf8\xc6\x13^:kU,\xe8\xf6C\x19\x89^\xeaWVF\xa9\xff\xa5\xda`\x1c\xa3F\xacb\x1d\x91\x12\xbe(\xf1\x13O\xd9\xcaO\xa9\x0b\xc82<\xc5\xdf@\xd4X\x16\x99u\x91\x00\x81\xf0g~\xd6\xc9\x91\xceW \x9at\x91&1\\\xf41\xa7L\x8c:\xcf\x86\x8f\x84\"\x87!\x91P\xb6\xc6\x01\xa2\xc3\x0b\x10\xe83/\xd8\xfe\xd4^\xa4\xf8\xc7\xb0\x9dq\x81\x88w`IA\x06\xbc\xe4D\n\x98)\xb0q\x17\xa3C\xd0f\xe2\x80\x13\x10\xd1O\x93\x13\xd7 \xb1\xe90\xf52Y29\xae3N\xb0\x89f\x11\xe3\x1bp\xe0\x84\xa8\x89\xe9\\\x00\x98C\xd0\xc3\xc6ah\xf6\xf7&\xb06\xe5p\xcb`\xe2\xda\x81z\xb3g\x82B\nhRf\xad\x00\x0f\x9e\xad]\x13;\x0c]\xcc#pw_t(\x9bp\x0cq\x03\xea\xbf\x8f\xd9\xb7,\xcf\xce\xedbdk\x8bR\x89\xd5B\x8e\xcb\xe8\xdaT?\xd9\xec2\xa1\x8c\x97\xc0\x062\xafc\xe5F\x84y2\x98\x15\x99%\x08\xac\xcd\xcfC\x15\xcfn\x08\xc19\xa0\xd0\x14\x8c\x850\x9b\xf1\xdc\xf79E&#\xd7l\x92T__\xc0S\xd0\xbbg\xb6)eh/\xda\xb7\x03+\xf7#:F\x1dGot\xf7k5Gbr;\x13Cb\x12\xcb\xb4\x14\xdc:\xc4\xca\xd2#\xbd\xbc\xc9\x9c	&\x00\xd5\xe3\x00Q\x11\x03C\x14\xa0\xf1w\xff\x92\x85\x99mxl\x13N\x87\x08\xabq\x88\x0c\xaa\x80\xe9P\xc7\x03\xb4)\x81\x13\xcd\x903f-v5K\x07\x89\x01\xb8\xa8h\xfd\xb70A\xd7\x9b\xa2\xa7\xd0j\xbbnSp\xac	\xff\x9c^H\x18\x02\xaa\x7f\xd0G\xb7F\x8a\xc0f\xdd\x00\xbe\xf3\x82H\x8e	 \"%\x1a[\x15\xd1\xbb\x12\x89\xdf\xcd @\x0b\x00\x0c\xdb\xe8p \xc9a\xc1\xa6\xce\xb1\x00\xec$$\x81\x9c\x07\xcd\x82\xc5\x14*\xe2\xc2_\xdc\\\xc0\xef@>M\x1a\x9c\xaa1\x0c\x110\xa8{=\xe6\x90\xf7)\x9e\x80\x0b\xb3K\xa0%\x8f$C\n\xc2\xf8\x919\x8aM\xf0\xf6\xbc\xeb\xbc4c\x01	\xea\x80Eotj\xcd\xc2V\xa7GD\x8e)l\xf18\x93\xaf,\x98\\w\xc0\xa5\xe0\x0b!\x00%$\xbf\xd73t\xc9		T\x12B\x1az\x92\x9e\xd2\xb4	iU\x1aJ\xd2\xdd\x12[\xa2\xc7x\x12g\x13d\x1c\x84\x1eBr\xef$\xc5\x18!eq\x88\x81\x92\"J>\xe0\x10\xa3	\x0c)\\\x9d~\xa1\x82\x8a\x893\x08\x90\x0e(\x08^\x0d\xe2\xa0R\xc2\x808#>\xd6\x07b\x9b\x05\xe4H\x80\xe2G'7_\x0cf\xd3\xabc\xce\xbatD\x00oAA\xdf\x83\x86(q\x99B<\x16\xfd`\xc7\x03\xad\x1c`V\x88\xfc\xf8\xe9\xce\xab\x94\xa9\xd6\x98\x19\xc2*\xfab\xde\xcfu\x8b\x14P\xad4\x13v@\x97+\x95\xca\x04.\x08\x8f\x92\xeeQ\xe5\xd4\xa5$V\x82\x12\xa1\x19\x95\xed@C0\n\x0b\xedR\xa2\xd3\x1c\x04\xdc\x90P[\x91\x1d\x11z:X\xa6H\x18#e\xe4\xc1\x0b\x02\xf2s\xa0>?\xfa\x05E\xc8WO>@\x0eI\xd8$|s\xac\x9ei\x1a\xe2\nE\x02\x12S\xa5\xb2)0A\x8c?\x16\xa39\x95ab,\xb6\x8d@K\x9a\xf1\xcc\xa9o&\xee\x04\xfe\xfc\x0e\x88\xacQ\xb4%\xac\x0c\xcf\x9eLu+\x9b\n\xc2+\x90H|\xcc\xc6\x90?\xb4\x16NK\xcc\x1b4\x8c\xc6\x17\x92\xd3CnPt\xe8\xb3\x0d'OT\xf2\x9c\xd2.j5\xe0\xc4\xb48\xc8\xdcv\xb6w\xd6\x9c\x90\xab\x12I\xa5\x12&\x95+\xdf`\x02\xbc\x8ay\x18S\x9d\x90caO\x11[#\xa1g\xb0\xa7\x08Q\xa7\x9c\x80\xb8\xdad\xaa\x17[\xeeK\xbdI\xe7\x9f\x97`\xf4\x07\xc4\x8cLP\xfd\xd3\x18\xb8	#\xb0\xc1\x9c\xbd \xa9)2\xd27\x16aT\x83\x7f\xe4\x16\xebi@c\\\xde\x90\x91\xee\x0b\xc2\xe2\xc80n\xeaC\xbbp\xf2\x10\xdf\x96\xe9\x81\x8b4\xcd\xb5\x8e\x90x\xf6*\xf1\xcb\xd0R\x94z\xd5\x0eY\xe2\x84b\x87\xc0\xfa\xdbT[\\\xfa\x1dkU\x02\x99v\xecH\xca\x88\xdcq\x92\x08p\xe0\xa6\x84I\xc2\xedI\x18\xeb\xc5\x97)\x08\x0b\x8bbB\x0d	\x10X\x94P\xbaN\xb4\x85\x9at\x0fz\xed	2\x0dI\xe6=\x12=\xa4 \xa6\x1f\x1b\x1c\x0e\xb3\x88\xfd\xa8\xc3;}\x86b\x8a\x9c\xe0q\xfe\xd3ji\xde\x86\xa7a\xb2#\"	\xac\x17\x9f>1\x01\xbc\x82\x90\xb01\xe4A\x9b\xa3p1\xd6\xed\xddP\x82\xa7O\x12\x1a\xc7\x04\x13\x1d\xe8O\x97ux\xf7Q\xf4\xf9\xb0\xb9\xce\nF\xcf\xb2(\xfah\xdd\x84\xa9O'MDx\xcaL\xedK\x11$\xc8\xb5\x9ch\xe6&\x0d\xf9\x8b\xa6\xd0\x04\x001\x8c\xef\xc44\x9b\x9bSi\xa0\xdc\xe3rHJ\x16\x92P\xb0t\x00DM\xcb;rM\xe3\x82+\x94\xf6\x97\n*\x96\xe0\x9f\xed\xd8\x975u\x172$\x07\xaaf\x103\x92K \xdf<\xf9P\xb2L\xe7r\xd1c\x8bI)\x81\x98\xd6\xe5\x16^\xeb\x1fda>\n%\xc5\xe0\xd1\xb3b\x0b(\x9f\xfa\x96@\x08,\x912f,~\"\xa67\xdbR;\xaeE\xd1\x1d\x8e;\xac\xad\x94HX\xe5(\xfa\xb9\x12\x9f\x17\x1c4\x8a2Z\x03\x1f\xe4\xdd\x08'\x00T\xaa\xdb\xbf\xf6\x8b\x81\x84\x04\x0f\x94\xbd2J+\xff^!#o\x1b\x8e\x84\x9b\x94Y~4\xd8-\xd7\x83\xf2GW\x1f*\xf0!\xdf\xc3A\x95\x1a0&8\x80f\xe4{`\xbc\xbd\xf8\xe0W\xf6=\x92DP8\x92'\xff\x13= \xd6R\xa6 g\xa9}\x10\xf4iP>\x93\xca\x03#\xb9\xcb\xe5\xb94\xc3\xd2E\xd0BRY\xae\xc6^4e\xf3\x02\x9d\xfd\x82\xa7N8\xb8\x8fV,[B\x8b\x86\x15\xc4\xa8\xeeD#\x81X\x86\xf8]\xb2,\x19\xd6\xe8\xe2\xabLBsNC>\x17\x0d+\xa2\xedo\xcd\xea^x\xa8\xec\xa7\n\xa0\xf7\x0e\x95\x90\xfajC\xec.4\x0f\xc0Y\x11a\x89_{e\x01\xa6A2=r\x8e\xf0\xd8+\x00\x89\x05\xad\xb4\xd6\xee\xa7\x04\xa19PO\xbbA!!\x0b\n\xd7}\xb4Y\xcaP\x1a\x02Je\x84\x15\x97\xe7Gn\x9a\xb1%x\xfc\x8d1\x16\x14\xac/}Rg\x12H\xd8\x08\x9a\x11a\x0c\x8e\x01^3-\x8a\xa9 \x8b5\x06\n\xb6|\x8b\x01qS\xa7\xd0\xf0a\x07\x08WK{\x0c1al`I\xc0\x181\xd3\x0b\x99\xc6Q\xe9\xbe\xebf_yy\x05C\x19Z\x14)\xc4L3X\xb1]\x0bW6@DM\x99\x15T\xf8<.\x84\xabu\xebG\xceK\x8c\xec8\xd9Ds\xf4\xda\xd0\xb1\x03W\xe6\x91r\x85\xdd\\\xdf7Z\\\xd5\xcb\xff\xf2V\xd3\"I\x18\xa6\xa2\x8c\xf5S\xa1\xa7\xaed\xb5\x89>C\x8e\xa6\xc8U\x81j\x90\xdf\xc9e\x02\x9e\xc9\xc8\xd3D\x13\x05	\xae\x163\x19M\xc7tWcP\xef\xaf\x05\x86\x96\xf2\xd3\x896#3Q\xd7\x02\x9an\xe1\x89\xa9\x85\xb0J\\\xba\xa1\xc3\x05\x197\x9e#\xe7\xa3\xb1`\xd8\x80K\xeb\xeb\xa4 \xa9\xd7\x08lV\x036\x0b&\xd3\x1fT\x1d\x8e\x92	\xde~\xee\xdal.\x92\x9d\xbe\x16\xa1 <\x98\x98BP\n\xa3*\xb4!zRZ\xc4\xe4e\xd1\x99\xbb\xbe\xbe\xd9\xb7\x04T\xb1#\xa3C\xe9LH\x13\xb1\xac\x18\xc8\x16\xaa\x08W\xc5)\xdaD\x9b\x86\x16\xf7\x93p\xaeYU#\xc9\xca51{WJ\x80\x8e\xa44^\xc4f\x12\x19\xb3\xcc\xbc\x15Z\xb0\x11\xf6\xcc\xd1y6\x96\xd3\x91T2\x99d\xce4H=\xeaB\x84\x1e\xd2\x8a\xc9\x10\xac\x0f}\x9c&\xdd\x83\xea\xc2,aP\xc3\xa7v+:2\x16\xe6~\xf2\xc1*0\xbc\xb0\xa2\x88d\xa6\xc9\x93\xc2\xf5\xd6\x83d	\x0c\xc2\x82\xf8\xe1\xcb!\"A+\x89r\x00\x90Hn\x0c\xa1\xc7\xe0sA\xe4\xc1\xc8\xda\x97U\x0d\x80\xfd\x02\x04\xf8\xa4b\xa0H\x93\xdbN6\xfe$.\xd0l\xc0};\xbd@\xa3\x11\xa1\xe2\x14iK\x7f\xc3 \\\xac\xd2\x82:v\x1e\x89QE\xc7\x00:\x1d\x08,|\xfd\xaaQ\xa0 Y0\x02|\xc7%\x18\xd6\x16\x19@\xed\x13\xb0 \xdc\x81\xe4qc\xe7\xd3\xd1dqh\xaf\xab\xe8\xab\xb9v\xdcC\xcdG\x07V\x86\x06\xb0\xa9\xb8\xaf-(\xd1\x03\x88m\x11\x85\x05\x921\x12\xbb\xae\xe2q89KF\x96\xd6\xc3\xa4\n\"2\xb1\xf2}Rr\x16z\xf3\x8e,j^\xa5\xc0q\xcb\\\x04\x85\xdd\x96#p\x19\x83\xbb+\xf5`f\x1dl\x9a\xb3\x13\x1c\xbd\x8f\xe2:k\x0b\xb4t\x965E\x84\x1aOaI\xc3\x0fJ\x16\xacP\x0d@ps\xadE\x99j1\xe44;6\x12\xf6\xf4/aH\xce.\xbc\xcf\xd3\xb0T\x00X\xa4p\x93L\x8b\xb8\x08\xc4L8\xa4\xbdF\xe7\x84\xdc\x9ai\xa8\x01\x0el\xed1\x96\x12\xb2Y\xd8\x8a8\xc9\x0d%\x8d\x16!/\xc1\xf9{\xad\xa8\x0e\xd2\xc5\xf1\xa0\xe9\x9c\x8b\xd9\xe5\x1d\xc6X\x9c\x80\xba\x07b\x88\x95\xbd\x85\x00\x15N\xc9\xc2\x04xp\xbb\xba\xe4\x06PW\xea\xbd\xdb\xed\xe8\xc4cI9\x18g\xb2*\xfe\xba\xbf\xee\x9d\x83\xb9\x9c%:\xd6\x1d\xbbL\xcb\x06\xdeu\x8a\x82CAO\xc2\x8c\xad\x99%\xac/\xc5\x93\xb4(Y\x08\xa2\xb3\x10^\xef?\xa0\xde\xe3\x1d\x81&I'\x88\xc8\x12uh[x\x14\x8b\xb4\x96Q\xf4$\xc7z\xd2\xb5\xc5\xbd\xf8\x01\x82	\xdf\xb3\x9e\x81\x82(=V\xd7\x80\x9f\xea\x0d\x02\xbem\xf0\xad\xc5\x04U)\x0b\xbb\xedl\xce\xa0\xce\x92\x18\xbe\xcci\x9c\x02\x18\x95d\xe3\xa6\x88\x99\xa8\xbd~f\xa6\xf9jG\x1b\xed\x01\xb5\x03\xd6R\x06{D\x80%>\xae\xa5\x90@\x94\x85\x946\x82\xa5\xa41\x82\x9c`\xc6\x1a!\xce ` \xc5\x1d\x86\xb6wY\xf3\xa7\x7f\x89\xd5\xe0\x81k/\x08a\x9d0A\x12\x86\x02\xab\xc2\xb9\x9f\xd4\x81\xb4\x0f\xcaYh\xb2\xaf\x97\xb5\xf2\x88d\xec\xe6x\x9a\x91k:f\x9a\x83\xff\xef\xa6\x1f\x92<\xd5\xd8\xd9WL4\x81`\x1d8IYMB\xc1Slc\xe4\xd6\xdf\xc8\xe0\x99-\xbbE\xd2\x82'\xce\xda\x8c\xc5:,\x1d\xffD\xac\xb0\x90\xe7\xd1\xd9\xf8\xc6\xa98\x184\xd3)~\xf7\xff\x042\x04\xb7j\x80\x9f\x96\xc7\xa0\x10i\xb6\xb7\x04\x0fB(L\xe3\xb5\x06\x08|\x0b\"a\xa9\x9a\xa6\xaf4,\x06\xa6b8\xa7\x94\xa5\xd4\x93\x17i 94\xa6\xe5\xd4\x11\x8c\xd2jW\xd1\x89\xb0\x1e\x0c\x02\xa96*\x90\xd0T\xf0\xa3\x1b\x86c4g\x8a\xcc\x93\xa2\xd7UM\xc9b\xb3R\xc7E\x00\xb2\xfe\xaa\x8b\xf2\x85\x1aC5\x91\xc6)j\xe4\xc8\xb4 \x91\xad1\x8d6pb\xc3\xeb\xdb\xc6\x8eH\xf7\xa7\xaaFx\xf2\x88\xf1\xb9\x01\xbf\x97\xaf\xab\xc4\xa3\x8f%4\xe2\xf2Q\xd9\xc4\x17C\x04\x89\xca\x88\xa7\x0e\xc5	\x1c$9\xd2:\xc5M>\xf2E\xd6\xdda\x03\x01\xdc\xc6\x02o\xab\x81\xcc\x9f^\xc2\x15\xd8<\x02\x19Iw\xde\x11\x00Ygq\x8f7s[\x86\x1f\xf0\x92\xf0	-y\xd01\xd8\xb95\x86\x19\xe4a\xc4\xe3M\x06K\x9a\xd7\x90\xe6RB\xc7Y\x80\x86\xf3Fq}\xb9\xe2\xe7\xb1\xf48\xef\x01\xc0\xb2*\xc8Nt\xe5\x90'.Yb\x14\x84\x94\x9b\xa4\xcd\xf0Z\x15\xcd\x1e\xfbv\xc5K\n(\xca]\x05&\xc9\x9c\x13\x1c\x8a\x19(\x0e\xa0\x1d\xd5\x99\xa5\xfd\x1e2\xaf:0\xd5\x0d\x80\xe4o\xa4\xce\x8f\xd1\x85\x1cPKiBH4U\xf0\xb9X,\x13\x8e\xa2\x8d[\x17\x88\xf0$\x0c\n0\xadmX\xb1\xe5\xbb\xd8\xb4\x8f\x82 \xf2\xa5f\xeb\x015\x0f\x15\xf0\x03\x040\xb1\xa0VR\x0d\xa98\xea%\xd9\xd1\xf1\xca\xde\xa7\xa7\x02Dt\xb0\xc3U\x8c\x91s`\xf4\x1d\xb7\x1b-BP\x8f\xc8\x0fz\xf4\x01P\x13\x94\x1ds\xeb\xb0\x03\xc1\x11\x12\x02\xa6v\x04I\xeb\xb68z-\xa5t1DiB\n\xd2\xdd\"\xcb\xb6\xdc\xc8YTJ	\x83\xc4.\x9a?\xd40\xc77\xe0\x80jL\xa2\xc3N\x9e\xfa[2\xfft\xc8\xc2\xc4\xae\xcc\x8e\x18\x86\x8d\xe6\x00\x0b\xf9#\xfe6?E\xd7\xbb\x86\x94\x8c\xd7\x10\xa1\xae\x88:\xc9\x9e\xceY;\x83\xe7\xacA&q\x85\x13\xeaS\xd8IR\xc8)\xc9s\x05s\n9*x\xd2\xdf0Bj)m\x06\xec\xe1H\xa7A\xbe\xf6hy\xd0\x8fh\xf2Mm\xa4&4\xc5\x8a\x854\x80\x0b\x80\x87\xdc\xdag\xb8\x9fV\xe6&tY\xf3\xda\x1e\xa6\x02\xcfOCS0\xb3Y\xb2\xf4\x82d\x077Mv\x8d\x07N\xefj)w\xeb\xf7A\xc9(\xac\xe2o\x7f\x0d\x1f\"\xcd\xa2\xc9[\xa6\xd6\nE`\x9b\x94\xfe\x8a\xeb7ez\xb8\xc4\x8f\x86\x9d\xbb\xde-\xb7Q\xc0]\xa66\xdb+\x13Bca\xcd@^I\xc2:\xb2\xd2\xbb\xb4\xde\xfe\xbe\x1d=\x83\x02\x97\x9a\xad\x88sS\x9f\xe4\xcfn\x1dc\x08\x11\xc7\xf9\xd3	6\x1c\x0d\x82\xcd\xe7O\xe3\xa1B\x844\xbd\x88\x9f\xe7\xa0L\x1b\xa5\xa8\xc0\x07\x07Gp\xe3B\x89q/<\x95zA\xe3\xd3C\xc1\x01\xa5\xbb \x80\x05\xd4A~\xb9\x12\x16\xc9x\xd00\x0b6r\x17ih\xa3\xcdh\x1f\xa4I\xec\xd8\xb7O\x82\x03N,:\x0eo\xc7\xc1k\xec\xe7\xda\xf6\xc5/\xf3\xb8{H\xb0\x14\x15,\xdbz\xd0\x82g\xdaf\xc8\xbbz\x97\xaf\xd3\xce\x805\xfd\x90F\xf5\xb2\x14Tr\xc0n/\xe4t\x11``l\x86\xc1\x14\x06\x06\x99*\x08H6j\x1fT\x0f\xa1\x1etG\x04/x\xf8\xcb@P@(\x84\xc4I\xe8p\x0d\xd2e\xba!\xf9\xea`wv,:A\xec\x91\x9c\x0f\xb9\x0eN\xa3 4}09\x01z\xc7qC\x90\x17\xec\xe4$r\x00\xec\xfc\x02\x0eM`\x19Y\x86Q\x94\x92\xa0\xf8M\x7f\xe4\xe4\x95\xab\xb3\xf7\xc4(|\xe9B!\x0f\xed\x08>\x1d\xa2\xc1\xd8>\xabO	pwj\x08 A\x02*@\x9b\x12\x90\x1f\xaa\x9fJ\xe4C[h&3\x8d\xfc\xebB \x1fQb\xfd\xcf\xa9\x108\x0b\x85:\xf1\x93%f~\x81v\x01/\x8bl\xe2S\xe4\xd0\xe8\xd20\xdd\xe8\xfe\x02\xd0\xf00a\x19\x93\xb7\xb6\"<TX\xa7@\xc7&\xb0\xf4\xe0\xb0Jg\x80\x0d3\xcf\x95\xec\xa4\xe9HF\x0c\xd5\xd0o\xef\x96\xe9I8\xab\xa1{\xfe\xb8:YT\xe8\xf3b(\x0b\x14\x88\xb0P\xebj\xfe\x04<za\x0f{\xb8\x85\x1ewX\xa5oa\x9504 \x9e3\x83\xcc\x05l\xca\xf8G\xc8\xb6\x16N\x92\xe00>\x8eB\xe68(f	\xfauGo\xc7\x9a\xc8\x0egy\xf1\xc5\xd7t\xa3_\xc3y~\xc0\xcd\x94\x8e\n\xc3%\xe4\x07\x85\xb0\xfb\x1dm\x90\x0e\x86L\n\xe8\xe0!I$\xe4X<T+\x1d\xca3\xad\x9cdq\xf3\x08\nD\xf6M\xe5\xd4t\xcc\xf52|fEV([\x15\x19\xe2]\x91Ndb\x8f\x9cD3Sp'\x0fR\x9fG\xac\x1e\x1dm\x97K\xa2\x9b<\x9cT\x90\xe4\xd9\xb0\x00}\xbd5i\xdc\xb7\xb5\x17\xca\xb9\x97\xe0\xccp\xb8\x88\xab\xbf#\xc4\x02&\x0fjF\x17\x0d\x15\x1d\xf4Z\xb5'\x06\x94\xae\x922\xef%y9\xa1Q#2\xf1H]w\xacA\x88}\xc6vf\xa7\xe2\xd8\xd0\x18\xb6\xe8%\xfa\xb3\xe9\xf2\xf6X\xa1\xd3\x9a\xb7\xec)\x94X_\xa0S\x0e0\xe5t\xa3(\xb1\xa4\x93-\xd4\x12\xee\x80\xe2\xb0\x93j\x01Hp\xd4\xf7\xd3\x96v\x9c\x08\xef/\x97\xce\xf4\xe8\xa9\xb5\x15\x13\xa0,9\xaew<`\xf8E\x93\x88\n\xed\x1e\x02\xecF\xb0\x17agA\xd0\xd9\x93\xa0\xd0\x89t\xa9\xb4)l\x9ce\n\x9b\xf8\xcc;\xe9\x0c\xb6\xf6$9\xba\x9f\xd7\xee\x8c\xb0\xf1\x06{\xe6C\xf9\x17\xa8\x89\x00\x9c\xfa()\xaa\xc7?\x1f\x11\xaf\xf1\x9e\xc3\x18p\x83\xbf\xbcI\x06F\xe3\x1c\x92\x1a\xf8\xac\x87\x8b\xac\xa6\x97\x9eb3\x94\xd2\xf1l[):\x98drr]\x9f?\xc2\x86\x9f\xd5\x96\x98\xf6?\xb8\xc9Bd\x11\xc0i\xe5\xb6D\xd5\xe5\xd6\xc5\xf5\xf17\xfd\xfchJ\xa4\xd1:\n\xbd\xc0U%n\xe63a\xc6\xac\x13J.\xcc\x1a>t0\x83\xcf\x12\x80~\x16\xc0e\x8cP\x88z\xcb\xcd]\xa2U\xecg\x0d\x7f\xd0\x9d=_\xb1?\xf1\xba\x1b\xb5\xba.j#+`li\x91\xa1	\x1eB\x8a\x0e\xf1\xe2M5\x9b\x1f\xd2 \x0b\xba\xbf\x10\xc5\x91G\xd2p\x8c\x9e7\xaba\n\x86\xd6\x92\x1f\x8f%Y[\x18UG9\xe6\x99\xf2\xc6\xd3@\\\x05bD\xea\x1c\xd0Y\x1c\x85\x92{\x89\x9d{\xa4\xf0\x0eED0\xae\x97\n\xd6\x01$\x8d\xa0\x1bQ\xf8+FvC\xf0`\xdd\xa8\xec3\xb0\xfdQ\xa5	\x93\xee\xb1\x10E\\\xe0\xd0uC9\xcd\xe1\xc3![\x80$\x12\xeal\xef\xdf\xf5\x0b\x9a\xfa\x90\xea\x10\xf96\xdfD\xa8o\xd9Dg\xc0G\x88*+\x8dX!\xb8\x8d%#\x82C\x80q\x91\x0c?\xe9\xad\x0f8\x07ZU\x1aB)U@\x07\x08o\xa2\xcfpg\xde\xa9\xb6\x01Z\xd8q\x85\xa1\xa1\xc98\x8e\xca9\xf8\x9e\xc7|uc\xe1c\x08A\xd1\x9c\xb6\xad\xe9\xb0\x10\x95W;\xa9@\xe1\"\xa0\x11\x80\xd8\x19>P\x82\xd3\xef\xe5h_\x99\x9d\xc7\x109}.6\x80\x84\x90V/\xc7O:\xe03\x1b\xb4}\x8e\xa1\x13Z\x1cS\x0c\x1b\xb1\xb5\x9c{:\xd8\xda~\x92\xf3\xfe\x9c\xc5y\x0e\x1f\x8ak\xa6c\xee\x16\x88\xa4O6;O\xceB\xe1=\x97bV\xf1.	R\xbfk\x8b\n\x01o\xf1\x0b\xa4\xff\x07^\xb1GV=\xe1\xd8 }\x11\xefoI\"+\x0d\xf4\n]w\x87\x81\xd7F\xaa\xc1z\xcf\xb7\xe4\xae\xf6`<\x93\xc9\xf5\xb230\x9d\xfb\x1f\x17h\xf7\x8c\xc53]\xeaR\x1ef\x7f\x05\xfa\x97\xbf8\x145\x04\x169s\xbc`K\x85\x06\x1e\x10M\x80\xa48\x03\xf1\xcb\nX\xbbUq\x88<\x89\x98\xa5\\\x98\x93\xc6ZO\xe0ss\xe8\xbfM\x92\xb7&\x03j\x1c&\xcf\x0d\xc4\xd6\x06\x02\xf7	.\xa7%\x9f\x0e\xa0\xd2P\xcaBL~^\xe4\xdf\x01\xff\xf9G\x88\xcb\x88\x913p\xe1D\x87\xac\x95:\xed\xb8\xd7\x1a\xa3Z\xbf\xa3\xc1\xb9\x04\xa8\xa9<\\\xf1\xab\xc7\xa0i\xaf\xa8\xdbW\xcc\x86\xa8\xc8\xc2\x10\"(\x94\x1c\x83:\xe1\xc5\xe2z\x8b\xa9\x96\x13X\x96~\xea\x81\xce0\x05P\x18G]8\x90\xef\x82\xbc\xaa\xac\x83\x8c\x88RQMN\x15T\x00\xa6qf\xddW\x03~!\xdd0\x94R%\xd5\x91\x9d0\xf0xvGFy/F\xf8-\x9b\xcfw\xfau\x82/\xf4\xee\x1f*\x7f\x01\xeb\x07+\x92\xc6	\\\xf5\xc28@\x886\xa2\xab\xc2\xfe\xa9\xb4\x8b\xbbc<\xb4\xe0\x0e\x1a\x16L\x02\x83;c\x8d[\x9a\x1e\xfb\xf7\x8a\x07\xdb\xd9\x07\xc2\xba\x0bnr	\x9fQ\x15S'o\xa3Qu\x18\xf2T\xae{\x08q\xd2\x90\x90_\x9c\xcd\xbf\x8f\x83\x83S\x04d\xaa\xbbA\x04*\xc3\xb0:m\xf28Yuz2\xffPB\xab\x0d\xecHh`\x18l\xb4k\x92p\xe8\x13\xffLLh\ncEb6e\xdb\x8f\x00\xd2\x8b ?!\x84\x99\x10>|\x0b*=V\x8d\x01\xfc\xad\xbbK\xee@\x9e\xeb\x93rx\x910\xd3G`%\x08ryr[6\xea\x8aY3\x8c7\x8c\xc5\x0b\x87f\x17*\x97*\x18\x1bn\x95\xe0%9\x99\xdadf\xc3\xe81\xf31\xde\xa2\xda\x81^'\xcc\xfd]\x89\x9a\x96\x0dR\xcd\xdf\xe8q\x90\xdc\xd4.\xd8\xea\xf7\x00,\x9c\xf6\x95\x89\xd3^%\x84\xafl\x1a\xc2\xda\x11\xe2\x0d\xe3\xbde\x14\xd8\xd8#wW\x1e\xc2\xd1s\x12\xf356!\xd9=\xe2\xe5!q[\x04\xf6\xb0\xc4\xd8\x0c\xc3\x00%\xc8\xd4\xae\x18]\xf3\x8b5^:\x80\xbdm\xa85\xa9\x10\x10)\x01?\x11\x90V\x0bb|\x9au\xc07f\x93\x05\xba\x19\xecw\xb0\x9c\xe6\xc4\xf0,\x11:\xe7Y\x1ee\x0c\xe6\x86\x7fR\x07\x7f%\x94\n\xf2[\xc0\x9b\x8d\xee\x0d\x10\x1b\xc9o g\xe6F\xabA\x15z\xb5FP\xa5\x12\x9b\xf2\x1d\x9f\xc0\x10\x1d\xd4x\x9b\xb6\xee{\xcf\x16\x07\x07\xed\xf6d\x82x\xc3\xad\xd6w\x01\xc38\x8e\x98\x96\x08\xd9\x94{{\x03L> \xae\x82d\xac\x13\x812C\xe4\x00L\x91\xba\xa8\xe4L\x19\xde,\x9cL\xdc\xe8\x1e,\x84\xf2(\xe0mS\xec\xf8\x12\x9b\xc3\xd8\xe5\xe5$=\xd1|%\x9d\x15\x06\xd6\x9dlu\xe8&	\xc4\x85\x94\x1a83\xe3\xda\nN\x0c\xa2X\xe5\x8ax\x0c\xeb\x0b\x04\\Vn\xf5\xcd\xef\x9eJ[)I\x9b\xea\x0ew\x8c\xc4/\xd1\xe9\xb9\xbb\xb2\xda\x0c\xb2\x7f\x18|\xa0G\xc5\xba\xd9\xd8Y\xd7\xc1\xf0\xf7DH\xb5\x98\xbd*\x9b\x12S\xfd\xaa\x8d\xee\xe8\xa4\xe6\x92\x1a\x1ap6\xae0\xd3c\x8fJ2\xe3@\xc5W\xb4%\xd1\xa6c\xef\xbc_\x1a^\xd3$\xd1\xe7#\x08*:G\xa7\xae\xe6\x186\x8e\xa1\xefn>\xcdD;\xfa\xf9\x02\xa5\x90~\xa4`9\xebhXB \xf1\x1dU\x8e\xabJ\x03B_\xd0\xb2\x88\x98\xf9\xcb\x88\xee%\xaa\xfd\x92\x01\xb4w\x17'\xb9$\xb3\xe8v|#T<\x0f6\x078\xe7\xaaKM\xb6\xcf\x91-\xd95U+\xbe\xb6\xa1'\xed\x06B\n\xcb\xc4\xaaN\x85\x91\xf8\x8ebJ\xec\xc3Ov'\xc8\xec|\x8b\x84+*M\x8c\xbck(\x0fd\x88\x0d}\x9b\x10C\xda\xcb\xb1@\xa0\xb3\xc1q\xb0\xb3\xb9\x04&\xf9aR%}\xb4\n\xcb!\xd6V\xd0\x83\x91s\x113w2\xa6\x8e\xd1a\xb22\xb2\xff\x8e\x17awH\xe6z\x10\xa1\x17/\x8d\x9dQ0\xf0\x02F\xa6 \xd9]~;\x03\x9e\xa5\xc3\xa4\x9d\x12\xcb\x15\xd6 ND\xf9P\nm\xfc\x98K3x\xde\x15\x8ake_\x99\xa3\x0d\xa0\xf1\xf3\xfeS\xaf!\x90\xa1V&=\xb2\x05\xb2\xaa\xb2\xbav\xe7\x19\x19_P\xc0\x8dL9\xd8\x83\x18Y\xa3\xa1i\xbf\n\xa7NU\xad\xd3_\xb6\xac\x11\xaf)\x96\x17\x83\x90J6\xdd\x7f9\x91f*\xca\xf0S	\x10\xb1 \x11\x1d\x8f\x1e1\x007\xdaF|\xb8BR$\xc9\x15\xb7y,\x19\x0e\x04\xc6\xb1.\xbf\xc0\xd5&=uqs\xe1\x18\xf3\xa1OD\xc5\xf2B\x9b\x1f\xc8\xf4R\x84\x19=\xe7\xd9\xc9\xb3\x97e\xf8\xd8\xbd\xc9\x87\xe0\x1bB\xae\xac\x03\xe4\xac\xd6H\xad\xa1\xae\x13\x01\x88\n\x1d\xaa2lu\x03'\x9dh\x117^#\xffS\x85)\xa3Xi2..P\x00e\xa1/@F\xd5K\x13\xc9\x11\x91$\xe9](\x1a\xd8%\xe0|\x962\xc9\x1d\xf0\x13Y1\x10\x05pC\x9d\x07\xb18t\xc1\xf9I\xf8\xe311\x14N//+\\\xbb\x93p\xa5j\xd4\xc4\xef\xf4d\x80\x94\x18\xce\xe1\x18\x00W\xcam\x15\xe9\x9b\xc3I=\x04\xdf\xbd\x12\xb7\xd3\x08Y\x03\x93Zx\x1e\xa1\x01\xd4M\xd0\x89P\xfd8\xb2\x93\x011/\x0bJG\xab\xf5\xc4^U	\x14,P\xc8d1O\xae\x14\xf3\x06^\xacy\xdfpq\x94\x13l\xbf\x81\x0e\xa32h\xdd\xd1$\xf8\x7fjv\xf1\xf8\x8b\xfe\xaa\x04\x1d\x01\xad\xcc\xf5\x9eI\x9a\xf6%\x87\x8a\xa8\xa7\xe1\xe8\xd4]V\xe6\x06\xce\x13\xd6\n.\x00'[+W\x12U8\x1b\xc1\xad[\x8e\xe5\x86\x01D\xea\x06\x92\xb3\xe8,\xdf\xbb\x05\xbe-\x0f=[\xc0\xe5\xd9\xc2\x06\x02\x0bO\n\nw\xff\x83\xa0\xbfE\xea)\xe53\xb1\xf8\xac\xe4\xf3\x0f\xbfJ&\x02\xa5d\xef\xd9\x82\xdd\xb6R\xc2\xa1\xac\x06\x97S\x96\\.\xb0 \x955J$I\x8d&\xf3\x91\x18\xddo\xaa\xb7\x1fH\xc8\xb3~\x9b l\x87\xbd\xcez>\x80\x1a\nUx\x08/\xf5H\xf1\xd0u;\x9a?Gt\xae{?\xe0\x0f\xb3;\xf3T\xa1\x8c\xaaH \xe4L\xfe|F\xfa8\xe1\x86\x03\xf0\xb2}\x88\xa1{\x0f\x18\xfa\x98\x1dp:\xdf2t\xec\xcd\x86<L\xa4C\x02A`\xb2\xbc\xd3\xca\x98\xc6\xe2\x1e\xc3\x87\xeb\x93\x9d\xa7\x84+'	\x89\x97\x89\x1e\x82\xb9\xaao\x13R0D\x1e?A\xfbClI\xfe\x02\xe7\x08\xafZ1\xac\xb6\x9bF?j\xe1\xa7\xb4\xf9\xf5\xe4\x1e{^\x00\x9c\x17E\xb5dGI\x9c\xb5T\xb0\x11\xba\xa1&#\x12eJ}\x0c\xd6\xc4\x0c\xc9\xa3_m\xa6\xdc\x00i\x92\xb3\xd0A3\xf7K[\"o\x9aC\xd9TJE\xdf\x9e4\x08\xcbc$\xf4\x84j\xdd\x8dbY\xcbn\x0eathY\x00\x08\x84`YG\x1b\x81\x14\xc8\xe3e\x08i\x82\xb5\xa8\xf1(\x85a\xba#ps\xbcW\x90\xf2\xb1\xc2i-1\xf2\xc7\xd1b\x99\xab,\xca\x8eT\xe9cm\xaa\xe5\x0cb\x07\x1chv9jh\x11\xdc\xf43\xabt\xe84\xce@\x06z\x01\xf6K\xb1\xb1\xe6\xea\x99\x86f\xd1\x1fj\xc4\x96\xc5\\$5P\xfc\x85!\xbchR\xb6\x93$P\xe9\nM\x16\x93\xd1\x9a`\x92\xb3\xff\xaa\x07\xc0C\xf4C^%2\xd9]u\x0b\x0e\x01Os\x95\x87LTx\x93\xed\x14\x0f\xddp\xa6Y\x80\xdc\x1c!\x9bU\x11\xc6\x9c{\xb0\xcd'\x00\xd0\x16\x92\x04\xe1\xa4\xcfyL\xf0 +\x8e\xb0l\xc8J\x15\xe9\x8b8\xaa\x00\xca\xdf)\x10@\xf6w\x84$F5t\x134\xd5\xdb\x11\xbe\xad\x0e$\xc3,\xa3\xb234a\x08T\xfe\x98\x05&\x89\x86\xd5\xdd\x84\x15\xa8Ui\xf5\xda+\xbf\xe4\xec-\xe0\xb2\x91-\x9b\xe7,\xae\xf0\x05{!/\\\xc5\xc2\xfc\xcf\x82\x9f\xc2\x9f\xb1'&\x0b\xbfS\xac\xc5\x00\x99\xc10xk\xc0Y\xff\x91\x1d\xc50I\xb6\x10)\xab'\xdd\xf6\xed\xe2~\xbf\xd6 \xb4\xea\xab\x95j\x83\x03\x13\xf5#\xb1m!\x96-\x02TQ`\x95\x8b\x89=\xb6\x1a=\x9cK\x1bR\x1e\xd4\xe8\xd5,.i\x18\x15s\xa1gI&jf\x89-\x13I\xcd(\xff\xaa~\x0c\xb2\x8e\xb3o\xa8\x8b,\x15\xe8i\x9e\x80\xa9\xe5\x82\x8ct&\xda\\\xed\x9d\xe8\xd8`\xcd\x9e\xb9\xb9\xe9\x05\xd2\x95,\xe4Y\x86\xe7G\xdc\x91u\xc1\xa0I(\x0f~[\xc1!2=\xca\xcd\xfd\x0b\xe2\xf8\xb8\x93\xa4h\x1e\x1d\xd9\xe5\x88&I\x99\xa4\xea{8~4\x9c\x8c\n\x0b\xf0j\x0e\x10(*\x81\x81\x01aA\x85T\xee\x05R\xfe?b\xda0\x84I\x93\xb3K\xeb\xbeP\xff\n\xb8\xac\x9e\x80M\x0c\x07\x14\x8b\xfb^c\xb3\x9c\xb4Yf\x01\x143\x8c\xe2-\xae\xb9J\xb8\xf3\xba\x13c\xb1\xf7r\xf8;\xfe\x03r\x05\x7fu\x9e\xeaGuA\xc1T1?Q\x82\x89\xe08D\x8apy\x82y\x16\x86+\x1f\x1a\x91\x05\xd2c\x9e\xa6\xec\x8a@6!\xcb[o\xcb\xc4\xd4f\x08\xa3\xd7Zp\xad\x11\x12\x00\xd7\xe2\xc9\xb2\xe8`$\xc6Q\xf5\xc8!\x86\xb2O\xad\x82 \xe14\xab\x8a\xbb|\x8d\xac\xc7qi\xf9\x8aL^\xb7\xd8_\x15\xc7\x80M+\x9e\xc6\xbeQb\xb2\xb9#7\xd5\x83\x02\xd8\xecX\x0d\x045=\x9e\xdaq\x13Q\xbf\xe7\xee\xac!\xbci\xeb\x1e\xe7\xf9m~\x95\x87\xf9\xf7\xc5\xf7\xd4\xdc\xf7\x87u\x1f\x85\x03\xdd\xa2\xea\xe7\xd3\xdc	r\x01\x11(48zr\x18\x8cY;\xe3*1\xc3y\x18Nk\xd6$9\x04j\xd6\xf4\x17\x10\xcai\x01\x05p\x1c+\x88q]\xa0\xe6\xb0g\xe8i\x99f\x94\xd1\xee\xf9\xd2\x0f\xa6f\x85\xd4\xa5\xd7\xbe\xa0\xa8\xa4\xd7\xbb\x91>a\xb7\xcb\xd1\xa7p6\xd1\xcf\xed\xd4\xfb\xb7\xb6\xf8\xe85Y\"L\xdaD\x93\x8c\xf9.\x8ar\xbc\xd8V\x0f\x93\xdf\x04\x91\x15\x14\x1a\xb2\x18\xdfS_\x0d\xba\xda\xcak\xfe\xcf]\xbbn&\xfaH\x8d\xb8\x0fz\xa7~\xa69\x91\xc3\xa6\n\xa6p\x0d\x15$\x1c\xa74\xd9\x82\x94\x8d'\xa2{\xba&\xa0\x01\xb8\xab\xff\xcbM\\\x9f\xce\xb0\xe9\xd1\x87\xa8\xae!\xecq\xaei\x08\x9d\xe0 \xcf\xc4(.h\x9a'\xcb\x0bB\xb1\x0bT\xad\xb2\x9f|\x0e\x1e\x9e{\x04\x06I\x846cL\x1c\xf2\xa1\x10.\xb9\x9e\x1e\xa3\x11\xeb\xb9\x8diI\xbe\xea\xab\xbf\\!\xe0\x1d;\x08\xa7\xe0g`1\xe2\x0c\x1d\xe1\xbe\x15\x95\x98j%\x10C \xb9o\x9d3*60\xf7\xb7E\x8c\x07\x98\xd8\x8e\x01\x9e]t\xe4\x89.\xd7-%0\x0dY\x1e\x89K\xc7_nft] \xb7\x17*VFC\x1f\xc6tJ\x92\xb0\xc4T\xd4\x12+\x16\xa4\\WZ\x908\xe1\xf2\xc4\xe2\xd7\x10g\x1bF\xd0\x04\xb2\xe0\x02\xd9^\n\xde\x9ef\x14\x9d\xb6 5\x9a\x12I=\xb6\xd7\xf9#6\xf6.@\xf52z\xd2\xc3;W\x9a`\xffB/\xc4\x99Q\x05\x05\xf8\x8a\x1ag\xed\xb0\xfc\x15h\x8a\x19jyJ\x9d\xd3\x19\xb0\x80N\xb2AX\xa43\xaa\xdd\x05,\xf5\xa4\x9b\x00\x0bK\xe46\xe8\x92\xeb6\x1b\x8f\xda\xb2\xd8M0\xaeT@\xa0\x8e\x85O{\xa1\xa3\x984k\x13j\x1f\xa3|\"\xacft\xd1\x9f\x94\xdb\x84U\xfc\x82\x18<\x08\x16-\xfc\x18\xdea\x86\x14\xae\xd5\x19\xe65b\x8f\xfa)\xed^R\xb1\xb08\x99\x84\xce\xc1\x9e:\x86\xa7il\x1e\x90\xbe\xad\xc0Ka\xc76@\xb5\xe6\x94\xc3!\xc0\xcd\x1a\xc3\x0f]\xa0buv\x0f\x1d\xce\x8f$	\x11\x87oU\xc7\xc2\x9c\x81~:.\x85\x10\x06\x14L\xfbt\x96\xe8\xeae\x97\xfc \xc7\x1b\x0f\x80\xa2J\xce\xbeP\nl$S\x13[z\x0e\x96\x8f~\x12Rq39\xe9\x92\xba\xf4\xb69\xebQ\x08\xef\x13\xcb/\x90m\"\x95%\xca\xa4\x89\xaf\x86\xbc7\x9f\x17\x03\x0e\x9a	\xc3\xee\x1f5MKL\x9f\xe9\x91\xa7\"I\xdf\x8fG\x84	\xe8XT\xde\x8e\x1aXL\xbfF\xf0\xdd\xa7V\x0dj\x91p^\xa1/M\xc3g\xc1\xdb\xbb{\xb6\xb9\xbbw\xf4\n\xec*\xf8\xba\x80\x9e9\x0e\xff\xf0\x97\xcaO\xbe\xca\x88<\xcb\"a\x12\x1f\x0f\xf4\xc1\xfe\xf7A\xe1\xee\xef\x88q\xbf\xbb\xa2\x86.\x1fM\x7f\x97\x13\x002@m\xf6\xeb\x87p\xbf^\xda'\x93w\xdf\x95m\xf6\xc7k\x01xO8\x0b\xfc$[\xf3\xab&\x17\xc1\xfc|Y\x82Zy\xfd`2_|%\x11r\x97\x93/\xe5J?\xa1Q\xf9\xc3\x0eN\xcc\xb1l\x893\xc3\x9e\xce\xdfK\xa1\x14E$\x96w\xffv\x07\x13\x18C\xcb\x01h\x7f\xa3\xfb\x0ba@\xf7U\x801\xa9M\xf8\xbe%\x02\x160?1*\xa5\x0b\x96$G\xd3Z\xd3{!|\xc7\xca\xbf\x18\x11\x04\x10\x1a\xc0$\xc3\xdf\xdb\x95\x10\xc2-\x1b\xf2\xd9\xaaEv;\x90\x8b\xcd\x93:\xe4\xbd\x15\x8b\x9f\x1a\x06`Bl\xcf\xcb\xb8\xa0\xec\x8c\xa7\xc7\x07\xc9\xac\x9boQ\xdd0&\x8b\x02\x95\x04\xfb\xfe\xf1,\x86F?\xa1\xfd\xc6\xe4\x84^\x9ds,\x87c\x93\x99\xc1h\xcb\x95\xff$\xc3E\x13\xfccl0\xe5\x13\xbaw`\xfd\xe2\x8f\xba\xb9\xc5\x88\xa9@/\x80r\x07^\x16l\x988cT\xb73\x99\x9d\xdck@\x9b\xdc\xfaJ\xc2\xdd\x94\xb4uP\xd0\x18\x05&\xca\xaaN\xc9\xf3d\xf9Jj\x14T\x90K\xb8\xaai	\xb7\xe9*u\xa7\xbb\xe9X\x96{t\x93j~\xbd\xc9\xa1}\xf9\xf1\x12\x0fi\\B\xc8K\x1den\xe2\x8b\xc8\xb5|N\xeb\xd6\xea\x0b\x9au\x9d\x92\xef#\xc3]@\x1fl\xf5CZ$iP\xe6a\xbd\xe3\xb8\xa9t04y20\xfc\x0ds\x11\xd8\xd6\xaa\xe2,Au\xc6!Q\x07\xd2\xd8B\xe4\xcf\x96\xf6\x96^\xec\x88@Vs\xc9\x91\x80\x82\\\xdeZ\xdfa\xe37\xa9\xec\xbe\x89\x04\xa9\x14\xb8\xe2\xd1\x88\xb3\xbb6-T\xefr\xb1\xc0\x17\xe4U\x98\x8f\x0b\xe0u\x18\x93\x8c~\xeb\xb01H\xc2J\xa8(<\xce\xb1\x8e\x82\xf2\xbd\x90\xd3\x1d\x0e\xb3bR\xd4\x96\xb8qi\x0b\xcf\xe9\xe6\xa2\x10\xacJ?\x1f\xede\xffG\x00\xc1\x0d\xa7*jV\xc4\xa7\x0c\"\xe1\xd8\xe3\x86:\x0eY);\x8f-F\xe5\x06\x05d\xf4\x17!\xf0H\xa3\xbb\xd9G~\xb4\x95\x1fu\xa6x	cb\x8f6m\x95\x16\xbc\xf8)&;\xf10\x1d\x87\xcfdU?\x878\xc5X~\xef\x9f1\xd12\x8f\x9a\x17\xdb\xbc\xa8t\x80\x88I\x00\xd8x\xe85\x03\xc4\xc0{\x03(\xebz\x84\xea\n\xdc'\xbf\xfb\xff[\xa0\xc5\x83k\x8e\x08\xe8Z\xd0\x85\xd8\x12\xec\xe9\xcdi,\xf0\xc5b\x991\xcc\x87\x8b\xa2\xcd\xe1`\xba\xb1(\xf4\xaam\x8fH\xe1\x81N\xf0\xec\xfce\x89K\xa4\xb0\x10\xdf\xd4/\n[\xe0\xb4(\xf5\xf6#Q\xf4\x97G\x06d\xcau\x1a\xceT\xa9\xbd\x7f^\xf8m\xb3\xa2\xbf%\xf9\x86\x8c\xc5!(\x987K\x1cg\x03\xe9\x85P=\xe8\x13h\x0e\xf8\x1f\xcf\x95\xe1k\xc9\x90U+\x8c\xc2\xc6.[\xd2e\x05\xaf\x8b\xcf\xd0\x03\xbc\xb3C\xc1\x8f\x9e\x8f\xff\xe5\"GD\xff\xce\xa8\xa3\x9b<*<\xd6\xcf\xfe\xe9h\x0b\xab)\x18\xa4` A\x98U\x0c@O]h\x14\xfdl\xc5f2\x94\x85!H\x9e\xe7\xcfF#\x00QB\xc2\xe9=u\xc8\xbe9f\xb4h\x07\x80\xf3;\"R\x84\xa5\xda\x00\x92\x01K\xdc3-\x82(\x08G	)\x05\xbc\x19P\xb1\xe1\xf8\xa1\xa8\x9e\xa6\xb2\x10T],7\xc1ec\xde\n\xeb\x1d	F4hH\x0c\xd3s\xb3\x1473\xe1\x96\x9f\xa0\x12\xa1\xb2\x16\x0b\xe2\xdb`\xe0\xbaR\x96\xa1T\xedwf\xcd\xb3;6B\xf3>\xc5\x98\x0d9&\x15\x06\xc8\x1b\x05\xe2\xdb\x06\xd1\xda\xdc\x82\x02\x05\xce\x08?\x92\x97\xf7\xf8)\xc0\\\xa8\x8c\x80\x81<&O\xcc\x86\x99\x1c\xf05	\x11L\xc3Ju\xa5@Y\x9e\xdd\xdd,\x1d\x90\xeb\x83\xb2\xda\xbe\xdb\x04_w\x07\xc20\x98\x03^\xe917\xf1\xf0\x08\xf0\xf6\x11\xecp\xde\xbb\x87*>D\x948\xe3\x9f\x11\x98\xfc\xb0_)$U\xc5\xba\xf3\xca\x15R\xb4!j\x1aOF\xf4\xd6>{\x88\xd0\x1f\x92\x91\x0b\xbbt,\xaf-\x1c\x85bP\xb5,m`D\"/\x9fz\xf0A\xe2\x0d\xcd\x94\x02\xd8\xa5\xea\xdfQZG\xd5&U]\x90xej\x04x\xe6\x13\xe5Lwv\xf5~\x10\xb2\x9c=)@\xd8B\x1b\xaf\xd6\x086\xca?!;5\x143/ps@\x02t\x83OZS7\x10\x03\xa9\x94\xa7\xd8\x99\x14\xae\x92n\x9f\xd8lx\xe8\xfb\xee\xffZ?\x12\xe1\x83Z\xf9\x97j\x03\x0da\x0e\xb2\x96\x15{\xfd\xfb6\x97\xa5\xff\x19L4\x9b\x8a\xab1\x9f\x03\x7f\x0b2\xb9\xb4\xf9\x0e\xaf\x8bQ\x87i\x18\xdc\x19\xfd&\xd6\xa5l\x83\x88\xe1\xbd\xc5\xec]o=\x03\x1f\xa07\x1d\xc4\xc4\xbc	of\xfc\xd0\x96\xfcr\x0bMEV@\x83\xe2\x0fH\xf5\x03\xa6\xe8\xf2\xfb/\xe8\xfda\x08D\xa5\xd9\xa6\xebH\x95\x83\xae\xaelK5)\xc2\x8cZ	OE\xb4\x9c\x98\x1f\x84\x053\x10\xc1\xa6I\x01G\xa9'\xd0\xb3\x0f;\xeeD'\xb6zl(\x91\xa0\xf7\x9dE\x9f\xcf\xd1$\x9d\x8a.\xd9\x9c\xf0-W\x0c\x07R'\\w+)\xc2w3\xe6\xea\xba\xbe\xf9\xb8 @\xdb%R\xd4\x14)\xff.\xf2\x07~\x8a\x14\x059\x05;]\xf4\x14.\xc2\x9ag+)\xd8\x03%\xc8\x9d\xf6k\xd5\xce\xc0\xd2\x89\xb3\xa8^\xd2\x1f\xf6N\x80\x06W\xb7>b1z:\x1ds\x86\xa8oD\nK\x8d\xf6\xb2\xba\xc22w[|>9\xe2\xaevWMF\xe2\xafu\xde`\xb9\x1c\xeb\x13\xcdax\x87ch\xd5\xab\xf5U\xb7\x14\x81`*\xca\x86e\xfb]O\xa0V'6\xfd\x87\xc0\x03\x83x\xd4d\x1e?\xbcH]_r\xf5A\xbb\xa3+z\x11\xc0d\xadF\x9b\xafH	\xc4\xca\x8b<\xa4\x1e\x01\x85\xc7\xb4\x1d\xa3\x04\xd5\x02\xc6\x04\x17kUsFz\xc0\xba\xf2\xcfaH\xd6\xc79\x07-\xb3\x9c\x90\x00\x98\x83gv\x82b\x07\x8b\x1f=\xd3\xebL/\x11\x9eE\xbb)\x10\xb0\xc4.\x98\xbdx9j\x13%B\xe3)\xa0$\x97\x8c\xe9A\xcbB\xa2\x8f\xe6\xec	\x83\xdb\x1a\x9f\x01t b.b\xd2\x02A\x10E\xa8\x9eZ\x8dRb\xf6H(\x91\xa3\xf5J\xffya\xe3\x88\x1e\xd29Wj0\x05f\xa4\x1b\xdfF'\x9b\xb0X\xe0z\xbe\xc3\x0b\xef$DQ\xad6\xb4\xeb\x9eq\x83\xd8`	o\xca\xd0	i\x14=\x81\xe1\xc1{#4\x14\xa4\x13\xa9FYH\xf9@\xd8J\xd03\x0d3i~\x91tY\xd0\xa2\xd9hk\x05H\x87P\xcf\xf1\xd7\x0f\x17\xf7\xfd17\xd3\xe0\xe0\x04\xa5\x86Y\xdcD\x97\"\xdcp\x97\xc4\xa6;'\xb31\x026\x80\xc6f\x97pu\x18\x02\x8b\x17\xa0\xf4\xbe\x04>\x11\xfeF\x9boD\xc5Qi\xa8n\xe1\xcc\x92\x8d-\xcf\xe7\x0c@P#\xe4\x9a\x7f\xab\x87 \x12\xa6h\x93j \xde\x82\x06\x88\xc5\x80f\xb4\xb6C\x0e\x18\x96 \x96\x81\x837\xc2\xb0\x01\x94\x17T5HVX\xc9p\xed\xf6\xc9\x02k\x12l\xc4\xad\x8c\xb3\xae]\x99\xdayX\x06r\xc6)?\xcd\xba\xd3BNJ\x9a\x0cB\x83\xf7\xf8\xe4\xbd#\xcb\x07\x9b9e\x18\x14\x94\x00&&\xbb_0\x95\xd3\x1f=\xae\x9a\x7f\x7fp\x15Z\x14\x8f\xc96\xa7\xaah\xa4\xd9)\x03\xf0\x0d\xcc\x97\x83a b\xc0\x8c\x15\xed=(p)\x87\xe2\xd9\xe5\xed\xac;\x8a.N\x10\x95,\x93\xc3W\xed^\x0c*\x03h\xd4\xba\x8aC\x97\xeem}E\x997\x00i\x10\xf5\xe0\x876\xc1\x82\x06\x02\xc3\xf7a\xcbI\xedv\xcd\xb2xp\x83*A\x7fc\x14#4\x82\xff\x17\xfd\xfb\x8c\xb3\xc7\x08\xa0N\xf6&\xf0`)\xae\xc4\x89\x88\xa3H\xa3We\x9b\x83y\x127jl\xa1\xef\x08\xb0\x00o\xdd\x13Eh_n3 \xad	\x8bjp?\xaa4\xe8p2W\xc0E\x05\x1d'kT_\xe3\x0d&\xa3\xb0!\xc8\x96jVl\x98H\xed\xd3\xbb_k\xc9\x9a\xe1\xc8\xe2\xf6\xca\xb3\xf9\x0faY\xf9\x8c\xa0\xa1\x1b s\xce@\xe4[\x85\x04G\"\xca\xd3bY\xd5L\xdb\xdc\xabX\xa6\xaai\x8f\x0d\xd5C\x90\x98\x11q8\x01\xf1&\xfaz\x90\x90VaY{\xe8\xc6\x0e#I@\xb5\xa7\x7f\x1f\x9d\xad2\x98\x8em\x06\xf3!\xf4d\x01\x8c[1	\x85A\x10\xe0\xc6\xa2\x9a\x07\xffnK\xe8\xf0\xf2\xd5\x06\xc6e\xd7\x9d\xb2\xe5/>\x1d\x10\xdfd\x83\x02m\x86uX:x\xca\xb7\\\x84\xe2p\xf2N\x91\xfb\xfd\xa9\x1el\x9d+\x83H+c\xc7tS\xc7\xb6\x82\xe6\x1f\x14C\xc0\xb1[\xed\xe0~3\x8c\xcde\xc0}6\xb0 \x8d\\\xb3,\xce\xf1\xc9\x84\x98\xd7|\xa4Y\xf2\x04\x11\xdd\xa7\xe7\xf8\x98\xa7v]\xac'\xfb|\xbf\x9e\x9f\xeb\x08&\xed\x96\xecM\xf42\xb0 d\x10\xf5\xac\x00\x1bds\xe0x\x03-((76\x94\xa9a\x05\x03X\x9b\xbdm=\xd5\xee\xd3\x8a\xbf\xe3Q\x88\x97<$\x02\xaa\xaa\x00\x80\xfc\xf3Q\x05\x1e\xc2\x86\x98\x84\xba\\\x90\x02\x93\n\xd4\x0c\xaaqi\xe9H\xe9\x98\x87\xac\x8b\x89i\x06'i\xa4\x94$\x8f\"\xa3{S*V\x8fwF\x8b\x93/\xb0t<\xec\xca\xc1\xe1Q`\xca\x92Z\x16\xb8\x9a\x1e+\xf0pr)\x9b(\xb9.\x13j\xb5\xe9\xb8\xabI\xfck\x035\xf5	<\x04\xe4\xb4\x12\xca\x86\xb1\xcb\xae\xc9\xd6, k\x1bO\x91\x87\x9cDT\x88\xcaJ&^\x0e7\xba\xa3\x07\x87\xc4\xaaQ\x8d\xfe\x10\xa4\xcb\xcfv\xdfe\x10\n&\x9eZ\x90\xd8\x08\x92\x0d^4\xfa\xc6^\x06s\xb0\xf1D+`WH\xb5\x99\xae\x11\x81b\xec6\xd9\xc4\x05\x14\x05\xa9\x98 \x08\xb8\xae\xc8L\x9d\x98W{ZZ \xa6@\xb0\xe4mq\xe1\xfbv\xa6\xc9\xb7(\x04D\xc1\\+\xd4l\xe5\xe9\x14\xfb\x140*\xa5V\xa5\xdf\x87\xb0Vm\xd5\x1f\x8a\xa7\xe6h\xc6\x8f\xe6\xd8/S`|\xb3^\\<-\x99\x84\xa9\xc36\xeb\xb82\xa9N3\x9d\x82\"\x07\x0dT\x12o\x9f\xf3\x06\x04\x8clr\xe4\xc5e\xa0\x82\x12!\xf5\x04\xc5H2\x0b\x8b\x15p\x83A \xd6\x9b\xa8\xa0\x18\x87\x02\xde\xc3\xcf\x02{\x9b\xc8\xbc\xfe/\xa3\x1e\xf2\x9f\xd1\x00\xe7\x9cudU2*2\xf2\x10\"c\xab\xcc\"p\x85${\xa9\x80y\x81,\x0b\xe9\xa5\x8b\xf6\x11\x11\x1c&\\\xe0m\xbe&\xba`\x1c\xd0|x \xa6p\x85\x88C\xaa\xd2w#\xc2\xc9\xfbW\x909D\xadI\x07i\xf1\xd1\x96C\x88\x8f\x11\x9b\x02Ks\xef\x96\xe7\x87\x9d\x1dS\xb6\x07\x93\xe33\xef\x0c,\xb6\x0e\x91\x15\x96\xfeM\x9b\x92;\x1dj\xa8\xfeB\xeb\xa74\x9a\x9bP\x9b2\x02\xd9\xd9i\xb5\xee\xeff\xb6\xae\x00\xc9\xbf\xed\x17\xc1bA\xad]a\xa2id\xed\xc2\xf0\x10\x8a\xad\xa8\x0f\x86\"\xc4\xf2\xd7\x13i!\x07aQh\xd4CNO\xbd\xb1\x9e\x8a\xef\x82\x1a\xf5Y\xed\n\x93x\x06\x12F$\xc4\xf8g\x979\x16\x14\x9e\xa5\x10\x91Z`W\xab\x1f\xb0\x85VB\xe2g\xb8\xb1\xa0\xec\xda#j\\\xcb\x82\x97\xa8\x80e\xf9G\xf1\xfb\x1c\x0b[\x13\xb3.\x0f\x1d\xe0\xbe]\x8b\xaa0\x13\x14\xba~X{2\x9bD\xa9\x84?\x0b\x8a\xf8\"\xf3\x8a3\xc4B\x07\xe1j\x14,\xc0\x10K~\x0f\xc6\x06\x00b#\x840\x02\xac\xc9\x92L\x98\x01kc\xcd(6 \xb8\x0c\x02\n\xb1a\xfc\x04E\x1a7\xce\xbb\x81/\xd5\x8e\xaf%\x00\xad \xfc\xb1\x03\x9c\x0f\xb7\xef \xe0\xc9\xc4\xa1R\xeb^J\x14\xfb\x1b\xeb\xc5\x12\x04C\xcf\x8fZ+71X\xdb\x1a\x13\xb4\xd0UO,\xc1\x84\xf6\xe1\x14}\x0f#\x90-\x94\x90e\xd9\xa4\xa04\xf63\xc5\x82\xf0\xedt\xc3\x048\xa7\x99Z\x047\x08\x86\xcei\xe0\xac\xca<:i\xd1?Ft\x8bFk\x96\x7fC\x0cW'\x98\xea\x01f0\x01i\x02\x1b<\xe2Xdj\x97\xf9\x10\x8c\x940\xdb\x12W#i\x13\x8b\x0e\x8b\x9a\x96e\x08C\xcf\nzI7\x88\xce\x0eB\xb0\x03s\x18\xb7\xac\x98.K\x83\x0e \x12 *\x05\xeb\x8d\xddV\x91\xb0\x9d\xab\x12d\xff\x87\x9fD\x81lj\xf6@\xec\xab\xef%\n\xa9\xdc\x88\x9d\xe5\x9d\x0d\x15\xceZ\x88\xc4s\x18\xdd\xef\xae\x90sh\xcc\xb8%\x87^\xdf\n\xfd\xe8\xf8\xcd\xf7@\x188\x86\xf2\xa7\xa4\xf8\xce?\x0b\xa0N\xba8g\x17\xd4G\xf8gr\xa8X\xb0\x14\x17\x80S\x83\xbb\xa0\xfc\x06\xe4\x1b\x95\x0dAp\x0c\x91\x07\xb3\xba4\x87z*\xf6\xb94\xe1\x81\xdd\xe0\xa7,\xc3\xad\xb9\xc4t4G\xd9n\xd4\xe8\xf7\x91\xbc\x15\xf5dS\x0f\xe5\x13>f\xee\x94Q\x96C\xf2\x10\xcf\x1eWUZ{S\x08\xd9;N\x8f\x08x\xe5\xbd\xca}\xb0\xc7H&\xba\xbc*\x0b\xad\x009\xd7\xb8\xafq\x13\x8b\x9aU1 \xca\xf3\x0ca\xa0`(\x11\x7fM-a\xc8G}\xd5n\xb6\xcc\xbd\xe8\xa2\xda0	\x96\xbcp\xca\xd4\xc7mcn\xf1\x8e\x0d\xf2\xf0\x82\xc9\x98\xc0_\xfa\\\xb1\xfc\x17l\xbc\xde\xdb\xe0\xfe\xbb}\xce\x18\x1a	\xc8\x00\x0b\xde9\xf7F\xe1\x1cv\x9eH\x7f\xc3\xbek\x83JZ\xfcNO \xe5\xb4m\x08Z\x81\xe1\xc1Q\x9e\xed\xd2\xa4	aS\xfb\xebf\xfa\x16\x81\n)\x11QC+2\x16\nd\x92\x98\xa1[\xaf\xfd\xbb	\xcc\xef\x03\xc1\xf5H\"t*\xde\x0d\xc1c*b\xcf\xc6\xda\xa2\x01\xf7\xafq\xb0\xa8,\x05\xb5\x99\xf3\xe3\x13#\x01S\x98\x9f#\xa2\xe4u\x9b\x14\x0f'\xd2\xac\xf5:4\xa9\x1das\xa5\x03\xa9\xbeCDM\x90F\xa7\x13|\xc9\xb8m\xa9_\xc31L]\xf6\xe1Y\x98\x17\xca\\\xc0\xa7\xfd*\xa4X\x9c\x8a>t\xfa\x96\xaf\xb8\xcc\x16g\x8b\xa7\xd8D\x1c\x89\x9f\xa3\x8a\xf8\xe8\x0f\x04d@&[\xb0\x19)8\xc3\x18\xce;<\x9c{\xf3\xca8<\x11\x96\xc8+VG\\\xb0H\x98\xae\xa6\x1d^\x8d\x04\xafa\x97\x8ba\x90e\xdd-4\x94\xfas\xdaJ\xd4A	\x1b\\\xe0\x0c\x90hM[\x82\\`\x14\xf0\x12\x93\xbc#\xbfpD5Z97g;\xb2\xf7BW\xe2m\xce\xe4\x89qTXX\x91%0\xb9\x00v\xba\x9e\xe3\x86\xf9&\xf9\xb7]E\x0b\xb9\x17\xdb4]\xfbF\x10\x9fIJ\xe4\xa4\xf9\x96\x9c\x84&\xddS\x8e_\x12\xa6\xee\x834\xc8R\x890\xa0\x02\xaf\xa5D\x05\xfc+\xcbme\xb9\x04\xd4\x05\xa8Y	\x83g\xf7\xd0O\xf8\xf1+M{\x940\x06\x0f3\xcfv\x00'\xcd\x85f\x85\xc1\xc5t\xaf\xe1\x00\xe8\xa0:;\xf4\xd8\xb1\xca	N\xf4\x07\xa6n\xe0\\\xc7\x94^\xdc,\x0e)1\xdel\xe3\xe1\x92aB\xef\x03ZZ\xda\x01\x84[\x95\xe0	\x04\xb8\x9d	\xfbZS\xd2\xd2\xe4\xbcUYh\xdc\xdf\x86\xcf\xcaw\x7f\x80\xf5\x8b\x08\x9aS\xb8\\\xae/\xa4*?zQ\xd0\x8b\xff`\x90X4\xef\x1cg\xb9r\xed\xdb[\xa7\x08\x8aCW\xe6\xdbG\x16\xfb\x14.\xa7Y\x84\xec0Q|\xfbR\xd4\x83\x82E\x8d[w\xbe\xa6\xee\x84y\x83)\xb8\x10\xe1\xef\x91\x1a,\xd1\x88\xef$\xcbNK@c\x1d/b\n-#Z\xafI\x0d\x1b\xb9G$\xc6\x97\xaf\x99\x8btm\xe7\xcaH#\xea\xf0\x7f)X\xa3wP\x11ZAD\x7f|\xa2S\x0do\xfdf\x90\x8a\xf5T\xa4\x80\xddH\xda\xeb)\xb8\xce\xe4\xd3\xe7\xc7>\xaaM1\xa0b\x0d7\x1e\x03\xe1\x0e\xb0\x85\xc9\x86S\x8bu\xd0\xc3q\xd7\n\xf6\xb7\xf6jK4[s\xf0\x08\x84\x87\x10	\x1e\x95\x97\xd7x\x02L\x0c \x9b\xd6\x13\xbc\xc7\xa2\xa9\xeb]5\x0b\xfa!M!\x1fA\xbed\xc6\xa7N\xa0\xcb><\xab:\xc7\xbbZ(\xb08\x90\x86\xf8\x9d)e\x85\x0b\x84\xdf\x0d \xbb\xa5\x99\x86/\x99W\x15\xd8\xc8\xc0|\x0d\xfd\xb0b\xaa\x19\xd8\xe9\x88\xfa<\xe9\xf7\x9c\x83\xaeT?%\xc3 \x03\xb2:@\xb1\xe4\xd4,-\xe0\xf8\x80ecMP\xf08u\xa4m\xb0V\xd0g\x8d\x8c9\x1cH\xe9\xf66\xae\x1c\x12\xcb\x0f\xe7\x8b}\x0f\xbe=\x03\xb35\x00\x83\x81\x97Ab\xd2\xc4\x8e\xe6\xfd\xcf\xec\xb0\x81\xac\xce\x99\xc0V:\x92\x9d\x85_\xa0\x1cle\x1d\xc9\xb9\xdf\n\x11\xcf\xca\xee\x96\x95\x16v\x17\x0b\xfd`\xcd\x110\x8e\xe4!$`G\xc1\xe9A\"I;$\xdf^?\xfa\x81\x02\xae\x8a\x13\xed\x89Ke	\x05O\xa2\x15 \xcd\xf7\xb3N\x0f(\xd5\xbd\xe7\xf6\x93Yy\xca5B\xe7\x1a\xa1w\xb8\xd0V\xb9%\x88ju;)\x16lF\xb5oa\xe5\xec\xcb\x15\x9b7\x8f\xf3x\xe9\xff\x92\xda\xb8\xd84-\x89\xc9%\xeb\x9d \x05\x86\xf0$\xcf\xd6\xb9/zsk\xc7\x98(sh>\xbb\xc1DD\xa9\xc5\x83\xc9t\xa5T\xc4\x117\xf6rur\x1a\xc0\x16\x9c\xb80\xc9\x1f\xd2\xa2\xa0`\x02\xdc\xb4h5\x0d\x025\x90\x8c\xa6\xc9\xe4\xb6\x00\x93S\xe1}\xb8\xd1\xdd\xc8\x15\x06\xff\xd24\x1bhrva\x12\xbc\x03\xe9l\xe9c!ZjB]\x81\xb9\x8e\xa6\xa9\x1a\xce\x7fx\xe2D\xaf\x18\xb6\xffb\x96Tx\x8fzYS\x82\x1f\xdf6_\xf6)\x83\xcao\xb0\xd4p\x08>\x98#\x8f@P\xa2S\xd3*\xfdb\xdcS\\q\x0b\xc6\x8bx\xf1YfQ><\"\xf3\x7f\xb7\xb2\xe3\xa2\x0dY\x1c6\x91\xc5\xf2I\x1fE\x0e\x00r_7\xf1\x88\xd2\xb0\x0cV\xd4H\xc3!\x00\xb3\xc5I\xe7r\x8cEL\xe7\x8e6\x19\x9e!N\xbb\x00\x12\xf6q\"'\x92\x1cd\xa0\x93\x01a\xfeqMv\xba\xc5\x0f\x8bA\x1f\x82%\xed\xf5\xba\xba\xbe	\xf1v\xb3\xed\x15\xbd\x8e\x0bn<E\xd0\xb1\x89;\x81\xc3,\xdaw\xae\xdf2pO%\x1e\xacr\x92\x87X\x93\x06H\xf6`\x98uI#\x99/\x9aK\xb9\x06\xc5\x14\x0b\xf2;\x895\x1f\x186\x87\xdfLL.\x9cMI\x1b8\xd4\x08\x02q\x1f\x1a\xc1\xa44U\x91n\xe4r\xc9\xa1\x19\"s9\xa6(\xfb\xdc@=\xac\xf2\x14}N\x17\xa2\xa4)\x1d?S\x1d\x99\x16\xfa\x82\x85.\xfar\xbd0L3\xafm7V\x1d\xc2\xfdK HG\xb0/\xaeyQ\xbe\xc3\xe92\x08\xfb/Ww\xabF)\x1c\xb1\xc1\xe3d)\x1cs\x1e\x95\xac\x19\x01F\xeb\x13\x0c7|\xf3\x8e\xc6\x03\xbavQ\xcc\xb4\xcbA\xddI\x13z`\x80\\\x89\x86\xb8\xbe\xe5\xdc\x01\x96\xd0\x02\xe4\x84\x9b<>\x1f\xf0.;\x1f\x9a\x1f\xebA/\xcf\x07\xe7\xb0\xf42\xca\xb2\x89\x9ca8D$\x17\xff\x03GWv\x85#\xcc\x8f\xfb\x0d9\xaek\xc5\xc5'\x06\x01\xfc\x89\xcbo\xd8\x9f\x9co\x80@\xe2\xfd\xcc	(]gk\xed+}/\x03	(nq\x16\x87\xba\xecK(f\xa2\xcd\xd6\x0b\xdd\xc6\x9f\xd0\xb8\x9ep\x1d\xfc\xf8\xcc2\xd4\x1f\xc83Y\xb0\xe3\xdd\xe9w\x00\xb2pD\xfedG\xb4q2$\xcc\xc9}\x91K\x13\xd3\xafA\xad\"\xf6E&N\x82tg\x19'N\x07e\xfds\xd5\xf3\x1a!\xd0\xae\xf04q\xec\x9c\x17o\x14}\xec\xbf\x9d\xa5S\xb5\x05\xb5\xeb\x1e,o\xd5jr/s\x0c\x9cT\x0e\xfe\x04MT\x97&\xf6\xd0\x1b\xf0Qf\\12\xa1h'&ctN\xa6\xfa'T\xc5x7\xbc\x81]2\xfb ;G\xcd\x0e\x02	\xca\x85\xeb\xa2\xe3\x17|T\xaa\x01++:%/ \x86\xe8\xa6\xfb\x8a\xb3\xff1T\xc2\x0b\x01\x91\xc5\xfa\xcf\x1a\x93\x0c\x1a\xf3\xcb\x80\x9f<\xd4\xf1\xcc4\xc2\x0e\xd3\xd4\xf9\x8a\x0e\xc0\xcd\x94\xd7\xff\x93\xcb\x97	\xc9,0\x0f~\xe1\xf2\x9d!\xa1W\x8bO\xa9\x1d\xe0'\x89 \xe1\xcd:s\xf1u\x01\xc8\xc6\xca\xd2\xa6\xd9\x86\xf9\x8f\x03(\xb4^\xef\xae\x8e\x18\x0c\xb5\xa5\x9c\xc2)\x98\xf87\xe8\xd8\x00f\xc1\x80\xd1ml\xa5\xf2\xd2\xb9\xee1\xc5\xabt\x19\xdc\x1d\xd2Z\x83\x04\xe8\x08h\xc0\x0d\xcaL0\x0c\xa7\xa3\xb7\x96\x1a6\xd2X\"J\xd2\x82\xed\n\x8c\x884\xa79\xd8\xd1 \x9d\xd6\xa9B\xe9\x1d}\x83\xde\xd4\xad`\xe8`\x91\xa5\xae\xf0\x84\xd3\x92\x7f\xe7	#\xa6J\xde\xefn\xe9\xe4\xf4\xd1_\x91F\xad H|\x9a\xa1$O\xc8K\xce\xfa=\xa1\xc5\x93\x1fi\x191\xf7\xa1\xa67\x8c\x94o-\x7fH\xcbq\x1d\xa1\xaa\xfbp[\xc9\xab%%:\x10\x04\x88\xe4\x80\xc9\x88\x15\x10i3\x1d\xdb\xa0\xfa\x84G C\x97\x00LL\x894\x8aS\xd0:\x9edB\xf2j|\x89\x88pY\xd3\xf6S\xfeD\x90P\x1d>\xb6p\xd3v\x00\xde\x04\xb25KLe\xe8{t0\xae\xf2\x91y\xc7END$\xe0*\x9d;z\x1c\xbb5\x9a\x8aN\x92\x02\xe1BI\xf3\xd9gn\x8c\x80\x7f.N\xc9|\xd7\xb6\xe0\xd1n\xd0\x05\x8d\x94R\xc8aS\xa4Z\xd7\xc2JcH\xb2\x10 m\xcd\xd1X\xf8\x06\xdc\xca\xdf\x07e\x90\x12k;_\x0c6\xc8,y\x1e\x01\xca\xc2b\x94\x8d0#\xa6Z\x84\xb8A\x14\x0d\x17\x06e|w\x82\xd4\xccG\x0dU\xbd1l\xb8\xcbLD\xd87\xc3\x84V\xa3q\x92\xddt[\xadxu\xddE\x94QUL\x88\x01\xef\xf0PB\x9dlZSh\x96\x92.\xe1\xe91Q0U\xec\xd9\xb18R\x84\x06i\x8d\xfap;\xa6\xf1{\xf3\xf4H#\x96G\x03ON\x02!?\xeb\xa3\x05\xe8t>\xa9Q	\x08|p\xcak\xa4\x90\xdb\xf3\xa8q!\xe7gT,\xf6\xd5j\xc7\xd02\x04\xc3\xc8\x16s\xc7\x8d4\xed\x88\x8at\x1b\x94j\xe4\x0e\xb7n\xc6\x9b/\x08I\xc9O\x98E\x02!\xcb\x8bnF\xf5\x9b4\x12\xa8\x86\xb7\x88M\x0f&\x1e\xd41\x84\x1b\x92\x97\xbe\x85x\xd3$\xa7ew+v\x99S\xf0\xcb\n\x0e\x0cbm\x05]e%8\x0c\xb2\xe4\x90\x06P\xcc\xc2\x11\n!\xfa\xef\xb3\x11\x90\x8cs\xc2\x11\xf3_0\x066\xa3\x1b\xf2)\xc2\x8fQ\xb42JB\x86\xea\xd8\xfd\x01\x0c\x84[t9\xae\x96\x83'\x94\xa7\xb3\xd4\x9c,\xa7\xa2\xcc\xf4[\xbdf\x00\xc3\x86\xd7\x92\xb6]\x98\x1e\xc2B\x8aB\x1f\xc3@\x9a\xa6\xeer&B\x84s|\x95Q\x9a\x0d\xb0\xa7\x99\xd7g\xa8\xedOC\x88\x9e1\x87\xdcJ D\xe7<\xcc\xcf\xe2U\xff\x87\xb2\xce\xbc\xd3\x11(o\xa9!\xb3\x81h\xa6\x90\xdcK\xbdH\xfc\xea 0q\x9b\x88\x92\xa7A\xd1V\x88\x07\xbc'p\xb4f\xccy\"Q\nO\x04\x85\xdb\x0c2\xc7\x06Z\xbb\xbe\x9fq\xc2\xe0\xbd\x02#d\"\x9b@bQ\xbb\x06,\xae\x93\xc2\x0bw)\xeeP\xcd\\\x1db`x\x1f\x8a\xdf\x00O\xfe)\xde\xa2\x0cd\xbc\x13MC\x80$[Ho\xa4\x13\x90\x18W\xde\xa6\xd1va4{\xe4\xc7\xb1`52\xed\x0f\xfd\xba\x87\x06\xb3\x1e5;\x82\x19\x85X\xb0\xffao\x00K\x86;\x986\x93%\xc1R(\xc0\x82\x05\x8c\xd3\xc6\xd1\x85x9\x8a8\x0c\xc02r\xe3D\x1ec\xf7\x10\xa5@\xd9\x88\x8c\xe6\xbe\xc9\x10\xa4\xeeF\xd7<\x86d\x0f\x16\x07(\xc8AN#F\x81I\xb7\x9e\x9bz\x1cm\x1dE\x04\xfe\x89\xbbF=\xa9\xb1\x85\xc6\x9a\xad\xe5\x95S\x82\x80f\n4\xca8\xa7<'\xb4\x84\xedj\x90\xea\x8e\xf4-\xaa\x98\xda'\x08\xc7\x98<\xd2Tb\xf12\xddv\x80E\xc0t\xb8\xbfq\xa1\xd23qODd_\xed\xd0{`/\x9c\x0fhh\xea\x82\xf6\xcc`\xc2\x929_\xfc1hAY|\x19/\xf9\xeb\x0b\xab\xde\xb7U\xea\x08-\xcd\x95\xba\xd0\xc4A\xde\x0f\x94\xd5o(\xf1\xcb\xea\"\x93$r\xd8\x86T\xcc\xd7PR;\x15\xa7\x05.\xb8-w>&LJ\xf8i\x10\x1aC`\x05A\xa3^\x1b\xb1\x97\xd3#\x89\x80\xc4X\x178\x97t\x97\xf6\xe2H?\x80\x14\x08d\xc1\xbfa\xc3\xc4\x96TST\xda\x03a\x1e\xa8H\x9f0@\xd2\xee\x8a\x17\xf0\xf3U)\x88\xa3\xe6\xef^\x1be}Jb7\x17%\xd7\xdc\x94%\x0e:\x9b\xd3\xc6\xbf@\x00\x97\xafM\x8e\x07+\xf1\xbb\x17y\x94sq\x8e\x00\xaa\xa1\xebL\xcc\xd2\xfd\xf8\xbf\xe1\x0b\xca\x12Y\xaa\x19\x1a0\x0f\x140\xc3\x94\xf7G\xfcD\xa1	\x16>\xc4\xa9\xeaAW\x0b\x11\x88\xb6\xf02\x8dI\xdb:\xc4\xd9F	\x9e\xc8\x08\x02\xc7\x03\x9a3\xe3\x9f2<k\xbd}[\x1a{\xe7\xbc*\x99\"A\x8dz0\x85\xce:@\xde\x11\xc0\xa21\xa8A:\x13\x9d\xb5\xf0\xe7\x8a\xed\x17\xdc\xa4h\xd6\x1bX\xc3\xee\xa3C\xfb\xf1\x93\x93\xa39\xe8\x888\xc8\xcb\x14\xe8\xb5\x16\xd4E\x84\xf9\xf2\x18\xc9\xc5U\xd6\xd8eu)[?\xa9mt-5\xcbr\x94~J\x1b\x92\xdd\xaa\xd3V\x182li)\x1b\xe1\xd5\x9e<\xb8\xd2\xb3?\xf2(D\x86\x7f\x17\xa6\xee;)\x92\x9do  (\xad\xa4\x98\xcaX\x1b\x1cI\xbfI$\xa6\x96\x92\xf1$\xaa)\xc0'i(\xc0\xaa*\x92\xa6_\xb5\x1a\x9fE	K\xb4\xaa*\xbd4C\x8bk\xe0\xfd\x1a\xcf\x0f\xf7wkOI\xf0\x98FfQ$8\xce\xb3\x9d;(0+.\xbd9\xb2\xc3\x14\xc2\x0e\x1c9u\xdd\x06$\xe1\xc20\xf6\xec\x8ft\x0b\x91170\x89\xecf\xc8\xa6\x0d\x0d\xc7\x92\xfbaO\xb5=T\x0e,\xe8m;\xb0\x80\xf4\x15n\x12\x1c\x99\x91\x1b\x00\xa5\xf8\xcb\xb8\xc5\xfd\x1e\xce\xa7\x97\x0fc\xed<9\xf00\xfa<\xea\xc6\xf0\x0d_\xbd=g \x15\xc0\x11QV&\xde\x1a\xc5B\xb1\xdc\x80\xc1%\x14f\xd23`5\xcdF\x00\xdd\xb6\x96~\x17\x89\xa7`\x086d\xc9.\xea2`?\xce\xc0\x0e\x1a\xe9]\x02\x84\x13}\xecO\x18\xb40^\xadA\x02\xbfK\xb4N\\Q\xe7(I	{\xc9\xc6\x0c\x8c\xefp[\xea\x9c\xaa\xd24\xc5$6x\xa7P&\xd5 :\xb2\x1f'\x007u\x84\x07\x06\x04\xc7\xea\xe1\xdf\xd4\x7f	\xe6\x06\xa7\xb4&\xe9\xf5\x9fR\xf3\xae\x02\xaed\xc0'\xc4\x0d\xcd\xb4#{*W\xf8\x04\x7f\xb5\xe0\x1e\xe2l\x19\xa0\xb7D\xc6Q\xa7\xd5\xcc\x8e.*ZE\xee\xff\x0d\x9a\x03c\x83\xdd\x03\xe9\x017\xb5\xbc|\x024\x80\x0b\xe3\x80\xd5\x82or\\\x8f*\x04\xf6\xed\nH\x12\x05X\xa5\xb3\xd8\x18\x1b'\xc8#k\x1b?WR\xc0\x87\x91mP\x00x\x0b\xd9$\xd9\x93]\x90\x1a\xa9\xaf\x00\x1d\x0d\x16\xd7\x84FK\xc1 ~\xc84;\x0d[\xd2\x8ah\x062\x0c\xc7A\x10\xcc\xc9\x89f\x89\x1d\x90\x0b\xa8<P\x0ddg\xb6\xe9\x92\x0c\xf7)\x97!b#Z\x03\xa5?0o\x07\xb4\xd4\x01\xe1[\xaf\xaf\x01E\x01\xa0hX\xdc$\xf6\xb6\x0c\x1e\x85\xd3\xeaS\xfe\x10\xed\x92\xd8\xbe\x14e\xfe\x88\x0e\xbd\x1fN\xdb\xec$\x90\xf2\x96\xe6\xf0\x93\x8c=\x9f\x1d\x16\x178\xd0\xa8\"^	\x87V\xd9cFD\xd4\xefx\x98\xc1\xa7\xfd\xd1RX\x15\xb3C\xf5X\x93\xe1\x9e\xce.:F\x08\x83\xbfq,\x86\x84\xe61)b\xa1B\xba1\x01\x0d\xf2\xa7\xb2+\xa1Q\x9e)\xf2_\xc6OyE\xa3\x8d\xb3	\n\x19\xf4\x9f\xfc\x89\xbe\xba\xb9n\x1eTp \x1c\x05\x84\x9a}1`\xee\x9d#\x0e\n\xd7\xa3d\x16-\xbd\xd6\xa5#\x84O\xf1\xe1\xe2\x84\x9at\x14\xef\xc8:5\xd0\x8b\x9f/<b0\xb0'm\x9doqI\xa3\xdf\x0e\xc1B\xe2\x17\x8cFW\x89\xfc.\x91\\k\x19\xafc\xf85\xdf\xa6-v\x9bT[\xcd\x82\xe0\xf4\x9d\xb0\x15\xea\xe0\x13\x03\xb1\x17 \xf4\xfc\x9b-4\xad:d\xdd\x97u\x94\x86[\x17	8:P\x1c\xea\xb8\x88\xaa\xa3\xaaBT\x98\xfb\xb5U\xcc\xcb\xe7\x14\xc6Q\xf0\xa0,F24\x10\x82l\xc0EO\xf7\x14?\xaaD\xfek\xa3\x9c{\x12\x0d\xe5\xb11\xb8k6)R\xe4\xcc\x98GI\xc9\xcb6\xa7Yp^U\xc1\x10\xad\x12!A\xe2@\xe9{x\x7fg\x90\x11#^/	\x82\xd7E\x89Tz\xb0\xc7\xc4\x92\xca\xbb@\x02:F\x8e'\\\x8fQ6\x15\x83t,\xe6\xd4pT!i\xf5\nN!\xa6\x1ddG\x1a\xc1B\x07\xe1\xc4^\n\xf3$@yn\x9d\x10\x88_\x19\x1e\x1du\x9cU\xfc\x01\xba\x13\x0fC\xd2\xe0\xedK\xa8_\x17\x06K62\x98\xecB|\n\x1c^\x87\x81\xa2\x82T\xb2mr\xbd\x17\x8e\xa1LDg\xca\xbf\xcbf\x9b)!-\x1c\xee\xfa\xfa\x90\xd3o\x8a\xa4\x90ch\xbb}\xc9\xed@o\xe0[\x10\x18r\xe0E] \x90\xeb/i\xdaWJ8\xc1O\x18gb\xea\xd3\x81F\xd6e\x82(/\x94\xc2E\xce\xa0\x08\xe7yO\xf1\x1e\x99LB\x8d\x9c]IkT\xda\x89a\xcc\xe0bV\x8e\x11\xcc\xd5\n\xcf\xce\n	2\xbc\xb9\x93\x99\xd6\x81%\xcdb\x04\xbb\x8a\xc2j\xfa\xaa\xd4g\x86\x8c'\x82\xc0\xf1\x872\x85\x02-6\xb5\xff\x1b\x98D\xfc\x04\xed\xbb\xa2\xf2J\x17Ze'	\xb7oBi2\x1d\xfc\xfb\x1b+]x;S\xbe\x10P\xcf\x19\x08\x83\x0e\xa5{\xa3\x1e{Ju\xa4m\xb2\x0c\x84f^L\nS\x150\xc3\x19\x91\x92\xcd\xc4\x7f~o\xc7\xc7\xeb\xe6\xfc-\xeb\xf7\xd0\x0fS\xb8Ec\xf4*\x80vl\x00\x00pOm\xf3\x81\x14@\x13\x00\xf6v	-\x0e\x1fS\xe3\xffD;<U\x1c\x0b\xc8C\xaf\x11\x12Y\xd7\xe0\x15\x19\xbe\xee\xfb\xd6nA)\xa4pxO\xfd@\xa5i\xe5L\x8a\x90\xc27\x0f\x97E`K\\\x87J`\xf49\xdb\x02U$\xfc	\x05p\xba'\xb0\xd5\x8f\xa0\xdd\x01\x85\x8c\xd33\xc1\x10v\x0d+\x00\x93n\x9c\x98\x0f%\xa7l\x08S\x8a}\xdc\x05\x01\x89A\xc5\x18\xecNj0*\x0f\xb1\xa6\xe8\xd7\xb348\xd8\xcf\x02\xcei%\xd1\x05\x87\x16\x8a\x94\xd28\xd1\xe3P5\xc2c\x89\x8c#\xc5\xe8T$\x7fF\xbb?$\xb2\x97\x80L~\xaaI\x9e\x0eQN\x0f_\xf2M\x03C\nTn\x89L\x8a`)e|\xc8\x90\x8b!d\x9a\xe4\xf3\xda\xf2\xec\x04\xdc\x91[\xecs\xfb\x91D\x94\\V\x07o\x15\x8d\x82\x06gF\x1d\xfb\x9c\x08\x8eG(1\xa8 \xc6\xcc\x1bOJB\x99\xc9\x11\x00J\xdbFR%p\xe1\x9d\x06\x8e\x1d\x8d3N\xf0P C\xe9S\xea\xf3\xd2\xeb@pM\x14\x94\x00\xcd\xddvA\x00f,-\x13 +\xaeH\x83Ft\xbb,\x9f\xb6\x87\x06\xf3wf\x03A\xa8\x12\x80\x00\xa9\xb2\x8b\xe6\x8e)y\xc1\xf3\xee^\xad\xc6\xb8}\x02\xc8N\xc5+s8\x16\x04Z\x16\x82$j\x87NF\xb3\xf1\xd7\xe2i#\xdal\xc8\xd6\x08\x16\xe2h\x81\x96\xb4\xffP!9ge\x1d\x0c]\x02\x06\xf0i\xcb\x07\xa8\xf6h\xf2\xef\xe7\x80\x01\xf6\x1af\x93v\x16'\x05\xf4\x83l\x17\xe1\xf0!\xea\xe8\x1cyn\xdbO\xdb\xe4]3\xe3\x00i\x86\x99\xd1\x8f\xc0\x0eF\xcd	\x9b\x80\xc8\x05Pkc\x9c\\\xe7\x88\n`\xe7\xf5\x0f\xde\x16@\xde\x15\x0892\x01\xc4\x0dz\xbf\xb5X\xe3\xfa;]\xdb\xa9\xe1i\xaa%[\x1b5\x8b\x14\x94\x80\xe0p\xac8Q c\x8b\xc8\xe5d\xdb\xf0\\\xd1Lo\xb1\xe4\x02;jP\xda/\x8a\xad\xf8n\xfdg\x81\xa2\xf3[\xe5\xd2qB\xd2QP;\xf6\x98,\x18V\x93e\xd9\xe7\xd03\xdcP\x1er\xb4'\x02\xd8\xb7\xf54Y\xff\xa9\x86 8\xbb\x0f\x06\xf7[%\x0b\xcd\xf6\xa6c\x93\x08\n\x19^\x88`\xd5\xf7\xb0	\x9a\x8b\x06\x19\x0eP\x1a\x1f\x05jL>\xca\xa0\xedq\x17\x80\xf7\xc0\x94:6S\x95\x97\x8e\xd1]K\xce\xcf\"\xa0\xa5\x08\xaeg[\xa6\x9d	\xe5\xcf\x91H\x93\x1b\x1d\x1e\x98\xe2\x03B\xac5\xc8V\x06\x1cEq\xdbLJ\x8c\x95X{C\xbc\x88\xb9\xa7B\xbd\xc5\x03\xd9\xd2!\x08\xa5P\xabI\xe1\x90\x1dq9\xbb\xf8Llx\x96\xae\xca\xaa7\xd2\x1b>\xd6\xa4\x96\xdb]@\xd5!@9H\x03\x94!\xaa\xed\xe4\xc8p\xc0\x1e\xc9\x99\x15\xd5$	\xe2?\xde\xd5)\x9b\xab\x81\xdc\x8e\xa8\x05l\xb0\x06/\"\xb1\x94\xc0\xcc\x81\x96\xaf+\x93@`}}:\\\xf7\x95\xaf\xd0	8\x95zQgS\xa3\xbf\x18+\xf2\x92\xa4\xbf\xc1\x92C\x84\xa3}\x80\x1bR:\x9f\xf5H\xfeUF\x02\\\xa1X\xfe\x92g\xf6\xc0\x18/\xe2\x08\xeb\x80\x04AZ%\x11c\x1f1\x10\xd5wlET\x00\x05\x96\x0fwX\x0c\xa0\x08ZNh\xa5\xa0\x85\x08\xc4yf2D\xc6 \x80\xc3\xb8\x18\x89&v\xaeL\x93q\xee\x1e4\xc67\x95\xf1\xa7\xfb\xcaz\xfa\xf0\\\x90iJ\x11y\xc0\xe8J-k\xafN\xc43\xbd\xa0\xeb	\xa3-\xbc\x05s\x91\xd1J\x175\x16\x89\x0f\x97\x1e)\xd9V0\x99N\x170\xddd\xda\\\xd3\x9bd0d-\xa9\xe3E\xda[mf\xa3\\\xa3Um\xc1x\x11\xb2\xd2\xd2C\xabR<(`\xaa\xd1\x95\xe6\x1d\x83p4^!\x06\x9dh\xd4Q\xe8\x0b\x00`\xa2\xf9\x81!l\x08\x93 ~\xc6\x99\xec:J\x87\xc9\xa0\xf1l\xfcW\xb1\xfe\x809\xcb\xb8\xccZXB\x14=\xeb\xc8l)`j\x9e\x1d\xaaeVJ\xb3\xe0U\x80\xb3\x02\x86G!\xaes\xd8\xe71\xd4?\xc6\xbc3\x84\xa8\xc3\x8a.\xb3\x1e}b\x1bIa\xd9\xea6\xe0\x03\xca\x95\x06\x16\x0d\x1e\x9ct?\xe8\xc0\x80\xdeS\x07xZJ'\xc3p\ni\xeb,\xa6\x12.\x88\x8f\xf1\xac\x12\x90\xd8R\x07\x07\x012T`5\x00\x98-R\nBxr\xe6WH\x03\xf6\x0cJP\xb0e#Bb\x89|\x93\xaf\x94-\xb1\xfe\x90\xa1\x90\xec\x8b[\xb2\x84\xa0\xc6\x1c\xe4P\xc2\xe2\xfd\x85\x1a\xa4\xa8Eh\x8b\xb1\xb3\xc2\x8b(5S\x9c\xa2\x1d\x95f\xd5r\xe4\x1c\xc3\x19/]\x7f\xcb\x1c\xb0\xd1I\xc6\x8a\x0d\xcc\x15\xd6d\x94\xdeE#\xfa\xa2O\xaeS\xfa3\x979\xd3\xbb]\xb8\x16\xba\xb3\x80e\x1e\x82\xbf\xdb\xae\xd5\xc9\xb9.9\x17_\x8cb\xeae\xa7\xe6\xbeM\x8c\x14\xb4\x819b\x1e\x13\x19#e\x8d\xa9(\x92\xa6\x11-\x88 0\x9d\xa7\xd2\xd7Ra\xb1\xe0\xc6\x1d\x849\xf9\xba\x96\x88\x06\"\x02\xfe\x89\xb1\xfe\xfd\xfdU,\xe1\xc2%\xfa~\xbeX\xe8\xdc\x80\x1f\xf6\x97\x94\xebz\x80\x15\xdb\xbd{'6[@\x84t[W%\xfd\xd1*\x0b.d'vR {\x94\xd2\xf0h\x1e\x8a\x04\xa6!\xdeAed\x92C\xaaE}\xbbx=E[\x0e\x01|\xefB$7J\xa1* B-\xe1\x00\x0c,=\x11k7\x94[_\xb6\xea-\xd0I\xf4\x96\x0c\xa2\x15\xab\x80\x92\x87J5e\xd6\xcc\xb6\xc4\x01\xb4\x13{\x0d\xc8\xed(	\xb4\x86;\x10\x8d\x05\x14WMw\xa7`\xab\xb0\x02\x80\xcb~p\xdcA\xa0\xb0z\x15\x0e 8\x87\x02\xeef\xe6\x13))\xe2\x8c\xe2\xc2(\xde\xfc@	\xa9\x08\xc4\xaa\x07\xd9\x85\x85\xd9\x03<\xe1\xee\x85\xe4.a%N \xf2\xecn\x14\xe9@bz\xad\xc3\x19\x87\xc8\xd1\x1a\xc0\xb5\xbf>\x1a\x1a\xc0\x90\xeb\x18\x03\xf4%\x85\x87\x80\x05T\x07*?lgb\xbfd\xf6\x10\xc8<\x82\xc4\xb5\xe3\xfa\xc0w9Na\xac\xc5\x13\xbc8;<^*%\x9d\x9by\xd2:t\x11D\xa5\xd2\x95Z<\x1c@\x1b\x05\xfc\x890\xaa\xa8\xab\xe4\x82q4\xb1\xe4\xd0\xedl\\\x0d\x96\x1f\x15\x861\x86\x0e\xee\xc9\x1b\x9f\xd3\x00`/\x9e$\x12IJ \xd2\x93sN)\xbc;\x07:A;\x92)$\xd7\x95\n\xb0Ww\xa2\x12y%Kr\xdeIv\x0f\\b\xb6V\x07\x99\x06\xa3\\\x1cn\xadd{\xc0\xde\xf4\xc86\x15t\x10\xbb\x90v\x9d\xed\xd7/~\xa2\x00\xfc*O\xd6\xed\n\x117U\x16>\xa38\xfb\x17r\x82AC<\xba\x13j\xe9\x8aE\xe2\xa2-j\x0f\x1c\xe7\xd8\xe7\x89\xb7\xa8\xfcxs\xee)\x81\x8d\xccD\xa2\x9b\x961\xbc\xc3\x8c/\xcf\xcaq\x93p**\xcc\xb8\x18\xc0$\x02\xd9\x91\x8d\x13,\x0b\x16\xdb\xe1\x0d\x83\xb3B\x1a\xf5\xc8\xbcp\xc4\xfa\x0ek	\x1bM\x17hp\x88K\xea7\x17\xc6\x15U\xe8\xa4\xc3]\xf0\xf8\xe1\x03h&\x18\x84-\x19\x13\x9e$\x03\x88\xe9\x8e\xbb\x81\xaf\x94\x93Y\xea\x90\x1b\xa3;\xe0q\xcb\xe96w\x95z\xdd\xf7\xd6W\xfb\xee\xcb\x84\xd6\xadA\xa6h\xb2\xecD\x7f\x9c\x91\x03^R\xf6\x03\xde\x1e\xc9\x01\"\xad\xc6s\x0f5\x00f\xfd\xfc\xeew\x0d\x88\xbf\xe4+\x10\xe7Q&\x12\x1f\x11\x92\x0e/9\xc8\x82\x96\x9c\xb8wN\x1eb\xc7\xeb\xe9\xfc\x90\x90\x19\xad\x0f\xe3\xfc\xb0\xd8z{\xe5\xd8\x1c\x95\xd3\xfeY\x17\xc5>\n]NE\xda\xc1\xb1c,\xdf\x9e#\x0cBF\xfd:0\xcd\xd8/-E\x18\x13\xc8\xbe\xc6\xc2\x8c\xc7\xd7\x83\xeb\x11F\\\xea\x8c\xf4\xe4I\xa7{t\xec\xe4A\xbbZ\x89C\x99O\x0e\x07R\xc3\x1buk\xa5\x0ci\xfa\x94\xf4)\x85ytkd\x9dN\xb8&\x16\x9bv\xa7\x15A\xb1\x99\x88\x0cP\x02{\xcd\xd6\xee\xf4\xcbP'\x9a\xf3\x92>\x02\xc8\xea\xe0x\x02\xe0\xc6\x86`.\xdc\x04\xe4%,;:\xd4\xbf\xd9:\x0f\x8e\xa9\x1a\xab\xad\xbf\xedaF\xf1\xa7o\x1aTQ\xab\x10}v#\xf4\xec\x9a\xd7\xa3\x02\x91\xf6\xdaQk\xe8\xc6'\xdds\xc4\xd4\xd3\xd6\x1f\x08\xd8\xf7\x12~\x85\x0f\xb5\xde\xcdz5h\x1fM\xc4Q\xca\x92\x06\xe1Y>C\x19\x85\xe8\x07\xca\x8d\x99\x00\x84\xe8\xbei\xb7\xcc\x02\x1d\x18U\xb1\xa0\xd3NF#\x11J\x180u\x8c\x05\xceC\xf0\xe4\xf08k\x93\x08!\nf\xab\xe9\xec\xa7v\x0c\xb9{\x7f\x1aE\xf1/\x1f\xcf\xeb\xe6IKIE\xcb>\x0c\xbap\xb7yd\x86\x13\xcce	\n\xca\xbe\x12\x94=z\xf4\x86:@7\xd6J\xe0\xf7\xc4\x0e\xb3\xcc|\xc6\xc65g\x07\x0f8\xc0\xeex\x0c\xc53\xe7O\xb1\x8c\x1d\xaa\xfe\x80\xc4\x10\xdc\xdc\x07\n\xfe3\x1f\x80H1\x8b\xf3\xb1\xd8\x84F.\xa0y\xb4fz\xb4\xecW\x06IM\x1b\x0b\xf1\xd9\x19\x83\x18\x11\xc6j[\x81\x17.w\xe6%\x08\x84i?\x01\xd2\x86U\x12\xc2\xe8\xa9f|}@+\x04[8\x95k7Cx\xa4\x98S\x90\x85\xedEO\x02\x12\xde\xafp\xa0$\xe4\x17\x97\xfc\xe1\xe7\xbeQ\xe6\xbb+\x99\x19\xca\x03:\xb8<\xe1]\x81\xb6\x01\xb8K\xe23\x8f\x8bT-y\xb2\xc2\xcd\x16\x08[N\xd1\xd6z\xb4\xb5\x84;y\xb3\x8a\xa4-HZ\xfe\xaaY^\x15\xa1\xd4.\xa5M\x00*\x08\xd4'h8\xd2\xedA\x85\x04.\xb0N\xef2\x16r\x89\x9cLB\x9c\x0b7:Or\x8f\x92\xa9}\x91\x12C\x89S\xcb\x9aS\x199\xe4\x01Jq#\xec\xa3\x12WI}*8\xcbD!\x1b\x88\xb8#	\x11\x14g#Y\x8f>\x138\x18`\x95\n\xec\x15\xd0\x92\xc2\xf1\x03\x0c?a\x85\x812\x12H,\x1f^\xf1\xe3\xc4'\x83\x8f\xef?\xb8\xff\x03\x90\x0e^\xb8\x88\xe6\x03\xa7n\x83h\xe3O\xc6\x92\xad\x07\x1a\xbfi<\xd1\x19\xaa\xe6\xddY\x0fa2\xc9+\x1e\x99\xfc\xcc6a\xb0F\xb1\xe2a<\xcc!\x84\xdb0\xac\x892\xbd]\x81c:\xefe\xbcK\xa4\xac\x1cX\x98X\x98[Ug\xe9O\x12\xafu\x175i\xd4yPcV\xd9T\xba\x9e5\x1fR\x01I\xfa\x9fA6\xf2O\xd4\xb8i\x0d\xa4\xfdC\x04\x8e\\\x87\xf1\x1e\x85\x97\xe3Q\x0fZ\x13\x8dM\x84D\xc4\xc6\x83\xd3\xda\x01\x90\xcfB!X\x96\xc4:\xf4\xd0\xe3\x08\x1c\\!\xc7\x14\x18^\xc1\x85\"\x14{\xa1E \x14Va\x07x$P\x1d	\x17\x18\\$\x02\x0c\xb3DBBT\xde\xd3Ft\xe8\x9f~\x99\xc3{O\x87\x1e\x04\x00\xbc\x0dw\x00\xef\xf8\x9e5a#\xf8\x07`\x90\xab=\x04\x16\x00\x11g\x81\x12\x80\x11\xd0\x81\x13\xb0\x01Y\xfd\x192>\x1d\x87\xb1MG\xaf-G\xadk\x8f\xc3\xa8\xaa\xdb1T\xbeb\xa6\xfc\x85L\x18\n\xb9`*\xd9\x80\xabV\x02\xacX\n\xad\xde*\xa5x\xaae\xc2\xa7\xd6\x8a\x9dZ*c`\xaaV\xc1S\xd5b\xa5\xba\xc5JU\x8a\x92\xaa\x15\x1d\xd0*6\xa0TK@\xa8zqP\xc4\xe2\xb6\xc9\xc5h\x93\x8a\xc7g\x15\x86\xcc*\xdf\x94U\xa7(\xaa\xf6QU4\x82\xa79\x05L\x92\n\xadc\x15M\xc6*\x90\x8cT\xbb\x18\xa9R!R,B\xa3\xc8\x85E\xb0\x8a\x88\xa0\x15\x0f\xbe*C|Tz\xf8\xf4p\xf0\xf4F\xe8\xf4@\xe8\xf44\xe8\xf4*\xe0\xf4\x10\xe0\xf7\xf5\xb1\xee\x05\xb1\xed\x85\xb0\x96\x86\xd8\xac\xe1\xb1X\xf3b\xb0\x06\x80\x1cL\x80.\x99\x00T2\x00y`\x00\xae\xc0\x01Up\x02b\xe0\x03\xe5\xc0\x05\xeb\x00\n\x15\x00\x10\xaa\x00\x1bT\x00,\xa0\x00%@\x05\x1a`\x07\xe4\xc0\x0b\xe8\x80\x15\x90\x00#\xa0\x00?@\x00t\x80\x00\xa4\xf8\x19GL\x88\xeb\xc5\x9e\x00S\xc0)\xf6\x01\x9e\xc3\xbf\xa0z\x93\xfft\x07\xcf\xb2Fy\x15\xd7\x8e\x00 \x1a\x0014\x00Lh\x00\x8c\xd0\x00\xe1\x80\x01\x83\x00\x01f\x00\x7f\x99\x00\xb0\xc8\x05e\xc0(.\x01)p\x08K\x80@\\\x01\xe2\xe0\x0c\x97\x00X\xb8\x02e@\x05\x15\x00\x08T\x0fb\xa0v\x95\x03h\x98\x1aD\xc0\xc5&\x05\xf90-I\x81bD\x02\x89\x10	d@\x1f\x11\x00ZD\x011\x10\x03\xa4@\x0c\x91\x00\x18D\xe0\x04y\xc0\xb8\xf3\x80\xd1\xa7\x00CN|\x0d9\xdc4\xe6\xd8\xd3\x9a#Nc\x0bl\xc2\x16\x05\xc0\xb0;\x05\x81\xb8,\x0d\x81`c\x8b\x03\x04X\x16\xe2\xc0\xb3\x16\x05@\x90(\x84\x812$\x030\x90\x0c\"@-	\x00\x98$\x01\xe8\x90\x06B@\x16\x89\x00<$\x00\xd0\x90\x01\xc1\xc0\xf8\x0e\x078p7C\x81\xa6\x1c\x0c\x80\xe0b\x05\x02\xe8(\x16\x81@\xa5\n\x05\x18P\x05A@\x13\x85\x00F\x0c\x00\xb80\x02\x00\xc0\xf5\x06\x00t\x89\xfc\x01\x9c\xde\x04\x1d\x8b\xe4G\x16\xad\xe9\xd4OR\x97\x89\xe9\xc4\xb2\xe2I\xef\x1eT\xf1yS\x8d\xcdMW52\\T\xc6oR\xe5\xa5KV\x950\xc8\x8e\xac\x04\xe0\xbb\x1a\x82\x8c(\n-\xa0$\xb2\x80\x92\x9a\x01\x80\x94\x0d\xa4\x02!6\xa6\x84\xa2w\x88\xeaH\xa2\xa9\x0e\x86\xa3\xf9\xfa\x8fG\x12\xf9\xad\xa0\x11O  r~\x07\x07\xe0e~\x06/\xe0]\xfe\x05\xb7\xe0V~\x05/\xe0P~\x057\xa0Sz\x04\xef\xa0K\xfa\x04\x97\xa0Fv\x04\x17`;\xf6\x03\xaf`9v\x05\xd1#\nJ\xa4\x1a\xdc\x17\xa7B\xcdN\x82,\x90\xe4\xd7\xce\x1f\xc5\xd3\xad\xb2'\xb0\x00\x00\x01\x03\x01`\x00\x00\x15\xa1'\xe2\x8f\x10\x82`\x04\\LT\xfe\xf0\xd9\x02A\x18p\x12Bs\x81)r\x85!\xd5\n\xe2(\n\x03\xd2\x04i\x82`PK\x07\x08X\xc7\xb1\x9c\x9fN\x00\x00\x9fN\x00\x00PK\x03\x04\x14\x00\x08\x00\x00\x00W\x9a5G\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00&\x00\x00\x00fonts/glyphicons-halflings-regular.svg<?xml version=\"1.0\" standalone=\"no\"?>\n<!DOCTYPE svg PUBLIC \"-//W3C//DTD SVG 1.1//EN\" \"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd\" >\n<svg xmlns=\"http://www.w3.org/2000/svg\">\n<metadata></metadata>\n<defs>\n<font id=\"glyphicons_halflingsregular\" horiz-adv-x=\"1200\" >\n<font-face units-per-em=\"1200\" ascent=\"960\" descent=\"-240\" />\n<missing-glyph horiz-adv-x=\"500\" />\n<glyph horiz-adv-x=\"0\" />\n<glyph horiz-adv-x=\"400\" />\n<glyph unicode=\" \" />\n<glyph unicode=\"*\" d=\"M600 1100q15 0 34 -1.5t30 -3.5l11 -1q10 -2 17.5 -10.5t7.5 -18.5v-224l158 158q7 7 18 8t19 -6l106 -106q7 -8 6 -19t-8 -18l-158 -158h224q10 0 18.5 -7.5t10.5 -17.5q6 -41 6 -75q0 -15 -1.5 -34t-3.5 -30l-1 -11q-2 -10 -10.5 -17.5t-18.5 -7.5h-224l158 -158 q7 -7 8 -18t-6 -19l-106 -106q-8 -7 -19 -6t-18 8l-158 158v-224q0 -10 -7.5 -18.5t-17.5 -10.5q-41 -6 -75 -6q-15 0 -34 1.5t-30 3.5l-11 1q-10 2 -17.5 10.5t-7.5 18.5v224l-158 -158q-7 -7 -18 -8t-19 6l-106 106q-7 8 -6 19t8 18l158 158h-224q-10 0 -18.5 7.5 t-10.5 17.5q-6 41 -6 75q0 15 1.5 34t3.5 30l1 11q2 10 10.5 17.5t18.5 7.5h224l-158 158q-7 7 -8 18t6 19l106 106q8 7 19 6t18 -8l158 -158v224q0 10 7.5 18.5t17.5 10.5q41 6 75 6z\" />\n<glyph unicode=\"+\" d=\"M450 1100h200q21 0 35.5 -14.5t14.5 -35.5v-350h350q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-350v-350q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v350h-350q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5 h350v350q0 21 14.5 35.5t35.5 14.5z\" />\n<glyph unicode=\"&#xa0;\" />\n<glyph unicode=\"&#xa5;\" d=\"M825 1100h250q10 0 12.5 -5t-5.5 -13l-364 -364q-6 -6 -11 -18h268q10 0 13 -6t-3 -14l-120 -160q-6 -8 -18 -14t-22 -6h-125v-100h275q10 0 13 -6t-3 -14l-120 -160q-6 -8 -18 -14t-22 -6h-125v-174q0 -11 -7.5 -18.5t-18.5 -7.5h-148q-11 0 -18.5 7.5t-7.5 18.5v174 h-275q-10 0 -13 6t3 14l120 160q6 8 18 14t22 6h125v100h-275q-10 0 -13 6t3 14l120 160q6 8 18 14t22 6h118q-5 12 -11 18l-364 364q-8 8 -5.5 13t12.5 5h250q25 0 43 -18l164 -164q8 -8 18 -8t18 8l164 164q18 18 43 18z\" />\n<glyph unicode=\"&#x2000;\" horiz-adv-x=\"650\" />\n<glyph unicode=\"&#x2001;\" horiz-adv-x=\"1300\" />\n<glyph unicode=\"&#x2002;\" horiz-adv-x=\"650\" />\n<glyph unicode=\"&#x2003;\" horiz-adv-x=\"1300\" />\n<glyph unicode=\"&#x2004;\" horiz-adv-x=\"433\" />\n<glyph unicode=\"&#x2005;\" horiz-adv-x=\"325\" />\n<glyph unicode=\"&#x2006;\" horiz-adv-x=\"216\" />\n<glyph unicode=\"&#x2007;\" horiz-adv-x=\"216\" />\n<glyph unicode=\"&#x2008;\" horiz-adv-x=\"162\" />\n<glyph unicode=\"&#x2009;\" horiz-adv-x=\"260\" />\n<glyph unicode=\"&#x200a;\" horiz-adv-x=\"72\" />\n<glyph unicode=\"&#x202f;\" horiz-adv-x=\"260\" />\n<glyph unicode=\"&#x205f;\" horiz-adv-x=\"325\" />\n<glyph unicode=\"&#x20ac;\" d=\"M744 1198q242 0 354 -189q60 -104 66 -209h-181q0 45 -17.5 82.5t-43.5 61.5t-58 40.5t-60.5 24t-51.5 7.5q-19 0 -40.5 -5.5t-49.5 -20.5t-53 -38t-49 -62.5t-39 -89.5h379l-100 -100h-300q-6 -50 -6 -100h406l-100 -100h-300q9 -74 33 -132t52.5 -91t61.5 -54.5t59 -29 t47 -7.5q22 0 50.5 7.5t60.5 24.5t58 41t43.5 61t17.5 80h174q-30 -171 -128 -278q-107 -117 -274 -117q-206 0 -324 158q-36 48 -69 133t-45 204h-217l100 100h112q1 47 6 100h-218l100 100h134q20 87 51 153.5t62 103.5q117 141 297 141z\" />\n<glyph unicode=\"&#x20bd;\" d=\"M428 1200h350q67 0 120 -13t86 -31t57 -49.5t35 -56.5t17 -64.5t6.5 -60.5t0.5 -57v-16.5v-16.5q0 -36 -0.5 -57t-6.5 -61t-17 -65t-35 -57t-57 -50.5t-86 -31.5t-120 -13h-178l-2 -100h288q10 0 13 -6t-3 -14l-120 -160q-6 -8 -18 -14t-22 -6h-138v-175q0 -11 -5.5 -18 t-15.5 -7h-149q-10 0 -17.5 7.5t-7.5 17.5v175h-267q-10 0 -13 6t3 14l120 160q6 8 18 14t22 6h117v100h-267q-10 0 -13 6t3 14l120 160q6 8 18 14t22 6h117v475q0 10 7.5 17.5t17.5 7.5zM600 1000v-300h203q64 0 86.5 33t22.5 119q0 84 -22.5 116t-86.5 32h-203z\" />\n<glyph unicode=\"&#x2212;\" d=\"M250 700h800q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5z\" />\n<glyph unicode=\"&#x231b;\" d=\"M1000 1200v-150q0 -21 -14.5 -35.5t-35.5 -14.5h-50v-100q0 -91 -49.5 -165.5t-130.5 -109.5q81 -35 130.5 -109.5t49.5 -165.5v-150h50q21 0 35.5 -14.5t14.5 -35.5v-150h-800v150q0 21 14.5 35.5t35.5 14.5h50v150q0 91 49.5 165.5t130.5 109.5q-81 35 -130.5 109.5 t-49.5 165.5v100h-50q-21 0 -35.5 14.5t-14.5 35.5v150h800zM400 1000v-100q0 -60 32.5 -109.5t87.5 -73.5q28 -12 44 -37t16 -55t-16 -55t-44 -37q-55 -24 -87.5 -73.5t-32.5 -109.5v-150h400v150q0 60 -32.5 109.5t-87.5 73.5q-28 12 -44 37t-16 55t16 55t44 37 q55 24 87.5 73.5t32.5 109.5v100h-400z\" />\n<glyph unicode=\"&#x25fc;\" horiz-adv-x=\"500\" d=\"M0 0z\" />\n<glyph unicode=\"&#x2601;\" d=\"M503 1089q110 0 200.5 -59.5t134.5 -156.5q44 14 90 14q120 0 205 -86.5t85 -206.5q0 -121 -85 -207.5t-205 -86.5h-750q-79 0 -135.5 57t-56.5 137q0 69 42.5 122.5t108.5 67.5q-2 12 -2 37q0 153 108 260.5t260 107.5z\" />\n<glyph unicode=\"&#x26fa;\" d=\"M774 1193.5q16 -9.5 20.5 -27t-5.5 -33.5l-136 -187l467 -746h30q20 0 35 -18.5t15 -39.5v-42h-1200v42q0 21 15 39.5t35 18.5h30l468 746l-135 183q-10 16 -5.5 34t20.5 28t34 5.5t28 -20.5l111 -148l112 150q9 16 27 20.5t34 -5zM600 200h377l-182 112l-195 534v-646z \" />\n<glyph unicode=\"&#x2709;\" d=\"M25 1100h1150q10 0 12.5 -5t-5.5 -13l-564 -567q-8 -8 -18 -8t-18 8l-564 567q-8 8 -5.5 13t12.5 5zM18 882l264 -264q8 -8 8 -18t-8 -18l-264 -264q-8 -8 -13 -5.5t-5 12.5v550q0 10 5 12.5t13 -5.5zM918 618l264 264q8 8 13 5.5t5 -12.5v-550q0 -10 -5 -12.5t-13 5.5 l-264 264q-8 8 -8 18t8 18zM818 482l364 -364q8 -8 5.5 -13t-12.5 -5h-1150q-10 0 -12.5 5t5.5 13l364 364q8 8 18 8t18 -8l164 -164q8 -8 18 -8t18 8l164 164q8 8 18 8t18 -8z\" />\n<glyph unicode=\"&#x270f;\" d=\"M1011 1210q19 0 33 -13l153 -153q13 -14 13 -33t-13 -33l-99 -92l-214 214l95 96q13 14 32 14zM1013 800l-615 -614l-214 214l614 614zM317 96l-333 -112l110 335z\" />\n<glyph unicode=\"&#xe001;\" d=\"M700 650v-550h250q21 0 35.5 -14.5t14.5 -35.5v-50h-800v50q0 21 14.5 35.5t35.5 14.5h250v550l-500 550h1200z\" />\n<glyph unicode=\"&#xe002;\" d=\"M368 1017l645 163q39 15 63 0t24 -49v-831q0 -55 -41.5 -95.5t-111.5 -63.5q-79 -25 -147 -4.5t-86 75t25.5 111.5t122.5 82q72 24 138 8v521l-600 -155v-606q0 -42 -44 -90t-109 -69q-79 -26 -147 -5.5t-86 75.5t25.5 111.5t122.5 82.5q72 24 138 7v639q0 38 14.5 59 t53.5 34z\" />\n<glyph unicode=\"&#xe003;\" d=\"M500 1191q100 0 191 -39t156.5 -104.5t104.5 -156.5t39 -191l-1 -2l1 -5q0 -141 -78 -262l275 -274q23 -26 22.5 -44.5t-22.5 -42.5l-59 -58q-26 -20 -46.5 -20t-39.5 20l-275 274q-119 -77 -261 -77l-5 1l-2 -1q-100 0 -191 39t-156.5 104.5t-104.5 156.5t-39 191 t39 191t104.5 156.5t156.5 104.5t191 39zM500 1022q-88 0 -162 -43t-117 -117t-43 -162t43 -162t117 -117t162 -43t162 43t117 117t43 162t-43 162t-117 117t-162 43z\" />\n<glyph unicode=\"&#xe005;\" d=\"M649 949q48 68 109.5 104t121.5 38.5t118.5 -20t102.5 -64t71 -100.5t27 -123q0 -57 -33.5 -117.5t-94 -124.5t-126.5 -127.5t-150 -152.5t-146 -174q-62 85 -145.5 174t-150 152.5t-126.5 127.5t-93.5 124.5t-33.5 117.5q0 64 28 123t73 100.5t104 64t119 20 t120.5 -38.5t104.5 -104z\" />\n<glyph unicode=\"&#xe006;\" d=\"M407 800l131 353q7 19 17.5 19t17.5 -19l129 -353h421q21 0 24 -8.5t-14 -20.5l-342 -249l130 -401q7 -20 -0.5 -25.5t-24.5 6.5l-343 246l-342 -247q-17 -12 -24.5 -6.5t-0.5 25.5l130 400l-347 251q-17 12 -14 20.5t23 8.5h429z\" />\n<glyph unicode=\"&#xe007;\" d=\"M407 800l131 353q7 19 17.5 19t17.5 -19l129 -353h421q21 0 24 -8.5t-14 -20.5l-342 -249l130 -401q7 -20 -0.5 -25.5t-24.5 6.5l-343 246l-342 -247q-17 -12 -24.5 -6.5t-0.5 25.5l130 400l-347 251q-17 12 -14 20.5t23 8.5h429zM477 700h-240l197 -142l-74 -226 l193 139l195 -140l-74 229l192 140h-234l-78 211z\" />\n<glyph unicode=\"&#xe008;\" d=\"M600 1200q124 0 212 -88t88 -212v-250q0 -46 -31 -98t-69 -52v-75q0 -10 6 -21.5t15 -17.5l358 -230q9 -5 15 -16.5t6 -21.5v-93q0 -10 -7.5 -17.5t-17.5 -7.5h-1150q-10 0 -17.5 7.5t-7.5 17.5v93q0 10 6 21.5t15 16.5l358 230q9 6 15 17.5t6 21.5v75q-38 0 -69 52 t-31 98v250q0 124 88 212t212 88z\" />\n<glyph unicode=\"&#xe009;\" d=\"M25 1100h1150q10 0 17.5 -7.5t7.5 -17.5v-1050q0 -10 -7.5 -17.5t-17.5 -7.5h-1150q-10 0 -17.5 7.5t-7.5 17.5v1050q0 10 7.5 17.5t17.5 7.5zM100 1000v-100h100v100h-100zM875 1000h-550q-10 0 -17.5 -7.5t-7.5 -17.5v-350q0 -10 7.5 -17.5t17.5 -7.5h550 q10 0 17.5 7.5t7.5 17.5v350q0 10 -7.5 17.5t-17.5 7.5zM1000 1000v-100h100v100h-100zM100 800v-100h100v100h-100zM1000 800v-100h100v100h-100zM100 600v-100h100v100h-100zM1000 600v-100h100v100h-100zM875 500h-550q-10 0 -17.5 -7.5t-7.5 -17.5v-350q0 -10 7.5 -17.5 t17.5 -7.5h550q10 0 17.5 7.5t7.5 17.5v350q0 10 -7.5 17.5t-17.5 7.5zM100 400v-100h100v100h-100zM1000 400v-100h100v100h-100zM100 200v-100h100v100h-100zM1000 200v-100h100v100h-100z\" />\n<glyph unicode=\"&#xe010;\" d=\"M50 1100h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM650 1100h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v400 q0 21 14.5 35.5t35.5 14.5zM50 500h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM650 500h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400 q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5z\" />\n<glyph unicode=\"&#xe011;\" d=\"M50 1100h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM450 1100h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200 q0 21 14.5 35.5t35.5 14.5zM850 1100h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM50 700h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200 q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM450 700h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM850 700h200q21 0 35.5 -14.5t14.5 -35.5v-200 q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM50 300h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM450 300h200 q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM850 300h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5 t35.5 14.5z\" />\n<glyph unicode=\"&#xe012;\" d=\"M50 1100h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM450 1100h700q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-700q-21 0 -35.5 14.5t-14.5 35.5v200 q0 21 14.5 35.5t35.5 14.5zM50 700h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM450 700h700q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-700 q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM50 300h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM450 300h700q21 0 35.5 -14.5t14.5 -35.5v-200 q0 -21 -14.5 -35.5t-35.5 -14.5h-700q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5z\" />\n<glyph unicode=\"&#xe013;\" d=\"M465 477l571 571q8 8 18 8t17 -8l177 -177q8 -7 8 -17t-8 -18l-783 -784q-7 -8 -17.5 -8t-17.5 8l-384 384q-8 8 -8 18t8 17l177 177q7 8 17 8t18 -8l171 -171q7 -7 18 -7t18 7z\" />\n<glyph unicode=\"&#xe014;\" d=\"M904 1083l178 -179q8 -8 8 -18.5t-8 -17.5l-267 -268l267 -268q8 -7 8 -17.5t-8 -18.5l-178 -178q-8 -8 -18.5 -8t-17.5 8l-268 267l-268 -267q-7 -8 -17.5 -8t-18.5 8l-178 178q-8 8 -8 18.5t8 17.5l267 268l-267 268q-8 7 -8 17.5t8 18.5l178 178q8 8 18.5 8t17.5 -8 l268 -267l268 268q7 7 17.5 7t18.5 -7z\" />\n<glyph unicode=\"&#xe015;\" d=\"M507 1177q98 0 187.5 -38.5t154.5 -103.5t103.5 -154.5t38.5 -187.5q0 -141 -78 -262l300 -299q8 -8 8 -18.5t-8 -18.5l-109 -108q-7 -8 -17.5 -8t-18.5 8l-300 299q-119 -77 -261 -77q-98 0 -188 38.5t-154.5 103t-103 154.5t-38.5 188t38.5 187.5t103 154.5 t154.5 103.5t188 38.5zM506.5 1023q-89.5 0 -165.5 -44t-120 -120.5t-44 -166t44 -165.5t120 -120t165.5 -44t166 44t120.5 120t44 165.5t-44 166t-120.5 120.5t-166 44zM425 900h150q10 0 17.5 -7.5t7.5 -17.5v-75h75q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5 t-17.5 -7.5h-75v-75q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v75h-75q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5h75v75q0 10 7.5 17.5t17.5 7.5z\" />\n<glyph unicode=\"&#xe016;\" d=\"M507 1177q98 0 187.5 -38.5t154.5 -103.5t103.5 -154.5t38.5 -187.5q0 -141 -78 -262l300 -299q8 -8 8 -18.5t-8 -18.5l-109 -108q-7 -8 -17.5 -8t-18.5 8l-300 299q-119 -77 -261 -77q-98 0 -188 38.5t-154.5 103t-103 154.5t-38.5 188t38.5 187.5t103 154.5 t154.5 103.5t188 38.5zM506.5 1023q-89.5 0 -165.5 -44t-120 -120.5t-44 -166t44 -165.5t120 -120t165.5 -44t166 44t120.5 120t44 165.5t-44 166t-120.5 120.5t-166 44zM325 800h350q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-350q-10 0 -17.5 7.5 t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5z\" />\n<glyph unicode=\"&#xe017;\" d=\"M550 1200h100q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM800 975v166q167 -62 272 -209.5t105 -331.5q0 -117 -45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5 t-184.5 123t-123 184.5t-45.5 224q0 184 105 331.5t272 209.5v-166q-103 -55 -165 -155t-62 -220q0 -116 57 -214.5t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5q0 120 -62 220t-165 155z\" />\n<glyph unicode=\"&#xe018;\" d=\"M1025 1200h150q10 0 17.5 -7.5t7.5 -17.5v-1150q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v1150q0 10 7.5 17.5t17.5 7.5zM725 800h150q10 0 17.5 -7.5t7.5 -17.5v-750q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v750 q0 10 7.5 17.5t17.5 7.5zM425 500h150q10 0 17.5 -7.5t7.5 -17.5v-450q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v450q0 10 7.5 17.5t17.5 7.5zM125 300h150q10 0 17.5 -7.5t7.5 -17.5v-250q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5 v250q0 10 7.5 17.5t17.5 7.5z\" />\n<glyph unicode=\"&#xe019;\" d=\"M600 1174q33 0 74 -5l38 -152l5 -1q49 -14 94 -39l5 -2l134 80q61 -48 104 -105l-80 -134l3 -5q25 -44 39 -93l1 -6l152 -38q5 -43 5 -73q0 -34 -5 -74l-152 -38l-1 -6q-15 -49 -39 -93l-3 -5l80 -134q-48 -61 -104 -105l-134 81l-5 -3q-44 -25 -94 -39l-5 -2l-38 -151 q-43 -5 -74 -5q-33 0 -74 5l-38 151l-5 2q-49 14 -94 39l-5 3l-134 -81q-60 48 -104 105l80 134l-3 5q-25 45 -38 93l-2 6l-151 38q-6 42 -6 74q0 33 6 73l151 38l2 6q13 48 38 93l3 5l-80 134q47 61 105 105l133 -80l5 2q45 25 94 39l5 1l38 152q43 5 74 5zM600 815 q-89 0 -152 -63t-63 -151.5t63 -151.5t152 -63t152 63t63 151.5t-63 151.5t-152 63z\" />\n<glyph unicode=\"&#xe020;\" d=\"M500 1300h300q41 0 70.5 -29.5t29.5 -70.5v-100h275q10 0 17.5 -7.5t7.5 -17.5v-75h-1100v75q0 10 7.5 17.5t17.5 7.5h275v100q0 41 29.5 70.5t70.5 29.5zM500 1200v-100h300v100h-300zM1100 900v-800q0 -41 -29.5 -70.5t-70.5 -29.5h-700q-41 0 -70.5 29.5t-29.5 70.5 v800h900zM300 800v-700h100v700h-100zM500 800v-700h100v700h-100zM700 800v-700h100v700h-100zM900 800v-700h100v700h-100z\" />\n<glyph unicode=\"&#xe021;\" d=\"M18 618l620 608q8 7 18.5 7t17.5 -7l608 -608q8 -8 5.5 -13t-12.5 -5h-175v-575q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v375h-300v-375q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v575h-175q-10 0 -12.5 5t5.5 13z\" />\n<glyph unicode=\"&#xe022;\" d=\"M600 1200v-400q0 -41 29.5 -70.5t70.5 -29.5h300v-650q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v1100q0 21 14.5 35.5t35.5 14.5h450zM1000 800h-250q-21 0 -35.5 14.5t-14.5 35.5v250z\" />\n<glyph unicode=\"&#xe023;\" d=\"M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5t-57 214.5t-155.5 155.5t-214.5 57zM525 900h50q10 0 17.5 -7.5t7.5 -17.5v-275h175q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v350q0 10 7.5 17.5t17.5 7.5z\" />\n<glyph unicode=\"&#xe024;\" d=\"M1300 0h-538l-41 400h-242l-41 -400h-538l431 1200h209l-21 -300h162l-20 300h208zM515 800l-27 -300h224l-27 300h-170z\" />\n<glyph unicode=\"&#xe025;\" d=\"M550 1200h200q21 0 35.5 -14.5t14.5 -35.5v-450h191q20 0 25.5 -11.5t-7.5 -27.5l-327 -400q-13 -16 -32 -16t-32 16l-327 400q-13 16 -7.5 27.5t25.5 11.5h191v450q0 21 14.5 35.5t35.5 14.5zM1125 400h50q10 0 17.5 -7.5t7.5 -17.5v-350q0 -10 -7.5 -17.5t-17.5 -7.5 h-1050q-10 0 -17.5 7.5t-7.5 17.5v350q0 10 7.5 17.5t17.5 7.5h50q10 0 17.5 -7.5t7.5 -17.5v-175h900v175q0 10 7.5 17.5t17.5 7.5z\" />\n<glyph unicode=\"&#xe026;\" d=\"M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5t-57 214.5t-155.5 155.5t-214.5 57zM525 900h150q10 0 17.5 -7.5t7.5 -17.5v-275h137q21 0 26 -11.5t-8 -27.5l-223 -275q-13 -16 -32 -16t-32 16l-223 275q-13 16 -8 27.5t26 11.5h137v275q0 10 7.5 17.5t17.5 7.5z \" />\n<glyph unicode=\"&#xe027;\" d=\"M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5t-57 214.5t-155.5 155.5t-214.5 57zM632 914l223 -275q13 -16 8 -27.5t-26 -11.5h-137v-275q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v275h-137q-21 0 -26 11.5t8 27.5l223 275q13 16 32 16 t32 -16z\" />\n<glyph unicode=\"&#xe028;\" d=\"M225 1200h750q10 0 19.5 -7t12.5 -17l186 -652q7 -24 7 -49v-425q0 -12 -4 -27t-9 -17q-12 -6 -37 -6h-1100q-12 0 -27 4t-17 8q-6 13 -6 38l1 425q0 25 7 49l185 652q3 10 12.5 17t19.5 7zM878 1000h-556q-10 0 -19 -7t-11 -18l-87 -450q-2 -11 4 -18t16 -7h150 q10 0 19.5 -7t11.5 -17l38 -152q2 -10 11.5 -17t19.5 -7h250q10 0 19.5 7t11.5 17l38 152q2 10 11.5 17t19.5 7h150q10 0 16 7t4 18l-87 450q-2 11 -11 18t-19 7z\" />\n<glyph unicode=\"&#xe029;\" d=\"M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5t-57 214.5t-155.5 155.5t-214.5 57zM540 820l253 -190q17 -12 17 -30t-17 -30l-253 -190q-16 -12 -28 -6.5t-12 26.5v400q0 21 12 26.5t28 -6.5z\" />\n<glyph unicode=\"&#xe030;\" d=\"M947 1060l135 135q7 7 12.5 5t5.5 -13v-362q0 -10 -7.5 -17.5t-17.5 -7.5h-362q-11 0 -13 5.5t5 12.5l133 133q-109 76 -238 76q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5h150q0 -117 -45.5 -224 t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5q192 0 347 -117z\" />\n<glyph unicode=\"&#xe031;\" d=\"M947 1060l135 135q7 7 12.5 5t5.5 -13v-361q0 -11 -7.5 -18.5t-18.5 -7.5h-361q-11 0 -13 5.5t5 12.5l134 134q-110 75 -239 75q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5h-150q0 117 45.5 224t123 184.5t184.5 123t224 45.5q192 0 347 -117zM1027 600h150 q0 -117 -45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5q-192 0 -348 118l-134 -134q-7 -8 -12.5 -5.5t-5.5 12.5v360q0 11 7.5 18.5t18.5 7.5h360q10 0 12.5 -5.5t-5.5 -12.5l-133 -133q110 -76 240 -76q116 0 214.5 57t155.5 155.5t57 214.5z\" />\n<glyph unicode=\"&#xe032;\" d=\"M125 1200h1050q10 0 17.5 -7.5t7.5 -17.5v-1150q0 -10 -7.5 -17.5t-17.5 -7.5h-1050q-10 0 -17.5 7.5t-7.5 17.5v1150q0 10 7.5 17.5t17.5 7.5zM1075 1000h-850q-10 0 -17.5 -7.5t-7.5 -17.5v-850q0 -10 7.5 -17.5t17.5 -7.5h850q10 0 17.5 7.5t7.5 17.5v850 q0 10 -7.5 17.5t-17.5 7.5zM325 900h50q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-50q-10 0 -17.5 7.5t-7.5 17.5v50q0 10 7.5 17.5t17.5 7.5zM525 900h450q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-450q-10 0 -17.5 7.5t-7.5 17.5v50 q0 10 7.5 17.5t17.5 7.5zM325 700h50q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-50q-10 0 -17.5 7.5t-7.5 17.5v50q0 10 7.5 17.5t17.5 7.5zM525 700h450q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-450q-10 0 -17.5 7.5t-7.5 17.5v50 q0 10 7.5 17.5t17.5 7.5zM325 500h50q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-50q-10 0 -17.5 7.5t-7.5 17.5v50q0 10 7.5 17.5t17.5 7.5zM525 500h450q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-450q-10 0 -17.5 7.5t-7.5 17.5v50 q0 10 7.5 17.5t17.5 7.5zM325 300h50q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-50q-10 0 -17.5 7.5t-7.5 17.5v50q0 10 7.5 17.5t17.5 7.5zM525 300h450q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-450q-10 0 -17.5 7.5t-7.5 17.5v50 q0 10 7.5 17.5t17.5 7.5z\" />\n<glyph unicode=\"&#xe033;\" d=\"M900 800v200q0 83 -58.5 141.5t-141.5 58.5h-300q-82 0 -141 -59t-59 -141v-200h-100q-41 0 -70.5 -29.5t-29.5 -70.5v-600q0 -41 29.5 -70.5t70.5 -29.5h900q41 0 70.5 29.5t29.5 70.5v600q0 41 -29.5 70.5t-70.5 29.5h-100zM400 800v150q0 21 15 35.5t35 14.5h200 q20 0 35 -14.5t15 -35.5v-150h-300z\" />\n<glyph unicode=\"&#xe034;\" d=\"M125 1100h50q10 0 17.5 -7.5t7.5 -17.5v-1075h-100v1075q0 10 7.5 17.5t17.5 7.5zM1075 1052q4 0 9 -2q16 -6 16 -23v-421q0 -6 -3 -12q-33 -59 -66.5 -99t-65.5 -58t-56.5 -24.5t-52.5 -6.5q-26 0 -57.5 6.5t-52.5 13.5t-60 21q-41 15 -63 22.5t-57.5 15t-65.5 7.5 q-85 0 -160 -57q-7 -5 -15 -5q-6 0 -11 3q-14 7 -14 22v438q22 55 82 98.5t119 46.5q23 2 43 0.5t43 -7t32.5 -8.5t38 -13t32.5 -11q41 -14 63.5 -21t57 -14t63.5 -7q103 0 183 87q7 8 18 8z\" />\n<glyph unicode=\"&#xe035;\" d=\"M600 1175q116 0 227 -49.5t192.5 -131t131 -192.5t49.5 -227v-300q0 -10 -7.5 -17.5t-17.5 -7.5h-50q-10 0 -17.5 7.5t-7.5 17.5v300q0 127 -70.5 231.5t-184.5 161.5t-245 57t-245 -57t-184.5 -161.5t-70.5 -231.5v-300q0 -10 -7.5 -17.5t-17.5 -7.5h-50 q-10 0 -17.5 7.5t-7.5 17.5v300q0 116 49.5 227t131 192.5t192.5 131t227 49.5zM220 500h160q8 0 14 -6t6 -14v-460q0 -8 -6 -14t-14 -6h-160q-8 0 -14 6t-6 14v460q0 8 6 14t14 6zM820 500h160q8 0 14 -6t6 -14v-460q0 -8 -6 -14t-14 -6h-160q-8 0 -14 6t-6 14v460 q0 8 6 14t14 6z\" />\n<glyph unicode=\"&#xe036;\" d=\"M321 814l258 172q9 6 15 2.5t6 -13.5v-750q0 -10 -6 -13.5t-15 2.5l-258 172q-21 14 -46 14h-250q-10 0 -17.5 7.5t-7.5 17.5v350q0 10 7.5 17.5t17.5 7.5h250q25 0 46 14zM900 668l120 120q7 7 17 7t17 -7l34 -34q7 -7 7 -17t-7 -17l-120 -120l120 -120q7 -7 7 -17 t-7 -17l-34 -34q-7 -7 -17 -7t-17 7l-120 119l-120 -119q-7 -7 -17 -7t-17 7l-34 34q-7 7 -7 17t7 17l119 120l-119 120q-7 7 -7 17t7 17l34 34q7 8 17 8t17 -8z\" />\n<glyph unicode=\"&#xe037;\" d=\"M321 814l258 172q9 6 15 2.5t6 -13.5v-750q0 -10 -6 -13.5t-15 2.5l-258 172q-21 14 -46 14h-250q-10 0 -17.5 7.5t-7.5 17.5v350q0 10 7.5 17.5t17.5 7.5h250q25 0 46 14zM766 900h4q10 -1 16 -10q96 -129 96 -290q0 -154 -90 -281q-6 -9 -17 -10l-3 -1q-9 0 -16 6 l-29 23q-7 7 -8.5 16.5t4.5 17.5q72 103 72 229q0 132 -78 238q-6 8 -4.5 18t9.5 17l29 22q7 5 15 5z\" />\n<glyph unicode=\"&#xe038;\" d=\"M967 1004h3q11 -1 17 -10q135 -179 135 -396q0 -105 -34 -206.5t-98 -185.5q-7 -9 -17 -10h-3q-9 0 -16 6l-42 34q-8 6 -9 16t5 18q111 150 111 328q0 90 -29.5 176t-84.5 157q-6 9 -5 19t10 16l42 33q7 5 15 5zM321 814l258 172q9 6 15 2.5t6 -13.5v-750q0 -10 -6 -13.5 t-15 2.5l-258 172q-21 14 -46 14h-250q-10 0 -17.5 7.5t-7.5 17.5v350q0 10 7.5 17.5t17.5 7.5h250q25 0 46 14zM766 900h4q10 -1 16 -10q96 -129 96 -290q0 -154 -90 -281q-6 -9 -17 -10l-3 -1q-9 0 -16 6l-29 23q-7 7 -8.5 16.5t4.5 17.5q72 103 72 229q0 132 -78 238 q-6 8 -4.5 18.5t9.5 16.5l29 22q7 5 15 5z\" />\n<glyph unicode=\"&#xe039;\" d=\"M500 900h100v-100h-100v-100h-400v-100h-100v600h500v-300zM1200 700h-200v-100h200v-200h-300v300h-200v300h-100v200h600v-500zM100 1100v-300h300v300h-300zM800 1100v-300h300v300h-300zM300 900h-100v100h100v-100zM1000 900h-100v100h100v-100zM300 500h200v-500 h-500v500h200v100h100v-100zM800 300h200v-100h-100v-100h-200v100h-100v100h100v200h-200v100h300v-300zM100 400v-300h300v300h-300zM300 200h-100v100h100v-100zM1200 200h-100v100h100v-100zM700 0h-100v100h100v-100zM1200 0h-300v100h300v-100z\" />\n<glyph unicode=\"&#xe040;\" d=\"M100 200h-100v1000h100v-1000zM300 200h-100v1000h100v-1000zM700 200h-200v1000h200v-1000zM900 200h-100v1000h100v-1000zM1200 200h-200v1000h200v-1000zM400 0h-300v100h300v-100zM600 0h-100v91h100v-91zM800 0h-100v91h100v-91zM1100 0h-200v91h200v-91z\" />\n<glyph unicode=\"&#xe041;\" d=\"M500 1200l682 -682q8 -8 8 -18t-8 -18l-464 -464q-8 -8 -18 -8t-18 8l-682 682l1 475q0 10 7.5 17.5t17.5 7.5h474zM319.5 1024.5q-29.5 29.5 -71 29.5t-71 -29.5t-29.5 -71.5t29.5 -71.5t71 -29.5t71 29.5t29.5 71.5t-29.5 71.5z\" />\n<glyph unicode=\"&#xe042;\" d=\"M500 1200l682 -682q8 -8 8 -18t-8 -18l-464 -464q-8 -8 -18 -8t-18 8l-682 682l1 475q0 10 7.5 17.5t17.5 7.5h474zM800 1200l682 -682q8 -8 8 -18t-8 -18l-464 -464q-8 -8 -18 -8t-18 8l-56 56l424 426l-700 700h150zM319.5 1024.5q-29.5 29.5 -71 29.5t-71 -29.5 t-29.5 -71.5t29.5 -71.5t71 -29.5t71 29.5t29.5 71.5t-29.5 71.5z\" />\n<glyph unicode=\"&#xe043;\" d=\"M300 1200h825q75 0 75 -75v-900q0 -25 -18 -43l-64 -64q-8 -8 -13 -5.5t-5 12.5v950q0 10 -7.5 17.5t-17.5 7.5h-700q-25 0 -43 -18l-64 -64q-8 -8 -5.5 -13t12.5 -5h700q10 0 17.5 -7.5t7.5 -17.5v-950q0 -10 -7.5 -17.5t-17.5 -7.5h-850q-10 0 -17.5 7.5t-7.5 17.5v975 q0 25 18 43l139 139q18 18 43 18z\" />\n<glyph unicode=\"&#xe044;\" d=\"M250 1200h800q21 0 35.5 -14.5t14.5 -35.5v-1150l-450 444l-450 -445v1151q0 21 14.5 35.5t35.5 14.5z\" />\n<glyph unicode=\"&#xe045;\" d=\"M822 1200h-444q-11 0 -19 -7.5t-9 -17.5l-78 -301q-7 -24 7 -45l57 -108q6 -9 17.5 -15t21.5 -6h450q10 0 21.5 6t17.5 15l62 108q14 21 7 45l-83 301q-1 10 -9 17.5t-19 7.5zM1175 800h-150q-10 0 -21 -6.5t-15 -15.5l-78 -156q-4 -9 -15 -15.5t-21 -6.5h-550 q-10 0 -21 6.5t-15 15.5l-78 156q-4 9 -15 15.5t-21 6.5h-150q-10 0 -17.5 -7.5t-7.5 -17.5v-650q0 -10 7.5 -17.5t17.5 -7.5h150q10 0 17.5 7.5t7.5 17.5v150q0 10 7.5 17.5t17.5 7.5h750q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 7.5 -17.5t17.5 -7.5h150q10 0 17.5 7.5 t7.5 17.5v650q0 10 -7.5 17.5t-17.5 7.5zM850 200h-500q-10 0 -19.5 -7t-11.5 -17l-38 -152q-2 -10 3.5 -17t15.5 -7h600q10 0 15.5 7t3.5 17l-38 152q-2 10 -11.5 17t-19.5 7z\" />\n<glyph unicode=\"&#xe046;\" d=\"M500 1100h200q56 0 102.5 -20.5t72.5 -50t44 -59t25 -50.5l6 -20h150q41 0 70.5 -29.5t29.5 -70.5v-600q0 -41 -29.5 -70.5t-70.5 -29.5h-1000q-41 0 -70.5 29.5t-29.5 70.5v600q0 41 29.5 70.5t70.5 29.5h150q2 8 6.5 21.5t24 48t45 61t72 48t102.5 21.5zM900 800v-100 h100v100h-100zM600 730q-95 0 -162.5 -67.5t-67.5 -162.5t67.5 -162.5t162.5 -67.5t162.5 67.5t67.5 162.5t-67.5 162.5t-162.5 67.5zM600 603q43 0 73 -30t30 -73t-30 -73t-73 -30t-73 30t-30 73t30 73t73 30z\" />\n<glyph unicode=\"&#xe047;\" d=\"M681 1199l385 -998q20 -50 60 -92q18 -19 36.5 -29.5t27.5 -11.5l10 -2v-66h-417v66q53 0 75 43.5t5 88.5l-82 222h-391q-58 -145 -92 -234q-11 -34 -6.5 -57t25.5 -37t46 -20t55 -6v-66h-365v66q56 24 84 52q12 12 25 30.5t20 31.5l7 13l399 1006h93zM416 521h340 l-162 457z\" />\n<glyph unicode=\"&#xe048;\" d=\"M753 641q5 -1 14.5 -4.5t36 -15.5t50.5 -26.5t53.5 -40t50.5 -54.5t35.5 -70t14.5 -87q0 -67 -27.5 -125.5t-71.5 -97.5t-98.5 -66.5t-108.5 -40.5t-102 -13h-500v89q41 7 70.5 32.5t29.5 65.5v827q0 24 -0.5 34t-3.5 24t-8.5 19.5t-17 13.5t-28 12.5t-42.5 11.5v71 l471 -1q57 0 115.5 -20.5t108 -57t80.5 -94t31 -124.5q0 -51 -15.5 -96.5t-38 -74.5t-45 -50.5t-38.5 -30.5zM400 700h139q78 0 130.5 48.5t52.5 122.5q0 41 -8.5 70.5t-29.5 55.5t-62.5 39.5t-103.5 13.5h-118v-350zM400 200h216q80 0 121 50.5t41 130.5q0 90 -62.5 154.5 t-156.5 64.5h-159v-400z\" />\n<glyph unicode=\"&#xe049;\" d=\"M877 1200l2 -57q-83 -19 -116 -45.5t-40 -66.5l-132 -839q-9 -49 13 -69t96 -26v-97h-500v97q186 16 200 98l173 832q3 17 3 30t-1.5 22.5t-9 17.5t-13.5 12.5t-21.5 10t-26 8.5t-33.5 10q-13 3 -19 5v57h425z\" />\n<glyph unicode=\"&#xe050;\" d=\"M1300 900h-50q0 21 -4 37t-9.5 26.5t-18 17.5t-22 11t-28.5 5.5t-31 2t-37 0.5h-200v-850q0 -22 25 -34.5t50 -13.5l25 -2v-100h-400v100q4 0 11 0.5t24 3t30 7t24 15t11 24.5v850h-200q-25 0 -37 -0.5t-31 -2t-28.5 -5.5t-22 -11t-18 -17.5t-9.5 -26.5t-4 -37h-50v300 h1000v-300zM175 1000h-75v-800h75l-125 -167l-125 167h75v800h-75l125 167z\" />\n<glyph unicode=\"&#xe051;\" d=\"M1100 900h-50q0 21 -4 37t-9.5 26.5t-18 17.5t-22 11t-28.5 5.5t-31 2t-37 0.5h-200v-650q0 -22 25 -34.5t50 -13.5l25 -2v-100h-400v100q4 0 11 0.5t24 3t30 7t24 15t11 24.5v650h-200q-25 0 -37 -0.5t-31 -2t-28.5 -5.5t-22 -11t-18 -17.5t-9.5 -26.5t-4 -37h-50v300 h1000v-300zM1167 50l-167 -125v75h-800v-75l-167 125l167 125v-75h800v75z\" />\n<glyph unicode=\"&#xe052;\" d=\"M50 1100h600q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-600q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 800h1000q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1000q-21 0 -35.5 14.5t-14.5 35.5v100 q0 21 14.5 35.5t35.5 14.5zM50 500h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 200h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100 q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z\" />\n<glyph unicode=\"&#xe053;\" d=\"M250 1100h700q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-700q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 800h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v100 q0 21 14.5 35.5t35.5 14.5zM250 500h700q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-700q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 200h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100 q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z\" />\n<glyph unicode=\"&#xe054;\" d=\"M500 950v100q0 21 14.5 35.5t35.5 14.5h600q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-600q-21 0 -35.5 14.5t-14.5 35.5zM100 650v100q0 21 14.5 35.5t35.5 14.5h1000q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1000 q-21 0 -35.5 14.5t-14.5 35.5zM300 350v100q0 21 14.5 35.5t35.5 14.5h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5zM0 50v100q0 21 14.5 35.5t35.5 14.5h1100q21 0 35.5 -14.5t14.5 -35.5v-100 q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5z\" />\n<glyph unicode=\"&#xe055;\" d=\"M50 1100h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 800h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v100 q0 21 14.5 35.5t35.5 14.5zM50 500h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 200h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100 q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z\" />\n<glyph unicode=\"&#xe056;\" d=\"M50 1100h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM350 1100h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v100 q0 21 14.5 35.5t35.5 14.5zM50 800h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM350 800h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-800 q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 500h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM350 500h800q21 0 35.5 -14.5t14.5 -35.5v-100 q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 200h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM350 200h800 q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z\" />\n<glyph unicode=\"&#xe057;\" d=\"M400 0h-100v1100h100v-1100zM550 1100h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM550 800h500q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-500 q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM267 550l-167 -125v75h-200v100h200v75zM550 500h300q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-300q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM550 200h600 q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-600q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z\" />\n<glyph unicode=\"&#xe058;\" d=\"M50 1100h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM900 0h-100v1100h100v-1100zM50 800h500q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-500 q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM1100 600h200v-100h-200v-75l-167 125l167 125v-75zM50 500h300q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-300q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 200h600 q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-600q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z\" />\n<glyph unicode=\"&#xe059;\" d=\"M75 1000h750q31 0 53 -22t22 -53v-650q0 -31 -22 -53t-53 -22h-750q-31 0 -53 22t-22 53v650q0 31 22 53t53 22zM1200 300l-300 300l300 300v-600z\" />\n<glyph unicode=\"&#xe060;\" d=\"M44 1100h1112q18 0 31 -13t13 -31v-1012q0 -18 -13 -31t-31 -13h-1112q-18 0 -31 13t-13 31v1012q0 18 13 31t31 13zM100 1000v-737l247 182l298 -131l-74 156l293 318l236 -288v500h-1000zM342 884q56 0 95 -39t39 -94.5t-39 -95t-95 -39.5t-95 39.5t-39 95t39 94.5 t95 39z\" />\n<glyph unicode=\"&#xe062;\" d=\"M648 1169q117 0 216 -60t156.5 -161t57.5 -218q0 -115 -70 -258q-69 -109 -158 -225.5t-143 -179.5l-54 -62q-9 8 -25.5 24.5t-63.5 67.5t-91 103t-98.5 128t-95.5 148q-60 132 -60 249q0 88 34 169.5t91.5 142t137 96.5t166.5 36zM652.5 974q-91.5 0 -156.5 -65 t-65 -157t65 -156.5t156.5 -64.5t156.5 64.5t65 156.5t-65 157t-156.5 65z\" />\n<glyph unicode=\"&#xe063;\" d=\"M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 173v854q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57z\" />\n<glyph unicode=\"&#xe064;\" d=\"M554 1295q21 -72 57.5 -143.5t76 -130t83 -118t82.5 -117t70 -116t49.5 -126t18.5 -136.5q0 -71 -25.5 -135t-68.5 -111t-99 -82t-118.5 -54t-125.5 -23q-84 5 -161.5 34t-139.5 78.5t-99 125t-37 164.5q0 69 18 136.5t49.5 126.5t69.5 116.5t81.5 117.5t83.5 119 t76.5 131t58.5 143zM344 710q-23 -33 -43.5 -70.5t-40.5 -102.5t-17 -123q1 -37 14.5 -69.5t30 -52t41 -37t38.5 -24.5t33 -15q21 -7 32 -1t13 22l6 34q2 10 -2.5 22t-13.5 19q-5 4 -14 12t-29.5 40.5t-32.5 73.5q-26 89 6 271q2 11 -6 11q-8 1 -15 -10z\" />\n<glyph unicode=\"&#xe065;\" d=\"M1000 1013l108 115q2 1 5 2t13 2t20.5 -1t25 -9.5t28.5 -21.5q22 -22 27 -43t0 -32l-6 -10l-108 -115zM350 1100h400q50 0 105 -13l-187 -187h-368q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v182l200 200v-332 q0 -165 -93.5 -257.5t-256.5 -92.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400q0 165 92.5 257.5t257.5 92.5zM1009 803l-362 -362l-161 -50l55 170l355 355z\" />\n<glyph unicode=\"&#xe066;\" d=\"M350 1100h361q-164 -146 -216 -200h-195q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5l200 153v-103q0 -165 -92.5 -257.5t-257.5 -92.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400q0 165 92.5 257.5t257.5 92.5z M824 1073l339 -301q8 -7 8 -17.5t-8 -17.5l-340 -306q-7 -6 -12.5 -4t-6.5 11v203q-26 1 -54.5 0t-78.5 -7.5t-92 -17.5t-86 -35t-70 -57q10 59 33 108t51.5 81.5t65 58.5t68.5 40.5t67 24.5t56 13.5t40 4.5v210q1 10 6.5 12.5t13.5 -4.5z\" />\n<glyph unicode=\"&#xe067;\" d=\"M350 1100h350q60 0 127 -23l-178 -177h-349q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v69l200 200v-219q0 -165 -92.5 -257.5t-257.5 -92.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400q0 165 92.5 257.5t257.5 92.5z M643 639l395 395q7 7 17.5 7t17.5 -7l101 -101q7 -7 7 -17.5t-7 -17.5l-531 -532q-7 -7 -17.5 -7t-17.5 7l-248 248q-7 7 -7 17.5t7 17.5l101 101q7 7 17.5 7t17.5 -7l111 -111q8 -7 18 -7t18 7z\" />\n<glyph unicode=\"&#xe068;\" d=\"M318 918l264 264q8 8 18 8t18 -8l260 -264q7 -8 4.5 -13t-12.5 -5h-170v-200h200v173q0 10 5 12t13 -5l264 -260q8 -7 8 -17.5t-8 -17.5l-264 -265q-8 -7 -13 -5t-5 12v173h-200v-200h170q10 0 12.5 -5t-4.5 -13l-260 -264q-8 -8 -18 -8t-18 8l-264 264q-8 8 -5.5 13 t12.5 5h175v200h-200v-173q0 -10 -5 -12t-13 5l-264 265q-8 7 -8 17.5t8 17.5l264 260q8 7 13 5t5 -12v-173h200v200h-175q-10 0 -12.5 5t5.5 13z\" />\n<glyph unicode=\"&#xe069;\" d=\"M250 1100h100q21 0 35.5 -14.5t14.5 -35.5v-438l464 453q15 14 25.5 10t10.5 -25v-1000q0 -21 -10.5 -25t-25.5 10l-464 453v-438q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v1000q0 21 14.5 35.5t35.5 14.5z\" />\n<glyph unicode=\"&#xe070;\" d=\"M50 1100h100q21 0 35.5 -14.5t14.5 -35.5v-438l464 453q15 14 25.5 10t10.5 -25v-438l464 453q15 14 25.5 10t10.5 -25v-1000q0 -21 -10.5 -25t-25.5 10l-464 453v-438q0 -21 -10.5 -25t-25.5 10l-464 453v-438q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5 t-14.5 35.5v1000q0 21 14.5 35.5t35.5 14.5z\" />\n<glyph unicode=\"&#xe071;\" d=\"M1200 1050v-1000q0 -21 -10.5 -25t-25.5 10l-464 453v-438q0 -21 -10.5 -25t-25.5 10l-492 480q-15 14 -15 35t15 35l492 480q15 14 25.5 10t10.5 -25v-438l464 453q15 14 25.5 10t10.5 -25z\" />\n<glyph unicode=\"&#xe072;\" d=\"M243 1074l814 -498q18 -11 18 -26t-18 -26l-814 -498q-18 -11 -30.5 -4t-12.5 28v1000q0 21 12.5 28t30.5 -4z\" />\n<glyph unicode=\"&#xe073;\" d=\"M250 1000h200q21 0 35.5 -14.5t14.5 -35.5v-800q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v800q0 21 14.5 35.5t35.5 14.5zM650 1000h200q21 0 35.5 -14.5t14.5 -35.5v-800q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v800 q0 21 14.5 35.5t35.5 14.5z\" />\n<glyph unicode=\"&#xe074;\" d=\"M1100 950v-800q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v800q0 21 14.5 35.5t35.5 14.5h800q21 0 35.5 -14.5t14.5 -35.5z\" />\n<glyph unicode=\"&#xe075;\" d=\"M500 612v438q0 21 10.5 25t25.5 -10l492 -480q15 -14 15 -35t-15 -35l-492 -480q-15 -14 -25.5 -10t-10.5 25v438l-464 -453q-15 -14 -25.5 -10t-10.5 25v1000q0 21 10.5 25t25.5 -10z\" />\n<glyph unicode=\"&#xe076;\" d=\"M1048 1102l100 1q20 0 35 -14.5t15 -35.5l5 -1000q0 -21 -14.5 -35.5t-35.5 -14.5l-100 -1q-21 0 -35.5 14.5t-14.5 35.5l-2 437l-463 -454q-14 -15 -24.5 -10.5t-10.5 25.5l-2 437l-462 -455q-15 -14 -25.5 -9.5t-10.5 24.5l-5 1000q0 21 10.5 25.5t25.5 -10.5l466 -450 l-2 438q0 20 10.5 24.5t25.5 -9.5l466 -451l-2 438q0 21 14.5 35.5t35.5 14.5z\" />\n<glyph unicode=\"&#xe077;\" d=\"M850 1100h100q21 0 35.5 -14.5t14.5 -35.5v-1000q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v438l-464 -453q-15 -14 -25.5 -10t-10.5 25v1000q0 21 10.5 25t25.5 -10l464 -453v438q0 21 14.5 35.5t35.5 14.5z\" />\n<glyph unicode=\"&#xe078;\" d=\"M686 1081l501 -540q15 -15 10.5 -26t-26.5 -11h-1042q-22 0 -26.5 11t10.5 26l501 540q15 15 36 15t36 -15zM150 400h1000q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1000q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z\" />\n<glyph unicode=\"&#xe079;\" d=\"M885 900l-352 -353l352 -353l-197 -198l-552 552l552 550z\" />\n<glyph unicode=\"&#xe080;\" d=\"M1064 547l-551 -551l-198 198l353 353l-353 353l198 198z\" />\n<glyph unicode=\"&#xe081;\" d=\"M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM650 900h-100q-21 0 -35.5 -14.5t-14.5 -35.5v-150h-150 q-21 0 -35.5 -14.5t-14.5 -35.5v-100q0 -21 14.5 -35.5t35.5 -14.5h150v-150q0 -21 14.5 -35.5t35.5 -14.5h100q21 0 35.5 14.5t14.5 35.5v150h150q21 0 35.5 14.5t14.5 35.5v100q0 21 -14.5 35.5t-35.5 14.5h-150v150q0 21 -14.5 35.5t-35.5 14.5z\" />\n<glyph unicode=\"&#xe082;\" d=\"M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM850 700h-500q-21 0 -35.5 -14.5t-14.5 -35.5v-100q0 -21 14.5 -35.5 t35.5 -14.5h500q21 0 35.5 14.5t14.5 35.5v100q0 21 -14.5 35.5t-35.5 14.5z\" />\n<glyph unicode=\"&#xe083;\" d=\"M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM741.5 913q-12.5 0 -21.5 -9l-120 -120l-120 120q-9 9 -21.5 9 t-21.5 -9l-141 -141q-9 -9 -9 -21.5t9 -21.5l120 -120l-120 -120q-9 -9 -9 -21.5t9 -21.5l141 -141q9 -9 21.5 -9t21.5 9l120 120l120 -120q9 -9 21.5 -9t21.5 9l141 141q9 9 9 21.5t-9 21.5l-120 120l120 120q9 9 9 21.5t-9 21.5l-141 141q-9 9 -21.5 9z\" />\n<glyph unicode=\"&#xe084;\" d=\"M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM546 623l-84 85q-7 7 -17.5 7t-18.5 -7l-139 -139q-7 -8 -7 -18t7 -18 l242 -241q7 -8 17.5 -8t17.5 8l375 375q7 7 7 17.5t-7 18.5l-139 139q-7 7 -17.5 7t-17.5 -7z\" />\n<glyph unicode=\"&#xe085;\" d=\"M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM588 941q-29 0 -59 -5.5t-63 -20.5t-58 -38.5t-41.5 -63t-16.5 -89.5 q0 -25 20 -25h131q30 -5 35 11q6 20 20.5 28t45.5 8q20 0 31.5 -10.5t11.5 -28.5q0 -23 -7 -34t-26 -18q-1 0 -13.5 -4t-19.5 -7.5t-20 -10.5t-22 -17t-18.5 -24t-15.5 -35t-8 -46q-1 -8 5.5 -16.5t20.5 -8.5h173q7 0 22 8t35 28t37.5 48t29.5 74t12 100q0 47 -17 83 t-42.5 57t-59.5 34.5t-64 18t-59 4.5zM675 400h-150q-10 0 -17.5 -7.5t-7.5 -17.5v-150q0 -10 7.5 -17.5t17.5 -7.5h150q10 0 17.5 7.5t7.5 17.5v150q0 10 -7.5 17.5t-17.5 7.5z\" />\n<glyph unicode=\"&#xe086;\" d=\"M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM675 1000h-150q-10 0 -17.5 -7.5t-7.5 -17.5v-150q0 -10 7.5 -17.5 t17.5 -7.5h150q10 0 17.5 7.5t7.5 17.5v150q0 10 -7.5 17.5t-17.5 7.5zM675 700h-250q-10 0 -17.5 -7.5t-7.5 -17.5v-50q0 -10 7.5 -17.5t17.5 -7.5h75v-200h-75q-10 0 -17.5 -7.5t-7.5 -17.5v-50q0 -10 7.5 -17.5t17.5 -7.5h350q10 0 17.5 7.5t7.5 17.5v50q0 10 -7.5 17.5 t-17.5 7.5h-75v275q0 10 -7.5 17.5t-17.5 7.5z\" />\n<glyph unicode=\"&#xe087;\" d=\"M525 1200h150q10 0 17.5 -7.5t7.5 -17.5v-194q103 -27 178.5 -102.5t102.5 -178.5h194q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-194q-27 -103 -102.5 -178.5t-178.5 -102.5v-194q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v194 q-103 27 -178.5 102.5t-102.5 178.5h-194q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5h194q27 103 102.5 178.5t178.5 102.5v194q0 10 7.5 17.5t17.5 7.5zM700 893v-168q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v168q-68 -23 -119 -74 t-74 -119h168q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-168q23 -68 74 -119t119 -74v168q0 10 7.5 17.5t17.5 7.5h150q10 0 17.5 -7.5t7.5 -17.5v-168q68 23 119 74t74 119h-168q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5h168 q-23 68 -74 119t-119 74z\" />\n<glyph unicode=\"&#xe088;\" d=\"M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5t-57 214.5t-155.5 155.5t-214.5 57zM759 823l64 -64q7 -7 7 -17.5t-7 -17.5l-124 -124l124 -124q7 -7 7 -17.5t-7 -17.5l-64 -64q-7 -7 -17.5 -7t-17.5 7l-124 124l-124 -124q-7 -7 -17.5 -7t-17.5 7l-64 64 q-7 7 -7 17.5t7 17.5l124 124l-124 124q-7 7 -7 17.5t7 17.5l64 64q7 7 17.5 7t17.5 -7l124 -124l124 124q7 7 17.5 7t17.5 -7z\" />\n<glyph unicode=\"&#xe089;\" d=\"M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5t-57 214.5t-155.5 155.5t-214.5 57zM782 788l106 -106q7 -7 7 -17.5t-7 -17.5l-320 -321q-8 -7 -18 -7t-18 7l-202 203q-8 7 -8 17.5t8 17.5l106 106q7 8 17.5 8t17.5 -8l79 -79l197 197q7 7 17.5 7t17.5 -7z\" />\n<glyph unicode=\"&#xe090;\" d=\"M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5q0 -120 65 -225 l587 587q-105 65 -225 65zM965 819l-584 -584q104 -62 219 -62q116 0 214.5 57t155.5 155.5t57 214.5q0 115 -62 219z\" />\n<glyph unicode=\"&#xe091;\" d=\"M39 582l522 427q16 13 27.5 8t11.5 -26v-291h550q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-550v-291q0 -21 -11.5 -26t-27.5 8l-522 427q-16 13 -16 32t16 32z\" />\n<glyph unicode=\"&#xe092;\" d=\"M639 1009l522 -427q16 -13 16 -32t-16 -32l-522 -427q-16 -13 -27.5 -8t-11.5 26v291h-550q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5h550v291q0 21 11.5 26t27.5 -8z\" />\n<glyph unicode=\"&#xe093;\" d=\"M682 1161l427 -522q13 -16 8 -27.5t-26 -11.5h-291v-550q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v550h-291q-21 0 -26 11.5t8 27.5l427 522q13 16 32 16t32 -16z\" />\n<glyph unicode=\"&#xe094;\" d=\"M550 1200h200q21 0 35.5 -14.5t14.5 -35.5v-550h291q21 0 26 -11.5t-8 -27.5l-427 -522q-13 -16 -32 -16t-32 16l-427 522q-13 16 -8 27.5t26 11.5h291v550q0 21 14.5 35.5t35.5 14.5z\" />\n<glyph unicode=\"&#xe095;\" d=\"M639 1109l522 -427q16 -13 16 -32t-16 -32l-522 -427q-16 -13 -27.5 -8t-11.5 26v291q-94 -2 -182 -20t-170.5 -52t-147 -92.5t-100.5 -135.5q5 105 27 193.5t67.5 167t113 135t167 91.5t225.5 42v262q0 21 11.5 26t27.5 -8z\" />\n<glyph unicode=\"&#xe096;\" d=\"M850 1200h300q21 0 35.5 -14.5t14.5 -35.5v-300q0 -21 -10.5 -25t-24.5 10l-94 94l-249 -249q-8 -7 -18 -7t-18 7l-106 106q-7 8 -7 18t7 18l249 249l-94 94q-14 14 -10 24.5t25 10.5zM350 0h-300q-21 0 -35.5 14.5t-14.5 35.5v300q0 21 10.5 25t24.5 -10l94 -94l249 249 q8 7 18 7t18 -7l106 -106q7 -8 7 -18t-7 -18l-249 -249l94 -94q14 -14 10 -24.5t-25 -10.5z\" />\n<glyph unicode=\"&#xe097;\" d=\"M1014 1120l106 -106q7 -8 7 -18t-7 -18l-249 -249l94 -94q14 -14 10 -24.5t-25 -10.5h-300q-21 0 -35.5 14.5t-14.5 35.5v300q0 21 10.5 25t24.5 -10l94 -94l249 249q8 7 18 7t18 -7zM250 600h300q21 0 35.5 -14.5t14.5 -35.5v-300q0 -21 -10.5 -25t-24.5 10l-94 94 l-249 -249q-8 -7 -18 -7t-18 7l-106 106q-7 8 -7 18t7 18l249 249l-94 94q-14 14 -10 24.5t25 10.5z\" />\n<glyph unicode=\"&#xe101;\" d=\"M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM704 900h-208q-20 0 -32 -14.5t-8 -34.5l58 -302q4 -20 21.5 -34.5 t37.5 -14.5h54q20 0 37.5 14.5t21.5 34.5l58 302q4 20 -8 34.5t-32 14.5zM675 400h-150q-10 0 -17.5 -7.5t-7.5 -17.5v-150q0 -10 7.5 -17.5t17.5 -7.5h150q10 0 17.5 7.5t7.5 17.5v150q0 10 -7.5 17.5t-17.5 7.5z\" />\n<glyph unicode=\"&#xe102;\" d=\"M260 1200q9 0 19 -2t15 -4l5 -2q22 -10 44 -23l196 -118q21 -13 36 -24q29 -21 37 -12q11 13 49 35l196 118q22 13 45 23q17 7 38 7q23 0 47 -16.5t37 -33.5l13 -16q14 -21 18 -45l25 -123l8 -44q1 -9 8.5 -14.5t17.5 -5.5h61q10 0 17.5 -7.5t7.5 -17.5v-50 q0 -10 -7.5 -17.5t-17.5 -7.5h-50q-10 0 -17.5 -7.5t-7.5 -17.5v-175h-400v300h-200v-300h-400v175q0 10 -7.5 17.5t-17.5 7.5h-50q-10 0 -17.5 7.5t-7.5 17.5v50q0 10 7.5 17.5t17.5 7.5h61q11 0 18 3t7 8q0 4 9 52l25 128q5 25 19 45q2 3 5 7t13.5 15t21.5 19.5t26.5 15.5 t29.5 7zM915 1079l-166 -162q-7 -7 -5 -12t12 -5h219q10 0 15 7t2 17l-51 149q-3 10 -11 12t-15 -6zM463 917l-177 157q-8 7 -16 5t-11 -12l-51 -143q-3 -10 2 -17t15 -7h231q11 0 12.5 5t-5.5 12zM500 0h-375q-10 0 -17.5 7.5t-7.5 17.5v375h400v-400zM1100 400v-375 q0 -10 -7.5 -17.5t-17.5 -7.5h-375v400h400z\" />\n<glyph unicode=\"&#xe103;\" d=\"M1165 1190q8 3 21 -6.5t13 -17.5q-2 -178 -24.5 -323.5t-55.5 -245.5t-87 -174.5t-102.5 -118.5t-118 -68.5t-118.5 -33t-120 -4.5t-105 9.5t-90 16.5q-61 12 -78 11q-4 1 -12.5 0t-34 -14.5t-52.5 -40.5l-153 -153q-26 -24 -37 -14.5t-11 43.5q0 64 42 102q8 8 50.5 45 t66.5 58q19 17 35 47t13 61q-9 55 -10 102.5t7 111t37 130t78 129.5q39 51 80 88t89.5 63.5t94.5 45t113.5 36t129 31t157.5 37t182 47.5zM1116 1098q-8 9 -22.5 -3t-45.5 -50q-38 -47 -119 -103.5t-142 -89.5l-62 -33q-56 -30 -102 -57t-104 -68t-102.5 -80.5t-85.5 -91 t-64 -104.5q-24 -56 -31 -86t2 -32t31.5 17.5t55.5 59.5q25 30 94 75.5t125.5 77.5t147.5 81q70 37 118.5 69t102 79.5t99 111t86.5 148.5q22 50 24 60t-6 19z\" />\n<glyph unicode=\"&#xe104;\" d=\"M653 1231q-39 -67 -54.5 -131t-10.5 -114.5t24.5 -96.5t47.5 -80t63.5 -62.5t68.5 -46.5t65 -30q-4 7 -17.5 35t-18.5 39.5t-17 39.5t-17 43t-13 42t-9.5 44.5t-2 42t4 43t13.5 39t23 38.5q96 -42 165 -107.5t105 -138t52 -156t13 -159t-19 -149.5q-13 -55 -44 -106.5 t-68 -87t-78.5 -64.5t-72.5 -45t-53 -22q-72 -22 -127 -11q-31 6 -13 19q6 3 17 7q13 5 32.5 21t41 44t38.5 63.5t21.5 81.5t-6.5 94.5t-50 107t-104 115.5q10 -104 -0.5 -189t-37 -140.5t-65 -93t-84 -52t-93.5 -11t-95 24.5q-80 36 -131.5 114t-53.5 171q-2 23 0 49.5 t4.5 52.5t13.5 56t27.5 60t46 64.5t69.5 68.5q-8 -53 -5 -102.5t17.5 -90t34 -68.5t44.5 -39t49 -2q31 13 38.5 36t-4.5 55t-29 64.5t-36 75t-26 75.5q-15 85 2 161.5t53.5 128.5t85.5 92.5t93.5 61t81.5 25.5z\" />\n<glyph unicode=\"&#xe105;\" d=\"M600 1094q82 0 160.5 -22.5t140 -59t116.5 -82.5t94.5 -95t68 -95t42.5 -82.5t14 -57.5t-14 -57.5t-43 -82.5t-68.5 -95t-94.5 -95t-116.5 -82.5t-140 -59t-159.5 -22.5t-159.5 22.5t-140 59t-116.5 82.5t-94.5 95t-68.5 95t-43 82.5t-14 57.5t14 57.5t42.5 82.5t68 95 t94.5 95t116.5 82.5t140 59t160.5 22.5zM888 829q-15 15 -18 12t5 -22q25 -57 25 -119q0 -124 -88 -212t-212 -88t-212 88t-88 212q0 59 23 114q8 19 4.5 22t-17.5 -12q-70 -69 -160 -184q-13 -16 -15 -40.5t9 -42.5q22 -36 47 -71t70 -82t92.5 -81t113 -58.5t133.5 -24.5 t133.5 24t113 58.5t92.5 81.5t70 81.5t47 70.5q11 18 9 42.5t-14 41.5q-90 117 -163 189zM448 727l-35 -36q-15 -15 -19.5 -38.5t4.5 -41.5q37 -68 93 -116q16 -13 38.5 -11t36.5 17l35 34q14 15 12.5 33.5t-16.5 33.5q-44 44 -89 117q-11 18 -28 20t-32 -12z\" />\n<glyph unicode=\"&#xe106;\" d=\"M592 0h-148l31 120q-91 20 -175.5 68.5t-143.5 106.5t-103.5 119t-66.5 110t-22 76q0 21 14 57.5t42.5 82.5t68 95t94.5 95t116.5 82.5t140 59t160.5 22.5q61 0 126 -15l32 121h148zM944 770l47 181q108 -85 176.5 -192t68.5 -159q0 -26 -19.5 -71t-59.5 -102t-93 -112 t-129 -104.5t-158 -75.5l46 173q77 49 136 117t97 131q11 18 9 42.5t-14 41.5q-54 70 -107 130zM310 824q-70 -69 -160 -184q-13 -16 -15 -40.5t9 -42.5q18 -30 39 -60t57 -70.5t74 -73t90 -61t105 -41.5l41 154q-107 18 -178.5 101.5t-71.5 193.5q0 59 23 114q8 19 4.5 22 t-17.5 -12zM448 727l-35 -36q-15 -15 -19.5 -38.5t4.5 -41.5q37 -68 93 -116q16 -13 38.5 -11t36.5 17l12 11l22 86l-3 4q-44 44 -89 117q-11 18 -28 20t-32 -12z\" />\n<glyph unicode=\"&#xe107;\" d=\"M-90 100l642 1066q20 31 48 28.5t48 -35.5l642 -1056q21 -32 7.5 -67.5t-50.5 -35.5h-1294q-37 0 -50.5 34t7.5 66zM155 200h345v75q0 10 7.5 17.5t17.5 7.5h150q10 0 17.5 -7.5t7.5 -17.5v-75h345l-445 723zM496 700h208q20 0 32 -14.5t8 -34.5l-58 -252 q-4 -20 -21.5 -34.5t-37.5 -14.5h-54q-20 0 -37.5 14.5t-21.5 34.5l-58 252q-4 20 8 34.5t32 14.5z\" />\n<glyph unicode=\"&#xe108;\" d=\"M650 1200q62 0 106 -44t44 -106v-339l363 -325q15 -14 26 -38.5t11 -44.5v-41q0 -20 -12 -26.5t-29 5.5l-359 249v-263q100 -93 100 -113v-64q0 -21 -13 -29t-32 1l-205 128l-205 -128q-19 -9 -32 -1t-13 29v64q0 20 100 113v263l-359 -249q-17 -12 -29 -5.5t-12 26.5v41 q0 20 11 44.5t26 38.5l363 325v339q0 62 44 106t106 44z\" />\n<glyph unicode=\"&#xe109;\" d=\"M850 1200h100q21 0 35.5 -14.5t14.5 -35.5v-50h50q21 0 35.5 -14.5t14.5 -35.5v-150h-1100v150q0 21 14.5 35.5t35.5 14.5h50v50q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-50h500v50q0 21 14.5 35.5t35.5 14.5zM1100 800v-750q0 -21 -14.5 -35.5 t-35.5 -14.5h-1000q-21 0 -35.5 14.5t-14.5 35.5v750h1100zM100 600v-100h100v100h-100zM300 600v-100h100v100h-100zM500 600v-100h100v100h-100zM700 600v-100h100v100h-100zM900 600v-100h100v100h-100zM100 400v-100h100v100h-100zM300 400v-100h100v100h-100zM500 400 v-100h100v100h-100zM700 400v-100h100v100h-100zM900 400v-100h100v100h-100zM100 200v-100h100v100h-100zM300 200v-100h100v100h-100zM500 200v-100h100v100h-100zM700 200v-100h100v100h-100zM900 200v-100h100v100h-100z\" />\n<glyph unicode=\"&#xe110;\" d=\"M1135 1165l249 -230q15 -14 15 -35t-15 -35l-249 -230q-14 -14 -24.5 -10t-10.5 25v150h-159l-600 -600h-291q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h209l600 600h241v150q0 21 10.5 25t24.5 -10zM522 819l-141 -141l-122 122h-209q-21 0 -35.5 14.5 t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h291zM1135 565l249 -230q15 -14 15 -35t-15 -35l-249 -230q-14 -14 -24.5 -10t-10.5 25v150h-241l-181 181l141 141l122 -122h159v150q0 21 10.5 25t24.5 -10z\" />\n<glyph unicode=\"&#xe111;\" d=\"M100 1100h1000q41 0 70.5 -29.5t29.5 -70.5v-600q0 -41 -29.5 -70.5t-70.5 -29.5h-596l-304 -300v300h-100q-41 0 -70.5 29.5t-29.5 70.5v600q0 41 29.5 70.5t70.5 29.5z\" />\n<glyph unicode=\"&#xe112;\" d=\"M150 1200h200q21 0 35.5 -14.5t14.5 -35.5v-250h-300v250q0 21 14.5 35.5t35.5 14.5zM850 1200h200q21 0 35.5 -14.5t14.5 -35.5v-250h-300v250q0 21 14.5 35.5t35.5 14.5zM1100 800v-300q0 -41 -3 -77.5t-15 -89.5t-32 -96t-58 -89t-89 -77t-129 -51t-174 -20t-174 20 t-129 51t-89 77t-58 89t-32 96t-15 89.5t-3 77.5v300h300v-250v-27v-42.5t1.5 -41t5 -38t10 -35t16.5 -30t25.5 -24.5t35 -19t46.5 -12t60 -4t60 4.5t46.5 12.5t35 19.5t25 25.5t17 30.5t10 35t5 38t2 40.5t-0.5 42v25v250h300z\" />\n<glyph unicode=\"&#xe113;\" d=\"M1100 411l-198 -199l-353 353l-353 -353l-197 199l551 551z\" />\n<glyph unicode=\"&#xe114;\" d=\"M1101 789l-550 -551l-551 551l198 199l353 -353l353 353z\" />\n<glyph unicode=\"&#xe115;\" d=\"M404 1000h746q21 0 35.5 -14.5t14.5 -35.5v-551h150q21 0 25 -10.5t-10 -24.5l-230 -249q-14 -15 -35 -15t-35 15l-230 249q-14 14 -10 24.5t25 10.5h150v401h-381zM135 984l230 -249q14 -14 10 -24.5t-25 -10.5h-150v-400h385l215 -200h-750q-21 0 -35.5 14.5 t-14.5 35.5v550h-150q-21 0 -25 10.5t10 24.5l230 249q14 15 35 15t35 -15z\" />\n<glyph unicode=\"&#xe116;\" d=\"M56 1200h94q17 0 31 -11t18 -27l38 -162h896q24 0 39 -18.5t10 -42.5l-100 -475q-5 -21 -27 -42.5t-55 -21.5h-633l48 -200h535q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-50v-50q0 -21 -14.5 -35.5t-35.5 -14.5t-35.5 14.5t-14.5 35.5v50h-300v-50 q0 -21 -14.5 -35.5t-35.5 -14.5t-35.5 14.5t-14.5 35.5v50h-31q-18 0 -32.5 10t-20.5 19l-5 10l-201 961h-54q-20 0 -35 14.5t-15 35.5t15 35.5t35 14.5z\" />\n<glyph unicode=\"&#xe117;\" d=\"M1200 1000v-100h-1200v100h200q0 41 29.5 70.5t70.5 29.5h300q41 0 70.5 -29.5t29.5 -70.5h500zM0 800h1200v-800h-1200v800z\" />\n<glyph unicode=\"&#xe118;\" d=\"M200 800l-200 -400v600h200q0 41 29.5 70.5t70.5 29.5h300q42 0 71 -29.5t29 -70.5h500v-200h-1000zM1500 700l-300 -700h-1200l300 700h1200z\" />\n<glyph unicode=\"&#xe119;\" d=\"M635 1184l230 -249q14 -14 10 -24.5t-25 -10.5h-150v-601h150q21 0 25 -10.5t-10 -24.5l-230 -249q-14 -15 -35 -15t-35 15l-230 249q-14 14 -10 24.5t25 10.5h150v601h-150q-21 0 -25 10.5t10 24.5l230 249q14 15 35 15t35 -15z\" />\n<glyph unicode=\"&#xe120;\" d=\"M936 864l249 -229q14 -15 14 -35.5t-14 -35.5l-249 -229q-15 -15 -25.5 -10.5t-10.5 24.5v151h-600v-151q0 -20 -10.5 -24.5t-25.5 10.5l-249 229q-14 15 -14 35.5t14 35.5l249 229q15 15 25.5 10.5t10.5 -25.5v-149h600v149q0 21 10.5 25.5t25.5 -10.5z\" />\n<glyph unicode=\"&#xe121;\" d=\"M1169 400l-172 732q-5 23 -23 45.5t-38 22.5h-672q-20 0 -38 -20t-23 -41l-172 -739h1138zM1100 300h-1000q-41 0 -70.5 -29.5t-29.5 -70.5v-100q0 -41 29.5 -70.5t70.5 -29.5h1000q41 0 70.5 29.5t29.5 70.5v100q0 41 -29.5 70.5t-70.5 29.5zM800 100v100h100v-100h-100 zM1000 100v100h100v-100h-100z\" />\n<glyph unicode=\"&#xe122;\" d=\"M1150 1100q21 0 35.5 -14.5t14.5 -35.5v-850q0 -21 -14.5 -35.5t-35.5 -14.5t-35.5 14.5t-14.5 35.5v850q0 21 14.5 35.5t35.5 14.5zM1000 200l-675 200h-38l47 -276q3 -16 -5.5 -20t-29.5 -4h-7h-84q-20 0 -34.5 14t-18.5 35q-55 337 -55 351v250v6q0 16 1 23.5t6.5 14 t17.5 6.5h200l675 250v-850zM0 750v-250q-4 0 -11 0.5t-24 6t-30 15t-24 30t-11 48.5v50q0 26 10.5 46t25 30t29 16t25.5 7z\" />\n<glyph unicode=\"&#xe123;\" d=\"M553 1200h94q20 0 29 -10.5t3 -29.5l-18 -37q83 -19 144 -82.5t76 -140.5l63 -327l118 -173h17q19 0 33 -14.5t14 -35t-13 -40.5t-31 -27q-8 -4 -23 -9.5t-65 -19.5t-103 -25t-132.5 -20t-158.5 -9q-57 0 -115 5t-104 12t-88.5 15.5t-73.5 17.5t-54.5 16t-35.5 12l-11 4 q-18 8 -31 28t-13 40.5t14 35t33 14.5h17l118 173l63 327q15 77 76 140t144 83l-18 32q-6 19 3.5 32t28.5 13zM498 110q50 -6 102 -6q53 0 102 6q-12 -49 -39.5 -79.5t-62.5 -30.5t-63 30.5t-39 79.5z\" />\n<glyph unicode=\"&#xe124;\" d=\"M800 946l224 78l-78 -224l234 -45l-180 -155l180 -155l-234 -45l78 -224l-224 78l-45 -234l-155 180l-155 -180l-45 234l-224 -78l78 224l-234 45l180 155l-180 155l234 45l-78 224l224 -78l45 234l155 -180l155 180z\" />\n<glyph unicode=\"&#xe125;\" d=\"M650 1200h50q40 0 70 -40.5t30 -84.5v-150l-28 -125h328q40 0 70 -40.5t30 -84.5v-100q0 -45 -29 -74l-238 -344q-16 -24 -38 -40.5t-45 -16.5h-250q-7 0 -42 25t-66 50l-31 25h-61q-45 0 -72.5 18t-27.5 57v400q0 36 20 63l145 196l96 198q13 28 37.5 48t51.5 20z M650 1100l-100 -212l-150 -213v-375h100l136 -100h214l250 375v125h-450l50 225v175h-50zM50 800h100q21 0 35.5 -14.5t14.5 -35.5v-500q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v500q0 21 14.5 35.5t35.5 14.5z\" />\n<glyph unicode=\"&#xe126;\" d=\"M600 1100h250q23 0 45 -16.5t38 -40.5l238 -344q29 -29 29 -74v-100q0 -44 -30 -84.5t-70 -40.5h-328q28 -118 28 -125v-150q0 -44 -30 -84.5t-70 -40.5h-50q-27 0 -51.5 20t-37.5 48l-96 198l-145 196q-20 27 -20 63v400q0 39 27.5 57t72.5 18h61q124 100 139 100z M50 1000h100q21 0 35.5 -14.5t14.5 -35.5v-500q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v500q0 21 14.5 35.5t35.5 14.5zM636 1000l-136 -100h-100v-375l150 -213l100 -212h50v175l-50 225h450v125l-250 375h-214z\" />\n<glyph unicode=\"&#xe127;\" d=\"M356 873l363 230q31 16 53 -6l110 -112q13 -13 13.5 -32t-11.5 -34l-84 -121h302q84 0 138 -38t54 -110t-55 -111t-139 -39h-106l-131 -339q-6 -21 -19.5 -41t-28.5 -20h-342q-7 0 -90 81t-83 94v525q0 17 14 35.5t28 28.5zM400 792v-503l100 -89h293l131 339 q6 21 19.5 41t28.5 20h203q21 0 30.5 25t0.5 50t-31 25h-456h-7h-6h-5.5t-6 0.5t-5 1.5t-5 2t-4 2.5t-4 4t-2.5 4.5q-12 25 5 47l146 183l-86 83zM50 800h100q21 0 35.5 -14.5t14.5 -35.5v-500q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v500 q0 21 14.5 35.5t35.5 14.5z\" />\n<glyph unicode=\"&#xe128;\" d=\"M475 1103l366 -230q2 -1 6 -3.5t14 -10.5t18 -16.5t14.5 -20t6.5 -22.5v-525q0 -13 -86 -94t-93 -81h-342q-15 0 -28.5 20t-19.5 41l-131 339h-106q-85 0 -139.5 39t-54.5 111t54 110t138 38h302l-85 121q-11 15 -10.5 34t13.5 32l110 112q22 22 53 6zM370 945l146 -183 q17 -22 5 -47q-2 -2 -3.5 -4.5t-4 -4t-4 -2.5t-5 -2t-5 -1.5t-6 -0.5h-6h-6.5h-6h-475v-100h221q15 0 29 -20t20 -41l130 -339h294l106 89v503l-342 236zM1050 800h100q21 0 35.5 -14.5t14.5 -35.5v-500q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5 v500q0 21 14.5 35.5t35.5 14.5z\" />\n<glyph unicode=\"&#xe129;\" d=\"M550 1294q72 0 111 -55t39 -139v-106l339 -131q21 -6 41 -19.5t20 -28.5v-342q0 -7 -81 -90t-94 -83h-525q-17 0 -35.5 14t-28.5 28l-9 14l-230 363q-16 31 6 53l112 110q13 13 32 13.5t34 -11.5l121 -84v302q0 84 38 138t110 54zM600 972v203q0 21 -25 30.5t-50 0.5 t-25 -31v-456v-7v-6v-5.5t-0.5 -6t-1.5 -5t-2 -5t-2.5 -4t-4 -4t-4.5 -2.5q-25 -12 -47 5l-183 146l-83 -86l236 -339h503l89 100v293l-339 131q-21 6 -41 19.5t-20 28.5zM450 200h500q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-500 q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z\" />\n<glyph unicode=\"&#xe130;\" d=\"M350 1100h500q21 0 35.5 14.5t14.5 35.5v100q0 21 -14.5 35.5t-35.5 14.5h-500q-21 0 -35.5 -14.5t-14.5 -35.5v-100q0 -21 14.5 -35.5t35.5 -14.5zM600 306v-106q0 -84 -39 -139t-111 -55t-110 54t-38 138v302l-121 -84q-15 -12 -34 -11.5t-32 13.5l-112 110 q-22 22 -6 53l230 363q1 2 3.5 6t10.5 13.5t16.5 17t20 13.5t22.5 6h525q13 0 94 -83t81 -90v-342q0 -15 -20 -28.5t-41 -19.5zM308 900l-236 -339l83 -86l183 146q22 17 47 5q2 -1 4.5 -2.5t4 -4t2.5 -4t2 -5t1.5 -5t0.5 -6v-5.5v-6v-7v-456q0 -22 25 -31t50 0.5t25 30.5 v203q0 15 20 28.5t41 19.5l339 131v293l-89 100h-503z\" />\n<glyph unicode=\"&#xe131;\" d=\"M600 1178q118 0 225 -45.5t184.5 -123t123 -184.5t45.5 -225t-45.5 -225t-123 -184.5t-184.5 -123t-225 -45.5t-225 45.5t-184.5 123t-123 184.5t-45.5 225t45.5 225t123 184.5t184.5 123t225 45.5zM914 632l-275 223q-16 13 -27.5 8t-11.5 -26v-137h-275 q-10 0 -17.5 -7.5t-7.5 -17.5v-150q0 -10 7.5 -17.5t17.5 -7.5h275v-137q0 -21 11.5 -26t27.5 8l275 223q16 13 16 32t-16 32z\" />\n<glyph unicode=\"&#xe132;\" d=\"M600 1178q118 0 225 -45.5t184.5 -123t123 -184.5t45.5 -225t-45.5 -225t-123 -184.5t-184.5 -123t-225 -45.5t-225 45.5t-184.5 123t-123 184.5t-45.5 225t45.5 225t123 184.5t184.5 123t225 45.5zM561 855l-275 -223q-16 -13 -16 -32t16 -32l275 -223q16 -13 27.5 -8 t11.5 26v137h275q10 0 17.5 7.5t7.5 17.5v150q0 10 -7.5 17.5t-17.5 7.5h-275v137q0 21 -11.5 26t-27.5 -8z\" />\n<glyph unicode=\"&#xe133;\" d=\"M600 1178q118 0 225 -45.5t184.5 -123t123 -184.5t45.5 -225t-45.5 -225t-123 -184.5t-184.5 -123t-225 -45.5t-225 45.5t-184.5 123t-123 184.5t-45.5 225t45.5 225t123 184.5t184.5 123t225 45.5zM855 639l-223 275q-13 16 -32 16t-32 -16l-223 -275q-13 -16 -8 -27.5 t26 -11.5h137v-275q0 -10 7.5 -17.5t17.5 -7.5h150q10 0 17.5 7.5t7.5 17.5v275h137q21 0 26 11.5t-8 27.5z\" />\n<glyph unicode=\"&#xe134;\" d=\"M600 1178q118 0 225 -45.5t184.5 -123t123 -184.5t45.5 -225t-45.5 -225t-123 -184.5t-184.5 -123t-225 -45.5t-225 45.5t-184.5 123t-123 184.5t-45.5 225t45.5 225t123 184.5t184.5 123t225 45.5zM675 900h-150q-10 0 -17.5 -7.5t-7.5 -17.5v-275h-137q-21 0 -26 -11.5 t8 -27.5l223 -275q13 -16 32 -16t32 16l223 275q13 16 8 27.5t-26 11.5h-137v275q0 10 -7.5 17.5t-17.5 7.5z\" />\n<glyph unicode=\"&#xe135;\" d=\"M600 1176q116 0 222.5 -46t184 -123.5t123.5 -184t46 -222.5t-46 -222.5t-123.5 -184t-184 -123.5t-222.5 -46t-222.5 46t-184 123.5t-123.5 184t-46 222.5t46 222.5t123.5 184t184 123.5t222.5 46zM627 1101q-15 -12 -36.5 -20.5t-35.5 -12t-43 -8t-39 -6.5 q-15 -3 -45.5 0t-45.5 -2q-20 -7 -51.5 -26.5t-34.5 -34.5q-3 -11 6.5 -22.5t8.5 -18.5q-3 -34 -27.5 -91t-29.5 -79q-9 -34 5 -93t8 -87q0 -9 17 -44.5t16 -59.5q12 0 23 -5t23.5 -15t19.5 -14q16 -8 33 -15t40.5 -15t34.5 -12q21 -9 52.5 -32t60 -38t57.5 -11 q7 -15 -3 -34t-22.5 -40t-9.5 -38q13 -21 23 -34.5t27.5 -27.5t36.5 -18q0 -7 -3.5 -16t-3.5 -14t5 -17q104 -2 221 112q30 29 46.5 47t34.5 49t21 63q-13 8 -37 8.5t-36 7.5q-15 7 -49.5 15t-51.5 19q-18 0 -41 -0.5t-43 -1.5t-42 -6.5t-38 -16.5q-51 -35 -66 -12 q-4 1 -3.5 25.5t0.5 25.5q-6 13 -26.5 17.5t-24.5 6.5q1 15 -0.5 30.5t-7 28t-18.5 11.5t-31 -21q-23 -25 -42 4q-19 28 -8 58q6 16 22 22q6 -1 26 -1.5t33.5 -4t19.5 -13.5q7 -12 18 -24t21.5 -20.5t20 -15t15.5 -10.5l5 -3q2 12 7.5 30.5t8 34.5t-0.5 32q-3 18 3.5 29 t18 22.5t15.5 24.5q6 14 10.5 35t8 31t15.5 22.5t34 22.5q-6 18 10 36q8 0 24 -1.5t24.5 -1.5t20 4.5t20.5 15.5q-10 23 -31 42.5t-37.5 29.5t-49 27t-43.5 23q0 1 2 8t3 11.5t1.5 10.5t-1 9.5t-4.5 4.5q31 -13 58.5 -14.5t38.5 2.5l12 5q5 28 -9.5 46t-36.5 24t-50 15 t-41 20q-18 -4 -37 0zM613 994q0 -17 8 -42t17 -45t9 -23q-8 1 -39.5 5.5t-52.5 10t-37 16.5q3 11 16 29.5t16 25.5q10 -10 19 -10t14 6t13.5 14.5t16.5 12.5z\" />\n<glyph unicode=\"&#xe136;\" d=\"M756 1157q164 92 306 -9l-259 -138l145 -232l251 126q6 -89 -34 -156.5t-117 -110.5q-60 -34 -127 -39.5t-126 16.5l-596 -596q-15 -16 -36.5 -16t-36.5 16l-111 110q-15 15 -15 36.5t15 37.5l600 599q-34 101 5.5 201.5t135.5 154.5z\" />\n<glyph unicode=\"&#xe137;\" horiz-adv-x=\"1220\" d=\"M100 1196h1000q41 0 70.5 -29.5t29.5 -70.5v-100q0 -41 -29.5 -70.5t-70.5 -29.5h-1000q-41 0 -70.5 29.5t-29.5 70.5v100q0 41 29.5 70.5t70.5 29.5zM1100 1096h-200v-100h200v100zM100 796h1000q41 0 70.5 -29.5t29.5 -70.5v-100q0 -41 -29.5 -70.5t-70.5 -29.5h-1000 q-41 0 -70.5 29.5t-29.5 70.5v100q0 41 29.5 70.5t70.5 29.5zM1100 696h-500v-100h500v100zM100 396h1000q41 0 70.5 -29.5t29.5 -70.5v-100q0 -41 -29.5 -70.5t-70.5 -29.5h-1000q-41 0 -70.5 29.5t-29.5 70.5v100q0 41 29.5 70.5t70.5 29.5zM1100 296h-300v-100h300v100z \" />\n<glyph unicode=\"&#xe138;\" d=\"M150 1200h900q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-900q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM700 500v-300l-200 -200v500l-350 500h900z\" />\n<glyph unicode=\"&#xe139;\" d=\"M500 1200h200q41 0 70.5 -29.5t29.5 -70.5v-100h300q41 0 70.5 -29.5t29.5 -70.5v-400h-500v100h-200v-100h-500v400q0 41 29.5 70.5t70.5 29.5h300v100q0 41 29.5 70.5t70.5 29.5zM500 1100v-100h200v100h-200zM1200 400v-200q0 -41 -29.5 -70.5t-70.5 -29.5h-1000 q-41 0 -70.5 29.5t-29.5 70.5v200h1200z\" />\n<glyph unicode=\"&#xe140;\" d=\"M50 1200h300q21 0 25 -10.5t-10 -24.5l-94 -94l199 -199q7 -8 7 -18t-7 -18l-106 -106q-8 -7 -18 -7t-18 7l-199 199l-94 -94q-14 -14 -24.5 -10t-10.5 25v300q0 21 14.5 35.5t35.5 14.5zM850 1200h300q21 0 35.5 -14.5t14.5 -35.5v-300q0 -21 -10.5 -25t-24.5 10l-94 94 l-199 -199q-8 -7 -18 -7t-18 7l-106 106q-7 8 -7 18t7 18l199 199l-94 94q-14 14 -10 24.5t25 10.5zM364 470l106 -106q7 -8 7 -18t-7 -18l-199 -199l94 -94q14 -14 10 -24.5t-25 -10.5h-300q-21 0 -35.5 14.5t-14.5 35.5v300q0 21 10.5 25t24.5 -10l94 -94l199 199 q8 7 18 7t18 -7zM1071 271l94 94q14 14 24.5 10t10.5 -25v-300q0 -21 -14.5 -35.5t-35.5 -14.5h-300q-21 0 -25 10.5t10 24.5l94 94l-199 199q-7 8 -7 18t7 18l106 106q8 7 18 7t18 -7z\" />\n<glyph unicode=\"&#xe141;\" d=\"M596 1192q121 0 231.5 -47.5t190 -127t127 -190t47.5 -231.5t-47.5 -231.5t-127 -190.5t-190 -127t-231.5 -47t-231.5 47t-190.5 127t-127 190.5t-47 231.5t47 231.5t127 190t190.5 127t231.5 47.5zM596 1010q-112 0 -207.5 -55.5t-151 -151t-55.5 -207.5t55.5 -207.5 t151 -151t207.5 -55.5t207.5 55.5t151 151t55.5 207.5t-55.5 207.5t-151 151t-207.5 55.5zM454.5 905q22.5 0 38.5 -16t16 -38.5t-16 -39t-38.5 -16.5t-38.5 16.5t-16 39t16 38.5t38.5 16zM754.5 905q22.5 0 38.5 -16t16 -38.5t-16 -39t-38 -16.5q-14 0 -29 10l-55 -145 q17 -23 17 -51q0 -36 -25.5 -61.5t-61.5 -25.5t-61.5 25.5t-25.5 61.5q0 32 20.5 56.5t51.5 29.5l122 126l1 1q-9 14 -9 28q0 23 16 39t38.5 16zM345.5 709q22.5 0 38.5 -16t16 -38.5t-16 -38.5t-38.5 -16t-38.5 16t-16 38.5t16 38.5t38.5 16zM854.5 709q22.5 0 38.5 -16 t16 -38.5t-16 -38.5t-38.5 -16t-38.5 16t-16 38.5t16 38.5t38.5 16z\" />\n<glyph unicode=\"&#xe142;\" d=\"M546 173l469 470q91 91 99 192q7 98 -52 175.5t-154 94.5q-22 4 -47 4q-34 0 -66.5 -10t-56.5 -23t-55.5 -38t-48 -41.5t-48.5 -47.5q-376 -375 -391 -390q-30 -27 -45 -41.5t-37.5 -41t-32 -46.5t-16 -47.5t-1.5 -56.5q9 -62 53.5 -95t99.5 -33q74 0 125 51l548 548 q36 36 20 75q-7 16 -21.5 26t-32.5 10q-26 0 -50 -23q-13 -12 -39 -38l-341 -338q-15 -15 -35.5 -15.5t-34.5 13.5t-14 34.5t14 34.5q327 333 361 367q35 35 67.5 51.5t78.5 16.5q14 0 29 -1q44 -8 74.5 -35.5t43.5 -68.5q14 -47 2 -96.5t-47 -84.5q-12 -11 -32 -32 t-79.5 -81t-114.5 -115t-124.5 -123.5t-123 -119.5t-96.5 -89t-57 -45q-56 -27 -120 -27q-70 0 -129 32t-93 89q-48 78 -35 173t81 163l511 511q71 72 111 96q91 55 198 55q80 0 152 -33q78 -36 129.5 -103t66.5 -154q17 -93 -11 -183.5t-94 -156.5l-482 -476 q-15 -15 -36 -16t-37 14t-17.5 34t14.5 35z\" />\n<glyph unicode=\"&#xe143;\" d=\"M649 949q48 68 109.5 104t121.5 38.5t118.5 -20t102.5 -64t71 -100.5t27 -123q0 -57 -33.5 -117.5t-94 -124.5t-126.5 -127.5t-150 -152.5t-146 -174q-62 85 -145.5 174t-150 152.5t-126.5 127.5t-93.5 124.5t-33.5 117.5q0 64 28 123t73 100.5t104 64t119 20 t120.5 -38.5t104.5 -104zM896 972q-33 0 -64.5 -19t-56.5 -46t-47.5 -53.5t-43.5 -45.5t-37.5 -19t-36 19t-40 45.5t-43 53.5t-54 46t-65.5 19q-67 0 -122.5 -55.5t-55.5 -132.5q0 -23 13.5 -51t46 -65t57.5 -63t76 -75l22 -22q15 -14 44 -44t50.5 -51t46 -44t41 -35t23 -12 t23.5 12t42.5 36t46 44t52.5 52t44 43q4 4 12 13q43 41 63.5 62t52 55t46 55t26 46t11.5 44q0 79 -53 133.5t-120 54.5z\" />\n<glyph unicode=\"&#xe144;\" d=\"M776.5 1214q93.5 0 159.5 -66l141 -141q66 -66 66 -160q0 -42 -28 -95.5t-62 -87.5l-29 -29q-31 53 -77 99l-18 18l95 95l-247 248l-389 -389l212 -212l-105 -106l-19 18l-141 141q-66 66 -66 159t66 159l283 283q65 66 158.5 66zM600 706l105 105q10 -8 19 -17l141 -141 q66 -66 66 -159t-66 -159l-283 -283q-66 -66 -159 -66t-159 66l-141 141q-66 66 -66 159.5t66 159.5l55 55q29 -55 75 -102l18 -17l-95 -95l247 -248l389 389z\" />\n<glyph unicode=\"&#xe145;\" d=\"M603 1200q85 0 162 -15t127 -38t79 -48t29 -46v-953q0 -41 -29.5 -70.5t-70.5 -29.5h-600q-41 0 -70.5 29.5t-29.5 70.5v953q0 21 30 46.5t81 48t129 37.5t163 15zM300 1000v-700h600v700h-600zM600 254q-43 0 -73.5 -30.5t-30.5 -73.5t30.5 -73.5t73.5 -30.5t73.5 30.5 t30.5 73.5t-30.5 73.5t-73.5 30.5z\" />\n<glyph unicode=\"&#xe146;\" d=\"M902 1185l283 -282q15 -15 15 -36t-14.5 -35.5t-35.5 -14.5t-35 15l-36 35l-279 -267v-300l-212 210l-308 -307l-280 -203l203 280l307 308l-210 212h300l267 279l-35 36q-15 14 -15 35t14.5 35.5t35.5 14.5t35 -15z\" />\n<glyph unicode=\"&#xe148;\" d=\"M700 1248v-78q38 -5 72.5 -14.5t75.5 -31.5t71 -53.5t52 -84t24 -118.5h-159q-4 36 -10.5 59t-21 45t-40 35.5t-64.5 20.5v-307l64 -13q34 -7 64 -16.5t70 -32t67.5 -52.5t47.5 -80t20 -112q0 -139 -89 -224t-244 -97v-77h-100v79q-150 16 -237 103q-40 40 -52.5 93.5 t-15.5 139.5h139q5 -77 48.5 -126t117.5 -65v335l-27 8q-46 14 -79 26.5t-72 36t-63 52t-40 72.5t-16 98q0 70 25 126t67.5 92t94.5 57t110 27v77h100zM600 754v274q-29 -4 -50 -11t-42 -21.5t-31.5 -41.5t-10.5 -65q0 -29 7 -50.5t16.5 -34t28.5 -22.5t31.5 -14t37.5 -10 q9 -3 13 -4zM700 547v-310q22 2 42.5 6.5t45 15.5t41.5 27t29 42t12 59.5t-12.5 59.5t-38 44.5t-53 31t-66.5 24.5z\" />\n<glyph unicode=\"&#xe149;\" d=\"M561 1197q84 0 160.5 -40t123.5 -109.5t47 -147.5h-153q0 40 -19.5 71.5t-49.5 48.5t-59.5 26t-55.5 9q-37 0 -79 -14.5t-62 -35.5q-41 -44 -41 -101q0 -26 13.5 -63t26.5 -61t37 -66q6 -9 9 -14h241v-100h-197q8 -50 -2.5 -115t-31.5 -95q-45 -62 -99 -112 q34 10 83 17.5t71 7.5q32 1 102 -16t104 -17q83 0 136 30l50 -147q-31 -19 -58 -30.5t-55 -15.5t-42 -4.5t-46 -0.5q-23 0 -76 17t-111 32.5t-96 11.5q-39 -3 -82 -16t-67 -25l-23 -11l-55 145q4 3 16 11t15.5 10.5t13 9t15.5 12t14.5 14t17.5 18.5q48 55 54 126.5 t-30 142.5h-221v100h166q-23 47 -44 104q-7 20 -12 41.5t-6 55.5t6 66.5t29.5 70.5t58.5 71q97 88 263 88z\" />\n<glyph unicode=\"&#xe150;\" d=\"M400 300h150q21 0 25 -11t-10 -25l-230 -250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM935 1184l230 -249q14 -14 10 -24.5t-25 -10.5h-150v-900h-200v900h-150q-21 0 -25 10.5t10 24.5l230 249q14 15 35 15t35 -15z\" />\n<glyph unicode=\"&#xe151;\" d=\"M1000 700h-100v100h-100v-100h-100v500h300v-500zM400 300h150q21 0 25 -11t-10 -25l-230 -250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM801 1100v-200h100v200h-100zM1000 350l-200 -250h200v-100h-300v150l200 250h-200v100h300v-150z \" />\n<glyph unicode=\"&#xe152;\" d=\"M400 300h150q21 0 25 -11t-10 -25l-230 -250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM1000 1050l-200 -250h200v-100h-300v150l200 250h-200v100h300v-150zM1000 0h-100v100h-100v-100h-100v500h300v-500zM801 400v-200h100v200h-100z \" />\n<glyph unicode=\"&#xe153;\" d=\"M400 300h150q21 0 25 -11t-10 -25l-230 -250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM1000 700h-100v400h-100v100h200v-500zM1100 0h-100v100h-200v400h300v-500zM901 400v-200h100v200h-100z\" />\n<glyph unicode=\"&#xe154;\" d=\"M400 300h150q21 0 25 -11t-10 -25l-230 -250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM1100 700h-100v100h-200v400h300v-500zM901 1100v-200h100v200h-100zM1000 0h-100v400h-100v100h200v-500z\" />\n<glyph unicode=\"&#xe155;\" d=\"M400 300h150q21 0 25 -11t-10 -25l-230 -250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM900 1000h-200v200h200v-200zM1000 700h-300v200h300v-200zM1100 400h-400v200h400v-200zM1200 100h-500v200h500v-200z\" />\n<glyph unicode=\"&#xe156;\" d=\"M400 300h150q21 0 25 -11t-10 -25l-230 -250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM1200 1000h-500v200h500v-200zM1100 700h-400v200h400v-200zM1000 400h-300v200h300v-200zM900 100h-200v200h200v-200z\" />\n<glyph unicode=\"&#xe157;\" d=\"M350 1100h400q162 0 256 -93.5t94 -256.5v-400q0 -165 -93.5 -257.5t-256.5 -92.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400q0 165 92.5 257.5t257.5 92.5zM800 900h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5 v500q0 41 -29.5 70.5t-70.5 29.5z\" />\n<glyph unicode=\"&#xe158;\" d=\"M350 1100h400q165 0 257.5 -92.5t92.5 -257.5v-400q0 -165 -92.5 -257.5t-257.5 -92.5h-400q-163 0 -256.5 92.5t-93.5 257.5v400q0 163 94 256.5t256 93.5zM800 900h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5 v500q0 41 -29.5 70.5t-70.5 29.5zM440 770l253 -190q17 -12 17 -30t-17 -30l-253 -190q-16 -12 -28 -6.5t-12 26.5v400q0 21 12 26.5t28 -6.5z\" />\n<glyph unicode=\"&#xe159;\" d=\"M350 1100h400q163 0 256.5 -94t93.5 -256v-400q0 -165 -92.5 -257.5t-257.5 -92.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400q0 163 92.5 256.5t257.5 93.5zM800 900h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5 v500q0 41 -29.5 70.5t-70.5 29.5zM350 700h400q21 0 26.5 -12t-6.5 -28l-190 -253q-12 -17 -30 -17t-30 17l-190 253q-12 16 -6.5 28t26.5 12z\" />\n<glyph unicode=\"&#xe160;\" d=\"M350 1100h400q165 0 257.5 -92.5t92.5 -257.5v-400q0 -163 -92.5 -256.5t-257.5 -93.5h-400q-163 0 -256.5 94t-93.5 256v400q0 165 92.5 257.5t257.5 92.5zM800 900h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5 v500q0 41 -29.5 70.5t-70.5 29.5zM580 693l190 -253q12 -16 6.5 -28t-26.5 -12h-400q-21 0 -26.5 12t6.5 28l190 253q12 17 30 17t30 -17z\" />\n<glyph unicode=\"&#xe161;\" d=\"M550 1100h400q165 0 257.5 -92.5t92.5 -257.5v-400q0 -165 -92.5 -257.5t-257.5 -92.5h-400q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h450q41 0 70.5 29.5t29.5 70.5v500q0 41 -29.5 70.5t-70.5 29.5h-450q-21 0 -35.5 14.5t-14.5 35.5v100 q0 21 14.5 35.5t35.5 14.5zM338 867l324 -284q16 -14 16 -33t-16 -33l-324 -284q-16 -14 -27 -9t-11 26v150h-250q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5h250v150q0 21 11 26t27 -9z\" />\n<glyph unicode=\"&#xe162;\" d=\"M793 1182l9 -9q8 -10 5 -27q-3 -11 -79 -225.5t-78 -221.5l300 1q24 0 32.5 -17.5t-5.5 -35.5q-1 0 -133.5 -155t-267 -312.5t-138.5 -162.5q-12 -15 -26 -15h-9l-9 8q-9 11 -4 32q2 9 42 123.5t79 224.5l39 110h-302q-23 0 -31 19q-10 21 6 41q75 86 209.5 237.5 t228 257t98.5 111.5q9 16 25 16h9z\" />\n<glyph unicode=\"&#xe163;\" d=\"M350 1100h400q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-450q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h450q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400 q0 165 92.5 257.5t257.5 92.5zM938 867l324 -284q16 -14 16 -33t-16 -33l-324 -284q-16 -14 -27 -9t-11 26v150h-250q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5h250v150q0 21 11 26t27 -9z\" />\n<glyph unicode=\"&#xe164;\" d=\"M750 1200h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -10.5 -25t-24.5 10l-109 109l-312 -312q-15 -15 -35.5 -15t-35.5 15l-141 141q-15 15 -15 35.5t15 35.5l312 312l-109 109q-14 14 -10 24.5t25 10.5zM456 900h-156q-41 0 -70.5 -29.5t-29.5 -70.5v-500 q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v148l200 200v-298q0 -165 -93.5 -257.5t-256.5 -92.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400q0 165 92.5 257.5t257.5 92.5h300z\" />\n<glyph unicode=\"&#xe165;\" d=\"M600 1186q119 0 227.5 -46.5t187 -125t125 -187t46.5 -227.5t-46.5 -227.5t-125 -187t-187 -125t-227.5 -46.5t-227.5 46.5t-187 125t-125 187t-46.5 227.5t46.5 227.5t125 187t187 125t227.5 46.5zM600 1022q-115 0 -212 -56.5t-153.5 -153.5t-56.5 -212t56.5 -212 t153.5 -153.5t212 -56.5t212 56.5t153.5 153.5t56.5 212t-56.5 212t-153.5 153.5t-212 56.5zM600 794q80 0 137 -57t57 -137t-57 -137t-137 -57t-137 57t-57 137t57 137t137 57z\" />\n<glyph unicode=\"&#xe166;\" d=\"M450 1200h200q21 0 35.5 -14.5t14.5 -35.5v-350h245q20 0 25 -11t-9 -26l-383 -426q-14 -15 -33.5 -15t-32.5 15l-379 426q-13 15 -8.5 26t25.5 11h250v350q0 21 14.5 35.5t35.5 14.5zM50 300h1000q21 0 35.5 -14.5t14.5 -35.5v-250h-1100v250q0 21 14.5 35.5t35.5 14.5z M900 200v-50h100v50h-100z\" />\n<glyph unicode=\"&#xe167;\" d=\"M583 1182l378 -435q14 -15 9 -31t-26 -16h-244v-250q0 -20 -17 -35t-39 -15h-200q-20 0 -32 14.5t-12 35.5v250h-250q-20 0 -25.5 16.5t8.5 31.5l383 431q14 16 33.5 17t33.5 -14zM50 300h1000q21 0 35.5 -14.5t14.5 -35.5v-250h-1100v250q0 21 14.5 35.5t35.5 14.5z M900 200v-50h100v50h-100z\" />\n<glyph unicode=\"&#xe168;\" d=\"M396 723l369 369q7 7 17.5 7t17.5 -7l139 -139q7 -8 7 -18.5t-7 -17.5l-525 -525q-7 -8 -17.5 -8t-17.5 8l-292 291q-7 8 -7 18t7 18l139 139q8 7 18.5 7t17.5 -7zM50 300h1000q21 0 35.5 -14.5t14.5 -35.5v-250h-1100v250q0 21 14.5 35.5t35.5 14.5zM900 200v-50h100v50 h-100z\" />\n<glyph unicode=\"&#xe169;\" d=\"M135 1023l142 142q14 14 35 14t35 -14l77 -77l-212 -212l-77 76q-14 15 -14 36t14 35zM655 855l210 210q14 14 24.5 10t10.5 -25l-2 -599q-1 -20 -15.5 -35t-35.5 -15l-597 -1q-21 0 -25 10.5t10 24.5l208 208l-154 155l212 212zM50 300h1000q21 0 35.5 -14.5t14.5 -35.5 v-250h-1100v250q0 21 14.5 35.5t35.5 14.5zM900 200v-50h100v50h-100z\" />\n<glyph unicode=\"&#xe170;\" d=\"M350 1200l599 -2q20 -1 35 -15.5t15 -35.5l1 -597q0 -21 -10.5 -25t-24.5 10l-208 208l-155 -154l-212 212l155 154l-210 210q-14 14 -10 24.5t25 10.5zM524 512l-76 -77q-15 -14 -36 -14t-35 14l-142 142q-14 14 -14 35t14 35l77 77zM50 300h1000q21 0 35.5 -14.5 t14.5 -35.5v-250h-1100v250q0 21 14.5 35.5t35.5 14.5zM900 200v-50h100v50h-100z\" />\n<glyph unicode=\"&#xe171;\" d=\"M1200 103l-483 276l-314 -399v423h-399l1196 796v-1096zM483 424v-230l683 953z\" />\n<glyph unicode=\"&#xe172;\" d=\"M1100 1000v-850q0 -21 -14.5 -35.5t-35.5 -14.5h-150v400h-700v-400h-150q-21 0 -35.5 14.5t-14.5 35.5v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100zM700 1000h-100v200h100v-200z\" />\n<glyph unicode=\"&#xe173;\" d=\"M1100 1000l-2 -149l-299 -299l-95 95q-9 9 -21.5 9t-21.5 -9l-149 -147h-312v-400h-150q-21 0 -35.5 14.5t-14.5 35.5v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100zM700 1000h-100v200h100v-200zM1132 638l106 -106q7 -7 7 -17.5t-7 -17.5l-420 -421q-8 -7 -18 -7 t-18 7l-202 203q-8 7 -8 17.5t8 17.5l106 106q7 8 17.5 8t17.5 -8l79 -79l297 297q7 7 17.5 7t17.5 -7z\" />\n<glyph unicode=\"&#xe174;\" d=\"M1100 1000v-269l-103 -103l-134 134q-15 15 -33.5 16.5t-34.5 -12.5l-266 -266h-329v-400h-150q-21 0 -35.5 14.5t-14.5 35.5v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100zM700 1000h-100v200h100v-200zM1202 572l70 -70q15 -15 15 -35.5t-15 -35.5l-131 -131 l131 -131q15 -15 15 -35.5t-15 -35.5l-70 -70q-15 -15 -35.5 -15t-35.5 15l-131 131l-131 -131q-15 -15 -35.5 -15t-35.5 15l-70 70q-15 15 -15 35.5t15 35.5l131 131l-131 131q-15 15 -15 35.5t15 35.5l70 70q15 15 35.5 15t35.5 -15l131 -131l131 131q15 15 35.5 15 t35.5 -15z\" />\n<glyph unicode=\"&#xe175;\" d=\"M1100 1000v-300h-350q-21 0 -35.5 -14.5t-14.5 -35.5v-150h-500v-400h-150q-21 0 -35.5 14.5t-14.5 35.5v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100zM700 1000h-100v200h100v-200zM850 600h100q21 0 35.5 -14.5t14.5 -35.5v-250h150q21 0 25 -10.5t-10 -24.5 l-230 -230q-14 -14 -35 -14t-35 14l-230 230q-14 14 -10 24.5t25 10.5h150v250q0 21 14.5 35.5t35.5 14.5z\" />\n<glyph unicode=\"&#xe176;\" d=\"M1100 1000v-400l-165 165q-14 15 -35 15t-35 -15l-263 -265h-402v-400h-150q-21 0 -35.5 14.5t-14.5 35.5v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100zM700 1000h-100v200h100v-200zM935 565l230 -229q14 -15 10 -25.5t-25 -10.5h-150v-250q0 -20 -14.5 -35 t-35.5 -15h-100q-21 0 -35.5 15t-14.5 35v250h-150q-21 0 -25 10.5t10 25.5l230 229q14 15 35 15t35 -15z\" />\n<glyph unicode=\"&#xe177;\" d=\"M50 1100h1100q21 0 35.5 -14.5t14.5 -35.5v-150h-1200v150q0 21 14.5 35.5t35.5 14.5zM1200 800v-550q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v550h1200zM100 500v-200h400v200h-400z\" />\n<glyph unicode=\"&#xe178;\" d=\"M935 1165l248 -230q14 -14 14 -35t-14 -35l-248 -230q-14 -14 -24.5 -10t-10.5 25v150h-400v200h400v150q0 21 10.5 25t24.5 -10zM200 800h-50q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h50v-200zM400 800h-100v200h100v-200zM18 435l247 230 q14 14 24.5 10t10.5 -25v-150h400v-200h-400v-150q0 -21 -10.5 -25t-24.5 10l-247 230q-15 14 -15 35t15 35zM900 300h-100v200h100v-200zM1000 500h51q20 0 34.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-34.5 -14.5h-51v200z\" />\n<glyph unicode=\"&#xe179;\" d=\"M862 1073l276 116q25 18 43.5 8t18.5 -41v-1106q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v397q-4 1 -11 5t-24 17.5t-30 29t-24 42t-11 56.5v359q0 31 18.5 65t43.5 52zM550 1200q22 0 34.5 -12.5t14.5 -24.5l1 -13v-450q0 -28 -10.5 -59.5 t-25 -56t-29 -45t-25.5 -31.5l-10 -11v-447q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v447q-4 4 -11 11.5t-24 30.5t-30 46t-24 55t-11 60v450q0 2 0.5 5.5t4 12t8.5 15t14.5 12t22.5 5.5q20 0 32.5 -12.5t14.5 -24.5l3 -13v-350h100v350v5.5t2.5 12 t7 15t15 12t25.5 5.5q23 0 35.5 -12.5t13.5 -24.5l1 -13v-350h100v350q0 2 0.5 5.5t3 12t7 15t15 12t24.5 5.5z\" />\n<glyph unicode=\"&#xe180;\" d=\"M1200 1100v-56q-4 0 -11 -0.5t-24 -3t-30 -7.5t-24 -15t-11 -24v-888q0 -22 25 -34.5t50 -13.5l25 -2v-56h-400v56q75 0 87.5 6.5t12.5 43.5v394h-500v-394q0 -37 12.5 -43.5t87.5 -6.5v-56h-400v56q4 0 11 0.5t24 3t30 7.5t24 15t11 24v888q0 22 -25 34.5t-50 13.5 l-25 2v56h400v-56q-75 0 -87.5 -6.5t-12.5 -43.5v-394h500v394q0 37 -12.5 43.5t-87.5 6.5v56h400z\" />\n<glyph unicode=\"&#xe181;\" d=\"M675 1000h375q21 0 35.5 -14.5t14.5 -35.5v-150h-105l-295 -98v98l-200 200h-400l100 100h375zM100 900h300q41 0 70.5 -29.5t29.5 -70.5v-500q0 -41 -29.5 -70.5t-70.5 -29.5h-300q-41 0 -70.5 29.5t-29.5 70.5v500q0 41 29.5 70.5t70.5 29.5zM100 800v-200h300v200 h-300zM1100 535l-400 -133v163l400 133v-163zM100 500v-200h300v200h-300zM1100 398v-248q0 -21 -14.5 -35.5t-35.5 -14.5h-375l-100 -100h-375l-100 100h400l200 200h105z\" />\n<glyph unicode=\"&#xe182;\" d=\"M17 1007l162 162q17 17 40 14t37 -22l139 -194q14 -20 11 -44.5t-20 -41.5l-119 -118q102 -142 228 -268t267 -227l119 118q17 17 42.5 19t44.5 -12l192 -136q19 -14 22.5 -37.5t-13.5 -40.5l-163 -162q-3 -1 -9.5 -1t-29.5 2t-47.5 6t-62.5 14.5t-77.5 26.5t-90 42.5 t-101.5 60t-111 83t-119 108.5q-74 74 -133.5 150.5t-94.5 138.5t-60 119.5t-34.5 100t-15 74.5t-4.5 48z\" />\n<glyph unicode=\"&#xe183;\" d=\"M600 1100q92 0 175 -10.5t141.5 -27t108.5 -36.5t81.5 -40t53.5 -37t31 -27l9 -10v-200q0 -21 -14.5 -33t-34.5 -9l-202 34q-20 3 -34.5 20t-14.5 38v146q-141 24 -300 24t-300 -24v-146q0 -21 -14.5 -38t-34.5 -20l-202 -34q-20 -3 -34.5 9t-14.5 33v200q3 4 9.5 10.5 t31 26t54 37.5t80.5 39.5t109 37.5t141 26.5t175 10.5zM600 795q56 0 97 -9.5t60 -23.5t30 -28t12 -24l1 -10v-50l365 -303q14 -15 24.5 -40t10.5 -45v-212q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v212q0 20 10.5 45t24.5 40l365 303v50 q0 4 1 10.5t12 23t30 29t60 22.5t97 10z\" />\n<glyph unicode=\"&#xe184;\" d=\"M1100 700l-200 -200h-600l-200 200v500h200v-200h200v200h200v-200h200v200h200v-500zM250 400h700q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-12l137 -100h-950l137 100h-12q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM50 100h1100q21 0 35.5 -14.5 t14.5 -35.5v-50h-1200v50q0 21 14.5 35.5t35.5 14.5z\" />\n<glyph unicode=\"&#xe185;\" d=\"M700 1100h-100q-41 0 -70.5 -29.5t-29.5 -70.5v-1000h300v1000q0 41 -29.5 70.5t-70.5 29.5zM1100 800h-100q-41 0 -70.5 -29.5t-29.5 -70.5v-700h300v700q0 41 -29.5 70.5t-70.5 29.5zM400 0h-300v400q0 41 29.5 70.5t70.5 29.5h100q41 0 70.5 -29.5t29.5 -70.5v-400z \" />\n<glyph unicode=\"&#xe186;\" d=\"M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM500 700h-200v-100h200v-300h-300v100h200v100h-200v300h300v-100zM900 700v-300l-100 -100h-200v500h200z M700 700v-300h100v300h-100z\" />\n<glyph unicode=\"&#xe187;\" d=\"M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM500 300h-100v200h-100v-200h-100v500h100v-200h100v200h100v-500zM900 700v-300l-100 -100h-200v500h200z M700 700v-300h100v300h-100z\" />\n<glyph unicode=\"&#xe188;\" d=\"M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM500 700h-200v-300h200v-100h-300v500h300v-100zM900 700h-200v-300h200v-100h-300v500h300v-100z\" />\n<glyph unicode=\"&#xe189;\" d=\"M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM500 400l-300 150l300 150v-300zM900 550l-300 -150v300z\" />\n<glyph unicode=\"&#xe190;\" d=\"M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM900 300h-700v500h700v-500zM800 700h-130q-38 0 -66.5 -43t-28.5 -108t27 -107t68 -42h130v300zM300 700v-300 h130q41 0 68 42t27 107t-28.5 108t-66.5 43h-130z\" />\n<glyph unicode=\"&#xe191;\" d=\"M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM500 700h-200v-100h200v-300h-300v100h200v100h-200v300h300v-100zM900 300h-100v400h-100v100h200v-500z M700 300h-100v100h100v-100z\" />\n<glyph unicode=\"&#xe192;\" d=\"M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM300 700h200v-400h-300v500h100v-100zM900 300h-100v400h-100v100h200v-500zM300 600v-200h100v200h-100z M700 300h-100v100h100v-100z\" />\n<glyph unicode=\"&#xe193;\" d=\"M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM500 500l-199 -200h-100v50l199 200v150h-200v100h300v-300zM900 300h-100v400h-100v100h200v-500zM701 300h-100 v100h100v-100z\" />\n<glyph unicode=\"&#xe194;\" d=\"M600 1191q120 0 229.5 -47t188.5 -126t126 -188.5t47 -229.5t-47 -229.5t-126 -188.5t-188.5 -126t-229.5 -47t-229.5 47t-188.5 126t-126 188.5t-47 229.5t47 229.5t126 188.5t188.5 126t229.5 47zM600 1021q-114 0 -211 -56.5t-153.5 -153.5t-56.5 -211t56.5 -211 t153.5 -153.5t211 -56.5t211 56.5t153.5 153.5t56.5 211t-56.5 211t-153.5 153.5t-211 56.5zM800 700h-300v-200h300v-100h-300l-100 100v200l100 100h300v-100z\" />\n<glyph unicode=\"&#xe195;\" d=\"M600 1191q120 0 229.5 -47t188.5 -126t126 -188.5t47 -229.5t-47 -229.5t-126 -188.5t-188.5 -126t-229.5 -47t-229.5 47t-188.5 126t-126 188.5t-47 229.5t47 229.5t126 188.5t188.5 126t229.5 47zM600 1021q-114 0 -211 -56.5t-153.5 -153.5t-56.5 -211t56.5 -211 t153.5 -153.5t211 -56.5t211 56.5t153.5 153.5t56.5 211t-56.5 211t-153.5 153.5t-211 56.5zM800 700v-100l-50 -50l100 -100v-50h-100l-100 100h-150v-100h-100v400h300zM500 700v-100h200v100h-200z\" />\n<glyph unicode=\"&#xe197;\" d=\"M503 1089q110 0 200.5 -59.5t134.5 -156.5q44 14 90 14q120 0 205 -86.5t85 -207t-85 -207t-205 -86.5h-128v250q0 21 -14.5 35.5t-35.5 14.5h-300q-21 0 -35.5 -14.5t-14.5 -35.5v-250h-222q-80 0 -136 57.5t-56 136.5q0 69 43 122.5t108 67.5q-2 19 -2 37q0 100 49 185 t134 134t185 49zM525 500h150q10 0 17.5 -7.5t7.5 -17.5v-275h137q21 0 26 -11.5t-8 -27.5l-223 -244q-13 -16 -32 -16t-32 16l-223 244q-13 16 -8 27.5t26 11.5h137v275q0 10 7.5 17.5t17.5 7.5z\" />\n<glyph unicode=\"&#xe198;\" d=\"M502 1089q110 0 201 -59.5t135 -156.5q43 15 89 15q121 0 206 -86.5t86 -206.5q0 -99 -60 -181t-150 -110l-378 360q-13 16 -31.5 16t-31.5 -16l-381 -365h-9q-79 0 -135.5 57.5t-56.5 136.5q0 69 43 122.5t108 67.5q-2 19 -2 38q0 100 49 184.5t133.5 134t184.5 49.5z M632 467l223 -228q13 -16 8 -27.5t-26 -11.5h-137v-275q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v275h-137q-21 0 -26 11.5t8 27.5q199 204 223 228q19 19 31.5 19t32.5 -19z\" />\n<glyph unicode=\"&#xe199;\" d=\"M700 100v100h400l-270 300h170l-270 300h170l-300 333l-300 -333h170l-270 -300h170l-270 -300h400v-100h-50q-21 0 -35.5 -14.5t-14.5 -35.5v-50h400v50q0 21 -14.5 35.5t-35.5 14.5h-50z\" />\n<glyph unicode=\"&#xe200;\" d=\"M600 1179q94 0 167.5 -56.5t99.5 -145.5q89 -6 150.5 -71.5t61.5 -155.5q0 -61 -29.5 -112.5t-79.5 -82.5q9 -29 9 -55q0 -74 -52.5 -126.5t-126.5 -52.5q-55 0 -100 30v-251q21 0 35.5 -14.5t14.5 -35.5v-50h-300v50q0 21 14.5 35.5t35.5 14.5v251q-45 -30 -100 -30 q-74 0 -126.5 52.5t-52.5 126.5q0 18 4 38q-47 21 -75.5 65t-28.5 97q0 74 52.5 126.5t126.5 52.5q5 0 23 -2q0 2 -1 10t-1 13q0 116 81.5 197.5t197.5 81.5z\" />\n<glyph unicode=\"&#xe201;\" d=\"M1010 1010q111 -111 150.5 -260.5t0 -299t-150.5 -260.5q-83 -83 -191.5 -126.5t-218.5 -43.5t-218.5 43.5t-191.5 126.5q-111 111 -150.5 260.5t0 299t150.5 260.5q83 83 191.5 126.5t218.5 43.5t218.5 -43.5t191.5 -126.5zM476 1065q-4 0 -8 -1q-121 -34 -209.5 -122.5 t-122.5 -209.5q-4 -12 2.5 -23t18.5 -14l36 -9q3 -1 7 -1q23 0 29 22q27 96 98 166q70 71 166 98q11 3 17.5 13.5t3.5 22.5l-9 35q-3 13 -14 19q-7 4 -15 4zM512 920q-4 0 -9 -2q-80 -24 -138.5 -82.5t-82.5 -138.5q-4 -13 2 -24t19 -14l34 -9q4 -1 8 -1q22 0 28 21 q18 58 58.5 98.5t97.5 58.5q12 3 18 13.5t3 21.5l-9 35q-3 12 -14 19q-7 4 -15 4zM719.5 719.5q-49.5 49.5 -119.5 49.5t-119.5 -49.5t-49.5 -119.5t49.5 -119.5t119.5 -49.5t119.5 49.5t49.5 119.5t-49.5 119.5zM855 551q-22 0 -28 -21q-18 -58 -58.5 -98.5t-98.5 -57.5 q-11 -4 -17 -14.5t-3 -21.5l9 -35q3 -12 14 -19q7 -4 15 -4q4 0 9 2q80 24 138.5 82.5t82.5 138.5q4 13 -2.5 24t-18.5 14l-34 9q-4 1 -8 1zM1000 515q-23 0 -29 -22q-27 -96 -98 -166q-70 -71 -166 -98q-11 -3 -17.5 -13.5t-3.5 -22.5l9 -35q3 -13 14 -19q7 -4 15 -4 q4 0 8 1q121 34 209.5 122.5t122.5 209.5q4 12 -2.5 23t-18.5 14l-36 9q-3 1 -7 1z\" />\n<glyph unicode=\"&#xe202;\" d=\"M700 800h300v-380h-180v200h-340v-200h-380v755q0 10 7.5 17.5t17.5 7.5h575v-400zM1000 900h-200v200zM700 300h162l-212 -212l-212 212h162v200h100v-200zM520 0h-395q-10 0 -17.5 7.5t-7.5 17.5v395zM1000 220v-195q0 -10 -7.5 -17.5t-17.5 -7.5h-195z\" />\n<glyph unicode=\"&#xe203;\" d=\"M700 800h300v-520l-350 350l-550 -550v1095q0 10 7.5 17.5t17.5 7.5h575v-400zM1000 900h-200v200zM862 200h-162v-200h-100v200h-162l212 212zM480 0h-355q-10 0 -17.5 7.5t-7.5 17.5v55h380v-80zM1000 80v-55q0 -10 -7.5 -17.5t-17.5 -7.5h-155v80h180z\" />\n<glyph unicode=\"&#xe204;\" d=\"M1162 800h-162v-200h100l100 -100h-300v300h-162l212 212zM200 800h200q27 0 40 -2t29.5 -10.5t23.5 -30t7 -57.5h300v-100h-600l-200 -350v450h100q0 36 7 57.5t23.5 30t29.5 10.5t40 2zM800 400h240l-240 -400h-800l300 500h500v-100z\" />\n<glyph unicode=\"&#xe205;\" d=\"M650 1100h100q21 0 35.5 -14.5t14.5 -35.5v-50h50q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-300q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h50v50q0 21 14.5 35.5t35.5 14.5zM1000 850v150q41 0 70.5 -29.5t29.5 -70.5v-800 q0 -41 -29.5 -70.5t-70.5 -29.5h-600q-1 0 -20 4l246 246l-326 326v324q0 41 29.5 70.5t70.5 29.5v-150q0 -62 44 -106t106 -44h300q62 0 106 44t44 106zM412 250l-212 -212v162h-200v100h200v162z\" />\n<glyph unicode=\"&#xe206;\" d=\"M450 1100h100q21 0 35.5 -14.5t14.5 -35.5v-50h50q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-300q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h50v50q0 21 14.5 35.5t35.5 14.5zM800 850v150q41 0 70.5 -29.5t29.5 -70.5v-500 h-200v-300h200q0 -36 -7 -57.5t-23.5 -30t-29.5 -10.5t-40 -2h-600q-41 0 -70.5 29.5t-29.5 70.5v800q0 41 29.5 70.5t70.5 29.5v-150q0 -62 44 -106t106 -44h300q62 0 106 44t44 106zM1212 250l-212 -212v162h-200v100h200v162z\" />\n<glyph unicode=\"&#xe209;\" d=\"M658 1197l637 -1104q23 -38 7 -65.5t-60 -27.5h-1276q-44 0 -60 27.5t7 65.5l637 1104q22 39 54 39t54 -39zM704 800h-208q-20 0 -32 -14.5t-8 -34.5l58 -302q4 -20 21.5 -34.5t37.5 -14.5h54q20 0 37.5 14.5t21.5 34.5l58 302q4 20 -8 34.5t-32 14.5zM500 300v-100h200 v100h-200z\" />\n<glyph unicode=\"&#xe210;\" d=\"M425 1100h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5zM425 800h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5 t17.5 7.5zM825 800h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5zM25 500h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v150 q0 10 7.5 17.5t17.5 7.5zM425 500h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5zM825 500h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5 v150q0 10 7.5 17.5t17.5 7.5zM25 200h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5zM425 200h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5 t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5zM825 200h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5z\" />\n<glyph unicode=\"&#xe211;\" d=\"M700 1200h100v-200h-100v-100h350q62 0 86.5 -39.5t-3.5 -94.5l-66 -132q-41 -83 -81 -134h-772q-40 51 -81 134l-66 132q-28 55 -3.5 94.5t86.5 39.5h350v100h-100v200h100v100h200v-100zM250 400h700q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-12l137 -100 h-950l138 100h-13q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM50 100h1100q21 0 35.5 -14.5t14.5 -35.5v-50h-1200v50q0 21 14.5 35.5t35.5 14.5z\" />\n<glyph unicode=\"&#xe212;\" d=\"M600 1300q40 0 68.5 -29.5t28.5 -70.5h-194q0 41 28.5 70.5t68.5 29.5zM443 1100h314q18 -37 18 -75q0 -8 -3 -25h328q41 0 44.5 -16.5t-30.5 -38.5l-175 -145h-678l-178 145q-34 22 -29 38.5t46 16.5h328q-3 17 -3 25q0 38 18 75zM250 700h700q21 0 35.5 -14.5 t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-150v-200l275 -200h-950l275 200v200h-150q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM50 100h1100q21 0 35.5 -14.5t14.5 -35.5v-50h-1200v50q0 21 14.5 35.5t35.5 14.5z\" />\n<glyph unicode=\"&#xe213;\" d=\"M600 1181q75 0 128 -53t53 -128t-53 -128t-128 -53t-128 53t-53 128t53 128t128 53zM602 798h46q34 0 55.5 -28.5t21.5 -86.5q0 -76 39 -183h-324q39 107 39 183q0 58 21.5 86.5t56.5 28.5h45zM250 400h700q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-13 l138 -100h-950l137 100h-12q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM50 100h1100q21 0 35.5 -14.5t14.5 -35.5v-50h-1200v50q0 21 14.5 35.5t35.5 14.5z\" />\n<glyph unicode=\"&#xe214;\" d=\"M600 1300q47 0 92.5 -53.5t71 -123t25.5 -123.5q0 -78 -55.5 -133.5t-133.5 -55.5t-133.5 55.5t-55.5 133.5q0 62 34 143l144 -143l111 111l-163 163q34 26 63 26zM602 798h46q34 0 55.5 -28.5t21.5 -86.5q0 -76 39 -183h-324q39 107 39 183q0 58 21.5 86.5t56.5 28.5h45 zM250 400h700q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-13l138 -100h-950l137 100h-12q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM50 100h1100q21 0 35.5 -14.5t14.5 -35.5v-50h-1200v50q0 21 14.5 35.5t35.5 14.5z\" />\n<glyph unicode=\"&#xe215;\" d=\"M600 1200l300 -161v-139h-300q0 -57 18.5 -108t50 -91.5t63 -72t70 -67.5t57.5 -61h-530q-60 83 -90.5 177.5t-30.5 178.5t33 164.5t87.5 139.5t126 96.5t145.5 41.5v-98zM250 400h700q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-13l138 -100h-950l137 100 h-12q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM50 100h1100q21 0 35.5 -14.5t14.5 -35.5v-50h-1200v50q0 21 14.5 35.5t35.5 14.5z\" />\n<glyph unicode=\"&#xe216;\" d=\"M600 1300q41 0 70.5 -29.5t29.5 -70.5v-78q46 -26 73 -72t27 -100v-50h-400v50q0 54 27 100t73 72v78q0 41 29.5 70.5t70.5 29.5zM400 800h400q54 0 100 -27t72 -73h-172v-100h200v-100h-200v-100h200v-100h-200v-100h200q0 -83 -58.5 -141.5t-141.5 -58.5h-400 q-83 0 -141.5 58.5t-58.5 141.5v400q0 83 58.5 141.5t141.5 58.5z\" />\n<glyph unicode=\"&#xe218;\" d=\"M150 1100h900q21 0 35.5 -14.5t14.5 -35.5v-500q0 -21 -14.5 -35.5t-35.5 -14.5h-900q-21 0 -35.5 14.5t-14.5 35.5v500q0 21 14.5 35.5t35.5 14.5zM125 400h950q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-283l224 -224q13 -13 13 -31.5t-13 -32 t-31.5 -13.5t-31.5 13l-88 88h-524l-87 -88q-13 -13 -32 -13t-32 13.5t-13 32t13 31.5l224 224h-289q-10 0 -17.5 7.5t-7.5 17.5v50q0 10 7.5 17.5t17.5 7.5zM541 300l-100 -100h324l-100 100h-124z\" />\n<glyph unicode=\"&#xe219;\" d=\"M200 1100h800q83 0 141.5 -58.5t58.5 -141.5v-200h-100q0 41 -29.5 70.5t-70.5 29.5h-250q-41 0 -70.5 -29.5t-29.5 -70.5h-100q0 41 -29.5 70.5t-70.5 29.5h-250q-41 0 -70.5 -29.5t-29.5 -70.5h-100v200q0 83 58.5 141.5t141.5 58.5zM100 600h1000q41 0 70.5 -29.5 t29.5 -70.5v-300h-1200v300q0 41 29.5 70.5t70.5 29.5zM300 100v-50q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v50h200zM1100 100v-50q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v50h200z\" />\n<glyph unicode=\"&#xe221;\" d=\"M480 1165l682 -683q31 -31 31 -75.5t-31 -75.5l-131 -131h-481l-517 518q-32 31 -32 75.5t32 75.5l295 296q31 31 75.5 31t76.5 -31zM108 794l342 -342l303 304l-341 341zM250 100h800q21 0 35.5 -14.5t14.5 -35.5v-50h-900v50q0 21 14.5 35.5t35.5 14.5z\" />\n<glyph unicode=\"&#xe223;\" d=\"M1057 647l-189 506q-8 19 -27.5 33t-40.5 14h-400q-21 0 -40.5 -14t-27.5 -33l-189 -506q-8 -19 1.5 -33t30.5 -14h625v-150q0 -21 14.5 -35.5t35.5 -14.5t35.5 14.5t14.5 35.5v150h125q21 0 30.5 14t1.5 33zM897 0h-595v50q0 21 14.5 35.5t35.5 14.5h50v50 q0 21 14.5 35.5t35.5 14.5h48v300h200v-300h47q21 0 35.5 -14.5t14.5 -35.5v-50h50q21 0 35.5 -14.5t14.5 -35.5v-50z\" />\n<glyph unicode=\"&#xe224;\" d=\"M900 800h300v-575q0 -10 -7.5 -17.5t-17.5 -7.5h-375v591l-300 300v84q0 10 7.5 17.5t17.5 7.5h375v-400zM1200 900h-200v200zM400 600h300v-575q0 -10 -7.5 -17.5t-17.5 -7.5h-650q-10 0 -17.5 7.5t-7.5 17.5v950q0 10 7.5 17.5t17.5 7.5h375v-400zM700 700h-200v200z \" />\n<glyph unicode=\"&#xe225;\" d=\"M484 1095h195q75 0 146 -32.5t124 -86t89.5 -122.5t48.5 -142q18 -14 35 -20q31 -10 64.5 6.5t43.5 48.5q10 34 -15 71q-19 27 -9 43q5 8 12.5 11t19 -1t23.5 -16q41 -44 39 -105q-3 -63 -46 -106.5t-104 -43.5h-62q-7 -55 -35 -117t-56 -100l-39 -234q-3 -20 -20 -34.5 t-38 -14.5h-100q-21 0 -33 14.5t-9 34.5l12 70q-49 -14 -91 -14h-195q-24 0 -65 8l-11 -64q-3 -20 -20 -34.5t-38 -14.5h-100q-21 0 -33 14.5t-9 34.5l26 157q-84 74 -128 175l-159 53q-19 7 -33 26t-14 40v50q0 21 14.5 35.5t35.5 14.5h124q11 87 56 166l-111 95 q-16 14 -12.5 23.5t24.5 9.5h203q116 101 250 101zM675 1000h-250q-10 0 -17.5 -7.5t-7.5 -17.5v-50q0 -10 7.5 -17.5t17.5 -7.5h250q10 0 17.5 7.5t7.5 17.5v50q0 10 -7.5 17.5t-17.5 7.5z\" />\n<glyph unicode=\"&#xe226;\" d=\"M641 900l423 247q19 8 42 2.5t37 -21.5l32 -38q14 -15 12.5 -36t-17.5 -34l-139 -120h-390zM50 1100h106q67 0 103 -17t66 -71l102 -212h823q21 0 35.5 -14.5t14.5 -35.5v-50q0 -21 -14 -40t-33 -26l-737 -132q-23 -4 -40 6t-26 25q-42 67 -100 67h-300q-62 0 -106 44 t-44 106v200q0 62 44 106t106 44zM173 928h-80q-19 0 -28 -14t-9 -35v-56q0 -51 42 -51h134q16 0 21.5 8t5.5 24q0 11 -16 45t-27 51q-18 28 -43 28zM550 727q-32 0 -54.5 -22.5t-22.5 -54.5t22.5 -54.5t54.5 -22.5t54.5 22.5t22.5 54.5t-22.5 54.5t-54.5 22.5zM130 389 l152 130q18 19 34 24t31 -3.5t24.5 -17.5t25.5 -28q28 -35 50.5 -51t48.5 -13l63 5l48 -179q13 -61 -3.5 -97.5t-67.5 -79.5l-80 -69q-47 -40 -109 -35.5t-103 51.5l-130 151q-40 47 -35.5 109.5t51.5 102.5zM380 377l-102 -88q-31 -27 2 -65l37 -43q13 -15 27.5 -19.5 t31.5 6.5l61 53q19 16 14 49q-2 20 -12 56t-17 45q-11 12 -19 14t-23 -8z\" />\n<glyph unicode=\"&#xe227;\" d=\"M625 1200h150q10 0 17.5 -7.5t7.5 -17.5v-109q79 -33 131 -87.5t53 -128.5q1 -46 -15 -84.5t-39 -61t-46 -38t-39 -21.5l-17 -6q6 0 15 -1.5t35 -9t50 -17.5t53 -30t50 -45t35.5 -64t14.5 -84q0 -59 -11.5 -105.5t-28.5 -76.5t-44 -51t-49.5 -31.5t-54.5 -16t-49.5 -6.5 t-43.5 -1v-75q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v75h-100v-75q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v75h-175q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5h75v600h-75q-10 0 -17.5 7.5t-7.5 17.5v150 q0 10 7.5 17.5t17.5 7.5h175v75q0 10 7.5 17.5t17.5 7.5h150q10 0 17.5 -7.5t7.5 -17.5v-75h100v75q0 10 7.5 17.5t17.5 7.5zM400 900v-200h263q28 0 48.5 10.5t30 25t15 29t5.5 25.5l1 10q0 4 -0.5 11t-6 24t-15 30t-30 24t-48.5 11h-263zM400 500v-200h363q28 0 48.5 10.5 t30 25t15 29t5.5 25.5l1 10q0 4 -0.5 11t-6 24t-15 30t-30 24t-48.5 11h-363z\" />\n<glyph unicode=\"&#xe230;\" d=\"M212 1198h780q86 0 147 -61t61 -147v-416q0 -51 -18 -142.5t-36 -157.5l-18 -66q-29 -87 -93.5 -146.5t-146.5 -59.5h-572q-82 0 -147 59t-93 147q-8 28 -20 73t-32 143.5t-20 149.5v416q0 86 61 147t147 61zM600 1045q-70 0 -132.5 -11.5t-105.5 -30.5t-78.5 -41.5 t-57 -45t-36 -41t-20.5 -30.5l-6 -12l156 -243h560l156 243q-2 5 -6 12.5t-20 29.5t-36.5 42t-57 44.5t-79 42t-105 29.5t-132.5 12zM762 703h-157l195 261z\" />\n<glyph unicode=\"&#xe231;\" d=\"M475 1300h150q103 0 189 -86t86 -189v-500q0 -41 -42 -83t-83 -42h-450q-41 0 -83 42t-42 83v500q0 103 86 189t189 86zM700 300v-225q0 -21 -27 -48t-48 -27h-150q-21 0 -48 27t-27 48v225h300z\" />\n<glyph unicode=\"&#xe232;\" d=\"M475 1300h96q0 -150 89.5 -239.5t239.5 -89.5v-446q0 -41 -42 -83t-83 -42h-450q-41 0 -83 42t-42 83v500q0 103 86 189t189 86zM700 300v-225q0 -21 -27 -48t-48 -27h-150q-21 0 -48 27t-27 48v225h300z\" />\n<glyph unicode=\"&#xe233;\" d=\"M1294 767l-638 -283l-378 170l-78 -60v-224l100 -150v-199l-150 148l-150 -149v200l100 150v250q0 4 -0.5 10.5t0 9.5t1 8t3 8t6.5 6l47 40l-147 65l642 283zM1000 380l-350 -166l-350 166v147l350 -165l350 165v-147z\" />\n<glyph unicode=\"&#xe234;\" d=\"M250 800q62 0 106 -44t44 -106t-44 -106t-106 -44t-106 44t-44 106t44 106t106 44zM650 800q62 0 106 -44t44 -106t-44 -106t-106 -44t-106 44t-44 106t44 106t106 44zM1050 800q62 0 106 -44t44 -106t-44 -106t-106 -44t-106 44t-44 106t44 106t106 44z\" />\n<glyph unicode=\"&#xe235;\" d=\"M550 1100q62 0 106 -44t44 -106t-44 -106t-106 -44t-106 44t-44 106t44 106t106 44zM550 700q62 0 106 -44t44 -106t-44 -106t-106 -44t-106 44t-44 106t44 106t106 44zM550 300q62 0 106 -44t44 -106t-44 -106t-106 -44t-106 44t-44 106t44 106t106 44z\" />\n<glyph unicode=\"&#xe236;\" d=\"M125 1100h950q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-950q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5zM125 700h950q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-950q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5 t17.5 7.5zM125 300h950q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-950q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5z\" />\n<glyph unicode=\"&#xe237;\" d=\"M350 1200h500q162 0 256 -93.5t94 -256.5v-500q0 -165 -93.5 -257.5t-256.5 -92.5h-500q-165 0 -257.5 92.5t-92.5 257.5v500q0 165 92.5 257.5t257.5 92.5zM900 1000h-600q-41 0 -70.5 -29.5t-29.5 -70.5v-600q0 -41 29.5 -70.5t70.5 -29.5h600q41 0 70.5 29.5 t29.5 70.5v600q0 41 -29.5 70.5t-70.5 29.5zM350 900h500q21 0 35.5 -14.5t14.5 -35.5v-300q0 -21 -14.5 -35.5t-35.5 -14.5h-500q-21 0 -35.5 14.5t-14.5 35.5v300q0 21 14.5 35.5t35.5 14.5zM400 800v-200h400v200h-400z\" />\n<glyph unicode=\"&#xe238;\" d=\"M150 1100h1000q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-50v-200h50q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-50v-200h50q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-50v-200h50q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5 t-35.5 -14.5h-1000q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5h50v200h-50q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5h50v200h-50q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5h50v200h-50q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5z\" />\n<glyph unicode=\"&#xe239;\" d=\"M650 1187q87 -67 118.5 -156t0 -178t-118.5 -155q-87 66 -118.5 155t0 178t118.5 156zM300 800q124 0 212 -88t88 -212q-124 0 -212 88t-88 212zM1000 800q0 -124 -88 -212t-212 -88q0 124 88 212t212 88zM300 500q124 0 212 -88t88 -212q-124 0 -212 88t-88 212z M1000 500q0 -124 -88 -212t-212 -88q0 124 88 212t212 88zM700 199v-144q0 -21 -14.5 -35.5t-35.5 -14.5t-35.5 14.5t-14.5 35.5v142q40 -4 43 -4q17 0 57 6z\" />\n<glyph unicode=\"&#xe240;\" d=\"M745 878l69 19q25 6 45 -12l298 -295q11 -11 15 -26.5t-2 -30.5q-5 -14 -18 -23.5t-28 -9.5h-8q1 0 1 -13q0 -29 -2 -56t-8.5 -62t-20 -63t-33 -53t-51 -39t-72.5 -14h-146q-184 0 -184 288q0 24 10 47q-20 4 -62 4t-63 -4q11 -24 11 -47q0 -288 -184 -288h-142 q-48 0 -84.5 21t-56 51t-32 71.5t-16 75t-3.5 68.5q0 13 2 13h-7q-15 0 -27.5 9.5t-18.5 23.5q-6 15 -2 30.5t15 25.5l298 296q20 18 46 11l76 -19q20 -5 30.5 -22.5t5.5 -37.5t-22.5 -31t-37.5 -5l-51 12l-182 -193h891l-182 193l-44 -12q-20 -5 -37.5 6t-22.5 31t6 37.5 t31 22.5z\" />\n<glyph unicode=\"&#xe241;\" d=\"M1200 900h-50q0 21 -4 37t-9.5 26.5t-18 17.5t-22 11t-28.5 5.5t-31 2t-37 0.5h-200v-850q0 -22 25 -34.5t50 -13.5l25 -2v-100h-400v100q4 0 11 0.5t24 3t30 7t24 15t11 24.5v850h-200q-25 0 -37 -0.5t-31 -2t-28.5 -5.5t-22 -11t-18 -17.5t-9.5 -26.5t-4 -37h-50v300 h1000v-300zM500 450h-25q0 15 -4 24.5t-9 14.5t-17 7.5t-20 3t-25 0.5h-100v-425q0 -11 12.5 -17.5t25.5 -7.5h12v-50h-200v50q50 0 50 25v425h-100q-17 0 -25 -0.5t-20 -3t-17 -7.5t-9 -14.5t-4 -24.5h-25v150h500v-150z\" />\n<glyph unicode=\"&#xe242;\" d=\"M1000 300v50q-25 0 -55 32q-14 14 -25 31t-16 27l-4 11l-289 747h-69l-300 -754q-18 -35 -39 -56q-9 -9 -24.5 -18.5t-26.5 -14.5l-11 -5v-50h273v50q-49 0 -78.5 21.5t-11.5 67.5l69 176h293l61 -166q13 -34 -3.5 -66.5t-55.5 -32.5v-50h312zM412 691l134 342l121 -342 h-255zM1100 150v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1000q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h1000q21 0 35.5 -14.5t14.5 -35.5z\" />\n<glyph unicode=\"&#xe243;\" d=\"M50 1200h1100q21 0 35.5 -14.5t14.5 -35.5v-1100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v1100q0 21 14.5 35.5t35.5 14.5zM611 1118h-70q-13 0 -18 -12l-299 -753q-17 -32 -35 -51q-18 -18 -56 -34q-12 -5 -12 -18v-50q0 -8 5.5 -14t14.5 -6 h273q8 0 14 6t6 14v50q0 8 -6 14t-14 6q-55 0 -71 23q-10 14 0 39l63 163h266l57 -153q11 -31 -6 -55q-12 -17 -36 -17q-8 0 -14 -6t-6 -14v-50q0 -8 6 -14t14 -6h313q8 0 14 6t6 14v50q0 7 -5.5 13t-13.5 7q-17 0 -42 25q-25 27 -40 63h-1l-288 748q-5 12 -19 12zM639 611 h-197l103 264z\" />\n<glyph unicode=\"&#xe244;\" d=\"M1200 1100h-1200v100h1200v-100zM50 1000h400q21 0 35.5 -14.5t14.5 -35.5v-900q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v900q0 21 14.5 35.5t35.5 14.5zM650 1000h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400 q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM700 900v-300h300v300h-300z\" />\n<glyph unicode=\"&#xe245;\" d=\"M50 1200h400q21 0 35.5 -14.5t14.5 -35.5v-900q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v900q0 21 14.5 35.5t35.5 14.5zM650 700h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v400 q0 21 14.5 35.5t35.5 14.5zM700 600v-300h300v300h-300zM1200 0h-1200v100h1200v-100z\" />\n<glyph unicode=\"&#xe246;\" d=\"M50 1000h400q21 0 35.5 -14.5t14.5 -35.5v-350h100v150q0 21 14.5 35.5t35.5 14.5h400q21 0 35.5 -14.5t14.5 -35.5v-150h100v-100h-100v-150q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v150h-100v-350q0 -21 -14.5 -35.5t-35.5 -14.5h-400 q-21 0 -35.5 14.5t-14.5 35.5v800q0 21 14.5 35.5t35.5 14.5zM700 700v-300h300v300h-300z\" />\n<glyph unicode=\"&#xe247;\" d=\"M100 0h-100v1200h100v-1200zM250 1100h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM300 1000v-300h300v300h-300zM250 500h900q21 0 35.5 -14.5t14.5 -35.5v-400 q0 -21 -14.5 -35.5t-35.5 -14.5h-900q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5z\" />\n<glyph unicode=\"&#xe248;\" d=\"M600 1100h150q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-150v-100h450q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-900q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5h350v100h-150q-21 0 -35.5 14.5 t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5h150v100h100v-100zM400 1000v-300h300v300h-300z\" />\n<glyph unicode=\"&#xe249;\" d=\"M1200 0h-100v1200h100v-1200zM550 1100h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM600 1000v-300h300v300h-300zM50 500h900q21 0 35.5 -14.5t14.5 -35.5v-400 q0 -21 -14.5 -35.5t-35.5 -14.5h-900q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5z\" />\n<glyph unicode=\"&#xe250;\" d=\"M865 565l-494 -494q-23 -23 -41 -23q-14 0 -22 13.5t-8 38.5v1000q0 25 8 38.5t22 13.5q18 0 41 -23l494 -494q14 -14 14 -35t-14 -35z\" />\n<glyph unicode=\"&#xe251;\" d=\"M335 635l494 494q29 29 50 20.5t21 -49.5v-1000q0 -41 -21 -49.5t-50 20.5l-494 494q-14 14 -14 35t14 35z\" />\n<glyph unicode=\"&#xe252;\" d=\"M100 900h1000q41 0 49.5 -21t-20.5 -50l-494 -494q-14 -14 -35 -14t-35 14l-494 494q-29 29 -20.5 50t49.5 21z\" />\n<glyph unicode=\"&#xe253;\" d=\"M635 865l494 -494q29 -29 20.5 -50t-49.5 -21h-1000q-41 0 -49.5 21t20.5 50l494 494q14 14 35 14t35 -14z\" />\n<glyph unicode=\"&#xe254;\" d=\"M700 741v-182l-692 -323v221l413 193l-413 193v221zM1200 0h-800v200h800v-200z\" />\n<glyph unicode=\"&#xe255;\" d=\"M1200 900h-200v-100h200v-100h-300v300h200v100h-200v100h300v-300zM0 700h50q0 21 4 37t9.5 26.5t18 17.5t22 11t28.5 5.5t31 2t37 0.5h100v-550q0 -22 -25 -34.5t-50 -13.5l-25 -2v-100h400v100q-4 0 -11 0.5t-24 3t-30 7t-24 15t-11 24.5v550h100q25 0 37 -0.5t31 -2 t28.5 -5.5t22 -11t18 -17.5t9.5 -26.5t4 -37h50v300h-800v-300z\" />\n<glyph unicode=\"&#xe256;\" d=\"M800 700h-50q0 21 -4 37t-9.5 26.5t-18 17.5t-22 11t-28.5 5.5t-31 2t-37 0.5h-100v-550q0 -22 25 -34.5t50 -14.5l25 -1v-100h-400v100q4 0 11 0.5t24 3t30 7t24 15t11 24.5v550h-100q-25 0 -37 -0.5t-31 -2t-28.5 -5.5t-22 -11t-18 -17.5t-9.5 -26.5t-4 -37h-50v300 h800v-300zM1100 200h-200v-100h200v-100h-300v300h200v100h-200v100h300v-300z\" />\n<glyph unicode=\"&#xe257;\" d=\"M701 1098h160q16 0 21 -11t-7 -23l-464 -464l464 -464q12 -12 7 -23t-21 -11h-160q-13 0 -23 9l-471 471q-7 8 -7 18t7 18l471 471q10 9 23 9z\" />\n<glyph unicode=\"&#xe258;\" d=\"M339 1098h160q13 0 23 -9l471 -471q7 -8 7 -18t-7 -18l-471 -471q-10 -9 -23 -9h-160q-16 0 -21 11t7 23l464 464l-464 464q-12 12 -7 23t21 11z\" />\n<glyph unicode=\"&#xe259;\" d=\"M1087 882q11 -5 11 -21v-160q0 -13 -9 -23l-471 -471q-8 -7 -18 -7t-18 7l-471 471q-9 10 -9 23v160q0 16 11 21t23 -7l464 -464l464 464q12 12 23 7z\" />\n<glyph unicode=\"&#xe260;\" d=\"M618 993l471 -471q9 -10 9 -23v-160q0 -16 -11 -21t-23 7l-464 464l-464 -464q-12 -12 -23 -7t-11 21v160q0 13 9 23l471 471q8 7 18 7t18 -7z\" />\n<glyph unicode=\"&#xf8ff;\" d=\"M1000 1200q0 -124 -88 -212t-212 -88q0 124 88 212t212 88zM450 1000h100q21 0 40 -14t26 -33l79 -194q5 1 16 3q34 6 54 9.5t60 7t65.5 1t61 -10t56.5 -23t42.5 -42t29 -64t5 -92t-19.5 -121.5q-1 -7 -3 -19.5t-11 -50t-20.5 -73t-32.5 -81.5t-46.5 -83t-64 -70 t-82.5 -50q-13 -5 -42 -5t-65.5 2.5t-47.5 2.5q-14 0 -49.5 -3.5t-63 -3.5t-43.5 7q-57 25 -104.5 78.5t-75 111.5t-46.5 112t-26 90l-7 35q-15 63 -18 115t4.5 88.5t26 64t39.5 43.5t52 25.5t58.5 13t62.5 2t59.5 -4.5t55.5 -8l-147 192q-12 18 -5.5 30t27.5 12z\" />\n<glyph unicode=\"&#x1f511;\" d=\"M250 1200h600q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-150v-500l-255 -178q-19 -9 -32 -1t-13 29v650h-150q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM400 1100v-100h300v100h-300z\" />\n<glyph unicode=\"&#x1f6aa;\" d=\"M250 1200h750q39 0 69.5 -40.5t30.5 -84.5v-933l-700 -117v950l600 125h-700v-1000h-100v1025q0 23 15.5 49t34.5 26zM500 525v-100l100 20v100z\" />\n</font>\n</defs></svg> PK\x07\x08|\xee\xc6\xc9\xc2\xa8\x01\x00\xc2\xa8\x01\x00PK\x03\x04\x14\x00\x08\x00\x00\x00W\x9a5G\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00&\x00\x00\x00fonts/glyphicons-halflings-regular.ttf\x00\x01\x00\x00\x00\x0f\x00\x80\x00\x03\x00pFFTMm*\x97\xdc\x00\x00\x00\xfc\x00\x00\x00\x1cGDEF\x01D\x00\x04\x00\x00\x01\x18\x00\x00\x00 OS/2g\xb9k\x89\x00\x00\x018\x00\x00\x00`cmap\xda\xad\xe3\x81\x00\x00\x01\x98\x00\x00\x06rcvt \x00(\x02\xf8\x00\x00\x08\x0c\x00\x00\x00\x04gasp\xff\xff\x00\x03\x00\x00\x08\x10\x00\x00\x00\x08glyf}]\xc2o\x00\x00\x08\x18\x00\x00\x94\xa4head\x05M/\xd8\x00\x00\x9c\xbc\x00\x00\x006hhea\nD\x04\x11\x00\x00\x9c\xf4\x00\x00\x00$hmtx\xd2\xc7 `\x00\x00\x9d\x18\x00\x00\x03tlocao\xfb\x95\xce\x00\x00\xa0\x8c\x00\x00\x020maxp\x01j\x00\xd8\x00\x00\xa2\xbc\x00\x00\x00 name\xb3,\xa0\x9b\x00\x00\xa2\xdc\x00\x00\x03\xa2post\xba\xa3\xe55\x00\x00\xa6\x80\x00\x00\n\xd1webf\xc3\x18TP\x00\x00\xb1T\x00\x00\x00\x06\x00\x00\x00\x01\x00\x00\x00\x00\xcc=\xa2\xcf\x00\x00\x00\x00\xd0v\x81u\x00\x00\x00\x00\xd0vs\x97\x00\x01\x00\x00\x00\x0e\x00\x00\x00\x18\x00\x00\x00\x00\x00\x02\x00\x01\x00\x01\x01\x16\x00\x01\x00\x04\x00\x00\x00\x02\x00\x00\x00\x03\x04\x8b\x01\x90\x00\x05\x00\x04\x03\x0c\x02\xd0\x00\x00\x00Z\x03\x0c\x02\xd0\x00\x00\x01\xa4\x002\x02\xb8\x00\x00\x00\x00\x05\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00UKWN\x00@\x00 \xff\xff\x03\xc0\xff\x10\x00\x00\x05\x14\x00{\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00 \x00\x01\x00\x00\x00\x05\x00\x00\x00\x03\x00\x00\x00,\x00\x00\x00\n\x00\x00\x01\xdc\x00\x01\x00\x00\x00\x00\x04h\x00\x03\x00\x01\x00\x00\x00,\x00\x03\x00\n\x00\x00\x01\xdc\x00\x04\x01\xb0\x00\x00\x00h\x00@\x00\x05\x00(\x00 \x00+\x00\xa0\x00\xa5 \n / _ \xac \xbd\"\x12#\x1b%\xfc&\x01&\xfa'	'\x0f\xe0\x03\xe0	\xe0\x19\xe0)\xe09\xe0I\xe0Y\xe0`\xe0i\xe0y\xe0\x89\xe0\x97\xe1	\xe1\x19\xe1)\xe19\xe1F\xe1I\xe1Y\xe1i\xe1y\xe1\x89\xe1\x95\xe1\x99\xe2\x06\xe2	\xe2\x16\xe2\x19\xe2!\xe2'\xe29\xe2I\xe2Y\xe2`\xf8\xff\xff\xff\x00\x00\x00 \x00*\x00\xa0\x00\xa5 \x00 / _ \xac \xbd\"\x12#\x1b%\xfc&\x01&\xfa'	'\x0f\xe0\x01\xe0\x05\xe0\x10\xe0 \xe00\xe0@\xe0P\xe0`\xe0b\xe0p\xe0\x80\xe0\x90\xe1\x01\xe1\x10\xe1 \xe10\xe1@\xe1H\xe1P\xe1`\xe1p\xe1\x80\xe1\x90\xe1\x97\xe2\x00\xe2	\xe2\x10\xe2\x18\xe2!\xe2#\xe20\xe2@\xe2P\xe2`\xf8\xff\xff\xff\xff\xe3\xff\xda\xfff\xffb\xe0\x08\xdf\xe4\xdf\xb5\xdfi\xdfY\xde\x05\xdc\xfd\xda\x1d\xda\x19\xd9!\xd9\x13\xd9\x0e \x1d \x1c \x16 \x10 \n \x04\x1f\xfe\x1f\xf8\x1f\xf7\x1f\xf1\x1f\xeb\x1f\xe5\x1f|\x1fv\x1fp\x1fj\x1fd\x1fc\x1f]\x1fW\x1fQ\x1fK\x1fE\x1fD\x1e\xde\x1e\xdc\x1e\xd6\x1e\xd5\x1e\xce\x1e\xcd\x1e\xc5\x1e\xbf\x1e\xb9\x1e\xb3\x08\x15\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x0c\x00\x00\x00\x00\x02\x8c\x00\x00\x00\x00\x00\x00\x005\x00\x00\x00 \x00\x00\x00 \x00\x00\x00\x03\x00\x00\x00*\x00\x00\x00+\x00\x00\x00\x04\x00\x00\x00\xa0\x00\x00\x00\xa0\x00\x00\x00\x06\x00\x00\x00\xa5\x00\x00\x00\xa5\x00\x00\x00\x07\x00\x00 \x00\x00\x00 \n\x00\x00\x00\x08\x00\x00 /\x00\x00 /\x00\x00\x00\x13\x00\x00 _\x00\x00 _\x00\x00\x00\x14\x00\x00 \xac\x00\x00 \xac\x00\x00\x00\x15\x00\x00 \xbd\x00\x00 \xbd\x00\x00\x00\x16\x00\x00\"\x12\x00\x00\"\x12\x00\x00\x00\x17\x00\x00#\x1b\x00\x00#\x1b\x00\x00\x00\x18\x00\x00%\xfc\x00\x00%\xfc\x00\x00\x00\x19\x00\x00&\x01\x00\x00&\x01\x00\x00\x00\x1a\x00\x00&\xfa\x00\x00&\xfa\x00\x00\x00\x1b\x00\x00'	\x00\x00'	\x00\x00\x00\x1c\x00\x00'\x0f\x00\x00'\x0f\x00\x00\x00\x1d\x00\x00\xe0\x01\x00\x00\xe0\x03\x00\x00\x00\x1e\x00\x00\xe0\x05\x00\x00\xe0	\x00\x00\x00!\x00\x00\xe0\x10\x00\x00\xe0\x19\x00\x00\x00&\x00\x00\xe0 \x00\x00\xe0)\x00\x00\x000\x00\x00\xe00\x00\x00\xe09\x00\x00\x00:\x00\x00\xe0@\x00\x00\xe0I\x00\x00\x00D\x00\x00\xe0P\x00\x00\xe0Y\x00\x00\x00N\x00\x00\xe0`\x00\x00\xe0`\x00\x00\x00X\x00\x00\xe0b\x00\x00\xe0i\x00\x00\x00Y\x00\x00\xe0p\x00\x00\xe0y\x00\x00\x00a\x00\x00\xe0\x80\x00\x00\xe0\x89\x00\x00\x00k\x00\x00\xe0\x90\x00\x00\xe0\x97\x00\x00\x00u\x00\x00\xe1\x01\x00\x00\xe1	\x00\x00\x00}\x00\x00\xe1\x10\x00\x00\xe1\x19\x00\x00\x00\x86\x00\x00\xe1 \x00\x00\xe1)\x00\x00\x00\x90\x00\x00\xe10\x00\x00\xe19\x00\x00\x00\x9a\x00\x00\xe1@\x00\x00\xe1F\x00\x00\x00\xa4\x00\x00\xe1H\x00\x00\xe1I\x00\x00\x00\xab\x00\x00\xe1P\x00\x00\xe1Y\x00\x00\x00\xad\x00\x00\xe1`\x00\x00\xe1i\x00\x00\x00\xb7\x00\x00\xe1p\x00\x00\xe1y\x00\x00\x00\xc1\x00\x00\xe1\x80\x00\x00\xe1\x89\x00\x00\x00\xcb\x00\x00\xe1\x90\x00\x00\xe1\x95\x00\x00\x00\xd5\x00\x00\xe1\x97\x00\x00\xe1\x99\x00\x00\x00\xdb\x00\x00\xe2\x00\x00\x00\xe2\x06\x00\x00\x00\xde\x00\x00\xe2	\x00\x00\xe2	\x00\x00\x00\xe5\x00\x00\xe2\x10\x00\x00\xe2\x16\x00\x00\x00\xe6\x00\x00\xe2\x18\x00\x00\xe2\x19\x00\x00\x00\xed\x00\x00\xe2!\x00\x00\xe2!\x00\x00\x00\xef\x00\x00\xe2#\x00\x00\xe2'\x00\x00\x00\xf0\x00\x00\xe20\x00\x00\xe29\x00\x00\x00\xf5\x00\x00\xe2@\x00\x00\xe2I\x00\x00\x00\xff\x00\x00\xe2P\x00\x00\xe2Y\x00\x00\x01	\x00\x00\xe2`\x00\x00\xe2`\x00\x00\x01\x13\x00\x00\xf8\xff\x00\x00\xf8\xff\x00\x00\x01\x14\x00\x01\xf5\x11\x00\x01\xf5\x11\x00\x00\x01\x15\x00\x01\xf6\xaa\x00\x01\xf6\xaa\x00\x00\x01\x16\x00\x06\x02\n\x00\x00\x00\x00\x01\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x02\x00\x00\x00\x00\x00\x00\x00\x02\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x03\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x04\x00\x05\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x07\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x06\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x15\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x14\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00(\x02\xf8\x00\x00\x00\x01\xff\xff\x00\x02\x00\x02\x00(\x00\x00\x01h\x03 \x00\x03\x00\x07\x00.\xb1\x01\x00/<\xb2\x07\x04\x00\xed2\xb1\x06\x05\xdc<\xb2\x03\x02\x00\xed2\x00\xb1\x03\x00/<\xb2\x05\x04\x00\xed2\xb2\x07\x06\x01\xfc<\xb2\x01\x02\x00\xed23\x11!\x11%3\x11#(\x01@\xfe\xe8\xf0\xf0\x03 \xfc\xe0(\x02\xd0\x00\x01\x00d\x00d\x04L\x04L\x00[\x00\x00\x012\x16\x1f\x01\x1e\x01\x1d\x017>\x01\x1f\x01\x16\x06\x0f\x0132\x16\x17\x16\x15\x14\x06\x0f\x01\x0e\x01+\x01\x17\x1e\x01\x0f\x01\x06&/\x01\x15\x14\x06\x07\x06#\"&/\x01.\x01=\x01\x07\x0e\x01/\x01&6?\x01#\"&'&546?\x01>\x01;\x01'.\x01?\x016\x16\x1f\x0154676\x02X\x0f&\x0b\x0b\n\x0f\x9e\x07\x16\x08j\x07\x02\x07\x9e\xe0\n\x11\x02\x06\x03\x02\x01\x02\x11\n\xe0\x9e\x07\x02\x07j\x08\x16\x07\x9e\x0f\n)\"\x0f&\x0b\x0b\n\x0f\x9e\x07\x16\x08j\x07\x02\x07\x9e\xe0\n\x11\x02\x06\x03\x02\x01\x02\x11\n\xe0\x9e\x07\x02\x07j\x08\x16\x07\x9e\x0f\n)\x04L\x03\x02\x01\x02\x11\n\xe0\x9e\x07\x02\x07j\x08\x16\x07\x9e\x0f\n)\"\x0f&\x0b\x0b\n\x0f\x9e\x07\x16\x08j\x07\x02\x07\x9e\xe0\n\x11\x02\x06\x03\x02\x01\x02\x11\n\xe0\x9e\x07\x02\x07j\x08\x16\x07\x9e\x0f\n)\"\x0f&\x0b\x0b\n\x0f\x9e\x07\x16\x08j\x07\x02\x07\x9e\xe0\n\x11\x02\x06\x00\x00\x00\x00\x01\x00\x00\x00\x00\x04L\x04L\x00#\x00\x00\x0132\x16\x15\x11!2\x16\x1d\x01\x14\x06#!\x11\x14\x06+\x01\"&5\x11!\"&=\x01463!\x1146\x01\xc2\xc8\x15\x1d\x01^\x15\x1d\x1d\x15\xfe\xa2\x1d\x15\xc8\x15\x1d\xfe\xa2\x15\x1d\x1d\x15\x01^\x1d\x04L\x1d\x15\xfe\xa2\x1d\x15\xc8\x15\x1d\xfe\xa2\x15\x1d\x1d\x15\x01^\x1d\x15\xc8\x15\x1d\x01^\x15\x1d\x00\x00\x00\x00\x01\x00p\x00\x00\x04@\x04L\x00E\x00\x00\x0132\x16\x07\x01\x06\x07!2\x16\x0f\x01\x0e\x01+\x01\x15!2\x16\x0f\x01\x0e\x01+\x01\x15\x14\x06+\x01\"&=\x01!\"&?\x01>\x01;\x015!\"&?\x01>\x01;\x01&'\x01&6;\x012\x1f\x01\x162?\x016\x039\xfa\n\x05\x08\xfe\x94\x06\x05\x01\x0c\n\x06\x06x\x06\x18\n}\x01\x13\n\x06\x06x\x06\x18\n}\x0f\x0b\x94\x0b\x0f\xfe\xed\n\x06\x06x\x06\x18\n}\xfe\xed\n\x06\x06x\x06\x18\nv\x05\x06\xfe\x94\x08\x05\n\xfa\x19\x12\xa4\x08\x14\x08\xa4\x12\x04L\n\x08\xfe\x94\x06\x0c\x0c\x08\xa0\x08\x0cd\x0c\x08\xa0\x08\x0c\xae\x0b\x0f\x0f\x0b\xae\x0c\x08\xa0\x08\x0cd\x0c\x08\xa0\x08\x0c\x0c\x06\x01l\x08\n\x12\xa4\x08\x08\xa4\x12\x00\x00\x01\x00d\x00\x05\x04\x8c\x04\xae\x00;\x00\x00\x012\x17\x16\x17#4.\x03#\"\x0e\x03\x07!\x07!\x06\x15!\x07!\x1e\x0432>\x0353\x06\x07\x06#\"'.\x01'#7367#73>\x0176\x02\xe8\xf2p<\x06\xb5#4@9\x17\x13+820\x0f\x01{d\xfe\xd4\x06\x01\x96d\xfe\xd4	09B4\x15\x169@4#\xae\x1ebk\xa7\xcev$B\x0c\xd9dp\x01\x05\xdad\x86\x14>\x1fu\x04\xae\xbdhi-K0!\x0f\x0b\x1e.O2d22dJtB+\x0f\x0f\"0J+\xabku\x9e0\xaawd/5dW\x85%\x8d\x00\x00\x02\x00{\x00\x00\x04L\x04\xb0\x00>\x00G\x00\x00\x01!2\x1e\x05\x15\x1c\x01\x15\x14\x0e\x05+\x01\x07!2\x16\x0f\x01\x0e\x01+\x01\x15\x14\x06+\x01\"&=\x01!\"&?\x01>\x01;\x015!\"&?\x01>\x01;\x01\x1146\x17\x1132654&#\x01\xac\x01^CjB0\x16\x0c\x01\x01\x0c\x160BjC\xb2\x02\x01 \n\x06\x06x\x06\x18\n\x8a\x0b\n\x95\n\x0f\xfe\xf5\n\x06\x06x\x06\x18\nu\xfe\xf5\n\x06\x06x\x06\x18\nu\x0f\xb6\xcb@--@\x04\xb0\x1a$?2O*$\x0b\x0b\x0b$*P2@%\x1ad\x0c\x08\xa0\x08\x0c\xaf\x0b\x0e\x0f\n\xaf\x0c\x08\xa0\x08\x0cd\x0c\x08\xa0\x08\x0c\x01\xdb\n\x0f\xc8\xfe\xd4BVT@\x00\x00\x01\x00\xc8\x01\x90\x04L\x02\xbc\x00\x0f\x00\x00\x13!2\x16\x1d\x01\x14\x06#!\"&=\x0146\xfa\x03 \x15\x1d\x1d\x15\xfc\xe0\x15\x1d\x1d\x02\xbc\x1d\x15\xc8\x15\x1d\x1d\x15\xc8\x15\x1d\x00\x00\x00\x02\x00\xc8\x00\x00\x03\xe8\x04\xb0\x00%\x00A\x00\x00\x01\x15\x14\x06+\x01\x15\x14\x06\x07\x1e\x01\x1d\x0132\x16\x1d\x01!546;\x015467.\x01=\x01#\"&=\x01\x17\x15\x14\x16\x17\x1e\x01\x14\x06\x07\x0e\x01\x1d\x01!54&'.\x01467>\x01=\x01\x03\xe8\x1d\x152cQQc2\x15\x1d\xfc\xe0\x1d\x152cQQc2\x15\x1d\xc8A7\x1c  \x1c7A\x01\x90A7\x1c  \x1c7A\x04\xb0\x96\x15\x1dd[\x95##\x95[\x96\x1d\x15\x96\x96\x15\x1d\x96[\x95##\x95[d\x1d\x15\x96\xc8d<c\x18\x0c2<2\x0c\x18c<\x96\x96<c\x18\x0c2<2\x0c\x18c<d\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x001\x00\x00\x01\xff\xf2\x01,\x04\xc2\x04A\x00\x16\x00\x00\x012\x16\x17632\x16\x15\x14\x06#!\"&5467&546\x01\xf7n\xb5,,.x\xaa\xaax\xfd\x12OqUB\x02\xd8\x04Awa\x0e\xadxy\xadrPEk\x0e\x0c\x19\x99\xd7\x00\x00\x00\x02\x00\x00\x00d\x04\xb0\x04\xaf\x00\x1a\x00\x1e\x00\x00\x00\x1e\x01\x0f\x01\x0132\x16\x1d\x01!546;\x01\x01'&>\x01\x16\x1f\x0176\x03!'\x03\x02\xf6 	\n\x88\x01\xd3\x1e\x14\x1e\xfbP\x1e\x14\x1e\x01\xd4\x87\n	 $\nop	z\x01y\xb6\xc3\x04\xb3\x13#\x10\xbb\xfd\x16%\x15**\x15%\x02\xea\xb7\x10$\x14	\x10\x94\x96\x10\xfc\x1ep\x02\x16\x00\x00\x00\x00\x04\x00\x00\x00d\x04\xb0\x04L\x00\x0b\x00\x17\x00#\x007\x00\x00\x13!2\x16\x07\x01\x06\"'\x01&6\x17\x01\x16\x14\x07\x01\x06&5\x1146	\x016\x16\x15\x11\x14\x06'\x01&4\x07\x01\x16\x06#!\"&7\x0162\x1f\x01\x162?\x0162\x19\x04~\n\x05\x08\xfd\xcc\x08\x14\x08\xfd\xcc\x08\x05\x03\x01\x08\x08\x08\xfe\xf8\x08\n\n\x03\x8c\x01\x08\x08\n\n\x08\xfe\xf8\x08\\\x01l\x08\x05\n\xfb\x82\n\x05\x08\x01l\x08\x14\x08\xa4\x08\x14\x08\xa4\x08\x14\x04L\n\x08\xfd\xc9\x08\x08\x027\x08\n\xda\xfe\xf8\x08\x14\x08\xfe\xf8\x08\x05\n\x02&\n\x05\xfe\xf0\x01\x08\x08\x05\n\xfd\xda\n\x05\x08\x01\x08\x08\x14\x80\xfe\x94\x08\n\n\x08\x01l\x08\x08\xa4\x08\x08\xa4\x08\x00\x00\x00\x03\xff\xf0\xff\xf0\x04\xba\x04\xba\x00	\x00\x0d\x00\x10\x00\x00\x002\x1f\x01\x16\x14\x0f\x01'7\x13\x01'	\x01\x05\x13\x03\xe0&\x0e\x99\x0d\x0dc\xd6_\"\xfd\x99\xd6\x02f\xfe\x1f\xfe\xb3n\x04\xba\x0d\x99\x0e&\x0e\\\xd6`\xfet\xfd\x9a\xd6\x02f\xfcjp\x01O\x00\x00\x00\x01\x00\x00\x00\x00\x04\xb0\x04\xb0\x00\x0f\x00\x00\x01\x1132\x16\x1d\x01!546;\x01\x11\x01!\x02\xbc\xfa\x15\x1d\xfc\xe0\x1d\x15\xfa\xfe\x0c\x04\xb0\x02\x8a\xfd\xda\x1d\x1522\x15\x1d\x02&\x02&\x00\x00\x00\x01\x00\x0e\x00\x08\x04L\x04\x9c\x00\x1f\x00\x00\x01%6\x16\x15\x11\x14\x06\x07\x06.\x01676\x17\x11\x05\x11\x14\x06\x07\x06.\x01676\x17\x1146\x01p\x02\x85'0SFO\x88$WOHB\xfd\xa8XAO\x88$WOHB\x1d\x03\xf9\xa3\x0f\x1e\"\xfc\xc17Q\x17\x19)mr\x19\x18\x10\x02	\x9b\xfd\xa2*`\x15\x1a)nq\x1a\x18\x11\x02\x7f&*\x00\x00\x00\x02\x00	\xff\xf8\x04\xbb\x04\xa7\x00\x1d\x00)\x00\x00\x002\x1e\x02\x15\x07\x17\x14\x07\x01\x16\x06\x0f\x01\x06\"'\x01\x06#'\x07\".\x024>\x01\x04\"\x0e\x01\x14\x1e\x012>\x014&\x01\x90\xc8\xb6\x83N\x01\x01N\x01\x13\x17\x01\x16;\x1a)\x13\xfe\xedw\x8e\x05\x02d\xb6\x83NN\x83\x01r\xb0\x94VV\x94\xb0\x94VV\x04\xa7N\x83\xb6d\x02\x05\x8dy\xfe\xee\x1a%\x18:\x14\x14\x01\x12M\x01\x01N\x83\xb6\xc8\xb6\x83[V\x94\xb0\x94VV\x94\xb0\x94\x00\x01\x00d\x00X\x04\xaf\x04D\x00\x19\x00\x00\x01>\x02\x1e\x02\x15\x14\x0e\x03\x07.\x0454>\x02\x1e\x01\x02\x890{xuX6Cy\x84\xa8>>\xa7\x85xC8Zvxy\x03\xb5DH\x05-Sv@9y\x80\x7f\xb2UU\xb2\x7f\x80y9@vS-\x05H\x00\x00\x00\x01\xff\xd3\x00^\x04{\x04\x94\x00\x18\x00\x00\x01\x1362\x17\x13!2\x16\x07\x05\x13\x16\x06'%\x05\x06&7\x13%&63\x01\x97\x83\x07\x15\x07\x81\x01\xa5\x15\x06\x11\xfe\xaa\x82\x07\x0f\x11\xfe\xa9\xfe\xaa\x11\x0f\x07\x82\xfe\xa5\x11\x06\x14\x03 \x01a\x13\x13\xfe\x9f\x11\x0c\xf9\xfeo\x14\x0b\x0c\xf6\xf7\x0c\x0b\x14\x01\x90\xfb\x0c\x11\x00\x02\xff\xd3\x00^\x04{\x04\x94\x00\x18\x00\"\x00\x00\x01\x1362\x17\x13!2\x16\x07\x05\x13\x16\x06'%\x05\x06&7\x13%&63\x05#\x17\x077\x17'7#'\x01\x97\x83\x07\x15\x07\x81\x01\xa5\x15\x06\x11\xfe\xaa\x82\x07\x0f\x11\xfe\xa9\xfe\xaa\x11\x0f\x07\x82\xfe\xa5\x11\x06\x14\x01\xf3\xf0\xc5J\xc1\xc3J\xc0\xeaN\x03 \x01a\x13\x13\xfe\x9f\x11\x0c\xf9\xfeo\x14\x0b\x0c\xf6\xf7\x0c\x0b\x14\x01\x90\xfb\x0c\x11d\x8e\xe2\x8b\x8c\xe5\x8c\xd3\x00\x00\x01\x00\x00\x00\x00\x04\xb0\x04\xb0\x00&\x00\x00\x012\x16\x1d\x01\x14\x06#\x15\x14\x16\x17\x05\x1e\x01\x1d\x01\x14\x06#!\"&=\x01467%>\x01=\x01\"&=\x0146\x02X|\xb0>&\x0c	\x01f	\x0c\x0f\n\xfb\x82\n\x0f\x0c	\x01f	\x0c&>\xb0\x04\xb0\xb0|\xfa.hK\n\x17\x06\xe6\x05\x17\n]\n\x0f\x0f\n]\n\x17\x05\xe6\x06\x17\nKh.\xfa|\xb0\x00\x00\x00\x0d\x00\x00\x00\x00\x04\xb0\x04L\x00\x0f\x00\x13\x00#\x00'\x00+\x00/\x003\x007\x00G\x00K\x00O\x00S\x00W\x00\x00\x13!2\x16\x15\x11\x14\x06#!\"&5\x1146\x17\x1535)\x01\"\x06\x15\x11\x14\x163!265\x114&3\x1535\x05\x1535!\x1535\x05\x1535!\x1535\x07!\"\x06\x15\x11\x14\x163!265\x114&\x05\x1535!\x1535\x05\x1535!\x1535\x19\x04~\n\x0f\x0f\n\xfb\x82\n\x0f\x0fUd\x02\xa3\xfd\xda\n\x0f\x0f\n\x02&\n\x0f\x0fsd\xfc\x18d\x03 d\xfc\x18d\x03 d\xe1\xfd\xda\n\x0f\x0f\n\x02&\n\x0f\x0f\xfc\xefd\x03 d\xfc\x18d\x03 d\x04L\x0f\n\xfb\xe6\n\x0f\x0f\n\x04\x1a\n\x0fddd\x0f\n\xfe\xa2\n\x0f\x0f\n\x01^\n\x0fdd\xc8dddd\xc8ddddd\x0f\n\xfe\xa2\n\x0f\x0f\n\x01^\n\x0fddddd\xc8dddd\x00\x00\x04\x00\x00\x00\x00\x04L\x04L\x00\x0f\x00\x1f\x00/\x00?\x00\x00\x13!2\x16\x15\x11\x14\x06#!\"&5\x1146)\x012\x16\x15\x11\x14\x06#!\"&5\x1146\x01!2\x16\x15\x11\x14\x06#!\"&5\x1146)\x012\x16\x15\x11\x14\x06#!\"&5\x11462\x01\x90\x15\x1d\x1d\x15\xfep\x15\x1d\x1d\x02m\x01\x90\x15\x1d\x1d\x15\xfep\x15\x1d\x1d\xfd\xbd\x01\x90\x15\x1d\x1d\x15\xfep\x15\x1d\x1d\x02m\x01\x90\x15\x1d\x1d\x15\xfep\x15\x1d\x1d\x04L\x1d\x15\xfep\x15\x1d\x1d\x15\x01\x90\x15\x1d\x1d\x15\xfep\x15\x1d\x1d\x15\x01\x90\x15\x1d\xfd\xa8\x1d\x15\xfep\x15\x1d\x1d\x15\x01\x90\x15\x1d\x1d\x15\xfep\x15\x1d\x1d\x15\x01\x90\x15\x1d\x00\x00	\x00\x00\x00\x00\x04L\x04L\x00\x0f\x00\x1f\x00/\x00?\x00O\x00_\x00o\x00\x7f\x00\x8f\x00\x00\x1332\x16\x1d\x01\x14\x06+\x01\"&=\x0146!32\x16\x1d\x01\x14\x06+\x01\"&=\x0146!32\x16\x1d\x01\x14\x06+\x01\"&=\x0146\x0132\x16\x1d\x01\x14\x06+\x01\"&=\x0146!32\x16\x1d\x01\x14\x06+\x01\"&=\x0146!32\x16\x1d\x01\x14\x06+\x01\"&=\x0146\x0132\x16\x1d\x01\x14\x06+\x01\"&=\x0146!32\x16\x1d\x01\x14\x06+\x01\"&=\x0146!32\x16\x1d\x01\x14\x06+\x01\"&=\x01462\xc8\x15\x1d\x1d\x15\xc8\x15\x1d\x1d\x01\xa5\xc8\x15\x1d\x1d\x15\xc8\x15\x1d\x1d\x01\xa5\xc8\x15\x1d\x1d\x15\xc8\x15\x1d\x1d\xfc\xf5\xc8\x15\x1d\x1d\x15\xc8\x15\x1d\x1d\x01\xa5\xc8\x15\x1d\x1d\x15\xc8\x15\x1d\x1d\x01\xa5\xc8\x15\x1d\x1d\x15\xc8\x15\x1d\x1d\xfc\xf5\xc8\x15\x1d\x1d\x15\xc8\x15\x1d\x1d\x01\xa5\xc8\x15\x1d\x1d\x15\xc8\x15\x1d\x1d\x01\xa5\xc8\x15\x1d\x1d\x15\xc8\x15\x1d\x1d\x04L\x1d\x15\xc8\x15\x1d\x1d\x15\xc8\x15\x1d\x1d\x15\xc8\x15\x1d\x1d\x15\xc8\x15\x1d\x1d\x15\xc8\x15\x1d\x1d\x15\xc8\x15\x1d\xfep\x1d\x15\xc8\x15\x1d\x1d\x15\xc8\x15\x1d\x1d\x15\xc8\x15\x1d\x1d\x15\xc8\x15\x1d\x1d\x15\xc8\x15\x1d\x1d\x15\xc8\x15\x1d\xfep\x1d\x15\xc8\x15\x1d\x1d\x15\xc8\x15\x1d\x1d\x15\xc8\x15\x1d\x1d\x15\xc8\x15\x1d\x1d\x15\xc8\x15\x1d\x1d\x15\xc8\x15\x1d\x00\x06\x00\x00\x00\x00\x04\xb0\x04L\x00\x0f\x00\x1f\x00/\x00?\x00O\x00_\x00\x00\x1332\x16\x1d\x01\x14\x06+\x01\"&=\x0146)\x012\x16\x1d\x01\x14\x06#!\"&=\x0146\x0132\x16\x1d\x01\x14\x06+\x01\"&=\x0146)\x012\x16\x1d\x01\x14\x06#!\"&=\x0146\x0132\x16\x1d\x01\x14\x06+\x01\"&=\x0146)\x012\x16\x1d\x01\x14\x06#!\"&=\x01462\xc8\x15\x1d\x1d\x15\xc8\x15\x1d\x1d\x01\xa5\x02\xbc\x15\x1d\x1d\x15\xfdD\x15\x1d\x1d\xfe\x85\xc8\x15\x1d\x1d\x15\xc8\x15\x1d\x1d\x01\xa5\x02\xbc\x15\x1d\x1d\x15\xfdD\x15\x1d\x1d\xfe\x85\xc8\x15\x1d\x1d\x15\xc8\x15\x1d\x1d\x01\xa5\x02\xbc\x15\x1d\x1d\x15\xfdD\x15\x1d\x1d\x04L\x1d\x15\xc8\x15\x1d\x1d\x15\xc8\x15\x1d\x1d\x15\xc8\x15\x1d\x1d\x15\xc8\x15\x1d\xfep\x1d\x15\xc8\x15\x1d\x1d\x15\xc8\x15\x1d\x1d\x15\xc8\x15\x1d\x1d\x15\xc8\x15\x1d\xfep\x1d\x15\xc8\x15\x1d\x1d\x15\xc8\x15\x1d\x1d\x15\xc8\x15\x1d\x1d\x15\xc8\x15\x1d\x00\x00\x00\x00\x01\x00&\x00,\x04\xe8\x04 \x00\x17\x00\x00	\x0162\x1f\x01\x16\x14\x07\x01\x06\"'\x01&4?\x0162\x1f\x01\x162\x01\xd1\x02;\x08\x14\x07\xb1\x08\x08\xfc\xf1\x07\x15\x07\xfe\x80\x08\x08\xb1\x07\x14\x08\xab\x07\x16\x01\xdd\x02;\x08\x08\xb1\x07\x14\x08\xfc\xf0\x08\x08\x01\x80\x08\x14\x07\xb1\x08\x08\xab\x07\x00\x01\x00n\x00n\x04B\x04B\x00#\x00\x00\x01\x17\x16\x14\x07	\x01\x16\x14\x0f\x01\x06\"'	\x01\x06\"/\x01&47	\x01&4?\x0162\x17	\x0162\x03\x88\xb2\x08\x08\xfe\xf5\x01\x0b\x08\x08\xb2\x08\x15\x07\xfe\xf4\xfe\xf4\x07\x15\x08\xb2\x08\x08\x01\x0b\xfe\xf5\x08\x08\xb2\x08\x15\x07\x01\x0c\x01\x0c\x07\x15\x04;\xb3\x08\x15\x07\xfe\xf4\xfe\xf4\x07\x15\x08\xb2\x08\x08\x01\x0b\xfe\xf5\x08\x08\xb2\x08\x15\x07\x01\x0c\x01\x0c\x07\x15\x08\xb2\x08\x08\xfe\xf5\x01\x0c\x07\x00\x03\x00\x17\xff\xeb\x04\xc5\x04\x99\x00\x19\x00%\x00I\x00\x00\x002\x1e\x02\x15\x14\x07\x01\x16\x14\x0f\x01\x06\"'\x01\x06#\".\x024>\x01\x04\"\x0e\x01\x14\x1e\x012>\x014&\x0532\x16\x1d\x0132\x16\x1d\x01\x14\x06+\x01\x15\x14\x06+\x01\"&=\x01#\"&=\x0146;\x01546\x01\x99\xc4\xb3\x82MN\x01,\x08\x08m\x07\x15\x08\xfe\xd4w\x8eb\xb4\x81MM\x81\x01o\xb3\x98XX\x98\xb3\x99XX\xfe\xbc\x96\n\x0fK\n\x0f\x0f\nK\x0f\n\x96\n\x0fK\n\x0f\x0f\nK\x0f\x04\x99M\x82\xb3b\x8dy\xfe\xd5\x08\x15\x08l\x08\x08\x01+MM\x81\xb4\xc4\xb3\x82MX\x99\xb3\x98XX\x98\xb3\x99#\x0f\nK\x0f\n\x96\n\x0fK\n\x0f\x0f\nK\x0f\n\x96\n\x0fK\n\x0f\x00\x00\x03\x00\x17\xff\xeb\x04\xc5\x04\x99\x00\x19\x00%\x005\x00\x00\x002\x1e\x02\x15\x14\x07\x01\x16\x14\x0f\x01\x06\"'\x01\x06#\".\x024>\x01\x04\"\x0e\x01\x14\x1e\x012>\x014&\x05!2\x16\x1d\x01\x14\x06#!\"&=\x0146\x01\x99\xc4\xb3\x82MN\x01,\x08\x08m\x07\x15\x08\xfe\xd4w\x8eb\xb4\x81MM\x81\x01o\xb3\x98XX\x98\xb3\x99XX\xfeX\x01^\n\x0f\x0f\n\xfe\xa2\n\x0f\x0f\x04\x99M\x82\xb3b\x8dy\xfe\xd5\x08\x15\x08l\x08\x08\x01+MM\x81\xb4\xc4\xb3\x82MX\x99\xb3\x98XX\x98\xb3\x99\x87\x0f\n\x96\n\x0f\x0f\n\x96\n\x0f\x00\x00\x00\x00\x02\x00\x17\x00\x17\x04\x99\x04\xb0\x00\x0f\x00-\x00\x00\x0132\x16\x15\x11\x14\x06+\x01\"&5\x1146\x055\x16\x12\x15\x14\x0e\x02\".\x0254\x127\x15\x0e\x01\x15\x14\x1e\x012>\x0154&\x02&d\x15\x1d\x1d\x15d\x15\x1d\x1d\x01\x0f\xa7\xd2[\x9b\xd6\xea\xd6\x9b[\xd2\xa7g|r\xc5\xe8\xc5r|\x04\xb0\x1d\x15\xfep\x15\x1d\x1d\x15\x01\x90\x15\x1d\xe1\xa6>\xfe\xd9\xb8u\xd6\x9b[[\x9b\xd6u\xb8\x01'>\xa67\xc8xt\xc5rr\xc5tx\xc8\x00\x04\x00d\x00\x00\x04\xb0\x04\xb0\x00\x0f\x00\x1f\x00/\x00?\x00\x00\x0132\x16\x15\x11\x14\x06+\x01\"&5\x1146\x0132\x16\x15\x11\x14\x06+\x01\"&5\x1146\x0132\x16\x15\x11\x14\x06+\x01\"&5\x1146\x0532\x16\x1d\x01\x14\x06+\x01\"&=\x0146\x04\x01\x96\n\x0f\x0f\n\x96\n\x0f\x0f\xfe\xde\x96\n\x0f\x0f\n\x96\n\x0f\x0f\xfe\xde\x96\n\x0f\x0f\n\x96\n\x0f\x0f\xfe\xde\x96\n\x0f\x0f\n\x96\n\x0f\x0f\x04\xb0\x0f\n\xfb\x82\n\x0f\x0f\n\x04~\n\x0f\xfep\x0f\n\xfd\x12\n\x0f\x0f\n\x02\xee\n\x0f\xfe\xd4\x0f\n\xfe>\n\x0f\x0f\n\x01\xc2\n\x0f\xc8\x0f\n\xfa\n\x0f\x0f\n\xfa\n\x0f\x00\x00\x00\x00\x02\x00\x1a\x00\x1b\x04\x96\x04\x96\x00G\x00O\x00\x00\x012\x1f\x02\x16\x1f\x017\x16\x17\x07\x17\x16\x1f\x02\x16\x15\x14\x0f\x02\x06\x0f\x01\x17\x06\x07'\x07\x06\x0f\x02\x06#\"/\x02&/\x01\x07&'7'&/\x02&54?\x026?\x01'67\x1776?\x026\x12\"\x06\x14\x16264\x02X!)&\x051-\x05\x86=+P\x03\x19\x0e\x01\x98\x05\x05\x98\x01\x0f\x18\x03P08\x86\x05,2\x05&+\x1f!)&\x051-\x05\x86<,P\x03\x19\x0d\x02\x97\x06\x06\x97\x02\x0d\x19\x03P/:\x85\x05-1\x05&+x\xb2~~\xb2~\x04\x96\x05\x98\x01\x0e\x19\x02P09\x86\x05,1\x06&+\x1e\"(&\x061,\x05\x86=,Q\x03\x19\x0e\x02\x97\x05\x05\x97\x02\x0e\x19\x03Q09\x86\x05-0\x06&* !(&\x060-\x05\x86=,P\x02\x19\x0e\x01\x98\x05\xfe\x99~\xb1~~\xb1\x00\x07\x00d\x00\x00\x04\xb0\x05\x14\x00\x13\x00\x17\x00!\x00%\x00)\x00-\x001\x00\x00\x01!2\x16\x1d\x01!2\x16\x1d\x01!5463!546\x17\x15!5\x01\x11\x14\x06#!\"&5\x11\x17\x113\x113\x113\x113\x113\x113\x113\x11\x01\xf4\x01,);\x01\x13\n\x0f\xfb\xb4\x0f\n\x01\x13;)\x01,\x01,;)\xfdD);dddddddd\x05\x14;)d\x0f\nKK\n\x0fd);ddd\xfe\xd4\xfc\xe0);;)\x03 d\xfdD\x02\xbc\xfdD\x02\xbc\xfdD\x02\xbc\xfdD\x02\xbc\x00\x01\x00\x0c\x00\x00\x05\x08\x04\xd1\x00\x1f\x00\x00\x13\x0162\x17\x01\x16\x06+\x01\x11\x14\x06+\x01\"&5\x11!\x11\x14\x06+\x01\"&5\x11#\"&\x12\x02l\x08\x15\x07\x02`\x08\x05\n\xaf\x0f\n\xfa\n\x0f\xfe\xd4\x0f\n\xfa\n\x0f\xaf\n\x05\x02j\x02`\x07\x07\xfd\xa0\x08\n\xfd\xc1\n\x0f\x0f\n\x01w\xfe\x89\n\x0f\x0f\n\x02?\n\x00\x02\x00d\x00\x00\x03\xe8\x04\xb0\x00\x11\x00\x17\x00\x00\x01\x11\x14\x163!\x11\x14\x06#!\"&5\x11463\x01#\"&=\x01\x02X;)\x01,\x1d\x15\xfc\xe0\x15\x1d\x1d\x15\x03R\xfa\x15\x1d\x04\xb0\xfep);\xfdv\x15\x1d\x1d\x15\x04L\x15\x1d\xfep\x1d\x15\xfa\x00\x03\x00\x17\x00\x17\x04\x99\x04\x99\x00\x0f\x00\x1b\x000\x00\x00\x002\x1e\x02\x14\x0e\x02\".\x024>\x01\x04\"\x0e\x01\x14\x1e\x012>\x014&\x0532\x16\x15\x1132\x16\x1d\x01\x14\x06+\x01\"&5\x1146\x01\xe3\xea\xd6\x9b[[\x9b\xd6\xea\xd6\x9b[[\x9b\x01\xbf\xe8\xc5rr\xc5\xe8\xc5rr\xfe|2\n\x0f\xaf\n\x0f\x0f\n\xfa\n\x0f\x0f\x04\x99[\x9b\xd6\xea\xd6\x9b[[\x9b\xd6\xea\xd6\x9b;r\xc5\xe8\xc5rr\xc5\xe8\xc5\x0d\x0f\n\xfe\xed\x0f\n2\n\x0f\x0f\n\x01^\n\x0f\x00\x00\x00\x00\x02\xff\x9c\x00\x00\x05\x14\x04\xb0\x00\x0b\x00\x0f\x00\x00)\x01\x03#\x03!\x013\x033\x033\x01\x033\x03\x05\x14\xfd\xe6)\xf2)\xfd\xe6\x01\xaf\xd1\x15\xa2\x14\xd0\xfe\x9e\x1b\xe0\x1b\x01\x90\xfep\x04\xb0\xfe\xd4\x01,\xfep\xfe\xd4\x01,\x00\x00\x00\x00\x02\x00d\x00\x00\x04\xb0\x04\xb0\x00\x15\x00/\x00\x00\x0132\x16\x15\x1132\x16\x07\x01\x06\"'\x01&6;\x01\x1146\x0132\x16\x15\x11\x14\x06#!\"&5\x1146;\x012\x16\x1d\x01!546\x02&\xc8\x15\x1d\xbf\x14\x0b\x0d\xfe\xb9\x0d&\x0d\xfe\xb9\x0d\x0b\x14\xbf\x1d\x02T2\n\x0f\x0f\n\xfb\xe6\n\x0f\x0f\n2\n\x0f\x03\x84\x0f\x04\xb0\x1d\x15\xfe>\x17\x10\xfep\x10\x10\x01\x90\x10\x17\x01\xc2\x15\x1d\xfc\xe0\x0f\n\xfe\xa2\n\x0f\x0f\n\x01^\n\x0f\x0f\n\xaf\xaf\n\x0f\x00\x03\x00\x17\x00\x17\x04\x99\x04\x99\x00\x0f\x00\x1b\x001\x00\x00\x002\x1e\x02\x14\x0e\x02\".\x024>\x01\x04\"\x0e\x01\x14\x1e\x012>\x014&\x0532\x16\x15\x1132\x16\x07\x03\x06\"'\x03&6;\x01\x1146\x01\xe3\xea\xd6\x9b[[\x9b\xd6\xea\xd6\x9b[[\x9b\x01\xbf\xe8\xc5rr\xc5\xe8\xc5rr\xfe|\x96\n\x0f\x89\x15\n\x0d\xdf\x0d&\x0d\xdf\x0d\n\x15\x89\x0f\x04\x99[\x9b\xd6\xea\xd6\x9b[[\x9b\xd6\xea\xd6\x9b;r\xc5\xe8\xc5rr\xc5\xe8\xc5\x0d\x0f\n\xfe\xed\x17\x10\xfe\xed\x10\x10\x01\x13\x10\x17\x01\x13\n\x0f\x00\x00\x00\x03\x00\x17\x00\x17\x04\x99\x04\x99\x00\x0f\x00\x1b\x001\x00\x00\x002\x1e\x02\x14\x0e\x02\".\x024>\x01\x04\"\x0e\x01\x14\x1e\x012>\x014&%\x13\x16\x06+\x01\x11\x14\x06+\x01\"&5\x11#\"&7\x1362\x01\xe3\xea\xd6\x9b[[\x9b\xd6\xea\xd6\x9b[[\x9b\x01\xbf\xe8\xc5rr\xc5\xe8\xc5rr\xfe\xe7\xdf\x0d\n\x15\x89\x0f\n\x96\n\x0f\x89\x15\n\x0d\xdf\x0d&\x04\x99[\x9b\xd6\xea\xd6\x9b[[\x9b\xd6\xea\xd6\x9b;r\xc5\xe8\xc5rr\xc5\xe8\xc5\x01\xfe\xed\x10\x17\xfe\xed\n\x0f\x0f\n\x01\x13\x17\x10\x01\x13\x10\x00\x00\x00\x00\x02\x00\x00\x00\x00\x04\xb0\x04\xb0\x00\x19\x009\x00\x00\x13!2\x16\x17\x13\x16\x15\x11\x14\x06\x07\x06#!\"&'&5\x1347\x13>\x01\x05!\"\x06\x07\x03\x06\x16;\x012\x16\x1f\x01\x1e\x01;\x0126?\x01>\x01;\x0126'\x03.\x01\xe1\x02\xee\n\x13\x03\xba\x07\x08\x05\x0c\x19\xfb\xb4\x0c\x1e\x02\x06\x01\x07\xb9\x03\x13\x02\x97\xfd\xd4\n\x12\x02W\x02\x0c\n\x96\n\x13\x02&\x02\x13\n\xfa\n\x13\x02&\x02\x13\n\x96\n\x0c\x02W\x02\x12\x04\xb0\x0e\n\xfdt\x18\x19\xfeW\x0c\x1e\x02\x06\x08\x04\x0d\x19\x01\xa9\x19\x18\x02\x8c\n\x0e\xc8\x0e\x0b\xfe>\x0b\x0e\x0e\n\x98\n\x0e\x0e\n\x98\n\x0e\x0e\x0b\x01\xc2\x0b\x0e\x00\x03\x00\x17\x00\x17\x04\x99\x04\x99\x00\x0f\x00\x1b\x00'\x00\x00\x002\x1e\x02\x14\x0e\x02\".\x024>\x01\x04\"\x0e\x01\x14\x1e\x012>\x014&\x05\x17\x16\x14\x0f\x01\x06&5\x1146\x01\xe3\xea\xd6\x9b[[\x9b\xd6\xea\xd6\x9b[[\x9b\x01\xbf\xe8\xc5rr\xc5\xe8\xc5rr\xfe\x8b\xfd\x11\x11\xfd\x10\x18\x18\x04\x99[\x9b\xd6\xea\xd6\x9b[[\x9b\xd6\xea\xd6\x9b;r\xc5\xe8\xc5rr\xc5\xe8\xc5]\xbe\x0c$\x0c\xbe\x0c\x0b\x15\x01\x90\x15\x0b\x00\x01\x00\x17\x00\x17\x04\x99\x04\xb0\x00(\x00\x00\x0176\x16\x15\x11\x14\x06#!\"&?\x01&#\"\x0e\x01\x14\x1e\x012>\x0153\x14\x0e\x02\".\x024>\x0232\x03\xb3\x87\x07\x0b\x0f\n\xfe\x96\x0b\x04\x07\x85m\x81t\xc5rr\xc5\xe8\xc5r\x96[\x9b\xd6\xea\xd6\x9b[[\x9b\xd6u\xc0\x04$\x87\x07\x04\x0b\xfe\x96\n\x0f\x0b\x07\x85Lr\xc5\xe8\xc5rr\xc5tu\xd6\x9b[[\x9b\xd6\xea\xd6\x9b[\x00\x00\x00\x00\x02\x00\x17\x00\x01\x04\x99\x04\xb0\x00\x1a\x005\x00\x00\x0176\x16\x15\x11\x14\x06#!\"&?\x01&#\"\x0e\x01\x15#4>\x0232\x133\x14\x0e\x02#\"'\x07\x06&5\x11463!2\x16\x0f\x01\x1632>\x01\x03\xb3\x87\x07\x0b\x0f\x0b\xfe\x97\x0b\x04\x07\x86n\x81t\xc5r\x96[\x9b\xd6u\xc0\xeb\x96[\x9b\xd6u\xc0\x9c\x86\x07\x0b\x0f\x0b\x01h\n\x05\x08\x85n\x82t\xc5r\x04$\x87\x07\x04\x0b\xfe\x97\x0b\x0f\x0b\x07\x86Kr\xc5tu\xd6\x9b[\xfd\xbfu\xd6\x9b[v\x86\x08\x05\n\x01h\x0b\x0f\x0b\x07\x85Lr\xc5\x00\x00\x00\n\x00d\x00\x00\x04\xb0\x04\xb0\x00\x0f\x00\x1f\x00/\x00?\x00O\x00_\x00o\x00\x7f\x00\x8f\x00\x9f\x00\x00\x13!2\x16\x15\x11\x14\x06#!\"&5\x1146\x05!\"\x06\x15\x11\x14\x163!265\x114&\x0532\x16\x1d\x01\x14\x06+\x01\"&=\x01463!2\x16\x1d\x01\x14\x06#!\"&=\x0146\x0732\x16\x1d\x01\x14\x06+\x01\"&=\x01463!2\x16\x1d\x01\x14\x06#!\"&=\x0146\x0732\x16\x1d\x01\x14\x06+\x01\"&=\x01463!2\x16\x1d\x01\x14\x06#!\"&=\x0146\x0732\x16\x1d\x01\x14\x06+\x01\"&=\x01463!2\x16\x1d\x01\x14\x06#!\"&=\x0146}\x04\x1a\n\x0f\x0f\n\xfb\xe6\n\x0f\x0f\x03\xc0\xfc\xae\n\x0f\x0f\n\x03R\n\x0f\x0f\xfd\x082\n\x0f\x0f\n2\n\x0f\x0f\xd2\x01\xc2\n\x0f\x0f\n\xfe>\n\x0f\x0f\xbe2\n\x0f\x0f\n2\n\x0f\x0f\xd2\x01\xc2\n\x0f\x0f\n\xfe>\n\x0f\x0f\xbe2\n\x0f\x0f\n2\n\x0f\x0f\xd2\x01\xc2\n\x0f\x0f\n\xfe>\n\x0f\x0f\xbe2\n\x0f\x0f\n2\n\x0f\x0f\xd2\x01\xc2\n\x0f\x0f\n\xfe>\n\x0f\x0f\x04\xb0\x0f\n\xfb\x82\n\x0f\x0f\n\x04~\n\x0f\xc8\x0f\n\xfc\xae\n\x0f\x0f\n\x03R\n\x0fd\x0f\n2\n\x0f\x0f\n2\n\x0f\x0f\n2\n\x0f\x0f\n2\n\x0f\xc8\x0f\n2\n\x0f\x0f\n2\n\x0f\x0f\n2\n\x0f\x0f\n2\n\x0f\xc8\x0f\n2\n\x0f\x0f\n2\n\x0f\x0f\n2\n\x0f\x0f\n2\n\x0f\xc8\x0f\n2\n\x0f\x0f\n2\n\x0f\x0f\n2\n\x0f\x0f\n2\n\x0f\x00\x00\x00\x00\x02\x00\x00\x00\x00\x04L\x04\xb0\x00\x19\x00#\x00\x00\x0154&#!\"\x06\x1d\x01#\"\x06\x15\x11\x14\x163!265\x114&#!546;\x012\x16\x1d\x01\x03\x84uS\xfe\xd4Rvd);;)\x03\x84);;)\xfd\xa8\x1e\x14\xc8\x14\x1e\x03 \xc8SuvR\xc8;)\xfd\xa8);;)\x02X);\x96\x15\x1d\x1d\x15\x96\x00\x02\x00d\x00\x00\x04L\x04L\x00	\x007\x00\x00\x1332\x16\x15\x11#\x1146\x052\x17\x16\x15\x11\x14\x07\x0e\x03#\".\x01'.\x02#\"\x07\x06#\"'&5\x11>\x0176\x1e\x03\x17\x1e\x023276}2\n\x0fd\x0f\x03\xc0\x04\x05\x10\x03!C@1\x1c\x1a?*'),G\x1eUK\x07\x08\x06\x05\x0e\x16x;\x17(.\x139\x04)-E\x1dgP\x07\x04L\x0f\n\xfb\xcd\x043\n\x0f0\x02\x06\x11\xfe[\x06\x06;P$\x0d\x0d\x0e\x0e\x0f\x0f\x0f9\x05\x03\x07\x0f\x01\xb67W\x03\x02\x03\x0b\x06\x14\x01\x0e\x0e\x0eW\x08\x00\x00\x03\x00\x00\x00\x00\x04\xb0\x04\x97\x00!\x001\x00A\x00\x00\x002\x1e\x02\x15\x11\x14\x06+\x01\"&5\x114.\x01 \x0e\x01\x15\x11\x14\x06+\x01\"&5\x114>\x01\x0332\x16\x15\x11\x14\x06+\x01\"&5\x1146!32\x16\x15\x11\x14\x06+\x01\"&5\x1146\x01\xe4\xe8\xde\xa3c\x0f\n2\n\x0f\x8d\xe4\xfe\xfa\xe4\x8d\x0f\n2\n\x0fc\xa3*\xa0\x08\x0c\x0c\x08\xa0\x08\x0c\x0c\x02`\xa0\x08\x0c\x0c\x08\xa0\x08\x0c\x0c\x04\x97c\xa3\xdet\xfe\xd4\n\x0f\x0f\n\x01,\x7f\xd1rr\xd1\x7f\xfe\xd4\n\x0f\x0f\n\x01,t\xde\xa3\xfd\xc0\x0c\x08\xfe4\x08\x0c\x0c\x08\x01\xcc\x08\x0c\x0c\x08\xfe4\x08\x0c\x0c\x08\x01\xcc\x08\x0c\x00\x00\x00\x00\x02\x00\x00\x00\xd3\x04G\x03\xdd\x00\x15\x009\x00\x00\x01%6\x16\x15\x11\x14\x06'%&+\x01\"&5\x1146;\x012\x05762\x1f\x01\x16\x14\x0f\x01\x17\x16\x14\x0f\x01\x06\"/\x01\x07\x06\"/\x01&4?\x01'&4?\x0162\x17\x01A\x01\x02	\x0c\x0c	\xfe\xfe\x15\x19\xfa\n\x0f\x0f\n\xfa\x19\x02Xx\x07\x14\x07\"\x07\x07xx\x07\x07\"\x07\x14\x07xx\x07\x14\x07\"\x07\x07ww\x07\x07\"\x07\x14\x07\x03.\xac\x06\x07\n\xfd\x12\n\x07\x06\xac\x0e\x0f\n\x01^\n\x0f\x84x\x07\x07\"\x07\x14\x07xx\x07\x14\x07\"\x07\x07ww\x07\x07\"\x07\x14\x07xx\x07\x14\x07\"\x08\x08\x00\x00\x00\x00\x02\x00\x00\x00\xd3\x03r\x03\xdd\x00\x15\x00/\x00\x00\x01%6\x16\x15\x11\x14\x06'%&+\x01\"&5\x1146;\x012%3\x16\x17\x16\x15\x14\x07\x06\x0f\x01\"/\x01.\x017654'&6?\x016\x01A\x01\x02	\x0c\x0c	\xfe\xfe\x15\x19\xfa\n\x0f\x0f\n\xfa\x19\x01\xd2\x04\n\x06`Z\x06\x0b\x03	\x07\x1d\x07\x03\x06HN\x06\x03\x08\x1d\x07\x03.\xac\x06\x07\n\xfd\x12\n\x07\x06\xac\x0e\x0f\n\x01^\n\x0fd\x01	\x81\xa1\x9a\x7f	\x01\x01\x06\x17\x07\x13\x08g~\x84j\x08\x14\x07\x16\x05\x00\x00\x00\x00\x03\x00\x00\x00\xc4\x04b\x03\xec\x00\x1b\x001\x00K\x00\x00\x013\x16\x17\x16\x15\x14\x06\x07\x06\x07#\"/\x01.\x017654&'&6?\x016\x05%6\x16\x15\x11\x14\x06'%&+\x01\"&5\x1146;\x012%3\x16\x17\x16\x15\x14\x07\x06\x0f\x01\"/\x01.\x017654'&6?\x016\x03\xc7\x03\x0b\x06\x87D@\x07\n\x03	\x07*\x08\x02\x06o;7\x06\x02	*\x07\xfd\x82\x01\x02	\x0c\x0c	\xfe\xfe\x15\x19\xfa\n\x0f\x0f\n\xfa\x19\x01\xd2\x04\n\x06`Z\x06\x0b\x03	\x07\x1d\x07\x03\x06HN\x06\x03\x08\x1d\x07\x03\xec\x01	\xb3\xd9i\xcbT	\x01\x06\"\x06\x14\x08\x96\xb2Z\xacG	\x14\x06!\x05\xbe\xac\x06\x07\n\xfd\x12\n\x07\x06\xac\x0e\x0f\n\x01^\n\x0fd\x01	\x81\xa1\x9a\x7f	\x01\x01\x06\x17\x07\x13\x08g~\x84j\x08\x15\x06\x16\x05\x00\x00\x00\x00\x0d\x00\x00\x00\x00\x04\xb0\x04\xb0\x00	\x00\x15\x00\x19\x00\x1d\x00!\x00%\x00-\x00;\x00?\x00C\x00G\x00K\x00O\x00\x00\x013\x15#\x15!\x15#\x11!\x01#\x153\x15!\x11#\x11#5!\x05\x11!\x11!\x11!\x11\x05#53\x05#53\x013\x11!\x11353\x013\x15#\x15#5#535#5!\x05\x11!\x11\x07#53\x05#53\x01#53\x05!5!\x01\xf4dd\xfepd\x01\xf4\x02\xbc\xc8\xc8\xfe\xd4\xc8d\x02X\xfb\xb4\x01,\x01\x90\x01,\xfc\xe0dd\x02\xbcdd\xfdD\xc8\xfe\x0c\xc8d\x01\xf4\xc8d\xc8dd\xc8\x01,\xfdD\x01,ddd\x03\x84dd\xfe\x0cdd\x01\xf4\xfe\xd4\x01,\x03\x84ddd\x02X\xfe\x0cd\xc8\x01,\x01,\xc8d\xfe\xd4\x01,\xfe\xd4\x01,\xc8ddd\xfe\x0c\xfe\x0c\x01\xf4d\xfe\xd4dddd\xc8d\xc8\xfe\xd4\x01,\xc8ddd\xfe\xd4ddd\x00\x00\x00\x00	\x00\x00\x00\x00\x04\xb0\x04\xb0\x00\x03\x00\x07\x00\x0b\x00\x0f\x00\x13\x00\x17\x00\x1b\x00\x1f\x00#\x00\x007#\x113\x13#\x113\x01#\x113\x13#\x113\x01#\x113\x01!5!\x17#53\x17#53\x05#53ddd\xc8dd\x01\x90\xc8\xc8\xc8dd\x01,\xc8\xc8\xfc\xe0\xfe\xd4\x01,\xc8dd\xc8dd\x01,\xc8\xc8\xc8\x03\xe8\xfc\x18\x03\xe8\xfc\x18\x03\xe8\xfc\x18\x03\xe8\xfc\x18\x03\xe8\xfbPdd[[[[[\x00\x00\x02\x00\x00\x00\n\x04\xa6\x04\xb0\x00\x0d\x00\x15\x00\x00	\x01\x16\x14\x07\x01\x06\"'\x01\x13463\x04&\"\x06\x14\x1626\x01\xf4\x02\xaa\x08\x08\xfe0\x08\x14\x08\xfdV\x01\x0f\n\x01C;S;;S;\x04\xb0\xfdV\x08\x14\x08\xfe0\x08\x08\x02\xaa\x01\xdb\n\x0f\xcd;;T;;\x00\x00\x00\x00\x03\x00\x00\x00\n\x05\xd2\x04\xb0\x00\x0d\x00\x19\x00!\x00\x00	\x01\x16\x14\x07\x01\x06\"'\x01\x13463!\x01\x16\x14\x07\x01\x06\"/\x01	\x01\x04&\"\x06\x14\x1626\x01\xf4\x02\xaa\x08\x08\xfe0\x08\x14\x08\xfdV\x01\x0f\n\x03\x06\x02\xaa\x08\x08\xfe0\x08\x14\x088\x01\xa8\xfdD\xfe\xd3;S;;S;\x04\xb0\xfdV\x08\x14\x08\xfe0\x08\x08\x02\xaa\x01\xdb\n\x0f\xfdV\x08\x14\x08\xfe0\x08\x088\x01\xaa\x02\xbc\xcd;;T;;\x00\x00\x00\x00\x01\x00d\x00\x00\x04\xb0\x04\xb0\x00&\x00\x00\x01!2\x15\x11\x14\x0f\x01\x06&5\x114&#!\"\x0f\x01\x06\x163!2\x16\x15\x11\x14\x06#!\"&5\x114?\x016\x01,\x039K\x12@\x08\n\x0f\n\xfdD\x19\x12@\x08\x05\n\x02\xbc\n\x0f\x0f\n\xfc\xae\n\x0f\x12\x8b\x12\x04\xb0K\xfc|\x19\x12@\x08\x05\n\x03\xb6\n\x0f\x12@\x08\n\x0f\n\xfcJ\n\x0f\x0f\n\x03\xcf\x19\x12\x8b\x12\x00\x00\x00\x01\x00\xc8\xff\xff\x04L\x04\xb0\x00\n\x00\x00\x13!2\x16\x15\x11	\x01\x1146\xfa\x03 \x15\x1d\xfe>\xfe>\x1d\x04\xb0\x1d\x15\xfb\x82\x01\xbc\xfeC\x04\x7f\x15\x1d\x00\x00\x00\x00\x03\x00\x00\x00\x00\x04\xb0\x04\xb0\x00\x15\x00E\x00U\x00\x00\x01!\"\x06\x07\x03\x06\x1f\x01\x1e\x013!26?\x016'\x03.\x01\x01#\"\x06\x0f\x01\x0e\x01#!\"&/\x01.\x01+\x01\"\x06\x15\x11\x14\x16;\x0126=\x01463!2\x16\x1d\x01\x14\x16;\x01265\x114&\x01!\"\x06\x0f\x01\x06\x163!26/\x01.\x01\x036\xfeD\x0b\x10\x01N\x07\x0e9\x06\x17\n\x01\xc2\n\x17\x06>\x0e\x07S\x01\x10\x01V\x96\n\x16\x04N\x04\x16\n\xfd\xda\n\x16\x04N\x04\x16\n\x96\n\x0f\x0f\n\x96\n\x0f\x0f\n\x02\xee\n\x0f\x0f\n\x96\n\x0f\x0f\xfe\xb1\xfe\x0c\n\x13\x02&\x02\x0b\n\x02X\n\x0b\x02&\x02\x13\x04\xb0\x0f\n\xfe\xd3\x18\x15l	\x0c\x0c	l\x15\x18\x01-\n\x0f\xfep\x0d	\x9c	\x0d\x0d	\x9c	\x0d\x0f\n\xfdv\n\x0f\x0f\n\x96\n\x0f\x0f\n\x96\n\x0f\x0f\n\x02\x8a\n\x0f\xfd\xa8\x0e\n\x98\n\x0e\x0e\n\x98\n\x0e\x00\x00\x00\x00\x04\x00\x00\x00d\x04\xb0\x04L\x00\x1d\x00!\x00)\x001\x00\x00\x0132\x1e\x02\x1f\x0132\x16\x15\x11\x14\x06#!\"&5\x1146;\x01>\x04\x01\x1535\x04\"\x06\x14\x16264$2\x16\x14\x06\"&4\x01\xf4\xc88]4$\x07\x06\x96);;)\xfc\x18);;)\x96\x02	'3]\x01\xc8d\xfe\xcf\xbe\x87\x87\xbe\x87\xfe\xefV<<V<\x04L);;\x15\x14;)\xfd\xa8);;)\x02X);\x08\x1bE5+\xfe\xd4ddF\x87\xbe\x87\x87\xbe\x08<V<<V\x00\x00\x00\x00\x02\x005\x00\x00\x04\xb0\x04\xaf\x00 \x00#\x00\x00	\x01\x16\x17\x1e\x01\x1f\x01\x15!526/\x01!\x06\x07\x06\x1e\x023\x15!567>\x01?\x01\x01\x03!\x03\x02\xa9\x01\x81\x14(\x12%	\n\xfe_5,\x11R\xfey:\"\x0b	*2\x1e\xfe\x938\x1c\x0c\x1a\x07\x07\x01\x8f\xac\x01T\xa2\x04\xaf\xfc\x1a2*\x13\x15\x01\x02BBW-\xde\x91Y\".\x1c\x0cBB\x18\x1c\x0c%\x0d\x0d\x03\xee\xfdZ\x01\xc9\x00\x00\x00\x00\x03\x00d\x00\x00\x03\xf0\x04\xb0\x00'\x002\x00;\x00\x00\x01\x1e\x06\x15\x14\x0e\x03#!5>\x015\x114.\x04'5\x052\x1e\x02\x15\x14\x0e\x02\x07%32654.\x02+\x01\x1132654&+\x01\x02\xf1\x05\x1350;*\x1d7Xml0\xfe\x0c);\x01\x06\x0b\x17!\x1a\x01\xd79uc>\x1f--\x10\xfe\x8f\x8bNi\x11*S>v\xd8PR}^\x9f\x02\x81\x01\x07\x18\x1d3:R.CuN7\x1aY\x073(\x03;\x18\x14\x1c\x0b\x10	\x07G\x01)IsC3[:+	1aJ);4\x1b\xfc\xaeePZ\x81\x00\x00\x01\x00\xc8\x00\x00\x03o\x04\xb0\x00\x19\x00\x00\x01\x17\x0e\x01\x07\x03\x06\x16\x17\x15!567\x1364.\x04'&'5\x03m\x02SB\x07\x84	,J\xfe\x0c\xba\x0e\xad\x03\x03\x0f\x0c\x1f\x15\x17\x0d\x06\x04\xb09\x135(\xfc\xb91(\x06aa\x10R\x03@\x11\x1a\x13\x10	\x0b\x06\x07\x03\x029\x00\x00\x00\x00\x02\xff\xb5\x00\x00\x05\x14\x04\xb0\x00%\x00/\x00\x00\x01#4.\x05+\x01\x11\x14\x16\x1f\x01\x15!52>\x035\x11#\"\x0e\x05\x15#\x11!\x05#\x113\x07'3\x11#7\x05\x142\x08\x0b\x19\x13&\x18\x19\xc82\x19\x19\xfep\x04\x0e\"\x1a\x16\xc8\x19\x18&\x13\x19\x0b\x082\x03\xe8\xfb\x9bKK}}KK}\x03\x84\x15 \x15\x0e\x08\x03\x01\xfc\xae\x16\x19\x01\x02dd\x01\x05	\x15\x0e\x03R\x01\x03\x08\x0e\x15 \x15\x01,\xc8\xfc\xe0\xa7\xa7\x03 \xa7\x00\x02\x00!\xff\xb5\x04\x8f\x04\xb0\x00%\x00/\x00\x00\x01#4.\x05+\x01\x11\x14\x16\x1f\x01\x15!52>\x035\x11#\"\x0e\x05\x15#\x11!\x13\x075!\x15'7\x15!5\x04L2\x08\x0b\x19\x13&\x18\x19\xc82\x19\x19\xfep\x04\x0e\"\x1a\x16\xc8\x19\x18&\x13\x19\x0b\x082\x03\xe8C\xa7\xfc\xe0\xa7\xa7\x03 \x03\x84\x15 \x15\x0e\x08\x03\x01\xfdv\x16\x19\x01\x02dd\x01\x05	\x15\x0e\x02\x8a\x01\x03\x08\x0e\x15 \x15\x01,\xfb\x82}KK}}KK\x00\x04\x00\x00\x00\x00\x04\xb0\x04L\x00\x0f\x00\x1f\x00/\x00?\x00\x00\x13!2\x16\x1d\x01\x14\x06#!\"&=\x0146\x13!2\x16\x1d\x01\x14\x06#!\"&=\x0146\x13!2\x16\x1d\x01\x14\x06#!\"&=\x0146\x13!2\x16\x1d\x01\x14\x06#!\"&=\x01462\x02X\x15\x1d\x1d\x15\xfd\xa8\x15\x1d\x1d\x15\x03\xe8\x15\x1d\x1d\x15\xfc\x18\x15\x1d\x1d\x15\x03 \x15\x1d\x1d\x15\xfc\xe0\x15\x1d\x1d\x15\x04L\x15\x1d\x1d\x15\xfb\xb4\x15\x1d\x1d\x04L\x1d\x15d\x15\x1d\x1d\x15d\x15\x1d\xfe\xd4\x1d\x15d\x15\x1d\x1d\x15d\x15\x1d\xfe\xd4\x1d\x15d\x15\x1d\x1d\x15d\x15\x1d\xfe\xd4\x1d\x15d\x15\x1d\x1d\x15d\x15\x1d\x00\x04\x00\x00\x00\x00\x04\xb0\x04L\x00\x0f\x00\x1f\x00/\x00?\x00\x00\x13!2\x16\x1d\x01\x14\x06#!\"&=\x0146\x03!2\x16\x1d\x01\x14\x06#!\"&=\x0146\x13!2\x16\x1d\x01\x14\x06#!\"&=\x0146\x03!2\x16\x1d\x01\x14\x06#!\"&=\x0146\xfa\x02\xbc\x15\x1d\x1d\x15\xfdD\x15\x1d\x1d\xb3\x04L\x15\x1d\x1d\x15\xfb\xb4\x15\x1d\x1d\xdd\x02\xbc\x15\x1d\x1d\x15\xfdD\x15\x1d\x1d\xb3\x04L\x15\x1d\x1d\x15\xfb\xb4\x15\x1d\x1d\x04L\x1d\x15d\x15\x1d\x1d\x15d\x15\x1d\xfe\xd4\x1d\x15d\x15\x1d\x1d\x15d\x15\x1d\xfe\xd4\x1d\x15d\x15\x1d\x1d\x15d\x15\x1d\xfe\xd4\x1d\x15d\x15\x1d\x1d\x15d\x15\x1d\x00\x04\x00\x00\x00\x00\x04\xb0\x04L\x00\x0f\x00\x1f\x00/\x00?\x00\x00\x015463!2\x16\x1d\x01\x14\x06#!\"&\x015463!2\x16\x1d\x01\x14\x06#!\"&\x135463!2\x16\x1d\x01\x14\x06#!\"&\x015463!2\x16\x1d\x01\x14\x06#!\"&\x01\xf4\x1d\x15\x02X\x15\x1d\x1d\x15\xfd\xa8\x15\x1d\xfep\x1d\x15\x03\xe8\x15\x1d\x1d\x15\xfc\x18\x15\x1d\xc8\x1d\x15\x03 \x15\x1d\x1d\x15\xfc\xe0\x15\x1d\xfe\xd4\x1d\x15\x04L\x15\x1d\x1d\x15\xfb\xb4\x15\x1d\x03\xb6d\x15\x1d\x1d\x15d\x15\x1d\x1d\xfe\xe9d\x15\x1d\x1d\x15d\x15\x1d\x1d\xfe\xe9d\x15\x1d\x1d\x15d\x15\x1d\x1d\xfe\xe9d\x15\x1d\x1d\x15d\x15\x1d\x1d\x00\x00\x04\x00\x00\x00\x00\x04\xb0\x04L\x00\x0f\x00\x1f\x00/\x00?\x00\x00\x13!2\x16\x1d\x01\x14\x06#!\"&=\x0146\x13!2\x16\x1d\x01\x14\x06#!\"&=\x0146\x13!2\x16\x1d\x01\x14\x06#!\"&=\x0146\x13!2\x16\x1d\x01\x14\x06#!\"&=\x01462\x04L\x15\x1d\x1d\x15\xfb\xb4\x15\x1d\x1d\x15\x04L\x15\x1d\x1d\x15\xfb\xb4\x15\x1d\x1d\x15\x04L\x15\x1d\x1d\x15\xfb\xb4\x15\x1d\x1d\x15\x04L\x15\x1d\x1d\x15\xfb\xb4\x15\x1d\x1d\x04L\x1d\x15d\x15\x1d\x1d\x15d\x15\x1d\xfe\xd4\x1d\x15d\x15\x1d\x1d\x15d\x15\x1d\xfe\xd4\x1d\x15d\x15\x1d\x1d\x15d\x15\x1d\xfe\xd4\x1d\x15d\x15\x1d\x1d\x15d\x15\x1d\x00\x08\x00\x00\x00\x00\x04\xb0\x04L\x00\x0f\x00\x1f\x00/\x00?\x00O\x00_\x00o\x00\x7f\x00\x00\x1332\x16\x1d\x01\x14\x06+\x01\"&=\x0146)\x012\x16\x1d\x01\x14\x06#!\"&=\x0146\x0132\x16\x1d\x01\x14\x06+\x01\"&=\x0146)\x012\x16\x1d\x01\x14\x06#!\"&=\x0146\x0132\x16\x1d\x01\x14\x06+\x01\"&=\x0146)\x012\x16\x1d\x01\x14\x06#!\"&=\x0146\x0132\x16\x1d\x01\x14\x06+\x01\"&=\x0146)\x012\x16\x1d\x01\x14\x06#!\"&=\x01462d\x15\x1d\x1d\x15d\x15\x1d\x1d\x01A\x03 \x15\x1d\x1d\x15\xfc\xe0\x15\x1d\x1d\xfe\xe9d\x15\x1d\x1d\x15d\x15\x1d\x1d\x01A\x03 \x15\x1d\x1d\x15\xfc\xe0\x15\x1d\x1d\xfe\xe9d\x15\x1d\x1d\x15d\x15\x1d\x1d\x01A\x03 \x15\x1d\x1d\x15\xfc\xe0\x15\x1d\x1d\xfe\xe9d\x15\x1d\x1d\x15d\x15\x1d\x1d\x01A\x03 \x15\x1d\x1d\x15\xfc\xe0\x15\x1d\x1d\x04L\x1d\x15d\x15\x1d\x1d\x15d\x15\x1d\x1d\x15d\x15\x1d\x1d\x15d\x15\x1d\xfe\xd4\x1d\x15d\x15\x1d\x1d\x15d\x15\x1d\x1d\x15d\x15\x1d\x1d\x15d\x15\x1d\xfe\xd4\x1d\x15d\x15\x1d\x1d\x15d\x15\x1d\x1d\x15d\x15\x1d\x1d\x15d\x15\x1d\xfe\xd4\x1d\x15d\x15\x1d\x1d\x15d\x15\x1d\x1d\x15d\x15\x1d\x1d\x15d\x15\x1d\x00\x00\x06\xff\x9c\x00\x00\x04\xb0\x04L\x00\x03\x00\x13\x00#\x00*\x00:\x00J\x00\x00!#\x11;\x022\x16\x1d\x01\x14\x06+\x01\"&=\x0146\x13!2\x16\x1d\x01\x14\x06#!\"&=\x0146\x05\x075#535\x05!2\x16\x1d\x01\x14\x06#!\"&=\x0146\x13!2\x16\x1d\x01\x14\x06#!\"&=\x0146\x01\x90dd\x96d\x15\x1d\x1d\x15d\x15\x1d\x1d\x15\x01\xf4\x15\x1d\x1d\x15\xfe\x0c\x15\x1d\x1d\xfe\xfa\xa7\xc8\xc8\x01\xc2\x01,\x15\x1d\x1d\x15\xfe\xd4\x15\x1d\x1d\x15\x02X\x15\x1d\x1d\x15\xfd\xa8\x15\x1d\x1d\x04L\x1d\x15d\x15\x1d\x1d\x15d\x15\x1d\xfe\xd4\x1d\x15d\x15\x1d\x1d\x15d\x15\x1d\xfa}KdK\xaf\x1d\x15d\x15\x1d\x1d\x15d\x15\x1d\xfe\xd4\x1d\x15d\x15\x1d\x1d\x15d\x15\x1d\x00\x00\x00\x06\x00\x00\x00\x00\x05\x14\x04L\x00\x0f\x00\x13\x00#\x00*\x00:\x00J\x00\x00\x1332\x16\x1d\x01\x14\x06+\x01\"&=\x0146\x01#\x113\x01!2\x16\x1d\x01\x14\x06#!\"&=\x0146\x053\x15#\x15'7\x05!2\x16\x1d\x01\x14\x06#!\"&=\x0146\x13!2\x16\x1d\x01\x14\x06#!\"&=\x01462d\x15\x1d\x1d\x15d\x15\x1d\x1d\x03gdd\xfc\xae\x01\xf4\x15\x1d\x1d\x15\xfe\x0c\x15\x1d\x1d\x04/\xc8\xc8\xa7\xa7\xfb\xe6\x01,\x15\x1d\x1d\x15\xfe\xd4\x15\x1d\x1d\x15\x02X\x15\x1d\x1d\x15\xfd\xa8\x15\x1d\x1d\x04L\x1d\x15d\x15\x1d\x1d\x15d\x15\x1d\xfb\xb4\x04L\xfe\xd4\x1d\x15d\x15\x1d\x1d\x15d\x15\x1d\xc8dK}}\xaf\x1d\x15d\x15\x1d\x1d\x15d\x15\x1d\xfe\xd4\x1d\x15d\x15\x1d\x1d\x15d\x15\x1d\x00\x00\x00\x00\x02\x00\x00\x00\xc8\x04\xb0\x03\xe8\x00\x0f\x00\x12\x00\x00\x13!2\x16\x15\x11\x14\x06#!\"&5\x1146	\x02K\x02\xee\x1f,,\x1f\xfd\x12\x1f,,\x04\x84\xfe\xd4\x01,\x03\xe8,\x1f\xfdv\x1f,,\x1f\x02\x8a\x1f,\xfdD\x01,\x01,\x00\x03\x00\x00\x00\x00\x04\xb0\x04L\x00\x0f\x00\x17\x00\x1f\x00\x00\x13!2\x16\x15\x11\x14\x06#!\"&5\x1146\x17\x117\x05'\x01\x13\x11\x042\x16\x14\x06\"&4,\x04X\x12\x1a\x1a\x12\xfb\xa8\x12\x1a\x1aJ\xf7\x01*J\x01%\xec\xfc\xd2pNNpN\x04L\x1a\x12\xfc\x0c\x12\x1a\x1a\x12\x03\xf4\x12\x1ad\xfd\x1f\xb6\x83\x9c\x01>\xfe\xe0\x01\xf4tNoOOo\x00\x00\x00\x00\x02\x00\xdb\x00\x05\x046\x04\x91\x00\x16\x00\x1e\x00\x00\x012\x1e\x01\x15\x14\x07\x0e\x01\x0f\x01.\x04'&54>\x02\x16\"\x06\x14\x16264\x02\x88u\xc6sFE\xb266	!^Xm)<Ds\x9f\xb7\xb7\x82\x82\xb7\x82\x04\x91x\xcaus\x8fm\xe9?>\x08!fh\x98H\x84uX\xa3yH\xc3\x82\xb8\x81\x81\xb8\x00\x00\x00\x02\x00\x17\x00\x17\x04\x99\x04\x99\x00\x0f\x00\x17\x00\x00\x002\x1e\x02\x14\x0e\x02\".\x024>\x01\x01\x11\"\x0e\x01\x14\x1e\x01\x01\xe3\xea\xd6\x9b[[\x9b\xd6\xea\xd6\x9b[[\x9b\x01Kt\xc5rr\xc5\x04\x99[\x9b\xd6\xea\xd6\x9b[[\x9b\xd6\xea\xd6\x9b\xfco\x03Vr\xc5\xe8\xc5r\x00\x00\x02\x00u\x00\x03\x03\xdf\x05\x0f\x00\x1a\x005\x00\x00\x01\x1e\x06\x15\x14\x0e\x03\x07.\x0354>\x05\x03\x0e\x02\x17\x1e\x04\x17\x166?\x016&'.\x02'&76#&\x02*\x15IOWN>%3Vp}?T\x9b|J$?LWPI\xbc\x17)(\x03\x01\x1b!1\x1c\x13\x15\x16\x02\x06\x02		\x05\x12)\x0c\x1a \x02\x08\x08\x05\x0fH\x8fuwsu\x87EG\x80^F&\x04\x05:c\x97YE\x87vsxv\x90\xfd\xfe!K\x82:%A'#\x0e\x08\x07\x0c\x10\"\n\x18\x07\x04\x10A)Y\xb6\x0b\x01\x00\x00\x00\x03\x00\x00\x00\x00\x04\xcb\x04l\x00\x0c\x00*\x00/\x00\x00\x017>\x02\x1e\x01\x17\x1e\x01\x0f\x02%!2\x17\x07!\"\x06\x15\x11\x14\x163!26=\x017\x11\x14\x06#!\"&5\x1146	\x01\x077\x01\x03\xe8l\x02\x06\x14\x15\x1d\x0e\x16\n\x05\x06l\xfd\x05\x01\x9027\xbb\xfe\x90);;)\x01\xf4);\xc8\xbb\xa3\xfep\xa5\xb9\xb9\x038\xfe\x96\xa17\x01c\x03\xf5s\x01\x02\x02\x04\x0f\x0e\x16*\x0b\ns\xc8\x0d\xbb;)\xfe\x0c);;)\xb6\xc8\xfe\xb4\xa5\xb9\xb9\xa5\x01\x90\xa5\xb9\xfe\xd7\xfe\x962\xaa\x01c\x00\x02\x00\x00\x00\x00\x04\x93\x04L\x00\x1b\x006\x00\x00\x01!\x06\x07#\"\x06\x15\x11\x14\x163!2657\x15\x14\x06#!\"&5\x1146\x05\x01\x16\x14\x07\x01\x06&'5&\x0e\x03\x07>\x0675>\x01\x01^\x01i\xa44\xc3);;)\x01\xf4);\xc8\xb9\xa5\xfep\xa5\xb9\xb9\x02\x7f\x01S\x08\x08\xfe\xac\x07\x0b\x01\x1a9dTX\x1a\n.9I@F*\x13\x01\x0b\x04L\x926;)\xfe\x0c);;)\x99g\xa5\xb9\xb9\xa5\x01\x90\xa5\xb9\x1b\xfe\xd3\x07\x15\x07\xfe\xce\x06\x04	\xcb\x01\x02\x0d\x160!;bA4\x1d\x14\x07\x01\xd2\n\x05\x00\x00\x00\x00\x02\x00\x00\x00\x00\x04\x9d\x04L\x00\x1d\x005\x00\x00\x01!2\x17\x07!\"\x06\x15\x11\x14\x163!26=\x017\x15\x14\x06#!\"&5\x1146	\x0162\x1f\x01\x16\x14\x07\x01\x06\"/\x01&4?\x0162\x1f\x01\x162\x01^\x01^<C\xb2\xfe\xa3);;)\x01\xf4);\xc8\xb9\xa5\xfep\xa5\xb9\xb9\x01\xca\x01\x8b\x07\x15\x07e\x07\x07\xfd\xed\x07\x15\x07\xf8\x07\x07e\x07\x15\x07o\x08\x14\x04L\x17\xb1;)\xfe\x0c);;)E\xc8\xdb\xa5\xb9\xb9\xa5\x01\x90\xa5\xb9\xfe3\x01\x8b\x07\x07e\x07\x15\x07\xfd\xec\x07\x07\xf8\x07\x15\x07e\x07\x07o\x07\x00\x00\x00\x01\x00\n\x00\n\x04\xa6\x04\xa6\x00;\x00\x00	\x0162\x17\x01\x16\x06+\x01\x153546\x17\x01\x16\x14\x07\x01\x06&=\x01#\x1532\x16\x07\x01\x06\"'\x01&6;\x015#\x15\x14\x06'\x01&47\x016\x16\x1d\x0135#\"&\x01>\x01\x08\x08\x14\x08\x01\x04\x07\x05\n\xaa\xc8\n\x08\x01\x08\x08\x08\xfe\xf8\x08\n\xc8\xaa\n\x05\x07\xfe\xfc\x08\x14\x08\xfe\xf8\x08\x05\n\xaf\xc8\n\x08\xfe\xf8\x08\x08\x01\x08\x08\n\xc8\xaf\n\x05\x03\x96\x01\x08\x08\x08\xfe\xf8\x08\n\xc8\xad\n\x04\x07\xfe\xfc\x07\x15\x07\xfe\xf7\x07\x04\n\xad\xc8\n\x08\xfe\xf8\x08\x08\x01\x08\x08\n\xc8\xad\n\x04\x07\x01	\x07\x15\x07\x01\x04\x07\x04\n\xad\xc8\n\x00\x01\x00\xc8\x00\x00\x03\x84\x04L\x00\x19\x00\x00\x1332\x16\x15\x11\x016\x16\x15\x11\x14\x06'\x01\x11\x14\x06+\x01\"&5\x1146\xfad\x15\x1d\x01\xd0\x0f\x15\x15\x0f\xfe0\x1d\x15d\x15\x1d\x1d\x04L\x1d\x15\xfeJ\x01\xc5\x0e\x08\x15\xfc\x18\x15\x08\x0e\x01\xc5\xfeJ\x15\x1d\x1d\x15\x03\xe8\x15\x1d\x00\x00\x00\x01\x00\x00\x00\x00\x04\xb0\x04L\x00#\x00\x00\x1332\x16\x15\x11\x016\x16\x15\x11\x016\x16\x15\x11\x14\x06'\x01\x11\x14\x06'\x01\x11\x14\x06+\x01\"&5\x11462d\x15\x1d\x01\xd0\x0f\x15\x01\xd0\x0f\x15\x15\x0f\xfe0\x15\x0f\xfe0\x1d\x15d\x15\x1d\x1d\x04L\x1d\x15\xfeJ\x01\xc5\x0e\x08\x15\xfeJ\x01\xc5\x0e\x08\x15\xfc\x18\x15\x08\x0e\x01\xc5\xfeJ\x15\x08\x0e\x01\xc5\xfeJ\x15\x1d\x1d\x15\x03\xe8\x15\x1d\x00\x00\x00\x01\x00\x9d\x00\x19\x04\xb0\x043\x00\x15\x00\x00\x01\x11\x14\x06'\x01\x11\x14\x06'\x01&47\x016\x16\x15\x11\x016\x16\x04\xb0\x15\x0f\xfe0\x15\x0f\xfe\x14\x0f\x0f\x01\xec\x0f\x15\x01\xd0\x0f\x15\x04\x1a\xfc\x18\x15\x08\x0e\x01\xc5\xfeJ\x15\x08\x0e\x01\xe0\x0e*\x0e\x01\xe0\x0e\x08\x15\xfeJ\x01\xc5\x0e\x08\x00\x00\x00\x01\x00\xc8\x00\x16\x043\x046\x00\x0b\x00\x00\x13\x01\x16\x14\x07\x01\x06&5\x1146\xf3\x03.\x12\x12\xfc\xd2\x12\x19\x19\x042\xfe\x0e\x0b\x1e\x0b\xfe\x0e\x0b\x0e\x15\x03\xe8\x15\x0e\x00\x02\x00\xc8\x00d\x03\x84\x03\xe8\x00\x0f\x00\x1f\x00\x00\x1332\x16\x15\x11\x14\x06+\x01\"&5\x1146!32\x16\x15\x11\x14\x06+\x01\"&5\x1146\xfa\xc8\x15\x1d\x1d\x15\xc8\x15\x1d\x1d\x01\xa5\xc8\x15\x1d\x1d\x15\xc8\x15\x1d\x1d\x03\xe8\x1d\x15\xfc\xe0\x15\x1d\x1d\x15\x03 \x15\x1d\x1d\x15\xfc\xe0\x15\x1d\x1d\x15\x03 \x15\x1d\x00\x00\x01\x00\xc8\x00d\x04L\x03\xe8\x00\x0f\x00\x00\x01\x11\x14\x06#!\"&5\x11463!2\x16\x04L\x1d\x15\xfc\xe0\x15\x1d\x1d\x15\x03 \x15\x1d\x03\xb6\xfc\xe0\x15\x1d\x1d\x15\x03 \x15\x1d\x1d\x00\x00\x00\x00\x01\x00\x00\x00\x19\x04\x13\x043\x00\x15\x00\x00\x01\x1146\x17\x01\x16\x14\x07\x01\x06&5\x11\x01\x06&5\x1146\x17\x01\xf4\x15\x0f\x01\xec\x0f\x0f\xfe\x14\x0f\x15\xfe0\x0f\x15\x15\x0f\x02d\x01\xb6\x15\x08\x0e\xfe \x0e*\x0e\xfe \x0e\x08\x15\x01\xb6\xfe;\x0e\x08\x15\x03\xe8\x15\x08\x0e\x00\x00\x01\xff\xfe\x00\x02\x04\xb3\x04O\x00#\x00\x00\x0172\x16\x15\x13\x14\x06#\x07\"&5\x03\x01\x06&5\x03\x01\x06&5\x0346\x17\x01\x0346\x17\x01\x0346\x04\x18d\x14\x1e\x05\x1d\x15d\x15\x1d\x02\xfe1\x0e\x15\x02\xfe2\x0f\x15\x05\x15\x0f\x01\xd2\x02\x15\x0f\x01\xd2\x02\x1d\x04N\x01\x1d\x15\xfc\x18\x15\x1d\x01\x1d\x15\x01\xb5\xfe:\x0f	\x15\x01\xb5\xfe9\x0e	\x14\x03\xe8\x15	\x0f\xfe>\x01\xb6\x14	\x0e\xfe=\x01\xb6\x15\x1d\x00\x00\x01\x01,\x00\x00\x03\xe8\x04L\x00\x19\x00\x00\x0132\x16\x15\x11\x14\x06+\x01\"&5\x11\x01\x06&5\x1146\x17\x01\x1146\x03Rd\x15\x1d\x1d\x15d\x15\x1d\xfe0\x0f\x15\x15\x0f\x01\xd0\x1d\x04L\x1d\x15\xfc\x18\x15\x1d\x1d\x15\x01\xb6\xfe;\x0e\x08\x15\x03\xe8\x15\x08\x0e\xfe;\x01\xb6\x15\x1d\x00\x00\x02\x00d\x00\xc8\x04\xb0\x04H\x00\x0b\x00\x1b\x00\x00	\x01\x16\x06#!\"&7\x0162\x01!2\x16\x1d\x01\x14\x06#!\"&=\x0146\x02\xae\x01\xf5\x0f	\x16\xfb\xee\x16	\x0f\x01\xf5\x0f*\xfd\xf7\x03\xe8\x15\x1d\x1d\x15\xfc\x18\x15\x1d\x1d\x049\xfd\xe4\x0f\x16\x16\x0f\x02\x1c\x0f\xfdH\x1d\x15d\x15\x1d\x1d\x15d\x15\x1d\x00\x01\x00\x88\xff\xfc\x03u\x04J\x00\x05\x00\x00	\x02\x07	\x01\x03u\xfe\xa0\x01`\xc5\xfd\xd8\x02(\x03\x84\xfe\x9f\xfe\x9f\xc6\x02(\x02&\x00\x00\x00\x00\x01\x01;\xff\xfc\x04(\x04J\x00\x05\x00\x00	\x01'	\x017\x04(\xfd\xd9\xc6\x01a\xfe\x9f\xc6\x02#\xfd\xd9\xc6\x01a\x01a\xc6\x00\x02\x00\x17\x00\x17\x04\x99\x04\x99\x00\x0f\x003\x00\x00\x002\x1e\x02\x14\x0e\x02\".\x024>\x01\x05#\"\x06\x1d\x01#\"\x06\x1d\x01\x14\x16;\x01\x15\x14\x16;\x0126=\x01326=\x014&+\x0154&\x01\xe3\xea\xd6\x9b[[\x9b\xd6\xea\xd6\x9b[[\x9b\x01}d\x15\x1d\x96\x15\x1d\x1d\x15\x96\x1d\x15d\x15\x1d\x96\x15\x1d\x1d\x15\x96\x1d\x04\x99[\x9b\xd6\xea\xd6\x9b[[\x9b\xd6\xea\xd6\x9b\xba\x1d\x15\x96\x1d\x15d\x15\x1d\x96\x15\x1d\x1d\x15\x96\x1d\x15d\x15\x1d\x96\x15\x1d\x00\x00\x00\x00\x02\x00\x17\x00\x17\x04\x99\x04\x99\x00\x0f\x00\x1f\x00\x00\x002\x1e\x02\x14\x0e\x02\".\x024>\x01\x01!\"\x06\x1d\x01\x14\x163!26=\x014&\x01\xe3\xea\xd6\x9b[[\x9b\xd6\xea\xd6\x9b[[\x9b\x02E\xfe\x0c\x15\x1d\x1d\x15\x01\xf4\x15\x1d\x1d\x04\x99[\x9b\xd6\xea\xd6\x9b[[\x9b\xd6\xea\xd6\x9b\xfe~\x1d\x15d\x15\x1d\x1d\x15d\x15\x1d\x00\x02\x00\x17\x00\x17\x04\x99\x04\x99\x00\x0f\x003\x00\x00\x002\x1e\x02\x14\x0e\x02\".\x024>\x01\x04\"\x0f\x01'&\"\x0f\x01\x06\x14\x1f\x01\x07\x06\x14\x1f\x01\x162?\x01\x17\x162?\x0164/\x01764/\x01\x01\xe3\xea\xd6\x9b[[\x9b\xd6\xea\xd6\x9b[[\x9b\x01\xe5\x19	xx	\x19	\x8d		xx		\x8d	\x19	xx	\x19	\x8d		xx		\x8d\x04\x99[\x9b\xd6\xea\xd6\x9b[[\x9b\xd6\xea\xd6\x9b\xad	xx		\x8d	\x19	xx	\x19	\x8d		xx		\x8d	\x19	xx	\x19	\x8d\x00\x02\x00\x17\x00\x17\x04\x99\x04\x99\x00\x0f\x00$\x00\x00\x002\x1e\x02\x14\x0e\x02\".\x024>\x01\x01'&\"\x0f\x01\x06\x14\x1f\x01\x1627\x0164/\x01&\"\x07\x01\xe3\xea\xd6\x9b[[\x9b\xd6\xea\xd6\x9b[[\x9b\x01\x15T\x07\x15\x08\x8b\x07\x07\xf2\x07\x15\x07\x01w\x07\x07\x8b\x07\x15\x07\x04\x99[\x9b\xd6\xea\xd6\x9b[[\x9b\xd6\xea\xd6\x9b\xfe1U\x07\x07\x8b\x08\x14\x08\xf1\x08\x08\x01w\x07\x15\x08\x8b\x07\x07\x00\x00\x00\x00\x03\x00\x17\x00\x17\x04\x99\x04\x99\x00\x0f\x00;\x00K\x00\x00\x002\x1e\x02\x14\x0e\x02\".\x024>\x01\x05\"\x0e\x03\x15\x14;\x01\x167>\x0132\x16\x15\x14\x06\x07\"\x0e\x05\x07\x06\x16;\x012>\x0354.\x03\x13#\"\x06\x1d\x01\x14\x16;\x0126=\x014&\x01\xe3\xea\xd6\x9b[[\x9b\xd6\xea\xd6\x9b[[\x9b\x01?\x1d<B2!\x14\x83\x1e\x05\x06\x1d\x1f\x14\x17\x0e\x13\x01\x19\x0e\x1a\x12\x13\x0c\x02\x01\x0d\x0e\xad\x07\x1e(#\x18\"3D<:\x96\n\x0f\x0f\n\x96\n\x0f\x0f\x04\x99[\x9b\xd6\xea\xd6\x9b[[\x9b\xd6\xea\xd6\x9b\x91\x0b\x1e/O2\x19\x05\x10\x14\x10\x15\x12\x17\x16\x07\x08\x07\x0e\x14\x1c*\x19\x08\x11\x10(8\\6/H*\x1b	\xfd\xe3\x0f\n\x96\n\x0f\x0f\n\x96\n\x0f\x00\x00\x03\x00\x17\x00\x17\x04\x99\x04\x99\x00\x0f\x00\x1f\x00>\x00\x00\x002\x1e\x02\x14\x0e\x02\".\x024>\x01\x05#\"\x06\x1d\x01\x14\x16;\x0126=\x014&\x03#\"\x06\x1d\x01\x14\x16;\x01\x15#\"\x06\x1d\x01\x14\x163!26=\x014&+\x01\x114&\x01\xe3\xea\xd6\x9b[[\x9b\xd6\xea\xd6\x9b[[\x9b\x01\x96\x96\n\x0f\x0f\n\x96\n\x0f\x0f\n\xfa\n\x0f\x0f\nKK\n\x0f\x0f\n\x01^\n\x0f\x0f\nK\x0f\x04\x99[\x9b\xd6\xea\xd6\x9b[[\x9b\xd6\xea\xd6\x9bV\x0f\n\x96\n\x0f\x0f\n\x96\n\x0f\xfe\xd4\x0f\n2\n\x0f\xc8\x0f\n2\n\x0f\x0f\n2\n\x0f\x01\x13\n\x0f\x00\x02\x00\x00\x00\x00\x04\xb0\x04\xb0\x00/\x00_\x00\x00\x0132\x16\x1d\x01\x1e\x01\x1732\x16\x1d\x01\x14\x06+\x01\x0e\x01\x07\x15\x14\x06+\x01\"&=\x01.\x01'#\"&=\x0146;\x01>\x017546\x13\x15\x14\x06+\x01\"&=\x01\x0e\x01\x0732\x16\x1d\x01\x14\x06+\x01\x1e\x01\x17546;\x012\x16\x1d\x01>\x017#\"&=\x0146;\x01.\x01\x02\x0d\x96\n\x0fg\x97\x1b\xc2\n\x0f\x0f\n\xc2\x1b\x97g\x0f\n\x96\n\x0fg\x97\x1b\xc2\n\x0f\x0f\n\xc2\x1b\x97g\x0f\xb9\x0f\n\x96\n\x0fDf\x17\xa8\n\x0f\x0f\n\xa8\x17fD\x0f\n\x96\n\x0fDf\x17\xa8\n\x0f\x0f\n\xa8\x17f\x04\xb0\x0f\n\xc2\x1b\x97g\x0f\n\x96\n\x0fg\x97\x1b\xc2\n\x0f\x0f\n\xc2\x1b\x97g\x0f\n\x96\n\x0fg\x97\x1b\xc2\n\x0f\xfe\xcd\xa8\n\x0f\x0f\n\xa8\x17fD\x0f\n\x96\n\x0fDf\x17\xa8\n\x0f\x0f\n\xa8\x17fD\x0f\n\x96\n\x0fDf\x00\x03\x00\x17\x00\x17\x04\x99\x04\x99\x00\x0f\x00\x1b\x00?\x00\x00\x002\x1e\x02\x14\x0e\x02\".\x024>\x01\x04\"\x0e\x01\x14\x1e\x012>\x014&\x07\x17\x16\x14\x0f\x01\x17\x16\x14\x0f\x01\x06\"/\x01\x07\x06\"/\x01&4?\x01'&4?\x0162\x1f\x01762\x01\xe3\xea\xd6\x9b[[\x9b\xd6\xea\xd6\x9b[[\x9b\x01\xbf\xe8\xc5rr\xc5\xe8\xc5rr\x9a@\x07\x07||\x07\x07@\x07\x15\x07||\x07\x15\x07@\x07\x07||\x07\x07@\x07\x15\x07||\x07\x15\x04\x99[\x9b\xd6\xea\xd6\x9b[[\x9b\xd6\xea\xd6\x9b;r\xc5\xe8\xc5rr\xc5\xe8\xc5Z@\x07\x15\x07||\x07\x15\x07@\x07\x07||\x07\x07@\x07\x15\x07||\x07\x15\x07@\x07\x07||\x07\x00\x00\x00\x03\x00\x17\x00\x17\x04\x99\x04\x99\x00\x0f\x00\x1b\x000\x00\x00\x002\x1e\x02\x14\x0e\x02\".\x024>\x01\x04\"\x0e\x01\x14\x1e\x012>\x014&\x07\x17\x16\x14\x07\x01\x06\"/\x01&4?\x0162\x1f\x01762\x01\xe3\xea\xd6\x9b[[\x9b\xd6\xea\xd6\x9b[[\x9b\x01\xbf\xe8\xc5rr\xc5\xe8\xc5rr\x83j\x07\x07\xfe\xc0\x08\x14\x08\xca\x08\x08j\x07\x15\x07O\xc5\x07\x15\x04\x99[\x9b\xd6\xea\xd6\x9b[[\x9b\xd6\xea\xd6\x9b;r\xc5\xe8\xc5rr\xc5\xe8\xc5}j\x07\x15\x07\xfe\xbf\x07\x07\xcb\x07\x15\x07j\x08\x08O\xc5\x07\x00\x00\x00\x03\x00\x17\x00\x17\x04\x99\x04\x99\x00\x0f\x00\x18\x00!\x00\x00\x002\x1e\x02\x14\x0e\x02\".\x024>\x01\x05\"\x0e\x01\x15\x14\x17\x01&\x17\x01\x1632>\x0154\x01\xe3\xea\xd6\x9b[[\x9b\xd6\xea\xd6\x9b[[\x9b\x01Kt\xc5rA\x02Ki\xf5\xfd\xb8hst\xc5r\x04\x99[\x9b\xd6\xea\xd6\x9b[[\x9b\xd6\xea\xd6\x9b;r\xc5txi\x02KA\xd0\xfd\xb8>r\xc5ts\x00\x00\x00\x00\x01\x00\x17\x00S\x04\xb0\x03\xf9\x00\x15\x00\x00\x13\x016\x16\x15\x11!2\x16\x1d\x01\x14\x06#!\x11\x14\x06'\x01&4'\x02\n\x10\x17\x02&\x15\x1d\x1d\x15\xfd\xda\x17\x10\xfd\xf6\x10\x02F\x01\xab\x0d\n\x15\xfe\xdd\x1d\x15\xc8\x15\x1d\xfe\xdd\x15\n\x0d\x01\xab\x0d&\x00\x00\x00\x00\x01\x00\x00\x00S\x04\x99\x03\xf9\x00\x15\x00\x00	\x01\x16\x14\x07\x01\x06&5\x11!\"&=\x01463!\x1146\x02\x7f\x02\n\x10\x10\xfd\xf6\x10\x17\xfd\xda\x15\x1d\x1d\x15\x02&\x17\x03\xf1\xfeU\x0d&\x0d\xfeU\x0d\n\x15\x01#\x1d\x15\xc8\x15\x1d\x01#\x15\n\x00\x00\x00\x01\x00\xb7\x00\x00\x04]\x04\x99\x00\x15\x00\x00	\x01\x16\x06#!\x11\x14\x06+\x01\"&5\x11!\"&7\x0162\x02\xaa\x01\xab\x0d\n\x15\xfe\xdd\x1d\x15\xc8\x15\x1d\xfe\xdd\x15\n\x0d\x01\xab\x0d&\x04\x89\xfd\xf6\x10\x17\xfd\xda\x15\x1d\x1d\x15\x02&\x17\x10\x02\n\x10\x00\x00\x00\x01\x00\xb7\x00\x17\x04]\x04\xb0\x00\x15\x00\x00\x0132\x16\x15\x11!2\x16\x07\x01\x06\"'\x01&63!\x1146\x02&\xc8\x15\x1d\x01#\x15\n\x0d\xfeU\x0d&\x0d\xfeU\x0d\n\x15\x01#\x1d\x04\xb0\x1d\x15\xfd\xda\x17\x10\xfd\xf6\x10\x10\x02\n\x10\x17\x02&\x15\x1d\x00\x00\x01\x00\x00\x00\xb7\x04\x99\x04]\x00\x17\x00\x00	\x01\x16\x14\x07\x01\x06&5\x11\x0e\x03\x07>\x047\x1146\x02\x7f\x02\n\x10\x10\xfd\xf6\x10\x17^\xb0\xa5\x81$\x05,[\x87\xc7~\x17\x04U\xfeU\x0d&\x0d\xfeU\x0d\n\x15\x01#\x02$DuMi\xb1\x9dqF\x07\x01\x06\x15\n\x00\x02\x00\x00\x00\x00\x04\xb0\x04\xb0\x00\x15\x00+\x00\x00\x01!2\x16\x15\x11\x14\x06/\x01\x07\x06\"/\x01&4?\x01'&6\x01!\"&5\x1146\x1f\x01762\x1f\x01\x16\x14\x0f\x01\x17\x16\x06\x03R\x01,\x15\x1d\x15\x0e^\xf9\x08\x14\x08j\x07\x07\xf9^\x0e\x08\xfe!\xfe\xd4\x15\x1d\x15\x0e^\xf9\x08\x14\x08j\x07\x07\xf9^\x0e\x08\x04\xb0\x1d\x15\xfe\xd4\x15\x08\x0e^\xf9\x07\x07j\x08\x14\x08\xf9^\x0e\x15\xfbP\x1d\x15\x01,\x15\x08\x0e^\xf9\x07\x07j\x08\x14\x08\xf9^\x0e\x15\x00\x00\x00\x02\x00I\x00I\x04g\x04g\x00\x15\x00+\x00\x00\x01\x17\x16\x14\x0f\x01\x17\x16\x06#!\"&5\x1146\x1f\x01762\x01!2\x16\x15\x11\x14\x06/\x01\x07\x06\"/\x01&4?\x01'&6\x03\xf6j\x07\x07\xf9^\x0e\x08\x15\xfe\xd4\x15\x1d\x15\x0e^\xf9\x08\x14\xfd\x0c\x01,\x15\x1d\x15\x0e^\xf9\x08\x14\x08j\x07\x07\xf9^\x0e\x08\x04`j\x08\x14\x08\xf9^\x0e\x15\x1d\x15\x01,\x15\x08\x0e^\xf9\x07\xfd\xf1\x1d\x15\xfe\xd4\x15\x08\x0e^\xf9\x07\x07j\x08\x14\x08\xf9^\x0e\x15\x00\x00\x00\x00\x03\x00\x17\x00\x17\x04\x99\x04\x99\x00\x0f\x00\x1f\x00/\x00\x00\x002\x1e\x02\x14\x0e\x02\".\x024>\x01\x05#\"\x06\x17\x13\x1e\x01;\x01267\x136&\x03#\"\x06\x1d\x01\x14\x16;\x0126=\x014&\x01\xe3\xea\xd6\x9b[[\x9b\xd6\xea\xd6\x9b[[\x9b\x01\xb3\xd0\x14\x18\x04:\x04#\x146\x14#\x04:\x04\x181\x96\n\x0f\x0f\n\x96\n\x0f\x0f\x04\x99[\x9b\xd6\xea\xd6\x9b[[\x9b\xd6\xea\xd6\x9b\xba\x1d\x14\xfe\xd2\x14\x1d\x1d\x14\x01.\x14\x1d\xfe\x0c\x0f\n\x96\n\x0f\x0f\n\x96\n\x0f\x00\x00\x00\x00\x05\x00\x00\x00\x00\x04\xb0\x04\xb0\x00I\x00U\x00a\x00h\x00o\x00\x00\x012\x16\x1f\x01\x16\x1f\x01\x16\x17\x1676?\x0167632\x16\x1f\x01\x16\x1f\x02\x1e\x01;\x012\x16\x1d\x01\x14\x06+\x01\"\x06\x1d\x01!\x11#\x11!54&+\x01\"&=\x0146;\x012654?\x0167>\x04\x05\x07\x06\x16;\x0126/\x01.\x01\x05'&\x06\x0f\x01\x06\x16;\x0126\x13!\"&5\x11)\x01\x11\x14\x06#!\x11\x01\x04	\x14\x05\x05\x16\x16\xc4\x15\x0f\x1d\x08\x0b&\xc4\x16\x17\x11\x15\x170\x0d\x0d\x0e\x04\x19\x08\x01\x0f\n=\n\x0f\x0f\n2\n\x0f\xfep\xc8\xfep\x0f\n2\n\x0f\x0f\n=\x0b\x0e	\x19\x05\x0e\x02\x06\x15\x16\x1f\x02\x9d\xa6\x07\x04\n\xdb\n\n\x033\x03\x10\xfe5\xb1\x08\x10\x033\x03\n\n\xe7\x0b\x03\x1e\xfe\x89\n\x0f\x01\x90\x02X\x0f\n\xfe\x89\x04\xb0\x04\x02\x02\n\x0dv\x0d\x0b\x15	\x0d\x16v\x0d\n\x07!\x11\x10\x15\x18{,	\x0b\x0f\n2\n\x0f\x0f\n\xaf\x01,\xfe\xd4\xaf\n\x0f\x0f\n2\n\x0f\x06\x05\x040\x80\x19\x14\x03\x08\x16\x11\x0ey\xa2\x07\n\x0e\n\x95\n\x04\xaa\x9d\x07\x04\n\x8f\n\x0e\n\xfcr\x0f\n\x01w\xfe\x89\n\x0f\x01\x90\x00\x00\x00\x00\x02\x00\x00\x00\x0c\x04\xaf\x04\xa6\x00+\x00I\x00\x00\x016\x16\x15\x06\x02\x0e\x04.\x01'&\x07&\x0e\x01\x0f\x01\x06&547>\x017>\x01'.\x01>\x017>\x06\x17&\x06\x07\x0e\x01\x0f\x01\x0e\x04\x07\x0e\x01\x1667>\x027>\x037>\x01\x04\x8d\x08\x1a\x02-Bla\x8bb\x8eD8=\x11\x04\x113\x1b\x99\x1a\x16*\x08U\x18\x13 \x03	\x02\x10:1'Ra\\\x87{\xc0%\x08\x1d\x1f&\xa2=>8\\tYR\x17\x18\x0e\x12-!\x19\x8aq[Fak[)\x16\x04\x04\xa6\x03\x13\x08\xb2\xfe\xdd\xc8\x95X1\x11\x08\x0b\x0b\x0c\x01\x01\x02\x1b\x1b\x99\x18\x13\"@&\x08J\x15\x11<\x1f7_\x7f\x85?3J5%#\x1b/D	\x18&/q!!\x1e6ROg58<\x04'(\x1e[@1%@_\x7fU2\x14\x00\x01\x00]\x00\x1e\x04r\x04\xcf\x00O\x00\x00\x01\x0e\x01\x1e\x04\x17.\x07>\x017\x1e\x03\x06\x07\x0e\x04\x07\x06'&767>\x04.\x01'\x16\x0e\x03&'.\x01'&>\x047\x06\x1e\x037>\x01.\x02'&>\x03\x02\x8d'\x1f\n'8GB \x04\x1b\n\x18\n\x10\x03\x01	\x12\x0e`\x8aH \x06\x10\x0d>JS>\x16H7\x1f\x12\x06\x0b\x0d'+\"	\x16NA\n\x155M[`/Pg\x02\x02\x04\x05\x16!;(\x08\x06\x1d'2\x18\x1f\x0f\x18\"&\x07\x0f\"IbY\x04\xcfC\x80e\\D9$\x0c\x078\x178\x1e6#1%)\x12*\x83\x91\xa7\x97J7gG: \x06\x16\x0b\x06\x0d\x03\x04\x05 8G\\au9h\xaaoK\x1d\x07\x15$\x9c]\x1754<<E\"5cQ8\x16	\x0d.@AU!U\x99hQ)\x00\x00\x00\x00\x03\xff\xdc\x00j\x04\xd4\x04F\x00\x1b\x00?\x00Q\x00\x00\x002\x1e\x05\x14\x0e\x05\".\x054>\x04\x05&\x06\x17\x16\x15\x14\x06\"&5476&\x07\x06\x07\x0e\x01\x17\x1e\x042>\x0376&'&\x05\x07\x0e\x01\x17\x16\x17\x166?\x016&'&'.\x01\x02\x06\xa4\x9d{nO9\x1c\x1c:On{\x9d\xa2\x9d{nO:\x1c\x1c9On{\x02\x0f\x0f\x06\x08\x19\xb0\xf8\xb0\x17\x08\x07\x0eFZ\x0d\x04\x0b\x162Z_\x83\x88\x83_Z2\x16\x0b\x04\x0cZ\xfd\xff#\x0f		%8\x10-\x0e#\x0e\x03\x0f,-\x0b\"\x04F-I\\b\\I*I\\b\\I--I\\b\\I*I\\b\\I\xdc\x0f\x06\x139>|\xb0\xb0|;7\x13\x06\x0fEs\x101\x12$F^D10E^E$\x121\x11u\x1e$\x0f/\x12D0\x0d\x04\x0f\"\x0f%\x0f,I\x12\x04\x00\x00\x00\x04\xff\xdc\x00\x00\x04\xd4\x04\xb0\x00\x14\x00'\x00;\x00L\x00\x00!#7.\x0454>\x0532\x1773\x137\x1e\x01\x15\x14\x0e\x03\x077>\x0176&'&%\x06\x07\x0e\x01\x17\x1e\x04\x177.\x015476&\x17\x07\x0e\x01\x17\x16\x17\x166?\x02'&'.\x01\x02P\x94\x1f[\xa9vY,\x1c9On{\x9dR=A \x94&/l\x89'Pj\x98R.Mv&\x0b\x04\x0c6\xfdQFZ\x0d\x04\x0b\x12*HLh5)k\x8f\x17\x08\x07|#\x0f		%8\x10-\x0e\x0c\x16\x03,-\x0b\"x\x14atzb\x1b\x15I\\b\\I-\x0fy\xfeR\xb5U\xd64\x1aZrnc\x1a\xad1\x88?\x121\x11FrEs\x101\x12\x1e<QA9\x0d\x9a\x12\xa7n;7\x13\x06p$\x0f/\x12D0\x0d\x04\x0f\x0bV\x04,I\x12\x04\x00\x00\x00\x03\xff\x9e\x00\x00\x05\x12\x04\xab\x00\x0b\x00\x18\x00(\x00\x00'\x016\x16\x17\x01\x16\x06#!\"&%!546;\x012\x16\x1d\x01!\x01\x0732\x16\x0f\x01\x0e\x01+\x01\"&/\x01&6Z\x02\x82\x148\x14\x02\x82\x15\x1b%\xfa\xf2%\x1b\x01\n\x01Y\x0f\n\x96\n\x0f\x01Y\xfeCh\xd0\x14\x18\x04:\x04#\x146\x14#\x04:\x04\x18d\x04*\x1f\x05!\xfb\xe0 GD\x84K\n\x0f\x0f\nK\x02\xd3\xdf\x1d\x14\xfc\x14\x1d\x1d\x14\xfc\x14\x1d\x00\x00\x00\x01\x00d\x00\x15\x04\xb0\x04\xb0\x00(\x00\x00\x002\x16\x15\x11\x01\x1e\x01\x1d\x01\x14\x06'%\x11\x16\x1d\x01\x14\x06/\x01\x07\x06&=\x0147\x11\x05\x06&=\x01467\x01\x114\x02L|X\x01k\x0f\x16\x18\x11\xfe\x99d\x1a\x13\xcd\xcd\x13\x1ad\xfe\x99\x11\x18\x16\x0f\x01k\x04\xb0X>\xfe\xad\xfe\xbb\x0e1\x14)\x14\x0d\x0c\xf9\xfe\xf9]\x14@\x15\x10	\x80\x80	\x10\x15@\x14]\x01\x07\xf9\x0c\x0d\x14)\x141\x0e\x01E\x01S>\x00\x00\x00\x11\x00\x00\x00\x00\x04L\x04\xb0\x00\x1d\x00'\x00+\x00/\x003\x007\x00;\x00?\x00C\x00G\x00K\x00O\x00S\x00W\x00[\x00_\x00c\x00\x00\x0132\x16\x1d\x0132\x16\x1d\x01!546;\x01546;\x012\x16\x1d\x01!546\x01\x11\x14\x06#!\"&5\x11\x17\x15353\x15353\x15353\x15353\x1535\x05\x15353\x15353\x15353\x15353\x1535\x05\x15353\x15353\x15353\x15353\x1535\x03Rd\x15\x1d2\x15\x1d\xfb\xb4\x1d\x152\x1d\x15d\x15\x1d\x01\xf4\x1d\x01\x0f\x1d\x15\xfc\x18\x15\x1ddddddddddd\xfc|ddddddddd\xfc|ddddddddd\x04\xb0\x1d\x152\x1d\x15\x96\x96\x15\x1d2\x15\x1d\x1d\x1522\x15\x1d\xfep\xfd\x12\x15\x1d\x1d\x15\x02\xee\xc8dddddddddd\xc8dddddddddd\xc8dddddddddd\x00\x00\x00\x03\x00\x00\x00\x19\x05w\x04\x97\x00\x19\x00%\x007\x00\x00\x01\x17\x16\x14\x0f\x01\x06&=\x01#\x01!\"&=\x0146;\x01\x013546\x01\x07'#\"&=\x01463!\x01\x17\x16\x14\x0f\x01\x06&=\x01#'7\x173546\x04o\xf9\x0f\x0f\xf9\x0e\x15\x9f\xfd\xa8\xfe\xdd\x15\x1d\x1d\x15\xd1\x02X\xf1\x15\xfd\xa9\x8dz\xd1\x15\x1d\x1d\x15\x01#\x03\x1a\xf9\x0f\x0f\xf9\x0e\x15\xf1\xb5\x8dz\x9f\x15\x04\x8d\xe6\x0e*\x0e\xe6\x0e\x08\x15\x96\xfd\xa8\x1d\x15d\x15\x1d\x02X\x96\x15\x08\xfe\x98\x8dz\x1d\x15d\x15\x1d\xfeM\xe6\x0e*\x0e\xe6\x0e\x08\x15\x96\xb5\x8dz\x96\x15\x08\x00\x00\x00\x01\x00\x00\x00\x00\x04\xb0\x04L\x00\x12\x00\x00\x13!2\x16\x15\x11\x14\x06#!\x01\x11#\"&5\x1146d\x03\xe8);;)\xfd\xac\xfe\xd0d);;\x04L;)\xfd\xa8);\xfe\xd4\x01,;)\x02X);\x00\x00\x00\x03\x00d\x00\x00\x04L\x04\xb0\x00	\x00\x13\x00?\x00\x00\x1332\x16\x1d\x01!546!32\x16\x1d\x01!546\x01\x11\x14\x0e\x05\".\x055\x11!\x15\x14\x15\x1c\x01\x1e\x062>\x06&54=\x01\x96\xc8\x15\x1d\xfe\xd4\x1d\x02\xd1\xc8\x15\x1d\xfe\xd4\x1d\x01\x0f\x06\x18(Lf\x9c\xc0\x9cfL(\x18\x06\x01,\x03\x07\x0d\x14\x1f'6B6'\x1f\x13\x0f\x05\x05\x01\x04\xb0\x1d\x15\xfa\xfa\x15\x1d\x1d\x15\xfa\xfa\x15\x1d\xfep\xfe\xd4)IjV\\>((>\\VjI)\x01,\xfa	\x12\x15+'%!\x1b\x16\x10\x08	\x10\x17\x1c!%'*\x15\x11\x08\xfa\x00\x00\x00\x01\xff\xff\x00\xd4\x04L\x03\xc2\x00\x05\x00\x00\x01\x07	\x01'\x01\x04L\xc6\xfe\x9f\xfe\x9f\xc5\x02'\x01\x9b\xc7\x01a\xfe\x9f\xc7\x02'\x00\x01\x00\x00\x00\xee\x04M\x03\xdc\x00\x05\x00\x00	\x027	\x01\x04M\xfd\xda\xfd\xd9\xc6\x01a\x01a\x03\x15\xfd\xd9\x02'\xc7\xfe\x9f\x01a\x00\x00\x00\x00\x02\xffQ\x00d\x05_\x03\xe8\x00\x14\x00)\x00\x00\x01!2\x16\x15\x1132\x16\x0f\x01\x06\"/\x01&6;\x01\x11!%\x17\x16\x06+\x01\x11!\x17!\"&5\x11#\"&?\x0162\x01\x94\x02\xea\x15\x1d\x96\x15\x08\x0e\xe6\x0e*\x0e\xe6\x0e\x08\x15\x96\xfe\x83\xfe\x1c\xe6\x0e\x08\x15\x96\x01\x81\xd7\xfd\x12\x15\x1d\x96\x15\x08\x0e\xe6\x0e*\x03\xe8\x1d\x15\xfd\xd9\x15\x0e\xf9\x0f\x0f\xf9\x0e\x15\x01\x91\xb8\xf9\x0e\x15\xfep\xc8\x1d\x15\x02&\x15\x0e\xf9\x0f\x00\x00\x01\x00\x06\x00\x00\x04\x9e\x04\xb0\x000\x00\x00\x1332\x16\x1f\x01!2\x16\x07\x03\x0e\x01#!\x17!2\x16\x14\x06+\x01\x15\x14\x06\"&=\x01!\x15\x14\x06\"&=\x01#\"&/\x01\x03#\"&468^\x11\x1c\x04&\x03\x80\x18\x1e\x05d\x05,!\xfd\x870\x02\x17\x15\x1d\x1d\x152\x1d*\x1d\xfe\xd4\x1d*\x1d\x1f\x12\x1d\x06\x05\xc96\x14\x1e\x1e\x04\xb0\x16\x10\xa2%\x18\xfe%\x15+\xc8\x1d*\x1d2\x15\x1d\x1d\x1522\x15\x1d\x1d\x152\x14	\n\x03\xc1\x1d*\x1d\x00\x00\x00\x00\x02\x00\x00\x00\x00\x04\xb0\x04L\x00\x0b\x00\x0f\x00\x00\x01\x15!53463!2\x16\x15\x05!\x11!\x04\xb0\xfbP\xc8;)\x01,);\xfdD\x04\xb0\xfbP\x03\xe8dd);;)\xc8\xfc\xe0\x00\x02\x00\x00\x00\x00\x05\xdc\x04L\x00\x0c\x00\x10\x00\x00\x13\x03\x113463!2\x16\x15!\x15\x05\x01!\x01\xc8\xc8\xc8;)\x01,*:\x01\xf4\x01,\xfe\xd4\xfbP\x01,\x03 \xfep\x02X);;)\xc8d\xfdD\x02\xbc\x00\x01\x01E\x00\x00\x03k\x04\xaf\x00\x1b\x00\x00\x01\x17\x16\x06+\x01\x1132\x16\x0f\x01\x06\"/\x01&6;\x01\x11#\"&?\x0162\x02{\xe6\x0e\x08\x15\x96\x96\x15\x08\x0e\xe6\x0e*\x0e\xe6\x0e\x08\x15\x96\x96\x15\x08\x0e\xe6\x0e*\x04\xa0\xf9\x0e\x15\xfd\xa7\x15\x0e\xf9\x0f\x0f\xf9\x0e\x15\x02Y\x15\x0e\xf9\x0f\x00\x00\x00\x01\x00\x01\x01D\x04\xaf\x03k\x00\x1b\x00\x00\x01\x17\x16\x14\x0f\x01\x06&=\x01!\x15\x14\x06/\x01&4?\x016\x16\x1d\x01!546\x03\xa8\xf9\x0e\x0e\xf9\x0f\x15\xfd\xa8\x15\x0f\xf9\x0e\x0e\xf9\x0f\x15\x02X\x15\x03`\xe5\x0f)\x0f\xe5\x0f	\x14\x97\x97\x14	\x0f\xe5\x0f)\x0f\xe5\x0f	\x15\x95\x95\x15	\x00\x00\x00\x04\x00\x00\x00\x00\x04\xb0\x04\xb0\x00	\x00\x19\x00\x1d\x00!\x00\x00\x01\x03.\x01#!\"\x06\x07\x03\x05!\"\x06\x1d\x01\x14\x163!26=\x014&\x0553\x15353\x15\x04\x91\xac\x05$\x14\xfd`\x14$\x05\xac\x04-\xfc\x18);;)\x03\xe8);;\xfe\xabddd\x01\x90\x02\xdc\x17-(\x15\xfd\x1dd;)d);;)d);\xc8dddd\x00\x00\x00\x03\xff\x9c\x00d\x04\xb0\x04L\x00\x0b\x00#\x001\x00\x00\x002\x16\x15\x11\x14\x06\"&5\x114\x03%#\x13\x16\x06#\"+\x01\"&'\x02=\x01454>\x01;\x01%\x01\x15\".\x03=\x014>\x027\x04i*\x1d\x1d*\x1dd\xfd]&/\x03\x11\x15\x05\x02T\x14\x1d\x047\x02\x0b\x0c\xc8\x02\xa3\xfc\x18\x04\x0e\"\x1a\x16\x15\x1d\x1d\x0b\x04L\x1d\x15\xfc\xae\x15\x1d\x1d\x15\x03R\x15\xfc\x99\xc8\xfe\xec\x10\x08\x1c\x15\x01Q\x0e\xfa\x02\x04\x10\x0f\x0d\xfa\xfe\xd4\xfa\x01\x0b\x13)\x1c2\x1a(\x14\x0c\x01\x00\x00\x00\x02\x00J\x00\x00\x04f\x04\xb0\x00,\x005\x00\x00\x0132\x16\x0f\x01\x1e\x01\x17\x13\x1732\x16\x14\x06\x07\x0e\x04#\".\x04/\x01.\x0146;\x017\x13>\x017'&6\x03\x16327\x0e\x01\"&\x02)^\x14\x12\x06\x12Sz\x0f?v\x11\x13\x1c\x1a\x12\x08\x1edj\x9fO9t\\U>/\x0c\x0b\x12\x1a\x1c\x13\x11v?\x0fzS\x12\x06\x13$2451\x0c7F8\x04\xb0\x15\x13%\x13\x7fM\xfe\xb9\xad\x1d)(\x07\x04\x0b\x1c\x16\x12\n\x0e\x11\x12\x0e\x05\x04\x08()\x1d\xad\x01GM~\x14 \x13\x1a\xfb\xbe\x06\x061==\x00\x01\x00\x14\x00\x14\x04\x9c\x04\x9c\x00\x17\x00\x00\x017\x07\x17\x07\x17\x07\x17'\x07'\x07'\x077'7'7'\x177\x177\x03 \xe0N\xea\xb4\xb4\xeaN\xe0-\x9b\x9b-\xe0N\xea\xb4\xb4\xeaN\xe0-\x9b\x9b\x03\xb2N\xe0-\x9b\x9b-\xe0N\xea\xb4\xb4\xeaN\xe0-\x9b\x9b-\xe0N\xea\xb4\xb4\x00\x03\x00\x00\x00d\x04\xb0\x04\xb0\x00!\x00-\x00=\x00\x00\x0132\x16\x1d\x01\x07!2\x16\x1d\x01\x14\x07\x03\x0e\x01+\x01\"&/\x01#\"&5\x114?\x02>\x01\x17\x0f\x01\x113\x173\x135!75\x0132\x16\x15\x11\x14\x06+\x01\"&5\x1146\x02\x8a2(<\x1c\x01H(<\x1d\xee\x10,\x17\xfa\x07F\x1f\x1f=-7\x14\x91`\x0d1\x1bd\x96d\x88\xd6\xfa\xfe>2\xfdvd\x15\x1d\x1d\x15d\x15\x1d\x1d\x04\xb0Q,\x96}Q,d-\x1d\xfe\xa8\x18!2\x19\x19$'\x01\x90$\x1b\xc4\xc6\x1c(d\xd4\xd5\xfe\x89d\x01w}\xe1\xaf\xfe\xd4\x1d\x15\xfe\x0c\x15\x1d\x1d\x15\x01\xf4\x15\x1d\x00\x00\x00\x00\x03\x00\x00\x00\x00\x04\xb0\x04L\x00 \x000\x00<\x00\x00\x0132\x16\x17\x13\x16\x1d\x01\x14\x06#!\x16\x1d\x01\x14\x06+\x01\"&/\x02&5\x1146;\x016\x0532\x16\x15\x11\x14\x06+\x01\"&5\x1146!\x07#\x11\x1f\x0135'!5\x03\x02X\xfa\x17,\x10\xee\x1d<(\xfe\xb8\x1c<(2\x1b1\x0d`\x91\x147-=|\xfd\xe9d\x15\x1d\x1d\x15d\x15\x1d\x1d\x02_\x88d\x96d22\x01\xc2\xfa\x04L!\x18\xfe\xa8\x1d-d,Qv\x07\x96,Q(\x1c\xc6\xc4\x1b$\x01\x90'$dd\x1d\x15\xfe\x0c\x15\x1d\x1d\x15\x01\xf4\x15\x1dd\xfe\x89\xd5\xd4\xaf\xe1}\x01w\x00\x03\x00\x00\x00d\x05\x0e\x04O\x00\x1b\x007\x00G\x00\x00\x01%6\x1f\x01\x1e\x01\x0f\x01!2\x16\x14\x06+\x01\x03\x0e\x01#!\"&5\x11467\x17\x11\x17!\x13>\x01;\x0126&#!*\x03.\x04'&?\x01'\x0532\x16\x15\x11\x14\x06+\x01\"&5\x1146\x01d\x01k\x1f\x16n\x0d\x01\x0cT\x01.TlnTj\x83\x06\x1b\x0f\xfe\xaa\x07\xa6\x1c\x0e:d\x01%\x83\x06\x1b\x0f\xcb\x15\x13\x12\x16\xfe8\x02\n\x02	\x03\x07\x03\x05\x03\x01\x0c\x11\x92V\xfdOd\x15\x1d\x1d\x15d\x15\x1d\x1d\x03i\xe6\x10\x16p\x0d&\x0fyL\x90N\xfe\xad\x15(\xa2\x0d\x02\x0d\x11%\nH\xfe	Y\x01S\x15(22\x01\x02\x02\x03\x05\x02\x19\x16\xb7S\xe4\x1d\x15\xfe\x0c\x15\x1d\x1d\x15\x01\xf4\x15\x1d\x00\x00\x00\x03\xff\x9c\x00d\x04\xb0\x04O\x00\x1d\x006\x00F\x00\x00\x01\x05\x1e\x04\x15\x11\x14\x06#!\"&'\x03#\"&463!'&6?\x016\x07\x17\x16\x07\x0e\x05*\x02#!\x1532\x16\x17\x13!7\x11%\x0532\x16\x15\x11\x14\x06+\x01\"&5\x1146\x01\xdb\x01n\x02\x08\x14\x10\x0d\xac\x07\xfe\xaa\x0f\x1b\x06\x83jUmlT\x01.U\x0b\x01\x0dn\x16J\x92\x11\x0c\x02\x03\x05\x03\x07\x03	\x03\n\x01\xfe%\xdd\x0f\x1c\x06\x82\x01&j\xfe\xaa\x02Pd\x15\x1d\x1d\x15d\x15\x1d\x1d\x04O\xe6\x01\x05\x10\x11\x17\x0b\xfd\xf3\x0d\xa2(\x15\x01SN\x90Ly\x0f&\x0dp\x16\xae\xb7\x16\x19\x02\x05\x03\x02\x02\x01d(\x15\xfe\xadY\x01\xf7\xec\xe4\x1d\x15\xfe\x0c\x15\x1d\x1d\x15\x01\xf4\x15\x1d\x00\x00\x00\x03\x00a\x00\x00\x04L\x05\x0e\x00\x1b\x007\x00G\x00\x00\x002\x16\x1d\x01\x05\x1e\x01\x15\x11\x14\x06#!\"&/\x01\x03&?\x01>\x01\x1f\x01\x114\x1754&\x06\x15\x11\x1c\x03\x0e\x04\x07\x06/\x01\x07\x13!7\x11%.\x01\x03!2\x16\x1d\x01\x14\x06#!\"&=\x0146\x01\xde\x90N\x01S\x15(\xa2\x0d\xfd\xf3\x11%\n	\xe6\x10\x16p\x0d&\x0fy\xc622\x01\x02\x02\x03\x05\x02\x19\x16\xb7S\xec\x01\xf7Y\xfe\xad\x15(\x96\x01\xf4\x15\x1d\x1d\x15\xfe\x0c\x15\x1d\x1d\x05\x0enTj\x83\x06\x1b\x0f\xfe\xaa\x07\xa6\x1c\x0e\x0e\x01k\x1f\x16n\x0d\x01\x0cT\x01.T\xd6\xcb\x15\x13\x12\x16\xfe8\x02\n\x02	\x03\x07\x03\x05\x03\x01\x0c\x11\x92V\xfe\xadd\x01%\x83\x06\x1b\xfd\x0b\x1d\x15d\x15\x1d\x1d\x15d\x15\x1d\x00\x03\xff\xfd\x00\x06\x03\xe8\x05\x14\x00\x0f\x00-\x00I\x00\x00\x01!26=\x014&#!\"\x06\x1d\x01\x14\x16\x01\x15\x14\x06\"&5\x11\x07\x06&/\x01&7\x13>\x043!2\x16\x15\x11\x14\x06\x07\x01\x03\x1776\x17\x1e\x05\x1c\x02\x15\x11\x14\x166=\x01467%\x11'\x01^\x01\xf4\x15\x1d\x1d\x15\xfe\x0c\x15\x1d\x1d\x01\x0fN\x90Ly\x0f&\x0dp\x16\x10\xe6\x01\x05\x10\x11\x17\x0b\x02\x0d\x0d\xa2(\x15\xfd\x89\xecS\xb7\x16\x19\x02\x05\x03\x02\x02\x0122(\x15\x01SY\x04L\x1d\x15d\x15\x1d\x1d\x15d\x15\x1d\xfc\xe6jTnlT\x01.T\x0c\x01\x0dn\x16\x1f\x01k\x02\x08\x13\x0f\x0c\xa6\x07\xfe\xaa\x0f\x1b\x06\x01\xcf\xfe\xadV\x92\x11\x0c\x01\x03\x05\x03\x07\x03	\x02\n\x02\xfe8\x16\x12\x13\x15\xcb\x0f\x1b\x06\x83\x01%d\x00\x02\x00\x16\x00\x16\x04\x9a\x04\x9a\x00\x0f\x00%\x00\x00\x002\x1e\x02\x14\x0e\x02\".\x024>\x01\x01%&\x06\x1d\x01!\"\x06\x1d\x01\x14\x163!\x15\x14\x167%64\x01\xe2\xec\xd6\x9b[[\x9b\xd6\xec\xd6\x9b[[\x9b\x02\x86\xfe\xed\x10\x17\xfe\xed\n\x0f\x0f\n\x01\x13\x17\x10\x01\x13\x10\x04\x9a[\x9b\xd6\xec\xd6\x9b[[\x9b\xd6\xec\xd6\x9b\xfe9\xdf\x0d\n\x15\x89\x0f\n\x96\n\x0f\x89\x15\n\x0d\xdf\x0d&\x00\x00\x02\x00\x16\x00\x16\x04\x9a\x04\x9a\x00\x0f\x00%\x00\x00\x002\x1e\x02\x14\x0e\x02\".\x024>\x01\x0d\x01\x06\x14\x17\x05\x166=\x01!26=\x014&#!54&\x01\xe2\xec\xd6\x9b[[\x9b\xd6\xec\xd6\x9b[[\x9b\x01%\xfe\xed\x10\x10\x01\x13\x10\x17\x01\x13\n\x0f\x0f\n\xfe\xed\x17\x04\x9a[\x9b\xd6\xec\xd6\x9b[[\x9b\xd6\xec\xd6\x9b\xe8\xdf\x0d&\x0d\xdf\x0d\n\x15\x89\x0f\n\x96\n\x0f\x89\x15\n\x00\x00\x00\x02\x00\x16\x00\x16\x04\x9a\x04\x9a\x00\x0f\x00%\x00\x00\x002\x1e\x02\x14\x0e\x02\".\x024>\x01\x01\x03&\"\x07\x03\x06\x16;\x01\x11\x14\x16;\x01265\x11326\x01\xe2\xec\xd6\x9b[[\x9b\xd6\xec\xd6\x9b[[\x9b\x02K\xdf\x0d&\x0d\xdf\x0d\n\x15\x89\x0f\n\x96\n\x0f\x89\x15\n\x04\x9a[\x9b\xd6\xec\xd6\x9b[[\x9b\xd6\xec\xd6\x9b\xfe@\x01\x13\x10\x10\xfe\xed\x10\x17\xfe\xed\n\x0f\x0f\n\x01\x13\x17\x00\x00\x02\x00\x16\x00\x16\x04\x9a\x04\x9a\x00\x0f\x00%\x00\x00\x002\x1e\x02\x14\x0e\x02\".\x024>\x01\x05#\"\x06\x15\x11#\"\x06\x17\x13\x1627\x136&+\x01\x114&\x01\xe2\xec\xd6\x9b[[\x9b\xd6\xec\xd6\x9b[[\x9b\x01\x97\x96\n\x0f\x89\x15\n\x0d\xdf\x0d&\x0d\xdf\x0d\n\x15\x89\x0f\x04\x9a[\x9b\xd6\xec\xd6\x9b[[\x9b\xd6\xec\xd6\x9b\xbb\x0f\n\xfe\xed\x17\x10\xfe\xed\x10\x10\x01\x13\x10\x17\x01\x13\n\x0f\x00\x00\x03\x00\x18\x00\x18\x04\x98\x04\x98\x00\x0f\x00\x96\x00\xa6\x00\x00\x002\x1e\x02\x14\x0e\x02\".\x024>\x01%\x0e\x03\x07\x06&\x07\x0e\x01\x07\x06\x16\x07\x0e\x01\x07\x06\x16\x07\x14\x16\x072\x1e\x01\x17\x1e\x02\x17\x1e\x027\x16\x0e\x01\x17\x1e\x02\x17\x14\x06\x14\x17\x167>\x027.\x01'.\x01'\"\x0e\x02\x07\x06'&65.\x01'6.\x01\x06\x07\x06'&767\x1e\x02\x17\x1e\x03\x1f\x01>\x02'&>\x017>\x037&72\x16267.\x03'4>\x02&'\x1e\x01?\x016.\x02'\x06\x07\x14\x1e\x01\x15.\x02'>\x017\x162>\x01\x01\xe4\xe8\xd5\x9b\\\\\x9b\xd5\xe8\xd5\x9b\\\\\x9b\x01d\x0f+\x1c:\n\x0f=\x0f\x14?\x03\x03\x13\x01\x031\x05	\x1c\x06\"\x01\x0c\x16\x19\x07\x10\"/\x0b\x15?9\x1d\x07\x14\x19\x03\x0d\x14#\x13\x07\x05hu\x1e!$\x03\x0d0\x0c\x0fE\x11\x12.(,\x103\x0f\x04\x01\x06)\x04\x01\x03\x0b\x1a\x12\x17\x13\x13\x0b\x06\x10\x06(\x1b\x06\x07\x16\x15\x13\x06\x05\x02\x0b\x05\x03\x03\x0d\x17\x04\x06	\x07\x18\x16\x06\x10\x08 \x11\x17	\n*!A\x0b\x04\x02\x01\x03\x03\x1f7\x0b\x0c\x05\x1d,8\x0d\x12!\x10\x12\x08?*\x10\x03\x1a\x03\n\x12\n\x11\x04\x98\\\x9b\xd5\xe8\xd5\x9b\\\\\x9b\xd5\xe8\xd5\x9b\x11\x0c\x11\x07	\x02\x03\x06\x05\x07'\x0f\x0b\x17\x07\"r\x16\"v\x1c	G\x18\n\x14\x04\x08\x0e\x10\x04	.\x1e\x04\x0f&*\x11\x15\x1b\x1c\x04\x07\x12\n\x0c\x02r\x1d$> \x08\x01\x07\x07\x10\x0b\x01\x02\x0b\x0b#\x17\x011\x01\x0d	\x02\x0f\x1f\x19\x02\x14\x19\x1d\x1c\x1e\x10\x06\x01\x01\x07\n\x0c\x18\x11\x0d\x04\x03\x0c% \x10\x12\x16\x17\x0d\x0e*\x14\x19\n\x12\x12\x03	\x0b\x17'\x14\"\x06\x01\x0e	\x0c\x07\x01\x0d\x03\x04\x05\x1c$\x0c\x12\x0b\x04g\x112(\x03\x01	\x0b\x0b\x0b%\x07\n\x0c\x11\x00\x00\x00\x00\x01\x00\x00\x00\x02\x04\xaf\x04\x85\x00\x16\x00\x00\x016\x17\x05\x177\x16\x06\x07\x0e\x01'\x01\x06\"/\x01&47\x01&6\x02\xf4\xa4\x8e\xfe\xfd\x91\xfb\x06PM<\x86;\xfd\xac\x0f+\x0fo\x0f\x0f\x02X\"O\x04\x85\\e\x8a\xe8~Y\x87+\"\x0b\x16\xfd\xac\x10\x10n\x0f+\x10\x02We\xc9\x00\x06\x00\x00\x00`\x04\xb0\x04\xac\x00\x0f\x00\x13\x00#\x00'\x007\x00;\x00\x00\x13!2\x16\x1d\x01\x14\x06#!\"&=\x0146\x05#\x153\x05!2\x16\x1d\x01\x14\x06#!\"&=\x0146\x05!\x15!\x05!2\x16\x1d\x01\x14\x06#!\"&=\x0146\x05!\x15!d\x03\xe8);;)\xfc\x18);;\x04\x11\xc8\xc8\xfc\x18\x03\xe8);;)\xfc\x18);;\x04\x11\xfe\x0c\x01\xf4\xfc\x18\x03\xe8);;)\xfc\x18);;\x04\x11\xfe\xd4\x01,\x04\xac;)d);;)d);dd\xc8;)d);;)d);dd\xc8;)d);;)d);dd\x00\x00\x00\x02\x00d\x00\x00\x04L\x04\xb0\x00\x0b\x00\x11\x00\x00\x13!2\x16\x14\x06#!\"&46\x01\x11\x07\x11\x01!\x96\x03\x84\x15\x1d\x1d\x15\xfc|\x15\x1d\x1d\x02;\xc8\xfe\xa2\x03\x84\x04\xb0\x1d*\x1d\x1d*\x1d\xfdD\xfe\xd4\xc8\x01\xf4\x01\xf4\x00\x00\x00\x03\x00\x00\x00d\x04\xb0\x04\xb0\x00\x17\x00\x1b\x00%\x00\x00\x0132\x16\x1d\x01!2\x16\x15\x11!5#\x15!\x11463!546\x17\x1535\x01\x15\x14\x06#!\"&=\x01\x01\xf4\xc8);\x01,);\xfe\x0c\xc8\xfe\x0c;)\x01,;)\xc8\x01\xf4;)\xfc\x18);\x04\xb0;)d;)\xfepdd\x01\x90);d);ddd\xfdD\xc8);;)\xc8\x00\x00\x00\x04\x00\x00\x00\x00\x04\xb0\x04\xb0\x00\x15\x00+\x00A\x00W\x00\x00\x13!2\x16\x0f\x01\x17\x16\x14\x0f\x01\x06\"/\x01\x07\x06&5\x1146)\x012\x16\x15\x11\x14\x06/\x01\x07\x06\"/\x01&4?\x01'&6\x01\x17\x16\x14\x0f\x01\x17\x16\x06#!\"&5\x1146\x1f\x01762\x0576\x16\x15\x11\x14\x06#!\"&?\x01'&4?\x0162\x172\x01,\x15\x08\x0e^\xc7\x07\x07j\x08\x14\x08\xc7^\x0e\x15\x1d\x035\x01,\x15\x1d\x15\x0e^\xc7\x08\x14\x08j\x07\x07\xc7^\x0e\x08\xfe/j\x07\x07\xc7^\x0e\x08\x15\xfe\xd4\x15\x1d\x15\x0e^\xc7\x08\x14\x02\xcb^\x0e\x15\x1d\x15\xfe\xd4\x15\x08\x0e^\xc7\x07\x07j\x08\x14\x08\x04\xb0\x15\x0e^\xc7\x08\x14\x08j\x07\x07\xc7^\x0e\x08\x15\x01,\x15\x1d\x1d\x15\xfe\xd4\x15\x08\x0e^\xc7\x07\x07j\x08\x14\x08\xc7^\x0e\x15\xfd&j\x08\x14\x08\xc7^\x0e\x15\x1d\x15\x01,\x15\x08\x0e^\xc7\x07\xce^\x0e\x08\x15\xfe\xd4\x15\x1d\x15\x0e^\xc7\x08\x14\x08j\x07\x07\x00\x00\x00\x06\x00\x00\x00\x00\x04\xa8\x04\xa8\x00\x0f\x00\x1b\x00#\x00;\x00C\x00K\x00\x00\x002\x1e\x02\x14\x0e\x02\".\x024>\x01\x04\"\x0e\x01\x14\x1e\x012>\x014&$2\x16\x14\x06\"&4$2\x16\x14\x06#\"'\x07\x16\x15\x14\x06\"&546?\x02&54\x042\x16\x14\x06\"&4$2\x16\x14\x06\"&4\x01\xdb\xf2\xdd\x9f__\x9f\xdd\xf2\xdd\xa0^^\xa0\x01\xc6\xe0\xbfoo\xbf\xe0\xbfoo\xfe--  - \x01L-  \x16\x0e\x0f7\x113H3)\x1fz\x01	\xfe\x87-  - \x02\x1d-  - \x04\xa8_\x9f\xdd\xf2\xdd\xa0^^\xa0\xdd\xf2\xdd\x9fWo\xbf\xe0\xbfoo\xbf\xe0\xbf\x06 -!!-  -!\n\x91\x17\x1c$33$ 1\x05~\x01\x0e\x0e\x17\xa4 -  -  -  -\x00\x01\xff\xd8\x00Z\x04\xb9\x04\xbc\x00[\x00\x00%\x01676&'&#\"\x0e\x03\x07\x00\x07\x0e\x04\x17\x1e\x01327\x016'.\x01#\"\x07\x06\x07\x01\x0e\x01&47\x007>\x0132\x17\x1e\x01\x17\x16\x06\x07\x0e\x06\x07\x06#\"&'&67\x0167632\x17\x1e\x01\x17\x16\x06\x07\x01\x0e\x01'.\x01\x02\"\x01\xd5[\x08\x07v_\x16\x19\"A0?! \xfe\x88\x0f\x1e\x1e-\x13\x0d\x05	Y7J3\x02$$\x10\x07\x1d\x12\x1a\x18\x0d\x1a\xfe\xab\x0f)\x1c\x0e\x01G\"#A.\x0e\x0f,=\x0d\x0e\x18#\x0c(wn\x8bkV\x0e8@Fv\"0\x1aD\x01\xffG([kPHNg\x0f\x118B\xfe\x1e\x0f*\x10\x10\x03\xad\x01\xd6[eb\x9b\x11\x04\x14\x1a2!\x1f\xfe\x89\x0f\x1b\x1d5(7\x1d>B3\x02$$'\x10\x14\x17\x0c\x1a\xfe\xae\x0f\x01\x1c)\x0e\x01M\"#!\x01\x087)/c#\x0b*xn\x89fL\x07\x1b@9N\xbeD\x01\xffH\x187!$\x86W]\xb5B\xfe$\x0f\x02\x0f\x0f&\x00\x00\x00\x02\x00d\x00X\x04\xaf\x04D\x00\x19\x00D\x00\x00\x01>\x02\x1e\x02\x15\x14\x0e\x03\x07.\x0454>\x02\x1e\x01\x05\"\x0e\x03\".\x03#\"\x06\x15\x14\x1e\x02\x17\x16\x17\x1e\x042>\x03767>\x0454&\x02\x890{xuX6Cy\x84\xa8>>\xa7\x85xC8Zvxy\x01#!?2-*!')-?\"Co\x1bA23\x0f\x07\x0f:+1!\x0d\"3)@\x0c\x04\x08+)?\x1d\x17j\x03\xb5DH\x05-Sv@9y\x80\x7f\xb2UU\xb2\x7f\x80y9@vS-\x05H-&65&&56&oM\x178J41\x0f\x07\x0e<*.\x18\x180(@\x0b\x04	)*D*2\x13Om\x00\x02\x009\xff\xf2\x04w\x04\xbe\x00\x17\x00.\x00\x00\x002\x1f\x01\x16\x15\x14\x06\x0f\x01&/\x017'\x01\x17\x07/\x01&47\x01\x037\x16\x1f\x01\x16\x14\x07\x01\x06\"/\x01&4?\x01\x16\x1f\x01\x07\x17\x01\x02\xab\xbbB\x8dB8\"\x1d\x1f.\x12_\xf7\xfe{\xd4i\x13\x8dBB\x01\x1b\x12i\n	\x8dBB\xfe\xe5B\xbaB\x8dBB7\x1d.\x12_\xf7\x01\x85\x04\xbeB\x8dB^*k\"\x1d5.\x12_\xf8\xfe{\xd4j\x12\x8dB\xbaB\x01\x1b\xfeFi\x08	\x8dB\xbaB\xfe\xe5BB\x8dB\xbbB77/\x11_\xf8\x01\x85\x00\x00\x00\x00\x03\x00\xc8\x00\x00\x03\xe8\x04\xb0\x00\x11\x00\x15\x00\x1d\x00\x00\x002\x1e\x02\x15\x11\x14\x06#!\"&5\x114>\x01\x07\x11!\x11\x00\"\x06\x14\x16264\x02\x06\xaa\x9ad:;)\xfd\xa8);<f>\x02X\xfe\xffV==V=\x04\xb0\x1e.2\x15\xfcG);;)\x03\xb9\x153-\xaa\xfdD\x02\xbc\xfd\x16=V==V\x00\x01\x00\x00\x00\x00\x04\xb0\x04\xb0\x00\x16\x00\x00	\x01\x16\x14\x06\"/\x01\x01\x11'\x01\x05\x13\x01'!\x01'&462\x03\x86\x01\x1b\x0f\x1d*\x0e$\xfe\xe9\xd4\xfe\xcc\xfe\xe8\xcb\x013\xd2\x01,\x01\x0b#\x0f\x1d*\x04\xa1\xfe\xe6\x0f*\x1d\x0f#\xfe\xf5\xfe\xd4\xd2\xfe\xcd\xcb\x01\x18\x014\xd4\x01\x17$\x0e*\x1d\x00\x00\x00\x00\x03\x01'\x00\x11\x04	\x04\xe0\x002\x00@\x00K\x00\x00\x01\x15\x1e\x04\x17#.\x03'\x11\x17\x1e\x04\x15\x14\x06\x07\x15#5&'.\x01'3\x1e\x01\x17\x11'.\x0454>\x0275\x19\x01\x0e\x03\x15\x14\x1e\x03\x17\x16\x17\x11>\x044.\x02\x02\xbc&ER<,\x02\x9f\x04\x0d\x1d3'@\"<P7(\xb2\x9bd\x96W(\x19\x03\x8b\x05WJ\x1b.BN0 2Uh:\x1d**\x15\x0e\x13&\x19\x19	h\x16)1\"\x18\x1937\x04\xe0N\x05\x13,?iB$.,\x1b\x07\xfe\xcd\x0d\x07\x13-<d>\x8b\xaa\x0cMO\x10W(kVMb\x10\x01O\x08\x0e\x19/9X6FpH*\x06M\xfe\x12\x01\x12\x04\x0e\x1d6&\x1d+\x19\x14\x08\x06\x03\xd0\xfe\xca\x02	\x16 4C4%\x19\x00\x00\x00\x01\x00d\x00f\x03\x94\x04\xad\x00J\x00\x00\x012\x1e\x01\x15#4.\x02#\"\x06\x07\x06\x15\x14\x1e\x01\x17\x16\x173\x15#\x16\x06\x07\x06\x07>\x0136\x16327\x17\x0e\x03#\".\x01\x07\x0e\x01\x0f\x01'>\x057>\x01'#53&'.\x02>\x0176\x021T\x99^\x99'<;\x1a%T\x14)\x1b\x1a\x18\x06\x03\xf1\xc5\x08\x15\x15-6\"b\x16 \x8c\"S52\x1f68\x1c \x17jt&'V\x18\x177\x04\x18\x07\x13\x0c\x11	0\x0c$\xdd\xa6\x17\x15\x07\n\x02\x0e-$a\x04\xadP\x8bN(?\"\x12\x1d\x15,9\x1aJ0*	\x05d2\x82\x1e>2\n\x0f\x01\"\x1e\x93\x13\x17\x08\x01\"\x1f\x04\x03\x1a\x0c\x0b\x91\x03\x10\x05\x0d\x0b\x11\n7\x8fGd/9\x14+DAL!X\x00\x00\x00\x02\x00\x19\xff\xff\x04\x97\x04\xb0\x00\x0f\x00\x1f\x00\x00\x0132\x16\x0f\x01\x06\"/\x01&6;\x01\x113\x05\x17\x16\x06+\x01\x11#\x11#\"&?\x0162\x01\x90\x96\x15\x08\x0e\xe6\x0e*\x0e\xe6\x0e\x08\x15\x96\xc8\x02\x17\xe6\x0e\x08\x15\x96\xc8\x96\x15\x08\x0e\xe6\x0e*\x01,\x16\x0e\xfa\x0f\x0f\xfa\x0e\x16\x03\x84\x10\xf9\x0e\x15\xfc|\x03\x84\x15\x0e\xf9\x0f\x00\x00\x04\x00\x19\xff\xff\x03\xe8\x04\xb0\x00\x07\x00\x17\x00\x1b\x00%\x00\x00\x01#5#\x15#\x11!\x0132\x16\x0f\x01\x06\"/\x01&6;\x01\x113\x05\x1535\x13\x073\x15!57#5!\x03\xe8ddd\x01,\xfd\xa8\x96\x15\x08\x0e\xe6\x0e*\x0e\xe6\x0e\x08\x15\x96\xc8\x01\x91dc\xc8\xc8\xfe\xd4\xc8\xc8\x01,\x02\xbcdd\x01\xf4\xfc|\x16\x0e\xfa\x0f\x0f\xfa\x0e\x16\x03\x84d\xc8\xc8\xfd\x12\xfad\x96\xfad\x00\x00\x00\x00\x04\x00\x19\xff\xff\x03\xe8\x04\xb0\x00\x0f\x00\x19\x00!\x00%\x00\x00\x0132\x16\x0f\x01\x06\"/\x01&6;\x01\x113\x05\x073\x15!57#5!\x11#5#\x15#\x11!\x07\x1535\x01\x90\x96\x15\x08\x0e\xe6\x0e*\x0e\xe6\x0e\x08\x15\x96\xc8\x02X\xc8\xc8\xfe\xd4\xc8\xc8\x01,ddd\x01,\xc7d\x01,\x16\x0e\xfa\x0f\x0f\xfa\x0e\x16\x03\x84\x96\xfad\x96\xfad\xfbPdd\x01\xf4d\xc8\xc8\x00\x00\x00\x04\x00\x19\xff\xff\x04L\x04\xb0\x00\x0f\x00\x15\x00\x1b\x00\x1f\x00\x00\x0132\x16\x0f\x01\x06\"/\x01&6;\x01\x113\x01#\x11#53\x13#5#\x11!\x07\x1535\x01\x90\x96\x15\x08\x0e\xe6\x0e*\x0e\xe6\x0e\x08\x15\x96\xc8\x02Xdd\xc8dd\xc8\x01,\xc7d\x01,\x16\x0e\xfa\x0f\x0f\xfa\x0e\x16\x03\x84\xfe\x0c\x01\x90d\xfbPd\x01\x90d\xc8\xc8\x00\x00\x00\x00\x04\x00\x19\xff\xff\x04L\x04\xb0\x00\x0f\x00\x15\x00\x19\x00\x1f\x00\x00\x0132\x16\x0f\x01\x06\"/\x01&6;\x01\x113\x01#5#\x11!\x07\x1535\x03#\x11#53\x01\x90\x96\x15\x08\x0e\xe6\x0e*\x0e\xe6\x0e\x08\x15\x96\xc8\x02\xbcd\xc8\x01,\xc7d\x01dd\xc8\x01,\x16\x0e\xfa\x0f\x0f\xfa\x0e\x16\x03\x84\xfe\x0cd\x01\x90d\xc8\xc8\xfb\xb4\x01\x90d\x00\x00\x00\x00\x05\x00\x19\xff\xff\x04\xb0\x04\xb0\x00\x0f\x00\x13\x00\x17\x00\x1b\x00\x1f\x00\x00\x0132\x16\x0f\x01\x06\"/\x01&6;\x01\x113\x05#53\x13!5!\x13!5!\x13!5!\x01\x90\x96\x15\x08\x0e\xe6\x0e*\x0e\xe6\x0e\x08\x15\x96\xc8\x01\xf4\xc8\xc8d\xfe\xd4\x01,d\xfep\x01\x90d\xfe\x0c\x01\xf4\x01,\x16\x0e\xfa\x0f\x0f\xfa\x0e\x16\x03\x84\xc8\xc8\xfe\x0c\xc8\xfe\x0c\xc8\xfe\x0c\xc8\x00\x05\x00\x19\xff\xff\x04\xb0\x04\xb0\x00\x0f\x00\x13\x00\x17\x00\x1b\x00\x1f\x00\x00\x0132\x16\x0f\x01\x06\"/\x01&6;\x01\x113\x05!5!\x03!5!\x03!5!\x03#53\x01\x90\x96\x15\x08\x0e\xe6\x0e*\x0e\xe6\x0e\x08\x15\x96\xc8\x03 \xfe\x0c\x01\xf4d\xfep\x01\x90d\xfe\xd4\x01,d\xc8\xc8\x01,\x16\x0e\xfa\x0f\x0f\xfa\x0e\x16\x03\x84\xc8\xc8\xfe\x0c\xc8\xfe\x0c\xc8\xfe\x0c\xc8\x00\x02\x00\x00\x00\x00\x04L\x04L\x00\x0f\x00\x1f\x00\x00\x01!2\x16\x15\x11\x14\x06#!\"&5\x1146\x05!\"\x06\x15\x11\x14\x163!265\x114&\x01^\x01\x90\xa2\xbc\xbb\xa3\xfep\xa5\xb9\xb9\x02g\xfe\x0c);;)\x01\xf4);;\x04L\xbb\xa3\xfep\xa5\xb9\xb9\xa5\x01\x90\xa5\xb9\xc8;)\xfe\x0c);;)\x01\xf4);\x00\x00\x00\x00\x03\x00\x00\x00\x00\x04L\x04L\x00\x0f\x00\x1f\x00+\x00\x00\x01!2\x16\x15\x11\x14\x06#!\"&5\x1146\x05!\"\x06\x15\x11\x14\x163!265\x114&\x05\x17\x16\x14\x0f\x01\x06&5\x1146\x01^\x01\x90\xa5\xb9\xb9\xa5\xfep\xa3\xbb\xbc\x02d\xfe\x0c);;)\x01\xf4);;\xfeo\xfd\x11\x11\xfd\x10\x18\x18\x04L\xb9\xa5\xfep\xa5\xb9\xb9\xa5\x01\x90\xa3\xbb\xc8;)\xfe\x0c);;)\x01\xf4);\x82\xbe\x0c$\x0c\xbe\x0c\x0b\x15\x01\x90\x15\x0b\x00\x00\x00\x00\x03\x00\x00\x00\x00\x04L\x04L\x00\x0f\x00\x1f\x00+\x00\x00\x01!2\x16\x15\x11\x14\x06#!\"&5\x1146\x05!\"\x06\x15\x11\x14\x163!265\x114&\x05!2\x16\x0f\x01\x06\"/\x01&6\x01^\x01\x90\xa3\xbb\xb9\xa5\xfep\xa5\xb9\xb9\x02g\xfe\x0c);;)\x01\xf4);;\xfe\x15\x01\x90\x15\x0b\x0c\xbe\x0c$\x0c\xbe\x0c\x0b\x04L\xbc\xa2\xfep\xa5\xb9\xb9\xa5\x01\x90\xa3\xbb\xc8;)\xfe\x0c);;)\x01\xf4);\xc8\x18\x10\xfd\x11\x11\xfd\x10\x18\x00\x00\x00\x03\x00\x00\x00\x00\x04L\x04L\x00\x0f\x00\x1f\x00+\x00\x00\x01!2\x16\x15\x11\x14\x06#!\"&5\x1146\x05!\"\x06\x15\x11\x14\x163!265\x114&\x05\x17\x16\x06#!\"&?\x0162\x01^\x01\x90\xa5\xb9\xb9\xa5\xfep\xa3\xbb\xb9\x02g\xfe\x0c);;)\x01\xf4);;\xfe\xfb\xbe\x0c\x0b\x15\xfep\x15\x0b\x0c\xbe\x0c$\x04L\xb9\xa5\xfep\xa3\xbb\xbc\xa2\x01\x90\xa5\xb9\xc8;)\xfe\x0c);;)\x01\xf4);\xcf\xfd\x10\x18\x18\x10\xfd\x11\x00\x00\x00\x00\x02\x00\x00\x00\x00\x05\x14\x04L\x00\x1f\x005\x00\x00\x01!2\x16\x15\x11\x14\x06#!\"&=\x01463!265\x114&#!\"&=\x0146\x07\x01\x16\x14\x07\x01\x06&=\x01#\"&=\x0146;\x01546\x02&\x01\x90\xa5\xb9\xb9\xa5\xfep\x15\x1d\x1d\x15\x01\xc2);;)\xfe>\x15\x1d\x1d\xbf\x01D\x10\x10\xfe\xbc\x10\x16\xfa\x15\x1d\x1d\x15\xfa\x16\x04L\xb9\xa5\xfep\xa5\xb9\x1d\x15d\x15\x1d;)\x01\xf4);\x1d\x15d\x15\x1d\xe9\xfe\xe4\x0e&\x0e\xfe\xe4\x0e\n\x15\x96\x1d\x15\xc8\x15\x1d\x96\x15\n\x00\x00\x01\x00\xd9\x00\x02\x03\xd7\x04\x9e\x00#\x00\x00\x01\x17\x16\x07\x06\x02\x07%2\x16\x07\"\x08\x01\x07\x06+\x01'&7>\x01?\x01!\"'&76\x006763\x03\x19	\x08\x03\x03\x98\x02\x01,\x18\x11\x0e\x01\xfe\xf7\xfe\xf3\x04\x0c\x0e			\x05\x02P''\xfe\xd2\x17\x08\n\x10K\x01\x0d\xbb\x05	\x10\x04\x9e	\n\x11\x0b\xfeS\x07\x01#\x12\xfe\xca\xfe\xc5\x05\x0f\x08\x0b\x15	\xe5nn\x13\x15\x14V\x01/\xd3\x06\x10\x00\x00\x00\x02\x00\x00\x00\x00\x04\xfe\x04L\x00\x1f\x005\x00\x00\x01!2\x16\x1d\x01\x14\x06#!\"\x06\x15\x11\x14\x163!2\x16\x1d\x01\x14\x06#!\"&5\x1146\x05\x01\x16\x14\x07\x01\x06&=\x01#\"&=\x0146;\x01546\x01^\x01\x90\x15\x1d\x1d\x15\xfe>);;)\x01\xc2\x15\x1d\x1d\x15\xfep\xa5\xb9\xb9\x02\xf1\x01D\x10\x10\xfe\xbc\x10\x16\xfa\x15\x1d\x1d\x15\xfa\x16\x04L\x1d\x15d\x15\x1d;)\xfe\x0c);\x1d\x15d\x15\x1d\xb9\xa5\x01\x90\xa5\xb9\xe9\xfe\xe4\x0e&\x0e\xfe\xe4\x0e\n\x15\x96\x1d\x15\xc8\x15\x1d\x96\x15\n\x00\x02\x00\x00\x00\x00\x04\xb0\x04\xb0\x00\x15\x001\x00\x00\x01!2\x16\x15\x11\x14\x06/\x01\x01\x06\"/\x01&47\x01'&6\x01#\"\x06\x15\x11\x14\x163!26=\x017\x11\x14\x06#!\"&5\x11463!\x02\xee\x01\x90\x15\x1d\x15\x0em\xfe\xc8\x0f)\x0f\x8d\x0f\x0f\x018m\x0e\x08\xfe\xef\x9c);;)\x01\xf4);\xc8\xbb\xa3\xfep\xa5\xb9\xb9\xa5\x01,\x04\xb0\x1d\x15\xfep\x15\x08\x0em\xfe\xc8\x0f\x0f\x8d\x0f)\x0f\x018m\x0e\x15\xfe\xd4;)\xfe\x0c);;)\x94\xc8\xfe\xd6\xa5\xb9\xb9\xa5\x01\x90\xa5\xb9\x00\x00\x03\x00\x0e\x00\x0e\x04\xa2\x04\xa2\x00\x0f\x00\x1b\x00#\x00\x00\x002\x1e\x02\x14\x0e\x02\".\x024>\x01\x04\"\x0e\x01\x14\x1e\x012>\x014&\x042\x16\x14\x06\"&4\x01\xe1\xee\xd9\x9d]]\x9d\xd9\xee\xd9\x9d]]\x9d\x01\xc3\xe6\xc2qq\xc2\xe6\xc2qq\xfe{\xa0rr\xa0r\x04\xa2]\x9d\xd9\xee\xd9\x9d]]\x9d\xd9\xee\xd9\x9dGq\xc2\xe6\xc2qq\xc2\xe6\xc2sr\xa0rr\xa0\x00\x00\x03\x00\x00\x00\x00\x04L\x04\xb0\x00\x15\x00\x1f\x00#\x00\x00\x0132\x16\x15\x1132\x16\x07\x01\x06\"'\x01&6;\x01\x1146\x01!2\x16\x1d\x01!546\x05\x1535\x01\xc2\xc8\x15\x1d\xf5\x14\n\x0e\xfe\x81\x0e'\x0d\xfe\x85\x0d	\x15\xfa\x1d\xfe\x85\x03\xe8\x15\x1d\xfb\xb4\x1d\x03gd\x04\xb0\x1d\x15\xfe\xa2\x16\x0f\xfeV\x0f\x0f\x01\xaa\x0f\x16\x01^\x15\x1d\xfc|\x1d\x15\xfa\xfa\x15\x1dd22\x00\x00\x00\x03\x00\x00\x00\x00\x04L\x04\xac\x00\x15\x00\x1f\x00#\x00\x00	\x01\x16\x06+\x01\x15\x14\x06+\x01\"&=\x01#\"&7\x01>\x01\x01!2\x16\x1d\x01!546\x05\x1535\x02G\x01z\x0e\n\x15\xf4\"\x16\xc8\x14\x18\xfa\x14\x0b\x0e\x01\x7f\x0e'\xfd\xf9\x03\xe8\x15\x1d\xfb\xb4\x1d\x03gd\x04\x9e\xfeM\x0f \xfa\x14\x1e\x1d\x15\xfa!\x0f\x01\xaf\x10\x02\xfc\x7f\x1d\x15\xfa\xfa\x15\x1dd22\x00\x03\x00\x00\x00\x00\x04L\x04K\x00\x14\x00\x1e\x00\"\x00\x00	\x0162\x1f\x01\x16\x14\x07\x01\x06\"'\x01&4?\x0162\x17\x03!2\x16\x1d\x01!546\x05\x1535\x01\x8c\x01q\x07\x15\x07\x8b\x07\x07\xfd\xf3\x07\x15\x07\xfe\xdc\x07\x07\x8b\x08\x15\x07\xd4\x03\xe8\x15\x1d\xfb\xb4\x1d\x03gd\x02\xd3\x01q\x07\x07\x8b\x08\x15\x07\xfd\xf3\x08\x08\x01#\x08\x14\x08\x8b\x07\x07\xfd\xd2\x1d\x15\xfa\xfa\x15\x1dd22\x00\x04\x00\x00\x00\x00\x04L\x04\x9b\x00	\x00\x19\x00#\x00'\x00\x00\x13762\x1f\x01\x07'&4\x0576\x16\x15\x03\x0e\x01#\x05\"&?\x01'7\x01!2\x16\x1d\x01!546\x05\x1535\x87\x8e\x0e*\x0eM\xd4M\x0e\x02\x16\xd2\x0e\x15\x02\x01\x1d\x15\xfd\xab\x15\x08\x0e\xd0\x9a\xd4\xfe=\x03\xe8\x15\x1d\xfb\xb4\x1d\x03gd\x03\xff\x8e\x0e\x0eM\xd4L\x0f*\x9a\xd2\x0e\x08\x15\xfd\xa9\x14\x1e\x01\x15\x0e\xd0\x9b\xd4\xfd:\x1d\x15\xfa\xfa\x15\x1dd22\x00\x00\x00\x04\x00\x00\x00\x00\x04L\x04\xb0\x00\x0f\x00\x19\x00#\x00'\x00\x00\x01\x05\x1e\x01\x15\x13\x14\x06/\x01\x07'7'&6\x13\x07\x06\"/\x01&4?\x01\x01!2\x16\x1d\x01!546\x05\x1535\x01^\x02W\x14\x1e\x01\x15\x0e\xd0\x9b\xd4\x9b\xd2\x0e\x08\xc3L\x0f*\x0e\x8e\x0e\x0eM\xfe\xfa\x03\xe8\x15\x1d\xfb\xb4\x1d\x03gd\x04\xb0\x02\x01\x1d\x15\xfd\xab\x15\x08\x0e\xd0\x9a\xd4\x9a\xd2\x0e\x15\xfdPM\x0e\x0e\x8e\x0e*\x0eM\xfeX\x1d\x15\xfa\xfa\x15\x1dd22\x00\x02\x00\x04\xff\xec\x04\xb0\x04\xaf\x00\x05\x00\x08\x00\x00%	\x01\x11!	\x01\x15\x01\x04\xb0\xfe\x1d\xfe\xc6\xfeq\x04\xac\xfd3\x02\xabg\x01\x14\xfeq\x01\xa7\x03\x1c\xfc\xf9\xe6\x03\xb9\x00\x00\x00\x00\x02\x00\x00\x00d\x04L\x04\xb0\x00\x15\x00\x19\x00\x00\x01\x11\x14\x06+\x01\x11!\x11#\"&5\x1146;\x01\x11!\x113\x07#53\x04L\x1d\x15\x96\xfdD\x96\x15\x1d\x1d\x15\xfa\x01\xf4d\xc8dd\x03\xe8\xfc\xae\x15\x1d\x01\x90\xfep\x1d\x15\x03\xe8\x14\x1e\xfe\xd4\x01,\xc8\xc8\x00\x00\x03\x00\x00\x00E\x04\xdd\x04\xb0\x00\x16\x00\x1a\x00/\x00\x00\x01\x07\x01'&\"\x0f\x01!\x11#\"&5\x1146;\x01\x11!\x113\x07#53\x01\x17\x16\x14\x07\x01\x06\"/\x01&4?\x0162\x1f\x01\x0162\x04L\x02\xfe\xd5_	\x19	\x95\xfe\xc8\x96\x15\x1d\x1d\x15\xfa\x01\xf4d\xc8dd\x01\xb0j\x07\x07\xfe\\\x08\x14\x08\xca\x08\x08j\x07\x15\x07O\x01)\x07\x15\x03\xe8\x95\xfe\xd5_		\x93\xfep\x1d\x15\x03\xe8\x14\x1e\xfe\xd4\x01,\xc8\xc8\xfd\xcej\x07\x15\x07\xfe[\x07\x07\xcb\x07\x15\x07j\x08\x08O\x01)\x07\x00\x03\x00\x00\x00\x0d\x05\x07\x04\xb0\x00\x16\x00\x1a\x00>\x00\x00\x01\x11\x07'.\x01\x07\x01!\x11#\"&5\x1146;\x01\x11!\x113\x07#53\x01\x17\x16\x14\x0f\x01\x17\x16\x14\x0f\x01\x06\"/\x01\x07\x06\"/\x01&4?\x01'&4?\x0162\x1f\x01762\x04Lg\x86\x0f%\x10\xfe\xf6\xfe\xb7\x96\x15\x1d\x1d\x15\xfa\x01\xf4d\xc8dd\x01\xf6F\x0f\x0f\x83\x83\x0f\x0fF\x0f)\x0f\x83\x83\x0f)\x0fF\x0f\x0f\x83\x83\x0f\x0fF\x0f)\x0f\x83\x83\x0f)\x03\xe8\xfe\xf3g\x86\x0f\x03\x0e\xfe\xf6\xfep\x1d\x15\x03\xe8\x14\x1e\xfe\xd4\x01,\xc8\xc8\xfd\x8cF\x0f)\x0f\x83\x83\x0f)\x0fF\x0f\x0f\x83\x83\x0f\x0fF\x0f)\x0f\x83\x83\x0f)\x0fF\x0f\x0f\x83\x83\x0f\x00\x00\x03\x00\x00\x00\x15\x04\x97\x04\xb0\x00\x15\x00\x19\x00/\x00\x00\x01\x11!\"\x06\x1d\x01!\x11#\"&5\x1146;\x01\x11!\x113\x07#53\x1332\x16\x1d\x0132\x16\x0f\x01\x06\"/\x01&6;\x01546\x04L\xfe\xa2\x15\x1d\xfe\x0c\x96\x15\x1d\x1d\x15\xfa\x01\xf4d\xc8dd\x96d\x15\x1d\x96\x15\x08\x0e\xe6\x0e*\x0e\xe6\x0e\x08\x15\x96\x1d\x03\xe8\xfe\xd4\x1d\x15\x96\xfep\x1d\x15\x03\xe8\x14\x1e\xfe\xd4\x01,\xc8\xc8\xfd\xa8\x1d\x15\xfa\x15\x0e\xe6\x0e\x0e\xe6\x0e\x15\xfa\x15\x1d\x00\x00\x00\x00\x03\x00\x00\x00\x00\x04\x97\x04\xb0\x00\x15\x00\x19\x00/\x00\x00\x01\x11'&\"\x07\x01!\x11#\"&5\x1146;\x01\x11!\x113\x07#53\x13\x17\x16\x06+\x01\x15\x14\x06+\x01\"&=\x01#\"&?\x0162\x04L\xa5\x0e*\x0e\xfe\xf9\xfen\x96\x15\x1d\x1d\x15\xfa\x01\xf4d\xc8dd\xeb\xe6\x0e\x08\x15\x96\x1d\x15d\x15\x1d\x96\x15\x08\x0e\xe6\x0e*\x03\xe8\xfep\xa5\x0f\x0f\xfe\xf7\xfep\x1d\x15\x03\xe8\x14\x1e\xfe\xd4\x01,\xc8\xc8\xfd\x85\xe5\x0f\x15\xfa\x14\x1e\x1e\x14\xfa\x15\x0f\xe5\x0f\x00\x03\x00\x00\x00\xc8\x04\xb0\x04L\x00	\x00\x13\x00\x17\x00\x00\x13!2\x16\x1d\x01!546\x01\x11\x14\x06#!\"&5\x11\x13\x15!52\x04L\x15\x1d\xfbP\x1d\x04\x93\x1d\x15\xfb\xb4\x15\x1dd\x01\x90\x04L\x1d\x15\x96\x96\x15\x1d\xfe\xd4\xfd\xda\x15\x1d\x1d\x15\x02&\xfe\xd4\xc8\xc8\x00\x00\x06\x00\x03\x00}\x04\xad\x04\x97\x00\x0f\x00\x19\x00\x1d\x00-\x001\x00;\x00\x00\x01\x17\x16\x14\x0f\x01\x06&=\x01!5!546\x01#\"&=\x0146;\x01\x17#53\x0176\x16\x1d\x01!\x15!\x15\x14\x06/\x01&4\x05#5;\x022\x16\x1d\x01\x14\x06+\x01\x03\xa7\xf8\x0e\x0e\xf8\x0e\x15\xfep\x01\x90\x15\xfd/2\x15\x1d\x1d\x152\xc8dd\xfe\x82\xf7\x0e\x15\x01\x90\xfep\x15\x0e\xf7\x0f\x03\x81ddd3\x14\x1d\x1d\x143\x04\x8d\xe6\x0e*\x0e\xe6\x0e\x08\x15\x96\xc8\x96\x15\x08\xfe\x85\x1d\x15d\x15\x1d\xc8\xc8\xfd\xcb\xe6\x0e\x08\x15\x96\xc8\x96\x15\x08\x0e\xe6\x0e*y\xc8\x1d\x15d\x15\x1d\x00\x00\x00\x00\x02\x00d\x00\x00\x04\xb0\x04\xb0\x00\x16\x00Q\x00\x00\x01%6\x16\x15\x11\x14\x06+\x01\"&5\x11.\x045\x1146%2\x16\x1f\x01\x11\x14\x0e\x02\x0f\x01\x11\x14\x06+\x01\"&5\x11.\x045\x114>\x0332\x16\x1f\x01\x113\x11<\x01>\x0232\x16\x1f\x01\x113\x114>\x03\x03^\x01\x14\x19%\x1d\x15\xc8\x15\x1d\x04\x0e\"\x1a\x16%\xfe\xe1\x16\x19\x02\x01\x15\x1d\x1d\x0b\n\x1d\x15\xc8\x15\x1d\x04\x0e\"\x1a\x16\x01\x07\n\x13\x0d\x14\x19\x02\x03d\x05	\x15\x0f\x17\x19\x01\x01d\x01\x05	\x15\x041t\x12\x14\x1f\xfb\xae\x15\x1d\x1d\x15\x01\x8d\x01\x08\x1b\x1f5\x1e\x01g\x1fD\x91\x19\x0c\x0d\xfe>\x1c?1)\x0b\x0b\xfeA\x15\x1d\x1d\x15\x01\xbf\x04\x0f..@\x1c\x01\xc2\x02\x07\x11\x0d\x0b\x19\x0c\x0d\xfe\xa2\x01^\x02\x07\x11\x0d\x0b\x19\x0c\x0d\xfe\xa2\x01^\x02\x07\x11\x0d\x0b\x00\x01\x00d\x00\x00\x04\xb0\x04L\x003\x00\x00\x01\x15\"\x0e\x03\x15\x11\x14\x16\x1f\x01\x15!5265\x11!\x11\x14\x163\x15!52>\x035\x114&/\x015!\x15\"\x06\x15\x11!\x114&#5\x04\xb0\x04\x0e\"\x1a\x162\x19\x19\xfepK\x19\xfe\x0c\x19K\xfep\x04\x0e\"\x1a\x162\x19\x19\x01\x90K\x19\x01\xf4\x19K\x04L8\x01\x05\n\x14\x0e\xfc\x88\x16\x19\x01\x0288\x0d%\x01\x8a\xfev%\x0d88\x01\x05\n\x14\x0e\x03x\x16\x19\x01\x0288\x0d%\xfev\x01\x8a%\x0d8\x00\x00\x00\x06\x00\x00\x00\x00\x04L\x04L\x00\x0c\x00\x1c\x00 \x00$\x00(\x004\x00\x00\x01!2\x16\x1d\x01#\x055'!7!\x05!2\x16\x15\x11\x14\x06#!\"&5\x1146\x17\x15!5\x01\x055%\x05\x15!5\x05\x15\x14\x06#!\x07!'!73\x02\xa3\x01w\x15\x1di\xfe\xd9\xc8\xfepd\x01w\xfe%\x01,);;)\xfe\xd4);;)\x01,\x02\xbc\xfep\x01\x90\xfc\x18\x01,\x02\xbc\x1d\x15\xfe\x89d\xfe\x89d\x01\x90\xc8i\x03\xe8\x1d\x15\x96bb\xc8d\xc8;)\xfe\x0c);;)\x01\xf4);d\xc8\xc8\xfe\xf7\x85\xa3\x85\xc6\xc8\xc8f\xf8\x15\x1ddd\xc8\x00\x01\x00\x10\x00\x10\x04\x9f\x04\x9f\x00&\x00\x00\x1376\x16\x1f\x01\x16\x06\x0f\x01\x1e\x01\x177>\x01\x1f\x01\x1e\x01\x0f\x01\x06\".\x06'.\x057\x11\xa2\x11.\x0e\x8b\x0e\x06\x11wf\xfc\x8dw\x113\x13\xc0\x13\x07\x11\xa3\x03\x0d.1LOefx;JwF2\x13\x0b\x01\x03\xef\xa2\x11\x06\x13\xc2\x141\x11v\x8e\xfcev\x11\x04\x0e\x88\x0e/\x11\xa2\x01\x04\x08\x15 5Cc;J\x99|sU@\x10\x00\x00\x00\x02\x00\x00\x00\x00\x04\xb0\x04L\x00#\x00A\x00\x00\x002\x1e\x04\x1f\x01\x15\x14\x06/\x01.\x01=\x01& \x07\x15\x14\x06\x0f\x01\x06&=\x01>\x05\x122\x1e\x02\x1f\x01\x15\x01\x1e\x01\x1d\x01\x14\x06#!\"&=\x01467\x0154>\x02\x01\xfc\xb8\xa6ud?,		\x1d\x14\xca\x14\x1d\x8d\xfe\xc2\x8d\x1d\x14\xca\x14\x1d\x03\x0d1;ft\xcapR&\x16\x01\x01\x01m\x0e\x15\x1d\x15\xfb\xb4\x15\x1d\x15\x0e\x01m\x02\x16&\x04L\x15!((\"\n\n\xc8\x15\x18\x03\"\x03\"\x15\x92\x18\x18\x92\x15\"\x03\"\x03\x18\x15\xc8\x04\x0d'$+ \xfe\xe4\x13\x1c\x1c\n\n2\xfe\xd1\x0f2\x14\xd4\x15\x1d\x1d\x15\xd4\x142\x0f\x01/2\x04\x0d!\x19\x00\x00\x03\x00\x00\x00\x00\x04\xb0\x04\xb0\x00\x0d\x00\x1d\x00'\x00\x00\x01\x07!'\x113\x15353\x15353\x01!2\x16\x14\x06+\x01\x17!7#\"&46\x03!2\x16\x1d\x01!546\x04L\xc8\xfd\xa8\xc8\xc8\xc8\xc8\xc8\xc8\xfc\xae\x02\xbc\x15\x1d\x1d\x15\x0c\x89\xfcJ\x89\x0c\x15\x1d\x1d\xb3\x04L\x15\x1d\xfbP\x1d\x02\xbc\xc8\xc8\x01\xf4\xc8\xc8\xc8\xc8\xfc\xe0\x1d*\x1ddd\x1d*\x1d\xfe\xd4\x1d\x1522\x15\x1d\x00\x00\x00\x03\x00d\x00\x00\x04\xb0\x04L\x00	\x00\x13\x00\x1d\x00\x00\x01#\"\x06\x15\x11!\x114&\x01#\"\x06\x15\x11!\x114&\x01!\x1146;\x012\x16\x15\x02\xbcd);\x01,;\x01gd);\x01,;\xfd\x1b\xfe\xd4;)d);\x04L;)\xfc\x18\x03\xe8);\xfe\xd4;)\xfdD\x02\xbc);\xfc\xe0\x01\x90);;)\x00\x00\x00\x00\x05\xff\x9c\x00\x00\x04\xb0\x04L\x00\x0f\x00\x13\x00\x1f\x00%\x00)\x00\x00\x13!2\x16\x15\x11\x14\x06#!\"&5\x1146\x17\x11!\x11\x05#\x153\x11!535#\x11!\x05\x11\x07#\x113\x07\x113\x11\xc8\x02\xbc|\xb0\xb0|\xfdD|\xb0\xb0\x18\x03\x84\xfe\x0c\xc8\xc8\xfe\xd4\xc8\xc8\x01,\x01\x90d\xc8\xc8dd\x04L\xb0|\xfe\x0c|\xb0\xb0|\x01\xf4|\xb0\xc8\xfdD\x02\xbc\xc8d\xfe\xd4dd\x01,d\xfe\xd4d\x01\xf4d\xfe\xd4\x01,\x00\x00\x00\x05\xff\x9c\x00\x00\x04\xb0\x04L\x00\x0f\x00\x13\x00\x1f\x00%\x00)\x00\x00\x13!2\x16\x15\x11\x14\x06#!\"&5\x1146\x17\x11!\x11\x01#5#\x15#\x113\x15353\x05\x11\x07#\x113\x07\x113\x11\xc8\x02\xbc|\xb0\xb0|\xfdD|\xb0\xb0\x18\x03\x84\xfe\x0cdddddd\x01\x90d\xc8\xc8dd\x04L\xb0|\xfe\x0c|\xb0\xb0|\x01\xf4|\xb0\xc8\xfdD\x02\xbc\xfd\xa8\xc8\xc8\x01\xf4\xc8\xc8d\xfe\xd4d\x01\xf4d\xfe\xd4\x01,\x00\x04\xff\x9c\x00\x00\x04\xb0\x04L\x00\x0f\x00\x13\x00\x1b\x00#\x00\x00\x13!2\x16\x15\x11\x14\x06#!\"&5\x1146\x17\x11!\x11\x05#\x113\x15!\x11!\x05#\x113\x15!\x11!\xc8\x02\xbc|\xb0\xb0|\xfdD|\xb0\xb0\x18\x03\x84\xfe\x0c\xc8\xc8\xfe\xd4\x01,\x01\x90\xc8\xc8\xfe\xd4\x01,\x04L\xb0|\xfe\x0c|\xb0\xb0|\x01\xf4|\xb0\xc8\xfdD\x02\xbc\xc8\xfe\xd4d\x01\xf4d\xfe\xd4d\x01\xf4\x00\x00\x00\x04\xff\x9c\x00\x00\x04\xb0\x04L\x00\x0f\x00\x13\x00\x16\x00\x19\x00\x00\x13!2\x16\x15\x11\x14\x06#!\"&5\x1146\x17\x11!\x11\x01-\x01\x0d\x01\x11\xc8\x02\xbc|\xb0\xb0|\xfdD|\xb0\xb0\x18\x03\x84\xfe\x0c\xfe\xd4\x01,\x01\x90\xfe\xd4\x04L\xb0|\xfe\x0c|\xb0\xb0|\x01\xf4|\xb0\xc8\xfdD\x02\xbc\xfe\x0c\x96\x96\x96\x96\x01,\x00\x00\x00\x05\xff\x9c\x00\x00\x04\xb0\x04L\x00\x0f\x00\x13\x00\x17\x00 \x00)\x00\x00\x13!2\x16\x15\x11\x14\x06#!\"&5\x1146\x17\x11!\x11\x03!\x11!\x07#\"\x06\x15\x14\x16;\x01\x01\x1132654&#\xc8\x02\xbc|\xb0\xb0|\xfdD|\xb0\xb0\x18\x03\x84d\xfdD\x02\xbcd\x82&96)\x82\xfe\x0c\x82)69&\x04L\xb0|\xfe\x0c|\xb0\xb0|\x01\xf4|\xb0\xc8\xfdD\x02\xbc\xfd\xa8\x01\xf4dVAAT\x01,\xfe\xd4TAAV\x00\x00\x00\x05\xff\x9c\x00\x00\x04\xb0\x04L\x00\x0f\x00\x13\x00\x1f\x00%\x00)\x00\x00\x13!2\x16\x15\x11\x14\x06#!\"&5\x1146\x17\x11!\x11\x05#\x153\x11!535#\x11!\x01#\x11#53\x03#53\xc8\x02\xbc|\xb0\xb0|\xfdD|\xb0\xb0\x18\x03\x84\xfe\x0c\xc8\xc8\xfe\xd4\xc8\xc8\x01,\x01\x90dd\xc8\xc8dd\x04L\xb0|\xfe\x0c|\xb0\xb0|\x01\xf4|\xb0\xc8\xfdD\x02\xbc\xc8d\xfe\xd4dd\x01,\xfe\x0c\x01\x90d\xfe\x0cd\x00\x06\xff\x9c\x00\x00\x04\xb0\x04L\x00\x0f\x00\x13\x00\x19\x00\x1f\x00#\x00'\x00\x00\x13!2\x16\x15\x11\x14\x06#!\"&5\x1146\x17\x11!\x11\x053\x11!\x113\x01#\x11#53\x05\x1535\x01#53\xc8\x02\xbc|\xb0\xb0|\xfdD|\xb0\xb0\x18\x03\x84\xfdD\xc8\xfe\xd4d\x02Xdd\xc8\xfd\xa8d\x01,dd\x04L\xb0|\xfe\x0c|\xb0\xb0|\x01\xf4|\xb0\xc8\xfdD\x02\xbc\xc8\xfep\x01\xf4\xfe\x0c\x01\x90d\xc8\xc8\xc8\xfe\xd4d\x00\x05\xff\x9c\x00\x00\x04\xb0\x04L\x00\x0f\x00\x13\x00\x1c\x00\"\x00&\x00\x00\x13!2\x16\x15\x11\x14\x06#!\"&5\x1146\x17\x11!\x11\x01\x07#575#5!\x01#\x11#53\x03#53\xc8\x02\xbc|\xb0\xb0|\xfdD|\xb0\xb0\x18\x03\x84\xfe\x0c\xc7d\xc7\xc8\x01,\x01\x90dd\xc8\xc7dd\x04L\xb0|\xfe\x0c|\xb0\xb0|\x01\xf4|\xb0\xc8\xfdD\x02\xbc\xfep\xc82\xc8\x96d\xfe\x0c\x01\x90d\xfe\x0cd\x00\x00\x00\x03\x00	\x00	\x04\xa7\x04\xa7\x00\x0f\x00\x1b\x00%\x00\x00\x002\x1e\x02\x14\x0e\x02\".\x024>\x01\x04\"\x0e\x01\x14\x1e\x012>\x014&\x07!\x15!\x15!'57!\x01\xe0\xf0\xdb\x9e^^\x9e\xdb\xf0\xdb\x9e^^\x9e\x01\xc5\xe4\xc2qq\xc2\xe4\xc2qql\xfe\xd4\x01,\xfe\xd4dd\x01,\x04\xa7^\x9e\xdb\xf0\xdb\x9e^^\x9e\xdb\xf0\xdb\x9eLq\xc2\xe4\xc2qq\xc2\xe4\xc2\xd0\xc8dd\xc8d\x00\x00\x00\x00\x04\x00	\x00	\x04\xa7\x04\xa7\x00\x0f\x00\x1b\x00'\x00+\x00\x00\x002\x1e\x02\x14\x0e\x02\".\x024>\x01\x04\"\x0e\x01\x14\x1e\x012>\x014&\x07\x15\x07\x17\x15#'#\x15#\x11!\x07\x1535\x01\xe0\xf0\xdb\x9e^^\x9e\xdb\xf0\xdb\x9e^^\x9e\x01\xc5\xe4\xc2qq\xc2\xe4\xc2qql2ddd\x96d\x01,\xc8\xc8\x04\xa7^\x9e\xdb\xf0\xdb\x9e^^\x9e\xdb\xf0\xdb\x9eLq\xc2\xe4\xc2qq\xc2\xe4\xc2\xd0d2d2dd\x01\x90ddd\x00\x00\x02\xff\xf2\xff\x9d\x04\xc2\x04A\x00 \x006\x00\x00\x012\x16\x17632\x16\x14\x06+\x0154&#!\"\x06\x1d\x01#\"&5467&54>\x01\x1332\x16\x15\x1132\x16\x0f\x01\x06\"/\x01&6;\x01\x1146\x01\xf7n\xb5,,.x\xaa\xaax\x80\x1d\x15\xfe\xd4\x15\x1d\xdePpVA\x02b\xaaz\x96\n\x0f\x89\x15\n\x0d\xdf\x0d&\x0d\xdf\x0d\n\x15\x89\x0f\x04Awa\x0e\xad\xf1\xad\xfa\x15\x1d\x1d\x15\xfasOEk\x0e\x13\x12d\xaab\xfd\xb3\x0f\n\xfe\xed\x17\x10\xf4\x10\x10\xf4\x10\x17\x01\x13\n\x0f\x00\x00\x00\x00\x02\xff\xf2\xff\x9c\x04\xc3\x04A\x00\x1c\x003\x00\x00\x012\x16\x17632\x16\x17\x14\x06\x07\x01&\"\x07\x01#\"&5467&54>\x01\x13\x17\x16\x06+\x01\x11\x14\x06+\x01\"&5\x11#\"&76762\x01\xf6n\xb6,+.y\xaa\x01xZ\xfe\x86\x0d%\x0d\xfe\x83	OqVA\x02b\xa9\xe6\xdf\x0d\n\x15\x89\x0f\n\x96\n\x0f\x89\x15\n\x0d\xc7\x18\x13\x19\x04Awa\x0f\xadxc\xa4\x1c\x01h\x10\x10\xfe\x93sOEk\x0e\x13\x13d\xa9c\xfd\x92\xe4\x10\x17\xfe\xed\n\x0f\x0f\n\x01\x13\x17\x10\xcc\x18\x13\x00\x00\x00\x01\x00d\x00\x00\x04L\x04m\x00\x18\x00\x00%5!\x013\x013	\x013\x013\x01!\x15#\"\x06\x1d\x01!54&#\x02\xbc\x01\x90\xfe\xf2\xaa\xfe\xf2\xaa\xfe\xd4\xfe\xd4\xaa\xfe\xf2\xaa\xfe\xf2\x01\x902\x15\x1d\x01\x90\x1d\x15dd\x01,\x01,\x01M\xfe\xb3\xfe\xd4\xfe\xd4d\x1d\x1522\x15\x1d\x00\x00\x00\x00\x01\x00y\x00\x00\x047\x04\x9b\x00/\x00\x00\x012\x16\x17\x1e\x01\x15\x14\x06\x07\x16\x15\x14\x06#\"'\x152\x16\x1d\x01!54635\x06#\"&547.\x0154632\x174&546\x02X^\x93\x1aY{;2	iJ7-\x15\x1d\xfe\xd4\x1d\x15-7Ji\x04/9iJ\x05\x12\x02\xa3\x04\x9bqY\x06\x83Z=g\x1f\x1d\x1aJi\x1e\xfb\x1d\x1522\x15\x1d\xfb\x1eiJ\x12\x14\x15X5Ji\x02\x02\x10\x05t\xa3\x00\x00\x00\x06\x00'\x00\x14\x04\x89\x04\x9c\x00\x11\x00*\x00B\x00J\x00b\x00{\x00\x00\x01\x16\x12\x02\x07\x0e\x01\"&'&\x02\x127>\x012\x16\x05\"\x07\x0e\x01\x07\x06\x16\x1f\x01\x163276767>\x01/\x01&'&\x17\"\x07\x0e\x01\x07\x06\x16\x1f\x01\x16327>\x017>\x01/\x01&'&\x16&\"\x06\x14\x16267\"\x07\x0e\x01\x07\x0e\x01\x1f\x01\x16\x17\x16327>\x0176&/\x01&\x17\"\x07\x06\x07\x06\x07\x0e\x01\x1f\x01\x16\x17\x16327>\x0176&/\x01&\x03\xf2oOOoS\xd9\xdc\xd9SoOOoS\xd9\xdc\xd9\xfe=\x04\x04y\xb1\"\x04\x0d\x0c$\x03\x04\x17\x06\x1bGF`\x0b\x0d\x03	\x03\x0b\x07\x1c\x04\x05Pu\x18\x04\x0c\x0d\"\x04\x04\x16\x06\x12Q9\x0c\x0c\x03	\x03\x0b\x07\xf9c\x8ccc\x8ccV\x16\x06\x12Q:\x0b\x0c\x03	\x03\x0b\x07\x08\x04\x05Pu\x18\x04\x0d\x0c\"\x04\x8d\x17\x06\x1bGF`\x0b\x0d\x03	\x03\x0b\x07\x08\x04\x04y\xb1\"\x04\x0d\x0c$\x03\x03\xf2o\xfe\xd5\xfe\xd5oSWWSo\x01+\x01+oSWW\x1c\x01\"\xb1y\x0c\x16\x03	\x01\x16`FG\x1b\x03\x15\x0c#\x0d\x06\x04\x91\x02\x18uP\x0d\x16\x03	\x01\x15:Q\x12\x03\x15\x0b#\x0c\x07\x04\xfacc\x8ccc\x15\x15:Q\x11\x04\x15\x0b#\x0c\x07\x04\x02\x18uP\x0d\x16\x03	\x01$\x16`FG\x1b\x03\x15\x0c#\x0d\x06\x04\x01\"\xb1y\x0c\x16\x03	\x01\x00\x00\x00\x05\x00d\x00\x00\x03\xe8\x04\xb0\x00\x0c\x00\x0f\x00\x16\x00\x1c\x00\"\x00\x00\x01!\x11#5!\x15!\x11463!\x01#5\x033\x07'353\x03!\"&5\x11\x05\x15\x14\x06+\x01\x02\xbc\x01,\xb4\xfe\xac\xfe\x84\x0f\n\x02?\x01,\xc8d\xa2\xd4\xd4\xa2d\xb4\xfeu\n\x0f\x03\x84\x0f\n\xc3\x03 \xfe\x84\xc8\xc8\x02\xf3\n\x0f\xfe\xd4\xc8\xfc\xe0\xd4\xd4\xc8\xfe\x0c\x0f\n\x01\x8b\xc8\xc3\n\x0f\x00\x00\x00\x00\x05\x00d\x00\x00\x03\xe8\x04\xb0\x00	\x00\x0c\x00\x13\x00\x1a\x00!\x00\x00\x01!\x11	\x01\x11463!\x01#5\x13#\x15#5#7\x03!\"&=\x01)\x01\x15\x14\x06+\x015\x02\xbc\x01,\xfe\xa2\xfd\xda\x0f\n\x02?\x01,\xc8>\xa2d\xa2\xd4\xaa\xfe\x9d\n\x0f\x01|\x02\x08\x0f\n\x9b\x03 \xfd\xf8\x01^\xfd\xda\x04G\n\x0f\xfe\xd4\xc8\xfc|\xc8\xc8\xd4\xfed\x0f\n77\n\x0fP\x00\x00\x00\x00\x03\x00\x00\x00\x00\x04\xb0\x03\xf4\x00\x08\x00\x19\x00\x1f\x00\x00\x01#\x153\x17!\x11#7\x0532\x1e\x02\x15!\x15!\x03\x1134>\x02\x013\x03!\x01!\x04\x8a\xa2dd\xfe\xd4\xa2\xd4\xfd\x12\xc8\x1b\x1a!\x0e\x01,\xfd\xa8\xc8d\x0e!\x1a\x02s\xf0\xf0\xfc\xe0\x01,\x01\xf4\x03 \xc8d\x01,\xd4\xd4\x04\x11+$d\xfe\xa2\x01\xc2$+\x11\x04\xfep\xfep\x01\xf4\x00\x00\x00\x03\x00\x00\x00\x00\x04L\x04L\x00\x19\x002\x009\x00\x00\x0132\x16\x1d\x0132\x16\x1d\x01\x14\x06#!\"&=\x0146;\x01546\x0552\x16\x15\x11\x14\x06#!\"'7\x01\x11463\x15\x14\x163!26\x01\x075#535\x02\x8ad\x15\x1d2\x15\x1d\x1d\x15\xfe\xd4\x15\x1d\x1d\x152\x1d\x01s);;)\xfd\xa8\x01\x13\xf6\xfe\xba;)X>\x01,>X\xfd\xb4\xd4\xc8\xc8\x04L\x1d\x152\x1d\x15d\x15\x1d\x1d\x15d\x15\x1d2\x15\x1d\xfa\x96;)\xfc\xe0);\x04\xf6\x01F\x01D);\x96>XX\xfd\xe6\xd4\xa2d\xa2\x00\x03\x00d\x00\x00\x04\xbc\x04L\x00\x19\x006\x00=\x00\x00\x0132\x16\x1d\x0132\x16\x1d\x01\x14\x06#!\"&=\x0146;\x01546\x0552\x16\x15\x11#\x113\x14\x0e\x02#!\"&5\x11463\x15\x14\x163!26\x01\x075#535\x01\xc2d\x15\x1d2\x15\x1d\x1d\x15\xfe\xd4\x15\x1d\x1d\x152\x1d\x01s);\xc8\xc8\x0e!\x1a\x1b\xfd\xa8);;)X>\x01,>X\x01\x9c\xd4\xc8\xc8\x04L\x1d\x152\x1d\x15d\x15\x1d\x1d\x15d\x15\x1d2\x15\x1d\xfa\x96;)\xfe\x0c\xfe\xd4$+\x11\x04;)\x03 );\x96>XX\xfd\xe6\xd4\xa2d\xa2\x00\x00\x00\x03\xff\xa2\x00\x00\x05\x16\x04\xd4\x00\x0b\x00\x1b\x00\x1f\x00\x00	\x01\x16\x06#!\"&7\x0162\x13#\"\x06\x17\x13\x1e\x01;\x01267\x136&\x03\x1535\x02\x92\x02}\x17 ,\xfb\x04, \x17\x02}\x16@D\xd0\x14\x18\x04:\x04#\x146\x14#\x04:\x04\x18\xe0\xc8\x04\xad\xfb\xb0&77&\x04P'\xfeL\x1d\x14\xfe\xd2\x14\x1d\x1d\x14\x01.\x14\x1d\xfe\x0cdd\x00\x00\x00\x00	\x00\x00\x00\x00\x04L\x04L\x00\x0f\x00\x1f\x00/\x00?\x00O\x00_\x00o\x00\x7f\x00\x8f\x00\x00\x0132\x16\x1d\x01\x14\x06+\x01\"&=\x0146\x1332\x16\x1d\x01\x14\x06+\x01\"&=\x0146!32\x16\x1d\x01\x14\x06+\x01\"&=\x0146\x0132\x16\x1d\x01\x14\x06+\x01\"&=\x0146!32\x16\x1d\x01\x14\x06+\x01\"&=\x0146!32\x16\x1d\x01\x14\x06+\x01\"&=\x0146\x0132\x16\x1d\x01\x14\x06+\x01\"&=\x0146!32\x16\x1d\x01\x14\x06+\x01\"&=\x0146!32\x16\x1d\x01\x14\x06+\x01\"&=\x0146\x01\xa9\xfa\n\x0f\x0f\n\xfa\n\x0f\x0f\n\xfa\n\x0f\x0f\n\xfa\n\x0f\x0f\x01\x9a\xfa\n\x0f\x0f\n\xfa\n\x0f\x0f\xfc\xea\xfa\n\x0f\x0f\n\xfa\n\x0f\x0f\x01\x9a\xfa\n\x0f\x0f\n\xfa\n\x0f\x0f\x01\x9a\xfa\n\x0f\x0f\n\xfa\n\x0f\x0f\xfc\xea\xfa\n\x0f\x0f\n\xfa\n\x0f\x0f\x01\x9a\xfa\n\x0f\x0f\n\xfa\n\x0f\x0f\x01\x9a\xfa\n\x0f\x0f\n\xfa\n\x0f\x0f\x04L\x0f\n\x96\n\x0f\x0f\n\x96\n\x0f\xfe\xd4\x0f\n\x96\n\x0f\x0f\n\x96\n\x0f\x0f\n\x96\n\x0f\x0f\n\x96\n\x0f\xfe\xd4\x0f\n\x96\n\x0f\x0f\n\x96\n\x0f\x0f\n\x96\n\x0f\x0f\n\x96\n\x0f\x0f\n\x96\n\x0f\x0f\n\x96\n\x0f\xfe\xd4\x0f\n\x96\n\x0f\x0f\n\x96\n\x0f\x0f\n\x96\n\x0f\x0f\n\x96\n\x0f\x0f\n\x96\n\x0f\x0f\n\x96\n\x0f\x00\x00\x00\x03\x00\x00\x00\x00\x04\xb0\x05\x14\x00\x19\x00)\x003\x00\x00\x013\x15#\x15!2\x16\x0f\x01\x06\x07!&/\x01&63!5#5353\x01!2\x16\x14\x06+\x01\x17!7#\"&46\x03!2\x16\x1d\x01!546\x02\xbcdd\x01^>1\x1cB)(\xfc\xfc()B\x1c1>\x01^dd\xc8\xfe>\x02\xbc\x15\x1d\x1d\x15\x0c\x89\xfcJ\x8a\x0d\x15\x1d\x1d\xb3\x04L\x15\x1d\xfbP\x1d\x04\xb0\xc8dO7\x84S33S\x847Od\xc8d\xfc|\x1d*\x1ddd\x1d*\x1d\xfe\xd4\x1d\x1522\x15\x1d\x00\x00\x04\x00\x00\x00\x00\x04\xb0\x05\x14\x00\x05\x00\x19\x00+\x005\x00\x00\x002\x16\x15#4\x07!\x16\x15\x14\x07!2\x16\x0f\x01!'&63!&54\x03!2\x16\x14\x06+\x01\x15\x05!%5#\"&46\x03!2\x16\x1d\x01!546\x020P9\xc2<\x01:\x12\x03\x01H)\x07\"\xaf\xfdZ\xb2\"\n)\x01H\x03\xaf\x02\xbc\x15\x1d\x1d\x15\x96\x01\x13\xfcJ\x01\x13\x96\x15\x1d\x1d\xb3\x04L\x15\x1d\xfbP\x1d\x05\x14;))\x8d%&\x08\x11!\x16\x91\x91\x16!\x11\x08&\xfe\x95\x1d*\x1d\xc8\xc8\xc8\xc8\x1d*\x1d\xfd\xa8\x1d\x1522\x15\x1d\x00\x04\x00\x00\x00\x00\x04\xb0\x04\x9d\x00\x07\x00\x14\x00$\x00.\x00\x00\x002\x16\x14\x06\"&4\x1332\x16\x15\x14\x17!65463\x01!2\x16\x14\x06+\x01\x17!7#\"&46\x03!2\x16\x1d\x01!546\x02\x0d\x96jj\x96j\xb7.\"+'\xfe\xbc'+#\xfe\xcd\x02\xbc\x15\x1d\x1d\x15\x0d\x8a\xfcJ\x89\x0c\x15\x1d\x1d\xb3\x04L\x15\x1d\xfbP\x1d\x04\x9dj\x96jj\x96\xfe\xeb9:LkkL:9\xfer\x1d*\x1ddd\x1d*\x1d\xfe\xd4\x1d\x1522\x15\x1d\x00\x04\x00\x00\x00\x00\x04\xb0\x05\x14\x00\x0f\x00\x1c\x00,\x006\x00\x00\x012\x1e\x01\x15\x14\x06\"&547\x177'6\x1332\x16\x15\x14\x17!65463\x01!2\x16\x14\x06+\x01\x17!7#\"&46\x03!2\x16\x1d\x01!546\x02X/[3o\x9co\"\x90o\xa3\"\x1f.\"+'\xfe\xbc'+#\xfe\xcd\x02\xbc\x15\x1d\x1d\x15\x0d\x8a\xfcJ\x89\x0c\x15\x1d\x1d\xb3\x04L\x15\x1d\xfbP\x1d\x05\x14k\x8b6NooN>Q\x8fo\xa3\x1a\xfe\n9:LkkL:9\xfer\x1d*\x1ddd\x1d*\x1d\xfe\xd4\x1d\x1522\x15\x1d\x00\x00\x00\x03\x00\x00\x00\x00\x04\xb0\x05\x12\x00\x12\x00\"\x00,\x00\x00\x01\x05\x15!\x14\x1e\x03\x17!.\x0154>\x027\x01!2\x16\x14\x06+\x01\x17!7#\"&46\x03!2\x16\x1d\x01!546\x02X\x01,\xfe\xd4%??M\x13\xfd\xee<=Bm\x8fJ\xfe\xa2\x02\xbc\x15\x1d\x1d\x15\x0d\x8a\xfcJ\x89\x0c\x15\x1d\x1d\xb3\x04L\x15\x1d\xfbP\x1d\x04\xb0\xa1\x8b9fQ?H\x19S\xbdTT\xa1vK\x04\xfc~\x1d*\x1ddd\x1d*\x1d\xfe\xd4\x1d\x1522\x15\x1d\x00\x02\x00\xc8\x00\x00\x03\xe8\x05\x14\x00\x0f\x00)\x00\x00\x002\x16\x1d\x01\x1e\x01\x1d\x01!546754\x03!2\x16\x17#\x153\x15#\x153\x15#\x153\x14\x06#!\"&5\x1146\x02/R;.6\xfep6.d\x01\x906\\\x1a\xac\xc8\xc8\xc8\xc8\xc8uS\xfepSuu\x05\x14;)N\x1a\\6226\\\x1aN)\xfeG6.dddddSuuS\x01\x90Su\x00\x00\x03\x00d\xff\xff\x04L\x04L\x00\x0f\x00/\x003\x00\x00\x13!2\x16\x15\x11\x14\x06#!\"&5\x1146\x03!2\x16\x1d\x01\x14\x06#!\x17\x16\x14\x06\"/\x01!\x07\x06\"&4?\x01!\"&=\x0146\x05\x07!'\x96\x03\x84\x15\x1d\x1d\x15\xfc|\x15\x1d\x1d\x04\x03\xb6\n\x0f\x0f\n\xfe\xe5\xe0\x0d\x1a%\x0dX\xfd\xf4W\x0d&\x1a\x0d\xe0\xfe\xdf\n\x0f\x0f\x01\xaad\x01Dd\x04L\x1d\x15\xfe\x0c\x15\x1d\x1d\x15\x01\xf4\x15\x1d\xfdD\x0f\n2\n\x0f\xe0\x0d%\x1b\x0dXX\x0d\x1b%\x0d\xe0\x0f\n2\n\x0fddd\x00\x00\x00\x00\x04\x00\x00\x00\x00\x04\xb0\x04L\x00\x19\x00#\x00-\x007\x00\x00\x13!2\x16\x1d\x01#4&+\x01\"\x06\x15#4&+\x01\"\x06\x15#546\x03!2\x16\x15\x11!\x1146\x13\x15\x14\x06+\x01\"&=\x01!\x15\x14\x06+\x01\"&=\x01\xc8\x03 Sud;)\xfa);d;)\xfa);du\x11\x03\xe8);\xfbP;\xf1\x1d\x15d\x15\x1d\x03\xe8\x1d\x15d\x15\x1d\x04LuS\xc8);;));;)\xc8Su\xfe\x0c;)\xfe\xd4\x01,);\xfe\x0c2\x15\x1d\x1d\x1522\x15\x1d\x1d\x152\x00\x03\x00\x01\x00\x00\x04\xa9\x04\xac\x00\x0d\x00\x11\x00\x1b\x00\x00	\x01\x16\x14\x0f\x01!\x01&47\x0162	\x03\x03!2\x16\x1d\x01!546\x01\xe0\x02\xaa\x1f\x1f\x83\xfe\x1f\xfd\xfb  \x01'\x1fY\xfe\xac\x01V\x01/\xfe\xab\xa2\x03 \x15\x1d\xfc|\x1d\x04\x8d\xfdU\x1fY\x1f\x83\x02\x06\x1fY\x1f\x01(\x1f\xfen\xfe\xaa\x010\x01U\xfc\x1b\x1d\x1522\x15\x1d\x00\x00\x00\x00\x02\x00\x8f\x00\x00\x04!\x04\xb0\x00\x17\x00/\x00\x00\x01\x03.\x01#!\"\x06\x07\x03\x06\x163!\x15\x14\x1626=\x01326\x03!546;\x01546;\x01\x113\x1132\x16\x1d\x0132\x16\x15\x04!\xbd\x08'\x15\xfep\x15'\x08\xbd\x08\x13\x15\x02q\x1d*\x1d}\x15\x13\xa8\xfd\xad\x1d\x152\x1d\x150\xc8/\x15\x1d2\x15\x1d\x02\x87\x01\xfa\x13\x1c\x1c\x13\xfe\x06\x13\x1c\x96\x15\x1d\x1d\x15\x96\x1c\xfd\x8c2\x15\x1d2\x15\x1d\x01,\xfe\xd4\x1d\x152\x1d\x15\x00\x00\x04\x00\x00\x00\x00\x04\xb0\x04\xb0\x00\x0d\x00\x10\x00\x1f\x00\"\x00\x00\x01!\x11\x14\x06#!\x11\x015463!\x01#5\x01!\x11\x14\x06#!\"&5\x11463!\x01#5\x03\x84\x01,\x0f\n\xfe\x89\xfe\xd4\x0f\n\x01w\x01,\xc8\xfd\xa8\x01,\x0f\n\xfdv\n\x0f\x0f\n\x01w\x01,\xc8\x03 \xfd\xc1\n\x0f\x02O\x01,T\n\x0f\xfe\xd4\xc8\xfe\x0c\xfd\xc1\n\x0f\x0f\n\x03\xb6\n\x0f\xfe\xd4\xc8\x00\x02\xff\x9c\x00d\x05\x14\x04G\x00F\x00V\x00\x00\x0132\x1e\x02\x17\x16\x17\x16676'&7>\x01\x16\x17\x16\x07\x0e\x01+\x01\x0e\x01\x0f\x01\x0e\x01+\x01\"&?\x01\x06+\x01\"'\x07\x0e\x01+\x01\"&?\x01&/\x01.\x01=\x0146;\x0167'&6;\x016\x05#\"\x06\x1d\x01\x14\x16;\x0126=\x014&\x01\xe4\xc3K\x8ejI\x0c\x12\x11\x1fC\n\n\x19\x13\n\x05\x0f\x17\x0c)\x02\x03V=>\x078\x1c'\x03\"\x15d\x15\x18\x03\x0c1*\xc3\x18)\x0b\x03\"\x15d\x15\x18\x03\x1aT,\x9f\x13\x1c\x1d\x15|\x0b-o\x10\x07\x15\xcbt\x01E\xfa\n\x0f\x0f\n\xfa\n\x0f\x0f\x04GAk\x8aI\x0e\x06\n! \"%\x1b\x10\x08\x06\x08\x0c,=?W7|&\xea\x14\x1d\x1d\x14F\x0e\x08@\x14\x1d\x1d\x14\x9dJe5\x07&\x152\x15\x1dWO_\x0e\x13e_\x0f\n2\n\x0f\x0f\n2\n\x0f\x00\x06\xff\x9c\xff\xe6\x05\x14\x04~\x00	\x00$\x004\x00<\x00R\x00b\x00\x00\x01%6\x16\x1f\x01\x16\x06\x0f\x01%32\x16\x1f\x01!2\x16\x1d\x01\x14\x06\x07\x05\x06&'&#!\"&=\x0146\x17#\"\x06\x1d\x01\x14;\x012654&'&\x04\"\x06\x14\x16264\x017>\x01\x1e\x01\x17\x1e\x01?\x01\x17\x16\x06\x0f\x01\x06&/\x01&6%\x07\x06\x1f\x01\x1e\x01?\x016'.\x01'.\x01\x02\x81\x01\xa7\x13.\x0e \x0e\x03\x10\x8b\xfc+jCH\x1ef\x037\x15\x1d\x1c\x13\xfd\x1f\x17\"	*:\xfe\xd4>XX\xb9P\x13\x12*\x86\x10\x0b \x0b\x12\x01\x80@--@-\xfe\x0f\x98\x12 \x1e\x13\x10\x1c-\x1a?0\x0d!3P/|)\x82(	\x01)f\x1f!%\x0d\x1d\x11=\x13\x05\x02\x14\x07\x0b\x10\x03\x84\xf7\x08\x0b\x10&\x0f*\x0dx\xc8\"6\xd4\x1d\x152\x15&\x07\x84\x04\x14\x0fCX>\xc8>X\xac\x1c\x1583\x10\x10\x0bD\x11\x1c\xc9-@--@\xfe\xdb\x82\x13\n\x11\x12\x13# \x03\x05\xb3=I+E(	/\x97/}\x1cX\x1b&+\x0f	\x0b5\x10!\x14H	\x0c\x04\x00\x00\x00\x00\x03\x00d\x00\x00\x049\x04\xb0\x00Q\x00`\x00o\x00\x00\x0132\x16\x1d\x01\x1e\x01\x17\x16\x0e\x02\x0f\x012\x1e\x05\x15\x14\x0e\x05#\x15\x14\x06+\x01\"&=\x01#\x15\x14\x06+\x01\"&=\x01#\"&=\x0146;\x01\x11#\"&=\x0146;\x01546;\x012\x16\x1d\x013546\x03\x15!2>\x02574.\x03#\x01\x15!2>\x02574.\x03#\x02q\x96\n\x0fOh\x01\x01 ..\x10\x11\x06\x1240:*\x1d\x17\"6-@#\x1a\x0f\n\x96\n\x0fd\x0f\n\x96\n\x0f\xaf\n\x0f\x0f\nKK\n\x0f\x0f\n\xaf\x0f\n\x96\n\x0fd\x0f\xd7\x01\x07\x1c)\x13\x0b\x01\x01\x0b\x13)\x1c\xfe\xf9\x01k\x1c)\x13\x0b\x01\x01\x0b\x13)\x1c\x04\xb0\x0f\nm!mJ.M-\x1f\x06\x06\x03\x0f\x14(2N-;]<*\x15\x0b\x02K\n\x0f\x0f\nKK\n\x0f\x0f\nK\x0f\n\x96\n\x0f\x02X\x0f\n\x96\n\x0fK\n\x0f\x0f\nKK\n\x0f\xfe\xd4\xc8\x15\x1d\x1d\x0b\n\x04\x0e\"\x1a\x16\xfep\xc8\x15\x1d\x1d\x0b\n\x04\x0e\"\x1a\x16\x00\x00\x03\x00\x04\x00\x02\x04\xb0\x04\xae\x00\x17\x00)\x00,\x00\x00\x13!2\x16\x15\x11\x14\x06\x0f\x01\x0e\x01#!\"&'.\x025\x1146\x04\"\x0e\x04\x0f\x01\x17!7.\x05\x03#\x13\xd4\x03\x0cVz$\x12\x12\x1d\x81R\xfd\xc4R\x82\x1c\x08\x18(z\x02 \x8c}VG+\x1d\x06\x06\x9c\x020\x9c\x02\x08 )IU!\x9d\xc3\x04\xaezV\xfe`3\xb7BBWwvX\x1cZ\xc53\x01\xa0Vz\x99\x17&--%\x0c\x0c\xf3\xf3\x05\x0f,(1#\xfe\xc2\x01\x05\x00\x02\x00\xc8\x00\x00\x03\x84\x05\x14\x00\x0f\x00\x19\x00\x00\x0132\x16\x15\x11\x14\x06#!\"&5\x1146\x01\x15\x14\x06+\x01\"&=\x01\x01\xdb\x96g\xacT)\xfe>)T\xac\x01H6\x15\x96\x156\x05\x14\xacg\xfe\x0c)TT)\x01\xf4g\xac\xfc\x18\xe1\x1566\x15\xe1\x00\x00\x02\x00\xc8\x00\x00\x03\x84\x05\x14\x00\x0f\x00\x19\x00\x00\x013\x14\x163\x11\x14\x06#!\"&5\x1146\x01\x15\x14\x06+\x01\"&=\x01\x01\xdb`\xb3\x96T)\xfe>)T\xac\x01H6\x15\x96\x156\x05\x14\x96\xb3\xfeB)TT)\x01\xf4g\xac\xfc\x18\xe1\x1566\x15\xe1\x00\x00\x02\x00\x00\x00\x14\x05\x0e\x04\x1a\x00\x14\x00\x1a\x00\x00	\x01%\x07\x15\x17\x15'\x075754&>\x02?\x01'	\x01\x05%5\x05%\x05\x0e\xfd\x82\xfe\x86Nd\x96\x96d\x01\x01\x01\x05\x04/\x93\x02\x82\x01\\\xfe\xa2\xfe\xa2\x01^\x01^\x02\xff\xfe\xe5\xaa<\xe0\x96\xc7\x94\x95\xc8\x96\xfa\x04\x0d\x06\n\x06\x03(A\x01\x1b\xfdb\xa6\xa6\x93\xa5\xa5\x00\x00\x03\x00d\x01\xf4\x04\xb0\x03 \x00\x07\x00\x0f\x00\x17\x00\x00\x122\x16\x14\x06\"&4$2\x16\x14\x06\"&4$2\x16\x14\x06\"&4\xbc|XX|X\x01\xe8|XX|X\x01\xe8|XX|X\x03 X|XX|XX|XX|XX|XX|\x00\x00\x00\x00\x03\x01\x90\x00\x00\x02\xbc\x04L\x00\x07\x00\x0f\x00\x17\x00\x00\x002\x16\x14\x06\"&4\x122\x16\x14\x06\"&4\x122\x16\x14\x06\"&4\x01\xe8|XX|XX|XX|XX|XX|X\x04LX|XX|\xfe\xc8X|XX|\xfe\xc8X|XX|\x00\x00\x00\x03\x00d\x00d\x04L\x04L\x00\x0f\x00\x1f\x00/\x00\x00\x13!2\x16\x1d\x01\x14\x06#!\"&=\x0146\x13!2\x16\x1d\x01\x14\x06#!\"&=\x0146\x13!2\x16\x1d\x01\x14\x06#!\"&=\x0146}\x03\xb6\n\x0f\x0f\n\xfcJ\n\x0f\x0f\n\x03\xb6\n\x0f\x0f\n\xfcJ\n\x0f\x0f\n\x03\xb6\n\x0f\x0f\n\xfcJ\n\x0f\x0f\x04L\x0f\n\x96\n\x0f\x0f\n\x96\n\x0f\xfep\x0f\n\x96\n\x0f\x0f\n\x96\n\x0f\xfep\x0f\n\x96\n\x0f\x0f\n\x96\n\x0f\x00\x00\x00\x04\x00\x00\x00\x00\x04\xb0\x04\xb0\x00\x0f\x00\x1f\x00/\x003\x00\x00\x01!2\x16\x15\x11\x14\x06#!\"&5\x1146\x05!\"\x06\x15\x11\x14\x163!265\x114&\x05!2\x16\x15\x11\x14\x06#!\"&5\x1146\x17\x15!5\x01^\x01\xf4\xa2\xbc\xbb\xa3\xfe\x0c\xa5\xb9\xb9\x02\xcb\xfd\xa8);;)\x02X);;\xfd\xb1\x01\xf4\x15\x1d\x1d\x15\xfe\x0c\x15\x1d\x1dG\x01\x90\x04\xb0\xbb\xa3\xfe\x0c\xa5\xb9\xb9\xa5\x01\xf4\xa5\xb9\xc8;)\xfd\xa8);;)\x02X);d\x1d\x15\xfe\xd4\x15\x1d\x1d\x15\x01,\x15\x1dd\xc8\xc8\x00\x00\x00\x00\x01\x00d\x00d\x04\xb0\x04L\x00;\x00\x00\x13!2\x16\x14\x06+\x01\x1532\x16\x14\x06+\x01\x1532\x16\x14\x06+\x01\x1532\x16\x14\x06#!\"&46;\x015#\"&46;\x015#\"&46;\x015#\"&46\x96\x03\xe8\x15\x1d\x1d\x1522\x15\x1d\x1d\x1522\x15\x1d\x1d\x1522\x15\x1d\x1d\x15\xfc\x18\x15\x1d\x1d\x1522\x15\x1d\x1d\x1522\x15\x1d\x1d\x1522\x15\x1d\x1d\x04L\x1d*\x1d\xc8\x1d*\x1d\xc8\x1d*\x1d\xc8\x1d*\x1d\x1d*\x1d\xc8\x1d*\x1d\xc8\x1d*\x1d\xc8\x1d*\x1d\x00\x00\x00\x06\x01,\x00\x05\x03\xe8\x04\xa3\x00\x07\x00\x0d\x00\x13\x00\x19\x00\x1f\x00*\x00\x00\x01\x1e\x01\x06\x07.\x016\x012\x16\x15\"&%\x14\x06#46\x012\x16\x15\"&%\x14\x06#46\x03\x15\x14\x06\"&=\x01\x1632\x02\x8aW??WW??\xfe\xf9|\xb0|\xb0\x02\xbc\xb0|\xb0\xfd\xc0|\xb0|\xb0\x02\xbc\xb0|\xb0\xb0\x1d*\x1d(\x03\x11\x04\xa3C\xb2\xb2BB\xb2\xb2\xfe\xc0\xb0|\xb0||\xb0|\xb0\xfe\xd4\xb0|\xb0||\xb0|\xb0\xfe\xd3\x90\x15\x1d\x1d\x15\x8e\x04\x00\x00\x01\xff\xb5\x00\xc8\x04\x94\x03\x81\x00B\x00\x00\x0176\x17\x01\x1e\x01\x07\x0e\x01+\x012\x15\x14\x0e\x04+\x01\"\x1147&\"\x07\x16\x15\x10+\x01\".\x03543#\"&'&67\x016\x1f\x01\x1e\x01\x0e\x01/\x01\x07!'\x07\x06.\x016\x02\xe9E\x19\x14\x01*\x0b\x08\x06\x05\x1a\x0f\x08\x01\x04\x0d\x1b'?)\x92\xb8\n\x14T\x15\x0b\xb8\x8e0I'\x19\x07\x02\x07\x0f\x19\x06\x06\x08\x0b\x01*\x14\x1aL\x14\x15\n#\x143\xb6\x03{\xb6,\x14#\n\x16\x03n\x13\x06\x12\xfe\xd9\x0b\x1f\x0f\x0e\x13\x0d\x1d6F82\x1c\x01 \x18\x17\x04\x04\x18\x17\xfe\xe0*<SC#\x0d\x13\x0e\x0f\x1f\n\x01(\x12\x07\x13\x05#(\x16\x06\x0c\xc1\xc1\x0c\x05\x16(#\x00\x00\x00\x00\x02\x00\x00\x00\x00\x04\xb0\x04\xb0\x00%\x00C\x00\x00\x01#4.\x05+\x01\x11\x14\x16\x1f\x01\x15!52>\x035\x11#\"\x0e\x05\x15#\x11!\x01#4.\x03+\x01\x11\x14\x16\x173\x15#525\x11#\"\x0e\x03\x15#5!\x04\xb02\x08\x0b\x19\x13&\x18\x19\xc82\x19\x19\xfep\x04\x0e\"\x1a\x16\xc8\x19\x18&\x13\x19\x0b\x082\x03\xe8\xfdD\x19\x08\n\x18\x10\x11d\x19\x0d\x0c\xc82d\x11\x10\x18\n\x08\x19\x01\xf4\x03\x84\x15 \x15\x0e\x08\x03\x01\xfc\xae\x16\x19\x01\x02dd\x01\x05	\x15\x0e\x03R\x01\x03\x08\x0e\x15 \x15\x01,\xfd\x12\x0f\x13\n\x05\x01\xfeW\x0b\x0d\x0122\x19\x01\xa9\x01\x05\n\x13\x0f\x96\x00\x00\x00\x00\x03\x00\x00\x00\x00\x04L\x04\xae\x00\x1d\x00 \x000\x00\x00\x015\"'.\x01/\x01\x01#\x01\x06\x07\x0e\x01\x0f\x01\x15!5\"&?\x01!\x17\x16\x06#\x15\x01\x1b\x01\x01\x15\x14\x06#!\"&=\x01463!2\x16\x03\xe8\x19\x1e\x0e\x16\x05\x04\xfe\xdfE\xfe\xd4\x12\x15	\x1f\x0b\x0b\x01\x111;\x12E\x01%=\x0d!'\xfe\xec\x86y\x01\xb1\x1d\x15\xfc\x18\x15\x1d\x1d\x15\x03\xe8\x15\x1d\x01,2 \x0e\"\n\x0b\x02\xeb\xfd\x0e#\x15	\x13\x05\x0522+.\xb0\xa6\"A2\x01\x87\x01V\xfe\xaa\xfd\xe3d\x15\x1d\x1d\x15d\x15\x1d\x1d\x00\x03\x00\x00\x00\x00\x04\xb0\x04\xb0\x00\x0f\x00G\x00J\x00\x00\x13!2\x16\x15\x11\x14\x06#!\"&5\x1146\x05#\"\x07\x01\x06\x07\x06\x07\x06\x1d\x01\x14\x163!26=\x014&#\"'&?\x01!\x17\x16\x07\x06#\"\x06\x1d\x01\x14\x163!26=\x014&'\"'&'#\x01&\x13#\x132\x04L\x15\x1d\x1d\x15\xfb\xb4\x15\x1d\x1d\x02FF\x0d\x05\xfe\xd5\x11\x12\x12&\x0c\x0b	\x01\x11\x08\x0c\x0c\x087\x10\n\n?\x01\n9\x0b\x11\x0c\x18\x08\x0c\x0c\x08\x019\x08\x0c\x0b\x08\x11\x19\x19\x0f\x01\xfe\xe0\x05\x0e\xc5g\x04\xb0\x1d\x15\xfb\xb4\x15\x1d\x1d\x15\x04L\x15\x1dR\x0c\xfd\x0f \x13\x12\x10\x05\x0d2\x08\x0c\x0c\x082\x08\x0c\x17\x0e\x19\xa3\x99\x1f\x18\x11\x0c\x082\x08\x0c\x0c\x082\x07\x0c\x01\x19\x1b$\x02\xec\x0c\xfe\x05\x01\x08\x00\x00\x04\x00\x00\x00\x00\x04\xb0\x04\xb0\x00\x03\x00\x13\x00#\x00'\x00\x00\x01!5!\x05!2\x16\x15\x11\x14\x06#!\"&5\x1146)\x012\x16\x15\x11\x14\x06#!\"&5\x1146\x17\x11!\x11\x04\xb0\xfbP\x04\xb0\xfb\x82\x01\x90\x15\x1d\x1d\x15\xfep\x15\x1d\x1d\x02m\x01\x90\x15\x1d\x1d\x15\xfep\x15\x1d\x1dG\x01,\x04Ld\xc8\x1d\x15\xfc|\x15\x1d\x1d\x15\x03\x84\x15\x1d\x1d\x15\xfep\x15\x1d\x1d\x15\x01\x90\x15\x1dd\xfe\xd4\x01,\x00\x04\x00\x00\x00\x00\x04\xb0\x04\xb0\x00\x0f\x00\x1f\x00#\x00'\x00\x00\x13!2\x16\x15\x11\x14\x06#!\"&5\x1146\x01!2\x16\x15\x11\x14\x06#!\"&5\x1146\x17\x11!\x11\x13!5!2\x01\x90\x15\x1d\x1d\x15\xfep\x15\x1d\x1d\x02m\x01\x90\x15\x1d\x1d\x15\xfep\x15\x1d\x1dG\x01,\xc8\xfbP\x04\xb0\x04\xb0\x1d\x15\xfc|\x15\x1d\x1d\x15\x03\x84\x15\x1d\xfe\x0c\x1d\x15\xfep\x15\x1d\x1d\x15\x01\x90\x15\x1dd\xfe\xd4\x01,\xfd\xa8d\x00\x00\x00\x00\x02\x00\x00\x00d\x04\xb0\x03\xe8\x00'\x00+\x00\x00\x13!2\x16\x15\x1135463!2\x16\x1d\x013\x15#\x15\x14\x06#!\"&=\x01#\x11\x14\x06#!\"&5\x1146\x01\x11!\x112\x01\x90\x15\x1dd\x1d\x15\x01\x90\x15\x1ddd\x1d\x15\xfep\x15\x1dd\x1d\x15\xfep\x15\x1d\x1d\x02\x9f\x01,\x03\xe8\x1d\x15\xfe\xa2\x96\x15\x1d\x1d\x15\x96d\x96\x15\x1d\x1d\x15\x96\xfe\xa2\x15\x1d\x1d\x15\x03 \x15\x1d\xfe\xd4\xfe\xd4\x01,\x00\x00\x04\x00\x00\x00\x00\x04\xb0\x04\xb0\x00\x03\x00\x13\x00\x17\x00'\x00\x003#\x113\x17!2\x16\x15\x11\x14\x06#!\"&5\x1146\x17\x11!\x11\x01!2\x16\x15\x11\x14\x06#!\"&5\x1146ddd\x96\x01\x90\x15\x1d\x1d\x15\xfep\x15\x1d\x1dG\x01,\xfe\xa2\x03\x84\x15\x1d\x1d\x15\xfc|\x15\x1d\x1d\x04\xb0d\x1d\x15\xfep\x15\x1d\x1d\x15\x01\x90\x15\x1dd\xfe\xd4\x01,\xfe\x0c\x1d\x15\xfep\x15\x1d\x1d\x15\x01\x90\x15\x1d\x00\x00\x00\x00\x02\x00d\x00\x00\x04L\x04\xb0\x00'\x00+\x00\x00\x0132\x16\x15\x11\x14\x06+\x01\x15!2\x16\x15\x11\x14\x06#!\"&5\x11463!5#\"&5\x1146;\x0153\x07\x11!\x11\x02X\x96\x15\x1d\x1d\x15\x96\x01\xc2\x15\x1d\x1d\x15\xfc|\x15\x1d\x1d\x15\x01^\x96\x15\x1d\x1d\x15\x96d\xc8\x01,\x04L\x1d\x15\xfep\x15\x1dd\x1d\x15\xfep\x15\x1d\x1d\x15\x01\x90\x15\x1dd\x1d\x15\x01\x90\x15\x1dd\xc8\xfe\xd4\x01,\x00\x00\x00\x04\x00\x00\x00\x00\x04\xb0\x04\xb0\x00\x03\x00\x13\x00\x17\x00'\x00\x00!#\x113\x05!2\x16\x15\x11\x14\x06#!\"&5\x1146\x17\x11!\x11\x01!2\x16\x15\x11\x14\x06#!\"&5\x1146\x04\xb0dd\xfdv\x01\x90\x15\x1d\x1d\x15\xfep\x15\x1d\x1dG\x01,\xfc\xae\x03\x84\x15\x1d\x1d\x15\xfc|\x15\x1d\x1d\x04\xb0d\x1d\x15\xfep\x15\x1d\x1d\x15\x01\x90\x15\x1dd\xfe\xd4\x01,\xfe\x0c\x1d\x15\xfep\x15\x1d\x1d\x15\x01\x90\x15\x1d\x00\x00\x01\x01,\x000\x03o\x04\x80\x00\x0f\x00\x00	\x01\x06#\"&5\x114632\x17\x01\x16\x14\x03a\xfe\x12\x17\x12\x0e\x10\x10\x0e\x12\x17\x01\xee\x0e\x025\xfe\x12\x17\x1b\x19\x03\xe8\x19\x1b\x17\xfe\x12\x0e*\x00\x00\x00\x00\x01\x01A\x002\x03\x84\x04~\x00\x0b\x00\x00	\x016\x16\x15\x11\x14\x06'\x01&4\x01O\x01\xee\x1d**\x1d\xfe\x12\x0e\x02{\x01\xee\x1d\x11)\xfc\x18)\x11\x1d\x01\xee\x0e*\x00\x00\x00\x00\x01\x002\x01A\x04~\x03\x84\x00\x0b\x00\x00\x13!2\x16\x07\x01\x06\"'\x01&6d\x03\xe8)\x11\x1d\xfe\x12\x0e*\x0e\xfe\x12\x1d\x11\x03\x84*\x1d\xfe\x12\x0e\x0e\x01\xee\x1d*\x00\x00\x00\x00\x01\x002\x01,\x04~\x03o\x00\x0b\x00\x00	\x01\x16\x06#!\"&7\x0162\x02{\x01\xee\x1d\x11)\xfc\x18)\x11\x1d\x01\xee\x0e*\x03a\xfe\x12\x1d**\x1d\x01\xee\x0e\x00\x00\x00\x00\x02\x00\x08\x00\x00\x04\xb0\x04(\x00\x06\x00\n\x00\x00\x01\x15\x015-\x015\x01!5!\x02\xbc\xfdL\x01\x9d\xfec\x04\xa8\xfc\xe0\x03 \x02\xe5\xb6\xfe\xbd\xdd\xc1\xc1\xdd\xfb\xd8\xc8\x00\x00\x00\x00\x02\x00\x00\x00d\x04\xb0\x04\xb0\x00\x0b\x001\x00\x00\x01#\x153\x15!\x1135#5!\x0134>\x05;\x01\x11\x14\x06\x0f\x01\x15!5\".\x035\x1132\x1e\x05\x153\x11!\x04\xb0\xc8\xc8\xfe\xd4\xc8\xc8\x01,\xfbP2\x08\x0b\x19\x13&\x18\x19d2\x19\x19\x01\x90\x04\x0e\"\x1a\x16d\x19\x18&\x13\x19\x0b\x082\xfc\xe0\x03\x84dd\x01,dd\xfe\x0c\x15 \x15\x0e\x08\x03\x01\xfd\xda\x16\x19\x01\x02dd\x01\x05	\x15\x0e\x02&\x01\x03\x08\x0e\x15 \x15\x01,\x00\x00\x02\x00\x00\x00\x00\x04L\x03\xe8\x00%\x001\x00\x00\x01#4.\x05+\x01\x11\x14\x16\x1f\x01\x15!52>\x035\x11#\"\x0e\x05\x15#\x11!\x01#\x153\x15!\x1135#5!\x03 2\x08\x0b\x19\x13&\x18\x19d2\x19\x19\xfep\x04\x0e\"\x1a\x16d\x19\x18&\x13\x19\x0b\x082\x03 \x01,\xc8\xc8\xfe\xd4\xc8\xc8\x01,\x02\xbc\x15 \x15\x0e\x08\x03\x01\xfd\xda\x16\x19\x02\x01dd\x01\x05	\x15\x0e\x02&\x01\x03\x08\x0e\x15 \x15\x01,\xfc\xe0dd\x01,dd\x00\x00\x01\x00\xc8\x00f\x03r\x04J\x00\x12\x00\x00\x0132\x16\x07	\x01\x16\x06+\x01\"'\x01&47\x016\x02\xbd\xa0\x10\n\x0c\xfe0\x01\xd0\x0c\n\x10\xa0\x0d\n\xfe)\x07\x07\x01\xd7\n\x04J\x16\x0c\xfe0\xfe0\x0c\x16	\x01\xd7\x08\x14\x08\x01\xd7	\x00\x00\x01\x01>\x00f\x03\xe8\x04J\x00\x12\x00\x00\x0132\x17\x01\x16\x14\x07\x01\x06+\x01\"&7	\x01&6\x01S\xa0\x0d\n\x01\xd7\x07\x07\xfe)\n\x0d\xa0\x10\n\x0c\x01\xd0\xfe0\x0c\n\x04J	\xfe)\x08\x14\x08\xfe)	\x16\x0c\x01\xd0\x01\xd0\x0c\x16\x00\x00\x01\x00f\x00\xc8\x04J\x03r\x00\x12\x00\x00\x00\x16\x1d\x01\x14\x07\x01\x06\"'\x01&=\x0146\x17	\x01\x044\x16	\xfe)\x08\x14\x08\xfe)	\x16\x0c\x01\xd0\x01\xd0\x03w\n\x10\xa0\x0d\n\xfe)\x07\x07\x01\xd7\n\x0d\xa0\x10\n\x0c\xfe0\x01\xd0\x00\x00\x00\x01\x00f\x01>\x04J\x03\xe8\x00\x12\x00\x00	\x01\x16\x1d\x01\x14\x06'	\x01\x06&=\x0147\x0162\x02j\x01\xd7	\x16\x0c\xfe0\xfe0\x0c\x16	\x01\xd7\x08\x14\x03\xe1\xfe)\n\x0d\xa0\x10\n\x0c\x01\xd0\xfe0\x0c\n\x10\xa0\x0d\n\x01\xd7\x07\x00\x00\x00\x02\x00\xd9\xff\xf9\x04=\x04\xb0\x00\x05\x00:\x00\x00\x01\x14\x06#46\x0532\x16\x1f\x0167>\x02\x1e\x04\x06\x07\x0e\x06\x07\x06\"&#\"\x06\"'.\x03/\x01.\x01>\x04\x1e\x01\x17'&6\x03\xe8\xb0|\xb0\xfeVd\x15&\x07O\x05\x0b\"(P3G*+\x0f\x05\x11\x01\x04\x12\x17*3M,\x0d:I\x0b\x0eG7\x109_7&\x07\x07\x0f\x06\x0f%*>7F1\x1f\x93\x0c\x0d\x04\xb0|\xb0|\xb0\xc8\x1c\x13\xc2\x01\x02\x06\x07\x07\x05\x0f\x1f5KmC\x07\x19KG\\JB\x11\x05\x05\x07\x07\x19ktl$#?hI7 \x13\x07\x03\x06\x05\xc0\x12\x18\x00\x00\x00\x00\x02\x00\xc8\x00\x15\x03\x84\x04\xb0\x00\x16\x00\x1a\x00\x00\x13!2\x16\x15\x11\x14\x06+\x01\x11\x07\x06&5\x11#\"&5\x1146\x17\x15!5\xfa\x02X\x15\x1d\x1d\x15\x96\xff\x13\x1a\x96\x15\x1d\x1d\xab\x01,\x04\xb0\x1d\x15\xfep\x15\x1d\xfe\x0c\xb2	\x10\x15\x02\x8a\x1d\x15\x01\x90\x15\x1dddd\x00\x00\x00\x02\x00\xc8\x00\x19\x04L\x04\xb0\x00\x0e\x00\x12\x00\x00\x13!2\x16\x15\x11\x05\x11%!\x11#\x1146\x01\x1575\xfa\x02\xee'=\xfdD\x02X\xfdDd\x1f\x01\x0dd\x04\xb0Q,\xfc[u\x03\xb6}\xfc\x18\x04\x01\x174\xfd]d\x14d\x00\x01\x00\x00\x00\x01\x02Mo\xc3\x04__\x0f<\xf5\x00\x1f\x04\xb0\x00\x00\x00\x00\xd0vs\x97\x00\x00\x00\x00\xd0vs\x97\xffQ\xff\x9c\x05\xdc\x05\x14\x00\x00\x00\x08\x00\x02\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x05\x14\xff\x85\x00\x00\x05\x14\xffQ\xfe\xd4\x05\xdc\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xa3\x01\xb8\x00(\x00\x00\x00\x00\x01\x90\x00\x00\x04\xb0\x00\x00\x04\xb0\x00d\x04\xb0\x00\x00\x04\xb0\x00\x00\x04\xb0\x00p\x02\x8a\x00\x00\x05\x14\x00\x00\x02\x8a\x00\x00\x05\x14\x00\x00\x01\xb1\x00\x00\x01E\x00\x00\x00\xd8\x00\x00\x00\xd8\x00\x00\x00\xa2\x00\x00\x01\x04\x00\x00\x00H\x00\x00\x01\x04\x00\x00\x01E\x00\x00\x04\xb0\x00d\x04\xb0\x00{\x04\xb0\x00\xc8\x04\xb0\x00\xc8\x01\xf4\x00\x00\x04\xb0\xff\xf2\x04\xb0\x00\x00\x04\xb0\x00\x00\x04\xb0\xff\xf0\x04\xb0\x00\x00\x04\xb0\x00\x0e\x04\xb0\x00	\x04\xb0\x00d\x04\xb0\xff\xd3\x04\xb0\xff\xd3\x04\xb0\x00\x00\x04\xb0\x00\x00\x04\xb0\x00\x00\x04\xb0\x00\x00\x04\xb0\x00\x00\x04\xb0\x00&\x04\xb0\x00n\x04\xb0\x00\x17\x04\xb0\x00\x17\x04\xb0\x00\x17\x04\xb0\x00d\x04\xb0\x00\x1a\x04\xb0\x00d\x04\xb0\x00\x0c\x04\xb0\x00d\x04\xb0\x00\x17\x04\xb0\xff\x9c\x04\xb0\x00d\x04\xb0\x00\x17\x04\xb0\x00\x17\x04\xb0\x00\x00\x04\xb0\x00\x17\x04\xb0\x00\x17\x04\xb0\x00\x17\x04\xb0\x00d\x04\xb0\x00\x00\x04\xb0\x00d\x04\xb0\x00\x00\x04\xb0\x00\x00\x04\xb0\x00\x00\x04\xb0\x00\x00\x04\xb0\x00\x00\x04\xb0\x00\x00\x04\xb0\x00\x00\x04\xb0\x00\x00\x04\xb0\x00d\x04\xb0\x00\xc8\x04\xb0\x00\x00\x04\xb0\x00\x00\x04\xb0\x005\x04\xb0\x00d\x04\xb0\x00\xc8\x04\xb0\xff\xb5\x04\xb0\x00!\x04\xb0\x00\x00\x04\xb0\x00\x00\x04\xb0\x00\x00\x04\xb0\x00\x00\x04\xb0\x00\x00\x04\xb0\xff\x9c\x04\xb0\x00\x00\x04\xb0\x00\x00\x04\xb0\x00\x00\x04\xb0\x00\xdb\x04\xb0\x00\x17\x04\xb0\x00u\x04\xb0\x00\x00\x04\xb0\x00\x00\x04\xb0\x00\x00\x04\xb0\x00\n\x04\xb0\x00\xc8\x04\xb0\x00\x00\x04\xb0\x00\x9d\x04\xb0\x00\xc8\x04\xb0\x00\xc8\x04\xb0\x00\xc8\x04\xb0\x00\x00\x04\xb0\xff\xfe\x04\xb0\x01,\x04\xb0\x00d\x04\xb0\x00\x88\x04\xb0\x01;\x04\xb0\x00\x17\x04\xb0\x00\x17\x04\xb0\x00\x17\x04\xb0\x00\x17\x04\xb0\x00\x17\x04\xb0\x00\x17\x04\xb0\x00\x00\x04\xb0\x00\x17\x04\xb0\x00\x17\x04\xb0\x00\x17\x04\xb0\x00\x17\x04\xb0\x00\x00\x04\xb0\x00\xb7\x04\xb0\x00\xb7\x04\xb0\x00\x00\x04\xb0\x00\x00\x04\xb0\x00I\x04\xb0\x00\x17\x04\xb0\x00\x00\x04\xb0\x00\x00\x04\xb0\x00]\x04\xb0\xff\xdc\x04\xb0\xff\xdc\x04\xb0\xff\x9f\x04\xb0\x00d\x04\xb0\x00\x00\x04\xb0\x00\x00\x04\xb0\x00\x00\x04\xb0\x00d\x04\xb0\xff\xff\x04\xb0\x00\x00\x04\xb0\xffQ\x04\xb0\x00\x06\x04\xb0\x00\x00\x04\xb0\x00\x00\x04\xb0\x01E\x04\xb0\x00\x01\x04\xb0\x00\x00\x04\xb0\xff\x9c\x04\xb0\x00J\x04\xb0\x00\x14\x04\xb0\x00\x00\x04\xb0\x00\x00\x04\xb0\x00\x00\x04\xb0\xff\x9c\x04\xb0\x00a\x04\xb0\xff\xfd\x04\xb0\x00\x16\x04\xb0\x00\x16\x04\xb0\x00\x16\x04\xb0\x00\x16\x04\xb0\x00\x18\x04\xb0\x00\x00\x04\xc4\x00\x00\x04\xb0\x00d\x00\x00\x00\x00\x00\x00\xff\xd8\x00d\x009\x00\xc8\x00\x00\x01'\x00d\x00\x19\x00\x19\x00\x19\x00\x19\x00\x19\x00\x19\x00\x19\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xd9\x00\x00\x00\x00\x00\x0e\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x04\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x03\x00d\x00d\x00\x00\x00\x10\x00\x00\x00\x00\x00d\xff\x9c\xff\x9c\xff\x9c\xff\x9c\xff\x9c\xff\x9c\xff\x9c\xff\x9c\x00	\x00	\xff\xf2\xff\xf2\x00d\x00y\x00'\x00d\x00d\x00\x00\x00\x00\x00d\xff\xa2\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xc8\x00d\x00\x00\x00\x01\x00\x8f\x00\x00\xff\x9c\xff\x9c\x00d\x00\x04\x00\xc8\x00\xc8\x00\x00\x00d\x01\x90\x00d\x00\x00\x00d\x01,\xff\xb5\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00d\x00\x00\x01,\x01A\x002\x002\x00\x08\x00\x00\x00\x00\x00\xc8\x01>\x00f\x00f\x00\xd9\x00\xc8\x00\xc8\x00\x00\x00*\x00*\x00*\x00*\x00\xb2\x00\xe8\x00\xe8\x01N\x01N\x01N\x01N\x01N\x01N\x01N\x01N\x01N\x01N\x01N\x01N\x01N\x01N\x01\xa4\x02\x06\x02\"\x02~\x02\x86\x02\xac\x02\xe4\x03F\x03n\x03\x8c\x03\xc4\x04\x08\x042\x04b\x04\xa2\x04\xdc\x05\\\x05\xba\x06r\x06\xf4\x07 \x07b\x07\xca\x08\x1e\x08b\x08\xbe	6	\x84	\xb6	\xde\n(\nL\n\x94\n\xe2\x0b0\x0b\x8a\x0b\xca\x0c\x08\x0cX\x0d*\x0d^\x0d\xb0\x0e\x0e\x0eh\x0e\xb4\x0f(\x0f\xa6\x0f\xe6\x10\x12\x10T\x10\x90\x10\xaa\x11*\x11v\x11\xb6\x12\n\x128\x12|\x12\xc0\x13\x1a\x13t\x13\xd0\x14*\x14\xd4\x15<\x15\xa8\x15\xcc\x16\x04\x166\x16`\x16\xb0\x16\xfe\x17R\x17\xa6\x18\x02\x18.\x18j\x18\x96\x18\xb0\x18\xe0\x18\xfe\x19(\x19h\x19\x94\x19\xc4\x19\xda\x19\xee\x1a6\x1ah\x1a\xb8\x1a\xf6\x1b^\x1b\xb4\x1c2\x1c\x94\x1c\xe2\x1d\x1c\x1dD\x1dl\x1d\x94\x1d\xbc\x1d\xe6\x1e.\x1ev\x1e\xc0\x1fb\x1f\xd2 F \xbe!2!v!\xb8\"@\"\x96\"\xb8#\x0e#\"#8#z#\xc2#\xe0$\x02$0$^$\x96$\xe2%4%`%\xbc&\x14&~&\xe6'P'\xbc'\xf8(4(p(\xac)\xa0)\xcc*&*J*\x84+\n+z,\x08,h,\xba,\xec-\x1c-\x88-\xf4.(.f.\xa2.\xd8/\x0e/F/~/\xb2/\xf80>0\x840\xd21\x121`1\xae1\xe82$2^2\x9a2\xde3\"3>3h3\xb64\x184`4\xa84\xd25,5\x9e5\xe86>6|6\xdc7\x1a7N7\x927\xd48\x108B8\x868\xc89\n9J9\x889\xcc:\x1c:l:\x9a:\xde;\xa0;\xdc<\x18<P<\xa2<\xf8=2=\xec>:>\x8c>\xd4?(?n?\xaa?\xfa@H@\x80@\xc6A\x02A~B\x18B\xa8B\xeeC\x18CBCvC\xa0C\xcaD\x10D`D\xaeD\xf6EZE\xb6F\x06FtF\xb4F\xf6G6GvG\xb6G\xf6H\x16H2HNHjH\x86H\xccI\x12I8I^I\x84I\xaaJ\x02J.JR\x00\x01\x00\x00\x01\x17\x00\xa7\x00\x11\x00\x00\x00\x00\x00\x02\x00\x00\x00\x01\x00\x01\x00\x00\x00@\x00.\x00\x00\x00\x00\x00\x00\x00\x10\x00\xc6\x00\x01\x00\x00\x00\x00\x00\x13\x00\x12\x00\x00\x00\x03\x00\x01\x04	\x00\x00\x00j\x00\x12\x00\x03\x00\x01\x04	\x00\x01\x00(\x00|\x00\x03\x00\x01\x04	\x00\x02\x00\x0e\x00\xa4\x00\x03\x00\x01\x04	\x00\x03\x00L\x00\xb2\x00\x03\x00\x01\x04	\x00\x04\x008\x00\xfe\x00\x03\x00\x01\x04	\x00\x05\x00x\x016\x00\x03\x00\x01\x04	\x00\x06\x006\x01\xae\x00\x03\x00\x01\x04	\x00\x08\x00\x16\x01\xe4\x00\x03\x00\x01\x04	\x00	\x00\x16\x01\xfa\x00\x03\x00\x01\x04	\x00\x0b\x00$\x02\x10\x00\x03\x00\x01\x04	\x00\x0c\x00$\x024\x00\x03\x00\x01\x04	\x00\x13\x00$\x02X\x00\x03\x00\x01\x04	\x00\xc8\x00\x16\x02|\x00\x03\x00\x01\x04	\x00\xc9\x000\x02\x92\x00\x03\x00\x01\x04	\xd9\x03\x00\x1a\x02\xc2www.glyphicons.com\x00C\x00o\x00p\x00y\x00r\x00i\x00g\x00h\x00t\x00 \x00\xa9\x00 \x002\x000\x001\x004\x00 \x00b\x00y\x00 \x00J\x00a\x00n\x00 \x00K\x00o\x00v\x00a\x00r\x00i\x00k\x00.\x00 \x00A\x00l\x00l\x00 \x00r\x00i\x00g\x00h\x00t\x00s\x00 \x00r\x00e\x00s\x00e\x00r\x00v\x00e\x00d\x00.\x00G\x00L\x00Y\x00P\x00H\x00I\x00C\x00O\x00N\x00S\x00 \x00H\x00a\x00l\x00f\x00l\x00i\x00n\x00g\x00s\x00R\x00e\x00g\x00u\x00l\x00a\x00r\x001\x00.\x000\x000\x009\x00;\x00U\x00K\x00W\x00N\x00;\x00G\x00L\x00Y\x00P\x00H\x00I\x00C\x00O\x00N\x00S\x00H\x00a\x00l\x00f\x00l\x00i\x00n\x00g\x00s\x00-\x00R\x00e\x00g\x00u\x00l\x00a\x00r\x00G\x00L\x00Y\x00P\x00H\x00I\x00C\x00O\x00N\x00S\x00 \x00H\x00a\x00l\x00f\x00l\x00i\x00n\x00g\x00s\x00 \x00R\x00e\x00g\x00u\x00l\x00a\x00r\x00V\x00e\x00r\x00s\x00i\x00o\x00n\x00 \x001\x00.\x000\x000\x009\x00;\x00P\x00S\x00 \x000\x000\x001\x00.\x000\x000\x009\x00;\x00h\x00o\x00t\x00c\x00o\x00n\x00v\x00 \x001\x00.\x000\x00.\x007\x000\x00;\x00m\x00a\x00k\x00e\x00o\x00t\x00f\x00.\x00l\x00i\x00b\x002\x00.\x005\x00.\x005\x008\x003\x002\x009\x00G\x00L\x00Y\x00P\x00H\x00I\x00C\x00O\x00N\x00S\x00H\x00a\x00l\x00f\x00l\x00i\x00n\x00g\x00s\x00-\x00R\x00e\x00g\x00u\x00l\x00a\x00r\x00J\x00a\x00n\x00 \x00K\x00o\x00v\x00a\x00r\x00i\x00k\x00J\x00a\x00n\x00 \x00K\x00o\x00v\x00a\x00r\x00i\x00k\x00w\x00w\x00w\x00.\x00g\x00l\x00y\x00p\x00h\x00i\x00c\x00o\x00n\x00s\x00.\x00c\x00o\x00m\x00w\x00w\x00w\x00.\x00g\x00l\x00y\x00p\x00h\x00i\x00c\x00o\x00n\x00s\x00.\x00c\x00o\x00m\x00w\x00w\x00w\x00.\x00g\x00l\x00y\x00p\x00h\x00i\x00c\x00o\x00n\x00s\x00.\x00c\x00o\x00m\x00W\x00e\x00b\x00f\x00o\x00n\x00t\x00 \x001\x00.\x000\x00W\x00e\x00d\x00 \x00O\x00c\x00t\x00 \x002\x009\x00 \x000\x006\x00:\x003\x006\x00:\x000\x007\x00 \x002\x000\x001\x004\x00F\x00o\x00n\x00t\x00 \x00S\x00q\x00u\x00i\x00r\x00r\x00e\x00l\x00\x00\x00\x02\x00\x00\x00\x00\x00\x00\xff\xb5\x002\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x17\x00\x00\x01\x02\x01\x03\x00\x03\x00\x0d\x00\x0e\x01\x04\x00\x96\x01\x05\x01\x06\x01\x07\x01\x08\x01	\x01\n\x01\x0b\x01\x0c\x01\x0d\x01\x0e\x01\x0f\x01\x10\x01\x11\x01\x12\x01\x13\x00\xef\x01\x14\x01\x15\x01\x16\x01\x17\x01\x18\x01\x19\x01\x1a\x01\x1b\x01\x1c\x01\x1d\x01\x1e\x01\x1f\x01 \x01!\x01\"\x01#\x01$\x01%\x01&\x01'\x01(\x01)\x01*\x01+\x01,\x01-\x01.\x01/\x010\x011\x012\x013\x014\x015\x016\x017\x018\x019\x01:\x01;\x01<\x01=\x01>\x01?\x01@\x01A\x01B\x01C\x01D\x01E\x01F\x01G\x01H\x01I\x01J\x01K\x01L\x01M\x01N\x01O\x01P\x01Q\x01R\x01S\x01T\x01U\x01V\x01W\x01X\x01Y\x01Z\x01[\x01\\\x01]\x01^\x01_\x01`\x01a\x01b\x01c\x01d\x01e\x01f\x01g\x01h\x01i\x01j\x01k\x01l\x01m\x01n\x01o\x01p\x01q\x01r\x01s\x01t\x01u\x01v\x01w\x01x\x01y\x01z\x01{\x01|\x01}\x01~\x01\x7f\x01\x80\x01\x81\x01\x82\x01\x83\x01\x84\x01\x85\x01\x86\x01\x87\x01\x88\x01\x89\x01\x8a\x01\x8b\x01\x8c\x01\x8d\x01\x8e\x01\x8f\x01\x90\x01\x91\x01\x92\x01\x93\x01\x94\x01\x95\x01\x96\x01\x97\x01\x98\x01\x99\x01\x9a\x01\x9b\x01\x9c\x01\x9d\x01\x9e\x01\x9f\x01\xa0\x01\xa1\x01\xa2\x01\xa3\x01\xa4\x01\xa5\x01\xa6\x01\xa7\x01\xa8\x01\xa9\x01\xaa\x01\xab\x01\xac\x01\xad\x01\xae\x01\xaf\x01\xb0\x01\xb1\x01\xb2\x01\xb3\x01\xb4\x01\xb5\x01\xb6\x01\xb7\x01\xb8\x01\xb9\x01\xba\x01\xbb\x01\xbc\x01\xbd\x01\xbe\x01\xbf\x01\xc0\x01\xc1\x01\xc2\x01\xc3\x01\xc4\x01\xc5\x01\xc6\x01\xc7\x01\xc8\x01\xc9\x01\xca\x01\xcb\x01\xcc\x01\xcd\x01\xce\x01\xcf\x01\xd0\x01\xd1\x01\xd2\x01\xd3\x01\xd4\x01\xd5\x01\xd6\x01\xd7\x01\xd8\x01\xd9\x01\xda\x01\xdb\x01\xdc\x01\xdd\x01\xde\x01\xdf\x01\xe0\x01\xe1\x01\xe2\x01\xe3\x01\xe4\x01\xe5\x01\xe6\x01\xe7\x01\xe8\x01\xe9\x01\xea\x01\xeb\x01\xec\x01\xed\x01\xee\x01\xef\x01\xf0\x01\xf1\x01\xf2\x01\xf3\x01\xf4\x01\xf5\x01\xf6\x01\xf7\x01\xf8\x01\xf9\x01\xfa\x01\xfb\x01\xfc\x01\xfd\x01\xfe\x01\xff\x02\x00\x02\x01\x02\x02\x02\x03\x02\x04\x02\x05\x02\x06\x02\x07\x02\x08\x02	\x02\n\x02\x0b\x02\x0c\x02\x0d\x02\x0e\x02\x0f\x02\x10\x02\x11\x02\x12\x06glyph1\x06glyph2\x07uni00A0\x07uni2000\x07uni2001\x07uni2002\x07uni2003\x07uni2004\x07uni2005\x07uni2006\x07uni2007\x07uni2008\x07uni2009\x07uni200A\x07uni202F\x07uni205F\x04Euro\x07uni20BD\x07uni231B\x07uni25FC\x07uni2601\x07uni26FA\x07uni2709\x07uni270F\x07uniE001\x07uniE002\x07uniE003\x07uniE005\x07uniE006\x07uniE007\x07uniE008\x07uniE009\x07uniE010\x07uniE011\x07uniE012\x07uniE013\x07uniE014\x07uniE015\x07uniE016\x07uniE017\x07uniE018\x07uniE019\x07uniE020\x07uniE021\x07uniE022\x07uniE023\x07uniE024\x07uniE025\x07uniE026\x07uniE027\x07uniE028\x07uniE029\x07uniE030\x07uniE031\x07uniE032\x07uniE033\x07uniE034\x07uniE035\x07uniE036\x07uniE037\x07uniE038\x07uniE039\x07uniE040\x07uniE041\x07uniE042\x07uniE043\x07uniE044\x07uniE045\x07uniE046\x07uniE047\x07uniE048\x07uniE049\x07uniE050\x07uniE051\x07uniE052\x07uniE053\x07uniE054\x07uniE055\x07uniE056\x07uniE057\x07uniE058\x07uniE059\x07uniE060\x07uniE062\x07uniE063\x07uniE064\x07uniE065\x07uniE066\x07uniE067\x07uniE068\x07uniE069\x07uniE070\x07uniE071\x07uniE072\x07uniE073\x07uniE074\x07uniE075\x07uniE076\x07uniE077\x07uniE078\x07uniE079\x07uniE080\x07uniE081\x07uniE082\x07uniE083\x07uniE084\x07uniE085\x07uniE086\x07uniE087\x07uniE088\x07uniE089\x07uniE090\x07uniE091\x07uniE092\x07uniE093\x07uniE094\x07uniE095\x07uniE096\x07uniE097\x07uniE101\x07uniE102\x07uniE103\x07uniE104\x07uniE105\x07uniE106\x07uniE107\x07uniE108\x07uniE109\x07uniE110\x07uniE111\x07uniE112\x07uniE113\x07uniE114\x07uniE115\x07uniE116\x07uniE117\x07uniE118\x07uniE119\x07uniE120\x07uniE121\x07uniE122\x07uniE123\x07uniE124\x07uniE125\x07uniE126\x07uniE127\x07uniE128\x07uniE129\x07uniE130\x07uniE131\x07uniE132\x07uniE133\x07uniE134\x07uniE135\x07uniE136\x07uniE137\x07uniE138\x07uniE139\x07uniE140\x07uniE141\x07uniE142\x07uniE143\x07uniE144\x07uniE145\x07uniE146\x07uniE148\x07uniE149\x07uniE150\x07uniE151\x07uniE152\x07uniE153\x07uniE154\x07uniE155\x07uniE156\x07uniE157\x07uniE158\x07uniE159\x07uniE160\x07uniE161\x07uniE162\x07uniE163\x07uniE164\x07uniE165\x07uniE166\x07uniE167\x07uniE168\x07uniE169\x07uniE170\x07uniE171\x07uniE172\x07uniE173\x07uniE174\x07uniE175\x07uniE176\x07uniE177\x07uniE178\x07uniE179\x07uniE180\x07uniE181\x07uniE182\x07uniE183\x07uniE184\x07uniE185\x07uniE186\x07uniE187\x07uniE188\x07uniE189\x07uniE190\x07uniE191\x07uniE192\x07uniE193\x07uniE194\x07uniE195\x07uniE197\x07uniE198\x07uniE199\x07uniE200\x07uniE201\x07uniE202\x07uniE203\x07uniE204\x07uniE205\x07uniE206\x07uniE209\x07uniE210\x07uniE211\x07uniE212\x07uniE213\x07uniE214\x07uniE215\x07uniE216\x07uniE218\x07uniE219\x07uniE221\x07uniE223\x07uniE224\x07uniE225\x07uniE226\x07uniE227\x07uniE230\x07uniE231\x07uniE232\x07uniE233\x07uniE234\x07uniE235\x07uniE236\x07uniE237\x07uniE238\x07uniE239\x07uniE240\x07uniE241\x07uniE242\x07uniE243\x07uniE244\x07uniE245\x07uniE246\x07uniE247\x07uniE248\x07uniE249\x07uniE250\x07uniE251\x07uniE252\x07uniE253\x07uniE254\x07uniE255\x07uniE256\x07uniE257\x07uniE258\x07uniE259\x07uniE260\x07uniF8FF\x06u1F511\x06u1F6AA\x00\x00\x00\x00\x01TP\xc3\x17\x00\x00PK\x07\x08\x9a\x17<\x9c\\\xb1\x00\x00\\\xb1\x00\x00PK\x03\x04\x14\x00\x08\x00\x00\x00W\x9a5G\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00'\x00\x00\x00fonts/glyphicons-halflings-regular.woffwOFF\x00\x01\x00\x00\x00\x00[\x80\x00\x0f\x00\x00\x00\x00\xb1\\\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00FFTM\x00\x00\x01X\x00\x00\x00\x1c\x00\x00\x00\x1cm*\x97\xdcGDEF\x00\x00\x01t\x00\x00\x00\x1f\x00\x00\x00 \x01D\x00\x04OS/2\x00\x00\x01\x94\x00\x00\x00E\x00\x00\x00`g\xb9k\x89cmap\x00\x00\x01\xdc\x00\x00\x02\xc0\x00\x00\x06r\xda\xad\xe3\x81cvt \x00\x00\x04\x9c\x00\x00\x00\x04\x00\x00\x00\x04\x00(\x02\xf8gasp\x00\x00\x04\xa0\x00\x00\x00\x08\x00\x00\x00\x08\xff\xff\x00\x03glyf\x00\x00\x04\xa8\x00\x00M\x17\x00\x00\x94\xa4}]\xc2ohead\x00\x00Q\xc0\x00\x00\x004\x00\x00\x006\x05M/\xd8hhea\x00\x00Q\xf4\x00\x00\x00\x1c\x00\x00\x00$\nD\x04\x11hmtx\x00\x00R\x10\x00\x00\x01O\x00\x00\x03t\xd2\xc7 `loca\x00\x00S`\x00\x00\x02'\x00\x00\x020o\xfb\x95\xcemaxp\x00\x00U\x88\x00\x00\x00 \x00\x00\x00 \x01j\x00\xd8name\x00\x00U\xa8\x00\x00\x01\x9e\x00\x00\x03\xa2\xb3,\xa0\x9bpost\x00\x00WH\x00\x00\x04-\x00\x00\n\xd1\xba\xa3\xe55webf\x00\x00[x\x00\x00\x00\x06\x00\x00\x00\x06\xc3\x18TP\x00\x00\x00\x01\x00\x00\x00\x00\xcc=\xa2\xcf\x00\x00\x00\x00\xd0v\x81u\x00\x00\x00\x00\xd0vs\x97x\xdac`d``\xe0\x03b	\x06\x10`b`d`d\x14\x03\x92,`\x1e\x03\x00\x05H\x00J\x00x\xdac`f\xe9f\x9c\xc0\xc0\xca\xc0\xc2\xcc\xc3t\x81\x81\x81!\nB3.a0b\xda\x01\xe4\x03\xa5\x10\x80	\x89\x1d\xea\x1d\xee\xc7\xe0\xc0\xa0\xf0\xff?\xf3\x81\xff\x02@u\"\x0c\xd5@aF$%\n\x0c\x8c\x001\x96\x0b\x0c\x00\x00\x00x\xda\xed\x94?hSA\x1c\xc7\x7f\x97\xa4iS\xc4\xc6\xfe\x89\x8dm\xdf\xbd44\xb1\xad\xd0,\x0eq\xcaPK\x83 q\xd2\x0c\xd2XE\x1a]\xb2(\x04\x142	\x01\x87.\xa5\xd4\xa9\x83]\xb4\x82 \"\x0eE\x1c\x9cD\xb7\n\xad\xa5\xb9\xdfi]D\xd4\xa1ZJ\xf5\xf9\xbd\\\x06\x11\xb5\xba8\xf9\xe0\x93\xcf\xef\xbdw\xef\xee\x9bw\xbf\x84\x88\x9a\x88\xc8\x0f\x0e\x81V\"\xb1F\x02\x15\x05\xa6pU\xd4\xaf\xfb\x1b\xd7\x03\xe2.\xce\xa7(\x83g\x0e\x92K\xc34O\x0bn\xab;\xe2N\xb8\x8b\xeeR\x7f{\xbcg`'!\x12\xdb\xc9P\xb2M\xf9UHE\xd5\xa0J\xab\xac\xca\xab\x82*\xaa\xb2\xaa\xaaY\x0eq\x94\x079\xcdc\x9c\xe5<\x17\xb9\xccU\x9e\xe19\x1d\xd4!\x1d\xd1Q\x1d\xd3I\x9d\xd6Y\x9d\xd7\x85-\xcf\xf3\xb0\xa2KC\xf5\x95\xe8\x17+	\xd5\xa4\xc2\xcaU)\x95Q9\xac4\xa9J\xaa\xa2\xa6Yp\x98]Nq\x86\xc79\xc7\x05.q\x85\xa7yV\x13V\n\xebn\xac\x14\xd7)\x9d\xd19\xbb\x92\xf7\xca[\xf5\xce{\x93\xaa\xa5\xf6\xbav\xbfV\xac\xe5\xd7\x9b\xd6\xbe\xac\xf6\xadFWb+\x1d+{\xdd>\xb7\xd7\x8d\xb8a|\xe3\x80\xfc*\xb7\xe4g\xf9Q\xbe\x95\x1b\xf2\x8a\xbc,K\xf2\x82<'\xcf\xca\xd3\xf2\xa4<!\x8f\xc9\xa3r\xd4Yw\xd6\x9c\x17\xce\xb2\xf3\xdcy\xe6<q\x1e9\x0f\x9d{-]\xf6\xed\xfe\x93c\x8f\xf9\xf0]o\x9c\x1d\xae\xbfI\x8b\xd9\xef!0l6\x1a\xcc7\x08\x82\x85\x06\xcd\x8d\xe1\xd8{j\x81G,\xd4\x01OX\xa8\x13^\xb4P\x17\xbcd\xa1\x08Q\x7f\xbb\x85\xf6\x13\xc5{,\xd4M4\xb0c\xa1(QBX\xe8\x00\xbcm!\x8cK\x86,\xd4\x0b\xb7Y\xa8\x8fHa\xac2\xd9\x1d\x18}\xab\xcc\x98\x18\x1c\x06\x98\x8f\x120B\xabA\xd4)\xd8\x90F}\x04\xce\x80,\xeaQ8\x07\xf2\xa8\x8f\xc3\x05\x0b\x9d\x82'A\x115\xee\xa9\x12(\xa3>\x03W@\x15\xf5Ex\x1a\xcc\xa2\xbeD\xc4\xc8\xc3&\xc3U\x18\x19\xd8d\xb8\x06#\x03\x9b\x0c\x18\xcb\xc8\xc0&\xc3\x0d\x18\x19x\x0c\xf5Mx\x1c\x98<\xb7a\xe4a\x93\xe7\x0e\x8c,l2<\x80\x91\x81M\x86\xc702\xb0\xc9\xf0\x146\xf3\xce\xa0^\x86\x91\x85\xe7P\xbf$\xd2\x906{\xb8\x0e\x87,\xb4\x01#\x9b\xc6\x9e\xd0\x1b\x18{\xa0M\xcewp\xccB\xef\xe18H\xa2\xfe\x00#\xb36\x997ad\xd6&'~\x89\x1a95r\n3w\xc1\"\xd0\x0f[\x9eEt\x92\xd8\xdcW\x87\x04:\xfd\xd3\xad:$\"\x14\xf4\x99>2\xcd\xffc\xff\x0b\xf25*\xdf.\xfdl\x9f\xf4\xff\xe4N\xa0\xfe/\xf6\xff\xf8\xfeh\xfe\x8b\xb1\xc1]Gt\xfd\xe9T\xe8\x81\xdf\x1e\xdf\x00\x8f\xd1\x0f\x18\x00(\x02\xf8\x00\x00\x00\x01\xff\xff\x00\x02x\xda\xc5\xbd	|\x1b\xd5\xb50>w\x16\x8d\xd6\x19m#Y\xb6e[\x92%Y\xde-YR\x1c'r\xf6\x84\xc4Y\xc8j\xb6\xb0D%\x10 	\x81,@\xd8B\xd8K\x1bZjH\xd9\xda\xa4@\x1a\x12b\x02\xa5\xa5\xa4-\x85R\xf4\xca\xeb+\xa5n\xfbhK\x9b~\xaf\xe5\xcb\xeb\xa3\xbc\x96\xa6\xa5$\xd6\xe4;\xe7\xceh\xb5\x13\xe8\xeb\xff\xfd\xfe^f\xee\xdc\xb9s\xef\xb9\xe7n\xe7\x9c{\xce\xb9\x0c\xcb\xb40\x0c\xb9\x8ckb8Fd:\x9f%L\xd7\x94\xc3\"\xcf\xfc1\xfe\xacA\xf8\xd5\x94\xc3\x1c\x0bA\xe6Y\x0e\xa3\x05\x8c>,\x1a\xc8\xd8\x94\xc3\x04\xe3\x13\x8e\x80#\x9cp\x84Z\xc84\xf5\xd8\x9f\xfe\xc45\x8d\x1dma\xdfd\x08\x93e\xb2\xfc ?\xc8\x9c\x07y\xc7=\x8d\xa4\x81\xf8I:C\x1a\x89\xc7 \x93D\xdc\xe3\xf5(n\x08I\xa4\x8dx\x1b\x88L\x0c\x91.\x021\xa2!\x14\x84P'\x99JD\x89t\x91Hj\x80@L4\x92\xec\x85P\x86\xf4\x93h'\x19 )\xc8\x11b\xd2)vH\x8eX,f\xf91\xd1c\\'\xb2\xe2cG\xcd\x0e\xd6\xc0\xb1\x84u\x98\x8f>\x06\x11\xeb\x8c\x1e\xf11\xd9\x1c\x0b~\xc2t\xfc\xe0?\xf1\xf1\x84\xe9\x18\xf8!x\xa1\xf8\x08\xc1\x03T_q\x04\xe2\x1e?q\x1bB\x01\x87\xdb\xd0F\x82\x91\xa4#\x10\x8cL%\xbd\xa9D\xc0\xd1\x9b\"\xaf\xe4\x14?Y\xad\xf8\xfd\x8a\xba\xc7\xaf\xc0\x83\xba\x07\x1f\xc8j??8>N\xd1Skem\x84\xb2\xa6AY\xb3\xb5\xb2Db\x10\xa14\x0d\xd9J)\xa4\x95;\x95@\xb9\x1aj\x93\xc5P$\n\x98\xef'qh\xae8`\x9b\xeb;a\x16\x8c\xea\x03\x06\x81X\xcd\x06\xc36C\x8d\xf9F\xe2*\x84d\xcb\x03\x16Y\xfdc\xe1\xb1\x18\xda\"\x18\xd4\x07\x8c\x82\xf9\x84\xcf\xf9\x15\xa3\xdb\xf8\x15'?h\xc6L\xacV\xe3\x97\x8c\xd6,\xbd>c\x91e\xcb3e\x11V\x03\xb9\xd2h\x86\x0f =C\xfb\x91\xc0\x7f\x9a\x7f\x86\xe9\xc7~\xe4\xf5xC\xbd\x9d\\((qb@\x0c\x18\x14\xb84\xf0\x89x\x86K&h\xd7\x81\xce\x11\x0d\xa5\x13\xa94\\2\x04\xba\xc7\xb1\x0f6N1|-\xd4;\xad\xcf\xebj\x9b\x14\xef\x96\xc9\x0dYu\xd4@\x86\xe1j\xea\xee\x9b\xd1\xabx\xfa\xa6\xf5\x86\x9ei\xb8\xe4\x8a\xa7\xfemK\xf3\x0c\xeb\xdb\xd9\x8dD\xf8E\xf6\x0ew\xa6q3\xff\xcc\xb7.\xbb\xbccAw@\xb64t.\x8eg\xe3\xf1\xec\xfckg\xb4\xc9r\xb0{~\xdb\xd3Wl~\xac{\xff\xd6lW2\xbb\xea\xf6\xf0}\x0c\xc327\xd06\x1ea2\xcc\\\x806\x10o\x10\x94z@\xb3$\xb4\x11\xf1\x13\xa1\x1d\x1a\xde\xebH\xc4S\xc9\xdeH\x88\x1c \xabg\xae\x9b\xd1\xed\xb1\x12b\xf5t\xcfX7\xf30K\x9at\xd4\xdec1\x7f\xc1,\xab\x7f\xd5\x1f7\x97B\xf2\x0boL\xeb\xe8\x98\xc6\x8f\xd46\x0f\xc4\x17\xb76[,\x96\xe6\xd6%\xf1i\xe1Z\x0d\xbf\x87,\x92l>T\x86p\xf2K\xb3\x9cSGg\xac\\>\x0d\xf1\x9d#\xbb\xf8A\xf6\x08#3\x8c\xab\xd8E\xb5\x8ey\x82k\xc2\xee6v\x14\xae\xec\x11\xda\xe7\xe8\x85\xc1\xba\xe7\x18\x86;\x06u\x0f3\xd3!\x1bZI\x1c\xce8\xec\x13\x98M\x00\x86k?\x1d\xb38\xb6C\x98\xa3Wq{`\xecC*\x89\xd0\x04\x11h>H\x90\x81\x04\xdc1\xbf\x12_s\xf6\xd9k\xe2\x8a\x7f\xech)\x9c\x9b\x9e\xaeoj\xaaOO'\xbb\n!~dX\xf1g\xcf\xfbB(\xf4\x85\xf3\x86\xfd\xca0<\x0dkOYx\xcae\xa7\xac\xa9\xb1\xc6\xa7\xc4\xad5k\xa6\x0c\x0f\x97=d\x0b\xe3\xb2\xf0\xd3\x03\xcf\xa7> \xed\xfc+\xfct\xc6C\xe7-o\n\xc7\xaa\x86\x02\x84\x1d/\xe4\xc3\xf5_ko\xef\xdc\xb6\x7f\xff\xb6\xbcs\xf1\xd5+f\xb0\xff\xceO\xdfz\xb1tp\xdbu\x077-\x99}\x85d\xf5\xed\xfe9\xc5	\x03s\xe0\x08\x7f\x88\xa9e\x1a \x8c\xb3\\9.H4\x92!0\x8f\xa5S\\ \xca\xb1\x7fk2\x99\xef\"?ip7\x9c\\\x02\x172z\xa7\xd9\xd4\xd4l\xde\xb0\xd1t=\xb9\xee\x85W\xf9\xe7\\!\xfbKyOXimU\xc2\xec\x1f\xbenov\x9b\xec\x0f\x0c\xdb\xc7\x1a6\xb2\x1e:\xbd\xe8\xe5\x0d2\x16\xc6\x0b\xf3LZkA\x18\xfdA\x1c\xcd^\xe2qC\x18\xe6\x99\xde\x94	&P\x05\xe6\x1d\x88\xef\x15aF\xc6\xea\xa5I\xaa0\xdc\xe3>\xfe&\x18\xef\xf9\x7f\x85Q\x0b\x17\x81#F\xa3Q\xfd\xbb\xd1l\xe6>\x0dA\xb3\x19\x1f\xce\x87q*\x98O\xee\x80\x84\x10\x82\xe1\xad\xfd\xe3\x18\xcf\xff\x8b\xd1\xc8\xa6\x8d\xe6_@27\xa6\x15\xccl\xc4,\xa8\x7f\x82\x8f\x05s\xfe\x17\xf8\x89\xd1\xe8\xbe\x05f\x07\xc8\x0b\xbe6\xe2p7\x02\xfc\xdc\xa9?\x9d\xfa\x13\xffM\xfe\x9b\x8c\x89\xb11v\x88A\x98\xdc2\x89\xa6]$j\"\x82\x8b;\x1a\x91v\xdblk~va0\xbf\xfbg\xec\xa5j\xa3\xfa\xdcz\xfe\x9b\xb6\xddRD:\xffg\x17\xa9\xd7\xe6\xbf\x08\xb1c\xeb6\x92\xc5\xc5yw\x04\xfa%\xf4g\xe2(\xc3\xbe\x83\x04\xd8#'\xb4\xceuB\xb5\xf2#\xec=\xf9_@?\x83>\xc6F\xd8\x08\xfdVb\x8c0\x9e\x1fa\x1a\xe1!\xacaL4t\x12Xv\xbc\x0e\xa1\xfc\x01:\xc5F\xf6\xf6h\xf7\xb29\x8b\xefj^\xb5x\xde\x8c\xfc\xbe\xa1\xe9z\xd0\xcf}\xb4Wn\x08\x8e}7}\xb6\xd7\x17\xbbj\x93\xaf\xc6\xce\x9a\x1e\xce\xefi\xbdH\xa9\x8d\xad\xbf\xba\xb6\xc6\xc1\xde\x1ci\xa5\xfd\xc5t\xea\xef\xfcK\xfcS\x8c\x9f\x89a\xcd\x1bXE\xf4\xbaE\xbabb\x1b\x1aBQ1\xd8\xc9\xf6f\x08\x1f\x94\x08t\x91x\x86\xf4F\xc8\xae\xdc\x0b\xb7-\"d\x11qA\x13\xf7\xd7\xc6\\\xea\x1f\xb7~F`\xb3\x10\xbb\xe86\xb2i\xe4\x81\x95+\x1f\xc0\x0b\xff\xd4\xa2\xdb^\xc8\xb2\xc2}\xd7\xa9\xef\xd7\x86k&\xbb\xdd\xc4\xb9\x10\xbe\xbb\xed\x05\xc8\xe0<-\x0d\\\xe8\x9c;\xc4\x1f\xe2g1>\xa8w\x86\x050\xdc0\xdfv\xf2\xc9^x \xec\xdd\xdd7l\xdb<\x94\x9ay\xdd\xce}\x99\xccS\xb7o\x9b9\xe9\xdc-\xdb\xae\xe3\xbe6k\x9e\xd0\xb1l\xcb\xb4\xbe\xebn\xb9\xf9\xf0\x8a\x15\x87o\xbe\xe5\xba\xbei[\x96u\x08\xf3\x10\x97\xa7~\xc2\xac\xe6o\xe0\x1f`j\xe0\xc1\x95\x8a{i\xd7\x14\\\x1eC4,\x18\"iW8\x92J\x90\x07o\x13\x15\xf1V\xf2\x84bp\xa8\xfbw\x88\xb2C\xfd\xaa\xba\xdf!\x8b;\xd4'\x1c\x067\xd7D.v\xb9\xd4\xc7\x1d\xd6\x8f\xd4\x0dn\x8b\xf5o\x1fZ-n\xb2\xeb\xa4\xd5\xc1\xb0e\xf9\x07\xcfP\x82\x10\xf2\x8aio4\x1d\x8a~LY\xe4/\x7fzm\xfew_\x9d\xff\xf2\x1f\x16\x9d\xbe\xd8\xecg\xfe\xcf\xbd\x9f\xfe\xfd\xa7\x7fR\xde\xcf\"t\xde\xa0\xd3&No\x02N\x80\xa5)4\x1d\xc6\xc9M\x0b\xb3C\xdbG2\x11\xab\x89\\j\xb2\xca8\x90d-\x1c\xc9@>#\xdbOt^\xb6\xc0\xec5\xbc+x\xcd\x17\x98e\x19.^\xe1]\x83\xd7\xbc\xe0\xb2\xce\x13\xdbG\xa08\x9b^\xe6 \xf4m\x17\x8c\xf7(\xd3\xc6t1	\x18\xf7s\x99\x05\xccbf\x19\xb3J\x9b\x01\xb0\xdf\xd2	\x0c\x97\x17%\x91\x8c\x91\xa0\x01\xe2<\x89\x00\xac4\x8e\xdeH\x02\xe2\x04\xf8\x0f\x94\xdd\xc5@e\x9a\xea\xf78C\xc8\x1a\xd4\xf2\x8a,\xbb\x17\x065<\xc2(\x97\xe5k\xb2c5Y\xaeI\xbf\xfe\xb6\xec\xcd\xd8\x7f\x97\xe2\xf9A\xf8\xfa]|\xc5\xd7\x9a\xe5l6+\x9b\xd5=\xf8HV\xe3c\x0eb\xb4K\xd5\x8bB\xb46\xdfi4\x95\x0c#\xb4\x8b\x19\x18_\xdb\x18\xa9|&\x1f\xf3>NvQ\x8ak#\xaepW\x95=\xe4\xbfu\xba7\x94\x1a\xdbH\xc9\xb0R$\x0d\xe7\xf7\x9d\xee\x0d\x03\xb3[5\xec\x8b\x99\x0b\x99\x0d\xcc\xcd\xccg\xa1\x16	\xad\x03\xb5\xe9\x1d%\xf01\xcf\xe4\x7f9}\xbc\xb0\xd0\xfb\xc9\x13\x13\x05\xc7\xfe\xfa\xcf&@$\x16\x1f&\xb8\xa8\x1b\xff\xb9\xf7\x8c\xa1l\xac\x94\xf0=\x0e\xd31RI\xf1\x90\x7f\xf2}9\xe6\xd8#\x18\xce\xcf\x82\xabz\xfb?\x16?1z&\xae\xf4\xc4\xb1\x1a_\x10a\xda\xf9c|\x13P\x07\x8cI[\xed\xdd:u\xd0;\xa0\xaf\xfe\xe4\xc7l\xbf\xd1->k4\x8e\xfd\x19\xe6G\xf5\x16\xa3\xf1Y\xd1m|Z\xf4\x90w\xe0\x0d}\x18\xfb\x93\xd1Hn\xd1R=-B\xbe\xeb\x99\xf5\xfc\x0c~\x06\xe5m\xbc\x90\xa7\x89.\xd9\x90\xb1	.\xc0\xc3\xf5\xa6Mz\x11^,\x97\xbb\xeb0\x90\x13\x7f%\x16\xa3\xf1\xb0\x11\xca8\xae\x1e\x17\x15\x08\x1a\x89E\xfd\xab\x16G\xac\xc4**|\xffsg|o\xd4\xf2\xb1\x8a\xc0\xb9zO\xfd\x17\xff\x1a\xbf\x1b\xd6\xac0s\x96\xbez\xe2\xda\xe9.\xac\x9d\xe3WN\x81\xb6^\xb1	\x8b\x84yHk<J\xad\x92\xdd\xdf{n\xc7\xc2E\xa4\xddh\xbc\n\nTG\xb7~\xe6\x92\xe7o]\xb8\xf0V\xb2\xe1\xb9\x87\x86\x86\x1ezn\xf7\xd0\x90zd\xd8,/\xc0)j\x81l.\x05\xf9\xdd\x0bw<w	\xac\xb6?5*F\xa0qH\x1b|\xf6<f7\xb4[\xff6T\xf5\x89\x1ed\xaa\xea\x93\xfc\x84\xf5\xa9\xa2\xd7?\x11\xecC8\xad\xeaS\xec'\x80\xf8N\n#\xbd0\x94f\xf12^~7\xa5\xaf:\n\x9cm\x81\x9f\xedM	I\x8f\x13\x88\x07\x16`M\xf6:\xd3\x8a\x04H\xa6\xc0\x02\xad\xcfF\xb2\xd89\xf1B\xe4\xa7\xde:\xef\xe1\x9f\xfd\xe1g\x0f\x9f\xf7\xd6Sk\xb7oz\xed\xd8k\x9b\xb6\xf3#\xe5S\xe6o\x9f\xcc\xa8o\x7fc3\xa4\x80\x84\x9b\xbfA\xa2\x99'\xd3\xb9m\xd7\xbe\xb6i\xd3k\xd7n\xcb\xc1Z\x90-\xd2y\xfaZP\x0d\xcb\xc7=\x0bUc\x99'\x85\x8a\xca\xea\xaf?&\xc8\x8f\xe8K\xa1\x19\x97Eu\xa3l\xce;\xe9\xaa\xf7><\x8d\x02v3t\x01{\x058-\xd9|\x02\xc3'\n\xf8\xabe\xea\xf8a~\x18\xd6\xec\xc5H94\xb2\xc8\x11x\xbc\xa2\xd7\x03A\xc5-\xb3@\xfcy\x0dbT4@0\x14\xecb#]D\x8cD\xd3\xd1\x08\x04\x93\xbd\x03lj\x80DSio:\x05Ag\xd0\xe0\xf6\xc4S\xbd\xecP \x16\x11z:\x84;\xa6\xb6-\xe1|\x12yH\x10\x1e\"r\x0d\xb7\xa4{\xd2\x1dB{\\\x88\xb45\x16RLi\x87\x146\xf6A\x83\xe1A\xd6\xe6\xe3\x96tM\xbe]\xe8\xe8\x81\x14\xdb\x0e\xdft\xd3\xe1\x9b\xf8a\xf8R\xf2\xb1K\xba\xfb\xe0\xcb\x1eC\xa4\xad!\xd8\x121\xf4\xb4C\xde\xedgC\xde\xec\x83\x82\xf0 +\xf9\xb8\xb31EG\xb7!\xd2\xda\x14\x80\x14\xddXz\xfb\x12\x96\x96\xae\xee\xbe\xe9\xd9\x9bnz\x96\x11\xb5v\x12\xdc@\xb1x\x99\x00\xf4\xed\x18\xf4\x9b\x1e\xca-#i^\xa0\xcf\x13x\xf1*\x81$)\xae\xce\xc0\x18W\xfc\x92\xe3\xa4=\xd6O\\f\xf9\xe4\xf3\x80[W\x7f\x8c\xb4\x93\xf6\xfeX~V\xac?\xab\xff\x08\xee\xfe\x18\xd0\x0f\x0b`Lei\xac::v4\xd6\xdf\x1f\x03\x02$?\x8b=R\xfe\x0f\xf3\x98\x95a\x04#\xffc\xa4\xf7]8Y\x01\xe5\xddFJ\xe2\x99b\x08&\x08'{%LC\xecE\xc0\xcf\x1c\xa2\xad\x89\xcd\x0c\xb7Cf\x81]\xc7^$\x8a\xf9/\x19\xcd\xf9\xef\xd2f\xdf\xaa\xdeM;\xc3\x80\x19\xda;\xab\xf3\xc9\x0e\x9c\x85	\xa5\xb0\xca\x08\x90\x846\xf9\xb0CX\x1b\x9d\xd5V\xb8\xa5\xc0\xa7\xf0#\xea\xc6X\x7f~\x0bF\xf0\x83\xda<\x7f\x02\xe7	:\xfevC\xbf\xafc\xba\xb5yB\x1bp\x13Lv\x8a\xa3\xac\x8f\xd31\xf0\x1f\x7f\xd0F\x94v#\xdf9\x86\x03\n/\xea\xf68VF\xeb\xa901\x14\xd3\xe0\xad_K\x03\x17\x1b\xf4\xed?\xca\xe6x\x81>\xa3}\xfa\xd4#\x80G7\xd4\xd1\x82\\W\x8cp!.@\x12\x1c\xfc\x12\xb8\x08\xee\xfc\xbb\xb1\x0fb\xf9w\xc9\xa1\x1f+{\xdco\xaa\x8f\xd5\x1d\xad#\xbb\xd4\x8dP\xc3Q\xd2\xaen\xc4\xab66\ncZ\x81\x11\xad\x8f\xe7D\x89\xa1\xa5\xe2\x92\xc2(. \xb0\x9f\x14\xba\x10\x1b\x81u\xef;n\x8bM}\xd1\x16\xc1\x8b\xc5\xfd\x1d?\xbb\x9c\x82\xaa\x11\x9e\x10\xe4v\xcat\x9e\xc9x\xed\xeaF\xbb\x9d\xec\xb2{\xc9+\xc8\x14\x96\x13\x9d\xb2\xf9\x10`\xa2\n\xd7=\x9f\x04\xd7\"\x07\xa0r\x05P\xcf\x80l\x98D\xeeV\xcc\xb6\xdf\x00\xa4\xbf\xb1\x99\x95\xbb?\x06\xe3\x00\xed\x1f\x01Z\x17@\xeb\xa2H\xff\xe4\xb0\x85]\x15\x9d\x1a\xba[\x1a\x98\xa53\xc0\xf6\x7f5\x80\xcc%\x10O\x0b\x1b\x01\xa8\xbc\xea\x1f)\xde\\^\x84\x8f\xd1\xe5 Z;\xfa\x98>\x8dF\xf7\xbatf\x1a\x9b-\x1aI\xbaz\xd3\xae\x0c\x11\x80\xe7\x00\x8cy\xfau\x811\xdcu\x99o<\x15\xe5:\xc9oa:uq\xdf\x14\x8d\x82\xd5w\xf2yk\x03k \xe2\x8b\x9c\x8b}0?jv\xb2\xabX+\xc0\xe8\x02\xe6\xdd\x05}V\xbb\x0f\x9b\xad\x10\xef\xe4G$s\xfe\xda\x1a\x9f\xba\n?2\xf26\x1f\xf9\xaa\xaf\x86\xfd\xb4Y\xcaI\x165c\x91$\xf3Cf\xfdb!\xafX\xa4*|F\xcf\xd4\xd6^\xba$\x7f\xdcp\xba7\xefp\xe4\xed55\xa7\xc5\xdd\x05\xdf\xb66[\xbfm\xb5\xe0jg\x81\xb9\xa8\xb0\xae\xa2l>\x9d*\xf6\xf1\x01\x12	\x15KO&\n \xb1\x898\xf7\xdc\x9d\xa2\x05:\xc7\xb0\x85\x17o\xbf\xea\xd6k\xf5\xa2\x87K\xe5m~\x99o\xbeS\xe4-*4\xa5E\xbc}P/\xfb\xda\xcd%\xa0\x0bk:\xa1e\xd7\"\xe51A\xe9J\x88\x96\xe8\xc2\xe2CAX\x9a\xb4\xb9\x8b\x8a8=	\x00L\x83\xc5\xa2>\x08\xb0\xdc\xb1\x1ea\x19\xa6\xe5\xff\x97v{\xe4\x0e|K.3\x0b\xc6\xdb\xd7\xef\x80\xb7:\\\x0fB\xacx\xc7\x02\x1d\xa4\xfcw\xf0\xba\xe5\x0e\x98b\xc9e\x16\x1db\x80\xcf<n\xad/\xf1N\x8f\x8f\xe7\x01\x85jN\xb6j\x9dOTQM\xe2\xff\xf2\xfb\x1b\x91\xdf\xd5\xa7 \xee\xe5\xb1g\xf0\x81[\n\xd7\xbc1\xae\xcfJ\xf2[H*\xe8d\xc3\xb7\xff\xe9\xd8J\xea\x04(\x90R\xa1Y}\xee\xae\xb8\xe4\xfe\xb9\xc8\xd2\x98\x1f\xa4c\x1e\xb9\x02\x14hC;\xf8ay\xabh\x8c\x90&\x8cC\x0cq;7/SG\x97n\xc9\xd2\xf5y'^\xf3\xfb\x1a\xdc9w\x03\xd7\x94[\xb6y\xcb\xd2\x1cF`4;\x14\xeb\x1f\xc6upX_#\x90\x8f6Qy'\x9dxC\xd8\xeaq/\xf6\x02Q\xe2\x80P&\xd1N\xe8\xa7t\x7f\x00\xba\x04\xee\x0b4p\xde\x06\xe8\xc1\xe9\xd4\x8dqD\x02\xf72/\xd8\xb9\xc0\xcci=\xf5\xb5\x03\xad\xd1X\xfb\xdc\x86\x15\x0bD\xa3A\x90<\xdb\xfa\xbd-\x9d\xae>>\xd61\xdb\xbfv\x89H\xc5\x16?\xe4\x13f\xb9\x9b58\xd4\xf3\x0c\x86\xfe%\xcd6\x9b$\xc9\xb2\xdc'p\xa2L^H\xaf\xe2X\xcebp\x13I\x92V\x19qn\xd6\xe6\xbf\x07\x81\xde\xe9A\xe98\xa5\xe5K\x94g'i\x82!Uz\x86\xe1SE\x9a\x06\xaaI\xd7\xdf\x1d\xfb\xf5\xde5\x14\xd9\xf7\xfdN=\xf1\xbb\xfbhp\xcd\xdeV\xdc?\xa1\x9b(\xecE\xc5 \xff\xe0\x9a\xbd\xbf\xbeV\x1d\xa5\xb3r\xfb\xcd?\xde\xb4\xe9\xc77\x17\x9e\xae\xfd\xf5\xde\xfc\xcbV\xa3\xda\x8b\x89\xc9\xbf\xe2\xb5\x14.\xb4\xe3O\xf8\xb9\xdc;\xb0\x06\xf7\x95\xa4\xa0\xd1p\xa4\x00\x0b4\x9e\x90N\xe9RZm.\x04\x96O\xd4\xf8> Mu\xbe\x8fL'\xac\xc9j5\xa9\xaa\xe2\xd3\x08`\x1f;\xb4Mt\x8bAQ\xdc\xb6M\x84\x9b\x1b\xef\xf4y\xebV\xed\x99\xeb<`\x10\x91\x92\x16\x0d\x07$m)\xdey\x9a\xa4\xda\xb3\xd1X\x84\x99\xdbDa\xee:\x1d\xcc\xe1\x04\xdd\x81\x04\xaa\x9a\x04q\xbb1\x9dJ\xf6Fq\xb315\x01\xa4\xe4-\xdel\xb8\xe8\\\x83\x853\x89~X\xa1\xe6-2pF\xffD\xf0e\x89\xe9\xd6/\x7f\xf1f\x13!\x06\xaf\xe82\xae\xbdi\xe7:\xe0\x93=\x02\xc3h\xfd\xe0{\xfc%\xdc{t\x85^\x80\x14\x8d\xb6\x0b*\x1a\xc4P\x11\x88\x88\x06\x85\xf0\x0fB\xcd\xbd\x0e]\xee\xceY\xd3D3\xc0\xd8jd\x0d\x1b\xfa\xd3\x06\xd6\xd4*\xe6w|\xe2\xea\xbcGL\xcf\xbd}\xf9\x1b\xcb\x91k7\xb8\x8d\xc3\x87\xcf=0\xd7\xe46\x04\x84o\x7f\xa2z*\x06\xad\x9e\xb6\xe2zo\x82\x16\xf01~J\xe7w0\xfd0S\xcf\xd4e\x93Pw%\xa4\x04\x94\x90#@BJB	\xc0\xa0\x0d%\x03\x02\x10\xd9\xf8+\x84\x92	\xfc'\xb8\xbd\x9c\xc0;\xa4\x0e%!&\xa9\xa7\x12\x0b)\xf0\x1eH\x06\xc8q \xee7f\xc9q\xf6H.\xa7\x8e\xe6\xb2\xec\xd0\xc9\xe7\x81!\xd8E\xda\xc7\x8ef\xb3\xec\x91,\x10\xfc9\xd5\x9a\x83$9\x94 \xe6H{~\x16i\x07\x9e\x80\xdb	\x9fZ\xb3\xf0\x02)O|\x82\x8f!\"\x87\xfcD.K\x89\xd2Q\x0ca2\xd5\n%\xa9\xa3\x9a\x182W\x8c\x1f\xa5\x12\xc9\x82\\\x0f\xeb\x8e{\xe9\x16*\x99\xf5B{7\xe2,\x98\x0e9\x12.\xf8'ew U\x03^\xa8\x83W\xaf\x8f&\xde$\xbbr9\xbc\xb5\xe7rcG\xf5B\xf4\xe7\x1cwl\xac\xa6\xf2\xff\xe4\x92l\xf6<\xfc\xd1\xfa\xbe\x99\x7f\x12\xca\xb7\x01\xee\x19SQ\xc2\xe3\x82\x85\x88\x8fh\xec! i\xbf\xd1\xa8v\xe3\xee\xceJ\x02\x0d:\xb3\x7fY?\xfc\xf1#\xf9\x95\xb8_\xd3m4\xb2\xfbq[\xf0\x87\xfd\xfd\xcb\xfb\xfb\x0b}\xd7,\xbcE\xf3\xf5A{V\xe5\x1c\xd0\x9f\xba\x88\x89\x9c\xae\x14\xceP|\x9eD\xf6\xe5g\xa9?9M\xa9\xc5\xc7Id?{\xa4\x04\x03)\xae\xfb\x11\xca/\xc2\xf0\xd0	/\\[ \x88\xabJ\xf9\xd2\x8f\x83\xb9\x9d\xeb[\xe0\x9cf4\x03G>\xcb\x07\x01\xc1\xcc\x1e\xc1Q\x80K\xa0\xf3^\xa0\x0c\x17\x8cm\xd7\xe2\xb9\x17 \x86\xa6\x1c\x9bO\x97\xc7\x1f\xf9 \x01-7w\xea\x14]\xcb\xcc\x05\xea\xc2\x84\xf4<\xdd\x0eU3j\xc6\x8f,\xc4\xc9\x1d\xe4\x88:\x93\xbfY\x93\xb5q\xc5~\xa00\xb3\x99\x15\x08/\xa5m\x91\xac\xc5\xb5\x0f@C\x8a\x16\x97C\xdc\x15F\x80q<\xb7\xe9\x92y\xa4x\xcbh\x07\xfa\x8c\xf5\xc4\\\xf4\x8a\xa60=\x97RgY\xecd\x91(\xf5\x19\xbc(_\xf0\x1a2\x92\xb8\x8c\xd8\xc9\xcaa\xb3\x87_\xc4{p\xb7M\x0b\x14\x85\x15T*\xa1\x8b0\x9eU\xad\x94T\xb6\x98\xd9!\xb3\x05if$\x16\xd4\x9f\xd4(W\xe2\xa4q\xa5RC:P\xa0a3=b\xb2\xd1\x0b rK1'-\xbb{\xa0\xcd\xf6\x95H\xe8\xca\xbdH\x1c\xfd1\xca\xe1'`\xd9k\x1c\xcf\xafex\xa2$\x92\xbc.\xb9h\x8e{\xdc\x86`\xa4\x17F\xe9\xa4\x0bz\x9bE\xc30\xae\xf8c5x\x1dfM\xd1\xc4\x05\x04\x86\xe4\x8f\xbe}\xe7\x9d\xdf\xbeS\xfd\xef\x95S\xa6\xac\x9c\xc2\x0f\xc2K\xc5]N\x1d\x18\xebf'\xdbpP\xce\xb9\x13S\x1a\xa7`BmmH\xd2v9\xc44\xe1\x88\x84^\xecm \x8dD	$\x11\xa1\x01\x98\x8a\x81,\x80'\xdc\x84\x1e \x84\x0bp\xecW\xc9\xad\xee\x16g\xd8dV/L\xb6;\x96\xaa\xd7M\x0eZL\xad\xf1\x06\xf5\xf3\x93\xea\xad\xb5\xa2H>{\x80,\xdf\xc3\x1f\x1a\xab\x8d\xb7\xba\x14\xc2\xce\x98\xb1\xaa\xe3\xd7\xf7\x9f\x13\xec\xac\xb7\xce\x98QSo\x0d\xdbl\xdc\xfb\xf9s\xc9\xbfh\xfd\x02\xf9\xff?A\xbf\x882q\xaa\xd3\xd0`\xc0\xdd5\xa0\x83\x80\x9c\x07Z\x80\x8f&\x05*\xea\x93X1L5\x01:\xd96\xa2\xeb\x04\xb4\x11\xf6\xcf\x82+\xd9\xdd\xdf\xeaO\x0f]ue\xb7j\x8d\xf5\x13\x83\xc5\x1b\xa8%?\xef\xdb\xbc&\xd3\xd8\xd1aW?{\xef\xa2\xcb\x1d\xad\xcb2[\xfe}\xc9\xd2\x1bW?\xce\xdeJ\xc4\x1a\x7fb\xf2\xd2\xce\x99\x9b\x17\xa5k\xcf\x11\x13-\\\x7f\x8d\xbb\xdeb7\x89sI\xec\xackf&\xce\x9b\xdcf\xea\xb9x~\xac\xbf\xb7n\xec\x99O-9\xf7V\xda\xe7\x01\xce\x0d\x94~c\x88W\"\xc8\x97y)b\\)\x842\x12MrW\xb1\xcbf\x88;M\xed\xf3U\xeb7\xa5\x83\x1c'[\x1b\x15\xaf\xcd\xc0\x8f\xf4\xb9\x92-c/\xf6\xb4\x18.\xbe\xd8\xbe\x94\x9b\xe6\xa8u\xd9M\x16\xe8\xfel\x9f&\x1f\xf8\x9a.\x1f\x08\xd3\xf59\xd4\xdb) G\xea\xd1\xda!\xc3!W*	\xb86\x080C\x8a\xd1\x84#\x94\x16\xdcq\xa3\xc5\xe7\x8a\xd4\xf8rq\x9fO\xdd\xc8K\xc1ZO\xceW\x13q\xf9,\xc68\xcc\x81\x0f/Xp\xe3\x8d\xf0\xcf\xedT\x9a\x14\xc9\xc8\x91\xb1g<>\xc2\xc2\xa4)\x98\x14\x89[J8\xa3\x04o`\n\x1d;\xfa\xd4S\\\xd3S\xd0\x17\x02\xa7\xbe\xc6\x7f\xf6\x93\xc0\xe1\x12\x93\x01%\x9a\x86h~\xf0\xccp\xcc|J\xcb\xbe\x08F~K\x19\x18\xec=E0N\xee\xb8Q\x83X\xdf\xc7\x1a\xa9\xde\xc7*\xe7\x19\xfe\xd1\xe78;D7\x0f\xf6Q\xf1\xd11\xaa\xb5QC\xc3%\x0d\x0e*E\x82y\xeby}\x83\xa1 \x8dUG?>\xfcI`\xe6>\x06\xc6\xea\xf7'\xca6<\x9e+\x83\xed\x9d\xd3\xc4\xff\x7f\x013IV\xf2g\xd5\xcf\xae\x8fyO\x8e\xfb\x95\x12\xaaQ$WBv\xae\x1c\xdb\x08H	v\xee\x85\xa2\xe8[\xfd\xcf\x8f	2\xff+\xfd\xa3\x0c\x8f\xca'\x08\xff\xc3\xb86N\xb8\xdf\x86<\xfa\xff\xfa\x9e\xdb\xc7\xee\xc9\x95\xb6\x1d\xa6\x97\x0d\x872\x94\xffS\xf1\xe5\xa8\x9a\x189\xff\xb3X\x861\xa0\\\x95\xe2\x94\xa3\xfb\xfd\xad\xccdf>\xc3\x04B\x8e~\xb6\xb2\xca\xd5\xcd-\x88\x94t\x16>\xa6W\x90]\xd9\xecp\xa9Pr\x9c\xeeZ[\xb1\xb2'\x9e\xca\xe5\xc8+\xa4\x9d\xc6\x8c\xe2\xb5l\x869]\xef8q\xe3\x82\xec\x82C\xa7\xe9!\x8c\xb6'\x0b\xeb@A\x7fA\xafOu\xff\xd0\xa8\xe4\xaa\n!?\x10M\x7f\\\x85JM\xcd\xad\xcdf\xc7\x9e)\xab\x11\xdf\x95\xcb=\xf5\xd4\xc9w?A\x95N>\xcf\x0f\x96\x83\x9e\xcb\xc2\xbc}\xfajQ\x1a<\xc7\x8fp\xc7\xa0^\xce\xf1\xf2(\x13\xbb\x80}\xbf\xb1\xbd\xbd1\xef\x84+\xbf\x932\x1d\xc7\xe0q\x0bF\xb2\xf74R\xbe\x84\xb4\x17iH\xc4\x8f\x97\xeeIT\xebr8\xd2\x02\xd0\xdf\x0e^\xa7\x99\xda\xf9!gm\xad\xf3\xe4>\xb8\xce\xff\x90\xb4\xce'\xe1\xf7\xc6\xde\xda\xb8h\xd1\xc6E\xfc`\xads\xcc\x8ao\xb9\xe3\xce\xdal\xbe\xf1\x85\xdb\x1e!\x19\xf5(9~\xed\xa2\x0d\x8b\x17o\xd0\xe0\xfe%#\xf0)\xfe~\xc6\x83\xfaj$\xde@\x80\xd5\x94\x88Lp\xbdG\xe5\x1fOa{\xe9\xae\xcd\xdf\xbff\xce\xec\xc3\xa9\x94)\xb0z\xe8\xaa\xd8\x94Y\xd7<\xfe\xf5\xaf\xef\xd8\xf1\xf5\x1d\xfc\xfd\xdb~\xb0\xf9\x9a\xcf^\xf5\x9f\x03\x19c\xe0\xd2\xcb\x1e\x9a\xb7s\xf3\xd0\xde\xeb\xe6\xbd\xba\xe3\x1b\xb7\xde\xfa\x8d\xb2\xfd\xc2\xdd\xb4N\x95RU\xe2\xd0\x04\x9b\xd5R\xd4\x05T\x94Y%8\x1d\xdb\xc0\xad\xa4\xf2K\xccs3\xc3q\xbf\x11d]^\xa9QTb'\x07 \x0b\x9c\xc4z\x1bx\xaf\x07)\xeeH\xb4\x93\x8dF\xd2\xa9P\x84mU\xceZ\xbcjQ&\x9cX\xb9\xf1\xc6\x81\xe5\x0fo\x9f\xdf<0\xb8j\xc9YG\xbc\xb1\x16\x8e\xd4\x05z\xea]\x8a\x87\x05\xfe\xd9$8c\xd6\xda&\xd6h\x14\xe4y\x9f\xdd\xbc\xf5\x9a\xcdw\xce\x9e{\xcb\xea9\x11^\x98\xbc\xe6\xc1sf\xdf\xb9\xe5\x9am[v\xe5\xd5\xc0\x82\x1d\x93\xc3\xd3\xa3!\xc9(Z\xedAs\x8d\xc8\xdb\xa7\xc7\xcey\xc1B\x8a\xbc\xc0\x1b\xfc\x95\x8c\x15\xfa8R\x1ai\xd4\xa3B\xadg6\x1c\x88{\xcbUm\xa6\x92tyW!b\x9ap\xc7\xaed\x0dn\xc5/y\xcc\x82\xe1\xca\xbc@v\xc5\xd3/\xa9\xbb\x90\xd4%\xc7c\xfd\xb9\x97\xf6\xaa\x1b\x9fx\xf1En\x92:\xfc\xe54Y\xc3\xfd\xf5\x1a\xc2\xb2\xbc,yZ-\xe6kr\xb6\x97\xfacH&\xf6\xc7^\xc8\xa9\xcfC\xba'\xc8\xae'^T\x7f\xae\x0e\xc7\xf7\x935\xba\x9c\xee\xf3\xd0\xc7\xea\x98\x14r)(\x8a(I\xe8\xd2J\x99\x1cU\xd7\x1f\x8c&#\x80\xdd\x8c!\x0d\x14+YM.\xffJ\xef\xabEX^|\x82\xc2\xc2\xdeL\x96\x01\xabw@\xb4\x90\xda\xbe\xec\xf2\xa1Zsg\xdfY\xd3\xe6\xb4\xba\x88\x85\x1f\xfc\\\xaa\x00\xd1\xee\xb5\x05x\xea\xd4\x9f\xa0\xb2\xc1\xbf\x19x\xd3\x1b\x84\xb5y\xba\x03\xfd\x97L\xef\xf5Cyo\x99\x85\x92<\xf1Q\xcaO$)\xf7W\x8d6\xa5\x1cm%\xdd\x86\xaer\xdd\x86\xd5d\xf5\x94\x99\x87\xd5\xbd\xd5\xf0\x92\x1f\x90{\xa1\xfcO\x89b\xfe\x8fp\xff\xbb\x08AE\xdc\x80\xca\x8c\xdeg\x0b\xd0\xce\xce\xfd\xb2\x88\xbe\x04\xa4\xa7i\xf2\xef\x89\x90\x9c~\xbaA\xa4\xbc\xa2\x99\xf2\xdfO\"mo*\xee!\x02\x83\xd3[T\xc0\x9c\x8a\x12\x8f\xf2m\xacdH\xd1T1\xd3$\x85\n	\xc9\x10P\x16\x19\xd4\x904\x12^\x14\xcc\xfbsfcA\x033\xb7\xdf,\x88\xeaXA\xad\xf2P\x8e\xeab\xe2ks\xee\x90Y\xe0\x86\x8b	\x0f\x9ayH\x88h\xfdP\xe4\xcd\x07\xcb\x13\xe2+b\x82W\x90=}\xa5\xd3\xfb;\x01\xbf\xbe\x82\x14\xb5\xa8\"Z&x<\x01S\x1cySV\x14Y\xed\xd6&=\xaa\xfe4\x9f\xbc&\x19\x91\xe81J\xe45u~\x81\xe8,\xd3\xbf\xa4z\xefe\xf9\x96g^QB\\/\xa1P\xca\x84%\x8d+p\x82r\x1fe|Pn\x02\xa5 \xa4T\x92\x86cZ>?\xa2\xe7\xef\x96e\xf2\x9eV\"_[\x91\xe7Q\xa9\x15/\x85\x025Y\x00\xe3\xe1\x13|\x8a\xb1\xe0\x1eqI\xa3\xf6/\\\xa7\xd39\xf6\x96\xd3\xe7\xe3\xe3\xaadi\xb0\xc0EBh$\xaa\x1b\x9d\xe5v\xd2\xf5\xa0\xb1\x80\x85\xd3\x0bwOL\xa4 \x85\xea\xd0\xfafp\x19\x05\x8fa\x0d\xa6,?H\xf3gH\xf9f2\xac\x17\x88\xb5Rb\xee\x85\xb2L\nv	>\xdeU\xc0So\x99\x96\xb0^1/,\x9a\x88\x1f\xc4\x93\xa2vc\xab\xb0Y\xf2\x02\xa0Gm\x02\xf4\xc0\xc5\xa8\x90\x17\xd4~\xb8Am\x8d\x12\xeaz\xaa\x0c\xcb?\xc7/\xa6\x92\xff4\xd4\xce\x050\x89\x00\x13\x87yj\x17\xcc\xb8p\xe1k\xb2\xee\x06\x81\xb62\xab\xf6H\n\xab\xc6eE\x80R\xdfb\xe9\xc5\xcf/\"\x1aM\x0d7\xf25u\xb2l\xc2[\x9fdrC\x91&Y\xcd\x90\x17\xdc&I\x9d\n`!>p\xfb\x98;\xa6\xf5\xe5J-\x8fb\x9d\xe0\xc2--.\xe0\xb4V\xe4M\xda\xc54>\xa9\xbcFj\xbf\x96/\xee5\xc0\xba\xce\xcf\x83\xb6\xaf\xa3\xb2\x83\xa2\xdet5}\xc2>C\xfe*\x9b<'\xdf\xf7\x98d\x08\xb5\xe6?,c\xc2\xf8\xbe\xfc\xefd\x8fGf\xeb\xe5\xfc\xbc2\xd2\x810w\x9d\x1a\xe36\xf3\xf3\x19\x98\xf2L\xach\"\xdcf\xf5K\xe4\xa2\xd7\xf2\xff\xce\xb6p;\xd5\xc7\xd5\xc7\xbf\xcf\xb6P\xd5d\xa8c\xff\xa91\xbeEO\x8b\x9a\xd1i\xbe%\xff\xf6\xf7\xc9\xc5\x98(DC\xe4\xe2\xefW\xac\xb7\x89\xaa\xf5V\x08\xe9\x1b2\x9a\x84I)\x88\x9d\x12T\xf6\x14i\xc3M\x9b\xea\xb5\xf8F\x00T\xdbz\xa10\xeb\xc1\xaa\xb5\xf9\x9bU\xaf\xf5 S\xb5\xfe7V\xaf\xff\x01\x0d\x14mB\x1fW6;\x9b\x12n\x1aYZU\xa2zS\x19\x1e\xcfTg>(\x93h\x04\x85\x85\xeeF\"\xe2\x05\x15\xde\xbdT\xeb\xbd\xb7\x8b\xa4\xf1R]\xe7\xdf\xfbL\xdb\xb6\x99|\xa6\xfbLx\x87[\xd5s\x15,\x07'NU|\xae\x80\xaf\xb9\x1a\x07E\xe0<\xf14\x05)\x12\x14\xab\x01R\x96\x8b\x8a\x11\x16\xa0\x0fp\x06\xdf*\x8a\xb8vU#\xa4g\x05\xc4\xc3*\xf1g\x98\xf2\xb7j\xc9\x99*=\x81~\xdc\x83\xa8\xec\x11A\x89S\xdc\xfd\xc4\x93\xce\x10\xcd\xeeA\x0cJ\x82Hw\xe43@Nur\xaebw\x99\xb0\x8d\xc8\x80\x7f\xca\x8cx\xc0}[\x83`\xf07\xba\xbd\x92\x8b\xf8\xa4Z\xa7\xcb\xca\x12\x9btPlh	\xd5\x04\x13\xb3\xa6L.)NU\x82}\xbf\xa5\xa1kq\xdc'\xd8\xddv\xc5\xe9\xf5\x88FQr\xd7\xb7\xfa\x8c\x0e{\xcb\xa4\xf3S]\xf3Z\xebL\xf9\xff(\xd7@\xe3*\xfaSf\xc2\x1e^\x82\x96+u\xf6Pe_k#\x8e\xf1\x95\x19.\xc98\xe9\xce\xc9\x82\x05%\x8d\x90\x05\xd5\xa0\xaf,\x81\x85\xaa@\x95\x9b\xa3TK\xa3\xa4\x07\xd1\x85\xba\xa7\x1a\x9f\nt`\x91\xdf\x91\x88X\xd4AD;\xa6\x82\x1ab\x86\xa4\x81|p\x15\xdfA\xba\xe27\xf0}q\x07\x15\xd2\x15\xbf\xe9\x042\n@Y\xfb`\x1d\xdd\x07~\xa5\xee\xc1\xb5\x14\xb6\x8a\x88\x17i\xd4\xacK\xbd\xfb0j\x9f\xf7\xd2Y\xd5\x11(\x0d\x9e\xf8\xdbR\x84\xfa\xc3\xd3~^\x88\xa8\xd2\xa7\x188\x83>\x85\xe8=\xe3F\"\x9a\xcb\x9cA[\xe5\x8b\xd3Dq\xfbvQ\x9c\x06C\x02\xee\x8aX\xf5|Z\xf5\x8bsO\xf7\x85\xfe<N\xc7\xa6\xfbc\xeaPI|\x9e\x11\xe8\xdb\xd6\x89\xa2\xfa2\x0c\xd6\x1f\x18\x8d\xeb\xa0\xc4\xc5\xaf\x9d\x01\xd0\x1b1\x85\xfa\x1dQ|\x03\xee\xeb\x8cFH\\\x05[\x0d\xee\xcfT\x8fk\x98\xde\xbd$\xe2\xd5\xd43\x92\xbd\x13\xf1X\xd3\xd9\x05\x97\xff5\xff\x8d\xcb\xaeA\x85\x8cq\xc5_\xbb\xedrv\xc1\xf47\xf3\xdf\xc8@\xf8\x1a\x8dv\xf02\xcb\x80\xcf\xfd\x08i\x07\x17%\xab\xcam\x1a\x91\xd8\x8a\xb2f\xbb\x97\x8dP\xb6\xfa\x17^{\xfeovv\x0ey\xdafV\xd4w4e\xe5w\x14\xb3\x0d\"\"\x05Zd\x19\xbf[\xcb\xcfT\xa4C\xca\xad\"\xd9\x9b!C\xcc\xc6\x9b\xff\x05\xe5\xd8#^\xee\xcf\xea\n\xd4\xefZ\x01\xb9\x92\x90f\x08\x19R\xcc4\xbf\xaf\xc3x\xbb\x00p\xa2\x14V\xebrSK\\\xb7\xd9\xfd\x13B\xc3\xdf]Q\x84\x1d\n\xd5\xf3\xf3B~#\x94V*\xd8p\x16\xc8x\x0d\xbe\x88^\xbc\xad\x02(\xdc\x1f\xd2\xebo/`D\xab\xef\xd7\xa1\xcd.\xd0\xf4\xb1\x0b\xf5E\xe6\x8aOWTv\xf5\xc8\x13\xb76\x0b\xed\xe7\xdd\xf9\xfaM^~Ey\xd6l\xf3\xac\xcd\x0b/\x7f\xf6\xd1\xab\xe7\xc0\xc7\x8a\xb9l\x8eQ\x986M\xab\x12\xa9\x9f\x8aq\x94\":}H\xbbea\xe3\xde\xc0-EY\x88\"\xad\xfe\x08z\"\xf4\xc8\x8fVKF5\x80\x92\x91\xca8\xaa/7\nt\xd1\xea\x8fD\xe8\x80n#D*'\x97\xc0\xc2\xdc^\x15I\xd7\xfb\xb3\x98\xb3\xf8\xb5\xfcZ\x1d\x1e}p\x17ITmdL\x08%\xf77\xbd@\xa5\x04C\xde:\x1eF\xfe\xa2By%\x10\xf2\x7f\x9e\x00\xc6\xea\xf5\x0f\xe5\x92\xe3\xd7\x0b\xafKS<K\xbbRe\xeb\xc5\xc4\xab\xddso\xbak\xf8\xc9|\xc8\x9dr\x87\xe0^\xd3s\xbau\xed\x9b~\xb7\xfa\x96\xdb\xefw\x93N\xb7_\xb5V\xeaP\x0b\xc56;\x8bY\xc1\\\xcc\\\xc6l\xd0m\xa6\xf1\xcf\xebI\xa3\xec\"\x8d\x86\x88\x18\xc3R\xf0\n\x122\x00\x0f\xb7\xce\x03ts\xa80\xf7\xe3^\x11~\x92\xe1\xf5\xb5\x9b\xee\x15\n\xd1\x08\xdd;\xc4g\x17E\x7fLc\x16\x1c\x847\xb9\x05\xc1\xe3\xf9\x9e\"\xfb\x8d\x96\xc8\xf7<^\x87\xe2\xed\xb6\xd9$\xdeg$\xb2y\xaa\xbe\x88\xa9\x1bs\xa8\xd9L\xd7\xb4\xa9\x16\xc9\xe4\x13$\xd6\xa0\x00D\x8f>	\\\xe4/\xcdf.\xc1\xd9\xd5\xe4\xb3F;\x04\xcc\xe6\xffk\xe1\x1aP\xf1\x95\xecb\x87d\xb3z7\xd4\x90e\xcd\xb6-6\x8bb\xb2y\xb6\xd8\xccb\xc0aWjnh7Y\xf4L\x0f\xe1F\xfb!\xbd4\x83\xc0w\xdf\xe2ssF\x8fC\xban\x8fh\x96\xcc_0\xf3\xfb\x1f\x85\x92>\x0b\xe1\xb1M\x05\xbdZ\xb2\xab \x1f\xb0\xf2\x87\x80\xefnC\xed\x7f\x9c\x8c\x0c\xac\xc4\xc3*\x1a\x11#\x125/O\xf6\x02U\x03\x7f\xd1N\\(3\x06o\xc4@\x85[\x12\x0f7\x0f`\x8bMg8x\xcf\xdfg\xace;f\\y\xf1\xbd\x97|f\xd6\xa4\xa9\x0e\xde\x91\xa8\xdb]\xebi5\xae\xa8q5q&\xd6>\xb9'\xba\xf4\xe2\xf3\xef\xbc\xe1\xe5\xb0\xd1\xdf\x18\xd9353\xe9\xfck\xcfY\xea\xad\x91\x9c\x1d\x01\xdf=W\x9f7\xe7\xe2+\xce\x8byx\xfeI\xcee<\xac\xbe\x93\xfb\xc2P\x8f\xc3h\xb1X	a\xeb\xeav\xd7\xb8\x82\xd3\"\xc6\xf9\x8acJc\xfa\xc2\x9bo\x1fH\xccO\x86Cu]\xb3L5\x91\xae\xab\x03\x81\x86\xd4\xd2\xc5k\x93\x93\xa6\xf0\xd1\x96\x86\xf3\xa6\xf5\x84\xa7]x\xf3\x8a\xb8\x1b\xe6\x8a\x0b\x98\x06~\x13\xff#\xaa;!\x91\x06\xde\xdb)B5\x1a8\xa8\x04/\x1aP\xac\x05\xed\x0d\xf5\xf5H\x1c\x9a\xd1F#0\x89\x18\x1a\xb0B(\xf4\xcap\xec}\xd1Fst\xd2\xdc\x19M|\x9d\xb9\xc6l\xe7\x88\xc9)]t\xcf\xbc&\x83\xdd\x96\x99\xbf,\xe3\x99\x97nt\x1a,\xb6h[\xd0\xe4Y4\xdd\xac$\x17\x9ewQ\xd7\x92\xb5,\xcb\x0b\x9e@\x7f\x8b\xd1\xe0\x8f\xc6k\x1a\xe5\x9a`D\x94\x83g]r\x0e\xff\xa3\x99\xb7|\xea\xfcY}\xcdVq\x92wRC*\xd4\x13\x8e9[o\xbb\xff\xa9\x07\xe7\xa7\xd7\xce\x9d\xdcd\xf0X\x0c6\x8e\x17\x9a&\xcd=\xff\xe2\xcd}\x97\xed\xdf\xb0\xc0/*\xcd\x8f\\\x00\x04\xcb\x94)\xb3\x83\xc95gO\xf2\x98l\x9d\xd3\xa6\xaf\x08\xac\xd8}\xd9\xd91:>O\xfd\x8aY\xc7\x8f\xf2s(\x95p6\x1d\x9f\x82[\x12\x82\x9dB/t\xe7\x88\x81*\xcc\xa0-n:\x15\x11\xb1\x01\xbd\x0d<\xd0\xa6\xf0\x14\x8d\x08\xf8\xe8)\xc8\xfa\x10\x0b\xac\xe1+\x8f\xde\xb0~q_}\xfd\xe4\xc5\xeboxt\x0f>L\xae\xaf\xef\x83\x07V\x96\x0dF\xdf\xc8\xdfG\xbc@d\xce9\xd7\xc6[<\xf1s/\xbc\xed\xae\xdb.<7\xee\xb1\xf0\xd6s\xf3\xa7B\xb2\xc9\x14\x9ed\xef\x90B\x12'\xb7wX\x82\xfc\x9c\x8e\xb3\xce\xbf\xe4\xfc\xb3Z\xe9\xb5\xa3\xfc\xe1W\xb2\xc1\xd5\x97\xd9>2\xb2\xbd?\xed2\xc8\xb3\xaf\xb1\xf78\x9b\xe7\xac\x9e\xd5\xd3={\xf5\xecfg\x8fcsC\xb3\xdc\xe5\x9c\xd5m\xe3\xe5\xa0\x1c\x96\xdb\xcfr\xe2\xbe\x0e\x0f\xf5e\xa0\xbe#\x8c\x9b\x89\x02E>\x88\xf2\xfc45\xb5\x14\x12qo:\xe1J\xa3\x14\x16\xd6\x04\xec\xbcX\xab\xb0^io\xba\x93P,x\x8b\xb5f\xb5:/y\xa0\xf1\xbc\xafn9\xa7\x9dV\xf3\xd1\xa5S\xa77=\x10\xe9\xba\xf2\xee\xe8\x92u\x0f-\xed\\\xb8%\x02\x95K\xe5\xcf\xa6Uv\xb6\xce\x1b\xbc,\x19\xbb\xe2\xb3\x80\x84\xed\xc5\xeaZ=\x1c\xd6v\x9b\xfb\xe2k\xaf\xbf\xa4N\xd1*+_\xa7.\xfd\xda\x8a\x9f\xf5\xd6\x9e\xbbi\xfd\x9a\xda\x83=w\x0d@\xa5\xe6l\xa2\x15m\x98r\xf6\xf4>\xdb\x17\x9dO\xad\xc7\xcao,V\xd4\xb2\x92\xd7\xeb\xc9\x9dz\x0c&:'\xff4\xf0\xce5\xa8\xd3\x1a\x85!\xea\xd59\xe8pI	0@I[\xcdP\x1eU\"\"\xa9s\xd9\x1d\xeeInv\x87R\x17>\xf1A\xb8\x8e\x98\xc99t\xe6$\xe7\xa83/\xab\x9a\x7f\xb3|k\xa3\x108y\xb4i\xee\xac\x9d\x9aE\x0d\xfb\x93\xdf\xf8\xddc8\xf3\xc2E\xd7!Q\xe8\\\xdb\x82}\x0b%A\x9a\x81f4\xec\xa0s*\xaeA8\x8d\xa6\x1d\x82A\xb3\xd8\x04\xce\x80\x1d\xdc>D\xae\x90=5\x0euw\xb6\xd6\xf5\xc3\x1f\xbaj\xb3\xeanG\x0d\x00z\x05?2\x94Q\x0f\xaa/I=\xee\x98\xdbf\xfdH\xfd\xe8\x02\xf74\xc5n\xba\xe5\x16\x93]\x99\xe6\xbe\x80\x88\x1fYm\xf0\xaaG\"\xb3\xc92\xe4P\x1cE\xddH\x7f\x99\xcdf\xb9v\x14Zn\x9e\x07<\xc2\x9a\x02\x97PiA_\xd2q/\xb3\x8eP\x12\xc9D\xd5\xbf\xf0	\xe3\xa8$$\x8e\x1b\x1d~%Nyhr\xdcOdM\\\x91-\xfe\x8cm\x9f(\x88\xe4@\\\xb3\xba\x8f#\xbd\x84\x06\xd4\xea\xc6\xbc\x93\xd2N\xef\xe7J\x9fO\x1c\xd4\xe5\xe3>a+\xff \xb5uJ\x17\xa8\x04*(%\x81\xc2\xa2FP\x84J\xc4\x02W\x94\x08\x94\xa5\x8a\xa6\xbd\xf8\x96\xdf\xf0\x91,\x7f$)\x8f\xe7\xf7\x01)\x07\xe5\xff\x98\x1d\xfa\xb3\x92\xff\xea}\xd7\xff\x98\n\x0eB\\\xad\x96\xe0\xcf_\xbb\xef\xfa\xc7\x15\xfe\xbew\xa5V\xe9] 0\x86\xd1T\x13\xa5OC\xc3\x8aQ}\xe8\xbe\xeb5\xb1\xd0\xc2\xe2{H\x0fo*\xe4\x99\x15;;\x04\xf5\xe8\x91\x9e\xc9r\xc7\xa8\xe2\xea\x01\xf5M\xd4c\xe5\x075\xad\x14\xdc\xe3\xd14S\n: \xb4\xfdM\x8c\x8b\xee\xe6\x16\x9b7\x90(kY:\xeb\x01\xa9\xaa\xb8\x95z\xd2`\x88gp\x0d\x9bJ\x86st\xcb\x89\xfd\xb1v'\xb2\xa1\xa6e\xf0\xd2G^~\xe4\xd2\xc1\x96\x1a\x03i\xe7D\x9b\xbb1\x9a\x9a\x91\x8a6\xbadA \xd8@'N \x02\xf0\x8a\xe6\x15\xb1\xb3\xd6\xad<?\xd3\xd2\x929\x7f\xe5\xba\xb3b\xa4\xfd\x84\xc9\xa9\xb4E\xc3\x81:\x8f\xddh\xb2{\xeb\x03\xe1h\xab\xe20\x9e\xa0v\xdb\xa7\x98Q~\x90{\x05\xa9\x14\"\x9aH\x94\xf0\x83\xdfGQ\xd4kl\x94<\xfc:\xca\x9b^g\xa3\x14/\xef\xf3\x0b\xb9_i\xb2\xab\xb4\x89\xf0\x0b\xf3\xbf\xd0\xc5P\x9c\x92\x7f\x9b\x8d\xbe\xae>N.\xd6\xf4?\xcef\xb2\xc2\x85\xdc1\x98\xf3b\x05\x1a\x95\x8ezJ\xfd\xa1\xb1D \xec\xa5V\n\x01o@7R@6\x8a<\xc0\xfe\x01%IF\xa9\xd80\xeamj=\x0d\x90[\x7f\x8e}N\x7f\x89\xe2\xd2\xfc\xdb\x8a\xa457\xb9\xff\x1bp\x05\xf2\x05\xa9y\x8c\xc4v4@\x1b<\x06m\xd0\xad\xe1\xbf\x11\xc1\x109T\xc5\xf2\x06p?\x8d\xda\x03R7\x1d\xfa\x9d\xfa\xa5\x01\x8a0\xd2\x9b\x9a\xb4\xdaQ\xcfG\xb8[j\x1a\x84\xac\xd0\x1e\xc8\xdf\xd9\xcdzi\xdf\xf7\xb7b\x93\xb4\xfa\x1b\x9d~\x83\xf0/)wC\x03?\xe2\xb1\xef	\xd7\xa8a\xa5-\x07/\x8aC\x04\xaen\x93\x99\xfb.\xc4\x95\xdbH\x0cj63\xa8\x80\x92\xd0\x04\xb8\x8a\x10p\x04\xf8\x91\x93Krh\x12\x14\xeb\xcf\xcf\xc2\x07\xeeX\x96\xeaI\xe7\xc6\x8ej\xdf\n\xbf\x82o\xad\xe81\xc1\xc59\n\x9f\x06\x14\x01f\xd4\\\x8e~\xda:\x19-\xa6\xd4\xd1\x93K\xa0\x8f4\xa9\x1b\xb17B\x06Y\xcd\xf6\x89\xcc\x86\x8ey\x05\x7f\x08%\x9bDC~e\x93\xe8m\xc0\xde@\xd1]\xd1\x08\xfa\x03\xff%\xc0r\xfe\xa9\x02\xd6\xd9s4T\x03\xae	\x99\xc5\x1f\xe2\xae\xd0\xf3\xd6G-\xe2Ug\x90\xf5>\xcf\xed\xfbH\x82Op\x07V\xd6B\xec\x90\xc2]\xf4{9&\xff^6\xb9\x1f|\xd0m\x92\xf5\x07\xe5\x0b_PLLI7\x02\xc7\x92\xa6i\xca\x10\xae\x13\xf5\xe9\x0c\"'T	\x14\x05}\xc6\xe3\xef? 4\xbb\xf3\x17\xb9\x9b\x85\x03|\x87\xa6[F\xc7\xad\xfat\x16u/\xd9_y;Z\x94\xbc?\xdb\x1f\xa3H\x86K\xae0W\x9dz\xa4\xe8c#\xa4\xd9\xd9\xd0)\x80\x8e~.\x1cr\xc1\x8a\x16\xc4\xa5+\xcaB\x89\xb0\x8a\x03\xb1\x1e&J\xb0\x93\x83G\xa00\xf9\xcb[\xfd\xd0\xe4\xd9\xfc\x05\x91.\xce\xa1\x08\xecr\xb7\x9fO\xb3\x16k\x8e\xdd;VC\x95\x89\xa0oX\xa8 \xfa\x19\xcd\xf6K\x19\xdb\x9dS\xdf\xb3\x1b\xeb\x15r\xb6t\x82\xe5\xed\xb2\xed\x84:z\x82X\\\xb1\xfaxm\x8b\xdbJh\xff\x99\x0fx\xb8\x14\xf0\xd0N\xf7\xc7h\xdb5\x10\xaf\x0b\xa5K\xe8`\x85\x0f\x05;yd\x03p.Ec\x9b4\xb2X\x9eD<-\x01\xb4ll\xb5\xdbip.\xbb^\x1e\xd8\xe2p\xd5\xd7:\x8d\x0d\xd9u\x8f/\xee\xbb\xf6\xfc\x15\x99.\xab\xc5Y[\xefrl\x19\x90\xaf_\xe64\xb8\x9a\xe3\xbd\xc9\x1ekz\xce$~Dq\x85]7/T_<\xe8\x8f\xb5\x88\xbc\xa5\xde\xe34K\x0e\xa7$\xf0\xc6\x96\x98\xff \x99\xbb\xf0&w\x93\xab\xf6\xe4\xb7\x0d\x86\x9e\xa9S\xa1\x1f\xb8\x197\xff\x08\xff\x08\xb5|K\x8b^\xfc\x8d\x8a\xf8\x9b\x8e\xe2\xaf7\xedMsMG\x17\xfd\xe1\xf9\xe7\xff\xb0\xe8h\xc7\xc3\x0fw\x94\x85\xb9\xc3\xe3\xa2\xb40]?\xb2\xb4\x0f\x04\x98\x0efja\xcd\x145a\x04\x8ei\x8d\x96\xd0\xa6\xe8\x016C\xbc2\xf4no\xc2\x95\x0c\xa4\x93\xd5f\xa0\xec=\xf1\x96)\xf5d^\xcb\x14\xff\xfb\xf6v\xef	qNc\xe3\xd4\x8e\xb4\xfb\xfe\x8bl=u\xd9\xe1\xec]?;\xa1f\xe2\xf9-E\xd5\x02~\xe4\xec\xf6\xe1\x1b\xcfn\xcfv\xf8\xd5}5\x81\xb8\xcf\xd7\x1c%\xbb\x9a\xeb\xbe\xf7\xfd\xfa\x96\xec\xe8O\xd5\xbb\xb3d\xeb\x8d\xbf=\x84Z\x02%\x01v\xb9\x8e\xe8 \xd3\x04\xb3\xd0\x14\x0dn\xafK\x97\xa0\x14u \xd0\xcc\x93*J\xa6\x84\xea\x9d#1\xe4h\x84u1\x1aHr\xec\xd0	o\xbb\xfd}\xff\x94\x16\xf5\x1b\xf5SZ\xe2u=\xb6\x8b\xeew\xa7;\xa6n\xcf\x97\x14U\xd8\x0b\xef\x82\x1a\xc4\xe3\xe4\x95\x13\xfc`\xa0F\xdd\xe7\xef\xc8\xb6\x9f\xbdE\x1cn?\xbb\xa5\xfe\xfb\xdf\xabk&\xbb\xa2\xcd\xd9l9\xa0Y\xf5\xee\x9f\x8e\x1e\xfa\xed\x8dd\xab\x86gA\xe2\x17\xc38NS\x0fG\xe1\x14\xea\xb3\xcaD\x9f09M\x91\x15AK{\x1d\xde\x80K3\xdd\x8a\x84\x02\xad\x1c\xaa\x10\x00[_]\x05\x92%W4z\xd6\xdb\x88u9\xe9\\~\xe5\xfa\xe5\xebn3\xd4\xc9\xea~\xf1\xc9zir\x96\x84\xf1\xe9\x0d\xc5\xe5\xf4\xa8\x93X3k\xe2`Ps\xc4\xea\xf8\xdc\xca\xfc\xe2\x92n\xc7\xe5\xef\xda=\x1bm\x11\xf9\xba\xc1]\x8b\xd4\x83J\xcb\x1e\x1bks\x84\xcd\xf3T\xd39d\x99\xd2\x02\xf5eYN`}\x9e\xaf/\xfb]U#\x14\xc6\xf3b\x98;R\xcc\x1c\xa8\x93\xd0\xc0\x17t,\xa2\xdal\x9f\x08h*\xf6\xa2\xd7#JB+\x1b\n(\xb4\xa1\x02iGx\\}~I\xd6\xb3F\xb7\xddv@T\xf7\xcbu\x86\xdb\xd6\xad\xb8\xeaJ\xa8\xda\n\x0b\xb1\xad\xf7\xcc\xff\x9c\xc3\n\x90@-L\x9c\x99\xa8\xe1w\xe4z\xc3\x0e\x12Y\xa7\xeeg\x97\x94\xfa\xd3\xe2w\x89`wx-\xf9\xbf\xd8\xf6\xb4(d\xd9\xa2]\x83\xd7\xc9\x11\xdbF\xcf3_\xf7\xf8X\x81cY\x92mQ\xd4\x83\xe7\x90\x0f\xdf\x1bW\x1f\xe6b\xa4-\x04\xa9\xd0F\x0c\x0e\x02\xa1\x81\x14\xea\x04K\x18\xf55\xd5\x08d-0b\x11\x83\xe2\xa8\xe7\x90\x83\x04\xc2\x97\xd6\xa8\x93T+\xe6\x91_\xefZ\x84x\xdcc\xcb\xff\x05\xd0j*`\xfb\xfb\xe5\x88}\x8f|x\x0e\xe2~\xb8L\xc7F\x90*\xdaS*o\xea\x9fM\xd8\xaa\xeaA\xad\xcd\xf3\x96\xb2\xfd\x1c\xeeT\x9e1p\xc7\x047\xb51?\x8bR\x0ct>\x0f\xe9\xf3\xbb\xb6R'\x1d\"\xfa\x90\x8b\xc0\xe4\xc6\x17\x14\xc1E\xc2y\xd3)o\x83P\x8f\x067\x9e\x94\xe6\x82\xc5\x11%\xab\xcb\xc0$r\x11\xc3v\x1d\xf5\xac\x0dQ\x9f\xbf\xfb\xbdeE\x94\xc7\xe3\xd8\x16\xe7\x94+\x06\x8d\xbd\xbbn\xf9zl\xdd\xe5Vl\xddFr\x05kt\xc9\xd6'\xb5\xa6'?R\x0f\xae\x84\x06'Z\x83CE\xd5I\x1e\xa7Ky\x03\xbb\x05	ga\xce\xf60\x1e\xfe\x8b\xfc\x17\xa1^\xe1\xea}\xa0p\x04E;\x85\xf5Kq{\xd2\xe1T/\xf9?\xefi\"%\xed\xc6\xde1\xce\xde\x92\xffb\xf1-\xde\xd4\xbeq\xc6\x9b\xcc\x19\xcb\xb5\x11\x83\xdb+ \xa2\x8a8\xc6]\xc0\xcarI\xb8\xdc\xfa\x94\xda\xa3V\x95{\xacd\xc8\xaa\x17\xcd\x9c\xb9\\\xe8\x95A\xcd\xf4\xd3Q\xd0vO\xc4S\xd5\xf5]0.\xdb\xea\xfaN\x03\xa8\xec\x15X9s\xb9\x02\xd5v\xa1b?O\x1cE~\xdaFPU}\x1f\x1co\x9e[Y\xeeK\x13\x19\xe5r\xc0\xe9\xd6\xf0\x0f\xf1\x0fA\xb9\xc3\xcc\x93U%\x87\x81\xa77D\x80w\x17\x0d\x1e\xfd\xea\xf6\x88q\xd4\x0bb\xe1/\xed\x91h\xc8\x0d\xed\xe1A\xd9\x14\x1a\xb1\x91hPbQ\xd8\x93JB8\xd5I\x0c\xba\xe4\x07?\xe1\x1aI\x06%=\x04\xc5X\x91t\xdc\x13O\xa5;\xb9(P\x1d\x91h\x03\xbaL\xecd\xa3\x06\xd1\x0dS\x01\x04 \x95'\x0eh\xff\xdd\xb1\x9f>|\xfe\xf9\x0f\xffT\xbb\x91\xac\xdcV?\xd9,O\x95\xdd\x03\x1c\xe7\"\\\x8f`\xaa7\x04\x89\xd5\xe3\x13\xed\xc1.\x8b2\xd0\xe7\x17\xdd>\xce\xe6\x0e\xb9D\xe1\xb2\xcd\x0d\x81f\xce\xd6m\x95g;\x9c\x9d-\xed\xf6\x84\xcc\x13C\x8c'\x9c\xa5\xd6\xe9u\xb9,\x06\xbb\xa1\xa5\xce z\x14\x97A`-\x02\xc7\xd9\xbc\xbc\xc1$\xd6x\x0cvc\x93\xc3k2\xb7\x06\xa6[x\x96p\\c\xdab\x15\xfc\xed\x93l\xce\x80\xddi\x1ch\xb5s\xb5\x9c\xd9iv\xf0\x0f\x15a\xc3\x9b\xc3\xea\x10M,g\x10\xc4\xa8l\xf1\x8a\xc1M\x9e\xe0\x96z\xd3\xdc\x1a\xb3\x9b7Jv\xde\xd4\xd9\xc0\xcb\x91V\x87RW\xcf\x8bN\xb3\x95\xdd\xe4o\xce4\x19\x89(\xda-\x84\xb5XB^\xd2Cl&Vn\xf4\xb1n\x9f\xbf\xbe\xc1n D4[k\x1c6\x9e\xb3\x86\x9b\xecN\x8f\xd7&\xb5\xba}f\xa7\x933Y\xbcQw\xd0@$\x93U$(\xc7\xaao\xb6:-\xfcZG\xbc\x85#&\x8b\xc5\x12\x86/\x1d\x85}\x0b\x96?\xc4\xdfN}\xc6\xa5\xbc\x827\xedA!M\xb4\xe0\xfc\x04\x08h\xf6\xf8W>\xa3\xe6\xef?iX\xb2p\xca\x1d\xfd\xf9\x03r\x9b\xbcA\x96\xd9\xa1\xe0b\xfe\xf6\xf3?u\xcf\xb1\x9b\xce\xb9\xb3-h\xf1\xe4\x0f\xd8\xed\xeb\xe56;\xbb\xeaS\xffB\xf5#/\x82\xb5\xe9@\xd1\xbf\x13J	\xc6\xe9\xfe\n!%Q\xad\x08)\x04\x94\xc0Dq:{JI^\xde\x91\xcb\xa1\xf5PY\x04\x1a7UG\x01\xe7\xca\x1f(\x11\xc2\xc0\xbc\x9f\xf6\xa1h\xb3?Hm\xff\x1d\x1a\xac\x1a\x04\xc8\xd1\x8a\x0e\x12\x18\xe6vRE\x88\xedH\x8e\xf4\xe7\xd4=\xdcN`P)Q\x9c\x9f\xa5\x8e\xe6\x80G9\xae\xd3F\x1aM\x87\xd6S\xe1\x02MG\xa7\xf5@2\xa4\x04\x1cE\x1f\x11\x89$Q\n\xb5$\xc7s\xb1~\xe4\x92TkN\xb5\"\xd7\x03\x1c\x0e9\xae\xd5\x86\x1f\x018\xfbc\xeaF\xa4\xf1\x01^\xea\x10\"?+G\xd9\xa0\n^\x02\xf7*\xa6\x17\xbcgUlFVx\x8d\xaa\xdaU\x99poC\xa8\xb0\x9e.XC\xc6\xb5\x8d\x8a\xd7\xb5\xcd\x89\xd7q\xef\x82K\xea[\x1b\xafk[\x1b\xaf\xe3\xf6K\x97\x1e(l\x81\xc0;\xf6\x0d\xba\xd3\xa1\xedn\xe8\x19\x00%^\xf1\x9dR\xd4j\xad,$\x1f)\x16\xa7\x14 \xf8\xb7\xca\xec1\x8b\x82n.\xbf\x8f\xdfG\xf7:C\xd0\xeff\x8e\xd3\x16(\xdf\xf1,\x98\xed\xd0;\x9a\x84\x17\xc4\xb4\xa9\x01\xf4R\xc2\x97\xbfF\xeb\x9e_~\xf0\xce\xe3\x17^\xf8\xf8;\x1f\xbc\xf3\xa5\xd5\xab\xbfD\xbe\x7f\xf4;\x1b6|\x07/jGGSSG\x13\x19\x84\x9bG\x92\xd3\x8e\xc4\xbcD\xac\xf1zbR\xef\xa4/X?\xbd\xf1\xfb\x8a\x1f\xc3\xed\xf1U\xda\xc7p14u\x04\x02\x98$`\xbe\xdf[\xdf\x9cH47\xf5\x087\x11I\xf2~\xa5\x89~I\xff\x18r\xea\xdf\x99s\xf9\x17\xf9#\xe8\x9f6\x8c\xdb+\x91h\x84\xba\x15e\x80W\xf26@wK\x93\x14\xcc\xb8h6,\x12	\x871C\xb5\"\xe0\x9d\x17\x87\xb7\xe6\xa9\x16\xda=\xadm\xce\xe8\xf1\x90\x14e\xb0A\xf2\xd3\xf3\x8c\xe2\x96\x0b=\xbe\xe0\xf4\xee\x81@\x93z\x97\xdc\xd0\xd0\xe1\xb2	\xa6s\xd2\xf3\x13ls\xb3]\xf4;kkl\xb5\xea\xd3r\xac^\"s\x83\xa1\xe9\x9d\x92\xdc>\xd5&\xd5\x84\xac-[\xd7\xdf{\xc5Ji\xd2\xb49[\x82\xdd\xb5\xb3\xc8\xa9\xb9-\xe7]\xb1d\xde\xa2\xb5\xb2c\xd2\x0c\xb5An\xb5\xdb\xb9\x83\xe4g\xe7}\xea\x92\x87\x1d\xbc\xbb6\x1ehT\xef\x96\xeb\xfc\xc9\x96\xb4?3\x03s\x8f\xda\xdd^k\xad\xfa\x8cL\xeac\x12Y\x18\x0c\x05\x881\x1d\xebZ\x13\xb2\xb4n[\x7f\xf7\xa5\x83b\xdd\xb4\xbeE\xdf\x86\x8c\xe7\xd5\xa4\x03\xcdw\xac\xba\xe0k3\xd4f\x99\x95\xe5\x88>\x86\x0b\xfe\xfffM\xe4\x01\x10\xd5D\x82\xe8\x85\xd5\xa0\xb8a\xe5\xf1\x14D\xf0\xe9\x0c\x8f~}&\xf6\x0f\x08\xac\xc1@\xbc\xa35\x10\x8du\x0c\x04gn\xa8\x9b\x1eO\xc8\xa2<\xb9\xad'`\x0b&b\xd3\xac\xbc\xb1-6\xe0\xf7\xae;\x83\x1f\xc1\x0eX\xf7\"\x91d*\xb2a\xa1w\xd2\xfc\xde\x1eY\x94\xa6\xb4v\xd6\xd4t\xb7L\xb3\xf0\xa6X\xeb\xac\xd6\xb8k\xf1U\x00\x7f\xdf\xa9\x0f\xf8\xad\xfc\xb7a\xee\xe8\xd4=HR_\xc3@\x1d\xa6\xa3\xc4+j\x932\x97\xf6T*\x89\xc2\xa3\xe8%\xec\xd3/\xcd\xb8o\xc6\xa4\xa0\xbf\xb1\xd3y\xe1\x87\xea\x0d\xa3\x97\xbb\xee\x9b1\x83\xd49/7\x9b \xa0\xfe~\xc67\xe1\xfd\x8c\xb4\x1f_\x93\xdb\xf9o\xc3\xd3\xea\xd6+\x82\xfe$D\xfc\x1d\xd2\xafs\xde\x07IH\x9d:\xe7r\xa3	\x83\xf0	\xa4yiF:\xdd\xe5\xb8\xf0\xef\xe4v\x8d\xf7\xcb\x15\xfd\xc0(\x8c\xbfd\x13\xaeO\x1e\x19\":\x02\x0e\xa6\xa0om\xd8\xff\xc5\xecdM\x948\xe5\xd2\x0c;\xa4\x9eZ9u\xea\xca\xa9\xfcHCg\\\x19\x9bK\x05\x18/*\x89\x8e\xfd\xd4\x99\x8dg*\xbe-\xf3I\xe8\xd1\xf6\x97\xb1\xa2\x04\x88_\xc1E\xa2\x01\x9c\x8bRq\xee\x0eR'\xfb[\xa5f\xf5?G\xd5\x7fU\x8f\xbdA\x12o\x91vb	A$\xffe\xf5]\xb9\xd5/\x87\xd4\xbf\xaa\xa3o\xa9?|\x83\xd4\x90\xdeQ\xe2m\x964\x99\x15G\xa2\x8c\x837\xf1G\x9983\x8d\xda3+\x0d\xbc7\x044\x87\x03z\x04*\x0f)\xa1$\xdd\x8bJ\xc0\xd8pD\xb5\xee\x93N\xfa\x08j\x195p\xd0q\x1c\x19\xbe\xb7\x93e\x8fDf/\x9d\xd2\xce>\xce\xdb\xfc\x89\xe8\xb4\xe0\x94%\xe9\x96\xc3\x0fg\x87W\xb5\xf8\xb8{\x85U\xf3\xeb:g,\xean\x8a\xaf\xb8l\xb2\xbf\xb5U\x91\\\x11\x9f\xcft\x99'\xd6\x13\xac\xf1%\xd2\xfc\xd1E\x82\xab}\xe0\xf2\x19\xcd\x9d\xedu\xa2\xfaC\x9b\xe8\xea\x98\x92\xcd\xdc\xbb\xdf\xbap\xb1}U\xcb\x15+\x17^b'\x8b\x8d\x92\xaf\xabo(5g\xe3\xbcV\xc3B\xd5I\x9c\xbc\xe4OE\xfcm>\xb7\xd1\xc0\xbd\xa9\xfe\x805y\x9azg\xf6\x86}\xfa\x1e\xc1\xa5\xdc\x03\xfcA\x94\xa9P-\xf8P/\xfa\x0f\x80\x11\x8f\xde\xab\x00\xec\x84\x12\xf2\xa0\xd56\xcc\x07)\x14\xa1x5/\x03t;1\x9a\x11p\x931\x94L\xa0\xba9\xf5A\xdc\xb3|\xf7\xea\xdd\xd1)\xfd\xb5\xe1\xe5\xeeX]m\x8d\x81\xfb\xf3kFE\xe9H\x05/\xf14}:\xb8,\x19oLM\xaao\xf2\xae\xbb6\x12]Y\xe3M\xf35\xa2\xcb\xea0u[\x9b\xdfy\xd2\xab\x88fV\xeah\xbe\x98?\xb8\xe4\xdeE-\x03A\xa7_i\xef\xab\x9d\xdf\xddj\x12\xb2\xf1\x1d\x0d\x19\xd4.\n6|\xde\xe55\x92`#\xcf\xd5Z-\xf7sv\xc1fq\x98\xd3\x9f\x9d\x9b\xed\xeas\xb7\xcd\x9a>\x18\x18\xa2\xe3\xdaw\xea\x14\xff\xa0\xee7C\x97\x11\x15\xe5{	A\x93\xfa\x85\x8a\xd2\xd6]\x15B\xbe\x1c\xeb\xd5\xeez,i\xf7H'd\xf9\x84\xe4\xe1v\xda?\x92`E\x87\x95\x9d\n\xfcx,\x87\xf6m\xb1\xb8z\x87`\xcdF[\xef\xea2a\xf5v\x89hp\x99\x0e%\x03(\xd4\xcc\x92\xf6\xfc\xbe\xca\x82\xc9\xfd\xd95\xd4\xa6;G\xda\xd1\x8e\x1bh\x94\xed\xa5\xb2\xb3\xb9\\\xdey\";|\"\xab\xd9\x9d\x16\xca\x96\xa9\x9drx\x82z\x16\xcbs\xe8P\x89HCT\xd7v\xa8P$\x85\xe9\xf5ly}\x87iyhvM\x8eC\xf9\x85r)\xdd#\xc3x\xae\x9b\x08\xbf\x04-\xdc\x13.(\xf3t%fu\xbb\xf4\xca\xc2\x80(\xdb\x85e\xc1\x95\x16UU\x96o\xe2\xb2\n\xa5p\xb4\xd4qe\x1d\xd1\xcb\xa1\xe5\x95\x97\xa5\x15s\xf2y\xb8i\xba	X\x96\xe6k\xa5`\xc9>\x1e\xa3X\xaf@2P\xf8\xaf.\x0d\xa82\xcd\x8c>\xabn\x84|\x91\xca,/4\x97\xa3\xd4\x1a\xfe}\xc2\xf2\xa0\x0c\xae\xf0?A\xed\xb8&\xcdJ\x9f\x16\x86\xc5\xe6r\xa7+\x8f\xad\xf0\xc3\xc9\x90\x8f\xf1\x1dCV\x93]{\x8e\xe8\x16\x17\xecZ\xcd0\x00-	\xfa\xf9A=\x96\x1a\x08\xe4\nF\x03\xf8\xae$\xeb+\x94\xd3\xf6\xf1%U\xb8\x15Z\x8dy\xa2\xad\xc2\xde\x97\x8e\xb0\xd9\xb2R\xd5\x0d\x05\xb7B\x83\xba)\x03\x14\xbf\xf7\xa5\x8a\xe2wT8\x16\xfa\x1f\xc1\x12(\xe1\x1fa\xd9\xfbR\xc1\xce\xa3\x1c\x03*-\xc0\xaa\x97\xc6\x0f\x1e\xd9s\x1a\x80r5v\x0d\xea\xff!^tZ:\x15/\xc7K\x15,'\xb1\xc2\xeaF\x0d\x1e\x0d9\x80\xbb=\xe3\xda\xe6G\x88<\x00\xa7\xb8\x07C\xed\xd1\x1au\x1b\x93\"$\xba-\xbe\xee\xb2F\xf7\xf3S2\xe7(\xf3\x17\xc9F\n0Q\xa9\xdc+X\x90\x9a\x81\xf0w\xc8,\xbb]=b\xf7h[q\x9eB\x8bQI\x92\x06\x0c\x0d\xfe\xa7\xfa;)\"\xc1\xc5\x8c\x9a\xd39\xdc\xd22\xe3\x9a\xf46\xc3r?\xe7\x1f\xd3}l\x8a\x06V\x0c\xc7=b\x10\xb8[\x98\xb5\xa3\x11j\xaf\x1e\x08\xa24\x80Az\x94\xf3\x99\x8c\x1c\xf7\x10K\xdak\x1c\x12Q?T\xff\xc2[%\x93\xc9$\xb0K\xa2Q\xf5-\xaf\xd1l_@l/	&;\xff\x98\xc9\xec\xb0\xa8\xcbD\x12r\xaa?P_\x13d\xa3E1\xfd~\xfdz\x97\xe2^I\xba~b\xb0\x17\xf7\xa7\xd4r\xdc\xe8\xbce\xa1u\x8a\xbcf\xb9\xadP\x95/\xcd\xd5\xba#\xdc\x0cE\xff+\x9aS\\\xecG\x7f\x1e\x87\x1c\x1d-\xd8R4\xa8\x8d\xab	\x91S\xae\xf3\xd6S\xae\xf3V\xe4\xbf\x91;\x0b\x9d\xce\xc8*\x11`\xdfG\xb8\x14\xe9*5'\xc7\xe4\xfbd\x99L\xba\n\x98\xaf\xff~\xa4\xda\xc6\xea	\xe0\x855\xaf\x94F\x9a\x18\xd2\xc6hb`\xa0\n\xbd\xea\x81\x9c\xfa\xb3\xc24\x80\xfd[b$~\x0f\xbfG\xe7\xa3N\xcfA\x15X$\xf2\xdb\xf7\xdf~\xf4\x82\x0b\x1e}[\xbb\x91W\xdf}\xe5\xea\xab_\xc1\x8bz\xc3\x976m\xfa\xd2&~O\xf1%\xde\xe6j/\xe1r\xcd&|_\x1aS\x88\x8f\xc6\xd2y\x13\xe3<\xe7\x15\x9d-\xe2*L\xcf\x9b\xf8\xab\xdb,\xa9\xb7JQ\x9bz\xbb\xcd\xa4\x9c\xf0\xab\xb7\xa3\xd9\xc2\xc9\xe7\xd1|\x92V|\x8fGVW\x02~\xf6\xcb\x1e<mbl\xbb\xb6\xa9\x9c\x8d\xc7\xcb\xc6\xf2\x81B\xb9&\xcd\xf6\xa9\xcc\xadj\x9a\xa0\x9a\x7fy\xb9\xec\\r=\xb4\xe6\xf1\xa0'\xe7\xae9\xe1\xb6H\xe4f)\x9a\xff\xa8\xac\xdc\xc7\xd4\x85r\xd3	w\x03\x14\x15\x90\xc9!;;vs\xa9\xd4B\x99\x0b\x187\xd3\x80\x9e\xbf'\xf2k\xeb\xe5*\xab\xfair\xb5\xa8\x88\xf7\x8ab\xfe/\xa8K\xfb+\xd4\x94W\xc4\xd1R\x99\xecO \x05\x8d\xcc\xff\xc5h$!`\x8b1\xf5[\xa5r\x0b\xbe\xa7\x1f\xa6\xfb\x8e(\x9ba\\T\x99R\x04\xb2\x9a\xf2\xfc\xb8\x19\"P\x9e?]Y\xe3;?\x03\x0b\xd5\xc2\xd1\x85\x12\xebyKRX\xe2W\xf2OC\x7fz\xf3\x8b\xa3\xea\xd4\x12\x08\xdc\xa9\xcfH\x90jPn\xfd\xe2[\xb0\xa8\xe5\xbf\x8a\x82;\xe9\xcd\x87G\xf3\x93\xcbq\xce\x17\xdbZ.\xc0A\xa5\xfd.*\x9d@/\xa1)WQHQ\xd5\xe2\xab\xd9U\x85L\x1f\x862^\x85\xb2$,T=Q\xde\xea\xe5\x00\x02(J~\xc9BI\xa2UP\x87J\x90\xb0\x0c\x7f\xea=\xeaWC@\xdb\xef\xb0\x898\x02&\xa2\x10~D\xf5\xab\xdfW\xaf\xe6\x0f\xe4\x13\xec\xd3k\x89[\xbd\x9a<\xc5\xd5\x8f}\xf4.\xf7\"S<#A\xeb\xab>\xcdz	\xb7\xfd\x0b\xea\x14\xa8\n\xe0H\xa0\xaf\x1f\x9c\x11\x86\xf3\xb3\xa8E\xc9	\xa4\xba\xb2Y\xee\x18n\x91\xa2\xe7H4\xfbr7P?99\xad\x1f\xce\xe6\xdf\xa1|O-\xb5\xb7\x145\xb3\x8a	\xb2%\xe34\xb5	\x1a\xc7\xb3\xeaO/4\xf9L_Ps\xe5\x05\x92\x11T\xd4>\xbfLQ\x9b\xc4D(\xfa\x0b\x98\xda\xf4\xf9J8\xf2\xffF\x15\xb5\xcf+)jCb\n\x9bM\x10u\xd82Xc\x118$\xf1t\xb0}\x9c&<?\xb8\xf6\x0e9lW\xff\xa6~\xbd\x02\xd2\xbf\xcd\x91\xe5\xdbn\x93\xe590A\xc1=&W=s\xc7\xd4\xbf\xc0\x97\x9c\x04_V\x82\xfd\xe9\xd3}\xa2?k\xf8U(\x1f\x81m\x86\xf8u\x04tE\xd4\xea*\xb8\n\xdaK%\xf2\x0d\xf5t\x06\xf1\xdc\x1a\xd5Z\x0e\xf1p\xb6J\xb3\xc3\x0f \x8eB\x9bW\x81\xb7\x0f\xbeP \x05\xfcA\xa0l\x1f\xb5\x02\x9e(Z\xcdL\x04\x8f\xb7zF\x1a\xa0\xed\xfd\x04Z\xb2}\xa4\xae/\x87\xe8\xbf40\x94l\x99V	\xac\x02\xb2\x0c\x8bi%L\xb7\xff^V`\x82jp\x9fP\xe4\xdf\xcb\x14\x9e\x1c\xdd\xd75Q\x1aV\x97\xd8V\xeak\xb9\xd0\xc5\x08zX8\xb9\xc4\xcf\x7f^s\xb3\x90\xc5\xa3W4U*u\xb4\xa0}\x8eL\x08\xca\xe38\xe6F\xfe \xff \x1d\xe7~\xea3\xb7\xbfB\x9b\"I\xf3/.\xb7\xe8O\n=7B\xb9JA\xd3\x02\xe8\xf4\x92\xa7\x00\xee\xa9\xbfK\xd2\xdfQ-\x06\x16\xbf|\x97\xa6\x92\x02\xd5Vw|()8\xa8\x14\xe9C\x99\xbb\x15\xb8\x9f\x04\xaa\xcf%\xca\xb4\xa5\x90\x05To\xd7l\xe1s\xf97*\xd8\xc2\xebrev\xf0\xd9\xa2\xfc\xe1\xec\x92\x1f6m\xab\xb4\x93\xc7\x96	\xa3\xe2\x8d\x03\xd6C\x99T\xbe\xc9pT'\xc7\x91pL!\xe8jR\x0bC4\xb7\x9a\xb8}a\xba\xf6Sm\x89\xb0\xfa[\x8f\x8f%\xa84a.\xc5\x12\xd1\xec\xb2\xb9},\x97\x15L\x8a\xec\xf5\x11B\xfd\xaf\xf0=\xd7:\xdd\x8d'\xa9b\x05\xb9\x8f\x18\xeb\x1a\x93\x0ddm\xe3\xac\xfb}V\x9b\x9a\xa9\x1f\xe8\x89Y,\xeat\xfa\xf6;\xbc\xdc\xd99\xad\x9e\xbc\xc2\x8a\x0e\x9b\x05\xdf\xef\x81	\xb3:\\\xf4I5\x88\x96fDA\xfb\xa9\xa2\x03\x99\x14u\x19\xecI\x14\x9c\xc9\xf4F\xbaH2\xa0 \x1d\x12@:2	\xdf!\xb0\xd4\x8f\xcc\x02\x9fj\xf5-\xd0\xfd\xc9@\x0c\xd9\xb5\xc0G\x8e\xfb\x16\xf0\x83\x93\x88`vKcw\xa1\x1b\x99I\x93lar\x8f\xba%l\x9b\xa4Es\xdb\n\xd1\xea\x16r\x0fD\x17e\xb7\x83T\x1f\xa8\x9eib\x9a\x99\x16\xa6\xb7@\xb3\x85\x84d4\x90\xa6\x9b\x03\x95\xc7B\x04\x92DH\x86\x05\xb8\x0bT\x9c.\x06 ]\x82\xddK\xb6*\xfe\xcb\xd5\xb7s\xe8\\m\xab\x1aF\xe1:\x90:\xa3\x944\x02v\x1c\xbb\xcfX\x0d\x86\x80<\xb8;\x8b\xda\x0e\xbbr\x97\xa3\xfe\xd5\xf0%\x97\xe4\xb2\x15\xc46\xf0a\xea\x87\xb7\xef\xbd\xfd\xfb\xb9\xdc\xa5\x7fG\xcd\xc2\x1c\xe0\xcf\xce\xd8\xf9\xc7\xf9\xc7\xd1\xa7\x17\xac\xa0\x1e\xed|\xb0\x06\xe2\xa5g\x85\xd1\x83\xc1\x82\x9d\x86h\xa7\x90v\xecqtJ\xf7J\x06\xc7\xd6K\xc7\xee\xdb\xeaH\xb8^v\x89\x8e\xbd\x9c\xad\xb3gp\xf1\xa7.\xdd\xd6?\x7f\xeb\x9c\xb8\xcbB\xb8\xff\xde\xe30\xb8^q\xf78\xb6|f\xecS[\x1c\xbct\x97\xd4\xe5\xd8Cx\xa3\xd2\x94\x9c\xb9\xa6\x7f\xfe\xee\xed\xd7\xac\x98f\xaf\xd0\xb9\n\xe9^\x19\xf9FB\x87\n\x9eP\x14i\x12\xa9\xd0\x10\x07WFpR\xdfU\n\xa9:\xcd\x83\xa0D\x8b\x8c}\xe3\xc9\xcd\xd9\x81v\x93\xc9\xef\xfe\x81\xdb\x7f\x9f\xfa\xca}4\xc0\xd9z\xfa/\xbd\xf6\x07\x1b\x97F<\x84\x90\xabP\xe8\x8e\xa3\\\x91\xc8U\xac'\x02c?\xd0\xd2\x124\x9bsJ\x0d\x17\xe4\x82\xca\xe7jj>\xa7@\x80\xabQr\xbc-\xda\xdc\xd6\xa4\xfe\xceU_o6\xc7\xd5\x1f\xcbq7\xf5P1\xea\x8e\xcb\xa4+\xce\xdb\x02\xber\x1fc6\xaaI\n\xeb\\ \xea(*v\x16\xb42\xbc\x814Uc(\x11A\xfc \xcc\xa39\xfa3\xf6\x8c\xe6]\xc7z\xf7\xd8\xfc\xbb\xad\x05\x0f;0'\xa1\x1b=\xe4\xdb\xd1\x01\x1d*,e5\xd56\xaa\xbbV\xd4a,\xccqh\xcc\x12*\xf4\xeb\xb2P@w\xc8\xac\xb0G\xb2\xb8/\xd3O\xd6j\xf7|\x1d\x12\xcc\x10F\x05Im\xc7	#Pz\x19\xeb\x1f;J\xa8w\x03\xca\x8e\x15}\x9e\xa0<\xa0\x91\xfa\x0b\x9f\xc0\x0f\x06z\x0cT\x12\x8e\x00\xfa\x07t\x04\x04\x87\x88~\xa3`\xc2\xc8\xb1GP%;?\x0b\xae5(\xde(\x08u\xa8\x94#\x0b\x94\xc7\xc8v\xd5\x8aI\xc8\xf1\xed#9,?G\x9d\xf9\xa1\xacb4K]\xfdQg\xd4\x9f\x18\x0e]\xd2E[\xe0\x0cph\xca\xaf\xa7\x87\x02\xdbG\x17\x9b\x14\xa1\xe0+`\xa0\xdc\xc4\xc4\x98p\xa0?\xc5@\xe1>!\x0e\x10\x03\xda}\"\x14\x14\n\xcd\xd2\xbd\xb8\xcar=\xd4C\xc0D5\xef 62\xbe\xa6ZY\xea\xe8\x04\xe5\x00\x05\x00?\x13\xe0\xd7\x0b\xb3\xd6i\xf0\xcbA\x8d\xa8\x8b\nT\x13(\xf8E\x0bU\x95Ju\x1a\xb3;\"}\xa9\xd8\x0e\xd5\xba#\x96\xea\x8bL\x88c\xa8\xe4\xca\xe9\xd3\x97\xa3V\xe4\xf2\xe9\xd3W\xfeO\xfb\x9b&\xd9CI\xd4\x99\xfa\xdb\xc7u8*\xe7\x83\x9eQ\xe6\xe7\x07a\xf0Q^*z\x1a(\xa8\x7fL\xad|J\xd3\x8f\x87\x01\xbd^\x8ef\xa9p1\xbf\x0f\xfb\xf5\x840\xc04~\x9c\x02\x90C\x88\xb3Ux\xa8\x07\xce*r\x9aV\x07\xb2*\x8dN9\xcf\x80\x84\xd7\xb3\xaf\x17P\xf0\xfa\x84\xc5\xab\x1bs\xf1\xdcp\xb6\x88\x01\x9c_L\x8c\x89\x7f\x8a\x7f\x8a\xf2\xcd\xe13\xd9Z\"}\x13\x88&\xd3\x01r\xf4O\xbf|l\xf5\xea\xc7~\xa9\xdd\xc8k\xbfC\xbe\x18/Wj><\x11\xcb\xfcS\xc5\x04x\x1b\xd4\x12\xc0\xe5M\xeabS\x93\xaf\x96\x97\x8d\x1a\xfag(]\x11\xbdJ(Z\x12#\x9f\x1e\x86x\x16\xa9\\$\x18O\x0fC6\x0e\xbf8-\xe0f:{\xea\x83S\x8f\xd2\xb3\xe8\x9a\xa8o\x16\xfd4:\x9c\xd3\xcb\xdc)\x17\x8e\xa5\xcb\x10Wb\xbc\"u\xc5iu\xb7h\x8e\x8e~\xbdd\xe3\xca\xe9\xec%\xfb\xaf\x1f\xaf\xd5B\x8f\xb1\xfb\xf3AM\ns\xcd\xe2\xd9WH.gv\xff%\xf9\xe74\xfd\x96\xe3v\xf8+\xb8\x9c\xa7\xf0=\xc2\xbf\n\xf0\xd5S\xeaG\x87\xcf\x8bjWH\x7fW\xc0\xe6\x1d\xe7u>\x85\x96\x7f\x7f[\xffB{[\xe7u\xfb\xc9\xb6s\xd5;la\x9bz\x9bi\xf1\xd5\x08\xddW\xdf\xad\xd4\\z\xbd\xc6\xe5C\xf0\xe4\x83\xdb\xd6|\xa5\x9e\\f\xb7\xab\x9f\xd7\x00te\xbf\xba&\xff\xb9\xdf\x95+B\xfdk\x8d\xab\xe8/t\x90\xbf\n\xcf\x1c\x0bC\x0fM\x90\x84	/@\x12S\xc3>Tm\n\xb1G`v\xfa`?\xfe\x8d\xaa\xa3\xf4\xfe\x01\xd9\x15G\xc6\x12(\xd9,zb\"\x0b\xd5\xe7\xf0e\xb6\xb8\xfcA\xde\xd7A\xdei\xe0\xff\xbb\xb4\x9a7\xd0\xd3\x0e\xe9Q\x81\xc1\xa8R<\xc6\"i\xa0X\xa0\xb6:\xb8I\xdc\x8b(a\x87V\x7f\xbe\xf6\x9c\x1b\xfa\xe3\xa6\xcb\xe7\xa7;4\x07R\x1d\xe9\xf9\x97\xf3]}\x97\xcf\x17\x9c\xec^\xfe\xe1\xab\xcf1\xdcv\xee\xd4\xb5\x8d\xfe\xda\xf9\x977\x9c\xd4\xca=\xd9p\xf9|\xa7[\x19J\xce\xbf\x9ce\xed\xc2\xb5{)\xad\x17e\xdc\xfc\xdd\xfc#\x8c\x83ief0\xf3\x99K\xf0\x14J\xe2q\xb2\"*\xf6F#\xac\x13(\xa9\xb8G\x08jJF\x8dh\x01\x8c\xb8\x87X\xe8#\xd1\x88\xb7\xe2\x05\xb5\x90\xa3\xf1\x1e\xdd\x8dk\x9a\xbe\x97\x085E\xd4R\xa4P\xcd\xce\x8b\x1b\xe3\x86	^p\x1f\xa0C\xa9eo\xff\xea\xede\x85\x80:\x95\xe7\xaf{6\xc8\xdb\xac\xcd\x1c\xef5\xd4\xcd\x9ds\x91\xc5\xc6\x998\x8bX\xcf\x0bK6\xd7\xf0V[\x90\xe7=\x06\xe7\xd9}V+\x8d\xffh\xcd\xa7\xd7\xc0\xdfJ\x8c\x9bl\xd1\xe2\x8cZZ\x9b5\xc8\xdfW\x91\x89\xb1\x94;\x14\xae\xfeT\xfd\xe9\x86e\xabV-\xdb@\xdaH\x1b\x86\xeaI\xf0\xd9\xeb\xac\x1e\xceD<\x17\xcd\x99[\xc7)\xd6\x90\xcd\xc0\xdf\xcf\xd6l^b\xc3Xe\xf2\xd9NN\xb1\x84\xac\"\x7f\x02K]\xa3@\x8c\x83\xd7b\x8a\xa9\x9a\xcb?.\xe6H\xf7H\ngzXa\xc6\xf0\xd0\xd9\x92A\xee\x13\x88}MO\x05\xa6e\x0e\xfdX\xc2\xfcH\xa7N\x81r\xa0\xd0\xf3\xda\x9fW\x0f\xa8;\xf1h\x10t\xf1\xbbgttO\xf6yu3=\x96\xc2\xfc*\xd7\xa4\xee\xcc\xe5\xd8\xbf\xa0C\x01\xa0\xc2FGsh9J\xee\xcd\xbdZ\xb0\x1b-\x94k\x82\x92]L-\xd5~\x0fh\xceii\xa1.\xea49\xcdQr5\xa6\xf1\xbdI,V\xdd\x93\xff\x85^jf\x0f\x94\xbb_}\xd4,\x93\xed\xacQ6?\xcc5\xe5\xffNV\xe7\x7f\xc1\xcf\xd5\n\xde\x9e\xcb\x8d\xaaY\xd9\x9cN\x9b\xe5%ez\xcb\xdcq\xc6\xa8\xef>\xc1Z\xe8\x0d\xa0\x93Nt\xf1\x8a\xd31\x9a \x00a\x0c\xd5%\x01\xfe\x9e=\xe8 y\xcfh\xde\x99\xab\xab\x0dH\xb8\xc1\x97\xcbJ\x81Z\xf6\x9a?\xfd	h\xbdvr\x9ck\xca\xc1@\x1b\x1d\xe5\x1dm\xcdY`\xae^ins\xf0\xeaF\\\x94*\xf6\x08|L\x9cz!/?\xb7)\x14(\x930\x0b\xc9\xe2\n\x15MS4(\x9a\xc8\x97h\x1e\xf0\xd8{\xb2\xba\x99\x92\xe6\xf1-\xee'\xd7h\x8e\xe6\x89\xebo\xea7\xfbcC\x19\xd2\x9e\x19\xca?\x0f\x8b6\xb2\xe2\xf1\x92\xb2'|ub\x18\x88\xd5\xa3@\xb4\xfe\x8d\xcc!\xb3b\xfd\xc3\x99\xa1\xa1\xfc\xbb\xd0f{tz\xf8\x08\x851U\xd2A?=\x8c@\x9c\xe1\xe1	\x05\x19t%\x98\xe4\x95\x89\xc0\xcc\xe5\x00iu\x9a\x93[\x0dN\xf2\xc8i\xe1D\xc2\x0b\xb1\x88G\xddT@\x8a:\xcfp\x15<\xfc(\xf5c\xd3X\xe9\xc9\xc6Um\x02\x8d2\xda\xcf\xb17z\x9b\xdaO\xf2\xedM^\xf6F\xcf\xb4YUfwGs\xfc\xc1\x93#\x91t:\xc2/\x89\xaa\x83\x95\xb6\xce\xe5~\xb1Os\xde]\xb5\xc7F\xd7\xff\xcf\xe7\xdd\x91\xaf\x9e(\xfa\xfc(^\xc8\x17\x8b\xc1\xb1?L\x14\xfb\x8f$\xc0S\x04\xca\xbd\x85\x0cWzT>m\xec'\x7f_\x1a\xa7\x82\x1b\xfad\x8c\xae\xd0\xd4\xe7:\xa5\x0f\xc4\x005\xaeL\x04h\x7f;\x03\xafH7\xdcWgz\xeag\xc4Z\xc6\xc6Zb3\xea{2d5\x90Jj\xa6\xc49\xdec+\xe3\x1c\xf9\x91\\vqz\xe7\xb2Db\xd9\xce\xf4b\xa0\xa9\xc6\xb6\x8fg \xf9\"l\x02@\xd7\xa6\x9dp\xe6QB\xbdb\x00\xfd\xdbS Q\xed>\x11\x80\x05\x93+\x18d	\x81p\xb2\x1a\xbe\xee%}\xafL!\x93\x9d\x1c\x99\x17\x13\x83\x87\xf2\xe7\x1e\x0e\x9acd\x1ewH\x03o\x98\xb8\xc6\xe6\x13\xd7p\x19\x80x(T\xec\xbep\xc4\xe8\x08x\xee\xbf\xdf\x13p\x18#\xea\x17\x00:dvQ\x0dq\x9f\x0edA\x1f\xf0QFd\xdcL\xb3\xa6K\xa4m\xd2PR\xcb\xed\x0d\xa4pU?\x03\xf2l\xc3\xeb\xd6\x0d\xaf\xfbzg\xb0-\xaa\x1e\x89\xb6\x85\xd4\x1fjP\xd9\xee\xa9b\xb7\xf9G\xd7aR\xf5\xbf\xfa&\x0f^q\xc5\xe0\xe4>u\xd38\xa4\x95p&\xc3\x1a\xd3\xae\xd1\x84\x0d\xa4`\x0f\xedMGS\x9f\x14\xae\xa1\xae\xf3\x12\x1b\x1e\xd9\x10\xdc\xb5ao\xb0\xf1\xe3\xa1\x13\xdcW\xdc\x9bZ\xb4a\xc3\xa2\xcc\xd9\x9f\xdd\xb0\xb7V5\x9f\x01\xcaR\xbfs2NX	\xdbqGB	\xa0\xbeO\xa0\x93\xcaK\xd2g\x02\x0c\xe9\xf4\xf0\xc0\xc0BW\xfe\xfd)Sg\\\xf5\xd9\xf9\xea\x9e\xd3\xa1l\xe4\xcb\xf7\xf6]z\xf6\xc0<\xdf\xb2o-_\xfe\xe5-\x0b\xf8\xb1\x9b\xc6A\xa3\x9fKMq\x16\xd3\xad!\x1a\xb4\xc3\xa6Si\xadgy\xf1\xfc\x01\xfd\xbf\xc4\xdb\xb0]K\xfb;S\xea\xc6T'\x90\xe3\xa9\xf3k\x0fPq\xc9\xe6e\xea\xc6e\x9b7c\x0fZT{~*\x1e\x877\x8bb\xea\\H\x85?\xf0j\x19\xd9\xb5l3\x95\x8fP\x1d\x0d\x9c\xef\xd0\xbew\x1c\xefT2\xb2\xf0j\x8aY\x01\x11;\xd6\x00)\xbal\x0dD\xcbueytO\x0fT\xf8\xef\x8f\xdaj\xc3\xb6\xa1\xfc\xf1U\xb6H\xad\xed\xa8\xfa\x1b\x9cX\xf6g\xc9\xac,\xf5\x8fW\xb4\x05\xc9\xcf\xa2^\x14\x8e\xda\xc2u\xb6\xa1![]\xd8v\x94F\xe8\xe7\x14\x94|\n\xe3\xaeQG\xe1\xach`(\xa8#	\x83R\xbc'5X\xa9D\xa7\xcc\x07Q\xa0\x18\xcaqM\xcb6g\xfbc'b\xfd\xfau\xb3\x03\x05:'\x97\xf4\xff\x99\xaeH(\x0c\x84\x1b?\xb8y\x19\xd5\xb5\xa5\xfa\xb6\xcb6\xa3~.\xf2e\xa8\xac[n\x16	\xb8\x03\xaa\x8a\xff*\x7f\x80\xb1\x01U\xabyZs\xc3t\xa09\xef\x8b\x9b\xb8R\x7f!G\xd9\xfd\x8d\x8d\xb7\xa9\x8d\xf9\x93MM$\xdax\x8ez\x80\xac$]\xea\xd3{\xd0\xc3\x1dL<\xfc}\xf9\x15\x8d\xe74\xde\xc6\x1a\xe0JZ\x1a\xd5\xf5\xea~\xd2MV\x8c\xd5\x95hy\x16\xd7 >@u\x8d\xbb\xca\xed\x07\x0d\x9a\xe5\x85\xee\x13\x8d+\xb3\xbf\xc6\x03\xe8\xf4\xf5]\xe1\x03\xdf2FqO8j\xfc\x96\xd1\xa5\xb0WC\xff\xbbQq\xed\xcb\x1f\xa4\xebrw\xae\x8b.\xca\xec\x9d\xe4\x84\xab\xbe\xde\xa5\x1a\\\xf5\x9a_\xb4\xfa\xfc\xa7\xe3\xf4\x15\xf6y\x9a\xb6\\\x07\x19O\xbfn\xd4)I\xcdKGR\xa7\xeaH\xc5\x81q\x94\xb8\xdcI\xda\xd1\xc5\x06.\nd+\x10u@\xcf\xb4\x17\x1c\xf5\xd3\x08 \xea\xbek\x96\xd9\xc5\xa4}9\xa5\xeaT\xabv6\x1d\xf6*x\xa4g\xb6e\x057?\x97\x99\xc3\xac\xd4}\xf5S\xa7\x02\xe9\x14\xd5-\xf0\xa0\xed\x13A\x17U\x05\xdb\xfc\x01\x82\xed\x1f\x15\x0bO\x11MlJ\x0d\xd5p\xdb\x11\xed\xd5\xaa\xdd\xa7\xfc\xee\xd5\x05\x9fYw\x96\xd5\xe9h\x9ci6\xfb\\fA\xf6Zc,\xb7rjF\x9cT\x1f\xe5\x82\xd0Mj8kO\xeb\xab51\x8b\xfeT\xbb\xbc\xfdqW\xbd_\xd9n\xe9\xd8`\x17\x957\xae%\xb3K\xab\xe8\xdc\xe9W\xdcs\x96d0\x07\x9a\x82\xe1:\xbb\xd1`\xb4\xb6O\x1dX\x95\xde\x1e\xf9\x03\xd2\x1fs$\xe34\xbc?:\xffSI1\xa2\x00\xa2W-\xbePr}\xea\xc2\xb2\xa3\x8a\x0c\xa7\x1e9\xf5.\xd4\xfb&\xa0P\x9a\x99^f\n\xb3\x148(\xbaW\xa1I\xa2\xc3\x05\xdb`\x1c\xac\xa2`@5a}\x88z\xb5\xeai\xfeV \xbep\x84\x01\xb2P\xd4\xbd+:\x96\xa3\x12d\\j\xc3\"=\xfca\x80j\x15\xa3\x8a\xf0\xad\xe4)W\xa7\xd4$q\xf6{\xc7\xda\xd6\xcd\x9c\xd7p)\x97V\xfc\xf5\xae|\xa37hj\x9d\xac\x8e\x02\xcd\xf6\xe2\x12\x97\xb3\xf5\x0e\xbb\xa5\xc9\xe2$\xb7L\xeb\xe8\x98\xd6\xa1\xca\x0f9\x9b\x1a\\\xf6\xfa\x8e\xda\x81n[ \xb1\xa4k{lG\x8b\x89\xc4.m\x0c\x84m~\xc7T\x97\xc0\xbaE\x8b\x9d\xdb\xf9\xa1\xd1b\x8f\xc8\xad\xb6m\xb9`\n\xbb\x97\x12\x11w\xf2ny\xe6P&\x97\x19:P\xafLJ\xd8\xed\x96Y\x8e\xfa\x7f\xe9\xc0\x8c\xd5_\xeep\x99\x1dNW\xa8\x89\x13\x9e\x9bzV\xdb\xec\x16S\xd7\x83]7\xd6\x0f\xd5E\xdad\x93%i\x0f\xb8\xe7\x99\xac|\xf1\x0c\x03\xbe\x0f\xfa\xe8\xd9\xccE\xd4WM\xc1\x93\x99\x077r\xe2\x0d\xc0\xdeHB\xa8\xb4\xcb6\xfe`UG\xb9Z\x88\xe6\xce\x00\x0d\xf89\xa0N2l2\xdd\xdb\xc9\x85HY\x98\xbd\x1a(\x9a\xc5\x97\x11\xd2\xd4\xd9iw\x18\x9c\xbd\xdd\x93[\xfd\xde`\xaacZ\xa8\x96R;Yz=Tr\xd2vH\x8f\xfe9\x11\xebc.\x0b\xa1\xd6\xb2\xeaG\xe4\x8a\xd2\x13\xba6\xbb*p\xd5\xfc\xce\x85\x1d\x8d\x06\x03'\xbb[\xe2\x8b:\xfa/\x98\xd2\xaaX\xd8\x05\xa5\x9c\xb4CY\xd1\x85M\xf1\x98\xd6\x05t\xcc\xd0-'\xba]\xa3n,{@\xfc\xf0\x0c\x0bc\xf8\x19\x98Ob\xb8\xfe\x15\xe6\xfe\xc2I\x1f\xd1N\x16\x87.\x1f\x94x\x19\x17\xc1N\x81\x0b\xb9F9\xeb\xca\xeb\x9b\x9dN\xff\xadK\xf3\xdf[\xba\xa3\xdeX\xd3r=\xdb\xf4\xe9\x1bW\xcem\xf3\x1b\x0c\x8f\xb0\xdd\x8f\xb0\xc6\xa6\xd8Y+\x02\x8f\xbe\xca?s\xfdJ\xf5\xa2\xc4\xd7g\xccX\xb5u\xcbP\xfd\xb9\xaf%\xc8\x97V^\xbf\xdb\x1b\xe9\xe8\x08[\xad\x7f\xf9\x8b \xb7\xb7\xf4\x84\xd4W\x88\xa0\xaf\x7f;\xe9\xfaW\xe6\x0d\xb3x\x1ev\xb1i\xc8/\x87\xd7\x1eX\x1eS3\xb1\xe5\x07\xc8\xbc\x942\xac\xa4\x04\xf7\x01\xd4\xa9Z\xbe<F\x8e\xaf=0V\xf3[%\x95R~\xcb\x8c\xcf\x13x\x97\xd3\xe4y\xd1s\xc3\xd5y\x0e?\xa7\xce\x98(O\x86q\x0b\x12_\x0b\x94V-\xce\xf8aQ\xf1*Q1	\x8bt$\x03\x8cj\xd4D\x84pR\x08\x0bR~\x87z\xc7\xa2\xec\xf0p\x96\x10\"\xf0]\x9fgw\x90\xf3\xd5=\xb8%GV\xb3\xa7\xd4\xdf\xef\x9frt\xf8\xf5\x07\xbe\x90\x1b>\xc1\xdb\x0cf\x03\xd72\x9d\xd4\xe5/y\xf2\xc9\xcf?\xf1\x04\xed\xbb\xe48\xf0\xaeM@\xd3Q\x0f\xd4\xce*\xcb\x84\xc2\xfd\xc8\xf6\xa1\xa1\xedC\xe4X\xf9\x8dk\x1a\xa2\xf7\xb2?M\x0fz\x17T\x00y?\xb1\xe0\xd5Z\xcb\xc3Yu\xd7\xb3)\xff\xe3\x07\xe9]\xcd\x95\xdf\xf41\x96-\xe3\x97\xfea\x8f\xff7j\xf4\x82~\x94\xcd\xc4\xe1\n.d\xe3\xc4\xe1\n\xbb\x18\x0d\x96\xc4'\xd3\x18\x1c\xb7\xbd\xb8\x9a\x1c\xa7\xba\x93V\xd4\xf8z\xa3tXK\x7f\xfe\xd92k\xcc\xb9d\x17?\xa2\xa7z\x82\x1c\xa7\xfaz\xa5\xb4\xd9\x02K\x8c\x16.\xba>,\xa1\xb8BZ\xa6\xbf`q\x84\x1e\x97'\xbak\x96H\xe8qy\xa2\xfb\xb0\xe6\xa45\x1e\xaf\xbej>a\xc7\xc5\x03\xc5\x05\\C\xd9\x7f\xd5#\xca\xe7H;#p\xc7\xf8\xbd\xd07l\xba4\xbf\x15}\x94\x03\x0b\xd6IR\xb87\x16\x8c\x84\x01\xb0\xde\x8a0\xa7\xfb\x9c\xf0$\xe2\xec=\xab\x06\x06V\xc1\xbf\xfa\xd1\xf6\x91\xed#\xec\x11\xb8\xe4_.\x06\xd1v\xaa\x85s\xf0{g\x1e><c\xc6\xe1\xc3\xea\xcb\x10\xb9\x1d_\xab\xa3\xc5\xd0O\xa8\xda\xddgx\xf4\xe7\xf15&\xc7?\xc0\xdd\xca\xcc\xa0';z\x01\x12\xba\x84\xc7a\xce\xe6a\xd8:z\xd3\x91\xa0\xe8Q\xec\x10F\x0f\xea\x89\xa2\x91\x0b\xae^\x12\xe9\xc2MF\xd1\x00\xb0\xb3\xff9\xdb\xe7&\xad\x16\xa3A\xa8\x95\x8d\x84\xb7\xd5E\x07b\x9f\xfb\x86\xd9\xbd\\\xb1|\xe33\xddgE}\"+\xca>\x83\xc1h!\xad\xee\xdaA\xb7b\x0e\xb9\x13/p7\xbc\xd0\xee\x0e\x99=\xdcz\x97\xc1\xa9\xbemi\x94%\x97\xcd\x9f\x9a3)^O\x9aj\xbc<_\xe3U\x8f\xb6NY63dsIr\xa3\x99\xb48E\x97\x10j\xf1\x18\xac\xdf\xfd\xaeU\xf0\xb4\x84*\xcf\x14\x0d33\xcf|v\x0b\xbe\xe3\xe8;\xd4\xdbO\xc6\xe9\x1b\x0eB@\xf1\x9d\xf9,\x97\xfc,\x9f\xd1\\cwd}6k.\x9eu\xd8k\xccF\x1f9\xfe\xb1'\xcc\xe4\x9d2\xd06D]e\xb1\x91x\xdcG\xbeJ\x04\xb3K\x1e.\xd7\xbd}\x86\xf1S\xab\x7f\x86$\x83@\x0ct\x11\x12\"\x9a;2\x00\x1f\xc9\xa9\x00\xea\xb9*\xa4\x8e\x94\x8c\xdb4\xa7\x1e\xdc1_\x83\xe4\x11x\xf57\xb3\xd5Q\xa7bj\xb4X\x88\xa3\xa7\xdf9\x9b\x84\xa7\xda\x02Q\xf5\xbd;\xae#\xcf\x16\x8f{9\x86\xd4e\xbcI\n\x9a-\xec\x7f\xe5\xa5\x90br	B<\xde\xd69\xf2dpz\x9c\xdcIV\xaa\xfb\xf3\xffQ:l\x84+\x1b\xebs\xe9i\x0c\xd5#=\x14\x14\xd1\xecT\xac\xf0\xac\x81\x07+R\x98\xd1(\xaa\xe2M\x14\xdeDC$\xe2\n\xb9\xca\x0f\x1da\xe7\xcc\xb1	\xeaO\x1dNg\xc4j1\x11\x07\x9e9\x98\xb6\x9b\xcd\x03\xc4\xdcgqXk\xe8\x19\x84}F\xab\xc5\xe8\xf0\xf9d\xa2\x1e\x15\xa4\xd7\xd6\xd2c\xb6\x8aG\x93,\xb5\xe6\xe5&\x97\xd3.\xd8\xe2\x98\x1a.^\xc9\xb7wwc\x8d\x83>\xc0E\xb4\x12_]3\xfb\x9eU\x15\x88\xb1|\x1e\xe3t{J\x06\xd5f\xaa\xe7\xaa\x82u_\xf9.\x17\xba\\\x81\xff\x1d\xba\xfe*\xea\xf6\xb2W\x95=\xcc\xc5}\xd4lN\xe7\xd5\x14\x8do+\x1d^\xae\xef\xdfV\xcc\xa3\x13\xee\xe9\x91	v\xd8P\xa3>~\x86\x82s\x08\x1a\xa2\xa6T\xb6j\x1dWz~_\xb6\xa4o\x87gS\xd0}-\xad\xfcD\xf1T\x1bd\x82\x0b\xdd-T\x0e\x17\xc0Aa\xc8\xeaYf\xb5\x02\xb2\x05\x98\x1e\xc73,PATcm\xb2\xda\x0d\xd5\xbc4g\xe3\xb8}\x82\x1b\xbd\x95m\xe0E\x1c$B\x8e\x84w\xa2\x9d\xc5\xaa8\xdc>\xab\xac9\x1a\x8f\x96\x18\xe4\x91\xec\xb8JW\xe2\x81\xa9\xb0O\xa5\xf5/9\xffP\xaaJC\xc9XA{,\x99@c,t\x0eE\x05J\xaf\x14\xcbT\xc8j\xbd\xbe9\xec\x00\x958Q\xca\xf1\x95\xd3\xf5\x08&\xa8\x7f \xe4H\x08\x9f\xa0\xfeP\xc1l~K%\x06\xc6\x9e\xf9\x071\x80\xbe\xd1\xbb\xb9\x0d\xfc-\xe8e\xc8D\x0cz\x1d\x13xN\x81\x9b\xbbXuz\x9d\x92\xdd.9\xbd\xe4}\x89M\xc2c\x9d\x0f&\x9c:\xaf\xea\x94Z5\xbf\xe3\xd3\x998\xb7\x13\xf8%\x0b\xd5\xb5\xd5\xbd\xf8\x03m\xb3\x98\xbc\xefom\xf5CB\xf6\x06\x08:\xd0\xe4\xd6\xe1\x87l\xb4\xef\x988\x99\xce\xdf\xc4\xed\xa4~\xf3\xcb\xdc\xa6\xa2E\xb2\x03\xbfj\x95T\xa7\xdf\xc1\xed\xa4YH\x98Y\xe1\xbbv\xf8n\x83V^IN]]\x08\xc2\x8e\xe5CXkg#\xc5s\x0bc\xc0S\xfb\x88B\x92\x1d$\x89\xc3\x9d=\x92\x1f$\x8f\xaak\xf8}cG\xb9&\xf6\xf7/\xa8\xdfz\xe7\xbb\xdf}\xe7\xe4\xbf\xe7\xca\xc6\x07\xb5_\xee\xd1v6\x14<\x81\x127\xb8\x13\xbd\x19\x01\xfd\x13\x18\xb4I\x1aVGG\x02\x99\x9d\x04\xfag*l\xf4\x9f\\RXS\xb2T\x8b\x8b\xae)\xd9\xc2\x9a\x02E\xee\xa4\xca%Y\xa0u\xf4\xf3\xc1~Q~>X\xa4\xb8\x88\x14\xcf\xd0\x85\xb1\x1a\xd6`9\xd3\x1aW\x82\x93k*\x87@_\xd5\x8a\x10pM\xb8\x03]0\xa6*\x83\x81%\xe3a\xc0\x933\x11X\xed\x8c\x81K\xb9M\xfc|\xf4{\x86\xa3F\xd4\x94\xbb\x83\xfa\x91\n\xec\xb7\xbed7[\xd5n\xf2\xa6\xd5l\xff\x92\xcd\xac\xc6D\x91\xfc\xdc\xcc\xcf\xf7@\xa4\xdam\xf5\x98\xc8\xcf\xf18\x8b\x9f\x9b\xb0\x0fe \xafc\xc5\xbc\xf4#\x07\x90gH\x9b\xd0\xc4d\x19d@~.\x8aj\xccl\xc3l\xc9\x9b\x90\x03\xe4eRcx\xeeE\xcc\xe4\x81((	\xcd\xed\x99K\x81\x9e\x99\xcfm\xc2\xbc\x18\xea\xefG\xebX\x94A7\x11\xbe\xd7S\xf5\x15\xb7\xb5\x1c@[\x01l\xda\xd7.%\x19\xc8\xeb\x18\xe6\x05\xd5\xa3n\x01MDs\x07\x88]n\x1d\x80_Q\x1f\xee\xb7\x95 \xda5\xc0i?z\xfb\xd4G\xfcT\xe8G\x023\x19\xb2\xa6T\x9d@e	\xe8i\xb4\x81\xd7,\x88\x83\xb0r\x02\xb8\x9d\x1c\nO2<\xb0\xd0\xe8\x95\xe9\x18\xd2l+\xb3\xc0\xb0/\x16,\xc1\x96%\x89\xb9\xadm\xb2\xe0 \xbc\xd3\xdb\x9aX\xd8n\x9b|\x96E\x9a\x9b\xb6\xf7]\x98\x8e\x88\xa2l\x90\xc3\xad\x99\xf4\x9c\x9e\xc6\xcf[m<\x92|#\xb9z\xd7+\x845\x88\xa2 7&\x17\\5S\xf4-\x98{\xfe\xfc\x19\x0eA\x10E\xdf\x15\xd7^\xd9\x1c\x1a\xb8\xec\xact\x93K\xe4\x0c\xc2\xcb\xce\x1a\xad\xdf\xe7\x18\x05M\xf1\xa9^rq]\x82\xeeFm\xdeC%2\xfe\x84vJ\xd2\xf0)W-\xce}O\x17M\"`\xd59l\xb2+\xec=\x85%\"\xab\xe7\xeb\xa3\xf3\xadT\xf2\x98'8\xc2\x01zH3Q\xd2\x90\xdf\xfb\xd1\xa9\xf9Y\xecP~V\xb6\x91\xd8\xb2\xe8Ni\xec\xbc\xcd\xdc\x0b7\x8e\xd5\xf0\xc4\xdb\x9b\xbf \xeb\xce\xfe?w1\xea\xd7\x00x\xdac`d```d\xf2\xcd?\xcc\x12\x1f\xcfo\xf3\x95A\x9ee\x03P\x84\xe1BY\xf1t\x18\xfd?\xf0\xff\x1c\xd6;\xac\"@.\x07\x03\x13H\x14\x00c\x04\x0c\xe8x\xdac`d``\x15\xf9\xdf\n&\x03\xff]a\xbd\xc3\x00\x14A\x01\x8b\x01\x8a\x8f\x06_x\xda}S\xbdJ\x03A\x10\x9e\xd5S<\x91`\x11\x8c\xda\xd9\x18\x8b\xab\x04\x0b\x11\x04\x8b\x80\xda\xf9\x00\x16\xc2b)6\x16\xe2\x0b\x88\x8d>@D\xc8\x13\xc4\"\xe8\x03X\\o\x93\xa0\x0f!\x87\xad\x8e\xdf\xec\xce\xb9{\xc7\xe9,_\xbe\xd9o\xe7gg\x93\x98g\xda \x98\xb9#J\x86\x0eVYp>uC4\xd3&*\xd9<\x02=$\x8c\x15\x03\xec\x13\xf0\xbeg9\xd3\x1aW@.0\x9f\xa2q\x11\xea\xf2\x87\xfa- \xf5\xf1\xfc\xea\xf1\xdb;\xc6:p\x06t\"H\x8fU\xe5\x05e\xe8\xdc\x0f\xbe\x035\xe4\xd5\xe7\xfc\x0bVg(\xf7[A\xe3\x11x\xad9\xcf\xdd!\xd6\xde\xb4\xf7EM\x9f\x8f\xea\xdf\x97\xef\x154\xfeN\x86&\xd3\x9e\xd7\xf0wj\xb3t\xfe\x99\xb3\xd4\x9e\x14e\xcf\x83\xe8Lp\x8c>\xef\x8a\x87\x86w\x91\xef\x86\xf5>G\xe0\xd9pfz`\x13\xcd|\x08\xb4\x1b\xde\xe2\x04\xfc\x05^\xaaa\xd9\xc5\xbc\xf8>\xe4\x8c\xc7\xf0\xb6)\xc7o\xa9\x0bo\xa5\xb2\x82M\xdcg+R\x12\x8am\x1a\xb9Rq\xd1\xed,\xf7\xab\x8bRJ\xb9\xe0\x021\x97\xd4\xd5X\x89\x1bT\xaa\xe4N7t\x8b{I\x96E\x97\\\xeeF\x16\xff\x18\xeb8\xe3\x11U\x0d\xba\xc9\xcc\x1emb\xcd\xf9:f\x97N\xb1&\x92\xfd\x03j9\xccY\x00x\xdac``\xd0\x82\xc2M\x0c/\x18^0\xfa\xe1\x81K\x98\xd8\x98\x94\x98\xea\x98\xda\x98\xd60=avc\xcec\xeea>\xc2\xc2\xc1b\xc4\x92\xc4\xb2\x88\xe5\x0ek\x0c\xeb.\xb6\"\xb6/\xec\n\xecI\xec\xa78\xe48\x928\xf6q\x9aq\xb6pn\xe3\xbc\xc7\xa5\xc1\xe5\xc35\x85\xeb\x11\xb7\x01w\x17\xf7)\x1e\x0e\x9e\x08^-\xde8\xde\x0d|||\x19|[\xf85\xf8\x97\xf1?\x13\x10\x12\x08\x11\x98 \xb0JPK\xb0Lp\x9b\x10\x97\x90\x85P\x8d\xd0\x01a)\xe1\x12\xe1\x0b\"Z\"WDmDW\x88\x9e\x11c\x113\x13K\x10\xdb \xf6O<H|\x99\x04\x93\x84\x9eD\x96\xc44\x89\x0d\x12\x0f$\xfeIjHfHN\x91<\"yK\xf2\x9d\x94\x99T\x86\xd4\x0e\xa9o\xd2q\xd2[d\x8cd\xa6\xc8<\x92\x95\x91u\x91\xcd\x91\x9d\"\xbbG\xf6\x99\x9c\x9e\\\x99\xdc\x01\xf9$\xf9K\nn\n\xfb\x14\x8d\x14\xcb\x14w(9(MS\xda\xa1\xcc\xa7\xac\xa4l\xa1\\\xa5|H\xf9\x81\n\x93\x8a\x81J\x9c\xca4\x95G\xaa&\xaa	\xaa{\xd4D\xd4\xea\xd4\x9e\xa9\x07\xa8\xefQ\xff\xa1a\xa2Q\xa0\xb1Fs\x81\xe6\x19-5-/\xad\x16m.\xed*\x1d\x0e\x9d\x0c\x9d]:otet;t\xbf\xe8i\xe8\xa5\xe9-\xd2\xbb\xa1\xcf\xa7\xef\xa6_\xa7\xbfI\xff\x87\x81\x9dA\x8b\xc1%C!\xc3\x04\xc3u\x86/\x8cT\x8c\xe2\x8cf\x19\xdd3V2\xb63\xce0\xdef\"a\x92`\xb2\xc2\xe4\x92\xa9\x8e\xe9<\xd3\x17fvf5fw\xcc\xa5\xcc\xfd\xcc'\x99_\xb1\x10\xb0p\xb2h\xb38a\xc9e\xe9e\xd9ay\xc6J\xc6*\xc7j\x96\xd5=\xeb\x05\xd6wl$l\x02l\x16\xd9\xfc\xb05\xb2}cge\xd7cw\xc5^\xc3>\xcf~\x95\xfd/\x07\x0f\x87\x06\x87c\x8eL\x8euN\x12N+\x9c\xde9K8;9\x979/p>\xe5\"\xe0\x92\xe0\xb2\xce\xe5\x9bk\x94\xeb676\xb7\x12\xb7-n\xdf\xdc\xcd\xdc\xcb\xdc\xb7\xb9\x7f\xf3\x10\xf30\xf2\xf0\xf3\xc8\xf2h\xf38\xe3)\xe4i\xe1\x19\xe7\xd9\xe2\xb9\xca\x8b\xc9K\xcf+\x08\x00\x9fs\xaa9\x00\x00\x01\x00\x00\x01\x17\x00\xa7\x00\x11\x00\x00\x00\x00\x00\x02\x00\x00\x00\x01\x00\x01\x00\x00\x00@\x00.\x00\x00\x00\x00x\xda\xad\x92\xbdN\x02A\x10\xc7\xffw\xa0\x91h\x0c\x91\x84\xc2\xea\n\x0b\x1b/\x87\"\x82T\xc6D\xf1#J$\x8a\x96r\xf2qr|\xe8!'\x89O\xe13\xd8\xd8X\xf8\x08\x16F\x1f\xc1\xde\xa7\xb00\xfewY\x81 \x851\xdefg\x7f;73;3\xbb\x00\xc2x\x86\x06\xf1E0C\x19\x80\x16\x0cq=\xe7\xae\xcb\x1a\xe6q\xa3X\xc74\xee\x14\x07\xb0\x8bG\xc5A$\xf1\xa9x\x0c\xd7ZB\xf18\x12\xda\x83\xe2	D\xb5w\xc5!\xf2\x87\xe2I\xcc\xe9a\xc5S\xe4\xb8\xe2\x08\xf9X\xf1\x0b\xa2\xfaw\x0e\xaf\xb0\xf4\xdb.\xbf\x050\xab?\xf9\xbeo\x96\xddN\xb3\xe2\xd8\x8d\xbag\xda\x8d\x1a\xd6\xd1@\x13\x1d\\\xc2A\x19\x15\xb4`\xe0\x9es\x11\x16b\x88\x93\n\xfck`\x1b\xa7\xa8s\xdd\xa1}\x9b,\xec\xab0\xa9Y\x83\xcba\x0cD\xf0\xe4\xae\xc8\xb5\xc8\xb5MyF\xcbMv\xe1\x04Yd\xb0\xc5S\xf7\xb1\x87\x1c\xed2\x8c\xe5\xa2\xc4\xe90~\x99>\x07\xb4/\xe3\x8a\x1aqJ\x8c\x9e\x16G\ni\x1c\xf2\xf4<\xfd\xd2#c\xfd\x8c\xb40\x14\xeb\xb7\x19\x18C~G\xb2\x0e\x8f\xff\x1b\xb2\x07\x839ee\x0cKv\xab\xaf\xad\xd0\xb2\x05[\xda\xb7{\x1e&V(\xd3\xa81j\x951\x85M\x89Zqr\x81\x1d7\xb1,g\x12K\xdc\xa5\xfeX\xe5\xe8\x9b\x1a\xad\xf5\xe50\xe9\xed\xf2\x96\x9b\xcc\xdbQY{\xd4\n\xaa\xfd\x9bM\x9eY\x16\x98\xb9\xd0\xb6z=\xc9\xcb\xd7a\xb0:[jE\xdd\xa2\x9f	\xac\xb2\x0bBZ\xecZ\xff=n\xf4\xfcs\xb8`\xcd\x0e+\x11o\xcd\xfd\x02\xd4\xcc\x8f\x8f\x00\x00x\xdam\xd5U\x94Sg\x18F\xe1\xec\x83\x17\xa7B\xdd]\xf3\xfd\xc99I\xea\x03$uw\xf7\x02-\x05J;m\xa9\xbb\xbbPwwwwwwww\x17\x98l\xee\x9a\xb5\xb2\xde\x95\x8b\xb3\xf3]<3)e\xa5\xae\xd7\xbf7\x97R\xe9\x7f^\x0c\x9d\xfc\xce\xe8V\xeaV\xea_\x1a@\xf7\xd2$z\xd0\x93^\xf4\xa6\x0f\xd3\xd0\x97~\xf4g\x00\x03\x19\xc4`\x860m\xe9[\xa6czf`(32\x1333\x0b\xb32\x1b\xb33\x07s2\x17s3\x0f\xf32\x1f\xf3\xb3\x00\x0b\xb2\x10\x0b\xb3\x08\x8b\xb2\x18\x8b\xb3\x04e\x82D\x85*9\x055\xea4X\x92\xa5X\x9aeX\x96\xe5X\x9e\x0e\x861\x9c\x114i\xb1\x02+\xb2\x12+\xb3\n\xab\xb2\x1a\xab\xb3\x06k\xb2\x16k\xb3\x0e\xeb\xb2\x1e\xeb\xb3\x01\x1b\xb2\x11\x1b\xb3	\x9b\xb2\x19\x9b\xb3\x05[\xb2\x15[\xb3\x0d\xdb\xb2\x1d\xdb3\x92Q\x8cf\x07vd\x0c;1\x96q\x8cgg&\xb0\x0b\xbb\xd2\xc9n\xec\xce\x1eLdO\xf6bo\xf6a_\xf6c\x7f\x0e\xe0@\x0e\xe2`\x0e\xe1P\x0e\xe3p\x8e\xe0H\x8e\xe2h\x8e\xe1X\x8e\xe3xN\xe0DN\xe2dNa\x12\xa7r\x1a\xa7s\x06gr\x16gs\x0e\xe7r\x1e\xe7s\x01\x17r\x11\x17s	\x97r\x19\x97s\x05Wr\x15Ws\x0d\xd7r\x1d\xd7s\x037r\x137s\x0b\xb7r\x1b\xb7s\x07wr\x17ws\x0f\xf7r\x1f\xf7\xf3\x00\x0f\xf2\x10\x0f\xf3\x08\x8f\xf2\x18\x8f\xf3\x04O\xf2\x14O\xf3\x0c\xcf\xf2\x1c\xcf\xf3\x02/\xf2\x12/\xf3\n\xaf\xf2\x1a\xaf\xf3\x06o\xf2\x16o\xf3\x0e\xef\xf2\x1e\xef\xf3\x01\x1f\xf2\x11\x1f\xf3	\x9f\xf2\x19\x9f\xf3\x05_\xf2\x15_\xf3\x0d\xdf\xf2\x1d\xdf\xf3\x03?\xf2\x13?\xf3\x0b\xbf\xf2\x1b\xbf\xf3\x07\x7f\xf2\x17\x7f\xf3\x0f\xfff\xa5\x8c,\xcb\xbae\xdd\xb3\x1eY\xcf\xacW\xd6;\xeb\x93M\x93\xf5\xcd\xfae\xfd\xb3\x01\xd9\xc0lP68\x1b\xd2s\xe4\x98\x89\xe3GE{R\xaf\xce\xb1\xa3\xcb\xe5\x8e\xf2\x94M\xe5\xf2\xd4\x0d7\xb9\x15\xb7\xea\xe6n\xe1\xd6\xdc\xba\xdbp;\xda\x9bZ\xed\xcd[\xdd\x9b\x9d\x13\xc6\xb5?\x0c\x1b\xd1\xb5\x95\x18\xd6\xb5ykx\xd7\x16~y\xd1j?\\3V+wE\x9a\x1e\xd7\xf4\xb8\xa6\xc75=\xaa\xe9QM\x8fjzT\xd3\xa3\x9a\xe5(\xbbv\xc2N\xd8\x89\xaak/\xec\x85\xbd\xb0\x17\xf6\x92\xbdd/\xd9K\xf6\x92\xbdd/\xd9K\xf6\x92\xbdd\xafb\xafb\xafb\xafb\xafb\xafb\xafb\xafb\xafb\xafb\xafj\xafj\xafj\xafj\xafj\xafj\xafj\xafj\xafj\xafj/\xb7\x97\xdb\xcb\xed\xe5\xf6r{\xb9\xbd\xdc^n/\xb7\x97\xdb+\xec\x15v\n;\x85\x9d\xc2Na\xa7\xb0S\xd8)\xec\xd4\xec\xd4\xbc\xabf\xaff\xaff\xaff\xaff\xaff\xaff\xaff\xafn\xafn\xafn\xafn\xafn\xafn\xafn\xafn\xafn\xafn\xafa\xafa\xafa\xafa\xafa\xafa\xafa\xaf\xd1\xee\x85\xeeC\xf7\xa1\xfbh\xffQN\xde\xdc-\xdc\xa9\xcf\xd5\xdd\xf6\x1d\xa1\xff\xd0\x7f\xe8?\xf4\x1f\xfa\x0f\xfd\x87\xfeC\xff\xa1\xff\xd0\x7f\xe8?\xf4\x1f\xfa\x0f\xfd\x87\xfeC\xff\xa1\xff\xd0\x7f\xe8?\xf4\x1f\xfa\x0f\xfd\x87\xfeC\xff\xa1\xff\xd0\x7f\xe8?\xf4\x1f\xfa\x0f\xfd\x87\xfeC\xff\xa1\xff\xd0\x7f\xe8?\xf4\x1f\xfa\x0f\xdd\x87\xeeC\xf7\xa1\xfb\xd0}\xe8>t\x1f\xba\x0f\xdd\x87\xeeC\xf7\xa1\xfb\xd0}\x14\xf6\xf4\x1f\xfa\x0f\xfd\x87\xfeC\xff\xa1\xff\xd0\x7f\xe8?\xf4\x1f\xfa\x0f\xfd\x87\xfeC\xff\xa1\xff\xd0\x7f\xe8?\xf4\x1f\xfa\x0f\xfd\x87\xfeC\xff\xa1\xff\xd0\x7f\xe8?\xf4\x1f\xfa\x0f\xfd\x87\xfeC\xff\xa1\xff\xd0\x7f\xe8?\xf4\x1f\xfa\x8f\xa9\xee\x1bv\x1a\xedNj\xffHM\xdep\x93[q\xabn\xee\x16\xae\xcf\xeb?\xe9?\xe9?\xe9?\xe9?\xe9?\xe9?\xe9>\xe9>\xe9=\xe9<\xe9<\xe9<\xe9<\xe9<\xe9:\xe9:\xe9:\xe9:\xe9:\xe9:\xe9:U\xa6>\xef\xf7\xeb:\xe9:\xe9:\xe9:\xe9:\xe9:\xe9:\xe9:\xf9\x7f=\xe9;\xe9;\xe9;\xe9;\xe9;\xe9;\xe9;\xe9;\xe9;\xe9;\xe9;\xe9;\xb5}\xb7\xea\xadV\xcf\xceh\xe5\x11S\xa6\xe8\xe8\xf8\x0f\xb7\xaa\xd9o\x00\x00\x00\x00\x01TP\xc3\x17\x00\x00PK\x07\x08\xea\x14{\xf5\x80[\x00\x00\x80[\x00\x00PK\x03\x04\x14\x00\x08\x00\x00\x00W\x9a5G\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00(\x00\x00\x00fonts/glyphicons-halflings-regular.woff2wOF2\x00\x01\x00\x00\x00\x00Fl\x00\x0f\x00\x00\x00\x00\xb1\\\x00\x00F	\x00\x01\x02M\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00?FFTM\x1c\x1a \x06`\x00\x8cr\x08\x04\x11\x08\n\x82\xa9$\x81\xe5e\x016\x02$\x03\x86t\x0b\x840\x00\x04 \x05\x87\"\x07\x95Q?webf\x06\x1be\x8c5\xec\x98\x8f\x80\xf3@\xa0\xc2?\xfe\xbe\x08\n\xda\xf6\x88 \x1b\xact\xf6\xff\x9f\x94\xa0\x86\x8c\xc1\x93\xc7\xd8\xdc,3+\x0f2q\x0d\xcbF\x16\xaeYO\x1b\xec\x04&>\xb1\xe9\xb1b\xd2m\xa45\x81Z\x8e\xe6H$\xb1\xaaY\x8a\x19\x9c\xbd{\xecH	jd\x86\x0b\xd5\x89\x0c\xfc\xb2%\xf7\xb9\xd9\xa7\x7fy\"\xa7\x04\x03\xf7\xf6\xd7+\x8d@\xb9\x8c]\xbd\xabe\x9f\xfb{\xfa\xd2\xfbv\x90\xa0Nc\x8b)\x0e\xbbn\xf9\x93\xc9?~?\xe8\x90\xa4h\xf2\x00\xff\x9e_\xe7&i\x1f\xc6\xca\xc8\x1d\xd1\x9d\x05\xc1\xa4\x8b?\xba>\xfc\xe5^K \xfbv\xb4-\x1bc\xdb\x8d1\xed\xf4\x80\x12\x892K\xa0\xe1y\xb7\xf5,'n\xe4\xab\xe0\x00\x07(\xf03Ewi\xe0B\x05\x17\x82\xa0&\xa9\xff\x0b\xe9\xceT\xb4lh\xd80M\x1a\xd2\xd8\xda\xd2\x86d\xe5Y\xd8r\xf1\xef\xb2\xac\xb3nti\xde]\xddyur\x95\xb4\xbc\xae\xfb\x99\xee\x13VXsj\x0e\xa1\xa2\x9e\xe5gMn\x19\xaa\xd3\x99H\x81W\x95\xa9\xc3\xd4\x08 r2\xf4>iT`V7\xb8\xcdR(\xb1\xa8\xc9\xcf\x1a\xe0\xff+\xa0o6\xf3'c\xc5\xc8B\xb0\x8f\xe6\x06\xeb4\xe7\xb7\xd6\xce\xb9\xdd\x7f\x87\x83\x8b\xe3\xbf\x9a\xaeT	]a[Qd<3wq8,\x8e\x85\xeerTI\x16\xa18\xe1\x12\x1c\x8e0>E\xb8?\xf9*E\xa8\xe7\x97\xa6\x95#\xcf\xfa7'\x8d\xec\xdd\xfd\x86S	\x0c\x0boc\xfb\xca\xb7\xed_\x8b7&#*\xd1+)\xbd\xb3\xa0\xd0+4a\x01\xb0A6\xb6c\x8c\xe7y\xb1\xd9\xa3\x86f(b\x19F\xe9\xe6\xe4\xff\xe9\xb4$;{ YA\xc31vP-tG\xf8\xff\x8c\xe1\xc0\xb1\x15\xcd\"\xfb\xb0\x95\xdb\x01C\xc2f- W\x82\xf7\xae\x02\x9a\xd4\x99\xceuK\xd6\xb0K\x08\xe3#\xad\xed\x0e\xe4\xac\xd6*K\x86<\xdb\xfc\x04 (\xd1\xdf\xeb\xd4\xf7\xd7\xffZ\xfe`\xd9\xab\x0c\xe5\xb5[\x97%\xeaY\x05T\x8a\xac{%\xaf\xc9\x8a$\x88\xad\x10\xa0s{o\xef\xed\x19\x9c\x17\xf2\x88\x83\x18\xd5\xbb\xefvt\"p\xe0\x9c4`\xc8\xea\xdf\xa9\x8a\xcf\xa4}o\x0c`\xe3\xb3\xdd\x14\xfa'n\x14e\xdc>\n\xe4G\x1e5s\x00z\xf3_N\xf3\n\x92PK\xd3\xa6vmU\xde\x0b\xc9\xbe{z\xbd\xdc\xf2\xee\xf3\xff\x9f\x19\xf8\x7f\xf8\x8c\x87\"3`l\x0d\x92\x1c\x03\x96W#\xd4\x90\xbd^\x18@+\x8d,\x07c\xb9\xc9ko\xa9\x8dAO\x1bp\x15nu\xb5\xa7\xd4z\xf3\x96zJ)\xf5\xdc\xce\xa5\x1e\xf7\x98\xdb1\xc7}\xe1\xe1\xffO=\xde\x7f\xad\xb6\x80x\xbeR\xc6\xc4`\xc1J\x89`\xa7q\x83\x15\xa5\x82Us/\xbf+\xf8k\xd2v\xc71xl\x1a\xdd\xdf\xe7j\x12l\x05\x96El\xec\\nD\x8c\xc8\xc3\xc6\xb6\xafV\x86\xb1\xe6\xff\xd0jg\x9b{Zd\xe5\x89\x08z7\x8f\x0b\x145\xff\xdf!\x04xm\xc25o\xc2[\x07\x1c\xbd\xbfu\xef\xfb&\xb7\xaf1\xda\x82H\x10BkA\xe2\xec\x08qr\xea\xceR\x90\xc4\x0d\xa3\xb7\xb0\x16\x8f(\\gh\xf4\x10\x14\xc87\x89\xec\xd2\x8ay\x8f=\x86H\xb5Z\xf3UPh\xe9\xd0$8\x10Rg\xd3\x05\xc4\x18\x80z\xc2g\xcd\xad\xc9N:\x8b\xe0\x001u\xac$\xdc\x85\xaf\xa4\xa1\x9e>R\xfd]\xe5\xfa\x14\x97\x0e\xa6\xac\"\x9f\xf4f7\xbc\x97\x0b\xf5K\xaf^\x7f'\x98\xaa\xeb\xbd3\x93+E/\xbc\xc4^\x89YU5]\xa8NB\x17.\xde\xca\x8b\xa5\xd28\xdf\xc5+\xce\xcd\x8f8\x8f\xf9,|\x89{M|\x8cA\x8a\x11\xe5ua|\xd0a\x88\x92\x7f\xec\x8e\xd5\xde\xcb\x85\xd5\x9d%\x00\n\x7flKG\xa2P\xed,\x17Nu\x14\xe6\xdc\xd4k\xfec\xef8mX@\xda\xd3d\xff\x17\xcc\x98?\x7f\xf1\xfc\xda\xf3\xa2\xe7Y\xd3&\xcf\xfe{\xea\xf6\x94\xf8\xb3\xc7\xcf\x0e?\xdbP\xdc(\xae\x14G\x8a]\xb6\xbf\xcf\xc6\xe4\xaf\xe4O\xe4\x8f\xe4\xb7\xe4\xd7\xe4\x97\xe4\x06r-\xb9\x92\\LF\xc9\x089\x97,&\xa7\x93y\xe48r\xac\xfb\xb4\xfb3\xf7\x1f\xdc\x9f\xb8?p\xbf\xef>\xea~\xdb\xfd\xba\xfb\x15s\xe8\xe4\xff\x05\x8b\x9e\x12\xd0\x10\xa2\xd3D\xc7\x08\xa4z\xf31\xfa\xa1?\x12\\U5\x16q=\xad\xd9t\xd1z\xd4\x92\x0e\x86&Z\x90nj\xa2%\xe9mM\xb4\"}\xbc\x89\xd6tk\xdeD\x1b\xbawh\xa2-=\xffm\xa2\x1d\xbdB\x13\xed\xe9\xf576\xf1\xf4\xae\x83&:\xd2\xbb\xc9qt\"\x0b\xd61:\x93\x15\xac\xeb\xd0\x95\xac\xa9u;\xf4\"K_\xa1/Jd\xd6c0\x96l\xb2\xf5\x1c0\x1d\xb2\xc5'^\x03\x16B\xb6\xf98VC\xb6\xd5zg\xb0\x06\xb2\xbd\xac\x0f\x06[ ;\xca\xfad\xec\n\xd9Y\xd6\x17b\x7f\xc8\x83u\x1d\x0e\x87\xbc\xa9u;\x9c@\x9e*}\x01\x06y\x89|\x0c.\xa9\xac'C>\x13\\g=\x1b\xf29\xe0V\xeb\xc5\x90\xaf\x01\xb7[o\x86|g\xf0\xa0\xf5^\x90\x1f\x0c\x9e\xb6>\x8a\xfcd\xbc\n9\xad\xcf\xc7\xfb\xe4\x17\xee\xd8\xc5\xf8\x94\n*E|A\xa5\x0e\x8f\xe3\x1b*M\xad[\xe3[*mO\xdc\x0e\xdfQ\xe9z\x1c?P\xe9n\xdd\x1b?R)Y\x8f\xc1oT&[\xcf\x01U*\x8b\x955\x10\xc0S\xd9\x0cMB\x0b\xfe\xec\x04\xa1\xa5\xf0[\xb3\x13\n\xad\x84\xdfoYDh\xad\x18\xd5{\xec\xd1,}1<f\x8d&\x026h\xa4\x18\x86'\x8f\x81\x7f\x07\xca\xa5U#V\xa8\x08\xde\x11\xad\xbc\x1f\xa1\xa5E\xfbD\x7f\"T\xc1\xa5\xde\xa9\xd0\x06\xa2AD9\x83\xffeB\xb9:\xa9\x07\x06\x15\xc4%\x0f\x02O\x9c\xc1 \xd2\xd0\x04\x13\xf1\x82\x87\xd8F\x12u\x8an \x167?%R\x03G4\"\x84\xb8f\xa9g\xc7\xc1F\xea\xba\x81 \x0ea=\x82\x91-\xb3\xd5Q\x97\xe1\xbdy+B\xbd,\xc4\xf8\xd02\xc3\xcb\x13\xd6\x855\xa2\x95\x87\xf0\x99\x84\x8cxn\xa1\x05\x15\xce\xaa\x04f*!\xa1\xb3\xe6\xebl\xe2|GXQ\xf8 \xde\x83Up\x94\xe4\n\xc5Eu \xc2@\x9e\x01\x8f\xa6\xe5-\xf0\x80\x04\x1fDo.6YZ\xf6\x82-&a>f\x12?\x9b\x00\xab\x93N\x8fN\x9c\xa2	]\xd4O/^;\\\xda\x0e\xc2J\xca\x0d\xcfB\x06\xc7EsJr\x19\x04\xaa\x90\x19\x01\xa0\xc4\x9a\xf5\xc6\x0f\x14'\xf2\x85g\x12/\xe3\xe3\xd1B\x17%\x9f\xa1\x1eo \x1fC\xf5\xea\xban\x957\x8b\xdc:\x05|\xf5y\x83Kt\xb2&\xf7$\xa7\xd8s\xaf|\xb9\xf5wP\x88\xf9\xc4\\i]\xbe$Z\x12@+\x01\xcd\x0c\xb6\xb6\xd5\x8090x]\xbbr\xb8\xad%\xbe\xc8\xd5+\xf6\x07RU\xacEm\x87+\x16\xdc\xb0\xaa\xa3;w\xa0u\xac\xc09/I\xbc\x05\xd47\xc87\xd5\xa6\xb9Q\xfelu\\\xa6y\xd0\x0eW\x8b\x10N)\xeb8\x89\xdc\xb0vY\xee*u\xb4m\x02\x94\xa1\xb1\xbf\xe9\xe2\xa9\xe2\x04\xbam(	f\x06\xcaE\xbd\xf2\xffG8\xb2\x0c\xa2j#I\xac\xbdR\x8e\xcc\x17\xf9z\x0c#q\xb8\xdf\xb7\xdf\x01\x06	\x84)Y\xa0\xd7$\x8b\x0b\xe1\xd0\x9b\x86c_%\xbfm-{!0-`\x0b;\xe1\xe5\x85\xac\xf1\x14hyV\xf5\xe4\xc1]Hv!	\xcf\x1ft\x1ca\xbd\\K\xef\xc5\x10\x1e\x06\xa5[\xcc1{\x1a\x03\"\xe7j 6@\xec\x963T0%\xa5\x13\xbf\x0f\xe9\xce\x98\"\xc7\xd4\x99\xc6ZI\x86G\xe4\x06\x9bS\x93\xf7\x8d\x82.\xb3\x11\xc4\xce\xa3p\x07\x81\xc6\xd3\xacS\xc61e\xe9\xfb\xd9\x93\xc4\xd8\x9b\x9d\xf9\x0cY\xc1\x1e\xffv\xbb8\x1a\x08d\xb1\\\xb1B\xa1\x17l\xa1S\xfb\xfeR)\x06\xd2\x13\xd3\x86\xe7\xf9\xaf\x96\xae\x80\x0b{\x02I\x8a\xd3\x86\xf4\xd2%\x9d\x94\xaf>\xfb0\xd0\x8e\xda\xa6\xb3\\\xf0'\x94cg\xbd2%4\xa0Q\x8eD\xa1\n0\xcd\x923B\xb2\"\xc9M\x8e\xd5\x8e&\x80\xdb\x8ahI\x15\xc7\xc2\xda\xa7\xd2Rg\x10\xb7ME\xa4\xa1\xa9\xa1\xb6\x9a\x0dI\xbd\xce(\x07\xa9\xde\xd55U\x96D]\x0c}\xf2\x1d\x99\x07b\xed8$\x97\x87\xec8\xa8>\xf3\xe1X \x01\xb2\x07h\x95\"l\x1e\xb5\xce\x80\xe2j\x1c\x9d.%\x88\xdb\x80\x18HH\xc7-\x0bI\x9a\xa6\xdd\xb8#1\x92\x1dC\x014\xf5\xdeY\xde\x017\x84\xed\xee\xae\x12\xedY\xdd\x96\xa1V\x0co\x08\x1a>P\xca]\xa16\xbf\xb7\x07\x98\xf6\x99O4\xff7f\x1a\x0d\xbd~\x00\x18\x1eAJdYF\xd5\xc2\x80\xca.\x96\xdeo\xf5\xc3\xfey)	\xc68l\xc6\x0b\xb622\x8ee\x8a\x9c\x1f\xa6\xd21H\x1b\xa1[\x01t\x89\xb0@!\xc8\x85\x0c2\\\x80@\xb8\x085\x06\xc4\xd9\x93\xca%Z\xd7\xee\xfc\xdbk\xde\x92\x08\x06a\xf5\x9d\xae\xdc@\xfa.`n\xa83\xcaOF\x8c\xa2\x10R(\xf3\x85\xa5\xb6\xf7\xff\xbdZ\x01kLk\x05F \xedHWjY\x1f\x0dI\xa4\xea5\xd7\xe7*\x13\xf16\xda\xcee\xb5Sbk.\xa4\xbc5F,\x17\xec.\x95\x02N0\xdf\xd4\x99\x92\xb9\x80|\x94\x86V\xa6\x80||~\x05N\xf4\x87(	 4\xb7\x9d\xec\xda],\xec\x1aJp|~\xf9xe\xd3\xc9A\xa8\xd4\x1c\xa1\xaf5\x88\x88/\xbb\xda\xbbS\xa4\xfd\x04\xe4\xf4\x94\xd0v\xf2\xd7\xdcy?\x9b\xf9\xb2'_v|r\xea\x84\xcbX\xdc\x06\xf8\xeeH\xe9Q\xca\x05\xb0\xb5\x15\x05\xc4\x93B@=\x0b\xddX\xac\xdf\xfa\xacB\x13\x189\xcb4\xb3\x98\xab\xc3T\xa9\xd8B\x89B\xa9c\xa0\xad\xc1\x18\xabH\x91P\xa3\xce+\x82\xf2\x89\x81_\x93\x93\xd5YH\xd9#\xac$\xaa\xcb\xca`\xa0\xecF\xf8\xa3\xf1B;\xe3\xb5\xc2+\xdb\x11\x94\x85BPR\xb04\xcc\xbc t\x04\xad:t\x08\xf5\"Z\x13E\xbaJ^!X\xc2\xc7\x93\xe0\xacq4_dTW(5\xe4\xdc\x80\x04\xa7\xe5\xff\xe4\x1f\xb8\xdaI\xb1\x94U\xc5\x87\xd2A\xcdz\xfe@U6\xffn.WGX\xfd\xc0\xc1\x05\xe8H\xecRK\xc0\x16\xdb\x1a&\x08'swM\xb1j\x8a\xca\x8e\x98\x8b\xb1<\x9f\x94\xb1\x983\xa6)\x80\x96\x9d`#F@\x12\x0c\x18\x0cF \xd4\xa2\xe0\x08\xfe\xd8v\x8do\xcdb$x\x0c\x07\xef+\xb2\xe0\xbcu\xfb&\xb4}\x89|\xcaX\x18&[\xd9\xaa\x908F\x8b-\xb9E&/>\x8a/\x17\xd1G\xc5.a\xeaz^\x8a\xde/\x83\xd4\xfe})\x9c\x11\xb2\x13\x92\xf3'\x93x\xa9\x91$O=<\x01\xc7\xc2z\x99\xa4o\xe4\xa7\xe1A9M\x1f\xd8\x9d&\x1d\xf2~\xee\xa1\x99\xb93\x19r\xb5\x053g\x9f\x9c\xa6'\xbf8\xd2\xa3\\\xb0-\xb6MDz\xc8\xe8\x11\x98\xf8k\xba\xcd5\x86\xf9\xb1\xb4A\n\xdd\xc2\xfd\xaaG9\xa9\xe4|1-\xd8! \xc787\xfb\x10[\x9c\x7f\xf4\xa4,mR\xeeu|\xa657\xae\n\x1c=X\xfe\x91\xa4,\x98aJ\xa7\xd9\x1b\x16\x9b\xb8^t\xb4N\x9b4\xd3\xd8\\f\x10\xd0\x84]Az\x1bH^\x027\xb7\xaaF\x95\xe8\x1c\xfe\x95\x99\x84&k\"\x1bLU>}\xec>\xe7rB\xe5X(\xdb\x82\xaa\xeb\x82\x02T\x9a%\xbf\xab\x0bJ\xaa\x08\xbf\x84\xaddhK\xc4\x1f\x94\xf3\xb6P\x93\xb2K\xc1\x1eTFaA\x873HH\x86C[r;a\x9b\xc0\xb6d\x02\xb7\x99\x17\x87\x1a\x9554\xc8\xcc\x0c\x89\x97lL\x84k\x03jG\x0f\x1a{\xa1\xec8\x9fh~\xe4\x8f\x07\x0dfR@\x03\xd0\xec\xfc\x1e9w\xe0B\xa8\xa4\xe0\xd00\xeb\x0bzS\xf5\xf4\xb0\xe2\xff'\x97\xa0\x14\x02a7\x03\x82@\xdd@N\x9b\xb1\x8a\xdd\xc6\xb9l\x91b\x18j3\x0fhN\x04\x13\xee\xb2X\xf6\x8bF/\xc9\xede\xa2s\xa3\xd9'\xfa\x8aDsQ\xab\xf1<\xfek^\xd3\xed\x1d\xf2\xd7\xbc\xb2\xfd\x88ZASO\xa8i\x17d\xbaSJ\xe3x\x1cN4D\xbd\xb3\xc0K\xd3!\xb4\xb9\xd4\xf9	!\xd9\xabv\x89\xachA`\xdbE\x96\xb7X\x10\x90\x95\x00\x02\xbc\xca-\x0d\xa2P\x0d\xed\xc4:\x9f\x82\xdb\xd1\xa4\x1b\x7fC\xea:\xc2\xc2W\xcdzS\xbds\xc4dO\x0c:\x08\x10\xb6_\xbf\xab\xd4\xcb`\x8a:t\xc1a\xce\xb7\xd0\x91\x0b\x1e\xa5\x86\xb2\xcd\xd8\xb3\xfa\xa2\x16\x81\xae\x0d\xbcIY\xf0\x044\xc7\x0c# \x10\x90\xf8*\xd2\x1c\xcd+<\x03\xeaq\x00n\xb0o\xd4\x00\xb8u\nU\x08\x04\xcccww\x8f\xf3x$d\xb5\xb3\xf0\x1b\xc6\xbf\x0e\x9d}\xcf\x81\xfb\xd6\xc194\xcc\xfd\x9a\xed\xfc\x039p\xac*T:\xfa%G\x15Q\xe6\x85^a\x9f\x8b\x15\x87\x10\xe4\x03\xdd\xcb'\xa8\xe7e\x83\x1e\xf4b\xf6\xa8\x04\x14\x14\x8al-\xd5\xdc*X\xddL\xe7%*\xc5\xba\x08\x19\xb8.\x85\xda\x8a\xc8\\\x8a@pR$T\xe5*K\xd6\x18\xcd\x05\xbd\x08\xb8hp\x87\xc0\x88\xc8\xe8\xc1\x82\xdf\xe3\xa6m\xfa\xc1\x1b\x91\xe2-/\x93oS\xda3\x8e\xdf\xc2E\x8d\xe0\xcf\xceto\x7f\xb8\x07\x9e}\xe7\xd0\xb6V\x87o\xf5\x07eJ\x0b`<\x99$\xf6\xd9t\xed\xd8\x12\xbd\xdf\xfc\x1f	\xaa]g*\xdfZ\x9b\x0f\x84\xb56q\xb0\xc0\xf9l\x92\x04\xf8~\x1b\xf7E\xaf\xab\n\x86S\xfa\xb8/\x8a\x92\xf9i\xa3\xc4T\xc6t\xcdk\x82\xc7\xae\xe0\xb2W\xdd\xc3\xbe\x0c\xdc=?j\xb9\x00G\xa2\xd2\xcc\xd4UU\x05AJ\xc6\xf5\x0e\xfd\x9b\x02\x1c`\x86\xd2b\xd4\xcb\x91\x97\x83G\xc2\x88\xf5Q\xcdA\xcf\xab\xa9\x81\xf1\xc3\x96\xce\x15\xc6\xda\xecc\x83\xfb\xea\xbdW\xcb\xef\xa9\x15\xe8\x03WSm\x08\xdd\xc0\xadg\xb3\xba\xdaF\xcb\xf1\xaa\x91&\xa9^\x16\xf5\xfa\xd8\x98\xd4\xa1\x886;C1:=\xdb\x88P\x89\xe4\xba\x14\xd5`\xca\xda\x9c\x90VV\xff\x93\x1d\xd4E\x9d\xc65\"\xb4hO\xabX\xe0~\x14\x1b\xab\xde\xd8N3_5\xd3\x81]\xbaz-\xfe\xad\xe4\x92CW\xd3\xddt\xd4\xa5\x8d\x82\xd3\x88\xb4\xd0\x18\xcbe\xdc]\xb0\\\xb6\x94\xa9\xbf\x1dV\xaf\x19\x13\x96\x8b\xffc\xd4#\x1dm[\xc6ku\xde\x97\xad_\xca\xb1\"\xa9\xc9\xf6s\x8dH\xb3\x7f\xf4<}x\xef\xb1\x02\x85m0b\xe5x\x01H\xd3qb\x1f\x91a3tf\xe7MT\xdb\xd1\xcf*]I\xbb\x18\x1c\n\x15\xde}\xd7(\x1c\xfa\xbe\x9c,M\x94\x84\x8d\x96=\x8a	\xdd@\x8cJA\xdb\xc6\xd0d\x89\x90\xa0\xac\xcb?\xc2\xa76PV\xb1\xf6[\x0ddV\xe3v\xf4\xe64j\x9e\xd2\xdf\x9b\x91lH\\\xe2\xf7\xd4\x16\x8c\xc5\xe8{\x98\xd8\xf2\x02M\xf4\xe5\xbd\xc8\x98\\\xba\x9d\x8d\xe5\x01Y\xfe\xdc\x81\x80\x1c\x1d\x81`9M\xc3`D\x13b\x87<\xc1\x05\x12;a#z\xf2\x86\x91<\x8ax\"\x06\xf3,\xa8d\x82gCi\xbf`\x91c\x92\x9b\x16:\xc1\x01\x05\xc8\xe2I\xb4\xe2>jw\xb7\xcc}J\x05\xc8\xc9z\xa7\x8d^:V.\x1d\xfd:\xd7\xfe\xda\x8b\x13{\xbf\xcd\xbc\x06(\xc8\xb2B\xf7\xe6\xcb\x1c\xc9\xa6\x03\x92\xc9\xf3x\x8e<\x18\x1eDb#\"S\xa3\xa1{\xf4\x92P\xf9Hu\xbdN\x81/\x13\xeb{r6\x05;wU\xb6\x13\xe6\xd0\xf2\x12s\xd6P\x17\xd0\x9e\x93<\xa4\xe7X\xc0\xe0Y\xe2s\xd4\xc4\xf7\xdeMxu\xb0\x87\x14\\\x9ab\x00\x91\xdas\xb8$\x11\x8e\x98\x11x\x8e\xca(\xa2\x89/^|\x03^*\x180j~m\xe0\xac;#\xb7%J\x84\xdeM4\x9d\xc7p\x98QM\xd7\xac\xf0::\x1ab\\C2gf\x01\xb0\xb0]\xbdz\xd2P8T\x99 U\xaa\x93Qb\xd6\xe8t\xba\x83\x1dC\x1c\xbdT\x9f>\np\xa08+6g_2\x96l\xce\xa16\xa7H\xf2\x11\x08 \xda\xce\x00\xc7\x86\x0fH\x9d:\xf7\x0dd\x9b<\xe6C\xcd\xe96\xb3\xaf\xd8\xa4\xea/\xab\xbf6\x7f\xe3E:\xc2K\x8b\x94\"\xcb`kJ\xa9<\x9b\xcf\xc6\xa2\xe4=\x08\xf9v\x9e7\x84\xa5\xe2N5\xb7\xb5`\xb0\xf2\x9b\xb6Jt\x8b\x12\xd9\\j\xb96\xcd\x85%\x03\x0e\xcb\x9e7\xf4*\xa5'\x0f\xa5\x10\x95U\x95\xd94\xb1:\xe2\x1bX+\x0d\xe4\\\x02b\x00\xfc\x92E\n\x11\xe4\xec\xf4\xdeaf\xae\x8ax\x8c\x1f\x93}\xc1\x891+p\x99\x8bB\xa5\xcb0\xee6\xf2\x17\xe2\x94\xe5\xfd\x9e3r\xf5A$\x1bN\x14\x9a~\xb6\x12\xf4#\xb3d\xaa}\x08\xc7\xd7\xa4\x9fP7h\xf7H7b\xa3F\xaa\x9e\xc2\xa7\x85\x82\xac8\xf0\x11\x0d\x1e\xb3P>\xf8Bt\x19\x1eGN\xd0\x14\x15\x8e\xa2\xf0m\xe4\x01\x82x\xf4@\x8fj	\x85\x91\xb8|{\xc0s9\x12\x19\xe0\xbb=\x0f\xfewR\xd9/\xad\xaboDJs5\x16z>\x93;\x8a'x\xdd\xf1E\x06\xd0q\x15^\x06r\xe9^=G\x1a?\xbd\x859A\xea\xa1\x06\x7f\xe6\x96\xc7A\xe4_\x97\xa3\x06\xedK%\xb5D\xc9\xae:uikjk\xeeI\x18e\xc9\xe6\xbd\x1a\xacG\xfa\xd5\x9d#*\xa1\x86)\xb5jm\x06\x91\xe1|\xbdt\xa3\xb9}`\x01J\xe6\xa9Z\xd8\x88\xe9\xd6\xf7\x17\x07\x03H\x0f=4\xee\x9d{g\xdf\x81\xa2\xbe)\xa1qX\x88MA,\x17\x9aH\xf8\x8c7\x18\xfb1\x89\xebV\"\xa5\xd9\x14\x0fo,\xe7Y#h\x12\xfd\xfc\xf7\xdd\xa8S\x17\xf2_\xea;\x8b\xcda_\xd4\x97Z^cn4\xa2\xad\x10\x8d\xa0\x82H\xb8E\xab\xae?\x89\xab\xb0\x11}\xd1\n\xc8\x9d\xa1\xbb\xad\xdc\xee\xbc\xd9\xa4=}B\x9eWv\xde\xaaUe\xf0\xe5h\x9a\x17\x83\xda\x00G\x1d\x8a\x93F\x90\x85\x89\x91\xe6;\x9d@2S\xa5\xd8\x01\x9c\x80@\xcbf \x05\xfe\xc2\xcb\xfcn\xcd\xe22\xd0#\x8d\x8e\xe6\x1e\xb9\xf1\x13f\xddY:]\xbfJy\xe5\x08H]\x1a\xad\x95-\xb7\x98G\xd7\x8cwgv'\xa1\x07\x04\xe2|\x88\xc40e\xf1\n\xc3_7\x88\xf0\xd2\x90\xabn+f\x1e\xdf\xd9\xb8\xe2\xe0Y<\xab\xe7(\xcd\n\xaa?\xf6\xec\x92\x10\xa9\x91y\xf2\xf9\xa1%wm\xac+j\x0e\x83&&!\xe8\xa2c\x93^\xa1u'\x9db\xfc&\xf1h\x9fm6\x10\x04\xc2\xa4\x9a\xce\xfb\xb9*2\x0c?\x1c\xb4A\xc7I\x1c\xab\xb6\xc6\xb25F\x06W\xbe\xd8\x99[\xe2\xc6\x9c\x06\xa8B\xf5Uz\xefI\xceE\x94\x93!\x92m:\x8b\xd2\xfb\x9cxh\xd4e\x97\xdd\xc7\xaen\xbcz|]%\x0c\x8d\x90m\x11\xd9r\xc1U\xb8F\x8d\xda\xaf\x90\x05\x94\xf9\x11\x7f\xae1\xc6\x0b\x1d\x89};!\x0fn F\xbe&\xa0g\xf2\xda\xf1\xffP\x89\x86\xdd\x01\xaf\xaf\x1b\x1b;&\xd7\xf6\xa9\x9c\xf8\xef\x18$$\xb8\x1a\xe9F\xab)\x1a.t\x9bB\xedQ\xa83\xa6\x8e\xbd\x15(\x9eC=\xfa\xb7\xd3\xe4\xa6X\xc0\xce\xd8es\xd4;\xddi\xfb\xab\xb6\xad\xd9\x8a@\xbc\xd1\x08~\xfcN\xed\xc9\x1b\x1b\xce\xa1E\x01\x7f\xeb	\xd4SR\x8b\x14\x04\x14\xa1\x88h\x9d\\\xe9\xe8\xa3\xfa\xc1Be\xf1o\x18\xba\x86\xbd\x9c\xa0\xb4\xb9\xce\x01bT\xd1\x16\x84\x06n\xce\x92\x11ju\x02\xb9\xbe\xc0\x1b	\x07g@\xe4\xf7'\x04qQ\xeb\x94\x8enx.u6bVU&\xd4\x0c\x9b]\xb9;\xdb\xef\xaa\x15!C_\x0c\x84\x16\x06\x0b\x08\x9e\x8d5\xc6*\xdez\xb9\x1d\xc9\xba\xfbm\x80RQu\x91\xaaq\x82\x92\xe0\x16\xa6\xb1P\xfc\xdaZ0\x83\xb6}m\xf1\xbc\xa1\xcc\x06\xca\xf5n\xbd\xa6^n\xd5Or\xc9T\xa6\xe2\xc1\x91\xb5\xce:\x9fU\xe3'\xd7h\xc0\xe6\xa70n\x0fZ\xa1p^\x19R\xe9|DF\xaa_b\\\xf2@\x96\xd6m\x81\x82\xe8DE\xeb8\x81\x00\xc6{o\xe8\x1eGM\x89\xe1\xa0\x9c\x01q\xb8\xdd\xcf\x06}\xdc\xeeSd \x16\x14\xae\x0fC,\x1b\xfb\x04i\xc0\xdc\x9aE\xea\x1d\x12\x8a\xe9/\xb0\xde\xc3\x8b[\x18d8]\x8e\xd7,MCI\x9a\xce\xd0\xf3_u\x97,]V\x99\x81c\xf1\"\x97\xe4\xa4p\x18\xb0\x06g\x1d@\xec`\"y)\x8b,;B\xb3^e\xad\x9el\x10\xda\x08\x04\xa1\xaa2'\x80.(\x9d\xcd\xd0\xc4\x98\xe2y>\xe0-\x1a|\xceh\xad\x18\xdc\x13\xd3\xc4w\x9a\xfa\xfe\xea;\xa9j\xe5\xa5\xe8\x1d\x92\xed\xd5\x8d\x18\xd1\xd2i\xd4\xbd\xb1\xe4\xaf\xea_\x19\x08o|!@\xf6)\xc9\xa2\xdd\x1e\xaa\xc4=\x7f\xd9\xcc\x8cSPz\x9d\x97\xe9\x1d\x1f\x88*!z})\xbc|\xc6\xa7T}\xbdj\x18\x91\x86E\xa3tC\xacZ\xe5\xa1n\x8c\x8d\x17\xbd\x7f\xc3\xbd\x9c*\xd5\x9e\xf5\xc94\xdb\x86\xd7\xbd[\xb9\xa9\xb1\x0b\xbe9\x1a\xbb\xd0\xae\x05\xa8\x8e\xe8\x88\x17\x91\x06\x92\xdd\x93\xf5\x8cz`W\x08m\x14e\xf4o\x82\x8b|j8j\xad\xef5\xe1\x18\x909\xbc\xf6\xb5@.\xfa\x9aE\xbf\x18V\xcc/\xccZW\x05@\x17|\x97\x81f_\xe7\x10\\\"$\x1d{\xe1\x05\x9c\x91v\x10\xa1\xe0\xf2\x83\xf3\x9c\xc0\xc8/\xb8\x06\xf2\xb6;a\xd7\x16\x1c:Se\xa6i3T\xe4G\xcb\x10*\xeb\xce\xfd\x83]\xb8\xc6\xa1/\xcch\x14\xc02\x1dC32$\xbf\xd3\x01\x0e\xf4\xbf\xfc1}\xbf\x8cD\xa4\xcdNX\xc9\xf8\xfet\xec?F\xcf\x9d\xed~n,Pj9\x0f.\xee\x96>\xd7\xa3\xfc\xa8\xcd{\n9\xfd\x7f\xc9EN-v|3h\x86\x14\xf2\x91C\xc5\xd0\xb8E\x94\x95\x87 XT\xe0\xe2\xcb;P\x96$\xc3=\x8dJ\xd6-\x0f\xdd\xd5g\xdd\x95\xfd\xf9igz~q\x97(A\xe9<:h\x131\xb19\xb33\xe1N\xec\xcc\xbd\xf5Q\x89\x8b\xe3\xc7}CL\xd8\x7f\x90W\xf9\xdf\xa7\xc2\xd7\x8e\xdc~\x83\x12\x1b\xe1\x0d\x12\xdab\x99\xa5\"\x86\x81\x87\xcd|\xc74u}\xee\xf0\xad\xd7\x01\xd9c\x99y\x80\x04\xe0\x8b\xc86\xb0\xa12\xff[ \xa5\xd8\xd6\\d\xb8,\xb5\xd2\x8e\xd5\xb3b\x81\x11k\xf9\xa4\xccD\xe5\xe4\xbe%0T\xdcx\xad\xae{=;\xf6\xd4\xb7\x8b\x86\x01(\x84i\x08\x87\x0b\x8d\xd8LS\xb7\xf8\x13\xdf1\xbd\x98\xf8\xfd\xa9\xd13\xffN\xcfh/\xa46?\xe6'E^\xf6~\xff\xc6\xd4P\xae\x7f{sZ\xec\x1b\x99Z\xd3K\x94\xc4\x9e\x13B{\x92D\xcct\xf8&\x89\xbd\xd4z\x92\xd3\xf7)\xb5\x17Uoa\xf95Q\xa63\x8f\x91\xc8\x97\x88r~\xbf\x8e\x91\xbe\n\xa6\x01\xf4\xd9\xf9F]\x11\xa0$\xba<\xe8\x04\xfatm(\x9a}\x0c\xfb\xc3\xcfMB@\x87\x9e[\x9cGx\xec\x08\xceF\xd3\x05h\x108\x00\x9b#}\x88\xf4,\xa3#\xc0\x98u\x0b\xfdLaz(\xdeQh\xb14%\xd3x\x01m\x04`U\x13\xe0\x95\xd5\xb9.E\x11\xa8\xe3v1a\x92\x9e4\x0e_'/[\xa8d\xb1{Fx\xa8I\xca59\x9e\x8c\x0c\x83D\xf5\x11<\xea\xec&\x908V\x88E\xf3Fg\xc9\xc8\xd9\x0b\xe8\x8a\x98#\xf5I\x91\xe4\x9f\x8d2S\xb2\xcd\xee\xff_\x06\x0f\xe3\xa9]QqA\x13\x9an\x88\xd1_\xf0Q\x19\xe7\x07\x12>b\xde\x984g\xa1\x19\xa8\xad\x13\xb1-\xae\x010&\x07E#c\xa6\xdci8\xbf	vR/\xd54\xff\x18r\x9e\x8a\xeb\x08\x9aP7\x95\xa3K\x03sOW\x05\xb5N3\xd5\x8f\x1evE\\bq\x86\x7f\xfbQ\xdf5\x18\x12\x8dZ\xb9\xda\xbdVy5\x07]\x8d\x13\xbd\xd6\xf6\xe0h/	i)\xc5\xfb\x9d\xa6\x8e-/\xb4\xb0\xe3\xa1k\xb5N\xac\xd1\x8e\xbe\xc8\xc4\x1c\x13#e\xec)\"P\x17\xed\xf1\xfc\x08	{\xfdKSQ\x90x\x89\xb2\xb8\x9d\xa6>a\xe3&\xb5\xed\xb6\x8e<a,\xeb\xa6\x8c\x17HEH\xcf\xf2\xf3\x89\x0d\x02\x1c]\x94%,eD\x9e\xb3U~W\xbbl\xfd\x17\x8f\x03\xda\x9b\xab;c\xbe\xe1\x98\x93\xf7\x07`\xfe\x9d? \xa1\xbep\x91M\x0d\xb2\x0bl\xeb\xea.\x82P\xb2W7\xf5\x06\xa1\xd9\xa3\xc8.\x1a/\xf4W\x9c#;W\xf5d*\x96:z;E2\x86\xa8\x9f\xee\xf6\xe3\xfaj\xa1\x07\xf89\x13y\xc9\xdcA\xc7S\x90S8\xe8u\xc0\x8c\xb6\xe0\xac;fY8\xbbm K\xd1\xaf\xe8\xec\xd4\x84\xd4\xb6\x89\xcd\xa1>,\x84\x17\xa0\x0e\x0d_\xe8g\xa5\xb4\xf1-m\xe1c<\xd7\x18n]\xd0\xa7-\x14\xae5\x912c\xa8\xb9\xa1\xae\xf1z\x0d\xac7d P\x9cz\xf3\x13\xe5\x01\xb5\x19\xe0\xf2\xf0\xb2V\x84\xf6\x93\xfb\xa5O\x1dPvf\xbcR\xfe\x0cR\xa4\xd3\xc6\xe0\xb0\x939\x86Z\x0d-\x9f\xc1\x1e\xded\x12\x86\xf7\xae\x9a\x88\xbfC\x9b\x9a\xf1\xf3\xc7`,\xf6at\xc1=\x13\x14\x87k?v\xa2\xed4#P\x0d\xe8\xa4B\xcc\x16\x08\xa1\x9a\xd8\xa5\xb8/[\x17\xf5\x06s.<a\x150e\xc6{\x8f\xb4&\x8e\xa2v\xfe\x10\xf2\xa1a~\x01\x1de\x01\x08\xd0\xf38\x8b\xe8)f\xe4\xb1\x1c\x17\xdbn\x14y\x06\x92\xea\x02f\xe4BP\x1cL\xf9u\xf1\xb3Iy\xb2H\x18=S\xf82\xf6\xd1\x1d\x94\xd2\"[\xc3\xc8(\xd9\xc2\xbcO@\xedz*I\xb8\xba@\xc5\xf60\x97\xe4\xaa#\x98\xe3\xdc\xe0,\x1a\xd0\x00\x02\xad\xf4\xc5I$Q\xa1\xcfy\x0d\x0dc\xf4\xd1\x9eF\x0d\xeba\x8f\xdf\x9e\x03v\"\xb2\xef\x0e|R\xc7\xdc\x98	'W\x9c\x13F\xa0\x0cx?\x11\xfe+aN\x83M\xf6\xae\x8fK\xce`\xc6D\x05\xde\x03/\xe8\xb7nf:X\xb8I8:H	\xb1IRm]\x9bK\xf4\xba6i\x0e \xfc@U\x12\xcfH*N\xed\xd0o\x08F\xac\xe0\xfd;\x96\xb1\xa9\x9b\xe1\x87\x8f\"\x02W\x9dq\xa3\xbed\\\x93\xef\x8a\x88\x89\x91\xd0\x8d*C=#\xe32\xcf6x\x947\xec<T\xcf\xd5\x1b\n7y\x88\xd4rU>-bH)\x11\x11\xc9\xbaz\xef '}\xb6\xd7\xb6\xdd\xeew\x9c!\x04\x17r\xc1X\xce\x11Z\x8a\xb5	\xb4.:\x92Vn\xd7\x13;\xee-\xee>\x8a:\xe1\n\x1d\x026\x01\xe0r\xff\xbd\x87\x0e\x1dU\xc1cs\xd54k\xac\x11VW\xac{\x92\xfa\x89\xf0#\xad\x0f\x985\xdf\x910\xc1B\xdd\xe3\xec\xc7`\xdc\x9d\xff0u\x9a\xd1\".Q\xca\xc6\x1f\xac\x9bdB\xb4\x980\xa3\x94\x1d\xf5\x98C\x9e\xd0r\xf5\x1e]\xed\xef\xe0#\xed\xbaQ9\x08lq\x9c\xe0\x02N^\xf4\xd6\xb3\x8d\xaf\xe9\xf4h~\xa0NU\\\xb4 \xbc16\x9a\n~\xe9\xe8\x15\x93\x1c\xe1\x94S\x91n\x87T\xf2\x04l\xa2\x91\\\xfeTH\xd2\xb2\xda\x9b-\xd9\xc9~\xaaG~)$\x85oQ7\x1e-\xeb\xafC\xef\x11\xb0\xcc\x01\xc8\xec}q\x12%/\x1ca\x99\xa6\xb3vO\xb0\xaa|[q4\x96\x82\x8a\x92\xb3~Bc-$N\xdc\x1b7<V\x18\x85HE\x80\x1fi-\x99\x9c\x17\xe8R\xc8F\x93\x0cGNM\xe0{\xd0\"3\x95\x90\x0c\xfb49\x87[\x15\x84j<\xa0\x90\xe1\xb8\x1d\xacW\xd3\xad\x0b\xca\xe3h\xd5\xf8\x98\x02\xbfl\x91n\xdb\x06\xc3 \xfc\xc8\xd8Q\xd2\xa8\xda\x89G\x07cq\xa8\xef@w\xaf/e q\xff\xa3\xcc\x15\xe6\x01g\xce\x1c\xae\xc8<\x88\xa3\xcd\xc6\x10\x0f: \xa0\xea\xe1a\xe9\x92\xb7\xa2\x91u\xaf\x10\xea\xcd\xf1\x94\x95_P\x8b`\x0c\xdd\xf9b{E\xeb\x1c\xe1\xa6I(\x16\xcf\xd9OWG\xdd\x1c\xe6\xabfEy\xc0\xdc\xe9ABa_\x9e\xdf;O\x08^\x8eDQ\xa3\xe2'\xe8\xb5s\xf3\xe5\xe7\x0c\xee\xd0\xec\xf3`D\xee#\xd1\x9ai\xaf:\x18\xd1\xb4\xdb+\xdf\x16Y\x01{\xa9{\xd2p\xe5&\xb6\xc5\\\xdf\x1aRa\x9e\x9a\xc0\xc1\x97g\x10\xfe\xcf\x9e0\xff\xc1\x1fg\xfa\xefT\xf9L\xcei<'\x9f7\xf6\x0f\xa6?\xc0\x05\xd2\x08\xe7X1\xb9\xc0\xcfC\xef\xd6\na\xa5\xbf\xe9\xeen0o\xb9r1\xd1\x0c\x99\x1e\x17/U\xad\xa5\x89\x9d\x05\xf5\x0b\xceo\x8f/\x0f?\xe9\x95\xe2\x99\xafa\xf9\xd3_\xacp\x15\xea\x8fH\xd6\xb1\x0dG\xf5\xec\xb4\xa0\xa6\xc28\x9f\xdd\xa3?3F\x890\xf0\x07\x98\x80\xd9`%\xc3\xf7\xcf\x91\xc4\xd3<\x8d\nG\x9a]\xd4\xbd\x9c\x198bl\xcd\x8f%-,\xc2)}%\x9e\x03J\x94:\x16\xb9Y\x02\xad\xd2j\xd0\x1b\x10T\xcd;\xd0\xab\xc8\xb65\xc5\x92>\x9e6\x1c\xbd\x9f\x90w\xd2{\x0f\x9cV\xe9\xa4\x83.&\x13\xa3\xf6(\x86\x0eo\xb9\xa9*\xf5n<\xa7\xd8n9\x06\xa1\x06\xc1J\x96\n\"a\x87\x07\xa9\x0b\xd0\x94\x08\xcd\xdd+\xa1\x86\x0ba\xca/\xbb\xfd\xba\xba\xf0;7zD\xd8Z\xce\xb7\x11{\xd7t\x8fM	Mp\x97\xa3	i\xd8\x9ak\xbcNPw\x88\xd8\x91\xcd\xba\xf0H`T\x0d\xf6$23\x1b\x96\x86f\x1e\xd3\xf6\xc0\xd0\xda0\x9az\x1f\xc6\xc8;\xad\xa1\xa6\x9e\xe7\"\xf0]\x8c\xf2\xaa\x82*\x8eY\xb2\xa4\xe9\x10,\xe4Q\xa1W\x81\xd8\x1b\xe0\x0e\xf4\xb8lS\xe9\xb5\xc6\xc5O\x8erW$5\x06]K\xa1V\xd9\xbbB\xe2\x16\x85\xdc\x9a\x85I\xb8\x18\x8a\x18k\xda|\xdf=\xb2&\xc1[\xd4\xe8\xea\xde\xd1\xde\xc558E\xd3R\xa40\xde\x8bGk\xabs\x1bS\xee\xf1\xc1n\xe3\xf2n\x11nu\xe3\xfa\xf1ExK\x8d\xd0\x7fr\xf4\xa2\xac\x8c}\x87~m\x1f\xf1\xd9`\x10\x8eG4\x02u{\xd0\xd1\xf1=]6f\xa4\x00\xf7\xe2\x08\xd7\xa8\nBo\xd6\x1e&<\x0d\x99\xc3\xb1c;2\xa0\xae\x10P$\xc3\xc7\x83{mW_c\x1b\x9e\xf5\xc2\xaa'B6\xd0\x8a?$\xbd^z[\x8fC\x03\x97\x1dY\xb9\xdd\xad\x99\xe9\xa5j\xd0N\xf3~\x0b\xfe\xa6\xdb\xae0\x05\xbe\xbb\x9b\xfat\xa2\xaf\x06\xfa\xb0\xdb\xe2\x846/)-\x891\x7f:p$D\xea\xa5\x85\xc8\x97\n\xae\x10\x1a\x0e\n,'\xb3\x86\xfcy\xe0\xf5\xb1\xf8\xc1v\x98\xc4 \x85n\x9c\x8bF\xb3T\xd7\xd1\x81\x99[\x04'a\xa6Mb\xceJ]\xbb%\x90&\xc3\xae\x10\xaclc6\x02&\xc2\xe8IpF\xe5\x90\xc4\x0d\xa8\xdco\xf0\x8ci\x83\x06\xaa\xc4\xc9\xfe\xe3\x155\xb1\xa0\xf8'r\xa8\xe4\xcb\xe5r\x91(q\xbc\xef\xe8\x90\xfa\xae\xeb\xee\xbez6\xc1\xb0\xf6\x9e\xee\xc9(5\xf3\xd0\xe1E\x0e\xf4\xe0\xc9\xa2\xd5\x9fl\x13\\\x1d\x85L\xf1\x9dk\xba7\xab\xb01\xc5Y4^)\x02b\xd9\x97\xc2\xa68\xf9\xbcy\xf8\xc6\x8f\xaa\xe4\xdb\nN\x9e\xd8=\x83\x9b9zT\x96^[T$\x87dk\xc2\x19\x9c\x0dQ\xe2iK%\xe1\x886\x8e\xb5\x90\xfcq\xb5\xe9\xe7\xf5\xcc\xeefO|\x03\xe0\xda\xe0c\xd08$\x95ji^v\x1b\x04r\xfe\x02.QQR\"\xe2Y\xe1r\xc4\x8a\xe3\xe2\xf5\xb8\x0d\xa8\xc3k\xf8\x92\xa5\xder\x9f\xba\xbcK\x0e\x88\xa2\xb5<QI\x89\"\x11\xb7@\xb4\xef\xeaR\x10\x149\x0d\xf6\xc0\x0f/\xbd\xab\x18\\&7Y}m\x89g\xd2\x8a7\xbb\x9c\x1cz6\xb8-M\xf9u=\x82\xc0\xe9,\xf5\xfeN3O\\\xba6\x8c\xc3aDA\x8e\xbb\xde\xae\xf0Ld^r\xeb\xc9/.\xae>\xfb\xa0\xe6\xe8\nN\xb7e\xed\xcf\x08Ri\x13\xfb4\xa6\xbe\xd5!3R\xf9\xa2\xba\x15\x90\"\x8d4\xa6\x88\xc8\xf1\xfa\x9an\x99b\xe1m\xc9-y[X\xa6\xa6\xff\xcf\xf1.\"\xc6\xf4\x19!\x94\xf8\xdcQK\xaf\xe5E\\\x07N\x8f\xeb\xb54g\xd5\xa0\xd7\x9d\xf8\x05\xa7\xbf\xa6\x83\xef\xb1aN\xa6p\x82\x0d>k)9\xc1\xc10\x88B\x8dZ\xea\xccBs\n\xf6\xa5y\x8a\x19r\x8e\x9aer\xab)v\xaf\xa2\xaeD\xf3\xebt\xe8rv\x81\\\xfbv\xf9[\xad\xfc>\xf3r\xb5Jm\x9c\x81\x02\x96\na\x9c\xf2\xab\xb5\xcc\xbc\x9b~u\xdd\x17\xea\xea\xd5\x8f\xba>\xb5rMZ\x9c\xb0\x98c\xedB<\xf8\xe3\x0f`)\\y\xd7t|\xdb\x8d\xef\xffr'<\x86\x18\x1a\x06\xf4\x98\xe0>\xf9\xd7\xd6\xfe\xe3[\xe6\xc3\x8e\x97\xef\xad\xe8h7\xeb\xfa\xad\xfeZ\xc5\x10\x04\x8c8\x7fcaI\x81!\xb9\x0d\xb4p\xe2\xa2\x9f\xcd\xcc\xae\x00,\xb6\x0fG\xc3\xed\x0b\xbbk\x07\xa05@\xc8\xd9\xf4\xf7\x08\x1b\xff`\xf4\xc9iw\x0d\x88\xd2n\xd0\x9e\x1d8p\x9fv\xbf \xe7\xc9\x13\xe9*\x8f\x9d\xb2\xc2'O\n\x0b\xdd\x1d\xd4\xfc\x8a\xb2\x14\xa0\xddA[\xc8.\xa1\xa4r\x8f\x16h\xf3T\x0dpR?+;\xcb\xff\xf3\\\x11*H\x8bsLq\xde\xe6\xebU\x9a\xb9f\x96\xe2:ql-\xc4\x87\xa4\x0c\xf1*6!\x85h\xe7+\xcb\xac\x04\x00{h\xb7\x89\xf6- jg\xb1k\xc9MM\xc9\xd7P#\xe3\xb6\xe4:\xbc}\x91\xb1\xb8{/\xdd\xeb\xeeV\xcb\xdf\xc5\xb6C]\xec\x98\x99\xea\xb7&[\xb3W$\xda\xab\x01\x03^\xdf#\xe0\xfb\xb8\xb64f\x1dWa\\\x0d\x8b\x05\xc15\xec\xf0\xe8\xba\xbaM[6\x9e\xbd\x1c)T\xa73\x97\x95\x1b\x15\x9b~\xfc\xda\x1d\xce\x0e\xad\xc9\x12\xd4\xc0\n\xe3:. Z\x94\xa6\xbc\x02\xa8`s\xdei(\xcdR\xf4\xa9Q\x85\xbc\xb2\xcc|/\xfa`\xf9\nil\xcf^\xb0L#\xa0\xa7\xf7\x1d\xf2f\xa4-\xf1\xd7;-C;\x13_\xdc\xde\xf9*\xf9{@EMCoo\xc3\x82_\xa4\x9c\xc6\xc3\xf57\x17\xbeT\xf6\xe3rqz\xdcF\xb5%\x17\xd7\xaf|\x99\x9aU<Z\xa4\xdco\xc1\x13[TA=\x8e\x84\x04\xd0'DPJ]\xb4;,U9\x19\xaf\xb5\xcaQ\x9b\xb1\xd3p\x8a\x9ek\x06\xf14~\x80\x1d\xea\xe1\x06\xc1\xe2\x06_\x05\x8dC\xaa^\x99qE\xa2\xc5\xae\x90\x9cb\x0d\x81SGs\xda\xf8\xdf\xed\x7fY\x85\x9d2N\x96A\x0e\xae\xd2u\xed\xae\x1f%\xf0\xf0SD\x84\x82 \xd7hj	\n\xffy;9$\xdf\xb4IA\xa8\xd5h\xe4\x04EO\x8f\xcc\x11\x84\xe1\xb2\xcb}\n\xa8\x16g\x89\xb3\xac\x85\x14\x97/+ \xf9\xd5\x83\x93\xef5\x9dJY\xca @\xe4\x07G\xfa\xf8\x8d\x8d\xfc\xbe\x82\xea\xaef2\x14\x90\xa2\xb4\x04\x97Y\xa0\xc4\xe7/\xb8\xc2\xdf\xbc\x99\x7fe\x84\xdf\xb7\xb9\xb1|v\xde/\x16\x1f\xb8\"\xde\xff\xd5p\xe5\x80\xd8~\xe5\x88\x8b\xf1T\xe3\xf48\x1eOK\xf3r*\xd2\x0f\x9e\xdd*\x0d\x86\x83\x1d\xc0\x134hi\xe0@Q\x9b\x993g\"\x1f\xd1\x06j\xb2\x9f\x1c:\xf4$\xfb\x95;\x1d:\x94\xfd\xa4f\xe0\xcd\xfc\x96\xf7\x8c,d\xbd\xae\xaez\xcd\xc8\xc8\x9a\xd9\xc6\xd4\x8c\xea\xba\xb3\x03\xb0\xab\x1au%\xe7\xa0\xcb\xa3}O\xf5&\xb3\xbe\x82i\x192\x0fU\xe8,\x0b@\x02\xcdk\xeaj\x0f%u?\xdb\x1a\xe34\xa7N\x9cKm\xf6\xde\xf9\xd0d?5\xc9\xdd\x93;\xca0\x99Y\xef\x9d\xda\xfce}sZ\xf4\x80\x1b\x87\xaa>E\xc6\xabUs^\x14\xdd\x9cv{\xa0\x7f\xeb\x04\xa4\xa6fQ<\xc4\x90\xa1\x89VP\xfc\xef\xc3\xcaT\x0ef\xcd\xa6\xee?\xa5\x90\xf5m\xd8p\xd9P*\x00\xc8&\x01\xa6\xf7\xd0Q\x87G\x89\xf9{c\x9c\x03J\xef\xf1EP\x18e2)\x8exP\xbd0\x05A\x06\xd1\xdf\xcd\x01\xfbM\xc9\xaaZH\xb6j\x95\"\x11\xd7\xbb\"\xd9A\x05\xac\xd0C+zq\x89m\x04V\x11z\xe1\x96\x9e\x05\xf3U%\xd8C\xb5\x00:\x16@1\x0e\xe6\xe3\xf0W\xb9\x8a\x0c\xee[\x11y)\xceJ@\xf7o\xb1b%\x0c\xf7j\x94\x15A>)N\x0f\xd2\xc7\x80\xd4i\x7f\xe7\xbc$\x92A\xf3\x88\xc0\xect`>\xcc?f0g\x00\xffH36p\xe86\xe1\xccD|\xfb\x04M\x9b\xe4\x0c\xe1\xf6\x104N\x8d\xa1\xb0\n\x9c\x92 4J\xbdJ\xda\x83\x1e\xaf\n\xb5j\x07\xa4\x9e\x98\xc6\x87\x01\xb4\xf3\\\x0d\xedp\xa03\xd3\x19\xf8\x1c\x8e\xa38\x8d\xc0\xa6\xaa\xd1\xe3\x96\xd0\xaf\xef\x94\x13\xbb\xad6p\xae\x11\xf9V?:\xac$\x82sD\xf9\xc0N\xfa\x12\xb5\x0e\xc6\xb9\x912\xef\x92n\x92,\xb6\x84H\xddO\\\x82[\xb8\xf8\xd5\xb8\x9b\xf6K\xd9-)\x9d\xabW~\xb9i\xe9m\x99?\x18\xff\xae\x83T\xd0:\xb0\xcc\xf0\xde\xbaU\xd6eY\x8c\xd3\xe3\x8a-#dJe)\xaf\xb1\xda\xcfZ\xaa\xd55\x94?\xf8$\xbb\xe6\x0e\xa1\\d\xa9W\x19<\xb7\xb9\xb9,\xc9\x86\x7f\x86\x9a;\xaf\xd8\xb7\xb8\xc35\xcd\xcd\xf2S\xb8\xd5\xb8\xaf\xbc\x1a\x97T\xabT\x96\xf1\x9a\xce\x08\xcc\x84f(\x81PY\x0e\xb0v=Q\x0d~DX\x7f*\x07\xbc\xdf\x0f\xdd8\xf8\xe8\xbe\xa9s-	\xc2\x08\x05\xcb\xa8\xae\xce\x80\x0555\x02\x0c\xad\x0dX\xa2R\xa5l QC\xcf\x08\x18\xe1\x19\xa4\xce\x0c\xe1\x93\xf8\x03\xd1\xc0l|\xf2\xfd5\xce{\xfb\xd3\xa6T\\t\xea\xbc\x95+\xe9\xef\xa3e\xbbn\xc5\xdb\xb8\x8b\x92\xc2Ps\xd3\xe8\x1fl\xfb3\x15\x99\x9d\xf9UO\xa9[\xfc\xdb\xee\xc7Z\xbb\xc9S3\xe5\xc0\x9d\xee\x9f\x9d*\xe8\xec,\x98\xaa\x86\xdf:\xc3\x9bZ\x1f\xfe\xbe\xc6\xd4L\x89\x9b\xac\x86\xd5\x05S\x9d\x9d\xf4\x15'\xcc\xb5\xe6\xe3*\x07\xf5\xf2\x8c*@\xa8\xf8\x19\x9d\x1f\xc4\xb1~xgno2\xb1\xb9\x19\xe1\x16\x88\xe2-\n\x85\x8c \xb3W\xb3\x14\x8a\xab\xbdV\x1c\x00;\xe4pZ\xe5\x049\x8d?\x13~\x84\x18\xab$\xab6\x9f<\x94\xb5Qr\x82bQ8&\xf3\x14se\x1b\x95\xc9Eb\xaf\xdaQ\x14,\xb7\xfe^|B\xb2\xb5\xef\xe7\xa2\x98\xefVd\xacV-\xb6(\xdc]\xe3 .\xef\xe8\xcb\x8e8\x1f\x12/qhV\xa1\x1bnR\xae\xf3\xaeQ\xc8D\x89*\xf9U(*1h\xe71\x14\xc3`\xd8\x9dQL\x12{\x07\x85\x81Uj\x0b\x0b`\x17\xe0\xd2\"\x9ao\x1e3\x00\xdc\xbb\xe6\x99V\xa8\x02l\x05\x85\xb5:\x1c	\xd1\xed\xea\xc2\xd8\xc0\x0dja\x04Fa\xe0\x10\x9eE\xad\xb6\xcc\x9eZ\x88\x8bg1\xb1\xb7z\xfc\xb0\xcc2\xd6\xa0\xd5:\x04\xcdAu\xd9ZIf6\x96\x83\x012\xd5tw+\x08\x8a\x89\x89\x17f\x19\x81\xa7D\x8f\x8b\x1e\xef\xc9\xe8\x11\xaa\xa9\x11CL-}\x14g\xbb\xb5Z\x18\xb30>\xd2\x84\xf3xJ\xa2\xfd\xff\xc5>\\\xee\x90\xc1\xebQ\x89\xb8A\xda_C\xb6i\x82h\xdf\xd2b\x0fl]\x0d\x05\x1a\x876\xde\xd5\xde\x1d\xdc4\x1e*\x0e\x9aA\xcb\xaf\x16\xc9\xb0\xfcqX\x89\xa4\x047\x84\x1b\xbb\x14Y\xf2X.\x80-\xbe\x8a\xda\xd5\xb8\x95a\xc9\x87\xc3V\xe2h\x17\xac\x96iKg\x95\xd4\xcfqN\xb3R\xc4\x86N(r\x11'\xc1]\xbc\xe0%\xd9\x98\x84\x8f\x85\xad\xf4\x8d\x88@3\xd4\xcd\x80\xce\xc2\x81j\xa7\x16Z\xac\xf7J\x86.\x1f;\xfc\xe3nm\xdd\xfa\xaf\xd5\xce,S\xfb\xfb\xd8\x040x\xaf\xb3\xc3\x1f\x01\xf5\xf8\xd8\xcd\xbb\xa3OF\x0733\xad\xd2\xa7\xb6\x85\xab<$'\xdb\x0e\xbb\xb8G\x97E+\xb4\xda}\xa5\xa5\xce\xf3\xfa\xf3\xa7\x85'1\xf0f3\x9b\xc6\xfd\xd2y\xd05\xdd/&\xa4Z\x9c\\\x1aRB\xf47dm\xed\xf4]\xe6\xbc8\xa7\xa7\xc2\\\xcd\xfd\x01\x843\xdf\x82\x84\xc8\xaa\x98@\xf7\xeco\xbf\xfbT\xe9\xbf3eu^\x12\x1d\xb7W@\x8a\xaa\x15\xfc\x94\x96\x8e\xa6e7l\x96\x1e\x07!B\xe3,\xc0s\x82\xe4\xe61\xdc\xcd\xdf$\x9a\xe4\x1b\xf2\xaf\xdbZ\xa7\xe3&\xd9\x14\x92\xe7?\x03\xaf\xe2dC\xe9\xe1 \x9d(Y\xd0\xa6Sm>\x82J\"&pt\xde\xdc\x88\xaaP\xe3\x87\x84\x03B\x1b\x01F\xac\x14\xf8\xb4\x9d\xda\x04\xb1\xe0\xd9\xf84\x8cG\xe15\x9c	t^\x1d\xc4\x86$\xaf\xde\xf2j-a\xe3\xa0\x8dg\x1a^\xc1\x0e\xca\x90C\xa4\x12\x96\x85\x83A\x02s\xd6T=k\xa1TS,|\x0e\x80r\xe0\xe5\x0f\x9a9I\xb7\x0f\xbdB\xcf\x98\x07\xd0\xac\x86\xf6'\x01\xc2\xecvG\x00A\xb6\xce\x11@\x90\xcdt\x04\x10\xc0\xcchQ\xd5Nj\x86&\x18\x80\x05\xe5T=\xce\x03xt;2]\xaf\x12P\xa1|T-\x07	L\xc3\x9e\x83\x92\xc9\xe7\xbf\xf1e1\x14\xe3\xdd\xbd\x04W\xc3Z\xc5\x9a*MrH5?\x84\xf1\x82=\xe0\x00\xfd\xd1o\xb0\x03\xac\"\xeb\xc69\xd1K5\xce\xf8=\xab'k\xc9-*\x07\x95\x84\xe8A\xa6\x12\x0f\x16E|	\xfe \xde q\xd2\x94\x13\x91_?\\\xa37%\x1e\xf6\x8e|M6\xb0f\xaa+\x93\x93+\x92S*}\xe7W\x00_\xdc]3\xaa\xa8\xfa\xb6fm\xdc\xae\xd8\xd2\xcb\xb3\xd2\xdcm w!\x96\x97\xee\xf7\xe5.\xdbR#\x89\xe9\xac\xaa;\xc6\xed\x1f\xfa\xa6\xb1q\xa0q\xf371\x8a\x01\xd6\xe4$\xc2\x95\xdd\x99\xd5\xaf_\x19\xc0\xf3iK\xe0&\xecJ\xa9\xce\xacM\xae\x8a\xac\xf6\xde\x1a\xc7em\x12\xe5V\xc45P\x7f\xcf0>\x14\xbe\xbe Q\x9d\x15\xe7\xb55\xaa\x86W\x95\xa9H\xadIh\xd7\x1a\xe5\xf9&\xf94\xd2\x8dIl\xd3E7}\xe2s\xc8\xe9\xc4m[c\xc8\xbe\xec\x01\xa2\x84|\x8dd^	\xa2\xec\xf7%Uv\xe9\x011\x0f\xa6D\x07\x93\xb2>\x93.\xe8T\xac\xd2\x1b7*\xe9=t\x83Z\xb8_\xa7\xe3\x9f\xbe1\xd0\xa5:=0pZ\xfb\x9a\x066\xd2\x8b\x8aN\x04\x84t\x17\x14\x00(\xe5\x17u\xed\x0e\x1e\xc6\x9d\xad; \xc7B\xd2]\xb3\x91$\x80k\xa1\xda\x8c\x80\xc2.\xf3{\xaaF\xc4*\x03\x12/U\x1dZ\x92\x1f\xc6N\x08\xfc\x12\xe7\xa0\xa6|oq\x8a\xca\x15K\x97G;^\xd6\xe4\xbe\x9e9N\xa7\xfbe\x1f\xff\xedxK\x8b\x0c\x92\xa1\xa8\\\x87wh\xfe\xf8\xf1~\xa1\xf2\xf2Z\x02pH\xd4b\x91\x12\x8b\xcd\xe4\x89\xb8\x1e\x0c\xbb\x88\xdb[k\xb68\xe2\xc9\xcd\xcck\xf7\xe2.bX\x0f.Q\xbeXp\x02\xb8x\x0eYa^\xb5\x18\x02\xd0\"\x98\xd1#\xeb\x9f\x18\x99\xe3B\xb3\x10wnb\xa4\xbf\x11\xf3\xe5\x90u\xd3\xf0\xa0\xe9m5\x9eF\xb2\x0f\xbd~>\xc7\xd08\x1f\x05\x80\xad\xc1b\xfd\xfa\x8e\xe4N:\xddp\x1b4\x0b\xb5\x01[gv^\nB\xbd\xd3F\xd0Uz\xfb)?\x9c\xbc60\x8f\xd0F\xc9\xc9\x078\x98\x82\x00\xc2/\x042\xa0\x8cC\x088\xa8\x8c\xae>\x18\x9dN8G\xee\x8f\xcd%\x10l\xf3%\xe8\x1f\xdd5\xbaFH\x98{4\x846h\x1c\x04\xa7\x8e\xef\xb84\x8e%\xc6\x01#\x0d7\xb8\xe8\x9b\x1d\xf1\x8e\xcd\xfa\xcbx\x0c\xf3o\xba\xdcN t\xaa\\\x95'\xdf\xc8\xa8\x0f\x0d\xa8 \xfa\xe6E\xa3\x8d\x8e\xe6\xbd0#\x83\x12\xefj\xb8N\xc3\xa3V\xef\xd3\xb9d\xe0?WlcW\x90\x81\xd7\xf0\x8b\x0b\xc4\xed\n\xc5\xbe\xbd\xd6\xb5\xb5u\xfb-\x93\x06\xbb}\x0f2\x842\xa8\xb6\xa5EN\x90\xbf}#\x87\xe4\xb5\xb52H^a3\xf0\xf5\xbb\x19\xa5r\xbb\xc1qs\xa7\xa4\xb0\x88\x84-\x8fS3&\xc8\x04\x14\xef\xf4\x84f\xb4\xed\x87\xa3\x0e\xcc\xeb\xcefwl.\x9a=W\xf88\xe5\x84,\xf5\xe0\xd2cH\x03\xe1\xaej\x9ecT\xea\xb1W\xae\x0e\x91\xd7\xa0\x05s\x819\x0e\xf20\x9e\xee\x94Z\xe0D\xceM\x11\x93\xfa\xbeC2\x92ZM\x92\x8d\xdd\xfb\x90dj\xb5\x8ct\x9f\x16\"8\xc0:g\xed{.\xc6\xb1\xb0\xd01Fb6\x831\xc78\"\x06y\xd4\xa6>\x98\xf5\xbf\x0c\x92\xadW\xc09\xa3\xeb \xd3V\x9a\x1a\x8a\x8a\xf6\x0b\xaf`\xd7\x12j\xbf\xfd\xae\x16\x9a\x8f\xbfT\xf2\x94\x94\x91\x91\x80<I\x11\xa3\xbdM\xd4\xb1W'%\xadf\x1b&\xb8\\y\xe4Z\xebdk\x01\xcd\xb4\xe8\xf9R\x04y\xd1jw\x98\xe6\x05\x15}\xf9\x88\xd0\x80\xcf\xdf[8\xc2\x17\xd4\x8d\x02\x86\xbb\xa3\xc7bB\xed \xa9'd'm\xfco\xfb\x12'<\x9d\x11\xf8|E\xd4\xca\xcd5\xea\xf5:\x15\xb3\xb9\xda\x8bo\xbc\x9a\xa9\xc9>\xb2\xb5r,n\x83\xa9i\xc0\xad\xc1\x0d\x0d<T\xaa\xb8S\xb9\xb9\x9f>\xa5\x16d\xb3\x85 \xff\xf4\xe9qN\xa7\xaa\xdd\x0c.g\x04+ \xefS\x07\xc2\x1a\xeb\xbc\x0dQ\xfa\xf9\xb7\x81\xbe\xeb\x0f	\x0d\x81\xe1K\x02aB\x08\x01\xbe\x8c\xdb\xe0?_\xed\x8b\xdbQ\x8dE \x87\x93\xb5r\xb8\x86\xffj\xa4\xee\x82h>\xf4\x95E\xa6\x90\xd3\x9b;\x13\x8fC\x9d\xd7\xad7\x7f\x85\x8b\x1c\xb7^q\xaf\n\xc6`U\xafe\xfa#-\x9f\x98\x18\xb7;oJ\x98\xc4\x8b\xe3\xd2\xe6\x8e\xd4\x9d>)\x0b\xc7\xfd\x82;Jg\xed\xa3\xcf\x7f\xd7\xad9R;Og\xed\xa2\x1f\xc5\xfdiI7\xfa}\x97\xe28K\xa1\x92\x9c\x1f\xdb\x81\x04q\xa6j\x8f\xb9\xd1e\xd8\x93\xa3+\xd9\x97'n\xf1\xcf\xb7k3\x8b\xc1\xad\xbb\x07\xfceF\xcf\x81\x03\xfb\x05\x9e\xec\x0e\x850\xb1\x9a\xf2\xaf\xdfV#\xa9\xed\xc6p\xa5MAzb^P\x8e\xf7V\xcfu\xa4\xdb~\xde1u\xba\x97\xd2\x93\x95w\x1en\xc8	^\x9b.II\x97\xa1\x8a_\x1c\xc6\xcc\xdavdW\xae\xc8\xf6\x8f\xf3\xce[Q,\xcd\xde\xe8+L\x0f\x04\xbeb\x82\x16\xed\xbe\xc9\x02\xa5\xe5\x84\xc6\xc4\x87q\xbc\xfe\x0d9\xabV\x1c}\xef	\x94\xce\x8fV\xd1w4qU\xe43&j\xdb\xc4\xb1HYb\xbc \xfc\xb9\x88\x0b\x15\xbft\x15t\x8dT\x9c\xf5\x887\xcf\x81\xf2\x92\xab\xd9a\x16rBwP9?)\xdbu\x95\xe9\x8bT/\xd9a\xa3\x95\x8eA19\x96\x11\xb1k\xaaM\n\\\xd3\xe4P\xdd\xdfs\x9b<\xd8Ta\x9e\x8d\xd0\xe3@\x82<?M\xe2\x0b(\x10\x7f\xea\x08\xbc.\xa1,'%?,\xc7%\x81a\x1c~e\xce\x05\xeb\x12\x8e\xc0\x9d\x8eU\xe1\x960\xb5\xcd/zQ\xd5\xf6(\xd1\xb8\xfd\x93\xf7\xa4a\x99\xac\xaap:.6\xabj\xc2\xffdF@\\V\xae4\xa6\xc9\x7f{\xd3Ri\xec\xfe\x19\x0b\x88\xcd8\xe9\xaf\xc9\xaa\x06nu\xfd\xaeF\xef\x98M_\x86\xa7=\xa6\xbd\xf5Z8\xe1\xa4\x03H\xe3\xee\x8al\x87sy5k%\xf5\xcc|\x17(\xf0i9\x02\x0b\"\xd96\xe4\xba}\xd4\x8b~WK\x84\xdb\x9f\x04\x91hY\xa9k\x8a\xca\xf6\x17\xa4\x13\x97\\\xe0\xfb\xd7l\x93Rm\x0f\x8e\xbb\xb4&\xd2\x0d\xba\x1d\xe6\xa6\xf1\xd8\xf20\xbe\xef\xc1b\xfb]g\xca\x13\x94\xb5\xbe\"\xc2\xe7\xde\x80D^\xfd\xb2\xe6\xbe\xde\x8c\xa8j\xff\xb1\x15J*)\x9e\x9a6\x03\xa8\xb5\x18\x8b-Yb\xd9h\xd6\xe0\xf7\xf2\xe9\nZ\xfd\xaf\xe9\xdf=\x04\xde\x91\xa6A,\x8e\xca(\x8e\x9dK#\xd0	\x0d\x96\xb2Of\xc8J\x02\x1b:\xee;\xbeI\x86\xbe\xc7!6\x01Yi&\xfbd\xd9\xe0\xd6%m\xae86#\xaa\xf6\x99Q\x81\xb5\xd2\xd4\xccW_\x91\x15\x1b\xf6A\x9bv}?+\xe8G\xe1\x9a\xca\xfa	cc\x0e*\x10\xffm\xfb\xf4\x92g`\xd2>\x85\x0e\xf5q\xb1\xd8+\x1c\xfb\xa3=\xd9[5\xc4\xcd\x94\xb7\xb6\xd6\xd7?\xb29\xa3W\xc0\xc9+^\xfdo\xaf^E\xe0\xe38s\x81)\xe5\x8ff\xe7\x0b\x972a\xf4\xe6\x01\x16\xadQ\x9f\x05x\x01\x1a\x7f\xa4\x17\xb7i\x87\xe9&	NE>\"^Na\xe4a\x9f;f\x8a\xd9\xcc9]NE&	t\x18^\xb0\xc0CL\x1az'\xe2e\x858ZR\xf1\x07s&6\xde\x02\xb27_\x00\x1f\xfc\xc3\xa3cyJ\x9e\x911\x1a\x0d\xc4\xfe@TZ\xb0?S\x00D2\xfb\n\x1a\x87|\xd4P\xf5\xd4\xcbO\xd3\x8c\xe9\\d\xaa\x1aR\xef\xde\xf0\xfb7zH\xd5\xf8\x83\xee\xb19i\xc8\x03\x00\x8bQ#\xb5\xbf\xb6\x82zr\xb3\xf3c.\xf24\xf6\x86G\xfdR\x9d\x134\xce\xc8qx\xa6\xf0\xbe<2~X\x92h\xb5\xf7n\x08\xe1\x19\xe3\x19\xe0\xa9\xb3\xa8\x06\xc52\x88auB\xadNC\xd1\x00+\x9b\xa2k\x97X\xf30\x0e\xd1\x0d\x18\x13aj5n\x03>\xde\x89\xa8\xf5\xb2\x12e3\xf6\x07\x11v\xde\xa7\x17\xd3\xf4\xe9<\xa5>\x81\xb0_\xb2\x9f\x90\xa0\x07\xdb\x0cuH:\xa0\x04\x90XR\x9d\xff%~9\xe1\x04!4\xf6\xfco\xd1\x0f\xd1\xbc\xa6\xe8\x1c\x02\x003\x85\xba\xe2\x948?\xb6\x82 \xce\x1f1\x01d\x1a#\xef\xd4\xd1\xfc\x1c\x96\x9aA&\x8b\x84\x84{A!i6\x0b\x8b\x8c\xed\xdc/Xa\x9d\x9f\xa3\x1a\xe1\x05\xe3\x87\xa4=\x12W\x16\x89;|\xef\x04\xf0\xe4\x1a)\x81 \xd0g\x16\xbe~\xa3\x0d?*\xbe\xe6\x82\xbd\xc3 }\xbf\xe3\xda\xa7\x88K\x11t\xcc>5|\xadE\x8e\xb5\xd0\xee\xd1\xdc\xd5.\xa7\xfd\xf4A\x07\xfb\x9a\x0bQ\xf16\xfc\xfa\x0d\x02\x07\xb2\x80\xbe(6\x1a\n\n6\xd1\x94\xc67\x00\x96\xda\xf7<9\xf9\xf9_\xf0\x95C\xc1\x0cf1\x0f\x19\xfe\xeb\xd0\x8e\xe9i8\x15\x06\xbe\xae\x86\xe5\xbb,\x0dV\xbb4$\xc0\x9fut\xc9\xf8\x9c\xf8\xa3\xc6i\xc1,.`v6r	\xe2\xa3\xf2\x8eP\x0d\xaf\x1a\xbdgFB\x90\xc9\x8e\xc7\nt\x1b\xf2\xc3\xe7\xda\x0dC\x013\xbd;\x98\x0c\x1f\x04\x18,\xbco\xc3\x82\x93\xe6\xe3\x9cx|	\n/K\xf3Mp\xa91S_\xbe\x91X.f\xf7V\x8d\xaa\x86#\xbcU>\xc8\x92\xc8\xf5\x88#B\xf6\xf1]\xb5\x0dA\x15\x1d\x8f\x91IVo\xc0\xcc\xd0\x86\xcf\xb5\xc0\x91\x14\x15\xbf\xfcGTV1nr+\xa3\xceOX\xc2S\x95%\x0b\x8b\x9b\x04\xc2\xb3\xb6\x99f\xa7OZ[\xdb_\xfd9\x9c\xfb\x11\x91P\xad\xdf\xb0\xf7 \x0f{Gl\x11n\x91\x05%\xdf#\xda\xdbh\xc0dw\xbfH\xa0\xf9=\x86\x7f \xb8y\xa9e/\xed\xaaW\xbc\x19\xb3\xb4\xb6>\x7f\xd2,\xd3\xf6\xac\xb0IP,*MV\x95\xf0\x84~\xc2\xbaK&\xe3e\x15\xa2\xc4\x8b\xbb\xfbM\x06\xec\xbd\xa3=\xf2)\x16\x8bqF\xbf\xa0S\xb6\xdf\x08\x1b\x05\xb4\"\xc9G\xd1\xebT\x9aF\x99\x8d*\xb9LX,h\x8a[\x97\xb4\xba\x93\xa7w\x8ew\xb4\xede\xf1WQE\xd9x\xda\xeb\xba\x0c?\xe1\xe8\x93{\x10^\xda\x86E\x8ex\xefh\xbb\x9di\xfd\xbb\x05\xa2\xd7\x82\x8f\x12\x84J\x94\xb3\xc3\xc0H\x8f\x07\xa5|\xf3^\xd9\xcd\x93\x8a\x85\xc9e*^\x89\xd0\xaf.\xe3u\xdaxE\x99\xe8\xeb\xcbb#\xee;\x9b\x92\xf4\xd4\x9d<]z]\\\xed\x83\xd7\x02\x81\xa8\x7fw\xdaN\xbbho\xbcchq\xb8E\x98\xa3=\x1e\xba\xe7\xe2\x134Q1\x1f\xb87\x0e\xfd\xdd\xe7W\xfc\xbd\xcc\x93l\xc3\x956\x8f\xe1\xa7\xbf\x14\xad\x12HE_\xcc\xa3\xa0\xf9qy\xff\x89\x1e\xe1\x0bY\x06R\x8e\xa4\xdb\xab\x1a<x=\xd4cS\xdfX\x15y!=0\xfb8\xc7\x97\xf3x\xd6\x0c\x98\x9d\xf4\xfe?\x1f\xb1{}\xa2\xff\xc0\xee\xdfF_\x84\xfc\xe1\xc7\xa0\x99z\xf8\xaf\x89kt\xa9\xc9\xb1\xf0\x887\xb3\xca\xda\x82|t\xfb\xa7+a\xaem\xb8<x\x07e$\x82\xe9e\x96\x8f\xe3\xc9\x8d\xaa\xd7<[\x1c\xb9T\xf7\xa6\xff\x8fX[\x1c\xfe\xe1\x9a\x1b\x0b\x9e\x7f\xf8\x03\xa3\xd9\xf6\x00\x1b\xbfs\xbb\x1dV\xc3\xcc\x8b\xab\xde\xa7U\x9e\xc9*\x11\xb3\xe1\x8ch\x97S\xa9K=Fe\xcbsw uY\xe9o\xcd\xdf\xd9\xafnQ\xab\x17\xb3=N\x1bE:[\xd2(\x7f\x17t]\xe5\x0dk\xd7|\xe7@\x91\xd9\xbfuZ\\9{h\x81\xb1\x8fv\x10\x7f\x18\x80\x14\xda\xdc\x95\xd3\x86.\xda\xa1\xfasa\x83\x89$u+\x9fq\xb9\x19w:#\xe3\x1f\xe6?\xe5e\xfaT\x893=\xd0\x14\xac\x07\xd0\xbb\xd0!\xb5p\xecPL`\xcd:\x85\x93\xdd\xd0R\x03;\x0c\xd8g\x08\xca\xae\x0b\x9d\x06Fha\x9d\xce\x90;\xaf\x14\x07\x13\xcc\x13\x865Ie\xa0+\x18\x96\xdb\xd8\xf5\xbb\x0e\x0c\x9d\xd7bt06AW40T\xcdhJcc<&\x03\xc0mJcc\xe0\n\xb8\x10\x0c\x8d\x07\xf3\xa1O\x1c\x1bCn\xabW?\xfc\xf9N\x07\xc2i\xfe\xee\xbeo](X\xd0\x84\xfb\x9f{\xf7Lz\xec\x98\xf4\xd9;\xbf\xf0\xd8\xf1g\xb9\xef|\xc7\x8f\xe7>\x18\xe49~l4s\xe6Vy\xf9\xad\x99`\x8a\xd7U\xdf\x9b,\xf9\x9f\xfe\xf1\xd7\xc5#_\xcau\xb4\xf9+De\xea\xea\xed\x99\xe0\xe9M\xd9\xfc\xa2~\x03h\xb3q\xaa\xeb\xb2\x87\x92\xb7#Y\xfa\xca\xe6\xf1z\xfc$;\xdb\x0c5\xcd\xaf9$\xb5\xcb z\xb2\x1d>\xff\n\xbe*j\xf5O\x9f\x8d\xf8\x8c\xf1\xdb$\x9c\xd0$O/\xaf\xc0\x0f\x15\xc3xR\xed\xbd\x83\xc2t\xfdf-}*\x9eo\xef\xc9\xa6\xf8\xd9\xcc|3\x86M;\x15x\xde\xa8\xafU\x94\x95\xb5l/.\x14\xf1~X\xc7\x8e\xafY\xe1\xbc4\x99x3&\xe6\xeb\xd7x\xae\";\xa4$\x8dKI\xf6\x925\xdbd\xda\xad\x0c\xbd\xca\xe1\xfc\xfa\x8b~w[\xca\xd4M\x19\x1f9O\xd8\xe3%4\xd2\xe1Q\xa8\x1c}\xe9\x19S^\x9e\xect\x96\x9d\xe8@\xd1\xcb\xe6\x0ew[\x9bY;-\xdd\xf6\xff\x8d\xc0\xbas;\xa2b\xbe\xcdwH-*\x05\x0c\xef\x96\x96\xc3im\xbd\xb6I\xca\x08-\xb6\x1f\x7f1e/\x95~\xf8\xa8TNN\xae.\xf2p\xb2\xdf\xf0)H$\xfb\xeb\xabW\xef\xdf~\x8f\xce\xf0\x03\x90\xb5\xc9\xc6\xa6\xed\xbcO\n(\xa0\xe99\xe8\x86,\xd9\x0d]gM6r\x1d\xea+\x84#\xbb\x07%\x83\xe0/s\xfcw\xafA\x18\x9c$\x11\xf5\x8cq\xc64\xcb\x11\x07O>\nd9}\xf7\x9d\x13+\xf0\xd1$\x8cs\xf4\x9a\xb3\xfd?\x030\xa3\x99\x14a,>\x9dy\x8b\xb9\xda\x88s<\xf0\xfe=\x86,\xf0\x8bc_*\\\xe2\x83D\xed\xbc\xdc}\xc82\x19M\xed\xb0\xcd\xccT8\x17/\x12\xed4\xe6g\xe6'\xda\xa6\x9e\x9d\xe28'\xfb}\"\x8bC\xe2\x03*\x84\\9\xbd#Y\x8f\x1f>z$\x8e\xe6\xf6\xd47c[s\x93|\"$}\xbb	ym\xcc\x16\xef\xd5\xc0\xabzQx 5\xb7%\xe5\xa0o\xf9\xe5\x93$j\x86k\xd0\xcep\x12)\xf1x\xbd\xc4\xfb-:\xba\x86\xd0\x98|?\x9d\x98o\xe3\xf8f\xa7\x87gFr\xc0\x9e\xdf2\x15\x1a\x8aS\x91\xc7Z\xf7\x8c\x02\x11q}q\x88\x8a\xb5	\x85o\x80\x1d\x1f,wy\xc5O\xa1g\xca\x13\x90CF1\xd6l\x98\xe7\x9f'\x06\xedL5T3\xf5\xf23\xfb\xd1\xf0y\xaa\xa6M\x899\xda2\"s\x94\x98\xf25\x14u\x1bD\x95\x8b6\xc0\xd4-J\xec\x89U\x08\x86b\x05s\xba\xcf\x18\n\xabO)\x83\xcc\x16w\xb8R\x0d-2\xe6/5f\xdc<\xaaBQ\xcc4\x16k\x8c\x98\xea\x90\xad\x9dG\xb9	\x13\x1f)%\xdf\xbc\x0e\xe3<d\x1e\xc6\xe0\xc4\xaa\xc4\x9e\xed\xbc\x013\xc82\x0b`\x8e\x1c\x1aa\x02\x12\xd8\xc3]\xa9\xaaS{\xa3K%\xf4\\]\xa63\x08&\x81\x8ap\x12\x84\x93\xae\xae\x1b\xda\xb8\xda\x1b\x88\x94C\xd5\xb8\xa2\x0c\xfd\x9c\xa9\xeb\x86\xb6\x93,\xf7\xc0\x0d\xda\xf9^\xe9T\xd0\xd9\xdb7\xbfh\xbc5\x99u\xfblD\xc0\xa3x\xda\xb7\xb6\x1f\x97\xf1\x03L'D\xb6\x06\xf0\x84\x18r\xc36\x1d\xfav\x0c\x19\xd5\xb7fc\\\xfe\xa3\xfd\xa7\xb5gA\xea\x05\x91\xc2\x9d\xb3\xa0\x86\xb2@\x00?\xb6\xbd\x9e\xc2\xd8\x7f\xc1\x91	\x9c\x95GF\xe6\xc1V\x11A\xb7l,\xb6\xb5\xc4:\xa7\xbe\xa0\x95i#~NU\xfb\xe6\x93DV~7\xbe\x8fk\xb7K`\x1a!\x88P\x1c\x96\xecMX\xb3\xfcR\xcd\xc6$#\xeeTiih\xa8\x9e\xaeom\xd5\x98\xc5<.8Um\xc7<\x92\xce3\xef\xd3\xe9\x18ES\xe44\x0c\xdc\xab\x9d\xfa\x9fV\x1e9\xb2\xf2'\xbd\x99bv\xd2{\xbf\xa1\xf8?\xeeVV\xde\xfd\xa33\x9d\xd7;\x94U'\xd6\xac\x91\x02\xc0\xb51R\xd9V\xe9{B\xc7\xf4\xc6\xeei\x9f\x07\xeb\xba\x1f4C\x0bRh\xdc\xe9\x8ar6~\x98\x1f\xd3\x96\x90J\x94\xa5\x1fP\xe0\xcd\x8e\xd5\xf7M\x1f\x87\x0c\x0b\x047G\x8c\xd0\x00-,\x10NLo\xbc\xf4<\x9f\xb2\xb6\xd1\xa3z\xe7\xf7\x95\x952H&\x12|\x16$\xb3\xb2\x92\xbc<{\x0d\x06\xa6\xda\x9c\x93K\xe4_\x9c\xe6\xd6\xffmmS\x8c)>\x7fr\x92\xcf\x9bf@\x07\x1f=\x9a\xe2BF\x99\x8b\xefCB\x00\xb1\xa9\x89\x89\x83\x87&'\x87F}\x19@\xa9&\xd3\xc8\xff\x19\x04\x84y\xd7ub\xe2\xd0\xc1\xc9\xc9C?'\xab\x1e\xea\xe5\xf1\xe7\x18S\x01\xe649+\x97\xc3\x93\xe4\xb1C\xf8\xae\xb3\xedI\xc3\xae\xf0\xa4\xd9\x1f\x8c+\xd7\xe7\x98\xebf\x05/R\xab\x06U\xea\x0d\xcc\x12\xeeC\x0b\xb0\x01Fu:\x14C\x11*\xa3}\x0c\x86T:\x1f\xba\xb6}{\xc2\xdc\xdd\xbd\x01\xe2\xb2\xb7\xd4u\xaa\xce\xd7\x17\xf8\x95\xace[!\xae\x96>\xfa?\x0b\x8b\xc4\x0f\xe5\xfd\xda\xb8\xb8\"\xc7M\n8gz\x83\xf40\\Hk\x83\xd4\x06Z\xb3:\xc4h\xe5\x02\xad\x1b~\x99\x03@\x13\xaa+\x1d\xf4#\xabN\x9d\xea\x0c\xd6fj\xbe\xe7\x18y\xb5\xee\xe5\x8bio\xc0!\x84B\xf7	\xfe\xf1\xf4\xb7\x93\xb1R'\xa95>\xda\x13\x03`\xda\xf2[!\x1a\xc2\xc4T\x18\x88`m\x1fC\x01\x9a\x9d\x0bI\x85\xd1\x9d\xc3}\xb8n\n\x8f>W\xdf\x10\xf4\x01!M}\x18U\xcbav\xf5\xb6\x014\x90\x803)!\x10\x04\xa7\x01\x0ek\x1bc\xc8\x82\x1a\xb2\xf3m\xfe?\x92\x8e	\xdd\xe5d\xef\x18w\x95\xe3v\x17\xab!\xd7\x94;X\xcf\xa1\xdb\xa8}\xbd\x1d8\xedvt\x95\xeb\xd0\"\xd3\xbc#\x0ck\xc2v\x17X\x8aJ\x17\x99\xb1[\x93l\x9d\xb6[Z\xdd\x99M\xc3\x80\xa7\xf1\xc3\x16XC\x073l\xea\x96[\x0d\xc3Ta\xbcVj\x8b\xa1\x85\xda\xca\xbb\xa5\xe5\x18\x01\x8c\xd1\xac\"\xc5\x93\x17\xd1\xf2\x0bt:\x15\x82(\x9e\xea\xe0\xa6\xc8\xc1<\xbe\x08\x06cZ\xf3ve\x97\xfdQ\x9b\xc7\xeeT\x85\x9f\xa0qH\xe1\x91i{\xa0\xd2\xe9\x8a\x80Q\xe5\x9f\x93'\xc1\x93\xc3\x96\xbb\x93i\xa0\xf6P\xd8\xf6\xef\xbf\xad\xe8\xfc\xc8\x03\xaf\xe1\xedmK\xcaA\xe7I\x8a\xf5\xa4\x19\x8f\x90BF\x83\n\xa3\x15\x05=\x89\x89\xb5\x07\xe2\xd6\x07T\xe1\x85\xbd\xb6\xe0(\xe2\x0f\x9c&TS\x10\x9f?/\xef\xd8\x81A:\xd6\xb7\x1e\xac\xbb\xd0\x9eV\xa7(\xf8\xf7@w\xef\x0fF\x07a^\xe3\xa6]\x85\x8c\xb5\xe4o]*\xd3\xf199\x16\x16\xacR\xbfi\x0e\xe1\xf1_\xd4\xf2\x98\xc0\x99\xfe\xce\xcb2vM\x93\x80\xd8`P\xa7\x93\xf4f\x03\xa6\xb4\x06{Q\x06Y\xcf\x16\xab\xedH\x7f#V7v\xc57\xcc\xd2\xb0\xa0q>@\xe0\xf3\xab\x18~u\xc9\x98\xd7\x86Ax\xb0\xc3/\x83\x02\xabx\xd9\x08\xb0B\xfe\xe03\xa3\xc4\xa0\xd9\xf4\x89\x9dt\x83\xca\xc1y\x1d\x86b0\x8c\x9e\x16nG`\x04\xc1\x0c\x18\xf2\x04E\xda\x04D\xec\xd9\x8d\x1a\xe4A\x92\xd4:\x0c\xc6P\xd8\x10\x05wI\x1f\xd37\xcf\xec\x10nW\xd3\xf72ED<h\x18D\x90&Z\x98\x88\xc3	\xce\xa07\xcd3\xe1&\xfa\xcd\x1c\xeb)LD\xcb4;\xdc7\xe8\xe6\xd1\xb4?$\xad\xee\xcbk@\xd9\x03\"\xf6\xbf\"L&~\xa7\xf9\xf61\x1d\xca\xbaf\xab14\x8a\xca\xb1|\xee\xda\xd97Os\x8f\x1e\xcd}\xfa\xc6L1;\xe9\xdd?\xc2{1$\x90\x17\x83\x03\xafw)\x99\x801\x18}\xd0\xe00\xe8~7\x84\xda#\x08\x0bE\x105\x8a\xaa`\x1d\xd2q&o\x0d\xc7ow\xde\xcd\x0b\xcb\xd3_\x93\x85\xe9\xb4\x8a\xaa\xd48Q1\xdb\x1a\x8fG\xf3\xbb\xbb\xf3\xeb\xf9\xd3\xc9\x8a\xf9\xea\xf90\x198\xe5\xd7\x02h\xb8\xe4W\xbfe\xa0\x98+\xba\xb2\\\xea\xe5\x13\xd4\x89\x86R\x8b\xd4\xca\x17\x93\xc3U?w\xae\xe0e\xd9\xf4\xefO\xd9\x19\x8f\xddSx\x12\x81\x16AU\xd6\xcc\x9e\x7f3\x98|	=WA\xb5\xcd\xdd\xc5R\x9d\x0e\nP\xf1\xb0tO%Q\"1Y\xd7\x94\x1d\x19!so%%\xad^\x9d\x14z\xff_hn,\x04\xfd{?\xd4\xdc\x05\x1f\xf8\"L\x1c\xac\x175\xb1_D6\xa9\xee\xec\x04+\xea\xef\xca\xcbS\x18b\xc6<\x81\xe0\xa7\xccgfJ\xcb\xf4\xa50\xe4b\xec_\xe7\xa1\xd1x\xd4-\x1b\xed\x0b\xa3\x18;\x89H\xab\xe2\xe3\xe2\xe2W\x91:G\x98M\xf0i\xc4Ee\xccIu\xaa\xaevJ]~m\xc8\xd9\xdf\xd8QHLKk\xec\xbb\xcahb\x9eA>}.(h\x95\xdc\"\x82\xf3\xe3U]\xa29I\xedh_\xeeV\xaf@\x87\x9bGZ\x100C\n\xdcp\x15\x13b\x0d\xf3\x1b:\xe3\x99L\x0c3\x8d\xa1tN*\xaaN\x0c\xbd2\xbf\xd3!\xbc3\x8c\x8d\x0dCa\x18\xb3\x97yn.\x95\xca\xdd\xc9\x8b\x7fW\xe2`\xcc\xb3\xdc}\x18\xb1QB\x1b\xccC\x8f\xaa\xc3i \xc1\xa18*\x08\x02\xc3\xef{57\x89\xb9\xec\x05O#aT\xa2\xcb\x1dB\xbd\x9f\x82\xbdU\xedo\xfei\xa70\xe7\x0d\xf3_\xcb\xf0\xd1\xf9^\nChrU}~r\xc8L\x19 1\xf2z\xff>..\xf6=\x1c%\x16G\xc1\x9a\x9bG\x8c\xa3\x0b\xeb\xfco \x99\x90\x87\x0c\x18\x8cE\xe9u\x91P\xb3\x05Ps\xd8\x98\xde\xb8\xe8\xf38\xad\xf0\x03\xfc\x05\xfeP\xa8\x9fu&;\xe6\xca*\x8c\xeb\xf9|i&\xa4\xffPb\xdb\xc8\x9b\xb0\xb2\x98h\xd2;\xb4[\x97\x80|\x18y*c\x83V\x9ah\x86\xd2\xbc\xd2(\xff\x94~\xce\x16_A\x95qU2\xb7\xbd\xff\xf4GIQ\xc73`\xae^\xcav\xfe=\xee@\xac\x0f\xdcK'\xa4\xb5\xd0\x87\xe8\xcbZ#\x084sJ\x02=\x0f\xba\xa4:sY\x05\xa9\xe8	\x14s\xda\xa5b\xc2yj\x0c\xaf\xeb\xb7\x1bS\x1f_E\xdc\x83\"\x8e\xaa\x8b\x8a@\x9e~\x82\x9f\xe7\xb9\x08>\xad86\xba\xf1#\xcey\xb1\xda\xe4\xe5[\xef\xe8c\xf2S\xef\x84\xa5\xd9\xc5\xac\x96\x90\x94\xf2\xf2#\xadSJ\x94GZ\xfb\xaey\x19vv\x12\xdd\xdfS\xf9\xd1\x8f\x1a\xe6\x89\x9dp\xb8waT\x9a\x9e\xcf\xf5\xc5/\x13,\x1f\x14\n9'Jkv%%.\x86~o\xf2[\xcc\xf3\x9f \xe8\xa1\xa7\xfc\x1c\x9c\x13\xc2R\xb1Bj\xa2\x9fS\xe8\xc8\x80*$'\xf8\xe8\x85\x81\x08\xa9p\xc3\xa7S\xa5u\x00\x0b\xe0+\xe7\x079\x18\\\xac\xed_f+\xe5\xf2\xfc\xf98\xf5\x10u\\,\xb6\xca\x14\x8f\xd3t\xe6\xe5\xf0p\x9e\xd1\x8d\xd0\x1ek\xd8\xae\x13J0h\xf3(]\x18N\x11\x84Q\xc8v\xf3\xb3W\x1f\xac\x81\xc7\xcc7\xf3\x0c\x958\xab\x836:\xdc\xd6\xdd\xa3\xcf\xe2\x0b\xb7\xf1Wc\x93\xafY_i>\xfa\xac\x8c\xdd\"\x91\xdfR\xa1\x10\xe7\xf5\x92\xe2\x81(\xd3e\x18]\xde6\xf8\xb9\xaa\x04RA%U\x976&\xb4F]\x94\xbd7@\xcc\xb3k3X\x0dh\x81?\x8c\xc1K\xef\xe0\x13\xae\x04\xde\x00\x1eQ\xa42\x99B\x08k\xbe[<o\xa5-[\x0d\x11\x00s~\x9f\x1c\xee0\xaf\x8d]T\x9c\xb0\xc32\xc1\xcd\xe4\xafh\xca\xf1\xddJ\xc6q\xeeK\xb9v\xa7\xab\x9f(32J\x16\xba\xfe\x1a\xed//W\x08\x85\x1a\xbc,\xe3\xac\x19\xc3\xce\xdbz\xef\x0b\x11\x8fd$2\xd1cA\xb4kP\x94\x0f\xb9\x01\x97	\xa7\x94K\xff+\x80\xee\xadEc\xa5\x0b\xdb\xc2\x01\xdc\x07\xe0[Q\x9e\xf9\xe0\xf3\xf4\xf9\xfbi\xfa\x97\x16Ed\x1aV\x1c\xc3\xf5xR8\x19\x9a\xe4B\xd05\xda\xcc\x16\xc4a\x17=:\xa2\x81KQ\x98\xb6\x9d\x03\xe7\xd3\x1c\\\xa0\xb0@\xc6V\xbb^;Kr\xcc	\x97M\x18{\xfc\xf7\x13\xf1\xc6{\x7f#\xfe\xf3C\x8fw}\x13{^,\xed\x1b\xa7$0Rc\xff\\o\xbe\xabQ\xbd\xd1\xbc\xc1\xd7\xa5P\xfc\xca$\xe9\x01\x86\x1bY\xcavp\xe0\xae>?\x0f.\xff\x1f\x80\xc3.K\xa1\xc8KAb\x8e\xcc\x7f6\xfd\xde\xc4\x14\x1f5\xbf\x7f\xb7k\xf2\x92e\x8e+]\xb2F\x16<H\xcbe\"\xaa;{wN\x89yx/\xc6\xd7\xe5\x07&f\xe6\xaa\x84/XZ\x18[\x9f\xa47\xbb\x9a\xb6c%\xdf\xc5\x805\xbdd\x95Y_\x9fy\"\xd0\xab\xdf\x9e\xa32\\37\xd7\n\x96\x0b\x1ak\\\xc4\xeb\x9d\xb2|F\x02O \x8a\x92\x0f\xb468\x8a\xa8\xf1\xf0\x85\x91\x9c\x9c\xc3\xef\xfc\xbd\x17\x84\x8d\xffnK\xf0\x17zR\"\x8f\x0e\x19\x83\xfd\x87\xa0\x96\x9f?/7\xd032\x9a:\xd0\xb0\xe1>\x8e\xb0e\xf6WH\x04\xa9U\xf2\xab\xfb\x070O\xdd\xd7\xa7\xbe5\x85\xb4\xf8\xff\x0d\xa4\xfa\xee\xe4e3H\x87\xaeco\xc7>l\x16]0\xb62\xb1\x88c\xfd\xb9\x87\xddH\xca9\x9a{Z\x0d{sO\xf5\x04\x96!\xa5A,\xfe7\x86?\xc5\xb73\x00w\xe4\xbf\x8eA\x1c\n\xe0Fj\xda\xff\xb88\xb8B\x16\xed&8U$\x06\x11G\x85\xa1\xc2\x00\xb5\xd9\xdf\xe9$\x1b\xb5Y5\x98\x82\x18\x86\x0f\x0eF\xe2\x11L\x855n\xc7\xec\xb2\xd8\xf21\x96\x94>\x02\x0cq\xf3\xba2\xa3\xa3.\xab6\x93\x03e\x97\xe9\n\xee\x0d\xec\xbc\xda\xf5\x97\x9c+\x98\x96@/\xac\xa2\xf0\x99\xb5k\xedb{\xe0\xf7(\x8f\xc57\x07\xd0i=\x1b\xa5\xc9{l\xcd\x8d\xac\xdd\x82\xad\xe2\xce\xe6\xbf\xa6\xef\x19\xa08\xab\x03\x851g\x9d(\x03\xbb\xfc\x13\xe8%\xce\x02\xd3h/\xebEf\xb6M\xb9\xd2\x8d\xddt\x9f\x005\x0f\x1f\x14\xbd\x9f\x1a\xcc\xbcvg\xbdo\x03\xda \xea~\x01\xe0\xa9\x9bWKi\xe7\x88\xb6U\x07\xab\xdf\xd8\xa3\xdd\x96\xadw\xacRS\x82E\xecF\xed\xdfT\x1f\xac\xb2%\xaa\x0d`=\xed\x17\x18\x8b\xf8|*=1\x82\xf2*\x8e\xf9\x16\x1f\xbb\xfd\xb7S\xa7X\xf6\xac\x80\x1e\xb7\xd8^\xea\xf2\xd3w)l\x1f\x96\xc3\xd6fQ\x9dH\xe3\xfa\x8c(\x14YS\xfe\xf4\x84S\xcb\x8cK\x8f\xb7\xe61\xde\xd8\xe2\xedW]\xb5f\x99\x9f\xb7\xb07\xd7\x9a\xb3^&\x0f\xfdp\xf4@T'.\xec\xc0%3\x8d\xb3\x95\x84\xc3\x0d\x9a\x9d\xaf\xb4\xdf\xde\xf2\xbb\x11\xf95\xcfzaTf6\xd1\xeb\xa9A5\xdc\x19L\x95\xf3X\xcc\xa1\xe6\xb7\xc1|\xf1\x08L\xb8\x7f-\x9f\xe5\x96\xce\xb7\x07\xea\xc4\x1aT\x03\x16\xd7g{A)\xaa\xee\xad\xaeF\xd1\x15\x95.\"\x14h\xfc\x18\x93\xf9j\xa2\xa0A;\x10.\xf0\xe2~\xc2\xfe\xa0\x85o\xde%\xb0\xe8\x0c\xfdG#\x1a\xd1}&]\x02\x1a\xde\xd7\xbec\xdc`\x0fC\xbbhH9xnN\x86\xb7Y \xce\x12\x17l\xf0\xb2c\xde\x14\x03\xa4\\+v\\E\x9f\xa5\xab\xc6\xa71\xa6D9K\xb7X\xe1)2b\x01.\xbf\xf3\xad\x93N\xf4\x07\xda\x17\xfdW\xa2\xa7\x8e\xdcQ\xd7\xa9$\xa5/\x05\xa3\x94\x10|6t\xc3\xb0\x99\xc332\x14\xd4\x9b\xa3\xb47\xa1\xa1\x17\xa6\x00\x962\xb8\xd1\xdb\xd0\xb8yu\xfc0e\xd7\xf1\x80)\x92N\xd8uh'd\x9c\xb6\xc3\xee\x84\xf5\x81\x1f~xY\x89\xc9\x0b\x1e\x00\x90\x91\xb4>\xc4\xda#\x0cb\x88\"k3\xd3\x0e\xf0\xc2\x0c\x03\xbc\x83\xae\xcc:\x13\xa09\xbf\xba\xa2v\x13\x0f\x88\xfa\x06$\xd0\x9fC\xdd:\x14\xca)H\xb9\xcb>	\xd5\xa6\x9az\xc7\xdb\x1c;e\x93d\\j\x17m\x1af\x9f\xe4\x18O\xcfa%\xf29\x9a\x91\x88\x04cK\x9bx\xd3\xd0\x0f\xdb\xa5\xc5!k\xa9%H\x81\xdeDn\x93\x10\x7f\xfc{Y\xdc\"\x93\x17{n_\xd6}\n\xdf)9\x83=\x0d_/\xfb\x1e\x87Z\xce(\xe9\xf9>\x16l\xfa\xb6\xad\xf7Y\x9e\x06\x9f\xd6V\xf7\x8b\x1b\x06gQ#\xa7\xdf\xad:Q\xc4\x01\x95\x17\xc8bw\x07\x83\xc7\xf7\xd5$\xbe\x1bzw\xb1\xf0\xd9\xae\x8b#\xbf\xbb\xe3\x7fU\x14\x98?|\xc5\xf0\xefG\x08\xd4\xce\x05\x84h\xc1\x1e\x7fz\xfc{\xf9o\xba$w\xf1\xd7\xcf\x9c\x9d\xb4\xba\x04\x1c)|Vh\x89\xda?\xbb\x8c\x0d\x14ZV\x8f7\xbe%\x9f\xfcG\xfbo/\xa3\xd7\x86\x87\xf4\xe9E\xcf\"\xb9K\xd3\xb2\x85\xa0\xec\x15\xb5\x08l\x06\xa5p76\xce\x00\x1f-z\x0d!\xc1l\x804\x17n>\x94\xbc$\\\xe1\xd7zV?sz\xfbqej\xecQ\xe7\xeb\xe9]m\x8b\x9b\x04\xe6^\xe6=^\xb5\x0d\xe4\xa7\xed\xad\xa5!\xa0\xb2\xbal\x85\xf4HB4sL\x0bi9}\xde\x1d2\xa2^\xd7\xfdK\xd05\x04\xc5OB\xfa)\xe8\xedO\x0d\xad\xe7v^~\xaa\x12\xea\xb5\xfd\xef\xdd\x80x\xa6\x93rm\\\x1eK\xda&G^\xd0\x075\x8fC\xe7\xd0\x10L\x1b\xbc}&F\xba\xf2\x94\xc0\xcb\xe2\xa8B]K\x86\x14\xa1n3\x86\x86|\xcdsGjy\x1a\xf0\x16k\xfeO\xaf\xb5\x16\xdab\xe5s\xdc\xbd\xe6aW?R6\xf0\x12\xa1\xb7\xb2\xbeJ\x90\xc2\xc7fh\xe3\xda2	\x0c\xc4\xcalBS\x1c\xa7\\=\xa2j\xd5\xd5V\x97\x1e\xca*\x94\x1f\xf4Y\xa6\x93\x14^\xa2\xa2\xc1\x99\x04\x84\xcb\xba^\x1aE)\x07\xd5\xe8*\x94\x03\\\xbd\x9f\x04\xa0\n\x03\xc2\x14\x82r\xd4r(a\xa2\x1d@\xf8\x05\x16\x08\x846n\xd4\x8c\x14\xa3?\xa5}\xdadL\xb0\xa9\x17\x1e\xa6\x81\x16\x9ag\xa2\x0eI\x1dvq\xd8Nc\xd0\xc7a\x8d\x91\xc6\xaek\x8c\xcd\xf7mL\x8c\xf6\x7fc\xc1A!\xa4\xb1hd\xb8\xa3\xb1V\xeb\xf0\xb5\xb9\xce\xf2wc\x03=\xa2\xa6\xe6\x86\x96\xe1\xe6\x16\x96\xd5s_\xd2:\x8a\xff\xd2\x97\x95\xa2sL\x1f\xcb\xed\xa3g>\x91\x9c\x971\xdc*4-%\xf0\x13&\xcb\xf50\x11\x08Ub\x16\x83)E\xdc\xac\x8d\x86*\x19b\xb8\xd4\xd6\x0651\x97\xc4\xef\x84\xe7	\xe4+\xe8+;\x98\x8e<\x85\xab\x86\x92`!q\xb0f\xcd\x1a\xceM\xf9*\xc6,[/GK+\x13\x07{\x17\x04\xc3\x12\x97\xae\x8d,>C\xe2L\x13\x81\x8c\x1b\x01\xf3\x9dR%%c\x8c\xb3\xc2\xc6\xc3~\x91\x92'EG\x8f\x86A\x89\xaeG\xba\xc2=\x87h\xc2\x12\xe4\x9f\x94\x8e\xb08\x1c:ID\xecN\x02)\xc5W\xcc\xbb\xe1AF)ucw'qh\xcdX\x1f\xc3\xa8\xb2L@a\x84\xbe~\x8c6\xccPc2L\xe3\"\xa5A\x08\x852b\xec\xc8U	\x99\xc0&\x8c\x13\x80\x8b\xff\x0c\xaf9\xf6A#\xd3QLO\x07\x04\xac:\x81E\x14\x809k\xa7\xa9\x92\x91\xc6\x1af\xdeKF\x95b93t\xbaL$c\x89\xcb\xacp\xffLz\xff\xa0\xbf5\xd4d\x12\xdap\x08\xa2\xfe\xf0\xf9\xdb\xb0>$`\x9c.\xf7\xef\xab\x1d~X\xf3\x07=\xb6\x17\x00\xa1\xe3?\x84\xa0\x18N\x90\x14\xcd\xb0\x1c/\x10\x8a\xc4\x12\xa9L\xaeP\xaa\xd4\x1a\xadNo0\x9a\xcc\x16\xab\xcd\xeep\xba\xdc\x1e\xaf\xcf\x0f \x82b8AR4\xc3r\xbc J\xb2\xa2j\xbf}\xf8\x9f\xd0\x0d\xd3\xb2\x1d\xd7\xf3\x830\x8a\x934\xcb\x8b\xb2\xaa\x9b\xb6\xeb\x87q\x9a\x97u\xdb\x8f\xf3\xba\x9f\xf7\xfbA\x08FP\x0c'H\x8afX\x8e\x17DIVTM7L\xcbv\\\xcf\x0f\xc2(N\xd2,/\xca\xaan\xda\xae\x1f\xc6i^\xd6m?\xce\xeb~\xde\xef\xf7\x87\x11\x14\xc3	\x92\xa2\x19\x96\xe3\x05Q\x92\x15U\xd3\x0d\xd3\xb2\x1d\xd7\xf3\x830\x8a\x934\xcb\x8b\xb2\xaa\x9b\xb6\xeb\x87q\x9a\x97u\xdb\x8f\xf3\xba\x9f\xf7\xf7\xff\x00b$\x9c\xabtV&g\xae\xcf\x96\xed\x7f\xc1r>\xbf<\xd9y\xf3\xe5?\x8f\x92\x19\x93\x98\x8d\xfbf\xfe{\x9d\xe7\xb4\xb7\x9d\xa3\x00\x89\xb5\x11\x9b\x9e%\xee\xb5\xef\xc7\xcc~\xdfZ\xfb\xfea\xc5zW\xbe\xbf\xbc\xf7\xdc\xf5\xdd2\x9f\x1d\xb5sv\x90\xef\xc0\xcc\xf2\x1d\x90\x99\xd9eW\x1d\xab\x00\x89\xb5\x91\xe0\x02\x00\x00\x00\x00@DDDD$\"\"\"\"bffff\xd6}\x03\x90X\x1b	\x0e\xd3O\x01\x840\xc6\x18cDDDDD\xac\xb5\xd6Z\x9b6W\xf208B\xd6\xe7\x10I\x1b\xa5\x0f\x00\x00\x00\x00\x00\x00\x00\x00\x90\x13\x00\x00\x00\x83.\x01H\xac\x8d\x04W\x08\x00\x00\x00\x00\x00\x00\n\xa2\xdf\x88\x13\xc7\xd09\xa0\x00\x89u\x84*\xa5\x94R*J^}\x80\x1e\x14\xc4:M\x94\xb4$I\x92$I\xd2\x0eF\x82\x8b\x99\x99\x99\x99y\xd1\x9f\x9e\xfb\xde\xf3\xc0_W\xcd\xc6\xfd<G<\xfe\x03\x00\x00PK\x07\x08v\xe8\xc3alF\x00\x00lF\x00\x00PK\x03\x04\x14\x00\x08\x00\x00\x00W\x9a5G\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x19\x00\x00\x00img/influxdb-light400.png\x89PNG\x0d\n\x1a\n\x00\x00\x00\x0dIHDR\x00\x00\x01\x90\x00\x00\x00]\x08\x06\x00\x00\x00\x8b\xbe0\x12\x00\x00\x00\x19tEXtSoftware\x00Adobe ImageReadyq\xc9e<\x00\x00L\xe1IDATx\xda\xec]\x07|\x14\xd5\xd6\xff\xcf\xf6\x92M6\xbd\x17\x12B\xef\xbd#\xd2\x04\xa4(\xa0\xe8\xb3\xf7\xfa|\xcf\xf6\xfc\xec>{\xef\xed=\xebSAE@\x10EQ:\xd2{	-$$$\xa4\xf7d\xfb\xee|\xe7\xcc.\x1a @v\x130\x819\xbf\xdf%d2\xf7\xce\x9d\x99;\xe7\x7f\xce\xb9\xa7\x08xc1\xfeB\xeaD\xedJ\x88\x18\x06Q\x8c\xa1\xff\xdb\xa1\x10\x0e\xd2\xcfE\xd4\xbe\xa6V\x85\xd6N6'\x82\x83\xf5\x983\xa97\xa2\x8d\x1aT\xd9]\x90I\xa6s\x91\x92y\x9d\xef/\xc4?\x17m\x03\xb4j\xd0\xb7,?\x94s\x9cT\x7f\xd9\x95\x05\xe1Ux<\xf7\xa2\xc6\x06\x02\x0f@\xad\xf2\xfet\xb8\xba@\xab\x9a\x0c\xa3\xee\xdft\xe0>\x02\x97/\xe5\xd7$\x93L2\xc9$\x03\x88\x97\x14\xc2O\xb0:\xc6\xb1t\xde\xa7m\x0cF\xa7F\"\xce\xa8\x83\xd3#b\x7fE-\xe6\xec-@IQe\x14\x82\x0d_@\xa9\x88&`yU~U2\xc9$\x93L\xe7;\x80\x08\xc2[\xb0\x10x\x10X<6\xba+n\xe9\x99\x8c\x04\x9d\xf2\x8f?{\xa8\xdd\xda=	\x0f/\xdf\x8bE;r\x81`\xfd+\x048\x9b\xe8\xf0\n\xf9u\xc9$\x93L2\x9d\xbf\x00\xd2\x0e\x1e\xcf\xddp\xb8\xf0/\x02\x8f\x7f\x0fh\x83JB\x8c\xf7v\x17`\xfe\x9e|\x98u\x1a\\\xdf3\x05\xa3\xe3\x83\xf1\xbf\x89=1\xd5\xed\xc6\xca\xddy@h\xd0\xe7\xa4\x85\xa4\xc8\xafK&\x99d\x92\xa9\xe5\x90\xe2,_\xef\xef\xa8\xb1\xa2g\xbb\x18\xdc\xdb;\x05\x15.\xe0!\xd24\xee\x9c\xbf\x19%\x16\x076\x1d\xa9\xc0\x84Yk\xf0\xf9\xde\"D\x10\xb4=:\xa8=\xb4!F\xc0\xeeL\xa6\xbe#\xe5\xd7%\x93L2\xc9t\xbe\x02\x88\xe4m%`rj4\xa2\xd4\x02>\xdf\x9d\x8f\x0f\xd7\x1c\xc0;\x17\xf7\xc4\xaak\x06a\xcb\xcd\xc3qQZ\x14n\\\xb4\x1d\x9b\xca\xac\xe8\x1bm\xc2\xa0\x94H\xc0\xea\xe0\xde\xa3\xe5\xd7%\x93L2\xc9t~\x02\x88\x16\x1eO<\x0c\x1a\xa4\x04\xeb\xa4\x03\x9fg\xe4\xa1Wz4n\xef\x16\x8f\xadE\xb5\xc8\xad\xb2\xe1\x8d\xd1\xdd\xa0\xd3(1{\xdf\x11\x98\x95@G\xb3\xde\xeb\x9d\x05\xa44\xe1\xda4\x08\xd2\xa9\xa5\xe2\xaf\xf4<\x93I&\x99d\x92\x01$@\xfd\x83\xf7\xc8	\x0cD\xdf\x01\xb5B\x80\xc3\xe5\x91\xfe\xafQ\n\x92\x17V~\x8d\x15\x0e\xb7\x08\xad\xd2;5\xb7\xf8G\x7fO\x00\xd7\x9cN\xedG\xb8=\xd9t\xa1\xfd\xd4\x0e\xc2#f\xd31v\x0d\x1e*\xbf~\x99d\x92I\xa6\xd6\x01 \x0e(\x14\x87aq \xb3\xd2\"\x1d\xb8\xb5[2v\x1d*\xc1\x13k\x0e\">\xc4\x88\xb6\xa4m\xcc\xdc\x9b\x8f \xb5\x12\x97\xa6\xc7\xa2\xcc\x05\xec\xae\xa8c\xcf->=\xd3\x8fk\x05A!,\x84\xd3\xfd-*\xea\xc6\xd3\xcfh\x8d^\x03%\x077Y\x1d	\xa8\xb4\xfc\x8d\x80d%\x8d\xfb\xb6\xbc\x04d\x92I&\x99\x02\xa3\xb3k\xce\x11\xf0\x1b1\xf6\x9es\x0e\x14\xe2\xb6\xee\xc9\xb8\xbcC4\xb2.\xec\x8cg\x96\xee\xc6\x97\xdbs\xf1\xf2\xd8n\xb8\xac],F%E\xa0C\x98\x0e\xbf\x1e\xae\xc4\xba\xec\x12\xc0\xa0\x85\xa4I4\x8e\xd4t\x8d\x0d\xa8\xb1ud\xe0\xb9\xbc_\x1a\xc6\xa4F!\xc6\xa8%EDDn\xb5\x15\xf3\xf6\x17`IF>\xa0U\xdd\x05\xbd&\x96\xc0d\x9a\xbc\x14d\x92I&\x99Z2\x80\x00o!X\xff\xc0\xde\x83\xc5xf\xdd\x01\xbc}A{<:0\x15\xdd\xa3C\xf0#1\xf4\x12\xab\x03\xfdb\xccl\xe7\xc2\xf6\xd2:<\xb9j/\\u6\xc0l\\\x07Q\\\xdf8\x90\x12f\xa1\xd6\xd6Q\xa5U\xe1\xbdq\xddqe\xa7X\x18\xe9p\x0d5\x8e61 \x14\x97w\x8c\xc3\xeb\xb1\xa1xny\x06\xa7\x1a\x99J@r\x0f]\xf2My9\xc8$\x93L2\xb5\\\x00\xc9#\x06\xff\x18i\x14O\x7f\xb8z\x1f\x94\xa4\x11\xdc\xd5;\x15\xd3S\xc3q\x19\xb5j\x0fPbs!R\xa7\xc2\xb3\xeb\x0ez\xb6l\xcfU >\x8c7\xd1\xefl\xe4\xf8\xbd\xe1rO\xe5 \xc5\x17Fw\xc5\xcd\x04\x1e\x87\xadn<\xb1)\x0b\xf3\xf7\x1e\x81Z\xa9\xc4\x8d=\x93qC\xb7D<=(\x15Ev'>^\xb9\x07\xd0\xa8^\xa3\xbe\x1fS\xab\x95\x97\x84L2\xc9$S\xcb\x04\x10\x06\x83g\xa0S\xa5C\xc05\xef\x91\x86\xb1\xe8P	F\xb5\x89D|\x90\x1e\xd56'r*\xeb\xc4\x07\x07\xa6\xe3\xae\x1e\x89\xc27\x19ybM\x95E\x80I\x7f-\xf5\xdb\xd2\x88\xd1o#\xed\x03\x83:'\xe0\xfaN\xf1(\xb4\x8b\xb8\xf9\x97\x1d\xf8\x85\xb4\x9b+z$K\xe3\xdf\xff\xe3V\xe4\xd29/\x0eM\xc7=\xbd\xda\xe0\xc7\x83E(,\xa9V\x10\xa8]\xee\x03\x11\x99d\x92I&\x99Z$\x800y\xc4kI\xea\xdf	\xb5\xf1\xf1\xec\xc2*\xd3\x7fs\xcbh&J>\x0eT\xd5	5\x80\xfb\x97\x89\xdd\x15\xcf\x8e\xe8$\xfc\xfd\xbb\x0d \xad\xe2\xefP*\x96Q\xcf\xdf\xe1\xb5D\x15\x9e\x04\x9cz\xf1\xbe\xc7\xd8\xe4\x08\x84\xd1\x9d=\xb1%\x07\xbf\xec\xca\xc3\x82k\x86`|R\xa8\xd4\xf1\x99\xc4p<\xb6t7F\xd0\xcf\x8bS\xc20\")\x02\xb3\xf2\xcay\x9fe\xa8\x1f\x002\x9cZWj\x9cA8\x9f\xda6jkO2'(\x94\n\xc91\xc0-\x8a\xf2\x8a\x93\xe9\x9c%\xb5B\x81j\x87K\xca@\x0d\xbdF~ 2\x80\x9cQM\xe4\x15\xfa\xf7\x0b\x18\xb5S\xa9]@\xbf\x87\x11\xf3\xd7\xc2\xa8\x19\xb2x\xeb!\xc5\x87mc<ww\x8eU\xce\xde\x9f\x84U[\x0f\x01\x11\xa6y\xb0;mt\x9e\x92\xc0g\x07\x14\xc2\x1c\x88x\x11\xf5\xdd{=\x88\xe64\xd2\xd1\x06\xef\xe2\x9ds\xa0\x00\xa9\x89a\x18E\xe0\xf1{a\x0d4\xc4\xc8o\xea\x9e\x847i\xbc\x85Y%\x98B\x00\x92\x10\xa4=\x9av\xda|\xda9\x0b\xb8\x95\xaey\x1f\xec\xaet\xd8\x1c^\xc7d\xee\xabS\xf3\x86\xfcv\xfa\xfd\x05x\xd3\xd0\xd7{\xc2JXj\xac8RgG\xef\x98\x10T\xdb\xad\xc7g\xb9\xbe\x8d\xda\xd5~>\xbd9\xd4^;O\xd7,\x83v7x\xe3\x82\x92\x1bX\xc3u\xd4\xaa}-\x8b\xdar\xdf\xf1\x9e\xd4\xde\xf1\xe3:?P{Af\x11\x8d\xa7\n\xbb\x13}\xa3C\xa0\n\xd1\xc3\xc5\x9e\x96aA\xf4M\xfa\xed}\xaf\xf0\xad\xef\xa8\xb39u\xb0y\x1d(\xa0\xb6\x8bZ\x06\xb5=g\xf0zm|\xdf\xfd_AVj\xa5>\xc1\xf7\x08\xbc\xde\xade\xad\x0f@\xbcTD\xed=\xa9	>\xae\xaaQ\xcd\x82\xc51\xe3\xa1\xe5\x19\xc2\xa5\xa9\x11\x9e\x8fGuR\xb4\xcf.\x86XP\x01el\xa8\x8eA\xc0Z^\xdb\x1bjeo\x18u3h\x81\xde\x0e\xde\xfb`\xe6\xeet\xc5\xa3\xb4\x06\xb9\xd56\xd4\xb8\xd9M8	qA:X\xe9\xff!\x04,Q\x04,G,\x0e\x94\xd6\xda\x90h\xf2\x063\xda\xdd\x1e\xf8\x02S\x9c\xa7^\xd6\xc2l\x02\xb0i\xa8\xb5C\x17aB\xef\xd4H\x98i\xcc2\xab\x03\xeb\x0b*!\x96\xd7u\x87I?\x8bPj\x08iRw\xfd\xd1O\xa3\x82\xa3\xac\x06\xef\xef\xc8\xc5\x17\xf1\xdd\x1b*\x91\xd0\x9b\xda ?\x9f[\xdey\xc6\x9bB\xa8]Em*\xb5\x81\xd4t\x8d\xec\xb7\xd3\x076G\x81\xc7\x9f\xe7\\\x06\x99\xfc\xfb\x98IH\xea\x12i\xc2wS\xfbc\xda7k\xe1\xaa\xa8\x05B\x8d^\xcbB\xe3\x89\xbf\x90)-\xe0v\xf6Q[Cm\xa1\xaf9\x9aq\xec\x8e\xd4\x1el!\xaf\xad\xce\x07\x96\x1b\xa8\xfd\x02\xaf\xb7\xab\xfb\xaf\x06\x10\x96\x1eb\xa9q\xc0\x07\x07\xee5\xbe\x8a\x12\x9b\xb7B\x0c\x93*\xf3+\x0c7/\xdd\xe3\xfe~\\\x17<>\xac\x03\x0e\x16T\x8a\x7f\xeb\x91\xe2\xd1\xaa\x14\xc2\x86\xc2J\xc5\xb3\xab\xf7\xa1\xa6\xd6\xda\x0d\x06\xed\xef\xa8\xb6\xb2\x99\x0bZZ\xac\xa3\x06\xb4\xf5\x0c\x8a\x0f\x15\x8eX\x9c\xc2\x94\xb61\xd8E\x80\xf2\xc4\x8a\xbd\xb8\xa8],*IB\xbar\xdeF\xc4\x98\xf4\xb8\xaac\x1c\xca\x0826\x95\xd4x\x97\xacWZ=\x19x|\x8b:\xfb4\xfe\x10n\x1d\xda\x01Wt\x8eG\x07\x92\xae\x824\x02i\x14\x1e\xe9\x1a\x1fo\xcb\xc57[\xe9V=\xea;I\x0b\xb2\x93\xa6t\xdfQ\x13\x16\x08\xc4~\xcb*\xc6\xd6\xa2*$\x93tVn=\x06\xabJ\x03x\xbe\xc5\xe7\x11_b\x01\xe1)j\x91\x01\n(\xf5%\xaf@\xfb\xca\xd4\x18fB\xd2QV\x95\x05\xc3\xe2\xcd\xf8n\xc6@L\xfdz-\xdc\x1c\xc7\xe5?\x88\x1c\xa6\x96\xf8\x17\xdfN{_\xbb\xde'\xb0\xb1e\xe1C\xf8\x17\x8fv2jI\xce:\xec\xa4\xda\xc7\xd7\xee\xa0\x96C\xedSj\xec\x95Z\xd9\x18u\xb19\x89'\xb0\x8a\x98y\x0el\xcem\xb0\xbb\xf6\xd3\xc2\xc9\"\x06\xfd\x19\x1d\x1f\xd0\xc81\xd86t\x0d\x81\x08\xe6o9\xa4\xfc`w\x81\xe7\x9f=\x93\xf1\xf4\x98\xaeB\x9a\xd9\xa0\x8c1h\x15\xf7\xf7L\xc4g\x13{\x91\xce@@YV\x8bN\x89\xe1xpT\x17\xfc~\xf5\x10,\x9c\xda[h\x1bj\x14Km\x0e(I\xab)&\x8dc\xee\xfe\x02\\5w\x03\xc6\xcdZCZ\x83\x06_O\xec\x89\xb4 5\x16\x1f.\xc3\x9a\x03\x85\xf4\x08\xa58\x93oO2\x9f\xc9p\xb8\xa6\x834\x95\xa7\xc7t\xc3;#;`P\x8c	\x07HE\xffao\x11\xf2H\xea\x1a\x15\x1f\x82O&t\xc5]CI\xb0`pp{\xee=\xe6~I\x0bA\xb5\x05+\x0e\x97#\\'\xdb\x86\xfd\xa0\xaf}\x1ajd\x80\xfd=\xf2#<\xbb\xa4\xa0on\x07	e\xc3b	D.\x1f\x08%\xaf\xf7\nKk\xafN\x98@\xed~j\xfb\xc1\xa1\x08@\xc49\xfc\n\xd9,\xfc\xa4\xef^\xaf9[\x1aH;IJ\xb78\xbaK\x89\x0fM:\xa9\x8c+\x9b\x87\xecU\x96Db\xa8\xd7J\x9eTJ\xc5\xf3$\x91?|\xda\xd1D\xcc\x81N\xf5=jmS\xde\xdezH\x18\x9d\x12\x892\x02\x02\xbb\xc7#)\x0bk	\x1c\xbaE\x98\xf0\x001\xf4\x18\x95\x02\xb7\xf7I\xe6dW\x9e\xadeV\xcfC\xab2\xc5Y\xdbr\x14i\xb1!\xf8\xfc\xe2^\xb8\xbc}\x14\xbaF\x05\xe3\xf7\x9c\x12hUJ\x8c!\xad$E\xa7\xc0\xb6J;\x1e]\xba\x9b+ \x02z\xc3\x1a\x9a\xd7\xe6\x93(\xd4/p\xd5\xc4\xa9\x03\xda\xe2\xc1>I(w\x88xi]&\xde\xdd\x94\x8d\x10\x8d\x02\xb5.\x0f\x1e\x1a\xdc\x0ew\xf7J\xc13C\xd3\xb1\xa3\xac\x06+w\x92\x00e6\xfc\x9bz\x8f\xa9\xa7Y!\xa7\xc6\nA\xdeGo,\xb1*=^~\x0c\xad\x8b\x84\xa3 BZ\xf9\xf083f\xcf\x18\x80i_\xaf\x83\x87A$\xd4\xe0\xaf&\xd2\x12o\xefnx\xcd\xa9,$~v\x0e\xbfJ\x16\xda>\xa7\xd6\xd7w\xcfg\x0c@\x12i\xc5lA\xa5\xc5(\x18\xb4\xb8\xf3\x82\x8e\x18L\x1aA,I\xf5\x0c \xfb\xca\xeb\xf0MF>~\xdfw\x84=3\xfe\x0f:\xb5\x99\x16\xd1\x1d\x8d0e}M:\xf1\x14%\xadF'\x01\x87\x07G-M\x90\xbc\x99\nI\xf2\x7fi@\x1b\xb1\x8a\xce\xfc:\xa3\xc03w_\xa1\xf0[n\xa9\xcaF\xd7#\xa0Bny-\xae\xa4\xeb\xffk`\xba\x14\x9cxg\x8fDi\x8c|\x8b\x0b_\xee+\xc1\xa3+\xf6\"\xa7\xa0\xd2\xab^\x8b\xe2\x95'Uc\x1d\xee\x0eJ\xd2\x86\xae\xeb\x14\x0f\xd6\x1d^\xdc\x98\x85\xd7\x96g\xe0\xf1\xd1]1,%\x02s\xe8\xde\x1e\xfbi;\xdd\x96\x12\xf7\xd35n\xe8\x92\x80\x95\xfb\x0bY\x0b\x19E\xf3\x08\x85w\x83N\xdaL?DZH\xa5\xc3)\xa9\xfa.\x8f\x8c$\xa7\xa0\x17e\xf0h\xdd\\V\xe9\x03\x91\x0b\xe2B%\x10\x99\xfe\xf5Z\x02\x91\x80\xccY-\x91B}f\x9e\xe1>\x13\xd7\xb9L\xbc\x9f\xab\xf4Y\x97\xce\x00\x80py\xda*\x8b1*<\x08\x9f\x92\xc4?6\xc9,]\xad\x98=\xf9\xd4$\x82\xc7\x87\xe0\xb2\xf6\xb1xn\xed\x01\xbc\xb5j/\x9f\x7f;\xd4\xca\xa5\xa4e|w\x9a\x91\xeb\x98\xe9\xf2\xc6\x9c\x93\x80\xc0\xacU\xa1\xd8b\xa7\xc5)H\xdeTI&=\x9e\xdc\x94\xe3\x99\xb5\xe5\x10\xf6\x97T\xab%M\xc2\xa8\x03\xc2\x8c\x1b!\x08\xdbh\x91\xde\xbczo\x01V\xe7U`hr\x04\x12\x83u\x12\xd3\xdeO\x8bx\xdb\xa1Ri\xcf\x84\x16\xb3\x95\xc0c\xbc\xcf\xee\xd7\x10\xf5\x82\xdd\x894\xea\xdf>,\x08\xbb\xab\xecxcs\x16\xee\xb8\xa0\x13\x9e\x1a\x98\x8a=\xd5\x0e\xbc7\xb2#\xf2\xacN<\xb7\xfe \xae\xee\x18\x8f\x8et^\x18=\x8b\xf2\xb2\x1a\x81\x00\x937\xcb\xd6\x1c\x1d\xccN\xda\x8a\x8c\x1b\xa7%v\x8f~P~\x0c\xe7\x889\x8b@dD|(\xbe\xbd|\xa0\x04\"\"{g\x99\x8d\x81xg\xb5D\xba\x8eZgj\x17\xe2\xdc\x0eB\xe6}H\x0e\xa1\xf8\xea\x84w\xdc\xc4\x81/\x83\xcd\xd9E\xa5S\xe3\xbd	=1\x9e\xc0#\xa3\xd2\x8e\xab\x17\xedD\xefO\x96c\xf0\xa7\xab\xf1\xfe\xae\x02\x18\xd4\x02^\x1a\xde\x0e\x97\xf4N\x05\x9b\x83HFy\xbf\x11c/\x83Ac-.\xaa\xc2\xab$\xf53\xdf\xd5\x13\xa0\xb41\x1b\xd0/\xd2\x88\x05\x99Ex\xea\x87\xad\xca\xfd\xf9\xe5J\x18\xb5V\x84\x9bfA\xab\x1aG\xa7\xf5#P\xb8\x85p\xe6B\x02\x88\xdfy\x13{UF\x1ef\xae\xcd\xc4\xb7\xc4\xe4\xb7\x1d,f\x97[ \xc40\x97\xfe\xd6\x05\x7f\xbay6D&\xeeo\xd6(\xa58\x0e\xd6z<\x0e7\xd2B\xf4\xc8\xb1\xb8QL\xbfs\xc2\xc7!	\xa1\xb08\xe9w\xab\x0bF:/D\xad<*e\x1d\xe3-\xc4\x9a\x87 \xc8\x8c\xe54$\xa7\x949\xd7\xccY%5\xb8\x90Ad\xc6@\x08\xbc\x1fXI\x9a\x88Bq\xae\xdc&\x9bx\xd8\x83)\xe8\x1c\x7f\x9d\x9f5t\x8fM}\x8b7\x83\x98\xe8\xd4n\xc9\x98\x98\x1cJ\x12\xb9\x1d3\x16l\xc6\xec\x8c|LJ\x8fA<i	w|\xbf\x91\xa4\xf6\x1cI\xd5\xb9\xa7g\n\x0c\xe1&\x0e4\xe2M\xa8\xd3U\x18\xac#n\xfbO\x8e\xeb\xf8|\xc3Al*\xac\xf2\xc4\x06i\xb1\xe4p\x19\xeeZ\xba\x0fw\xfc\xbc\xdd\xab\xe2D\x98\x96\xd0yi>3\xd4\xcf\xc7\x00\x90(\x0e!mg\x08\x81\xc5\xbf`6\xbc)5\x93\xee.(\x15]\xe9o\xec\x12\x9au\x9a9\x14\xb19,\xaf\xce\x81R\xd22\xc2\x08(\xa7uN@(\xcd)D\xabD\xd7(\x13\x0ctc\x1fm\xcbAr\xb0\x1e\xa9\xc1\x1a\xe9\xbc\"\xde\x07RI\x8f\xf6\x18/\x06\x87\x9b5\x10\x112\x86\x9c\x94\xb8^\xcb\x88f\x1c/M~\xa4-\x04DH\x13\x19I\x82\xd67\x97\x0f8\x17A\xa4\xa3OB?\x97\x89Y\xf8\x03\xcdi\xc2\xd2\x107\xec\xc1L|dB\x98\xb4?\xf0<I\xf8\x19%\xd5\xd8y\xf3\x08\xa4\x05k%\xf1\xfb\xceeAx|\xc5\x1e\\\x98\x18\x8e\xee\x11A\x18\x90\x18\x86\xa5;rY\x0b`\xfb\xe1\x92S^A\x14\x0f\xb0\xa9\xc9\x1cn\x12\x87%\x98\xd9\x8b\xc9s\xdd\xac\xb5\x02\x1d\x13x\xa3\x9e4\x8f\x154\x07\xde\xa8>\x95>\xfc{\x13^\xee:\x020\xcb\x91\xe2j\xc3\xda#\x15\x18\xdf&\x12\xcf\x0dm/\xb9\xe1\xde\xb34\x03A\xa4Q,\xcf)Cfy\x0d\xe6O\x1f\x00#}\x0f\x1b\x8b*a)\xaba\xd7]\xce\xdf\xb8\xbb\xde\xbd \x88>\x1c\x8e\xd6\x95]\x83NJ\x97\x06\xd0\x87\xfd\xf3\xffGm+5\x9b\x8fg\xf1rL\xa1\x96+?\xd2\x96\xa5\x89\x8c\"^\xf15\x81\xc8\xe5\xdf\xac\xf5\x82\x88\xd9\x80s\xc4\xae\xcb\xf1Fs\x03\\\xc3\xad\x858\xf8\xf1\x89\xe6\x02\x103\xdc\xa2	\x1a5BI2\xe7@\x8f\xa5\xb9e\x98\xd8!\x0e\xed\x08<V\x1f\xa9\x96\x8e\xdf\xd5\xbb\x0d>'\x8d\xe47b\xb4\x83\xa3\x83\x10\xc7\xa9\xd9\xbd\x0b\xe6\xf4\xae\x99\x82p;\xa7E\x18\x9d\x12\xe1I6\xa8\x15\xf7\x1e(\xf4\xc0\xe1R \xd2\xc4\x11\x94\xcf\xd38\xef\x9c\xe1\x07VD\x1a\xcc\nT[\xc7=\xbf>\x13\xc3i\xf1+\xb9\x08\x16i\x12\xec\xef\x9eYP\x85\xa4P\x03\xbe\xbfl\x80\x94*e_\xad\x13\xefo\xce\xf6~2\na&D\xd8\xff\x18\xc9\xe3\x91bGB\xe8y\xb1)L\xa6\x06i\xa0\xdf\xef\xc7[\x18\xec\x80\xfc\xe8Z\x07\x88\xec$Md4	\x91__6\x103\xbe]G b9\x97@\xe4\x12x\xf7\x0b\xde?\x03c\xb35c\x96\x9f}\xe8\xc1Jr<\xbb!'\xa1\xe9\xb15\x1c\xdf\xc7\xf1\"\x9b\x9a\x03@,\xb4*\x9cp{\xb4\xecm\xc5\x03\xb1\xe7\xd5\x9e\xd2\x1a/\xba\x10x\xf0\x9e\xc5v\xd2H,v'RB\xf4R\xa8\xb7\x857\xaf\xbd6\x9c\xd3sQ\xb7g\x02\x9b\xb0\xc6$G\n\xe5NQ\\]P\xa9\x807M\xc9?q\xf2\xb8\x8d\xe6ehnO\x1f\xb6;\xb5\x0b\x0b\x12\xf5j\xa5\xc2E\x93o\xcb\xa01\xa5\x8f\x94\xf7'\xca\xa0\x92\"qxC\xfd\xd6E\xdb\x91u\xb8\xdc\xbbI(\x8a\xc7 5\xab\xeb\xa9!\x068EY\xff8\x05\xb5\xf5\xf3\xfc\x07d\xf0h] \xc2\x9b\x80;I\x13\x19C 2sz\x7f\\5{=<\xbc/\xca\x16\x85\xa6\x81\x08\x7fo\xd9\xa79G\xe7\xd3N9\xf0+\x9eZ\x1c\xbc\x9b\xe0]\x80f\xb3,s\xdc\x12\xa7bi\xee`_\x0ef\xbc\xa3	\xfd\xd5>\xe6\xcfIc\xefi\xc28\x83\x9b\x0b@j\xa1R\x1cB\x95\xa5KFy\xad\xa4P<\xd4\xbf\xad\x94\xc2\xe0\x9a\xef\xb7\xe2\x91\x0b:J\xdeRW\xff\xb4\x1d]\xa3C01-\x12\xd95Nla\x80\xe1M\xe6\xfa\xe6\x9dc\x89m\xe0\x13Hz\xbf\x00\x16\x87\xde\x1ci\xf2\\\x9c\x1a)\xfc\x98]*\x16\x17W\xb3g\x13\x9b)\x16\x9eb^\xc3\xe0\x8d\xbfH\xf7-\x18NI\xb1\x9a\xda<\x1cu\xa9m\x1c\x85\xd3b_\x8c\xd2\x9a\xa0n\x1d\xe3=\xbfL\xee\x81e\x855\x9eg\x97e\x08\xc3\xd2\xa2\x85\xa1\x89\xe10iT8P^\x87\x1d\xc5Uxwk\x0e\x0eqRF\x02J\x08\xe2t\x9a\x7f\xd1\x1f_M\xad\x1d!\x91\xc1\x92\x19\x8f=\xc9d:)\x85\xf9q.#\xf1/\xf2#k\xa5 B|`|J8>$A\xec\xe6y\x1b\xd9E\xf1(_\x08\x94\xd8\xf9\xa2*\xc0\xbe\x9c\x9bj\x14\xd8)\xc8\xfb\xb3\xa9\xf4	\xb5\x8b\x9b\xf9\xd155\x02\x99\xe5\xf7\xb5\xbe\xf6\x11\xb5E>\xcd\xc4_j\xd7\\&,H\x8c\\\xa9\xe82sw\x1e\xae\xed\x9c\x88\x89m\xc2\xf0\xfe\xc5\xbdp\xf7\xfcMH%\xd0\xb8\xbaS\x02\xa6\xb7\x8b\xc1\xf5]\x12\x11\xa6\x12\xf0\x9f\x83E8\x94[*\xa5\xf6 Zp\xdcXq\xa4\xe3~\x00\x87k\"3\\\xc9]\xa9\xda\x82\xc1\xdd\x12\xc5\x18\xad\x02\xf3\x0f\x16\x8a\xecR\x0b\xa3\xf6[\x92\xee-\x0dJ\xaf\\\xa2\xd6\xe9\xba\x887\xf6\xffHt\xc8\xb9\xae4\xaa\xeb\xa9\xdfK\xb4z\x9f\xa3\xe3\x8dKB\xa8\x10~Cy]Ph\x8c\xd9\xbdpJo\xc1&Bq\xc7/;\xc4\xbd\xbb\xf3\x84%\xd9%0\x85\x1a\x11B\x00Rju\xc0\xc6\xfe\xed|\xadP\x03\xcf\xeb\x86c]\x94\x05.\xa3\x8bk\x87v@\x87p#id5\x92\x8f\xbcL'\xe7/~\x98\xafJ\xe4G\xd6\x9a5\x91Z\\\xd5>\n\xf3\xba%\xe2\xa7\xb5\x99$\x83\x06{S\xff\x04F\xe9\xf5%c?\x895\x97\xff\xfa\x1a\x0b\xa0O\xa2i\xce\x1c\x13\xe0M\xde\xb9\xb5\x85\xbe\x02N\x189\xc8\xa7\xbdk\xfd\xec\x1b\xdd\x9c\x00\xf2:\x81\xc1C\x87\x0e\x97\xe1\x81e\xbb\xf1\xc9\xf8\xee\xb8\xadK,\xba\xc6\x8cDa\x8d\x15\x9cN\xe4U\xd2D\x18\x00~\xca\xab\xc2\xf3+\xf6x=/\x14\x8aOi\xa1\x14\x1d\xf3\xf2\x15\xc2ZTY\xc3Y\n\x19\xdb#	}\xa2\xcdP\xd2b\x1a\x98\x10\xa68T\xeb\xc4OY\xc5\xde\xd8\x0d\x01\xdd\x89A\xb3\x17W\xfd\x1cR\xfdhA.'\xc0\xd1C\xad\xc2\x05\x04X]\"L\xd0\x92\x06TB\x12\xffr\x02\xad\xdc\xbc\xf2p\x02\x91W\xa1U\xf7\"U\xf9\xaaS\xdc\x13\x07F\xbe\x8e\x1a[\x0fhU\xe2\xac)\xbd\x91hP)F\xcf\xdf&\xee\xcd,\x12|\x05\xae\xb2jj\xac\xa95\x0cNJ%\xab\xdfYt\xfd\x054\xaf7P?\xa6D\xd2>l\x08\x89\x0b\xc5\xb5\x9d\xe2q\x98Tu\x85\x0c\x1e\xa7\xd3*\x1aK\xac\x89\xcaQ5\xad\x18D\x18+\n\xea\\\xb8\x95\x84\xcf\x9fv\xe7C\x12\x105\x7fu~W\xac\x847\xae\xe3_hZ6\xe6\x97\xa8\x8dn\xc1\xaf\x80\xf3\x8d\xbdL\xedQ?\xfb\x19\x9b\x13@\x8ai%\xdc\x0c\x93\xfe\xbf\x0b\xb6\x1e\xc2\x0c\x87\x0b\xf7\xf5KC\xaf83\x12\x0cZ\x1c\xaa\xb6\xd2\x02\xb1\xe3\xeb\xbd\xe5xly\x06j	T\x10b(&\x06~\xe71\xb69\x85\xb0\x02\x95\x96\xf0\x98\xf0 \xbc5\xb6\x1b\x86%\x86#R#H\xd9\xef\xb2*lB\x91\xcd\x89W\x86w\x12\x1e\\\xba\x0buU\xd6\xee\x08\xd1\xffJc\xf4\xf4\xf5\x8f\xa4\xfe\xabPQ\xa7I\x8e1\xe3\x95\x91\x9d1\x90\x98|\x84N!\xdd\\\x1daNN\xb5\x0d\x1fn\xcb\xc1\xbbk\xf6\xb3\x9d\xf5o\xd0i\x8e\xd0\xea=1XM\x10^\x82\xc7\xf3w\xd2<\xb4py\xf0\xd2\xf4\xfe\x9e\xb1\xf1!\xca\xbf\xaf9\x88\xdf6g	R\x14\xad\x80\xe9\xf4\xcfw\x04D\xdd}\xcf\x8f\xa7\x99q\xd2\xcf\x84\xe6~\x0d\x01Z\x9aY\x8fm\xadO\xfbP\xf9TV\x96\xee\x0c\xf5\x8e\xb3\x1d\x8e\x1d\x19\xf2\xd0\xbc\x99\x81\xdd\x90\xe9\xfc\x01\x11\xfa\x14\xf2j\xad\x18\x18\x1b\x8aK\xe8\x1b\x99\xb7\xe1`K\x00\x90\xa3\xc4\xd9\x10hB\x98\x1d`\xffQ>\xd3Xv\x0b~\x05\xdf\x04\x00 \x8a\xe6\x04\x10\x96\x01?\x82J\x19C \xf2\xf4o\xbb\xf2\xf0\x1bI\xfb\x03\xc3M\x98\xd4%A\xbc\xb3{\xa2\xe7\xc6\xc5\xbb=\xb3W\xecQ#X\xcf\xe0\x91C\x0c|$\xeagF\x15\xf08I\xe9\xb1\x9c;\xeb\xabK\xfbb@\x8c	\x15v\x0f\xbe\xc9,\x85\x85\x98x\x9f\xe8\x10\x84\xeb\xd4\xb8\x8e4\x9b\x08\xa3\x16W~\xb7\x1en\xab\x93\xb5\x03N!\xf0)\xad\xc2\x0fHs\xd1\xc4E\x85`\xf6\xd4~\xe8\x1c\xaeG\xa5C\xc4/9\x15(&\xe9\xbf7\x81I\x9b`\x1d^\x1c\xd1\x1eZZ\x9c\xafq\xfe+\xb5\xea\x01\x02\x9d\xef|*\xaf\xc2\x07b\x1f\x13\xb3\xbf\x82m\xb1\xa9\xa4JO\xeb\xd5\xc6\xf3@\xb7x\xc5\x93\x1b\x0e\xe1\xed_v\x90\x96\xa1\xe7t$\x8f\x12\xf0\x1c5Om?\xad\x88E\xd7\x0f\x8e5\xe3\xda\xce\xf1\x12\x88\x9da\xed\x83=$:\xc0\x9b\xf9\xf8T\x929\x1b\x9a\xebN\xa1^\xf3\xf3 \x90\x94<J\xd8+*\xe94\x0c\x9f\xd3^s\xbd\xfa\xef\x1b0K6\xf4T\xe2p\xf2\xf8#\x7f\xec\xbc\x1a\x9c\xda\xab\x84\x9fAA3\x83\xd2\xf8\xe3%\xb0S\x10\xaf\xf1\x1f\x9b\xa8%\xa5\xc0\x1b\xa8\xe6\x8fi\xa2~\x1d\x8b\x11\xbe\xf7g\xf1c\x0cv\x8b\x9e\x1f\xe0|9\xd0l\x9c\x1f\xe7+!\n\x82\xc5\xe5\x9euM\xc78\xcc\xcb -\x84\xbey_\x0cUK \xfe\xd6o\x80wO#\x10\xe2M\xef\x07Z0\x80\xe4\xfax\x81\xd1\x8f>\xb6\xe6\x05\x10\xe9S\x15\x9f!\xee\xb8\x8d$\xf4\xc7\xe0p\xf5[K\xda\x88\xa0\xd7\x08\x0f\xf5J\x12\xcbl\x0e'I\x15j\x04\xe9Xk\xe0\xe0\xbd\x9ac\xb4\x0f\x0f\xee\x81\xc3\x8d\xbbG\xa6c0\x81G\xa1\xc5\x8d\xe7IS\xf8p\xd5^\xbc0\xa5\x0f\xac.7\x96\x10(\x8dN\x8e\x90*\x08^\xd77\x0d\x1f\xaf\xc8\xe08\x92\xcb\xa4\x85\xee\xf6\\\xca\xfb\x0f\x8f\x0f\xef\x80\xae\x04\x1ey\xb5N<\xbdz\x1f\xbe!\x95X\xa7V@\xa7R\xe2\xe5Q]0&%\x12\xffG\xda\xd1\xca\xfcrl\xda\x9d\xc7\x9eR\x9c@\xf1\xb0\xc4\xcc\x04AC\xc0\x11\xc3\xfb%\x0f\x8e\xe8\x88\x9bz\xa4@\xa7\x10\x14\xb9\x16\x17j\x9c.\x91\x83	%\xff]Q\\\xed\x97\x92n%\xedch\x02\xda\x86\x9c\x15\xed\x83\x9f\xed{\x8d\xd6\x1c\x8f\xb3e\xfa\x88\xbd\xdb\xee\xf6IN\x8dc\x00@'_\xbb\xde\xa7\x89\xb1\xda\xff\xc5I\xce7\xf8\x807\xb41\xd2\xcdi\x88\xbdh\x0e\x9d\x86\x11\xa6\xfa@\xa4\xb9h\x81\xef\x9e\xfd\xd1\xe0\x9a\x02`\x13\xe1\xcd\xfe\xdaXz\xe58\x86ERO@	\xffn\x81w?\xc0_b\xc0\x1c\xe6\xa7-\xeb\x05\xfa.fI\xae\xedl\xa2n9\x1a\xc8Q\xe2\x9cW\x17\xc1\xbb\xc1\xee/]\xd9\xc2\x01\xc4\xed\x13t\xfc\x01\x90\xc2@?\xd8\xd3\xd1Bb\xb0\xfd\xa1V\xbe\xce\xa6\x1e\x9dW\x8aPF\x19\xb4:i\x83Y\x14\x97\x1d\x07\x1eL\xfd`w\x9a\x82\xa2\x82q\x11\x01\x84\x93d\xb5\x0f\xb6\xe7\xe0\xc3u\x99x\xfb\x92\xbe\xb8\x86\xeb\x9a\xd3\xc2\xbao\xc9n\xfc\x9c]\"\xa9\xbc\x93\xdbD\x82\x93\x1b\xc2\xe9f&w\x1f,v\xb4M\n\xc7\x05	\xe1\xa8s\x02\xcfR\xdf\xffm\xce\xc6\x9bc\xbb\xe2\xa7+\x06\xa2#iC\xd7\xcc\xdb\xc4\x91\xec\x08W\xd3*h\x17\xebu\x17\xb4;\x95\xb4`S\xa8%\x11\xe8\xc5pP\xd3\xe5\xbdR\xf0\xfc\xe0\xb6\xa4\x88\xb8$\xf3[N\x8d\x0dO\x0cl\x8bk\x87\xb4\x97\xb4	\xbf\xd4=\x9awH\x1ci\x1f\x1d\xe3\x91{v\xf6>\xfc\xd9?8\xbe8\x0e\x9b\x03\xb9,\xefk~\x80GC\xc4@\xc2A}?\xa0\xe1\xd4\x0e\x82\x0f<\x14'i\xfe\x92\xe2\x14M\x87\xe6/W\x90\xef\xc7\xb9\xcd\x01\\\xfe\xe6W:\xbe~\xc3O\xd4\x1e	\xe0\xba\xff\x81\xff\x15\x01o\xf2\x1b<\x80\xc5\xd4\xfeOM\xfc\xe1\x07\xde\xe3d\x0fEe\x8b4\xf1^\x87\xc0\nJ\xc5\xf9\xa9A\x9emR\xe3X\xd3tchO\xf3k \xc7\xd2z\xe6\xf4V\x97Gdx\xd3\xab\x14\n\x9foMC>\xfe\xed8	b\xba\xd9\x88\x18\xa3\x16\x956\xb7\x04 \xd3\xfb\xa6\xe2\xae\x1e	\xf8\xbd\xa8\x16\x83\xe2B\xd1/!\x0c\x1f\xed<\x8c\x9b\xbb%\"\xde\xa4Cl\x88\x11y\x85\x15\x11\x04V\xe3Yj\xe9\x16\x16\x84H\xbd\x1a\x99\x95\x16|\xb6+\x0f\x0f\x8f\xee\x8a\x9b\xbb\xc4!\xb3\xc6\x81\x8f&\xf6\xc2\x92C%\xb0\xb9\xdd\xd8Vn\xc1`\x1ao\xd6u\xc3|\xde\x1eB}-\n\xa9\x04|\xdb\xca\xac\xa8%\x00a\x86/\x95h\xb7\xbb\x85	\xa4\xbd|\xbe%\x9b\xd5\xebNRB\xab\xd3\x99%xl\x9a\xd7?\xe9>8fd[q\x8d\xaf\xdb\x19%\x97\x1f\xe7\xda\x8f\x93r\x174\xf3\\.\xf6i\x1a\xecw^q\x9cY\xa9\xea\x14\x1aHs\x92\x03\xcd_\x0f\xc4}\x86\xce=\x95\x19\xae\xa9\xe7?\xe73G\xf6\xf1s,\x8ee\x18\xda\xc8s#\x02\xd0XX\xf2\x9d\x12\xacV\xe2`U\x1dV\xe7\x97{\xeb\xa8\xb7L\xb7\x08\x9e\xeb\xab\x0cv\x01\xf4e\xb3\xe7\xc6\x16\n I\x01\x00\xc8\x923\xa5\x81\x1c\xa5j\x06\x10\x8b\xd3\xcd\xae\xafB\xa8V\xed\x92<\xaf\xc4\x93\xd7\x1cg\xe1\xbc>WV\xf9x\xadV\xa9D\x94\xc6\x9b}\xd7Y/\xc8H\xf0~*<w\x0dwb\xe6\xcc\x82\x0b\x9b\xbb\x98y3\x18\xd5\x11\xeb(\xb1:\xa5\xb1\xfa\xc6\x84\xc0\xa4V\xa1\xc6\xe1f@C\xe7\xc8`t\x8e0Q\x0b\xfa\xb3\x91\x16d\xa2\xc5\xcc\x81\x8e\x82O[\xe0\x1f\x9c\xc1W%\x08G\x0b\xe2\xa8\xe0\x87\xab\xa9\xc3-B\x04Zb\xee+U=\xcdc\xc1\x19\xba\x06\x9b\x8f\x96C\xa6\x96@\x93\x02\xe83\xc4g\xcaj\x0c}\x17\xc0\xf8\xd3\xe8S\xb5\xc6\x06\xe9\xb0\xa1\xb0\n\xd5\x1c\x1f\xd6\xb2\x8b\xad\xbd\x1a`\xbfA\xe7\xd0\xba`\x87\x80\x9dg\x12@\x86\x10\xb7|\x12.\x17\xb2\xab,\xb0\x91L\x1c\xa6\xd78|)h\x1b\xf27\xde\xcf6\xcfL:\xb7\x90\xd4W\xb3N\x89\x9b\xba%a\xd6\xc6,\xfc'\xa3\x00\xe1\x065\xfe\xbd>\x1b\xab\xf7\xe4\xe3\xee\x9e\xc9\x04(\xc0\x91Z\x1b\x8eT\xd7\xb1\xad\x94\x03\x04W\xf1\xfe\xc4\x81*+*\xe8b\xedI\x83\x18H\xda\xca\x83\xbf\xee\xc4\x81J+\xda\x87\x1b\xf1\xde\xa6l\xf4\xfax9\xcalN\xf4\x8f1aKQ5\xfa\xffg)\xfa\x7f\xb1\x1a\xfd\xbfZ\xe3m_\xfe\x8e\xfe\xef\xfe\x8a\x0fI{\xe9\x1f\x1d\x04\xb5\xb4\xdd\x01)\xf1a\x8cQ\x85\xd5\x85\x95R0 ]+\xbbQR-\xdf/\x81\xd1\x9b\x1b\x0fboY\x1d\"\x0d\x9a\x96&X\xf1^\x85	\xa7\xcbE\xd6t\xe2\xfc@\xff\x96\xf9\xf7_NlN\xbb9\x80~\\\xc25\xa6\x11\xe6\x9d\xe1~\x8e\xcb\xfb\n?\xb1\\\xc9\x02\xda\x02\xc9E\xdfsf\xc4\xd9\xe6#\xe67\xbf\x05\xd0\xaf'Z\xe6\x9d1?\xbe\xcf\xcf>O\x1d\x7f\xa0\xf9nL\x10\xc6\x12\x97\\\x85*k?N?\xd21<Hb\x9a\xc4\x84\xd5R0\x9f\xa2A\x8f\x99M\x9c\xac\xb0\xba\xa8\nK\x0e\x97CM|\xf7\xce\x1e\xc9\xd2F\xf9\xad\x0b\xb7b\xe8\xe7+\xf1\xc4\x8a=\xb8oxGLo\x1f+\x8d\xf7SN)\xdc\x9c?G\xad\xe4\x92\x8b/qj\x93m\x87\xcb\xb0\x95$\x18\x93F\x81\xb7/\xec,\xd5\xe4\x18\xf4\xe9J\x0c\xfad\x05^Z\xbb\x1f\xf7\x0dL\xc7\xc083\\4\xc0\x9c\x83E\xb0\x96\xd5\xc2ju\xc0Zg\xf76\x0b\xfd\x9f\xe6\xf8\xd6\x9a\xfd\xf8xw\x01\xd2	x8\xf5J\xacQ\x87\xb7\xb6\x1c\xc6\x1b\\\xc7\x84sx	\x929\xa0qD\xe7\xd7\xd1}}\x9a\x91\x8fx\x93V\x02\xa3\x16D\x0c\x1e\xf3\xce\x92)\xe91\xfciO\x97\x83`\xfe:\xe2\xe8\xe3_\x03\xe87\xe7\x14\x7f\x0b\xf1\x8d\xeb/\x98\xb1g\x93\x94\xd5\x9a#\xd2\x97\xd37-}_-?\xaa'\x10m\x9ds\xfe\xb5\xb4\xac\xd0\xe1\xd4V\x00'\xb7\n5@\xecm\xf9\xf9\xc9L\x19\xc7\x13o\x86\xf2\x86X\x8a\xcf\xb2\x94\xed\xbb\xe0\xbe\x93NH\x14\x7fB\xad\x15\xc3:\xc4\xe2\xe1A\xed\x10A\xea(\xef%D\x1b4j)E\x81\xc3\xdd\x8d~r\x00\xdf\x97\xf5\xfa\xd9\xa1\x10\xde\x81J\xf9\xe0\xeb\xc4\xbc/L\nG\xafH#\x9e\x1e\xde\x01c\xdaDb'1`\xde\xff\xe8\x1f\x17\n\xb3F\xc0\xcf9\x15\xf8h\xfd\xc1\xa3\xaa.g\xbe\xcc\x82Z\xb5E\xac\xac\xeb\xf5\x02\x01\xc5\x80\xd8~R\xbc\xc5\x17\x97\xf4\xc1\xf7{\x8e\xa0\x804\x9b\x17Fu\xc5\xa0\xf8P\x84R\xff\xff\xed+\xc2\xa2\x9d\xb94\xdb \x06 V\xcfW\xfa@T\x0b\xbd\xfa#\xb1\xce\xde\xfbv\x02\xae\xefv\xe4bb\xd7$\xcf=]b\x85\x02\x8b]\xf00`E\x98\x18$\xe3\x1a\x1d)\xcb\xe7\xd1G\xf1\xd5\xae\xc3\xb8\xb1K\x82\xf4<\xca\xed\xce\x96\xc2A\x87\x9c\xe5\xeb\xfd\x1d^\x07\x04\xcfY\x02-&\x0d\xce\xcc\x1e_k\xa6\xa9>IZ\xed\xa7	\xe6V\x9f6r<q\x1c\x81\xbf\xf9G&\x1d\xfd<\"\xf5Z|\xbd\xb7\xc0[d\x8a\xcb\xdd\xb6|\x00Y\x1b`?\x8e\xa3jj\xce\xb6\xe6\xc8\x81\xc4`\xc6\xdedO\xc2\xbf\xba\xee\xfcf\x1at\xcf>\xfe\x03\xebNL\xf29\xb8\xdc\xe3%\x8f\x08\x97\xcfZ\xa3\xa25\xc2I\x0cUJ.\xc2\xc4\x11\x9a\x99\xc7\xf5\xfb'j\xac\x8a\xae)\x91\x989\xa97\xad(\x01y5V)\xf2zbj4V\xf7O\xc3\x17\xbf\xef\xe78\x90\xa7\x8f\x03\x10o\xd2A\x93\xee\xa6\xca\x8a\xba\xb0+\xe6l\xc4;\x17u\xc3\x90\xf80LO\x8f\xc4\x15\xd4xg\xb8\xcc!\xe2\xbb}\xc5\xb8\xfb\x97\x1dp\xda\x9c\x9coj/\x89\xf4\x1f\xfb\xfa\xdf\x88`\xc3\xd6\x0d\xfb\nq\xdd\x0f[\xf02i m\xcd:<\xdc/E\xfa3\xf7\xaf\xa2._d\x14\xe2\xef\\C\x84oI\xab\xfa\x8d\xfa\x1f\xbb\xe9\xe7\x11\x87\xc0\xa8\xfd\x86\x80n\xd2\x12b\xfaK\x0e\x14!B?\xc8\xf3\xc6\x90\xb6\xcab\x9b\x0b\xb3\xd8u8<\xe8}z>\x19>\xe0	\xf3\xbd\x10N\xa7Q\xde\xe0c7jaa-dw\x1e^\x1c\xd2N\x8a\xccoe\x81\x84\xcd\xb5\x85s\xad\x0f@x3r\x91O\x03j\x88\xfa\xa2\xf1\xa9\x15\xf8\x83:\xd5\xe6\xa4\x94\xbbS\xc6\x8cc\x88\xbd g\x9cF\xabh\x88>\xf0I\xdf\xf5=\xcb\xae\xa06\xd6\xcfq\x9e\x83/\xdd\x08o)\xda=n,\xcb+\xf3\xa2I\xeb\xc8)\xc0\xf9\xfb\xd83\xce\xdf\xe2QI\xcdp\xedXj\x0f\x05\xd0O\xef\xe3U\xed\xe1\x8d\xeb\n\xa4\xf0\xd5p\x9c$ \xf2O\x00\x110\x19\x1c\x0c\xc69\xfa\xb5*\xf4L\x8b&i\xde y\"\x1d\xa8\xa8\xc3\xce\xdc2vM\xbd\x94@`\x02\xbdp\xce\xf5\xb2\xa4\x1e\x08\\\xcc\x0b\xe0\xaa\xce	\x1e\xa3J\xa18\xeau$\xf2.\x99\xdb\x83\xab;\xc4\xe3kb\xcaN\xa7;\x85$\x7fv\xaf\xac\x1f\x8cb\xa3\x8b\x0cG\xa8q]^I\xb5q\xca\xec\xf5\xb8\xa4c<z\xc6\x84 X\xa3B9\x01\xc6\x86#\x15\xf8\x994\n\xa9\x0cf\x88>\x9f\xce\xbf\xa0^\xffm\xb4\x1a\xef@\xb0\xfe\xbd\xc5t\x8d\xed\xa4\x12\xcf\xe8\x94\x80N\xe1F\xe8\x94J\x14[\xedX\x99S\x86\x1f2\xf2\xbc\x8b4X\xb7\x8f\xfaOn\xe0Y\xd8\xa4\xe3*\xc5p\xc4\x98\x9fG\xa5e\xe0\x0d\xf37{:_?\xcc=sT\x07\xe5\x01\x1aw\xd3\xee\xc3\x9c\xafg\x11\xdd\xd86\x02\xd9\xaet\xbe\x89\xaeM7\xab\xdc\x0bo\xf0\xd5\x9b\xa8\xefz\xe9\xd3B\xbe\xdcy\x187\xd0\x9c\"\xf4\x1a\xe9~Z0\x84\xac\x827 \x90]zs}\xf8\xab\xf4}\x00\xbc\xf8\xae\xf3IS\xfe\x12'm\xeb\xec\xfb\x00OU\xeb\xfc\x10\xb5\xe4F\x8e\xc9\x91\xf0C!\x93\xbf\xc4\x9a\xfb\xb7\xf0?\xaea.\xfeL\xb7\x1f\xdc\x909\xa3\x11\xcc\xf7\x0f\x97\xe20\xbd\x1a\xfb\xcb\xeb\xb0!\xbf\xc2k\xbej\x1d\xc4\x02\x10\x9b\xce{\xf9\xd9/\xa6\x19\xae\xcd\x1a\xc3\xf3g\xf9~9-\xd3\xf4S	jG\x01\xa4\x171\xd7\xef97\x7f\xc7\xe4\x08<6\xb8\x1d\x06\x91\x16\x10gPJ<7\xaf\xce\x85\xd5$)<\xb1r\x1f\x0e\x1d\xa9\xd0\x12\xb3\xff\x8d\x98#\x9b\xa3\xdaH\x0c\xc1\xe5\xe9\x0e\xbbS\xb4\xb9<\x1e\x9b[T\x1cuYeWX\xbb\xcb\x0d\xab\xd3\x05\xa7[<\x9a(\x8d\x0b\xae\xcc<n\x1e\xbb\x88\x19\x07\xc1l\xf8\x80:L\x9b\xb7)+|\x1e\xc7\x91\xb0\xe6\xe3t{\xe368\x01\xa3F\xf9=\xfd\xff&\x9f\x1a^_\x8by\x9fD\xfb*\x84\x06\xbdYTV\x1b\xf1\xe6\xd2]^3\x17\x07\x00r~\x1d\xd6\xa4\x82t\x15\xd4\xff\x15\xea\x7f\xba}\x0c.R5\x8c\xe6\x92\xe3(\xad\x89\x9b2w\x93{\xd7\xf5C=?^\xdaK\xd1\xab\xda\"\xe6g\x15\x1bH\x1b\x1b\xc4\xda\x85\x86\x00\xc1aw\x9a\x08t\xfbB\xa3\xea\x0b\xa3\xeeN\x9a\x0b\xdbw\x7f\xae\xaf\x85\xf0^\xc8'\x04>\xcf\x0ei\x8f2\xab\xb3%\x96\xb5e\x0d\xea\xfaS\xd8x9\xa5\x03\xc7\xf1p\x90\xe0\xbb\xf0\x16\x96\xf1\x97\x06\xe3\xe4\x19\x98\xff\x14c\x1aO\xe7L9\xbb\xbf\x80\xfe\x06o\x9e&\x7f\xcc\x89\x03\xa8]\x03o\x9c\xcfW~\x9a\xc1\x98&\xd6\x97\xab\xd8|\xf5\xd9\xae|8*j\xbd\xe5\x0fZ\x0f\xe5\x04\x00 a\xadl}\x94\xf9x\xf4\xc38M,\x92\xca\xc7\xe9\xe7\x81\xa4\x81\x1e\xa9Q\x98}i_\xb45\xaa\x90iq\xe3\xd3]G\x88\x07+0\x92\x8e_\xd3>\x9a\xb4\x023\xa6\xcf\xdd\x88}\xac\x8d\xe85_r\x96YI\xac\xa7\xc5\x90\x14\x17*\x84hU*\xc2\x10\xc9L\xc3\xde\x15\xcc\x0e\xb4\x04\x02\xa1z\x8dh\xd2\xa9\xc5\x9a#\x15\nD\x98\xbe\x82B\xc1%h\x9f\xfe\xc3l\xe6\xddo\xe1\n\x87\xb9\xa4\xa1\xac!\x80\xe2=\x95\x02p\xf5W\x9d&\x8a\xfe\xdd(I\xc6\x1eq\xe5)\x8c-t\xc3\xe2\"b\xd87\xd2U\xc7\xd0\xb9\xe94F\x0d\xfd\x9e\xe1\xe3\xd8\x07\xe8\x18\x9b\xde8:\x94\x139n\xc0\x89\x81\x8dG\xc9E\xe7\x8e@X\xd0\xbe\x9cC%\xca\x8b\xe7ou/\xbf\xa4\xa7\xf8\xc1\xb8\xee\xf8\xbf\x9f\xb7\x8b\xfd\xdbD	\xa3R\"a&M\xad\x82\x00j{q\xb5T\xd6\xb6\xac\xa4&\x96\x80g\x11\xcdw<\xcdg\xd1\x1fV \x02\x9aY{\x0bpS\xd7D\x984J\xd49[T\xca\xa7jj\xbdq\xea\xa8\xee?\x0c}\xf0\x16\xcca\x8d\xc2\xdft\xd5]\x1aq\x8e?\x00\"o\xc8\x07N.\x9f \xb7\xcc\xcf~,@\xa4\x06\xf0\xee\xef\xaao\x02Q)\x05T\xd3w\xf3Cv\xf1\x89>\xfc-\x9f\x02	\x105\xb4\xb2\xb5\xc1\xdeVo7\xe6d\x06\x90)\x04\x04I\xba\x10=^\x1a\xd5E\x02\x8f\x1fs+q\xd7\xcf\xdbQN\x00\xc1f(\xaem\xfe\xdc\xc8\xce\x98\x94\x12\x86\x97\xe8\xe7\xe4\x99k\xc4 \x8dJ\xe8\x97\x1a\x89>\x04*\x83\x13\xc2\xa4R\xb5$\x92\x88\xb9UV.,%\x18\xd4JIq\xc8\xaa\xb2\x88\xe9aA\xe2\xda+\x07\xe3\xd6\x9f\xb7\xbb\x7f\xdf\x9d\xa7$m\xe0\xdf$\xc5\xb3\xd6\xe3\x80\xd3u\x19,\x0eo\xdau&\xa5B$\x95\xf60\x01\xc9\x01\xba\xf8\xe3\xf0\xaf,)\x07\xad\xbd\"5I\x0b\x12Ri\x81\xde\x0c\x8f\xe7BR\x83.\"m&DZ\xac\xbc\xa9\xaf\xd3\x94\x90\x0c\xfb)\xcd\xe1I\xd4\xcf\xcd\xf5'\xed\xa7s\xa7\x10\x98\xcdZ\xb1\xed\x90\xfe\n\x83\xd6\xf5\xca\xb0\x0e\xca//\x1f\x80\x08\x8d\x1a1:\x05j\xe9\xfeBh\xbc+\xdaFbZ\xfbX\xdc\xb2h;\xb6\x1e\xa4\x8f\"\xd4\xf8\x13=\n\xf6<*\x91>\x0c\x83\x06\xd5e5XF\xc0{E\xc7x\xd4U\xb5(\xd3\xfc\xa5\x8d\x04\x8f\xfat=\xfcO\xa5\x9e*\xf3\xed\x16E\xcb\xe1\xdd\xdb\xf0G\x9bd;\xfc\x13~^g\x99Ok\xfd\x83\"I\xa0\xdaZR\x8d=\xa4\x99\xb3\x86\xde\xcar*\x97\x07\xd0\xa75\xa9XJ\x9f\xe6\xc1\x0e\x17\x9f\xe14\xa9p\x18@.g\x06>\xa1[\x12\x86\xc5\x9a\xb0\xa5\xdc\x8ai\x0b6#\xd5@*\xe6\xe5\x03\xc1\x1a\xc5\x8d?l\xc1\xddKv\xa3\xdd\xb4~H!0\xf9\xea\xb2\x01bWR;\xbb\x86Iu=\xc4}\xd5\x0e,\xd8[ \xae \x06\xb9\xab\xa8J\x91\x1e\x1d\"\xb9\xcd\xe6T[\xb1`W\x9e\xd0%\xd6\xec\xf9zJOa\xf5\x8c~\x8a\xfbV\x86\xba_[\xbdO\x89\n\xcb\x14\x89\xc9kT\xe8G\xcc7\x85\x93-2'\xab\xb2\n\x1brJ\x92`\xb1_\x8b\x10\xfde\xd2\x8d\xfc!\xcd\xfbE\x1di\xfc\xb9\xa8\xb6v`$\x8b\x8d5#\xd5l\x90\xd4g\xde\xd3))\xac\x8c$ y\x90\xc0l\x1a\xfd\x9d\xf7t\xf66\xa0\xd5\xcc\xa7s~\"\x10\x9a\xfaKv\xb1\xea\xe1\xfe\xa9R@b.\xdd\xd7\x1dK\x0ebW^9\xdaG\x06\xe3\xfeA\xe9\x18\x11c\xc2\xff&\xf5\xc6\x84o\xd6!\x97?\x8c`\xfd3t\xb1[}\x1a\x1e8\xe2\x9e]\x16\xafS\xb4(\xcb\x0b\xd7\x8a\x0f$\x16\x84S\xe9/\xf4S\x12\x8d\x95yv\x8b\xa3\xdb}\xef0\xe1\x0c\x8d\xcf\x8e\x0c\x97\x1c\xa3\xc2\xd2\xf7\x17\xa6Sc\x15\xef}\xb0 \xc5\x1e\x91\xad\x0b@\x02\xf1\x86\xd2\xb6\xa2\xfbc\x11;\xc6\xd7x\xf3\x9c3\xa7\xdf\x0f\xaf\x17n\x03\x00\"\x8ai\x9c\xfd\xb2\x07\xd7\xcf\xa0\x03\xefl9$\xbd\xcf_\xae\x1a\x0c\x97\xd3\x0d\xde\xba\x98s\xd9\x00\x14\xd5\xda$\xd3\x0b\xff\xde?:X\xb1\xb3\xb4\xd6\xf3\xc9\xae\\\xcf\xe6\xc2*\x81\x18\xa3\xb2\x92]\xf1\x88I\xf2\xbe\x03\xc7e\xcc\x96\x8a9\x89\x92\xa5:\xbb\xb0R\xd9\xaf\xbc\xce\xf5\xee\x84\x1e\xc2\xab\xc3\xd2\x15\x03\x12\xc2\xdc\xb7\xfe\xb0Y0\x1bu\x8a\x97FtBo\xd2b\xc2\xf5^kZ\x99\xd5\x85\xcd\x85\x95xb\xd5>d\xe4\x94\xeaa6p>\x9f\xa3\xb9\x9a\x1aK)\xc4\xf4w\xa3\xa2N\x88\xa4\xfbzdP;IK\x8a0xS%\x14Y\xecX\x96S\x8ag\xd7\xecGm\xa5%\x95\xae\xb1\x8eVv\x1a\x8e\xdf[\xe1\x17\xef\xf6\xf4f\x8d\xe5\xbe>mh\xe1k$@\xe5<_\xbc\xa7\xd3\x85\xc0csq\x15&\x11h\xcc\x9d\xda\x0fc\x12Bpw\xff4<@\x00LZ\xcf54\x87{\xc1\xd9.\xf9\x81*\x958XY\x87*\x87S\xca\xcb\xe8n\x195\xa0\x9bR\xbby\x9e\x9f\x00\x12\x8a\xd6f\xac8?\x88\xddj\xb7\x9c\xa1\xb1\xd9\xe3\xeb\x98*\x81\x1c\xa4[C|b)W\xefT*Z\xe3j\x08\xc4|\xd0\x9a\xebX\xf7\xf1i\xab\\\xfe\xe2\xe5\x864\x10-\xa7\x1aa\x8f%\xa6\xec\x1a\x0b\xda\x84\x18\x10\xaa\x16\xb0\x99\xb4\x11\xe6smIr?BRwFY-.I\x8b\xc4[\xdbr\xf1\xf8\xc2\xad\xde\xfe\x0c\x14Z5\x9bi\nI\x1deu\x95\x93mu%`jO\xfc\"\x87\xfe\x9eM\xff\xbf}wN\xa9z\xc4\xe7\xab\xc4gFv\xf6<\xdc;I\x119c\x90\xb4x\xd2C\x0d\xa8\xa3\x05\xb5\xa5\xa4V\xda]k\x1f\x16\x84q\xa9\x11\xe8\xee\xdbo\xd9\xcevR\xb3\xf1;\xfa[\xe3\xebe+\x04v\x08\x10\xb8>\xc8\xb7S\xfb\xa2K\xb8\x01Nz\x85\xc5\x16\xa7\x94\xa6\x84+\x03v\x8d4\xa2_|\x18f\xd05J*\xebB`\xd2\xcf\xa2k\x8c9\xe1\xe1\xd9])!\x04B#\x92\"\x08@]xgk\x0ez\x93\x86\xf5\xc5\xf8\xee\x12;\xe4\xdb\xef\xf9\xc9J\xfc}\xe9nl\xbcj \x06\xd35\xb9|mU\xa5E\x07\x9d\x9a7\xdbV\x1d\xc5uN\x93\xe2$\x00jA\xc6\xfb\xdf\x9a\xd0w\x9b\x9f\xe7\xb3\xe7\x8e\x1e\xb2kmK#\xfe\x90\x9fE`I\x17OE_\xc3\xeb\xb9u\x0cE\x1b5XWP\x89\x9d\x0c Fmk|^\x81@\xde\xb9\xb0\xe6_\xf2	\x81\x0f\x1f\xc3j\x89\xb3U\xb0\xa7S\x89\xcd\x9bl\xf2\xe2\xd4h\xec\xa5\x97\xfbSv\x19\x06\xc6\x9804\xd6\x84\xc5$\xadO\xfa\xdf*Ir\x08Q	lf\xe2d\x81\n\x84\x1a\x0b\x10bx\x9c\x18\xe5\x08\xe2\xccl\xe3\xe6\x0dj\xde\x1c\xbf\x8c~\xefN\x9cr\x121e.\xe0\xde\x03\x11A\x1bE\xb7[x\xe4\xfbM\x8aK~\xdc!\xb6\x0d1\x08\xb1\xbc7`w\xe1\x95M\xd9\x982s\x0d&\xccZ+\xc5z\xe4T\xdb\x11kP\xe1\x85\x0b;C\xcd\xdeWv'k\x07\x8d\xad30\x92\x98~w\x85^\x8d\xd7\xc7vC\x970\x03\n\xeb\\x|\xd5~\x8c\xa0{\xe0\xf6\xca\x86,\xd2t\xdc\x18D\xf7\xf6\xfc\xa8.^\x14p\xb9\xd9+\xa5\xfbqc\xc5sR\xc48Z\xe81\xb4\xf0+h\xaeoo\xce\xc6AR\xbd\xad\x84H\xbbJj\xc0\xd9\xde\xef\x1b\xd0VJ\xe4\xb8\xbb\xcc*\xa5-\x89e\xb7D\xefFy\xec\xb1\xd2\x97\xa2%U$d\x93]Q\x13\xfas*|\x7f2\x94\xeaZ\x99*\x7f>\x11\xc7\xe8d4\xe3xl\xe2\xfc\xdb	\x9c\x97X\xaf\x99\x84\xcd\x1f9uI5g\x93h\x95q\x9e\x81\xecg\xd4\x9d#\xeb\x84\x93I^\x7f\xac\x06\"`\x1dq\xb5\xe1\xbf\xe6\x96\xe1\x9f\xbd\xdb\xe0\x9a\x8e	\xe0\xbd\x8c\xcb\xbe^\x8b\xbf\xf5H\x86\x9b\xde\xfa\xd7\xdbrp)\xfd\xed\xca\x8eq\xc8\xb6\xb8\xb1\xeaH\xc5\xd1hp\xae\xda\xf5f#.\x9cA\xaaL?\x04\xe9\x96\xc1\xe6\xbc\xe0P\xb5U\xb0\xb9<\xb0\xb9=\xbc\xe1\x8eT\xd2x\xee\xe9\x97\x8aPb\xbc\xff\\\xbc\x03\xa5$\xe9\x7f1\xae\x07\xfaF\x07cL\xfbX\xfc\xb8)\x8b\xf7JxS\xa71{!W\xa1\xce\x86\xb1\xbdS1<>T*N\xf5\xd0\xaa\xbd\x98M\x8c\xff\x8e\x01\xe9\xb0\x11 <\xf3\xdbn\x94\xda\x9cxrP;)\x8d|\xbf\xf4Xl\xe0b6!z\x06\xc0\xfa\x85\xa2\xa4<^\x16\x9a'\xcf\xd7\xac!\x85K)Hy\xb5\x12\xf4\n\x14YTR\xe5\xc4\xfd\x15u\x120\x84\xe9T\xb0\xd3\xb9\x16)u\x8b\x10\xa8\xbd\xf4l\xd1\xbe&\xf6/\xf7\x01P\xa2\x1f\x92\x9bl\xbej\xd9\xa6\xac\xccf\x1akJCf\x1b\xadJ\x81#\xb5v\xac\xe0\xfd\x0f\x8d\xba)\xf5\xcf\xffJ\xd2\x07\xd0\xa7\xaa\x19\xae\xcb\xdf\xda\x93\x01\xf65\xf8\x80/E\x12\xe6\xfdwC\xaeO\\\\\x8b\xc3\x14\n\x8e\x9a\xb0>%\xc6\xfe\xaf\xad\x07\n\xf1\xf1\xee<<\xd23\x11\xef\x92T\xde\xcel\xc0\x9c=G$\x97\xdcGH\x13\xb8\xabW\x1b\x84\xd3\xd9/o\xce\xc5\x81\xec\x12\x0e\xc8\xe3\xfe\xfe\x95{t{\xca9\xb6\x83\xa3\xd3\x93\x82Tt\xbd\x12\xec*\xad\x91\n=\x89t\x9dH\x9d\x02\xf1f#.\x9b\xb3\x01K	\xc4\xaen\x1f\x85^\x11&\xfc\xe8\xcd\xe6\xdb\xbeQ\xb6\x1f\x11]\xd8\xb6: :\x84\xb4%\x90\xb4S\x8a\xd9\xdbs\xf1\xf1\xd4~\xb8\xa1\x83\xb7\x86R\xbb\xc8`<\xb4d\x97\xa4m\x8dI2cPL\x086\xec\x96*\xb3v=n\xb4\x9d\x1cTy\xb8\xac\x8e4\x8c:LJ\x0e\xc3m\xdd\x93\xf1\xde\x8a=\xe8H\xcf\xe7\x82\xa4p\xbc\xbb#\x1f\xef\xd0\xefw\x0d\xed\x80v&\x0d\x16\xe4T \xaf\xa2\xeeha\x9cc\xa4:\x06!\x06\xe4\x16\xa2\x83\xe47\xb1\xbf\xbb\x85\x03\xa4L\xfe\x11\xc7\xfa\xf0\x9e\xddkM\x1c\xe7ux\x9d3N\xa0h\x12\x10\x97\x1d.\xf3:\x99\x184\xad\xf59\x05\x12\x14X\xda\x0c\xd7\xe5\"p\x1f4\xd3=\xb0\xa5\x85\x93k\xde\x19`\x7f\xae\x173\xf1(\x80\xec#\x86\xfb9T\x8ak\x9f \xa6\x1aI\x8c\xef\xaa\xce\xb1xeh:\x1e\x1e\x9c\xee\xad\x00D\xfc\xbb\x86\x84\x85\xd7\xb7\xe5\xe1\xc5\xe5{\xa4Hu(\x14/\x93\x04q\xc4\xcf\x0b'\xf1~\x8b\x96\x18</\x9f\xbc\x1a\x1b\xde[\x9f\x89[\xba'I\xe9O*\xac\"\xbaE\x9a`\xa0\xc5\x95[c\xf5&\xa9\xe2`Bo	\x0e]\xe3\\\xffE#oX\x07\xa9\x95\x92?\x1ag\xdf\x0d!\x0d\x87+\x12n,\xb5H\x9a\xc2\x84\xd4(<\xbdN\x8b\xed%\xd5\x98@\x00\xc2\xb1\x19\xde\xa2W\x08:\xee\x12\x07\xa1V\xee\xf1\x94\xd7u\xfcj_\x01\xc6\x11\x80<2\xa0-lv\x17\xeeY\xbc\x131AZ\x14\x90Duc\xff\xb6x\x98\x8e\xb3\xcb\xc9L:\xcf\xc3\xde%\xa1F6\x11\xfd\x99\xff\xc6\xe3A\x9cI'yqUr:\x96\xbf\x9e\xaa\x9ba\x0c\x17d:\x97\x88\x99?{>\x0e\x08\xb0\xff~\x1f\x085\xa8~\x1a\xe9\x9b\\A\x00\"\xa5I\n7\xb5V\x0d$9\x80>\xf9\xcdp\xdd\xe64\xff\xb2\x95\x85cs\xb8r(\xa7\xb5\x89\xf7\xb3?;\xcf\xb4\xe3\xf7\xed\xf5)\x15\xc5\xeba\xd4nw;\xdc\xb8u\xc1\x16\xdc\xb4h'>\xdfW\x8cm\x85\xd5\xd8B\xed\xd3\xbdE\xb8n\xe1v\xdc\xfb\xe3V_z\x0e\xcdj\xfa\xf9\xa0\xdf\xd3\x16\x84\x12\xdeS\xe0\x9cP\x9c\xcbdBj\xa4\x14m\xfe\xc2\xda\x03H3k\xd16T\x87\xc7I\x9a\xb7\xd8\x9d\x18\x99\x14!\x9dSt\xb4\xd4%\xf7m\xdc5\xaa\xf9\xfcJ\x87K\xe2n\xc3\x12\xc3PUm\xc1W{\xf2\xd13\xc2\xc0\xc9\x1d\xf1\xd6\xd6C\xa8\xb3:00.T\x12\xa1+9\xef<\x9b\x9d\x84\x06|\xbc9N$H\x87o7g\xe3\xad\xed\xf9\x88\xd5*\xf0\xe6\x98N\x98;\xbd?n'\xadl\xde\xb4~x}T'\xc4\xf0q\xfa\xfb7\x9b\xb3\xbcQ\xf3\xde,\xb4G'%=\xb7\xce\xe1A0\xd0\xfd\xba[\xc6wS\xdb\x0cc\xc8\x1b\xe2\xe7\x1e\x8d\xf5i#\x81\xac\xa7\xfe'\xfb#\x83\x07k\xf1?\xb1S\x8c\xb6\xd5\x9a\xaf\x98:\x05\xd0'\xbb\x85\xde\xcbzx\xd3\xd3\x04Rm\xf1\x8e\xa3\x1a\x88\x97Mz\xc4\x010\xe9\xbe\x86\xdd5y\xd6\xfa\x83\x98\xb5\xe30\x82LzpI\xa4\xbaj+\xc0R3\xfd\x0e\x8dr\x16\x9d{e\x80\x13^\x03\xa50\x8e7\xe5\xffA\xcc\xb7]h\x10\xde\x1c\xdd\x15\xf7\xfc\xb4\x0d\xbbI\xade\x8f\xaf\xdd\xc5\xd5x{|\x0f\xa9\xb6\xc7\x91:\x17~\xe1T\xcf*\xc9C\xac~\x14\xfa\x10\x9f\x1a\xc6\x9b\xd4\\\xa3\x97=\x82\x8e\xd6+_M\x03\xf5_\x9e_\x81\xbb\x1c\xc9\x18\x18\x1b\x8a\xbbH;xh\xeeFl*\xa8\xc2\x87c:\xa3\x92\x00\xea\xfa\x1e\xc9\x12C\xe7\x1a\xec\xcb\xf3}.\x85\xc0\xe6\x06\xe6\xfc-\xa9A\xd7\xc2\xe9\x1e\x7f\xff\xcf\xdbQJ\x9a\xd1\x15\x9d\xe31&9\x14\x93\xa91\xc8\x1d\xa8\xb0afF\x1e^X\xb5\x0f\xbe\xf0\xfbE4\x87?\x8b\xec\xb8\x08\xa0\x8cz\xf4\x8b1\xa3\xdc\xeeh)&\xac\xe60?\xc9\xe9D\xce=b\xcd\x94\xed\xdb\xfe\xa6 \xe7e\xcd\x89\xfa*\x1b\\(\xbe\xec\x14\x0ew\xab\xde\x06k\x07\xff\xe3\x99\\>\xcd\xac\xa5\x12;\xc3p\xe4\xf9\xb3~\xf6\xe3}\xae\x7f\xd4w\x83\xe0d\x82S\xa0V^\x8aP\xe3\x8d$\x91\x0f\xa9\xad\xb5\x06K\x7f\xe1\xe2Mz\x0d\x07\x92|J\xe7,l\xc2d?#\xe9\xfc\xe9\x8c\xacbi\xbf\xe5\xd1\xbe\xc9\xb8\xbc},\x12L:|\xb9=\x97V\xa0\x88\xa7/\xec\x8c\xc1\xb1f\x04\x91\x90\xf2\xca\x96\xc3\xd8\xcf\x12K\xb0\x81\xa5\x1bN\xa3\xc0AI\xcf\x10\xc8u\x92\x00M\xf4\xa6K\x916\xf4\xb5\xaa\xbd\xf4\xff\x87i\x88\xe7\xe8\x1aw\xad\xda{D\xbb\x90\x18\xfd\x95\xed\xa2\xf0`\xdf4DhT\xf89\xb7\x0c[\x8bk\xf0\x18\x01\n/\xe8\x10\x8d\x80\xcf\xf7\x14`\xe7\xc1\xa2\xa3Z\xc3\x17\x0d\xce\x9a\x03\x0d\x83\xb4K`u\\\xf8\xc2\x92\xdd\xf8b\xef\x11)\xc5<\x07DU\xd0<\xd6\x17T\"\x8f\xdd\x12\xf5jN[\xb2\x94\xce\x1f_O#\x02\x08tzt\x8c\x97\xca\xf3\x1e\xae\xb1\xb6\x94\x85\xa3\x94ye\x8b\xa7\xbf\"~\xe0~\x04\x96\xee\x9f7i9\xddy\x83N\x15\xec\xc1\xc9uz\xa6\xb5\x8b\xc1G+\xf6\xd0\xf7\xa6m\x8d.\x15#\x03\xe8\xc3Rey\x0b\xbf\xaf\xb7\xe0\xdd\xa0\xf7'\xbf\x19\x9b\xf2\xd2\x1a\xf2\xa3\x9b+5\xa5\"\x94Z\xb4o\x11\x1fi&\x93G\x1e\x14\x8a\xd7\xa0V\xdd\xfb\xf4\xd2\xdd\x08'\xa6~51\xf9\x8bS\xc20!%\xec\x0f1\xa6\x860\xfb\xdd\xad$\xd1K\xfb-j\x16_\x9e\xa0?\xdc\x07\x87\xeb\x15\xd4\xd8\xa0!\xcd\xa1O\x9bH\x84\x12\x03gmbSa\x15\xec\xa55\x1d\x08\x04\xe6\x12\x90<CZ\xd2L\xd8\x1c\xd7\xdf\xf7\xf3\x0eD\xeb\xfb`D\xa2\x19\x0f\x0dH\xc5\x1d\xbd\xdb \xab\xd2*\x95\xb6e\xd0\x9a\x97U\x86\xc7\x08\x10$\xedC\xa9\xf8\x98\x00\xe9\xd0\xc9?eq$t\xea\xc7h>\xff\xc8/\xa9	\x9b\x9bWoM\xf0\x9e\x90\xd9PA`\xf1&\x9dwl\xd5.6\x8d)\x95\xb8\xbdk\x12a\xb3B\x92\xc2\x14\x82\x9c\xc6I\xa6FQ\xd0Y\xbe\x1e\xbb\xe2\xbf\xdc\x84\xfe\x1c\xd1\xce\xc1\xa9\xb77\xa4\x9e0\x88\\\x98\x14\x81\x8fXX\xe3\x04\xa7\xcaV\xa7\xc0^\x1d@\x9f\xcd\xad\xe0\xbe\x98\xb7o\xc2\x9f\xd9\x96\x1bK=O\xe5\x88]\xe1k\xcdK\xa2x\x1f\x8c\x9a\x01\xa8\xb5\x0f\xfa\xc7\xc2-X\x9a[\x8a\x8b\xd3\xa2\x11O\x8b\x8a\x05\x92\xfcZ\x1b\x16d\x16\xe2\xc7\x9d\x87\xbd\x0b\xcc\xa8\xfd\x0c\x1c\xc0bu<J\xfa/\xae\x1d\x98\x8e\xeb\xba%\xa2M\x88\x91\x04~\x05)\"\x1e\xa9|\xee\xff\xe8\xfcO6\x1ed\x86\xfd(\x0c\x9aY\x08\xd6o\xad\xac\xb4\xf4\x9c<{=\xee\xef\xdf\x16#\x92#\x10\xae\xd7HQ\xe0\xf1F-\xe6g\x16\x89w\xcd\xdf\xec\xcd\xe4\x16\xac\xdbL\x8c\xff\xf49\x81D)\xc6\xe5\x1d\x1a\x7f<5.\xd7\xea\xcdw\xe5\xdd\x94\xe24\xef\xc7J\x1a\x0c\x14\x95u\xe8\xde1N\xf2<\xe3y\xca\xe0q\xdePs\xb8-\xab\xcf\xf2\x9c\x174\xc3\x18\xfc\x1dq\xba\xf8\x13\x125\x16[\x1d\xe8\x15\x15\x8c\xb61fd\x1ebON}kz\x9f\xe9\x010X\xa6\xd5\xad\xe4\xfe\xf6\x07p\x7f)\xcd\x19\xc9\xd3\x11\xde\x9a\x0f\x9c\xb7\x9e\xdd\xd6v\xa1\xa1\xfcR^i~0\xa9\xb0\xb3\xe0t\xcfX\xb09\x1b\x0bv\xe7A\xe35!\xc1A\x1a\x06\x1c\xbe\xfd\x16\xb5\xf29:w\x16\x81\xc2\x16N\x93\xf2\xd0\xc8.x\x984	\xfe,\xcb\x1d\x1e\xe4W[\x11J`\xd0+\xda\x84\xde1\x9d\x10\x17\xa2\xc73\xbf\xee\xa4\xfe\xca)P)\xae\"\xad\xe0J\xb7\xc51\xf5E:\xf6\n\xa9\xcf	\xa4\xb1\xe8\xf5\x1aq\xc1%}\xa0S\xa9<4\xb6RR\xa5=\"\xa7\\h\xacG\x11\x83\xeaW\xbevjb\xed\x83@\xeev\x02<\xc6\x0d'\xfd.\x03\xc8yC\x02\x9a\x9e1\xf8l\xfa\xba>\xe1\xfb~\x9b\x83\xe6\xf9\xf8\xc01\xdf\x94\x9d\xb4\x8eH\xb3\x06#\x13\xc2\x90IB\xa2\xf4Q\xb4\x9e\xcd\xf4\x17\x03\xec\xf7K+\xb9\xbf@\\\x8d\xc3\x9bC\x87\x9c@\x9f\xc9\n\xb8\xdc\x19\xa8\xb5\xcdF\x95\xf5}\xe9\xa7\xcb\xbd\x87\x8es\x1a\x8f\xc9'\x01\x91+H\x1d\x98@\x080\x1bZU\x81\x83\xa4\x13n\xc4\xd9\x8f\xc0l\xfc\x96\xfe6\x9e\xcey\x84\x16\xd9\x13\xa8\xb1\xaa\xc7vK\xc6\xbf\xfa\xa7\x92\xc6!\xe2\xb7\x9cr\x8c\x9f\xb9\x06c\xbfZ#\xfd\\|\xa8\x0c\x16:~\x7f\xdf6\x18\xdf#\x99\xf7\x1c\xf4\xd4o:\xf5\x9f\x06\x9d\xfa\x9ft\x8d=n\xbb\x139\xc5U\xd8\xbb'\x1f\xdf\x1f(\xf4\\\xdb!JHM\x8e\x10i\xae<\x9b~gF1\xb4\xa1\x7f\x878\x8co\x13%k\x1f\xe7\x1f\xf1\x9e@S]/#\xcf\xd2\\\xd9\xb3\xe8\xc9f\x1c\x8fk\xa5\x1f_\xf3G\xf2\x94\xe7\xcc\x13\xc3\x08@`\xd4y\xbd+[\x07q\xf0\xdd%\x01\xf4c!:\xf7\\^\xe3M\x03\x10\x85\xf0:I\xd9\x0bQ^7LRA\x92\"\xa4\xcc\xba\xfcS\xa2\xf2\xba!\xf4\xf7\xef\x89\x99\xbfu\x92\x118Q\xe2eP(R\xa1Qy\x1b\xff\x9f3\x04{\xa3\xce#Hl\x9f\xc6\x15\xcb\xae\xef\x1c\x0f-\xcdvSQ\x15\xa6\xce\xdb(%4|ph{\x04k\xd4\x986w#\xd6\x17V\xb2\xb0\x8f\xeb;%x7\xc4I\xbb\xf1}\x80oH\x1f\x88F\xd5\x99T\xe6\x9f\xe9\xa7\xf03\xa9\xcf\xacz\x8dN\x0c\xf7H\xb6X!\xe0\x80\x9aS\x99\xea$	\xeb\x96.\x89\x08\xd2(\xa5\x08u\x99\xce+\nB\xd3\xf70\x12\xcf\xd2\\\xe7\x9f\x811\xb9\x92\xdd\xa5\xc7\x1f,\xb28\xd0+:\x04)\xd1\xc1\\\xe1\xb4\xb5\xbc\xcby\x01\xf6\xfb\xaa\x15\xad\xd7\xe8\x00\xfa8\x02\x07\x10Ax\x99\xd4\x81\x7f\xf0\"\x98\xd43\x05s\xa7\xf6\xc5\xfcK\xfax\xdb\x94>\x98{i?L\xa4\xe3\xd2\"q8\xef\xa6\xf3_=\xc5h\xac\x06d\xfbZ\xfdU\xd5\x9b+\n\xc6\x85\x9b\xd0\xd6l\x94x\xfd\xfd+\xf6 \xc2\xa8\xc5\xbak\x06\xe1\xe6n\x89Xy\xd5\x00\xb4\x8d\x08\xc2\xa3\xab\xf7\xf3\x16	\xd2C\x8dH\x8a0y+\x11\x1ek\xd3\xcb\x80\x88\xa7\xb8\xb8\xd3\xba\x82JeV\x9dK\x18\x97\x1a-\xc0\xa8\xe1\x0d\xbdA\xa8W1\xady\x0c\x18^\xf5|uA\xa5o\xe3\\\xe6\xa8\xe7\x00\xf9\xf3\xbd\xa8\x03\xfc(\xebS\x97\xb3pOl\x9ai{\x86\xc6\xe6\x84\x8a\xc1\xc7\x98\xb1H\x90\xe2\xd2\xce\x17\xa7F\x1d\x8d\xbdj\xe9\xc4%\x9eS\x02\xec\xfbI+Z\xdb\x81Xa*\x03\x05\x90\x81\xf4\xf2\xef\x87\xd5\x89\xdb\x87\xb4\xc7\x17\x93z\xe0\x92\x94p\xb8H\xe8\xdeYX%\x19>/i\x13\x86/\xe9\xf8m\xf4w_\xc1\xa8{\xe1\xff&\x8d\x91\x83C8\x07\x95\x9e4\x8ej\x87\x07\x95\xa4\x02\x8fj\x13\x89Z\xba\xc8\xe6\xa2ji\xfd\x0d%\x8d'\xa7\xda\x82Z\xa77\xd5:\x9f/\xd5O?Q\x02\\\x07\xad\xfa\x80\xa5\xbc\x16\xdfg\x16y&$\x9ba6\x1b\xdd\xe0\xdc<.\xf7\x02b\xfa\x9c\xe3\xa5\xf9\xeaV\xe8\xd4\xf8tK\xb64O\xc9I@\xce\x04\xd5\xda\xc9_\x919\xbd	\xd7\x8aB`Ak\xfe\x10\xe7Dz\xf0\x0c\x8e\xcf :\xf7x3V\xb9\xcd\x81q)\x91P\x98\x0d\x90\xa4\xbe\x96K\xec\x0c0\xb9	ZKq+Y\xd7l\xa2k\x17@\xbf\xc2\xc0\x00D\x10\x9eC\xb5\x15\xc3\xbb$\xe0\xf9\xe1\xed\xa5M\xed\xd7\xb6\xe6a\xe8\xe7+q\xc5\xf7\x9b\xa4\x9f/o9\x0c\x81\x8e\xbf@\x7f\x1f\xd6\x854q\x0eF\x14\xa4X\x0e\x7f\xe8w\xae\xc5\x91_g\x93T\xdf*\xd2*\x9e\x1f\xda\x1e7\xd2xUN7\xba\x93\x1a\x9c]\xeb\xc4\x97;\x0ecxB8B4\n)\xaa<\x9fS%x\x83\x0fO,?\xa9\x14\xf6\x82@\xe8\xd3]\x87\x05\x0e\\|\xbc\x7f[a\x18\xef\x9b\xf0/\xb5\xb6\xb1\xb4\xc2\xd9\x9d\xcd|\x9ayqr2\xce\x93\x7f\x01\xbc\xe5`u\x0d\x9e\xc5.\xc8\x95\x16|\xb8\xf30\xc2\xf5j)(S\xa6VM\xfe&\xc5\x1b\xd4\x84kM\xc0\x99\x0f\xd4\xfc>\x80\xfb\xdf\xe5g\x1f\x8e\x9d\xb8\xa5\xfe\x81R\x12<;\x85\x05\xa1gl\xa87\xadI\xcb#\x06V.y=\xbd	c<\xda\x8a\xd6\xf5\x7f\x03\xec\xb7'\x90\x05\x1aI\xd2\xfa\x05\x1c4wc\xd7D\x84\xd0\x08\x1f\xef\xcc\xc7}?n\xc1\xb8\xb4(\xbc5\xae;&\xa7\xc7\xe2A\x02\x92g\xd7gI\x7f\xbf\xad[\x927\xc8\xce\xe5\xe1\xbd\x92\xc6\xe7]\x11\x84\xfb\x18\x08\xaarJ\xf1{~\xb9h\"\xcdbtr\x84\xc4\xeb'\x7f\xb7\x1eS\xbe\xdd\x80\x9e\x1f-CZ\x88\x1eO\x0eJ\x97\xf6@\xb6\x95T\xa3\xac\xb8\x9a\x997\xab \xc7\x17\xca\xe9C\x9a\xd08\x8e\xdb\xe8\x1b\x13\xa2\xc8\xaau*&\xb7\x8dV|=c \xbe\xbd\xb4/\x8c\\\x9f\xa0\xbc6\x0e^\xb7\\\xae\x8f\xd0\xe6\x04\x93\x82@\x0f[\x14\xb3`snD\x9d\x9d\xb3\x0bo\xa2	e\xd1qN0\xd6\xf1\x98\xb3Y\xe50\xe91?#\x0f\xeb\x0b\xaa\x10o\x92\xb5\x90VN\xfeJ\x94\xd3\x9ap\xad{\xcf\xf0\xbdp\xcdk\x7f\xf7X\xfe\xe1\x13\x98\xfc\xa5\x0f\xa9\xc5\x1d\xfd\x85\x8b\xa9\xf1\xb7<\x827\xd3=bs\x99\xb1\x8e4\xc3\x18\x0c\xf8\x1f\xc3\x1b\xbb\xd1\xb7	\xe3\xb0\xf6\x91\xd1J\xd6\xf4\xc7>a\xd8_\xe2\x88\xe8\xcd\x81\x00HO\x96\xe0\xa3\xc3M\xe8\x12\x1e\x84|\x9b\x1bO\xad\xdd\x8fI$\xc5\x7f1\xae+\x06\xc5\x87\xe2\xbfc;\xe1oC\xda\xe3\xdb}Gp\xd8\xeaB\xc7p#GhK\xd28qPN;2\x8b\xda\xad\xc71\xdctxm\xbe*ia+\x84\x95$\x9d<\x80j\x8bxa\xcf\x14\xf7(\x02\x0e\x93N)\x05#qU\xc0\xee\x91\xc1\xc4\xbb]\x98\xd1)\x1e_M\xe9#\x95\xc4-\xb2\xba\xf1\x16\xe7\xa2\x92\x82\xf7\x14\xf3\x1a\x90\x18\xefB\xb5M5\xb8c<^\x1c\xda\x01U6'\xf2kl8TQ\x87Ii\x11R\xfd\x10\xadN#\xa2\xac6\x894\xa6gh\x9cLZ\xdc,\xa5\x8d\xa5\x9f\x9c\x07\x7f'\xaa\xac7\xa1\xd6\x1em\xa2\xeb%\xc7\x9a\x11\xcc\xbe\xec\x16{,\x1d\xbfYZ4\xc2\xb1\xd2\x16\x9b\xb1D\xba\xef\x0fv\xe4J\x1b\xfe\xb2#V\xab\xa6<?\xcf\xe7h\xdd\xa9\x01\\\xe76\x9c\xd9\xfd\x8fA\xf0&\xd3\xf3\x878N\xe03x\xf3&\xdd\x15\xc05\x17\xfc)\x17\x02e6\x07\x86&\x84B\x08i63\xd6P\xdf3kL\xe34H\x03\xe1\xcd\xfb\xc5|\xe8=\x9f\xd0\xc8Y\x84oh\x86\xb9\xdcr\x06\xdeYsg`\x1d\x01oz\xa8@\xef\x97\x8b\xd1\xd9\x02\x89\x031\xf1\xfeB\xa8FI\x0cQ\x85\x9cjo\xa9\xdbq\xa9\xd18b\xf3H\xc5\xa6\x0e\xd7\x08x\x7ft'\x1c(\xb7b_\x85E\xaa\xf9qIZ\xb4\xe7W\xbb\xcbS[g\x8f\x90<\xa4T\xca\x19\xcc\\\xa1Vn\x94Fu\xb8\xfaJ\xd2\x88V\x95\x0b\x85\"\x9c4\x01#\x9b\x80\x1e\xb9\xa8\xbb\xf8\xcc\xc0T\xc5\x8e*\xbb\xe7\xe9\xa5{\x85\x89\x9d\xe3\x15C\x13\xcc\x18\x9eh\x86\x9dp\x82=\xb3\x98'\xe7\xd7:q\xd7\xe2\x9d\xe04)0\x1b\x19\xa8\xfeu\xc2\xccEQ\xaa\xfd\xcc5@8\xa0\xd0\xe6vK\xe9\xea]\xa4\x16\xac+\xa8\xc1\x98\xa4p\xac\xbae\x04\xe6\xec\xcas\xff\x94U\xac\xd8y\xa4R\x81*\xc7d\x18\xb4\x93\xa5\xf4\xec\xd5Vtn\x13\x89[	,\xbb\x12\x80\x99u*T\x11\x98\xee$\x8d\xe7\xc3m9\xd8\xe5Ms\xff!\x94J\x91\xae\xf5\xdf?\xb4\x90 \x1d\x16f\x16aG\x8f$)\xa55\xef\xe3\xc8\xd4*\xe9@\x80\xe6\x01\xfePK\x1ay>\xd7\xe5x\xff\x0c\xdfG ^E\xf5=\xaa\xde\xa5v\x9d\x9f\x92+k.\x0f\xc1\x9b\x92\x08eV\x87\xf4\x0d\xf5$!l\xcb\xbe\x02\xce\xe4\xd0\xd4{\xfa\xba\x85\xac\x11\x8e\xc2/=\x03\xe3\x1aO\xb0p4\x8e\xd8\x96\xcf\x11\x9b\xbc\x1f\x9c\x04o\xc9\x8aaM\xd4\xb0\xe0\x03]\x04\x02 U\x1c!^JL\xb0\xc2\xeeD\xdb\x10\x1dB\x89\xd1\x7f\x93\x91\x8f\xdb:\xc5@IZ\x89\x82\x98\xf3\x1b\x9b\x0e!T\xa7\x91\xf2?1}5\xbe+\x0e\x0cj\x87\xdfsK\x9d\\\xd2r[q\x952\xa3\xacV\xe1\xaa\xb2\xf4\xe5\xad\x01U\x98Q\xca\xd8YU^\x97\xc4\xf1\x13i)\x91\xee\xb7\xc6\xf7\xc0\xf8\x84\x10\xc5\xcf\xf9U\x9e\xdb\x16nENv\x89\xe2\x87\xdcR\xdc\xde3\x19\x9d#\x82%\xf7\xd8Z\x02\xaf\x8c\x92\x1a|\xb05\x07\xfbr\x99\x81\x1bX\xc4\xb9\x89\x18\xf7\x89\x19E\x15B\x02k'\xc4\xc0E\xa7G\x14\x94>u\x80\xff\xe54#\x87I\x1b\x11\x88^\x18\x9a\xae|jh\xbag\xde\x81\x12\xcf\xf7\xb4\xb8\x17f\x17+\xebh\xce\x17\xf7k\x8b7\xc7tA\xaaA\x85J\x9asa\x8d\x03)\xd1z\x0c\x8f1\xe1\xe2\xf4\x18\xdc\xbdx\x07\x16n\xcb\xe5\x8f\x81\xcdY\x1c\x89\xeb-\xd0C\xcf\xc7Um\xc1\xc6\xc2*\\\xdd)A\x06\x90\xd6K\xdb\x03\xe8\xc3\x1f\xc0V\x9fVq\xaa<r)\xd4\xee\xf1\x99\x89\xce\xb4\xc9\"\xca\xcf>\\\xcetw\x03\x80\xe2o\x8c\xc3\xf3\xf0\xee\xbb\xece\xcf\xc4`\xb5\n#\x12\xc3\xb1e\xef\x11\xefG\xd8\xfa\xcd\xbb?\xa2\xf9jv4\xb4>Z\x8aY\x8c\xf9\xda\xcf\x81\x02\xc8V\xdeC(%\xa6\xbd\x9dZ\x9fp\x03\x9e\x1b\xda\x017\xcf\xdd\x80\xd1\xdf\x89\x98H\x8c\xf4\xe7\x83\xc5X\xb43\x17\xcfM\xec\x8d.\xe1z\xcc=X*~\xb69[\x18\x91\x1e\xa3\x9a\xd19\x1e\xb7w\x8b\xf7X\x01\xcf\xe6\xc2\x1a\xcf\xf7\xfb\x0b\xc5:\x97G965R\xc1\xc9	\x7f&)\xfe`I\xb5\xe7\x85\xd1]\x856z\xa5\xf0\xe8\xda,\xcf\xb3+\xf6(9\x12\x1d\x04F\x07\x8eT\xe0\xde\xfcr\xe8C\x83\x08\xb8TR\x99YkE\xad\x17\x06\xccF\x17\xfd\xb8\x8d\xc0\xe3\xe3\x13f-\xe0\x01X\x1c\xeda\xd2\x89\xfdbB<:\xa5\xa0d;,o\xcc\xab\x08\xf0\xfaF\x19\xf1\xfa\xf6<\xf1\xf1\x1f\xb7	\x83\xe8\x1e.\xef\x10\xa7\x98\xde1\x0e3\xd2#\xc5\xcde\x16\xcf\xcf\x07\x8a\x84\xb1\xedb\x04=\x01\xcd\xcb\xdb\x0e\xe3\xab\xed\xb9R\xaa\xf9(\xd2(\x1e\x1e\xda\x9e4\xac\x08\xbc?\xb6;\x0e\x11\x08\xed\xca*a\x10y\x9e\xe61\xfd\x0f\x84r\xb9q\xa0\xd2\x02\x8d\xec\xcf\xdb\x9a\x897V]\x01|7\xbc\xef\xf7\x03\xbc\xf9\x868\xb86\xcbg\x92P\xfa\xcc\\=|&\x853\x9d\xbadd\x00&\x8bC\xd4\xfe\xd5\xc0q\xce\xe2z\x1f\xb5W\xfd\x1c\x8f\x9fC:\xc9i(\xb4\xd8qQJ$\xde\x8b0\xc1\xca\x9e\x9aZUk^\x1b\x99>\xed\xf1|\xa0?\xca\xda\x06\xf2\xc6\xca\xa0T.\x82\xd36\xee\xfdm9R\x1e\xab\xbfu\x8c&y\xa4/\x9e_\xbd\x1fO\xae\xdc\x8b\x10\x92\xb8?\x98\xd6\x1fWv\x8c\x95\x12#>\xb7.S\xd8\xb9\xe5\x10^\x893#-,\x08=\xa2\x82\x15\xfdbC\x15\x03\xe2C\xa5z\xe2\xbc\x11\xc3E\x96H+\xc0m=\x92a\xd4(\x85\xecJ\xabx\xeb\xa2=\x9e_\xb7\xe5(\xa5\xeae\xa1F\xcer\xfb\x02\x01\xc0\x85\xf4s\xba\xb5\xce\x9efe\xcf.\xce\x97\x15\xa4\xcb&\xed\xe2'\x92`\xde\xa4\xd6\x90\x99!\x8e\x8e\xbf\x84:\x07\xee\x18\xdb\xd5=--B\xf9\xe9\xfeb\xa4\x9a\xf4\xe8J\x8b\x97\xbd\xa3\xe6\x1f,\xc5\xcb4\x7f;i4\xcbv\xe7a\xd9\xbe#xq\xbd\x19cS\xa30\xbdC\x9cpc\xef6Bq\xad\xd7\\\xb7\xbd\xb8F2\x81\xdd\xda+\x05?e\x16c\xc6\xec\xf5\x989\xad\x1f\xaeh\x1b)Un\xbc-\xb7\x8c\xf7a.\xa59\x85\xe0\xe8>\x8cB\x81}\xe5\xb5\xa8\" \xe4\xbe\xbc\x91(S\xab\xa3j\x9ff9:\xc0\xfe}\x10\xd8\x86es\x10\x7f\xeb\xdf\x05\xd0\xefT{8\\\xbd\xf0Zj\xdd\xfc\x18\x8fcN^\xa1v?g\xb2\xee\x12\x11\x84\x01	aX\xb65\x87\xb3P\xb4V-\x84\x0bF\x0d\xc6_\x93=\xf9l\x13;D\xacn\n\x80\xb0]\xff!\x04\xeb\xc7m\xde_\x80{~\xdd\x897Fu\xc1M\x1dc0\xa1m4\xf2\xaa\xacH\x08\xd6#VC\x12\x86C\xa4\xbf\xef\xf2\xa6KO\x0cc\xa6\xea>x\xa4By0\xa7\x14s\x88\x11\xc7\xb6\x89\xc2\x9cI\xbd\xa4\x18\x0f6EI\xf61\xd2\x08\xd2C\x8d\xc2k\x9b\xb2\xf0\xeb\xda\xfd\n\xc4\x85\xb9\x89\xe3\xbeB\xa0\xf1\x90\xf7\xda\xf8\x15\x82\xf0\x7f$\xad\xb0=\x90\xddg\xd9\x0fp\xcf)}d\x15\xc2\xb7(\xabErZ\x94\xfb\xed!m\x15\xcb\x0bj\x84\x9b\xe6nD\x0c\x81\xd9H\x92\x80J\xacv,>P\xc4\xfb0\x02\xc2\x8c<\xd6Zx<Wd\x17U\xe9?8P(|{\xa0P\xfc\xf1\xd2\xbe\xa2\x92\xc4\xa6j\x02\x80\xc7\x07\xa6CMs\x0e\xa2\xf6\xd8\x80T\x0c\x9c\xb5\x01\xf7.\xdf\x831\xc9\xe1R\xb2\xb8\xf0\xc8`\x94\x95\xd5(\xa0\xd7\xf4\xc2\xd1\xa4r$q\xd5R_\xa7\xc7\x03Y\x07i\xd5\xf4^\x13\x00$\x10\xe2M\xeb\xe6\xc8\x89\xc5\xa5\n\xcc~\xf6\xe1,\x0e[Ns\xce\xa5\xf0\xbf\x96:k.\xb3E\x11\xeb\xd9\x8c\xcc\xdeX\xcbv\xe4\xb6V\xf0`S9\xef)\x14\x9f\x07k\x7f\x0d\xbc\xa6\xd8?Yk\x80\x03\xed \x89\xfa\xffxs\xf8\x9b\x8dY\xb8d\xceF|\xb6\xa7H\x02\x0f\xd6>8\xc9!\xff\xce\xc7\xbf% \x90\xf2\xde(\x14\x0fB\xa5L\xa3>W\x916\xb1\x98\xd5U\xbdZ	\xb3N}L\x9a\x0f\x16\xcc\xd9\xa4\x14m\xd0\n\xde~\xc22	\xb0N\xa4=\xf0\xda\x963p\xe2\xd2c\x97\xc1q\x92\xf4$\xe0)\xd8\x9c\x83\xa1Q\x89o]\xd8I\xa4\x1bV\xfc}Y\x86\x14\xdcXH\xa0\xf2\xd5\xef\xfb\xb0x\x9b\xcf\x94k\xd2\xcd\x91\nk\x89\xe2\x8d\xc4\xf0Si\xae\xefp\xc6\xd0 \x8dJ0k\xd5\x82\x95\xe6y\xcb\xe2\x9dXWP\x01\x17\xfd\x7fwi-\x8a\xed\x1e\xdc\xd0=\x89@\xc8\x81}\x156)\xc5|\xa4N\xedMW\xed\xb5\x7f\xffA\x1a\xd2\x96\xe4|X\xad\x9e\xbe\xf7\x99o\xce\x06q\x94\xf87\xcd0\x0egY\x98\xe1g\x1fv\x8b\xfdg#\x19h 1\x0f\xf3\xf9S\xe0\xf8\xae\xc1q\xa1\xd0\x910\x87\x96Q\xea\xd9\x1fbO\xa4\x9eh\x1e\x17\xe2\x96N\xeb\xe0\x8d{;A\xad\x0d\x8cD\xf1\x05\x02\x04\x01!\xfa\xe7\xd6\x1d(\xc0\xbaC%\x88\x894I\x1b\xea\\\xa3\xa3\xa0\xa4\x06p\xba\x00v\xd3S\x08\x8f\xd2\xf9G\xeb\x0c\x90\xae\x8a_\xa0S\x97\x94\xd4Z%\x8d#\xda\xa8E.\x81\x0eK#\xbc\xa8x\x9b \x93\x0b/y\xf7\x0b\xb2\xfc\x98\xd5\x854\xc0\xbd\xc4\xddG\xc3\xee\xd4H\xb5cU\\\xd0\xdd\x86+FtrOJ\nU>\xb21\x07\xbby\xd3.\xcc\xc8Z\xc1\xc30hX\xc2\xab\xa3\xb6\x9c\xc0\xa3~\xf6\xe0BI]S\x08w\xb1n\xc4\x9aC\x9b`\x1d\xf6\x14U\xe1\xbb\xfd\x85\xb8\xa6]\x14\x9d.J%n\x97\x1f.\x83F\xa1@|\x90F2Qq\x90#\xdd\x0c\x8fa=\xf6\x91\xc9\xdc\xf7\x1c\xa1\xeb\xa8-9\xc3\xd7\xe0\xb5\xf8P\x80f\xa7\xfa\xc4\x1e8\x81x(\xf9\x13\xc3\xc2\xd5\xec\xfe\x06\xff\xbc\x848\xcd\xcb\xa7\xc4+\xae\xef@\xe01\x80@d\xf9\xf6\\o\xbcX\xeb\xf8N\xb8\xb4\xc3\xe3\xe7\xc9zg\xed\xf5\x9a\x06\x8d;M\x1aV\x14\x9f'&<\x10f\xc3w\xd0\xa9\xac\x85\xa55\xd8\x93[\xea\x05\x0f\xad\xcaJ\xc7\xe7\x92\x060\x88\xce;\xbe\\b)\xb4\xea\xcc\x1a\xd2\x00^X\x97\x89p\x9d\n]\xa3LRp\x11\xd7\xec\x98\xb9\xa7\x00?\xed\xce\xe3Z |n\xe3\\\x0e\x05\xe1\xdft\x9d%\xa8\xa8\x9b\x00\x87[\x93\x18mF\xb7\xd4(\x98h\xbc\xa4\xd4(\xf7\x1b\xc3\xda+vTX\x85\x97~\xdf'J\xee\xc3\n\x05Kw\xec\x15\xc2\x9b\x80\x1f\xa0\xe1\xd4\xf3\x84\x0c\xa4Q\x95\xd1}\xd1\\\x13\xf5*<5\xbc#~\xd8\x9c\x8d\x7f,\xdb\x87\xac*\x0b\xee\xa1\x9f\xdf\xac\xcf\xc4#\xfd\xd3\x90lP\xd1yu(\xa0\xf3\xb9\x9f\xa4\xa9\xd5#\xb7(\xca rn\xd0Rx\xed\xffg\x8a\xb8\xae\xccp\xdf\xffS\x9a8\x16\x83\x87\xbf>\xb2\xecF\xbc\xd6\xcf>\x97\x06\x02\xc4\xf49\\\xc4\x1e\x90\xc39\xa8\x90\x05F\xb1\xc5k\xe8\x8b\xe1\xcd\x1bu>\x80\x07g\xf2\xb8\xf6d\xe0\xd14\x0d\xa4\xbej#b:1\xe4h\xe85\\O\x80\x93\xa7U\xc3\x9b\xbc\xb0\xf0\xe4\x0c\x1f\xd7\x13w_5\x9f\xa4\x8e\x89v\x97gzz4\xda\x84\x05)\xfaD\x07\xbb?\xdc\x91\x0bO\xb5U\x89\xa8\xe0%$\xe6\xff\xdc\x08\xf0x\x82\xb4\x9d\xc78q\xe3\xb0Nq\xb8\xa5{2\xbaD\x06K\x80\x94YQ\x07\x8dJ\xa9d\xd3\xd1\xb4\x1f\xb6z\\%5\n\xc4\x9a\xb3\xe0\xf6<\xd4\xa8\x07\xa8V\xaeF\x85u\xc8G\xbb\xf20>5\x02w\xf7J\x86\xdb\xed\xc1\xab\x04|\xb3v\x1d\x86\xc5#\xe2\xc9\xb1\xddqg\xcfd\xd4\xd2\xd7\xf0\x11\x1d\x93\x12H\x86\x06\xad\xa7\xaf!\xffO\xf4p#)X\x8f\x10\x9a\x13\x07Q\xc9\xd4\xea\x89\xed\xf8\xec[\xdf\xdcAc\xbc\x9f0\x06\x7f\xda\xd4\x9b\xb2X\xd8\x0b\xd0_\xcf \x8eW\xb9#@\x8d\x89\x05\xc5G\xfc\xe9Dp\xf1]a\x9d-\xe2\x82\xc4p\xdb+\x91&\xd4q= \x9d\xba%\xbe\xefe>\xa1a\xe1y\xb0\xb6\xd9$\xf7\x1f\x9fp}\xcaJ\xb4\xcd\xe97W\xe4k\x8d\xd4^\xb0\x1aJ\xc5-\x08\xd2\xfeg\xe5\x9e|\xc5\xca\xf5\x99\xe2\xcd\xe3\xbbcL\xa2\xd9-\xc9 Z\x95\x92\xc0\xe3\xedF\x8c\xd4\x0b\x1e\xcf\x93\xa8\xb5\xe3\xaa\x01m\xf1\xc6\xc8\xce\x08\xa7\xbb\xcaq\x88\xc8&M \x8c4\x10v\x0f.\xb1:\x91n6*\x0e\xa8\x95\xbc?\x11B+7\x0d^\xfb\xed\xe9\xb4\xacG\x08\xe8V\xfcJ\xa0\xf6d\x84	\xcf\x0cN\xc3\x93\x03\xda`b\xbb\x18\xe4\xf0\xc6|x\x10z\x87\xe9\xa5t\xc2\x8f\xae\xce\xc4o\xbc\x19(UZ\xab\xb7o\xc3Z\x07IY\xdd\"\x82\xa5\x18\x99\xe3\xb27\x18\x03x\xd6\x0d\xa5	\xd7\xf99\x86\xa1\x19\xdey\xa8\x9fs>\x9dx\x19\xe6\xc7xa~\xce\xd5_\xaedj\xc49\x1c\xc5\xcc\xb9\xa1^\xf4\x99\x8a\x9aJ\x9fR\xe3\xd2\x02\xf5M\x9f1~\xf4\x0f\xa9\xf7\x7f^\xdf\xdf\x060\x87\xcb\x9b0\x7f\xde\x0b\x99\xe1\xbbvc\xc9Xas.\xe9\x1aa\x1a<&%\x12\xf3H\x9b'A4\xac\x85\xa8\xea{|\x1a\xc7\xd7\xf0\xee\x014\x17\xb5D\x84\xac\x04\x9b\xf1\xbd{|\xb3\xa9Y\x1a\xd3\xe9\xafu\xbc\xe6hmA\xd8A\x0cz&\x81@j\x88F\x0d\xab\x07J\x9b\xdb#\xf8\xf6?N\xef\x16'\xe0%TZ\xd1\xbfc\x9c\x04\x1ez\xc2\x87\x0fv\x15\xe0\xdf\x8bw &:\x04\xef\x8d\xe9*\xedU\xf0\x1e\xc5\x7f\xc7v\xc5$\xab\x1d\x9b\xf7\x15\x84\xc3lx\x9b\x18\xfb\xf8F\xccr%i!\x1fB\xab\xbe\xf5\xd5e\x19(\xa8\xb2\xe0\xba\xeeI\xe8L`\xd2.T\x8f\x1a\xbb\x07\xbf\xe6W\xe1s\xd2\xa4fn\xc9\xf6\xfa\xb2\xab\x95\x1f\xd0E\x97\xff1\x82\xd3%\xc5\xad\x0c\x8e7K\x11\xb8\xc2\x89\xe6\x8a\x1a?\x9f\\Y\x03\xc7j\xfc\x1c\xa7\xb2\x19\xde`\xbe\x1f\x8c\xbc\xae\x11\xef\x937\xa7\x1b\x9b+\xcd\xdf\xb4\"6?\x9fOc#\xc7Y\xc8a3\xeb\xfd\xd4\xae\x84\xffE\xa0x\xe7x\x0e\xbc\xd1\xdd\x0d\x95?]\xcf\xfa+N_1\x93\x99R\xd6\x9f\x82\xbd\x14\xfc\x07?\xef\xf9K4P\x8a\xd6O\xba\xc47F\xa3=\xc7\x04A\x18ds\xbb/\x1f\x9d\x1c\xf1\xcd\xbc\x1d\xb9\"\xdc\x9e\xc3\xf4\xfd\xc7\x9fENT\xe3\xd3\xf8\xb8\xed\x86\xd71\x87c~v\x9c\xa1\xeb\xd9\x02\xf8\xe6\x9b\x8b<>\xfe\xc1\xdfn\xaeO\x00\xda\xe2\xbb_\xbfyBK\x88\xdcaS\xcf\x1e\xa8\x94\xa9\xa1:\xb5hq\x89J\x8e\xb5\x80\xa08\xfa\xa0OE\x91\xa4M\x8cd\xff\xf1\xdb{$K\x9a\xc7{\x04\x1ew\xce\xdb(i\x08W\xf6I\x95\xd2\xa8\xdc\xfe\xdb.\xf4\x8b1\xe3\xc9~)\xb8\xbd{2n\xe2t'.\xf1\"(\x05\x96\xa0O_\xf7\x9d\xeb\xa5\xeb\xd5j:\xff\x86\x99\x1b\x0eb\xd6\x81B\xf4\x8d5K\x0e\x03\xe56'6\x15VB\xac\xa8\xf3\x96\xe1\xd5(?\xa1\xf3o?\xb6\xbf\x07j5\xa7\xa4WJ\x9b\xf1\xc7\x11K\xafo\xf8\xf9\xcc\x1aJa\xcaR\xd2\x02?\x17qS\xe9\"x\x83\xe1\x1a\xa7szM\x9b\xa7\xa2\xfeh\xfc\xbe\x9c\xbf>\xf7l\xd3O\xf2\xe3|\x7fLG\x0cf\x1cA\xfe\x98\xcf\xfc\xc4y\x96\xba\xf9\xc0\x90\xcb\x03h\x8f{wY\xbe\x0f\x97\x01\xe3\x17\x9c\xda\xab\xeb\x8a\x00\xdf\x0d\x07\xff\xdd\x18\x80\x14\xdaT\xda	\xef\xbeM\xa3y\x0b\xa1\x1d\x7f\xf3A\x9c\xe6\x07:\xb5\x07.w\x7f(T\x8a\xb3\xc8\x83,M4\x15\x06\xc0\xf3\xfcZ\x8b\xcd\x0d \xd5\xcd5XK	\xfd\x0c\xe7e\x14DL\x96\xeb\x86\xdb\xb8\xd4\xa5W\x039\xdd\x82\x96\nN\xc5\x128\xf4\x8c\x0cF\xbe\xcd\x85\x87W\xef\xc5\xd8n\x89X0\xb9'2k\x9d\x12\xd7*\xac\xb3\xe3\xddm9\xb8\xa3G\"zD\x9a\xbcq\x1a\xa55\x02\xa9\xca\xec\x82\xb7\xb4q\x8f]\xbc\x91@n	\xc2\x8c\x0f\x8avW\xf7\x0d\x9c\xbf\x87mQ<O\xb6\xd9\x86\x19\xb7\xd2\xc5^\x96j\xb8\x9f(b\x11\x86x$w\xe5\x06\xdcx\xad\xc7\x99,\x02%\xc7Y\xfe\x08\xfc\x95n\x1bC\xd5gp\xae\xaefb\x90\xa7{\x1es|\xad\xbe)Ls\xdc{:\xd3\xd2'/\xfb\xcc\xbf\xf0{\xae\xf5\xb7\x03}\x17eV\xfe\xee%\xfb\xaeP\x8ds\x9b\xce\xc6Z<+\xd4\x12\x00d*-\xf7\xb6,\x86\xe8U\n\x81$t\x97\xcb\xe39:\xaf\xd3\xedQ\x84\xf2\x82\x8b M X\xabBf\xa5\x0d5\x0e7\xa7!!0\xf1 \xaf\xc6\x86\xf4P\x83\x94v\xfe\x9ee\x19\xc8\xaa\xb2#\x9c\x98}\x04\x9d[\xe6\xd5\x04\x82\xfd\x9c\xebL\x9a\xebLhT\xfd\xa9\xb1\x84\xc9\xf6i\xf6T\xd8N\xc77B&\x99\xce<\xc8\xca$\x93\x0c \xe0jk\n\xe1#\xd8\x9c\x03Q%\x15\x9b\x12\xcd:\x95PN\xeaGey\x9dwn\n\x81\xcdA\x9c\xbb\xa7\xfc$cT\xb1\x06P\xeep\x82#\xc4SCt0\xa8\x95\xf8\xfe@\x11\xaeo\x1fM\x03\x1a\x10\xafSbAf\x11Lt\xbcM\xb0\x16y\xb5\x0e\x94q2C\x85\xa2)\x1f\xf7z_\x93I&\x99d:oI\xf1\x17]\xb7\x0f\xa9\xa9\xdbQQ7\x90\x01`\xea\xc0\xb6xfro$\x9b\x0c\"i\x1f\x9a\xd1\x9d\x12\x14\x92*[m\x9bL\x7f\xe7\xe2.\xe1'\x19g\x0bg\xba\xcd/\xae\x96\xa2\xc29N\xe3\xdf\x83\xd2\xb1`\xeb!\xfc\xed\xc7\x1d\xf8\xedp).\xfba;\x16\xef:\x8cg\x86\xb4G\xb4V\x89\x9de5(-\xe58\x0d	;\xb7\xc9K@&\x99d\x92\xa9\xf5h &\x02\x85\xe5\x04\x1e\xaa\xb4\xb8P\xbc5\xa6+.L\ne\x1fTaC\xa9\x05*A\xc0\xb7\x13{\x08s\xdb\xc7\xe2\xee_\xb6\xc3RmMA\xb0\x9e\xe3Az40V!T\x8a\xd5\xa8\xb1\x0d\xe1\xd8\x11\x8e\xd3\xb8\xb9k\x02\x14\\J\xf7\xf7\xfdX|\xb0\x18*\x95\x02\xefL\xea\x8d\xeb:\xc7\xa1\x9c\x14\x8f\x0f9\xda\x955\x10\x83\xe6W\x88\x0dz3\xc9$\x93L2\xc9\xd4\"\x01D\x10^B\xb5\xd5\x18\x15i\xc2\xccK\xfb\xa1_\x98\x0e\xeb\xca,\x98\x9d\x91\x8f\xe1I\x11R.\xa9\xbc:;n\xe8\x18\x0d\xad\xa67\xae\x9d\xbb\x01n\xab\xb3;\xb4*\x8e\x88\xfc\xfc\x84\xf1D<H\x00\xb3f\xc5\xae<<d6\xe0\xf9\x0b:\xe0\x9e\x1e	\x98\x90\x1e#\xb9\xdc\xc6\xd1\xb14\x83\n\x15n\xe0\xfee\x19X\xb7'\x1f\x08\xd1s\xbf\x87\xe4\xd7/\x93L2\xc9\x148\x9dm\x13\x16W3\xbc\x99\xcdS\xf7\x0el'\x81\xc7\xaa\xa2ZL\x9a\xb5\x16\xff\xd9\x96\x83\xce\xe1A\xf8-\xa7\x14W\xcf\xdf\x82\xbd\xd5\x0e\\\x91\x16\x8e\xab{\xb7\xe1\x92\xb1\xdc\xf7\xbe\x93\x8c\xb9\x16J\xc5K\x9c\xf2\xfd\x83\xd5\xfbp\xe5\xfc\xad\xf8.\xab\x0c\x0e\x97\x1bI\xa1F\xd8\x9cn|{\xb0\x14\x97\x7f\xbf\x19\x9f\xae=@\x9a\x87\x96\xf7?\x9e\xc1\xe9\xb3\x8c\xca$\x93L2\xc9\xd4\x824\x90\xc1\xc4\xd1\x95\xe11f\x8cJ\x0cG5i\x05\xb7\xfd\xba\x13\x1e\x81\xb8\xf9u\xc3%\x8f\xd8!\xf1\xa1\xf87i\nO\x11\xb3\x9f5\xb63&\xb6\x89\xc4\xe7\x04.\xa2\xcb\xdd\x15*%\xfb\xd5\xe7\x9f\xa8\x85\x88\xff\x82F%\x10\x90<\xb0hG.\x16\x1d,B\xdb\xa8`i\xe3\x9c7\xd7\x0f\x16WK\xd9w\xa5\x08q\xa5\x82\x0b==&\xbfz\x99d\x92I\xa6\xd6\xa5\x81\xa4qe\xc1t\xb3\x01\xc9\xc4\xccW\x1f\xa9BFi\x0d^\x1b\xd3\x0df\x8d\n\x07\xab\xac\x18\x10\x17\x82\xbb\x07\xb7\xc3B\x02\x81\x1c\x0b\xe7\x8f2 \x92\x19\xbf\xb7^H\xc2IG\x16\xc5\x07	\x81\xc6#\xd4\xb0\x94]\x823\xf3\xca\xb1\x95\xc68\x98_\xe1\xf5\xb8\n5\xfcF\x7f\xbf\x88\xce{X~\xed2\xc9$\x93L\xadO\x03\x91\x82\xea\xbc\xfc^\xf4e<\x17\xa4,\xb5\\\xa5\x8f\xd3\x8d\xe8\x05H\x95	\xf9<\xd6H8\x0dI\xbd\x90\xe3\xd3%\xc8YDg,\x92\xea\x8e\xa8\x94\x1c\xa7\xc1\x05t8`\x87\xe34\xb2\xe4\xd7-\x93L2\xc9\xd4z\x01d?\xd4J\xec\xaf\xa8\xc3\xa1j+\x06\xc7\x87\xa0Ol\x08\xee\\\xb4\x0d\xbd\xae\x1d\x86.\x91AX\x9c[)\xede\\\xd7?\x0d\x89z%\xd6\x1e\xb1\xa0\xb4\xca\x02\xa8\xa5\xa9\xe66\xf2:\x07\xd1\x98D\x892\xc9$\x93L2\xb5\x1a\x00Y\x03\x9d\xdaQ^T\xa9Y\x9c[\x86\xbe\x11\x06\xbc?\xaa\x0b\xae]\xb0\x15\xfd>Y\x81N\xe1A\xd8VX\x89	\x1d\xe3\xf0\xf8\x80t)\xde\x7fAv\x89T\x10\n\xa1F\xde\xf4.\x94_\x99L2\xc9$\xd3\xf9	 uP(\xde\x86Ry\xdf\xab\xbf\xef\xc3\x90\x840\x0c\x8f2b\xce\xf4~\xf8rG.\xf6\x96\xd6\xe0\xeanI\x98\xd19\x01q\x1a\x01\x9f\xed/\xc1\xcc\xcd\xd9G\x0bK\xbd\"\xbf.\x99d\x92I\xa6\xf3\x17@x\xf3\xe3Q\x98t7TT\xd4\x85^1g\x03\xde\x1e\xdb\x15\xa3\x92#\xf0\xcc\xa0?K\x08\x14\xdaE\xbc\xb3#\x1f\xf7\xff\xb6\x8b\xbd\xaf\xd8{j]\x83I\ne\x92I&\x99d:\x8f\x00\x84\xd3\x88{\xc4\xe10\x1b\xd7\x15\x94\xd6\x18\xa6}\xb7\x01\x13\xda\xc7\xa1Gt\x88TA\x90\xab\xf5\xad\xcd+\xc7\xea\x03\x85\xde\x0d\xf7`\xfd^:\x7f\x8c\xfc\xaad\x92I&\x99d\x00a\xdaI\x9aH7\x98\x0d\x1f\xc2\xee\x1a\xf9\xe3\xb6C\xf8\x91\xeb\x7fp	\x00\x97\xdb{F\x90\x8e~W~N\xe0\xc1U\xdf\xec\xf2\xab\x92I&\x99d\x92\x01\xe4(\x1d$p\x18\x05\xb5r\x14i#\x17CDw@4\x92\xdaQ	A\xaa\x8e5\x8f@f\xb3\xfc\x8ad\x92I&\x99Z&\xfd\xbf\x00\x03\x00\x93\x19\xf9\xc5\x1e\x83\x05U\x00\x00\x00\x00IEND\xaeB`\x82PK\x07\x08z\x1b\xa9\xd9?M\x00\x00?M\x00\x00PK\x03\x04\x14\x00\x08\x00\x00\x00W\x9a5G\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\n\x00\x00\x00index.html<!doctype html>\n<html lang=\"en\">\n<head>\n    <meta charset=\"utf-8\">\n    <meta http-equiv=\"X-UA-Compatible\" content=\"IE=edge\">\n    <meta name=\"viewport\" content=\"width=device-width, initial-scale=1\">\n    <meta name=\"description\" content=\"\">\n    <meta name=\"author\" content=\"\">\n\n    <title>InfluxDB - Admin Interface</title>\n\n    <!-- Bootstrap Core CSS -->\n    <link href=\"css/bootstrap.css\" rel=\"stylesheet\">\n    <link href=\"css/dropdowns-enhancement.css\" rel=\"stylesheet\">\n    <link href=\"css/admin.css\" rel=\"stylesheet\">\n\n</head>\n\n<body>\n    <div id=\"wrap\">\n        <!-- Navigation -->\n        <nav class=\"navbar navbar-inverse navbar-fixed-top\" role=\"navigation\">\n            <div class=\"container\">\n                <!-- Brand and toggle get grouped for better mobile display -->\n                <div class=\"navbar-header\">\n                    <a class=\"navbar-brand\" href=\"#\">\n                        <img src=\"img/influxdb-light400.png\" style=\"height:28px; margin-top:-4px;\" />\n                    </a>\n                </div>\n                <!-- Collect the nav links, forms, and other content for toggling -->\n                <div class=\"collapse navbar-collapse\" id=\"bs-example-navbar-collapse-1\">\n                    <ul class=\"nav navbar-nav\">\n                        <li>\n                            <a href=\"#\" data-toggle=\"modal\" data-target=\"#myModal\">Write Data</a>\n                        </li>\n                    </ul>\n\n\n                    <ul class=\"nav navbar-nav navbar-right\">\n                        <li class=\"dropdown\">\n                            <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\" role=\"button\" aria-haspopup=\"true\" aria-expanded=\"false\"><span>Database:</span> <span id=\"content-current-database\">&hellip;</span> <span class=\"caret\"></span></a>\n                            <ul class=\"dropdown-menu\" id=\"content-database-list\">\n                                <!-- Available databases will go here -->\n                            </ul>\n                        </li>\n\n                        <li>\n                            <a href=\"#\" id=\"action-settings\"><i class=\"glyphicon glyphicon-cog\"></i></a>\n                        </li>\n                    </ul>\n                </div>\n                <!-- /.navbar-collapse -->\n\n            </div>\n            <!-- /.container -->\n        </nav>\n\n\n        <!-- Page Content -->\n        <div class=\"container\">\n\n            <!-- Settings Pane -->\n            <div id=\"settings\">\n                <div class=\"panel panel-info\">\n                    <div class=\"panel-heading\">\n                        <h3 class=\"panel-title\">Connection Settings</h3>\n                    </div>\n                    <div class=\"panel-body\">\n                        <form class=\"form-inline\" id=\"form-settings\">\n                            <div class=\"form-group\">\n                                <label for=\"hostname\">Host</label>\n                                <input type=\"text\" class=\"form-control\" id=\"hostname\" placeholder=\"localhost\">\n                            </div>\n\n                            <div class=\"form-group\">\n                                <label for=\"port\">Port</label>\n                                <input type=\"text\" class=\"form-control\" id=\"port\" placeholder=\"8086\" />\n                            </div>\n\n                            <div class=\"form-group\">\n                                <label for=\"username\">Username</label>\n                                <input type=\"text\" class=\"form-control\" id=\"username\" placeholder=\"\">\n                            </div>\n\n                            <div class=\"form-group\">\n                                <label for=\"password\">Password</label>\n                                <input type=\"text\" class=\"form-control\" id=\"password\" placeholder=\"\">\n                            </div>\n\n                            <div class=\"checkbox form-group\">\n                                <label>\n                                    <input type=\"checkbox\" id=\"ssl\"> SSL\n                                </label>\n                            </div>\n                            <div class=\"form-group\">\n                                <button type=\"submit\" class=\"btn btn-default\">Save</button>\n                            </div>\n                        </form>\n                    </div>\n                </div>\n            </div>\n\n          <div id=\"queries\"></div>\n            <div class=\"row\">\n                <div class=\"col-sm-12\" id=\"content\">\n                    <form id=\"query-form\">\n                        <div class=\"form-group\">\n                            <div class=\"input-group\">\n                                <label class=\"input-group-addon\">Query: </label>\n                                <input type=\"text\" class=\"form-control\" id=\"query\" style=\"width:100%\">\n                            </div>\n                        </div>\n                    </form>\n                </div>\n            </div>\n            <div class=\"row\">\n                <div class=\"col-sm-12\" id=\"content\">\n\n                    <div class=\"dropdown text-right\" id=\"template-container\">\n                        <button class=\"btn btn-default dropdown-toggle\" id=\"dropdown-templates\" data-toggle=\"dropdown\">Query Templates <span class=\"caret\"></span> </button>\n                        <ul class=\"dropdown-menu pull-right\" id=\"action-template\">\n                          <li><label data-query=\"SHOW DATABASES\">Show Databases</label></li>\n                          <li><label data-query=\"CREATE DATABASE &quot;db_name&quot;\">Create Database</label></li>\n                          <li><label data-query=\"DROP DATABASE &quot;db_name&quot;\">Drop Database</label></li>\n                          <li class=\"divider\"></li>\n                          <li><label data-query=\"SHOW MEASUREMENTS\">Show Measurements</label></li>\n                          <li><label data-query=\"SHOW TAG KEYS FROM &quot;measurement_name&quot;\">Show Tag Keys</label></li>\n                          <li><label data-query=\"SHOW TAG VALUES FROM &quot;measurement_name&quot; WITH KEY = &quot;tag_key&quot;\">Show Tag Values</label></li>\n                          <li class=\"divider\"></li>\n                          <li><label data-query=\"SHOW RETENTION POLICIES ON &quot;db_name&quot;\">Show Retention Policies</label></li>\n                          <li><label data-query=\"CREATE RETENTION POLICY &quot;rp_name&quot; ON &quot;db_name&quot; DURATION 30d REPLICATION 1 DEFAULT\">Create Retention Policy</label></li>\n                          <li><label data-query=\"DROP RETENTION POLICY &quot;rp_name&quot;\">Drop Retention Policy</label></li>\n                          <li class=\"divider\"></li>\n                          <li><label data-query=\"SHOW USERS\">Show Users</label></li>\n                          <li><label data-query=\"CREATE USER &quot;username&quot; WITH PASSWORD 'password'\">Create User</label></li>\n                          <li><label data-query=\"CREATE USER &quot;username&quot; WITH PASSWORD 'password' WITH ALL PRIVILEGES\">Create Admin User</label></li>\n                          <li><label data-query=\"DROP USER &quot;username&quot;\">Drop User</label></li>\n                        </ul>\n                    </div>\n                </div>\n            </div>\n\n            <div class=\"row\" id=\"query-alerts\">\n                <div class=\"col-sm-12\">\n                    <div class=\"alert alert-danger\" id=\"query-error\"></div>\n                    <div class=\"alert alert-success\" id=\"query-success\"></div>\n                    <div class=\"alert alert-warning\" id=\"database-warning\"></div>\n                </div>\n                <div class=\"col-sm-12\" id=\"alert\"></div>\n            </div>\n\n            <div class=\"row\">\n                <div class=\"col-sm-12\" id=\"table\"></div>\n            </div>\n\n            <div id=\"push\"></div>\n        </div>\n    </div>\n\n    <!-- /.container -->\n    <div id=\"footer\">\n      <div class=\"container\">\n          <p class=\"text-muted text-right credit\"><b>InfluxDB</b> v0.9.3</p>\n      </div>\n    </div>\n\n    <!-- Modal -->\n    <div class=\"modal fade\" id=\"myModal\" tabindex=\"-1\" role=\"dialog\" aria-labelledby=\"myModalLabel\">\n      <div class=\"modal-dialog\" role=\"document\">\n        <div class=\"modal-content\">\n          <div class=\"modal-header\">\n            <button type=\"button\" class=\"close\" data-dismiss=\"modal\" aria-label=\"Close\"><span aria-hidden=\"true\">&times;</span></button>\n            <h4 class=\"modal-title\" id=\"myModalLabel\">Write Data to InfluxDB</h4>\n          </div>\n          <div class=\"modal-body\">\n              <form>\n                  <div class=\"form-group\">\n                      <textarea class=\"form-control\" id=\"content-data\"></textarea>\n                  </div>\n              </form>\n              <div class=\"alert alert-danger\" role=\"alert\" id=\"modal-error\"></div>\n              <div class=\"alert alert-success\" role=\"alert\" id=\"modal-success\"></div>\n          </div>\n          <div class=\"modal-footer\">\n            <button type=\"button\" class=\"btn btn-default\" data-dismiss=\"modal\">Close</button>\n            <button type=\"button\" class=\"btn btn-primary\" id=\"action-send\">Send Data</button>\n          </div>\n        </div>\n      </div>\n    </div>\n\n    <script src=\"js/vendor/react-0.13.3.min.js\"></script>\n    <script src=\"js/vendor/jquery-2.1.4.min.js\"></script>\n    <script src=\"js/vendor/bootstrap-3.3.5.min.js\"></script>\n    <script src=\"js/admin.js\"></script>\n</body>\n\n</html>\nPK\x07\x08\xb1y\"\x84\xdc$\x00\x00\xdc$\x00\x00PK\x03\x04\x14\x00\x08\x00\x00\x00[\xb0HG\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x0b\x00\x00\x00js/admin.js// allow the user to store recent queries for quick retrieval\nvar recentQueries = [];\nvar queryPointer = null;\n\n// keep track of the databases that exist on the server\nvar availableDatabases = [];\nvar currentlySelectedDatabase = null;\n\n// connection settings for the server, with sensible defaults\nvar connectionSettings = {\n    hostname: (window.location.hostname ? window.location.hostname: \"localhost\"),\n    port: \"8086\",\n    username: \"\",\n    password: \"\",\n    ssl: ('https:' == window.location.protocol ? true : false)\n}\n\nvar connectionString = function() {\n    var protocol = (connectionSettings.ssl ? \"https\" : \"http\");\n    var host = connectionSettings.hostname + \":\" + connectionSettings.port;\n\n    if (connectionSettings.username !== \"\") {\n        $.ajaxSetup({\n            headers: {\n                'Authorization': \"Basic \" + btoa(connectionSettings.username + \":\" + connectionSettings.password)\n            }\n        });\n    }\n\n    return protocol + \"://\" + host;\n}\n\nvar getSeriesFromJSON = function(data) {\n    var results = data.results[0].series;\n    return results;\n}\n\n// gets settings from the browser's localStorage and sets defaults if they aren't found\nvar loadSettings = function() {\n    var cs = localStorage.getItem(\"connectionSettings\");\n\n    if (cs != null) { connectionSettings = JSON.parse(cs); }\n\n    document.getElementById('hostname').value = connectionSettings.hostname;\n    document.getElementById('port').value = connectionSettings.port;\n    document.getElementById('username').value = connectionSettings.username;\n    document.getElementById('password').value = connectionSettings.password;\n    document.getElementById('ssl').checked = connectionSettings.ssl;\n\n    getDatabases();\n}\n\nvar updateSettings = function() {\n    var hostname = document.getElementById('hostname').value;\n    var port = document.getElementById('port').value;\n    var username = document.getElementById('username').value;\n    var password = document.getElementById('password').value;\n    var ssl = document.getElementById('ssl').checked;\n\n    if (hostname == \"\") { hostname = \"localhost\"; }\n\n    if (port == \"\") { port = \"8086\"; }\n\n    connectionSettings.hostname = hostname;\n    connectionSettings.port     = port;\n    connectionSettings.username = username;\n    connectionSettings.password = password;\n    connectionSettings.ssl      = ssl;\n\n    localStorage.setItem(\"connectionSettings\", JSON.stringify(connectionSettings));\n\n    getDatabases();\n}\n\nvar showSettings = function() {\n    $(\"#settings\").show();\n    $(\"input#query\").prop('disabled', true);\n}\n\nvar hideSettings = function() {\n    $(\"#settings\").hide();\n    $(\"input#query\").prop('disabled', false);\n}\n\n// hide errors within the Write Data modal\nvar hideModalError = function() {\n    $(\"div#modal-error\").empty().hide();\n}\n\n// show errors within the Write Data modal\nvar showModalError = function(message) {\n    hideModalSuccess();\n\n    $(\"div#modal-error\").html(\"<p>\" + message + \"</p>\").show();\n}\n\n// hide success messages within the Write Data modal\nvar hideModalSuccess = function() {\n    $(\"div#modal-success\").empty().hide();\n}\n\n// show success messages within the Write Data modal\nvar showModalSuccess = function(message) {\n    hideModalError();\n\n    $(\"div#modal-success\").html(\"<p>\" + message + \"</p>\").show();\n}\n\n// hide errors from queries\nvar hideQueryError = function() {\n    $(\"div#query-error\").empty().hide();\n}\n\n// show errors from queries\nvar showQueryError = function(message) {\n    hideQuerySuccess();\n\n    $(\"div#query-error\").html(\"<p>\" + message + \"</p>\").show();\n}\n\n// hide success messages from queries\nvar hideQuerySuccess = function() {\n    $(\"div#query-success\").empty().hide();\n}\n\n// show success messages from queries\nvar showQuerySuccess = function(message) {\n    hideQueryError();\n\n    $(\"div#query-success\").html(\"<p>\" + message + \"</p>\").show();\n}\n\n// hide warning from database lookup\nvar hideDatabaseWarning = function() {\n    $(\"div#database-warning\").empty().hide();\n}\n\n// show warning from database lookup\nvar showDatabaseWarning = function(message) {\n    $(\"div#database-warning\").html(\"<p>\" + message + \"</p>\").show();\n}\n\n// clear out the results table\nvar clearResults = function() {\n    $(\"div#table\").empty();\n}\n\n// handle submissions of the query bar\nvar handleSubmit = function(e) {\n    var queryElement = document.getElementById('query');\n    var q = queryElement.value;\n\n    clearResults();\n\n    if (q == \"\") { return };\n\n    var query = $.get(connectionString() + \"/query\", {q: q, db: currentlySelectedDatabase}, function() {\n        hideQueryError();\n        hideQuerySuccess();\n    });\n\n    recentQueries.push(q);\n    queryPointer = recentQueries.length - 1;\n\n    query.fail(handleRequestError);\n\n    query.done(function (data) {\n        var firstRow = data.results[0];\n        if (firstRow.error) {\n            showQueryError(\"Server returned error: \" + firstRow.error);\n            return\n        }\n\n        var series = getSeriesFromJSON(data);\n\n        if (series == null) {\n            showQuerySuccess(\"Success! (no results to display)\");\n            getDatabases();\n            return\n        }\n\n        var values = series[0].values;\n\n        if ((values == null) || (values.length == 0)) {\n            showQueryError(\"Query returned no results!\");\n        } else {\n            availableDatabases = values.map(function(value) {\n                return value[0];\n            });\n\n            hideDatabaseWarning();\n            React.render(\n              React.createElement(DataTable, {series: series}),\n              document.getElementById('table')\n            );\n        }\n    });\n\n    if (e != null) { e.preventDefault(); }\n    return false;\n};\n\nvar handleRequestError = function(e) {\n    var errorText = e.status + \" \" + e.statusText;\n    showDatabaseWarning(\"Unable to fetch list of databases.\");\n\n    if (\"responseText\" in e) {\n        try { errorText = \"Server returned error: \" + JSON.parse(e.responseText).error; } catch(e) {}\n    }\n\n    if (e.status == 400) {\n        hideSettings();\n    } else if (e.status == 401) {\n        if (errorText.indexOf(\"error authorizing query\") > -1) {\n            hideSettings();\n            $(\"input#query\").val(\"CREATE USER <username> WITH PASSWORD '<password>' WITH ALL PRIVILEGES\").focus();\n        } else {\n            showSettings();\n            $(\"input#username\").focus();\n        }\n    } else {\n        showSettings();\n        $(\"input#hostname\").focus();\n        showDatabaseWarning(\"Hint: the InfluxDB API runs on port 8086 by default\");\n        errorText = e.status + \" \" + e.statusText + \" - Could not connect to \" + connectionString();\n    }\n    showQueryError(errorText);\n};\n\nvar handleKeypress = function(e) {\n    var queryElement = document.getElementById('query');\n\n    // key press == enter\n    if (e.keyCode == 13) {\n        e.preventDefault();\n        handleSubmit();\n        return false;\n    }\n\n    // if we don't have any recent queries, ignore the arrow keys\n    if (recentQueries.length == 0 ) { return }\n\n    // key press == up arrow\n    if (e.keyCode == 38) {\n        // TODO: stash the current query, if there is one?\n        if (queryPointer == recentQueries.length - 1) {\n            // this is buggy.\n            //recentQueries.push(queryElement.value);\n            //queryPointer = recentQueries.length - 1;\n        }\n\n        if (queryPointer != null && queryPointer > 0) {\n            queryPointer -= 1;\n            queryElement.value = recentQueries[queryPointer];\n        }\n    }\n\n    // key press == down arrow\n    if (e.keyCode == 40) {\n        if (queryPointer != null && queryPointer < recentQueries.length - 1) {\n            queryPointer += 1;\n            queryElement.value = recentQueries[queryPointer];\n        }\n    }\n};\n\nvar QueryError = React.createClass({\n    render: function() {\n        return React.createElement(\"div\", {className: \"alert alert-danger\"}, this.props.message)\n    }\n});\n\nvar stringifyTags = function(tags) {\n    var tagStrings = [];\n\n    for(var index in tags) {\n        tagStrings.push(index + \":\" + tags[index]);\n    }\n\n    return tagStrings.join(\", \");\n}\n\nvar DataTable = React.createClass({\n  render: function() {\n    var tables = this.props.series.map(function(series) {\n        return React.createElement(\"div\", null,\n            React.createElement(\"h1\", null, series.name),\n            React.createElement(\"h2\", null, stringifyTags(series.tags)),\n            React.createElement(\"table\", {className: \"table\"},\n                React.createElement(TableHeader, {data: series.columns}),\n                React.createElement(TableBody, {data: series})\n            )\n        );\n    });\n\n    return React.createElement(\"div\", null, tables);\n  }\n});\n\nvar TableHeader = React.createClass({\n    render: function() {\n        var headers = this.props.data.map(function(column) {\n            return React.createElement(\"th\", null, column);\n        });\n\n        return React.createElement(\"tr\", null, headers);\n    }\n});\n\nvar TableBody = React.createClass({\n    render: function() {\n        if (this.props.data.values) {\n            var tableRows = this.props.data.values.map(function (row) {\n                return React.createElement(TableRow, {data: row});\n            });\n        }\n\n        return React.createElement(\"tbody\", null, tableRows);\n    }\n});\n\nvar TableRow = React.createClass({\n    render: function() {\n        var tableData = this.props.data.map(function (data, index) {\n            if (index == 0) {\n                return React.createElement(\"td\", {className: \"timestamp\"}, null, data);\n            } else {\n                return React.createElement(\"td\", null, pretty(data));\n            }\n        });\n\n        return React.createElement(\"tr\", null, tableData);\n    }\n});\n\nvar pretty = function(val) {\n    if (typeof val == 'string') {\n        return \"\\\"\" + val + \"\\\"\";\n    } else if (typeof val == 'boolean' ){\n        return val.toString();\n    } else {\n        return val;\n    }\n}\n\nvar chooseDatabase = function (databaseName) {\n    currentlySelectedDatabase = databaseName;\n    document.getElementById(\"content-current-database\").innerHTML = currentlySelectedDatabase;\n}\n\nvar getDatabases = function () {\n    var q = \"SHOW DATABASES\";\n    var query = $.get(connectionString() + \"/query\", {q: q, db: currentlySelectedDatabase});\n\n    query.fail(handleRequestError);\n\n    query.done(function (data) {\n        hideSettings();\n        hideDatabaseWarning();\n\n        var firstRow = data.results[0];\n        if (firstRow.error) {\n            showDatabaseWarning(firstRow.error);\n            return;\n        }\n\n        var series = getSeriesFromJSON(data);\n        var values = series[0].values;\n\n        if ((values == null) || (values.length == 0)) {\n            availableDatabases = [];\n            updateDatabaseList();\n\n            showDatabaseWarning(\"No databases found.\")\n        } else {\n            availableDatabases = values.map(function(value) {\n                return value[0];\n            }).sort();\n\n            if (currentlySelectedDatabase == null) {\n                chooseDatabase(availableDatabases[0]);\n            } else if (availableDatabases.indexOf(currentlySelectedDatabase) == -1) {\n                chooseDatabase(availableDatabases[0]);\n            }\n            updateDatabaseList();\n        }\n    });\n}\n\nvar updateDatabaseList = function() {\n    var databaseList = $(\"ul#content-database-list\");\n\n    databaseList.empty();\n    availableDatabases.forEach(function(database) {\n        var li = $(\"<li><a href=\\\"#\\\">\" + database + \"</a></li>\");\n        databaseList.append(li);\n    });\n\n    if (availableDatabases.length == 0) {\n        document.getElementById(\"content-current-database\").innerHTML = \"&hellip;\";\n    }\n}\n\n// when the page is ready, start everything up\n$(document).ready(function () {\n    loadSettings();\n\n    // bind to the settings cog in the navbar\n    $(\"#action-settings\").click(function (e) {\n        $(\"#settings\").toggle();\n    });\n\n    // bind to the save button in the settings form\n    $(\"#form-settings\").submit(function (e) {\n        updateSettings();\n    });\n\n    // bind to the items in the query template dropdown\n    $(\"ul#action-template label\").click(function (e) {\n        var el = $(e.target);\n        $(\"input#query\").val(el.data(\"query\")).focus();\n    });\n\n    $(\"ul#content-database-list\").on(\"click\", function(e) {\n        if (e.target.tagName != \"A\") { return; }\n\n        chooseDatabase(e.target.innerHTML);\n        e.preventDefault();\n    })\n\n    // load the Write Data modal\n    $(\"button#action-send\").click(function (e) {\n        var data = $(\"textarea#content-data\").val();\n\n        var startTime = new Date().getTime();\n        var write = $.post(connectionString() + \"/write?db=\" + currentlySelectedDatabase, data, function() {\n        });\n\n        write.fail(function (e) {\n            if (e.status == 400) {\n                showModalError(\"Failed to write: \" + e.responseText)\n            }\n            else {\n                showModalError(\"Failed to contact server: \" + e.statusText)\n            }\n        });\n\n        write.done(function (data) {\n            var endTime = new Date().getTime();\n            var elapsed = endTime - startTime;\n            showModalSuccess(\"Write succeeded. (\" + elapsed + \"ms)\");\n        });\n\n    });\n\n    // handle submit actions on the query bar\n    var form = document.getElementById('query-form');\n    form.addEventListener(\"submit\", handleSubmit);\n\n    // handle keypresses on the query bar so we can get arrow keys and enter\n    var query = document.getElementById('query');\n    query.addEventListener(\"keydown\", handleKeypress);\n\n    // make sure we start out with the query bar in focus\n    document.getElementById('query').focus();\n})\nPK\x07\x08\xe0U\xfd\xad\x915\x00\x00\x915\x00\x00PK\x03\x04\x14\x00\x08\x00\x00\x00W\x9a5G\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00 \x00\x00\x00js/vendor/bootstrap-3.3.5.min.js/*!\n * Bootstrap v3.3.5 (http://getbootstrap.com)\n * Copyright 2011-2015 Twitter, Inc.\n * Licensed under the MIT license\n */\nif(\"undefined\"==typeof jQuery)throw new Error(\"Bootstrap's JavaScript requires jQuery\");+function(a){\"use strict\";var b=a.fn.jquery.split(\" \")[0].split(\".\");if(b[0]<2&&b[1]<9||1==b[0]&&9==b[1]&&b[2]<1)throw new Error(\"Bootstrap's JavaScript requires jQuery version 1.9.1 or higher\")}(jQuery),+function(a){\"use strict\";function b(){var a=document.createElement(\"bootstrap\"),b={WebkitTransition:\"webkitTransitionEnd\",MozTransition:\"transitionend\",OTransition:\"oTransitionEnd otransitionend\",transition:\"transitionend\"};for(var c in b)if(void 0!==a.style[c])return{end:b[c]};return!1}a.fn.emulateTransitionEnd=function(b){var c=!1,d=this;a(this).one(\"bsTransitionEnd\",function(){c=!0});var e=function(){c||a(d).trigger(a.support.transition.end)};return setTimeout(e,b),this},a(function(){a.support.transition=b(),a.support.transition&&(a.event.special.bsTransitionEnd={bindType:a.support.transition.end,delegateType:a.support.transition.end,handle:function(b){return a(b.target).is(this)?b.handleObj.handler.apply(this,arguments):void 0}})})}(jQuery),+function(a){\"use strict\";function b(b){return this.each(function(){var c=a(this),e=c.data(\"bs.alert\");e||c.data(\"bs.alert\",e=new d(this)),\"string\"==typeof b&&e[b].call(c)})}var c='[data-dismiss=\"alert\"]',d=function(b){a(b).on(\"click\",c,this.close)};d.VERSION=\"3.3.5\",d.TRANSITION_DURATION=150,d.prototype.close=function(b){function c(){g.detach().trigger(\"closed.bs.alert\").remove()}var e=a(this),f=e.attr(\"data-target\");f||(f=e.attr(\"href\"),f=f&&f.replace(/.*(?=#[^\\s]*$)/,\"\"));var g=a(f);b&&b.preventDefault(),g.length||(g=e.closest(\".alert\")),g.trigger(b=a.Event(\"close.bs.alert\")),b.isDefaultPrevented()||(g.removeClass(\"in\"),a.support.transition&&g.hasClass(\"fade\")?g.one(\"bsTransitionEnd\",c).emulateTransitionEnd(d.TRANSITION_DURATION):c())};var e=a.fn.alert;a.fn.alert=b,a.fn.alert.Constructor=d,a.fn.alert.noConflict=function(){return a.fn.alert=e,this},a(document).on(\"click.bs.alert.data-api\",c,d.prototype.close)}(jQuery),+function(a){\"use strict\";function b(b){return this.each(function(){var d=a(this),e=d.data(\"bs.button\"),f=\"object\"==typeof b&&b;e||d.data(\"bs.button\",e=new c(this,f)),\"toggle\"==b?e.toggle():b&&e.setState(b)})}var c=function(b,d){this.$element=a(b),this.options=a.extend({},c.DEFAULTS,d),this.isLoading=!1};c.VERSION=\"3.3.5\",c.DEFAULTS={loadingText:\"loading...\"},c.prototype.setState=function(b){var c=\"disabled\",d=this.$element,e=d.is(\"input\")?\"val\":\"html\",f=d.data();b+=\"Text\",null==f.resetText&&d.data(\"resetText\",d[e]()),setTimeout(a.proxy(function(){d[e](null==f[b]?this.options[b]:f[b]),\"loadingText\"==b?(this.isLoading=!0,d.addClass(c).attr(c,c)):this.isLoading&&(this.isLoading=!1,d.removeClass(c).removeAttr(c))},this),0)},c.prototype.toggle=function(){var a=!0,b=this.$element.closest('[data-toggle=\"buttons\"]');if(b.length){var c=this.$element.find(\"input\");\"radio\"==c.prop(\"type\")?(c.prop(\"checked\")&&(a=!1),b.find(\".active\").removeClass(\"active\"),this.$element.addClass(\"active\")):\"checkbox\"==c.prop(\"type\")&&(c.prop(\"checked\")!==this.$element.hasClass(\"active\")&&(a=!1),this.$element.toggleClass(\"active\")),c.prop(\"checked\",this.$element.hasClass(\"active\")),a&&c.trigger(\"change\")}else this.$element.attr(\"aria-pressed\",!this.$element.hasClass(\"active\")),this.$element.toggleClass(\"active\")};var d=a.fn.button;a.fn.button=b,a.fn.button.Constructor=c,a.fn.button.noConflict=function(){return a.fn.button=d,this},a(document).on(\"click.bs.button.data-api\",'[data-toggle^=\"button\"]',function(c){var d=a(c.target);d.hasClass(\"btn\")||(d=d.closest(\".btn\")),b.call(d,\"toggle\"),a(c.target).is('input[type=\"radio\"]')||a(c.target).is('input[type=\"checkbox\"]')||c.preventDefault()}).on(\"focus.bs.button.data-api blur.bs.button.data-api\",'[data-toggle^=\"button\"]',function(b){a(b.target).closest(\".btn\").toggleClass(\"focus\",/^focus(in)?$/.test(b.type))})}(jQuery),+function(a){\"use strict\";function b(b){return this.each(function(){var d=a(this),e=d.data(\"bs.carousel\"),f=a.extend({},c.DEFAULTS,d.data(),\"object\"==typeof b&&b),g=\"string\"==typeof b?b:f.slide;e||d.data(\"bs.carousel\",e=new c(this,f)),\"number\"==typeof b?e.to(b):g?e[g]():f.interval&&e.pause().cycle()})}var c=function(b,c){this.$element=a(b),this.$indicators=this.$element.find(\".carousel-indicators\"),this.options=c,this.paused=null,this.sliding=null,this.interval=null,this.$active=null,this.$items=null,this.options.keyboard&&this.$element.on(\"keydown.bs.carousel\",a.proxy(this.keydown,this)),\"hover\"==this.options.pause&&!(\"ontouchstart\"in document.documentElement)&&this.$element.on(\"mouseenter.bs.carousel\",a.proxy(this.pause,this)).on(\"mouseleave.bs.carousel\",a.proxy(this.cycle,this))};c.VERSION=\"3.3.5\",c.TRANSITION_DURATION=600,c.DEFAULTS={interval:5e3,pause:\"hover\",wrap:!0,keyboard:!0},c.prototype.keydown=function(a){if(!/input|textarea/i.test(a.target.tagName)){switch(a.which){case 37:this.prev();break;case 39:this.next();break;default:return}a.preventDefault()}},c.prototype.cycle=function(b){return b||(this.paused=!1),this.interval&&clearInterval(this.interval),this.options.interval&&!this.paused&&(this.interval=setInterval(a.proxy(this.next,this),this.options.interval)),this},c.prototype.getItemIndex=function(a){return this.$items=a.parent().children(\".item\"),this.$items.index(a||this.$active)},c.prototype.getItemForDirection=function(a,b){var c=this.getItemIndex(b),d=\"prev\"==a&&0===c||\"next\"==a&&c==this.$items.length-1;if(d&&!this.options.wrap)return b;var e=\"prev\"==a?-1:1,f=(c+e)%this.$items.length;return this.$items.eq(f)},c.prototype.to=function(a){var b=this,c=this.getItemIndex(this.$active=this.$element.find(\".item.active\"));return a>this.$items.length-1||0>a?void 0:this.sliding?this.$element.one(\"slid.bs.carousel\",function(){b.to(a)}):c==a?this.pause().cycle():this.slide(a>c?\"next\":\"prev\",this.$items.eq(a))},c.prototype.pause=function(b){return b||(this.paused=!0),this.$element.find(\".next, .prev\").length&&a.support.transition&&(this.$element.trigger(a.support.transition.end),this.cycle(!0)),this.interval=clearInterval(this.interval),this},c.prototype.next=function(){return this.sliding?void 0:this.slide(\"next\")},c.prototype.prev=function(){return this.sliding?void 0:this.slide(\"prev\")},c.prototype.slide=function(b,d){var e=this.$element.find(\".item.active\"),f=d||this.getItemForDirection(b,e),g=this.interval,h=\"next\"==b?\"left\":\"right\",i=this;if(f.hasClass(\"active\"))return this.sliding=!1;var j=f[0],k=a.Event(\"slide.bs.carousel\",{relatedTarget:j,direction:h});if(this.$element.trigger(k),!k.isDefaultPrevented()){if(this.sliding=!0,g&&this.pause(),this.$indicators.length){this.$indicators.find(\".active\").removeClass(\"active\");var l=a(this.$indicators.children()[this.getItemIndex(f)]);l&&l.addClass(\"active\")}var m=a.Event(\"slid.bs.carousel\",{relatedTarget:j,direction:h});return a.support.transition&&this.$element.hasClass(\"slide\")?(f.addClass(b),f[0].offsetWidth,e.addClass(h),f.addClass(h),e.one(\"bsTransitionEnd\",function(){f.removeClass([b,h].join(\" \")).addClass(\"active\"),e.removeClass([\"active\",h].join(\" \")),i.sliding=!1,setTimeout(function(){i.$element.trigger(m)},0)}).emulateTransitionEnd(c.TRANSITION_DURATION)):(e.removeClass(\"active\"),f.addClass(\"active\"),this.sliding=!1,this.$element.trigger(m)),g&&this.cycle(),this}};var d=a.fn.carousel;a.fn.carousel=b,a.fn.carousel.Constructor=c,a.fn.carousel.noConflict=function(){return a.fn.carousel=d,this};var e=function(c){var d,e=a(this),f=a(e.attr(\"data-target\")||(d=e.attr(\"href\"))&&d.replace(/.*(?=#[^\\s]+$)/,\"\"));if(f.hasClass(\"carousel\")){var g=a.extend({},f.data(),e.data()),h=e.attr(\"data-slide-to\");h&&(g.interval=!1),b.call(f,g),h&&f.data(\"bs.carousel\").to(h),c.preventDefault()}};a(document).on(\"click.bs.carousel.data-api\",\"[data-slide]\",e).on(\"click.bs.carousel.data-api\",\"[data-slide-to]\",e),a(window).on(\"load\",function(){a('[data-ride=\"carousel\"]').each(function(){var c=a(this);b.call(c,c.data())})})}(jQuery),+function(a){\"use strict\";function b(b){var c,d=b.attr(\"data-target\")||(c=b.attr(\"href\"))&&c.replace(/.*(?=#[^\\s]+$)/,\"\");return a(d)}function c(b){return this.each(function(){var c=a(this),e=c.data(\"bs.collapse\"),f=a.extend({},d.DEFAULTS,c.data(),\"object\"==typeof b&&b);!e&&f.toggle&&/show|hide/.test(b)&&(f.toggle=!1),e||c.data(\"bs.collapse\",e=new d(this,f)),\"string\"==typeof b&&e[b]()})}var d=function(b,c){this.$element=a(b),this.options=a.extend({},d.DEFAULTS,c),this.$trigger=a('[data-toggle=\"collapse\"][href=\"#'+b.id+'\"],[data-toggle=\"collapse\"][data-target=\"#'+b.id+'\"]'),this.transitioning=null,this.options.parent?this.$parent=this.getParent():this.addAriaAndCollapsedClass(this.$element,this.$trigger),this.options.toggle&&this.toggle()};d.VERSION=\"3.3.5\",d.TRANSITION_DURATION=350,d.DEFAULTS={toggle:!0},d.prototype.dimension=function(){var a=this.$element.hasClass(\"width\");return a?\"width\":\"height\"},d.prototype.show=function(){if(!this.transitioning&&!this.$element.hasClass(\"in\")){var b,e=this.$parent&&this.$parent.children(\".panel\").children(\".in, .collapsing\");if(!(e&&e.length&&(b=e.data(\"bs.collapse\"),b&&b.transitioning))){var f=a.Event(\"show.bs.collapse\");if(this.$element.trigger(f),!f.isDefaultPrevented()){e&&e.length&&(c.call(e,\"hide\"),b||e.data(\"bs.collapse\",null));var g=this.dimension();this.$element.removeClass(\"collapse\").addClass(\"collapsing\")[g](0).attr(\"aria-expanded\",!0),this.$trigger.removeClass(\"collapsed\").attr(\"aria-expanded\",!0),this.transitioning=1;var h=function(){this.$element.removeClass(\"collapsing\").addClass(\"collapse in\")[g](\"\"),this.transitioning=0,this.$element.trigger(\"shown.bs.collapse\")};if(!a.support.transition)return h.call(this);var i=a.camelCase([\"scroll\",g].join(\"-\"));this.$element.one(\"bsTransitionEnd\",a.proxy(h,this)).emulateTransitionEnd(d.TRANSITION_DURATION)[g](this.$element[0][i])}}}},d.prototype.hide=function(){if(!this.transitioning&&this.$element.hasClass(\"in\")){var b=a.Event(\"hide.bs.collapse\");if(this.$element.trigger(b),!b.isDefaultPrevented()){var c=this.dimension();this.$element[c](this.$element[c]())[0].offsetHeight,this.$element.addClass(\"collapsing\").removeClass(\"collapse in\").attr(\"aria-expanded\",!1),this.$trigger.addClass(\"collapsed\").attr(\"aria-expanded\",!1),this.transitioning=1;var e=function(){this.transitioning=0,this.$element.removeClass(\"collapsing\").addClass(\"collapse\").trigger(\"hidden.bs.collapse\")};return a.support.transition?void this.$element[c](0).one(\"bsTransitionEnd\",a.proxy(e,this)).emulateTransitionEnd(d.TRANSITION_DURATION):e.call(this)}}},d.prototype.toggle=function(){this[this.$element.hasClass(\"in\")?\"hide\":\"show\"]()},d.prototype.getParent=function(){return a(this.options.parent).find('[data-toggle=\"collapse\"][data-parent=\"'+this.options.parent+'\"]').each(a.proxy(function(c,d){var e=a(d);this.addAriaAndCollapsedClass(b(e),e)},this)).end()},d.prototype.addAriaAndCollapsedClass=function(a,b){var c=a.hasClass(\"in\");a.attr(\"aria-expanded\",c),b.toggleClass(\"collapsed\",!c).attr(\"aria-expanded\",c)};var e=a.fn.collapse;a.fn.collapse=c,a.fn.collapse.Constructor=d,a.fn.collapse.noConflict=function(){return a.fn.collapse=e,this},a(document).on(\"click.bs.collapse.data-api\",'[data-toggle=\"collapse\"]',function(d){var e=a(this);e.attr(\"data-target\")||d.preventDefault();var f=b(e),g=f.data(\"bs.collapse\"),h=g?\"toggle\":e.data();c.call(f,h)})}(jQuery),+function(a){\"use strict\";function b(b){var c=b.attr(\"data-target\");c||(c=b.attr(\"href\"),c=c&&/#[A-Za-z]/.test(c)&&c.replace(/.*(?=#[^\\s]*$)/,\"\"));var d=c&&a(c);return d&&d.length?d:b.parent()}function c(c){c&&3===c.which||(a(e).remove(),a(f).each(function(){var d=a(this),e=b(d),f={relatedTarget:this};e.hasClass(\"open\")&&(c&&\"click\"==c.type&&/input|textarea/i.test(c.target.tagName)&&a.contains(e[0],c.target)||(e.trigger(c=a.Event(\"hide.bs.dropdown\",f)),c.isDefaultPrevented()||(d.attr(\"aria-expanded\",\"false\"),e.removeClass(\"open\").trigger(\"hidden.bs.dropdown\",f))))}))}function d(b){return this.each(function(){var c=a(this),d=c.data(\"bs.dropdown\");d||c.data(\"bs.dropdown\",d=new g(this)),\"string\"==typeof b&&d[b].call(c)})}var e=\".dropdown-backdrop\",f='[data-toggle=\"dropdown\"]',g=function(b){a(b).on(\"click.bs.dropdown\",this.toggle)};g.VERSION=\"3.3.5\",g.prototype.toggle=function(d){var e=a(this);if(!e.is(\".disabled, :disabled\")){var f=b(e),g=f.hasClass(\"open\");if(c(),!g){\"ontouchstart\"in document.documentElement&&!f.closest(\".navbar-nav\").length&&a(document.createElement(\"div\")).addClass(\"dropdown-backdrop\").insertAfter(a(this)).on(\"click\",c);var h={relatedTarget:this};if(f.trigger(d=a.Event(\"show.bs.dropdown\",h)),d.isDefaultPrevented())return;e.trigger(\"focus\").attr(\"aria-expanded\",\"true\"),f.toggleClass(\"open\").trigger(\"shown.bs.dropdown\",h)}return!1}},g.prototype.keydown=function(c){if(/(38|40|27|32)/.test(c.which)&&!/input|textarea/i.test(c.target.tagName)){var d=a(this);if(c.preventDefault(),c.stopPropagation(),!d.is(\".disabled, :disabled\")){var e=b(d),g=e.hasClass(\"open\");if(!g&&27!=c.which||g&&27==c.which)return 27==c.which&&e.find(f).trigger(\"focus\"),d.trigger(\"click\");var h=\" li:not(.disabled):visible a\",i=e.find(\".dropdown-menu\"+h);if(i.length){var j=i.index(c.target);38==c.which&&j>0&&j--,40==c.which&&j<i.length-1&&j++,~j||(j=0),i.eq(j).trigger(\"focus\")}}}};var h=a.fn.dropdown;a.fn.dropdown=d,a.fn.dropdown.Constructor=g,a.fn.dropdown.noConflict=function(){return a.fn.dropdown=h,this},a(document).on(\"click.bs.dropdown.data-api\",c).on(\"click.bs.dropdown.data-api\",\".dropdown form\",function(a){a.stopPropagation()}).on(\"click.bs.dropdown.data-api\",f,g.prototype.toggle).on(\"keydown.bs.dropdown.data-api\",f,g.prototype.keydown).on(\"keydown.bs.dropdown.data-api\",\".dropdown-menu\",g.prototype.keydown)}(jQuery),+function(a){\"use strict\";function b(b,d){return this.each(function(){var e=a(this),f=e.data(\"bs.modal\"),g=a.extend({},c.DEFAULTS,e.data(),\"object\"==typeof b&&b);f||e.data(\"bs.modal\",f=new c(this,g)),\"string\"==typeof b?f[b](d):g.show&&f.show(d)})}var c=function(b,c){this.options=c,this.$body=a(document.body),this.$element=a(b),this.$dialog=this.$element.find(\".modal-dialog\"),this.$backdrop=null,this.isShown=null,this.originalBodyPad=null,this.scrollbarWidth=0,this.ignoreBackdropClick=!1,this.options.remote&&this.$element.find(\".modal-content\").load(this.options.remote,a.proxy(function(){this.$element.trigger(\"loaded.bs.modal\")},this))};c.VERSION=\"3.3.5\",c.TRANSITION_DURATION=300,c.BACKDROP_TRANSITION_DURATION=150,c.DEFAULTS={backdrop:!0,keyboard:!0,show:!0},c.prototype.toggle=function(a){return this.isShown?this.hide():this.show(a)},c.prototype.show=function(b){var d=this,e=a.Event(\"show.bs.modal\",{relatedTarget:b});this.$element.trigger(e),this.isShown||e.isDefaultPrevented()||(this.isShown=!0,this.checkScrollbar(),this.setScrollbar(),this.$body.addClass(\"modal-open\"),this.escape(),this.resize(),this.$element.on(\"click.dismiss.bs.modal\",'[data-dismiss=\"modal\"]',a.proxy(this.hide,this)),this.$dialog.on(\"mousedown.dismiss.bs.modal\",function(){d.$element.one(\"mouseup.dismiss.bs.modal\",function(b){a(b.target).is(d.$element)&&(d.ignoreBackdropClick=!0)})}),this.backdrop(function(){var e=a.support.transition&&d.$element.hasClass(\"fade\");d.$element.parent().length||d.$element.appendTo(d.$body),d.$element.show().scrollTop(0),d.adjustDialog(),e&&d.$element[0].offsetWidth,d.$element.addClass(\"in\"),d.enforceFocus();var f=a.Event(\"shown.bs.modal\",{relatedTarget:b});e?d.$dialog.one(\"bsTransitionEnd\",function(){d.$element.trigger(\"focus\").trigger(f)}).emulateTransitionEnd(c.TRANSITION_DURATION):d.$element.trigger(\"focus\").trigger(f)}))},c.prototype.hide=function(b){b&&b.preventDefault(),b=a.Event(\"hide.bs.modal\"),this.$element.trigger(b),this.isShown&&!b.isDefaultPrevented()&&(this.isShown=!1,this.escape(),this.resize(),a(document).off(\"focusin.bs.modal\"),this.$element.removeClass(\"in\").off(\"click.dismiss.bs.modal\").off(\"mouseup.dismiss.bs.modal\"),this.$dialog.off(\"mousedown.dismiss.bs.modal\"),a.support.transition&&this.$element.hasClass(\"fade\")?this.$element.one(\"bsTransitionEnd\",a.proxy(this.hideModal,this)).emulateTransitionEnd(c.TRANSITION_DURATION):this.hideModal())},c.prototype.enforceFocus=function(){a(document).off(\"focusin.bs.modal\").on(\"focusin.bs.modal\",a.proxy(function(a){this.$element[0]===a.target||this.$element.has(a.target).length||this.$element.trigger(\"focus\")},this))},c.prototype.escape=function(){this.isShown&&this.options.keyboard?this.$element.on(\"keydown.dismiss.bs.modal\",a.proxy(function(a){27==a.which&&this.hide()},this)):this.isShown||this.$element.off(\"keydown.dismiss.bs.modal\")},c.prototype.resize=function(){this.isShown?a(window).on(\"resize.bs.modal\",a.proxy(this.handleUpdate,this)):a(window).off(\"resize.bs.modal\")},c.prototype.hideModal=function(){var a=this;this.$element.hide(),this.backdrop(function(){a.$body.removeClass(\"modal-open\"),a.resetAdjustments(),a.resetScrollbar(),a.$element.trigger(\"hidden.bs.modal\")})},c.prototype.removeBackdrop=function(){this.$backdrop&&this.$backdrop.remove(),this.$backdrop=null},c.prototype.backdrop=function(b){var d=this,e=this.$element.hasClass(\"fade\")?\"fade\":\"\";if(this.isShown&&this.options.backdrop){var f=a.support.transition&&e;if(this.$backdrop=a(document.createElement(\"div\")).addClass(\"modal-backdrop \"+e).appendTo(this.$body),this.$element.on(\"click.dismiss.bs.modal\",a.proxy(function(a){return this.ignoreBackdropClick?void(this.ignoreBackdropClick=!1):void(a.target===a.currentTarget&&(\"static\"==this.options.backdrop?this.$element[0].focus():this.hide()))},this)),f&&this.$backdrop[0].offsetWidth,this.$backdrop.addClass(\"in\"),!b)return;f?this.$backdrop.one(\"bsTransitionEnd\",b).emulateTransitionEnd(c.BACKDROP_TRANSITION_DURATION):b()}else if(!this.isShown&&this.$backdrop){this.$backdrop.removeClass(\"in\");var g=function(){d.removeBackdrop(),b&&b()};a.support.transition&&this.$element.hasClass(\"fade\")?this.$backdrop.one(\"bsTransitionEnd\",g).emulateTransitionEnd(c.BACKDROP_TRANSITION_DURATION):g()}else b&&b()},c.prototype.handleUpdate=function(){this.adjustDialog()},c.prototype.adjustDialog=function(){var a=this.$element[0].scrollHeight>document.documentElement.clientHeight;this.$element.css({paddingLeft:!this.bodyIsOverflowing&&a?this.scrollbarWidth:\"\",paddingRight:this.bodyIsOverflowing&&!a?this.scrollbarWidth:\"\"})},c.prototype.resetAdjustments=function(){this.$element.css({paddingLeft:\"\",paddingRight:\"\"})},c.prototype.checkScrollbar=function(){var a=window.innerWidth;if(!a){var b=document.documentElement.getBoundingClientRect();a=b.right-Math.abs(b.left)}this.bodyIsOverflowing=document.body.clientWidth<a,this.scrollbarWidth=this.measureScrollbar()},c.prototype.setScrollbar=function(){var a=parseInt(this.$body.css(\"padding-right\")||0,10);this.originalBodyPad=document.body.style.paddingRight||\"\",this.bodyIsOverflowing&&this.$body.css(\"padding-right\",a+this.scrollbarWidth)},c.prototype.resetScrollbar=function(){this.$body.css(\"padding-right\",this.originalBodyPad)},c.prototype.measureScrollbar=function(){var a=document.createElement(\"div\");a.className=\"modal-scrollbar-measure\",this.$body.append(a);var b=a.offsetWidth-a.clientWidth;return this.$body[0].removeChild(a),b};var d=a.fn.modal;a.fn.modal=b,a.fn.modal.Constructor=c,a.fn.modal.noConflict=function(){return a.fn.modal=d,this},a(document).on(\"click.bs.modal.data-api\",'[data-toggle=\"modal\"]',function(c){var d=a(this),e=d.attr(\"href\"),f=a(d.attr(\"data-target\")||e&&e.replace(/.*(?=#[^\\s]+$)/,\"\")),g=f.data(\"bs.modal\")?\"toggle\":a.extend({remote:!/#/.test(e)&&e},f.data(),d.data());d.is(\"a\")&&c.preventDefault(),f.one(\"show.bs.modal\",function(a){a.isDefaultPrevented()||f.one(\"hidden.bs.modal\",function(){d.is(\":visible\")&&d.trigger(\"focus\")})}),b.call(f,g,this)})}(jQuery),+function(a){\"use strict\";function b(b){return this.each(function(){var d=a(this),e=d.data(\"bs.tooltip\"),f=\"object\"==typeof b&&b;(e||!/destroy|hide/.test(b))&&(e||d.data(\"bs.tooltip\",e=new c(this,f)),\"string\"==typeof b&&e[b]())})}var c=function(a,b){this.type=null,this.options=null,this.enabled=null,this.timeout=null,this.hoverState=null,this.$element=null,this.inState=null,this.init(\"tooltip\",a,b)};c.VERSION=\"3.3.5\",c.TRANSITION_DURATION=150,c.DEFAULTS={animation:!0,placement:\"top\",selector:!1,template:'<div class=\"tooltip\" role=\"tooltip\"><div class=\"tooltip-arrow\"></div><div class=\"tooltip-inner\"></div></div>',trigger:\"hover focus\",title:\"\",delay:0,html:!1,container:!1,viewport:{selector:\"body\",padding:0}},c.prototype.init=function(b,c,d){if(this.enabled=!0,this.type=b,this.$element=a(c),this.options=this.getOptions(d),this.$viewport=this.options.viewport&&a(a.isFunction(this.options.viewport)?this.options.viewport.call(this,this.$element):this.options.viewport.selector||this.options.viewport),this.inState={click:!1,hover:!1,focus:!1},this.$element[0]instanceof document.constructor&&!this.options.selector)throw new Error(\"`selector` option must be specified when initializing \"+this.type+\" on the window.document object!\");for(var e=this.options.trigger.split(\" \"),f=e.length;f--;){var g=e[f];if(\"click\"==g)this.$element.on(\"click.\"+this.type,this.options.selector,a.proxy(this.toggle,this));else if(\"manual\"!=g){var h=\"hover\"==g?\"mouseenter\":\"focusin\",i=\"hover\"==g?\"mouseleave\":\"focusout\";this.$element.on(h+\".\"+this.type,this.options.selector,a.proxy(this.enter,this)),this.$element.on(i+\".\"+this.type,this.options.selector,a.proxy(this.leave,this))}}this.options.selector?this._options=a.extend({},this.options,{trigger:\"manual\",selector:\"\"}):this.fixTitle()},c.prototype.getDefaults=function(){return c.DEFAULTS},c.prototype.getOptions=function(b){return b=a.extend({},this.getDefaults(),this.$element.data(),b),b.delay&&\"number\"==typeof b.delay&&(b.delay={show:b.delay,hide:b.delay}),b},c.prototype.getDelegateOptions=function(){var b={},c=this.getDefaults();return this._options&&a.each(this._options,function(a,d){c[a]!=d&&(b[a]=d)}),b},c.prototype.enter=function(b){var c=b instanceof this.constructor?b:a(b.currentTarget).data(\"bs.\"+this.type);return c||(c=new this.constructor(b.currentTarget,this.getDelegateOptions()),a(b.currentTarget).data(\"bs.\"+this.type,c)),b instanceof a.Event&&(c.inState[\"focusin\"==b.type?\"focus\":\"hover\"]=!0),c.tip().hasClass(\"in\")||\"in\"==c.hoverState?void(c.hoverState=\"in\"):(clearTimeout(c.timeout),c.hoverState=\"in\",c.options.delay&&c.options.delay.show?void(c.timeout=setTimeout(function(){\"in\"==c.hoverState&&c.show()},c.options.delay.show)):c.show())},c.prototype.isInStateTrue=function(){for(var a in this.inState)if(this.inState[a])return!0;return!1},c.prototype.leave=function(b){var c=b instanceof this.constructor?b:a(b.currentTarget).data(\"bs.\"+this.type);return c||(c=new this.constructor(b.currentTarget,this.getDelegateOptions()),a(b.currentTarget).data(\"bs.\"+this.type,c)),b instanceof a.Event&&(c.inState[\"focusout\"==b.type?\"focus\":\"hover\"]=!1),c.isInStateTrue()?void 0:(clearTimeout(c.timeout),c.hoverState=\"out\",c.options.delay&&c.options.delay.hide?void(c.timeout=setTimeout(function(){\"out\"==c.hoverState&&c.hide()},c.options.delay.hide)):c.hide())},c.prototype.show=function(){var b=a.Event(\"show.bs.\"+this.type);if(this.hasContent()&&this.enabled){this.$element.trigger(b);var d=a.contains(this.$element[0].ownerDocument.documentElement,this.$element[0]);if(b.isDefaultPrevented()||!d)return;var e=this,f=this.tip(),g=this.getUID(this.type);this.setContent(),f.attr(\"id\",g),this.$element.attr(\"aria-describedby\",g),this.options.animation&&f.addClass(\"fade\");var h=\"function\"==typeof this.options.placement?this.options.placement.call(this,f[0],this.$element[0]):this.options.placement,i=/\\s?auto?\\s?/i,j=i.test(h);j&&(h=h.replace(i,\"\")||\"top\"),f.detach().css({top:0,left:0,display:\"block\"}).addClass(h).data(\"bs.\"+this.type,this),this.options.container?f.appendTo(this.options.container):f.insertAfter(this.$element),this.$element.trigger(\"inserted.bs.\"+this.type);var k=this.getPosition(),l=f[0].offsetWidth,m=f[0].offsetHeight;if(j){var n=h,o=this.getPosition(this.$viewport);h=\"bottom\"==h&&k.bottom+m>o.bottom?\"top\":\"top\"==h&&k.top-m<o.top?\"bottom\":\"right\"==h&&k.right+l>o.width?\"left\":\"left\"==h&&k.left-l<o.left?\"right\":h,f.removeClass(n).addClass(h)}var p=this.getCalculatedOffset(h,k,l,m);this.applyPlacement(p,h);var q=function(){var a=e.hoverState;e.$element.trigger(\"shown.bs.\"+e.type),e.hoverState=null,\"out\"==a&&e.leave(e)};a.support.transition&&this.$tip.hasClass(\"fade\")?f.one(\"bsTransitionEnd\",q).emulateTransitionEnd(c.TRANSITION_DURATION):q()}},c.prototype.applyPlacement=function(b,c){var d=this.tip(),e=d[0].offsetWidth,f=d[0].offsetHeight,g=parseInt(d.css(\"margin-top\"),10),h=parseInt(d.css(\"margin-left\"),10);isNaN(g)&&(g=0),isNaN(h)&&(h=0),b.top+=g,b.left+=h,a.offset.setOffset(d[0],a.extend({using:function(a){d.css({top:Math.round(a.top),left:Math.round(a.left)})}},b),0),d.addClass(\"in\");var i=d[0].offsetWidth,j=d[0].offsetHeight;\"top\"==c&&j!=f&&(b.top=b.top+f-j);var k=this.getViewportAdjustedDelta(c,b,i,j);k.left?b.left+=k.left:b.top+=k.top;var l=/top|bottom/.test(c),m=l?2*k.left-e+i:2*k.top-f+j,n=l?\"offsetWidth\":\"offsetHeight\";d.offset(b),this.replaceArrow(m,d[0][n],l)},c.prototype.replaceArrow=function(a,b,c){this.arrow().css(c?\"left\":\"top\",50*(1-a/b)+\"%\").css(c?\"top\":\"left\",\"\")},c.prototype.setContent=function(){var a=this.tip(),b=this.getTitle();a.find(\".tooltip-inner\")[this.options.html?\"html\":\"text\"](b),a.removeClass(\"fade in top bottom left right\")},c.prototype.hide=function(b){function d(){\"in\"!=e.hoverState&&f.detach(),e.$element.removeAttr(\"aria-describedby\").trigger(\"hidden.bs.\"+e.type),b&&b()}var e=this,f=a(this.$tip),g=a.Event(\"hide.bs.\"+this.type);return this.$element.trigger(g),g.isDefaultPrevented()?void 0:(f.removeClass(\"in\"),a.support.transition&&f.hasClass(\"fade\")?f.one(\"bsTransitionEnd\",d).emulateTransitionEnd(c.TRANSITION_DURATION):d(),this.hoverState=null,this)},c.prototype.fixTitle=function(){var a=this.$element;(a.attr(\"title\")||\"string\"!=typeof a.attr(\"data-original-title\"))&&a.attr(\"data-original-title\",a.attr(\"title\")||\"\").attr(\"title\",\"\")},c.prototype.hasContent=function(){return this.getTitle()},c.prototype.getPosition=function(b){b=b||this.$element;var c=b[0],d=\"BODY\"==c.tagName,e=c.getBoundingClientRect();null==e.width&&(e=a.extend({},e,{width:e.right-e.left,height:e.bottom-e.top}));var f=d?{top:0,left:0}:b.offset(),g={scroll:d?document.documentElement.scrollTop||document.body.scrollTop:b.scrollTop()},h=d?{width:a(window).width(),height:a(window).height()}:null;return a.extend({},e,g,h,f)},c.prototype.getCalculatedOffset=function(a,b,c,d){return\"bottom\"==a?{top:b.top+b.height,left:b.left+b.width/2-c/2}:\"top\"==a?{top:b.top-d,left:b.left+b.width/2-c/2}:\"left\"==a?{top:b.top+b.height/2-d/2,left:b.left-c}:{top:b.top+b.height/2-d/2,left:b.left+b.width}},c.prototype.getViewportAdjustedDelta=function(a,b,c,d){var e={top:0,left:0};if(!this.$viewport)return e;var f=this.options.viewport&&this.options.viewport.padding||0,g=this.getPosition(this.$viewport);if(/right|left/.test(a)){var h=b.top-f-g.scroll,i=b.top+f-g.scroll+d;h<g.top?e.top=g.top-h:i>g.top+g.height&&(e.top=g.top+g.height-i)}else{var j=b.left-f,k=b.left+f+c;j<g.left?e.left=g.left-j:k>g.right&&(e.left=g.left+g.width-k)}return e},c.prototype.getTitle=function(){var a,b=this.$element,c=this.options;return a=b.attr(\"data-original-title\")||(\"function\"==typeof c.title?c.title.call(b[0]):c.title)},c.prototype.getUID=function(a){do a+=~~(1e6*Math.random());while(document.getElementById(a));return a},c.prototype.tip=function(){if(!this.$tip&&(this.$tip=a(this.options.template),1!=this.$tip.length))throw new Error(this.type+\" `template` option must consist of exactly 1 top-level element!\");return this.$tip},c.prototype.arrow=function(){return this.$arrow=this.$arrow||this.tip().find(\".tooltip-arrow\")},c.prototype.enable=function(){this.enabled=!0},c.prototype.disable=function(){this.enabled=!1},c.prototype.toggleEnabled=function(){this.enabled=!this.enabled},c.prototype.toggle=function(b){var c=this;b&&(c=a(b.currentTarget).data(\"bs.\"+this.type),c||(c=new this.constructor(b.currentTarget,this.getDelegateOptions()),a(b.currentTarget).data(\"bs.\"+this.type,c))),b?(c.inState.click=!c.inState.click,c.isInStateTrue()?c.enter(c):c.leave(c)):c.tip().hasClass(\"in\")?c.leave(c):c.enter(c)},c.prototype.destroy=function(){var a=this;clearTimeout(this.timeout),this.hide(function(){a.$element.off(\".\"+a.type).removeData(\"bs.\"+a.type),a.$tip&&a.$tip.detach(),a.$tip=null,a.$arrow=null,a.$viewport=null})};var d=a.fn.tooltip;a.fn.tooltip=b,a.fn.tooltip.Constructor=c,a.fn.tooltip.noConflict=function(){return a.fn.tooltip=d,this}}(jQuery),+function(a){\"use strict\";function b(b){return this.each(function(){var d=a(this),e=d.data(\"bs.popover\"),f=\"object\"==typeof b&&b;(e||!/destroy|hide/.test(b))&&(e||d.data(\"bs.popover\",e=new c(this,f)),\"string\"==typeof b&&e[b]())})}var c=function(a,b){this.init(\"popover\",a,b)};if(!a.fn.tooltip)throw new Error(\"Popover requires tooltip.js\");c.VERSION=\"3.3.5\",c.DEFAULTS=a.extend({},a.fn.tooltip.Constructor.DEFAULTS,{placement:\"right\",trigger:\"click\",content:\"\",template:'<div class=\"popover\" role=\"tooltip\"><div class=\"arrow\"></div><h3 class=\"popover-title\"></h3><div class=\"popover-content\"></div></div>'}),c.prototype=a.extend({},a.fn.tooltip.Constructor.prototype),c.prototype.constructor=c,c.prototype.getDefaults=function(){return c.DEFAULTS},c.prototype.setContent=function(){var a=this.tip(),b=this.getTitle(),c=this.getContent();a.find(\".popover-title\")[this.options.html?\"html\":\"text\"](b),a.find(\".popover-content\").children().detach().end()[this.options.html?\"string\"==typeof c?\"html\":\"append\":\"text\"](c),a.removeClass(\"fade top bottom left right in\"),a.find(\".popover-title\").html()||a.find(\".popover-title\").hide()},c.prototype.hasContent=function(){return this.getTitle()||this.getContent()},c.prototype.getContent=function(){var a=this.$element,b=this.options;return a.attr(\"data-content\")||(\"function\"==typeof b.content?b.content.call(a[0]):b.content)},c.prototype.arrow=function(){return this.$arrow=this.$arrow||this.tip().find(\".arrow\")};var d=a.fn.popover;a.fn.popover=b,a.fn.popover.Constructor=c,a.fn.popover.noConflict=function(){return a.fn.popover=d,this}}(jQuery),+function(a){\"use strict\";function b(c,d){this.$body=a(document.body),this.$scrollElement=a(a(c).is(document.body)?window:c),this.options=a.extend({},b.DEFAULTS,d),this.selector=(this.options.target||\"\")+\" .nav li > a\",this.offsets=[],this.targets=[],this.activeTarget=null,this.scrollHeight=0,this.$scrollElement.on(\"scroll.bs.scrollspy\",a.proxy(this.process,this)),this.refresh(),this.process()}function c(c){return this.each(function(){var d=a(this),e=d.data(\"bs.scrollspy\"),f=\"object\"==typeof c&&c;e||d.data(\"bs.scrollspy\",e=new b(this,f)),\"string\"==typeof c&&e[c]()})}b.VERSION=\"3.3.5\",b.DEFAULTS={offset:10},b.prototype.getScrollHeight=function(){return this.$scrollElement[0].scrollHeight||Math.max(this.$body[0].scrollHeight,document.documentElement.scrollHeight)},b.prototype.refresh=function(){var b=this,c=\"offset\",d=0;this.offsets=[],this.targets=[],this.scrollHeight=this.getScrollHeight(),a.isWindow(this.$scrollElement[0])||(c=\"position\",d=this.$scrollElement.scrollTop()),this.$body.find(this.selector).map(function(){var b=a(this),e=b.data(\"target\")||b.attr(\"href\"),f=/^#./.test(e)&&a(e);return f&&f.length&&f.is(\":visible\")&&[[f[c]().top+d,e]]||null}).sort(function(a,b){return a[0]-b[0]}).each(function(){b.offsets.push(this[0]),b.targets.push(this[1])})},b.prototype.process=function(){var a,b=this.$scrollElement.scrollTop()+this.options.offset,c=this.getScrollHeight(),d=this.options.offset+c-this.$scrollElement.height(),e=this.offsets,f=this.targets,g=this.activeTarget;if(this.scrollHeight!=c&&this.refresh(),b>=d)return g!=(a=f[f.length-1])&&this.activate(a);if(g&&b<e[0])return this.activeTarget=null,this.clear();for(a=e.length;a--;)g!=f[a]&&b>=e[a]&&(void 0===e[a+1]||b<e[a+1])&&this.activate(f[a])},b.prototype.activate=function(b){this.activeTarget=b,this.clear();var c=this.selector+'[data-target=\"'+b+'\"],'+this.selector+'[href=\"'+b+'\"]',d=a(c).parents(\"li\").addClass(\"active\");d.parent(\".dropdown-menu\").length&&(d=d.closest(\"li.dropdown\").addClass(\"active\")),\nd.trigger(\"activate.bs.scrollspy\")},b.prototype.clear=function(){a(this.selector).parentsUntil(this.options.target,\".active\").removeClass(\"active\")};var d=a.fn.scrollspy;a.fn.scrollspy=c,a.fn.scrollspy.Constructor=b,a.fn.scrollspy.noConflict=function(){return a.fn.scrollspy=d,this},a(window).on(\"load.bs.scrollspy.data-api\",function(){a('[data-spy=\"scroll\"]').each(function(){var b=a(this);c.call(b,b.data())})})}(jQuery),+function(a){\"use strict\";function b(b){return this.each(function(){var d=a(this),e=d.data(\"bs.tab\");e||d.data(\"bs.tab\",e=new c(this)),\"string\"==typeof b&&e[b]()})}var c=function(b){this.element=a(b)};c.VERSION=\"3.3.5\",c.TRANSITION_DURATION=150,c.prototype.show=function(){var b=this.element,c=b.closest(\"ul:not(.dropdown-menu)\"),d=b.data(\"target\");if(d||(d=b.attr(\"href\"),d=d&&d.replace(/.*(?=#[^\\s]*$)/,\"\")),!b.parent(\"li\").hasClass(\"active\")){var e=c.find(\".active:last a\"),f=a.Event(\"hide.bs.tab\",{relatedTarget:b[0]}),g=a.Event(\"show.bs.tab\",{relatedTarget:e[0]});if(e.trigger(f),b.trigger(g),!g.isDefaultPrevented()&&!f.isDefaultPrevented()){var h=a(d);this.activate(b.closest(\"li\"),c),this.activate(h,h.parent(),function(){e.trigger({type:\"hidden.bs.tab\",relatedTarget:b[0]}),b.trigger({type:\"shown.bs.tab\",relatedTarget:e[0]})})}}},c.prototype.activate=function(b,d,e){function f(){g.removeClass(\"active\").find(\"> .dropdown-menu > .active\").removeClass(\"active\").end().find('[data-toggle=\"tab\"]').attr(\"aria-expanded\",!1),b.addClass(\"active\").find('[data-toggle=\"tab\"]').attr(\"aria-expanded\",!0),h?(b[0].offsetWidth,b.addClass(\"in\")):b.removeClass(\"fade\"),b.parent(\".dropdown-menu\").length&&b.closest(\"li.dropdown\").addClass(\"active\").end().find('[data-toggle=\"tab\"]').attr(\"aria-expanded\",!0),e&&e()}var g=d.find(\"> .active\"),h=e&&a.support.transition&&(g.length&&g.hasClass(\"fade\")||!!d.find(\"> .fade\").length);g.length&&h?g.one(\"bsTransitionEnd\",f).emulateTransitionEnd(c.TRANSITION_DURATION):f(),g.removeClass(\"in\")};var d=a.fn.tab;a.fn.tab=b,a.fn.tab.Constructor=c,a.fn.tab.noConflict=function(){return a.fn.tab=d,this};var e=function(c){c.preventDefault(),b.call(a(this),\"show\")};a(document).on(\"click.bs.tab.data-api\",'[data-toggle=\"tab\"]',e).on(\"click.bs.tab.data-api\",'[data-toggle=\"pill\"]',e)}(jQuery),+function(a){\"use strict\";function b(b){return this.each(function(){var d=a(this),e=d.data(\"bs.affix\"),f=\"object\"==typeof b&&b;e||d.data(\"bs.affix\",e=new c(this,f)),\"string\"==typeof b&&e[b]()})}var c=function(b,d){this.options=a.extend({},c.DEFAULTS,d),this.$target=a(this.options.target).on(\"scroll.bs.affix.data-api\",a.proxy(this.checkPosition,this)).on(\"click.bs.affix.data-api\",a.proxy(this.checkPositionWithEventLoop,this)),this.$element=a(b),this.affixed=null,this.unpin=null,this.pinnedOffset=null,this.checkPosition()};c.VERSION=\"3.3.5\",c.RESET=\"affix affix-top affix-bottom\",c.DEFAULTS={offset:0,target:window},c.prototype.getState=function(a,b,c,d){var e=this.$target.scrollTop(),f=this.$element.offset(),g=this.$target.height();if(null!=c&&\"top\"==this.affixed)return c>e?\"top\":!1;if(\"bottom\"==this.affixed)return null!=c?e+this.unpin<=f.top?!1:\"bottom\":a-d>=e+g?!1:\"bottom\";var h=null==this.affixed,i=h?e:f.top,j=h?g:b;return null!=c&&c>=e?\"top\":null!=d&&i+j>=a-d?\"bottom\":!1},c.prototype.getPinnedOffset=function(){if(this.pinnedOffset)return this.pinnedOffset;this.$element.removeClass(c.RESET).addClass(\"affix\");var a=this.$target.scrollTop(),b=this.$element.offset();return this.pinnedOffset=b.top-a},c.prototype.checkPositionWithEventLoop=function(){setTimeout(a.proxy(this.checkPosition,this),1)},c.prototype.checkPosition=function(){if(this.$element.is(\":visible\")){var b=this.$element.height(),d=this.options.offset,e=d.top,f=d.bottom,g=Math.max(a(document).height(),a(document.body).height());\"object\"!=typeof d&&(f=e=d),\"function\"==typeof e&&(e=d.top(this.$element)),\"function\"==typeof f&&(f=d.bottom(this.$element));var h=this.getState(g,b,e,f);if(this.affixed!=h){null!=this.unpin&&this.$element.css(\"top\",\"\");var i=\"affix\"+(h?\"-\"+h:\"\"),j=a.Event(i+\".bs.affix\");if(this.$element.trigger(j),j.isDefaultPrevented())return;this.affixed=h,this.unpin=\"bottom\"==h?this.getPinnedOffset():null,this.$element.removeClass(c.RESET).addClass(i).trigger(i.replace(\"affix\",\"affixed\")+\".bs.affix\")}\"bottom\"==h&&this.$element.offset({top:g-b-f})}};var d=a.fn.affix;a.fn.affix=b,a.fn.affix.Constructor=c,a.fn.affix.noConflict=function(){return a.fn.affix=d,this},a(window).on(\"load\",function(){a('[data-spy=\"affix\"]').each(function(){var c=a(this),d=c.data();d.offset=d.offset||{},null!=d.offsetBottom&&(d.offset.bottom=d.offsetBottom),null!=d.offsetTop&&(d.offset.top=d.offsetTop),b.call(c,d)})})}(jQuery);PK\x07\x08^\xbfIn\xd0\x8f\x00\x00\xd0\x8f\x00\x00PK\x03\x04\x14\x00\x08\x00\x00\x00W\x9a5G\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x1d\x00\x00\x00js/vendor/jquery-2.1.4.min.js/*! jQuery v2.1.4 | (c) 2005, 2015 jQuery Foundation, Inc. | jquery.org/license */\n!function(a,b){\"object\"==typeof module&&\"object\"==typeof module.exports?module.exports=a.document?b(a,!0):function(a){if(!a.document)throw new Error(\"jQuery requires a window with a document\");return b(a)}:b(a)}(\"undefined\"!=typeof window?window:this,function(a,b){var c=[],d=c.slice,e=c.concat,f=c.push,g=c.indexOf,h={},i=h.toString,j=h.hasOwnProperty,k={},l=a.document,m=\"2.1.4\",n=function(a,b){return new n.fn.init(a,b)},o=/^[\\s\\uFEFF\\xA0]+|[\\s\\uFEFF\\xA0]+$/g,p=/^-ms-/,q=/-([\\da-z])/gi,r=function(a,b){return b.toUpperCase()};n.fn=n.prototype={jquery:m,constructor:n,selector:\"\",length:0,toArray:function(){return d.call(this)},get:function(a){return null!=a?0>a?this[a+this.length]:this[a]:d.call(this)},pushStack:function(a){var b=n.merge(this.constructor(),a);return b.prevObject=this,b.context=this.context,b},each:function(a,b){return n.each(this,a,b)},map:function(a){return this.pushStack(n.map(this,function(b,c){return a.call(b,c,b)}))},slice:function(){return this.pushStack(d.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(a){var b=this.length,c=+a+(0>a?b:0);return this.pushStack(c>=0&&b>c?[this[c]]:[])},end:function(){return this.prevObject||this.constructor(null)},push:f,sort:c.sort,splice:c.splice},n.extend=n.fn.extend=function(){var a,b,c,d,e,f,g=arguments[0]||{},h=1,i=arguments.length,j=!1;for(\"boolean\"==typeof g&&(j=g,g=arguments[h]||{},h++),\"object\"==typeof g||n.isFunction(g)||(g={}),h===i&&(g=this,h--);i>h;h++)if(null!=(a=arguments[h]))for(b in a)c=g[b],d=a[b],g!==d&&(j&&d&&(n.isPlainObject(d)||(e=n.isArray(d)))?(e?(e=!1,f=c&&n.isArray(c)?c:[]):f=c&&n.isPlainObject(c)?c:{},g[b]=n.extend(j,f,d)):void 0!==d&&(g[b]=d));return g},n.extend({expando:\"jQuery\"+(m+Math.random()).replace(/\\D/g,\"\"),isReady:!0,error:function(a){throw new Error(a)},noop:function(){},isFunction:function(a){return\"function\"===n.type(a)},isArray:Array.isArray,isWindow:function(a){return null!=a&&a===a.window},isNumeric:function(a){return!n.isArray(a)&&a-parseFloat(a)+1>=0},isPlainObject:function(a){return\"object\"!==n.type(a)||a.nodeType||n.isWindow(a)?!1:a.constructor&&!j.call(a.constructor.prototype,\"isPrototypeOf\")?!1:!0},isEmptyObject:function(a){var b;for(b in a)return!1;return!0},type:function(a){return null==a?a+\"\":\"object\"==typeof a||\"function\"==typeof a?h[i.call(a)]||\"object\":typeof a},globalEval:function(a){var b,c=eval;a=n.trim(a),a&&(1===a.indexOf(\"use strict\")?(b=l.createElement(\"script\"),b.text=a,l.head.appendChild(b).parentNode.removeChild(b)):c(a))},camelCase:function(a){return a.replace(p,\"ms-\").replace(q,r)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toLowerCase()===b.toLowerCase()},each:function(a,b,c){var d,e=0,f=a.length,g=s(a);if(c){if(g){for(;f>e;e++)if(d=b.apply(a[e],c),d===!1)break}else for(e in a)if(d=b.apply(a[e],c),d===!1)break}else if(g){for(;f>e;e++)if(d=b.call(a[e],e,a[e]),d===!1)break}else for(e in a)if(d=b.call(a[e],e,a[e]),d===!1)break;return a},trim:function(a){return null==a?\"\":(a+\"\").replace(o,\"\")},makeArray:function(a,b){var c=b||[];return null!=a&&(s(Object(a))?n.merge(c,\"string\"==typeof a?[a]:a):f.call(c,a)),c},inArray:function(a,b,c){return null==b?-1:g.call(b,a,c)},merge:function(a,b){for(var c=+b.length,d=0,e=a.length;c>d;d++)a[e++]=b[d];return a.length=e,a},grep:function(a,b,c){for(var d,e=[],f=0,g=a.length,h=!c;g>f;f++)d=!b(a[f],f),d!==h&&e.push(a[f]);return e},map:function(a,b,c){var d,f=0,g=a.length,h=s(a),i=[];if(h)for(;g>f;f++)d=b(a[f],f,c),null!=d&&i.push(d);else for(f in a)d=b(a[f],f,c),null!=d&&i.push(d);return e.apply([],i)},guid:1,proxy:function(a,b){var c,e,f;return\"string\"==typeof b&&(c=a[b],b=a,a=c),n.isFunction(a)?(e=d.call(arguments,2),f=function(){return a.apply(b||this,e.concat(d.call(arguments)))},f.guid=a.guid=a.guid||n.guid++,f):void 0},now:Date.now,support:k}),n.each(\"Boolean Number String Function Array Date RegExp Object Error\".split(\" \"),function(a,b){h[\"[object \"+b+\"]\"]=b.toLowerCase()});function s(a){var b=\"length\"in a&&a.length,c=n.type(a);return\"function\"===c||n.isWindow(a)?!1:1===a.nodeType&&b?!0:\"array\"===c||0===b||\"number\"==typeof b&&b>0&&b-1 in a}var t=function(a){var b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u=\"sizzle\"+1*new Date,v=a.document,w=0,x=0,y=ha(),z=ha(),A=ha(),B=function(a,b){return a===b&&(l=!0),0},C=1<<31,D={}.hasOwnProperty,E=[],F=E.pop,G=E.push,H=E.push,I=E.slice,J=function(a,b){for(var c=0,d=a.length;d>c;c++)if(a[c]===b)return c;return-1},K=\"checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped\",L=\"[\\\\x20\\\\t\\\\r\\\\n\\\\f]\",M=\"(?:\\\\\\\\.|[\\\\w-]|[^\\\\x00-\\\\xa0])+\",N=M.replace(\"w\",\"w#\"),O=\"\\\\[\"+L+\"*(\"+M+\")(?:\"+L+\"*([*^$|!~]?=)\"+L+\"*(?:'((?:\\\\\\\\.|[^\\\\\\\\'])*)'|\\\"((?:\\\\\\\\.|[^\\\\\\\\\\\"])*)\\\"|(\"+N+\"))|)\"+L+\"*\\\\]\",P=\":(\"+M+\")(?:\\\\((('((?:\\\\\\\\.|[^\\\\\\\\'])*)'|\\\"((?:\\\\\\\\.|[^\\\\\\\\\\\"])*)\\\")|((?:\\\\\\\\.|[^\\\\\\\\()[\\\\]]|\"+O+\")*)|.*)\\\\)|)\",Q=new RegExp(L+\"+\",\"g\"),R=new RegExp(\"^\"+L+\"+|((?:^|[^\\\\\\\\])(?:\\\\\\\\.)*)\"+L+\"+$\",\"g\"),S=new RegExp(\"^\"+L+\"*,\"+L+\"*\"),T=new RegExp(\"^\"+L+\"*([>+~]|\"+L+\")\"+L+\"*\"),U=new RegExp(\"=\"+L+\"*([^\\\\]'\\\"]*?)\"+L+\"*\\\\]\",\"g\"),V=new RegExp(P),W=new RegExp(\"^\"+N+\"$\"),X={ID:new RegExp(\"^#(\"+M+\")\"),CLASS:new RegExp(\"^\\\\.(\"+M+\")\"),TAG:new RegExp(\"^(\"+M.replace(\"w\",\"w*\")+\")\"),ATTR:new RegExp(\"^\"+O),PSEUDO:new RegExp(\"^\"+P),CHILD:new RegExp(\"^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\\\(\"+L+\"*(even|odd|(([+-]|)(\\\\d*)n|)\"+L+\"*(?:([+-]|)\"+L+\"*(\\\\d+)|))\"+L+\"*\\\\)|)\",\"i\"),bool:new RegExp(\"^(?:\"+K+\")$\",\"i\"),needsContext:new RegExp(\"^\"+L+\"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\\\(\"+L+\"*((?:-\\\\d)?\\\\d*)\"+L+\"*\\\\)|)(?=[^-]|$)\",\"i\")},Y=/^(?:input|select|textarea|button)$/i,Z=/^h\\d$/i,$=/^[^{]+\\{\\s*\\[native \\w/,_=/^(?:#([\\w-]+)|(\\w+)|\\.([\\w-]+))$/,aa=/[+~]/,ba=/'|\\\\/g,ca=new RegExp(\"\\\\\\\\([\\\\da-f]{1,6}\"+L+\"?|(\"+L+\")|.)\",\"ig\"),da=function(a,b,c){var d=\"0x\"+b-65536;return d!==d||c?b:0>d?String.fromCharCode(d+65536):String.fromCharCode(d>>10|55296,1023&d|56320)},ea=function(){m()};try{H.apply(E=I.call(v.childNodes),v.childNodes),E[v.childNodes.length].nodeType}catch(fa){H={apply:E.length?function(a,b){G.apply(a,I.call(b))}:function(a,b){var c=a.length,d=0;while(a[c++]=b[d++]);a.length=c-1}}}function ga(a,b,d,e){var f,h,j,k,l,o,r,s,w,x;if((b?b.ownerDocument||b:v)!==n&&m(b),b=b||n,d=d||[],k=b.nodeType,\"string\"!=typeof a||!a||1!==k&&9!==k&&11!==k)return d;if(!e&&p){if(11!==k&&(f=_.exec(a)))if(j=f[1]){if(9===k){if(h=b.getElementById(j),!h||!h.parentNode)return d;if(h.id===j)return d.push(h),d}else if(b.ownerDocument&&(h=b.ownerDocument.getElementById(j))&&t(b,h)&&h.id===j)return d.push(h),d}else{if(f[2])return H.apply(d,b.getElementsByTagName(a)),d;if((j=f[3])&&c.getElementsByClassName)return H.apply(d,b.getElementsByClassName(j)),d}if(c.qsa&&(!q||!q.test(a))){if(s=r=u,w=b,x=1!==k&&a,1===k&&\"object\"!==b.nodeName.toLowerCase()){o=g(a),(r=b.getAttribute(\"id\"))?s=r.replace(ba,\"\\\\$&\"):b.setAttribute(\"id\",s),s=\"[id='\"+s+\"'] \",l=o.length;while(l--)o[l]=s+ra(o[l]);w=aa.test(a)&&pa(b.parentNode)||b,x=o.join(\",\")}if(x)try{return H.apply(d,w.querySelectorAll(x)),d}catch(y){}finally{r||b.removeAttribute(\"id\")}}}return i(a.replace(R,\"$1\"),b,d,e)}function ha(){var a=[];function b(c,e){return a.push(c+\" \")>d.cacheLength&&delete b[a.shift()],b[c+\" \"]=e}return b}function ia(a){return a[u]=!0,a}function ja(a){var b=n.createElement(\"div\");try{return!!a(b)}catch(c){return!1}finally{b.parentNode&&b.parentNode.removeChild(b),b=null}}function ka(a,b){var c=a.split(\"|\"),e=a.length;while(e--)d.attrHandle[c[e]]=b}function la(a,b){var c=b&&a,d=c&&1===a.nodeType&&1===b.nodeType&&(~b.sourceIndex||C)-(~a.sourceIndex||C);if(d)return d;if(c)while(c=c.nextSibling)if(c===b)return-1;return a?1:-1}function ma(a){return function(b){var c=b.nodeName.toLowerCase();return\"input\"===c&&b.type===a}}function na(a){return function(b){var c=b.nodeName.toLowerCase();return(\"input\"===c||\"button\"===c)&&b.type===a}}function oa(a){return ia(function(b){return b=+b,ia(function(c,d){var e,f=a([],c.length,b),g=f.length;while(g--)c[e=f[g]]&&(c[e]=!(d[e]=c[e]))})})}function pa(a){return a&&\"undefined\"!=typeof a.getElementsByTagName&&a}c=ga.support={},f=ga.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return b?\"HTML\"!==b.nodeName:!1},m=ga.setDocument=function(a){var b,e,g=a?a.ownerDocument||a:v;return g!==n&&9===g.nodeType&&g.documentElement?(n=g,o=g.documentElement,e=g.defaultView,e&&e!==e.top&&(e.addEventListener?e.addEventListener(\"unload\",ea,!1):e.attachEvent&&e.attachEvent(\"onunload\",ea)),p=!f(g),c.attributes=ja(function(a){return a.className=\"i\",!a.getAttribute(\"className\")}),c.getElementsByTagName=ja(function(a){return a.appendChild(g.createComment(\"\")),!a.getElementsByTagName(\"*\").length}),c.getElementsByClassName=$.test(g.getElementsByClassName),c.getById=ja(function(a){return o.appendChild(a).id=u,!g.getElementsByName||!g.getElementsByName(u).length}),c.getById?(d.find.ID=function(a,b){if(\"undefined\"!=typeof b.getElementById&&p){var c=b.getElementById(a);return c&&c.parentNode?[c]:[]}},d.filter.ID=function(a){var b=a.replace(ca,da);return function(a){return a.getAttribute(\"id\")===b}}):(delete d.find.ID,d.filter.ID=function(a){var b=a.replace(ca,da);return function(a){var c=\"undefined\"!=typeof a.getAttributeNode&&a.getAttributeNode(\"id\");return c&&c.value===b}}),d.find.TAG=c.getElementsByTagName?function(a,b){return\"undefined\"!=typeof b.getElementsByTagName?b.getElementsByTagName(a):c.qsa?b.querySelectorAll(a):void 0}:function(a,b){var c,d=[],e=0,f=b.getElementsByTagName(a);if(\"*\"===a){while(c=f[e++])1===c.nodeType&&d.push(c);return d}return f},d.find.CLASS=c.getElementsByClassName&&function(a,b){return p?b.getElementsByClassName(a):void 0},r=[],q=[],(c.qsa=$.test(g.querySelectorAll))&&(ja(function(a){o.appendChild(a).innerHTML=\"<a id='\"+u+\"'></a><select id='\"+u+\"-\\f]' msallowcapture=''><option selected=''></option></select>\",a.querySelectorAll(\"[msallowcapture^='']\").length&&q.push(\"[*^$]=\"+L+\"*(?:''|\\\"\\\")\"),a.querySelectorAll(\"[selected]\").length||q.push(\"\\\\[\"+L+\"*(?:value|\"+K+\")\"),a.querySelectorAll(\"[id~=\"+u+\"-]\").length||q.push(\"~=\"),a.querySelectorAll(\":checked\").length||q.push(\":checked\"),a.querySelectorAll(\"a#\"+u+\"+*\").length||q.push(\".#.+[+~]\")}),ja(function(a){var b=g.createElement(\"input\");b.setAttribute(\"type\",\"hidden\"),a.appendChild(b).setAttribute(\"name\",\"D\"),a.querySelectorAll(\"[name=d]\").length&&q.push(\"name\"+L+\"*[*^$|!~]?=\"),a.querySelectorAll(\":enabled\").length||q.push(\":enabled\",\":disabled\"),a.querySelectorAll(\"*,:x\"),q.push(\",.*:\")})),(c.matchesSelector=$.test(s=o.matches||o.webkitMatchesSelector||o.mozMatchesSelector||o.oMatchesSelector||o.msMatchesSelector))&&ja(function(a){c.disconnectedMatch=s.call(a,\"div\"),s.call(a,\"[s!='']:x\"),r.push(\"!=\",P)}),q=q.length&&new RegExp(q.join(\"|\")),r=r.length&&new RegExp(r.join(\"|\")),b=$.test(o.compareDocumentPosition),t=b||$.test(o.contains)?function(a,b){var c=9===a.nodeType?a.documentElement:a,d=b&&b.parentNode;return a===d||!(!d||1!==d.nodeType||!(c.contains?c.contains(d):a.compareDocumentPosition&&16&a.compareDocumentPosition(d)))}:function(a,b){if(b)while(b=b.parentNode)if(b===a)return!0;return!1},B=b?function(a,b){if(a===b)return l=!0,0;var d=!a.compareDocumentPosition-!b.compareDocumentPosition;return d?d:(d=(a.ownerDocument||a)===(b.ownerDocument||b)?a.compareDocumentPosition(b):1,1&d||!c.sortDetached&&b.compareDocumentPosition(a)===d?a===g||a.ownerDocument===v&&t(v,a)?-1:b===g||b.ownerDocument===v&&t(v,b)?1:k?J(k,a)-J(k,b):0:4&d?-1:1)}:function(a,b){if(a===b)return l=!0,0;var c,d=0,e=a.parentNode,f=b.parentNode,h=[a],i=[b];if(!e||!f)return a===g?-1:b===g?1:e?-1:f?1:k?J(k,a)-J(k,b):0;if(e===f)return la(a,b);c=a;while(c=c.parentNode)h.unshift(c);c=b;while(c=c.parentNode)i.unshift(c);while(h[d]===i[d])d++;return d?la(h[d],i[d]):h[d]===v?-1:i[d]===v?1:0},g):n},ga.matches=function(a,b){return ga(a,null,null,b)},ga.matchesSelector=function(a,b){if((a.ownerDocument||a)!==n&&m(a),b=b.replace(U,\"='$1']\"),!(!c.matchesSelector||!p||r&&r.test(b)||q&&q.test(b)))try{var d=s.call(a,b);if(d||c.disconnectedMatch||a.document&&11!==a.document.nodeType)return d}catch(e){}return ga(b,n,null,[a]).length>0},ga.contains=function(a,b){return(a.ownerDocument||a)!==n&&m(a),t(a,b)},ga.attr=function(a,b){(a.ownerDocument||a)!==n&&m(a);var e=d.attrHandle[b.toLowerCase()],f=e&&D.call(d.attrHandle,b.toLowerCase())?e(a,b,!p):void 0;return void 0!==f?f:c.attributes||!p?a.getAttribute(b):(f=a.getAttributeNode(b))&&f.specified?f.value:null},ga.error=function(a){throw new Error(\"Syntax error, unrecognized expression: \"+a)},ga.uniqueSort=function(a){var b,d=[],e=0,f=0;if(l=!c.detectDuplicates,k=!c.sortStable&&a.slice(0),a.sort(B),l){while(b=a[f++])b===a[f]&&(e=d.push(f));while(e--)a.splice(d[e],1)}return k=null,a},e=ga.getText=function(a){var b,c=\"\",d=0,f=a.nodeType;if(f){if(1===f||9===f||11===f){if(\"string\"==typeof a.textContent)return a.textContent;for(a=a.firstChild;a;a=a.nextSibling)c+=e(a)}else if(3===f||4===f)return a.nodeValue}else while(b=a[d++])c+=e(b);return c},d=ga.selectors={cacheLength:50,createPseudo:ia,match:X,attrHandle:{},find:{},relative:{\">\":{dir:\"parentNode\",first:!0},\" \":{dir:\"parentNode\"},\"+\":{dir:\"previousSibling\",first:!0},\"~\":{dir:\"previousSibling\"}},preFilter:{ATTR:function(a){return a[1]=a[1].replace(ca,da),a[3]=(a[3]||a[4]||a[5]||\"\").replace(ca,da),\"~=\"===a[2]&&(a[3]=\" \"+a[3]+\" \"),a.slice(0,4)},CHILD:function(a){return a[1]=a[1].toLowerCase(),\"nth\"===a[1].slice(0,3)?(a[3]||ga.error(a[0]),a[4]=+(a[4]?a[5]+(a[6]||1):2*(\"even\"===a[3]||\"odd\"===a[3])),a[5]=+(a[7]+a[8]||\"odd\"===a[3])):a[3]&&ga.error(a[0]),a},PSEUDO:function(a){var b,c=!a[6]&&a[2];return X.CHILD.test(a[0])?null:(a[3]?a[2]=a[4]||a[5]||\"\":c&&V.test(c)&&(b=g(c,!0))&&(b=c.indexOf(\")\",c.length-b)-c.length)&&(a[0]=a[0].slice(0,b),a[2]=c.slice(0,b)),a.slice(0,3))}},filter:{TAG:function(a){var b=a.replace(ca,da).toLowerCase();return\"*\"===a?function(){return!0}:function(a){return a.nodeName&&a.nodeName.toLowerCase()===b}},CLASS:function(a){var b=y[a+\" \"];return b||(b=new RegExp(\"(^|\"+L+\")\"+a+\"(\"+L+\"|$)\"))&&y(a,function(a){return b.test(\"string\"==typeof a.className&&a.className||\"undefined\"!=typeof a.getAttribute&&a.getAttribute(\"class\")||\"\")})},ATTR:function(a,b,c){return function(d){var e=ga.attr(d,a);return null==e?\"!=\"===b:b?(e+=\"\",\"=\"===b?e===c:\"!=\"===b?e!==c:\"^=\"===b?c&&0===e.indexOf(c):\"*=\"===b?c&&e.indexOf(c)>-1:\"$=\"===b?c&&e.slice(-c.length)===c:\"~=\"===b?(\" \"+e.replace(Q,\" \")+\" \").indexOf(c)>-1:\"|=\"===b?e===c||e.slice(0,c.length+1)===c+\"-\":!1):!0}},CHILD:function(a,b,c,d,e){var f=\"nth\"!==a.slice(0,3),g=\"last\"!==a.slice(-4),h=\"of-type\"===b;return 1===d&&0===e?function(a){return!!a.parentNode}:function(b,c,i){var j,k,l,m,n,o,p=f!==g?\"nextSibling\":\"previousSibling\",q=b.parentNode,r=h&&b.nodeName.toLowerCase(),s=!i&&!h;if(q){if(f){while(p){l=b;while(l=l[p])if(h?l.nodeName.toLowerCase()===r:1===l.nodeType)return!1;o=p=\"only\"===a&&!o&&\"nextSibling\"}return!0}if(o=[g?q.firstChild:q.lastChild],g&&s){k=q[u]||(q[u]={}),j=k[a]||[],n=j[0]===w&&j[1],m=j[0]===w&&j[2],l=n&&q.childNodes[n];while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if(1===l.nodeType&&++m&&l===b){k[a]=[w,n,m];break}}else if(s&&(j=(b[u]||(b[u]={}))[a])&&j[0]===w)m=j[1];else while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if((h?l.nodeName.toLowerCase()===r:1===l.nodeType)&&++m&&(s&&((l[u]||(l[u]={}))[a]=[w,m]),l===b))break;return m-=e,m===d||m%d===0&&m/d>=0}}},PSEUDO:function(a,b){var c,e=d.pseudos[a]||d.setFilters[a.toLowerCase()]||ga.error(\"unsupported pseudo: \"+a);return e[u]?e(b):e.length>1?(c=[a,a,\"\",b],d.setFilters.hasOwnProperty(a.toLowerCase())?ia(function(a,c){var d,f=e(a,b),g=f.length;while(g--)d=J(a,f[g]),a[d]=!(c[d]=f[g])}):function(a){return e(a,0,c)}):e}},pseudos:{not:ia(function(a){var b=[],c=[],d=h(a.replace(R,\"$1\"));return d[u]?ia(function(a,b,c,e){var f,g=d(a,null,e,[]),h=a.length;while(h--)(f=g[h])&&(a[h]=!(b[h]=f))}):function(a,e,f){return b[0]=a,d(b,null,f,c),b[0]=null,!c.pop()}}),has:ia(function(a){return function(b){return ga(a,b).length>0}}),contains:ia(function(a){return a=a.replace(ca,da),function(b){return(b.textContent||b.innerText||e(b)).indexOf(a)>-1}}),lang:ia(function(a){return W.test(a||\"\")||ga.error(\"unsupported lang: \"+a),a=a.replace(ca,da).toLowerCase(),function(b){var c;do if(c=p?b.lang:b.getAttribute(\"xml:lang\")||b.getAttribute(\"lang\"))return c=c.toLowerCase(),c===a||0===c.indexOf(a+\"-\");while((b=b.parentNode)&&1===b.nodeType);return!1}}),target:function(b){var c=a.location&&a.location.hash;return c&&c.slice(1)===b.id},root:function(a){return a===o},focus:function(a){return a===n.activeElement&&(!n.hasFocus||n.hasFocus())&&!!(a.type||a.href||~a.tabIndex)},enabled:function(a){return a.disabled===!1},disabled:function(a){return a.disabled===!0},checked:function(a){var b=a.nodeName.toLowerCase();return\"input\"===b&&!!a.checked||\"option\"===b&&!!a.selected},selected:function(a){return a.parentNode&&a.parentNode.selectedIndex,a.selected===!0},empty:function(a){for(a=a.firstChild;a;a=a.nextSibling)if(a.nodeType<6)return!1;return!0},parent:function(a){return!d.pseudos.empty(a)},header:function(a){return Z.test(a.nodeName)},input:function(a){return Y.test(a.nodeName)},button:function(a){var b=a.nodeName.toLowerCase();return\"input\"===b&&\"button\"===a.type||\"button\"===b},text:function(a){var b;return\"input\"===a.nodeName.toLowerCase()&&\"text\"===a.type&&(null==(b=a.getAttribute(\"type\"))||\"text\"===b.toLowerCase())},first:oa(function(){return[0]}),last:oa(function(a,b){return[b-1]}),eq:oa(function(a,b,c){return[0>c?c+b:c]}),even:oa(function(a,b){for(var c=0;b>c;c+=2)a.push(c);return a}),odd:oa(function(a,b){for(var c=1;b>c;c+=2)a.push(c);return a}),lt:oa(function(a,b,c){for(var d=0>c?c+b:c;--d>=0;)a.push(d);return a}),gt:oa(function(a,b,c){for(var d=0>c?c+b:c;++d<b;)a.push(d);return a})}},d.pseudos.nth=d.pseudos.eq;for(b in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})d.pseudos[b]=ma(b);for(b in{submit:!0,reset:!0})d.pseudos[b]=na(b);function qa(){}qa.prototype=d.filters=d.pseudos,d.setFilters=new qa,g=ga.tokenize=function(a,b){var c,e,f,g,h,i,j,k=z[a+\" \"];if(k)return b?0:k.slice(0);h=a,i=[],j=d.preFilter;while(h){(!c||(e=S.exec(h)))&&(e&&(h=h.slice(e[0].length)||h),i.push(f=[])),c=!1,(e=T.exec(h))&&(c=e.shift(),f.push({value:c,type:e[0].replace(R,\" \")}),h=h.slice(c.length));for(g in d.filter)!(e=X[g].exec(h))||j[g]&&!(e=j[g](e))||(c=e.shift(),f.push({value:c,type:g,matches:e}),h=h.slice(c.length));if(!c)break}return b?h.length:h?ga.error(a):z(a,i).slice(0)};function ra(a){for(var b=0,c=a.length,d=\"\";c>b;b++)d+=a[b].value;return d}function sa(a,b,c){var d=b.dir,e=c&&\"parentNode\"===d,f=x++;return b.first?function(b,c,f){while(b=b[d])if(1===b.nodeType||e)return a(b,c,f)}:function(b,c,g){var h,i,j=[w,f];if(g){while(b=b[d])if((1===b.nodeType||e)&&a(b,c,g))return!0}else while(b=b[d])if(1===b.nodeType||e){if(i=b[u]||(b[u]={}),(h=i[d])&&h[0]===w&&h[1]===f)return j[2]=h[2];if(i[d]=j,j[2]=a(b,c,g))return!0}}}function ta(a){return a.length>1?function(b,c,d){var e=a.length;while(e--)if(!a[e](b,c,d))return!1;return!0}:a[0]}function ua(a,b,c){for(var d=0,e=b.length;e>d;d++)ga(a,b[d],c);return c}function va(a,b,c,d,e){for(var f,g=[],h=0,i=a.length,j=null!=b;i>h;h++)(f=a[h])&&(!c||c(f,d,e))&&(g.push(f),j&&b.push(h));return g}function wa(a,b,c,d,e,f){return d&&!d[u]&&(d=wa(d)),e&&!e[u]&&(e=wa(e,f)),ia(function(f,g,h,i){var j,k,l,m=[],n=[],o=g.length,p=f||ua(b||\"*\",h.nodeType?[h]:h,[]),q=!a||!f&&b?p:va(p,m,a,h,i),r=c?e||(f?a:o||d)?[]:g:q;if(c&&c(q,r,h,i),d){j=va(r,n),d(j,[],h,i),k=j.length;while(k--)(l=j[k])&&(r[n[k]]=!(q[n[k]]=l))}if(f){if(e||a){if(e){j=[],k=r.length;while(k--)(l=r[k])&&j.push(q[k]=l);e(null,r=[],j,i)}k=r.length;while(k--)(l=r[k])&&(j=e?J(f,l):m[k])>-1&&(f[j]=!(g[j]=l))}}else r=va(r===g?r.splice(o,r.length):r),e?e(null,g,r,i):H.apply(g,r)})}function xa(a){for(var b,c,e,f=a.length,g=d.relative[a[0].type],h=g||d.relative[\" \"],i=g?1:0,k=sa(function(a){return a===b},h,!0),l=sa(function(a){return J(b,a)>-1},h,!0),m=[function(a,c,d){var e=!g&&(d||c!==j)||((b=c).nodeType?k(a,c,d):l(a,c,d));return b=null,e}];f>i;i++)if(c=d.relative[a[i].type])m=[sa(ta(m),c)];else{if(c=d.filter[a[i].type].apply(null,a[i].matches),c[u]){for(e=++i;f>e;e++)if(d.relative[a[e].type])break;return wa(i>1&&ta(m),i>1&&ra(a.slice(0,i-1).concat({value:\" \"===a[i-2].type?\"*\":\"\"})).replace(R,\"$1\"),c,e>i&&xa(a.slice(i,e)),f>e&&xa(a=a.slice(e)),f>e&&ra(a))}m.push(c)}return ta(m)}function ya(a,b){var c=b.length>0,e=a.length>0,f=function(f,g,h,i,k){var l,m,o,p=0,q=\"0\",r=f&&[],s=[],t=j,u=f||e&&d.find.TAG(\"*\",k),v=w+=null==t?1:Math.random()||.1,x=u.length;for(k&&(j=g!==n&&g);q!==x&&null!=(l=u[q]);q++){if(e&&l){m=0;while(o=a[m++])if(o(l,g,h)){i.push(l);break}k&&(w=v)}c&&((l=!o&&l)&&p--,f&&r.push(l))}if(p+=q,c&&q!==p){m=0;while(o=b[m++])o(r,s,g,h);if(f){if(p>0)while(q--)r[q]||s[q]||(s[q]=F.call(i));s=va(s)}H.apply(i,s),k&&!f&&s.length>0&&p+b.length>1&&ga.uniqueSort(i)}return k&&(w=v,j=t),r};return c?ia(f):f}return h=ga.compile=function(a,b){var c,d=[],e=[],f=A[a+\" \"];if(!f){b||(b=g(a)),c=b.length;while(c--)f=xa(b[c]),f[u]?d.push(f):e.push(f);f=A(a,ya(e,d)),f.selector=a}return f},i=ga.select=function(a,b,e,f){var i,j,k,l,m,n=\"function\"==typeof a&&a,o=!f&&g(a=n.selector||a);if(e=e||[],1===o.length){if(j=o[0]=o[0].slice(0),j.length>2&&\"ID\"===(k=j[0]).type&&c.getById&&9===b.nodeType&&p&&d.relative[j[1].type]){if(b=(d.find.ID(k.matches[0].replace(ca,da),b)||[])[0],!b)return e;n&&(b=b.parentNode),a=a.slice(j.shift().value.length)}i=X.needsContext.test(a)?0:j.length;while(i--){if(k=j[i],d.relative[l=k.type])break;if((m=d.find[l])&&(f=m(k.matches[0].replace(ca,da),aa.test(j[0].type)&&pa(b.parentNode)||b))){if(j.splice(i,1),a=f.length&&ra(j),!a)return H.apply(e,f),e;break}}}return(n||h(a,o))(f,b,!p,e,aa.test(a)&&pa(b.parentNode)||b),e},c.sortStable=u.split(\"\").sort(B).join(\"\")===u,c.detectDuplicates=!!l,m(),c.sortDetached=ja(function(a){return 1&a.compareDocumentPosition(n.createElement(\"div\"))}),ja(function(a){return a.innerHTML=\"<a href='#'></a>\",\"#\"===a.firstChild.getAttribute(\"href\")})||ka(\"type|href|height|width\",function(a,b,c){return c?void 0:a.getAttribute(b,\"type\"===b.toLowerCase()?1:2)}),c.attributes&&ja(function(a){return a.innerHTML=\"<input/>\",a.firstChild.setAttribute(\"value\",\"\"),\"\"===a.firstChild.getAttribute(\"value\")})||ka(\"value\",function(a,b,c){return c||\"input\"!==a.nodeName.toLowerCase()?void 0:a.defaultValue}),ja(function(a){return null==a.getAttribute(\"disabled\")})||ka(K,function(a,b,c){var d;return c?void 0:a[b]===!0?b.toLowerCase():(d=a.getAttributeNode(b))&&d.specified?d.value:null}),ga}(a);n.find=t,n.expr=t.selectors,n.expr[\":\"]=n.expr.pseudos,n.unique=t.uniqueSort,n.text=t.getText,n.isXMLDoc=t.isXML,n.contains=t.contains;var u=n.expr.match.needsContext,v=/^<(\\w+)\\s*\\/?>(?:<\\/\\1>|)$/,w=/^.[^:#\\[\\.,]*$/;function x(a,b,c){if(n.isFunction(b))return n.grep(a,function(a,d){return!!b.call(a,d,a)!==c});if(b.nodeType)return n.grep(a,function(a){return a===b!==c});if(\"string\"==typeof b){if(w.test(b))return n.filter(b,a,c);b=n.filter(b,a)}return n.grep(a,function(a){return g.call(b,a)>=0!==c})}n.filter=function(a,b,c){var d=b[0];return c&&(a=\":not(\"+a+\")\"),1===b.length&&1===d.nodeType?n.find.matchesSelector(d,a)?[d]:[]:n.find.matches(a,n.grep(b,function(a){return 1===a.nodeType}))},n.fn.extend({find:function(a){var b,c=this.length,d=[],e=this;if(\"string\"!=typeof a)return this.pushStack(n(a).filter(function(){for(b=0;c>b;b++)if(n.contains(e[b],this))return!0}));for(b=0;c>b;b++)n.find(a,e[b],d);return d=this.pushStack(c>1?n.unique(d):d),d.selector=this.selector?this.selector+\" \"+a:a,d},filter:function(a){return this.pushStack(x(this,a||[],!1))},not:function(a){return this.pushStack(x(this,a||[],!0))},is:function(a){return!!x(this,\"string\"==typeof a&&u.test(a)?n(a):a||[],!1).length}});var y,z=/^(?:\\s*(<[\\w\\W]+>)[^>]*|#([\\w-]*))$/,A=n.fn.init=function(a,b){var c,d;if(!a)return this;if(\"string\"==typeof a){if(c=\"<\"===a[0]&&\">\"===a[a.length-1]&&a.length>=3?[null,a,null]:z.exec(a),!c||!c[1]&&b)return!b||b.jquery?(b||y).find(a):this.constructor(b).find(a);if(c[1]){if(b=b instanceof n?b[0]:b,n.merge(this,n.parseHTML(c[1],b&&b.nodeType?b.ownerDocument||b:l,!0)),v.test(c[1])&&n.isPlainObject(b))for(c in b)n.isFunction(this[c])?this[c](b[c]):this.attr(c,b[c]);return this}return d=l.getElementById(c[2]),d&&d.parentNode&&(this.length=1,this[0]=d),this.context=l,this.selector=a,this}return a.nodeType?(this.context=this[0]=a,this.length=1,this):n.isFunction(a)?\"undefined\"!=typeof y.ready?y.ready(a):a(n):(void 0!==a.selector&&(this.selector=a.selector,this.context=a.context),n.makeArray(a,this))};A.prototype=n.fn,y=n(l);var B=/^(?:parents|prev(?:Until|All))/,C={children:!0,contents:!0,next:!0,prev:!0};n.extend({dir:function(a,b,c){var d=[],e=void 0!==c;while((a=a[b])&&9!==a.nodeType)if(1===a.nodeType){if(e&&n(a).is(c))break;d.push(a)}return d},sibling:function(a,b){for(var c=[];a;a=a.nextSibling)1===a.nodeType&&a!==b&&c.push(a);return c}}),n.fn.extend({has:function(a){var b=n(a,this),c=b.length;return this.filter(function(){for(var a=0;c>a;a++)if(n.contains(this,b[a]))return!0})},closest:function(a,b){for(var c,d=0,e=this.length,f=[],g=u.test(a)||\"string\"!=typeof a?n(a,b||this.context):0;e>d;d++)for(c=this[d];c&&c!==b;c=c.parentNode)if(c.nodeType<11&&(g?g.index(c)>-1:1===c.nodeType&&n.find.matchesSelector(c,a))){f.push(c);break}return this.pushStack(f.length>1?n.unique(f):f)},index:function(a){return a?\"string\"==typeof a?g.call(n(a),this[0]):g.call(this,a.jquery?a[0]:a):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(a,b){return this.pushStack(n.unique(n.merge(this.get(),n(a,b))))},addBack:function(a){return this.add(null==a?this.prevObject:this.prevObject.filter(a))}});function D(a,b){while((a=a[b])&&1!==a.nodeType);return a}n.each({parent:function(a){var b=a.parentNode;return b&&11!==b.nodeType?b:null},parents:function(a){return n.dir(a,\"parentNode\")},parentsUntil:function(a,b,c){return n.dir(a,\"parentNode\",c)},next:function(a){return D(a,\"nextSibling\")},prev:function(a){return D(a,\"previousSibling\")},nextAll:function(a){return n.dir(a,\"nextSibling\")},prevAll:function(a){return n.dir(a,\"previousSibling\")},nextUntil:function(a,b,c){return n.dir(a,\"nextSibling\",c)},prevUntil:function(a,b,c){return n.dir(a,\"previousSibling\",c)},siblings:function(a){return n.sibling((a.parentNode||{}).firstChild,a)},children:function(a){return n.sibling(a.firstChild)},contents:function(a){return a.contentDocument||n.merge([],a.childNodes)}},function(a,b){n.fn[a]=function(c,d){var e=n.map(this,b,c);return\"Until\"!==a.slice(-5)&&(d=c),d&&\"string\"==typeof d&&(e=n.filter(d,e)),this.length>1&&(C[a]||n.unique(e),B.test(a)&&e.reverse()),this.pushStack(e)}});var E=/\\S+/g,F={};function G(a){var b=F[a]={};return n.each(a.match(E)||[],function(a,c){b[c]=!0}),b}n.Callbacks=function(a){a=\"string\"==typeof a?F[a]||G(a):n.extend({},a);var b,c,d,e,f,g,h=[],i=!a.once&&[],j=function(l){for(b=a.memory&&l,c=!0,g=e||0,e=0,f=h.length,d=!0;h&&f>g;g++)if(h[g].apply(l[0],l[1])===!1&&a.stopOnFalse){b=!1;break}d=!1,h&&(i?i.length&&j(i.shift()):b?h=[]:k.disable())},k={add:function(){if(h){var c=h.length;!function g(b){n.each(b,function(b,c){var d=n.type(c);\"function\"===d?a.unique&&k.has(c)||h.push(c):c&&c.length&&\"string\"!==d&&g(c)})}(arguments),d?f=h.length:b&&(e=c,j(b))}return this},remove:function(){return h&&n.each(arguments,function(a,b){var c;while((c=n.inArray(b,h,c))>-1)h.splice(c,1),d&&(f>=c&&f--,g>=c&&g--)}),this},has:function(a){return a?n.inArray(a,h)>-1:!(!h||!h.length)},empty:function(){return h=[],f=0,this},disable:function(){return h=i=b=void 0,this},disabled:function(){return!h},lock:function(){return i=void 0,b||k.disable(),this},locked:function(){return!i},fireWith:function(a,b){return!h||c&&!i||(b=b||[],b=[a,b.slice?b.slice():b],d?i.push(b):j(b)),this},fire:function(){return k.fireWith(this,arguments),this},fired:function(){return!!c}};return k},n.extend({Deferred:function(a){var b=[[\"resolve\",\"done\",n.Callbacks(\"once memory\"),\"resolved\"],[\"reject\",\"fail\",n.Callbacks(\"once memory\"),\"rejected\"],[\"notify\",\"progress\",n.Callbacks(\"memory\")]],c=\"pending\",d={state:function(){return c},always:function(){return e.done(arguments).fail(arguments),this},then:function(){var a=arguments;return n.Deferred(function(c){n.each(b,function(b,f){var g=n.isFunction(a[b])&&a[b];e[f[1]](function(){var a=g&&g.apply(this,arguments);a&&n.isFunction(a.promise)?a.promise().done(c.resolve).fail(c.reject).progress(c.notify):c[f[0]+\"With\"](this===d?c.promise():this,g?[a]:arguments)})}),a=null}).promise()},promise:function(a){return null!=a?n.extend(a,d):d}},e={};return d.pipe=d.then,n.each(b,function(a,f){var g=f[2],h=f[3];d[f[1]]=g.add,h&&g.add(function(){c=h},b[1^a][2].disable,b[2][2].lock),e[f[0]]=function(){return e[f[0]+\"With\"](this===e?d:this,arguments),this},e[f[0]+\"With\"]=g.fireWith}),d.promise(e),a&&a.call(e,e),e},when:function(a){var b=0,c=d.call(arguments),e=c.length,f=1!==e||a&&n.isFunction(a.promise)?e:0,g=1===f?a:n.Deferred(),h=function(a,b,c){return function(e){b[a]=this,c[a]=arguments.length>1?d.call(arguments):e,c===i?g.notifyWith(b,c):--f||g.resolveWith(b,c)}},i,j,k;if(e>1)for(i=new Array(e),j=new Array(e),k=new Array(e);e>b;b++)c[b]&&n.isFunction(c[b].promise)?c[b].promise().done(h(b,k,c)).fail(g.reject).progress(h(b,j,i)):--f;return f||g.resolveWith(k,c),g.promise()}});var H;n.fn.ready=function(a){return n.ready.promise().done(a),this},n.extend({isReady:!1,readyWait:1,holdReady:function(a){a?n.readyWait++:n.ready(!0)},ready:function(a){(a===!0?--n.readyWait:n.isReady)||(n.isReady=!0,a!==!0&&--n.readyWait>0||(H.resolveWith(l,[n]),n.fn.triggerHandler&&(n(l).triggerHandler(\"ready\"),n(l).off(\"ready\"))))}});function I(){l.removeEventListener(\"DOMContentLoaded\",I,!1),a.removeEventListener(\"load\",I,!1),n.ready()}n.ready.promise=function(b){return H||(H=n.Deferred(),\"complete\"===l.readyState?setTimeout(n.ready):(l.addEventListener(\"DOMContentLoaded\",I,!1),a.addEventListener(\"load\",I,!1))),H.promise(b)},n.ready.promise();var J=n.access=function(a,b,c,d,e,f,g){var h=0,i=a.length,j=null==c;if(\"object\"===n.type(c)){e=!0;for(h in c)n.access(a,b,h,c[h],!0,f,g)}else if(void 0!==d&&(e=!0,n.isFunction(d)||(g=!0),j&&(g?(b.call(a,d),b=null):(j=b,b=function(a,b,c){return j.call(n(a),c)})),b))for(;i>h;h++)b(a[h],c,g?d:d.call(a[h],h,b(a[h],c)));return e?a:j?b.call(a):i?b(a[0],c):f};n.acceptData=function(a){return 1===a.nodeType||9===a.nodeType||!+a.nodeType};function K(){Object.defineProperty(this.cache={},0,{get:function(){return{}}}),this.expando=n.expando+K.uid++}K.uid=1,K.accepts=n.acceptData,K.prototype={key:function(a){if(!K.accepts(a))return 0;var b={},c=a[this.expando];if(!c){c=K.uid++;try{b[this.expando]={value:c},Object.defineProperties(a,b)}catch(d){b[this.expando]=c,n.extend(a,b)}}return this.cache[c]||(this.cache[c]={}),c},set:function(a,b,c){var d,e=this.key(a),f=this.cache[e];if(\"string\"==typeof b)f[b]=c;else if(n.isEmptyObject(f))n.extend(this.cache[e],b);else for(d in b)f[d]=b[d];return f},get:function(a,b){var c=this.cache[this.key(a)];return void 0===b?c:c[b]},access:function(a,b,c){var d;return void 0===b||b&&\"string\"==typeof b&&void 0===c?(d=this.get(a,b),void 0!==d?d:this.get(a,n.camelCase(b))):(this.set(a,b,c),void 0!==c?c:b)},remove:function(a,b){var c,d,e,f=this.key(a),g=this.cache[f];if(void 0===b)this.cache[f]={};else{n.isArray(b)?d=b.concat(b.map(n.camelCase)):(e=n.camelCase(b),b in g?d=[b,e]:(d=e,d=d in g?[d]:d.match(E)||[])),c=d.length;while(c--)delete g[d[c]]}},hasData:function(a){return!n.isEmptyObject(this.cache[a[this.expando]]||{})},discard:function(a){a[this.expando]&&delete this.cache[a[this.expando]]}};var L=new K,M=new K,N=/^(?:\\{[\\w\\W]*\\}|\\[[\\w\\W]*\\])$/,O=/([A-Z])/g;function P(a,b,c){var d;if(void 0===c&&1===a.nodeType)if(d=\"data-\"+b.replace(O,\"-$1\").toLowerCase(),c=a.getAttribute(d),\"string\"==typeof c){try{c=\"true\"===c?!0:\"false\"===c?!1:\"null\"===c?null:+c+\"\"===c?+c:N.test(c)?n.parseJSON(c):c}catch(e){}M.set(a,b,c)}else c=void 0;return c}n.extend({hasData:function(a){return M.hasData(a)||L.hasData(a)},data:function(a,b,c){\nreturn M.access(a,b,c)},removeData:function(a,b){M.remove(a,b)},_data:function(a,b,c){return L.access(a,b,c)},_removeData:function(a,b){L.remove(a,b)}}),n.fn.extend({data:function(a,b){var c,d,e,f=this[0],g=f&&f.attributes;if(void 0===a){if(this.length&&(e=M.get(f),1===f.nodeType&&!L.get(f,\"hasDataAttrs\"))){c=g.length;while(c--)g[c]&&(d=g[c].name,0===d.indexOf(\"data-\")&&(d=n.camelCase(d.slice(5)),P(f,d,e[d])));L.set(f,\"hasDataAttrs\",!0)}return e}return\"object\"==typeof a?this.each(function(){M.set(this,a)}):J(this,function(b){var c,d=n.camelCase(a);if(f&&void 0===b){if(c=M.get(f,a),void 0!==c)return c;if(c=M.get(f,d),void 0!==c)return c;if(c=P(f,d,void 0),void 0!==c)return c}else this.each(function(){var c=M.get(this,d);M.set(this,d,b),-1!==a.indexOf(\"-\")&&void 0!==c&&M.set(this,a,b)})},null,b,arguments.length>1,null,!0)},removeData:function(a){return this.each(function(){M.remove(this,a)})}}),n.extend({queue:function(a,b,c){var d;return a?(b=(b||\"fx\")+\"queue\",d=L.get(a,b),c&&(!d||n.isArray(c)?d=L.access(a,b,n.makeArray(c)):d.push(c)),d||[]):void 0},dequeue:function(a,b){b=b||\"fx\";var c=n.queue(a,b),d=c.length,e=c.shift(),f=n._queueHooks(a,b),g=function(){n.dequeue(a,b)};\"inprogress\"===e&&(e=c.shift(),d--),e&&(\"fx\"===b&&c.unshift(\"inprogress\"),delete f.stop,e.call(a,g,f)),!d&&f&&f.empty.fire()},_queueHooks:function(a,b){var c=b+\"queueHooks\";return L.get(a,c)||L.access(a,c,{empty:n.Callbacks(\"once memory\").add(function(){L.remove(a,[b+\"queue\",c])})})}}),n.fn.extend({queue:function(a,b){var c=2;return\"string\"!=typeof a&&(b=a,a=\"fx\",c--),arguments.length<c?n.queue(this[0],a):void 0===b?this:this.each(function(){var c=n.queue(this,a,b);n._queueHooks(this,a),\"fx\"===a&&\"inprogress\"!==c[0]&&n.dequeue(this,a)})},dequeue:function(a){return this.each(function(){n.dequeue(this,a)})},clearQueue:function(a){return this.queue(a||\"fx\",[])},promise:function(a,b){var c,d=1,e=n.Deferred(),f=this,g=this.length,h=function(){--d||e.resolveWith(f,[f])};\"string\"!=typeof a&&(b=a,a=void 0),a=a||\"fx\";while(g--)c=L.get(f[g],a+\"queueHooks\"),c&&c.empty&&(d++,c.empty.add(h));return h(),e.promise(b)}});var Q=/[+-]?(?:\\d*\\.|)\\d+(?:[eE][+-]?\\d+|)/.source,R=[\"Top\",\"Right\",\"Bottom\",\"Left\"],S=function(a,b){return a=b||a,\"none\"===n.css(a,\"display\")||!n.contains(a.ownerDocument,a)},T=/^(?:checkbox|radio)$/i;!function(){var a=l.createDocumentFragment(),b=a.appendChild(l.createElement(\"div\")),c=l.createElement(\"input\");c.setAttribute(\"type\",\"radio\"),c.setAttribute(\"checked\",\"checked\"),c.setAttribute(\"name\",\"t\"),b.appendChild(c),k.checkClone=b.cloneNode(!0).cloneNode(!0).lastChild.checked,b.innerHTML=\"<textarea>x</textarea>\",k.noCloneChecked=!!b.cloneNode(!0).lastChild.defaultValue}();var U=\"undefined\";k.focusinBubbles=\"onfocusin\"in a;var V=/^key/,W=/^(?:mouse|pointer|contextmenu)|click/,X=/^(?:focusinfocus|focusoutblur)$/,Y=/^([^.]*)(?:\\.(.+)|)$/;function Z(){return!0}function $(){return!1}function _(){try{return l.activeElement}catch(a){}}n.event={global:{},add:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,o,p,q,r=L.get(a);if(r){c.handler&&(f=c,c=f.handler,e=f.selector),c.guid||(c.guid=n.guid++),(i=r.events)||(i=r.events={}),(g=r.handle)||(g=r.handle=function(b){return typeof n!==U&&n.event.triggered!==b.type?n.event.dispatch.apply(a,arguments):void 0}),b=(b||\"\").match(E)||[\"\"],j=b.length;while(j--)h=Y.exec(b[j])||[],o=q=h[1],p=(h[2]||\"\").split(\".\").sort(),o&&(l=n.event.special[o]||{},o=(e?l.delegateType:l.bindType)||o,l=n.event.special[o]||{},k=n.extend({type:o,origType:q,data:d,handler:c,guid:c.guid,selector:e,needsContext:e&&n.expr.match.needsContext.test(e),namespace:p.join(\".\")},f),(m=i[o])||(m=i[o]=[],m.delegateCount=0,l.setup&&l.setup.call(a,d,p,g)!==!1||a.addEventListener&&a.addEventListener(o,g,!1)),l.add&&(l.add.call(a,k),k.handler.guid||(k.handler.guid=c.guid)),e?m.splice(m.delegateCount++,0,k):m.push(k),n.event.global[o]=!0)}},remove:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,o,p,q,r=L.hasData(a)&&L.get(a);if(r&&(i=r.events)){b=(b||\"\").match(E)||[\"\"],j=b.length;while(j--)if(h=Y.exec(b[j])||[],o=q=h[1],p=(h[2]||\"\").split(\".\").sort(),o){l=n.event.special[o]||{},o=(d?l.delegateType:l.bindType)||o,m=i[o]||[],h=h[2]&&new RegExp(\"(^|\\\\.)\"+p.join(\"\\\\.(?:.*\\\\.|)\")+\"(\\\\.|$)\"),g=f=m.length;while(f--)k=m[f],!e&&q!==k.origType||c&&c.guid!==k.guid||h&&!h.test(k.namespace)||d&&d!==k.selector&&(\"**\"!==d||!k.selector)||(m.splice(f,1),k.selector&&m.delegateCount--,l.remove&&l.remove.call(a,k));g&&!m.length&&(l.teardown&&l.teardown.call(a,p,r.handle)!==!1||n.removeEvent(a,o,r.handle),delete i[o])}else for(o in i)n.event.remove(a,o+b[j],c,d,!0);n.isEmptyObject(i)&&(delete r.handle,L.remove(a,\"events\"))}},trigger:function(b,c,d,e){var f,g,h,i,k,m,o,p=[d||l],q=j.call(b,\"type\")?b.type:b,r=j.call(b,\"namespace\")?b.namespace.split(\".\"):[];if(g=h=d=d||l,3!==d.nodeType&&8!==d.nodeType&&!X.test(q+n.event.triggered)&&(q.indexOf(\".\")>=0&&(r=q.split(\".\"),q=r.shift(),r.sort()),k=q.indexOf(\":\")<0&&\"on\"+q,b=b[n.expando]?b:new n.Event(q,\"object\"==typeof b&&b),b.isTrigger=e?2:3,b.namespace=r.join(\".\"),b.namespace_re=b.namespace?new RegExp(\"(^|\\\\.)\"+r.join(\"\\\\.(?:.*\\\\.|)\")+\"(\\\\.|$)\"):null,b.result=void 0,b.target||(b.target=d),c=null==c?[b]:n.makeArray(c,[b]),o=n.event.special[q]||{},e||!o.trigger||o.trigger.apply(d,c)!==!1)){if(!e&&!o.noBubble&&!n.isWindow(d)){for(i=o.delegateType||q,X.test(i+q)||(g=g.parentNode);g;g=g.parentNode)p.push(g),h=g;h===(d.ownerDocument||l)&&p.push(h.defaultView||h.parentWindow||a)}f=0;while((g=p[f++])&&!b.isPropagationStopped())b.type=f>1?i:o.bindType||q,m=(L.get(g,\"events\")||{})[b.type]&&L.get(g,\"handle\"),m&&m.apply(g,c),m=k&&g[k],m&&m.apply&&n.acceptData(g)&&(b.result=m.apply(g,c),b.result===!1&&b.preventDefault());return b.type=q,e||b.isDefaultPrevented()||o._default&&o._default.apply(p.pop(),c)!==!1||!n.acceptData(d)||k&&n.isFunction(d[q])&&!n.isWindow(d)&&(h=d[k],h&&(d[k]=null),n.event.triggered=q,d[q](),n.event.triggered=void 0,h&&(d[k]=h)),b.result}},dispatch:function(a){a=n.event.fix(a);var b,c,e,f,g,h=[],i=d.call(arguments),j=(L.get(this,\"events\")||{})[a.type]||[],k=n.event.special[a.type]||{};if(i[0]=a,a.delegateTarget=this,!k.preDispatch||k.preDispatch.call(this,a)!==!1){h=n.event.handlers.call(this,a,j),b=0;while((f=h[b++])&&!a.isPropagationStopped()){a.currentTarget=f.elem,c=0;while((g=f.handlers[c++])&&!a.isImmediatePropagationStopped())(!a.namespace_re||a.namespace_re.test(g.namespace))&&(a.handleObj=g,a.data=g.data,e=((n.event.special[g.origType]||{}).handle||g.handler).apply(f.elem,i),void 0!==e&&(a.result=e)===!1&&(a.preventDefault(),a.stopPropagation()))}return k.postDispatch&&k.postDispatch.call(this,a),a.result}},handlers:function(a,b){var c,d,e,f,g=[],h=b.delegateCount,i=a.target;if(h&&i.nodeType&&(!a.button||\"click\"!==a.type))for(;i!==this;i=i.parentNode||this)if(i.disabled!==!0||\"click\"!==a.type){for(d=[],c=0;h>c;c++)f=b[c],e=f.selector+\" \",void 0===d[e]&&(d[e]=f.needsContext?n(e,this).index(i)>=0:n.find(e,this,null,[i]).length),d[e]&&d.push(f);d.length&&g.push({elem:i,handlers:d})}return h<b.length&&g.push({elem:this,handlers:b.slice(h)}),g},props:\"altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which\".split(\" \"),fixHooks:{},keyHooks:{props:\"char charCode key keyCode\".split(\" \"),filter:function(a,b){return null==a.which&&(a.which=null!=b.charCode?b.charCode:b.keyCode),a}},mouseHooks:{props:\"button buttons clientX clientY offsetX offsetY pageX pageY screenX screenY toElement\".split(\" \"),filter:function(a,b){var c,d,e,f=b.button;return null==a.pageX&&null!=b.clientX&&(c=a.target.ownerDocument||l,d=c.documentElement,e=c.body,a.pageX=b.clientX+(d&&d.scrollLeft||e&&e.scrollLeft||0)-(d&&d.clientLeft||e&&e.clientLeft||0),a.pageY=b.clientY+(d&&d.scrollTop||e&&e.scrollTop||0)-(d&&d.clientTop||e&&e.clientTop||0)),a.which||void 0===f||(a.which=1&f?1:2&f?3:4&f?2:0),a}},fix:function(a){if(a[n.expando])return a;var b,c,d,e=a.type,f=a,g=this.fixHooks[e];g||(this.fixHooks[e]=g=W.test(e)?this.mouseHooks:V.test(e)?this.keyHooks:{}),d=g.props?this.props.concat(g.props):this.props,a=new n.Event(f),b=d.length;while(b--)c=d[b],a[c]=f[c];return a.target||(a.target=l),3===a.target.nodeType&&(a.target=a.target.parentNode),g.filter?g.filter(a,f):a},special:{load:{noBubble:!0},focus:{trigger:function(){return this!==_()&&this.focus?(this.focus(),!1):void 0},delegateType:\"focusin\"},blur:{trigger:function(){return this===_()&&this.blur?(this.blur(),!1):void 0},delegateType:\"focusout\"},click:{trigger:function(){return\"checkbox\"===this.type&&this.click&&n.nodeName(this,\"input\")?(this.click(),!1):void 0},_default:function(a){return n.nodeName(a.target,\"a\")}},beforeunload:{postDispatch:function(a){void 0!==a.result&&a.originalEvent&&(a.originalEvent.returnValue=a.result)}}},simulate:function(a,b,c,d){var e=n.extend(new n.Event,c,{type:a,isSimulated:!0,originalEvent:{}});d?n.event.trigger(e,null,b):n.event.dispatch.call(b,e),e.isDefaultPrevented()&&c.preventDefault()}},n.removeEvent=function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c,!1)},n.Event=function(a,b){return this instanceof n.Event?(a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||void 0===a.defaultPrevented&&a.returnValue===!1?Z:$):this.type=a,b&&n.extend(this,b),this.timeStamp=a&&a.timeStamp||n.now(),void(this[n.expando]=!0)):new n.Event(a,b)},n.Event.prototype={isDefaultPrevented:$,isPropagationStopped:$,isImmediatePropagationStopped:$,preventDefault:function(){var a=this.originalEvent;this.isDefaultPrevented=Z,a&&a.preventDefault&&a.preventDefault()},stopPropagation:function(){var a=this.originalEvent;this.isPropagationStopped=Z,a&&a.stopPropagation&&a.stopPropagation()},stopImmediatePropagation:function(){var a=this.originalEvent;this.isImmediatePropagationStopped=Z,a&&a.stopImmediatePropagation&&a.stopImmediatePropagation(),this.stopPropagation()}},n.each({mouseenter:\"mouseover\",mouseleave:\"mouseout\",pointerenter:\"pointerover\",pointerleave:\"pointerout\"},function(a,b){n.event.special[a]={delegateType:b,bindType:b,handle:function(a){var c,d=this,e=a.relatedTarget,f=a.handleObj;return(!e||e!==d&&!n.contains(d,e))&&(a.type=f.origType,c=f.handler.apply(this,arguments),a.type=b),c}}}),k.focusinBubbles||n.each({focus:\"focusin\",blur:\"focusout\"},function(a,b){var c=function(a){n.event.simulate(b,a.target,n.event.fix(a),!0)};n.event.special[b]={setup:function(){var d=this.ownerDocument||this,e=L.access(d,b);e||d.addEventListener(a,c,!0),L.access(d,b,(e||0)+1)},teardown:function(){var d=this.ownerDocument||this,e=L.access(d,b)-1;e?L.access(d,b,e):(d.removeEventListener(a,c,!0),L.remove(d,b))}}}),n.fn.extend({on:function(a,b,c,d,e){var f,g;if(\"object\"==typeof a){\"string\"!=typeof b&&(c=c||b,b=void 0);for(g in a)this.on(g,b,c,a[g],e);return this}if(null==c&&null==d?(d=b,c=b=void 0):null==d&&(\"string\"==typeof b?(d=c,c=void 0):(d=c,c=b,b=void 0)),d===!1)d=$;else if(!d)return this;return 1===e&&(f=d,d=function(a){return n().off(a),f.apply(this,arguments)},d.guid=f.guid||(f.guid=n.guid++)),this.each(function(){n.event.add(this,a,d,c,b)})},one:function(a,b,c,d){return this.on(a,b,c,d,1)},off:function(a,b,c){var d,e;if(a&&a.preventDefault&&a.handleObj)return d=a.handleObj,n(a.delegateTarget).off(d.namespace?d.origType+\".\"+d.namespace:d.origType,d.selector,d.handler),this;if(\"object\"==typeof a){for(e in a)this.off(e,b,a[e]);return this}return(b===!1||\"function\"==typeof b)&&(c=b,b=void 0),c===!1&&(c=$),this.each(function(){n.event.remove(this,a,c,b)})},trigger:function(a,b){return this.each(function(){n.event.trigger(a,b,this)})},triggerHandler:function(a,b){var c=this[0];return c?n.event.trigger(a,b,c,!0):void 0}});var aa=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\\w:]+)[^>]*)\\/>/gi,ba=/<([\\w:]+)/,ca=/<|&#?\\w+;/,da=/<(?:script|style|link)/i,ea=/checked\\s*(?:[^=]|=\\s*.checked.)/i,fa=/^$|\\/(?:java|ecma)script/i,ga=/^true\\/(.*)/,ha=/^\\s*<!(?:\\[CDATA\\[|--)|(?:\\]\\]|--)>\\s*$/g,ia={option:[1,\"<select multiple='multiple'>\",\"</select>\"],thead:[1,\"<table>\",\"</table>\"],col:[2,\"<table><colgroup>\",\"</colgroup></table>\"],tr:[2,\"<table><tbody>\",\"</tbody></table>\"],td:[3,\"<table><tbody><tr>\",\"</tr></tbody></table>\"],_default:[0,\"\",\"\"]};ia.optgroup=ia.option,ia.tbody=ia.tfoot=ia.colgroup=ia.caption=ia.thead,ia.th=ia.td;function ja(a,b){return n.nodeName(a,\"table\")&&n.nodeName(11!==b.nodeType?b:b.firstChild,\"tr\")?a.getElementsByTagName(\"tbody\")[0]||a.appendChild(a.ownerDocument.createElement(\"tbody\")):a}function ka(a){return a.type=(null!==a.getAttribute(\"type\"))+\"/\"+a.type,a}function la(a){var b=ga.exec(a.type);return b?a.type=b[1]:a.removeAttribute(\"type\"),a}function ma(a,b){for(var c=0,d=a.length;d>c;c++)L.set(a[c],\"globalEval\",!b||L.get(b[c],\"globalEval\"))}function na(a,b){var c,d,e,f,g,h,i,j;if(1===b.nodeType){if(L.hasData(a)&&(f=L.access(a),g=L.set(b,f),j=f.events)){delete g.handle,g.events={};for(e in j)for(c=0,d=j[e].length;d>c;c++)n.event.add(b,e,j[e][c])}M.hasData(a)&&(h=M.access(a),i=n.extend({},h),M.set(b,i))}}function oa(a,b){var c=a.getElementsByTagName?a.getElementsByTagName(b||\"*\"):a.querySelectorAll?a.querySelectorAll(b||\"*\"):[];return void 0===b||b&&n.nodeName(a,b)?n.merge([a],c):c}function pa(a,b){var c=b.nodeName.toLowerCase();\"input\"===c&&T.test(a.type)?b.checked=a.checked:(\"input\"===c||\"textarea\"===c)&&(b.defaultValue=a.defaultValue)}n.extend({clone:function(a,b,c){var d,e,f,g,h=a.cloneNode(!0),i=n.contains(a.ownerDocument,a);if(!(k.noCloneChecked||1!==a.nodeType&&11!==a.nodeType||n.isXMLDoc(a)))for(g=oa(h),f=oa(a),d=0,e=f.length;e>d;d++)pa(f[d],g[d]);if(b)if(c)for(f=f||oa(a),g=g||oa(h),d=0,e=f.length;e>d;d++)na(f[d],g[d]);else na(a,h);return g=oa(h,\"script\"),g.length>0&&ma(g,!i&&oa(a,\"script\")),h},buildFragment:function(a,b,c,d){for(var e,f,g,h,i,j,k=b.createDocumentFragment(),l=[],m=0,o=a.length;o>m;m++)if(e=a[m],e||0===e)if(\"object\"===n.type(e))n.merge(l,e.nodeType?[e]:e);else if(ca.test(e)){f=f||k.appendChild(b.createElement(\"div\")),g=(ba.exec(e)||[\"\",\"\"])[1].toLowerCase(),h=ia[g]||ia._default,f.innerHTML=h[1]+e.replace(aa,\"<$1></$2>\")+h[2],j=h[0];while(j--)f=f.lastChild;n.merge(l,f.childNodes),f=k.firstChild,f.textContent=\"\"}else l.push(b.createTextNode(e));k.textContent=\"\",m=0;while(e=l[m++])if((!d||-1===n.inArray(e,d))&&(i=n.contains(e.ownerDocument,e),f=oa(k.appendChild(e),\"script\"),i&&ma(f),c)){j=0;while(e=f[j++])fa.test(e.type||\"\")&&c.push(e)}return k},cleanData:function(a){for(var b,c,d,e,f=n.event.special,g=0;void 0!==(c=a[g]);g++){if(n.acceptData(c)&&(e=c[L.expando],e&&(b=L.cache[e]))){if(b.events)for(d in b.events)f[d]?n.event.remove(c,d):n.removeEvent(c,d,b.handle);L.cache[e]&&delete L.cache[e]}delete M.cache[c[M.expando]]}}}),n.fn.extend({text:function(a){return J(this,function(a){return void 0===a?n.text(this):this.empty().each(function(){(1===this.nodeType||11===this.nodeType||9===this.nodeType)&&(this.textContent=a)})},null,a,arguments.length)},append:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=ja(this,a);b.appendChild(a)}})},prepend:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=ja(this,a);b.insertBefore(a,b.firstChild)}})},before:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this)})},after:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this.nextSibling)})},remove:function(a,b){for(var c,d=a?n.filter(a,this):this,e=0;null!=(c=d[e]);e++)b||1!==c.nodeType||n.cleanData(oa(c)),c.parentNode&&(b&&n.contains(c.ownerDocument,c)&&ma(oa(c,\"script\")),c.parentNode.removeChild(c));return this},empty:function(){for(var a,b=0;null!=(a=this[b]);b++)1===a.nodeType&&(n.cleanData(oa(a,!1)),a.textContent=\"\");return this},clone:function(a,b){return a=null==a?!1:a,b=null==b?a:b,this.map(function(){return n.clone(this,a,b)})},html:function(a){return J(this,function(a){var b=this[0]||{},c=0,d=this.length;if(void 0===a&&1===b.nodeType)return b.innerHTML;if(\"string\"==typeof a&&!da.test(a)&&!ia[(ba.exec(a)||[\"\",\"\"])[1].toLowerCase()]){a=a.replace(aa,\"<$1></$2>\");try{for(;d>c;c++)b=this[c]||{},1===b.nodeType&&(n.cleanData(oa(b,!1)),b.innerHTML=a);b=0}catch(e){}}b&&this.empty().append(a)},null,a,arguments.length)},replaceWith:function(){var a=arguments[0];return this.domManip(arguments,function(b){a=this.parentNode,n.cleanData(oa(this)),a&&a.replaceChild(b,this)}),a&&(a.length||a.nodeType)?this:this.remove()},detach:function(a){return this.remove(a,!0)},domManip:function(a,b){a=e.apply([],a);var c,d,f,g,h,i,j=0,l=this.length,m=this,o=l-1,p=a[0],q=n.isFunction(p);if(q||l>1&&\"string\"==typeof p&&!k.checkClone&&ea.test(p))return this.each(function(c){var d=m.eq(c);q&&(a[0]=p.call(this,c,d.html())),d.domManip(a,b)});if(l&&(c=n.buildFragment(a,this[0].ownerDocument,!1,this),d=c.firstChild,1===c.childNodes.length&&(c=d),d)){for(f=n.map(oa(c,\"script\"),ka),g=f.length;l>j;j++)h=c,j!==o&&(h=n.clone(h,!0,!0),g&&n.merge(f,oa(h,\"script\"))),b.call(this[j],h,j);if(g)for(i=f[f.length-1].ownerDocument,n.map(f,la),j=0;g>j;j++)h=f[j],fa.test(h.type||\"\")&&!L.access(h,\"globalEval\")&&n.contains(i,h)&&(h.src?n._evalUrl&&n._evalUrl(h.src):n.globalEval(h.textContent.replace(ha,\"\")))}return this}}),n.each({appendTo:\"append\",prependTo:\"prepend\",insertBefore:\"before\",insertAfter:\"after\",replaceAll:\"replaceWith\"},function(a,b){n.fn[a]=function(a){for(var c,d=[],e=n(a),g=e.length-1,h=0;g>=h;h++)c=h===g?this:this.clone(!0),n(e[h])[b](c),f.apply(d,c.get());return this.pushStack(d)}});var qa,ra={};function sa(b,c){var d,e=n(c.createElement(b)).appendTo(c.body),f=a.getDefaultComputedStyle&&(d=a.getDefaultComputedStyle(e[0]))?d.display:n.css(e[0],\"display\");return e.detach(),f}function ta(a){var b=l,c=ra[a];return c||(c=sa(a,b),\"none\"!==c&&c||(qa=(qa||n(\"<iframe frameborder='0' width='0' height='0'/>\")).appendTo(b.documentElement),b=qa[0].contentDocument,b.write(),b.close(),c=sa(a,b),qa.detach()),ra[a]=c),c}var ua=/^margin/,va=new RegExp(\"^(\"+Q+\")(?!px)[a-z%]+$\",\"i\"),wa=function(b){return b.ownerDocument.defaultView.opener?b.ownerDocument.defaultView.getComputedStyle(b,null):a.getComputedStyle(b,null)};function xa(a,b,c){var d,e,f,g,h=a.style;return c=c||wa(a),c&&(g=c.getPropertyValue(b)||c[b]),c&&(\"\"!==g||n.contains(a.ownerDocument,a)||(g=n.style(a,b)),va.test(g)&&ua.test(b)&&(d=h.width,e=h.minWidth,f=h.maxWidth,h.minWidth=h.maxWidth=h.width=g,g=c.width,h.width=d,h.minWidth=e,h.maxWidth=f)),void 0!==g?g+\"\":g}function ya(a,b){return{get:function(){return a()?void delete this.get:(this.get=b).apply(this,arguments)}}}!function(){var b,c,d=l.documentElement,e=l.createElement(\"div\"),f=l.createElement(\"div\");if(f.style){f.style.backgroundClip=\"content-box\",f.cloneNode(!0).style.backgroundClip=\"\",k.clearCloneStyle=\"content-box\"===f.style.backgroundClip,e.style.cssText=\"border:0;width:0;height:0;top:0;left:-9999px;margin-top:1px;position:absolute\",e.appendChild(f);function g(){f.style.cssText=\"-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;display:block;margin-top:1%;top:1%;border:1px;padding:1px;width:4px;position:absolute\",f.innerHTML=\"\",d.appendChild(e);var g=a.getComputedStyle(f,null);b=\"1%\"!==g.top,c=\"4px\"===g.width,d.removeChild(e)}a.getComputedStyle&&n.extend(k,{pixelPosition:function(){return g(),b},boxSizingReliable:function(){return null==c&&g(),c},reliableMarginRight:function(){var b,c=f.appendChild(l.createElement(\"div\"));return c.style.cssText=f.style.cssText=\"-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;display:block;margin:0;border:0;padding:0\",c.style.marginRight=c.style.width=\"0\",f.style.width=\"1px\",d.appendChild(e),b=!parseFloat(a.getComputedStyle(c,null).marginRight),d.removeChild(e),f.removeChild(c),b}})}}(),n.swap=function(a,b,c,d){var e,f,g={};for(f in b)g[f]=a.style[f],a.style[f]=b[f];e=c.apply(a,d||[]);for(f in b)a.style[f]=g[f];return e};var za=/^(none|table(?!-c[ea]).+)/,Aa=new RegExp(\"^(\"+Q+\")(.*)$\",\"i\"),Ba=new RegExp(\"^([+-])=(\"+Q+\")\",\"i\"),Ca={position:\"absolute\",visibility:\"hidden\",display:\"block\"},Da={letterSpacing:\"0\",fontWeight:\"400\"},Ea=[\"Webkit\",\"O\",\"Moz\",\"ms\"];function Fa(a,b){if(b in a)return b;var c=b[0].toUpperCase()+b.slice(1),d=b,e=Ea.length;while(e--)if(b=Ea[e]+c,b in a)return b;return d}function Ga(a,b,c){var d=Aa.exec(b);return d?Math.max(0,d[1]-(c||0))+(d[2]||\"px\"):b}function Ha(a,b,c,d,e){for(var f=c===(d?\"border\":\"content\")?4:\"width\"===b?1:0,g=0;4>f;f+=2)\"margin\"===c&&(g+=n.css(a,c+R[f],!0,e)),d?(\"content\"===c&&(g-=n.css(a,\"padding\"+R[f],!0,e)),\"margin\"!==c&&(g-=n.css(a,\"border\"+R[f]+\"Width\",!0,e))):(g+=n.css(a,\"padding\"+R[f],!0,e),\"padding\"!==c&&(g+=n.css(a,\"border\"+R[f]+\"Width\",!0,e)));return g}function Ia(a,b,c){var d=!0,e=\"width\"===b?a.offsetWidth:a.offsetHeight,f=wa(a),g=\"border-box\"===n.css(a,\"boxSizing\",!1,f);if(0>=e||null==e){if(e=xa(a,b,f),(0>e||null==e)&&(e=a.style[b]),va.test(e))return e;d=g&&(k.boxSizingReliable()||e===a.style[b]),e=parseFloat(e)||0}return e+Ha(a,b,c||(g?\"border\":\"content\"),d,f)+\"px\"}function Ja(a,b){for(var c,d,e,f=[],g=0,h=a.length;h>g;g++)d=a[g],d.style&&(f[g]=L.get(d,\"olddisplay\"),c=d.style.display,b?(f[g]||\"none\"!==c||(d.style.display=\"\"),\"\"===d.style.display&&S(d)&&(f[g]=L.access(d,\"olddisplay\",ta(d.nodeName)))):(e=S(d),\"none\"===c&&e||L.set(d,\"olddisplay\",e?c:n.css(d,\"display\"))));for(g=0;h>g;g++)d=a[g],d.style&&(b&&\"none\"!==d.style.display&&\"\"!==d.style.display||(d.style.display=b?f[g]||\"\":\"none\"));return a}n.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=xa(a,\"opacity\");return\"\"===c?\"1\":c}}}},cssNumber:{columnCount:!0,fillOpacity:!0,flexGrow:!0,flexShrink:!0,fontWeight:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{\"float\":\"cssFloat\"},style:function(a,b,c,d){if(a&&3!==a.nodeType&&8!==a.nodeType&&a.style){var e,f,g,h=n.camelCase(b),i=a.style;return b=n.cssProps[h]||(n.cssProps[h]=Fa(i,h)),g=n.cssHooks[b]||n.cssHooks[h],void 0===c?g&&\"get\"in g&&void 0!==(e=g.get(a,!1,d))?e:i[b]:(f=typeof c,\"string\"===f&&(e=Ba.exec(c))&&(c=(e[1]+1)*e[2]+parseFloat(n.css(a,b)),f=\"number\"),null!=c&&c===c&&(\"number\"!==f||n.cssNumber[h]||(c+=\"px\"),k.clearCloneStyle||\"\"!==c||0!==b.indexOf(\"background\")||(i[b]=\"inherit\"),g&&\"set\"in g&&void 0===(c=g.set(a,c,d))||(i[b]=c)),void 0)}},css:function(a,b,c,d){var e,f,g,h=n.camelCase(b);return b=n.cssProps[h]||(n.cssProps[h]=Fa(a.style,h)),g=n.cssHooks[b]||n.cssHooks[h],g&&\"get\"in g&&(e=g.get(a,!0,c)),void 0===e&&(e=xa(a,b,d)),\"normal\"===e&&b in Da&&(e=Da[b]),\"\"===c||c?(f=parseFloat(e),c===!0||n.isNumeric(f)?f||0:e):e}}),n.each([\"height\",\"width\"],function(a,b){n.cssHooks[b]={get:function(a,c,d){return c?za.test(n.css(a,\"display\"))&&0===a.offsetWidth?n.swap(a,Ca,function(){return Ia(a,b,d)}):Ia(a,b,d):void 0},set:function(a,c,d){var e=d&&wa(a);return Ga(a,c,d?Ha(a,b,d,\"border-box\"===n.css(a,\"boxSizing\",!1,e),e):0)}}}),n.cssHooks.marginRight=ya(k.reliableMarginRight,function(a,b){return b?n.swap(a,{display:\"inline-block\"},xa,[a,\"marginRight\"]):void 0}),n.each({margin:\"\",padding:\"\",border:\"Width\"},function(a,b){n.cssHooks[a+b]={expand:function(c){for(var d=0,e={},f=\"string\"==typeof c?c.split(\" \"):[c];4>d;d++)e[a+R[d]+b]=f[d]||f[d-2]||f[0];return e}},ua.test(a)||(n.cssHooks[a+b].set=Ga)}),n.fn.extend({css:function(a,b){return J(this,function(a,b,c){var d,e,f={},g=0;if(n.isArray(b)){for(d=wa(a),e=b.length;e>g;g++)f[b[g]]=n.css(a,b[g],!1,d);return f}return void 0!==c?n.style(a,b,c):n.css(a,b)},a,b,arguments.length>1)},show:function(){return Ja(this,!0)},hide:function(){return Ja(this)},toggle:function(a){return\"boolean\"==typeof a?a?this.show():this.hide():this.each(function(){S(this)?n(this).show():n(this).hide()})}});function Ka(a,b,c,d,e){return new Ka.prototype.init(a,b,c,d,e)}n.Tween=Ka,Ka.prototype={constructor:Ka,init:function(a,b,c,d,e,f){this.elem=a,this.prop=c,this.easing=e||\"swing\",this.options=b,this.start=this.now=this.cur(),this.end=d,this.unit=f||(n.cssNumber[c]?\"\":\"px\")},cur:function(){var a=Ka.propHooks[this.prop];return a&&a.get?a.get(this):Ka.propHooks._default.get(this)},run:function(a){var b,c=Ka.propHooks[this.prop];return this.options.duration?this.pos=b=n.easing[this.easing](a,this.options.duration*a,0,1,this.options.duration):this.pos=b=a,this.now=(this.end-this.start)*b+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),c&&c.set?c.set(this):Ka.propHooks._default.set(this),this}},Ka.prototype.init.prototype=Ka.prototype,Ka.propHooks={_default:{get:function(a){var b;return null==a.elem[a.prop]||a.elem.style&&null!=a.elem.style[a.prop]?(b=n.css(a.elem,a.prop,\"\"),b&&\"auto\"!==b?b:0):a.elem[a.prop]},set:function(a){n.fx.step[a.prop]?n.fx.step[a.prop](a):a.elem.style&&(null!=a.elem.style[n.cssProps[a.prop]]||n.cssHooks[a.prop])?n.style(a.elem,a.prop,a.now+a.unit):a.elem[a.prop]=a.now}}},Ka.propHooks.scrollTop=Ka.propHooks.scrollLeft={set:function(a){a.elem.nodeType&&a.elem.parentNode&&(a.elem[a.prop]=a.now)}},n.easing={linear:function(a){return a},swing:function(a){return.5-Math.cos(a*Math.PI)/2}},n.fx=Ka.prototype.init,n.fx.step={};var La,Ma,Na=/^(?:toggle|show|hide)$/,Oa=new RegExp(\"^(?:([+-])=|)(\"+Q+\")([a-z%]*)$\",\"i\"),Pa=/queueHooks$/,Qa=[Va],Ra={\"*\":[function(a,b){var c=this.createTween(a,b),d=c.cur(),e=Oa.exec(b),f=e&&e[3]||(n.cssNumber[a]?\"\":\"px\"),g=(n.cssNumber[a]||\"px\"!==f&&+d)&&Oa.exec(n.css(c.elem,a)),h=1,i=20;if(g&&g[3]!==f){f=f||g[3],e=e||[],g=+d||1;do h=h||\".5\",g/=h,n.style(c.elem,a,g+f);while(h!==(h=c.cur()/d)&&1!==h&&--i)}return e&&(g=c.start=+g||+d||0,c.unit=f,c.end=e[1]?g+(e[1]+1)*e[2]:+e[2]),c}]};function Sa(){return setTimeout(function(){La=void 0}),La=n.now()}function Ta(a,b){var c,d=0,e={height:a};for(b=b?1:0;4>d;d+=2-b)c=R[d],e[\"margin\"+c]=e[\"padding\"+c]=a;return b&&(e.opacity=e.width=a),e}function Ua(a,b,c){for(var d,e=(Ra[b]||[]).concat(Ra[\"*\"]),f=0,g=e.length;g>f;f++)if(d=e[f].call(c,b,a))return d}function Va(a,b,c){var d,e,f,g,h,i,j,k,l=this,m={},o=a.style,p=a.nodeType&&S(a),q=L.get(a,\"fxshow\");c.queue||(h=n._queueHooks(a,\"fx\"),null==h.unqueued&&(h.unqueued=0,i=h.empty.fire,h.empty.fire=function(){h.unqueued||i()}),h.unqueued++,l.always(function(){l.always(function(){h.unqueued--,n.queue(a,\"fx\").length||h.empty.fire()})})),1===a.nodeType&&(\"height\"in b||\"width\"in b)&&(c.overflow=[o.overflow,o.overflowX,o.overflowY],j=n.css(a,\"display\"),k=\"none\"===j?L.get(a,\"olddisplay\")||ta(a.nodeName):j,\"inline\"===k&&\"none\"===n.css(a,\"float\")&&(o.display=\"inline-block\")),c.overflow&&(o.overflow=\"hidden\",l.always(function(){o.overflow=c.overflow[0],o.overflowX=c.overflow[1],o.overflowY=c.overflow[2]}));for(d in b)if(e=b[d],Na.exec(e)){if(delete b[d],f=f||\"toggle\"===e,e===(p?\"hide\":\"show\")){if(\"show\"!==e||!q||void 0===q[d])continue;p=!0}m[d]=q&&q[d]||n.style(a,d)}else j=void 0;if(n.isEmptyObject(m))\"inline\"===(\"none\"===j?ta(a.nodeName):j)&&(o.display=j);else{q?\"hidden\"in q&&(p=q.hidden):q=L.access(a,\"fxshow\",{}),f&&(q.hidden=!p),p?n(a).show():l.done(function(){n(a).hide()}),l.done(function(){var b;L.remove(a,\"fxshow\");for(b in m)n.style(a,b,m[b])});for(d in m)g=Ua(p?q[d]:0,d,l),d in q||(q[d]=g.start,p&&(g.end=g.start,g.start=\"width\"===d||\"height\"===d?1:0))}}function Wa(a,b){var c,d,e,f,g;for(c in a)if(d=n.camelCase(c),e=b[d],f=a[c],n.isArray(f)&&(e=f[1],f=a[c]=f[0]),c!==d&&(a[d]=f,delete a[c]),g=n.cssHooks[d],g&&\"expand\"in g){f=g.expand(f),delete a[d];for(c in f)c in a||(a[c]=f[c],b[c]=e)}else b[d]=e}function Xa(a,b,c){var d,e,f=0,g=Qa.length,h=n.Deferred().always(function(){delete i.elem}),i=function(){if(e)return!1;for(var b=La||Sa(),c=Math.max(0,j.startTime+j.duration-b),d=c/j.duration||0,f=1-d,g=0,i=j.tweens.length;i>g;g++)j.tweens[g].run(f);return h.notifyWith(a,[j,f,c]),1>f&&i?c:(h.resolveWith(a,[j]),!1)},j=h.promise({elem:a,props:n.extend({},b),opts:n.extend(!0,{specialEasing:{}},c),originalProperties:b,originalOptions:c,startTime:La||Sa(),duration:c.duration,tweens:[],createTween:function(b,c){var d=n.Tween(a,j.opts,b,c,j.opts.specialEasing[b]||j.opts.easing);return j.tweens.push(d),d},stop:function(b){var c=0,d=b?j.tweens.length:0;if(e)return this;for(e=!0;d>c;c++)j.tweens[c].run(1);return b?h.resolveWith(a,[j,b]):h.rejectWith(a,[j,b]),this}}),k=j.props;for(Wa(k,j.opts.specialEasing);g>f;f++)if(d=Qa[f].call(j,a,k,j.opts))return d;return n.map(k,Ua,j),n.isFunction(j.opts.start)&&j.opts.start.call(a,j),n.fx.timer(n.extend(i,{elem:a,anim:j,queue:j.opts.queue})),j.progress(j.opts.progress).done(j.opts.done,j.opts.complete).fail(j.opts.fail).always(j.opts.always)}n.Animation=n.extend(Xa,{tweener:function(a,b){n.isFunction(a)?(b=a,a=[\"*\"]):a=a.split(\" \");for(var c,d=0,e=a.length;e>d;d++)c=a[d],Ra[c]=Ra[c]||[],Ra[c].unshift(b)},prefilter:function(a,b){b?Qa.unshift(a):Qa.push(a)}}),n.speed=function(a,b,c){var d=a&&\"object\"==typeof a?n.extend({},a):{complete:c||!c&&b||n.isFunction(a)&&a,duration:a,easing:c&&b||b&&!n.isFunction(b)&&b};return d.duration=n.fx.off?0:\"number\"==typeof d.duration?d.duration:d.duration in n.fx.speeds?n.fx.speeds[d.duration]:n.fx.speeds._default,(null==d.queue||d.queue===!0)&&(d.queue=\"fx\"),d.old=d.complete,d.complete=function(){n.isFunction(d.old)&&d.old.call(this),d.queue&&n.dequeue(this,d.queue)},d},n.fn.extend({fadeTo:function(a,b,c,d){return this.filter(S).css(\"opacity\",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,d){var e=n.isEmptyObject(a),f=n.speed(b,c,d),g=function(){var b=Xa(this,n.extend({},a),f);(e||L.get(this,\"finish\"))&&b.stop(!0)};return g.finish=g,e||f.queue===!1?this.each(g):this.queue(f.queue,g)},stop:function(a,b,c){var d=function(a){var b=a.stop;delete a.stop,b(c)};return\"string\"!=typeof a&&(c=b,b=a,a=void 0),b&&a!==!1&&this.queue(a||\"fx\",[]),this.each(function(){var b=!0,e=null!=a&&a+\"queueHooks\",f=n.timers,g=L.get(this);if(e)g[e]&&g[e].stop&&d(g[e]);else for(e in g)g[e]&&g[e].stop&&Pa.test(e)&&d(g[e]);for(e=f.length;e--;)f[e].elem!==this||null!=a&&f[e].queue!==a||(f[e].anim.stop(c),b=!1,f.splice(e,1));(b||!c)&&n.dequeue(this,a)})},finish:function(a){return a!==!1&&(a=a||\"fx\"),this.each(function(){var b,c=L.get(this),d=c[a+\"queue\"],e=c[a+\"queueHooks\"],f=n.timers,g=d?d.length:0;for(c.finish=!0,n.queue(this,a,[]),e&&e.stop&&e.stop.call(this,!0),b=f.length;b--;)f[b].elem===this&&f[b].queue===a&&(f[b].anim.stop(!0),f.splice(b,1));for(b=0;g>b;b++)d[b]&&d[b].finish&&d[b].finish.call(this);delete c.finish})}}),n.each([\"toggle\",\"show\",\"hide\"],function(a,b){var c=n.fn[b];n.fn[b]=function(a,d,e){return null==a||\"boolean\"==typeof a?c.apply(this,arguments):this.animate(Ta(b,!0),a,d,e)}}),n.each({slideDown:Ta(\"show\"),slideUp:Ta(\"hide\"),slideToggle:Ta(\"toggle\"),fadeIn:{opacity:\"show\"},fadeOut:{opacity:\"hide\"},fadeToggle:{opacity:\"toggle\"}},function(a,b){n.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),n.timers=[],n.fx.tick=function(){var a,b=0,c=n.timers;for(La=n.now();b<c.length;b++)a=c[b],a()||c[b]!==a||c.splice(b--,1);c.length||n.fx.stop(),La=void 0},n.fx.timer=function(a){n.timers.push(a),a()?n.fx.start():n.timers.pop()},n.fx.interval=13,n.fx.start=function(){Ma||(Ma=setInterval(n.fx.tick,n.fx.interval))},n.fx.stop=function(){clearInterval(Ma),Ma=null},n.fx.speeds={slow:600,fast:200,_default:400},n.fn.delay=function(a,b){return a=n.fx?n.fx.speeds[a]||a:a,b=b||\"fx\",this.queue(b,function(b,c){var d=setTimeout(b,a);c.stop=function(){clearTimeout(d)}})},function(){var a=l.createElement(\"input\"),b=l.createElement(\"select\"),c=b.appendChild(l.createElement(\"option\"));a.type=\"checkbox\",k.checkOn=\"\"!==a.value,k.optSelected=c.selected,b.disabled=!0,k.optDisabled=!c.disabled,a=l.createElement(\"input\"),a.value=\"t\",a.type=\"radio\",k.radioValue=\"t\"===a.value}();var Ya,Za,$a=n.expr.attrHandle;n.fn.extend({attr:function(a,b){return J(this,n.attr,a,b,arguments.length>1)},removeAttr:function(a){return this.each(function(){n.removeAttr(this,a)})}}),n.extend({attr:function(a,b,c){var d,e,f=a.nodeType;if(a&&3!==f&&8!==f&&2!==f)return typeof a.getAttribute===U?n.prop(a,b,c):(1===f&&n.isXMLDoc(a)||(b=b.toLowerCase(),d=n.attrHooks[b]||(n.expr.match.bool.test(b)?Za:Ya)),\nvoid 0===c?d&&\"get\"in d&&null!==(e=d.get(a,b))?e:(e=n.find.attr(a,b),null==e?void 0:e):null!==c?d&&\"set\"in d&&void 0!==(e=d.set(a,c,b))?e:(a.setAttribute(b,c+\"\"),c):void n.removeAttr(a,b))},removeAttr:function(a,b){var c,d,e=0,f=b&&b.match(E);if(f&&1===a.nodeType)while(c=f[e++])d=n.propFix[c]||c,n.expr.match.bool.test(c)&&(a[d]=!1),a.removeAttribute(c)},attrHooks:{type:{set:function(a,b){if(!k.radioValue&&\"radio\"===b&&n.nodeName(a,\"input\")){var c=a.value;return a.setAttribute(\"type\",b),c&&(a.value=c),b}}}}}),Za={set:function(a,b,c){return b===!1?n.removeAttr(a,c):a.setAttribute(c,c),c}},n.each(n.expr.match.bool.source.match(/\\w+/g),function(a,b){var c=$a[b]||n.find.attr;$a[b]=function(a,b,d){var e,f;return d||(f=$a[b],$a[b]=e,e=null!=c(a,b,d)?b.toLowerCase():null,$a[b]=f),e}});var _a=/^(?:input|select|textarea|button)$/i;n.fn.extend({prop:function(a,b){return J(this,n.prop,a,b,arguments.length>1)},removeProp:function(a){return this.each(function(){delete this[n.propFix[a]||a]})}}),n.extend({propFix:{\"for\":\"htmlFor\",\"class\":\"className\"},prop:function(a,b,c){var d,e,f,g=a.nodeType;if(a&&3!==g&&8!==g&&2!==g)return f=1!==g||!n.isXMLDoc(a),f&&(b=n.propFix[b]||b,e=n.propHooks[b]),void 0!==c?e&&\"set\"in e&&void 0!==(d=e.set(a,c,b))?d:a[b]=c:e&&\"get\"in e&&null!==(d=e.get(a,b))?d:a[b]},propHooks:{tabIndex:{get:function(a){return a.hasAttribute(\"tabindex\")||_a.test(a.nodeName)||a.href?a.tabIndex:-1}}}}),k.optSelected||(n.propHooks.selected={get:function(a){var b=a.parentNode;return b&&b.parentNode&&b.parentNode.selectedIndex,null}}),n.each([\"tabIndex\",\"readOnly\",\"maxLength\",\"cellSpacing\",\"cellPadding\",\"rowSpan\",\"colSpan\",\"useMap\",\"frameBorder\",\"contentEditable\"],function(){n.propFix[this.toLowerCase()]=this});var ab=/[\\t\\r\\n\\f]/g;n.fn.extend({addClass:function(a){var b,c,d,e,f,g,h=\"string\"==typeof a&&a,i=0,j=this.length;if(n.isFunction(a))return this.each(function(b){n(this).addClass(a.call(this,b,this.className))});if(h)for(b=(a||\"\").match(E)||[];j>i;i++)if(c=this[i],d=1===c.nodeType&&(c.className?(\" \"+c.className+\" \").replace(ab,\" \"):\" \")){f=0;while(e=b[f++])d.indexOf(\" \"+e+\" \")<0&&(d+=e+\" \");g=n.trim(d),c.className!==g&&(c.className=g)}return this},removeClass:function(a){var b,c,d,e,f,g,h=0===arguments.length||\"string\"==typeof a&&a,i=0,j=this.length;if(n.isFunction(a))return this.each(function(b){n(this).removeClass(a.call(this,b,this.className))});if(h)for(b=(a||\"\").match(E)||[];j>i;i++)if(c=this[i],d=1===c.nodeType&&(c.className?(\" \"+c.className+\" \").replace(ab,\" \"):\"\")){f=0;while(e=b[f++])while(d.indexOf(\" \"+e+\" \")>=0)d=d.replace(\" \"+e+\" \",\" \");g=a?n.trim(d):\"\",c.className!==g&&(c.className=g)}return this},toggleClass:function(a,b){var c=typeof a;return\"boolean\"==typeof b&&\"string\"===c?b?this.addClass(a):this.removeClass(a):this.each(n.isFunction(a)?function(c){n(this).toggleClass(a.call(this,c,this.className,b),b)}:function(){if(\"string\"===c){var b,d=0,e=n(this),f=a.match(E)||[];while(b=f[d++])e.hasClass(b)?e.removeClass(b):e.addClass(b)}else(c===U||\"boolean\"===c)&&(this.className&&L.set(this,\"__className__\",this.className),this.className=this.className||a===!1?\"\":L.get(this,\"__className__\")||\"\")})},hasClass:function(a){for(var b=\" \"+a+\" \",c=0,d=this.length;d>c;c++)if(1===this[c].nodeType&&(\" \"+this[c].className+\" \").replace(ab,\" \").indexOf(b)>=0)return!0;return!1}});var bb=/\\r/g;n.fn.extend({val:function(a){var b,c,d,e=this[0];{if(arguments.length)return d=n.isFunction(a),this.each(function(c){var e;1===this.nodeType&&(e=d?a.call(this,c,n(this).val()):a,null==e?e=\"\":\"number\"==typeof e?e+=\"\":n.isArray(e)&&(e=n.map(e,function(a){return null==a?\"\":a+\"\"})),b=n.valHooks[this.type]||n.valHooks[this.nodeName.toLowerCase()],b&&\"set\"in b&&void 0!==b.set(this,e,\"value\")||(this.value=e))});if(e)return b=n.valHooks[e.type]||n.valHooks[e.nodeName.toLowerCase()],b&&\"get\"in b&&void 0!==(c=b.get(e,\"value\"))?c:(c=e.value,\"string\"==typeof c?c.replace(bb,\"\"):null==c?\"\":c)}}}),n.extend({valHooks:{option:{get:function(a){var b=n.find.attr(a,\"value\");return null!=b?b:n.trim(n.text(a))}},select:{get:function(a){for(var b,c,d=a.options,e=a.selectedIndex,f=\"select-one\"===a.type||0>e,g=f?null:[],h=f?e+1:d.length,i=0>e?h:f?e:0;h>i;i++)if(c=d[i],!(!c.selected&&i!==e||(k.optDisabled?c.disabled:null!==c.getAttribute(\"disabled\"))||c.parentNode.disabled&&n.nodeName(c.parentNode,\"optgroup\"))){if(b=n(c).val(),f)return b;g.push(b)}return g},set:function(a,b){var c,d,e=a.options,f=n.makeArray(b),g=e.length;while(g--)d=e[g],(d.selected=n.inArray(d.value,f)>=0)&&(c=!0);return c||(a.selectedIndex=-1),f}}}}),n.each([\"radio\",\"checkbox\"],function(){n.valHooks[this]={set:function(a,b){return n.isArray(b)?a.checked=n.inArray(n(a).val(),b)>=0:void 0}},k.checkOn||(n.valHooks[this].get=function(a){return null===a.getAttribute(\"value\")?\"on\":a.value})}),n.each(\"blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu\".split(\" \"),function(a,b){n.fn[b]=function(a,c){return arguments.length>0?this.on(b,null,a,c):this.trigger(b)}}),n.fn.extend({hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)},bind:function(a,b,c){return this.on(a,null,b,c)},unbind:function(a,b){return this.off(a,null,b)},delegate:function(a,b,c,d){return this.on(b,a,c,d)},undelegate:function(a,b,c){return 1===arguments.length?this.off(a,\"**\"):this.off(b,a||\"**\",c)}});var cb=n.now(),db=/\\?/;n.parseJSON=function(a){return JSON.parse(a+\"\")},n.parseXML=function(a){var b,c;if(!a||\"string\"!=typeof a)return null;try{c=new DOMParser,b=c.parseFromString(a,\"text/xml\")}catch(d){b=void 0}return(!b||b.getElementsByTagName(\"parsererror\").length)&&n.error(\"Invalid XML: \"+a),b};var eb=/#.*$/,fb=/([?&])_=[^&]*/,gb=/^(.*?):[ \\t]*([^\\r\\n]*)$/gm,hb=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,ib=/^(?:GET|HEAD)$/,jb=/^\\/\\//,kb=/^([\\w.+-]+:)(?:\\/\\/(?:[^\\/?#]*@|)([^\\/?#:]*)(?::(\\d+)|)|)/,lb={},mb={},nb=\"*/\".concat(\"*\"),ob=a.location.href,pb=kb.exec(ob.toLowerCase())||[];function qb(a){return function(b,c){\"string\"!=typeof b&&(c=b,b=\"*\");var d,e=0,f=b.toLowerCase().match(E)||[];if(n.isFunction(c))while(d=f[e++])\"+\"===d[0]?(d=d.slice(1)||\"*\",(a[d]=a[d]||[]).unshift(c)):(a[d]=a[d]||[]).push(c)}}function rb(a,b,c,d){var e={},f=a===mb;function g(h){var i;return e[h]=!0,n.each(a[h]||[],function(a,h){var j=h(b,c,d);return\"string\"!=typeof j||f||e[j]?f?!(i=j):void 0:(b.dataTypes.unshift(j),g(j),!1)}),i}return g(b.dataTypes[0])||!e[\"*\"]&&g(\"*\")}function sb(a,b){var c,d,e=n.ajaxSettings.flatOptions||{};for(c in b)void 0!==b[c]&&((e[c]?a:d||(d={}))[c]=b[c]);return d&&n.extend(!0,a,d),a}function tb(a,b,c){var d,e,f,g,h=a.contents,i=a.dataTypes;while(\"*\"===i[0])i.shift(),void 0===d&&(d=a.mimeType||b.getResponseHeader(\"Content-Type\"));if(d)for(e in h)if(h[e]&&h[e].test(d)){i.unshift(e);break}if(i[0]in c)f=i[0];else{for(e in c){if(!i[0]||a.converters[e+\" \"+i[0]]){f=e;break}g||(g=e)}f=f||g}return f?(f!==i[0]&&i.unshift(f),c[f]):void 0}function ub(a,b,c,d){var e,f,g,h,i,j={},k=a.dataTypes.slice();if(k[1])for(g in a.converters)j[g.toLowerCase()]=a.converters[g];f=k.shift();while(f)if(a.responseFields[f]&&(c[a.responseFields[f]]=b),!i&&d&&a.dataFilter&&(b=a.dataFilter(b,a.dataType)),i=f,f=k.shift())if(\"*\"===f)f=i;else if(\"*\"!==i&&i!==f){if(g=j[i+\" \"+f]||j[\"* \"+f],!g)for(e in j)if(h=e.split(\" \"),h[1]===f&&(g=j[i+\" \"+h[0]]||j[\"* \"+h[0]])){g===!0?g=j[e]:j[e]!==!0&&(f=h[0],k.unshift(h[1]));break}if(g!==!0)if(g&&a[\"throws\"])b=g(b);else try{b=g(b)}catch(l){return{state:\"parsererror\",error:g?l:\"No conversion from \"+i+\" to \"+f}}}return{state:\"success\",data:b}}n.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:ob,type:\"GET\",isLocal:hb.test(pb[1]),global:!0,processData:!0,async:!0,contentType:\"application/x-www-form-urlencoded; charset=UTF-8\",accepts:{\"*\":nb,text:\"text/plain\",html:\"text/html\",xml:\"application/xml, text/xml\",json:\"application/json, text/javascript\"},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:\"responseXML\",text:\"responseText\",json:\"responseJSON\"},converters:{\"* text\":String,\"text html\":!0,\"text json\":n.parseJSON,\"text xml\":n.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(a,b){return b?sb(sb(a,n.ajaxSettings),b):sb(n.ajaxSettings,a)},ajaxPrefilter:qb(lb),ajaxTransport:qb(mb),ajax:function(a,b){\"object\"==typeof a&&(b=a,a=void 0),b=b||{};var c,d,e,f,g,h,i,j,k=n.ajaxSetup({},b),l=k.context||k,m=k.context&&(l.nodeType||l.jquery)?n(l):n.event,o=n.Deferred(),p=n.Callbacks(\"once memory\"),q=k.statusCode||{},r={},s={},t=0,u=\"canceled\",v={readyState:0,getResponseHeader:function(a){var b;if(2===t){if(!f){f={};while(b=gb.exec(e))f[b[1].toLowerCase()]=b[2]}b=f[a.toLowerCase()]}return null==b?null:b},getAllResponseHeaders:function(){return 2===t?e:null},setRequestHeader:function(a,b){var c=a.toLowerCase();return t||(a=s[c]=s[c]||a,r[a]=b),this},overrideMimeType:function(a){return t||(k.mimeType=a),this},statusCode:function(a){var b;if(a)if(2>t)for(b in a)q[b]=[q[b],a[b]];else v.always(a[v.status]);return this},abort:function(a){var b=a||u;return c&&c.abort(b),x(0,b),this}};if(o.promise(v).complete=p.add,v.success=v.done,v.error=v.fail,k.url=((a||k.url||ob)+\"\").replace(eb,\"\").replace(jb,pb[1]+\"//\"),k.type=b.method||b.type||k.method||k.type,k.dataTypes=n.trim(k.dataType||\"*\").toLowerCase().match(E)||[\"\"],null==k.crossDomain&&(h=kb.exec(k.url.toLowerCase()),k.crossDomain=!(!h||h[1]===pb[1]&&h[2]===pb[2]&&(h[3]||(\"http:\"===h[1]?\"80\":\"443\"))===(pb[3]||(\"http:\"===pb[1]?\"80\":\"443\")))),k.data&&k.processData&&\"string\"!=typeof k.data&&(k.data=n.param(k.data,k.traditional)),rb(lb,k,b,v),2===t)return v;i=n.event&&k.global,i&&0===n.active++&&n.event.trigger(\"ajaxStart\"),k.type=k.type.toUpperCase(),k.hasContent=!ib.test(k.type),d=k.url,k.hasContent||(k.data&&(d=k.url+=(db.test(d)?\"&\":\"?\")+k.data,delete k.data),k.cache===!1&&(k.url=fb.test(d)?d.replace(fb,\"$1_=\"+cb++):d+(db.test(d)?\"&\":\"?\")+\"_=\"+cb++)),k.ifModified&&(n.lastModified[d]&&v.setRequestHeader(\"If-Modified-Since\",n.lastModified[d]),n.etag[d]&&v.setRequestHeader(\"If-None-Match\",n.etag[d])),(k.data&&k.hasContent&&k.contentType!==!1||b.contentType)&&v.setRequestHeader(\"Content-Type\",k.contentType),v.setRequestHeader(\"Accept\",k.dataTypes[0]&&k.accepts[k.dataTypes[0]]?k.accepts[k.dataTypes[0]]+(\"*\"!==k.dataTypes[0]?\", \"+nb+\"; q=0.01\":\"\"):k.accepts[\"*\"]);for(j in k.headers)v.setRequestHeader(j,k.headers[j]);if(k.beforeSend&&(k.beforeSend.call(l,v,k)===!1||2===t))return v.abort();u=\"abort\";for(j in{success:1,error:1,complete:1})v[j](k[j]);if(c=rb(mb,k,b,v)){v.readyState=1,i&&m.trigger(\"ajaxSend\",[v,k]),k.async&&k.timeout>0&&(g=setTimeout(function(){v.abort(\"timeout\")},k.timeout));try{t=1,c.send(r,x)}catch(w){if(!(2>t))throw w;x(-1,w)}}else x(-1,\"No Transport\");function x(a,b,f,h){var j,r,s,u,w,x=b;2!==t&&(t=2,g&&clearTimeout(g),c=void 0,e=h||\"\",v.readyState=a>0?4:0,j=a>=200&&300>a||304===a,f&&(u=tb(k,v,f)),u=ub(k,u,v,j),j?(k.ifModified&&(w=v.getResponseHeader(\"Last-Modified\"),w&&(n.lastModified[d]=w),w=v.getResponseHeader(\"etag\"),w&&(n.etag[d]=w)),204===a||\"HEAD\"===k.type?x=\"nocontent\":304===a?x=\"notmodified\":(x=u.state,r=u.data,s=u.error,j=!s)):(s=x,(a||!x)&&(x=\"error\",0>a&&(a=0))),v.status=a,v.statusText=(b||x)+\"\",j?o.resolveWith(l,[r,x,v]):o.rejectWith(l,[v,x,s]),v.statusCode(q),q=void 0,i&&m.trigger(j?\"ajaxSuccess\":\"ajaxError\",[v,k,j?r:s]),p.fireWith(l,[v,x]),i&&(m.trigger(\"ajaxComplete\",[v,k]),--n.active||n.event.trigger(\"ajaxStop\")))}return v},getJSON:function(a,b,c){return n.get(a,b,c,\"json\")},getScript:function(a,b){return n.get(a,void 0,b,\"script\")}}),n.each([\"get\",\"post\"],function(a,b){n[b]=function(a,c,d,e){return n.isFunction(c)&&(e=e||d,d=c,c=void 0),n.ajax({url:a,type:b,dataType:e,data:c,success:d})}}),n._evalUrl=function(a){return n.ajax({url:a,type:\"GET\",dataType:\"script\",async:!1,global:!1,\"throws\":!0})},n.fn.extend({wrapAll:function(a){var b;return n.isFunction(a)?this.each(function(b){n(this).wrapAll(a.call(this,b))}):(this[0]&&(b=n(a,this[0].ownerDocument).eq(0).clone(!0),this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstElementChild)a=a.firstElementChild;return a}).append(this)),this)},wrapInner:function(a){return this.each(n.isFunction(a)?function(b){n(this).wrapInner(a.call(this,b))}:function(){var b=n(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=n.isFunction(a);return this.each(function(c){n(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){n.nodeName(this,\"body\")||n(this).replaceWith(this.childNodes)}).end()}}),n.expr.filters.hidden=function(a){return a.offsetWidth<=0&&a.offsetHeight<=0},n.expr.filters.visible=function(a){return!n.expr.filters.hidden(a)};var vb=/%20/g,wb=/\\[\\]$/,xb=/\\r?\\n/g,yb=/^(?:submit|button|image|reset|file)$/i,zb=/^(?:input|select|textarea|keygen)/i;function Ab(a,b,c,d){var e;if(n.isArray(b))n.each(b,function(b,e){c||wb.test(a)?d(a,e):Ab(a+\"[\"+(\"object\"==typeof e?b:\"\")+\"]\",e,c,d)});else if(c||\"object\"!==n.type(b))d(a,b);else for(e in b)Ab(a+\"[\"+e+\"]\",b[e],c,d)}n.param=function(a,b){var c,d=[],e=function(a,b){b=n.isFunction(b)?b():null==b?\"\":b,d[d.length]=encodeURIComponent(a)+\"=\"+encodeURIComponent(b)};if(void 0===b&&(b=n.ajaxSettings&&n.ajaxSettings.traditional),n.isArray(a)||a.jquery&&!n.isPlainObject(a))n.each(a,function(){e(this.name,this.value)});else for(c in a)Ab(c,a[c],b,e);return d.join(\"&\").replace(vb,\"+\")},n.fn.extend({serialize:function(){return n.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var a=n.prop(this,\"elements\");return a?n.makeArray(a):this}).filter(function(){var a=this.type;return this.name&&!n(this).is(\":disabled\")&&zb.test(this.nodeName)&&!yb.test(a)&&(this.checked||!T.test(a))}).map(function(a,b){var c=n(this).val();return null==c?null:n.isArray(c)?n.map(c,function(a){return{name:b.name,value:a.replace(xb,\"\\r\\n\")}}):{name:b.name,value:c.replace(xb,\"\\r\\n\")}}).get()}}),n.ajaxSettings.xhr=function(){try{return new XMLHttpRequest}catch(a){}};var Bb=0,Cb={},Db={0:200,1223:204},Eb=n.ajaxSettings.xhr();a.attachEvent&&a.attachEvent(\"onunload\",function(){for(var a in Cb)Cb[a]()}),k.cors=!!Eb&&\"withCredentials\"in Eb,k.ajax=Eb=!!Eb,n.ajaxTransport(function(a){var b;return k.cors||Eb&&!a.crossDomain?{send:function(c,d){var e,f=a.xhr(),g=++Bb;if(f.open(a.type,a.url,a.async,a.username,a.password),a.xhrFields)for(e in a.xhrFields)f[e]=a.xhrFields[e];a.mimeType&&f.overrideMimeType&&f.overrideMimeType(a.mimeType),a.crossDomain||c[\"X-Requested-With\"]||(c[\"X-Requested-With\"]=\"XMLHttpRequest\");for(e in c)f.setRequestHeader(e,c[e]);b=function(a){return function(){b&&(delete Cb[g],b=f.onload=f.onerror=null,\"abort\"===a?f.abort():\"error\"===a?d(f.status,f.statusText):d(Db[f.status]||f.status,f.statusText,\"string\"==typeof f.responseText?{text:f.responseText}:void 0,f.getAllResponseHeaders()))}},f.onload=b(),f.onerror=b(\"error\"),b=Cb[g]=b(\"abort\");try{f.send(a.hasContent&&a.data||null)}catch(h){if(b)throw h}},abort:function(){b&&b()}}:void 0}),n.ajaxSetup({accepts:{script:\"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript\"},contents:{script:/(?:java|ecma)script/},converters:{\"text script\":function(a){return n.globalEval(a),a}}}),n.ajaxPrefilter(\"script\",function(a){void 0===a.cache&&(a.cache=!1),a.crossDomain&&(a.type=\"GET\")}),n.ajaxTransport(\"script\",function(a){if(a.crossDomain){var b,c;return{send:function(d,e){b=n(\"<script>\").prop({async:!0,charset:a.scriptCharset,src:a.url}).on(\"load error\",c=function(a){b.remove(),c=null,a&&e(\"error\"===a.type?404:200,a.type)}),l.head.appendChild(b[0])},abort:function(){c&&c()}}}});var Fb=[],Gb=/(=)\\?(?=&|$)|\\?\\?/;n.ajaxSetup({jsonp:\"callback\",jsonpCallback:function(){var a=Fb.pop()||n.expando+\"_\"+cb++;return this[a]=!0,a}}),n.ajaxPrefilter(\"json jsonp\",function(b,c,d){var e,f,g,h=b.jsonp!==!1&&(Gb.test(b.url)?\"url\":\"string\"==typeof b.data&&!(b.contentType||\"\").indexOf(\"application/x-www-form-urlencoded\")&&Gb.test(b.data)&&\"data\");return h||\"jsonp\"===b.dataTypes[0]?(e=b.jsonpCallback=n.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,h?b[h]=b[h].replace(Gb,\"$1\"+e):b.jsonp!==!1&&(b.url+=(db.test(b.url)?\"&\":\"?\")+b.jsonp+\"=\"+e),b.converters[\"script json\"]=function(){return g||n.error(e+\" was not called\"),g[0]},b.dataTypes[0]=\"json\",f=a[e],a[e]=function(){g=arguments},d.always(function(){a[e]=f,b[e]&&(b.jsonpCallback=c.jsonpCallback,Fb.push(e)),g&&n.isFunction(f)&&f(g[0]),g=f=void 0}),\"script\"):void 0}),n.parseHTML=function(a,b,c){if(!a||\"string\"!=typeof a)return null;\"boolean\"==typeof b&&(c=b,b=!1),b=b||l;var d=v.exec(a),e=!c&&[];return d?[b.createElement(d[1])]:(d=n.buildFragment([a],b,e),e&&e.length&&n(e).remove(),n.merge([],d.childNodes))};var Hb=n.fn.load;n.fn.load=function(a,b,c){if(\"string\"!=typeof a&&Hb)return Hb.apply(this,arguments);var d,e,f,g=this,h=a.indexOf(\" \");return h>=0&&(d=n.trim(a.slice(h)),a=a.slice(0,h)),n.isFunction(b)?(c=b,b=void 0):b&&\"object\"==typeof b&&(e=\"POST\"),g.length>0&&n.ajax({url:a,type:e,dataType:\"html\",data:b}).done(function(a){f=arguments,g.html(d?n(\"<div>\").append(n.parseHTML(a)).find(d):a)}).complete(c&&function(a,b){g.each(c,f||[a.responseText,b,a])}),this},n.each([\"ajaxStart\",\"ajaxStop\",\"ajaxComplete\",\"ajaxError\",\"ajaxSuccess\",\"ajaxSend\"],function(a,b){n.fn[b]=function(a){return this.on(b,a)}}),n.expr.filters.animated=function(a){return n.grep(n.timers,function(b){return a===b.elem}).length};var Ib=a.document.documentElement;function Jb(a){return n.isWindow(a)?a:9===a.nodeType&&a.defaultView}n.offset={setOffset:function(a,b,c){var d,e,f,g,h,i,j,k=n.css(a,\"position\"),l=n(a),m={};\"static\"===k&&(a.style.position=\"relative\"),h=l.offset(),f=n.css(a,\"top\"),i=n.css(a,\"left\"),j=(\"absolute\"===k||\"fixed\"===k)&&(f+i).indexOf(\"auto\")>-1,j?(d=l.position(),g=d.top,e=d.left):(g=parseFloat(f)||0,e=parseFloat(i)||0),n.isFunction(b)&&(b=b.call(a,c,h)),null!=b.top&&(m.top=b.top-h.top+g),null!=b.left&&(m.left=b.left-h.left+e),\"using\"in b?b.using.call(a,m):l.css(m)}},n.fn.extend({offset:function(a){if(arguments.length)return void 0===a?this:this.each(function(b){n.offset.setOffset(this,a,b)});var b,c,d=this[0],e={top:0,left:0},f=d&&d.ownerDocument;if(f)return b=f.documentElement,n.contains(b,d)?(typeof d.getBoundingClientRect!==U&&(e=d.getBoundingClientRect()),c=Jb(f),{top:e.top+c.pageYOffset-b.clientTop,left:e.left+c.pageXOffset-b.clientLeft}):e},position:function(){if(this[0]){var a,b,c=this[0],d={top:0,left:0};return\"fixed\"===n.css(c,\"position\")?b=c.getBoundingClientRect():(a=this.offsetParent(),b=this.offset(),n.nodeName(a[0],\"html\")||(d=a.offset()),d.top+=n.css(a[0],\"borderTopWidth\",!0),d.left+=n.css(a[0],\"borderLeftWidth\",!0)),{top:b.top-d.top-n.css(c,\"marginTop\",!0),left:b.left-d.left-n.css(c,\"marginLeft\",!0)}}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||Ib;while(a&&!n.nodeName(a,\"html\")&&\"static\"===n.css(a,\"position\"))a=a.offsetParent;return a||Ib})}}),n.each({scrollLeft:\"pageXOffset\",scrollTop:\"pageYOffset\"},function(b,c){var d=\"pageYOffset\"===c;n.fn[b]=function(e){return J(this,function(b,e,f){var g=Jb(b);return void 0===f?g?g[c]:b[e]:void(g?g.scrollTo(d?a.pageXOffset:f,d?f:a.pageYOffset):b[e]=f)},b,e,arguments.length,null)}}),n.each([\"top\",\"left\"],function(a,b){n.cssHooks[b]=ya(k.pixelPosition,function(a,c){return c?(c=xa(a,b),va.test(c)?n(a).position()[b]+\"px\":c):void 0})}),n.each({Height:\"height\",Width:\"width\"},function(a,b){n.each({padding:\"inner\"+a,content:b,\"\":\"outer\"+a},function(c,d){n.fn[d]=function(d,e){var f=arguments.length&&(c||\"boolean\"!=typeof d),g=c||(d===!0||e===!0?\"margin\":\"border\");return J(this,function(b,c,d){var e;return n.isWindow(b)?b.document.documentElement[\"client\"+a]:9===b.nodeType?(e=b.documentElement,Math.max(b.body[\"scroll\"+a],e[\"scroll\"+a],b.body[\"offset\"+a],e[\"offset\"+a],e[\"client\"+a])):void 0===d?n.css(b,c,g):n.style(b,c,d,g)},b,f?d:void 0,f,null)}})}),n.fn.size=function(){return this.length},n.fn.andSelf=n.fn.addBack,\"function\"==typeof define&&define.amd&&define(\"jquery\",[],function(){return n});var Kb=a.jQuery,Lb=a.$;return n.noConflict=function(b){return a.$===n&&(a.$=Lb),b&&a.jQuery===n&&(a.jQuery=Kb),n},typeof b===U&&(a.jQuery=a.$=n),n});\nPK\x07\x08\x12\x138\xccyI\x01\x00yI\x01\x00PK\x03\x04\x14\x00\x08\x00\x00\x00W\x9a5G\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x1d\x00\x00\x00js/vendor/react-0.13.3.min.js/**\n * React v0.13.3\n *\n * Copyright 2013-2015, Facebook, Inc.\n * All rights reserved.\n *\n * This source code is licensed under the BSD-style license found in the\n * LICENSE file in the root directory of this source tree. An additional grant\n * of patent rights can be found in the PATENTS file in the same directory.\n *\n */\n!function(e){if(\"object\"==typeof exports&&\"undefined\"!=typeof module)module.exports=e();else if(\"function\"==typeof define&&define.amd)define([],e);else{var t;t=\"undefined\"!=typeof window?window:\"undefined\"!=typeof global?global:\"undefined\"!=typeof self?self:this,t.React=e()}}(function(){return function e(t,n,r){function o(a,u){if(!n[a]){if(!t[a]){var s=\"function\"==typeof require&&require;if(!u&&s)return s(a,!0);if(i)return i(a,!0);var l=new Error(\"Cannot find module '\"+a+\"'\");throw l.code=\"MODULE_NOT_FOUND\",l}var c=n[a]={exports:{}};t[a][0].call(c.exports,function(e){var n=t[a][1][e];return o(n?n:e)},c,c.exports,e,t,n,r)}return n[a].exports}for(var i=\"function\"==typeof require&&require,a=0;a<r.length;a++)o(r[a]);return o}({1:[function(e,t,n){\"use strict\";var r=e(19),o=e(32),i=e(34),a=e(33),u=e(38),s=e(39),l=e(55),c=(e(56),e(40)),p=e(51),d=e(54),f=e(64),h=e(68),m=e(73),v=e(76),g=e(79),y=e(82),C=e(27),E=e(115),b=e(142);d.inject();var _=l.createElement,x=l.createFactory,D=l.cloneElement,M=m.measure(\"React\",\"render\",h.render),N={Children:{map:o.map,forEach:o.forEach,count:o.count,only:b},Component:i,DOM:c,PropTypes:v,initializeTouchEvents:function(e){r.useTouchEvents=e},createClass:a.createClass,createElement:_,cloneElement:D,createFactory:x,createMixin:function(e){return e},constructAndRenderComponent:h.constructAndRenderComponent,constructAndRenderComponentByID:h.constructAndRenderComponentByID,findDOMNode:E,render:M,renderToString:y.renderToString,renderToStaticMarkup:y.renderToStaticMarkup,unmountComponentAtNode:h.unmountComponentAtNode,isValidElement:l.isValidElement,withContext:u.withContext,__spread:C};\"undefined\"!=typeof __REACT_DEVTOOLS_GLOBAL_HOOK__&&\"function\"==typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.inject&&__REACT_DEVTOOLS_GLOBAL_HOOK__.inject({CurrentOwner:s,InstanceHandles:f,Mount:h,Reconciler:g,TextComponent:p});N.version=\"0.13.3\",t.exports=N},{115:115,142:142,19:19,27:27,32:32,33:33,34:34,38:38,39:39,40:40,51:51,54:54,55:55,56:56,64:64,68:68,73:73,76:76,79:79,82:82}],2:[function(e,t,n){\"use strict\";var r=e(117),o={componentDidMount:function(){this.props.autoFocus&&r(this.getDOMNode())}};t.exports=o},{117:117}],3:[function(e,t,n){\"use strict\";function r(){var e=window.opera;return\"object\"==typeof e&&\"function\"==typeof e.version&&parseInt(e.version(),10)<=12}function o(e){return(e.ctrlKey||e.altKey||e.metaKey)&&!(e.ctrlKey&&e.altKey)}function i(e){switch(e){case T.topCompositionStart:return P.compositionStart;case T.topCompositionEnd:return P.compositionEnd;case T.topCompositionUpdate:return P.compositionUpdate}}function a(e,t){return e===T.topKeyDown&&t.keyCode===b}function u(e,t){switch(e){case T.topKeyUp:return-1!==E.indexOf(t.keyCode);case T.topKeyDown:return t.keyCode!==b;case T.topKeyPress:case T.topMouseDown:case T.topBlur:return!0;default:return!1}}function s(e){var t=e.detail;return\"object\"==typeof t&&\"data\"in t?t.data:null}function l(e,t,n,r){var o,l;if(_?o=i(e):w?u(e,r)&&(o=P.compositionEnd):a(e,r)&&(o=P.compositionStart),!o)return null;M&&(w||o!==P.compositionStart?o===P.compositionEnd&&w&&(l=w.getData()):w=v.getPooled(t));var c=g.getPooled(o,n,r);if(l)c.data=l;else{var p=s(r);null!==p&&(c.data=p)}return h.accumulateTwoPhaseDispatches(c),c}function c(e,t){switch(e){case T.topCompositionEnd:return s(t);case T.topKeyPress:var n=t.which;return n!==N?null:(R=!0,I);case T.topTextInput:var r=t.data;return r===I&&R?null:r;default:return null}}function p(e,t){if(w){if(e===T.topCompositionEnd||u(e,t)){var n=w.getData();return v.release(w),w=null,n}return null}switch(e){case T.topPaste:return null;case T.topKeyPress:return t.which&&!o(t)?String.fromCharCode(t.which):null;case T.topCompositionEnd:return M?null:t.data;default:return null}}function d(e,t,n,r){var o;if(o=D?c(e,r):p(e,r),!o)return null;var i=y.getPooled(P.beforeInput,n,r);return i.data=o,h.accumulateTwoPhaseDispatches(i),i}var f=e(15),h=e(20),m=e(21),v=e(22),g=e(91),y=e(95),C=e(139),E=[9,13,27,32],b=229,_=m.canUseDOM&&\"CompositionEvent\"in window,x=null;m.canUseDOM&&\"documentMode\"in document&&(x=document.documentMode);var D=m.canUseDOM&&\"TextEvent\"in window&&!x&&!r(),M=m.canUseDOM&&(!_||x&&x>8&&11>=x),N=32,I=String.fromCharCode(N),T=f.topLevelTypes,P={beforeInput:{phasedRegistrationNames:{bubbled:C({onBeforeInput:null}),captured:C({onBeforeInputCapture:null})},dependencies:[T.topCompositionEnd,T.topKeyPress,T.topTextInput,T.topPaste]},compositionEnd:{phasedRegistrationNames:{bubbled:C({onCompositionEnd:null}),captured:C({onCompositionEndCapture:null})},dependencies:[T.topBlur,T.topCompositionEnd,T.topKeyDown,T.topKeyPress,T.topKeyUp,T.topMouseDown]},compositionStart:{phasedRegistrationNames:{bubbled:C({onCompositionStart:null}),captured:C({onCompositionStartCapture:null})},dependencies:[T.topBlur,T.topCompositionStart,T.topKeyDown,T.topKeyPress,T.topKeyUp,T.topMouseDown]},compositionUpdate:{phasedRegistrationNames:{bubbled:C({onCompositionUpdate:null}),captured:C({onCompositionUpdateCapture:null})},dependencies:[T.topBlur,T.topCompositionUpdate,T.topKeyDown,T.topKeyPress,T.topKeyUp,T.topMouseDown]}},R=!1,w=null,O={eventTypes:P,extractEvents:function(e,t,n,r){return[l(e,t,n,r),d(e,t,n,r)]}};t.exports=O},{139:139,15:15,20:20,21:21,22:22,91:91,95:95}],4:[function(e,t,n){\"use strict\";function r(e,t){return e+t.charAt(0).toUpperCase()+t.substring(1)}var o={boxFlex:!0,boxFlexGroup:!0,columnCount:!0,flex:!0,flexGrow:!0,flexPositive:!0,flexShrink:!0,flexNegative:!0,fontWeight:!0,lineClamp:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0,fillOpacity:!0,strokeDashoffset:!0,strokeOpacity:!0,strokeWidth:!0},i=[\"Webkit\",\"ms\",\"Moz\",\"O\"];Object.keys(o).forEach(function(e){i.forEach(function(t){o[r(t,e)]=o[e]})});var a={background:{backgroundImage:!0,backgroundPosition:!0,backgroundRepeat:!0,backgroundColor:!0},border:{borderWidth:!0,borderStyle:!0,borderColor:!0},borderBottom:{borderBottomWidth:!0,borderBottomStyle:!0,borderBottomColor:!0},borderLeft:{borderLeftWidth:!0,borderLeftStyle:!0,borderLeftColor:!0},borderRight:{borderRightWidth:!0,borderRightStyle:!0,borderRightColor:!0},borderTop:{borderTopWidth:!0,borderTopStyle:!0,borderTopColor:!0},font:{fontStyle:!0,fontVariant:!0,fontWeight:!0,fontSize:!0,lineHeight:!0,fontFamily:!0}},u={isUnitlessNumber:o,shorthandPropertyExpansions:a};t.exports=u},{}],5:[function(e,t,n){\"use strict\";var r=e(4),o=e(21),i=(e(106),e(111)),a=e(131),u=e(141),s=(e(150),u(function(e){return a(e)})),l=\"cssFloat\";o.canUseDOM&&void 0===document.documentElement.style.cssFloat&&(l=\"styleFloat\");var c={createMarkupForStyles:function(e){var t=\"\";for(var n in e)if(e.hasOwnProperty(n)){var r=e[n];null!=r&&(t+=s(n)+\":\",t+=i(n,r)+\";\")}return t||null},setValueForStyles:function(e,t){var n=e.style;for(var o in t)if(t.hasOwnProperty(o)){var a=i(o,t[o]);if(\"float\"===o&&(o=l),a)n[o]=a;else{var u=r.shorthandPropertyExpansions[o];if(u)for(var s in u)n[s]=\"\";else n[o]=\"\"}}}};t.exports=c},{106:106,111:111,131:131,141:141,150:150,21:21,4:4}],6:[function(e,t,n){\"use strict\";function r(){this._callbacks=null,this._contexts=null}var o=e(28),i=e(27),a=e(133);i(r.prototype,{enqueue:function(e,t){this._callbacks=this._callbacks||[],this._contexts=this._contexts||[],this._callbacks.push(e),this._contexts.push(t)},notifyAll:function(){var e=this._callbacks,t=this._contexts;if(e){a(e.length===t.length),this._callbacks=null,this._contexts=null;for(var n=0,r=e.length;r>n;n++)e[n].call(t[n]);e.length=0,t.length=0}},reset:function(){this._callbacks=null,this._contexts=null},destructor:function(){this.reset()}}),o.addPoolingTo(r),t.exports=r},{133:133,27:27,28:28}],7:[function(e,t,n){\"use strict\";function r(e){return\"SELECT\"===e.nodeName||\"INPUT\"===e.nodeName&&\"file\"===e.type}function o(e){var t=x.getPooled(T.change,R,e);E.accumulateTwoPhaseDispatches(t),_.batchedUpdates(i,t)}function i(e){C.enqueueEvents(e),C.processEventQueue()}function a(e,t){P=e,R=t,P.attachEvent(\"onchange\",o)}function u(){P&&(P.detachEvent(\"onchange\",o),P=null,R=null)}function s(e,t,n){return e===I.topChange?n:void 0}function l(e,t,n){e===I.topFocus?(u(),a(t,n)):e===I.topBlur&&u()}function c(e,t){P=e,R=t,w=e.value,O=Object.getOwnPropertyDescriptor(e.constructor.prototype,\"value\"),Object.defineProperty(P,\"value\",k),P.attachEvent(\"onpropertychange\",d)}function p(){P&&(delete P.value,P.detachEvent(\"onpropertychange\",d),P=null,R=null,w=null,O=null)}function d(e){if(\"value\"===e.propertyName){var t=e.srcElement.value;t!==w&&(w=t,o(e))}}function f(e,t,n){return e===I.topInput?n:void 0}function h(e,t,n){e===I.topFocus?(p(),c(t,n)):e===I.topBlur&&p()}function m(e,t,n){return e!==I.topSelectionChange&&e!==I.topKeyUp&&e!==I.topKeyDown||!P||P.value===w?void 0:(w=P.value,R)}function v(e){return\"INPUT\"===e.nodeName&&(\"checkbox\"===e.type||\"radio\"===e.type)}function g(e,t,n){return e===I.topClick?n:void 0}var y=e(15),C=e(17),E=e(20),b=e(21),_=e(85),x=e(93),D=e(134),M=e(136),N=e(139),I=y.topLevelTypes,T={change:{phasedRegistrationNames:{bubbled:N({onChange:null}),captured:N({onChangeCapture:null})},dependencies:[I.topBlur,I.topChange,I.topClick,I.topFocus,I.topInput,I.topKeyDown,I.topKeyUp,I.topSelectionChange]}},P=null,R=null,w=null,O=null,S=!1;b.canUseDOM&&(S=D(\"change\")&&(!(\"documentMode\"in document)||document.documentMode>8));var A=!1;b.canUseDOM&&(A=D(\"input\")&&(!(\"documentMode\"in document)||document.documentMode>9));var k={get:function(){return O.get.call(this)},set:function(e){w=\"\"+e,O.set.call(this,e)}},L={eventTypes:T,extractEvents:function(e,t,n,o){var i,a;if(r(t)?S?i=s:a=l:M(t)?A?i=f:(i=m,a=h):v(t)&&(i=g),i){var u=i(e,t,n);if(u){var c=x.getPooled(T.change,u,o);return E.accumulateTwoPhaseDispatches(c),c}}a&&a(e,t,n)}};t.exports=L},{134:134,136:136,139:139,15:15,17:17,20:20,21:21,85:85,93:93}],8:[function(e,t,n){\"use strict\";var r=0,o={createReactRootIndex:function(){return r++}};t.exports=o},{}],9:[function(e,t,n){\"use strict\";function r(e,t,n){e.insertBefore(t,e.childNodes[n]||null)}var o=e(12),i=e(70),a=e(145),u=e(133),s={dangerouslyReplaceNodeWithMarkup:o.dangerouslyReplaceNodeWithMarkup,updateTextContent:a,processUpdates:function(e,t){for(var n,s=null,l=null,c=0;c<e.length;c++)if(n=e[c],n.type===i.MOVE_EXISTING||n.type===i.REMOVE_NODE){var p=n.fromIndex,d=n.parentNode.childNodes[p],f=n.parentID;u(d),s=s||{},s[f]=s[f]||[],s[f][p]=d,l=l||[],l.push(d)}var h=o.dangerouslyRenderMarkup(t);if(l)for(var m=0;m<l.length;m++)l[m].parentNode.removeChild(l[m]);for(var v=0;v<e.length;v++)switch(n=e[v],n.type){case i.INSERT_MARKUP:r(n.parentNode,h[n.markupIndex],n.toIndex);break;case i.MOVE_EXISTING:r(n.parentNode,s[n.parentID][n.fromIndex],n.toIndex);break;case i.TEXT_CONTENT:a(n.parentNode,n.textContent);break;case i.REMOVE_NODE:}}};t.exports=s},{12:12,133:133,145:145,70:70}],10:[function(e,t,n){\"use strict\";function r(e,t){return(e&t)===t}var o=e(133),i={MUST_USE_ATTRIBUTE:1,MUST_USE_PROPERTY:2,HAS_SIDE_EFFECTS:4,HAS_BOOLEAN_VALUE:8,HAS_NUMERIC_VALUE:16,HAS_POSITIVE_NUMERIC_VALUE:48,HAS_OVERLOADED_BOOLEAN_VALUE:64,injectDOMPropertyConfig:function(e){var t=e.Properties||{},n=e.DOMAttributeNames||{},a=e.DOMPropertyNames||{},s=e.DOMMutationMethods||{};e.isCustomAttribute&&u._isCustomAttributeFunctions.push(e.isCustomAttribute);for(var l in t){o(!u.isStandardName.hasOwnProperty(l)),u.isStandardName[l]=!0;var c=l.toLowerCase();if(u.getPossibleStandardName[c]=l,n.hasOwnProperty(l)){var p=n[l];u.getPossibleStandardName[p]=l,u.getAttributeName[l]=p}else u.getAttributeName[l]=c;u.getPropertyName[l]=a.hasOwnProperty(l)?a[l]:l,s.hasOwnProperty(l)?u.getMutationMethod[l]=s[l]:u.getMutationMethod[l]=null;var d=t[l];u.mustUseAttribute[l]=r(d,i.MUST_USE_ATTRIBUTE),u.mustUseProperty[l]=r(d,i.MUST_USE_PROPERTY),u.hasSideEffects[l]=r(d,i.HAS_SIDE_EFFECTS),u.hasBooleanValue[l]=r(d,i.HAS_BOOLEAN_VALUE),u.hasNumericValue[l]=r(d,i.HAS_NUMERIC_VALUE),u.hasPositiveNumericValue[l]=r(d,i.HAS_POSITIVE_NUMERIC_VALUE),u.hasOverloadedBooleanValue[l]=r(d,i.HAS_OVERLOADED_BOOLEAN_VALUE),o(!u.mustUseAttribute[l]||!u.mustUseProperty[l]),o(u.mustUseProperty[l]||!u.hasSideEffects[l]),o(!!u.hasBooleanValue[l]+!!u.hasNumericValue[l]+!!u.hasOverloadedBooleanValue[l]<=1)}}},a={},u={ID_ATTRIBUTE_NAME:\"data-reactid\",isStandardName:{},getPossibleStandardName:{},getAttributeName:{},getPropertyName:{},getMutationMethod:{},mustUseAttribute:{},mustUseProperty:{},hasSideEffects:{},hasBooleanValue:{},hasNumericValue:{},hasPositiveNumericValue:{},hasOverloadedBooleanValue:{},_isCustomAttributeFunctions:[],isCustomAttribute:function(e){for(var t=0;t<u._isCustomAttributeFunctions.length;t++){var n=u._isCustomAttributeFunctions[t];if(n(e))return!0}return!1},getDefaultValueForProperty:function(e,t){var n,r=a[e];return r||(a[e]=r={}),t in r||(n=document.createElement(e),r[t]=n[t]),r[t]},injection:i};t.exports=u},{133:133}],11:[function(e,t,n){\"use strict\";function r(e,t){return null==t||o.hasBooleanValue[e]&&!t||o.hasNumericValue[e]&&isNaN(t)||o.hasPositiveNumericValue[e]&&1>t||o.hasOverloadedBooleanValue[e]&&t===!1}var o=e(10),i=e(143),a=(e(150),{createMarkupForID:function(e){return o.ID_ATTRIBUTE_NAME+\"=\"+i(e)},createMarkupForProperty:function(e,t){if(o.isStandardName.hasOwnProperty(e)&&o.isStandardName[e]){if(r(e,t))return\"\";var n=o.getAttributeName[e];return o.hasBooleanValue[e]||o.hasOverloadedBooleanValue[e]&&t===!0?n:n+\"=\"+i(t)}return o.isCustomAttribute(e)?null==t?\"\":e+\"=\"+i(t):null},setValueForProperty:function(e,t,n){if(o.isStandardName.hasOwnProperty(t)&&o.isStandardName[t]){var i=o.getMutationMethod[t];if(i)i(e,n);else if(r(t,n))this.deleteValueForProperty(e,t);else if(o.mustUseAttribute[t])e.setAttribute(o.getAttributeName[t],\"\"+n);else{var a=o.getPropertyName[t];o.hasSideEffects[t]&&\"\"+e[a]==\"\"+n||(e[a]=n)}}else o.isCustomAttribute(t)&&(null==n?e.removeAttribute(t):e.setAttribute(t,\"\"+n))},deleteValueForProperty:function(e,t){if(o.isStandardName.hasOwnProperty(t)&&o.isStandardName[t]){var n=o.getMutationMethod[t];if(n)n(e,void 0);else if(o.mustUseAttribute[t])e.removeAttribute(o.getAttributeName[t]);else{var r=o.getPropertyName[t],i=o.getDefaultValueForProperty(e.nodeName,r);o.hasSideEffects[t]&&\"\"+e[r]===i||(e[r]=i)}}else o.isCustomAttribute(t)&&e.removeAttribute(t)}});t.exports=a},{10:10,143:143,150:150}],12:[function(e,t,n){\"use strict\";function r(e){return e.substring(1,e.indexOf(\" \"))}var o=e(21),i=e(110),a=e(112),u=e(125),s=e(133),l=/^(<[^ \\/>]+)/,c=\"data-danger-index\",p={dangerouslyRenderMarkup:function(e){s(o.canUseDOM);for(var t,n={},p=0;p<e.length;p++)s(e[p]),t=r(e[p]),t=u(t)?t:\"*\",n[t]=n[t]||[],n[t][p]=e[p];var d=[],f=0;for(t in n)if(n.hasOwnProperty(t)){var h,m=n[t];for(h in m)if(m.hasOwnProperty(h)){var v=m[h];m[h]=v.replace(l,\"$1 \"+c+'=\"'+h+'\" ')}for(var g=i(m.join(\"\"),a),y=0;y<g.length;++y){var C=g[y];C.hasAttribute&&C.hasAttribute(c)&&(h=+C.getAttribute(c),C.removeAttribute(c),s(!d.hasOwnProperty(h)),d[h]=C,f+=1)}}return s(f===d.length),s(d.length===e.length),d},dangerouslyReplaceNodeWithMarkup:function(e,t){s(o.canUseDOM),s(t),s(\"html\"!==e.tagName.toLowerCase());var n=i(t,a)[0];e.parentNode.replaceChild(n,e)}};t.exports=p},{110:110,112:112,125:125,133:133,21:21}],13:[function(e,t,n){\"use strict\";var r=e(139),o=[r({ResponderEventPlugin:null}),r({SimpleEventPlugin:null}),r({TapEventPlugin:null}),r({EnterLeaveEventPlugin:null}),r({ChangeEventPlugin:null}),r({SelectEventPlugin:null}),r({BeforeInputEventPlugin:null}),r({AnalyticsEventPlugin:null}),r({MobileSafariClickEventPlugin:null})];t.exports=o},{139:139}],14:[function(e,t,n){\"use strict\";var r=e(15),o=e(20),i=e(97),a=e(68),u=e(139),s=r.topLevelTypes,l=a.getFirstReactDOM,c={mouseEnter:{registrationName:u({onMouseEnter:null}),dependencies:[s.topMouseOut,s.topMouseOver]},mouseLeave:{registrationName:u({onMouseLeave:null}),dependencies:[s.topMouseOut,s.topMouseOver]}},p=[null,null],d={eventTypes:c,extractEvents:function(e,t,n,r){if(e===s.topMouseOver&&(r.relatedTarget||r.fromElement))return null;if(e!==s.topMouseOut&&e!==s.topMouseOver)return null;var u;if(t.window===t)u=t;else{var d=t.ownerDocument;u=d?d.defaultView||d.parentWindow:window}var f,h;if(e===s.topMouseOut?(f=t,h=l(r.relatedTarget||r.toElement)||u):(f=u,h=t),f===h)return null;var m=f?a.getID(f):\"\",v=h?a.getID(h):\"\",g=i.getPooled(c.mouseLeave,m,r);g.type=\"mouseleave\",g.target=f,g.relatedTarget=h;var y=i.getPooled(c.mouseEnter,v,r);return y.type=\"mouseenter\",y.target=h,y.relatedTarget=f,o.accumulateEnterLeaveDispatches(g,y,m,v),p[0]=g,p[1]=y,p}};t.exports=d},{139:139,15:15,20:20,68:68,97:97}],15:[function(e,t,n){\"use strict\";var r=e(138),o=r({bubbled:null,captured:null}),i=r({topBlur:null,topChange:null,topClick:null,topCompositionEnd:null,topCompositionStart:null,topCompositionUpdate:null,topContextMenu:null,topCopy:null,topCut:null,topDoubleClick:null,topDrag:null,topDragEnd:null,topDragEnter:null,topDragExit:null,topDragLeave:null,topDragOver:null,topDragStart:null,topDrop:null,topError:null,topFocus:null,topInput:null,topKeyDown:null,topKeyPress:null,topKeyUp:null,topLoad:null,topMouseDown:null,topMouseMove:null,topMouseOut:null,topMouseOver:null,topMouseUp:null,topPaste:null,topReset:null,topScroll:null,topSelectionChange:null,topSubmit:null,topTextInput:null,topTouchCancel:null,topTouchEnd:null,topTouchMove:null,topTouchStart:null,topWheel:null}),a={topLevelTypes:i,PropagationPhases:o};t.exports=a},{138:138}],16:[function(e,t,n){var r=e(112),o={listen:function(e,t,n){return e.addEventListener?(e.addEventListener(t,n,!1),{remove:function(){e.removeEventListener(t,n,!1)}}):e.attachEvent?(e.attachEvent(\"on\"+t,n),{remove:function(){e.detachEvent(\"on\"+t,n)}}):void 0},capture:function(e,t,n){return e.addEventListener?(e.addEventListener(t,n,!0),{remove:function(){e.removeEventListener(t,n,!0)}}):{remove:r}},registerDefault:function(){}};t.exports=o},{112:112}],17:[function(e,t,n){\"use strict\";var r=e(18),o=e(19),i=e(103),a=e(118),u=e(133),s={},l=null,c=function(e){if(e){var t=o.executeDispatch,n=r.getPluginModuleForEvent(e);n&&n.executeDispatch&&(t=n.executeDispatch),o.executeDispatchesInOrder(e,t),e.isPersistent()||e.constructor.release(e)}},p=null,d={injection:{injectMount:o.injection.injectMount,injectInstanceHandle:function(e){p=e},getInstanceHandle:function(){return p},injectEventPluginOrder:r.injectEventPluginOrder,injectEventPluginsByName:r.injectEventPluginsByName},eventNameDispatchConfigs:r.eventNameDispatchConfigs,registrationNameModules:r.registrationNameModules,putListener:function(e,t,n){u(!n||\"function\"==typeof n);var r=s[t]||(s[t]={});r[e]=n},getListener:function(e,t){var n=s[t];return n&&n[e]},deleteListener:function(e,t){var n=s[t];n&&delete n[e]},deleteAllListeners:function(e){for(var t in s)delete s[t][e]},extractEvents:function(e,t,n,o){for(var a,u=r.plugins,s=0,l=u.length;l>s;s++){var c=u[s];if(c){var p=c.extractEvents(e,t,n,o);p&&(a=i(a,p))}}return a},enqueueEvents:function(e){e&&(l=i(l,e))},processEventQueue:function(){var e=l;l=null,a(e,c),u(!l)},__purge:function(){s={}},__getListenerBank:function(){return s}};t.exports=d},{103:103,118:118,133:133,18:18,19:19}],18:[function(e,t,n){\"use strict\";function r(){if(u)for(var e in s){var t=s[e],n=u.indexOf(e);if(a(n>-1),!l.plugins[n]){a(t.extractEvents),l.plugins[n]=t;var r=t.eventTypes;for(var i in r)a(o(r[i],t,i))}}}function o(e,t,n){a(!l.eventNameDispatchConfigs.hasOwnProperty(n)),l.eventNameDispatchConfigs[n]=e;var r=e.phasedRegistrationNames;if(r){for(var o in r)if(r.hasOwnProperty(o)){var u=r[o];i(u,t,n)}return!0}return e.registrationName?(i(e.registrationName,t,n),!0):!1}function i(e,t,n){a(!l.registrationNameModules[e]),l.registrationNameModules[e]=t,l.registrationNameDependencies[e]=t.eventTypes[n].dependencies}var a=e(133),u=null,s={},l={plugins:[],eventNameDispatchConfigs:{},registrationNameModules:{},registrationNameDependencies:{},injectEventPluginOrder:function(e){a(!u),u=Array.prototype.slice.call(e),r()},injectEventPluginsByName:function(e){var t=!1;for(var n in e)if(e.hasOwnProperty(n)){var o=e[n];s.hasOwnProperty(n)&&s[n]===o||(a(!s[n]),s[n]=o,t=!0)}t&&r()},getPluginModuleForEvent:function(e){var t=e.dispatchConfig;if(t.registrationName)return l.registrationNameModules[t.registrationName]||null;for(var n in t.phasedRegistrationNames)if(t.phasedRegistrationNames.hasOwnProperty(n)){var r=l.registrationNameModules[t.phasedRegistrationNames[n]];if(r)return r}return null},_resetEventPlugins:function(){u=null;for(var e in s)s.hasOwnProperty(e)&&delete s[e];l.plugins.length=0;var t=l.eventNameDispatchConfigs;for(var n in t)t.hasOwnProperty(n)&&delete t[n];var r=l.registrationNameModules;for(var o in r)r.hasOwnProperty(o)&&delete r[o]}};t.exports=l},{133:133}],19:[function(e,t,n){\"use strict\";function r(e){return e===v.topMouseUp||e===v.topTouchEnd||e===v.topTouchCancel}function o(e){return e===v.topMouseMove||e===v.topTouchMove}function i(e){return e===v.topMouseDown||e===v.topTouchStart}function a(e,t){var n=e._dispatchListeners,r=e._dispatchIDs;if(Array.isArray(n))for(var o=0;o<n.length&&!e.isPropagationStopped();o++)t(e,n[o],r[o]);else n&&t(e,n,r)}function u(e,t,n){e.currentTarget=m.Mount.getNode(n);var r=t(e,n);return e.currentTarget=null,r}function s(e,t){a(e,t),e._dispatchListeners=null,e._dispatchIDs=null}function l(e){var t=e._dispatchListeners,n=e._dispatchIDs;if(Array.isArray(t)){for(var r=0;r<t.length&&!e.isPropagationStopped();r++)if(t[r](e,n[r]))return n[r]}else if(t&&t(e,n))return n;return null}function c(e){var t=l(e);return e._dispatchIDs=null,e._dispatchListeners=null,t}function p(e){var t=e._dispatchListeners,n=e._dispatchIDs;h(!Array.isArray(t));var r=t?t(e,n):null;return e._dispatchListeners=null,e._dispatchIDs=null,r}function d(e){return!!e._dispatchListeners}var f=e(15),h=e(133),m={Mount:null,injectMount:function(e){m.Mount=e}},v=f.topLevelTypes,g={isEndish:r,isMoveish:o,isStartish:i,executeDirectDispatch:p,executeDispatch:u,executeDispatchesInOrder:s,executeDispatchesInOrderStopAtTrue:c,hasDispatches:d,injection:m,useTouchEvents:!1};t.exports=g},{133:133,15:15}],20:[function(e,t,n){\"use strict\";function r(e,t,n){var r=t.dispatchConfig.phasedRegistrationNames[n];return v(e,r)}function o(e,t,n){var o=t?m.bubbled:m.captured,i=r(e,n,o);i&&(n._dispatchListeners=f(n._dispatchListeners,i),n._dispatchIDs=f(n._dispatchIDs,e))}function i(e){e&&e.dispatchConfig.phasedRegistrationNames&&d.injection.getInstanceHandle().traverseTwoPhase(e.dispatchMarker,o,e)}function a(e,t,n){if(n&&n.dispatchConfig.registrationName){var r=n.dispatchConfig.registrationName,o=v(e,r);o&&(n._dispatchListeners=f(n._dispatchListeners,o),n._dispatchIDs=f(n._dispatchIDs,e))}}function u(e){e&&e.dispatchConfig.registrationName&&a(e.dispatchMarker,null,e)}function s(e){h(e,i)}function l(e,t,n,r){d.injection.getInstanceHandle().traverseEnterLeave(n,r,a,e,t)}function c(e){h(e,u)}var p=e(15),d=e(17),f=e(103),h=e(118),m=p.PropagationPhases,v=d.getListener,g={accumulateTwoPhaseDispatches:s,accumulateDirectDispatches:c,accumulateEnterLeaveDispatches:l};t.exports=g},{103:103,118:118,15:15,17:17}],21:[function(e,t,n){\"use strict\";var r=!(\"undefined\"==typeof window||!window.document||!window.document.createElement),o={canUseDOM:r,canUseWorkers:\"undefined\"!=typeof Worker,canUseEventListeners:r&&!(!window.addEventListener&&!window.attachEvent),canUseViewport:r&&!!window.screen,isInWorker:!r};t.exports=o},{}],22:[function(e,t,n){\"use strict\";function r(e){this._root=e,this._startText=this.getText(),this._fallbackText=null}var o=e(28),i=e(27),a=e(128);i(r.prototype,{getText:function(){return\"value\"in this._root?this._root.value:this._root[a()]},getData:function(){if(this._fallbackText)return this._fallbackText;var e,t,n=this._startText,r=n.length,o=this.getText(),i=o.length;for(e=0;r>e&&n[e]===o[e];e++);var a=r-e;for(t=1;a>=t&&n[r-t]===o[i-t];t++);var u=t>1?1-t:void 0;return this._fallbackText=o.slice(e,u),this._fallbackText}}),o.addPoolingTo(r),t.exports=r},{128:128,27:27,28:28}],23:[function(e,t,n){\"use strict\";var r,o=e(10),i=e(21),a=o.injection.MUST_USE_ATTRIBUTE,u=o.injection.MUST_USE_PROPERTY,s=o.injection.HAS_BOOLEAN_VALUE,l=o.injection.HAS_SIDE_EFFECTS,c=o.injection.HAS_NUMERIC_VALUE,p=o.injection.HAS_POSITIVE_NUMERIC_VALUE,d=o.injection.HAS_OVERLOADED_BOOLEAN_VALUE;if(i.canUseDOM){var f=document.implementation;r=f&&f.hasFeature&&f.hasFeature(\"http://www.w3.org/TR/SVG11/feature#BasicStructure\",\"1.1\")}var h={isCustomAttribute:RegExp.prototype.test.bind(/^(data|aria)-[a-z_][a-z\\d_.\\-]*$/),Properties:{accept:null,acceptCharset:null,accessKey:null,action:null,allowFullScreen:a|s,allowTransparency:a,alt:null,async:s,autoComplete:null,autoPlay:s,cellPadding:null,cellSpacing:null,charSet:a,checked:u|s,classID:a,className:r?a:u,cols:a|p,colSpan:null,content:null,contentEditable:null,contextMenu:a,controls:u|s,coords:null,crossOrigin:null,data:null,dateTime:a,defer:s,dir:null,disabled:a|s,download:d,draggable:null,encType:null,form:a,formAction:a,formEncType:a,formMethod:a,formNoValidate:s,formTarget:a,frameBorder:a,headers:null,height:a,hidden:a|s,high:null,href:null,hrefLang:null,htmlFor:null,httpEquiv:null,icon:null,id:u,label:null,lang:null,list:a,loop:u|s,low:null,manifest:a,marginHeight:null,marginWidth:null,max:null,maxLength:a,media:a,mediaGroup:null,method:null,min:null,multiple:u|s,muted:u|s,name:null,noValidate:s,open:s,optimum:null,pattern:null,placeholder:null,poster:null,preload:null,radioGroup:null,readOnly:u|s,rel:null,required:s,role:a,rows:a|p,rowSpan:null,sandbox:null,scope:null,scoped:s,scrolling:null,seamless:a|s,selected:u|s,shape:null,size:a|p,sizes:a,span:p,spellCheck:null,src:null,srcDoc:u,srcSet:a,start:c,step:null,style:null,tabIndex:null,target:null,title:null,type:null,useMap:null,value:u|l,width:a,wmode:a,autoCapitalize:null,autoCorrect:null,itemProp:a,itemScope:a|s,itemType:a,itemID:a,itemRef:a,property:null,unselectable:a},DOMAttributeNames:{acceptCharset:\"accept-charset\",className:\"class\",htmlFor:\"for\",httpEquiv:\"http-equiv\"},DOMPropertyNames:{autoCapitalize:\"autocapitalize\",autoComplete:\"autocomplete\",autoCorrect:\"autocorrect\",autoFocus:\"autofocus\",autoPlay:\"autoplay\",encType:\"encoding\",hrefLang:\"hreflang\",radioGroup:\"radiogroup\",spellCheck:\"spellcheck\",srcDoc:\"srcdoc\",srcSet:\"srcset\"}};t.exports=h},{10:10,21:21}],24:[function(e,t,n){\"use strict\";function r(e){l(null==e.props.checkedLink||null==e.props.valueLink)}function o(e){r(e),l(null==e.props.value&&null==e.props.onChange)}function i(e){r(e),l(null==e.props.checked&&null==e.props.onChange)}function a(e){this.props.valueLink.requestChange(e.target.value)}function u(e){this.props.checkedLink.requestChange(e.target.checked)}var s=e(76),l=e(133),c={button:!0,checkbox:!0,image:!0,hidden:!0,radio:!0,reset:!0,submit:!0},p={Mixin:{propTypes:{value:function(e,t,n){return!e[t]||c[e.type]||e.onChange||e.readOnly||e.disabled?null:new Error(\"You provided a `value` prop to a form field without an `onChange` handler. This will render a read-only field. If the field should be mutable use `defaultValue`. Otherwise, set either `onChange` or `readOnly`.\")},checked:function(e,t,n){return!e[t]||e.onChange||e.readOnly||e.disabled?null:new Error(\"You provided a `checked` prop to a form field without an `onChange` handler. This will render a read-only field. If the field should be mutable use `defaultChecked`. Otherwise, set either `onChange` or `readOnly`.\")},onChange:s.func}},getValue:function(e){return e.props.valueLink?(o(e),e.props.valueLink.value):e.props.value},getChecked:function(e){return e.props.checkedLink?(i(e),e.props.checkedLink.value):e.props.checked},getOnChange:function(e){return e.props.valueLink?(o(e),a):e.props.checkedLink?(i(e),u):e.props.onChange}};t.exports=p},{133:133,76:76}],25:[function(e,t,n){\"use strict\";function r(e){e.remove()}var o=e(30),i=e(103),a=e(118),u=e(133),s={trapBubbledEvent:function(e,t){u(this.isMounted());var n=this.getDOMNode();u(n);var r=o.trapBubbledEvent(e,t,n);this._localEventListeners=i(this._localEventListeners,r)},componentWillUnmount:function(){this._localEventListeners&&a(this._localEventListeners,r)}};t.exports=s},{103:103,118:118,133:133,30:30}],26:[function(e,t,n){\"use strict\";var r=e(15),o=e(112),i=r.topLevelTypes,a={eventTypes:null,extractEvents:function(e,t,n,r){if(e===i.topTouchStart){var a=r.target;a&&!a.onclick&&(a.onclick=o)}}};t.exports=a},{112:112,15:15}],27:[function(e,t,n){\"use strict\";function r(e,t){if(null==e)throw new TypeError(\"Object.assign target cannot be null or undefined\");for(var n=Object(e),r=Object.prototype.hasOwnProperty,o=1;o<arguments.length;o++){var i=arguments[o];if(null!=i){var a=Object(i);for(var u in a)r.call(a,u)&&(n[u]=a[u])}}return n}t.exports=r},{}],28:[function(e,t,n){\"use strict\";var r=e(133),o=function(e){var t=this;if(t.instancePool.length){var n=t.instancePool.pop();return t.call(n,e),n}return new t(e)},i=function(e,t){var n=this;if(n.instancePool.length){var r=n.instancePool.pop();return n.call(r,e,t),r}return new n(e,t)},a=function(e,t,n){var r=this;if(r.instancePool.length){var o=r.instancePool.pop();return r.call(o,e,t,n),o}return new r(e,t,n)},u=function(e,t,n,r,o){var i=this;if(i.instancePool.length){var a=i.instancePool.pop();return i.call(a,e,t,n,r,o),a}return new i(e,t,n,r,o)},s=function(e){var t=this;r(e instanceof t),e.destructor&&e.destructor(),t.instancePool.length<t.poolSize&&t.instancePool.push(e)},l=10,c=o,p=function(e,t){var n=e;return n.instancePool=[],n.getPooled=t||c,n.poolSize||(n.poolSize=l),n.release=s,n},d={addPoolingTo:p,oneArgumentPooler:o,twoArgumentPooler:i,threeArgumentPooler:a,fiveArgumentPooler:u};t.exports=d},{133:133}],29:[function(e,t,n){\"use strict\";var r=e(115),o={getDOMNode:function(){return r(this)}};t.exports=o},{115:115}],30:[function(e,t,n){\"use strict\";function r(e){return Object.prototype.hasOwnProperty.call(e,m)||(e[m]=f++,p[e[m]]={}),p[e[m]]}var o=e(15),i=e(17),a=e(18),u=e(59),s=e(102),l=e(27),c=e(134),p={},d=!1,f=0,h={topBlur:\"blur\",topChange:\"change\",topClick:\"click\",topCompositionEnd:\"compositionend\",topCompositionStart:\"compositionstart\",topCompositionUpdate:\"compositionupdate\",topContextMenu:\"contextmenu\",topCopy:\"copy\",topCut:\"cut\",topDoubleClick:\"dblclick\",topDrag:\"drag\",topDragEnd:\"dragend\",topDragEnter:\"dragenter\",topDragExit:\"dragexit\",topDragLeave:\"dragleave\",topDragOver:\"dragover\",topDragStart:\"dragstart\",topDrop:\"drop\",topFocus:\"focus\",topInput:\"input\",topKeyDown:\"keydown\",topKeyPress:\"keypress\",topKeyUp:\"keyup\",topMouseDown:\"mousedown\",topMouseMove:\"mousemove\",topMouseOut:\"mouseout\",topMouseOver:\"mouseover\",topMouseUp:\"mouseup\",topPaste:\"paste\",topScroll:\"scroll\",topSelectionChange:\"selectionchange\",topTextInput:\"textInput\",topTouchCancel:\"touchcancel\",topTouchEnd:\"touchend\",topTouchMove:\"touchmove\",topTouchStart:\"touchstart\",topWheel:\"wheel\"},m=\"_reactListenersID\"+String(Math.random()).slice(2),v=l({},u,{ReactEventListener:null,injection:{injectReactEventListener:function(e){e.setHandleTopLevel(v.handleTopLevel),v.ReactEventListener=e}},setEnabled:function(e){v.ReactEventListener&&v.ReactEventListener.setEnabled(e)},isEnabled:function(){return!(!v.ReactEventListener||!v.ReactEventListener.isEnabled())},listenTo:function(e,t){for(var n=t,i=r(n),u=a.registrationNameDependencies[e],s=o.topLevelTypes,l=0,p=u.length;p>l;l++){var d=u[l];i.hasOwnProperty(d)&&i[d]||(d===s.topWheel?c(\"wheel\")?v.ReactEventListener.trapBubbledEvent(s.topWheel,\"wheel\",n):c(\"mousewheel\")?v.ReactEventListener.trapBubbledEvent(s.topWheel,\"mousewheel\",n):v.ReactEventListener.trapBubbledEvent(s.topWheel,\"DOMMouseScroll\",n):d===s.topScroll?c(\"scroll\",!0)?v.ReactEventListener.trapCapturedEvent(s.topScroll,\"scroll\",n):v.ReactEventListener.trapBubbledEvent(s.topScroll,\"scroll\",v.ReactEventListener.WINDOW_HANDLE):d===s.topFocus||d===s.topBlur?(c(\"focus\",!0)?(v.ReactEventListener.trapCapturedEvent(s.topFocus,\"focus\",n),v.ReactEventListener.trapCapturedEvent(s.topBlur,\"blur\",n)):c(\"focusin\")&&(v.ReactEventListener.trapBubbledEvent(s.topFocus,\"focusin\",n),v.ReactEventListener.trapBubbledEvent(s.topBlur,\"focusout\",n)),i[s.topBlur]=!0,i[s.topFocus]=!0):h.hasOwnProperty(d)&&v.ReactEventListener.trapBubbledEvent(d,h[d],n),i[d]=!0)}},trapBubbledEvent:function(e,t,n){\nreturn v.ReactEventListener.trapBubbledEvent(e,t,n)},trapCapturedEvent:function(e,t,n){return v.ReactEventListener.trapCapturedEvent(e,t,n)},ensureScrollValueMonitoring:function(){if(!d){var e=s.refreshScrollValues;v.ReactEventListener.monitorScrollValue(e),d=!0}},eventNameDispatchConfigs:i.eventNameDispatchConfigs,registrationNameModules:i.registrationNameModules,putListener:i.putListener,getListener:i.getListener,deleteListener:i.deleteListener,deleteAllListeners:i.deleteAllListeners});t.exports=v},{102:102,134:134,15:15,17:17,18:18,27:27,59:59}],31:[function(e,t,n){\"use strict\";var r=e(79),o=e(116),i=e(132),a=e(147),u={instantiateChildren:function(e,t,n){var r=o(e);for(var a in r)if(r.hasOwnProperty(a)){var u=r[a],s=i(u,null);r[a]=s}return r},updateChildren:function(e,t,n,u){var s=o(t);if(!s&&!e)return null;var l;for(l in s)if(s.hasOwnProperty(l)){var c=e&&e[l],p=c&&c._currentElement,d=s[l];if(a(p,d))r.receiveComponent(c,d,n,u),s[l]=c;else{c&&r.unmountComponent(c,l);var f=i(d,null);s[l]=f}}for(l in e)!e.hasOwnProperty(l)||s&&s.hasOwnProperty(l)||r.unmountComponent(e[l]);return s},unmountChildren:function(e){for(var t in e){var n=e[t];r.unmountComponent(n)}}};t.exports=u},{116:116,132:132,147:147,79:79}],32:[function(e,t,n){\"use strict\";function r(e,t){this.forEachFunction=e,this.forEachContext=t}function o(e,t,n,r){var o=e;o.forEachFunction.call(o.forEachContext,t,r)}function i(e,t,n){if(null==e)return e;var i=r.getPooled(t,n);f(e,o,i),r.release(i)}function a(e,t,n){this.mapResult=e,this.mapFunction=t,this.mapContext=n}function u(e,t,n,r){var o=e,i=o.mapResult,a=!i.hasOwnProperty(n);if(a){var u=o.mapFunction.call(o.mapContext,t,r);i[n]=u}}function s(e,t,n){if(null==e)return e;var r={},o=a.getPooled(r,t,n);return f(e,u,o),a.release(o),d.create(r)}function l(e,t,n,r){return null}function c(e,t){return f(e,l,null)}var p=e(28),d=e(61),f=e(149),h=(e(150),p.twoArgumentPooler),m=p.threeArgumentPooler;p.addPoolingTo(r,h),p.addPoolingTo(a,m);var v={forEach:i,map:s,count:c};t.exports=v},{149:149,150:150,28:28,61:61}],33:[function(e,t,n){\"use strict\";function r(e,t){var n=D.hasOwnProperty(t)?D[t]:null;N.hasOwnProperty(t)&&y(n===_.OVERRIDE_BASE),e.hasOwnProperty(t)&&y(n===_.DEFINE_MANY||n===_.DEFINE_MANY_MERGED)}function o(e,t){if(t){y(\"function\"!=typeof t),y(!d.isValidElement(t));var n=e.prototype;t.hasOwnProperty(b)&&M.mixins(e,t.mixins);for(var o in t)if(t.hasOwnProperty(o)&&o!==b){var i=t[o];if(r(n,o),M.hasOwnProperty(o))M[o](e,i);else{var a=D.hasOwnProperty(o),l=n.hasOwnProperty(o),c=i&&i.__reactDontBind,p=\"function\"==typeof i,f=p&&!a&&!l&&!c;if(f)n.__reactAutoBindMap||(n.__reactAutoBindMap={}),n.__reactAutoBindMap[o]=i,n[o]=i;else if(l){var h=D[o];y(a&&(h===_.DEFINE_MANY_MERGED||h===_.DEFINE_MANY)),h===_.DEFINE_MANY_MERGED?n[o]=u(n[o],i):h===_.DEFINE_MANY&&(n[o]=s(n[o],i))}else n[o]=i}}}}function i(e,t){if(t)for(var n in t){var r=t[n];if(t.hasOwnProperty(n)){var o=n in M;y(!o);var i=n in e;y(!i),e[n]=r}}}function a(e,t){y(e&&t&&\"object\"==typeof e&&\"object\"==typeof t);for(var n in t)t.hasOwnProperty(n)&&(y(void 0===e[n]),e[n]=t[n]);return e}function u(e,t){return function(){var n=e.apply(this,arguments),r=t.apply(this,arguments);if(null==n)return r;if(null==r)return n;var o={};return a(o,n),a(o,r),o}}function s(e,t){return function(){e.apply(this,arguments),t.apply(this,arguments)}}function l(e,t){var n=t.bind(e);return n}function c(e){for(var t in e.__reactAutoBindMap)if(e.__reactAutoBindMap.hasOwnProperty(t)){var n=e.__reactAutoBindMap[t];e[t]=l(e,f.guard(n,e.constructor.displayName+\".\"+t))}}var p=e(34),d=(e(39),e(55)),f=e(58),h=e(65),m=e(66),v=(e(75),e(74),e(84)),g=e(27),y=e(133),C=e(138),E=e(139),b=(e(150),E({mixins:null})),_=C({DEFINE_ONCE:null,DEFINE_MANY:null,OVERRIDE_BASE:null,DEFINE_MANY_MERGED:null}),x=[],D={mixins:_.DEFINE_MANY,statics:_.DEFINE_MANY,propTypes:_.DEFINE_MANY,contextTypes:_.DEFINE_MANY,childContextTypes:_.DEFINE_MANY,getDefaultProps:_.DEFINE_MANY_MERGED,getInitialState:_.DEFINE_MANY_MERGED,getChildContext:_.DEFINE_MANY_MERGED,render:_.DEFINE_ONCE,componentWillMount:_.DEFINE_MANY,componentDidMount:_.DEFINE_MANY,componentWillReceiveProps:_.DEFINE_MANY,shouldComponentUpdate:_.DEFINE_ONCE,componentWillUpdate:_.DEFINE_MANY,componentDidUpdate:_.DEFINE_MANY,componentWillUnmount:_.DEFINE_MANY,updateComponent:_.OVERRIDE_BASE},M={displayName:function(e,t){e.displayName=t},mixins:function(e,t){if(t)for(var n=0;n<t.length;n++)o(e,t[n])},childContextTypes:function(e,t){e.childContextTypes=g({},e.childContextTypes,t)},contextTypes:function(e,t){e.contextTypes=g({},e.contextTypes,t)},getDefaultProps:function(e,t){e.getDefaultProps?e.getDefaultProps=u(e.getDefaultProps,t):e.getDefaultProps=t},propTypes:function(e,t){e.propTypes=g({},e.propTypes,t)},statics:function(e,t){i(e,t)}},N={replaceState:function(e,t){v.enqueueReplaceState(this,e),t&&v.enqueueCallback(this,t)},isMounted:function(){var e=h.get(this);return e&&e!==m.currentlyMountingInstance},setProps:function(e,t){v.enqueueSetProps(this,e),t&&v.enqueueCallback(this,t)},replaceProps:function(e,t){v.enqueueReplaceProps(this,e),t&&v.enqueueCallback(this,t)}},I=function(){};g(I.prototype,p.prototype,N);var T={createClass:function(e){var t=function(e,t){this.__reactAutoBindMap&&c(this),this.props=e,this.context=t,this.state=null;var n=this.getInitialState?this.getInitialState():null;y(\"object\"==typeof n&&!Array.isArray(n)),this.state=n};t.prototype=new I,t.prototype.constructor=t,x.forEach(o.bind(null,t)),o(t,e),t.getDefaultProps&&(t.defaultProps=t.getDefaultProps()),y(t.prototype.render);for(var n in D)t.prototype[n]||(t.prototype[n]=null);return t.type=t,t},injection:{injectMixin:function(e){x.push(e)}}};t.exports=T},{133:133,138:138,139:139,150:150,27:27,34:34,39:39,55:55,58:58,65:65,66:66,74:74,75:75,84:84}],34:[function(e,t,n){\"use strict\";function r(e,t){this.props=e,this.context=t}{var o=e(84),i=e(133);e(150)}r.prototype.setState=function(e,t){i(\"object\"==typeof e||\"function\"==typeof e||null==e),o.enqueueSetState(this,e),t&&o.enqueueCallback(this,t)},r.prototype.forceUpdate=function(e){o.enqueueForceUpdate(this),e&&o.enqueueCallback(this,e)};t.exports=r},{133:133,150:150,84:84}],35:[function(e,t,n){\"use strict\";var r=e(44),o=e(68),i={processChildrenUpdates:r.dangerouslyProcessChildrenUpdates,replaceNodeWithMarkupByID:r.dangerouslyReplaceNodeWithMarkupByID,unmountIDFromEnvironment:function(e){o.purgeID(e)}};t.exports=i},{44:44,68:68}],36:[function(e,t,n){\"use strict\";var r=e(133),o=!1,i={unmountIDFromEnvironment:null,replaceNodeWithMarkupByID:null,processChildrenUpdates:null,injection:{injectEnvironment:function(e){r(!o),i.unmountIDFromEnvironment=e.unmountIDFromEnvironment,i.replaceNodeWithMarkupByID=e.replaceNodeWithMarkupByID,i.processChildrenUpdates=e.processChildrenUpdates,o=!0}}};t.exports=i},{133:133}],37:[function(e,t,n){\"use strict\";function r(e){var t=e._currentElement._owner||null;if(t){var n=t.getName();if(n)return\" Check the render method of `\"+n+\"`.\"}return\"\"}var o=e(36),i=e(38),a=e(39),u=e(55),s=(e(56),e(65)),l=e(66),c=e(71),p=e(73),d=e(75),f=(e(74),e(79)),h=e(85),m=e(27),v=e(113),g=e(133),y=e(147),C=(e(150),1),E={construct:function(e){this._currentElement=e,this._rootNodeID=null,this._instance=null,this._pendingElement=null,this._pendingStateQueue=null,this._pendingReplaceState=!1,this._pendingForceUpdate=!1,this._renderedComponent=null,this._context=null,this._mountOrder=0,this._isTopLevel=!1,this._pendingCallbacks=null},mountComponent:function(e,t,n){this._context=n,this._mountOrder=C++,this._rootNodeID=e;var r=this._processProps(this._currentElement.props),o=this._processContext(this._currentElement._context),i=c.getComponentClassForElement(this._currentElement),a=new i(r,o);a.props=r,a.context=o,a.refs=v,this._instance=a,s.set(a,this);var u=a.state;void 0===u&&(a.state=u=null),g(\"object\"==typeof u&&!Array.isArray(u)),this._pendingStateQueue=null,this._pendingReplaceState=!1,this._pendingForceUpdate=!1;var p,d,h=l.currentlyMountingInstance;l.currentlyMountingInstance=this;try{a.componentWillMount&&(a.componentWillMount(),this._pendingStateQueue&&(a.state=this._processPendingState(a.props,a.context))),p=this._getValidatedChildContext(n),d=this._renderValidatedComponent(p)}finally{l.currentlyMountingInstance=h}this._renderedComponent=this._instantiateReactComponent(d,this._currentElement.type);var m=f.mountComponent(this._renderedComponent,e,t,this._mergeChildContext(n,p));return a.componentDidMount&&t.getReactMountReady().enqueue(a.componentDidMount,a),m},unmountComponent:function(){var e=this._instance;if(e.componentWillUnmount){var t=l.currentlyUnmountingInstance;l.currentlyUnmountingInstance=this;try{e.componentWillUnmount()}finally{l.currentlyUnmountingInstance=t}}f.unmountComponent(this._renderedComponent),this._renderedComponent=null,this._pendingStateQueue=null,this._pendingReplaceState=!1,this._pendingForceUpdate=!1,this._pendingCallbacks=null,this._pendingElement=null,this._context=null,this._rootNodeID=null,s.remove(e)},_setPropsInternal:function(e,t){var n=this._pendingElement||this._currentElement;this._pendingElement=u.cloneAndReplaceProps(n,m({},n.props,e)),h.enqueueUpdate(this,t)},_maskContext:function(e){var t=null;if(\"string\"==typeof this._currentElement.type)return v;var n=this._currentElement.type.contextTypes;if(!n)return v;t={};for(var r in n)t[r]=e[r];return t},_processContext:function(e){var t=this._maskContext(e);return t},_getValidatedChildContext:function(e){var t=this._instance,n=t.getChildContext&&t.getChildContext();if(n){g(\"object\"==typeof t.constructor.childContextTypes);for(var r in n)g(r in t.constructor.childContextTypes);return n}return null},_mergeChildContext:function(e,t){return t?m({},e,t):e},_processProps:function(e){return e},_checkPropTypes:function(e,t,n){var o=this.getName();for(var i in e)if(e.hasOwnProperty(i)){var a;try{g(\"function\"==typeof e[i]),a=e[i](t,i,o,n)}catch(u){a=u}a instanceof Error&&(r(this),n===d.prop)}},receiveComponent:function(e,t,n){var r=this._currentElement,o=this._context;this._pendingElement=null,this.updateComponent(t,r,e,o,n)},performUpdateIfNecessary:function(e){null!=this._pendingElement&&f.receiveComponent(this,this._pendingElement||this._currentElement,e,this._context),(null!==this._pendingStateQueue||this._pendingForceUpdate)&&this.updateComponent(e,this._currentElement,this._currentElement,this._context,this._context)},_warnIfContextsDiffer:function(e,t){e=this._maskContext(e),t=this._maskContext(t);for(var n=Object.keys(t).sort(),r=(this.getName()||\"ReactCompositeComponent\",0);r<n.length;r++)n[r]},updateComponent:function(e,t,n,r,o){var i=this._instance,a=i.context,u=i.props;t!==n&&(a=this._processContext(n._context),u=this._processProps(n.props),i.componentWillReceiveProps&&i.componentWillReceiveProps(u,a));var s=this._processPendingState(u,a),l=this._pendingForceUpdate||!i.shouldComponentUpdate||i.shouldComponentUpdate(u,s,a);l?(this._pendingForceUpdate=!1,this._performComponentUpdate(n,u,s,a,e,o)):(this._currentElement=n,this._context=o,i.props=u,i.state=s,i.context=a)},_processPendingState:function(e,t){var n=this._instance,r=this._pendingStateQueue,o=this._pendingReplaceState;if(this._pendingReplaceState=!1,this._pendingStateQueue=null,!r)return n.state;if(o&&1===r.length)return r[0];for(var i=m({},o?r[0]:n.state),a=o?1:0;a<r.length;a++){var u=r[a];m(i,\"function\"==typeof u?u.call(n,i,e,t):u)}return i},_performComponentUpdate:function(e,t,n,r,o,i){var a=this._instance,u=a.props,s=a.state,l=a.context;a.componentWillUpdate&&a.componentWillUpdate(t,n,r),this._currentElement=e,this._context=i,a.props=t,a.state=n,a.context=r,this._updateRenderedComponent(o,i),a.componentDidUpdate&&o.getReactMountReady().enqueue(a.componentDidUpdate.bind(a,u,s,l),a)},_updateRenderedComponent:function(e,t){var n=this._renderedComponent,r=n._currentElement,o=this._getValidatedChildContext(),i=this._renderValidatedComponent(o);if(y(r,i))f.receiveComponent(n,i,e,this._mergeChildContext(t,o));else{var a=this._rootNodeID,u=n._rootNodeID;f.unmountComponent(n),this._renderedComponent=this._instantiateReactComponent(i,this._currentElement.type);var s=f.mountComponent(this._renderedComponent,a,e,this._mergeChildContext(t,o));this._replaceNodeWithMarkupByID(u,s)}},_replaceNodeWithMarkupByID:function(e,t){o.replaceNodeWithMarkupByID(e,t)},_renderValidatedComponentWithoutOwnerOrContext:function(){var e=this._instance,t=e.render();return t},_renderValidatedComponent:function(e){var t,n=i.current;i.current=this._mergeChildContext(this._currentElement._context,e),a.current=this;try{t=this._renderValidatedComponentWithoutOwnerOrContext()}finally{i.current=n,a.current=null}return g(null===t||t===!1||u.isValidElement(t)),t},attachRef:function(e,t){var n=this.getPublicInstance(),r=n.refs===v?n.refs={}:n.refs;r[e]=t.getPublicInstance()},detachRef:function(e){var t=this.getPublicInstance().refs;delete t[e]},getName:function(){var e=this._currentElement.type,t=this._instance&&this._instance.constructor;return e.displayName||t&&t.displayName||e.name||t&&t.name||null},getPublicInstance:function(){return this._instance},_instantiateReactComponent:null};p.measureMethods(E,\"ReactCompositeComponent\",{mountComponent:\"mountComponent\",updateComponent:\"updateComponent\",_renderValidatedComponent:\"_renderValidatedComponent\"});var b={Mixin:E};t.exports=b},{113:113,133:133,147:147,150:150,27:27,36:36,38:38,39:39,55:55,56:56,65:65,66:66,71:71,73:73,74:74,75:75,79:79,85:85}],38:[function(e,t,n){\"use strict\";var r=e(27),o=e(113),i=(e(150),{current:o,withContext:function(e,t){var n,o=i.current;i.current=r({},o,e);try{n=t()}finally{i.current=o}return n}});t.exports=i},{113:113,150:150,27:27}],39:[function(e,t,n){\"use strict\";var r={current:null};t.exports=r},{}],40:[function(e,t,n){\"use strict\";function r(e){return o.createFactory(e)}var o=e(55),i=(e(56),e(140)),a=i({a:\"a\",abbr:\"abbr\",address:\"address\",area:\"area\",article:\"article\",aside:\"aside\",audio:\"audio\",b:\"b\",base:\"base\",bdi:\"bdi\",bdo:\"bdo\",big:\"big\",blockquote:\"blockquote\",body:\"body\",br:\"br\",button:\"button\",canvas:\"canvas\",caption:\"caption\",cite:\"cite\",code:\"code\",col:\"col\",colgroup:\"colgroup\",data:\"data\",datalist:\"datalist\",dd:\"dd\",del:\"del\",details:\"details\",dfn:\"dfn\",dialog:\"dialog\",div:\"div\",dl:\"dl\",dt:\"dt\",em:\"em\",embed:\"embed\",fieldset:\"fieldset\",figcaption:\"figcaption\",figure:\"figure\",footer:\"footer\",form:\"form\",h1:\"h1\",h2:\"h2\",h3:\"h3\",h4:\"h4\",h5:\"h5\",h6:\"h6\",head:\"head\",header:\"header\",hr:\"hr\",html:\"html\",i:\"i\",iframe:\"iframe\",img:\"img\",input:\"input\",ins:\"ins\",kbd:\"kbd\",keygen:\"keygen\",label:\"label\",legend:\"legend\",li:\"li\",link:\"link\",main:\"main\",map:\"map\",mark:\"mark\",menu:\"menu\",menuitem:\"menuitem\",meta:\"meta\",meter:\"meter\",nav:\"nav\",noscript:\"noscript\",object:\"object\",ol:\"ol\",optgroup:\"optgroup\",option:\"option\",output:\"output\",p:\"p\",param:\"param\",picture:\"picture\",pre:\"pre\",progress:\"progress\",q:\"q\",rp:\"rp\",rt:\"rt\",ruby:\"ruby\",s:\"s\",samp:\"samp\",script:\"script\",section:\"section\",select:\"select\",small:\"small\",source:\"source\",span:\"span\",strong:\"strong\",style:\"style\",sub:\"sub\",summary:\"summary\",sup:\"sup\",table:\"table\",tbody:\"tbody\",td:\"td\",textarea:\"textarea\",tfoot:\"tfoot\",th:\"th\",thead:\"thead\",time:\"time\",title:\"title\",tr:\"tr\",track:\"track\",u:\"u\",ul:\"ul\",\"var\":\"var\",video:\"video\",wbr:\"wbr\",circle:\"circle\",clipPath:\"clipPath\",defs:\"defs\",ellipse:\"ellipse\",g:\"g\",line:\"line\",linearGradient:\"linearGradient\",mask:\"mask\",path:\"path\",pattern:\"pattern\",polygon:\"polygon\",polyline:\"polyline\",radialGradient:\"radialGradient\",rect:\"rect\",stop:\"stop\",svg:\"svg\",text:\"text\",tspan:\"tspan\"},r);t.exports=a},{140:140,55:55,56:56}],41:[function(e,t,n){\"use strict\";var r=e(2),o=e(29),i=e(33),a=e(55),u=e(138),s=a.createFactory(\"button\"),l=u({onClick:!0,onDoubleClick:!0,onMouseDown:!0,onMouseMove:!0,onMouseUp:!0,onClickCapture:!0,onDoubleClickCapture:!0,onMouseDownCapture:!0,onMouseMoveCapture:!0,onMouseUpCapture:!0}),c=i.createClass({displayName:\"ReactDOMButton\",tagName:\"BUTTON\",mixins:[r,o],render:function(){var e={};for(var t in this.props)!this.props.hasOwnProperty(t)||this.props.disabled&&l[t]||(e[t]=this.props[t]);return s(e,this.props.children)}});t.exports=c},{138:138,2:2,29:29,33:33,55:55}],42:[function(e,t,n){\"use strict\";function r(e){e&&(null!=e.dangerouslySetInnerHTML&&(g(null==e.children),g(\"object\"==typeof e.dangerouslySetInnerHTML&&\"__html\"in e.dangerouslySetInnerHTML)),g(null==e.style||\"object\"==typeof e.style))}function o(e,t,n,r){var o=d.findReactContainerForID(e);if(o){var i=o.nodeType===D?o.ownerDocument:o;E(t,i)}r.getPutListenerQueue().enqueuePutListener(e,t,n)}function i(e){P.call(T,e)||(g(I.test(e)),T[e]=!0)}function a(e){i(e),this._tag=e,this._renderedChildren=null,this._previousStyleCopy=null,this._rootNodeID=null}var u=e(5),s=e(10),l=e(11),c=e(30),p=e(35),d=e(68),f=e(69),h=e(73),m=e(27),v=e(114),g=e(133),y=(e(134),e(139)),C=(e(150),c.deleteListener),E=c.listenTo,b=c.registrationNameModules,_={string:!0,number:!0},x=y({style:null}),D=1,M=null,N={area:!0,base:!0,br:!0,col:!0,embed:!0,hr:!0,img:!0,input:!0,keygen:!0,link:!0,meta:!0,param:!0,source:!0,track:!0,wbr:!0},I=/^[a-zA-Z][a-zA-Z:_\\.\\-\\d]*$/,T={},P={}.hasOwnProperty;a.displayName=\"ReactDOMComponent\",a.Mixin={construct:function(e){this._currentElement=e},mountComponent:function(e,t,n){this._rootNodeID=e,r(this._currentElement.props);var o=N[this._tag]?\"\":\"</\"+this._tag+\">\";return this._createOpenTagMarkupAndPutListeners(t)+this._createContentMarkup(t,n)+o},_createOpenTagMarkupAndPutListeners:function(e){var t=this._currentElement.props,n=\"<\"+this._tag;for(var r in t)if(t.hasOwnProperty(r)){var i=t[r];if(null!=i)if(b.hasOwnProperty(r))o(this._rootNodeID,r,i,e);else{r===x&&(i&&(i=this._previousStyleCopy=m({},t.style)),i=u.createMarkupForStyles(i));var a=l.createMarkupForProperty(r,i);a&&(n+=\" \"+a)}}if(e.renderToStaticMarkup)return n+\">\";var s=l.createMarkupForID(this._rootNodeID);return n+\" \"+s+\">\"},_createContentMarkup:function(e,t){var n=\"\";(\"listing\"===this._tag||\"pre\"===this._tag||\"textarea\"===this._tag)&&(n=\"\\n\");var r=this._currentElement.props,o=r.dangerouslySetInnerHTML;if(null!=o){if(null!=o.__html)return n+o.__html}else{var i=_[typeof r.children]?r.children:null,a=null!=i?null:r.children;if(null!=i)return n+v(i);if(null!=a){var u=this.mountChildren(a,e,t);return n+u.join(\"\")}}return n},receiveComponent:function(e,t,n){var r=this._currentElement;this._currentElement=e,this.updateComponent(t,r,e,n)},updateComponent:function(e,t,n,o){r(this._currentElement.props),this._updateDOMProperties(t.props,e),this._updateDOMChildren(t.props,e,o)},_updateDOMProperties:function(e,t){var n,r,i,a=this._currentElement.props;for(n in e)if(!a.hasOwnProperty(n)&&e.hasOwnProperty(n))if(n===x){var u=this._previousStyleCopy;for(r in u)u.hasOwnProperty(r)&&(i=i||{},i[r]=\"\");this._previousStyleCopy=null}else b.hasOwnProperty(n)?C(this._rootNodeID,n):(s.isStandardName[n]||s.isCustomAttribute(n))&&M.deletePropertyByID(this._rootNodeID,n);for(n in a){var l=a[n],c=n===x?this._previousStyleCopy:e[n];if(a.hasOwnProperty(n)&&l!==c)if(n===x)if(l?l=this._previousStyleCopy=m({},l):this._previousStyleCopy=null,c){for(r in c)!c.hasOwnProperty(r)||l&&l.hasOwnProperty(r)||(i=i||{},i[r]=\"\");for(r in l)l.hasOwnProperty(r)&&c[r]!==l[r]&&(i=i||{},i[r]=l[r])}else i=l;else b.hasOwnProperty(n)?o(this._rootNodeID,n,l,t):(s.isStandardName[n]||s.isCustomAttribute(n))&&M.updatePropertyByID(this._rootNodeID,n,l)}i&&M.updateStylesByID(this._rootNodeID,i)},_updateDOMChildren:function(e,t,n){var r=this._currentElement.props,o=_[typeof e.children]?e.children:null,i=_[typeof r.children]?r.children:null,a=e.dangerouslySetInnerHTML&&e.dangerouslySetInnerHTML.__html,u=r.dangerouslySetInnerHTML&&r.dangerouslySetInnerHTML.__html,s=null!=o?null:e.children,l=null!=i?null:r.children,c=null!=o||null!=a,p=null!=i||null!=u;null!=s&&null==l?this.updateChildren(null,t,n):c&&!p&&this.updateTextContent(\"\"),null!=i?o!==i&&this.updateTextContent(\"\"+i):null!=u?a!==u&&M.updateInnerHTMLByID(this._rootNodeID,u):null!=l&&this.updateChildren(l,t,n)},unmountComponent:function(){this.unmountChildren(),c.deleteAllListeners(this._rootNodeID),p.unmountIDFromEnvironment(this._rootNodeID),this._rootNodeID=null}},h.measureMethods(a,\"ReactDOMComponent\",{mountComponent:\"mountComponent\",updateComponent:\"updateComponent\"}),m(a.prototype,a.Mixin,f.Mixin),a.injection={injectIDOperations:function(e){a.BackendIDOperations=M=e}},t.exports=a},{10:10,11:11,114:114,133:133,134:134,139:139,150:150,27:27,30:30,35:35,5:5,68:68,69:69,73:73}],43:[function(e,t,n){\"use strict\";var r=e(15),o=e(25),i=e(29),a=e(33),u=e(55),s=u.createFactory(\"form\"),l=a.createClass({displayName:\"ReactDOMForm\",tagName:\"FORM\",mixins:[i,o],render:function(){return s(this.props)},componentDidMount:function(){this.trapBubbledEvent(r.topLevelTypes.topReset,\"reset\"),this.trapBubbledEvent(r.topLevelTypes.topSubmit,\"submit\")}});t.exports=l},{15:15,25:25,29:29,33:33,55:55}],44:[function(e,t,n){\"use strict\";var r=e(5),o=e(9),i=e(11),a=e(68),u=e(73),s=e(133),l=e(144),c={dangerouslySetInnerHTML:\"`dangerouslySetInnerHTML` must be set using `updateInnerHTMLByID()`.\",style:\"`style` must be set using `updateStylesByID()`.\"},p={updatePropertyByID:function(e,t,n){var r=a.getNode(e);s(!c.hasOwnProperty(t)),null!=n?i.setValueForProperty(r,t,n):i.deleteValueForProperty(r,t)},deletePropertyByID:function(e,t,n){var r=a.getNode(e);s(!c.hasOwnProperty(t)),i.deleteValueForProperty(r,t,n)},updateStylesByID:function(e,t){var n=a.getNode(e);r.setValueForStyles(n,t)},updateInnerHTMLByID:function(e,t){var n=a.getNode(e);l(n,t)},updateTextContentByID:function(e,t){var n=a.getNode(e);o.updateTextContent(n,t)},dangerouslyReplaceNodeWithMarkupByID:function(e,t){var n=a.getNode(e);o.dangerouslyReplaceNodeWithMarkup(n,t)},dangerouslyProcessChildrenUpdates:function(e,t){for(var n=0;n<e.length;n++)e[n].parentNode=a.getNode(e[n].parentID);o.processUpdates(e,t)}};u.measureMethods(p,\"ReactDOMIDOperations\",{updatePropertyByID:\"updatePropertyByID\",deletePropertyByID:\"deletePropertyByID\",updateStylesByID:\"updateStylesByID\",updateInnerHTMLByID:\"updateInnerHTMLByID\",updateTextContentByID:\"updateTextContentByID\",dangerouslyReplaceNodeWithMarkupByID:\"dangerouslyReplaceNodeWithMarkupByID\",dangerouslyProcessChildrenUpdates:\"dangerouslyProcessChildrenUpdates\"}),t.exports=p},{11:11,133:133,144:144,5:5,68:68,73:73,9:9}],45:[function(e,t,n){\"use strict\";var r=e(15),o=e(25),i=e(29),a=e(33),u=e(55),s=u.createFactory(\"iframe\"),l=a.createClass({displayName:\"ReactDOMIframe\",tagName:\"IFRAME\",mixins:[i,o],render:function(){return s(this.props)},componentDidMount:function(){this.trapBubbledEvent(r.topLevelTypes.topLoad,\"load\")}});t.exports=l},{15:15,25:25,29:29,33:33,55:55}],46:[function(e,t,n){\"use strict\";var r=e(15),o=e(25),i=e(29),a=e(33),u=e(55),s=u.createFactory(\"img\"),l=a.createClass({displayName:\"ReactDOMImg\",tagName:\"IMG\",mixins:[i,o],render:function(){return s(this.props)},componentDidMount:function(){this.trapBubbledEvent(r.topLevelTypes.topLoad,\"load\"),this.trapBubbledEvent(r.topLevelTypes.topError,\"error\")}});t.exports=l},{15:15,25:25,29:29,33:33,55:55}],47:[function(e,t,n){\"use strict\";function r(){this.isMounted()&&this.forceUpdate()}var o=e(2),i=e(11),a=e(24),u=e(29),s=e(33),l=e(55),c=e(68),p=e(85),d=e(27),f=e(133),h=l.createFactory(\"input\"),m={},v=s.createClass({displayName:\"ReactDOMInput\",tagName:\"INPUT\",mixins:[o,a.Mixin,u],getInitialState:function(){var e=this.props.defaultValue;return{initialChecked:this.props.defaultChecked||!1,initialValue:null!=e?e:null}},render:function(){var e=d({},this.props);e.defaultChecked=null,e.defaultValue=null;var t=a.getValue(this);e.value=null!=t?t:this.state.initialValue;var n=a.getChecked(this);return e.checked=null!=n?n:this.state.initialChecked,e.onChange=this._handleChange,h(e,this.props.children)},componentDidMount:function(){var e=c.getID(this.getDOMNode());m[e]=this},componentWillUnmount:function(){var e=this.getDOMNode(),t=c.getID(e);delete m[t]},componentDidUpdate:function(e,t,n){var r=this.getDOMNode();null!=this.props.checked&&i.setValueForProperty(r,\"checked\",this.props.checked||!1);var o=a.getValue(this);null!=o&&i.setValueForProperty(r,\"value\",\"\"+o)},_handleChange:function(e){var t,n=a.getOnChange(this);n&&(t=n.call(this,e)),p.asap(r,this);var o=this.props.name;if(\"radio\"===this.props.type&&null!=o){for(var i=this.getDOMNode(),u=i;u.parentNode;)u=u.parentNode;for(var s=u.querySelectorAll(\"input[name=\"+JSON.stringify(\"\"+o)+'][type=\"radio\"]'),l=0,d=s.length;d>l;l++){var h=s[l];if(h!==i&&h.form===i.form){var v=c.getID(h);f(v);var g=m[v];f(g),p.asap(r,g)}}}return t}});t.exports=v},{11:11,133:133,2:2,24:24,27:27,29:29,33:33,55:55,68:68,85:85}],48:[function(e,t,n){\"use strict\";var r=e(29),o=e(33),i=e(55),a=(e(150),i.createFactory(\"option\")),u=o.createClass({displayName:\"ReactDOMOption\",tagName:\"OPTION\",mixins:[r],componentWillMount:function(){},render:function(){return a(this.props,this.props.children)}});t.exports=u},{150:150,29:29,33:33,55:55}],49:[function(e,t,n){\"use strict\";function r(){if(this._pendingUpdate){this._pendingUpdate=!1;var e=u.getValue(this);null!=e&&this.isMounted()&&i(this,e)}}function o(e,t,n){if(null==e[t])return null;if(e.multiple){if(!Array.isArray(e[t]))return new Error(\"The `\"+t+\"` prop supplied to <select> must be an array if `multiple` is true.\")}else if(Array.isArray(e[t]))return new Error(\"The `\"+t+\"` prop supplied to <select> must be a scalar value if `multiple` is false.\")}function i(e,t){var n,r,o,i=e.getDOMNode().options;if(e.props.multiple){for(n={},r=0,o=t.length;o>r;r++)n[\"\"+t[r]]=!0;for(r=0,o=i.length;o>r;r++){var a=n.hasOwnProperty(i[r].value);i[r].selected!==a&&(i[r].selected=a)}}else{for(n=\"\"+t,r=0,o=i.length;o>r;r++)if(i[r].value===n)return void(i[r].selected=!0);i.length&&(i[0].selected=!0)}}var a=e(2),u=e(24),s=e(29),l=e(33),c=e(55),p=e(85),d=e(27),f=c.createFactory(\"select\"),h=l.createClass({displayName:\"ReactDOMSelect\",tagName:\"SELECT\",mixins:[a,u.Mixin,s],propTypes:{defaultValue:o,value:o},render:function(){var e=d({},this.props);return e.onChange=this._handleChange,e.value=null,f(e,this.props.children)},componentWillMount:function(){this._pendingUpdate=!1},componentDidMount:function(){var e=u.getValue(this);null!=e?i(this,e):null!=this.props.defaultValue&&i(this,this.props.defaultValue)},componentDidUpdate:function(e){var t=u.getValue(this);null!=t?(this._pendingUpdate=!1,i(this,t)):!e.multiple!=!this.props.multiple&&(null!=this.props.defaultValue?i(this,this.props.defaultValue):i(this,this.props.multiple?[]:\"\"))},_handleChange:function(e){var t,n=u.getOnChange(this);return n&&(t=n.call(this,e)),this._pendingUpdate=!0,p.asap(r,this),t}});t.exports=h},{2:2,24:24,27:27,29:29,33:33,55:55,85:85}],50:[function(e,t,n){\"use strict\";function r(e,t,n,r){return e===n&&t===r}function o(e){var t=document.selection,n=t.createRange(),r=n.text.length,o=n.duplicate();o.moveToElementText(e),o.setEndPoint(\"EndToStart\",n);var i=o.text.length,a=i+r;return{start:i,end:a}}function i(e){var t=window.getSelection&&window.getSelection();if(!t||0===t.rangeCount)return null;var n=t.anchorNode,o=t.anchorOffset,i=t.focusNode,a=t.focusOffset,u=t.getRangeAt(0),s=r(t.anchorNode,t.anchorOffset,t.focusNode,t.focusOffset),l=s?0:u.toString().length,c=u.cloneRange();c.selectNodeContents(e),c.setEnd(u.startContainer,u.startOffset);var p=r(c.startContainer,c.startOffset,c.endContainer,c.endOffset),d=p?0:c.toString().length,f=d+l,h=document.createRange();h.setStart(n,o),h.setEnd(i,a);var m=h.collapsed;return{start:m?f:d,end:m?d:f}}function a(e,t){var n,r,o=document.selection.createRange().duplicate();\"undefined\"==typeof t.end?(n=t.start,r=n):t.start>t.end?(n=t.end,r=t.start):(n=t.start,r=t.end),o.moveToElementText(e),o.moveStart(\"character\",n),o.setEndPoint(\"EndToStart\",o),o.moveEnd(\"character\",r-n),o.select()}function u(e,t){if(window.getSelection){var n=window.getSelection(),r=e[c()].length,o=Math.min(t.start,r),i=\"undefined\"==typeof t.end?o:Math.min(t.end,r);if(!n.extend&&o>i){var a=i;i=o,o=a}var u=l(e,o),s=l(e,i);if(u&&s){var p=document.createRange();p.setStart(u.node,u.offset),n.removeAllRanges(),o>i?(n.addRange(p),n.extend(s.node,s.offset)):(p.setEnd(s.node,s.offset),n.addRange(p))}}}var s=e(21),l=e(126),c=e(128),p=s.canUseDOM&&\"selection\"in document&&!(\"getSelection\"in window),d={getOffsets:p?o:i,setOffsets:p?a:u};t.exports=d},{126:126,128:128,21:21}],51:[function(e,t,n){\"use strict\";var r=e(11),o=e(35),i=e(42),a=e(27),u=e(114),s=function(e){};a(s.prototype,{construct:function(e){this._currentElement=e,this._stringText=\"\"+e,this._rootNodeID=null,this._mountIndex=0},mountComponent:function(e,t,n){this._rootNodeID=e;var o=u(this._stringText);return t.renderToStaticMarkup?o:\"<span \"+r.createMarkupForID(e)+\">\"+o+\"</span>\"},receiveComponent:function(e,t){if(e!==this._currentElement){this._currentElement=e;var n=\"\"+e;n!==this._stringText&&(this._stringText=n,i.BackendIDOperations.updateTextContentByID(this._rootNodeID,n))}},unmountComponent:function(){o.unmountIDFromEnvironment(this._rootNodeID)}}),t.exports=s},{11:11,114:114,27:27,35:35,42:42}],52:[function(e,t,n){\"use strict\";function r(){this.isMounted()&&this.forceUpdate()}var o=e(2),i=e(11),a=e(24),u=e(29),s=e(33),l=e(55),c=e(85),p=e(27),d=e(133),f=(e(150),l.createFactory(\"textarea\")),h=s.createClass({displayName:\"ReactDOMTextarea\",tagName:\"TEXTAREA\",mixins:[o,a.Mixin,u],getInitialState:function(){var e=this.props.defaultValue,t=this.props.children;null!=t&&(d(null==e),Array.isArray(t)&&(d(t.length<=1),t=t[0]),e=\"\"+t),null==e&&(e=\"\");var n=a.getValue(this);return{initialValue:\"\"+(null!=n?n:e)}},render:function(){var e=p({},this.props);return d(null==e.dangerouslySetInnerHTML),e.defaultValue=null,e.value=null,e.onChange=this._handleChange,f(e,this.state.initialValue)},componentDidUpdate:function(e,t,n){var r=a.getValue(this);if(null!=r){var o=this.getDOMNode();i.setValueForProperty(o,\"value\",\"\"+r)}},_handleChange:function(e){var t,n=a.getOnChange(this);return n&&(t=n.call(this,e)),c.asap(r,this),t}});t.exports=h},{11:11,133:133,150:150,2:2,24:24,27:27,29:29,33:33,55:55,85:85}],53:[function(e,t,n){\"use strict\";function r(){this.reinitializeTransaction()}var o=e(85),i=e(101),a=e(27),u=e(112),s={initialize:u,close:function(){d.isBatchingUpdates=!1}},l={initialize:u,close:o.flushBatchedUpdates.bind(o)},c=[l,s];a(r.prototype,i.Mixin,{getTransactionWrappers:function(){return c}});var p=new r,d={isBatchingUpdates:!1,batchedUpdates:function(e,t,n,r,o){var i=d.isBatchingUpdates;d.isBatchingUpdates=!0,i?e(t,n,r,o):p.perform(e,null,t,n,r,o)}};t.exports=d},{101:101,112:112,27:27,85:85}],54:[function(e,t,n){\"use strict\";function r(e){return h.createClass({tagName:e.toUpperCase(),render:function(){return new T(e,null,null,null,null,this.props)}})}function o(){R.EventEmitter.injectReactEventListener(P),R.EventPluginHub.injectEventPluginOrder(s),R.EventPluginHub.injectInstanceHandle(w),R.EventPluginHub.injectMount(O),R.EventPluginHub.injectEventPluginsByName({SimpleEventPlugin:L,EnterLeaveEventPlugin:l,ChangeEventPlugin:a,MobileSafariClickEventPlugin:d,SelectEventPlugin:A,BeforeInputEventPlugin:i}),R.NativeComponent.injectGenericComponentClass(g),R.NativeComponent.injectTextComponentClass(I),R.NativeComponent.injectAutoWrapper(r),R.Class.injectMixin(f),R.NativeComponent.injectComponentClasses({button:y,form:C,iframe:_,img:E,input:x,option:D,select:M,textarea:N,html:F(\"html\"),head:F(\"head\"),body:F(\"body\")}),R.DOMProperty.injectDOMPropertyConfig(p),R.DOMProperty.injectDOMPropertyConfig(U),R.EmptyComponent.injectEmptyComponent(\"noscript\"),R.Updates.injectReconcileTransaction(S),R.Updates.injectBatchingStrategy(v),R.RootIndex.injectCreateReactRootIndex(c.canUseDOM?u.createReactRootIndex:k.createReactRootIndex),R.Component.injectEnvironment(m),R.DOMComponent.injectIDOperations(b)}var i=e(3),a=e(7),u=e(8),s=e(13),l=e(14),c=e(21),p=e(23),d=e(26),f=e(29),h=e(33),m=e(35),v=e(53),g=e(42),y=e(41),C=e(43),E=e(46),b=e(44),_=e(45),x=e(47),D=e(48),M=e(49),N=e(52),I=e(51),T=e(55),P=e(60),R=e(62),w=e(64),O=e(68),S=e(78),A=e(87),k=e(88),L=e(89),U=e(86),F=e(109);\n\nt.exports={inject:o}},{109:109,13:13,14:14,21:21,23:23,26:26,29:29,3:3,33:33,35:35,41:41,42:42,43:43,44:44,45:45,46:46,47:47,48:48,49:49,51:51,52:52,53:53,55:55,60:60,62:62,64:64,68:68,7:7,78:78,8:8,86:86,87:87,88:88,89:89}],55:[function(e,t,n){\"use strict\";var r=e(38),o=e(39),i=e(27),a=(e(150),{key:!0,ref:!0}),u=function(e,t,n,r,o,i){this.type=e,this.key=t,this.ref=n,this._owner=r,this._context=o,this.props=i};u.prototype={_isReactElement:!0},u.createElement=function(e,t,n){var i,s={},l=null,c=null;if(null!=t){c=void 0===t.ref?null:t.ref,l=void 0===t.key?null:\"\"+t.key;for(i in t)t.hasOwnProperty(i)&&!a.hasOwnProperty(i)&&(s[i]=t[i])}var p=arguments.length-2;if(1===p)s.children=n;else if(p>1){for(var d=Array(p),f=0;p>f;f++)d[f]=arguments[f+2];s.children=d}if(e&&e.defaultProps){var h=e.defaultProps;for(i in h)\"undefined\"==typeof s[i]&&(s[i]=h[i])}return new u(e,l,c,o.current,r.current,s)},u.createFactory=function(e){var t=u.createElement.bind(null,e);return t.type=e,t},u.cloneAndReplaceProps=function(e,t){var n=new u(e.type,e.key,e.ref,e._owner,e._context,t);return n},u.cloneElement=function(e,t,n){var r,s=i({},e.props),l=e.key,c=e.ref,p=e._owner;if(null!=t){void 0!==t.ref&&(c=t.ref,p=o.current),void 0!==t.key&&(l=\"\"+t.key);for(r in t)t.hasOwnProperty(r)&&!a.hasOwnProperty(r)&&(s[r]=t[r])}var d=arguments.length-2;if(1===d)s.children=n;else if(d>1){for(var f=Array(d),h=0;d>h;h++)f[h]=arguments[h+2];s.children=f}return new u(e.type,l,c,p,e._context,s)},u.isValidElement=function(e){var t=!(!e||!e._isReactElement);return t},t.exports=u},{150:150,27:27,38:38,39:39}],56:[function(e,t,n){\"use strict\";function r(){if(y.current){var e=y.current.getName();if(e)return\" Check the render method of `\"+e+\"`.\"}return\"\"}function o(e){var t=e&&e.getPublicInstance();if(!t)return void 0;var n=t.constructor;return n?n.displayName||n.name||void 0:void 0}function i(){var e=y.current;return e&&o(e)||void 0}function a(e,t){e._store.validated||null!=e.key||(e._store.validated=!0,s('Each child in an array or iterator should have a unique \"key\" prop.',e,t))}function u(e,t,n){D.test(e)&&s(\"Child objects should have non-numeric keys so ordering is preserved.\",t,n)}function s(e,t,n){var r=i(),a=\"string\"==typeof n?n:n.displayName||n.name,u=r||a,s=_[e]||(_[e]={});if(!s.hasOwnProperty(u)){s[u]=!0;var l=\"\";if(t&&t._owner&&t._owner!==y.current){var c=o(t._owner);l=\" It was passed a child from \"+c+\".\"}}}function l(e,t){if(Array.isArray(e))for(var n=0;n<e.length;n++){var r=e[n];m.isValidElement(r)&&a(r,t)}else if(m.isValidElement(e))e._store.validated=!0;else if(e){var o=E(e);if(o){if(o!==e.entries)for(var i,s=o.call(e);!(i=s.next()).done;)m.isValidElement(i.value)&&a(i.value,t)}else if(\"object\"==typeof e){var l=v.extractIfFragment(e);for(var c in l)l.hasOwnProperty(c)&&u(c,l[c],t)}}}function c(e,t,n,o){for(var i in t)if(t.hasOwnProperty(i)){var a;try{b(\"function\"==typeof t[i]),a=t[i](n,i,e,o)}catch(u){a=u}a instanceof Error&&!(a.message in x)&&(x[a.message]=!0,r(this))}}function p(e,t){var n=t.type,r=\"string\"==typeof n?n:n.displayName,o=t._owner?t._owner.getPublicInstance().constructor.displayName:null,i=e+\"|\"+r+\"|\"+o;if(!M.hasOwnProperty(i)){M[i]=!0;var a=\"\";r&&(a=\" <\"+r+\" />\");var u=\"\";o&&(u=\" The element was created by \"+o+\".\")}}function d(e,t){return e!==e?t!==t:0===e&&0===t?1/e===1/t:e===t}function f(e){if(e._store){var t=e._store.originalProps,n=e.props;for(var r in n)n.hasOwnProperty(r)&&(t.hasOwnProperty(r)&&d(t[r],n[r])||(p(r,e),t[r]=n[r]))}}function h(e){if(null!=e.type){var t=C.getComponentClassForElement(e),n=t.displayName||t.name;t.propTypes&&c(n,t.propTypes,e.props,g.prop),\"function\"==typeof t.getDefaultProps}}var m=e(55),v=e(61),g=e(75),y=(e(74),e(39)),C=e(71),E=e(124),b=e(133),_=(e(150),{}),x={},D=/^\\d+$/,M={},N={checkAndWarnForMutatedProps:f,createElement:function(e,t,n){var r=m.createElement.apply(this,arguments);if(null==r)return r;for(var o=2;o<arguments.length;o++)l(arguments[o],e);return h(r),r},createFactory:function(e){var t=N.createElement.bind(null,e);return t.type=e,t},cloneElement:function(e,t,n){for(var r=m.cloneElement.apply(this,arguments),o=2;o<arguments.length;o++)l(arguments[o],r.type);return h(r),r}};t.exports=N},{124:124,133:133,150:150,39:39,55:55,61:61,71:71,74:74,75:75}],57:[function(e,t,n){\"use strict\";function r(e){c[e]=!0}function o(e){delete c[e]}function i(e){return!!c[e]}var a,u=e(55),s=e(65),l=e(133),c={},p={injectEmptyComponent:function(e){a=u.createFactory(e)}},d=function(){};d.prototype.componentDidMount=function(){var e=s.get(this);e&&r(e._rootNodeID)},d.prototype.componentWillUnmount=function(){var e=s.get(this);e&&o(e._rootNodeID)},d.prototype.render=function(){return l(a),a()};var f=u.createElement(d),h={emptyElement:f,injection:p,isNullComponentID:i};t.exports=h},{133:133,55:55,65:65}],58:[function(e,t,n){\"use strict\";var r={guard:function(e,t){return e}};t.exports=r},{}],59:[function(e,t,n){\"use strict\";function r(e){o.enqueueEvents(e),o.processEventQueue()}var o=e(17),i={handleTopLevel:function(e,t,n,i){var a=o.extractEvents(e,t,n,i);r(a)}};t.exports=i},{17:17}],60:[function(e,t,n){\"use strict\";function r(e){var t=p.getID(e),n=c.getReactRootIDFromNodeID(t),r=p.findReactContainerForID(n),o=p.getFirstReactDOM(r);return o}function o(e,t){this.topLevelType=e,this.nativeEvent=t,this.ancestors=[]}function i(e){for(var t=p.getFirstReactDOM(h(e.nativeEvent))||window,n=t;n;)e.ancestors.push(n),n=r(n);for(var o=0,i=e.ancestors.length;i>o;o++){t=e.ancestors[o];var a=p.getID(t)||\"\";v._handleTopLevel(e.topLevelType,t,a,e.nativeEvent)}}function a(e){var t=m(window);e(t)}var u=e(16),s=e(21),l=e(28),c=e(64),p=e(68),d=e(85),f=e(27),h=e(123),m=e(129);f(o.prototype,{destructor:function(){this.topLevelType=null,this.nativeEvent=null,this.ancestors.length=0}}),l.addPoolingTo(o,l.twoArgumentPooler);var v={_enabled:!0,_handleTopLevel:null,WINDOW_HANDLE:s.canUseDOM?window:null,setHandleTopLevel:function(e){v._handleTopLevel=e},setEnabled:function(e){v._enabled=!!e},isEnabled:function(){return v._enabled},trapBubbledEvent:function(e,t,n){var r=n;return r?u.listen(r,t,v.dispatchEvent.bind(null,e)):null},trapCapturedEvent:function(e,t,n){var r=n;return r?u.capture(r,t,v.dispatchEvent.bind(null,e)):null},monitorScrollValue:function(e){var t=a.bind(null,e);u.listen(window,\"scroll\",t)},dispatchEvent:function(e,t){if(v._enabled){var n=o.getPooled(e,t);try{d.batchedUpdates(i,n)}finally{o.release(n)}}}};t.exports=v},{123:123,129:129,16:16,21:21,27:27,28:28,64:64,68:68,85:85}],61:[function(e,t,n){\"use strict\";var r=(e(55),e(150),{create:function(e){return e},extract:function(e){return e},extractIfFragment:function(e){return e}});t.exports=r},{150:150,55:55}],62:[function(e,t,n){\"use strict\";var r=e(10),o=e(17),i=e(36),a=e(33),u=e(57),s=e(30),l=e(71),c=e(42),p=e(73),d=e(81),f=e(85),h={Component:i.injection,Class:a.injection,DOMComponent:c.injection,DOMProperty:r.injection,EmptyComponent:u.injection,EventPluginHub:o.injection,EventEmitter:s.injection,NativeComponent:l.injection,Perf:p.injection,RootIndex:d.injection,Updates:f.injection};t.exports=h},{10:10,17:17,30:30,33:33,36:36,42:42,57:57,71:71,73:73,81:81,85:85}],63:[function(e,t,n){\"use strict\";function r(e){return i(document.documentElement,e)}var o=e(50),i=e(107),a=e(117),u=e(119),s={hasSelectionCapabilities:function(e){return e&&(\"INPUT\"===e.nodeName&&\"text\"===e.type||\"TEXTAREA\"===e.nodeName||\"true\"===e.contentEditable)},getSelectionInformation:function(){var e=u();return{focusedElem:e,selectionRange:s.hasSelectionCapabilities(e)?s.getSelection(e):null}},restoreSelection:function(e){var t=u(),n=e.focusedElem,o=e.selectionRange;t!==n&&r(n)&&(s.hasSelectionCapabilities(n)&&s.setSelection(n,o),a(n))},getSelection:function(e){var t;if(\"selectionStart\"in e)t={start:e.selectionStart,end:e.selectionEnd};else if(document.selection&&\"INPUT\"===e.nodeName){var n=document.selection.createRange();n.parentElement()===e&&(t={start:-n.moveStart(\"character\",-e.value.length),end:-n.moveEnd(\"character\",-e.value.length)})}else t=o.getOffsets(e);return t||{start:0,end:0}},setSelection:function(e,t){var n=t.start,r=t.end;if(\"undefined\"==typeof r&&(r=n),\"selectionStart\"in e)e.selectionStart=n,e.selectionEnd=Math.min(r,e.value.length);else if(document.selection&&\"INPUT\"===e.nodeName){var i=e.createTextRange();i.collapse(!0),i.moveStart(\"character\",n),i.moveEnd(\"character\",r-n),i.select()}else o.setOffsets(e,t)}};t.exports=s},{107:107,117:117,119:119,50:50}],64:[function(e,t,n){\"use strict\";function r(e){return f+e.toString(36)}function o(e,t){return e.charAt(t)===f||t===e.length}function i(e){return\"\"===e||e.charAt(0)===f&&e.charAt(e.length-1)!==f}function a(e,t){return 0===t.indexOf(e)&&o(t,e.length)}function u(e){return e?e.substr(0,e.lastIndexOf(f)):\"\"}function s(e,t){if(d(i(e)&&i(t)),d(a(e,t)),e===t)return e;var n,r=e.length+h;for(n=r;n<t.length&&!o(t,n);n++);return t.substr(0,n)}function l(e,t){var n=Math.min(e.length,t.length);if(0===n)return\"\";for(var r=0,a=0;n>=a;a++)if(o(e,a)&&o(t,a))r=a;else if(e.charAt(a)!==t.charAt(a))break;var u=e.substr(0,r);return d(i(u)),u}function c(e,t,n,r,o,i){e=e||\"\",t=t||\"\",d(e!==t);var l=a(t,e);d(l||a(e,t));for(var c=0,p=l?u:s,f=e;;f=p(f,t)){var h;if(o&&f===e||i&&f===t||(h=n(f,l,r)),h===!1||f===t)break;d(c++<m)}}var p=e(81),d=e(133),f=\".\",h=f.length,m=100,v={createReactRootID:function(){return r(p.createReactRootIndex())},createReactID:function(e,t){return e+t},getReactRootIDFromNodeID:function(e){if(e&&e.charAt(0)===f&&e.length>1){var t=e.indexOf(f,1);return t>-1?e.substr(0,t):e}return null},traverseEnterLeave:function(e,t,n,r,o){var i=l(e,t);i!==e&&c(e,i,n,r,!1,!0),i!==t&&c(i,t,n,o,!0,!1)},traverseTwoPhase:function(e,t,n){e&&(c(\"\",e,t,n,!0,!1),c(e,\"\",t,n,!1,!0))},traverseAncestors:function(e,t,n){c(\"\",e,t,n,!0,!1)},_getFirstCommonAncestorID:l,_getNextDescendantID:s,isAncestorIDOf:a,SEPARATOR:f};t.exports=v},{133:133,81:81}],65:[function(e,t,n){\"use strict\";var r={remove:function(e){e._reactInternalInstance=void 0},get:function(e){return e._reactInternalInstance},has:function(e){return void 0!==e._reactInternalInstance},set:function(e,t){e._reactInternalInstance=t}};t.exports=r},{}],66:[function(e,t,n){\"use strict\";var r={currentlyMountingInstance:null,currentlyUnmountingInstance:null};t.exports=r},{}],67:[function(e,t,n){\"use strict\";var r=e(104),o={CHECKSUM_ATTR_NAME:\"data-react-checksum\",addChecksumToMarkup:function(e){var t=r(e);return e.replace(\">\",\" \"+o.CHECKSUM_ATTR_NAME+'=\"'+t+'\">')},canReuseMarkup:function(e,t){var n=t.getAttribute(o.CHECKSUM_ATTR_NAME);n=n&&parseInt(n,10);var i=r(e);return i===n}};t.exports=o},{104:104}],68:[function(e,t,n){\"use strict\";function r(e,t){for(var n=Math.min(e.length,t.length),r=0;n>r;r++)if(e.charAt(r)!==t.charAt(r))return r;return e.length===t.length?-1:n}function o(e){var t=P(e);return t&&K.getID(t)}function i(e){var t=a(e);if(t)if(L.hasOwnProperty(t)){var n=L[t];n!==e&&(w(!c(n,t)),L[t]=e)}else L[t]=e;return t}function a(e){return e&&e.getAttribute&&e.getAttribute(k)||\"\"}function u(e,t){var n=a(e);n!==t&&delete L[n],e.setAttribute(k,t),L[t]=e}function s(e){return L.hasOwnProperty(e)&&c(L[e],e)||(L[e]=K.findReactNodeByID(e)),L[e]}function l(e){var t=b.get(e)._rootNodeID;return C.isNullComponentID(t)?null:(L.hasOwnProperty(t)&&c(L[t],t)||(L[t]=K.findReactNodeByID(t)),L[t])}function c(e,t){if(e){w(a(e)===t);var n=K.findReactContainerForID(t);if(n&&T(n,e))return!0}return!1}function p(e){delete L[e]}function d(e){var t=L[e];return t&&c(t,e)?void(W=t):!1}function f(e){W=null,E.traverseAncestors(e,d);var t=W;return W=null,t}function h(e,t,n,r,o){var i=D.mountComponent(e,t,r,I);e._isTopLevel=!0,K._mountImageIntoNode(i,n,o)}function m(e,t,n,r){var o=N.ReactReconcileTransaction.getPooled();o.perform(h,null,e,t,n,o,r),N.ReactReconcileTransaction.release(o)}var v=e(10),g=e(30),y=(e(39),e(55)),C=(e(56),e(57)),E=e(64),b=e(65),_=e(67),x=e(73),D=e(79),M=e(84),N=e(85),I=e(113),T=e(107),P=e(127),R=e(132),w=e(133),O=e(144),S=e(147),A=(e(150),E.SEPARATOR),k=v.ID_ATTRIBUTE_NAME,L={},U=1,F=9,B={},V={},j=[],W=null,K={_instancesByReactRootID:B,scrollMonitor:function(e,t){t()},_updateRootComponent:function(e,t,n,r){return K.scrollMonitor(n,function(){M.enqueueElementInternal(e,t),r&&M.enqueueCallbackInternal(e,r)}),e},_registerComponent:function(e,t){w(t&&(t.nodeType===U||t.nodeType===F)),g.ensureScrollValueMonitoring();var n=K.registerContainer(t);return B[n]=e,n},_renderNewRootComponent:function(e,t,n){var r=R(e,null),o=K._registerComponent(r,t);return N.batchedUpdates(m,r,o,t,n),r},render:function(e,t,n){w(y.isValidElement(e));var r=B[o(t)];if(r){var i=r._currentElement;if(S(i,e))return K._updateRootComponent(r,e,t,n).getPublicInstance();K.unmountComponentAtNode(t)}var a=P(t),u=a&&K.isRenderedByReact(a),s=u&&!r,l=K._renderNewRootComponent(e,t,s).getPublicInstance();return n&&n.call(l),l},constructAndRenderComponent:function(e,t,n){var r=y.createElement(e,t);return K.render(r,n)},constructAndRenderComponentByID:function(e,t,n){var r=document.getElementById(n);return w(r),K.constructAndRenderComponent(e,t,r)},registerContainer:function(e){var t=o(e);return t&&(t=E.getReactRootIDFromNodeID(t)),t||(t=E.createReactRootID()),V[t]=e,t},unmountComponentAtNode:function(e){w(e&&(e.nodeType===U||e.nodeType===F));var t=o(e),n=B[t];return n?(K.unmountComponentFromNode(n,e),delete B[t],delete V[t],!0):!1},unmountComponentFromNode:function(e,t){for(D.unmountComponent(e),t.nodeType===F&&(t=t.documentElement);t.lastChild;)t.removeChild(t.lastChild)},findReactContainerForID:function(e){var t=E.getReactRootIDFromNodeID(e),n=V[t];return n},findReactNodeByID:function(e){var t=K.findReactContainerForID(e);return K.findComponentRoot(t,e)},isRenderedByReact:function(e){if(1!==e.nodeType)return!1;var t=K.getID(e);return t?t.charAt(0)===A:!1},getFirstReactDOM:function(e){for(var t=e;t&&t.parentNode!==t;){if(K.isRenderedByReact(t))return t;t=t.parentNode}return null},findComponentRoot:function(e,t){var n=j,r=0,o=f(t)||e;for(n[0]=o.firstChild,n.length=1;r<n.length;){for(var i,a=n[r++];a;){var u=K.getID(a);u?t===u?i=a:E.isAncestorIDOf(u,t)&&(n.length=r=0,n.push(a.firstChild)):n.push(a.firstChild),a=a.nextSibling}if(i)return n.length=0,i}n.length=0,w(!1)},_mountImageIntoNode:function(e,t,n){if(w(t&&(t.nodeType===U||t.nodeType===F)),n){var o=P(t);if(_.canReuseMarkup(e,o))return;var i=o.getAttribute(_.CHECKSUM_ATTR_NAME);o.removeAttribute(_.CHECKSUM_ATTR_NAME);var a=o.outerHTML;o.setAttribute(_.CHECKSUM_ATTR_NAME,i);var u=r(e,a);\" (client) \"+e.substring(u-20,u+20)+\"\\n (server) \"+a.substring(u-20,u+20),w(t.nodeType!==F)}w(t.nodeType!==F),O(t,e)},getReactRootID:o,getID:i,setID:u,getNode:s,getNodeFromInstance:l,purgeID:p};x.measureMethods(K,\"ReactMount\",{_renderNewRootComponent:\"_renderNewRootComponent\",_mountImageIntoNode:\"_mountImageIntoNode\"}),t.exports=K},{10:10,107:107,113:113,127:127,132:132,133:133,144:144,147:147,150:150,30:30,39:39,55:55,56:56,57:57,64:64,65:65,67:67,73:73,79:79,84:84,85:85}],69:[function(e,t,n){\"use strict\";function r(e,t,n){h.push({parentID:e,parentNode:null,type:c.INSERT_MARKUP,markupIndex:m.push(t)-1,textContent:null,fromIndex:null,toIndex:n})}function o(e,t,n){h.push({parentID:e,parentNode:null,type:c.MOVE_EXISTING,markupIndex:null,textContent:null,fromIndex:t,toIndex:n})}function i(e,t){h.push({parentID:e,parentNode:null,type:c.REMOVE_NODE,markupIndex:null,textContent:null,fromIndex:t,toIndex:null})}function a(e,t){h.push({parentID:e,parentNode:null,type:c.TEXT_CONTENT,markupIndex:null,textContent:t,fromIndex:null,toIndex:null})}function u(){h.length&&(l.processChildrenUpdates(h,m),s())}function s(){h.length=0,m.length=0}var l=e(36),c=e(70),p=e(79),d=e(31),f=0,h=[],m=[],v={Mixin:{mountChildren:function(e,t,n){var r=d.instantiateChildren(e,t,n);this._renderedChildren=r;var o=[],i=0;for(var a in r)if(r.hasOwnProperty(a)){var u=r[a],s=this._rootNodeID+a,l=p.mountComponent(u,s,t,n);u._mountIndex=i,o.push(l),i++}return o},updateTextContent:function(e){f++;var t=!0;try{var n=this._renderedChildren;d.unmountChildren(n);for(var r in n)n.hasOwnProperty(r)&&this._unmountChildByName(n[r],r);this.setTextContent(e),t=!1}finally{f--,f||(t?s():u())}},updateChildren:function(e,t,n){f++;var r=!0;try{this._updateChildren(e,t,n),r=!1}finally{f--,f||(r?s():u())}},_updateChildren:function(e,t,n){var r=this._renderedChildren,o=d.updateChildren(r,e,t,n);if(this._renderedChildren=o,o||r){var i,a=0,u=0;for(i in o)if(o.hasOwnProperty(i)){var s=r&&r[i],l=o[i];s===l?(this.moveChild(s,u,a),a=Math.max(s._mountIndex,a),s._mountIndex=u):(s&&(a=Math.max(s._mountIndex,a),this._unmountChildByName(s,i)),this._mountChildByNameAtIndex(l,i,u,t,n)),u++}for(i in r)!r.hasOwnProperty(i)||o&&o.hasOwnProperty(i)||this._unmountChildByName(r[i],i)}},unmountChildren:function(){var e=this._renderedChildren;d.unmountChildren(e),this._renderedChildren=null},moveChild:function(e,t,n){e._mountIndex<n&&o(this._rootNodeID,e._mountIndex,t)},createChild:function(e,t){r(this._rootNodeID,t,e._mountIndex)},removeChild:function(e){i(this._rootNodeID,e._mountIndex)},setTextContent:function(e){a(this._rootNodeID,e)},_mountChildByNameAtIndex:function(e,t,n,r,o){var i=this._rootNodeID+t,a=p.mountComponent(e,i,r,o);e._mountIndex=n,this.createChild(e,a)},_unmountChildByName:function(e,t){this.removeChild(e),e._mountIndex=null}}};t.exports=v},{31:31,36:36,70:70,79:79}],70:[function(e,t,n){\"use strict\";var r=e(138),o=r({INSERT_MARKUP:null,MOVE_EXISTING:null,REMOVE_NODE:null,TEXT_CONTENT:null});t.exports=o},{138:138}],71:[function(e,t,n){\"use strict\";function r(e){if(\"function\"==typeof e.type)return e.type;var t=e.type,n=p[t];return null==n&&(p[t]=n=l(t)),n}function o(e){return s(c),new c(e.type,e.props)}function i(e){return new d(e)}function a(e){return e instanceof d}var u=e(27),s=e(133),l=null,c=null,p={},d=null,f={injectGenericComponentClass:function(e){c=e},injectTextComponentClass:function(e){d=e},injectComponentClasses:function(e){u(p,e)},injectAutoWrapper:function(e){l=e}},h={getComponentClassForElement:r,createInternalComponent:o,createInstanceForText:i,isTextComponent:a,injection:f};t.exports=h},{133:133,27:27}],72:[function(e,t,n){\"use strict\";var r=e(133),o={isValidOwner:function(e){return!(!e||\"function\"!=typeof e.attachRef||\"function\"!=typeof e.detachRef)},addComponentAsRefTo:function(e,t,n){r(o.isValidOwner(n)),n.attachRef(t,e)},removeComponentAsRefFrom:function(e,t,n){r(o.isValidOwner(n)),n.getPublicInstance().refs[t]===e.getPublicInstance()&&n.detachRef(t)}};t.exports=o},{133:133}],73:[function(e,t,n){\"use strict\";function r(e,t,n){return n}var o={enableMeasure:!1,storedMeasure:r,measureMethods:function(e,t,n){},measure:function(e,t,n){return n},injection:{injectMeasure:function(e){o.storedMeasure=e}}};t.exports=o},{}],74:[function(e,t,n){\"use strict\";var r={};t.exports=r},{}],75:[function(e,t,n){\"use strict\";var r=e(138),o=r({prop:null,context:null,childContext:null});t.exports=o},{138:138}],76:[function(e,t,n){\"use strict\";function r(e){function t(t,n,r,o,i){if(o=o||b,null==n[r]){var a=C[i];return t?new Error(\"Required \"+a+\" `\"+r+\"` was not specified in \"+(\"`\"+o+\"`.\")):null}return e(n,r,o,i)}var n=t.bind(null,!1);return n.isRequired=t.bind(null,!0),n}function o(e){function t(t,n,r,o){var i=t[n],a=m(i);if(a!==e){var u=C[o],s=v(i);return new Error(\"Invalid \"+u+\" `\"+n+\"` of type `\"+s+\"` \"+(\"supplied to `\"+r+\"`, expected `\"+e+\"`.\"))}return null}return r(t)}function i(){return r(E.thatReturns(null))}function a(e){function t(t,n,r,o){var i=t[n];if(!Array.isArray(i)){var a=C[o],u=m(i);return new Error(\"Invalid \"+a+\" `\"+n+\"` of type \"+(\"`\"+u+\"` supplied to `\"+r+\"`, expected an array.\"))}for(var s=0;s<i.length;s++){var l=e(i,s,r,o);if(l instanceof Error)return l}return null}return r(t)}function u(){function e(e,t,n,r){if(!g.isValidElement(e[t])){var o=C[r];return new Error(\"Invalid \"+o+\" `\"+t+\"` supplied to \"+(\"`\"+n+\"`, expected a ReactElement.\"))}return null}return r(e)}function s(e){function t(t,n,r,o){if(!(t[n]instanceof e)){var i=C[o],a=e.name||b;return new Error(\"Invalid \"+i+\" `\"+n+\"` supplied to \"+(\"`\"+r+\"`, expected instance of `\"+a+\"`.\"))}return null}return r(t)}function l(e){function t(t,n,r,o){for(var i=t[n],a=0;a<e.length;a++)if(i===e[a])return null;var u=C[o],s=JSON.stringify(e);return new Error(\"Invalid \"+u+\" `\"+n+\"` of value `\"+i+\"` \"+(\"supplied to `\"+r+\"`, expected one of \"+s+\".\"))}return r(t)}function c(e){function t(t,n,r,o){var i=t[n],a=m(i);if(\"object\"!==a){var u=C[o];return new Error(\"Invalid \"+u+\" `\"+n+\"` of type \"+(\"`\"+a+\"` supplied to `\"+r+\"`, expected an object.\"))}for(var s in i)if(i.hasOwnProperty(s)){var l=e(i,s,r,o);if(l instanceof Error)return l}return null}return r(t)}function p(e){function t(t,n,r,o){for(var i=0;i<e.length;i++){var a=e[i];if(null==a(t,n,r,o))return null}var u=C[o];return new Error(\"Invalid \"+u+\" `\"+n+\"` supplied to \"+(\"`\"+r+\"`.\"))}return r(t)}function d(){function e(e,t,n,r){if(!h(e[t])){var o=C[r];return new Error(\"Invalid \"+o+\" `\"+t+\"` supplied to \"+(\"`\"+n+\"`, expected a ReactNode.\"))}return null}return r(e)}function f(e){function t(t,n,r,o){var i=t[n],a=m(i);if(\"object\"!==a){var u=C[o];return new Error(\"Invalid \"+u+\" `\"+n+\"` of type `\"+a+\"` \"+(\"supplied to `\"+r+\"`, expected `object`.\"))}for(var s in e){var l=e[s];if(l){var c=l(i,s,r,o);if(c)return c}}return null}return r(t)}function h(e){switch(typeof e){case\"number\":case\"string\":case\"undefined\":return!0;case\"boolean\":return!e;case\"object\":if(Array.isArray(e))return e.every(h);if(null===e||g.isValidElement(e))return!0;e=y.extractIfFragment(e);for(var t in e)if(!h(e[t]))return!1;return!0;default:return!1}}function m(e){var t=typeof e;return Array.isArray(e)?\"array\":e instanceof RegExp?\"object\":t}function v(e){var t=m(e);if(\"object\"===t){if(e instanceof Date)return\"date\";if(e instanceof RegExp)return\"regexp\"}return t}var g=e(55),y=e(61),C=e(74),E=e(112),b=\"<<anonymous>>\",_=u(),x=d(),D={array:o(\"array\"),bool:o(\"boolean\"),func:o(\"function\"),number:o(\"number\"),object:o(\"object\"),string:o(\"string\"),any:i(),arrayOf:a,element:_,instanceOf:s,node:x,objectOf:c,oneOf:l,oneOfType:p,shape:f};t.exports=D},{112:112,55:55,61:61,74:74}],77:[function(e,t,n){\"use strict\";function r(){this.listenersToPut=[]}var o=e(28),i=e(30),a=e(27);a(r.prototype,{enqueuePutListener:function(e,t,n){this.listenersToPut.push({rootNodeID:e,propKey:t,propValue:n})},putListeners:function(){for(var e=0;e<this.listenersToPut.length;e++){var t=this.listenersToPut[e];i.putListener(t.rootNodeID,t.propKey,t.propValue)}},reset:function(){this.listenersToPut.length=0},destructor:function(){this.reset()}}),o.addPoolingTo(r),t.exports=r},{27:27,28:28,30:30}],78:[function(e,t,n){\"use strict\";function r(){this.reinitializeTransaction(),this.renderToStaticMarkup=!1,this.reactMountReady=o.getPooled(null),this.putListenerQueue=s.getPooled()}var o=e(6),i=e(28),a=e(30),u=e(63),s=e(77),l=e(101),c=e(27),p={initialize:u.getSelectionInformation,close:u.restoreSelection},d={initialize:function(){var e=a.isEnabled();return a.setEnabled(!1),e},close:function(e){a.setEnabled(e)}},f={initialize:function(){this.reactMountReady.reset()},close:function(){this.reactMountReady.notifyAll()}},h={initialize:function(){this.putListenerQueue.reset()},close:function(){this.putListenerQueue.putListeners()}},m=[h,p,d,f],v={getTransactionWrappers:function(){return m},getReactMountReady:function(){return this.reactMountReady},getPutListenerQueue:function(){return this.putListenerQueue},destructor:function(){o.release(this.reactMountReady),this.reactMountReady=null,s.release(this.putListenerQueue),this.putListenerQueue=null}};c(r.prototype,l.Mixin,v),i.addPoolingTo(r),t.exports=r},{101:101,27:27,28:28,30:30,6:6,63:63,77:77}],79:[function(e,t,n){\"use strict\";function r(){o.attachRefs(this,this._currentElement)}var o=e(80),i=(e(56),{mountComponent:function(e,t,n,o){var i=e.mountComponent(t,n,o);return n.getReactMountReady().enqueue(r,e),i},unmountComponent:function(e){o.detachRefs(e,e._currentElement),e.unmountComponent()},receiveComponent:function(e,t,n,i){var a=e._currentElement;if(t!==a||null==t._owner){var u=o.shouldUpdateRefs(a,t);u&&o.detachRefs(e,a),e.receiveComponent(t,n,i),u&&n.getReactMountReady().enqueue(r,e)}},performUpdateIfNecessary:function(e,t){e.performUpdateIfNecessary(t)}});t.exports=i},{56:56,80:80}],80:[function(e,t,n){\"use strict\";function r(e,t,n){\"function\"==typeof e?e(t.getPublicInstance()):i.addComponentAsRefTo(t,e,n)}function o(e,t,n){\"function\"==typeof e?e(null):i.removeComponentAsRefFrom(t,e,n)}var i=e(72),a={};a.attachRefs=function(e,t){var n=t.ref;null!=n&&r(n,e,t._owner)},a.shouldUpdateRefs=function(e,t){return t._owner!==e._owner||t.ref!==e.ref},a.detachRefs=function(e,t){var n=t.ref;null!=n&&o(n,e,t._owner)},t.exports=a},{72:72}],81:[function(e,t,n){\"use strict\";var r={injectCreateReactRootIndex:function(e){o.createReactRootIndex=e}},o={createReactRootIndex:null,injection:r};t.exports=o},{}],82:[function(e,t,n){\"use strict\";function r(e){p(i.isValidElement(e));var t;try{var n=a.createReactRootID();return t=s.getPooled(!1),t.perform(function(){var r=c(e,null),o=r.mountComponent(n,t,l);return u.addChecksumToMarkup(o)},null)}finally{s.release(t)}}function o(e){p(i.isValidElement(e));var t;try{var n=a.createReactRootID();return t=s.getPooled(!0),t.perform(function(){var r=c(e,null);return r.mountComponent(n,t,l)},null)}finally{s.release(t)}}var i=e(55),a=e(64),u=e(67),s=e(83),l=e(113),c=e(132),p=e(133);t.exports={renderToString:r,renderToStaticMarkup:o}},{113:113,132:132,133:133,55:55,64:64,67:67,83:83}],83:[function(e,t,n){\"use strict\";function r(e){this.reinitializeTransaction(),this.renderToStaticMarkup=e,this.reactMountReady=i.getPooled(null),this.putListenerQueue=a.getPooled()}var o=e(28),i=e(6),a=e(77),u=e(101),s=e(27),l=e(112),c={initialize:function(){this.reactMountReady.reset()},close:l},p={initialize:function(){this.putListenerQueue.reset()},close:l},d=[p,c],f={getTransactionWrappers:function(){return d},getReactMountReady:function(){return this.reactMountReady},getPutListenerQueue:function(){return this.putListenerQueue},destructor:function(){i.release(this.reactMountReady),this.reactMountReady=null,a.release(this.putListenerQueue),this.putListenerQueue=null}};s(r.prototype,u.Mixin,f),o.addPoolingTo(r),t.exports=r},{101:101,112:112,27:27,28:28,6:6,77:77}],84:[function(e,t,n){\"use strict\";function r(e){e!==i.currentlyMountingInstance&&l.enqueueUpdate(e)}function o(e,t){p(null==a.current);var n=s.get(e);return n?n===i.currentlyUnmountingInstance?null:n:null}var i=e(66),a=e(39),u=e(55),s=e(65),l=e(85),c=e(27),p=e(133),d=(e(150),{enqueueCallback:function(e,t){p(\"function\"==typeof t);var n=o(e);return n&&n!==i.currentlyMountingInstance?(n._pendingCallbacks?n._pendingCallbacks.push(t):n._pendingCallbacks=[t],void r(n)):null},enqueueCallbackInternal:function(e,t){p(\"function\"==typeof t),e._pendingCallbacks?e._pendingCallbacks.push(t):e._pendingCallbacks=[t],r(e)},enqueueForceUpdate:function(e){var t=o(e,\"forceUpdate\");t&&(t._pendingForceUpdate=!0,r(t))},enqueueReplaceState:function(e,t){var n=o(e,\"replaceState\");n&&(n._pendingStateQueue=[t],n._pendingReplaceState=!0,r(n))},enqueueSetState:function(e,t){var n=o(e,\"setState\");if(n){var i=n._pendingStateQueue||(n._pendingStateQueue=[]);i.push(t),r(n)}},enqueueSetProps:function(e,t){var n=o(e,\"setProps\");if(n){p(n._isTopLevel);var i=n._pendingElement||n._currentElement,a=c({},i.props,t);n._pendingElement=u.cloneAndReplaceProps(i,a),r(n)}},enqueueReplaceProps:function(e,t){var n=o(e,\"replaceProps\");if(n){p(n._isTopLevel);var i=n._pendingElement||n._currentElement;n._pendingElement=u.cloneAndReplaceProps(i,t),r(n)}},enqueueElementInternal:function(e,t){e._pendingElement=t,r(e)}});t.exports=d},{133:133,150:150,27:27,39:39,55:55,65:65,66:66,85:85}],85:[function(e,t,n){\"use strict\";function r(){v(N.ReactReconcileTransaction&&E)}function o(){this.reinitializeTransaction(),this.dirtyComponentsLength=null,this.callbackQueue=c.getPooled(),this.reconcileTransaction=N.ReactReconcileTransaction.getPooled()}function i(e,t,n,o,i){r(),E.batchedUpdates(e,t,n,o,i)}function a(e,t){return e._mountOrder-t._mountOrder}function u(e){var t=e.dirtyComponentsLength;v(t===g.length),g.sort(a);for(var n=0;t>n;n++){var r=g[n],o=r._pendingCallbacks;if(r._pendingCallbacks=null,f.performUpdateIfNecessary(r,e.reconcileTransaction),o)for(var i=0;i<o.length;i++)e.callbackQueue.enqueue(o[i],r.getPublicInstance())}}function s(e){return r(),E.isBatchingUpdates?void g.push(e):void E.batchedUpdates(s,e)}function l(e,t){v(E.isBatchingUpdates),y.enqueue(e,t),C=!0}var c=e(6),p=e(28),d=(e(39),e(73)),f=e(79),h=e(101),m=e(27),v=e(133),g=(e(150),[]),y=c.getPooled(),C=!1,E=null,b={initialize:function(){this.dirtyComponentsLength=g.length},close:function(){this.dirtyComponentsLength!==g.length?(g.splice(0,this.dirtyComponentsLength),D()):g.length=0}},_={initialize:function(){this.callbackQueue.reset()},close:function(){this.callbackQueue.notifyAll()}},x=[b,_];m(o.prototype,h.Mixin,{getTransactionWrappers:function(){return x},destructor:function(){this.dirtyComponentsLength=null,c.release(this.callbackQueue),this.callbackQueue=null,N.ReactReconcileTransaction.release(this.reconcileTransaction),this.reconcileTransaction=null},perform:function(e,t,n){return h.Mixin.perform.call(this,this.reconcileTransaction.perform,this.reconcileTransaction,e,t,n)}}),p.addPoolingTo(o);var D=function(){for(;g.length||C;){if(g.length){var e=o.getPooled();e.perform(u,null,e),o.release(e)}if(C){C=!1;var t=y;y=c.getPooled(),t.notifyAll(),c.release(t)}}};D=d.measure(\"ReactUpdates\",\"flushBatchedUpdates\",D);var M={injectReconcileTransaction:function(e){v(e),N.ReactReconcileTransaction=e},injectBatchingStrategy:function(e){v(e),v(\"function\"==typeof e.batchedUpdates),v(\"boolean\"==typeof e.isBatchingUpdates),E=e}},N={ReactReconcileTransaction:null,batchedUpdates:i,enqueueUpdate:s,flushBatchedUpdates:D,injection:M,asap:l};t.exports=N},{101:101,133:133,150:150,27:27,28:28,39:39,6:6,73:73,79:79}],86:[function(e,t,n){\"use strict\";var r=e(10),o=r.injection.MUST_USE_ATTRIBUTE,i={Properties:{clipPath:o,cx:o,cy:o,d:o,dx:o,dy:o,fill:o,fillOpacity:o,fontFamily:o,fontSize:o,fx:o,fy:o,gradientTransform:o,gradientUnits:o,markerEnd:o,markerMid:o,markerStart:o,offset:o,opacity:o,patternContentUnits:o,patternUnits:o,points:o,preserveAspectRatio:o,r:o,rx:o,ry:o,spreadMethod:o,stopColor:o,stopOpacity:o,stroke:o,strokeDasharray:o,strokeLinecap:o,strokeOpacity:o,strokeWidth:o,textAnchor:o,transform:o,version:o,viewBox:o,x1:o,x2:o,x:o,y1:o,y2:o,y:o},DOMAttributeNames:{clipPath:\"clip-path\",fillOpacity:\"fill-opacity\",fontFamily:\"font-family\",fontSize:\"font-size\",gradientTransform:\"gradientTransform\",gradientUnits:\"gradientUnits\",markerEnd:\"marker-end\",markerMid:\"marker-mid\",markerStart:\"marker-start\",patternContentUnits:\"patternContentUnits\",patternUnits:\"patternUnits\",preserveAspectRatio:\"preserveAspectRatio\",spreadMethod:\"spreadMethod\",stopColor:\"stop-color\",stopOpacity:\"stop-opacity\",strokeDasharray:\"stroke-dasharray\",strokeLinecap:\"stroke-linecap\",strokeOpacity:\"stroke-opacity\",strokeWidth:\"stroke-width\",textAnchor:\"text-anchor\",viewBox:\"viewBox\"}};t.exports=i},{10:10}],87:[function(e,t,n){\"use strict\";function r(e){if(\"selectionStart\"in e&&u.hasSelectionCapabilities(e))return{start:e.selectionStart,end:e.selectionEnd};if(window.getSelection){var t=window.getSelection();return{anchorNode:t.anchorNode,anchorOffset:t.anchorOffset,focusNode:t.focusNode,focusOffset:t.focusOffset}}if(document.selection){var n=document.selection.createRange();return{parentElement:n.parentElement(),text:n.text,top:n.boundingTop,left:n.boundingLeft}}}function o(e){if(y||null==m||m!==l())return null;var t=r(m);if(!g||!d(g,t)){g=t;var n=s.getPooled(h.select,v,e);return n.type=\"select\",n.target=m,a.accumulateTwoPhaseDispatches(n),n}}var i=e(15),a=e(20),u=e(63),s=e(93),l=e(119),c=e(136),p=e(139),d=e(146),f=i.topLevelTypes,h={select:{phasedRegistrationNames:{bubbled:p({onSelect:null}),captured:p({onSelectCapture:null})},dependencies:[f.topBlur,f.topContextMenu,f.topFocus,f.topKeyDown,f.topMouseDown,f.topMouseUp,f.topSelectionChange]\n}},m=null,v=null,g=null,y=!1,C={eventTypes:h,extractEvents:function(e,t,n,r){switch(e){case f.topFocus:(c(t)||\"true\"===t.contentEditable)&&(m=t,v=n,g=null);break;case f.topBlur:m=null,v=null,g=null;break;case f.topMouseDown:y=!0;break;case f.topContextMenu:case f.topMouseUp:return y=!1,o(r);case f.topSelectionChange:case f.topKeyDown:case f.topKeyUp:return o(r)}}};t.exports=C},{119:119,136:136,139:139,146:146,15:15,20:20,63:63,93:93}],88:[function(e,t,n){\"use strict\";var r=Math.pow(2,53),o={createReactRootIndex:function(){return Math.ceil(Math.random()*r)}};t.exports=o},{}],89:[function(e,t,n){\"use strict\";var r=e(15),o=e(19),i=e(20),a=e(90),u=e(93),s=e(94),l=e(96),c=e(97),p=e(92),d=e(98),f=e(99),h=e(100),m=e(120),v=e(133),g=e(139),y=(e(150),r.topLevelTypes),C={blur:{phasedRegistrationNames:{bubbled:g({onBlur:!0}),captured:g({onBlurCapture:!0})}},click:{phasedRegistrationNames:{bubbled:g({onClick:!0}),captured:g({onClickCapture:!0})}},contextMenu:{phasedRegistrationNames:{bubbled:g({onContextMenu:!0}),captured:g({onContextMenuCapture:!0})}},copy:{phasedRegistrationNames:{bubbled:g({onCopy:!0}),captured:g({onCopyCapture:!0})}},cut:{phasedRegistrationNames:{bubbled:g({onCut:!0}),captured:g({onCutCapture:!0})}},doubleClick:{phasedRegistrationNames:{bubbled:g({onDoubleClick:!0}),captured:g({onDoubleClickCapture:!0})}},drag:{phasedRegistrationNames:{bubbled:g({onDrag:!0}),captured:g({onDragCapture:!0})}},dragEnd:{phasedRegistrationNames:{bubbled:g({onDragEnd:!0}),captured:g({onDragEndCapture:!0})}},dragEnter:{phasedRegistrationNames:{bubbled:g({onDragEnter:!0}),captured:g({onDragEnterCapture:!0})}},dragExit:{phasedRegistrationNames:{bubbled:g({onDragExit:!0}),captured:g({onDragExitCapture:!0})}},dragLeave:{phasedRegistrationNames:{bubbled:g({onDragLeave:!0}),captured:g({onDragLeaveCapture:!0})}},dragOver:{phasedRegistrationNames:{bubbled:g({onDragOver:!0}),captured:g({onDragOverCapture:!0})}},dragStart:{phasedRegistrationNames:{bubbled:g({onDragStart:!0}),captured:g({onDragStartCapture:!0})}},drop:{phasedRegistrationNames:{bubbled:g({onDrop:!0}),captured:g({onDropCapture:!0})}},focus:{phasedRegistrationNames:{bubbled:g({onFocus:!0}),captured:g({onFocusCapture:!0})}},input:{phasedRegistrationNames:{bubbled:g({onInput:!0}),captured:g({onInputCapture:!0})}},keyDown:{phasedRegistrationNames:{bubbled:g({onKeyDown:!0}),captured:g({onKeyDownCapture:!0})}},keyPress:{phasedRegistrationNames:{bubbled:g({onKeyPress:!0}),captured:g({onKeyPressCapture:!0})}},keyUp:{phasedRegistrationNames:{bubbled:g({onKeyUp:!0}),captured:g({onKeyUpCapture:!0})}},load:{phasedRegistrationNames:{bubbled:g({onLoad:!0}),captured:g({onLoadCapture:!0})}},error:{phasedRegistrationNames:{bubbled:g({onError:!0}),captured:g({onErrorCapture:!0})}},mouseDown:{phasedRegistrationNames:{bubbled:g({onMouseDown:!0}),captured:g({onMouseDownCapture:!0})}},mouseMove:{phasedRegistrationNames:{bubbled:g({onMouseMove:!0}),captured:g({onMouseMoveCapture:!0})}},mouseOut:{phasedRegistrationNames:{bubbled:g({onMouseOut:!0}),captured:g({onMouseOutCapture:!0})}},mouseOver:{phasedRegistrationNames:{bubbled:g({onMouseOver:!0}),captured:g({onMouseOverCapture:!0})}},mouseUp:{phasedRegistrationNames:{bubbled:g({onMouseUp:!0}),captured:g({onMouseUpCapture:!0})}},paste:{phasedRegistrationNames:{bubbled:g({onPaste:!0}),captured:g({onPasteCapture:!0})}},reset:{phasedRegistrationNames:{bubbled:g({onReset:!0}),captured:g({onResetCapture:!0})}},scroll:{phasedRegistrationNames:{bubbled:g({onScroll:!0}),captured:g({onScrollCapture:!0})}},submit:{phasedRegistrationNames:{bubbled:g({onSubmit:!0}),captured:g({onSubmitCapture:!0})}},touchCancel:{phasedRegistrationNames:{bubbled:g({onTouchCancel:!0}),captured:g({onTouchCancelCapture:!0})}},touchEnd:{phasedRegistrationNames:{bubbled:g({onTouchEnd:!0}),captured:g({onTouchEndCapture:!0})}},touchMove:{phasedRegistrationNames:{bubbled:g({onTouchMove:!0}),captured:g({onTouchMoveCapture:!0})}},touchStart:{phasedRegistrationNames:{bubbled:g({onTouchStart:!0}),captured:g({onTouchStartCapture:!0})}},wheel:{phasedRegistrationNames:{bubbled:g({onWheel:!0}),captured:g({onWheelCapture:!0})}}},E={topBlur:C.blur,topClick:C.click,topContextMenu:C.contextMenu,topCopy:C.copy,topCut:C.cut,topDoubleClick:C.doubleClick,topDrag:C.drag,topDragEnd:C.dragEnd,topDragEnter:C.dragEnter,topDragExit:C.dragExit,topDragLeave:C.dragLeave,topDragOver:C.dragOver,topDragStart:C.dragStart,topDrop:C.drop,topError:C.error,topFocus:C.focus,topInput:C.input,topKeyDown:C.keyDown,topKeyPress:C.keyPress,topKeyUp:C.keyUp,topLoad:C.load,topMouseDown:C.mouseDown,topMouseMove:C.mouseMove,topMouseOut:C.mouseOut,topMouseOver:C.mouseOver,topMouseUp:C.mouseUp,topPaste:C.paste,topReset:C.reset,topScroll:C.scroll,topSubmit:C.submit,topTouchCancel:C.touchCancel,topTouchEnd:C.touchEnd,topTouchMove:C.touchMove,topTouchStart:C.touchStart,topWheel:C.wheel};for(var b in E)E[b].dependencies=[b];var _={eventTypes:C,executeDispatch:function(e,t,n){var r=o.executeDispatch(e,t,n);r===!1&&(e.stopPropagation(),e.preventDefault())},extractEvents:function(e,t,n,r){var o=E[e];if(!o)return null;var g;switch(e){case y.topInput:case y.topLoad:case y.topError:case y.topReset:case y.topSubmit:g=u;break;case y.topKeyPress:if(0===m(r))return null;case y.topKeyDown:case y.topKeyUp:g=l;break;case y.topBlur:case y.topFocus:g=s;break;case y.topClick:if(2===r.button)return null;case y.topContextMenu:case y.topDoubleClick:case y.topMouseDown:case y.topMouseMove:case y.topMouseOut:case y.topMouseOver:case y.topMouseUp:g=c;break;case y.topDrag:case y.topDragEnd:case y.topDragEnter:case y.topDragExit:case y.topDragLeave:case y.topDragOver:case y.topDragStart:case y.topDrop:g=p;break;case y.topTouchCancel:case y.topTouchEnd:case y.topTouchMove:case y.topTouchStart:g=d;break;case y.topScroll:g=f;break;case y.topWheel:g=h;break;case y.topCopy:case y.topCut:case y.topPaste:g=a}v(g);var C=g.getPooled(o,n,r);return i.accumulateTwoPhaseDispatches(C),C}};t.exports=_},{100:100,120:120,133:133,139:139,15:15,150:150,19:19,20:20,90:90,92:92,93:93,94:94,96:96,97:97,98:98,99:99}],90:[function(e,t,n){\"use strict\";function r(e,t,n){o.call(this,e,t,n)}var o=e(93),i={clipboardData:function(e){return\"clipboardData\"in e?e.clipboardData:window.clipboardData}};o.augmentClass(r,i),t.exports=r},{93:93}],91:[function(e,t,n){\"use strict\";function r(e,t,n){o.call(this,e,t,n)}var o=e(93),i={data:null};o.augmentClass(r,i),t.exports=r},{93:93}],92:[function(e,t,n){\"use strict\";function r(e,t,n){o.call(this,e,t,n)}var o=e(97),i={dataTransfer:null};o.augmentClass(r,i),t.exports=r},{97:97}],93:[function(e,t,n){\"use strict\";function r(e,t,n){this.dispatchConfig=e,this.dispatchMarker=t,this.nativeEvent=n;var r=this.constructor.Interface;for(var o in r)if(r.hasOwnProperty(o)){var i=r[o];i?this[o]=i(n):this[o]=n[o]}var u=null!=n.defaultPrevented?n.defaultPrevented:n.returnValue===!1;u?this.isDefaultPrevented=a.thatReturnsTrue:this.isDefaultPrevented=a.thatReturnsFalse,this.isPropagationStopped=a.thatReturnsFalse}var o=e(28),i=e(27),a=e(112),u=e(123),s={type:null,target:u,currentTarget:a.thatReturnsNull,eventPhase:null,bubbles:null,cancelable:null,timeStamp:function(e){return e.timeStamp||Date.now()},defaultPrevented:null,isTrusted:null};i(r.prototype,{preventDefault:function(){this.defaultPrevented=!0;var e=this.nativeEvent;e.preventDefault?e.preventDefault():e.returnValue=!1,this.isDefaultPrevented=a.thatReturnsTrue},stopPropagation:function(){var e=this.nativeEvent;e.stopPropagation?e.stopPropagation():e.cancelBubble=!0,this.isPropagationStopped=a.thatReturnsTrue},persist:function(){this.isPersistent=a.thatReturnsTrue},isPersistent:a.thatReturnsFalse,destructor:function(){var e=this.constructor.Interface;for(var t in e)this[t]=null;this.dispatchConfig=null,this.dispatchMarker=null,this.nativeEvent=null}}),r.Interface=s,r.augmentClass=function(e,t){var n=this,r=Object.create(n.prototype);i(r,e.prototype),e.prototype=r,e.prototype.constructor=e,e.Interface=i({},n.Interface,t),e.augmentClass=n.augmentClass,o.addPoolingTo(e,o.threeArgumentPooler)},o.addPoolingTo(r,o.threeArgumentPooler),t.exports=r},{112:112,123:123,27:27,28:28}],94:[function(e,t,n){\"use strict\";function r(e,t,n){o.call(this,e,t,n)}var o=e(99),i={relatedTarget:null};o.augmentClass(r,i),t.exports=r},{99:99}],95:[function(e,t,n){\"use strict\";function r(e,t,n){o.call(this,e,t,n)}var o=e(93),i={data:null};o.augmentClass(r,i),t.exports=r},{93:93}],96:[function(e,t,n){\"use strict\";function r(e,t,n){o.call(this,e,t,n)}var o=e(99),i=e(120),a=e(121),u=e(122),s={key:a,location:null,ctrlKey:null,shiftKey:null,altKey:null,metaKey:null,repeat:null,locale:null,getModifierState:u,charCode:function(e){return\"keypress\"===e.type?i(e):0},keyCode:function(e){return\"keydown\"===e.type||\"keyup\"===e.type?e.keyCode:0},which:function(e){return\"keypress\"===e.type?i(e):\"keydown\"===e.type||\"keyup\"===e.type?e.keyCode:0}};o.augmentClass(r,s),t.exports=r},{120:120,121:121,122:122,99:99}],97:[function(e,t,n){\"use strict\";function r(e,t,n){o.call(this,e,t,n)}var o=e(99),i=e(102),a=e(122),u={screenX:null,screenY:null,clientX:null,clientY:null,ctrlKey:null,shiftKey:null,altKey:null,metaKey:null,getModifierState:a,button:function(e){var t=e.button;return\"which\"in e?t:2===t?2:4===t?1:0},buttons:null,relatedTarget:function(e){return e.relatedTarget||(e.fromElement===e.srcElement?e.toElement:e.fromElement)},pageX:function(e){return\"pageX\"in e?e.pageX:e.clientX+i.currentScrollLeft},pageY:function(e){return\"pageY\"in e?e.pageY:e.clientY+i.currentScrollTop}};o.augmentClass(r,u),t.exports=r},{102:102,122:122,99:99}],98:[function(e,t,n){\"use strict\";function r(e,t,n){o.call(this,e,t,n)}var o=e(99),i=e(122),a={touches:null,targetTouches:null,changedTouches:null,altKey:null,metaKey:null,ctrlKey:null,shiftKey:null,getModifierState:i};o.augmentClass(r,a),t.exports=r},{122:122,99:99}],99:[function(e,t,n){\"use strict\";function r(e,t,n){o.call(this,e,t,n)}var o=e(93),i=e(123),a={view:function(e){if(e.view)return e.view;var t=i(e);if(null!=t&&t.window===t)return t;var n=t.ownerDocument;return n?n.defaultView||n.parentWindow:window},detail:function(e){return e.detail||0}};o.augmentClass(r,a),t.exports=r},{123:123,93:93}],100:[function(e,t,n){\"use strict\";function r(e,t,n){o.call(this,e,t,n)}var o=e(97),i={deltaX:function(e){return\"deltaX\"in e?e.deltaX:\"wheelDeltaX\"in e?-e.wheelDeltaX:0},deltaY:function(e){return\"deltaY\"in e?e.deltaY:\"wheelDeltaY\"in e?-e.wheelDeltaY:\"wheelDelta\"in e?-e.wheelDelta:0},deltaZ:null,deltaMode:null};o.augmentClass(r,i),t.exports=r},{97:97}],101:[function(e,t,n){\"use strict\";var r=e(133),o={reinitializeTransaction:function(){this.transactionWrappers=this.getTransactionWrappers(),this.wrapperInitData?this.wrapperInitData.length=0:this.wrapperInitData=[],this._isInTransaction=!1},_isInTransaction:!1,getTransactionWrappers:null,isInTransaction:function(){return!!this._isInTransaction},perform:function(e,t,n,o,i,a,u,s){r(!this.isInTransaction());var l,c;try{this._isInTransaction=!0,l=!0,this.initializeAll(0),c=e.call(t,n,o,i,a,u,s),l=!1}finally{try{if(l)try{this.closeAll(0)}catch(p){}else this.closeAll(0)}finally{this._isInTransaction=!1}}return c},initializeAll:function(e){for(var t=this.transactionWrappers,n=e;n<t.length;n++){var r=t[n];try{this.wrapperInitData[n]=i.OBSERVED_ERROR,this.wrapperInitData[n]=r.initialize?r.initialize.call(this):null}finally{if(this.wrapperInitData[n]===i.OBSERVED_ERROR)try{this.initializeAll(n+1)}catch(o){}}}},closeAll:function(e){r(this.isInTransaction());for(var t=this.transactionWrappers,n=e;n<t.length;n++){var o,a=t[n],u=this.wrapperInitData[n];try{o=!0,u!==i.OBSERVED_ERROR&&a.close&&a.close.call(this,u),o=!1}finally{if(o)try{this.closeAll(n+1)}catch(s){}}}this.wrapperInitData.length=0}},i={Mixin:o,OBSERVED_ERROR:{}};t.exports=i},{133:133}],102:[function(e,t,n){\"use strict\";var r={currentScrollLeft:0,currentScrollTop:0,refreshScrollValues:function(e){r.currentScrollLeft=e.x,r.currentScrollTop=e.y}};t.exports=r},{}],103:[function(e,t,n){\"use strict\";function r(e,t){if(o(null!=t),null==e)return t;var n=Array.isArray(e),r=Array.isArray(t);return n&&r?(e.push.apply(e,t),e):n?(e.push(t),e):r?[e].concat(t):[e,t]}var o=e(133);t.exports=r},{133:133}],104:[function(e,t,n){\"use strict\";function r(e){for(var t=1,n=0,r=0;r<e.length;r++)t=(t+e.charCodeAt(r))%o,n=(n+t)%o;return t|n<<16}var o=65521;t.exports=r},{}],105:[function(e,t,n){function r(e){return e.replace(o,function(e,t){return t.toUpperCase()})}var o=/-(.)/g;t.exports=r},{}],106:[function(e,t,n){\"use strict\";function r(e){return o(e.replace(i,\"ms-\"))}var o=e(105),i=/^-ms-/;t.exports=r},{105:105}],107:[function(e,t,n){function r(e,t){return e&&t?e===t?!0:o(e)?!1:o(t)?r(e,t.parentNode):e.contains?e.contains(t):e.compareDocumentPosition?!!(16&e.compareDocumentPosition(t)):!1:!1}var o=e(137);t.exports=r},{137:137}],108:[function(e,t,n){function r(e){return!!e&&(\"object\"==typeof e||\"function\"==typeof e)&&\"length\"in e&&!(\"setInterval\"in e)&&\"number\"!=typeof e.nodeType&&(Array.isArray(e)||\"callee\"in e||\"item\"in e)}function o(e){return r(e)?Array.isArray(e)?e.slice():i(e):[e]}var i=e(148);t.exports=o},{148:148}],109:[function(e,t,n){\"use strict\";function r(e){var t=i.createFactory(e),n=o.createClass({tagName:e.toUpperCase(),displayName:\"ReactFullPageComponent\"+e,componentWillUnmount:function(){a(!1)},render:function(){return t(this.props)}});return n}var o=e(33),i=e(55),a=e(133);t.exports=r},{133:133,33:33,55:55}],110:[function(e,t,n){function r(e){var t=e.match(c);return t&&t[1].toLowerCase()}function o(e,t){var n=l;s(!!l);var o=r(e),i=o&&u(o);if(i){n.innerHTML=i[1]+e+i[2];for(var c=i[0];c--;)n=n.lastChild}else n.innerHTML=e;var p=n.getElementsByTagName(\"script\");p.length&&(s(t),a(p).forEach(t));for(var d=a(n.childNodes);n.lastChild;)n.removeChild(n.lastChild);return d}var i=e(21),a=e(108),u=e(125),s=e(133),l=i.canUseDOM?document.createElement(\"div\"):null,c=/^\\s*<(\\w+)/;t.exports=o},{108:108,125:125,133:133,21:21}],111:[function(e,t,n){\"use strict\";function r(e,t){var n=null==t||\"boolean\"==typeof t||\"\"===t;if(n)return\"\";var r=isNaN(t);return r||0===t||i.hasOwnProperty(e)&&i[e]?\"\"+t:(\"string\"==typeof t&&(t=t.trim()),t+\"px\")}var o=e(4),i=o.isUnitlessNumber;t.exports=r},{4:4}],112:[function(e,t,n){function r(e){return function(){return e}}function o(){}o.thatReturns=r,o.thatReturnsFalse=r(!1),o.thatReturnsTrue=r(!0),o.thatReturnsNull=r(null),o.thatReturnsThis=function(){return this},o.thatReturnsArgument=function(e){return e},t.exports=o},{}],113:[function(e,t,n){\"use strict\";var r={};t.exports=r},{}],114:[function(e,t,n){\"use strict\";function r(e){return i[e]}function o(e){return(\"\"+e).replace(a,r)}var i={\"&\":\"&amp;\",\">\":\"&gt;\",\"<\":\"&lt;\",'\"':\"&quot;\",\"'\":\"&#x27;\"},a=/[&><\"']/g;t.exports=o},{}],115:[function(e,t,n){\"use strict\";function r(e){return null==e?null:u(e)?e:o.has(e)?i.getNodeFromInstance(e):(a(null==e.render||\"function\"!=typeof e.render),void a(!1))}{var o=(e(39),e(65)),i=e(68),a=e(133),u=e(135);e(150)}t.exports=r},{133:133,135:135,150:150,39:39,65:65,68:68}],116:[function(e,t,n){\"use strict\";function r(e,t,n){var r=e,o=!r.hasOwnProperty(n);o&&null!=t&&(r[n]=t)}function o(e){if(null==e)return e;var t={};return i(e,r,t),t}{var i=e(149);e(150)}t.exports=o},{149:149,150:150}],117:[function(e,t,n){\"use strict\";function r(e){try{e.focus()}catch(t){}}t.exports=r},{}],118:[function(e,t,n){\"use strict\";var r=function(e,t,n){Array.isArray(e)?e.forEach(t,n):e&&t.call(n,e)};t.exports=r},{}],119:[function(e,t,n){function r(){try{return document.activeElement||document.body}catch(e){return document.body}}t.exports=r},{}],120:[function(e,t,n){\"use strict\";function r(e){var t,n=e.keyCode;return\"charCode\"in e?(t=e.charCode,0===t&&13===n&&(t=13)):t=n,t>=32||13===t?t:0}t.exports=r},{}],121:[function(e,t,n){\"use strict\";function r(e){if(e.key){var t=i[e.key]||e.key;if(\"Unidentified\"!==t)return t}if(\"keypress\"===e.type){var n=o(e);return 13===n?\"Enter\":String.fromCharCode(n)}return\"keydown\"===e.type||\"keyup\"===e.type?a[e.keyCode]||\"Unidentified\":\"\"}var o=e(120),i={Esc:\"Escape\",Spacebar:\" \",Left:\"ArrowLeft\",Up:\"ArrowUp\",Right:\"ArrowRight\",Down:\"ArrowDown\",Del:\"Delete\",Win:\"OS\",Menu:\"ContextMenu\",Apps:\"ContextMenu\",Scroll:\"ScrollLock\",MozPrintableKey:\"Unidentified\"},a={8:\"Backspace\",9:\"Tab\",12:\"Clear\",13:\"Enter\",16:\"Shift\",17:\"Control\",18:\"Alt\",19:\"Pause\",20:\"CapsLock\",27:\"Escape\",32:\" \",33:\"PageUp\",34:\"PageDown\",35:\"End\",36:\"Home\",37:\"ArrowLeft\",38:\"ArrowUp\",39:\"ArrowRight\",40:\"ArrowDown\",45:\"Insert\",46:\"Delete\",112:\"F1\",113:\"F2\",114:\"F3\",115:\"F4\",116:\"F5\",117:\"F6\",118:\"F7\",119:\"F8\",120:\"F9\",121:\"F10\",122:\"F11\",123:\"F12\",144:\"NumLock\",145:\"ScrollLock\",224:\"Meta\"};t.exports=r},{120:120}],122:[function(e,t,n){\"use strict\";function r(e){var t=this,n=t.nativeEvent;if(n.getModifierState)return n.getModifierState(e);var r=i[e];return r?!!n[r]:!1}function o(e){return r}var i={Alt:\"altKey\",Control:\"ctrlKey\",Meta:\"metaKey\",Shift:\"shiftKey\"};t.exports=o},{}],123:[function(e,t,n){\"use strict\";function r(e){var t=e.target||e.srcElement||window;return 3===t.nodeType?t.parentNode:t}t.exports=r},{}],124:[function(e,t,n){\"use strict\";function r(e){var t=e&&(o&&e[o]||e[i]);return\"function\"==typeof t?t:void 0}var o=\"function\"==typeof Symbol&&Symbol.iterator,i=\"@@iterator\";t.exports=r},{}],125:[function(e,t,n){function r(e){return i(!!a),d.hasOwnProperty(e)||(e=\"*\"),u.hasOwnProperty(e)||(\"*\"===e?a.innerHTML=\"<link />\":a.innerHTML=\"<\"+e+\"></\"+e+\">\",u[e]=!a.firstChild),u[e]?d[e]:null}var o=e(21),i=e(133),a=o.canUseDOM?document.createElement(\"div\"):null,u={circle:!0,clipPath:!0,defs:!0,ellipse:!0,g:!0,line:!0,linearGradient:!0,path:!0,polygon:!0,polyline:!0,radialGradient:!0,rect:!0,stop:!0,text:!0},s=[1,'<select multiple=\"true\">',\"</select>\"],l=[1,\"<table>\",\"</table>\"],c=[3,\"<table><tbody><tr>\",\"</tr></tbody></table>\"],p=[1,\"<svg>\",\"</svg>\"],d={\"*\":[1,\"?<div>\",\"</div>\"],area:[1,\"<map>\",\"</map>\"],col:[2,\"<table><tbody></tbody><colgroup>\",\"</colgroup></table>\"],legend:[1,\"<fieldset>\",\"</fieldset>\"],param:[1,\"<object>\",\"</object>\"],tr:[2,\"<table><tbody>\",\"</tbody></table>\"],optgroup:s,option:s,caption:l,colgroup:l,tbody:l,tfoot:l,thead:l,td:c,th:c,circle:p,clipPath:p,defs:p,ellipse:p,g:p,line:p,linearGradient:p,path:p,polygon:p,polyline:p,radialGradient:p,rect:p,stop:p,text:p};t.exports=r},{133:133,21:21}],126:[function(e,t,n){\"use strict\";function r(e){for(;e&&e.firstChild;)e=e.firstChild;return e}function o(e){for(;e;){if(e.nextSibling)return e.nextSibling;e=e.parentNode}}function i(e,t){for(var n=r(e),i=0,a=0;n;){if(3===n.nodeType){if(a=i+n.textContent.length,t>=i&&a>=t)return{node:n,offset:t-i};i=a}n=r(o(n))}}t.exports=i},{}],127:[function(e,t,n){\"use strict\";function r(e){return e?e.nodeType===o?e.documentElement:e.firstChild:null}var o=9;t.exports=r},{}],128:[function(e,t,n){\"use strict\";function r(){return!i&&o.canUseDOM&&(i=\"textContent\"in document.documentElement?\"textContent\":\"innerText\"),i}var o=e(21),i=null;t.exports=r},{21:21}],129:[function(e,t,n){\"use strict\";function r(e){return e===window?{x:window.pageXOffset||document.documentElement.scrollLeft,y:window.pageYOffset||document.documentElement.scrollTop}:{x:e.scrollLeft,y:e.scrollTop}}t.exports=r},{}],130:[function(e,t,n){function r(e){return e.replace(o,\"-$1\").toLowerCase()}var o=/([A-Z])/g;t.exports=r},{}],131:[function(e,t,n){\"use strict\";function r(e){return o(e).replace(i,\"-ms-\")}var o=e(130),i=/^ms-/;t.exports=r},{130:130}],132:[function(e,t,n){\"use strict\";function r(e){return\"function\"==typeof e&&\"undefined\"!=typeof e.prototype&&\"function\"==typeof e.prototype.mountComponent&&\"function\"==typeof e.prototype.receiveComponent}function o(e,t){var n;if((null===e||e===!1)&&(e=a.emptyElement),\"object\"==typeof e){var o=e;n=t===o.type&&\"string\"==typeof o.type?u.createInternalComponent(o):r(o.type)?new o.type(o):new c}else\"string\"==typeof e||\"number\"==typeof e?n=u.createInstanceForText(e):l(!1);return n.construct(e),n._mountIndex=0,n._mountImage=null,n}var i=e(37),a=e(57),u=e(71),s=e(27),l=e(133),c=(e(150),function(){});s(c.prototype,i.Mixin,{_instantiateReactComponent:o}),t.exports=o},{133:133,150:150,27:27,37:37,57:57,71:71}],133:[function(e,t,n){\"use strict\";var r=function(e,t,n,r,o,i,a,u){if(!e){var s;if(void 0===t)s=new Error(\"Minified exception occurred; use the non-minified dev environment for the full error message and additional helpful warnings.\");else{var l=[n,r,o,i,a,u],c=0;s=new Error(\"Invariant Violation: \"+t.replace(/%s/g,function(){return l[c++]}))}throw s.framesToPop=1,s}};t.exports=r},{}],134:[function(e,t,n){\"use strict\";function r(e,t){if(!i.canUseDOM||t&&!(\"addEventListener\"in document))return!1;var n=\"on\"+e,r=n in document;if(!r){var a=document.createElement(\"div\");a.setAttribute(n,\"return;\"),r=\"function\"==typeof a[n]}return!r&&o&&\"wheel\"===e&&(r=document.implementation.hasFeature(\"Events.wheel\",\"3.0\")),r}var o,i=e(21);i.canUseDOM&&(o=document.implementation&&document.implementation.hasFeature&&document.implementation.hasFeature(\"\",\"\")!==!0),t.exports=r},{21:21}],135:[function(e,t,n){function r(e){return!(!e||!(\"function\"==typeof Node?e instanceof Node:\"object\"==typeof e&&\"number\"==typeof e.nodeType&&\"string\"==typeof e.nodeName))}t.exports=r},{}],136:[function(e,t,n){\"use strict\";function r(e){return e&&(\"INPUT\"===e.nodeName&&o[e.type]||\"TEXTAREA\"===e.nodeName)}var o={color:!0,date:!0,datetime:!0,\"datetime-local\":!0,email:!0,month:!0,number:!0,password:!0,range:!0,search:!0,tel:!0,text:!0,time:!0,url:!0,week:!0};t.exports=r},{}],137:[function(e,t,n){function r(e){return o(e)&&3==e.nodeType}var o=e(135);t.exports=r},{135:135}],138:[function(e,t,n){\"use strict\";var r=e(133),o=function(e){var t,n={};r(e instanceof Object&&!Array.isArray(e));for(t in e)e.hasOwnProperty(t)&&(n[t]=t);return n};t.exports=o},{133:133}],139:[function(e,t,n){var r=function(e){var t;for(t in e)if(e.hasOwnProperty(t))return t;return null};t.exports=r},{}],140:[function(e,t,n){\"use strict\";function r(e,t,n){if(!e)return null;var r={};for(var i in e)o.call(e,i)&&(r[i]=t.call(n,e[i],i,e));return r}var o=Object.prototype.hasOwnProperty;t.exports=r},{}],141:[function(e,t,n){\"use strict\";function r(e){var t={};return function(n){return t.hasOwnProperty(n)||(t[n]=e.call(this,n)),t[n]}}t.exports=r},{}],142:[function(e,t,n){\"use strict\";function r(e){return i(o.isValidElement(e)),e}var o=e(55),i=e(133);t.exports=r},{133:133,55:55}],143:[function(e,t,n){\"use strict\";function r(e){return'\"'+o(e)+'\"'}var o=e(114);t.exports=r},{114:114}],144:[function(e,t,n){\"use strict\";var r=e(21),o=/^[ \\r\\n\\t\\f]/,i=/<(!--|link|noscript|meta|script|style)[ \\r\\n\\t\\f\\/>]/,a=function(e,t){e.innerHTML=t};if(\"undefined\"!=typeof MSApp&&MSApp.execUnsafeLocalFunction&&(a=function(e,t){MSApp.execUnsafeLocalFunction(function(){e.innerHTML=t})}),r.canUseDOM){var u=document.createElement(\"div\");u.innerHTML=\" \",\"\"===u.innerHTML&&(a=function(e,t){if(e.parentNode&&e.parentNode.replaceChild(e,e),o.test(t)||\"<\"===t[0]&&i.test(t)){e.innerHTML=\"\\ufeff\"+t;var n=e.firstChild;1===n.data.length?e.removeChild(n):n.deleteData(0,1)}else e.innerHTML=t})}t.exports=a},{21:21}],145:[function(e,t,n){\"use strict\";var r=e(21),o=e(114),i=e(144),a=function(e,t){e.textContent=t};r.canUseDOM&&(\"textContent\"in document.documentElement||(a=function(e,t){i(e,o(t))})),t.exports=a},{114:114,144:144,21:21}],146:[function(e,t,n){\"use strict\";function r(e,t){if(e===t)return!0;var n;for(n in e)if(e.hasOwnProperty(n)&&(!t.hasOwnProperty(n)||e[n]!==t[n]))return!1;for(n in t)if(t.hasOwnProperty(n)&&!e.hasOwnProperty(n))return!1;return!0}t.exports=r},{}],147:[function(e,t,n){\"use strict\";function r(e,t){if(null!=e&&null!=t){var n=typeof e,r=typeof t;if(\"string\"===n||\"number\"===n)return\"string\"===r||\"number\"===r;if(\"object\"===r&&e.type===t.type&&e.key===t.key){var o=e._owner===t._owner;return o}}return!1}e(150);t.exports=r},{150:150}],148:[function(e,t,n){function r(e){var t=e.length;if(o(!Array.isArray(e)&&(\"object\"==typeof e||\"function\"==typeof e)),o(\"number\"==typeof t),o(0===t||t-1 in e),e.hasOwnProperty)try{return Array.prototype.slice.call(e)}catch(n){}for(var r=Array(t),i=0;t>i;i++)r[i]=e[i];return r}var o=e(133);t.exports=r},{133:133}],149:[function(e,t,n){\"use strict\";function r(e){return v[e]}function o(e,t){return e&&null!=e.key?a(e.key):t.toString(36)}function i(e){return(\"\"+e).replace(g,r)}function a(e){return\"$\"+i(e)}function u(e,t,n,r,i){var s=typeof e;if((\"undefined\"===s||\"boolean\"===s)&&(e=null),null===e||\"string\"===s||\"number\"===s||l.isValidElement(e))return r(i,e,\"\"===t?h+o(e,0):t,n),1;var p,v,g,y=0;if(Array.isArray(e))for(var C=0;C<e.length;C++)p=e[C],v=(\"\"!==t?t+m:h)+o(p,C),g=n+y,y+=u(p,v,g,r,i);else{var E=d(e);if(E){var b,_=E.call(e);if(E!==e.entries)for(var x=0;!(b=_.next()).done;)p=b.value,v=(\"\"!==t?t+m:h)+o(p,x++),g=n+y,y+=u(p,v,g,r,i);else for(;!(b=_.next()).done;){var D=b.value;D&&(p=D[1],v=(\"\"!==t?t+m:h)+a(D[0])+m+o(p,0),g=n+y,y+=u(p,v,g,r,i))}}else if(\"object\"===s){f(1!==e.nodeType);var M=c.extract(e);for(var N in M)M.hasOwnProperty(N)&&(p=M[N],v=(\"\"!==t?t+m:h)+a(N)+m+o(p,0),g=n+y,y+=u(p,v,g,r,i))}}return y}function s(e,t,n){return null==e?0:u(e,\"\",0,t,n)}var l=e(55),c=e(61),p=e(64),d=e(124),f=e(133),h=(e(150),p.SEPARATOR),m=\":\",v={\"=\":\"=0\",\".\":\"=1\",\":\":\"=2\"},g=/[=.:]/g;t.exports=s},{124:124,133:133,150:150,55:55,61:61,64:64}],150:[function(e,t,n){\"use strict\";var r=e(112),o=r;t.exports=o},{112:112}]},{},[1])(1)});PK\x07\x08\xab\xc3\xfe2\x8a\xdb\x01\x00\x8a\xdb\x01\x00PK\x01\x02\x14\x03\x14\x00\x08\x00\x00\x00W\x9a5GHx6\x84\x0e\x03\x00\x00\x0e\x03\x00\x00	\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xa4\x81\x00\x00\x00\x00README.mdPK\x01\x02\x14\x03\x14\x00\x08\x00\x00\x00W\x9a5G\x9c\x84U>\x8e\x05\x00\x00\x8e\x05\x00\x00\x0d\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xa4\x81E\x03\x00\x00css/admin.cssPK\x01\x02\x14\x03\x14\x00\x08\x00\x00\x00W\x9a5G\xbeO[\x0b6)\x02\x006)\x02\x00\x11\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xa4\x81\x0e	\x00\x00css/bootstrap.cssPK\x01\x02\x14\x03\x14\x00\x08\x00\x00\x00W\x9a5G\x9a\x90:SN \x00\x00N \x00\x00\x1d\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xed\x81\x832\x02\x00css/dropdowns-enhancement.cssPK\x01\x02\x14\x03\x14\x00\x08\x00\x00\x00W\x9a5GX\xc7\xb1\x9c\x9fN\x00\x00\x9fN\x00\x00&\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xa4\x81\x1cS\x02\x00fonts/glyphicons-halflings-regular.eotPK\x01\x02\x14\x03\x14\x00\x08\x00\x00\x00W\x9a5G|\xee\xc6\xc9\xc2\xa8\x01\x00\xc2\xa8\x01\x00&\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xa4\x81\x0f\xa2\x02\x00fonts/glyphicons-halflings-regular.svgPK\x01\x02\x14\x03\x14\x00\x08\x00\x00\x00W\x9a5G\x9a\x17<\x9c\\\xb1\x00\x00\\\xb1\x00\x00&\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xa4\x81%K\x04\x00fonts/glyphicons-halflings-regular.ttfPK\x01\x02\x14\x03\x14\x00\x08\x00\x00\x00W\x9a5G\xea\x14{\xf5\x80[\x00\x00\x80[\x00\x00'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xa4\x81\xd5\xfc\x04\x00fonts/glyphicons-halflings-regular.woffPK\x01\x02\x14\x03\x14\x00\x08\x00\x00\x00W\x9a5Gv\xe8\xc3alF\x00\x00lF\x00\x00(\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xa4\x81\xaaX\x05\x00fonts/glyphicons-halflings-regular.woff2PK\x01\x02\x14\x03\x14\x00\x08\x00\x00\x00W\x9a5Gz\x1b\xa9\xd9?M\x00\x00?M\x00\x00\x19\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xa4\x81l\x9f\x05\x00img/influxdb-light400.pngPK\x01\x02\x14\x03\x14\x00\x08\x00\x00\x00W\x9a5G\xb1y\"\x84\xdc$\x00\x00\xdc$\x00\x00\n\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xa4\x81\xf2\xec\x05\x00index.htmlPK\x01\x02\x14\x03\x14\x00\x08\x00\x00\x00[\xb0HG\xe0U\xfd\xad\x915\x00\x00\x915\x00\x00\x0b\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xa4\x81\x06\x12\x06\x00js/admin.jsPK\x01\x02\x14\x03\x14\x00\x08\x00\x00\x00W\x9a5G^\xbfIn\xd0\x8f\x00\x00\xd0\x8f\x00\x00 \x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xa4\x81\xd0G\x06\x00js/vendor/bootstrap-3.3.5.min.jsPK\x01\x02\x14\x03\x14\x00\x08\x00\x00\x00W\x9a5G\x12\x138\xccyI\x01\x00yI\x01\x00\x1d\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xa4\x81\xee\xd7\x06\x00js/vendor/jquery-2.1.4.min.jsPK\x01\x02\x14\x03\x14\x00\x08\x00\x00\x00W\x9a5G\xab\xc3\xfe2\x8a\xdb\x01\x00\x8a\xdb\x01\x00\x1d\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xa4\x81\xb2!\x08\x00js/vendor/react-0.13.3.min.jsPK\x05\x06\x00\x00\x00\x00\x0f\x00\x0f\x00?\x04\x00\x00\x87\xfd	\x00\x00\x00"
-	fs.Register(data)
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/stress/config.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/stress/config.go
deleted file mode 100644
index 8012f2c39..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/stress/config.go
+++ /dev/null
@@ -1,281 +0,0 @@
-package runner
-
-import (
-	"bytes"
-	"fmt"
-	"math/rand"
-	"time"
-
-	"github.com/BurntSushi/toml"
-)
-
-// tag is a struct that contains data
-// about a tag for in a series
-type tag struct {
-	Key   string `toml:"key"`
-	Value string `toml:"value"`
-}
-
-// tag is a struct that contains data
-// about a field for in a series
-type field struct {
-	Key  string `toml:"key"`
-	Type string `toml:"type"`
-}
-
-// series is a struct that contains data
-// about the series that will be written
-// during a stress test
-type series struct {
-	PointCount  int     `toml:"point_count"`
-	Tick        string  `toml:"tick"`
-	Jitter      bool    `toml:"jitter"`
-	Measurement string  `toml:"measurement"`
-	SeriesCount int     `toml:"series_count"`
-	TagCount    int     `toml:"tag_count"`
-	Tags        []tag   `toml:"tag"`
-	Fields      []field `toml:"field"`
-}
-
-// write is a struct that contains the business
-// logic for the stress test. e.g. where the
-// influxdb instance is running, what database
-// should points be written into
-type write struct {
-	Concurrency   int    `toml:"concurrency"`
-	BatchSize     int    `toml:"batch_size"`
-	BatchInterval string `toml:"batch_interval"`
-	Database      string `toml:"database"`
-	ResetDatabase bool   `toml:"reset_database"`
-	Address       string `toml:"address"`
-	Precision     string `toml:"precision"`
-	StartDate     string `toml:"start_date"`
-}
-
-// query is a struct that contains the logic for
-// a query that will be ran on during the stress
-// test
-type query struct {
-	Enabled     bool     `toml:"enabled"`
-	Concurrency int      `toml:"concurrency"`
-	Aggregates  []string `toml:"aggregates"`
-	Fields      []string `toml:"fields"`
-}
-
-// measurementQuery is a struct that contains
-// the logic that runs a query against a measurement
-// over a time period that is specified by
-// `Offset`
-type measurementQuery struct {
-	query
-	Offset string `toml:"offset"`
-}
-
-// seriesQuery is a struct that contains
-// the logic that runs a query against a single
-// series
-type seriesQuery struct {
-	query
-	Interval string `toml:"interval"`
-}
-
-// Config is a struct that is passed into the `Run()` function.
-type Config struct {
-	Write             write            `toml:"write"`
-	Series            []series         `toml:"series"`
-	MeasurementQuery  measurementQuery `toml:"measurement_query"`
-	SeriesQuery       seriesQuery      `toml:"series_query"`
-	ChannelBufferSize int              `toml:"channel_buffer_size"`
-	SSL               bool             `toml:"ssl"`
-}
-
-// NewSeries takes a measurement, and point count,
-// and a series count and returns a series
-func NewSeries(m string, p int, sc int) series {
-	s := series{
-		PointCount:  p,
-		SeriesCount: sc,
-		Tick:        "1s",
-		Measurement: m,
-		Tags: []tag{
-			tag{
-				Key:   "host",
-				Value: "server",
-			},
-		},
-		Fields: []field{
-			field{
-				Key: "value",
-			},
-		},
-	}
-
-	return s
-}
-
-// NewConfig returns a pointer to a config
-// with some default parameters set
-func NewConfig() *Config {
-
-	w := write{
-		Concurrency:   10,
-		BatchSize:     5000,
-		BatchInterval: "0s",
-		Database:      "stress",
-		ResetDatabase: true,
-		Address:       "localhost:8086",
-		Precision:     "n",
-	}
-
-	c := &Config{
-		Write: w,
-	}
-
-	return c
-}
-
-// DecodeFile takes a file path for a toml config file
-// and returns a pointer to a Config Struct.
-func DecodeFile(s string) (*Config, error) {
-	t := &Config{}
-
-	// Decode the toml file
-	if _, err := toml.DecodeFile(s, t); err != nil {
-		return nil, err
-	}
-
-	// Initialize Config struct
-	// NOTE: Not happy with the implementation
-	// but it will do for now
-	for j, srs := range t.Series {
-		for i := 0; i < srs.TagCount; i++ {
-
-			tag := tag{
-				Key:   fmt.Sprintf("tag-key-%d", i),
-				Value: "tag-value",
-			}
-
-			srs.Tags = append(srs.Tags, tag)
-			fmt.Println(srs)
-		}
-
-		t.Series[j] = srs
-	}
-
-	return t, nil
-}
-
-// seriesIter is a struct that contains a
-// series and a count, where count is the
-//number of points that have been written
-// for the series `s`
-type seriesIter struct {
-	s         *series
-	count     int
-	timestamp time.Time
-	precision string
-}
-
-// writeInterval returns a timestamp for the current time
-// interval
-func (s *series) writeInterval(i int, start time.Time) time.Time {
-	var tick time.Duration
-	var j int
-	var err error
-
-	tick, err = time.ParseDuration(s.Tick)
-	if err != nil {
-		panic(err)
-	}
-
-	if s.Jitter {
-		j = rand.Intn(int(tick))
-		if j%2 == 0 {
-			j = -2 * j
-		}
-	}
-
-	tick = tick*time.Duration(i) + time.Duration(j)
-
-	return start.Add(tick)
-}
-
-// Iter returns a pointer to a seriesIter
-func (s *series) Iter(i int, start time.Time, p string) *seriesIter {
-
-	return &seriesIter{s: s, count: -1, timestamp: s.writeInterval(i, start), precision: p}
-}
-
-// Next returns a new point for a series.
-// Currently, there is an off by one bug here.
-func (iter *seriesIter) Next() ([]byte, bool) {
-	var buf bytes.Buffer
-	iter.count++
-
-	buf.Write([]byte(fmt.Sprintf("%v,", iter.s.Measurement)))
-	buf.Write(iter.s.newTagSet(iter.count))
-	buf.Write([]byte(" "))
-	buf.Write(iter.s.newFieldSet(iter.count))
-	buf.Write([]byte(" "))
-
-	switch iter.precision {
-	case "s":
-		buf.Write([]byte(fmt.Sprintf("%v", iter.timestamp.Unix())))
-	default:
-		buf.Write([]byte(fmt.Sprintf("%v", iter.timestamp.UnixNano())))
-	}
-
-	b := iter.count < iter.s.SeriesCount
-	byt := buf.Bytes()
-
-	return byt, b
-}
-
-// newTagSet returns a byte array representation
-// of the tagset for a series
-func (s *series) newTagSet(c int) []byte {
-	var buf bytes.Buffer
-	for _, tag := range s.Tags {
-		buf.Write([]byte(fmt.Sprintf("%v=%v-%v,", tag.Key, tag.Value, c)))
-	}
-
-	b := buf.Bytes()
-	b = b[0 : len(b)-1]
-
-	return b
-}
-
-// newFieldSet returns a byte array representation
-// of the field-set for a series
-func (s *series) newFieldSet(c int) []byte {
-	var buf bytes.Buffer
-
-	for _, field := range s.Fields {
-		switch field.Type {
-		case "float64-flat":
-			if rand.Intn(10) > 2 {
-				buf.Write([]byte(fmt.Sprintf("%v=%v,", field.Key, 100)))
-			} else {
-				buf.Write([]byte(fmt.Sprintf("%v=%v,", field.Key, 100+rand.Intn(100))))
-			}
-		case "float64-inc+":
-			buf.Write([]byte(fmt.Sprintf("%v=%v,", field.Key, c+rand.Intn(2))))
-		case "float64-inc":
-			buf.Write([]byte(fmt.Sprintf("%v=%v,", field.Key, c)))
-		case "float64":
-			buf.Write([]byte(fmt.Sprintf("%v=%v,", field.Key, rand.Intn(1000))))
-		case "int":
-			buf.Write([]byte(fmt.Sprintf("%v=%vi,", field.Key, rand.Intn(1000))))
-		case "bool":
-			b := rand.Intn(2) == 1
-			buf.Write([]byte(fmt.Sprintf("%v=%v,", field.Key, b)))
-		default:
-			buf.Write([]byte(fmt.Sprintf("%v=%v,", field.Key, rand.Intn(1000))))
-		}
-	}
-
-	b := buf.Bytes()
-	b = b[0 : len(b)-1]
-
-	return b
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/stress/query.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/stress/query.go
deleted file mode 100644
index 832d4d297..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/stress/query.go
+++ /dev/null
@@ -1,138 +0,0 @@
-package runner
-
-import (
-	"fmt"
-	"sync"
-	"time"
-
-	"github.com/influxdb/influxdb/client"
-)
-
-// QueryResults holds the total number of executed queries
-// and the response time for each query
-type QueryResults struct {
-	TotalQueries  int
-	ResponseTimes ResponseTimes
-}
-
-func SeriesQuery(cfg *Config, done chan struct{}, results chan QueryResults) {
-
-	var mu sync.Mutex
-	var wg sync.WaitGroup
-	responseTimes := make(ResponseTimes, 0)
-	totalQueries := 0
-
-	c, err := cfg.NewClient()
-	if err != nil {
-		panic(err)
-	}
-
-	counter := NewConcurrencyLimiter(cfg.SeriesQuery.Concurrency)
-	for _, s := range cfg.Series {
-		for i := 0; i < s.SeriesCount; i++ {
-			for _, a := range cfg.SeriesQuery.Aggregates {
-				for _, f := range cfg.SeriesQuery.Fields {
-					q := fmt.Sprintf("SELECT %v(%v) FROM %v WHERE %v='%v-%v'", a, f, s.Measurement, s.Tags[0].Key, s.Tags[0].Value, i)
-
-					wg.Add(1)
-					counter.Increment()
-					totalQueries += 1
-
-					go func(q string) {
-
-						select {
-						case <-done:
-							results <- QueryResults{
-								TotalQueries:  totalQueries,
-								ResponseTimes: responseTimes,
-							}
-						default:
-							st := time.Now()
-							_, err := c.Query(client.Query{
-								Command:  q,
-								Database: cfg.Write.Database,
-							})
-							if err != nil {
-								fmt.Println("Error")
-							}
-							mu.Lock()
-							totalQueries += 1
-							responseTimes = append(responseTimes, NewResponseTime(int(time.Since(st).Nanoseconds())))
-							mu.Unlock()
-							wg.Done()
-							t, err := time.ParseDuration(cfg.SeriesQuery.Interval)
-							time.Sleep(t)
-						}
-
-						counter.Decrement()
-
-					}(q)
-
-				}
-			}
-		}
-	}
-
-	wg.Wait()
-
-	return
-
-}
-
-func MeasurementQuery(cfg *Config, timestamp chan time.Time, results chan QueryResults) {
-
-	var wg sync.WaitGroup
-	responseTimes := make(ResponseTimes, 0)
-	totalQueries := 0
-
-	c, err := cfg.NewClient()
-	if err != nil {
-		panic(err)
-	}
-
-	for _, s := range cfg.Series {
-		for _, a := range cfg.MeasurementQuery.Aggregates {
-			for _, f := range cfg.MeasurementQuery.Fields {
-
-				wg.Add(1)
-
-				go func(a string, f string, m string) {
-
-					tsp := <-timestamp
-
-					offset, err := time.ParseDuration(cfg.MeasurementQuery.Offset)
-					if err != nil {
-						panic(err)
-					}
-
-					q := fmt.Sprintf("SELECT %v(%v) FROM %v WHERE time>=%vs", a, f, m, tsp.Add(-1*offset).Unix())
-					st := time.Now()
-
-					_, err = c.Query(client.Query{
-						Command:  q,
-						Database: cfg.Write.Database,
-					})
-
-					if err != nil {
-						fmt.Println("Error")
-					}
-
-					totalQueries += 1
-					responseTimes = append(responseTimes, NewResponseTime(int(time.Since(st).Nanoseconds())))
-					wg.Done()
-
-				}(a, f, s.Measurement)
-
-			}
-		}
-	}
-
-	wg.Wait()
-	results <- QueryResults{
-		TotalQueries:  totalQueries,
-		ResponseTimes: responseTimes,
-	}
-
-	return
-
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/stress/runner.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/stress/runner.go
deleted file mode 100644
index 1c758a065..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/stress/runner.go
+++ /dev/null
@@ -1,360 +0,0 @@
-package runner
-
-import (
-	"bytes"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"net/http"
-	"strings"
-	"sync"
-	"time"
-
-	"github.com/influxdb/influxdb/client"
-)
-
-func post(url string, datatype string, data io.Reader) error {
-
-	resp, err := http.Post(url, datatype, data)
-	if err != nil {
-		return err
-	}
-	defer resp.Body.Close()
-
-	body, err := ioutil.ReadAll(resp.Body)
-	if err != nil {
-		return err
-	}
-
-	if resp.StatusCode != http.StatusNoContent && resp.StatusCode != http.StatusOK {
-		return fmt.Errorf(string(body))
-	}
-
-	return nil
-}
-
-// Timer is struct that can be used to track elaspsed time
-type Timer struct {
-	start time.Time
-	end   time.Time
-}
-
-// Start returns a Timers start field
-func (t *Timer) Start() time.Time {
-	return t.start
-}
-
-// End returns a Timers end field
-func (t *Timer) End() time.Time {
-	return t.end
-}
-
-// StartTimer sets a timers `start` field to the current time
-func (t *Timer) StartTimer() {
-	t.start = time.Now()
-}
-
-// StopTimer sets a timers `end` field to the current time
-func (t *Timer) StopTimer() {
-	t.end = time.Now()
-}
-
-// Elapsed returns the total elapsed time between the `start`
-// and `end` fields on a timer.
-func (t *Timer) Elapsed() time.Duration {
-	return t.end.Sub(t.start)
-}
-
-// NewTimer returns a pointer to a `Timer` struct where the
-// timers `start` field has been set to `time.Now()`
-func NewTimer() *Timer {
-	t := &Timer{}
-	t.StartTimer()
-	return t
-}
-
-// ResponseTime is a struct that contains `Value`
-// `Time` pairing.
-type ResponseTime struct {
-	Value int
-	Time  time.Time
-}
-
-// NewResponseTime returns a new response time
-// with value `v` and time `time.Now()`.
-func NewResponseTime(v int) ResponseTime {
-	r := ResponseTime{Value: v, Time: time.Now()}
-	return r
-}
-
-// ResponseTimes is a slice of response times
-type ResponseTimes []ResponseTime
-
-// Implements the `Len` method for the
-// sort.Interface type
-func (rs ResponseTimes) Len() int {
-	return len(rs)
-}
-
-// Implements the `Less` method for the
-// sort.Interface type
-func (rs ResponseTimes) Less(i, j int) bool {
-	return rs[i].Value < rs[j].Value
-}
-
-// Implements the `Swap` method for the
-// sort.Interface type
-func (rs ResponseTimes) Swap(i, j int) {
-	rs[i], rs[j] = rs[j], rs[i]
-}
-
-// Measurements holds all measurement results of the stress test
-type Measurements []string
-
-// String returns a string and implements the `String` method for
-// the flag.Value interface.
-func (ms *Measurements) String() string {
-	return fmt.Sprint(*ms)
-}
-
-// Set implements the `Set` method for the flag.Value
-// interface. Set splits a string of comma separated values
-// into a `Measurement`.
-func (ms *Measurements) Set(value string) error {
-	values := strings.Split(value, ",")
-	for _, m := range values {
-		*ms = append(*ms, m)
-	}
-	return nil
-}
-
-// NewClient returns a pointer to an InfluxDB client for
-// a `Config`'s `Address` field. If an error is encountered
-// when creating a new client, the function panics.
-func (cfg *Config) NewClient() (*client.Client, error) {
-	u, _ := client.ParseConnectionString(cfg.Write.Address, cfg.SSL)
-	c, err := client.NewClient(client.Config{URL: u})
-	if err != nil {
-		return nil, err
-	}
-	return c, nil
-}
-
-func resetDB(c *client.Client, database string) error {
-	_, err := c.Query(client.Query{
-		Command: fmt.Sprintf("DROP DATABASE %s", database),
-	})
-
-	if err != nil && !strings.Contains(err.Error(), "database not found") {
-		return err
-	}
-
-	return nil
-}
-
-// Run runs the stress test that is specified by a `Config`.
-// It returns the total number of points that were during the test,
-// an slice of all of the stress tests response times,
-// and the times that the test started at and ended as a `Timer`
-func Run(cfg *Config, done chan struct{}, ts chan time.Time) (totalPoints int, failedRequests int, responseTimes ResponseTimes, timer *Timer) {
-
-	c, err := cfg.NewClient()
-	if err != nil {
-		panic(err)
-	}
-
-	if cfg.Write.ResetDatabase {
-		resetDB(c, cfg.Write.Database)
-	}
-
-	_, err = c.Query(client.Query{
-		Command: fmt.Sprintf("CREATE DATABASE %s", cfg.Write.Database),
-	})
-
-	if err != nil && !strings.Contains(err.Error(), "database already exists") {
-		fmt.Println(err)
-	}
-
-	counter := NewConcurrencyLimiter(cfg.Write.Concurrency)
-
-	var mu sync.Mutex
-	var wg sync.WaitGroup
-	responseTimes = make(ResponseTimes, 0)
-
-	failedRequests = 0
-
-	totalPoints = 0
-
-	lastSuccess := true
-
-	ch := make(chan []byte, cfg.ChannelBufferSize)
-
-	go func() {
-		var buf bytes.Buffer
-		num := 0
-		for _, s := range cfg.Series {
-			num += s.PointCount * s.SeriesCount
-
-		}
-
-		if cfg.MeasurementQuery.Enabled {
-			num = num / (len(cfg.Series) * len(cfg.MeasurementQuery.Aggregates) * len(cfg.MeasurementQuery.Fields))
-		}
-
-		ctr := 0
-
-		start, err := time.Parse("2006-Jan-02", cfg.Write.StartDate)
-		if err != nil {
-			start, err = time.Parse("Jan 2, 2006 at 3:04pm (MST)", cfg.Write.StartDate)
-			if err != nil {
-				start = time.Now()
-			}
-		}
-
-		for _, testSeries := range cfg.Series {
-			for i := 0; i < testSeries.PointCount; i++ {
-				iter := testSeries.Iter(i, start, cfg.Write.Precision)
-				p, ok := iter.Next()
-				for ok {
-					ctr++
-					buf.Write(p)
-					buf.Write([]byte("\n"))
-					if ctr != 0 && ctr%cfg.Write.BatchSize == 0 {
-						b := buf.Bytes()
-
-						b = b[0 : len(b)-2]
-
-						ch <- b
-						var b2 bytes.Buffer
-						buf = b2
-					}
-
-					if cfg.MeasurementQuery.Enabled && ctr%num == 0 {
-						select {
-						case ts <- time.Now():
-						default:
-						}
-					}
-
-					p, ok = iter.Next()
-				}
-			}
-		}
-
-		close(ch)
-
-	}()
-
-	fmt.Println("Filling the Point Channel Buffer...")
-	fmt.Printf("Test will begin in %v seconds\n", (time.Duration(cfg.ChannelBufferSize/10) * time.Millisecond).Seconds())
-	time.Sleep(time.Duration(cfg.ChannelBufferSize/10) * time.Millisecond)
-	fmt.Println("Starting Stress...")
-
-	timer = NewTimer()
-
-	for pnt := range ch {
-
-		wg.Add(1)
-		counter.Increment()
-		totalPoints += cfg.Write.BatchSize
-
-		protocol := "http"
-
-		if cfg.SSL {
-			protocol = fmt.Sprintf("%vs", protocol)
-		}
-
-		instanceURL := fmt.Sprintf("%v://%v/write?db=%v&precision=%v", protocol, cfg.Write.Address, cfg.Write.Database, cfg.Write.Precision)
-
-		go func(b *bytes.Buffer, total int) {
-			st := time.Now()
-			err := post(instanceURL, "application/x-www-form-urlencoded", b)
-			if err != nil { // Should retry write if failed
-				mu.Lock()
-				if lastSuccess {
-					fmt.Println("ERROR: ", err.Error())
-				}
-				failedRequests += 1
-				totalPoints -= cfg.Write.BatchSize
-				lastSuccess = false
-				mu.Unlock()
-			} else {
-				mu.Lock()
-				if !lastSuccess {
-					fmt.Println("success in ", time.Since(st))
-				}
-				lastSuccess = true
-				responseTimes = append(responseTimes, NewResponseTime(int(time.Since(st).Nanoseconds())))
-				mu.Unlock()
-			}
-			batchInterval, _ := time.ParseDuration(cfg.Write.BatchInterval)
-			time.Sleep(batchInterval)
-			wg.Done()
-			counter.Decrement()
-			if total%500000 == 0 {
-				fmt.Printf("%d total points. %d in %s\n", total, cfg.Write.BatchSize, time.Since(st))
-			}
-		}(bytes.NewBuffer(pnt), totalPoints)
-
-	}
-
-	wg.Wait()
-
-	timer.StopTimer()
-
-	if cfg.SeriesQuery.Enabled {
-		done <- struct{}{}
-	}
-
-	return
-}
-
-// ConcurrencyLimiter is a go routine safe struct that can be used to
-// ensure that no more than a specifid max number of goroutines are
-// executing.
-type ConcurrencyLimiter struct {
-	inc   chan chan struct{}
-	dec   chan struct{}
-	max   int
-	count int
-}
-
-// NewConcurrencyLimiter returns a configured limiter that will
-// ensure that calls to Increment will block if the max is hit.
-func NewConcurrencyLimiter(max int) *ConcurrencyLimiter {
-	c := &ConcurrencyLimiter{
-		inc: make(chan chan struct{}),
-		dec: make(chan struct{}, max),
-		max: max,
-	}
-	go c.handleLimits()
-	return c
-}
-
-// Increment will increase the count of running goroutines by 1.
-// if the number is currently at the max, the call to Increment
-// will block until another goroutine decrements.
-func (c *ConcurrencyLimiter) Increment() {
-	r := make(chan struct{})
-	c.inc <- r
-	<-r
-}
-
-// Decrement will reduce the count of running goroutines by 1
-func (c *ConcurrencyLimiter) Decrement() {
-	c.dec <- struct{}{}
-}
-
-// handleLimits runs in a goroutine to manage the count of
-// running goroutines.
-func (c *ConcurrencyLimiter) handleLimits() {
-	for {
-		r := <-c.inc
-		if c.count >= c.max {
-			<-c.dec
-			c.count--
-		}
-		c.count++
-		r <- struct{}{}
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/stress/runner_test.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/stress/runner_test.go
deleted file mode 100644
index 5fe2fbf01..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/stress/runner_test.go
+++ /dev/null
@@ -1,246 +0,0 @@
-package runner
-
-import (
-	"encoding/json"
-	"net/http"
-	"net/http/httptest"
-	"testing"
-	"time"
-
-	"github.com/influxdb/influxdb/client"
-)
-
-func TestTimer_StartTimer(t *testing.T) {
-	var epoch time.Time
-
-	tmr := &Timer{}
-
-	tmr.StartTimer()
-
-	s := tmr.Start()
-
-	if s == epoch {
-		t.Errorf("expected tmr.start to not be %v", s)
-	}
-}
-
-func TestNewTimer(t *testing.T) {
-	var epoch time.Time
-
-	tmr := NewTimer()
-
-	s := tmr.Start()
-
-	if s == epoch {
-		t.Errorf("expected tmr.start to not be %v", s)
-	}
-
-	e := tmr.End()
-
-	if e != epoch {
-		t.Errorf("expected tmr.stop to be %v, got %v", epoch, e)
-	}
-}
-
-func TestTimer_StopTimer(t *testing.T) {
-	var epoch time.Time
-
-	tmr := NewTimer()
-
-	tmr.StopTimer()
-
-	e := tmr.End()
-
-	if e == epoch {
-		t.Errorf("expected tmr.stop to not be %v", e)
-	}
-}
-
-func TestTimer_Elapsed(t *testing.T) {
-
-	tmr := NewTimer()
-	time.Sleep(2 * time.Second)
-	tmr.StopTimer()
-
-	e := tmr.Elapsed()
-
-	if time.Duration(2*time.Second) > e || e > time.Duration(3*time.Second) {
-		t.Errorf("expected around %s got %s", time.Duration(2*time.Second), e)
-	}
-
-}
-
-func TestNewResponseTime(t *testing.T) {
-	r := NewResponseTime(100)
-
-	if r.Value != 100 {
-		t.Errorf("expected Value to be %v, got %v", 100, r.Value)
-	}
-
-	var epoch time.Time
-
-	if r.Time == epoch {
-		t.Errorf("expected r.Time not to be %v", epoch)
-	}
-
-}
-
-func TestMeasurments_Set(t *testing.T) {
-	ms := make(Measurements, 0)
-
-	ms.Set("this,is,a,test")
-
-	if ms[0] != "this" {
-		t.Errorf("expected value to be %v, got %v", "this", ms[0])
-	}
-
-	if ms[1] != "is" {
-		t.Errorf("expected value to be %v, got %v", "is", ms[1])
-	}
-
-	ms.Set("more,here")
-
-	if ms[4] != "more" {
-		t.Errorf("expected value to be %v, got %v", "more", ms[4])
-	}
-
-	if len(ms) != 6 {
-		t.Errorf("expected the length of ms to be %v, got %v", 6, len(ms))
-	}
-
-}
-
-func TestNewSeries(t *testing.T) {
-	s := NewSeries("cpu", 1000, 10000)
-
-	if s.PointCount != 1000 {
-		t.Errorf("expected value to be %v, got %v", 1000, s.PointCount)
-	}
-
-	if s.SeriesCount != 10000 {
-		t.Errorf("expected value to be %v, got %v", 10000, s.SeriesCount)
-	}
-
-	if s.Measurement != "cpu" {
-		t.Errorf("expected value to be %v, got %v", "cpu", s.Measurement)
-	}
-}
-
-func TestNewConfig(t *testing.T) {
-	c := NewConfig()
-
-	if c.Write.BatchSize != 5000 {
-		t.Errorf("expected value to be %v, got %v", 5000, c.Write.BatchSize)
-	}
-
-}
-
-func TestSeriesIter_Next(t *testing.T) {
-	s := NewSeries("cpu", 1000, 10000)
-	const shortForm = "2006-Jan-02"
-	tm, _ := time.Parse(shortForm, "2013-Feb-03")
-	i := s.Iter(10, tm, "n")
-	if i.count != -1 {
-		t.Errorf("expected value to be %v, go %v", -1, i.count)
-	}
-
-	_, ok := i.Next()
-
-	for ok {
-		_, ok = i.Next()
-	}
-
-	if i.count != s.SeriesCount {
-		t.Errorf("expected value to be %v, go %v", s.SeriesCount, i.count)
-	}
-
-}
-
-func TestConfig_newClient(t *testing.T) {
-	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		w.Header().Set("X-Influxdb-Version", "x.x")
-		return
-	}))
-	defer ts.Close()
-
-	ms := make(Measurements, 0)
-	ms.Set("this,is,a,test")
-
-	url := ts.URL[7:]
-
-	cfg, err := DecodeFile("test.toml")
-
-	if err != nil {
-		panic(err)
-	}
-
-	cfg.Write.Address = url
-
-	// the client.NewClient method in the influxdb go
-	// client never returns an error that is not nil.
-	// To test that the client actually gets created without
-	// any error, I run the Ping() method to verify that everything
-	// is okay.
-	c, err := cfg.NewClient()
-
-	// This err will never be nil. See the following URL:
-	// https://github.com/influxdb/influxdb/blob/master/client/influxdb.go#L119
-	if err != nil {
-		t.Error(err)
-	}
-
-	// Verify that the client actually gets created correctly
-	d, version, err := c.Ping()
-	if err != nil {
-		t.Fatalf("unexpected error.  expected %v, actual %v", nil, err)
-	}
-	if d == 0 {
-		t.Fatalf("expected a duration greater than zero.  actual %v", d)
-	}
-	if version != "x.x" {
-		t.Fatalf("unexpected version.  expected %s,  actual %v", "x.x", version)
-	}
-}
-
-func TestRun(t *testing.T) {
-	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		var data client.Response
-		w.WriteHeader(http.StatusOK)
-		_ = json.NewEncoder(w).Encode(data)
-	}))
-	defer ts.Close()
-
-	ms := make(Measurements, 0)
-	ms.Set("this,is,a,test")
-
-	url := ts.URL[7:]
-
-	cfg, _ := DecodeFile("test.toml")
-
-	cfg.Write.Address = url
-
-	d := make(chan struct{})
-	timestamp := make(chan time.Time)
-
-	tp, _, rts, tmr := Run(cfg, d, timestamp)
-
-	ps := cfg.Series[0].SeriesCount * cfg.Series[0].PointCount
-
-	if tp != ps {
-		t.Fatalf("unexpected error. expected %v, actual %v", ps, tp)
-	}
-
-	if len(rts) != ps/cfg.Write.BatchSize {
-		t.Fatalf("unexpected error. expected %v, actual %v", ps/cfg.Write.BatchSize, len(rts))
-	}
-
-	var epoch time.Time
-
-	if tmr.Start() == epoch {
-		t.Errorf("expected trm.start not to be %s", epoch)
-	}
-
-	if tmr.End() == epoch {
-		t.Errorf("expected trm.end not to be %s", epoch)
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/stress/test.toml b/Godeps/_workspace/src/github.com/influxdb/influxdb/stress/test.toml
deleted file mode 100644
index c008366ba..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/stress/test.toml
+++ /dev/null
@@ -1,43 +0,0 @@
-channel_buffer_size = 100
-
-[write]
-  concurrency = 10
-  batch_size = 10000
-  batch_interval = "0s"
-  database = "stress"
-  precision = "s"
-  address = "localhost:8086"
-  reset_database = true
-  start_date = "2006-Jan-02"
-
-[[series]]
-  tick = "10s"
-  point_count = 10 # number of points that will be written for each of the series
-  measurement = "cpu"
-  series_count = 10000
-
-  tag_count = 0 # 
-
-  [[series.tag]]
-    key = "host"
-    value = "idk"
-
-  [[series.tag]]
-    key = "location"
-    value = "lame"
-
-  [[series.field]]
-    key = "value"
-    type = "float64"
-
-  [[series.field]]
-    key = "percent"
-    type = "int"
-
-  [[series.field]]
-    key = "idk"
-    type = "bool"
-
-  [[series.field]]
-    key = "default"
-
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/tcp/mux.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/tcp/mux.go
deleted file mode 100644
index 98ce99176..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/tcp/mux.go
+++ /dev/null
@@ -1,154 +0,0 @@
-package tcp
-
-import (
-	"errors"
-	"fmt"
-	"io"
-	"log"
-	"net"
-	"os"
-	"sync"
-	"time"
-)
-
-const (
-	// DefaultTimeout is the default length of time to wait for first byte.
-	DefaultTimeout = 30 * time.Second
-)
-
-// Mux multiplexes a network connection.
-type Mux struct {
-	ln net.Listener
-	m  map[byte]*listener
-
-	wg sync.WaitGroup
-
-	// The amount of time to wait for the first header byte.
-	Timeout time.Duration
-
-	// Out-of-band error logger
-	Logger *log.Logger
-}
-
-// NewMux returns a new instance of Mux for ln.
-func NewMux() *Mux {
-	return &Mux{
-		m:       make(map[byte]*listener),
-		Timeout: DefaultTimeout,
-		Logger:  log.New(os.Stderr, "[tcp] ", log.LstdFlags),
-	}
-}
-
-// Serve handles connections from ln and multiplexes then across registered listener.
-func (mux *Mux) Serve(ln net.Listener) error {
-	for {
-		// Wait for the next connection.
-		// If it returns a temporary error then simply retry.
-		// If it returns any other error then exit immediately.
-		conn, err := ln.Accept()
-		if err, ok := err.(interface {
-			Temporary() bool
-		}); ok && err.Temporary() {
-			continue
-		}
-		if err != nil {
-			// Wait for all connections to be demux
-			mux.wg.Wait()
-			for _, ln := range mux.m {
-				close(ln.c)
-			}
-			return err
-		}
-
-		// Demux in a goroutine to
-		mux.wg.Add(1)
-		go mux.handleConn(conn)
-	}
-}
-
-func (mux *Mux) handleConn(conn net.Conn) {
-	defer mux.wg.Done()
-	// Set a read deadline so connections with no data don't timeout.
-	if err := conn.SetReadDeadline(time.Now().Add(mux.Timeout)); err != nil {
-		conn.Close()
-		mux.Logger.Printf("tcp.Mux: cannot set read deadline: %s", err)
-		return
-	}
-
-	// Read first byte from connection to determine handler.
-	var typ [1]byte
-	if _, err := io.ReadFull(conn, typ[:]); err != nil {
-		conn.Close()
-		mux.Logger.Printf("tcp.Mux: cannot read header byte: %s", err)
-		return
-	}
-
-	// Reset read deadline and let the listener handle that.
-	if err := conn.SetReadDeadline(time.Time{}); err != nil {
-		conn.Close()
-		mux.Logger.Printf("tcp.Mux: cannot reset set read deadline: %s", err)
-		return
-	}
-
-	// Retrieve handler based on first byte.
-	handler := mux.m[typ[0]]
-	if handler == nil {
-		conn.Close()
-		mux.Logger.Printf("tcp.Mux: handler not registered: %d", typ[0])
-		return
-	}
-
-	// Send connection to handler.  The handler is responsible for closing the connection.
-	handler.c <- conn
-}
-
-// Listen returns a listener identified by header.
-// Any connection accepted by mux is multiplexed based on the initial header byte.
-func (mux *Mux) Listen(header byte) net.Listener {
-	// Ensure two listeners are not created for the same header byte.
-	if _, ok := mux.m[header]; ok {
-		panic(fmt.Sprintf("listener already registered under header byte: %d", header))
-	}
-
-	// Create a new listener and assign it.
-	ln := &listener{
-		c: make(chan net.Conn),
-	}
-	mux.m[header] = ln
-
-	return ln
-}
-
-// listener is a receiver for connections received by Mux.
-type listener struct {
-	c chan net.Conn
-}
-
-// Accept waits for and returns the next connection to the listener.
-func (ln *listener) Accept() (c net.Conn, err error) {
-	conn, ok := <-ln.c
-	if !ok {
-		return nil, errors.New("network connection closed")
-	}
-	return conn, nil
-}
-
-// Close is a no-op. The mux's listener should be closed instead.
-func (ln *listener) Close() error { return nil }
-
-// Addr always returns nil.
-func (ln *listener) Addr() net.Addr { return nil }
-
-// Dial connects to a remote mux listener with a given header byte.
-func Dial(network, address string, header byte) (net.Conn, error) {
-	conn, err := net.Dial(network, address)
-	if err != nil {
-		return nil, err
-	}
-
-	if _, err := conn.Write([]byte{header}); err != nil {
-		return nil, fmt.Errorf("write mux header: %s", err)
-	}
-
-	return conn, nil
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/tcp/mux_test.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/tcp/mux_test.go
deleted file mode 100644
index 95b2e4df1..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/tcp/mux_test.go
+++ /dev/null
@@ -1,137 +0,0 @@
-package tcp_test
-
-import (
-	"bytes"
-	"io"
-	"io/ioutil"
-	"log"
-	"net"
-	"strings"
-	"sync"
-	"testing"
-	"testing/quick"
-	"time"
-
-	"github.com/influxdb/influxdb/tcp"
-)
-
-// Ensure the muxer can split a listener's connections across multiple listeners.
-func TestMux(t *testing.T) {
-	if err := quick.Check(func(n uint8, msg []byte) bool {
-		if testing.Verbose() {
-			if len(msg) == 0 {
-				log.Printf("n=%d, <no message>", n)
-			} else {
-				log.Printf("n=%d, hdr=%d, len=%d", n, msg[0], len(msg))
-			}
-		}
-
-		var wg sync.WaitGroup
-
-		// Open single listener on random port.
-		tcpListener, err := net.Listen("tcp", "127.0.0.1:0")
-		if err != nil {
-			t.Fatal(err)
-		}
-		defer tcpListener.Close()
-
-		// Setup muxer & listeners.
-		mux := tcp.NewMux()
-		mux.Timeout = 200 * time.Millisecond
-		if !testing.Verbose() {
-			mux.Logger = log.New(ioutil.Discard, "", 0)
-		}
-		for i := uint8(0); i < n; i++ {
-			ln := mux.Listen(byte(i))
-
-			wg.Add(1)
-			go func(i uint8, ln net.Listener) {
-				defer wg.Done()
-
-				// Wait for a connection for this listener.
-				conn, err := ln.Accept()
-				if conn != nil {
-					defer conn.Close()
-				}
-
-				// If there is no message or the header byte
-				// doesn't match then expect close.
-				if len(msg) == 0 || msg[0] != byte(i) {
-					if err == nil || err.Error() != "network connection closed" {
-						t.Fatalf("unexpected error: %s", err)
-					}
-					return
-				}
-
-				// If the header byte matches this listener
-				// then expect a connection and read the message.
-				var buf bytes.Buffer
-				if _, err := io.CopyN(&buf, conn, int64(len(msg)-1)); err != nil {
-					t.Fatal(err)
-				} else if !bytes.Equal(msg[1:], buf.Bytes()) {
-					t.Fatalf("message mismatch:\n\nexp=%x\n\ngot=%x\n\n", msg[1:], buf.Bytes())
-				}
-
-				// Write response.
-				if _, err := conn.Write([]byte("OK")); err != nil {
-					t.Fatal(err)
-				}
-			}(i, ln)
-		}
-
-		// Begin serving from the listener.
-		go mux.Serve(tcpListener)
-
-		// Write message to TCP listener and read OK response.
-		conn, err := net.Dial("tcp", tcpListener.Addr().String())
-		if err != nil {
-			t.Fatal(err)
-		} else if _, err = conn.Write(msg); err != nil {
-			t.Fatal(err)
-		}
-
-		// Read the response into the buffer.
-		var resp [2]byte
-		_, err = io.ReadFull(conn, resp[:])
-
-		// If the message header is less than n then expect a response.
-		// Otherwise we should get an EOF because the mux closed.
-		if len(msg) > 0 && uint8(msg[0]) < n {
-			if string(resp[:]) != `OK` {
-				t.Fatalf("unexpected response: %s", resp[:])
-			}
-		} else {
-			if err == nil || (err != io.EOF && !(strings.Contains(err.Error(), "connection reset by peer") ||
-				strings.Contains(err.Error(), "closed by the remote host"))) {
-				t.Fatalf("unexpected error: %s", err)
-			}
-		}
-
-		// Close connection.
-		if err := conn.Close(); err != nil {
-			t.Fatal(err)
-		}
-
-		// Close original TCP listener and wait for all goroutines to close.
-		tcpListener.Close()
-		wg.Wait()
-
-		return true
-	}, nil); err != nil {
-		t.Error(err)
-	}
-}
-
-// Ensure two handlers cannot be registered for the same header byte.
-func TestMux_Listen_ErrAlreadyRegistered(t *testing.T) {
-	defer func() {
-		if r := recover(); r != `listener already registered under header byte: 5` {
-			t.Fatalf("unexpected recover: %#v", r)
-		}
-	}()
-
-	// Register two listeners with the same header byte.
-	mux := tcp.NewMux()
-	mux.Listen(5)
-	mux.Listen(5)
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/test-32bit-docker.sh b/Godeps/_workspace/src/github.com/influxdb/influxdb/test-32bit-docker.sh
deleted file mode 100644
index 145ee3767..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/test-32bit-docker.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-docker build -f Dockerfile_test_ubuntu32 -t ubuntu-32-influxdb-test .
-docker run -v $(pwd):/root/go/src/github.com/influxdb/influxdb -t ubuntu-32-influxdb-test bash -c "cd /root/go/src/github.com/influxdb/influxdb && go get -t -d -v ./... && go build -v ./... && go test -v ./..."
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/tests/README.md b/Godeps/_workspace/src/github.com/influxdb/influxdb/tests/README.md
deleted file mode 100644
index 08f258f8e..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/tests/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-Tests
-======
-
-This is just the start of a set of test scripts.  Consider everything here highly experimental.
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/tests/create_future_writes.sh b/Godeps/_workspace/src/github.com/influxdb/influxdb/tests/create_future_writes.sh
deleted file mode 100644
index 9cc4fcb97..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/tests/create_future_writes.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-now=$(date '+%FT%T.000Z')
-tomorrow=$(date -v +1d '+%FT%T.000Z')
-
-echo "creating database"
-curl -G http://localhost:8086/query --data-urlencode "q=CREATE DATABASE foo"
-
-echo "creating retention policy"
-curl -G http://localhost:8086/query --data-urlencode "q=CREATE RETENTION POLICY bar ON foo DURATION INF REPLICATION 1 DEFAULT"
-
-echo "inserting data"
-curl -d "{\"database\" : \"foo\", \"retentionPolicy\" : \"bar\", \"points\": [{\"measurement\": \"cpu\", \"tags\": {\"region\":\"uswest\",\"host\": \"server01\"},\"time\": \"$now\",\"fields\": {\"value\": 100}}]}" -H "Content-Type: application/json" http://localhost:8086/write
-
-echo "inserting data"
-curl -d "{\"database\" : \"foo\", \"retentionPolicy\" : \"bar\", \"points\": [{\"measurement\": \"cpu\", \"tags\": {\"region\":\"uswest\",\"host\": \"server01\"},\"time\": \"$tomorrow\",\"fields\": {\"value\": 200}}]}" -H "Content-Type: application/json" http://localhost:8086/write
-
-sleep 1
-
-echo "querying data"
-curl -G http://localhost:8086/query --data-urlencode "db=foo" --data-urlencode "q=SELECT count(value) FROM \"foo\".\"bar\".cpu"
-
-echo "querying data"
-curl -G http://localhost:8086/query --data-urlencode "db=foo" --data-urlencode "q=SELECT count(value) FROM \"foo\".\"bar\".cpu where time < now() + 10d"
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/tests/create_write_multiple_query.sh b/Godeps/_workspace/src/github.com/influxdb/influxdb/tests/create_write_multiple_query.sh
deleted file mode 100644
index f267f319d..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/tests/create_write_multiple_query.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-echo "creating database"
-curl -G http://localhost:8086/query --data-urlencode "q=CREATE DATABASE foo"
-
-echo "creating retention policy"
-curl -G http://localhost:8086/query --data-urlencode "q=CREATE RETENTION POLICY bar ON foo DURATION 1h REPLICATION 3 DEFAULT"
-
-echo "inserting data"
-curl -d '{"database" : "foo", "retentionPolicy" : "bar", "points": [{"measurement": "cpu", "tags": {"host": "server01"},"time": "2015-01-26T22:01:11.703Z","fields": {"value": 100}}]}' -H "Content-Type: application/json" http://localhost:8086/write
-curl -d '{"database" : "foo", "retentionPolicy" : "bar", "points": [{"measurement": "cpu", "tags": {"host": "server01"},"time": "2015-01-27T22:01:11.703Z","fields": {"value": 100}}]}' -H "Content-Type: application/json" http://localhost:8086/write
-curl -d '{"database" : "foo", "retentionPolicy" : "bar", "points": [{"measurement": "cpu", "tags": {"host": "server01"},"time": "2015-01-28T22:01:11.703Z","fields": {"value": 100}}]}' -H "Content-Type: application/json" http://localhost:8086/write
-curl -d '{"database" : "foo", "retentionPolicy" : "bar", "points": [{"measurement": "mem", "tags": {"host": "server01"},"time": "2015-01-29T22:01:11.703Z","fields": {"value": 100}}]}' -H "Content-Type: application/json" http://localhost:8086/write
-
-echo "querying data"
-curl -G http://localhost:8086/query --data-urlencode "db=foo" --data-urlencode "q=SELECT sum(value) FROM \"foo\".\"bar\".cpu GROUP BY time(1h)"
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/tests/create_write_single_query.sh b/Godeps/_workspace/src/github.com/influxdb/influxdb/tests/create_write_single_query.sh
deleted file mode 100644
index 7ca2cf206..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/tests/create_write_single_query.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-set -e
-
-echo "> creating database"
-curl -G http://localhost:8086/query --data-urlencode "q=CREATE DATABASE foo"
-
-echo ""
-echo "> creating retention policy"
-curl -G http://localhost:8086/query --data-urlencode "q=CREATE RETENTION POLICY bar ON foo DURATION 1h REPLICATION 1 DEFAULT"
-
-echo ""
-echo "> inserting data"
-curl -v -X POST "http://localhost:8086/write?db=foo&rp=bar" -d 'cpu,host=server01 value=1.0'
-curl -v -d '{"database" : "foo", "retentionPolicy" : "bar", "points": [{"measurement": "cpu", "tags": {"host": "server02"},"fields": {"value": 100}}]}' -H "Content-Type: application/json" http://localhost:8086/write
-
-echo ""
-echo "> querying data"
-curl -G http://localhost:8086/query --data-urlencode "db=foo" --data-urlencode "pretty=true" --data-urlencode "q=SELECT * FROM \"foo\".\"bar\".cpu"
-
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/tests/create_write_single_with_multiple_measurements_values_tags.sh b/Godeps/_workspace/src/github.com/influxdb/influxdb/tests/create_write_single_with_multiple_measurements_values_tags.sh
deleted file mode 100644
index 4beea7839..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/tests/create_write_single_with_multiple_measurements_values_tags.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-echo "creating database"
-curl -G http://localhost:8086/query --data-urlencode "q=CREATE DATABASE foo"
-
-echo "creating retention policy"
-curl -G http://localhost:8086/query --data-urlencode "q=CREATE RETENTION POLICY bar ON foo DURATION 300d REPLICATION 3 DEFAULT"
-
-echo "inserting data"
-curl -d '{"database" : "foo", "retentionPolicy" : "bar", "points": [{"measurement": "cpu", "time": "2015-02-26T22:01:11.703Z","fields": {"value": 8.9}}]}' -H "Content-Type: application/json" http://localhost:8086/write
-curl -d '{"database" : "foo", "retentionPolicy" : "bar", "points": [{"measurement": "cpu", "time": "2015-02-27T22:01:11.703Z","fields": {"value": 1.3}}]}' -H "Content-Type: application/json" http://localhost:8086/write
-curl -d '{"database" : "foo", "retentionPolicy" : "bar", "points": [{"measurement": "cpu", "time": "2015-02-28T22:01:11.703Z","fields": {"value": 50.4}}]}' -H "Content-Type: application/json" http://localhost:8086/write
-
-
-curl -d '{"database" : "foo", "retentionPolicy" : "bar", "points": [{"measurement": "mem", "tags": {"host": "server01"},"time": "2015-02-26T22:01:11.703Z","fields": {"value": 16432}}]}' -H "Content-Type: application/json" http://localhost:8086/write
-curl -d '{"database" : "foo", "retentionPolicy" : "bar", "points": [{"measurement": "mem", "tags": {"host": "server01"},"time": "2015-02-27T22:01:11.703Z","fields": {"value": 23453}}]}' -H "Content-Type: application/json" http://localhost:8086/write
-curl -d '{"database" : "foo", "retentionPolicy" : "bar", "points": [{"measurement": "mem", "tags": {"host": "server02"},"time": "2015-02-28T22:01:11.703Z","fields": {"value": 90234}}]}' -H "Content-Type: application/json" http://localhost:8086/write
-
-curl -d '{"database" : "foo", "retentionPolicy" : "bar", "points": [{"measurement": "temp", "tags": {"host": "server01","region":"uswest"}, "time": "2015-02-26T22:01:11.703Z","fields": {"value": 98.6}}]}' -H "Content-Type: application/json" http://localhost:8086/write
-curl -d '{"database" : "foo", "retentionPolicy" : "bar", "points": [{"measurement": "temp", "tags": {"host": "server01","region":"useast"}, "time": "2015-02-27T22:01:11.703Z","fields": {"value": 101.1}}]}' -H "Content-Type: application/json" http://localhost:8086/write
-curl -d '{"database" : "foo", "retentionPolicy" : "bar", "points": [{"measurement": "temp", "tags": {"host": "server02","region":"useast"}, "time": "2015-02-28T22:01:11.703Z","fields": {"value": 105.4}}]}' -H "Content-Type: application/json" http://localhost:8086/write
-
-curl -d '{"database" : "foo", "retentionPolicy" : "bar", "points": [{"measurement": "network", "tags": {"host": "server01","region":"uswest"},"time": "2015-02-26T22:01:11.703Z","fields": {"rx": 2342,"tx": 9804}}]}' -H "Content-Type: application/json" http://localhost:8086/write
-curl -d '{"database" : "foo", "retentionPolicy" : "bar", "points": [{"measurement": "network", "tags": {"host": "server01","region":"useast"},"time": "2015-02-27T22:01:11.703Z","fields": {"rx": 4324,"tx": 7930}}]}' -H "Content-Type: application/json" http://localhost:8086/write
-curl -d '{"database" : "foo", "retentionPolicy" : "bar", "points": [{"measurement": "network", "tags": {"host": "server02","region":"useast"},"time": "2015-02-28T22:01:11.703Z","fields": {"rx": 2342,"tx": 8234}}]}' -H "Content-Type: application/json" http://localhost:8086/write
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/tests/create_write_single_with_multiple_tags_query.sh b/Godeps/_workspace/src/github.com/influxdb/influxdb/tests/create_write_single_with_multiple_tags_query.sh
deleted file mode 100644
index d809a447d..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/tests/create_write_single_with_multiple_tags_query.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-echo "creating database"
-curl -G http://localhost:8086/query --data-urlencode "q=CREATE DATABASE foo"
-
-echo "creating retention policy"
-curl -G http://localhost:8086/query --data-urlencode "q=CREATE RETENTION POLICY bar ON foo DURATION 1h REPLICATION 3 DEFAULT"
-
-echo "inserting data"
-curl -d '{"database" : "foo", "retentionPolicy" : "bar", "points": [{"measurement": "cpu", "tags": {"region":"uswest","host": "server01"},"time": "2015-01-26T22:01:11.703Z","fields": {"value": 100}}]}' -H "Content-Type: application/json" http://localhost:8086/write
-
-echo "querying data"
-curl -G http://localhost:8086/query --data-urlencode "db=foo" --data-urlencode "q=SELECT sum(value) FROM \"foo\".\"bar\".cpu GROUP BY time(1h)"
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/tests/distinct-data-scenarios.sh b/Godeps/_workspace/src/github.com/influxdb/influxdb/tests/distinct-data-scenarios.sh
deleted file mode 100644
index 2808d1224..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/tests/distinct-data-scenarios.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-echo "creating database"
-curl -G http://localhost:8086/query --data-urlencode "q=CREATE DATABASE foo"
-
-echo "creating retention policy"
-curl -G http://localhost:8086/query --data-urlencode "q=CREATE RETENTION POLICY bar ON foo DURATION 300d REPLICATION 3 DEFAULT"
-
-echo "inserting data"
-curl -d '{"database" : "foo", "retentionPolicy" : "bar", "points": [{"measurement": "cpu", "time": "2015-05-01T00:00:00.000Z","fields": {"value": 1.1}}]}' -H "Content-Type: application/json" http://localhost:8086/write
-curl -d '{"database" : "foo", "retentionPolicy" : "bar", "points": [{"measurement": "cpu", "time": "2015-05-01T08:00:00.000Z","fields": {"value": 1.2}}]}' -H "Content-Type: application/json" http://localhost:8086/write
-curl -d '{"database" : "foo", "retentionPolicy" : "bar", "points": [{"measurement": "cpu", "time": "2015-05-01T16:00:00.000Z","fields": {"value": 1.3}}]}' -H "Content-Type: application/json" http://localhost:8086/write
-curl -d '{"database" : "foo", "retentionPolicy" : "bar", "points": [{"measurement": "cpu", "time": "2015-05-01T16:59:00.000Z","fields": {"value": 1.1}}]}' -H "Content-Type: application/json" http://localhost:8086/write
-
-curl -d '{"database" : "foo", "retentionPolicy" : "bar", "points": [{"measurement": "cpu", "time": "2015-05-02T00:00:00.000Z","fields": {"value": 2.1}}]}' -H "Content-Type: application/json" http://localhost:8086/write
-curl -d '{"database" : "foo", "retentionPolicy" : "bar", "points": [{"measurement": "cpu", "time": "2015-05-02T08:00:00.000Z","fields": {"value": 2.2}}]}' -H "Content-Type: application/json" http://localhost:8086/write
-curl -d '{"database" : "foo", "retentionPolicy" : "bar", "points": [{"measurement": "cpu", "time": "2015-05-02T16:00:00.000Z","fields": {"value": 2.3}}]}' -H "Content-Type: application/json" http://localhost:8086/write
-curl -d '{"database" : "foo", "retentionPolicy" : "bar", "points": [{"measurement": "cpu", "time": "2015-05-02T16:59:00.000Z","fields": {"value": 2.1}}]}' -H "Content-Type: application/json" http://localhost:8086/write
-
-curl -d '{"database" : "foo", "retentionPolicy" : "bar", "points": [{"measurement": "cpu", "time": "2015-05-03T00:00:00.000Z","fields": {"value": 3.1}}]}' -H "Content-Type: application/json" http://localhost:8086/write
-curl -d '{"database" : "foo", "retentionPolicy" : "bar", "points": [{"measurement": "cpu", "time": "2015-05-03T08:00:00.000Z","fields": {"value": 3.2}}]}' -H "Content-Type: application/json" http://localhost:8086/write
-curl -d '{"database" : "foo", "retentionPolicy" : "bar", "points": [{"measurement": "cpu", "time": "2015-05-03T16:00:00.000Z","fields": {"value": 3.3}}]}' -H "Content-Type: application/json" http://localhost:8086/write
-curl -d '{"database" : "foo", "retentionPolicy" : "bar", "points": [{"measurement": "cpu", "time": "2015-05-03T16:59:00.000Z","fields": {"value": 3.1}}]}' -H "Content-Type: application/json" http://localhost:8086/write
-
-curl -d '{"database" : "foo", "retentionPolicy" : "bar", "points": [{"measurement": "cpu", "time": "2015-05-04T00:00:00.000Z","fields": {"value": 4.1}}]}' -H "Content-Type: application/json" http://localhost:8086/write
-curl -d '{"database" : "foo", "retentionPolicy" : "bar", "points": [{"measurement": "cpu", "time": "2015-05-04T08:00:00.000Z","fields": {"value": 4.2}}]}' -H "Content-Type: application/json" http://localhost:8086/write
-curl -d '{"database" : "foo", "retentionPolicy" : "bar", "points": [{"measurement": "cpu", "time": "2015-05-04T16:00:00.000Z","fields": {"value": 4.3}}]}' -H "Content-Type: application/json" http://localhost:8086/write
-curl -d '{"database" : "foo", "retentionPolicy" : "bar", "points": [{"measurement": "cpu", "time": "2015-05-04T16:59:00.000Z","fields": {"value": 4.1}}]}' -H "Content-Type: application/json" http://localhost:8086/write
-
-curl -d '{"database" : "foo", "retentionPolicy" : "bar", "points": [{"measurement": "names", "time": "2015-05-01T00:00:00.000Z","fields": {"first": "suzie", "last": "smith"}}]}' -H "Content-Type: application/json" http://localhost:8086/write
-curl -d '{"database" : "foo", "retentionPolicy" : "bar", "points": [{"measurement": "names", "time": "2015-05-01T08:00:00.000Z","fields": {"first": "frank", "last": "smith"}}]}' -H "Content-Type: application/json" http://localhost:8086/write
-curl -d '{"database" : "foo", "retentionPolicy" : "bar", "points": [{"measurement": "names", "time": "2015-05-01T16:00:00.000Z","fields": {"first": "jonny", "last": "jones"}}]}' -H "Content-Type: application/json" http://localhost:8086/write
-
-
-curl -d '{"database" : "foo", "retentionPolicy" : "bar", "points": [{"measurement": "sensor", "time": "2015-05-01T00:00:00.000Z","fields": {"on": true, "off": false}}]}' -H "Content-Type: application/json" http://localhost:8086/write
-curl -d '{"database" : "foo", "retentionPolicy" : "bar", "points": [{"measurement": "sensor", "time": "2015-05-01T08:00:00.000Z","fields": {"on": false, "off": true}}]}' -H "Content-Type: application/json" http://localhost:8086/write
-curl -d '{"database" : "foo", "retentionPolicy" : "bar", "points": [{"measurement": "sensor", "time": "2015-05-01T16:00:00.000Z","fields": {"on": true, "off": false}}]}' -H "Content-Type: application/json" http://localhost:8086/write
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/tests/read_write_gzip.sh b/Godeps/_workspace/src/github.com/influxdb/influxdb/tests/read_write_gzip.sh
deleted file mode 100644
index e8f3ede78..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/tests/read_write_gzip.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-echo "creating database"
-curl -G http://localhost:8086/query --data-urlencode "q=CREATE DATABASE foo"
-
-echo "creating retention policy"
-curl -G http://localhost:8086/query --data-urlencode "q=CREATE RETENTION POLICY bar ON foo DURATION 1h REPLICATION 3 DEFAULT"
-
-echo '{"database" : "foo", "retentionPolicy" : "bar", "points": [{"name": "cpu", "tags": {"host": "server01"},"time": "2015-01-26T22:01:11.703Z","fields": {"value": 123}}]}' | gzip > foo.json.gz
-
-echo "inserting data"
-curl -v -i -H "Content-encoding: gzip" -H "Content-Type: application/json" -X POST -T foo.json.gz http://localhost:8086/write
-
-rm foo.json.gz
-
-echo "querying data with gzip encoding"
-curl -v -G --compressed http://localhost:8086/query --data-urlencode "db=foo" --data-urlencode "q=SELECT sum(value) FROM \"foo\".\"bar\".cpu GROUP BY time(1h)"
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/tests/siege/.gitignore b/Godeps/_workspace/src/github.com/influxdb/influxdb/tests/siege/.gitignore
deleted file mode 100644
index 057e4a7fe..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/tests/siege/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-urls.txt
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/tests/siege/README.md b/Godeps/_workspace/src/github.com/influxdb/influxdb/tests/siege/README.md
deleted file mode 100644
index 3ef158d68..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/tests/siege/README.md
+++ /dev/null
@@ -1,66 +0,0 @@
-Siege
-=====
-
-Siege is an HTTP benchmarking tool and can be used against InfluxDB easily.
-If you're on Mac you can install `siege` using `brew`. If you're on Linux
-you can install using your package manager.
-
-
-## Initializing the database
-
-Before you run your siege, you need to do 2 things:
-
-- Create a database named `db`.
-- Create a retention policy named `raw`.
-
-You can do this with the following commands:
-
-```sh
-$ curl -G http://localhost:8086/query --data-urlencode "q=CREATE DATABASE db"
-$ curl -G http://localhost:8086/query --data-urlencode "q=CREATE RETENTION POLICY raw ON db DURATION 30d REPLICATION 3 DEFAULT"
-```
-
-
-## Running
-
-To run siege, first start one or more InfluxDB nodes. At least one of those
-nodes should run on the default port of `8086`.
-
-Next, generate a URL file to run. You can use the `urlgen` utility in this
-folder to make the file. Simply set the number of unique clients and number of
-series to generate:
-
-```sh
-$ ./urlgen -c 10 -s 100 > urls.txt
-```
-
-Now you can execute siege. There are several arguments available but only 
-a few that we're concerned with:
-
-```
--c NUM   the number of concurrent connections.
--d NUM   delay between each request, in seconds.
--b       benchmark mode. runs with a delay of 0.
--t DUR   duration of the benchmark. value should end in 's', 'm', or 'h'.
--f FILE  the path to the URL file.
-```
-
-These can be combined to simulate different load. For example, this command
-will execute writes against using 100 concurrent connections with a 1 second
-delay in between each call:
-
-```sh
-$ siege -c 100 -f urls.txt
-```
-
-Again, you can also specify the `-b` option to remove the delay.
-
-
-## Verification
-
-You can verify that your data made it in by executing a query against it:
-
-```sh
-$ curl -G http://localhost:8086/query --data-urlencode "db=db" --data-urlencode "q=SELECT sum(value) FROM cpu GROUP BY time(1h)"
-```
-
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/tests/siege/urlgen b/Godeps/_workspace/src/github.com/influxdb/influxdb/tests/siege/urlgen
deleted file mode 100644
index 0b54bcc27..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/tests/siege/urlgen
+++ /dev/null
@@ -1,107 +0,0 @@
-#!/bin/bash -e
-
-# Calculate start time as unix timestamp.
-
-PLATFORM=`uname`
-
-_date_to_unix_timestamp () {
-    if [  "$PLATFORM" = "Darwin" ] ; then
-        date -j -f "%b %d %T %Z %Y" "$1" "+%s"
-    elif [  "$PLATFORM" = "Linux" ] ; then
-        date -d "$1" "+%s"
-    else
-        echo "I don't know if your date can read a format and a time, failing"
-        exit 99
-    fi
-}
-
-_timestamp_to_time_string () {
-    if [  "$PLATFORM" = "Darwin" ] ; then
-        date -j -f "%s" "$1" +"%Y-%m-%dT%H:%M:%SZ"
-    elif [  "$PLATFORM" = "Linux" ] ; then
-        date -d "@$1" +"%Y-%m-%dT%H:%M:%SZ"
-    fi
-}
-
-# Starting the test at "Jan 01 00:00:00 GMT 2000"
-TIME=`_date_to_unix_timestamp "Jan 01 00:00:00 GMT 2000"`
-
-
-# Set defaults.
-INTERVAL=10      # 1s
-NUMCLIENTS=10
-NUMSERIES=1
-
-# Parse arguments
-while getopts "s:c:i:h" opt; do
-	case $opt in
-	i)
-		INTERVAL=$OPTARG
-		;;
-	c)
-		NUMCLIENTS=$OPTARG
-		;;
-	s)
-		NUMSERIES=$OPTARG
-		;;
-	h)
-		echo "urlgen is a utility for generating URL files for siege."
-		echo ""
-		echo "Usage:"
-		echo "	urlgen.sh [OPTIONS]"
-		echo ""
-		echo "The following arguments can be specified:"
-		echo ""
-		echo "	-i seconds"
-	    echo "	    Interval between requests."
-	    echo "	    Defaults to 10 seconds."
-		echo ""
-		echo "	-s num"
-	    echo "	    Number of unique series to generate."
-	    echo "	    Defaults to 1 series."
-		echo ""
-		echo "	-c num"
-	    echo "	    Number of clients to simulate."
-	    echo "	    One request per client."
-	    echo "	    Defaults to 10 clients."
-		echo ""
-		exit 1
-		;;
-	esac
-done
-
-# Generate a new request every interval per client.
-for i in `seq 1 $NUMCLIENTS`;
-do
-	# Move forward the current time.
-	TIME=$((TIME+INTERVAL))
-	TIMESTAMP=`_timestamp_to_time_string $TIME`
-
-	# Generate a URL for each series.
-	for series in `seq 1 $NUMSERIES`;
-	do
-		# Generate a URL for each second in the interval.
-		POINTS=""
-		for j in `seq 0 $INTERVAL`;
-		do
-			# Format the timestamp to ISO 8601.
-			let CURRTIME=TIME+j
-			TIMESTAMP=`_timestamp_to_time_string $CURRTIME`
-
-			# Add comma separator.
-			if [ "$j" -ne "0" ]
-			then
-				POINTS=$POINTS,
-			fi
-
-			# Append the point.
-			POINTS=$POINTS'{"name": "cpu", "tags": {"host": "server'$series'"}, "time": "'$TIMESTAMP'","fields": {"value": 100}}'
-		done
-
-		# Write out point.
-		echo 'http://localhost:8086/write POST {"database" : "db", "retentionPolicy" : "raw", "points": ['$POINTS']}'
-	done
-
-	# Move forward the current time.
-	let TIME=TIME+INTERVAL
-done
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/tests/tmux/3_shards b/Godeps/_workspace/src/github.com/influxdb/influxdb/tests/tmux/3_shards
deleted file mode 100644
index 726b0b66e..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/tests/tmux/3_shards
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/bash
-set -e # stop if anything fails
-set -x
-
-session="influxd-3-shard-test"
-
-# start the world if we're not already in session
-if ! tmux ls | grep -q "$session"; then
-	cd $GOPATH/src/github.com/influxdb/influxdb/tests/tmux
-	tmux new-session -d -s $session
-
-	# create and split main window into three panes
-	tmux split-window -h -t $session
-	tmux split-window -h -t $session
-
-	# Fire up the servers
-	tmux send-keys -t $session:1.1 'influxd -config server_8086.toml' C-m
-	sleep 1
-	tmux send-keys -t $session:1.2 'influxd -config server_8087.toml -join http://127.0.0.1:8086' C-m
-	tmux send-keys -t $session:1.3 'influxd -config server_8088.toml -join http://127.0.0.1:8086' C-m
-	sleep 1
-	
-	./seed.sh
-
-	# even out the layouts
-	tmux select-layout -t $session even-horizontal
-fi
-
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/tests/tmux/README.md b/Godeps/_workspace/src/github.com/influxdb/influxdb/tests/tmux/README.md
deleted file mode 100644
index b13f316d8..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/tests/tmux/README.md
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-## Generating Sample JSON
-
-Use [http://www.json-generator.com/](http://www.json-generator.com/)
-
-```json
-[
-  '{{repeat(1000,1000)}}',
-  {
-    "database": "foo", 
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu", 
-        "tags": {"host": "server01"},
-        "time": "{{date(new Date(2015, 15, 1), new Date(), 'YYYY-MM-ddThh:mm:ss Z')}}",
-        "fields": {
-          "value": '{{integer(1, 1000)}}'
-        }
-      }
-    ]
-  }
-]
-```
-
-You can curl the data with the following command:
-
-```bash
-cat sample.json | curl -d @- -H "Content-Type: application/json" http://localhost:8086/write
-```
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/tests/tmux/sample.json b/Godeps/_workspace/src/github.com/influxdb/influxdb/tests/tmux/sample.json
deleted file mode 100644
index a29cd5b83..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/tests/tmux/sample.json
+++ /dev/null
@@ -1,16000 +0,0 @@
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-02-18T02:33:19 +07:00",
-        "fields": {
-          "value": 897
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-02-17T19:41:14 +07:00",
-        "fields": {
-          "value": 853
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-10-06T01:02:46 +06:00",
-        "fields": {
-          "value": 677
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-02-04T20:25:48 +07:00",
-        "fields": {
-          "value": 146
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-05-24T00:13:23 +06:00",
-        "fields": {
-          "value": 316
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-01-05T10:18:32 +07:00",
-        "fields": {
-          "value": 190
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-08-10T00:42:22 +06:00",
-        "fields": {
-          "value": 501
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-12-24T09:12:08 +07:00",
-        "fields": {
-          "value": 804
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-11-16T23:44:30 +07:00",
-        "fields": {
-          "value": 122
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-09-16T01:59:49 +06:00",
-        "fields": {
-          "value": 553
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-09-19T18:15:57 +06:00",
-        "fields": {
-          "value": 607
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-11-20T20:54:47 +07:00",
-        "fields": {
-          "value": 474
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-01-23T01:15:42 +07:00",
-        "fields": {
-          "value": 97
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-02-25T15:17:18 +07:00",
-        "fields": {
-          "value": 245
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-06-09T21:50:00 +06:00",
-        "fields": {
-          "value": 470
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-02-02T13:34:10 +07:00",
-        "fields": {
-          "value": 830
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-08-08T23:46:16 +06:00",
-        "fields": {
-          "value": 420
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-03-13T19:38:44 +06:00",
-        "fields": {
-          "value": 374
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-02-13T17:08:33 +07:00",
-        "fields": {
-          "value": 656
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-04-01T21:13:05 +06:00",
-        "fields": {
-          "value": 777
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-05-31T06:17:41 +06:00",
-        "fields": {
-          "value": 762
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-05-11T00:39:24 +06:00",
-        "fields": {
-          "value": 390
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-03-02T08:55:26 +07:00",
-        "fields": {
-          "value": 967
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-02-07T19:04:31 +07:00",
-        "fields": {
-          "value": 699
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-12-14T23:15:57 +07:00",
-        "fields": {
-          "value": 99
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-02-08T21:27:30 +07:00",
-        "fields": {
-          "value": 516
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-06-11T14:28:02 +06:00",
-        "fields": {
-          "value": 840
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-01-30T11:23:54 +07:00",
-        "fields": {
-          "value": 317
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-07-31T02:54:40 +06:00",
-        "fields": {
-          "value": 686
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-04-15T22:51:35 +06:00",
-        "fields": {
-          "value": 487
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-03-12T16:26:22 +06:00",
-        "fields": {
-          "value": 712
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-07-05T09:09:35 +06:00",
-        "fields": {
-          "value": 974
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-06-16T16:27:34 +06:00",
-        "fields": {
-          "value": 26
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-05-11T20:36:47 +06:00",
-        "fields": {
-          "value": 248
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-12-31T04:19:49 +07:00",
-        "fields": {
-          "value": 989
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-01-29T11:16:11 +07:00",
-        "fields": {
-          "value": 451
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-10-07T04:43:41 +06:00",
-        "fields": {
-          "value": 421
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-01-13T11:30:32 +07:00",
-        "fields": {
-          "value": 927
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-10-16T19:19:45 +06:00",
-        "fields": {
-          "value": 57
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-08-24T14:38:51 +06:00",
-        "fields": {
-          "value": 982
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-11-01T20:47:59 +07:00",
-        "fields": {
-          "value": 488
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-03-09T16:46:43 +07:00",
-        "fields": {
-          "value": 228
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-01-10T08:27:20 +07:00",
-        "fields": {
-          "value": 104
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-12-31T20:11:24 +07:00",
-        "fields": {
-          "value": 438
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-05-11T22:49:17 +06:00",
-        "fields": {
-          "value": 509
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-02-05T20:32:31 +07:00",
-        "fields": {
-          "value": 8
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-04-13T05:19:20 +06:00",
-        "fields": {
-          "value": 748
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-05-09T19:16:49 +06:00",
-        "fields": {
-          "value": 558
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-01-07T20:27:09 +07:00",
-        "fields": {
-          "value": 739
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-07-11T16:45:27 +06:00",
-        "fields": {
-          "value": 320
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-03-01T09:33:27 +07:00",
-        "fields": {
-          "value": 928
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-03-03T02:15:58 +07:00",
-        "fields": {
-          "value": 852
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-01-27T04:06:11 +07:00",
-        "fields": {
-          "value": 623
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-02-05T18:14:07 +07:00",
-        "fields": {
-          "value": 971
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-05-30T10:35:40 +06:00",
-        "fields": {
-          "value": 205
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-01-27T00:59:42 +07:00",
-        "fields": {
-          "value": 947
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-03-13T15:58:15 +06:00",
-        "fields": {
-          "value": 846
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-09-10T00:00:26 +06:00",
-        "fields": {
-          "value": 510
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-10-11T10:22:27 +06:00",
-        "fields": {
-          "value": 987
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-03-27T20:37:39 +06:00",
-        "fields": {
-          "value": 332
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-04-09T21:43:22 +06:00",
-        "fields": {
-          "value": 771
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-08-25T07:27:43 +06:00",
-        "fields": {
-          "value": 741
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-01-28T22:31:37 +07:00",
-        "fields": {
-          "value": 586
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-05-14T21:05:02 +06:00",
-        "fields": {
-          "value": 124
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-09-02T03:01:11 +06:00",
-        "fields": {
-          "value": 175
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-07-01T21:51:02 +06:00",
-        "fields": {
-          "value": 88
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-02-01T03:17:41 +07:00",
-        "fields": {
-          "value": 425
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-05-05T07:44:11 +06:00",
-        "fields": {
-          "value": 98
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-02-16T19:38:37 +07:00",
-        "fields": {
-          "value": 807
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-02-05T03:57:33 +07:00",
-        "fields": {
-          "value": 57
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-03-24T13:21:44 +06:00",
-        "fields": {
-          "value": 723
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-02-20T10:17:27 +07:00",
-        "fields": {
-          "value": 584
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-02-10T11:47:17 +07:00",
-        "fields": {
-          "value": 877
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-10-03T22:49:48 +06:00",
-        "fields": {
-          "value": 445
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-10-13T10:46:10 +06:00",
-        "fields": {
-          "value": 509
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-04-23T07:53:07 +06:00",
-        "fields": {
-          "value": 483
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-09-15T16:27:41 +06:00",
-        "fields": {
-          "value": 434
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-06-04T16:30:57 +06:00",
-        "fields": {
-          "value": 240
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-07-13T19:34:30 +06:00",
-        "fields": {
-          "value": 595
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-12-10T02:51:34 +07:00",
-        "fields": {
-          "value": 381
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-03-25T03:11:06 +06:00",
-        "fields": {
-          "value": 338
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-10-20T10:10:26 +06:00",
-        "fields": {
-          "value": 306
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-12-13T16:17:45 +07:00",
-        "fields": {
-          "value": 189
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-11-22T20:10:56 +07:00",
-        "fields": {
-          "value": 825
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-09-22T02:10:21 +06:00",
-        "fields": {
-          "value": 290
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-03-10T01:00:52 +07:00",
-        "fields": {
-          "value": 867
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-12-25T23:00:01 +07:00",
-        "fields": {
-          "value": 876
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-08-10T21:38:05 +06:00",
-        "fields": {
-          "value": 375
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-04-25T23:35:33 +06:00",
-        "fields": {
-          "value": 299
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-03-27T00:13:49 +06:00",
-        "fields": {
-          "value": 908
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-12-23T16:18:38 +07:00",
-        "fields": {
-          "value": 353
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-10-15T19:54:23 +06:00",
-        "fields": {
-          "value": 616
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-07-12T00:26:17 +06:00",
-        "fields": {
-          "value": 806
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-05-19T19:06:41 +06:00",
-        "fields": {
-          "value": 122
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-02-27T09:56:51 +07:00",
-        "fields": {
-          "value": 776
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-09-24T02:31:09 +06:00",
-        "fields": {
-          "value": 816
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-12-27T01:07:34 +07:00",
-        "fields": {
-          "value": 193
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-05-02T23:22:27 +06:00",
-        "fields": {
-          "value": 526
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-04-20T06:04:44 +06:00",
-        "fields": {
-          "value": 517
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-06-06T07:49:45 +06:00",
-        "fields": {
-          "value": 758
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-08-07T20:37:39 +06:00",
-        "fields": {
-          "value": 721
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-03-10T10:41:54 +06:00",
-        "fields": {
-          "value": 591
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-11-19T14:29:43 +07:00",
-        "fields": {
-          "value": 567
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-12-07T16:13:37 +07:00",
-        "fields": {
-          "value": 717
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-11-27T03:31:55 +07:00",
-        "fields": {
-          "value": 769
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-01-19T01:31:44 +07:00",
-        "fields": {
-          "value": 174
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-05-29T23:00:22 +06:00",
-        "fields": {
-          "value": 344
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-03-18T07:53:09 +06:00",
-        "fields": {
-          "value": 348
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-06-22T02:39:58 +06:00",
-        "fields": {
-          "value": 608
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-12-26T02:05:16 +07:00",
-        "fields": {
-          "value": 578
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-04-11T13:48:46 +06:00",
-        "fields": {
-          "value": 959
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-03-14T20:18:05 +06:00",
-        "fields": {
-          "value": 329
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-03-25T06:44:46 +06:00",
-        "fields": {
-          "value": 259
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-11-03T17:29:53 +07:00",
-        "fields": {
-          "value": 431
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-08-10T10:09:43 +06:00",
-        "fields": {
-          "value": 60
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-04-20T06:51:59 +06:00",
-        "fields": {
-          "value": 13
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-05-06T01:36:32 +06:00",
-        "fields": {
-          "value": 897
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-05-04T14:03:09 +06:00",
-        "fields": {
-          "value": 316
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-07-24T10:47:52 +06:00",
-        "fields": {
-          "value": 203
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-01-04T12:19:03 +07:00",
-        "fields": {
-          "value": 400
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-08-22T03:30:35 +06:00",
-        "fields": {
-          "value": 245
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-08-29T16:09:58 +06:00",
-        "fields": {
-          "value": 919
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-11-04T00:16:36 +07:00",
-        "fields": {
-          "value": 783
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-05-06T21:25:24 +06:00",
-        "fields": {
-          "value": 444
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-07-15T14:19:40 +06:00",
-        "fields": {
-          "value": 820
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-04-25T11:28:22 +06:00",
-        "fields": {
-          "value": 605
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-03-25T01:30:15 +06:00",
-        "fields": {
-          "value": 689
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-02-21T06:38:01 +07:00",
-        "fields": {
-          "value": 85
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-03-11T02:33:06 +06:00",
-        "fields": {
-          "value": 904
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-09-13T05:06:48 +06:00",
-        "fields": {
-          "value": 994
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-09-07T17:47:44 +06:00",
-        "fields": {
-          "value": 190
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-11-24T02:23:35 +07:00",
-        "fields": {
-          "value": 3
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-07-18T07:46:49 +06:00",
-        "fields": {
-          "value": 525
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-03-08T22:32:28 +07:00",
-        "fields": {
-          "value": 151
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-03-16T21:17:58 +06:00",
-        "fields": {
-          "value": 821
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-11-01T18:36:48 +07:00",
-        "fields": {
-          "value": 295
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-06-10T12:38:54 +06:00",
-        "fields": {
-          "value": 898
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-02-23T17:18:31 +07:00",
-        "fields": {
-          "value": 880
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-08-26T16:01:00 +06:00",
-        "fields": {
-          "value": 822
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-06-22T14:57:52 +06:00",
-        "fields": {
-          "value": 280
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-08-28T22:41:21 +06:00",
-        "fields": {
-          "value": 467
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-03-29T05:30:54 +06:00",
-        "fields": {
-          "value": 964
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-02-11T20:27:50 +07:00",
-        "fields": {
-          "value": 952
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-06-28T11:13:47 +06:00",
-        "fields": {
-          "value": 462
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-03-16T23:27:59 +06:00",
-        "fields": {
-          "value": 54
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-11-11T11:07:23 +07:00",
-        "fields": {
-          "value": 288
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-06-03T05:14:57 +06:00",
-        "fields": {
-          "value": 825
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-11-18T15:52:57 +07:00",
-        "fields": {
-          "value": 973
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-06-24T05:58:31 +06:00",
-        "fields": {
-          "value": 92
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-09-07T22:48:33 +06:00",
-        "fields": {
-          "value": 139
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-02-15T09:32:56 +07:00",
-        "fields": {
-          "value": 243
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-01-29T04:51:42 +07:00",
-        "fields": {
-          "value": 525
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-04-21T16:42:15 +06:00",
-        "fields": {
-          "value": 991
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-10-11T20:11:06 +06:00",
-        "fields": {
-          "value": 63
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-05-22T02:05:46 +06:00",
-        "fields": {
-          "value": 902
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-06-23T21:21:29 +06:00",
-        "fields": {
-          "value": 204
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-02-26T23:31:16 +07:00",
-        "fields": {
-          "value": 956
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-04-07T02:09:40 +06:00",
-        "fields": {
-          "value": 968
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-08-05T15:26:59 +06:00",
-        "fields": {
-          "value": 492
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-07-10T13:25:19 +06:00",
-        "fields": {
-          "value": 847
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-08-17T03:44:11 +06:00",
-        "fields": {
-          "value": 181
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-02-20T09:19:21 +07:00",
-        "fields": {
-          "value": 86
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-02-25T12:19:54 +07:00",
-        "fields": {
-          "value": 469
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-08-01T19:24:32 +06:00",
-        "fields": {
-          "value": 23
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-05-13T21:52:20 +06:00",
-        "fields": {
-          "value": 411
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-11-02T07:34:33 +07:00",
-        "fields": {
-          "value": 623
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-01-15T18:05:42 +07:00",
-        "fields": {
-          "value": 792
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-12-19T18:35:33 +07:00",
-        "fields": {
-          "value": 15
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-09-30T13:36:01 +06:00",
-        "fields": {
-          "value": 893
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-10-22T13:44:29 +06:00",
-        "fields": {
-          "value": 496
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-09-01T06:19:56 +06:00",
-        "fields": {
-          "value": 318
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-01-29T00:19:21 +07:00",
-        "fields": {
-          "value": 249
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-09-08T01:36:47 +06:00",
-        "fields": {
-          "value": 505
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-06-09T19:41:26 +06:00",
-        "fields": {
-          "value": 393
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-10-12T04:14:54 +06:00",
-        "fields": {
-          "value": 867
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-11-14T17:14:50 +07:00",
-        "fields": {
-          "value": 330
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-02-10T21:56:29 +07:00",
-        "fields": {
-          "value": 119
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-03-26T04:06:26 +06:00",
-        "fields": {
-          "value": 798
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-02-08T20:00:59 +07:00",
-        "fields": {
-          "value": 265
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-01-19T09:05:59 +07:00",
-        "fields": {
-          "value": 830
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-09-10T15:10:22 +06:00",
-        "fields": {
-          "value": 94
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-07-21T15:39:19 +06:00",
-        "fields": {
-          "value": 67
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-07-10T23:48:51 +06:00",
-        "fields": {
-          "value": 572
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-12-19T08:26:22 +07:00",
-        "fields": {
-          "value": 562
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-08-26T03:04:57 +06:00",
-        "fields": {
-          "value": 294
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-06-27T19:54:14 +06:00",
-        "fields": {
-          "value": 967
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-11-01T22:59:08 +07:00",
-        "fields": {
-          "value": 632
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-02-18T13:47:38 +07:00",
-        "fields": {
-          "value": 223
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-08-23T11:07:35 +06:00",
-        "fields": {
-          "value": 898
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-11-08T07:42:09 +07:00",
-        "fields": {
-          "value": 301
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-02-06T19:00:28 +07:00",
-        "fields": {
-          "value": 689
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-12-17T07:46:28 +07:00",
-        "fields": {
-          "value": 605
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-11-07T23:42:39 +07:00",
-        "fields": {
-          "value": 976
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-04-08T10:58:41 +06:00",
-        "fields": {
-          "value": 474
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-04-21T13:21:35 +06:00",
-        "fields": {
-          "value": 755
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-03-09T21:13:18 +06:00",
-        "fields": {
-          "value": 260
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-09-21T17:06:46 +06:00",
-        "fields": {
-          "value": 817
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-01-16T00:29:21 +07:00",
-        "fields": {
-          "value": 841
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-03-28T00:38:16 +06:00",
-        "fields": {
-          "value": 414
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-09-19T20:23:38 +06:00",
-        "fields": {
-          "value": 992
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-02-13T06:44:22 +07:00",
-        "fields": {
-          "value": 984
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-12-20T02:19:33 +07:00",
-        "fields": {
-          "value": 587
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-01-16T23:13:48 +07:00",
-        "fields": {
-          "value": 886
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-09-19T21:03:11 +06:00",
-        "fields": {
-          "value": 21
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-06-23T00:33:55 +06:00",
-        "fields": {
-          "value": 277
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-03-28T08:51:09 +06:00",
-        "fields": {
-          "value": 953
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-12-06T00:45:39 +07:00",
-        "fields": {
-          "value": 602
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-09-12T00:58:36 +06:00",
-        "fields": {
-          "value": 157
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-09-13T20:26:58 +06:00",
-        "fields": {
-          "value": 102
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-03-21T08:58:34 +06:00",
-        "fields": {
-          "value": 891
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-02-17T07:57:58 +07:00",
-        "fields": {
-          "value": 210
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-01-05T05:00:19 +07:00",
-        "fields": {
-          "value": 515
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-02-23T02:22:40 +07:00",
-        "fields": {
-          "value": 635
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-04-01T18:52:17 +06:00",
-        "fields": {
-          "value": 898
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-03-30T03:04:59 +06:00",
-        "fields": {
-          "value": 380
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-05-19T06:51:24 +06:00",
-        "fields": {
-          "value": 464
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-07-05T16:10:03 +06:00",
-        "fields": {
-          "value": 526
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-06-20T00:26:58 +06:00",
-        "fields": {
-          "value": 144
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-08-09T02:43:00 +06:00",
-        "fields": {
-          "value": 5
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-11-10T05:01:36 +07:00",
-        "fields": {
-          "value": 822
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-01-02T08:44:58 +07:00",
-        "fields": {
-          "value": 808
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-07-19T09:48:54 +06:00",
-        "fields": {
-          "value": 353
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-03-24T21:02:44 +06:00",
-        "fields": {
-          "value": 60
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-08-12T12:36:45 +06:00",
-        "fields": {
-          "value": 921
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-12-06T13:08:37 +07:00",
-        "fields": {
-          "value": 859
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-04-12T11:28:09 +06:00",
-        "fields": {
-          "value": 71
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-07-24T00:14:51 +06:00",
-        "fields": {
-          "value": 294
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-06-09T09:47:20 +06:00",
-        "fields": {
-          "value": 668
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-11-09T06:24:32 +07:00",
-        "fields": {
-          "value": 621
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-05-11T05:13:55 +06:00",
-        "fields": {
-          "value": 373
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-10-06T01:12:22 +06:00",
-        "fields": {
-          "value": 270
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-03-06T14:17:20 +07:00",
-        "fields": {
-          "value": 297
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-03-22T15:07:36 +06:00",
-        "fields": {
-          "value": 398
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-12-16T01:25:10 +07:00",
-        "fields": {
-          "value": 347
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-03-31T11:21:32 +06:00",
-        "fields": {
-          "value": 842
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-02-05T13:47:17 +07:00",
-        "fields": {
-          "value": 735
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-08-23T04:49:12 +06:00",
-        "fields": {
-          "value": 43
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-10-15T03:11:42 +06:00",
-        "fields": {
-          "value": 694
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-03-21T06:49:51 +06:00",
-        "fields": {
-          "value": 642
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-03-14T00:02:05 +06:00",
-        "fields": {
-          "value": 995
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-07-31T12:57:38 +06:00",
-        "fields": {
-          "value": 265
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-09-13T07:49:21 +06:00",
-        "fields": {
-          "value": 141
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-01-28T13:51:49 +07:00",
-        "fields": {
-          "value": 633
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-03-11T03:07:31 +06:00",
-        "fields": {
-          "value": 955
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-09-20T11:22:33 +06:00",
-        "fields": {
-          "value": 5
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-03-18T17:37:35 +06:00",
-        "fields": {
-          "value": 198
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-06-30T09:49:21 +06:00",
-        "fields": {
-          "value": 95
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-03-22T13:59:52 +06:00",
-        "fields": {
-          "value": 268
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-02-22T11:41:45 +07:00",
-        "fields": {
-          "value": 347
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-05-16T14:59:31 +06:00",
-        "fields": {
-          "value": 877
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-12-07T16:52:49 +07:00",
-        "fields": {
-          "value": 426
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-02-23T02:18:18 +07:00",
-        "fields": {
-          "value": 805
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-01-27T23:04:46 +07:00",
-        "fields": {
-          "value": 677
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-01-14T05:42:09 +07:00",
-        "fields": {
-          "value": 359
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-04-02T11:58:01 +06:00",
-        "fields": {
-          "value": 109
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-01-12T03:41:26 +07:00",
-        "fields": {
-          "value": 414
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-09-11T04:32:46 +06:00",
-        "fields": {
-          "value": 595
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-04-13T00:13:18 +06:00",
-        "fields": {
-          "value": 714
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-10-02T11:55:16 +06:00",
-        "fields": {
-          "value": 201
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-03-03T17:05:29 +07:00",
-        "fields": {
-          "value": 54
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-03-09T14:01:17 +06:00",
-        "fields": {
-          "value": 448
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-09-21T09:11:18 +06:00",
-        "fields": {
-          "value": 624
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-06-20T15:26:20 +06:00",
-        "fields": {
-          "value": 35
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-09-01T01:07:26 +06:00",
-        "fields": {
-          "value": 270
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-07-04T03:35:14 +06:00",
-        "fields": {
-          "value": 299
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-02-21T00:48:37 +07:00",
-        "fields": {
-          "value": 237
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-03-31T10:00:59 +06:00",
-        "fields": {
-          "value": 288
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-02-10T06:51:18 +07:00",
-        "fields": {
-          "value": 324
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-06-08T04:45:16 +06:00",
-        "fields": {
-          "value": 297
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-02-19T21:15:40 +07:00",
-        "fields": {
-          "value": 382
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-09-29T20:53:30 +06:00",
-        "fields": {
-          "value": 156
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-11-12T06:34:00 +07:00",
-        "fields": {
-          "value": 477
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-03-16T00:29:48 +06:00",
-        "fields": {
-          "value": 226
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-02-25T19:47:55 +07:00",
-        "fields": {
-          "value": 302
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-03-23T09:07:28 +06:00",
-        "fields": {
-          "value": 772
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-03-19T03:07:13 +06:00",
-        "fields": {
-          "value": 902
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-08-22T11:22:14 +06:00",
-        "fields": {
-          "value": 627
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-01-25T05:52:07 +07:00",
-        "fields": {
-          "value": 251
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-07-31T02:24:36 +06:00",
-        "fields": {
-          "value": 493
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-11-02T10:14:18 +07:00",
-        "fields": {
-          "value": 969
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-02-16T06:17:17 +07:00",
-        "fields": {
-          "value": 156
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-08-14T22:21:59 +06:00",
-        "fields": {
-          "value": 255
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-09-17T07:07:01 +06:00",
-        "fields": {
-          "value": 693
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-02-20T23:07:31 +07:00",
-        "fields": {
-          "value": 291
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-08-21T09:59:50 +06:00",
-        "fields": {
-          "value": 753
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-02-13T02:02:13 +07:00",
-        "fields": {
-          "value": 253
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-07-18T23:31:17 +06:00",
-        "fields": {
-          "value": 83
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-01-11T03:45:50 +07:00",
-        "fields": {
-          "value": 225
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-02-05T03:50:35 +07:00",
-        "fields": {
-          "value": 897
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-02-16T21:00:00 +07:00",
-        "fields": {
-          "value": 470
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-03-20T16:44:42 +06:00",
-        "fields": {
-          "value": 341
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-04-21T05:34:41 +06:00",
-        "fields": {
-          "value": 474
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-02-20T03:46:22 +07:00",
-        "fields": {
-          "value": 795
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-01-06T12:58:22 +07:00",
-        "fields": {
-          "value": 827
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-09-15T02:05:14 +06:00",
-        "fields": {
-          "value": 565
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-10-26T17:26:57 +06:00",
-        "fields": {
-          "value": 257
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-07-27T11:17:57 +06:00",
-        "fields": {
-          "value": 634
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-03-22T01:39:37 +06:00",
-        "fields": {
-          "value": 887
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-03-31T04:28:27 +06:00",
-        "fields": {
-          "value": 84
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-04-08T17:13:01 +06:00",
-        "fields": {
-          "value": 499
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-03-03T06:05:01 +07:00",
-        "fields": {
-          "value": 394
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-03-26T23:18:12 +06:00",
-        "fields": {
-          "value": 309
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-03-28T01:17:25 +06:00",
-        "fields": {
-          "value": 167
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-01-05T06:16:51 +07:00",
-        "fields": {
-          "value": 302
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-02-07T19:54:38 +07:00",
-        "fields": {
-          "value": 141
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-05-22T04:17:40 +06:00",
-        "fields": {
-          "value": 72
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-06-06T09:11:41 +06:00",
-        "fields": {
-          "value": 160
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-07-16T09:10:49 +06:00",
-        "fields": {
-          "value": 3
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-01-12T13:00:54 +07:00",
-        "fields": {
-          "value": 153
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-10-06T22:15:43 +06:00",
-        "fields": {
-          "value": 619
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-02-01T04:14:33 +07:00",
-        "fields": {
-          "value": 920
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-08-25T02:55:49 +06:00",
-        "fields": {
-          "value": 761
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-04-04T18:30:39 +06:00",
-        "fields": {
-          "value": 30
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-09-18T11:51:40 +06:00",
-        "fields": {
-          "value": 560
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-10-21T00:34:43 +06:00",
-        "fields": {
-          "value": 332
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-12-16T11:18:41 +07:00",
-        "fields": {
-          "value": 272
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-02-04T10:09:35 +07:00",
-        "fields": {
-          "value": 917
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-05-30T04:37:30 +06:00",
-        "fields": {
-          "value": 644
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-10-26T21:12:16 +06:00",
-        "fields": {
-          "value": 952
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-02-27T02:43:57 +07:00",
-        "fields": {
-          "value": 660
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-02-25T05:25:35 +07:00",
-        "fields": {
-          "value": 732
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-11-28T10:25:44 +07:00",
-        "fields": {
-          "value": 850
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-01-11T07:53:07 +07:00",
-        "fields": {
-          "value": 283
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-01-28T19:26:04 +07:00",
-        "fields": {
-          "value": 768
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-01-27T09:30:38 +07:00",
-        "fields": {
-          "value": 246
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-05-19T13:24:34 +06:00",
-        "fields": {
-          "value": 872
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-03-08T16:07:25 +07:00",
-        "fields": {
-          "value": 526
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-12-10T01:28:49 +07:00",
-        "fields": {
-          "value": 563
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-05-25T02:09:30 +06:00",
-        "fields": {
-          "value": 312
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-03-13T16:51:44 +06:00",
-        "fields": {
-          "value": 21
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-09-19T18:11:13 +06:00",
-        "fields": {
-          "value": 736
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-01-12T06:17:56 +07:00",
-        "fields": {
-          "value": 185
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-04-22T03:23:29 +06:00",
-        "fields": {
-          "value": 190
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-04-08T09:33:38 +06:00",
-        "fields": {
-          "value": 734
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-09-19T21:23:58 +06:00",
-        "fields": {
-          "value": 154
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-01-30T02:22:44 +07:00",
-        "fields": {
-          "value": 729
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-07-24T12:42:09 +06:00",
-        "fields": {
-          "value": 741
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-04-07T09:57:27 +06:00",
-        "fields": {
-          "value": 153
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-11-19T05:26:19 +07:00",
-        "fields": {
-          "value": 128
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-09-17T08:34:19 +06:00",
-        "fields": {
-          "value": 182
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-02-13T16:01:48 +07:00",
-        "fields": {
-          "value": 530
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-08-15T02:31:24 +06:00",
-        "fields": {
-          "value": 205
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-03-10T08:26:34 +07:00",
-        "fields": {
-          "value": 913
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-02-06T07:11:35 +07:00",
-        "fields": {
-          "value": 411
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-02-23T04:47:45 +07:00",
-        "fields": {
-          "value": 399
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-08-03T06:18:11 +06:00",
-        "fields": {
-          "value": 203
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-07-20T06:27:42 +06:00",
-        "fields": {
-          "value": 146
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-10-03T00:03:47 +06:00",
-        "fields": {
-          "value": 861
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-08-05T18:37:24 +06:00",
-        "fields": {
-          "value": 961
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-09-09T04:31:52 +06:00",
-        "fields": {
-          "value": 656
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-12-21T19:47:58 +07:00",
-        "fields": {
-          "value": 866
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-02-19T17:56:34 +07:00",
-        "fields": {
-          "value": 235
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-02-09T10:23:51 +07:00",
-        "fields": {
-          "value": 75
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-03-22T09:09:19 +06:00",
-        "fields": {
-          "value": 791
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-09-26T00:08:26 +06:00",
-        "fields": {
-          "value": 37
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-05-26T09:56:19 +06:00",
-        "fields": {
-          "value": 594
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-07-03T11:18:34 +06:00",
-        "fields": {
-          "value": 725
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-08-16T00:55:20 +06:00",
-        "fields": {
-          "value": 192
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-12-13T19:13:13 +07:00",
-        "fields": {
-          "value": 930
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-03-05T10:09:53 +07:00",
-        "fields": {
-          "value": 462
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-02-03T23:30:50 +07:00",
-        "fields": {
-          "value": 402
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-08-08T14:41:51 +06:00",
-        "fields": {
-          "value": 984
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-12-02T17:26:46 +07:00",
-        "fields": {
-          "value": 994
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-10-11T05:14:14 +06:00",
-        "fields": {
-          "value": 199
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-11-14T16:02:19 +07:00",
-        "fields": {
-          "value": 72
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-06-13T16:51:29 +06:00",
-        "fields": {
-          "value": 681
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-02-15T13:32:50 +07:00",
-        "fields": {
-          "value": 239
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-01-30T07:40:32 +07:00",
-        "fields": {
-          "value": 673
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-01-31T23:18:48 +07:00",
-        "fields": {
-          "value": 464
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-07-10T02:12:23 +06:00",
-        "fields": {
-          "value": 373
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-05-04T12:56:33 +06:00",
-        "fields": {
-          "value": 98
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-02-07T06:51:37 +07:00",
-        "fields": {
-          "value": 1000
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-08-06T16:36:15 +06:00",
-        "fields": {
-          "value": 758
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-01-24T01:18:28 +07:00",
-        "fields": {
-          "value": 83
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-01-19T22:31:21 +07:00",
-        "fields": {
-          "value": 395
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-06-30T04:15:27 +06:00",
-        "fields": {
-          "value": 779
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-03-15T00:46:50 +06:00",
-        "fields": {
-          "value": 576
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-11-16T05:27:00 +07:00",
-        "fields": {
-          "value": 973
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-02-27T02:37:59 +07:00",
-        "fields": {
-          "value": 860
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-05-09T21:31:56 +06:00",
-        "fields": {
-          "value": 737
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-07-26T00:22:50 +06:00",
-        "fields": {
-          "value": 567
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-02-02T01:47:58 +07:00",
-        "fields": {
-          "value": 296
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-08-16T04:03:17 +06:00",
-        "fields": {
-          "value": 572
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-12-31T07:11:13 +07:00",
-        "fields": {
-          "value": 126
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-10-06T22:06:18 +06:00",
-        "fields": {
-          "value": 886
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-06-06T14:37:54 +06:00",
-        "fields": {
-          "value": 30
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-09-24T11:15:35 +06:00",
-        "fields": {
-          "value": 205
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-01-27T07:14:41 +07:00",
-        "fields": {
-          "value": 942
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-06-01T14:02:38 +06:00",
-        "fields": {
-          "value": 509
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-04-18T10:27:35 +06:00",
-        "fields": {
-          "value": 444
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-02-08T02:55:31 +07:00",
-        "fields": {
-          "value": 75
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-02-14T19:58:59 +07:00",
-        "fields": {
-          "value": 804
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-06-27T11:48:42 +06:00",
-        "fields": {
-          "value": 414
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-01-30T02:05:48 +07:00",
-        "fields": {
-          "value": 431
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-06-08T23:15:23 +06:00",
-        "fields": {
-          "value": 138
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-04-06T23:49:05 +06:00",
-        "fields": {
-          "value": 869
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-09-27T07:30:03 +06:00",
-        "fields": {
-          "value": 586
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-07-10T22:53:28 +06:00",
-        "fields": {
-          "value": 366
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-01-28T06:23:28 +07:00",
-        "fields": {
-          "value": 545
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-04-18T19:13:02 +06:00",
-        "fields": {
-          "value": 323
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-11-25T11:09:23 +07:00",
-        "fields": {
-          "value": 90
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-05-19T16:56:04 +06:00",
-        "fields": {
-          "value": 777
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-03-30T05:43:41 +06:00",
-        "fields": {
-          "value": 682
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-09-14T02:46:57 +06:00",
-        "fields": {
-          "value": 242
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-04-06T07:14:54 +06:00",
-        "fields": {
-          "value": 785
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-02-08T23:42:17 +07:00",
-        "fields": {
-          "value": 853
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-08-10T01:20:19 +06:00",
-        "fields": {
-          "value": 583
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-07-16T23:32:34 +06:00",
-        "fields": {
-          "value": 84
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-09-10T05:27:21 +06:00",
-        "fields": {
-          "value": 946
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-12-19T01:36:46 +07:00",
-        "fields": {
-          "value": 495
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-07-07T21:50:59 +06:00",
-        "fields": {
-          "value": 995
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-04-21T19:13:37 +06:00",
-        "fields": {
-          "value": 719
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-02-27T13:50:39 +07:00",
-        "fields": {
-          "value": 337
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-03-18T08:56:55 +06:00",
-        "fields": {
-          "value": 684
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-03-10T00:07:01 +07:00",
-        "fields": {
-          "value": 626
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-02-10T04:14:45 +07:00",
-        "fields": {
-          "value": 94
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-01-29T22:59:49 +07:00",
-        "fields": {
-          "value": 846
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-03-25T19:03:54 +06:00",
-        "fields": {
-          "value": 943
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-02-12T02:10:01 +07:00",
-        "fields": {
-          "value": 847
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-06-08T00:03:46 +06:00",
-        "fields": {
-          "value": 695
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-05-07T06:06:37 +06:00",
-        "fields": {
-          "value": 288
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-03-22T19:20:13 +06:00",
-        "fields": {
-          "value": 979
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-01-06T01:35:05 +07:00",
-        "fields": {
-          "value": 686
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-03-04T03:49:12 +07:00",
-        "fields": {
-          "value": 217
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-12-07T00:12:18 +07:00",
-        "fields": {
-          "value": 407
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-09-25T04:59:11 +06:00",
-        "fields": {
-          "value": 495
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-03-07T07:14:43 +07:00",
-        "fields": {
-          "value": 647
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-09-08T02:13:02 +06:00",
-        "fields": {
-          "value": 514
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-12-01T18:02:54 +07:00",
-        "fields": {
-          "value": 581
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-10-14T19:42:57 +06:00",
-        "fields": {
-          "value": 47
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-06-09T21:30:50 +06:00",
-        "fields": {
-          "value": 241
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-09-01T19:23:27 +06:00",
-        "fields": {
-          "value": 413
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-10-03T07:44:53 +06:00",
-        "fields": {
-          "value": 729
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-12-25T16:58:43 +07:00",
-        "fields": {
-          "value": 293
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-07-03T08:20:47 +06:00",
-        "fields": {
-          "value": 870
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-10-10T00:46:46 +06:00",
-        "fields": {
-          "value": 686
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-01-29T05:09:27 +07:00",
-        "fields": {
-          "value": 97
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-11-25T02:52:16 +07:00",
-        "fields": {
-          "value": 334
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-03-03T17:30:42 +07:00",
-        "fields": {
-          "value": 2
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-01-30T11:17:25 +07:00",
-        "fields": {
-          "value": 281
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-08-28T19:45:59 +06:00",
-        "fields": {
-          "value": 419
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-05-05T12:20:37 +06:00",
-        "fields": {
-          "value": 118
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-06-02T09:44:48 +06:00",
-        "fields": {
-          "value": 893
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-06-04T09:29:21 +06:00",
-        "fields": {
-          "value": 746
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-08-26T15:17:18 +06:00",
-        "fields": {
-          "value": 161
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-10-08T14:31:50 +06:00",
-        "fields": {
-          "value": 191
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-02-02T11:15:28 +07:00",
-        "fields": {
-          "value": 686
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-04-14T16:13:31 +06:00",
-        "fields": {
-          "value": 134
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-09-23T17:50:04 +06:00",
-        "fields": {
-          "value": 771
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-11-11T02:33:21 +07:00",
-        "fields": {
-          "value": 617
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-03-10T01:50:07 +07:00",
-        "fields": {
-          "value": 581
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-10-10T05:07:00 +06:00",
-        "fields": {
-          "value": 179
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-09-24T21:38:21 +06:00",
-        "fields": {
-          "value": 363
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-03-20T19:26:51 +06:00",
-        "fields": {
-          "value": 360
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-01-18T23:34:41 +07:00",
-        "fields": {
-          "value": 638
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-03-04T09:04:17 +07:00",
-        "fields": {
-          "value": 113
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-07-30T17:46:50 +06:00",
-        "fields": {
-          "value": 586
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-11-08T20:37:48 +07:00",
-        "fields": {
-          "value": 656
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-06-16T15:40:19 +06:00",
-        "fields": {
-          "value": 314
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-07-30T23:20:22 +06:00",
-        "fields": {
-          "value": 738
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-02-13T20:40:39 +07:00",
-        "fields": {
-          "value": 785
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-01-30T10:53:53 +07:00",
-        "fields": {
-          "value": 46
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-08-21T03:25:47 +06:00",
-        "fields": {
-          "value": 965
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-02-28T16:46:14 +07:00",
-        "fields": {
-          "value": 360
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-09-17T16:33:19 +06:00",
-        "fields": {
-          "value": 490
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-12-05T02:11:10 +07:00",
-        "fields": {
-          "value": 816
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-02-17T04:51:01 +07:00",
-        "fields": {
-          "value": 692
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-01-21T19:55:03 +07:00",
-        "fields": {
-          "value": 329
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-02-11T00:32:32 +07:00",
-        "fields": {
-          "value": 442
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-06-18T22:27:04 +06:00",
-        "fields": {
-          "value": 515
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-01-19T14:51:10 +07:00",
-        "fields": {
-          "value": 994
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-03-22T03:53:36 +06:00",
-        "fields": {
-          "value": 134
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-04-08T14:20:07 +06:00",
-        "fields": {
-          "value": 465
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-02-24T00:21:59 +07:00",
-        "fields": {
-          "value": 300
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-10-31T02:25:45 +06:00",
-        "fields": {
-          "value": 957
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-09-01T16:04:47 +06:00",
-        "fields": {
-          "value": 387
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-11-12T20:35:00 +07:00",
-        "fields": {
-          "value": 55
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-10-08T23:46:58 +06:00",
-        "fields": {
-          "value": 205
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-06-28T16:59:20 +06:00",
-        "fields": {
-          "value": 353
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-02-16T19:17:45 +07:00",
-        "fields": {
-          "value": 427
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-07-20T10:34:41 +06:00",
-        "fields": {
-          "value": 55
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-06-26T00:57:37 +06:00",
-        "fields": {
-          "value": 8
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-03-26T19:39:41 +06:00",
-        "fields": {
-          "value": 794
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-07-24T16:28:55 +06:00",
-        "fields": {
-          "value": 156
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-02-22T05:07:43 +07:00",
-        "fields": {
-          "value": 677
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-11-16T07:38:36 +07:00",
-        "fields": {
-          "value": 149
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-08-22T21:51:44 +06:00",
-        "fields": {
-          "value": 987
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-01-20T05:36:48 +07:00",
-        "fields": {
-          "value": 263
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-01-29T16:42:37 +07:00",
-        "fields": {
-          "value": 816
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-03-22T13:19:59 +06:00",
-        "fields": {
-          "value": 578
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-08-15T20:35:47 +06:00",
-        "fields": {
-          "value": 580
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-08-29T11:49:43 +06:00",
-        "fields": {
-          "value": 440
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-08-18T19:05:45 +06:00",
-        "fields": {
-          "value": 565
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-04-29T05:43:09 +06:00",
-        "fields": {
-          "value": 169
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-03-22T18:04:41 +06:00",
-        "fields": {
-          "value": 147
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-12-14T04:51:25 +07:00",
-        "fields": {
-          "value": 136
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-11-03T02:18:23 +07:00",
-        "fields": {
-          "value": 809
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-07-23T10:58:06 +06:00",
-        "fields": {
-          "value": 881
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-12-12T09:22:37 +07:00",
-        "fields": {
-          "value": 270
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-03-02T12:16:54 +07:00",
-        "fields": {
-          "value": 420
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-06-03T06:25:59 +06:00",
-        "fields": {
-          "value": 936
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-11-23T20:31:37 +07:00",
-        "fields": {
-          "value": 662
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-11-30T01:35:15 +07:00",
-        "fields": {
-          "value": 327
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-01-01T03:47:14 +07:00",
-        "fields": {
-          "value": 18
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-12-28T18:12:54 +07:00",
-        "fields": {
-          "value": 444
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-12-25T06:21:13 +07:00",
-        "fields": {
-          "value": 922
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-11-05T18:19:04 +07:00",
-        "fields": {
-          "value": 328
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-08-27T02:14:18 +06:00",
-        "fields": {
-          "value": 63
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-03-05T04:31:49 +07:00",
-        "fields": {
-          "value": 115
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-04-27T11:34:46 +06:00",
-        "fields": {
-          "value": 501
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-06-05T16:13:46 +06:00",
-        "fields": {
-          "value": 990
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-05-28T20:21:01 +06:00",
-        "fields": {
-          "value": 63
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-04-01T08:51:46 +06:00",
-        "fields": {
-          "value": 348
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-04-11T19:00:50 +06:00",
-        "fields": {
-          "value": 817
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-11-30T04:46:32 +07:00",
-        "fields": {
-          "value": 868
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-05-27T22:58:18 +06:00",
-        "fields": {
-          "value": 170
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-02-22T16:19:45 +07:00",
-        "fields": {
-          "value": 67
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-11-17T23:17:13 +07:00",
-        "fields": {
-          "value": 927
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-06-14T03:21:45 +06:00",
-        "fields": {
-          "value": 483
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-10-20T13:26:36 +06:00",
-        "fields": {
-          "value": 569
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-02-06T23:46:53 +07:00",
-        "fields": {
-          "value": 429
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-02-18T01:06:23 +07:00",
-        "fields": {
-          "value": 370
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-04-03T10:56:14 +06:00",
-        "fields": {
-          "value": 946
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-02-22T05:26:32 +07:00",
-        "fields": {
-          "value": 344
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-04-06T14:09:51 +06:00",
-        "fields": {
-          "value": 708
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-11-30T21:43:24 +07:00",
-        "fields": {
-          "value": 125
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-01-06T07:33:05 +07:00",
-        "fields": {
-          "value": 997
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-04-11T10:42:22 +06:00",
-        "fields": {
-          "value": 302
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-09-02T00:13:54 +06:00",
-        "fields": {
-          "value": 176
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-09-22T09:01:20 +06:00",
-        "fields": {
-          "value": 7
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-06-17T01:54:59 +06:00",
-        "fields": {
-          "value": 253
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-04-09T17:39:18 +06:00",
-        "fields": {
-          "value": 903
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-12-11T11:53:42 +07:00",
-        "fields": {
-          "value": 692
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-02-07T03:40:33 +07:00",
-        "fields": {
-          "value": 585
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-12-12T06:52:54 +07:00",
-        "fields": {
-          "value": 590
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-02-17T02:03:19 +07:00",
-        "fields": {
-          "value": 662
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-08-15T19:38:18 +06:00",
-        "fields": {
-          "value": 254
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-12-16T23:36:56 +07:00",
-        "fields": {
-          "value": 516
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-06-10T16:38:43 +06:00",
-        "fields": {
-          "value": 806
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-05-20T11:50:54 +06:00",
-        "fields": {
-          "value": 960
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-01-29T13:18:59 +07:00",
-        "fields": {
-          "value": 866
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-01-08T10:34:17 +07:00",
-        "fields": {
-          "value": 338
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-10-24T20:11:34 +06:00",
-        "fields": {
-          "value": 153
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-08-02T17:50:43 +06:00",
-        "fields": {
-          "value": 870
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-01-01T12:47:23 +07:00",
-        "fields": {
-          "value": 486
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-06-05T16:46:27 +06:00",
-        "fields": {
-          "value": 161
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-03-16T08:47:29 +06:00",
-        "fields": {
-          "value": 821
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-12-29T01:55:11 +07:00",
-        "fields": {
-          "value": 184
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-02-28T05:30:09 +07:00",
-        "fields": {
-          "value": 679
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-01-16T20:24:29 +07:00",
-        "fields": {
-          "value": 863
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-12-13T23:46:03 +07:00",
-        "fields": {
-          "value": 137
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-12-02T23:23:09 +07:00",
-        "fields": {
-          "value": 306
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-09-09T14:12:39 +06:00",
-        "fields": {
-          "value": 418
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-01-13T21:03:41 +07:00",
-        "fields": {
-          "value": 419
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-04-09T15:16:11 +06:00",
-        "fields": {
-          "value": 75
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-06-07T07:35:35 +06:00",
-        "fields": {
-          "value": 94
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-06-14T03:01:03 +06:00",
-        "fields": {
-          "value": 79
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-12-10T14:42:41 +07:00",
-        "fields": {
-          "value": 331
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-10-20T06:03:24 +06:00",
-        "fields": {
-          "value": 457
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-01-27T00:10:55 +07:00",
-        "fields": {
-          "value": 473
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-12-12T15:30:57 +07:00",
-        "fields": {
-          "value": 428
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-05-27T07:23:11 +06:00",
-        "fields": {
-          "value": 286
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-10-15T22:03:32 +06:00",
-        "fields": {
-          "value": 21
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-08-01T03:04:05 +06:00",
-        "fields": {
-          "value": 512
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-02-10T11:32:17 +07:00",
-        "fields": {
-          "value": 132
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-02-24T00:11:23 +07:00",
-        "fields": {
-          "value": 483
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-08-08T00:38:24 +06:00",
-        "fields": {
-          "value": 492
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-09-15T01:59:10 +06:00",
-        "fields": {
-          "value": 473
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-02-11T14:15:28 +07:00",
-        "fields": {
-          "value": 627
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-12-08T01:54:01 +07:00",
-        "fields": {
-          "value": 676
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-07-03T23:26:02 +06:00",
-        "fields": {
-          "value": 564
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-09-17T23:47:49 +06:00",
-        "fields": {
-          "value": 891
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-05-27T17:36:39 +06:00",
-        "fields": {
-          "value": 531
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-01-16T03:35:59 +07:00",
-        "fields": {
-          "value": 260
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-09-23T03:22:31 +06:00",
-        "fields": {
-          "value": 116
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-05-23T12:33:57 +06:00",
-        "fields": {
-          "value": 667
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-10-05T17:25:43 +06:00",
-        "fields": {
-          "value": 106
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-02-20T03:37:42 +07:00",
-        "fields": {
-          "value": 969
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-07-08T17:12:54 +06:00",
-        "fields": {
-          "value": 286
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-02-21T08:57:14 +07:00",
-        "fields": {
-          "value": 847
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-11-16T13:45:23 +07:00",
-        "fields": {
-          "value": 466
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-07-06T07:43:34 +06:00",
-        "fields": {
-          "value": 290
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-12-06T11:06:37 +07:00",
-        "fields": {
-          "value": 262
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-11-08T18:52:19 +07:00",
-        "fields": {
-          "value": 593
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-03-13T13:43:54 +06:00",
-        "fields": {
-          "value": 600
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-02-26T06:01:26 +07:00",
-        "fields": {
-          "value": 603
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-02-16T16:15:20 +07:00",
-        "fields": {
-          "value": 723
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-07-20T00:17:53 +06:00",
-        "fields": {
-          "value": 19
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-02-26T20:01:22 +07:00",
-        "fields": {
-          "value": 152
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-04-19T11:17:58 +06:00",
-        "fields": {
-          "value": 153
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-04-20T08:36:47 +06:00",
-        "fields": {
-          "value": 12
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-07-01T15:25:51 +06:00",
-        "fields": {
-          "value": 323
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-07-18T10:57:32 +06:00",
-        "fields": {
-          "value": 111
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-10-20T12:25:36 +06:00",
-        "fields": {
-          "value": 392
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-07-14T22:23:34 +06:00",
-        "fields": {
-          "value": 592
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-10-26T21:31:06 +06:00",
-        "fields": {
-          "value": 387
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-03-04T20:33:01 +07:00",
-        "fields": {
-          "value": 235
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-05-02T13:20:58 +06:00",
-        "fields": {
-          "value": 145
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-09-26T15:37:03 +06:00",
-        "fields": {
-          "value": 898
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-11-17T17:22:53 +07:00",
-        "fields": {
-          "value": 335
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-02-05T01:51:24 +07:00",
-        "fields": {
-          "value": 423
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-02-03T13:13:58 +07:00",
-        "fields": {
-          "value": 274
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-03-09T20:35:53 +07:00",
-        "fields": {
-          "value": 566
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-12-10T08:07:24 +07:00",
-        "fields": {
-          "value": 19
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-11-28T03:20:02 +07:00",
-        "fields": {
-          "value": 34
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-02-12T14:25:15 +07:00",
-        "fields": {
-          "value": 414
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-06-06T17:19:59 +06:00",
-        "fields": {
-          "value": 223
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-08-05T08:17:47 +06:00",
-        "fields": {
-          "value": 668
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-10-01T09:54:32 +06:00",
-        "fields": {
-          "value": 583
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-12-19T09:26:13 +07:00",
-        "fields": {
-          "value": 914
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-02-24T14:22:57 +07:00",
-        "fields": {
-          "value": 19
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-08-24T17:27:14 +06:00",
-        "fields": {
-          "value": 19
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-04-07T15:23:56 +06:00",
-        "fields": {
-          "value": 600
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-06-20T17:01:44 +06:00",
-        "fields": {
-          "value": 277
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-08-25T02:16:04 +06:00",
-        "fields": {
-          "value": 684
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-11-08T09:14:54 +07:00",
-        "fields": {
-          "value": 491
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-06-06T18:11:21 +06:00",
-        "fields": {
-          "value": 594
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-07-29T05:10:43 +06:00",
-        "fields": {
-          "value": 546
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-02-16T16:39:14 +07:00",
-        "fields": {
-          "value": 76
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-05-20T01:02:16 +06:00",
-        "fields": {
-          "value": 467
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-02-29T00:38:40 +07:00",
-        "fields": {
-          "value": 468
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-03-23T07:49:59 +06:00",
-        "fields": {
-          "value": 19
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-01-04T03:39:03 +07:00",
-        "fields": {
-          "value": 481
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-06-13T01:51:58 +06:00",
-        "fields": {
-          "value": 929
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-09-11T18:10:50 +06:00",
-        "fields": {
-          "value": 77
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-02-03T21:15:03 +07:00",
-        "fields": {
-          "value": 504
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-10-05T22:53:45 +06:00",
-        "fields": {
-          "value": 432
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-04-13T09:16:49 +06:00",
-        "fields": {
-          "value": 987
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-03-09T23:47:37 +06:00",
-        "fields": {
-          "value": 922
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-02-25T21:47:34 +07:00",
-        "fields": {
-          "value": 192
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-11-08T01:05:56 +07:00",
-        "fields": {
-          "value": 662
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-03-24T14:06:50 +06:00",
-        "fields": {
-          "value": 250
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-10-18T09:28:31 +06:00",
-        "fields": {
-          "value": 293
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-03-20T01:16:02 +06:00",
-        "fields": {
-          "value": 254
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-06-08T17:44:27 +06:00",
-        "fields": {
-          "value": 718
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-05-16T01:55:46 +06:00",
-        "fields": {
-          "value": 814
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-08-13T21:56:45 +06:00",
-        "fields": {
-          "value": 79
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-12-06T17:06:13 +07:00",
-        "fields": {
-          "value": 749
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-09-02T17:17:16 +06:00",
-        "fields": {
-          "value": 587
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-08-12T10:39:51 +06:00",
-        "fields": {
-          "value": 643
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-05-12T16:31:57 +06:00",
-        "fields": {
-          "value": 753
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-07-06T19:22:07 +06:00",
-        "fields": {
-          "value": 285
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-09-15T19:19:19 +06:00",
-        "fields": {
-          "value": 153
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-09-26T20:49:47 +06:00",
-        "fields": {
-          "value": 821
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-12-23T03:32:01 +07:00",
-        "fields": {
-          "value": 613
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-06-27T13:25:17 +06:00",
-        "fields": {
-          "value": 335
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-01-18T21:40:28 +07:00",
-        "fields": {
-          "value": 932
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-12-03T03:45:21 +07:00",
-        "fields": {
-          "value": 97
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-10-29T03:37:52 +06:00",
-        "fields": {
-          "value": 611
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-09-14T21:40:17 +06:00",
-        "fields": {
-          "value": 208
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-02-13T14:57:51 +07:00",
-        "fields": {
-          "value": 463
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-08-29T19:36:28 +06:00",
-        "fields": {
-          "value": 927
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-02-06T12:24:59 +07:00",
-        "fields": {
-          "value": 416
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-10-02T19:10:00 +06:00",
-        "fields": {
-          "value": 464
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-05-08T10:08:31 +06:00",
-        "fields": {
-          "value": 254
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-02-01T05:32:40 +07:00",
-        "fields": {
-          "value": 619
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-07-08T15:08:14 +06:00",
-        "fields": {
-          "value": 766
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-03-25T22:54:16 +06:00",
-        "fields": {
-          "value": 318
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-03-14T14:41:53 +06:00",
-        "fields": {
-          "value": 320
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-12-09T23:05:42 +07:00",
-        "fields": {
-          "value": 633
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-09-07T02:16:37 +06:00",
-        "fields": {
-          "value": 328
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-01-30T14:32:29 +07:00",
-        "fields": {
-          "value": 674
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-02-14T23:24:55 +07:00",
-        "fields": {
-          "value": 917
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-10-11T20:00:50 +06:00",
-        "fields": {
-          "value": 317
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-03-14T03:32:22 +06:00",
-        "fields": {
-          "value": 578
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-04-12T16:31:20 +06:00",
-        "fields": {
-          "value": 190
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-08-02T05:31:42 +06:00",
-        "fields": {
-          "value": 339
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-12-04T11:40:44 +07:00",
-        "fields": {
-          "value": 85
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-07-20T09:49:00 +06:00",
-        "fields": {
-          "value": 336
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-02-22T03:03:56 +07:00",
-        "fields": {
-          "value": 303
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-08-18T08:20:54 +06:00",
-        "fields": {
-          "value": 235
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-05-22T20:08:58 +06:00",
-        "fields": {
-          "value": 587
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-03-07T22:56:16 +07:00",
-        "fields": {
-          "value": 436
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-11-25T08:29:45 +07:00",
-        "fields": {
-          "value": 798
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-02-10T03:47:35 +07:00",
-        "fields": {
-          "value": 967
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-07-27T21:03:52 +06:00",
-        "fields": {
-          "value": 772
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-03-22T14:06:31 +06:00",
-        "fields": {
-          "value": 179
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-03-27T04:12:55 +06:00",
-        "fields": {
-          "value": 985
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-06-01T07:24:43 +06:00",
-        "fields": {
-          "value": 76
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-11-17T03:08:37 +07:00",
-        "fields": {
-          "value": 869
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-11-07T07:42:26 +07:00",
-        "fields": {
-          "value": 111
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-06-02T07:30:54 +06:00",
-        "fields": {
-          "value": 742
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-03-18T01:31:41 +06:00",
-        "fields": {
-          "value": 737
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-04-25T07:14:11 +06:00",
-        "fields": {
-          "value": 11
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-06-16T08:53:32 +06:00",
-        "fields": {
-          "value": 967
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-05-23T04:04:27 +06:00",
-        "fields": {
-          "value": 757
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-03-10T14:12:59 +06:00",
-        "fields": {
-          "value": 548
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-05-20T02:42:54 +06:00",
-        "fields": {
-          "value": 846
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-03-30T20:28:38 +06:00",
-        "fields": {
-          "value": 103
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-03-07T14:56:03 +07:00",
-        "fields": {
-          "value": 70
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-02-04T10:37:15 +07:00",
-        "fields": {
-          "value": 37
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-01-08T13:03:31 +07:00",
-        "fields": {
-          "value": 708
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-03-29T09:38:41 +06:00",
-        "fields": {
-          "value": 866
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-07-26T15:09:59 +06:00",
-        "fields": {
-          "value": 741
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-11-28T19:30:01 +07:00",
-        "fields": {
-          "value": 896
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-07-02T11:14:53 +06:00",
-        "fields": {
-          "value": 901
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-08-21T12:17:27 +06:00",
-        "fields": {
-          "value": 794
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-11-03T06:19:55 +07:00",
-        "fields": {
-          "value": 112
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-11-17T03:28:57 +07:00",
-        "fields": {
-          "value": 329
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-09-06T12:54:13 +06:00",
-        "fields": {
-          "value": 354
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-02-21T02:43:44 +07:00",
-        "fields": {
-          "value": 870
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-11-15T19:21:23 +07:00",
-        "fields": {
-          "value": 661
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-04-29T15:47:31 +06:00",
-        "fields": {
-          "value": 588
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-02-15T06:30:39 +07:00",
-        "fields": {
-          "value": 594
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-09-25T15:47:16 +06:00",
-        "fields": {
-          "value": 564
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-07-27T19:51:32 +06:00",
-        "fields": {
-          "value": 587
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-10-05T03:58:28 +06:00",
-        "fields": {
-          "value": 469
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-05-13T17:29:27 +06:00",
-        "fields": {
-          "value": 237
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-09-08T07:33:21 +06:00",
-        "fields": {
-          "value": 47
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-05-10T05:28:57 +06:00",
-        "fields": {
-          "value": 757
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-05-30T12:37:42 +06:00",
-        "fields": {
-          "value": 570
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-04-13T19:09:31 +06:00",
-        "fields": {
-          "value": 693
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-08-24T11:40:08 +06:00",
-        "fields": {
-          "value": 109
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-03-25T03:30:06 +06:00",
-        "fields": {
-          "value": 713
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-09-29T07:18:34 +06:00",
-        "fields": {
-          "value": 907
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-05-31T11:47:09 +06:00",
-        "fields": {
-          "value": 169
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-04-23T05:58:25 +06:00",
-        "fields": {
-          "value": 966
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-03-07T23:03:00 +07:00",
-        "fields": {
-          "value": 265
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-10-23T08:25:38 +06:00",
-        "fields": {
-          "value": 584
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-10-05T07:08:07 +06:00",
-        "fields": {
-          "value": 966
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-12-03T07:35:19 +07:00",
-        "fields": {
-          "value": 228
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-06-22T14:46:49 +06:00",
-        "fields": {
-          "value": 391
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-03-31T08:34:11 +06:00",
-        "fields": {
-          "value": 794
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-04-19T03:09:25 +06:00",
-        "fields": {
-          "value": 360
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-09-06T00:55:08 +06:00",
-        "fields": {
-          "value": 271
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-02-21T17:59:28 +07:00",
-        "fields": {
-          "value": 161
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-01-25T02:49:05 +07:00",
-        "fields": {
-          "value": 625
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-10-06T10:22:45 +06:00",
-        "fields": {
-          "value": 382
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-03-25T22:52:00 +06:00",
-        "fields": {
-          "value": 949
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-01-18T06:47:08 +07:00",
-        "fields": {
-          "value": 962
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-02-04T19:35:41 +07:00",
-        "fields": {
-          "value": 681
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-08-25T17:21:49 +06:00",
-        "fields": {
-          "value": 384
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-12-02T05:47:27 +07:00",
-        "fields": {
-          "value": 187
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-08-31T05:37:15 +06:00",
-        "fields": {
-          "value": 426
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-02-20T05:03:36 +07:00",
-        "fields": {
-          "value": 662
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-06-25T02:54:40 +06:00",
-        "fields": {
-          "value": 691
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-09-28T16:29:50 +06:00",
-        "fields": {
-          "value": 762
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-01-13T08:24:19 +07:00",
-        "fields": {
-          "value": 523
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-04-14T00:15:45 +06:00",
-        "fields": {
-          "value": 876
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-02-14T07:28:47 +07:00",
-        "fields": {
-          "value": 759
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-02-16T13:22:27 +07:00",
-        "fields": {
-          "value": 718
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-04-19T20:06:41 +06:00",
-        "fields": {
-          "value": 902
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-05-25T09:20:13 +06:00",
-        "fields": {
-          "value": 750
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-07-08T23:16:19 +06:00",
-        "fields": {
-          "value": 496
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-06-20T23:15:28 +06:00",
-        "fields": {
-          "value": 519
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-08-08T21:03:01 +06:00",
-        "fields": {
-          "value": 12
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-09-03T23:28:43 +06:00",
-        "fields": {
-          "value": 562
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-01-28T02:42:49 +07:00",
-        "fields": {
-          "value": 282
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-09-07T02:29:08 +06:00",
-        "fields": {
-          "value": 681
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-06-03T23:58:34 +06:00",
-        "fields": {
-          "value": 194
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-06-29T17:03:43 +06:00",
-        "fields": {
-          "value": 257
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-09-09T21:39:11 +06:00",
-        "fields": {
-          "value": 474
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-03-18T11:11:05 +06:00",
-        "fields": {
-          "value": 870
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-08-12T13:56:58 +06:00",
-        "fields": {
-          "value": 943
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-08-24T18:49:38 +06:00",
-        "fields": {
-          "value": 798
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-07-28T17:28:17 +06:00",
-        "fields": {
-          "value": 960
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-03-19T23:42:34 +06:00",
-        "fields": {
-          "value": 188
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-02-09T06:22:17 +07:00",
-        "fields": {
-          "value": 940
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-04-24T04:36:05 +06:00",
-        "fields": {
-          "value": 561
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-07-04T15:04:19 +06:00",
-        "fields": {
-          "value": 296
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-09-01T21:23:16 +06:00",
-        "fields": {
-          "value": 127
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-07-20T12:53:25 +06:00",
-        "fields": {
-          "value": 845
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-04-29T11:15:14 +06:00",
-        "fields": {
-          "value": 617
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-06-25T08:37:29 +06:00",
-        "fields": {
-          "value": 500
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-04-22T23:53:56 +06:00",
-        "fields": {
-          "value": 511
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-09-19T13:05:31 +06:00",
-        "fields": {
-          "value": 674
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-02-09T21:22:30 +07:00",
-        "fields": {
-          "value": 937
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-11-11T22:06:12 +07:00",
-        "fields": {
-          "value": 548
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-09-08T03:18:01 +06:00",
-        "fields": {
-          "value": 561
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-05-18T19:22:24 +06:00",
-        "fields": {
-          "value": 322
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-04-01T14:09:00 +06:00",
-        "fields": {
-          "value": 65
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-05-13T11:53:14 +06:00",
-        "fields": {
-          "value": 755
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-08-01T23:19:07 +06:00",
-        "fields": {
-          "value": 224
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-03-31T08:56:01 +06:00",
-        "fields": {
-          "value": 198
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-09-19T22:47:56 +06:00",
-        "fields": {
-          "value": 531
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-07-26T23:15:23 +06:00",
-        "fields": {
-          "value": 618
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-04-10T21:48:44 +06:00",
-        "fields": {
-          "value": 757
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-02-15T14:40:11 +07:00",
-        "fields": {
-          "value": 253
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-02-23T23:23:05 +07:00",
-        "fields": {
-          "value": 892
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-04-08T09:20:19 +06:00",
-        "fields": {
-          "value": 477
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-09-08T22:05:05 +06:00",
-        "fields": {
-          "value": 802
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-01-05T20:38:25 +07:00",
-        "fields": {
-          "value": 166
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-11-07T06:59:34 +07:00",
-        "fields": {
-          "value": 18
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-06-05T02:10:00 +06:00",
-        "fields": {
-          "value": 343
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-07-20T10:37:37 +06:00",
-        "fields": {
-          "value": 32
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-07-28T16:08:57 +06:00",
-        "fields": {
-          "value": 226
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-05-05T20:21:36 +06:00",
-        "fields": {
-          "value": 34
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-09-24T09:03:46 +06:00",
-        "fields": {
-          "value": 57
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-11-22T04:49:50 +07:00",
-        "fields": {
-          "value": 475
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-02-22T18:14:24 +07:00",
-        "fields": {
-          "value": 849
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-11-08T23:18:49 +07:00",
-        "fields": {
-          "value": 51
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-09-08T15:36:52 +06:00",
-        "fields": {
-          "value": 965
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-11-29T23:35:47 +07:00",
-        "fields": {
-          "value": 987
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-05-03T03:03:25 +06:00",
-        "fields": {
-          "value": 416
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-01-27T11:54:14 +07:00",
-        "fields": {
-          "value": 103
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-04-13T19:12:34 +06:00",
-        "fields": {
-          "value": 564
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-08-24T15:53:54 +06:00",
-        "fields": {
-          "value": 921
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-10-18T08:45:44 +06:00",
-        "fields": {
-          "value": 578
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-09-01T08:01:32 +06:00",
-        "fields": {
-          "value": 589
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-04-18T22:56:35 +06:00",
-        "fields": {
-          "value": 732
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-09-06T03:57:30 +06:00",
-        "fields": {
-          "value": 146
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-03-25T20:29:33 +06:00",
-        "fields": {
-          "value": 274
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-03-07T08:27:57 +07:00",
-        "fields": {
-          "value": 397
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-05-08T18:49:48 +06:00",
-        "fields": {
-          "value": 104
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-07-07T22:05:14 +06:00",
-        "fields": {
-          "value": 337
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-05-12T15:15:15 +06:00",
-        "fields": {
-          "value": 870
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-09-14T11:48:37 +06:00",
-        "fields": {
-          "value": 337
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-11-09T03:10:55 +07:00",
-        "fields": {
-          "value": 32
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-07-14T04:04:43 +06:00",
-        "fields": {
-          "value": 682
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-05-15T21:29:51 +06:00",
-        "fields": {
-          "value": 507
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-11-10T17:13:52 +07:00",
-        "fields": {
-          "value": 776
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-04-28T18:25:12 +06:00",
-        "fields": {
-          "value": 760
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-09-24T03:03:39 +06:00",
-        "fields": {
-          "value": 712
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-05-24T08:13:05 +06:00",
-        "fields": {
-          "value": 716
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-06-09T10:50:58 +06:00",
-        "fields": {
-          "value": 858
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-04-30T18:49:20 +06:00",
-        "fields": {
-          "value": 322
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-07-24T01:23:55 +06:00",
-        "fields": {
-          "value": 437
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-02-15T09:59:17 +07:00",
-        "fields": {
-          "value": 419
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-01-09T17:20:48 +07:00",
-        "fields": {
-          "value": 292
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-01-07T17:35:15 +07:00",
-        "fields": {
-          "value": 618
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-09-01T01:24:35 +06:00",
-        "fields": {
-          "value": 155
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-06-22T07:55:05 +06:00",
-        "fields": {
-          "value": 476
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-01-07T07:05:49 +07:00",
-        "fields": {
-          "value": 101
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-11-05T02:47:05 +07:00",
-        "fields": {
-          "value": 338
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-09-25T20:07:58 +06:00",
-        "fields": {
-          "value": 65
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-05-19T00:18:22 +06:00",
-        "fields": {
-          "value": 657
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-08-31T13:26:25 +06:00",
-        "fields": {
-          "value": 799
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-01-02T05:41:14 +07:00",
-        "fields": {
-          "value": 29
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-01-05T08:37:26 +07:00",
-        "fields": {
-          "value": 137
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-03-23T07:03:47 +06:00",
-        "fields": {
-          "value": 567
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-10-18T12:20:14 +06:00",
-        "fields": {
-          "value": 428
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-01-03T22:45:13 +07:00",
-        "fields": {
-          "value": 397
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-04-03T14:36:47 +06:00",
-        "fields": {
-          "value": 625
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-10-09T08:11:26 +06:00",
-        "fields": {
-          "value": 506
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-11-11T18:07:07 +07:00",
-        "fields": {
-          "value": 307
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-01-28T02:04:08 +07:00",
-        "fields": {
-          "value": 313
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-08-13T10:30:36 +06:00",
-        "fields": {
-          "value": 750
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-11-17T01:41:32 +07:00",
-        "fields": {
-          "value": 806
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-06-12T17:24:12 +06:00",
-        "fields": {
-          "value": 875
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-03-07T07:56:21 +07:00",
-        "fields": {
-          "value": 651
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-03-07T02:06:18 +07:00",
-        "fields": {
-          "value": 505
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-08-14T09:02:39 +06:00",
-        "fields": {
-          "value": 736
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-10-17T02:43:26 +06:00",
-        "fields": {
-          "value": 74
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-09-12T23:10:28 +06:00",
-        "fields": {
-          "value": 220
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-05-04T14:51:54 +06:00",
-        "fields": {
-          "value": 479
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-10-12T01:57:14 +06:00",
-        "fields": {
-          "value": 742
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-06-05T13:27:13 +06:00",
-        "fields": {
-          "value": 9
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-04-30T20:11:01 +06:00",
-        "fields": {
-          "value": 888
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-10-19T03:37:35 +06:00",
-        "fields": {
-          "value": 830
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-12-21T22:38:24 +07:00",
-        "fields": {
-          "value": 962
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-05-04T13:00:05 +06:00",
-        "fields": {
-          "value": 985
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-01-30T04:39:30 +07:00",
-        "fields": {
-          "value": 106
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-02-07T22:32:07 +07:00",
-        "fields": {
-          "value": 490
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-05-21T16:49:08 +06:00",
-        "fields": {
-          "value": 252
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-11-29T06:53:03 +07:00",
-        "fields": {
-          "value": 953
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-11-26T12:31:15 +07:00",
-        "fields": {
-          "value": 970
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-04-12T21:33:41 +06:00",
-        "fields": {
-          "value": 494
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-05-24T16:35:59 +06:00",
-        "fields": {
-          "value": 75
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-02-09T22:23:59 +07:00",
-        "fields": {
-          "value": 41
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-10-01T14:58:17 +06:00",
-        "fields": {
-          "value": 606
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-08-20T08:50:39 +06:00",
-        "fields": {
-          "value": 583
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-12-17T03:16:23 +07:00",
-        "fields": {
-          "value": 279
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-01-01T22:20:33 +07:00",
-        "fields": {
-          "value": 817
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-08-14T21:24:42 +06:00",
-        "fields": {
-          "value": 88
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-06-11T16:58:13 +06:00",
-        "fields": {
-          "value": 320
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-06-07T17:08:41 +06:00",
-        "fields": {
-          "value": 655
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-03-04T21:58:54 +07:00",
-        "fields": {
-          "value": 833
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-06-07T08:58:37 +06:00",
-        "fields": {
-          "value": 102
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-02-12T07:57:12 +07:00",
-        "fields": {
-          "value": 631
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-07-14T23:51:37 +06:00",
-        "fields": {
-          "value": 182
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-02-18T14:02:52 +07:00",
-        "fields": {
-          "value": 743
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-03-10T03:48:30 +06:00",
-        "fields": {
-          "value": 702
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-12-13T07:53:22 +07:00",
-        "fields": {
-          "value": 879
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-11-14T12:15:36 +07:00",
-        "fields": {
-          "value": 861
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-10-09T00:56:37 +06:00",
-        "fields": {
-          "value": 226
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-01-15T13:55:17 +07:00",
-        "fields": {
-          "value": 111
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-08-12T22:17:02 +06:00",
-        "fields": {
-          "value": 153
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-02-03T13:26:24 +07:00",
-        "fields": {
-          "value": 6
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-05-02T12:14:47 +06:00",
-        "fields": {
-          "value": 7
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-10-15T10:48:55 +06:00",
-        "fields": {
-          "value": 478
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-08-24T08:18:53 +06:00",
-        "fields": {
-          "value": 103
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-10-15T08:52:04 +06:00",
-        "fields": {
-          "value": 806
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-09-30T03:30:08 +06:00",
-        "fields": {
-          "value": 718
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-12-17T12:49:04 +07:00",
-        "fields": {
-          "value": 809
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-04-06T06:04:48 +06:00",
-        "fields": {
-          "value": 867
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-06-08T15:58:12 +06:00",
-        "fields": {
-          "value": 913
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-05-23T18:50:45 +06:00",
-        "fields": {
-          "value": 157
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-02-01T14:11:34 +07:00",
-        "fields": {
-          "value": 461
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-12-28T21:07:01 +07:00",
-        "fields": {
-          "value": 338
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-04-22T15:23:59 +06:00",
-        "fields": {
-          "value": 323
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-03-01T07:50:53 +07:00",
-        "fields": {
-          "value": 955
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-11-02T21:10:53 +07:00",
-        "fields": {
-          "value": 113
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-03-21T19:54:08 +06:00",
-        "fields": {
-          "value": 911
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-12-15T03:49:13 +07:00",
-        "fields": {
-          "value": 179
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-03-20T17:30:31 +06:00",
-        "fields": {
-          "value": 874
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-09-02T03:45:35 +06:00",
-        "fields": {
-          "value": 6
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-12-26T01:53:02 +07:00",
-        "fields": {
-          "value": 687
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-07-25T13:10:35 +06:00",
-        "fields": {
-          "value": 86
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-10-17T20:14:21 +06:00",
-        "fields": {
-          "value": 358
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-04-14T02:19:21 +06:00",
-        "fields": {
-          "value": 254
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-06-13T15:04:57 +06:00",
-        "fields": {
-          "value": 757
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-04-17T10:25:08 +06:00",
-        "fields": {
-          "value": 605
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-09-22T13:04:40 +06:00",
-        "fields": {
-          "value": 972
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-06-23T19:55:55 +06:00",
-        "fields": {
-          "value": 699
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-10-04T07:31:57 +06:00",
-        "fields": {
-          "value": 265
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-12-03T23:22:37 +07:00",
-        "fields": {
-          "value": 524
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-06-24T09:37:00 +06:00",
-        "fields": {
-          "value": 641
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-10-23T04:09:59 +06:00",
-        "fields": {
-          "value": 116
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-04-09T05:26:38 +06:00",
-        "fields": {
-          "value": 49
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-10-03T00:08:49 +06:00",
-        "fields": {
-          "value": 834
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-09-19T09:15:49 +06:00",
-        "fields": {
-          "value": 366
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-11-23T17:53:29 +07:00",
-        "fields": {
-          "value": 907
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-01-06T15:15:42 +07:00",
-        "fields": {
-          "value": 731
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-02-25T04:54:15 +07:00",
-        "fields": {
-          "value": 658
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-02-20T23:24:42 +07:00",
-        "fields": {
-          "value": 812
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-02-20T06:32:33 +07:00",
-        "fields": {
-          "value": 292
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-05-06T17:27:49 +06:00",
-        "fields": {
-          "value": 462
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-06-08T06:26:41 +06:00",
-        "fields": {
-          "value": 309
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-01-12T23:08:29 +07:00",
-        "fields": {
-          "value": 630
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-03-28T03:03:11 +06:00",
-        "fields": {
-          "value": 954
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-12-01T23:16:23 +07:00",
-        "fields": {
-          "value": 624
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-01-10T14:27:24 +07:00",
-        "fields": {
-          "value": 483
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-11-04T04:34:26 +07:00",
-        "fields": {
-          "value": 235
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-03-10T00:11:47 +07:00",
-        "fields": {
-          "value": 227
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-12-09T12:02:26 +07:00",
-        "fields": {
-          "value": 141
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-07-11T01:38:13 +06:00",
-        "fields": {
-          "value": 567
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-01-28T23:11:52 +07:00",
-        "fields": {
-          "value": 518
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-02-27T08:51:08 +07:00",
-        "fields": {
-          "value": 730
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-02-18T04:38:02 +07:00",
-        "fields": {
-          "value": 206
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-03-14T15:14:56 +06:00",
-        "fields": {
-          "value": 189
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-02-21T23:54:54 +07:00",
-        "fields": {
-          "value": 765
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-05-31T04:38:02 +06:00",
-        "fields": {
-          "value": 785
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-04-19T16:31:29 +06:00",
-        "fields": {
-          "value": 248
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-10-31T13:30:05 +06:00",
-        "fields": {
-          "value": 685
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-11-13T15:17:48 +07:00",
-        "fields": {
-          "value": 398
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-04-06T02:59:41 +06:00",
-        "fields": {
-          "value": 256
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-12-04T16:53:46 +07:00",
-        "fields": {
-          "value": 984
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-04-23T18:47:57 +06:00",
-        "fields": {
-          "value": 630
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-10-19T13:05:32 +06:00",
-        "fields": {
-          "value": 252
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-08-21T18:41:49 +06:00",
-        "fields": {
-          "value": 611
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-10-09T08:01:01 +06:00",
-        "fields": {
-          "value": 777
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-07-22T15:52:43 +06:00",
-        "fields": {
-          "value": 162
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-08-24T01:20:36 +06:00",
-        "fields": {
-          "value": 121
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-06-13T12:23:29 +06:00",
-        "fields": {
-          "value": 397
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-03-30T21:55:49 +06:00",
-        "fields": {
-          "value": 241
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-03-06T13:29:34 +07:00",
-        "fields": {
-          "value": 402
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-03-10T21:44:07 +07:00",
-        "fields": {
-          "value": 858
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-09-19T10:42:14 +06:00",
-        "fields": {
-          "value": 896
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-04-30T20:23:36 +06:00",
-        "fields": {
-          "value": 582
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-09-17T14:55:00 +06:00",
-        "fields": {
-          "value": 302
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-04-03T04:41:34 +06:00",
-        "fields": {
-          "value": 932
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-02-24T20:04:04 +07:00",
-        "fields": {
-          "value": 119
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-01-15T23:45:05 +07:00",
-        "fields": {
-          "value": 749
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-03-04T03:28:21 +07:00",
-        "fields": {
-          "value": 784
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-02-03T11:18:33 +07:00",
-        "fields": {
-          "value": 31
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-10-25T02:12:17 +06:00",
-        "fields": {
-          "value": 614
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-11-27T06:06:52 +07:00",
-        "fields": {
-          "value": 64
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-08-25T08:53:24 +06:00",
-        "fields": {
-          "value": 70
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-12-05T21:14:28 +07:00",
-        "fields": {
-          "value": 412
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-08-19T07:11:34 +06:00",
-        "fields": {
-          "value": 373
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-11-11T20:35:07 +07:00",
-        "fields": {
-          "value": 869
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-03-14T01:22:21 +06:00",
-        "fields": {
-          "value": 593
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-10-23T00:37:30 +06:00",
-        "fields": {
-          "value": 431
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-10-02T17:58:22 +06:00",
-        "fields": {
-          "value": 669
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-10-24T19:06:48 +06:00",
-        "fields": {
-          "value": 170
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-03-03T23:20:24 +07:00",
-        "fields": {
-          "value": 53
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-05-13T15:12:56 +06:00",
-        "fields": {
-          "value": 974
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-11-10T19:27:05 +07:00",
-        "fields": {
-          "value": 53
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-02-21T12:20:09 +07:00",
-        "fields": {
-          "value": 5
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-06-17T01:50:43 +06:00",
-        "fields": {
-          "value": 253
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-06-14T14:30:27 +06:00",
-        "fields": {
-          "value": 40
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-02-24T09:12:23 +07:00",
-        "fields": {
-          "value": 776
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-02-06T16:05:04 +07:00",
-        "fields": {
-          "value": 47
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-06-30T04:31:46 +06:00",
-        "fields": {
-          "value": 133
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-02-03T06:21:47 +07:00",
-        "fields": {
-          "value": 300
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-04-14T18:55:09 +06:00",
-        "fields": {
-          "value": 351
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-10-16T02:38:20 +06:00",
-        "fields": {
-          "value": 61
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-11-16T04:48:09 +07:00",
-        "fields": {
-          "value": 932
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-06-20T07:21:10 +06:00",
-        "fields": {
-          "value": 426
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-01-10T19:02:17 +07:00",
-        "fields": {
-          "value": 450
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-05-16T00:12:20 +06:00",
-        "fields": {
-          "value": 766
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-02-27T06:03:48 +07:00",
-        "fields": {
-          "value": 750
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-04-10T03:20:01 +06:00",
-        "fields": {
-          "value": 982
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-08-13T02:47:11 +06:00",
-        "fields": {
-          "value": 414
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-12-28T16:06:53 +07:00",
-        "fields": {
-          "value": 129
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-12-10T08:24:48 +07:00",
-        "fields": {
-          "value": 349
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-02-08T14:59:01 +07:00",
-        "fields": {
-          "value": 864
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-12-22T23:07:08 +07:00",
-        "fields": {
-          "value": 329
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-08-26T18:28:57 +06:00",
-        "fields": {
-          "value": 544
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-07-10T07:40:54 +06:00",
-        "fields": {
-          "value": 41
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-02-29T01:29:22 +07:00",
-        "fields": {
-          "value": 975
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-02-06T17:06:13 +07:00",
-        "fields": {
-          "value": 95
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-08-02T10:54:35 +06:00",
-        "fields": {
-          "value": 959
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-05-30T03:31:31 +06:00",
-        "fields": {
-          "value": 582
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-01-31T18:45:32 +07:00",
-        "fields": {
-          "value": 417
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-03-05T15:37:55 +07:00",
-        "fields": {
-          "value": 691
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-03-20T22:59:01 +06:00",
-        "fields": {
-          "value": 660
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-07-18T14:12:20 +06:00",
-        "fields": {
-          "value": 427
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2015-12-24T23:05:17 +07:00",
-        "fields": {
-          "value": 573
-        }
-      }
-    ]
-  },
-  {
-    "database": "foo",
-    "retentionPolicy": "bar",
-    "points": [
-      {
-        "name": "cpu",
-        "tags": {
-          "host": "server01"
-        },
-        "time": "2016-02-12T14:42:19 +07:00",
-        "fields": {
-          "value": 11
-        }
-      }
-    ]
-  }
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/tests/tmux/seed.sh b/Godeps/_workspace/src/github.com/influxdb/influxdb/tests/tmux/seed.sh
deleted file mode 100644
index b624a0616..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/tests/tmux/seed.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-echo "creating database"
-curl -G http://localhost:8086/query --data-urlencode "q=CREATE DATABASE foo"
-
-echo "creating retention policy"
-curl -G http://localhost:8086/query --data-urlencode "q=CREATE RETENTION POLICY bar ON foo DURATION 1h REPLICATION 3 DEFAULT"
-
-echo "inserting data"
-curl -d '{"database" : "foo", "retentionPolicy" : "bar", "points": [{"name": "cpu", "tags": {"host": "server01"},"time": "2015-01-26T22:01:11.703Z","fields": {"value": 100}}]}' -H "Content-Type: application/json" http://localhost:8086/write
-curl -d '{"database" : "foo", "retentionPolicy" : "bar", "points": [{"name": "cpu", "tags": {"host": "server01"},"time": "2015-01-27T22:01:11.703Z","fields": {"value": 100}}]}' -H "Content-Type: application/json" http://localhost:8086/write
-curl -d '{"database" : "foo", "retentionPolicy" : "bar", "points": [{"name": "cpu", "tags": {"host": "server01"},"time": "2015-01-28T22:01:11.703Z","fields": {"value": 100}}]}' -H "Content-Type: application/json" http://localhost:8086/write
-
-echo "querying data"
-curl -G http://localhost:8086/query --data-urlencode "db=foo" --data-urlencode "q=SELECT sum(value) FROM \"foo\".\"bar\".cpu GROUP BY time(1h)"
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/tests/tmux/server_8086.toml b/Godeps/_workspace/src/github.com/influxdb/influxdb/tests/tmux/server_8086.toml
deleted file mode 100644
index 6d1b6cde8..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/tests/tmux/server_8086.toml
+++ /dev/null
@@ -1,7 +0,0 @@
-[broker]
-dir  = "/tmp/influxdb/8086/broker"
-port = 8086
-
-[data]
-dir  = "/tmp/influxdb/8086/data"
-port = 8086
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/tests/tmux/server_8087.toml b/Godeps/_workspace/src/github.com/influxdb/influxdb/tests/tmux/server_8087.toml
deleted file mode 100644
index 930921718..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/tests/tmux/server_8087.toml
+++ /dev/null
@@ -1,7 +0,0 @@
-[broker]
-dir  = "/tmp/influxdb/8087/broker"
-port = 8087
-
-[data]
-dir  = "/tmp/influxdb/8087/data"
-port = 8087
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/tests/tmux/server_8088.toml b/Godeps/_workspace/src/github.com/influxdb/influxdb/tests/tmux/server_8088.toml
deleted file mode 100644
index 223c7654f..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/tests/tmux/server_8088.toml
+++ /dev/null
@@ -1,7 +0,0 @@
-[broker]
-dir  = "/tmp/influxdb/8088/broker"
-port = 8088
-
-[data]
-dir  = "/tmp/influxdb/8088/data"
-port = 8088
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/tests/urlgen/urlgen.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/tests/urlgen/urlgen.go
deleted file mode 100644
index 730878a51..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/tests/urlgen/urlgen.go
+++ /dev/null
@@ -1,58 +0,0 @@
-package main
-
-import (
-	"encoding/json"
-	"flag"
-	"fmt"
-	"time"
-)
-
-func main() {
-	var (
-		intervalN = flag.Int("interval", 10, "interval")
-		seriesN   = flag.Int("series", 1, "Number of unique series to generate.")
-		clientN   = flag.Int("clients", 10, "Number of clients to simulate.")
-		host      = flag.String("host", "localhost:8086", "Target host")
-	)
-	flag.Parse()
-
-	// Calculate time so that the last point ends now.
-	n := (*clientN) * (*seriesN) * (*intervalN)
-	t := time.Now().UTC().Add(-time.Duration(n) * time.Second)
-
-	for i := 0; i < *clientN; i++ {
-		for j := 0; j < *seriesN; j++ {
-			points := make([]*Point, 0)
-			for k := 0; k < *intervalN; k++ {
-				t = t.Add(1 * time.Second)
-				points = append(points, &Point{
-					Measurement: "cpu",
-					Time:        t,
-					Tags:        map[string]string{"host": fmt.Sprintf("server%d", j+1)},
-					Fields:      map[string]interface{}{"value": 100},
-				})
-			}
-			batch := &Batch{
-				Database:        "db",
-				RetentionPolicy: "raw",
-				Points:          points,
-			}
-			buf, _ := json.Marshal(batch)
-
-			fmt.Printf("http://%s/write POST %s\n", *host, buf)
-		}
-	}
-}
-
-type Batch struct {
-	Database        string   `json:"database"`
-	RetentionPolicy string   `json:"retentionPolicy"`
-	Points          []*Point `json:"points"`
-}
-
-type Point struct {
-	Measurement string                 `json:"measurement"`
-	Time        time.Time              `json:"time"`
-	Tags        map[string]string      `json:"tags"`
-	Fields      map[string]interface{} `json:"fields"`
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/toml/toml.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/toml/toml.go
deleted file mode 100644
index 105c908c7..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/toml/toml.go
+++ /dev/null
@@ -1,72 +0,0 @@
-package toml
-
-import (
-	"fmt"
-	"strconv"
-	"time"
-)
-
-// maxInt is the largest integer representable by a word (architecture dependent).
-const maxInt = int64(^uint(0) >> 1)
-
-// Duration is a TOML wrapper type for time.Duration.
-type Duration time.Duration
-
-func (d Duration) String() string {
-	return time.Duration(d).String()
-}
-
-// UnmarshalText parses a TOML value into a duration value.
-func (d *Duration) UnmarshalText(text []byte) error {
-	// Ignore if there is no value set.
-	if len(text) == 0 {
-		return nil
-	}
-
-	// Otherwise parse as a duration formatted string.
-	duration, err := time.ParseDuration(string(text))
-	if err != nil {
-		return err
-	}
-
-	// Set duration and return.
-	*d = Duration(duration)
-	return nil
-}
-
-// MarshalText converts a duration to a string for decoding toml
-func (d Duration) MarshalText() (text []byte, err error) {
-	return []byte(d.String()), nil
-}
-
-// Size represents a TOML parseable file size.
-// Users can specify size using "m" for megabytes and "g" for gigabytes.
-type Size int
-
-// UnmarshalText parses a byte size from text.
-func (s *Size) UnmarshalText(text []byte) error {
-	// Parse numeric portion of value.
-	length := len(string(text))
-	size, err := strconv.ParseInt(string(text[:length-1]), 10, 64)
-	if err != nil {
-		return err
-	}
-
-	// Parse unit of measure ("m", "g", etc).
-	switch suffix := text[len(text)-1]; suffix {
-	case 'm':
-		size *= 1 << 20 // MB
-	case 'g':
-		size *= 1 << 30 // GB
-	default:
-		return fmt.Errorf("unknown size suffix: %c", suffix)
-	}
-
-	// Check for overflow.
-	if size > maxInt {
-		return fmt.Errorf("size %d cannot be represented by an int", size)
-	}
-
-	*s = Size(size)
-	return nil
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/toml/toml_test.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/toml/toml_test.go
deleted file mode 100644
index dcf56b1ce..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/toml/toml_test.go
+++ /dev/null
@@ -1,45 +0,0 @@
-package toml_test
-
-import (
-	"bytes"
-	"strings"
-	"testing"
-	"time"
-
-	"github.com/BurntSushi/toml"
-	"github.com/influxdb/influxdb/cmd/influxd/run"
-	itoml "github.com/influxdb/influxdb/toml"
-)
-
-// Ensure that megabyte sizes can be parsed.
-func TestSize_UnmarshalText_MB(t *testing.T) {
-	var s itoml.Size
-	if err := s.UnmarshalText([]byte("200m")); err != nil {
-		t.Fatalf("unexpected error: %s", err)
-	} else if s != 200*(1<<20) {
-		t.Fatalf("unexpected size: %d", s)
-	}
-}
-
-// Ensure that gigabyte sizes can be parsed.
-func TestSize_UnmarshalText_GB(t *testing.T) {
-	var s itoml.Size
-	if err := s.UnmarshalText([]byte("1g")); err != nil {
-		t.Fatalf("unexpected error: %s", err)
-	} else if s != 1073741824 {
-		t.Fatalf("unexpected size: %d", s)
-	}
-}
-
-func TestConfig_Encode(t *testing.T) {
-	var c run.Config
-	c.Cluster.WriteTimeout = itoml.Duration(time.Minute)
-	buf := new(bytes.Buffer)
-	if err := toml.NewEncoder(buf).Encode(&c); err != nil {
-		t.Fatal("Failed to encode: ", err)
-	}
-	got, search := buf.String(), `write-timeout = "1m0s"`
-	if !strings.Contains(got, search) {
-		t.Fatalf("Encoding config failed.\nfailed to find %s in:\n%s\n", search, got)
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/README.md b/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/README.md
deleted file mode 100644
index 73b3a390d..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/README.md
+++ /dev/null
@@ -1,91 +0,0 @@
-# Line Protocol
-
-The line protocol is a text based format for writing points to InfluxDB.  Each line defines a single point. 
-Multiple lines must be separated by the newline character `\n`. The format of the line consists of three parts:
-
-```
-[key] [fields] [timestamp]
-```
-
-Each section is separated by spaces.  The minimum required point consists of a measurement name and at least one field. Points without a specified timestamp will be written using the server's local timestamp. Timestamps are assumed to be in nanoseconds unless a `precision` value is passed in the query string.
-
-## Key
-
-The key is the measurement name and any optional tags separated by commas.  Measurement names, tag keys, and tag values must escape any spaces or commas using a backslash (`\`). For example: `\ ` and `\,`.  All tag values are stored as strings and should not be surrounded in quotes. 
-
-Tags should be sorted by key before being sent for best performance. The sort should match that from the Go `bytes.Compare` function (http://golang.org/pkg/bytes/#Compare).
-
-### Examples
-
-```
-# measurement only
-cpu
-
-# measurment and tags
-cpu,host=serverA,region=us-west
-
-# measurment with commas
-cpu\,01,host=serverA,region=us-west
-
-# tag value with spaces
-cpu,host=server\ A,region=us\ west
-```
-
-## Fields
-
-Fields are key-value metrics associated with the measurement.  Every line must have at least one field.  Multiple fields must be separated with commas and not spaces.
-
-Field keys are always strings and follow the same syntactical rules as described above for tag keys and values. Field values can be one of four types.  The first value written for a given field on a given measurement defines the type of that field for all series under that measurement.
-
-* _integer_ - Numeric values that do not include a decimal and are followed by a trailing i when inserted (e.g. 1i, 345i, 2015i, -10i). Note that all values must have a trailing i. If they do not they will be written as floats.
-* _float_ - Numeric values tha are not followed by a trailing i. (e.g. 1, 1.0, -3.14, 6.0+e5, 10).
-* _boolean_ - A value indicating true or false.  Valid boolean strings are (t, T, true, TRUE, f, F, false, and FALSE).
-* _string_ - A text value.  All string values _must_ be surrounded in double-quotes `"`.  If the string contains
-a double-quote or backslashes, it must be escaped with a backslash, e.g. `\"`, `\\`.
-
-
-```
-# integer value
-cpu value=1i
-
-cpu value=1.1i # will result in a parse error
-
-# float value
-cpu_load value=1
-
-cpu_load value=1.0
-
-cpu_load value=1.2
-
-# boolean value
-error fatal=true
-
-# string value
-event msg="logged out"
-
-# multiple values
-cpu load=10,alert=true,reason="value above maximum threshold"
-```
-
-## Timestamp
-
-The timestamp section is optional but should be specified if possible.  The value is an integer representing nanoseconds since the epoch. If the timestamp is not provided the point will inherit the server's local timestamp.
-
-Some write APIs allow passing a lower precision.  If the API supports a lower precision, the timestamp may also be
-an integer epoch in microseconds, milliseconds, seconds, minutes or hours.
-
-## Full Example
-A full example is shown below.
-```
-cpu,host=server01,region=uswest value=1 1434055562000000000
-cpu,host=server02,region=uswest value=3 1434055562000010000
-```
-In this example the first line shows a `measurement` of "cpu", there are two tags "host" and "region, the `value` is 1.0, and the `timestamp` is 1434055562000000000. Following this is a second line, also a point in the `measurement` "cpu" but belonging to a different "host".
-```
-cpu,host=server\ 01,region=uswest value=1,msg="all systems nominal"
-cpu,host=server\ 01,region=us\,west value_int=1i
-```
-In these examples, the "host" is set to `server 01`. The field value associated with field key `msg` is double-quoted, as it is a string. The second example shows a region of `us,west` with the comma properly escaped. In the first example `value` is written as a floating point number. In the second, `value_int` is an integer. 
-
-# Distributed Queries
-
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/aggregate.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/aggregate.go
deleted file mode 100644
index 2f58685b4..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/aggregate.go
+++ /dev/null
@@ -1,892 +0,0 @@
-package tsdb
-
-import (
-	"errors"
-	"fmt"
-	"sort"
-	"strings"
-	"time"
-
-	"github.com/influxdb/influxdb/influxql"
-	"github.com/influxdb/influxdb/models"
-	"github.com/influxdb/influxdb/pkg/slices"
-)
-
-// AggregateExecutor represents a mapper for execute aggregate SELECT statements.
-type AggregateExecutor struct {
-	stmt    *influxql.SelectStatement
-	mappers []*StatefulMapper
-}
-
-// NewAggregateExecutor returns a new AggregateExecutor.
-func NewAggregateExecutor(stmt *influxql.SelectStatement, mappers []Mapper) *AggregateExecutor {
-	e := &AggregateExecutor{
-		stmt:    stmt,
-		mappers: make([]*StatefulMapper, 0, len(mappers)),
-	}
-
-	for _, m := range mappers {
-		e.mappers = append(e.mappers, &StatefulMapper{m, nil, false})
-	}
-
-	return e
-}
-
-// close closes the executor such that all resources are released.
-// Once closed, an executor may not be re-used.
-func (e *AggregateExecutor) close() {
-	if e != nil {
-		for _, m := range e.mappers {
-			m.Close()
-		}
-	}
-}
-
-// Execute begins execution of the query and returns a channel to receive rows.
-func (e *AggregateExecutor) Execute() <-chan *models.Row {
-	out := make(chan *models.Row, 0)
-	go e.execute(out)
-	return out
-}
-
-func (e *AggregateExecutor) execute(out chan *models.Row) {
-	// It's important to close all resources when execution completes.
-	defer e.close()
-
-	// Create the functions which will reduce values from mappers for
-	// a given interval. The function offsets within this slice match
-	// the offsets within the value slices that are returned by the
-	// mapper.
-	reduceFuncs, err := e.initReduceFuncs()
-	if err != nil {
-		out <- &models.Row{Err: err}
-		return
-	}
-
-	// Put together the rows to return, starting with columns.
-	columnNames := e.stmt.ColumnNames()
-
-	// Open the mappers.
-	if err := e.openMappers(); err != nil {
-		out <- &models.Row{Err: err}
-		return
-	}
-
-	// Filter out empty sets if there are multiple tag sets.
-	hasMultipleTagSets := e.hasMultipleTagSets()
-	ascending := e.ascending()
-
-	// Prime each mapper's chunk buffer.
-	if err := e.initMappers(); err != nil {
-		out <- &models.Row{Err: err}
-		return
-	}
-
-	// Keep looping until all mappers drained.
-	for !e.mappersDrained() {
-		chunks, err := e.readNextTagset()
-		if err != nil {
-			out <- &models.Row{Err: err}
-			return
-		}
-
-		// Prep a row, ready for kicking out.
-		row := &models.Row{
-			Name:    chunks[0].Name,
-			Tags:    chunks[0].Tags,
-			Columns: columnNames,
-		}
-
-		// Prep for bucketing data by start time of the interval.
-		buckets := map[int64][][]interface{}{}
-
-		var chunkValues []*MapperValue
-		for _, chunk := range chunks {
-			for _, chunkValue := range chunk.Values {
-				chunkValues = append(chunkValues, chunkValue)
-			}
-		}
-		sort.Sort(MapperValues(chunkValues))
-
-		for _, chunkValue := range chunkValues {
-			startTime := chunkValue.Time
-			values := chunkValue.Value.([]interface{})
-
-			if _, ok := buckets[startTime]; !ok {
-				buckets[startTime] = make([][]interface{}, len(values))
-			}
-			for i, v := range values {
-				buckets[startTime][i] = append(buckets[startTime][i], v)
-			}
-		}
-
-		// Now, after the loop above, within each time bucket is a slice. Within the element of each
-		// slice is another slice of interface{}, ready for passing to the reducer functions.
-
-		// Work each bucket of time, in time ascending order.
-		tMins := make(int64Slice, 0, len(buckets))
-		for k, _ := range buckets {
-			tMins = append(tMins, k)
-		}
-
-		if ascending {
-			sort.Sort(tMins)
-		} else {
-			sort.Sort(sort.Reverse(tMins))
-		}
-
-		values := make([][]interface{}, len(tMins))
-		for i, t := range tMins {
-			values[i] = make([]interface{}, 0, len(columnNames))
-			values[i] = append(values[i], time.Unix(0, t).UTC()) // Time value is always first.
-
-			for j, f := range reduceFuncs {
-				reducedVal := f(buckets[t][j])
-				values[i] = append(values[i], reducedVal)
-			}
-		}
-
-		// Perform aggregate unwraps
-		values, err = e.processFunctions(values, columnNames)
-		if err != nil {
-			out <- &models.Row{Err: err}
-		}
-
-		// Perform any mathematics.
-		values = processForMath(e.stmt.Fields, values)
-
-		// Handle any fill options
-		values = e.processFill(values)
-
-		// process derivatives
-		values = e.processDerivative(values)
-
-		// If we have multiple tag sets we'll want to filter out the empty ones
-		if hasMultipleTagSets && resultsEmpty(values) {
-			continue
-		}
-
-		row.Values = values
-		out <- row
-	}
-
-	close(out)
-}
-
-// initReduceFuncs returns a list of reduce functions for the aggregates in the query.
-func (e *AggregateExecutor) initReduceFuncs() ([]reduceFunc, error) {
-	calls := e.stmt.FunctionCalls()
-	fns := make([]reduceFunc, len(calls))
-	for i, c := range calls {
-		fn, err := initializeReduceFunc(c)
-		if err != nil {
-			return nil, err
-		}
-		fns[i] = fn
-	}
-	return fns, nil
-}
-
-// openMappers opens all the mappers.
-func (e *AggregateExecutor) openMappers() error {
-	for _, m := range e.mappers {
-		if err := m.Open(); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-// initMappers buffers the first chunk of each mapper.
-func (e *AggregateExecutor) initMappers() error {
-	for _, m := range e.mappers {
-		chunk, err := m.NextChunk()
-		if err != nil {
-			return err
-		}
-		m.bufferedChunk = chunk
-
-		if m.bufferedChunk == nil {
-			m.drained = true
-		}
-	}
-	return nil
-}
-
-// hasMultipleTagSets returns true if there is more than one tagset in the mappers.
-func (e *AggregateExecutor) hasMultipleTagSets() bool {
-	set := make(map[string]struct{})
-	for _, m := range e.mappers {
-		for _, t := range m.TagSets() {
-			set[t] = struct{}{}
-			if len(set) > 1 {
-				return true
-			}
-		}
-	}
-	return false
-}
-
-// ascending returns true if statement is sorted in ascending order.
-func (e *AggregateExecutor) ascending() bool {
-	if len(e.stmt.SortFields) == 0 {
-		return true
-	}
-	return e.stmt.SortFields[0].Ascending
-}
-
-// mappersDrained returns whether all the executors Mappers have been drained of data.
-func (e *AggregateExecutor) mappersDrained() bool {
-	for _, m := range e.mappers {
-		if !m.drained {
-			return false
-		}
-	}
-	return true
-}
-
-// nextMapperTagset returns the alphabetically lowest tagset across all Mappers.
-func (e *AggregateExecutor) nextMapperTagSet() string {
-	tagset := ""
-	for _, m := range e.mappers {
-		if m.bufferedChunk != nil {
-			if tagset == "" {
-				tagset = m.bufferedChunk.key()
-			} else if m.bufferedChunk.key() < tagset {
-				tagset = m.bufferedChunk.key()
-			}
-		}
-	}
-	return tagset
-}
-
-// readNextTagset returns all chunks for the next tagset.
-func (e *AggregateExecutor) readNextTagset() ([]*MapperOutput, error) {
-	// Send out data for the next alphabetically-lowest tagset.
-	// All Mappers send out in this order so collect data for this tagset, ignoring all others.
-	tagset := e.nextMapperTagSet()
-	chunks := []*MapperOutput{}
-
-	// Pull as much as possible from each mapper. Stop when a mapper offers
-	// data for a new tagset, or empties completely.
-	for _, m := range e.mappers {
-		if m.drained {
-			continue
-		}
-
-		for {
-			if m.bufferedChunk == nil {
-				chunk, err := m.NextChunk()
-				if err != nil {
-					return nil, err
-				}
-				m.bufferedChunk = chunk
-
-				if m.bufferedChunk == nil {
-					m.drained = true
-					break
-				}
-			}
-
-			// Got a chunk. Can we use it?
-			if m.bufferedChunk.key() != tagset {
-				break // No, so just leave it in the buffer.
-			}
-
-			// We can, take it.
-			chunks = append(chunks, m.bufferedChunk)
-			m.bufferedChunk = nil
-		}
-	}
-
-	return chunks, nil
-}
-
-// processFill will take the results and return new results (or the same if no fill modifications are needed)
-// with whatever fill options the query has.
-func (e *AggregateExecutor) processFill(results [][]interface{}) [][]interface{} {
-	// don't do anything if we're supposed to leave the nulls
-	if e.stmt.Fill == influxql.NullFill {
-		return results
-	}
-
-	if e.stmt.Fill == influxql.NoFill {
-		// remove any rows that have even one nil value. This one is tricky because they could have multiple
-		// aggregates, but this option means that any row that has even one nil gets purged.
-		newResults := make([][]interface{}, 0, len(results))
-		for _, vals := range results {
-			hasNil := false
-			// start at 1 because the first value is always time
-			for j := 1; j < len(vals); j++ {
-				if vals[j] == nil {
-					hasNil = true
-					break
-				}
-			}
-			if !hasNil {
-				newResults = append(newResults, vals)
-			}
-		}
-		return newResults
-	}
-
-	// They're either filling with previous values or a specific number
-	for i, vals := range results {
-		// start at 1 because the first value is always time
-		for j := 1; j < len(vals); j++ {
-			if vals[j] == nil {
-				switch e.stmt.Fill {
-				case influxql.PreviousFill:
-					if i != 0 {
-						vals[j] = results[i-1][j]
-					}
-				case influxql.NumberFill:
-					vals[j] = e.stmt.FillValue
-				}
-			}
-		}
-	}
-	return results
-}
-
-// processDerivative returns the derivatives of the results
-func (e *AggregateExecutor) processDerivative(results [][]interface{}) [][]interface{} {
-	// Return early if we're not supposed to process the derivatives
-	if e.stmt.HasDerivative() {
-		interval, err := derivativeInterval(e.stmt)
-		if err != nil {
-			return results // XXX need to handle this better.
-		}
-
-		// Determines whether to drop negative differences
-		isNonNegative := e.stmt.FunctionCalls()[0].Name == "non_negative_derivative"
-		return ProcessAggregateDerivative(results, isNonNegative, interval)
-	}
-	return results
-}
-
-func (e *AggregateExecutor) processFunctions(results [][]interface{}, columnNames []string) ([][]interface{}, error) {
-	callInPosition := e.stmt.FunctionCallsByPosition()
-	hasTimeField := e.stmt.HasTimeFieldSpecified()
-
-	var err error
-	for i, calls := range callInPosition {
-		// We can only support expanding fields if a single selector call was specified
-		// i.e. select tx, max(rx) from foo
-		// If you have multiple selectors or aggregates, there is no way of knowing who gets to insert the values, so we don't
-		// i.e. select tx, max(rx), min(rx) from foo
-		if len(calls) == 1 {
-			var c *influxql.Call
-			c = calls[0]
-
-			switch c.Name {
-			case "top", "bottom":
-				results, err = e.processAggregates(results, columnNames, c)
-				if err != nil {
-					return results, err
-				}
-			case "first", "last", "min", "max":
-				results, err = e.processSelectors(results, i, hasTimeField, columnNames)
-				if err != nil {
-					return results, err
-				}
-			}
-		}
-	}
-
-	return results, nil
-}
-
-func (e *AggregateExecutor) processSelectors(results [][]interface{}, callPosition int, hasTimeField bool, columnNames []string) ([][]interface{}, error) {
-	// if the columns doesn't have enough columns, expand it
-	for i, columns := range results {
-		if len(columns) != len(columnNames) {
-			columns = append(columns, make([]interface{}, len(columnNames)-len(columns))...)
-		}
-		for j := 1; j < len(columns); j++ {
-			switch v := columns[j].(type) {
-			case PositionPoint:
-				tMin := columns[0].(time.Time)
-				results[i] = e.selectorPointToQueryResult(columns, hasTimeField, callPosition, v, tMin, columnNames)
-			}
-		}
-	}
-	return results, nil
-}
-
-func (e *AggregateExecutor) selectorPointToQueryResult(columns []interface{}, hasTimeField bool, columnIndex int, p PositionPoint, tMin time.Time, columnNames []string) []interface{} {
-	callCount := len(e.stmt.FunctionCalls())
-	if callCount == 1 {
-		tm := time.Unix(0, p.Time).UTC()
-		// If we didn't explicity ask for time, and we have a group by, then use TMIN for the time returned
-		if len(e.stmt.Dimensions) > 0 && !hasTimeField {
-			tm = tMin.UTC()
-		}
-		columns[0] = tm
-	}
-
-	for i, c := range columnNames {
-		// skip over time, we already handled that above
-		if i == 0 {
-			continue
-		}
-		if (i == columnIndex && hasTimeField) || (i == columnIndex+1 && !hasTimeField) {
-			// Check to see if we previously processed this column, if so, continue
-			if _, ok := columns[i].(PositionPoint); !ok && columns[i] != nil {
-				continue
-			}
-			columns[i] = p.Value
-			continue
-		}
-
-		if callCount == 1 {
-			// Always favor fields over tags if there is a name collision
-			if t, ok := p.Fields[c]; ok {
-				columns[i] = t
-			} else if t, ok := p.Tags[c]; ok {
-				// look in the tags for a value
-				columns[i] = t
-			}
-		}
-	}
-	return columns
-}
-
-func (e *AggregateExecutor) processAggregates(results [][]interface{}, columnNames []string, call *influxql.Call) ([][]interface{}, error) {
-	var values [][]interface{}
-
-	// Check if we have a group by, if not, rewrite the entire result by flattening it out
-	for _, vals := range results {
-		// start at 1 because the first value is always time
-		for j := 1; j < len(vals); j++ {
-			switch v := vals[j].(type) {
-			case PositionPoints:
-				tMin := vals[0].(time.Time)
-				for _, p := range v {
-					result := e.aggregatePointToQueryResult(p, tMin, call, columnNames)
-					values = append(values, result)
-				}
-			case nil:
-				continue
-			default:
-				return nil, fmt.Errorf("unrechable code - processAggregates for type %T %v", v, v)
-			}
-		}
-	}
-	return values, nil
-}
-
-func (e *AggregateExecutor) aggregatePointToQueryResult(p PositionPoint, tMin time.Time, call *influxql.Call, columnNames []string) []interface{} {
-	tm := time.Unix(0, p.Time).UTC()
-	// If we didn't explicity ask for time, and we have a group by, then use TMIN for the time returned
-	if len(e.stmt.Dimensions) > 0 && !e.stmt.HasTimeFieldSpecified() {
-		tm = tMin.UTC()
-	}
-	vals := []interface{}{tm}
-	for _, c := range columnNames {
-		if c == call.Name {
-			vals = append(vals, p.Value)
-			continue
-		}
-		// TODO in the future fields will also be available to us.
-		// we should always favor fields over tags if there is a name collision
-
-		// look in the tags for a value
-		if t, ok := p.Tags[c]; ok {
-			vals = append(vals, t)
-		}
-	}
-	return vals
-}
-
-// AggregateMapper runs the map phase for aggregate SELECT queries.
-type AggregateMapper struct {
-	shard      *Shard
-	stmt       *influxql.SelectStatement
-	qmin, qmax int64 // query time range
-
-	tx          Tx
-	cursors     []CursorSet
-	cursorIndex int
-
-	interval     int   // Current interval for which data is being fetched.
-	intervalN    int   // Maximum number of intervals to return.
-	intervalSize int64 // Size of each interval.
-	qminWindow   int64 // Minimum time of the query floored to start of interval.
-
-	mapFuncs   []mapFunc // The mapping functions.
-	fieldNames []string  // the field name being read for mapping.
-
-	selectFields []string
-	selectTags   []string
-	whereFields  []string
-}
-
-// NewAggregateMapper returns a new instance of AggregateMapper.
-func NewAggregateMapper(sh *Shard, stmt *influxql.SelectStatement) *AggregateMapper {
-	return &AggregateMapper{
-		shard: sh,
-		stmt:  stmt,
-	}
-}
-
-// Open opens and initializes the mapper.
-func (m *AggregateMapper) Open() error {
-	// Ignore if node has the shard but hasn't written to it yet.
-	if m.shard == nil {
-		return nil
-	}
-
-	// Rewrite statement.
-	stmt, err := m.shard.index.RewriteSelectStatement(m.stmt)
-	if err != nil {
-		return err
-	}
-	m.stmt = stmt
-
-	// Set all time-related parameters on the mapper.
-	m.qmin, m.qmax = influxql.TimeRangeAsEpochNano(m.stmt.Condition)
-
-	if err := m.initializeMapFunctions(); err != nil {
-		return err
-	}
-
-	// For GROUP BY time queries, limit the number of data points returned by the limit and offset
-	d, err := m.stmt.GroupByInterval()
-	if err != nil {
-		return err
-	}
-
-	m.intervalSize = d.Nanoseconds()
-	if m.qmin == 0 || m.intervalSize == 0 {
-		m.intervalN = 1
-		m.intervalSize = m.qmax - m.qmin
-	} else {
-		intervalTop := m.qmax/m.intervalSize*m.intervalSize + m.intervalSize
-		intervalBottom := m.qmin / m.intervalSize * m.intervalSize
-		m.intervalN = int((intervalTop - intervalBottom) / m.intervalSize)
-	}
-
-	if m.stmt.Limit > 0 || m.stmt.Offset > 0 {
-		// ensure that the offset isn't higher than the number of points we'd get
-		if m.stmt.Offset > m.intervalN {
-			return nil
-		}
-
-		// Take the lesser of either the pre computed number of GROUP BY buckets that
-		// will be in the result or the limit passed in by the user
-		if m.stmt.Limit < m.intervalN {
-			m.intervalN = m.stmt.Limit
-		}
-	}
-
-	// If we are exceeding our MaxGroupByPoints error out
-	if m.intervalN > MaxGroupByPoints {
-		return errors.New("too many points in the group by interval. maybe you forgot to specify a where time clause?")
-	}
-
-	// Ensure that the start time for the results is on the start of the window.
-	m.qminWindow = m.qmin
-	if m.intervalSize > 0 && m.intervalN > 1 {
-		m.qminWindow = m.qminWindow / m.intervalSize * m.intervalSize
-	}
-
-	// Get a read-only transaction.
-	tx, err := m.shard.engine.Begin(false)
-	if err != nil {
-		return err
-	}
-	m.tx = tx
-
-	// Collect measurements.
-	mms := Measurements(m.shard.index.MeasurementsByName(m.stmt.SourceNames()))
-	m.selectFields = mms.SelectFields(m.stmt)
-	m.selectTags = mms.SelectTags(m.stmt)
-	m.whereFields = mms.WhereFields(m.stmt)
-
-	// Open cursors for each measurement.
-	for _, mm := range mms {
-		if err := m.openMeasurement(mm); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (m *AggregateMapper) openMeasurement(mm *Measurement) error {
-	// Validate that ANY GROUP BY is not a field for the measurement.
-	if err := mm.ValidateGroupBy(m.stmt); err != nil {
-		return err
-	}
-
-	// Validate the fields and tags asked for exist and keep track of which are in the select vs the where
-	selectFields := mm.SelectFields(m.stmt)
-	selectTags := mm.SelectTags(m.stmt)
-
-	// If we only have tags in our select clause we just return
-	if len(selectFields) == 0 && len(selectTags) > 0 {
-		return fmt.Errorf("statement must have at least one field in select clause")
-	}
-
-	// Calculate tag sets and apply SLIMIT/SOFFSET.
-	tagSets, err := mm.DimensionTagSets(m.stmt)
-	if err != nil {
-		return err
-	}
-	tagSets = m.stmt.LimitTagSets(tagSets)
-
-	// Create all cursors for reading the data from this shard.
-	for _, t := range tagSets {
-		cursorSet := CursorSet{
-			Measurement: mm.Name,
-			Tags:        t.Tags,
-		}
-		if len(t.Tags) == 0 {
-			cursorSet.Key = mm.Name
-		} else {
-			cursorSet.Key = strings.Join([]string{mm.Name, string(MarshalTags(t.Tags))}, "|")
-		}
-
-		for i, key := range t.SeriesKeys {
-			fields := slices.Union(selectFields, m.fieldNames, false)
-			c := m.tx.Cursor(key, fields, m.shard.FieldCodec(mm.Name), true)
-			if c == nil {
-				continue
-			}
-
-			seriesTags := m.shard.index.TagsForSeries(key)
-			cursorSet.Cursors = append(cursorSet.Cursors, NewTagsCursor(c, t.Filters[i], seriesTags))
-		}
-
-		// tsc.Init(m.qmin)
-		m.cursors = append(m.cursors, cursorSet)
-	}
-
-	sort.Sort(CursorSets(m.cursors))
-
-	return nil
-}
-
-// initializeMapFunctions initialize the mapping functions for the mapper.
-func (m *AggregateMapper) initializeMapFunctions() error {
-	// Set up each mapping function for this statement.
-	aggregates := m.stmt.FunctionCalls()
-	m.mapFuncs = make([]mapFunc, len(aggregates))
-	m.fieldNames = make([]string, len(m.mapFuncs))
-
-	for i, c := range aggregates {
-		mfn, err := initializeMapFunc(c)
-		if err != nil {
-			return err
-		}
-		m.mapFuncs[i] = mfn
-
-		// Check for calls like `derivative(lmean(value), 1d)`
-		var nested *influxql.Call = c
-		if fn, ok := c.Args[0].(*influxql.Call); ok {
-			nested = fn
-		}
-		switch lit := nested.Args[0].(type) {
-		case *influxql.VarRef:
-			m.fieldNames[i] = lit.Val
-		case *influxql.Distinct:
-			if c.Name != "count" {
-				return fmt.Errorf("aggregate call didn't contain a field %s", c.String())
-			}
-			m.fieldNames[i] = lit.Val
-		default:
-			return fmt.Errorf("aggregate call didn't contain a field %s", c.String())
-		}
-	}
-
-	return nil
-}
-
-// Close closes the mapper.
-func (m *AggregateMapper) Close() {
-	if m != nil && m.tx != nil {
-		m.tx.Rollback()
-	}
-	return
-}
-
-// TagSets returns the list of tag sets for which this mapper has data.
-func (m *AggregateMapper) TagSets() []string { return CursorSets(m.cursors).Keys() }
-
-// Fields returns all SELECT fields.
-func (m *AggregateMapper) Fields() []string { return append(m.selectFields, m.selectTags...) }
-
-// NextChunk returns the next interval of data.
-// Tagsets are always processed in the same order as AvailTagsSets().
-// When there is no more data for any tagset nil is returned.
-func (m *AggregateMapper) NextChunk() (interface{}, error) {
-	var tmin, tmax int64
-	for {
-		// All tagset cursors processed. NextChunk'ing complete.
-		if m.cursorIndex == len(m.cursors) {
-			return nil, nil
-		}
-
-		// All intervals complete for this tagset. Move to the next tagset.
-		tmin, tmax = m.nextInterval()
-		if tmin < 0 {
-			m.interval = 0
-			m.cursorIndex++
-			continue
-		}
-		break
-	}
-
-	// Prep the return data for this tagset.
-	// This will hold data for a single interval for a single tagset.
-	cursorSet := m.cursors[m.cursorIndex]
-	output := &MapperOutput{
-		Name:      cursorSet.Measurement,
-		Tags:      cursorSet.Tags,
-		Fields:    m.selectFields,
-		cursorKey: cursorSet.Key,
-	}
-
-	// Always clamp tmin and tmax. This can happen as bucket-times are bucketed to the nearest
-	// interval. This is necessary to grab the "partial" buckets at the beginning and end of the time range
-	qmin, qmax := tmin, tmax
-	if qmin < m.qmin {
-		qmin = m.qmin
-	}
-	if qmax > m.qmax {
-		qmax = m.qmax + 1
-	}
-
-	for _, c := range cursorSet.Cursors {
-		mapperValue := &MapperValue{
-			Time:  tmin,
-			Value: make([]interface{}, len(m.mapFuncs)),
-		}
-
-		for i := range m.mapFuncs {
-			// Build a map input from the cursor.
-			input := &MapInput{
-				TMin:  -1,
-				Items: readMapItems(c, m.fieldNames[i], qmin, qmin, qmax),
-			}
-			if len(m.stmt.Dimensions) > 0 && !m.stmt.HasTimeFieldSpecified() {
-				input.TMin = tmin
-			}
-
-			// Execute the map function which walks the entire interval, and aggregates the result.
-			value := m.mapFuncs[i](input)
-			if value == nil {
-				continue
-			}
-			mapperValue.Value.([]interface{})[i] = value
-		}
-		output.Values = append(output.Values, mapperValue)
-	}
-
-	return output, nil
-}
-
-func readMapItems(c *TagsCursor, field string, seek, tmin, tmax int64) []MapItem {
-	var items []MapItem
-	var seeked bool
-	for {
-		var timestamp int64
-		var value interface{}
-		if !seeked {
-			timestamp, value = c.SeekTo(seek)
-			seeked = true
-		} else {
-			timestamp, value = c.Next()
-		}
-
-		// We're done if the point is outside the query's time range [tmin:tmax).
-		if timestamp != tmin && (timestamp < tmin || timestamp >= tmax) {
-			return items
-		}
-
-		// Convert values to fields map.
-		fields, ok := value.(map[string]interface{})
-		if !ok {
-			fields = map[string]interface{}{"": value}
-		}
-
-		// Value didn't match, look for the next one.
-		if value == nil {
-			continue
-		}
-
-		// Filter value.
-		if c.filter != nil {
-			// Convert value to a map for filter evaluation.
-			m, ok := value.(map[string]interface{})
-			if !ok {
-				m = map[string]interface{}{field: value}
-			}
-
-			// If filter fails then skip to the next value.
-			if !influxql.EvalBool(c.filter, m) {
-				continue
-			}
-		}
-
-		// Filter out single field, if specified.
-		if m, ok := value.(map[string]interface{}); ok {
-			value = m[field]
-		}
-		if value == nil {
-			continue
-		}
-
-		items = append(items, MapItem{
-			Timestamp: timestamp,
-			Value:     value,
-			Fields:    fields,
-			Tags:      c.tags,
-		})
-	}
-}
-
-// nextInterval returns the next interval for which to return data.
-// If start is less than 0 there are no more intervals.
-func (m *AggregateMapper) nextInterval() (start, end int64) {
-	t := m.qminWindow + int64(m.interval+m.stmt.Offset)*m.intervalSize
-
-	// On to next interval.
-	m.interval++
-	if t > m.qmax || m.interval > m.intervalN {
-		start, end = -1, 1
-	} else {
-		start, end = t, t+m.intervalSize
-	}
-	return
-}
-
-type CursorSet struct {
-	Measurement string
-	Tags        map[string]string
-	Key         string
-	Cursors     []*TagsCursor
-}
-
-// CursorSets represents a sortable slice of CursorSet.
-type CursorSets []CursorSet
-
-func (a CursorSets) Len() int           { return len(a) }
-func (a CursorSets) Less(i, j int) bool { return a[i].Key < a[j].Key }
-func (a CursorSets) Swap(i, j int)      { a[i], a[j] = a[j], a[i] }
-
-func (a CursorSets) Keys() []string {
-	keys := make([]string, len(a))
-	for i := range a {
-		keys[i] = a[i].Key
-	}
-	sort.Strings(keys)
-	return keys
-}
-
-type int64Slice []int64
-
-func (a int64Slice) Len() int           { return len(a) }
-func (a int64Slice) Swap(i, j int)      { a[i], a[j] = a[j], a[i] }
-func (a int64Slice) Less(i, j int) bool { return a[i] < a[j] }
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/batcher.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/batcher.go
deleted file mode 100644
index 221100f32..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/batcher.go
+++ /dev/null
@@ -1,147 +0,0 @@
-package tsdb
-
-import (
-	"sync"
-	"sync/atomic"
-	"time"
-
-	"github.com/influxdb/influxdb/models"
-)
-
-// PointBatcher accepts Points and will emit a batch of those points when either
-// a) the batch reaches a certain size, or b) a certain time passes.
-type PointBatcher struct {
-	stats PointBatcherStats
-
-	size     int
-	duration time.Duration
-
-	stop  chan struct{}
-	in    chan models.Point
-	out   chan []models.Point
-	flush chan struct{}
-
-	wg *sync.WaitGroup
-}
-
-// NewPointBatcher returns a new PointBatcher. sz is the batching size,
-// bp is the maximum number of batches that may be pending. d is the time
-// after which a batch will be emitted after the first point is received
-// for the batch, regardless of its size.
-func NewPointBatcher(sz int, bp int, d time.Duration) *PointBatcher {
-	return &PointBatcher{
-		size:     sz,
-		duration: d,
-		stop:     make(chan struct{}),
-		in:       make(chan models.Point, bp*sz),
-		out:      make(chan []models.Point),
-		flush:    make(chan struct{}),
-	}
-}
-
-// PointBatcherStats are the statistics each batcher tracks.
-type PointBatcherStats struct {
-	BatchTotal   uint64 // Total count of batches transmitted.
-	PointTotal   uint64 // Total count of points processed.
-	SizeTotal    uint64 // Number of batches that reached size threshold.
-	TimeoutTotal uint64 // Number of timeouts that occurred.
-}
-
-// Start starts the batching process. Returns the in and out channels for points
-// and point-batches respectively.
-func (b *PointBatcher) Start() {
-	// Already running?
-	if b.wg != nil {
-		return
-	}
-
-	var timer *time.Timer
-	var batch []models.Point
-	var timerCh <-chan time.Time
-
-	emit := func() {
-		b.out <- batch
-		atomic.AddUint64(&b.stats.BatchTotal, 1)
-		batch = nil
-	}
-
-	b.wg = &sync.WaitGroup{}
-	b.wg.Add(1)
-
-	go func() {
-		defer b.wg.Done()
-		for {
-			select {
-			case <-b.stop:
-				if len(batch) > 0 {
-					emit()
-					timerCh = nil
-				}
-				return
-			case p := <-b.in:
-				atomic.AddUint64(&b.stats.PointTotal, 1)
-				if batch == nil {
-					batch = make([]models.Point, 0, b.size)
-					if b.duration > 0 {
-						timer = time.NewTimer(b.duration)
-						timerCh = timer.C
-					}
-				}
-
-				batch = append(batch, p)
-				if len(batch) >= b.size { // 0 means send immediately.
-					atomic.AddUint64(&b.stats.SizeTotal, 1)
-					emit()
-					timerCh = nil
-				}
-
-			case <-b.flush:
-				if len(batch) > 0 {
-					emit()
-					timerCh = nil
-				}
-
-			case <-timerCh:
-				atomic.AddUint64(&b.stats.TimeoutTotal, 1)
-				emit()
-			}
-		}
-	}()
-}
-
-func (b *PointBatcher) Stop() {
-	// If not running, nothing to stop.
-	if b.wg == nil {
-		return
-	}
-
-	close(b.stop)
-	b.wg.Wait()
-}
-
-// In returns the channel to which points should be written.
-func (b *PointBatcher) In() chan<- models.Point {
-	return b.in
-}
-
-// Out returns the channel from which batches should be read.
-func (b *PointBatcher) Out() <-chan []models.Point {
-	return b.out
-}
-
-// Flush instructs the batcher to emit any pending points in a batch, regardless of batch size.
-// If there are no pending points, no batch is emitted.
-func (b *PointBatcher) Flush() {
-	b.flush <- struct{}{}
-}
-
-// Stats returns a PointBatcherStats object for the PointBatcher. While the each statistic should be
-// closely correlated with each other statistic, it is not guaranteed.
-func (b *PointBatcher) Stats() *PointBatcherStats {
-	stats := PointBatcherStats{}
-	stats.BatchTotal = atomic.LoadUint64(&b.stats.BatchTotal)
-	stats.PointTotal = atomic.LoadUint64(&b.stats.PointTotal)
-	stats.SizeTotal = atomic.LoadUint64(&b.stats.SizeTotal)
-	stats.TimeoutTotal = atomic.LoadUint64(&b.stats.TimeoutTotal)
-	return &stats
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/batcher_test.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/batcher_test.go
deleted file mode 100644
index fb245837e..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/batcher_test.go
+++ /dev/null
@@ -1,146 +0,0 @@
-package tsdb_test
-
-import (
-	"testing"
-	"time"
-
-	"github.com/influxdb/influxdb/models"
-	"github.com/influxdb/influxdb/tsdb"
-)
-
-// TestBatch_Size ensures that a batcher generates a batch when the size threshold is reached.
-func TestBatch_Size(t *testing.T) {
-	batchSize := 5
-	batcher := tsdb.NewPointBatcher(batchSize, 0, time.Hour)
-	if batcher == nil {
-		t.Fatal("failed to create batcher for size test")
-	}
-
-	batcher.Start()
-
-	var p models.Point
-	go func() {
-		for i := 0; i < batchSize; i++ {
-			batcher.In() <- p
-		}
-	}()
-	batch := <-batcher.Out()
-	if len(batch) != batchSize {
-		t.Errorf("received batch has incorrect length exp %d, got %d", batchSize, len(batch))
-	}
-	checkPointBatcherStats(t, batcher, -1, batchSize, 1, 0)
-}
-
-// TestBatch_Size ensures that a buffered batcher generates a batch when the size threshold is reached.
-func TestBatch_SizeBuffered(t *testing.T) {
-	batchSize := 5
-	batcher := tsdb.NewPointBatcher(batchSize, 5, time.Hour)
-	if batcher == nil {
-		t.Fatal("failed to create batcher for size test")
-	}
-
-	batcher.Start()
-
-	var p models.Point
-	go func() {
-		for i := 0; i < batchSize; i++ {
-			batcher.In() <- p
-		}
-	}()
-	batch := <-batcher.Out()
-	if len(batch) != batchSize {
-		t.Errorf("received batch has incorrect length exp %d, got %d", batchSize, len(batch))
-	}
-	checkPointBatcherStats(t, batcher, -1, batchSize, 1, 0)
-}
-
-// TestBatch_Size ensures that a batcher generates a batch when the timeout triggers.
-func TestBatch_Timeout(t *testing.T) {
-	batchSize := 5
-	batcher := tsdb.NewPointBatcher(batchSize+1, 0, 100*time.Millisecond)
-	if batcher == nil {
-		t.Fatal("failed to create batcher for timeout test")
-	}
-
-	batcher.Start()
-
-	var p models.Point
-	go func() {
-		for i := 0; i < batchSize; i++ {
-			batcher.In() <- p
-		}
-	}()
-	batch := <-batcher.Out()
-	if len(batch) != batchSize {
-		t.Errorf("received batch has incorrect length exp %d, got %d", batchSize, len(batch))
-	}
-	checkPointBatcherStats(t, batcher, -1, batchSize, 0, 1)
-}
-
-// TestBatch_Flush ensures that a batcher generates a batch when flushed
-func TestBatch_Flush(t *testing.T) {
-	batchSize := 2
-	batcher := tsdb.NewPointBatcher(batchSize, 0, time.Hour)
-	if batcher == nil {
-		t.Fatal("failed to create batcher for flush test")
-	}
-
-	batcher.Start()
-
-	var p models.Point
-	go func() {
-		batcher.In() <- p
-		batcher.Flush()
-	}()
-	batch := <-batcher.Out()
-	if len(batch) != 1 {
-		t.Errorf("received batch has incorrect length exp %d, got %d", 1, len(batch))
-	}
-	checkPointBatcherStats(t, batcher, -1, 1, 0, 0)
-}
-
-// TestBatch_MultipleBatches ensures that a batcher correctly processes multiple batches.
-func TestBatch_MultipleBatches(t *testing.T) {
-	batchSize := 2
-	batcher := tsdb.NewPointBatcher(batchSize, 0, 100*time.Millisecond)
-	if batcher == nil {
-		t.Fatal("failed to create batcher for size test")
-	}
-
-	batcher.Start()
-
-	var p models.Point
-	var b []models.Point
-
-	batcher.In() <- p
-	batcher.In() <- p
-	b = <-batcher.Out() // Batch threshold reached.
-	if len(b) != batchSize {
-		t.Errorf("received batch (size) has incorrect length exp %d, got %d", batchSize, len(b))
-	}
-
-	batcher.In() <- p
-	b = <-batcher.Out() // Timeout triggered.
-	if len(b) != 1 {
-		t.Errorf("received batch (timeout) has incorrect length exp %d, got %d", 1, len(b))
-	}
-
-	checkPointBatcherStats(t, batcher, -1, 3, 1, 1)
-}
-
-func checkPointBatcherStats(t *testing.T, b *tsdb.PointBatcher, batchTotal, pointTotal, sizeTotal, timeoutTotal int) {
-	stats := b.Stats()
-
-	if batchTotal != -1 && stats.BatchTotal != uint64(batchTotal) {
-		t.Errorf("batch total stat is incorrect: %d", stats.BatchTotal)
-	}
-	if pointTotal != -1 && stats.PointTotal != uint64(pointTotal) {
-		t.Errorf("point total stat is incorrect: %d", stats.PointTotal)
-	}
-	if sizeTotal != -1 && stats.SizeTotal != uint64(sizeTotal) {
-		t.Errorf("size total stat is incorrect: %d", stats.SizeTotal)
-	}
-	if timeoutTotal != -1 && stats.TimeoutTotal != uint64(timeoutTotal) {
-		t.Errorf("timeout total stat is incorrect: %d", stats.TimeoutTotal)
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/config.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/config.go
deleted file mode 100644
index df3141842..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/config.go
+++ /dev/null
@@ -1,153 +0,0 @@
-package tsdb
-
-import (
-	"errors"
-	"fmt"
-	"log"
-	"os"
-	"time"
-
-	"github.com/influxdb/influxdb/toml"
-)
-
-const (
-	// DefaultEngine is the default engine for new shards
-	DefaultEngine = "bz1"
-
-	// DefaultMaxWALSize is the default size of the WAL before it is flushed.
-	DefaultMaxWALSize = 100 * 1024 * 1024 // 100MB
-
-	// DefaultWALFlushInterval is the frequency the WAL will get flushed if
-	// it doesn't reach its size threshold.
-	DefaultWALFlushInterval = 10 * time.Minute
-
-	// DefaultWALPartitionFlushDelay is the sleep time between WAL partition flushes.
-	DefaultWALPartitionFlushDelay = 2 * time.Second
-
-	// tsdb/engine/wal configuration options
-
-	// DefaultReadySeriesSize of 32KB specifies when a series is eligible to be flushed
-	DefaultReadySeriesSize = 30 * 1024
-
-	// DefaultCompactionThreshold flush and compact a partition once this ratio of keys are over the flush size
-	DefaultCompactionThreshold = 0.5
-
-	// DefaultMaxSeriesSize specifies the size at which a series will be forced to flush
-	DefaultMaxSeriesSize = 1024 * 1024
-
-	// DefaultFlushColdInterval specifies how long after a partition has been cold
-	// for writes that a full flush and compaction are forced
-	DefaultFlushColdInterval = 5 * time.Second
-
-	// DefaultParititionSizeThreshold specifies when a partition gets to this size in
-	// memory, we should slow down writes until it gets a chance to compact.
-	// This will force clients to get backpressure if they're writing too fast. We need
-	// this because the WAL can take writes much faster than the index. So eventually
-	// we'll need to create backpressure, otherwise we'll fill up the memory and die.
-	// This number multiplied by the parition count is roughly the max possible memory
-	// size for the in-memory WAL cache.
-	DefaultPartitionSizeThreshold = 50 * 1024 * 1024 // 50MB
-
-	// Default WAL settings for the TSM1 WAL
-	DefaultFlushMemorySizeThreshold    = 5 * 1024 * 1024   // 5MB
-	DefaultMaxMemorySizeThreshold      = 100 * 1024 * 1024 // 100MB
-	DefaultIndexCompactionAge          = time.Minute
-	DefaultIndexMinCompactionInterval  = time.Minute
-	DefaultIndexMinCompactionFileCount = 5
-	DefaultIndexCompactionFullAge      = 5 * time.Minute
-)
-
-type Config struct {
-	Dir    string `toml:"dir"`
-	Engine string `toml:"engine"`
-
-	// WAL config options for b1 (introduced in 0.9.2)
-	MaxWALSize             int           `toml:"max-wal-size"`
-	WALFlushInterval       toml.Duration `toml:"wal-flush-interval"`
-	WALPartitionFlushDelay toml.Duration `toml:"wal-partition-flush-delay"`
-
-	// WAL configuration options for bz1 (introduced in 0.9.3)
-	WALDir                    string        `toml:"wal-dir"`
-	WALLoggingEnabled         bool          `toml:"wal-logging-enabled"`
-	WALReadySeriesSize        int           `toml:"wal-ready-series-size"`
-	WALCompactionThreshold    float64       `toml:"wal-compaction-threshold"`
-	WALMaxSeriesSize          int           `toml:"wal-max-series-size"`
-	WALFlushColdInterval      toml.Duration `toml:"wal-flush-cold-interval"`
-	WALPartitionSizeThreshold uint64        `toml:"wal-partition-size-threshold"`
-
-	// WAL configuration options for tsm1 introduced in 0.9.5
-	WALFlushMemorySizeThreshold int `toml:"wal-flush-memory-size-threshold"`
-	WALMaxMemorySizeThreshold   int `toml:"wal-max-memory-size-threshold"`
-
-	// compaction options for tsm1 introduced in 0.9.5
-
-	// IndexCompactionAge specifies the duration after the data file creation time
-	// at which it is eligible to be compacted
-	IndexCompactionAge time.Duration `toml:"index-compaction-age"`
-
-	// IndexMinimumCompactionInterval specifies the minimum amount of time that must
-	// pass after a compaction before another compaction is run
-	IndexMinCompactionInterval time.Duration `toml:"index-min-compaction-interval"`
-
-	// IndexCompactionFileCount specifies the minimum number of data files that
-	// must be eligible for compaction before actually running one
-	IndexMinCompactionFileCount int `toml:"index-compaction-min-file-count"`
-
-	// IndexCompactionFullAge specifies how long after the last write was received
-	// in the WAL that a full compaction should be performed.
-	IndexCompactionFullAge time.Duration `toml:"index-compaction-full-age"`
-
-	// Query logging
-	QueryLogEnabled bool `toml:"query-log-enabled"`
-}
-
-func NewConfig() Config {
-	defaultEngine := DefaultEngine
-	if engine := os.Getenv("INFLUXDB_DATA_ENGINE"); engine != "" {
-		log.Println("TSDB engine selected via environment variable:", engine)
-		defaultEngine = engine
-	}
-
-	return Config{
-		Engine:                 defaultEngine,
-		MaxWALSize:             DefaultMaxWALSize,
-		WALFlushInterval:       toml.Duration(DefaultWALFlushInterval),
-		WALPartitionFlushDelay: toml.Duration(DefaultWALPartitionFlushDelay),
-
-		WALLoggingEnabled:           true,
-		WALReadySeriesSize:          DefaultReadySeriesSize,
-		WALCompactionThreshold:      DefaultCompactionThreshold,
-		WALMaxSeriesSize:            DefaultMaxSeriesSize,
-		WALFlushColdInterval:        toml.Duration(DefaultFlushColdInterval),
-		WALPartitionSizeThreshold:   DefaultPartitionSizeThreshold,
-		WALFlushMemorySizeThreshold: DefaultFlushMemorySizeThreshold,
-		WALMaxMemorySizeThreshold:   DefaultMaxMemorySizeThreshold,
-		IndexCompactionAge:          DefaultIndexCompactionAge,
-		IndexMinCompactionFileCount: DefaultIndexMinCompactionFileCount,
-		IndexCompactionFullAge:      DefaultIndexCompactionFullAge,
-		IndexMinCompactionInterval:  DefaultIndexMinCompactionInterval,
-
-		QueryLogEnabled: true,
-	}
-}
-
-func (c *Config) Validate() error {
-	if c.Dir == "" {
-		return errors.New("Data.Dir must be specified")
-	} else if c.WALDir == "" {
-		return errors.New("Data.WALDir must be specified")
-	}
-
-	valid := false
-	for _, e := range RegisteredEngines() {
-		if e == c.Engine {
-			valid = true
-			break
-		}
-	}
-	if !valid {
-		return fmt.Errorf("unrecognized engine %s", c.Engine)
-	}
-
-	return nil
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/cursor.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/cursor.go
deleted file mode 100644
index b7b7c6b75..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/cursor.go
+++ /dev/null
@@ -1,399 +0,0 @@
-package tsdb
-
-import (
-	"container/heap"
-	"encoding/binary"
-	"sort"
-	"strings"
-
-	"github.com/influxdb/influxdb/influxql"
-)
-
-// EOF represents a "not found" key returned by a Cursor.
-const EOF = int64(-1)
-
-// Cursor represents an iterator over a series.
-type Cursor interface {
-	SeekTo(seek int64) (key int64, value interface{})
-	Next() (key int64, value interface{})
-	Ascending() bool
-}
-
-// MultiCursor returns a single cursor that combines the results of all cursors in order.
-//
-// If the same key is returned from multiple cursors then the first cursor
-// specified will take precendence. A key will only be returned once from the
-// returned cursor.
-func MultiCursor(cursors ...Cursor) Cursor {
-	return &multiCursor{
-		cursors: cursors,
-	}
-}
-
-// multiCursor represents a cursor that combines multiple cursors into one.
-type multiCursor struct {
-	cursors []Cursor
-	heap    cursorHeap
-	prev    int64 // previously read key
-}
-
-// Seek moves the cursor to a given key.
-func (mc *multiCursor) SeekTo(seek int64) (int64, interface{}) {
-	// Initialize heap.
-	h := make(cursorHeap, 0, len(mc.cursors))
-	for i, c := range mc.cursors {
-		// Move cursor to position. Skip if it's empty.
-		k, v := c.SeekTo(seek)
-		if k == EOF {
-			continue
-		}
-
-		// Append cursor to heap.
-		h = append(h, &cursorHeapItem{
-			key:      k,
-			value:    v,
-			cursor:   c,
-			priority: len(mc.cursors) - i,
-		})
-	}
-
-	heap.Init(&h)
-	mc.heap = h
-	mc.prev = EOF
-
-	return mc.pop()
-}
-
-// Ascending returns the direction of the first cursor.
-func (mc *multiCursor) Ascending() bool {
-	if len(mc.cursors) == 0 {
-		return true
-	}
-	return mc.cursors[0].Ascending()
-}
-
-// Next returns the next key/value from the cursor.
-func (mc *multiCursor) Next() (int64, interface{}) { return mc.pop() }
-
-// pop returns the next item from the heap.
-// Reads the next key/value from item's cursor and puts it back on the heap.
-func (mc *multiCursor) pop() (key int64, value interface{}) {
-	// Read items until we have a key that doesn't match the previously read one.
-	// This is to perform deduplication when there's multiple items with the same key.
-	// The highest priority cursor will be read first and then remaining keys will be dropped.
-	for {
-		// Return EOF marker if there are no more items left.
-		if len(mc.heap) == 0 {
-			return EOF, nil
-		}
-
-		// Read the next item from the heap.
-		item := heap.Pop(&mc.heap).(*cursorHeapItem)
-
-		// Save the key/value for return.
-		key, value = item.key, item.value
-
-		// Read the next item from the cursor. Push back to heap if one exists.
-		if item.key, item.value = item.cursor.Next(); item.key != EOF {
-			heap.Push(&mc.heap, item)
-		}
-
-		// Skip if this key matches the previously returned one.
-		if key == mc.prev {
-			continue
-		}
-
-		mc.prev = key
-		return
-	}
-}
-
-// cursorHeap represents a heap of cursorHeapItems.
-type cursorHeap []*cursorHeapItem
-
-func (h cursorHeap) Len() int      { return len(h) }
-func (h cursorHeap) Swap(i, j int) { h[i], h[j] = h[j], h[i] }
-func (h cursorHeap) Less(i, j int) bool {
-	// Use priority if the keys are the same.
-	if h[i].key == h[j].key {
-		return h[i].priority > h[j].priority
-	}
-
-	// Otherwise compare based on cursor direction.
-	if h[i].cursor.Ascending() {
-		return h[i].key < h[j].key
-	}
-	return h[i].key > h[j].key
-}
-
-func (h *cursorHeap) Push(x interface{}) {
-	*h = append(*h, x.(*cursorHeapItem))
-}
-
-func (h *cursorHeap) Pop() interface{} {
-	old := *h
-	n := len(old)
-	item := old[n-1]
-	*h = old[0 : n-1]
-	return item
-}
-
-// cursorHeapItem is something we manage in a priority queue.
-type cursorHeapItem struct {
-	key      int64
-	value    interface{}
-	cursor   Cursor
-	priority int
-}
-
-// TagSetCursor is virtual cursor that iterates over multiple TagsCursors.
-type TagSetCursor struct {
-	measurement   string            // Measurement name
-	currentFields interface{}       // the current decoded and selected fields for the cursor in play
-	tags          map[string]string // Tag key-value pairs
-	cursors       []*TagsCursor     // Underlying tags cursors.
-	currentTags   map[string]string // the current tags for the underlying series cursor in play
-
-	SelectFields []string // fields to be selected
-
-	// Min-heap of cursors ordered by timestamp.
-	heap *pointHeap
-
-	// Memoize the cursor's tagset-based key.
-	memokey string
-}
-
-// NewTagSetCursor returns a instance of TagSetCursor.
-func NewTagSetCursor(m string, t map[string]string, c []*TagsCursor) *TagSetCursor {
-	return &TagSetCursor{
-		measurement: m,
-		tags:        t,
-		cursors:     c,
-		heap:        newPointHeap(),
-	}
-}
-
-func (tsc *TagSetCursor) key() string {
-	if tsc.memokey == "" {
-		if len(tsc.tags) == 0 {
-			tsc.memokey = tsc.measurement
-		} else {
-			tsc.memokey = strings.Join([]string{tsc.measurement, string(MarshalTags(tsc.tags))}, "|")
-		}
-	}
-	return tsc.memokey
-}
-
-func (tsc *TagSetCursor) Init(seek int64) {
-	tsc.heap = newPointHeap()
-
-	// Prime the buffers.
-	for i := 0; i < len(tsc.cursors); i++ {
-		k, v := tsc.cursors[i].SeekTo(seek)
-		if k == EOF {
-			k, v = tsc.cursors[i].Next()
-		}
-		if k == EOF {
-			continue
-		}
-
-		heap.Push(tsc.heap, &pointHeapItem{
-			timestamp: k,
-			value:     v,
-			cursor:    tsc.cursors[i],
-		})
-	}
-}
-
-// Next returns the next matching series-key, timestamp byte slice and meta tags for the tagset. Filtering
-// is enforced on the values. If there is no matching value, then a nil result is returned.
-func (tsc *TagSetCursor) Next(tmin, tmax int64) (int64, interface{}) {
-	for {
-		// If we're out of points, we're done.
-		if tsc.heap.Len() == 0 {
-			return -1, nil
-		}
-
-		// Grab the next point with the lowest timestamp.
-		p := heap.Pop(tsc.heap).(*pointHeapItem)
-
-		// We're done if the point is outside the query's time range [tmin:tmax).
-		if p.timestamp != tmin && (p.timestamp < tmin || p.timestamp >= tmax) {
-			return -1, nil
-		}
-
-		// Save timestamp & value.
-		timestamp, value := p.timestamp, p.value
-
-		// Keep track of all fields for series cursor so we can
-		// respond with them if asked
-		tsc.currentFields = value
-
-		// Keep track of the current tags for the series cursor so we can
-		// respond with them if asked
-		tsc.currentTags = p.cursor.tags
-
-		// Advance the cursor.
-		if nextKey, nextVal := p.cursor.Next(); nextKey != -1 {
-			*p = pointHeapItem{
-				timestamp: nextKey,
-				value:     nextVal,
-				cursor:    p.cursor,
-			}
-			heap.Push(tsc.heap, p)
-		}
-
-		// Value didn't match, look for the next one.
-		if value == nil {
-			continue
-		}
-
-		// Filter value.
-		if p.cursor.filter != nil {
-			// Convert value to a map for filter evaluation.
-			m, ok := value.(map[string]interface{})
-			if !ok {
-				m = map[string]interface{}{tsc.SelectFields[0]: value}
-			}
-
-			// If filter fails then skip to the next value.
-			if !influxql.EvalBool(p.cursor.filter, m) {
-				continue
-			}
-		}
-
-		// Filter out single field, if specified.
-		if len(tsc.SelectFields) == 1 {
-			if m, ok := value.(map[string]interface{}); ok {
-				value = m[tsc.SelectFields[0]]
-			}
-			if value == nil {
-				continue
-			}
-		}
-
-		return timestamp, value
-	}
-}
-
-// Fields returns the current fields of the current cursor
-func (tsc *TagSetCursor) Fields() map[string]interface{} {
-	switch v := tsc.currentFields.(type) {
-	case map[string]interface{}:
-		return v
-	default:
-		return map[string]interface{}{"": v}
-	}
-}
-
-// Tags returns the current tags of the current cursor
-// if there is no current currsor, it returns nil
-func (tsc *TagSetCursor) Tags() map[string]string { return tsc.currentTags }
-
-type pointHeapItem struct {
-	timestamp int64
-	value     interface{}
-	cursor    *TagsCursor // cursor whence pointHeapItem came
-}
-
-type pointHeap []*pointHeapItem
-
-func newPointHeap() *pointHeap {
-	q := make(pointHeap, 0)
-	heap.Init(&q)
-	return &q
-}
-
-func (pq pointHeap) Len() int { return len(pq) }
-
-func (pq pointHeap) Less(i, j int) bool {
-	// We want a min-heap (points in chronological order), so use less than.
-	return pq[i].timestamp < pq[j].timestamp
-}
-
-func (pq pointHeap) Swap(i, j int) { pq[i], pq[j] = pq[j], pq[i] }
-
-func (pq *pointHeap) Push(x interface{}) {
-	item := x.(*pointHeapItem)
-	*pq = append(*pq, item)
-}
-
-func (pq *pointHeap) Pop() interface{} {
-	old := *pq
-	n := len(old)
-	item := old[n-1]
-	*pq = old[0 : n-1]
-	return item
-}
-
-// TagsCursor is a cursor with attached tags and filter.
-type TagsCursor struct {
-	cursor Cursor
-	filter influxql.Expr
-	tags   map[string]string
-
-	seek int64
-	buf  struct {
-		key   int64
-		value interface{}
-	}
-}
-
-// NewTagsCursor returns a new instance of a series cursor.
-func NewTagsCursor(c Cursor, filter influxql.Expr, tags map[string]string) *TagsCursor {
-	return &TagsCursor{
-		cursor: c,
-		filter: filter,
-		tags:   tags,
-		seek:   EOF,
-	}
-}
-
-// Seek positions returning the key and value at that key.
-func (c *TagsCursor) SeekTo(seek int64) (int64, interface{}) {
-	// We've seeked on this cursor. This seek is after that previous cached seek
-	// and the result it gave was after the key for this seek.
-	//
-	// In this case, any seek would just return what we got before, so there's
-	// no point in reseeking.
-	if c.seek != -1 && c.seek < seek && (c.buf.key == EOF || c.buf.key >= seek) {
-		return c.buf.key, c.buf.value
-	}
-
-	// Seek to key/value in underlying cursor.
-	key, value := c.cursor.SeekTo(seek)
-
-	// Save the seek to the buffer.
-	c.seek = seek
-	c.buf.key, c.buf.value = key, value
-	return key, value
-}
-
-// Next returns the next timestamp and value from the cursor.
-func (c *TagsCursor) Next() (int64, interface{}) {
-	// Invalidate the seek.
-	c.seek = -1
-	c.buf.key, c.buf.value = 0, nil
-
-	// Return next key/value.
-	return c.cursor.Next()
-}
-
-// TagSetCursors represents a sortable slice of TagSetCursors.
-type TagSetCursors []*TagSetCursor
-
-func (a TagSetCursors) Len() int           { return len(a) }
-func (a TagSetCursors) Less(i, j int) bool { return a[i].key() < a[j].key() }
-func (a TagSetCursors) Swap(i, j int)      { a[i], a[j] = a[j], a[i] }
-
-func (a TagSetCursors) Keys() []string {
-	keys := []string{}
-	for i := range a {
-		keys = append(keys, a[i].key())
-	}
-	sort.Strings(keys)
-	return keys
-}
-
-// btou64 converts an 8-byte slice into an uint64.
-func btou64(b []byte) uint64 { return binary.BigEndian.Uint64(b) }
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/cursor_test.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/cursor_test.go
deleted file mode 100644
index b5505f2c4..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/cursor_test.go
+++ /dev/null
@@ -1,333 +0,0 @@
-package tsdb_test
-
-import (
-	"bytes"
-	"encoding/binary"
-	"math/rand"
-	"reflect"
-	"sort"
-	"testing"
-	"testing/quick"
-
-	"github.com/influxdb/influxdb/tsdb"
-)
-
-// Ensure the multi-cursor can correctly iterate across a single subcursor.
-func TestMultiCursor_Single(t *testing.T) {
-	mc := tsdb.MultiCursor(NewCursor([]CursorItem{
-		{Key: 0, Value: 0},
-		{Key: 1, Value: 10},
-		{Key: 2, Value: 20},
-	}, true))
-
-	if k, v := mc.SeekTo(0); k != 0 || v.(int) != 0 {
-		t.Fatalf("unexpected key/value: %x / %x", k, v)
-	} else if k, v = mc.Next(); k != 1 || v.(int) != 10 {
-		t.Fatalf("unexpected key/value: %x / %x", k, v)
-	} else if k, v = mc.Next(); k != 2 || v.(int) != 20 {
-		t.Fatalf("unexpected key/value: %x / %x", k, v)
-	} else if k, v = mc.Next(); k != tsdb.EOF {
-		t.Fatalf("expected eof, got: %x / %x", k, v)
-	}
-}
-
-// Ensure the multi-cursor can correctly iterate across a single subcursor in reverse order.
-func TestMultiCursor_Single_Reverse(t *testing.T) {
-	mc := tsdb.MultiCursor(NewCursor([]CursorItem{
-		{Key: 0, Value: 0},
-		{Key: 1, Value: 10},
-		{Key: 2, Value: 20},
-	}, false))
-
-	if k, v := mc.SeekTo(2); k != 2 || v.(int) != 20 {
-		t.Fatalf("unexpected key/value: %x / %x", k, v)
-	} else if k, v = mc.Next(); k != 1 || v.(int) != 10 {
-		t.Fatalf("unexpected key/value: %x / %x", k, v)
-	} else if k, v = mc.Next(); k != 0 || v.(int) != 0 {
-		t.Fatalf("unexpected key/value: %x / %x", k, v)
-	} else if k, v = mc.Next(); k != tsdb.EOF {
-		t.Fatalf("expected eof, got: %x / %x", k, v)
-	}
-}
-
-// Ensure the multi-cursor can correctly iterate across multiple non-overlapping subcursors.
-func TestMultiCursor_Multiple_NonOverlapping(t *testing.T) {
-	mc := tsdb.MultiCursor(
-		NewCursor([]CursorItem{
-			{Key: 0, Value: 0},
-			{Key: 3, Value: 30},
-			{Key: 4, Value: 40},
-		}, true),
-		NewCursor([]CursorItem{
-			{Key: 1, Value: 10},
-			{Key: 2, Value: 20},
-		}, true),
-	)
-
-	if k, v := mc.SeekTo(0); k != 0 || v.(int) != 0 {
-		t.Fatalf("unexpected key/value: %x / %x", k, v)
-	} else if k, v = mc.Next(); k != 1 || v.(int) != 10 {
-		t.Fatalf("unexpected key/value: %x / %x", k, v)
-	} else if k, v = mc.Next(); k != 2 || v.(int) != 20 {
-		t.Fatalf("unexpected key/value: %x / %x", k, v)
-	} else if k, v = mc.Next(); k != 3 || v.(int) != 30 {
-		t.Fatalf("unexpected key/value: %x / %x", k, v)
-	} else if k, v = mc.Next(); k != 4 || v.(int) != 40 {
-		t.Fatalf("unexpected key/value: %x / %x", k, v)
-	} else if k, v = mc.Next(); k != tsdb.EOF {
-		t.Fatalf("expected eof, got: %x / %x", k, v)
-	}
-}
-
-// Ensure the multi-cursor can correctly iterate across multiple non-overlapping subcursors.
-func TestMultiCursor_Multiple_NonOverlapping_Reverse(t *testing.T) {
-	mc := tsdb.MultiCursor(
-		NewCursor([]CursorItem{
-			{Key: 0, Value: 0},
-			{Key: 3, Value: 30},
-			{Key: 4, Value: 40},
-		}, false),
-		NewCursor([]CursorItem{
-			{Key: 1, Value: 10},
-			{Key: 2, Value: 20},
-		}, false),
-	)
-
-	if k, v := mc.SeekTo(4); k != 4 || v.(int) != 40 {
-		t.Fatalf("unexpected key/value: %x / %x", k, v)
-	} else if k, v = mc.Next(); k != 3 || v.(int) != 30 {
-		t.Fatalf("unexpected key/value: %x / %x", k, v)
-	} else if k, v = mc.Next(); k != 2 || v.(int) != 20 {
-		t.Fatalf("unexpected key/value: %x / %x", k, v)
-	} else if k, v = mc.Next(); k != 1 || v.(int) != 10 {
-		t.Fatalf("unexpected key/value: %x / %x", k, v)
-	} else if k, v = mc.Next(); k != 0 || v.(int) != 00 {
-		t.Fatalf("unexpected key/value: %x / %x", k, v)
-	} else if k, v = mc.Next(); k != tsdb.EOF {
-		t.Fatalf("expected eof, got: %x / %x", k, v)
-	}
-}
-
-// Ensure the multi-cursor can correctly iterate across multiple overlapping subcursors.
-func TestMultiCursor_Multiple_Overlapping(t *testing.T) {
-	mc := tsdb.MultiCursor(
-		NewCursor([]CursorItem{
-			{Key: 0, Value: 0},
-			{Key: 3, Value: 3},
-			{Key: 4, Value: 4},
-		}, true),
-		NewCursor([]CursorItem{
-			{Key: 0, Value: 0xF0},
-			{Key: 2, Value: 0xF2},
-			{Key: 4, Value: 0xF4},
-		}, true),
-	)
-
-	if k, v := mc.SeekTo(0); k != 0 || v.(int) != 0 {
-		t.Fatalf("unexpected key/value: %x / %x", k, v)
-	} else if k, v = mc.Next(); k != 2 || v.(int) != 0xF2 {
-		t.Fatalf("unexpected key/value: %x / %x", k, v)
-	} else if k, v = mc.Next(); k != 3 || v.(int) != 3 {
-		t.Fatalf("unexpected key/value: %x / %x", k, v)
-	} else if k, v = mc.Next(); k != 4 || v.(int) != 4 {
-		t.Fatalf("unexpected key/value: %x / %x", k, v)
-	} else if k, v = mc.Next(); k != tsdb.EOF {
-		t.Fatalf("expected eof, got: %x / %x", k, v)
-	}
-}
-
-// Ensure the multi-cursor can correctly iterate across multiple overlapping subcursors.
-func TestMultiCursor_Multiple_Overlapping_Reverse(t *testing.T) {
-	mc := tsdb.MultiCursor(
-		NewCursor([]CursorItem{
-			{Key: 0, Value: 0},
-			{Key: 3, Value: 3},
-			{Key: 4, Value: 4},
-		}, false),
-		NewCursor([]CursorItem{
-			{Key: 0, Value: 0xF0},
-			{Key: 2, Value: 0xF2},
-			{Key: 4, Value: 0xF4},
-		}, false),
-	)
-
-	if k, v := mc.SeekTo(4); k != 4 || v.(int) != 4 {
-		t.Fatalf("unexpected key/value: %x / %x", k, v)
-	} else if k, v = mc.Next(); k != 3 || v.(int) != 3 {
-		t.Fatalf("unexpected key/value: %x / %x", k, v)
-	} else if k, v = mc.Next(); k != 2 || v.(int) != 0xF2 {
-		t.Fatalf("unexpected key/value: %x / %x", k, v)
-	} else if k, v = mc.Next(); k != 0 || v.(int) != 0 {
-		t.Fatalf("unexpected key/value: %x / %x", k, v)
-	} else if k, v = mc.Next(); k != tsdb.EOF {
-		t.Fatalf("expected eof, got: %x / %x", k, v)
-	}
-}
-
-// Ensure the multi-cursor can handle randomly generated data.
-func TestMultiCursor_Quick(t *testing.T) {
-	quick.Check(func(useek uint64, cursors []Cursor) bool {
-		var got, exp []CursorItem
-		seek := int64(useek) % 100
-
-		// Merge all cursor data to determine expected output.
-		// First seen key overrides all other items with the same key.
-		m := make(map[int64]CursorItem)
-		for _, c := range cursors {
-			for _, item := range c.items {
-				if item.Key < seek {
-					continue
-				}
-				if _, ok := m[item.Key]; ok {
-					continue
-				}
-				m[item.Key] = item
-			}
-		}
-
-		// Convert map back to single item list.
-		for _, item := range m {
-			exp = append(exp, item)
-		}
-		sort.Sort(CursorItems(exp))
-
-		// Create multi-cursor and iterate over all items.
-		mc := tsdb.MultiCursor(tsdbCursorSlice(cursors)...)
-		for k, v := mc.SeekTo(seek); k != tsdb.EOF; k, v = mc.Next() {
-			got = append(got, CursorItem{k, v.(int)})
-		}
-
-		// Verify results.
-		if !reflect.DeepEqual(got, exp) {
-			t.Fatalf("mismatch: seek=%d\n\ngot=%+v\n\nexp=%+v", seek, got, exp)
-		}
-
-		return true
-	}, nil)
-}
-
-// Cursor represents an in-memory test cursor.
-type Cursor struct {
-	items     []CursorItem
-	index     int
-	ascending bool
-}
-
-// NewCursor returns a new instance of Cursor.
-func NewCursor(items []CursorItem, ascending bool) *Cursor {
-	index := 0
-	sort.Sort(CursorItems(items))
-
-	if !ascending {
-		index = len(items)
-	}
-	return &Cursor{
-		items:     items,
-		index:     index,
-		ascending: ascending,
-	}
-}
-
-func (c *Cursor) Ascending() bool { return c.ascending }
-
-// Seek seeks to an item by key.
-func (c *Cursor) SeekTo(seek int64) (key int64, value interface{}) {
-	if c.ascending {
-		return c.seekForward(seek)
-	}
-	return c.seekReverse(seek)
-}
-
-func (c *Cursor) seekForward(seek int64) (key int64, value interface{}) {
-	for c.index = 0; c.index < len(c.items); c.index++ {
-		if c.items[c.index].Key < seek { // skip keys less than seek
-			continue
-		}
-		return c.items[c.index].Key, c.items[c.index].Value
-	}
-	return tsdb.EOF, nil
-}
-
-func (c *Cursor) seekReverse(seek int64) (key int64, value interface{}) {
-	for c.index = len(c.items) - 1; c.index >= 0; c.index-- {
-		if c.items[c.index].Key > seek { // skip keys greater than seek
-			continue
-		}
-		return c.items[c.index].Key, c.items[c.index].Value
-	}
-	return tsdb.EOF, nil
-}
-
-// Next returns the next key/value pair.
-func (c *Cursor) Next() (key int64, value interface{}) {
-	if !c.ascending && c.index < 0 {
-		return tsdb.EOF, nil
-	}
-
-	if c.ascending && c.index >= len(c.items) {
-		return tsdb.EOF, nil
-	}
-
-	k, v := c.items[c.index].Key, c.items[c.index].Value
-
-	if c.ascending {
-		c.index++
-	} else {
-		c.index--
-	}
-	return k, v
-}
-
-// Generate returns a randomly generated cursor. Implements quick.Generator.
-func (c Cursor) Generate(rand *rand.Rand, size int) reflect.Value {
-	c.index = 0
-	c.ascending = true
-
-	c.items = make([]CursorItem, rand.Intn(size))
-	for i := range c.items {
-		c.items[i] = CursorItem{
-			Key:   rand.Int63n(int64(size)),
-			Value: rand.Int(),
-		}
-	}
-
-	// Sort items by key.
-	sort.Sort(CursorItems(c.items))
-
-	return reflect.ValueOf(c)
-}
-
-// tsdbCursorSlice converts a Cursor slice to a tsdb.Cursor slice.
-func tsdbCursorSlice(a []Cursor) []tsdb.Cursor {
-	var other []tsdb.Cursor
-	for i := range a {
-		other = append(other, &a[i])
-	}
-	return other
-}
-
-// CursorItem represents a key/value pair in a cursor.
-type CursorItem struct {
-	Key   int64
-	Value int
-}
-
-type CursorItems []CursorItem
-
-func (a CursorItems) Len() int           { return len(a) }
-func (a CursorItems) Swap(i, j int)      { a[i], a[j] = a[j], a[i] }
-func (a CursorItems) Less(i, j int) bool { return a[i].Key < a[j].Key }
-
-// byteSlices represents a sortable slice of byte slices.
-type byteSlices [][]byte
-
-func (a byteSlices) Len() int           { return len(a) }
-func (a byteSlices) Less(i, j int) bool { return bytes.Compare(a[i], a[j]) == -1 }
-func (a byteSlices) Swap(i, j int)      { a[i], a[j] = a[j], a[i] }
-
-// u64tob converts a uint64 into an 8-byte slice.
-func u64tob(v uint64) []byte {
-	b := make([]byte, 8)
-	binary.BigEndian.PutUint64(b, v)
-	return b
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/doc.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/doc.go
deleted file mode 100644
index 50c110ab2..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/doc.go
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
-Package tsdb implements a durable time series database.
-
-*/
-package tsdb
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/engine.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/engine.go
deleted file mode 100644
index 946079028..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/engine.go
+++ /dev/null
@@ -1,194 +0,0 @@
-package tsdb
-
-import (
-	"bytes"
-	"errors"
-	"fmt"
-	"io"
-	"os"
-	"sort"
-	"time"
-
-	"github.com/boltdb/bolt"
-	"github.com/influxdb/influxdb/models"
-)
-
-var (
-	// ErrFormatNotFound is returned when no format can be determined from a path.
-	ErrFormatNotFound = errors.New("format not found")
-)
-
-// Engine represents a swappable storage engine for the shard.
-type Engine interface {
-	Open() error
-	Close() error
-
-	SetLogOutput(io.Writer)
-	LoadMetadataIndex(shard *Shard, index *DatabaseIndex, measurementFields map[string]*MeasurementFields) error
-
-	Begin(writable bool) (Tx, error)
-	WritePoints(points []models.Point, measurementFieldsToSave map[string]*MeasurementFields, seriesToCreate []*SeriesCreate) error
-	DeleteSeries(keys []string) error
-	DeleteMeasurement(name string, seriesKeys []string) error
-	SeriesCount() (n int, err error)
-
-	// PerformMaintenance will get called periodically by the store
-	PerformMaintenance()
-
-	// Format will return the format for the engine
-	Format() EngineFormat
-
-	io.WriterTo
-}
-
-type EngineFormat int
-
-const (
-	B1Format EngineFormat = iota
-	BZ1Format
-	TSM1Format
-)
-
-// NewEngineFunc creates a new engine.
-type NewEngineFunc func(path string, walPath string, options EngineOptions) Engine
-
-// newEngineFuncs is a lookup of engine constructors by name.
-var newEngineFuncs = make(map[string]NewEngineFunc)
-
-// RegisterEngine registers a storage engine initializer by name.
-func RegisterEngine(name string, fn NewEngineFunc) {
-	if _, ok := newEngineFuncs[name]; ok {
-		panic("engine already registered: " + name)
-	}
-	newEngineFuncs[name] = fn
-}
-
-// RegisteredEngines returns the slice of currently registered engines.
-func RegisteredEngines() []string {
-	a := make([]string, 0, len(newEngineFuncs))
-	for k, _ := range newEngineFuncs {
-		a = append(a, k)
-	}
-	sort.Strings(a)
-	return a
-}
-
-// NewEngine returns an instance of an engine based on its format.
-// If the path does not exist then the DefaultFormat is used.
-func NewEngine(path string, walPath string, options EngineOptions) (Engine, error) {
-	// Create a new engine
-	if _, err := os.Stat(path); os.IsNotExist(err) {
-		return newEngineFuncs[options.EngineVersion](path, walPath, options), nil
-	}
-
-	// Only bolt and tsm1 based storage engines are currently supported
-	var format string
-	if err := func() error {
-		// if it's a dir then it's a tsm1 engine
-		f, err := os.Open(path)
-		if err != nil {
-			return err
-		}
-		fi, err := f.Stat()
-		f.Close()
-		if err != nil {
-			return err
-		}
-		if fi.Mode().IsDir() {
-			format = "tsm1"
-			return nil
-		}
-
-		db, err := bolt.Open(path, 0666, &bolt.Options{Timeout: 1 * time.Second})
-		if err != nil {
-			return err
-		}
-		defer db.Close()
-
-		return db.View(func(tx *bolt.Tx) error {
-			// Retrieve the meta bucket.
-			b := tx.Bucket([]byte("meta"))
-
-			// If no format is specified then it must be an original b1 database.
-			if b == nil {
-				format = "b1"
-				return nil
-			}
-
-			// Save the format.
-			format = string(b.Get([]byte("format")))
-			if format == "v1" {
-				format = "b1"
-			}
-			return nil
-		})
-	}(); err != nil {
-		return nil, err
-	}
-
-	// Lookup engine by format.
-	fn := newEngineFuncs[format]
-	if fn == nil {
-		return nil, fmt.Errorf("invalid engine format: %q", format)
-	}
-
-	return fn(path, walPath, options), nil
-}
-
-// EngineOptions represents the options used to initialize the engine.
-type EngineOptions struct {
-	EngineVersion          string
-	MaxWALSize             int
-	WALFlushInterval       time.Duration
-	WALPartitionFlushDelay time.Duration
-
-	Config Config
-}
-
-// NewEngineOptions returns the default options.
-func NewEngineOptions() EngineOptions {
-	return EngineOptions{
-		EngineVersion:          DefaultEngine,
-		MaxWALSize:             DefaultMaxWALSize,
-		WALFlushInterval:       DefaultWALFlushInterval,
-		WALPartitionFlushDelay: DefaultWALPartitionFlushDelay,
-		Config:                 NewConfig(),
-	}
-}
-
-// Tx represents a transaction.
-type Tx interface {
-	io.WriterTo
-
-	Size() int64
-	Commit() error
-	Rollback() error
-
-	Cursor(series string, fields []string, dec *FieldCodec, ascending bool) Cursor
-}
-
-// DedupeEntries returns slices with unique keys (the first 8 bytes).
-func DedupeEntries(a [][]byte) [][]byte {
-	// Convert to a map where the last slice is used.
-	m := make(map[string][]byte)
-	for _, b := range a {
-		m[string(b[0:8])] = b
-	}
-
-	// Convert map back to a slice of byte slices.
-	other := make([][]byte, 0, len(m))
-	for _, v := range m {
-		other = append(other, v)
-	}
-
-	// Sort entries.
-	sort.Sort(ByteSlices(other))
-
-	return other
-}
-
-type ByteSlices [][]byte
-
-func (a ByteSlices) Len() int           { return len(a) }
-func (a ByteSlices) Swap(i, j int)      { a[i], a[j] = a[j], a[i] }
-func (a ByteSlices) Less(i, j int) bool { return bytes.Compare(a[i], a[j]) == -1 }
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/engine/b1/b1.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/engine/b1/b1.go
deleted file mode 100644
index a3f63602c..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/engine/b1/b1.go
+++ /dev/null
@@ -1,812 +0,0 @@
-package b1
-
-import (
-	"bytes"
-	"encoding/binary"
-	"errors"
-	"fmt"
-	"hash/fnv"
-	"io"
-	"log"
-	"os"
-	"sort"
-	"sync"
-	"time"
-
-	"github.com/boltdb/bolt"
-	"github.com/influxdb/influxdb/models"
-	"github.com/influxdb/influxdb/tsdb"
-)
-
-// Format is the file format name of this engine.
-const Format = "b1"
-
-func init() {
-	tsdb.RegisterEngine(Format, NewEngine)
-}
-
-// topLevelBucketN is the number of non-series buckets in the bolt db.
-const topLevelBucketN = 3
-
-var (
-	// ErrWALPartitionNotFound returns when flushing a partition that does not exist.
-	ErrWALPartitionNotFound = errors.New("wal partition not found")
-)
-
-// Ensure Engine implements the interface.
-var _ tsdb.Engine = &Engine{}
-
-// Engine represents a version 1 storage engine.
-type Engine struct {
-	mu sync.RWMutex
-
-	path string   // path to data file
-	db   *bolt.DB // underlying database
-
-	cache map[uint8]map[string][][]byte // values by <wal partition,series>
-
-	walSize    int           // approximate size of the WAL, in bytes
-	flush      chan struct{} // signals background flush
-	flushTimer *time.Timer   // signals time-based flush
-
-	// These coordinate closing and waiting for running goroutines.
-	wg      sync.WaitGroup
-	closing chan struct{}
-
-	// Used for out-of-band error messages.
-	logger *log.Logger
-
-	// The maximum size and time thresholds for flushing the WAL.
-	MaxWALSize             int
-	WALFlushInterval       time.Duration
-	WALPartitionFlushDelay time.Duration
-
-	// The writer used by the logger.
-	LogOutput io.Writer
-}
-
-// NewEngine returns a new instance of Engine. walPath isn't used in b1, but had
-// to be added for later engine versions.
-func NewEngine(path string, walPath string, opt tsdb.EngineOptions) tsdb.Engine {
-	e := &Engine{
-		path:  path,
-		flush: make(chan struct{}, 1),
-
-		MaxWALSize:             opt.MaxWALSize,
-		WALFlushInterval:       opt.WALFlushInterval,
-		WALPartitionFlushDelay: opt.WALPartitionFlushDelay,
-
-		LogOutput: os.Stderr,
-	}
-
-	// Initialize all partitions of the cache.
-	e.cache = make(map[uint8]map[string][][]byte)
-	for i := uint8(0); i < WALPartitionN; i++ {
-		e.cache[i] = make(map[string][][]byte)
-	}
-
-	return e
-}
-
-// Path returns the path the engine was initialized with.
-func (e *Engine) Path() string { return e.path }
-
-// PerformMaintenance is for periodic maintenance of the store. A no-op for b1
-func (e *Engine) PerformMaintenance() {}
-
-// Format returns the format type of this engine
-func (e *Engine) Format() tsdb.EngineFormat {
-	return tsdb.B1Format
-}
-
-// Open opens and initializes the engine.
-func (e *Engine) Open() error {
-	if err := func() error {
-		e.mu.Lock()
-		defer e.mu.Unlock()
-
-		// Open underlying storage.
-		db, err := bolt.Open(e.path, 0666, &bolt.Options{Timeout: 1 * time.Second})
-		if err != nil {
-			return err
-		}
-		e.db = db
-
-		// Initialize data file.
-		if err := e.db.Update(func(tx *bolt.Tx) error {
-			_, _ = tx.CreateBucketIfNotExists([]byte("series"))
-			_, _ = tx.CreateBucketIfNotExists([]byte("fields"))
-			_, _ = tx.CreateBucketIfNotExists([]byte("wal"))
-
-			// Set file format, if not set yet.
-			b, _ := tx.CreateBucketIfNotExists([]byte("meta"))
-			if v := b.Get([]byte("format")); v == nil {
-				if err := b.Put([]byte("format"), []byte(Format)); err != nil {
-					return fmt.Errorf("set format: %s", err)
-				}
-			}
-
-			return nil
-		}); err != nil {
-			return fmt.Errorf("init: %s", err)
-		}
-
-		// Start flush interval timer.
-		e.flushTimer = time.NewTimer(e.WALFlushInterval)
-
-		// Initialize logger.
-		e.logger = log.New(e.LogOutput, "[b1] ", log.LstdFlags)
-
-		// Start background goroutines.
-		e.wg.Add(1)
-		e.closing = make(chan struct{})
-		go e.autoflusher(e.closing)
-
-		return nil
-	}(); err != nil {
-		e.close()
-		return err
-	}
-
-	// Flush on-disk WAL before we return to the caller.
-	if err := e.Flush(0); err != nil {
-		return fmt.Errorf("flush: %s", err)
-	}
-
-	return nil
-}
-
-func (e *Engine) Close() error {
-	e.mu.Lock()
-	err := e.close()
-	e.mu.Unlock()
-
-	// Wait for open goroutines to finish.
-	e.wg.Wait()
-	return err
-}
-
-func (e *Engine) close() error {
-	if e.db != nil {
-		e.db.Close()
-	}
-	if e.closing != nil {
-		close(e.closing)
-		e.closing = nil
-	}
-	return nil
-}
-
-// SetLogOutput sets the writer used for log output.
-// This must be set before opening the engine.
-func (e *Engine) SetLogOutput(w io.Writer) { e.LogOutput = w }
-
-// LoadMetadataIndex loads the shard metadata into memory.
-func (e *Engine) LoadMetadataIndex(shard *tsdb.Shard, index *tsdb.DatabaseIndex, measurementFields map[string]*tsdb.MeasurementFields) error {
-	return e.db.View(func(tx *bolt.Tx) error {
-		// load measurement metadata
-		meta := tx.Bucket([]byte("fields"))
-		c := meta.Cursor()
-		for k, v := c.First(); k != nil; k, v = c.Next() {
-			m := index.CreateMeasurementIndexIfNotExists(string(k))
-			mf := &tsdb.MeasurementFields{}
-			if err := mf.UnmarshalBinary(v); err != nil {
-				return err
-			}
-			for name, _ := range mf.Fields {
-				m.SetFieldName(name)
-			}
-			mf.Codec = tsdb.NewFieldCodec(mf.Fields)
-			measurementFields[m.Name] = mf
-		}
-
-		// load series metadata
-		meta = tx.Bucket([]byte("series"))
-		c = meta.Cursor()
-		for k, v := c.First(); k != nil; k, v = c.Next() {
-			series := tsdb.NewSeries("", nil)
-			if err := series.UnmarshalBinary(v); err != nil {
-				return err
-			}
-			index.CreateSeriesIndexIfNotExists(tsdb.MeasurementFromSeriesKey(string(k)), series)
-		}
-		return nil
-	})
-}
-
-// WritePoints will write the raw data points and any new metadata to the index in the shard
-func (e *Engine) WritePoints(points []models.Point, measurementFieldsToSave map[string]*tsdb.MeasurementFields, seriesToCreate []*tsdb.SeriesCreate) error {
-	// save to the underlying bolt instance
-	if err := e.db.Update(func(tx *bolt.Tx) error {
-		// save any new metadata
-		if len(seriesToCreate) > 0 {
-			b := tx.Bucket([]byte("series"))
-			for _, sc := range seriesToCreate {
-				data, err := sc.Series.MarshalBinary()
-				if err != nil {
-					return err
-				}
-				if err := b.Put([]byte(sc.Series.Key), data); err != nil {
-					return err
-				}
-			}
-		}
-		if len(measurementFieldsToSave) > 0 {
-			b := tx.Bucket([]byte("fields"))
-			for name, m := range measurementFieldsToSave {
-				data, err := m.MarshalBinary()
-				if err != nil {
-					return err
-				}
-				if err := b.Put([]byte(name), data); err != nil {
-					return err
-				}
-			}
-		}
-
-		// Write points to WAL bucket.
-		wal := tx.Bucket([]byte("wal"))
-		for _, p := range points {
-			// Retrieve partition bucket.
-			key := p.Key()
-			b, err := wal.CreateBucketIfNotExists([]byte{WALPartition(key)})
-			if err != nil {
-				return fmt.Errorf("create WAL partition bucket: %s", err)
-			}
-
-			// Generate an autoincrementing index for the WAL partition.
-			id, _ := b.NextSequence()
-
-			// Append points sequentially to the WAL bucket.
-			v := marshalWALEntry(key, p.UnixNano(), p.Data())
-			if err := b.Put(u64tob(id), v); err != nil {
-				return fmt.Errorf("put wal: %s", err)
-			}
-		}
-
-		return nil
-	}); err != nil {
-		return err
-	}
-
-	// If successful then save points to in-memory cache.
-	if err := func() error {
-		e.mu.Lock()
-		defer e.mu.Unlock()
-
-		// tracks which in-memory caches need to be resorted
-		resorts := map[uint8]map[string]struct{}{}
-
-		for _, p := range points {
-			// Generate in-memory cache entry of <timestamp,data>.
-			key, data := p.Key(), p.Data()
-			v := make([]byte, 8+len(data))
-			binary.BigEndian.PutUint64(v[0:8], uint64(p.UnixNano()))
-			copy(v[8:], data)
-
-			// Determine if we are appending.
-			partitionID := WALPartition(key)
-			a := e.cache[partitionID][string(key)]
-			appending := (len(a) == 0 || bytes.Compare(a[len(a)-1], v) == -1)
-
-			// Append to cache list.
-			a = append(a, v)
-
-			// If not appending, keep track of cache lists that need to be resorted.
-			if !appending {
-				series := resorts[partitionID]
-				if series == nil {
-					series = map[string]struct{}{}
-					resorts[partitionID] = series
-				}
-				series[string(key)] = struct{}{}
-			}
-
-			e.cache[partitionID][string(key)] = a
-
-			// Calculate estimated WAL size.
-			e.walSize += len(key) + len(v)
-		}
-
-		// Sort by timestamp if not appending.
-		for partitionID, cache := range resorts {
-			for key, _ := range cache {
-				sort.Sort(byteSlices(e.cache[partitionID][key]))
-			}
-		}
-
-		// Check for flush threshold.
-		e.triggerAutoFlush()
-
-		return nil
-	}(); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-// DeleteSeries deletes the series from the engine.
-func (e *Engine) DeleteSeries(keys []string) error {
-	e.mu.Lock()
-	defer e.mu.Unlock()
-
-	if err := e.db.Update(func(tx *bolt.Tx) error {
-		b := tx.Bucket([]byte("series"))
-		for _, k := range keys {
-			if err := b.Delete([]byte(k)); err != nil {
-				return err
-			}
-			if err := tx.DeleteBucket([]byte(k)); err != nil && err != bolt.ErrBucketNotFound {
-				return err
-			}
-			delete(e.cache[WALPartition([]byte(k))], k)
-		}
-		return nil
-	}); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-// DeleteMeasurement deletes a measurement and all related series.
-func (e *Engine) DeleteMeasurement(name string, seriesKeys []string) error {
-	e.mu.Lock()
-	defer e.mu.Unlock()
-
-	if err := e.db.Update(func(tx *bolt.Tx) error {
-		bm := tx.Bucket([]byte("fields"))
-		if err := bm.Delete([]byte(name)); err != nil {
-			return err
-		}
-		b := tx.Bucket([]byte("series"))
-		for _, k := range seriesKeys {
-			if err := b.Delete([]byte(k)); err != nil {
-				return err
-			}
-			if err := tx.DeleteBucket([]byte(k)); err != nil && err != bolt.ErrBucketNotFound {
-				return err
-			}
-			delete(e.cache[WALPartition([]byte(k))], k)
-		}
-
-		return nil
-	}); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-// Flush writes all points from the write ahead log to the index.
-func (e *Engine) Flush(partitionFlushDelay time.Duration) error {
-	// Retrieve a list of WAL buckets.
-	var partitionIDs []uint8
-	if err := e.db.View(func(tx *bolt.Tx) error {
-		return tx.Bucket([]byte("wal")).ForEach(func(key, _ []byte) error {
-			partitionIDs = append(partitionIDs, uint8(key[0]))
-			return nil
-		})
-	}); err != nil {
-		return err
-	}
-
-	// Continue flushing until there are no more partition buckets.
-	for _, partitionID := range partitionIDs {
-		if err := e.FlushPartition(partitionID); err != nil {
-			return fmt.Errorf("flush partition: id=%d, err=%s", partitionID, err)
-		}
-
-		// Wait momentarily so other threads can process.
-		time.Sleep(partitionFlushDelay)
-	}
-
-	e.mu.Lock()
-	defer e.mu.Unlock()
-
-	// Reset WAL size.
-	e.walSize = 0
-
-	// Reset the timer.
-	e.flushTimer.Reset(e.WALFlushInterval)
-
-	return nil
-}
-
-// FlushPartition flushes a single WAL partition.
-func (e *Engine) FlushPartition(partitionID uint8) error {
-	e.mu.Lock()
-	defer e.mu.Unlock()
-
-	startTime := time.Now()
-
-	var pointN int
-	if err := e.db.Update(func(tx *bolt.Tx) error {
-		// Retrieve partition bucket. Exit if it doesn't exist.
-		pb := tx.Bucket([]byte("wal")).Bucket([]byte{byte(partitionID)})
-		if pb == nil {
-			return ErrWALPartitionNotFound
-		}
-
-		// Iterate over keys in the WAL partition bucket.
-		c := pb.Cursor()
-		for k, v := c.First(); k != nil; k, v = c.Next() {
-			key, timestamp, data := unmarshalWALEntry(v)
-
-			// Create bucket for entry.
-			b, err := tx.CreateBucketIfNotExists(key)
-			if err != nil {
-				return fmt.Errorf("create bucket: %s", err)
-			}
-
-			// Write point to bucket.
-			if err := b.Put(u64tob(uint64(timestamp)), data); err != nil {
-				return fmt.Errorf("put: %s", err)
-			}
-
-			// Remove entry in the WAL.
-			if err := c.Delete(); err != nil {
-				return fmt.Errorf("delete: %s", err)
-			}
-
-			pointN++
-		}
-
-		return nil
-	}); err != nil {
-		return err
-	}
-
-	// Reset cache.
-	e.cache[partitionID] = make(map[string][][]byte)
-
-	if pointN > 0 {
-		e.logger.Printf("flush %d points in %.3fs", pointN, time.Since(startTime).Seconds())
-	}
-
-	return nil
-}
-
-// autoflusher waits for notification of a flush and kicks it off in the background.
-// This method runs in a separate goroutine.
-func (e *Engine) autoflusher(closing chan struct{}) {
-	defer e.wg.Done()
-
-	for {
-		// Wait for close or flush signal.
-		select {
-		case <-closing:
-			return
-		case <-e.flushTimer.C:
-			if err := e.Flush(e.WALPartitionFlushDelay); err != nil {
-				e.logger.Printf("flush error: %s", err)
-			}
-		case <-e.flush:
-			if err := e.Flush(e.WALPartitionFlushDelay); err != nil {
-				e.logger.Printf("flush error: %s", err)
-			}
-		}
-	}
-}
-
-// triggerAutoFlush signals that a flush should occur if the size is above the threshold.
-// This function must be called within the context of a lock.
-func (e *Engine) triggerAutoFlush() {
-	// Ignore if we haven't reached the threshold.
-	if e.walSize < e.MaxWALSize {
-		return
-	}
-
-	// Otherwise send a non-blocking signal.
-	select {
-	case e.flush <- struct{}{}:
-	default:
-	}
-}
-
-// SeriesCount returns the number of series buckets on the shard.
-// This does not include a count from the WAL.
-func (e *Engine) SeriesCount() (n int, err error) {
-	err = e.db.View(func(tx *bolt.Tx) error {
-		return tx.ForEach(func(_ []byte, _ *bolt.Bucket) error {
-			n++
-			return nil
-		})
-	})
-
-	// Remove top-level buckets.
-	n -= topLevelBucketN
-
-	return
-}
-
-// Begin starts a new transaction on the engine.
-func (e *Engine) Begin(writable bool) (tsdb.Tx, error) {
-	tx, err := e.db.Begin(writable)
-	if err != nil {
-		return nil, err
-	}
-	return &Tx{Tx: tx, engine: e}, nil
-}
-
-// DB returns the underlying Bolt database.
-func (e *Engine) DB() *bolt.DB { return e.db }
-
-// WriteTo writes the length and contents of the engine to w.
-func (e *Engine) WriteTo(w io.Writer) (n int64, err error) {
-	tx, err := e.db.Begin(false)
-	if err != nil {
-		return 0, err
-	}
-	defer tx.Rollback()
-
-	// Write size.
-	if err := binary.Write(w, binary.BigEndian, uint64(tx.Size())); err != nil {
-		return 0, err
-	}
-
-	// Write data.
-	n, err = tx.WriteTo(w)
-	n += 8 // size header
-	return
-}
-
-// Tx represents a transaction.
-type Tx struct {
-	*bolt.Tx
-	engine *Engine
-}
-
-// Cursor returns an iterator for a key over a single field.
-func (tx *Tx) Cursor(series string, fields []string, dec *tsdb.FieldCodec, ascending bool) tsdb.Cursor {
-	// Retrieve series bucket.
-	b := tx.Bucket([]byte(series))
-
-	tx.engine.mu.RLock()
-	defer tx.engine.mu.RUnlock()
-
-	// Ignore if there is no bucket or points in the cache.
-	partitionID := WALPartition([]byte(series))
-	if b == nil && len(tx.engine.cache[partitionID][series]) == 0 {
-		return nil
-	}
-
-	// Retrieve a copy of the in-cache points for the series.
-	cache := make([][]byte, len(tx.engine.cache[partitionID][series]))
-	copy(cache, tx.engine.cache[partitionID][series])
-
-	// Build a cursor that merges the bucket and cache together.
-	cur := &Cursor{
-		cache:     cache,
-		fields:    fields,
-		dec:       dec,
-		ascending: ascending,
-	}
-	if b != nil {
-		cur.cursor = b.Cursor()
-	}
-
-	// If it's a reverse cursor, set the current location to the end.
-	if !ascending {
-		cur.index = len(cache) - 1
-		if cur.cursor != nil {
-			cur.cursor.Last()
-		}
-	}
-	return cur
-}
-
-// Cursor provides ordered iteration across a series.
-type Cursor struct {
-	// Bolt cursor and readahead buffer.
-	cursor *bolt.Cursor
-	buf    struct {
-		key, value []byte
-	}
-
-	// Fields and codec.
-	fields []string
-	dec    *tsdb.FieldCodec
-
-	// Cache and current cache index.
-	cache [][]byte
-	index int
-
-	// Previously read key.
-	prev []byte
-
-	// The direction the cursor pointer moves after each call to Next()
-	ascending bool
-}
-
-func (c *Cursor) Ascending() bool { return c.ascending }
-
-// Seek moves the cursor to a position and returns the closest key/value pair.
-func (c *Cursor) SeekTo(seek int64) (key int64, value interface{}) {
-	// Seek bolt cursor.
-	seekBytes := u64tob(uint64(seek))
-	if c.cursor != nil {
-		c.buf.key, c.buf.value = c.cursor.Seek(seekBytes)
-	}
-
-	// Seek cache index.
-	c.index = sort.Search(len(c.cache), func(i int) bool {
-		return bytes.Compare(c.cache[i][0:8], seekBytes) != -1
-	})
-
-	// Search will return an index after the length of cache if the seek value is greater
-	// than all the values.  Clamp it to the end of the cache.
-	if !c.ascending && c.index >= len(c.cache) {
-		c.index = len(c.cache) - 1
-	}
-
-	c.prev = nil
-	return c.read()
-}
-
-// Next returns the next key/value pair from the cursor.
-func (c *Cursor) Next() (key int64, value interface{}) {
-	return c.read()
-}
-
-// read returns the next key/value in the cursor buffer or cache.
-func (c *Cursor) read() (key int64, value interface{}) {
-	// Continue skipping ahead through duplicate keys in the cache list.
-	var k, v []byte
-	for {
-		if c.ascending {
-			k, v = c.readForward()
-		} else {
-			k, v = c.readReverse()
-		}
-
-		// Exit loop if we're at the end of the cache or the next key is different.
-		if k == nil || !bytes.Equal(k, c.prev) {
-			break
-		}
-	}
-
-	// Save key so it's not re-read.
-	c.prev = k
-
-	// Exit if no keys left.
-	if k == nil {
-		return tsdb.EOF, nil
-	}
-
-	// Convert key to timestamp.
-	key = int64(btou64(k))
-
-	// Decode fields. Optimize for single field, if possible.
-	if len(c.fields) == 1 {
-		decValue, err := c.dec.DecodeByName(c.fields[0], v)
-		if err != nil {
-			return key, nil
-		}
-		return key, decValue
-	} else if len(c.fields) > 1 {
-		m, err := c.dec.DecodeFieldsWithNames(v)
-		if err != nil {
-			return key, nil
-		}
-		return key, m
-	} else {
-		return key, nil
-	}
-}
-
-// readForward returns the next key/value from the cursor and moves the current location forward.
-func (c *Cursor) readForward() (key, value []byte) {
-	// Read next value from the cursor.
-	if c.buf.key == nil && c.cursor != nil {
-		c.buf.key, c.buf.value = c.cursor.Next()
-	}
-
-	// Read from the buffer or cache, which ever is lower.
-	if c.buf.key != nil && (c.index >= len(c.cache) || bytes.Compare(c.buf.key, c.cache[c.index][0:8]) == -1) {
-		key, value = c.buf.key, c.buf.value
-		c.buf.key, c.buf.value = nil, nil
-	} else if c.index < len(c.cache) {
-		key, value = c.cache[c.index][0:8], c.cache[c.index][8:]
-		c.index++
-	} else {
-		key, value = nil, nil
-	}
-	return
-}
-
-// readReverse returns the next key/value from the cursor and moves the current location backwards.
-func (c *Cursor) readReverse() (key, value []byte) {
-	// Read prev value from the cursor.
-	if c.buf.key == nil && c.cursor != nil {
-		c.buf.key, c.buf.value = c.cursor.Prev()
-	}
-
-	// Read from the buffer or cache, which ever is lower.
-	if c.buf.key != nil && (c.index < 0 || bytes.Compare(c.buf.key, c.cache[c.index][0:8]) == 1) {
-		key, value = c.buf.key, c.buf.value
-		c.buf.key, c.buf.value = nil, nil
-	} else if c.index >= 0 && c.index < len(c.cache) {
-		key, value = c.cache[c.index][0:8], c.cache[c.index][8:]
-		c.index--
-	} else {
-		key, value = nil, nil
-	}
-	return
-}
-
-// WALPartitionN is the number of partitions in the write ahead log.
-const WALPartitionN = 8
-
-// WALPartition returns the partition number that key belongs to.
-func WALPartition(key []byte) uint8 {
-	h := fnv.New64a()
-	h.Write(key)
-	return uint8(h.Sum64() % WALPartitionN)
-}
-
-// marshalWALEntry encodes point data into a single byte slice.
-//
-// The format of the byte slice is:
-//
-//     uint64 timestamp
-//     uint32 key length
-//     []byte key
-//     []byte data
-//
-func marshalWALEntry(key []byte, timestamp int64, data []byte) []byte {
-	v := make([]byte, 8+4, 8+4+len(key)+len(data))
-	binary.BigEndian.PutUint64(v[0:8], uint64(timestamp))
-	binary.BigEndian.PutUint32(v[8:12], uint32(len(key)))
-	v = append(v, key...)
-	v = append(v, data...)
-	return v
-}
-
-// unmarshalWALEntry decodes a WAL entry into it's separate parts.
-// Returned byte slices point to the original slice.
-func unmarshalWALEntry(v []byte) (key []byte, timestamp int64, data []byte) {
-	keyLen := binary.BigEndian.Uint32(v[8:12])
-	key = v[12 : 12+keyLen]
-	timestamp = int64(binary.BigEndian.Uint64(v[0:8]))
-	data = v[12+keyLen:]
-	return
-}
-
-// marshalCacheEntry encodes the timestamp and data to a single byte slice.
-//
-// The format of the byte slice is:
-//
-//     uint64 timestamp
-//     []byte data
-//
-func marshalCacheEntry(timestamp int64, data []byte) []byte {
-	buf := make([]byte, 8, 8+len(data))
-	binary.BigEndian.PutUint64(buf[0:8], uint64(timestamp))
-	return append(buf, data...)
-}
-
-// unmarshalCacheEntry returns the timestamp and data from an encoded byte slice.
-func unmarshalCacheEntry(buf []byte) (timestamp int64, data []byte) {
-	timestamp = int64(binary.BigEndian.Uint64(buf[0:8]))
-	data = buf[8:]
-	return
-}
-
-// u64tob converts a uint64 into an 8-byte slice.
-func u64tob(v uint64) []byte {
-	b := make([]byte, 8)
-	binary.BigEndian.PutUint64(b, v)
-	return b
-}
-
-// btou64 converts an 8-byte slice to a uint64.
-func btou64(b []byte) uint64 { return binary.BigEndian.Uint64(b) }
-
-// byteSlices represents a sortable slice of byte slices.
-type byteSlices [][]byte
-
-func (a byteSlices) Len() int           { return len(a) }
-func (a byteSlices) Less(i, j int) bool { return bytes.Compare(a[i], a[j]) == -1 }
-func (a byteSlices) Swap(i, j int)      { a[i], a[j] = a[j], a[i] }
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/engine/b1/b1_test.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/engine/b1/b1_test.go
deleted file mode 100644
index 31b90344c..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/engine/b1/b1_test.go
+++ /dev/null
@@ -1,198 +0,0 @@
-package b1_test
-
-import (
-	"encoding/binary"
-	"io/ioutil"
-	"math"
-	"os"
-	"testing"
-	"time"
-
-	"github.com/influxdb/influxdb/influxql"
-	"github.com/influxdb/influxdb/models"
-	"github.com/influxdb/influxdb/tsdb"
-	"github.com/influxdb/influxdb/tsdb/engine/b1"
-)
-
-// Ensure points can be written to the engine and queried.
-func TestEngine_WritePoints(t *testing.T) {
-	e := OpenDefaultEngine()
-	defer e.Close()
-
-	// Create metadata.
-	mf := &tsdb.MeasurementFields{Fields: make(map[string]*tsdb.Field)}
-	mf.CreateFieldIfNotExists("value", influxql.Float, true)
-	seriesToCreate := []*tsdb.SeriesCreate{
-		{Series: tsdb.NewSeries(string(models.MakeKey([]byte("temperature"), nil)), nil)},
-	}
-
-	// Parse point.
-	points, err := models.ParsePointsWithPrecision([]byte("temperature value=100 1434059627"), time.Now().UTC(), "s")
-	if err != nil {
-		t.Fatal(err)
-	} else if data, err := mf.Codec.EncodeFields(points[0].Fields()); err != nil {
-		t.Fatal(err)
-	} else {
-		points[0].SetData(data)
-	}
-
-	// Write original value.
-	if err := e.WritePoints(points, map[string]*tsdb.MeasurementFields{"temperature": mf}, seriesToCreate); err != nil {
-		t.Fatal(err)
-	}
-
-	// Flush to disk.
-	if err := e.Flush(0); err != nil {
-		t.Fatal(err)
-	}
-
-	// Parse new point.
-	points, err = models.ParsePointsWithPrecision([]byte("temperature value=200 1434059627"), time.Now().UTC(), "s")
-	if err != nil {
-		t.Fatal(err)
-	} else if data, err := mf.Codec.EncodeFields(points[0].Fields()); err != nil {
-		t.Fatal(err)
-	} else {
-		points[0].SetData(data)
-	}
-
-	// Update existing value.
-	if err := e.WritePoints(points, nil, nil); err != nil {
-		t.Fatal(err)
-	}
-
-	// Ensure only the updated value is read.
-	tx := e.MustBegin(false)
-	defer tx.Rollback()
-
-	c := tx.Cursor("temperature", []string{"value"}, mf.Codec, true)
-	if k, v := c.SeekTo(0); k != 1434059627000000000 {
-		t.Fatalf("unexpected key: %#v", k)
-	} else if v == nil || v.(float64) != 200 {
-		t.Errorf("unexpected value: %#v", v)
-	}
-
-	if k, v := c.Next(); k != tsdb.EOF {
-		t.Fatalf("unexpected key/value: %#v / %#v", k, v)
-	}
-}
-
-// Ensure points can be written to the engine and queried in reverse order.
-func TestEngine_WritePoints_Reverse(t *testing.T) {
-	e := OpenDefaultEngine()
-	defer e.Close()
-
-	// Create metadata.
-	mf := &tsdb.MeasurementFields{Fields: make(map[string]*tsdb.Field)}
-	mf.CreateFieldIfNotExists("value", influxql.Float, true)
-	seriesToCreate := []*tsdb.SeriesCreate{
-		{Series: tsdb.NewSeries(string(models.MakeKey([]byte("temperature"), nil)), nil)},
-	}
-
-	// Parse point.
-	points, err := models.ParsePointsWithPrecision([]byte("temperature value=100 0"), time.Now().UTC(), "s")
-	if err != nil {
-		t.Fatal(err)
-	} else if data, err := mf.Codec.EncodeFields(points[0].Fields()); err != nil {
-		t.Fatal(err)
-	} else {
-		points[0].SetData(data)
-	}
-
-	// Write original value.
-	if err := e.WritePoints(points, map[string]*tsdb.MeasurementFields{"temperature": mf}, seriesToCreate); err != nil {
-		t.Fatal(err)
-	}
-
-	// Flush to disk.
-	if err := e.Flush(0); err != nil {
-		t.Fatal(err)
-	}
-
-	// Parse new point.
-	points, err = models.ParsePointsWithPrecision([]byte("temperature value=200 1"), time.Now().UTC(), "s")
-	if err != nil {
-		t.Fatal(err)
-	} else if data, err := mf.Codec.EncodeFields(points[0].Fields()); err != nil {
-		t.Fatal(err)
-	} else {
-		points[0].SetData(data)
-	}
-
-	// Write the new points existing value.
-	if err := e.WritePoints(points, nil, nil); err != nil {
-		t.Fatal(err)
-	}
-
-	// Ensure only the updated value is read.
-	tx := e.MustBegin(false)
-	defer tx.Rollback()
-
-	c := tx.Cursor("temperature", []string{"value"}, mf.Codec, false)
-	if k, _ := c.SeekTo(math.MaxInt64); k != time.Unix(1, 0).UnixNano() {
-		t.Fatalf("unexpected key: %v", k)
-	} else if k, v := c.Next(); k != time.Unix(0, 0).UnixNano() {
-		t.Fatalf("unexpected key: %v", k)
-	} else if v == nil || v.(float64) != 100 {
-		t.Errorf("unexpected value: %#v", v)
-	}
-
-	if k, v := c.Next(); k != tsdb.EOF {
-		t.Fatalf("unexpected key/value: %#v / %#v", k, v)
-	}
-}
-
-// Engine represents a test wrapper for b1.Engine.
-type Engine struct {
-	*b1.Engine
-}
-
-// NewEngine returns a new instance of Engine.
-func NewEngine(opt tsdb.EngineOptions) *Engine {
-	// Generate temporary file.
-	f, _ := ioutil.TempFile("", "b1-")
-	f.Close()
-	os.Remove(f.Name())
-
-	return &Engine{
-		Engine: b1.NewEngine(f.Name(), "", opt).(*b1.Engine),
-	}
-}
-
-// OpenEngine returns an opened instance of Engine. Panic on error.
-func OpenEngine(opt tsdb.EngineOptions) *Engine {
-	e := NewEngine(opt)
-	if err := e.Open(); err != nil {
-		panic(err)
-	}
-	return e
-}
-
-// OpenDefaultEngine returns an open Engine with default options.
-func OpenDefaultEngine() *Engine { return OpenEngine(tsdb.NewEngineOptions()) }
-
-// Close closes the engine and removes all data.
-func (e *Engine) Close() error {
-	e.Engine.Close()
-	os.RemoveAll(e.Path())
-	return nil
-}
-
-// MustBegin returns a new tranaction. Panic on error.
-func (e *Engine) MustBegin(writable bool) tsdb.Tx {
-	tx, err := e.Begin(writable)
-	if err != nil {
-		panic(err)
-	}
-	return tx
-}
-
-func u64tob(v uint64) []byte {
-	b := make([]byte, 8)
-	binary.BigEndian.PutUint64(b, v)
-	return b
-}
-
-func btou64(b []byte) uint64 {
-	return binary.BigEndian.Uint64(b)
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/engine/bz1/bz1.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/engine/bz1/bz1.go
deleted file mode 100644
index 72d19052a..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/engine/bz1/bz1.go
+++ /dev/null
@@ -1,878 +0,0 @@
-package bz1
-
-import (
-	"bytes"
-	"encoding/binary"
-	"encoding/json"
-	"errors"
-	"expvar"
-	"fmt"
-	"io"
-	"log"
-	"math"
-	"sort"
-	"sync"
-	"time"
-
-	"github.com/boltdb/bolt"
-	"github.com/golang/snappy"
-	"github.com/influxdb/influxdb"
-	"github.com/influxdb/influxdb/models"
-	"github.com/influxdb/influxdb/tsdb"
-	"github.com/influxdb/influxdb/tsdb/engine/wal"
-)
-
-var (
-	// ErrSeriesExists is returned when writing points to an existing series.
-	ErrSeriesExists = errors.New("series exists")
-)
-
-const (
-	// Format is the file format name of this engine.
-	Format = "bz1"
-)
-
-const (
-	statSlowInsert               = "slowInsert"
-	statPointsWrite              = "pointsWrite"
-	statPointsWriteDedupe        = "pointsWriteDedupe"
-	statBlocksWrite              = "blksWrite"
-	statBlocksWriteBytes         = "blksWriteBytes"
-	statBlocksWriteBytesCompress = "blksWriteBytesC"
-)
-
-func init() {
-	tsdb.RegisterEngine(Format, NewEngine)
-}
-
-const (
-	// DefaultBlockSize is the default size of uncompressed points blocks.
-	DefaultBlockSize = 4 * 1024 // 4KB
-)
-
-// Ensure Engine implements the interface.
-var _ tsdb.Engine = &Engine{}
-
-// Engine represents a storage engine with compressed blocks.
-type Engine struct {
-	mu   sync.Mutex
-	path string
-	db   *bolt.DB
-
-	// expvar-based statistics collection.
-	statMap *expvar.Map
-
-	// Write-ahead log storage.
-	WAL WAL
-
-	// Size of uncompressed points to write to a block.
-	BlockSize int
-}
-
-// WAL represents a write ahead log that can be queried
-type WAL interface {
-	WritePoints(points []models.Point, measurementFieldsToSave map[string]*tsdb.MeasurementFields, seriesToCreate []*tsdb.SeriesCreate) error
-	LoadMetadataIndex(index *tsdb.DatabaseIndex, measurementFields map[string]*tsdb.MeasurementFields) error
-	DeleteSeries(keys []string) error
-	Cursor(series string, fields []string, dec *tsdb.FieldCodec, ascending bool) tsdb.Cursor
-	Open() error
-	Close() error
-	Flush() error
-}
-
-// NewEngine returns a new instance of Engine.
-func NewEngine(path string, walPath string, opt tsdb.EngineOptions) tsdb.Engine {
-	// Configure statistics collection.
-	key := fmt.Sprintf("engine:%s:%s", opt.EngineVersion, path)
-	tags := map[string]string{"path": path, "version": opt.EngineVersion}
-	statMap := influxdb.NewStatistics(key, "engine", tags)
-
-	// create the writer with a directory of the same name as the shard, but with the wal extension
-	w := wal.NewLog(walPath)
-
-	w.ReadySeriesSize = opt.Config.WALReadySeriesSize
-	w.FlushColdInterval = time.Duration(opt.Config.WALFlushColdInterval)
-	w.MaxSeriesSize = opt.Config.WALMaxSeriesSize
-	w.CompactionThreshold = opt.Config.WALCompactionThreshold
-	w.PartitionSizeThreshold = opt.Config.WALPartitionSizeThreshold
-	w.ReadySeriesSize = opt.Config.WALReadySeriesSize
-	w.LoggingEnabled = opt.Config.WALLoggingEnabled
-
-	e := &Engine{
-		path: path,
-
-		statMap:   statMap,
-		BlockSize: DefaultBlockSize,
-		WAL:       w,
-	}
-
-	w.Index = e
-
-	return e
-}
-
-// Path returns the path the engine was opened with.
-func (e *Engine) Path() string { return e.path }
-
-// PerformMaintenance is for periodic maintenance of the store. A no-op for bz1
-func (e *Engine) PerformMaintenance() {}
-
-// Format returns the format type of this engine
-func (e *Engine) Format() tsdb.EngineFormat {
-	return tsdb.BZ1Format
-}
-
-// Open opens and initializes the engine.
-func (e *Engine) Open() error {
-	if err := func() error {
-		e.mu.Lock()
-		defer e.mu.Unlock()
-
-		// Open underlying storage.
-		db, err := bolt.Open(e.path, 0666, &bolt.Options{Timeout: 1 * time.Second})
-		if err != nil {
-			return err
-		}
-		e.db = db
-
-		// Initialize data file.
-		if err := e.db.Update(func(tx *bolt.Tx) error {
-			_, _ = tx.CreateBucketIfNotExists([]byte("points"))
-
-			// Set file format, if not set yet.
-			b, _ := tx.CreateBucketIfNotExists([]byte("meta"))
-			if v := b.Get([]byte("format")); v == nil {
-				if err := b.Put([]byte("format"), []byte(Format)); err != nil {
-					return fmt.Errorf("set format: %s", err)
-				}
-			}
-
-			return nil
-		}); err != nil {
-			return fmt.Errorf("init: %s", err)
-		}
-
-		return nil
-	}(); err != nil {
-		e.close()
-		return err
-	}
-
-	return nil
-}
-
-// Close closes the engine.
-func (e *Engine) Close() error {
-	e.mu.Lock()
-	defer e.mu.Unlock()
-
-	if err := e.WAL.Close(); err != nil {
-		return err
-	}
-
-	return e.close()
-}
-
-func (e *Engine) close() error {
-	if e.db != nil {
-		return e.db.Close()
-	}
-	return nil
-}
-
-// SetLogOutput is a no-op.
-func (e *Engine) SetLogOutput(w io.Writer) {}
-
-// LoadMetadataIndex loads the shard metadata into memory.
-func (e *Engine) LoadMetadataIndex(shard *tsdb.Shard, index *tsdb.DatabaseIndex, measurementFields map[string]*tsdb.MeasurementFields) error {
-	if err := e.db.View(func(tx *bolt.Tx) error {
-		// Load measurement metadata
-		fields, err := e.readFields(tx)
-		if err != nil {
-			return err
-		}
-		for k, mf := range fields {
-			m := index.CreateMeasurementIndexIfNotExists(string(k))
-			for name, _ := range mf.Fields {
-				m.SetFieldName(name)
-			}
-			mf.Codec = tsdb.NewFieldCodec(mf.Fields)
-			measurementFields[m.Name] = mf
-		}
-
-		// Load series metadata
-		series, err := e.readSeries(tx)
-		if err != nil {
-			return err
-		}
-
-		// Load the series into the in-memory index in sorted order to ensure
-		// it's always consistent for testing purposes
-		a := make([]string, 0, len(series))
-		for k, _ := range series {
-			a = append(a, k)
-		}
-		sort.Strings(a)
-		for _, key := range a {
-			s := series[key]
-			s.InitializeShards()
-			index.CreateSeriesIndexIfNotExists(tsdb.MeasurementFromSeriesKey(string(key)), s)
-		}
-		return nil
-	}); err != nil {
-		return err
-	}
-
-	// now flush the metadata that was in the WAL, but hadn't yet been flushed
-	if err := e.WAL.LoadMetadataIndex(index, measurementFields); err != nil {
-		return err
-	}
-
-	// finally open the WAL up
-	return e.WAL.Open()
-}
-
-// WritePoints writes metadata and point data into the engine.
-// Returns an error if new points are added to an existing key.
-func (e *Engine) WritePoints(points []models.Point, measurementFieldsToSave map[string]*tsdb.MeasurementFields, seriesToCreate []*tsdb.SeriesCreate) error {
-	// Write points to the WAL.
-	if err := e.WAL.WritePoints(points, measurementFieldsToSave, seriesToCreate); err != nil {
-		return fmt.Errorf("write points: %s", err)
-	}
-
-	return nil
-}
-
-// WriteIndex writes marshaled points to the engine's underlying index.
-func (e *Engine) WriteIndex(pointsByKey map[string][][]byte, measurementFieldsToSave map[string]*tsdb.MeasurementFields, seriesToCreate []*tsdb.SeriesCreate) error {
-	return e.db.Update(func(tx *bolt.Tx) error {
-		// Write series & field metadata.
-		if err := e.writeNewSeries(tx, seriesToCreate); err != nil {
-			return fmt.Errorf("write series: %s", err)
-		}
-		if err := e.writeNewFields(tx, measurementFieldsToSave); err != nil {
-			return fmt.Errorf("write fields: %s", err)
-		}
-
-		for key, values := range pointsByKey {
-			if err := e.writeIndex(tx, key, values); err != nil {
-				return fmt.Errorf("write: key=%x, err=%s", key, err)
-			}
-		}
-		return nil
-	})
-}
-
-func (e *Engine) writeNewFields(tx *bolt.Tx, measurementFieldsToSave map[string]*tsdb.MeasurementFields) error {
-	if len(measurementFieldsToSave) == 0 {
-		return nil
-	}
-
-	// read in all the previously saved fields
-	fields, err := e.readFields(tx)
-	if err != nil {
-		return err
-	}
-
-	// add the new ones or overwrite old ones
-	for name, mf := range measurementFieldsToSave {
-		fields[name] = mf
-	}
-
-	return e.writeFields(tx, fields)
-}
-
-func (e *Engine) writeFields(tx *bolt.Tx, fields map[string]*tsdb.MeasurementFields) error {
-	// compress and save everything
-	data, err := json.Marshal(fields)
-	if err != nil {
-		return err
-	}
-
-	return tx.Bucket([]byte("meta")).Put([]byte("fields"), snappy.Encode(nil, data))
-}
-
-func (e *Engine) readFields(tx *bolt.Tx) (map[string]*tsdb.MeasurementFields, error) {
-	fields := make(map[string]*tsdb.MeasurementFields)
-
-	b := tx.Bucket([]byte("meta")).Get([]byte("fields"))
-	if b == nil {
-		return fields, nil
-	}
-
-	data, err := snappy.Decode(nil, b)
-	if err != nil {
-		return nil, err
-	}
-
-	if err := json.Unmarshal(data, &fields); err != nil {
-		return nil, err
-	}
-
-	return fields, nil
-}
-
-func (e *Engine) writeNewSeries(tx *bolt.Tx, seriesToCreate []*tsdb.SeriesCreate) error {
-	if len(seriesToCreate) == 0 {
-		return nil
-	}
-
-	// read in previously saved series
-	series, err := e.readSeries(tx)
-	if err != nil {
-		return err
-	}
-
-	// add new ones, compress and save
-	for _, s := range seriesToCreate {
-		series[s.Series.Key] = s.Series
-	}
-
-	return e.writeSeries(tx, series)
-}
-
-func (e *Engine) writeSeries(tx *bolt.Tx, series map[string]*tsdb.Series) error {
-	data, err := json.Marshal(series)
-	if err != nil {
-		return err
-	}
-
-	return tx.Bucket([]byte("meta")).Put([]byte("series"), snappy.Encode(nil, data))
-}
-
-func (e *Engine) readSeries(tx *bolt.Tx) (map[string]*tsdb.Series, error) {
-	series := make(map[string]*tsdb.Series)
-
-	b := tx.Bucket([]byte("meta")).Get([]byte("series"))
-	if b == nil {
-		return series, nil
-	}
-
-	data, err := snappy.Decode(nil, b)
-	if err != nil {
-		return nil, err
-	}
-
-	if err := json.Unmarshal(data, &series); err != nil {
-		return nil, err
-	}
-
-	return series, nil
-}
-
-// writeIndex writes a set of points for a single key.
-func (e *Engine) writeIndex(tx *bolt.Tx, key string, a [][]byte) error {
-	// Ignore if there are no points.
-	if len(a) == 0 {
-		return nil
-	}
-	e.statMap.Add(statPointsWrite, int64(len(a)))
-
-	// Create or retrieve series bucket.
-	bkt, err := tx.Bucket([]byte("points")).CreateBucketIfNotExists([]byte(key))
-	if err != nil {
-		return fmt.Errorf("create series bucket: %s", err)
-	}
-	c := bkt.Cursor()
-
-	// Ensure the slice is sorted before retrieving the time range.
-	a = tsdb.DedupeEntries(a)
-	e.statMap.Add(statPointsWriteDedupe, int64(len(a)))
-
-	// Convert the raw time and byte slices to entries with lengths
-	for i, p := range a {
-		timestamp := int64(btou64(p[0:8]))
-		a[i] = MarshalEntry(timestamp, p[8:])
-	}
-
-	// Determine time range of new data.
-	tmin, tmax := int64(btou64(a[0][0:8])), int64(btou64(a[len(a)-1][0:8]))
-
-	// If tmin is after the last block then append new blocks.
-	//
-	// This is the optimized fast path. Otherwise we need to merge the points
-	// with existing blocks on disk and rewrite all the blocks for that range.
-	if k, v := c.Last(); k == nil {
-		bkt.FillPercent = 1.0
-		if err := e.writeBlocks(bkt, a); err != nil {
-			return fmt.Errorf("new blocks: %s", err)
-		}
-		return nil
-
-	} else if int64(btou64(v[0:8])) < tmin {
-		// Append new blocks if our time range is past the last on-disk time.
-		bkt.FillPercent = 1.0
-		if err := e.writeBlocks(bkt, a); err != nil {
-			return fmt.Errorf("append blocks: %s", err)
-		}
-		return nil
-	}
-
-	// Generate map of inserted keys.
-	m := make(map[int64]struct{})
-	for _, b := range a {
-		m[int64(btou64(b[0:8]))] = struct{}{}
-	}
-
-	// If time range overlaps existing blocks then unpack full range and reinsert.
-	var existing [][]byte
-	for k, v := c.First(); k != nil; k, v = c.Next() {
-		// Determine block range.
-		bmin, bmax := int64(btou64(k)), int64(btou64(v[0:8]))
-
-		// Skip over all blocks before the time range.
-		// Exit once we reach a block that is beyond our time range.
-		if bmax < tmin {
-			continue
-		} else if bmin > tmax {
-			break
-		}
-
-		// Decode block.
-		buf, err := snappy.Decode(nil, v[8:])
-		if err != nil {
-			return fmt.Errorf("decode block: %s", err)
-		}
-
-		// Copy out any entries that aren't being overwritten.
-		for _, entry := range SplitEntries(buf) {
-			if _, ok := m[int64(btou64(entry[0:8]))]; !ok {
-				existing = append(existing, entry)
-			}
-		}
-
-		// Delete block in database.
-		c.Delete()
-	}
-
-	// Merge entries before rewriting.
-	a = append(existing, a...)
-	sort.Sort(tsdb.ByteSlices(a))
-
-	// Rewrite points to new blocks.
-	if err := e.writeBlocks(bkt, a); err != nil {
-		return fmt.Errorf("rewrite blocks: %s", err)
-	}
-
-	return nil
-}
-
-// writeBlocks writes point data to the bucket in blocks.
-func (e *Engine) writeBlocks(bkt *bolt.Bucket, a [][]byte) error {
-	var block []byte
-
-	// Group points into blocks by size.
-	tmin, tmax := int64(math.MaxInt64), int64(math.MinInt64)
-	for i, p := range a {
-		// Update block time range.
-		timestamp := int64(btou64(p[0:8]))
-		if timestamp < tmin {
-			tmin = timestamp
-		}
-		if timestamp > tmax {
-			tmax = timestamp
-		}
-
-		// Append point to the end of the block.
-		block = append(block, p...)
-
-		// If the block is larger than the target block size or this is the
-		// last point then flush the block to the bucket.
-		if len(block) >= e.BlockSize || i == len(a)-1 {
-			e.statMap.Add(statBlocksWrite, 1)
-			e.statMap.Add(statBlocksWriteBytes, int64(len(block)))
-
-			// Encode block in the following format:
-			//   tmax int64
-			//   data []byte (snappy compressed)
-			value := append(u64tob(uint64(tmax)), snappy.Encode(nil, block)...)
-
-			// Write block to the bucket.
-			if err := bkt.Put(u64tob(uint64(tmin)), value); err != nil {
-				return fmt.Errorf("put: ts=%d-%d, err=%s", tmin, tmax, err)
-			}
-			e.statMap.Add(statBlocksWriteBytesCompress, int64(len(value)))
-
-			// Reset the block & time range.
-			block = nil
-			tmin, tmax = int64(math.MaxInt64), int64(math.MinInt64)
-		}
-	}
-
-	return nil
-}
-
-// DeleteSeries deletes the series from the engine.
-func (e *Engine) DeleteSeries(keys []string) error {
-	// remove it from the WAL first
-	if err := e.WAL.DeleteSeries(keys); err != nil {
-		return err
-	}
-
-	return e.db.Update(func(tx *bolt.Tx) error {
-		series, err := e.readSeries(tx)
-		if err != nil {
-			return err
-		}
-		for _, k := range keys {
-			delete(series, k)
-			if err := tx.Bucket([]byte("points")).DeleteBucket([]byte(k)); err != nil && err != bolt.ErrBucketNotFound {
-				return fmt.Errorf("delete series data: %s", err)
-			}
-		}
-
-		return e.writeSeries(tx, series)
-	})
-}
-
-// DeleteMeasurement deletes a measurement and all related series.
-func (e *Engine) DeleteMeasurement(name string, seriesKeys []string) error {
-	// remove from the WAL first so it won't get flushed after removing from Bolt
-	if err := e.WAL.DeleteSeries(seriesKeys); err != nil {
-		return err
-	}
-
-	return e.db.Update(func(tx *bolt.Tx) error {
-		fields, err := e.readFields(tx)
-		if err != nil {
-			return err
-		}
-		delete(fields, name)
-		if err := e.writeFields(tx, fields); err != nil {
-			return err
-		}
-
-		series, err := e.readSeries(tx)
-		if err != nil {
-			return err
-		}
-		for _, k := range seriesKeys {
-			delete(series, k)
-			if err := tx.Bucket([]byte("points")).DeleteBucket([]byte(k)); err != nil && err != bolt.ErrBucketNotFound {
-				return fmt.Errorf("delete series data: %s", err)
-			}
-		}
-
-		return e.writeSeries(tx, series)
-	})
-}
-
-// SeriesCount returns the number of series buckets on the shard.
-func (e *Engine) SeriesCount() (n int, err error) {
-	err = e.db.View(func(tx *bolt.Tx) error {
-		c := tx.Bucket([]byte("points")).Cursor()
-		for k, _ := c.First(); k != nil; k, _ = c.Next() {
-			n++
-		}
-		return nil
-	})
-	return
-}
-
-// Begin starts a new transaction on the engine.
-func (e *Engine) Begin(writable bool) (tsdb.Tx, error) {
-	tx, err := e.db.Begin(writable)
-	if err != nil {
-		return nil, err
-	}
-	return &Tx{Tx: tx, engine: e, wal: e.WAL}, nil
-}
-
-// Stats returns internal statistics for the engine.
-func (e *Engine) Stats() (stats Stats, err error) {
-	err = e.db.View(func(tx *bolt.Tx) error {
-		stats.Size = tx.Size()
-		return nil
-	})
-	return stats, err
-}
-
-// SeriesBucketStats returns internal BoltDB stats for a series bucket.
-func (e *Engine) SeriesBucketStats(key string) (stats bolt.BucketStats, err error) {
-	err = e.db.View(func(tx *bolt.Tx) error {
-		bkt := tx.Bucket([]byte("points")).Bucket([]byte(key))
-		if bkt != nil {
-			stats = bkt.Stats()
-		}
-		return nil
-	})
-	return stats, err
-}
-
-// WriteTo writes the length and contents of the engine to w.
-func (e *Engine) WriteTo(w io.Writer) (n int64, err error) {
-	tx, err := e.db.Begin(false)
-	if err != nil {
-		return 0, err
-	}
-	defer tx.Rollback()
-
-	// Write size.
-	if err := binary.Write(w, binary.BigEndian, uint64(tx.Size())); err != nil {
-		return 0, err
-	}
-
-	// Write data.
-	n, err = tx.WriteTo(w)
-	n += 8 // size header
-	return
-}
-
-// Stats represents internal engine statistics.
-type Stats struct {
-	Size int64 // BoltDB data size
-}
-
-// Tx represents a transaction.
-type Tx struct {
-	*bolt.Tx
-	engine *Engine
-	wal    WAL
-}
-
-// Cursor returns an iterator for a key.
-func (tx *Tx) Cursor(series string, fields []string, dec *tsdb.FieldCodec, ascending bool) tsdb.Cursor {
-	walCursor := tx.wal.Cursor(series, fields, dec, ascending)
-
-	// Retrieve points bucket. Ignore if there is no bucket.
-	b := tx.Bucket([]byte("points")).Bucket([]byte(series))
-	if b == nil {
-		return walCursor
-	}
-
-	c := &Cursor{
-		cursor:    b.Cursor(),
-		fields:    fields,
-		dec:       dec,
-		ascending: ascending,
-	}
-
-	if !ascending {
-		c.last()
-	}
-
-	return tsdb.MultiCursor(walCursor, c)
-}
-
-// Cursor provides ordered iteration across a series.
-type Cursor struct {
-	cursor       *bolt.Cursor
-	buf          []byte // uncompressed buffer
-	off          int    // buffer offset
-	ascending    bool
-	fieldIndices []int
-	index        int
-
-	fields []string
-	dec    *tsdb.FieldCodec
-}
-
-func (c *Cursor) last() {
-	_, v := c.cursor.Last()
-	c.setBuf(v)
-}
-
-func (c *Cursor) Ascending() bool { return c.ascending }
-
-// Seek moves the cursor to a position and returns the closest key/value pair.
-func (c *Cursor) SeekTo(seek int64) (key int64, value interface{}) {
-	seekBytes := u64tob(uint64(seek))
-
-	// Move cursor to appropriate block and set to buffer.
-	k, v := c.cursor.Seek(seekBytes)
-	if v == nil { // get the last block, it might have this time
-		_, v = c.cursor.Last()
-	} else if seek < int64(btou64(k)) { // the seek key is less than this block, go back one and check
-		_, v = c.cursor.Prev()
-
-		// if the previous block max time is less than the seek value, reset to where we were originally
-		if v == nil || seek > int64(btou64(v[0:8])) {
-			_, v = c.cursor.Seek(seekBytes)
-		}
-	}
-	c.setBuf(v)
-
-	// Read current block up to seek position.
-	c.seekBuf(seekBytes)
-
-	// Return current entry.
-	return c.read()
-}
-
-// seekBuf moves the cursor to a position within the current buffer.
-func (c *Cursor) seekBuf(seek []byte) (key, value []byte) {
-	for {
-		// Slice off the current entry.
-		buf := c.buf[c.off:]
-
-		// Exit if current entry's timestamp is on or after the seek.
-		if len(buf) == 0 {
-			return
-		}
-
-		if c.ascending && bytes.Compare(buf[0:8], seek) != -1 {
-			return
-		} else if !c.ascending && bytes.Compare(buf[0:8], seek) != 1 {
-			return
-		}
-
-		if c.ascending {
-			// Otherwise skip ahead to the next entry.
-			c.off += entryHeaderSize + entryDataSize(buf)
-		} else {
-			c.index -= 1
-			if c.index < 0 {
-				return
-			}
-			c.off = c.fieldIndices[c.index]
-		}
-	}
-}
-
-// Next returns the next key/value pair from the cursor.
-func (c *Cursor) Next() (key int64, value interface{}) {
-	// Ignore if there is no buffer.
-	if len(c.buf) == 0 {
-		return tsdb.EOF, nil
-	}
-
-	if c.ascending {
-		// Move forward to next entry.
-		c.off += entryHeaderSize + entryDataSize(c.buf[c.off:])
-	} else {
-		// If we've move past the beginning of buf, grab the previous block
-		if c.index < 0 {
-			_, v := c.cursor.Prev()
-			c.setBuf(v)
-		}
-
-		if len(c.fieldIndices) > 0 {
-			c.off = c.fieldIndices[c.index]
-		}
-		c.index -= 1
-	}
-
-	// If no items left then read first item from next block.
-	if c.off >= len(c.buf) {
-		_, v := c.cursor.Next()
-		c.setBuf(v)
-	}
-
-	return c.read()
-}
-
-// setBuf saves a compressed block to the buffer.
-func (c *Cursor) setBuf(block []byte) {
-	// Clear if the block is empty.
-	if len(block) == 0 {
-		c.buf, c.off, c.fieldIndices, c.index = c.buf[0:0], 0, c.fieldIndices[0:0], 0
-		return
-	}
-
-	// Otherwise decode block into buffer.
-	// Skip over the first 8 bytes since they are the max timestamp.
-	buf, err := snappy.Decode(nil, block[8:])
-	if err != nil {
-		c.buf = c.buf[0:0]
-		log.Printf("block decode error: %s", err)
-	}
-
-	if c.ascending {
-		c.buf, c.off = buf, 0
-	} else {
-		c.buf, c.off = buf, 0
-
-		// Buf contains multiple fields packed into a byte slice with timestamp
-		// and data lengths.  We need to build an index into this byte slice that
-		// tells us where each field block is in buf so we can iterate backward without
-		// rescanning the buf each time Next is called.  Forward iteration does not
-		// need this because we know the entries lenghth and the header size so we can
-		// skip forward that many bytes.
-		c.fieldIndices = []int{}
-		for {
-			if c.off >= len(buf) {
-				break
-			}
-
-			c.fieldIndices = append(c.fieldIndices, c.off)
-			c.off += entryHeaderSize + entryDataSize(buf[c.off:])
-		}
-
-		c.off = c.fieldIndices[len(c.fieldIndices)-1]
-		c.index = len(c.fieldIndices) - 1
-	}
-}
-
-// read reads the current key and value from the current block.
-func (c *Cursor) read() (key int64, value interface{}) {
-	// Return nil if the offset is at the end of the buffer.
-	if c.off >= len(c.buf) {
-		return tsdb.EOF, nil
-	}
-
-	// Otherwise read the current entry.
-	buf := c.buf[c.off:]
-	dataSize := entryDataSize(buf)
-
-	return wal.DecodeKeyValue(c.fields, c.dec, buf[0:8], buf[entryHeaderSize:entryHeaderSize+dataSize])
-}
-
-// MarshalEntry encodes point data into a single byte slice.
-//
-// The format of the byte slice is:
-//
-//     uint64 timestamp
-//     uint32 data length
-//     []byte data
-//
-func MarshalEntry(timestamp int64, data []byte) []byte {
-	v := make([]byte, 8+4, 8+4+len(data))
-	binary.BigEndian.PutUint64(v[0:8], uint64(timestamp))
-	binary.BigEndian.PutUint32(v[8:12], uint32(len(data)))
-	v = append(v, data...)
-	return v
-}
-
-// UnmarshalEntry decodes an entry into it's separate parts.
-// Returns the timestamp, data and the number of bytes read.
-// Returned byte slices point to the original slice.
-func UnmarshalEntry(v []byte) (timestamp int64, data []byte, n int) {
-	timestamp = int64(binary.BigEndian.Uint64(v[0:8]))
-	dataLen := binary.BigEndian.Uint32(v[8:12])
-	data = v[12+dataLen:]
-	return timestamp, data, 12 + int(dataLen)
-}
-
-// SplitEntries returns a slice of individual entries from one continuous set.
-func SplitEntries(b []byte) [][]byte {
-	var a [][]byte
-	for {
-		// Exit if there's no more data left.
-		if len(b) == 0 {
-			return a
-		}
-
-		// Create slice that points to underlying entry.
-		dataSize := entryDataSize(b)
-		a = append(a, b[0:entryHeaderSize+dataSize])
-
-		// Move buffer forward.
-		b = b[entryHeaderSize+dataSize:]
-	}
-}
-
-// entryHeaderSize is the number of bytes required for the header.
-const entryHeaderSize = 8 + 4
-
-// entryDataSize returns the size of an entry's data field, in bytes.
-func entryDataSize(v []byte) int { return int(binary.BigEndian.Uint32(v[8:12])) }
-
-// u64tob converts a uint64 into an 8-byte slice.
-func u64tob(v uint64) []byte {
-	b := make([]byte, 8)
-	binary.BigEndian.PutUint64(b, v)
-	return b
-}
-
-// btou64 converts an 8-byte slice into an uint64.
-func btou64(b []byte) uint64 { return binary.BigEndian.Uint64(b) }
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/engine/bz1/bz1_test.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/engine/bz1/bz1_test.go
deleted file mode 100644
index 6a73478ea..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/engine/bz1/bz1_test.go
+++ /dev/null
@@ -1,486 +0,0 @@
-package bz1_test
-
-import (
-	"encoding/binary"
-	"errors"
-	"io/ioutil"
-	"math"
-	"os"
-	"path/filepath"
-	"reflect"
-	"strings"
-	"testing"
-	"time"
-
-	"github.com/influxdb/influxdb/influxql"
-	"github.com/influxdb/influxdb/models"
-	"github.com/influxdb/influxdb/tsdb"
-	"github.com/influxdb/influxdb/tsdb/engine/bz1"
-)
-
-// Ensure the engine can write series metadata and reload it.
-func TestEngine_LoadMetadataIndex_Series(t *testing.T) {
-	e := OpenDefaultEngine()
-	defer e.Close()
-
-	// Setup mock that writes the index
-	seriesToCreate := []*tsdb.SeriesCreate{
-		{Series: tsdb.NewSeries(string(models.MakeKey([]byte("cpu"), map[string]string{"host": "server0"})), map[string]string{"host": "server0"})},
-		{Series: tsdb.NewSeries(string(models.MakeKey([]byte("cpu"), map[string]string{"host": "server1"})), map[string]string{"host": "server1"})},
-		{Series: tsdb.NewSeries("series with spaces", nil)},
-	}
-	e.PointsWriter.WritePointsFn = func(a []models.Point) error { return e.WriteIndex(nil, nil, seriesToCreate) }
-
-	// Write series metadata.
-	if err := e.WritePoints(nil, nil, seriesToCreate); err != nil {
-		t.Fatal(err)
-	}
-
-	// Load metadata index.
-	index := tsdb.NewDatabaseIndex()
-	if err := e.LoadMetadataIndex(nil, index, make(map[string]*tsdb.MeasurementFields)); err != nil {
-		t.Fatal(err)
-	}
-
-	// Verify index is correct.
-	if m := index.Measurement("cpu"); m == nil {
-		t.Fatal("measurement not found")
-	} else if s := m.SeriesByID(1); s.Key != "cpu,host=server0" || !reflect.DeepEqual(s.Tags, map[string]string{"host": "server0"}) {
-		t.Fatalf("unexpected series: %q / %#v", s.Key, s.Tags)
-	} else if s = m.SeriesByID(2); s.Key != "cpu,host=server1" || !reflect.DeepEqual(s.Tags, map[string]string{"host": "server1"}) {
-		t.Fatalf("unexpected series: %q / %#v", s.Key, s.Tags)
-	}
-
-	if m := index.Measurement("series with spaces"); m == nil {
-		t.Fatal("measurement not found")
-	} else if s := m.SeriesByID(3); s.Key != "series with spaces" {
-		t.Fatalf("unexpected series: %q", s.Key)
-	}
-}
-
-// Ensure the engine can write field metadata and reload it.
-func TestEngine_LoadMetadataIndex_Fields(t *testing.T) {
-	e := OpenDefaultEngine()
-	defer e.Close()
-
-	// Setup mock that writes the index
-	fields := map[string]*tsdb.MeasurementFields{
-		"cpu": &tsdb.MeasurementFields{
-			Fields: map[string]*tsdb.Field{
-				"value": &tsdb.Field{ID: 0, Name: "value"},
-			},
-		},
-	}
-	e.PointsWriter.WritePointsFn = func(a []models.Point) error { return e.WriteIndex(nil, fields, nil) }
-
-	// Write series metadata.
-	if err := e.WritePoints(nil, fields, nil); err != nil {
-		t.Fatal(err)
-	}
-
-	// Load metadata index.
-	mfs := make(map[string]*tsdb.MeasurementFields)
-	if err := e.LoadMetadataIndex(nil, tsdb.NewDatabaseIndex(), mfs); err != nil {
-		t.Fatal(err)
-	}
-
-	// Verify measurement field is correct.
-	if mf := mfs["cpu"]; mf == nil {
-		t.Fatal("measurement fields not found")
-	} else if !reflect.DeepEqual(mf.Fields, map[string]*tsdb.Field{"value": &tsdb.Field{ID: 0, Name: "value"}}) {
-		t.Fatalf("unexpected fields: %#v", mf.Fields)
-	}
-}
-
-// Ensure the engine can write points to storage.
-func TestEngine_WritePoints_PointsWriter(t *testing.T) {
-	e := OpenDefaultEngine()
-	defer e.Close()
-
-	// Points to be inserted.
-	points := []models.Point{
-		models.MustNewPoint("cpu", models.Tags{}, models.Fields{}, time.Unix(0, 1)),
-		models.MustNewPoint("cpu", models.Tags{}, models.Fields{}, time.Unix(0, 0)),
-		models.MustNewPoint("cpu", models.Tags{}, models.Fields{}, time.Unix(1, 0)),
-
-		models.MustNewPoint("cpu", models.Tags{"host": "serverA"}, models.Fields{}, time.Unix(0, 0)),
-	}
-
-	// Mock points writer to ensure points are passed through.
-	var invoked bool
-	e.PointsWriter.WritePointsFn = func(a []models.Point) error {
-		invoked = true
-		if !reflect.DeepEqual(points, a) {
-			t.Fatalf("unexpected points: %#v", a)
-		}
-		return nil
-	}
-
-	// Write points against two separate series.
-	if err := e.WritePoints(points, nil, nil); err != nil {
-		t.Fatal(err)
-	} else if !invoked {
-		t.Fatal("PointsWriter.WritePoints() not called")
-	}
-}
-
-// Ensure the engine can return errors from the points writer.
-func TestEngine_WritePoints_ErrPointsWriter(t *testing.T) {
-	e := OpenDefaultEngine()
-	defer e.Close()
-
-	// Ensure points writer returns an error.
-	e.PointsWriter.WritePointsFn = func(a []models.Point) error { return errors.New("marker") }
-
-	// Write to engine.
-	if err := e.WritePoints(nil, nil, nil); err == nil || err.Error() != `write points: marker` {
-		t.Fatal(err)
-	}
-}
-
-// Ensure the engine can write points to the index.
-func TestEngine_WriteIndex_Append(t *testing.T) {
-	e := OpenDefaultEngine()
-	defer e.Close()
-
-	// Create codec.
-	codec := tsdb.NewFieldCodec(map[string]*tsdb.Field{
-		"value": {ID: uint8(1), Name: "value", Type: influxql.Float},
-	})
-
-	// Append points to index.
-	if err := e.WriteIndex(map[string][][]byte{
-		"cpu": [][]byte{
-			append(u64tob(1), MustEncodeFields(codec, models.Fields{"value": float64(10)})...),
-			append(u64tob(2), MustEncodeFields(codec, models.Fields{"value": float64(20)})...),
-		},
-		"mem": [][]byte{
-			append(u64tob(0), MustEncodeFields(codec, models.Fields{"value": float64(30)})...),
-		},
-	}, nil, nil); err != nil {
-		t.Fatal(err)
-	}
-
-	// Start transaction.
-	tx := e.MustBegin(false)
-	defer tx.Rollback()
-
-	// Iterate over "cpu" series.
-	c := tx.Cursor("cpu", []string{"value"}, codec, true)
-	if k, v := c.SeekTo(0); k != 1 || v.(float64) != float64(10) {
-		t.Fatalf("unexpected key/value: %x / %x", k, v)
-	} else if k, v = c.Next(); k != 2 || v.(float64) != float64(20) {
-		t.Fatalf("unexpected key/value: %x / %x", k, v)
-	} else if k, _ = c.Next(); k != tsdb.EOF {
-		t.Fatalf("unexpected key/value: %x / %x", k, v)
-	}
-
-	// Iterate over "mem" series.
-	c = tx.Cursor("mem", []string{"value"}, codec, true)
-	if k, v := c.SeekTo(0); k != 0 || v.(float64) != float64(30) {
-		t.Fatalf("unexpected key/value: %x / %x", k, v)
-	} else if k, _ = c.Next(); k != tsdb.EOF {
-		t.Fatalf("unexpected key/value: %x / %x", k, v)
-	}
-}
-
-// Ensure the engine can rewrite blocks that contain the new point range.
-func TestEngine_WriteIndex_Insert(t *testing.T) {
-	e := OpenDefaultEngine()
-	defer e.Close()
-
-	// Create codec.
-	codec := tsdb.NewFieldCodec(map[string]*tsdb.Field{
-		"value": {ID: uint8(1), Name: "value", Type: influxql.Float},
-	})
-
-	// Write initial points to index.
-	if err := e.WriteIndex(map[string][][]byte{
-		"cpu": [][]byte{
-			append(u64tob(10), MustEncodeFields(codec, models.Fields{"value": float64(10)})...),
-			append(u64tob(20), MustEncodeFields(codec, models.Fields{"value": float64(20)})...),
-			append(u64tob(30), MustEncodeFields(codec, models.Fields{"value": float64(30)})...),
-		},
-	}, nil, nil); err != nil {
-		t.Fatal(err)
-	}
-
-	// Write overlapping points to index.
-	if err := e.WriteIndex(map[string][][]byte{
-		"cpu": [][]byte{
-			append(u64tob(9), MustEncodeFields(codec, models.Fields{"value": float64(9)})...),
-			append(u64tob(10), MustEncodeFields(codec, models.Fields{"value": float64(255)})...),
-			append(u64tob(25), MustEncodeFields(codec, models.Fields{"value": float64(25)})...),
-			append(u64tob(31), MustEncodeFields(codec, models.Fields{"value": float64(31)})...),
-		},
-	}, nil, nil); err != nil {
-		t.Fatal(err)
-	}
-
-	// Write overlapping points to index again.
-	if err := e.WriteIndex(map[string][][]byte{
-		"cpu": [][]byte{
-			append(u64tob(31), MustEncodeFields(codec, models.Fields{"value": float64(255)})...),
-		},
-	}, nil, nil); err != nil {
-		t.Fatal(err)
-	}
-
-	// Start transaction.
-	tx := e.MustBegin(false)
-	defer tx.Rollback()
-
-	// Iterate over "cpu" series.
-	c := tx.Cursor("cpu", []string{"value"}, codec, true)
-	if k, v := c.SeekTo(0); k != 9 || v.(float64) != float64(9) {
-		t.Fatalf("unexpected key/value: %x / %x", k, v)
-	} else if k, v = c.Next(); k != 10 || v.(float64) != float64(255) {
-		t.Fatalf("unexpected key/value: %x / %x", k, v)
-	} else if k, v = c.Next(); k != 20 || v.(float64) != float64(20) {
-		t.Fatalf("unexpected key/value: %x / %x", k, v)
-	} else if k, v = c.Next(); k != 25 || v.(float64) != float64(25) {
-		t.Fatalf("unexpected key/value: %x / %x", k, v)
-	} else if k, v = c.Next(); k != 30 || v.(float64) != float64(30) {
-		t.Fatalf("unexpected key/value: %x / %x", k, v)
-	} else if k, v = c.Next(); k != 31 || v.(float64) != float64(255) {
-		t.Fatalf("unexpected key/value: %x / %x", k, v)
-	}
-}
-
-// Ensure the engine can rewrite blocks that contain the new point range.
-func TestEngine_Cursor_Reverse(t *testing.T) {
-	e := OpenDefaultEngine()
-	defer e.Close()
-
-	// Create codec.
-	codec := tsdb.NewFieldCodec(map[string]*tsdb.Field{
-		"value": {ID: uint8(1), Name: "value", Type: influxql.Float},
-	})
-
-	// Write initial points to index.
-	if err := e.WriteIndex(map[string][][]byte{
-		"cpu": [][]byte{
-			append(u64tob(10), MustEncodeFields(codec, models.Fields{"value": float64(10)})...),
-			append(u64tob(20), MustEncodeFields(codec, models.Fields{"value": float64(20)})...),
-			append(u64tob(30), MustEncodeFields(codec, models.Fields{"value": float64(30)})...),
-		},
-	}, nil, nil); err != nil {
-		t.Fatal(err)
-	}
-
-	// Write overlapping points to index.
-	if err := e.WriteIndex(map[string][][]byte{
-		"cpu": [][]byte{
-			append(u64tob(9), MustEncodeFields(codec, models.Fields{"value": float64(9)})...),
-			append(u64tob(10), MustEncodeFields(codec, models.Fields{"value": float64(255)})...),
-			append(u64tob(25), MustEncodeFields(codec, models.Fields{"value": float64(25)})...),
-			append(u64tob(31), MustEncodeFields(codec, models.Fields{"value": float64(31)})...),
-		},
-	}, nil, nil); err != nil {
-		t.Fatal(err)
-	}
-
-	// Write overlapping points to index again.
-	if err := e.WriteIndex(map[string][][]byte{
-		"cpu": [][]byte{
-			append(u64tob(31), MustEncodeFields(codec, models.Fields{"value": float64(255)})...),
-		},
-	}, nil, nil); err != nil {
-		t.Fatal(err)
-	}
-
-	// Start transaction.
-	tx := e.MustBegin(false)
-	defer tx.Rollback()
-
-	// Iterate over "cpu" series.
-	c := tx.Cursor("cpu", []string{"value"}, codec, false)
-	if k, v := c.SeekTo(math.MaxInt64); k != 31 || v.(float64) != float64(255) {
-		t.Fatalf("unexpected key/value: %x / %x", k, v)
-	} else if k, v = c.Next(); k != 30 || v.(float64) != float64(30) {
-		t.Fatalf("unexpected key/value: %x / %x", k, v)
-	} else if k, v = c.Next(); k != 25 || v.(float64) != float64(25) {
-		t.Fatalf("unexpected key/value: %x / %x", k, v)
-	} else if k, v = c.Next(); k != 20 || v.(float64) != float64(20) {
-		t.Fatalf("unexpected key/value: %x / %x", k, v)
-	} else if k, v = c.Next(); k != 10 || v.(float64) != float64(255) {
-		t.Fatalf("unexpected key/value: %x / %x", k, v)
-	} else if k, v = c.SeekTo(0); k != 9 || v.(float64) != float64(9) {
-		t.Fatalf("unexpected key/value: %x / %x", k, v)
-	}
-}
-
-// Ensure that the engine properly seeks to a block when the seek value is in the middle.
-func TestEngine_WriteIndex_SeekAgainstInBlockValue(t *testing.T) {
-	e := OpenDefaultEngine()
-	defer e.Close()
-
-	// Create codec.
-	codec := tsdb.NewFieldCodec(map[string]*tsdb.Field{
-		"value": {ID: uint8(1), Name: "value", Type: influxql.String},
-	})
-
-	// make sure we have data split across two blocks
-	dataSize := (bz1.DefaultBlockSize - 16) / 2
-	data := strings.Repeat("*", dataSize)
-
-	// Write initial points to index.
-	if err := e.WriteIndex(map[string][][]byte{
-		"cpu": [][]byte{
-			append(u64tob(10), MustEncodeFields(codec, models.Fields{"value": data})...),
-			append(u64tob(20), MustEncodeFields(codec, models.Fields{"value": data})...),
-			append(u64tob(30), MustEncodeFields(codec, models.Fields{"value": data})...),
-			append(u64tob(40), MustEncodeFields(codec, models.Fields{"value": data})...),
-		},
-	}, nil, nil); err != nil {
-		t.Fatal(err)
-	}
-
-	// Start transaction.
-	tx := e.MustBegin(false)
-	defer tx.Rollback()
-
-	// Ensure that we can seek to a block in the middle
-	c := tx.Cursor("cpu", []string{"value"}, codec, true)
-	if k, _ := c.SeekTo(15); k != 20 {
-		t.Fatalf("expected to seek to time 20, but got %d", k)
-	}
-	// Ensure that we can seek to the block on the end
-	if k, _ := c.SeekTo(35); k != 40 {
-		t.Fatalf("expected to seek to time 40, but got %d", k)
-	}
-}
-
-// Ensure the engine ignores writes without keys.
-func TestEngine_WriteIndex_NoKeys(t *testing.T) {
-	e := OpenDefaultEngine()
-	defer e.Close()
-	if err := e.WriteIndex(nil, nil, nil); err != nil {
-		t.Fatal(err)
-	}
-}
-
-// Ensure the engine ignores writes without points in a key.
-func TestEngine_WriteIndex_NoPoints(t *testing.T) {
-	e := OpenDefaultEngine()
-	defer e.Close()
-	if err := e.WriteIndex(map[string][][]byte{"cpu": nil}, nil, nil); err != nil {
-		t.Fatal(err)
-	}
-}
-
-// Engine represents a test wrapper for bz1.Engine.
-type Engine struct {
-	*bz1.Engine
-	PointsWriter EnginePointsWriter
-}
-
-// NewEngine returns a new instance of Engine.
-func NewEngine(opt tsdb.EngineOptions) *Engine {
-	// Generate temporary file.
-	f, _ := ioutil.TempFile("", "bz1-")
-	f.Close()
-	os.Remove(f.Name())
-	walPath := filepath.Join(f.Name(), "wal")
-
-	// Create test wrapper and attach mocks.
-	e := &Engine{
-		Engine: bz1.NewEngine(f.Name(), walPath, opt).(*bz1.Engine),
-	}
-	e.Engine.WAL = &e.PointsWriter
-	return e
-}
-
-// OpenEngine returns an opened instance of Engine. Panic on error.
-func OpenEngine(opt tsdb.EngineOptions) *Engine {
-	e := NewEngine(opt)
-	if err := e.Open(); err != nil {
-		panic(err)
-	}
-	return e
-}
-
-// OpenDefaultEngine returns an open Engine with default options.
-func OpenDefaultEngine() *Engine { return OpenEngine(tsdb.NewEngineOptions()) }
-
-// Close closes the engine and removes all data.
-func (e *Engine) Close() error {
-	e.Engine.Close()
-	os.RemoveAll(e.Path())
-	return nil
-}
-
-// MustBegin returns a new tranaction. Panic on error.
-func (e *Engine) MustBegin(writable bool) tsdb.Tx {
-	tx, err := e.Begin(writable)
-	if err != nil {
-		panic(err)
-	}
-	return tx
-}
-
-// EnginePointsWriter represents a mock that implements Engine.PointsWriter.
-type EnginePointsWriter struct {
-	WritePointsFn func(points []models.Point) error
-}
-
-func (w *EnginePointsWriter) WritePoints(points []models.Point, measurementFieldsToSave map[string]*tsdb.MeasurementFields, seriesToCreate []*tsdb.SeriesCreate) error {
-	return w.WritePointsFn(points)
-}
-
-func (w *EnginePointsWriter) LoadMetadataIndex(index *tsdb.DatabaseIndex, measurementFields map[string]*tsdb.MeasurementFields) error {
-	return nil
-}
-
-func (w *EnginePointsWriter) DeleteSeries(keys []string) error { return nil }
-
-func (w *EnginePointsWriter) Open() error { return nil }
-
-func (w *EnginePointsWriter) Close() error { return nil }
-
-func (w *EnginePointsWriter) Cursor(series string, fields []string, dec *tsdb.FieldCodec, ascending bool) tsdb.Cursor {
-	return &Cursor{ascending: ascending}
-}
-
-func (w *EnginePointsWriter) Flush() error { return nil }
-
-// Cursor represents a mock that implements tsdb.Curosr.
-type Cursor struct {
-	ascending bool
-}
-
-func (c *Cursor) Ascending() bool { return c.ascending }
-
-func (c *Cursor) SeekTo(key int64) (int64, interface{}) { return tsdb.EOF, nil }
-
-func (c *Cursor) Next() (int64, interface{}) { return tsdb.EOF, nil }
-
-// MustEncodeFields encodes fields with codec. Panic on error.
-func MustEncodeFields(codec *tsdb.FieldCodec, fields models.Fields) []byte {
-	b, err := codec.EncodeFields(fields)
-	if err != nil {
-		panic(err)
-	}
-	return b
-}
-
-// copyBytes returns a copy of a byte slice.
-func copyBytes(b []byte) []byte {
-	if b == nil {
-		return nil
-	}
-
-	other := make([]byte, len(b))
-	copy(other, b)
-	return other
-}
-
-// u64tob converts a uint64 into an 8-byte slice.
-func u64tob(v uint64) []byte {
-	b := make([]byte, 8)
-	binary.BigEndian.PutUint64(b, v)
-	return b
-}
-
-// btou64 converts an 8-byte slice into an uint64.
-func btou64(b []byte) uint64 { return binary.BigEndian.Uint64(b) }
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/engine/engine.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/engine/engine.go
deleted file mode 100644
index 6c8cb51e1..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/engine/engine.go
+++ /dev/null
@@ -1,7 +0,0 @@
-package engine
-
-import (
-	_ "github.com/influxdb/influxdb/tsdb/engine/b1"
-	_ "github.com/influxdb/influxdb/tsdb/engine/bz1"
-	_ "github.com/influxdb/influxdb/tsdb/engine/tsm1"
-)
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/engine/tsm1/DESIGN.md b/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/engine/tsm1/DESIGN.md
deleted file mode 100644
index dfdff76ca..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/engine/tsm1/DESIGN.md
+++ /dev/null
@@ -1,411 +0,0 @@
-# File Structure
-
-A TSM file is composed for four sections: header, blocks, index and the footer.
-
-```
-┌────────┬────────────────────────────────────┬─────────────┬──────────────┐
-│ Header │               Blocks               │    Index    │    Footer    │
-│5 bytes │              N bytes               │   N bytes   │   4 bytes    │
-└────────┴────────────────────────────────────┴─────────────┴──────────────┘
-```
-Header is composed of a magic number to identify the file type and a version number.
-
-```
-┌───────────────────┐
-│      Header       │
-├─────────┬─────────┤
-│  Magic  │ Version │
-│ 4 bytes │ 1 byte  │
-└─────────┴─────────┘
-```
-
-Blocks are sequences of block CRC32 and data.  The block data is opaque to the file.  The CRC32 is used for recovery to ensure blocks have not been corrupted due to bugs outside of our control.  The length of the blocks is stored in the index.
-
-```
-┌───────────────────────────────────────────────────────────┐
-│                          Blocks                           │
-├───────────────────┬───────────────────┬───────────────────┤
-│      Block 1      │      Block 2      │      Block N      │
-├─────────┬─────────┼─────────┬─────────┼─────────┬─────────┤
-│  CRC    │  Data   │  CRC    │  Data   │  CRC    │  Data   │
-│ 4 bytes │ N bytes │ 4 bytes │ N bytes │ 4 bytes │ N bytes │
-└─────────┴─────────┴─────────┴─────────┴─────────┴─────────┘
-```
-
-Following the blocks is the index for the blocks in the file.  The index is composed of a sequence of index entries ordered lexicographically by key and then by time.  Each index entry starts with a key length and key followed by a count of the number of blocks in the file.  Each block entry is composed of the min and max time for the block, the offset into the file where the block is located and the the size of the block.
-
-The index structure can provide efficient access to all blocks as well as the ability to determine the cost associated with acessing given key.  Given a key and timestamp, we know exactly which file contains the block for that timestamp as well as where that block resides and how much data to read to retrieve the block.  If we know we need to read all or multiple blocks in a file, we can use the size to determine how much to read in a given IO.
-
-_TBD: The block length stored in the block data could probably be dropped since we store it in the index._
-
-```
-┌──────────────────────────────────────────────────────────────────────────┐
-│                                  Index                                   │
-├─────────┬─────────┬───────┬─────────┬─────────┬─────────┬─────────┬──────┤
-│ Key Len │   Key   │ Count │Min Time │Max Time │ Offset  │  Size   │ ...  │
-│ 2 bytes │ N bytes │2 bytes│ 8 bytes │ 8 bytes │ 8 bytes │ 4 bytes │      │
-└─────────┴─────────┴───────┴─────────┴─────────┴─────────┴─────────┴──────┘
-```
-
-The last section is the footer that stores the offset of the start of the index.
-
-```
-┌─────────┐
-│ Footer  │
-├─────────┤
-│Index Ofs│
-│ 8 bytes │
-└─────────┘
-```
-
-# File System Layout
-
-The file system is organized a directory per shard where each shard is integer number.  Within the shard dir exists a set of other directories and files:
-
-* wal Dir - Contains a set numerically increasing files WAL segment files name ######.wal.  The wal dir will be a separate location from the TSM data files so that different types can be used if necessary.
-* TSM files - A set of numerically increasing TSM files containing compressed series data.
-* Tombstone files - Files named after the corresponding TSM file as #####.tombstone.  These contain measurement and series keys that have been deleted.  These are removed during compactions.
-
-# Data Flow
-
-Writes are appended to the current WAL segment and are also added to the Cache.  Each WAL segment is size bounded and rolls-over to a new file after it fills up.  The cache is also size bounded and older entries are evicted as new entries are added to maintain the size.  The WAL and Cache are separate entities and do not interact with each other.  The Engine coordinates the writes to both.
-
-When WAL segments fill up and closed, the Compactor reads the WAL entries and combines then with one or more existing TSM files.  This process runs continously until all WAL files are compacted and there is a minimum number of TSM files.  As each TSM file is completed, it is loaded and referenced by the FileStore.
-
-Queries are executed by constructing Cursors for keys.  The Cursors iterate of slices of Values.  When the current Values are exhausted, a cursor requests a the next set of Values from the Engine.  The Engine returns a slice of Values by querying the FileStore and Cache.  The Values in the Cache are overlayed on top of the values returned from the FileStore.  The FileStore reads and decodes blocks of Values according to the index for the file.
-
-Updates (writing a newer value for a point that already exists) occur as normal writes.  Since cached values overwrite existing values, newer writes take precedence.
-
-Deletes occur by writing a delete entry for the measurement or series to the WAL and then update the Cache and FileStore.  The Cache evicts all relevant entries.  The FileStore writes a tombstone file for each TSM file that contains relevent data.  These tombstone files are used at startup time to ignore blocks as well as during compactions to remove deleted entries.
-
-# Compactions
-
-Compactions are a serial and continously running process that iteratively optimizes the storage for queries.  Specifically, it does the following:
-
-* Converts closed WAL files into TSM files and removes the closed WAL files
-* Combines smaller TSM files into larger ones to improve compression ratios
-* Rewrites existing files that contain series data that has been deleted
-* Rewrites existing files that contain writes with more recent data to ensure a point exists in only one TSM file.
-
-The compaction algorithm is continously running and always selects files to compact based on a priority.
-
-1. If there are closed WAL files, the 5 oldest WAL segments are added to the set of compaction files.
-2. If any TSM files contain points with older timestamps that also exist in the WAL files, those TSM files are added to the compaction set.
-3. If any TSM files have a tombstone marker, those TSM files are added to the compaction set.
-
-The compaction is used to generate a set of SeriesIterators that return a sequence of `key`, `Values` where each `key` returned is lexicographically greater than the previous one.  The iterators are ordered such that WAL iterators will override any values return the TSM file iterators.  WAL iterators read and cache the WAL segment so that deletes later in the log can be processed correctly.  TSM file iterators use the tombstone files to ensure that deleted series are not returned during iteration.  As each key is processed, the Values slice is grown, sorted, and then written to a new block in the new TSM file.  The blocks can be split based on number of points or size of the block.  If the total size of the current TSM file would exceed the maximum file size, a new file is created.
-
-Deletions can occur while a new file is being written.  Since the new TSM file is not complete a tombstone would not be written for it. This could result in deleted values getting written into a new file.  To prevent this, if a compaction is running and a delete occurs, the current compaction is aborted and new compaction is started.
-
-When all files are processed and succesfully written, completion checkpoint markers are created and files are renamed.   The engine then notifies the Cache of the last written timestamp which is used for by the Cache to know what entries can be evicted in the future.
-
-This process then runs again until there are no more WAL files and the minimum number of TSM files exists that are also under the maximum file size.
-
-# WAL
-
-Currently, there is a WAL per shard.  This means all the writes in a WAL segments are for the given shard.  It also means that writes across a lot of shards append to many files which might results in more disk IO due to seeking to the end of multiple files.
-
-Two options being considered:
-
-## WAL per Shard
-
-This is the current behavior of the WAL.  This option is conceptually easier to reason about.  For example, compactions that read in multiple WAL segments are assured that all the WAL entries pertain to the current shard.  If it completes a compaction, it is saft to remove the WAL segment.  It is also easier to deal with shard deletions as all the WAL segments can be dropped along with the other shard files.
-
-The drawback of this option is the potential for turning sequential write IO into random IO in the presence of multiple shards and writes to many different shards.
-
-## Single WAL
-
-Using a single WAL adds some complexity to compactions and deletions.  Compactions will need to either sort all the WAL entries in a segment by shard first and then run compactiosn on each shard or the compactor needs to be able to compact multiple shards concurrently while ensuring points in existing TSM files in different shards remain separate.
-
-Deletions would not be able to reclaim WAL segments immediately as in the case where there is a WAL per shard.  Similarly, a compaction of a WAL segment that contains writes for a deleted shard would need to be dropped.
-
-Currently, we are moving towards a Single WAL implemention.
-
-# TSM File Index
-
-Each TSM file contains a full index of the blocks contained within the file.  The existing index structure is designed to allow for a binary search across the index to find the starting block for a key.  We would then seek to that start key and sequentially scan each block to find the location of a timestamp.
-
-Some issues with the existing structure is that seeking to a given timestamp for a key has a unknown cost.  This can cause variability in read performance that would very difficult to fix.  Another issue is that startup times for loading a TSM file would grow in proportion to number and size of TSM files on disk since we would need to scan the entire file to find all keys contained in the file.  This could be addressed by using a separate index like file or changing the index structure.
-
-We've chosen to update the block index structure to ensure a TSM file is fully self-contained, supports consistent IO characteristics for sequential and random accesses as well as provides an efficient load time regardless of file size.  The implications of these changes are that the index is slightly larger and we need to be able to search the index despite each entry being variably sized.
-
-The following are some alternative design options to handle the cases where the index is too large to fit in memory.  We are currently planning to use an indirect MMAP indexing approach for loaded TSM files.  
-
-### Indirect MMAP Indexing
-
-One option is to MMAP the index into memory and record the pointers to the start of each index entry in a slice.  When searching for a given key, the pointers are used to perform a binary search on the underlying mmap data.  When the matching key is found, the block entries can be loaded and search or a subsequent binary search on the blocks can be performed.
-
-A variation of this can also be done without MMAPs by seeking and reading in the file.  The underlying file cache will still be utilized in this approach as well.
-
-As an example, if we have an index structure in memory such as:
-
- ```
-┌────────────────────────────────────────────────────────────────────┐
-│                               Index                                │
-├─┬──────────────────────┬──┬───────────────────────┬───┬────────────┘
-│0│                      │62│                       │145│
-├─┴───────┬─────────┬────┼──┴──────┬─────────┬──────┼───┴─────┬──────┐
-│Key 1 Len│   Key   │... │Key 2 Len│  Key 2  │ ...  │  Key 3  │ ...  │
-│ 2 bytes │ N bytes │    │ 2 bytes │ N bytes │      │ 2 bytes │      │
-└─────────┴─────────┴────┴─────────┴─────────┴──────┴─────────┴──────┘
-```
-
-We would build an `offsets` slices where each element pointers to the byte location for the first key in then index slice.
-
-```
-┌────────────────────────────────────────────────────────────────────┐
-│                              Offsets                               │
-├────┬────┬────┬─────────────────────────────────────────────────────┘
-│ 0  │ 62 │145 │
-└────┴────┴────┘
- ```
-
-
-Using this offset slice we can find `Key 2` by doing a binary search over the offsets slice.  Instead of comparing the value in the offsets (e.g. `62`), we use that as an index into the underlying index to retrieve the key at postion `62` and perform our comparisons with that.
-
-When we have identified the correct position in the index for a given key, we could perform another binary search or a linear scan.  This should be fast as well since each index entry is 28 bytes and all contiguous in memory.
-
-The size of the offsets slice would be proportional to the number of unique series.  If we we limit file sizes to 4GB, we would use 4 bytes for each pointer.
-
-### LRU/Lazy Load
-
-A second option could be to have the index work as a memory bounded, lazy-load style cache.  When a cache miss occurs, the index structure is scanned to find the the key and the entries are load and added to the cache which causes the least-recently used entries to be evicted.
-
-### Key Compression
-
-Another option is compress keys using a key specific dictionary encoding.   For example,
-
-```
-cpu,host=server1 value=1
-cpu,host=server2 value=2
-meory,host=server1 value=3
-```
-
-Could be compressed by expanding the key into its respective parts: mesasurment, tag keys, tag values and tag fields .  For each part a unique number is assigned.  e.g.
-
-Measurements
-```
-cpu = 1
-memory = 2
-```
-
-Tag Keys
-```
-host = 1
-```
-
-Tag Values
-```
-server1 = 1
-server2 = 2
-```
-
-Fields
-```
-value = 1
-```
-
-Using this encoding dictionary, the string keys could be converted to a sequency of integers:
-
-```
-cpu,host=server1 value=1 -->    1,1,1,1
-cpu,host=server2 value=2 -->    1,1,2,1
-memory,host=server1 value=3 --> 3,1,2,1
-```
-
-These sequences of small integers list can then be compressed further using a bit packed format such as Simple9 or Simple8b.  The resulting byte slices would be a multiple of 4 or 8 bytes (using Simple9/Simple8b respectively) which could used as the (string).
-
-### Separate Index
-
-Another option might be to have a separate index file (BoltDB) that serves as the storage for the `FileIndex` and is transient.   This index would be recreated at startup and updated at compaction time.
-
-# Components
-
-These are some of the high-level components and their responsibilities.  These are ideas preliminary.
-
-## WAL
-
-* Append-only log composed of a fixed size segment files.
-* Writes are appended to the current segment
-* Roll-over to new segment after filling the the current segment
-* Closed segments are never modified and used for startup and recovery as well as compactions.
-* There is a single WAL for the store as opposed to a WAL per shard.
-
-## Compactor
-
-* Continously running, iterative file storage optimizer
-* Takes closed WAL files, existing TSM files and combines into one or more new TSM files
-
-## Cache
-
-* Hold recently written series data
-* Has max memory limit
-* When limit is crossed, old entries are expired according to the last compaction checkpoint.  Entries written that are older than the last checkpoint time can be evicted.
-* If a write comes in, points after the checkpoint are evicted, but there is still not enough room to hold the write, the write returns and error.
-
-# Engine
-
-* Maintains references to Cache, FileStore, WAL, etc..
-* Creates a cursor
-* Receives writes, coordinates queries
-* Hides underlying files and types from clients
-
-## Cursor
-
-* Iterates forward or reverse for given key
-* Requests values from Engine for key and timestamp
-* Has no knowledge of TSM files or WAL - delegates to Engine to request next set of Values
-
-## FileStore
-
-* Manages TSM files
-* Maintains the file indexes and references to active files
-* A TSM file that is opened entails reading in and adding the index section to the `FileIndex`.  The block data is then MMAPed up to the index offset to avoid having the index in memory twice.
-
-## FileIndex
-* Provides location information to a file and block for a given key and timestamp.  
-
-## Interfaces
-
-```
-SeriesIterator returns the key and []Value such that a key is only returned
-once and subsequent calls to Next() do not return the same key twice.
-type SeriesIterator interace {
-   func Next() (key, []Value, error)
-}
-```
-
-## Types
-
-_NOTE: the actual func names are to illustrate the type of functionaltiy the type is responsible._
-
-```
-TSMWriter writes a sets of key and Values to a TSM file.
-type TSMWriter struct {}
-func (t *TSMWriter) Write(key string, values []Value) error {}
-func (t *TSMWriter) Close() error
-```
-
-
-```
-// WALIterator returns the key and []Values for a set of WAL segment files. 
-type WALIterator struct{
-    Files *os.File
-}
-func (r *WALReader) Next() (key, []Value, error)
-```
-
-
-```
-TSMIterator returns the key and values from a TSM file.
-type TSMIterator struct {}
-funct (r *TSMIterator) Next() (key, []Value, error)
-```
-
-```
-type Compactor struct {}
-func (c *Compactor) Compact(iters ...SeriesIterators) error
-```
-
-```
-type Engine struct {
-    wal *WAL
-    cache *Cache
-    fileStore *FileStore
-    compactor *Compactor
-}
-
-func (e *Engine) ValuesBefore(key string, timstamp time.Time) ([]Value, error)
-func (e *Engine) ValuesAfter(key string, timstamp time.Time) ([]Value, error)
-```
-
-```
-type Cursor struct{
-    engine *Engine
-}
-...
-```
-
-```
-// FileStore maintains references
-type FileStore struct {}
-func (f *FileStore) ValuesBefore(key string, timstamp time.Time) ([]Value, error)
-func (f *FileStore) ValuesAfter(key string, timstamp time.Time) ([]Value, error)
-
-```
-
-```
-type FileIndex struct {}
-
-// Returns a file and offset for a block located in the return file that contains the requested key and timestamp.
-func (f *FileIndex) Location(key, timestamp) (*os.File, uint64, error)
-```
-
-```
-type Cache struct {}
-func (c *Cache) Write(key string, values []Value) error
-```
-
-```
-type WAL struct {}
-func (w *WAL) Write(key string, values []Value)
-func (w *WAL) ClosedSegments() ([]*os.File, error)
-```
-
-
-# Concerns
-
-## Performance
-
-There are three categories of performance this design is concerned with:
-
-* Write Throughput/Latency
-* Query Throughput/Latency
-* Startup time
-* Compaction Throughput/Latency
-* Memory Usage
-
-### Writes
-
-Write throughput is bounded by the time to process the write on the CPU (parsing, sorting, etc..), adding and evicting to the Cache and appending the write to the WAL.  The first two items are CPU bound and can be tuned and optimized if they become a bottleneck.  The WAL write can be tuned such that in the worst case every write requires at least 2 IOPS (write + fysnc) or batched so that multiple writes are queued and fysnc'd in sizes matching one or more disk blocks.  Performing more work with each IO will improve throughput
-
-Write latency is minimal for the WAL write since there are no seeks.  The latency is bounded by the time to complete any write and fysnc calls.
-
-### Queries
-
-Query throughput is directly related to how many blocks can be read in a period of time.  The index structure contains enough information to determine if one or multiple blocks can be read in a single IO.
-
-Query latency is determine by how long it takes to find and read the relevant blocks.  The in-memory index structure contains the offsets and sizes of all blocks for a key.  This allows every block to be read in 2 IOPS (seek + read) regardless of position, structure or size of file.  
-
-### Startup
-
-Startup time is proportional to the number of WAL files, TSM files and tombstone files.  WAL files can be read and process in large batches using the WALIterators.  TSM files require reading the index block into memory (5 IOPS/file).  Tombstone files are expected to be small and infrequent and would require approximately 2 IOPS/file.
-
-### Compactions
-
-Compactions are IO intensive in that they may need to read multiple, large TSM files to rewrite them.  The throughput of a compactions (MB/s) as well as the latency for each compaction is important to keep consistent even as data sizes grow.  
-
-The performance of compactions also has an effect on what data is visible during queries.  If the Cache fills up and evicts old entries faster than the compactions can process old WAL files, queries could return return gaps until compactions catch up.
-
-To address these concerns, compactions prioritize old WAL files over optimizing storage/compression to avoid data being hidden overload situations.  This also accounts for the fact that shards will eventually become cold for writes so that existing data will be able to be optimized.  To maintain consistent performance, the number of each type of file processed as well as the size of each file processed is bounded.  
-
-### Memory Footprint
-
-The memory footprint should shoud not grow unbounded due to additional files or series keys of large sizes or numbers.  Some options for addressing this concern is covered in the [Design Options] section.
-
-## Concurrency
-
-The main concern with concurrency is that reads and writes should not block each other.  Writes add entries to the Cache and append entries to the WAL.  During queries, the contention points will be the Cache and existing TSM files.  Since the Cache and TSM file data is only access through the engine by the cursors, several strategies can be used to improve concurrency.
-
-1. Cache series data can be returned to cursors as a copy.  Since cache entries are evicted on writes, cursors iteration and writes to the same series could block each other.  Iterating over copies of the values can relieve some of this contention.
-2. TSM data values returned by the engine are new references to Values and not access to the actual TSM files.  This means that the `Engine`, through the `FileStore` can limit contention.
-3. Compactions are the only place where new TSM files are added and removed.  Since this is a serial, continously running process, file contention is minimized. 
-
-## Robustness
-
-The two robustness concerns considered by this design are writes filling the cache and crash recovery.
-
-Writes filling up cache faster than the WAL segments can be processed result in the oldest entries being evicted from the cache.  This is the normal operation for the cache.  Old entries are always evicited to make room for new entries.  In the case where WAL segements are slow to be processed, writes are not blocked or errored so timeouts should not occur due to IO issues.  A side effect of this is that queries for recent data will always be served from memory.  The size of the in-memory cache can also be tuned so that if IO does because a bottleneck the window of time for queries with recent data can be tuned.
-
-Crash recovery is handled by using copy-on-write style updates along with checkpoint marker files.  Existing data is never updated.  Updates and deletes to existing data are recored as new changes and processed at compaction and query time. 
-
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/engine/tsm1/bool.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/engine/tsm1/bool.go
deleted file mode 100644
index 5e280d9b4..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/engine/tsm1/bool.go
+++ /dev/null
@@ -1,141 +0,0 @@
-package tsm1
-
-// bool encoding uses 1 bit per value.  Each compressed byte slice contains a 1 byte header
-// indicating the compression type, followed by a variable byte encoded length indicating
-// how many booleans are packed in the slice.  The remaining bytes contains 1 byte for every
-// 8 boolean values encoded.
-
-import "encoding/binary"
-
-const (
-	// boolUncompressed is an uncompressed boolean format.
-	// Not yet implemented.
-	boolUncompressed = 0
-
-	// boolCompressedBitPacked is an bit packed format using 1 bit per boolean
-	boolCompressedBitPacked = 1
-)
-
-// BoolEncoder encodes a series of bools to an in-memory buffer.
-type BoolEncoder interface {
-	Write(b bool)
-	Bytes() ([]byte, error)
-}
-
-type boolEncoder struct {
-	// The encoded bytes
-	bytes []byte
-
-	// The current byte being encoded
-	b byte
-
-	// The number of bools packed into b
-	i int
-
-	// The total number of bools written
-	n int
-}
-
-// NewBoolEncoder returns a new instance of BoolEncoder.
-func NewBoolEncoder() BoolEncoder {
-	return &boolEncoder{}
-}
-
-func (e *boolEncoder) Write(b bool) {
-	// If we have filled the current byte, flush it
-	if e.i >= 8 {
-		e.flush()
-	}
-
-	// Use 1 bit for each boolen value, shift the current byte
-	// by 1 and set the least signficant bit acordingly
-	e.b = e.b << 1
-	if b {
-		e.b |= 1
-	}
-
-	// Increment the current bool count
-	e.i++
-	// Increment the total bool count
-	e.n++
-}
-
-func (e *boolEncoder) flush() {
-	// Pad remaining byte w/ 0s
-	for e.i < 8 {
-		e.b = e.b << 1
-		e.i++
-	}
-
-	// If we have bits set, append them to the byte slice
-	if e.i > 0 {
-		e.bytes = append(e.bytes, e.b)
-		e.b = 0
-		e.i = 0
-	}
-}
-
-func (e *boolEncoder) Bytes() ([]byte, error) {
-	// Ensure the current byte is flushed
-	e.flush()
-	b := make([]byte, 10+1)
-
-	// Store the encoding type in the 4 high bits of the first byte
-	b[0] = byte(boolCompressedBitPacked) << 4
-
-	i := 1
-	// Encode the number of bools written
-	i += binary.PutUvarint(b[i:], uint64(e.n))
-
-	// Append the packed booleans
-	return append(b[:i], e.bytes...), nil
-}
-
-// BoolDecoder decodes a series of bools from an in-memory buffer.
-type BoolDecoder interface {
-	Next() bool
-	Read() bool
-	Error() error
-}
-
-type boolDecoder struct {
-	b   []byte
-	i   int
-	n   int
-	err error
-}
-
-// NewBoolDecoder returns a new instance of BoolDecoder.
-func NewBoolDecoder(b []byte) BoolDecoder {
-	// First byte stores the encoding type, only have 1 bit-packet format
-	// currently ignore for now.
-	b = b[1:]
-	count, n := binary.Uvarint(b)
-	return &boolDecoder{b: b[n:], i: -1, n: int(count)}
-}
-
-func (e *boolDecoder) Next() bool {
-	e.i++
-	return e.i < e.n
-}
-
-func (e *boolDecoder) Read() bool {
-	// Index into the byte slice
-	idx := e.i / 8
-
-	// Bit position
-	pos := (8 - e.i%8) - 1
-
-	// The mask to select the bit
-	mask := byte(1 << uint(pos))
-
-	// The packed byte
-	v := e.b[idx]
-
-	// Returns true if the bit is set
-	return v&mask == mask
-}
-
-func (e *boolDecoder) Error() error {
-	return e.err
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/engine/tsm1/bool_test.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/engine/tsm1/bool_test.go
deleted file mode 100644
index b94276eef..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/engine/tsm1/bool_test.go
+++ /dev/null
@@ -1,107 +0,0 @@
-package tsm1_test
-
-import (
-	"reflect"
-	"testing"
-	"testing/quick"
-
-	"github.com/influxdb/influxdb/tsdb/engine/tsm1"
-)
-
-func Test_BoolEncoder_NoValues(t *testing.T) {
-	enc := tsm1.NewBoolEncoder()
-	b, err := enc.Bytes()
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-
-	dec := tsm1.NewBoolDecoder(b)
-	if dec.Next() {
-		t.Fatalf("unexpected next value: got true, exp false")
-	}
-}
-
-func Test_BoolEncoder_Single(t *testing.T) {
-	enc := tsm1.NewBoolEncoder()
-	v1 := true
-	enc.Write(v1)
-	b, err := enc.Bytes()
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-
-	dec := tsm1.NewBoolDecoder(b)
-	if !dec.Next() {
-		t.Fatalf("unexpected next value: got false, exp true")
-	}
-
-	if v1 != dec.Read() {
-		t.Fatalf("unexpected value: got %v, exp %v", dec.Read(), v1)
-	}
-}
-
-func Test_BoolEncoder_Multi_Compressed(t *testing.T) {
-	enc := tsm1.NewBoolEncoder()
-
-	values := make([]bool, 10)
-	for i := range values {
-		values[i] = i%2 == 0
-		enc.Write(values[i])
-	}
-
-	b, err := enc.Bytes()
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-
-	if exp := 4; len(b) != exp {
-		t.Fatalf("unexpected length: got %v, exp %v", len(b), exp)
-	}
-
-	dec := tsm1.NewBoolDecoder(b)
-
-	for i, v := range values {
-		if !dec.Next() {
-			t.Fatalf("unexpected next value: got false, exp true")
-		}
-		if v != dec.Read() {
-			t.Fatalf("unexpected value at pos %d: got %v, exp %v", i, dec.Read(), v)
-		}
-	}
-
-	if dec.Next() {
-		t.Fatalf("unexpected next value: got true, exp false")
-	}
-}
-
-func Test_BoolEncoder_Quick(t *testing.T) {
-	if err := quick.Check(func(values []bool) bool {
-		// Write values to encoder.
-		enc := tsm1.NewBoolEncoder()
-		for _, v := range values {
-			enc.Write(v)
-		}
-
-		// Retrieve compressed bytes.
-		buf, err := enc.Bytes()
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		// Read values out of decoder.
-		got := make([]bool, 0, len(values))
-		dec := tsm1.NewBoolDecoder(buf)
-		for dec.Next() {
-			got = append(got, dec.Read())
-		}
-
-		// Verify that input and output values match.
-		if !reflect.DeepEqual(values, got) {
-			t.Fatalf("mismatch:\n\nexp=%+v\n\ngot=%+v\n\n", values, got)
-		}
-
-		return true
-	}, nil); err != nil {
-		t.Fatal(err)
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/engine/tsm1/cursor.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/engine/tsm1/cursor.go
deleted file mode 100644
index 6ec413d54..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/engine/tsm1/cursor.go
+++ /dev/null
@@ -1,486 +0,0 @@
-package tsm1
-
-import (
-	"math"
-
-	"github.com/influxdb/influxdb/tsdb"
-)
-
-// combinedEngineCursor holds a cursor for the WAL and the index
-// and will combine the two together. Any points in the WAL with
-// identical timestamps from the index will be preferred over the
-// index point
-type combinedEngineCursor struct {
-	walCursor      tsdb.Cursor
-	engineCursor   tsdb.Cursor
-	walKeyBuf      int64
-	walValueBuf    interface{}
-	engineKeyBuf   int64
-	engineValueBuf interface{}
-	ascending      bool
-}
-
-// NewCombinedEngineCursor returns a Cursor that joins wc and ec.
-// Values from wc take precedence over ec when identical timestamps are returned.
-func NewCombinedEngineCursor(wc, ec tsdb.Cursor, ascending bool) tsdb.Cursor {
-	return &combinedEngineCursor{
-		walCursor:    wc,
-		engineCursor: ec,
-		ascending:    ascending,
-	}
-}
-
-// SeekTo will seek both the index and WAL cursor
-func (c *combinedEngineCursor) SeekTo(seek int64) (key int64, value interface{}) {
-	c.walKeyBuf, c.walValueBuf = c.walCursor.SeekTo(seek)
-	c.engineKeyBuf, c.engineValueBuf = c.engineCursor.SeekTo(seek)
-	return c.read()
-}
-
-// Next returns the next value in the cursor
-func (c *combinedEngineCursor) Next() (int64, interface{}) {
-	return c.read()
-}
-
-// Ascending returns true if the cursor is time ascending
-func (c *combinedEngineCursor) Ascending() bool {
-	return c.ascending
-}
-
-// read will return the buffer value that is next from either the
-// WAL or index cursor and repopulate the buffer value with the
-// appropriate cursor's next value
-func (c *combinedEngineCursor) read() (key int64, value interface{}) {
-	if c.walKeyBuf == tsdb.EOF && c.engineKeyBuf == tsdb.EOF {
-		return tsdb.EOF, nil
-	}
-
-	// handle the case where they have the same point
-	if c.walKeyBuf == c.engineKeyBuf {
-		// keep the wal value since it will overwrite the engine value
-		key = c.walKeyBuf
-		value = c.walValueBuf
-		c.walKeyBuf, c.walValueBuf = c.walCursor.Next()
-
-		// overwrite the buffered engine values
-		c.engineKeyBuf, c.engineValueBuf = c.engineCursor.Next()
-		return
-	}
-
-	// ascending order
-	if c.ascending {
-		if c.walKeyBuf != tsdb.EOF && (c.walKeyBuf < c.engineKeyBuf || c.engineKeyBuf == tsdb.EOF) {
-			key = c.walKeyBuf
-			value = c.walValueBuf
-			c.walKeyBuf, c.walValueBuf = c.walCursor.Next()
-			return
-		}
-
-		key = c.engineKeyBuf
-		value = c.engineValueBuf
-		c.engineKeyBuf, c.engineValueBuf = c.engineCursor.Next()
-		return
-	}
-
-	// descending order
-	if c.walKeyBuf != tsdb.EOF && c.walKeyBuf > c.engineKeyBuf {
-		key = c.walKeyBuf
-		value = c.walValueBuf
-		c.walKeyBuf, c.walValueBuf = c.walCursor.Next()
-		return
-	}
-
-	key = c.engineKeyBuf
-	value = c.engineValueBuf
-	c.engineKeyBuf, c.engineValueBuf = c.engineCursor.Next()
-	return
-}
-
-// multieFieldCursor wraps cursors for multiple fields on the same series
-// key. Instead of returning a plain interface value in the call for Next(),
-// it returns a map[string]interface{} for the field values
-type multiFieldCursor struct {
-	fields      []string
-	cursors     []tsdb.Cursor
-	ascending   bool
-	keyBuffer   []int64
-	valueBuffer []interface{}
-}
-
-// NewMultiFieldCursor returns an instance of Cursor that joins the results of cursors.
-func NewMultiFieldCursor(fields []string, cursors []tsdb.Cursor, ascending bool) tsdb.Cursor {
-	return &multiFieldCursor{
-		fields:      fields,
-		cursors:     cursors,
-		ascending:   ascending,
-		keyBuffer:   make([]int64, len(cursors)),
-		valueBuffer: make([]interface{}, len(cursors)),
-	}
-}
-
-func (m *multiFieldCursor) SeekTo(seek int64) (key int64, value interface{}) {
-	for i, c := range m.cursors {
-		m.keyBuffer[i], m.valueBuffer[i] = c.SeekTo(seek)
-	}
-	return m.read()
-}
-
-func (m *multiFieldCursor) Next() (int64, interface{}) {
-	return m.read()
-}
-
-func (m *multiFieldCursor) Ascending() bool {
-	return m.ascending
-}
-
-func (m *multiFieldCursor) read() (int64, interface{}) {
-	t := int64(math.MaxInt64)
-	if !m.ascending {
-		t = int64(math.MinInt64)
-	}
-
-	// find the time we need to combine all fields
-	for _, k := range m.keyBuffer {
-		if k == tsdb.EOF {
-			continue
-		}
-		if m.ascending && t > k {
-			t = k
-		} else if !m.ascending && t < k {
-			t = k
-		}
-	}
-
-	// get the value and advance each of the cursors that have the matching time
-	if t == math.MinInt64 || t == math.MaxInt64 {
-		return tsdb.EOF, nil
-	}
-
-	mm := make(map[string]interface{})
-	for i, k := range m.keyBuffer {
-		if k == t {
-			mm[m.fields[i]] = m.valueBuffer[i]
-			m.keyBuffer[i], m.valueBuffer[i] = m.cursors[i].Next()
-		}
-	}
-	return t, mm
-}
-
-type emptyCursor struct {
-	ascending bool
-}
-
-func (c *emptyCursor) Next() (int64, interface{})            { return tsdb.EOF, nil }
-func (c *emptyCursor) SeekTo(key int64) (int64, interface{}) { return tsdb.EOF, nil }
-func (c *emptyCursor) Ascending() bool                       { return c.ascending }
-
-// cursor is a cursor for the data in the index
-type cursor struct {
-	// id for the series key and field
-	id uint64
-
-	// f is the current data file we're reading from
-	f *dataFile
-
-	// filesPos is the position in the files index we're reading from
-	filesPos int // the index in the files slice we're looking at
-
-	// pos is the position in the current data file we're reading
-	pos uint32
-
-	// vals is the current decoded block of Values we're iterating from
-	vals []Value
-
-	ascending bool
-
-	// blockPositions is used for descending queries to keep track
-	// of what positions in the current data file encoded blocks for
-	// the id exist at
-	blockPositions []uint32
-
-	// time acending slice of read only data files
-	files []*dataFile
-}
-
-func newCursor(id uint64, files []*dataFile, ascending bool) *cursor {
-	return &cursor{
-		id:        id,
-		ascending: ascending,
-		files:     files,
-		vals:      make([]Value, 0),
-	}
-}
-
-func (c *cursor) SeekTo(seek int64) (int64, interface{}) {
-	if len(c.files) == 0 {
-		return tsdb.EOF, nil
-	}
-
-	if c.ascending {
-		if seek <= c.files[0].MinTime() {
-			c.filesPos = 0
-			c.f = c.files[0]
-		} else {
-			for i, f := range c.files {
-				if seek >= f.MinTime() && seek <= f.MaxTime() {
-					c.filesPos = i
-					c.f = f
-					break
-				}
-			}
-		}
-	} else {
-		if seek >= c.files[len(c.files)-1].MaxTime() {
-			c.filesPos = len(c.files) - 1
-			c.f = c.files[c.filesPos]
-		} else if seek < c.files[0].MinTime() {
-			return tsdb.EOF, nil
-		} else {
-			for i, f := range c.files {
-				if seek >= f.MinTime() && seek <= f.MaxTime() {
-					c.filesPos = i
-					c.f = f
-					break
-				}
-			}
-		}
-	}
-
-	if c.f == nil {
-		return tsdb.EOF, nil
-	}
-
-	// find the first file we need to check in
-	for {
-		if c.filesPos < 0 || c.filesPos >= len(c.files) {
-			return tsdb.EOF, nil
-		}
-		c.f = c.files[c.filesPos]
-
-		c.pos = c.f.StartingPositionForID(c.id)
-
-		// if this id isn't in this file, move to next one or return
-		if c.pos == 0 {
-			if c.ascending {
-				c.filesPos++
-			} else {
-				c.filesPos--
-				c.blockPositions = nil
-			}
-			continue
-		}
-
-		// handle seek for correct order
-		k := tsdb.EOF
-		var v interface{}
-
-		if c.ascending {
-			k, v = c.seekAscending(seek)
-		} else {
-			k, v = c.seekDescending(seek)
-		}
-
-		if k != tsdb.EOF {
-			return k, v
-		}
-
-		if c.ascending {
-			c.filesPos++
-		} else {
-			c.filesPos--
-			c.blockPositions = nil
-		}
-	}
-}
-
-func (c *cursor) seekAscending(seek int64) (int64, interface{}) {
-	// seek to the block and values we're looking for
-	for {
-		// if the time is between this block and the next,
-		// decode this block and go, otherwise seek to next block
-		length := c.blockLength(c.pos)
-
-		// if the next block has a time less than what we're seeking to,
-		// skip decoding this block and continue on
-		nextBlockPos := c.pos + blockHeaderSize + length
-		if nextBlockPos < c.f.indexPosition() {
-			nextBlockID := btou64(c.f.mmap[nextBlockPos : nextBlockPos+8])
-			if nextBlockID == c.id {
-				nextBlockTime := c.blockMinTime(nextBlockPos)
-				if nextBlockTime <= seek {
-					c.pos = nextBlockPos
-					continue
-				}
-			}
-		}
-
-		// it must be in this block or not at all
-		id := btou64((c.f.mmap[c.pos : c.pos+8]))
-		if id != c.id {
-			return tsdb.EOF, nil
-		}
-		c.decodeBlock(c.pos)
-
-		// see if we can find it in this block
-		for i, v := range c.vals {
-			if v.Time().UnixNano() >= seek {
-				c.vals = c.vals[i+1:]
-				return v.Time().UnixNano(), v.Value()
-			}
-		}
-	}
-}
-
-func (c *cursor) seekDescending(seek int64) (int64, interface{}) {
-	c.setBlockPositions()
-	if len(c.blockPositions) == 0 {
-		return tsdb.EOF, nil
-	}
-
-	for i := len(c.blockPositions) - 1; i >= 0; i-- {
-		pos := c.blockPositions[i]
-		if c.blockMinTime(pos) > seek {
-			continue
-		}
-
-		c.decodeBlock(pos)
-		c.blockPositions = c.blockPositions[:i]
-
-		for i := len(c.vals) - 1; i >= 0; i-- {
-			val := c.vals[i]
-			if seek >= val.UnixNano() {
-				c.vals = c.vals[:i]
-				return val.UnixNano(), val.Value()
-			}
-			if seek < val.UnixNano() {
-				// we need to move to the next block
-				if i == 0 {
-					break
-				}
-				val := c.vals[i-1]
-				c.vals = c.vals[:i-1]
-				return val.UnixNano(), val.Value()
-			}
-		}
-		c.blockPositions = c.blockPositions[:i]
-	}
-
-	return tsdb.EOF, nil
-}
-
-// blockMinTime is the minimum time for the block
-func (c *cursor) blockMinTime(pos uint32) int64 {
-	return int64(btou64(c.f.mmap[pos+12 : pos+20]))
-}
-
-// setBlockPositions will read the positions of all
-// blocks for the cursor id in the given data file
-func (c *cursor) setBlockPositions() {
-	pos := c.pos
-
-	for {
-		if pos >= c.f.indexPosition() {
-			return
-		}
-
-		length := c.blockLength(pos)
-		id := btou64(c.f.mmap[pos : pos+8])
-
-		if id != c.id {
-			return
-		}
-
-		c.blockPositions = append(c.blockPositions, pos)
-		pos += blockHeaderSize + length
-	}
-}
-
-func (c *cursor) Next() (int64, interface{}) {
-	if c.ascending {
-		k, v := c.nextAscending()
-		return k, v
-	}
-	return c.nextDescending()
-}
-
-func (c *cursor) nextAscending() (int64, interface{}) {
-	if len(c.vals) > 0 {
-		v := c.vals[0]
-		c.vals = c.vals[1:]
-
-		return v.Time().UnixNano(), v.Value()
-	}
-
-	// if we have a file set, see if the next block is for this ID
-	if c.f != nil && c.pos < c.f.indexPosition() {
-		nextBlockID := btou64(c.f.mmap[c.pos : c.pos+8])
-		if nextBlockID == c.id {
-			c.decodeBlock(c.pos)
-			return c.nextAscending()
-		}
-	}
-
-	// loop through the files until we hit the next one that has this id
-	for {
-		c.filesPos++
-		if c.filesPos >= len(c.files) {
-			return tsdb.EOF, nil
-		}
-		c.f = c.files[c.filesPos]
-
-		startingPos := c.f.StartingPositionForID(c.id)
-		if startingPos == 0 {
-			// move to next file because it isn't in this one
-			continue
-		}
-
-		// we have a block with this id, decode and return
-		c.decodeBlock(startingPos)
-		return c.nextAscending()
-	}
-}
-
-func (c *cursor) nextDescending() (int64, interface{}) {
-	if len(c.vals) > 0 {
-		v := c.vals[len(c.vals)-1]
-		if len(c.vals) >= 1 {
-			c.vals = c.vals[:len(c.vals)-1]
-		} else {
-			c.vals = nil
-		}
-		return v.UnixNano(), v.Value()
-	}
-
-	for i := len(c.blockPositions) - 1; i >= 0; i-- {
-		c.decodeBlock(c.blockPositions[i])
-		c.blockPositions = c.blockPositions[:i]
-		if len(c.vals) == 0 {
-			continue
-		}
-		val := c.vals[len(c.vals)-1]
-		c.vals = c.vals[:len(c.vals)-1]
-		return val.UnixNano(), val.Value()
-	}
-
-	return tsdb.EOF, nil
-}
-
-func (c *cursor) blockLength(pos uint32) uint32 {
-	return btou32(c.f.mmap[pos+8 : pos+12])
-}
-
-// decodeBlock will decod the block and set the vals
-func (c *cursor) decodeBlock(position uint32) {
-	length := c.blockLength(position)
-	block := c.f.mmap[position+blockHeaderSize : position+blockHeaderSize+length]
-	c.vals = c.vals[:0]
-	_ = DecodeBlock(block, &c.vals)
-
-	// only adavance the position if we're asceending.
-	// Descending queries use the blockPositions
-	if c.ascending {
-		c.pos = position + blockHeaderSize + length
-	}
-}
-
-func (c *cursor) Ascending() bool { return c.ascending }
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/engine/tsm1/cursor_test.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/engine/tsm1/cursor_test.go
deleted file mode 100644
index 2fd678c82..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/engine/tsm1/cursor_test.go
+++ /dev/null
@@ -1,204 +0,0 @@
-package tsm1_test
-
-import (
-	"math/rand"
-	"reflect"
-	"sort"
-	"testing"
-	"testing/quick"
-	"time"
-
-	"github.com/influxdb/influxdb/tsdb"
-	"github.com/influxdb/influxdb/tsdb/engine/tsm1"
-)
-
-func TestCombinedEngineCursor_Quick(t *testing.T) {
-	const tmin = 0
-	quick.Check(func(wc, ec *Cursor, ascending bool, seek int64) bool {
-		c := tsm1.NewCombinedEngineCursor(wc, ec, ascending)
-		// Read from cursor.
-		got := make([]int64, 0)
-		for k, _ := c.SeekTo(seek); k != tsdb.EOF; k, _ = c.Next() {
-			got = append(got, k)
-		}
-		// Merge cursors items.
-		merged := MergeCursorItems(wc.items, ec.items)
-		if !ascending {
-			sort.Sort(sort.Reverse(CursorItems(merged)))
-		}
-		// Filter out items outside of seek range.
-		exp := make([]int64, 0)
-		for _, item := range merged {
-			if (ascending && item.Key < seek) || (!ascending && item.Key > seek) {
-				continue
-			}
-			exp = append(exp, item.Key)
-		}
-		if !reflect.DeepEqual(got, exp) {
-			t.Fatalf("mismatch: seek=%v, ascending=%v\n\ngot=%#v\n\nexp=%#v\n\n", seek, ascending, got, exp)
-		}
-		return true
-	}, &quick.Config{Values: func(values []reflect.Value, rand *rand.Rand) {
-		ascending := rand.Intn(1) == 1
-		values[0] = reflect.ValueOf(GenerateCursor(tmin, 10, ascending, rand))
-		values[1] = reflect.ValueOf(GenerateCursor(tmin, 10, ascending, rand))
-		values[2] = reflect.ValueOf(ascending)
-		values[3] = reflect.ValueOf(rand.Int63n(100))
-	}})
-}
-
-// Cursor represents a simple test cursor that implements tsdb.Cursor.
-type Cursor struct {
-	i         int
-	items     []CursorItem
-	ascending bool
-}
-
-// NewCursor returns a new instance of Cursor.
-func NewCursor(items []CursorItem, ascending bool) *Cursor {
-	c := &Cursor{
-		items:     items,
-		ascending: ascending,
-	}
-	// Set initial position depending on cursor direction.
-	if ascending {
-		c.i = -1
-	} else {
-		c.i = len(c.items)
-	}
-	return c
-}
-
-// CursorItem represents an item in a test cursor.
-type CursorItem struct {
-	Key   int64
-	Value interface{}
-}
-
-// SeekTo moves the cursor to the first key greater than or equal to seek.
-func (c *Cursor) SeekTo(seek int64) (key int64, value interface{}) {
-	if c.ascending {
-		for i, item := range c.items {
-			if item.Key >= seek {
-				c.i = i
-				return item.Key, item.Value
-			}
-		}
-	} else {
-		for i := len(c.items) - 1; i >= 0; i-- {
-			if item := c.items[i]; item.Key <= seek {
-				c.i = i
-				return item.Key, item.Value
-			}
-		}
-	}
-	c.i = len(c.items)
-	return tsdb.EOF, nil
-}
-
-// Next returns the next key/value from the cursor.
-func (c *Cursor) Next() (key int64, value interface{}) {
-	if c.ascending {
-		c.i++
-		if c.i >= len(c.items) {
-			return tsdb.EOF, nil
-		}
-	} else if !c.ascending {
-		c.i--
-		if c.i < 0 {
-			return tsdb.EOF, nil
-		}
-	}
-	return c.items[c.i].Key, c.items[c.i].Value
-}
-
-// Ascending returns true if the cursor moves in ascending order.
-func (c *Cursor) Ascending() bool { return c.ascending }
-
-// CursorItems represents a list of CursorItem objects.
-type CursorItems []CursorItem
-
-func (a CursorItems) Len() int           { return len(a) }
-func (a CursorItems) Swap(i, j int)      { a[i], a[j] = a[j], a[i] }
-func (a CursorItems) Less(i, j int) bool { return a[i].Key < a[j].Key }
-
-// Keys returns a list of keys.
-func (a CursorItems) Keys() []int64 {
-	keys := make([]int64, len(a))
-	for i := range a {
-		keys[i] = a[i].Key
-	}
-	return keys
-}
-
-// GenerateCursor generates a cursor with a random data.
-func GenerateCursor(tmin, step int64, ascending bool, rand *rand.Rand) *Cursor {
-	key := tmin + rand.Int63n(10)
-	items := make([]CursorItem, 0)
-	for i, n := 0, rand.Intn(100); i < n; i++ {
-		items = append(items, CursorItem{
-			Key:   key,
-			Value: int64(0),
-		})
-		key += rand.Int63n(10)
-	}
-	return NewCursor(items, ascending)
-}
-
-// MergeCursorItems merges items in a & b together.
-// If two items share a timestamp then a takes precendence.
-func MergeCursorItems(a, b []CursorItem) []CursorItem {
-	items := make([]CursorItem, 0)
-	var ai, bi int
-	for {
-		if ai < len(a) && bi < len(b) {
-			if ak, bk := a[ai].Key, b[bi].Key; ak == bk {
-				items = append(items, a[ai])
-				ai++
-				bi++
-			} else if ak < bk {
-				items = append(items, a[ai])
-				ai++
-			} else {
-				items = append(items, b[bi])
-				bi++
-			}
-		} else if ai < len(a) {
-			items = append(items, a[ai])
-			ai++
-		} else if bi < len(b) {
-			items = append(items, b[bi])
-			bi++
-		} else {
-			break
-		}
-	}
-	return items
-}
-
-// ReadAllCursor slurps all values from a cursor.
-func ReadAllCursor(c tsdb.Cursor) tsm1.Values {
-	var values tsm1.Values
-	for k, v := c.Next(); k != tsdb.EOF; k, v = c.Next() {
-		values = append(values, tsm1.NewValue(time.Unix(0, k).UTC(), v))
-	}
-	return values
-}
-
-// DedupeValues returns a list of values with duplicate times removed.
-func DedupeValues(a tsm1.Values) tsm1.Values {
-	other := make(tsm1.Values, 0, len(a))
-	m := map[int64]struct{}{}
-
-	for i := len(a) - 1; i >= 0; i-- {
-		value := a[i]
-		if _, ok := m[value.UnixNano()]; ok {
-			continue
-		}
-
-		other = append(other, value)
-		m[value.UnixNano()] = struct{}{}
-	}
-
-	return other
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/engine/tsm1/data_file.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/engine/tsm1/data_file.go
deleted file mode 100644
index f0da01279..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/engine/tsm1/data_file.go
+++ /dev/null
@@ -1,666 +0,0 @@
-package tsm1
-
-/*
-A TSM file is composed for four sections: header, blocks, index and the footer.
-
-┌────────┬────────────────────────────────────┬─────────────┬──────────────┐
-│ Header │               Blocks               │    Index    │    Footer    │
-│5 bytes │              N bytes               │   N bytes   │   4 bytes    │
-└────────┴────────────────────────────────────┴─────────────┴──────────────┘
-
-Header is composed of a magic number to identify the file type and a version
-number.
-
-┌───────────────────┐
-│      Header       │
-├─────────┬─────────┤
-│  Magic  │ Version │
-│ 4 bytes │ 1 byte  │
-└─────────┴─────────┘
-
-Blocks are sequences of pairs of CRC32 and data.  The block data is opaque to the
-file.  The CRC32 is used for block level error detection.  The length of the blocks
-is stored in the index.
-
-┌───────────────────────────────────────────────────────────┐
-│                          Blocks                           │
-├───────────────────┬───────────────────┬───────────────────┤
-│      Block 1      │      Block 2      │      Block N      │
-├─────────┬─────────┼─────────┬─────────┼─────────┬─────────┤
-│  CRC    │  Data   │  CRC    │  Data   │  CRC    │  Data   │
-│ 4 bytes │ N bytes │ 4 bytes │ N bytes │ 4 bytes │ N bytes │
-└─────────┴─────────┴─────────┴─────────┴─────────┴─────────┘
-
-Following the blocks is the index for the blocks in the file.  The index is
-composed of a sequence of index entries ordered lexicographically by key and
-then by time.  Each index entry starts with a key length and key followed by a
-count of the number of blocks in the file.  Each block entry is composed of
-the min and max time for the block, the offset into the file where the block
-is located and the the size of the block.
-
-The index structure can provide efficient access to all blocks as well as the
-ability to determine the cost associated with acessing a given key.  Given a key
-and timestamp, we can determine whether a file contains the block for that
-timestamp as well as where that block resides and how much data to read to
-retrieve the block.  If we know we need to read all or multiple blocks in a
-file, we can use the size to determine how much to read in a given IO.
-
-┌──────────────────────────────────────────────────────────────────────────┐
-│                                  Index                                   │
-├─────────┬─────────┬───────┬─────────┬─────────┬─────────┬─────────┬──────┤
-│ Key Len │   Key   │ Count │Min Time │Max Time │ Offset  │  Size   │ ...  │
-│ 2 bytes │ N bytes │2 bytes│ 8 bytes │ 8 bytes │ 8 bytes │ 4 bytes │      │
-└─────────┴─────────┴───────┴─────────┴─────────┴─────────┴─────────┴──────┘
-
-The last section is the footer that stores the offset of the start of the index.
-
-┌─────────┐
-│ Footer  │
-├─────────┤
-│Index Ofs│
-│ 8 bytes │
-└─────────┘
-*/
-
-import (
-	"encoding/binary"
-	"fmt"
-	"hash/crc32"
-	"io"
-	"os"
-	"sort"
-	"time"
-)
-
-const (
-	// MagicNumber is written as the first 4 bytes of a data file to
-	// identify the file as a tsm1 formatted file
-	MagicNumber uint32 = 0x16D116D1
-
-	Version byte = 1
-
-	indexEntrySize = 28
-)
-
-// TSMWriter writes TSM formatted key and values.
-type TSMWriter interface {
-	// Write writes a new block for key containing and values.  Writes append
-	// blocks in the order that the Write function is called.  The caller is
-	// responsible for ensuring keys and blocks or sorted appropriately.
-	// Values are encoded as a full block.  The caller is responsible for
-	// ensuring a fixed number of values are encoded in each block as wells as
-	// ensuring the Values are sorted. The first and last timestamp values are
-	// used as the minimum and maximum values for the index entry.
-	Write(key string, values Values) error
-
-	// Close finishes the TSM write streams and writes the index.
-	Close() error
-}
-
-// TSMIndex represent the index section of a TSM file.  The index records all
-// blocks, their locations, sizes, min and max times.
-type TSMIndex interface {
-
-	// Add records a new block entry for a key in the index.
-	Add(key string, minTime, maxTime time.Time, offset int64, size uint32)
-
-	// Entries returns all index entries for a key.
-	Entries(key string) []*IndexEntry
-
-	// Entry returns the index entry for the specified key and timestamp.  If no entry
-	// matches the key and timestamp, nil is returned.
-	Entry(key string, timestamp time.Time) *IndexEntry
-
-	// MarshalBinary returns a byte slice encoded version of the index.
-	MarshalBinary() ([]byte, error)
-
-	// UnmarshalBinary populates an index from an encoded byte slice
-	// representation of an index.
-	UnmarshalBinary(b []byte) error
-}
-
-// IndexEntry is the index information for a given block in a TSM file.
-type IndexEntry struct {
-
-	// The min and max time of all points stored in the block.
-	MinTime, MaxTime time.Time
-
-	// The absolute position in the file where this block is located.
-	Offset int64
-
-	// The size in bytes of the block in the file.
-	Size uint32
-}
-
-func (e *IndexEntry) UnmarshalBinary(b []byte) error {
-	if len(b) != indexEntrySize {
-		return fmt.Errorf("unmarshalBinary: short buf: %v != %v", indexEntrySize, len(b))
-	}
-	e.MinTime = time.Unix(0, int64(btou64(b[:8])))
-	e.MaxTime = time.Unix(0, int64(btou64(b[8:16])))
-	e.Offset = int64(btou64(b[16:24]))
-	e.Size = btou32(b[24:28])
-	return nil
-}
-
-// Returns true if this IndexEntry may contain values for the given time.  The min and max
-// times are inclusive.
-func (e *IndexEntry) Contains(t time.Time) bool {
-	return e.MinTime.Equal(t) || e.MinTime.Before(t) &&
-		e.MaxTime.Equal(t) || e.MaxTime.After(t)
-}
-
-func NewDirectIndex() TSMIndex {
-	return &directIndex{
-		blocks: map[string]indexEntries{},
-	}
-}
-
-// directIndex is a simple in-memory index implementation for a TSM file.  The full index
-// must fit in memory.
-type directIndex struct {
-	blocks map[string]indexEntries
-}
-
-func (d *directIndex) Add(key string, minTime, maxTime time.Time, offset int64, size uint32) {
-	d.blocks[key] = append(d.blocks[key], &IndexEntry{
-		MinTime: minTime,
-		MaxTime: maxTime,
-		Offset:  offset,
-		Size:    size,
-	})
-}
-
-func (d *directIndex) Entries(key string) []*IndexEntry {
-	return d.blocks[key]
-}
-
-func (d *directIndex) Entry(key string, t time.Time) *IndexEntry {
-	entries := d.Entries(key)
-	for _, entry := range entries {
-		if entry.Contains(t) {
-			return entry
-		}
-	}
-	return nil
-}
-
-func (d *directIndex) addEntries(key string, entries indexEntries) {
-	d.blocks[key] = append(d.blocks[key], entries...)
-}
-
-func (d *directIndex) Write(w io.Writer) error {
-	b, err := d.MarshalBinary()
-	if err != nil {
-		return fmt.Errorf("write: marshal error: %v", err)
-	}
-
-	// Write out the index bytes
-	_, err = w.Write(b)
-	if err != nil {
-		return fmt.Errorf("write: writer error: %v", err)
-	}
-	return nil
-}
-
-func (d *directIndex) MarshalBinary() ([]byte, error) {
-	// Index blocks are writtens sorted by key
-	var keys []string
-	for k := range d.blocks {
-		keys = append(keys, k)
-	}
-	sort.Strings(keys)
-
-	// Buffer to build up the index and write in bulk
-	var b []byte
-
-	// For each key, individual entries are sorted by time
-	for _, key := range keys {
-		entries := d.blocks[key]
-		sort.Sort(entries)
-
-		// Append the key length and key
-		b = append(b, u16tob(uint16(len(key)))...)
-		b = append(b, key...)
-
-		// Append the index block count
-		b = append(b, u16tob(uint16(len(entries)))...)
-
-		// Append each index entry for all blocks for this key
-		for _, entry := range entries {
-			b = append(b, u64tob(uint64(entry.MinTime.UnixNano()))...)
-			b = append(b, u64tob(uint64(entry.MaxTime.UnixNano()))...)
-			b = append(b, u64tob(uint64(entry.Offset))...)
-			b = append(b, u32tob(entry.Size)...)
-		}
-	}
-	return b, nil
-}
-
-func (d *directIndex) UnmarshalBinary(b []byte) error {
-	var pos int
-	for pos < len(b) {
-		n, key, err := d.readKey(b[pos:])
-		if err != nil {
-			return fmt.Errorf("readIndex: read key error: %v", err)
-		}
-
-		pos += n
-		n, entries, err := d.readEntries(b[pos:])
-		if err != nil {
-			return fmt.Errorf("readIndex: read entries error: %v", err)
-		}
-
-		pos += n
-		d.addEntries(key, entries)
-	}
-	return nil
-}
-
-func (d *directIndex) readKey(b []byte) (n int, key string, err error) {
-	// 2 byte size of key
-	n, size := 2, int(btou16(b[:2]))
-
-	// N byte key
-	key = string(b[n : n+size])
-	n += len(key)
-	return
-}
-
-func (d *directIndex) readEntries(b []byte) (n int, entries indexEntries, err error) {
-	// 2 byte count of index entries
-	n, count := 2, int(btou16(b[:2]))
-
-	for i := 0; i < count; i++ {
-		ie := &IndexEntry{}
-		if err := ie.UnmarshalBinary(b[i*indexEntrySize+2 : i*indexEntrySize+2+indexEntrySize]); err != nil {
-			return 0, nil, fmt.Errorf("readEntries: unmarshal error: %v", err)
-		}
-		entries = append(entries, ie)
-		n += indexEntrySize
-	}
-	return
-}
-
-// indirectIndex is a TSMIndex that uses a raw byte slice representation of an index.  This
-// implementation can be used for indexes that may be MMAPed into memory.
-type indirectIndex struct {
-	// indirectIndex works a follows.  Assuming we have an index structure in memory as
-	// the diagram below:
-	//
-	// ┌────────────────────────────────────────────────────────────────────┐
-	// │                               Index                                │
-	// ├─┬──────────────────────┬──┬───────────────────────┬───┬────────────┘
-	// │0│                      │62│                       │145│
-	// ├─┴───────┬─────────┬────┼──┴──────┬─────────┬──────┼───┴─────┬──────┐
-	// │Key 1 Len│   Key   │... │Key 2 Len│  Key 2  │ ...  │  Key 3  │ ...  │
-	// │ 2 bytes │ N bytes │    │ 2 bytes │ N bytes │      │ 2 bytes │      │
-	// └─────────┴─────────┴────┴─────────┴─────────┴──────┴─────────┴──────┘
-
-	// We would build an `offsets` slices where each element pointers to the byte location
-	// for the first key in the index slice.
-
-	// ┌────────────────────────────────────────────────────────────────────┐
-	// │                              Offsets                               │
-	// ├────┬────┬────┬─────────────────────────────────────────────────────┘
-	// │ 0  │ 62 │145 │
-	// └────┴────┴────┘
-
-	// Using this offset slice we can find `Key 2` by doing a binary search
-	// over the offsets slice.  Instead of comparing the value in the offsets
-	// (e.g. `62`), we use that as an index into the underlying index to
-	// retrieve the key at postion `62` and perform our comparisons with that.
-
-	// When we have identified the correct position in the index for a given
-	// key, we could perform another binary search or a linear scan.  This
-	// should be fast as well since each index entry is 28 bytes and all
-	// contiguous in memory.  The current implementation uses a linear scan since the
-	// number of block entries is expected to be < 100 per key.
-
-	// b is the underlying index byte slice.  This could be a copy on the heap or an MMAP
-	// slice reference
-	b []byte
-
-	// offsets contains the positions in b for each key.  It points to the 2 byte length of
-	// key.
-	offsets []int32
-}
-
-func NewIndirectIndex() TSMIndex {
-	return &indirectIndex{}
-}
-
-// Add records a new block entry for a key in the index.
-func (d *indirectIndex) Add(key string, minTime, maxTime time.Time, offset int64, size uint32) {
-	panic("unsupported operation")
-}
-
-// Entries returns all index entries for a key.
-func (d *indirectIndex) Entries(key string) []*IndexEntry {
-	// We use a binary search across our indirect offsets (pointers to all the keys
-	// in the index slice).
-	i := sort.Search(len(d.offsets), func(i int) bool {
-		// i is the position in offsets we are at so get offset it points to
-		offset := d.offsets[i]
-
-		// It's pointing to the start of the key which is a 2 byte length
-		keyLen := int32(btou16(d.b[offset : offset+2]))
-
-		// Now get the actual key bytes and convert to string
-		k := string(d.b[offset+2 : offset+2+keyLen])
-
-		// See if it matches
-		return key == k || k > key
-	})
-
-	// See if we might have found the right index
-	if i < len(d.offsets) {
-		ofs := d.offsets[i]
-		n, k, err := d.readKey(d.b[ofs:])
-		if err != nil {
-			panic(fmt.Sprintf("error reading key: %v", err))
-		}
-
-		// The search may have returned an i == 0 which could indicated that the value
-		// searched should be inserted at postion 0.  Make sure the key in the index
-		// matches the search value.
-		if k != key {
-			return nil
-		}
-
-		// Read and return all the entries
-		ofs += int32(n)
-		_, entries, err := d.readEntries(d.b[ofs:])
-		if err != nil {
-			panic(fmt.Sprintf("error reading entries: %v", err))
-
-		}
-		return entries
-
-	}
-
-	// The key is not in the index.  i is the index where it would be inserted.
-	return nil
-}
-
-// Entry returns the index entry for the specified key and timestamp.  If no entry
-// matches the key an timestamp, nil is returned.
-func (d *indirectIndex) Entry(key string, timestamp time.Time) *IndexEntry {
-	entries := d.Entries(key)
-	for _, entry := range entries {
-		if entry.Contains(timestamp) {
-			return entry
-		}
-	}
-	return nil
-}
-
-// MarshalBinary returns a byte slice encoded version of the index.
-func (d *indirectIndex) MarshalBinary() ([]byte, error) {
-	return d.b, nil
-}
-
-// UnmarshalBinary populates an index from an encoded byte slice
-// representation of an index.
-func (d *indirectIndex) UnmarshalBinary(b []byte) error {
-	// Keep a reference to the actual index bytes
-	d.b = b
-
-	// To create our "indirect" index, we need to find he location of all the keys in
-	// the raw byte slice.  The keys are listed once each (in sorted order).  Following
-	// each key is a time ordered list of index entry blocks for that key.  The loop below
-	// basically skips across the slice keeping track of the counter when we are at a key
-	// field.
-	var i int32
-	for i < int32(len(b)) {
-		d.offsets = append(d.offsets, i)
-		keyLen := int32(btou16(b[i : i+2]))
-		// Skip to the start of the key
-		i += 2
-
-		// Skip over the key
-		i += keyLen
-
-		// Count of all the index blocks for this key
-		count := int32(btou16(b[i : i+2]))
-
-		// Skip the count bytes
-		i += 2
-
-		// Skip over all the blocks
-		i += count * indexEntrySize
-	}
-	return nil
-}
-
-func (d *indirectIndex) readKey(b []byte) (n int, key string, err error) {
-	// 2 byte size of key
-	n, size := 2, int(btou16(b[:2]))
-
-	// N byte key
-	key = string(b[n : n+size])
-	n += len(key)
-	return
-}
-
-func (d *indirectIndex) readEntries(b []byte) (n int, entries indexEntries, err error) {
-	// 2 byte count of index entries
-	n, count := 2, int(btou16(b[:2]))
-
-	for i := 0; i < count; i++ {
-		ie := &IndexEntry{}
-		if err := ie.UnmarshalBinary(b[i*indexEntrySize+2 : i*indexEntrySize+2+indexEntrySize]); err != nil {
-			return 0, nil, fmt.Errorf("readEntries: unmarshal error: %v", err)
-		}
-		entries = append(entries, ie)
-		n += indexEntrySize
-	}
-	return
-}
-
-// tsmWriter writes keys and values in the TSM format
-type tsmWriter struct {
-	w     io.Writer
-	index TSMIndex
-	n     int64
-}
-
-func NewTSMWriter(w io.Writer) (TSMWriter, error) {
-	n, err := w.Write(append(u32tob(MagicNumber), Version))
-	if err != nil {
-		return nil, err
-	}
-
-	index := &directIndex{
-		blocks: map[string]indexEntries{},
-	}
-
-	return &tsmWriter{w: w, index: index, n: int64(n)}, nil
-}
-
-func (t *tsmWriter) Write(key string, values Values) error {
-	block, err := values.Encode(nil)
-	if err != nil {
-		return err
-	}
-
-	checksum := crc32.ChecksumIEEE(block)
-
-	n, err := t.w.Write(append(u32tob(checksum), block...))
-	if err != nil {
-		return err
-	}
-
-	// Record this block in index
-	t.index.Add(key, values[0].Time(), values[len(values)-1].Time(), t.n, uint32(n))
-
-	// Increment file position pointer
-	t.n += int64(n)
-	return nil
-}
-
-func (t *tsmWriter) Close() error {
-	indexPos := t.n
-
-	// Generate the index bytes
-	b, err := t.index.MarshalBinary()
-	if err != nil {
-		return err
-	}
-
-	// Write the index followed by index position
-	_, err = t.w.Write(append(b, u64tob(uint64(indexPos))...))
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-type tsmReader struct {
-	r                    io.ReadSeeker
-	indexStart, indexEnd int64
-	index                TSMIndex
-}
-
-func NewTSMReader(r io.ReadSeeker) (*tsmReader, error) {
-	t := &tsmReader{r: r}
-	if err := t.init(); err != nil {
-		return nil, err
-	}
-
-	return t, nil
-}
-
-func (t *tsmReader) init() error {
-	// Current the readers size
-	size, err := t.r.Seek(0, os.SEEK_END)
-	if err != nil {
-		return fmt.Errorf("init: failed to seek: %v", err)
-	}
-
-	t.indexEnd = size - 8
-
-	// Seek to index location pointer
-	_, err = t.r.Seek(-8, os.SEEK_END)
-	if err != nil {
-		return fmt.Errorf("init: failed to seek to index ptr: %v", err)
-	}
-
-	// Read the absolute position of the start of the index
-	b := make([]byte, 8)
-	_, err = t.r.Read(b)
-	if err != nil {
-		return fmt.Errorf("init: failed to read index ptr: %v", err)
-
-	}
-
-	t.indexStart = int64(btou64(b))
-
-	_, err = t.r.Seek(t.indexStart, os.SEEK_SET)
-	if err != nil {
-		return fmt.Errorf("init: failed to seek to index: %v", err)
-	}
-
-	b = make([]byte, t.indexEnd-t.indexStart)
-	t.index = &directIndex{
-		blocks: map[string]indexEntries{},
-	}
-	_, err = t.r.Read(b)
-	if err != nil {
-		return fmt.Errorf("init: read index: %v", err)
-	}
-
-	if err := t.index.UnmarshalBinary(b); err != nil {
-		return fmt.Errorf("init: unmarshal error: %v", err)
-	}
-
-	return nil
-}
-
-func (t *tsmReader) Read(key string, timestamp time.Time) ([]Value, error) {
-	block := t.index.Entry(key, timestamp)
-	if block == nil {
-		return nil, nil
-	}
-
-	// TODO: remove this allocation
-	b := make([]byte, 16*1024)
-	_, err := t.r.Seek(block.Offset, os.SEEK_SET)
-	if err != nil {
-		return nil, err
-	}
-
-	if int(block.Size) > len(b) {
-		b = make([]byte, block.Size)
-	}
-
-	n, err := t.r.Read(b)
-	if err != nil {
-		return nil, err
-	}
-
-	//TODO: Validate checksum
-	var values []Value
-	err = DecodeBlock(b[4:n], &values)
-	if err != nil {
-		return nil, err
-	}
-
-	return values, nil
-}
-
-// ReadAll returns all values for a key in all blocks.
-func (t *tsmReader) ReadAll(key string) ([]Value, error) {
-	var values []Value
-	blocks := t.index.Entries(key)
-	if len(blocks) == 0 {
-		return values, nil
-	}
-
-	var temp []Value
-	// TODO: we can determine the max block size when loading the file create/re-use
-	// a reader level buf then.
-	b := make([]byte, 16*1024)
-	for _, block := range blocks {
-		_, err := t.r.Seek(block.Offset, os.SEEK_SET)
-		if err != nil {
-			return nil, err
-		}
-
-		if int(block.Size) > len(b) {
-			b = make([]byte, block.Size)
-		}
-
-		n, err := t.r.Read(b)
-		if err != nil {
-			return nil, err
-		}
-
-		//TODO: Validate checksum
-		temp = temp[:0]
-		err = DecodeBlock(b[4:n], &temp)
-		if err != nil {
-			return nil, err
-		}
-		values = append(values, temp...)
-	}
-
-	return values, nil
-}
-
-type indexEntries []*IndexEntry
-
-func (a indexEntries) Len() int           { return len(a) }
-func (a indexEntries) Swap(i, j int)      { a[i], a[j] = a[j], a[i] }
-func (a indexEntries) Less(i, j int) bool { return a[i].MinTime.UnixNano() < a[j].MinTime.UnixNano() }
-
-func u16tob(v uint16) []byte {
-	b := make([]byte, 2)
-	binary.BigEndian.PutUint16(b, v)
-	return b
-}
-
-func btou16(b []byte) uint16 {
-	return uint16(binary.BigEndian.Uint16(b))
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/engine/tsm1/data_file_test.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/engine/tsm1/data_file_test.go
deleted file mode 100644
index 71e857b98..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/engine/tsm1/data_file_test.go
+++ /dev/null
@@ -1,426 +0,0 @@
-package tsm1_test
-
-import (
-	"bytes"
-	"encoding/binary"
-	"testing"
-	"time"
-
-	"github.com/influxdb/influxdb/tsdb/engine/tsm1"
-)
-
-func TestTSMWriter_Write_Empty(t *testing.T) {
-	var b bytes.Buffer
-	w, err := tsm1.NewTSMWriter(&b)
-	if err != nil {
-		t.Fatalf("unexpected error created writer: %v", err)
-	}
-
-	if err := w.Close(); err != nil {
-		t.Fatalf("unexpeted error closing: %v", err)
-	}
-
-	if got, exp := len(b.Bytes()), 5; got < exp {
-		t.Fatalf("file size mismatch: got %v, exp %v", got, exp)
-	}
-	if got := binary.BigEndian.Uint32(b.Bytes()[0:4]); got != tsm1.MagicNumber {
-		t.Fatalf("magic number mismatch: got %v, exp %v", got, tsm1.MagicNumber)
-	}
-}
-
-func TestTSMWriter_Write_Single(t *testing.T) {
-	var b bytes.Buffer
-	w, err := tsm1.NewTSMWriter(&b)
-	if err != nil {
-		t.Fatalf("unexpected error creating writer: %v", err)
-	}
-
-	values := []tsm1.Value{tsm1.NewValue(time.Unix(0, 0), 1.0)}
-	if err := w.Write("cpu", values); err != nil {
-		t.Fatalf("unexpeted error writing: %v", err)
-
-	}
-	if err := w.Close(); err != nil {
-		t.Fatalf("unexpeted error closing: %v", err)
-	}
-
-	if got, exp := len(b.Bytes()), 5; got < exp {
-		t.Fatalf("file size mismatch: got %v, exp %v", got, exp)
-	}
-	if got := binary.BigEndian.Uint32(b.Bytes()[0:4]); got != tsm1.MagicNumber {
-		t.Fatalf("magic number mismatch: got %v, exp %v", got, tsm1.MagicNumber)
-	}
-
-	r, err := tsm1.NewTSMReader(bytes.NewReader(b.Bytes()))
-	if err != nil {
-		t.Fatalf("unexpected error created reader: %v", err)
-	}
-
-	readValues, err := r.ReadAll("cpu")
-	if err != nil {
-		t.Fatalf("unexpeted error readin: %v", err)
-	}
-
-	if len(readValues) != len(values) {
-		t.Fatalf("read values length mismatch: got %v, exp %v", len(readValues), len(values))
-	}
-
-	for i, v := range values {
-		if v.Value() != readValues[i].Value() {
-			t.Fatalf("read value mismatch(%d): got %v, exp %d", i, readValues[i].Value(), v.Value())
-		}
-	}
-}
-
-func TestTSMWriter_Write_Multiple(t *testing.T) {
-	var b bytes.Buffer
-	w, err := tsm1.NewTSMWriter(&b)
-	if err != nil {
-		t.Fatalf("unexpected error creating writer: %v", err)
-	}
-
-	var data = []struct {
-		key    string
-		values []tsm1.Value
-	}{
-		{"cpu", []tsm1.Value{tsm1.NewValue(time.Unix(0, 0), 1.0)}},
-		{"mem", []tsm1.Value{tsm1.NewValue(time.Unix(1, 0), 2.0)}},
-	}
-
-	for _, d := range data {
-		if err := w.Write(d.key, d.values); err != nil {
-			t.Fatalf("unexpeted error writing: %v", err)
-		}
-	}
-
-	if err := w.Close(); err != nil {
-		t.Fatalf("unexpeted error closing: %v", err)
-	}
-
-	r, err := tsm1.NewTSMReader(bytes.NewReader(b.Bytes()))
-	if err != nil {
-		t.Fatalf("unexpected error created reader: %v", err)
-	}
-
-	for _, d := range data {
-		readValues, err := r.ReadAll(d.key)
-		if err != nil {
-			t.Fatalf("unexpeted error readin: %v", err)
-		}
-
-		if exp := len(d.values); exp != len(readValues) {
-			t.Fatalf("read values length mismatch: got %v, exp %v", len(readValues), exp)
-		}
-
-		for i, v := range d.values {
-			if v.Value() != readValues[i].Value() {
-				t.Fatalf("read value mismatch(%d): got %v, exp %d", i, readValues[i].Value(), v.Value())
-			}
-		}
-	}
-}
-
-func TestTSMWriter_Write_MultipleKeyValues(t *testing.T) {
-	var b bytes.Buffer
-	w, err := tsm1.NewTSMWriter(&b)
-	if err != nil {
-		t.Fatalf("unexpected error creating writer: %v", err)
-	}
-
-	var data = []struct {
-		key    string
-		values []tsm1.Value
-	}{
-		{"cpu", []tsm1.Value{
-			tsm1.NewValue(time.Unix(0, 0), 1.0),
-			tsm1.NewValue(time.Unix(1, 0), 2.0)},
-		},
-		{"mem", []tsm1.Value{
-			tsm1.NewValue(time.Unix(0, 0), 1.5),
-			tsm1.NewValue(time.Unix(1, 0), 2.5)},
-		},
-	}
-
-	for _, d := range data {
-		if err := w.Write(d.key, d.values); err != nil {
-			t.Fatalf("unexpeted error writing: %v", err)
-		}
-	}
-
-	if err := w.Close(); err != nil {
-		t.Fatalf("unexpeted error closing: %v", err)
-	}
-
-	r, err := tsm1.NewTSMReader(bytes.NewReader(b.Bytes()))
-	if err != nil {
-		t.Fatalf("unexpected error created reader: %v", err)
-	}
-
-	for _, d := range data {
-		readValues, err := r.ReadAll(d.key)
-		if err != nil {
-			t.Fatalf("unexpeted error readin: %v", err)
-		}
-
-		if exp := len(d.values); exp != len(readValues) {
-			t.Fatalf("read values length mismatch: got %v, exp %v", len(readValues), exp)
-		}
-
-		for i, v := range d.values {
-			if v.Value() != readValues[i].Value() {
-				t.Fatalf("read value mismatch(%d): got %v, exp %d", i, readValues[i].Value(), v.Value())
-			}
-		}
-	}
-}
-
-// Tests that writing keys in reverse is able to read them back.
-func TestTSMWriter_Write_ReverseKeys(t *testing.T) {
-	var b bytes.Buffer
-	w, err := tsm1.NewTSMWriter(&b)
-	if err != nil {
-		t.Fatalf("unexpected error creating writer: %v", err)
-	}
-
-	var data = []struct {
-		key    string
-		values []tsm1.Value
-	}{
-		{"mem", []tsm1.Value{
-			tsm1.NewValue(time.Unix(0, 0), 1.5),
-			tsm1.NewValue(time.Unix(1, 0), 2.5)},
-		},
-		{"cpu", []tsm1.Value{
-			tsm1.NewValue(time.Unix(0, 0), 1.0),
-			tsm1.NewValue(time.Unix(1, 0), 2.0)},
-		},
-	}
-
-	for _, d := range data {
-		if err := w.Write(d.key, d.values); err != nil {
-			t.Fatalf("unexpeted error writing: %v", err)
-		}
-	}
-
-	if err := w.Close(); err != nil {
-		t.Fatalf("unexpeted error closing: %v", err)
-	}
-
-	r, err := tsm1.NewTSMReader(bytes.NewReader(b.Bytes()))
-	if err != nil {
-		t.Fatalf("unexpected error created reader: %v", err)
-	}
-
-	for _, d := range data {
-		readValues, err := r.ReadAll(d.key)
-		if err != nil {
-			t.Fatalf("unexpeted error readin: %v", err)
-		}
-
-		if exp := len(d.values); exp != len(readValues) {
-			t.Fatalf("read values length mismatch: got %v, exp %v", len(readValues), exp)
-		}
-
-		for i, v := range d.values {
-			if v.Value() != readValues[i].Value() {
-				t.Fatalf("read value mismatch(%d): got %v, exp %d", i, readValues[i].Value(), v.Value())
-			}
-		}
-	}
-}
-
-// Tests that writing keys in reverse is able to read them back.
-func TestTSMWriter_Write_SameKey(t *testing.T) {
-	var b bytes.Buffer
-	w, err := tsm1.NewTSMWriter(&b)
-	if err != nil {
-		t.Fatalf("unexpected error creating writer: %v", err)
-	}
-
-	var data = []struct {
-		key    string
-		values []tsm1.Value
-	}{
-		{"cpu", []tsm1.Value{
-			tsm1.NewValue(time.Unix(0, 0), 1.0),
-			tsm1.NewValue(time.Unix(1, 0), 2.0)},
-		},
-		{"cpu", []tsm1.Value{
-			tsm1.NewValue(time.Unix(2, 0), 3.0),
-			tsm1.NewValue(time.Unix(3, 0), 4.0)},
-		},
-	}
-
-	for _, d := range data {
-		if err := w.Write(d.key, d.values); err != nil {
-			t.Fatalf("unexpeted error writing: %v", err)
-		}
-	}
-
-	if err := w.Close(); err != nil {
-		t.Fatalf("unexpeted error closing: %v", err)
-	}
-
-	r, err := tsm1.NewTSMReader(bytes.NewReader(b.Bytes()))
-	if err != nil {
-		t.Fatalf("unexpected error created reader: %v", err)
-	}
-
-	values := append(data[0].values, data[1].values...)
-
-	readValues, err := r.ReadAll("cpu")
-	if err != nil {
-		t.Fatalf("unexpeted error readin: %v", err)
-	}
-
-	if exp := len(values); exp != len(readValues) {
-		t.Fatalf("read values length mismatch: got %v, exp %v", len(readValues), exp)
-	}
-
-	for i, v := range values {
-		if v.Value() != readValues[i].Value() {
-			t.Fatalf("read value mismatch(%d): got %v, exp %d", i, readValues[i].Value(), v.Value())
-		}
-	}
-}
-
-// Tests that calling Read returns all the values for block matching the key
-// and timestamp
-func TestTSMWriter_Read_Multiple(t *testing.T) {
-	var b bytes.Buffer
-	w, err := tsm1.NewTSMWriter(&b)
-	if err != nil {
-		t.Fatalf("unexpected error creating writer: %v", err)
-	}
-
-	var data = []struct {
-		key    string
-		values []tsm1.Value
-	}{
-		{"cpu", []tsm1.Value{
-			tsm1.NewValue(time.Unix(0, 0), 1.0),
-			tsm1.NewValue(time.Unix(1, 0), 2.0)},
-		},
-		{"cpu", []tsm1.Value{
-			tsm1.NewValue(time.Unix(2, 0), 3.0),
-			tsm1.NewValue(time.Unix(3, 0), 4.0)},
-		},
-	}
-
-	for _, d := range data {
-		if err := w.Write(d.key, d.values); err != nil {
-			t.Fatalf("unexpeted error writing: %v", err)
-		}
-	}
-
-	if err := w.Close(); err != nil {
-		t.Fatalf("unexpeted error closing: %v", err)
-	}
-
-	r, err := tsm1.NewTSMReader(bytes.NewReader(b.Bytes()))
-	if err != nil {
-		t.Fatalf("unexpected error created reader: %v", err)
-	}
-
-	for _, values := range data {
-		// Try the first timestamp
-		readValues, err := r.Read("cpu", values.values[0].Time())
-		if err != nil {
-			t.Fatalf("unexpeted error readin: %v", err)
-		}
-
-		if exp := len(values.values); exp != len(readValues) {
-			t.Fatalf("read values length mismatch: got %v, exp %v", len(readValues), exp)
-		}
-
-		for i, v := range values.values {
-			if v.Value() != readValues[i].Value() {
-				t.Fatalf("read value mismatch(%d): got %v, exp %d", i, readValues[i].Value(), v.Value())
-			}
-		}
-
-		// Try the last timestamp too
-		readValues, err = r.Read("cpu", values.values[1].Time())
-		if err != nil {
-			t.Fatalf("unexpeted error readin: %v", err)
-		}
-
-		if exp := len(values.values); exp != len(readValues) {
-			t.Fatalf("read values length mismatch: got %v, exp %v", len(readValues), exp)
-		}
-
-		for i, v := range values.values {
-			if v.Value() != readValues[i].Value() {
-				t.Fatalf("read value mismatch(%d): got %v, exp %d", i, readValues[i].Value(), v.Value())
-			}
-		}
-
-	}
-}
-
-func TestIndirectIndex_Entries(t *testing.T) {
-	index := tsm1.NewDirectIndex()
-	index.Add("cpu", time.Unix(0, 0), time.Unix(1, 0), 10, 100)
-	index.Add("cpu", time.Unix(2, 0), time.Unix(3, 0), 20, 200)
-	index.Add("mem", time.Unix(0, 0), time.Unix(1, 0), 10, 100)
-
-	b, err := index.MarshalBinary()
-	if err != nil {
-		t.Fatalf("unexpected error marshaling index: %v", err)
-	}
-
-	indirect := tsm1.NewIndirectIndex()
-	if err := indirect.UnmarshalBinary(b); err != nil {
-		t.Fatalf("unexpected error unmarshaling index: %v", err)
-	}
-
-	exp := index.Entries("cpu")
-	entries := indirect.Entries("cpu")
-
-	if got, exp := len(entries), len(exp); got != exp {
-		t.Fatalf("entries length mismatch: got %v, exp %v", got, exp)
-	}
-
-	for i, exp := range exp {
-		got := entries[i]
-		if exp.MinTime != got.MinTime {
-			t.Fatalf("minTime mismatch: got %v, exp %v", got.MinTime, exp.MinTime)
-		}
-
-		if exp.MaxTime != got.MaxTime {
-			t.Fatalf("minTime mismatch: got %v, exp %v", got.MaxTime, exp.MaxTime)
-		}
-
-		if exp.Size != got.Size {
-			t.Fatalf("size mismatch: got %v, exp %v", got.Size, exp.Size)
-		}
-		if exp.Offset != got.Offset {
-			t.Fatalf("size mismatch: got %v, exp %v", got.Offset, exp.Offset)
-		}
-	}
-}
-
-func TestIndirectIndex_Entries_NonExistent(t *testing.T) {
-	index := tsm1.NewDirectIndex()
-	index.Add("cpu", time.Unix(0, 0), time.Unix(1, 0), 10, 100)
-	index.Add("cpu", time.Unix(2, 0), time.Unix(3, 0), 20, 200)
-
-	b, err := index.MarshalBinary()
-	if err != nil {
-		t.Fatalf("unexpected error marshaling index: %v", err)
-	}
-
-	indirect := tsm1.NewIndirectIndex()
-	if err := indirect.UnmarshalBinary(b); err != nil {
-		t.Fatalf("unexpected error unmarshaling index: %v", err)
-	}
-
-	// mem has not been added to the index so we should get now entries back
-	// for both
-	exp := index.Entries("mem")
-	entries := indirect.Entries("mem")
-
-	if got, exp := len(entries), len(exp); got != exp && exp != 0 {
-		t.Fatalf("entries length mismatch: got %v, exp %v", got, exp)
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/engine/tsm1/encoding.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/engine/tsm1/encoding.go
deleted file mode 100644
index cd8ea59f5..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/engine/tsm1/encoding.go
+++ /dev/null
@@ -1,541 +0,0 @@
-package tsm1
-
-import (
-	"encoding/binary"
-	"fmt"
-	"sort"
-	"time"
-
-	"github.com/influxdb/influxdb/tsdb"
-)
-
-const (
-	// BlockFloat64 designates a block encodes float64 values
-	BlockFloat64 = 0
-
-	// BlockInt64 designates a block encodes int64 values
-	BlockInt64 = 1
-
-	// BlockBool designates a block encodes bool values
-	BlockBool = 2
-
-	// BlockString designates a block encodes string values
-	BlockString = 3
-
-	// encodedBlockHeaderSize is the size of the header for an encoded block.  The first 8 bytes
-	// are the minimum timestamp of the block.  The next byte is a block encoding type indicator.
-	encodedBlockHeaderSize = 9
-)
-
-type Value interface {
-	Time() time.Time
-	UnixNano() int64
-	Value() interface{}
-	Size() int
-}
-
-func NewValue(t time.Time, value interface{}) Value {
-	switch v := value.(type) {
-	case int64:
-		return &Int64Value{time: t, value: v}
-	case float64:
-		return &FloatValue{time: t, value: v}
-	case bool:
-		return &BoolValue{time: t, value: v}
-	case string:
-		return &StringValue{time: t, value: v}
-	}
-	return &EmptyValue{}
-}
-
-type EmptyValue struct {
-}
-
-func (e *EmptyValue) UnixNano() int64    { return tsdb.EOF }
-func (e *EmptyValue) Time() time.Time    { return time.Unix(0, tsdb.EOF) }
-func (e *EmptyValue) Value() interface{} { return nil }
-func (e *EmptyValue) Size() int          { return 0 }
-
-// Values represented a time ascending sorted collection of Value types.
-// the underlying type should be the same across all values, but the interface
-// makes the code cleaner.
-type Values []Value
-
-func (a Values) MinTime() int64 {
-	return a[0].Time().UnixNano()
-}
-
-func (a Values) MaxTime() int64 {
-	return a[len(a)-1].Time().UnixNano()
-}
-
-// Encode converts the values to a byte slice.  If there are no values,
-// this function panics.
-func (a Values) Encode(buf []byte) ([]byte, error) {
-	if len(a) == 0 {
-		panic("unable to encode block type")
-	}
-
-	switch a[0].(type) {
-	case *FloatValue:
-		return encodeFloatBlock(buf, a)
-	case *Int64Value:
-		return encodeInt64Block(buf, a)
-	case *BoolValue:
-		return encodeBoolBlock(buf, a)
-	case *StringValue:
-		return encodeStringBlock(buf, a)
-	}
-
-	return nil, fmt.Errorf("unsupported value type %T", a[0])
-}
-
-// DecodeBlock takes a byte array and will decode into values of the appropriate type
-// based on the block
-func DecodeBlock(block []byte, vals *[]Value) error {
-	if len(block) <= encodedBlockHeaderSize {
-		panic(fmt.Sprintf("decode of short block: got %v, exp %v", len(block), encodedBlockHeaderSize))
-	}
-
-	blockType := block[8]
-	switch blockType {
-	case BlockFloat64:
-		return decodeFloatBlock(block, vals)
-	case BlockInt64:
-		return decodeInt64Block(block, vals)
-	case BlockBool:
-		return decodeBoolBlock(block, vals)
-	case BlockString:
-		return decodeStringBlock(block, vals)
-	default:
-		panic(fmt.Sprintf("unknown block type: %d", blockType))
-	}
-}
-
-// Deduplicate returns a new Values slice with any values
-// that have the same  timestamp removed. The Value that appears
-// last in the slice is the one that is kept. The returned slice is in ascending order
-func (a Values) Deduplicate() Values {
-	m := make(map[int64]Value)
-	for _, val := range a {
-		m[val.UnixNano()] = val
-	}
-
-	other := make([]Value, 0, len(m))
-	for _, val := range m {
-		other = append(other, val)
-	}
-	sort.Sort(Values(other))
-
-	return other
-}
-
-// Sort methods
-func (a Values) Len() int           { return len(a) }
-func (a Values) Swap(i, j int)      { a[i], a[j] = a[j], a[i] }
-func (a Values) Less(i, j int) bool { return a[i].Time().UnixNano() < a[j].Time().UnixNano() }
-
-type FloatValue struct {
-	time  time.Time
-	value float64
-}
-
-func (f *FloatValue) Time() time.Time {
-	return f.time
-}
-
-func (f *FloatValue) UnixNano() int64 {
-	return f.time.UnixNano()
-}
-
-func (f *FloatValue) Value() interface{} {
-	return f.value
-}
-
-func (f *FloatValue) Size() int {
-	return 16
-}
-
-func encodeFloatBlock(buf []byte, values []Value) ([]byte, error) {
-	if len(values) == 0 {
-		return nil, nil
-	}
-
-	// A float block is encoded using different compression strategies
-	// for timestamps and values.
-
-	// Encode values using Gorilla float compression
-	venc := NewFloatEncoder()
-
-	// Encode timestamps using an adaptive encoder that uses delta-encoding,
-	// frame-or-reference and run length encoding.
-	tsenc := NewTimeEncoder()
-
-	for _, v := range values {
-		tsenc.Write(v.Time())
-		venc.Push(v.(*FloatValue).value)
-	}
-	venc.Finish()
-
-	// Encoded timestamp values
-	tb, err := tsenc.Bytes()
-	if err != nil {
-		return nil, err
-	}
-	// Encoded float values
-	vb, err := venc.Bytes()
-	if err != nil {
-		return nil, err
-	}
-
-	// Prepend the first timestamp of the block in the first 8 bytes and the block
-	// in the next byte, followed by the block
-	block := packBlockHeader(values[0].Time(), BlockFloat64)
-	block = append(block, packBlock(tb, vb)...)
-	return block, nil
-}
-
-func decodeFloatBlock(block []byte, a *[]Value) error {
-	// The first 8 bytes is the minimum timestamp of the block
-	block = block[8:]
-
-	// Block type is the next block, make sure we actually have a float block
-	blockType := block[0]
-	if blockType != BlockFloat64 {
-		return fmt.Errorf("invalid block type: exp %d, got %d", BlockFloat64, blockType)
-	}
-	block = block[1:]
-
-	tb, vb := unpackBlock(block)
-
-	// Setup our timestamp and value decoders
-	dec := NewTimeDecoder(tb)
-	iter, err := NewFloatDecoder(vb)
-	if err != nil {
-		return err
-	}
-
-	// Decode both a timestamp and value
-	for dec.Next() && iter.Next() {
-		ts := dec.Read()
-		v := iter.Values()
-		*a = append(*a, &FloatValue{ts, v})
-	}
-
-	// Did timestamp decoding have an error?
-	if dec.Error() != nil {
-		return dec.Error()
-	}
-	// Did float decoding have an error?
-	if iter.Error() != nil {
-		return iter.Error()
-	}
-
-	return nil
-}
-
-type BoolValue struct {
-	time  time.Time
-	value bool
-}
-
-func (b *BoolValue) Time() time.Time {
-	return b.time
-}
-
-func (b *BoolValue) Size() int {
-	return 9
-}
-
-func (b *BoolValue) UnixNano() int64 {
-	return b.time.UnixNano()
-}
-
-func (b *BoolValue) Value() interface{} {
-	return b.value
-}
-
-func encodeBoolBlock(buf []byte, values []Value) ([]byte, error) {
-	if len(values) == 0 {
-		return nil, nil
-	}
-
-	// A bool block is encoded using different compression strategies
-	// for timestamps and values.
-
-	// Encode values using Gorilla float compression
-	venc := NewBoolEncoder()
-
-	// Encode timestamps using an adaptive encoder
-	tsenc := NewTimeEncoder()
-
-	for _, v := range values {
-		tsenc.Write(v.Time())
-		venc.Write(v.(*BoolValue).value)
-	}
-
-	// Encoded timestamp values
-	tb, err := tsenc.Bytes()
-	if err != nil {
-		return nil, err
-	}
-	// Encoded float values
-	vb, err := venc.Bytes()
-	if err != nil {
-		return nil, err
-	}
-
-	// Prepend the first timestamp of the block in the first 8 bytes and the block
-	// in the next byte, followed by the block
-	block := packBlockHeader(values[0].Time(), BlockBool)
-	block = append(block, packBlock(tb, vb)...)
-	return block, nil
-}
-
-func decodeBoolBlock(block []byte, a *[]Value) error {
-	// The first 8 bytes is the minimum timestamp of the block
-	block = block[8:]
-
-	// Block type is the next block, make sure we actually have a float block
-	blockType := block[0]
-	if blockType != BlockBool {
-		return fmt.Errorf("invalid block type: exp %d, got %d", BlockBool, blockType)
-	}
-	block = block[1:]
-
-	tb, vb := unpackBlock(block)
-
-	// Setup our timestamp and value decoders
-	dec := NewTimeDecoder(tb)
-	vdec := NewBoolDecoder(vb)
-
-	// Decode both a timestamp and value
-	for dec.Next() && vdec.Next() {
-		ts := dec.Read()
-		v := vdec.Read()
-		*a = append(*a, &BoolValue{ts, v})
-	}
-
-	// Did timestamp decoding have an error?
-	if dec.Error() != nil {
-		return dec.Error()
-	}
-	// Did bool decoding have an error?
-	if vdec.Error() != nil {
-		return vdec.Error()
-	}
-
-	return nil
-}
-
-type Int64Value struct {
-	time  time.Time
-	value int64
-}
-
-func (v *Int64Value) Time() time.Time {
-	return v.time
-}
-
-func (v *Int64Value) Value() interface{} {
-	return v.value
-}
-
-func (v *Int64Value) UnixNano() int64 {
-	return v.time.UnixNano()
-}
-
-func (v *Int64Value) Size() int {
-	return 16
-}
-
-func (v *Int64Value) String() string { return fmt.Sprintf("%v", v.value) }
-
-func encodeInt64Block(buf []byte, values []Value) ([]byte, error) {
-	tsEnc := NewTimeEncoder()
-	vEnc := NewInt64Encoder()
-	for _, v := range values {
-		tsEnc.Write(v.Time())
-		vEnc.Write(v.(*Int64Value).value)
-	}
-
-	// Encoded timestamp values
-	tb, err := tsEnc.Bytes()
-	if err != nil {
-		return nil, err
-	}
-	// Encoded int64 values
-	vb, err := vEnc.Bytes()
-	if err != nil {
-		return nil, err
-	}
-
-	// Prepend the first timestamp of the block in the first 8 bytes
-	block := packBlockHeader(values[0].Time(), BlockInt64)
-	return append(block, packBlock(tb, vb)...), nil
-}
-
-func decodeInt64Block(block []byte, a *[]Value) error {
-	// slice off the first 8 bytes (min timestmap for the block)
-	block = block[8:]
-
-	blockType := block[0]
-	if blockType != BlockInt64 {
-		return fmt.Errorf("invalid block type: exp %d, got %d", BlockInt64, blockType)
-	}
-
-	block = block[1:]
-
-	// The first 8 bytes is the minimum timestamp of the block
-	tb, vb := unpackBlock(block)
-
-	// Setup our timestamp and value decoders
-	tsDec := NewTimeDecoder(tb)
-	vDec := NewInt64Decoder(vb)
-
-	// Decode both a timestamp and value
-	for tsDec.Next() && vDec.Next() {
-		ts := tsDec.Read()
-		v := vDec.Read()
-		*a = append(*a, &Int64Value{ts, v})
-	}
-
-	// Did timestamp decoding have an error?
-	if tsDec.Error() != nil {
-		return tsDec.Error()
-	}
-	// Did int64 decoding have an error?
-	if vDec.Error() != nil {
-		return vDec.Error()
-	}
-
-	return nil
-}
-
-type StringValue struct {
-	time  time.Time
-	value string
-}
-
-func (v *StringValue) Time() time.Time {
-	return v.time
-}
-
-func (v *StringValue) Value() interface{} {
-	return v.value
-}
-
-func (v *StringValue) UnixNano() int64 {
-	return v.time.UnixNano()
-}
-
-func (v *StringValue) Size() int {
-	return 8 + len(v.value)
-}
-
-func (v *StringValue) String() string { return v.value }
-
-func encodeStringBlock(buf []byte, values []Value) ([]byte, error) {
-	tsEnc := NewTimeEncoder()
-	vEnc := NewStringEncoder()
-	for _, v := range values {
-		tsEnc.Write(v.Time())
-		vEnc.Write(v.(*StringValue).value)
-	}
-
-	// Encoded timestamp values
-	tb, err := tsEnc.Bytes()
-	if err != nil {
-		return nil, err
-	}
-	// Encoded string values
-	vb, err := vEnc.Bytes()
-	if err != nil {
-		return nil, err
-	}
-
-	// Prepend the first timestamp of the block in the first 8 bytes
-	block := packBlockHeader(values[0].Time(), BlockString)
-	return append(block, packBlock(tb, vb)...), nil
-}
-
-func decodeStringBlock(block []byte, a *[]Value) error {
-	// slice off the first 8 bytes (min timestmap for the block)
-	block = block[8:]
-
-	blockType := block[0]
-	if blockType != BlockString {
-		return fmt.Errorf("invalid block type: exp %d, got %d", BlockString, blockType)
-	}
-
-	block = block[1:]
-
-	// The first 8 bytes is the minimum timestamp of the block
-	tb, vb := unpackBlock(block)
-
-	// Setup our timestamp and value decoders
-	tsDec := NewTimeDecoder(tb)
-	vDec, err := NewStringDecoder(vb)
-	if err != nil {
-		return err
-	}
-
-	// Decode both a timestamp and value
-	for tsDec.Next() && vDec.Next() {
-		ts := tsDec.Read()
-		v := vDec.Read()
-		*a = append(*a, &StringValue{ts, v})
-	}
-
-	// Did timestamp decoding have an error?
-	if tsDec.Error() != nil {
-		return tsDec.Error()
-	}
-	// Did string decoding have an error?
-	if vDec.Error() != nil {
-		return vDec.Error()
-	}
-
-	return nil
-}
-
-func packBlockHeader(firstTime time.Time, blockType byte) []byte {
-	return append(u64tob(uint64(firstTime.UnixNano())), blockType)
-}
-
-func packBlock(ts []byte, values []byte) []byte {
-	// We encode the length of the timestamp block using a variable byte encoding.
-	// This allows small byte slices to take up 1 byte while larger ones use 2 or more.
-	b := make([]byte, 10)
-	i := binary.PutUvarint(b, uint64(len(ts)))
-
-	// block is <len timestamp bytes>, <ts bytes>, <value bytes>
-	block := append(b[:i], ts...)
-
-	// We don't encode the value length because we know it's the rest of the block after
-	// the timestamp block.
-	return append(block, values...)
-}
-
-func unpackBlock(buf []byte) (ts, values []byte) {
-	// Unpack the timestamp block length
-	tsLen, i := binary.Uvarint(buf)
-
-	// Unpack the timestamp bytes
-	ts = buf[int(i) : int(i)+int(tsLen)]
-
-	// Unpack the value bytes
-	values = buf[int(i)+int(tsLen):]
-	return
-}
-
-// ZigZagEncode converts a int64 to a uint64 by zig zagging negative and positive values
-// across even and odd numbers.  Eg. [0,-1,1,-2] becomes [0, 1, 2, 3]
-func ZigZagEncode(x int64) uint64 {
-	return uint64(uint64(x<<1) ^ uint64((int64(x) >> 63)))
-}
-
-// ZigZagDecode converts a previously zigzag encoded uint64 back to a int64
-func ZigZagDecode(v uint64) int64 {
-	return int64((v >> 1) ^ uint64((int64(v&1)<<63)>>63))
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/engine/tsm1/encoding_test.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/engine/tsm1/encoding_test.go
deleted file mode 100644
index 3c72afc53..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/engine/tsm1/encoding_test.go
+++ /dev/null
@@ -1,198 +0,0 @@
-package tsm1_test
-
-import (
-	"fmt"
-	"reflect"
-	"testing"
-	"time"
-
-	"github.com/davecgh/go-spew/spew"
-	"github.com/influxdb/influxdb/tsdb/engine/tsm1"
-)
-
-func TestEncoding_FloatBlock(t *testing.T) {
-	valueCount := 1000
-	times := getTimes(valueCount, 60, time.Second)
-	values := make([]tsm1.Value, len(times))
-	for i, t := range times {
-		values[i] = tsm1.NewValue(t, float64(i))
-	}
-
-	b, err := tsm1.Values(values).Encode(nil)
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-
-	var decodedValues []tsm1.Value
-	if err := tsm1.DecodeBlock(b, &decodedValues); err != nil {
-		t.Fatalf("unexpected error decoding block: %v", err)
-	}
-
-	if !reflect.DeepEqual(decodedValues, values) {
-		t.Fatalf("unexpected results:\n\tgot: %s\n\texp: %s\n", spew.Sdump(decodedValues), spew.Sdump(values))
-	}
-}
-
-func TestEncoding_FloatBlock_ZeroTime(t *testing.T) {
-	values := make([]tsm1.Value, 3)
-	for i := 0; i < 3; i++ {
-		values[i] = tsm1.NewValue(time.Unix(0, 0), float64(i))
-	}
-
-	b, err := tsm1.Values(values).Encode(nil)
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-
-	var decodedValues []tsm1.Value
-	if err := tsm1.DecodeBlock(b, &decodedValues); err != nil {
-		t.Fatalf("unexpected error decoding block: %v", err)
-	}
-
-	if !reflect.DeepEqual(decodedValues, values) {
-		t.Fatalf("unexpected results:\n\tgot: %v\n\texp: %v\n", decodedValues, values)
-	}
-}
-
-func TestEncoding_FloatBlock_SimilarFloats(t *testing.T) {
-	values := make([]tsm1.Value, 5)
-	values[0] = tsm1.NewValue(time.Unix(0, 1444238178437870000), 6.00065e+06)
-	values[1] = tsm1.NewValue(time.Unix(0, 1444238185286830000), 6.000656e+06)
-	values[2] = tsm1.NewValue(time.Unix(0, 1444238188441501000), 6.000657e+06)
-	values[3] = tsm1.NewValue(time.Unix(0, 1444238195286811000), 6.000659e+06)
-	values[4] = tsm1.NewValue(time.Unix(0, 1444238198439917000), 6.000661e+06)
-
-	b, err := tsm1.Values(values).Encode(nil)
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-
-	var decodedValues []tsm1.Value
-	if err := tsm1.DecodeBlock(b, &decodedValues); err != nil {
-		t.Fatalf("unexpected error decoding block: %v", err)
-	}
-
-	if !reflect.DeepEqual(decodedValues, values) {
-		t.Fatalf("unexpected results:\n\tgot: %v\n\texp: %v\n", decodedValues, values)
-	}
-}
-
-func TestEncoding_IntBlock_Basic(t *testing.T) {
-	valueCount := 1000
-	times := getTimes(valueCount, 60, time.Second)
-	values := make([]tsm1.Value, len(times))
-	for i, t := range times {
-		values[i] = tsm1.NewValue(t, int64(i))
-	}
-
-	b, err := tsm1.Values(values).Encode(nil)
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-
-	var decodedValues []tsm1.Value
-	if err := tsm1.DecodeBlock(b, &decodedValues); err != nil {
-		t.Fatalf("unexpected error decoding block: %v", err)
-	}
-
-	if len(decodedValues) != len(values) {
-		t.Fatalf("unexpected results length:\n\tgot: %v\n\texp: %v\n", len(decodedValues), len(values))
-	}
-
-	for i := 0; i < len(decodedValues); i++ {
-
-		if decodedValues[i].Time() != values[i].Time() {
-			t.Fatalf("unexpected results:\n\tgot: %v\n\texp: %v\n", decodedValues[i].Time(), values[i].Time())
-		}
-
-		if decodedValues[i].Value() != values[i].Value() {
-			t.Fatalf("unexpected results:\n\tgot: %v\n\texp: %v\n", decodedValues[i].Value(), values[i].Value())
-		}
-	}
-}
-
-func TestEncoding_IntBlock_Negatives(t *testing.T) {
-	valueCount := 1000
-	times := getTimes(valueCount, 60, time.Second)
-	values := make([]tsm1.Value, len(times))
-	for i, t := range times {
-		v := int64(i)
-		if i%2 == 0 {
-			v = -v
-		}
-		values[i] = tsm1.NewValue(t, int64(v))
-	}
-
-	b, err := tsm1.Values(values).Encode(nil)
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-
-	var decodedValues []tsm1.Value
-	if err := tsm1.DecodeBlock(b, &decodedValues); err != nil {
-		t.Fatalf("unexpected error decoding block: %v", err)
-	}
-
-	if !reflect.DeepEqual(decodedValues, values) {
-		t.Fatalf("unexpected results:\n\tgot: %v\n\texp: %v\n", decodedValues, values)
-	}
-}
-
-func TestEncoding_BoolBlock_Basic(t *testing.T) {
-	valueCount := 1000
-	times := getTimes(valueCount, 60, time.Second)
-	values := make([]tsm1.Value, len(times))
-	for i, t := range times {
-		v := true
-		if i%2 == 0 {
-			v = false
-		}
-		values[i] = tsm1.NewValue(t, v)
-	}
-
-	b, err := tsm1.Values(values).Encode(nil)
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-
-	var decodedValues []tsm1.Value
-	if err := tsm1.DecodeBlock(b, &decodedValues); err != nil {
-		t.Fatalf("unexpected error decoding block: %v", err)
-	}
-
-	if !reflect.DeepEqual(decodedValues, values) {
-		t.Fatalf("unexpected results:\n\tgot: %v\n\texp: %v\n", decodedValues, values)
-	}
-}
-
-func TestEncoding_StringBlock_Basic(t *testing.T) {
-	valueCount := 1000
-	times := getTimes(valueCount, 60, time.Second)
-	values := make([]tsm1.Value, len(times))
-	for i, t := range times {
-		values[i] = tsm1.NewValue(t, fmt.Sprintf("value %d", i))
-	}
-
-	b, err := tsm1.Values(values).Encode(nil)
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-
-	var decodedValues []tsm1.Value
-	if err := tsm1.DecodeBlock(b, &decodedValues); err != nil {
-		t.Fatalf("unexpected error decoding block: %v", err)
-	}
-
-	if !reflect.DeepEqual(decodedValues, values) {
-		t.Fatalf("unexpected results:\n\tgot: %v\n\texp: %v\n", decodedValues, values)
-	}
-}
-
-func getTimes(n, step int, precision time.Duration) []time.Time {
-	t := time.Now().Round(precision)
-	a := make([]time.Time, n)
-	for i := 0; i < n; i++ {
-		a[i] = t.Add(time.Duration(i*60) * precision)
-	}
-	return a
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/engine/tsm1/float.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/engine/tsm1/float.go
deleted file mode 100644
index 76059abc3..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/engine/tsm1/float.go
+++ /dev/null
@@ -1,241 +0,0 @@
-package tsm1
-
-/*
-This code is originally from: https://github.com/dgryski/go-tsz and has been modified to remove
-the timestamp compression fuctionality.
-
-It implements the float compression as presented in: http://www.vldb.org/pvldb/vol8/p1816-teller.pdf.
-This implementation uses a sentinel value of NaN which means that float64 NaN cannot be stored using
-this version.
-*/
-
-import (
-	"bytes"
-	"fmt"
-	"math"
-
-	"github.com/dgryski/go-bits"
-	"github.com/dgryski/go-bitstream"
-)
-
-const (
-	// floatUncompressed is an uncompressed format using 8 bytes per value.
-	// Not yet implemented.
-	floatUncompressed = 0
-
-	// floatCompressedGorilla is a compressed format using the gorilla paper encoding
-	floatCompressedGorilla = 1
-)
-
-// FloatEncoder encodes multiple float64s into a byte slice
-type FloatEncoder struct {
-	val float64
-	err error
-
-	leading  uint64
-	trailing uint64
-
-	buf bytes.Buffer
-	bw  *bitstream.BitWriter
-
-	first    bool
-	finished bool
-}
-
-func NewFloatEncoder() *FloatEncoder {
-	s := FloatEncoder{
-		first:   true,
-		leading: ^uint64(0),
-	}
-
-	s.bw = bitstream.NewWriter(&s.buf)
-
-	return &s
-
-}
-
-func (s *FloatEncoder) Bytes() ([]byte, error) {
-	return append([]byte{floatCompressedGorilla << 4}, s.buf.Bytes()...), s.err
-}
-
-func (s *FloatEncoder) Finish() {
-	if !s.finished {
-		// write an end-of-stream record
-		s.finished = true
-		s.Push(math.NaN())
-		s.bw.Flush(bitstream.Zero)
-	}
-}
-
-func (s *FloatEncoder) Push(v float64) {
-	// Only allow NaN as a sentinel value
-	if math.IsNaN(v) && !s.finished {
-		s.err = fmt.Errorf("unsupported value: NaN")
-		return
-	}
-	if s.first {
-		// first point
-		s.val = v
-		s.first = false
-		s.bw.WriteBits(math.Float64bits(v), 64)
-		return
-	}
-
-	vDelta := math.Float64bits(v) ^ math.Float64bits(s.val)
-
-	if vDelta == 0 {
-		s.bw.WriteBit(bitstream.Zero)
-	} else {
-		s.bw.WriteBit(bitstream.One)
-
-		leading := bits.Clz(vDelta)
-		trailing := bits.Ctz(vDelta)
-
-		// Clamp number of leading zeros to avoid overflow when encoding
-		leading &= 0x1F
-		if leading >= 32 {
-			leading = 31
-		}
-
-		// TODO(dgryski): check if it's 'cheaper' to reset the leading/trailing bits instead
-		if s.leading != ^uint64(0) && leading >= s.leading && trailing >= s.trailing {
-			s.bw.WriteBit(bitstream.Zero)
-			s.bw.WriteBits(vDelta>>s.trailing, 64-int(s.leading)-int(s.trailing))
-		} else {
-			s.leading, s.trailing = leading, trailing
-
-			s.bw.WriteBit(bitstream.One)
-			s.bw.WriteBits(leading, 5)
-
-			// Note that if leading == trailing == 0, then sigbits == 64.  But that
-			// value doesn't actually fit into the 6 bits we have.
-			// Luckily, we never need to encode 0 significant bits, since that would
-			// put us in the other case (vdelta == 0).  So instead we write out a 0 and
-			// adjust it back to 64 on unpacking.
-			sigbits := 64 - leading - trailing
-			s.bw.WriteBits(sigbits, 6)
-			s.bw.WriteBits(vDelta>>trailing, int(sigbits))
-		}
-	}
-
-	s.val = v
-}
-
-// FloatDecoder decodes a byte slice into multipe float64 values
-type FloatDecoder struct {
-	val float64
-
-	leading  uint64
-	trailing uint64
-
-	br *bitstream.BitReader
-
-	b []byte
-
-	first    bool
-	finished bool
-
-	err error
-}
-
-func NewFloatDecoder(b []byte) (*FloatDecoder, error) {
-	// first byte is the compression type but we currently just have gorilla
-	// compression
-	br := bitstream.NewReader(bytes.NewReader(b[1:]))
-
-	v, err := br.ReadBits(64)
-	if err != nil {
-		return nil, err
-	}
-
-	return &FloatDecoder{
-		val:   math.Float64frombits(v),
-		first: true,
-		br:    br,
-		b:     b,
-	}, nil
-}
-
-func (it *FloatDecoder) Next() bool {
-	if it.err != nil || it.finished {
-		return false
-	}
-
-	if it.first {
-		it.first = false
-
-		// mark as finished if there were no values.
-		if math.IsNaN(it.val) {
-			it.finished = true
-			return false
-		}
-
-		return true
-	}
-
-	// read compressed value
-	bit, err := it.br.ReadBit()
-	if err != nil {
-		it.err = err
-		return false
-	}
-
-	if bit == bitstream.Zero {
-		// it.val = it.val
-	} else {
-		bit, err := it.br.ReadBit()
-		if err != nil {
-			it.err = err
-			return false
-		}
-		if bit == bitstream.Zero {
-			// reuse leading/trailing zero bits
-			// it.leading, it.trailing = it.leading, it.trailing
-		} else {
-			bits, err := it.br.ReadBits(5)
-			if err != nil {
-				it.err = err
-				return false
-			}
-			it.leading = bits
-
-			bits, err = it.br.ReadBits(6)
-			if err != nil {
-				it.err = err
-				return false
-			}
-			mbits := bits
-			// 0 significant bits here means we overflowed and we actually need 64; see comment in encoder
-			if mbits == 0 {
-				mbits = 64
-			}
-			it.trailing = 64 - it.leading - mbits
-		}
-
-		mbits := int(64 - it.leading - it.trailing)
-		bits, err := it.br.ReadBits(mbits)
-		if err != nil {
-			it.err = err
-			return false
-		}
-		vbits := math.Float64bits(it.val)
-		vbits ^= (bits << it.trailing)
-
-		val := math.Float64frombits(vbits)
-		if math.IsNaN(val) {
-			it.finished = true
-			return false
-		}
-		it.val = val
-	}
-
-	return true
-}
-
-func (it *FloatDecoder) Values() float64 {
-	return it.val
-}
-
-func (it *FloatDecoder) Error() error {
-	return it.err
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/engine/tsm1/float_test.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/engine/tsm1/float_test.go
deleted file mode 100644
index 33ae3211a..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/engine/tsm1/float_test.go
+++ /dev/null
@@ -1,269 +0,0 @@
-package tsm1_test
-
-import (
-	"math"
-	"reflect"
-	"testing"
-	"testing/quick"
-
-	"github.com/influxdb/influxdb/tsdb/engine/tsm1"
-)
-
-func TestFloatEncoder_Simple(t *testing.T) {
-	// Example from the paper
-	s := tsm1.NewFloatEncoder()
-
-	s.Push(12)
-	s.Push(12)
-	s.Push(24)
-
-	// extra tests
-
-	// floating point masking/shifting bug
-	s.Push(13)
-	s.Push(24)
-
-	// delta-of-delta sizes
-	s.Push(24)
-	s.Push(24)
-	s.Push(24)
-
-	s.Finish()
-
-	b, err := s.Bytes()
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-
-	it, err := tsm1.NewFloatDecoder(b)
-	if err != nil {
-		t.Fatalf("unexpected error creating float decoder: %v", err)
-	}
-
-	want := []float64{
-		12,
-		12,
-		24,
-
-		13,
-		24,
-
-		24,
-		24,
-		24,
-	}
-
-	for _, w := range want {
-		if !it.Next() {
-			t.Fatalf("Next()=false, want true")
-		}
-		vv := it.Values()
-		if w != vv {
-			t.Errorf("Values()=(%v), want (%v)\n", vv, w)
-		}
-	}
-
-	if it.Next() {
-		t.Fatalf("Next()=true, want false")
-	}
-
-	if err := it.Error(); err != nil {
-		t.Errorf("it.Error()=%v, want nil", err)
-	}
-}
-
-func TestFloatEncoder_SimilarFloats(t *testing.T) {
-	s := tsm1.NewFloatEncoder()
-	want := []float64{
-		6.00065e+06,
-		6.000656e+06,
-		6.000657e+06,
-
-		6.000659e+06,
-		6.000661e+06,
-	}
-
-	for _, v := range want {
-		s.Push(v)
-	}
-
-	s.Finish()
-
-	b, err := s.Bytes()
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-
-	it, err := tsm1.NewFloatDecoder(b)
-	if err != nil {
-		t.Fatalf("unexpected error creating float decoder: %v", err)
-	}
-
-	for _, w := range want {
-		if !it.Next() {
-			t.Fatalf("Next()=false, want true")
-		}
-		vv := it.Values()
-		if w != vv {
-			t.Errorf("Values()=(%v), want (%v)\n", vv, w)
-		}
-	}
-
-	if it.Next() {
-		t.Fatalf("Next()=true, want false")
-	}
-
-	if err := it.Error(); err != nil {
-		t.Errorf("it.Error()=%v, want nil", err)
-	}
-}
-
-var TwoHoursData = []struct {
-	v float64
-}{
-	// 2h of data
-	{761}, {727}, {763}, {706}, {700},
-	{679}, {757}, {708}, {739}, {707},
-	{699}, {740}, {729}, {766}, {730},
-	{715}, {705}, {693}, {765}, {724},
-	{799}, {761}, {737}, {766}, {756},
-	{719}, {722}, {801}, {747}, {731},
-	{742}, {744}, {791}, {750}, {759},
-	{809}, {751}, {705}, {770}, {792},
-	{727}, {762}, {772}, {721}, {748},
-	{753}, {744}, {716}, {776}, {659},
-	{789}, {766}, {758}, {690}, {795},
-	{770}, {758}, {723}, {767}, {765},
-	{693}, {706}, {681}, {727}, {724},
-	{780}, {678}, {696}, {758}, {740},
-	{735}, {700}, {742}, {747}, {752},
-	{734}, {743}, {732}, {746}, {770},
-	{780}, {710}, {731}, {712}, {712},
-	{741}, {770}, {770}, {754}, {718},
-	{670}, {775}, {749}, {795}, {756},
-	{741}, {787}, {721}, {745}, {782},
-	{765}, {780}, {811}, {790}, {836},
-	{743}, {858}, {739}, {762}, {770},
-	{752}, {763}, {795}, {792}, {746},
-	{786}, {785}, {774}, {786}, {718},
-}
-
-func TestFloatEncoder_Roundtrip(t *testing.T) {
-	s := tsm1.NewFloatEncoder()
-	for _, p := range TwoHoursData {
-		s.Push(p.v)
-	}
-	s.Finish()
-
-	b, err := s.Bytes()
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-
-	it, err := tsm1.NewFloatDecoder(b)
-	if err != nil {
-		t.Fatalf("unexpected error creating float decoder: %v", err)
-	}
-
-	for _, w := range TwoHoursData {
-		if !it.Next() {
-			t.Fatalf("Next()=false, want true")
-		}
-		vv := it.Values()
-		// t.Logf("it.Values()=(%+v, %+v)\n", time.Unix(int64(tt), 0), vv)
-		if w.v != vv {
-			t.Errorf("Values()=(%v), want (%v)\n", vv, w.v)
-		}
-	}
-
-	if it.Next() {
-		t.Fatalf("Next()=true, want false")
-	}
-
-	if err := it.Error(); err != nil {
-		t.Errorf("it.Error()=%v, want nil", err)
-	}
-}
-
-func TestFloatEncoder_Roundtrip_NaN(t *testing.T) {
-
-	s := tsm1.NewFloatEncoder()
-	s.Push(1.0)
-	s.Push(math.NaN())
-	s.Push(2.0)
-	s.Finish()
-
-	_, err := s.Bytes()
-
-	if err == nil {
-		t.Fatalf("expected error. got nil")
-	}
-}
-
-func Test_FloatEncoder_Quick(t *testing.T) {
-	quick.Check(func(values []float64) bool {
-		// Write values to encoder.
-		enc := tsm1.NewFloatEncoder()
-		for _, v := range values {
-			enc.Push(v)
-		}
-		enc.Finish()
-
-		// Read values out of decoder.
-		got := make([]float64, 0, len(values))
-		b, err := enc.Bytes()
-		if err != nil {
-			t.Fatalf("unexpected error: %v", err)
-		}
-
-		dec, err := tsm1.NewFloatDecoder(b)
-		if err != nil {
-			t.Fatal(err)
-		}
-		for dec.Next() {
-			got = append(got, dec.Values())
-		}
-
-		// Verify that input and output values match.
-		if !reflect.DeepEqual(values, got) {
-			t.Fatalf("mismatch:\n\nexp=%+v\n\ngot=%+v\n\n", values, got)
-		}
-
-		return true
-	}, nil)
-}
-
-func BenchmarkFloatEncoder(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		s := tsm1.NewFloatEncoder()
-		for _, tt := range TwoHoursData {
-			s.Push(tt.v)
-		}
-		s.Finish()
-	}
-}
-
-func BenchmarkFloatDecoder(b *testing.B) {
-	s := tsm1.NewFloatEncoder()
-	for _, tt := range TwoHoursData {
-		s.Push(tt.v)
-	}
-	s.Finish()
-	bytes, err := s.Bytes()
-	if err != nil {
-		b.Fatalf("unexpected error: %v", err)
-	}
-
-	b.ResetTimer()
-
-	for i := 0; i < b.N; i++ {
-		it, err := tsm1.NewFloatDecoder(bytes)
-		if err != nil {
-			b.Fatalf("unexpected error creating float decoder: %v", err)
-		}
-
-		for j := 0; j < len(TwoHoursData); it.Next() {
-			j++
-		}
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/engine/tsm1/int.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/engine/tsm1/int.go
deleted file mode 100644
index ba23533cb..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/engine/tsm1/int.go
+++ /dev/null
@@ -1,293 +0,0 @@
-package tsm1
-
-// Int64 encoding uses two different strategies depending on the range of values in
-// the uncompressed data.  Encoded values are first encoding used zig zag encoding.
-// This interleaves positive and negative integers across a range of positive integers.
-//
-// For example, [-2,-1,0,1] becomes [3,1,0,2]. See
-// https://developers.google.com/protocol-buffers/docs/encoding?hl=en#signed-integers
-// for more information.
-//
-// If all the zig zag encoded values less than 1 << 60 - 1, they are compressed using
-// simple8b encoding.  If any values is larger than 1 << 60 - 1, the values are stored uncompressed.
-//
-// Each encoded byte slice, contains a 1 byte header followed by multiple 8 byte packed integers
-// or 8 byte uncompressed integers.  The 4 high bits of the first byte indicate the encoding type
-// for the remaining bytes.
-//
-// There are currently two encoding types that can be used with room for 16 total.  These additional
-// encoding slots are reserved for future use.  One improvement to be made is to use a patched
-// encoding such as PFOR if only a small number of values exceed the max compressed value range.  This
-// should improve compression ratios with very large integers near the ends of the int64 range.
-
-import (
-	"encoding/binary"
-	"fmt"
-
-	"github.com/jwilder/encoding/simple8b"
-)
-
-const (
-	// intUncompressed is an uncompressed format using 8 bytes per point
-	intUncompressed = 0
-	// intCompressedSimple is a bit-packed format using simple8b encoding
-	intCompressedSimple = 1
-	// intCompressedRLE is a run-length encoding format
-	intCompressedRLE = 2
-)
-
-// Int64Encoder encoders int64 into byte slices
-type Int64Encoder interface {
-	Write(v int64)
-	Bytes() ([]byte, error)
-}
-
-// Int64Decoder decodes a byte slice into int64s
-type Int64Decoder interface {
-	Next() bool
-	Read() int64
-	Error() error
-}
-
-type int64Encoder struct {
-	prev   int64
-	rle    bool
-	values []uint64
-}
-
-func NewInt64Encoder() Int64Encoder {
-	return &int64Encoder{rle: true}
-}
-
-func (e *int64Encoder) Write(v int64) {
-	// Delta-encode each value as it's written.  This happens before
-	// ZigZagEncoding because the deltas could be negative.
-	delta := v - e.prev
-	e.prev = v
-	enc := ZigZagEncode(delta)
-	if len(e.values) > 1 {
-		e.rle = e.rle && e.values[len(e.values)-1] == enc
-	}
-
-	e.values = append(e.values, enc)
-}
-
-func (e *int64Encoder) Bytes() ([]byte, error) {
-	// Only run-length encode if it could be reduce storage size
-	if e.rle && len(e.values) > 2 {
-		return e.encodeRLE()
-	}
-
-	for _, v := range e.values {
-		// Value is too large to encode using packed format
-		if v > simple8b.MaxValue {
-			return e.encodeUncompressed()
-		}
-	}
-
-	return e.encodePacked()
-}
-
-func (e *int64Encoder) encodeRLE() ([]byte, error) {
-	// Large varints can take up to 10 bytes
-	b := make([]byte, 1+10*3)
-
-	// 4 high bits used for the encoding type
-	b[0] = byte(intCompressedRLE) << 4
-
-	i := 1
-	// The first value
-	binary.BigEndian.PutUint64(b[i:], e.values[0])
-	i += 8
-	// The first delta
-	i += binary.PutUvarint(b[i:], e.values[1])
-	// The number of times the delta is repeated
-	i += binary.PutUvarint(b[i:], uint64(len(e.values)-1))
-
-	return b[:i], nil
-}
-
-func (e *int64Encoder) encodePacked() ([]byte, error) {
-	if len(e.values) == 0 {
-		return nil, nil
-	}
-
-	// Encode all but the first value.  Fist value is written unencoded
-	// using 8 bytes.
-	encoded, err := simple8b.EncodeAll(e.values[1:])
-	if err != nil {
-		return nil, err
-	}
-
-	b := make([]byte, 1+(len(encoded)+1)*8)
-	// 4 high bits of first byte store the encoding type for the block
-	b[0] = byte(intCompressedSimple) << 4
-
-	// Write the first value since it's not part of the encoded values
-	binary.BigEndian.PutUint64(b[1:9], e.values[0])
-
-	// Write the encoded values
-	for i, v := range encoded {
-		binary.BigEndian.PutUint64(b[9+i*8:9+i*8+8], v)
-	}
-	return b, nil
-}
-
-func (e *int64Encoder) encodeUncompressed() ([]byte, error) {
-	if len(e.values) == 0 {
-		return nil, nil
-	}
-
-	b := make([]byte, 1+len(e.values)*8)
-	// 4 high bits of first byte store the encoding type for the block
-	b[0] = byte(intUncompressed) << 4
-
-	for i, v := range e.values {
-		binary.BigEndian.PutUint64(b[1+i*8:1+i*8+8], v)
-	}
-	return b, nil
-}
-
-type int64Decoder struct {
-	values []uint64
-	bytes  []byte
-	i      int
-	n      int
-	prev   int64
-	first  bool
-
-	// The first value for a run-length encoded byte slice
-	rleFirst uint64
-
-	// The delta value for a run-length encoded byte slice
-	rleDelta uint64
-	encoding byte
-	err      error
-}
-
-func NewInt64Decoder(b []byte) Int64Decoder {
-	d := &int64Decoder{
-		// 240 is the maximum number of values that can be encoded into a single uint64 using simple8b
-		values: make([]uint64, 240),
-	}
-
-	d.SetBytes(b)
-	return d
-}
-
-func (d *int64Decoder) SetBytes(b []byte) {
-	if len(b) > 0 {
-		d.encoding = b[0] >> 4
-		d.bytes = b[1:]
-	}
-	d.first = true
-	d.i = 0
-	d.n = 0
-}
-
-func (d *int64Decoder) Next() bool {
-	if d.i >= d.n && len(d.bytes) == 0 {
-		return false
-	}
-
-	d.i++
-
-	if d.i >= d.n {
-		switch d.encoding {
-		case intUncompressed:
-			d.decodeUncompressed()
-		case intCompressedSimple:
-			d.decodePacked()
-		case intCompressedRLE:
-			d.decodeRLE()
-		default:
-			d.err = fmt.Errorf("unknown encoding %v", d.encoding)
-		}
-	}
-	return d.i < d.n
-}
-
-func (d *int64Decoder) Error() error {
-	return d.err
-}
-
-func (d *int64Decoder) Read() int64 {
-	switch d.encoding {
-	case intCompressedRLE:
-		return ZigZagDecode(d.rleFirst + uint64(d.i)*d.rleDelta)
-	default:
-		v := ZigZagDecode(d.values[d.i])
-		// v is the delta encoded value, we need to add the prior value to get the original
-		v = v + d.prev
-		d.prev = v
-		return v
-
-	}
-}
-
-func (d *int64Decoder) decodeRLE() {
-	if len(d.bytes) == 0 {
-		return
-	}
-
-	var i, n int
-
-	// Next 8 bytes is the starting value
-	first := binary.BigEndian.Uint64(d.bytes[i : i+8])
-	i += 8
-
-	// Next 1-10 bytes is the delta value
-	value, n := binary.Uvarint(d.bytes[i:])
-
-	i += n
-
-	// Last 1-10 bytes is how many times the value repeats
-	count, n := binary.Uvarint(d.bytes[i:])
-
-	// Store the first value and delta value so we do not need to allocate
-	// a large values slice.  We can compute the value at position d.i on
-	// demand.
-	d.rleFirst = first
-	d.rleDelta = value
-	d.n = int(count) + 1
-	d.i = 0
-
-	// We've process all the bytes
-	d.bytes = nil
-}
-
-func (d *int64Decoder) decodePacked() {
-	if len(d.bytes) == 0 {
-		return
-	}
-
-	v := binary.BigEndian.Uint64(d.bytes[0:8])
-	// The first value is always unencoded
-	if d.first {
-		d.first = false
-		d.n = 1
-		d.values[0] = v
-	} else {
-		n, err := simple8b.Decode(d.values, v)
-		if err != nil {
-			// Should never happen, only error that could be returned is if the the value to be decoded was not
-			// actually encoded by simple8b encoder.
-			d.err = fmt.Errorf("failed to decode value %v: %v", v, err)
-		}
-
-		d.n = n
-	}
-	d.i = 0
-	d.bytes = d.bytes[8:]
-}
-
-func (d *int64Decoder) decodeUncompressed() {
-	if len(d.bytes) == 0 {
-		return
-	}
-
-	d.values[0] = binary.BigEndian.Uint64(d.bytes[0:8])
-	d.i = 0
-	d.n = 1
-	d.bytes = d.bytes[8:]
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/engine/tsm1/int_test.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/engine/tsm1/int_test.go
deleted file mode 100644
index dde37ab59..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/engine/tsm1/int_test.go
+++ /dev/null
@@ -1,522 +0,0 @@
-package tsm1
-
-import (
-	"math"
-	"math/rand"
-	"reflect"
-	"testing"
-	"testing/quick"
-)
-
-func Test_Int64Encoder_NoValues(t *testing.T) {
-	enc := NewInt64Encoder()
-	b, err := enc.Bytes()
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-
-	if len(b) > 0 {
-		t.Fatalf("unexpected lenght: exp 0, got %v", len(b))
-	}
-
-	dec := NewInt64Decoder(b)
-	if dec.Next() {
-		t.Fatalf("unexpected next value: got true, exp false")
-	}
-}
-
-func Test_Int64Encoder_One(t *testing.T) {
-	enc := NewInt64Encoder()
-	v1 := int64(1)
-
-	enc.Write(1)
-	b, err := enc.Bytes()
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-
-	if got := b[0] >> 4; intCompressedSimple != got {
-		t.Fatalf("encoding type mismatch: exp uncompressed, got %v", got)
-	}
-
-	dec := NewInt64Decoder(b)
-	if !dec.Next() {
-		t.Fatalf("unexpected next value: got true, exp false")
-	}
-
-	if v1 != dec.Read() {
-		t.Fatalf("read value mismatch: got %v, exp %v", dec.Read(), v1)
-	}
-}
-
-func Test_Int64Encoder_Two(t *testing.T) {
-	enc := NewInt64Encoder()
-	var v1, v2 int64 = 1, 2
-
-	enc.Write(v1)
-	enc.Write(v2)
-
-	b, err := enc.Bytes()
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-
-	if got := b[0] >> 4; intCompressedSimple != got {
-		t.Fatalf("encoding type mismatch: exp uncompressed, got %v", got)
-	}
-
-	dec := NewInt64Decoder(b)
-	if !dec.Next() {
-		t.Fatalf("unexpected next value: got true, exp false")
-	}
-
-	if v1 != dec.Read() {
-		t.Fatalf("read value mismatch: got %v, exp %v", dec.Read(), v1)
-	}
-
-	if !dec.Next() {
-		t.Fatalf("unexpected next value: got true, exp false")
-	}
-
-	if v2 != dec.Read() {
-		t.Fatalf("read value mismatch: got %v, exp %v", dec.Read(), v2)
-	}
-}
-
-func Test_Int64Encoder_Negative(t *testing.T) {
-	enc := NewInt64Encoder()
-	var v1, v2, v3 int64 = -2, 0, 1
-
-	enc.Write(v1)
-	enc.Write(v2)
-	enc.Write(v3)
-
-	b, err := enc.Bytes()
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-
-	if got := b[0] >> 4; intCompressedSimple != got {
-		t.Fatalf("encoding type mismatch: exp uncompressed, got %v", got)
-	}
-
-	dec := NewInt64Decoder(b)
-	if !dec.Next() {
-		t.Fatalf("unexpected next value: got true, exp false")
-	}
-
-	if v1 != dec.Read() {
-		t.Fatalf("read value mismatch: got %v, exp %v", dec.Read(), v1)
-	}
-
-	if !dec.Next() {
-		t.Fatalf("unexpected next value: got true, exp false")
-	}
-
-	if v2 != dec.Read() {
-		t.Fatalf("read value mismatch: got %v, exp %v", dec.Read(), v2)
-	}
-
-	if !dec.Next() {
-		t.Fatalf("unexpected next value: got true, exp false")
-	}
-
-	if v3 != dec.Read() {
-		t.Fatalf("read value mismatch: got %v, exp %v", dec.Read(), v3)
-	}
-}
-
-func Test_Int64Encoder_Large_Range(t *testing.T) {
-	enc := NewInt64Encoder()
-	var v1, v2 int64 = math.MinInt64, math.MaxInt64
-	enc.Write(v1)
-	enc.Write(v2)
-	b, err := enc.Bytes()
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-
-	if got := b[0] >> 4; intUncompressed != got {
-		t.Fatalf("encoding type mismatch: exp uncompressed, got %v", got)
-	}
-
-	dec := NewInt64Decoder(b)
-	if !dec.Next() {
-		t.Fatalf("unexpected next value: got true, exp false")
-	}
-
-	if v1 != dec.Read() {
-		t.Fatalf("read value mismatch: got %v, exp %v", dec.Read(), v1)
-	}
-
-	if !dec.Next() {
-		t.Fatalf("unexpected next value: got true, exp false")
-	}
-
-	if v2 != dec.Read() {
-		t.Fatalf("read value mismatch: got %v, exp %v", dec.Read(), v2)
-	}
-}
-
-func Test_Int64Encoder_Uncompressed(t *testing.T) {
-	enc := NewInt64Encoder()
-	var v1, v2, v3 int64 = 0, 1, 1 << 60
-
-	enc.Write(v1)
-	enc.Write(v2)
-	enc.Write(v3)
-
-	b, err := enc.Bytes()
-	if err != nil {
-		t.Fatalf("expected error: %v", err)
-	}
-
-	// 1 byte header + 3 * 8 byte values
-	if exp := 25; len(b) != exp {
-		t.Fatalf("length mismatch: got %v, exp %v", len(b), exp)
-	}
-
-	if got := b[0] >> 4; intUncompressed != got {
-		t.Fatalf("encoding type mismatch: exp uncompressed, got %v", got)
-	}
-
-	dec := NewInt64Decoder(b)
-	if !dec.Next() {
-		t.Fatalf("unexpected next value: got true, exp false")
-	}
-
-	if v1 != dec.Read() {
-		t.Fatalf("read value mismatch: got %v, exp %v", dec.Read(), v1)
-	}
-
-	if !dec.Next() {
-		t.Fatalf("unexpected next value: got true, exp false")
-	}
-
-	if v2 != dec.Read() {
-		t.Fatalf("read value mismatch: got %v, exp %v", dec.Read(), v2)
-	}
-
-	if !dec.Next() {
-		t.Fatalf("unexpected next value: got true, exp false")
-	}
-
-	if v3 != dec.Read() {
-		t.Fatalf("read value mismatch: got %v, exp %v", dec.Read(), v3)
-	}
-}
-
-func Test_Int64Encoder_NegativeUncompressed(t *testing.T) {
-	values := []int64{
-		-2352281900722994752, 1438442655375607923, -4110452567888190110,
-		-1221292455668011702, -1941700286034261841, -2836753127140407751,
-		1432686216250034552, 3663244026151507025, -3068113732684750258,
-		-1949953187327444488, 3713374280993588804, 3226153669854871355,
-		-2093273755080502606, 1006087192578600616, -2272122301622271655,
-		2533238229511593671, -4450454445568858273, 2647789901083530435,
-		2761419461769776844, -1324397441074946198, -680758138988210958,
-		94468846694902125, -2394093124890745254, -2682139311758778198,
-	}
-	enc := NewInt64Encoder()
-	for _, v := range values {
-		enc.Write(v)
-	}
-
-	b, err := enc.Bytes()
-	if err != nil {
-		t.Fatalf("expected error: %v", err)
-	}
-
-	if got := b[0] >> 4; intUncompressed != got {
-		t.Fatalf("encoding type mismatch: exp uncompressed, got %v", got)
-	}
-
-	dec := NewInt64Decoder(b)
-
-	i := 0
-	for dec.Next() {
-		if i > len(values) {
-			t.Fatalf("read too many values: got %v, exp %v", i, len(values))
-		}
-
-		if values[i] != dec.Read() {
-			t.Fatalf("read value %d mismatch: got %v, exp %v", i, dec.Read(), values[i])
-		}
-		i += 1
-	}
-
-	if i != len(values) {
-		t.Fatalf("failed to read enough values: got %v, exp %v", i, len(values))
-	}
-}
-
-func Test_Int64Encoder_AllNegative(t *testing.T) {
-	enc := NewInt64Encoder()
-	values := []int64{
-		-10, -5, -1,
-	}
-
-	for _, v := range values {
-		enc.Write(v)
-	}
-
-	b, err := enc.Bytes()
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-
-	if got := b[0] >> 4; intCompressedSimple != got {
-		t.Fatalf("encoding type mismatch: exp uncompressed, got %v", got)
-	}
-
-	dec := NewInt64Decoder(b)
-	i := 0
-	for dec.Next() {
-		if i > len(values) {
-			t.Fatalf("read too many values: got %v, exp %v", i, len(values))
-		}
-
-		if values[i] != dec.Read() {
-			t.Fatalf("read value %d mismatch: got %v, exp %v", i, dec.Read(), values[i])
-		}
-		i += 1
-	}
-
-	if i != len(values) {
-		t.Fatalf("failed to read enough values: got %v, exp %v", i, len(values))
-	}
-}
-
-func Test_Int64Encoder_CounterPacked(t *testing.T) {
-	enc := NewInt64Encoder()
-	values := []int64{
-		1e15, 1e15 + 1, 1e15 + 2, 1e15 + 3, 1e15 + 4, 1e15 + 6,
-	}
-
-	for _, v := range values {
-		enc.Write(v)
-	}
-
-	b, err := enc.Bytes()
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-
-	if b[0]>>4 != intCompressedSimple {
-		t.Fatalf("unexpected encoding format: expected simple, got %v", b[0]>>4)
-	}
-
-	// Should use 1 header byte + 2, 8 byte words if delta-encoding is used based on
-	// values sizes.  Without delta-encoding, we'd get 49 bytes.
-	if exp := 17; len(b) != exp {
-		t.Fatalf("encoded length mismatch: got %v, exp %v", len(b), exp)
-	}
-
-	dec := NewInt64Decoder(b)
-	i := 0
-	for dec.Next() {
-		if i > len(values) {
-			t.Fatalf("read too many values: got %v, exp %v", i, len(values))
-		}
-
-		if values[i] != dec.Read() {
-			t.Fatalf("read value %d mismatch: got %v, exp %v", i, dec.Read(), values[i])
-		}
-		i += 1
-	}
-
-	if i != len(values) {
-		t.Fatalf("failed to read enough values: got %v, exp %v", i, len(values))
-	}
-}
-
-func Test_Int64Encoder_CounterRLE(t *testing.T) {
-	enc := NewInt64Encoder()
-	values := []int64{
-		1e15, 1e15 + 1, 1e15 + 2, 1e15 + 3, 1e15 + 4, 1e15 + 5,
-	}
-
-	for _, v := range values {
-		enc.Write(v)
-	}
-
-	b, err := enc.Bytes()
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-
-	if b[0]>>4 != intCompressedRLE {
-		t.Fatalf("unexpected encoding format: expected simple, got %v", b[0]>>4)
-	}
-
-	// Should use 1 header byte, 8 byte first value, 1 var-byte for delta and 1 var-byte for
-	// count of deltas in this particular RLE.
-	if exp := 11; len(b) != exp {
-		t.Fatalf("encoded length mismatch: got %v, exp %v", len(b), exp)
-	}
-
-	dec := NewInt64Decoder(b)
-	i := 0
-	for dec.Next() {
-		if i > len(values) {
-			t.Fatalf("read too many values: got %v, exp %v", i, len(values))
-		}
-
-		if values[i] != dec.Read() {
-			t.Fatalf("read value %d mismatch: got %v, exp %v", i, dec.Read(), values[i])
-		}
-		i += 1
-	}
-
-	if i != len(values) {
-		t.Fatalf("failed to read enough values: got %v, exp %v", i, len(values))
-	}
-}
-
-func Test_Int64Encoder_MinMax(t *testing.T) {
-	enc := NewInt64Encoder()
-	values := []int64{
-		math.MinInt64, math.MaxInt64,
-	}
-
-	for _, v := range values {
-		enc.Write(v)
-	}
-
-	b, err := enc.Bytes()
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-
-	if b[0]>>4 != intUncompressed {
-		t.Fatalf("unexpected encoding format: expected simple, got %v", b[0]>>4)
-	}
-
-	if exp := 17; len(b) != exp {
-		t.Fatalf("encoded length mismatch: got %v, exp %v", len(b), exp)
-	}
-
-	dec := NewInt64Decoder(b)
-	i := 0
-	for dec.Next() {
-		if i > len(values) {
-			t.Fatalf("read too many values: got %v, exp %v", i, len(values))
-		}
-
-		if values[i] != dec.Read() {
-			t.Fatalf("read value %d mismatch: got %v, exp %v", i, dec.Read(), values[i])
-		}
-		i += 1
-	}
-
-	if i != len(values) {
-		t.Fatalf("failed to read enough values: got %v, exp %v", i, len(values))
-	}
-}
-
-func Test_Int64Encoder_Quick(t *testing.T) {
-	quick.Check(func(values []int64) bool {
-		// Write values to encoder.
-		enc := NewInt64Encoder()
-		for _, v := range values {
-			enc.Write(v)
-		}
-
-		// Retrieve encoded bytes from encoder.
-		buf, err := enc.Bytes()
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		// Read values out of decoder.
-		got := make([]int64, 0, len(values))
-		dec := NewInt64Decoder(buf)
-		for dec.Next() {
-			if err := dec.Error(); err != nil {
-				t.Fatal(err)
-			}
-			got = append(got, dec.Read())
-		}
-
-		// Verify that input and output values match.
-		if !reflect.DeepEqual(values, got) {
-			t.Fatalf("mismatch:\n\nexp=%+v\n\ngot=%+v\n\n", values, got)
-		}
-
-		return true
-	}, nil)
-}
-
-func BenchmarkInt64EncoderRLE(b *testing.B) {
-	enc := NewInt64Encoder()
-	x := make([]int64, 1024)
-	for i := 0; i < len(x); i++ {
-		x[i] = int64(i)
-		enc.Write(x[i])
-	}
-
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		enc.Bytes()
-	}
-}
-
-func BenchmarkInt64EncoderPackedSimple(b *testing.B) {
-	enc := NewInt64Encoder()
-	x := make([]int64, 1024)
-	for i := 0; i < len(x); i++ {
-		// Small amount of randomness prevents RLE from being used
-		x[i] = int64(i) + int64(rand.Intn(10))
-		enc.Write(x[i])
-	}
-
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		enc.Bytes()
-	}
-}
-
-type byteSetter interface {
-	SetBytes(b []byte)
-}
-
-func BenchmarkInt64DecoderPackedSimple(b *testing.B) {
-	x := make([]int64, 1024)
-	enc := NewInt64Encoder()
-	for i := 0; i < len(x); i++ {
-		// Small amount of randomness prevents RLE from being used
-		x[i] = int64(i) + int64(rand.Intn(10))
-		enc.Write(x[i])
-	}
-	bytes, _ := enc.Bytes()
-
-	b.ResetTimer()
-
-	dec := NewInt64Decoder(bytes)
-
-	for i := 0; i < b.N; i++ {
-		dec.(byteSetter).SetBytes(bytes)
-		for dec.Next() {
-		}
-	}
-}
-
-func BenchmarkInt64DecoderRLE(b *testing.B) {
-	x := make([]int64, 1024)
-	enc := NewInt64Encoder()
-	for i := 0; i < len(x); i++ {
-		x[i] = int64(i)
-		enc.Write(x[i])
-	}
-	bytes, _ := enc.Bytes()
-
-	b.ResetTimer()
-
-	dec := NewInt64Decoder(bytes)
-
-	for i := 0; i < b.N; i++ {
-		dec.(byteSetter).SetBytes(bytes)
-		for dec.Next() {
-		}
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/engine/tsm1/string.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/engine/tsm1/string.go
deleted file mode 100644
index a01b90686..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/engine/tsm1/string.go
+++ /dev/null
@@ -1,96 +0,0 @@
-package tsm1
-
-// String encoding uses snappy compression to compress each string.  Each string is
-// appended to byte slice prefixed with a variable byte length followed by the string
-// bytes.  The bytes are compressed using snappy compressor and a 1 byte header is used
-// to indicate the type of encoding.
-
-import (
-	"encoding/binary"
-	"fmt"
-
-	"github.com/golang/snappy"
-)
-
-const (
-	// stringUncompressed is a an uncompressed format encoding strings as raw bytes.
-	// Not yet implemented.
-	stringUncompressed = 0
-
-	// stringCompressedSnappy is a compressed encoding using Snappy compression
-	stringCompressedSnappy = 1
-)
-
-type StringEncoder interface {
-	Write(s string)
-	Bytes() ([]byte, error)
-}
-
-type StringDecoder interface {
-	Next() bool
-	Read() string
-	Error() error
-}
-
-type stringEncoder struct {
-	// The encoded bytes
-	bytes []byte
-}
-
-func NewStringEncoder() StringEncoder {
-	return &stringEncoder{}
-}
-
-func (e *stringEncoder) Write(s string) {
-	b := make([]byte, 10)
-	// Append the length of the string using variable byte encoding
-	i := binary.PutUvarint(b, uint64(len(s)))
-	e.bytes = append(e.bytes, b[:i]...)
-
-	// Append the string bytes
-	e.bytes = append(e.bytes, s...)
-}
-
-func (e *stringEncoder) Bytes() ([]byte, error) {
-	// Compress the currently appended bytes using snappy and prefix with
-	// a 1 byte header for future extension
-	data := snappy.Encode(nil, e.bytes)
-	return append([]byte{stringCompressedSnappy << 4}, data...), nil
-}
-
-type stringDecoder struct {
-	b   []byte
-	l   int
-	i   int
-	err error
-}
-
-func NewStringDecoder(b []byte) (StringDecoder, error) {
-	// First byte stores the encoding type, only have snappy format
-	// currently so ignore for now.
-	data, err := snappy.Decode(nil, b[1:])
-	if err != nil {
-		return nil, fmt.Errorf("failed to decode string block: %v", err.Error())
-	}
-
-	return &stringDecoder{b: data}, nil
-}
-
-func (e *stringDecoder) Next() bool {
-	e.i += e.l
-	return e.i < len(e.b)
-}
-
-func (e *stringDecoder) Read() string {
-	// Read the length of the string
-	length, n := binary.Uvarint(e.b[e.i:])
-
-	// The length of this string plus the length of the variable byte encoded length
-	e.l = int(length) + n
-
-	return string(e.b[e.i+n : e.i+n+int(length)])
-}
-
-func (e *stringDecoder) Error() error {
-	return e.err
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/engine/tsm1/string_test.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/engine/tsm1/string_test.go
deleted file mode 100644
index 7c0e56b02..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/engine/tsm1/string_test.go
+++ /dev/null
@@ -1,123 +0,0 @@
-package tsm1
-
-import (
-	"fmt"
-	"reflect"
-	"testing"
-	"testing/quick"
-)
-
-func Test_StringEncoder_NoValues(t *testing.T) {
-	enc := NewStringEncoder()
-	b, err := enc.Bytes()
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-
-	dec, err := NewStringDecoder(b)
-	if err != nil {
-		t.Fatalf("unexpected erorr creating string decoder: %v", err)
-	}
-	if dec.Next() {
-		t.Fatalf("unexpected next value: got true, exp false")
-	}
-}
-
-func Test_StringEncoder_Single(t *testing.T) {
-	enc := NewStringEncoder()
-	v1 := "v1"
-	enc.Write(v1)
-	b, err := enc.Bytes()
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-
-	dec, err := NewStringDecoder(b)
-	if err != nil {
-		t.Fatalf("unexpected erorr creating string decoder: %v", err)
-	}
-	if !dec.Next() {
-		t.Fatalf("unexpected next value: got false, exp true")
-	}
-
-	if v1 != dec.Read() {
-		t.Fatalf("unexpected value: got %v, exp %v", dec.Read(), v1)
-	}
-}
-
-func Test_StringEncoder_Multi_Compressed(t *testing.T) {
-	enc := NewStringEncoder()
-
-	values := make([]string, 10)
-	for i := range values {
-		values[i] = fmt.Sprintf("value %d", i)
-		enc.Write(values[i])
-	}
-
-	b, err := enc.Bytes()
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-
-	if b[0]>>4 != stringCompressedSnappy {
-		t.Fatalf("unexpected encoding: got %v, exp %v", b[0], stringCompressedSnappy)
-	}
-
-	if exp := 47; len(b) != exp {
-		t.Fatalf("unexpected length: got %v, exp %v", len(b), exp)
-	}
-
-	dec, err := NewStringDecoder(b)
-	if err != nil {
-		t.Fatalf("unexpected erorr creating string decoder: %v", err)
-	}
-
-	for i, v := range values {
-		if !dec.Next() {
-			t.Fatalf("unexpected next value: got false, exp true")
-		}
-		if v != dec.Read() {
-			t.Fatalf("unexpected value at pos %d: got %v, exp %v", i, dec.Read(), v)
-		}
-	}
-
-	if dec.Next() {
-		t.Fatalf("unexpected next value: got true, exp false")
-	}
-}
-
-func Test_StringEncoder_Quick(t *testing.T) {
-	quick.Check(func(values []string) bool {
-		// Write values to encoder.
-		enc := NewStringEncoder()
-		for _, v := range values {
-			enc.Write(v)
-		}
-
-		// Retrieve encoded bytes from encoder.
-		buf, err := enc.Bytes()
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		// Read values out of decoder.
-		got := make([]string, 0, len(values))
-		dec, err := NewStringDecoder(buf)
-		if err != nil {
-			t.Fatal(err)
-		}
-		for dec.Next() {
-			if err := dec.Error(); err != nil {
-				t.Fatal(err)
-			}
-			got = append(got, dec.Read())
-		}
-
-		// Verify that input and output values match.
-		if !reflect.DeepEqual(values, got) {
-			t.Fatalf("mismatch:\n\nexp=%+v\n\ngot=%+v\n\n", values, got)
-		}
-
-		return true
-	}, nil)
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/engine/tsm1/timestamp.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/engine/tsm1/timestamp.go
deleted file mode 100644
index 9c48f06a7..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/engine/tsm1/timestamp.go
+++ /dev/null
@@ -1,309 +0,0 @@
-package tsm1
-
-// Timestamp encoding is adaptive and based on structure of the timestamps that are encoded.  It
-// uses a combination of delta encoding, scaling and compression using simple8b, run length encoding
-// as well as falling back to no compression if needed.
-//
-// Timestamp values to be encoded should be sorted before encoding.  When encoded, the values are
-// first delta-encoded.  The first value is the starting timestamp, subsequent values are the difference.
-// from the prior value.
-//
-// Timestamp resolution can also be in the nanosecond.  Many timestamps are monotonically increasing
-// and fall on even boundaries of time such as every 10s.  When the timestamps have this structure,
-// they are scaled by the largest common divisor that is also a factor of 10.  This has the effect
-// of converting very large integer deltas into very small one that can be reversed by multiplying them
-// by the scaling factor.
-//
-// Using these adjusted values, if all the deltas are the same, the time range is stored using run
-// length encoding.  If run length encoding is not possible and all values are less than 1 << 60 - 1
-//  (~36.5 yrs in nanosecond resolution), then the timestamps are encoded using simple8b encoding.  If
-// any value exceeds the maximum values, the deltas are stored uncompressed using 8b each.
-//
-// Each compressed byte slice has a 1 byte header indicating the compression type.  The 4 high bits
-// indicated the encoding type.  The 4 low bits are used by the encoding type.
-//
-// For run-length encoding, the 4 low bits store the log10 of the scaling factor.  The next 8 bytes are
-// the starting timestamp, next 1-10 bytes is the delta value using variable-length encoding, finally the
-// next 1-10 bytes is the count of values.
-//
-// For simple8b encoding, the 4 low bits store the log10 of the scaling factor.  The next 8 bytes is the
-// first delta value stored uncompressed, the remaining bytes are 64bit words containg compressed delta
-// values.
-//
-// For uncompressed encoding, the delta values are stored using 8 bytes each.
-
-import (
-	"encoding/binary"
-	"fmt"
-	"math"
-	"time"
-
-	"github.com/jwilder/encoding/simple8b"
-)
-
-const (
-	// timeUncompressed is a an uncompressed format using 8 bytes per timestamp
-	timeUncompressed = 0
-	// timeCompressedPackedSimple is a bit-packed format using simple8b encoding
-	timeCompressedPackedSimple = 1
-	// timeCompressedRLE is a run-length encoding format
-	timeCompressedRLE = 2
-)
-
-// TimeEncoder encodes time.Time to byte slices.
-type TimeEncoder interface {
-	Write(t time.Time)
-	Bytes() ([]byte, error)
-}
-
-// TimeDecoder decodes byte slices to time.Time values.
-type TimeDecoder interface {
-	Next() bool
-	Read() time.Time
-	Error() error
-}
-
-type encoder struct {
-	ts []uint64
-}
-
-// NewTimeEncoder returns a TimeEncoder
-func NewTimeEncoder() TimeEncoder {
-	return &encoder{}
-}
-
-// Write adds a time.Time to the compressed stream.
-func (e *encoder) Write(t time.Time) {
-	e.ts = append(e.ts, uint64(t.UnixNano()))
-}
-
-func (e *encoder) reduce() (max, divisor uint64, rle bool, deltas []uint64) {
-	// Compute the deltas in place to avoid allocating another slice
-	deltas = e.ts
-	// Starting values for a max and divisor
-	max, divisor = 0, 1e12
-
-	// Indicates whether the the deltas can be run-length encoded
-	rle = true
-
-	// Iterate in reverse so we can apply deltas in place
-	for i := len(deltas) - 1; i > 0; i-- {
-
-		// First differential encode the values
-		deltas[i] = deltas[i] - deltas[i-1]
-
-		// We also need to keep track of the max value and largest common divisor
-		v := deltas[i]
-
-		if v > max {
-			max = v
-		}
-
-		for {
-			// If our value is divisible by 10, break.  Otherwise, try the next smallest divisor.
-			if v%divisor == 0 {
-				break
-			}
-			divisor /= 10
-		}
-
-		// Skip the first value || see if prev = curr.  The deltas can be RLE if the are all equal.
-		rle = i == len(deltas)-1 || rle && (deltas[i+1] == deltas[i])
-	}
-	return
-}
-
-// Bytes returns the encoded bytes of all written times.
-func (e *encoder) Bytes() ([]byte, error) {
-	if len(e.ts) == 0 {
-		return []byte{}, nil
-	}
-
-	// Maximum and largest common divisor.  rle is true if dts (the delta timestamps),
-	// are all the same.
-	max, div, rle, dts := e.reduce()
-
-	// The deltas are all the same, so we can run-length encode them
-	if rle && len(e.ts) > 1 {
-		return e.encodeRLE(e.ts[0], e.ts[1], div, len(e.ts))
-	}
-
-	// We can't compress this time-range, the deltas exceed 1 << 60
-	if max > simple8b.MaxValue {
-		return e.encodeRaw()
-	}
-
-	return e.encodePacked(div, dts)
-}
-
-func (e *encoder) encodePacked(div uint64, dts []uint64) ([]byte, error) {
-	enc := simple8b.NewEncoder()
-	for _, v := range dts[1:] {
-		enc.Write(uint64(v) / div)
-	}
-
-	b := make([]byte, 8+1)
-
-	// 4 high bits used for the encoding type
-	b[0] = byte(timeCompressedPackedSimple) << 4
-	// 4 low bits are the log10 divisor
-	b[0] |= byte(math.Log10(float64(div)))
-
-	// The first delta value
-	binary.BigEndian.PutUint64(b[1:9], uint64(dts[0]))
-
-	// The compressed deltas
-	deltas, err := enc.Bytes()
-	if err != nil {
-		return nil, err
-	}
-
-	return append(b, deltas...), nil
-}
-
-func (e *encoder) encodeRaw() ([]byte, error) {
-	b := make([]byte, 1+len(e.ts)*8)
-	b[0] = byte(timeUncompressed) << 4
-	for i, v := range e.ts {
-		binary.BigEndian.PutUint64(b[1+i*8:1+i*8+8], uint64(v))
-	}
-	return b, nil
-}
-
-func (e *encoder) encodeRLE(first, delta, div uint64, n int) ([]byte, error) {
-	// Large varints can take up to 10 bytes
-	b := make([]byte, 1+10*3)
-
-	// 4 high bits used for the encoding type
-	b[0] = byte(timeCompressedRLE) << 4
-	// 4 low bits are the log10 divisor
-	b[0] |= byte(math.Log10(float64(div)))
-
-	i := 1
-	// The first timestamp
-	binary.BigEndian.PutUint64(b[i:], uint64(first))
-	i += 8
-	// The first delta
-	i += binary.PutUvarint(b[i:], uint64(delta/div))
-	// The number of times the delta is repeated
-	i += binary.PutUvarint(b[i:], uint64(n))
-
-	return b[:i], nil
-}
-
-type decoder struct {
-	v   time.Time
-	ts  []uint64
-	err error
-}
-
-func NewTimeDecoder(b []byte) TimeDecoder {
-	d := &decoder{}
-	d.decode(b)
-	return d
-}
-
-func (d *decoder) Next() bool {
-	if len(d.ts) == 0 {
-		return false
-	}
-	d.v = time.Unix(0, int64(d.ts[0]))
-	d.ts = d.ts[1:]
-	return true
-}
-
-func (d *decoder) Read() time.Time {
-	return d.v
-}
-
-func (d *decoder) Error() error {
-	return d.err
-}
-
-func (d *decoder) decode(b []byte) {
-	if len(b) == 0 {
-		return
-	}
-
-	// Encoding type is stored in the 4 high bits of the first byte
-	encoding := b[0] >> 4
-	switch encoding {
-	case timeUncompressed:
-		d.decodeRaw(b[1:])
-	case timeCompressedRLE:
-		d.decodeRLE(b)
-	case timeCompressedPackedSimple:
-		d.decodePacked(b)
-	default:
-		d.err = fmt.Errorf("unknown encoding: %v", encoding)
-	}
-}
-
-func (d *decoder) decodePacked(b []byte) {
-	div := uint64(math.Pow10(int(b[0] & 0xF)))
-	first := uint64(binary.BigEndian.Uint64(b[1:9]))
-
-	enc := simple8b.NewDecoder(b[9:])
-
-	deltas := []uint64{first}
-	for enc.Next() {
-		deltas = append(deltas, enc.Read())
-	}
-
-	// Compute the prefix sum and scale the deltas back up
-	for i := 1; i < len(deltas); i++ {
-		dgap := deltas[i] * div
-		deltas[i] = deltas[i-1] + dgap
-	}
-
-	d.ts = deltas
-}
-
-func (d *decoder) decodeRLE(b []byte) {
-	var i, n int
-
-	// Lower 4 bits hold the 10 based exponent so we can scale the values back up
-	mod := int64(math.Pow10(int(b[i] & 0xF)))
-	i++
-
-	// Next 8 bytes is the starting timestamp
-	first := binary.BigEndian.Uint64(b[i : i+8])
-	i += 8
-
-	// Next 1-10 bytes is our (scaled down by factor of 10) run length values
-	value, n := binary.Uvarint(b[i:])
-
-	// Scale the value back up
-	value *= uint64(mod)
-	i += n
-
-	// Last 1-10 bytes is how many times the value repeats
-	count, _ := binary.Uvarint(b[i:])
-
-	// Rebuild construct the original values now
-	deltas := make([]uint64, count)
-	for i := range deltas {
-		deltas[i] = value
-	}
-
-	// Reverse the delta-encoding
-	deltas[0] = first
-	for i := 1; i < len(deltas); i++ {
-		deltas[i] = deltas[i-1] + deltas[i]
-	}
-
-	d.ts = deltas
-}
-
-func (d *decoder) decodeRaw(b []byte) {
-	d.ts = make([]uint64, len(b)/8)
-	for i := range d.ts {
-		d.ts[i] = binary.BigEndian.Uint64(b[i*8 : i*8+8])
-
-		delta := d.ts[i]
-		// Compute the prefix sum and scale the deltas back up
-		if i > 0 {
-			d.ts[i] = d.ts[i-1] + delta
-		}
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/engine/tsm1/timestamp_test.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/engine/tsm1/timestamp_test.go
deleted file mode 100644
index 6c9300b5b..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/engine/tsm1/timestamp_test.go
+++ /dev/null
@@ -1,465 +0,0 @@
-package tsm1
-
-import (
-	"reflect"
-	"testing"
-	"testing/quick"
-	"time"
-)
-
-func Test_TimeEncoder(t *testing.T) {
-	enc := NewTimeEncoder()
-
-	x := []time.Time{}
-	now := time.Unix(0, 0)
-	x = append(x, now)
-	enc.Write(now)
-	for i := 1; i < 4; i++ {
-		x = append(x, now.Add(time.Duration(i)*time.Second))
-		enc.Write(x[i])
-	}
-
-	b, err := enc.Bytes()
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-
-	if got := b[0] >> 4; got != timeCompressedRLE {
-		t.Fatalf("Wrong encoding used: expected rle, got %v", got)
-	}
-
-	dec := NewTimeDecoder(b)
-	for i, v := range x {
-		if !dec.Next() {
-			t.Fatalf("Next == false, expected true")
-		}
-
-		if v != dec.Read() {
-			t.Fatalf("Item %d mismatch, got %v, exp %v", i, dec.Read(), v)
-		}
-	}
-}
-
-func Test_TimeEncoder_NoValues(t *testing.T) {
-	enc := NewTimeEncoder()
-	b, err := enc.Bytes()
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-
-	dec := NewTimeDecoder(b)
-	if dec.Next() {
-		t.Fatalf("unexpected next value: got true, exp false")
-	}
-}
-
-func Test_TimeEncoder_One(t *testing.T) {
-	enc := NewTimeEncoder()
-	tm := time.Unix(0, 0)
-
-	enc.Write(tm)
-	b, err := enc.Bytes()
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-
-	if got := b[0] >> 4; got != timeCompressedPackedSimple {
-		t.Fatalf("Wrong encoding used: expected uncompressed, got %v", got)
-	}
-
-	dec := NewTimeDecoder(b)
-	if !dec.Next() {
-		t.Fatalf("unexpected next value: got true, exp false")
-	}
-
-	if tm != dec.Read() {
-		t.Fatalf("read value mismatch: got %v, exp %v", dec.Read(), tm)
-	}
-}
-
-func Test_TimeEncoder_Two(t *testing.T) {
-	enc := NewTimeEncoder()
-	t1 := time.Unix(0, 0)
-	t2 := time.Unix(0, 1)
-	enc.Write(t1)
-	enc.Write(t2)
-
-	b, err := enc.Bytes()
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-
-	if got := b[0] >> 4; got != timeCompressedRLE {
-		t.Fatalf("Wrong encoding used: expected rle, got %v", got)
-	}
-
-	dec := NewTimeDecoder(b)
-	if !dec.Next() {
-		t.Fatalf("unexpected next value: got true, exp false")
-	}
-
-	if t1 != dec.Read() {
-		t.Fatalf("read value mismatch: got %v, exp %v", dec.Read(), t1)
-	}
-
-	if !dec.Next() {
-		t.Fatalf("unexpected next value: got true, exp false")
-	}
-
-	if t2 != dec.Read() {
-		t.Fatalf("read value mismatch: got %v, exp %v", dec.Read(), t2)
-	}
-}
-
-func Test_TimeEncoder_Three(t *testing.T) {
-	enc := NewTimeEncoder()
-	t1 := time.Unix(0, 0)
-	t2 := time.Unix(0, 1)
-	t3 := time.Unix(0, 3)
-
-	enc.Write(t1)
-	enc.Write(t2)
-	enc.Write(t3)
-
-	b, err := enc.Bytes()
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-
-	if got := b[0] >> 4; got != timeCompressedPackedSimple {
-		t.Fatalf("Wrong encoding used: expected rle, got %v", got)
-	}
-
-	dec := NewTimeDecoder(b)
-	if !dec.Next() {
-		t.Fatalf("unexpected next value: got true, exp false")
-	}
-
-	if t1 != dec.Read() {
-		t.Fatalf("read value mismatch: got %v, exp %v", dec.Read(), t1)
-	}
-
-	if !dec.Next() {
-		t.Fatalf("unexpected next value: got true, exp false")
-	}
-
-	if t2 != dec.Read() {
-		t.Fatalf("read value mismatch: got %v, exp %v", dec.Read(), t2)
-	}
-
-	if !dec.Next() {
-		t.Fatalf("unexpected next value: got true, exp false")
-	}
-
-	if t3 != dec.Read() {
-		t.Fatalf("read value mismatch: got %v, exp %v", dec.Read(), t3)
-	}
-}
-
-func Test_TimeEncoder_Large_Range(t *testing.T) {
-	enc := NewTimeEncoder()
-	t1 := time.Unix(0, 1442369134000000000)
-	t2 := time.Unix(0, 1442369135000000000)
-	enc.Write(t1)
-	enc.Write(t2)
-	b, err := enc.Bytes()
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-
-	if got := b[0] >> 4; got != timeCompressedRLE {
-		t.Fatalf("Wrong encoding used: expected rle, got %v", got)
-	}
-
-	dec := NewTimeDecoder(b)
-	if !dec.Next() {
-		t.Fatalf("unexpected next value: got true, exp false")
-	}
-
-	if t1 != dec.Read() {
-		t.Fatalf("read value mismatch: got %v, exp %v", dec.Read(), t1)
-	}
-
-	if !dec.Next() {
-		t.Fatalf("unexpected next value: got true, exp false")
-	}
-
-	if t2 != dec.Read() {
-		t.Fatalf("read value mismatch: got %v, exp %v", dec.Read(), t2)
-	}
-}
-
-func Test_TimeEncoder_Uncompressed(t *testing.T) {
-	enc := NewTimeEncoder()
-	t1 := time.Unix(0, 0)
-	t2 := time.Unix(1, 0)
-
-	// about 36.5yrs in NS resolution is max range for compressed format
-	// This should cause the encoding to fallback to raw points
-	t3 := time.Unix(2, (2 << 59))
-	enc.Write(t1)
-	enc.Write(t2)
-	enc.Write(t3)
-
-	b, err := enc.Bytes()
-	if err != nil {
-		t.Fatalf("expected error: %v", err)
-	}
-
-	if exp := 25; len(b) != exp {
-		t.Fatalf("length mismatch: got %v, exp %v", len(b), exp)
-	}
-
-	if got := b[0] >> 4; got != timeUncompressed {
-		t.Fatalf("Wrong encoding used: expected uncompressed, got %v", got)
-	}
-
-	dec := NewTimeDecoder(b)
-	if !dec.Next() {
-		t.Fatalf("unexpected next value: got true, exp false")
-	}
-
-	if t1 != dec.Read() {
-		t.Fatalf("read value mismatch: got %v, exp %v", dec.Read(), t1)
-	}
-
-	if !dec.Next() {
-		t.Fatalf("unexpected next value: got true, exp false")
-	}
-
-	if t2 != dec.Read() {
-		t.Fatalf("read value mismatch: got %v, exp %v", dec.Read(), t2)
-	}
-
-	if !dec.Next() {
-		t.Fatalf("unexpected next value: got true, exp false")
-	}
-
-	if t3 != dec.Read() {
-		t.Fatalf("read value mismatch: got %v, exp %v", dec.Read(), t3)
-	}
-}
-
-func Test_TimeEncoder_RLE(t *testing.T) {
-	enc := NewTimeEncoder()
-	var ts []time.Time
-	for i := 0; i < 500; i++ {
-		ts = append(ts, time.Unix(int64(i), 0))
-	}
-
-	for _, v := range ts {
-		enc.Write(v)
-	}
-
-	b, err := enc.Bytes()
-	if exp := 12; len(b) != exp {
-		t.Fatalf("length mismatch: got %v, exp %v", len(b), exp)
-	}
-
-	if got := b[0] >> 4; got != timeCompressedRLE {
-		t.Fatalf("Wrong encoding used: expected uncompressed, got %v", got)
-	}
-
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-
-	dec := NewTimeDecoder(b)
-	for i, v := range ts {
-		if !dec.Next() {
-			t.Fatalf("Next == false, expected true")
-		}
-
-		if v != dec.Read() {
-			t.Fatalf("Item %d mismatch, got %v, exp %v", i, dec.Read(), v)
-		}
-	}
-
-	if dec.Next() {
-		t.Fatalf("unexpected extra values")
-	}
-}
-
-func Test_TimeEncoder_Reverse(t *testing.T) {
-	enc := NewTimeEncoder()
-	ts := []time.Time{
-		time.Unix(0, 3),
-		time.Unix(0, 2),
-		time.Unix(0, 0),
-	}
-
-	for _, v := range ts {
-		enc.Write(v)
-	}
-
-	b, err := enc.Bytes()
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-
-	if got := b[0] >> 4; got != timeUncompressed {
-		t.Fatalf("Wrong encoding used: expected uncompressed, got %v", got)
-	}
-
-	dec := NewTimeDecoder(b)
-	i := 0
-	for dec.Next() {
-		if ts[i] != dec.Read() {
-			t.Fatalf("read value %d mismatch: got %v, exp %v", i, dec.Read(), ts[i])
-		}
-		i++
-	}
-}
-
-func Test_TimeEncoder_220SecondDelta(t *testing.T) {
-	enc := NewTimeEncoder()
-	var ts []time.Time
-	now := time.Now()
-	for i := 0; i < 220; i++ {
-		ts = append(ts, now.Add(time.Duration(i*60)*time.Second))
-	}
-
-	for _, v := range ts {
-		enc.Write(v)
-	}
-
-	b, err := enc.Bytes()
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-
-	// Using RLE, should get 12 bytes
-	if exp := 12; len(b) != exp {
-		t.Fatalf("unexpected length: got %v, exp %v", len(b), exp)
-	}
-
-	if got := b[0] >> 4; got != timeCompressedRLE {
-		t.Fatalf("Wrong encoding used: expected uncompressed, got %v", got)
-	}
-
-	dec := NewTimeDecoder(b)
-	i := 0
-	for dec.Next() {
-		if ts[i] != dec.Read() {
-			t.Fatalf("read value %d mismatch: got %v, exp %v", i, dec.Read(), ts[i])
-		}
-		i++
-	}
-
-	if i != len(ts) {
-		t.Fatalf("Read too few values: exp %d, got %d", len(ts), i)
-	}
-
-	if dec.Next() {
-		t.Fatalf("expecte Next() = false, got true")
-	}
-}
-
-func Test_TimeEncoder_Quick(t *testing.T) {
-	quick.Check(func(values []int64) bool {
-		// Write values to encoder.
-		enc := NewTimeEncoder()
-		exp := make([]time.Time, len(values))
-		for i, v := range values {
-			exp[i] = time.Unix(0, v)
-			enc.Write(exp[i])
-		}
-
-		// Retrieve encoded bytes from encoder.
-		buf, err := enc.Bytes()
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		// Read values out of decoder.
-		got := make([]time.Time, 0, len(values))
-		dec := NewTimeDecoder(buf)
-		for dec.Next() {
-			if err := dec.Error(); err != nil {
-				t.Fatal(err)
-			}
-			got = append(got, dec.Read())
-		}
-
-		// Verify that input and output values match.
-		if !reflect.DeepEqual(exp, got) {
-			t.Fatalf("mismatch:\n\nexp=%+v\n\ngot=%+v\n\n", exp, got)
-		}
-
-		return true
-	}, nil)
-}
-
-func Test_TimeEncoder_RLESeconds(t *testing.T) {
-	enc := NewTimeEncoder()
-	ts := make([]time.Time, 6)
-
-	ts[0] = time.Unix(0, 1444448158000000000)
-	ts[1] = time.Unix(0, 1444448168000000000)
-	ts[2] = time.Unix(0, 1444448178000000000)
-	ts[3] = time.Unix(0, 1444448188000000000)
-	ts[4] = time.Unix(0, 1444448198000000000)
-	ts[5] = time.Unix(0, 1444448208000000000)
-
-	for _, v := range ts {
-		enc.Write(v)
-	}
-
-	b, err := enc.Bytes()
-	if got := b[0] >> 4; got != timeCompressedRLE {
-		t.Fatalf("Wrong encoding used: expected rle, got %v", got)
-	}
-
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-
-	dec := NewTimeDecoder(b)
-	for i, v := range ts {
-		if !dec.Next() {
-			t.Fatalf("Next == false, expected true")
-		}
-
-		if v != dec.Read() {
-			t.Fatalf("Item %d mismatch, got %v, exp %v", i, dec.Read(), v)
-		}
-	}
-
-	if dec.Next() {
-		t.Fatalf("unexpected extra values")
-	}
-
-}
-func BenchmarkTimeEncoder(b *testing.B) {
-	enc := NewTimeEncoder()
-	x := make([]time.Time, 1024)
-	for i := 0; i < len(x); i++ {
-		x[i] = time.Now()
-		enc.Write(x[i])
-	}
-
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		enc.Bytes()
-	}
-}
-
-func BenchmarkTimeDecoder(b *testing.B) {
-	x := make([]time.Time, 1024)
-	enc := NewTimeEncoder()
-	for i := 0; i < len(x); i++ {
-		x[i] = time.Now()
-		enc.Write(x[i])
-	}
-	bytes, _ := enc.Bytes()
-
-	b.ResetTimer()
-
-	for i := 0; i < b.N; i++ {
-		b.StopTimer()
-		dec := NewTimeDecoder(bytes)
-		b.StartTimer()
-		for dec.Next() {
-		}
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/engine/tsm1/tsm1.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/engine/tsm1/tsm1.go
deleted file mode 100644
index 59ddcd704..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/engine/tsm1/tsm1.go
+++ /dev/null
@@ -1,2371 +0,0 @@
-package tsm1
-
-import (
-	"encoding/binary"
-	"encoding/json"
-	"fmt"
-	"hash/fnv"
-	"io"
-	"io/ioutil"
-	"log"
-	"math"
-	"os"
-	"path/filepath"
-	"sort"
-	"strings"
-	"sync"
-	"syscall"
-	"time"
-
-	"github.com/golang/snappy"
-	"github.com/influxdb/influxdb/models"
-	"github.com/influxdb/influxdb/tsdb"
-)
-
-const (
-	// Format is the file format name of this engine.
-	Format = "tsm1"
-
-	//IDsFileExtension is the extension for the file that keeps the compressed map
-	// of keys to uint64 IDs.
-	IDsFileExtension = "ids"
-
-	// FieldsFileExtension is the extension for the file that stores compressed field
-	// encoding data for this db
-	FieldsFileExtension = "fields"
-
-	// SeriesFileExtension is the extension for the file that stores the compressed
-	// series metadata for series in this db
-	SeriesFileExtension = "series"
-
-	// CollisionsFileExtension is the extension for the file that keeps a map of which
-	// keys have hash collisions and what their actual IDs are
-	CollisionsFileExtension = "collisions"
-
-	// CheckpointExtension is the extension given to files that checkpoint a rewrite or compaction.
-	// The checkpoint files are created when a new file is first created. They
-	// are removed after the file has been synced and is safe for use. If a file
-	// has an associated checkpoint file, it wasn't safely written and both should be removed
-	CheckpointExtension = "check"
-
-	// CompactionExtension is the extension given to the file that marks when a compaction has been
-	// fully written, but the compacted files have not yet been deleted. It is used for cleanup
-	// if the server was not cleanly shutdown before the compacted files could be deleted.
-	CompactionExtension = "compact"
-
-	// keyFieldSeparator separates the series key from the field name in the composite key
-	// that identifies a specific field in series
-	keyFieldSeparator = "#!~#"
-
-	blockBufferSize = 1024 * 1024
-)
-
-type TimePrecision uint8
-
-const (
-	Seconds TimePrecision = iota
-	Milliseconds
-	Microseconds
-	Nanoseconds
-)
-
-func init() {
-	tsdb.RegisterEngine(Format, NewEngine)
-}
-
-const (
-	MaxDataFileSize = 1024 * 1024 * 1024 * 2 // 2GB
-
-	DefaultRotateFileSize = 5 * 1024 * 1024 // 5MB
-
-	DefaultMaxPointsPerBlock = 1000
-
-	// MAP_POPULATE is for the mmap syscall. For some reason this isn't defined in golang's syscall
-	MAP_POPULATE = 0x8000
-)
-
-// Ensure Engine implements the interface.
-var _ tsdb.Engine = &Engine{}
-
-// Engine represents a storage engine with compressed blocks.
-type Engine struct {
-	writeLock *WriteLock
-	metaLock  sync.Mutex
-	path      string
-	logger    *log.Logger
-
-	// deletesPending mark how many old data files are waiting to be deleted. This will
-	// keep a close from returning until all deletes finish
-	deletesPending sync.WaitGroup
-
-	// HashSeriesField is a function that takes a series key and a field name
-	// and returns a hash identifier. It's not guaranteed to be unique.
-	HashSeriesField func(key string) uint64
-
-	WAL *Log
-
-	RotateFileSize             uint32
-	MaxFileSize                uint32
-	SkipCompaction             bool
-	CompactionAge              time.Duration
-	MinCompactionFileCount     int
-	IndexCompactionFullAge     time.Duration
-	IndexMinCompactionInterval time.Duration
-	MaxPointsPerBlock          int
-
-	// filesLock is only for modifying and accessing the files slice
-	filesLock          sync.RWMutex
-	files              dataFiles
-	currentFileID      int
-	compactionRunning  bool
-	lastCompactionTime time.Time
-
-	// deletes is a map of keys that are deleted, but haven't yet been
-	// compacted and flushed. They map the ID to the corresponding key
-	deletes map[uint64]string
-
-	// deleteMeasurements is a map of the measurements that are deleted
-	// but haven't yet been compacted and flushed
-	deleteMeasurements map[string]bool
-
-	collisionsLock sync.RWMutex
-	collisions     map[string]uint64
-
-	// queryLock keeps data files from being deleted or the store from
-	// being closed while queries are running
-	queryLock sync.RWMutex
-}
-
-// NewEngine returns a new instance of Engine.
-func NewEngine(path string, walPath string, opt tsdb.EngineOptions) tsdb.Engine {
-	w := NewLog(path)
-	w.FlushColdInterval = time.Duration(opt.Config.WALFlushColdInterval)
-	w.FlushMemorySizeThreshold = opt.Config.WALFlushMemorySizeThreshold
-	w.MaxMemorySizeThreshold = opt.Config.WALMaxMemorySizeThreshold
-	w.LoggingEnabled = opt.Config.WALLoggingEnabled
-
-	e := &Engine{
-		path:      path,
-		writeLock: &WriteLock{},
-		logger:    log.New(os.Stderr, "[tsm1] ", log.LstdFlags),
-
-		// TODO: this is the function where we can inject a check against the in memory collisions
-		HashSeriesField:            hashSeriesField,
-		WAL:                        w,
-		RotateFileSize:             DefaultRotateFileSize,
-		MaxFileSize:                MaxDataFileSize,
-		CompactionAge:              opt.Config.IndexCompactionAge,
-		MinCompactionFileCount:     opt.Config.IndexMinCompactionFileCount,
-		IndexCompactionFullAge:     opt.Config.IndexCompactionFullAge,
-		IndexMinCompactionInterval: opt.Config.IndexMinCompactionInterval,
-		MaxPointsPerBlock:          DefaultMaxPointsPerBlock,
-	}
-	e.WAL.IndexWriter = e
-
-	return e
-}
-
-// Path returns the path the engine was opened with.
-func (e *Engine) Path() string { return e.path }
-
-// PerformMaintenance is for periodic maintenance of the store. A no-op for b1
-func (e *Engine) PerformMaintenance() {
-	if f := e.WAL.shouldFlush(); f != noFlush {
-		go func() {
-			if err := e.WAL.flush(f); err != nil {
-				e.logger.Printf("PerformMaintenance: WAL flush failed: %v", err)
-			}
-		}()
-		return
-	}
-
-	// don't do a full compaction if the WAL received writes in the time window
-	if time.Since(e.WAL.LastWriteTime()) < e.IndexCompactionFullAge {
-		return
-	}
-
-	e.filesLock.RLock()
-	running := e.compactionRunning
-	deletesPending := len(e.deletes) > 0
-	e.filesLock.RUnlock()
-	if running || deletesPending {
-		return
-	}
-
-	// do a full compaction if all the index files are older than the compaction time
-	for _, f := range e.copyFilesCollection() {
-		if time.Since(f.modTime) < e.IndexCompactionFullAge {
-			return
-		}
-	}
-
-	go func() {
-		if err := e.Compact(true); err != nil {
-			e.logger.Printf("PerformMaintenance: error during compaction: %v", err)
-		}
-	}()
-}
-
-// Format returns the format type of this engine
-func (e *Engine) Format() tsdb.EngineFormat {
-	return tsdb.TSM1Format
-}
-
-// Open opens and initializes the engine.
-func (e *Engine) Open() error {
-	if err := os.MkdirAll(e.path, 0777); err != nil {
-		return err
-	}
-
-	// perform any cleanup on metafiles that were halfway written
-	e.cleanupMetafile(SeriesFileExtension)
-	e.cleanupMetafile(FieldsFileExtension)
-	e.cleanupMetafile(IDsFileExtension)
-	e.cleanupMetafile(CollisionsFileExtension)
-
-	e.cleanupUnfinishedCompaction()
-
-	files, err := filepath.Glob(filepath.Join(e.path, fmt.Sprintf("*.%s", Format)))
-	if err != nil {
-		return err
-	}
-	for _, fn := range files {
-		// if the file has a checkpoint it's not valid, so remove it
-		if removed := e.removeFileIfCheckpointExists(fn); removed {
-			continue
-		}
-
-		id, err := idFromFileName(fn)
-		if err != nil {
-			return err
-		}
-		if id >= e.currentFileID {
-			e.currentFileID = id + 1
-		}
-		f, err := os.OpenFile(fn, os.O_RDONLY, 0666)
-		if err != nil {
-			return fmt.Errorf("error opening file %s: %s", fn, err.Error())
-		}
-		df, err := NewDataFile(f)
-		if err != nil {
-			return fmt.Errorf("error opening memory map for file %s: %s", fn, err.Error())
-		}
-		e.files = append(e.files, df)
-	}
-	sort.Sort(e.files)
-
-	if err := e.readCollisions(); err != nil {
-		return err
-	}
-
-	e.deletes = make(map[uint64]string)
-	e.deleteMeasurements = make(map[string]bool)
-
-	// mark the last compaction as now so it doesn't try to compact while
-	// flushing the WAL on load
-	e.lastCompactionTime = time.Now()
-
-	if err := e.WAL.Open(); err != nil {
-		return err
-	}
-
-	e.lastCompactionTime = time.Now()
-
-	return nil
-}
-
-// cleanupUnfinishedConpaction will read any compaction markers. If the marker exists, the compaction finished successfully,
-// but didn't get fully cleaned up. Remove the old files and their checkpoints
-func (e *Engine) cleanupUnfinishedCompaction() {
-	files, err := filepath.Glob(filepath.Join(e.path, fmt.Sprintf("*.%s", CompactionExtension)))
-	if err != nil {
-		panic(fmt.Sprintf("error getting compaction checkpoints: %s", err.Error()))
-	}
-
-	for _, fn := range files {
-		f, err := os.OpenFile(fn, os.O_RDONLY, 0666)
-		if err != nil {
-			panic(fmt.Sprintf("error opening compaction info file: %s", err.Error()))
-		}
-		data, err := ioutil.ReadAll(f)
-		if err != nil {
-			panic(fmt.Sprintf("error reading compaction info file: %s", err.Error()))
-		}
-
-		c := &compactionCheckpoint{}
-		err = json.Unmarshal(data, c)
-		if err == nil {
-			c.cleanup()
-		}
-
-		if err := f.Close(); err != nil {
-			panic(fmt.Sprintf("error closing compaction checkpoint: %s", err.Error()))
-		}
-		if err := os.RemoveAll(f.Name()); err != nil {
-			panic(fmt.Sprintf("error removing compaction checkpoint: %s", err.Error()))
-		}
-	}
-}
-
-// Close closes the engine.
-func (e *Engine) Close() error {
-	// get all the locks so queries, writes, and compactions stop before closing
-	e.queryLock.Lock()
-	defer e.queryLock.Unlock()
-	e.metaLock.Lock()
-	defer e.metaLock.Unlock()
-	min, max := int64(math.MinInt64), int64(math.MaxInt64)
-	e.writeLock.LockRange(min, max)
-	defer e.writeLock.UnlockRange(min, max)
-	e.filesLock.Lock()
-	defer e.filesLock.Unlock()
-
-	e.WAL.Close()
-
-	// ensure all deletes have been processed
-	e.deletesPending.Wait()
-
-	for _, df := range e.files {
-		_ = df.Close()
-	}
-	e.files = nil
-	e.currentFileID = 0
-	e.collisions = nil
-	e.deletes = nil
-	e.deleteMeasurements = nil
-	return nil
-}
-
-// DataFileCount returns the number of data files in the database
-func (e *Engine) DataFileCount() int {
-	e.filesLock.RLock()
-	defer e.filesLock.RUnlock()
-	return len(e.files)
-}
-
-// SetLogOutput is a no-op.
-func (e *Engine) SetLogOutput(w io.Writer) {}
-
-// LoadMetadataIndex loads the shard metadata into memory.
-func (e *Engine) LoadMetadataIndex(shard *tsdb.Shard, index *tsdb.DatabaseIndex, measurementFields map[string]*tsdb.MeasurementFields) error {
-	// Load measurement metadata
-	fields, err := e.readFields()
-	if err != nil {
-		return err
-	}
-	for k, mf := range fields {
-		m := index.CreateMeasurementIndexIfNotExists(string(k))
-		for name := range mf.Fields {
-			m.SetFieldName(name)
-		}
-		mf.Codec = tsdb.NewFieldCodec(mf.Fields)
-		measurementFields[m.Name] = mf
-	}
-
-	// Load series metadata
-	series, err := e.readSeries()
-	if err != nil {
-		return err
-	}
-
-	// Load the series into the in-memory index in sorted order to ensure
-	// it's always consistent for testing purposes
-	a := make([]string, 0, len(series))
-	for k := range series {
-		a = append(a, k)
-	}
-	sort.Strings(a)
-	for _, key := range a {
-		s := series[key]
-		s.InitializeShards()
-		index.CreateSeriesIndexIfNotExists(tsdb.MeasurementFromSeriesKey(string(key)), s)
-	}
-
-	return nil
-}
-
-// WritePoints writes metadata and point data into the engine.
-// Returns an error if new points are added to an existing key.
-func (e *Engine) WritePoints(points []models.Point, measurementFieldsToSave map[string]*tsdb.MeasurementFields, seriesToCreate []*tsdb.SeriesCreate) error {
-	return e.WAL.WritePoints(points, measurementFieldsToSave, seriesToCreate)
-}
-
-func (e *Engine) Write(pointsByKey map[string]Values, measurementFieldsToSave map[string]*tsdb.MeasurementFields, seriesToCreate []*tsdb.SeriesCreate) error {
-	// Flush any deletes before writing new data from the WAL
-	e.filesLock.RLock()
-	hasDeletes := len(e.deletes) > 0
-	e.filesLock.RUnlock()
-	if hasDeletes {
-		e.flushDeletes()
-	}
-
-	startTime, endTime, valuesByID, err := e.convertKeysAndWriteMetadata(pointsByKey, measurementFieldsToSave, seriesToCreate)
-	if err != nil {
-		return err
-	}
-	if len(valuesByID) == 0 {
-		return nil
-	}
-
-	files, lockStart, lockEnd := e.filesAndLock(startTime, endTime)
-	defer e.writeLock.UnlockRange(lockStart, lockEnd)
-
-	if len(files) == 0 {
-		return e.rewriteFile(nil, valuesByID)
-	}
-
-	maxTime := int64(math.MaxInt64)
-
-	// do the file rewrites in parallel
-	var mu sync.Mutex
-	var writes sync.WaitGroup
-	var errors []error
-
-	// reverse through the data files and write in the data
-	for i := len(files) - 1; i >= 0; i-- {
-		f := files[i]
-		// max times are exclusive, so add 1 to it
-		fileMax := f.MaxTime() + 1
-		fileMin := f.MinTime()
-		// if the file is < rotate, write all data between fileMin and maxTime
-		if f.size < e.RotateFileSize {
-			writes.Add(1)
-			go func(df *dataFile, vals map[uint64]Values) {
-				if err := e.rewriteFile(df, vals); err != nil {
-					mu.Lock()
-					errors = append(errors, err)
-					mu.Unlock()
-				}
-				writes.Done()
-			}(f, e.filterDataBetweenTimes(valuesByID, fileMin, maxTime))
-			continue
-		}
-		// if the file is > rotate:
-		//   write all data between fileMax and maxTime into new file
-		//   write all data between fileMin and fileMax into old file
-		writes.Add(1)
-		go func(vals map[uint64]Values) {
-			if err := e.rewriteFile(nil, vals); err != nil {
-				mu.Lock()
-				errors = append(errors, err)
-				mu.Unlock()
-			}
-			writes.Done()
-		}(e.filterDataBetweenTimes(valuesByID, fileMax, maxTime))
-		writes.Add(1)
-		go func(df *dataFile, vals map[uint64]Values) {
-			if err := e.rewriteFile(df, vals); err != nil {
-				mu.Lock()
-				errors = append(errors, err)
-				mu.Unlock()
-			}
-			writes.Done()
-		}(f, e.filterDataBetweenTimes(valuesByID, fileMin, fileMax))
-		maxTime = fileMin
-	}
-	// for any data leftover, write into a new file since it's all older
-	// than any file we currently have
-	writes.Add(1)
-	go func() {
-		if err := e.rewriteFile(nil, valuesByID); err != nil {
-			mu.Lock()
-			errors = append(errors, err)
-			mu.Unlock()
-		}
-		writes.Done()
-	}()
-
-	writes.Wait()
-
-	if len(errors) > 0 {
-		// TODO: log errors
-		return errors[0]
-	}
-
-	if !e.SkipCompaction && e.shouldCompact() {
-		go func() {
-			if err := e.Compact(false); err != nil {
-				e.logger.Printf("Write: error during compaction: %v", err)
-			}
-		}()
-	}
-
-	return nil
-}
-
-// MarkDeletes will mark the given keys for deletion in memory. They will be deleted from data
-// files on the next flush. This mainly for the WAL to use on startup
-func (e *Engine) MarkDeletes(keys []string) {
-	e.filesLock.Lock()
-	defer e.filesLock.Unlock()
-	for _, k := range keys {
-		e.deletes[e.keyToID(k)] = k
-	}
-}
-
-func (e *Engine) MarkMeasurementDelete(name string) {
-	e.filesLock.Lock()
-	defer e.filesLock.Unlock()
-	e.deleteMeasurements[name] = true
-}
-
-// filesAndLock returns the data files that match the given range and
-// ensures that the write lock will hold for the entire range
-func (e *Engine) filesAndLock(min, max int64) (a dataFiles, lockStart, lockEnd int64) {
-	for {
-		a = make([]*dataFile, 0)
-		files := e.copyFilesCollection()
-
-		e.filesLock.RLock()
-		for _, f := range e.files {
-			fmin, fmax := f.MinTime(), f.MaxTime()
-			if min < fmax && fmin >= fmin {
-				a = append(a, f)
-			} else if max >= fmin && max < fmax {
-				a = append(a, f)
-			}
-		}
-		e.filesLock.RUnlock()
-
-		if len(a) > 0 {
-			lockStart = a[0].MinTime()
-			lockEnd = a[len(a)-1].MaxTime()
-			if max > lockEnd {
-				lockEnd = max
-			}
-		} else {
-			lockStart = min
-			lockEnd = max
-		}
-
-		e.writeLock.LockRange(lockStart, lockEnd)
-
-		// it's possible for compaction to change the files collection while we
-		// were waiting for a write lock on the range. Make sure the files are still the
-		// same after we got the lock, otherwise try again. This shouldn't happen often.
-		filesAfterLock := e.copyFilesCollection()
-		if dataFilesEquals(files, filesAfterLock) {
-			return
-		}
-
-		e.writeLock.UnlockRange(lockStart, lockEnd)
-	}
-}
-
-// getCompactionFiles will return the list of files ready to be compacted along with the min and
-// max time of the write lock obtained for compaction
-func (e *Engine) getCompactionFiles(fullCompaction bool) (minTime, maxTime int64, files dataFiles) {
-	// we're looping here to ensure that the files we've marked to compact are
-	// still there after we've obtained the write lock
-	for {
-		if fullCompaction {
-			files = e.copyFilesCollection()
-		} else {
-			files = e.filesToCompact()
-		}
-		if len(files) < 2 {
-			return minTime, maxTimeOffset, nil
-		}
-		minTime = files[0].MinTime()
-		maxTime = files[len(files)-1].MaxTime()
-
-		e.writeLock.LockRange(minTime, maxTime)
-
-		// if the files are different after obtaining the write lock, one or more
-		// was rewritten. Release the lock and try again. This shouldn't happen really.
-		var filesAfterLock dataFiles
-		if fullCompaction {
-			filesAfterLock = e.copyFilesCollection()
-		} else {
-			filesAfterLock = e.filesToCompact()
-		}
-		if !dataFilesEquals(files, filesAfterLock) {
-			e.writeLock.UnlockRange(minTime, maxTime)
-			continue
-		}
-
-		// we've got the write lock and the files are all there
-		return
-	}
-}
-
-// compactToNewFiles will compact the passed in data files into as few files as possible
-func (e *Engine) compactToNewFiles(minTime, maxTime int64, files dataFiles) []*os.File {
-	fileName := e.nextFileName()
-	e.logger.Printf("Starting compaction in %s of %d files to new file %s", e.path, len(files), fileName)
-
-	compaction := newCompactionJob(files, minTime, maxTime, e.MaxFileSize, e.MaxPointsPerBlock)
-	compaction.newCurrentFile(fileName)
-
-	// loop writing data until we've read through all the files
-	for {
-		nextID := compaction.nextID()
-		if nextID == dataFileEOF {
-			break
-		}
-
-		// write data for this ID while rotating to new files if necessary
-		for {
-			moreToWrite := compaction.writeBlocksForID(nextID)
-			if !moreToWrite {
-				break
-			}
-			compaction.newCurrentFile(e.nextFileName())
-		}
-	}
-
-	// close out the current compacted file
-	compaction.writeOutCurrentFile()
-
-	return compaction.newFiles
-}
-
-// Compact will compact data files in the directory into the fewest possible data files they
-// can be combined into
-func (e *Engine) Compact(fullCompaction bool) error {
-	minTime, maxTime, files := e.getCompactionFiles(fullCompaction)
-	if len(files) < 2 {
-		return nil
-	}
-
-	// mark the compaction as running
-	e.filesLock.Lock()
-	if e.compactionRunning {
-		e.filesLock.Unlock()
-		return nil
-	}
-	e.compactionRunning = true
-	e.filesLock.Unlock()
-	defer func() {
-		//release the lock
-		e.writeLock.UnlockRange(minTime, maxTime)
-		e.filesLock.Lock()
-		e.lastCompactionTime = time.Now()
-		e.compactionRunning = false
-		e.filesLock.Unlock()
-	}()
-
-	st := time.Now()
-
-	newFiles := e.compactToNewFiles(minTime, maxTime, files)
-
-	newDataFiles := make(dataFiles, len(newFiles))
-	for i, f := range newFiles {
-		// now open it as a memory mapped data file
-		newDF, err := NewDataFile(f)
-		if err != nil {
-			return err
-		}
-		newDataFiles[i] = newDF
-	}
-
-	// write the compaction file to note that we've successfully commpleted the write portion of compaction
-	compactedFileNames := make([]string, len(files))
-	newFileNames := make([]string, len(newFiles))
-	for i, f := range files {
-		compactedFileNames[i] = f.f.Name()
-	}
-	for i, f := range newFiles {
-		newFileNames[i] = f.Name()
-	}
-	compactionCheckpointName, err := e.writeCompactionCheckpointFile(compactedFileNames, newFileNames)
-	if err != nil {
-		return err
-	}
-
-	// update engine with new file pointers
-	e.filesLock.Lock()
-	var replacementFiles dataFiles
-	for _, df := range e.files {
-		// exclude any files that were compacted
-		include := true
-		for _, f := range files {
-			if f == df {
-				include = false
-				break
-			}
-		}
-		if include {
-			replacementFiles = append(replacementFiles, df)
-		}
-	}
-	replacementFiles = append(replacementFiles, newDataFiles...)
-	sort.Sort(replacementFiles)
-	e.files = replacementFiles
-	e.filesLock.Unlock()
-
-	e.logger.Printf("Compaction of %s took %s", e.path, time.Since(st))
-
-	e.clearCompactedFiles(compactionCheckpointName, newFiles, files)
-
-	return nil
-}
-
-// clearCompactedFiles will remove the compaction checkpoints for new files, remove the old compacted files, and
-// finally remove the compaction checkpoint
-func (e *Engine) clearCompactedFiles(compactionCheckpointName string, newFiles []*os.File, oldFiles dataFiles) {
-	// delete the old files in a goroutine so running queries won't block the write
-	// from completing
-	e.deletesPending.Add(1)
-	go func() {
-		// first clear out the compaction checkpoints
-		for _, f := range newFiles {
-			if err := removeCheckpoint(f.Name()); err != nil {
-				// panic here since continuing could cause data loss. It's better to fail hard so
-				// everything can be recovered on restart
-				panic(fmt.Sprintf("error removing checkpoint file %s: %s", f.Name(), err.Error()))
-			}
-		}
-
-		// now delete the underlying data files
-		for _, f := range oldFiles {
-			if err := f.Delete(); err != nil {
-				panic(fmt.Sprintf("error deleting old file after compaction %s: %s", f.f.Name(), err.Error()))
-			}
-		}
-
-		// finally remove the compaction marker
-		if err := os.RemoveAll(compactionCheckpointName); err != nil {
-			e.logger.Printf("error removing %s: %s", compactionCheckpointName, err.Error())
-		}
-
-		e.deletesPending.Done()
-	}()
-}
-
-// writeCompactionCheckpointFile will save the compacted filenames and new filenames in
-// a file. This is used on startup to clean out files that weren't deleted if the server
-// wasn't shut down cleanly.
-func (e *Engine) writeCompactionCheckpointFile(compactedFiles, newFiles []string) (string, error) {
-	m := &compactionCheckpoint{
-		CompactedFiles: compactedFiles,
-		NewFiles:       newFiles,
-	}
-
-	data, err := json.Marshal(m)
-	if err != nil {
-		return "", err
-	}
-
-	// make the compacted filename the same name as the first compacted file, but with the compacted extension
-	name := strings.Split(filepath.Base(compactedFiles[0]), ".")[0]
-	fn := fmt.Sprintf("%s.%s", name, CompactionExtension)
-	fileName := filepath.Join(filepath.Dir(compactedFiles[0]), fn)
-
-	f, err := os.OpenFile(fileName, os.O_CREATE|os.O_RDWR, 0666)
-	if err != nil {
-		return "", err
-	}
-	if _, err := f.Write(data); err != nil {
-		f.Close()
-		return fileName, err
-	}
-
-	return fileName, f.Close()
-}
-
-func (e *Engine) writeIndexAndGetDataFile(f *os.File, minTime, maxTime int64, ids []uint64, newPositions []uint32) (*dataFile, error) {
-	if err := writeIndex(f, minTime, maxTime, ids, newPositions); err != nil {
-		return nil, err
-	}
-
-	if err := removeCheckpoint(f.Name()); err != nil {
-		return nil, err
-	}
-
-	// now open it as a memory mapped data file
-	newDF, err := NewDataFile(f)
-	if err != nil {
-		return nil, err
-	}
-
-	return newDF, nil
-}
-
-func (e *Engine) shouldCompact() bool {
-	e.filesLock.RLock()
-	running := e.compactionRunning
-	since := time.Since(e.lastCompactionTime)
-	deletesPending := len(e.deletes) > 0
-	e.filesLock.RUnlock()
-	if running || since < e.IndexMinCompactionInterval || deletesPending {
-		return false
-	}
-	return len(e.filesToCompact()) >= e.MinCompactionFileCount
-}
-
-func (e *Engine) filesToCompact() dataFiles {
-	e.filesLock.RLock()
-	defer e.filesLock.RUnlock()
-
-	var a dataFiles
-	for _, df := range e.files {
-		if time.Since(df.modTime) > e.CompactionAge && df.size < e.MaxFileSize {
-			a = append(a, df)
-		} else if len(a) > 0 {
-			// only compact contiguous ranges. If we hit the negative case and
-			// there are files to compact, stop here
-			break
-		}
-	}
-	return a
-}
-
-func (e *Engine) convertKeysAndWriteMetadata(pointsByKey map[string]Values, measurementFieldsToSave map[string]*tsdb.MeasurementFields, seriesToCreate []*tsdb.SeriesCreate) (minTime, maxTime int64, valuesByID map[uint64]Values, err error) {
-	e.metaLock.Lock()
-	defer e.metaLock.Unlock()
-
-	if err := e.writeNewFields(measurementFieldsToSave); err != nil {
-		return 0, 0, nil, err
-	}
-	if err := e.writeNewSeries(seriesToCreate); err != nil {
-		return 0, 0, nil, err
-	}
-
-	if len(pointsByKey) == 0 {
-		return 0, 0, nil, nil
-	}
-
-	// read in keys and assign any that aren't defined
-	b, err := e.readCompressedFile(IDsFileExtension)
-	if err != nil {
-		return 0, 0, nil, err
-	}
-	ids := make(map[string]uint64)
-	if b != nil {
-		if err := json.Unmarshal(b, &ids); err != nil {
-			return 0, 0, nil, err
-		}
-	}
-
-	// these are values that are newer than anything stored in the shard
-	valuesByID = make(map[uint64]Values)
-
-	idToKey := make(map[uint64]string)    // we only use this map if new ids are being created
-	collisions := make(map[string]uint64) // we only use this if a collision is encountered
-	newKeys := false
-	// track the min and max time of values being inserted so we can lock that time range
-	minTime = int64(math.MaxInt64)
-	maxTime = int64(math.MinInt64)
-	for k, values := range pointsByKey {
-		var id uint64
-		var ok bool
-		if id, ok = ids[k]; !ok {
-			// populate the map if we haven't already
-
-			if len(idToKey) == 0 {
-				for n, id := range ids {
-					idToKey[id] = n
-				}
-			}
-
-			// now see if the hash id collides with a different key
-			hashID := e.HashSeriesField(k)
-			existingKey, idInMap := idToKey[hashID]
-			// we only care if the keys are different. if so, it's a hash collision we have to keep track of
-			if idInMap && k != existingKey {
-				// we have a collision, find this new key the next available id
-				hashID = 0
-				for {
-					hashID++
-					if _, ok := idToKey[hashID]; !ok {
-						// next ID is available, use it
-						break
-					}
-				}
-				collisions[k] = hashID
-			}
-
-			newKeys = true
-			ids[k] = hashID
-			idToKey[hashID] = k
-			id = hashID
-		}
-
-		if minTime > values.MinTime() {
-			minTime = values.MinTime()
-		}
-		if maxTime < values.MaxTime() {
-			maxTime = values.MaxTime()
-		}
-		valuesByID[id] = values
-	}
-
-	if newKeys {
-		b, err := json.Marshal(ids)
-		if err != nil {
-			return 0, 0, nil, err
-		}
-		if err := e.replaceCompressedFile(IDsFileExtension, b); err != nil {
-			return 0, 0, nil, err
-		}
-	}
-
-	if len(collisions) > 0 {
-		e.saveNewCollisions(collisions)
-	}
-
-	return
-}
-
-func (e *Engine) saveNewCollisions(collisions map[string]uint64) error {
-	e.collisionsLock.Lock()
-	defer e.collisionsLock.Unlock()
-
-	for k, v := range collisions {
-		e.collisions[k] = v
-	}
-
-	data, err := json.Marshal(e.collisions)
-
-	if err != nil {
-		return err
-	}
-
-	return e.replaceCompressedFile(CollisionsFileExtension, data)
-}
-
-func (e *Engine) readCollisions() error {
-	e.collisions = make(map[string]uint64)
-	data, err := e.readCompressedFile(CollisionsFileExtension)
-	if err != nil {
-		return err
-	}
-
-	if len(data) == 0 {
-		return nil
-	}
-
-	return json.Unmarshal(data, &e.collisions)
-}
-
-// filterDataBetweenTimes will create a new map with data between
-// the minTime (inclusive) and maxTime (exclusive) while removing that
-// data from the passed in map. It is assume that the Values arrays
-// are sorted in time ascending order
-func (e *Engine) filterDataBetweenTimes(valuesByID map[uint64]Values, minTime, maxTime int64) map[uint64]Values {
-	filteredValues := make(map[uint64]Values)
-	for id, values := range valuesByID {
-		maxIndex := len(values)
-		minIndex := -1
-		// find the index of the first value in the range
-		for i, v := range values {
-			t := v.UnixNano()
-			if t >= minTime && t < maxTime {
-				minIndex = i
-				break
-			}
-		}
-		if minIndex == -1 {
-			continue
-		}
-		// go backwards to find the index of the last value in the range
-		for i := len(values) - 1; i >= 0; i-- {
-			t := values[i].UnixNano()
-			if t < maxTime {
-				maxIndex = i + 1
-				break
-			}
-		}
-
-		// write into the result map and filter the passed in map
-		filteredValues[id] = values[minIndex:maxIndex]
-
-		// if we grabbed all the values, remove them from the passed in map
-		if minIndex == len(values) || (minIndex == 0 && maxIndex == len(values)) {
-			delete(valuesByID, id)
-			continue
-		}
-
-		valuesByID[id] = values[0:minIndex]
-		if maxIndex < len(values) {
-			valuesByID[id] = append(valuesByID[id], values[maxIndex:]...)
-		}
-	}
-	return filteredValues
-}
-
-// rewriteFile will read in the old data file, if provided and merge the values
-// in the passed map into a new data file
-func (e *Engine) rewriteFile(oldDF *dataFile, valuesByID map[uint64]Values) error {
-	if len(valuesByID) == 0 {
-		return nil
-	}
-
-	// we need the values in sorted order so that we can merge them into the
-	// new file as we read the old file
-	ids := make([]uint64, 0, len(valuesByID))
-	for id := range valuesByID {
-		ids = append(ids, id)
-	}
-
-	minTime := int64(math.MaxInt64)
-	maxTime := int64(math.MinInt64)
-
-	// read header of ids to starting positions and times
-	oldIDToPosition := make(map[uint64]uint32)
-	if oldDF != nil {
-		oldIDToPosition = oldDF.IDToPosition()
-		minTime = oldDF.MinTime()
-		maxTime = oldDF.MaxTime()
-	}
-
-	for _, v := range valuesByID {
-		if minTime > v.MinTime() {
-			minTime = v.MinTime()
-		}
-		if maxTime < v.MaxTime() {
-			// add 1 ns to the time since maxTime is exclusive
-			maxTime = v.MaxTime() + 1
-		}
-	}
-
-	// add any ids that are in the file that aren't getting flushed here
-	for id := range oldIDToPosition {
-		if _, ok := valuesByID[id]; !ok {
-			ids = append(ids, id)
-		}
-	}
-
-	// always write in order by ID
-	sort.Sort(uint64slice(ids))
-
-	f, err := openFileAndCheckpoint(e.nextFileName())
-	if err != nil {
-		return err
-	}
-
-	if oldDF == nil || oldDF.Deleted() {
-		e.logger.Printf("writing new index file %s", f.Name())
-	} else {
-		e.logger.Printf("rewriting index file %s with %s", oldDF.Name(), f.Name())
-	}
-
-	// now combine the old file data with the new values, keeping track of
-	// their positions
-	currentPosition := uint32(fileHeaderSize)
-	newPositions := make([]uint32, len(ids))
-	buf := make([]byte, e.MaxPointsPerBlock*20)
-	for i, id := range ids {
-		// mark the position for this ID
-		newPositions[i] = currentPosition
-
-		newVals := valuesByID[id]
-
-		// if this id is only in the file and not in the new values, just copy over from old file
-		if len(newVals) == 0 {
-			fpos := oldIDToPosition[id]
-
-			// write the blocks until we hit whatever the next id is
-			for {
-				fid := btou64(oldDF.mmap[fpos : fpos+8])
-				if fid != id {
-					break
-				}
-				length := btou32(oldDF.mmap[fpos+8 : fpos+12])
-				if _, err := f.Write(oldDF.mmap[fpos : fpos+12+length]); err != nil {
-					f.Close()
-					return err
-				}
-				fpos += (12 + length)
-				currentPosition += (12 + length)
-
-				// make sure we're not at the end of the file
-				if fpos >= oldDF.indexPosition() {
-					break
-				}
-			}
-
-			continue
-		}
-
-		// if the values are not in the file, just write the new ones
-		fpos, ok := oldIDToPosition[id]
-		if !ok {
-			// TODO: ensure we encode only the amount in a block
-			block, err := newVals.Encode(buf)
-			if err != nil {
-				f.Close()
-				return err
-			}
-
-			if err := writeBlock(f, id, block); err != nil {
-				f.Close()
-				return err
-			}
-			currentPosition += uint32(blockHeaderSize + len(block))
-
-			continue
-		}
-
-		// it's in the file and the new values, combine them and write out
-		for {
-			fid, _, block := oldDF.block(fpos)
-			if fid != id {
-				break
-			}
-			fpos += uint32(blockHeaderSize + len(block))
-
-			// determine if there's a block after this with the same id and get its time
-			nextID, nextTime, _ := oldDF.block(fpos)
-			hasFutureBlock := nextID == id
-
-			nv, newBlock, err := e.DecodeAndCombine(newVals, block, buf[:0], nextTime, hasFutureBlock)
-			newVals = nv
-			if err != nil {
-				f.Close()
-				return err
-			}
-
-			if _, err := f.Write(append(u64tob(id), u32tob(uint32(len(newBlock)))...)); err != nil {
-				f.Close()
-				return err
-			}
-			if _, err := f.Write(newBlock); err != nil {
-				f.Close()
-				return err
-			}
-
-			currentPosition += uint32(blockHeaderSize + len(newBlock))
-
-			if fpos >= oldDF.indexPosition() {
-				break
-			}
-		}
-
-		// TODO: ensure we encode only the amount in a block, refactor this wil line 450 into func
-		if len(newVals) > 0 {
-			// TODO: ensure we encode only the amount in a block
-			block, err := newVals.Encode(buf)
-			if err != nil {
-				f.Close()
-				return err
-			}
-
-			if _, err := f.Write(append(u64tob(id), u32tob(uint32(len(block)))...)); err != nil {
-				f.Close()
-				return err
-			}
-			if _, err := f.Write(block); err != nil {
-				f.Close()
-				return err
-			}
-			currentPosition += uint32(blockHeaderSize + len(block))
-		}
-	}
-
-	newDF, err := e.writeIndexAndGetDataFile(f, minTime, maxTime, ids, newPositions)
-	if err != nil {
-		f.Close()
-		return err
-	}
-
-	// update the engine to point at the new dataFiles
-	e.filesLock.Lock()
-	var files dataFiles
-	for _, df := range e.files {
-		if df != oldDF {
-			files = append(files, df)
-		}
-	}
-	files = append(files, newDF)
-	sort.Sort(files)
-	e.files = files
-	e.filesLock.Unlock()
-
-	// remove the old data file. no need to block returning the write,
-	// but we need to let any running queries finish before deleting it
-	if oldDF != nil {
-		e.deletesPending.Add(1)
-		go func() {
-			if err := oldDF.Delete(); err != nil {
-				e.logger.Println("ERROR DELETING FROM REWRITE:", oldDF.f.Name())
-			}
-			e.deletesPending.Done()
-		}()
-	}
-
-	return nil
-}
-
-// flushDeletes will lock the entire shard and rewrite all index files so they no
-// longer contain the flushed IDs
-func (e *Engine) flushDeletes() error {
-	e.writeLock.LockRange(math.MinInt64, math.MaxInt64)
-	defer e.writeLock.UnlockRange(math.MinInt64, math.MaxInt64)
-	e.metaLock.Lock()
-	defer e.metaLock.Unlock()
-
-	measurements := make(map[string]bool)
-	deletes := make(map[uint64]string)
-	e.filesLock.RLock()
-	for name := range e.deleteMeasurements {
-		measurements[name] = true
-	}
-	for id, key := range e.deletes {
-		deletes[id] = key
-	}
-	e.filesLock.RUnlock()
-
-	// if we're deleting measurements, rewrite the field data
-	if len(measurements) > 0 {
-		fields, err := e.readFields()
-		if err != nil {
-			return err
-		}
-		for name := range measurements {
-			delete(fields, name)
-		}
-		if err := e.writeFields(fields); err != nil {
-			return err
-		}
-	}
-
-	series, err := e.readSeries()
-	if err != nil {
-		return err
-	}
-	for _, key := range deletes {
-		seriesName, _ := seriesAndFieldFromCompositeKey(key)
-		delete(series, seriesName)
-	}
-	if err := e.writeSeries(series); err != nil {
-		return err
-	}
-
-	// now remove the raw time series data from the data files
-	files := e.copyFilesCollection()
-	newFiles := make(dataFiles, 0, len(files))
-	for _, f := range files {
-		newFiles = append(newFiles, e.writeNewFileExcludeDeletes(f))
-	}
-
-	// update the delete map and files
-	e.filesLock.Lock()
-	defer e.filesLock.Unlock()
-
-	e.files = newFiles
-
-	// remove the things we've deleted from the map
-	for name := range measurements {
-		delete(e.deleteMeasurements, name)
-	}
-	for id := range deletes {
-		delete(e.deletes, id)
-	}
-
-	e.deletesPending.Add(1)
-	go func() {
-		for _, oldDF := range files {
-			if err := oldDF.Delete(); err != nil {
-				e.logger.Println("ERROR DELETING FROM REWRITE:", oldDF.f.Name())
-			}
-		}
-		e.deletesPending.Done()
-	}()
-	return nil
-}
-
-func (e *Engine) writeNewFileExcludeDeletes(oldDF *dataFile) *dataFile {
-	f, err := openFileAndCheckpoint(e.nextFileName())
-	if err != nil {
-		panic(fmt.Sprintf("error opening new data file: %s", err.Error()))
-	}
-
-	var ids []uint64
-	var positions []uint32
-
-	indexPosition := oldDF.indexPosition()
-	currentPosition := uint32(fileHeaderSize)
-	currentID := uint64(0)
-	for currentPosition < indexPosition {
-		id := btou64(oldDF.mmap[currentPosition : currentPosition+8])
-		length := btou32(oldDF.mmap[currentPosition+8 : currentPosition+blockHeaderSize])
-		newPosition := currentPosition + blockHeaderSize + length
-
-		if _, ok := e.deletes[id]; ok {
-			currentPosition = newPosition
-			continue
-		}
-
-		if _, err := f.Write(oldDF.mmap[currentPosition:newPosition]); err != nil {
-			panic(fmt.Sprintf("error writing new index file: %s", err.Error()))
-		}
-		if id != currentID {
-			currentID = id
-			ids = append(ids, id)
-			positions = append(positions, currentPosition)
-		}
-		currentPosition = newPosition
-	}
-
-	df, err := e.writeIndexAndGetDataFile(f, oldDF.MinTime(), oldDF.MaxTime(), ids, positions)
-	if err != nil {
-		panic(fmt.Sprintf("error writing new index file: %s", err.Error()))
-	}
-
-	return df
-}
-
-func (e *Engine) nextFileName() string {
-	e.filesLock.Lock()
-	defer e.filesLock.Unlock()
-	e.currentFileID++
-	return filepath.Join(e.path, fmt.Sprintf("%07d.%s", e.currentFileID, Format))
-}
-
-func (e *Engine) readCompressedFile(name string) ([]byte, error) {
-	f, err := os.OpenFile(filepath.Join(e.path, name), os.O_RDONLY, 0666)
-	if os.IsNotExist(err) {
-		return nil, nil
-	} else if err != nil {
-		return nil, err
-	}
-	b, err := ioutil.ReadAll(f)
-	if err != nil {
-		return nil, err
-	}
-
-	data, err := snappy.Decode(nil, b)
-	if err != nil {
-		return nil, err
-	}
-	return data, nil
-}
-
-func (e *Engine) replaceCompressedFile(name string, data []byte) error {
-	tmpName := filepath.Join(e.path, name+"tmp")
-	f, err := os.OpenFile(tmpName, os.O_CREATE|os.O_RDWR, 0666)
-	if err != nil {
-		return err
-	}
-	b := snappy.Encode(nil, data)
-	if _, err := f.Write(b); err != nil {
-		return err
-	}
-	if err := f.Close(); err != nil {
-		return err
-	}
-	return os.Rename(tmpName, filepath.Join(e.path, name))
-}
-
-// keysWithFields takes the map of measurements to their fields and a set of series keys
-// and returns the columnar keys for the keys and fields
-func (e *Engine) keysWithFields(fields map[string]*tsdb.MeasurementFields, keys []string) []string {
-	e.WAL.cacheLock.RLock()
-	defer e.WAL.cacheLock.RUnlock()
-
-	var a []string
-	for _, k := range keys {
-		measurement := tsdb.MeasurementFromSeriesKey(k)
-
-		// add the fields from the index
-		mf := fields[measurement]
-		if mf != nil {
-			for _, f := range mf.Fields {
-				a = append(a, SeriesFieldKey(k, f.Name))
-			}
-		}
-
-		// now add any fields from the WAL that haven't been flushed yet
-		mf = e.WAL.measurementFieldsCache[measurement]
-		if mf != nil {
-			for _, f := range mf.Fields {
-				a = append(a, SeriesFieldKey(k, f.Name))
-			}
-		}
-	}
-
-	return a
-}
-
-// DeleteSeries deletes the series from the engine.
-func (e *Engine) DeleteSeries(seriesKeys []string) error {
-	e.metaLock.Lock()
-	defer e.metaLock.Unlock()
-
-	fields, err := e.readFields()
-	if err != nil {
-		return err
-	}
-
-	keyFields := e.keysWithFields(fields, seriesKeys)
-	e.filesLock.Lock()
-	defer e.filesLock.Unlock()
-	for _, key := range keyFields {
-		e.deletes[e.keyToID(key)] = key
-	}
-
-	return e.WAL.DeleteSeries(keyFields)
-}
-
-// DeleteMeasurement deletes a measurement and all related series.
-func (e *Engine) DeleteMeasurement(name string, seriesKeys []string) error {
-	e.metaLock.Lock()
-	defer e.metaLock.Unlock()
-
-	fields, err := e.readFields()
-	if err != nil {
-		return err
-	}
-
-	// mark the measurement, series keys and the fields for deletion on the next flush
-	// also serves as a tombstone for any queries that come in before the flush
-	keyFields := e.keysWithFields(fields, seriesKeys)
-	e.filesLock.Lock()
-	defer e.filesLock.Unlock()
-
-	e.deleteMeasurements[name] = true
-	for _, k := range keyFields {
-		e.deletes[e.keyToID(k)] = k
-	}
-
-	return e.WAL.DeleteMeasurement(name, seriesKeys)
-}
-
-// SeriesCount returns the number of series buckets on the shard.
-func (e *Engine) SeriesCount() (n int, err error) {
-	return 0, nil
-}
-
-// Begin starts a new transaction on the engine.
-func (e *Engine) Begin(writable bool) (tsdb.Tx, error) {
-	e.queryLock.RLock()
-
-	var files dataFiles
-
-	// we do this to ensure that the data files haven't been deleted from a compaction
-	// while we were waiting to get the query lock
-	for {
-		files = e.copyFilesCollection()
-
-		// get the query lock
-		for _, f := range files {
-			f.mu.RLock()
-		}
-
-		// ensure they're all still open
-		reset := false
-		for _, f := range files {
-			if f.f == nil {
-				reset = true
-				break
-			}
-		}
-
-		// if not, release and try again
-		if reset {
-			for _, f := range files {
-				f.mu.RUnlock()
-			}
-			continue
-		}
-
-		// we're good to go
-		break
-	}
-
-	return &tx{files: files, engine: e}, nil
-}
-
-func (e *Engine) WriteTo(w io.Writer) (n int64, err error) { panic("not implemented") }
-
-func (e *Engine) keyToID(key string) uint64 {
-	// get the ID for the key and be sure to check if it had hash collision before
-	e.collisionsLock.RLock()
-	id, ok := e.collisions[key]
-	e.collisionsLock.RUnlock()
-
-	if !ok {
-		id = e.HashSeriesField(key)
-	}
-	return id
-}
-
-func (e *Engine) keyAndFieldToID(series, field string) uint64 {
-	key := SeriesFieldKey(series, field)
-	return e.keyToID(key)
-}
-
-func (e *Engine) copyFilesCollection() []*dataFile {
-	e.filesLock.RLock()
-	defer e.filesLock.RUnlock()
-	a := make([]*dataFile, len(e.files))
-	copy(a, e.files)
-	return a
-}
-
-func (e *Engine) writeNewFields(measurementFieldsToSave map[string]*tsdb.MeasurementFields) error {
-	if len(measurementFieldsToSave) == 0 {
-		return nil
-	}
-
-	// read in all the previously saved fields
-	fields, err := e.readFields()
-	if err != nil {
-		return err
-	}
-
-	// add the new ones or overwrite old ones
-	for name, mf := range measurementFieldsToSave {
-		fields[name] = mf
-	}
-
-	return e.writeFields(fields)
-}
-
-func (e *Engine) writeFields(fields map[string]*tsdb.MeasurementFields) error {
-	// compress and save everything
-	data, err := json.Marshal(fields)
-	if err != nil {
-		return err
-	}
-
-	fn := filepath.Join(e.path, FieldsFileExtension+"tmp")
-	ff, err := os.OpenFile(fn, os.O_CREATE|os.O_RDWR, 0666)
-	if err != nil {
-		return err
-	}
-	_, err = ff.Write(snappy.Encode(nil, data))
-	if err != nil {
-		return err
-	}
-	if err := ff.Close(); err != nil {
-		return err
-	}
-	fieldsFileName := filepath.Join(e.path, FieldsFileExtension)
-	return os.Rename(fn, fieldsFileName)
-}
-
-func (e *Engine) readFields() (map[string]*tsdb.MeasurementFields, error) {
-	fields := make(map[string]*tsdb.MeasurementFields)
-
-	f, err := os.OpenFile(filepath.Join(e.path, FieldsFileExtension), os.O_RDONLY, 0666)
-	if os.IsNotExist(err) {
-		return fields, nil
-	} else if err != nil {
-		return nil, err
-	}
-	b, err := ioutil.ReadAll(f)
-	if err != nil {
-		return nil, err
-	}
-
-	data, err := snappy.Decode(nil, b)
-	if err != nil {
-		return nil, err
-	}
-
-	if err := json.Unmarshal(data, &fields); err != nil {
-		return nil, err
-	}
-
-	return fields, nil
-}
-
-func (e *Engine) writeNewSeries(seriesToCreate []*tsdb.SeriesCreate) error {
-	if len(seriesToCreate) == 0 {
-		return nil
-	}
-
-	// read in previously saved series
-	series, err := e.readSeries()
-	if err != nil {
-		return err
-	}
-
-	// add new ones, compress and save
-	for _, s := range seriesToCreate {
-		series[s.Series.Key] = s.Series
-	}
-
-	return e.writeSeries(series)
-}
-
-func (e *Engine) writeSeries(series map[string]*tsdb.Series) error {
-	data, err := json.Marshal(series)
-	if err != nil {
-		return err
-	}
-
-	fn := filepath.Join(e.path, SeriesFileExtension+"tmp")
-	ff, err := os.OpenFile(fn, os.O_CREATE|os.O_RDWR, 0666)
-	if err != nil {
-		return err
-	}
-	_, err = ff.Write(snappy.Encode(nil, data))
-	if err != nil {
-		return err
-	}
-	if err := ff.Close(); err != nil {
-		return err
-	}
-	seriesFileName := filepath.Join(e.path, SeriesFileExtension)
-	return os.Rename(fn, seriesFileName)
-}
-
-func (e *Engine) readSeries() (map[string]*tsdb.Series, error) {
-	series := make(map[string]*tsdb.Series)
-
-	f, err := os.OpenFile(filepath.Join(e.path, SeriesFileExtension), os.O_RDONLY, 0666)
-	if os.IsNotExist(err) {
-		return series, nil
-	} else if err != nil {
-		return nil, err
-	}
-	defer f.Close()
-	b, err := ioutil.ReadAll(f)
-	if err != nil {
-		return nil, err
-	}
-
-	data, err := snappy.Decode(nil, b)
-	if err != nil {
-		return nil, err
-	}
-
-	if err := json.Unmarshal(data, &series); err != nil {
-		return nil, err
-	}
-
-	return series, nil
-}
-
-// DecodeAndCombine take an encoded block from a file, decodes it and interleaves the file
-// values with the values passed in. nextTime and hasNext refer to if the file
-// has future encoded blocks so that this method can know how much of its values can be
-// combined and output in the resulting encoded block.
-func (e *Engine) DecodeAndCombine(newValues Values, block, buf []byte, nextTime int64, hasFutureBlock bool) (Values, []byte, error) {
-	// No new values passed in, so nothing to combine.  Just return the existing block.
-	if len(newValues) == 0 {
-		return newValues, block, nil
-	}
-
-	var values []Value
-	err := DecodeBlock(block, &values)
-	if err != nil {
-		panic(fmt.Sprintf("failure decoding block: %v", err))
-	}
-
-	var remainingValues Values
-
-	if hasFutureBlock {
-		// take all values that have times less than the future block and update the vals array
-		pos := sort.Search(len(newValues), func(i int) bool {
-			return newValues[i].Time().UnixNano() >= nextTime
-		})
-		values = append(values, newValues[:pos]...)
-		remainingValues = newValues[pos:]
-		values = Values(values).Deduplicate()
-	} else {
-		requireSort := Values(values).MaxTime() >= newValues.MinTime()
-		values = append(values, newValues...)
-		if requireSort {
-			values = Values(values).Deduplicate()
-		}
-	}
-
-	if len(values) > e.MaxPointsPerBlock {
-		remainingValues = values[e.MaxPointsPerBlock:]
-		values = values[:e.MaxPointsPerBlock]
-	}
-
-	encoded, err := Values(values).Encode(buf)
-	if err != nil {
-		return nil, nil, err
-	}
-	return remainingValues, encoded, nil
-}
-
-// removeFileIfCheckpointExists will remove the file if its associated checkpoint fil is there.
-// It returns true if the file was removed. This is for recovery of data files on startup
-func (e *Engine) removeFileIfCheckpointExists(fileName string) bool {
-	checkpointName := fmt.Sprintf("%s.%s", fileName, CheckpointExtension)
-	_, err := os.Stat(checkpointName)
-
-	// if there's no checkpoint, move on
-	if err != nil {
-		return false
-	}
-
-	// there's a checkpoint so we know this file isn't safe so we should remove it
-	err = os.RemoveAll(fileName)
-	if err != nil {
-		panic(fmt.Sprintf("error removing file %s", err.Error()))
-	}
-
-	err = os.RemoveAll(checkpointName)
-	if err != nil {
-		panic(fmt.Sprintf("error removing file %s", err.Error()))
-	}
-
-	return true
-}
-
-// cleanupMetafile will remove the tmp file if the other file exists, or rename the
-// tmp file to be a regular file if the normal file is missing. This is for recovery on
-// startup.
-func (e *Engine) cleanupMetafile(name string) {
-	fileName := filepath.Join(e.path, name)
-	tmpName := fileName + "tmp"
-
-	_, err := os.Stat(tmpName)
-
-	// if the tmp file isn't there, we can just exit
-	if err != nil {
-		return
-	}
-
-	_, err = os.Stat(fileName)
-
-	// the regular file is there so we should just remove the tmp file
-	if err == nil {
-		err = os.Remove(tmpName)
-		if err != nil {
-			panic(fmt.Sprintf("error removing meta file %s: %s", tmpName, err.Error()))
-		}
-	}
-
-	// regular file isn't there so have the tmp file take its place
-	err = os.Rename(tmpName, fileName)
-	if err != nil {
-		panic(fmt.Sprintf("error renaming meta file %s: %s", tmpName, err.Error()))
-	}
-}
-
-// compactionJob contains the data and methods for compacting multiple data files
-// into fewer larger data files that ideally have larger blocks of points together
-type compactionJob struct {
-	idsInCurrentFile  []uint64
-	startingPositions []uint32
-	newFiles          []*os.File
-
-	dataFilesToCompact []*dataFile
-	dataFilePositions  []uint32
-	currentDataFileIDs []uint64
-
-	currentFile     *os.File
-	currentPosition uint32
-
-	maxFileSize       uint32
-	maxPointsPerBlock int
-
-	minTime int64
-	maxTime int64
-
-	// leftoverValues holds values from an ID that is getting split across multiple
-	// compacted data files
-	leftoverValues Values
-
-	// buffer for encoding
-	buf []byte
-}
-
-// dataFileOEF is a sentinel values marking that there is no more data to be read from the data file
-const dataFileEOF = uint64(math.MaxUint64)
-
-func newCompactionJob(files dataFiles, minTime, maxTime int64, maxFileSize uint32, maxPointsPerBlock int) *compactionJob {
-	c := &compactionJob{
-		dataFilesToCompact: files,
-		dataFilePositions:  make([]uint32, len(files)),
-		currentDataFileIDs: make([]uint64, len(files)),
-		maxFileSize:        maxFileSize,
-		maxPointsPerBlock:  maxPointsPerBlock,
-		minTime:            minTime,
-		maxTime:            maxTime,
-		buf:                make([]byte, blockBufferSize),
-	}
-
-	// set the starting positions and ids for the files getting compacted
-	for i, df := range files {
-		c.dataFilePositions[i] = uint32(fileHeaderSize)
-		c.currentDataFileIDs[i] = df.idForPosition(uint32(fileHeaderSize))
-	}
-
-	return c
-}
-
-// newCurrentFile will create a new compaction file and reset the ids and positions
-// in the file so we can write the index out later
-func (c *compactionJob) newCurrentFile(fileName string) {
-	c.idsInCurrentFile = make([]uint64, 0)
-	c.startingPositions = make([]uint32, 0)
-
-	f, err := openFileAndCheckpoint(fileName)
-	if err != nil {
-		panic(fmt.Sprintf("error opening new file: %s", err.Error()))
-	}
-	c.currentFile = f
-	c.currentPosition = uint32(fileHeaderSize)
-}
-
-// writeBlocksForID will read data for the given ID from all the files getting compacted
-// and write it into a new compacted file. Blocks from different files will be combined to
-// create larger blocks in the compacted file. If the compacted file goes over the max
-// file size limit, true will be returned indicating that its time to create a new compaction file
-func (c *compactionJob) writeBlocksForID(id uint64) bool {
-	// mark this ID as new and track its starting position
-	c.idsInCurrentFile = append(c.idsInCurrentFile, id)
-	c.startingPositions = append(c.startingPositions, c.currentPosition)
-
-	// loop through the files in order emptying each one of its data for this ID
-
-	// first handle any values that didn't get written to the previous
-	// compaction file because it was too large
-	previousValues := c.leftoverValues
-	c.leftoverValues = nil
-	rotateFile := false
-	for i, df := range c.dataFilesToCompact {
-		idForFile := c.currentDataFileIDs[i]
-
-		// if the next ID in this file doesn't match, move to the next file
-		if idForFile != id {
-			continue
-		}
-
-		var newFilePosition uint32
-		var nextID uint64
-
-		// write out the values and keep track of the next ID and position in this file
-		previousValues, rotateFile, newFilePosition, nextID = c.writeIDFromFile(id, previousValues, c.dataFilePositions[i], df)
-		c.dataFilePositions[i] = newFilePosition
-		c.currentDataFileIDs[i] = nextID
-
-		// if we hit the max file size limit, return so a new file to compact into can be allocated
-		if rotateFile {
-			c.leftoverValues = previousValues
-			c.writeOutCurrentFile()
-			return true
-		}
-	}
-
-	if len(previousValues) > 0 {
-		bytesWritten := writeValues(c.currentFile, id, previousValues, c.buf)
-		c.currentPosition += bytesWritten
-	}
-
-	return false
-}
-
-// writeIDFromFile will read all data from the passed in file for the given ID and either buffer the values in memory if below the
-// max points allowed in a block, or write out to the file. The remaining buffer will be returned along with a bool indicating if
-// we need a new file to compact into, the current position of the data file now that we've read data, and the next ID to be read
-// from the data file
-func (c *compactionJob) writeIDFromFile(id uint64, previousValues Values, filePosition uint32, df *dataFile) (Values, bool, uint32, uint64) {
-	for {
-		// check if we're at the end of the file
-		indexPosition := df.indexPosition()
-		if filePosition >= indexPosition {
-			return previousValues, false, filePosition, dataFileEOF
-		}
-
-		// check if we're at the end of the blocks for this ID
-		nextID, _, block := df.block(filePosition)
-		if nextID != id {
-			return previousValues, false, filePosition, nextID
-		}
-
-		blockLength := uint32(blockHeaderSize + len(block))
-		filePosition += blockLength
-
-		// decode the block and append to previous values
-		// TODO: update this so that blocks already at their limit don't need decoding
-		var values []Value
-		err := DecodeBlock(block, &values)
-		if err != nil {
-			panic(fmt.Sprintf("error decoding block: %s", err.Error()))
-		}
-
-		previousValues = append(previousValues, values...)
-
-		// if we've hit the block limit, encode and write out to the file
-		if len(previousValues) > c.maxPointsPerBlock {
-			valuesToEncode := previousValues[:c.maxPointsPerBlock]
-			previousValues = previousValues[c.maxPointsPerBlock:]
-
-			bytesWritten := writeValues(c.currentFile, id, valuesToEncode, c.buf)
-			c.currentPosition += bytesWritten
-
-			// if we're at the limit of what should go into the current file,
-			// return the values we've decoded and return the ID in the next
-			// block
-			if c.shouldRotateCurrentFile() {
-				if filePosition >= indexPosition {
-					return previousValues, true, filePosition, dataFileEOF
-				}
-
-				nextID, _, _ = df.block(filePosition)
-				return previousValues, true, filePosition, nextID
-			}
-		}
-	}
-}
-
-// nextID returns the lowest number ID to be read from one of the data files getting
-// compacted. Will return an EOF if all files have been read and compacted
-func (c *compactionJob) nextID() uint64 {
-	minID := dataFileEOF
-	for _, id := range c.currentDataFileIDs {
-		if minID > id {
-			minID = id
-		}
-	}
-
-	// if the min is still EOF, we're done with all the data from all files to compact
-	if minID == dataFileEOF {
-		return dataFileEOF
-	}
-
-	return minID
-}
-
-// writeOutCurrentFile will write the index out to the current file in preparation for a new file to compact into
-func (c *compactionJob) writeOutCurrentFile() {
-	if c.currentFile == nil {
-		return
-	}
-
-	// write out the current file
-	if err := writeIndex(c.currentFile, c.minTime, c.maxTime, c.idsInCurrentFile, c.startingPositions); err != nil {
-		panic(fmt.Sprintf("error writing index: %s", err.Error()))
-	}
-
-	// mark it as a new file and reset
-	c.newFiles = append(c.newFiles, c.currentFile)
-	c.currentFile = nil
-}
-
-// shouldRotateCurrentFile returns true if the current file is over the max file size
-func (c *compactionJob) shouldRotateCurrentFile() bool {
-	return c.currentPosition+footerSize(len(c.idsInCurrentFile)) > c.maxFileSize
-}
-
-type dataFile struct {
-	f       *os.File
-	mu      sync.RWMutex
-	size    uint32
-	modTime time.Time
-	mmap    []byte
-}
-
-// byte size constants for the data file
-const (
-	fileHeaderSize     = 4
-	seriesCountSize    = 4
-	timeSize           = 8
-	blockHeaderSize    = 12
-	seriesIDSize       = 8
-	seriesPositionSize = 4
-	seriesHeaderSize   = seriesIDSize + seriesPositionSize
-	minTimeOffset      = 20
-	maxTimeOffset      = 12
-)
-
-func NewDataFile(f *os.File) (*dataFile, error) {
-	// seek back to the beginning to hand off to the mmap
-	if _, err := f.Seek(0, 0); err != nil {
-		return nil, err
-	}
-
-	fInfo, err := f.Stat()
-	if err != nil {
-		return nil, err
-	}
-	mmap, err := syscall.Mmap(int(f.Fd()), 0, int(fInfo.Size()), syscall.PROT_READ, syscall.MAP_SHARED|MAP_POPULATE)
-	if err != nil {
-		return nil, err
-	}
-
-	return &dataFile{
-		f:       f,
-		mmap:    mmap,
-		size:    uint32(fInfo.Size()),
-		modTime: fInfo.ModTime(),
-	}, nil
-}
-
-func (d *dataFile) Name() string {
-	d.mu.RLock()
-	defer d.mu.RUnlock()
-
-	if d.Deleted() {
-		return ""
-	}
-	return d.f.Name()
-}
-
-func (d *dataFile) Deleted() bool {
-	d.mu.RLock()
-	defer d.mu.RUnlock()
-	return d.f == nil
-}
-
-func (d *dataFile) Close() error {
-	d.mu.Lock()
-	defer d.mu.Unlock()
-	return d.close()
-}
-
-func (d *dataFile) Delete() error {
-	d.mu.Lock()
-	defer d.mu.Unlock()
-
-	if err := d.close(); err != nil {
-		return err
-	}
-
-	if d.f == nil {
-		return nil
-	}
-
-	err := os.RemoveAll(d.f.Name())
-	if err != nil {
-		return err
-	}
-	d.f = nil
-	return nil
-}
-
-func (d *dataFile) close() error {
-	if d.mmap == nil {
-		return nil
-	}
-	err := syscall.Munmap(d.mmap)
-	if err != nil {
-		return err
-	}
-
-	d.mmap = nil
-	return d.f.Close()
-}
-
-func (d *dataFile) MinTime() int64 {
-	d.mu.RLock()
-	defer d.mu.RUnlock()
-
-	if len(d.mmap) == 0 {
-		return 0
-	}
-	minTimePosition := d.size - minTimeOffset
-	timeBytes := d.mmap[minTimePosition : minTimePosition+timeSize]
-	return int64(btou64(timeBytes))
-}
-
-func (d *dataFile) MaxTime() int64 {
-	d.mu.RLock()
-	defer d.mu.RUnlock()
-
-	if len(d.mmap) == 0 {
-		return 0
-	}
-
-	maxTimePosition := d.size - maxTimeOffset
-	timeBytes := d.mmap[maxTimePosition : maxTimePosition+timeSize]
-	return int64(btou64(timeBytes))
-}
-
-func (d *dataFile) SeriesCount() uint32 {
-	d.mu.RLock()
-	defer d.mu.RUnlock()
-
-	if len(d.mmap) == 0 {
-		return 0
-	}
-
-	return btou32(d.mmap[d.size-seriesCountSize:])
-}
-
-func (d *dataFile) IDToPosition() map[uint64]uint32 {
-	d.mu.RLock()
-	defer d.mu.RUnlock()
-
-	if len(d.mmap) == 0 {
-		return nil
-	}
-
-	count := int(d.SeriesCount())
-	m := make(map[uint64]uint32)
-
-	indexStart := d.size - uint32(count*12+20)
-	for i := 0; i < count; i++ {
-		offset := indexStart + uint32(i*12)
-		id := btou64(d.mmap[offset : offset+8])
-		pos := btou32(d.mmap[offset+8 : offset+12])
-		m[id] = pos
-	}
-
-	return m
-}
-
-func (d *dataFile) indexPosition() uint32 {
-	d.mu.RLock()
-	defer d.mu.RUnlock()
-
-	if len(d.mmap) == 0 {
-		return 0
-	}
-
-	return d.size - uint32(d.SeriesCount()*12+20)
-}
-
-// StartingPositionForID returns the position in the file of the
-// first block for the given ID. If zero is returned the ID doesn't
-// have any data in this file.
-func (d *dataFile) StartingPositionForID(id uint64) uint32 {
-	d.mu.RLock()
-	defer d.mu.RUnlock()
-
-	if len(d.mmap) == 0 {
-		return 0
-	}
-
-	seriesCount := d.SeriesCount()
-	indexStart := d.indexPosition()
-
-	min := uint32(0)
-	max := uint32(seriesCount)
-
-	for min < max {
-		mid := (max-min)/2 + min
-
-		offset := mid*seriesHeaderSize + indexStart
-		checkID := btou64(d.mmap[offset : offset+8])
-
-		if checkID == id {
-			return btou32(d.mmap[offset+8 : offset+12])
-		} else if checkID < id {
-			min = mid + 1
-		} else {
-			max = mid
-		}
-	}
-
-	return uint32(0)
-}
-
-func (d *dataFile) block(pos uint32) (id uint64, t int64, block []byte) {
-	d.mu.RLock()
-	defer d.mu.RUnlock()
-
-	if len(d.mmap) == 0 {
-		return 0, 0, nil
-	}
-
-	defer func() {
-		if r := recover(); r != nil {
-			panic(fmt.Sprintf("panic decoding file: %s at position %d for id %d at time %d", d.f.Name(), pos, id, t))
-		}
-	}()
-	if pos < d.indexPosition() {
-		id = d.idForPosition(pos)
-		length := btou32(d.mmap[pos+8 : pos+12])
-		block = d.mmap[pos+blockHeaderSize : pos+blockHeaderSize+length]
-		t = int64(btou64(d.mmap[pos+blockHeaderSize : pos+blockHeaderSize+8]))
-	}
-	return
-}
-
-// idForPosition assumes the position is the start of an ID and will return the converted bytes as a uint64 ID
-func (d *dataFile) idForPosition(pos uint32) uint64 {
-	d.mu.RLock()
-	defer d.mu.RUnlock()
-
-	if len(d.mmap) == 0 {
-		return 0
-	}
-
-	return btou64(d.mmap[pos : pos+seriesIDSize])
-}
-
-type dataFiles []*dataFile
-
-func (a dataFiles) Len() int           { return len(a) }
-func (a dataFiles) Swap(i, j int)      { a[i], a[j] = a[j], a[i] }
-func (a dataFiles) Less(i, j int) bool { return a[i].MinTime() < a[j].MinTime() }
-
-func dataFilesEquals(a, b []*dataFile) bool {
-	if len(a) != len(b) {
-		return false
-	}
-	for i, v := range a {
-		if v.MinTime() != b[i].MinTime() && v.MaxTime() != b[i].MaxTime() {
-			return false
-		}
-	}
-	return true
-}
-
-// compactionCheckpoint holds the new files and compacted files from a compaction
-type compactionCheckpoint struct {
-	CompactedFiles []string
-	NewFiles       []string
-}
-
-// cleanup will remove all the checkpoint files and old compacted files from a compaction
-// that finsihed, but didn't get to cleanup yet
-func (c *compactionCheckpoint) cleanup() {
-	for _, fn := range c.CompactedFiles {
-		cn := checkpointFileName(fn)
-		if err := os.RemoveAll(cn); err != nil {
-			panic(fmt.Sprintf("error removing checkpoint file: %s", err.Error()))
-		}
-		if err := os.RemoveAll(fn); err != nil {
-			panic(fmt.Sprintf("error removing old data file: %s", err.Error()))
-		}
-	}
-
-	for _, fn := range c.NewFiles {
-		cn := checkpointFileName(fn)
-		if err := os.RemoveAll(cn); err != nil {
-			panic(fmt.Sprintf("error removing checkpoint file: %s", err.Error()))
-		}
-	}
-}
-
-// footerSize will return what the size of the index and footer of a data file
-// will be given the passed in series count
-func footerSize(seriesCount int) uint32 {
-	timeSizes := 2 * timeSize
-	return uint32(seriesCount*(seriesIDSize+seriesPositionSize) + timeSizes + seriesCountSize)
-}
-
-// writeValues will encode the values and write them as a compressed block to the file
-func writeValues(f *os.File, id uint64, values Values, buf []byte) uint32 {
-	b, err := values.Encode(buf)
-	if err != nil {
-		panic(fmt.Sprintf("failure encoding block: %s", err.Error()))
-	}
-
-	if err := writeBlock(f, id, b); err != nil {
-		// fail hard. If we can't write a file someone needs to get woken up
-		panic(fmt.Sprintf("failure writing block: %s", err.Error()))
-	}
-
-	return uint32(blockHeaderSize + len(b))
-}
-
-// writeBlock will write a compressed block including its header
-func writeBlock(f *os.File, id uint64, block []byte) error {
-	if _, err := f.Write(append(u64tob(id), u32tob(uint32(len(block)))...)); err != nil {
-		return err
-	}
-	_, err := f.Write(block)
-	return err
-}
-
-// writeIndex will write out the index block and the footer of the file. After this call it should
-// be a read only file that can be mmap'd as a dataFile
-func writeIndex(f *os.File, minTime, maxTime int64, ids []uint64, newPositions []uint32) error {
-	// write the file index, starting with the series ids and their positions
-	for i, id := range ids {
-		if _, err := f.Write(u64tob(id)); err != nil {
-			return err
-		}
-		if _, err := f.Write(u32tob(newPositions[i])); err != nil {
-			return err
-		}
-	}
-
-	// write the min time, max time
-	if _, err := f.Write(append(u64tob(uint64(minTime)), u64tob(uint64(maxTime))...)); err != nil {
-		return err
-	}
-
-	// series count
-	if _, err := f.Write(u32tob(uint32(len(ids)))); err != nil {
-		return err
-	}
-
-	// sync it
-	return f.Sync()
-}
-
-// openFileAndCehckpoint will create a checkpoint file, open a new file for
-// writing a data index, write the header and return the file
-func openFileAndCheckpoint(fileName string) (*os.File, error) {
-	checkpointFile := checkpointFileName(fileName)
-	cf, err := os.OpenFile(checkpointFile, os.O_CREATE, 0666)
-	if err != nil {
-		return nil, err
-	}
-	if err := cf.Close(); err != nil {
-		return nil, err
-	}
-
-	f, err := os.OpenFile(fileName, os.O_CREATE|os.O_RDWR, 0666)
-	if err != nil {
-		return nil, err
-	}
-
-	// write the header, which is just the magic number
-	if _, err := f.Write(u32tob(MagicNumber)); err != nil {
-		f.Close()
-		return nil, err
-	}
-
-	return f, nil
-}
-
-// checkpointFileName will return the checkpoint name for the data files
-func checkpointFileName(fileName string) string {
-	return fmt.Sprintf("%s.%s", fileName, CheckpointExtension)
-}
-
-// removeCheckpoint removes the checkpoint for a new data file that was getting written
-func removeCheckpoint(fileName string) error {
-	checkpointFile := fmt.Sprintf("%s.%s", fileName, CheckpointExtension)
-	return os.RemoveAll(checkpointFile)
-}
-
-// u64tob converts a uint64 into an 8-byte slice.
-func u64tob(v uint64) []byte {
-	b := make([]byte, 8)
-	binary.BigEndian.PutUint64(b, v)
-	return b
-}
-
-func btou64(b []byte) uint64 {
-	return binary.BigEndian.Uint64(b)
-}
-
-func u32tob(v uint32) []byte {
-	b := make([]byte, 4)
-	binary.BigEndian.PutUint32(b, v)
-	return b
-}
-
-func btou32(b []byte) uint32 {
-	return uint32(binary.BigEndian.Uint32(b))
-}
-
-// hashSeriesField will take the fnv-1a hash of the key. It returns the value
-// or 1 if the hash is either 0 or the max uint64. It does this to keep sentinel
-// values available.
-func hashSeriesField(key string) uint64 {
-	h := fnv.New64a()
-	h.Write([]byte(key))
-	n := h.Sum64()
-	if n == uint64(0) || n == uint64(math.MaxUint64) {
-		return 1
-	}
-	return n
-}
-
-// SeriesFieldKey combine a series key and field name for a unique string to be hashed to a numeric ID
-func SeriesFieldKey(seriesKey, field string) string {
-	return seriesKey + keyFieldSeparator + field
-}
-
-func seriesAndFieldFromCompositeKey(key string) (string, string) {
-	parts := strings.Split(key, keyFieldSeparator)
-	if len(parts) != 0 {
-		return parts[0], strings.Join(parts[1:], keyFieldSeparator)
-	}
-	return parts[0], parts[1]
-}
-
-type uint64slice []uint64
-
-func (a uint64slice) Len() int           { return len(a) }
-func (a uint64slice) Swap(i, j int)      { a[i], a[j] = a[j], a[i] }
-func (a uint64slice) Less(i, j int) bool { return a[i] < a[j] }
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/engine/tsm1/tsm1_test.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/engine/tsm1/tsm1_test.go
deleted file mode 100644
index 444a63a91..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/engine/tsm1/tsm1_test.go
+++ /dev/null
@@ -1,1874 +0,0 @@
-package tsm1_test
-
-import (
-	"encoding/binary"
-	"fmt"
-	"io/ioutil"
-	"math"
-	"os"
-	"reflect"
-	"sync"
-	"testing"
-	"time"
-
-	"github.com/influxdb/influxdb/influxql"
-	"github.com/influxdb/influxdb/models"
-	"github.com/influxdb/influxdb/tsdb"
-	"github.com/influxdb/influxdb/tsdb/engine/tsm1"
-)
-
-func TestEngine_WriteAndReadFloats(t *testing.T) {
-	e := OpenDefaultEngine()
-	defer e.Close()
-
-	p1 := parsePoint("cpu,host=A value=1.1 1000000000")
-	p2 := parsePoint("cpu,host=B value=1.2 1000000000")
-	p3 := parsePoint("cpu,host=A value=2.1 2000000000")
-	p4 := parsePoint("cpu,host=B value=2.2 2000000000")
-
-	if err := e.WritePoints([]models.Point{p1, p2, p3}, nil, nil); err != nil {
-		t.Fatalf("failed to write points: %s", err.Error())
-	}
-
-	fields := []string{"value"}
-
-	verify := func(checkSingleBVal bool) {
-		tx, _ := e.Begin(false)
-		defer tx.Rollback()
-		c := tx.Cursor("cpu,host=A", fields, nil, true)
-		k, v := c.SeekTo(0)
-		if k != p1.UnixNano() {
-			t.Fatalf("p1 time wrong:\n\texp:%d\n\tgot:%d\n", p1.UnixNano(), k)
-		}
-		if 1.1 != v {
-			t.Fatal("p1 data not equal")
-		}
-		k, v = c.Next()
-		if k != p3.UnixNano() {
-			t.Fatalf("p3 time wrong:\n\texp:%d\n\tgot:%d\n", p3.UnixNano(), k)
-		}
-		if 2.1 != v {
-			t.Fatal("p3 data not equal")
-		}
-		k, v = c.Next()
-		if k != tsdb.EOF {
-			t.Fatal("expected EOF")
-		}
-
-		c = tx.Cursor("cpu,host=B", fields, nil, true)
-		k, v = c.SeekTo(0)
-		if k != p2.UnixNano() {
-			t.Fatalf("p2 time wrong:\n\texp:%d\n\tgot:%d\n", p2.UnixNano(), k)
-		}
-		if 1.2 != v {
-			t.Fatal("p2 data not equal")
-		}
-
-		if checkSingleBVal {
-			k, _ = c.Next()
-			if k != tsdb.EOF {
-				t.Fatal("expected EOF")
-			}
-		}
-	}
-	verify(true)
-
-	if err := e.WritePoints([]models.Point{p4}, nil, nil); err != nil {
-		t.Fatalf("failed to write points: %s", err.Error())
-	}
-	verify(false)
-
-	tx, _ := e.Begin(false)
-	c := tx.Cursor("cpu,host=B", fields, nil, true)
-	k, v := c.SeekTo(0)
-	if k != p2.UnixNano() {
-		t.Fatalf("p2 time wrong:\n\texp:%d\n\tgot:%d\n", p2.UnixNano(), k)
-	}
-	if 1.2 != v {
-		t.Fatal("p2 data not equal")
-	}
-	k, v = c.Next()
-	if k != p4.UnixNano() {
-		t.Fatalf("p2 time wrong:\n\texp:%d\n\tgot:%d\n", p2.UnixNano(), k)
-	}
-	if 2.2 != v {
-		t.Fatal("p2 data not equal")
-	}
-
-	// verify we can seek
-	k, v = c.SeekTo(2000000000)
-	if k != p4.UnixNano() {
-		t.Fatalf("p2 time wrong:\n\texp:%d\n\tgot:%d\n", p2.UnixNano(), k)
-	}
-	if 2.2 != v {
-		t.Fatal("p2 data not equal")
-	}
-
-	c = tx.Cursor("cpu,host=A", fields, nil, true)
-	k, v = c.SeekTo(0)
-	if k != p1.UnixNano() {
-		t.Fatalf("p1 time wrong:\n\texp:%d\n\tgot:%d\n", p1.UnixNano(), k)
-	}
-	if 1.1 != v {
-		t.Fatal("p1 data not equal")
-	}
-	tx.Rollback()
-
-	if err := e.Engine.Close(); err != nil {
-		t.Fatalf("error closing: %s", err.Error())
-	}
-
-	if err := e.Open(); err != nil {
-		t.Fatalf("error opening: %s", err.Error())
-	}
-
-	verify(false)
-}
-
-func TestEngine_WriteIndexWithCollision(t *testing.T) {
-}
-
-func TestEngine_WriteIndexQueryAcrossDataFiles(t *testing.T) {
-	e := OpenDefaultEngine()
-	defer e.Close()
-
-	e.RotateFileSize = 10
-
-	p1 := parsePoint("cpu,host=A value=1.1 1000000000")
-	p2 := parsePoint("cpu,host=B value=1.2 1000000000")
-	p3 := parsePoint("cpu,host=A value=2.1 4000000000")
-	p4 := parsePoint("cpu,host=B value=2.2 4000000000")
-
-	if err := e.WritePoints([]models.Point{p1, p2, p3, p4}, nil, nil); err != nil {
-		t.Fatalf("failed to write points: %s", err.Error())
-	}
-
-	p5 := parsePoint("cpu,host=A value=3.1 5000000000")
-	p6 := parsePoint("cpu,host=B value=3.2 5000000000")
-	p7 := parsePoint("cpu,host=A value=4.1 3000000000")
-	p8 := parsePoint("cpu,host=B value=4.2 3000000000")
-
-	if err := e.WritePoints([]models.Point{p5, p6, p7, p8}, nil, nil); err != nil {
-		t.Fatalf("failed to write points: %s", err.Error())
-	}
-
-	if count := e.DataFileCount(); count != 2 {
-		t.Fatalf("expected 2 data files to exist but got %d", count)
-	}
-
-	fields := []string{"value"}
-
-	verify := func(series string, points []models.Point, seek int64) {
-		tx, _ := e.Begin(false)
-		defer tx.Rollback()
-		c := tx.Cursor(series, fields, nil, true)
-
-		k, v := c.SeekTo(seek)
-		p := points[0]
-		val := p.Fields()["value"]
-		if p.UnixNano() != k || val != v {
-			t.Fatalf("expected to seek to first point\n\texp: %d %f\n\tgot: %d %f", p.UnixNano(), val, k, v)
-		}
-		points = points[1:]
-
-		for _, p := range points {
-			k, v := c.Next()
-			val := p.Fields()["value"]
-			if p.UnixNano() != k || val != v {
-				t.Fatalf("expected to seek to first point\n\texp: %d %f\n\tgot: %d %f", p.UnixNano(), val, k, v.(float64))
-			}
-		}
-	}
-
-	fmt.Println("v1")
-	verify("cpu,host=A", []models.Point{p1, p7, p3, p5}, 0)
-	fmt.Println("v2")
-	verify("cpu,host=B", []models.Point{p2, p8, p4, p6}, 0)
-	fmt.Println("v3")
-	verify("cpu,host=A", []models.Point{p5}, 5000000000)
-	fmt.Println("v4")
-	verify("cpu,host=B", []models.Point{p6}, 5000000000)
-}
-
-func TestEngine_WriteOverwritePreviousPoint(t *testing.T) {
-	e := OpenDefaultEngine()
-	defer e.Close()
-
-	fields := []string{"value"}
-
-	p1 := parsePoint("cpu,host=A value=1.1 1000000000")
-	p2 := parsePoint("cpu,host=A value=1.2 1000000000")
-	p3 := parsePoint("cpu,host=A value=1.3 1000000000")
-
-	if err := e.WritePoints([]models.Point{p1, p2}, nil, nil); err != nil {
-		t.Fatalf("failed to write points: %s", err.Error())
-	}
-
-	tx, _ := e.Begin(false)
-	defer tx.Rollback()
-	c := tx.Cursor("cpu,host=A", fields, nil, true)
-	k, v := c.SeekTo(0)
-	if k != p2.UnixNano() {
-		t.Fatalf("time wrong:\n\texp:%d\n\tgot:%d\n", p2.UnixNano(), k)
-	}
-	if 1.2 != v {
-		t.Fatalf("data wrong:\n\texp:%f\n\tgot:%f", 1.2, v.(float64))
-	}
-	k, v = c.Next()
-	if k != tsdb.EOF {
-		t.Fatal("expected EOF")
-	}
-
-	if err := e.WritePoints([]models.Point{p3}, nil, nil); err != nil {
-		t.Fatalf("failed to write points: %s", err.Error())
-	}
-
-	tx2, _ := e.Begin(false)
-	defer tx2.Rollback()
-	c = tx2.Cursor("cpu,host=A", fields, nil, true)
-	k, v = c.SeekTo(0)
-	if k != p3.UnixNano() {
-		t.Fatalf("time wrong:\n\texp:%d\n\tgot:%d\n", p3.UnixNano(), k)
-	}
-	if 1.3 != v {
-		t.Fatalf("data wrong:\n\texp:%f\n\tgot:%f", 1.3, v.(float64))
-	}
-	k, _ = c.Next()
-	if k != tsdb.EOF {
-		t.Fatal("expected EOF")
-	}
-}
-
-// Tests that writing a point that before the earliest point
-// is queryable before and after a full compaction
-func TestEngine_Write_BeforeFirstPoint(t *testing.T) {
-	e := OpenDefaultEngine()
-	defer e.Close()
-
-	e.RotateFileSize = 1
-
-	fields := []string{"value"}
-
-	p1 := parsePoint("cpu,host=A value=1.1 1000000000")
-	p2 := parsePoint("cpu,host=A value=1.2 2000000000")
-	p3 := parsePoint("cpu,host=A value=1.3 3000000000")
-	p4 := parsePoint("cpu,host=A value=1.4 0000000000") // earlier than first point
-
-	verify := func(points []models.Point) {
-		tx2, _ := e.Begin(false)
-		defer tx2.Rollback()
-		c := tx2.Cursor("cpu,host=A", fields, nil, true)
-		k, v := c.SeekTo(0)
-
-		for _, p := range points {
-			if k != p.UnixNano() {
-				t.Fatalf("time wrong:\n\texp:%d\n\tgot:%d\n", p.UnixNano(), k)
-			}
-			if v != p.Fields()["value"] {
-				t.Fatalf("data wrong:\n\texp:%f\n\tgot:%f", p.Fields()["value"], v.(float64))
-			}
-			k, v = c.Next()
-		}
-	}
-
-	// Write each point individually to force file rotation
-	for _, p := range []models.Point{p1, p2} {
-		if err := e.WritePoints([]models.Point{p}, nil, nil); err != nil {
-			t.Fatalf("failed to write points: %s", err.Error())
-		}
-	}
-
-	verify([]models.Point{p1, p2})
-
-	// Force a full compaction
-	e.CompactionAge = time.Duration(0)
-	if err := e.Compact(true); err != nil {
-		t.Fatalf("failed to run full compaction: %v", err)
-	}
-
-	// Write a point before the earliest data file
-	if err := e.WritePoints([]models.Point{p3, p4}, nil, nil); err != nil {
-		t.Fatalf("failed to write points: %s", err.Error())
-	}
-
-	// Verify earlier point is returned in the correct order before compaction
-	verify([]models.Point{p4, p1, p2, p3})
-
-	if err := e.Compact(true); err != nil {
-		t.Fatalf("failed to run full compaction: %v", err)
-	}
-	// Verify earlier point is returned in the correct order after compaction
-	verify([]models.Point{p4, p1, p2, p3})
-}
-
-// Tests that writing a series with different fields is queryable before and
-// after a full compaction
-func TestEngine_Write_MixedFields(t *testing.T) {
-	e := OpenDefaultEngine()
-	defer e.Close()
-
-	e.RotateFileSize = 1
-
-	fields := []string{"value", "value2"}
-
-	p1 := parsePoint("cpu,host=A value=1.1 1000000000")
-	p2 := parsePoint("cpu,host=A value=1.2,value2=2.1 2000000000")
-	p3 := parsePoint("cpu,host=A value=1.3 3000000000")
-	p4 := parsePoint("cpu,host=A value=1.4 4000000000")
-
-	verify := func(points []models.Point) {
-		tx2, _ := e.Begin(false)
-		defer tx2.Rollback()
-		c := tx2.Cursor("cpu,host=A", fields, nil, true)
-		k, v := c.SeekTo(0)
-
-		for _, p := range points {
-			if k != p.UnixNano() {
-				t.Fatalf("time wrong:\n\texp:%d\n\tgot:%d\n", p.UnixNano(), k)
-			}
-
-			pv := v.(map[string]interface{})
-			for _, key := range fields {
-				if pv[key] != p.Fields()[key] {
-					t.Fatalf("data wrong:\n\texp:%v\n\tgot:%v", p.Fields()[key], pv[key])
-				}
-			}
-			k, v = c.Next()
-		}
-	}
-
-	// Write each point individually to force file rotation
-	for _, p := range []models.Point{p1, p2} {
-		if err := e.WritePoints([]models.Point{p}, nil, nil); err != nil {
-			t.Fatalf("failed to write points: %s", err.Error())
-		}
-	}
-
-	verify([]models.Point{p1, p2})
-
-	// Force a full compaction
-	e.CompactionAge = time.Duration(0)
-	if err := e.Compact(true); err != nil {
-		t.Fatalf("failed to run full compaction: %v", err)
-	}
-
-	// Write a point before the earliest data file
-	if err := e.WritePoints([]models.Point{p3, p4}, nil, nil); err != nil {
-		t.Fatalf("failed to write points: %s", err.Error())
-	}
-
-	// Verify points returned in the correct order before compaction
-	verify([]models.Point{p1, p2, p3, p4})
-
-	if err := e.Compact(true); err != nil {
-		t.Fatalf("failed to run full compaction: %v", err)
-	}
-	// Verify points returned in the correct order after compaction
-	verify([]models.Point{p1, p2, p3, p4})
-}
-
-// Tests that writing and compactions running concurrently does not
-// fail.
-func TestEngine_WriteCompaction_Concurrent(t *testing.T) {
-	e := OpenDefaultEngine()
-	defer e.Close()
-
-	e.RotateFileSize = 1
-
-	done := make(chan struct{})
-	total := 1000
-
-	var wg sync.WaitGroup
-	wg.Add(1)
-	go func() {
-		defer wg.Done()
-		i := 0
-		for {
-			if i > total {
-				return
-			}
-
-			pt := models.MustNewPoint("cpu",
-				map[string]string{"host": "A"},
-				map[string]interface{}{"value": i},
-				time.Unix(int64(i), 0),
-			)
-			if err := e.WritePoints([]models.Point{pt}, nil, nil); err != nil {
-				t.Fatalf("failed to write points: %s", err.Error())
-			}
-			i++
-		}
-	}()
-
-	// Force a compactions to happen
-	e.CompactionAge = time.Duration(0)
-
-	// Run compactions concurrently
-	wg.Add(1)
-	go func() {
-		defer wg.Done()
-		for {
-			select {
-			case <-done:
-				return
-			default:
-			}
-
-			if err := e.Compact(false); err != nil {
-				t.Fatalf("failed to run full compaction: %v", err)
-			}
-		}
-	}()
-
-	// Let the goroutines run for a second
-	select {
-	case <-time.After(1 * time.Second):
-		close(done)
-	}
-
-	// Wait for them to exit
-	wg.Wait()
-
-	tx2, _ := e.Begin(false)
-	defer tx2.Rollback()
-	c := tx2.Cursor("cpu,host=A", []string{"value"}, nil, true)
-	k, v := c.SeekTo(0)
-
-	// Verify we wrote and can read all the points
-	i := 0
-	for {
-		if exp := time.Unix(int64(i), 0).UnixNano(); k != exp {
-			t.Fatalf("time wrong:\n\texp:%d\n\tgot:%d\n", exp, k)
-		}
-
-		if exp := int64(i); v != exp {
-			t.Fatalf("value wrong:\n\texp:%v\n\tgot:%v", exp, v)
-		}
-
-		k, v = c.Next()
-		if k == tsdb.EOF {
-			break
-		}
-		i += 1
-	}
-
-	if i != total {
-		t.Fatalf("point count mismatch: got %v, exp %v", i, total)
-	}
-
-}
-
-func TestEngine_CursorCombinesWALAndIndex(t *testing.T) {
-	e := OpenDefaultEngine()
-	defer e.Close()
-
-	fields := []string{"value"}
-
-	p1 := parsePoint("cpu,host=A value=1.1 1000000000")
-	p2 := parsePoint("cpu,host=A value=1.2 2000000000")
-
-	if err := e.WritePoints([]models.Point{p1}, nil, nil); err != nil {
-		t.Fatalf("failed to write points: %s", err.Error())
-	}
-	e.WAL.SkipCache = false
-	if err := e.WritePoints([]models.Point{p2}, nil, nil); err != nil {
-		t.Fatalf("failed to write points: %s", err.Error())
-	}
-
-	tx, _ := e.Begin(false)
-	defer tx.Rollback()
-	c := tx.Cursor("cpu,host=A", fields, nil, true)
-	k, v := c.SeekTo(0)
-	if k != p1.UnixNano() {
-		t.Fatalf("time wrong:\n\texp:%d\n\tgot:%d\n", p1.UnixNano(), k)
-	}
-	if 1.1 != v {
-		t.Fatalf("data wrong:\n\texp:%f\n\tgot:%f", 1.1, v.(float64))
-	}
-	k, v = c.Next()
-	if k != p2.UnixNano() {
-		t.Fatalf("time wrong:\n\texp:%d\n\tgot:%d\n", p2.UnixNano(), k)
-	}
-	if 1.2 != v {
-		t.Fatalf("data wrong:\n\texp:%f\n\tgot:%f", 1.2, v.(float64))
-	}
-	k, _ = c.Next()
-	if k != tsdb.EOF {
-		t.Fatal("expected EOF")
-	}
-}
-
-func TestEngine_Compaction(t *testing.T) {
-	e := OpenDefaultEngine()
-	defer e.Close()
-
-	e.RotateFileSize = 10
-
-	p1 := parsePoint("cpu,host=A value=1.1 1000000000")
-	p2 := parsePoint("cpu,host=B value=1.1 1000000000")
-	if err := e.WritePoints([]models.Point{p1, p2}, nil, nil); err != nil {
-		t.Fatalf("failed to write points: %s", err.Error())
-	}
-
-	p3 := parsePoint("cpu,host=A value=2.4 4000000000")
-	p4 := parsePoint("cpu,host=B value=2.4 4000000000")
-	if err := e.WritePoints([]models.Point{p3, p4}, nil, nil); err != nil {
-		t.Fatalf("failed to write points: %s", err.Error())
-	}
-
-	p5 := parsePoint("cpu,host=A value=1.5 5000000000")
-	p6 := parsePoint("cpu,host=B value=2.5 5000000000")
-	if err := e.WritePoints([]models.Point{p5, p6}, nil, nil); err != nil {
-		t.Fatalf("failed to write points: %s", err.Error())
-	}
-
-	p7 := parsePoint("cpu,host=A value=1.5 6000000000")
-	p8 := parsePoint("cpu,host=B value=2.5 6000000000")
-	if err := e.WritePoints([]models.Point{p7, p8}, nil, nil); err != nil {
-		t.Fatalf("failed to write points: %s", err.Error())
-	}
-
-	if count := e.DataFileCount(); count != 4 {
-		t.Fatalf("expected 3 data files to exist but got %d", count)
-	}
-
-	fields := []string{"value"}
-
-	e.CompactionAge = time.Duration(0)
-
-	if err := e.Compact(true); err != nil {
-		t.Fatalf("error compacting: %s", err.Error())
-	}
-
-	if count := e.DataFileCount(); count != 1 {
-		t.Fatalf("expected compaction to reduce data file count to 1 but got %d", count)
-	}
-
-	verify := func(series string, points []models.Point, seek int64) {
-		tx, _ := e.Begin(false)
-		defer tx.Rollback()
-		c := tx.Cursor(series, fields, nil, true)
-
-		k, v := c.SeekTo(seek)
-		p := points[0]
-		val := p.Fields()["value"]
-		if p.UnixNano() != k || val != v {
-			t.Fatalf("expected to seek to first point\n\texp: %d %f\n\tgot: %d %f", p.UnixNano(), val, k, v)
-		}
-		points = points[1:]
-
-		for _, p := range points {
-			k, v := c.Next()
-			val := p.Fields()["value"]
-			if p.UnixNano() != k || val != v {
-				t.Fatalf("expected to seek to first point\n\texp: %d %f\n\tgot: %d %f", p.UnixNano(), val, k, v.(float64))
-			}
-		}
-	}
-
-	verify("cpu,host=A", []models.Point{p1, p3, p5, p7}, 0)
-	verify("cpu,host=B", []models.Point{p2, p4, p6, p8}, 0)
-	if err := e.Engine.Close(); err != nil {
-		t.Fatalf("error closing: %s", err.Error())
-	}
-	if err := e.Open(); err != nil {
-		t.Fatalf("error opening: %s", err.Error())
-	}
-	verify("cpu,host=A", []models.Point{p1, p3, p5, p7}, 0)
-	verify("cpu,host=B", []models.Point{p2, p4, p6, p8}, 0)
-}
-
-// Ensure that if two keys have the same fnv64-a id, we handle it
-func TestEngine_KeyCollisionsAreHandled(t *testing.T) {
-	e := OpenDefaultEngine()
-	defer e.Close()
-
-	fields := []string{"value"}
-
-	// make sure two of these keys collide
-	e.HashSeriesField = func(key string) uint64 {
-		return 1
-	}
-	p1 := parsePoint("cpu,host=A value=1.1 1000000000")
-	p2 := parsePoint("cpu,host=B value=1.2 1000000000")
-	p3 := parsePoint("cpu,host=C value=1.3 1000000000")
-
-	if err := e.WritePoints([]models.Point{p1, p2, p3}, nil, nil); err != nil {
-		t.Fatalf("failed to write points: %s", err.Error())
-	}
-
-	verify := func(series string, points []models.Point, seek int64) {
-		tx, _ := e.Begin(false)
-		defer tx.Rollback()
-		c := tx.Cursor(series, fields, nil, true)
-
-		k, v := c.SeekTo(seek)
-		p := points[0]
-		val := p.Fields()["value"]
-		if p.UnixNano() != k || val != v {
-			t.Fatalf("expected to seek to first point\n\texp: %d %f\n\tgot: %d %f", p.UnixNano(), val, k, v)
-		}
-		points = points[1:]
-
-		for _, p := range points {
-			k, v := c.Next()
-			val := p.Fields()["value"]
-			if p.UnixNano() != k || val != v {
-				t.Fatalf("expected to seek to first point\n\texp: %d %f\n\tgot: %d %f", p.UnixNano(), val, k, v.(float64))
-			}
-		}
-	}
-
-	verify("cpu,host=A", []models.Point{p1}, 0)
-	verify("cpu,host=B", []models.Point{p2}, 0)
-	verify("cpu,host=C", []models.Point{p3}, 0)
-
-	p4 := parsePoint("cpu,host=A value=2.1 2000000000")
-	p5 := parsePoint("cpu,host=B value=2.2 2000000000")
-	p6 := parsePoint("cpu,host=C value=2.3 2000000000")
-
-	if err := e.WritePoints([]models.Point{p4, p5, p6}, nil, nil); err != nil {
-		t.Fatalf("failed to write points: %s", err.Error())
-	}
-
-	verify("cpu,host=A", []models.Point{p1, p4}, 0)
-	verify("cpu,host=B", []models.Point{p2, p5}, 0)
-	verify("cpu,host=C", []models.Point{p3, p6}, 0)
-
-	// verify collisions are handled after closing and reopening
-	if err := e.Engine.Close(); err != nil {
-		t.Fatalf("error closing: %s", err.Error())
-	}
-	if err := e.Open(); err != nil {
-		t.Fatalf("error opening: %s", err.Error())
-	}
-
-	verify("cpu,host=A", []models.Point{p1, p4}, 0)
-	verify("cpu,host=B", []models.Point{p2, p5}, 0)
-	verify("cpu,host=C", []models.Point{p3, p6}, 0)
-
-	p7 := parsePoint("cpu,host=A value=3.1 3000000000")
-	p8 := parsePoint("cpu,host=B value=3.2 3000000000")
-	p9 := parsePoint("cpu,host=C value=3.3 3000000000")
-
-	if err := e.WritePoints([]models.Point{p7, p8, p9}, nil, nil); err != nil {
-		t.Fatalf("failed to write points: %s", err.Error())
-	}
-
-	verify("cpu,host=A", []models.Point{p1, p4, p7}, 0)
-	verify("cpu,host=B", []models.Point{p2, p5, p8}, 0)
-	verify("cpu,host=C", []models.Point{p3, p6, p9}, 0)
-}
-
-func TestEngine_SupportMultipleFields(t *testing.T) {
-	e := OpenDefaultEngine()
-	defer e.Close()
-
-	fields := []string{"value", "foo"}
-
-	p1 := parsePoint("cpu,host=A value=1.1 1000000000")
-	p2 := parsePoint("cpu,host=A value=1.2,foo=2.2 2000000000")
-
-	if err := e.WritePoints([]models.Point{p1, p2}, nil, nil); err != nil {
-		t.Fatalf("failed to write points: %s", err.Error())
-	}
-	tx, _ := e.Begin(false)
-	defer tx.Rollback()
-	c := tx.Cursor("cpu,host=A", fields, nil, true)
-	k, v := c.SeekTo(0)
-	if k != p1.UnixNano() {
-		t.Fatalf("time wrong:\n\texp: %d\n\tgot: %d", p1.UnixNano(), k)
-	}
-	if !reflect.DeepEqual(v, map[string]interface{}{"value": 1.1}) {
-		t.Fatalf("value wrong: %v", v)
-	}
-	k, v = c.Next()
-	if k != p2.UnixNano() {
-		t.Fatalf("time wrong:\n\texp: %d\n\tgot: %d", p2.UnixNano(), k)
-	}
-	if !reflect.DeepEqual(v, map[string]interface{}{"value": 1.2, "foo": 2.2}) {
-		t.Fatalf("value wrong: %v", v)
-	}
-	k, _ = c.Next()
-	if k != tsdb.EOF {
-		t.Fatal("expected EOF")
-	}
-
-	// verify we can update a field and it's still all good
-	p11 := parsePoint("cpu,host=A foo=2.1 1000000000")
-	if err := e.WritePoints([]models.Point{p11}, nil, nil); err != nil {
-		t.Fatalf("failed to write points: %s", err.Error())
-	}
-
-	tx2, _ := e.Begin(false)
-	defer tx2.Rollback()
-	c = tx2.Cursor("cpu,host=A", fields, nil, true)
-	k, v = c.SeekTo(0)
-	if k != p1.UnixNano() {
-		t.Fatalf("time wrong:\n\texp: %d\n\tgot: %d", p1.UnixNano(), k)
-	}
-	if !reflect.DeepEqual(v, map[string]interface{}{"value": 1.1, "foo": 2.1}) {
-		t.Fatalf("value wrong: %v", v)
-	}
-	k, v = c.Next()
-	if k != p2.UnixNano() {
-		t.Fatalf("time wrong:\n\texp: %d\n\tgot: %d", p2.UnixNano(), k)
-	}
-	if !reflect.DeepEqual(v, map[string]interface{}{"value": 1.2, "foo": 2.2}) {
-		t.Fatalf("value wrong: %v", v)
-	}
-	k, _ = c.Next()
-	if k != tsdb.EOF {
-		t.Fatal("expected EOF")
-	}
-
-	// verify it's all good with the wal in the picture
-	e.WAL.SkipCache = false
-
-	p3 := parsePoint("cpu,host=A value=1.3 3000000000")
-	p4 := parsePoint("cpu,host=A value=1.4,foo=2.4 4000000000")
-	if err := e.WritePoints([]models.Point{p3, p4}, nil, nil); err != nil {
-		t.Fatalf("failed to write points: %s", err.Error())
-	}
-
-	tx3, _ := e.Begin(false)
-	defer tx3.Rollback()
-	c = tx3.Cursor("cpu,host=A", fields, nil, true)
-	k, v = c.SeekTo(0)
-	if k != p1.UnixNano() {
-		t.Fatalf("time wrong:\n\texp: %d\n\tgot: %d", p1.UnixNano(), k)
-	}
-	if !reflect.DeepEqual(v, map[string]interface{}{"value": 1.1, "foo": 2.1}) {
-		t.Fatalf("value wrong: %v", v)
-	}
-	k, v = c.Next()
-	if k != p2.UnixNano() {
-		t.Fatalf("time wrong:\n\texp: %d\n\tgot: %d", p2.UnixNano(), k)
-	}
-	if !reflect.DeepEqual(v, map[string]interface{}{"value": 1.2, "foo": 2.2}) {
-		t.Fatalf("value wrong: %v", v)
-	}
-	k, v = c.Next()
-	if k != p3.UnixNano() {
-		t.Fatalf("time wrong:\n\texp: %d\n\tgot: %d", p3.UnixNano(), k)
-	}
-	if !reflect.DeepEqual(v, map[string]interface{}{"value": 1.3}) {
-		t.Fatalf("value wrong: %v", v)
-	}
-	k, v = c.Next()
-	if k != p4.UnixNano() {
-		t.Fatalf("time wrong:\n\texp: %d\n\tgot: %d", p2.UnixNano(), k)
-	}
-	if !reflect.DeepEqual(v, map[string]interface{}{"value": 1.4, "foo": 2.4}) {
-		t.Fatalf("value wrong: %v", v)
-	}
-	k, _ = c.Next()
-	if k != tsdb.EOF {
-		t.Fatal("expected EOF")
-	}
-
-	p33 := parsePoint("cpu,host=A foo=2.3 3000000000")
-	if err := e.WritePoints([]models.Point{p33}, nil, nil); err != nil {
-		t.Fatalf("failed to write points: %s", err.Error())
-	}
-
-	tx4, _ := e.Begin(false)
-	defer tx4.Rollback()
-	c = tx4.Cursor("cpu,host=A", fields, nil, true)
-	k, v = c.SeekTo(0)
-	if k != p1.UnixNano() {
-		t.Fatalf("time wrong:\n\texp: %d\n\tgot: %d", p1.UnixNano(), k)
-	}
-	if !reflect.DeepEqual(v, map[string]interface{}{"value": 1.1, "foo": 2.1}) {
-		t.Fatalf("value wrong: %v", v)
-	}
-	k, v = c.Next()
-	if k != p2.UnixNano() {
-		t.Fatalf("time wrong:\n\texp: %d\n\tgot: %d", p2.UnixNano(), k)
-	}
-	if !reflect.DeepEqual(v, map[string]interface{}{"value": 1.2, "foo": 2.2}) {
-		t.Fatalf("value wrong: %v", v)
-	}
-	k, v = c.Next()
-	if k != p3.UnixNano() {
-		t.Fatalf("time wrong:\n\texp: %d\n\tgot: %d", p3.UnixNano(), k)
-	}
-	if !reflect.DeepEqual(v, map[string]interface{}{"value": 1.3, "foo": 2.3}) {
-		t.Fatalf("value wrong: %v", v)
-	}
-	k, v = c.Next()
-	if k != p4.UnixNano() {
-		t.Fatalf("time wrong:\n\texp: %d\n\tgot: %d", p2.UnixNano(), k)
-	}
-	if !reflect.DeepEqual(v, map[string]interface{}{"value": 1.4, "foo": 2.4}) {
-		t.Fatalf("value wrong: %v", v)
-	}
-	k, _ = c.Next()
-	if k != tsdb.EOF {
-		t.Fatal("expected EOF")
-	}
-
-	// and ensure we can grab one of the fields
-	c = tx4.Cursor("cpu,host=A", []string{"value"}, nil, true)
-	k, v = c.SeekTo(4000000000)
-	if k != p4.UnixNano() {
-		t.Fatalf("time wrong:\n\texp: %d\n\tgot: %d", p4.UnixNano(), k)
-	}
-	if v != 1.4 {
-		t.Fatalf("value wrong: %v", v)
-	}
-	k, _ = c.Next()
-	if k != tsdb.EOF {
-		t.Fatal("expected EOF")
-	}
-}
-
-func TestEngine_WriteManyPointsToSingleSeries(t *testing.T) {
-	e := OpenDefaultEngine()
-	defer e.Close()
-
-	fields := []string{"value"}
-
-	var points []models.Point
-	for i := 1; i <= 10000; i++ {
-		points = append(points, parsePoint(fmt.Sprintf("cpu,host=A value=%d %d000000000", i, i)))
-		if i%500 == 0 {
-			if err := e.WritePoints(points, nil, nil); err != nil {
-				t.Fatalf("failed to write points: %s", err.Error())
-			}
-			points = nil
-		}
-	}
-
-	tx, _ := e.Begin(false)
-	defer tx.Rollback()
-	c := tx.Cursor("cpu,host=A", fields, nil, true)
-	k, v := c.SeekTo(0)
-	for i := 2; i <= 10000; i++ {
-		k, v = c.Next()
-		if k != int64(i)*1000000000 {
-			t.Fatalf("time wrong:\n\texp: %d\n\tgot: %d", i*1000000000, k)
-		}
-		if v != float64(i) {
-			t.Fatalf("value wrong:\n\texp:%v\n\tgot:%v", float64(i), v)
-		}
-	}
-	k, _ = c.Next()
-	if k != tsdb.EOF {
-		t.Fatal("expected EOF")
-	}
-}
-
-func TestEngine_WritePointsInMultipleRequestsWithSameTime(t *testing.T) {
-	e := OpenDefaultEngine()
-	defer e.Close()
-
-	fields := []string{"value"}
-
-	e.WAL.SkipCache = false
-
-	if err := e.WritePoints([]models.Point{parsePoint("foo value=1 0")}, nil, nil); err != nil {
-		t.Fatalf("failed to write points: %s", err.Error())
-	}
-	if err := e.WritePoints([]models.Point{parsePoint("foo value=2 0")}, nil, nil); err != nil {
-		t.Fatalf("failed to write points: %s", err.Error())
-	}
-	if err := e.WritePoints([]models.Point{parsePoint("foo value=3 0")}, nil, nil); err != nil {
-		t.Fatalf("failed to write points: %s", err.Error())
-	}
-
-	verify := func() {
-		tx, _ := e.Begin(false)
-		defer tx.Rollback()
-		c := tx.Cursor("foo", fields, nil, true)
-		k, v := c.SeekTo(0)
-		if k != 0 {
-			t.Fatalf("expected 0 time but got %d", k)
-		}
-		if v != float64(3) {
-			t.Fatalf("expected 3 for value but got %f", v.(float64))
-		}
-		k, _ = c.Next()
-		if k != tsdb.EOF {
-			t.Fatal("expected EOF")
-		}
-	}
-
-	verify()
-
-	if err := e.Engine.Close(); err != nil {
-		t.Fatalf("error closing: %s", err.Error())
-	}
-	if err := e.Open(); err != nil {
-		t.Fatalf("error opening: %s", err.Error())
-	}
-
-	verify()
-}
-
-func TestEngine_CursorDescendingOrder(t *testing.T) {
-	e := OpenDefaultEngine()
-	defer e.Close()
-
-	fields := []string{"value"}
-
-	p1 := parsePoint("foo value=1 1")
-	p2 := parsePoint("foo value=2 2")
-
-	e.WAL.SkipCache = false
-
-	if err := e.WritePoints([]models.Point{p1, p2}, nil, nil); err != nil {
-		t.Fatalf("failed to write points: %s", err.Error())
-	}
-
-	verify := func() {
-		tx, _ := e.Begin(false)
-		defer tx.Rollback()
-		c := tx.Cursor("foo", fields, nil, false)
-		fmt.Println("seek")
-		k, v := c.SeekTo(5000000)
-		if k != 2 {
-			t.Fatalf("expected 2 time but got %d", k)
-		}
-		if v != float64(2) {
-			t.Fatalf("expected 2 for value but got %f", v.(float64))
-		}
-		fmt.Println("next1")
-		k, v = c.Next()
-		if k != 1 {
-			t.Fatalf("expected 1 time but got %d", k)
-		}
-		fmt.Println("next2")
-		if v != float64(1) {
-			t.Fatalf("expected 1 for value but got %f", v.(float64))
-		}
-		k, _ = c.Next()
-		if k != tsdb.EOF {
-			t.Fatal("expected EOF", k)
-		}
-	}
-	fmt.Println("verify 1")
-	verify()
-
-	if err := e.WAL.Flush(); err != nil {
-		t.Fatalf("error flushing WAL %s", err.Error())
-	}
-
-	fmt.Println("verify 2")
-	verify()
-
-	p3 := parsePoint("foo value=3 3")
-
-	if err := e.WritePoints([]models.Point{p3}, nil, nil); err != nil {
-		t.Fatalf("failed to write points: %s", err.Error())
-	}
-
-	func() {
-		tx, _ := e.Begin(false)
-		defer tx.Rollback()
-		c := tx.Cursor("foo", fields, nil, false)
-		k, v := c.SeekTo(234232)
-		if k != 3 {
-			t.Fatalf("expected 3 time but got %d", k)
-		}
-		if v != float64(3) {
-			t.Fatalf("expected 3 for value but got %f", v.(float64))
-		}
-		k, _ = c.Next()
-		if k != 2 {
-			t.Fatalf("expected 2 time but got %d", k)
-		}
-	}()
-}
-
-func TestEngine_CompactWithSeriesInOneFile(t *testing.T) {
-	e := OpenDefaultEngine()
-	defer e.Close()
-
-	fields := []string{"value"}
-
-	e.RotateFileSize = 10
-	e.MaxPointsPerBlock = 1
-
-	p1 := parsePoint("cpu,host=A value=1.1 1000000000")
-	p2 := parsePoint("cpu,host=B value=1.2 2000000000")
-	p3 := parsePoint("cpu,host=A value=1.3 3000000000")
-
-	if err := e.WritePoints([]models.Point{p1}, nil, nil); err != nil {
-		t.Fatalf("failed to write points: %s", err.Error())
-	}
-	if err := e.WritePoints([]models.Point{p2}, nil, nil); err != nil {
-		t.Fatalf("failed to write points: %s", err.Error())
-	}
-	if err := e.WritePoints([]models.Point{p3}, nil, nil); err != nil {
-		t.Fatalf("failed to write points: %s", err.Error())
-	}
-
-	if count := e.DataFileCount(); count != 3 {
-		t.Fatalf("expected 3 data files but got %d", count)
-	}
-
-	verify := func() {
-		tx, _ := e.Begin(false)
-		defer tx.Rollback()
-		c := tx.Cursor("cpu,host=A", fields, nil, true)
-		k, v := c.SeekTo(0)
-		if k != 1000000000 {
-			t.Fatalf("expected time 1000000000 but got %d", k)
-		}
-		if v != 1.1 {
-			t.Fatalf("expected value 1.1 but got %f", v.(float64))
-		}
-		k, v = c.Next()
-		if k != 3000000000 {
-			t.Fatalf("expected time 3000000000 but got %d", k)
-		}
-		c = tx.Cursor("cpu,host=B", fields, nil, true)
-		k, v = c.SeekTo(0)
-		if k != 2000000000 {
-			t.Fatalf("expected time 2000000000 but got %d", k)
-		}
-		if v != 1.2 {
-			t.Fatalf("expected value 1.2 but got %f", v.(float64))
-		}
-	}
-
-	fmt.Println("verify 1")
-	verify()
-
-	if err := e.Compact(true); err != nil {
-		t.Fatalf("error compacting: %s", err.Error())
-	}
-	fmt.Println("verify 2")
-	verify()
-
-	p4 := parsePoint("cpu,host=A value=1.4 4000000000")
-	if err := e.WritePoints([]models.Point{p4}, nil, nil); err != nil {
-		t.Fatalf("failed to write points: %s", err.Error())
-	}
-
-	if err := e.Compact(true); err != nil {
-		t.Fatalf("error compacting: %s", err.Error())
-	}
-	tx1, _ := e.Begin(false)
-	defer tx1.Rollback()
-	c := tx1.Cursor("cpu,host=A", fields, nil, true)
-	k, v := c.SeekTo(0)
-	if k != 1000000000 {
-		t.Fatalf("expected time 1000000000 but got %d", k)
-	}
-	if v != 1.1 {
-		t.Fatalf("expected value 1.1 but got %f", v.(float64))
-	}
-	k, v = c.Next()
-	if k != 3000000000 {
-		t.Fatalf("expected time 3000000000 but got %d", k)
-	}
-	k, _ = c.Next()
-	if k != 4000000000 {
-		t.Fatalf("expected time 3000000000 but got %d", k)
-	}
-}
-
-// Ensure that compactions that happen where blocks from old data files
-// skip decoding and just get copied over to the new data file works.
-func TestEngine_CompactionWithCopiedBlocks(t *testing.T) {
-	e := OpenDefaultEngine()
-	defer e.Close()
-
-	fields := []string{"value"}
-
-	e.RotateFileSize = 10
-	e.MaxPointsPerBlock = 1
-
-	p1 := parsePoint("cpu,host=A value=1.1 1000000000")
-	p2 := parsePoint("cpu,host=A value=1.2 2000000000")
-	p3 := parsePoint("cpu,host=A value=1.3 3000000000")
-
-	if err := e.WritePoints([]models.Point{p1, p2}, nil, nil); err != nil {
-		t.Fatalf("failed to write points: %s", err.Error())
-	}
-	if err := e.WritePoints([]models.Point{p3}, nil, nil); err != nil {
-		t.Fatalf("failed to write points: %s", err.Error())
-	}
-
-	verify := func() {
-		tx, _ := e.Begin(false)
-		defer tx.Rollback()
-		c := tx.Cursor("cpu,host=A", fields, nil, true)
-		k, _ := c.SeekTo(0)
-		if k != 1000000000 {
-			t.Fatalf("expected time 1000000000 but got %d", k)
-		}
-		k, _ = c.Next()
-		if k != 2000000000 {
-			t.Fatalf("expected time 2000000000 but got %d", k)
-		}
-		k, _ = c.Next()
-		if k != 3000000000 {
-			t.Fatalf("expected time 3000000000 but got %d", k)
-		}
-	}
-
-	verify()
-	if err := e.Compact(true); err != nil {
-		t.Fatalf("error compacting: %s", err.Error())
-	}
-	fmt.Println("verify 2")
-	verify()
-
-	p4 := parsePoint("cpu,host=B value=1.4 4000000000")
-	if err := e.WritePoints([]models.Point{p4}, nil, nil); err != nil {
-		t.Fatalf("failed to write points: %s", err.Error())
-	}
-
-	if err := e.Compact(true); err != nil {
-		t.Fatalf("error compacting: %s", err.Error())
-	}
-	fmt.Println("verify 3")
-	verify()
-
-	p5 := parsePoint("cpu,host=A value=1.5 5000000000")
-	p6 := parsePoint("cpu,host=A value=1.6 6000000000")
-	p7 := parsePoint("cpu,host=B value=2.1 7000000000")
-	if err := e.WritePoints([]models.Point{p5, p6, p7}, nil, nil); err != nil {
-		t.Fatalf("failed to write points: %s", err.Error())
-	}
-
-	p8 := parsePoint("cpu,host=A value=1.5 7000000000")
-	p9 := parsePoint("cpu,host=A value=1.6 8000000000")
-	p10 := parsePoint("cpu,host=B value=2.1 8000000000")
-	if err := e.WritePoints([]models.Point{p8, p9, p10}, nil, nil); err != nil {
-		t.Fatalf("failed to write points: %s", err.Error())
-	}
-
-	if err := e.Compact(true); err != nil {
-		t.Fatalf("error compacting: %s", err.Error())
-	}
-	verify()
-
-}
-
-func TestEngine_RewritingOldBlocks(t *testing.T) {
-	e := OpenDefaultEngine()
-	defer e.Close()
-
-	fields := []string{"value"}
-
-	e.MaxPointsPerBlock = 2
-
-	p1 := parsePoint("cpu,host=A value=1.1 1000000000")
-	p2 := parsePoint("cpu,host=A value=1.2 2000000000")
-	p3 := parsePoint("cpu,host=A value=1.3 3000000000")
-	p4 := parsePoint("cpu,host=A value=1.5 1500000000")
-
-	if err := e.WritePoints([]models.Point{p1, p2}, nil, nil); err != nil {
-		t.Fatalf("failed to write points: %s", err.Error())
-	}
-	if err := e.WritePoints([]models.Point{p3}, nil, nil); err != nil {
-		t.Fatalf("failed to write points: %s", err.Error())
-	}
-	if err := e.WritePoints([]models.Point{p4}, nil, nil); err != nil {
-		t.Fatalf("failed to write points: %s", err.Error())
-	}
-
-	tx, _ := e.Begin(false)
-	defer tx.Rollback()
-	c := tx.Cursor("cpu,host=A", fields, nil, true)
-	k, _ := c.SeekTo(0)
-	if k != 1000000000 {
-		t.Fatalf("expected time 1000000000 but got %d", k)
-	}
-	k, _ = c.Next()
-	if k != 1500000000 {
-		t.Fatalf("expected time 1500000000 but got %d", k)
-	}
-	k, _ = c.Next()
-	if k != 2000000000 {
-		t.Fatalf("expected time 2000000000 but got %d", k)
-	}
-	k, _ = c.Next()
-	if k != 3000000000 {
-		t.Fatalf("expected time 3000000000 but got %d", k)
-	}
-}
-
-func TestEngine_WriteIntoCompactedFile(t *testing.T) {
-	e := OpenDefaultEngine()
-	defer e.Close()
-
-	fields := []string{"value"}
-
-	e.MaxPointsPerBlock = 3
-	e.RotateFileSize = 10
-
-	p1 := parsePoint("cpu,host=A value=1.1 1000000000")
-	p2 := parsePoint("cpu,host=A value=1.2 2000000000")
-	p3 := parsePoint("cpu,host=A value=1.3 3000000000")
-	p4 := parsePoint("cpu,host=A value=1.5 4000000000")
-	p5 := parsePoint("cpu,host=A value=1.6 2500000000")
-
-	if err := e.WritePoints([]models.Point{p1, p2}, nil, nil); err != nil {
-		t.Fatalf("failed to write points: %s", err.Error())
-	}
-	if err := e.WritePoints([]models.Point{p3}, nil, nil); err != nil {
-		t.Fatalf("failed to write points: %s", err.Error())
-	}
-
-	if err := e.Compact(true); err != nil {
-		t.Fatalf("error compacting: %s", err.Error())
-	}
-
-	if err := e.WritePoints([]models.Point{p4}, nil, nil); err != nil {
-		t.Fatalf("failed to write points: %s", err.Error())
-	}
-
-	if err := e.Compact(true); err != nil {
-		t.Fatalf("error compacting: %s", err.Error())
-	}
-
-	if err := e.WritePoints([]models.Point{p5}, nil, nil); err != nil {
-		t.Fatalf("failed to write points: %s", err.Error())
-	}
-
-	if count := e.DataFileCount(); count != 1 {
-		t.Fatalf("expected 1 data file but got %d", count)
-	}
-
-	tx, _ := e.Begin(false)
-	defer tx.Rollback()
-	c := tx.Cursor("cpu,host=A", fields, nil, true)
-	k, _ := c.SeekTo(0)
-	if k != 1000000000 {
-		t.Fatalf("wrong time: %d", k)
-	}
-	k, _ = c.Next()
-	if k != 2000000000 {
-		t.Fatalf("wrong time: %d", k)
-	}
-	k, _ = c.Next()
-	if k != 2500000000 {
-		t.Fatalf("wrong time: %d", k)
-	}
-	k, _ = c.Next()
-	if k != 3000000000 {
-		t.Fatalf("wrong time: %d", k)
-	}
-	k, _ = c.Next()
-	if k != 4000000000 {
-		t.Fatalf("wrong time: %d", k)
-	}
-}
-
-func TestEngine_WriteIntoCompactedFile_MaxPointsPerBlockZero(t *testing.T) {
-	e := OpenDefaultEngine()
-	defer e.Close()
-
-	fields := []string{"value"}
-
-	e.MaxPointsPerBlock = 4
-	e.RotateFileSize = 10
-
-	p1 := parsePoint("cpu,host=A value=1.1 1000000000")
-	p2 := parsePoint("cpu,host=A value=1.2 2000000000")
-	p3 := parsePoint("cpu,host=A value=1.3 3000000000")
-	p4 := parsePoint("cpu,host=A value=1.5 4000000000")
-	p5 := parsePoint("cpu,host=A value=1.6 2500000000")
-	p6 := parsePoint("cpu,host=A value=1.7 5000000000")
-	p7 := parsePoint("cpu,host=A value=1.8 6000000000")
-	p8 := parsePoint("cpu,host=A value=1.9 7000000000")
-
-	if err := e.WritePoints([]models.Point{p1, p2}, nil, nil); err != nil {
-		t.Fatalf("failed to write points: %s", err.Error())
-	}
-	if err := e.WritePoints([]models.Point{p3}, nil, nil); err != nil {
-		t.Fatalf("failed to write points: %s", err.Error())
-	}
-
-	if err := e.Compact(true); err != nil {
-		t.Fatalf("error compacting: %s", err.Error())
-	}
-
-	if err := e.WritePoints([]models.Point{p4}, nil, nil); err != nil {
-		t.Fatalf("failed to write points: %s", err.Error())
-	}
-
-	if err := e.WritePoints([]models.Point{p6, p7, p8}, nil, nil); err != nil {
-		t.Fatalf("failed to write points: %s", err.Error())
-	}
-
-	if err := e.Compact(true); err != nil {
-		t.Fatalf("error compacting: %s", err.Error())
-	}
-
-	if err := e.WritePoints([]models.Point{p5}, nil, nil); err != nil {
-		t.Fatalf("failed to write points: %s", err.Error())
-	}
-
-	if count := e.DataFileCount(); count != 1 {
-		t.Fatalf("expected 1 data file but got %d", count)
-	}
-
-	tx, _ := e.Begin(false)
-	defer tx.Rollback()
-	c := tx.Cursor("cpu,host=A", fields, nil, true)
-	k, _ := c.SeekTo(0)
-	if k != 1000000000 {
-		t.Fatalf("wrong time: %d", k)
-	}
-	k, _ = c.Next()
-	if k != 2000000000 {
-		t.Fatalf("wrong time: %d", k)
-	}
-	k, _ = c.Next()
-	if k != 2500000000 {
-		t.Fatalf("wrong time: %d", k)
-	}
-	k, _ = c.Next()
-	if k != 3000000000 {
-		t.Fatalf("wrong time: %d", k)
-	}
-	k, _ = c.Next()
-	if k != 4000000000 {
-		t.Fatalf("wrong time: %d", k)
-	}
-}
-
-func TestEngine_DuplicatePointsInWalAndIndex(t *testing.T) {
-	e := OpenDefaultEngine()
-	defer e.Close()
-
-	fields := []string{"value"}
-	p1 := parsePoint("cpu,host=A value=1.1 1000000000")
-	p2 := parsePoint("cpu,host=A value=1.2 1000000000")
-	if err := e.WritePoints([]models.Point{p1}, nil, nil); err != nil {
-		t.Fatalf("failed to write points: %s", err.Error())
-	}
-	e.WAL.SkipCache = false
-	if err := e.WritePoints([]models.Point{p2}, nil, nil); err != nil {
-		t.Fatalf("failed to write points: %s", err.Error())
-	}
-	tx, _ := e.Begin(false)
-	defer tx.Rollback()
-	c := tx.Cursor("cpu,host=A", fields, nil, true)
-	k, v := c.SeekTo(0)
-	if k != 1000000000 {
-		t.Fatalf("wrong time: %d", k)
-	}
-	if v != 1.2 {
-		t.Fatalf("wrong value: %f", v.(float64))
-	}
-	k, _ = c.Next()
-	if k != tsdb.EOF {
-		t.Fatal("expected EOF", k)
-	}
-}
-
-func TestEngine_Deletes(t *testing.T) {
-	e := OpenDefaultEngine()
-	defer e.Close()
-
-	fields := []string{"value"}
-	// Create metadata.
-	mf := &tsdb.MeasurementFields{Fields: make(map[string]*tsdb.Field)}
-	mf.CreateFieldIfNotExists("value", influxql.Float, false)
-	atag := map[string]string{"host": "A"}
-	btag := map[string]string{"host": "B"}
-	seriesToCreate := []*tsdb.SeriesCreate{
-		{Series: tsdb.NewSeries(string(models.MakeKey([]byte("cpu"), atag)), atag)},
-		{Series: tsdb.NewSeries(string(models.MakeKey([]byte("cpu"), btag)), btag)},
-	}
-
-	p1 := parsePoint("cpu,host=A value=1.1 1000000001")
-	p2 := parsePoint("cpu,host=A value=1.2 2000000001")
-	p3 := parsePoint("cpu,host=B value=2.1 1000000000")
-	p4 := parsePoint("cpu,host=B value=2.1 2000000000")
-
-	e.SkipCompaction = true
-	e.WAL.SkipCache = false
-
-	if err := e.WritePoints([]models.Point{p1, p3}, map[string]*tsdb.MeasurementFields{"cpu": mf}, seriesToCreate); err != nil {
-		t.Fatalf("failed to write points: %s", err.Error())
-	}
-
-	func() {
-		tx, _ := e.Begin(false)
-		defer tx.Rollback()
-		c := tx.Cursor("cpu,host=A", fields, nil, true)
-		k, _ := c.SeekTo(0)
-		if k != p1.UnixNano() {
-			t.Fatalf("time wrong:\n\texp:%d\n\tgot:%d\n", p1.UnixNano(), k)
-		}
-	}()
-
-	if err := e.DeleteSeries([]string{"cpu,host=A"}); err != nil {
-		t.Fatalf("failed to delete series: %s", err.Error())
-	}
-
-	func() {
-		tx, _ := e.Begin(false)
-		defer tx.Rollback()
-		c := tx.Cursor("cpu,host=B", fields, nil, true)
-		k, _ := c.SeekTo(0)
-		if k != p3.UnixNano() {
-			t.Fatalf("time wrong:\n\texp:%d\n\tgot:%d\n", p1.UnixNano(), k)
-		}
-		c = tx.Cursor("cpu,host=A", fields, nil, true)
-		k, _ = c.SeekTo(0)
-		if k != tsdb.EOF {
-			t.Fatal("expected EOF", k)
-		}
-	}()
-
-	if err := e.WritePoints([]models.Point{p2, p4}, nil, nil); err != nil {
-		t.Fatalf("failed to write points: %s", err.Error())
-	}
-
-	if err := e.WAL.Flush(); err != nil {
-		t.Fatalf("error flushing wal: %s", err.Error())
-	}
-
-	func() {
-		tx, _ := e.Begin(false)
-		defer tx.Rollback()
-		c := tx.Cursor("cpu,host=A", fields, nil, true)
-		k, _ := c.SeekTo(0)
-		if k != p2.UnixNano() {
-			t.Fatalf("time wrong:\n\texp:%d\n\tgot:%d\n", p1.UnixNano(), k)
-		}
-	}()
-
-	if err := e.DeleteSeries([]string{"cpu,host=A"}); err != nil {
-		t.Fatalf("failed to delete series: %s", err.Error())
-	}
-
-	// we already know the delete on the wal works. open and close so
-	// the wal flushes to the index. To verify that the delete gets
-	// persisted and will go all the way through the index
-
-	if err := e.Engine.Close(); err != nil {
-		t.Fatalf("error closing: %s", err.Error())
-	}
-	if err := e.Open(); err != nil {
-		t.Fatalf("error opening: %s", err.Error())
-	}
-
-	verify := func() {
-		tx, _ := e.Begin(false)
-		defer tx.Rollback()
-		c := tx.Cursor("cpu,host=B", fields, nil, true)
-		k, _ := c.SeekTo(0)
-		if k != p3.UnixNano() {
-			t.Fatalf("time wrong:\n\texp:%d\n\tgot:%d\n", p1.UnixNano(), k)
-		}
-		c = tx.Cursor("cpu,host=A", fields, nil, true)
-		k, _ = c.SeekTo(0)
-		if k != tsdb.EOF {
-			t.Fatal("expected EOF")
-		}
-	}
-
-	fmt.Println("verify 1")
-	verify()
-
-	// open and close to verify thd delete was persisted
-	if err := e.Engine.Close(); err != nil {
-		t.Fatalf("error closing: %s", err.Error())
-	}
-	if err := e.Open(); err != nil {
-		t.Fatalf("error opening: %s", err.Error())
-	}
-
-	fmt.Println("verify 2")
-	verify()
-
-	if err := e.DeleteSeries([]string{"cpu,host=B"}); err != nil {
-		t.Fatalf("failed to delete series: %s", err.Error())
-	}
-
-	func() {
-		tx, _ := e.Begin(false)
-		defer tx.Rollback()
-		c := tx.Cursor("cpu,host=B", fields, nil, true)
-		k, _ := c.SeekTo(0)
-		if k != tsdb.EOF {
-			t.Fatal("expected EOF")
-		}
-	}()
-
-	if err := e.WAL.Flush(); err != nil {
-		t.Fatalf("error flushing: %s", err.Error())
-	}
-
-	func() {
-		tx, _ := e.Begin(false)
-		defer tx.Rollback()
-		c := tx.Cursor("cpu,host=B", fields, nil, true)
-		k, _ := c.SeekTo(0)
-		if k != tsdb.EOF {
-			t.Fatal("expected EOF")
-		}
-	}()
-
-	// open and close to verify thd delete was persisted
-	if err := e.Engine.Close(); err != nil {
-		t.Fatalf("error closing: %s", err.Error())
-	}
-	if err := e.Open(); err != nil {
-		t.Fatalf("error opening: %s", err.Error())
-	}
-
-	func() {
-		tx, _ := e.Begin(false)
-		defer tx.Rollback()
-		c := tx.Cursor("cpu,host=B", fields, nil, true)
-		k, _ := c.SeekTo(0)
-		if k != tsdb.EOF {
-			t.Fatal("expected EOF")
-		}
-	}()
-}
-
-func TestEngine_IndexGoodAfterFlush(t *testing.T) {
-	e := OpenDefaultEngine()
-	defer e.Close()
-
-	fields := []string{"value"}
-
-	p1 := parsePoint("test,tag=a value=2.5 1443916800000000000")
-	p2 := parsePoint("test value=3.5 1443916810000000000")
-	p3 := parsePoint("test,tag=b value=6.5 1443916860000000000")
-	p4 := parsePoint("test value=8.5 1443916861000000000")
-
-	e.SkipCompaction = true
-	e.WAL.SkipCache = false
-
-	for _, p := range []models.Point{p1, p2, p3, p4} {
-		if err := e.WritePoints([]models.Point{p}, nil, nil); err != nil {
-			t.Fatalf("failed to write points: %s", err.Error())
-		}
-	}
-
-	verify := func() {
-		tx, _ := e.Begin(false)
-		defer tx.Rollback()
-		c1 := tx.Cursor("test", fields, nil, true)
-		c2 := tx.Cursor("test,tag=a", fields, nil, true)
-		c3 := tx.Cursor("test,tag=b", fields, nil, true)
-		k, v := c1.SeekTo(1443916800000000001)
-		if k != p2.UnixNano() {
-			t.Fatalf("time wrong: %d", k)
-		}
-		if v != 3.5 {
-			t.Fatalf("value wrong: %f", v.(float64))
-		}
-		k, v = c1.Next()
-		if k != p4.UnixNano() {
-			t.Fatalf("time wrong: %d", k)
-		}
-		if v != 8.5 {
-			t.Fatalf("value wrong: %f", v.(float64))
-		}
-		if k, _ := c1.Next(); k != tsdb.EOF {
-			t.Fatalf("expected EOF: %d", k)
-		}
-		k, _ = c2.SeekTo(1443916800000000001)
-		if k != tsdb.EOF {
-			t.Fatalf("time wrong: %d", k)
-		}
-		k, v = c3.SeekTo(1443916800000000001)
-		if k != p3.UnixNano() {
-			t.Fatalf("time wrong: %d", k)
-		}
-		if v != 6.5 {
-			t.Fatalf("value wrong: %f", v.(float64))
-		}
-		if k, _ := c3.Next(); k != tsdb.EOF {
-			t.Fatalf("expected EOF: %d", k)
-		}
-	}
-
-	fmt.Println("verify1")
-	verify()
-	fmt.Println("flush")
-	if err := e.WAL.Flush(); err != nil {
-		t.Fatalf("error flushing: %s", err.Error())
-	}
-	fmt.Println("verify2")
-	verify()
-}
-
-// Ensure that when rewriting an index file with values in a
-// series not in the file doesn't cause corruption on compaction
-func TestEngine_RewriteFileAndCompact(t *testing.T) {
-	e := OpenDefaultEngine()
-	defer e.Engine.Close()
-
-	fields := []string{"value"}
-
-	e.RotateFileSize = 10
-
-	p1 := parsePoint("cpu,host=A value=1.1 1000000000")
-	p2 := parsePoint("cpu,host=A value=1.2 2000000000")
-	p3 := parsePoint("cpu,host=A value=1.3 3000000000")
-	p4 := parsePoint("cpu,host=A value=1.5 4000000000")
-	p5 := parsePoint("cpu,host=A value=1.6 5000000000")
-	p6 := parsePoint("cpu,host=B value=2.1 2000000000")
-
-	if err := e.WritePoints([]models.Point{p1, p2}, nil, nil); err != nil {
-		t.Fatalf("failed to write points: %s", err.Error())
-	}
-	if err := e.WritePoints([]models.Point{p3}, nil, nil); err != nil {
-		t.Fatalf("failed to write points: %s", err.Error())
-	}
-
-	if err := e.WritePoints([]models.Point{p4, p5, p6}, nil, nil); err != nil {
-		t.Fatalf("failed to write points: %s", err.Error())
-	}
-
-	if err := e.Compact(true); err != nil {
-		t.Fatalf("error compacting: %s", err.Error())
-	}
-
-	func() {
-		tx, _ := e.Begin(false)
-		defer tx.Rollback()
-		c := tx.Cursor("cpu,host=A", fields, nil, true)
-		k, _ := c.SeekTo(0)
-		if k != p1.UnixNano() {
-			t.Fatalf("wrong time %d", k)
-		}
-		c = tx.Cursor("cpu,host=B", fields, nil, true)
-		k, _ = c.SeekTo(0)
-		if k != p6.UnixNano() {
-			t.Fatalf("wrong time %d", k)
-		}
-	}()
-}
-
-func TestEngine_DecodeAndCombine_NoNewValues(t *testing.T) {
-	var newValues tsm1.Values
-	e := OpenDefaultEngine()
-	defer e.Engine.Close()
-
-	values := make(tsm1.Values, 1)
-	values[0] = tsm1.NewValue(time.Unix(0, 0), float64(1))
-
-	block, err := values.Encode(nil)
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-	remaining, encoded, err := e.DecodeAndCombine(newValues, block, nil, time.Unix(1, 0).UnixNano(), false)
-	if len(remaining) != 0 {
-		t.Fatalf("unexpected remaining values: exp %v, got %v", 0, len(remaining))
-	}
-
-	if len(encoded) != len(block) {
-		t.Fatalf("unexpected encoded block length: exp %v, got %v", len(block), len(encoded))
-	}
-
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-}
-
-func TestEngine_Write_Concurrent(t *testing.T) {
-	e := OpenDefaultEngine()
-	defer e.Engine.Close()
-
-	values1 := make(tsm1.Values, 1)
-	values1[0] = tsm1.NewValue(time.Unix(0, 0), float64(1))
-
-	pointsByKey1 := map[string]tsm1.Values{
-		"foo": values1,
-	}
-
-	values2 := make(tsm1.Values, 1)
-	values2[0] = tsm1.NewValue(time.Unix(10, 0), float64(1))
-
-	pointsByKey2 := map[string]tsm1.Values{
-		"foo": values2,
-	}
-
-	var wg sync.WaitGroup
-	for i := 0; i < 4; i++ {
-		wg.Add(1)
-		go func() {
-			e.Write(pointsByKey1, nil, nil)
-			wg.Done()
-		}()
-		wg.Add(1)
-		go func() {
-			e.Write(pointsByKey2, nil, nil)
-			wg.Done()
-		}()
-	}
-	wg.Wait()
-}
-
-// Ensure the index won't compact files that would cause the
-// resulting file to be larger than the max file size
-func TestEngine_IndexFileSizeLimitedDuringCompaction(t *testing.T) {
-	e := OpenDefaultEngine()
-	defer e.Close()
-
-	e.RotateFileSize = 10
-	e.MaxFileSize = 100
-	e.MaxPointsPerBlock = 3
-
-	p1 := parsePoint("cpu,host=A value=1.1 1000000000")
-	p2 := parsePoint("cpu,host=A value=1.2 2000000000")
-	p3 := parsePoint("cpu,host=A value=1.3 3000000000")
-	p4 := parsePoint("cpu,host=A value=1.5 4000000000")
-	p5 := parsePoint("cpu,host=A value=1.6 5000000000")
-	p6 := parsePoint("cpu,host=B value=2.1 2000000000")
-
-	if err := e.WritePoints([]models.Point{p1, p2}, nil, nil); err != nil {
-		t.Fatalf("failed to write points: %s", err.Error())
-	}
-	if err := e.WritePoints([]models.Point{p3}, nil, nil); err != nil {
-		t.Fatalf("failed to write points: %s", err.Error())
-	}
-
-	if err := e.WritePoints([]models.Point{p4, p5, p6}, nil, nil); err != nil {
-		t.Fatalf("failed to write points: %s", err.Error())
-	}
-
-	if count := e.DataFileCount(); count != 3 {
-		t.Fatalf("execpted 3 data file but got %d", count)
-	}
-
-	if err := checkPoints(e, "cpu,host=A", []models.Point{p1, p2, p3, p4, p5}); err != nil {
-		t.Fatal(err.Error())
-	}
-	if err := checkPoints(e, "cpu,host=B", []models.Point{p6}); err != nil {
-		t.Fatal(err.Error())
-	}
-
-	if err := e.Compact(true); err != nil {
-		t.Fatalf("error compacting: %s", err.Error())
-	}
-
-	if err := checkPoints(e, "cpu,host=A", []models.Point{p1, p2, p3, p4, p5}); err != nil {
-		t.Fatal(err.Error())
-	}
-	if err := checkPoints(e, "cpu,host=B", []models.Point{p6}); err != nil {
-		t.Fatal(err.Error())
-	}
-
-	if count := e.DataFileCount(); count != 2 {
-		t.Fatalf("expected 1 data file but got %d", count)
-	}
-}
-
-// Ensure the index will split a large data file in two if a write
-// will cause the resulting data file to be larger than the max file
-// size limit
-func TestEngine_IndexFilesSplitOnWriteToLargeFile(t *testing.T) {
-}
-
-// checkPoints will ensure that the engine has the points passed in the block
-// along with checking that seeks in the middle work and an EOF is hit at the end
-func checkPoints(e *Engine, key string, points []models.Point) error {
-	tx, _ := e.Begin(false)
-	defer tx.Rollback()
-	c := tx.Cursor(key, []string{"value"}, nil, true)
-	k, v := c.SeekTo(0)
-	if k != points[0].UnixNano() {
-		return fmt.Errorf("wrong time:\n\texp: %d\n\tgot: %d", points[0].UnixNano(), k)
-	}
-	if got := points[0].Fields()["value"]; v != got {
-		return fmt.Errorf("wrong value:\n\texp: %v\n\tgot: %v", v, got)
-	}
-	points = points[1:]
-	for _, p := range points {
-		k, v = c.Next()
-		if k != p.UnixNano() {
-			return fmt.Errorf("wrong time:\n\texp: %d\n\tgot: %d", p.UnixNano(), k)
-		}
-		if got := p.Fields()["value"]; v != got {
-			return fmt.Errorf("wrong value:\n\texp: %v\n\tgot: %v", v, got)
-		}
-	}
-	k, _ = c.Next()
-	if k != tsdb.EOF {
-		return fmt.Errorf("expected EOF but got: %d", k)
-	}
-
-	// TODO: seek tests
-
-	return nil
-}
-
-// Engine represents a test wrapper for tsm1.Engine.
-type Engine struct {
-	*tsm1.Engine
-}
-
-// NewEngine returns a new instance of Engine.
-func NewEngine(opt tsdb.EngineOptions) *Engine {
-	dir, err := ioutil.TempDir("", "tsm1-test")
-	if err != nil {
-		panic("couldn't get temp dir")
-	}
-
-	// Create test wrapper and attach mocks.
-	e := &Engine{
-		Engine: tsm1.NewEngine(dir, dir, opt).(*tsm1.Engine),
-	}
-
-	return e
-}
-
-// OpenEngine returns an opened instance of Engine. Panic on error.
-func OpenEngine(opt tsdb.EngineOptions) *Engine {
-	e := NewEngine(opt)
-	if err := e.Open(); err != nil {
-		panic(err)
-	}
-	e.WAL.SkipCache = true
-	e.SkipCompaction = true
-	return e
-}
-
-// OpenDefaultEngine returns an open Engine with default options.
-func OpenDefaultEngine() *Engine { return OpenEngine(tsdb.NewEngineOptions()) }
-
-// Close closes the engine and removes all data.
-func (e *Engine) Close() error {
-	e.Engine.Close()
-	os.RemoveAll(e.Path())
-	return nil
-}
-
-func parsePoints(buf string) []models.Point {
-	points, err := models.ParsePointsString(buf)
-	if err != nil {
-		panic(fmt.Sprintf("couldn't parse points: %s", err.Error()))
-	}
-	return points
-}
-
-func parsePoint(buf string) models.Point {
-	return parsePoints(buf)[0]
-}
-
-func inttob(v int) []byte {
-	b := make([]byte, 8)
-	binary.BigEndian.PutUint64(b, uint64(v))
-	return b
-}
-
-func btou64(b []byte) uint64 {
-	return binary.BigEndian.Uint64(b)
-}
-
-func u64tob(v uint64) []byte {
-	b := make([]byte, 8)
-	binary.BigEndian.PutUint64(b, v)
-	return b
-}
-
-func btof64(b []byte) float64 {
-	return math.Float64frombits(binary.BigEndian.Uint64(b))
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/engine/tsm1/tx.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/engine/tsm1/tx.go
deleted file mode 100644
index 854bfb7d3..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/engine/tsm1/tx.go
+++ /dev/null
@@ -1,69 +0,0 @@
-package tsm1
-
-import (
-	"io"
-
-	"github.com/influxdb/influxdb/tsdb"
-)
-
-type tx struct {
-	files  dataFiles
-	engine *Engine
-}
-
-// TODO: handle multiple fields and descending
-func (t *tx) Cursor(series string, fields []string, dec *tsdb.FieldCodec, ascending bool) tsdb.Cursor {
-	t.engine.filesLock.RLock()
-	defer t.engine.filesLock.RUnlock()
-
-	// don't add the overhead of the multifield cursor if we only have one field
-	if len(fields) == 1 {
-		id := t.engine.keyAndFieldToID(series, fields[0])
-		_, isDeleted := t.engine.deletes[id]
-
-		var indexCursor tsdb.Cursor
-		if isDeleted {
-			indexCursor = &emptyCursor{ascending: ascending}
-		} else {
-			indexCursor = newCursor(id, t.files, ascending)
-		}
-		wc := t.engine.WAL.Cursor(series, fields, dec, ascending)
-		return NewCombinedEngineCursor(wc, indexCursor, ascending)
-	}
-
-	// multiple fields. use just the MultiFieldCursor, which also handles time collisions
-	// so we don't need to use the combined cursor
-	var cursors []tsdb.Cursor
-	var cursorFields []string
-	for _, field := range fields {
-		id := t.engine.keyAndFieldToID(series, field)
-		_, isDeleted := t.engine.deletes[id]
-
-		var indexCursor tsdb.Cursor
-		if isDeleted {
-			indexCursor = &emptyCursor{ascending: ascending}
-		} else {
-			indexCursor = newCursor(id, t.files, ascending)
-		}
-		wc := t.engine.WAL.Cursor(series, []string{field}, dec, ascending)
-		// double up the fields since there's one for the wal and one for the index
-		cursorFields = append(cursorFields, field, field)
-		cursors = append(cursors, indexCursor, wc)
-	}
-
-	return NewMultiFieldCursor(cursorFields, cursors, ascending)
-}
-
-func (t *tx) Rollback() error {
-	t.engine.queryLock.RUnlock()
-	for _, f := range t.files {
-		f.mu.RUnlock()
-	}
-
-	return nil
-}
-
-// TODO: refactor the Tx interface to not have Size, Commit, or WriteTo since they're not used
-func (t *tx) Size() int64                              { panic("not implemented") }
-func (t *tx) Commit() error                            { panic("not implemented") }
-func (t *tx) WriteTo(w io.Writer) (n int64, err error) { panic("not implemented") }
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/engine/tsm1/wal.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/engine/tsm1/wal.go
deleted file mode 100644
index 5b0cf60bb..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/engine/tsm1/wal.go
+++ /dev/null
@@ -1,816 +0,0 @@
-package tsm1
-
-import (
-	"encoding/json"
-	"fmt"
-	"io"
-	"log"
-	"os"
-	"path/filepath"
-	"sort"
-	"strconv"
-	"strings"
-	"sync"
-	"time"
-
-	"github.com/influxdb/influxdb/models"
-	"github.com/influxdb/influxdb/tsdb"
-
-	"github.com/golang/snappy"
-)
-
-const (
-	// DefaultSegmentSize of 2MB is the size at which segment files will be rolled over
-	DefaultSegmentSize = 2 * 1024 * 1024
-
-	// FileExtension is the file extension we expect for wal segments
-	WALFileExtension = "wal"
-
-	WALFilePrefix = "_"
-
-	writeBufLen = 32 << 10 // 32kb
-)
-
-// flushType indiciates why a flush and compaction are being run so the partition can
-// do the appropriate type of compaction
-type flushType int
-
-const (
-	// noFlush indicates that no flush or compaction are necesssary at this time
-	noFlush flushType = iota
-	// memoryFlush indicates that we should look for the series using the most
-	// memory to flush out and compact all others
-	memoryFlush
-	// idleFlush indicates that we should flush all series in the parition,
-	// delete all segment files and hold off on opening a new one
-	idleFlush
-	// startupFlush indicates that we're flushing because the database is starting up
-	startupFlush
-)
-
-// walEntry is a byte written to a wal segment file that indicates what the following compressed block contains
-type walEntryType byte
-
-const (
-	pointsEntry walEntryType = 0x01
-	fieldsEntry walEntryType = 0x02
-	seriesEntry walEntryType = 0x03
-	deleteEntry walEntryType = 0x04
-)
-
-var ErrWALClosed = fmt.Errorf("WAL closed")
-
-type Log struct {
-	path string
-
-	// write variables
-	writeLock          sync.Mutex
-	currentSegmentID   int
-	currentSegmentFile *os.File
-	currentSegmentSize int
-
-	// cache and flush variables
-	closing                chan struct{}
-	cacheLock              sync.RWMutex
-	lastWriteTime          time.Time
-	flushRunning           bool
-	cache                  map[string]Values
-	cacheDirtySort         map[string]bool   // this map should be small, only for dirty vals
-	flushCache             map[string]Values // temporary map while flushing
-	memorySize             int
-	measurementFieldsCache map[string]*tsdb.MeasurementFields
-	seriesToCreateCache    []*tsdb.SeriesCreate
-
-	// LogOutput is the writer used by the logger.
-	LogOutput io.Writer
-	logger    *log.Logger
-
-	// FlushColdInterval is the period of time after which a partition will do a
-	// full flush and compaction if it has been cold for writes.
-	FlushColdInterval time.Duration
-
-	// SegmentSize is the file size at which a segment file will be rotated
-	SegmentSize int
-
-	// FlushMemorySizeThreshold specifies when the log should be forced to be flushed
-	FlushMemorySizeThreshold int
-
-	// MaxMemorySizeThreshold specifies the limit at which writes to the WAL should be rejected
-	MaxMemorySizeThreshold int
-
-	// IndexWriter is the database series will be flushed to
-	IndexWriter IndexWriter
-
-	// LoggingEnabled specifies if detailed logs should be output
-	LoggingEnabled bool
-
-	// SkipCache specifies if the wal should immediately write to the index instead of
-	// caching data in memory. False by default so we buffer in memory before flushing to index.
-	SkipCache bool
-
-	// SkipDurability specifies if the wal should not write the wal entries to disk.
-	// False by default which means all writes are durable even when cached before flushing to index.
-	SkipDurability bool
-}
-
-// IndexWriter is an interface for the indexed database the WAL flushes data to
-type IndexWriter interface {
-	Write(valuesByKey map[string]Values, measurementFieldsToSave map[string]*tsdb.MeasurementFields, seriesToCreate []*tsdb.SeriesCreate) error
-	MarkDeletes(keys []string)
-	MarkMeasurementDelete(name string)
-}
-
-func NewLog(path string) *Log {
-	return &Log{
-		path: path,
-
-		// these options should be overriden by any options in the config
-		LogOutput:                os.Stderr,
-		FlushColdInterval:        tsdb.DefaultFlushColdInterval,
-		SegmentSize:              DefaultSegmentSize,
-		FlushMemorySizeThreshold: tsdb.DefaultFlushMemorySizeThreshold,
-		MaxMemorySizeThreshold:   tsdb.DefaultMaxMemorySizeThreshold,
-		logger:                   log.New(os.Stderr, "[tsm1wal] ", log.LstdFlags),
-		closing:                  make(chan struct{}),
-	}
-}
-
-// Path returns the path the log was initialized with.
-func (l *Log) Path() string { return l.path }
-
-// Open opens and initializes the Log. Will recover from previous unclosed shutdowns
-func (l *Log) Open() error {
-	if l.LoggingEnabled {
-		l.logger.Printf("tsm1 WAL starting with %d flush memory size threshold and %d max memory size threshold\n", l.FlushMemorySizeThreshold, l.MaxMemorySizeThreshold)
-		l.logger.Printf("tsm1 WAL writing to %s\n", l.path)
-	}
-	if err := os.MkdirAll(l.path, 0777); err != nil {
-		return err
-	}
-
-	l.cache = make(map[string]Values)
-	l.cacheDirtySort = make(map[string]bool)
-	l.measurementFieldsCache = make(map[string]*tsdb.MeasurementFields)
-	l.closing = make(chan struct{})
-
-	// flush out any WAL entries that are there from before
-	if err := l.readAndFlushWAL(); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-// Cursor will return a cursor object to Seek and iterate with Next for the WAL cache for the given.
-// This should only ever be called by the engine cursor method, which will always give it
-// exactly one field.
-func (l *Log) Cursor(series string, fields []string, dec *tsdb.FieldCodec, ascending bool) tsdb.Cursor {
-	l.cacheLock.RLock()
-	defer l.cacheLock.RUnlock()
-
-	if len(fields) != 1 {
-		panic("wal cursor should only ever be called with 1 field")
-	}
-	ck := SeriesFieldKey(series, fields[0])
-	values := l.cache[ck]
-
-	// if we're in the middle of a flush, combine the previous cache
-	// with this one for the cursor
-	if l.flushCache != nil {
-		if fc, ok := l.flushCache[ck]; ok {
-			c := make([]Value, len(fc), len(fc)+len(values))
-			copy(c, fc)
-			c = append(c, values...)
-
-			return newWALCursor(Values(c).Deduplicate(), ascending)
-		}
-	}
-
-	if l.cacheDirtySort[ck] {
-		values = Values(values).Deduplicate()
-	}
-
-	// build a copy so writes afterwards don't change the result set
-	a := make([]Value, len(values))
-	copy(a, values)
-	return newWALCursor(a, ascending)
-}
-
-func (l *Log) WritePoints(points []models.Point, fields map[string]*tsdb.MeasurementFields, series []*tsdb.SeriesCreate) error {
-	// add everything to the cache, or return an error if we've hit our max memory
-	if err := l.addToCache(points, fields, series, true); err != nil {
-		return err
-	}
-
-	// make the write durable if specified
-	if !l.SkipDurability {
-		// write the points
-		pointStrings := make([]string, len(points))
-		for i, p := range points {
-			pointStrings[i] = p.String()
-		}
-		data := strings.Join(pointStrings, "\n")
-		compressed := snappy.Encode(nil, []byte(data))
-
-		if err := l.writeToLog(pointsEntry, compressed); err != nil {
-			return err
-		}
-
-		// write the new fields
-		if len(fields) > 0 {
-			data, err := json.Marshal(fields)
-			if err != nil {
-				return err
-			}
-			compressed = snappy.Encode(compressed, data)
-			if err := l.writeToLog(fieldsEntry, compressed); err != nil {
-				return err
-			}
-		}
-
-		// write the new series
-		if len(series) > 0 {
-			data, err := json.Marshal(series)
-			if err != nil {
-				return err
-			}
-			compressed = snappy.Encode(compressed, data)
-			if err := l.writeToLog(seriesEntry, compressed); err != nil {
-				return err
-			}
-		}
-	}
-
-	// usually skipping the cache is only for testing purposes and this was the easiest
-	// way to represent the logic (to cache and then immediately flush)
-	if l.SkipCache {
-		if err := l.flush(idleFlush); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-// addToCache will add the points, measurements, and fields to the cache and return true if successful. They will be queryable
-// immediately after return and will be flushed at the next flush cycle. Before adding to the cache we check if we're over the
-// max memory threshold. If we are we request a flush in a new goroutine and return an error, indicating we didn't add the values
-// to the cache and that writes should return a failure.
-func (l *Log) addToCache(points []models.Point, fields map[string]*tsdb.MeasurementFields, series []*tsdb.SeriesCreate, checkMemory bool) error {
-	l.cacheLock.Lock()
-	defer l.cacheLock.Unlock()
-
-	// Make sure the log has not been closed
-	select {
-	case <-l.closing:
-		return ErrWALClosed
-	default:
-	}
-
-	// if we should check memory and we're over the threshold, mark a flush as running and kick one off in a goroutine
-	if checkMemory && l.memorySize > l.FlushMemorySizeThreshold {
-		if !l.flushRunning {
-			l.flushRunning = true
-			go func() {
-				if err := l.flush(memoryFlush); err != nil {
-					l.logger.Printf("addToCache: failed to flush: %v", err)
-				}
-			}()
-		}
-		if l.memorySize > l.MaxMemorySizeThreshold {
-			return fmt.Errorf("WAL backed up flushing to index, hit max memory")
-		}
-	}
-
-	for _, p := range points {
-		for name, value := range p.Fields() {
-			k := SeriesFieldKey(string(p.Key()), name)
-			v := NewValue(p.Time(), value)
-			cacheValues := l.cache[k]
-
-			// only mark it as dirty if it isn't already
-			if _, ok := l.cacheDirtySort[k]; !ok && len(cacheValues) > 0 {
-				dirty := cacheValues[len(cacheValues)-1].Time().UnixNano() >= v.Time().UnixNano()
-				if dirty {
-					l.cacheDirtySort[k] = true
-				}
-			}
-			l.memorySize += v.Size()
-			l.cache[k] = append(cacheValues, v)
-		}
-	}
-
-	for k, v := range fields {
-		l.measurementFieldsCache[k] = v
-	}
-	l.seriesToCreateCache = append(l.seriesToCreateCache, series...)
-	l.lastWriteTime = time.Now()
-
-	return nil
-}
-
-func (l *Log) LastWriteTime() time.Time {
-	l.cacheLock.RLock()
-	defer l.cacheLock.RUnlock()
-	return l.lastWriteTime
-}
-
-// readAndFlushWAL is called on open and will read the segment files in, flushing whenever
-// the memory gets over the limit. Once all files have been read it will flush and remove the files
-func (l *Log) readAndFlushWAL() error {
-	files, err := l.segmentFileNames()
-	if err != nil {
-		return err
-	}
-
-	// read all the segment files and cache them, flushing along the way if we
-	// hit memory limits
-	for _, fn := range files {
-		if err := l.readFileToCache(fn); err != nil {
-			return err
-		}
-
-		if l.memorySize > l.MaxMemorySizeThreshold {
-			if err := l.flush(memoryFlush); err != nil {
-				return err
-			}
-		}
-	}
-
-	// now flush and remove all the old files
-	if err := l.flush(startupFlush); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (l *Log) readFileToCache(fileName string) error {
-	f, err := os.OpenFile(fileName, os.O_RDONLY, 0666)
-	if err != nil {
-		return err
-	}
-	defer f.Close()
-
-	buf := make([]byte, writeBufLen)
-	data := make([]byte, writeBufLen)
-	for {
-		// read the type and the length of the entry
-		_, err := io.ReadFull(f, buf[0:5])
-		if err == io.EOF {
-			return nil
-		} else if err != nil {
-			l.logger.Printf("error reading segment file %s: %s", fileName, err.Error())
-			return err
-		}
-		entryType := buf[0]
-		length := btou32(buf[1:5])
-
-		// read the compressed block and decompress it
-		if int(length) > len(buf) {
-			buf = make([]byte, length)
-		}
-		_, err = io.ReadFull(f, buf[0:length])
-		if err == io.EOF || err == io.ErrUnexpectedEOF {
-			l.logger.Printf("hit end of file while reading compressed wal entry from %s", fileName)
-			return nil
-		} else if err != nil {
-			return err
-		}
-		data, err = snappy.Decode(data, buf[0:length])
-		if err != nil {
-			l.logger.Printf("error decoding compressed entry from %s: %s", fileName, err.Error())
-			return nil
-		}
-
-		// and marshal it and send it to the cache
-		switch walEntryType(entryType) {
-		case pointsEntry:
-			points, err := models.ParsePoints(data)
-			if err != nil {
-				l.logger.Printf("failed to parse points: %v", err)
-				return err
-			}
-			l.addToCache(points, nil, nil, false)
-		case fieldsEntry:
-			fields := make(map[string]*tsdb.MeasurementFields)
-			if err := json.Unmarshal(data, &fields); err != nil {
-				return err
-			}
-			l.addToCache(nil, fields, nil, false)
-		case seriesEntry:
-			var series []*tsdb.SeriesCreate
-			if err := json.Unmarshal(data, &series); err != nil {
-				return err
-			}
-			l.addToCache(nil, nil, series, false)
-		case deleteEntry:
-			d := &deleteData{}
-			if err := json.Unmarshal(data, &d); err != nil {
-				return err
-			}
-			l.IndexWriter.MarkDeletes(d.Keys)
-			l.IndexWriter.MarkMeasurementDelete(d.MeasurementName)
-			l.deleteKeysFromCache(d.Keys)
-			if d.MeasurementName != "" {
-				l.deleteMeasurementFromCache(d.MeasurementName)
-			}
-		}
-	}
-}
-
-func (l *Log) writeToLog(writeType walEntryType, data []byte) error {
-	l.writeLock.Lock()
-	defer l.writeLock.Unlock()
-
-	// Make sure the log has not been closed
-	select {
-	case <-l.closing:
-		return ErrWALClosed
-	default:
-	}
-
-	if l.currentSegmentFile == nil || l.currentSegmentSize > DefaultSegmentSize {
-		if err := l.newSegmentFile(); err != nil {
-			// A drop database or RP call could trigger this error if writes were in-flight
-			// when the drop statement executes.
-			return fmt.Errorf("error opening new segment file for wal: %s", err.Error())
-		}
-	}
-
-	// The panics here are an intentional choice. Based on reports from users
-	// it's better to fail hard if the database can't take writes. Then they'll
-	// get alerted and fix whatever is broken. Remove these and face Paul's wrath.
-	if _, err := l.currentSegmentFile.Write([]byte{byte(writeType)}); err != nil {
-		panic(fmt.Sprintf("error writing type to wal: %s", err.Error()))
-	}
-	if _, err := l.currentSegmentFile.Write(u32tob(uint32(len(data)))); err != nil {
-		panic(fmt.Sprintf("error writing len to wal: %s", err.Error()))
-	}
-	if _, err := l.currentSegmentFile.Write(data); err != nil {
-		panic(fmt.Sprintf("error writing data to wal: %s", err.Error()))
-	}
-
-	l.currentSegmentSize += 5 + len(data)
-
-	return l.currentSegmentFile.Sync()
-}
-
-// Flush will force a flush of the WAL to the index
-func (l *Log) Flush() error {
-	return l.flush(idleFlush)
-}
-
-func (l *Log) DeleteMeasurement(measurement string, keys []string) error {
-	d := &deleteData{MeasurementName: measurement, Keys: keys}
-	err := l.writeDeleteEntry(d)
-	if err != nil {
-		return err
-	}
-
-	l.deleteKeysFromCache(keys)
-	l.deleteMeasurementFromCache(measurement)
-
-	return nil
-}
-
-func (l *Log) deleteMeasurementFromCache(name string) {
-	l.cacheLock.Lock()
-	defer l.cacheLock.Unlock()
-	delete(l.measurementFieldsCache, name)
-}
-
-func (l *Log) writeDeleteEntry(d *deleteData) error {
-	js, err := json.Marshal(d)
-	if err != nil {
-		return err
-	}
-	data := snappy.Encode(nil, js)
-	return l.writeToLog(deleteEntry, data)
-}
-
-func (l *Log) DeleteSeries(keys []string) error {
-	l.deleteKeysFromCache(keys)
-
-	return l.writeDeleteEntry(&deleteData{Keys: keys})
-}
-
-func (l *Log) deleteKeysFromCache(keys []string) {
-	seriesKeys := make(map[string]bool)
-	for _, k := range keys {
-		series, _ := seriesAndFieldFromCompositeKey(k)
-		seriesKeys[series] = true
-	}
-
-	l.cacheLock.Lock()
-	defer l.cacheLock.Unlock()
-
-	for _, k := range keys {
-		delete(l.cache, k)
-	}
-
-	// now remove any of these that are marked for creation
-	var seriesCreate []*tsdb.SeriesCreate
-	for _, sc := range l.seriesToCreateCache {
-		if _, ok := seriesKeys[sc.Series.Key]; !ok {
-			seriesCreate = append(seriesCreate, sc)
-		}
-	}
-	l.seriesToCreateCache = seriesCreate
-}
-
-// Close will finish any flush that is currently in process and close file handles
-func (l *Log) Close() error {
-	l.cacheLock.Lock()
-	l.writeLock.Lock()
-	defer l.cacheLock.Unlock()
-	defer l.writeLock.Unlock()
-
-	// If cache is nil, then we're not open.  This avoids a double-close in tests.
-	if l.cache != nil {
-		// Close, but don't set to nil so future goroutines can still be signaled
-		close(l.closing)
-	}
-
-	l.cache = nil
-	l.measurementFieldsCache = nil
-	l.seriesToCreateCache = nil
-
-	if l.currentSegmentFile != nil {
-		l.currentSegmentFile.Close()
-		l.currentSegmentFile = nil
-	}
-
-	return nil
-}
-
-// flush writes all wal data in memory to the index
-func (l *Log) flush(flush flushType) error {
-	// Make sure the log has not been closed
-	select {
-	case <-l.closing:
-		return ErrWALClosed
-	default:
-	}
-
-	// only flush if there isn't one already running. Memory flushes are only triggered
-	// by writes, which will mark the flush as running, so we can ignore it.
-	l.cacheLock.Lock()
-
-	if l.flushRunning && flush != memoryFlush {
-		l.cacheLock.Unlock()
-		return nil
-	}
-
-	// mark the flush as running and ensure that it gets marked as not running when we return
-	l.flushRunning = true
-	defer func() {
-		l.cacheLock.Lock()
-		l.flushRunning = false
-		l.cacheLock.Unlock()
-	}()
-
-	// only hold the lock while we rotate the segment file
-	l.writeLock.Lock()
-	lastFileID := l.currentSegmentID
-	// if it's an idle flush, don't open a new segment file
-	if flush == idleFlush {
-		if l.currentSegmentFile != nil {
-			if err := l.currentSegmentFile.Close(); err != nil {
-				l.cacheLock.Unlock()
-				l.writeLock.Unlock()
-				return fmt.Errorf("error closing current segment: %v", err)
-			}
-			l.currentSegmentFile = nil
-			l.currentSegmentSize = 0
-		}
-	} else {
-		if err := l.newSegmentFile(); err != nil {
-			l.cacheLock.Unlock()
-			l.writeLock.Unlock()
-			return fmt.Errorf("error creating new wal file: %v", err)
-		}
-	}
-	l.writeLock.Unlock()
-
-	// copy the cache items to new maps so we can empty them out
-	l.flushCache = make(map[string]Values)
-	valueCount := 0
-	for key, v := range l.cache {
-		l.flushCache[key] = v
-		valueCount += len(v)
-	}
-	l.cache = make(map[string]Values)
-	for k := range l.cacheDirtySort {
-		l.flushCache[k] = l.flushCache[k].Deduplicate()
-	}
-	l.cacheDirtySort = make(map[string]bool)
-
-	flushSize := l.memorySize
-
-	// reset the memory being used by the cache
-	l.memorySize = 0
-
-	// reset the measurements for flushing
-	mfc := l.measurementFieldsCache
-	l.measurementFieldsCache = make(map[string]*tsdb.MeasurementFields)
-
-	// reset the series for flushing
-	scc := l.seriesToCreateCache
-	l.seriesToCreateCache = nil
-
-	l.cacheLock.Unlock()
-
-	// exit if there's nothing to flush to the index
-	if len(l.flushCache) == 0 && len(mfc) == 0 && len(scc) == 0 && flush != startupFlush {
-		return nil
-	}
-
-	if l.LoggingEnabled {
-		ftype := "idle"
-		if flush == memoryFlush {
-			ftype = "memory"
-		} else if flush == startupFlush {
-			ftype = "startup"
-		}
-		l.logger.Printf("%s flush of %s with %d keys and %d total values of %d bytes\n", ftype, l.path, len(l.flushCache), valueCount, flushSize)
-	}
-
-	startTime := time.Now()
-	if err := l.IndexWriter.Write(l.flushCache, mfc, scc); err != nil {
-		l.logger.Printf("failed to flush to index: %v", err)
-		return err
-	}
-	if l.LoggingEnabled {
-		l.logger.Printf("%s flush to index took %s\n", l.path, time.Since(startTime))
-	}
-
-	l.cacheLock.Lock()
-	l.flushCache = nil
-	l.cacheLock.Unlock()
-
-	// remove all the old segment files
-	fileNames, err := l.segmentFileNames()
-	if err != nil {
-		return err
-	}
-	for _, fn := range fileNames {
-		id, err := idFromFileName(fn)
-		if err != nil {
-			return err
-		}
-		if id <= lastFileID {
-			err := os.RemoveAll(fn)
-			if err != nil {
-				return fmt.Errorf("failed to remove: %v: %v", fn, err)
-			}
-		}
-	}
-
-	return nil
-}
-
-// segmentFileNames will return all files that are WAL segment files in sorted order by ascending ID
-func (l *Log) segmentFileNames() ([]string, error) {
-	names, err := filepath.Glob(filepath.Join(l.path, fmt.Sprintf("%s*.%s", WALFilePrefix, WALFileExtension)))
-	if err != nil {
-		return nil, err
-	}
-	sort.Strings(names)
-	return names, nil
-}
-
-// newSegmentFile will close the current segment file and open a new one, updating bookkeeping info on the log
-func (l *Log) newSegmentFile() error {
-	l.currentSegmentID++
-	if l.currentSegmentFile != nil {
-		if err := l.currentSegmentFile.Close(); err != nil {
-			return err
-		}
-	}
-
-	fileName := filepath.Join(l.path, fmt.Sprintf("%s%05d.%s", WALFilePrefix, l.currentSegmentID, WALFileExtension))
-	ff, err := os.OpenFile(fileName, os.O_CREATE|os.O_RDWR, 0666)
-	if err != nil {
-		return err
-	}
-	l.currentSegmentSize = 0
-	l.currentSegmentFile = ff
-
-	return nil
-}
-
-// shouldFlush will return the flushType specifying whether we should flush. memoryFlush
-// is never returned from this function since those can only be triggered by writes
-func (l *Log) shouldFlush() flushType {
-	l.cacheLock.RLock()
-	defer l.cacheLock.RUnlock()
-
-	if l.flushRunning {
-		return noFlush
-	}
-
-	if len(l.cache) == 0 {
-		return noFlush
-	}
-
-	if time.Since(l.lastWriteTime) > l.FlushColdInterval {
-		return idleFlush
-	}
-
-	return noFlush
-}
-
-// cursor is a unidirectional iterator for a given entry in the cache
-type walCursor struct {
-	cache     Values
-	position  int
-	ascending bool
-}
-
-func newWALCursor(cache Values, ascending bool) *walCursor {
-	// position is set such that a call to Next will successfully advance
-	// to the next postion and return the value.
-	c := &walCursor{cache: cache, ascending: ascending, position: -1}
-	if !ascending {
-		c.position = len(c.cache)
-	}
-	return c
-}
-
-func (c *walCursor) Ascending() bool { return c.ascending }
-
-// Seek will point the cursor to the given time (or key)
-func (c *walCursor) SeekTo(seek int64) (int64, interface{}) {
-	// Seek cache index
-	c.position = sort.Search(len(c.cache), func(i int) bool {
-		return c.cache[i].Time().UnixNano() >= seek
-	})
-
-	// If seek is not in the cache, return the last value in the cache
-	if !c.ascending && c.position >= len(c.cache) {
-		c.position = len(c.cache) - 1
-	}
-
-	// Make sure our position points to something in the cache
-	if c.position < 0 || c.position >= len(c.cache) {
-		return tsdb.EOF, nil
-	}
-
-	v := c.cache[c.position]
-
-	return v.Time().UnixNano(), v.Value()
-}
-
-// Next moves the cursor to the next key/value. will return nil if at the end
-func (c *walCursor) Next() (int64, interface{}) {
-	var v Value
-	if c.ascending {
-		v = c.nextForward()
-	} else {
-		v = c.nextReverse()
-	}
-
-	return v.Time().UnixNano(), v.Value()
-}
-
-// nextForward advances the cursor forward returning the next value
-func (c *walCursor) nextForward() Value {
-	c.position++
-
-	if c.position >= len(c.cache) {
-		return &EmptyValue{}
-	}
-
-	return c.cache[c.position]
-}
-
-// nextReverse advances the cursor backwards returning the next value
-func (c *walCursor) nextReverse() Value {
-	c.position--
-
-	if c.position < 0 {
-		return &EmptyValue{}
-	}
-
-	return c.cache[c.position]
-}
-
-// deleteData holds the information for a delete entry
-type deleteData struct {
-	// MeasurementName will be empty for deletes that are only against series
-	MeasurementName string
-	Keys            []string
-}
-
-// idFromFileName parses the segment file ID from its name
-func idFromFileName(name string) (int, error) {
-	parts := strings.Split(filepath.Base(name), ".")
-	if len(parts) != 2 {
-		return 0, fmt.Errorf("file %s has wrong name format to have an id", name)
-	}
-
-	id, err := strconv.ParseUint(parts[0][1:], 10, 32)
-
-	return int(id), err
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/engine/tsm1/wal_test.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/engine/tsm1/wal_test.go
deleted file mode 100644
index f854a0e62..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/engine/tsm1/wal_test.go
+++ /dev/null
@@ -1,553 +0,0 @@
-package tsm1_test
-
-import (
-	"io/ioutil"
-	"math/rand"
-	"os"
-	"reflect"
-	"sort"
-	"strconv"
-	"sync"
-	"testing"
-	"testing/quick"
-	"time"
-
-	"github.com/influxdb/influxdb/influxql"
-	"github.com/influxdb/influxdb/models"
-	"github.com/influxdb/influxdb/tsdb"
-	"github.com/influxdb/influxdb/tsdb/engine/tsm1"
-)
-
-func TestLog_TestWriteQueryOpen(t *testing.T) {
-	w := NewLog()
-	defer w.Close()
-
-	// Mock call to the index.
-	var vals map[string]tsm1.Values
-	var fields map[string]*tsdb.MeasurementFields
-	var series []*tsdb.SeriesCreate
-	w.IndexWriter.WriteFn = func(valuesByKey map[string]tsm1.Values, measurementFieldsToSave map[string]*tsdb.MeasurementFields, seriesToCreate []*tsdb.SeriesCreate) error {
-		vals = valuesByKey
-		fields = measurementFieldsToSave
-		series = seriesToCreate
-		return nil
-	}
-
-	if err := w.Open(); err != nil {
-		t.Fatalf("error opening: %s", err.Error())
-	}
-
-	p1 := parsePoint("cpu,host=A value=1.1 1000000000")
-	p2 := parsePoint("cpu,host=B value=1.2 1000000000")
-	p3 := parsePoint("cpu,host=A value=2.1 2000000000")
-	p4 := parsePoint("cpu,host=B value=2.2 2000000000")
-	fieldsToWrite := map[string]*tsdb.MeasurementFields{"foo": {Fields: map[string]*tsdb.Field{"bar": {Name: "value"}}}}
-	seriesToWrite := []*tsdb.SeriesCreate{{Measurement: "asdf"}}
-
-	if err := w.WritePoints([]models.Point{p1, p2}, fieldsToWrite, seriesToWrite); err != nil {
-		t.Fatalf("failed to write points: %s", err.Error())
-	}
-
-	fieldNames := []string{"value"}
-	var codec *tsdb.FieldCodec
-
-	c := w.Cursor("cpu,host=A", fieldNames, codec, true)
-	k, v := c.Next()
-	if k != p1.UnixNano() {
-		t.Fatalf("p1 time wrong:\n\texp:%d\n\tgot:%d\n", p1.UnixNano(), k)
-	}
-	if 1.1 != v {
-		t.Fatal("p1 data not equal")
-	}
-	c = w.Cursor("cpu,host=B", fieldNames, codec, true)
-	k, v = c.Next()
-	if k != p2.UnixNano() {
-		t.Fatalf("p2 time wrong:\n\texp:%d\n\tgot:%d\n", p2.UnixNano(), k)
-	}
-	if 1.2 != v {
-		t.Fatal("p2 data not equal")
-	}
-
-	k, v = c.Next()
-	if k != tsdb.EOF {
-		t.Fatal("expected EOF", k, v)
-	}
-
-	// ensure we can do another write to the wal and get stuff
-	if err := w.WritePoints([]models.Point{p3}, nil, nil); err != nil {
-		t.Fatalf("failed to write: %s", err.Error())
-	}
-
-	c = w.Cursor("cpu,host=A", fieldNames, codec, true)
-	k, v = c.Next()
-	if k != p1.UnixNano() {
-		t.Fatalf("p1 time wrong:\n\texp:%d\n\tgot:%d\n", p1.UnixNano(), k)
-	}
-	if 1.1 != v {
-		t.Fatal("p1 data not equal")
-	}
-	k, v = c.Next()
-	if k != p3.UnixNano() {
-		t.Fatalf("p3 time wrong:\n\texp:%d\n\tgot:%d\n", p3.UnixNano(), k)
-	}
-	if 2.1 != v {
-		t.Fatal("p3 data not equal")
-	}
-
-	// ensure we can seek
-	k, v = c.SeekTo(2000000000)
-	if k != p3.UnixNano() {
-		t.Fatalf("p3 time wrong:\n\texp:%d\n\tgot:%d\n", p3.UnixNano(), k)
-	}
-	if 2.1 != v {
-		t.Fatal("p3 data not equal")
-	}
-	k, v = c.Next()
-	if k != tsdb.EOF {
-		t.Fatal("expected EOF")
-	}
-
-	// ensure we close and after open it flushes to the index
-	if err := w.Log.Close(); err != nil {
-		t.Fatalf("failed to close: %s", err.Error())
-	}
-
-	if err := w.Open(); err != nil {
-		t.Fatalf("failed to open: %s", err.Error())
-	}
-
-	if len(vals[tsm1.SeriesFieldKey("cpu,host=A", "value")]) != 2 {
-		t.Fatal("expected host A values to flush to index on open")
-	}
-
-	if len(vals[tsm1.SeriesFieldKey("cpu,host=B", "value")]) != 1 {
-		t.Fatal("expected host B values to flush to index on open")
-	}
-
-	if err := w.WritePoints([]models.Point{p4}, nil, nil); err != nil {
-		t.Fatalf("failed to write: %s", err.Error())
-	}
-	c = w.Cursor("cpu,host=B", fieldNames, codec, true)
-	k, v = c.Next()
-	if k != p4.UnixNano() {
-		t.Fatalf("p4 time wrong:\n\texp:%d\n\tgot:%d\n", p4.UnixNano(), k)
-	}
-	if 2.2 != v {
-		t.Fatal("p4 data not equal")
-	}
-
-	if !reflect.DeepEqual(fields, fieldsToWrite) {
-		t.Fatal("fields not flushed")
-	}
-
-	if !reflect.DeepEqual(series, seriesToWrite) {
-		t.Fatal("series not flushed")
-	}
-}
-
-// Tests that concurrent flushes and writes do not trigger race conditions
-func TestLog_WritePoints_FlushConcurrent(t *testing.T) {
-	w := NewLog()
-	defer w.Close()
-	w.FlushMemorySizeThreshold = 1000
-	total := 1000
-
-	w.IndexWriter.WriteFn = func(valuesByKey map[string]tsm1.Values, measurementFieldsToSave map[string]*tsdb.MeasurementFields, seriesToCreate []*tsdb.SeriesCreate) error {
-		return nil
-	}
-
-	if err := w.Open(); err != nil {
-		t.Fatalf("error opening: %s", err.Error())
-	}
-
-	done := make(chan struct{})
-	var wg sync.WaitGroup
-	wg.Add(1)
-	go func() {
-		defer wg.Done()
-		for {
-			select {
-			case <-done:
-				return
-			default:
-			}
-
-			// Force an idle flush
-			if err := w.Flush(); err != nil {
-				t.Fatalf("failed to run full compaction: %v", err)
-			}
-			// Allow some time so memory flush can occur due to writes
-			time.Sleep(10 * time.Millisecond)
-		}
-	}()
-
-	wg.Add(1)
-	go func() {
-		defer wg.Done()
-		i := 0
-		for {
-			if i > total {
-				return
-			}
-			select {
-			case <-done:
-				return
-			default:
-			}
-
-			pt := models.MustNewPoint("cpu",
-				map[string]string{"host": "A"},
-				map[string]interface{}{"value": i},
-				time.Unix(int64(i), 0),
-			)
-
-			if err := w.WritePoints([]models.Point{pt}, nil, nil); err != nil {
-				t.Fatalf("failed to write points: %s", err.Error())
-			}
-			i++
-		}
-	}()
-
-	// Let the goroutines run for a second
-	select {
-	case <-time.After(1 * time.Second):
-		close(done)
-	}
-
-	// Wait for them to exit
-	wg.Wait()
-}
-
-// Tests that concurrent writes when the WAL closes do not cause race conditions.
-func TestLog_WritePoints_CloseConcurrent(t *testing.T) {
-	w := NewLog()
-	defer w.Close()
-	w.FlushMemorySizeThreshold = 1000
-	total := 1000
-
-	w.IndexWriter.WriteFn = func(valuesByKey map[string]tsm1.Values, measurementFieldsToSave map[string]*tsdb.MeasurementFields, seriesToCreate []*tsdb.SeriesCreate) error {
-		return nil
-	}
-
-	if err := w.Open(); err != nil {
-		t.Fatalf("error opening: %s", err.Error())
-	}
-
-	done := make(chan struct{})
-	var wg sync.WaitGroup
-	wg.Add(1)
-	go func() {
-		defer wg.Done()
-		i := 0
-		for {
-			if i > total {
-				return
-			}
-			select {
-			case <-done:
-				return
-			default:
-			}
-
-			pt := models.MustNewPoint("cpu",
-				map[string]string{"host": "A"},
-				map[string]interface{}{"value": i},
-				time.Unix(int64(i), 0),
-			)
-
-			if err := w.WritePoints([]models.Point{pt}, nil, nil); err != nil && err != tsm1.ErrWALClosed {
-				t.Fatalf("failed to write points: %s", err.Error())
-			}
-			i++
-		}
-	}()
-
-	time.Sleep(10 * time.Millisecond)
-	if err := w.Close(); err != nil {
-		t.Fatalf("failed to close WAL: %v", err)
-	}
-
-	// Let the goroutines run for a second
-	select {
-	case <-time.After(1 * time.Second):
-		close(done)
-	}
-
-	// Wait for them to exit
-	wg.Wait()
-}
-
-// Ensure the log can handle random data.
-func TestLog_Quick(t *testing.T) {
-	if testing.Short() {
-		t.Skip("short mode")
-	}
-
-	quick.Check(func(pointsSlice PointsSlice) bool {
-		l := NewLog()
-		l.FlushMemorySizeThreshold = 4096 // low threshold
-		defer l.Close()
-
-		var mu sync.Mutex
-		index := make(map[string]tsm1.Values)
-
-		// Ignore flush to the index.
-		l.IndexWriter.WriteFn = func(valuesByKey map[string]tsm1.Values, measurementFieldsToSave map[string]*tsdb.MeasurementFields, seriesToCreate []*tsdb.SeriesCreate) error {
-			mu.Lock()
-			defer mu.Unlock()
-			for key, values := range valuesByKey {
-				index[key] = append(index[key], values...)
-			}
-
-			// Simulate slow index writes.
-			time.Sleep(100 * time.Millisecond)
-
-			return nil
-		}
-
-		// Open the log.
-		if err := l.Open(); err != nil {
-			t.Fatal(err)
-		}
-
-		// Generate fields and series to create.
-		fieldsToWrite := pointsSlice.MeasurementFields()
-		seriesToWrite := pointsSlice.SeriesCreate()
-
-		// Write each set of points separately.
-		for _, points := range pointsSlice {
-			if err := l.WritePoints(points.Encode(), fieldsToWrite, seriesToWrite); err != nil {
-				t.Fatal(err)
-			}
-		}
-
-		// Iterate over each series and read out cursor.
-		for _, series := range pointsSlice.Series() {
-			mu.Lock()
-			if got := mergeIndexCursor(series, l, index); !reflect.DeepEqual(got, series.Values) {
-				t.Fatalf("mismatch:\n\ngot=%v\n\nexp=%v\n\n", len(got), len(series.Values))
-			}
-			mu.Unlock()
-		}
-
-		// Reopen log.
-		if err := l.Reopen(); err != nil {
-			t.Fatal(err)
-		}
-
-		// Iterate over each series and read out cursor again.
-		for _, series := range pointsSlice.Series() {
-			mu.Lock()
-			if got := mergeIndexCursor(series, l, index); !reflect.DeepEqual(got, series.Values) {
-				t.Fatalf("mismatch(reopen):\n\ngot=%v\n\nexp=%v\n\n", len(got), len(series.Values))
-			}
-			mu.Unlock()
-		}
-
-		return true
-	}, &quick.Config{
-		MaxCount: 10,
-		Values: func(values []reflect.Value, rand *rand.Rand) {
-			values[0] = reflect.ValueOf(GeneratePointsSlice(rand))
-		},
-	})
-}
-
-func mergeIndexCursor(series *Series, l *Log, index map[string]tsm1.Values) tsm1.Values {
-	c := l.Cursor(series.Name, series.FieldsSlice(), &tsdb.FieldCodec{}, true)
-	a := ReadAllCursor(c)
-	a = append(index[series.Name+"#!~#value"], a...)
-	a = DedupeValues(a)
-	sort.Sort(a)
-	return a
-}
-
-type Log struct {
-	*tsm1.Log
-	IndexWriter IndexWriter
-}
-
-// NewLog returns a new instance of Log
-func NewLog() *Log {
-	path, err := ioutil.TempDir("", "tsm1-test")
-	if err != nil {
-		panic(err)
-	}
-
-	l := &Log{Log: tsm1.NewLog(path)}
-	l.Log.IndexWriter = &l.IndexWriter
-	l.LoggingEnabled = true
-
-	return l
-}
-
-// Close closes the log and removes the underlying temporary path.
-func (l *Log) Close() error {
-	defer os.RemoveAll(l.Path())
-	return l.Log.Close()
-}
-
-// Reopen closes and reopens the log.
-func (l *Log) Reopen() error {
-	if err := l.Log.Close(); err != nil {
-		return err
-	}
-	if err := l.Log.Open(); err != nil {
-		return err
-	}
-	return nil
-}
-
-// IndexWriter represents a mock implementation of tsm1.IndexWriter.
-type IndexWriter struct {
-	WriteFn                 func(valuesByKey map[string]tsm1.Values, measurementFieldsToSave map[string]*tsdb.MeasurementFields, seriesToCreate []*tsdb.SeriesCreate) error
-	MarkDeletesFn           func(keys []string)
-	MarkMeasurementDeleteFn func(name string)
-}
-
-func (w *IndexWriter) Write(valuesByKey map[string]tsm1.Values, measurementFieldsToSave map[string]*tsdb.MeasurementFields, seriesToCreate []*tsdb.SeriesCreate) error {
-	return w.WriteFn(valuesByKey, measurementFieldsToSave, seriesToCreate)
-}
-
-func (w *IndexWriter) MarkDeletes(keys []string) {
-	w.MarkDeletesFn(keys)
-}
-
-func (w *IndexWriter) MarkMeasurementDelete(name string) {
-	w.MarkMeasurementDeleteFn(name)
-}
-
-// PointsSlice represents a slice of point slices.
-type PointsSlice []Points
-
-// GeneratePointsSlice randomly generates a slice of slice of points.
-func GeneratePointsSlice(rand *rand.Rand) PointsSlice {
-	var pointsSlice PointsSlice
-	for i, pointsN := 0, rand.Intn(100); i < pointsN; i++ {
-		var points Points
-		for j, pointN := 0, rand.Intn(1000); j < pointN; j++ {
-			points = append(points, Point{
-				Name:   strconv.Itoa(rand.Intn(10)),
-				Fields: models.Fields{"value": rand.Int63n(100000)},
-				Time:   time.Unix(0, rand.Int63n(int64(24*time.Hour))).UTC(),
-			})
-		}
-		pointsSlice = append(pointsSlice, points)
-	}
-	return pointsSlice
-}
-
-// MeasurementFields returns a set of fields used across all points.
-func (a PointsSlice) MeasurementFields() map[string]*tsdb.MeasurementFields {
-	mfs := map[string]*tsdb.MeasurementFields{}
-	for _, points := range a {
-		for _, p := range points {
-			pp := p.Encode()
-
-			// Create measurement field, if not exists.
-			mf := mfs[string(pp.Key())]
-			if mf == nil {
-				mf = &tsdb.MeasurementFields{Fields: make(map[string]*tsdb.Field)}
-				mfs[string(pp.Key())] = mf
-			}
-
-			// Add all fields on the point.
-			for name, value := range p.Fields {
-				mf.CreateFieldIfNotExists(name, influxql.InspectDataType(value), false)
-			}
-		}
-	}
-	return mfs
-}
-
-// SeriesCreate returns a list of series to create across all points.
-func (a PointsSlice) SeriesCreate() []*tsdb.SeriesCreate {
-	// Create unique set of series.
-	m := map[string]*tsdb.SeriesCreate{}
-	for _, points := range a {
-		for _, p := range points {
-			if pp := p.Encode(); m[string(pp.Key())] == nil {
-				m[string(pp.Key())] = &tsdb.SeriesCreate{Measurement: pp.Name(), Series: tsdb.NewSeries(string(string(pp.Key())), pp.Tags())}
-			}
-		}
-	}
-
-	// Convert to slice.
-	slice := make([]*tsdb.SeriesCreate, 0, len(m))
-	for _, v := range m {
-		slice = append(slice, v)
-	}
-	return slice
-}
-
-// Series returns a set of per-series data.
-func (a PointsSlice) Series() map[string]*Series {
-	m := map[string]*Series{}
-	for _, points := range a {
-		for _, p := range points {
-			pp := p.Encode()
-
-			// Create series if not exists.
-			s := m[string(pp.Key())]
-			if s == nil {
-				s = &Series{
-					Name:   string(pp.Key()),
-					Fields: make(map[string]struct{}),
-				}
-				m[string(pp.Key())] = s
-			}
-
-			// Append point data.
-			s.Values = append(s.Values, tsm1.NewValue(p.Time, p.Fields["value"]))
-
-			// Add fields.
-			for k := range p.Fields {
-				s.Fields[k] = struct{}{}
-			}
-		}
-	}
-
-	// Deduplicate & sort items in each series.
-	for _, s := range m {
-		s.Values = DedupeValues(s.Values)
-		sort.Sort(s.Values)
-	}
-
-	return m
-}
-
-// Points represents a slice of points.
-type Points []Point
-
-func (a Points) Encode() []models.Point {
-	other := make([]models.Point, len(a))
-	for i := range a {
-		other[i] = a[i].Encode()
-	}
-	return other
-}
-
-// Point represents a test point
-type Point struct {
-	Name   string
-	Tags   models.Tags
-	Fields models.Fields
-	Time   time.Time
-}
-
-func (p *Point) Encode() models.Point { return models.MustNewPoint(p.Name, p.Tags, p.Fields, p.Time) }
-
-type Series struct {
-	Name   string
-	Fields map[string]struct{}
-	Values tsm1.Values
-}
-
-// FieldsSlice returns a list of field names.
-func (s *Series) FieldsSlice() []string {
-	a := make([]string, 0, len(s.Fields))
-	for k := range s.Fields {
-		a = append(a, k)
-	}
-	return a
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/engine/tsm1/write_lock.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/engine/tsm1/write_lock.go
deleted file mode 100644
index 4913cf007..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/engine/tsm1/write_lock.go
+++ /dev/null
@@ -1,96 +0,0 @@
-package tsm1
-
-import (
-	"reflect"
-	"sync"
-)
-
-// writeLock is a lock that enables locking of ranges between a
-// min and max value. We use this so that flushes from the WAL
-// can occur concurrently along with compactions.
-type WriteLock struct {
-	rangesLock sync.Mutex
-	ranges     []*rangeLock
-}
-
-// LockRange will ensure an exclusive lock between the min and
-// max values inclusive. Any subsequent calls that have an
-// an overlapping range will have to wait until the previous
-// lock is released. A corresponding call to UnlockRange should
-// be deferred.
-func (w *WriteLock) LockRange(min, max int64) {
-	r := &rangeLock{min: min, max: max}
-	for {
-		ranges := w.currentlyLockedRanges()
-
-		// ensure there are no currently locked ranges that overlap
-		for _, rr := range ranges {
-			if rr.overlaps(r) {
-				// wait until it gets unlocked
-				rr.mu.Lock()
-				// release the lock so the object can get GC'd
-				rr.mu.Unlock()
-			}
-		}
-
-		// ensure that no one else got a lock on the range while we
-		// were waiting
-		w.rangesLock.Lock()
-		if len(w.ranges) == 0 || reflect.DeepEqual(ranges, w.ranges) {
-			// and lock the range
-			r.mu.Lock()
-
-			// now that we know the range is free, add it to the locks
-			w.ranges = append(w.ranges, r)
-			w.rangesLock.Unlock()
-			return
-		}
-
-		// try again
-		w.rangesLock.Unlock()
-	}
-}
-
-// UnlockRange will release a previously locked range.
-func (w *WriteLock) UnlockRange(min, max int64) {
-	w.rangesLock.Lock()
-	defer w.rangesLock.Unlock()
-
-	// take the range out of the slice and unlock it
-	var a []*rangeLock
-	for _, r := range w.ranges {
-		if r.min == min && r.max == max {
-			r.mu.Unlock()
-			continue
-		}
-		a = append(a, r)
-	}
-	w.ranges = a
-}
-
-func (w *WriteLock) currentlyLockedRanges() []*rangeLock {
-	w.rangesLock.Lock()
-	defer w.rangesLock.Unlock()
-	a := make([]*rangeLock, len(w.ranges))
-	copy(a, w.ranges)
-	return a
-}
-
-type rangeLock struct {
-	mu  sync.Mutex
-	min int64
-	max int64
-}
-
-func (r *rangeLock) overlaps(l *rangeLock) bool {
-	if l.min >= r.min && l.min <= r.max {
-		return true
-	} else if l.max >= r.min && l.max <= r.max {
-		return true
-	} else if l.min <= r.min && l.max >= r.max {
-		return true
-	} else if l.min >= r.min && l.max <= r.max {
-		return true
-	}
-	return false
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/engine/tsm1/write_lock_test.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/engine/tsm1/write_lock_test.go
deleted file mode 100644
index 30178b8fc..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/engine/tsm1/write_lock_test.go
+++ /dev/null
@@ -1,166 +0,0 @@
-package tsm1_test
-
-import (
-	"sync"
-	"testing"
-	"testing/quick"
-	"time"
-
-	"github.com/influxdb/influxdb/tsdb/engine/tsm1"
-)
-
-func TestWriteLock_FullCover(t *testing.T) {
-	w := &tsm1.WriteLock{}
-	w.LockRange(2, 10)
-
-	lock := make(chan bool)
-	timeout := time.NewTimer(10 * time.Millisecond)
-	go func() {
-		w.LockRange(1, 11)
-		lock <- true
-	}()
-	select {
-	case <-lock:
-		t.Fatal("able to get lock when we shouldn't")
-	case <-timeout.C:
-		// we're all good
-	}
-}
-
-func TestWriteLock_RightIntersect(t *testing.T) {
-	w := &tsm1.WriteLock{}
-	w.LockRange(2, 10)
-
-	lock := make(chan bool)
-	timeout := time.NewTimer(10 * time.Millisecond)
-	go func() {
-		w.LockRange(5, 15)
-		lock <- true
-	}()
-	select {
-	case <-lock:
-		t.Fatal("able to get lock when we shouldn't")
-	case <-timeout.C:
-		// we're all good
-	}
-}
-
-func TestWriteLock_LeftIntersect(t *testing.T) {
-	w := &tsm1.WriteLock{}
-	w.LockRange(1, 4)
-
-	lock := make(chan bool)
-	timeout := time.NewTimer(10 * time.Millisecond)
-	go func() {
-		w.LockRange(1, 11)
-		lock <- true
-	}()
-	select {
-	case <-lock:
-		t.Fatal("able to get lock when we shouldn't")
-	case <-timeout.C:
-		// we're all good
-	}
-}
-
-func TestWriteLock_Inside(t *testing.T) {
-	w := &tsm1.WriteLock{}
-	w.LockRange(4, 8)
-
-	lock := make(chan bool)
-	timeout := time.NewTimer(10 * time.Millisecond)
-	go func() {
-		w.LockRange(1, 11)
-		lock <- true
-	}()
-	select {
-	case <-lock:
-		t.Fatal("able to get lock when we shouldn't")
-	case <-timeout.C:
-		// we're all good
-	}
-}
-
-func TestWriteLock_Same(t *testing.T) {
-	w := &tsm1.WriteLock{}
-	w.LockRange(2, 10)
-
-	lock := make(chan bool)
-	timeout := time.NewTimer(10 * time.Millisecond)
-	go func() {
-		w.LockRange(2, 10)
-		lock <- true
-	}()
-	select {
-	case <-lock:
-		t.Fatal("able to get lock when we shouldn't")
-	case <-timeout.C:
-		// we're all good
-	}
-}
-
-// func TestWriteLock_FreeRangeWithContentionElsewhere(t *testing.T) {
-// 	w := &tsm1.WriteLock{}
-// 	w.LockRange(2, 10)
-
-// 	lock := make(chan bool)
-// 	freeRange := make(chan bool)
-// 	timeout := time.NewTimer(10 * time.Millisecond)
-// 	var wg sync.WaitGroup
-
-// 	wg.Add(1)
-// 	go func() {
-// 		wg.Done()
-// 		w.LockRange(4, 12)
-// 		lock <- true
-// 	}()
-
-// 	// make sure the other go func has gotten to the point of requesting the lock
-// 	wg.Wait()
-// 	go func() {
-// 		w.LockRange(15, 23)
-// 		freeRange <- true
-// 	}()
-// 	select {
-// 	case <-lock:
-// 		t.Fatal("able to get lock when we shouldn't")
-// 	case <-timeout.C:
-// 		t.Fatal("unable to get lock of free range when contention exists elsewhere")
-// 	case <-freeRange:
-// 		// we're all good
-// 	}
-// }
-
-func TestWriteLock_Quick(t *testing.T) {
-	if testing.Short() {
-		t.Skip("short mode")
-	}
-
-	quick.Check(func(extents []struct{ Min, Max uint64 }) bool {
-		var wg sync.WaitGroup
-		var mu tsm1.WriteLock
-		for _, extent := range extents {
-			// Limit range.
-			extent.Min %= 10
-			extent.Max %= 10
-
-			// Reverse if out of order.
-			if extent.Min > extent.Max {
-				extent.Min, extent.Max = extent.Max, extent.Min
-			}
-
-			// Lock, wait and unlock in a separate goroutine.
-			wg.Add(1)
-			go func(min, max int64) {
-				defer wg.Done()
-				mu.LockRange(min, max)
-				time.Sleep(1 * time.Millisecond)
-				mu.UnlockRange(min, max)
-			}(int64(extent.Min), int64(extent.Max))
-		}
-
-		// All locks should return.
-		wg.Wait()
-		return true
-	}, nil)
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/engine/wal/wal.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/engine/wal/wal.go
deleted file mode 100644
index 8e98207f7..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/engine/wal/wal.go
+++ /dev/null
@@ -1,1612 +0,0 @@
-/*
-Package WAL implements a write ahead log optimized for write throughput
-that can be put in front of the database index.
-
-The WAL is broken into different partitions. The default number of
-partitions is 5. Each partition consists of a number of segment files.
-By default these files will get up to 2MB in size before a new segment
-file is opened. The files are numbered and start at 1. The number
-indicates the order in which the files should be read on startup to
-ensure data is recovered in the same order it was written.
-
-Partitions are flushed and compacted individually. One of the goals with
-having multiple partitions was to be able to flush only a portion of the
-WAL at a time.
-
-The WAL does not flush everything in a partition when it comes time. It will
-only flush series that are over a given threshold (32kb by default). The rest
-will be written into a new segment file so they can be flushed later. This
-is like a compaction in an LSM Tree.
-*/
-package wal
-
-import (
-	"bytes"
-	"encoding/binary"
-	"encoding/json"
-	"errors"
-	"expvar"
-	"fmt"
-	"io"
-	"log"
-	"os"
-	"path/filepath"
-	"sort"
-	"strconv"
-	"strings"
-	"sync"
-	"time"
-
-	"github.com/golang/snappy"
-	"github.com/influxdb/influxdb"
-	"github.com/influxdb/influxdb/models"
-	"github.com/influxdb/influxdb/tsdb"
-)
-
-const (
-	// DefaultSegmentSize of 2MB is the size at which segment files will be rolled over
-	DefaultSegmentSize = 2 * 1024 * 1024
-
-	// FileExtension is the file extension we expect for wal segments
-	FileExtension = "wal"
-
-	// MetaFileExtension is the file extension for the log files of new fields and measurements that get created
-	MetaFileExtension = "meta"
-
-	// CompactionExtension is the file extension we expect for compaction files
-	CompactionExtension = "CPT"
-
-	// MetaFlushInterval is the period after which any compressed meta data in the .meta file will get
-	// flushed to the index
-	MetaFlushInterval = 10 * time.Minute
-
-	// FailWriteMemoryThreshold will start returning errors on writes if the memory gets more
-	// than this multiple above the maximum threshold. This is set to 5 because previously
-	// the memory threshold was for 5 partitions, but when this was introduced the partition
-	// count was reduced to 1 so we know that it can handle at least this much extra memory
-	FailWriteMemoryThreshold = 5
-
-	// defaultFlushCheckInterval is how often flushes are triggered automatically by the flush criteria
-	defaultFlushCheckInterval = time.Second
-)
-
-// Statistics maintained by the WAL
-const (
-	statPointsWriteReq = "pointsWriteReq"
-	statPointsWrite    = "pointsWrite"
-	statFlush          = "flush"
-	statAutoFlush      = "autoFlush"
-	statIdleFlush      = "idleFlush"
-	statMetadataFlush  = "metaFlush"
-	statThresholdFlush = "thresholdFlush"
-	statMemoryFlush    = "memFlush"
-	statSeriesFlushed  = "seriesFlush"
-	statPointsFlushed  = "pointsFlush"
-	statFlushDuration  = "flushDuration"
-	statWriteFail      = "writeFail"
-	statMemorySize     = "memSize"
-)
-
-// flushType indiciates why a flush and compaction are being run so the partition can
-// do the appropriate type of compaction
-type flushType int
-
-const (
-	// noFlush indicates that no flush or compaction are necesssary at this time
-	noFlush flushType = iota
-	// memoryFlush indicates that we should look for the series using the most
-	// memory to flush out and compact all others
-	memoryFlush
-	// idleFlush indicates that we should flush all series in the parition,
-	// delete all segment files and hold off on opening a new one
-	idleFlush
-	// thresholdFlush indicates that we should flush all series over the ReadySize
-	// and compact all other series
-	thresholdFlush
-	// deleteFlush indicates that we're flushing because series need to be removed from the WAL
-	deleteFlush
-)
-
-var (
-	// ErrCompactionRunning to return if we attempt to run a compaction on a partition that is currently running one
-	ErrCompactionRunning = errors.New("compaction running")
-
-	// ErrMemoryCompactionDone gets returned if we called to flushAndCompact to free up memory
-	// but a compaction has already been done to do so
-	ErrMemoryCompactionDone = errors.New("compaction already run to free up memory")
-
-	// CompactSequence is the byte sequence within a segment file that has been compacted
-	// that indicates the start of a compaction marker
-	CompactSequence = []byte{0xFF, 0xFF}
-)
-
-type Log struct {
-	path string
-
-	flush              chan int    // signals a background flush on the given partition
-	flushLock          sync.Mutex  // serializes access to flushing to index
-	flushCheckTimer    *time.Timer // check this often to see if a background flush should happen
-	flushCheckInterval time.Duration
-
-	// These coordinate closing and waiting for running goroutines.
-	wg      sync.WaitGroup
-	closing chan struct{}
-
-	// LogOutput is the writer used by the logger.
-	LogOutput io.Writer
-	logger    *log.Logger
-
-	mu        sync.RWMutex
-	partition *Partition
-
-	// metaFile is the file that compressed metadata like series and fields are written to
-	metaFile *os.File
-
-	// FlushColdInterval is the period of time after which a partition will do a
-	// full flush and compaction if it has been cold for writes.
-	FlushColdInterval time.Duration
-
-	// SegmentSize is the file size at which a segment file will be rotated in a partition.
-	SegmentSize int64
-
-	// MaxSeriesSize controls when a partition should get flushed to index and compacted
-	// if any series in the partition has exceeded this size threshold
-	MaxSeriesSize int
-
-	// ReadySeriesSize is the minimum size a series of points must get to before getting flushed.
-	ReadySeriesSize int
-
-	// CompactionThreshold controls when a parition will be flushed. Once this
-	// percentage of series in a partition are ready, a flush and compaction will be triggered.
-	CompactionThreshold float64
-
-	// PartitionSizeThreshold specifies when a partition should be forced to be flushed.
-	PartitionSizeThreshold uint64
-
-	// Index is the database that series data gets flushed to once it gets compacted
-	// out of the WAL.
-	Index IndexWriter
-
-	// LoggingEnabled specifies if detailed logs should be output
-	LoggingEnabled bool
-
-	// expvar-based statistics
-	statMap *expvar.Map
-}
-
-// IndexWriter is an interface for the indexed database the WAL flushes data to
-type IndexWriter interface {
-	// time ascending points where each byte array is:
-	//   int64 time
-	//   data
-	WriteIndex(pointsByKey map[string][][]byte, measurementFieldsToSave map[string]*tsdb.MeasurementFields, seriesToCreate []*tsdb.SeriesCreate) error
-}
-
-func NewLog(path string) *Log {
-	// Configure expvar monitoring. It's OK to do this even if the service fails to open and
-	// should be done before any data could arrive for the service.
-	key := strings.Join([]string{"wal", path}, ":")
-	tags := map[string]string{"path": path}
-
-	return &Log{
-		path:  path,
-		flush: make(chan int, 1),
-
-		// these options should be overriden by any options in the config
-		LogOutput:              os.Stderr,
-		FlushColdInterval:      tsdb.DefaultFlushColdInterval,
-		SegmentSize:            DefaultSegmentSize,
-		MaxSeriesSize:          tsdb.DefaultMaxSeriesSize,
-		CompactionThreshold:    tsdb.DefaultCompactionThreshold,
-		PartitionSizeThreshold: tsdb.DefaultPartitionSizeThreshold,
-		ReadySeriesSize:        tsdb.DefaultReadySeriesSize,
-		flushCheckInterval:     defaultFlushCheckInterval,
-		logger:                 log.New(os.Stderr, "[wal] ", log.LstdFlags),
-		statMap:                influxdb.NewStatistics(key, "wal", tags),
-	}
-}
-
-// Open opens and initializes the Log. Will recover from previous unclosed shutdowns
-func (l *Log) Open() error {
-
-	if l.LoggingEnabled {
-		l.logger.Printf("WAL starting with %d ready series size, %0.2f compaction threshold, and %d partition size threshold\n", l.ReadySeriesSize, l.CompactionThreshold, l.PartitionSizeThreshold)
-		l.logger.Printf("WAL writing to %s\n", l.path)
-	}
-	if err := os.MkdirAll(l.path, 0777); err != nil {
-		return err
-	}
-
-	// open the metafile for writing
-	if err := l.nextMetaFile(); err != nil {
-		return err
-	}
-
-	// open the partition
-	p, err := NewPartition(uint8(1), l.path, l.SegmentSize, l.PartitionSizeThreshold, l.ReadySeriesSize, l.FlushColdInterval, l.Index, l.statMap)
-	if err != nil {
-		return err
-	}
-	p.log = l
-	l.partition = p
-	if err := l.openPartitionFile(); err != nil {
-		return err
-	}
-
-	l.flushCheckTimer = time.NewTimer(l.flushCheckInterval)
-
-	// Start background goroutines.
-	l.wg.Add(1)
-	l.closing = make(chan struct{})
-	go l.autoflusher(l.closing)
-
-	return nil
-}
-
-func (l *Log) DiskSize() (int64, error) {
-	l.mu.RLock()
-	defer l.mu.RUnlock()
-
-	stat, err := os.Stat(l.path)
-	if err != nil {
-		return 0, err
-	}
-	return stat.Size(), nil
-}
-
-// Cursor will return a cursor object to Seek and iterate with Next for the WAL cache for the given
-func (l *Log) Cursor(series string, fields []string, dec *tsdb.FieldCodec, ascending bool) tsdb.Cursor {
-	l.mu.RLock()
-	defer l.mu.RUnlock()
-	return l.partition.cursor(series, fields, dec, ascending)
-}
-
-func (l *Log) WritePoints(points []models.Point, fields map[string]*tsdb.MeasurementFields, series []*tsdb.SeriesCreate) error {
-	l.statMap.Add(statPointsWriteReq, 1)
-	l.statMap.Add(statPointsWrite, int64(len(points)))
-
-	// persist the series and fields if there are any
-	if err := l.writeSeriesAndFields(fields, series); err != nil {
-		l.logger.Println("error writing series and fields:", err.Error())
-		return err
-	}
-
-	// persist the raw point data
-	return l.partition.Write(points)
-}
-
-// Flush will force a flush on all paritions
-func (l *Log) Flush() error {
-	l.statMap.Add(statFlush, 1)
-	l.mu.RLock()
-	defer l.mu.RUnlock()
-
-	return l.partition.flushAndCompact(idleFlush)
-}
-
-// LoadMetadatIndex loads the new series and fields files into memory and flushes them to the BoltDB index. This function
-// should be called before making a call to Open()
-func (l *Log) LoadMetadataIndex(index *tsdb.DatabaseIndex, measurementFields map[string]*tsdb.MeasurementFields) error {
-	metaFiles, err := l.metadataFiles()
-	if err != nil {
-		return err
-	}
-
-	measurementFieldsToSave := make(map[string]*tsdb.MeasurementFields)
-	seriesToCreate := make([]*tsdb.SeriesCreate, 0)
-
-	// read all the metafiles off disk
-	for _, fn := range metaFiles {
-		a, err := l.readMetadataFile(fn)
-		if err != nil {
-			return err
-		}
-
-		// loop through the seriesAndFields and add them to the index and the collection to be written to the index
-		for _, sf := range a {
-			for k, mf := range sf.Fields {
-				measurementFieldsToSave[k] = mf
-
-				m := index.CreateMeasurementIndexIfNotExists(string(k))
-				for name, _ := range mf.Fields {
-					m.SetFieldName(name)
-				}
-				mf.Codec = tsdb.NewFieldCodec(mf.Fields)
-				measurementFields[m.Name] = mf
-			}
-
-			for _, sc := range sf.Series {
-				seriesToCreate = append(seriesToCreate, sc)
-
-				sc.Series.InitializeShards()
-				index.CreateSeriesIndexIfNotExists(tsdb.MeasurementFromSeriesKey(string(sc.Series.Key)), sc.Series)
-			}
-		}
-	}
-
-	if err := l.Index.WriteIndex(nil, measurementFieldsToSave, seriesToCreate); err != nil {
-		return err
-	}
-
-	// now remove all the old metafiles
-	for _, fn := range metaFiles {
-		if err := os.Remove(fn); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-// DeleteSeries will flush the metadata that is in the WAL to the index and remove
-// all series specified from the cache and the segment files in each partition. This
-// will block all writes while a compaction is done against all partitions. This function
-// is meant to be called by bz1 BEFORE it updates its own index, since the metadata
-// is flushed here first.
-func (l *Log) DeleteSeries(keys []string) error {
-	if err := l.flushMetadata(); err != nil {
-		return err
-	}
-
-	// we want to stop any writes from happening to ensure the data gets cleared
-	l.mu.Lock()
-	defer l.mu.Unlock()
-
-	return l.partition.deleteSeries(keys)
-}
-
-// readMetadataFile will read the entire contents of the meta file and return a slice of the
-// seriesAndFields objects that were written in. It ignores file errors since those can't be
-// recovered.
-func (l *Log) readMetadataFile(fileName string) ([]*seriesAndFields, error) {
-	f, err := os.OpenFile(fileName, os.O_RDWR, 0666)
-	if err != nil {
-		return nil, err
-	}
-
-	a := make([]*seriesAndFields, 0)
-
-	length := make([]byte, 8)
-	for {
-		// get the length of the compressed seriesAndFields blob
-		_, err := io.ReadFull(f, length)
-		if err == io.EOF {
-			break
-		} else if err != nil {
-			f.Close()
-			return nil, err
-		}
-
-		dataLength := btou64(length)
-		if dataLength == 0 {
-			break
-		}
-
-		// read in the compressed block and decod it
-		b := make([]byte, dataLength)
-
-		_, err = io.ReadFull(f, b)
-		if err == io.EOF {
-			break
-		} else if err != nil {
-			// print the error and move on since we can't recover the file
-			l.logger.Println("error reading length of metadata:", err.Error())
-			break
-		}
-
-		buf, err := snappy.Decode(nil, b)
-		if err != nil {
-			// print the error and move on since we can't recover the file
-			l.logger.Println("error reading compressed metadata info:", err.Error())
-			break
-		}
-
-		sf := &seriesAndFields{}
-		if err := json.Unmarshal(buf, sf); err != nil {
-			// print the error and move on since we can't recover the file
-			l.logger.Println("error unmarshaling json for new series and fields:", err.Error())
-			break
-		}
-
-		a = append(a, sf)
-	}
-
-	if err := f.Close(); err != nil {
-		return nil, err
-	}
-
-	return a, nil
-}
-
-// writeSeriesAndFields will write the compressed fields and series to the meta file. This file persists the data
-// in case the server gets shutdown before the WAL has a chance to flush everything to the cache. By default this
-// file is flushed on start when bz1 calls LoadMetaDataIndex
-func (l *Log) writeSeriesAndFields(fields map[string]*tsdb.MeasurementFields, series []*tsdb.SeriesCreate) error {
-	if len(fields) == 0 && len(series) == 0 {
-		return nil
-	}
-
-	sf := &seriesAndFields{Fields: fields, Series: series}
-	b, err := json.Marshal(sf)
-	if err != nil {
-		return err
-	}
-	cb := snappy.Encode(nil, b)
-
-	l.mu.Lock()
-	defer l.mu.Unlock()
-
-	if _, err := l.metaFile.Write(u64tob(uint64(len(cb)))); err != nil {
-		return err
-	}
-
-	if _, err := l.metaFile.Write(cb); err != nil {
-		return err
-	}
-
-	return l.metaFile.Sync()
-}
-
-// nextMetaFile will close the current file if there is one open and open a new file to log
-// metadata updates to. This function assumes that you've locked l.mu elsewhere.
-func (l *Log) nextMetaFile() error {
-	l.mu.Lock()
-	defer l.mu.Unlock()
-
-	if l.metaFile != nil {
-		if err := l.metaFile.Close(); err != nil {
-			return err
-		}
-	}
-
-	metaFiles, err := l.metadataFiles()
-	if err != nil {
-		return err
-	}
-
-	id := 0
-	if len(metaFiles) > 0 {
-		num := strings.Split(filepath.Base(metaFiles[len(metaFiles)-1]), ".")[0]
-		n, err := strconv.ParseInt(num, 10, 32)
-
-		if err != nil {
-			return err
-		}
-
-		id = int(n) + 1
-	}
-
-	nextFileName := filepath.Join(l.path, fmt.Sprintf("%06d.%s", id, MetaFileExtension))
-	l.metaFile, err = os.OpenFile(nextFileName, os.O_CREATE|os.O_RDWR, 0666)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-// metadataFiles returns the files in the WAL directory with the MetaFileExtension
-func (l *Log) metadataFiles() ([]string, error) {
-	path := filepath.Join(l.path, fmt.Sprintf("*.%s", MetaFileExtension))
-
-	a, err := filepath.Glob(path)
-	if err != nil {
-		return nil, err
-	}
-
-	sort.Strings(a)
-
-	return a, nil
-}
-
-// openPartitionFiles will open the partition and flush all segment files to the index
-func (l *Log) openPartitionFile() error {
-	// Recover from a partial compaction.
-	if err := l.partition.recoverCompactionFile(); err != nil {
-		return fmt.Errorf("recover compaction files: %s", err)
-	}
-
-	fileNames, err := l.partition.segmentFileNames()
-	if err != nil {
-		return err
-	}
-
-	if l.LoggingEnabled && len(fileNames) > 0 {
-		l.logger.Println("reading WAL files to flush to index")
-	}
-	for _, n := range fileNames {
-		entries, err := l.partition.readFile(n)
-		if err != nil {
-			return err
-		}
-
-		seriesToFlush := make(map[string][][]byte)
-		for _, e := range entries {
-			seriesToFlush[string(e.key)] = append(seriesToFlush[string(e.key)], MarshalEntry(e.timestamp, e.data))
-		}
-
-		if l.LoggingEnabled {
-			l.logger.Printf("writing %d series from WAL file %s to index\n", len(seriesToFlush), n)
-		}
-		if err := l.Index.WriteIndex(seriesToFlush, nil, nil); err != nil {
-			return err
-		}
-		if err := os.Remove(n); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-// Close will finish any flush that is currently in process and close file handles
-func (l *Log) Close() error {
-	// stop the autoflushing process so it doesn't try to kick another one off
-	l.mu.Lock()
-	if l.closing != nil {
-		close(l.closing)
-		l.closing = nil
-	}
-	l.mu.Unlock()
-
-	// Allow goroutines to finish running.
-	l.wg.Wait()
-
-	// Lock the remainder of the closing process.
-	l.mu.Lock()
-	defer l.mu.Unlock()
-
-	// close partition and metafile
-	if err := l.close(); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-// close all the open Log partitions and file handles
-func (l *Log) close() error {
-	if err := l.partition.Close(); err != nil {
-		// log and skip so we can close the other partitions
-		l.logger.Println("error closing partition:", err)
-	}
-
-	if err := l.metaFile.Close(); err != nil {
-		return err
-	}
-
-	l.metaFile = nil
-	return nil
-}
-
-// triggerAutoFlush will flush and compact any partitions that have hit the thresholds for compaction
-func (l *Log) triggerAutoFlush() {
-	l.statMap.Add(statAutoFlush, 1)
-	l.mu.RLock()
-	defer l.mu.RUnlock()
-
-	if f := l.partition.shouldFlush(); f != noFlush {
-		if err := l.partition.flushAndCompact(f); err != nil {
-			l.logger.Printf("error flushing partition: %s\n", err)
-		}
-	}
-}
-
-// autoflusher waits for notification of a flush and kicks it off in the background.
-// This method runs in a separate goroutine.
-func (l *Log) autoflusher(closing chan struct{}) {
-	defer l.wg.Done()
-
-	metaFlushTicker := time.NewTicker(MetaFlushInterval)
-
-	for {
-		// Wait for close or flush signal.
-		select {
-		case <-closing:
-			metaFlushTicker.Stop()
-			return
-		case <-l.flushCheckTimer.C:
-			l.triggerAutoFlush()
-			l.flushCheckTimer.Reset(l.flushCheckInterval)
-		case <-l.flush:
-			if err := l.Flush(); err != nil {
-				l.logger.Println("flush error:", err)
-			}
-		case <-metaFlushTicker.C:
-			if err := l.flushMetadata(); err != nil {
-				l.logger.Println("metadata flush error:", err)
-			}
-		}
-	}
-}
-
-// flushMetadata will write start a new metafile for writes to go through and then flush all
-// metadata from previous files to the index. After a sucessful write, the metadata files
-// will be removed. While the flush to index is happening we aren't blocked for new metadata writes.
-func (l *Log) flushMetadata() error {
-	l.statMap.Add(statMetadataFlush, 1)
-
-	// make sure there's actually something in the metadata file to flush
-	size, err := func() (int64, error) {
-		l.mu.Lock()
-		defer l.mu.Unlock()
-
-		if l.metaFile == nil {
-			return 0, nil
-		}
-		st, err := l.metaFile.Stat()
-		if err != nil {
-			return 0, err
-		}
-
-		return st.Size(), nil
-	}()
-	if err != nil {
-		return err
-	} else if size == 0 {
-		return nil
-	}
-
-	// we have data, get a list of the existing files and rotate to a new one, then flush
-	files, err := l.metadataFiles()
-	if err != nil {
-		return err
-	}
-
-	if err := l.nextMetaFile(); err != nil {
-		return err
-	}
-
-	measurements := make(map[string]*tsdb.MeasurementFields)
-	series := make([]*tsdb.SeriesCreate, 0)
-
-	// read all the measurement fields and series from the metafiles
-	for _, fn := range files {
-		a, err := l.readMetadataFile(fn)
-		if err != nil {
-			return err
-		}
-
-		for _, sf := range a {
-			for k, mf := range sf.Fields {
-				measurements[k] = mf
-			}
-
-			series = append(series, sf.Series...)
-		}
-	}
-
-	// Lock before flushing to ensure timing is not spent waiting for lock.
-	l.flushLock.Lock()
-	defer l.flushLock.Unlock()
-
-	startTime := time.Now()
-	if l.LoggingEnabled {
-		l.logger.Printf("Flushing %d measurements and %d series to index\n", len(measurements), len(series))
-	}
-	// write them to the index
-	if err := l.Index.WriteIndex(nil, measurements, series); err != nil {
-		return err
-	}
-	if l.LoggingEnabled {
-		l.logger.Println("Metadata flush took", time.Since(startTime))
-	}
-
-	// remove the old files now that we've persisted them elsewhere
-	for _, fn := range files {
-		if err := os.Remove(fn); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-// Partition is a set of files for a partition of the WAL. We use multiple partitions so when compactions occur
-// only a portion of the WAL must be flushed and compacted
-type Partition struct {
-	id                 uint8
-	path               string
-	mu                 sync.RWMutex
-	currentSegmentFile *os.File
-	currentSegmentSize int64
-	currentSegmentID   uint32
-	lastFileID         uint32
-	maxSegmentSize     int64
-	cache              map[string]*cacheEntry
-
-	index           IndexWriter
-	readySeriesSize int
-
-	// memorySize is the rough size in memory of all the cached series data
-	memorySize uint64
-
-	// sizeThreshold is the memory size after which writes start getting throttled
-	sizeThreshold uint64
-
-	// flushCache is a temporary placeholder to keep data while its being flushed
-	// and compacted. It's for cursors to combine the cache and this if a flush is occuring
-	flushCache        map[string][][]byte
-	compactionRunning bool
-
-	// flushColdInterval and lastWriteTime are used to determin if a partition should
-	// be flushed because it has been idle for writes.
-	flushColdInterval time.Duration
-	lastWriteTime     time.Time
-
-	log     *Log
-	statMap *expvar.Map
-
-	// Used for mocking OS calls
-	os struct {
-		OpenCompactionFile func(name string, flag int, perm os.FileMode) (file *os.File, err error)
-		OpenSegmentFile    func(name string, flag int, perm os.FileMode) (file *os.File, err error)
-		Rename             func(oldpath, newpath string) error
-	}
-
-	// buffers for reading and writing compressed blocks
-	// We constrain blocks so that we can read and write into a partition
-	// without allocating
-	buf       []byte
-	snappybuf []byte
-}
-
-const partitionBufLen = 16 << 10 // 16kb
-
-func NewPartition(id uint8, path string, segmentSize int64, sizeThreshold uint64, readySeriesSize int,
-	flushColdInterval time.Duration, index IndexWriter, statMap *expvar.Map) (*Partition, error) {
-
-	p := &Partition{
-		id:                id,
-		path:              path,
-		maxSegmentSize:    segmentSize,
-		sizeThreshold:     sizeThreshold,
-		lastWriteTime:     time.Now(),
-		cache:             make(map[string]*cacheEntry),
-		readySeriesSize:   readySeriesSize,
-		index:             index,
-		flushColdInterval: flushColdInterval,
-		statMap:           statMap,
-	}
-
-	p.os.OpenCompactionFile = os.OpenFile
-	p.os.OpenSegmentFile = os.OpenFile
-	p.os.Rename = os.Rename
-
-	p.buf = make([]byte, partitionBufLen)
-	p.snappybuf = make([]byte, snappy.MaxEncodedLen(partitionBufLen))
-
-	return p, nil
-}
-
-// Close resets the caches and closes the currently open segment file
-func (p *Partition) Close() error {
-	if p == nil {
-		return nil
-	}
-	p.mu.Lock()
-	defer p.mu.Unlock()
-
-	p.cache = nil
-	if p.currentSegmentFile == nil {
-		return nil
-	}
-	if err := p.currentSegmentFile.Close(); err != nil {
-		return err
-	}
-	p.currentSegmentFile = nil
-
-	return nil
-}
-
-// Write will write a compressed block of the points to the current segment file. If the segment
-// file is larger than the max size, it will roll over to a new file before performing the write.
-// This method will also add the points to the in memory cache
-func (p *Partition) Write(points []models.Point) error {
-
-	// Check if we should compact due to memory pressure and if we should fail the write if
-	// we're way too far over the threshold.
-	if shouldFailWrite, shouldCompact := func() (shouldFailWrite bool, shouldCompact bool) {
-		p.mu.RLock()
-		defer p.mu.RUnlock()
-		// Return an error if memory threshold has been reached.
-		if p.memorySize > p.sizeThreshold {
-			if !p.compactionRunning {
-				shouldCompact = true
-			} else if p.memorySize > p.sizeThreshold*FailWriteMemoryThreshold {
-				shouldFailWrite = true
-			}
-		}
-		return
-	}(); shouldCompact {
-		go p.flushAndCompact(memoryFlush)
-	} else if shouldFailWrite {
-		p.statMap.Add(statWriteFail, 1)
-		return fmt.Errorf("write throughput too high. backoff and retry")
-	}
-	p.mu.Lock()
-	defer p.mu.Unlock()
-
-	remainingPoints := points
-	for len(remainingPoints) > 0 {
-		block := bytes.NewBuffer(p.buf[:0])
-		var i int
-		for i = 0; i < len(remainingPoints); i++ {
-			pp := remainingPoints[i]
-			n := walEntryLength(pp)
-
-			// we might have a single point which is larger than the buffer
-			// If this is the case, then marshal it anyway and fall back to
-			// slice allocation. The appends below should handle it.
-			if block.Len()+n > partitionBufLen && i > 0 {
-				break
-			}
-			marshalWALEntry(block, pp.Key(), pp.UnixNano(), pp.Data())
-		}
-		marshaledPoints := remainingPoints[:i]
-		remainingPoints = remainingPoints[i:]
-		b := snappy.Encode(p.snappybuf[:], block.Bytes())
-
-		// rotate to a new file if we've gone over our limit
-		if p.currentSegmentFile == nil || p.currentSegmentSize > p.maxSegmentSize {
-			err := p.newSegmentFile()
-			if err != nil {
-				return err
-			}
-		}
-
-		if n, err := p.currentSegmentFile.Write(u64tob(uint64(len(b)))); err != nil {
-			return err
-		} else if n != 8 {
-			return fmt.Errorf("expected to write %d bytes but wrote %d", 8, n)
-		}
-
-		if n, err := p.currentSegmentFile.Write(b); err != nil {
-			return err
-		} else if n != len(b) {
-			return fmt.Errorf("expected to write %d bytes but wrote %d", len(b), n)
-		}
-
-		p.currentSegmentSize += int64(8 + len(b))
-		p.lastWriteTime = time.Now()
-
-		for _, pp := range marshaledPoints {
-			p.addToCache(pp.Key(), pp.Data(), pp.UnixNano())
-		}
-	}
-
-	return p.currentSegmentFile.Sync()
-}
-
-// newSegmentFile will close the current segment file and open a new one, updating bookkeeping info on the partition
-func (p *Partition) newSegmentFile() error {
-	p.currentSegmentID += 1
-	if p.currentSegmentFile != nil {
-		if err := p.currentSegmentFile.Close(); err != nil {
-			return err
-		}
-	}
-
-	fileName := p.fileNameForSegment(p.currentSegmentID)
-	ff, err := os.OpenFile(fileName, os.O_CREATE|os.O_RDWR, 0666)
-	if err != nil {
-		return err
-	}
-	p.currentSegmentSize = 0
-	p.currentSegmentFile = ff
-
-	return nil
-}
-
-// fileNameForSegment will return the full path and filename for a given segment ID
-func (p *Partition) fileNameForSegment(id uint32) string {
-	return filepath.Join(p.path, fmt.Sprintf("%02d.%06d.%s", p.id, id, FileExtension))
-}
-
-// compactionFileName is the name of the temporary file used for compaction
-func (p *Partition) compactionFileName() string {
-	return filepath.Join(p.path, fmt.Sprintf("%02d.%06d.%s", p.id, 1, CompactionExtension))
-}
-
-// fileIDFromName will return the segment ID from the file name
-func (p *Partition) fileIDFromName(name string) (uint32, error) {
-	parts := strings.Split(filepath.Base(name), ".")
-	if len(parts) != 3 {
-		return 0, fmt.Errorf("file name doesn't follow wal format: %s", name)
-	}
-	id, err := strconv.ParseUint(parts[1], 10, 32)
-	if err != nil {
-		return 0, err
-	}
-	return uint32(id), nil
-}
-
-// shouldFlush returns a flushType that indicates if a partition should be flushed and why. If the
-// partition hasn't received a write in a configurable amount of time it will flush or if the
-// size of the in memory cache is too large it will flush.
-func (p *Partition) shouldFlush() flushType {
-	p.mu.Lock()
-	defer p.mu.Unlock()
-
-	if len(p.cache) == 0 {
-		return noFlush
-	}
-
-	if p.memorySize > p.sizeThreshold {
-		return memoryFlush
-	}
-
-	if time.Since(p.lastWriteTime) > p.flushColdInterval {
-		return idleFlush
-	}
-
-	return noFlush
-}
-
-// prepareSeriesToFlush will empty the cache of series and return compaction information
-func (p *Partition) prepareSeriesToFlush(readySeriesSize int, flush flushType) (*compactionInfo, error) {
-	p.mu.Lock()
-	defer p.mu.Unlock()
-
-	// if there is either a compaction running or one just ran and relieved
-	// memory pressure, just return from here
-	if p.compactionRunning {
-		return nil, ErrCompactionRunning
-	} else if flush == memoryFlush && p.memorySize < p.sizeThreshold {
-		return nil, ErrMemoryCompactionDone
-	}
-	p.compactionRunning = true
-
-	var size int
-	for _, c := range p.cache {
-		size += c.size
-	}
-	seriesToFlush := make(map[string][][]byte)
-	for k, c := range p.cache {
-		seriesToFlush[k] = c.points
-	}
-	p.cache = make(map[string]*cacheEntry)
-
-	c := &compactionInfo{seriesToFlush: seriesToFlush, flushSize: size}
-
-	if flush == idleFlush {
-		// don't create a new segment file because this partition is idle
-		if p.currentSegmentFile != nil {
-			if err := p.currentSegmentFile.Close(); err != nil {
-				return nil, err
-			}
-		}
-		p.currentSegmentFile = nil
-		p.currentSegmentID += 1
-		p.currentSegmentSize = 0
-	} else {
-		// roll over a new segment file so we can compact all the old ones
-		if err := p.newSegmentFile(); err != nil {
-			return nil, err
-		}
-	}
-
-	p.flushCache = c.seriesToFlush
-	c.compactFilesLessThan = p.currentSegmentID
-	c.countCompacting = len(p.cache)
-
-	return c, nil
-}
-
-// flushAndCompact will flush any series that are over their threshold and then read in all old segment files and
-// write the data that was not flushed to a new file
-func (p *Partition) flushAndCompact(flush flushType) error {
-	c, err := p.prepareSeriesToFlush(p.readySeriesSize, flush)
-
-	if err == ErrCompactionRunning || err == ErrMemoryCompactionDone {
-		return nil
-	} else if err != nil {
-		return err
-	} else if len(c.seriesToFlush) == 0 { // nothing to flush!
-		return nil
-	}
-
-	// Logging and stats.
-	ftype := "idle"
-	ftypeStat := statIdleFlush
-	if flush == thresholdFlush {
-		ftype = "threshold"
-		ftypeStat = statThresholdFlush
-	} else if flush == memoryFlush {
-		ftype = "memory"
-		ftypeStat = statMemoryFlush
-	}
-	pointCount := 0
-	for _, a := range c.seriesToFlush {
-		pointCount += len(a)
-	}
-	if p.log.LoggingEnabled {
-		p.log.logger.Printf("Flush due to %s. Flushing %d series with %d points and %d bytes from partition %d\n", ftype, len(c.seriesToFlush), pointCount, c.flushSize, p.id)
-	}
-	p.statMap.Add(ftypeStat, 1)
-	p.statMap.Add(statPointsFlushed, int64(pointCount))
-	p.statMap.Add(statSeriesFlushed, int64(len(c.seriesToFlush)))
-
-	startTime := time.Now()
-	// write the data to the index first
-	if err := p.index.WriteIndex(c.seriesToFlush, nil, nil); err != nil {
-		// if we can't write the index, we should just bring down the server hard
-		panic(fmt.Sprintf("error writing the wal to the index: %s", err.Error()))
-	}
-
-	writeDuration := time.Since(startTime)
-	p.statMap.AddFloat(statFlushDuration, writeDuration.Seconds())
-	if p.log.LoggingEnabled {
-		p.log.logger.Printf("write to index of partition %d took %s\n", p.id, writeDuration)
-	}
-
-	// clear the flush cache and reset the memory thresholds
-	p.mu.Lock()
-	p.flushCache = nil
-	p.memorySize -= uint64(c.flushSize)
-	p.mu.Unlock()
-	p.statMap.Add(statMemorySize, -int64(c.flushSize))
-
-	// ensure that we mark that compaction is no longer running
-	defer func() {
-		p.mu.Lock()
-		p.compactionRunning = false
-		p.mu.Unlock()
-	}()
-
-	return p.removeOldSegmentFiles(c)
-}
-
-// removeOldSegmentFiles will delete all files that have been flushed to the
-// index based on the information in the compaction info.
-func (p *Partition) removeOldSegmentFiles(c *compactionInfo) error {
-	// now compact all the old data
-	fileNames, err := p.segmentFileNames()
-	if err != nil {
-		return err
-	}
-
-	for _, n := range fileNames {
-		id, err := p.idFromFileName(n)
-		if err != nil {
-			return err
-		}
-
-		// only compact files that are older than the segment that became active when we started the flush
-		if id >= c.compactFilesLessThan {
-			break
-		}
-
-		if err := os.Remove(n); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-// recoverCompactionFile iterates over all compaction files in a directory and
-// cleans them and removes undeleted files.
-func (p *Partition) recoverCompactionFile() error {
-	path := p.compactionFileName()
-
-	// Open compaction file. Ignore if it doesn't exist.
-	f, err := p.os.OpenCompactionFile(path, os.O_RDWR, 0666)
-	if os.IsNotExist(err) {
-		return nil
-	} else if err != nil {
-		return err
-	}
-	defer f.Close()
-
-	// Iterate through all named blocks.
-	sf := newSegment(f, p.log.logger)
-	var hasData bool
-	for {
-		// Only read named blocks.
-		name, a, err := sf.readCompressedBlock()
-		if err != nil {
-			return fmt.Errorf("read name block: %s", err)
-		} else if name == "" && a == nil {
-			break // eof
-		} else if name == "" {
-			continue // skip unnamed blocks
-		}
-
-		// Read data for the named block.
-		if s, entries, err := sf.readCompressedBlock(); err != nil {
-			return fmt.Errorf("read data block: %s", err)
-		} else if s != "" {
-			return fmt.Errorf("unexpected double name block")
-		} else if entries == nil {
-			break // eof
-		}
-
-		// If data exists then ensure the underlying segment is deleted.
-		if err := os.Remove(name); err != nil && !os.IsNotExist(err) {
-			return fmt.Errorf("remove segment: filename=%s, err=%s", name, err)
-		}
-
-		// Flag the compaction file as having data and it should be renamed.
-		hasData = true
-	}
-	f.Close()
-
-	// If the compaction file did not have at least one named block written to
-	// it then it should removed. This check is performed to ensure a partial
-	// compaction file does not overwrite an original segment file.
-	if !hasData {
-		if err := os.Remove(path); err != nil {
-			return fmt.Errorf("remove compaction file: %s", err)
-		}
-		return nil
-	}
-
-	// Double check that we are not renaming the compaction file over an
-	// existing segment file. The segment file should be removed in the
-	// recovery process but this simply double checks that removal occurred.
-	newpath := p.fileNameForSegment(1)
-	if _, err := os.Stat(newpath); !os.IsNotExist(err) {
-		return fmt.Errorf("cannot rename compaction file, segment exists: filename=%s", newpath)
-	}
-
-	// Rename compaction file to the first segment file.
-	if err := p.os.Rename(path, newpath); err != nil {
-		return fmt.Errorf("rename compaction file: %s", err)
-	}
-
-	return nil
-}
-
-// readFile will read a segment file and marshal its entries into the cache
-func (p *Partition) readFile(path string) (entries []*entry, err error) {
-	f, err := os.OpenFile(path, os.O_CREATE|os.O_RDWR, 0666)
-	if err != nil {
-		return nil, err
-	}
-
-	sf := newSegment(f, p.log.logger)
-	for {
-		name, a, err := sf.readCompressedBlock()
-		if name != "" {
-			continue // skip name blocks
-		} else if err != nil {
-			f.Close()
-			return nil, err
-		} else if a == nil {
-			break
-		}
-
-		entries = append(entries, a...)
-	}
-
-	if err := f.Close(); err != nil {
-		return nil, err
-	}
-	return
-}
-
-// addToCache will marshal the entry and add it to the in memory cache. It will also mark if this key will need sorting later
-func (p *Partition) addToCache(key, data []byte, timestamp int64) {
-	// Generate in-memory cache entry of <timestamp,data>.
-	v := MarshalEntry(timestamp, data)
-	p.memorySize += uint64(len(v))
-	p.statMap.Add(statMemorySize, int64(len(v)))
-	keystr := string(key)
-
-	entry := p.cache[keystr]
-	if entry == nil {
-		entry = &cacheEntry{
-			points: [][]byte{v},
-			size:   len(v),
-		}
-		p.cache[keystr] = entry
-
-		return
-	}
-
-	// Determine if we'll need to sort the values for this key later
-	if !entry.isDirtySort { // don't bother if we already know it has to be sorted
-		entry.isDirtySort = bytes.Compare(entry.points[len(entry.points)-1][0:8], v[0:8]) != -1
-	}
-	entry.points = append(entry.points, v)
-	entry.size += len(v)
-}
-
-// cursor will combine the in memory cache and flush cache (if a flush is currently happening) to give a single ordered cursor for the key
-func (p *Partition) cursor(series string, fields []string, dec *tsdb.FieldCodec, ascending bool) *cursor {
-	p.mu.Lock()
-	defer p.mu.Unlock()
-
-	entry := p.cache[series]
-	if entry == nil {
-		entry = &cacheEntry{}
-	}
-
-	// if we're in the middle of a flush, combine the previous cache
-	// with this one for the cursor
-	if p.flushCache != nil {
-		if fc, ok := p.flushCache[series]; ok {
-			c := make([][]byte, len(fc), len(fc)+len(entry.points))
-			copy(c, fc)
-			c = append(c, entry.points...)
-
-			dedupe := tsdb.DedupeEntries(c)
-			return newCursor(dedupe, fields, dec, ascending)
-		}
-	}
-
-	if entry.isDirtySort {
-		entry.points = tsdb.DedupeEntries(entry.points)
-		entry.isDirtySort = false
-	}
-
-	// Build a copy so modifications to the partition don't change the result set
-	a := make([][]byte, len(entry.points))
-	copy(a, entry.points)
-
-	return newCursor(a, fields, dec, ascending)
-}
-
-// idFromFileName parses the segment file ID from its name
-func (p *Partition) idFromFileName(name string) (uint32, error) {
-	parts := strings.Split(filepath.Base(name), ".")
-	if len(parts) != 3 {
-		return 0, fmt.Errorf("file %s has wrong name format to be a segment file", name)
-	}
-
-	id, err := strconv.ParseUint(parts[1], 10, 32)
-
-	return uint32(id), err
-}
-
-// segmentFileNames returns all the segment files names for the partition
-func (p *Partition) segmentFileNames() ([]string, error) {
-	path := filepath.Join(p.path, fmt.Sprintf("*.%s", FileExtension))
-	return filepath.Glob(path)
-}
-
-// deleteSeries will perform a compaction on the partition, removing all data
-// from any of the series passed in.
-func (p *Partition) deleteSeries(keys []string) error {
-	p.mu.Lock()
-	for _, k := range keys {
-		delete(p.cache, k)
-	}
-	p.mu.Unlock()
-
-	return p.flushAndCompact(deleteFlush)
-}
-
-// compactionInfo is a data object with information about a compaction running
-// and the series that will be flushed to the index
-type compactionInfo struct {
-	seriesToFlush        map[string][][]byte
-	compactFilesLessThan uint32
-	flushSize            int
-	countCompacting      int
-}
-
-// segmentFile is a struct for reading in segment files from the WAL. Used on startup only while loading
-type segment struct {
-	f      *os.File
-	block  []byte
-	length []byte
-	size   int64
-	logger *log.Logger
-}
-
-func newSegment(f *os.File, l *log.Logger) *segment {
-	return &segment{
-		length: make([]byte, 8),
-		f:      f,
-		logger: l,
-	}
-}
-
-// readCompressedBlock will read the next compressed block from the file and marshal the entries.
-// if we've hit the end of the file or corruption the entry array will be nil
-func (s *segment) readCompressedBlock() (name string, entries []*entry, err error) {
-	blockSize := int64(0)
-
-	n, err := s.f.Read(s.length)
-	if err == io.EOF {
-		return "", nil, nil
-	} else if err != nil {
-		return "", nil, fmt.Errorf("read length: %s", err)
-	} else if n != len(s.length) {
-		// seek back before this length so we can start overwriting the file from here
-		s.logger.Println("unable to read the size of a data block from file:", s.f.Name())
-		s.f.Seek(-int64(n), 1)
-		return "", nil, nil
-	}
-	blockSize += int64(n)
-
-	// Compacted WAL files will have a magic byte sequence that indicate the next part is a file name
-	// instead of a compressed block. We can ignore these bytes and the ensuing file name to get to the next block.
-	isCompactionFileNameBlock := bytes.Equal(s.length[0:2], CompactSequence)
-	if isCompactionFileNameBlock {
-		s.length[0], s.length[1] = 0x00, 0x00
-	}
-
-	dataLength := btou64(s.length)
-
-	// make sure we haven't hit the end of data. trailing end of file can be zero bytes
-	if dataLength == 0 {
-		s.f.Seek(-int64(len(s.length)), 1)
-		return "", nil, nil
-	}
-
-	if len(s.block) < int(dataLength) {
-		s.block = make([]byte, dataLength)
-	}
-
-	n, err = s.f.Read(s.block[:dataLength])
-	if err != nil {
-		return "", nil, fmt.Errorf("read block: %s", err)
-	}
-	blockSize += int64(n)
-
-	// read the compressed block and decompress it. if partial or corrupt,
-	// overwrite with zeroes so we can start over on this wal file
-	if n != int(dataLength) {
-		s.logger.Println("partial compressed block in file:", s.f.Name())
-
-		// seek back to before this block and its size so we can overwrite the corrupt data
-		s.f.Seek(-int64(len(s.length)+n), 1)
-		if err := s.f.Truncate(s.size); err != nil {
-			return "", nil, fmt.Errorf("truncate(0): sz=%d, err=%s", s.size, err)
-		}
-
-		return "", nil, nil
-	}
-
-	// skip the rest if this is just the filename from a compaction
-	if isCompactionFileNameBlock {
-		return string(s.block[:dataLength]), nil, nil
-	}
-
-	// if there was an error decoding, this is a corrupt block so we zero out the rest of the file
-	buf, err := snappy.Decode(nil, s.block[:dataLength])
-	if err != nil {
-		s.logger.Println("corrupt compressed block in file:", err.Error(), s.f.Name())
-
-		// go back to the start of this block and zero out the rest of the file
-		s.f.Seek(-int64(len(s.length)+n), 1)
-		if err := s.f.Truncate(s.size); err != nil {
-			return "", nil, fmt.Errorf("truncate(1): sz=%d, err=%s", s.size, err)
-		}
-
-		return "", nil, nil
-	}
-
-	// read in the individual data points from the decompressed wal block
-	bytesRead := 0
-	entries = make([]*entry, 0)
-	for {
-		if bytesRead >= len(buf) {
-			break
-		}
-		n, key, timestamp, data := unmarshalWALEntry(buf[bytesRead:])
-		bytesRead += n
-		entries = append(entries, &entry{key: key, data: data, timestamp: timestamp})
-	}
-
-	s.size = blockSize
-
-	return
-}
-
-// entry is used as a temporary object when reading data from segment files
-type entry struct {
-	key       []byte
-	data      []byte
-	timestamp int64
-}
-
-// cursor is a unidirectional iterator for a given entry in the cache
-type cursor struct {
-	cache     [][]byte
-	position  int
-	ascending bool
-
-	fields []string
-	dec    *tsdb.FieldCodec
-}
-
-func newCursor(cache [][]byte, fields []string, dec *tsdb.FieldCodec, ascending bool) *cursor {
-	// position is set such that a call to Next will successfully advance
-	// to the next postion and return the value.
-	c := &cursor{
-		cache:     cache,
-		ascending: ascending,
-		position:  -1,
-		fields:    fields,
-		dec:       dec,
-	}
-	if !ascending {
-		c.position = len(c.cache)
-	}
-	return c
-}
-
-func (c *cursor) Ascending() bool { return c.ascending }
-
-// Seek will point the cursor to the given time (or key)
-func (c *cursor) SeekTo(seek int64) (key int64, value interface{}) {
-	seekBytes := u64tob(uint64(seek))
-
-	// Seek cache index
-	c.position = sort.Search(len(c.cache), func(i int) bool {
-		return bytes.Compare(c.cache[i][0:8], seekBytes) != -1
-	})
-
-	// If seek is not in the cache, return the last value in the cache
-	if !c.ascending && c.position >= len(c.cache) {
-		c.position = len(c.cache)
-	}
-
-	// Make sure our position points to something in the cache
-	if c.position < 0 || c.position >= len(c.cache) {
-		return tsdb.EOF, nil
-	}
-
-	v := c.cache[c.position]
-
-	if v == nil {
-		return tsdb.EOF, nil
-	}
-
-	return DecodeKeyValue(c.fields, c.dec, v[0:8], v[8:])
-}
-
-// Next moves the cursor to the next key/value. will return nil if at the end
-func (c *cursor) Next() (key int64, value interface{}) {
-	var v []byte
-	if c.ascending {
-		v = c.nextForward()
-	} else {
-		v = c.nextReverse()
-	}
-
-	// Iterated past the end of the cursor
-	if v == nil {
-		return tsdb.EOF, nil
-	}
-
-	// Split v into key/value
-	return DecodeKeyValue(c.fields, c.dec, v[0:8], v[8:])
-}
-
-// nextForward advances the cursor forward returning the next value
-func (c *cursor) nextForward() (b []byte) {
-	c.position++
-
-	if c.position >= len(c.cache) {
-		return nil
-	}
-
-	return c.cache[c.position]
-}
-
-// nextReverse advances the cursor backwards returning the next value
-func (c *cursor) nextReverse() (b []byte) {
-	c.position--
-
-	if c.position < 0 {
-		return nil
-	}
-
-	return c.cache[c.position]
-}
-
-// seriesAndFields is a data struct to serialize new series and fields
-// to get created into WAL segment files
-type seriesAndFields struct {
-	Fields map[string]*tsdb.MeasurementFields `json:"fields,omitempty"`
-	Series []*tsdb.SeriesCreate               `json:"series,omitempty"`
-}
-
-// cacheEntry holds the cached data for a series
-type cacheEntry struct {
-	points      [][]byte
-	isDirtySort bool
-	size        int
-}
-
-// marshalWALEntry encodes point data into a single byte slice.
-//
-// The format of the byte slice is:
-//
-//     uint64 timestamp
-//     uint32 key length
-//     uint32 data length
-//     []byte key
-//     []byte data
-//
-func marshalWALEntry(buf *bytes.Buffer, key []byte, timestamp int64, data []byte) {
-	// bytes.Buffer can't error, so ignore error checking in this code
-	var tmpbuf [8]byte
-	binary.BigEndian.PutUint64(tmpbuf[:], uint64(timestamp))
-	buf.Write(tmpbuf[:])
-	binary.BigEndian.PutUint32(tmpbuf[:4], uint32(len(key)))
-	buf.Write(tmpbuf[:4])
-	binary.BigEndian.PutUint32(tmpbuf[:4], uint32(len(data)))
-	buf.Write(tmpbuf[:4])
-
-	buf.Write(key)
-	buf.Write(data)
-}
-
-func walEntryLength(p models.Point) int {
-	return 8 + 4 + 4 + len(p.Key()) + len(p.Data())
-}
-
-// unmarshalWALEntry decodes a WAL entry into it's separate parts.
-// Returned byte slices point to the original slice.
-func unmarshalWALEntry(v []byte) (bytesRead int, key []byte, timestamp int64, data []byte) {
-	timestamp = int64(binary.BigEndian.Uint64(v[0:8]))
-	keyLen := binary.BigEndian.Uint32(v[8:12])
-	dataLen := binary.BigEndian.Uint32(v[12:16])
-
-	key = v[16 : 16+keyLen]
-	data = v[16+keyLen : 16+keyLen+dataLen]
-	bytesRead = 16 + int(keyLen) + int(dataLen)
-	return
-}
-
-// marshalCacheEntry encodes the timestamp and data to a single byte slice.
-//
-// The format of the byte slice is:
-//
-//     uint64 timestamp
-//     []byte data
-//
-func MarshalEntry(timestamp int64, data []byte) []byte {
-	buf := make([]byte, 8+len(data))
-	binary.BigEndian.PutUint64(buf[0:8], uint64(timestamp))
-	copy(buf[8:], data)
-	return buf
-}
-
-// unmarshalCacheEntry returns the timestamp and data from an encoded byte slice.
-func UnmarshalEntry(buf []byte) (timestamp int64, data []byte) {
-	timestamp = int64(binary.BigEndian.Uint64(buf[0:8]))
-	data = buf[8:]
-	return
-}
-
-// u64tob converts a uint64 into an 8-byte slice.
-func u64tob(v uint64) []byte {
-	b := make([]byte, 8)
-	binary.BigEndian.PutUint64(b, v)
-	return b
-}
-
-func btou64(b []byte) uint64 {
-	return binary.BigEndian.Uint64(b)
-}
-
-// DecodeKeyValue decodes the key and value from bytes.
-func DecodeKeyValue(fields []string, dec *tsdb.FieldCodec, k, v []byte) (key int64, value interface{}) {
-	// Convert key to a timestamp.
-	key = int64(btou64(k[0:8]))
-
-	// Decode values. Optimize for single field.
-	switch len(fields) {
-	case 0:
-		return
-	case 1:
-		decValue, err := dec.DecodeByName(fields[0], v)
-		if err != nil {
-			return
-		}
-		return key, decValue
-	default:
-		m, err := dec.DecodeFieldsWithNames(v)
-		if err != nil {
-			return
-		}
-		return key, m
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/engine/wal/wal_test.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/engine/wal/wal_test.go
deleted file mode 100644
index 9c425782f..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/engine/wal/wal_test.go
+++ /dev/null
@@ -1,740 +0,0 @@
-package wal
-
-import (
-	"bytes"
-	"fmt"
-	"io/ioutil"
-	"math/rand"
-	"os"
-	"reflect"
-	"testing"
-	"time"
-
-	"github.com/influxdb/influxdb/influxql"
-	"github.com/influxdb/influxdb/models"
-	"github.com/influxdb/influxdb/tsdb"
-)
-
-func TestWAL_WritePoints(t *testing.T) {
-	log := openTestWAL()
-	defer log.Close()
-	defer os.RemoveAll(log.path)
-
-	if err := log.Open(); err != nil {
-		t.Fatalf("couldn't open wal: %s", err.Error())
-	}
-
-	codec := tsdb.NewFieldCodec(map[string]*tsdb.Field{
-		"value": {
-			ID:   uint8(1),
-			Name: "value",
-			Type: influxql.Float,
-		},
-	})
-
-	// Test that we can write to two different series
-	p1 := parsePoint("cpu,host=A value=23.2 1", codec)
-	p2 := parsePoint("cpu,host=A value=25.3 4", codec)
-	p3 := parsePoint("cpu,host=B value=1.0 1", codec)
-	if err := log.WritePoints([]models.Point{p1, p2, p3}, nil, nil); err != nil {
-		t.Fatalf("failed to write points: %s", err.Error())
-	}
-
-	c := log.Cursor("cpu,host=A", []string{"value"}, codec, true)
-	k, v := c.SeekTo(1)
-
-	// ensure the series are there and points are in order
-	if v.(float64) != 23.2 {
-		t.Fatalf("expected to seek to first point but got key and value: %v %v", k, v)
-	}
-
-	k, v = c.Next()
-	if v.(float64) != 25.3 {
-		t.Fatalf("expected to seek to first point but got key and value: %v %v", k, v)
-	}
-
-	k, v = c.Next()
-	if k != tsdb.EOF {
-		t.Fatalf("expected nil on last seek: %v %v", k, v)
-	}
-
-	c = log.Cursor("cpu,host=B", []string{"value"}, codec, true)
-	k, v = c.Next()
-	if v.(float64) != 1.0 {
-		t.Fatalf("expected to seek to first point but got key and value: %v %v", k, v)
-	}
-
-	// ensure that we can close and re-open the log with points getting to the index
-	log.Close()
-
-	points := make([]map[string][][]byte, 0)
-	log.Index = &testIndexWriter{fn: func(pointsByKey map[string][][]byte, measurementFieldsToSave map[string]*tsdb.MeasurementFields, seriesToCreate []*tsdb.SeriesCreate) error {
-		points = append(points, pointsByKey)
-		return nil
-	}}
-
-	if err := log.Open(); err != nil {
-		t.Fatal("error opening log", err)
-	}
-
-	p := points[0]
-	if len(p["cpu,host=A"]) != 2 {
-		t.Fatal("expected two points for cpu,host=A flushed to index")
-	}
-	if len(p["cpu,host=B"]) != 1 {
-		t.Fatal("expected one point for cpu,host=B flushed to index")
-	}
-
-	// ensure we can write new points into the series
-	p4 := parsePoint("cpu,host=A value=1.0 7", codec)
-	// ensure we can write an all new series
-	p5 := parsePoint("cpu,host=C value=1.4 2", codec)
-	// ensure we can write a point out of order and get it back
-	p6 := parsePoint("cpu,host=A value=1.3 2", codec)
-	// // ensure we can write to a new partition
-	// p7 := parsePoint("cpu,region=west value=2.2", codec)
-	if err := log.WritePoints([]models.Point{p4, p5, p6}, nil, nil); err != nil {
-		t.Fatalf("failed to write points: %s", err.Error())
-	}
-
-	c = log.Cursor("cpu,host=A", []string{"value"}, codec, true)
-	if _, v := c.Next(); v.(float64) != 1.3 {
-		t.Fatal("order wrong, expected p6")
-	}
-	if _, v := c.Next(); v.(float64) != 1.0 {
-		t.Fatal("order wrong, expected p6")
-	}
-
-	c = log.Cursor("cpu,host=C", []string{"value"}, codec, true)
-	if _, v := c.Next(); v.(float64) != 1.4 {
-		t.Fatal("order wrong, expected p6")
-	}
-
-	if err := log.Close(); err != nil {
-		t.Fatal("error closing log", err)
-	}
-
-	points = make([]map[string][][]byte, 0)
-	if err := log.Open(); err != nil {
-		t.Fatal("error opening log", err)
-	}
-
-	p = points[0]
-	if len(p["cpu,host=A"]) != 2 {
-		t.Fatal("expected two points for cpu,host=A flushed to index")
-	}
-	if len(p["cpu,host=C"]) != 1 {
-		t.Fatal("expected one point for cpu,host=B flushed to index")
-	}
-}
-
-func TestWAL_CorruptDataLengthSize(t *testing.T) {
-	log := openTestWAL()
-	defer log.Close()
-	defer os.RemoveAll(log.path)
-
-	if err := log.Open(); err != nil {
-		t.Fatalf("couldn't open wal: %s", err.Error())
-	}
-
-	codec := tsdb.NewFieldCodec(map[string]*tsdb.Field{
-		"value": {
-			ID:   uint8(1),
-			Name: "value",
-			Type: influxql.Float,
-		},
-	})
-
-	// test that we can write to two different series
-	p1 := parsePoint("cpu,host=A value=23.2 1", codec)
-	p2 := parsePoint("cpu,host=A value=25.3 4", codec)
-	if err := log.WritePoints([]models.Point{p1, p2}, nil, nil); err != nil {
-		t.Fatalf("failed to write points: %s", err.Error())
-	}
-
-	c := log.Cursor("cpu,host=A", []string{"value"}, codec, true)
-	if _, v := c.Next(); v.(float64) != 23.2 {
-		t.Fatal("p1 value wrong")
-	}
-	if _, v := c.Next(); v.(float64) != 25.3 {
-		t.Fatal("p2 value wrong")
-	}
-	if _, v := c.Next(); v != nil {
-		t.Fatal("expected cursor to return nil")
-	}
-
-	// now write junk data and ensure that we can close, re-open and read
-	f := log.partition.currentSegmentFile
-	f.Write([]byte{0x23, 0x12})
-	f.Sync()
-	log.Close()
-
-	points := make([]map[string][][]byte, 0)
-	log.Index = &testIndexWriter{fn: func(pointsByKey map[string][][]byte, measurementFieldsToSave map[string]*tsdb.MeasurementFields, seriesToCreate []*tsdb.SeriesCreate) error {
-		points = append(points, pointsByKey)
-		return nil
-	}}
-
-	log.Open()
-
-	if p := points[0]; len(p["cpu,host=A"]) != 2 {
-		t.Fatal("expected two points for cpu,host=A")
-	}
-
-	// now write new data and ensure it's all good
-	p3 := parsePoint("cpu,host=A value=29.2 6", codec)
-	if err := log.WritePoints([]models.Point{p3}, nil, nil); err != nil {
-		t.Fatalf("failed to write point: %s", err.Error())
-	}
-
-	c = log.Cursor("cpu,host=A", []string{"value"}, codec, true)
-	if _, v := c.Next(); v.(float64) != 29.2 {
-		t.Fatal("p3 value wrong")
-	}
-
-	log.Close()
-
-	points = make([]map[string][][]byte, 0)
-	log.Open()
-	if p := points[0]; len(p["cpu,host=A"]) != 1 {
-		t.Fatal("expected two points for cpu,host=A")
-	}
-}
-
-func TestWAL_CorruptDataBlock(t *testing.T) {
-	log := openTestWAL()
-	defer log.Close()
-	defer os.RemoveAll(log.path)
-
-	if err := log.Open(); err != nil {
-		t.Fatalf("couldn't open wal: %s", err.Error())
-	}
-
-	codec := tsdb.NewFieldCodec(map[string]*tsdb.Field{
-		"value": {
-			ID:   uint8(1),
-			Name: "value",
-			Type: influxql.Float,
-		},
-	})
-
-	// test that we can write to two different series
-	p1 := parsePoint("cpu,host=A value=23.2 1", codec)
-	p2 := parsePoint("cpu,host=A value=25.3 4", codec)
-	if err := log.WritePoints([]models.Point{p1, p2}, nil, nil); err != nil {
-		t.Fatalf("failed to write points: %s", err.Error())
-	}
-
-	c := log.Cursor("cpu,host=A", []string{"value"}, codec, true)
-	if _, v := c.Next(); v.(float64) != 23.2 {
-		t.Fatal("p1 value wrong")
-	}
-	if _, v := c.Next(); v.(float64) != 25.3 {
-		t.Fatal("p2 value wrong")
-	}
-	if _, v := c.Next(); v != nil {
-		t.Fatal("expected cursor to return nil")
-	}
-
-	// now write junk data and ensure that we can close, re-open and read
-
-	f := log.partition.currentSegmentFile
-	f.Write(u64tob(23))
-	// now write a bunch of garbage
-	for i := 0; i < 1000; i++ {
-		f.Write([]byte{0x23, 0x78, 0x11, 0x33})
-	}
-	f.Sync()
-
-	log.Close()
-
-	points := make([]map[string][][]byte, 0)
-	log.Index = &testIndexWriter{fn: func(pointsByKey map[string][][]byte, measurementFieldsToSave map[string]*tsdb.MeasurementFields, seriesToCreate []*tsdb.SeriesCreate) error {
-		points = append(points, pointsByKey)
-		return nil
-	}}
-
-	log.Open()
-	if p := points[0]; len(p["cpu,host=A"]) != 2 {
-		t.Fatal("expected two points for cpu,host=A")
-	}
-
-	// now write new data and ensure it's all good
-	p3 := parsePoint("cpu,host=A value=29.2 6", codec)
-	if err := log.WritePoints([]models.Point{p3}, nil, nil); err != nil {
-		t.Fatalf("failed to write point: %s", err.Error())
-	}
-
-	c = log.Cursor("cpu,host=A", []string{"value"}, codec, true)
-	if _, v := c.Next(); v.(float64) != 29.2 {
-		t.Fatal("p3 value wrong", p3.Data(), v)
-	}
-
-	log.Close()
-
-	points = make([]map[string][][]byte, 0)
-	log.Open()
-	if p := points[0]; len(p["cpu,host=A"]) != 1 {
-		t.Fatal("expected two points for cpu,host=A")
-	}
-}
-
-// Ensure the wal forces a full flush after not having a write in a given interval of time
-func TestWAL_CompactAfterTimeWithoutWrite(t *testing.T) {
-	log := openTestWAL()
-
-	// set this low
-	log.flushCheckInterval = 10 * time.Millisecond
-	log.FlushColdInterval = 500 * time.Millisecond
-
-	defer log.Close()
-	defer os.RemoveAll(log.path)
-
-	points := make([]map[string][][]byte, 0)
-	log.Index = &testIndexWriter{fn: func(pointsByKey map[string][][]byte, measurementFieldsToSave map[string]*tsdb.MeasurementFields, seriesToCreate []*tsdb.SeriesCreate) error {
-		points = append(points, pointsByKey)
-		return nil
-	}}
-
-	if err := log.Open(); err != nil {
-		t.Fatalf("couldn't open wal: %s", err.Error())
-	}
-
-	codec := tsdb.NewFieldCodec(map[string]*tsdb.Field{
-		"value": {
-			ID:   uint8(1),
-			Name: "value",
-			Type: influxql.Float,
-		},
-	})
-
-	numSeries := 100
-	b := make([]byte, 70*5000)
-	for i := 1; i <= 10; i++ {
-		buf := bytes.NewBuffer(b)
-		for j := 1; j <= numSeries; j++ {
-			buf.WriteString(fmt.Sprintf("cpu,host=A,region=uswest%d value=%.3f %d\n", j, rand.Float64(), i))
-		}
-
-		// write the batch out
-		if err := log.WritePoints(parsePoints(buf.String(), codec), nil, nil); err != nil {
-			t.Fatalf("failed to write points: %s", err.Error())
-		}
-		buf = bytes.NewBuffer(b)
-	}
-
-	// ensure we have some data
-	c := log.Cursor("cpu,host=A,region=uswest10", []string{"value"}, codec, true)
-	k, _ := c.Next()
-	if k != 1 {
-		t.Fatalf("expected first data point but got one with key: %v", k)
-	}
-
-	time.Sleep(700 * time.Millisecond)
-
-	// ensure that as a whole its not ready for flushing yet
-	if f := log.partition.shouldFlush(); f != noFlush {
-		t.Fatalf("expected partition 1 to return noFlush from shouldFlush %v", f)
-	}
-
-	// ensure that the partition is empty
-	if log.partition.memorySize != 0 || len(log.partition.cache) != 0 {
-		t.Fatal("expected partition to be empty")
-	}
-	// ensure that we didn't bother to open a new segment file
-	if log.partition.currentSegmentFile != nil {
-		t.Fatal("expected partition to not have an open segment file")
-	}
-}
-
-func TestWAL_SeriesAndFieldsGetPersisted(t *testing.T) {
-	log := openTestWAL()
-	defer log.Close()
-	defer os.RemoveAll(log.path)
-
-	if err := log.Open(); err != nil {
-		t.Fatalf("couldn't open wal: %s", err.Error())
-	}
-
-	codec := tsdb.NewFieldCodec(map[string]*tsdb.Field{
-		"value": {
-			ID:   uint8(1),
-			Name: "value",
-			Type: influxql.Float,
-		},
-	})
-
-	var measurementsToIndex map[string]*tsdb.MeasurementFields
-	var seriesToIndex []*tsdb.SeriesCreate
-	log.Index = &testIndexWriter{fn: func(pointsByKey map[string][][]byte, measurementFieldsToSave map[string]*tsdb.MeasurementFields, seriesToCreate []*tsdb.SeriesCreate) error {
-		measurementsToIndex = measurementFieldsToSave
-		seriesToIndex = append(seriesToIndex, seriesToCreate...)
-		return nil
-	}}
-
-	// test that we can write to two different series
-	p1 := parsePoint("cpu,host=A value=23.2 1", codec)
-	p2 := parsePoint("cpu,host=A value=25.3 4", codec)
-	p3 := parsePoint("cpu,host=B value=1.0 1", codec)
-
-	seriesToCreate := []*tsdb.SeriesCreate{
-		{Series: tsdb.NewSeries(string(models.MakeKey([]byte("cpu"), map[string]string{"host": "A"})), map[string]string{"host": "A"})},
-		{Series: tsdb.NewSeries(string(models.MakeKey([]byte("cpu"), map[string]string{"host": "B"})), map[string]string{"host": "B"})},
-	}
-
-	measaurementsToCreate := map[string]*tsdb.MeasurementFields{
-		"cpu": {
-			Fields: map[string]*tsdb.Field{
-				"value": {ID: 1, Name: "value"},
-			},
-		},
-	}
-
-	if err := log.WritePoints([]models.Point{p1, p2, p3}, measaurementsToCreate, seriesToCreate); err != nil {
-		t.Fatalf("failed to write points: %s", err.Error())
-	}
-
-	// now close it and see if loading the metadata index will populate the measurement and series info
-	log.Close()
-
-	idx := tsdb.NewDatabaseIndex()
-	mf := make(map[string]*tsdb.MeasurementFields)
-
-	if err := log.LoadMetadataIndex(idx, mf); err != nil {
-		t.Fatalf("error loading metadata index: %s", err.Error())
-	}
-
-	s := idx.Series("cpu,host=A")
-	if s == nil {
-		t.Fatal("expected to find series cpu,host=A in index")
-	}
-
-	s = idx.Series("cpu,host=B")
-	if s == nil {
-		t.Fatal("expected to find series cpu,host=B in index")
-	}
-
-	m := mf["cpu"]
-	if m == nil {
-		t.Fatal("expected to find measurement fields for cpu", mf)
-	}
-	if m.Fields["value"] == nil {
-		t.Fatal("expected to find field definition for 'value'")
-	}
-
-	// ensure that they were actually flushed to the index. do it this way because the annoying deepequal doessn't really work for these
-	for i, s := range seriesToCreate {
-		if seriesToIndex[i].Measurement != s.Measurement {
-			t.Fatal("expected measurement to be the same")
-		}
-		if seriesToIndex[i].Series.Key != s.Series.Key {
-			t.Fatal("expected series key to be the same")
-		}
-		if !reflect.DeepEqual(seriesToIndex[i].Series.Tags, s.Series.Tags) {
-			t.Fatal("expected series tags to be the same")
-		}
-	}
-
-	// ensure that the measurement fields were flushed to the index
-	for k, v := range measaurementsToCreate {
-		m := measurementsToIndex[k]
-		if m == nil {
-			t.Fatalf("measurement %s wasn't indexed", k)
-		}
-
-		if !reflect.DeepEqual(m.Fields, v.Fields) {
-			t.Fatal("measurement fields not equal")
-		}
-	}
-
-	// now open and close the log and try to reload the metadata index, which should now be empty
-	if err := log.Open(); err != nil {
-		t.Fatalf("error opening log: %s", err.Error())
-	}
-	if err := log.Close(); err != nil {
-		t.Fatalf("error closing log: %s", err.Error())
-	}
-
-	idx = tsdb.NewDatabaseIndex()
-	mf = make(map[string]*tsdb.MeasurementFields)
-
-	if err := log.LoadMetadataIndex(idx, mf); err != nil {
-		t.Fatalf("error loading metadata index: %s", err.Error())
-	}
-
-	if len(idx.Measurements()) != 0 || len(mf) != 0 {
-		t.Fatal("expected index and measurement fields to be empty")
-	}
-}
-
-func TestWAL_DeleteSeries(t *testing.T) {
-	log := openTestWAL()
-	defer log.Close()
-	defer os.RemoveAll(log.path)
-
-	codec := tsdb.NewFieldCodec(map[string]*tsdb.Field{
-		"value": {
-			ID:   uint8(1),
-			Name: "value",
-			Type: influxql.Float,
-		},
-	})
-
-	var seriesToIndex []*tsdb.SeriesCreate
-	var points map[string][][]byte
-	log.Index = &testIndexWriter{fn: func(pointsByKey map[string][][]byte, measurementFieldsToSave map[string]*tsdb.MeasurementFields, seriesToCreate []*tsdb.SeriesCreate) error {
-		points = pointsByKey
-		seriesToIndex = append(seriesToIndex, seriesToCreate...)
-		return nil
-	}}
-
-	seriesToCreate := []*tsdb.SeriesCreate{
-		{Series: tsdb.NewSeries(string(models.MakeKey([]byte("cpu"), map[string]string{"host": "A"})), map[string]string{"host": "A"})},
-		{Series: tsdb.NewSeries(string(models.MakeKey([]byte("cpu"), map[string]string{"host": "B"})), map[string]string{"host": "B"})},
-	}
-
-	if err := log.Open(); err != nil {
-		t.Fatalf("couldn't open wal: %s", err.Error())
-	}
-
-	// test that we can write to two different series
-	p1 := parsePoint("cpu,host=A value=23.2 1", codec)
-	p2 := parsePoint("cpu,host=B value=0.9 2", codec)
-	p3 := parsePoint("cpu,host=A value=25.3 4", codec)
-	p4 := parsePoint("cpu,host=B value=1.0 3", codec)
-	if err := log.WritePoints([]models.Point{p1, p2, p3, p4}, nil, seriesToCreate); err != nil {
-		t.Fatalf("failed to write points: %s", err.Error())
-	}
-
-	// ensure data is there
-	c := log.Cursor("cpu,host=A", []string{"value"}, codec, true)
-	if k, _ := c.Next(); k != 1 {
-		t.Fatal("expected data point for cpu,host=A")
-	}
-
-	c = log.Cursor("cpu,host=B", []string{"value"}, codec, true)
-	if k, _ := c.Next(); k != 2 {
-		t.Fatal("expected data point for cpu,host=B")
-	}
-
-	// delete the series and ensure metadata was flushed and data is gone
-	if err := log.DeleteSeries([]string{"cpu,host=B"}); err != nil {
-		t.Fatalf("error deleting series: %s", err.Error())
-	}
-
-	// ensure data is there
-	if len(points["cpu,host=A"]) != 2 {
-		t.Fatal("expected cpu,host=A to be flushed to the index")
-	}
-	if len(points["cpu,host=B"]) != 0 {
-		t.Fatal("expected cpu,host=B to have no points in index")
-	}
-	c = log.Cursor("cpu,host=A", []string{"value"}, codec, true)
-	if k, _ := c.Next(); k != tsdb.EOF {
-		t.Fatal("expected data to be out of the cache cpu,host=A")
-	}
-
-	// ensure series is deleted
-	c = log.Cursor("cpu,host=B", []string{"value"}, codec, true)
-	if k, _ := c.Next(); k != tsdb.EOF {
-		t.Fatal("expected no data for cpu,host=B")
-	}
-
-	// ensure that they were actually flushed to the index. do it this way because the annoying deepequal doessn't really work for these
-	for i, s := range seriesToCreate {
-		if seriesToIndex[i].Measurement != s.Measurement {
-			t.Fatal("expected measurement to be the same")
-		}
-		if seriesToIndex[i].Series.Key != s.Series.Key {
-			t.Fatal("expected series key to be the same")
-		}
-		if !reflect.DeepEqual(seriesToIndex[i].Series.Tags, s.Series.Tags) {
-			t.Fatal("expected series tags to be the same")
-		}
-	}
-
-	// close and re-open the WAL to ensure that the data didn't show back up
-	if err := log.Close(); err != nil {
-		t.Fatalf("error closing log: %s", err.Error())
-	}
-
-	points = make(map[string][][]byte)
-	if err := log.Open(); err != nil {
-		t.Fatalf("error opening log: %s", err.Error())
-	}
-
-	// ensure data wasn't flushed on open
-	if len(points) != 0 {
-		t.Fatal("expected no data to be flushed on open")
-	}
-}
-
-func TestWAL_QueryDuringCompaction(t *testing.T) {
-	log := openTestWAL()
-	defer log.Close()
-	defer os.RemoveAll(log.path)
-
-	var points []map[string][][]byte
-	finishCompaction := make(chan struct{})
-	log.Index = &testIndexWriter{fn: func(pointsByKey map[string][][]byte, measurementFieldsToSave map[string]*tsdb.MeasurementFields, seriesToCreate []*tsdb.SeriesCreate) error {
-		points = append(points, pointsByKey)
-		finishCompaction <- struct{}{}
-		return nil
-	}}
-
-	if err := log.Open(); err != nil {
-		t.Fatalf("couldn't open wal: %s", err.Error())
-	}
-
-	codec := tsdb.NewFieldCodec(map[string]*tsdb.Field{
-		"value": {
-			ID:   uint8(1),
-			Name: "value",
-			Type: influxql.Float,
-		},
-	})
-
-	// test that we can write to two different series
-	p1 := parsePoint("cpu,host=A value=23.2 1", codec)
-	if err := log.WritePoints([]models.Point{p1}, nil, nil); err != nil {
-		t.Fatalf("failed to write points: %s", err.Error())
-	}
-
-	verify := func() {
-		c := log.Cursor("cpu,host=A", []string{"value"}, codec, true)
-		k, v := c.SeekTo(1)
-		// ensure the series are there and points are in order
-		if v.(float64) != 23.2 {
-			<-finishCompaction
-			t.Fatalf("expected to seek to first point but got key and value: %v %v", k, v)
-		}
-	}
-
-	verify()
-	go func() {
-		log.Flush()
-	}()
-
-	time.Sleep(100 * time.Millisecond)
-	verify()
-	<-finishCompaction
-	verify()
-}
-
-func TestWAL_PointsSorted(t *testing.T) {
-	log := openTestWAL()
-	defer log.Close()
-	defer os.RemoveAll(log.path)
-
-	if err := log.Open(); err != nil {
-		t.Fatalf("couldn't open wal: %s", err.Error())
-	}
-
-	codec := tsdb.NewFieldCodec(map[string]*tsdb.Field{
-		"value": {
-			ID:   uint8(1),
-			Name: "value",
-			Type: influxql.Float,
-		},
-	})
-
-	// test that we can write to two different series
-	p1 := parsePoint("cpu,host=A value=1.1 1", codec)
-	p2 := parsePoint("cpu,host=A value=4.4 4", codec)
-	p3 := parsePoint("cpu,host=A value=2.2 2", codec)
-	p4 := parsePoint("cpu,host=A value=6.6 6", codec)
-	if err := log.WritePoints([]models.Point{p1, p2, p3, p4}, nil, nil); err != nil {
-		t.Fatalf("failed to write points: %s", err.Error())
-	}
-
-	c := log.Cursor("cpu,host=A", []string{"value"}, codec, true)
-	if k, _ := c.Next(); k != 1 {
-		t.Fatal("points out of order")
-	}
-	if k, _ := c.Next(); k != 2 {
-		t.Fatal("points out of order")
-	}
-	if k, _ := c.Next(); k != 4 {
-		t.Fatal("points out of order")
-	}
-	if k, _ := c.Next(); k != 6 {
-		t.Fatal("points out of order")
-	}
-}
-
-func TestWAL_Cursor_Reverse(t *testing.T) {
-	log := openTestWAL()
-	defer log.Close()
-	defer os.RemoveAll(log.path)
-
-	if err := log.Open(); err != nil {
-		t.Fatalf("couldn't open wal: %s", err.Error())
-	}
-
-	codec := tsdb.NewFieldCodec(map[string]*tsdb.Field{
-		"value": {
-			ID:   uint8(1),
-			Name: "value",
-			Type: influxql.Float,
-		},
-	})
-
-	// test that we can write to two different series
-	p1 := parsePoint("cpu,host=A value=1.1 1", codec)
-	p2 := parsePoint("cpu,host=A value=4.4 4", codec)
-	p3 := parsePoint("cpu,host=A value=2.2 2", codec)
-	p4 := parsePoint("cpu,host=A value=6.6 6", codec)
-	if err := log.WritePoints([]models.Point{p1, p2, p3, p4}, nil, nil); err != nil {
-		t.Fatalf("failed to write points: %s", err.Error())
-	}
-
-	c := log.Cursor("cpu,host=A", []string{"value"}, codec, false)
-	k, _ := c.Next()
-	if k != 6 {
-		t.Fatal("points out of order")
-	}
-	if k, _ := c.Next(); k != 4 {
-		t.Fatal("points out of order")
-	}
-	if k, _ := c.Next(); k != 2 {
-		t.Fatal("points out of order")
-	}
-	if k, _ := c.Next(); k != 1 {
-		t.Fatal("points out of order")
-	}
-}
-
-type testIndexWriter struct {
-	fn func(pointsByKey map[string][][]byte, measurementFieldsToSave map[string]*tsdb.MeasurementFields, seriesToCreate []*tsdb.SeriesCreate) error
-}
-
-func (t *testIndexWriter) WriteIndex(pointsByKey map[string][][]byte, measurementFieldsToSave map[string]*tsdb.MeasurementFields, seriesToCreate []*tsdb.SeriesCreate) error {
-	return t.fn(pointsByKey, measurementFieldsToSave, seriesToCreate)
-}
-
-func openTestWAL() *Log {
-	dir, err := ioutil.TempDir("", "wal-test")
-	if err != nil {
-		panic("couldn't get temp dir")
-	}
-	return NewLog(dir)
-}
-
-func parsePoints(buf string, codec *tsdb.FieldCodec) []models.Point {
-	points, err := models.ParsePointsString(buf)
-	if err != nil {
-		panic(fmt.Sprintf("couldn't parse points: %s", err.Error()))
-	}
-	for _, p := range points {
-		b, err := codec.EncodeFields(p.Fields())
-		if err != nil {
-			panic(fmt.Sprintf("couldn't encode fields: %s", err.Error()))
-		}
-		p.SetData(b)
-	}
-	return points
-}
-
-func parsePoint(buf string, codec *tsdb.FieldCodec) models.Point {
-	return parsePoints(buf, codec)[0]
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/engine_test.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/engine_test.go
deleted file mode 100644
index c1c5c090f..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/engine_test.go
+++ /dev/null
@@ -1,3 +0,0 @@
-package tsdb_test
-
-import _ "github.com/influxdb/influxdb/tsdb/engine"
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/executor.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/executor.go
deleted file mode 100644
index 11016e232..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/executor.go
+++ /dev/null
@@ -1,8 +0,0 @@
-package tsdb
-
-import "github.com/influxdb/influxdb/models"
-
-// Executor is an interface for a query executor.
-type Executor interface {
-	Execute() <-chan *models.Row
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/functions.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/functions.go
deleted file mode 100644
index 61da27957..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/functions.go
+++ /dev/null
@@ -1,1714 +0,0 @@
-package tsdb
-
-// All aggregate and query functions are defined in this file along with any intermediate data objects they need to process.
-// Query functions are represented as two discreet functions: Map and Reduce. These roughly follow the MapReduce
-// paradigm popularized by Google and Hadoop.
-//
-// When adding an aggregate function, define a mapper, a reducer, and add them in the switch statement in the MapreduceFuncs function
-
-import (
-	"container/heap"
-	"encoding/json"
-	"fmt"
-	"math"
-	"math/rand"
-	"reflect"
-	"sort"
-
-	// "github.com/davecgh/go-spew/spew"
-	"github.com/influxdb/influxdb/influxql"
-)
-
-// MapInput represents a collection of values to be processed by the mapper.
-type MapInput struct {
-	TMin  int64
-	Items []MapItem
-}
-
-// MapItem represents a single item in a collection that's processed by the mapper.
-type MapItem struct {
-	Timestamp int64
-	Value     interface{}
-
-	// TODO(benbjohnson):
-	//   Move fields and tags up to MapInput. Currently the engine combines
-	//   multiple series together during processing. This needs to be fixed so
-	//   that each map function only operates on a single series at a time instead.
-	Fields map[string]interface{}
-	Tags   map[string]string
-}
-
-// mapFunc represents a function used for mapping over a sequential series of data.
-// The iterator represents a single group by interval
-type mapFunc func(*MapInput) interface{}
-
-// reduceFunc represents a function used for reducing mapper output.
-type reduceFunc func([]interface{}) interface{}
-
-// UnmarshalFunc represents a function that can take bytes from a mapper from remote
-// server and marshal it into an interface the reducer can use
-type UnmarshalFunc func([]byte) (interface{}, error)
-
-// initializemapFunc takes an aggregate call from the query and returns the mapFunc
-func initializeMapFunc(c *influxql.Call) (mapFunc, error) {
-	// see if it's a query for raw data
-	if c == nil {
-		return MapRawQuery, nil
-	}
-
-	// Retrieve map function by name.
-	switch c.Name {
-	case "count":
-		if _, ok := c.Args[0].(*influxql.Distinct); ok {
-			return MapCountDistinct, nil
-		}
-		if c, ok := c.Args[0].(*influxql.Call); ok {
-			if c.Name == "distinct" {
-				return MapCountDistinct, nil
-			}
-		}
-		return MapCount, nil
-	case "distinct":
-		return MapDistinct, nil
-	case "sum":
-		return MapSum, nil
-	case "mean":
-		return MapMean, nil
-	case "median":
-		return MapStddev, nil
-	case "min":
-		return func(input *MapInput) interface{} {
-			return MapMin(input, c.Fields()[0])
-		}, nil
-	case "max":
-		return func(input *MapInput) interface{} {
-			return MapMax(input, c.Fields()[0])
-		}, nil
-	case "spread":
-		return MapSpread, nil
-	case "stddev":
-		return MapStddev, nil
-	case "first":
-		return func(input *MapInput) interface{} {
-			return MapFirst(input, c.Fields()[0])
-		}, nil
-	case "last":
-		return func(input *MapInput) interface{} {
-			return MapLast(input, c.Fields()[0])
-		}, nil
-
-	case "top", "bottom":
-		// Capture information from the call that the Map function will require
-		lit, _ := c.Args[len(c.Args)-1].(*influxql.NumberLiteral)
-		limit := int(lit.Val)
-		fields := topCallArgs(c)
-
-		return func(input *MapInput) interface{} {
-			return MapTopBottom(input, limit, fields, len(c.Args), c.Name)
-		}, nil
-	case "percentile":
-		return MapEcho, nil
-	case "derivative", "non_negative_derivative":
-		// If the arg is another aggregate e.g. derivative(mean(value)), then
-		// use the map func for that nested aggregate
-		if fn, ok := c.Args[0].(*influxql.Call); ok {
-			return initializeMapFunc(fn)
-		}
-		return MapRawQuery, nil
-	default:
-		return nil, fmt.Errorf("function not found: %q", c.Name)
-	}
-}
-
-// InitializereduceFunc takes an aggregate call from the query and returns the reduceFunc
-func initializeReduceFunc(c *influxql.Call) (reduceFunc, error) {
-	// Retrieve reduce function by name.
-	switch c.Name {
-	case "count":
-		if _, ok := c.Args[0].(*influxql.Distinct); ok {
-			return ReduceCountDistinct, nil
-		}
-		if c, ok := c.Args[0].(*influxql.Call); ok {
-			if c.Name == "distinct" {
-				return ReduceCountDistinct, nil
-			}
-		}
-		return ReduceSum, nil
-	case "distinct":
-		return ReduceDistinct, nil
-	case "sum":
-		return ReduceSum, nil
-	case "mean":
-		return ReduceMean, nil
-	case "median":
-		return ReduceMedian, nil
-	case "min":
-		return ReduceMin, nil
-	case "max":
-		return ReduceMax, nil
-	case "spread":
-		return ReduceSpread, nil
-	case "stddev":
-		return ReduceStddev, nil
-	case "first":
-		return ReduceFirst, nil
-	case "last":
-		return ReduceLast, nil
-	case "top", "bottom":
-		return func(values []interface{}) interface{} {
-			lit, _ := c.Args[len(c.Args)-1].(*influxql.NumberLiteral)
-			limit := int(lit.Val)
-			fields := topCallArgs(c)
-			return ReduceTopBottom(values, limit, fields, c.Name)
-		}, nil
-	case "percentile":
-		return func(values []interface{}) interface{} {
-			// Checks that this arg exists and is a valid type are done in the parsing validation
-			// and have test coverage there
-			lit, _ := c.Args[1].(*influxql.NumberLiteral)
-			percentile := lit.Val
-			return ReducePercentile(values, percentile)
-		}, nil
-	case "derivative", "non_negative_derivative":
-		// If the arg is another aggregate e.g. derivative(mean(value)), then
-		// use the map func for that nested aggregate
-		if fn, ok := c.Args[0].(*influxql.Call); ok {
-			return initializeReduceFunc(fn)
-		}
-		return nil, fmt.Errorf("expected function argument to %s", c.Name)
-	default:
-		return nil, fmt.Errorf("function not found: %q", c.Name)
-	}
-}
-
-func InitializeUnmarshaller(c *influxql.Call) (UnmarshalFunc, error) {
-	// if c is nil it's a raw data query
-	if c == nil {
-		return func(b []byte) (interface{}, error) {
-			a := make([]*rawQueryMapOutput, 0)
-			err := json.Unmarshal(b, &a)
-			return a, err
-		}, nil
-	}
-
-	// Retrieve marshal function by name
-	switch c.Name {
-	case "mean":
-		return func(b []byte) (interface{}, error) {
-			var o meanMapOutput
-			err := json.Unmarshal(b, &o)
-			return &o, err
-		}, nil
-	case "spread":
-		return func(b []byte) (interface{}, error) {
-			var o spreadMapOutput
-			err := json.Unmarshal(b, &o)
-			return &o, err
-		}, nil
-	case "distinct":
-		return func(b []byte) (interface{}, error) {
-			var val InterfaceValues
-			err := json.Unmarshal(b, &val)
-			return val, err
-		}, nil
-	case "first":
-		return func(b []byte) (interface{}, error) {
-			var o firstLastMapOutput
-			err := json.Unmarshal(b, &o)
-			return &o, err
-		}, nil
-	case "last":
-		return func(b []byte) (interface{}, error) {
-			var o firstLastMapOutput
-			err := json.Unmarshal(b, &o)
-			return &o, err
-		}, nil
-	case "stddev":
-		return func(b []byte) (interface{}, error) {
-			val := make([]float64, 0)
-			err := json.Unmarshal(b, &val)
-			return val, err
-		}, nil
-	case "median":
-		return func(b []byte) (interface{}, error) {
-			a := make([]float64, 0)
-			err := json.Unmarshal(b, &a)
-			return a, err
-		}, nil
-	default:
-		return func(b []byte) (interface{}, error) {
-			var val interface{}
-			err := json.Unmarshal(b, &val)
-			return val, err
-		}, nil
-	}
-}
-
-// MapCount computes the number of values in an iterator.
-func MapCount(input *MapInput) interface{} {
-	n := float64(0)
-	for range input.Items {
-		n++
-	}
-	if n > 0 {
-		return n
-	}
-	return nil
-}
-
-type InterfaceValues []interface{}
-
-func (d InterfaceValues) Len() int      { return len(d) }
-func (d InterfaceValues) Swap(i, j int) { d[i], d[j] = d[j], d[i] }
-func (d InterfaceValues) Less(i, j int) bool {
-	cmpt, a, b := typeCompare(d[i], d[j])
-	cmpv := valueCompare(a, b)
-	if cmpv == 0 {
-		return cmpt < 0
-	}
-	return cmpv < 0
-}
-
-// MapDistinct computes the unique values in an iterator.
-func MapDistinct(input *MapInput) interface{} {
-	m := make(map[interface{}]struct{})
-	for _, item := range input.Items {
-		m[item.Value] = struct{}{}
-	}
-
-	if len(m) == 0 {
-		return nil
-	}
-
-	results := make(InterfaceValues, len(m))
-	var i int
-	for value, _ := range m {
-		results[i] = value
-		i++
-	}
-	return results
-}
-
-// ReduceDistinct finds the unique values for each key.
-func ReduceDistinct(values []interface{}) interface{} {
-	var index = make(map[interface{}]struct{})
-
-	// index distinct values from each mapper
-	for _, v := range values {
-		if v == nil {
-			continue
-		}
-		d, ok := v.(InterfaceValues)
-		if !ok {
-			msg := fmt.Sprintf("expected distinctValues, got: %T", v)
-			panic(msg)
-		}
-		for _, distinctValue := range d {
-			index[distinctValue] = struct{}{}
-		}
-	}
-
-	// convert map keys to an array
-	results := make(InterfaceValues, len(index))
-	var i int
-	for k, _ := range index {
-		results[i] = k
-		i++
-	}
-	if len(results) > 0 {
-		sort.Sort(results)
-		return results
-	}
-	return nil
-}
-
-// MapCountDistinct computes the unique count of values in an iterator.
-func MapCountDistinct(input *MapInput) interface{} {
-	var index = make(map[interface{}]struct{})
-
-	for _, item := range input.Items {
-		index[item.Value] = struct{}{}
-	}
-
-	if len(index) == 0 {
-		return nil
-	}
-
-	return index
-}
-
-// ReduceCountDistinct finds the unique counts of values.
-func ReduceCountDistinct(values []interface{}) interface{} {
-	var index = make(map[interface{}]struct{})
-
-	// index distinct values from each mapper
-	for _, v := range values {
-		if v == nil {
-			continue
-		}
-		d, ok := v.(map[interface{}]struct{})
-		if !ok {
-			msg := fmt.Sprintf("expected map[interface{}]struct{}, got: %T", v)
-			panic(msg)
-		}
-		for distinctCountValue, _ := range d {
-			index[distinctCountValue] = struct{}{}
-		}
-	}
-
-	return len(index)
-}
-
-type NumberType int8
-
-const (
-	Float64Type NumberType = iota
-	Int64Type
-)
-
-// MapSum computes the summation of values in an iterator.
-func MapSum(input *MapInput) interface{} {
-	if len(input.Items) == 0 {
-		return nil
-	}
-
-	n := float64(0)
-	var resultType NumberType
-	for _, item := range input.Items {
-		switch v := item.Value.(type) {
-		case float64:
-			n += v
-		case int64:
-			n += float64(v)
-			resultType = Int64Type
-		}
-	}
-
-	switch resultType {
-	case Float64Type:
-		return n
-	case Int64Type:
-		return int64(n)
-	default:
-		return nil
-	}
-}
-
-// ReduceSum computes the sum of values for each key.
-func ReduceSum(values []interface{}) interface{} {
-	var n float64
-	count := 0
-	var resultType NumberType
-	for _, v := range values {
-		if v == nil {
-			continue
-		}
-		count++
-		switch n1 := v.(type) {
-		case float64:
-			n += n1
-		case int64:
-			n += float64(n1)
-			resultType = Int64Type
-		}
-	}
-	if count > 0 {
-		switch resultType {
-		case Float64Type:
-			return n
-		case Int64Type:
-			return int64(n)
-		}
-	}
-	return nil
-}
-
-// MapMean computes the count and sum of values in an iterator to be combined by the reducer.
-func MapMean(input *MapInput) interface{} {
-	if len(input.Items) == 0 {
-		return nil
-	}
-
-	out := &meanMapOutput{}
-	for _, item := range input.Items {
-		out.Count++
-		switch v := item.Value.(type) {
-		case float64:
-			out.Total += v
-		case int64:
-			out.Total += float64(v)
-			out.ResultType = Int64Type
-		}
-	}
-	return out
-}
-
-type meanMapOutput struct {
-	Count      int
-	Total      float64
-	ResultType NumberType
-}
-
-// ReduceMean computes the mean of values for each key.
-func ReduceMean(values []interface{}) interface{} {
-	var total float64
-	var count int
-	for _, v := range values {
-		if v, _ := v.(*meanMapOutput); v != nil {
-			count += v.Count
-			total += v.Total
-		}
-	}
-	if count == 0 {
-		return nil
-	}
-	return total / float64(count)
-}
-
-// ReduceMedian computes the median of values
-func ReduceMedian(values []interface{}) interface{} {
-	var data []float64
-	// Collect all the data points
-	for _, value := range values {
-		if value == nil {
-			continue
-		}
-		data = append(data, value.([]float64)...)
-	}
-
-	length := len(data)
-	if length < 2 {
-		if length == 0 {
-			return nil
-		}
-		return data[0]
-	}
-	middle := length / 2
-	var sortedRange []float64
-	if length%2 == 0 {
-		sortedRange = getSortedRange(data, middle-1, 2)
-		var low, high = sortedRange[0], sortedRange[1]
-		return low + (high-low)/2
-	}
-	sortedRange = getSortedRange(data, middle, 1)
-	return sortedRange[0]
-}
-
-// getSortedRange returns a sorted subset of data. By using discardLowerRange and discardUpperRange to get the target
-// subset (unsorted) and then just sorting that subset, the work can be reduced from O(N lg N), where N is len(data), to
-// O(N + count lg count) for the average case
-// - O(N) to discard the unwanted items
-// - O(count lg count) to sort the count number of extracted items
-// This can be useful for:
-// - finding the median: getSortedRange(data, middle, 1)
-// - finding the top N: getSortedRange(data, len(data) - N, N)
-// - finding the bottom N: getSortedRange(data, 0, N)
-func getSortedRange(data []float64, start int, count int) []float64 {
-	out := discardLowerRange(data, start)
-	k := len(out) - count
-	if k > 0 {
-		out = discardUpperRange(out, k)
-	}
-	sort.Float64s(out)
-
-	return out
-}
-
-// discardLowerRange discards the lower k elements of the sorted data set without sorting all the data. Sorting all of
-// the data would take O(NlgN), where N is len(data), but partitioning to find the kth largest number is O(N) in the
-// average case. The remaining N-k unsorted elements are returned - no kind of ordering is guaranteed on these elements.
-func discardLowerRange(data []float64, k int) []float64 {
-	out := make([]float64, len(data)-k)
-	i := 0
-
-	// discard values lower than the desired range
-	for k > 0 {
-		lows, pivotValue, highs := partition(data)
-
-		lowLength := len(lows)
-		if lowLength > k {
-			// keep all the highs and the pivot
-			out[i] = pivotValue
-			i++
-			copy(out[i:], highs)
-			i += len(highs)
-			// iterate over the lows again
-			data = lows
-		} else {
-			// discard all the lows
-			data = highs
-			k -= lowLength
-			if k == 0 {
-				// if discarded enough lows, keep the pivot
-				out[i] = pivotValue
-				i++
-			} else {
-				// able to discard the pivot too
-				k--
-			}
-		}
-	}
-	copy(out[i:], data)
-	return out
-}
-
-// discardUpperRange discards the upper k elements of the sorted data set without sorting all the data. Sorting all of
-// the data would take O(NlgN), where N is len(data), but partitioning to find the kth largest number is O(N) in the
-// average case. The remaining N-k unsorted elements are returned - no kind of ordering is guaranteed on these elements.
-func discardUpperRange(data []float64, k int) []float64 {
-	out := make([]float64, len(data)-k)
-	i := 0
-
-	// discard values higher than the desired range
-	for k > 0 {
-		lows, pivotValue, highs := partition(data)
-
-		highLength := len(highs)
-		if highLength > k {
-			// keep all the lows and the pivot
-			out[i] = pivotValue
-			i++
-			copy(out[i:], lows)
-			i += len(lows)
-			// iterate over the highs again
-			data = highs
-		} else {
-			// discard all the highs
-			data = lows
-			k -= highLength
-			if k == 0 {
-				// if discarded enough highs, keep the pivot
-				out[i] = pivotValue
-				i++
-			} else {
-				// able to discard the pivot too
-				k--
-			}
-		}
-	}
-	copy(out[i:], data)
-	return out
-}
-
-// partition takes a list of data, chooses a random pivot index and returns a list of elements lower than the
-// pivotValue, the pivotValue, and a list of elements higher than the pivotValue.  partition mutates data.
-func partition(data []float64) (lows []float64, pivotValue float64, highs []float64) {
-	length := len(data)
-	// there are better (more complex) ways to calculate pivotIndex (e.g. median of 3, median of 3 medians) if this
-	// proves to be inadequate.
-	pivotIndex := rand.Int() % length
-	pivotValue = data[pivotIndex]
-	low, high := 1, length-1
-
-	// put the pivot in the first position
-	data[pivotIndex], data[0] = data[0], data[pivotIndex]
-
-	// partition the data around the pivot
-	for low <= high {
-		for low <= high && data[low] <= pivotValue {
-			low++
-		}
-		for high >= low && data[high] >= pivotValue {
-			high--
-		}
-		if low < high {
-			data[low], data[high] = data[high], data[low]
-		}
-	}
-
-	return data[1:low], pivotValue, data[high+1:]
-}
-
-type minMaxMapOut struct {
-	Time   int64
-	Val    float64
-	Type   NumberType
-	Fields map[string]interface{}
-	Tags   map[string]string
-}
-
-// MapMin collects the values to pass to the reducer
-func MapMin(input *MapInput, fieldName string) interface{} {
-	min := &minMaxMapOut{}
-
-	pointsYielded := false
-	var val float64
-
-	for _, item := range input.Items {
-		switch v := item.Value.(type) {
-		case float64:
-			val = v
-		case int64:
-			val = float64(v)
-			min.Type = Int64Type
-		case map[string]interface{}:
-			if d, t, ok := decodeValueAndNumberType(v[fieldName]); ok {
-				val, min.Type = d, t
-			} else {
-				continue
-			}
-		}
-
-		// Initialize min
-		if !pointsYielded {
-			min.Time = item.Timestamp
-			min.Val = val
-			min.Fields = item.Fields
-			min.Tags = item.Tags
-			pointsYielded = true
-		}
-
-		current := min.Val
-		min.Val = math.Min(min.Val, val)
-
-		// Check to see if the value changed, if so, update the fields/tags
-		if current != min.Val {
-			min.Time = item.Timestamp
-			min.Fields = item.Fields
-			min.Tags = item.Tags
-		}
-	}
-	if pointsYielded {
-		return min
-	}
-	return nil
-}
-
-// ReduceMin computes the min of value.
-func ReduceMin(values []interface{}) interface{} {
-	var curr *minMaxMapOut
-	for _, value := range values {
-		v, _ := value.(*minMaxMapOut)
-		if v == nil {
-			continue
-		}
-
-		// Replace current if lower value.
-		if curr == nil || v.Val < curr.Val || (v.Val == curr.Val && v.Time < curr.Time) {
-			curr = v
-		}
-	}
-
-	if curr == nil {
-		return nil
-	}
-
-	switch curr.Type {
-	case Float64Type:
-		return PositionPoint{
-			Time:   curr.Time,
-			Value:  curr.Val,
-			Fields: curr.Fields,
-			Tags:   curr.Tags,
-		}
-	case Int64Type:
-		return PositionPoint{
-			Time:   curr.Time,
-			Value:  int64(curr.Val),
-			Fields: curr.Fields,
-			Tags:   curr.Tags,
-		}
-	default:
-		return nil
-	}
-}
-
-func decodeValueAndNumberType(v interface{}) (float64, NumberType, bool) {
-	switch n := v.(type) {
-	case float64:
-		return n, Float64Type, true
-	case int64:
-		return float64(n), Int64Type, true
-	default:
-		return 0, Float64Type, false
-	}
-}
-
-// MapMax collects the values to pass to the reducer
-func MapMax(input *MapInput, fieldName string) interface{} {
-	max := &minMaxMapOut{}
-
-	pointsYielded := false
-	var val float64
-
-	for _, item := range input.Items {
-		switch v := item.Value.(type) {
-		case float64:
-			val = v
-		case int64:
-			val = float64(v)
-			max.Type = Int64Type
-		case map[string]interface{}:
-			if d, t, ok := decodeValueAndNumberType(v[fieldName]); ok {
-				val, max.Type = d, t
-			} else {
-				continue
-			}
-		}
-
-		// Initialize max
-		if !pointsYielded {
-			max.Time = item.Timestamp
-			max.Val = val
-			max.Fields = item.Fields
-			max.Tags = item.Tags
-			pointsYielded = true
-		}
-		current := max.Val
-		max.Val = math.Max(max.Val, val)
-
-		// Check to see if the value changed, if so, update the fields/tags
-		if current != max.Val {
-			max.Time = item.Timestamp
-			max.Fields = item.Fields
-			max.Tags = item.Tags
-		}
-	}
-	if pointsYielded {
-		return max
-	}
-	return nil
-}
-
-// ReduceMax computes the max of value.
-func ReduceMax(values []interface{}) interface{} {
-	var curr *minMaxMapOut
-	for _, value := range values {
-		v, _ := value.(*minMaxMapOut)
-		if v == nil {
-			continue
-		}
-
-		// Replace current if higher value.
-		if curr == nil || v.Val > curr.Val || (v.Val == curr.Val && v.Time < curr.Time) {
-			curr = v
-		}
-	}
-
-	if curr == nil {
-		return nil
-	}
-
-	switch curr.Type {
-	case Float64Type:
-		return PositionPoint{
-			Time:   curr.Time,
-			Value:  curr.Val,
-			Fields: curr.Fields,
-			Tags:   curr.Tags,
-		}
-	case Int64Type:
-		return PositionPoint{
-			Time:   curr.Time,
-			Value:  int64(curr.Val),
-			Fields: curr.Fields,
-			Tags:   curr.Tags,
-		}
-	default:
-		return nil
-	}
-}
-
-type spreadMapOutput struct {
-	Min, Max float64
-	Type     NumberType
-}
-
-// MapSpread collects the values to pass to the reducer
-func MapSpread(input *MapInput) interface{} {
-	out := &spreadMapOutput{}
-	pointsYielded := false
-	var val float64
-
-	for _, item := range input.Items {
-		switch v := item.Value.(type) {
-		case float64:
-			val = v
-		case int64:
-			val = float64(v)
-			out.Type = Int64Type
-		}
-
-		// Initialize
-		if !pointsYielded {
-			out.Max = val
-			out.Min = val
-			pointsYielded = true
-		}
-		out.Max = math.Max(out.Max, val)
-		out.Min = math.Min(out.Min, val)
-	}
-	if pointsYielded {
-		return out
-	}
-	return nil
-}
-
-// ReduceSpread computes the spread of values.
-func ReduceSpread(values []interface{}) interface{} {
-	result := &spreadMapOutput{}
-	pointsYielded := false
-
-	for _, v := range values {
-		if v == nil {
-			continue
-		}
-		val := v.(*spreadMapOutput)
-		// Initialize
-		if !pointsYielded {
-			result.Max = val.Max
-			result.Min = val.Min
-			result.Type = val.Type
-			pointsYielded = true
-		}
-		result.Max = math.Max(result.Max, val.Max)
-		result.Min = math.Min(result.Min, val.Min)
-	}
-	if pointsYielded {
-		switch result.Type {
-		case Float64Type:
-			return result.Max - result.Min
-		case Int64Type:
-			return int64(result.Max - result.Min)
-		}
-	}
-	return nil
-}
-
-// MapStddev collects the values to pass to the reducer
-func MapStddev(input *MapInput) interface{} {
-	var a []float64
-	for _, item := range input.Items {
-		switch v := item.Value.(type) {
-		case float64:
-			a = append(a, v)
-		case int64:
-			a = append(a, float64(v))
-		}
-	}
-	return a
-}
-
-// ReduceStddev computes the stddev of values.
-func ReduceStddev(values []interface{}) interface{} {
-	var data []float64
-	// Collect all the data points
-	for _, value := range values {
-		if value == nil {
-			continue
-		}
-		data = append(data, value.([]float64)...)
-	}
-
-	// If no data or we only have one point, it's nil or undefined
-	if len(data) < 2 {
-		return nil
-	}
-
-	// Get the mean
-	var mean float64
-	var count int
-	for _, v := range data {
-		count++
-		mean += (v - mean) / float64(count)
-	}
-	// Get the variance
-	var variance float64
-	for _, v := range data {
-		dif := v - mean
-		sq := math.Pow(dif, 2)
-		variance += sq
-	}
-	variance = variance / float64(count-1)
-	stddev := math.Sqrt(variance)
-
-	return stddev
-}
-
-type firstLastMapOutput struct {
-	Time   int64
-	Value  interface{}
-	Fields map[string]interface{}
-	Tags   map[string]string
-}
-
-// MapFirst collects the values to pass to the reducer
-// This function assumes time ordered input
-func MapFirst(input *MapInput, fieldName string) interface{} {
-	if len(input.Items) == 0 {
-		return nil
-	}
-
-	k, v := input.Items[0].Timestamp, input.Items[0].Value
-	tags := input.Items[0].Tags
-	fields := input.Items[0].Fields
-	if n, ok := v.(map[string]interface{}); ok {
-		v = n[fieldName]
-	}
-
-	// Find greatest value at same timestamp.
-	for _, item := range input.Items[1:] {
-		nextk, nextv := item.Timestamp, item.Value
-		if nextk != k {
-			break
-		}
-		if n, ok := nextv.(map[string]interface{}); ok {
-			nextv = n[fieldName]
-		}
-
-		if greaterThan(nextv, v) {
-			fields = item.Fields
-			tags = item.Tags
-			v = nextv
-		}
-	}
-	return &firstLastMapOutput{Time: k, Value: v, Fields: fields, Tags: tags}
-}
-
-// ReduceFirst computes the first of value.
-func ReduceFirst(values []interface{}) interface{} {
-	out := &firstLastMapOutput{}
-	pointsYielded := false
-
-	for _, v := range values {
-		if v == nil {
-			continue
-		}
-		val := v.(*firstLastMapOutput)
-		// Initialize first
-		if !pointsYielded {
-			out.Time = val.Time
-			out.Value = val.Value
-			out.Fields = val.Fields
-			out.Tags = val.Tags
-			pointsYielded = true
-		}
-		if val.Time < out.Time {
-			out.Time = val.Time
-			out.Value = val.Value
-			out.Fields = val.Fields
-			out.Tags = val.Tags
-		} else if val.Time == out.Time && greaterThan(val.Value, out.Value) {
-			out.Value = val.Value
-			out.Fields = val.Fields
-			out.Tags = val.Tags
-		}
-	}
-	if pointsYielded {
-		return PositionPoint{
-			Time:   out.Time,
-			Value:  out.Value,
-			Fields: out.Fields,
-			Tags:   out.Tags,
-		}
-	}
-	return nil
-}
-
-// MapLast collects the values to pass to the reducer
-func MapLast(input *MapInput, fieldName string) interface{} {
-	out := &firstLastMapOutput{}
-	pointsYielded := false
-
-	for _, item := range input.Items {
-		k, v := item.Timestamp, item.Value
-		if m, ok := v.(map[string]interface{}); ok {
-			v = m[fieldName]
-		}
-
-		// Initialize last
-		if !pointsYielded {
-			out.Time = k
-			out.Value = v
-			out.Fields = item.Fields
-			out.Tags = item.Tags
-			pointsYielded = true
-		}
-		if k > out.Time {
-			out.Time = k
-			out.Value = v
-			out.Fields = item.Fields
-			out.Tags = item.Tags
-		} else if k == out.Time && greaterThan(v, out.Value) {
-			out.Value = v
-			out.Fields = item.Fields
-			out.Tags = item.Tags
-		}
-	}
-	if pointsYielded {
-		return out
-	}
-	return nil
-}
-
-// ReduceLast computes the last of value.
-func ReduceLast(values []interface{}) interface{} {
-	out := &firstLastMapOutput{}
-	pointsYielded := false
-
-	for _, v := range values {
-		if v == nil {
-			continue
-		}
-
-		val := v.(*firstLastMapOutput)
-		// Initialize last
-		if !pointsYielded {
-			out.Time = val.Time
-			out.Value = val.Value
-			out.Fields = val.Fields
-			out.Tags = val.Tags
-			pointsYielded = true
-		}
-		if val.Time > out.Time {
-			out.Time = val.Time
-			out.Value = val.Value
-			out.Fields = val.Fields
-			out.Tags = val.Tags
-		} else if val.Time == out.Time && greaterThan(val.Value, out.Value) {
-			out.Value = val.Value
-			out.Fields = val.Fields
-			out.Tags = val.Tags
-		}
-	}
-	if pointsYielded {
-		return PositionPoint{
-			Time:   out.Time,
-			Value:  out.Value,
-			Fields: out.Fields,
-			Tags:   out.Tags,
-		}
-	}
-	return nil
-}
-
-type positionOut struct {
-	points   PositionPoints
-	callArgs []string // ordered args in the call
-}
-
-func (p *positionOut) lessKey(a, b *PositionPoint) bool {
-	t1, t2 := a.Tags, b.Tags
-	for _, k := range p.callArgs {
-		if t1[k] != t2[k] {
-			return t1[k] < t2[k]
-		}
-	}
-	return false
-}
-
-// typeCompare compares the types of a and b and returns an arbitrary ordering.
-// It returns -1 if type(a) < type(b) , 0 if type(a) == type(b), or 1 if type(a) > type(b), following the strcmp convention
-// from C.
-//
-// If the types are not equal, then it will attempt to coerce them to floating point and return them in the last 2 arguments.
-// If the type cannot be coerced to floating point, it is returned unaltered.
-func typeCompare(a, b interface{}) (int, interface{}, interface{}) {
-	const (
-		stringWeight = iota
-		boolWeight
-		intWeight
-		floatWeight
-	)
-
-	va := reflect.ValueOf(a)
-	vb := reflect.ValueOf(b)
-
-	vakind := va.Type().Kind()
-	vbkind := vb.Type().Kind()
-
-	// same kind. Ordering is dependent on value
-	if vakind == vbkind {
-		return 0, a, b
-	}
-	wa, a := inferFloat(va)
-	wb, b := inferFloat(vb)
-	if wa < wb {
-		return -1, a, b
-	} else if wa == wb {
-		return 0, a, b
-	}
-	return 1, a, b
-}
-
-// returns a weighting and if applicable, the value coerced to a float
-func inferFloat(v reflect.Value) (weight int, value interface{}) {
-	const (
-		stringWeight = iota
-		boolWeight
-		intWeight
-		floatWeight
-	)
-	kind := v.Kind()
-	switch kind {
-	case reflect.Uint64, reflect.Uint32, reflect.Uint16, reflect.Uint8:
-		return intWeight, float64(v.Uint())
-	case reflect.Int64, reflect.Int32, reflect.Int16, reflect.Int8:
-		return intWeight, float64(v.Int())
-	case reflect.Float64, reflect.Float32:
-		return floatWeight, v.Float()
-	case reflect.Bool:
-		return boolWeight, v.Interface()
-	case reflect.String:
-		return stringWeight, v.Interface()
-	}
-	panic(fmt.Sprintf("InterfaceValues.Less - unreachable code; type was %T", v.Interface()))
-}
-
-func cmpFloat(a, b float64) int {
-	if a == b {
-		return 0
-	} else if a < b {
-		return -1
-	}
-	return 1
-}
-
-func cmpInt(a, b int64) int {
-	if a == b {
-		return 0
-	} else if a < b {
-		return -1
-	}
-	return 1
-}
-
-func cmpUint(a, b uint64) int {
-	if a == b {
-		return 0
-	} else if a < b {
-		return -1
-	}
-	return 1
-}
-
-// valueCompare returns -1 if a < b , 0 if a == b, or 1 if a > b
-// If the interfaces are 2 different types, then 0 is returned
-func valueCompare(a, b interface{}) int {
-	if reflect.TypeOf(a).Kind() != reflect.TypeOf(b).Kind() {
-		return 0
-	}
-	// compare by float64/int64 first as that is the most likely match
-	{
-		d1, ok1 := a.(float64)
-		d2, ok2 := b.(float64)
-		if ok1 && ok2 {
-			return cmpFloat(d1, d2)
-		}
-	}
-
-	{
-		d1, ok1 := a.(int64)
-		d2, ok2 := b.(int64)
-		if ok1 && ok2 {
-			return cmpInt(d1, d2)
-		}
-	}
-
-	// compare by every numeric type left
-	{
-		d1, ok1 := a.(float32)
-		d2, ok2 := b.(float32)
-		if ok1 && ok2 {
-			return cmpFloat(float64(d1), float64(d2))
-		}
-	}
-
-	{
-		d1, ok1 := a.(uint64)
-		d2, ok2 := b.(uint64)
-		if ok1 && ok2 {
-			return cmpUint(d1, d2)
-		}
-	}
-
-	{
-		d1, ok1 := a.(uint32)
-		d2, ok2 := b.(uint32)
-		if ok1 && ok2 {
-			return cmpUint(uint64(d1), uint64(d2))
-		}
-	}
-
-	{
-		d1, ok1 := a.(uint16)
-		d2, ok2 := b.(uint16)
-		if ok1 && ok2 {
-			return cmpUint(uint64(d1), uint64(d2))
-		}
-	}
-
-	{
-		d1, ok1 := a.(uint8)
-		d2, ok2 := b.(uint8)
-		if ok1 && ok2 {
-			return cmpUint(uint64(d1), uint64(d2))
-		}
-	}
-
-	{
-		d1, ok1 := a.(int32)
-		d2, ok2 := b.(int32)
-		if ok1 && ok2 {
-			return cmpInt(int64(d1), int64(d2))
-		}
-	}
-
-	{
-		d1, ok1 := a.(int16)
-		d2, ok2 := b.(int16)
-		if ok1 && ok2 {
-			return cmpInt(int64(d1), int64(d2))
-		}
-	}
-
-	{
-		d1, ok1 := a.(int8)
-		d2, ok2 := b.(int8)
-		if ok1 && ok2 {
-			return cmpInt(int64(d1), int64(d2))
-		}
-	}
-
-	{
-		d1, ok1 := a.(bool)
-		d2, ok2 := b.(bool)
-		if ok1 && ok2 {
-			if d1 == d2 {
-				return 0
-			} else if d1 == true && d2 == false {
-				return 1
-			}
-			return -1
-		}
-	}
-
-	{
-		d1, ok1 := a.(string)
-		d2, ok2 := b.(string)
-		if ok1 && ok2 {
-			if d1 == d2 {
-				return 0
-			}
-			if d1 > d2 {
-				return 1
-			}
-			return -1
-		}
-	}
-	panic(fmt.Sprintf("unreachable code; types were %T, %T", a, b))
-}
-
-// PositionPoints is a slice of PositionPoints used to return richer data from a reduce func
-type PositionPoints []PositionPoint
-
-// PositionPoint will return all data points from a written point that were selected in the query
-// to be used in the post processing phase of the query executor to fill in additional
-// tag and field values
-type PositionPoint struct {
-	Time   int64
-	Value  interface{}
-	Fields map[string]interface{}
-	Tags   map[string]string
-}
-
-type topBottomMapOut struct {
-	*positionOut
-	bottom bool
-}
-
-func (t *topBottomMapOut) Len() int      { return len(t.points) }
-func (t *topBottomMapOut) Swap(i, j int) { t.points[i], t.points[j] = t.points[j], t.points[i] }
-func (t *topBottomMapOut) Less(i, j int) bool {
-	return t.positionPointLess(&t.points[i], &t.points[j])
-}
-
-func (t *topBottomMapOut) positionPointLess(pa, pb *PositionPoint) bool {
-	// old C trick makes this code easier to read. Imagine
-	// that the OP in "cmp(i, j) OP 0" is the comparison you want
-	// between i and j
-	cmpt, a, b := typeCompare(pa.Value, pb.Value)
-	cmpv := valueCompare(a, b)
-	if cmpv != 0 {
-		if t.bottom {
-			return cmpv > 0
-		}
-		return cmpv < 0
-	}
-	if cmpt != 0 {
-		return cmpt < 0
-	}
-	k1, k2 := pa.Time, pb.Time
-	if k1 != k2 {
-		return k1 > k2
-	}
-	return !t.lessKey(pa, pb)
-}
-
-// We never use this function, so make it a no-op.
-func (t *topBottomMapOut) Push(i interface{}) {
-	panic("someone used the function")
-}
-
-// this function doesn't return anything meaningful, since we don't look at the
-// return value and we don't want to allocate for generating an interface.
-func (t *topBottomMapOut) Pop() interface{} {
-	t.points = t.points[:len(t.points)-1]
-	return nil
-}
-
-func (t *topBottomMapOut) insert(p PositionPoint) {
-	t.points[0] = p
-	heap.Fix(t, 0)
-}
-
-type topBottomReduceOut struct {
-	positionOut
-	bottom bool
-}
-
-func (t topBottomReduceOut) Len() int      { return len(t.points) }
-func (t topBottomReduceOut) Swap(i, j int) { t.points[i], t.points[j] = t.points[j], t.points[i] }
-func (t topBottomReduceOut) Less(i, j int) bool {
-	// Now sort by time first, not value
-
-	k1, k2 := t.points[i].Time, t.points[j].Time
-	if k1 != k2 {
-		return k1 < k2
-	}
-	cmpt, a, b := typeCompare(t.points[i].Value, t.points[j].Value)
-	cmpv := valueCompare(a, b)
-	if cmpv != 0 {
-		if t.bottom {
-			return cmpv < 0
-		}
-		return cmpv > 0
-	}
-	if cmpt != 0 {
-		return cmpt < 0
-	}
-	return t.lessKey(&t.points[i], &t.points[j])
-}
-
-// callArgs will get any additional field/tag names that may be needed to sort with
-// it is important to maintain the order of these that they were asked for in the call
-// for sorting purposes
-func topCallArgs(c *influxql.Call) []string {
-	var names []string
-	for _, v := range c.Args[1 : len(c.Args)-1] {
-		if f, ok := v.(*influxql.VarRef); ok {
-			names = append(names, f.Val)
-		}
-	}
-	return names
-}
-
-func tagkeytop(args []string, fields map[string]interface{}, keys map[string]string) string {
-	key := ""
-	for _, a := range args {
-		if v, ok := fields[a]; ok {
-			key += a + ":" + fmt.Sprintf("%v", v) + ","
-			continue
-		}
-		if v, ok := keys[a]; ok {
-			key += a + ":" + v + ","
-			continue
-		}
-	}
-	return key
-}
-
-// map iterator. We need this for the top
-// query, but luckily that doesn't require ordered
-// iteration, so we can fake it
-type mapIter struct {
-	m          map[string]PositionPoint
-	currTags   map[string]string
-	currFields map[string]interface{}
-	tmin       int64
-}
-
-func (m *mapIter) TMin() int64 {
-	return m.tmin
-}
-
-func (m *mapIter) Fields() map[string]interface{} {
-	return m.currFields
-}
-
-func (m *mapIter) Tags() map[string]string {
-	return m.currTags
-}
-
-func (m *mapIter) Next() (time int64, value interface{}) {
-	// this is a bit ugly, but can't think of  any other way that doesn't involve dumping
-	// the entire map to an array
-	for key, p := range m.m {
-		m.currFields = p.Fields
-		m.currTags = p.Tags
-		time = p.Time
-		value = p.Value
-		delete(m.m, key)
-		return
-	}
-	return -1, nil
-}
-
-// MapTopBottom emits the top/bottom data points for each group by interval
-func MapTopBottom(input *MapInput, limit int, fields []string, argCount int, callName string) interface{} {
-	out := positionOut{callArgs: fields}
-	out.points = make([]PositionPoint, 0, limit)
-	minheap := topBottomMapOut{
-		&out,
-		callName == "bottom",
-	}
-	tagmap := make(map[string]PositionPoint)
-
-	// throughout this function, we refer to max and top. This is by the ordering specified by
-	// minheap, not the ordering based on value. Since this function handles both top and bottom
-	// max can be the lowest valued entry.
-
-	// buffer so we don't allocate every time through
-	var pp PositionPoint
-
-	if argCount > 2 {
-		// this is a tag aggregating query.
-		// For each unique permutation of the tags given,
-		// select the max and then fall through to select top of those
-		// points
-		for _, item := range input.Items {
-			pp = PositionPoint{
-				Time:   item.Timestamp,
-				Value:  item.Value,
-				Fields: item.Fields,
-				Tags:   item.Tags,
-			}
-			tags := item.Tags
-
-			// TODO in the future we need to send in fields as well
-			// this will allow a user to query on both fields and tags
-			// fields will take the priority over tags if there is a name collision
-			key := tagkeytop(fields, nil, tags)
-			p, ok := tagmap[key]
-			if !ok || minheap.positionPointLess(&p, &pp) {
-				tagmap[key] = pp
-			}
-		}
-
-		items := make([]MapItem, 0, len(tagmap))
-		for _, p := range tagmap {
-			items = append(items, MapItem{Timestamp: p.Time, Value: p.Value, Fields: p.Fields, Tags: p.Tags})
-		}
-		input = &MapInput{
-			TMin:  input.TMin,
-			Items: items,
-		}
-	}
-
-	for _, item := range input.Items {
-		t := item.Timestamp
-		if input.TMin > -1 {
-			t = input.TMin
-		}
-		if len(out.points) < limit {
-			out.points = append(out.points, PositionPoint{t, item.Value, item.Fields, item.Tags})
-			if len(out.points) == limit {
-				heap.Init(&minheap)
-			}
-		} else {
-			// we're over the limit, so find out if we're bigger than the
-			// smallest point in the set and eject it if we are
-			minval := &out.points[0]
-			pp = PositionPoint{t, item.Value, item.Fields, item.Tags}
-			if minheap.positionPointLess(minval, &pp) {
-				minheap.insert(pp)
-			}
-		}
-	}
-
-	// should only happen on empty iterator.
-	if len(out.points) == 0 {
-		return nil
-	} else if len(out.points) < limit {
-		// it would be as fast to just sort regularly here,
-		// but falling down to the heapsort will mean we can get
-		// rid of another sort order.
-		heap.Init(&minheap)
-	}
-
-	// minheap should now contain the largest/smallest values that were encountered
-	// during iteration.
-	//
-	// we want these values in ascending sorted order. We can achieve this by iteratively
-	// removing the lowest element and putting it at the end of the array. This is analogous
-	// to a heap sort.
-	//
-	// computer science is fun!
-	result := out.points
-	for len(out.points) > 0 {
-		p := out.points[0]
-		heap.Pop(&minheap)
-
-		// reslice so that we can get to the element just after the heap
-		endslice := out.points[:len(out.points)+1]
-		endslice[len(endslice)-1] = p
-	}
-
-	// the ascending order is now in the result slice
-	return result
-}
-
-// ReduceTop computes the top values for each key.
-// This function assumes that its inputs are in sorted ascending order.
-func ReduceTopBottom(values []interface{}, limit int, fields []string, callName string) interface{} {
-	out := positionOut{callArgs: fields}
-	minheap := topBottomMapOut{&out, callName == "bottom"}
-	results := make([]PositionPoints, 0, len(values))
-	out.points = make([]PositionPoint, 0, limit)
-	for _, v := range values {
-		if v == nil {
-			continue
-		}
-
-		o, ok := v.(PositionPoints)
-		if !ok {
-			continue
-		}
-
-		results = append(results, o)
-	}
-
-	// These ranges are all in sorted ascending order
-	// so we can grab the top value out of all of them
-	// to figure out the top X ones.
-	keys := map[string]struct{}{}
-	for i := 0; i < limit; i++ {
-		var max *PositionPoint
-		whichselected := -1
-		for iter, v := range results {
-			// ignore if there are no values or if value is less.
-			if len(v) == 0 {
-				continue
-			} else if max != nil && !minheap.positionPointLess(max, &v[0]) {
-				continue
-			}
-
-			// ignore if we've already appended this key.
-			if len(fields) > 0 {
-				tagkey := tagkeytop(fields, nil, v[0].Tags)
-				if _, ok := keys[tagkey]; ok {
-					continue
-				}
-			}
-
-			max = &v[0]
-			whichselected = iter
-		}
-
-		if whichselected == -1 {
-			break
-		}
-
-		v := results[whichselected]
-
-		tagkey := tagkeytop(fields, nil, v[0].Tags)
-		keys[tagkey] = struct{}{}
-
-		out.points = append(out.points, v[0])
-		results[whichselected] = v[1:]
-	}
-
-	// now we need to resort the tops by time
-	sort.Sort(topBottomReduceOut{out, callName == "bottom"})
-
-	return out.points
-}
-
-// MapEcho emits the data points for each group by interval
-func MapEcho(input *MapInput) interface{} {
-	var values []interface{}
-	for _, item := range input.Items {
-		values = append(values, item.Value)
-	}
-	return values
-}
-
-// ReducePercentile computes the percentile of values for each key.
-func ReducePercentile(values []interface{}, percentile float64) interface{} {
-
-	var allValues []float64
-
-	for _, v := range values {
-		if v == nil {
-			continue
-		}
-
-		vals := v.([]interface{})
-		for _, v := range vals {
-			switch v.(type) {
-			case int64:
-				allValues = append(allValues, float64(v.(int64)))
-			case float64:
-				allValues = append(allValues, v.(float64))
-			}
-		}
-	}
-
-	sort.Float64s(allValues)
-	length := len(allValues)
-	index := int(math.Floor(float64(length)*percentile/100.0+0.5)) - 1
-
-	if index < 0 || index >= len(allValues) {
-		return nil
-	}
-
-	return allValues[index]
-}
-
-// IsNumeric returns whether a given aggregate can only be run on numeric fields.
-func IsNumeric(c *influxql.Call) bool {
-	switch c.Name {
-	case "count", "first", "last", "distinct":
-		return false
-	default:
-		return true
-	}
-}
-
-// MapRawQuery is for queries without aggregates
-func MapRawQuery(input *MapInput) interface{} {
-	var values []*rawQueryMapOutput
-	for _, item := range input.Items {
-		values = append(values, &rawQueryMapOutput{item.Timestamp, item.Value})
-	}
-	return values
-}
-
-type rawQueryMapOutput struct {
-	Time   int64
-	Values interface{}
-}
-
-func (r *rawQueryMapOutput) String() string {
-	return fmt.Sprintf("{%#v %#v}", r.Time, r.Values)
-}
-
-type rawOutputs []*rawQueryMapOutput
-
-func (a rawOutputs) Len() int           { return len(a) }
-func (a rawOutputs) Less(i, j int) bool { return a[i].Time < a[j].Time }
-func (a rawOutputs) Swap(i, j int)      { a[i], a[j] = a[j], a[i] }
-
-func greaterThan(a, b interface{}) bool {
-	switch t := a.(type) {
-	case int64:
-		return t > b.(int64)
-	case float64:
-		return t > b.(float64)
-	case string:
-		return t > b.(string)
-	case bool:
-		return t == true
-	}
-	return false
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/functions_test.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/functions_test.go
deleted file mode 100644
index 9bbf1eff0..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/functions_test.go
+++ /dev/null
@@ -1,865 +0,0 @@
-package tsdb
-
-import (
-	"reflect"
-	"testing"
-	"time"
-
-	"github.com/davecgh/go-spew/spew"
-	"github.com/influxdb/influxdb/influxql"
-)
-
-import "sort"
-
-// type testPoint struct {
-// 	time   int64
-// 	value  interface{}
-// 	fields map[string]interface{}
-// 	tags   map[string]string
-// }
-
-func TestMapMeanNoValues(t *testing.T) {
-	if got := MapMean(&MapInput{}); got != nil {
-		t.Errorf("output mismatch: exp nil got %v", got)
-	}
-}
-
-func TestMapMean(t *testing.T) {
-
-	tests := []struct {
-		input  *MapInput
-		output *meanMapOutput
-	}{
-		{ // Single point
-			input: &MapInput{
-				Items: []MapItem{
-					{Timestamp: 1, Value: 1.0},
-				},
-			},
-			output: &meanMapOutput{1, 1, Float64Type},
-		},
-		{ // Two points
-			input: &MapInput{
-				Items: []MapItem{
-					{Timestamp: 1, Value: float64(2.0)},
-					{Timestamp: 2, Value: float64(8.0)},
-				},
-			},
-			output: &meanMapOutput{2, 10.0, Float64Type},
-		},
-	}
-
-	for _, test := range tests {
-		got := MapMean(test.input)
-		if got == nil {
-			t.Fatalf("MapMean(%v): output mismatch: exp %v got %v", test.input, test.output, got)
-		}
-
-		if got.(*meanMapOutput).Count != test.output.Count || got.(*meanMapOutput).Total != test.output.Total {
-			t.Errorf("output mismatch: exp %v got %v", test.output, got)
-		}
-	}
-}
-
-func TestInitializeMapFuncDerivative(t *testing.T) {
-
-	for _, fn := range []string{"derivative", "non_negative_derivative"} {
-		// Single field arg should return MapEcho
-		c := &influxql.Call{
-			Name: fn,
-			Args: []influxql.Expr{
-				&influxql.VarRef{Val: " field1"},
-				&influxql.DurationLiteral{Val: time.Hour},
-			},
-		}
-
-		_, err := initializeMapFunc(c)
-		if err != nil {
-			t.Errorf("InitializeMapFunc(%v) unexpected error.  got %v", c, err)
-		}
-
-		// Nested Aggregate func should return the map func for the nested aggregate
-		c = &influxql.Call{
-			Name: fn,
-			Args: []influxql.Expr{
-				&influxql.Call{Name: "mean", Args: []influxql.Expr{&influxql.VarRef{Val: "field1"}}},
-				&influxql.DurationLiteral{Val: time.Hour},
-			},
-		}
-
-		_, err = initializeMapFunc(c)
-		if err != nil {
-			t.Errorf("InitializeMapFunc(%v) unexpected error.  got %v", c, err)
-		}
-	}
-}
-
-func TestReducePercentileNil(t *testing.T) {
-
-	input := []interface{}{
-		nil,
-	}
-
-	// ReducePercentile should ignore nil values when calculating the percentile
-	got := ReducePercentile(input, 100)
-	if got != nil {
-		t.Fatalf("ReducePercentile(100) returned wrong type. exp nil got %v", got)
-	}
-}
-
-func TestMapDistinct(t *testing.T) {
-	const ( // prove that we're ignoring time
-		timeId1 = iota + 1
-		timeId2
-		timeId3
-		timeId4
-		timeId5
-		timeId6
-	)
-
-	input := &MapInput{
-		Items: []MapItem{
-			{Timestamp: timeId1, Value: uint64(1)},
-			{Timestamp: timeId2, Value: uint64(1)},
-			{Timestamp: timeId3, Value: "1"},
-			{Timestamp: timeId4, Value: uint64(1)},
-			{Timestamp: timeId5, Value: float64(1.0)},
-			{Timestamp: timeId6, Value: "1"},
-		},
-	}
-
-	values := MapDistinct(input).(InterfaceValues)
-
-	if exp, got := 3, len(values); exp != got {
-		t.Errorf("Wrong number of values. exp %v got %v", exp, got)
-	}
-
-	sort.Sort(values)
-
-	exp := InterfaceValues{
-		"1",
-		uint64(1),
-		float64(1),
-	}
-
-	if !reflect.DeepEqual(values, exp) {
-		t.Errorf("Wrong values. exp %v got %v", spew.Sdump(exp), spew.Sdump(values))
-	}
-}
-
-func TestMapDistinctNil(t *testing.T) {
-	values := MapDistinct(&MapInput{})
-
-	if values != nil {
-		t.Errorf("Wrong values. exp nil got %v", spew.Sdump(values))
-	}
-}
-
-func TestReduceDistinct(t *testing.T) {
-	v1 := InterfaceValues{
-		"2",
-		"1",
-		float64(2.0),
-		float64(1),
-		uint64(2),
-		uint64(1),
-		true,
-		false,
-	}
-
-	expect := InterfaceValues{
-		"1",
-		"2",
-		false,
-		true,
-		uint64(1),
-		float64(1),
-		uint64(2),
-		float64(2),
-	}
-
-	got := ReduceDistinct([]interface{}{v1, v1, expect})
-
-	if !reflect.DeepEqual(got, expect) {
-		t.Errorf("Wrong values. exp %v got %v", spew.Sdump(expect), spew.Sdump(got))
-	}
-}
-
-func TestReduceDistinctNil(t *testing.T) {
-	tests := []struct {
-		name   string
-		values []interface{}
-	}{
-		{
-			name:   "nil values",
-			values: nil,
-		},
-		{
-			name:   "nil mapper",
-			values: []interface{}{nil},
-		},
-		{
-			name:   "no mappers",
-			values: []interface{}{},
-		},
-		{
-			name:   "empty mappper (len 1)",
-			values: []interface{}{InterfaceValues{}},
-		},
-		{
-			name:   "empty mappper (len 2)",
-			values: []interface{}{InterfaceValues{}, InterfaceValues{}},
-		},
-	}
-
-	for _, test := range tests {
-		t.Log(test.name)
-		got := ReduceDistinct(test.values)
-		if got != nil {
-			t.Errorf("Wrong values. exp nil got %v", spew.Sdump(got))
-		}
-	}
-}
-
-func Test_distinctValues_Sort(t *testing.T) {
-	values := InterfaceValues{
-		"2",
-		"1",
-		float64(2.0),
-		float64(1),
-		uint64(2),
-		uint64(1),
-		true,
-		false,
-	}
-
-	expect := InterfaceValues{
-		"1",
-		"2",
-		false,
-		true,
-		uint64(1),
-		float64(1),
-		uint64(2),
-		float64(2),
-	}
-
-	sort.Sort(values)
-
-	if !reflect.DeepEqual(values, expect) {
-		t.Errorf("Wrong values. exp %v got %v", spew.Sdump(expect), spew.Sdump(values))
-	}
-}
-
-func TestMapCountDistinct(t *testing.T) {
-	const ( // prove that we're ignoring time
-		timeId1 = iota + 1
-		timeId2
-		timeId3
-		timeId4
-		timeId5
-		timeId6
-		timeId7
-	)
-
-	input := &MapInput{
-		Items: []MapItem{
-			{Timestamp: timeId1, Value: uint64(1)},
-			{Timestamp: timeId2, Value: uint64(1)},
-			{Timestamp: timeId3, Value: "1"},
-			{Timestamp: timeId4, Value: uint64(1)},
-			{Timestamp: timeId5, Value: float64(1.0)},
-			{Timestamp: timeId6, Value: "1"},
-			{Timestamp: timeId7, Value: true},
-		},
-	}
-
-	values := MapCountDistinct(input).(map[interface{}]struct{})
-
-	if exp, got := 4, len(values); exp != got {
-		t.Errorf("Wrong number of values. exp %v got %v", exp, got)
-	}
-
-	exp := map[interface{}]struct{}{
-		uint64(1):  struct{}{},
-		float64(1): struct{}{},
-		"1":        struct{}{},
-		true:       struct{}{},
-	}
-
-	if !reflect.DeepEqual(values, exp) {
-		t.Errorf("Wrong values. exp %v got %v", spew.Sdump(exp), spew.Sdump(values))
-	}
-}
-
-func TestMapCountDistinctNil(t *testing.T) {
-	if values := MapCountDistinct(&MapInput{}); values != nil {
-		t.Errorf("Wrong values. exp nil got %v", spew.Sdump(values))
-	}
-}
-
-func TestReduceCountDistinct(t *testing.T) {
-	v1 := map[interface{}]struct{}{
-		"2":          struct{}{},
-		"1":          struct{}{},
-		float64(2.0): struct{}{},
-		float64(1):   struct{}{},
-		uint64(2):    struct{}{},
-		uint64(1):    struct{}{},
-		true:         struct{}{},
-		false:        struct{}{},
-	}
-
-	v2 := map[interface{}]struct{}{
-		uint64(1):  struct{}{},
-		float64(1): struct{}{},
-		uint64(2):  struct{}{},
-		float64(2): struct{}{},
-		false:      struct{}{},
-		true:       struct{}{},
-		"1":        struct{}{},
-		"2":        struct{}{},
-	}
-
-	exp := 8
-	got := ReduceCountDistinct([]interface{}{v1, v1, v2})
-
-	if !reflect.DeepEqual(got, exp) {
-		t.Errorf("Wrong values. exp %v got %v", spew.Sdump(exp), spew.Sdump(got))
-	}
-}
-
-func TestReduceCountDistinctNil(t *testing.T) {
-	emptyResults := make(map[interface{}]struct{})
-	tests := []struct {
-		name   string
-		values []interface{}
-	}{
-		{
-			name:   "nil values",
-			values: nil,
-		},
-		{
-			name:   "nil mapper",
-			values: []interface{}{nil},
-		},
-		{
-			name:   "no mappers",
-			values: []interface{}{},
-		},
-		{
-			name:   "empty mappper (len 1)",
-			values: []interface{}{emptyResults},
-		},
-		{
-			name:   "empty mappper (len 2)",
-			values: []interface{}{emptyResults, emptyResults},
-		},
-	}
-
-	for _, test := range tests {
-		t.Log(test.name)
-		got := ReduceCountDistinct(test.values)
-		if got != 0 {
-			t.Errorf("Wrong values. exp nil got %v", spew.Sdump(got))
-		}
-	}
-}
-
-var getSortedRangeData = []float64{
-	60, 61, 62, 63, 64, 65, 66, 67, 68, 69,
-	20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
-	0, 1, 2, 3, 4, 5, 6, 7, 8, 9,
-	40, 41, 42, 43, 44, 45, 46, 47, 48, 49,
-	10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
-	50, 51, 52, 53, 54, 55, 56, 57, 58, 59,
-	30, 31, 32, 33, 34, 35, 36, 37, 38, 39,
-}
-
-var getSortedRangeTests = []struct {
-	name     string
-	data     []float64
-	start    int
-	count    int
-	expected []float64
-}{
-	{"first 5", getSortedRangeData, 0, 5, []float64{0, 1, 2, 3, 4}},
-	{"0 length", getSortedRangeData, 8, 0, []float64{}},
-	{"past end of data", getSortedRangeData, len(getSortedRangeData) - 3, 5, []float64{67, 68, 69}},
-}
-
-func TestGetSortedRange(t *testing.T) {
-	for _, tt := range getSortedRangeTests {
-		results := getSortedRange(tt.data, tt.start, tt.count)
-		if len(results) != len(tt.expected) {
-			t.Errorf("Test %s error.  Expected getSortedRange to return %v but got %v", tt.name, tt.expected, results)
-		}
-		for i, testPoint := range tt.expected {
-			if testPoint != results[i] {
-				t.Errorf("Test %s error. getSortedRange returned wrong result for index %v.  Expected %v but got %v", tt.name, i, testPoint, results[i])
-			}
-		}
-	}
-}
-
-var benchGetSortedRangeResults []float64
-
-func BenchmarkGetSortedRangeByPivot(b *testing.B) {
-	data := make([]float64, len(getSortedRangeData))
-	var results []float64
-	for i := 0; i < b.N; i++ {
-		copy(data, getSortedRangeData)
-		results = getSortedRange(data, 8, 15)
-	}
-	benchGetSortedRangeResults = results
-}
-
-func BenchmarkGetSortedRangeBySort(b *testing.B) {
-	data := make([]float64, len(getSortedRangeData))
-	var results []float64
-	for i := 0; i < b.N; i++ {
-		copy(data, getSortedRangeData)
-		sort.Float64s(data)
-		results = data[8:23]
-	}
-	benchGetSortedRangeResults = results
-}
-
-func TestMapTopBottom(t *testing.T) {
-	tests := []struct {
-		name  string
-		skip  bool
-		input *MapInput
-		exp   positionOut
-		call  *influxql.Call
-	}{
-		{
-			name: "top int64 - basic",
-			input: &MapInput{
-				TMin: -1,
-				Items: []MapItem{
-					{Timestamp: 10, Value: int64(53), Tags: map[string]string{"host": "a"}},
-					{Timestamp: 20, Value: int64(88), Tags: map[string]string{"host": "a"}},
-				},
-			},
-			exp: positionOut{
-				points: PositionPoints{
-					{20, int64(88), nil, map[string]string{"host": "a"}},
-					{10, int64(53), nil, map[string]string{"host": "a"}},
-				},
-			},
-			call: &influxql.Call{Name: "top", Args: []influxql.Expr{&influxql.VarRef{Val: "field1"}, &influxql.NumberLiteral{Val: 2}}},
-		},
-		{
-			name: "top int64 - tie on value, resolve based on time",
-			input: &MapInput{
-				TMin: -1,
-				Items: []MapItem{
-					{Timestamp: 20, Value: int64(99), Tags: map[string]string{"host": "a"}},
-					{Timestamp: 10, Value: int64(53), Tags: map[string]string{"host": "a"}},
-					{Timestamp: 10, Value: int64(99), Tags: map[string]string{"host": "a"}},
-				},
-			},
-			exp: positionOut{
-				callArgs: []string{"host"},
-				points: PositionPoints{
-					{10, int64(99), nil, map[string]string{"host": "a"}},
-					{20, int64(99), nil, map[string]string{"host": "a"}},
-				},
-			},
-			call: &influxql.Call{Name: "top", Args: []influxql.Expr{&influxql.VarRef{Val: "field1"}, &influxql.NumberLiteral{Val: 2}}},
-		},
-		{
-			name: "top mixed numerics - ints",
-			input: &MapInput{
-				TMin: -1,
-				Items: []MapItem{
-					{Timestamp: 10, Value: int64(99), Tags: map[string]string{"host": "a"}},
-					{Timestamp: 10, Value: int64(53), Tags: map[string]string{"host": "a"}},
-					{Timestamp: 20, Value: uint64(88), Tags: map[string]string{"host": "a"}},
-				},
-			},
-			exp: positionOut{
-				points: PositionPoints{
-					{10, int64(99), nil, map[string]string{"host": "a"}},
-					{20, uint64(88), nil, map[string]string{"host": "a"}},
-				},
-			},
-			call: &influxql.Call{Name: "top", Args: []influxql.Expr{&influxql.VarRef{Val: "field1"}, &influxql.NumberLiteral{Val: 2}}},
-		},
-		{
-			name: "top mixed numerics - ints & floats",
-			input: &MapInput{
-				TMin: -1,
-				Items: []MapItem{
-					{Timestamp: 10, Value: float64(99), Tags: map[string]string{"host": "a"}},
-					{Timestamp: 10, Value: int64(53), Tags: map[string]string{"host": "a"}},
-					{Timestamp: 20, Value: uint64(88), Tags: map[string]string{"host": "a"}},
-				},
-			},
-			exp: positionOut{
-				points: PositionPoints{
-					{10, float64(99), nil, map[string]string{"host": "a"}},
-					{20, uint64(88), nil, map[string]string{"host": "a"}},
-				},
-			},
-			call: &influxql.Call{Name: "top", Args: []influxql.Expr{&influxql.VarRef{Val: "field1"}, &influxql.NumberLiteral{Val: 2}}},
-		},
-		{
-			name: "top mixed numerics - ints, floats, & strings",
-			input: &MapInput{
-				TMin: -1,
-				Items: []MapItem{
-					{Timestamp: 10, Value: float64(99), Tags: map[string]string{"host": "a"}},
-					{Timestamp: 10, Value: int64(53), Tags: map[string]string{"host": "a"}},
-					{Timestamp: 20, Value: "88", Tags: map[string]string{"host": "a"}},
-				},
-			},
-			exp: positionOut{
-				points: PositionPoints{
-					{10, float64(99), nil, map[string]string{"host": "a"}},
-					{10, int64(53), nil, map[string]string{"host": "a"}},
-				},
-			},
-			call: &influxql.Call{Name: "top", Args: []influxql.Expr{&influxql.VarRef{Val: "field1"}, &influxql.NumberLiteral{Val: 2}}},
-		},
-		{
-			name: "top bools",
-			input: &MapInput{
-				TMin: -1,
-				Items: []MapItem{
-					{Timestamp: 10, Value: true, Tags: map[string]string{"host": "a"}},
-					{Timestamp: 10, Value: true, Tags: map[string]string{"host": "a"}},
-					{Timestamp: 20, Value: false, Tags: map[string]string{"host": "a"}},
-				},
-			},
-			exp: positionOut{
-				points: PositionPoints{
-					{10, true, nil, map[string]string{"host": "a"}},
-					{10, true, nil, map[string]string{"host": "a"}},
-				},
-			},
-			call: &influxql.Call{Name: "top", Args: []influxql.Expr{&influxql.VarRef{Val: "field1"}, &influxql.NumberLiteral{Val: 2}}},
-		},
-		{
-			name: "bottom int64 - basic",
-			input: &MapInput{
-				TMin: -1,
-				Items: []MapItem{
-					{Timestamp: 10, Value: int64(99), Tags: map[string]string{"host": "a"}},
-					{Timestamp: 10, Value: int64(53), Tags: map[string]string{"host": "a"}},
-					{Timestamp: 20, Value: int64(88), Tags: map[string]string{"host": "a"}},
-				},
-			},
-			exp: positionOut{
-				points: PositionPoints{
-					{10, int64(53), nil, map[string]string{"host": "a"}},
-					{20, int64(88), nil, map[string]string{"host": "a"}},
-				},
-			},
-			call: &influxql.Call{Name: "bottom", Args: []influxql.Expr{&influxql.VarRef{Val: "field1"}, &influxql.NumberLiteral{Val: 2}}},
-		},
-		{
-			name: "bottom int64 - tie on value, resolve based on time",
-			input: &MapInput{
-				TMin: -1,
-				Items: []MapItem{
-					{Timestamp: 10, Value: int64(53), Tags: map[string]string{"host": "a"}},
-					{Timestamp: 20, Value: int64(53), Tags: map[string]string{"host": "a"}},
-					{Timestamp: 20, Value: int64(53), Tags: map[string]string{"host": "a"}},
-				},
-			},
-			exp: positionOut{
-				callArgs: []string{"host"},
-				points: PositionPoints{
-					{10, int64(53), nil, map[string]string{"host": "a"}},
-					{20, int64(53), nil, map[string]string{"host": "a"}},
-				},
-			},
-			call: &influxql.Call{Name: "bottom", Args: []influxql.Expr{&influxql.VarRef{Val: "field1"}, &influxql.NumberLiteral{Val: 2}}},
-		},
-		{
-			name: "bottom mixed numerics - ints",
-			input: &MapInput{
-				TMin: -1,
-				Items: []MapItem{
-					{Timestamp: 10, Value: int64(99), Tags: map[string]string{"host": "a"}},
-					{Timestamp: 10, Value: int64(53), Tags: map[string]string{"host": "a"}},
-					{Timestamp: 20, Value: uint64(88), Tags: map[string]string{"host": "a"}},
-				},
-			},
-			exp: positionOut{
-				points: PositionPoints{
-					{10, int64(53), nil, map[string]string{"host": "a"}},
-					{20, uint64(88), nil, map[string]string{"host": "a"}},
-				},
-			},
-			call: &influxql.Call{Name: "bottom", Args: []influxql.Expr{&influxql.VarRef{Val: "field1"}, &influxql.NumberLiteral{Val: 2}}},
-		},
-		{
-			name: "bottom mixed numerics - ints & floats",
-			input: &MapInput{
-				TMin: -1,
-				Items: []MapItem{
-					{Timestamp: 10, Value: int64(99), Tags: map[string]string{"host": "a"}},
-					{Timestamp: 10, Value: float64(53), Tags: map[string]string{"host": "a"}},
-					{Timestamp: 20, Value: uint64(88), Tags: map[string]string{"host": "a"}},
-				},
-			},
-			exp: positionOut{
-				points: PositionPoints{
-					{10, float64(53), nil, map[string]string{"host": "a"}},
-					{20, uint64(88), nil, map[string]string{"host": "a"}},
-				},
-			},
-			call: &influxql.Call{Name: "bottom", Args: []influxql.Expr{&influxql.VarRef{Val: "field1"}, &influxql.NumberLiteral{Val: 2}}},
-		},
-		{
-			name: "bottom mixed numerics - ints, floats, & strings",
-			input: &MapInput{
-				TMin: -1,
-				Items: []MapItem{
-					{Timestamp: 10, Value: float64(99), Tags: map[string]string{"host": "a"}},
-					{Timestamp: 10, Value: int64(53), Tags: map[string]string{"host": "a"}},
-					{Timestamp: 20, Value: "88", Tags: map[string]string{"host": "a"}},
-				},
-			},
-			exp: positionOut{
-				points: PositionPoints{
-					{10, int64(53), nil, map[string]string{"host": "a"}},
-					{10, float64(99), nil, map[string]string{"host": "a"}},
-				},
-			},
-			call: &influxql.Call{Name: "bottom", Args: []influxql.Expr{&influxql.VarRef{Val: "field1"}, &influxql.NumberLiteral{Val: 2}}},
-		},
-		{
-			name: "bottom bools",
-			input: &MapInput{
-				TMin: -1,
-				Items: []MapItem{
-					{Timestamp: 10, Value: true, Tags: map[string]string{"host": "a"}},
-					{Timestamp: 10, Value: true, Tags: map[string]string{"host": "a"}},
-					{Timestamp: 20, Value: false, Tags: map[string]string{"host": "a"}},
-				},
-			},
-			exp: positionOut{
-				points: PositionPoints{
-					{20, false, nil, map[string]string{"host": "a"}},
-					{10, true, nil, map[string]string{"host": "a"}},
-				},
-			},
-			call: &influxql.Call{Name: "bottom", Args: []influxql.Expr{&influxql.VarRef{Val: "field1"}, &influxql.NumberLiteral{Val: 2}}},
-		},
-	}
-
-	for _, test := range tests {
-		if test.skip {
-			continue
-		}
-		lit, _ := test.call.Args[len(test.call.Args)-1].(*influxql.NumberLiteral)
-		limit := int(lit.Val)
-		fields := topCallArgs(test.call)
-
-		values := MapTopBottom(test.input, limit, fields, len(test.call.Args), test.call.Name).(PositionPoints)
-		t.Logf("Test: %s", test.name)
-		if exp, got := len(test.exp.points), len(values); exp != got {
-			t.Errorf("Wrong number of values. exp %v got %v", exp, got)
-		}
-		if !reflect.DeepEqual(values, test.exp.points) {
-			t.Errorf("Wrong values. \nexp\n %v\ngot\n %v", spew.Sdump(test.exp.points), spew.Sdump(values))
-		}
-	}
-}
-
-func TestReduceTopBottom(t *testing.T) {
-	tests := []struct {
-		name   string
-		skip   bool
-		values []interface{}
-		exp    PositionPoints
-		call   *influxql.Call
-	}{
-		{
-			name: "top int64 - single map",
-			values: []interface{}{
-				PositionPoints{
-					{10, int64(99), nil, map[string]string{"host": "a"}},
-					{20, int64(88), nil, map[string]string{"host": "a"}},
-					{10, int64(53), nil, map[string]string{"host": "b"}},
-				},
-			},
-			exp: PositionPoints{
-				PositionPoint{10, int64(99), nil, map[string]string{"host": "a"}},
-				PositionPoint{20, int64(88), nil, map[string]string{"host": "a"}},
-			},
-			call: &influxql.Call{Name: "top", Args: []influxql.Expr{&influxql.VarRef{Val: "field1"}, &influxql.NumberLiteral{Val: 2}}},
-		},
-		{
-			name: "top int64 - double map",
-			values: []interface{}{
-				PositionPoints{
-					{10, int64(99), nil, map[string]string{"host": "a"}},
-				},
-				PositionPoints{
-					{20, int64(88), nil, map[string]string{"host": "a"}},
-					{10, int64(53), nil, map[string]string{"host": "b"}},
-				},
-			},
-			exp: PositionPoints{
-				PositionPoint{10, int64(99), nil, map[string]string{"host": "a"}},
-				PositionPoint{20, int64(88), nil, map[string]string{"host": "a"}},
-			},
-			call: &influxql.Call{Name: "top", Args: []influxql.Expr{&influxql.VarRef{Val: "field1"}, &influxql.NumberLiteral{Val: 2}}},
-		},
-		{
-			name: "top int64 - double map with nil",
-			values: []interface{}{
-				PositionPoints{
-					{10, int64(99), nil, map[string]string{"host": "a"}},
-					{20, int64(88), nil, map[string]string{"host": "a"}},
-					{10, int64(53), nil, map[string]string{"host": "b"}},
-				},
-				nil,
-			},
-			exp: PositionPoints{
-				PositionPoint{10, int64(99), nil, map[string]string{"host": "a"}},
-				PositionPoint{20, int64(88), nil, map[string]string{"host": "a"}},
-			},
-			call: &influxql.Call{Name: "top", Args: []influxql.Expr{&influxql.VarRef{Val: "field1"}, &influxql.NumberLiteral{Val: 2}}},
-		},
-		{
-			name: "top int64 - double map with non-matching tags and tag selected",
-			values: []interface{}{
-				PositionPoints{
-					{10, int64(99), nil, map[string]string{"host": "a"}},
-					{20, int64(88), nil, map[string]string{}},
-					{10, int64(53), nil, map[string]string{"host": "b"}},
-				},
-				nil,
-			},
-			exp: PositionPoints{
-				PositionPoint{10, int64(99), nil, map[string]string{"host": "a"}},
-				PositionPoint{20, int64(88), nil, map[string]string{}},
-			},
-			call: &influxql.Call{Name: "top", Args: []influxql.Expr{&influxql.VarRef{Val: "field1"}, &influxql.VarRef{Val: "host"}, &influxql.NumberLiteral{Val: 2}}},
-		},
-		{
-			skip: true,
-			name: "top int64 - double map with non-matching tags",
-			values: []interface{}{
-				PositionPoints{
-					{10, int64(99), nil, map[string]string{"host": "a"}},
-					{20, int64(88), nil, map[string]string{}},
-					{10, int64(53), nil, map[string]string{"host": "b"}},
-				},
-				nil,
-			},
-			exp: PositionPoints{
-				PositionPoint{10, int64(99), nil, map[string]string{"host": "a"}},
-				PositionPoint{20, int64(55), nil, map[string]string{"host": "b"}},
-			},
-			call: &influxql.Call{Name: "bottom", Args: []influxql.Expr{&influxql.VarRef{Val: "field1"}, &influxql.NumberLiteral{Val: 2}}},
-		},
-		{
-			name: "bottom int64 - single map",
-			values: []interface{}{
-				PositionPoints{
-					{10, int64(53), nil, map[string]string{"host": "b"}},
-					{20, int64(88), nil, map[string]string{"host": "a"}},
-					{10, int64(99), nil, map[string]string{"host": "a"}},
-				},
-			},
-			exp: PositionPoints{
-				PositionPoint{10, int64(53), nil, map[string]string{"host": "b"}},
-				PositionPoint{20, int64(88), nil, map[string]string{"host": "a"}},
-			},
-			call: &influxql.Call{Name: "bottom", Args: []influxql.Expr{&influxql.VarRef{Val: "field1"}, &influxql.NumberLiteral{Val: 2}}},
-		},
-		{
-			name: "bottom int64 - double map",
-			values: []interface{}{
-				PositionPoints{
-					{10, int64(99), nil, map[string]string{"host": "a"}},
-				},
-				PositionPoints{
-					{10, int64(53), nil, map[string]string{"host": "b"}},
-					{20, int64(88), nil, map[string]string{"host": "a"}},
-				},
-			},
-			exp: PositionPoints{
-				PositionPoint{10, int64(53), nil, map[string]string{"host": "b"}},
-				PositionPoint{20, int64(88), nil, map[string]string{"host": "a"}},
-			},
-			call: &influxql.Call{Name: "bottom", Args: []influxql.Expr{&influxql.VarRef{Val: "field1"}, &influxql.NumberLiteral{Val: 2}}},
-		},
-		{
-			name: "bottom int64 - double map with nil",
-			values: []interface{}{
-				PositionPoints{
-					{10, int64(53), nil, map[string]string{"host": "b"}},
-					{20, int64(88), nil, map[string]string{"host": "a"}},
-					{10, int64(99), nil, map[string]string{"host": "a"}},
-				},
-				nil,
-			},
-			exp: PositionPoints{
-				PositionPoint{10, int64(53), nil, map[string]string{"host": "b"}},
-				PositionPoint{20, int64(88), nil, map[string]string{"host": "a"}},
-			},
-			call: &influxql.Call{Name: "bottom", Args: []influxql.Expr{&influxql.VarRef{Val: "field1"}, &influxql.NumberLiteral{Val: 2}}},
-		},
-		{
-			name: "bottom int64 - double map with non-matching tags and tag selected",
-			values: []interface{}{
-				PositionPoints{
-					{10, int64(53), nil, map[string]string{"host": "b"}},
-					{20, int64(88), nil, map[string]string{}},
-					{10, int64(99), nil, map[string]string{"host": "a"}},
-				},
-				nil,
-			},
-			exp: PositionPoints{
-				PositionPoint{10, int64(53), nil, map[string]string{"host": "b"}},
-				PositionPoint{20, int64(88), nil, map[string]string{}},
-			},
-			call: &influxql.Call{Name: "bottom", Args: []influxql.Expr{&influxql.VarRef{Val: "field1"}, &influxql.VarRef{Val: "host"}, &influxql.NumberLiteral{Val: 2}}},
-		},
-		{
-			skip: true,
-			name: "bottom int64 - double map with non-matching tags",
-			values: []interface{}{
-				PositionPoints{
-					{10, int64(53), nil, map[string]string{"host": "b"}},
-					{20, int64(88), nil, map[string]string{}},
-					{10, int64(99), nil, map[string]string{"host": "a"}},
-				},
-				nil,
-			},
-			exp: PositionPoints{
-				PositionPoint{10, int64(99), nil, map[string]string{"host": "a"}},
-				PositionPoint{20, int64(55), nil, map[string]string{"host": "b"}},
-			},
-			call: &influxql.Call{Name: "bottom", Args: []influxql.Expr{&influxql.VarRef{Val: "field1"}, &influxql.NumberLiteral{Val: 2}}},
-		},
-	}
-
-	for _, test := range tests {
-		if test.skip {
-			continue
-		}
-		lit, _ := test.call.Args[len(test.call.Args)-1].(*influxql.NumberLiteral)
-		limit := int(lit.Val)
-		fields := topCallArgs(test.call)
-		values := ReduceTopBottom(test.values, limit, fields, test.call.Name)
-		t.Logf("Test: %s", test.name)
-		if values != nil {
-			v, _ := values.(PositionPoints)
-			if exp, got := len(test.exp), len(v); exp != got {
-				t.Errorf("Wrong number of values. exp %v got %v", exp, got)
-			}
-		}
-		if !reflect.DeepEqual(values, test.exp) {
-			t.Errorf("Wrong values. \nexp\n %v\ngot\n %v", spew.Sdump(test.exp), spew.Sdump(values))
-		}
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/internal/meta.pb.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/internal/meta.pb.go
deleted file mode 100644
index c580f4dba..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/internal/meta.pb.go
+++ /dev/null
@@ -1,122 +0,0 @@
-// Code generated by protoc-gen-gogo.
-// source: internal/meta.proto
-// DO NOT EDIT!
-
-/*
-Package internal is a generated protocol buffer package.
-
-It is generated from these files:
-	internal/meta.proto
-
-It has these top-level messages:
-	Series
-	Tag
-	MeasurementFields
-	Field
-*/
-package internal
-
-import proto "github.com/gogo/protobuf/proto"
-import fmt "fmt"
-import math "math"
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
-
-type Series struct {
-	Key              *string `protobuf:"bytes,1,req,name=Key" json:"Key,omitempty"`
-	Tags             []*Tag  `protobuf:"bytes,2,rep,name=Tags" json:"Tags,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *Series) Reset()         { *m = Series{} }
-func (m *Series) String() string { return proto.CompactTextString(m) }
-func (*Series) ProtoMessage()    {}
-
-func (m *Series) GetKey() string {
-	if m != nil && m.Key != nil {
-		return *m.Key
-	}
-	return ""
-}
-
-func (m *Series) GetTags() []*Tag {
-	if m != nil {
-		return m.Tags
-	}
-	return nil
-}
-
-type Tag struct {
-	Key              *string `protobuf:"bytes,1,req,name=Key" json:"Key,omitempty"`
-	Value            *string `protobuf:"bytes,2,req,name=Value" json:"Value,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *Tag) Reset()         { *m = Tag{} }
-func (m *Tag) String() string { return proto.CompactTextString(m) }
-func (*Tag) ProtoMessage()    {}
-
-func (m *Tag) GetKey() string {
-	if m != nil && m.Key != nil {
-		return *m.Key
-	}
-	return ""
-}
-
-func (m *Tag) GetValue() string {
-	if m != nil && m.Value != nil {
-		return *m.Value
-	}
-	return ""
-}
-
-type MeasurementFields struct {
-	Fields           []*Field `protobuf:"bytes,1,rep,name=Fields" json:"Fields,omitempty"`
-	XXX_unrecognized []byte   `json:"-"`
-}
-
-func (m *MeasurementFields) Reset()         { *m = MeasurementFields{} }
-func (m *MeasurementFields) String() string { return proto.CompactTextString(m) }
-func (*MeasurementFields) ProtoMessage()    {}
-
-func (m *MeasurementFields) GetFields() []*Field {
-	if m != nil {
-		return m.Fields
-	}
-	return nil
-}
-
-type Field struct {
-	ID               *int32  `protobuf:"varint,1,req,name=ID" json:"ID,omitempty"`
-	Name             *string `protobuf:"bytes,2,req,name=Name" json:"Name,omitempty"`
-	Type             *int32  `protobuf:"varint,3,req,name=Type" json:"Type,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *Field) Reset()         { *m = Field{} }
-func (m *Field) String() string { return proto.CompactTextString(m) }
-func (*Field) ProtoMessage()    {}
-
-func (m *Field) GetID() int32 {
-	if m != nil && m.ID != nil {
-		return *m.ID
-	}
-	return 0
-}
-
-func (m *Field) GetName() string {
-	if m != nil && m.Name != nil {
-		return *m.Name
-	}
-	return ""
-}
-
-func (m *Field) GetType() int32 {
-	if m != nil && m.Type != nil {
-		return *m.Type
-	}
-	return 0
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/internal/meta.proto b/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/internal/meta.proto
deleted file mode 100644
index d1deff6c5..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/internal/meta.proto
+++ /dev/null
@@ -1,27 +0,0 @@
-package internal;
-
-//========================================================================
-//
-// Metadata
-//
-//========================================================================
-
-message Series {
-  required string Key = 1;
-  repeated Tag Tags = 2;
-}
-
-message Tag {
-  required string Key = 1;
-  required string Value = 2;
-}
-
-message MeasurementFields {
-  repeated Field Fields = 1;
-}
-
-message Field {
-  required int32 ID = 1;
-  required string Name = 2;
-  required int32 Type = 3;
-}
\ No newline at end of file
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/into.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/into.go
deleted file mode 100644
index 9d7f65917..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/into.go
+++ /dev/null
@@ -1,61 +0,0 @@
-package tsdb
-
-import (
-	"errors"
-	"time"
-
-	"github.com/influxdb/influxdb/influxql"
-	"github.com/influxdb/influxdb/models"
-)
-
-// convertRowToPoints will convert a query result Row into Points that can be written back in.
-// Used for INTO queries
-func convertRowToPoints(measurementName string, row *models.Row) ([]models.Point, error) {
-	// figure out which parts of the result are the time and which are the fields
-	timeIndex := -1
-	fieldIndexes := make(map[string]int)
-	for i, c := range row.Columns {
-		if c == "time" {
-			timeIndex = i
-		} else {
-			fieldIndexes[c] = i
-		}
-	}
-
-	if timeIndex == -1 {
-		return nil, errors.New("error finding time index in result")
-	}
-
-	points := make([]models.Point, 0, len(row.Values))
-	for _, v := range row.Values {
-		vals := make(map[string]interface{})
-		for fieldName, fieldIndex := range fieldIndexes {
-			val := v[fieldIndex]
-			if val != nil {
-				vals[fieldName] = v[fieldIndex]
-			}
-		}
-
-		p, err := models.NewPoint(measurementName, row.Tags, vals, v[timeIndex].(time.Time))
-		if err != nil {
-			// Drop points that can't be stored
-			continue
-		}
-
-		points = append(points, p)
-	}
-
-	return points, nil
-}
-
-func intoDB(stmt *influxql.SelectStatement) (string, error) {
-	if stmt.Target.Measurement.Database != "" {
-		return stmt.Target.Measurement.Database, nil
-	}
-	return "", errNoDatabaseInTarget
-}
-
-var errNoDatabaseInTarget = errors.New("no database in target")
-
-func intoRP(stmt *influxql.SelectStatement) string          { return stmt.Target.Measurement.RetentionPolicy }
-func intoMeasurement(stmt *influxql.SelectStatement) string { return stmt.Target.Measurement.Name }
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/mapper.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/mapper.go
deleted file mode 100644
index 8c49bb2f7..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/mapper.go
+++ /dev/null
@@ -1,149 +0,0 @@
-package tsdb
-
-import (
-	"encoding/json"
-)
-
-// Mapper is the interface all Mapper types must implement.
-type Mapper interface {
-	Open() error
-	TagSets() []string
-	Fields() []string
-	NextChunk() (interface{}, error)
-	Close()
-}
-
-// StatefulMapper encapsulates a Mapper and some state that the executor needs to
-// track for that mapper.
-type StatefulMapper struct {
-	Mapper
-	bufferedChunk *MapperOutput // Last read chunk.
-	drained       bool
-}
-
-// NextChunk wraps a RawMapper and some state.
-func (sm *StatefulMapper) NextChunk() (*MapperOutput, error) {
-	c, err := sm.Mapper.NextChunk()
-	if err != nil {
-		return nil, err
-	}
-	chunk, ok := c.(*MapperOutput)
-	if !ok {
-		if chunk == interface{}(nil) {
-			return nil, nil
-		}
-	}
-	return chunk, nil
-}
-
-// MapperValue is a complex type, which can encapsulate data from both raw and aggregate
-// mappers. This currently allows marshalling and network system to remain simpler. For
-// aggregate output Time is ignored, and actual Time-Value pairs are contained soley
-// within the Value field.
-type MapperValue struct {
-	Time  int64             `json:"time,omitempty"`  // Ignored for aggregate output.
-	Value interface{}       `json:"value,omitempty"` // For aggregate, contains interval time multiple values.
-	Tags  map[string]string `json:"tags,omitempty"`  // Meta tags for results
-}
-
-// MapperValueJSON is the JSON-encoded representation of MapperValue. Because MapperValue is
-// a complex type, custom JSON encoding is required so that none of the types contained within
-// a MapperValue are "lost", and so the data are encoded as byte slices where necessary.
-type MapperValueJSON struct {
-	Time    int64             `json:"time,omitempty"`
-	RawData []byte            `json:"rdata,omitempty"`
-	AggData [][]byte          `json:"adata,omitempty"`
-	Tags    map[string]string `json:"tags,omitempty"`
-}
-
-// MarshalJSON returns the JSON-encoded representation of a MapperValue.
-func (mv *MapperValue) MarshalJSON() ([]byte, error) {
-	o := &MapperValueJSON{
-		Time:    mv.Time,
-		AggData: make([][]byte, 0),
-		Tags:    mv.Tags,
-	}
-
-	o.Time = mv.Time
-	o.Tags = mv.Tags
-	if values, ok := mv.Value.([]interface{}); ok {
-		// Value contain a slice of more values. This happens only with
-		// aggregate output.
-		for _, v := range values {
-			b, err := json.Marshal(v)
-			if err != nil {
-				return nil, err
-			}
-			o.AggData = append(o.AggData, b)
-		}
-	} else {
-		// If must be raw output, so just marshal the single value.
-		b, err := json.Marshal(mv.Value)
-		if err != nil {
-			return nil, err
-		}
-		o.RawData = b
-	}
-	return json.Marshal(o)
-}
-
-type MapperValues []*MapperValue
-
-func (a MapperValues) Len() int           { return len(a) }
-func (a MapperValues) Less(i, j int) bool { return a[i].Time < a[j].Time }
-func (a MapperValues) Swap(i, j int)      { a[i], a[j] = a[j], a[i] }
-
-type MapperOutput struct {
-	Name      string            `json:"name,omitempty"`
-	Tags      map[string]string `json:"tags,omitempty"`
-	Fields    []string          `json:"fields,omitempty"` // Field names of returned data.
-	Values    []*MapperValue    `json:"values,omitempty"` // For aggregates contains a single value at [0]
-	cursorKey string            // Tagset-based key for the source cursor. Cached for performance reasons.
-}
-
-// MapperOutputJSON is the JSON-encoded representation of MapperOutput. The query data is represented
-// as a raw JSON message, so decode is delayed, and can proceed in a custom manner.
-type MapperOutputJSON struct {
-	Name   string            `json:"name,omitempty"`
-	Tags   map[string]string `json:"tags,omitempty"`
-	Fields []string          `json:"fields,omitempty"` // Field names of returned data.
-	Values json.RawMessage   `json:"values,omitempty"`
-}
-
-// MarshalJSON returns the JSON-encoded representation of a MapperOutput.
-func (mo *MapperOutput) MarshalJSON() ([]byte, error) {
-	o := &MapperOutputJSON{
-		Name:   mo.Name,
-		Tags:   mo.Tags,
-		Fields: mo.Fields,
-	}
-	data, err := json.Marshal(mo.Values)
-	if err != nil {
-		return nil, err
-	}
-	o.Values = data
-
-	return json.Marshal(o)
-}
-
-func (mo *MapperOutput) key() string {
-	return mo.cursorKey
-}
-
-// uniqueStrings returns a slice of unique strings from all lists in a.
-func uniqueStrings(a ...[]string) []string {
-	// Calculate unique set of strings.
-	m := make(map[string]struct{})
-	for _, strs := range a {
-		for _, str := range strs {
-			m[str] = struct{}{}
-		}
-	}
-
-	// Convert back to slice.
-	result := make([]string, 0, len(m))
-	for k := range m {
-		result = append(result, k)
-	}
-	return result
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/mapper_test.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/mapper_test.go
deleted file mode 100644
index 5ad4fdd6b..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/mapper_test.go
+++ /dev/null
@@ -1,614 +0,0 @@
-package tsdb_test
-
-import (
-	"encoding/json"
-	"fmt"
-	"io/ioutil"
-	"os"
-	"path"
-	"path/filepath"
-	"reflect"
-	"strings"
-	"testing"
-	"time"
-
-	"github.com/influxdb/influxdb/influxql"
-	"github.com/influxdb/influxdb/models"
-	"github.com/influxdb/influxdb/tsdb"
-)
-
-func TestShardMapper_RawMapperTagSetsFields(t *testing.T) {
-	tmpDir, _ := ioutil.TempDir("", "shard_test")
-	defer os.RemoveAll(tmpDir)
-	shard := mustCreateShard(tmpDir)
-
-	pt1time := time.Unix(1, 0).UTC()
-	pt1 := models.MustNewPoint(
-		"cpu",
-		map[string]string{"host": "serverA", "region": "us-east"},
-		map[string]interface{}{"idle": 60},
-		pt1time,
-	)
-	pt2time := time.Unix(2, 0).UTC()
-	pt2 := models.MustNewPoint(
-		"cpu",
-		map[string]string{"host": "serverB", "region": "us-east"},
-		map[string]interface{}{"load": 60},
-		pt2time,
-	)
-	err := shard.WritePoints([]models.Point{pt1, pt2})
-	if err != nil {
-		t.Fatalf(err.Error())
-	}
-
-	var tests = []struct {
-		stmt           string
-		expectedTags   []string
-		expectedFields []string
-	}{
-		{
-			stmt:           `SELECT load FROM cpu`,
-			expectedTags:   []string{"cpu"},
-			expectedFields: []string{"load"},
-		},
-		{
-			stmt:           `SELECT derivative(load) FROM cpu`,
-			expectedTags:   []string{"cpu"},
-			expectedFields: []string{"load"},
-		},
-		{
-			stmt:           `SELECT idle,load FROM cpu`,
-			expectedTags:   []string{"cpu"},
-			expectedFields: []string{"idle", "load"},
-		},
-		{
-			stmt:           `SELECT load,idle FROM cpu`,
-			expectedTags:   []string{"cpu"},
-			expectedFields: []string{"idle", "load"},
-		},
-		{
-			stmt:           `SELECT load FROM cpu GROUP BY host`,
-			expectedTags:   []string{"cpu|host|serverA", "cpu|host|serverB"},
-			expectedFields: []string{"load"},
-		},
-		{
-			stmt:           `SELECT load FROM cpu GROUP BY region`,
-			expectedTags:   []string{"cpu|region|us-east"},
-			expectedFields: []string{"load"},
-		},
-		{
-			stmt:           `SELECT load FROM cpu WHERE host='serverA'`,
-			expectedTags:   []string{"cpu"},
-			expectedFields: []string{"load"},
-		},
-		{
-			stmt:           `SELECT load FROM cpu WHERE host='serverB'`,
-			expectedTags:   []string{"cpu"},
-			expectedFields: []string{"load"},
-		},
-		{
-			stmt:           `SELECT load FROM cpu WHERE host='serverC'`,
-			expectedTags:   []string{},
-			expectedFields: []string{"load"},
-		},
-	}
-
-	for _, tt := range tests {
-		stmt := mustParseSelectStatement(tt.stmt)
-		mapper := openRawMapperOrFail(t, shard, stmt, 0)
-		tags := mapper.TagSets()
-		if !reflect.DeepEqual(tags, tt.expectedTags) {
-			t.Errorf("test '%s'\n\tgot      %s\n\texpected %s", tt.stmt, tags, tt.expectedTags)
-		}
-		fields := mapper.Fields()
-		if !reflect.DeepEqual(fields, tt.expectedFields) {
-			t.Errorf("test '%s'\n\tgot      %s\n\texpected %s", tt.stmt, fields, tt.expectedFields)
-		}
-	}
-}
-
-func TestShardMapper_WriteAndSingleMapperRawQuerySingleValue(t *testing.T) {
-	tmpDir, _ := ioutil.TempDir("", "shard_test")
-	defer os.RemoveAll(tmpDir)
-	shard := mustCreateShard(tmpDir)
-
-	pt1time := time.Unix(1, 0).UTC()
-	pt1 := models.MustNewPoint(
-		"cpu",
-		map[string]string{"host": "serverA", "region": "us-east"},
-		map[string]interface{}{"load": 42},
-		pt1time,
-	)
-	pt2time := time.Unix(2, 0).UTC()
-	pt2 := models.MustNewPoint(
-		"cpu",
-		map[string]string{"host": "serverB", "region": "us-east"},
-		map[string]interface{}{"load": 60},
-		pt2time,
-	)
-	err := shard.WritePoints([]models.Point{pt1, pt2})
-	if err != nil {
-		t.Fatalf(err.Error())
-	}
-
-	var tests = []struct {
-		stmt      string
-		chunkSize int
-		expected  []string
-	}{
-		{
-			stmt:     `SELECT load FROM cpu`,
-			expected: []string{`{"name":"cpu","fields":["load"],"values":[{"time":1000000000,"value":42,"tags":{"host":"serverA","region":"us-east"}},{"time":2000000000,"value":60,"tags":{"host":"serverB","region":"us-east"}}]}`, `null`},
-		},
-		{
-			stmt:      `SELECT load FROM cpu # chunkSize 1`,
-			chunkSize: 1,
-			expected:  []string{`{"name":"cpu","fields":["load"],"values":[{"time":1000000000,"value":42,"tags":{"host":"serverA","region":"us-east"}}]}`},
-		},
-		{
-			stmt:      `SELECT load FROM cpu # chunkSize 2`,
-			chunkSize: 2,
-			expected:  []string{`{"name":"cpu","fields":["load"],"values":[{"time":1000000000,"value":42,"tags":{"host":"serverA","region":"us-east"}},{"time":2000000000,"value":60,"tags":{"host":"serverB","region":"us-east"}}]}`},
-		},
-		{
-			stmt:      `SELECT load FROM cpu # chunkSize 3`,
-			chunkSize: 3,
-			expected:  []string{`{"name":"cpu","fields":["load"],"values":[{"time":1000000000,"value":42,"tags":{"host":"serverA","region":"us-east"}},{"time":2000000000,"value":60,"tags":{"host":"serverB","region":"us-east"}}]}`},
-		},
-		{
-			stmt: `SELECT load FROM cpu GROUP BY host`,
-			expected: []string{
-				`{"name":"cpu","tags":{"host":"serverA"},"fields":["load"],"values":[{"time":1000000000,"value":42,"tags":{"host":"serverA","region":"us-east"}}]}`,
-				`{"name":"cpu","tags":{"host":"serverB"},"fields":["load"],"values":[{"time":2000000000,"value":60,"tags":{"host":"serverB","region":"us-east"}}]}`,
-			},
-		},
-		{
-			stmt:     `SELECT load FROM cpu GROUP BY region`,
-			expected: []string{`{"name":"cpu","tags":{"region":"us-east"},"fields":["load"],"values":[{"time":1000000000,"value":42,"tags":{"host":"serverA","region":"us-east"}},{"time":2000000000,"value":60,"tags":{"host":"serverB","region":"us-east"}}]}`},
-		},
-		{
-			stmt:     `SELECT load FROM cpu WHERE host='serverA'`,
-			expected: []string{`{"name":"cpu","fields":["load"],"values":[{"time":1000000000,"value":42,"tags":{"host":"serverA","region":"us-east"}}]}`},
-		},
-		{
-			stmt:     `SELECT load FROM cpu WHERE host='serverB'`,
-			expected: []string{`{"name":"cpu","fields":["load"],"values":[{"time":2000000000,"value":60,"tags":{"host":"serverB","region":"us-east"}}]}`},
-		},
-		{
-			stmt:     `SELECT load FROM cpu WHERE host='serverC'`,
-			expected: []string{`null`},
-		},
-		{
-			stmt:     `SELECT load FROM cpu WHERE load = 60`,
-			expected: []string{`{"name":"cpu","fields":["load"],"values":[{"time":2000000000,"value":60,"tags":{"host":"serverB","region":"us-east"}}]}`},
-		},
-		{
-			stmt:     `SELECT load FROM cpu WHERE load != 60`,
-			expected: []string{`{"name":"cpu","fields":["load"],"values":[{"time":1000000000,"value":42,"tags":{"host":"serverA","region":"us-east"}}]}`},
-		},
-		{
-			stmt:     fmt.Sprintf(`SELECT load FROM cpu WHERE time = '%s'`, pt1time.Format(influxql.DateTimeFormat)),
-			expected: []string{`{"name":"cpu","fields":["load"],"values":[{"time":1000000000,"value":42,"tags":{"host":"serverA","region":"us-east"}}]}`},
-		},
-		{
-			stmt:     fmt.Sprintf(`SELECT load FROM cpu WHERE time > '%s'`, pt1time.Format(influxql.DateTimeFormat)),
-			expected: []string{`{"name":"cpu","fields":["load"],"values":[{"time":2000000000,"value":60,"tags":{"host":"serverB","region":"us-east"}}]}`},
-		},
-		{
-			stmt:     fmt.Sprintf(`SELECT load FROM cpu WHERE time > '%s'`, pt2time.Format(influxql.DateTimeFormat)),
-			expected: []string{`null`},
-		},
-	}
-
-	for _, tt := range tests {
-		stmt := mustParseSelectStatement(tt.stmt)
-		mapper := openRawMapperOrFail(t, shard, stmt, tt.chunkSize)
-
-		for i, _ := range tt.expected {
-			got := nextRawChunkAsJson(t, mapper)
-			if got != tt.expected[i] {
-				t.Errorf("test '%s'\n\tgot      %s\n\texpected %s", tt.stmt, got, tt.expected[i])
-				break
-			}
-		}
-	}
-}
-
-func TestShardMapper_WriteAndSingleMapperRawQueryMultiValue(t *testing.T) {
-	tmpDir, _ := ioutil.TempDir("", "shard_test")
-	defer os.RemoveAll(tmpDir)
-	shard := mustCreateShard(tmpDir)
-
-	pt1time := time.Unix(1, 0).UTC()
-	pt1 := models.MustNewPoint(
-		"cpu",
-		map[string]string{"host": "serverA", "region": "us-east"},
-		map[string]interface{}{"foo": 42, "bar": 43},
-		pt1time,
-	)
-	pt2time := time.Unix(2, 0).UTC()
-	pt2 := models.MustNewPoint(
-		"cpu",
-		map[string]string{"host": "serverB", "region": "us-east"},
-		map[string]interface{}{"foo": 60, "bar": 61},
-		pt2time,
-	)
-	err := shard.WritePoints([]models.Point{pt1, pt2})
-	if err != nil {
-		t.Fatalf(err.Error())
-	}
-
-	var tests = []struct {
-		stmt      string
-		chunkSize int
-		expected  []string
-	}{
-		{
-			stmt:     `SELECT foo FROM cpu`,
-			expected: []string{`{"name":"cpu","fields":["foo"],"values":[{"time":1000000000,"value":42,"tags":{"host":"serverA","region":"us-east"}},{"time":2000000000,"value":60,"tags":{"host":"serverB","region":"us-east"}}]}`},
-		},
-		{
-			stmt:     `SELECT foo,bar FROM cpu`,
-			expected: []string{`{"name":"cpu","fields":["bar","foo"],"values":[{"time":1000000000,"value":{"bar":43,"foo":42},"tags":{"host":"serverA","region":"us-east"}},{"time":2000000000,"value":{"bar":61,"foo":60},"tags":{"host":"serverB","region":"us-east"}}]}`},
-		},
-	}
-
-	for _, tt := range tests {
-		stmt := mustParseSelectStatement(tt.stmt)
-		mapper := openRawMapperOrFail(t, shard, stmt, tt.chunkSize)
-
-		for i, s := range tt.expected {
-			got := nextRawChunkAsJson(t, mapper)
-			if got != s {
-				t.Errorf("test '%s'\n\tgot      %s\n\texpected %s", tt.stmt, got, tt.expected[i])
-				break
-			}
-		}
-	}
-}
-
-func TestShardMapper_WriteAndSingleMapperRawQueryMultiSource(t *testing.T) {
-	tmpDir, _ := ioutil.TempDir("", "shard_test")
-	defer os.RemoveAll(tmpDir)
-	shard := mustCreateShard(tmpDir)
-
-	pt1time := time.Unix(1, 0).UTC()
-	pt1 := models.MustNewPoint(
-		"cpu0",
-		map[string]string{"host": "serverA", "region": "us-east"},
-		map[string]interface{}{"foo": 42},
-		pt1time,
-	)
-	pt2time := time.Unix(2, 0).UTC()
-	pt2 := models.MustNewPoint(
-		"cpu1",
-		map[string]string{"host": "serverB", "region": "us-east"},
-		map[string]interface{}{"bar": 60},
-		pt2time,
-	)
-	err := shard.WritePoints([]models.Point{pt1, pt2})
-	if err != nil {
-		t.Fatalf(err.Error())
-	}
-
-	var tests = []struct {
-		stmt      string
-		chunkSize int
-		expected  []string
-	}{
-		{
-			stmt:     `SELECT foo FROM cpu0,cpu1`,
-			expected: []string{`{"name":"cpu0","fields":["foo"],"values":[{"time":1000000000,"value":42,"tags":{"host":"serverA","region":"us-east"}}]}`},
-		},
-		{
-			stmt:     `SELECT foo FROM cpu0,cpu1 WHERE foo=42`,
-			expected: []string{`{"name":"cpu0","fields":["foo"],"values":[{"time":1000000000,"value":42,"tags":{"host":"serverA","region":"us-east"}}]}`},
-		},
-		{
-			stmt:     `SELECT bar FROM cpu0,cpu1`,
-			expected: []string{`{"name":"cpu1","fields":["bar"],"values":[{"time":2000000000,"value":60,"tags":{"host":"serverB","region":"us-east"}}]}`},
-		},
-		{
-			stmt:     `SELECT bar FROM cpu0,cpu1 WHERE foo=42`,
-			expected: []string{`null`},
-		},
-		{
-			stmt:     `SELECT bar FROM cpu0,cpu1 WHERE bar!=60`,
-			expected: []string{`null`},
-		},
-	}
-
-	for _, tt := range tests {
-		stmt := mustParseSelectStatement(tt.stmt)
-		mapper := openRawMapperOrFail(t, shard, stmt, tt.chunkSize)
-
-		for i, s := range tt.expected {
-			got := nextRawChunkAsJson(t, mapper)
-			if got != s {
-				t.Errorf("test '%s'\n\tgot      %s\n\texpected %s", tt.stmt, got, tt.expected[i])
-				break
-			}
-		}
-	}
-}
-
-func TestShardMapper_WriteAndSingleMapperAggregateQuery(t *testing.T) {
-	tmpDir, _ := ioutil.TempDir("", "shard_test")
-	defer os.RemoveAll(tmpDir)
-	shard := mustCreateShard(tmpDir)
-
-	pt1time := time.Unix(10, 0).UTC()
-	pt1 := models.MustNewPoint(
-		"cpu",
-		map[string]string{"host": "serverA", "region": "us-east"},
-		map[string]interface{}{"value": 1},
-		pt1time,
-	)
-	pt2time := time.Unix(20, 0).UTC()
-	pt2 := models.MustNewPoint(
-		"cpu",
-		map[string]string{"host": "serverA", "region": "us-east"},
-		map[string]interface{}{"value": 60},
-		pt2time,
-	)
-	err := shard.WritePoints([]models.Point{pt1, pt2})
-	if err != nil {
-		t.Fatalf(err.Error())
-	}
-
-	var tests = []struct {
-		stmt     string
-		expected []string
-	}{
-		{
-			stmt:     `SELECT sum(value) FROM cpu`,
-			expected: []string{`{"name":"cpu","fields":["value"],"values":[{"value":[61]}]}`, `null`},
-		},
-		{
-			stmt:     `SELECT sum(value),mean(value) FROM cpu`,
-			expected: []string{`{"name":"cpu","fields":["value"],"values":[{"value":[61,{"Count":2,"Total":61,"ResultType":1}]}]}`, `null`},
-		},
-		{
-			stmt: `SELECT sum(value) FROM cpu GROUP BY host`,
-			expected: []string{
-				`{"name":"cpu","tags":{"host":"serverA"},"fields":["value"],"values":[{"value":[61]}]}`,
-				`null`},
-		},
-		{
-			stmt: `SELECT sum(value) FROM cpu GROUP BY region`,
-			expected: []string{
-				`{"name":"cpu","tags":{"region":"us-east"},"fields":["value"],"values":[{"value":[61]}]}`,
-				`null`},
-		},
-		{
-			stmt: `SELECT sum(value) FROM cpu GROUP BY region,host`,
-			expected: []string{
-				`{"name":"cpu","tags":{"host":"serverA","region":"us-east"},"fields":["value"],"values":[{"value":[61]}]}`,
-				`null`},
-		},
-		{
-			stmt: `SELECT sum(value) FROM cpu WHERE host='serverA'`,
-			expected: []string{
-				`{"name":"cpu","fields":["value"],"values":[{"value":[61]}]}`,
-				`null`},
-		},
-		{
-			stmt: fmt.Sprintf(`SELECT sum(value) FROM cpu WHERE time = '%s'`, pt1time.Format(influxql.DateTimeFormat)),
-			expected: []string{
-				`{"name":"cpu","fields":["value"],"values":[{"time":10000000000,"value":[1]}]}`,
-				`null`},
-		},
-		{
-			stmt: fmt.Sprintf(`SELECT sum(value) FROM cpu WHERE time > '%s'`, pt1time.Format(influxql.DateTimeFormat)),
-			expected: []string{
-				`{"name":"cpu","fields":["value"],"values":[{"time":10000000001,"value":[60]}]}`,
-				`null`},
-		},
-		{
-			stmt: fmt.Sprintf(`SELECT sum(value) FROM cpu WHERE time > '%s'`, pt2time.Format(influxql.DateTimeFormat)),
-			expected: []string{
-				`{"name":"cpu","fields":["value"],"values":[{"time":20000000001,"value":[null]}]}`,
-				`null`},
-		},
-	}
-
-	for _, tt := range tests {
-		stmt := mustParseSelectStatement(tt.stmt)
-		mapper := openAggregateMapperOrFail(t, shard, stmt)
-
-		for i := range tt.expected {
-			got := aggIntervalAsJson(t, mapper)
-			if got != tt.expected[i] {
-				t.Fatalf("test '%s'\n\tgot      %s\n\texpected %s", tt.stmt, got, tt.expected[i])
-				break
-			}
-		}
-	}
-}
-
-func TestShardMapper_SelectMapperTagSetsFields(t *testing.T) {
-	tmpDir, _ := ioutil.TempDir("", "shard_test")
-	defer os.RemoveAll(tmpDir)
-	shard := mustCreateShard(tmpDir)
-
-	pt1time := time.Unix(1, 0).UTC()
-	pt1 := models.MustNewPoint(
-		"cpu",
-		map[string]string{"host": "serverA", "region": "us-east"},
-		map[string]interface{}{"value": 42},
-		pt1time,
-	)
-	pt2time := time.Unix(2, 0).UTC()
-	pt2 := models.MustNewPoint(
-		"cpu",
-		map[string]string{"host": "serverB", "region": "us-east"},
-		map[string]interface{}{"value": 60},
-		pt2time,
-	)
-	err := shard.WritePoints([]models.Point{pt1, pt2})
-	if err != nil {
-		t.Fatalf(err.Error())
-	}
-
-	var tests = []struct {
-		stmt           string
-		expectedFields []string
-		expectedTags   []string
-	}{
-		{
-			stmt:           `SELECT sum(value) FROM cpu`,
-			expectedFields: []string{"value"},
-			expectedTags:   []string{"cpu"},
-		},
-		{
-			stmt:           `SELECT sum(value) FROM cpu GROUP BY host`,
-			expectedFields: []string{"value"},
-			expectedTags:   []string{"cpu|host|serverA", "cpu|host|serverB"},
-		},
-		{
-			stmt:           `SELECT sum(value) FROM cpu GROUP BY region`,
-			expectedFields: []string{"value"},
-			expectedTags:   []string{"cpu|region|us-east"},
-		},
-		{
-			stmt:           `SELECT sum(value) FROM cpu WHERE host='serverA'`,
-			expectedFields: []string{"value"},
-			expectedTags:   []string{"cpu"},
-		},
-		{
-			stmt:           `SELECT sum(value) FROM cpu WHERE host='serverB'`,
-			expectedFields: []string{"value"},
-			expectedTags:   []string{"cpu"},
-		},
-		{
-			stmt:           `SELECT sum(value) FROM cpu WHERE host='serverC'`,
-			expectedFields: []string{"value"},
-			expectedTags:   []string{},
-		},
-	}
-
-	for _, tt := range tests {
-		stmt := mustParseSelectStatement(tt.stmt)
-		mapper := openAggregateMapperOrFail(t, shard, stmt)
-
-		fields := mapper.Fields()
-		if !reflect.DeepEqual(fields, tt.expectedFields) {
-			t.Errorf("test '%s'\n\tgot      %s\n\texpected %s", tt.stmt, fields, tt.expectedFields)
-		}
-
-		tags := mapper.TagSets()
-		if !reflect.DeepEqual(tags, tt.expectedTags) {
-			t.Errorf("test '%s'\n\tgot      %s\n\texpected %s", tt.stmt, tags, tt.expectedTags)
-		}
-	}
-}
-
-func mustCreateShard(dir string) *tsdb.Shard {
-	tmpShard := path.Join(dir, "shard")
-	tmpWal := path.Join(dir, "wal")
-	index := tsdb.NewDatabaseIndex()
-	opts := tsdb.NewEngineOptions()
-	opts.Config.WALDir = filepath.Join(dir, "wal")
-	sh := tsdb.NewShard(1, index, tmpShard, tmpWal, opts)
-	if err := sh.Open(); err != nil {
-		panic(fmt.Sprintf("error opening shard: %s", err.Error()))
-	}
-	return sh
-}
-
-// mustParseSelectStatement parses a select statement. Panic on error.
-func mustParseSelectStatement(s string) *influxql.SelectStatement {
-	stmt, err := influxql.NewParser(strings.NewReader(s)).ParseStatement()
-	if err != nil {
-		panic(err)
-	}
-	return stmt.(*influxql.SelectStatement)
-}
-
-// mustParseStatement parses a statement. Panic on error.
-func mustParseStatement(s string) influxql.Statement {
-	stmt, err := influxql.NewParser(strings.NewReader(s)).ParseStatement()
-	if err != nil {
-		panic(err)
-	}
-	return stmt
-}
-
-func openRawMapperOrFail(t *testing.T, shard *tsdb.Shard, stmt *influxql.SelectStatement, chunkSize int) tsdb.Mapper {
-	m := tsdb.NewRawMapper(shard, stmt)
-	m.ChunkSize = chunkSize
-	if err := m.Open(); err != nil {
-		t.Fatalf("failed to open raw mapper: %s", err.Error())
-	}
-	return m
-}
-
-func nextRawChunkAsJson(t *testing.T, mapper tsdb.Mapper) string {
-	r, err := mapper.NextChunk()
-	if err != nil {
-		t.Fatalf("failed to get next chunk from mapper: %s", err.Error())
-	}
-	return mustMarshalMapperOutput(r)
-}
-
-func openAggregateMapperOrFail(t *testing.T, shard *tsdb.Shard, stmt *influxql.SelectStatement) *tsdb.AggregateMapper {
-	m := tsdb.NewAggregateMapper(shard, stmt)
-	if err := m.Open(); err != nil {
-		t.Fatalf("failed to open aggregate mapper: %s", err.Error())
-	}
-	return m
-}
-
-func aggIntervalAsJson(t *testing.T, mapper *tsdb.AggregateMapper) string {
-	r, err := mapper.NextChunk()
-	if err != nil {
-		t.Fatalf("failed to get next chunk from aggregate mapper: %s", err.Error())
-	}
-	return mustMarshalMapperOutput(r)
-}
-
-// mustMarshalMapperOutput manually converts a mapper output to JSON, to avoid the
-// built-in encoding.
-func mustMarshalMapperOutput(r interface{}) string {
-	if r == nil {
-		b, err := json.Marshal(nil)
-		if err != nil {
-			panic("failed to marshal nil chunk as JSON")
-		}
-		return string(b)
-	}
-	mo := r.(*tsdb.MapperOutput)
-
-	type v struct {
-		Time  int64             `json:"time,omitempty"`
-		Value interface{}       `json:"value,omitempty"`
-		Tags  map[string]string `json:"tags,omitempty"`
-	}
-
-	values := make([]*v, len(mo.Values))
-	for i, value := range mo.Values {
-		values[i] = &v{
-			Time:  value.Time,
-			Value: value.Value,
-			Tags:  value.Tags,
-		}
-	}
-
-	var o struct {
-		Name   string            `json:"name,omitempty"`
-		Tags   map[string]string `json:"tags,omitempty"`
-		Fields []string          `json:"fields,omitempty"`
-		Values []*v              `json:"values,omitempty"`
-	}
-
-	o.Name = mo.Name
-	o.Tags = mo.Tags
-	o.Fields = mo.Fields
-	o.Values = values
-
-	b, err := json.Marshal(o)
-	if err != nil {
-		panic("failed to marshal MapperOutput")
-	}
-	return string(b)
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/meta.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/meta.go
deleted file mode 100644
index a0890ebfc..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/meta.go
+++ /dev/null
@@ -1,1595 +0,0 @@
-package tsdb
-
-import (
-	"fmt"
-	"regexp"
-	"sort"
-	"strings"
-	"sync"
-	"time"
-
-	"github.com/influxdb/influxdb/influxql"
-	"github.com/influxdb/influxdb/pkg/escape"
-	"github.com/influxdb/influxdb/tsdb/internal"
-
-	"github.com/gogo/protobuf/proto"
-)
-
-//go:generate protoc --gogo_out=. internal/meta.proto
-
-const (
-	maxStringLength = 64 * 1024
-)
-
-// DatabaseIndex is the in memory index of a collection of measurements, time series, and their tags.
-// Exported functions are goroutine safe while un-exported functions assume the caller will use the appropriate locks
-type DatabaseIndex struct {
-	// in memory metadata index, built on load and updated when new series come in
-	mu           sync.RWMutex
-	measurements map[string]*Measurement // measurement name to object and index
-	series       map[string]*Series      // map series key to the Series object
-	lastID       uint64                  // last used series ID. They're in memory only for this shard
-}
-
-func NewDatabaseIndex() *DatabaseIndex {
-	return &DatabaseIndex{
-		measurements: make(map[string]*Measurement),
-		series:       make(map[string]*Series),
-	}
-}
-
-// Series returns a series by key.
-func (d *DatabaseIndex) Series(key string) *Series {
-	d.mu.RLock()
-	defer d.mu.RUnlock()
-	return d.series[key]
-}
-
-// SeriesN returns the number of series.
-func (d *DatabaseIndex) SeriesN() int {
-	d.mu.RLock()
-	defer d.mu.RUnlock()
-	return len(d.series)
-}
-
-// Measurement returns the measurement object from the index by the name
-func (d *DatabaseIndex) Measurement(name string) *Measurement {
-	d.mu.RLock()
-	defer d.mu.RUnlock()
-	return d.measurements[name]
-}
-
-// MeasurementsByName returns a list of measurements.
-func (d *DatabaseIndex) MeasurementsByName(names []string) []*Measurement {
-	d.mu.RLock()
-	defer d.mu.RUnlock()
-
-	a := make([]*Measurement, 0, len(names))
-	for _, name := range names {
-		if m := d.measurements[name]; m != nil {
-			a = append(a, m)
-		}
-	}
-	return a
-}
-
-// MeasurementSeriesCounts returns the number of measurements and series currently indexed by the database.
-// Useful for reporting and monitoring.
-func (d *DatabaseIndex) MeasurementSeriesCounts() (nMeasurements int, nSeries int) {
-	d.mu.RLock()
-	defer d.mu.RUnlock()
-	nMeasurements, nSeries = len(d.measurements), len(d.series)
-	return
-}
-
-// CreateSeriesIndexIfNotExists adds the series for the given measurement to the index and sets its ID or returns the existing series object
-func (s *DatabaseIndex) CreateSeriesIndexIfNotExists(measurementName string, series *Series) *Series {
-	// if there is a measurement for this id, it's already been added
-	ss := s.series[series.Key]
-	if ss != nil {
-		return ss
-	}
-
-	// get or create the measurement index
-	m := s.CreateMeasurementIndexIfNotExists(measurementName)
-
-	// set the in memory ID for query processing on this shard
-	series.id = s.lastID + 1
-	s.lastID += 1
-
-	series.measurement = m
-	s.series[series.Key] = series
-
-	m.AddSeries(series)
-
-	return series
-}
-
-// CreateMeasurementIndexIfNotExists creates or retrieves an in memory index object for the measurement
-func (s *DatabaseIndex) CreateMeasurementIndexIfNotExists(name string) *Measurement {
-	name = escape.UnescapeString(name)
-	m := s.measurements[name]
-	if m == nil {
-		m = NewMeasurement(name, s)
-		s.measurements[name] = m
-	}
-	return m
-}
-
-// TagsForSeries returns the tag map for the passed in series
-func (s *DatabaseIndex) TagsForSeries(key string) map[string]string {
-	s.mu.RLock()
-	defer s.mu.RUnlock()
-	ss := s.series[key]
-	if ss == nil {
-		return nil
-	}
-	return ss.Tags
-}
-
-// measurementsByExpr takes and expression containing only tags and returns
-// a list of matching *Measurement.
-func (db *DatabaseIndex) measurementsByExpr(expr influxql.Expr) (Measurements, error) {
-	switch e := expr.(type) {
-	case *influxql.BinaryExpr:
-		switch e.Op {
-		case influxql.EQ, influxql.NEQ, influxql.EQREGEX, influxql.NEQREGEX:
-			tag, ok := e.LHS.(*influxql.VarRef)
-			if !ok {
-				return nil, fmt.Errorf("left side of '%s' must be a tag key", e.Op.String())
-			}
-
-			tf := &TagFilter{
-				Op:  e.Op,
-				Key: tag.Val,
-			}
-
-			if influxql.IsRegexOp(e.Op) {
-				re, ok := e.RHS.(*influxql.RegexLiteral)
-				if !ok {
-					return nil, fmt.Errorf("right side of '%s' must be a regular expression", e.Op.String())
-				}
-				tf.Regex = re.Val
-			} else {
-				s, ok := e.RHS.(*influxql.StringLiteral)
-				if !ok {
-					return nil, fmt.Errorf("right side of '%s' must be a tag value string", e.Op.String())
-				}
-				tf.Value = s.Val
-			}
-
-			return db.measurementsByTagFilters([]*TagFilter{tf}), nil
-		case influxql.OR, influxql.AND:
-			lhsIDs, err := db.measurementsByExpr(e.LHS)
-			if err != nil {
-				return nil, err
-			}
-
-			rhsIDs, err := db.measurementsByExpr(e.RHS)
-			if err != nil {
-				return nil, err
-			}
-
-			if e.Op == influxql.OR {
-				return lhsIDs.union(rhsIDs), nil
-			}
-
-			return lhsIDs.intersect(rhsIDs), nil
-		default:
-			return nil, fmt.Errorf("invalid operator")
-		}
-	case *influxql.ParenExpr:
-		return db.measurementsByExpr(e.Expr)
-	}
-	return nil, fmt.Errorf("%#v", expr)
-}
-
-// measurementsByTagFilters returns the sorted measurements matching the filters on tag values.
-func (db *DatabaseIndex) measurementsByTagFilters(filters []*TagFilter) Measurements {
-	// If no filters, then return all measurements.
-	if len(filters) == 0 {
-		measurements := make(Measurements, 0, len(db.measurements))
-		for _, m := range db.measurements {
-			measurements = append(measurements, m)
-		}
-		return measurements
-	}
-
-	// Build a list of measurements matching the filters.
-	var measurements Measurements
-	var tagMatch bool
-
-	// Iterate through all measurements in the database.
-	for _, m := range db.measurements {
-		// Iterate filters seeing if the measurement has a matching tag.
-		for _, f := range filters {
-			tagVals, ok := m.seriesByTagKeyValue[f.Key]
-			if !ok {
-				continue
-			}
-
-			tagMatch = false
-
-			// If the operator is non-regex, only check the specified value.
-			if f.Op == influxql.EQ || f.Op == influxql.NEQ {
-				if _, ok := tagVals[f.Value]; ok {
-					tagMatch = true
-				}
-			} else {
-				// Else, the operator is regex and we have to check all tag
-				// values against the regular expression.
-				for tagVal := range tagVals {
-					if f.Regex.MatchString(tagVal) {
-						tagMatch = true
-						break
-					}
-				}
-			}
-
-			isEQ := (f.Op == influxql.EQ || f.Op == influxql.EQREGEX)
-
-			// tags match | operation is EQ | measurement matches
-			// --------------------------------------------------
-			//     True   |       True      |      True
-			//     True   |       False     |      False
-			//     False  |       True      |      False
-			//     False  |       False     |      True
-
-			if tagMatch == isEQ {
-				measurements = append(measurements, m)
-				break
-			}
-		}
-	}
-
-	sort.Sort(measurements)
-	return measurements
-}
-
-// measurementsByRegex returns the measurements that match the regex.
-func (db *DatabaseIndex) measurementsByRegex(re *regexp.Regexp) Measurements {
-	var matches Measurements
-	for _, m := range db.measurements {
-		if re.MatchString(m.Name) {
-			matches = append(matches, m)
-		}
-	}
-	return matches
-}
-
-// Measurements returns a list of all measurements.
-func (db *DatabaseIndex) Measurements() Measurements {
-	measurements := make(Measurements, 0, len(db.measurements))
-	for _, m := range db.measurements {
-		measurements = append(measurements, m)
-	}
-	return measurements
-}
-
-// DropMeasurement removes the measurement and all of its underlying series from the database index
-func (db *DatabaseIndex) DropMeasurement(name string) {
-	db.mu.Lock()
-	defer db.mu.Unlock()
-
-	m := db.measurements[name]
-	if m == nil {
-		return
-	}
-
-	delete(db.measurements, name)
-	for _, s := range m.seriesByID {
-		delete(db.series, s.Key)
-	}
-}
-
-// DropSeries removes the series keys and their tags from the index
-func (db *DatabaseIndex) DropSeries(keys []string) {
-	db.mu.Lock()
-	defer db.mu.Unlock()
-	for _, k := range keys {
-		series := db.series[k]
-		if series == nil {
-			continue
-		}
-		series.measurement.DropSeries(series.id)
-		delete(db.series, k)
-	}
-}
-
-// RewriteSelectStatement performs any necessary query re-writing.
-func (db *DatabaseIndex) RewriteSelectStatement(stmt *influxql.SelectStatement) (*influxql.SelectStatement, error) {
-	// Expand regex expressions in the FROM clause.
-	sources, err := db.ExpandSources(stmt.Sources)
-	if err != nil {
-		return nil, err
-	}
-	stmt.Sources = sources
-
-	// Expand wildcards in the fields or GROUP BY.
-	stmt, err = db.ExpandWildcards(stmt)
-	if err != nil {
-		return nil, err
-	}
-
-	stmt.RewriteDistinct()
-
-	return stmt, nil
-}
-
-// expandWildcards returns a new SelectStatement with wildcards expanded
-// If only a `SELECT *` is present, without a `GROUP BY *`, both tags and fields expand in the SELECT
-// If a `SELECT *` and a `GROUP BY *` are both present, then only fiels are expanded in the `SELECT` and only
-// tags are expanded in the `GROUP BY`
-func (db *DatabaseIndex) ExpandWildcards(stmt *influxql.SelectStatement) (*influxql.SelectStatement, error) {
-	// If there are no wildcards in the statement, return it as-is.
-	if !stmt.HasWildcard() {
-		return stmt, nil
-	}
-	// Use sets to avoid duplicate field names.
-	fieldSet := map[string]struct{}{}
-	dimensionSet := map[string]struct{}{}
-
-	// keep track of where the wildcards are in the select statement
-	hasFieldWildcard := stmt.HasFieldWildcard()
-	hasDimensionWildcard := stmt.HasDimensionWildcard()
-
-	// Iterate measurements in the FROM clause getting the fields & dimensions for each.
-	var fields influxql.Fields
-	var dimensions influxql.Dimensions
-	for _, src := range stmt.Sources {
-		if m, ok := src.(*influxql.Measurement); ok {
-			// Lookup the measurement in the database.
-			mm := db.Measurement(m.Name)
-			if mm == nil {
-				// This shard have never received data for the measurement. No Mapper
-				// required.
-				return stmt, nil
-			}
-
-			// Get the fields for this measurement.
-			for _, name := range mm.FieldNames() {
-				if _, ok := fieldSet[name]; ok {
-					continue
-				}
-				fieldSet[name] = struct{}{}
-				fields = append(fields, &influxql.Field{Expr: &influxql.VarRef{Val: name}})
-			}
-
-			// Add tags to fields if a field wildcard was provided and a dimension wildcard was not.
-			if hasFieldWildcard && !hasDimensionWildcard {
-				for _, t := range mm.TagKeys() {
-					if _, ok := fieldSet[t]; ok {
-						continue
-					}
-					fieldSet[t] = struct{}{}
-					fields = append(fields, &influxql.Field{Expr: &influxql.VarRef{Val: t}})
-				}
-			}
-
-			// Get the dimensions for this measurement.
-			if hasDimensionWildcard {
-				for _, t := range mm.TagKeys() {
-					if _, ok := dimensionSet[t]; ok {
-						continue
-					}
-					dimensionSet[t] = struct{}{}
-					dimensions = append(dimensions, &influxql.Dimension{Expr: &influxql.VarRef{Val: t}})
-				}
-			}
-		}
-	}
-
-	// Return a new SelectStatement with the wild cards rewritten.
-	return stmt.RewriteWildcards(fields, dimensions), nil
-}
-
-// expandSources expands regex sources and removes duplicates.
-// NOTE: sources must be normalized (db and rp set) before calling this function.
-func (di *DatabaseIndex) ExpandSources(sources influxql.Sources) (influxql.Sources, error) {
-	// Use a map as a set to prevent duplicates. Two regexes might produce
-	// duplicates when expanded.
-	set := map[string]influxql.Source{}
-	names := []string{}
-
-	// Iterate all sources, expanding regexes when they're found.
-	for _, source := range sources {
-		switch src := source.(type) {
-		case *influxql.Measurement:
-			if src.Regex == nil {
-				name := src.String()
-				set[name] = src
-				names = append(names, name)
-				continue
-			}
-			// Get measurements from the database that match the regex.
-			measurements := di.measurementsByRegex(src.Regex.Val)
-			// Add those measurements to the set.
-			for _, m := range measurements {
-				m2 := &influxql.Measurement{
-					Database:        src.Database,
-					RetentionPolicy: src.RetentionPolicy,
-					Name:            m.Name,
-				}
-				name := m2.String()
-				if _, ok := set[name]; !ok {
-					set[name] = m2
-					names = append(names, name)
-				}
-			}
-		default:
-			return nil, fmt.Errorf("expandSources: unsuported source type: %T", source)
-		}
-	}
-
-	// Sort the list of source names.
-	sort.Strings(names)
-
-	// Convert set to a list of Sources.
-	expanded := make(influxql.Sources, 0, len(set))
-	for _, name := range names {
-		expanded = append(expanded, set[name])
-	}
-	return expanded, nil
-}
-
-// Measurement represents a collection of time series in a database. It also contains in memory
-// structures for indexing tags. Exported functions are goroutine safe while un-exported functions
-// assume the caller will use the appropriate locks
-type Measurement struct {
-	mu         sync.RWMutex
-	Name       string `json:"name,omitempty"`
-	fieldNames map[string]struct{}
-	index      *DatabaseIndex
-
-	// in-memory index fields
-	seriesByID          map[uint64]*Series // lookup table for series by their id
-	measurement         *Measurement
-	seriesByTagKeyValue map[string]map[string]SeriesIDs // map from tag key to value to sorted set of series ids
-	seriesIDs           SeriesIDs                       // sorted list of series IDs in this measurement
-}
-
-// NewMeasurement allocates and initializes a new Measurement.
-func NewMeasurement(name string, idx *DatabaseIndex) *Measurement {
-	return &Measurement{
-		Name:       name,
-		fieldNames: make(map[string]struct{}),
-		index:      idx,
-
-		seriesByID:          make(map[uint64]*Series),
-		seriesByTagKeyValue: make(map[string]map[string]SeriesIDs),
-		seriesIDs:           make(SeriesIDs, 0),
-	}
-}
-
-// HasField returns true if the measurement has a field by the given name
-func (m *Measurement) HasField(name string) bool {
-	m.mu.RLock()
-	defer m.mu.RUnlock()
-	_, hasField := m.fieldNames[name]
-	return hasField
-}
-
-// SeriesByID returns a series by identifier.
-func (m *Measurement) SeriesByID(id uint64) *Series {
-	m.mu.RLock()
-	defer m.mu.RUnlock()
-	return m.seriesByID[id]
-}
-
-// SeriesKeys returns the keys of every series in this measurement
-func (m *Measurement) SeriesKeys() []string {
-	m.mu.RLock()
-	defer m.mu.RUnlock()
-	var keys []string
-	for _, s := range m.seriesByID {
-		keys = append(keys, s.Key)
-	}
-	return keys
-}
-
-// ValidateGroupBy ensures that the GROUP BY is not a field.
-func (m *Measurement) ValidateGroupBy(stmt *influxql.SelectStatement) error {
-	for _, d := range stmt.Dimensions {
-		switch e := d.Expr.(type) {
-		case *influxql.VarRef:
-			if m.HasField(e.Val) {
-				return fmt.Errorf("can not use field in GROUP BY clause: %s", e.Val)
-			}
-		}
-	}
-	return nil
-}
-
-// HasTagKey returns true if at least one series in this measurement has written a value for the passed in tag key
-func (m *Measurement) HasTagKey(k string) bool {
-	m.mu.RLock()
-	defer m.mu.RUnlock()
-	_, hasTag := m.seriesByTagKeyValue[k]
-	return hasTag
-}
-
-// HasSeries returns true if there is at least 1 series under this measurement
-func (m *Measurement) HasSeries() bool {
-	m.mu.RLock()
-	defer m.mu.RUnlock()
-	return len(m.seriesByID) > 0
-}
-
-// AddSeries will add a series to the measurementIndex. Returns false if already present
-func (m *Measurement) AddSeries(s *Series) bool {
-	m.mu.Lock()
-	defer m.mu.Unlock()
-
-	if _, ok := m.seriesByID[s.id]; ok {
-		return false
-	}
-	m.seriesByID[s.id] = s
-	m.seriesIDs = append(m.seriesIDs, s.id)
-
-	// the series ID should always be higher than all others because it's a new
-	// series. So don't do the sort if we don't have to.
-	if len(m.seriesIDs) > 1 && m.seriesIDs[len(m.seriesIDs)-1] < m.seriesIDs[len(m.seriesIDs)-2] {
-		sort.Sort(m.seriesIDs)
-	}
-
-	// add this series id to the tag index on the measurement
-	for k, v := range s.Tags {
-		valueMap := m.seriesByTagKeyValue[k]
-		if valueMap == nil {
-			valueMap = make(map[string]SeriesIDs)
-			m.seriesByTagKeyValue[k] = valueMap
-		}
-		ids := valueMap[v]
-		ids = append(ids, s.id)
-
-		// most of the time the series ID will be higher than all others because it's a new
-		// series. So don't do the sort if we don't have to.
-		if len(ids) > 1 && ids[len(ids)-1] < ids[len(ids)-2] {
-			sort.Sort(ids)
-		}
-		valueMap[v] = ids
-	}
-
-	return true
-}
-
-// DropSeries will remove a series from the measurementIndex.
-func (m *Measurement) DropSeries(seriesID uint64) {
-	m.mu.Lock()
-	defer m.mu.Unlock()
-
-	if _, ok := m.seriesByID[seriesID]; !ok {
-		return
-	}
-	delete(m.seriesByID, seriesID)
-
-	var ids []uint64
-	for _, id := range m.seriesIDs {
-		if id != seriesID {
-			ids = append(ids, id)
-		}
-	}
-	m.seriesIDs = ids
-
-	// remove this series id to the tag index on the measurement
-	// s.seriesByTagKeyValue is defined as map[string]map[string]SeriesIDs
-	for k, v := range m.seriesByTagKeyValue {
-		values := v
-		for kk, vv := range values {
-			var ids []uint64
-			for _, id := range vv {
-				if id != seriesID {
-					ids = append(ids, id)
-				}
-			}
-			// Check to see if we have any ids, if not, remove the key
-			if len(ids) == 0 {
-				delete(values, kk)
-			} else {
-				values[kk] = ids
-			}
-		}
-		// If we have no values, then we delete the key
-		if len(values) == 0 {
-			delete(m.seriesByTagKeyValue, k)
-		} else {
-			m.seriesByTagKeyValue[k] = values
-		}
-	}
-
-	return
-}
-
-// filters walks the where clause of a select statement and returns a map with all series ids
-// matching the where clause and any filter expression that should be applied to each
-func (m *Measurement) filters(stmt *influxql.SelectStatement) (map[uint64]influxql.Expr, error) {
-	if stmt.Condition == nil || influxql.OnlyTimeExpr(stmt.Condition) {
-		seriesIdsToExpr := make(map[uint64]influxql.Expr)
-		for _, id := range m.seriesIDs {
-			seriesIdsToExpr[id] = nil
-		}
-		return seriesIdsToExpr, nil
-	}
-
-	ids, seriesIdsToExpr, err := m.walkWhereForSeriesIds(stmt.Condition)
-	if err != nil {
-		return nil, err
-	}
-	// Ensure every id is in the map and replace literal true expressions with
-	// nil so the engine doesn't waste time evaluating them.
-	for _, id := range ids {
-		if expr, ok := seriesIdsToExpr[id]; !ok {
-			seriesIdsToExpr[id] = nil
-		} else if b, ok := expr.(*influxql.BooleanLiteral); ok && b.Val {
-			seriesIdsToExpr[id] = nil
-		}
-	}
-	return seriesIdsToExpr, nil
-}
-
-// tagSets returns the unique tag sets that exist for the given tag keys. This is used to determine
-// what composite series will be created by a group by. i.e. "group by region" should return:
-// {"region":"uswest"}, {"region":"useast"}
-// or region, service returns
-// {"region": "uswest", "service": "redis"}, {"region": "uswest", "service": "mysql"}, etc...
-// This will also populate the TagSet objects with the series IDs that match each tagset and any
-// influx filter expression that goes with the series
-// TODO: this shouldn't be exported. However, until tx.go and the engine get refactored into tsdb, we need it.
-func (m *Measurement) TagSets(stmt *influxql.SelectStatement, dimensions []string) ([]*influxql.TagSet, error) {
-	m.index.mu.RLock()
-	defer m.index.mu.RUnlock()
-	m.mu.RLock()
-	defer m.mu.RUnlock()
-
-	// get the unique set of series ids and the filters that should be applied to each
-	filters, err := m.filters(stmt)
-	if err != nil {
-		return nil, err
-	}
-
-	// For every series, get the tag values for the requested tag keys i.e. dimensions. This is the
-	// TagSet for that series. Series with the same TagSet are then grouped together, because for the
-	// purpose of GROUP BY they are part of the same composite series.
-	tagSets := make(map[string]*influxql.TagSet)
-	for id, filter := range filters {
-		s := m.seriesByID[id]
-		tags := make(map[string]string)
-
-		// Build the TagSet for this series.
-		for _, dim := range dimensions {
-			tags[dim] = s.Tags[dim]
-		}
-
-		// Convert the TagSet to a string, so it can be added to a map allowing TagSets to be handled
-		// as a set.
-		tagsAsKey := string(MarshalTags(tags))
-		tagSet, ok := tagSets[tagsAsKey]
-		if !ok {
-			// This TagSet is new, create a new entry for it.
-			tagSet = &influxql.TagSet{}
-			tagsForSet := make(map[string]string)
-			for k, v := range tags {
-				tagsForSet[k] = v
-			}
-			tagSet.Tags = tagsForSet
-			tagSet.Key = MarshalTags(tagsForSet)
-		}
-
-		// Associate the series and filter with the Tagset.
-		tagSet.AddFilter(m.seriesByID[id].Key, filter)
-
-		// Ensure it's back in the map.
-		tagSets[tagsAsKey] = tagSet
-	}
-
-	// The TagSets have been created, as a map of TagSets. Just send
-	// the values back as a slice, sorting for consistency.
-	sortedTagSetKeys := make([]string, 0, len(tagSets))
-	for k, _ := range tagSets {
-		sortedTagSetKeys = append(sortedTagSetKeys, k)
-	}
-	sort.Strings(sortedTagSetKeys)
-
-	sortedTagsSets := make([]*influxql.TagSet, 0, len(sortedTagSetKeys))
-	for _, k := range sortedTagSetKeys {
-		sortedTagsSets = append(sortedTagsSets, tagSets[k])
-	}
-
-	return sortedTagsSets, nil
-}
-
-// mergeSeriesFilters merges two sets of filter expressions and culls series IDs.
-func mergeSeriesFilters(op influxql.Token, ids SeriesIDs, lfilters, rfilters FilterExprs) (SeriesIDs, FilterExprs) {
-	// Create a map to hold the final set of series filter expressions.
-	filters := make(map[uint64]influxql.Expr, 0)
-	// Resulting list of series IDs
-	var series SeriesIDs
-
-	// Combining logic:
-	// +==========+==========+==========+=======================+=======================+
-	// | operator |   LHS    |   RHS    |   intermediate expr   |     reduced filter    |
-	// +==========+==========+==========+=======================+=======================+
-	// |          | <nil>    | <r-expr> | true OR <r-expr>      | true                  |
-	// |          |----------+----------+-----------------------+-----------------------+
-	// | OR       | <l-expr> | <nil>    | <l-expr> OR true      | true                  |
-	// |          |----------+----------+-----------------------+-----------------------+
-	// |          | <nil>    | <nil>    | true OR true          | true                  |
-	// |          |----------+----------+-----------------------+-----------------------+
-	// |          | <l-expr> | <r-expr> | <l-expr> OR <r-expr>  | <l-expr> OR <r-expr>  |
-	// +----------+----------+----------+-----------------------+-----------------------+
-	// |          | <nil>    | <r-expr> | false AND <r-expr>    | false*                |
-	// |          |----------+----------+-----------------------+-----------------------+
-	// | AND      | <l-expr> | <nil>    | <l-expr> AND false    | false                 |
-	// |          |----------+----------+-----------------------+-----------------------+
-	// |          | <nil>    | <nil>    | false AND false       | false                 |
-	// |          |----------+----------+-----------------------+-----------------------+
-	// |          | <l-expr> | <r-expr> | <l-expr> AND <r-expr> | <l-expr> AND <r-expr> |
-	// +----------+----------+----------+-----------------------+-----------------------+
-	// *literal false filters and series IDs should be excluded from the results
-
-	def := false
-	if op == influxql.OR {
-		def = true
-	}
-
-	for _, id := range ids {
-		// Get LHS and RHS filter expressions for this series ID.
-		lfilter, rfilter := lfilters[id], rfilters[id]
-
-		// Set default filters if either LHS or RHS expressions were nil.
-		if lfilter == nil {
-			lfilter = &influxql.BooleanLiteral{Val: def}
-		}
-		if rfilter == nil {
-			rfilter = &influxql.BooleanLiteral{Val: def}
-		}
-
-		// Create the intermediate filter expression for this series ID.
-		be := &influxql.BinaryExpr{
-			Op:  op,
-			LHS: lfilter,
-			RHS: rfilter,
-		}
-
-		// Reduce the intermediate expression.
-		expr := influxql.Reduce(be, nil)
-
-		// If the expression reduced to false, exclude this series ID and filter.
-		if b, ok := expr.(*influxql.BooleanLiteral); ok && !b.Val {
-			continue
-		}
-
-		// Store the series ID and merged filter in the final results.
-		filters[id] = expr
-		series = append(series, id)
-	}
-	return series, filters
-}
-
-// idsForExpr will return a collection of series ids and a filter expression that should
-// be used to filter points from those series.
-func (m *Measurement) idsForExpr(n *influxql.BinaryExpr) (SeriesIDs, influxql.Expr, error) {
-	name, ok := n.LHS.(*influxql.VarRef)
-	value := n.RHS
-	if !ok {
-		name, ok = n.RHS.(*influxql.VarRef)
-		if !ok {
-			return nil, nil, fmt.Errorf("invalid expression: %s", n.String())
-		}
-		value = n.LHS
-	}
-
-	// For time literals, return all series IDs and "true" as the filter.
-	if _, ok := value.(*influxql.TimeLiteral); ok || name.Val == "time" {
-		return m.seriesIDs, &influxql.BooleanLiteral{Val: true}, nil
-	}
-
-	// For fields, return all series IDs from this measurement and return
-	// the expression passed in, as the filter.
-	if m.HasField(name.Val) {
-		return m.seriesIDs, n, nil
-	}
-
-	tagVals, ok := m.seriesByTagKeyValue[name.Val]
-	if !ok {
-		return nil, nil, nil
-	}
-
-	// if we're looking for series with a specific tag value
-	if str, ok := value.(*influxql.StringLiteral); ok {
-		var ids SeriesIDs
-
-		if n.Op == influxql.EQ {
-			// return series that have a tag of specific value.
-			ids = tagVals[str.Val]
-		} else if n.Op == influxql.NEQ {
-			ids = m.seriesIDs.Reject(tagVals[str.Val])
-		}
-		return ids, &influxql.BooleanLiteral{Val: true}, nil
-	}
-
-	// if we're looking for series with a tag value that matches a regex
-	if re, ok := value.(*influxql.RegexLiteral); ok {
-		var ids SeriesIDs
-
-		// The operation is a NEQREGEX, code must start by assuming all match, even
-		// series without any tags.
-		if n.Op == influxql.NEQREGEX {
-			ids = m.seriesIDs
-		}
-
-		for k := range tagVals {
-			match := re.Val.MatchString(k)
-
-			if match && n.Op == influxql.EQREGEX {
-				ids = ids.Union(tagVals[k])
-			} else if match && n.Op == influxql.NEQREGEX {
-				ids = ids.Reject(tagVals[k])
-			}
-		}
-		return ids, &influxql.BooleanLiteral{Val: true}, nil
-	}
-
-	return nil, nil, nil
-}
-
-// FilterExprs represents a map of series IDs to filter expressions.
-type FilterExprs map[uint64]influxql.Expr
-
-// DeleteBoolLiteralTrues deletes all elements whose filter expression is a boolean literal true.
-func (fe FilterExprs) DeleteBoolLiteralTrues() {
-	for id, expr := range fe {
-		if e, ok := expr.(*influxql.BooleanLiteral); ok && e.Val == true {
-			delete(fe, id)
-		}
-	}
-}
-
-// Len returns the number of elements.
-func (fe FilterExprs) Len() int {
-	if fe == nil {
-		return 0
-	}
-	return len(fe)
-}
-
-// walkWhereForSeriesIds recursively walks the WHERE clause and returns an ordered set of series IDs and
-// a map from those series IDs to filter expressions that should be used to limit points returned in
-// the final query result.
-func (m *Measurement) walkWhereForSeriesIds(expr influxql.Expr) (SeriesIDs, FilterExprs, error) {
-	switch n := expr.(type) {
-	case *influxql.BinaryExpr:
-		switch n.Op {
-		case influxql.EQ, influxql.NEQ, influxql.LT, influxql.LTE, influxql.GT, influxql.GTE, influxql.EQREGEX, influxql.NEQREGEX:
-			// Get the series IDs and filter expression for the tag or field comparison.
-			ids, expr, err := m.idsForExpr(n)
-			if err != nil {
-				return nil, nil, err
-			}
-
-			filters := FilterExprs{}
-			for _, id := range ids {
-				filters[id] = expr
-			}
-
-			return ids, filters, nil
-		case influxql.AND, influxql.OR:
-			// Get the series IDs and filter expressions for the LHS.
-			lids, lfilters, err := m.walkWhereForSeriesIds(n.LHS)
-			if err != nil {
-				return nil, nil, err
-			}
-
-			// Get the series IDs and filter expressions for the RHS.
-			rids, rfilters, err := m.walkWhereForSeriesIds(n.RHS)
-			if err != nil {
-				return nil, nil, err
-			}
-
-			// Combine the series IDs from the LHS and RHS.
-			var ids SeriesIDs
-			switch n.Op {
-			case influxql.AND:
-				ids = lids.Intersect(rids)
-			case influxql.OR:
-				ids = lids.Union(rids)
-			}
-
-			// Merge the filter expressions for the LHS and RHS.
-			ids, filters := mergeSeriesFilters(n.Op, ids, lfilters, rfilters)
-
-			return ids, filters, nil
-		}
-
-		ids, _, err := m.idsForExpr(n)
-		return ids, nil, err
-	case *influxql.ParenExpr:
-		// walk down the tree
-		return m.walkWhereForSeriesIds(n.Expr)
-	default:
-		return nil, nil, nil
-	}
-}
-
-// expandExpr returns a list of expressions expanded by all possible tag combinations.
-func (m *Measurement) expandExpr(expr influxql.Expr) []tagSetExpr {
-	// Retrieve list of unique values for each tag.
-	valuesByTagKey := m.uniqueTagValues(expr)
-
-	// Convert keys to slices.
-	keys := make([]string, 0, len(valuesByTagKey))
-	for key := range valuesByTagKey {
-		keys = append(keys, key)
-	}
-	sort.Strings(keys)
-
-	// Order uniques by key.
-	uniques := make([][]string, len(keys))
-	for i, key := range keys {
-		uniques[i] = valuesByTagKey[key]
-	}
-
-	// Reduce a condition for each combination of tag values.
-	return expandExprWithValues(expr, keys, []tagExpr{}, uniques, 0)
-}
-
-func expandExprWithValues(expr influxql.Expr, keys []string, tagExprs []tagExpr, uniques [][]string, index int) []tagSetExpr {
-	// If we have no more keys left then execute the reduction and return.
-	if index == len(keys) {
-		// Create a map of tag key/values.
-		m := make(map[string]*string, len(keys))
-		for i, key := range keys {
-			if tagExprs[i].op == influxql.EQ {
-				m[key] = &tagExprs[i].values[0]
-			} else {
-				m[key] = nil
-			}
-		}
-
-		// TODO: Rewrite full expressions instead of VarRef replacement.
-
-		// Reduce using the current tag key/value set.
-		// Ignore it if reduces down to "false".
-		e := influxql.Reduce(expr, &tagValuer{tags: m})
-		if e, ok := e.(*influxql.BooleanLiteral); ok && e.Val == false {
-			return nil
-		}
-
-		return []tagSetExpr{{values: copyTagExprs(tagExprs), expr: e}}
-	}
-
-	// Otherwise expand for each possible equality value of the key.
-	var exprs []tagSetExpr
-	for _, v := range uniques[index] {
-		exprs = append(exprs, expandExprWithValues(expr, keys, append(tagExprs, tagExpr{keys[index], []string{v}, influxql.EQ}), uniques, index+1)...)
-	}
-	exprs = append(exprs, expandExprWithValues(expr, keys, append(tagExprs, tagExpr{keys[index], uniques[index], influxql.NEQ}), uniques, index+1)...)
-
-	return exprs
-}
-
-// seriesIDsAllOrByExpr walks an expressions for matching series IDs
-// or, if no expressions is given, returns all series IDs for the measurement.
-func (m *Measurement) seriesIDsAllOrByExpr(expr influxql.Expr) (SeriesIDs, error) {
-	// If no expression given or the measurement has no series,
-	// we can take just return the ids or nil accordingly.
-	if expr == nil {
-		return m.seriesIDs, nil
-	} else if len(m.seriesIDs) == 0 {
-		return nil, nil
-	}
-
-	// Get series IDs that match the WHERE clause.
-	ids, _, err := m.walkWhereForSeriesIds(expr)
-	if err != nil {
-		return nil, err
-	}
-
-	return ids, nil
-}
-
-// tagValuer is used during expression expansion to evaluate all sets of tag values.
-type tagValuer struct {
-	tags map[string]*string
-}
-
-// Value returns the string value of a tag and true if it's listed in the tagset.
-func (v *tagValuer) Value(name string) (interface{}, bool) {
-	if value, ok := v.tags[name]; ok {
-		if value == nil {
-			return nil, true
-		}
-		return *value, true
-	}
-	return nil, false
-}
-
-// tagSetExpr represents a set of tag keys/values and associated expression.
-type tagSetExpr struct {
-	values []tagExpr
-	expr   influxql.Expr
-}
-
-// tagExpr represents one or more values assigned to a given tag.
-type tagExpr struct {
-	key    string
-	values []string
-	op     influxql.Token // EQ or NEQ
-}
-
-func copyTagExprs(a []tagExpr) []tagExpr {
-	other := make([]tagExpr, len(a))
-	copy(other, a)
-	return other
-}
-
-// uniqueTagValues returns a list of unique tag values used in an expression.
-func (m *Measurement) uniqueTagValues(expr influxql.Expr) map[string][]string {
-	// Track unique value per tag.
-	tags := make(map[string]map[string]struct{})
-
-	// Find all tag values referenced in the expression.
-	influxql.WalkFunc(expr, func(n influxql.Node) {
-		switch n := n.(type) {
-		case *influxql.BinaryExpr:
-			// Ignore operators that are not equality.
-			if n.Op != influxql.EQ {
-				return
-			}
-
-			// Extract ref and string literal.
-			var key, value string
-			switch lhs := n.LHS.(type) {
-			case *influxql.VarRef:
-				if rhs, ok := n.RHS.(*influxql.StringLiteral); ok {
-					key, value = lhs.Val, rhs.Val
-				}
-			case *influxql.StringLiteral:
-				if rhs, ok := n.RHS.(*influxql.VarRef); ok {
-					key, value = rhs.Val, lhs.Val
-				}
-			}
-			if key == "" {
-				return
-			}
-
-			// Add value to set.
-			if tags[key] == nil {
-				tags[key] = make(map[string]struct{})
-			}
-			tags[key][value] = struct{}{}
-		}
-	})
-
-	// Convert to map of slices.
-	out := make(map[string][]string)
-	for k, values := range tags {
-		out[k] = make([]string, 0, len(values))
-		for v := range values {
-			out[k] = append(out[k], v)
-		}
-		sort.Strings(out[k])
-	}
-	return out
-}
-
-// SelectFields returns a list of fields in the SELECT section of stmt.
-func (m *Measurement) SelectFields(stmt *influxql.SelectStatement) []string {
-	set := newStringSet()
-	for _, name := range stmt.NamesInSelect() {
-		if m.HasField(name) {
-			set.add(name)
-			continue
-		}
-	}
-	return set.list()
-}
-
-// SelectTags returns a list of non-field tags in the SELECT section of stmt.
-func (m *Measurement) SelectTags(stmt *influxql.SelectStatement) []string {
-	set := newStringSet()
-	for _, name := range stmt.NamesInSelect() {
-		if !m.HasField(name) && m.HasTagKey(name) {
-			set.add(name)
-		}
-	}
-	return set.list()
-}
-
-// WhereFields returns a list of non-"time" fields in the WHERE section of stmt.
-func (m *Measurement) WhereFields(stmt *influxql.SelectStatement) []string {
-	set := newStringSet()
-	for _, name := range stmt.NamesInWhere() {
-		if name != "time" && m.HasField(name) {
-			set.add(name)
-		}
-	}
-	return set.list()
-}
-
-// DimensionTagSets returns list of tag sets from the GROUP BY section of stmt.
-func (m *Measurement) DimensionTagSets(stmt *influxql.SelectStatement) ([]*influxql.TagSet, error) {
-	_, tagKeys := stmt.Dimensions.Normalize()
-
-	for _, n := range stmt.NamesInDimension() {
-		if m.HasTagKey(n) {
-			tagKeys = append(tagKeys, n)
-		}
-	}
-
-	// Get the sorted unique tag sets for this statement.
-	tagSets, err := m.TagSets(stmt, tagKeys)
-	if err != nil {
-		return nil, err
-	}
-	return tagSets, nil
-}
-
-type SelectInfo struct {
-	SelectFields []string
-	SelectTags   []string
-	WhereFields  []string
-}
-
-// Measurements represents a list of *Measurement.
-type Measurements []*Measurement
-
-func (a Measurements) Len() int           { return len(a) }
-func (a Measurements) Less(i, j int) bool { return a[i].Name < a[j].Name }
-func (a Measurements) Swap(i, j int)      { a[i], a[j] = a[j], a[i] }
-
-// SelectFields returns a list of fields in the SELECT section of stmt.
-func (a Measurements) SelectFields(stmt *influxql.SelectStatement) []string {
-	set := newStringSet()
-	for _, name := range stmt.NamesInSelect() {
-		for _, m := range a {
-			if m.HasField(name) {
-				set.add(name)
-			}
-		}
-	}
-	return set.list()
-}
-
-// SelectTags returns a list of non-field tags in the SELECT section of stmt.
-func (a Measurements) SelectTags(stmt *influxql.SelectStatement) []string {
-	set := newStringSet()
-	for _, name := range stmt.NamesInSelect() {
-		for _, m := range a {
-			if !m.HasField(name) && m.HasTagKey(name) {
-				set.add(name)
-			}
-		}
-	}
-	return set.list()
-}
-
-// WhereFields returns a list of non-"time" fields in the WHERE section of stmt.
-func (a Measurements) WhereFields(stmt *influxql.SelectStatement) []string {
-	set := newStringSet()
-	for _, name := range stmt.NamesInWhere() {
-		for _, m := range a {
-			if name != "time" && m.HasField(name) {
-				set.add(name)
-			}
-		}
-	}
-	return set.list()
-}
-
-func (a Measurements) intersect(other Measurements) Measurements {
-	l := a
-	r := other
-
-	// we want to iterate through the shortest one and stop
-	if len(other) < len(a) {
-		l = other
-		r = a
-	}
-
-	// they're in sorted order so advance the counter as needed.
-	// That is, don't run comparisons against lower values that we've already passed
-	var i, j int
-
-	result := make(Measurements, 0, len(l))
-	for i < len(l) && j < len(r) {
-		if l[i].Name == r[j].Name {
-			result = append(result, l[i])
-			i++
-			j++
-		} else if l[i].Name < r[j].Name {
-			i++
-		} else {
-			j++
-		}
-	}
-
-	return result
-}
-
-func (a Measurements) union(other Measurements) Measurements {
-	result := make(Measurements, 0, len(a)+len(other))
-	var i, j int
-	for i < len(a) && j < len(other) {
-		if a[i].Name == other[j].Name {
-			result = append(result, a[i])
-			i++
-			j++
-		} else if a[i].Name < other[j].Name {
-			result = append(result, a[i])
-			i++
-		} else {
-			result = append(result, other[j])
-			j++
-		}
-	}
-
-	// now append the remainder
-	if i < len(a) {
-		result = append(result, a[i:]...)
-	} else if j < len(other) {
-		result = append(result, other[j:]...)
-	}
-
-	return result
-}
-
-// Series belong to a Measurement and represent unique time series in a database
-type Series struct {
-	Key  string
-	Tags map[string]string
-
-	id          uint64
-	measurement *Measurement
-	shardIDs    map[uint64]bool // shards that have this series defined
-}
-
-// NewSeries returns an initialized series struct
-func NewSeries(key string, tags map[string]string) *Series {
-	return &Series{
-		Key:      key,
-		Tags:     tags,
-		shardIDs: make(map[uint64]bool),
-	}
-}
-
-// MarshalBinary encodes the object to a binary format.
-func (s *Series) MarshalBinary() ([]byte, error) {
-	var pb internal.Series
-	pb.Key = &s.Key
-	for k, v := range s.Tags {
-		key := k
-		value := v
-		pb.Tags = append(pb.Tags, &internal.Tag{Key: &key, Value: &value})
-	}
-	return proto.Marshal(&pb)
-}
-
-// UnmarshalBinary decodes the object from a binary format.
-func (s *Series) UnmarshalBinary(buf []byte) error {
-	var pb internal.Series
-	if err := proto.Unmarshal(buf, &pb); err != nil {
-		return err
-	}
-	s.Key = pb.GetKey()
-	s.Tags = make(map[string]string)
-	for _, t := range pb.Tags {
-		s.Tags[t.GetKey()] = t.GetValue()
-	}
-	return nil
-}
-
-func (s *Series) InitializeShards() {
-	s.shardIDs = make(map[uint64]bool)
-}
-
-// match returns true if all tags match the series' tags.
-func (s *Series) match(tags map[string]string) bool {
-	for k, v := range tags {
-		if s.Tags[k] != v {
-			return false
-		}
-	}
-	return true
-}
-
-// SeriesIDs is a convenience type for sorting, checking equality, and doing
-// union and intersection of collections of series ids.
-type SeriesIDs []uint64
-
-func (a SeriesIDs) Len() int           { return len(a) }
-func (a SeriesIDs) Less(i, j int) bool { return a[i] < a[j] }
-func (a SeriesIDs) Swap(i, j int)      { a[i], a[j] = a[j], a[i] }
-
-// Equals assumes that both are sorted.
-func (a SeriesIDs) Equals(other SeriesIDs) bool {
-	if len(a) != len(other) {
-		return false
-	}
-	for i, s := range other {
-		if a[i] != s {
-			return false
-		}
-	}
-	return true
-}
-
-// Intersect returns a new collection of series ids in sorted order that is the intersection of the two.
-// The two collections must already be sorted.
-func (a SeriesIDs) Intersect(other SeriesIDs) SeriesIDs {
-	l := a
-	r := other
-
-	// we want to iterate through the shortest one and stop
-	if len(other) < len(a) {
-		l = other
-		r = a
-	}
-
-	// they're in sorted order so advance the counter as needed.
-	// That is, don't run comparisons against lower values that we've already passed
-	var i, j int
-
-	ids := make([]uint64, 0, len(l))
-	for i < len(l) && j < len(r) {
-		if l[i] == r[j] {
-			ids = append(ids, l[i])
-			i++
-			j++
-		} else if l[i] < r[j] {
-			i++
-		} else {
-			j++
-		}
-	}
-
-	return SeriesIDs(ids)
-}
-
-// Union returns a new collection of series ids in sorted order that is the union of the two.
-// The two collections must already be sorted.
-func (a SeriesIDs) Union(other SeriesIDs) SeriesIDs {
-	l := a
-	r := other
-	ids := make([]uint64, 0, len(l)+len(r))
-	var i, j int
-	for i < len(l) && j < len(r) {
-		if l[i] == r[j] {
-			ids = append(ids, l[i])
-			i++
-			j++
-		} else if l[i] < r[j] {
-			ids = append(ids, l[i])
-			i++
-		} else {
-			ids = append(ids, r[j])
-			j++
-		}
-	}
-
-	// now append the remainder
-	if i < len(l) {
-		ids = append(ids, l[i:]...)
-	} else if j < len(r) {
-		ids = append(ids, r[j:]...)
-	}
-
-	return ids
-}
-
-// Reject returns a new collection of series ids in sorted order with the passed in set removed from the original.
-// This is useful for the NOT operator. The two collections must already be sorted.
-func (a SeriesIDs) Reject(other SeriesIDs) SeriesIDs {
-	l := a
-	r := other
-	var i, j int
-
-	ids := make([]uint64, 0, len(l))
-	for i < len(l) && j < len(r) {
-		if l[i] == r[j] {
-			i++
-			j++
-		} else if l[i] < r[j] {
-			ids = append(ids, l[i])
-			i++
-		} else {
-			j++
-		}
-	}
-
-	// Append the remainder
-	if i < len(l) {
-		ids = append(ids, l[i:]...)
-	}
-
-	return SeriesIDs(ids)
-}
-
-// TagFilter represents a tag filter when looking up other tags or measurements.
-type TagFilter struct {
-	Op    influxql.Token
-	Key   string
-	Value string
-	Regex *regexp.Regexp
-}
-
-// used to convert the tag set to bytes for use as a lookup key
-func MarshalTags(tags map[string]string) []byte {
-	// Empty maps marshal to empty bytes.
-	if len(tags) == 0 {
-		return nil
-	}
-
-	// Extract keys and determine final size.
-	sz := (len(tags) * 2) - 1 // separators
-	keys := make([]string, 0, len(tags))
-	for k, v := range tags {
-		keys = append(keys, k)
-		sz += len(k) + len(v)
-	}
-	sort.Strings(keys)
-
-	// Generate marshaled bytes.
-	b := make([]byte, sz)
-	buf := b
-	for _, k := range keys {
-		copy(buf, k)
-		buf[len(k)] = '|'
-		buf = buf[len(k)+1:]
-	}
-	for i, k := range keys {
-		v := tags[k]
-		copy(buf, v)
-		if i < len(keys)-1 {
-			buf[len(v)] = '|'
-			buf = buf[len(v)+1:]
-		}
-	}
-	return b
-}
-
-// timeBetweenInclusive returns true if t is between min and max, inclusive.
-func timeBetweenInclusive(t, min, max time.Time) bool {
-	return (t.Equal(min) || t.After(min)) && (t.Equal(max) || t.Before(max))
-}
-
-// TagKeys returns a list of the measurement's tag names.
-func (m *Measurement) TagKeys() []string {
-	m.mu.RLock()
-	defer m.mu.RUnlock()
-	keys := make([]string, 0, len(m.seriesByTagKeyValue))
-	for k := range m.seriesByTagKeyValue {
-		keys = append(keys, k)
-	}
-	sort.Strings(keys)
-	return keys
-}
-
-// TagValues returns all the values for the given tag key
-func (m *Measurement) TagValues(key string) []string {
-	m.mu.RLock()
-	defer m.mu.RUnlock()
-	values := []string{}
-	for v := range m.seriesByTagKeyValue[key] {
-		values = append(values, v)
-	}
-	return values
-}
-
-// SetFieldName adds the field name to the measurement.
-func (m *Measurement) SetFieldName(name string) {
-	m.mu.Lock()
-	m.fieldNames[name] = struct{}{}
-	m.mu.Unlock()
-}
-
-// FieldNames returns a list of the measurement's field names
-func (m *Measurement) FieldNames() (a []string) {
-	m.mu.RLock()
-	defer m.mu.RUnlock()
-
-	for n, _ := range m.fieldNames {
-		a = append(a, n)
-	}
-	return
-}
-
-func (m *Measurement) tagValuesByKeyAndSeriesID(tagKeys []string, ids SeriesIDs) map[string]stringSet {
-	// If no tag keys were passed, get all tag keys for the measurement.
-	if len(tagKeys) == 0 {
-		for k := range m.seriesByTagKeyValue {
-			tagKeys = append(tagKeys, k)
-		}
-	}
-
-	// Mapping between tag keys to all existing tag values.
-	tagValues := make(map[string]stringSet, 0)
-
-	// Iterate all series to collect tag values.
-	for _, id := range ids {
-		s, ok := m.seriesByID[id]
-		if !ok {
-			continue
-		}
-
-		// Iterate the tag keys we're interested in and collect values
-		// from this series, if they exist.
-		for _, tagKey := range tagKeys {
-			if tagVal, ok := s.Tags[tagKey]; ok {
-				if _, ok = tagValues[tagKey]; !ok {
-					tagValues[tagKey] = newStringSet()
-				}
-				tagValues[tagKey].add(tagVal)
-			}
-		}
-	}
-
-	return tagValues
-}
-
-// stringSet represents a set of strings.
-type stringSet map[string]struct{}
-
-// newStringSet returns an empty stringSet.
-func newStringSet() stringSet {
-	return make(map[string]struct{})
-}
-
-// add adds strings to the set.
-func (s stringSet) add(ss ...string) {
-	for _, n := range ss {
-		s[n] = struct{}{}
-	}
-}
-
-// contains returns whether the set contains the given string.
-func (s stringSet) contains(ss string) bool {
-	_, ok := s[ss]
-	return ok
-}
-
-// list returns the current elements in the set, in sorted order.
-func (s stringSet) list() []string {
-	l := make([]string, 0, len(s))
-	for k := range s {
-		l = append(l, k)
-	}
-	sort.Strings(l)
-	return l
-}
-
-// union returns the union of this set and another.
-func (s stringSet) union(o stringSet) stringSet {
-	ns := newStringSet()
-	for k := range s {
-		ns[k] = struct{}{}
-	}
-	for k := range o {
-		ns[k] = struct{}{}
-	}
-	return ns
-}
-
-// union returns the intersection of this set and another.
-func (s stringSet) intersect(o stringSet) stringSet {
-	ns := newStringSet()
-	for k := range s {
-		if _, ok := o[k]; ok {
-			ns[k] = struct{}{}
-		}
-	}
-	for k := range o {
-		if _, ok := s[k]; ok {
-			ns[k] = struct{}{}
-		}
-	}
-	return ns
-}
-
-func MeasurementFromSeriesKey(key string) string {
-	idx := strings.Index(key, ",")
-	if idx == -1 {
-		return key
-	}
-	return key[:strings.Index(key, ",")]
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/meta_test.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/meta_test.go
deleted file mode 100644
index 9964130b8..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/meta_test.go
+++ /dev/null
@@ -1,302 +0,0 @@
-package tsdb_test
-
-import (
-	"bytes"
-	"fmt"
-	"testing"
-
-	"github.com/influxdb/influxdb/influxql"
-	"github.com/influxdb/influxdb/tsdb"
-)
-
-// Test comparing SeriesIDs for equality.
-func Test_SeriesIDs_Equals(t *testing.T) {
-	ids1 := tsdb.SeriesIDs{1, 2, 3}
-	ids2 := tsdb.SeriesIDs{1, 2, 3}
-	ids3 := tsdb.SeriesIDs{4, 5, 6}
-
-	if !ids1.Equals(ids2) {
-		t.Fatal("expected ids1 == ids2")
-	} else if ids1.Equals(ids3) {
-		t.Fatal("expected ids1 != ids3")
-	}
-}
-
-// Test intersecting sets of SeriesIDs.
-func Test_SeriesIDs_Intersect(t *testing.T) {
-	// Test swaping l & r, all branches of if-else, and exit loop when 'j < len(r)'
-	ids1 := tsdb.SeriesIDs{1, 3, 4, 5, 6}
-	ids2 := tsdb.SeriesIDs{1, 2, 3, 7}
-	exp := tsdb.SeriesIDs{1, 3}
-	got := ids1.Intersect(ids2)
-
-	if !exp.Equals(got) {
-		t.Fatalf("exp=%v, got=%v", exp, got)
-	}
-
-	// Test exit for loop when 'i < len(l)'
-	ids1 = tsdb.SeriesIDs{1}
-	ids2 = tsdb.SeriesIDs{1, 2}
-	exp = tsdb.SeriesIDs{1}
-	got = ids1.Intersect(ids2)
-
-	if !exp.Equals(got) {
-		t.Fatalf("exp=%v, got=%v", exp, got)
-	}
-}
-
-// Test union sets of SeriesIDs.
-func Test_SeriesIDs_Union(t *testing.T) {
-	// Test all branches of if-else, exit loop because of 'j < len(r)', and append remainder from left.
-	ids1 := tsdb.SeriesIDs{1, 2, 3, 7}
-	ids2 := tsdb.SeriesIDs{1, 3, 4, 5, 6}
-	exp := tsdb.SeriesIDs{1, 2, 3, 4, 5, 6, 7}
-	got := ids1.Union(ids2)
-
-	if !exp.Equals(got) {
-		t.Fatalf("exp=%v, got=%v", exp, got)
-	}
-
-	// Test exit because of 'i < len(l)' and append remainder from right.
-	ids1 = tsdb.SeriesIDs{1}
-	ids2 = tsdb.SeriesIDs{1, 2}
-	exp = tsdb.SeriesIDs{1, 2}
-	got = ids1.Union(ids2)
-
-	if !exp.Equals(got) {
-		t.Fatalf("exp=%v, got=%v", exp, got)
-	}
-}
-
-// Test removing one set of SeriesIDs from another.
-func Test_SeriesIDs_Reject(t *testing.T) {
-	// Test all branches of if-else, exit loop because of 'j < len(r)', and append remainder from left.
-	ids1 := tsdb.SeriesIDs{1, 2, 3, 7}
-	ids2 := tsdb.SeriesIDs{1, 3, 4, 5, 6}
-	exp := tsdb.SeriesIDs{2, 7}
-	got := ids1.Reject(ids2)
-
-	if !exp.Equals(got) {
-		t.Fatalf("exp=%v, got=%v", exp, got)
-	}
-
-	// Test exit because of 'i < len(l)'.
-	ids1 = tsdb.SeriesIDs{1}
-	ids2 = tsdb.SeriesIDs{1, 2}
-	exp = tsdb.SeriesIDs{}
-	got = ids1.Reject(ids2)
-
-	if !exp.Equals(got) {
-		t.Fatalf("exp=%v, got=%v", exp, got)
-	}
-}
-
-// Ensure tags can be marshaled into a byte slice.
-func TestMarshalTags(t *testing.T) {
-	for i, tt := range []struct {
-		tags   map[string]string
-		result []byte
-	}{
-		{
-			tags:   nil,
-			result: nil,
-		},
-		{
-			tags:   map[string]string{"foo": "bar"},
-			result: []byte(`foo|bar`),
-		},
-		{
-			tags:   map[string]string{"foo": "bar", "baz": "battttt"},
-			result: []byte(`baz|foo|battttt|bar`),
-		},
-		{
-			tags:   map[string]string{"baz": "battttt", "foo": "bar"},
-			result: []byte(`baz|foo|battttt|bar`),
-		},
-	} {
-		result := tsdb.MarshalTags(tt.tags)
-		if !bytes.Equal(result, tt.result) {
-			t.Fatalf("%d. unexpected result: exp=%s, got=%s", i, tt.result, result)
-		}
-	}
-}
-
-func BenchmarkMarshalTags_KeyN1(b *testing.B)  { benchmarkMarshalTags(b, 1) }
-func BenchmarkMarshalTags_KeyN3(b *testing.B)  { benchmarkMarshalTags(b, 3) }
-func BenchmarkMarshalTags_KeyN5(b *testing.B)  { benchmarkMarshalTags(b, 5) }
-func BenchmarkMarshalTags_KeyN10(b *testing.B) { benchmarkMarshalTags(b, 10) }
-
-func benchmarkMarshalTags(b *testing.B, keyN int) {
-	const keySize, valueSize = 8, 15
-
-	// Generate tag map.
-	tags := make(map[string]string)
-	for i := 0; i < keyN; i++ {
-		tags[fmt.Sprintf("%0*d", keySize, i)] = fmt.Sprintf("%0*d", valueSize, i)
-	}
-
-	// Unmarshal map into byte slice.
-	b.ReportAllocs()
-	for i := 0; i < b.N; i++ {
-		tsdb.MarshalTags(tags)
-	}
-}
-
-func BenchmarkCreateSeriesIndex_1K(b *testing.B) {
-	benchmarkCreateSeriesIndex(b, genTestSeries(38, 3, 3))
-}
-
-func BenchmarkCreateSeriesIndex_100K(b *testing.B) {
-	benchmarkCreateSeriesIndex(b, genTestSeries(32, 5, 5))
-}
-
-func BenchmarkCreateSeriesIndex_1M(b *testing.B) {
-	benchmarkCreateSeriesIndex(b, genTestSeries(330, 5, 5))
-}
-
-func benchmarkCreateSeriesIndex(b *testing.B, series []*TestSeries) {
-	idxs := make([]*tsdb.DatabaseIndex, 0, b.N)
-	for i := 0; i < b.N; i++ {
-		idxs = append(idxs, tsdb.NewDatabaseIndex())
-	}
-
-	b.ResetTimer()
-	for n := 0; n < b.N; n++ {
-		idx := idxs[n]
-		for _, s := range series {
-			idx.CreateSeriesIndexIfNotExists(s.Measurement, s.Series)
-		}
-	}
-}
-
-type TestSeries struct {
-	Measurement string
-	Series      *tsdb.Series
-}
-
-func genTestSeries(mCnt, tCnt, vCnt int) []*TestSeries {
-	measurements := genStrList("measurement", mCnt)
-	tagSets := NewTagSetGenerator(tCnt, vCnt).AllSets()
-	series := []*TestSeries{}
-	for _, m := range measurements {
-		for _, ts := range tagSets {
-			series = append(series, &TestSeries{
-				Measurement: m,
-				Series:      tsdb.NewSeries(fmt.Sprintf("%s:%s", m, string(tsdb.MarshalTags(ts))), ts),
-			})
-		}
-	}
-	return series
-}
-
-type TagValGenerator struct {
-	Key  string
-	Vals []string
-	idx  int
-}
-
-func NewTagValGenerator(tagKey string, nVals int) *TagValGenerator {
-	tvg := &TagValGenerator{Key: tagKey}
-	for i := 0; i < nVals; i++ {
-		tvg.Vals = append(tvg.Vals, fmt.Sprintf("tagValue%d", i))
-	}
-	return tvg
-}
-
-func (tvg *TagValGenerator) First() string {
-	tvg.idx = 0
-	return tvg.Curr()
-}
-
-func (tvg *TagValGenerator) Curr() string {
-	return tvg.Vals[tvg.idx]
-}
-
-func (tvg *TagValGenerator) Next() string {
-	tvg.idx++
-	if tvg.idx >= len(tvg.Vals) {
-		tvg.idx--
-		return ""
-	}
-	return tvg.Curr()
-}
-
-type TagSet map[string]string
-
-type TagSetGenerator struct {
-	TagVals []*TagValGenerator
-}
-
-func NewTagSetGenerator(nSets int, nTagVals ...int) *TagSetGenerator {
-	tsg := &TagSetGenerator{}
-	for i := 0; i < nSets; i++ {
-		nVals := nTagVals[0]
-		if i < len(nTagVals) {
-			nVals = nTagVals[i]
-		}
-		tagKey := fmt.Sprintf("tagKey%d", i)
-		tsg.TagVals = append(tsg.TagVals, NewTagValGenerator(tagKey, nVals))
-	}
-	return tsg
-}
-
-func (tsg *TagSetGenerator) First() TagSet {
-	for _, tsv := range tsg.TagVals {
-		tsv.First()
-	}
-	return tsg.Curr()
-}
-
-func (tsg *TagSetGenerator) Curr() TagSet {
-	ts := TagSet{}
-	for _, tvg := range tsg.TagVals {
-		ts[tvg.Key] = tvg.Curr()
-	}
-	return ts
-}
-
-func (tsg *TagSetGenerator) Next() TagSet {
-	val := ""
-	for _, tsv := range tsg.TagVals {
-		if val = tsv.Next(); val != "" {
-			break
-		} else {
-			tsv.First()
-		}
-	}
-
-	if val == "" {
-		return nil
-	}
-
-	return tsg.Curr()
-}
-
-func (tsg *TagSetGenerator) AllSets() []TagSet {
-	allSets := []TagSet{}
-	for ts := tsg.First(); ts != nil; ts = tsg.Next() {
-		allSets = append(allSets, ts)
-	}
-	return allSets
-}
-
-func genStrList(prefix string, n int) []string {
-	lst := make([]string, 0, n)
-	for i := 0; i < n; i++ {
-		lst = append(lst, fmt.Sprintf("%s%d", prefix, i))
-	}
-	return lst
-}
-
-// MustParseExpr parses an expression string and returns its AST representation.
-func MustParseExpr(s string) influxql.Expr {
-	expr, err := influxql.ParseExpr(s)
-	if err != nil {
-		panic(err.Error())
-	}
-	return expr
-}
-
-func strref(s string) *string {
-	return &s
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/query_executor.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/query_executor.go
deleted file mode 100644
index 3002163b3..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/query_executor.go
+++ /dev/null
@@ -1,1056 +0,0 @@
-package tsdb
-
-import (
-	"errors"
-	"fmt"
-	"log"
-	"os"
-	"sort"
-	"time"
-
-	"github.com/influxdb/influxdb/influxql"
-	"github.com/influxdb/influxdb/meta"
-	"github.com/influxdb/influxdb/models"
-)
-
-// QueryExecutor executes every statement in an influxdb Query. It is responsible for
-// coordinating between the local tsdb.Store, the meta.Store, and the other nodes in
-// the cluster to run the query against their local tsdb.Stores. There should be one executor
-// in a running process
-type QueryExecutor struct {
-	// The meta store for accessing and updating cluster and schema data.
-	MetaStore interface {
-		Database(name string) (*meta.DatabaseInfo, error)
-		Databases() ([]meta.DatabaseInfo, error)
-		User(name string) (*meta.UserInfo, error)
-		AdminUserExists() (bool, error)
-		Authenticate(username, password string) (*meta.UserInfo, error)
-		RetentionPolicy(database, name string) (rpi *meta.RetentionPolicyInfo, err error)
-		UserCount() (int, error)
-		ShardGroupsByTimeRange(database, policy string, min, max time.Time) (a []meta.ShardGroupInfo, err error)
-		NodeID() uint64
-	}
-
-	// Executes statements relating to meta data.
-	MetaStatementExecutor interface {
-		ExecuteStatement(stmt influxql.Statement) *influxql.Result
-	}
-
-	// Execute statements relating to statistics and diagnostics.
-	MonitorStatementExecutor interface {
-		ExecuteStatement(stmt influxql.Statement) *influxql.Result
-	}
-
-	// Maps shards for queries.
-	ShardMapper interface {
-		CreateMapper(shard meta.ShardInfo, stmt influxql.Statement, chunkSize int) (Mapper, error)
-	}
-
-	IntoWriter interface {
-		WritePointsInto(p *IntoWriteRequest) error
-	}
-
-	Logger          *log.Logger
-	QueryLogEnabled bool
-
-	// the local data store
-	Store *Store
-}
-
-// partial copy of cluster.WriteRequest
-type IntoWriteRequest struct {
-	Database        string
-	RetentionPolicy string
-	Points          []models.Point
-}
-
-// NewQueryExecutor returns an initialized QueryExecutor
-func NewQueryExecutor(store *Store) *QueryExecutor {
-	return &QueryExecutor{
-		Store:  store,
-		Logger: log.New(os.Stderr, "[query] ", log.LstdFlags),
-	}
-}
-
-// SetLogger sets the internal logger to the logger passed in.
-func (q *QueryExecutor) SetLogger(l *log.Logger) {
-	q.Logger = l
-}
-
-// Authorize user u to execute query q on database.
-// database can be "" for queries that do not require a database.
-// If no user is provided it will return an error unless the query's first statement is to create
-// a root user.
-func (q *QueryExecutor) Authorize(u *meta.UserInfo, query *influxql.Query, database string) error {
-	// Special case if no users exist.
-	if count, err := q.MetaStore.UserCount(); count == 0 && err == nil {
-		// Ensure there is at least one statement.
-		if len(query.Statements) > 0 {
-			// First statement in the query must create a user with admin privilege.
-			cu, ok := query.Statements[0].(*influxql.CreateUserStatement)
-			if ok && cu.Admin == true {
-				return nil
-			}
-		}
-		return NewErrAuthorize(q, query, "", database, "create admin user first or disable authentication")
-	}
-
-	if u == nil {
-		return NewErrAuthorize(q, query, "", database, "no user provided")
-	}
-
-	// Admin privilege allows the user to execute all statements.
-	if u.Admin {
-		return nil
-	}
-
-	// Check each statement in the query.
-	for _, stmt := range query.Statements {
-		// Get the privileges required to execute the statement.
-		privs := stmt.RequiredPrivileges()
-
-		// Make sure the user has the privileges required to execute
-		// each statement.
-		for _, p := range privs {
-			if p.Admin {
-				// Admin privilege already checked so statement requiring admin
-				// privilege cannot be run.
-				msg := fmt.Sprintf("statement '%s', requires admin privilege", stmt)
-				return NewErrAuthorize(q, query, u.Name, database, msg)
-			}
-
-			// Use the db name specified by the statement or the db
-			// name passed by the caller if one wasn't specified by
-			// the statement.
-			db := p.Name
-			if db == "" {
-				db = database
-			}
-			if !u.Authorize(p.Privilege, db) {
-				msg := fmt.Sprintf("statement '%s', requires %s on %s", stmt, p.Privilege.String(), db)
-				return NewErrAuthorize(q, query, u.Name, database, msg)
-			}
-		}
-	}
-	return nil
-}
-
-// ExecuteQuery executes an InfluxQL query against the server.
-// It sends results down the passed in chan and closes it when done. It will close the chan
-// on the first statement that throws an error.
-func (q *QueryExecutor) ExecuteQuery(query *influxql.Query, database string, chunkSize int) (<-chan *influxql.Result, error) {
-	// Execute each statement. Keep the iterator external so we can
-	// track how many of the statements were executed
-	results := make(chan *influxql.Result)
-	go func() {
-		var i int
-		var stmt influxql.Statement
-		for i, stmt = range query.Statements {
-			// If a default database wasn't passed in by the caller, check the statement.
-			// Some types of statements have an associated default database, even if it
-			// is not explicitly included.
-			defaultDB := database
-			if defaultDB == "" {
-				if s, ok := stmt.(influxql.HasDefaultDatabase); ok {
-					defaultDB = s.DefaultDatabase()
-				}
-			}
-
-			// Normalize each statement.
-			if err := q.normalizeStatement(stmt, defaultDB); err != nil {
-				results <- &influxql.Result{Err: err}
-				break
-			}
-
-			// Log each normalized statement.
-			if q.QueryLogEnabled {
-				q.Logger.Println(stmt.String())
-			}
-
-			var res *influxql.Result
-			switch stmt := stmt.(type) {
-			case *influxql.SelectStatement:
-				if err := q.executeStatement(i, stmt, database, results, chunkSize); err != nil {
-					results <- &influxql.Result{Err: err}
-					break
-				}
-			case *influxql.DropSeriesStatement:
-				// TODO: handle this in a cluster
-				res = q.executeDropSeriesStatement(stmt, database)
-			case *influxql.ShowSeriesStatement:
-				res = q.executeShowSeriesStatement(stmt, database)
-			case *influxql.DropMeasurementStatement:
-				// TODO: handle this in a cluster
-				res = q.executeDropMeasurementStatement(stmt, database)
-			case *influxql.ShowMeasurementsStatement:
-				if err := q.executeStatement(i, stmt, database, results, chunkSize); err != nil {
-					results <- &influxql.Result{Err: err}
-					break
-				}
-			case *influxql.ShowTagKeysStatement:
-				if err := q.executeStatement(i, stmt, database, results, chunkSize); err != nil {
-					results <- &influxql.Result{Err: err}
-					break
-				}
-			case *influxql.ShowTagValuesStatement:
-				res = q.executeShowTagValuesStatement(stmt, database)
-			case *influxql.ShowFieldKeysStatement:
-				res = q.executeShowFieldKeysStatement(stmt, database)
-			case *influxql.DeleteStatement:
-				res = &influxql.Result{Err: ErrInvalidQuery}
-			case *influxql.DropDatabaseStatement:
-				// TODO: handle this in a cluster
-				res = q.executeDropDatabaseStatement(stmt)
-			case *influxql.ShowStatsStatement, *influxql.ShowDiagnosticsStatement:
-				// Send monitor-related queries to the monitor service.
-				res = q.MonitorStatementExecutor.ExecuteStatement(stmt)
-			default:
-				// Delegate all other meta statements to a separate executor. They don't hit tsdb storage.
-				res = q.MetaStatementExecutor.ExecuteStatement(stmt)
-			}
-
-			if res != nil {
-				// set the StatementID for the handler on the other side to combine results
-				res.StatementID = i
-
-				// If an error occurs then stop processing remaining statements.
-				results <- res
-				if res.Err != nil {
-					break
-				}
-			}
-		}
-
-		// if there was an error send results that the remaining statements weren't executed
-		for ; i < len(query.Statements)-1; i++ {
-			results <- &influxql.Result{Err: ErrNotExecuted}
-		}
-
-		close(results)
-	}()
-
-	return results, nil
-}
-
-// Plan creates an execution plan for the given SelectStatement and returns an Executor.
-func (q *QueryExecutor) PlanSelect(stmt *influxql.SelectStatement, chunkSize int) (Executor, error) {
-	var shardIDs []uint64
-	shards := map[uint64]meta.ShardInfo{} // Shards requiring mappers.
-
-	// It is important to "stamp" this time so that everywhere we evaluate `now()` in the statement is EXACTLY the same `now`
-	now := time.Now().UTC()
-
-	// Replace instances of "now()" with the current time, and check the resultant times.
-	stmt.Condition = influxql.Reduce(stmt.Condition, &influxql.NowValuer{Now: now})
-	tmin, tmax := influxql.TimeRange(stmt.Condition)
-	if tmax.IsZero() {
-		tmax = now
-	}
-	if tmin.IsZero() {
-		tmin = time.Unix(0, 0)
-	}
-
-	for _, src := range stmt.Sources {
-		mm, ok := src.(*influxql.Measurement)
-		if !ok {
-			return nil, fmt.Errorf("invalid source type: %#v", src)
-		}
-
-		// Build the set of target shards. Using shard IDs as keys ensures each shard ID
-		// occurs only once.
-		shardGroups, err := q.MetaStore.ShardGroupsByTimeRange(mm.Database, mm.RetentionPolicy, tmin, tmax)
-		if err != nil {
-			return nil, err
-		}
-		for _, g := range shardGroups {
-			for _, sh := range g.Shards {
-				if _, ok := shards[sh.ID]; !ok {
-					shards[sh.ID] = sh
-					shardIDs = append(shardIDs, sh.ID)
-				}
-			}
-		}
-	}
-
-	// Sort shard IDs to make testing deterministic.
-	sort.Sort(uint64Slice(shardIDs))
-
-	// Build the Mappers, one per shard.
-	mappers := []Mapper{}
-	for _, shardID := range shardIDs {
-		sh := shards[shardID]
-
-		m, err := q.ShardMapper.CreateMapper(sh, stmt, chunkSize)
-		if err != nil {
-			return nil, err
-		}
-		if m == nil {
-			// No data for this shard, skip it.
-			continue
-		}
-		mappers = append(mappers, m)
-	}
-
-	// Certain operations on the SELECT statement can be performed by the AggregateExecutor without
-	// assistance from the Mappers. This allows the AggregateExecutor to prepare aggregation functions
-	// and mathematical functions.
-	stmt.RewriteDistinct()
-
-	if (stmt.IsRawQuery && !stmt.HasDistinct()) || stmt.IsSimpleDerivative() {
-		return NewRawExecutor(stmt, mappers, chunkSize), nil
-	} else {
-		return NewAggregateExecutor(stmt, mappers), nil
-	}
-}
-
-// expandSources expands regex sources and removes duplicates.
-// NOTE: sources must be normalized (db and rp set) before calling this function.
-func (q *QueryExecutor) expandSources(sources influxql.Sources) (influxql.Sources, error) {
-	// Use a map as a set to prevent duplicates. Two regexes might produce
-	// duplicates when expanded.
-	set := map[string]influxql.Source{}
-	names := []string{}
-
-	// Iterate all sources, expanding regexes when they're found.
-	for _, source := range sources {
-		switch src := source.(type) {
-		case *influxql.Measurement:
-			if src.Regex == nil {
-				name := src.String()
-				set[name] = src
-				names = append(names, name)
-				continue
-			}
-
-			// Lookup the database.
-			db := q.Store.DatabaseIndex(src.Database)
-			if db == nil {
-				return nil, nil
-			}
-
-			// Get measurements from the database that match the regex.
-			measurements := db.measurementsByRegex(src.Regex.Val)
-
-			// Add those measurements to the set.
-			for _, m := range measurements {
-				m2 := &influxql.Measurement{
-					Database:        src.Database,
-					RetentionPolicy: src.RetentionPolicy,
-					Name:            m.Name,
-				}
-
-				name := m2.String()
-				if _, ok := set[name]; !ok {
-					set[name] = m2
-					names = append(names, name)
-				}
-			}
-
-		default:
-			return nil, fmt.Errorf("expandSources: unsuported source type: %T", source)
-		}
-	}
-
-	// Sort the list of source names.
-	sort.Strings(names)
-
-	// Convert set to a list of Sources.
-	expanded := make(influxql.Sources, 0, len(set))
-	for _, name := range names {
-		expanded = append(expanded, set[name])
-	}
-
-	return expanded, nil
-}
-
-// executeDropDatabaseStatement closes all local shards for the database and removes the directory. It then calls to the metastore to remove the database from there.
-// TODO: make this work in a cluster/distributed
-func (q *QueryExecutor) executeDropDatabaseStatement(stmt *influxql.DropDatabaseStatement) *influxql.Result {
-	dbi, err := q.MetaStore.Database(stmt.Name)
-	if err != nil {
-		return &influxql.Result{Err: err}
-	} else if dbi == nil {
-		if stmt.IfExists {
-			return &influxql.Result{}
-		}
-		return &influxql.Result{Err: ErrDatabaseNotFound(stmt.Name)}
-	}
-
-	var shardIDs []uint64
-	for _, rp := range dbi.RetentionPolicies {
-		for _, sg := range rp.ShardGroups {
-			for _, s := range sg.Shards {
-				shardIDs = append(shardIDs, s.ID)
-			}
-		}
-	}
-
-	// Remove database from meta-store first so that in-flight writes can complete without error, but new ones will
-	// be rejected.
-	res := q.MetaStatementExecutor.ExecuteStatement(stmt)
-
-	// Remove the database from the local store
-	err = q.Store.DeleteDatabase(stmt.Name, shardIDs)
-	if err != nil {
-		return &influxql.Result{Err: err}
-	}
-
-	return res
-}
-
-// executeDropMeasurementStatement removes the measurement and all series data from the local store for the given measurement
-func (q *QueryExecutor) executeDropMeasurementStatement(stmt *influxql.DropMeasurementStatement, database string) *influxql.Result {
-	// Find the database.
-	db := q.Store.DatabaseIndex(database)
-	if db == nil {
-		return &influxql.Result{}
-	}
-
-	m := db.Measurement(stmt.Name)
-	if m == nil {
-		return &influxql.Result{Err: ErrMeasurementNotFound(stmt.Name)}
-	}
-
-	// first remove from the index
-	db.DropMeasurement(m.Name)
-
-	// now drop the raw data
-	if err := q.Store.deleteMeasurement(m.Name, m.SeriesKeys()); err != nil {
-		return &influxql.Result{Err: err}
-	}
-
-	return &influxql.Result{}
-}
-
-// executeDropSeriesStatement removes all series from the local store that match the drop query
-func (q *QueryExecutor) executeDropSeriesStatement(stmt *influxql.DropSeriesStatement, database string) *influxql.Result {
-	// Check for time in WHERE clause (not supported).
-	if influxql.HasTimeExpr(stmt.Condition) {
-		return &influxql.Result{Err: errors.New("DROP SERIES doesn't support time in WHERE clause")}
-	}
-
-	// Find the database.
-	db := q.Store.DatabaseIndex(database)
-	if db == nil {
-		return &influxql.Result{}
-	}
-
-	// Expand regex expressions in the FROM clause.
-	sources, err := q.expandSources(stmt.Sources)
-	if err != nil {
-		return &influxql.Result{Err: err}
-	} else if stmt.Sources != nil && len(stmt.Sources) != 0 && len(sources) == 0 {
-		return &influxql.Result{}
-	}
-
-	measurements, err := measurementsFromSourcesOrDB(db, sources...)
-	if err != nil {
-		return &influxql.Result{Err: err}
-	}
-
-	var seriesKeys []string
-	for _, m := range measurements {
-		var ids SeriesIDs
-		var filters FilterExprs
-		if stmt.Condition != nil {
-			// Get series IDs that match the WHERE clause.
-			ids, filters, err = m.walkWhereForSeriesIds(stmt.Condition)
-			if err != nil {
-				return &influxql.Result{Err: err}
-			}
-
-			// Delete boolean literal true filter expressions.
-			// These are returned for `WHERE tagKey = 'tagVal'` type expressions and are okay.
-			filters.DeleteBoolLiteralTrues()
-
-			// Check for unsupported field filters.
-			// Any remaining filters means there were fields (e.g., `WHERE value = 1.2`).
-			if filters.Len() > 0 {
-				return &influxql.Result{Err: errors.New("DROP SERIES doesn't support fields in WHERE clause")}
-			}
-		} else {
-			// No WHERE clause so get all series IDs for this measurement.
-			ids = m.seriesIDs
-		}
-
-		for _, id := range ids {
-			seriesKeys = append(seriesKeys, m.seriesByID[id].Key)
-		}
-	}
-
-	// delete the raw series data
-	if err := q.Store.deleteSeries(seriesKeys); err != nil {
-		return &influxql.Result{Err: err}
-	}
-	// remove them from the index
-	db.DropSeries(seriesKeys)
-
-	return &influxql.Result{}
-}
-
-func (q *QueryExecutor) executeShowSeriesStatement(stmt *influxql.ShowSeriesStatement, database string) *influxql.Result {
-	// Check for time in WHERE clause (not supported).
-	if influxql.HasTimeExpr(stmt.Condition) {
-		return &influxql.Result{Err: errors.New("SHOW SERIES doesn't support time in WHERE clause")}
-	}
-
-	// Find the database.
-	db := q.Store.DatabaseIndex(database)
-	if db == nil {
-		return &influxql.Result{}
-	}
-
-	// Expand regex expressions in the FROM clause.
-	sources, err := q.expandSources(stmt.Sources)
-	if err != nil {
-		return &influxql.Result{Err: err}
-	}
-
-	// Get the list of measurements we're interested in.
-	measurements, err := measurementsFromSourcesOrDB(db, sources...)
-	if err != nil {
-		return &influxql.Result{Err: err}
-	}
-
-	// Create result struct that will be populated and returned.
-	result := &influxql.Result{
-		Series: make(models.Rows, 0, len(measurements)),
-	}
-
-	// Loop through measurements to build result. One result row / measurement.
-	for _, m := range measurements {
-		var ids SeriesIDs
-		var filters FilterExprs
-
-		if stmt.Condition != nil {
-			// Get series IDs that match the WHERE clause.
-			ids, filters, err = m.walkWhereForSeriesIds(stmt.Condition)
-			if err != nil {
-				return &influxql.Result{Err: err}
-			}
-
-			// Delete boolean literal true filter expressions.
-			filters.DeleteBoolLiteralTrues()
-
-			// Check for unsupported field filters.
-			if filters.Len() > 0 {
-				return &influxql.Result{Err: errors.New("SHOW SERIES doesn't support fields in WHERE clause")}
-			}
-
-			// If no series matched, then go to the next measurement.
-			if len(ids) == 0 {
-				continue
-			}
-		} else {
-			// No WHERE clause so get all series IDs for this measurement.
-			ids = m.seriesIDs
-		}
-
-		// Make a new row for this measurement.
-		r := &models.Row{
-			Name:    m.Name,
-			Columns: m.TagKeys(),
-		}
-
-		// Loop through series IDs getting matching tag sets.
-		for _, id := range ids {
-			if s, ok := m.seriesByID[id]; ok {
-				values := make([]interface{}, 0, len(r.Columns))
-
-				// make the series key the first value
-				values = append(values, s.Key)
-
-				for _, column := range r.Columns {
-					values = append(values, s.Tags[column])
-				}
-
-				// Add the tag values to the row.
-				r.Values = append(r.Values, values)
-			}
-		}
-		// make the id the first column
-		r.Columns = append([]string{"_key"}, r.Columns...)
-
-		// Append the row to the result.
-		result.Series = append(result.Series, r)
-	}
-
-	if stmt.Limit > 0 || stmt.Offset > 0 {
-		result.Series = q.filterShowSeriesResult(stmt.Limit, stmt.Offset, result.Series)
-	}
-
-	return result
-}
-
-// filterShowSeriesResult will limit the number of series returned based on the limit and the offset.
-// Unlike limit and offset on SELECT statements, the limit and offset don't apply to the number of Rows, but
-// to the number of total Values returned, since each Value represents a unique series.
-func (q *QueryExecutor) filterShowSeriesResult(limit, offset int, rows models.Rows) models.Rows {
-	var filteredSeries models.Rows
-	seriesCount := 0
-	for _, r := range rows {
-		var currentSeries [][]interface{}
-
-		// filter the values
-		for _, v := range r.Values {
-			if seriesCount >= offset && seriesCount-offset < limit {
-				currentSeries = append(currentSeries, v)
-			}
-			seriesCount++
-		}
-
-		// only add the row back in if there are some values in it
-		if len(currentSeries) > 0 {
-			r.Values = currentSeries
-			filteredSeries = append(filteredSeries, r)
-			if seriesCount > limit+offset {
-				return filteredSeries
-			}
-		}
-	}
-	return filteredSeries
-}
-
-func (q *QueryExecutor) planStatement(stmt influxql.Statement, database string, chunkSize int) (Executor, error) {
-	switch stmt := stmt.(type) {
-	case *influxql.SelectStatement:
-		return q.PlanSelect(stmt, chunkSize)
-	case *influxql.ShowMeasurementsStatement:
-		return q.PlanShowMeasurements(stmt, database, chunkSize)
-	case *influxql.ShowTagKeysStatement:
-		return q.PlanShowTagKeys(stmt, database, chunkSize)
-	default:
-		return nil, fmt.Errorf("can't plan statement type: %v", stmt)
-	}
-}
-
-// PlanShowMeasurements creates an execution plan for a SHOW TAG KEYS statement and returns an Executor.
-func (q *QueryExecutor) PlanShowMeasurements(stmt *influxql.ShowMeasurementsStatement, database string, chunkSize int) (Executor, error) {
-	// Check for time in WHERE clause (not supported).
-	if influxql.HasTimeExpr(stmt.Condition) {
-		return nil, errors.New("SHOW MEASUREMENTS doesn't support time in WHERE clause")
-	}
-
-	// Get the database info.
-	di, err := q.MetaStore.Database(database)
-	if err != nil {
-		return nil, err
-	} else if di == nil {
-		return nil, ErrDatabaseNotFound(database)
-	}
-
-	// Get info for all shards in the database.
-	shards := di.ShardInfos()
-
-	// Build the Mappers, one per shard.
-	mappers := []Mapper{}
-	for _, sh := range shards {
-		m, err := q.ShardMapper.CreateMapper(sh, stmt, chunkSize)
-		if err != nil {
-			return nil, err
-		}
-		if m == nil {
-			// No data for this shard, skip it.
-			continue
-		}
-		mappers = append(mappers, m)
-	}
-
-	executor := NewShowMeasurementsExecutor(stmt, mappers, chunkSize)
-	return executor, nil
-}
-
-// PlanShowTagKeys creates an execution plan for a SHOW MEASUREMENTS statement and returns an Executor.
-func (q *QueryExecutor) PlanShowTagKeys(stmt *influxql.ShowTagKeysStatement, database string, chunkSize int) (Executor, error) {
-	// Check for time in WHERE clause (not supported).
-	if influxql.HasTimeExpr(stmt.Condition) {
-		return nil, errors.New("SHOW TAG KEYS doesn't support time in WHERE clause")
-	}
-
-	// Get the database info.
-	di, err := q.MetaStore.Database(database)
-	if err != nil {
-		return nil, err
-	} else if di == nil {
-		return nil, ErrDatabaseNotFound(database)
-	}
-
-	// Get info for all shards in the database.
-	shards := di.ShardInfos()
-
-	// Build the Mappers, one per shard.
-	mappers := []Mapper{}
-	for _, sh := range shards {
-		m, err := q.ShardMapper.CreateMapper(sh, stmt, chunkSize)
-		if err != nil {
-			return nil, err
-		}
-		if m == nil {
-			// No data for this shard, skip it.
-			continue
-		}
-		mappers = append(mappers, m)
-	}
-
-	executor := NewShowTagKeysExecutor(stmt, mappers, chunkSize)
-	return executor, nil
-}
-
-func (q *QueryExecutor) executeStatement(statementID int, stmt influxql.Statement, database string, results chan *influxql.Result, chunkSize int) error {
-	// Plan statement execution.
-	e, err := q.planStatement(stmt, database, chunkSize)
-	if err != nil {
-		return err
-	}
-
-	// Execute plan.
-	ch := e.Execute()
-	var writeerr error
-	var intoNum int64
-	var isinto bool
-	// Stream results from the channel. We should send an empty result if nothing comes through.
-	resultSent := false
-	for row := range ch {
-		// We had a write error. Continue draining results from the channel
-		// so we don't hang the goroutine in the executor.
-		if writeerr != nil {
-			continue
-		}
-		if row.Err != nil {
-			return row.Err
-		}
-		selectstmt, ok := stmt.(*influxql.SelectStatement)
-		if ok && selectstmt.Target != nil {
-			isinto = true
-			// this is a into query. Write results back to database
-			writeerr = q.writeInto(row, selectstmt)
-			intoNum += int64(len(row.Values))
-		} else {
-			resultSent = true
-			results <- &influxql.Result{StatementID: statementID, Series: []*models.Row{row}}
-		}
-	}
-	if writeerr != nil {
-		return writeerr
-	} else if isinto {
-		results <- &influxql.Result{
-			StatementID: statementID,
-			Series: []*models.Row{{
-				Name: "result",
-				// it seems weird to give a time here, but so much stuff breaks if you don't
-				Columns: []string{"time", "written"},
-				Values: [][]interface{}{{
-					time.Unix(0, 0).UTC(),
-					intoNum,
-				}},
-			}},
-		}
-		return nil
-	}
-
-	if !resultSent {
-		results <- &influxql.Result{StatementID: statementID, Series: make([]*models.Row, 0)}
-	}
-
-	return nil
-}
-
-func (q *QueryExecutor) writeInto(row *models.Row, selectstmt *influxql.SelectStatement) error {
-	// It might seem a bit weird that this is where we do this, since we will have to
-	// convert rows back to points. The Executors (both aggregate and raw) are complex
-	// enough that changing them to write back to the DB is going to be clumsy
-	//
-	// it might seem weird to have the write be in the QueryExecutor, but the interweaving of
-	// limitedRowWriter and ExecuteAggregate/Raw makes it ridiculously hard to make sure that the
-	// results will be the same as when queried normally.
-	measurement := intoMeasurement(selectstmt)
-	if measurement == "" {
-		measurement = row.Name
-	}
-	intodb, err := intoDB(selectstmt)
-	if err != nil {
-		return err
-	}
-	rp := intoRP(selectstmt)
-	points, err := convertRowToPoints(measurement, row)
-	if err != nil {
-		return err
-	}
-	req := &IntoWriteRequest{
-		Database:        intodb,
-		RetentionPolicy: rp,
-		Points:          points,
-	}
-	err = q.IntoWriter.WritePointsInto(req)
-	if err != nil {
-		return err
-	}
-	return nil
-}
-
-func (q *QueryExecutor) executeShowTagValuesStatement(stmt *influxql.ShowTagValuesStatement, database string) *influxql.Result {
-	// Check for time in WHERE clause (not supported).
-	if influxql.HasTimeExpr(stmt.Condition) {
-		return &influxql.Result{Err: errors.New("SHOW TAG VALUES doesn't support time in WHERE clause")}
-	}
-
-	// Find the database.
-	db := q.Store.DatabaseIndex(database)
-	if db == nil {
-		return &influxql.Result{}
-	}
-
-	// Expand regex expressions in the FROM clause.
-	sources, err := q.expandSources(stmt.Sources)
-	if err != nil {
-		return &influxql.Result{Err: err}
-	}
-
-	// Get the list of measurements we're interested in.
-	measurements, err := measurementsFromSourcesOrDB(db, sources...)
-	if err != nil {
-		return &influxql.Result{Err: err}
-	}
-
-	// Make result.
-	result := &influxql.Result{
-		Series: make(models.Rows, 0),
-	}
-
-	tagValues := make(map[string]stringSet)
-	for _, m := range measurements {
-		var ids SeriesIDs
-
-		if stmt.Condition != nil {
-			// Get series IDs that match the WHERE clause.
-			ids, _, err = m.walkWhereForSeriesIds(stmt.Condition)
-			if err != nil {
-				return &influxql.Result{Err: err}
-			}
-
-			// If no series matched, then go to the next measurement.
-			if len(ids) == 0 {
-				continue
-			}
-
-			// TODO: check return of walkWhereForSeriesIds for fields
-		} else {
-			// No WHERE clause so get all series IDs for this measurement.
-			ids = m.seriesIDs
-		}
-
-		for k, v := range m.tagValuesByKeyAndSeriesID(stmt.TagKeys, ids) {
-			_, ok := tagValues[k]
-			if !ok {
-				tagValues[k] = v
-			}
-			tagValues[k] = tagValues[k].union(v)
-		}
-	}
-
-	for k, v := range tagValues {
-		r := &models.Row{
-			Name:    k + "TagValues",
-			Columns: []string{k},
-		}
-
-		vals := v.list()
-		sort.Strings(vals)
-
-		for _, val := range vals {
-			v := interface{}(val)
-			r.Values = append(r.Values, []interface{}{v})
-		}
-
-		result.Series = append(result.Series, r)
-	}
-
-	sort.Sort(result.Series)
-	return result
-}
-
-func (q *QueryExecutor) executeShowFieldKeysStatement(stmt *influxql.ShowFieldKeysStatement, database string) *influxql.Result {
-	var err error
-
-	// Find the database.
-	db := q.Store.DatabaseIndex(database)
-	if db == nil {
-		return &influxql.Result{}
-	}
-
-	// Expand regex expressions in the FROM clause.
-	sources, err := q.expandSources(stmt.Sources)
-	if err != nil {
-		return &influxql.Result{Err: err}
-	}
-
-	measurements, err := measurementsFromSourcesOrDB(db, sources...)
-	if err != nil {
-		return &influxql.Result{Err: err}
-	}
-
-	// Make result.
-	result := &influxql.Result{
-		Series: make(models.Rows, 0, len(measurements)),
-	}
-
-	// Loop through measurements, adding a result row for each.
-	for _, m := range measurements {
-		// Create a new row.
-		r := &models.Row{
-			Name:    m.Name,
-			Columns: []string{"fieldKey"},
-		}
-
-		// Get a list of field names from the measurement then sort them.
-		names := m.FieldNames()
-		sort.Strings(names)
-
-		// Add the field names to the result row values.
-		for _, n := range names {
-			v := interface{}(n)
-			r.Values = append(r.Values, []interface{}{v})
-		}
-
-		// Append the row to the result.
-		result.Series = append(result.Series, r)
-	}
-
-	return result
-}
-
-// measurementsFromSourcesOrDB returns a list of measurements from the
-// sources passed in or, if sources is empty, a list of all
-// measurement names from the database passed in.
-func measurementsFromSourcesOrDB(db *DatabaseIndex, sources ...influxql.Source) (Measurements, error) {
-	var measurements Measurements
-	if len(sources) > 0 {
-		for _, source := range sources {
-			if m, ok := source.(*influxql.Measurement); ok {
-				measurement := db.measurements[m.Name]
-				if measurement == nil {
-					continue
-				}
-
-				measurements = append(measurements, measurement)
-			} else {
-				return nil, errors.New("identifiers in FROM clause must be measurement names")
-			}
-		}
-	} else {
-		// No measurements specified in FROM clause so get all measurements that have series.
-		for _, m := range db.Measurements() {
-			if m.HasSeries() {
-				measurements = append(measurements, m)
-			}
-		}
-	}
-	sort.Sort(measurements)
-
-	return measurements, nil
-}
-
-// normalizeStatement adds a default database and policy to the measurements in statement.
-func (q *QueryExecutor) normalizeStatement(stmt influxql.Statement, defaultDatabase string) (err error) {
-	// Track prefixes for replacing field names.
-	prefixes := make(map[string]string)
-
-	// Qualify all measurements.
-	influxql.WalkFunc(stmt, func(n influxql.Node) {
-		if err != nil {
-			return
-		}
-		switch n := n.(type) {
-		case *influxql.Measurement:
-			e := q.normalizeMeasurement(n, defaultDatabase)
-			if e != nil {
-				err = e
-				return
-			}
-			prefixes[n.Name] = n.Name
-		}
-	})
-	return
-}
-
-// normalizeMeasurement inserts the default database or policy into all measurement names,
-// if required.
-func (q *QueryExecutor) normalizeMeasurement(m *influxql.Measurement, defaultDatabase string) error {
-	// Targets (measurements in an INTO clause) can have blank names, which means it will be
-	// the same as the measurement name it came from in the FROM clause.
-	if !m.IsTarget && m.Name == "" && m.Regex == nil {
-		return errors.New("invalid measurement")
-	}
-
-	// Measurement does not have an explicit database? Insert default.
-	if m.Database == "" {
-		m.Database = defaultDatabase
-	}
-
-	// The database must now be specified by this point.
-	if m.Database == "" {
-		return errors.New("database name required")
-	}
-
-	// Find database.
-	di, err := q.MetaStore.Database(m.Database)
-	if err != nil {
-		return err
-	} else if di == nil {
-		return ErrDatabaseNotFound(m.Database)
-	}
-
-	// If no retention policy was specified, use the default.
-	if m.RetentionPolicy == "" {
-		if di.DefaultRetentionPolicy == "" {
-			return fmt.Errorf("default retention policy not set for: %s", di.Name)
-		}
-		m.RetentionPolicy = di.DefaultRetentionPolicy
-	}
-
-	return nil
-}
-
-// ErrAuthorize represents an authorization error.
-type ErrAuthorize struct {
-	q        *QueryExecutor
-	query    *influxql.Query
-	user     string
-	database string
-	message  string
-}
-
-const authErrLogFmt string = "unauthorized request | user: %q | query: %q | database %q\n"
-
-// newAuthorizationError returns a new instance of AuthorizationError.
-func NewErrAuthorize(qe *QueryExecutor, q *influxql.Query, u, db, m string) *ErrAuthorize {
-	return &ErrAuthorize{q: qe, query: q, user: u, database: db, message: m}
-}
-
-// Error returns the text of the error.
-func (e ErrAuthorize) Error() string {
-	e.q.Logger.Printf(authErrLogFmt, e.user, e.query.String(), e.database)
-	if e.user == "" {
-		return fmt.Sprint(e.message)
-	}
-	return fmt.Sprintf("%s not authorized to execute %s", e.user, e.message)
-}
-
-var (
-	// ErrInvalidQuery is returned when executing an unknown query type.
-	ErrInvalidQuery = errors.New("invalid query")
-
-	// ErrNotExecuted is returned when a statement is not executed in a query.
-	// This can occur when a previous statement in the same query has errored.
-	ErrNotExecuted = errors.New("not executed")
-)
-
-func ErrDatabaseNotFound(name string) error { return fmt.Errorf("database not found: %s", name) }
-
-func ErrMeasurementNotFound(name string) error { return fmt.Errorf("measurement not found: %s", name) }
-
-type uint64Slice []uint64
-
-func (a uint64Slice) Len() int           { return len(a) }
-func (a uint64Slice) Swap(i, j int)      { a[i], a[j] = a[j], a[i] }
-func (a uint64Slice) Less(i, j int) bool { return a[i] < a[j] }
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/query_executor_test.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/query_executor_test.go
deleted file mode 100644
index 47bf0bdec..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/query_executor_test.go
+++ /dev/null
@@ -1,493 +0,0 @@
-package tsdb_test
-
-import (
-	"encoding/json"
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"strings"
-	"testing"
-	"time"
-
-	"github.com/influxdb/influxdb/influxql"
-	"github.com/influxdb/influxdb/meta"
-	"github.com/influxdb/influxdb/models"
-	"github.com/influxdb/influxdb/tsdb"
-)
-
-var sgID = uint64(2)
-var shardID = uint64(1)
-
-func TestWritePointsAndExecuteQuery(t *testing.T) {
-	store, executor := testStoreAndExecutor("")
-	defer os.RemoveAll(store.Path())
-
-	// Write first point.
-	if err := store.WriteToShard(shardID, []models.Point{models.MustNewPoint(
-		"cpu",
-		map[string]string{"host": "server"},
-		map[string]interface{}{"value": 1.0},
-		time.Unix(1, 2),
-	)}); err != nil {
-		t.Fatalf(err.Error())
-	}
-
-	// Write second point.
-	if err := store.WriteToShard(shardID, []models.Point{models.MustNewPoint(
-		"cpu",
-		map[string]string{"host": "server"},
-		map[string]interface{}{"value": 1.0},
-		time.Unix(2, 3),
-	)}); err != nil {
-		t.Fatalf(err.Error())
-	}
-
-	got := executeAndGetJSON("SELECT * FROM cpu", executor)
-	exepected := `[{"series":[{"name":"cpu","columns":["time","host","value"],"values":[["1970-01-01T00:00:01.000000002Z","server",1],["1970-01-01T00:00:02.000000003Z","server",1]]}]}]`
-	if exepected != got {
-		t.Fatalf("\nexp: %s\ngot: %s", exepected, got)
-	}
-
-	got = executeAndGetJSON("SELECT * FROM cpu GROUP BY *", executor)
-	exepected = `[{"series":[{"name":"cpu","tags":{"host":"server"},"columns":["time","value"],"values":[["1970-01-01T00:00:01.000000002Z",1],["1970-01-01T00:00:02.000000003Z",1]]}]}]`
-	if exepected != got {
-		t.Fatalf("\nexp: %s\ngot: %s", exepected, got)
-	}
-
-	store.Close()
-	conf := store.EngineOptions.Config
-	store = tsdb.NewStore(store.Path())
-	store.EngineOptions.Config = conf
-	if err := store.Open(); err != nil {
-		t.Fatalf(err.Error())
-	}
-	executor.Store = store
-	executor.ShardMapper = &testShardMapper{store: store}
-
-	got = executeAndGetJSON("SELECT * FROM cpu GROUP BY *", executor)
-	if exepected != got {
-		t.Fatalf("\nexp: %s\ngot: %s", exepected, got)
-	}
-}
-
-// Ensure writing a point and updating it results in only a single point.
-func TestWritePointsAndExecuteQuery_Update(t *testing.T) {
-	store, executor := testStoreAndExecutor("")
-	defer os.RemoveAll(store.Path())
-
-	// Write original point.
-	if err := store.WriteToShard(1, []models.Point{models.MustNewPoint(
-		"temperature",
-		map[string]string{},
-		map[string]interface{}{"value": 100.0},
-		time.Unix(0, 0),
-	)}); err != nil {
-		t.Fatalf(err.Error())
-	}
-
-	// Restart store.
-	store.Close()
-	conf := store.EngineOptions.Config
-	store = tsdb.NewStore(store.Path())
-	store.EngineOptions.Config = conf
-	if err := store.Open(); err != nil {
-		t.Fatalf(err.Error())
-	}
-	executor.Store = store
-	executor.ShardMapper = &testShardMapper{store: store}
-
-	// Rewrite point with new value.
-	if err := store.WriteToShard(1, []models.Point{models.MustNewPoint(
-		"temperature",
-		map[string]string{},
-		map[string]interface{}{"value": 200.0},
-		time.Unix(0, 0),
-	)}); err != nil {
-		t.Fatalf(err.Error())
-	}
-
-	got := executeAndGetJSON("select * from temperature", executor)
-	exp := `[{"series":[{"name":"temperature","columns":["time","value"],"values":[["1970-01-01T00:00:00Z",200]]}]}]`
-	if exp != got {
-		t.Fatalf("\n\nexp: %s\ngot: %s", exp, got)
-	}
-}
-
-func TestDropSeriesStatement(t *testing.T) {
-	store, executor := testStoreAndExecutor("")
-	defer os.RemoveAll(store.Path())
-
-	pt := models.MustNewPoint(
-		"cpu",
-		map[string]string{"host": "server"},
-		map[string]interface{}{"value": 1.0},
-		time.Unix(1, 2),
-	)
-
-	err := store.WriteToShard(shardID, []models.Point{pt})
-	if err != nil {
-		t.Fatalf(err.Error())
-	}
-
-	got := executeAndGetJSON("SELECT * FROM cpu GROUP BY *", executor)
-	exepected := `[{"series":[{"name":"cpu","tags":{"host":"server"},"columns":["time","value"],"values":[["1970-01-01T00:00:01.000000002Z",1]]}]}]`
-	if exepected != got {
-		t.Fatalf("exp: %s\ngot: %s", exepected, got)
-	}
-
-	got = executeAndGetJSON("drop series from cpu", executor)
-
-	got = executeAndGetJSON("SELECT * FROM cpu GROUP BY *", executor)
-	exepected = `[{}]`
-	if exepected != got {
-		t.Fatalf("exp: %s\ngot: %s", exepected, got)
-	}
-
-	got = executeAndGetJSON("show tag keys from cpu", executor)
-	exepected = `[{}]`
-	if exepected != got {
-		t.Fatalf("exp: %s\ngot: %s", exepected, got)
-	}
-
-	store.Close()
-	conf := store.EngineOptions.Config
-	store = tsdb.NewStore(store.Path())
-	store.EngineOptions.Config = conf
-	store.Open()
-	executor.Store = store
-
-	got = executeAndGetJSON("select * from cpu", executor)
-	exepected = `[{}]`
-	if exepected != got {
-		t.Fatalf("exp: %s\ngot: %s", exepected, got)
-	}
-
-	got = executeAndGetJSON("show tag keys from cpu", executor)
-	exepected = `[{}]`
-	if exepected != got {
-		t.Fatalf("exp: %s\ngot: %s", exepected, got)
-	}
-}
-
-func TestDropMeasurementStatement(t *testing.T) {
-	store, executor := testStoreAndExecutor("")
-	defer os.RemoveAll(store.Path())
-
-	pt := models.MustNewPoint(
-		"cpu",
-		map[string]string{"host": "server"},
-		map[string]interface{}{"value": 1.0},
-		time.Unix(1, 2),
-	)
-	pt2 := models.MustNewPoint(
-		"memory",
-		map[string]string{"host": "server"},
-		map[string]interface{}{"value": 1.0},
-		time.Unix(1, 2),
-	)
-
-	if err := store.WriteToShard(shardID, []models.Point{pt, pt2}); err != nil {
-		t.Fatal(err)
-	}
-
-	got := executeAndGetJSON("show series", executor)
-	exepected := `[{"series":[{"name":"cpu","columns":["_key","host"],"values":[["cpu,host=server","server"]]},{"name":"memory","columns":["_key","host"],"values":[["memory,host=server","server"]]}]}]`
-	if exepected != got {
-		t.Fatalf("exp: %s\ngot: %s", exepected, got)
-	}
-
-	got = executeAndGetJSON("drop measurement memory", executor)
-	exepected = `[{}]`
-	if exepected != got {
-		t.Fatalf("exp: %s\ngot: %s", exepected, got)
-	}
-
-	validateDrop := func() {
-		got = executeAndGetJSON("show series", executor)
-		exepected = `[{"series":[{"name":"cpu","columns":["_key","host"],"values":[["cpu,host=server","server"]]}]}]`
-		if exepected != got {
-			t.Fatalf("exp: %s\ngot: %s", exepected, got)
-		}
-		got = executeAndGetJSON("show measurements", executor)
-		exepected = `[{"series":[{"name":"measurements","columns":["name"],"values":[["cpu"]]}]}]`
-		if exepected != got {
-			t.Fatalf("exp: %s\ngot: %s", exepected, got)
-		}
-		got = executeAndGetJSON("select * from memory", executor)
-		exepected = `[{}]`
-		if exepected != got {
-			t.Fatalf("exp: %s\ngot: %s", exepected, got)
-		}
-	}
-
-	validateDrop()
-	store.Close()
-	store, executor = testStoreAndExecutor(store.Path())
-	validateDrop()
-}
-
-// mock for the metaExecutor
-type metaExec struct {
-	fn func(stmt influxql.Statement) *influxql.Result
-}
-
-func (m *metaExec) ExecuteStatement(stmt influxql.Statement) *influxql.Result {
-	return m.fn(stmt)
-}
-
-func TestDropDatabase(t *testing.T) {
-	store, executor := testStoreAndExecutor("")
-	defer os.RemoveAll(store.Path())
-
-	pt := models.MustNewPoint(
-		"cpu",
-		map[string]string{"host": "server"},
-		map[string]interface{}{"value": 1.0},
-		time.Unix(1, 2),
-	)
-
-	if err := store.WriteToShard(shardID, []models.Point{pt}); err != nil {
-		t.Fatal(err)
-	}
-
-	got := executeAndGetJSON("SELECT * FROM cpu GROUP BY *", executor)
-	expected := `[{"series":[{"name":"cpu","tags":{"host":"server"},"columns":["time","value"],"values":[["1970-01-01T00:00:01.000000002Z",1]]}]}]`
-	if expected != got {
-		t.Fatalf("exp: %s\ngot: %s", expected, got)
-	}
-
-	var name string
-	me := &metaExec{fn: func(stmt influxql.Statement) *influxql.Result {
-		name = stmt.(*influxql.DropDatabaseStatement).Name
-		return &influxql.Result{}
-	}}
-	executor.MetaStatementExecutor = me
-
-	// verify the database is there on disk
-	dbPath := filepath.Join(store.Path(), "foo")
-	if _, err := os.Stat(dbPath); err != nil {
-		t.Fatalf("execpted database dir %s to exist", dbPath)
-	}
-
-	got = executeAndGetJSON("drop database foo", executor)
-	expected = `[{}]`
-	if got != expected {
-		t.Fatalf("exp: %s\ngot: %s", expected, got)
-	}
-
-	if name != "foo" {
-		t.Fatalf("expected the MetaStatementExecutor to be called with database name foo, but got %s", name)
-	}
-
-	if _, err := os.Stat(dbPath); !os.IsNotExist(err) {
-		t.Fatalf("expected database dir %s to be gone", dbPath)
-	}
-
-	store.Close()
-	conf := store.EngineOptions.Config
-	store = tsdb.NewStore(store.Path())
-	store.EngineOptions.Config = conf
-	store.Open()
-	executor.Store = store
-	executor.ShardMapper = &testShardMapper{store: store}
-
-	if err := store.WriteToShard(shardID, []models.Point{pt}); err == nil || err.Error() != "shard not found" {
-		t.Fatalf("expected shard to not be found")
-	}
-}
-
-// Ensure that queries for which there is no data result in an empty set.
-func TestQueryNoData(t *testing.T) {
-	store, executor := testStoreAndExecutor("")
-	defer os.RemoveAll(store.Path())
-
-	got := executeAndGetJSON("select * from /.*/", executor)
-	expected := `[{}]`
-	if expected != got {
-		t.Fatalf("exp: %s\ngot: %s", expected, got)
-	}
-
-	got = executeAndGetJSON("show series", executor)
-	expected = `[{}]`
-	if expected != got {
-		t.Fatalf("exp: %s\ngot: %s", expected, got)
-	}
-
-	store.Close()
-}
-
-// ensure that authenticate doesn't return an error if the user count is zero and they're attempting
-// to create a user.
-func TestAuthenticateIfUserCountZeroAndCreateUser(t *testing.T) {
-	store, executor := testStoreAndExecutor("")
-	defer os.RemoveAll(store.Path())
-	ms := &testMetastore{userCount: 0}
-	executor.MetaStore = ms
-
-	if err := executor.Authorize(nil, mustParseQuery("create user foo with password 'asdf' with all privileges"), ""); err != nil {
-		t.Fatalf("should have authenticated if no users and attempting to create a user but got error: %s", err.Error())
-	}
-
-	if executor.Authorize(nil, mustParseQuery("create user foo with password 'asdf'"), "") == nil {
-		t.Fatalf("should have failed authentication if no user given and no users exist for create user query that doesn't grant all privileges")
-	}
-
-	if executor.Authorize(nil, mustParseQuery("select * from foo"), "") == nil {
-		t.Fatalf("should have failed authentication if no user given and no users exist for any query other than create user")
-	}
-
-	ms.userCount = 1
-
-	if executor.Authorize(nil, mustParseQuery("create user foo with password 'asdf'"), "") == nil {
-		t.Fatalf("should have failed authentication if no user given and users exist")
-	}
-
-	if executor.Authorize(nil, mustParseQuery("select * from foo"), "") == nil {
-		t.Fatalf("should have failed authentication if no user given and users exist")
-	}
-}
-
-func testStoreAndExecutor(storePath string) (*tsdb.Store, *tsdb.QueryExecutor) {
-	if storePath == "" {
-		storePath, _ = ioutil.TempDir("", "")
-	}
-
-	store := tsdb.NewStore(storePath)
-	store.EngineOptions.Config.WALDir = filepath.Join(storePath, "wal")
-
-	err := store.Open()
-	if err != nil {
-		panic(err)
-	}
-	database := "foo"
-	retentionPolicy := "bar"
-	shardID := uint64(1)
-	store.CreateShard(database, retentionPolicy, shardID)
-
-	executor := tsdb.NewQueryExecutor(store)
-	executor.MetaStore = &testMetastore{}
-	executor.ShardMapper = &testShardMapper{store: store}
-
-	return store, executor
-}
-
-func executeAndGetJSON(query string, executor *tsdb.QueryExecutor) string {
-	ch, err := executor.ExecuteQuery(mustParseQuery(query), "foo", 20)
-	if err != nil {
-		panic(err.Error())
-	}
-
-	var results []*influxql.Result
-	for r := range ch {
-		results = append(results, r)
-	}
-
-	b, err := json.Marshal(results)
-	if err != nil {
-		panic(err)
-	}
-	return string(b)
-}
-
-type testMetastore struct {
-	userCount int
-}
-
-func (t *testMetastore) Database(name string) (*meta.DatabaseInfo, error) {
-	return &meta.DatabaseInfo{
-		Name: name,
-		DefaultRetentionPolicy: "foo",
-		RetentionPolicies: []meta.RetentionPolicyInfo{
-			{
-				Name: "bar",
-				ShardGroups: []meta.ShardGroupInfo{
-					{
-						ID:        uint64(1),
-						StartTime: time.Now().Add(-time.Hour),
-						EndTime:   time.Now().Add(time.Hour),
-						Shards: []meta.ShardInfo{
-							{
-								ID:     uint64(1),
-								Owners: []meta.ShardOwner{{NodeID: 1}},
-							},
-						},
-					},
-				},
-			},
-		},
-	}, nil
-}
-
-func (t *testMetastore) Databases() ([]meta.DatabaseInfo, error) {
-	db, _ := t.Database("foo")
-	return []meta.DatabaseInfo{*db}, nil
-}
-
-func (t *testMetastore) User(name string) (*meta.UserInfo, error) { return nil, nil }
-
-func (t *testMetastore) AdminUserExists() (bool, error) { return false, nil }
-
-func (t *testMetastore) Authenticate(username, password string) (*meta.UserInfo, error) {
-	return nil, nil
-}
-
-func (t *testMetastore) RetentionPolicy(database, name string) (rpi *meta.RetentionPolicyInfo, err error) {
-	return &meta.RetentionPolicyInfo{
-		Name: "bar",
-		ShardGroups: []meta.ShardGroupInfo{
-			{
-				ID:        uint64(1),
-				StartTime: time.Now().Add(-time.Hour),
-				EndTime:   time.Now().Add(time.Hour),
-				Shards: []meta.ShardInfo{
-					{
-						ID:     uint64(1),
-						Owners: []meta.ShardOwner{{NodeID: 1}},
-					},
-				},
-			},
-		},
-	}, nil
-}
-
-func (t *testMetastore) UserCount() (int, error) {
-	return t.userCount, nil
-}
-
-func (t *testMetastore) ShardGroupsByTimeRange(database, policy string, min, max time.Time) (a []meta.ShardGroupInfo, err error) {
-	return []meta.ShardGroupInfo{
-		{
-			ID:        sgID,
-			StartTime: time.Now().Add(-time.Hour),
-			EndTime:   time.Now().Add(time.Hour),
-			Shards: []meta.ShardInfo{
-				{
-					ID:     uint64(1),
-					Owners: []meta.ShardOwner{{NodeID: 1}},
-				},
-			},
-		},
-	}, nil
-}
-
-func (t *testMetastore) NodeID() uint64 {
-	return 1
-}
-
-type testShardMapper struct {
-	store *tsdb.Store
-}
-
-func (t *testShardMapper) CreateMapper(shard meta.ShardInfo, stmt influxql.Statement, chunkSize int) (tsdb.Mapper, error) {
-	m, err := t.store.CreateMapper(shard.ID, stmt, chunkSize)
-	return m, err
-}
-
-// MustParseQuery parses an InfluxQL query. Panic on error.
-func mustParseQuery(s string) *influxql.Query {
-	q, err := influxql.NewParser(strings.NewReader(s)).ParseQuery()
-	if err != nil {
-		panic(err.Error())
-	}
-	return q
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/raw.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/raw.go
deleted file mode 100644
index dc13b9737..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/raw.go
+++ /dev/null
@@ -1,950 +0,0 @@
-package tsdb
-
-import (
-	"fmt"
-	"math"
-	"sort"
-	"time"
-
-	"github.com/influxdb/influxdb/influxql"
-	"github.com/influxdb/influxdb/models"
-)
-
-const (
-	// Return an error if the user is trying to select more than this number of points in a group by statement.
-	// Most likely they specified a group by interval without time boundaries.
-	MaxGroupByPoints = 100000
-
-	// Since time is always selected, the column count when selecting only a single other value will be 2
-	SelectColumnCountWithOneValue = 2
-
-	// IgnoredChunkSize is what gets passed into Mapper.Begin for aggregate queries as they don't chunk points out
-	IgnoredChunkSize = 0
-)
-
-type RawExecutor struct {
-	stmt           *influxql.SelectStatement
-	mappers        []*StatefulMapper
-	chunkSize      int
-	limitedTagSets map[string]struct{} // Set tagsets for which data has reached the LIMIT.
-}
-
-// NewRawExecutor returns a new RawExecutor.
-func NewRawExecutor(stmt *influxql.SelectStatement, mappers []Mapper, chunkSize int) *RawExecutor {
-	a := []*StatefulMapper{}
-	for _, m := range mappers {
-		a = append(a, &StatefulMapper{m, nil, false})
-	}
-	return &RawExecutor{
-		stmt:           stmt,
-		mappers:        a,
-		chunkSize:      chunkSize,
-		limitedTagSets: make(map[string]struct{}),
-	}
-}
-
-// Close closes the executor such that all resources are released.
-// Once closed, an executor may not be re-used.
-func (e *RawExecutor) close() {
-	if e != nil {
-		for _, m := range e.mappers {
-			m.Close()
-		}
-	}
-}
-
-// Execute begins execution of the query and returns a channel to receive rows.
-func (e *RawExecutor) Execute() <-chan *models.Row {
-	out := make(chan *models.Row, 0)
-	go e.execute(out)
-	return out
-}
-
-func (e *RawExecutor) execute(out chan *models.Row) {
-	// It's important that all resources are released when execution completes.
-	defer e.close()
-
-	// Open the mappers.
-	for _, m := range e.mappers {
-		if err := m.Open(); err != nil {
-			out <- &models.Row{Err: err}
-			return
-		}
-	}
-
-	// Get the distinct fields across all mappers.
-	var selectFields, aliasFields []string
-	if e.stmt.HasWildcard() {
-		sf := newStringSet()
-		for _, m := range e.mappers {
-			sf.add(m.Fields()...)
-		}
-		selectFields = sf.list()
-		aliasFields = selectFields
-	} else {
-		selectFields = e.stmt.Fields.Names()
-		aliasFields = e.stmt.Fields.AliasNames()
-	}
-
-	// Used to read ahead chunks from mappers.
-	var rowWriter *limitedRowWriter
-	var currTagset string
-
-	// Keep looping until all mappers drained.
-	var err error
-	for {
-		// Get the next chunk from each Mapper.
-		for _, m := range e.mappers {
-			if m.drained {
-				continue
-			}
-
-			// Set the next buffered chunk on the mapper, or mark it drained.
-			for {
-				if m.bufferedChunk == nil {
-					m.bufferedChunk, err = m.NextChunk()
-					if err != nil {
-						out <- &models.Row{Err: err}
-						return
-					}
-					if m.bufferedChunk == nil {
-						// Mapper can do no more for us.
-						m.drained = true
-						break
-					}
-
-					// If the SELECT query is on more than 1 field, but the chunks values from the Mappers
-					// only contain a single value, create k-v pairs using the field name of the chunk
-					// and the value of the chunk. If there is only 1 SELECT field across all mappers then
-					// there is no need to create k-v pairs, and there is no need to distinguish field data,
-					// as it is all for the *same* field.
-					if len(selectFields) > 1 && len(m.bufferedChunk.Fields) == 1 {
-						fieldKey := m.bufferedChunk.Fields[0]
-
-						for i := range m.bufferedChunk.Values {
-							field := map[string]interface{}{fieldKey: m.bufferedChunk.Values[i].Value}
-							m.bufferedChunk.Values[i].Value = field
-						}
-					}
-				}
-
-				if e.tagSetIsLimited(m.bufferedChunk.Name) {
-					// chunk's tagset is limited, so no good. Try again.
-					m.bufferedChunk = nil
-					continue
-				}
-				// This mapper has a chunk available, and it is not limited.
-				break
-			}
-		}
-
-		// All Mappers done?
-		if e.mappersDrained() {
-			rowWriter.Flush()
-			break
-		}
-
-		// Send out data for the next alphabetically-lowest tagset. All Mappers emit data in this order,
-		// so by always continuing with the lowest tagset until it is finished, we process all data in
-		// the required order, and don't "miss" any.
-		tagset := e.nextMapperTagSet()
-		if tagset != currTagset {
-			currTagset = tagset
-			// Tagset has changed, time for a new rowWriter. Be sure to kick out any residual values.
-			rowWriter.Flush()
-			rowWriter = nil
-		}
-
-		ascending := true
-		if len(e.stmt.SortFields) > 0 {
-			ascending = e.stmt.SortFields[0].Ascending
-		}
-
-		var timeBoundary int64
-
-		if ascending {
-			// Process the mapper outputs. We can send out everything up to the min of the last time
-			// of the chunks for the next tagset.
-			timeBoundary = e.nextMapperLowestTime(tagset)
-		} else {
-			timeBoundary = e.nextMapperHighestTime(tagset)
-		}
-
-		// Now empty out all the chunks up to the min time. Create new output struct for this data.
-		var chunkedOutput *MapperOutput
-		for _, m := range e.mappers {
-			if m.drained {
-				continue
-			}
-
-			chunkBoundary := false
-			if ascending {
-				chunkBoundary = m.bufferedChunk.Values[0].Time > timeBoundary
-			} else {
-				chunkBoundary = m.bufferedChunk.Values[0].Time < timeBoundary
-			}
-
-			// This mapper's next chunk is not for the next tagset, or the very first value of
-			// the chunk is at a higher acceptable timestamp. Skip it.
-			if m.bufferedChunk.key() != tagset || chunkBoundary {
-				continue
-			}
-
-			// Find the index of the point up to the min.
-			ind := len(m.bufferedChunk.Values)
-			for i, mo := range m.bufferedChunk.Values {
-				if ascending && mo.Time > timeBoundary {
-					ind = i
-					break
-				} else if !ascending && mo.Time < timeBoundary {
-					ind = i
-					break
-				}
-
-			}
-
-			// Add up to the index to the values
-			if chunkedOutput == nil {
-				chunkedOutput = &MapperOutput{
-					Name:      m.bufferedChunk.Name,
-					Tags:      m.bufferedChunk.Tags,
-					cursorKey: m.bufferedChunk.key(),
-				}
-				chunkedOutput.Values = m.bufferedChunk.Values[:ind]
-			} else {
-				chunkedOutput.Values = append(chunkedOutput.Values, m.bufferedChunk.Values[:ind]...)
-			}
-
-			// Clear out the values being sent out, keep the remainder.
-			m.bufferedChunk.Values = m.bufferedChunk.Values[ind:]
-
-			// If we emptied out all the values, clear the mapper's buffered chunk.
-			if len(m.bufferedChunk.Values) == 0 {
-				m.bufferedChunk = nil
-			}
-		}
-
-		if ascending {
-			// Sort the values by time first so we can then handle offset and limit
-			sort.Sort(MapperValues(chunkedOutput.Values))
-		} else {
-			sort.Sort(sort.Reverse(MapperValues(chunkedOutput.Values)))
-		}
-
-		// Now that we have full name and tag details, initialize the rowWriter.
-		// The Name and Tags will be the same for all mappers.
-		if rowWriter == nil {
-			rowWriter = &limitedRowWriter{
-				limit:       e.stmt.Limit,
-				offset:      e.stmt.Offset,
-				chunkSize:   e.chunkSize,
-				name:        chunkedOutput.Name,
-				tags:        chunkedOutput.Tags,
-				selectNames: selectFields,
-				aliasNames:  aliasFields,
-				fields:      e.stmt.Fields,
-				c:           out,
-			}
-		}
-		if e.stmt.HasDerivative() {
-			interval, err := derivativeInterval(e.stmt)
-			if err != nil {
-				out <- &models.Row{Err: err}
-				return
-			}
-			rowWriter.transformer = &RawQueryDerivativeProcessor{
-				IsNonNegative:      e.stmt.FunctionCalls()[0].Name == "non_negative_derivative",
-				DerivativeInterval: interval,
-			}
-		}
-
-		// Emit the data via the limiter.
-		if limited := rowWriter.Add(chunkedOutput.Values); limited {
-			// Limit for this tagset was reached, mark it and start draining a new tagset.
-			e.limitTagSet(chunkedOutput.key())
-			continue
-		}
-	}
-
-	close(out)
-}
-
-// mappersDrained returns whether all the executors Mappers have been drained of data.
-func (e *RawExecutor) mappersDrained() bool {
-	for _, m := range e.mappers {
-		if !m.drained {
-			return false
-		}
-	}
-	return true
-}
-
-// nextMapperTagset returns the alphabetically lowest tagset across all Mappers.
-func (e *RawExecutor) nextMapperTagSet() string {
-	tagset := ""
-	for _, m := range e.mappers {
-		if m.bufferedChunk != nil {
-			if tagset == "" {
-				tagset = m.bufferedChunk.key()
-			} else if m.bufferedChunk.key() < tagset {
-				tagset = m.bufferedChunk.key()
-			}
-		}
-	}
-	return tagset
-}
-
-// nextMapperLowestTime returns the lowest minimum time across all Mappers, for the given tagset.
-func (e *RawExecutor) nextMapperLowestTime(tagset string) int64 {
-	minTime := int64(math.MaxInt64)
-	for _, m := range e.mappers {
-		if !m.drained && m.bufferedChunk != nil {
-			if m.bufferedChunk.key() != tagset {
-				continue
-			}
-			t := m.bufferedChunk.Values[len(m.bufferedChunk.Values)-1].Time
-			if t < minTime {
-				minTime = t
-			}
-		}
-	}
-	return minTime
-}
-
-// nextMapperHighestTime returns the highest time across all Mappers, for the given tagset.
-func (e *RawExecutor) nextMapperHighestTime(tagset string) int64 {
-	maxTime := int64(math.MinInt64)
-	for _, m := range e.mappers {
-		if !m.drained && m.bufferedChunk != nil {
-			if m.bufferedChunk.key() != tagset {
-				continue
-			}
-			t := m.bufferedChunk.Values[0].Time
-			if t > maxTime {
-				maxTime = t
-			}
-		}
-	}
-	return maxTime
-}
-
-// tagSetIsLimited returns whether data for the given tagset has been LIMITed.
-func (e *RawExecutor) tagSetIsLimited(tagset string) bool {
-	_, ok := e.limitedTagSets[tagset]
-	return ok
-}
-
-// limitTagSet marks the given taset as LIMITed.
-func (e *RawExecutor) limitTagSet(tagset string) {
-	e.limitedTagSets[tagset] = struct{}{}
-}
-
-// limitedRowWriter accepts raw mapper values, and will emit those values as rows in chunks
-// of the given size. If the chunk size is 0, no chunking will be performed. In addition if
-// limit is reached, outstanding values will be emitted. If limit is zero, no limit is enforced.
-type limitedRowWriter struct {
-	chunkSize   int
-	limit       int
-	offset      int
-	name        string
-	tags        map[string]string
-	fields      influxql.Fields
-	selectNames []string
-	aliasNames  []string
-	c           chan *models.Row
-
-	currValues  []*MapperValue
-	totalOffSet int
-	totalSent   int
-
-	transformer interface {
-		Process(input []*MapperValue) []*MapperValue
-	}
-}
-
-// Add accepts a slice of values, and will emit those values as per chunking requirements.
-// If limited is returned as true, the limit was also reached and no more values should be
-// added. In that case only up the limit of values are emitted.
-func (r *limitedRowWriter) Add(values []*MapperValue) (limited bool) {
-	if r.currValues == nil {
-		r.currValues = make([]*MapperValue, 0, r.chunkSize)
-	}
-
-	// Enforce offset.
-	if r.totalOffSet < r.offset {
-		// Still some offsetting to do.
-		offsetRequired := r.offset - r.totalOffSet
-		if offsetRequired >= len(values) {
-			r.totalOffSet += len(values)
-			return false
-		} else {
-			// Drop leading values and keep going.
-			values = values[offsetRequired:]
-			r.totalOffSet += offsetRequired
-		}
-	}
-	r.currValues = append(r.currValues, values...)
-
-	// Check limit.
-	limitReached := r.limit > 0 && r.totalSent+len(r.currValues) >= r.limit
-	if limitReached {
-		// Limit will be satified with current values. Truncate 'em.
-		r.currValues = r.currValues[:r.limit-r.totalSent]
-	}
-
-	// Is chunking in effect?
-	if r.chunkSize != IgnoredChunkSize {
-		// Chunking level reached?
-		for len(r.currValues) >= r.chunkSize {
-			index := len(r.currValues) - (len(r.currValues) - r.chunkSize)
-			r.c <- r.processValues(r.currValues[:index])
-			r.currValues = r.currValues[index:]
-		}
-
-		// After values have been sent out by chunking, there may still be some
-		// values left, if the remainder is less than the chunk size. But if the
-		// limit has been reached, kick them out.
-		if len(r.currValues) > 0 && limitReached {
-			r.c <- r.processValues(r.currValues)
-			r.currValues = nil
-		}
-	} else if limitReached {
-		// No chunking in effect, but the limit has been reached.
-		r.c <- r.processValues(r.currValues)
-		r.currValues = nil
-	}
-
-	return limitReached
-}
-
-// Flush instructs the limitedRowWriter to emit any pending values as a single row,
-// adhering to any limits. Chunking is not enforced.
-func (r *limitedRowWriter) Flush() {
-	if r == nil {
-		return
-	}
-
-	// If at least some rows were sent, and no values are pending, then don't
-	// emit anything, since at least 1 row was previously emitted. This ensures
-	// that if no rows were ever sent, at least 1 will be emitted, even an empty row.
-	if r.totalSent != 0 && len(r.currValues) == 0 {
-		return
-	}
-
-	if r.limit > 0 && len(r.currValues) > r.limit {
-		r.currValues = r.currValues[:r.limit]
-	}
-	r.c <- r.processValues(r.currValues)
-	r.currValues = nil
-}
-
-// processValues emits the given values in a single row.
-func (r *limitedRowWriter) processValues(values []*MapperValue) *models.Row {
-	defer func() {
-		r.totalSent += len(values)
-	}()
-
-	selectNames := r.selectNames
-	aliasNames := r.aliasNames
-
-	if r.transformer != nil {
-		values = r.transformer.Process(values)
-	}
-
-	// ensure that time is in the select names and in the first position
-	hasTime := false
-	for i, n := range selectNames {
-		if n == "time" {
-			// Swap time to the first argument for names
-			if i != 0 {
-				selectNames[0], selectNames[i] = selectNames[i], selectNames[0]
-			}
-			hasTime = true
-			break
-		}
-	}
-
-	// time should always be in the list of names they get back
-	if !hasTime {
-		selectNames = append([]string{"time"}, selectNames...)
-		aliasNames = append([]string{"time"}, aliasNames...)
-	}
-
-	// since selectNames can contain tags, we need to strip them out
-	selectFields := make([]string, 0, len(selectNames))
-	aliasFields := make([]string, 0, len(selectNames))
-
-	for i, n := range selectNames {
-		if _, found := r.tags[n]; !found {
-			selectFields = append(selectFields, n)
-			aliasFields = append(aliasFields, aliasNames[i])
-		}
-	}
-
-	row := &models.Row{
-		Name:    r.name,
-		Tags:    r.tags,
-		Columns: aliasFields,
-	}
-
-	// Kick out an empty row it no results available.
-	if len(values) == 0 {
-		return row
-	}
-
-	// if they've selected only a single value we have to handle things a little differently
-	singleValue := len(selectFields) == SelectColumnCountWithOneValue
-
-	// the results will have all of the raw mapper results, convert into the row
-	for _, v := range values {
-		vals := make([]interface{}, len(selectFields))
-
-		if singleValue {
-			vals[0] = time.Unix(0, v.Time).UTC()
-			switch val := v.Value.(type) {
-			case map[string]interface{}:
-				vals[1] = val[selectFields[1]]
-			default:
-				vals[1] = val
-			}
-		} else {
-			fields := v.Value.(map[string]interface{})
-
-			// time is always the first value
-			vals[0] = time.Unix(0, v.Time).UTC()
-
-			// populate the other values
-			for i := 1; i < len(selectFields); i++ {
-				f, ok := fields[selectFields[i]]
-				if ok {
-					vals[i] = f
-					continue
-				}
-				if v.Tags != nil {
-					f, ok = v.Tags[selectFields[i]]
-					if ok {
-						vals[i] = f
-					}
-				}
-			}
-		}
-
-		row.Values = append(row.Values, vals)
-	}
-
-	// Perform any mathematical post-processing.
-	row.Values = processForMath(r.fields, row.Values)
-
-	return row
-}
-
-type RawQueryDerivativeProcessor struct {
-	LastValueFromPreviousChunk *MapperValue
-	IsNonNegative              bool // Whether to drop negative differences
-	DerivativeInterval         time.Duration
-}
-
-func (rqdp *RawQueryDerivativeProcessor) canProcess(input *MapperValue) bool {
-	// Cannot process a nil value
-	if input == nil {
-		return false
-	}
-
-	// See if the field value is numeric, if it's not, we can't process the derivative
-	validType := false
-	switch input.Value.(type) {
-	case int64:
-		validType = true
-	case float64:
-		validType = true
-	}
-
-	return validType
-}
-
-func (rqdp *RawQueryDerivativeProcessor) Process(input []*MapperValue) []*MapperValue {
-	if len(input) == 0 {
-		return input
-	}
-
-	if len(input) == 1 {
-		return []*MapperValue{
-			&MapperValue{
-				Time:  input[0].Time,
-				Value: 0.0,
-			},
-		}
-	}
-
-	if rqdp.LastValueFromPreviousChunk == nil {
-		rqdp.LastValueFromPreviousChunk = input[0]
-	}
-
-	derivativeValues := []*MapperValue{}
-	for i := 1; i < len(input); i++ {
-		v := input[i]
-
-		// If we can't use the current or prev value (wrong time, nil), just append
-		// nil
-		if !rqdp.canProcess(v) || !rqdp.canProcess(rqdp.LastValueFromPreviousChunk) {
-			derivativeValues = append(derivativeValues, &MapperValue{
-				Time:  v.Time,
-				Value: nil,
-			})
-			continue
-		}
-
-		// Calculate the derivative of successive points by dividing the difference
-		// of each value by the elapsed time normalized to the interval
-		diff := int64toFloat64(v.Value) - int64toFloat64(rqdp.LastValueFromPreviousChunk.Value)
-
-		elapsed := v.Time - rqdp.LastValueFromPreviousChunk.Time
-
-		value := 0.0
-		if elapsed > 0 {
-			value = diff / (float64(elapsed) / float64(rqdp.DerivativeInterval))
-		}
-
-		rqdp.LastValueFromPreviousChunk = v
-
-		// Drop negative values for non-negative derivatives
-		if rqdp.IsNonNegative && diff < 0 {
-			continue
-		}
-
-		derivativeValues = append(derivativeValues, &MapperValue{
-			Time:  v.Time,
-			Value: value,
-		})
-	}
-
-	return derivativeValues
-}
-
-// processForMath will apply any math that was specified in the select statement
-// against the passed in results
-func processForMath(fields influxql.Fields, results [][]interface{}) [][]interface{} {
-	hasMath := false
-	for _, f := range fields {
-		if _, ok := f.Expr.(*influxql.BinaryExpr); ok {
-			hasMath = true
-		} else if _, ok := f.Expr.(*influxql.ParenExpr); ok {
-			hasMath = true
-		}
-	}
-
-	if !hasMath {
-		return results
-	}
-
-	processors := make([]influxql.Processor, len(fields))
-	startIndex := 1
-	for i, f := range fields {
-		processors[i], startIndex = influxql.GetProcessor(f.Expr, startIndex)
-	}
-
-	mathResults := make([][]interface{}, len(results))
-	for i, _ := range mathResults {
-		mathResults[i] = make([]interface{}, len(fields)+1)
-		// put the time in
-		mathResults[i][0] = results[i][0]
-		for j, p := range processors {
-			mathResults[i][j+1] = p(results[i])
-		}
-	}
-
-	return mathResults
-}
-
-// ProcessAggregateDerivative returns the derivatives of an aggregate result set
-func ProcessAggregateDerivative(results [][]interface{}, isNonNegative bool, interval time.Duration) [][]interface{} {
-	// Return early if we can't calculate derivatives
-	if len(results) == 0 {
-		return results
-	}
-
-	// If we only have 1 value, then the value did not change, so return
-	// a single row w/ 0.0
-	if len(results) == 1 {
-		return [][]interface{}{
-			[]interface{}{results[0][0], 0.0},
-		}
-	}
-
-	// Otherwise calculate the derivatives as the difference between consecutive
-	// points divided by the elapsed time.  Then normalize to the requested
-	// interval.
-	derivatives := [][]interface{}{}
-	for i := 1; i < len(results); i++ {
-		prev := results[i-1]
-		cur := results[i]
-
-		// If current value is nil, append nil for the value
-		if prev[1] == nil || cur[1] == nil {
-			derivatives = append(derivatives, []interface{}{
-				cur[0], nil,
-			})
-			continue
-		}
-
-		// Check the value's type to ensure it's an numeric, if not, return a nil result. We only check the first value
-		// because derivatives cannot be combined with other aggregates currently.
-		validType := false
-		switch cur[1].(type) {
-		case int64:
-			validType = true
-		case float64:
-			validType = true
-		}
-
-		if !validType {
-			derivatives = append(derivatives, []interface{}{
-				cur[0], nil,
-			})
-			continue
-		}
-
-		elapsed := cur[0].(time.Time).Sub(prev[0].(time.Time))
-		diff := int64toFloat64(cur[1]) - int64toFloat64(prev[1])
-		value := 0.0
-		if elapsed > 0 {
-			value = float64(diff) / (float64(elapsed) / float64(interval))
-		}
-
-		// Drop negative values for non-negative derivatives
-		if isNonNegative && diff < 0 {
-			continue
-		}
-
-		val := []interface{}{
-			cur[0],
-			value,
-		}
-		derivatives = append(derivatives, val)
-	}
-
-	return derivatives
-}
-
-// derivativeInterval returns the time interval for the one (and only) derivative func
-func derivativeInterval(stmt *influxql.SelectStatement) (time.Duration, error) {
-	if len(stmt.FunctionCalls()[0].Args) == 2 {
-		return stmt.FunctionCalls()[0].Args[1].(*influxql.DurationLiteral).Val, nil
-	}
-	interval, err := stmt.GroupByInterval()
-	if err != nil {
-		return 0, err
-	}
-	if interval > 0 {
-		return interval, nil
-	}
-	return time.Second, nil
-}
-
-// resultsEmpty will return true if the all the result values are empty or contain only nulls
-func resultsEmpty(resultValues [][]interface{}) bool {
-	for _, vals := range resultValues {
-		// start the loop at 1 because we want to skip over the time value
-		for i := 1; i < len(vals); i++ {
-			if vals[i] != nil {
-				return false
-			}
-		}
-	}
-	return true
-}
-
-func int64toFloat64(v interface{}) float64 {
-	switch v.(type) {
-	case int64:
-		return float64(v.(int64))
-	case float64:
-		return v.(float64)
-	}
-	panic(fmt.Sprintf("expected either int64 or float64, got %v", v))
-}
-
-// RawMapper runs the map phase for non-aggregate, raw SELECT queries.
-type RawMapper struct {
-	shard      *Shard
-	stmt       *influxql.SelectStatement
-	qmin, qmax int64 // query time range
-
-	tx          Tx
-	cursors     []*TagSetCursor
-	cursorIndex int
-
-	selectFields []string
-	selectTags   []string
-	whereFields  []string
-
-	ChunkSize int
-}
-
-// NewRawMapper returns a new instance of RawMapper.
-func NewRawMapper(sh *Shard, stmt *influxql.SelectStatement) *RawMapper {
-	return &RawMapper{
-		shard: sh,
-		stmt:  stmt,
-	}
-}
-
-// Open opens and initializes the mapper.
-func (m *RawMapper) Open() error {
-	// Ignore if node has the shard but hasn't written to it yet.
-	if m.shard == nil {
-		return nil
-	}
-
-	// Rewrite statement.
-	stmt, err := m.shard.index.RewriteSelectStatement(m.stmt)
-	if err != nil {
-		return err
-	}
-	m.stmt = stmt
-
-	// Set all time-related parameters on the mapper.
-	m.qmin, m.qmax = influxql.TimeRangeAsEpochNano(m.stmt.Condition)
-
-	// Get a read-only transaction.
-	tx, err := m.shard.engine.Begin(false)
-	if err != nil {
-		return err
-	}
-	m.tx = tx
-
-	// Collect measurements.
-	mms := Measurements(m.shard.index.MeasurementsByName(m.stmt.SourceNames()))
-	m.selectFields = mms.SelectFields(m.stmt)
-	m.selectTags = mms.SelectTags(m.stmt)
-	m.whereFields = mms.WhereFields(m.stmt)
-
-	// Open cursors for each measurement.
-	for _, mm := range mms {
-		if err := m.openMeasurement(mm); err != nil {
-			return err
-		}
-	}
-
-	// Remove cursors if there are not SELECT fields.
-	if len(m.selectFields) == 0 {
-		m.cursors = nil
-	}
-
-	return nil
-}
-
-func (m *RawMapper) openMeasurement(mm *Measurement) error {
-	// Validate that ANY GROUP BY is not a field for the measurement.
-	if err := mm.ValidateGroupBy(m.stmt); err != nil {
-		return err
-	}
-
-	// Validate the fields and tags asked for exist and keep track of which are in the select vs the where
-	selectFields := mm.SelectFields(m.stmt)
-	selectTags := mm.SelectTags(m.stmt)
-	fields := uniqueStrings(m.selectFields, m.whereFields)
-
-	// If we only have tags in our select clause we just return
-	if len(selectFields) == 0 && len(selectTags) > 0 {
-		return fmt.Errorf("statement must have at least one field in select clause")
-	}
-
-	// Calculate tag sets and apply SLIMIT/SOFFSET.
-	tagSets, err := mm.DimensionTagSets(m.stmt)
-	if err != nil {
-		return err
-	}
-	tagSets = m.stmt.LimitTagSets(tagSets)
-
-	// Create all cursors for reading the data from this shard.
-	ascending := m.stmt.TimeAscending()
-	for _, t := range tagSets {
-		cursors := []*TagsCursor{}
-
-		for i, key := range t.SeriesKeys {
-			c := m.tx.Cursor(key, fields, m.shard.FieldCodec(mm.Name), ascending)
-			if c == nil {
-				continue
-			}
-
-			seriesTags := m.shard.index.TagsForSeries(key)
-			cm := NewTagsCursor(c, t.Filters[i], seriesTags)
-			cursors = append(cursors, cm)
-		}
-
-		tsc := NewTagSetCursor(mm.Name, t.Tags, cursors)
-		tsc.SelectFields = m.selectFields
-		if ascending {
-			tsc.Init(m.qmin)
-		} else {
-			tsc.Init(m.qmax)
-		}
-
-		m.cursors = append(m.cursors, tsc)
-	}
-
-	sort.Sort(TagSetCursors(m.cursors))
-
-	return nil
-}
-
-// Close closes the mapper.
-func (m *RawMapper) Close() {
-	if m != nil && m.tx != nil {
-		m.tx.Rollback()
-	}
-}
-
-// TagSets returns the list of tag sets for which this mapper has data.
-func (m *RawMapper) TagSets() []string { return TagSetCursors(m.cursors).Keys() }
-
-// Fields returns all SELECT fields.
-func (m *RawMapper) Fields() []string { return append(m.selectFields, m.selectTags...) }
-
-// NextChunk returns the next chunk of data.
-// Data is ordered the same as TagSets. Each chunk contains one tag set.
-// If there is no more data for any tagset, nil will be returned.
-func (m *RawMapper) NextChunk() (interface{}, error) {
-	var output *MapperOutput
-	for {
-		// All tagset cursors processed. NextChunk'ing complete.
-		if m.cursorIndex == len(m.cursors) {
-			return nil, nil
-		}
-
-		cursor := m.cursors[m.cursorIndex]
-
-		k, v := cursor.Next(m.qmin, m.qmax)
-		if v == nil {
-			// Tagset cursor is empty, move to next one.
-			m.cursorIndex++
-			if output != nil {
-				// There is data, so return it and continue when next called.
-				return output, nil
-			} else {
-				// Just go straight to the next cursor.
-				continue
-			}
-		}
-
-		if output == nil {
-			output = &MapperOutput{
-				Name:      cursor.measurement,
-				Tags:      cursor.tags,
-				Fields:    m.selectFields,
-				cursorKey: cursor.key(),
-			}
-		}
-
-		output.Values = append(output.Values, &MapperValue{
-			Time:  k,
-			Value: v,
-			Tags:  cursor.Tags(),
-		})
-
-		if len(output.Values) == m.ChunkSize {
-			return output, nil
-		}
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/raw_test.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/raw_test.go
deleted file mode 100644
index 2515ff4fc..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/raw_test.go
+++ /dev/null
@@ -1,1044 +0,0 @@
-package tsdb_test
-
-import (
-	"encoding/json"
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"reflect"
-	"testing"
-	"time"
-
-	"github.com/davecgh/go-spew/spew"
-	"github.com/influxdb/influxdb/influxql"
-	"github.com/influxdb/influxdb/meta"
-	"github.com/influxdb/influxdb/models"
-	"github.com/influxdb/influxdb/tsdb"
-)
-
-var sID0 = uint64(1)
-var sID1 = uint64(2)
-var sgID1 = uint64(3)
-var sgID2 = uint64(4)
-var nID = uint64(42)
-
-// Simple test to ensure data can be read from two shards.
-func TestWritePointsAndExecuteTwoShards(t *testing.T) {
-	// Create the mock planner and its metastore
-	store, query_executor := testStoreAndQueryExecutor()
-	defer os.RemoveAll(store.Path())
-	query_executor.MetaStore = &testQEMetastore{
-		sgFunc: func(database, policy string, min, max time.Time) (a []meta.ShardGroupInfo, err error) {
-			return []meta.ShardGroupInfo{
-				{
-					ID:        sgID,
-					StartTime: time.Now().Add(-time.Hour),
-					EndTime:   time.Now().Add(time.Hour),
-					Shards: []meta.ShardInfo{
-						{
-							ID:     uint64(sID0),
-							Owners: []meta.ShardOwner{{NodeID: nID}},
-						},
-					},
-				},
-				{
-					ID:        sgID,
-					StartTime: time.Now().Add(-2 * time.Hour),
-					EndTime:   time.Now().Add(-time.Hour),
-					Shards: []meta.ShardInfo{
-						{
-							ID:     uint64(sID1),
-							Owners: []meta.ShardOwner{{NodeID: nID}},
-						},
-					},
-				},
-			}, nil
-		},
-	}
-
-	// Write two points across shards.
-	pt1time := time.Unix(1, 0).UTC()
-	if err := store.WriteToShard(sID0, []models.Point{models.MustNewPoint(
-		"cpu",
-		map[string]string{"host": "serverA", "region": "us-east"},
-		map[string]interface{}{"value": 100},
-		pt1time,
-	)}); err != nil {
-		t.Fatalf(err.Error())
-	}
-	pt2time := time.Unix(2, 0).UTC()
-	if err := store.WriteToShard(sID1, []models.Point{models.MustNewPoint(
-		"cpu",
-		map[string]string{"host": "serverB", "region": "us-east"},
-		map[string]interface{}{"value": 200},
-		pt2time,
-	)}); err != nil {
-		t.Fatalf(err.Error())
-	}
-
-	var tests = []struct {
-		skip      bool   // Skip test
-		stmt      string // Query statement
-		chunkSize int    // Chunk size for driving the executor
-		expected  string // Expected results, rendered as a string
-	}{
-		{
-			stmt:     `SELECT value FROM cpu`,
-			expected: `[{"name":"cpu","columns":["time","value"],"values":[["1970-01-01T00:00:01Z",100],["1970-01-01T00:00:02Z",200]]}]`,
-		},
-		{
-			stmt:      `SELECT value FROM cpu`,
-			chunkSize: 1,
-			expected:  `[{"name":"cpu","columns":["time","value"],"values":[["1970-01-01T00:00:01Z",100]]},{"name":"cpu","columns":["time","value"],"values":[["1970-01-01T00:00:02Z",200]]}]`,
-		},
-		{
-			stmt:     `SELECT value FROM cpu LIMIT 1`,
-			expected: `[{"name":"cpu","columns":["time","value"],"values":[["1970-01-01T00:00:01Z",100]]}]`,
-		},
-		{
-			stmt:      `SELECT value FROM cpu LIMIT 1`,
-			chunkSize: 2,
-			expected:  `[{"name":"cpu","columns":["time","value"],"values":[["1970-01-01T00:00:01Z",100]]}]`,
-		},
-		{
-			stmt:     `SELECT value FROM cpu WHERE host='serverA'`,
-			expected: `[{"name":"cpu","columns":["time","value"],"values":[["1970-01-01T00:00:01Z",100]]}]`,
-		},
-		{
-			stmt:     `SELECT value FROM cpu WHERE host='serverB'`,
-			expected: `[{"name":"cpu","columns":["time","value"],"values":[["1970-01-01T00:00:02Z",200]]}]`,
-		},
-		{
-			stmt:     `SELECT value FROM cpu WHERE host='serverC'`,
-			expected: `null`,
-		},
-		{
-			stmt:     `SELECT value FROM cpu GROUP BY host`,
-			expected: `[{"name":"cpu","tags":{"host":"serverA"},"columns":["time","value"],"values":[["1970-01-01T00:00:01Z",100]]},{"name":"cpu","tags":{"host":"serverB"},"columns":["time","value"],"values":[["1970-01-01T00:00:02Z",200]]}]`,
-		},
-		{
-			stmt:     `SELECT value FROM cpu GROUP BY region`,
-			expected: `[{"name":"cpu","tags":{"region":"us-east"},"columns":["time","value"],"values":[["1970-01-01T00:00:01Z",100],["1970-01-01T00:00:02Z",200]]}]`,
-		},
-		{
-			stmt:     `SELECT value FROM cpu GROUP BY host,region`,
-			expected: `[{"name":"cpu","tags":{"host":"serverA","region":"us-east"},"columns":["time","value"],"values":[["1970-01-01T00:00:01Z",100]]},{"name":"cpu","tags":{"host":"serverB","region":"us-east"},"columns":["time","value"],"values":[["1970-01-01T00:00:02Z",200]]}]`,
-		},
-		{
-			stmt:     `SELECT value FROM cpu WHERE host='serverA' GROUP BY host`,
-			expected: `[{"name":"cpu","tags":{"host":"serverA"},"columns":["time","value"],"values":[["1970-01-01T00:00:01Z",100]]}]`,
-		},
-
-		// Aggregate queries.
-		{
-			stmt:     `SELECT sum(value) FROM cpu`,
-			expected: `[{"name":"cpu","columns":["time","sum"],"values":[["1970-01-01T00:00:00Z",300]]}]`,
-		},
-	}
-
-	for _, tt := range tests {
-		if tt.skip {
-			t.Logf("Skipping test %s", tt.stmt)
-			continue
-		}
-
-		executor, err := query_executor.PlanSelect(mustParseSelectStatement(tt.stmt), tt.chunkSize)
-		if err != nil {
-			t.Fatalf("failed to plan query: %s", err.Error())
-		}
-		got := executeAndGetResults(executor)
-		if got != tt.expected {
-			t.Fatalf("Test %s\nexp: %s\ngot: %s\n", tt.stmt, tt.expected, got)
-		}
-	}
-}
-
-// Test that executor correctly orders data across shards.
-func TestWritePointsAndExecuteTwoShardsAlign(t *testing.T) {
-	// Create the mock planner and its metastore
-	store, query_executor := testStoreAndQueryExecutor()
-	defer os.RemoveAll(store.Path())
-	query_executor.MetaStore = &testQEMetastore{
-		sgFunc: func(database, policy string, min, max time.Time) (a []meta.ShardGroupInfo, err error) {
-			return []meta.ShardGroupInfo{
-				{
-					ID:        sgID,
-					StartTime: time.Now().Add(-2 * time.Hour),
-					EndTime:   time.Now().Add(-time.Hour),
-					Shards: []meta.ShardInfo{
-						{
-							ID:     uint64(sID1),
-							Owners: []meta.ShardOwner{{NodeID: nID}},
-						},
-					},
-				},
-				{
-					ID:        sgID,
-					StartTime: time.Now().Add(-2 * time.Hour),
-					EndTime:   time.Now().Add(time.Hour),
-					Shards: []meta.ShardInfo{
-						{
-							ID:     uint64(sID0),
-							Owners: []meta.ShardOwner{{NodeID: nID}},
-						},
-					},
-				},
-			}, nil
-		},
-	}
-
-	// Write interleaving, by time, chunks to the shards.
-	if err := store.WriteToShard(sID0, []models.Point{models.MustNewPoint(
-		"cpu",
-		map[string]string{"host": "serverA"},
-		map[string]interface{}{"value": 100},
-		time.Unix(1, 0).UTC(),
-	)}); err != nil {
-		t.Fatalf(err.Error())
-	}
-	if err := store.WriteToShard(sID1, []models.Point{models.MustNewPoint(
-		"cpu",
-		map[string]string{"host": "serverB"},
-		map[string]interface{}{"value": 200},
-		time.Unix(2, 0).UTC(),
-	)}); err != nil {
-		t.Fatalf(err.Error())
-	}
-	if err := store.WriteToShard(sID1, []models.Point{models.MustNewPoint(
-		"cpu",
-		map[string]string{"host": "serverA"},
-		map[string]interface{}{"value": 300},
-		time.Unix(3, 0).UTC(),
-	)}); err != nil {
-		t.Fatalf(err.Error())
-	}
-
-	var tests = []struct {
-		skip      bool   // Skip test
-		stmt      string // Query statement
-		chunkSize int    // Chunk size for driving the executor
-		expected  string // Expected results, rendered as a string
-	}{
-		{
-			stmt:      `SELECT value FROM cpu`,
-			chunkSize: 1,
-			expected:  `[{"name":"cpu","columns":["time","value"],"values":[["1970-01-01T00:00:01Z",100]]},{"name":"cpu","columns":["time","value"],"values":[["1970-01-01T00:00:02Z",200]]},{"name":"cpu","columns":["time","value"],"values":[["1970-01-01T00:00:03Z",300]]}]`,
-		},
-		{
-			stmt:      `SELECT value FROM cpu`,
-			chunkSize: 2,
-			expected:  `[{"name":"cpu","columns":["time","value"],"values":[["1970-01-01T00:00:01Z",100],["1970-01-01T00:00:02Z",200]]},{"name":"cpu","columns":["time","value"],"values":[["1970-01-01T00:00:03Z",300]]}]`,
-		},
-		{
-			stmt:      `SELECT mean(value),sum(value) FROM cpu`,
-			chunkSize: 2,
-			expected:  `[{"name":"cpu","columns":["time","mean","sum"],"values":[["1970-01-01T00:00:00Z",200,600]]}]`,
-		},
-	}
-
-	for _, tt := range tests {
-		if tt.skip {
-			t.Logf("Skipping test %s", tt.stmt)
-			continue
-		}
-		executor, err := query_executor.PlanSelect(mustParseSelectStatement(tt.stmt), tt.chunkSize)
-		if err != nil {
-			t.Fatalf("failed to plan query: %s", err.Error())
-		}
-		got := executeAndGetResults(executor)
-		if got != tt.expected {
-			t.Fatalf("Test %s\nexp: %s\ngot: %s\n", tt.stmt, tt.expected, got)
-		}
-	}
-}
-
-// Test to ensure the engine handles query re-writing across stores.
-func TestWritePointsAndExecuteTwoShardsQueryRewrite(t *testing.T) {
-	// Create two distinct stores, ensuring shard mappers will share nothing.
-	store0 := testStore()
-	defer os.RemoveAll(store0.Path())
-	store1 := testStore()
-	defer os.RemoveAll(store1.Path())
-
-	// Create a shard in each store.
-	database := "foo"
-	retentionPolicy := "bar"
-	store0.CreateShard(database, retentionPolicy, sID0)
-	store1.CreateShard(database, retentionPolicy, sID1)
-
-	// Write two points across shards.
-	pt1time := time.Unix(1, 0).UTC()
-	if err := store0.WriteToShard(sID0, []models.Point{models.MustNewPoint(
-		"cpu",
-		map[string]string{"host": "serverA"},
-		map[string]interface{}{"value1": 100},
-		pt1time,
-	)}); err != nil {
-		t.Fatalf(err.Error())
-	}
-	pt2time := time.Unix(2, 0).UTC()
-	if err := store1.WriteToShard(sID1, []models.Point{models.MustNewPoint(
-		"cpu",
-		map[string]string{"host": "serverB"},
-		map[string]interface{}{"value2": 200},
-		pt2time,
-	)}); err != nil {
-		t.Fatalf(err.Error())
-	}
-	var tests = []struct {
-		skip      bool   // Skip test
-		stmt      string // Query statement
-		chunkSize int    // Chunk size for driving the executor
-		expected  string // Expected results, rendered as a string
-	}{
-		{
-			stmt:     `SELECT * FROM cpu`,
-			expected: `[{"name":"cpu","columns":["time","host","value1","value2"],"values":[["1970-01-01T00:00:01Z","serverA",100,null],["1970-01-01T00:00:02Z","serverB",null,200]]}]`,
-		},
-		{
-			stmt:     `SELECT * FROM cpu GROUP BY *`,
-			expected: `[{"name":"cpu","tags":{"host":"serverA"},"columns":["time","value1","value2"],"values":[["1970-01-01T00:00:01Z",100,null]]},{"name":"cpu","tags":{"host":"serverB"},"columns":["time","value1","value2"],"values":[["1970-01-01T00:00:02Z",null,200]]}]`,
-		},
-	}
-	for _, tt := range tests {
-		if tt.skip {
-			t.Logf("Skipping test %s", tt.stmt)
-			continue
-		}
-
-		parsedSelectStmt := mustParseSelectStatement(tt.stmt)
-
-		// Create Mappers and Executor.
-		mapper0, err := store0.CreateMapper(sID0, parsedSelectStmt, tt.chunkSize)
-		if err != nil {
-			t.Fatalf("failed to create mapper0: %s", err.Error())
-		}
-		mapper1, err := store1.CreateMapper(sID1, parsedSelectStmt, tt.chunkSize)
-		if err != nil {
-			t.Fatalf("failed to create mapper1: %s", err.Error())
-		}
-		executor := tsdb.NewRawExecutor(parsedSelectStmt, []tsdb.Mapper{mapper0, mapper1}, tt.chunkSize)
-
-		// Check the results.
-		got := executeAndGetResults(executor)
-		if got != tt.expected {
-			t.Fatalf("Test %s\nexp: %s\ngot: %s\n", tt.stmt, tt.expected, got)
-		}
-
-	}
-}
-
-// Test that executor correctly orders data across shards when the tagsets
-// are not presented in alphabetically order across shards.
-func TestWritePointsAndExecuteTwoShardsTagSetOrdering(t *testing.T) {
-	// Create the mock planner and its metastore
-	store, query_executor := testStoreAndQueryExecutor()
-	defer os.RemoveAll(store.Path())
-	query_executor.MetaStore = &testQEMetastore{
-		sgFunc: func(database, policy string, min, max time.Time) (a []meta.ShardGroupInfo, err error) {
-			return []meta.ShardGroupInfo{
-				{
-					ID: sgID,
-					Shards: []meta.ShardInfo{
-						{
-							ID:     uint64(sID0),
-							Owners: []meta.ShardOwner{{NodeID: nID}},
-						},
-					},
-				},
-				{
-					ID: sgID,
-					Shards: []meta.ShardInfo{
-						{
-							ID:     uint64(sID1),
-							Owners: []meta.ShardOwner{{NodeID: nID}},
-						},
-					},
-				},
-			}, nil
-		},
-	}
-
-	// Write tagsets "y" and "z" to first shard.
-	if err := store.WriteToShard(sID0, []models.Point{models.MustNewPoint(
-		"cpu",
-		map[string]string{"host": "y"},
-		map[string]interface{}{"value": 100},
-		time.Unix(1, 0).UTC(),
-	)}); err != nil {
-		t.Fatalf(err.Error())
-	}
-	if err := store.WriteToShard(sID0, []models.Point{models.MustNewPoint(
-		"cpu",
-		map[string]string{"host": "z"},
-		map[string]interface{}{"value": 200},
-		time.Unix(1, 0).UTC(),
-	)}); err != nil {
-		t.Fatalf(err.Error())
-	}
-
-	// Write tagsets "x", y" and "z" to second shard.
-	if err := store.WriteToShard(sID1, []models.Point{models.MustNewPoint(
-		"cpu",
-		map[string]string{"host": "x"},
-		map[string]interface{}{"value": 300},
-		time.Unix(2, 0).UTC(),
-	)}); err != nil {
-		t.Fatalf(err.Error())
-	}
-	if err := store.WriteToShard(sID1, []models.Point{models.MustNewPoint(
-		"cpu",
-		map[string]string{"host": "y"},
-		map[string]interface{}{"value": 400},
-		time.Unix(3, 0).UTC(),
-	)}); err != nil {
-		t.Fatalf(err.Error())
-	}
-	if err := store.WriteToShard(sID1, []models.Point{models.MustNewPoint(
-		"cpu",
-		map[string]string{"host": "z"},
-		map[string]interface{}{"value": 500},
-		time.Unix(3, 0).UTC(),
-	)}); err != nil {
-		t.Fatalf(err.Error())
-	}
-
-	var tests = []struct {
-		skip      bool   // Skip test
-		stmt      string // Query statement
-		chunkSize int    // Chunk size for driving the executor
-		expected  string // Expected results, rendered as a string
-	}{
-		{
-			stmt:     `SELECT sum(value) FROM cpu GROUP BY host`,
-			expected: `[{"name":"cpu","tags":{"host":"x"},"columns":["time","sum"],"values":[["1970-01-01T00:00:00Z",300]]},{"name":"cpu","tags":{"host":"y"},"columns":["time","sum"],"values":[["1970-01-01T00:00:00Z",500]]},{"name":"cpu","tags":{"host":"z"},"columns":["time","sum"],"values":[["1970-01-01T00:00:00Z",700]]}]`,
-		},
-		{
-			stmt:     `SELECT value FROM cpu GROUP BY host`,
-			expected: `[{"name":"cpu","tags":{"host":"x"},"columns":["time","value"],"values":[["1970-01-01T00:00:02Z",300]]},{"name":"cpu","tags":{"host":"y"},"columns":["time","value"],"values":[["1970-01-01T00:00:01Z",100],["1970-01-01T00:00:03Z",400]]},{"name":"cpu","tags":{"host":"z"},"columns":["time","value"],"values":[["1970-01-01T00:00:01Z",200],["1970-01-01T00:00:03Z",500]]}]`,
-		},
-	}
-
-	for _, tt := range tests {
-		if tt.skip {
-			t.Logf("Skipping test %s", tt.stmt)
-			continue
-		}
-		executor, err := query_executor.PlanSelect(mustParseSelectStatement(tt.stmt), tt.chunkSize)
-		if err != nil {
-			t.Fatalf("failed to plan query: %s", err.Error())
-		}
-		got := executeAndGetResults(executor)
-		if got != tt.expected {
-			t.Fatalf("Test %s\nexp: %s\ngot: %s\n", tt.stmt, tt.expected, got)
-		}
-	}
-}
-
-// Test to ensure the engine handles measurements across stores.
-func TestShowMeasurementsMultipleShards(t *testing.T) {
-	// Create two distinct stores, ensuring shard mappers will share nothing.
-	store0 := testStore()
-	defer os.RemoveAll(store0.Path())
-	store1 := testStore()
-	defer os.RemoveAll(store1.Path())
-
-	// Create a shard in each store.
-	database := "foo"
-	retentionPolicy := "bar"
-	store0.CreateShard(database, retentionPolicy, sID0)
-	store1.CreateShard(database, retentionPolicy, sID1)
-
-	// Write two points across shards.
-	pt1time := time.Unix(1, 0).UTC()
-	if err := store0.WriteToShard(sID0, []models.Point{
-		models.MustNewPoint(
-			"cpu_user",
-			map[string]string{"host": "serverA", "region": "east", "cpuid": "cpu0"},
-			map[string]interface{}{"value1": 100},
-			pt1time,
-		),
-		models.MustNewPoint(
-			"mem_free",
-			map[string]string{"host": "serverA", "region": "east"},
-			map[string]interface{}{"value2": 200},
-			pt1time,
-		),
-	}); err != nil {
-		t.Fatalf(err.Error())
-	}
-	pt2time := time.Unix(2, 0).UTC()
-	if err := store1.WriteToShard(sID1, []models.Point{models.MustNewPoint(
-		"mem_used",
-		map[string]string{"host": "serverB", "region": "west"},
-		map[string]interface{}{"value3": 300},
-		pt2time,
-	),
-		models.MustNewPoint(
-			"cpu_sys",
-			map[string]string{"host": "serverB", "region": "west", "cpuid": "cpu0"},
-			map[string]interface{}{"value4": 400},
-			pt2time,
-		),
-	}); err != nil {
-		t.Fatalf(err.Error())
-	}
-	var tests = []struct {
-		skip      bool   // Skip test
-		stmt      string // Query statement
-		chunkSize int    // Chunk size for driving the executor
-		expected  string // Expected results, rendered as a string
-	}{
-		{
-			stmt:     `SHOW MEASUREMENTS`,
-			expected: `[{"name":"measurements","columns":["name"],"values":[["cpu_sys"],["cpu_user"],["mem_free"],["mem_used"]]}]`,
-		},
-		{
-			stmt:     `SHOW MEASUREMENTS WHERE host='serverB'`,
-			expected: `[{"name":"measurements","columns":["name"],"values":[["cpu_sys"],["mem_used"]]}]`,
-		},
-		{
-			stmt:     `SHOW MEASUREMENTS WHERE cpuid != '' AND region != ''`,
-			expected: `[{"name":"measurements","columns":["name"],"values":[["cpu_sys"],["cpu_user"]]}]`,
-		},
-		{
-			stmt:     `SHOW MEASUREMENTS WHERE host='serverX'`,
-			expected: `null`,
-		},
-	}
-	for _, tt := range tests {
-		if tt.skip {
-			t.Logf("Skipping test %s", tt.stmt)
-			continue
-		}
-
-		parsedStmt := mustParseStatement(tt.stmt).(*influxql.ShowMeasurementsStatement)
-
-		// Create Mappers and Executor.
-		mapper0, err := store0.CreateMapper(sID0, parsedStmt, tt.chunkSize)
-		if err != nil {
-			t.Fatalf("failed to create mapper0: %s", err.Error())
-		}
-		mapper1, err := store1.CreateMapper(sID1, parsedStmt, tt.chunkSize)
-		if err != nil {
-			t.Fatalf("failed to create mapper1: %s", err.Error())
-		}
-		executor := tsdb.NewShowMeasurementsExecutor(parsedStmt, []tsdb.Mapper{mapper0, mapper1}, tt.chunkSize)
-
-		// Check the results.
-		got := executeAndGetResults(executor)
-		if got != tt.expected {
-			t.Fatalf("Test %s\nexp: %s\ngot: %s\n", tt.stmt, tt.expected, got)
-		}
-
-	}
-}
-
-// Test to ensure the engine handles tag keys across stores.
-func TestShowShowTagKeysMultipleShards(t *testing.T) {
-	// Create two distinct stores, ensuring shard mappers will share nothing.
-	store0 := testStore()
-	defer os.RemoveAll(store0.Path())
-	store1 := testStore()
-	defer os.RemoveAll(store1.Path())
-
-	// Create a shard in each store.
-	database := "foo"
-	retentionPolicy := "bar"
-	store0.CreateShard(database, retentionPolicy, sID0)
-	store1.CreateShard(database, retentionPolicy, sID1)
-
-	// Write two points across shards.
-	pt1time := time.Unix(1, 0).UTC()
-	if err := store0.WriteToShard(sID0, []models.Point{
-		models.MustNewPoint(
-			"cpu",
-			map[string]string{"host": "serverA", "region": "uswest"},
-			map[string]interface{}{"value1": 100},
-			pt1time,
-		),
-		models.MustNewPoint(
-			"cpu",
-			map[string]string{"host": "serverB", "region": "useast"},
-			map[string]interface{}{"value1": 100},
-			pt1time,
-		),
-	}); err != nil {
-		t.Fatalf(err.Error())
-	}
-	pt2time := time.Unix(2, 0).UTC()
-	if err := store1.WriteToShard(sID1, []models.Point{
-		models.MustNewPoint(
-			"cpu",
-			map[string]string{"host": "serverB", "region": "useast", "rack": "12"},
-			map[string]interface{}{"value1": 100},
-			pt1time,
-		),
-		models.MustNewPoint(
-			"mem",
-			map[string]string{"host": "serverB"},
-			map[string]interface{}{"value2": 200},
-			pt2time,
-		)}); err != nil {
-		t.Fatalf(err.Error())
-	}
-	var tests = []struct {
-		skip      bool   // Skip test
-		stmt      string // Query statement
-		chunkSize int    // Chunk size for driving the executor
-		expected  string // Expected results, rendered as a string
-	}{
-		{
-			stmt:     `SHOW TAG KEYS`,
-			expected: `[{"name":"cpu","columns":["tagKey"],"values":[["host"],["rack"],["region"]]},{"name":"mem","columns":["tagKey"],"values":[["host"]]}]`,
-		},
-		{
-			stmt:     `SHOW TAG KEYS SLIMIT 1`,
-			expected: `[{"name":"cpu","columns":["tagKey"],"values":[["host"],["rack"],["region"]]}]`,
-		},
-		{
-			stmt:     `SHOW TAG KEYS SLIMIT 1 SOFFSET 1`,
-			expected: `[{"name":"mem","columns":["tagKey"],"values":[["host"]]}]`,
-		},
-		{
-			stmt:     `SHOW TAG KEYS SOFFSET 1`,
-			expected: `[{"name":"mem","columns":["tagKey"],"values":[["host"]]}]`,
-		},
-		{
-			stmt:     `SHOW TAG KEYS LIMIT 1`,
-			expected: `[{"name":"cpu","columns":["tagKey"],"values":[["host"]]},{"name":"mem","columns":["tagKey"],"values":[["host"]]}]`,
-		},
-		{
-			stmt:     `SHOW TAG KEYS LIMIT 1 OFFSET 1`,
-			expected: `[{"name":"cpu","columns":["tagKey"],"values":[["rack"]]},{"name":"mem","columns":["tagKey"]}]`,
-		},
-		{
-			stmt:     `SHOW TAG KEYS OFFSET 1`,
-			expected: `[{"name":"cpu","columns":["tagKey"],"values":[["rack"],["region"]]},{"name":"mem","columns":["tagKey"]}]`,
-		},
-		{
-			stmt:     `SHOW TAG KEYS FROM cpu`,
-			expected: `[{"name":"cpu","columns":["tagKey"],"values":[["host"],["rack"],["region"]]}]`,
-		},
-		{
-			stmt:     `SHOW TAG KEYS FROM cpu WHERE region = 'uswest'`,
-			expected: `[{"name":"cpu","columns":["tagKey"],"values":[["host"],["region"]]}]`,
-		},
-		{
-			stmt:     `SHOW TAG KEYS FROM doesntexist`,
-			expected: `null`,
-		},
-		{
-			stmt:     `SHOW TAG KEYS FROM cpu WHERE region = 'doesntexist'`,
-			expected: `null`,
-		},
-	}
-	for _, tt := range tests {
-		if tt.skip {
-			t.Logf("Skipping test %s", tt.stmt)
-			continue
-		}
-
-		parsedStmt := mustParseStatement(tt.stmt).(*influxql.ShowTagKeysStatement)
-
-		// Create Mappers and Executor.
-		mapper0, err := store0.CreateMapper(sID0, parsedStmt, tt.chunkSize)
-		if err != nil {
-			t.Fatalf("failed to create mapper0: %s", err.Error())
-		}
-		mapper1, err := store1.CreateMapper(sID1, parsedStmt, tt.chunkSize)
-		if err != nil {
-			t.Fatalf("failed to create mapper1: %s", err.Error())
-		}
-		executor := tsdb.NewShowTagKeysExecutor(parsedStmt, []tsdb.Mapper{mapper0, mapper1}, tt.chunkSize)
-
-		// Check the results.
-		got := executeAndGetResults(executor)
-		if got != tt.expected {
-			t.Fatalf("Test %s\nexp: %s\ngot: %s\n", tt.stmt, tt.expected, got)
-		}
-
-	}
-}
-
-func TestProcessAggregateDerivative_Empty(t *testing.T) {
-	results := tsdb.ProcessAggregateDerivative([][]interface{}{}, false, 24*time.Hour)
-	if !reflect.DeepEqual(results, [][]interface{}{}) {
-		t.Fatalf("unexpected results: %s", spew.Sdump(results))
-	}
-}
-
-func TestProcessAggregateDerivative_SingleRow(t *testing.T) {
-	results := tsdb.ProcessAggregateDerivative([][]interface{}{
-		[]interface{}{time.Unix(0, 0), 1.0},
-	}, false, 24*time.Hour)
-
-	if !reflect.DeepEqual(results, [][]interface{}{
-		[]interface{}{time.Unix(0, 0), 0.0},
-	}) {
-		t.Fatalf("unexpected results: %s", spew.Sdump(results))
-	}
-}
-
-func TestProcessAggregateDerivative_Basic_24h(t *testing.T) {
-	results := tsdb.ProcessAggregateDerivative([][]interface{}{
-		[]interface{}{time.Unix(0, 0), 1.0},
-		[]interface{}{time.Unix(0, 0).Add(24 * time.Hour), 3.0},
-		[]interface{}{time.Unix(0, 0).Add(48 * time.Hour), 5.0},
-		[]interface{}{time.Unix(0, 0).Add(72 * time.Hour), 9.0},
-	}, false, 24*time.Hour)
-
-	if !reflect.DeepEqual(results, [][]interface{}{
-		[]interface{}{time.Unix(0, 0).Add(24 * time.Hour), 2.0},
-		[]interface{}{time.Unix(0, 0).Add(48 * time.Hour), 2.0},
-		[]interface{}{time.Unix(0, 0).Add(72 * time.Hour), 4.0},
-	}) {
-		t.Fatalf("unexpected results: %s", spew.Sdump(results))
-	}
-}
-
-func TestProcessAggregateDerivative_Basic_12h(t *testing.T) {
-	results := tsdb.ProcessAggregateDerivative([][]interface{}{
-		[]interface{}{time.Unix(0, 0), 1.0},
-		[]interface{}{time.Unix(0, 0).Add(24 * time.Hour), 2.0},
-		[]interface{}{time.Unix(0, 0).Add(48 * time.Hour), 3.0},
-		[]interface{}{time.Unix(0, 0).Add(72 * time.Hour), 4.0},
-	}, false, 12*time.Hour)
-
-	if !reflect.DeepEqual(results, [][]interface{}{
-		[]interface{}{time.Unix(0, 0).Add(24 * time.Hour), 0.5},
-		[]interface{}{time.Unix(0, 0).Add(48 * time.Hour), 0.5},
-		[]interface{}{time.Unix(0, 0).Add(72 * time.Hour), 0.5},
-	}) {
-		t.Fatalf("unexpected results: %s", spew.Sdump(results))
-	}
-}
-
-func TestProcessAggregateDerivative_Negative(t *testing.T) {
-	results := tsdb.ProcessAggregateDerivative([][]interface{}{
-		[]interface{}{time.Unix(0, 0), 1.0},
-		[]interface{}{time.Unix(0, 0).Add(24 * time.Hour), 2.0},
-		[]interface{}{time.Unix(0, 0).Add(48 * time.Hour), 0.0},
-		[]interface{}{time.Unix(0, 0).Add(72 * time.Hour), 4.0},
-	}, false, 24*time.Hour)
-
-	if !reflect.DeepEqual(results, [][]interface{}{
-		[]interface{}{time.Unix(0, 0).Add(24 * time.Hour), 1.0},
-		[]interface{}{time.Unix(0, 0).Add(48 * time.Hour), -2.0},
-		[]interface{}{time.Unix(0, 0).Add(72 * time.Hour), 4.0},
-	}) {
-		t.Fatalf("unexpected results: %s", spew.Sdump(results))
-	}
-}
-
-func TestProcessAggregateDerivative_Negative_NonNegative(t *testing.T) {
-	results := tsdb.ProcessAggregateDerivative([][]interface{}{
-		[]interface{}{time.Unix(0, 0), 1.0},
-		[]interface{}{time.Unix(0, 0).Add(24 * time.Hour), 2.0},
-		[]interface{}{time.Unix(0, 0).Add(48 * time.Hour), 0.0},
-		[]interface{}{time.Unix(0, 0).Add(72 * time.Hour), 4.0},
-	}, true, 24*time.Hour)
-
-	if !reflect.DeepEqual(results, [][]interface{}{
-		[]interface{}{time.Unix(0, 0).Add(24 * time.Hour), 1.0},
-		[]interface{}{time.Unix(0, 0).Add(72 * time.Hour), 4.0},
-	}) {
-		t.Fatalf("unexpected results: %s", spew.Sdump(results))
-	}
-}
-
-func TestProcessAggregateDerivative_Integer(t *testing.T) {
-	results := tsdb.ProcessAggregateDerivative([][]interface{}{
-		[]interface{}{time.Unix(0, 0), 1.0},
-		[]interface{}{time.Unix(0, 0).Add(24 * time.Hour), int64(3)},
-		[]interface{}{time.Unix(0, 0).Add(48 * time.Hour), int64(5)},
-		[]interface{}{time.Unix(0, 0).Add(72 * time.Hour), int64(9)},
-	}, false, 24*time.Hour)
-
-	if !reflect.DeepEqual(results, [][]interface{}{
-		[]interface{}{time.Unix(0, 0).Add(24 * time.Hour), 2.0},
-		[]interface{}{time.Unix(0, 0).Add(48 * time.Hour), 2.0},
-		[]interface{}{time.Unix(0, 0).Add(72 * time.Hour), 4.0},
-	}) {
-		t.Fatalf("unexpected results: %s", spew.Sdump(results))
-	}
-}
-
-func TestProcessAggregateDerivative_String(t *testing.T) {
-	results := tsdb.ProcessAggregateDerivative([][]interface{}{
-		[]interface{}{time.Unix(0, 0), "1.0"},
-		[]interface{}{time.Unix(0, 0).Add(24 * time.Hour), "2.0"},
-		[]interface{}{time.Unix(0, 0).Add(48 * time.Hour), "3.0"},
-		[]interface{}{time.Unix(0, 0).Add(72 * time.Hour), "4.0"},
-	}, false, 24*time.Hour)
-
-	if !reflect.DeepEqual(results, [][]interface{}{
-		[]interface{}{time.Unix(0, 0).Add(24 * time.Hour), nil},
-		[]interface{}{time.Unix(0, 0).Add(48 * time.Hour), nil},
-		[]interface{}{time.Unix(0, 0).Add(72 * time.Hour), nil},
-	}) {
-		t.Fatalf("unexpected results: %s", spew.Sdump(results))
-	}
-}
-
-func TestProcessAggregateDerivative_Bool(t *testing.T) {
-	results := tsdb.ProcessAggregateDerivative([][]interface{}{
-		[]interface{}{time.Unix(0, 0), "1.0"},
-		[]interface{}{time.Unix(0, 0).Add(24 * time.Hour), true},
-		[]interface{}{time.Unix(0, 0).Add(48 * time.Hour), true},
-		[]interface{}{time.Unix(0, 0).Add(72 * time.Hour), true},
-	}, false, 24*time.Hour)
-
-	if !reflect.DeepEqual(results, [][]interface{}{
-		[]interface{}{time.Unix(0, 0).Add(24 * time.Hour), nil},
-		[]interface{}{time.Unix(0, 0).Add(48 * time.Hour), nil},
-		[]interface{}{time.Unix(0, 0).Add(72 * time.Hour), nil},
-	}) {
-		t.Fatalf("unexpected results: %s", spew.Sdump(results))
-	}
-}
-
-func TestRawQueryDerivative_Process_Empty(t *testing.T) {
-	p := tsdb.RawQueryDerivativeProcessor{
-		IsNonNegative:      false,
-		DerivativeInterval: 24 * time.Hour,
-	}
-
-	results := p.Process([]*tsdb.MapperValue{})
-	if !reflect.DeepEqual(results, []*tsdb.MapperValue{}) {
-		t.Fatalf("unexpected results: %s", spew.Sdump(results))
-	}
-}
-
-func TestRawQueryDerivative_Process_Single(t *testing.T) {
-	p := tsdb.RawQueryDerivativeProcessor{
-		IsNonNegative:      false,
-		DerivativeInterval: 24 * time.Hour,
-	}
-
-	results := p.Process([]*tsdb.MapperValue{
-		{Time: time.Unix(0, 0).Unix(), Value: 1.0},
-	})
-	if !reflect.DeepEqual(results, []*tsdb.MapperValue{
-		{Time: time.Unix(0, 0).Unix(), Value: 0.0},
-	}) {
-		t.Fatalf("unexpected results: %s", spew.Sdump(results))
-	}
-}
-
-func TestRawQueryDerivative_Process_Basic_24h(t *testing.T) {
-	p := tsdb.RawQueryDerivativeProcessor{
-		IsNonNegative:      false,
-		DerivativeInterval: 24 * time.Hour,
-	}
-
-	results := p.Process([]*tsdb.MapperValue{
-		{Time: time.Unix(0, 0).Unix(), Value: 0.0},
-		{Time: time.Unix(0, 0).Add(24 * time.Hour).UnixNano(), Value: 3.0},
-		{Time: time.Unix(0, 0).Add(48 * time.Hour).UnixNano(), Value: 5.0},
-		{Time: time.Unix(0, 0).Add(72 * time.Hour).UnixNano(), Value: 9.0},
-	})
-	if !reflect.DeepEqual(results, []*tsdb.MapperValue{
-		{Time: time.Unix(0, 0).Add(24 * time.Hour).UnixNano(), Value: 3.0},
-		{Time: time.Unix(0, 0).Add(48 * time.Hour).UnixNano(), Value: 2.0},
-		{Time: time.Unix(0, 0).Add(72 * time.Hour).UnixNano(), Value: 4.0},
-	}) {
-		t.Fatalf("unexpected results: %s", spew.Sdump(results))
-	}
-}
-
-func TestRawQueryDerivative_Process_Basic_12h(t *testing.T) {
-	p := tsdb.RawQueryDerivativeProcessor{
-		IsNonNegative:      false,
-		DerivativeInterval: 12 * time.Hour,
-	}
-
-	results := p.Process([]*tsdb.MapperValue{
-		{Time: time.Unix(0, 0).UnixNano(), Value: 1.0},
-		{Time: time.Unix(0, 0).Add(24 * time.Hour).UnixNano(), Value: 2.0},
-		{Time: time.Unix(0, 0).Add(48 * time.Hour).UnixNano(), Value: 3.0},
-		{Time: time.Unix(0, 0).Add(72 * time.Hour).UnixNano(), Value: 4.0},
-	})
-	if !reflect.DeepEqual(results, []*tsdb.MapperValue{
-		{Time: time.Unix(0, 0).Add(24 * time.Hour).UnixNano(), Value: 0.5},
-		{Time: time.Unix(0, 0).Add(48 * time.Hour).UnixNano(), Value: 0.5},
-		{Time: time.Unix(0, 0).Add(72 * time.Hour).UnixNano(), Value: 0.5},
-	}) {
-		t.Fatalf("unexpected results: %s", spew.Sdump(results))
-	}
-}
-
-func TestRawQueryDerivative_Process_Integer(t *testing.T) {
-	p := tsdb.RawQueryDerivativeProcessor{
-		IsNonNegative:      false,
-		DerivativeInterval: 24 * time.Hour,
-	}
-
-	results := p.Process([]*tsdb.MapperValue{
-		{Time: time.Unix(0, 0).Unix(), Value: int64(0)},
-		{Time: time.Unix(0, 0).Add(24 * time.Hour).UnixNano(), Value: int64(3)},
-		{Time: time.Unix(0, 0).Add(48 * time.Hour).UnixNano(), Value: int64(5)},
-		{Time: time.Unix(0, 0).Add(72 * time.Hour).UnixNano(), Value: int64(9)},
-	})
-	if !reflect.DeepEqual(results, []*tsdb.MapperValue{
-		{Time: time.Unix(0, 0).Add(24 * time.Hour).UnixNano(), Value: 3.0},
-		{Time: time.Unix(0, 0).Add(48 * time.Hour).UnixNano(), Value: 2.0},
-		{Time: time.Unix(0, 0).Add(72 * time.Hour).UnixNano(), Value: 4.0},
-	}) {
-		t.Fatalf("unexpected results: %s", spew.Sdump(results))
-	}
-}
-
-func TestRawQueryDerivative_Process_Negative(t *testing.T) {
-	p := tsdb.RawQueryDerivativeProcessor{
-		IsNonNegative:      false,
-		DerivativeInterval: 24 * time.Hour,
-	}
-
-	results := p.Process([]*tsdb.MapperValue{
-		{Time: time.Unix(0, 0).Unix(), Value: 1.0},
-		{Time: time.Unix(0, 0).Add(24 * time.Hour).UnixNano(), Value: 2.0},
-		{Time: time.Unix(0, 0).Add(48 * time.Hour).UnixNano(), Value: 0.0},
-		{Time: time.Unix(0, 0).Add(72 * time.Hour).UnixNano(), Value: 4.0},
-	})
-	if !reflect.DeepEqual(results, []*tsdb.MapperValue{
-		{Time: time.Unix(0, 0).Add(24 * time.Hour).UnixNano(), Value: 1.0},
-		{Time: time.Unix(0, 0).Add(48 * time.Hour).UnixNano(), Value: -2.0},
-		{Time: time.Unix(0, 0).Add(72 * time.Hour).UnixNano(), Value: 4.0},
-	}) {
-		t.Fatalf("unexpected results: %s", spew.Sdump(results))
-	}
-}
-
-func TestRawQueryDerivative_Process_Negative_NonNegative(t *testing.T) {
-	p := tsdb.RawQueryDerivativeProcessor{
-		IsNonNegative:      true,
-		DerivativeInterval: 24 * time.Hour,
-	}
-
-	results := p.Process([]*tsdb.MapperValue{
-		{Time: time.Unix(0, 0).Unix(), Value: 1.0},
-		{Time: time.Unix(0, 0).Add(24 * time.Hour).UnixNano(), Value: 2.0},
-		{Time: time.Unix(0, 0).Add(48 * time.Hour).UnixNano(), Value: 0.0},
-		{Time: time.Unix(0, 0).Add(72 * time.Hour).UnixNano(), Value: 4.0},
-	})
-	if !reflect.DeepEqual(results, []*tsdb.MapperValue{
-		{Time: time.Unix(0, 0).Add(24 * time.Hour).UnixNano(), Value: 1.0},
-		{Time: time.Unix(0, 0).Add(72 * time.Hour).UnixNano(), Value: 4.0},
-	}) {
-		t.Fatalf("unexpected results: %s", spew.Sdump(results))
-	}
-}
-
-func TestRawQueryDerivative_Process_String(t *testing.T) {
-	p := tsdb.RawQueryDerivativeProcessor{
-		IsNonNegative:      false,
-		DerivativeInterval: 24 * time.Hour,
-	}
-
-	results := p.Process([]*tsdb.MapperValue{
-		{Time: time.Unix(0, 0).Unix(), Value: "1.0"},
-		{Time: time.Unix(0, 0).Add(24 * time.Hour).UnixNano(), Value: "2.0"},
-		{Time: time.Unix(0, 0).Add(48 * time.Hour).UnixNano(), Value: "3.0"},
-		{Time: time.Unix(0, 0).Add(72 * time.Hour).UnixNano(), Value: "4.0"},
-	})
-	if !reflect.DeepEqual(results, []*tsdb.MapperValue{
-		{Time: time.Unix(0, 0).Add(24 * time.Hour).UnixNano(), Value: nil},
-		{Time: time.Unix(0, 0).Add(48 * time.Hour).UnixNano(), Value: nil},
-		{Time: time.Unix(0, 0).Add(72 * time.Hour).UnixNano(), Value: nil},
-	}) {
-		t.Fatalf("unexpected results: %s", spew.Sdump(results))
-	}
-}
-
-func TestRawQueryDerivative_Process_Bool(t *testing.T) {
-	p := tsdb.RawQueryDerivativeProcessor{
-		IsNonNegative:      false,
-		DerivativeInterval: 24 * time.Hour,
-	}
-
-	results := p.Process([]*tsdb.MapperValue{
-		{Time: time.Unix(0, 0).Unix(), Value: true},
-		{Time: time.Unix(0, 0).Add(24 * time.Hour).UnixNano(), Value: true},
-		{Time: time.Unix(0, 0).Add(48 * time.Hour).UnixNano(), Value: false},
-		{Time: time.Unix(0, 0).Add(72 * time.Hour).UnixNano(), Value: false},
-	})
-	if !reflect.DeepEqual(results, []*tsdb.MapperValue{
-		{Time: time.Unix(0, 0).Add(24 * time.Hour).UnixNano(), Value: nil},
-		{Time: time.Unix(0, 0).Add(48 * time.Hour).UnixNano(), Value: nil},
-		{Time: time.Unix(0, 0).Add(72 * time.Hour).UnixNano(), Value: nil},
-	}) {
-		t.Fatalf("unexpected results: %s", spew.Sdump(results))
-	}
-}
-
-type testQEMetastore struct {
-	sgFunc func(database, policy string, min, max time.Time) (a []meta.ShardGroupInfo, err error)
-}
-
-func (t *testQEMetastore) ShardGroupsByTimeRange(database, policy string, min, max time.Time) (a []meta.ShardGroupInfo, err error) {
-	return t.sgFunc(database, policy, min, max)
-}
-
-func (t *testQEMetastore) Database(name string) (*meta.DatabaseInfo, error) { return nil, nil }
-func (t *testQEMetastore) Databases() ([]meta.DatabaseInfo, error)          { return nil, nil }
-func (t *testQEMetastore) User(name string) (*meta.UserInfo, error)         { return nil, nil }
-func (t *testQEMetastore) AdminUserExists() (bool, error)                   { return false, nil }
-func (t *testQEMetastore) Authenticate(username, password string) (*meta.UserInfo, error) {
-	return nil, nil
-}
-func (t *testQEMetastore) RetentionPolicy(database, name string) (rpi *meta.RetentionPolicyInfo, err error) {
-	return nil, nil
-}
-func (t *testQEMetastore) UserCount() (int, error) { return 0, nil }
-
-func (t *testQEMetastore) NodeID() uint64 { return nID }
-
-func testStore() *tsdb.Store {
-	path, _ := ioutil.TempDir("", "")
-
-	store := tsdb.NewStore(path)
-
-	store.EngineOptions.Config.WALDir = filepath.Join(path, "wal")
-	err := store.Open()
-	if err != nil {
-		panic(err)
-	}
-	return store
-}
-
-func testStoreAndQueryExecutor() (*tsdb.Store, *tsdb.QueryExecutor) {
-	store := testStore()
-	database := "foo"
-	retentionPolicy := "bar"
-	store.CreateShard(database, retentionPolicy, sID0)
-	store.CreateShard(database, retentionPolicy, sID1)
-
-	query_executor := tsdb.NewQueryExecutor(store)
-	query_executor.ShardMapper = &testQEShardMapper{store}
-
-	return store, query_executor
-}
-
-type testQEShardMapper struct {
-	store *tsdb.Store
-}
-
-func (t *testQEShardMapper) CreateMapper(shard meta.ShardInfo, stmt influxql.Statement, chunkSize int) (tsdb.Mapper, error) {
-	return t.store.CreateMapper(shard.ID, stmt, chunkSize)
-}
-
-func executeAndGetResults(executor tsdb.Executor) string {
-	ch := executor.Execute()
-
-	var rows []*models.Row
-	for r := range ch {
-		rows = append(rows, r)
-	}
-
-	b, err := json.Marshal(rows)
-	if err != nil {
-		panic(err)
-	}
-	return string(b)
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/shard.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/shard.go
deleted file mode 100644
index 37bdfad36..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/shard.go
+++ /dev/null
@@ -1,797 +0,0 @@
-package tsdb
-
-import (
-	"encoding/binary"
-	"encoding/json"
-	"errors"
-	"expvar"
-	"fmt"
-	"io"
-	"math"
-	"os"
-	"sync"
-
-	"github.com/influxdb/influxdb"
-	"github.com/influxdb/influxdb/influxql"
-	"github.com/influxdb/influxdb/models"
-	"github.com/influxdb/influxdb/tsdb/internal"
-
-	"github.com/gogo/protobuf/proto"
-)
-
-const (
-	statWriteReq        = "writeReq"
-	statSeriesCreate    = "seriesCreate"
-	statFieldsCreate    = "fieldsCreate"
-	statWritePointsFail = "writePointsFail"
-	statWritePointsOK   = "writePointsOk"
-	statWriteBytes      = "writeBytes"
-)
-
-var (
-	// ErrFieldOverflow is returned when too many fields are created on a measurement.
-	ErrFieldOverflow = errors.New("field overflow")
-
-	// ErrFieldTypeConflict is returned when a new field already exists with a different type.
-	ErrFieldTypeConflict = errors.New("field type conflict")
-
-	// ErrFieldNotFound is returned when a field cannot be found.
-	ErrFieldNotFound = errors.New("field not found")
-
-	// ErrFieldUnmappedID is returned when the system is presented, during decode, with a field ID
-	// there is no mapping for.
-	ErrFieldUnmappedID = errors.New("field ID not mapped")
-)
-
-// Shard represents a self-contained time series database. An inverted index of
-// the measurement and tag data is kept along with the raw time series data.
-// Data can be split across many shards. The query engine in TSDB is responsible
-// for combining the output of many shards into a single query result.
-type Shard struct {
-	index   *DatabaseIndex
-	path    string
-	walPath string
-	id      uint64
-
-	engine  Engine
-	options EngineOptions
-
-	mu                sync.RWMutex
-	measurementFields map[string]*MeasurementFields // measurement name to their fields
-
-	// expvar-based stats.
-	statMap *expvar.Map
-
-	// The writer used by the logger.
-	LogOutput io.Writer
-}
-
-// NewShard returns a new initialized Shard. walPath doesn't apply to the b1 type index
-func NewShard(id uint64, index *DatabaseIndex, path string, walPath string, options EngineOptions) *Shard {
-	// Configure statistics collection.
-	key := fmt.Sprintf("shard:%s:%d", path, id)
-	tags := map[string]string{"path": path, "id": fmt.Sprintf("%d", id), "engine": options.EngineVersion}
-	statMap := influxdb.NewStatistics(key, "shard", tags)
-
-	return &Shard{
-		index:             index,
-		path:              path,
-		walPath:           walPath,
-		id:                id,
-		options:           options,
-		measurementFields: make(map[string]*MeasurementFields),
-
-		statMap:   statMap,
-		LogOutput: os.Stderr,
-	}
-}
-
-// Path returns the path set on the shard when it was created.
-func (s *Shard) Path() string { return s.path }
-
-// PerformMaintenance gets called periodically to have the engine perform
-// any maintenance tasks like WAL flushing and compaction
-func (s *Shard) PerformMaintenance() {
-	s.engine.PerformMaintenance()
-}
-
-// open initializes and opens the shard's store.
-func (s *Shard) Open() error {
-	if err := func() error {
-		s.mu.Lock()
-		defer s.mu.Unlock()
-
-		s.index.mu.Lock()
-		defer s.index.mu.Unlock()
-
-		// Return if the shard is already open
-		if s.engine != nil {
-			return nil
-		}
-
-		// Initialize underlying engine.
-		e, err := NewEngine(s.path, s.walPath, s.options)
-		if err != nil {
-			return fmt.Errorf("new engine: %s", err)
-		}
-		s.engine = e
-
-		// Set log output on the engine.
-		s.engine.SetLogOutput(s.LogOutput)
-
-		// Open engine.
-		if err := s.engine.Open(); err != nil {
-			return fmt.Errorf("open engine: %s", err)
-		}
-
-		// Load metadata index.
-		if err := s.engine.LoadMetadataIndex(s, s.index, s.measurementFields); err != nil {
-			return fmt.Errorf("load metadata index: %s", err)
-		}
-
-		return nil
-	}(); err != nil {
-		s.close()
-		return err
-	}
-
-	return nil
-}
-
-// Close shuts down the shard's store.
-func (s *Shard) Close() error {
-	s.mu.Lock()
-	defer s.mu.Unlock()
-	return s.close()
-}
-
-func (s *Shard) close() error {
-	if s.engine != nil {
-		return s.engine.Close()
-	}
-	return nil
-}
-
-// DiskSize returns the size on disk of this shard
-func (s *Shard) DiskSize() (int64, error) {
-	s.mu.RLock()
-	defer s.mu.RUnlock()
-	stats, err := os.Stat(s.path)
-	var size int64
-	if err != nil {
-		return 0, err
-	}
-	size += stats.Size()
-	return size, nil
-}
-
-// ReadOnlyTx returns a read-only transaction for the shard.  The transaction must be rolled back to
-// release resources.
-func (s *Shard) ReadOnlyTx() (Tx, error) {
-	return s.engine.Begin(false)
-}
-
-// TODO: this is temporarily exported to make tx.go work. When the query engine gets refactored
-// into the tsdb package this should be removed. No one outside tsdb should know the underlying field encoding scheme.
-func (s *Shard) FieldCodec(measurementName string) *FieldCodec {
-	s.mu.RLock()
-	defer s.mu.RUnlock()
-	m := s.measurementFields[measurementName]
-	if m == nil {
-		return NewFieldCodec(nil)
-	}
-	return m.Codec
-}
-
-// struct to hold information for a field to create on a measurement
-type FieldCreate struct {
-	Measurement string
-	Field       *Field
-}
-
-// struct to hold information for a series to create
-type SeriesCreate struct {
-	Measurement string
-	Series      *Series
-}
-
-// WritePoints will write the raw data points and any new metadata to the index in the shard
-func (s *Shard) WritePoints(points []models.Point) error {
-	s.statMap.Add(statWriteReq, 1)
-
-	seriesToCreate, fieldsToCreate, seriesToAddShardTo, err := s.validateSeriesAndFields(points)
-	if err != nil {
-		return err
-	}
-	s.statMap.Add(statSeriesCreate, int64(len(seriesToCreate)))
-	s.statMap.Add(statFieldsCreate, int64(len(fieldsToCreate)))
-
-	// add any new series to the in-memory index
-	if len(seriesToCreate) > 0 {
-		s.index.mu.Lock()
-		for _, ss := range seriesToCreate {
-			s.index.CreateSeriesIndexIfNotExists(ss.Measurement, ss.Series)
-		}
-		s.index.mu.Unlock()
-	}
-
-	if len(seriesToAddShardTo) > 0 {
-		s.index.mu.Lock()
-		for _, k := range seriesToAddShardTo {
-			ss := s.index.series[k]
-			if ss != nil {
-				ss.shardIDs[s.id] = true
-			}
-		}
-		s.index.mu.Unlock()
-	}
-
-	// add any new fields and keep track of what needs to be saved
-	measurementFieldsToSave, err := s.createFieldsAndMeasurements(fieldsToCreate)
-	if err != nil {
-		return err
-	}
-
-	// make sure all data is encoded before attempting to save to bolt
-	// only required for the b1 and bz1 formats
-	if s.engine.Format() != TSM1Format {
-		for _, p := range points {
-			// Ignore if raw data has already been marshaled.
-			if p.Data() != nil {
-				continue
-			}
-
-			// This was populated earlier, don't need to validate that it's there.
-			s.mu.RLock()
-			mf := s.measurementFields[p.Name()]
-			s.mu.RUnlock()
-
-			// If a measurement is dropped while writes for it are in progress, this could be nil
-			if mf == nil {
-				return ErrFieldNotFound
-			}
-
-			data, err := mf.Codec.EncodeFields(p.Fields())
-			if err != nil {
-				return err
-			}
-			p.SetData(data)
-		}
-	}
-
-	// Write to the engine.
-	if err := s.engine.WritePoints(points, measurementFieldsToSave, seriesToCreate); err != nil {
-		s.statMap.Add(statWritePointsFail, 1)
-		return fmt.Errorf("engine: %s", err)
-	}
-	s.statMap.Add(statWritePointsOK, int64(len(points)))
-
-	return nil
-}
-
-func (s *Shard) ValidateAggregateFieldsInStatement(measurementName string, stmt *influxql.SelectStatement) error {
-	s.mu.RLock()
-	defer s.mu.RUnlock()
-
-	validateType := func(aname, fname string, t influxql.DataType) error {
-		if t != influxql.Float && t != influxql.Integer {
-			return fmt.Errorf("aggregate '%s' requires numerical field values. Field '%s' is of type %s",
-				aname, fname, t)
-		}
-		return nil
-	}
-
-	m := s.measurementFields[measurementName]
-	if m == nil {
-		return fmt.Errorf("measurement not found: %s", measurementName)
-	}
-
-	// If a numerical aggregate is requested, ensure it is only performed on numeric data or on a
-	// nested aggregate on numeric data.
-	for _, a := range stmt.FunctionCalls() {
-		// Check for fields like `derivative(mean(value), 1d)`
-		var nested *influxql.Call = a
-		if fn, ok := nested.Args[0].(*influxql.Call); ok {
-			nested = fn
-		}
-
-		switch lit := nested.Args[0].(type) {
-		case *influxql.VarRef:
-			if IsNumeric(nested) {
-				f := m.Fields[lit.Val]
-				if err := validateType(a.Name, f.Name, f.Type); err != nil {
-					return err
-				}
-			}
-		case *influxql.Distinct:
-			if nested.Name != "count" {
-				return fmt.Errorf("aggregate call didn't contain a field %s", a.String())
-			}
-			if IsNumeric(nested) {
-				f := m.Fields[lit.Val]
-				if err := validateType(a.Name, f.Name, f.Type); err != nil {
-					return err
-				}
-			}
-		default:
-			return fmt.Errorf("aggregate call didn't contain a field %s", a.String())
-		}
-	}
-
-	return nil
-}
-
-// DeleteSeries deletes a list of series.
-func (s *Shard) DeleteSeries(keys []string) error {
-	return s.engine.DeleteSeries(keys)
-}
-
-// DeleteMeasurement deletes a measurement and all underlying series.
-func (s *Shard) DeleteMeasurement(name string, seriesKeys []string) error {
-	s.mu.Lock()
-	defer s.mu.Unlock()
-
-	if err := s.engine.DeleteMeasurement(name, seriesKeys); err != nil {
-		return err
-	}
-
-	// Remove entry from shard index.
-	delete(s.measurementFields, name)
-
-	return nil
-}
-
-func (s *Shard) createFieldsAndMeasurements(fieldsToCreate []*FieldCreate) (map[string]*MeasurementFields, error) {
-	if len(fieldsToCreate) == 0 {
-		return nil, nil
-	}
-
-	s.index.mu.Lock()
-	s.mu.Lock()
-	defer s.index.mu.Unlock()
-	defer s.mu.Unlock()
-
-	// add fields
-	measurementsToSave := make(map[string]*MeasurementFields)
-	for _, f := range fieldsToCreate {
-
-		m := s.measurementFields[f.Measurement]
-		if m == nil {
-			m = measurementsToSave[f.Measurement]
-			if m == nil {
-				m = &MeasurementFields{Fields: make(map[string]*Field)}
-			}
-			s.measurementFields[f.Measurement] = m
-		}
-
-		measurementsToSave[f.Measurement] = m
-
-		// add the field to the in memory index
-		// only limit the field count for non-tsm eninges
-		limitFieldCount := s.engine.Format() == B1Format || s.engine.Format() == BZ1Format
-		if err := m.CreateFieldIfNotExists(f.Field.Name, f.Field.Type, limitFieldCount); err != nil {
-			return nil, err
-		}
-
-		// ensure the measurement is in the index and the field is there
-		measurement := s.index.CreateMeasurementIndexIfNotExists(f.Measurement)
-		measurement.fieldNames[f.Field.Name] = struct{}{}
-	}
-
-	return measurementsToSave, nil
-}
-
-// validateSeriesAndFields checks which series and fields are new and whose metadata should be saved and indexed
-func (s *Shard) validateSeriesAndFields(points []models.Point) ([]*SeriesCreate, []*FieldCreate, []string, error) {
-	var seriesToCreate []*SeriesCreate
-	var fieldsToCreate []*FieldCreate
-	var seriesToAddShardTo []string
-
-	// get the mutex for the in memory index, which is shared across shards
-	s.index.mu.RLock()
-	defer s.index.mu.RUnlock()
-
-	// get the shard mutex for locally defined fields
-	s.mu.RLock()
-	defer s.mu.RUnlock()
-
-	for _, p := range points {
-		// see if the series should be added to the index
-		if ss := s.index.series[string(p.Key())]; ss == nil {
-			series := NewSeries(string(p.Key()), p.Tags())
-			seriesToCreate = append(seriesToCreate, &SeriesCreate{p.Name(), series})
-			seriesToAddShardTo = append(seriesToAddShardTo, series.Key)
-		} else if !ss.shardIDs[s.id] {
-			// this is the first time this series is being written into this shard, persist it
-			seriesToCreate = append(seriesToCreate, &SeriesCreate{p.Name(), ss})
-			seriesToAddShardTo = append(seriesToAddShardTo, ss.Key)
-		}
-
-		// see if the field definitions need to be saved to the shard
-		mf := s.measurementFields[p.Name()]
-		if mf == nil {
-			for name, value := range p.Fields() {
-				fieldsToCreate = append(fieldsToCreate, &FieldCreate{p.Name(), &Field{Name: name, Type: influxql.InspectDataType(value)}})
-			}
-			continue // skip validation since all fields are new
-		}
-
-		// validate field types and encode data
-		for name, value := range p.Fields() {
-			if f := mf.Fields[name]; f != nil {
-				// Field present in shard metadata, make sure there is no type conflict.
-				if f.Type != influxql.InspectDataType(value) {
-					return nil, nil, nil, fmt.Errorf("field type conflict: input field \"%s\" on measurement \"%s\" is type %T, already exists as type %s", name, p.Name(), value, f.Type)
-				}
-
-				continue // Field is present, and it's of the same type. Nothing more to do.
-			}
-
-			fieldsToCreate = append(fieldsToCreate, &FieldCreate{p.Name(), &Field{Name: name, Type: influxql.InspectDataType(value)}})
-		}
-	}
-
-	return seriesToCreate, fieldsToCreate, seriesToAddShardTo, nil
-}
-
-// SeriesCount returns the number of series buckets on the shard.
-func (s *Shard) SeriesCount() (int, error) { return s.engine.SeriesCount() }
-
-// WriteTo writes the shard's data to w.
-func (s *Shard) WriteTo(w io.Writer) (int64, error) {
-	n, err := s.engine.WriteTo(w)
-	s.statMap.Add(statWriteBytes, int64(n))
-	return n, err
-}
-
-type MeasurementFields struct {
-	Fields map[string]*Field `json:"fields"`
-	Codec  *FieldCodec
-}
-
-// MarshalBinary encodes the object to a binary format.
-func (m *MeasurementFields) MarshalBinary() ([]byte, error) {
-	var pb internal.MeasurementFields
-	for _, f := range m.Fields {
-		id := int32(f.ID)
-		name := f.Name
-		t := int32(f.Type)
-		pb.Fields = append(pb.Fields, &internal.Field{ID: &id, Name: &name, Type: &t})
-	}
-	return proto.Marshal(&pb)
-}
-
-// UnmarshalBinary decodes the object from a binary format.
-func (m *MeasurementFields) UnmarshalBinary(buf []byte) error {
-	var pb internal.MeasurementFields
-	if err := proto.Unmarshal(buf, &pb); err != nil {
-		return err
-	}
-	m.Fields = make(map[string]*Field)
-	for _, f := range pb.Fields {
-		m.Fields[f.GetName()] = &Field{ID: uint8(f.GetID()), Name: f.GetName(), Type: influxql.DataType(f.GetType())}
-	}
-	return nil
-}
-
-// CreateFieldIfNotExists creates a new field with an autoincrementing ID.
-// Returns an error if 255 fields have already been created on the measurement or
-// the fields already exists with a different type.
-func (m *MeasurementFields) CreateFieldIfNotExists(name string, typ influxql.DataType, limitCount bool) error {
-	// Ignore if the field already exists.
-	if f := m.Fields[name]; f != nil {
-		if f.Type != typ {
-			return ErrFieldTypeConflict
-		}
-		return nil
-	}
-
-	// If we're supposed to limit the number of fields, only 255 are allowed. If we go over that then return an error.
-	if len(m.Fields)+1 > math.MaxUint8 && limitCount {
-		return ErrFieldOverflow
-	}
-
-	// Create and append a new field.
-	f := &Field{
-		ID:   uint8(len(m.Fields) + 1),
-		Name: name,
-		Type: typ,
-	}
-	m.Fields[name] = f
-	m.Codec = NewFieldCodec(m.Fields)
-
-	return nil
-}
-
-// Field represents a series field.
-type Field struct {
-	ID   uint8             `json:"id,omitempty"`
-	Name string            `json:"name,omitempty"`
-	Type influxql.DataType `json:"type,omitempty"`
-}
-
-// FieldCodec provides encoding and decoding functionality for the fields of a given
-// Measurement. It is a distinct type to avoid locking writes on this node while
-// potentially long-running queries are executing.
-//
-// It is not affected by changes to the Measurement object after codec creation.
-// TODO: this shouldn't be exported. nothing outside the shard should know about field encodings.
-//       However, this is here until tx.go and the engine get refactored into tsdb.
-type FieldCodec struct {
-	fieldsByID   map[uint8]*Field
-	fieldsByName map[string]*Field
-}
-
-// NewFieldCodec returns a FieldCodec for the given Measurement. Must be called with
-// a RLock that protects the Measurement.
-func NewFieldCodec(fields map[string]*Field) *FieldCodec {
-	fieldsByID := make(map[uint8]*Field, len(fields))
-	fieldsByName := make(map[string]*Field, len(fields))
-	for _, f := range fields {
-		fieldsByID[f.ID] = f
-		fieldsByName[f.Name] = f
-	}
-	return &FieldCodec{fieldsByID: fieldsByID, fieldsByName: fieldsByName}
-}
-
-// EncodeFields converts a map of values with string keys to a byte slice of field
-// IDs and values.
-//
-// If a field exists in the codec, but its type is different, an error is returned. If
-// a field is not present in the codec, the system panics.
-func (f *FieldCodec) EncodeFields(values map[string]interface{}) ([]byte, error) {
-	// Allocate byte slice
-	b := make([]byte, 0, 10)
-
-	for k, v := range values {
-		field := f.fieldsByName[k]
-		if field == nil {
-			panic(fmt.Sprintf("field does not exist for %s", k))
-		} else if influxql.InspectDataType(v) != field.Type {
-			return nil, fmt.Errorf("field \"%s\" is type %T, mapped as type %s", k, v, field.Type)
-		}
-
-		var buf []byte
-
-		switch field.Type {
-		case influxql.Float:
-			value := v.(float64)
-			buf = make([]byte, 9)
-			binary.BigEndian.PutUint64(buf[1:9], math.Float64bits(value))
-		case influxql.Integer:
-			var value uint64
-			switch v.(type) {
-			case int:
-				value = uint64(v.(int))
-			case int32:
-				value = uint64(v.(int32))
-			case int64:
-				value = uint64(v.(int64))
-			default:
-				panic(fmt.Sprintf("invalid integer type: %T", v))
-			}
-			buf = make([]byte, 9)
-			binary.BigEndian.PutUint64(buf[1:9], value)
-		case influxql.Boolean:
-			value := v.(bool)
-
-			// Only 1 byte need for a boolean.
-			buf = make([]byte, 2)
-			if value {
-				buf[1] = byte(1)
-			}
-		case influxql.String:
-			value := v.(string)
-			if len(value) > maxStringLength {
-				value = value[:maxStringLength]
-			}
-			// Make a buffer for field ID (1 bytes), the string length (2 bytes), and the string.
-			buf = make([]byte, len(value)+3)
-
-			// Set the string length, then copy the string itself.
-			binary.BigEndian.PutUint16(buf[1:3], uint16(len(value)))
-			for i, c := range []byte(value) {
-				buf[i+3] = byte(c)
-			}
-		default:
-			panic(fmt.Sprintf("unsupported value type during encode fields: %T", v))
-		}
-
-		// Always set the field ID as the leading byte.
-		buf[0] = field.ID
-
-		// Append temp buffer to the end.
-		b = append(b, buf...)
-	}
-
-	return b, nil
-}
-
-// TODO: this shouldn't be exported. remove when tx.go and engine.go get refactored into tsdb
-func (f *FieldCodec) FieldIDByName(s string) (uint8, error) {
-	fi := f.fieldsByName[s]
-	if fi == nil {
-		return 0, ErrFieldNotFound
-	}
-	return fi.ID, nil
-}
-
-// DecodeFields decodes a byte slice into a set of field ids and values.
-func (f *FieldCodec) DecodeFields(b []byte) (map[uint8]interface{}, error) {
-	if len(b) == 0 {
-		return nil, nil
-	}
-
-	// Create a map to hold the decoded data.
-	values := make(map[uint8]interface{}, 0)
-
-	for {
-		if len(b) < 1 {
-			// No more bytes.
-			break
-		}
-
-		// First byte is the field identifier.
-		fieldID := b[0]
-		field := f.fieldsByID[fieldID]
-		if field == nil {
-			// See note in DecodeByID() regarding field-mapping failures.
-			return nil, ErrFieldUnmappedID
-		}
-
-		var value interface{}
-		switch field.Type {
-		case influxql.Float:
-			value = math.Float64frombits(binary.BigEndian.Uint64(b[1:9]))
-			// Move bytes forward.
-			b = b[9:]
-		case influxql.Integer:
-			value = int64(binary.BigEndian.Uint64(b[1:9]))
-			// Move bytes forward.
-			b = b[9:]
-		case influxql.Boolean:
-			if b[1] == 1 {
-				value = true
-			} else {
-				value = false
-			}
-			// Move bytes forward.
-			b = b[2:]
-		case influxql.String:
-			size := binary.BigEndian.Uint16(b[1:3])
-			value = string(b[3 : size+3])
-			// Move bytes forward.
-			b = b[size+3:]
-		default:
-			panic(fmt.Sprintf("unsupported value type during decode fields: %T", f.fieldsByID[fieldID]))
-		}
-
-		values[fieldID] = value
-
-	}
-
-	return values, nil
-}
-
-// DecodeFieldsWithNames decodes a byte slice into a set of field names and values
-// TODO: shouldn't be exported. refactor engine
-func (f *FieldCodec) DecodeFieldsWithNames(b []byte) (map[string]interface{}, error) {
-	fields, err := f.DecodeFields(b)
-	if err != nil {
-		return nil, err
-	}
-	m := make(map[string]interface{})
-	for id, v := range fields {
-		field := f.fieldsByID[id]
-		if field != nil {
-			m[field.Name] = v
-		}
-	}
-	return m, nil
-}
-
-// DecodeByID scans a byte slice for a field with the given ID, converts it to its
-// expected type, and return that value.
-// TODO: shouldn't be exported. refactor engine
-func (f *FieldCodec) DecodeByID(targetID uint8, b []byte) (interface{}, error) {
-	if len(b) == 0 {
-		return 0, ErrFieldNotFound
-	}
-
-	for {
-		if len(b) < 1 {
-			// No more bytes.
-			break
-		}
-		field, ok := f.fieldsByID[b[0]]
-		if !ok {
-			// This can happen, though is very unlikely. If this node receives encoded data, to be written
-			// to disk, and is queried for that data before its metastore is updated, there will be no field
-			// mapping for the data during decode. All this can happen because data is encoded by the node
-			// that first received the write request, not the node that actually writes the data to disk.
-			// So if this happens, the read must be aborted.
-			return 0, ErrFieldUnmappedID
-		}
-
-		var value interface{}
-		switch field.Type {
-		case influxql.Float:
-			// Move bytes forward.
-			value = math.Float64frombits(binary.BigEndian.Uint64(b[1:9]))
-			b = b[9:]
-		case influxql.Integer:
-			value = int64(binary.BigEndian.Uint64(b[1:9]))
-			b = b[9:]
-		case influxql.Boolean:
-			if b[1] == 1 {
-				value = true
-			} else {
-				value = false
-			}
-			// Move bytes forward.
-			b = b[2:]
-		case influxql.String:
-			size := binary.BigEndian.Uint16(b[1:3])
-			value = string(b[3 : 3+size])
-			// Move bytes forward.
-			b = b[size+3:]
-		default:
-			panic(fmt.Sprintf("unsupported value type during decode by id: %T", field.Type))
-		}
-
-		if field.ID == targetID {
-			return value, nil
-		}
-	}
-
-	return 0, ErrFieldNotFound
-}
-
-// DecodeByName scans a byte slice for a field with the given name, converts it to its
-// expected type, and return that value.
-func (f *FieldCodec) DecodeByName(name string, b []byte) (interface{}, error) {
-	fi := f.FieldByName(name)
-	if fi == nil {
-		return 0, ErrFieldNotFound
-	}
-	return f.DecodeByID(fi.ID, b)
-}
-
-func (f *FieldCodec) Fields() (a []*Field) {
-	for _, f := range f.fieldsByID {
-		a = append(a, f)
-	}
-	return
-}
-
-// FieldByName returns the field by its name. It will return a nil if not found
-func (f *FieldCodec) FieldByName(name string) *Field {
-	return f.fieldsByName[name]
-}
-
-// mustMarshal encodes a value to JSON.
-// This will panic if an error occurs. This should only be used internally when
-// an invalid marshal will cause corruption and a panic is appropriate.
-func mustMarshalJSON(v interface{}) []byte {
-	b, err := json.Marshal(v)
-	if err != nil {
-		panic("marshal: " + err.Error())
-	}
-	return b
-}
-
-// mustUnmarshalJSON decodes a value from JSON.
-// This will panic if an error occurs. This should only be used internally when
-// an invalid unmarshal will cause corruption and a panic is appropriate.
-func mustUnmarshalJSON(b []byte, v interface{}) {
-	if err := json.Unmarshal(b, v); err != nil {
-		panic("unmarshal: " + err.Error())
-	}
-}
-
-// u64tob converts a uint64 into an 8-byte slice.
-func u64tob(v uint64) []byte {
-	b := make([]byte, 8)
-	binary.BigEndian.PutUint64(b, v)
-	return b
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/shard_test.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/shard_test.go
deleted file mode 100644
index e6732985e..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/shard_test.go
+++ /dev/null
@@ -1,348 +0,0 @@
-package tsdb_test
-
-import (
-	"fmt"
-	"io/ioutil"
-	"os"
-	"path"
-	"path/filepath"
-	"reflect"
-	"testing"
-	"time"
-
-	"github.com/influxdb/influxdb/models"
-	"github.com/influxdb/influxdb/tsdb"
-	"github.com/influxdb/influxdb/tsdb/engine/b1"
-)
-
-func TestShardWriteAndIndex(t *testing.T) {
-	tmpDir, _ := ioutil.TempDir("", "shard_test")
-	defer os.RemoveAll(tmpDir)
-	tmpShard := path.Join(tmpDir, "shard")
-	tmpWal := path.Join(tmpDir, "wal")
-
-	index := tsdb.NewDatabaseIndex()
-	opts := tsdb.NewEngineOptions()
-	opts.Config.WALDir = filepath.Join(tmpDir, "wal")
-
-	sh := tsdb.NewShard(1, index, tmpShard, tmpWal, opts)
-	if err := sh.Open(); err != nil {
-		t.Fatalf("error openeing shard: %s", err.Error())
-	}
-
-	pt := models.MustNewPoint(
-		"cpu",
-		map[string]string{"host": "server"},
-		map[string]interface{}{"value": 1.0},
-		time.Unix(1, 2),
-	)
-
-	err := sh.WritePoints([]models.Point{pt})
-	if err != nil {
-		t.Fatalf(err.Error())
-	}
-
-	pt.SetTime(time.Unix(2, 3))
-	err = sh.WritePoints([]models.Point{pt})
-	if err != nil {
-		t.Fatalf(err.Error())
-	}
-
-	validateIndex := func() {
-		if index.SeriesN() != 1 {
-			t.Fatalf("series wasn't in index")
-		}
-
-		seriesTags := index.Series(string(pt.Key())).Tags
-		if len(seriesTags) != len(pt.Tags()) || pt.Tags()["host"] != seriesTags["host"] {
-			t.Fatalf("tags weren't properly saved to series index: %v, %v", pt.Tags(), seriesTags)
-		}
-		if !reflect.DeepEqual(index.Measurement("cpu").TagKeys(), []string{"host"}) {
-			t.Fatalf("tag key wasn't saved to measurement index")
-		}
-	}
-
-	validateIndex()
-
-	// ensure the index gets loaded after closing and opening the shard
-	sh.Close()
-
-	index = tsdb.NewDatabaseIndex()
-	sh = tsdb.NewShard(1, index, tmpShard, tmpWal, opts)
-	if err := sh.Open(); err != nil {
-		t.Fatalf("error openeing shard: %s", err.Error())
-	}
-
-	validateIndex()
-
-	// and ensure that we can still write data
-	pt.SetTime(time.Unix(2, 6))
-	err = sh.WritePoints([]models.Point{pt})
-	if err != nil {
-		t.Fatalf(err.Error())
-	}
-}
-
-func TestShardWriteAddNewField(t *testing.T) {
-	tmpDir, _ := ioutil.TempDir("", "shard_test")
-	defer os.RemoveAll(tmpDir)
-	tmpShard := path.Join(tmpDir, "shard")
-	tmpWal := path.Join(tmpDir, "wal")
-
-	index := tsdb.NewDatabaseIndex()
-	opts := tsdb.NewEngineOptions()
-	opts.Config.WALDir = filepath.Join(tmpDir, "wal")
-
-	sh := tsdb.NewShard(1, index, tmpShard, tmpWal, opts)
-	if err := sh.Open(); err != nil {
-		t.Fatalf("error openeing shard: %s", err.Error())
-	}
-	defer sh.Close()
-
-	pt := models.MustNewPoint(
-		"cpu",
-		map[string]string{"host": "server"},
-		map[string]interface{}{"value": 1.0},
-		time.Unix(1, 2),
-	)
-
-	err := sh.WritePoints([]models.Point{pt})
-	if err != nil {
-		t.Fatalf(err.Error())
-	}
-
-	pt = models.MustNewPoint(
-		"cpu",
-		map[string]string{"host": "server"},
-		map[string]interface{}{"value": 1.0, "value2": 2.0},
-		time.Unix(1, 2),
-	)
-
-	err = sh.WritePoints([]models.Point{pt})
-	if err != nil {
-		t.Fatalf(err.Error())
-	}
-
-	if index.SeriesN() != 1 {
-		t.Fatalf("series wasn't in index")
-	}
-	seriesTags := index.Series(string(pt.Key())).Tags
-	if len(seriesTags) != len(pt.Tags()) || pt.Tags()["host"] != seriesTags["host"] {
-		t.Fatalf("tags weren't properly saved to series index: %v, %v", pt.Tags(), seriesTags)
-	}
-	if !reflect.DeepEqual(index.Measurement("cpu").TagKeys(), []string{"host"}) {
-		t.Fatalf("tag key wasn't saved to measurement index")
-	}
-
-	if len(index.Measurement("cpu").FieldNames()) != 2 {
-		t.Fatalf("field names wasn't saved to measurement index")
-	}
-
-}
-
-// Ensure the shard will automatically flush the WAL after a threshold has been reached.
-func TestShard_Autoflush(t *testing.T) {
-	path, _ := ioutil.TempDir("", "shard_test")
-	defer os.RemoveAll(path)
-
-	// Open shard with a really low size threshold, high flush interval.
-	sh := tsdb.NewShard(1, tsdb.NewDatabaseIndex(), filepath.Join(path, "shard"), filepath.Join(path, "wal"), tsdb.EngineOptions{
-		EngineVersion:          b1.Format,
-		MaxWALSize:             1024, // 1KB
-		WALFlushInterval:       1 * time.Hour,
-		WALPartitionFlushDelay: 1 * time.Millisecond,
-	})
-	if err := sh.Open(); err != nil {
-		t.Fatal(err)
-	}
-	defer sh.Close()
-
-	// Write a bunch of points.
-	for i := 0; i < 100; i++ {
-		if err := sh.WritePoints([]models.Point{models.MustNewPoint(
-			fmt.Sprintf("cpu%d", i),
-			map[string]string{"host": "server"},
-			map[string]interface{}{"value": 1.0},
-			time.Unix(1, 2),
-		)}); err != nil {
-			t.Fatal(err)
-		}
-	}
-
-	// Wait for autoflush.
-	time.Sleep(100 * time.Millisecond)
-
-	// Make sure we have series buckets created outside the WAL.
-	if n, err := sh.SeriesCount(); err != nil {
-		t.Fatal(err)
-	} else if n < 10 {
-		t.Fatalf("not enough series, expected at least 10, got %d", n)
-	}
-}
-
-// Ensure the shard will automatically flush the WAL after a threshold has been reached.
-func TestShard_Autoflush_FlushInterval(t *testing.T) {
-	path, _ := ioutil.TempDir("", "shard_test")
-	defer os.RemoveAll(path)
-
-	// Open shard with a high size threshold, small time threshold.
-	sh := tsdb.NewShard(1, tsdb.NewDatabaseIndex(), filepath.Join(path, "shard"), filepath.Join(path, "wal"), tsdb.EngineOptions{
-		EngineVersion:          b1.Format,
-		MaxWALSize:             10 * 1024 * 1024, // 10MB
-		WALFlushInterval:       100 * time.Millisecond,
-		WALPartitionFlushDelay: 1 * time.Millisecond,
-	})
-	if err := sh.Open(); err != nil {
-		t.Fatal(err)
-	}
-	defer sh.Close()
-
-	// Write some points.
-	for i := 0; i < 100; i++ {
-		if err := sh.WritePoints([]models.Point{models.MustNewPoint(
-			fmt.Sprintf("cpu%d", i),
-			map[string]string{"host": "server"},
-			map[string]interface{}{"value": 1.0},
-			time.Unix(1, 2),
-		)}); err != nil {
-			t.Fatal(err)
-		}
-	}
-
-	// Wait for time-based flush.
-	time.Sleep(100 * time.Millisecond)
-
-	// Make sure we have series buckets created outside the WAL.
-	if n, err := sh.SeriesCount(); err != nil {
-		t.Fatal(err)
-	} else if n < 10 {
-		t.Fatalf("not enough series, expected at least 10, got %d", n)
-	}
-}
-
-func BenchmarkWritePoints_NewSeries_1K(b *testing.B)   { benchmarkWritePoints(b, 38, 3, 3, 1) }
-func BenchmarkWritePoints_NewSeries_100K(b *testing.B) { benchmarkWritePoints(b, 32, 5, 5, 1) }
-func BenchmarkWritePoints_NewSeries_250K(b *testing.B) { benchmarkWritePoints(b, 80, 5, 5, 1) }
-func BenchmarkWritePoints_NewSeries_500K(b *testing.B) { benchmarkWritePoints(b, 160, 5, 5, 1) }
-func BenchmarkWritePoints_NewSeries_1M(b *testing.B)   { benchmarkWritePoints(b, 320, 5, 5, 1) }
-
-func BenchmarkWritePoints_ExistingSeries_1K(b *testing.B) {
-	benchmarkWritePointsExistingSeries(b, 38, 3, 3, 1)
-}
-func BenchmarkWritePoints_ExistingSeries_100K(b *testing.B) {
-	benchmarkWritePointsExistingSeries(b, 32, 5, 5, 1)
-}
-func BenchmarkWritePoints_ExistingSeries_250K(b *testing.B) {
-	benchmarkWritePointsExistingSeries(b, 80, 5, 5, 1)
-}
-func BenchmarkWritePoints_ExistingSeries_500K(b *testing.B) {
-	benchmarkWritePointsExistingSeries(b, 160, 5, 5, 1)
-}
-func BenchmarkWritePoints_ExistingSeries_1M(b *testing.B) {
-	benchmarkWritePointsExistingSeries(b, 320, 5, 5, 1)
-}
-
-// benchmarkWritePoints benchmarks writing new series to a shard.
-// mCnt - measurement count
-// tkCnt - tag key count
-// tvCnt - tag value count (values per tag)
-// pntCnt - points per series.  # of series = mCnt * (tvCnt ^ tkCnt)
-func benchmarkWritePoints(b *testing.B, mCnt, tkCnt, tvCnt, pntCnt int) {
-	// Generate test series (measurements + unique tag sets).
-	series := genTestSeries(mCnt, tkCnt, tvCnt)
-	// Create index for the shard to use.
-	index := tsdb.NewDatabaseIndex()
-	// Generate point data to write to the shard.
-	points := []models.Point{}
-	for _, s := range series {
-		for val := 0.0; val < float64(pntCnt); val++ {
-			p := models.MustNewPoint(s.Measurement, s.Series.Tags, map[string]interface{}{"value": val}, time.Now())
-			points = append(points, p)
-		}
-	}
-
-	// Stop & reset timers and mem-stats before the main benchmark loop.
-	b.StopTimer()
-	b.ResetTimer()
-
-	// Run the benchmark loop.
-	for n := 0; n < b.N; n++ {
-		tmpDir, _ := ioutil.TempDir("", "shard_test")
-		tmpShard := path.Join(tmpDir, "shard")
-		tmpWal := path.Join(tmpDir, "wal")
-		shard := tsdb.NewShard(1, index, tmpShard, tmpWal, tsdb.NewEngineOptions())
-		shard.Open()
-
-		b.StartTimer()
-		// Call the function being benchmarked.
-		chunkedWrite(shard, points)
-
-		b.StopTimer()
-		shard.Close()
-		os.RemoveAll(tmpDir)
-	}
-}
-
-// benchmarkWritePointsExistingSeries benchmarks writing to existing series in a shard.
-// mCnt - measurement count
-// tkCnt - tag key count
-// tvCnt - tag value count (values per tag)
-// pntCnt - points per series.  # of series = mCnt * (tvCnt ^ tkCnt)
-func benchmarkWritePointsExistingSeries(b *testing.B, mCnt, tkCnt, tvCnt, pntCnt int) {
-	// Generate test series (measurements + unique tag sets).
-	series := genTestSeries(mCnt, tkCnt, tvCnt)
-	// Create index for the shard to use.
-	index := tsdb.NewDatabaseIndex()
-	// Generate point data to write to the shard.
-	points := []models.Point{}
-	for _, s := range series {
-		for val := 0.0; val < float64(pntCnt); val++ {
-			p := models.MustNewPoint(s.Measurement, s.Series.Tags, map[string]interface{}{"value": val}, time.Now())
-			points = append(points, p)
-		}
-	}
-
-	tmpDir, _ := ioutil.TempDir("", "")
-	defer os.RemoveAll(tmpDir)
-	tmpShard := path.Join(tmpDir, "shard")
-	tmpWal := path.Join(tmpDir, "wal")
-	shard := tsdb.NewShard(1, index, tmpShard, tmpWal, tsdb.NewEngineOptions())
-	shard.Open()
-	defer shard.Close()
-	chunkedWrite(shard, points)
-
-	// Reset timers and mem-stats before the main benchmark loop.
-	b.ResetTimer()
-
-	// Run the benchmark loop.
-	for n := 0; n < b.N; n++ {
-		b.StopTimer()
-		for _, p := range points {
-			p.SetTime(p.Time().Add(time.Second))
-		}
-
-		b.StartTimer()
-		// Call the function being benchmarked.
-		chunkedWrite(shard, points)
-	}
-}
-
-func chunkedWrite(shard *tsdb.Shard, points []models.Point) {
-	nPts := len(points)
-	chunkSz := 10000
-	start := 0
-	end := chunkSz
-
-	for {
-		if end > nPts {
-			end = nPts
-		}
-		if end-start == 0 {
-			break
-		}
-
-		shard.WritePoints(points[start:end])
-		start = end
-		end += chunkSz
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/show_measurements.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/show_measurements.go
deleted file mode 100644
index 49740349a..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/show_measurements.go
+++ /dev/null
@@ -1,247 +0,0 @@
-package tsdb
-
-import (
-	"encoding/json"
-	"fmt"
-	"sort"
-
-	"github.com/influxdb/influxdb/influxql"
-	"github.com/influxdb/influxdb/models"
-)
-
-// ShowMeasurementsExecutor implements the Executor interface for a SHOW MEASUREMENTS statement.
-type ShowMeasurementsExecutor struct {
-	stmt      *influxql.ShowMeasurementsStatement
-	mappers   []Mapper
-	chunkSize int
-}
-
-// NewShowMeasurementsExecutor returns a new ShowMeasurementsExecutor.
-func NewShowMeasurementsExecutor(stmt *influxql.ShowMeasurementsStatement, mappers []Mapper, chunkSize int) *ShowMeasurementsExecutor {
-	return &ShowMeasurementsExecutor{
-		stmt:      stmt,
-		mappers:   mappers,
-		chunkSize: chunkSize,
-	}
-}
-
-// Execute begins execution of the query and returns a channel to receive rows.
-func (e *ShowMeasurementsExecutor) Execute() <-chan *models.Row {
-	// Create output channel and stream data in a separate goroutine.
-	out := make(chan *models.Row, 0)
-
-	go func() {
-		// Open the mappers.
-		for _, m := range e.mappers {
-			if err := m.Open(); err != nil {
-				out <- &models.Row{Err: err}
-				return
-			}
-		}
-
-		// Create a set to hold measurement names from mappers.
-		set := map[string]struct{}{}
-		// Iterate through mappers collecting measurement names.
-		for _, m := range e.mappers {
-			// Get the data from the mapper.
-			c, err := m.NextChunk()
-			if err != nil {
-				out <- &models.Row{Err: err}
-				return
-			} else if c == nil {
-				// Mapper had no data.
-				continue
-			}
-
-			// Convert the mapper chunk to a string array of measurement names.
-			mms, ok := c.([]string)
-			if !ok {
-				out <- &models.Row{Err: fmt.Errorf("show measurements mapper returned invalid type: %T", c)}
-				return
-			}
-
-			// Add the measurement names to the set.
-			for _, mm := range mms {
-				set[mm] = struct{}{}
-			}
-		}
-
-		// Convert the set into an array of measurement names.
-		measurements := make([]string, 0, len(set))
-		for mm := range set {
-			measurements = append(measurements, mm)
-		}
-		// Sort the names.
-		sort.Strings(measurements)
-
-		// Calculate OFFSET and LIMIT
-		off := e.stmt.Offset
-		lim := len(measurements)
-		stmtLim := e.stmt.Limit
-
-		if stmtLim > 0 && off+stmtLim < lim {
-			lim = off + stmtLim
-		} else if off > lim {
-			off, lim = 0, 0
-		}
-
-		// Put the results in a row and send it.
-		row := &models.Row{
-			Name:    "measurements",
-			Columns: []string{"name"},
-			Values:  make([][]interface{}, 0, len(measurements)),
-		}
-
-		for _, m := range measurements[off:lim] {
-			v := []interface{}{m}
-			row.Values = append(row.Values, v)
-		}
-
-		if len(row.Values) > 0 {
-			out <- row
-		}
-
-		close(out)
-		// It's important that all resources are released when execution completes.
-		e.close()
-	}()
-	return out
-}
-
-// Close closes the executor such that all resources are released. Once closed,
-// an executor may not be re-used.
-func (e *ShowMeasurementsExecutor) close() {
-	if e != nil {
-		for _, m := range e.mappers {
-			m.Close()
-		}
-	}
-}
-
-// ShowMeasurementsMapper is a mapper for collecting measurement names from a shard.
-type ShowMeasurementsMapper struct {
-	remote Mapper
-	shard  *Shard
-	stmt   *influxql.ShowMeasurementsStatement
-	state  interface{}
-
-	ChunkSize int
-}
-
-// NewShowMeasurementsMapper returns a mapper for the given shard, which will return data for the meta statement.
-func NewShowMeasurementsMapper(shard *Shard, stmt *influxql.ShowMeasurementsStatement) *ShowMeasurementsMapper {
-	return &ShowMeasurementsMapper{
-		shard: shard,
-		stmt:  stmt,
-	}
-}
-
-// Open opens the mapper for use.
-func (m *ShowMeasurementsMapper) Open() error {
-	if m.remote != nil {
-		return m.remote.Open()
-	}
-
-	var measurements Measurements
-
-	if m.shard != nil {
-		// If a WHERE clause was specified, filter the measurements.
-		if m.stmt.Condition != nil {
-			var err error
-			measurements, err = m.shard.index.measurementsByExpr(m.stmt.Condition)
-			if err != nil {
-				return err
-			}
-		} else {
-			// Otherwise, get all measurements from the database.
-			measurements = m.shard.index.Measurements()
-		}
-		sort.Sort(measurements)
-	}
-
-	// Create a channel to send measurement names on.
-	ch := make(chan string)
-	// Start a goroutine to send the names over the channel as needed.
-	go func() {
-		for _, mm := range measurements {
-			// Filter measurements by WITH clause, if one was given.
-			if m.stmt.Source != nil {
-				s, ok := m.stmt.Source.(*influxql.Measurement)
-				if !ok ||
-					s.Regex != nil && !s.Regex.Val.MatchString(mm.Name) ||
-					s.Name != "" && s.Name != mm.Name {
-					continue
-				}
-			}
-
-			ch <- mm.Name
-		}
-		close(ch)
-	}()
-
-	// Store the channel as the state of the mapper.
-	m.state = ch
-
-	return nil
-}
-
-// SetRemote sets the remote mapper to use.
-func (m *ShowMeasurementsMapper) SetRemote(remote Mapper) { m.remote = remote }
-
-// TagSets is only implemented on this mapper to satisfy the Mapper interface.
-func (m *ShowMeasurementsMapper) TagSets() []string { return nil }
-
-// Fields returns a list of field names for this mapper.
-func (m *ShowMeasurementsMapper) Fields() []string { return []string{"name"} }
-
-// NextChunk returns the next chunk of measurement names.
-func (m *ShowMeasurementsMapper) NextChunk() (interface{}, error) {
-	if m.remote != nil {
-		b, err := m.remote.NextChunk()
-		if err != nil {
-			return nil, err
-		} else if b == nil {
-			return nil, nil
-		}
-
-		names := []string{}
-		if err := json.Unmarshal(b.([]byte), &names); err != nil {
-			return nil, err
-		} else if len(names) == 0 {
-			// Mapper on other node sent 0 values so it's done.
-			return nil, nil
-		}
-		return names, nil
-	}
-	return m.nextChunk()
-}
-
-// nextChunk implements next chunk logic for a local shard.
-func (m *ShowMeasurementsMapper) nextChunk() (interface{}, error) {
-	// Allocate array to hold measurement names.
-	names := make([]string, 0, m.ChunkSize)
-
-	// Get the channel of measurement names from the state.
-	measurementNames := m.state.(chan string)
-
-	// Get the next chunk of names.
-	for n := range measurementNames {
-		names = append(names, n)
-		if len(names) == m.ChunkSize {
-			break
-		}
-	}
-	// See if we've read all the names.
-	if len(names) == 0 {
-		return nil, nil
-	}
-
-	return names, nil
-}
-
-// Close closes the mapper.
-func (m *ShowMeasurementsMapper) Close() {
-	if m.remote != nil {
-		m.remote.Close()
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/show_tag_keys.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/show_tag_keys.go
deleted file mode 100644
index 8cf05af10..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/show_tag_keys.go
+++ /dev/null
@@ -1,315 +0,0 @@
-package tsdb
-
-import (
-	"encoding/json"
-	"fmt"
-	"sort"
-
-	"github.com/influxdb/influxdb/influxql"
-	"github.com/influxdb/influxdb/models"
-)
-
-// ShowTagKeysExecutor implements the Executor interface for a SHOW MEASUREMENTS statement.
-type ShowTagKeysExecutor struct {
-	stmt      *influxql.ShowTagKeysStatement
-	mappers   []Mapper
-	chunkSize int
-}
-
-// NewShowTagKeysExecutor returns a new ShowTagKeysExecutor.
-func NewShowTagKeysExecutor(stmt *influxql.ShowTagKeysStatement, mappers []Mapper, chunkSize int) *ShowTagKeysExecutor {
-	return &ShowTagKeysExecutor{
-		stmt:      stmt,
-		mappers:   mappers,
-		chunkSize: chunkSize,
-	}
-}
-
-// Execute begins execution of the query and returns a channel to receive rows.
-func (e *ShowTagKeysExecutor) Execute() <-chan *models.Row {
-	// Create output channel and stream data in a separate goroutine.
-	out := make(chan *models.Row, 0)
-
-	// It's important that all resources are released when execution completes.
-	defer e.close()
-
-	go func() {
-		defer close(out)
-		// Open the mappers.
-		for _, m := range e.mappers {
-			if err := m.Open(); err != nil {
-				out <- &models.Row{Err: err}
-				return
-			}
-		}
-
-		// Create a map of measurement to tags keys.
-		set := map[string]map[string]struct{}{}
-		// Iterate through mappers collecting measurement names.
-		for _, m := range e.mappers {
-			// Read all data from the mapper.
-			for {
-				c, err := m.NextChunk()
-				if err != nil {
-					out <- &models.Row{Err: err}
-					return
-				} else if c == nil {
-					// Mapper has been drained.
-					break
-				}
-
-				// Convert the mapper chunk to an array of measurements with tag keys.
-				mtks, ok := c.(MeasurementsTagKeys)
-				if !ok {
-					out <- &models.Row{Err: fmt.Errorf("show tag keys mapper returned invalid type: %T", c)}
-					return
-				}
-
-				// Merge mapper chunk with previous mapper outputs.
-				for _, mm := range mtks {
-					for _, key := range mm.TagKeys {
-						if set[mm.Measurement] == nil {
-							set[mm.Measurement] = map[string]struct{}{}
-						}
-						set[mm.Measurement][key] = struct{}{}
-					}
-				}
-			}
-		}
-
-		// All mappers are drained.
-
-		// Convert the set into an array of measurements and their tag keys.
-		mstks := make(MeasurementsTagKeys, 0)
-		for mm, tks := range set {
-			mtks := &MeasurementTagKeys{Measurement: mm}
-			for tk := range tks {
-				mtks.TagKeys = append(mtks.TagKeys, tk)
-			}
-			sort.Strings(mtks.TagKeys)
-			mstks = append(mstks, mtks)
-		}
-		// Sort by measurement name.
-		sort.Sort(mstks)
-
-		slim, soff := limitAndOffset(e.stmt.SLimit, e.stmt.SOffset, len(mstks))
-
-		// Send results.
-		for _, mtks := range mstks[soff:slim] {
-			lim, off := limitAndOffset(e.stmt.Limit, e.stmt.Offset, len(mtks.TagKeys))
-
-			row := &models.Row{
-				Name:    mtks.Measurement,
-				Columns: []string{"tagKey"},
-				Values:  make([][]interface{}, 0, lim-off),
-			}
-
-			for _, tk := range mtks.TagKeys[off:lim] {
-				v := []interface{}{tk}
-				row.Values = append(row.Values, v)
-			}
-
-			out <- row
-		}
-	}()
-	return out
-}
-
-// limitAndOffset calculates the limit and offset indexes for n things.
-func limitAndOffset(lim, off, n int) (int, int) {
-	if off >= n {
-		return 0, 0
-	}
-
-	o := off
-	l := n
-
-	if lim > 0 && o+lim < l {
-		l = o + lim
-	}
-
-	if o > l {
-		return 0, 0
-	}
-
-	return l, o
-}
-
-// Close closes the executor such that all resources are released. Once closed,
-// an executor may not be re-used.
-func (e *ShowTagKeysExecutor) close() {
-	if e != nil {
-		for _, m := range e.mappers {
-			m.Close()
-		}
-	}
-}
-
-// ShowTagKeysMapper is a mapper for collecting measurement names from a shard.
-type ShowTagKeysMapper struct {
-	remote    Mapper
-	shard     *Shard
-	stmt      *influxql.ShowTagKeysStatement
-	chunkSize int
-	state     interface{}
-}
-
-// NewShowTagKeysMapper returns a mapper for the given shard, which will return data for the meta statement.
-func NewShowTagKeysMapper(shard *Shard, stmt *influxql.ShowTagKeysStatement, chunkSize int) *ShowTagKeysMapper {
-	return &ShowTagKeysMapper{
-		shard:     shard,
-		stmt:      stmt,
-		chunkSize: chunkSize,
-	}
-}
-
-// MeasurementTagKeys represents measurement tag keys.
-type MeasurementTagKeys struct {
-	Measurement string   `json:"measurement"`
-	TagKeys     []string `json:"tagkeys"`
-}
-
-// MeasurementsTagKeys represents tag keys for multiple measurements.
-type MeasurementsTagKeys []*MeasurementTagKeys
-
-func (a MeasurementsTagKeys) Len() int           { return len(a) }
-func (a MeasurementsTagKeys) Less(i, j int) bool { return a[i].Measurement < a[j].Measurement }
-func (a MeasurementsTagKeys) Swap(i, j int)      { a[i], a[j] = a[j], a[i] }
-
-// Size returns the total string length of measurement names & tag keys.
-func (a MeasurementsTagKeys) Size() int {
-	n := 0
-	for _, m := range a {
-		n += len(m.Measurement)
-		for _, k := range m.TagKeys {
-			n += len(k)
-		}
-	}
-	return n
-}
-
-// Open opens the mapper for use.
-func (m *ShowTagKeysMapper) Open() error {
-	if m.remote != nil {
-		return m.remote.Open()
-	}
-
-	// This can happen when a shard has been assigned to this node but we have not
-	// written to it so it may not exist yet.
-	if m.shard == nil {
-		return nil
-	}
-
-	sources := influxql.Sources{}
-
-	// Expand regex expressions in the FROM clause.
-	if m.stmt.Sources != nil {
-		var err error
-		sources, err = m.shard.index.ExpandSources(m.stmt.Sources)
-		if err != nil {
-			return err
-		}
-	}
-
-	// Get measurements from sources in the statement if provided or database if not.
-	measurements, err := measurementsFromSourcesOrDB(m.shard.index, sources...)
-	if err != nil {
-		return err
-	}
-
-	// If a WHERE clause was specified, filter the measurements.
-	if m.stmt.Condition != nil {
-		var err error
-		whereMs, err := m.shard.index.measurementsByExpr(m.stmt.Condition)
-		if err != nil {
-			return err
-		}
-
-		sort.Sort(whereMs)
-
-		measurements = measurements.intersect(whereMs)
-	}
-
-	// Create a channel to send measurement names on.
-	ch := make(chan *MeasurementTagKeys)
-	// Start a goroutine to send the names over the channel as needed.
-	go func() {
-		for _, mm := range measurements {
-			ch <- &MeasurementTagKeys{
-				Measurement: mm.Name,
-				TagKeys:     mm.TagKeys(),
-			}
-		}
-		close(ch)
-	}()
-
-	// Store the channel as the state of the mapper.
-	m.state = ch
-
-	return nil
-}
-
-// SetRemote sets the remote mapper to use.
-func (m *ShowTagKeysMapper) SetRemote(remote Mapper) error {
-	m.remote = remote
-	return nil
-}
-
-// TagSets is only implemented on this mapper to satisfy the Mapper interface.
-func (m *ShowTagKeysMapper) TagSets() []string { return nil }
-
-// Fields returns a list of field names for this mapper.
-func (m *ShowTagKeysMapper) Fields() []string { return []string{"tagKey"} }
-
-// NextChunk returns the next chunk of measurements and tag keys.
-func (m *ShowTagKeysMapper) NextChunk() (interface{}, error) {
-	if m.remote != nil {
-		b, err := m.remote.NextChunk()
-		if err != nil {
-			return nil, err
-		} else if b == nil {
-			return nil, nil
-		}
-
-		mtks := []*MeasurementTagKeys{}
-		if err := json.Unmarshal(b.([]byte), &mtks); err != nil {
-			return nil, err
-		} else if len(mtks) == 0 {
-			// Mapper on other node sent 0 values so it's done.
-			return nil, nil
-		}
-		return mtks, nil
-	}
-	return m.nextChunk()
-}
-
-// nextChunk implements next chunk logic for a local shard.
-func (m *ShowTagKeysMapper) nextChunk() (interface{}, error) {
-	// Get the channel of measurement tag keys from the state.
-	ch, ok := m.state.(chan *MeasurementTagKeys)
-	if !ok {
-		return nil, nil
-	}
-	// Allocate array to hold measurement names.
-	mtks := make(MeasurementsTagKeys, 0)
-	// Get the next chunk of tag keys.
-	for n := range ch {
-		mtks = append(mtks, n)
-		if mtks.Size() >= m.chunkSize {
-			break
-		}
-	}
-	// See if we've read all the names.
-	if len(mtks) == 0 {
-		return nil, nil
-	}
-
-	return mtks, nil
-}
-
-// Close closes the mapper.
-func (m *ShowTagKeysMapper) Close() {
-	if m.remote != nil {
-		m.remote.Close()
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/snapshot_writer.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/snapshot_writer.go
deleted file mode 100644
index 4a0a2d3ed..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/snapshot_writer.go
+++ /dev/null
@@ -1,123 +0,0 @@
-package tsdb
-
-import (
-	"bytes"
-	"fmt"
-	"io"
-	"os"
-	"path/filepath"
-	"time"
-
-	"github.com/influxdb/influxdb/snapshot"
-)
-
-// NewSnapshotWriter returns a new snapshot.Writer that will write
-// metadata and the store's shards to an archive.
-func NewSnapshotWriter(meta []byte, store *Store) (*snapshot.Writer, error) {
-	// Create snapshot writer.
-	sw := snapshot.NewWriter()
-	if err := func() error {
-		// Create meta file.
-		f := &snapshot.File{
-			Name:    "meta",
-			Size:    int64(len(meta)),
-			ModTime: time.Now(),
-		}
-		sw.Manifest.Files = append(sw.Manifest.Files, *f)
-		sw.FileWriters[f.Name] = NopWriteToCloser(bytes.NewReader(meta))
-
-		// Create files for each shard.
-		if err := appendShardSnapshotFiles(sw, store); err != nil {
-			return fmt.Errorf("create shard snapshot files: %s", err)
-		}
-
-		return nil
-	}(); err != nil {
-		_ = sw.Close()
-		return nil, err
-	}
-
-	return sw, nil
-}
-
-// appendShardSnapshotFiles adds snapshot files for each shard in the store.
-func appendShardSnapshotFiles(sw *snapshot.Writer, store *Store) error {
-	// Calculate absolute path of store to use for relative shard paths.
-	storePath, err := filepath.Abs(store.Path())
-	if err != nil {
-		return fmt.Errorf("store abs path: %s", err)
-	}
-
-	// Create files for each shard.
-	for _, shardID := range store.ShardIDs() {
-		// Retrieve shard.
-		sh := store.Shard(shardID)
-		if sh == nil {
-			return fmt.Errorf("shard not found: %d", shardID)
-		}
-
-		// Calculate relative path from store.
-		shardPath, err := filepath.Abs(sh.Path())
-		if err != nil {
-			return fmt.Errorf("shard abs path: %s", err)
-		}
-		name, err := filepath.Rel(storePath, shardPath)
-		if err != nil {
-			return fmt.Errorf("shard rel path: %s", err)
-		}
-
-		if err := appendShardSnapshotFile(sw, sh, name); err != nil {
-			return fmt.Errorf("append shard: name=%s, err=%s", name, err)
-		}
-	}
-
-	return nil
-}
-
-func appendShardSnapshotFile(sw *snapshot.Writer, sh *Shard, name string) error {
-	// Stat the underlying data file to retrieve last modified date.
-	fi, err := os.Stat(sh.Path())
-	if err != nil {
-		return fmt.Errorf("stat shard data file: %s", err)
-	}
-
-	// Begin transaction.
-	tx, err := sh.engine.Begin(false)
-	if err != nil {
-		return fmt.Errorf("begin: %s", err)
-	}
-
-	// Create file.
-	f := snapshot.File{
-		Name:    name,
-		Size:    tx.Size(),
-		ModTime: fi.ModTime(),
-	}
-
-	// Append to snapshot writer.
-	sw.Manifest.Files = append(sw.Manifest.Files, f)
-	sw.FileWriters[f.Name] = &boltTxCloser{tx}
-	return nil
-}
-
-// boltTxCloser wraps a Bolt transaction to implement io.Closer.
-type boltTxCloser struct {
-	Tx
-}
-
-// Close rolls back the transaction.
-func (tx *boltTxCloser) Close() error { return tx.Rollback() }
-
-// NopWriteToCloser returns an io.WriterTo that implements io.Closer.
-func NopWriteToCloser(w io.WriterTo) interface {
-	io.WriterTo
-	io.Closer
-} {
-	return &nopWriteToCloser{w}
-}
-
-type nopWriteToCloser struct {
-	io.WriterTo
-}
-
-func (w *nopWriteToCloser) Close() error { return nil }
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/store.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/store.go
deleted file mode 100644
index e2b52a19f..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/store.go
+++ /dev/null
@@ -1,455 +0,0 @@
-package tsdb
-
-import (
-	"fmt"
-	"io/ioutil"
-	"log"
-	"os"
-	"path/filepath"
-	"strconv"
-	"strings"
-	"sync"
-	"time"
-
-	"github.com/influxdb/influxdb/influxql"
-	"github.com/influxdb/influxdb/models"
-)
-
-func NewStore(path string) *Store {
-	opts := NewEngineOptions()
-	opts.Config = NewConfig()
-
-	return &Store{
-		path:          path,
-		EngineOptions: opts,
-		Logger:        log.New(os.Stderr, "[store] ", log.LstdFlags),
-	}
-}
-
-var (
-	ErrShardNotFound = fmt.Errorf("shard not found")
-	ErrStoreClosed   = fmt.Errorf("store is closed")
-)
-
-const (
-	MaintenanceCheckInterval = time.Minute
-)
-
-type Store struct {
-	mu   sync.RWMutex
-	path string
-
-	databaseIndexes map[string]*DatabaseIndex
-	shards          map[uint64]*Shard
-
-	EngineOptions EngineOptions
-	Logger        *log.Logger
-
-	closing chan struct{}
-	wg      sync.WaitGroup
-	opened  bool
-}
-
-// Path returns the store's root path.
-func (s *Store) Path() string { return s.path }
-
-// DatabaseIndexN returns the number of databases indicies in the store.
-func (s *Store) DatabaseIndexN() int {
-	s.mu.RLock()
-	defer s.mu.RUnlock()
-	return len(s.databaseIndexes)
-}
-
-// Shard returns a shard by id.
-func (s *Store) Shard(id uint64) *Shard {
-	s.mu.RLock()
-	defer s.mu.RUnlock()
-	return s.shards[id]
-}
-
-// ShardN returns the number of shard in the store.
-func (s *Store) ShardN() int {
-	s.mu.RLock()
-	defer s.mu.RUnlock()
-	return len(s.shards)
-}
-
-func (s *Store) CreateShard(database, retentionPolicy string, shardID uint64) error {
-	s.mu.Lock()
-	defer s.mu.Unlock()
-
-	select {
-	case <-s.closing:
-		return ErrStoreClosed
-	default:
-	}
-
-	// shard already exists
-	if _, ok := s.shards[shardID]; ok {
-		return nil
-	}
-
-	// created the db and retention policy dirs if they don't exist
-	if err := os.MkdirAll(filepath.Join(s.path, database, retentionPolicy), 0700); err != nil {
-		return err
-	}
-
-	// create the WAL directory
-	walPath := filepath.Join(s.EngineOptions.Config.WALDir, database, retentionPolicy, fmt.Sprintf("%d", shardID))
-	if err := os.MkdirAll(walPath, 0700); err != nil {
-		return err
-	}
-
-	// create the database index if it does not exist
-	db, ok := s.databaseIndexes[database]
-	if !ok {
-		db = NewDatabaseIndex()
-		s.databaseIndexes[database] = db
-	}
-
-	shardPath := filepath.Join(s.path, database, retentionPolicy, strconv.FormatUint(shardID, 10))
-	shard := NewShard(shardID, db, shardPath, walPath, s.EngineOptions)
-	if err := shard.Open(); err != nil {
-		return err
-	}
-
-	s.shards[shardID] = shard
-
-	return nil
-}
-
-// DeleteShard removes a shard from disk.
-func (s *Store) DeleteShard(shardID uint64) error {
-	s.mu.Lock()
-	defer s.mu.Unlock()
-
-	// ensure shard exists
-	sh, ok := s.shards[shardID]
-	if !ok {
-		return nil
-	}
-
-	if err := sh.Close(); err != nil {
-		return err
-	}
-
-	if err := os.RemoveAll(sh.path); err != nil {
-		return err
-	}
-
-	if err := os.RemoveAll(sh.walPath); err != nil {
-		return err
-	}
-
-	delete(s.shards, shardID)
-
-	return nil
-}
-
-// DeleteDatabase will close all shards associated with a database and remove the directory and files from disk.
-func (s *Store) DeleteDatabase(name string, shardIDs []uint64) error {
-	s.mu.Lock()
-	defer s.mu.Unlock()
-	for _, id := range shardIDs {
-		shard := s.shards[id]
-		if shard != nil {
-			shard.Close()
-		}
-		delete(s.shards, id)
-	}
-
-	if err := os.RemoveAll(filepath.Join(s.path, name)); err != nil {
-		return err
-	}
-	if err := os.RemoveAll(filepath.Join(s.EngineOptions.Config.WALDir, name)); err != nil {
-		return err
-	}
-	delete(s.databaseIndexes, name)
-	return nil
-}
-
-// ShardIDs returns a slice of all ShardIDs under management.
-func (s *Store) ShardIDs() []uint64 {
-	s.mu.RLock()
-	defer s.mu.RUnlock()
-	ids := make([]uint64, 0, len(s.shards))
-	for i, _ := range s.shards {
-		ids = append(ids, i)
-	}
-	return ids
-}
-
-func (s *Store) ValidateAggregateFieldsInStatement(shardID uint64, measurementName string, stmt *influxql.SelectStatement) error {
-	s.mu.RLock()
-	shard := s.shards[shardID]
-	s.mu.RUnlock()
-	if shard == nil {
-		return ErrShardNotFound
-	}
-	return shard.ValidateAggregateFieldsInStatement(measurementName, stmt)
-}
-
-func (s *Store) DatabaseIndex(name string) *DatabaseIndex {
-	s.mu.RLock()
-	defer s.mu.RUnlock()
-	return s.databaseIndexes[name]
-}
-
-// Databases returns all the databases in the indexes
-func (s *Store) Databases() []string {
-	s.mu.RLock()
-	defer s.mu.RUnlock()
-	databases := []string{}
-	for db := range s.databaseIndexes {
-		databases = append(databases, db)
-	}
-	return databases
-}
-
-func (s *Store) Measurement(database, name string) *Measurement {
-	s.mu.RLock()
-	db := s.databaseIndexes[database]
-	s.mu.RUnlock()
-	if db == nil {
-		return nil
-	}
-	return db.Measurement(name)
-}
-
-// DiskSize returns the size of all the shard files in bytes.  This size does not include the WAL size.
-func (s *Store) DiskSize() (int64, error) {
-	s.mu.RLock()
-	defer s.mu.RUnlock()
-	var size int64
-	for _, shardID := range s.ShardIDs() {
-		shard := s.Shard(shardID)
-		sz, err := shard.DiskSize()
-		if err != nil {
-			return 0, err
-		}
-		size += sz
-	}
-	return size, nil
-}
-
-// deleteSeries loops through the local shards and deletes the series data and metadata for the passed in series keys
-func (s *Store) deleteSeries(keys []string) error {
-	s.mu.RLock()
-	defer s.mu.RUnlock()
-	for _, sh := range s.shards {
-		if err := sh.DeleteSeries(keys); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-// deleteMeasurement loops through the local shards and removes the measurement field encodings from each shard
-func (s *Store) deleteMeasurement(name string, seriesKeys []string) error {
-	s.mu.RLock()
-	defer s.mu.RUnlock()
-	for _, sh := range s.shards {
-		if err := sh.DeleteMeasurement(name, seriesKeys); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func (s *Store) loadIndexes() error {
-	dbs, err := ioutil.ReadDir(s.path)
-	if err != nil {
-		return err
-	}
-	for _, db := range dbs {
-		if !db.IsDir() {
-			s.Logger.Printf("Skipping database dir: %s. Not a directory", db.Name())
-			continue
-		}
-		s.databaseIndexes[db.Name()] = NewDatabaseIndex()
-	}
-	return nil
-}
-
-func (s *Store) loadShards() error {
-	// loop through the current database indexes
-	for db := range s.databaseIndexes {
-		rps, err := ioutil.ReadDir(filepath.Join(s.path, db))
-		if err != nil {
-			return err
-		}
-
-		for _, rp := range rps {
-			// retention policies should be directories.  Skip anything that is not a dir.
-			if !rp.IsDir() {
-				s.Logger.Printf("Skipping retention policy dir: %s. Not a directory", rp.Name())
-				continue
-			}
-
-			shards, err := ioutil.ReadDir(filepath.Join(s.path, db, rp.Name()))
-			if err != nil {
-				return err
-			}
-			for _, sh := range shards {
-				path := filepath.Join(s.path, db, rp.Name(), sh.Name())
-				walPath := filepath.Join(s.EngineOptions.Config.WALDir, db, rp.Name(), sh.Name())
-
-				// Shard file names are numeric shardIDs
-				shardID, err := strconv.ParseUint(sh.Name(), 10, 64)
-				if err != nil {
-					s.Logger.Printf("Skipping shard: %s. Not a valid path", rp.Name())
-					continue
-				}
-
-				shard := NewShard(shardID, s.databaseIndexes[db], path, walPath, s.EngineOptions)
-				err = shard.Open()
-				if err != nil {
-					return fmt.Errorf("failed to open shard %d: %s", shardID, err)
-				}
-				s.shards[shardID] = shard
-			}
-		}
-	}
-	return nil
-
-}
-
-// periodicMaintenance is the method called in a goroutine on the opening of the store
-// to perform periodic maintenance of the shards.
-func (s *Store) periodicMaintenance() {
-	t := time.NewTicker(MaintenanceCheckInterval)
-	for {
-		select {
-		case <-t.C:
-			s.performMaintenance()
-		case <-s.closing:
-			t.Stop()
-			return
-		}
-	}
-}
-
-// performMaintenance will loop through the shars and tell them
-// to perform any maintenance tasks. Those tasks should kick off
-// their own goroutines if it's anything that could take time.
-func (s *Store) performMaintenance() {
-	s.mu.Lock()
-	defer s.mu.Unlock()
-	for _, sh := range s.shards {
-		s.performMaintenanceOnShard(sh)
-	}
-}
-
-func (s *Store) performMaintenanceOnShard(shard *Shard) {
-	defer func() {
-		if r := recover(); r != nil {
-			s.Logger.Printf("recovered eror in maintenance on shard %d", shard.id)
-		}
-	}()
-	shard.PerformMaintenance()
-}
-
-func (s *Store) Open() error {
-	s.mu.Lock()
-	defer s.mu.Unlock()
-
-	s.closing = make(chan struct{})
-
-	s.shards = map[uint64]*Shard{}
-	s.databaseIndexes = map[string]*DatabaseIndex{}
-
-	s.Logger.Printf("Using data dir: %v", s.Path())
-
-	// Create directory.
-	if err := os.MkdirAll(s.path, 0777); err != nil {
-		return err
-	}
-
-	// TODO: Start AE for Node
-	if err := s.loadIndexes(); err != nil {
-		return err
-	}
-
-	if err := s.loadShards(); err != nil {
-		return err
-	}
-
-	go s.periodicMaintenance()
-	s.opened = true
-
-	return nil
-}
-
-func (s *Store) WriteToShard(shardID uint64, points []models.Point) error {
-	s.mu.RLock()
-	defer s.mu.RUnlock()
-
-	select {
-	case <-s.closing:
-		return ErrStoreClosed
-	default:
-	}
-
-	sh, ok := s.shards[shardID]
-	if !ok {
-		return ErrShardNotFound
-	}
-
-	return sh.WritePoints(points)
-}
-
-func (s *Store) CreateMapper(shardID uint64, stmt influxql.Statement, chunkSize int) (Mapper, error) {
-	shard := s.Shard(shardID)
-
-	switch stmt := stmt.(type) {
-	case *influxql.SelectStatement:
-		if (stmt.IsRawQuery && !stmt.HasDistinct()) || stmt.IsSimpleDerivative() {
-			m := NewRawMapper(shard, stmt)
-			m.ChunkSize = chunkSize
-			return m, nil
-		}
-		return NewAggregateMapper(shard, stmt), nil
-
-	case *influxql.ShowMeasurementsStatement:
-		m := NewShowMeasurementsMapper(shard, stmt)
-		m.ChunkSize = chunkSize
-		return m, nil
-	case *influxql.ShowTagKeysStatement:
-		return NewShowTagKeysMapper(shard, stmt, chunkSize), nil
-	default:
-		return nil, fmt.Errorf("can't create mapper for statement type: %T", stmt)
-	}
-}
-
-func (s *Store) Close() error {
-	s.mu.Lock()
-	defer s.mu.Unlock()
-
-	if s.opened {
-		close(s.closing)
-	}
-	s.wg.Wait()
-
-	for _, sh := range s.shards {
-		if err := sh.Close(); err != nil {
-			return err
-		}
-	}
-	s.opened = false
-	s.shards = nil
-	s.databaseIndexes = nil
-
-	return nil
-}
-
-// IsRetryable returns true if this error is temporary and could be retried
-func IsRetryable(err error) bool {
-	if err == nil {
-		return true
-	}
-
-	if strings.Contains(err.Error(), "field type conflict") {
-		return false
-	}
-	return true
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/store_test.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/store_test.go
deleted file mode 100644
index 696c275eb..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/tsdb/store_test.go
+++ /dev/null
@@ -1,346 +0,0 @@
-package tsdb_test
-
-import (
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"testing"
-	"time"
-
-	"github.com/influxdb/influxdb/models"
-	"github.com/influxdb/influxdb/tsdb"
-)
-
-func TestStoreOpen(t *testing.T) {
-	dir, err := ioutil.TempDir("", "store_test")
-	if err != nil {
-		t.Fatalf("failed to create temp dir: %v", err)
-	}
-	defer os.RemoveAll(dir)
-
-	if err := os.MkdirAll(filepath.Join(dir, "mydb"), 0600); err != nil {
-		t.Fatalf("failed to create test db dir: %v", err)
-	}
-
-	s := tsdb.NewStore(dir)
-	s.EngineOptions.Config.WALDir = filepath.Join(dir, "wal")
-	if err := s.Open(); err != nil {
-		t.Fatalf("Store.Open() failed: %v", err)
-	}
-
-	if got, exp := s.DatabaseIndexN(), 1; got != exp {
-		t.Fatalf("database index count mismatch: got %v, exp %v", got, exp)
-	}
-}
-
-func TestStoreOpenShard(t *testing.T) {
-	dir, err := ioutil.TempDir("", "store_test")
-	if err != nil {
-		t.Fatalf("Store.Open() failed to create temp dir: %v", err)
-	}
-	defer os.RemoveAll(dir)
-
-	path := filepath.Join(dir, "mydb", "myrp")
-	if err := os.MkdirAll(path, 0700); err != nil {
-		t.Fatalf("Store.Open() failed to create test db dir: %v", err)
-	}
-
-	shardPath := filepath.Join(path, "1")
-	if _, err := os.Create(shardPath); err != nil {
-		t.Fatalf("Store.Open() failed to create test shard 1: %v", err)
-	}
-
-	s := tsdb.NewStore(dir)
-	s.EngineOptions.Config.WALDir = filepath.Join(dir, "wal")
-	if err := s.Open(); err != nil {
-		t.Fatalf("Store.Open() failed: %v", err)
-	}
-
-	if got, exp := s.DatabaseIndexN(), 1; got != exp {
-		t.Fatalf("Store.Open() database index count mismatch: got %v, exp %v", got, exp)
-	}
-
-	if di := s.DatabaseIndex("mydb"); di == nil {
-		t.Errorf("Store.Open() database myb does not exist")
-	}
-
-	if got, exp := s.ShardN(), 1; got != exp {
-		t.Fatalf("Store.Open() shard count mismatch: got %v, exp %v", got, exp)
-	}
-
-	if sh := s.Shard(1); sh.Path() != shardPath {
-		t.Errorf("Store.Open() shard path mismatch: got %v, exp %v", sh.Path(), shardPath)
-	}
-}
-
-func TestStoreOpenShardCreateDelete(t *testing.T) {
-	dir, err := ioutil.TempDir("", "store_test")
-	if err != nil {
-		t.Fatalf("Store.Open() failed to create temp dir: %v", err)
-	}
-
-	path := filepath.Join(dir, "mydb", "myrp")
-	if err := os.MkdirAll(path, 0700); err != nil {
-		t.Fatalf("Store.Open() failed to create test db dir: %v", err)
-	}
-
-	s := tsdb.NewStore(dir)
-	s.EngineOptions.Config.WALDir = filepath.Join(dir, "wal")
-	if err := s.Open(); err != nil {
-		t.Fatalf("Store.Open() failed: %v", err)
-	}
-
-	if got, exp := s.DatabaseIndexN(), 1; got != exp {
-		t.Fatalf("Store.Open() database index count mismatch: got %v, exp %v", got, exp)
-	}
-
-	if di := s.DatabaseIndex("mydb"); di == nil {
-		t.Errorf("Store.Open() database mydb does not exist")
-	}
-
-	if err := s.CreateShard("mydb", "myrp", 1); err != nil {
-		t.Fatalf("Store.Open() failed to create shard")
-	}
-
-	if got, exp := s.ShardN(), 1; got != exp {
-		t.Fatalf("Store.Open() shard count mismatch: got %v, exp %v", got, exp)
-	}
-
-	shardIDs := s.ShardIDs()
-	if len(shardIDs) != 1 || shardIDs[0] != 1 {
-		t.Fatalf("Store.Open() ShardIDs not correct: got %v, exp %v", s.ShardIDs(), []uint64{1})
-	}
-
-	if err := s.DeleteShard(1); err != nil {
-		t.Fatalf("Store.Open() failed to delete shard: %v", err)
-	}
-
-	if sh := s.Shard(1); sh != nil {
-		t.Fatal("Store.Open() shard ID 1 still exists")
-	}
-}
-
-func TestStoreOpenNotDatabaseDir(t *testing.T) {
-	dir, err := ioutil.TempDir("", "store_test")
-	if err != nil {
-		t.Fatalf("Store.Open() failed to create temp dir: %v", err)
-	}
-	defer os.RemoveAll(dir)
-
-	path := filepath.Join(dir, "bad_db_path")
-	if _, err := os.Create(path); err != nil {
-		t.Fatalf("Store.Open() failed to create test db dir: %v", err)
-	}
-
-	s := tsdb.NewStore(dir)
-	s.EngineOptions.Config.WALDir = filepath.Join(dir, "wal")
-	if err := s.Open(); err != nil {
-		t.Fatalf("Store.Open() failed: %v", err)
-	}
-
-	if got, exp := s.DatabaseIndexN(), 0; got != exp {
-		t.Fatalf("Store.Open() database index count mismatch: got %v, exp %v", got, exp)
-	}
-
-	if got, exp := s.ShardN(), 0; got != exp {
-		t.Fatalf("Store.Open() shard count mismatch: got %v, exp %v", got, exp)
-	}
-}
-
-func TestStoreOpenNotRPDir(t *testing.T) {
-	dir, err := ioutil.TempDir("", "store_test")
-	if err != nil {
-		t.Fatalf("Store.Open() failed to create temp dir: %v", err)
-	}
-
-	path := filepath.Join(dir, "mydb")
-	if err := os.MkdirAll(path, 0700); err != nil {
-		t.Fatalf("Store.Open() failed to create test db dir: %v", err)
-	}
-
-	rpPath := filepath.Join(path, "myrp")
-	if _, err := os.Create(rpPath); err != nil {
-		t.Fatalf("Store.Open() failed to create test retention policy directory: %v", err)
-	}
-
-	s := tsdb.NewStore(dir)
-	s.EngineOptions.Config.WALDir = filepath.Join(dir, "wal")
-	if err := s.Open(); err != nil {
-		t.Fatalf("Store.Open() failed: %v", err)
-	}
-
-	if got, exp := s.DatabaseIndexN(), 1; got != exp {
-		t.Fatalf("Store.Open() database index count mismatch: got %v, exp %v", got, exp)
-	}
-
-	if di := s.DatabaseIndex("mydb"); di == nil {
-		t.Errorf("Store.Open() database myb does not exist")
-	}
-
-	if got, exp := s.ShardN(), 0; got != exp {
-		t.Fatalf("Store.Open() shard count mismatch: got %v, exp %v", got, exp)
-	}
-}
-
-func TestStoreOpenShardBadShardPath(t *testing.T) {
-	dir, err := ioutil.TempDir("", "store_test")
-	if err != nil {
-		t.Fatalf("Store.Open() failed to create temp dir: %v", err)
-	}
-	defer os.RemoveAll(dir)
-
-	path := filepath.Join(dir, "mydb", "myrp")
-	if err := os.MkdirAll(path, 0700); err != nil {
-		t.Fatalf("Store.Open() failed to create test db dir: %v", err)
-	}
-
-	// Non-numeric shard ID
-	shardPath := filepath.Join(path, "bad_shard_path")
-	if _, err := os.Create(shardPath); err != nil {
-		t.Fatalf("Store.Open() failed to create test shard 1: %v", err)
-	}
-
-	s := tsdb.NewStore(dir)
-	s.EngineOptions.Config.WALDir = filepath.Join(dir, "wal")
-	if err := s.Open(); err != nil {
-		t.Fatalf("Store.Open() failed: %v", err)
-	}
-
-	if got, exp := s.DatabaseIndexN(), 1; got != exp {
-		t.Fatalf("Store.Open() database index count mismatch: got %v, exp %v", got, exp)
-	}
-
-	if di := s.DatabaseIndex("mydb"); di == nil {
-		t.Errorf("Store.Open() database myb does not exist")
-	}
-
-	if got, exp := s.ShardN(), 0; got != exp {
-		t.Fatalf("Store.Open() shard count mismatch: got %v, exp %v", got, exp)
-	}
-
-}
-
-func TestStoreEnsureSeriesPersistedInNewShards(t *testing.T) {
-	dir, err := ioutil.TempDir("", "store_test")
-	if err != nil {
-		t.Fatalf("Store.Open() failed to create temp dir: %v", err)
-	}
-	defer os.RemoveAll(dir)
-
-	s := tsdb.NewStore(dir)
-	s.EngineOptions.Config.WALDir = filepath.Join(dir, "wal")
-	if err := s.Open(); err != nil {
-		t.Fatalf("Store.Open() failed: %v", err)
-	}
-
-	if err := s.CreateShard("foo", "default", 1); err != nil {
-		t.Fatalf("error creating shard: %v", err)
-	}
-
-	p, _ := models.ParsePoints([]byte("cpu val=1"))
-	if err := s.WriteToShard(1, p); err != nil {
-		t.Fatalf("error writing to shard: %v", err)
-	}
-
-	if err := s.CreateShard("foo", "default", 2); err != nil {
-		t.Fatalf("error creating shard: %v", err)
-	}
-
-	if err := s.WriteToShard(2, p); err != nil {
-		t.Fatalf("error writing to shard: %v", err)
-	}
-
-	d := s.DatabaseIndex("foo")
-	if d == nil {
-		t.Fatal("expected to have database index for foo")
-	}
-	if d.Series("cpu") == nil {
-		t.Fatal("expected series cpu to be in the index")
-	}
-
-	// delete the shard, close the store and reopen it and confirm the measurement is still there
-	s.DeleteShard(1)
-	s.Close()
-
-	s = tsdb.NewStore(dir)
-	s.EngineOptions.Config.WALDir = filepath.Join(dir, "wal")
-	if err := s.Open(); err != nil {
-		t.Fatalf("Store.Open() failed: %v", err)
-	}
-
-	d = s.DatabaseIndex("foo")
-	if d == nil {
-		t.Fatal("expected to have database index for foo")
-	}
-	if d.Series("cpu") == nil {
-		t.Fatal("expected series cpu to be in the index")
-	}
-}
-
-func BenchmarkStoreOpen_200KSeries_100Shards(b *testing.B) { benchmarkStoreOpen(b, 64, 5, 5, 1, 100) }
-
-func benchmarkStoreOpen(b *testing.B, mCnt, tkCnt, tvCnt, pntCnt, shardCnt int) {
-	// Generate test series (measurements + unique tag sets).
-	series := genTestSeries(mCnt, tkCnt, tvCnt)
-	// Generate point data to write to the shards.
-	points := []models.Point{}
-	for _, s := range series {
-		for val := 0.0; val < float64(pntCnt); val++ {
-			p := models.MustNewPoint(s.Measurement, s.Series.Tags, map[string]interface{}{"value": val}, time.Now())
-			points = append(points, p)
-		}
-	}
-	// Create a temporary directory for the test data.
-	dir, _ := ioutil.TempDir("", "store_test")
-	// Create the store.
-	store := tsdb.NewStore(dir)
-	// Open the store.
-	if err := store.Open(); err != nil {
-		b.Fatalf("benchmarkStoreOpen: %s", err)
-	}
-	// Create requested number of shards in the store & write points.
-	for shardID := 0; shardID < shardCnt; shardID++ {
-		if err := store.CreateShard("mydb", "myrp", uint64(shardID)); err != nil {
-			b.Fatalf("benchmarkStoreOpen: %s", err)
-		}
-		// Write points to the shard.
-		chunkedWriteStoreShard(store, shardID, points)
-	}
-	// Close the store.
-	if err := store.Close(); err != nil {
-		b.Fatalf("benchmarkStoreOpen: %s", err)
-	}
-
-	// Run the benchmark loop.
-	b.ResetTimer()
-	for n := 0; n < b.N; n++ {
-		store := tsdb.NewStore(dir)
-		if err := store.Open(); err != nil {
-			b.Fatalf("benchmarkStoreOpen: %s", err)
-		}
-
-		b.StopTimer()
-		store.Close()
-		b.StartTimer()
-	}
-}
-
-func chunkedWriteStoreShard(store *tsdb.Store, shardID int, points []models.Point) {
-	nPts := len(points)
-	chunkSz := 10000
-	start := 0
-	end := chunkSz
-
-	for {
-		if end > nPts {
-			end = nPts
-		}
-		if end-start == 0 {
-			break
-		}
-
-		store.WriteToShard(uint64(shardID), points[start:end])
-		start = end
-		end += chunkSz
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/influxdb/influxdb/uuid/uuid.go b/Godeps/_workspace/src/github.com/influxdb/influxdb/uuid/uuid.go
deleted file mode 100644
index a3144676e..000000000
--- a/Godeps/_workspace/src/github.com/influxdb/influxdb/uuid/uuid.go
+++ /dev/null
@@ -1,95 +0,0 @@
-// Copyright (c) 2012 The gocql 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.
-//    * 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.
-//
-// The uuid package can be used to generate and parse universally unique
-// identifiers, a standardized format in the form of a 128 bit number.
-//
-// http://tools.ietf.org/html/rfc4122
-
-package uuid
-
-import (
-	"sync/atomic"
-	"time"
-)
-
-// UUID - unique identifier type representing a 128 bit number
-type UUID [16]byte
-
-var timeBase = time.Date(1582, time.October, 15, 0, 0, 0, 0, time.UTC).Unix()
-var hardwareAddr []byte
-var clockSeq uint32
-
-// TimeUUID generates a new time based UUID (version 1) using the current
-// time as the timestamp.
-func TimeUUID() UUID {
-	return FromTime(time.Now())
-}
-
-// FromTime generates a new time based UUID (version 1) as described in
-// RFC 4122. This UUID contains the MAC address of the node that generated
-// the UUID, the given timestamp and a sequence number.
-func FromTime(aTime time.Time) UUID {
-	var u UUID
-
-	utcTime := aTime.In(time.UTC)
-	t := uint64(utcTime.Unix()-timeBase)*10000000 + uint64(utcTime.Nanosecond()/100)
-	u[0], u[1], u[2], u[3] = byte(t>>24), byte(t>>16), byte(t>>8), byte(t)
-	u[4], u[5] = byte(t>>40), byte(t>>32)
-	u[6], u[7] = byte(t>>56)&0x0F, byte(t>>48)
-
-	clock := atomic.AddUint32(&clockSeq, 1)
-	u[8] = byte(clock >> 8)
-	u[9] = byte(clock)
-
-	copy(u[10:], hardwareAddr)
-
-	u[6] |= 0x10 // set version to 1 (time based uuid)
-	u[8] &= 0x3F // clear variant
-	u[8] |= 0x80 // set to IETF variant
-
-	return u
-}
-
-// String returns the UUID in it's canonical form, a 32 digit hexadecimal
-// number in the form of xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx.
-func (u UUID) String() string {
-	var offsets = [...]int{0, 2, 4, 6, 9, 11, 14, 16, 19, 21, 24, 26, 28, 30, 32, 34}
-	const hexString = "0123456789abcdef"
-	r := make([]byte, 36)
-	for i, b := range u {
-		r[offsets[i]] = hexString[b>>4]
-		r[offsets[i]+1] = hexString[b&0xF]
-	}
-	r[8] = '-'
-	r[13] = '-'
-	r[18] = '-'
-	r[23] = '-'
-	return string(r)
-
-}
diff --git a/Godeps/_workspace/src/github.com/lib/pq/.gitignore b/Godeps/_workspace/src/github.com/lib/pq/.gitignore
deleted file mode 100644
index 0f1d00e11..000000000
--- a/Godeps/_workspace/src/github.com/lib/pq/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-.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
deleted file mode 100644
index 9bf683730..000000000
--- a/Godeps/_workspace/src/github.com/lib/pq/.travis.yml
+++ /dev/null
@@ -1,68 +0,0 @@
-language: go
-
-go:
-  - 1.1
-  - 1.2
-  - 1.3
-  - 1.4
-  - 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
-    - PGHOST=127.0.0.1
-  matrix:
-    - PGVERSION=9.4 PQTEST_BINARY_PARAMETERS=yes
-    - PGVERSION=9.3 PQTEST_BINARY_PARAMETERS=yes
-    - PGVERSION=9.2 PQTEST_BINARY_PARAMETERS=yes
-    - PGVERSION=9.1 PQTEST_BINARY_PARAMETERS=yes
-    - PGVERSION=9.0 PQTEST_BINARY_PARAMETERS=yes
-    - PGVERSION=8.4 PQTEST_BINARY_PARAMETERS=yes
-    - PGVERSION=9.4 PQTEST_BINARY_PARAMETERS=no
-    - PGVERSION=9.3 PQTEST_BINARY_PARAMETERS=no
-    - PGVERSION=9.2 PQTEST_BINARY_PARAMETERS=no
-    - PGVERSION=9.1 PQTEST_BINARY_PARAMETERS=no
-    - PGVERSION=9.0 PQTEST_BINARY_PARAMETERS=no
-    - PGVERSION=8.4 PQTEST_BINARY_PARAMETERS=no
-
-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
deleted file mode 100644
index 84c937f15..000000000
--- a/Godeps/_workspace/src/github.com/lib/pq/CONTRIBUTING.md
+++ /dev/null
@@ -1,29 +0,0 @@
-## 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
deleted file mode 100644
index 5773904a3..000000000
--- a/Godeps/_workspace/src/github.com/lib/pq/LICENSE.md
+++ /dev/null
@@ -1,8 +0,0 @@
-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
deleted file mode 100644
index 358d644f6..000000000
--- a/Godeps/_workspace/src/github.com/lib/pq/README.md
+++ /dev/null
@@ -1,103 +0,0 @@
-# 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 Gilling (cgilling)
-* Chris Walsh (cwds)
-* Dan Sosedoff (sosedoff)
-* Daniel Farina (fdr)
-* Eric Chlebek (echlebek)
-* Eric Garrido (minusnine)
-* Eric Urban (hydrogen18)
-* 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)
-* Jonathan Rudenberg (titanous)
-* 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)
-* Travis Cline (tmc)
-* TruongSinh Tran-Nguyen (truongsinh)
-* Yaismel Miranda (ympons)
-* 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
deleted file mode 100644
index e71f41d06..000000000
--- a/Godeps/_workspace/src/github.com/lib/pq/bench_test.go
+++ /dev/null
@@ -1,435 +0,0 @@
-// +build go1.1
-
-package pq
-
-import (
-	"bufio"
-	"bytes"
-	"database/sql"
-	"database/sql/driver"
-	"io"
-	"math/rand"
-	"net"
-	"runtime"
-	"strconv"
-	"strings"
-	"sync"
-	"testing"
-	"time"
-
-	"github.com/lib/pq/oid"
-)
-
-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.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.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, formatText)
-	}
-}
-
-var testFloatBytes = []byte("3.14159")
-
-func BenchmarkDecodeFloat64(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		decode(&parameterStatus{}, testFloatBytes, oid.T_float8, formatText)
-	}
-}
-
-var testBoolBytes = []byte{'t'}
-
-func BenchmarkDecodeBool(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		decode(&parameterStatus{}, testBoolBytes, oid.T_bool, formatText)
-	}
-}
-
-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, formatText)
-	}
-}
-
-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, formatText)
-		}
-	}
-
-	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
deleted file mode 100644
index 666b0012a..000000000
--- a/Godeps/_workspace/src/github.com/lib/pq/buf.go
+++ /dev/null
@@ -1,91 +0,0 @@
-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
-}
-
-// N.B: this is actually an unsigned 16-bit integer, unlike int32
-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 struct {
-	buf []byte
-	pos int
-}
-
-func (b *writeBuf) int32(n int) {
-	x := make([]byte, 4)
-	binary.BigEndian.PutUint32(x, uint32(n))
-	b.buf = append(b.buf, x...)
-}
-
-func (b *writeBuf) int16(n int) {
-	x := make([]byte, 2)
-	binary.BigEndian.PutUint16(x, uint16(n))
-	b.buf = append(b.buf, x...)
-}
-
-func (b *writeBuf) string(s string) {
-	b.buf = append(b.buf, (s + "\000")...)
-}
-
-func (b *writeBuf) byte(c byte) {
-	b.buf = append(b.buf, c)
-}
-
-func (b *writeBuf) bytes(v []byte) {
-	b.buf = append(b.buf, v...)
-}
-
-func (b *writeBuf) wrap() []byte {
-	p := b.buf[b.pos:]
-	binary.BigEndian.PutUint32(p, uint32(len(p)))
-	return b.buf
-}
-
-func (b *writeBuf) next(c byte) {
-	p := b.buf[b.pos:]
-	binary.BigEndian.PutUint32(p, uint32(len(p)))
-	b.pos = len(b.buf) + 1
-	b.buf = append(b.buf, c, 0, 0, 0, 0)
-}
diff --git a/Godeps/_workspace/src/github.com/lib/pq/certs/README b/Godeps/_workspace/src/github.com/lib/pq/certs/README
deleted file mode 100644
index 24ab7b256..000000000
--- a/Godeps/_workspace/src/github.com/lib/pq/certs/README
+++ /dev/null
@@ -1,3 +0,0 @@
-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
deleted file mode 100644
index 6e6b4284a..000000000
--- a/Godeps/_workspace/src/github.com/lib/pq/certs/postgresql.crt
+++ /dev/null
@@ -1,69 +0,0 @@
-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
deleted file mode 100644
index eb8b20be9..000000000
--- a/Godeps/_workspace/src/github.com/lib/pq/certs/postgresql.key
+++ /dev/null
@@ -1,15 +0,0 @@
------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
deleted file mode 100644
index aecf8f621..000000000
--- a/Godeps/_workspace/src/github.com/lib/pq/certs/root.crt
+++ /dev/null
@@ -1,24 +0,0 @@
------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
deleted file mode 100644
index ddc995a6d..000000000
--- a/Godeps/_workspace/src/github.com/lib/pq/certs/server.crt
+++ /dev/null
@@ -1,81 +0,0 @@
-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
deleted file mode 100644
index bd7b019b6..000000000
--- a/Godeps/_workspace/src/github.com/lib/pq/certs/server.key
+++ /dev/null
@@ -1,27 +0,0 @@
------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
deleted file mode 100644
index ce661d66e..000000000
--- a/Godeps/_workspace/src/github.com/lib/pq/conn.go
+++ /dev/null
@@ -1,1775 +0,0 @@
-package pq
-
-import (
-	"bufio"
-	"crypto/md5"
-	"crypto/tls"
-	"crypto/x509"
-	"database/sql"
-	"database/sql/driver"
-	"encoding/binary"
-	"errors"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"net"
-	"os"
-	"os/user"
-	"path"
-	"path/filepath"
-	"strconv"
-	"strings"
-	"time"
-	"unicode"
-
-	"github.com/lib/pq/oid"
-)
-
-// 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.")
-	ErrCouldNotDetectUsername    = errors.New("pq: Could not detect default username. Please provide one explicitly.")
-)
-
-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
-
-	// If set, this connection should never use the binary format when
-	// receiving query results from prepared statements.  Only provided for
-	// debugging.
-	disablePreparedBinaryResult bool
-
-	// Whether to always send []byte parameters over as binary.  Enables single
-	// round-trip mode for non-prepared Query calls.
-	binaryParameters bool
-}
-
-// Handle driver-side settings in parsed connection string.
-func (c *conn) handleDriverSettings(o values) (err error) {
-	boolSetting := func(key string, val *bool) error {
-		if value := o.Get(key); value != "" {
-			if value == "yes" {
-				*val = true
-			} else if value == "no" {
-				*val = false
-			} else {
-				return fmt.Errorf("unrecognized value %q for %s", value, key)
-			}
-		}
-		return nil
-	}
-
-	err = boolSetting("disable_prepared_binary_result", &c.disablePreparedBinaryResult)
-	if err != nil {
-		return err
-	}
-	err = boolSetting("binary_parameters", &c.binaryParameters)
-	if err != nil {
-		return err
-	}
-	return nil
-}
-
-func (c *conn) writeBuf(b byte) *writeBuf {
-	c.scratch[0] = b
-	return &writeBuf{
-		buf: c.scratch[:5],
-		pos: 1,
-	}
-}
-
-func Open(name string) (_ driver.Conn, err error) {
-	return DialOpen(defaultDialer{}, name)
-}
-
-func DialOpen(d Dialer, name string) (_ driver.Conn, err error) {
-	// 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.
-	defer errRecoverNoErrBadConn(&err)
-
-	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://") || strings.HasPrefix(name, "postgresql://") {
-		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)
-		}
-	}
-
-	cn := &conn{}
-	err = cn.handleDriverSettings(o)
-	if err != nil {
-		return nil, err
-	}
-
-	cn.c, err = dial(d, o)
-	if err != nil {
-		return nil, err
-	}
-	cn.ssl(o)
-	cn.buf = bufio.NewReader(cn.c)
-	cn.startup(o)
-
-	// reset the deadline, in case one was set (see dial)
-	if timeout := o.Get("connect_timeout"); timeout != "" && timeout != "0" {
-		err = cn.c.SetDeadline(time.Time{})
-	}
-	return cn, err
-}
-
-func dial(d Dialer, o values) (net.Conn, error) {
-	ntw, addr := network(o)
-	// SSL is not necessary or supported over UNIX domain sockets
-	if ntw == "unix" {
-		o["sslmode"] = "disable"
-	}
-
-	// Zero or not specified means wait indefinitely.
-	if timeout := o.Get("connect_timeout"); 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 {
-		if cn.isInTransaction() {
-			cn.bad = true
-		}
-		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 {
-		if cn.isInTransaction() {
-			cn.bad = true
-		}
-		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)
-		}
-	}
-}
-
-func (cn *conn) simpleQuery(q string) (res *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{
-				cn:       cn,
-				colNames: st.colNames,
-				colTyps:  st.colTyps,
-				colFmts:  st.colFmts,
-				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{cn: cn}
-			res.colNames, res.colFmts, res.colTyps = parsePortalRowDescribe(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)
-		}
-	}
-}
-
-// Decides which column formats to use for a prepared statement.  The input is
-// an array of type oids, one element per result column.
-func decideColumnFormats(colTyps []oid.Oid, forceText bool) (colFmts []format, colFmtData []byte) {
-	if len(colTyps) == 0 {
-		return nil, colFmtDataAllText
-	}
-
-	colFmts = make([]format, len(colTyps))
-	if forceText {
-		return colFmts, colFmtDataAllText
-	}
-
-	allBinary := true
-	allText := true
-	for i, o := range colTyps {
-		switch o {
-		// This is the list of types to use binary mode for when receiving them
-		// through a prepared statement.  If a type appears in this list, it
-		// must also be implemented in binaryDecode in encode.go.
-		case oid.T_bytea:
-			fallthrough
-		case oid.T_int8:
-			fallthrough
-		case oid.T_int4:
-			fallthrough
-		case oid.T_int2:
-			colFmts[i] = formatBinary
-			allText = false
-
-		default:
-			allBinary = false
-		}
-	}
-
-	if allBinary {
-		return colFmts, colFmtDataAllBinary
-	} else if allText {
-		return colFmts, colFmtDataAllText
-	} else {
-		colFmtData = make([]byte, 2+len(colFmts)*2)
-		binary.BigEndian.PutUint16(colFmtData, uint16(len(colFmts)))
-		for i, v := range colFmts {
-			binary.BigEndian.PutUint16(colFmtData[2+i*2:], uint16(v))
-		}
-		return colFmts, colFmtData
-	}
-}
-
-func (cn *conn) prepareTo(q, stmtName string) *stmt {
-	st := &stmt{cn: cn, name: stmtName}
-
-	b := cn.writeBuf('P')
-	b.string(st.name)
-	b.string(q)
-	b.int16(0)
-
-	b.next('D')
-	b.byte('S')
-	b.string(st.name)
-
-	b.next('S')
-	cn.send(b)
-
-	cn.readParseResponse()
-	st.paramTyps, st.colNames, st.colTyps = cn.readStatementDescribeResponse()
-	st.colFmts, st.colFmtData = decideColumnFormats(st.colTyps, cn.disablePreparedBinaryResult)
-	cn.readReadyForQuery()
-	return st
-}
-
-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()), nil
-}
-
-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)
-	}
-
-	if cn.binaryParameters {
-		cn.sendBinaryModeQuery(query, args)
-
-		cn.readParseResponse()
-		cn.readBindResponse()
-		rows := &rows{cn: cn}
-		rows.colNames, rows.colFmts, rows.colTyps = cn.readPortalDescribeResponse()
-		cn.postExecuteWorkaround()
-		return rows, nil
-	} else {
-		st := cn.prepareTo(query, "")
-		st.exec(args)
-		return &rows{
-			cn:       cn,
-			colNames: st.colNames,
-			colTyps:  st.colTyps,
-			colFmts:  st.colFmts,
-		}, nil
-	}
-}
-
-// Implement the optional "Execer" interface for one-shot queries
-func (cn *conn) Exec(query string, args []driver.Value) (res 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
-	}
-
-	if cn.binaryParameters {
-		cn.sendBinaryModeQuery(query, args)
-
-		cn.readParseResponse()
-		cn.readBindResponse()
-		cn.readPortalDescribeResponse()
-		cn.postExecuteWorkaround()
-		res, _, err = cn.readExecuteResponse("Execute")
-		return res, err
-	} else {
-		// Use the unnamed statement to defer planning until bind
-		// time, or else value-based selectivity estimates cannot be
-		// used.
-		st := cn.prepareTo(query, "")
-		r, err := st.Exec(args)
-		if err != nil {
-			panic(err)
-		}
-		return r, err
-	}
-}
-
-func (cn *conn) send(m *writeBuf) {
-	_, err := cn.c.Write(m.wrap())
-	if err != nil {
-		panic(err)
-	}
-}
-
-func (cn *conn) sendStartupPacket(m *writeBuf) {
-	// sanity check
-	if m.buf[0] != 0 {
-		panic("oops")
-	}
-
-	_, err := cn.c.Write((m.wrap())[1:])
-	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
-		}
-	}
-}
-
-// 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
-		}
-	}
-}
-
-// 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.sendStartupPacket(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 an 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 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
-	case "disable_prepared_binary_result":
-		return true
-	case "binary_parameters":
-		return true
-
-	default:
-		return false
-	}
-}
-
-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.sendStartupPacket(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 format int
-
-const formatText format = 0
-const formatBinary format = 1
-
-// One result-column format code with the value 1 (i.e. all binary).
-var colFmtDataAllBinary []byte = []byte{0, 1, 0, 1}
-
-// No result-column format codes (i.e. all text).
-var colFmtDataAllText []byte = []byte{0, 0}
-
-type stmt struct {
-	cn         *conn
-	name       string
-	colNames   []string
-	colFmts    []format
-	colFmtData []byte
-	colTyps    []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{
-		cn:       st.cn,
-		colNames: st.colNames,
-		colTyps:  st.colTyps,
-		colFmts:  st.colFmts,
-	}, 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)
-	res, _, err = st.cn.readExecuteResponse("simple query")
-	return res, err
-}
-
-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))
-	}
-
-	cn := st.cn
-	w := cn.writeBuf('B')
-	w.byte(0) // unnamed portal
-	w.string(st.name)
-
-	if cn.binaryParameters {
-		cn.sendBinaryParameters(w, v)
-	} else {
-		w.int16(0)
-		w.int16(len(v))
-		for i, x := range v {
-			if x == nil {
-				w.int32(-1)
-			} else {
-				b := encode(&cn.parameterStatus, x, st.paramTyps[i])
-				w.int32(len(b))
-				w.bytes(b)
-			}
-		}
-	}
-	w.bytes(st.colFmtData)
-
-	w.next('E')
-	w.byte(0)
-	w.int32(0)
-
-	w.next('S')
-	cn.send(w)
-
-	cn.readBindResponse()
-	cn.postExecuteWorkaround()
-
-}
-
-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 {
-	cn       *conn
-	colNames []string
-	colTyps  []oid.Oid
-	colFmts  []format
-	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
-		}
-	}
-}
-
-func (rs *rows) Columns() []string {
-	return rs.colNames
-}
-
-func (rs *rows) Next(dest []driver.Value) (err error) {
-	if rs.done {
-		return io.EOF
-	}
-
-	conn := rs.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 err != nil {
-				conn.bad = true
-				errorf("unexpected DataRow after error %s", err)
-			}
-			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.colTyps[i], rs.colFmts[i])
-			}
-			return
-		default:
-			errorf("unexpected message after execute: %q", t)
-		}
-	}
-}
-
-// 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 (cn *conn) sendBinaryParameters(b *writeBuf, args []driver.Value) {
-	// Do one pass over the parameters to see if we're going to send any of
-	// them over in binary.  If we are, create a paramFormats array at the
-	// same time.
-	var paramFormats []int
-	for i, x := range args {
-		_, ok := x.([]byte)
-		if ok {
-			if paramFormats == nil {
-				paramFormats = make([]int, len(args))
-			}
-			paramFormats[i] = 1
-		}
-	}
-	if paramFormats == nil {
-		b.int16(0)
-	} else {
-		b.int16(len(paramFormats))
-		for _, x := range paramFormats {
-			b.int16(x)
-		}
-	}
-
-	b.int16(len(args))
-	for _, x := range args {
-		if x == nil {
-			b.int32(-1)
-		} else {
-			datum := binaryEncode(&cn.parameterStatus, x)
-			b.int32(len(datum))
-			b.bytes(datum)
-		}
-	}
-}
-
-func (cn *conn) sendBinaryModeQuery(query string, args []driver.Value) {
-	if len(args) >= 65536 {
-		errorf("got %d parameters but PostgreSQL only supports 65535 parameters", len(args))
-	}
-
-	b := cn.writeBuf('P')
-	b.byte(0) // unnamed statement
-	b.string(query)
-	b.int16(0)
-
-	b.next('B')
-	b.int16(0) // unnamed portal and statement
-	cn.sendBinaryParameters(b, args)
-	b.bytes(colFmtDataAllText)
-
-	b.next('D')
-	b.byte('P')
-	b.byte(0) // unnamed portal
-
-	b.next('E')
-	b.byte(0)
-	b.int32(0)
-
-	b.next('S')
-	cn.send(b)
-}
-
-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 (cn *conn) readReadyForQuery() {
-	t, r := cn.recv1()
-	switch t {
-	case 'Z':
-		cn.processReadyForQuery(r)
-		return
-	default:
-		cn.bad = true
-		errorf("unexpected message %q; expected ReadyForQuery", t)
-	}
-}
-
-func (cn *conn) readParseResponse() {
-	t, r := cn.recv1()
-	switch t {
-	case '1':
-		return
-	case 'E':
-		err := parseError(r)
-		cn.readReadyForQuery()
-		panic(err)
-	default:
-		cn.bad = true
-		errorf("unexpected Parse response %q", t)
-	}
-}
-
-func (cn *conn) readStatementDescribeResponse() (paramTyps []oid.Oid, colNames []string, colTyps []oid.Oid) {
-	for {
-		t, r := cn.recv1()
-		switch t {
-		case 't':
-			nparams := r.int16()
-			paramTyps = make([]oid.Oid, nparams)
-			for i := range paramTyps {
-				paramTyps[i] = r.oid()
-			}
-		case 'n':
-			return paramTyps, nil, nil
-		case 'T':
-			colNames, colTyps = parseStatementRowDescribe(r)
-			return paramTyps, colNames, colTyps
-		case 'E':
-			err := parseError(r)
-			cn.readReadyForQuery()
-			panic(err)
-		default:
-			cn.bad = true
-			errorf("unexpected Describe statement response %q", t)
-		}
-	}
-}
-
-func (cn *conn) readPortalDescribeResponse() (colNames []string, colFmts []format, colTyps []oid.Oid) {
-	t, r := cn.recv1()
-	switch t {
-	case 'T':
-		return parsePortalRowDescribe(r)
-	case 'n':
-		return nil, nil, nil
-	case 'E':
-		err := parseError(r)
-		cn.readReadyForQuery()
-		panic(err)
-	default:
-		cn.bad = true
-		errorf("unexpected Describe response %q", t)
-	}
-	panic("not reached")
-}
-
-func (cn *conn) readBindResponse() {
-	t, r := cn.recv1()
-	switch t {
-	case '2':
-		return
-	case 'E':
-		err := parseError(r)
-		cn.readReadyForQuery()
-		panic(err)
-	default:
-		cn.bad = true
-		errorf("unexpected Bind response %q", t)
-	}
-}
-
-func (cn *conn) postExecuteWorkaround() {
-	// 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.
-	for {
-		t, r := cn.recv1()
-		switch t {
-		case 'E':
-			err := parseError(r)
-			cn.readReadyForQuery()
-			panic(err)
-		case 'C', 'D', 'I':
-			// the query didn't fail, but we can't process this message
-			cn.saveMessage(t, r)
-			return
-		default:
-			cn.bad = true
-			errorf("unexpected message during extended query execution: %q", t)
-		}
-	}
-}
-
-// Only for Exec(), since we ignore the returned data
-func (cn *conn) readExecuteResponse(protocolState string) (res driver.Result, commandTag string, err error) {
-	for {
-		t, r := cn.recv1()
-		switch t {
-		case 'C':
-			if err != nil {
-				cn.bad = true
-				errorf("unexpected CommandComplete after error %s", err)
-			}
-			res, commandTag = cn.parseComplete(r.string())
-		case 'Z':
-			cn.processReadyForQuery(r)
-			return res, commandTag, err
-		case 'E':
-			err = parseError(r)
-		case 'T', 'D', 'I':
-			if err != nil {
-				cn.bad = true
-				errorf("unexpected %q after error %s", t, err)
-			}
-			// ignore any results
-		default:
-			cn.bad = true
-			errorf("unknown %s response: %q", protocolState, t)
-		}
-	}
-}
-
-func parseStatementRowDescribe(r *readBuf) (colNames []string, colTyps []oid.Oid) {
-	n := r.int16()
-	colNames = make([]string, n)
-	colTyps = make([]oid.Oid, n)
-	for i := range colNames {
-		colNames[i] = r.string()
-		r.next(6)
-		colTyps[i] = r.oid()
-		r.next(6)
-		// format code not known when describing a statement; always 0
-		r.next(2)
-	}
-	return
-}
-
-func parsePortalRowDescribe(r *readBuf) (colNames []string, colFmts []format, colTyps []oid.Oid) {
-	n := r.int16()
-	colNames = make([]string, n)
-	colFmts = make([]format, n)
-	colTyps = make([]oid.Oid, n)
-	for i := range colNames {
-		colNames[i] = r.string()
-		r.next(6)
-		colTyps[i] = r.oid()
-		r.next(6)
-		colFmts[i] = format(r.int16())
-	}
-	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
deleted file mode 100644
index af07e5596..000000000
--- a/Godeps/_workspace/src/github.com/lib/pq/conn_test.go
+++ /dev/null
@@ -1,1306 +0,0 @@
-package pq
-
-import (
-	"database/sql"
-	"database/sql/driver"
-	"fmt"
-	"io"
-	"os"
-	"reflect"
-	"strings"
-	"testing"
-	"time"
-)
-
-type Fatalistic interface {
-	Fatal(args ...interface{})
-}
-
-func forceBinaryParameters() bool {
-	bp := os.Getenv("PQTEST_BINARY_PARAMETERS")
-	if bp == "yes" {
-		return true
-	} else if bp == "" || bp == "no" {
-		return false
-	} else {
-		panic("unexpected value for PQTEST_BINARY_PARAMETERS")
-	}
-}
-
-func openTestConnConninfo(conninfo string) (*sql.DB, error) {
-	defaultTo := func(envvar string, value string) {
-		if os.Getenv(envvar) == "" {
-			os.Setenv(envvar, value)
-		}
-	}
-	defaultTo("PGDATABASE", "pqgotest")
-	defaultTo("PGSSLMODE", "disable")
-	defaultTo("PGCONNECT_TIMEOUT", "20")
-
-	if forceBinaryParameters() &&
-		!strings.HasPrefix(conninfo, "postgres://") &&
-		!strings.HasPrefix(conninfo, "postgresql://") {
-		conninfo = conninfo + " binary_parameters=yes"
-	}
-
-	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) {
-	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) {
-	testURL := func(url string) {
-		db, err := openTestConnConninfo(url)
-		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()
-	}
-	testURL("postgres://")
-	testURL("postgresql://")
-}
-
-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,
-			-321,
-			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, got8 interface{}
-
-	err = r.Scan(&got1, &got2, &got3, &got4, &got5, &got6, &got7, &got8)
-	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 != int64(-321) {
-		t.Fatalf("expected -321, got %d", got7)
-	}
-
-	if got8 != float64(3.14) {
-		t.Fatalf("expected 3.14, got %f", got8)
-	}
-}
-
-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) {
-	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")
-	}
-}
-
-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)
-	}
-}
-
-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)
-		}
-
-		// application_name didn't exist before 9.0
-		if test.param == "application_name" && getServerVersion(t, db) < 90000 {
-			db.Close()
-			continue
-		}
-
-		tryGetParameterValue := func() (value string, outcome RuntimeTestResult) {
-			defer db.Close()
-			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/copy.go b/Godeps/_workspace/src/github.com/lib/pq/copy.go
deleted file mode 100644
index e44fa48a5..000000000
--- a/Godeps/_workspace/src/github.com/lib/pq/copy.go
+++ /dev/null
@@ -1,268 +0,0 @@
-package pq
-
-import (
-	"database/sql/driver"
-	"encoding/binary"
-	"errors"
-	"fmt"
-	"sync"
-)
-
-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
-
-	sync.Mutex // guards err
-	err        error
-}
-
-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, 1),
-	}
-	// 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)
-		}
-	}
-}
-
-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 {
-		var r readBuf
-		t, err := ci.cn.recvMessage(&r)
-		if err != nil {
-			ci.cn.bad = true
-			ci.setError(err)
-			ci.done <- true
-			return
-		}
-		switch t {
-		case 'C':
-			// complete
-		case 'N':
-			// NoticeResponse
-		case 'Z':
-			ci.cn.processReadyForQuery(&r)
-			ci.done <- true
-			return
-		case 'E':
-			err := parseError(&r)
-			ci.setError(err)
-		default:
-			ci.cn.bad = true
-			ci.setError(fmt.Errorf("unknown response during CopyIn: %q", t))
-			ci.done <- true
-			return
-		}
-	}
-}
-
-func (ci *copyin) isErrorSet() bool {
-	ci.Lock()
-	isSet := (ci.err != nil)
-	ci.Unlock()
-	return isSet
-}
-
-// setError() sets ci.err if one has not been set already.  Caller must not be
-// holding ci.Mutex.
-func (ci *copyin) setError(err error) {
-	ci.Lock()
-	if ci.err == nil {
-		ci.err = err
-	}
-	ci.Unlock()
-}
-
-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
deleted file mode 100644
index 6af4c9c76..000000000
--- a/Godeps/_workspace/src/github.com/lib/pq/copy_test.go
+++ /dev/null
@@ -1,462 +0,0 @@
-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 TestCopyInRaiseStmtTrigger(t *testing.T) {
-	db := openTestConn(t)
-	defer db.Close()
-
-	if getServerVersion(t, db) < 90000 {
-		var exists int
-		err := db.QueryRow("SELECT 1 FROM pg_language WHERE lanname = 'plpgsql'").Scan(&exists)
-		if err == sql.ErrNoRows {
-			t.Skip("language PL/PgSQL does not exist; skipping TestCopyInRaiseStmtTrigger")
-		} else if err != nil {
-			t.Fatal(err)
-		}
-	}
-
-	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)
-	}
-
-	_, err = txn.Exec(`
-			CREATE OR REPLACE FUNCTION pg_temp.temptest()
-			RETURNS trigger AS 
-			$BODY$ begin
-				raise notice 'Hello world';
-				return new;
-			end $BODY$
-			LANGUAGE plpgsql`)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	_, err = txn.Exec(`
-			CREATE TRIGGER temptest_trigger
-			BEFORE INSERT
-			ON temp 
-			FOR EACH ROW
-			EXECUTE PROCEDURE pg_temp.temptest()`)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	stmt, err := txn.Prepare(CopyIn("temp", "a", "b"))
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	longString := strings.Repeat("#", 500)
-
-	_, err = stmt.Exec(int64(1), 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 != 1 {
-		t.Fatalf("expected 1 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)
-	}
-}
-
-// Tests for connection errors in copyin.resploop()
-func TestCopyRespLoopConnectionError(t *testing.T) {
-	db := openTestConn(t)
-	defer db.Close()
-
-	txn, err := db.Begin()
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer txn.Rollback()
-
-	var pid int
-	err = txn.QueryRow("SELECT pg_backend_pid()").Scan(&pid)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	_, err = txn.Exec("CREATE TEMP TABLE temp (a int)")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	stmt, err := txn.Prepare(CopyIn("temp", "a"))
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	_, err = db.Exec("SELECT pg_terminate_backend($1)", pid)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if getServerVersion(t, db) < 90500 {
-		// We have to try and send something over, since postgres before
-		// version 9.5 won't process SIGTERMs while it's waiting for
-		// CopyData/CopyEnd messages; see tcop/postgres.c.
-		_, err = stmt.Exec(1)
-		if err != nil {
-			t.Fatal(err)
-		}
-	}
-	_, err = stmt.Exec()
-	if err == nil {
-		t.Fatalf("expected error")
-	}
-	pge, ok := err.(*Error)
-	if !ok {
-		t.Fatalf("expected *pq.Error, got %+#v", err)
-	} else if pge.Code.Name() != "admin_shutdown" {
-		t.Fatalf("expected admin_shutdown, got %s", pge.Code.Name())
-	}
-
-	err = stmt.Close()
-	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
deleted file mode 100644
index f772117d0..000000000
--- a/Godeps/_workspace/src/github.com/lib/pq/doc.go
+++ /dev/null
@@ -1,210 +0,0 @@
-/*
-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 (
-		"database/sql"
-
-		_ "github.com/lib/pq"
-	)
-
-	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
deleted file mode 100644
index 88422eb3d..000000000
--- a/Godeps/_workspace/src/github.com/lib/pq/encode.go
+++ /dev/null
@@ -1,538 +0,0 @@
-package pq
-
-import (
-	"bytes"
-	"database/sql/driver"
-	"encoding/binary"
-	"encoding/hex"
-	"fmt"
-	"math"
-	"strconv"
-	"strings"
-	"sync"
-	"time"
-
-	"github.com/lib/pq/oid"
-)
-
-func binaryEncode(parameterStatus *parameterStatus, x interface{}) []byte {
-	switch v := x.(type) {
-	case []byte:
-		return v
-	default:
-		return encode(parameterStatus, x, oid.T_unknown)
-	}
-	panic("not reached")
-}
-
-func encode(parameterStatus *parameterStatus, x interface{}, pgtypOid oid.Oid) []byte {
-	switch v := x.(type) {
-	case int64:
-		return strconv.AppendInt(nil, v, 10)
-	case float64:
-		return strconv.AppendFloat(nil, v, 'f', -1, 64)
-	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 strconv.AppendBool(nil, 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, f format) interface{} {
-	if f == formatBinary {
-		return binaryDecode(parameterStatus, s, typ)
-	} else {
-		return textDecode(parameterStatus, s, typ)
-	}
-}
-
-func binaryDecode(parameterStatus *parameterStatus, s []byte, typ oid.Oid) interface{} {
-	switch typ {
-	case oid.T_bytea:
-		return s
-	case oid.T_int8:
-		return int64(binary.BigEndian.Uint64(s))
-	case oid.T_int4:
-		return int64(int32(binary.BigEndian.Uint32(s)))
-	case oid.T_int2:
-		return int64(int16(binary.BigEndian.Uint16(s)))
-
-	default:
-		errorf("don't know how to decode binary parameter of type %u", uint32(typ))
-	}
-
-	panic("not reached")
-}
-
-func textDecode(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_int4, oid.T_int2:
-		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 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)
-
-	// 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
-}
-
-var infinityTsEnabled = false
-var infinityTsNegative time.Time
-var infinityTsPositive time.Time
-
-const (
-	infinityTsEnabledAlready        = "pq: infinity timestamp enabled already"
-	infinityTsNegativeMustBeSmaller = "pq: infinity timestamp: negative value must be smaller (before) than positive"
-)
-
-/*
- * If EnableInfinityTs is not called, "-infinity" and "infinity" will return
- * []byte("-infinity") and []byte("infinity") respectively, and potentially
- * cause error "sql: Scan error on column index 0: unsupported driver -> Scan pair: []uint8 -> *time.Time",
- * when scanning into a time.Time value.
- *
- * Once EnableInfinityTs has been called, all connections created using this
- * driver will decode Postgres' "-infinity" and "infinity" for "timestamp",
- * "timestamp with time zone" and "date" types to the predefined minimum and
- * maximum times, respectively.  When encoding time.Time values, any time which
- * equals or preceeds the predefined minimum time will be encoded to
- * "-infinity".  Any values at or past the maximum time will similarly be
- * encoded to "infinity".
- *
- *
- * If EnableInfinityTs is called with negative >= positive, it will panic.
- * Calling EnableInfinityTs after a connection has been established results in
- * undefined behavior.  If EnableInfinityTs is called more than once, it will
- * panic.
- */
-func EnableInfinityTs(negative time.Time, positive time.Time) {
-	if infinityTsEnabled {
-		panic(infinityTsEnabledAlready)
-	}
-	if !negative.Before(positive) {
-		panic(infinityTsNegativeMustBeSmaller)
-	}
-	infinityTsEnabled = true
-	infinityTsNegative = negative
-	infinityTsPositive = positive
-}
-
-/*
- * Testing might want to toggle infinityTsEnabled
- */
-func disableInfinityTs() {
-	infinityTsEnabled = false
-}
-
-// 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) interface{} {
-	switch str {
-	case "-infinity":
-		if infinityTsEnabled {
-			return infinityTsNegative
-		}
-		return []byte(str)
-	case "infinity":
-		if infinityTsEnabled {
-			return infinityTsPositive
-		}
-		return []byte(str)
-	}
-
-	monSep := strings.IndexRune(str, '-')
-	// this is Gregorian year, not ISO Year
-	// In Gregorian system, the year 1 BC is followed by AD 1
-	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
-
-	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)
-	}
-	var isoYear int
-	if remainderIdx < len(str) && str[remainderIdx:remainderIdx+3] == " BC" {
-		isoYear = 1 - year
-		remainderIdx += 3
-	} else {
-		isoYear = year
-	}
-	if remainderIdx < len(str) {
-		errorf("expected end of input, got %v", str[remainderIdx:])
-	}
-	t := time.Date(isoYear, 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 into a format postgres understands.
-func formatTs(t time.Time) (b []byte) {
-	if infinityTsEnabled {
-		// t <= -infinity : ! (t > -infinity)
-		if !t.After(infinityTsNegative) {
-			return []byte("-infinity")
-		}
-		// t >= infinity : ! (!t < infinity)
-		if !t.Before(infinityTsPositive) {
-			return []byte("infinity")
-		}
-	}
-	// Need to send dates before 0001 A.D. with " BC" suffix, instead of the
-	// minus sign preferred by Go.
-	// Beware, "0000" in ISO is "1 BC", "-0001" is "2 BC" and so on
-	bc := false
-	if t.Year() <= 0 {
-		// flip year sign, and add 1, e.g: "0" will be "1", and "-10" will be "11"
-		t = t.AddDate((-t.Year())*2+1, 0, 0)
-		bc = true
-	}
-	b = []byte(t.Format(time.RFC3339Nano))
-
-	_, offset := t.Zone()
-	offset = offset % 60
-	if offset != 0 {
-		// RFC3339Nano already printed the minus sign
-		if offset < 0 {
-			offset = -offset
-		}
-
-		b = append(b, ':')
-		if offset < 10 {
-			b = append(b, '0')
-		}
-		b = strconv.AppendInt(b, int64(offset), 10)
-	}
-
-	if bc {
-		b = append(b, " BC"...)
-	}
-	return b
-}
-
-// 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 = make([]byte, 2+hex.EncodedLen(len(v)))
-		result[0] = '\\'
-		result[1] = 'x'
-		hex.Encode(result[2:], 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
deleted file mode 100644
index 97b663886..000000000
--- a/Godeps/_workspace/src/github.com/lib/pq/encode_test.go
+++ /dev/null
@@ -1,719 +0,0 @@
-package pq
-
-import (
-	"bytes"
-	"database/sql"
-	"fmt"
-	"testing"
-	"time"
-
-	"github.com/lib/pq/oid"
-)
-
-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))},
-	{"0011-02-03 04:05:06 BC", time.Date(-10, time.February, 3, 4, 5, 6, 0, time.FixedZone("", 0))},
-	{"0011-02-03 04:05:06.123 BC", time.Date(-10, time.February, 3, 4, 5, 6, 123000000, time.FixedZone("", 0))},
-	{"0011-02-03 04:05:06.123-07 BC", time.Date(-10, time.February, 3, 4, 5, 6, 123000000,
-		time.FixedZone("", -7*60*60))},
-	{"0001-02-03 04:05:06.123", time.Date(1, time.February, 3, 4, 5, 6, 123000000, time.FixedZone("", 0))},
-	{"0001-02-03 04:05:06.123 BC", time.Date(1, time.February, 3, 4, 5, 6, 123000000, time.FixedZone("", 0)).AddDate(-1, 0, 0)},
-	{"0001-02-03 04:05:06.123 BC", time.Date(0, time.February, 3, 4, 5, 6, 123000000, time.FixedZone("", 0))},
-	{"0002-02-03 04:05:06.123 BC", time.Date(0, time.February, 3, 4, 5, 6, 123000000, time.FixedZone("", 0)).AddDate(-1, 0, 0)},
-	{"0002-02-03 04:05:06.123 BC", time.Date(-1, time.February, 3, 4, 5, 6, 123000000, time.FixedZone("", 0))},
-	{"12345-02-03 04:05:06.1", time.Date(12345, time.February, 3, 4, 5, 6, 100000000, time.FixedZone("", 0))},
-	{"123456-02-03 04:05:06.1", time.Date(123456, time.February, 3, 4, 5, 6, 100000000, time.FixedZone("", 0))},
-}
-
-// 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
-		}
-	}()
-	i := parseTs(nil, str)
-	t, ok := i.(time.Time)
-	if !ok {
-		err = fmt.Errorf("Not a time.Time type, got %#v", i)
-	}
-	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(2001, time.February, 3, 4, 5, 6, 0, time.FixedZone("", -(7*60*60+30*60+9))), "2001-02-03T04:05:06-07:30:09"},
-
-	{time.Date(1, time.February, 3, 4, 5, 6, 123456789, time.FixedZone("", 0)), "0001-02-03T04:05:06.123456789Z"},
-	{time.Date(1, time.February, 3, 4, 5, 6, 123456789, time.FixedZone("", 2*60*60)), "0001-02-03T04:05:06.123456789+02:00"},
-	{time.Date(1, time.February, 3, 4, 5, 6, 123456789, time.FixedZone("", -6*60*60)), "0001-02-03T04:05:06.123456789-06:00"},
-
-	{time.Date(0, time.February, 3, 4, 5, 6, 123456789, time.FixedZone("", 0)), "0001-02-03T04:05:06.123456789Z BC"},
-	{time.Date(0, time.February, 3, 4, 5, 6, 123456789, time.FixedZone("", 2*60*60)), "0001-02-03T04:05:06.123456789+02:00 BC"},
-	{time.Date(0, time.February, 3, 4, 5, 6, 123456789, time.FixedZone("", -6*60*60)), "0001-02-03T04:05:06.123456789-06:00 BC"},
-
-	{time.Date(1, time.February, 3, 4, 5, 6, 0, time.FixedZone("", -(7*60*60+30*60+9))), "0001-02-03T04:05:06-07:30:09"},
-	{time.Date(0, time.February, 3, 4, 5, 6, 0, time.FixedZone("", -(7*60*60+30*60+9))), "0001-02-03T04:05:06-07:30:09 BC"},
-}
-
-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 TestInfinityTimestamp(t *testing.T) {
-	db := openTestConn(t)
-	defer db.Close()
-	var err error
-	var resultT time.Time
-
-	expectedError := fmt.Errorf(`sql: Scan error on column index 0: unsupported driver -> Scan pair: []uint8 -> *time.Time`)
-	type testCases []struct {
-		Query       string
-		Param       string
-		ExpectedErr error
-		ExpectedVal interface{}
-	}
-	tc := testCases{
-		{"SELECT $1::timestamp", "-infinity", expectedError, "-infinity"},
-		{"SELECT $1::timestamptz", "-infinity", expectedError, "-infinity"},
-		{"SELECT $1::timestamp", "infinity", expectedError, "infinity"},
-		{"SELECT $1::timestamptz", "infinity", expectedError, "infinity"},
-	}
-	// try to assert []byte to time.Time
-	for _, q := range tc {
-		err = db.QueryRow(q.Query, q.Param).Scan(&resultT)
-		if err.Error() != q.ExpectedErr.Error() {
-			t.Errorf("Scanning -/+infinity, expected error, %q, got %q", q.ExpectedErr, err)
-		}
-	}
-	// yield []byte
-	for _, q := range tc {
-		var resultI interface{}
-		err = db.QueryRow(q.Query, q.Param).Scan(&resultI)
-		if err != nil {
-			t.Errorf("Scanning -/+infinity, expected no error, got %q", err)
-		}
-		result, ok := resultI.([]byte)
-		if !ok {
-			t.Errorf("Scanning -/+infinity, expected []byte, got %#v", resultI)
-		}
-		if string(result) != q.ExpectedVal {
-			t.Errorf("Scanning -/+infinity, expected %q, got %q", q.ExpectedVal, result)
-		}
-	}
-
-	y1500 := time.Date(1500, time.January, 1, 0, 0, 0, 0, time.UTC)
-	y2500 := time.Date(2500, time.January, 1, 0, 0, 0, 0, time.UTC)
-	EnableInfinityTs(y1500, y2500)
-
-	err = db.QueryRow("SELECT $1::timestamp", "infinity").Scan(&resultT)
-	if err != nil {
-		t.Errorf("Scanning infinity, expected no error, got %q", err)
-	}
-	if !resultT.Equal(y2500) {
-		t.Errorf("Scanning infinity, expected %q, got %q", y2500, resultT)
-	}
-
-	err = db.QueryRow("SELECT $1::timestamptz", "infinity").Scan(&resultT)
-	if err != nil {
-		t.Errorf("Scanning infinity, expected no error, got %q", err)
-	}
-	if !resultT.Equal(y2500) {
-		t.Errorf("Scanning Infinity, expected time %q, got %q", y2500, resultT.String())
-	}
-
-	err = db.QueryRow("SELECT $1::timestamp", "-infinity").Scan(&resultT)
-	if err != nil {
-		t.Errorf("Scanning -infinity, expected no error, got %q", err)
-	}
-	if !resultT.Equal(y1500) {
-		t.Errorf("Scanning -infinity, expected time %q, got %q", y1500, resultT.String())
-	}
-
-	err = db.QueryRow("SELECT $1::timestamptz", "-infinity").Scan(&resultT)
-	if err != nil {
-		t.Errorf("Scanning -infinity, expected no error, got %q", err)
-	}
-	if !resultT.Equal(y1500) {
-		t.Errorf("Scanning -infinity, expected time %q, got %q", y1500, resultT.String())
-	}
-
-	y_1500 := time.Date(-1500, time.January, 1, 0, 0, 0, 0, time.UTC)
-	y11500 := time.Date(11500, time.January, 1, 0, 0, 0, 0, time.UTC)
-	var s string
-	err = db.QueryRow("SELECT $1::timestamp::text", y_1500).Scan(&s)
-	if err != nil {
-		t.Errorf("Encoding -infinity, expected no error, got %q", err)
-	}
-	if s != "-infinity" {
-		t.Errorf("Encoding -infinity, expected %q, got %q", "-infinity", s)
-	}
-	err = db.QueryRow("SELECT $1::timestamptz::text", y_1500).Scan(&s)
-	if err != nil {
-		t.Errorf("Encoding -infinity, expected no error, got %q", err)
-	}
-	if s != "-infinity" {
-		t.Errorf("Encoding -infinity, expected %q, got %q", "-infinity", s)
-	}
-
-	err = db.QueryRow("SELECT $1::timestamp::text", y11500).Scan(&s)
-	if err != nil {
-		t.Errorf("Encoding infinity, expected no error, got %q", err)
-	}
-	if s != "infinity" {
-		t.Errorf("Encoding infinity, expected %q, got %q", "infinity", s)
-	}
-	err = db.QueryRow("SELECT $1::timestamptz::text", y11500).Scan(&s)
-	if err != nil {
-		t.Errorf("Encoding infinity, expected no error, got %q", err)
-	}
-	if s != "infinity" {
-		t.Errorf("Encoding infinity, expected %q, got %q", "infinity", s)
-	}
-
-	disableInfinityTs()
-
-	var panicErrorString string
-	func() {
-		defer func() {
-			panicErrorString, _ = recover().(string)
-		}()
-		EnableInfinityTs(y2500, y1500)
-	}()
-	if panicErrorString != infinityTsNegativeMustBeSmaller {
-		t.Errorf("Expected error, %q, got %q", infinityTsNegativeMustBeSmaller, panicErrorString)
-	}
-}
-
-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 TestByteSliceToText(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 TestStringToBytea(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 TestTextByteSliceToUUID(t *testing.T) {
-	db := openTestConn(t)
-	defer db.Close()
-
-	b := []byte("a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11")
-	row := db.QueryRow("SELECT $1::uuid", b)
-
-	var result string
-	err := row.Scan(&result)
-	if forceBinaryParameters() {
-		pqErr := err.(*Error)
-		if pqErr == nil {
-			t.Errorf("Expected to get error")
-		} else if pqErr.Code != "22P03" {
-			t.Fatalf("Expected to get invalid binary encoding error (22P03), got %s", pqErr.Code)
-		}
-	} else {
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		if result != string(b) {
-			t.Fatalf("expected %v but got %v", b, result)
-		}
-	}
-}
-
-func TestBinaryByteSlicetoUUID(t *testing.T) {
-	db := openTestConn(t)
-	defer db.Close()
-
-	b := []byte{'\xa0','\xee','\xbc','\x99',
-				'\x9c', '\x0b',
-				'\x4e', '\xf8',
-				'\xbb', '\x00', '\x6b',
-				'\xb9', '\xbd', '\x38', '\x0a', '\x11'}
-	row := db.QueryRow("SELECT $1::uuid", b)
-
-	var result string
-	err := row.Scan(&result)
-	if forceBinaryParameters() {
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		if result != string("a0eebc99-9c0b-4ef8-bb00-6bb9bd380a11") {
-			t.Fatalf("expected %v but got %v", b, result)
-		}
-	} else {
-		pqErr := err.(*Error)
-		if pqErr == nil {
-			t.Errorf("Expected to get error")
-		} else if pqErr.Code != "22021" {
-			t.Fatalf("Expected to get invalid byte sequence for encoding error (22021), got %s", pqErr.Code)
-		}
-	}
-}
-
-func TestStringToUUID(t *testing.T) {
-	db := openTestConn(t)
-	defer db.Close()
-
-	s := "a0eebc99-9c0b-4ef8-bb00-6bb9bd380a11"
-	row := db.QueryRow("SELECT $1::uuid", s)
-
-	var result string
-	err := row.Scan(&result)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if result != s {
-		t.Fatalf("expected %v but got %v", s, result)
-	}
-}
-
-func TestTextByteSliceToInt(t *testing.T) {
-	db := openTestConn(t)
-	defer db.Close()
-
-	expected := 12345678
-	b := []byte(fmt.Sprintf("%d", expected))
-	row := db.QueryRow("SELECT $1::int", b)
-
-	var result int
-	err := row.Scan(&result)
-	if forceBinaryParameters() {
-		pqErr := err.(*Error)
-		if pqErr == nil {
-			t.Errorf("Expected to get error")
-		} else if pqErr.Code != "22P03" {
-			t.Fatalf("Expected to get invalid binary encoding error (22P03), got %s", pqErr.Code)
-		}
-	} else {
-		if err != nil {
-			t.Fatal(err)
-		}
-		if result != expected {
-			t.Fatalf("expected %v but got %v", expected, result)
-		}
-	}
-}
-
-func TestBinaryByteSliceToInt(t *testing.T) {
-	db := openTestConn(t)
-	defer db.Close()
-
-	expected := 12345678
-	b := []byte{'\x00', '\xbc', '\x61', '\x4e'}
-	row := db.QueryRow("SELECT $1::int", b)
-
-	var result int
-	err := row.Scan(&result)
-	if forceBinaryParameters() {
-		if err != nil {
-			t.Fatal(err)
-		}
-		if result != expected {
-			t.Fatalf("expected %v but got %v", expected, result)
-		}
-	} else {
-		pqErr := err.(*Error)
-		if pqErr == nil {
-			t.Errorf("Expected to get error")
-		} else if pqErr.Code != "22021" {
-			t.Fatalf("Expected to get invalid byte sequence for encoding error (22021), got %s", pqErr.Code)
-		}
-	}
-}
-
-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, usePrepared bool) {
-		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)
-		}
-		var rows *sql.Rows
-		var stmt *sql.Stmt
-		if usePrepared {
-			stmt, err = txn.Prepare(sqlQuery)
-			if err != nil {
-				t.Fatal(err)
-			}
-			rows, err = stmt.Query()
-		} else {
-			// 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 stmt != nil {
-			err = stmt.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", false)
-	testByteaOutputFormat("escape", false)
-	testByteaOutputFormat("hex", true)
-	testByteaOutputFormat("escape", true)
-}
-
-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, 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.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
deleted file mode 100644
index b4bb44cee..000000000
--- a/Godeps/_workspace/src/github.com/lib/pq/error.go
+++ /dev/null
@@ -1,508 +0,0 @@
-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 errRecoverNoErrBadConn(err *error) {
-	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)
-	}
-}
-
-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
deleted file mode 100644
index 72d5abf51..000000000
--- a/Godeps/_workspace/src/github.com/lib/pq/hstore/hstore.go
+++ /dev/null
@@ -1,118 +0,0 @@
-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
deleted file mode 100644
index c9c108fc3..000000000
--- a/Godeps/_workspace/src/github.com/lib/pq/hstore/hstore_test.go
+++ /dev/null
@@ -1,148 +0,0 @@
-package hstore
-
-import (
-	"database/sql"
-	"os"
-	"testing"
-
-	_ "github.com/lib/pq"
-)
-
-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.Skipf("Skipping hstore tests - hstore extension create failed: %s", err.Error())
-	}
-
-	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
deleted file mode 100644
index 5bc99f5c1..000000000
--- a/Godeps/_workspace/src/github.com/lib/pq/listen_example/doc.go
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
-
-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 (
-        "database/sql"
-        "fmt"
-        "time"
-
-        "github.com/lib/pq"
-    )
-
-    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
deleted file mode 100644
index 8cad57815..000000000
--- a/Godeps/_workspace/src/github.com/lib/pq/notify.go
+++ /dev/null
@@ -1,766 +0,0 @@
-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"
-	"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 {
-	// we must acquire senderLock first to avoid deadlocks; see ExecSimpleQuery
-	l.senderLock.Lock()
-
-	l.connectionLock.Lock()
-	err := l.err
-	l.connectionLock.Unlock()
-	if err != nil {
-		l.senderLock.Unlock()
-		return err
-	}
-	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 errRecoverNoErrBadConn(&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 'T', 'D':
-			// only used by tests; ignore
-
-		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)
-		}
-	}
-}
-
-// 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 errRecoverNoErrBadConn(&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.
-	b := &writeBuf{
-		buf: []byte("Q\x00\x00\x00\x00"),
-		pos: 1,
-	}
-	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()
-		// Set the error pointer if it hasn't been set already; see
-		// listenerConnMain.
-		if l.err == nil {
-			l.err = err
-		}
-		l.connectionLock.Unlock()
-		l.cn.c.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.  err should have been set already.
-			l.connectionLock.Lock()
-			err := l.err
-			l.connectionLock.Unlock()
-			return false, err
-		}
-		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)
-		}
-	}
-}
-
-func (l *ListenerConn) Close() error {
-	l.connectionLock.Lock()
-	if l.err != nil {
-		l.connectionLock.Unlock()
-		return errListenerConnClosed
-	}
-	l.err = errListenerConnClosed
-	l.connectionLock.Unlock()
-	// We can't send anything on the connection without holding senderLock.
-	// Simply close the net.Conn to wake up everyone operating on it.
-	return l.cn.c.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
-}
-
-// Returns the notification channel for this listener.  This is the same
-// channel as Notify, and will not be recreated during the life time of the
-// Listener.
-func (l *Listener) NotificationChannel() <-chan *Notification {
-	return l.Notify
-}
-
-// 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
-		}
-	}
-}
-
-// 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
deleted file mode 100644
index fe8941a4e..000000000
--- a/Godeps/_workspace/src/github.com/lib/pq/notify_test.go
+++ /dev/null
@@ -1,574 +0,0 @@
-package pq
-
-import (
-	"errors"
-	"fmt"
-	"io"
-	"os"
-	"runtime"
-	"sync"
-	"sync/atomic"
-	"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")
-	}
-}
-
-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
-	}
-}
-
-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):
-		panic("expectEvent timeout")
-	}
-}
-
-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
-	}
-}
-
-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)
-	}
-}
-
-// Test for deadlock where a query fails while another one is queued
-func TestConnExecDeadlock(t *testing.T) {
-	l, _ := newTestListenerConn(t)
-	defer l.Close()
-
-	var wg sync.WaitGroup
-	wg.Add(2)
-
-	go func() {
-		l.ExecSimpleQuery("SELECT pg_sleep(60)")
-		wg.Done()
-	}()
-	runtime.Gosched()
-	go func() {
-		l.ExecSimpleQuery("SELECT 1")
-		wg.Done()
-	}()
-	// give the two goroutines some time to get into position
-	runtime.Gosched()
-	// calls Close on the net.Conn; equivalent to a network failure
-	l.Close()
-
-	var done int32 = 0
-	go func() {
-		time.Sleep(10 * time.Second)
-		if atomic.LoadInt32(&done) != 1 {
-			panic("timed out")
-		}
-	}()
-	wg.Wait()
-	atomic.StoreInt32(&done, 1)
-}
-
-// Test for ListenerConn being closed while a slow query is executing
-func TestListenerConnCloseWhileQueryIsExecuting(t *testing.T) {
-	l, _ := newTestListenerConn(t)
-	defer l.Close()
-
-	var wg sync.WaitGroup
-	wg.Add(1)
-
-	go func() {
-		sent, err := l.ExecSimpleQuery("SELECT pg_sleep(60)")
-		if sent {
-			panic("expected sent=false")
-		}
-		// could be any of a number of errors
-		if err == nil {
-			panic("expected error")
-		}
-		wg.Done()
-	}()
-	// give the above goroutine some time to get into position
-	runtime.Gosched()
-	err := l.Close()
-	if err != nil {
-		t.Fatal(err)
-	}
-	var done int32 = 0
-	go func() {
-		time.Sleep(10 * time.Second)
-		if atomic.LoadInt32(&done) != 1 {
-			panic("timed out")
-		}
-	}()
-	wg.Wait()
-	atomic.StoreInt32(&done, 1)
-}
-
-func TestNotifyExtra(t *testing.T) {
-	db := openTestConn(t)
-	defer db.Close()
-
-	if getServerVersion(t, db) < 90000 {
-		t.Skip("skipping NOTIFY payload test since the server does not appear to support it")
-	}
-
-	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
deleted file mode 100644
index caaede248..000000000
--- a/Godeps/_workspace/src/github.com/lib/pq/oid/doc.go
+++ /dev/null
@@ -1,6 +0,0 @@
-// 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
deleted file mode 100644
index cd4aea808..000000000
--- a/Godeps/_workspace/src/github.com/lib/pq/oid/gen.go
+++ /dev/null
@@ -1,74 +0,0 @@
-// +build ignore
-
-// Generate the table of OID values
-// Run with 'go run gen.go'.
-package main
-
-import (
-	"database/sql"
-	"fmt"
-	"log"
-	"os"
-	"os/exec"
-
-	_ "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
deleted file mode 100644
index 03df05a61..000000000
--- a/Godeps/_workspace/src/github.com/lib/pq/oid/types.go
+++ /dev/null
@@ -1,161 +0,0 @@
-// 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
deleted file mode 100644
index 932b336f5..000000000
--- a/Godeps/_workspace/src/github.com/lib/pq/ssl_test.go
+++ /dev/null
@@ -1,226 +0,0 @@
-package pq
-
-// This file contains SSL tests
-
-import (
-	_ "crypto/sha256"
-	"crypto/x509"
-	"database/sql"
-	"fmt"
-	"os"
-	"path/filepath"
-	"testing"
-)
-
-func maybeSkipSSLTests(t *testing.T) {
-	// Require some special variables for testing certificates
-	if os.Getenv("PQSSLCERTTEST_PATH") == "" {
-		t.Skip("PQSSLCERTTEST_PATH not set, skipping SSL tests")
-	}
-
-	value := os.Getenv("PQGOSSLTESTS")
-	if value == "" || value == "0" {
-		t.Skip("PQGOSSLTESTS not enabled, skipping SSL tests")
-	} else if value != "1" {
-		t.Fatalf("unexpected value %q for PQGOSSLTESTS", value)
-	}
-}
-
-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.Fatalf("expected error with conninfo=%q", conninfo)
-	}
-}
-
-// Connect over SSL and run a simple query to test the basics
-func TestSSLConnection(t *testing.T) {
-	maybeSkipSSLTests(t)
-	// 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) {
-	maybeSkipSSLTests(t)
-	// 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) {
-	maybeSkipSSLTests(t)
-	// 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) {
-	maybeSkipSSLTests(t)
-	// 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) {
-	maybeSkipSSLTests(t)
-	// 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
deleted file mode 100644
index 9bac95c48..000000000
--- a/Godeps/_workspace/src/github.com/lib/pq/url.go
+++ /dev/null
@@ -1,76 +0,0 @@
-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" && u.Scheme != "postgresql" {
-		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
deleted file mode 100644
index 29f4a7c75..000000000
--- a/Godeps/_workspace/src/github.com/lib/pq/url_test.go
+++ /dev/null
@@ -1,54 +0,0 @@
-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
deleted file mode 100644
index e937d7d08..000000000
--- a/Godeps/_workspace/src/github.com/lib/pq/user_posix.go
+++ /dev/null
@@ -1,24 +0,0 @@
-// Package pq is a pure Go Postgres driver for the database/sql package.
-
-// +build darwin dragonfly freebsd linux nacl netbsd openbsd solaris
-
-package pq
-
-import (
-	"os"
-	"os/user"
-)
-
-func userCurrent() (string, error) {
-	u, err := user.Current()
-	if err == nil {
-		return u.Username, nil
-	}
-
-	name := os.Getenv("USER")
-	if name != "" {
-		return name, nil
-	}
-
-	return "", ErrCouldNotDetectUsername
-}
diff --git a/Godeps/_workspace/src/github.com/lib/pq/user_windows.go b/Godeps/_workspace/src/github.com/lib/pq/user_windows.go
deleted file mode 100644
index 2b691267b..000000000
--- a/Godeps/_workspace/src/github.com/lib/pq/user_windows.go
+++ /dev/null
@@ -1,27 +0,0 @@
-// 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 "", ErrCouldNotDetectUsername
-	}
-	s := syscall.UTF16ToString(pw_name)
-	u := filepath.Base(s)
-	return u, nil
-}
diff --git a/Godeps/_workspace/src/github.com/matttproud/golang_protobuf_extensions/pbutil/all_test.go b/Godeps/_workspace/src/github.com/matttproud/golang_protobuf_extensions/pbutil/all_test.go
deleted file mode 100644
index 094156e66..000000000
--- a/Godeps/_workspace/src/github.com/matttproud/golang_protobuf_extensions/pbutil/all_test.go
+++ /dev/null
@@ -1,320 +0,0 @@
-// Copyright 2013 Matt T. Proud
-//
-// 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 pbutil
-
-import (
-	"bytes"
-	"math/rand"
-	"reflect"
-	"testing"
-	"testing/quick"
-
-	"github.com/matttproud/golang_protobuf_extensions/pbtest"
-
-	. "github.com/golang/protobuf/proto"
-	. "github.com/golang/protobuf/proto/testdata"
-)
-
-func TestWriteDelimited(t *testing.T) {
-	for _, test := range []struct {
-		msg Message
-		buf []byte
-		n   int
-		err error
-	}{
-		{
-			msg: &Empty{},
-			n:   1,
-			buf: []byte{0},
-		},
-		{
-			msg: &GoEnum{Foo: FOO_FOO1.Enum()},
-			n:   3,
-			buf: []byte{2, 8, 1},
-		},
-		{
-			msg: &Strings{
-				StringField: String(`This is my gigantic, unhappy string.  It exceeds
-the encoding size of a single byte varint.  We are using it to fuzz test the
-correctness of the header decoding mechanisms, which may prove problematic.
-I expect it may.  Let's hope you enjoy testing as much as we do.`),
-			},
-			n: 271,
-			buf: []byte{141, 2, 10, 138, 2, 84, 104, 105, 115, 32, 105, 115, 32, 109,
-				121, 32, 103, 105, 103, 97, 110, 116, 105, 99, 44, 32, 117, 110, 104,
-				97, 112, 112, 121, 32, 115, 116, 114, 105, 110, 103, 46, 32, 32, 73,
-				116, 32, 101, 120, 99, 101, 101, 100, 115, 10, 116, 104, 101, 32, 101,
-				110, 99, 111, 100, 105, 110, 103, 32, 115, 105, 122, 101, 32, 111, 102,
-				32, 97, 32, 115, 105, 110, 103, 108, 101, 32, 98, 121, 116, 101, 32,
-				118, 97, 114, 105, 110, 116, 46, 32, 32, 87, 101, 32, 97, 114, 101, 32,
-				117, 115, 105, 110, 103, 32, 105, 116, 32, 116, 111, 32, 102, 117, 122,
-				122, 32, 116, 101, 115, 116, 32, 116, 104, 101, 10, 99, 111, 114, 114,
-				101, 99, 116, 110, 101, 115, 115, 32, 111, 102, 32, 116, 104, 101, 32,
-				104, 101, 97, 100, 101, 114, 32, 100, 101, 99, 111, 100, 105, 110, 103,
-				32, 109, 101, 99, 104, 97, 110, 105, 115, 109, 115, 44, 32, 119, 104,
-				105, 99, 104, 32, 109, 97, 121, 32, 112, 114, 111, 118, 101, 32, 112,
-				114, 111, 98, 108, 101, 109, 97, 116, 105, 99, 46, 10, 73, 32, 101, 120,
-				112, 101, 99, 116, 32, 105, 116, 32, 109, 97, 121, 46, 32, 32, 76, 101,
-				116, 39, 115, 32, 104, 111, 112, 101, 32, 121, 111, 117, 32, 101, 110,
-				106, 111, 121, 32, 116, 101, 115, 116, 105, 110, 103, 32, 97, 115, 32,
-				109, 117, 99, 104, 32, 97, 115, 32, 119, 101, 32, 100, 111, 46},
-		},
-	} {
-		var buf bytes.Buffer
-		if n, err := WriteDelimited(&buf, test.msg); n != test.n || err != test.err {
-			t.Fatalf("WriteDelimited(buf, %#v) = %v, %v; want %v, %v", test.msg, n, err, test.n, test.err)
-		}
-		if out := buf.Bytes(); !bytes.Equal(out, test.buf) {
-			t.Fatalf("WriteDelimited(buf, %#v); buf = %v; want %v", test.msg, out, test.buf)
-		}
-	}
-}
-
-func TestReadDelimited(t *testing.T) {
-	for _, test := range []struct {
-		buf []byte
-		msg Message
-		n   int
-		err error
-	}{
-		{
-			buf: []byte{0},
-			msg: &Empty{},
-			n:   1,
-		},
-		{
-			n:   3,
-			buf: []byte{2, 8, 1},
-			msg: &GoEnum{Foo: FOO_FOO1.Enum()},
-		},
-		{
-			buf: []byte{141, 2, 10, 138, 2, 84, 104, 105, 115, 32, 105, 115, 32, 109,
-				121, 32, 103, 105, 103, 97, 110, 116, 105, 99, 44, 32, 117, 110, 104,
-				97, 112, 112, 121, 32, 115, 116, 114, 105, 110, 103, 46, 32, 32, 73,
-				116, 32, 101, 120, 99, 101, 101, 100, 115, 10, 116, 104, 101, 32, 101,
-				110, 99, 111, 100, 105, 110, 103, 32, 115, 105, 122, 101, 32, 111, 102,
-				32, 97, 32, 115, 105, 110, 103, 108, 101, 32, 98, 121, 116, 101, 32,
-				118, 97, 114, 105, 110, 116, 46, 32, 32, 87, 101, 32, 97, 114, 101, 32,
-				117, 115, 105, 110, 103, 32, 105, 116, 32, 116, 111, 32, 102, 117, 122,
-				122, 32, 116, 101, 115, 116, 32, 116, 104, 101, 10, 99, 111, 114, 114,
-				101, 99, 116, 110, 101, 115, 115, 32, 111, 102, 32, 116, 104, 101, 32,
-				104, 101, 97, 100, 101, 114, 32, 100, 101, 99, 111, 100, 105, 110, 103,
-				32, 109, 101, 99, 104, 97, 110, 105, 115, 109, 115, 44, 32, 119, 104,
-				105, 99, 104, 32, 109, 97, 121, 32, 112, 114, 111, 118, 101, 32, 112,
-				114, 111, 98, 108, 101, 109, 97, 116, 105, 99, 46, 10, 73, 32, 101, 120,
-				112, 101, 99, 116, 32, 105, 116, 32, 109, 97, 121, 46, 32, 32, 76, 101,
-				116, 39, 115, 32, 104, 111, 112, 101, 32, 121, 111, 117, 32, 101, 110,
-				106, 111, 121, 32, 116, 101, 115, 116, 105, 110, 103, 32, 97, 115, 32,
-				109, 117, 99, 104, 32, 97, 115, 32, 119, 101, 32, 100, 111, 46},
-			msg: &Strings{
-				StringField: String(`This is my gigantic, unhappy string.  It exceeds
-the encoding size of a single byte varint.  We are using it to fuzz test the
-correctness of the header decoding mechanisms, which may prove problematic.
-I expect it may.  Let's hope you enjoy testing as much as we do.`),
-			},
-			n: 271,
-		},
-	} {
-		msg := Clone(test.msg)
-		msg.Reset()
-		if n, err := ReadDelimited(bytes.NewBuffer(test.buf), msg); n != test.n || err != test.err {
-			t.Fatalf("ReadDelimited(%v, msg) = %v, %v; want %v, %v", test.buf, n, err, test.n, test.err)
-		}
-		if !Equal(msg, test.msg) {
-			t.Fatalf("ReadDelimited(%v, msg); msg = %v; want %v", test.buf, msg, test.msg)
-		}
-	}
-}
-
-func TestEndToEndValid(t *testing.T) {
-	for _, test := range [][]Message{
-		{&Empty{}},
-		{&GoEnum{Foo: FOO_FOO1.Enum()}, &Empty{}, &GoEnum{Foo: FOO_FOO1.Enum()}},
-		{&GoEnum{Foo: FOO_FOO1.Enum()}},
-		{&Strings{
-			StringField: String(`This is my gigantic, unhappy string.  It exceeds
-the encoding size of a single byte varint.  We are using it to fuzz test the
-correctness of the header decoding mechanisms, which may prove problematic.
-I expect it may.  Let's hope you enjoy testing as much as we do.`),
-		}},
-	} {
-		var buf bytes.Buffer
-		var written int
-		for i, msg := range test {
-			n, err := WriteDelimited(&buf, msg)
-			if err != nil {
-				// Assumption: TestReadDelimited and TestWriteDelimited are sufficient
-				//             and inputs for this test are explicitly exercised there.
-				t.Fatalf("WriteDelimited(buf, %v[%d]) = ?, %v; wanted ?, nil", test, i, err)
-			}
-			written += n
-		}
-		var read int
-		for i, msg := range test {
-			out := Clone(msg)
-			out.Reset()
-			n, _ := ReadDelimited(&buf, out)
-			// Decide to do EOF checking?
-			read += n
-			if !Equal(out, msg) {
-				t.Fatalf("out = %v; want %v[%d] = %#v", out, test, i, msg)
-			}
-		}
-		if read != written {
-			t.Fatalf("%v read = %d; want %d", test, read, written)
-		}
-	}
-}
-
-// rndMessage generates a random valid Protocol Buffer message.
-func rndMessage(r *rand.Rand) Message {
-	var t reflect.Type
-	switch v := rand.Intn(23); v {
-	// TODO(br): Uncomment the elements below once fix is incorporated, except
-	//           for the elements marked as patently incompatible.
-	// case 0:
-	// 	t = reflect.TypeOf(&GoEnum{})
-	// 	break
-	// case 1:
-	// 	t = reflect.TypeOf(&GoTestField{})
-	// 	break
-	case 2:
-		t = reflect.TypeOf(&GoTest{})
-		break
-		// case 3:
-		// 	t = reflect.TypeOf(&GoSkipTest{})
-		// 	break
-		// case 4:
-		// 	t = reflect.TypeOf(&NonPackedTest{})
-		// 	break
-		// case 5:
-		// t = reflect.TypeOf(&PackedTest{})
-		//	break
-	case 6:
-		t = reflect.TypeOf(&MaxTag{})
-		break
-	case 7:
-		t = reflect.TypeOf(&OldMessage{})
-		break
-	case 8:
-		t = reflect.TypeOf(&NewMessage{})
-		break
-	case 9:
-		t = reflect.TypeOf(&InnerMessage{})
-		break
-	case 10:
-		t = reflect.TypeOf(&OtherMessage{})
-		break
-	case 11:
-		// PATENTLY INVALID FOR FUZZ GENERATION
-		// t = reflect.TypeOf(&MyMessage{})
-		break
-		// case 12:
-		// 	t = reflect.TypeOf(&Ext{})
-		// 	break
-	case 13:
-		// PATENTLY INVALID FOR FUZZ GENERATION
-		// t = reflect.TypeOf(&MyMessageSet{})
-		break
-		// case 14:
-		//   t = reflect.TypeOf(&Empty{})
-		//   break
-		// case 15:
-		// t = reflect.TypeOf(&MessageList{})
-		// break
-		// case 16:
-		// 	t = reflect.TypeOf(&Strings{})
-		// 	break
-		// case 17:
-		// 	t = reflect.TypeOf(&Defaults{})
-		// 	break
-		// case 17:
-		// 	t = reflect.TypeOf(&SubDefaults{})
-		// 	break
-		// case 18:
-		// 	t = reflect.TypeOf(&RepeatedEnum{})
-		// 	break
-	case 19:
-		t = reflect.TypeOf(&MoreRepeated{})
-		break
-		// case 20:
-		// 	t = reflect.TypeOf(&GroupOld{})
-		// 	break
-		// case 21:
-		// 	t = reflect.TypeOf(&GroupNew{})
-		// 	break
-	case 22:
-		t = reflect.TypeOf(&FloatingPoint{})
-		break
-	default:
-		// TODO(br): Replace with an unreachable once fixed.
-		t = reflect.TypeOf(&GoTest{})
-		break
-	}
-	if t == nil {
-		t = reflect.TypeOf(&GoTest{})
-	}
-	v, ok := quick.Value(t, r)
-	if !ok {
-		panic("attempt to generate illegal item; consult item 11")
-	}
-	if err := pbtest.SanitizeGenerated(v.Interface().(Message)); err != nil {
-		panic(err)
-	}
-	return v.Interface().(Message)
-}
-
-// rndMessages generates several random Protocol Buffer messages.
-func rndMessages(r *rand.Rand) []Message {
-	n := r.Intn(128)
-	out := make([]Message, 0, n)
-	for i := 0; i < n; i++ {
-		out = append(out, rndMessage(r))
-	}
-	return out
-}
-
-func TestFuzz(t *testing.T) {
-	rnd := rand.New(rand.NewSource(42))
-	check := func() bool {
-		messages := rndMessages(rnd)
-		var buf bytes.Buffer
-		var written int
-		for i, msg := range messages {
-			n, err := WriteDelimited(&buf, msg)
-			if err != nil {
-				t.Fatalf("WriteDelimited(buf, %v[%d]) = ?, %v; wanted ?, nil", messages, i, err)
-			}
-			written += n
-		}
-		var read int
-		for i, msg := range messages {
-			out := Clone(msg)
-			out.Reset()
-			n, _ := ReadDelimited(&buf, out)
-			read += n
-			if !Equal(out, msg) {
-				t.Fatalf("out = %v; want %v[%d] = %#v", out, messages, i, msg)
-			}
-		}
-		if read != written {
-			t.Fatalf("%v read = %d; want %d", messages, read, written)
-		}
-		return true
-	}
-	if err := quick.Check(check, nil); err != nil {
-		t.Fatal(err)
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/matttproud/golang_protobuf_extensions/pbutil/decode.go b/Godeps/_workspace/src/github.com/matttproud/golang_protobuf_extensions/pbutil/decode.go
deleted file mode 100644
index 66d9b5458..000000000
--- a/Godeps/_workspace/src/github.com/matttproud/golang_protobuf_extensions/pbutil/decode.go
+++ /dev/null
@@ -1,75 +0,0 @@
-// Copyright 2013 Matt T. Proud
-//
-// 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 pbutil
-
-import (
-	"encoding/binary"
-	"errors"
-	"io"
-
-	"github.com/golang/protobuf/proto"
-)
-
-var errInvalidVarint = errors.New("invalid varint32 encountered")
-
-// ReadDelimited decodes a message from the provided length-delimited stream,
-// where the length is encoded as 32-bit varint prefix to the message body.
-// It returns the total number of bytes read and any applicable error.  This is
-// roughly equivalent to the companion Java API's
-// MessageLite#parseDelimitedFrom.  As per the reader contract, this function
-// calls r.Read repeatedly as required until exactly one message including its
-// prefix is read and decoded (or an error has occurred).  The function never
-// reads more bytes from the stream than required.  The function never returns
-// an error if a message has been read and decoded correctly, even if the end
-// of the stream has been reached in doing so.  In that case, any subsequent
-// calls return (0, io.EOF).
-func ReadDelimited(r io.Reader, m proto.Message) (n int, err error) {
-	// Per AbstractParser#parsePartialDelimitedFrom with
-	// CodedInputStream#readRawVarint32.
-	headerBuf := make([]byte, binary.MaxVarintLen32)
-	var bytesRead, varIntBytes int
-	var messageLength uint64
-	for varIntBytes == 0 { // i.e. no varint has been decoded yet.
-		if bytesRead >= len(headerBuf) {
-			return bytesRead, errInvalidVarint
-		}
-		// We have to read byte by byte here to avoid reading more bytes
-		// than required. Each read byte is appended to what we have
-		// read before.
-		newBytesRead, err := r.Read(headerBuf[bytesRead : bytesRead+1])
-		if newBytesRead == 0 {
-			if err != nil {
-				return bytesRead, err
-			}
-			// A Reader should not return (0, nil), but if it does,
-			// it should be treated as no-op (according to the
-			// Reader contract). So let's go on...
-			continue
-		}
-		bytesRead += newBytesRead
-		// Now present everything read so far to the varint decoder and
-		// see if a varint can be decoded already.
-		messageLength, varIntBytes = proto.DecodeVarint(headerBuf[:bytesRead])
-	}
-
-	messageBuf := make([]byte, messageLength)
-	newBytesRead, err := io.ReadFull(r, messageBuf)
-	bytesRead += newBytesRead
-	if err != nil {
-		return bytesRead, err
-	}
-
-	return bytesRead, proto.Unmarshal(messageBuf, m)
-}
diff --git a/Godeps/_workspace/src/github.com/matttproud/golang_protobuf_extensions/pbutil/doc.go b/Godeps/_workspace/src/github.com/matttproud/golang_protobuf_extensions/pbutil/doc.go
deleted file mode 100644
index c318385cb..000000000
--- a/Godeps/_workspace/src/github.com/matttproud/golang_protobuf_extensions/pbutil/doc.go
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2013 Matt T. Proud
-//
-// 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 pbutil provides record length-delimited Protocol Buffer streaming.
-package pbutil
diff --git a/Godeps/_workspace/src/github.com/matttproud/golang_protobuf_extensions/pbutil/encode.go b/Godeps/_workspace/src/github.com/matttproud/golang_protobuf_extensions/pbutil/encode.go
deleted file mode 100644
index 4b76ea9a1..000000000
--- a/Godeps/_workspace/src/github.com/matttproud/golang_protobuf_extensions/pbutil/encode.go
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright 2013 Matt T. Proud
-//
-// 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 pbutil
-
-import (
-	"encoding/binary"
-	"io"
-
-	"github.com/golang/protobuf/proto"
-)
-
-// WriteDelimited encodes and dumps a message to the provided writer prefixed
-// with a 32-bit varint indicating the length of the encoded message, producing
-// a length-delimited record stream, which can be used to chain together
-// encoded messages of the same type together in a file.  It returns the total
-// number of bytes written and any applicable error.  This is roughly
-// equivalent to the companion Java API's MessageLite#writeDelimitedTo.
-func WriteDelimited(w io.Writer, m proto.Message) (n int, err error) {
-	buffer, err := proto.Marshal(m)
-	if err != nil {
-		return 0, err
-	}
-
-	buf := make([]byte, binary.MaxVarintLen32)
-	encodedLength := binary.PutUvarint(buf, uint64(len(buffer)))
-
-	sync, err := w.Write(buf[:encodedLength])
-	if err != nil {
-		return sync, err
-	}
-
-	n, err = w.Write(buffer)
-	return n + sync, err
-}
diff --git a/Godeps/_workspace/src/github.com/matttproud/golang_protobuf_extensions/pbutil/fixtures_test.go b/Godeps/_workspace/src/github.com/matttproud/golang_protobuf_extensions/pbutil/fixtures_test.go
deleted file mode 100644
index d6d9b2559..000000000
--- a/Godeps/_workspace/src/github.com/matttproud/golang_protobuf_extensions/pbutil/fixtures_test.go
+++ /dev/null
@@ -1,103 +0,0 @@
-// Copyright 2010 The Go Authors.  All rights reserved.
-// http://github.com/golang/protobuf/
-//
-// 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.
-
-package pbutil
-
-import (
-	. "github.com/golang/protobuf/proto"
-	. "github.com/golang/protobuf/proto/testdata"
-)
-
-// FROM https://github.com/golang/protobuf/blob/master/proto/all_test.go.
-
-func initGoTestField() *GoTestField {
-	f := new(GoTestField)
-	f.Label = String("label")
-	f.Type = String("type")
-	return f
-}
-
-// These are all structurally equivalent but the tag numbers differ.
-// (It's remarkable that required, optional, and repeated all have
-// 8 letters.)
-func initGoTest_RequiredGroup() *GoTest_RequiredGroup {
-	return &GoTest_RequiredGroup{
-		RequiredField: String("required"),
-	}
-}
-
-func initGoTest_OptionalGroup() *GoTest_OptionalGroup {
-	return &GoTest_OptionalGroup{
-		RequiredField: String("optional"),
-	}
-}
-
-func initGoTest_RepeatedGroup() *GoTest_RepeatedGroup {
-	return &GoTest_RepeatedGroup{
-		RequiredField: String("repeated"),
-	}
-}
-
-func initGoTest(setdefaults bool) *GoTest {
-	pb := new(GoTest)
-	if setdefaults {
-		pb.F_BoolDefaulted = Bool(Default_GoTest_F_BoolDefaulted)
-		pb.F_Int32Defaulted = Int32(Default_GoTest_F_Int32Defaulted)
-		pb.F_Int64Defaulted = Int64(Default_GoTest_F_Int64Defaulted)
-		pb.F_Fixed32Defaulted = Uint32(Default_GoTest_F_Fixed32Defaulted)
-		pb.F_Fixed64Defaulted = Uint64(Default_GoTest_F_Fixed64Defaulted)
-		pb.F_Uint32Defaulted = Uint32(Default_GoTest_F_Uint32Defaulted)
-		pb.F_Uint64Defaulted = Uint64(Default_GoTest_F_Uint64Defaulted)
-		pb.F_FloatDefaulted = Float32(Default_GoTest_F_FloatDefaulted)
-		pb.F_DoubleDefaulted = Float64(Default_GoTest_F_DoubleDefaulted)
-		pb.F_StringDefaulted = String(Default_GoTest_F_StringDefaulted)
-		pb.F_BytesDefaulted = Default_GoTest_F_BytesDefaulted
-		pb.F_Sint32Defaulted = Int32(Default_GoTest_F_Sint32Defaulted)
-		pb.F_Sint64Defaulted = Int64(Default_GoTest_F_Sint64Defaulted)
-	}
-
-	pb.Kind = GoTest_TIME.Enum()
-	pb.RequiredField = initGoTestField()
-	pb.F_BoolRequired = Bool(true)
-	pb.F_Int32Required = Int32(3)
-	pb.F_Int64Required = Int64(6)
-	pb.F_Fixed32Required = Uint32(32)
-	pb.F_Fixed64Required = Uint64(64)
-	pb.F_Uint32Required = Uint32(3232)
-	pb.F_Uint64Required = Uint64(6464)
-	pb.F_FloatRequired = Float32(3232)
-	pb.F_DoubleRequired = Float64(6464)
-	pb.F_StringRequired = String("string")
-	pb.F_BytesRequired = []byte("bytes")
-	pb.F_Sint32Required = Int32(-32)
-	pb.F_Sint64Required = Int64(-64)
-	pb.Requiredgroup = initGoTest_RequiredGroup()
-
-	return pb
-}
diff --git a/Godeps/_workspace/src/github.com/mreiferson/go-snappystream/.travis.yml b/Godeps/_workspace/src/github.com/mreiferson/go-snappystream/.travis.yml
deleted file mode 100644
index a09420b31..000000000
--- a/Godeps/_workspace/src/github.com/mreiferson/go-snappystream/.travis.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-language: go
-go:
-  - 1.2.2
-  - 1.3.1
-env:
-  - GOARCH=amd64
-  - GOARCH=386
-install:
-  - go get code.google.com/p/snappy-go/snappy
-script:
-  - go test -v
-notifications:
-  email: false
diff --git a/Godeps/_workspace/src/github.com/mreiferson/go-snappystream/LICENSE b/Godeps/_workspace/src/github.com/mreiferson/go-snappystream/LICENSE
deleted file mode 100644
index 89de35479..000000000
--- a/Godeps/_workspace/src/github.com/mreiferson/go-snappystream/LICENSE
+++ /dev/null
@@ -1,17 +0,0 @@
-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/mreiferson/go-snappystream/README.md b/Godeps/_workspace/src/github.com/mreiferson/go-snappystream/README.md
deleted file mode 100644
index 277264fc8..000000000
--- a/Godeps/_workspace/src/github.com/mreiferson/go-snappystream/README.md
+++ /dev/null
@@ -1,11 +0,0 @@
-## go-snappystream
-
-a Go package for framed snappy streams.
-
-[![Build Status](https://secure.travis-ci.org/mreiferson/go-snappystream.png?branch=master)](http://travis-ci.org/mreiferson/go-snappystream) [![GoDoc](https://godoc.org/github.com/mreiferson/go-snappystream?status.svg)](https://godoc.org/github.com/mreiferson/go-snappystream)
-
-This package wraps [snappy-go][1] and supplies a `Reader` and `Writer` 
-for the snappy [framed stream format][2].
-
-[1]: https://code.google.com/p/snappy-go/
-[2]: https://snappy.googlecode.com/svn/trunk/framing_format.txt
diff --git a/Godeps/_workspace/src/github.com/mreiferson/go-snappystream/reader.go b/Godeps/_workspace/src/github.com/mreiferson/go-snappystream/reader.go
deleted file mode 100644
index 330974883..000000000
--- a/Godeps/_workspace/src/github.com/mreiferson/go-snappystream/reader.go
+++ /dev/null
@@ -1,321 +0,0 @@
-package snappystream
-
-import (
-	"bytes"
-	"fmt"
-	"hash/crc32"
-	"io"
-	"io/ioutil"
-
-	"github.com/mreiferson/go-snappystream/snappy-go"
-)
-
-// errMssingStreamID is returned from a reader when the source stream does not
-// begin with a stream identifier block (4.1 Stream identifier).  Its occurance
-// signifies that the source byte stream is not snappy framed.
-var errMissingStreamID = fmt.Errorf("missing stream identifier")
-
-type reader struct {
-	reader io.Reader
-
-	err error
-
-	seenStreamID   bool
-	verifyChecksum bool
-
-	buf bytes.Buffer
-	hdr []byte
-	src []byte
-	dst []byte
-}
-
-// NewReader returns an io.Reader interface to the snappy framed stream format.
-//
-// It transparently handles reading the stream identifier (but does not proxy this
-// to the caller), decompresses blocks, and (optionally) validates checksums.
-//
-// Internally, three buffers are maintained.  The first two are for reading
-// off the wrapped io.Reader and for holding the decompressed block (both are grown
-// automatically and re-used and will never exceed the largest block size, 65536). The
-// last buffer contains the *unread* decompressed bytes (and can grow indefinitely).
-//
-// The second param determines whether or not the reader will verify block
-// checksums and can be enabled/disabled with the constants VerifyChecksum and SkipVerifyChecksum
-//
-// For each Read, the returned length will be up to the lesser of len(b) or 65536
-// decompressed bytes, regardless of the length of *compressed* bytes read
-// from the wrapped io.Reader.
-func NewReader(r io.Reader, verifyChecksum bool) io.Reader {
-	return &reader{
-		reader: r,
-
-		verifyChecksum: verifyChecksum,
-
-		hdr: make([]byte, 4),
-		src: make([]byte, 4096),
-		dst: make([]byte, 4096),
-	}
-}
-
-// WriteTo implements the io.WriterTo interface used by io.Copy.  It writes
-// decoded data from the underlying reader to w.  WriteTo returns the number of
-// bytes written along with any error encountered.
-func (r *reader) WriteTo(w io.Writer) (int64, error) {
-	if r.err != nil {
-		return 0, r.err
-	}
-
-	n, err := r.buf.WriteTo(w)
-	if err != nil {
-		// r.err doesn't need to be set because a write error occurred and the
-		// stream hasn't been corrupted.
-		return n, err
-	}
-
-	// pass a bufferFallbackWriter to nextFrame so that write errors may be
-	// recovered from, allowing the unwritten stream to be read successfully.
-	wfallback := &bufferFallbackWriter{
-		w:   w,
-		buf: &r.buf,
-	}
-	for {
-		var m int
-		m, err = r.nextFrame(wfallback)
-		if wfallback.writerErr != nil && err == nil {
-			// a partial write was made before an error occurred and not all m
-			// bytes were writen to w.  but decoded bytes were successfully
-			// buffered and reading can resume later.
-			n += wfallback.n
-			return n, wfallback.writerErr
-		}
-		n += int64(m)
-		if err == io.EOF {
-			return n, nil
-		}
-		if err != nil {
-			r.err = err
-			return n, err
-		}
-	}
-	panic("unreachable")
-}
-
-// bufferFallbackWriter writes to an underlying io.Writer until an error
-// occurs.  If a error occurs in the underlying io.Writer the value is saved
-// for later inspection while the bufferFallbackWriter silently starts
-// buffering all data written to it. From the caller's perspective
-// bufferFallbackWriter has the same Write behavior has a bytes.Buffer.
-//
-// bufferFallbackWriter is useful for the reader.WriteTo method because it
-// allows internal decoding routines to avoid interruption (and subsequent
-// stream corruption) due to writing errors.
-type bufferFallbackWriter struct {
-	w         io.Writer
-	buf       *bytes.Buffer
-	n         int64 // number of bytes successfully written to w
-	writerErr error // any error that ocurred writing to w
-}
-
-// Write attempts to write b to the underlying io.Writer.  If the underlying
-// writer fails or has failed previously unwritten bytes are buffered
-// internally.  Write never returns an error but may panic with
-// bytes.ErrTooLarge if the buffer grows too large.
-func (w *bufferFallbackWriter) Write(b []byte) (int, error) {
-	if w.writerErr != nil {
-		return w.buf.Write(b)
-	}
-	n, err := w.w.Write(b)
-	w.n += int64(n)
-	if err != nil {
-		// begin buffering input. bytes.Buffer does not return errors and so we
-		// do not need complex error handling here.
-		w.writerErr = err
-		w.Write(b[n:])
-		return len(b), nil
-	}
-	return n, nil
-}
-
-func (r *reader) read(b []byte) (int, error) {
-	n, err := r.buf.Read(b)
-	r.err = err
-	return n, err
-}
-
-func (r *reader) Read(b []byte) (int, error) {
-	if r.err != nil {
-		return 0, r.err
-	}
-
-	if r.buf.Len() < len(b) {
-		_, r.err = r.nextFrame(&r.buf)
-		if r.err == io.EOF {
-			// fill b with any remaining bytes in the buffer.
-			return r.read(b)
-		}
-		if r.err != nil {
-			return 0, r.err
-		}
-	}
-
-	return r.read(b)
-}
-
-func (r *reader) nextFrame(w io.Writer) (int, error) {
-	for {
-		// read the 4-byte snappy frame header
-		_, err := io.ReadFull(r.reader, r.hdr)
-		if err != nil {
-			return 0, err
-		}
-
-		// a stream identifier may appear anywhere and contains no information.
-		// it must appear at the beginning of the stream.  when found, validate
-		// it and continue to the next block.
-		if r.hdr[0] == blockStreamIdentifier {
-			err := r.readStreamID()
-			if err != nil {
-				return 0, err
-			}
-			r.seenStreamID = true
-			continue
-		}
-		if !r.seenStreamID {
-			return 0, errMissingStreamID
-		}
-
-		switch typ := r.hdr[0]; {
-		case typ == blockCompressed || typ == blockUncompressed:
-			return r.decodeBlock(w)
-		case typ == blockPadding || (0x80 <= typ && typ <= 0xfd):
-			// skip blocks whose data must not be inspected (4.4 Padding, and 4.6
-			// Reserved skippable chunks).
-			err := r.discardBlock()
-			if err != nil {
-				return 0, err
-			}
-			continue
-		default:
-			// typ must be unskippable range 0x02-0x7f.  Read the block in full
-			// and return an error (4.5 Reserved unskippable chunks).
-			err = r.discardBlock()
-			if err != nil {
-				return 0, err
-			}
-			return 0, fmt.Errorf("unrecognized unskippable frame %#x", r.hdr[0])
-		}
-	}
-	panic("unreachable")
-}
-
-// decodeDataBlock assumes r.hdr[0] to be either blockCompressed or
-// blockUncompressed.
-func (r *reader) decodeBlock(w io.Writer) (int, error) {
-	// read compressed block data and determine if uncompressed data is too
-	// large.
-	buf, err := r.readBlock()
-	if err != nil {
-		return 0, err
-	}
-	declen := len(buf[4:])
-	if r.hdr[0] == blockCompressed {
-		declen, err = snappy.DecodedLen(buf[4:])
-		if err != nil {
-			return 0, err
-		}
-	}
-	if declen > MaxBlockSize {
-		return 0, fmt.Errorf("decoded block data too large %d > %d", declen, MaxBlockSize)
-	}
-
-	// decode data and verify its integrity using the little-endian crc32
-	// preceding encoded data
-	crc32le, blockdata := buf[:4], buf[4:]
-	if r.hdr[0] == blockCompressed {
-		r.dst, err = snappy.Decode(r.dst, blockdata)
-		if err != nil {
-			return 0, err
-		}
-		blockdata = r.dst
-	}
-	if r.verifyChecksum {
-		checksum := unmaskChecksum(uint32(crc32le[0]) | uint32(crc32le[1])<<8 | uint32(crc32le[2])<<16 | uint32(crc32le[3])<<24)
-		actualChecksum := crc32.Checksum(blockdata, crcTable)
-		if checksum != actualChecksum {
-			return 0, fmt.Errorf("checksum does not match %x != %x", checksum, actualChecksum)
-		}
-	}
-	return w.Write(blockdata)
-}
-
-func (r *reader) readStreamID() error {
-	// the length of the block is fixed so don't decode it from the header.
-	if !bytes.Equal(r.hdr, streamID[:4]) {
-		return fmt.Errorf("invalid stream identifier length")
-	}
-
-	// read the identifier block data "sNaPpY"
-	block := r.src[:6]
-	_, err := noeof(io.ReadFull(r.reader, block))
-	if err != nil {
-		return err
-	}
-	if !bytes.Equal(block, streamID[4:]) {
-		return fmt.Errorf("invalid stream identifier block")
-	}
-	return nil
-}
-
-func (r *reader) discardBlock() error {
-	length := uint64(decodeLength(r.hdr[1:]))
-	_, err := noeof64(io.CopyN(ioutil.Discard, r.reader, int64(length)))
-	return err
-}
-
-func (r *reader) readBlock() ([]byte, error) {
-	// check bounds on encoded length (+4 for checksum)
-	length := decodeLength(r.hdr[1:])
-	if length > (maxEncodedBlockSize + 4) {
-		return nil, fmt.Errorf("encoded block data too large %d > %d", length, (maxEncodedBlockSize + 4))
-	}
-
-	if int(length) > len(r.src) {
-		r.src = make([]byte, length)
-	}
-
-	buf := r.src[:length]
-	_, err := noeof(io.ReadFull(r.reader, buf))
-	if err != nil {
-		return nil, err
-	}
-
-	return buf, nil
-}
-
-// decodeLength decodes a 24-bit (3-byte) little-endian length from b.
-func decodeLength(b []byte) uint32 {
-	return uint32(b[0]) | uint32(b[1])<<8 | uint32(b[2])<<16
-}
-
-func unmaskChecksum(c uint32) uint32 {
-	x := c - 0xa282ead8
-	return ((x >> 17) | (x << 15))
-}
-
-// noeof is used after reads in situations where EOF signifies invalid
-// formatting or corruption.
-func noeof(n int, err error) (int, error) {
-	if err == io.EOF {
-		return n, io.ErrUnexpectedEOF
-	}
-	return n, err
-}
-
-// noeof64 is used after long reads (e.g. io.Copy) in situations where io.EOF
-// signifies invalid formatting or corruption.
-func noeof64(n int64, err error) (int64, error) {
-	if err == io.EOF {
-		return n, io.ErrUnexpectedEOF
-	}
-	return n, err
-}
diff --git a/Godeps/_workspace/src/github.com/mreiferson/go-snappystream/snappy-go/decode.go b/Godeps/_workspace/src/github.com/mreiferson/go-snappystream/snappy-go/decode.go
deleted file mode 100644
index d93c1b9db..000000000
--- a/Godeps/_workspace/src/github.com/mreiferson/go-snappystream/snappy-go/decode.go
+++ /dev/null
@@ -1,124 +0,0 @@
-// Copyright 2011 The Snappy-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 snappy
-
-import (
-	"encoding/binary"
-	"errors"
-)
-
-// ErrCorrupt reports that the input is invalid.
-var ErrCorrupt = errors.New("snappy: corrupt input")
-
-// DecodedLen returns the length of the decoded block.
-func DecodedLen(src []byte) (int, error) {
-	v, _, err := decodedLen(src)
-	return v, err
-}
-
-// decodedLen returns the length of the decoded block and the number of bytes
-// that the length header occupied.
-func decodedLen(src []byte) (blockLen, headerLen int, err error) {
-	v, n := binary.Uvarint(src)
-	if n == 0 {
-		return 0, 0, ErrCorrupt
-	}
-	if uint64(int(v)) != v {
-		return 0, 0, errors.New("snappy: decoded block is too large")
-	}
-	return int(v), n, nil
-}
-
-// Decode returns the decoded form of src. The returned slice may be a sub-
-// slice of dst if dst was large enough to hold the entire decoded block.
-// Otherwise, a newly allocated slice will be returned.
-// It is valid to pass a nil dst.
-func Decode(dst, src []byte) ([]byte, error) {
-	dLen, s, err := decodedLen(src)
-	if err != nil {
-		return nil, err
-	}
-	if len(dst) < dLen {
-		dst = make([]byte, dLen)
-	}
-
-	var d, offset, length int
-	for s < len(src) {
-		switch src[s] & 0x03 {
-		case tagLiteral:
-			x := uint(src[s] >> 2)
-			switch {
-			case x < 60:
-				s += 1
-			case x == 60:
-				s += 2
-				if s > len(src) {
-					return nil, ErrCorrupt
-				}
-				x = uint(src[s-1])
-			case x == 61:
-				s += 3
-				if s > len(src) {
-					return nil, ErrCorrupt
-				}
-				x = uint(src[s-2]) | uint(src[s-1])<<8
-			case x == 62:
-				s += 4
-				if s > len(src) {
-					return nil, ErrCorrupt
-				}
-				x = uint(src[s-3]) | uint(src[s-2])<<8 | uint(src[s-1])<<16
-			case x == 63:
-				s += 5
-				if s > len(src) {
-					return nil, ErrCorrupt
-				}
-				x = uint(src[s-4]) | uint(src[s-3])<<8 | uint(src[s-2])<<16 | uint(src[s-1])<<24
-			}
-			length = int(x + 1)
-			if length <= 0 {
-				return nil, errors.New("snappy: unsupported literal length")
-			}
-			if length > len(dst)-d || length > len(src)-s {
-				return nil, ErrCorrupt
-			}
-			copy(dst[d:], src[s:s+length])
-			d += length
-			s += length
-			continue
-
-		case tagCopy1:
-			s += 2
-			if s > len(src) {
-				return nil, ErrCorrupt
-			}
-			length = 4 + int(src[s-2])>>2&0x7
-			offset = int(src[s-2])&0xe0<<3 | int(src[s-1])
-
-		case tagCopy2:
-			s += 3
-			if s > len(src) {
-				return nil, ErrCorrupt
-			}
-			length = 1 + int(src[s-3])>>2
-			offset = int(src[s-2]) | int(src[s-1])<<8
-
-		case tagCopy4:
-			return nil, errors.New("snappy: unsupported COPY_4 tag")
-		}
-
-		end := d + length
-		if offset > d || end > len(dst) {
-			return nil, ErrCorrupt
-		}
-		for ; d < end; d++ {
-			dst[d] = dst[d-offset]
-		}
-	}
-	if d != dLen {
-		return nil, ErrCorrupt
-	}
-	return dst[:d], nil
-}
diff --git a/Godeps/_workspace/src/github.com/mreiferson/go-snappystream/snappy-go/encode.go b/Godeps/_workspace/src/github.com/mreiferson/go-snappystream/snappy-go/encode.go
deleted file mode 100644
index b2371db11..000000000
--- a/Godeps/_workspace/src/github.com/mreiferson/go-snappystream/snappy-go/encode.go
+++ /dev/null
@@ -1,174 +0,0 @@
-// Copyright 2011 The Snappy-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 snappy
-
-import (
-	"encoding/binary"
-)
-
-// We limit how far copy back-references can go, the same as the C++ code.
-const maxOffset = 1 << 15
-
-// emitLiteral writes a literal chunk and returns the number of bytes written.
-func emitLiteral(dst, lit []byte) int {
-	i, n := 0, uint(len(lit)-1)
-	switch {
-	case n < 60:
-		dst[0] = uint8(n)<<2 | tagLiteral
-		i = 1
-	case n < 1<<8:
-		dst[0] = 60<<2 | tagLiteral
-		dst[1] = uint8(n)
-		i = 2
-	case n < 1<<16:
-		dst[0] = 61<<2 | tagLiteral
-		dst[1] = uint8(n)
-		dst[2] = uint8(n >> 8)
-		i = 3
-	case n < 1<<24:
-		dst[0] = 62<<2 | tagLiteral
-		dst[1] = uint8(n)
-		dst[2] = uint8(n >> 8)
-		dst[3] = uint8(n >> 16)
-		i = 4
-	case int64(n) < 1<<32:
-		dst[0] = 63<<2 | tagLiteral
-		dst[1] = uint8(n)
-		dst[2] = uint8(n >> 8)
-		dst[3] = uint8(n >> 16)
-		dst[4] = uint8(n >> 24)
-		i = 5
-	default:
-		panic("snappy: source buffer is too long")
-	}
-	if copy(dst[i:], lit) != len(lit) {
-		panic("snappy: destination buffer is too short")
-	}
-	return i + len(lit)
-}
-
-// emitCopy writes a copy chunk and returns the number of bytes written.
-func emitCopy(dst []byte, offset, length int) int {
-	i := 0
-	for length > 0 {
-		x := length - 4
-		if 0 <= x && x < 1<<3 && offset < 1<<11 {
-			dst[i+0] = uint8(offset>>8)&0x07<<5 | uint8(x)<<2 | tagCopy1
-			dst[i+1] = uint8(offset)
-			i += 2
-			break
-		}
-
-		x = length
-		if x > 1<<6 {
-			x = 1 << 6
-		}
-		dst[i+0] = uint8(x-1)<<2 | tagCopy2
-		dst[i+1] = uint8(offset)
-		dst[i+2] = uint8(offset >> 8)
-		i += 3
-		length -= x
-	}
-	return i
-}
-
-// Encode returns the encoded form of src. The returned slice may be a sub-
-// slice of dst if dst was large enough to hold the entire encoded block.
-// Otherwise, a newly allocated slice will be returned.
-// It is valid to pass a nil dst.
-func Encode(dst, src []byte) ([]byte, error) {
-	if n := MaxEncodedLen(len(src)); len(dst) < n {
-		dst = make([]byte, n)
-	}
-
-	// The block starts with the varint-encoded length of the decompressed bytes.
-	d := binary.PutUvarint(dst, uint64(len(src)))
-
-	// Return early if src is short.
-	if len(src) <= 4 {
-		if len(src) != 0 {
-			d += emitLiteral(dst[d:], src)
-		}
-		return dst[:d], nil
-	}
-
-	// Initialize the hash table. Its size ranges from 1<<8 to 1<<14 inclusive.
-	const maxTableSize = 1 << 14
-	shift, tableSize := uint(32-8), 1<<8
-	for tableSize < maxTableSize && tableSize < len(src) {
-		shift--
-		tableSize *= 2
-	}
-	var table [maxTableSize]int
-
-	// Iterate over the source bytes.
-	var (
-		s   int // The iterator position.
-		t   int // The last position with the same hash as s.
-		lit int // The start position of any pending literal bytes.
-	)
-	for s+3 < len(src) {
-		// Update the hash table.
-		b0, b1, b2, b3 := src[s], src[s+1], src[s+2], src[s+3]
-		h := uint32(b0) | uint32(b1)<<8 | uint32(b2)<<16 | uint32(b3)<<24
-		p := &table[(h*0x1e35a7bd)>>shift]
-		// We need to to store values in [-1, inf) in table. To save
-		// some initialization time, (re)use the table's zero value
-		// and shift the values against this zero: add 1 on writes,
-		// subtract 1 on reads.
-		t, *p = *p-1, s+1
-		// If t is invalid or src[s:s+4] differs from src[t:t+4], accumulate a literal byte.
-		if t < 0 || s-t >= maxOffset || b0 != src[t] || b1 != src[t+1] || b2 != src[t+2] || b3 != src[t+3] {
-			s++
-			continue
-		}
-		// Otherwise, we have a match. First, emit any pending literal bytes.
-		if lit != s {
-			d += emitLiteral(dst[d:], src[lit:s])
-		}
-		// Extend the match to be as long as possible.
-		s0 := s
-		s, t = s+4, t+4
-		for s < len(src) && src[s] == src[t] {
-			s++
-			t++
-		}
-		// Emit the copied bytes.
-		d += emitCopy(dst[d:], s-t, s-s0)
-		lit = s
-	}
-
-	// Emit any final pending literal bytes and return.
-	if lit != len(src) {
-		d += emitLiteral(dst[d:], src[lit:])
-	}
-	return dst[:d], nil
-}
-
-// MaxEncodedLen returns the maximum length of a snappy block, given its
-// uncompressed length.
-func MaxEncodedLen(srcLen int) int {
-	// Compressed data can be defined as:
-	//    compressed := item* literal*
-	//    item       := literal* copy
-	//
-	// The trailing literal sequence has a space blowup of at most 62/60
-	// since a literal of length 60 needs one tag byte + one extra byte
-	// for length information.
-	//
-	// Item blowup is trickier to measure. Suppose the "copy" op copies
-	// 4 bytes of data. Because of a special check in the encoding code,
-	// we produce a 4-byte copy only if the offset is < 65536. Therefore
-	// the copy op takes 3 bytes to encode, and this type of item leads
-	// to at most the 62/60 blowup for representing literals.
-	//
-	// Suppose the "copy" op copies 5 bytes of data. If the offset is big
-	// enough, it will take 5 bytes to encode the copy op. Therefore the
-	// worst case here is a one-byte literal followed by a five-byte copy.
-	// That is, 6 bytes of input turn into 7 bytes of "compressed" data.
-	//
-	// This last factor dominates the blowup, so the final estimate is:
-	return 32 + srcLen + srcLen/6
-}
diff --git a/Godeps/_workspace/src/github.com/mreiferson/go-snappystream/snappy-go/snappy.go b/Godeps/_workspace/src/github.com/mreiferson/go-snappystream/snappy-go/snappy.go
deleted file mode 100644
index 2f1b790d0..000000000
--- a/Godeps/_workspace/src/github.com/mreiferson/go-snappystream/snappy-go/snappy.go
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright 2011 The Snappy-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 snappy implements the snappy block-based compression format.
-// It aims for very high speeds and reasonable compression.
-//
-// The C++ snappy implementation is at http://code.google.com/p/snappy/
-package snappy
-
-/*
-Each encoded block begins with the varint-encoded length of the decoded data,
-followed by a sequence of chunks. Chunks begin and end on byte boundaries. The
-first byte of each chunk is broken into its 2 least and 6 most significant bits
-called l and m: l ranges in [0, 4) and m ranges in [0, 64). l is the chunk tag.
-Zero means a literal tag. All other values mean a copy tag.
-
-For literal tags:
-  - If m < 60, the next 1 + m bytes are literal bytes.
-  - Otherwise, let n be the little-endian unsigned integer denoted by the next
-    m - 59 bytes. The next 1 + n bytes after that are literal bytes.
-
-For copy tags, length bytes are copied from offset bytes ago, in the style of
-Lempel-Ziv compression algorithms. In particular:
-  - For l == 1, the offset ranges in [0, 1<<11) and the length in [4, 12).
-    The length is 4 + the low 3 bits of m. The high 3 bits of m form bits 8-10
-    of the offset. The next byte is bits 0-7 of the offset.
-  - For l == 2, the offset ranges in [0, 1<<16) and the length in [1, 65).
-    The length is 1 + m. The offset is the little-endian unsigned integer
-    denoted by the next 2 bytes.
-  - For l == 3, this tag is a legacy format that is no longer supported.
-*/
-const (
-	tagLiteral = 0x00
-	tagCopy1   = 0x01
-	tagCopy2   = 0x02
-	tagCopy4   = 0x03
-)
diff --git a/Godeps/_workspace/src/github.com/mreiferson/go-snappystream/snappystream.go b/Godeps/_workspace/src/github.com/mreiferson/go-snappystream/snappystream.go
deleted file mode 100644
index fc7dbd397..000000000
--- a/Godeps/_workspace/src/github.com/mreiferson/go-snappystream/snappystream.go
+++ /dev/null
@@ -1,54 +0,0 @@
-// snappystream wraps snappy-go and supplies a Reader and Writer
-// for the snappy framed stream format:
-//     https://snappy.googlecode.com/svn/trunk/framing_format.txt
-package snappystream
-
-import (
-	"hash/crc32"
-
-	"github.com/mreiferson/go-snappystream/snappy-go"
-)
-
-// Ext is the file extension for files whose content is a snappy framed stream.
-const Ext = ".sz"
-
-// MediaType is the MIME type used to represent snappy framed content.
-const MediaType = "application/x-snappy-framed"
-
-// ContentEncoding is the appropriate HTTP Content-Encoding header value for
-// requests containing a snappy framed entity body.
-const ContentEncoding = "x-snappy-framed"
-
-// MaxBlockSize is the maximum number of decoded bytes allowed to be
-// represented in a snappy framed block (sections 4.2 and 4.3).
-const MaxBlockSize = 65536
-
-// maxEncodedBlockSize is the maximum number of encoded bytes in a framed
-// block.
-var maxEncodedBlockSize = uint32(snappy.MaxEncodedLen(MaxBlockSize))
-
-const VerifyChecksum = true
-const SkipVerifyChecksum = false
-
-// Block types defined by the snappy framed format specification.
-const (
-	blockCompressed       = 0x00
-	blockUncompressed     = 0x01
-	blockPadding          = 0xfe
-	blockStreamIdentifier = 0xff
-)
-
-// streamID is the stream identifier block that begins a valid snappy framed
-// stream.
-var streamID = []byte{0xff, 0x06, 0x00, 0x00, 0x73, 0x4e, 0x61, 0x50, 0x70, 0x59}
-
-// maskChecksum implements the checksum masking algorithm described by the spec.
-func maskChecksum(c uint32) uint32 {
-	return ((c >> 15) | (c << 17)) + 0xa282ead8
-}
-
-var crcTable *crc32.Table
-
-func init() {
-	crcTable = crc32.MakeTable(crc32.Castagnoli)
-}
diff --git a/Godeps/_workspace/src/github.com/mreiferson/go-snappystream/writer.go b/Godeps/_workspace/src/github.com/mreiferson/go-snappystream/writer.go
deleted file mode 100644
index 8f3fa9445..000000000
--- a/Godeps/_workspace/src/github.com/mreiferson/go-snappystream/writer.go
+++ /dev/null
@@ -1,229 +0,0 @@
-package snappystream
-
-import (
-	"bufio"
-	"errors"
-	"fmt"
-	"hash/crc32"
-	"io"
-
-	"github.com/mreiferson/go-snappystream/snappy-go"
-)
-
-var errClosed = fmt.Errorf("closed")
-
-// BufferedWriter is an io.WriteCloser with behavior similar to writers
-// returned by NewWriter but it buffers written data, maximizing block size (to
-// improve the output compression ratio) at the cost of speed. Benefits over
-// NewWriter are most noticible when individual writes are small and when
-// streams are long.
-//
-// Failure to call a BufferedWriter's Close or Flush methods after it is done
-// being written to will likely result in missing data frames which will be
-// undetectable in the decoding process.
-//
-// NOTE: BufferedWriter cannot be instantiated via struct literal and must
-// use NewBufferedWriter (i.e. its zero value is not usable).
-type BufferedWriter struct {
-	err error
-	w   *writer
-	bw  *bufio.Writer
-}
-
-// NewBufferedWriter allocates and returns a BufferedWriter with an internal
-// buffer of MaxBlockSize bytes.  If an error occurs writing a block to w, all
-// future writes will fail with the same error.  After all data has been
-// written, the client should call the Flush method to guarantee all data has
-// been forwarded to the underlying io.Writer.
-func NewBufferedWriter(w io.Writer) *BufferedWriter {
-	_w := NewWriter(w).(*writer)
-	return &BufferedWriter{
-		w:  _w,
-		bw: bufio.NewWriterSize(_w, MaxBlockSize),
-	}
-}
-
-// ReadFrom implements the io.ReaderFrom interface used by io.Copy. It encodes
-// data read from r as a snappy framed stream that is written to the underlying
-// writer.  ReadFrom returns the number number of bytes read, along with any
-// error encountered (other than io.EOF).
-func (w *BufferedWriter) ReadFrom(r io.Reader) (int64, error) {
-	if w.err != nil {
-		return 0, w.err
-	}
-
-	var n int64
-	n, w.err = w.bw.ReadFrom(r)
-	return n, w.err
-}
-
-// Write buffers p internally, encoding and writing a block to the underlying
-// buffer if the buffer grows beyond MaxBlockSize bytes.  The returned int
-// will be 0 if there was an error and len(p) otherwise.
-func (w *BufferedWriter) Write(p []byte) (int, error) {
-	if w.err != nil {
-		return 0, w.err
-	}
-
-	_, w.err = w.bw.Write(p)
-	if w.err != nil {
-		return 0, w.err
-	}
-
-	return len(p), nil
-}
-
-// Flush encodes and writes a block with the contents of w's internal buffer to
-// the underlying writer even if the buffer does not contain a full block of
-// data (MaxBlockSize bytes).
-func (w *BufferedWriter) Flush() error {
-	if w.err == nil {
-		w.err = w.bw.Flush()
-	}
-
-	return w.err
-}
-
-// Close flushes w's internal buffer and tears down internal data structures.
-// After a successful call to Close method calls on w return an error.  Close
-// makes no attempt to close the underlying writer.
-func (w *BufferedWriter) Close() error {
-	if w.err != nil {
-		return w.err
-	}
-
-	w.err = w.bw.Flush()
-	w.w = nil
-	w.bw = nil
-
-	if w.err != nil {
-		return w.err
-	}
-
-	w.err = errClosed
-	return nil
-}
-
-type writer struct {
-	writer io.Writer
-	err    error
-
-	hdr []byte
-	dst []byte
-
-	sentStreamID bool
-}
-
-// NewWriter returns an io.Writer that writes its input to an underlying
-// io.Writer encoded as a snappy framed stream.  A stream identifier block is
-// written to w preceding the first data block.  The returned writer will never
-// emit a block with length in bytes greater than MaxBlockSize+4 nor one
-// containing more than MaxBlockSize bytes of (uncompressed) data.
-//
-// For each Write, the returned length will only ever be len(p) or 0,
-// regardless of the length of *compressed* bytes written to the wrapped
-// io.Writer.  If the returned length is 0 then error will be non-nil.  If
-// len(p) exceeds 65536, the slice will be automatically chunked into smaller
-// blocks which are all emitted before the call returns.
-func NewWriter(w io.Writer) io.Writer {
-	return &writer{
-		writer: w,
-
-		hdr: make([]byte, 8),
-		dst: make([]byte, 4096),
-	}
-}
-
-func (w *writer) Write(p []byte) (int, error) {
-	if w.err != nil {
-		return 0, w.err
-	}
-
-	total := 0
-	sz := MaxBlockSize
-	var n int
-	for i := 0; i < len(p); i += n {
-		if i+sz > len(p) {
-			sz = len(p) - i
-		}
-
-		n, w.err = w.write(p[i : i+sz])
-		if w.err != nil {
-			return 0, w.err
-		}
-		total += n
-	}
-	return total, nil
-}
-
-// write attempts to encode p as a block and write it to the underlying writer.
-// The returned int may not equal p's length if compression below
-// MaxBlockSize-4 could not be achieved.
-func (w *writer) write(p []byte) (int, error) {
-	var err error
-
-	if len(p) > MaxBlockSize {
-		return 0, errors.New(fmt.Sprintf("block too large %d > %d", len(p), MaxBlockSize))
-	}
-
-	w.dst = w.dst[:cap(w.dst)] // Encode does dumb resize w/o context. reslice avoids alloc.
-	w.dst, err = snappy.Encode(w.dst, p)
-	if err != nil {
-		return 0, err
-	}
-	block := w.dst
-	n := len(p)
-	compressed := true
-
-	// check for data which is better left uncompressed.  this is determined if
-	// the encoded content is longer than the source.
-	if len(w.dst) >= len(p) {
-		compressed = false
-		block = p[:n]
-	}
-
-	if !w.sentStreamID {
-		_, err := w.writer.Write(streamID)
-		if err != nil {
-			return 0, err
-		}
-		w.sentStreamID = true
-	}
-
-	// set the block type
-	if compressed {
-		writeHeader(w.hdr, blockCompressed, block, p[:n])
-	} else {
-		writeHeader(w.hdr, blockUncompressed, block, p[:n])
-	}
-
-	_, err = w.writer.Write(w.hdr)
-	if err != nil {
-		return 0, err
-	}
-
-	_, err = w.writer.Write(block)
-	if err != nil {
-		return 0, err
-	}
-
-	return n, nil
-}
-
-// writeHeader panics if len(hdr) is less than 8.
-func writeHeader(hdr []byte, btype byte, enc, dec []byte) {
-	hdr[0] = btype
-
-	// 3 byte little endian length of encoded content
-	length := uint32(len(enc)) + 4 // +4 for checksum
-	hdr[1] = byte(length)
-	hdr[2] = byte(length >> 8)
-	hdr[3] = byte(length >> 16)
-
-	// 4 byte little endian CRC32 checksum of decoded content
-	checksum := maskChecksum(crc32.Checksum(dec, crcTable))
-	hdr[4] = byte(checksum)
-	hdr[5] = byte(checksum >> 8)
-	hdr[6] = byte(checksum >> 16)
-	hdr[7] = byte(checksum >> 24)
-}
diff --git a/Godeps/_workspace/src/github.com/naoina/go-stringutil/.travis.yml b/Godeps/_workspace/src/github.com/naoina/go-stringutil/.travis.yml
deleted file mode 100644
index 926eb992a..000000000
--- a/Godeps/_workspace/src/github.com/naoina/go-stringutil/.travis.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-language: go
-go:
-  - 1.3
-  - 1.4
-  - tip
-install:
-  - go get -v github.com/naoina/go-stringutil
-script:
-  - go test -v ./... -bench . -benchmem
diff --git a/Godeps/_workspace/src/github.com/naoina/go-stringutil/LICENSE b/Godeps/_workspace/src/github.com/naoina/go-stringutil/LICENSE
deleted file mode 100644
index 0fff1c58b..000000000
--- a/Godeps/_workspace/src/github.com/naoina/go-stringutil/LICENSE
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) 2015 Naoya Inada <naoina@kuune.org>
-
-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/naoina/go-stringutil/README.md b/Godeps/_workspace/src/github.com/naoina/go-stringutil/README.md
deleted file mode 100644
index 87772e88d..000000000
--- a/Godeps/_workspace/src/github.com/naoina/go-stringutil/README.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# stringutil [![Build Status](https://travis-ci.org/naoina/go-stringutil.png?branch=master)](https://travis-ci.org/naoina/go-stringutil)
-
-## Installation
-
-    go get -u github.com/naoina/go-stringutil
-
-## Documentation
-
-See https://godoc.org/github.com/naoina/go-stringutil
-
-## License
-
-MIT
diff --git a/Godeps/_workspace/src/github.com/naoina/go-stringutil/strings.go b/Godeps/_workspace/src/github.com/naoina/go-stringutil/strings.go
deleted file mode 100644
index c0fdd4cc1..000000000
--- a/Godeps/_workspace/src/github.com/naoina/go-stringutil/strings.go
+++ /dev/null
@@ -1,120 +0,0 @@
-package stringutil
-
-import (
-	"bytes"
-	"unicode"
-)
-
-// ToUpperCamelCase returns a copy of the string s with all Unicode letters mapped to their camel case.
-// It will convert to upper case previous letter of '_' and first letter, and remove letter of '_'.
-func ToUpperCamelCase(s string) string {
-	if s == "" {
-		return ""
-	}
-	upper := true
-	var result bytes.Buffer
-	for _, c := range s {
-		if c == '_' {
-			upper = true
-			continue
-		}
-		if upper {
-			result.WriteRune(unicode.ToUpper(c))
-			upper = false
-			continue
-		}
-		result.WriteRune(c)
-	}
-	return result.String()
-}
-
-// ToUpperCamelCaseASCII is similar to ToUpperCamelCase, but optimized for
-// only the ASCII characters.
-// ToUpperCamelCaseASCII is faster than ToUpperCamelCase, but doesn't work if
-// contains non-ASCII characters.
-func ToUpperCamelCaseASCII(s string) string {
-	if s == "" {
-		return ""
-	}
-	upper := true
-	result := make([]byte, 0, len(s))
-	for i := 0; i < len(s); i++ {
-		c := s[i]
-		if c == '_' {
-			upper = true
-			continue
-		}
-		if upper {
-			result = append(result, toUpperASCII(c))
-			upper = false
-			continue
-		}
-		result = append(result, c)
-	}
-	return string(result)
-}
-
-// ToSnakeCase returns a copy of the string s with all Unicode letters mapped to their snake case.
-// It will insert letter of '_' at position of previous letter of uppercase and all
-// letters convert to lower case.
-func ToSnakeCase(s string) string {
-	if s == "" {
-		return ""
-	}
-	var result bytes.Buffer
-	for _, c := range s {
-		if unicode.IsUpper(c) {
-			result.WriteByte('_')
-		}
-		result.WriteRune(unicode.ToLower(c))
-	}
-	s = result.String()
-	if s[0] == '_' {
-		return s[1:]
-	}
-	return s
-}
-
-// ToSnakeCaseASCII is similar to ToSnakeCase, but optimized for only the ASCII
-// characters.
-// ToSnakeCaseASCII is faster than ToSnakeCase, but doesn't work correctly if
-// contains non-ASCII characters.
-func ToSnakeCaseASCII(s string) string {
-	if s == "" {
-		return ""
-	}
-	result := make([]byte, 0, len(s))
-	for i := 0; i < len(s); i++ {
-		c := s[i]
-		if isUpperASCII(c) {
-			result = append(result, '_')
-		}
-		result = append(result, toLowerASCII(c))
-	}
-	if result[0] == '_' {
-		return string(result[1:])
-	}
-	return string(result)
-}
-
-func isUpperASCII(c byte) bool {
-	return 'A' <= c && c <= 'Z'
-}
-
-func isLowerASCII(c byte) bool {
-	return 'a' <= c && c <= 'z'
-}
-
-func toUpperASCII(c byte) byte {
-	if isLowerASCII(c) {
-		return c - ('a' - 'A')
-	}
-	return c
-}
-
-func toLowerASCII(c byte) byte {
-	if isUpperASCII(c) {
-		return c + 'a' - 'A'
-	}
-	return c
-}
diff --git a/Godeps/_workspace/src/github.com/naoina/go-stringutil/strings_bench_test.go b/Godeps/_workspace/src/github.com/naoina/go-stringutil/strings_bench_test.go
deleted file mode 100644
index 90c280bda..000000000
--- a/Godeps/_workspace/src/github.com/naoina/go-stringutil/strings_bench_test.go
+++ /dev/null
@@ -1,35 +0,0 @@
-package stringutil_test
-
-import (
-	"testing"
-
-	"github.com/naoina/go-stringutil"
-)
-
-var benchcaseForCamelCase = "the_quick_brown_fox_jumps_over_the_lazy_dog"
-
-func BenchmarkToUpperCamelCase(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		stringutil.ToUpperCamelCase(benchcaseForCamelCase)
-	}
-}
-
-func BenchmarkToUpperCamelCaseASCII(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		stringutil.ToUpperCamelCaseASCII(benchcaseForCamelCase)
-	}
-}
-
-var benchcaseForSnakeCase = "TheQuickBrownFoxJumpsOverTheLazyDog"
-
-func BenchmarkToSnakeCase(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		stringutil.ToSnakeCase(benchcaseForSnakeCase)
-	}
-}
-
-func BenchmarkToSnakeCaseASCII(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		stringutil.ToSnakeCaseASCII(benchcaseForSnakeCase)
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/naoina/go-stringutil/strings_test.go b/Godeps/_workspace/src/github.com/naoina/go-stringutil/strings_test.go
deleted file mode 100644
index 69c831e12..000000000
--- a/Godeps/_workspace/src/github.com/naoina/go-stringutil/strings_test.go
+++ /dev/null
@@ -1,88 +0,0 @@
-package stringutil_test
-
-import (
-	"reflect"
-	"testing"
-
-	"github.com/naoina/go-stringutil"
-)
-
-func TestToUpperCamelCase(t *testing.T) {
-	for _, v := range []struct {
-		input, expect string
-	}{
-		{"", ""},
-		{"thequickbrownfoxoverthelazydog", "Thequickbrownfoxoverthelazydog"},
-		{"thequickbrownfoxoverthelazydoG", "ThequickbrownfoxoverthelazydoG"},
-		{"thequickbrownfoxoverthelazydo_g", "ThequickbrownfoxoverthelazydoG"},
-		{"TheQuickBrownFoxJumpsOverTheLazyDog", "TheQuickBrownFoxJumpsOverTheLazyDog"},
-		{"the_quick_brown_fox_jumps_over_the_lazy_dog", "TheQuickBrownFoxJumpsOverTheLazyDog"},
-		{"the_Quick_Brown_Fox_Jumps_Over_The_Lazy_Dog", "TheQuickBrownFoxJumpsOverTheLazyDog"},
-		{"ｔｈｅ_ｑｕｉｃｋ_ｂｒｏｗｎ_ｆｏｘ_ｏｖｅｒ_ｔｈｅ_ｌａｚｙ_ｄｏｇ", "ＴｈｅＱｕｉｃｋＢｒｏｗｎＦｏｘＯｖｅｒＴｈｅＬａｚｙＤｏｇ"},
-	} {
-		actual := stringutil.ToUpperCamelCase(v.input)
-		expect := v.expect
-		if !reflect.DeepEqual(actual, expect) {
-			t.Errorf(`stringutil.ToUpperCamelCase(%#v) => %#v; want %#v`, v.input, actual, expect)
-		}
-	}
-}
-
-func TestToUpperCamelCaseASCII(t *testing.T) {
-	for _, v := range []struct {
-		input, expect string
-	}{
-		{"", ""},
-		{"thequickbrownfoxoverthelazydog", "Thequickbrownfoxoverthelazydog"},
-		{"thequickbrownfoxoverthelazydoG", "ThequickbrownfoxoverthelazydoG"},
-		{"thequickbrownfoxoverthelazydo_g", "ThequickbrownfoxoverthelazydoG"},
-		{"TheQuickBrownFoxJumpsOverTheLazyDog", "TheQuickBrownFoxJumpsOverTheLazyDog"},
-		{"the_quick_brown_fox_jumps_over_the_lazy_dog", "TheQuickBrownFoxJumpsOverTheLazyDog"},
-		{"the_Quick_Brown_Fox_Jumps_Over_The_Lazy_Dog", "TheQuickBrownFoxJumpsOverTheLazyDog"},
-	} {
-		actual := stringutil.ToUpperCamelCaseASCII(v.input)
-		expect := v.expect
-		if !reflect.DeepEqual(actual, expect) {
-			t.Errorf(`stringutil.ToUpperCamelCaseASCII(%#v) => %#v; want %#v`, v.input, actual, expect)
-		}
-	}
-}
-
-func TestToSnakeCase(t *testing.T) {
-	for _, v := range []struct {
-		input, expect string
-	}{
-		{"", ""},
-		{"thequickbrownfoxjumpsoverthelazydog", "thequickbrownfoxjumpsoverthelazydog"},
-		{"Thequickbrownfoxjumpsoverthelazydog", "thequickbrownfoxjumpsoverthelazydog"},
-		{"ThequickbrownfoxjumpsoverthelazydoG", "thequickbrownfoxjumpsoverthelazydo_g"},
-		{"TheQuickBrownFoxJumpsOverTheLazyDog", "the_quick_brown_fox_jumps_over_the_lazy_dog"},
-		{"the_quick_brown_fox_jumps_over_the_lazy_dog", "the_quick_brown_fox_jumps_over_the_lazy_dog"},
-		{"ＴｈｅＱｕｉｃｋＢｒｏｗｎＦｏｘＯｖｅｒＴｈｅＬａｚｙＤｏｇ", "ｔｈｅ_ｑｕｉｃｋ_ｂｒｏｗｎ_ｆｏｘ_ｏｖｅｒ_ｔｈｅ_ｌａｚｙ_ｄｏｇ"},
-	} {
-		actual := stringutil.ToSnakeCase(v.input)
-		expect := v.expect
-		if !reflect.DeepEqual(actual, expect) {
-			t.Errorf(`stringutil.ToSnakeCase(%#v) => %#v; want %#v`, v.input, actual, expect)
-		}
-	}
-}
-
-func TestToSnakeCaseASCII(t *testing.T) {
-	for _, v := range []struct {
-		input, expect string
-	}{
-		{"", ""},
-		{"thequickbrownfoxjumpsoverthelazydog", "thequickbrownfoxjumpsoverthelazydog"},
-		{"Thequickbrownfoxjumpsoverthelazydog", "thequickbrownfoxjumpsoverthelazydog"},
-		{"ThequickbrownfoxjumpsoverthelazydoG", "thequickbrownfoxjumpsoverthelazydo_g"},
-		{"TheQuickBrownFoxJumpsOverTheLazyDog", "the_quick_brown_fox_jumps_over_the_lazy_dog"},
-		{"the_quick_brown_fox_jumps_over_the_lazy_dog", "the_quick_brown_fox_jumps_over_the_lazy_dog"},
-	} {
-		actual := stringutil.ToSnakeCaseASCII(v.input)
-		expect := v.expect
-		if !reflect.DeepEqual(actual, expect) {
-			t.Errorf(`stringutil.ToSnakeCaseASCII(%#v) => %#v; want %#v`, v.input, actual, expect)
-		}
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/naoina/toml/.travis.yml b/Godeps/_workspace/src/github.com/naoina/toml/.travis.yml
deleted file mode 100644
index 6bd7b6df3..000000000
--- a/Godeps/_workspace/src/github.com/naoina/toml/.travis.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-language: go
-
-go:
-  - 1.3
-  - tip
-
-install:
-  - go get -v ./...
-
-script:
-  - go test ./...
diff --git a/Godeps/_workspace/src/github.com/naoina/toml/LICENSE b/Godeps/_workspace/src/github.com/naoina/toml/LICENSE
deleted file mode 100644
index e65039ad8..000000000
--- a/Godeps/_workspace/src/github.com/naoina/toml/LICENSE
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) 2014 Naoya Inada <naoina@kuune.org>
-
-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/naoina/toml/Makefile b/Godeps/_workspace/src/github.com/naoina/toml/Makefile
deleted file mode 100644
index 10dc5a553..000000000
--- a/Godeps/_workspace/src/github.com/naoina/toml/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-GO = go
-PEG = peg
-
-.SUFFIXES: .peg .peg.go
-
-.PHONY: all test clean
-all: parse.peg.go
-
-.peg.peg.go:
-	$(PEG) -switch -inline $<
-
-test: all
-	$(GO) test ./...
-
-clean:
-	$(RM) *.peg.go
diff --git a/Godeps/_workspace/src/github.com/naoina/toml/README.md b/Godeps/_workspace/src/github.com/naoina/toml/README.md
deleted file mode 100644
index 7330ce4d0..000000000
--- a/Godeps/_workspace/src/github.com/naoina/toml/README.md
+++ /dev/null
@@ -1,364 +0,0 @@
-# TOML parser and encoder library for Golang [![Build Status](https://travis-ci.org/naoina/toml.png?branch=master)](https://travis-ci.org/naoina/toml)
-
-[TOML](https://github.com/toml-lang/toml) parser and encoder library for [Golang](http://golang.org/).
-
-This library is compatible with TOML version [v0.4.0](https://github.com/toml-lang/toml/blob/master/versions/en/toml-v0.4.0.md).
-
-## Installation
-
-    go get -u github.com/naoina/toml
-
-## Usage
-
-The following TOML save as `example.toml`.
-
-```toml
-# This is a TOML document. Boom.
-
-title = "TOML Example"
-
-[owner]
-name = "Lance Uppercut"
-dob = 1979-05-27T07:32:00-08:00 # First class dates? Why not?
-
-[database]
-server = "192.168.1.1"
-ports = [ 8001, 8001, 8002 ]
-connection_max = 5000
-enabled = true
-
-[servers]
-
-  # You can indent as you please. Tabs or spaces. TOML don't care.
-  [servers.alpha]
-  ip = "10.0.0.1"
-  dc = "eqdc10"
-
-  [servers.beta]
-  ip = "10.0.0.2"
-  dc = "eqdc10"
-
-[clients]
-data = [ ["gamma", "delta"], [1, 2] ]
-
-# Line breaks are OK when inside arrays
-hosts = [
-  "alpha",
-  "omega"
-]
-```
-
-Then above TOML will mapping to `tomlConfig` struct using `toml.Unmarshal`.
-
-```go
-package main
-
-import (
-    "io/ioutil"
-    "os"
-    "time"
-
-    "github.com/naoina/toml"
-)
-
-type tomlConfig struct {
-    Title string
-    Owner struct {
-        Name string
-        Dob  time.Time
-    }
-    Database struct {
-        Server        string
-        Ports         []int
-        ConnectionMax uint
-        Enabled       bool
-    }
-    Servers map[string]Server
-    Clients struct {
-        Data  [][]interface{}
-        Hosts []string
-    }
-}
-
-type Server struct {
-    IP string
-    DC string
-}
-
-func main() {
-    f, err := os.Open("example.toml")
-    if err != nil {
-        panic(err)
-    }
-    defer f.Close()
-    buf, err := ioutil.ReadAll(f)
-    if err != nil {
-        panic(err)
-    }
-    var config tomlConfig
-    if err := toml.Unmarshal(buf, &config); err != nil {
-        panic(err)
-    }
-    // then to use the unmarshaled config...
-}
-```
-
-## Mappings
-
-A key and value of TOML will map to the corresponding field.
-The fields of struct for mapping must be exported.
-
-The rules of the mapping of key are following:
-
-#### Exact matching
-
-```toml
-timeout_seconds = 256
-```
-
-```go
-type Config struct {
-	Timeout_seconds int
-}
-```
-
-#### Camelcase matching
-
-```toml
-server_name = "srv1"
-```
-
-```go
-type Config struct {
-	ServerName string
-}
-```
-
-#### Uppercase matching
-
-```toml
-ip = "10.0.0.1"
-```
-
-```go
-type Config struct {
-	IP string
-}
-```
-
-See the following examples for the value mappings.
-
-### String
-
-```toml
-val = "string"
-```
-
-```go
-type Config struct {
-	Val string
-}
-```
-
-### Integer
-
-```toml
-val = 100
-```
-
-```go
-type Config struct {
-	Val int
-}
-```
-
-All types that can be used are following:
-
-* int8 (from `-128` to `127`)
-* int16 (from `-32768` to `32767`)
-* int32 (from `-2147483648` to `2147483647`)
-* int64 (from `-9223372036854775808` to `9223372036854775807`)
-* int (same as `int32` on 32bit environment, or `int64` on 64bit environment)
-* uint8 (from `0` to `255`)
-* uint16 (from `0` to `65535`)
-* uint32 (from `0` to `4294967295`)
-* uint64 (from `0` to `18446744073709551615`)
-* uint (same as `uint` on 32bit environment, or `uint64` on 64bit environment)
-
-### Float
-
-```toml
-val = 3.1415
-```
-
-```go
-type Config struct {
-	Val float32
-}
-```
-
-All types that can be used are following:
-
-* float32
-* float64
-
-### Boolean
-
-```toml
-val = true
-```
-
-```go
-type Config struct {
-	Val bool
-}
-```
-
-### Datetime
-
-```toml
-val = 2014-09-28T21:27:39Z
-```
-
-```go
-type Config struct {
-	Val time.Time
-}
-```
-
-### Array
-
-```toml
-val = ["a", "b", "c"]
-```
-
-```go
-type Config struct {
-	Val []string
-}
-```
-
-Also following examples all can be mapped:
-
-```toml
-val1 = [1, 2, 3]
-val2 = [["a", "b"], ["c", "d"]]
-val3 = [[1, 2, 3], ["a", "b", "c"]]
-val4 = [[1, 2, 3], [["a", "b"], [true, false]]]
-```
-
-```go
-type Config struct {
-	Val1 []int
-	Val2 [][]string
-	Val3 [][]interface{}
-	Val4 [][]interface{}
-}
-```
-
-### Table
-
-```toml
-[server]
-type = "app"
-
-  [server.development]
-  ip = "10.0.0.1"
-
-  [server.production]
-  ip = "10.0.0.2"
-```
-
-```go
-type Config struct {
-	Server map[string]Server
-}
-
-type Server struct {
-	IP string
-}
-```
-
-You can also use the following struct instead of map of struct.
-
-```go
-type Config struct {
-	Server struct {
-		Development Server
-		Production Server
-	}
-}
-
-type Server struct {
-	IP string
-}
-```
-
-### Array of Tables
-
-```toml
-[[fruit]]
-  name = "apple"
-
-  [fruit.physical]
-    color = "red"
-    shape = "round"
-
-  [[fruit.variety]]
-    name = "red delicious"
-
-  [[fruit.variety]]
-    name = "granny smith"
-
-[[fruit]]
-  name = "banana"
-
-  [[fruit.variety]]
-    name = "plantain"
-```
-
-```go
-type Config struct {
-	Fruit []struct {
-		Name string
-		Physical struct {
-			Color string
-			Shape string
-		}
-		Variety []struct {
-			Name string
-		}
-	}
-}
-```
-
-### Using `toml.UnmarshalTOML` interface
-
-```toml
-duration = "10s"
-```
-
-```go
-import time
-
-type Config struct {
-	Duration Duration
-}
-
-type Duration struct {
-	time.Duration
-}
-
-func (d *Duration) UnmarshalTOML(data []byte) error {
-	d.Duration, err := time.ParseDuration(string(data))
-	return err
-}
-```
-
-## API documentation
-
-See [Godoc](http://godoc.org/github.com/naoina/toml).
-
-## License
-
-MIT
diff --git a/Godeps/_workspace/src/github.com/naoina/toml/ast/ast.go b/Godeps/_workspace/src/github.com/naoina/toml/ast/ast.go
deleted file mode 100644
index 68bb0ee15..000000000
--- a/Godeps/_workspace/src/github.com/naoina/toml/ast/ast.go
+++ /dev/null
@@ -1,184 +0,0 @@
-package ast
-
-import (
-	"strconv"
-	"time"
-)
-
-type Position struct {
-	Begin int
-	End   int
-}
-
-type Value interface {
-	Pos() int
-	End() int
-	Source() string
-}
-
-type String struct {
-	Position Position
-	Value    string
-	Data     []rune
-}
-
-func (s *String) Pos() int {
-	return s.Position.Begin
-}
-
-func (s *String) End() int {
-	return s.Position.End
-}
-
-func (s *String) Source() string {
-	return string(s.Data)
-}
-
-type Integer struct {
-	Position Position
-	Value    string
-	Data     []rune
-}
-
-func (i *Integer) Pos() int {
-	return i.Position.Begin
-}
-
-func (i *Integer) End() int {
-	return i.Position.End
-}
-
-func (i *Integer) Source() string {
-	return string(i.Data)
-}
-
-func (i *Integer) Int() (int64, error) {
-	return strconv.ParseInt(i.Value, 10, 64)
-}
-
-type Float struct {
-	Position Position
-	Value    string
-	Data     []rune
-}
-
-func (f *Float) Pos() int {
-	return f.Position.Begin
-}
-
-func (f *Float) End() int {
-	return f.Position.End
-}
-
-func (f *Float) Source() string {
-	return string(f.Data)
-}
-
-func (f *Float) Float() (float64, error) {
-	return strconv.ParseFloat(f.Value, 64)
-}
-
-type Boolean struct {
-	Position Position
-	Value    string
-	Data     []rune
-}
-
-func (b *Boolean) Pos() int {
-	return b.Position.Begin
-}
-
-func (b *Boolean) End() int {
-	return b.Position.End
-}
-
-func (b *Boolean) Source() string {
-	return string(b.Data)
-}
-
-func (b *Boolean) Boolean() (bool, error) {
-	return strconv.ParseBool(b.Value)
-}
-
-type Datetime struct {
-	Position Position
-	Value    string
-	Data     []rune
-}
-
-func (d *Datetime) Pos() int {
-	return d.Position.Begin
-}
-
-func (d *Datetime) End() int {
-	return d.Position.End
-}
-
-func (d *Datetime) Source() string {
-	return string(d.Data)
-}
-
-func (d *Datetime) Time() (time.Time, error) {
-	return time.Parse(time.RFC3339Nano, d.Value)
-}
-
-type Array struct {
-	Position Position
-	Value    []Value
-	Data     []rune
-}
-
-func (a *Array) Pos() int {
-	return a.Position.Begin
-}
-
-func (a *Array) End() int {
-	return a.Position.End
-}
-
-func (a *Array) Source() string {
-	return string(a.Data)
-}
-
-type TableType uint8
-
-const (
-	TableTypeNormal TableType = iota
-	TableTypeArray
-)
-
-var tableTypes = [...]string{
-	"normal",
-	"array",
-}
-
-func (t TableType) String() string {
-	return tableTypes[t]
-}
-
-type Table struct {
-	Position Position
-	Line     int
-	Name     string
-	Fields   map[string]interface{}
-	Type     TableType
-	Data     []rune
-}
-
-func (t *Table) Pos() int {
-	return t.Position.Begin
-}
-
-func (t *Table) End() int {
-	return t.Position.End
-}
-
-func (t *Table) Source() string {
-	return string(t.Data)
-}
-
-type KeyValue struct {
-	Key   string
-	Value Value
-	Line  int
-}
diff --git a/Godeps/_workspace/src/github.com/naoina/toml/decode.go b/Godeps/_workspace/src/github.com/naoina/toml/decode.go
deleted file mode 100644
index c4eb32946..000000000
--- a/Godeps/_workspace/src/github.com/naoina/toml/decode.go
+++ /dev/null
@@ -1,678 +0,0 @@
-package toml
-
-import (
-	"fmt"
-	"io"
-	"io/ioutil"
-	"reflect"
-	"strconv"
-	"strings"
-
-	"github.com/naoina/toml/ast"
-)
-
-const (
-	tableSeparator = '.'
-)
-
-var (
-	escapeReplacer = strings.NewReplacer(
-		"\b", "\\n",
-		"\f", "\\f",
-		"\n", "\\n",
-		"\r", "\\r",
-		"\t", "\\t",
-	)
-	underscoreReplacer = strings.NewReplacer(
-		"_", "",
-	)
-)
-
-// Unmarshal parses the TOML data and stores the result in the value pointed to by v.
-//
-// Unmarshal will mapped to v that according to following rules:
-//
-//	TOML strings to string
-//	TOML integers to any int type
-//	TOML floats to float32 or float64
-//	TOML booleans to bool
-//	TOML datetimes to time.Time
-//	TOML arrays to any type of slice or []interface{}
-//	TOML tables to struct
-//	TOML array of tables to slice of struct
-func Unmarshal(data []byte, v interface{}) error {
-	table, err := Parse(data)
-	if err != nil {
-		return err
-	}
-	if err := UnmarshalTable(table, v); err != nil {
-		return fmt.Errorf("toml: unmarshal: %v", err)
-	}
-	return nil
-}
-
-// A Decoder reads and decodes TOML from an input stream.
-type Decoder struct {
-	r io.Reader
-}
-
-// NewDecoder returns a new Decoder that reads from r.
-// Note that it reads all from r before parsing it.
-func NewDecoder(r io.Reader) *Decoder {
-	return &Decoder{
-		r: r,
-	}
-}
-
-// Decode parses the TOML data from its input and stores it in the value pointed to by v.
-// See the documentation for Unmarshal for details about the conversion of TOML into a Go value.
-func (d *Decoder) Decode(v interface{}) error {
-	b, err := ioutil.ReadAll(d.r)
-	if err != nil {
-		return err
-	}
-	return Unmarshal(b, v)
-}
-
-// Unmarshaler is the interface implemented by objects that can unmarshal a
-// TOML description of themselves.
-// The input can be assumed to be a valid encoding of a TOML value.
-// UnmarshalJSON must copy the TOML data if it wishes to retain the data after
-// returning.
-type Unmarshaler interface {
-	UnmarshalTOML([]byte) error
-}
-
-// UnmarshalTable applies the contents of an ast.Table to the value pointed at by v.
-//
-// UnmarshalTable will mapped to v that according to following rules:
-//
-//	TOML strings to string
-//	TOML integers to any int type
-//	TOML floats to float32 or float64
-//	TOML booleans to bool
-//	TOML datetimes to time.Time
-//	TOML arrays to any type of slice or []interface{}
-//	TOML tables to struct
-//	TOML array of tables to slice of struct
-func UnmarshalTable(t *ast.Table, v interface{}) (err error) {
-	if v == nil {
-		return fmt.Errorf("v must not be nil")
-	}
-	rv := reflect.ValueOf(v)
-	if kind := rv.Kind(); kind != reflect.Ptr && kind != reflect.Map {
-		return fmt.Errorf("v must be a pointer or map")
-	}
-	for rv.Kind() == reflect.Ptr {
-		rv = rv.Elem()
-	}
-	if err, ok := setUnmarshaler(rv, string(t.Data)); ok {
-		return err
-	}
-	for key, val := range t.Fields {
-		switch av := val.(type) {
-		case *ast.KeyValue:
-			fv, fieldName, found := findField(rv, key)
-			if !found {
-				return fmt.Errorf("line %d: field corresponding to `%s' is not defined in `%T'", av.Line, key, v)
-			}
-			switch fv.Kind() {
-			case reflect.Map:
-				mv := reflect.New(fv.Type().Elem()).Elem()
-				if err := UnmarshalTable(t, mv.Addr().Interface()); err != nil {
-					return err
-				}
-				fv.SetMapIndex(reflect.ValueOf(fieldName), mv)
-			default:
-				if err := setValue(fv, av.Value); err != nil {
-					return fmt.Errorf("line %d: %v.%s: %v", av.Line, rv.Type(), fieldName, err)
-				}
-				if rv.Kind() == reflect.Map {
-					rv.SetMapIndex(reflect.ValueOf(fieldName), fv)
-				}
-			}
-		case *ast.Table:
-			fv, fieldName, found := findField(rv, key)
-			if !found {
-				return fmt.Errorf("line %d: field corresponding to `%s' is not defined in `%T'", av.Line, key, v)
-			}
-			if err, ok := setUnmarshaler(fv, string(av.Data)); ok {
-				if err != nil {
-					return err
-				}
-				continue
-			}
-			for fv.Kind() == reflect.Ptr {
-				fv.Set(reflect.New(fv.Type().Elem()))
-				fv = fv.Elem()
-			}
-			switch fv.Kind() {
-			case reflect.Struct:
-				vv := reflect.New(fv.Type()).Elem()
-				if err := UnmarshalTable(av, vv.Addr().Interface()); err != nil {
-					return err
-				}
-				fv.Set(vv)
-				if rv.Kind() == reflect.Map {
-					rv.SetMapIndex(reflect.ValueOf(fieldName), fv)
-				}
-			case reflect.Map:
-				mv := reflect.MakeMap(fv.Type())
-				if err := UnmarshalTable(av, mv.Interface()); err != nil {
-					return err
-				}
-				fv.Set(mv)
-			default:
-				return fmt.Errorf("line %d: `%v.%s' must be struct or map, but %v given", av.Line, rv.Type(), fieldName, fv.Kind())
-			}
-		case []*ast.Table:
-			fv, fieldName, found := findField(rv, key)
-			if !found {
-				return fmt.Errorf("line %d: field corresponding to `%s' is not defined in `%T'", av[0].Line, key, v)
-			}
-			data := make([]string, 0, len(av))
-			for _, tbl := range av {
-				data = append(data, string(tbl.Data))
-			}
-			if err, ok := setUnmarshaler(fv, strings.Join(data, "\n")); ok {
-				if err != nil {
-					return err
-				}
-				continue
-			}
-			t := fv.Type().Elem()
-			pc := 0
-			for ; t.Kind() == reflect.Ptr; pc++ {
-				t = t.Elem()
-			}
-			if fv.Kind() != reflect.Slice {
-				return fmt.Errorf("line %d: `%v.%s' must be slice type, but %v given", av[0].Line, rv.Type(), fieldName, fv.Kind())
-			}
-			for _, tbl := range av {
-				var vv reflect.Value
-				switch t.Kind() {
-				case reflect.Map:
-					vv = reflect.MakeMap(t)
-					if err := UnmarshalTable(tbl, vv.Interface()); err != nil {
-						return err
-					}
-				default:
-					vv = reflect.New(t).Elem()
-					if err := UnmarshalTable(tbl, vv.Addr().Interface()); err != nil {
-						return err
-					}
-				}
-				for i := 0; i < pc; i++ {
-					vv = vv.Addr()
-					pv := reflect.New(vv.Type()).Elem()
-					pv.Set(vv)
-					vv = pv
-				}
-				fv.Set(reflect.Append(fv, vv))
-			}
-			if rv.Kind() == reflect.Map {
-				rv.SetMapIndex(reflect.ValueOf(fieldName), fv)
-			}
-		default:
-			return fmt.Errorf("BUG: unknown type `%T'", t)
-		}
-	}
-	return nil
-}
-
-func setUnmarshaler(lhs reflect.Value, data string) (error, bool) {
-	for lhs.Kind() == reflect.Ptr {
-		lhs.Set(reflect.New(lhs.Type().Elem()))
-		lhs = lhs.Elem()
-	}
-	if lhs.CanAddr() {
-		if u, ok := lhs.Addr().Interface().(Unmarshaler); ok {
-			return u.UnmarshalTOML([]byte(data)), true
-		}
-	}
-	return nil, false
-}
-
-func setValue(lhs reflect.Value, val ast.Value) error {
-	for lhs.Kind() == reflect.Ptr {
-		lhs.Set(reflect.New(lhs.Type().Elem()))
-		lhs = lhs.Elem()
-	}
-	if err, ok := setUnmarshaler(lhs, val.Source()); ok {
-		return err
-	}
-	switch v := val.(type) {
-	case *ast.Integer:
-		if err := setInt(lhs, v); err != nil {
-			return err
-		}
-	case *ast.Float:
-		if err := setFloat(lhs, v); err != nil {
-			return err
-		}
-	case *ast.String:
-		if err := setString(lhs, v); err != nil {
-			return err
-		}
-	case *ast.Boolean:
-		if err := setBoolean(lhs, v); err != nil {
-			return err
-		}
-	case *ast.Datetime:
-		if err := setDatetime(lhs, v); err != nil {
-			return err
-		}
-	case *ast.Array:
-		if err := setArray(lhs, v); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func setInt(fv reflect.Value, v *ast.Integer) error {
-	i, err := v.Int()
-	if err != nil {
-		return err
-	}
-	switch fv.Kind() {
-	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
-		if fv.OverflowInt(i) {
-			return &errorOutOfRange{fv.Kind(), i}
-		}
-		fv.SetInt(i)
-	case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64:
-		fv.SetUint(uint64(i))
-	case reflect.Interface:
-		fv.Set(reflect.ValueOf(i))
-	default:
-		return fmt.Errorf("`%v' is not any types of int", fv.Type())
-	}
-	return nil
-}
-
-func setFloat(fv reflect.Value, v *ast.Float) error {
-	f, err := v.Float()
-	if err != nil {
-		return err
-	}
-	switch fv.Kind() {
-	case reflect.Float32, reflect.Float64:
-		if fv.OverflowFloat(f) {
-			return &errorOutOfRange{fv.Kind(), f}
-		}
-		fv.SetFloat(f)
-	case reflect.Interface:
-		fv.Set(reflect.ValueOf(f))
-	default:
-		return fmt.Errorf("`%v' is not float32 or float64", fv.Type())
-	}
-	return nil
-}
-
-func setString(fv reflect.Value, v *ast.String) error {
-	return set(fv, v.Value)
-}
-
-func setBoolean(fv reflect.Value, v *ast.Boolean) error {
-	b, err := v.Boolean()
-	if err != nil {
-		return err
-	}
-	return set(fv, b)
-}
-
-func setDatetime(fv reflect.Value, v *ast.Datetime) error {
-	tm, err := v.Time()
-	if err != nil {
-		return err
-	}
-	return set(fv, tm)
-}
-
-func setArray(fv reflect.Value, v *ast.Array) error {
-	if len(v.Value) == 0 {
-		return nil
-	}
-	typ := reflect.TypeOf(v.Value[0])
-	for _, vv := range v.Value[1:] {
-		if typ != reflect.TypeOf(vv) {
-			return fmt.Errorf("array cannot contain multiple types")
-		}
-	}
-	sliceType := fv.Type()
-	if fv.Kind() == reflect.Interface {
-		sliceType = reflect.SliceOf(sliceType)
-	}
-	slice := reflect.MakeSlice(sliceType, 0, len(v.Value))
-	t := sliceType.Elem()
-	for _, vv := range v.Value {
-		tmp := reflect.New(t).Elem()
-		if err := setValue(tmp, vv); err != nil {
-			return err
-		}
-		slice = reflect.Append(slice, tmp)
-	}
-	fv.Set(slice)
-	return nil
-}
-
-func set(fv reflect.Value, v interface{}) error {
-	rhs := reflect.ValueOf(v)
-	if !rhs.Type().AssignableTo(fv.Type()) {
-		return fmt.Errorf("`%v' type is not assignable to `%v' type", rhs.Type(), fv.Type())
-	}
-	fv.Set(rhs)
-	return nil
-}
-
-type stack struct {
-	key   string
-	table *ast.Table
-}
-
-type toml struct {
-	table        *ast.Table
-	line         int
-	currentTable *ast.Table
-	s            string
-	key          string
-	val          ast.Value
-	arr          *array
-	tableMap     map[string]*ast.Table
-	stack        []*stack
-	skip         bool
-}
-
-func (p *toml) init(data []rune) {
-	p.line = 1
-	p.table = &ast.Table{
-		Line: p.line,
-		Type: ast.TableTypeNormal,
-		Data: data[:len(data)-1], // truncate the end_symbol added by PEG parse generator.
-	}
-	p.tableMap = map[string]*ast.Table{
-		"": p.table,
-	}
-	p.currentTable = p.table
-}
-
-func (p *toml) Error(err error) {
-	panic(convertError{fmt.Errorf("toml: line %d: %v", p.line, err)})
-}
-
-func (p *tomlParser) SetTime(begin, end int) {
-	p.val = &ast.Datetime{
-		Position: ast.Position{Begin: begin, End: end},
-		Data:     p.buffer[begin:end],
-		Value:    string(p.buffer[begin:end]),
-	}
-}
-
-func (p *tomlParser) SetFloat64(begin, end int) {
-	p.val = &ast.Float{
-		Position: ast.Position{Begin: begin, End: end},
-		Data:     p.buffer[begin:end],
-		Value:    underscoreReplacer.Replace(string(p.buffer[begin:end])),
-	}
-}
-
-func (p *tomlParser) SetInt64(begin, end int) {
-	p.val = &ast.Integer{
-		Position: ast.Position{Begin: begin, End: end},
-		Data:     p.buffer[begin:end],
-		Value:    underscoreReplacer.Replace(string(p.buffer[begin:end])),
-	}
-}
-
-func (p *tomlParser) SetString(begin, end int) {
-	p.val = &ast.String{
-		Position: ast.Position{Begin: begin, End: end},
-		Data:     p.buffer[begin:end],
-		Value:    p.s,
-	}
-	p.s = ""
-}
-
-func (p *tomlParser) SetBool(begin, end int) {
-	p.val = &ast.Boolean{
-		Position: ast.Position{Begin: begin, End: end},
-		Data:     p.buffer[begin:end],
-		Value:    string(p.buffer[begin:end]),
-	}
-}
-
-func (p *tomlParser) StartArray() {
-	if p.arr == nil {
-		p.arr = &array{line: p.line, current: &ast.Array{}}
-		return
-	}
-	p.arr.child = &array{parent: p.arr, line: p.line, current: &ast.Array{}}
-	p.arr = p.arr.child
-}
-
-func (p *tomlParser) AddArrayVal() {
-	if p.arr.current == nil {
-		p.arr.current = &ast.Array{}
-	}
-	p.arr.current.Value = append(p.arr.current.Value, p.val)
-}
-
-func (p *tomlParser) SetArray(begin, end int) {
-	p.arr.current.Position = ast.Position{Begin: begin, End: end}
-	p.arr.current.Data = p.buffer[begin:end]
-	p.val = p.arr.current
-	p.arr = p.arr.parent
-}
-
-func (p *toml) SetTable(buf []rune, begin, end int) {
-	p.setTable(p.table, buf, begin, end)
-}
-
-func (p *toml) setTable(t *ast.Table, buf []rune, begin, end int) {
-	name := string(buf[begin:end])
-	names := splitTableKey(name)
-	if t, exists := p.tableMap[name]; exists {
-		if lt := p.tableMap[names[len(names)-1]]; t.Type == ast.TableTypeArray || lt != nil && lt.Type == ast.TableTypeNormal {
-			p.Error(fmt.Errorf("table `%s' is in conflict with %v table in line %d", name, t.Type, t.Line))
-		}
-	}
-	t, err := p.lookupTable(t, names)
-	if err != nil {
-		p.Error(err)
-	}
-	p.currentTable = t
-	p.tableMap[name] = p.currentTable
-}
-
-func (p *tomlParser) SetTableString(begin, end int) {
-	p.currentTable.Data = p.buffer[begin:end]
-
-	p.currentTable.Position.Begin = begin
-	p.currentTable.Position.End = end
-}
-
-func (p *toml) SetArrayTable(buf []rune, begin, end int) {
-	p.setArrayTable(p.table, buf, begin, end)
-}
-
-func (p *toml) setArrayTable(t *ast.Table, buf []rune, begin, end int) {
-	name := string(buf[begin:end])
-	if t, exists := p.tableMap[name]; exists && t.Type == ast.TableTypeNormal {
-		p.Error(fmt.Errorf("table `%s' is in conflict with %v table in line %d", name, t.Type, t.Line))
-	}
-	names := splitTableKey(name)
-	t, err := p.lookupTable(t, names[:len(names)-1])
-	if err != nil {
-		p.Error(err)
-	}
-	last := names[len(names)-1]
-	tbl := &ast.Table{
-		Position: ast.Position{begin, end},
-		Line:     p.line,
-		Name:     last,
-		Type:     ast.TableTypeArray,
-	}
-	switch v := t.Fields[last].(type) {
-	case nil:
-		if t.Fields == nil {
-			t.Fields = make(map[string]interface{})
-		}
-		t.Fields[last] = []*ast.Table{tbl}
-	case []*ast.Table:
-		t.Fields[last] = append(v, tbl)
-	case *ast.KeyValue:
-		p.Error(fmt.Errorf("key `%s' is in conflict with line %d", last, v.Line))
-	default:
-		p.Error(fmt.Errorf("BUG: key `%s' is in conflict but it's unknown type `%T'", last, v))
-	}
-	p.currentTable = tbl
-	p.tableMap[name] = p.currentTable
-}
-
-func (p *toml) StartInlineTable() {
-	p.skip = false
-	p.stack = append(p.stack, &stack{p.key, p.currentTable})
-	buf := []rune(p.key)
-	if p.arr == nil {
-		p.setTable(p.currentTable, buf, 0, len(buf))
-	} else {
-		p.setArrayTable(p.currentTable, buf, 0, len(buf))
-	}
-}
-
-func (p *toml) EndInlineTable() {
-	st := p.stack[len(p.stack)-1]
-	p.key, p.currentTable = st.key, st.table
-	p.stack[len(p.stack)-1] = nil
-	p.stack = p.stack[:len(p.stack)-1]
-	p.skip = true
-}
-
-func (p *toml) AddLineCount(i int) {
-	p.line += i
-}
-
-func (p *toml) SetKey(buf []rune, begin, end int) {
-	p.key = string(buf[begin:end])
-}
-
-func (p *toml) AddKeyValue() {
-	if p.skip {
-		p.skip = false
-		return
-	}
-	if val, exists := p.currentTable.Fields[p.key]; exists {
-		switch v := val.(type) {
-		case *ast.Table:
-			p.Error(fmt.Errorf("key `%s' is in conflict with %v table in line %d", p.key, v.Type, v.Line))
-		case *ast.KeyValue:
-			p.Error(fmt.Errorf("key `%s' is in conflict with line %d", p.key, v.Line))
-		default:
-			p.Error(fmt.Errorf("BUG: key `%s' is in conflict but it's unknown type `%T'", p.key, v))
-		}
-	}
-	if p.currentTable.Fields == nil {
-		p.currentTable.Fields = make(map[string]interface{})
-	}
-	p.currentTable.Fields[p.key] = &ast.KeyValue{
-		Key:   p.key,
-		Value: p.val,
-		Line:  p.line,
-	}
-}
-
-func (p *toml) SetBasicString(buf []rune, begin, end int) {
-	p.s = p.unquote(string(buf[begin:end]))
-}
-
-func (p *toml) SetMultilineString() {
-	p.s = p.unquote(`"` + escapeReplacer.Replace(strings.TrimLeft(p.s, "\r\n")) + `"`)
-}
-
-func (p *toml) AddMultilineBasicBody(buf []rune, begin, end int) {
-	p.s += string(buf[begin:end])
-}
-
-func (p *toml) SetLiteralString(buf []rune, begin, end int) {
-	p.s = string(buf[begin:end])
-}
-
-func (p *toml) SetMultilineLiteralString(buf []rune, begin, end int) {
-	p.s = strings.TrimLeft(string(buf[begin:end]), "\r\n")
-}
-
-func (p *toml) unquote(s string) string {
-	s, err := strconv.Unquote(s)
-	if err != nil {
-		p.Error(err)
-	}
-	return s
-}
-
-func (p *toml) lookupTable(t *ast.Table, keys []string) (*ast.Table, error) {
-	for _, s := range keys {
-		val, exists := t.Fields[s]
-		if !exists {
-			tbl := &ast.Table{
-				Line: p.line,
-				Name: s,
-				Type: ast.TableTypeNormal,
-			}
-			if t.Fields == nil {
-				t.Fields = make(map[string]interface{})
-			}
-			t.Fields[s] = tbl
-			t = tbl
-			continue
-		}
-		switch v := val.(type) {
-		case *ast.Table:
-			t = v
-		case []*ast.Table:
-			t = v[len(v)-1]
-		case *ast.KeyValue:
-			return nil, fmt.Errorf("key `%s' is in conflict with line %d", s, v.Line)
-		default:
-			return nil, fmt.Errorf("BUG: key `%s' is in conflict but it's unknown type `%T'", s, v)
-		}
-	}
-	return t, nil
-}
-
-func splitTableKey(tk string) []string {
-	key := make([]byte, 0, 1)
-	keys := make([]string, 0, 1)
-	inQuote := false
-	for i := 0; i < len(tk); i++ {
-		k := tk[i]
-		switch {
-		case k == tableSeparator && !inQuote:
-			keys = append(keys, string(key))
-			key = key[:0] // reuse buffer.
-		case k == '"':
-			inQuote = !inQuote
-		case (k == ' ' || k == '\t') && !inQuote:
-			// skip.
-		default:
-			key = append(key, k)
-		}
-	}
-	keys = append(keys, string(key))
-	return keys
-}
-
-type convertError struct {
-	err error
-}
-
-func (e convertError) Error() string {
-	return e.err.Error()
-}
-
-type array struct {
-	parent  *array
-	child   *array
-	current *ast.Array
-	line    int
-}
diff --git a/Godeps/_workspace/src/github.com/naoina/toml/decode_bench_test.go b/Godeps/_workspace/src/github.com/naoina/toml/decode_bench_test.go
deleted file mode 100644
index b85c1c680..000000000
--- a/Godeps/_workspace/src/github.com/naoina/toml/decode_bench_test.go
+++ /dev/null
@@ -1,49 +0,0 @@
-package toml_test
-
-import (
-	"testing"
-	"time"
-
-	"github.com/naoina/toml"
-)
-
-func BenchmarkUnmarshal(b *testing.B) {
-	var v struct {
-		Title string
-		Owner struct {
-			Name         string
-			Organization string
-			Bio          string
-			Dob          time.Time
-		}
-		Database struct {
-			Server        string
-			Ports         []int
-			ConnectionMax int
-			Enabled       bool
-		}
-		Servers struct {
-			Alpha struct {
-				IP string
-				DC string
-			}
-			Beta struct {
-				IP string
-				DC string
-			}
-		}
-		Clients struct {
-			Data  []interface{}
-			Hosts []string
-		}
-	}
-	data, err := loadTestData()
-	if err != nil {
-		b.Fatal(err)
-	}
-	for i := 0; i < b.N; i++ {
-		if err := toml.Unmarshal(data, &v); err != nil {
-			b.Fatal(err)
-		}
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/naoina/toml/decode_test.go b/Godeps/_workspace/src/github.com/naoina/toml/decode_test.go
deleted file mode 100644
index bd022eec2..000000000
--- a/Godeps/_workspace/src/github.com/naoina/toml/decode_test.go
+++ /dev/null
@@ -1,1123 +0,0 @@
-package toml_test
-
-import (
-	"fmt"
-	"io/ioutil"
-	"path/filepath"
-	"reflect"
-	"testing"
-	"time"
-
-	"github.com/naoina/toml"
-)
-
-const (
-	dataDir = "testdata"
-)
-
-func loadTestData() ([]byte, error) {
-	f := filepath.Join(dataDir, "test.toml")
-	data, err := ioutil.ReadFile(f)
-	if err != nil {
-		return nil, err
-	}
-	return data, nil
-}
-
-func mustTime(tm time.Time, err error) time.Time {
-	if err != nil {
-		panic(err)
-	}
-	return tm
-}
-
-type Name struct {
-	First string
-	Last  string
-}
-type Point struct {
-	X int
-	Y int
-}
-type Inline struct {
-	Name  Name
-	Point Point
-}
-type Subtable struct {
-	Key string
-}
-type Table struct {
-	Key      string
-	Subtable Subtable
-	Inline   Inline
-}
-type W struct {
-}
-type Z struct {
-	W W
-}
-type Y struct {
-	Z Z
-}
-type X struct {
-	Y Y
-}
-type Basic struct {
-	Basic string
-}
-type Continued struct {
-	Key1 string
-	Key2 string
-	Key3 string
-}
-type Multiline struct {
-	Key1      string
-	Key2      string
-	Key3      string
-	Continued Continued
-}
-type LiteralMultiline struct {
-	Regex2 string
-	Lines  string
-}
-type Literal struct {
-	Winpath   string
-	Winpath2  string
-	Quoted    string
-	Regex     string
-	Multiline LiteralMultiline
-}
-type String struct {
-	Basic     Basic
-	Multiline Multiline
-	Literal   Literal
-}
-type IntegerUnderscores struct {
-	Key1 int
-	Key2 int
-	Key3 int
-}
-type Integer struct {
-	Key1        int
-	Key2        int
-	Key3        int
-	Key4        int
-	Underscores IntegerUnderscores
-}
-type Fractional struct {
-	Key1 float64
-	Key2 float64
-	Key3 float64
-}
-type Exponent struct {
-	Key1 float64
-	Key2 float64
-	Key3 float64
-}
-type Both struct {
-	Key float64
-}
-type FloatUnderscores struct {
-	Key1 float64
-	Key2 float64
-}
-type Float struct {
-	Fractional  Fractional
-	Exponent    Exponent
-	Both        Both
-	Underscores FloatUnderscores
-}
-type Boolean struct {
-	True  bool
-	False bool
-}
-type Datetime struct {
-	Key1 time.Time
-	Key2 time.Time
-	Key3 time.Time
-}
-type Array struct {
-	Key1 []int
-	Key2 []string
-	Key3 [][]int
-	Key4 [][]interface{}
-	Key5 []int
-	Key6 []int
-}
-type Product struct {
-	Name  string
-	Sku   int64
-	Color string
-}
-type Physical struct {
-	Color string
-	Shape string
-}
-type Variety struct {
-	Name string
-}
-type Fruit struct {
-	Name     string
-	Physical Physical
-	Variety  []Variety
-}
-type testStruct struct {
-	Table    Table
-	X        X
-	String   String
-	Integer  Integer
-	Float    Float
-	Boolean  Boolean
-	Datetime Datetime
-	Array    Array
-	Products []Product
-	Fruit    []Fruit
-}
-
-func TestUnmarshal(t *testing.T) {
-	data, err := loadTestData()
-	if err != nil {
-		t.Fatal(err)
-	}
-	var v testStruct
-	var actual interface{} = toml.Unmarshal(data, &v)
-	var expect interface{} = nil
-	if !reflect.DeepEqual(actual, expect) {
-		t.Errorf(`toml.Unmarshal(data, &testStruct{}) => %#v; want %#v`, actual, expect)
-	}
-
-	actual = v
-	expect = testStruct{
-		Table: Table{
-			Key: "value",
-			Subtable: Subtable{
-				Key: "another value",
-			},
-			Inline: Inline{
-				Name: Name{
-					First: "Tom",
-					Last:  "Preston-Werner",
-				},
-				Point: Point{
-					X: 1,
-					Y: 2,
-				},
-			},
-		},
-		X: X{},
-		String: String{
-			Basic: Basic{
-				Basic: "I'm a string. \"You can quote me\". Name\tJos\u00E9\nLocation\tSF.",
-			},
-			Multiline: Multiline{
-				Key1: "One\nTwo",
-				Key2: "One\nTwo",
-				Key3: "One\nTwo",
-				Continued: Continued{
-					Key1: "The quick brown fox jumps over the lazy dog.",
-					Key2: "The quick brown fox jumps over the lazy dog.",
-					Key3: "The quick brown fox jumps over the lazy dog.",
-				},
-			},
-			Literal: Literal{
-				Winpath:  `C:\Users\nodejs\templates`,
-				Winpath2: `\\ServerX\admin$\system32\`,
-				Quoted:   `Tom "Dubs" Preston-Werner`,
-				Regex:    `<\i\c*\s*>`,
-				Multiline: LiteralMultiline{
-					Regex2: `I [dw]on't need \d{2} apples`,
-					Lines:  "The first newline is\ntrimmed in raw strings.\n   All other whitespace\n   is preserved.\n",
-				},
-			},
-		},
-		Integer: Integer{
-			Key1: 99,
-			Key2: 42,
-			Key3: 0,
-			Key4: -17,
-			Underscores: IntegerUnderscores{
-				Key1: 1000,
-				Key2: 5349221,
-				Key3: 12345,
-			},
-		},
-		Float: Float{
-			Fractional: Fractional{
-				Key1: 1.0,
-				Key2: 3.1415,
-				Key3: -0.01,
-			},
-			Exponent: Exponent{
-				Key1: 5e22,
-				Key2: 1e6,
-				Key3: -2e-2,
-			},
-			Both: Both{
-				Key: 6.626e-34,
-			},
-			Underscores: FloatUnderscores{
-				Key1: 9224617.445991228313,
-				Key2: 1e100,
-			},
-		},
-		Boolean: Boolean{
-			True:  true,
-			False: false,
-		},
-		Datetime: Datetime{
-			Key1: mustTime(time.Parse(time.RFC3339Nano, "1979-05-27T07:32:00Z")),
-			Key2: mustTime(time.Parse(time.RFC3339Nano, "1979-05-27T00:32:00-07:00")),
-			Key3: mustTime(time.Parse(time.RFC3339Nano, "1979-05-27T00:32:00.999999-07:00")),
-		},
-		Array: Array{
-			Key1: []int{1, 2, 3},
-			Key2: []string{"red", "yellow", "green"},
-			Key3: [][]int{{1, 2}, {3, 4, 5}},
-			Key4: [][]interface{}{{int64(1), int64(2)}, {"a", "b", "c"}},
-			Key5: []int{1, 2, 3},
-			Key6: []int{1, 2},
-		},
-		Products: []Product{
-			{Name: "Hammer", Sku: 738594937},
-			{},
-			{Name: "Nail", Sku: 284758393, Color: "gray"},
-		},
-		Fruit: []Fruit{
-			{
-				Name: "apple",
-				Physical: Physical{
-					Color: "red",
-					Shape: "round",
-				},
-				Variety: []Variety{
-					{Name: "red delicious"},
-					{Name: "granny smith"},
-				},
-			},
-			{
-				Name: "banana",
-				Variety: []Variety{
-					{Name: "plantain"},
-				},
-			},
-		},
-	}
-	if !reflect.DeepEqual(actual, expect) {
-		t.Errorf(`toml.Unmarshal(data, v); v => %#v; want %#v`, actual, expect)
-	}
-}
-
-type testcase struct {
-	data   string
-	err    error
-	actual interface{}
-	expect interface{}
-}
-
-func testUnmarshal(t *testing.T, testcases []testcase) {
-	for _, v := range testcases {
-		var actual error = toml.Unmarshal([]byte(v.data), v.actual)
-		var expect error = v.err
-		if !reflect.DeepEqual(actual, expect) {
-			t.Errorf(`toml.Unmarshal([]byte(%#v), %#v) => %#v; want %#v`, v.data, nil, actual, expect)
-		}
-		if !reflect.DeepEqual(v.actual, v.expect) {
-			t.Errorf(`toml.Unmarshal([]byte(%#v), v); v => %#v; want %#v`, v.data, v.actual, v.expect)
-		}
-	}
-}
-
-func TestUnmarshal_WithString(t *testing.T) {
-	type testStruct struct {
-		Str      string
-		Key1     string
-		Key2     string
-		Key3     string
-		Winpath  string
-		Winpath2 string
-		Quoted   string
-		Regex    string
-		Regex2   string
-		Lines    string
-	}
-	testUnmarshal(t, []testcase{
-		{`str = "I'm a string. \"You can quote me\". Name\tJos\u00E9\nLocation\tSF."`, nil, &testStruct{}, &testStruct{
-			Str: "I'm a string. \"You can quote me\". Name\tJos\u00E9\nLocation\tSF.",
-		}},
-		{`key1 = "One\nTwo"
-key2 = """One\nTwo"""
-key3 = """
-One
-Two"""
-`, nil, &testStruct{}, &testStruct{
-			Key1: "One\nTwo",
-			Key2: "One\nTwo",
-			Key3: "One\nTwo",
-		}},
-		{`# The following strings are byte-for-byte equivalent:
-key1 = "The quick brown fox jumps over the lazy dog."
-
-key2 = """
-The quick brown \
-
-
-  fox jumps over \
-    the lazy dog."""
-
-key3 = """\
-       The quick brown \
-       fox jumps over \
-       the lazy dog.\
-       """`, nil, &testStruct{}, &testStruct{
-			Key1: "The quick brown fox jumps over the lazy dog.",
-			Key2: "The quick brown fox jumps over the lazy dog.",
-			Key3: "The quick brown fox jumps over the lazy dog.",
-		}},
-		{`# What you see is what you get.
-winpath  = 'C:\Users\nodejs\templates'
-winpath2 = '\\ServerX\admin$\system32\'
-quoted   = 'Tom "Dubs" Preston-Werner'
-regex    = '<\i\c*\s*>'`, nil, &testStruct{}, &testStruct{
-			Winpath:  `C:\Users\nodejs\templates`,
-			Winpath2: `\\ServerX\admin$\system32\`,
-			Quoted:   `Tom "Dubs" Preston-Werner`,
-			Regex:    `<\i\c*\s*>`,
-		}},
-		{`regex2 = '''I [dw]on't need \d{2} apples'''
-lines  = '''
-The first newline is
-trimmed in raw strings.
-   All other whitespace
-   is preserved.
-'''`, nil, &testStruct{}, &testStruct{
-			Regex2: `I [dw]on't need \d{2} apples`,
-			Lines:  "The first newline is\ntrimmed in raw strings.\n   All other whitespace\n   is preserved.\n",
-		}},
-	})
-}
-
-func TestUnmarshal_WithInteger(t *testing.T) {
-	type testStruct struct {
-		Intval int64
-	}
-	testUnmarshal(t, []testcase{
-		{`intval = 0`, nil, &testStruct{}, &testStruct{0}},
-		{`intval = +0`, nil, &testStruct{}, &testStruct{0}},
-		{`intval = -0`, nil, &testStruct{}, &testStruct{-0}},
-		{`intval = 1`, nil, &testStruct{}, &testStruct{1}},
-		{`intval = +1`, nil, &testStruct{}, &testStruct{1}},
-		{`intval = -1`, nil, &testStruct{}, &testStruct{-1}},
-		{`intval = 10`, nil, &testStruct{}, &testStruct{10}},
-		{`intval = 777`, nil, &testStruct{}, &testStruct{777}},
-		{`intval = 2147483647`, nil, &testStruct{}, &testStruct{2147483647}},
-		{`intval = 2147483648`, nil, &testStruct{}, &testStruct{2147483648}},
-		{`intval = +2147483648`, nil, &testStruct{}, &testStruct{2147483648}},
-		{`intval = -2147483648`, nil, &testStruct{}, &testStruct{-2147483648}},
-		{`intval = -2147483649`, nil, &testStruct{}, &testStruct{-2147483649}},
-		{`intval = 9223372036854775807`, nil, &testStruct{}, &testStruct{9223372036854775807}},
-		{`intval = +9223372036854775807`, nil, &testStruct{}, &testStruct{9223372036854775807}},
-		{`intval = 9223372036854775808`, fmt.Errorf(`toml: unmarshal: line 1: toml_test.testStruct.Intval: strconv.ParseInt: parsing "9223372036854775808": value out of range`), &testStruct{}, &testStruct{}},
-		{`intval = +9223372036854775808`, fmt.Errorf(`toml: unmarshal: line 1: toml_test.testStruct.Intval: strconv.ParseInt: parsing "+9223372036854775808": value out of range`), &testStruct{}, &testStruct{}},
-		{`intval = -9223372036854775808`, nil, &testStruct{}, &testStruct{-9223372036854775808}},
-		{`intval = -9223372036854775809`, fmt.Errorf(`toml: unmarshal: line 1: toml_test.testStruct.Intval: strconv.ParseInt: parsing "-9223372036854775809": value out of range`), &testStruct{}, &testStruct{}},
-		{`intval = 1_000`, nil, &testStruct{}, &testStruct{1000}},
-		{`intval = 5_349_221`, nil, &testStruct{}, &testStruct{5349221}},
-		{`intval = 1_2_3_4_5`, nil, &testStruct{}, &testStruct{12345}},
-		{`intval = _1_000`, fmt.Errorf("toml: line 1: parse error"), &testStruct{}, &testStruct{}},
-		{`intval = 1_000_`, fmt.Errorf("toml: line 1: parse error"), &testStruct{}, &testStruct{}},
-	})
-}
-
-func TestUnmarshal_WithFloat(t *testing.T) {
-	type testStruct struct {
-		Floatval float64
-	}
-	testUnmarshal(t, []testcase{
-		{`floatval = 0.0`, nil, &testStruct{}, &testStruct{0.0}},
-		{`floatval = +0.0`, nil, &testStruct{}, &testStruct{0.0}},
-		{`floatval = -0.0`, nil, &testStruct{}, &testStruct{-0.0}},
-		{`floatval = 0.1`, nil, &testStruct{}, &testStruct{0.1}},
-		{`floatval = +0.1`, nil, &testStruct{}, &testStruct{0.1}},
-		{`floatval = -0.1`, nil, &testStruct{}, &testStruct{-0.1}},
-		{`floatval = 0.2`, nil, &testStruct{}, &testStruct{0.2}},
-		{`floatval = +0.2`, nil, &testStruct{}, &testStruct{0.2}},
-		{`floatval = -0.2`, nil, &testStruct{}, &testStruct{-0.2}},
-		{`floatval = 1.0`, nil, &testStruct{}, &testStruct{1.0}},
-		{`floatval = +1.0`, nil, &testStruct{}, &testStruct{1.0}},
-		{`floatval = -1.0`, nil, &testStruct{}, &testStruct{-1.0}},
-		{`floatval = 1.1`, nil, &testStruct{}, &testStruct{1.1}},
-		{`floatval = +1.1`, nil, &testStruct{}, &testStruct{1.1}},
-		{`floatval = -1.1`, nil, &testStruct{}, &testStruct{-1.1}},
-		{`floatval = 3.1415`, nil, &testStruct{}, &testStruct{3.1415}},
-		{`floatval = +3.1415`, nil, &testStruct{}, &testStruct{3.1415}},
-		{`floatval = -3.1415`, nil, &testStruct{}, &testStruct{-3.1415}},
-		{`floatval = 10.2e5`, nil, &testStruct{}, &testStruct{10.2e5}},
-		{`floatval = +10.2e5`, nil, &testStruct{}, &testStruct{10.2e5}},
-		{`floatval = -10.2e5`, nil, &testStruct{}, &testStruct{-10.2e5}},
-		{`floatval = 10.2E5`, nil, &testStruct{}, &testStruct{10.2e5}},
-		{`floatval = +10.2E5`, nil, &testStruct{}, &testStruct{10.2e5}},
-		{`floatval = -10.2E5`, nil, &testStruct{}, &testStruct{-10.2e5}},
-		{`floatval = 5e+22`, nil, &testStruct{}, &testStruct{5e+22}},
-		{`floatval = 1e6`, nil, &testStruct{}, &testStruct{1e6}},
-		{`floatval = -2E-2`, nil, &testStruct{}, &testStruct{-2E-2}},
-		{`floatval = 6.626e-34`, nil, &testStruct{}, &testStruct{6.626e-34}},
-		{`floatval = 9_224_617.445_991_228_313`, nil, &testStruct{}, &testStruct{9224617.445991228313}},
-		{`floatval = 1e1_00`, nil, &testStruct{}, &testStruct{1e100}},
-		{`floatval = 1e02`, nil, &testStruct{}, &testStruct{1e2}},
-		{`floatval = _1e1_00`, fmt.Errorf("toml: line 1: parse error"), &testStruct{}, &testStruct{}},
-		{`floatval = 1e1_00_`, fmt.Errorf("toml: line 1: parse error"), &testStruct{}, &testStruct{}},
-	})
-}
-
-func TestUnmarshal_WithBoolean(t *testing.T) {
-	type testStruct struct {
-		Boolval bool
-	}
-	testUnmarshal(t, []testcase{
-		{`boolval = true`, nil, &testStruct{}, &testStruct{true}},
-		{`boolval = false`, nil, &testStruct{}, &testStruct{false}},
-	})
-}
-
-func TestUnmarshal_WithDatetime(t *testing.T) {
-	type testStruct struct {
-		Datetimeval time.Time
-	}
-	testUnmarshal(t, []testcase{
-		{`datetimeval = 1979-05-27T07:32:00Z`, nil, &testStruct{}, &testStruct{
-			mustTime(time.Parse(time.RFC3339Nano, "1979-05-27T07:32:00Z")),
-		}},
-		{`datetimeval = 2014-09-13T12:37:39Z`, nil, &testStruct{}, &testStruct{
-			mustTime(time.Parse(time.RFC3339Nano, "2014-09-13T12:37:39Z")),
-		}},
-		{`datetimeval = 1979-05-27T00:32:00-07:00`, nil, &testStruct{}, &testStruct{
-			mustTime(time.Parse(time.RFC3339Nano, "1979-05-27T00:32:00-07:00")),
-		}},
-		{`datetimeval = 1979-05-27T00:32:00.999999-07:00`, nil, &testStruct{}, &testStruct{
-			mustTime(time.Parse(time.RFC3339Nano, "1979-05-27T00:32:00.999999-07:00")),
-		}},
-	})
-}
-
-func TestUnmarshal_WithArray(t *testing.T) {
-	testUnmarshal(t, []testcase{
-		{`arrayval = []`, nil, &struct{ Arrayval []interface{} }{}, &struct{ Arrayval []interface{} }{}},
-		{`arrayval = [ 1 ]`, nil, &struct{ Arrayval []int }{},
-			&struct {
-				Arrayval []int
-			}{
-				[]int{1},
-			}},
-		{`arrayval = [ 1, 2, 3 ]`, nil, &struct{ Arrayval []int }{},
-			&struct {
-				Arrayval []int
-			}{
-				[]int{1, 2, 3},
-			}},
-		{`arrayval = [ 1, 2, 3, ]`, nil, &struct{ Arrayval []int }{},
-			&struct {
-				Arrayval []int
-			}{
-				[]int{1, 2, 3},
-			}},
-		{`arrayval = ["red", "yellow", "green"]`, nil, &struct{ Arrayval []string }{},
-			&struct{ Arrayval []string }{
-				[]string{"red", "yellow", "green"},
-			}},
-		{`arrayval = [ "all", 'strings', """are the same""", '''type''']`, nil, &struct{ Arrayval []string }{},
-			&struct{ Arrayval []string }{
-				[]string{"all", "strings", "are the same", "type"},
-			}},
-		{`arrayval = [[1,2],[3,4,5]]`, nil, &struct{ Arrayval [][]int }{},
-			&struct{ Arrayval [][]int }{
-				[][]int{
-					[]int{1, 2},
-					[]int{3, 4, 5},
-				},
-			}},
-		{`arrayval = [ [ 1, 2 ], ["a", "b", "c"] ] # this is ok`, nil, &struct{ Arrayval [][]interface{} }{},
-			&struct{ Arrayval [][]interface{} }{
-				[][]interface{}{
-					[]interface{}{int64(1), int64(2)},
-					[]interface{}{"a", "b", "c"},
-				},
-			}},
-		{`arrayval = [ [ 1, 2 ], [ [3, 4], [5, 6] ] ] # this is ok`, nil, &struct{ Arrayval [][]interface{} }{},
-			&struct{ Arrayval [][]interface{} }{
-				[][]interface{}{
-					[]interface{}{int64(1), int64(2)},
-					[]interface{}{
-						[]interface{}{int64(3), int64(4)},
-						[]interface{}{int64(5), int64(6)},
-					},
-				},
-			}},
-		{`arrayval = [ [ 1, 2 ], [ [3, 4], [5, 6], [7, 8] ] ] # this is ok`, nil, &struct{ Arrayval [][]interface{} }{},
-			&struct{ Arrayval [][]interface{} }{
-				[][]interface{}{
-					[]interface{}{int64(1), int64(2)},
-					[]interface{}{
-						[]interface{}{int64(3), int64(4)},
-						[]interface{}{int64(5), int64(6)},
-						[]interface{}{int64(7), int64(8)},
-					},
-				},
-			}},
-		{`arrayval = [ [[ 1, 2 ]], [3, 4], [5, 6] ] # this is ok`, nil, &struct{ Arrayval [][]interface{} }{},
-			&struct{ Arrayval [][]interface{} }{
-				[][]interface{}{
-					[]interface{}{
-						[]interface{}{int64(1), int64(2)},
-					},
-					[]interface{}{int64(3), int64(4)},
-					[]interface{}{int64(5), int64(6)},
-				},
-			}},
-		{`arrayval = [ 1, 2.0 ] # note: this is NOT ok`, fmt.Errorf("toml: unmarshal: line 1: struct { Arrayval []interface {} }.Arrayval: array cannot contain multiple types"), &struct{ Arrayval []interface{} }{}, &struct{ Arrayval []interface{} }{}},
-		{`key = [
-  1, 2, 3
-]`, nil, &struct{ Key []int }{},
-			&struct{ Key []int }{
-				[]int{1, 2, 3},
-			}},
-		{`key = [
-  1,
-  2, # this is ok
-]`, nil, &struct{ Key []int }{},
-			&struct{ Key []int }{
-				[]int{1, 2},
-			}},
-	})
-}
-
-func TestUnmarshal_WithTable(t *testing.T) {
-	type W struct{}
-	type Z struct {
-		W W
-	}
-	type Y struct {
-		Z Z
-	}
-	type X struct {
-		Y Y
-	}
-	type testStruct struct {
-		Table struct {
-			Key string
-		}
-		Dog struct {
-			Tater struct{}
-		}
-		X X
-		A struct {
-			D int
-			B struct {
-				C int
-			}
-		}
-	}
-	type testQuotedKeyStruct struct {
-		Dog struct {
-			TaterMan struct {
-				Type string
-			} `toml:"tater.man"`
-		}
-	}
-	type testQuotedKeyWithWhitespaceStruct struct {
-		Dog struct {
-			TaterMan struct {
-				Type string
-			} `toml:"tater . man"`
-		}
-	}
-	type testStructWithMap struct {
-		Servers map[string]struct {
-			IP string
-			DC string
-		}
-	}
-	testUnmarshal(t, []testcase{
-		{`[table]`, nil, &testStruct{}, &testStruct{}},
-		{`[table]
-key = "value"`, nil, &testStruct{},
-			&testStruct{
-				Table: struct {
-					Key string
-				}{
-					Key: "value",
-				},
-			}},
-		{`[dog.tater]`, nil, &testStruct{},
-			&testStruct{
-				Dog: struct {
-					Tater struct{}
-				}{
-					Tater: struct{}{},
-				},
-			}},
-		{`[dog."tater.man"]
-type = "pug"`, nil, &testQuotedKeyStruct{},
-			&testQuotedKeyStruct{
-				Dog: struct {
-					TaterMan struct {
-						Type string
-					} `toml:"tater.man"`
-				}{
-					TaterMan: struct {
-						Type string
-					}{
-						Type: "pug",
-					},
-				},
-			}},
-		{`[dog."tater . man"]
-type = "pug"`, nil, &testQuotedKeyWithWhitespaceStruct{},
-			&testQuotedKeyWithWhitespaceStruct{
-				Dog: struct {
-					TaterMan struct {
-						Type string
-					} `toml:"tater . man"`
-				}{
-					TaterMan: struct {
-						Type string
-					}{
-						Type: "pug",
-					},
-				},
-			}},
-		{`[x.y.z.w] # for this to work`, nil, &testStruct{},
-			&testStruct{
-				X: X{},
-			}},
-		{`[ x .  y  . z . w ]`, nil, &testStruct{},
-			&testStruct{
-				X: X{},
-			}},
-		{`[ x . "y" . z . "w" ]`, nil, &testStruct{},
-			&testStruct{
-				X: X{},
-			}},
-		{`table = {}`, nil, &testStruct{}, &testStruct{}},
-		{`table = { key = "value" }`, nil, &testStruct{}, &testStruct{
-			Table: struct {
-				Key string
-			}{
-				Key: "value",
-			},
-		}},
-		{`x = { y = { "z" = { w = {} } } }`, nil, &testStruct{}, &testStruct{X: X{}}},
-		{`[a.b]
-c = 1
-
-[a]
-d = 2`, nil, &testStruct{},
-			&testStruct{
-				A: struct {
-					D int
-					B struct {
-						C int
-					}
-				}{
-					D: 2,
-					B: struct {
-						C int
-					}{
-						C: 1,
-					},
-				},
-			}},
-		{`# DO NOT DO THIS
-
-[a]
-b = 1
-
-[a]
-c = 2`, fmt.Errorf("toml: line 6: table `a' is in conflict with normal table in line 3"), &testStruct{}, &testStruct{}},
-		{`# DO NOT DO THIS EITHER
-
-[a]
-b = 1
-
-[a.b]
-c = 2`, fmt.Errorf("toml: line 6: key `b' is in conflict with line 4"), &testStruct{}, &testStruct{}},
-		{`# DO NOT DO THIS EITHER
-
-[a.b]
-c = 2
-
-[a]
-b = 1`, fmt.Errorf("toml: line 7: key `b' is in conflict with normal table in line 3"), &testStruct{}, &testStruct{}},
-		{`[]`, fmt.Errorf("toml: line 1: parse error"), &testStruct{}, &testStruct{}},
-		{`[a.]`, fmt.Errorf("toml: line 1: parse error"), &testStruct{}, &testStruct{}},
-		{`[a..b]`, fmt.Errorf("toml: line 1: parse error"), &testStruct{}, &testStruct{}},
-		{`[.b]`, fmt.Errorf("toml: line 1: parse error"), &testStruct{}, &testStruct{}},
-		{`[.]`, fmt.Errorf("toml: line 1: parse error"), &testStruct{}, &testStruct{}},
-		{` = "no key name" # not allowed`, fmt.Errorf("toml: line 1: parse error"), &testStruct{}, &testStruct{}},
-		{`[servers]
-[servers.alpha]
-ip = "10.0.0.1"
-dc = "eqdc10"
-[servers.beta]
-ip = "10.0.0.2"
-dc = "eqdc10"
-`, nil, &testStructWithMap{},
-			&testStructWithMap{
-				Servers: map[string]struct {
-					IP string
-					DC string
-				}{
-					"alpha": {
-						IP: "10.0.0.1",
-						DC: "eqdc10",
-					},
-					"beta": {
-						IP: "10.0.0.2",
-						DC: "eqdc10",
-					},
-				},
-			}},
-	})
-}
-
-func TestUnmarshal_WithArrayTable(t *testing.T) {
-	type Product struct {
-		Name  string
-		SKU   int64
-		Color string
-	}
-	type Physical struct {
-		Color string
-		Shape string
-	}
-	type Variety struct {
-		Name string
-	}
-	type Fruit struct {
-		Name     string
-		Physical Physical
-		Variety  []Variety
-	}
-	type testStruct struct {
-		Products []Product
-		Fruit    []Fruit
-	}
-	type testStructWithMap struct {
-		Fruit []map[string][]struct {
-			Name string
-		}
-	}
-	testUnmarshal(t, []testcase{
-		{`[[products]]
-		name = "Hammer"
-		sku = 738594937
-
-		[[products]]
-
-		[[products]]
-		name = "Nail"
-		sku = 284758393
-		color = "gray"`, nil, &testStruct{},
-			&testStruct{
-				Products: []Product{
-					{Name: "Hammer", SKU: 738594937},
-					{},
-					{Name: "Nail", SKU: 284758393, Color: "gray"},
-				},
-			}},
-		{`products = [{name = "Hammer", sku = 738594937}, {},
-{name = "Nail", sku = 284758393, color = "gray"}]`, nil, &testStruct{}, &testStruct{
-			Products: []Product{
-				{Name: "Hammer", SKU: 738594937},
-				{},
-				{Name: "Nail", SKU: 284758393, Color: "gray"},
-			},
-		}},
-		{`[[fruit]]
-		name = "apple"
-
-		[fruit.physical]
-		color = "red"
-		shape = "round"
-
-		[[fruit.variety]]
-		name = "red delicious"
-
-		[[fruit.variety]]
-		name = "granny smith"
-
-		[[fruit]]
-		name = "banana"
-
-		[fruit.physical]
-		color = "yellow"
-		shape = "lune"
-
-		[[fruit.variety]]
-		name = "plantain"`, nil, &testStruct{},
-			&testStruct{
-				Fruit: []Fruit{
-					{
-						Name: "apple",
-						Physical: Physical{
-							Color: "red",
-							Shape: "round",
-						},
-						Variety: []Variety{
-							{Name: "red delicious"},
-							{Name: "granny smith"},
-						},
-					},
-					{
-						Name: "banana",
-						Physical: Physical{
-							Color: "yellow",
-							Shape: "lune",
-						},
-						Variety: []Variety{
-							{Name: "plantain"},
-						},
-					},
-				},
-			}},
-		{`[[fruit]]
-
-		[[fruit.variety]]
-		name = "red delicious"
-
-		[[fruit.variety]]
-		name = "granny smith"
-
-		[[fruit]]
-
-		[[fruit.variety]]
-		name = "plantain"
-
-		[[fruit.area]]
-		name = "phillippines"`, nil, &testStructWithMap{},
-			&testStructWithMap{
-				Fruit: []map[string][]struct {
-					Name string
-				}{
-					{
-						"variety": {
-							{Name: "red delicious"},
-							{Name: "granny smith"},
-						},
-					},
-					{
-						"variety": {
-							{Name: "plantain"},
-						},
-						"area": {
-							{Name: "phillippines"},
-						},
-					},
-				},
-			}},
-		{`# INVALID TOML DOC
-		[[fruit]]
-		name = "apple"
-
-		[[fruit.variety]]
-		name = "red delicious"
-
-		# This table conflicts with the previous table
-		[fruit.variety]
-		name = "granny smith"`, fmt.Errorf("toml: line 9: table `fruit.variety' is in conflict with array table in line 5"), &testStruct{}, &testStruct{}},
-		{`# INVALID TOML DOC
-		[[fruit]]
-		name = "apple"
-
-		[fruit.variety]
-		name = "granny smith"
-
-		# This table conflicts with the previous table
-		[[fruit.variety]]
-		name = "red delicious"`, fmt.Errorf("toml: line 9: table `fruit.variety' is in conflict with normal table in line 5"), &testStruct{}, &testStruct{}},
-	})
-}
-
-type UnmarshalString string
-
-func (u *UnmarshalString) UnmarshalTOML(data []byte) error {
-	*u = UnmarshalString("UnmarshalString: " + string(data))
-	return nil
-}
-
-type testUnmarshalStruct struct {
-	Title  string
-	Author UnmarshalString
-}
-
-func (u *testUnmarshalStruct) UnmarshalTOML(data []byte) error {
-	u.Title = "Unmarshaled: " + string(data)
-	return nil
-}
-
-func TestUnmarshal_WithUnmarshaler(t *testing.T) {
-	type testStruct struct {
-		Title         UnmarshalString
-		MaxConn       UnmarshalString
-		Ports         UnmarshalString
-		Servers       UnmarshalString
-		Table         UnmarshalString
-		Arraytable    UnmarshalString
-		ArrayOfStruct []testUnmarshalStruct
-	}
-	data := `title = "testtitle"
-max_conn = 777
-ports = [8080, 8081, 8082]
-servers = [1, 2, 3]
-[table]
-name = "alice"
-[[arraytable]]
-name = "alice"
-[[arraytable]]
-name = "bob"
-[[array_of_struct]]
-title = "Alice's Adventures in Wonderland"
-author = "Lewis Carroll"
-`
-	var v testStruct
-	if err := toml.Unmarshal([]byte(data), &v); err != nil {
-		t.Fatal(err)
-	}
-	actual := v
-	expect := testStruct{
-		Title:      `UnmarshalString: "testtitle"`,
-		MaxConn:    `UnmarshalString: 777`,
-		Ports:      `UnmarshalString: [8080, 8081, 8082]`,
-		Servers:    `UnmarshalString: [1, 2, 3]`,
-		Table:      "UnmarshalString: [table]\nname = \"alice\"",
-		Arraytable: "UnmarshalString: [[arraytable]]\nname = \"alice\"\n[[arraytable]]\nname = \"bob\"",
-		ArrayOfStruct: []testUnmarshalStruct{
-			{
-				Title:  "Unmarshaled: [[array_of_struct]]\ntitle = \"Alice's Adventures in Wonderland\"\nauthor = \"Lewis Carroll\"",
-				Author: "",
-			},
-		},
-	}
-	if !reflect.DeepEqual(actual, expect) {
-		t.Errorf(`toml.Unmarshal(data, &v); v => %#v; want %#v`, actual, expect)
-	}
-}
-
-func TestUnmarshal_WithUnmarshalerForTopLevelStruct(t *testing.T) {
-	data := `title = "Alice's Adventures in Wonderland"
-author = "Lewis Carroll"
-`
-	var v testUnmarshalStruct
-	if err := toml.Unmarshal([]byte(data), &v); err != nil {
-		t.Fatal(err)
-	}
-	actual := v
-	expect := testUnmarshalStruct{
-		Title: `Unmarshaled: title = "Alice's Adventures in Wonderland"
-author = "Lewis Carroll"
-`,
-		Author: "",
-	}
-	if !reflect.DeepEqual(actual, expect) {
-		t.Errorf(`toml.Unmarshal(data, &v); v => %#v; want %#v`, actual, expect)
-	}
-}
-
-func TestUnmarshal_WithMultibyteString(t *testing.T) {
-	type testStruct struct {
-		Name    string
-		Numbers []string
-	}
-	v := testStruct{}
-	data := `name = "七一〇七"
-numbers = ["壱", "弐", "参"]
-`
-	if err := toml.Unmarshal([]byte(data), &v); err != nil {
-		t.Fatal(err)
-	}
-	actual := v
-	expect := testStruct{
-		Name:    "七一〇七",
-		Numbers: []string{"壱", "弐", "参"},
-	}
-	if !reflect.DeepEqual(actual, expect) {
-		t.Errorf(`toml.Unmarshal([]byte(data), &v); v => %#v; want %#v`, actual, expect)
-	}
-}
-
-func TestUnmarshal_WithPointers(t *testing.T) {
-	type Inline struct {
-		Key1 string
-		Key2 *string
-		Key3 **string
-	}
-	type Table struct {
-		Key1 *string
-		Key2 **string
-		Key3 ***string
-	}
-	type testStruct struct {
-		Inline *Inline
-		Tables []*Table
-	}
-	type testStruct2 struct {
-		Inline **Inline
-		Tables []**Table
-	}
-	type testStruct3 struct {
-		Inline ***Inline
-		Tables []***Table
-	}
-	data := `
-inline = { key1 = "test", key2 = "a", key3 = "b" }
-[[tables]]
-key1 = "a"
-key2 = "a"
-key3 = "a"
-[[tables]]
-key1 = "b"
-key2 = "b"
-key3 = "b"
-`
-	s1 := "a"
-	s2 := &s1
-	s3 := &s2
-	s4 := &s3
-	s5 := "b"
-	s6 := &s5
-	s7 := &s6
-	s8 := &s7
-	i1 := &Inline{"test", s2, s7}
-	i2 := &i1
-	i3 := &i2
-	t1 := &Table{s2, s3, s4}
-	t2 := &Table{s6, s7, s8}
-	t3 := &t1
-	t4 := &t2
-	sc := &testStruct{
-		Inline: i1, Tables: []*Table{t1, t2},
-	}
-	ac := &testStruct{}
-	testUnmarshal(t, []testcase{
-		{data, nil, ac, sc},
-		{data, nil, &testStruct2{}, &testStruct2{
-			Inline: i2,
-			Tables: []**Table{&t1, &t2},
-		}},
-		{data, nil, &testStruct3{}, &testStruct3{
-			Inline: i3,
-			Tables: []***Table{&t3, &t4},
-		}},
-	})
-}
-
-func TestUnmarshalMap(t *testing.T) {
-	testUnmarshal(t, []testcase{
-		{`
-name = "evan"
-foo = 1
-`, nil, map[string]interface{}{}, map[string]interface{}{
-			"name": "evan",
-			"foo":  int64(1),
-		}},
-	})
-}
diff --git a/Godeps/_workspace/src/github.com/naoina/toml/encode.go b/Godeps/_workspace/src/github.com/naoina/toml/encode.go
deleted file mode 100644
index 1932538e6..000000000
--- a/Godeps/_workspace/src/github.com/naoina/toml/encode.go
+++ /dev/null
@@ -1,235 +0,0 @@
-package toml
-
-import (
-	"fmt"
-	"io"
-	"reflect"
-	"strconv"
-	"time"
-
-	"go/ast"
-
-	"github.com/naoina/go-stringutil"
-)
-
-const (
-	tagOmitempty = "omitempty"
-	tagSkip      = "-"
-)
-
-// Marshal returns the TOML encoding of v.
-//
-// Struct values encode as TOML. Each exported struct field becomes a field of
-// the TOML structure unless
-//   - the field's tag is "-", or
-//   - the field is empty and its tag specifies the "omitempty" option.
-// The "toml" key in the struct field's tag value is the key name, followed by
-// an optional comma and options. Examples:
-//
-//   // Field is ignored by this package.
-//   Field int `toml:"-"`
-//
-//   // Field appears in TOML as key "myName".
-//   Field int `toml:"myName"`
-//
-//   // Field appears in TOML as key "myName" and the field is omitted from the
-//   // result of encoding if its value is empty.
-//   Field int `toml:"myName,omitempty"`
-//
-//   // Field appears in TOML as key "field", but the field is skipped if
-//   // empty.
-//   // Note the leading comma.
-//   Field int `toml:",omitempty"`
-func Marshal(v interface{}) ([]byte, error) {
-	return marshal(nil, "", reflect.ValueOf(v), false, false)
-}
-
-// A Encoder writes TOML to an output stream.
-type Encoder struct {
-	w io.Writer
-}
-
-// NewEncoder returns a new Encoder that writes to w.
-func NewEncoder(w io.Writer) *Encoder {
-	return &Encoder{
-		w: w,
-	}
-}
-
-// Encode writes the TOML of v to the stream.
-// See the documentation for Marshal for details about the conversion of Go values to TOML.
-func (e *Encoder) Encode(v interface{}) error {
-	b, err := Marshal(v)
-	if err != nil {
-		return err
-	}
-	_, err = e.w.Write(b)
-	return err
-}
-
-// Marshaler is the interface implemented by objects that can marshal themshelves into valid TOML.
-type Marshaler interface {
-	MarshalTOML() ([]byte, error)
-}
-
-func marshal(buf []byte, prefix string, rv reflect.Value, inArray, arrayTable bool) ([]byte, error) {
-	rt := rv.Type()
-	for i := 0; i < rv.NumField(); i++ {
-		ft := rt.Field(i)
-		if !ast.IsExported(ft.Name) {
-			continue
-		}
-		colName, rest := extractTag(rt.Field(i).Tag.Get(fieldTagName))
-		if colName == tagSkip {
-			continue
-		}
-		if colName == "" {
-			colName = stringutil.ToSnakeCase(ft.Name)
-		}
-		fv := rv.Field(i)
-		switch rest {
-		case tagOmitempty:
-			if fv.Interface() == reflect.Zero(ft.Type).Interface() {
-				continue
-			}
-		}
-		var err error
-		if buf, err = encodeValue(buf, prefix, colName, fv, inArray, arrayTable); err != nil {
-			return nil, err
-		}
-	}
-	return buf, nil
-}
-
-func encodeValue(buf []byte, prefix, name string, fv reflect.Value, inArray, arrayTable bool) ([]byte, error) {
-	switch t := fv.Interface().(type) {
-	case Marshaler:
-		b, err := t.MarshalTOML()
-		if err != nil {
-			return nil, err
-		}
-		return appendNewline(append(appendKey(buf, name, inArray, arrayTable), b...), inArray, arrayTable), nil
-	case time.Time:
-		return appendNewline(encodeTime(appendKey(buf, name, inArray, arrayTable), t), inArray, arrayTable), nil
-	}
-	switch fv.Kind() {
-	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
-		return appendNewline(encodeInt(appendKey(buf, name, inArray, arrayTable), fv.Int()), inArray, arrayTable), nil
-	case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64:
-		return appendNewline(encodeUint(appendKey(buf, name, inArray, arrayTable), fv.Uint()), inArray, arrayTable), nil
-	case reflect.Float32, reflect.Float64:
-		return appendNewline(encodeFloat(appendKey(buf, name, inArray, arrayTable), fv.Float()), inArray, arrayTable), nil
-	case reflect.Bool:
-		return appendNewline(encodeBool(appendKey(buf, name, inArray, arrayTable), fv.Bool()), inArray, arrayTable), nil
-	case reflect.String:
-		return appendNewline(encodeString(appendKey(buf, name, inArray, arrayTable), fv.String()), inArray, arrayTable), nil
-	case reflect.Slice, reflect.Array:
-		ft := fv.Type().Elem()
-		for ft.Kind() == reflect.Ptr {
-			ft = ft.Elem()
-		}
-		if ft.Kind() == reflect.Struct {
-			name := tableName(prefix, name)
-			var err error
-			for i := 0; i < fv.Len(); i++ {
-				if buf, err = marshal(append(append(append(buf, '[', '['), name...), ']', ']', '\n'), name, fv.Index(i), false, true); err != nil {
-					return nil, err
-				}
-			}
-			return buf, nil
-		}
-		buf = append(appendKey(buf, name, inArray, arrayTable), '[')
-		var err error
-		for i := 0; i < fv.Len(); i++ {
-			if i != 0 {
-				buf = append(buf, ',')
-			}
-			if buf, err = encodeValue(buf, prefix, name, fv.Index(i), true, false); err != nil {
-				return nil, err
-			}
-		}
-		return appendNewline(append(buf, ']'), inArray, arrayTable), nil
-	case reflect.Struct:
-		name := tableName(prefix, name)
-		return marshal(append(append(append(buf, '['), name...), ']', '\n'), name, fv, inArray, arrayTable)
-	case reflect.Interface:
-		var err error
-		if buf, err = encodeInterface(appendKey(buf, name, inArray, arrayTable), fv.Interface()); err != nil {
-			return nil, err
-		}
-		return appendNewline(buf, inArray, arrayTable), nil
-	}
-	return nil, fmt.Errorf("toml: marshal: unsupported type %v", fv.Kind())
-}
-
-func appendKey(buf []byte, key string, inArray, arrayTable bool) []byte {
-	if !inArray {
-		return append(append(buf, key...), '=')
-	}
-	return buf
-}
-
-func appendNewline(buf []byte, inArray, arrayTable bool) []byte {
-	if !inArray {
-		return append(buf, '\n')
-	}
-	return buf
-}
-
-func encodeInterface(buf []byte, v interface{}) ([]byte, error) {
-	switch v := v.(type) {
-	case int:
-		return encodeInt(buf, int64(v)), nil
-	case int8:
-		return encodeInt(buf, int64(v)), nil
-	case int16:
-		return encodeInt(buf, int64(v)), nil
-	case int32:
-		return encodeInt(buf, int64(v)), nil
-	case int64:
-		return encodeInt(buf, v), nil
-	case uint:
-		return encodeUint(buf, uint64(v)), nil
-	case uint8:
-		return encodeUint(buf, uint64(v)), nil
-	case uint16:
-		return encodeUint(buf, uint64(v)), nil
-	case uint32:
-		return encodeUint(buf, uint64(v)), nil
-	case uint64:
-		return encodeUint(buf, v), nil
-	case float32:
-		return encodeFloat(buf, float64(v)), nil
-	case float64:
-		return encodeFloat(buf, v), nil
-	case bool:
-		return encodeBool(buf, v), nil
-	case string:
-		return encodeString(buf, v), nil
-	}
-	return nil, fmt.Errorf("toml: marshal: unable to detect a type of value `%v'", v)
-}
-
-func encodeInt(buf []byte, i int64) []byte {
-	return strconv.AppendInt(buf, i, 10)
-}
-
-func encodeUint(buf []byte, u uint64) []byte {
-	return strconv.AppendUint(buf, u, 10)
-}
-
-func encodeFloat(buf []byte, f float64) []byte {
-	return strconv.AppendFloat(buf, f, 'e', -1, 64)
-}
-
-func encodeBool(buf []byte, b bool) []byte {
-	return strconv.AppendBool(buf, b)
-}
-
-func encodeString(buf []byte, s string) []byte {
-	return strconv.AppendQuote(buf, s)
-}
-
-func encodeTime(buf []byte, t time.Time) []byte {
-	return append(buf, t.Format(time.RFC3339Nano)...)
-}
diff --git a/Godeps/_workspace/src/github.com/naoina/toml/encode_test.go b/Godeps/_workspace/src/github.com/naoina/toml/encode_test.go
deleted file mode 100644
index 17e04fd0a..000000000
--- a/Godeps/_workspace/src/github.com/naoina/toml/encode_test.go
+++ /dev/null
@@ -1,298 +0,0 @@
-package toml_test
-
-import (
-	"reflect"
-	"testing"
-	"time"
-
-	"github.com/naoina/toml"
-)
-
-func TestMarshal(t *testing.T) {
-	for _, v := range []struct {
-		v      interface{}
-		expect string
-	}{
-		{struct{ Name string }{"alice"}, "name=\"alice\"\n"},
-		{struct{ Age int }{7}, "age=7\n"},
-		{struct {
-			Name string
-			Age  int
-		}{"alice", 7}, "name=\"alice\"\nage=7\n"},
-		{struct {
-			Name string `toml:"-"`
-			Age  int
-		}{"alice", 7}, "age=7\n"},
-		{struct {
-			Name string `toml:"my_name"`
-		}{"bob"}, "my_name=\"bob\"\n"},
-		{struct {
-			Name string `toml:"my_name,omitempty"`
-		}{"bob"}, "my_name=\"bob\"\n"},
-		{struct {
-			Name string `toml:",omitempty"`
-		}{"bob"}, "name=\"bob\"\n"},
-		{struct {
-			Name string `toml:",omitempty"`
-		}{""}, ""},
-	} {
-		b, err := toml.Marshal(v.v)
-		var actual interface{} = err
-		var expect interface{} = nil
-		if !reflect.DeepEqual(actual, expect) {
-			t.Errorf(`Marshal(%#v) => %#v; want %#v`, v.v, actual, expect)
-		}
-
-		actual = string(b)
-		expect = v.expect
-		if !reflect.DeepEqual(actual, expect) {
-			t.Errorf(`Marshal(%#v); v => %#v; want %#v`, v, actual, expect)
-		}
-	}
-}
-
-func TestMarshalWhole(t *testing.T) {
-	for _, v := range []struct {
-		v      interface{}
-		expect string
-	}{
-		{
-			testStruct{
-				Table: Table{
-					Key: "value",
-					Subtable: Subtable{
-						Key: "another value",
-					},
-					Inline: Inline{
-						Name: Name{
-							First: "Tom",
-							Last:  "Preston-Werner",
-						},
-						Point: Point{
-							X: 1,
-							Y: 2,
-						},
-					},
-				},
-				X: X{},
-				String: String{
-					Basic: Basic{
-						Basic: "I'm a string. \"You can quote me\". Name\tJos\u00E9\nLocation\tSF.",
-					},
-					Multiline: Multiline{
-						Key1: "One\nTwo",
-						Continued: Continued{
-							Key1: "The quick brown fox jumps over the lazy dog.",
-						},
-					},
-					Literal: Literal{
-						Winpath:  `C:\Users\nodejs\templates`,
-						Winpath2: `\\ServerX\admin$\system32\`,
-						Quoted:   `Tom "Dubs" Preston-Werner`,
-						Regex:    `<\i\c*\s*>`,
-						Multiline: LiteralMultiline{
-							Regex2: `I [dw]on't need \d{2} apples`,
-							Lines:  "The first newline is\ntrimmed in raw strings.\n   All other whitespace\n   is preserved.\n",
-						},
-					},
-				},
-				Integer: Integer{
-					Key1: 99,
-					Key2: 42,
-					Key3: 0,
-					Key4: -17,
-					Underscores: IntegerUnderscores{
-						Key1: 1000,
-						Key2: 5349221,
-						Key3: 12345,
-					},
-				},
-				Float: Float{
-					Fractional: Fractional{
-						Key1: 1.0,
-						Key2: 3.1415,
-						Key3: -0.01,
-					},
-					Exponent: Exponent{
-						Key1: 5e22,
-						Key2: 1e6,
-						Key3: -2e-2,
-					},
-					Both: Both{
-						Key: 6.626e-34,
-					},
-					Underscores: FloatUnderscores{
-						Key1: 9224617.445991228313,
-						Key2: 1e100,
-					},
-				},
-				Boolean: Boolean{
-					True:  true,
-					False: false,
-				},
-				Datetime: Datetime{
-					Key1: mustTime(time.Parse(time.RFC3339Nano, "1979-05-27T07:32:00Z")),
-					Key2: mustTime(time.Parse(time.RFC3339Nano, "1979-05-27T00:32:00-07:00")),
-					Key3: mustTime(time.Parse(time.RFC3339Nano, "1979-05-27T00:32:00.999999-07:00")),
-				},
-				Array: Array{
-					Key1: []int{1, 2, 3},
-					Key2: []string{"red", "yellow", "green"},
-					Key3: [][]int{{1, 2}, {3, 4, 5}},
-					Key4: [][]interface{}{{int64(1), int64(2)}, {"a", "b", "c"}},
-					Key5: []int{1, 2, 3},
-					Key6: []int{1, 2},
-				},
-				Products: []Product{
-					{Name: "Hammer", Sku: 738594937},
-					{},
-					{Name: "Nail", Sku: 284758393, Color: "gray"},
-				},
-				Fruit: []Fruit{
-					{
-						Name: "apple",
-						Physical: Physical{
-							Color: "red",
-							Shape: "round",
-						},
-						Variety: []Variety{
-							{Name: "red delicious"},
-							{Name: "granny smith"},
-						},
-					},
-					{
-						Name: "banana",
-						Variety: []Variety{
-							{Name: "plantain"},
-						},
-					},
-				},
-			},
-			`[table]
-key="value"
-[table.subtable]
-key="another value"
-[table.inline]
-[table.inline.name]
-first="Tom"
-last="Preston-Werner"
-[table.inline.point]
-x=1
-y=2
-[x]
-[x.y]
-[x.y.z]
-[x.y.z.w]
-[string]
-[string.basic]
-basic="I'm a string. \"You can quote me\". Name\tJosé\nLocation\tSF."
-[string.multiline]
-key1="One\nTwo"
-key2=""
-key3=""
-[string.multiline.continued]
-key1="The quick brown fox jumps over the lazy dog."
-key2=""
-key3=""
-[string.literal]
-winpath="C:\\Users\\nodejs\\templates"
-winpath2="\\\\ServerX\\admin$\\system32\\"
-quoted="Tom \"Dubs\" Preston-Werner"
-regex="<\\i\\c*\\s*>"
-[string.literal.multiline]
-regex2="I [dw]on't need \\d{2} apples"
-lines="The first newline is\ntrimmed in raw strings.\n   All other whitespace\n   is preserved.\n"
-[integer]
-key1=99
-key2=42
-key3=0
-key4=-17
-[integer.underscores]
-key1=1000
-key2=5349221
-key3=12345
-[float]
-[float.fractional]
-key1=1e+00
-key2=3.1415e+00
-key3=-1e-02
-[float.exponent]
-key1=5e+22
-key2=1e+06
-key3=-2e-02
-[float.both]
-key=6.626e-34
-[float.underscores]
-key1=9.224617445991227e+06
-key2=1e+100
-[boolean]
-true=true
-false=false
-[datetime]
-key1=1979-05-27T07:32:00Z
-key2=1979-05-27T00:32:00-07:00
-key3=1979-05-27T00:32:00.999999-07:00
-[array]
-key1=[1,2,3]
-key2=["red","yellow","green"]
-key3=[[1,2],[3,4,5]]
-key4=[[1,2],["a","b","c"]]
-key5=[1,2,3]
-key6=[1,2]
-[[products]]
-name="Hammer"
-sku=738594937
-color=""
-[[products]]
-name=""
-sku=0
-color=""
-[[products]]
-name="Nail"
-sku=284758393
-color="gray"
-[[fruit]]
-name="apple"
-[fruit.physical]
-color="red"
-shape="round"
-[[fruit.variety]]
-name="red delicious"
-[[fruit.variety]]
-name="granny smith"
-[[fruit]]
-name="banana"
-[fruit.physical]
-color=""
-shape=""
-[[fruit.variety]]
-name="plantain"
-`,
-		},
-	} {
-		b, err := toml.Marshal(v.v)
-		var actual interface{} = err
-		var expect interface{} = nil
-		if !reflect.DeepEqual(actual, expect) {
-			t.Errorf(`Marshal(%#v) => %#v; want %#v`, v.v, actual, expect)
-		}
-		actual = string(b)
-		expect = v.expect
-		if !reflect.DeepEqual(actual, expect) {
-			t.Errorf(`Marshal(%#v); v => %#v; want %#v`, v.v, actual, expect)
-		}
-
-		// test for reversible.
-		dest := testStruct{}
-		actual = toml.Unmarshal(b, &dest)
-		expect = nil
-		if !reflect.DeepEqual(actual, expect) {
-			t.Errorf(`Unmarshal after Marshal => %#v; want %#v`, actual, expect)
-		}
-		actual = dest
-		expect = v.v
-		if !reflect.DeepEqual(actual, expect) {
-			t.Errorf(`Unmarshal after Marshal => %#v; want %#v`, v, actual, expect)
-		}
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/naoina/toml/error.go b/Godeps/_workspace/src/github.com/naoina/toml/error.go
deleted file mode 100644
index 0261b3c2b..000000000
--- a/Godeps/_workspace/src/github.com/naoina/toml/error.go
+++ /dev/null
@@ -1,31 +0,0 @@
-package toml
-
-import (
-	"fmt"
-	"reflect"
-)
-
-func (e *parseError) Line() int {
-	tokens := e.p.tokenTree.Error()
-	positions := make([]int, len(tokens)*2)
-	p := 0
-	for _, token := range tokens {
-		positions[p], p = int(token.begin), p+1
-		positions[p], p = int(token.end), p+1
-	}
-	for _, t := range translatePositions(e.p.Buffer, positions) {
-		if e.p.line < t.line {
-			e.p.line = t.line
-		}
-	}
-	return e.p.line
-}
-
-type errorOutOfRange struct {
-	kind reflect.Kind
-	v    interface{}
-}
-
-func (err *errorOutOfRange) Error() string {
-	return fmt.Sprintf("value %d is out of range for `%v` type", err.v, err.kind)
-}
diff --git a/Godeps/_workspace/src/github.com/naoina/toml/parse.go b/Godeps/_workspace/src/github.com/naoina/toml/parse.go
deleted file mode 100644
index 2b5b14ab4..000000000
--- a/Godeps/_workspace/src/github.com/naoina/toml/parse.go
+++ /dev/null
@@ -1,54 +0,0 @@
-package toml
-
-import (
-	"fmt"
-
-	"github.com/naoina/toml/ast"
-)
-
-// Parse returns an AST representation of TOML.
-// The toplevel is represented by a table.
-func Parse(data []byte) (*ast.Table, error) {
-	d := &parseState{p: &tomlParser{Buffer: string(data)}}
-	d.init()
-
-	if err := d.parse(); err != nil {
-		return nil, err
-	}
-
-	return d.p.toml.table, nil
-}
-
-type parseState struct {
-	p *tomlParser
-}
-
-func (d *parseState) init() {
-	d.p.Init()
-	d.p.toml.init(d.p.buffer)
-}
-
-func (d *parseState) parse() error {
-	if err := d.p.Parse(); err != nil {
-		if err, ok := err.(*parseError); ok {
-			return fmt.Errorf("toml: line %d: parse error", err.Line())
-		}
-		return err
-	}
-	return d.execute()
-}
-
-func (d *parseState) execute() (err error) {
-	defer func() {
-		e := recover()
-		if e != nil {
-			cerr, ok := e.(convertError)
-			if !ok {
-				panic(e)
-			}
-			err = cerr.err
-		}
-	}()
-	d.p.Execute()
-	return nil
-}
diff --git a/Godeps/_workspace/src/github.com/naoina/toml/parse.peg b/Godeps/_workspace/src/github.com/naoina/toml/parse.peg
deleted file mode 100644
index 0380a201d..000000000
--- a/Godeps/_workspace/src/github.com/naoina/toml/parse.peg
+++ /dev/null
@@ -1,138 +0,0 @@
-package toml
-
-type tomlParser Peg {
-    toml
-}
-
-TOML <- Expression (newline Expression)* newline? !. { _ = buffer }
-
-Expression <- (
-    <ws table ws comment? (wsnl keyval ws comment?)*> { p.SetTableString(begin, end) }
-  / ws keyval ws comment?
-  / ws comment?
-  / ws
-)
-
-newline <- <[\r\n]+> { p.AddLineCount(end - begin) }
-
-ws <- [ \t]*
-wsnl <- (
-    [ \t]
-  / <[\r\n]> { p.AddLineCount(end - begin) }
-)*
-
-comment <- '#' <[\t -\0x10FFFF]*>
-
-keyval <- key ws '=' ws val { p.AddKeyValue() }
-
-key <- bareKey / quotedKey
-
-bareKey <- <[0-9A-Za-z\-_]+> { p.SetKey(p.buffer, begin, end) }
-
-quotedKey <- '"' <basicChar+> '"' { p.SetKey(p.buffer, begin, end) }
-
-val <- (
-    <datetime>    { p.SetTime(begin, end) }
-  / <float>       { p.SetFloat64(begin, end) }
-  / <integer>     { p.SetInt64(begin, end) }
-  / <string>      { p.SetString(begin, end) }
-  / <boolean>     { p.SetBool(begin, end) }
-  / <array>       { p.SetArray(begin, end) }
-  / inlineTable
-)
-
-table <- stdTable / arrayTable
-
-stdTable <- '[' ws <tableKey> ws ']' { p.SetTable(p.buffer, begin, end) }
-
-arrayTable <- '[[' ws <tableKey> ws ']]' { p.SetArrayTable(p.buffer, begin, end) }
-
-inlineTable <- (
-    '{' { p.StartInlineTable() }
-    ws inlineTableKeyValues ws
-    '}' { p.EndInlineTable() }
-)
-
-inlineTableKeyValues <- (keyval inlineTableValSep?)*
-
-tableKey <- key (tableKeySep key)*
-
-tableKeySep <- ws '.' ws
-
-inlineTableValSep <- ws ',' ws
-
-integer <- [\-+]? int
-int <- [1-9] (digit / '_' digit)+ / digit
-
-float <- integer (frac exp? / frac? exp)
-frac <- '.' digit (digit / '_' digit)*
-exp <- [eE] [\-+]? digit (digit / '_' digit)*
-
-string <- (
-    mlLiteralString
-  / literalString
-  / mlBasicString
-  / basicString
-)
-
-basicString <- <'"' basicChar* '"'> { p.SetBasicString(p.buffer, begin, end) }
-
-basicChar <- basicUnescaped / escaped
-escaped <- escape ([btnfr"/\\] / 'u' hexQuad / 'U' hexQuad hexQuad)
-
-basicUnescaped <- [ -!#-\[\]-\0x10FFFF]
-
-escape <- '\\'
-
-mlBasicString <- '"""' mlBasicBody '"""' { p.SetMultilineString() }
-
-mlBasicBody <- (
-    <basicChar / newline> { p.AddMultilineBasicBody(p.buffer, begin, end) }
-  / escape newline wsnl
-)*
-
-literalString <- "'" <literalChar*> "'" { p.SetLiteralString(p.buffer, begin, end) }
-
-literalChar <- [\t -&(-\0x10FFFF]
-
-mlLiteralString <- "'''" <mlLiteralBody> "'''" { p.SetMultilineLiteralString(p.buffer, begin, end) }
-
-mlLiteralBody <- (!"'''" (mlLiteralChar / newline))*
-
-mlLiteralChar <- [\t -\0x10FFFF]
-
-hexdigit <- [0-9A-Fa-f]
-hexQuad <- hexdigit hexdigit hexdigit hexdigit
-
-boolean <- 'true' / 'false'
-
-dateFullYear <- digitQuad
-dateMonth <- digitDual
-dateMDay <- digitDual
-timeHour <- digitDual
-timeMinute <- digitDual
-timeSecond <- digitDual
-timeSecfrac <- '.' digit+
-timeNumoffset <- [\-+] timeHour ':' timeMinute
-timeOffset <- 'Z' / timeNumoffset
-partialTime <- timeHour ':' timeMinute ':' timeSecond timeSecfrac?
-fullDate <- dateFullYear '-' dateMonth '-' dateMDay
-fullTime <- partialTime timeOffset
-datetime <- fullDate 'T' fullTime
-
-digit <- [0-9]
-digitDual <- digit digit
-digitQuad <- digitDual digitDual
-
-array <- (
-    '[' { p.StartArray() }
-    wsnl arrayValues wsnl
-    ']'
-)
-
-arrayValues <- (
-    val { p.AddArrayVal() }
-    arraySep? (comment? newline)?
-)*
-
-arraySep <- ws ',' wsnl
diff --git a/Godeps/_workspace/src/github.com/naoina/toml/parse.peg.go b/Godeps/_workspace/src/github.com/naoina/toml/parse.peg.go
deleted file mode 100644
index ce967e968..000000000
--- a/Godeps/_workspace/src/github.com/naoina/toml/parse.peg.go
+++ /dev/null
@@ -1,3065 +0,0 @@
-package toml
-
-import (
-	"fmt"
-	"math"
-	"sort"
-	"strconv"
-)
-
-const end_symbol rune = 4
-
-/* The rule types inferred from the grammar are below. */
-type pegRule uint8
-
-const (
-	ruleUnknown pegRule = iota
-	ruleTOML
-	ruleExpression
-	rulenewline
-	rulews
-	rulewsnl
-	rulecomment
-	rulekeyval
-	rulekey
-	rulebareKey
-	rulequotedKey
-	ruleval
-	ruletable
-	rulestdTable
-	rulearrayTable
-	ruleinlineTable
-	ruleinlineTableKeyValues
-	ruletableKey
-	ruletableKeySep
-	ruleinlineTableValSep
-	ruleinteger
-	ruleint
-	rulefloat
-	rulefrac
-	ruleexp
-	rulestring
-	rulebasicString
-	rulebasicChar
-	ruleescaped
-	rulebasicUnescaped
-	ruleescape
-	rulemlBasicString
-	rulemlBasicBody
-	ruleliteralString
-	ruleliteralChar
-	rulemlLiteralString
-	rulemlLiteralBody
-	rulemlLiteralChar
-	rulehexdigit
-	rulehexQuad
-	ruleboolean
-	ruledateFullYear
-	ruledateMonth
-	ruledateMDay
-	ruletimeHour
-	ruletimeMinute
-	ruletimeSecond
-	ruletimeSecfrac
-	ruletimeNumoffset
-	ruletimeOffset
-	rulepartialTime
-	rulefullDate
-	rulefullTime
-	ruledatetime
-	ruledigit
-	ruledigitDual
-	ruledigitQuad
-	rulearray
-	rulearrayValues
-	rulearraySep
-	ruleAction0
-	rulePegText
-	ruleAction1
-	ruleAction2
-	ruleAction3
-	ruleAction4
-	ruleAction5
-	ruleAction6
-	ruleAction7
-	ruleAction8
-	ruleAction9
-	ruleAction10
-	ruleAction11
-	ruleAction12
-	ruleAction13
-	ruleAction14
-	ruleAction15
-	ruleAction16
-	ruleAction17
-	ruleAction18
-	ruleAction19
-	ruleAction20
-	ruleAction21
-	ruleAction22
-	ruleAction23
-
-	rulePre_
-	rule_In_
-	rule_Suf
-)
-
-var rul3s = [...]string{
-	"Unknown",
-	"TOML",
-	"Expression",
-	"newline",
-	"ws",
-	"wsnl",
-	"comment",
-	"keyval",
-	"key",
-	"bareKey",
-	"quotedKey",
-	"val",
-	"table",
-	"stdTable",
-	"arrayTable",
-	"inlineTable",
-	"inlineTableKeyValues",
-	"tableKey",
-	"tableKeySep",
-	"inlineTableValSep",
-	"integer",
-	"int",
-	"float",
-	"frac",
-	"exp",
-	"string",
-	"basicString",
-	"basicChar",
-	"escaped",
-	"basicUnescaped",
-	"escape",
-	"mlBasicString",
-	"mlBasicBody",
-	"literalString",
-	"literalChar",
-	"mlLiteralString",
-	"mlLiteralBody",
-	"mlLiteralChar",
-	"hexdigit",
-	"hexQuad",
-	"boolean",
-	"dateFullYear",
-	"dateMonth",
-	"dateMDay",
-	"timeHour",
-	"timeMinute",
-	"timeSecond",
-	"timeSecfrac",
-	"timeNumoffset",
-	"timeOffset",
-	"partialTime",
-	"fullDate",
-	"fullTime",
-	"datetime",
-	"digit",
-	"digitDual",
-	"digitQuad",
-	"array",
-	"arrayValues",
-	"arraySep",
-	"Action0",
-	"PegText",
-	"Action1",
-	"Action2",
-	"Action3",
-	"Action4",
-	"Action5",
-	"Action6",
-	"Action7",
-	"Action8",
-	"Action9",
-	"Action10",
-	"Action11",
-	"Action12",
-	"Action13",
-	"Action14",
-	"Action15",
-	"Action16",
-	"Action17",
-	"Action18",
-	"Action19",
-	"Action20",
-	"Action21",
-	"Action22",
-	"Action23",
-
-	"Pre_",
-	"_In_",
-	"_Suf",
-}
-
-type tokenTree interface {
-	Print()
-	PrintSyntax()
-	PrintSyntaxTree(buffer string)
-	Add(rule pegRule, begin, end, next, depth int)
-	Expand(index int) tokenTree
-	Tokens() <-chan token32
-	AST() *node32
-	Error() []token32
-	trim(length int)
-}
-
-type node32 struct {
-	token32
-	up, next *node32
-}
-
-func (node *node32) print(depth int, buffer string) {
-	for node != nil {
-		for c := 0; c < depth; c++ {
-			fmt.Printf(" ")
-		}
-		fmt.Printf("\x1B[34m%v\x1B[m %v\n", rul3s[node.pegRule], strconv.Quote(string(([]rune(buffer)[node.begin:node.end]))))
-		if node.up != nil {
-			node.up.print(depth+1, buffer)
-		}
-		node = node.next
-	}
-}
-
-func (ast *node32) Print(buffer string) {
-	ast.print(0, buffer)
-}
-
-type element struct {
-	node *node32
-	down *element
-}
-
-/* ${@} bit structure for abstract syntax tree */
-type token16 struct {
-	pegRule
-	begin, end, next int16
-}
-
-func (t *token16) isZero() bool {
-	return t.pegRule == ruleUnknown && t.begin == 0 && t.end == 0 && t.next == 0
-}
-
-func (t *token16) isParentOf(u token16) bool {
-	return t.begin <= u.begin && t.end >= u.end && t.next > u.next
-}
-
-func (t *token16) getToken32() token32 {
-	return token32{pegRule: t.pegRule, begin: int32(t.begin), end: int32(t.end), next: int32(t.next)}
-}
-
-func (t *token16) String() string {
-	return fmt.Sprintf("\x1B[34m%v\x1B[m %v %v %v", rul3s[t.pegRule], t.begin, t.end, t.next)
-}
-
-type tokens16 struct {
-	tree    []token16
-	ordered [][]token16
-}
-
-func (t *tokens16) trim(length int) {
-	t.tree = t.tree[0:length]
-}
-
-func (t *tokens16) Print() {
-	for _, token := range t.tree {
-		fmt.Println(token.String())
-	}
-}
-
-func (t *tokens16) Order() [][]token16 {
-	if t.ordered != nil {
-		return t.ordered
-	}
-
-	depths := make([]int16, 1, math.MaxInt16)
-	for i, token := range t.tree {
-		if token.pegRule == ruleUnknown {
-			t.tree = t.tree[:i]
-			break
-		}
-		depth := int(token.next)
-		if length := len(depths); depth >= length {
-			depths = depths[:depth+1]
-		}
-		depths[depth]++
-	}
-	depths = append(depths, 0)
-
-	ordered, pool := make([][]token16, len(depths)), make([]token16, len(t.tree)+len(depths))
-	for i, depth := range depths {
-		depth++
-		ordered[i], pool, depths[i] = pool[:depth], pool[depth:], 0
-	}
-
-	for i, token := range t.tree {
-		depth := token.next
-		token.next = int16(i)
-		ordered[depth][depths[depth]] = token
-		depths[depth]++
-	}
-	t.ordered = ordered
-	return ordered
-}
-
-type state16 struct {
-	token16
-	depths []int16
-	leaf   bool
-}
-
-func (t *tokens16) AST() *node32 {
-	tokens := t.Tokens()
-	stack := &element{node: &node32{token32: <-tokens}}
-	for token := range tokens {
-		if token.begin == token.end {
-			continue
-		}
-		node := &node32{token32: token}
-		for stack != nil && stack.node.begin >= token.begin && stack.node.end <= token.end {
-			stack.node.next = node.up
-			node.up = stack.node
-			stack = stack.down
-		}
-		stack = &element{node: node, down: stack}
-	}
-	return stack.node
-}
-
-func (t *tokens16) PreOrder() (<-chan state16, [][]token16) {
-	s, ordered := make(chan state16, 6), t.Order()
-	go func() {
-		var states [8]state16
-		for i, _ := range states {
-			states[i].depths = make([]int16, len(ordered))
-		}
-		depths, state, depth := make([]int16, len(ordered)), 0, 1
-		write := func(t token16, leaf bool) {
-			S := states[state]
-			state, S.pegRule, S.begin, S.end, S.next, S.leaf = (state+1)%8, t.pegRule, t.begin, t.end, int16(depth), leaf
-			copy(S.depths, depths)
-			s <- S
-		}
-
-		states[state].token16 = ordered[0][0]
-		depths[0]++
-		state++
-		a, b := ordered[depth-1][depths[depth-1]-1], ordered[depth][depths[depth]]
-	depthFirstSearch:
-		for {
-			for {
-				if i := depths[depth]; i > 0 {
-					if c, j := ordered[depth][i-1], depths[depth-1]; a.isParentOf(c) &&
-						(j < 2 || !ordered[depth-1][j-2].isParentOf(c)) {
-						if c.end != b.begin {
-							write(token16{pegRule: rule_In_, begin: c.end, end: b.begin}, true)
-						}
-						break
-					}
-				}
-
-				if a.begin < b.begin {
-					write(token16{pegRule: rulePre_, begin: a.begin, end: b.begin}, true)
-				}
-				break
-			}
-
-			next := depth + 1
-			if c := ordered[next][depths[next]]; c.pegRule != ruleUnknown && b.isParentOf(c) {
-				write(b, false)
-				depths[depth]++
-				depth, a, b = next, b, c
-				continue
-			}
-
-			write(b, true)
-			depths[depth]++
-			c, parent := ordered[depth][depths[depth]], true
-			for {
-				if c.pegRule != ruleUnknown && a.isParentOf(c) {
-					b = c
-					continue depthFirstSearch
-				} else if parent && b.end != a.end {
-					write(token16{pegRule: rule_Suf, begin: b.end, end: a.end}, true)
-				}
-
-				depth--
-				if depth > 0 {
-					a, b, c = ordered[depth-1][depths[depth-1]-1], a, ordered[depth][depths[depth]]
-					parent = a.isParentOf(b)
-					continue
-				}
-
-				break depthFirstSearch
-			}
-		}
-
-		close(s)
-	}()
-	return s, ordered
-}
-
-func (t *tokens16) PrintSyntax() {
-	tokens, ordered := t.PreOrder()
-	max := -1
-	for token := range tokens {
-		if !token.leaf {
-			fmt.Printf("%v", token.begin)
-			for i, leaf, depths := 0, int(token.next), token.depths; i < leaf; i++ {
-				fmt.Printf(" \x1B[36m%v\x1B[m", rul3s[ordered[i][depths[i]-1].pegRule])
-			}
-			fmt.Printf(" \x1B[36m%v\x1B[m\n", rul3s[token.pegRule])
-		} else if token.begin == token.end {
-			fmt.Printf("%v", token.begin)
-			for i, leaf, depths := 0, int(token.next), token.depths; i < leaf; i++ {
-				fmt.Printf(" \x1B[31m%v\x1B[m", rul3s[ordered[i][depths[i]-1].pegRule])
-			}
-			fmt.Printf(" \x1B[31m%v\x1B[m\n", rul3s[token.pegRule])
-		} else {
-			for c, end := token.begin, token.end; c < end; c++ {
-				if i := int(c); max+1 < i {
-					for j := max; j < i; j++ {
-						fmt.Printf("skip %v %v\n", j, token.String())
-					}
-					max = i
-				} else if i := int(c); i <= max {
-					for j := i; j <= max; j++ {
-						fmt.Printf("dupe %v %v\n", j, token.String())
-					}
-				} else {
-					max = int(c)
-				}
-				fmt.Printf("%v", c)
-				for i, leaf, depths := 0, int(token.next), token.depths; i < leaf; i++ {
-					fmt.Printf(" \x1B[34m%v\x1B[m", rul3s[ordered[i][depths[i]-1].pegRule])
-				}
-				fmt.Printf(" \x1B[34m%v\x1B[m\n", rul3s[token.pegRule])
-			}
-			fmt.Printf("\n")
-		}
-	}
-}
-
-func (t *tokens16) PrintSyntaxTree(buffer string) {
-	tokens, _ := t.PreOrder()
-	for token := range tokens {
-		for c := 0; c < int(token.next); c++ {
-			fmt.Printf(" ")
-		}
-		fmt.Printf("\x1B[34m%v\x1B[m %v\n", rul3s[token.pegRule], strconv.Quote(string(([]rune(buffer)[token.begin:token.end]))))
-	}
-}
-
-func (t *tokens16) Add(rule pegRule, begin, end, depth, index int) {
-	t.tree[index] = token16{pegRule: rule, begin: int16(begin), end: int16(end), next: int16(depth)}
-}
-
-func (t *tokens16) Tokens() <-chan token32 {
-	s := make(chan token32, 16)
-	go func() {
-		for _, v := range t.tree {
-			s <- v.getToken32()
-		}
-		close(s)
-	}()
-	return s
-}
-
-func (t *tokens16) Error() []token32 {
-	ordered := t.Order()
-	length := len(ordered)
-	tokens, length := make([]token32, length), length-1
-	for i, _ := range tokens {
-		o := ordered[length-i]
-		if len(o) > 1 {
-			tokens[i] = o[len(o)-2].getToken32()
-		}
-	}
-	return tokens
-}
-
-/* ${@} bit structure for abstract syntax tree */
-type token32 struct {
-	pegRule
-	begin, end, next int32
-}
-
-func (t *token32) isZero() bool {
-	return t.pegRule == ruleUnknown && t.begin == 0 && t.end == 0 && t.next == 0
-}
-
-func (t *token32) isParentOf(u token32) bool {
-	return t.begin <= u.begin && t.end >= u.end && t.next > u.next
-}
-
-func (t *token32) getToken32() token32 {
-	return token32{pegRule: t.pegRule, begin: int32(t.begin), end: int32(t.end), next: int32(t.next)}
-}
-
-func (t *token32) String() string {
-	return fmt.Sprintf("\x1B[34m%v\x1B[m %v %v %v", rul3s[t.pegRule], t.begin, t.end, t.next)
-}
-
-type tokens32 struct {
-	tree    []token32
-	ordered [][]token32
-}
-
-func (t *tokens32) trim(length int) {
-	t.tree = t.tree[0:length]
-}
-
-func (t *tokens32) Print() {
-	for _, token := range t.tree {
-		fmt.Println(token.String())
-	}
-}
-
-func (t *tokens32) Order() [][]token32 {
-	if t.ordered != nil {
-		return t.ordered
-	}
-
-	depths := make([]int32, 1, math.MaxInt16)
-	for i, token := range t.tree {
-		if token.pegRule == ruleUnknown {
-			t.tree = t.tree[:i]
-			break
-		}
-		depth := int(token.next)
-		if length := len(depths); depth >= length {
-			depths = depths[:depth+1]
-		}
-		depths[depth]++
-	}
-	depths = append(depths, 0)
-
-	ordered, pool := make([][]token32, len(depths)), make([]token32, len(t.tree)+len(depths))
-	for i, depth := range depths {
-		depth++
-		ordered[i], pool, depths[i] = pool[:depth], pool[depth:], 0
-	}
-
-	for i, token := range t.tree {
-		depth := token.next
-		token.next = int32(i)
-		ordered[depth][depths[depth]] = token
-		depths[depth]++
-	}
-	t.ordered = ordered
-	return ordered
-}
-
-type state32 struct {
-	token32
-	depths []int32
-	leaf   bool
-}
-
-func (t *tokens32) AST() *node32 {
-	tokens := t.Tokens()
-	stack := &element{node: &node32{token32: <-tokens}}
-	for token := range tokens {
-		if token.begin == token.end {
-			continue
-		}
-		node := &node32{token32: token}
-		for stack != nil && stack.node.begin >= token.begin && stack.node.end <= token.end {
-			stack.node.next = node.up
-			node.up = stack.node
-			stack = stack.down
-		}
-		stack = &element{node: node, down: stack}
-	}
-	return stack.node
-}
-
-func (t *tokens32) PreOrder() (<-chan state32, [][]token32) {
-	s, ordered := make(chan state32, 6), t.Order()
-	go func() {
-		var states [8]state32
-		for i, _ := range states {
-			states[i].depths = make([]int32, len(ordered))
-		}
-		depths, state, depth := make([]int32, len(ordered)), 0, 1
-		write := func(t token32, leaf bool) {
-			S := states[state]
-			state, S.pegRule, S.begin, S.end, S.next, S.leaf = (state+1)%8, t.pegRule, t.begin, t.end, int32(depth), leaf
-			copy(S.depths, depths)
-			s <- S
-		}
-
-		states[state].token32 = ordered[0][0]
-		depths[0]++
-		state++
-		a, b := ordered[depth-1][depths[depth-1]-1], ordered[depth][depths[depth]]
-	depthFirstSearch:
-		for {
-			for {
-				if i := depths[depth]; i > 0 {
-					if c, j := ordered[depth][i-1], depths[depth-1]; a.isParentOf(c) &&
-						(j < 2 || !ordered[depth-1][j-2].isParentOf(c)) {
-						if c.end != b.begin {
-							write(token32{pegRule: rule_In_, begin: c.end, end: b.begin}, true)
-						}
-						break
-					}
-				}
-
-				if a.begin < b.begin {
-					write(token32{pegRule: rulePre_, begin: a.begin, end: b.begin}, true)
-				}
-				break
-			}
-
-			next := depth + 1
-			if c := ordered[next][depths[next]]; c.pegRule != ruleUnknown && b.isParentOf(c) {
-				write(b, false)
-				depths[depth]++
-				depth, a, b = next, b, c
-				continue
-			}
-
-			write(b, true)
-			depths[depth]++
-			c, parent := ordered[depth][depths[depth]], true
-			for {
-				if c.pegRule != ruleUnknown && a.isParentOf(c) {
-					b = c
-					continue depthFirstSearch
-				} else if parent && b.end != a.end {
-					write(token32{pegRule: rule_Suf, begin: b.end, end: a.end}, true)
-				}
-
-				depth--
-				if depth > 0 {
-					a, b, c = ordered[depth-1][depths[depth-1]-1], a, ordered[depth][depths[depth]]
-					parent = a.isParentOf(b)
-					continue
-				}
-
-				break depthFirstSearch
-			}
-		}
-
-		close(s)
-	}()
-	return s, ordered
-}
-
-func (t *tokens32) PrintSyntax() {
-	tokens, ordered := t.PreOrder()
-	max := -1
-	for token := range tokens {
-		if !token.leaf {
-			fmt.Printf("%v", token.begin)
-			for i, leaf, depths := 0, int(token.next), token.depths; i < leaf; i++ {
-				fmt.Printf(" \x1B[36m%v\x1B[m", rul3s[ordered[i][depths[i]-1].pegRule])
-			}
-			fmt.Printf(" \x1B[36m%v\x1B[m\n", rul3s[token.pegRule])
-		} else if token.begin == token.end {
-			fmt.Printf("%v", token.begin)
-			for i, leaf, depths := 0, int(token.next), token.depths; i < leaf; i++ {
-				fmt.Printf(" \x1B[31m%v\x1B[m", rul3s[ordered[i][depths[i]-1].pegRule])
-			}
-			fmt.Printf(" \x1B[31m%v\x1B[m\n", rul3s[token.pegRule])
-		} else {
-			for c, end := token.begin, token.end; c < end; c++ {
-				if i := int(c); max+1 < i {
-					for j := max; j < i; j++ {
-						fmt.Printf("skip %v %v\n", j, token.String())
-					}
-					max = i
-				} else if i := int(c); i <= max {
-					for j := i; j <= max; j++ {
-						fmt.Printf("dupe %v %v\n", j, token.String())
-					}
-				} else {
-					max = int(c)
-				}
-				fmt.Printf("%v", c)
-				for i, leaf, depths := 0, int(token.next), token.depths; i < leaf; i++ {
-					fmt.Printf(" \x1B[34m%v\x1B[m", rul3s[ordered[i][depths[i]-1].pegRule])
-				}
-				fmt.Printf(" \x1B[34m%v\x1B[m\n", rul3s[token.pegRule])
-			}
-			fmt.Printf("\n")
-		}
-	}
-}
-
-func (t *tokens32) PrintSyntaxTree(buffer string) {
-	tokens, _ := t.PreOrder()
-	for token := range tokens {
-		for c := 0; c < int(token.next); c++ {
-			fmt.Printf(" ")
-		}
-		fmt.Printf("\x1B[34m%v\x1B[m %v\n", rul3s[token.pegRule], strconv.Quote(string(([]rune(buffer)[token.begin:token.end]))))
-	}
-}
-
-func (t *tokens32) Add(rule pegRule, begin, end, depth, index int) {
-	t.tree[index] = token32{pegRule: rule, begin: int32(begin), end: int32(end), next: int32(depth)}
-}
-
-func (t *tokens32) Tokens() <-chan token32 {
-	s := make(chan token32, 16)
-	go func() {
-		for _, v := range t.tree {
-			s <- v.getToken32()
-		}
-		close(s)
-	}()
-	return s
-}
-
-func (t *tokens32) Error() []token32 {
-	ordered := t.Order()
-	length := len(ordered)
-	tokens, length := make([]token32, length), length-1
-	for i, _ := range tokens {
-		o := ordered[length-i]
-		if len(o) > 1 {
-			tokens[i] = o[len(o)-2].getToken32()
-		}
-	}
-	return tokens
-}
-
-func (t *tokens16) Expand(index int) tokenTree {
-	tree := t.tree
-	if index >= len(tree) {
-		expanded := make([]token32, 2*len(tree))
-		for i, v := range tree {
-			expanded[i] = v.getToken32()
-		}
-		return &tokens32{tree: expanded}
-	}
-	return nil
-}
-
-func (t *tokens32) Expand(index int) tokenTree {
-	tree := t.tree
-	if index >= len(tree) {
-		expanded := make([]token32, 2*len(tree))
-		copy(expanded, tree)
-		t.tree = expanded
-	}
-	return nil
-}
-
-type tomlParser struct {
-	toml
-
-	Buffer string
-	buffer []rune
-	rules  [85]func() bool
-	Parse  func(rule ...int) error
-	Reset  func()
-	tokenTree
-}
-
-type textPosition struct {
-	line, symbol int
-}
-
-type textPositionMap map[int]textPosition
-
-func translatePositions(buffer string, positions []int) textPositionMap {
-	length, translations, j, line, symbol := len(positions), make(textPositionMap, len(positions)), 0, 1, 0
-	sort.Ints(positions)
-
-search:
-	for i, c := range buffer[0:] {
-		if c == '\n' {
-			line, symbol = line+1, 0
-		} else {
-			symbol++
-		}
-		if i == positions[j] {
-			translations[positions[j]] = textPosition{line, symbol}
-			for j++; j < length; j++ {
-				if i != positions[j] {
-					continue search
-				}
-			}
-			break search
-		}
-	}
-
-	return translations
-}
-
-type parseError struct {
-	p *tomlParser
-}
-
-func (e *parseError) Error() string {
-	tokens, error := e.p.tokenTree.Error(), "\n"
-	positions, p := make([]int, 2*len(tokens)), 0
-	for _, token := range tokens {
-		positions[p], p = int(token.begin), p+1
-		positions[p], p = int(token.end), p+1
-	}
-	translations := translatePositions(e.p.Buffer, positions)
-	for _, token := range tokens {
-		begin, end := int(token.begin), int(token.end)
-		error += fmt.Sprintf("parse error near \x1B[34m%v\x1B[m (line %v symbol %v - line %v symbol %v):\n%v\n",
-			rul3s[token.pegRule],
-			translations[begin].line, translations[begin].symbol,
-			translations[end].line, translations[end].symbol,
-			/*strconv.Quote(*/ e.p.Buffer[begin:end] /*)*/)
-	}
-
-	return error
-}
-
-func (p *tomlParser) PrintSyntaxTree() {
-	p.tokenTree.PrintSyntaxTree(p.Buffer)
-}
-
-func (p *tomlParser) Highlighter() {
-	p.tokenTree.PrintSyntax()
-}
-
-func (p *tomlParser) Execute() {
-	buffer, begin, end := p.Buffer, 0, 0
-	for token := range p.tokenTree.Tokens() {
-		switch token.pegRule {
-
-		case rulePegText:
-			begin, end = int(token.begin), int(token.end)
-
-		case ruleAction0:
-			_ = buffer
-		case ruleAction1:
-			p.SetTableString(begin, end)
-		case ruleAction2:
-			p.AddLineCount(end - begin)
-		case ruleAction3:
-			p.AddLineCount(end - begin)
-		case ruleAction4:
-			p.AddKeyValue()
-		case ruleAction5:
-			p.SetKey(p.buffer, begin, end)
-		case ruleAction6:
-			p.SetKey(p.buffer, begin, end)
-		case ruleAction7:
-			p.SetTime(begin, end)
-		case ruleAction8:
-			p.SetFloat64(begin, end)
-		case ruleAction9:
-			p.SetInt64(begin, end)
-		case ruleAction10:
-			p.SetString(begin, end)
-		case ruleAction11:
-			p.SetBool(begin, end)
-		case ruleAction12:
-			p.SetArray(begin, end)
-		case ruleAction13:
-			p.SetTable(p.buffer, begin, end)
-		case ruleAction14:
-			p.SetArrayTable(p.buffer, begin, end)
-		case ruleAction15:
-			p.StartInlineTable()
-		case ruleAction16:
-			p.EndInlineTable()
-		case ruleAction17:
-			p.SetBasicString(p.buffer, begin, end)
-		case ruleAction18:
-			p.SetMultilineString()
-		case ruleAction19:
-			p.AddMultilineBasicBody(p.buffer, begin, end)
-		case ruleAction20:
-			p.SetLiteralString(p.buffer, begin, end)
-		case ruleAction21:
-			p.SetMultilineLiteralString(p.buffer, begin, end)
-		case ruleAction22:
-			p.StartArray()
-		case ruleAction23:
-			p.AddArrayVal()
-
-		}
-	}
-	_, _, _ = buffer, begin, end
-}
-
-func (p *tomlParser) Init() {
-	p.buffer = []rune(p.Buffer)
-	if len(p.buffer) == 0 || p.buffer[len(p.buffer)-1] != end_symbol {
-		p.buffer = append(p.buffer, end_symbol)
-	}
-
-	var tree tokenTree = &tokens16{tree: make([]token16, math.MaxInt16)}
-	position, depth, tokenIndex, buffer, _rules := 0, 0, 0, p.buffer, p.rules
-
-	p.Parse = func(rule ...int) error {
-		r := 1
-		if len(rule) > 0 {
-			r = rule[0]
-		}
-		matches := p.rules[r]()
-		p.tokenTree = tree
-		if matches {
-			p.tokenTree.trim(tokenIndex)
-			return nil
-		}
-		return &parseError{p}
-	}
-
-	p.Reset = func() {
-		position, tokenIndex, depth = 0, 0, 0
-	}
-
-	add := func(rule pegRule, begin int) {
-		if t := tree.Expand(tokenIndex); t != nil {
-			tree = t
-		}
-		tree.Add(rule, begin, position, depth, tokenIndex)
-		tokenIndex++
-	}
-
-	matchDot := func() bool {
-		if buffer[position] != end_symbol {
-			position++
-			return true
-		}
-		return false
-	}
-
-	/*matchChar := func(c byte) bool {
-		if buffer[position] == c {
-			position++
-			return true
-		}
-		return false
-	}*/
-
-	/*matchRange := func(lower byte, upper byte) bool {
-		if c := buffer[position]; c >= lower && c <= upper {
-			position++
-			return true
-		}
-		return false
-	}*/
-
-	_rules = [...]func() bool{
-		nil,
-		/* 0 TOML <- <(Expression (newline Expression)* newline? !. Action0)> */
-		func() bool {
-			position0, tokenIndex0, depth0 := position, tokenIndex, depth
-			{
-				position1 := position
-				depth++
-				if !_rules[ruleExpression]() {
-					goto l0
-				}
-			l2:
-				{
-					position3, tokenIndex3, depth3 := position, tokenIndex, depth
-					if !_rules[rulenewline]() {
-						goto l3
-					}
-					if !_rules[ruleExpression]() {
-						goto l3
-					}
-					goto l2
-				l3:
-					position, tokenIndex, depth = position3, tokenIndex3, depth3
-				}
-				{
-					position4, tokenIndex4, depth4 := position, tokenIndex, depth
-					if !_rules[rulenewline]() {
-						goto l4
-					}
-					goto l5
-				l4:
-					position, tokenIndex, depth = position4, tokenIndex4, depth4
-				}
-			l5:
-				{
-					position6, tokenIndex6, depth6 := position, tokenIndex, depth
-					if !matchDot() {
-						goto l6
-					}
-					goto l0
-				l6:
-					position, tokenIndex, depth = position6, tokenIndex6, depth6
-				}
-				{
-					add(ruleAction0, position)
-				}
-				depth--
-				add(ruleTOML, position1)
-			}
-			return true
-		l0:
-			position, tokenIndex, depth = position0, tokenIndex0, depth0
-			return false
-		},
-		/* 1 Expression <- <((<(ws table ws comment? (wsnl keyval ws comment?)*)> Action1) / (ws keyval ws comment?) / (ws comment?) / ws)> */
-		func() bool {
-			position8, tokenIndex8, depth8 := position, tokenIndex, depth
-			{
-				position9 := position
-				depth++
-				{
-					position10, tokenIndex10, depth10 := position, tokenIndex, depth
-					{
-						position12 := position
-						depth++
-						if !_rules[rulews]() {
-							goto l11
-						}
-						{
-							position13 := position
-							depth++
-							{
-								position14, tokenIndex14, depth14 := position, tokenIndex, depth
-								{
-									position16 := position
-									depth++
-									if buffer[position] != rune('[') {
-										goto l15
-									}
-									position++
-									if !_rules[rulews]() {
-										goto l15
-									}
-									{
-										position17 := position
-										depth++
-										if !_rules[ruletableKey]() {
-											goto l15
-										}
-										depth--
-										add(rulePegText, position17)
-									}
-									if !_rules[rulews]() {
-										goto l15
-									}
-									if buffer[position] != rune(']') {
-										goto l15
-									}
-									position++
-									{
-										add(ruleAction13, position)
-									}
-									depth--
-									add(rulestdTable, position16)
-								}
-								goto l14
-							l15:
-								position, tokenIndex, depth = position14, tokenIndex14, depth14
-								{
-									position19 := position
-									depth++
-									if buffer[position] != rune('[') {
-										goto l11
-									}
-									position++
-									if buffer[position] != rune('[') {
-										goto l11
-									}
-									position++
-									if !_rules[rulews]() {
-										goto l11
-									}
-									{
-										position20 := position
-										depth++
-										if !_rules[ruletableKey]() {
-											goto l11
-										}
-										depth--
-										add(rulePegText, position20)
-									}
-									if !_rules[rulews]() {
-										goto l11
-									}
-									if buffer[position] != rune(']') {
-										goto l11
-									}
-									position++
-									if buffer[position] != rune(']') {
-										goto l11
-									}
-									position++
-									{
-										add(ruleAction14, position)
-									}
-									depth--
-									add(rulearrayTable, position19)
-								}
-							}
-						l14:
-							depth--
-							add(ruletable, position13)
-						}
-						if !_rules[rulews]() {
-							goto l11
-						}
-						{
-							position22, tokenIndex22, depth22 := position, tokenIndex, depth
-							if !_rules[rulecomment]() {
-								goto l22
-							}
-							goto l23
-						l22:
-							position, tokenIndex, depth = position22, tokenIndex22, depth22
-						}
-					l23:
-					l24:
-						{
-							position25, tokenIndex25, depth25 := position, tokenIndex, depth
-							if !_rules[rulewsnl]() {
-								goto l25
-							}
-							if !_rules[rulekeyval]() {
-								goto l25
-							}
-							if !_rules[rulews]() {
-								goto l25
-							}
-							{
-								position26, tokenIndex26, depth26 := position, tokenIndex, depth
-								if !_rules[rulecomment]() {
-									goto l26
-								}
-								goto l27
-							l26:
-								position, tokenIndex, depth = position26, tokenIndex26, depth26
-							}
-						l27:
-							goto l24
-						l25:
-							position, tokenIndex, depth = position25, tokenIndex25, depth25
-						}
-						depth--
-						add(rulePegText, position12)
-					}
-					{
-						add(ruleAction1, position)
-					}
-					goto l10
-				l11:
-					position, tokenIndex, depth = position10, tokenIndex10, depth10
-					if !_rules[rulews]() {
-						goto l29
-					}
-					if !_rules[rulekeyval]() {
-						goto l29
-					}
-					if !_rules[rulews]() {
-						goto l29
-					}
-					{
-						position30, tokenIndex30, depth30 := position, tokenIndex, depth
-						if !_rules[rulecomment]() {
-							goto l30
-						}
-						goto l31
-					l30:
-						position, tokenIndex, depth = position30, tokenIndex30, depth30
-					}
-				l31:
-					goto l10
-				l29:
-					position, tokenIndex, depth = position10, tokenIndex10, depth10
-					if !_rules[rulews]() {
-						goto l32
-					}
-					{
-						position33, tokenIndex33, depth33 := position, tokenIndex, depth
-						if !_rules[rulecomment]() {
-							goto l33
-						}
-						goto l34
-					l33:
-						position, tokenIndex, depth = position33, tokenIndex33, depth33
-					}
-				l34:
-					goto l10
-				l32:
-					position, tokenIndex, depth = position10, tokenIndex10, depth10
-					if !_rules[rulews]() {
-						goto l8
-					}
-				}
-			l10:
-				depth--
-				add(ruleExpression, position9)
-			}
-			return true
-		l8:
-			position, tokenIndex, depth = position8, tokenIndex8, depth8
-			return false
-		},
-		/* 2 newline <- <(<('\r' / '\n')+> Action2)> */
-		func() bool {
-			position35, tokenIndex35, depth35 := position, tokenIndex, depth
-			{
-				position36 := position
-				depth++
-				{
-					position37 := position
-					depth++
-					{
-						position40, tokenIndex40, depth40 := position, tokenIndex, depth
-						if buffer[position] != rune('\r') {
-							goto l41
-						}
-						position++
-						goto l40
-					l41:
-						position, tokenIndex, depth = position40, tokenIndex40, depth40
-						if buffer[position] != rune('\n') {
-							goto l35
-						}
-						position++
-					}
-				l40:
-				l38:
-					{
-						position39, tokenIndex39, depth39 := position, tokenIndex, depth
-						{
-							position42, tokenIndex42, depth42 := position, tokenIndex, depth
-							if buffer[position] != rune('\r') {
-								goto l43
-							}
-							position++
-							goto l42
-						l43:
-							position, tokenIndex, depth = position42, tokenIndex42, depth42
-							if buffer[position] != rune('\n') {
-								goto l39
-							}
-							position++
-						}
-					l42:
-						goto l38
-					l39:
-						position, tokenIndex, depth = position39, tokenIndex39, depth39
-					}
-					depth--
-					add(rulePegText, position37)
-				}
-				{
-					add(ruleAction2, position)
-				}
-				depth--
-				add(rulenewline, position36)
-			}
-			return true
-		l35:
-			position, tokenIndex, depth = position35, tokenIndex35, depth35
-			return false
-		},
-		/* 3 ws <- <(' ' / '\t')*> */
-		func() bool {
-			{
-				position46 := position
-				depth++
-			l47:
-				{
-					position48, tokenIndex48, depth48 := position, tokenIndex, depth
-					{
-						position49, tokenIndex49, depth49 := position, tokenIndex, depth
-						if buffer[position] != rune(' ') {
-							goto l50
-						}
-						position++
-						goto l49
-					l50:
-						position, tokenIndex, depth = position49, tokenIndex49, depth49
-						if buffer[position] != rune('\t') {
-							goto l48
-						}
-						position++
-					}
-				l49:
-					goto l47
-				l48:
-					position, tokenIndex, depth = position48, tokenIndex48, depth48
-				}
-				depth--
-				add(rulews, position46)
-			}
-			return true
-		},
-		/* 4 wsnl <- <((&('\t') '\t') | (&(' ') ' ') | (&('\n' | '\r') (<('\r' / '\n')> Action3)))*> */
-		func() bool {
-			{
-				position52 := position
-				depth++
-			l53:
-				{
-					position54, tokenIndex54, depth54 := position, tokenIndex, depth
-					{
-						switch buffer[position] {
-						case '\t':
-							if buffer[position] != rune('\t') {
-								goto l54
-							}
-							position++
-							break
-						case ' ':
-							if buffer[position] != rune(' ') {
-								goto l54
-							}
-							position++
-							break
-						default:
-							{
-								position56 := position
-								depth++
-								{
-									position57, tokenIndex57, depth57 := position, tokenIndex, depth
-									if buffer[position] != rune('\r') {
-										goto l58
-									}
-									position++
-									goto l57
-								l58:
-									position, tokenIndex, depth = position57, tokenIndex57, depth57
-									if buffer[position] != rune('\n') {
-										goto l54
-									}
-									position++
-								}
-							l57:
-								depth--
-								add(rulePegText, position56)
-							}
-							{
-								add(ruleAction3, position)
-							}
-							break
-						}
-					}
-
-					goto l53
-				l54:
-					position, tokenIndex, depth = position54, tokenIndex54, depth54
-				}
-				depth--
-				add(rulewsnl, position52)
-			}
-			return true
-		},
-		/* 5 comment <- <('#' <('\t' / [ -􏿿])*>)> */
-		func() bool {
-			position60, tokenIndex60, depth60 := position, tokenIndex, depth
-			{
-				position61 := position
-				depth++
-				if buffer[position] != rune('#') {
-					goto l60
-				}
-				position++
-				{
-					position62 := position
-					depth++
-				l63:
-					{
-						position64, tokenIndex64, depth64 := position, tokenIndex, depth
-						{
-							position65, tokenIndex65, depth65 := position, tokenIndex, depth
-							if buffer[position] != rune('\t') {
-								goto l66
-							}
-							position++
-							goto l65
-						l66:
-							position, tokenIndex, depth = position65, tokenIndex65, depth65
-							if c := buffer[position]; c < rune(' ') || c > rune('\U0010ffff') {
-								goto l64
-							}
-							position++
-						}
-					l65:
-						goto l63
-					l64:
-						position, tokenIndex, depth = position64, tokenIndex64, depth64
-					}
-					depth--
-					add(rulePegText, position62)
-				}
-				depth--
-				add(rulecomment, position61)
-			}
-			return true
-		l60:
-			position, tokenIndex, depth = position60, tokenIndex60, depth60
-			return false
-		},
-		/* 6 keyval <- <(key ws '=' ws val Action4)> */
-		func() bool {
-			position67, tokenIndex67, depth67 := position, tokenIndex, depth
-			{
-				position68 := position
-				depth++
-				if !_rules[rulekey]() {
-					goto l67
-				}
-				if !_rules[rulews]() {
-					goto l67
-				}
-				if buffer[position] != rune('=') {
-					goto l67
-				}
-				position++
-				if !_rules[rulews]() {
-					goto l67
-				}
-				if !_rules[ruleval]() {
-					goto l67
-				}
-				{
-					add(ruleAction4, position)
-				}
-				depth--
-				add(rulekeyval, position68)
-			}
-			return true
-		l67:
-			position, tokenIndex, depth = position67, tokenIndex67, depth67
-			return false
-		},
-		/* 7 key <- <(bareKey / quotedKey)> */
-		func() bool {
-			position70, tokenIndex70, depth70 := position, tokenIndex, depth
-			{
-				position71 := position
-				depth++
-				{
-					position72, tokenIndex72, depth72 := position, tokenIndex, depth
-					{
-						position74 := position
-						depth++
-						{
-							position75 := position
-							depth++
-							{
-								switch buffer[position] {
-								case '_':
-									if buffer[position] != rune('_') {
-										goto l73
-									}
-									position++
-									break
-								case '-':
-									if buffer[position] != rune('-') {
-										goto l73
-									}
-									position++
-									break
-								case 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z':
-									if c := buffer[position]; c < rune('a') || c > rune('z') {
-										goto l73
-									}
-									position++
-									break
-								case '0', '1', '2', '3', '4', '5', '6', '7', '8', '9':
-									if c := buffer[position]; c < rune('0') || c > rune('9') {
-										goto l73
-									}
-									position++
-									break
-								default:
-									if c := buffer[position]; c < rune('A') || c > rune('Z') {
-										goto l73
-									}
-									position++
-									break
-								}
-							}
-
-						l76:
-							{
-								position77, tokenIndex77, depth77 := position, tokenIndex, depth
-								{
-									switch buffer[position] {
-									case '_':
-										if buffer[position] != rune('_') {
-											goto l77
-										}
-										position++
-										break
-									case '-':
-										if buffer[position] != rune('-') {
-											goto l77
-										}
-										position++
-										break
-									case 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z':
-										if c := buffer[position]; c < rune('a') || c > rune('z') {
-											goto l77
-										}
-										position++
-										break
-									case '0', '1', '2', '3', '4', '5', '6', '7', '8', '9':
-										if c := buffer[position]; c < rune('0') || c > rune('9') {
-											goto l77
-										}
-										position++
-										break
-									default:
-										if c := buffer[position]; c < rune('A') || c > rune('Z') {
-											goto l77
-										}
-										position++
-										break
-									}
-								}
-
-								goto l76
-							l77:
-								position, tokenIndex, depth = position77, tokenIndex77, depth77
-							}
-							depth--
-							add(rulePegText, position75)
-						}
-						{
-							add(ruleAction5, position)
-						}
-						depth--
-						add(rulebareKey, position74)
-					}
-					goto l72
-				l73:
-					position, tokenIndex, depth = position72, tokenIndex72, depth72
-					{
-						position81 := position
-						depth++
-						if buffer[position] != rune('"') {
-							goto l70
-						}
-						position++
-						{
-							position82 := position
-							depth++
-							if !_rules[rulebasicChar]() {
-								goto l70
-							}
-						l83:
-							{
-								position84, tokenIndex84, depth84 := position, tokenIndex, depth
-								if !_rules[rulebasicChar]() {
-									goto l84
-								}
-								goto l83
-							l84:
-								position, tokenIndex, depth = position84, tokenIndex84, depth84
-							}
-							depth--
-							add(rulePegText, position82)
-						}
-						if buffer[position] != rune('"') {
-							goto l70
-						}
-						position++
-						{
-							add(ruleAction6, position)
-						}
-						depth--
-						add(rulequotedKey, position81)
-					}
-				}
-			l72:
-				depth--
-				add(rulekey, position71)
-			}
-			return true
-		l70:
-			position, tokenIndex, depth = position70, tokenIndex70, depth70
-			return false
-		},
-		/* 8 bareKey <- <(<((&('_') '_') | (&('-') '-') | (&('a' | 'b' | 'c' | 'd' | 'e' | 'f' | 'g' | 'h' | 'i' | 'j' | 'k' | 'l' | 'm' | 'n' | 'o' | 'p' | 'q' | 'r' | 's' | 't' | 'u' | 'v' | 'w' | 'x' | 'y' | 'z') [a-z]) | (&('0' | '1' | '2' | '3' | '4' | '5' | '6' | '7' | '8' | '9') [0-9]) | (&('A' | 'B' | 'C' | 'D' | 'E' | 'F' | 'G' | 'H' | 'I' | 'J' | 'K' | 'L' | 'M' | 'N' | 'O' | 'P' | 'Q' | 'R' | 'S' | 'T' | 'U' | 'V' | 'W' | 'X' | 'Y' | 'Z') [A-Z]))+> Action5)> */
-		nil,
-		/* 9 quotedKey <- <('"' <basicChar+> '"' Action6)> */
-		nil,
-		/* 10 val <- <((<datetime> Action7) / (<float> Action8) / ((&('{') inlineTable) | (&('[') (<array> Action12)) | (&('f' | 't') (<boolean> Action11)) | (&('"' | '\'') (<string> Action10)) | (&('+' | '-' | '0' | '1' | '2' | '3' | '4' | '5' | '6' | '7' | '8' | '9') (<integer> Action9))))> */
-		func() bool {
-			position88, tokenIndex88, depth88 := position, tokenIndex, depth
-			{
-				position89 := position
-				depth++
-				{
-					position90, tokenIndex90, depth90 := position, tokenIndex, depth
-					{
-						position92 := position
-						depth++
-						{
-							position93 := position
-							depth++
-							{
-								position94 := position
-								depth++
-								{
-									position95 := position
-									depth++
-									{
-										position96 := position
-										depth++
-										if !_rules[ruledigitDual]() {
-											goto l91
-										}
-										if !_rules[ruledigitDual]() {
-											goto l91
-										}
-										depth--
-										add(ruledigitQuad, position96)
-									}
-									depth--
-									add(ruledateFullYear, position95)
-								}
-								if buffer[position] != rune('-') {
-									goto l91
-								}
-								position++
-								{
-									position97 := position
-									depth++
-									if !_rules[ruledigitDual]() {
-										goto l91
-									}
-									depth--
-									add(ruledateMonth, position97)
-								}
-								if buffer[position] != rune('-') {
-									goto l91
-								}
-								position++
-								{
-									position98 := position
-									depth++
-									if !_rules[ruledigitDual]() {
-										goto l91
-									}
-									depth--
-									add(ruledateMDay, position98)
-								}
-								depth--
-								add(rulefullDate, position94)
-							}
-							if buffer[position] != rune('T') {
-								goto l91
-							}
-							position++
-							{
-								position99 := position
-								depth++
-								{
-									position100 := position
-									depth++
-									if !_rules[ruletimeHour]() {
-										goto l91
-									}
-									if buffer[position] != rune(':') {
-										goto l91
-									}
-									position++
-									if !_rules[ruletimeMinute]() {
-										goto l91
-									}
-									if buffer[position] != rune(':') {
-										goto l91
-									}
-									position++
-									{
-										position101 := position
-										depth++
-										if !_rules[ruledigitDual]() {
-											goto l91
-										}
-										depth--
-										add(ruletimeSecond, position101)
-									}
-									{
-										position102, tokenIndex102, depth102 := position, tokenIndex, depth
-										{
-											position104 := position
-											depth++
-											if buffer[position] != rune('.') {
-												goto l102
-											}
-											position++
-											if !_rules[ruledigit]() {
-												goto l102
-											}
-										l105:
-											{
-												position106, tokenIndex106, depth106 := position, tokenIndex, depth
-												if !_rules[ruledigit]() {
-													goto l106
-												}
-												goto l105
-											l106:
-												position, tokenIndex, depth = position106, tokenIndex106, depth106
-											}
-											depth--
-											add(ruletimeSecfrac, position104)
-										}
-										goto l103
-									l102:
-										position, tokenIndex, depth = position102, tokenIndex102, depth102
-									}
-								l103:
-									depth--
-									add(rulepartialTime, position100)
-								}
-								{
-									position107 := position
-									depth++
-									{
-										position108, tokenIndex108, depth108 := position, tokenIndex, depth
-										if buffer[position] != rune('Z') {
-											goto l109
-										}
-										position++
-										goto l108
-									l109:
-										position, tokenIndex, depth = position108, tokenIndex108, depth108
-										{
-											position110 := position
-											depth++
-											{
-												position111, tokenIndex111, depth111 := position, tokenIndex, depth
-												if buffer[position] != rune('-') {
-													goto l112
-												}
-												position++
-												goto l111
-											l112:
-												position, tokenIndex, depth = position111, tokenIndex111, depth111
-												if buffer[position] != rune('+') {
-													goto l91
-												}
-												position++
-											}
-										l111:
-											if !_rules[ruletimeHour]() {
-												goto l91
-											}
-											if buffer[position] != rune(':') {
-												goto l91
-											}
-											position++
-											if !_rules[ruletimeMinute]() {
-												goto l91
-											}
-											depth--
-											add(ruletimeNumoffset, position110)
-										}
-									}
-								l108:
-									depth--
-									add(ruletimeOffset, position107)
-								}
-								depth--
-								add(rulefullTime, position99)
-							}
-							depth--
-							add(ruledatetime, position93)
-						}
-						depth--
-						add(rulePegText, position92)
-					}
-					{
-						add(ruleAction7, position)
-					}
-					goto l90
-				l91:
-					position, tokenIndex, depth = position90, tokenIndex90, depth90
-					{
-						position115 := position
-						depth++
-						{
-							position116 := position
-							depth++
-							if !_rules[ruleinteger]() {
-								goto l114
-							}
-							{
-								position117, tokenIndex117, depth117 := position, tokenIndex, depth
-								if !_rules[rulefrac]() {
-									goto l118
-								}
-								{
-									position119, tokenIndex119, depth119 := position, tokenIndex, depth
-									if !_rules[ruleexp]() {
-										goto l119
-									}
-									goto l120
-								l119:
-									position, tokenIndex, depth = position119, tokenIndex119, depth119
-								}
-							l120:
-								goto l117
-							l118:
-								position, tokenIndex, depth = position117, tokenIndex117, depth117
-								{
-									position121, tokenIndex121, depth121 := position, tokenIndex, depth
-									if !_rules[rulefrac]() {
-										goto l121
-									}
-									goto l122
-								l121:
-									position, tokenIndex, depth = position121, tokenIndex121, depth121
-								}
-							l122:
-								if !_rules[ruleexp]() {
-									goto l114
-								}
-							}
-						l117:
-							depth--
-							add(rulefloat, position116)
-						}
-						depth--
-						add(rulePegText, position115)
-					}
-					{
-						add(ruleAction8, position)
-					}
-					goto l90
-				l114:
-					position, tokenIndex, depth = position90, tokenIndex90, depth90
-					{
-						switch buffer[position] {
-						case '{':
-							{
-								position125 := position
-								depth++
-								if buffer[position] != rune('{') {
-									goto l88
-								}
-								position++
-								{
-									add(ruleAction15, position)
-								}
-								if !_rules[rulews]() {
-									goto l88
-								}
-								{
-									position127 := position
-									depth++
-								l128:
-									{
-										position129, tokenIndex129, depth129 := position, tokenIndex, depth
-										if !_rules[rulekeyval]() {
-											goto l129
-										}
-										{
-											position130, tokenIndex130, depth130 := position, tokenIndex, depth
-											{
-												position132 := position
-												depth++
-												if !_rules[rulews]() {
-													goto l130
-												}
-												if buffer[position] != rune(',') {
-													goto l130
-												}
-												position++
-												if !_rules[rulews]() {
-													goto l130
-												}
-												depth--
-												add(ruleinlineTableValSep, position132)
-											}
-											goto l131
-										l130:
-											position, tokenIndex, depth = position130, tokenIndex130, depth130
-										}
-									l131:
-										goto l128
-									l129:
-										position, tokenIndex, depth = position129, tokenIndex129, depth129
-									}
-									depth--
-									add(ruleinlineTableKeyValues, position127)
-								}
-								if !_rules[rulews]() {
-									goto l88
-								}
-								if buffer[position] != rune('}') {
-									goto l88
-								}
-								position++
-								{
-									add(ruleAction16, position)
-								}
-								depth--
-								add(ruleinlineTable, position125)
-							}
-							break
-						case '[':
-							{
-								position134 := position
-								depth++
-								{
-									position135 := position
-									depth++
-									if buffer[position] != rune('[') {
-										goto l88
-									}
-									position++
-									{
-										add(ruleAction22, position)
-									}
-									if !_rules[rulewsnl]() {
-										goto l88
-									}
-									{
-										position137 := position
-										depth++
-									l138:
-										{
-											position139, tokenIndex139, depth139 := position, tokenIndex, depth
-											if !_rules[ruleval]() {
-												goto l139
-											}
-											{
-												add(ruleAction23, position)
-											}
-											{
-												position141, tokenIndex141, depth141 := position, tokenIndex, depth
-												{
-													position143 := position
-													depth++
-													if !_rules[rulews]() {
-														goto l141
-													}
-													if buffer[position] != rune(',') {
-														goto l141
-													}
-													position++
-													if !_rules[rulewsnl]() {
-														goto l141
-													}
-													depth--
-													add(rulearraySep, position143)
-												}
-												goto l142
-											l141:
-												position, tokenIndex, depth = position141, tokenIndex141, depth141
-											}
-										l142:
-											{
-												position144, tokenIndex144, depth144 := position, tokenIndex, depth
-												{
-													position146, tokenIndex146, depth146 := position, tokenIndex, depth
-													if !_rules[rulecomment]() {
-														goto l146
-													}
-													goto l147
-												l146:
-													position, tokenIndex, depth = position146, tokenIndex146, depth146
-												}
-											l147:
-												if !_rules[rulenewline]() {
-													goto l144
-												}
-												goto l145
-											l144:
-												position, tokenIndex, depth = position144, tokenIndex144, depth144
-											}
-										l145:
-											goto l138
-										l139:
-											position, tokenIndex, depth = position139, tokenIndex139, depth139
-										}
-										depth--
-										add(rulearrayValues, position137)
-									}
-									if !_rules[rulewsnl]() {
-										goto l88
-									}
-									if buffer[position] != rune(']') {
-										goto l88
-									}
-									position++
-									depth--
-									add(rulearray, position135)
-								}
-								depth--
-								add(rulePegText, position134)
-							}
-							{
-								add(ruleAction12, position)
-							}
-							break
-						case 'f', 't':
-							{
-								position149 := position
-								depth++
-								{
-									position150 := position
-									depth++
-									{
-										position151, tokenIndex151, depth151 := position, tokenIndex, depth
-										if buffer[position] != rune('t') {
-											goto l152
-										}
-										position++
-										if buffer[position] != rune('r') {
-											goto l152
-										}
-										position++
-										if buffer[position] != rune('u') {
-											goto l152
-										}
-										position++
-										if buffer[position] != rune('e') {
-											goto l152
-										}
-										position++
-										goto l151
-									l152:
-										position, tokenIndex, depth = position151, tokenIndex151, depth151
-										if buffer[position] != rune('f') {
-											goto l88
-										}
-										position++
-										if buffer[position] != rune('a') {
-											goto l88
-										}
-										position++
-										if buffer[position] != rune('l') {
-											goto l88
-										}
-										position++
-										if buffer[position] != rune('s') {
-											goto l88
-										}
-										position++
-										if buffer[position] != rune('e') {
-											goto l88
-										}
-										position++
-									}
-								l151:
-									depth--
-									add(ruleboolean, position150)
-								}
-								depth--
-								add(rulePegText, position149)
-							}
-							{
-								add(ruleAction11, position)
-							}
-							break
-						case '"', '\'':
-							{
-								position154 := position
-								depth++
-								{
-									position155 := position
-									depth++
-									{
-										position156, tokenIndex156, depth156 := position, tokenIndex, depth
-										{
-											position158 := position
-											depth++
-											if buffer[position] != rune('\'') {
-												goto l157
-											}
-											position++
-											if buffer[position] != rune('\'') {
-												goto l157
-											}
-											position++
-											if buffer[position] != rune('\'') {
-												goto l157
-											}
-											position++
-											{
-												position159 := position
-												depth++
-												{
-													position160 := position
-													depth++
-												l161:
-													{
-														position162, tokenIndex162, depth162 := position, tokenIndex, depth
-														{
-															position163, tokenIndex163, depth163 := position, tokenIndex, depth
-															if buffer[position] != rune('\'') {
-																goto l163
-															}
-															position++
-															if buffer[position] != rune('\'') {
-																goto l163
-															}
-															position++
-															if buffer[position] != rune('\'') {
-																goto l163
-															}
-															position++
-															goto l162
-														l163:
-															position, tokenIndex, depth = position163, tokenIndex163, depth163
-														}
-														{
-															position164, tokenIndex164, depth164 := position, tokenIndex, depth
-															{
-																position166 := position
-																depth++
-																{
-																	position167, tokenIndex167, depth167 := position, tokenIndex, depth
-																	if buffer[position] != rune('\t') {
-																		goto l168
-																	}
-																	position++
-																	goto l167
-																l168:
-																	position, tokenIndex, depth = position167, tokenIndex167, depth167
-																	if c := buffer[position]; c < rune(' ') || c > rune('\U0010ffff') {
-																		goto l165
-																	}
-																	position++
-																}
-															l167:
-																depth--
-																add(rulemlLiteralChar, position166)
-															}
-															goto l164
-														l165:
-															position, tokenIndex, depth = position164, tokenIndex164, depth164
-															if !_rules[rulenewline]() {
-																goto l162
-															}
-														}
-													l164:
-														goto l161
-													l162:
-														position, tokenIndex, depth = position162, tokenIndex162, depth162
-													}
-													depth--
-													add(rulemlLiteralBody, position160)
-												}
-												depth--
-												add(rulePegText, position159)
-											}
-											if buffer[position] != rune('\'') {
-												goto l157
-											}
-											position++
-											if buffer[position] != rune('\'') {
-												goto l157
-											}
-											position++
-											if buffer[position] != rune('\'') {
-												goto l157
-											}
-											position++
-											{
-												add(ruleAction21, position)
-											}
-											depth--
-											add(rulemlLiteralString, position158)
-										}
-										goto l156
-									l157:
-										position, tokenIndex, depth = position156, tokenIndex156, depth156
-										{
-											position171 := position
-											depth++
-											if buffer[position] != rune('\'') {
-												goto l170
-											}
-											position++
-											{
-												position172 := position
-												depth++
-											l173:
-												{
-													position174, tokenIndex174, depth174 := position, tokenIndex, depth
-													{
-														position175 := position
-														depth++
-														{
-															switch buffer[position] {
-															case '\t':
-																if buffer[position] != rune('\t') {
-																	goto l174
-																}
-																position++
-																break
-															case ' ', '!', '"', '#', '$', '%', '&':
-																if c := buffer[position]; c < rune(' ') || c > rune('&') {
-																	goto l174
-																}
-																position++
-																break
-															default:
-																if c := buffer[position]; c < rune('(') || c > rune('\U0010ffff') {
-																	goto l174
-																}
-																position++
-																break
-															}
-														}
-
-														depth--
-														add(ruleliteralChar, position175)
-													}
-													goto l173
-												l174:
-													position, tokenIndex, depth = position174, tokenIndex174, depth174
-												}
-												depth--
-												add(rulePegText, position172)
-											}
-											if buffer[position] != rune('\'') {
-												goto l170
-											}
-											position++
-											{
-												add(ruleAction20, position)
-											}
-											depth--
-											add(ruleliteralString, position171)
-										}
-										goto l156
-									l170:
-										position, tokenIndex, depth = position156, tokenIndex156, depth156
-										{
-											position179 := position
-											depth++
-											if buffer[position] != rune('"') {
-												goto l178
-											}
-											position++
-											if buffer[position] != rune('"') {
-												goto l178
-											}
-											position++
-											if buffer[position] != rune('"') {
-												goto l178
-											}
-											position++
-											{
-												position180 := position
-												depth++
-											l181:
-												{
-													position182, tokenIndex182, depth182 := position, tokenIndex, depth
-													{
-														position183, tokenIndex183, depth183 := position, tokenIndex, depth
-														{
-															position185 := position
-															depth++
-															{
-																position186, tokenIndex186, depth186 := position, tokenIndex, depth
-																if !_rules[rulebasicChar]() {
-																	goto l187
-																}
-																goto l186
-															l187:
-																position, tokenIndex, depth = position186, tokenIndex186, depth186
-																if !_rules[rulenewline]() {
-																	goto l184
-																}
-															}
-														l186:
-															depth--
-															add(rulePegText, position185)
-														}
-														{
-															add(ruleAction19, position)
-														}
-														goto l183
-													l184:
-														position, tokenIndex, depth = position183, tokenIndex183, depth183
-														if !_rules[ruleescape]() {
-															goto l182
-														}
-														if !_rules[rulenewline]() {
-															goto l182
-														}
-														if !_rules[rulewsnl]() {
-															goto l182
-														}
-													}
-												l183:
-													goto l181
-												l182:
-													position, tokenIndex, depth = position182, tokenIndex182, depth182
-												}
-												depth--
-												add(rulemlBasicBody, position180)
-											}
-											if buffer[position] != rune('"') {
-												goto l178
-											}
-											position++
-											if buffer[position] != rune('"') {
-												goto l178
-											}
-											position++
-											if buffer[position] != rune('"') {
-												goto l178
-											}
-											position++
-											{
-												add(ruleAction18, position)
-											}
-											depth--
-											add(rulemlBasicString, position179)
-										}
-										goto l156
-									l178:
-										position, tokenIndex, depth = position156, tokenIndex156, depth156
-										{
-											position190 := position
-											depth++
-											{
-												position191 := position
-												depth++
-												if buffer[position] != rune('"') {
-													goto l88
-												}
-												position++
-											l192:
-												{
-													position193, tokenIndex193, depth193 := position, tokenIndex, depth
-													if !_rules[rulebasicChar]() {
-														goto l193
-													}
-													goto l192
-												l193:
-													position, tokenIndex, depth = position193, tokenIndex193, depth193
-												}
-												if buffer[position] != rune('"') {
-													goto l88
-												}
-												position++
-												depth--
-												add(rulePegText, position191)
-											}
-											{
-												add(ruleAction17, position)
-											}
-											depth--
-											add(rulebasicString, position190)
-										}
-									}
-								l156:
-									depth--
-									add(rulestring, position155)
-								}
-								depth--
-								add(rulePegText, position154)
-							}
-							{
-								add(ruleAction10, position)
-							}
-							break
-						default:
-							{
-								position196 := position
-								depth++
-								if !_rules[ruleinteger]() {
-									goto l88
-								}
-								depth--
-								add(rulePegText, position196)
-							}
-							{
-								add(ruleAction9, position)
-							}
-							break
-						}
-					}
-
-				}
-			l90:
-				depth--
-				add(ruleval, position89)
-			}
-			return true
-		l88:
-			position, tokenIndex, depth = position88, tokenIndex88, depth88
-			return false
-		},
-		/* 11 table <- <(stdTable / arrayTable)> */
-		nil,
-		/* 12 stdTable <- <('[' ws <tableKey> ws ']' Action13)> */
-		nil,
-		/* 13 arrayTable <- <('[' '[' ws <tableKey> ws (']' ']') Action14)> */
-		nil,
-		/* 14 inlineTable <- <('{' Action15 ws inlineTableKeyValues ws '}' Action16)> */
-		nil,
-		/* 15 inlineTableKeyValues <- <(keyval inlineTableValSep?)*> */
-		nil,
-		/* 16 tableKey <- <(key (tableKeySep key)*)> */
-		func() bool {
-			position203, tokenIndex203, depth203 := position, tokenIndex, depth
-			{
-				position204 := position
-				depth++
-				if !_rules[rulekey]() {
-					goto l203
-				}
-			l205:
-				{
-					position206, tokenIndex206, depth206 := position, tokenIndex, depth
-					{
-						position207 := position
-						depth++
-						if !_rules[rulews]() {
-							goto l206
-						}
-						if buffer[position] != rune('.') {
-							goto l206
-						}
-						position++
-						if !_rules[rulews]() {
-							goto l206
-						}
-						depth--
-						add(ruletableKeySep, position207)
-					}
-					if !_rules[rulekey]() {
-						goto l206
-					}
-					goto l205
-				l206:
-					position, tokenIndex, depth = position206, tokenIndex206, depth206
-				}
-				depth--
-				add(ruletableKey, position204)
-			}
-			return true
-		l203:
-			position, tokenIndex, depth = position203, tokenIndex203, depth203
-			return false
-		},
-		/* 17 tableKeySep <- <(ws '.' ws)> */
-		nil,
-		/* 18 inlineTableValSep <- <(ws ',' ws)> */
-		nil,
-		/* 19 integer <- <(('-' / '+')? int)> */
-		func() bool {
-			position210, tokenIndex210, depth210 := position, tokenIndex, depth
-			{
-				position211 := position
-				depth++
-				{
-					position212, tokenIndex212, depth212 := position, tokenIndex, depth
-					{
-						position214, tokenIndex214, depth214 := position, tokenIndex, depth
-						if buffer[position] != rune('-') {
-							goto l215
-						}
-						position++
-						goto l214
-					l215:
-						position, tokenIndex, depth = position214, tokenIndex214, depth214
-						if buffer[position] != rune('+') {
-							goto l212
-						}
-						position++
-					}
-				l214:
-					goto l213
-				l212:
-					position, tokenIndex, depth = position212, tokenIndex212, depth212
-				}
-			l213:
-				{
-					position216 := position
-					depth++
-					{
-						position217, tokenIndex217, depth217 := position, tokenIndex, depth
-						if c := buffer[position]; c < rune('1') || c > rune('9') {
-							goto l218
-						}
-						position++
-						{
-							position221, tokenIndex221, depth221 := position, tokenIndex, depth
-							if !_rules[ruledigit]() {
-								goto l222
-							}
-							goto l221
-						l222:
-							position, tokenIndex, depth = position221, tokenIndex221, depth221
-							if buffer[position] != rune('_') {
-								goto l218
-							}
-							position++
-							if !_rules[ruledigit]() {
-								goto l218
-							}
-						}
-					l221:
-					l219:
-						{
-							position220, tokenIndex220, depth220 := position, tokenIndex, depth
-							{
-								position223, tokenIndex223, depth223 := position, tokenIndex, depth
-								if !_rules[ruledigit]() {
-									goto l224
-								}
-								goto l223
-							l224:
-								position, tokenIndex, depth = position223, tokenIndex223, depth223
-								if buffer[position] != rune('_') {
-									goto l220
-								}
-								position++
-								if !_rules[ruledigit]() {
-									goto l220
-								}
-							}
-						l223:
-							goto l219
-						l220:
-							position, tokenIndex, depth = position220, tokenIndex220, depth220
-						}
-						goto l217
-					l218:
-						position, tokenIndex, depth = position217, tokenIndex217, depth217
-						if !_rules[ruledigit]() {
-							goto l210
-						}
-					}
-				l217:
-					depth--
-					add(ruleint, position216)
-				}
-				depth--
-				add(ruleinteger, position211)
-			}
-			return true
-		l210:
-			position, tokenIndex, depth = position210, tokenIndex210, depth210
-			return false
-		},
-		/* 20 int <- <(([1-9] (digit / ('_' digit))+) / digit)> */
-		nil,
-		/* 21 float <- <(integer ((frac exp?) / (frac? exp)))> */
-		nil,
-		/* 22 frac <- <('.' digit (digit / ('_' digit))*)> */
-		func() bool {
-			position227, tokenIndex227, depth227 := position, tokenIndex, depth
-			{
-				position228 := position
-				depth++
-				if buffer[position] != rune('.') {
-					goto l227
-				}
-				position++
-				if !_rules[ruledigit]() {
-					goto l227
-				}
-			l229:
-				{
-					position230, tokenIndex230, depth230 := position, tokenIndex, depth
-					{
-						position231, tokenIndex231, depth231 := position, tokenIndex, depth
-						if !_rules[ruledigit]() {
-							goto l232
-						}
-						goto l231
-					l232:
-						position, tokenIndex, depth = position231, tokenIndex231, depth231
-						if buffer[position] != rune('_') {
-							goto l230
-						}
-						position++
-						if !_rules[ruledigit]() {
-							goto l230
-						}
-					}
-				l231:
-					goto l229
-				l230:
-					position, tokenIndex, depth = position230, tokenIndex230, depth230
-				}
-				depth--
-				add(rulefrac, position228)
-			}
-			return true
-		l227:
-			position, tokenIndex, depth = position227, tokenIndex227, depth227
-			return false
-		},
-		/* 23 exp <- <(('e' / 'E') ('-' / '+')? digit (digit / ('_' digit))*)> */
-		func() bool {
-			position233, tokenIndex233, depth233 := position, tokenIndex, depth
-			{
-				position234 := position
-				depth++
-				{
-					position235, tokenIndex235, depth235 := position, tokenIndex, depth
-					if buffer[position] != rune('e') {
-						goto l236
-					}
-					position++
-					goto l235
-				l236:
-					position, tokenIndex, depth = position235, tokenIndex235, depth235
-					if buffer[position] != rune('E') {
-						goto l233
-					}
-					position++
-				}
-			l235:
-				{
-					position237, tokenIndex237, depth237 := position, tokenIndex, depth
-					{
-						position239, tokenIndex239, depth239 := position, tokenIndex, depth
-						if buffer[position] != rune('-') {
-							goto l240
-						}
-						position++
-						goto l239
-					l240:
-						position, tokenIndex, depth = position239, tokenIndex239, depth239
-						if buffer[position] != rune('+') {
-							goto l237
-						}
-						position++
-					}
-				l239:
-					goto l238
-				l237:
-					position, tokenIndex, depth = position237, tokenIndex237, depth237
-				}
-			l238:
-				if !_rules[ruledigit]() {
-					goto l233
-				}
-			l241:
-				{
-					position242, tokenIndex242, depth242 := position, tokenIndex, depth
-					{
-						position243, tokenIndex243, depth243 := position, tokenIndex, depth
-						if !_rules[ruledigit]() {
-							goto l244
-						}
-						goto l243
-					l244:
-						position, tokenIndex, depth = position243, tokenIndex243, depth243
-						if buffer[position] != rune('_') {
-							goto l242
-						}
-						position++
-						if !_rules[ruledigit]() {
-							goto l242
-						}
-					}
-				l243:
-					goto l241
-				l242:
-					position, tokenIndex, depth = position242, tokenIndex242, depth242
-				}
-				depth--
-				add(ruleexp, position234)
-			}
-			return true
-		l233:
-			position, tokenIndex, depth = position233, tokenIndex233, depth233
-			return false
-		},
-		/* 24 string <- <(mlLiteralString / literalString / mlBasicString / basicString)> */
-		nil,
-		/* 25 basicString <- <(<('"' basicChar* '"')> Action17)> */
-		nil,
-		/* 26 basicChar <- <(basicUnescaped / escaped)> */
-		func() bool {
-			position247, tokenIndex247, depth247 := position, tokenIndex, depth
-			{
-				position248 := position
-				depth++
-				{
-					position249, tokenIndex249, depth249 := position, tokenIndex, depth
-					{
-						position251 := position
-						depth++
-						{
-							switch buffer[position] {
-							case ' ', '!':
-								if c := buffer[position]; c < rune(' ') || c > rune('!') {
-									goto l250
-								}
-								position++
-								break
-							case '#', '$', '%', '&', '\'', '(', ')', '*', '+', ',', '-', '.', '/', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', ':', ';', '<', '=', '>', '?', '@', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', '[':
-								if c := buffer[position]; c < rune('#') || c > rune('[') {
-									goto l250
-								}
-								position++
-								break
-							default:
-								if c := buffer[position]; c < rune(']') || c > rune('\U0010ffff') {
-									goto l250
-								}
-								position++
-								break
-							}
-						}
-
-						depth--
-						add(rulebasicUnescaped, position251)
-					}
-					goto l249
-				l250:
-					position, tokenIndex, depth = position249, tokenIndex249, depth249
-					{
-						position253 := position
-						depth++
-						if !_rules[ruleescape]() {
-							goto l247
-						}
-						{
-							switch buffer[position] {
-							case 'U':
-								if buffer[position] != rune('U') {
-									goto l247
-								}
-								position++
-								if !_rules[rulehexQuad]() {
-									goto l247
-								}
-								if !_rules[rulehexQuad]() {
-									goto l247
-								}
-								break
-							case 'u':
-								if buffer[position] != rune('u') {
-									goto l247
-								}
-								position++
-								if !_rules[rulehexQuad]() {
-									goto l247
-								}
-								break
-							case '\\':
-								if buffer[position] != rune('\\') {
-									goto l247
-								}
-								position++
-								break
-							case '/':
-								if buffer[position] != rune('/') {
-									goto l247
-								}
-								position++
-								break
-							case '"':
-								if buffer[position] != rune('"') {
-									goto l247
-								}
-								position++
-								break
-							case 'r':
-								if buffer[position] != rune('r') {
-									goto l247
-								}
-								position++
-								break
-							case 'f':
-								if buffer[position] != rune('f') {
-									goto l247
-								}
-								position++
-								break
-							case 'n':
-								if buffer[position] != rune('n') {
-									goto l247
-								}
-								position++
-								break
-							case 't':
-								if buffer[position] != rune('t') {
-									goto l247
-								}
-								position++
-								break
-							default:
-								if buffer[position] != rune('b') {
-									goto l247
-								}
-								position++
-								break
-							}
-						}
-
-						depth--
-						add(ruleescaped, position253)
-					}
-				}
-			l249:
-				depth--
-				add(rulebasicChar, position248)
-			}
-			return true
-		l247:
-			position, tokenIndex, depth = position247, tokenIndex247, depth247
-			return false
-		},
-		/* 27 escaped <- <(escape ((&('U') ('U' hexQuad hexQuad)) | (&('u') ('u' hexQuad)) | (&('\\') '\\') | (&('/') '/') | (&('"') '"') | (&('r') 'r') | (&('f') 'f') | (&('n') 'n') | (&('t') 't') | (&('b') 'b')))> */
-		nil,
-		/* 28 basicUnescaped <- <((&(' ' | '!') [ -!]) | (&('#' | '$' | '%' | '&' | '\'' | '(' | ')' | '*' | '+' | ',' | '-' | '.' | '/' | '0' | '1' | '2' | '3' | '4' | '5' | '6' | '7' | '8' | '9' | ':' | ';' | '<' | '=' | '>' | '?' | '@' | 'A' | 'B' | 'C' | 'D' | 'E' | 'F' | 'G' | 'H' | 'I' | 'J' | 'K' | 'L' | 'M' | 'N' | 'O' | 'P' | 'Q' | 'R' | 'S' | 'T' | 'U' | 'V' | 'W' | 'X' | 'Y' | 'Z' | '[') [#-[]) | (&(']' | '^' | '_' | '`' | 'a' | 'b' | 'c' | 'd' | 'e' | 'f' | 'g' | 'h' | 'i' | 'j' | 'k' | 'l' | 'm' | 'n' | 'o' | 'p' | 'q' | 'r' | 's' | 't' | 'u' | 'v' | 'w' | 'x' | 'y' | 'z' | '{' | '|' | '}' | '~' | '\u007f' | '\u0080' | '\u0081' | '\u0082' | '\u0083' | '\u0084' | '\u0085' | '\u0086' | '\u0087' | '\u0088' | '\u0089' | '\u008a' | '\u008b' | '\u008c' | '\u008d' | '\u008e' | '\u008f' | '\u0090' | '\u0091' | '\u0092' | '\u0093' | '\u0094' | '\u0095' | '\u0096' | '\u0097' | '\u0098' | '\u0099' | '\u009a' | '\u009b' | '\u009c' | '\u009d' | '\u009e' | '\u009f' | '\u00a0' | '¡' | '¢' | '£' | '¤' | '¥' | '¦' | '§' | '¨' | '©' | 'ª' | '«' | '¬' | '\u00ad' | '®' | '¯' | '°' | '±' | '²' | '³' | '´' | 'µ' | '¶' | '·' | '¸' | '¹' | 'º' | '»' | '¼' | '½' | '¾' | '¿' | 'À' | 'Á' | 'Â' | 'Ã' | 'Ä' | 'Å' | 'Æ' | 'Ç' | 'È' | 'É' | 'Ê' | 'Ë' | 'Ì' | 'Í' | 'Î' | 'Ï' | 'Ð' | 'Ñ' | 'Ò' | 'Ó' | 'Ô' | 'Õ' | 'Ö' | '×' | 'Ø' | 'Ù' | 'Ú' | 'Û' | 'Ü' | 'Ý' | 'Þ' | 'ß' | 'à' | 'á' | 'â' | 'ã' | 'ä' | 'å' | 'æ' | 'ç' | 'è' | 'é' | 'ê' | 'ë' | 'ì' | 'í' | 'î' | 'ï' | 'ð' | 'ñ' | 'ò' | 'ó' | 'ô') []-􏿿]))> */
-		nil,
-		/* 29 escape <- <'\\'> */
-		func() bool {
-			position257, tokenIndex257, depth257 := position, tokenIndex, depth
-			{
-				position258 := position
-				depth++
-				if buffer[position] != rune('\\') {
-					goto l257
-				}
-				position++
-				depth--
-				add(ruleescape, position258)
-			}
-			return true
-		l257:
-			position, tokenIndex, depth = position257, tokenIndex257, depth257
-			return false
-		},
-		/* 30 mlBasicString <- <('"' '"' '"' mlBasicBody ('"' '"' '"') Action18)> */
-		nil,
-		/* 31 mlBasicBody <- <((<(basicChar / newline)> Action19) / (escape newline wsnl))*> */
-		nil,
-		/* 32 literalString <- <('\'' <literalChar*> '\'' Action20)> */
-		nil,
-		/* 33 literalChar <- <((&('\t') '\t') | (&(' ' | '!' | '"' | '#' | '$' | '%' | '&') [ -&]) | (&('(' | ')' | '*' | '+' | ',' | '-' | '.' | '/' | '0' | '1' | '2' | '3' | '4' | '5' | '6' | '7' | '8' | '9' | ':' | ';' | '<' | '=' | '>' | '?' | '@' | 'A' | 'B' | 'C' | 'D' | 'E' | 'F' | 'G' | 'H' | 'I' | 'J' | 'K' | 'L' | 'M' | 'N' | 'O' | 'P' | 'Q' | 'R' | 'S' | 'T' | 'U' | 'V' | 'W' | 'X' | 'Y' | 'Z' | '[' | '\\' | ']' | '^' | '_' | '`' | 'a' | 'b' | 'c' | 'd' | 'e' | 'f' | 'g' | 'h' | 'i' | 'j' | 'k' | 'l' | 'm' | 'n' | 'o' | 'p' | 'q' | 'r' | 's' | 't' | 'u' | 'v' | 'w' | 'x' | 'y' | 'z' | '{' | '|' | '}' | '~' | '\u007f' | '\u0080' | '\u0081' | '\u0082' | '\u0083' | '\u0084' | '\u0085' | '\u0086' | '\u0087' | '\u0088' | '\u0089' | '\u008a' | '\u008b' | '\u008c' | '\u008d' | '\u008e' | '\u008f' | '\u0090' | '\u0091' | '\u0092' | '\u0093' | '\u0094' | '\u0095' | '\u0096' | '\u0097' | '\u0098' | '\u0099' | '\u009a' | '\u009b' | '\u009c' | '\u009d' | '\u009e' | '\u009f' | '\u00a0' | '¡' | '¢' | '£' | '¤' | '¥' | '¦' | '§' | '¨' | '©' | 'ª' | '«' | '¬' | '\u00ad' | '®' | '¯' | '°' | '±' | '²' | '³' | '´' | 'µ' | '¶' | '·' | '¸' | '¹' | 'º' | '»' | '¼' | '½' | '¾' | '¿' | 'À' | 'Á' | 'Â' | 'Ã' | 'Ä' | 'Å' | 'Æ' | 'Ç' | 'È' | 'É' | 'Ê' | 'Ë' | 'Ì' | 'Í' | 'Î' | 'Ï' | 'Ð' | 'Ñ' | 'Ò' | 'Ó' | 'Ô' | 'Õ' | 'Ö' | '×' | 'Ø' | 'Ù' | 'Ú' | 'Û' | 'Ü' | 'Ý' | 'Þ' | 'ß' | 'à' | 'á' | 'â' | 'ã' | 'ä' | 'å' | 'æ' | 'ç' | 'è' | 'é' | 'ê' | 'ë' | 'ì' | 'í' | 'î' | 'ï' | 'ð' | 'ñ' | 'ò' | 'ó' | 'ô') [(-􏿿]))> */
-		nil,
-		/* 34 mlLiteralString <- <('\'' '\'' '\'' <mlLiteralBody> ('\'' '\'' '\'') Action21)> */
-		nil,
-		/* 35 mlLiteralBody <- <(!('\'' '\'' '\'') (mlLiteralChar / newline))*> */
-		nil,
-		/* 36 mlLiteralChar <- <('\t' / [ -􏿿])> */
-		nil,
-		/* 37 hexdigit <- <((&('a' | 'b' | 'c' | 'd' | 'e' | 'f') [a-f]) | (&('A' | 'B' | 'C' | 'D' | 'E' | 'F') [A-F]) | (&('0' | '1' | '2' | '3' | '4' | '5' | '6' | '7' | '8' | '9') [0-9]))> */
-		func() bool {
-			position266, tokenIndex266, depth266 := position, tokenIndex, depth
-			{
-				position267 := position
-				depth++
-				{
-					switch buffer[position] {
-					case 'a', 'b', 'c', 'd', 'e', 'f':
-						if c := buffer[position]; c < rune('a') || c > rune('f') {
-							goto l266
-						}
-						position++
-						break
-					case 'A', 'B', 'C', 'D', 'E', 'F':
-						if c := buffer[position]; c < rune('A') || c > rune('F') {
-							goto l266
-						}
-						position++
-						break
-					default:
-						if c := buffer[position]; c < rune('0') || c > rune('9') {
-							goto l266
-						}
-						position++
-						break
-					}
-				}
-
-				depth--
-				add(rulehexdigit, position267)
-			}
-			return true
-		l266:
-			position, tokenIndex, depth = position266, tokenIndex266, depth266
-			return false
-		},
-		/* 38 hexQuad <- <(hexdigit hexdigit hexdigit hexdigit)> */
-		func() bool {
-			position269, tokenIndex269, depth269 := position, tokenIndex, depth
-			{
-				position270 := position
-				depth++
-				if !_rules[rulehexdigit]() {
-					goto l269
-				}
-				if !_rules[rulehexdigit]() {
-					goto l269
-				}
-				if !_rules[rulehexdigit]() {
-					goto l269
-				}
-				if !_rules[rulehexdigit]() {
-					goto l269
-				}
-				depth--
-				add(rulehexQuad, position270)
-			}
-			return true
-		l269:
-			position, tokenIndex, depth = position269, tokenIndex269, depth269
-			return false
-		},
-		/* 39 boolean <- <(('t' 'r' 'u' 'e') / ('f' 'a' 'l' 's' 'e'))> */
-		nil,
-		/* 40 dateFullYear <- <digitQuad> */
-		nil,
-		/* 41 dateMonth <- <digitDual> */
-		nil,
-		/* 42 dateMDay <- <digitDual> */
-		nil,
-		/* 43 timeHour <- <digitDual> */
-		func() bool {
-			position275, tokenIndex275, depth275 := position, tokenIndex, depth
-			{
-				position276 := position
-				depth++
-				if !_rules[ruledigitDual]() {
-					goto l275
-				}
-				depth--
-				add(ruletimeHour, position276)
-			}
-			return true
-		l275:
-			position, tokenIndex, depth = position275, tokenIndex275, depth275
-			return false
-		},
-		/* 44 timeMinute <- <digitDual> */
-		func() bool {
-			position277, tokenIndex277, depth277 := position, tokenIndex, depth
-			{
-				position278 := position
-				depth++
-				if !_rules[ruledigitDual]() {
-					goto l277
-				}
-				depth--
-				add(ruletimeMinute, position278)
-			}
-			return true
-		l277:
-			position, tokenIndex, depth = position277, tokenIndex277, depth277
-			return false
-		},
-		/* 45 timeSecond <- <digitDual> */
-		nil,
-		/* 46 timeSecfrac <- <('.' digit+)> */
-		nil,
-		/* 47 timeNumoffset <- <(('-' / '+') timeHour ':' timeMinute)> */
-		nil,
-		/* 48 timeOffset <- <('Z' / timeNumoffset)> */
-		nil,
-		/* 49 partialTime <- <(timeHour ':' timeMinute ':' timeSecond timeSecfrac?)> */
-		nil,
-		/* 50 fullDate <- <(dateFullYear '-' dateMonth '-' dateMDay)> */
-		nil,
-		/* 51 fullTime <- <(partialTime timeOffset)> */
-		nil,
-		/* 52 datetime <- <(fullDate 'T' fullTime)> */
-		nil,
-		/* 53 digit <- <[0-9]> */
-		func() bool {
-			position287, tokenIndex287, depth287 := position, tokenIndex, depth
-			{
-				position288 := position
-				depth++
-				if c := buffer[position]; c < rune('0') || c > rune('9') {
-					goto l287
-				}
-				position++
-				depth--
-				add(ruledigit, position288)
-			}
-			return true
-		l287:
-			position, tokenIndex, depth = position287, tokenIndex287, depth287
-			return false
-		},
-		/* 54 digitDual <- <(digit digit)> */
-		func() bool {
-			position289, tokenIndex289, depth289 := position, tokenIndex, depth
-			{
-				position290 := position
-				depth++
-				if !_rules[ruledigit]() {
-					goto l289
-				}
-				if !_rules[ruledigit]() {
-					goto l289
-				}
-				depth--
-				add(ruledigitDual, position290)
-			}
-			return true
-		l289:
-			position, tokenIndex, depth = position289, tokenIndex289, depth289
-			return false
-		},
-		/* 55 digitQuad <- <(digitDual digitDual)> */
-		nil,
-		/* 56 array <- <('[' Action22 wsnl arrayValues wsnl ']')> */
-		nil,
-		/* 57 arrayValues <- <(val Action23 arraySep? (comment? newline)?)*> */
-		nil,
-		/* 58 arraySep <- <(ws ',' wsnl)> */
-		nil,
-		/* 60 Action0 <- <{ _ = buffer }> */
-		nil,
-		nil,
-		/* 62 Action1 <- <{ p.SetTableString(begin, end) }> */
-		nil,
-		/* 63 Action2 <- <{ p.AddLineCount(end - begin) }> */
-		nil,
-		/* 64 Action3 <- <{ p.AddLineCount(end - begin) }> */
-		nil,
-		/* 65 Action4 <- <{ p.AddKeyValue() }> */
-		nil,
-		/* 66 Action5 <- <{ p.SetKey(p.buffer, begin, end) }> */
-		nil,
-		/* 67 Action6 <- <{ p.SetKey(p.buffer, begin, end) }> */
-		nil,
-		/* 68 Action7 <- <{ p.SetTime(begin, end) }> */
-		nil,
-		/* 69 Action8 <- <{ p.SetFloat64(begin, end) }> */
-		nil,
-		/* 70 Action9 <- <{ p.SetInt64(begin, end) }> */
-		nil,
-		/* 71 Action10 <- <{ p.SetString(begin, end) }> */
-		nil,
-		/* 72 Action11 <- <{ p.SetBool(begin, end) }> */
-		nil,
-		/* 73 Action12 <- <{ p.SetArray(begin, end) }> */
-		nil,
-		/* 74 Action13 <- <{ p.SetTable(p.buffer, begin, end) }> */
-		nil,
-		/* 75 Action14 <- <{ p.SetArrayTable(p.buffer, begin, end) }> */
-		nil,
-		/* 76 Action15 <- <{ p.StartInlineTable() }> */
-		nil,
-		/* 77 Action16 <- <{ p.EndInlineTable() }> */
-		nil,
-		/* 78 Action17 <- <{ p.SetBasicString(p.buffer, begin, end) }> */
-		nil,
-		/* 79 Action18 <- <{ p.SetMultilineString() }> */
-		nil,
-		/* 80 Action19 <- <{ p.AddMultilineBasicBody(p.buffer, begin, end) }> */
-		nil,
-		/* 81 Action20 <- <{ p.SetLiteralString(p.buffer, begin, end) }> */
-		nil,
-		/* 82 Action21 <- <{ p.SetMultilineLiteralString(p.buffer, begin, end) }> */
-		nil,
-		/* 83 Action22 <- <{ p.StartArray() }> */
-		nil,
-		/* 84 Action23 <- <{ p.AddArrayVal() }> */
-		nil,
-	}
-	p.rules = _rules
-}
diff --git a/Godeps/_workspace/src/github.com/naoina/toml/testdata/test.toml b/Godeps/_workspace/src/github.com/naoina/toml/testdata/test.toml
deleted file mode 100644
index ec119752d..000000000
--- a/Godeps/_workspace/src/github.com/naoina/toml/testdata/test.toml
+++ /dev/null
@@ -1,244 +0,0 @@
-################################################################################
-## Comment
-
-# Speak your mind with the hash symbol. They go from the symbol to the end of
-# the line.
-
-
-################################################################################
-## Table
-
-# Tables (also known as hash tables or dictionaries) are collections of
-# key/value pairs. They appear in square brackets on a line by themselves.
-
-[table]
-
-key = "value" # Yeah, you can do this.
-
-# Nested tables are denoted by table names with dots in them. Name your tables
-# whatever crap you please, just don't use #, ., [ or ].
-
-[table.subtable]
-
-key = "another value"
-
-# You don't need to specify all the super-tables if you don't want to. TOML
-# knows how to do it for you.
-
-# [x] you
-# [x.y] don't
-# [x.y.z] need these
-[x.y.z.w] # for this to work
-
-
-################################################################################
-## Inline Table
-
-# Inline tables provide a more compact syntax for expressing tables. They are
-# especially useful for grouped data that can otherwise quickly become verbose.
-# Inline tables are enclosed in curly braces `{` and `}`. No newlines are
-# allowed between the curly braces unless they are valid within a value.
-
-[table.inline]
-
-name = { first = "Tom", last = "Preston-Werner" }
-point = { x = 1, y = 2 }
-
-
-################################################################################
-## String
-
-# There are four ways to express strings: basic, multi-line basic, literal, and
-# multi-line literal. All strings must contain only valid UTF-8 characters.
-
-[string.basic]
-
-basic = "I'm a string. \"You can quote me\". Name\tJos\u00E9\nLocation\tSF."
-
-[string.multiline]
-
-# The following strings are byte-for-byte equivalent:
-key1 = "One\nTwo"
-key2 = """One\nTwo"""
-key3 = """
-One
-Two"""
-
-[string.multiline.continued]
-
-# The following strings are byte-for-byte equivalent:
-key1 = "The quick brown fox jumps over the lazy dog."
-
-key2 = """
-The quick brown \
-
-
-  fox jumps over \
-    the lazy dog."""
-
-key3 = """\
-       The quick brown \
-       fox jumps over \
-       the lazy dog.\
-       """
-
-[string.literal]
-
-# What you see is what you get.
-winpath  = 'C:\Users\nodejs\templates'
-winpath2 = '\\ServerX\admin$\system32\'
-quoted   = 'Tom "Dubs" Preston-Werner'
-regex    = '<\i\c*\s*>'
-
-
-[string.literal.multiline]
-
-regex2 = '''I [dw]on't need \d{2} apples'''
-lines  = '''
-The first newline is
-trimmed in raw strings.
-   All other whitespace
-   is preserved.
-'''
-
-
-################################################################################
-## Integer
-
-# Integers are whole numbers. Positive numbers may be prefixed with a plus sign.
-# Negative numbers are prefixed with a minus sign.
-
-[integer]
-
-key1 = +99
-key2 = 42
-key3 = 0
-key4 = -17
-
-[integer.underscores]
-
-# For large numbers, you may use underscores to enhance readability. Each
-# underscore must be surrounded by at least one digit.
-key1 = 1_000
-key2 = 5_349_221
-key3 = 1_2_3_4_5     # valid but inadvisable
-
-
-################################################################################
-## Float
-
-# A float consists of an integer part (which may be prefixed with a plus or
-# minus sign) followed by a fractional part and/or an exponent part.
-
-[float.fractional]
-
-key1 = +1.0
-key2 = 3.1415
-key3 = -0.01
-
-[float.exponent]
-
-key1 = 5e+22
-key2 = 1e6
-key3 = -2E-2
-
-[float.both]
-
-key = 6.626e-34
-
-[float.underscores]
-
-key1 = 9_224_617.445_991_228_313
-key2 = 1e1_00
-
-
-################################################################################
-## Boolean
-
-# Booleans are just the tokens you're used to. Always lowercase.
-
-[boolean]
-
-True = true
-False = false
-
-
-################################################################################
-## Datetime
-
-# Datetimes are RFC 3339 dates.
-
-[datetime]
-
-key1 = 1979-05-27T07:32:00Z
-key2 = 1979-05-27T00:32:00-07:00
-key3 = 1979-05-27T00:32:00.999999-07:00
-
-
-################################################################################
-## Array
-
-# Arrays are square brackets with other primitives inside. Whitespace is
-# ignored. Elements are separated by commas. Data types may not be mixed.
-
-[array]
-
-key1 = [ 1, 2, 3 ]
-key2 = [ "red", "yellow", "green" ]
-key3 = [ [ 1, 2 ], [3, 4, 5] ]
-key4 = [ [ 1, 2 ], ["a", "b", "c"] ] # this is ok
-
-# Arrays can also be multiline. So in addition to ignoring whitespace, arrays
-# also ignore newlines between the brackets.  Terminating commas are ok before
-# the closing bracket.
-
-key5 = [
-  1, 2, 3
-]
-key6 = [
-  1,
-  2, # this is ok
-]
-
-
-################################################################################
-## Array of Tables
-
-# These can be expressed by using a table name in double brackets. Each table
-# with the same double bracketed name will be an element in the array. The
-# tables are inserted in the order encountered.
-
-[[products]]
-
-name = "Hammer"
-sku = 738594937
-
-[[products]]
-
-[[products]]
-
-name = "Nail"
-sku = 284758393
-color = "gray"
-
-
-# You can create nested arrays of tables as well.
-
-[[fruit]]
-  name = "apple"
-
-  [fruit.physical]
-    color = "red"
-    shape = "round"
-
-  [[fruit.variety]]
-    name = "red delicious"
-
-  [[fruit.variety]]
-    name = "granny smith"
-
-[[fruit]]
-  name = "banana"
-
-  [[fruit.variety]]
-    name = "plantain"
diff --git a/Godeps/_workspace/src/github.com/naoina/toml/util.go b/Godeps/_workspace/src/github.com/naoina/toml/util.go
deleted file mode 100644
index dc6a548d7..000000000
--- a/Godeps/_workspace/src/github.com/naoina/toml/util.go
+++ /dev/null
@@ -1,79 +0,0 @@
-package toml
-
-import (
-	"go/ast"
-	"reflect"
-	"strings"
-	"unicode"
-)
-
-// toCamelCase returns a copy of the string s with all Unicode letters mapped to their camel case.
-// It will convert to upper case previous letter of '_' and first letter, and remove letter of '_'.
-func toCamelCase(s string) string {
-	if s == "" {
-		return ""
-	}
-	result := make([]rune, 0, len(s))
-	upper := false
-	for _, r := range s {
-		if r == '_' {
-			upper = true
-			continue
-		}
-		if upper {
-			result = append(result, unicode.ToUpper(r))
-			upper = false
-			continue
-		}
-		result = append(result, r)
-	}
-	result[0] = unicode.ToUpper(result[0])
-	return string(result)
-}
-
-const (
-	fieldTagName = "toml"
-)
-
-func findField(rv reflect.Value, name string) (field reflect.Value, fieldName string, found bool) {
-	switch rv.Kind() {
-	case reflect.Struct:
-		rt := rv.Type()
-		for i := 0; i < rt.NumField(); i++ {
-			ft := rt.Field(i)
-			if !ast.IsExported(ft.Name) {
-				continue
-			}
-			if col, _ := extractTag(ft.Tag.Get(fieldTagName)); col == name {
-				return rv.Field(i), ft.Name, true
-			}
-		}
-		for _, name := range []string{
-			strings.Title(name),
-			toCamelCase(name),
-			strings.ToUpper(name),
-		} {
-			if field := rv.FieldByName(name); field.IsValid() {
-				return field, name, true
-			}
-		}
-	case reflect.Map:
-		return reflect.New(rv.Type().Elem()).Elem(), name, true
-	}
-	return field, "", false
-}
-
-func extractTag(tag string) (col, rest string) {
-	tags := strings.SplitN(tag, ",", 2)
-	if len(tags) == 2 {
-		return strings.TrimSpace(tags[0]), strings.TrimSpace(tags[1])
-	}
-	return strings.TrimSpace(tags[0]), ""
-}
-
-func tableName(prefix, name string) string {
-	if prefix != "" {
-		return prefix + string(tableSeparator) + name
-	}
-	return name
-}
diff --git a/Godeps/_workspace/src/github.com/nsqio/go-nsq/.travis.yml b/Godeps/_workspace/src/github.com/nsqio/go-nsq/.travis.yml
deleted file mode 100644
index b0a6ef1fd..000000000
--- a/Godeps/_workspace/src/github.com/nsqio/go-nsq/.travis.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-language: go
-go:
-  - 1.4.2
-  - 1.5.1
-env:
-  - NSQ_DOWNLOAD=nsq-0.3.0.linux-amd64.go1.3.3 GOARCH=amd64
-  - NSQ_DOWNLOAD=nsq-0.3.0.linux-amd64.go1.3.3 GOARCH=386
-  - NSQ_DOWNLOAD=nsq-0.3.1.linux-amd64.go1.4.1 GOARCH=amd64
-  - NSQ_DOWNLOAD=nsq-0.3.1.linux-amd64.go1.4.1 GOARCH=386
-  - NSQ_DOWNLOAD=nsq-0.3.2.linux-amd64.go1.4.1 GOARCH=amd64
-  - NSQ_DOWNLOAD=nsq-0.3.2.linux-amd64.go1.4.1 GOARCH=386
-  - NSQ_DOWNLOAD=nsq-0.3.5.linux-amd64.go1.4.2 GOARCH=amd64
-  - NSQ_DOWNLOAD=nsq-0.3.5.linux-amd64.go1.4.2 GOARCH=386
-install:
-  - go get github.com/mreiferson/go-snappystream
-script:
-  - wget http://bitly-downloads.s3.amazonaws.com/nsq/$NSQ_DOWNLOAD.tar.gz
-  - tar zxvf $NSQ_DOWNLOAD.tar.gz
-  - export PATH=$NSQ_DOWNLOAD/bin:$PATH
-  - pushd $TRAVIS_BUILD_DIR
-  - ./test.sh
-  - popd
-notifications:
-  email: false
-sudo: false
diff --git a/Godeps/_workspace/src/github.com/nsqio/go-nsq/ChangeLog.md b/Godeps/_workspace/src/github.com/nsqio/go-nsq/ChangeLog.md
deleted file mode 100644
index 60e58b93f..000000000
--- a/Godeps/_workspace/src/github.com/nsqio/go-nsq/ChangeLog.md
+++ /dev/null
@@ -1,239 +0,0 @@
-## go-nsq Change Log
-
-### 1.0.5 - 2015-09-19
-
-**Upgrading from 1.0.4**: There are no backward incompatible changes.
-
- * #156 - consumer: prevent data race on RNG
- * #155 - config: support `flag.Value` interface
- * #147/#150 - consumer: fix application of `max_backoff_duration` (thanks @judwhite)
- * #138 - fix lint, vet, fmt issues
- * #137 - remove `go-simplejson` dependency
-
-### 1.0.4 - 2015-04-07
-
-**Upgrading from 1.0.3**: There are no backward incompatible changes.
-
- * #133 - fix `ErrNotConnected` race during `Producer` connection (thanks @jeddenlea)
- * #132 - fix `RDY` redistribution after backoff with no connections
- * #128 - fix backoff stall when using `RequeueWithoutBackoff`
- * #127 - fix handling of connection closing when resuming after backoff (thanks @jnewmano)
- * #126 - allow `BackoffStrategy` to be set via flag (thanks @twmb)
- * #125 - add pluggable consumer `BackoffStrategy`; add full-jitter strategy (thanks @hden)
- * #124 - add `DialTimeout` and `LocalAddr` config (thanks @yashkin)
- * #119 - add `Producer.Ping()` method (thanks @zulily)
- * #122 - refactor log level string handling
- * #120 - fix `Message` data races on `responded`
- * #114 - fix lookupd jitter having no effect (thanks @judwhite)
-
-### 1.0.3 - 2015-02-07
-
-**Upgrading from 1.0.2**: There are no backward incompatible changes.
-
- * #104 - fix reconnect address bug (thanks @ryanslade)
- * #106 - fix backoff reconnect deadlock (thanks @ryanslade)
- * #107 - fix out-of-bounds error when removing nsqlookupd addresses (thanks @andreas)
- * #108 - fix potential logger race conditions (thanks @judwhite)
- * #111 - fix resolved address error in reconnect loop (thanks @twmb)
-
-### 1.0.2 - 2015-01-21
-
-**Upgrading from 1.0.1**: There are no backward incompatible changes.
-
- * #102 - TLS min/max config defaults (thanks @twmb)
- * #99 - fix `Consumer.Stop()` race and `Producer.Stop()` deadlock (thanks @tylertreat)
- * #92 - expose `Message.NSQDAddress`
- * #95 - cleanup panic during `Consumer.Stop()` if handlers are deadlocked
- * #98 - add `tls-min-version` option (thanks @twmb)
- * #93 - expose a way to get `Consumer` runtime stats (thanks @dcarney)
- * #94 - allow `#ephemeral` topic names (thanks @jamesgroat)
-
-### 1.0.1 - 2014-11-09
-
-**Upgrading from 1.0.0**: There are no backward incompatible changes functionally, however this
-release no longer compiles with Go `1.0.x`.
-
- * #89 - don't spam connection teardown cleanup messages
- * #91 - add consumer `DisconnectFrom*`
- * #87 - allow `heartbeat_interval` and `output_buffer_timeout` to be disabled
- * #86 - pluggable `nsqlookupd` behaviors
- * #83 - send `RDY` before `FIN`/`REQ` (forwards compatibility with nsqio/nsq#404)
- * #82 - fix panic when conn isn't assigned
- * #75/#76 - minor config related bug fixes
- * #75/#77/#78 - add `tls-cert` and `tls-key` config options
-
-### 1.0.0 - 2014-08-11
-
-**Upgrading from 0.3.7**: The public API was significantly refactored and is not backwards
-compatible, please read [UPGRADING](UPGRADING.md).
-
- * #58 - support `IDENTIFY` `msg_timeout`
- * #54 - per-connection TLS config and set `ServerName`
- * #49 - add common connect helpers
- * #43/#63 - more flexible `nsqlookupd` URL specification
- * #35 - `AUTH` support
- * #41/#62 - use package private RNG
- * #36 - support 64 character topic/channel names
- * #30/#38/#39/#42/#45/#46/#48/#51/#52/#65/#70 - refactor public API (see [UPGRADING](UPGRADING.md))
-
-### 0.3.7 - 2014-05-25
-
-**Upgrading from 0.3.6**: There are no backward incompatible changes. **THIS IS THE LAST STABLE
-RELEASE PROVIDING THIS API**. Future releases will be based on the api in #30 and **will not be
-backwards compatible!**
-
-This is a bug fix release relating to the refactoring done in `0.3.6`.
-
- * #32 - fix potential panic for race condition when # conns == 0
- * #33/#34 - more granular connection locking
-
-### 0.3.6 - 2014-04-29
-
-**Upgrading from 0.3.5**: There are no backward incompatible changes.
-
-This release includes a significant internal refactoring, designed
-to better encapsulate responsibility, see #19.
-
-Specifically:
-
- * make `Conn` public
- * move transport responsibilities into `Conn` from `Reader`/`Writer`
- * supply callbacks for hooking into `Conn` events
-
-As part of the refactoring, a few additional clean exit related 
-issues were resolved:
-
- * wait group now includes all exit related goroutines
- * ensure that readLoop exits before exiting cleanup
- * always check messagesInFlight at readLoop exit
- * close underlying connection last
-
-### 0.3.5 - 2014-04-05
-
-**Upgrading from 0.3.4**: There are no backward incompatible changes.
-
-This release includes a few new features such as support for channel
-sampling and sending along a user agent string (which is now displayed
-in `nsqadmin`).
-
-Also, a critical bug fix for potential deadlocks (thanks @kjk
-for reporting and help testing).
-
-New Features/Improvements:
-
- * #27 - reader logs disambiguate topic/channel
- * #22 - channel sampling
- * #23 - user agent
-
-Bug Fixes:
-
- * #24 - fix racey reader IDENTIFY buffering
- * #29 - fix recursive RLock deadlocks
-
-### 0.3.4 - 2013-11-19
-
-**Upgrading from 0.3.3**: There are no backward incompatible changes.
-
-This is a bug fix release, notably potential deadlocks in `Message.Requeue()` and `Message.Touch()`
-as well as a potential busy loop cleaning up closed connections with in-flight messages.
-
-New Features/Improvements:
-
- * #14 - add `Reader.Configure()`
- * #18 - return an exported error when an `nsqlookupd` address is already configured
-
-Bug Fixes:
-
- * #15 - dont let `handleError()` loop if already connected
- * #17 - resolve potential deadlocks on `Message` responders
- * #16 - eliminate busy loop when draining `finishedMessages`
-
-### 0.3.3 - 2013-10-21
-
-**Upgrading from 0.3.2**: This release requires NSQ binary version `0.2.23+` for compression
-support.
-
-This release contains significant `Reader` refactoring of the RDY handling code paths. The
-motivation is documented in #1 however the commits in #8 identify individual changes. Additionally,
-we eliminated deadlocks during connection cleanup in `Writer`.
-
-As a result, both user-facing APIs should now be considerably more robust and stable. Additionally,
-`Reader` should behave better when backing off.
-
-New Features/Improvements:
-
- * #9 - ability to ignore publish responses in `Writer`
- * #12 - `Requeue()` method on `Message`
- * #6 - `Touch()` method on `Message`
- * #4 - snappy/deflate feature negotiation
-
-Bug Fixes:
-
- * #8 - `Reader` RDY handling refactoring (race conditions, deadlocks, consolidation)
- * #13 - fix `Writer` deadlocks
- * #10 - stop accessing simplejson internals
- * #5 - fix `max-in-flight` race condition
-
-### 0.3.2 - 2013-08-26
-
-**Upgrading from 0.3.1**: This release requires NSQ binary version `0.2.22+` for TLS support.
-
-New Features/Improvements:
-
- * #227 - TLS feature negotiation
- * #164/#202/#255 - add `Writer`
- * #186 - `MaxBackoffDuration` of `0` disables backoff
- * #175 - support for `nsqd` config option `--max-rdy-count`
- * #169 - auto-reconnect to hard-coded `nsqd`
-
-Bug Fixes:
-
- * #254/#256/#257 - new connection RDY starvation
- * #250 - `nsqlookupd` polling improvements
- * #243 - limit `IsStarved()` to connections w/ in-flight messages
- * #169 - use last RDY count for `IsStarved()`; redistribute RDY state
- * #204 - fix early termination blocking
- * #177 - support `broadcast_address`
- * #161 - connection pool goroutine safety
-
-### 0.3.1 - 2013-02-07
-
-**Upgrading from 0.3.0**: This release requires NSQ binary version `0.2.17+` for `TOUCH` support.
-
- * #119 - add TOUCH command
- * #133 - improved handling of errors/magic
- * #127 - send IDENTIFY (missed in #90)
- * #16 - add backoff to Reader
-
-### 0.3.0 - 2013-01-07
-
-**Upgrading from 0.2.4**: There are no backward incompatible changes to applications
-written against the public `nsq.Reader` API.
-
-However, there *are* a few backward incompatible changes to the API for applications that 
-directly use other public methods, or properties of a few NSQ data types:
-
-`nsq.Message` IDs are now a type `nsq.MessageID` (a `[16]byte` array).  The signatures of
-`nsq.Finish()` and `nsq.Requeue()` reflect this change.
-
-`nsq.SendCommand()` and `nsq.Frame()` were removed in favor of `nsq.SendFramedResponse()`.
-
-`nsq.Subscribe()` no longer accepts `shortId` and `longId`.  If upgrading your consumers
-before upgrading your `nsqd` binaries to `0.2.16-rc.1` they will not be able to send the 
-optional custom identifiers.
-    
- * #90 performance optimizations
- * #81 reader performance improvements / MPUB support
-
-### 0.2.4 - 2012-10-15
-
- * #69 added IsStarved() to reader API
-
-### 0.2.3 - 2012-10-11
-
- * #64 timeouts on reader queries to lookupd
- * #54 fix crash issue with reader cleaning up from unexpectedly closed nsqd connections
-
-### 0.2.2 - 2012-10-09
-
- * Initial public release
diff --git a/Godeps/_workspace/src/github.com/nsqio/go-nsq/LICENSE b/Godeps/_workspace/src/github.com/nsqio/go-nsq/LICENSE
deleted file mode 100644
index 89de35479..000000000
--- a/Godeps/_workspace/src/github.com/nsqio/go-nsq/LICENSE
+++ /dev/null
@@ -1,17 +0,0 @@
-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/nsqio/go-nsq/README.md b/Godeps/_workspace/src/github.com/nsqio/go-nsq/README.md
deleted file mode 100644
index 55213f2fa..000000000
--- a/Godeps/_workspace/src/github.com/nsqio/go-nsq/README.md
+++ /dev/null
@@ -1,19 +0,0 @@
-## go-nsq
-
-[![Build Status](https://secure.travis-ci.org/nsqio/go-nsq.svg?branch=master)][travis] [![GoDoc](https://godoc.org/github.com/nsqio/go-nsq?status.svg)](https://godoc.org/github.com/nsqio/go-nsq) [![GitHub release](https://img.shields.io/github/release/nsqio/go-nsq.svg)](https://github.com/nsqio/go-nsq/releases/latest)
-
-The official Go package for [NSQ][nsq].
-
-### Docs
-
-See [godoc][nsq_gopkgdoc] and the [main repo apps][apps] directory for examples of clients built
-using this package.
-
-### Tests
-
-Tests are run via `./test.sh` (which requires `nsqd` and `nsqlookupd` to be installed).
-
-[nsq]: https://github.com/nsqio/nsq
-[nsq_gopkgdoc]: http://godoc.org/github.com/nsqio/go-nsq
-[apps]: https://github.com/nsqio/nsq/tree/master/apps
-[travis]: http://travis-ci.org/nsqio/go-nsq
diff --git a/Godeps/_workspace/src/github.com/nsqio/go-nsq/UPGRADING.md b/Godeps/_workspace/src/github.com/nsqio/go-nsq/UPGRADING.md
deleted file mode 100644
index ad2e7cd0a..000000000
--- a/Godeps/_workspace/src/github.com/nsqio/go-nsq/UPGRADING.md
+++ /dev/null
@@ -1,180 +0,0 @@
-This outlines the backwards incompatible changes that were made to the public API after the
-`v0.3.7` stable release, and and how to migrate existing legacy codebases.
-
-#### Background
-
-The original `go-nsq` codebase is some of our earliest Go code, and one of our first attempts at a
-public Go library.
-
-We've learned a lot over the last 2 years and we wanted `go-nsq` to reflect the experiences we've
-had working with the library as well as the general Go conventions and best practices we picked up
-along the way.
-
-The diff can be seen via: https://github.com/nsqio/go-nsq/compare/v0.3.7...HEAD
-
-The bulk of the refactoring came via: https://github.com/nsqio/go-nsq/pull/30
-
-#### Naming
-
-Previously, the high-level types we exposed were named `nsq.Reader` and `nsq.Writer`. These
-reflected internal naming conventions we had used at bitly for some time but conflated semantics
-with what a typical Go developer would expect (they obviously did not implement `io.Reader` and
-`io.Writer`).
-
-We renamed these types to `nsq.Consumer` and `nsq.Producer`, which more effectively communicate
-their purpose and is consistent with the NSQ documentation.
-
-#### Configuration
-
-In the previous API there were inconsistent and confusing ways to configure your clients.
-
-Now, configuration is performed *before* creating an `nsq.Consumer` or `nsq.Producer` by creating
-an `nsq.Config` struct. The only valid way to do this is via `nsq.NewConfig` (i.e. using a struct
-literal will panic due to invalid internal state).
-
-The `nsq.Config` struct has exported variables that can be set directly in a type-safe manner. You
-can also call `cfg.Validate()` to check that the values are correct and within range.
-
-`nsq.Config` also exposes a convenient helper method `Set(k string, v interface{})` that can set
-options by *coercing* the supplied `interface{}` value.
-
-This is incredibly convenient if you're reading options from a config file or in a serialized
-format that does not exactly match the native types.
-
-It is both flexible and forgiving.
-
-#### Improving the nsq.Handler interface
-
-`go-nsq` attempts to make writing the common use case consumer incredibly easy.
-
-You specify a type that implements the `nsq.Handler` interface, the interface method is called per
-message, and the return value of said method indicates to the library what the response to `nsqd`
-should be (`FIN` or `REQ`), all the while managing flow control and backoff.
-
-However, more advanced use cases require the ability to respond to a message *later*
-("asynchronously", if you will). Our original API provided a *second* message handler interface
-called `nsq.AsyncHandler`.
-
-Unfortunately, it was never obvious from the name alone (or even the documentation) how to properly
-use this form. The API was needlessly complex, involving the garbage creation of wrapping structs
-to track state and respond to messages.
-
-We originally had the same problem in `pynsq`, our Python client library, and we were able to
-resolve the tension and expose an API that was robust and supported all use cases.
-
-The new `go-nsq` message handler interface exposes only `nsq.Handler`, and its `HandleMessage`
-method remains identical (specifically, `nsq.AsyncHandler` has been removed).
-
-Additionally, the API to configure handlers has been improved to provide better first-class support
-for common operations. We've added `AddConcurrentHandlers` (for quickly spawning multiple handler
-goroutines).
-
-For the most common use case, where you want `go-nsq` to respond to messages on your behalf, there
-are no changes required! In fact, we've made it even easier to implement the `nsq.Handler`
-interface for simple functions by providing the `nsq.HandlerFunc` type (in the spirit of the Go
-standard library's `http.HandlerFunc`):
-
-```go
-r, err := nsq.NewConsumer("test_topic", "test_channel", nsq.NewConfig())
-if err != nil {
-    log.Fatalf(err.Error())
-}
-
-r.AddHandler(nsq.HandlerFunc(func(m *nsq.Message) error {
-    return doSomeWork(m)
-})
-
-err := r.ConnectToNSQD(nsqdAddr)
-if err != nil {
-    log.Fatalf(err.Error())
-}
-
-<-r.StopChan
-```
-
-In the new API, we've made the `nsq.Message` struct more robust, giving it the ability to proxy
-responses. If you want to usurp control of the message from `go-nsq`, you simply call
-`msg.DisableAutoResponse()`.
-
-This is effectively the same as if you had used `nsq.AsyncHandler`, only you don't need to manage
-`nsq.FinishedMessage` structs or implement a separate interface. Instead you just keep/pass
-references to the `nsq.Message` itself, and when you're ready to respond you call `msg.Finish()`,
-`msg.Requeue(<duration>)` or `msg.Touch(<duration>)`.  Additionally, this means you can make this
-decision on a *per-message* basis rather than for the lifetime of the handler.
-
-Here is an example:
-
-```go
-type myHandler struct {}
-
-func (h *myHandler) HandleMessage(m *nsq.Message) error {
-    m.DisableAutoResponse()
-    workerChan <- m
-    return nil
-}
-
-go func() {
-    for m := range workerChan {
-        err := doSomeWork(m)
-        if err != nil {
-            m.Requeue(-1)
-            continue
-        }
-        m.Finish()
-    }
-}()
-
-cfg := nsq.NewConfig()
-cfg.MaxInFlight = 1000
-r, err := nsq.NewConsumer("test_topic", "test_channel", cfg)
-if err != nil {
-    log.Fatalf(err.Error())
-}
-r.AddConcurrentHandlers(&myHandler{}, 20)
-
-err := r.ConnectToNSQD(nsqdAddr)
-if err != nil {
-    log.Fatalf(err.Error())
-}
-
-<-r.StopChan
-```
-
-#### Requeue without backoff
-
-As a side effect of the message handler restructuring above, it is now trivial to respond to a
-message without triggering a backoff state in `nsq.Consumer` (which was not possible in the
-previous API).
-
-The `nsq.Message` type now has a `msg.RequeueWithoutBackoff()` method for this purpose.
-
-#### Producer Error Handling
-
-Previously, `Writer` (now `Producer`) returned a triplicate of `frameType`, `responseBody`, and
-`error` from calls to `*Publish`.
-
-This required the caller to check both `error` and `frameType` to confirm success. `Producer`
-publish methods now return only `error`.
-
-#### Logging
-
-One of the challenges library implementors face is how to provide feedback via logging, while
-exposing an interface that follows the standard library and still provides a means to control and
-configure the output.
-
-In the new API, we've provided a method on `Consumer` and `Producer` called `SetLogger` that takes
-an interface compatible with the Go standard library `log.Logger` (which can be instantiated via
-`log.NewLogger`) and a traditional log level integer `nsq.LogLevel{Debug,Info,Warning,Error}`:
-
-    Output(maxdepth int, s string) error
-
-This gives the user the flexibility to control the format, destination, and verbosity while still
-conforming to standard library logging conventions.
-
-#### Misc.
-
-Un-exported `NewDeadlineTransport` and `ApiRequest`, which never should have been exported in the
-first place.
-
-`nsq.Message` serialization switched away from `binary.{Read,Write}` for performance and
-`nsq.Message` now implements the `io.WriterTo` interface.
diff --git a/Godeps/_workspace/src/github.com/nsqio/go-nsq/api_request.go b/Godeps/_workspace/src/github.com/nsqio/go-nsq/api_request.go
deleted file mode 100644
index 2c0c8d63d..000000000
--- a/Godeps/_workspace/src/github.com/nsqio/go-nsq/api_request.go
+++ /dev/null
@@ -1,90 +0,0 @@
-package nsq
-
-import (
-	"encoding/json"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"net"
-	"net/http"
-	"time"
-)
-
-type deadlinedConn struct {
-	Timeout time.Duration
-	net.Conn
-}
-
-func (c *deadlinedConn) Read(b []byte) (n int, err error) {
-	c.Conn.SetReadDeadline(time.Now().Add(c.Timeout))
-	return c.Conn.Read(b)
-}
-
-func (c *deadlinedConn) Write(b []byte) (n int, err error) {
-	c.Conn.SetWriteDeadline(time.Now().Add(c.Timeout))
-	return c.Conn.Write(b)
-}
-
-func newDeadlineTransport(timeout time.Duration) *http.Transport {
-	transport := &http.Transport{
-		Dial: func(netw, addr string) (net.Conn, error) {
-			c, err := net.DialTimeout(netw, addr, timeout)
-			if err != nil {
-				return nil, err
-			}
-			return &deadlinedConn{timeout, c}, nil
-		},
-	}
-	return transport
-}
-
-type wrappedResp struct {
-	Status     string      `json:"status_txt"`
-	StatusCode int         `json:"status_code"`
-	Data       interface{} `json:"data"`
-}
-
-// stores the result in the value pointed to by ret(must be a pointer)
-func apiRequestNegotiateV1(method string, endpoint string, body io.Reader, ret interface{}) error {
-	httpclient := &http.Client{Transport: newDeadlineTransport(2 * time.Second)}
-	req, err := http.NewRequest(method, endpoint, body)
-	if err != nil {
-		return err
-	}
-
-	req.Header.Add("Accept", "application/vnd.nsq; version=1.0")
-
-	resp, err := httpclient.Do(req)
-	if err != nil {
-		return err
-	}
-
-	respBody, err := ioutil.ReadAll(resp.Body)
-	resp.Body.Close()
-	if err != nil {
-		return err
-	}
-
-	if resp.StatusCode != 200 {
-		return fmt.Errorf("got response %s %q", resp.Status, respBody)
-	}
-
-	if len(respBody) == 0 {
-		respBody = []byte("{}")
-	}
-
-	if resp.Header.Get("X-NSQ-Content-Type") == "nsq; version=1.0" {
-		return json.Unmarshal(respBody, ret)
-	}
-
-	wResp := &wrappedResp{
-		Data: ret,
-	}
-
-	if err = json.Unmarshal(respBody, wResp); err != nil {
-		return err
-	}
-
-	// wResp.StatusCode here is equal to resp.StatusCode, so ignore it
-	return nil
-}
diff --git a/Godeps/_workspace/src/github.com/nsqio/go-nsq/command.go b/Godeps/_workspace/src/github.com/nsqio/go-nsq/command.go
deleted file mode 100644
index 80e47436b..000000000
--- a/Godeps/_workspace/src/github.com/nsqio/go-nsq/command.go
+++ /dev/null
@@ -1,221 +0,0 @@
-package nsq
-
-import (
-	"bytes"
-	"encoding/binary"
-	"encoding/json"
-	"fmt"
-	"io"
-	"strconv"
-	"time"
-)
-
-var byteSpace = []byte(" ")
-var byteNewLine = []byte("\n")
-
-// Command represents a command from a client to an NSQ daemon
-type Command struct {
-	Name   []byte
-	Params [][]byte
-	Body   []byte
-}
-
-// String returns the name and parameters of the Command
-func (c *Command) String() string {
-	if len(c.Params) > 0 {
-		return fmt.Sprintf("%s %s", c.Name, string(bytes.Join(c.Params, byteSpace)))
-	}
-	return string(c.Name)
-}
-
-// WriteTo implements the WriterTo interface and
-// serializes the Command to the supplied Writer.
-//
-// It is suggested that the target Writer is buffered
-// to avoid performing many system calls.
-func (c *Command) WriteTo(w io.Writer) (int64, error) {
-	var total int64
-	var buf [4]byte
-
-	n, err := w.Write(c.Name)
-	total += int64(n)
-	if err != nil {
-		return total, err
-	}
-
-	for _, param := range c.Params {
-		n, err := w.Write(byteSpace)
-		total += int64(n)
-		if err != nil {
-			return total, err
-		}
-		n, err = w.Write(param)
-		total += int64(n)
-		if err != nil {
-			return total, err
-		}
-	}
-
-	n, err = w.Write(byteNewLine)
-	total += int64(n)
-	if err != nil {
-		return total, err
-	}
-
-	if c.Body != nil {
-		bufs := buf[:]
-		binary.BigEndian.PutUint32(bufs, uint32(len(c.Body)))
-		n, err := w.Write(bufs)
-		total += int64(n)
-		if err != nil {
-			return total, err
-		}
-		n, err = w.Write(c.Body)
-		total += int64(n)
-		if err != nil {
-			return total, err
-		}
-	}
-
-	return total, nil
-}
-
-// Identify creates a new Command to provide information about the client.  After connecting,
-// it is generally the first message sent.
-//
-// The supplied map is marshaled into JSON to provide some flexibility
-// for this command to evolve over time.
-//
-// See http://nsq.io/clients/tcp_protocol_spec.html#identify for information
-// on the supported options
-func Identify(js map[string]interface{}) (*Command, error) {
-	body, err := json.Marshal(js)
-	if err != nil {
-		return nil, err
-	}
-	return &Command{[]byte("IDENTIFY"), nil, body}, nil
-}
-
-// Auth sends credentials for authentication
-//
-// After `Identify`, this is usually the first message sent, if auth is used.
-func Auth(secret string) (*Command, error) {
-	return &Command{[]byte("AUTH"), nil, []byte(secret)}, nil
-}
-
-// Register creates a new Command to add a topic/channel for the connected nsqd
-func Register(topic string, channel string) *Command {
-	params := [][]byte{[]byte(topic)}
-	if len(channel) > 0 {
-		params = append(params, []byte(channel))
-	}
-	return &Command{[]byte("REGISTER"), params, nil}
-}
-
-// UnRegister creates a new Command to remove a topic/channel for the connected nsqd
-func UnRegister(topic string, channel string) *Command {
-	params := [][]byte{[]byte(topic)}
-	if len(channel) > 0 {
-		params = append(params, []byte(channel))
-	}
-	return &Command{[]byte("UNREGISTER"), params, nil}
-}
-
-// Ping creates a new Command to keep-alive the state of all the
-// announced topic/channels for a given client
-func Ping() *Command {
-	return &Command{[]byte("PING"), nil, nil}
-}
-
-// Publish creates a new Command to write a message to a given topic
-func Publish(topic string, body []byte) *Command {
-	var params = [][]byte{[]byte(topic)}
-	return &Command{[]byte("PUB"), params, body}
-}
-
-// DeferredPublish creates a new Command to write a message to a given topic
-// where the message will queue at the channel level until the timeout expires
-func DeferredPublish(topic string, delay time.Duration, body []byte) *Command {
-	var params = [][]byte{[]byte(topic), []byte(strconv.Itoa(int(delay / time.Millisecond)))}
-	return &Command{[]byte("DPUB"), params, body}
-}
-
-// MultiPublish creates a new Command to write more than one message to a given topic
-// (useful for high-throughput situations to avoid roundtrips and saturate the pipe)
-func MultiPublish(topic string, bodies [][]byte) (*Command, error) {
-	var params = [][]byte{[]byte(topic)}
-
-	num := uint32(len(bodies))
-	bodySize := 4
-	for _, b := range bodies {
-		bodySize += len(b) + 4
-	}
-	body := make([]byte, 0, bodySize)
-	buf := bytes.NewBuffer(body)
-
-	err := binary.Write(buf, binary.BigEndian, &num)
-	if err != nil {
-		return nil, err
-	}
-	for _, b := range bodies {
-		err = binary.Write(buf, binary.BigEndian, int32(len(b)))
-		if err != nil {
-			return nil, err
-		}
-		_, err = buf.Write(b)
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	return &Command{[]byte("MPUB"), params, buf.Bytes()}, nil
-}
-
-// Subscribe creates a new Command to subscribe to the given topic/channel
-func Subscribe(topic string, channel string) *Command {
-	var params = [][]byte{[]byte(topic), []byte(channel)}
-	return &Command{[]byte("SUB"), params, nil}
-}
-
-// Ready creates a new Command to specify
-// the number of messages a client is willing to receive
-func Ready(count int) *Command {
-	var params = [][]byte{[]byte(strconv.Itoa(count))}
-	return &Command{[]byte("RDY"), params, nil}
-}
-
-// Finish creates a new Command to indiciate that
-// a given message (by id) has been processed successfully
-func Finish(id MessageID) *Command {
-	var params = [][]byte{id[:]}
-	return &Command{[]byte("FIN"), params, nil}
-}
-
-// Requeue creates a new Command to indicate that
-// a given message (by id) should be requeued after the given delay
-// NOTE: a delay of 0 indicates immediate requeue
-func Requeue(id MessageID, delay time.Duration) *Command {
-	var params = [][]byte{id[:], []byte(strconv.Itoa(int(delay / time.Millisecond)))}
-	return &Command{[]byte("REQ"), params, nil}
-}
-
-// Touch creates a new Command to reset the timeout for
-// a given message (by id)
-func Touch(id MessageID) *Command {
-	var params = [][]byte{id[:]}
-	return &Command{[]byte("TOUCH"), params, nil}
-}
-
-// StartClose creates a new Command to indicate that the
-// client would like to start a close cycle.  nsqd will no longer
-// send messages to a client in this state and the client is expected
-// finish pending messages and close the connection
-func StartClose() *Command {
-	return &Command{[]byte("CLS"), nil, nil}
-}
-
-// Nop creates a new Command that has no effect server side.
-// Commonly used to respond to heartbeats
-func Nop() *Command {
-	return &Command{[]byte("NOP"), nil, nil}
-}
diff --git a/Godeps/_workspace/src/github.com/nsqio/go-nsq/config.go b/Godeps/_workspace/src/github.com/nsqio/go-nsq/config.go
deleted file mode 100644
index 1a39f9f89..000000000
--- a/Godeps/_workspace/src/github.com/nsqio/go-nsq/config.go
+++ /dev/null
@@ -1,670 +0,0 @@
-package nsq
-
-import (
-	"crypto/tls"
-	"crypto/x509"
-	"errors"
-	"fmt"
-	"io/ioutil"
-	"log"
-	"math"
-	"math/rand"
-	"net"
-	"os"
-	"reflect"
-	"strconv"
-	"strings"
-	"sync"
-	"time"
-	"unsafe"
-)
-
-// Define handlers for setting config defaults, and setting config values from command line arguments or config files
-type configHandler interface {
-	HandlesOption(c *Config, option string) bool
-	Set(c *Config, option string, value interface{}) error
-	Validate(c *Config) error
-}
-
-type defaultsHandler interface {
-	SetDefaults(c *Config) error
-}
-
-// BackoffStrategy defines a strategy for calculating the duration of time
-// a consumer should backoff for a given attempt
-type BackoffStrategy interface {
-	Calculate(attempt int) time.Duration
-}
-
-// ExponentialStrategy implements an exponential backoff strategy (default)
-type ExponentialStrategy struct {
-	cfg *Config
-}
-
-// Calculate returns a duration of time: 2 ^ attempt
-func (s *ExponentialStrategy) Calculate(attempt int) time.Duration {
-	backoffDuration := s.cfg.BackoffMultiplier *
-		time.Duration(math.Pow(2, float64(attempt)))
-	return backoffDuration
-}
-
-func (s *ExponentialStrategy) setConfig(cfg *Config) {
-	s.cfg = cfg
-}
-
-// FullJitterStrategy implements http://www.awsarchitectureblog.com/2015/03/backoff.html
-type FullJitterStrategy struct {
-	cfg *Config
-
-	rngOnce sync.Once
-	rng     *rand.Rand
-}
-
-// Calculate returns a random duration of time [0, 2 ^ attempt]
-func (s *FullJitterStrategy) Calculate(attempt int) time.Duration {
-	// lazily initialize the RNG
-	s.rngOnce.Do(func() {
-		if s.rng != nil {
-			return
-		}
-		s.rng = rand.New(rand.NewSource(time.Now().UnixNano()))
-	})
-
-	backoffDuration := s.cfg.BackoffMultiplier *
-		time.Duration(math.Pow(2, float64(attempt)))
-	return time.Duration(s.rng.Intn(int(backoffDuration)))
-}
-
-func (s *FullJitterStrategy) setConfig(cfg *Config) {
-	s.cfg = cfg
-}
-
-// Config is a struct of NSQ options
-//
-// The only valid way to create a Config is via NewConfig, using a struct literal will panic.
-// After Config is passed into a high-level type (like Consumer, Producer, etc.) the values are no
-// longer mutable (they are copied).
-//
-// Use Set(option string, value interface{}) as an alternate way to set parameters
-type Config struct {
-	initialized bool
-
-	// used to Initialize, Validate
-	configHandlers []configHandler
-
-	DialTimeout time.Duration `opt:"dial_timeout" default:"1s"`
-
-	// Deadlines for network reads and writes
-	ReadTimeout  time.Duration `opt:"read_timeout" min:"100ms" max:"5m" default:"60s"`
-	WriteTimeout time.Duration `opt:"write_timeout" min:"100ms" max:"5m" default:"1s"`
-
-	// LocalAddr is the local address to use when dialing an nsqd.
-	// If empty, a local address is automatically chosen.
-	LocalAddr net.Addr `opt:"local_addr"`
-
-	// Duration between polling lookupd for new producers, and fractional jitter to add to
-	// the lookupd pool loop. this helps evenly distribute requests even if multiple consumers
-	// restart at the same time
-	//
-	// NOTE: when not using nsqlookupd, LookupdPollInterval represents the duration of time between
-	// reconnection attempts
-	LookupdPollInterval time.Duration `opt:"lookupd_poll_interval" min:"10ms" max:"5m" default:"60s"`
-	LookupdPollJitter   float64       `opt:"lookupd_poll_jitter" min:"0" max:"1" default:"0.3"`
-
-	// Maximum duration when REQueueing (for doubling of deferred requeue)
-	MaxRequeueDelay     time.Duration `opt:"max_requeue_delay" min:"0" max:"60m" default:"15m"`
-	DefaultRequeueDelay time.Duration `opt:"default_requeue_delay" min:"0" max:"60m" default:"90s"`
-
-	// Backoff strategy, defaults to exponential backoff. Overwrite this to define alternative backoff algrithms.
-	BackoffStrategy BackoffStrategy `opt:"backoff_strategy" default:"exponential"`
-	// Maximum amount of time to backoff when processing fails 0 == no backoff
-	MaxBackoffDuration time.Duration `opt:"max_backoff_duration" min:"0" max:"60m" default:"2m"`
-	// Unit of time for calculating consumer backoff
-	BackoffMultiplier time.Duration `opt:"backoff_multiplier" min:"0" max:"60m" default:"1s"`
-
-	// Maximum number of times this consumer will attempt to process a message before giving up
-	MaxAttempts uint16 `opt:"max_attempts" min:"0" max:"65535" default:"5"`
-
-	// Duration to wait for a message from a producer when in a state where RDY
-	// counts are re-distributed (ie. max_in_flight < num_producers)
-	LowRdyIdleTimeout time.Duration `opt:"low_rdy_idle_timeout" min:"1s" max:"5m" default:"10s"`
-
-	// Duration between redistributing max-in-flight to connections
-	RDYRedistributeInterval time.Duration `opt:"rdy_redistribute_interval" min:"1ms" max:"5s" default:"5s"`
-
-	// Identifiers sent to nsqd representing this client
-	// UserAgent is in the spirit of HTTP (default: "<client_library_name>/<version>")
-	ClientID  string `opt:"client_id"` // (defaults: short hostname)
-	Hostname  string `opt:"hostname"`
-	UserAgent string `opt:"user_agent"`
-
-	// Duration of time between heartbeats. This must be less than ReadTimeout
-	HeartbeatInterval time.Duration `opt:"heartbeat_interval" default:"30s"`
-	// Integer percentage to sample the channel (requires nsqd 0.2.25+)
-	SampleRate int32 `opt:"sample_rate" min:"0" max:"99"`
-
-	// To set TLS config, use the following options:
-	//
-	// tls_v1 - Bool enable TLS negotiation
-	// tls_root_ca_file - String path to file containing root CA
-	// tls_insecure_skip_verify - Bool indicates whether this client should verify server certificates
-	// tls_cert - String path to file containing public key for certificate
-	// tls_key - String path to file containing private key for certificate
-	// tls_min_version - String indicating the minimum version of tls acceptable ('ssl3.0', 'tls1.0', 'tls1.1', 'tls1.2')
-	//
-	TlsV1     bool        `opt:"tls_v1"`
-	TlsConfig *tls.Config `opt:"tls_config"`
-
-	// Compression Settings
-	Deflate      bool `opt:"deflate"`
-	DeflateLevel int  `opt:"deflate_level" min:"1" max:"9" default:"6"`
-	Snappy       bool `opt:"snappy"`
-
-	// Size of the buffer (in bytes) used by nsqd for buffering writes to this connection
-	OutputBufferSize int64 `opt:"output_buffer_size" default:"16384"`
-	// Timeout used by nsqd before flushing buffered writes (set to 0 to disable).
-	//
-	// WARNING: configuring clients with an extremely low
-	// (< 25ms) output_buffer_timeout has a significant effect
-	// on nsqd CPU usage (particularly with > 50 clients connected).
-	OutputBufferTimeout time.Duration `opt:"output_buffer_timeout" default:"250ms"`
-
-	// Maximum number of messages to allow in flight (concurrency knob)
-	MaxInFlight int `opt:"max_in_flight" min:"0" default:"1"`
-
-	// The server-side message timeout for messages delivered to this client
-	MsgTimeout time.Duration `opt:"msg_timeout" min:"0"`
-
-	// secret for nsqd authentication (requires nsqd 0.2.29+)
-	AuthSecret string `opt:"auth_secret"`
-}
-
-// NewConfig returns a new default nsq configuration.
-//
-// This must be used to initialize Config structs. Values can be set directly, or through Config.Set()
-func NewConfig() *Config {
-	c := &Config{
-		configHandlers: []configHandler{&structTagsConfig{}, &tlsConfig{}},
-		initialized:    true,
-	}
-	if err := c.setDefaults(); err != nil {
-		panic(err.Error())
-	}
-	return c
-}
-
-// Set takes an option as a string and a value as an interface and
-// attempts to set the appropriate configuration option.
-//
-// It attempts to coerce the value into the right format depending on the named
-// option and the underlying type of the value passed in.
-//
-// Calls to Set() that take a time.Duration as an argument can be input as:
-//
-// 	"1000ms" (a string parsed by time.ParseDuration())
-// 	1000 (an integer interpreted as milliseconds)
-// 	1000*time.Millisecond (a literal time.Duration value)
-//
-// Calls to Set() that take bool can be input as:
-//
-// 	"true" (a string parsed by strconv.ParseBool())
-// 	true (a boolean)
-// 	1 (an int where 1 == true and 0 == false)
-//
-// It returns an error for an invalid option or value.
-func (c *Config) Set(option string, value interface{}) error {
-	c.assertInitialized()
-	option = strings.Replace(option, "-", "_", -1)
-	for _, h := range c.configHandlers {
-		if h.HandlesOption(c, option) {
-			return h.Set(c, option, value)
-		}
-	}
-	return fmt.Errorf("invalid option %s", option)
-}
-
-func (c *Config) assertInitialized() {
-	if !c.initialized {
-		panic("Config{} must be created with NewConfig()")
-	}
-}
-
-// Validate checks that all values are within specified min/max ranges
-func (c *Config) Validate() error {
-	c.assertInitialized()
-	for _, h := range c.configHandlers {
-		if err := h.Validate(c); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func (c *Config) setDefaults() error {
-	for _, h := range c.configHandlers {
-		hh, ok := h.(defaultsHandler)
-		if ok {
-			if err := hh.SetDefaults(c); err != nil {
-				return err
-			}
-		}
-	}
-	return nil
-}
-
-type structTagsConfig struct{}
-
-// Handle options that are listed in StructTags
-func (h *structTagsConfig) HandlesOption(c *Config, option string) bool {
-	val := reflect.ValueOf(c).Elem()
-	typ := val.Type()
-	for i := 0; i < typ.NumField(); i++ {
-		field := typ.Field(i)
-		opt := field.Tag.Get("opt")
-		if opt == option {
-			return true
-		}
-	}
-	return false
-}
-
-// Set values based on parameters in StructTags
-func (h *structTagsConfig) Set(c *Config, option string, value interface{}) error {
-	val := reflect.ValueOf(c).Elem()
-	typ := val.Type()
-	for i := 0; i < typ.NumField(); i++ {
-		field := typ.Field(i)
-		opt := field.Tag.Get("opt")
-
-		if option != opt {
-			continue
-		}
-
-		min := field.Tag.Get("min")
-		max := field.Tag.Get("max")
-
-		fieldVal := val.FieldByName(field.Name)
-		dest := unsafeValueOf(fieldVal)
-		coercedVal, err := coerce(value, field.Type)
-		if err != nil {
-			return fmt.Errorf("failed to coerce option %s (%v) - %s",
-				option, value, err)
-		}
-		if min != "" {
-			coercedMinVal, _ := coerce(min, field.Type)
-			if valueCompare(coercedVal, coercedMinVal) == -1 {
-				return fmt.Errorf("invalid %s ! %v < %v",
-					option, coercedVal.Interface(), coercedMinVal.Interface())
-			}
-		}
-		if max != "" {
-			coercedMaxVal, _ := coerce(max, field.Type)
-			if valueCompare(coercedVal, coercedMaxVal) == 1 {
-				return fmt.Errorf("invalid %s ! %v > %v",
-					option, coercedVal.Interface(), coercedMaxVal.Interface())
-			}
-		}
-		if coercedVal.Type().String() == "nsq.BackoffStrategy" {
-			v := coercedVal.Interface().(BackoffStrategy)
-			if v, ok := v.(interface {
-				setConfig(*Config)
-			}); ok {
-				v.setConfig(c)
-			}
-		}
-		dest.Set(coercedVal)
-		return nil
-	}
-	return fmt.Errorf("unknown option %s", option)
-}
-
-func (h *structTagsConfig) SetDefaults(c *Config) error {
-	val := reflect.ValueOf(c).Elem()
-	typ := val.Type()
-	for i := 0; i < typ.NumField(); i++ {
-		field := typ.Field(i)
-		opt := field.Tag.Get("opt")
-		defaultVal := field.Tag.Get("default")
-		if defaultVal == "" || opt == "" {
-			continue
-		}
-
-		if err := c.Set(opt, defaultVal); err != nil {
-			return err
-		}
-	}
-
-	hostname, err := os.Hostname()
-	if err != nil {
-		log.Fatalf("ERROR: unable to get hostname %s", err.Error())
-	}
-
-	c.ClientID = strings.Split(hostname, ".")[0]
-	c.Hostname = hostname
-	c.UserAgent = fmt.Sprintf("go-nsq/%s", VERSION)
-	return nil
-}
-
-func (h *structTagsConfig) Validate(c *Config) error {
-	val := reflect.ValueOf(c).Elem()
-	typ := val.Type()
-	for i := 0; i < typ.NumField(); i++ {
-		field := typ.Field(i)
-
-		min := field.Tag.Get("min")
-		max := field.Tag.Get("max")
-
-		if min == "" && max == "" {
-			continue
-		}
-
-		value := val.FieldByName(field.Name)
-
-		if min != "" {
-			coercedMinVal, _ := coerce(min, field.Type)
-			if valueCompare(value, coercedMinVal) == -1 {
-				return fmt.Errorf("invalid %s ! %v < %v",
-					field.Name, value.Interface(), coercedMinVal.Interface())
-			}
-		}
-		if max != "" {
-			coercedMaxVal, _ := coerce(max, field.Type)
-			if valueCompare(value, coercedMaxVal) == 1 {
-				return fmt.Errorf("invalid %s ! %v > %v",
-					field.Name, value.Interface(), coercedMaxVal.Interface())
-			}
-		}
-	}
-
-	if c.HeartbeatInterval > c.ReadTimeout {
-		return fmt.Errorf("HeartbeatInterval %v must be less than ReadTimeout %v", c.HeartbeatInterval, c.ReadTimeout)
-	}
-
-	return nil
-}
-
-// Parsing for higher order TLS settings
-type tlsConfig struct {
-	certFile string
-	keyFile  string
-}
-
-func (t *tlsConfig) HandlesOption(c *Config, option string) bool {
-	switch option {
-	case "tls_root_ca_file", "tls_insecure_skip_verify", "tls_cert", "tls_key", "tls_min_version":
-		return true
-	}
-	return false
-}
-
-func (t *tlsConfig) Set(c *Config, option string, value interface{}) error {
-	if c.TlsConfig == nil {
-		c.TlsConfig = &tls.Config{
-			MinVersion: tls.VersionTLS10,
-			MaxVersion: tls.VersionTLS12, // enable TLS_FALLBACK_SCSV prior to Go 1.5: https://go-review.googlesource.com/#/c/1776/
-		}
-	}
-	val := reflect.ValueOf(c.TlsConfig).Elem()
-
-	switch option {
-	case "tls_cert", "tls_key":
-		if option == "tls_cert" {
-			t.certFile = value.(string)
-		} else {
-			t.keyFile = value.(string)
-		}
-		if t.certFile != "" && t.keyFile != "" && len(c.TlsConfig.Certificates) == 0 {
-			cert, err := tls.LoadX509KeyPair(t.certFile, t.keyFile)
-			if err != nil {
-				return err
-			}
-			c.TlsConfig.Certificates = []tls.Certificate{cert}
-		}
-		return nil
-	case "tls_root_ca_file":
-		filename, ok := value.(string)
-		if !ok {
-			return fmt.Errorf("ERROR: %v is not a string", value)
-		}
-		tlsCertPool := x509.NewCertPool()
-		caCertFile, err := ioutil.ReadFile(filename)
-		if err != nil {
-			return fmt.Errorf("ERROR: failed to read custom Certificate Authority file %s", err)
-		}
-		if !tlsCertPool.AppendCertsFromPEM(caCertFile) {
-			return fmt.Errorf("ERROR: failed to append certificates from Certificate Authority file")
-		}
-		c.TlsConfig.RootCAs = tlsCertPool
-		return nil
-	case "tls_insecure_skip_verify":
-		fieldVal := val.FieldByName("InsecureSkipVerify")
-		dest := unsafeValueOf(fieldVal)
-		coercedVal, err := coerce(value, fieldVal.Type())
-		if err != nil {
-			return fmt.Errorf("failed to coerce option %s (%v) - %s",
-				option, value, err)
-		}
-		dest.Set(coercedVal)
-		return nil
-	case "tls_min_version":
-		version, ok := value.(string)
-		if !ok {
-			return fmt.Errorf("ERROR: %v is not a string", value)
-		}
-		switch version {
-		case "ssl3.0":
-			c.TlsConfig.MinVersion = tls.VersionSSL30
-		case "tls1.0":
-			c.TlsConfig.MinVersion = tls.VersionTLS10
-		case "tls1.1":
-			c.TlsConfig.MinVersion = tls.VersionTLS11
-		case "tls1.2":
-			c.TlsConfig.MinVersion = tls.VersionTLS12
-		default:
-			return fmt.Errorf("ERROR: %v is not a tls version", value)
-		}
-		return nil
-	}
-
-	return fmt.Errorf("unknown option %s", option)
-}
-
-func (t *tlsConfig) Validate(c *Config) error {
-	return nil
-}
-
-// because Config contains private structs we can't use reflect.Value
-// directly, instead we need to "unsafely" address the variable
-func unsafeValueOf(val reflect.Value) reflect.Value {
-	uptr := unsafe.Pointer(val.UnsafeAddr())
-	return reflect.NewAt(val.Type(), uptr).Elem()
-}
-
-func valueCompare(v1 reflect.Value, v2 reflect.Value) int {
-	switch v1.Type().String() {
-	case "int", "int16", "int32", "int64":
-		if v1.Int() > v2.Int() {
-			return 1
-		} else if v1.Int() < v2.Int() {
-			return -1
-		}
-		return 0
-	case "uint", "uint16", "uint32", "uint64":
-		if v1.Uint() > v2.Uint() {
-			return 1
-		} else if v1.Uint() < v2.Uint() {
-			return -1
-		}
-		return 0
-	case "float32", "float64":
-		if v1.Float() > v2.Float() {
-			return 1
-		} else if v1.Float() < v2.Float() {
-			return -1
-		}
-		return 0
-	case "time.Duration":
-		if v1.Interface().(time.Duration) > v2.Interface().(time.Duration) {
-			return 1
-		} else if v1.Interface().(time.Duration) < v2.Interface().(time.Duration) {
-			return -1
-		}
-		return 0
-	}
-	panic("impossible")
-}
-
-func coerce(v interface{}, typ reflect.Type) (reflect.Value, error) {
-	var err error
-	if typ.Kind() == reflect.Ptr {
-		return reflect.ValueOf(v), nil
-	}
-	switch typ.String() {
-	case "string":
-		v, err = coerceString(v)
-	case "int", "int16", "int32", "int64":
-		v, err = coerceInt64(v)
-	case "uint", "uint16", "uint32", "uint64":
-		v, err = coerceUint64(v)
-	case "float32", "float64":
-		v, err = coerceFloat64(v)
-	case "bool":
-		v, err = coerceBool(v)
-	case "time.Duration":
-		v, err = coerceDuration(v)
-	case "net.Addr":
-		v, err = coerceAddr(v)
-	case "nsq.BackoffStrategy":
-		v, err = coerceBackoffStrategy(v)
-	default:
-		v = nil
-		err = fmt.Errorf("invalid type %s", typ.String())
-	}
-	return valueTypeCoerce(v, typ), err
-}
-
-func valueTypeCoerce(v interface{}, typ reflect.Type) reflect.Value {
-	val := reflect.ValueOf(v)
-	if reflect.TypeOf(v) == typ {
-		return val
-	}
-	tval := reflect.New(typ).Elem()
-	switch typ.String() {
-	case "int", "int16", "int32", "int64":
-		tval.SetInt(val.Int())
-	case "uint", "uint16", "uint32", "uint64":
-		tval.SetUint(val.Uint())
-	case "float32", "float64":
-		tval.SetFloat(val.Float())
-	default:
-		tval.Set(val)
-	}
-	return tval
-}
-
-func coerceString(v interface{}) (string, error) {
-	switch v := v.(type) {
-	case string:
-		return v, nil
-	case int, int16, int32, int64, uint, uint16, uint32, uint64:
-		return fmt.Sprintf("%d", v), nil
-	case float32, float64:
-		return fmt.Sprintf("%f", v), nil
-	}
-	return fmt.Sprintf("%s", v), nil
-}
-
-func coerceDuration(v interface{}) (time.Duration, error) {
-	switch v := v.(type) {
-	case string:
-		return time.ParseDuration(v)
-	case int, int16, int32, int64:
-		// treat like ms
-		return time.Duration(reflect.ValueOf(v).Int()) * time.Millisecond, nil
-	case uint, uint16, uint32, uint64:
-		// treat like ms
-		return time.Duration(reflect.ValueOf(v).Uint()) * time.Millisecond, nil
-	case time.Duration:
-		return v, nil
-	}
-	return 0, errors.New("invalid value type")
-}
-
-func coerceAddr(v interface{}) (net.Addr, error) {
-	switch v := v.(type) {
-	case string:
-		return net.ResolveTCPAddr("tcp", v)
-	case net.Addr:
-		return v, nil
-	}
-	return nil, errors.New("invalid value type")
-}
-
-func coerceBackoffStrategy(v interface{}) (BackoffStrategy, error) {
-	switch v := v.(type) {
-	case string:
-		switch v {
-		case "", "exponential":
-			return &ExponentialStrategy{}, nil
-		case "full_jitter":
-			return &FullJitterStrategy{}, nil
-		}
-	case BackoffStrategy:
-		return v, nil
-	}
-	return nil, errors.New("invalid value type")
-}
-
-func coerceBool(v interface{}) (bool, error) {
-	switch v := v.(type) {
-	case bool:
-		return v, nil
-	case string:
-		return strconv.ParseBool(v)
-	case int, int16, int32, int64:
-		return reflect.ValueOf(v).Int() != 0, nil
-	case uint, uint16, uint32, uint64:
-		return reflect.ValueOf(v).Uint() != 0, nil
-	}
-	return false, errors.New("invalid value type")
-}
-
-func coerceFloat64(v interface{}) (float64, error) {
-	switch v := v.(type) {
-	case string:
-		return strconv.ParseFloat(v, 64)
-	case int, int16, int32, int64:
-		return float64(reflect.ValueOf(v).Int()), nil
-	case uint, uint16, uint32, uint64:
-		return float64(reflect.ValueOf(v).Uint()), nil
-	case float32:
-		return float64(v), nil
-	case float64:
-		return v, nil
-	}
-	return 0, errors.New("invalid value type")
-}
-
-func coerceInt64(v interface{}) (int64, error) {
-	switch v := v.(type) {
-	case string:
-		return strconv.ParseInt(v, 10, 64)
-	case int, int16, int32, int64:
-		return reflect.ValueOf(v).Int(), nil
-	case uint, uint16, uint32, uint64:
-		return int64(reflect.ValueOf(v).Uint()), nil
-	}
-	return 0, errors.New("invalid value type")
-}
-
-func coerceUint64(v interface{}) (uint64, error) {
-	switch v := v.(type) {
-	case string:
-		return strconv.ParseUint(v, 10, 64)
-	case int, int16, int32, int64:
-		return uint64(reflect.ValueOf(v).Int()), nil
-	case uint, uint16, uint32, uint64:
-		return reflect.ValueOf(v).Uint(), nil
-	}
-	return 0, errors.New("invalid value type")
-}
diff --git a/Godeps/_workspace/src/github.com/nsqio/go-nsq/config_flag.go b/Godeps/_workspace/src/github.com/nsqio/go-nsq/config_flag.go
deleted file mode 100644
index 037da188f..000000000
--- a/Godeps/_workspace/src/github.com/nsqio/go-nsq/config_flag.go
+++ /dev/null
@@ -1,31 +0,0 @@
-package nsq
-
-import (
-	"strings"
-)
-
-// ConfigFlag wraps a Config and implements the flag.Value interface
-type ConfigFlag struct {
-	*Config
-}
-
-// Set takes a comma separated value and follows the rules in Config.Set
-// using the first field as the option key, and the second (if present) as the value
-func (c *ConfigFlag) Set(opt string) (err error) {
-	parts := strings.SplitN(opt, ",", 2)
-	key := parts[0]
-
-	switch len(parts) {
-	case 1:
-		// default options specified without a value to boolean true
-		err = c.Config.Set(key, true)
-	case 2:
-		err = c.Config.Set(key, parts[1])
-	}
-	return
-}
-
-// String implements the flag.Value interface
-func (c *ConfigFlag) String() string {
-	return ""
-}
diff --git a/Godeps/_workspace/src/github.com/nsqio/go-nsq/conn.go b/Godeps/_workspace/src/github.com/nsqio/go-nsq/conn.go
deleted file mode 100644
index 2f525b03d..000000000
--- a/Godeps/_workspace/src/github.com/nsqio/go-nsq/conn.go
+++ /dev/null
@@ -1,723 +0,0 @@
-package nsq
-
-import (
-	"bufio"
-	"bytes"
-	"compress/flate"
-	"crypto/tls"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"io"
-	"net"
-	"strings"
-	"sync"
-	"sync/atomic"
-	"time"
-
-	"github.com/mreiferson/go-snappystream"
-)
-
-// IdentifyResponse represents the metadata
-// returned from an IDENTIFY command to nsqd
-type IdentifyResponse struct {
-	MaxRdyCount  int64 `json:"max_rdy_count"`
-	TLSv1        bool  `json:"tls_v1"`
-	Deflate      bool  `json:"deflate"`
-	Snappy       bool  `json:"snappy"`
-	AuthRequired bool  `json:"auth_required"`
-}
-
-// AuthResponse represents the metadata
-// returned from an AUTH command to nsqd
-type AuthResponse struct {
-	Identity        string `json:"identity"`
-	IdentityUrl     string `json:"identity_url"`
-	PermissionCount int64  `json:"permission_count"`
-}
-
-type msgResponse struct {
-	msg     *Message
-	cmd     *Command
-	success bool
-	backoff bool
-}
-
-// Conn represents a connection to nsqd
-//
-// Conn exposes a set of callbacks for the
-// various events that occur on a connection
-type Conn struct {
-	// 64bit atomic vars need to be first for proper alignment on 32bit platforms
-	messagesInFlight int64
-	maxRdyCount      int64
-	rdyCount         int64
-	lastRdyCount     int64
-	lastMsgTimestamp int64
-
-	mtx sync.Mutex
-
-	config *Config
-
-	conn    *net.TCPConn
-	tlsConn *tls.Conn
-	addr    string
-
-	delegate ConnDelegate
-
-	logger   logger
-	logLvl   LogLevel
-	logFmt   string
-	logGuard sync.RWMutex
-
-	r io.Reader
-	w io.Writer
-
-	cmdChan         chan *Command
-	msgResponseChan chan *msgResponse
-	exitChan        chan int
-	drainReady      chan int
-
-	closeFlag int32
-	stopper   sync.Once
-	wg        sync.WaitGroup
-
-	readLoopRunning int32
-}
-
-// NewConn returns a new Conn instance
-func NewConn(addr string, config *Config, delegate ConnDelegate) *Conn {
-	if !config.initialized {
-		panic("Config must be created with NewConfig()")
-	}
-	return &Conn{
-		addr: addr,
-
-		config:   config,
-		delegate: delegate,
-
-		maxRdyCount:      2500,
-		lastMsgTimestamp: time.Now().UnixNano(),
-
-		cmdChan:         make(chan *Command),
-		msgResponseChan: make(chan *msgResponse),
-		exitChan:        make(chan int),
-		drainReady:      make(chan int),
-	}
-}
-
-// SetLogger assigns the logger to use as well as a level.
-//
-// The format parameter is expected to be a printf compatible string with
-// a single %s argument.  This is useful if you want to provide additional
-// context to the log messages that the connection will print, the default
-// is '(%s)'.
-//
-// The logger parameter is an interface that requires the following
-// method to be implemented (such as the the stdlib log.Logger):
-//
-//    Output(calldepth int, s string)
-//
-func (c *Conn) SetLogger(l logger, lvl LogLevel, format string) {
-	c.logGuard.Lock()
-	defer c.logGuard.Unlock()
-
-	c.logger = l
-	c.logLvl = lvl
-	c.logFmt = format
-	if c.logFmt == "" {
-		c.logFmt = "(%s)"
-	}
-}
-
-func (c *Conn) getLogger() (logger, LogLevel, string) {
-	c.logGuard.RLock()
-	defer c.logGuard.RUnlock()
-
-	return c.logger, c.logLvl, c.logFmt
-}
-
-// Connect dials and bootstraps the nsqd connection
-// (including IDENTIFY) and returns the IdentifyResponse
-func (c *Conn) Connect() (*IdentifyResponse, error) {
-	dialer := &net.Dialer{
-		LocalAddr: c.config.LocalAddr,
-		Timeout:   c.config.DialTimeout,
-	}
-
-	conn, err := dialer.Dial("tcp", c.addr)
-	if err != nil {
-		return nil, err
-	}
-	c.conn = conn.(*net.TCPConn)
-	c.r = conn
-	c.w = conn
-
-	_, err = c.Write(MagicV2)
-	if err != nil {
-		c.Close()
-		return nil, fmt.Errorf("[%s] failed to write magic - %s", c.addr, err)
-	}
-
-	resp, err := c.identify()
-	if err != nil {
-		return nil, err
-	}
-
-	if resp != nil && resp.AuthRequired {
-		if c.config.AuthSecret == "" {
-			c.log(LogLevelError, "Auth Required")
-			return nil, errors.New("Auth Required")
-		}
-		err := c.auth(c.config.AuthSecret)
-		if err != nil {
-			c.log(LogLevelError, "Auth Failed %s", err)
-			return nil, err
-		}
-	}
-
-	c.wg.Add(2)
-	atomic.StoreInt32(&c.readLoopRunning, 1)
-	go c.readLoop()
-	go c.writeLoop()
-	return resp, nil
-}
-
-// Close idempotently initiates connection close
-func (c *Conn) Close() error {
-	atomic.StoreInt32(&c.closeFlag, 1)
-	if c.conn != nil && atomic.LoadInt64(&c.messagesInFlight) == 0 {
-		return c.conn.CloseRead()
-	}
-	return nil
-}
-
-// IsClosing indicates whether or not the
-// connection is currently in the processing of
-// gracefully closing
-func (c *Conn) IsClosing() bool {
-	return atomic.LoadInt32(&c.closeFlag) == 1
-}
-
-// RDY returns the current RDY count
-func (c *Conn) RDY() int64 {
-	return atomic.LoadInt64(&c.rdyCount)
-}
-
-// LastRDY returns the previously set RDY count
-func (c *Conn) LastRDY() int64 {
-	return atomic.LoadInt64(&c.lastRdyCount)
-}
-
-// SetRDY stores the specified RDY count
-func (c *Conn) SetRDY(rdy int64) {
-	atomic.StoreInt64(&c.rdyCount, rdy)
-	atomic.StoreInt64(&c.lastRdyCount, rdy)
-}
-
-// MaxRDY returns the nsqd negotiated maximum
-// RDY count that it will accept for this connection
-func (c *Conn) MaxRDY() int64 {
-	return c.maxRdyCount
-}
-
-// LastMessageTime returns a time.Time representing
-// the time at which the last message was received
-func (c *Conn) LastMessageTime() time.Time {
-	return time.Unix(0, atomic.LoadInt64(&c.lastMsgTimestamp))
-}
-
-// RemoteAddr returns the configured destination nsqd address
-func (c *Conn) RemoteAddr() net.Addr {
-	return c.conn.RemoteAddr()
-}
-
-// String returns the fully-qualified address
-func (c *Conn) String() string {
-	return c.addr
-}
-
-// Read performs a deadlined read on the underlying TCP connection
-func (c *Conn) Read(p []byte) (int, error) {
-	c.conn.SetReadDeadline(time.Now().Add(c.config.ReadTimeout))
-	return c.r.Read(p)
-}
-
-// Write performs a deadlined write on the underlying TCP connection
-func (c *Conn) Write(p []byte) (int, error) {
-	c.conn.SetWriteDeadline(time.Now().Add(c.config.WriteTimeout))
-	return c.w.Write(p)
-}
-
-// WriteCommand is a goroutine safe method to write a Command
-// to this connection, and flush.
-func (c *Conn) WriteCommand(cmd *Command) error {
-	c.mtx.Lock()
-
-	_, err := cmd.WriteTo(c)
-	if err != nil {
-		goto exit
-	}
-	err = c.Flush()
-
-exit:
-	c.mtx.Unlock()
-	if err != nil {
-		c.log(LogLevelError, "IO error - %s", err)
-		c.delegate.OnIOError(c, err)
-	}
-	return err
-}
-
-type flusher interface {
-	Flush() error
-}
-
-// Flush writes all buffered data to the underlying TCP connection
-func (c *Conn) Flush() error {
-	if f, ok := c.w.(flusher); ok {
-		return f.Flush()
-	}
-	return nil
-}
-
-func (c *Conn) identify() (*IdentifyResponse, error) {
-	ci := make(map[string]interface{})
-	ci["client_id"] = c.config.ClientID
-	ci["hostname"] = c.config.Hostname
-	ci["user_agent"] = c.config.UserAgent
-	ci["short_id"] = c.config.ClientID // deprecated
-	ci["long_id"] = c.config.Hostname  // deprecated
-	ci["tls_v1"] = c.config.TlsV1
-	ci["deflate"] = c.config.Deflate
-	ci["deflate_level"] = c.config.DeflateLevel
-	ci["snappy"] = c.config.Snappy
-	ci["feature_negotiation"] = true
-	if c.config.HeartbeatInterval == -1 {
-		ci["heartbeat_interval"] = -1
-	} else {
-		ci["heartbeat_interval"] = int64(c.config.HeartbeatInterval / time.Millisecond)
-	}
-	ci["sample_rate"] = c.config.SampleRate
-	ci["output_buffer_size"] = c.config.OutputBufferSize
-	if c.config.OutputBufferTimeout == -1 {
-		ci["output_buffer_timeout"] = -1
-	} else {
-		ci["output_buffer_timeout"] = int64(c.config.OutputBufferTimeout / time.Millisecond)
-	}
-	ci["msg_timeout"] = int64(c.config.MsgTimeout / time.Millisecond)
-	cmd, err := Identify(ci)
-	if err != nil {
-		return nil, ErrIdentify{err.Error()}
-	}
-
-	err = c.WriteCommand(cmd)
-	if err != nil {
-		return nil, ErrIdentify{err.Error()}
-	}
-
-	frameType, data, err := ReadUnpackedResponse(c)
-	if err != nil {
-		return nil, ErrIdentify{err.Error()}
-	}
-
-	if frameType == FrameTypeError {
-		return nil, ErrIdentify{string(data)}
-	}
-
-	// check to see if the server was able to respond w/ capabilities
-	// i.e. it was a JSON response
-	if data[0] != '{' {
-		return nil, nil
-	}
-
-	resp := &IdentifyResponse{}
-	err = json.Unmarshal(data, resp)
-	if err != nil {
-		return nil, ErrIdentify{err.Error()}
-	}
-
-	c.log(LogLevelDebug, "IDENTIFY response: %+v", resp)
-
-	c.maxRdyCount = resp.MaxRdyCount
-
-	if resp.TLSv1 {
-		c.log(LogLevelInfo, "upgrading to TLS")
-		err := c.upgradeTLS(c.config.TlsConfig)
-		if err != nil {
-			return nil, ErrIdentify{err.Error()}
-		}
-	}
-
-	if resp.Deflate {
-		c.log(LogLevelInfo, "upgrading to Deflate")
-		err := c.upgradeDeflate(c.config.DeflateLevel)
-		if err != nil {
-			return nil, ErrIdentify{err.Error()}
-		}
-	}
-
-	if resp.Snappy {
-		c.log(LogLevelInfo, "upgrading to Snappy")
-		err := c.upgradeSnappy()
-		if err != nil {
-			return nil, ErrIdentify{err.Error()}
-		}
-	}
-
-	// now that connection is bootstrapped, enable read buffering
-	// (and write buffering if it's not already capable of Flush())
-	c.r = bufio.NewReader(c.r)
-	if _, ok := c.w.(flusher); !ok {
-		c.w = bufio.NewWriter(c.w)
-	}
-
-	return resp, nil
-}
-
-func (c *Conn) upgradeTLS(tlsConf *tls.Config) error {
-	// create a local copy of the config to set ServerName for this connection
-	var conf tls.Config
-	if tlsConf != nil {
-		conf = *tlsConf
-	}
-	host, _, err := net.SplitHostPort(c.addr)
-	if err != nil {
-		return err
-	}
-	conf.ServerName = host
-
-	c.tlsConn = tls.Client(c.conn, &conf)
-	err = c.tlsConn.Handshake()
-	if err != nil {
-		return err
-	}
-	c.r = c.tlsConn
-	c.w = c.tlsConn
-	frameType, data, err := ReadUnpackedResponse(c)
-	if err != nil {
-		return err
-	}
-	if frameType != FrameTypeResponse || !bytes.Equal(data, []byte("OK")) {
-		return errors.New("invalid response from TLS upgrade")
-	}
-	return nil
-}
-
-func (c *Conn) upgradeDeflate(level int) error {
-	conn := net.Conn(c.conn)
-	if c.tlsConn != nil {
-		conn = c.tlsConn
-	}
-	fw, _ := flate.NewWriter(conn, level)
-	c.r = flate.NewReader(conn)
-	c.w = fw
-	frameType, data, err := ReadUnpackedResponse(c)
-	if err != nil {
-		return err
-	}
-	if frameType != FrameTypeResponse || !bytes.Equal(data, []byte("OK")) {
-		return errors.New("invalid response from Deflate upgrade")
-	}
-	return nil
-}
-
-func (c *Conn) upgradeSnappy() error {
-	conn := net.Conn(c.conn)
-	if c.tlsConn != nil {
-		conn = c.tlsConn
-	}
-	c.r = snappystream.NewReader(conn, snappystream.SkipVerifyChecksum)
-	c.w = snappystream.NewWriter(conn)
-	frameType, data, err := ReadUnpackedResponse(c)
-	if err != nil {
-		return err
-	}
-	if frameType != FrameTypeResponse || !bytes.Equal(data, []byte("OK")) {
-		return errors.New("invalid response from Snappy upgrade")
-	}
-	return nil
-}
-
-func (c *Conn) auth(secret string) error {
-	cmd, err := Auth(secret)
-	if err != nil {
-		return err
-	}
-
-	err = c.WriteCommand(cmd)
-	if err != nil {
-		return err
-	}
-
-	frameType, data, err := ReadUnpackedResponse(c)
-	if err != nil {
-		return err
-	}
-
-	if frameType == FrameTypeError {
-		return errors.New("Error authenticating " + string(data))
-	}
-
-	resp := &AuthResponse{}
-	err = json.Unmarshal(data, resp)
-	if err != nil {
-		return err
-	}
-
-	c.log(LogLevelInfo, "Auth accepted. Identity: %q %s Permissions: %d",
-		resp.Identity, resp.IdentityUrl, resp.PermissionCount)
-
-	return nil
-}
-
-func (c *Conn) readLoop() {
-	delegate := &connMessageDelegate{c}
-	for {
-		if atomic.LoadInt32(&c.closeFlag) == 1 {
-			goto exit
-		}
-
-		frameType, data, err := ReadUnpackedResponse(c)
-		if err != nil {
-			if !strings.Contains(err.Error(), "use of closed network connection") {
-				c.log(LogLevelError, "IO error - %s", err)
-				c.delegate.OnIOError(c, err)
-			}
-			goto exit
-		}
-
-		if frameType == FrameTypeResponse && bytes.Equal(data, []byte("_heartbeat_")) {
-			c.log(LogLevelDebug, "heartbeat received")
-			c.delegate.OnHeartbeat(c)
-			err := c.WriteCommand(Nop())
-			if err != nil {
-				c.log(LogLevelError, "IO error - %s", err)
-				c.delegate.OnIOError(c, err)
-				goto exit
-			}
-			continue
-		}
-
-		switch frameType {
-		case FrameTypeResponse:
-			c.delegate.OnResponse(c, data)
-		case FrameTypeMessage:
-			msg, err := DecodeMessage(data)
-			if err != nil {
-				c.log(LogLevelError, "IO error - %s", err)
-				c.delegate.OnIOError(c, err)
-				goto exit
-			}
-			msg.Delegate = delegate
-			msg.NSQDAddress = c.String()
-
-			atomic.AddInt64(&c.rdyCount, -1)
-			atomic.AddInt64(&c.messagesInFlight, 1)
-			atomic.StoreInt64(&c.lastMsgTimestamp, time.Now().UnixNano())
-
-			c.delegate.OnMessage(c, msg)
-		case FrameTypeError:
-			c.log(LogLevelError, "protocol error - %s", data)
-			c.delegate.OnError(c, data)
-		default:
-			c.log(LogLevelError, "IO error - %s", err)
-			c.delegate.OnIOError(c, fmt.Errorf("unknown frame type %d", frameType))
-		}
-	}
-
-exit:
-	atomic.StoreInt32(&c.readLoopRunning, 0)
-	// start the connection close
-	messagesInFlight := atomic.LoadInt64(&c.messagesInFlight)
-	if messagesInFlight == 0 {
-		// if we exited readLoop with no messages in flight
-		// we need to explicitly trigger the close because
-		// writeLoop won't
-		c.close()
-	} else {
-		c.log(LogLevelWarning, "delaying close, %d outstanding messages", messagesInFlight)
-	}
-	c.wg.Done()
-	c.log(LogLevelInfo, "readLoop exiting")
-}
-
-func (c *Conn) writeLoop() {
-	for {
-		select {
-		case <-c.exitChan:
-			c.log(LogLevelInfo, "breaking out of writeLoop")
-			// Indicate drainReady because we will not pull any more off msgResponseChan
-			close(c.drainReady)
-			goto exit
-		case cmd := <-c.cmdChan:
-			err := c.WriteCommand(cmd)
-			if err != nil {
-				c.log(LogLevelError, "error sending command %s - %s", cmd, err)
-				c.close()
-				continue
-			}
-		case resp := <-c.msgResponseChan:
-			// Decrement this here so it is correct even if we can't respond to nsqd
-			msgsInFlight := atomic.AddInt64(&c.messagesInFlight, -1)
-
-			if resp.success {
-				c.log(LogLevelDebug, "FIN %s", resp.msg.ID)
-				c.delegate.OnMessageFinished(c, resp.msg)
-				c.delegate.OnResume(c)
-			} else {
-				c.log(LogLevelDebug, "REQ %s", resp.msg.ID)
-				c.delegate.OnMessageRequeued(c, resp.msg)
-				if resp.backoff {
-					c.delegate.OnBackoff(c)
-				} else {
-					c.delegate.OnContinue(c)
-				}
-			}
-
-			err := c.WriteCommand(resp.cmd)
-			if err != nil {
-				c.log(LogLevelError, "error sending command %s - %s", resp.cmd, err)
-				c.close()
-				continue
-			}
-
-			if msgsInFlight == 0 &&
-				atomic.LoadInt32(&c.closeFlag) == 1 {
-				c.close()
-				continue
-			}
-		}
-	}
-
-exit:
-	c.wg.Done()
-	c.log(LogLevelInfo, "writeLoop exiting")
-}
-
-func (c *Conn) close() {
-	// a "clean" connection close is orchestrated as follows:
-	//
-	//     1. CLOSE cmd sent to nsqd
-	//     2. CLOSE_WAIT response received from nsqd
-	//     3. set c.closeFlag
-	//     4. readLoop() exits
-	//         a. if messages-in-flight > 0 delay close()
-	//             i. writeLoop() continues receiving on c.msgResponseChan chan
-	//                 x. when messages-in-flight == 0 call close()
-	//         b. else call close() immediately
-	//     5. c.exitChan close
-	//         a. writeLoop() exits
-	//             i. c.drainReady close
-	//     6a. launch cleanup() goroutine (we're racing with intraprocess
-	//        routed messages, see comments below)
-	//         a. wait on c.drainReady
-	//         b. loop and receive on c.msgResponseChan chan
-	//            until messages-in-flight == 0
-	//            i. ensure that readLoop has exited
-	//     6b. launch waitForCleanup() goroutine
-	//         b. wait on waitgroup (covers readLoop() and writeLoop()
-	//            and cleanup goroutine)
-	//         c. underlying TCP connection close
-	//         d. trigger Delegate OnClose()
-	//
-	c.stopper.Do(func() {
-		c.log(LogLevelInfo, "beginning close")
-		close(c.exitChan)
-		c.conn.CloseRead()
-
-		c.wg.Add(1)
-		go c.cleanup()
-
-		go c.waitForCleanup()
-	})
-}
-
-func (c *Conn) cleanup() {
-	<-c.drainReady
-	ticker := time.NewTicker(100 * time.Millisecond)
-	lastWarning := time.Now()
-	// writeLoop has exited, drain any remaining in flight messages
-	for {
-		// we're racing with readLoop which potentially has a message
-		// for handling so infinitely loop until messagesInFlight == 0
-		// and readLoop has exited
-		var msgsInFlight int64
-		select {
-		case <-c.msgResponseChan:
-			msgsInFlight = atomic.AddInt64(&c.messagesInFlight, -1)
-		case <-ticker.C:
-			msgsInFlight = atomic.LoadInt64(&c.messagesInFlight)
-		}
-		if msgsInFlight > 0 {
-			if time.Now().Sub(lastWarning) > time.Second {
-				c.log(LogLevelWarning, "draining... waiting for %d messages in flight", msgsInFlight)
-				lastWarning = time.Now()
-			}
-			continue
-		}
-		// until the readLoop has exited we cannot be sure that there
-		// still won't be a race
-		if atomic.LoadInt32(&c.readLoopRunning) == 1 {
-			if time.Now().Sub(lastWarning) > time.Second {
-				c.log(LogLevelWarning, "draining... readLoop still running")
-				lastWarning = time.Now()
-			}
-			continue
-		}
-		goto exit
-	}
-
-exit:
-	ticker.Stop()
-	c.wg.Done()
-	c.log(LogLevelInfo, "finished draining, cleanup exiting")
-}
-
-func (c *Conn) waitForCleanup() {
-	// this blocks until readLoop and writeLoop
-	// (and cleanup goroutine above) have exited
-	c.wg.Wait()
-	c.conn.CloseWrite()
-	c.log(LogLevelInfo, "clean close complete")
-	c.delegate.OnClose(c)
-}
-
-func (c *Conn) onMessageFinish(m *Message) {
-	c.msgResponseChan <- &msgResponse{msg: m, cmd: Finish(m.ID), success: true}
-}
-
-func (c *Conn) onMessageRequeue(m *Message, delay time.Duration, backoff bool) {
-	if delay == -1 {
-		// linear delay
-		delay = c.config.DefaultRequeueDelay * time.Duration(m.Attempts)
-		// bound the requeueDelay to configured max
-		if delay > c.config.MaxRequeueDelay {
-			delay = c.config.MaxRequeueDelay
-		}
-	}
-	c.msgResponseChan <- &msgResponse{msg: m, cmd: Requeue(m.ID, delay), success: false, backoff: backoff}
-}
-
-func (c *Conn) onMessageTouch(m *Message) {
-	select {
-	case c.cmdChan <- Touch(m.ID):
-	case <-c.exitChan:
-	}
-}
-
-func (c *Conn) log(lvl LogLevel, line string, args ...interface{}) {
-	logger, logLvl, logFmt := c.getLogger()
-
-	if logger == nil {
-		return
-	}
-
-	if logLvl > lvl {
-		return
-	}
-
-	logger.Output(2, fmt.Sprintf("%-4s %s %s", lvl,
-		fmt.Sprintf(logFmt, c.String()),
-		fmt.Sprintf(line, args...)))
-}
diff --git a/Godeps/_workspace/src/github.com/nsqio/go-nsq/consumer.go b/Godeps/_workspace/src/github.com/nsqio/go-nsq/consumer.go
deleted file mode 100644
index 68e1803e0..000000000
--- a/Godeps/_workspace/src/github.com/nsqio/go-nsq/consumer.go
+++ /dev/null
@@ -1,1164 +0,0 @@
-package nsq
-
-import (
-	"bytes"
-	"errors"
-	"fmt"
-	"log"
-	"math"
-	"math/rand"
-	"net"
-	"net/url"
-	"os"
-	"strconv"
-	"strings"
-	"sync"
-	"sync/atomic"
-	"time"
-)
-
-// Handler is the message processing interface for Consumer
-//
-// Implement this interface for handlers that return whether or not message
-// processing completed successfully.
-//
-// When the return value is nil Consumer will automatically handle FINishing.
-//
-// When the returned value is non-nil Consumer will automatically handle REQueing.
-type Handler interface {
-	HandleMessage(message *Message) error
-}
-
-// HandlerFunc is a convenience type to avoid having to declare a struct
-// to implement the Handler interface, it can be used like this:
-//
-// 	consumer.AddHandler(nsq.HandlerFunc(func(m *Message) error {
-// 		// handle the message
-// 	}))
-type HandlerFunc func(message *Message) error
-
-// HandleMessage implements the Handler interface
-func (h HandlerFunc) HandleMessage(m *Message) error {
-	return h(m)
-}
-
-// DiscoveryFilter is an interface accepted by `SetBehaviorDelegate()`
-// for filtering the nsqds returned from discovery via nsqlookupd
-type DiscoveryFilter interface {
-	Filter([]string) []string
-}
-
-// FailedMessageLogger is an interface that can be implemented by handlers that wish
-// to receive a callback when a message is deemed "failed" (i.e. the number of attempts
-// exceeded the Consumer specified MaxAttemptCount)
-type FailedMessageLogger interface {
-	LogFailedMessage(message *Message)
-}
-
-// ConsumerStats represents a snapshot of the state of a Consumer's connections and the messages
-// it has seen
-type ConsumerStats struct {
-	MessagesReceived uint64
-	MessagesFinished uint64
-	MessagesRequeued uint64
-	Connections      int
-}
-
-var instCount int64
-
-type backoffSignal int
-
-const (
-	backoffFlag backoffSignal = iota
-	continueFlag
-	resumeFlag
-)
-
-// Consumer is a high-level type to consume from NSQ.
-//
-// A Consumer instance is supplied a Handler that will be executed
-// concurrently via goroutines to handle processing the stream of messages
-// consumed from the specified topic/channel. See: Handler/HandlerFunc
-// for details on implementing the interface to create handlers.
-//
-// If configured, it will poll nsqlookupd instances and handle connection (and
-// reconnection) to any discovered nsqds.
-type Consumer struct {
-	// 64bit atomic vars need to be first for proper alignment on 32bit platforms
-	messagesReceived uint64
-	messagesFinished uint64
-	messagesRequeued uint64
-	totalRdyCount    int64
-	backoffDuration  int64
-	backoffCounter   int32
-	maxInFlight      int32
-
-	mtx sync.RWMutex
-
-	logger   logger
-	logLvl   LogLevel
-	logGuard sync.RWMutex
-
-	behaviorDelegate interface{}
-
-	id      int64
-	topic   string
-	channel string
-	config  Config
-
-	rngMtx sync.Mutex
-	rng    *rand.Rand
-
-	needRDYRedistributed int32
-
-	backoffMtx sync.RWMutex
-
-	incomingMessages chan *Message
-
-	rdyRetryMtx    sync.RWMutex
-	rdyRetryTimers map[string]*time.Timer
-
-	pendingConnections map[string]*Conn
-	connections        map[string]*Conn
-
-	nsqdTCPAddrs []string
-
-	// used at connection close to force a possible reconnect
-	lookupdRecheckChan chan int
-	lookupdHTTPAddrs   []string
-	lookupdQueryIndex  int
-
-	wg              sync.WaitGroup
-	runningHandlers int32
-	stopFlag        int32
-	connectedFlag   int32
-	stopHandler     sync.Once
-	exitHandler     sync.Once
-
-	// read from this channel to block until consumer is cleanly stopped
-	StopChan chan int
-	exitChan chan int
-}
-
-// NewConsumer creates a new instance of Consumer for the specified topic/channel
-//
-// The only valid way to create a Config is via NewConfig, using a struct literal will panic.
-// After Config is passed into NewConsumer the values are no longer mutable (they are copied).
-func NewConsumer(topic string, channel string, config *Config) (*Consumer, error) {
-	config.assertInitialized()
-
-	if err := config.Validate(); err != nil {
-		return nil, err
-	}
-
-	if !IsValidTopicName(topic) {
-		return nil, errors.New("invalid topic name")
-	}
-
-	if !IsValidChannelName(channel) {
-		return nil, errors.New("invalid channel name")
-	}
-
-	r := &Consumer{
-		id: atomic.AddInt64(&instCount, 1),
-
-		topic:   topic,
-		channel: channel,
-		config:  *config,
-
-		logger:      log.New(os.Stderr, "", log.Flags()),
-		logLvl:      LogLevelInfo,
-		maxInFlight: int32(config.MaxInFlight),
-
-		incomingMessages: make(chan *Message),
-
-		rdyRetryTimers:     make(map[string]*time.Timer),
-		pendingConnections: make(map[string]*Conn),
-		connections:        make(map[string]*Conn),
-
-		lookupdRecheckChan: make(chan int, 1),
-
-		rng: rand.New(rand.NewSource(time.Now().UnixNano())),
-
-		StopChan: make(chan int),
-		exitChan: make(chan int),
-	}
-	r.wg.Add(1)
-	go r.rdyLoop()
-	return r, nil
-}
-
-// Stats retrieves the current connection and message statistics for a Consumer
-func (r *Consumer) Stats() *ConsumerStats {
-	return &ConsumerStats{
-		MessagesReceived: atomic.LoadUint64(&r.messagesReceived),
-		MessagesFinished: atomic.LoadUint64(&r.messagesFinished),
-		MessagesRequeued: atomic.LoadUint64(&r.messagesRequeued),
-		Connections:      len(r.conns()),
-	}
-}
-
-func (r *Consumer) conns() []*Conn {
-	r.mtx.RLock()
-	conns := make([]*Conn, 0, len(r.connections))
-	for _, c := range r.connections {
-		conns = append(conns, c)
-	}
-	r.mtx.RUnlock()
-	return conns
-}
-
-// SetLogger assigns the logger to use as well as a level
-//
-// The logger parameter is an interface that requires the following
-// method to be implemented (such as the the stdlib log.Logger):
-//
-//    Output(calldepth int, s string)
-//
-func (r *Consumer) SetLogger(l logger, lvl LogLevel) {
-	r.logGuard.Lock()
-	defer r.logGuard.Unlock()
-
-	r.logger = l
-	r.logLvl = lvl
-}
-
-func (r *Consumer) getLogger() (logger, LogLevel) {
-	r.logGuard.RLock()
-	defer r.logGuard.RUnlock()
-
-	return r.logger, r.logLvl
-}
-
-// SetBehaviorDelegate takes a type implementing one or more
-// of the following interfaces that modify the behavior
-// of the `Consumer`:
-//
-//    DiscoveryFilter
-//
-func (r *Consumer) SetBehaviorDelegate(cb interface{}) {
-	matched := false
-
-	if _, ok := cb.(DiscoveryFilter); ok {
-		matched = true
-	}
-
-	if !matched {
-		panic("behavior delegate does not have any recognized methods")
-	}
-
-	r.behaviorDelegate = cb
-}
-
-// perConnMaxInFlight calculates the per-connection max-in-flight count.
-//
-// This may change dynamically based on the number of connections to nsqd the Consumer
-// is responsible for.
-func (r *Consumer) perConnMaxInFlight() int64 {
-	b := float64(r.getMaxInFlight())
-	s := b / float64(len(r.conns()))
-	return int64(math.Min(math.Max(1, s), b))
-}
-
-// IsStarved indicates whether any connections for this consumer are blocked on processing
-// before being able to receive more messages (ie. RDY count of 0 and not exiting)
-func (r *Consumer) IsStarved() bool {
-	for _, conn := range r.conns() {
-		threshold := int64(float64(atomic.LoadInt64(&conn.lastRdyCount)) * 0.85)
-		inFlight := atomic.LoadInt64(&conn.messagesInFlight)
-		if inFlight >= threshold && inFlight > 0 && !conn.IsClosing() {
-			return true
-		}
-	}
-	return false
-}
-
-func (r *Consumer) getMaxInFlight() int32 {
-	return atomic.LoadInt32(&r.maxInFlight)
-}
-
-// ChangeMaxInFlight sets a new maximum number of messages this comsumer instance
-// will allow in-flight, and updates all existing connections as appropriate.
-//
-// For example, ChangeMaxInFlight(0) would pause message flow
-//
-// If already connected, it updates the reader RDY state for each connection.
-func (r *Consumer) ChangeMaxInFlight(maxInFlight int) {
-	if r.getMaxInFlight() == int32(maxInFlight) {
-		return
-	}
-
-	atomic.StoreInt32(&r.maxInFlight, int32(maxInFlight))
-
-	for _, c := range r.conns() {
-		r.maybeUpdateRDY(c)
-	}
-}
-
-// ConnectToNSQLookupd adds an nsqlookupd address to the list for this Consumer instance.
-//
-// If it is the first to be added, it initiates an HTTP request to discover nsqd
-// producers for the configured topic.
-//
-// A goroutine is spawned to handle continual polling.
-func (r *Consumer) ConnectToNSQLookupd(addr string) error {
-	if atomic.LoadInt32(&r.stopFlag) == 1 {
-		return errors.New("consumer stopped")
-	}
-	if atomic.LoadInt32(&r.runningHandlers) == 0 {
-		return errors.New("no handlers")
-	}
-
-	if err := validatedLookupAddr(addr); err != nil {
-		return err
-	}
-
-	atomic.StoreInt32(&r.connectedFlag, 1)
-
-	r.mtx.Lock()
-	for _, x := range r.lookupdHTTPAddrs {
-		if x == addr {
-			r.mtx.Unlock()
-			return nil
-		}
-	}
-	r.lookupdHTTPAddrs = append(r.lookupdHTTPAddrs, addr)
-	numLookupd := len(r.lookupdHTTPAddrs)
-	r.mtx.Unlock()
-
-	// if this is the first one, kick off the go loop
-	if numLookupd == 1 {
-		r.queryLookupd()
-		r.wg.Add(1)
-		go r.lookupdLoop()
-	}
-
-	return nil
-}
-
-// ConnectToNSQLookupds adds multiple nsqlookupd address to the list for this Consumer instance.
-//
-// If adding the first address it initiates an HTTP request to discover nsqd
-// producers for the configured topic.
-//
-// A goroutine is spawned to handle continual polling.
-func (r *Consumer) ConnectToNSQLookupds(addresses []string) error {
-	for _, addr := range addresses {
-		err := r.ConnectToNSQLookupd(addr)
-		if err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func validatedLookupAddr(addr string) error {
-	if strings.Contains(addr, "/") {
-		_, err := url.Parse(addr)
-		if err != nil {
-			return err
-		}
-		return nil
-	}
-	if !strings.Contains(addr, ":") {
-		return errors.New("missing port")
-	}
-	return nil
-}
-
-// poll all known lookup servers every LookupdPollInterval
-func (r *Consumer) lookupdLoop() {
-	// add some jitter so that multiple consumers discovering the same topic,
-	// when restarted at the same time, dont all connect at once.
-	r.rngMtx.Lock()
-	jitter := time.Duration(int64(r.rng.Float64() *
-		r.config.LookupdPollJitter * float64(r.config.LookupdPollInterval)))
-	r.rngMtx.Unlock()
-	var ticker *time.Ticker
-
-	select {
-	case <-time.After(jitter):
-	case <-r.exitChan:
-		goto exit
-	}
-
-	ticker = time.NewTicker(r.config.LookupdPollInterval)
-
-	for {
-		select {
-		case <-ticker.C:
-			r.queryLookupd()
-		case <-r.lookupdRecheckChan:
-			r.queryLookupd()
-		case <-r.exitChan:
-			goto exit
-		}
-	}
-
-exit:
-	if ticker != nil {
-		ticker.Stop()
-	}
-	r.log(LogLevelInfo, "exiting lookupdLoop")
-	r.wg.Done()
-}
-
-// return the next lookupd endpoint to query
-// keeping track of which one was last used
-func (r *Consumer) nextLookupdEndpoint() string {
-	r.mtx.RLock()
-	if r.lookupdQueryIndex >= len(r.lookupdHTTPAddrs) {
-		r.lookupdQueryIndex = 0
-	}
-	addr := r.lookupdHTTPAddrs[r.lookupdQueryIndex]
-	num := len(r.lookupdHTTPAddrs)
-	r.mtx.RUnlock()
-	r.lookupdQueryIndex = (r.lookupdQueryIndex + 1) % num
-
-	urlString := addr
-	if !strings.Contains(urlString, "://") {
-		urlString = "http://" + addr
-	}
-
-	u, err := url.Parse(urlString)
-	if err != nil {
-		panic(err)
-	}
-	if u.Path == "/" || u.Path == "" {
-		u.Path = "/lookup"
-	}
-
-	v, err := url.ParseQuery(u.RawQuery)
-	v.Add("topic", r.topic)
-	u.RawQuery = v.Encode()
-	return u.String()
-}
-
-type lookupResp struct {
-	Channels  []string    `json:"channels"`
-	Producers []*peerInfo `json:"producers"`
-	Timestamp int64       `json:"timestamp"`
-}
-
-type peerInfo struct {
-	RemoteAddress    string `json:"remote_address"`
-	Hostname         string `json:"hostname"`
-	BroadcastAddress string `json:"broadcast_address"`
-	TCPPort          int    `json:"tcp_port"`
-	HTTPPort         int    `json:"http_port"`
-	Version          string `json:"version"`
-}
-
-// make an HTTP req to one of the configured nsqlookupd instances to discover
-// which nsqd's provide the topic we are consuming.
-//
-// initiate a connection to any new producers that are identified.
-func (r *Consumer) queryLookupd() {
-	endpoint := r.nextLookupdEndpoint()
-
-	r.log(LogLevelInfo, "querying nsqlookupd %s", endpoint)
-
-	var data lookupResp
-	err := apiRequestNegotiateV1("GET", endpoint, nil, &data)
-	if err != nil {
-		r.log(LogLevelError, "error querying nsqlookupd (%s) - %s", endpoint, err)
-		return
-	}
-
-	var nsqdAddrs []string
-	for _, producer := range data.Producers {
-		broadcastAddress := producer.BroadcastAddress
-		port := producer.TCPPort
-		joined := net.JoinHostPort(broadcastAddress, strconv.Itoa(port))
-		nsqdAddrs = append(nsqdAddrs, joined)
-	}
-	// apply filter
-	if discoveryFilter, ok := r.behaviorDelegate.(DiscoveryFilter); ok {
-		nsqdAddrs = discoveryFilter.Filter(nsqdAddrs)
-	}
-	for _, addr := range nsqdAddrs {
-		err = r.ConnectToNSQD(addr)
-		if err != nil && err != ErrAlreadyConnected {
-			r.log(LogLevelError, "(%s) error connecting to nsqd - %s", addr, err)
-			continue
-		}
-	}
-}
-
-// ConnectToNSQDs takes multiple nsqd addresses to connect directly to.
-//
-// It is recommended to use ConnectToNSQLookupd so that topics are discovered
-// automatically.  This method is useful when you want to connect to local instance.
-func (r *Consumer) ConnectToNSQDs(addresses []string) error {
-	for _, addr := range addresses {
-		err := r.ConnectToNSQD(addr)
-		if err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-// ConnectToNSQD takes a nsqd address to connect directly to.
-//
-// It is recommended to use ConnectToNSQLookupd so that topics are discovered
-// automatically.  This method is useful when you want to connect to a single, local,
-// instance.
-func (r *Consumer) ConnectToNSQD(addr string) error {
-	if atomic.LoadInt32(&r.stopFlag) == 1 {
-		return errors.New("consumer stopped")
-	}
-
-	if atomic.LoadInt32(&r.runningHandlers) == 0 {
-		return errors.New("no handlers")
-	}
-
-	atomic.StoreInt32(&r.connectedFlag, 1)
-
-	logger, logLvl := r.getLogger()
-
-	conn := NewConn(addr, &r.config, &consumerConnDelegate{r})
-	conn.SetLogger(logger, logLvl,
-		fmt.Sprintf("%3d [%s/%s] (%%s)", r.id, r.topic, r.channel))
-
-	r.mtx.Lock()
-	_, pendingOk := r.pendingConnections[addr]
-	_, ok := r.connections[addr]
-	if ok || pendingOk {
-		r.mtx.Unlock()
-		return ErrAlreadyConnected
-	}
-	r.pendingConnections[addr] = conn
-	if idx := indexOf(addr, r.nsqdTCPAddrs); idx == -1 {
-		r.nsqdTCPAddrs = append(r.nsqdTCPAddrs, addr)
-	}
-	r.mtx.Unlock()
-
-	r.log(LogLevelInfo, "(%s) connecting to nsqd", addr)
-
-	cleanupConnection := func() {
-		r.mtx.Lock()
-		delete(r.pendingConnections, addr)
-		r.mtx.Unlock()
-		conn.Close()
-	}
-
-	resp, err := conn.Connect()
-	if err != nil {
-		cleanupConnection()
-		return err
-	}
-
-	if resp != nil {
-		if resp.MaxRdyCount < int64(r.getMaxInFlight()) {
-			r.log(LogLevelWarning,
-				"(%s) max RDY count %d < consumer max in flight %d, truncation possible",
-				conn.String(), resp.MaxRdyCount, r.getMaxInFlight())
-		}
-	}
-
-	cmd := Subscribe(r.topic, r.channel)
-	err = conn.WriteCommand(cmd)
-	if err != nil {
-		cleanupConnection()
-		return fmt.Errorf("[%s] failed to subscribe to %s:%s - %s",
-			conn, r.topic, r.channel, err.Error())
-	}
-
-	r.mtx.Lock()
-	delete(r.pendingConnections, addr)
-	r.connections[addr] = conn
-	r.mtx.Unlock()
-
-	// pre-emptive signal to existing connections to lower their RDY count
-	for _, c := range r.conns() {
-		r.maybeUpdateRDY(c)
-	}
-
-	return nil
-}
-
-func indexOf(n string, h []string) int {
-	for i, a := range h {
-		if n == a {
-			return i
-		}
-	}
-	return -1
-}
-
-// DisconnectFromNSQD closes the connection to and removes the specified
-// `nsqd` address from the list
-func (r *Consumer) DisconnectFromNSQD(addr string) error {
-	r.mtx.Lock()
-	defer r.mtx.Unlock()
-
-	idx := indexOf(addr, r.nsqdTCPAddrs)
-	if idx == -1 {
-		return ErrNotConnected
-	}
-
-	// slice delete
-	r.nsqdTCPAddrs = append(r.nsqdTCPAddrs[:idx], r.nsqdTCPAddrs[idx+1:]...)
-
-	pendingConn, pendingOk := r.pendingConnections[addr]
-	conn, ok := r.connections[addr]
-
-	if ok {
-		conn.Close()
-	} else if pendingOk {
-		pendingConn.Close()
-	}
-
-	return nil
-}
-
-// DisconnectFromNSQLookupd removes the specified `nsqlookupd` address
-// from the list used for periodic discovery.
-func (r *Consumer) DisconnectFromNSQLookupd(addr string) error {
-	r.mtx.Lock()
-	defer r.mtx.Unlock()
-
-	idx := indexOf(addr, r.lookupdHTTPAddrs)
-	if idx == -1 {
-		return ErrNotConnected
-	}
-
-	if len(r.lookupdHTTPAddrs) == 1 {
-		return fmt.Errorf("cannot disconnect from only remaining nsqlookupd HTTP address %s", addr)
-	}
-
-	r.lookupdHTTPAddrs = append(r.lookupdHTTPAddrs[:idx], r.lookupdHTTPAddrs[idx+1:]...)
-
-	return nil
-}
-
-func (r *Consumer) onConnMessage(c *Conn, msg *Message) {
-	atomic.AddInt64(&r.totalRdyCount, -1)
-	atomic.AddUint64(&r.messagesReceived, 1)
-	r.incomingMessages <- msg
-	r.maybeUpdateRDY(c)
-}
-
-func (r *Consumer) onConnMessageFinished(c *Conn, msg *Message) {
-	atomic.AddUint64(&r.messagesFinished, 1)
-}
-
-func (r *Consumer) onConnMessageRequeued(c *Conn, msg *Message) {
-	atomic.AddUint64(&r.messagesRequeued, 1)
-}
-
-func (r *Consumer) onConnBackoff(c *Conn) {
-	r.startStopContinueBackoff(c, backoffFlag)
-}
-
-func (r *Consumer) onConnContinue(c *Conn) {
-	r.startStopContinueBackoff(c, continueFlag)
-}
-
-func (r *Consumer) onConnResume(c *Conn) {
-	r.startStopContinueBackoff(c, resumeFlag)
-}
-
-func (r *Consumer) onConnResponse(c *Conn, data []byte) {
-	switch {
-	case bytes.Equal(data, []byte("CLOSE_WAIT")):
-		// server is ready for us to close (it ack'd our StartClose)
-		// we can assume we will not receive any more messages over this channel
-		// (but we can still write back responses)
-		r.log(LogLevelInfo, "(%s) received CLOSE_WAIT from nsqd", c.String())
-		c.Close()
-	}
-}
-
-func (r *Consumer) onConnError(c *Conn, data []byte) {}
-
-func (r *Consumer) onConnHeartbeat(c *Conn) {}
-
-func (r *Consumer) onConnIOError(c *Conn, err error) {
-	c.Close()
-}
-
-func (r *Consumer) onConnClose(c *Conn) {
-	var hasRDYRetryTimer bool
-
-	// remove this connections RDY count from the consumer's total
-	rdyCount := c.RDY()
-	atomic.AddInt64(&r.totalRdyCount, -rdyCount)
-
-	r.rdyRetryMtx.Lock()
-	if timer, ok := r.rdyRetryTimers[c.String()]; ok {
-		// stop any pending retry of an old RDY update
-		timer.Stop()
-		delete(r.rdyRetryTimers, c.String())
-		hasRDYRetryTimer = true
-	}
-	r.rdyRetryMtx.Unlock()
-
-	r.mtx.Lock()
-	delete(r.connections, c.String())
-	left := len(r.connections)
-	r.mtx.Unlock()
-
-	r.log(LogLevelWarning, "there are %d connections left alive", left)
-
-	if (hasRDYRetryTimer || rdyCount > 0) &&
-		(int32(left) == r.getMaxInFlight() || r.inBackoff()) {
-		// we're toggling out of (normal) redistribution cases and this conn
-		// had a RDY count...
-		//
-		// trigger RDY redistribution to make sure this RDY is moved
-		// to a new connection
-		atomic.StoreInt32(&r.needRDYRedistributed, 1)
-	}
-
-	// we were the last one (and stopping)
-	if atomic.LoadInt32(&r.stopFlag) == 1 {
-		if left == 0 {
-			r.stopHandlers()
-		}
-		return
-	}
-
-	r.mtx.RLock()
-	numLookupd := len(r.lookupdHTTPAddrs)
-	reconnect := indexOf(c.String(), r.nsqdTCPAddrs) >= 0
-	r.mtx.RUnlock()
-	if numLookupd > 0 {
-		// trigger a poll of the lookupd
-		select {
-		case r.lookupdRecheckChan <- 1:
-		default:
-		}
-	} else if reconnect {
-		// there are no lookupd and we still have this nsqd TCP address in our list...
-		// try to reconnect after a bit
-		go func(addr string) {
-			for {
-				r.log(LogLevelInfo, "(%s) re-connecting in %s", addr, r.config.LookupdPollInterval)
-				time.Sleep(r.config.LookupdPollInterval)
-				if atomic.LoadInt32(&r.stopFlag) == 1 {
-					break
-				}
-				r.mtx.RLock()
-				reconnect := indexOf(addr, r.nsqdTCPAddrs) >= 0
-				r.mtx.RUnlock()
-				if !reconnect {
-					r.log(LogLevelWarning, "(%s) skipped reconnect after removal...", addr)
-					return
-				}
-				err := r.ConnectToNSQD(addr)
-				if err != nil && err != ErrAlreadyConnected {
-					r.log(LogLevelError, "(%s) error connecting to nsqd - %s", addr, err)
-					continue
-				}
-				break
-			}
-		}(c.String())
-	}
-}
-
-func (r *Consumer) startStopContinueBackoff(conn *Conn, signal backoffSignal) {
-	// prevent many async failures/successes from immediately resulting in
-	// max backoff/normal rate (by ensuring that we dont continually incr/decr
-	// the counter during a backoff period)
-	r.backoffMtx.Lock()
-	if r.inBackoffTimeout() {
-		r.backoffMtx.Unlock()
-		return
-	}
-	defer r.backoffMtx.Unlock()
-
-	// update backoff state
-	backoffUpdated := false
-	backoffCounter := atomic.LoadInt32(&r.backoffCounter)
-	switch signal {
-	case resumeFlag:
-		if backoffCounter > 0 {
-			backoffCounter--
-			backoffUpdated = true
-		}
-	case backoffFlag:
-		nextBackoff := r.config.BackoffStrategy.Calculate(int(backoffCounter) + 1)
-		if nextBackoff <= r.config.MaxBackoffDuration {
-			backoffCounter++
-			backoffUpdated = true
-		}
-	}
-	atomic.StoreInt32(&r.backoffCounter, backoffCounter)
-
-	if r.backoffCounter == 0 && backoffUpdated {
-		// exit backoff
-		count := r.perConnMaxInFlight()
-		r.log(LogLevelWarning, "exiting backoff, returning all to RDY %d", count)
-		for _, c := range r.conns() {
-			r.updateRDY(c, count)
-		}
-	} else if r.backoffCounter > 0 {
-		// start or continue backoff
-		backoffDuration := r.config.BackoffStrategy.Calculate(int(backoffCounter))
-
-		if backoffDuration > r.config.MaxBackoffDuration {
-			backoffDuration = r.config.MaxBackoffDuration
-		}
-
-		r.log(LogLevelWarning, "backing off for %.04f seconds (backoff level %d), setting all to RDY 0",
-			backoffDuration.Seconds(), backoffCounter)
-
-		// send RDY 0 immediately (to *all* connections)
-		for _, c := range r.conns() {
-			r.updateRDY(c, 0)
-		}
-
-		r.backoff(backoffDuration)
-	}
-}
-
-func (r *Consumer) backoff(d time.Duration) {
-	atomic.StoreInt64(&r.backoffDuration, d.Nanoseconds())
-	time.AfterFunc(d, r.resume)
-}
-
-func (r *Consumer) resume() {
-	if atomic.LoadInt32(&r.stopFlag) == 1 {
-		atomic.StoreInt64(&r.backoffDuration, 0)
-		return
-	}
-
-	// pick a random connection to test the waters
-	conns := r.conns()
-	if len(conns) == 0 {
-		r.log(LogLevelWarning, "no connection available to resume")
-		r.log(LogLevelWarning, "backing off for %.04f seconds", 1)
-		r.backoff(time.Second)
-		return
-	}
-	r.rngMtx.Lock()
-	idx := r.rng.Intn(len(conns))
-	r.rngMtx.Unlock()
-	choice := conns[idx]
-
-	r.log(LogLevelWarning,
-		"(%s) backoff timeout expired, sending RDY 1",
-		choice.String())
-
-	// while in backoff only ever let 1 message at a time through
-	err := r.updateRDY(choice, 1)
-	if err != nil {
-		r.log(LogLevelWarning, "(%s) error resuming RDY 1 - %s", choice.String(), err)
-		r.log(LogLevelWarning, "backing off for %.04f seconds", 1)
-		r.backoff(time.Second)
-		return
-	}
-
-	atomic.StoreInt64(&r.backoffDuration, 0)
-}
-
-func (r *Consumer) inBackoff() bool {
-	return atomic.LoadInt32(&r.backoffCounter) > 0
-}
-
-func (r *Consumer) inBackoffTimeout() bool {
-	return atomic.LoadInt64(&r.backoffDuration) > 0
-}
-
-func (r *Consumer) maybeUpdateRDY(conn *Conn) {
-	inBackoff := r.inBackoff()
-	inBackoffTimeout := r.inBackoffTimeout()
-	if inBackoff || inBackoffTimeout {
-		r.log(LogLevelDebug, "(%s) skip sending RDY inBackoff:%v || inBackoffTimeout:%v",
-			conn, inBackoff, inBackoffTimeout)
-		return
-	}
-
-	remain := conn.RDY()
-	lastRdyCount := conn.LastRDY()
-	count := r.perConnMaxInFlight()
-
-	// refill when at 1, or at 25%, or if connections have changed and we're imbalanced
-	if remain <= 1 || remain < (lastRdyCount/4) || (count > 0 && count < remain) {
-		r.log(LogLevelDebug, "(%s) sending RDY %d (%d remain from last RDY %d)",
-			conn, count, remain, lastRdyCount)
-		r.updateRDY(conn, count)
-	} else {
-		r.log(LogLevelDebug, "(%s) skip sending RDY %d (%d remain out of last RDY %d)",
-			conn, count, remain, lastRdyCount)
-	}
-}
-
-func (r *Consumer) rdyLoop() {
-	redistributeTicker := time.NewTicker(r.config.RDYRedistributeInterval)
-
-	for {
-		select {
-		case <-redistributeTicker.C:
-			r.redistributeRDY()
-		case <-r.exitChan:
-			goto exit
-		}
-	}
-
-exit:
-	redistributeTicker.Stop()
-	r.log(LogLevelInfo, "rdyLoop exiting")
-	r.wg.Done()
-}
-
-func (r *Consumer) updateRDY(c *Conn, count int64) error {
-	if c.IsClosing() {
-		return ErrClosing
-	}
-
-	// never exceed the nsqd's configured max RDY count
-	if count > c.MaxRDY() {
-		count = c.MaxRDY()
-	}
-
-	// stop any pending retry of an old RDY update
-	r.rdyRetryMtx.Lock()
-	if timer, ok := r.rdyRetryTimers[c.String()]; ok {
-		timer.Stop()
-		delete(r.rdyRetryTimers, c.String())
-	}
-	r.rdyRetryMtx.Unlock()
-
-	// never exceed our global max in flight. truncate if possible.
-	// this could help a new connection get partial max-in-flight
-	rdyCount := c.RDY()
-	maxPossibleRdy := int64(r.getMaxInFlight()) - atomic.LoadInt64(&r.totalRdyCount) + rdyCount
-	if maxPossibleRdy > 0 && maxPossibleRdy < count {
-		count = maxPossibleRdy
-	}
-	if maxPossibleRdy <= 0 && count > 0 {
-		if rdyCount == 0 {
-			// we wanted to exit a zero RDY count but we couldn't send it...
-			// in order to prevent eternal starvation we reschedule this attempt
-			// (if any other RDY update succeeds this timer will be stopped)
-			r.rdyRetryMtx.Lock()
-			r.rdyRetryTimers[c.String()] = time.AfterFunc(5*time.Second,
-				func() {
-					r.updateRDY(c, count)
-				})
-			r.rdyRetryMtx.Unlock()
-		}
-		return ErrOverMaxInFlight
-	}
-
-	return r.sendRDY(c, count)
-}
-
-func (r *Consumer) sendRDY(c *Conn, count int64) error {
-	if count == 0 && c.LastRDY() == 0 {
-		// no need to send. It's already that RDY count
-		return nil
-	}
-
-	atomic.AddInt64(&r.totalRdyCount, -c.RDY()+count)
-	c.SetRDY(count)
-	err := c.WriteCommand(Ready(int(count)))
-	if err != nil {
-		r.log(LogLevelError, "(%s) error sending RDY %d - %s", c.String(), count, err)
-		return err
-	}
-	return nil
-}
-
-func (r *Consumer) redistributeRDY() {
-	if r.inBackoffTimeout() {
-		return
-	}
-
-	// if an external heuristic set needRDYRedistributed we want to wait
-	// until we can actually redistribute to proceed
-	conns := r.conns()
-	if len(conns) == 0 {
-		return
-	}
-
-	maxInFlight := r.getMaxInFlight()
-	if len(conns) > int(maxInFlight) {
-		r.log(LogLevelDebug, "redistributing RDY state (%d conns > %d max_in_flight)",
-			len(conns), maxInFlight)
-		atomic.StoreInt32(&r.needRDYRedistributed, 1)
-	}
-
-	if r.inBackoff() && len(conns) > 1 {
-		r.log(LogLevelDebug, "redistributing RDY state (in backoff and %d conns > 1)", len(conns))
-		atomic.StoreInt32(&r.needRDYRedistributed, 1)
-	}
-
-	if !atomic.CompareAndSwapInt32(&r.needRDYRedistributed, 1, 0) {
-		return
-	}
-
-	possibleConns := make([]*Conn, 0, len(conns))
-	for _, c := range conns {
-		lastMsgDuration := time.Now().Sub(c.LastMessageTime())
-		rdyCount := c.RDY()
-		r.log(LogLevelDebug, "(%s) rdy: %d (last message received %s)",
-			c.String(), rdyCount, lastMsgDuration)
-		if rdyCount > 0 && lastMsgDuration > r.config.LowRdyIdleTimeout {
-			r.log(LogLevelDebug, "(%s) idle connection, giving up RDY", c.String())
-			r.updateRDY(c, 0)
-		}
-		possibleConns = append(possibleConns, c)
-	}
-
-	availableMaxInFlight := int64(maxInFlight) - atomic.LoadInt64(&r.totalRdyCount)
-	if r.inBackoff() {
-		availableMaxInFlight = 1 - atomic.LoadInt64(&r.totalRdyCount)
-	}
-
-	for len(possibleConns) > 0 && availableMaxInFlight > 0 {
-		availableMaxInFlight--
-		r.rngMtx.Lock()
-		i := r.rng.Int() % len(possibleConns)
-		r.rngMtx.Unlock()
-		c := possibleConns[i]
-		// delete
-		possibleConns = append(possibleConns[:i], possibleConns[i+1:]...)
-		r.log(LogLevelDebug, "(%s) redistributing RDY", c.String())
-		r.updateRDY(c, 1)
-	}
-}
-
-// Stop will initiate a graceful stop of the Consumer (permanent)
-//
-// NOTE: receive on StopChan to block until this process completes
-func (r *Consumer) Stop() {
-	if !atomic.CompareAndSwapInt32(&r.stopFlag, 0, 1) {
-		return
-	}
-
-	r.log(LogLevelInfo, "stopping...")
-
-	if len(r.conns()) == 0 {
-		r.stopHandlers()
-	} else {
-		for _, c := range r.conns() {
-			err := c.WriteCommand(StartClose())
-			if err != nil {
-				r.log(LogLevelError, "(%s) error sending CLS - %s", c.String(), err)
-			}
-		}
-
-		time.AfterFunc(time.Second*30, func() {
-			// if we've waited this long handlers are blocked on processing messages
-			// so we can't just stopHandlers (if any adtl. messages were pending processing
-			// we would cause a panic on channel close)
-			//
-			// instead, we just bypass handler closing and skip to the final exit
-			r.exit()
-		})
-	}
-}
-
-func (r *Consumer) stopHandlers() {
-	r.stopHandler.Do(func() {
-		r.log(LogLevelInfo, "stopping handlers")
-		close(r.incomingMessages)
-	})
-}
-
-// AddHandler sets the Handler for messages received by this Consumer. This can be called
-// multiple times to add additional handlers. Handler will have a 1:1 ratio to message handling goroutines.
-//
-// This panics if called after connecting to NSQD or NSQ Lookupd
-//
-// (see Handler or HandlerFunc for details on implementing this interface)
-func (r *Consumer) AddHandler(handler Handler) {
-	r.AddConcurrentHandlers(handler, 1)
-}
-
-// AddConcurrentHandlers sets the Handler for messages received by this Consumer.  It
-// takes a second argument which indicates the number of goroutines to spawn for
-// message handling.
-//
-// This panics if called after connecting to NSQD or NSQ Lookupd
-//
-// (see Handler or HandlerFunc for details on implementing this interface)
-func (r *Consumer) AddConcurrentHandlers(handler Handler, concurrency int) {
-	if atomic.LoadInt32(&r.connectedFlag) == 1 {
-		panic("already connected")
-	}
-
-	atomic.AddInt32(&r.runningHandlers, int32(concurrency))
-	for i := 0; i < concurrency; i++ {
-		go r.handlerLoop(handler)
-	}
-}
-
-func (r *Consumer) handlerLoop(handler Handler) {
-	r.log(LogLevelDebug, "starting Handler")
-
-	for {
-		message, ok := <-r.incomingMessages
-		if !ok {
-			goto exit
-		}
-
-		if r.shouldFailMessage(message, handler) {
-			message.Finish()
-			continue
-		}
-
-		err := handler.HandleMessage(message)
-		if err != nil {
-			r.log(LogLevelError, "Handler returned error (%s) for msg %s", err, message.ID)
-			if !message.IsAutoResponseDisabled() {
-				message.Requeue(-1)
-			}
-			continue
-		}
-
-		if !message.IsAutoResponseDisabled() {
-			message.Finish()
-		}
-	}
-
-exit:
-	r.log(LogLevelDebug, "stopping Handler")
-	if atomic.AddInt32(&r.runningHandlers, -1) == 0 {
-		r.exit()
-	}
-}
-
-func (r *Consumer) shouldFailMessage(message *Message, handler interface{}) bool {
-	// message passed the max number of attempts
-	if r.config.MaxAttempts > 0 && message.Attempts > r.config.MaxAttempts {
-		r.log(LogLevelWarning, "msg %s attempted %d times, giving up",
-			message.ID, message.Attempts)
-
-		logger, ok := handler.(FailedMessageLogger)
-		if ok {
-			logger.LogFailedMessage(message)
-		}
-
-		return true
-	}
-	return false
-}
-
-func (r *Consumer) exit() {
-	r.exitHandler.Do(func() {
-		close(r.exitChan)
-		r.wg.Wait()
-		close(r.StopChan)
-	})
-}
-
-func (r *Consumer) log(lvl LogLevel, line string, args ...interface{}) {
-	logger, logLvl := r.getLogger()
-
-	if logger == nil {
-		return
-	}
-
-	if logLvl > lvl {
-		return
-	}
-
-	logger.Output(2, fmt.Sprintf("%-4s %3d [%s/%s] %s",
-		lvl, r.id, r.topic, r.channel,
-		fmt.Sprintf(line, args...)))
-}
diff --git a/Godeps/_workspace/src/github.com/nsqio/go-nsq/delegates.go b/Godeps/_workspace/src/github.com/nsqio/go-nsq/delegates.go
deleted file mode 100644
index 2ccaec77d..000000000
--- a/Godeps/_workspace/src/github.com/nsqio/go-nsq/delegates.go
+++ /dev/null
@@ -1,138 +0,0 @@
-package nsq
-
-import "time"
-
-type logger interface {
-	Output(calldepth int, s string) error
-}
-
-// LogLevel specifies the severity of a given log message
-type LogLevel int
-
-// Log levels
-const (
-	LogLevelDebug LogLevel = iota
-	LogLevelInfo
-	LogLevelWarning
-	LogLevelError
-)
-
-// String returns the string form for a given LogLevel
-func (lvl LogLevel) String() string {
-	switch lvl {
-	case LogLevelInfo:
-		return "INF"
-	case LogLevelWarning:
-		return "WRN"
-	case LogLevelError:
-		return "ERR"
-	}
-	return "DBG"
-}
-
-// MessageDelegate is an interface of methods that are used as
-// callbacks in Message
-type MessageDelegate interface {
-	// OnFinish is called when the Finish() method
-	// is triggered on the Message
-	OnFinish(*Message)
-
-	// OnRequeue is called when the Requeue() method
-	// is triggered on the Message
-	OnRequeue(m *Message, delay time.Duration, backoff bool)
-
-	// OnTouch is called when the Touch() method
-	// is triggered on the Message
-	OnTouch(*Message)
-}
-
-type connMessageDelegate struct {
-	c *Conn
-}
-
-func (d *connMessageDelegate) OnFinish(m *Message) { d.c.onMessageFinish(m) }
-func (d *connMessageDelegate) OnRequeue(m *Message, t time.Duration, b bool) {
-	d.c.onMessageRequeue(m, t, b)
-}
-func (d *connMessageDelegate) OnTouch(m *Message) { d.c.onMessageTouch(m) }
-
-// ConnDelegate is an interface of methods that are used as
-// callbacks in Conn
-type ConnDelegate interface {
-	// OnResponse is called when the connection
-	// receives a FrameTypeResponse from nsqd
-	OnResponse(*Conn, []byte)
-
-	// OnError is called when the connection
-	// receives a FrameTypeError from nsqd
-	OnError(*Conn, []byte)
-
-	// OnMessage is called when the connection
-	// receives a FrameTypeMessage from nsqd
-	OnMessage(*Conn, *Message)
-
-	// OnMessageFinished is called when the connection
-	// handles a FIN command from a message handler
-	OnMessageFinished(*Conn, *Message)
-
-	// OnMessageRequeued is called when the connection
-	// handles a REQ command from a message handler
-	OnMessageRequeued(*Conn, *Message)
-
-	// OnBackoff is called when the connection triggers a backoff state
-	OnBackoff(*Conn)
-
-	// OnContinue is called when the connection finishes a message without adjusting backoff state
-	OnContinue(*Conn)
-
-	// OnResume is called when the connection triggers a resume state
-	OnResume(*Conn)
-
-	// OnIOError is called when the connection experiences
-	// a low-level TCP transport error
-	OnIOError(*Conn, error)
-
-	// OnHeartbeat is called when the connection
-	// receives a heartbeat from nsqd
-	OnHeartbeat(*Conn)
-
-	// OnClose is called when the connection
-	// closes, after all cleanup
-	OnClose(*Conn)
-}
-
-// keeps the exported Consumer struct clean of the exported methods
-// required to implement the ConnDelegate interface
-type consumerConnDelegate struct {
-	r *Consumer
-}
-
-func (d *consumerConnDelegate) OnResponse(c *Conn, data []byte)       { d.r.onConnResponse(c, data) }
-func (d *consumerConnDelegate) OnError(c *Conn, data []byte)          { d.r.onConnError(c, data) }
-func (d *consumerConnDelegate) OnMessage(c *Conn, m *Message)         { d.r.onConnMessage(c, m) }
-func (d *consumerConnDelegate) OnMessageFinished(c *Conn, m *Message) { d.r.onConnMessageFinished(c, m) }
-func (d *consumerConnDelegate) OnMessageRequeued(c *Conn, m *Message) { d.r.onConnMessageRequeued(c, m) }
-func (d *consumerConnDelegate) OnBackoff(c *Conn)                     { d.r.onConnBackoff(c) }
-func (d *consumerConnDelegate) OnContinue(c *Conn)                    { d.r.onConnContinue(c) }
-func (d *consumerConnDelegate) OnResume(c *Conn)                      { d.r.onConnResume(c) }
-func (d *consumerConnDelegate) OnIOError(c *Conn, err error)          { d.r.onConnIOError(c, err) }
-func (d *consumerConnDelegate) OnHeartbeat(c *Conn)                   { d.r.onConnHeartbeat(c) }
-func (d *consumerConnDelegate) OnClose(c *Conn)                       { d.r.onConnClose(c) }
-
-// keeps the exported Producer struct clean of the exported methods
-// required to implement the ConnDelegate interface
-type producerConnDelegate struct {
-	w *Producer
-}
-
-func (d *producerConnDelegate) OnResponse(c *Conn, data []byte)       { d.w.onConnResponse(c, data) }
-func (d *producerConnDelegate) OnError(c *Conn, data []byte)          { d.w.onConnError(c, data) }
-func (d *producerConnDelegate) OnMessage(c *Conn, m *Message)         {}
-func (d *producerConnDelegate) OnMessageFinished(c *Conn, m *Message) {}
-func (d *producerConnDelegate) OnMessageRequeued(c *Conn, m *Message) {}
-func (d *producerConnDelegate) OnBackoff(c *Conn)                     {}
-func (d *producerConnDelegate) OnContinue(c *Conn)                    {}
-func (d *producerConnDelegate) OnResume(c *Conn)                      {}
-func (d *producerConnDelegate) OnIOError(c *Conn, err error)          { d.w.onConnIOError(c, err) }
-func (d *producerConnDelegate) OnHeartbeat(c *Conn)                   { d.w.onConnHeartbeat(c) }
-func (d *producerConnDelegate) OnClose(c *Conn)                       { d.w.onConnClose(c) }
diff --git a/Godeps/_workspace/src/github.com/nsqio/go-nsq/errors.go b/Godeps/_workspace/src/github.com/nsqio/go-nsq/errors.go
deleted file mode 100644
index 2f228d102..000000000
--- a/Godeps/_workspace/src/github.com/nsqio/go-nsq/errors.go
+++ /dev/null
@@ -1,44 +0,0 @@
-package nsq
-
-import (
-	"errors"
-	"fmt"
-)
-
-// ErrNotConnected is returned when a publish command is made
-// against a Producer that is not connected
-var ErrNotConnected = errors.New("not connected")
-
-// ErrStopped is returned when a publish command is
-// made against a Producer that has been stopped
-var ErrStopped = errors.New("stopped")
-
-// ErrClosing is returned when a connection is closing
-var ErrClosing = errors.New("closing")
-
-// ErrAlreadyConnected is returned from ConnectToNSQD when already connected
-var ErrAlreadyConnected = errors.New("already connected")
-
-// ErrOverMaxInFlight is returned from Consumer if over max-in-flight
-var ErrOverMaxInFlight = errors.New("over configure max-inflight")
-
-// ErrIdentify is returned from Conn as part of the IDENTIFY handshake
-type ErrIdentify struct {
-	Reason string
-}
-
-// Error returns a stringified error
-func (e ErrIdentify) Error() string {
-	return fmt.Sprintf("failed to IDENTIFY - %s", e.Reason)
-}
-
-// ErrProtocol is returned from Producer when encountering
-// an NSQ protocol level error
-type ErrProtocol struct {
-	Reason string
-}
-
-// Error returns a stringified error
-func (e ErrProtocol) Error() string {
-	return e.Reason
-}
diff --git a/Godeps/_workspace/src/github.com/nsqio/go-nsq/message.go b/Godeps/_workspace/src/github.com/nsqio/go-nsq/message.go
deleted file mode 100644
index a5a7fa4da..000000000
--- a/Godeps/_workspace/src/github.com/nsqio/go-nsq/message.go
+++ /dev/null
@@ -1,162 +0,0 @@
-package nsq
-
-import (
-	"bytes"
-	"encoding/binary"
-	"io"
-	"io/ioutil"
-	"sync/atomic"
-	"time"
-)
-
-// The number of bytes for a Message.ID
-const MsgIDLength = 16
-
-// MessageID is the ASCII encoded hexadecimal message ID
-type MessageID [MsgIDLength]byte
-
-// Message is the fundamental data type containing
-// the id, body, and metadata
-type Message struct {
-	ID        MessageID
-	Body      []byte
-	Timestamp int64
-	Attempts  uint16
-
-	NSQDAddress string
-
-	Delegate MessageDelegate
-
-	autoResponseDisabled int32
-	responded            int32
-}
-
-// NewMessage creates a Message, initializes some metadata,
-// and returns a pointer
-func NewMessage(id MessageID, body []byte) *Message {
-	return &Message{
-		ID:        id,
-		Body:      body,
-		Timestamp: time.Now().UnixNano(),
-	}
-}
-
-// DisableAutoResponse disables the automatic response that
-// would normally be sent when a handler.HandleMessage
-// returns (FIN/REQ based on the error value returned).
-//
-// This is useful if you want to batch, buffer, or asynchronously
-// respond to messages.
-func (m *Message) DisableAutoResponse() {
-	atomic.StoreInt32(&m.autoResponseDisabled, 1)
-}
-
-// IsAutoResponseDisabled indicates whether or not this message
-// will be responded to automatically
-func (m *Message) IsAutoResponseDisabled() bool {
-	return atomic.LoadInt32(&m.autoResponseDisabled) == 1
-}
-
-// HasResponded indicates whether or not this message has been responded to
-func (m *Message) HasResponded() bool {
-	return atomic.LoadInt32(&m.responded) == 1
-}
-
-// Finish sends a FIN command to the nsqd which
-// sent this message
-func (m *Message) Finish() {
-	if !atomic.CompareAndSwapInt32(&m.responded, 0, 1) {
-		return
-	}
-	m.Delegate.OnFinish(m)
-}
-
-// Touch sends a TOUCH command to the nsqd which
-// sent this message
-func (m *Message) Touch() {
-	if m.HasResponded() {
-		return
-	}
-	m.Delegate.OnTouch(m)
-}
-
-// Requeue sends a REQ command to the nsqd which
-// sent this message, using the supplied delay.
-//
-// A delay of -1 will automatically calculate
-// based on the number of attempts and the
-// configured default_requeue_delay
-func (m *Message) Requeue(delay time.Duration) {
-	m.doRequeue(delay, true)
-}
-
-// RequeueWithoutBackoff sends a REQ command to the nsqd which
-// sent this message, using the supplied delay.
-//
-// Notably, using this method to respond does not trigger a backoff
-// event on the configured Delegate.
-func (m *Message) RequeueWithoutBackoff(delay time.Duration) {
-	m.doRequeue(delay, false)
-}
-
-func (m *Message) doRequeue(delay time.Duration, backoff bool) {
-	if !atomic.CompareAndSwapInt32(&m.responded, 0, 1) {
-		return
-	}
-	m.Delegate.OnRequeue(m, delay, backoff)
-}
-
-// WriteTo implements the WriterTo interface and serializes
-// the message into the supplied producer.
-//
-// It is suggested that the target Writer is buffered to
-// avoid performing many system calls.
-func (m *Message) WriteTo(w io.Writer) (int64, error) {
-	var buf [10]byte
-	var total int64
-
-	binary.BigEndian.PutUint64(buf[:8], uint64(m.Timestamp))
-	binary.BigEndian.PutUint16(buf[8:10], uint16(m.Attempts))
-
-	n, err := w.Write(buf[:])
-	total += int64(n)
-	if err != nil {
-		return total, err
-	}
-
-	n, err = w.Write(m.ID[:])
-	total += int64(n)
-	if err != nil {
-		return total, err
-	}
-
-	n, err = w.Write(m.Body)
-	total += int64(n)
-	if err != nil {
-		return total, err
-	}
-
-	return total, nil
-}
-
-// DecodeMessage deseralizes data (as []byte) and creates a new Message
-func DecodeMessage(b []byte) (*Message, error) {
-	var msg Message
-
-	msg.Timestamp = int64(binary.BigEndian.Uint64(b[:8]))
-	msg.Attempts = binary.BigEndian.Uint16(b[8:10])
-
-	buf := bytes.NewBuffer(b[10:])
-
-	_, err := io.ReadFull(buf, msg.ID[:])
-	if err != nil {
-		return nil, err
-	}
-
-	msg.Body, err = ioutil.ReadAll(buf)
-	if err != nil {
-		return nil, err
-	}
-
-	return &msg, nil
-}
diff --git a/Godeps/_workspace/src/github.com/nsqio/go-nsq/producer.go b/Godeps/_workspace/src/github.com/nsqio/go-nsq/producer.go
deleted file mode 100644
index ab8232ef4..000000000
--- a/Godeps/_workspace/src/github.com/nsqio/go-nsq/producer.go
+++ /dev/null
@@ -1,393 +0,0 @@
-package nsq
-
-import (
-	"fmt"
-	"log"
-	"os"
-	"sync"
-	"sync/atomic"
-	"time"
-)
-
-type producerConn interface {
-	String() string
-	SetLogger(logger, LogLevel, string)
-	Connect() (*IdentifyResponse, error)
-	Close() error
-	WriteCommand(*Command) error
-}
-
-// Producer is a high-level type to publish to NSQ.
-//
-// A Producer instance is 1:1 with a destination `nsqd`
-// and will lazily connect to that instance (and re-connect)
-// when Publish commands are executed.
-type Producer struct {
-	id     int64
-	addr   string
-	conn   producerConn
-	config Config
-
-	logger   logger
-	logLvl   LogLevel
-	logGuard sync.RWMutex
-
-	responseChan chan []byte
-	errorChan    chan []byte
-	closeChan    chan int
-
-	transactionChan chan *ProducerTransaction
-	transactions    []*ProducerTransaction
-	state           int32
-
-	concurrentProducers int32
-	stopFlag            int32
-	exitChan            chan int
-	wg                  sync.WaitGroup
-	guard               sync.Mutex
-}
-
-// ProducerTransaction is returned by the async publish methods
-// to retrieve metadata about the command after the
-// response is received.
-type ProducerTransaction struct {
-	cmd      *Command
-	doneChan chan *ProducerTransaction
-	Error    error         // the error (or nil) of the publish command
-	Args     []interface{} // the slice of variadic arguments passed to PublishAsync or MultiPublishAsync
-}
-
-func (t *ProducerTransaction) finish() {
-	if t.doneChan != nil {
-		t.doneChan <- t
-	}
-}
-
-// NewProducer returns an instance of Producer for the specified address
-//
-// The only valid way to create a Config is via NewConfig, using a struct literal will panic.
-// After Config is passed into NewProducer the values are no longer mutable (they are copied).
-func NewProducer(addr string, config *Config) (*Producer, error) {
-	config.assertInitialized()
-	err := config.Validate()
-	if err != nil {
-		return nil, err
-	}
-
-	p := &Producer{
-		id: atomic.AddInt64(&instCount, 1),
-
-		addr:   addr,
-		config: *config,
-
-		logger: log.New(os.Stderr, "", log.Flags()),
-		logLvl: LogLevelInfo,
-
-		transactionChan: make(chan *ProducerTransaction),
-		exitChan:        make(chan int),
-		responseChan:    make(chan []byte),
-		errorChan:       make(chan []byte),
-	}
-	return p, nil
-}
-
-// Ping causes the Producer to connect to it's configured nsqd (if not already
-// connected) and send a `Nop` command, returning any error that might occur.
-//
-// This method can be used to verify that a newly-created Producer instance is
-// configured correctly, rather than relying on the lazy "connect on Publish"
-// behavior of a Producer.
-func (w *Producer) Ping() error {
-	if atomic.LoadInt32(&w.state) != StateConnected {
-		err := w.connect()
-		if err != nil {
-			return err
-		}
-	}
-
-	return w.conn.WriteCommand(Nop())
-}
-
-// SetLogger assigns the logger to use as well as a level
-//
-// The logger parameter is an interface that requires the following
-// method to be implemented (such as the the stdlib log.Logger):
-//
-//    Output(calldepth int, s string)
-//
-func (w *Producer) SetLogger(l logger, lvl LogLevel) {
-	w.logGuard.Lock()
-	defer w.logGuard.Unlock()
-
-	w.logger = l
-	w.logLvl = lvl
-}
-
-func (w *Producer) getLogger() (logger, LogLevel) {
-	w.logGuard.RLock()
-	defer w.logGuard.RUnlock()
-
-	return w.logger, w.logLvl
-}
-
-// String returns the address of the Producer
-func (w *Producer) String() string {
-	return w.addr
-}
-
-// Stop initiates a graceful stop of the Producer (permanent)
-//
-// NOTE: this blocks until completion
-func (w *Producer) Stop() {
-	w.guard.Lock()
-	if !atomic.CompareAndSwapInt32(&w.stopFlag, 0, 1) {
-		w.guard.Unlock()
-		return
-	}
-	w.log(LogLevelInfo, "stopping")
-	close(w.exitChan)
-	w.close()
-	w.guard.Unlock()
-	w.wg.Wait()
-}
-
-// PublishAsync publishes a message body to the specified topic
-// but does not wait for the response from `nsqd`.
-//
-// When the Producer eventually receives the response from `nsqd`,
-// the supplied `doneChan` (if specified)
-// will receive a `ProducerTransaction` instance with the supplied variadic arguments
-// and the response error if present
-func (w *Producer) PublishAsync(topic string, body []byte, doneChan chan *ProducerTransaction,
-	args ...interface{}) error {
-	return w.sendCommandAsync(Publish(topic, body), doneChan, args)
-}
-
-// MultiPublishAsync publishes a slice of message bodies to the specified topic
-// but does not wait for the response from `nsqd`.
-//
-// When the Producer eventually receives the response from `nsqd`,
-// the supplied `doneChan` (if specified)
-// will receive a `ProducerTransaction` instance with the supplied variadic arguments
-// and the response error if present
-func (w *Producer) MultiPublishAsync(topic string, body [][]byte, doneChan chan *ProducerTransaction,
-	args ...interface{}) error {
-	cmd, err := MultiPublish(topic, body)
-	if err != nil {
-		return err
-	}
-	return w.sendCommandAsync(cmd, doneChan, args)
-}
-
-// Publish synchronously publishes a message body to the specified topic, returning
-// an error if publish failed
-func (w *Producer) Publish(topic string, body []byte) error {
-	return w.sendCommand(Publish(topic, body))
-}
-
-// MultiPublish synchronously publishes a slice of message bodies to the specified topic, returning
-// an error if publish failed
-func (w *Producer) MultiPublish(topic string, body [][]byte) error {
-	cmd, err := MultiPublish(topic, body)
-	if err != nil {
-		return err
-	}
-	return w.sendCommand(cmd)
-}
-
-// DeferredPublish synchronously publishes a message body to the specified topic
-// where the message will queue at the channel level until the timeout expires, returning
-// an error if publish failed
-func (w *Producer) DeferredPublish(topic string, delay time.Duration, body []byte) error {
-	return w.sendCommand(DeferredPublish(topic, delay, body))
-}
-
-// DeferredPublishAsync publishes a message body to the specified topic
-// where the message will queue at the channel level until the timeout expires
-// but does not wait for the response from `nsqd`.
-//
-// When the Producer eventually receives the response from `nsqd`,
-// the supplied `doneChan` (if specified)
-// will receive a `ProducerTransaction` instance with the supplied variadic arguments
-// and the response error if present
-func (w *Producer) DeferredPublishAsync(topic string, delay time.Duration, body []byte,
-	doneChan chan *ProducerTransaction, args ...interface{}) error {
-	return w.sendCommandAsync(DeferredPublish(topic, delay, body), doneChan, args)
-}
-
-func (w *Producer) sendCommand(cmd *Command) error {
-	doneChan := make(chan *ProducerTransaction)
-	err := w.sendCommandAsync(cmd, doneChan, nil)
-	if err != nil {
-		close(doneChan)
-		return err
-	}
-	t := <-doneChan
-	return t.Error
-}
-
-func (w *Producer) sendCommandAsync(cmd *Command, doneChan chan *ProducerTransaction,
-	args []interface{}) error {
-	// keep track of how many outstanding producers we're dealing with
-	// in order to later ensure that we clean them all up...
-	atomic.AddInt32(&w.concurrentProducers, 1)
-	defer atomic.AddInt32(&w.concurrentProducers, -1)
-
-	if atomic.LoadInt32(&w.state) != StateConnected {
-		err := w.connect()
-		if err != nil {
-			return err
-		}
-	}
-
-	t := &ProducerTransaction{
-		cmd:      cmd,
-		doneChan: doneChan,
-		Args:     args,
-	}
-
-	select {
-	case w.transactionChan <- t:
-	case <-w.exitChan:
-		return ErrStopped
-	}
-
-	return nil
-}
-
-func (w *Producer) connect() error {
-	w.guard.Lock()
-	defer w.guard.Unlock()
-
-	if atomic.LoadInt32(&w.stopFlag) == 1 {
-		return ErrStopped
-	}
-
-	switch state := atomic.LoadInt32(&w.state); state {
-	case StateInit:
-	case StateConnected:
-		return nil
-	default:
-		return ErrNotConnected
-	}
-
-	w.log(LogLevelInfo, "(%s) connecting to nsqd", w.addr)
-
-	logger, logLvl := w.getLogger()
-
-	w.conn = NewConn(w.addr, &w.config, &producerConnDelegate{w})
-	w.conn.SetLogger(logger, logLvl, fmt.Sprintf("%3d (%%s)", w.id))
-
-	_, err := w.conn.Connect()
-	if err != nil {
-		w.conn.Close()
-		w.log(LogLevelError, "(%s) error connecting to nsqd - %s", w.addr, err)
-		return err
-	}
-	atomic.StoreInt32(&w.state, StateConnected)
-	w.closeChan = make(chan int)
-	w.wg.Add(1)
-	go w.router()
-
-	return nil
-}
-
-func (w *Producer) close() {
-	if !atomic.CompareAndSwapInt32(&w.state, StateConnected, StateDisconnected) {
-		return
-	}
-	w.conn.Close()
-	go func() {
-		// we need to handle this in a goroutine so we don't
-		// block the caller from making progress
-		w.wg.Wait()
-		atomic.StoreInt32(&w.state, StateInit)
-	}()
-}
-
-func (w *Producer) router() {
-	for {
-		select {
-		case t := <-w.transactionChan:
-			w.transactions = append(w.transactions, t)
-			err := w.conn.WriteCommand(t.cmd)
-			if err != nil {
-				w.log(LogLevelError, "(%s) sending command - %s", w.conn.String(), err)
-				w.close()
-			}
-		case data := <-w.responseChan:
-			w.popTransaction(FrameTypeResponse, data)
-		case data := <-w.errorChan:
-			w.popTransaction(FrameTypeError, data)
-		case <-w.closeChan:
-			goto exit
-		case <-w.exitChan:
-			goto exit
-		}
-	}
-
-exit:
-	w.transactionCleanup()
-	w.wg.Done()
-	w.log(LogLevelInfo, "exiting router")
-}
-
-func (w *Producer) popTransaction(frameType int32, data []byte) {
-	t := w.transactions[0]
-	w.transactions = w.transactions[1:]
-	if frameType == FrameTypeError {
-		t.Error = ErrProtocol{string(data)}
-	}
-	t.finish()
-}
-
-func (w *Producer) transactionCleanup() {
-	// clean up transactions we can easily account for
-	for _, t := range w.transactions {
-		t.Error = ErrNotConnected
-		t.finish()
-	}
-	w.transactions = w.transactions[:0]
-
-	// spin and free up any writes that might have raced
-	// with the cleanup process (blocked on writing
-	// to transactionChan)
-	for {
-		select {
-		case t := <-w.transactionChan:
-			t.Error = ErrNotConnected
-			t.finish()
-		default:
-			// keep spinning until there are 0 concurrent producers
-			if atomic.LoadInt32(&w.concurrentProducers) == 0 {
-				return
-			}
-			// give the runtime a chance to schedule other racing goroutines
-			time.Sleep(5 * time.Millisecond)
-		}
-	}
-}
-
-func (w *Producer) log(lvl LogLevel, line string, args ...interface{}) {
-	logger, logLvl := w.getLogger()
-
-	if logger == nil {
-		return
-	}
-
-	if logLvl > lvl {
-		return
-	}
-
-	logger.Output(2, fmt.Sprintf("%-4s %3d %s", lvl, w.id, fmt.Sprintf(line, args...)))
-}
-
-func (w *Producer) onConnResponse(c *Conn, data []byte) { w.responseChan <- data }
-func (w *Producer) onConnError(c *Conn, data []byte)    { w.errorChan <- data }
-func (w *Producer) onConnHeartbeat(c *Conn)             {}
-func (w *Producer) onConnIOError(c *Conn, err error)    { w.close() }
-func (w *Producer) onConnClose(c *Conn) {
-	w.guard.Lock()
-	defer w.guard.Unlock()
-	close(w.closeChan)
-}
diff --git a/Godeps/_workspace/src/github.com/nsqio/go-nsq/protocol.go b/Godeps/_workspace/src/github.com/nsqio/go-nsq/protocol.go
deleted file mode 100644
index 69b23ab0c..000000000
--- a/Godeps/_workspace/src/github.com/nsqio/go-nsq/protocol.go
+++ /dev/null
@@ -1,96 +0,0 @@
-package nsq
-
-import (
-	"encoding/binary"
-	"errors"
-	"io"
-	"regexp"
-)
-
-// MagicV1 is the initial identifier sent when connecting for V1 clients
-var MagicV1 = []byte("  V1")
-
-// MagicV2 is the initial identifier sent when connecting for V2 clients
-var MagicV2 = []byte("  V2")
-
-// frame types
-const (
-	FrameTypeResponse int32 = 0
-	FrameTypeError    int32 = 1
-	FrameTypeMessage  int32 = 2
-)
-
-var validTopicChannelNameRegex = regexp.MustCompile(`^[\.a-zA-Z0-9_-]+(#ephemeral)?$`)
-
-// IsValidTopicName checks a topic name for correctness
-func IsValidTopicName(name string) bool {
-	return isValidName(name)
-}
-
-// IsValidChannelName checks a channel name for correctness
-func IsValidChannelName(name string) bool {
-	return isValidName(name)
-}
-
-func isValidName(name string) bool {
-	if len(name) > 64 || len(name) < 1 {
-		return false
-	}
-	return validTopicChannelNameRegex.MatchString(name)
-}
-
-// ReadResponse is a client-side utility function to read from the supplied Reader
-// according to the NSQ protocol spec:
-//
-//    [x][x][x][x][x][x][x][x]...
-//    |  (int32) || (binary)
-//    |  4-byte  || N-byte
-//    ------------------------...
-//        size       data
-func ReadResponse(r io.Reader) ([]byte, error) {
-	var msgSize int32
-
-	// message size
-	err := binary.Read(r, binary.BigEndian, &msgSize)
-	if err != nil {
-		return nil, err
-	}
-
-	// message binary data
-	buf := make([]byte, msgSize)
-	_, err = io.ReadFull(r, buf)
-	if err != nil {
-		return nil, err
-	}
-
-	return buf, nil
-}
-
-// UnpackResponse is a client-side utility function that unpacks serialized data
-// according to NSQ protocol spec:
-//
-//    [x][x][x][x][x][x][x][x]...
-//    |  (int32) || (binary)
-//    |  4-byte  || N-byte
-//    ------------------------...
-//      frame ID     data
-//
-// Returns a triplicate of: frame type, data ([]byte), error
-func UnpackResponse(response []byte) (int32, []byte, error) {
-	if len(response) < 4 {
-		return -1, nil, errors.New("length of response is too small")
-	}
-
-	return int32(binary.BigEndian.Uint32(response)), response[4:], nil
-}
-
-// ReadUnpackedResponse reads and parses data from the underlying
-// TCP connection according to the NSQ TCP protocol spec and
-// returns the frameType, data or error
-func ReadUnpackedResponse(r io.Reader) (int32, []byte, error) {
-	resp, err := ReadResponse(r)
-	if err != nil {
-		return -1, nil, err
-	}
-	return UnpackResponse(resp)
-}
diff --git a/Godeps/_workspace/src/github.com/nsqio/go-nsq/states.go b/Godeps/_workspace/src/github.com/nsqio/go-nsq/states.go
deleted file mode 100644
index 76e8e7ba5..000000000
--- a/Godeps/_workspace/src/github.com/nsqio/go-nsq/states.go
+++ /dev/null
@@ -1,12 +0,0 @@
-package nsq
-
-// states
-const (
-	StateInit = iota
-	StateDisconnected
-	StateConnected
-	StateSubscribed
-	// StateClosing means CLOSE has started...
-	// (responses are ok, but no new messages will be sent)
-	StateClosing
-)
diff --git a/Godeps/_workspace/src/github.com/nsqio/go-nsq/test.sh b/Godeps/_workspace/src/github.com/nsqio/go-nsq/test.sh
deleted file mode 100644
index cc9fbbe6b..000000000
--- a/Godeps/_workspace/src/github.com/nsqio/go-nsq/test.sh
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-set -e
-
-# a helper script to run tests
-
-if ! which nsqd >/dev/null; then
-    echo "missing nsqd binary" && exit 1
-fi
-
-if ! which nsqlookupd >/dev/null; then
-    echo "missing nsqlookupd binary" && exit 1
-fi
-
-# run nsqlookupd
-LOOKUP_LOGFILE=$(mktemp -t nsqlookupd.XXXXXXX)
-echo "starting nsqlookupd"
-echo "  logging to $LOOKUP_LOGFILE"
-nsqlookupd >$LOOKUP_LOGFILE 2>&1 &
-LOOKUPD_PID=$!
-
-# run nsqd configured to use our lookupd above
-rm -f *.dat
-NSQD_LOGFILE=$(mktemp -t nsqlookupd.XXXXXXX)
-echo "starting nsqd --data-path=/tmp --lookupd-tcp-address=127.0.0.1:4160 --tls-cert=./test/server.pem --tls-key=./test/server.key --tls-root-ca-file=./test/ca.pem"
-echo "  logging to $NSQD_LOGFILE"
-nsqd --data-path=/tmp --lookupd-tcp-address=127.0.0.1:4160 --tls-cert=./test/server.pem --tls-key=./test/server.key --tls-root-ca-file=./test/ca.pem >$NSQD_LOGFILE 2>&1 &
-NSQD_PID=$!
-
-sleep 0.3
-
-cleanup() {
-    echo "killing nsqd PID $NSQD_PID"
-    kill -s TERM $NSQD_PID || cat $NSQD_LOGFILE
-    echo "killing nsqlookupd PID $LOOKUPD_PID"
-    kill -s TERM $LOOKUPD_PID || cat $LOOKUP_LOGFILE
-}
-trap cleanup INT TERM EXIT
-
-go test -v -timeout 60s
diff --git a/Godeps/_workspace/src/github.com/nsqio/go-nsq/test/ca.pem b/Godeps/_workspace/src/github.com/nsqio/go-nsq/test/ca.pem
deleted file mode 100644
index f5c4723e4..000000000
--- a/Godeps/_workspace/src/github.com/nsqio/go-nsq/test/ca.pem
+++ /dev/null
@@ -1,24 +0,0 @@
------BEGIN CERTIFICATE-----
-MIID9zCCAt+gAwIBAgIJAPYpAVNDj2lgMA0GCSqGSIb3DQEBBQUAMIGRMQswCQYD
-VQQGEwJERTEMMAoGA1UECAwDTlJXMQ4wDAYDVQQHDAVFYXJ0aDEXMBUGA1UECgwO
-UmFuZG9tIENvbXBhbnkxCzAJBgNVBAsMAklUMRcwFQYDVQQDDA53d3cucmFuZG9t
-LmNvbTElMCMGCSqGSIb3DQEJARYWS3J5cHRvS2luZ3NAcmFuZG9tLmNvbTAeFw0x
-NDA0MDIyMTE0NTJaFw0xNTA0MDIyMTE0NTJaMIGRMQswCQYDVQQGEwJERTEMMAoG
-A1UECAwDTlJXMQ4wDAYDVQQHDAVFYXJ0aDEXMBUGA1UECgwOUmFuZG9tIENvbXBh
-bnkxCzAJBgNVBAsMAklUMRcwFQYDVQQDDA53d3cucmFuZG9tLmNvbTElMCMGCSqG
-SIb3DQEJARYWS3J5cHRvS2luZ3NAcmFuZG9tLmNvbTCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBAL/sJU6ODQCsdWAmq3Qyp6vCqVFkSIHwR3oH8vPuwwob
-IOrx/pXz2LIRekQ4egT8LCH3QDxhEvFhDNXYM4h/mkQ+GpgzynoIqYrw+yF93pik
-T9Tpel2IuntThlZrO/4APRbVw4Ihf3zp47AY71J+8usJjmfWsId4dhqa1lTYecXK
-Zwxii8RTH/7LsuwIDOW1QJLGGKNzvVYA42Gh8Cw3uHlmqZ2tA/sp5qg1Z3QU5g7y
-EzzRybotHaRb5XMUWHAlGbIl/TW4KlFqFZ0kCXJXL1uO3uq2nIS3bG7ryjbobRVn
-dZ6sV34eenIeZWu6zlDxQP/EqxAezz5Ndyt9uYWb/JECAwEAAaNQME4wHQYDVR0O
-BBYEFI9l/QHE30clqx+1oCR6IhUYEdqLMB8GA1UdIwQYMBaAFI9l/QHE30clqx+1
-oCR6IhUYEdqLMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAES6GKxL
-oeCLZa83TjJXLagcc9mmdQZgfF3/o61+ye7D9BLqBwN5lx4+kIE1LAUI/Id0mCdW
-9uXmPhpCJ926krahNc4Ol+wQTmZ3j7Mn3DCkFufjr64cGPU/UzH4yjMg9wEf84qz
-5oH+dBifwJM8yoRCxbnMqGBu3xY8WCjPlw8E8lizXFk8wUbLZ/EC5Rjm+KmdT5ud
-KTEgM+K6RMNo9vLn5ZasrYyhVcHdEKIzo6qLm1ZVIgpi/1WX0m8hACMfEcqee6ot
-76LEyM3kwfqRkWGZWHEF9D4emp3quU+0AmjM57LHrYjidpDJkVTUHDoMBFHl9Uiq
-0O9+azN48F/bVgU=
------END CERTIFICATE-----
diff --git a/Godeps/_workspace/src/github.com/nsqio/go-nsq/test/server.key b/Godeps/_workspace/src/github.com/nsqio/go-nsq/test/server.key
deleted file mode 100644
index 0e3b4e5b4..000000000
--- a/Godeps/_workspace/src/github.com/nsqio/go-nsq/test/server.key
+++ /dev/null
@@ -1,28 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDFHWaPfRA5nU/F
-E8AVoFj2TAgMRISLduWlbAgDnMtFLSGVwgjxU13Txsv0LgwJgo4A5xpd2WNV0dIQ
-brerxvPVJruKO8KxKFS2U58BCFIG0xGrlQSg5wDGyqxEQY80XlrBtxs81v79GYHy
-fBhizg7onlmbNZzxPy7idU0a7TpgzakeDrfJHQ7rI3llvR0U0TdOLno82CtPvosY
-6TYZAIFYgH05yN7DWKuDUI8Fa2RFVkbHPUlJVKROw/0n1yWy7XcwTmQQyaodFYgg
-KMCdyR0ElPxLv8dKYFjLvef2DTmuYwbalt5hiQqOpY1wm616Xf4ywz2uEU+ooLW4
-/Q6DcRUBAgMBAAECggEBAKDUgVc4YuGvkmOp3sOGhq/Hj5V63m7wvyV/BPb1mwFB
-drK7lBJbxCXEgaslWxrzVCw2ZFQIyL1AKtbPj7tv5ImZRdHfOtbTonL1vbnY8Ryy
-YSuPtiwW75JD0dULbO38wq5mWaoFfh5DDr0sNbWAjbeNZG14jCpnNDkAHr6Gq2hJ
-VzwEwy+W7LXn8s8lYJHi3MsxCJqAFN1u2FOkjBtrcVW06VgV87IX59SOFns80x4E
-Nn0ZKH7RU2DuJ7Fm4HtaNH+yaDYxUeo2A/2/UoavyYYCgC5gThsNjlp9/R4gtm0h
-VO+8cN5a3s7zL+aITIusY7H/rwWc6XpRmxQn+jwqF8ECgYEA5PpAz4fhXA9abFZx
-0XqCgcwTFY5gTX/JDd1qv0b/PueAR7dY5d37bRbTXpzrHiNFVrq3x432V3+KY0b5
-55PEB1YxwBUga5DvTSa5fLfUibvLpdZjganzdTOsG53wMvNwUT8iUzUQDLkyRfIi
-mV0r4Sa34RrBZdWJ2Aou9by2SlkCgYEA3GCHTP7nAcuHXRTsXH3eK/HsfwxdwjhA
-G5SG7L7KSoMpzCbe90DuYEr6J/O1nnP0QiSQ2uEeTOARzMfio4E16exWlDDtvPBQ
-HqSuQKg4M7fMTN1tj95xmk1yGZMyPxgEfCScBeCbYQzOyZ0j93iFjqMnb2mlriq5
-MoSPat3BeukCgYEAjSGaFNABnUZxS1k0qhLCodHw6VZqERp0B7Gze9X8uP7jWFCv
-4G6j66cn/KbnXBoNQNmxMLRVY7TezTYQDiZLquH7pBLheqtIc9ssdKyxuXsgmES9
-7EueHV0N9a+xPxZA4jLxqyuHivATBn2pybFdvFaq+3oMPgISBjCwpRH9oXECgYAN
-+n16j8ydW4iZieM4Nq+p/+1tXZ5w3FqMpU4tpCh2s30qOuj3rAGyz+6wLBBAHcDH
-lUQu7gqa+7eFUsR4dJCz5s7TFYtu6ZtbZjy7UzBFb4og8gaqEoUIMZNkNecBA4f9
-S+EtqkKQ1Fwlg7ctUlK+anDs6zmcI4+dubTTJX/JSQKBgQCsu/gCgoOi2GFgebIh
-URvEMrhaiHxcw5u30nMNjWUGpDQK3lVTK51+7wj4xmVfiomvUW6M/HaR2+5xF1U1
-QV08cKeWCGfGUFetTxjdhsVhMIk84ygF2l9K6jiHqvtd5rIoQ9Lf8XXbYaQVicRg
-qmB2iOzmbQQM/GOSofAeUfE7/A==
------END PRIVATE KEY-----
diff --git a/Godeps/_workspace/src/github.com/nsqio/go-nsq/test/server.pem b/Godeps/_workspace/src/github.com/nsqio/go-nsq/test/server.pem
deleted file mode 100644
index 6e88f0349..000000000
--- a/Godeps/_workspace/src/github.com/nsqio/go-nsq/test/server.pem
+++ /dev/null
@@ -1,24 +0,0 @@
------BEGIN CERTIFICATE-----
-MIID7zCCAtegAwIBAgIJAMsErP97ZQmgMA0GCSqGSIb3DQEBBQUAMIGNMQswCQYD
-VQQGEwJERTEMMAoGA1UECAwDTlJXMQ4wDAYDVQQHDAVFYXJ0aDEXMBUGA1UECgwO
-UmFuZG9tIENvbXBhbnkxCzAJBgNVBAsMAklUMRcwFQYDVQQDDA53d3cucmFuZG9t
-LmNvbTEhMB8GCSqGSIb3DQEJARYSZm9vYmFyQGV4YW1wbGUuY29tMB4XDTE0MDQw
-MjIxMTQ1MloXDTI0MDMzMDIxMTQ1MlowgY0xCzAJBgNVBAYTAkRFMQwwCgYDVQQI
-DANOUlcxDjAMBgNVBAcMBUVhcnRoMRcwFQYDVQQKDA5SYW5kb20gQ29tcGFueTEL
-MAkGA1UECwwCSVQxFzAVBgNVBAMMDnd3dy5yYW5kb20uY29tMSEwHwYJKoZIhvcN
-AQkBFhJmb29iYXJAZXhhbXBsZS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQDFHWaPfRA5nU/FE8AVoFj2TAgMRISLduWlbAgDnMtFLSGVwgjxU13T
-xsv0LgwJgo4A5xpd2WNV0dIQbrerxvPVJruKO8KxKFS2U58BCFIG0xGrlQSg5wDG
-yqxEQY80XlrBtxs81v79GYHyfBhizg7onlmbNZzxPy7idU0a7TpgzakeDrfJHQ7r
-I3llvR0U0TdOLno82CtPvosY6TYZAIFYgH05yN7DWKuDUI8Fa2RFVkbHPUlJVKRO
-w/0n1yWy7XcwTmQQyaodFYggKMCdyR0ElPxLv8dKYFjLvef2DTmuYwbalt5hiQqO
-pY1wm616Xf4ywz2uEU+ooLW4/Q6DcRUBAgMBAAGjUDBOMB0GA1UdDgQWBBTxyT32
-Exu5TuortZY8zkVotLDNDTAfBgNVHSMEGDAWgBTxyT32Exu5TuortZY8zkVotLDN
-DTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAu+0B+caaV4HzIHyfX
-Zc6BUPcRoTEZIWX/7JLeeOVUztOjl9ExjYTzjo0QEt+PVcOzfQL/hxE2SPG6fRF7
-YRZU1h9t5Ti9rTg9myAbGGMo6MdWZULFcxIWjxhv6qnFPk/fF47PvGwjygFNnzv8
-FYmrAI99kK0CYolvXZ5ue250dpE/TCIAyk09a3WeBbHU/hMR/mBUNsitphelDbNK
-oohrY9D7QR5Mf/NZgx3a0eDH6zoMYDRPARY3M02EuHHiRKmlyfnPv4ns4/0wCarj
-pKpds+G80+k2fyiMgQ5bPTw8sfNgq1z0IvIuWB36XSNenTgnnjArbWii+x95jjNw
-XcQg
------END CERTIFICATE-----
diff --git a/Godeps/_workspace/src/github.com/nsqio/go-nsq/version.go b/Godeps/_workspace/src/github.com/nsqio/go-nsq/version.go
deleted file mode 100644
index 6bf16bc6c..000000000
--- a/Godeps/_workspace/src/github.com/nsqio/go-nsq/version.go
+++ /dev/null
@@ -1,8 +0,0 @@
-// Package nsq is the official Go package for NSQ (http://nsq.io/)
-//
-// It provides high-level Consumer and Producer types as well as low-level
-// functions to communicate over the NSQ protocol
-package nsq
-
-// VERSION
-const VERSION = "1.0.5"
diff --git a/Godeps/_workspace/src/github.com/pborman/uuid/CONTRIBUTORS b/Godeps/_workspace/src/github.com/pborman/uuid/CONTRIBUTORS
deleted file mode 100644
index b382a04ed..000000000
--- a/Godeps/_workspace/src/github.com/pborman/uuid/CONTRIBUTORS
+++ /dev/null
@@ -1 +0,0 @@
-Paul Borman <borman@google.com>
diff --git a/Godeps/_workspace/src/github.com/pborman/uuid/LICENSE b/Godeps/_workspace/src/github.com/pborman/uuid/LICENSE
deleted file mode 100644
index 5dc68268d..000000000
--- a/Godeps/_workspace/src/github.com/pborman/uuid/LICENSE
+++ /dev/null
@@ -1,27 +0,0 @@
-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/github.com/pborman/uuid/dce.go b/Godeps/_workspace/src/github.com/pborman/uuid/dce.go
deleted file mode 100644
index 50a0f2d09..000000000
--- a/Godeps/_workspace/src/github.com/pborman/uuid/dce.go
+++ /dev/null
@@ -1,84 +0,0 @@
-// 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/github.com/pborman/uuid/doc.go b/Godeps/_workspace/src/github.com/pborman/uuid/doc.go
deleted file mode 100644
index d8bd013e6..000000000
--- a/Godeps/_workspace/src/github.com/pborman/uuid/doc.go
+++ /dev/null
@@ -1,8 +0,0 @@
-// 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/github.com/pborman/uuid/hash.go b/Godeps/_workspace/src/github.com/pborman/uuid/hash.go
deleted file mode 100644
index cdd4192fd..000000000
--- a/Godeps/_workspace/src/github.com/pborman/uuid/hash.go
+++ /dev/null
@@ -1,53 +0,0 @@
-// 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/github.com/pborman/uuid/json.go b/Godeps/_workspace/src/github.com/pborman/uuid/json.go
deleted file mode 100644
index 760580a50..000000000
--- a/Godeps/_workspace/src/github.com/pborman/uuid/json.go
+++ /dev/null
@@ -1,30 +0,0 @@
-// 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/github.com/pborman/uuid/json_test.go b/Godeps/_workspace/src/github.com/pborman/uuid/json_test.go
deleted file mode 100644
index b5eae0924..000000000
--- a/Godeps/_workspace/src/github.com/pborman/uuid/json_test.go
+++ /dev/null
@@ -1,32 +0,0 @@
-// 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/github.com/pborman/uuid/node.go b/Godeps/_workspace/src/github.com/pborman/uuid/node.go
deleted file mode 100644
index dd0a8ac18..000000000
--- a/Godeps/_workspace/src/github.com/pborman/uuid/node.go
+++ /dev/null
@@ -1,101 +0,0 @@
-// 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/github.com/pborman/uuid/seq_test.go b/Godeps/_workspace/src/github.com/pborman/uuid/seq_test.go
deleted file mode 100644
index 3b3d1430d..000000000
--- a/Godeps/_workspace/src/github.com/pborman/uuid/seq_test.go
+++ /dev/null
@@ -1,66 +0,0 @@
-// 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/github.com/pborman/uuid/time.go b/Godeps/_workspace/src/github.com/pborman/uuid/time.go
deleted file mode 100644
index 7ebc9bef1..000000000
--- a/Godeps/_workspace/src/github.com/pborman/uuid/time.go
+++ /dev/null
@@ -1,132 +0,0 @@
-// 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/github.com/pborman/uuid/util.go b/Godeps/_workspace/src/github.com/pborman/uuid/util.go
deleted file mode 100644
index de40b102c..000000000
--- a/Godeps/_workspace/src/github.com/pborman/uuid/util.go
+++ /dev/null
@@ -1,43 +0,0 @@
-// 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/github.com/pborman/uuid/uuid.go b/Godeps/_workspace/src/github.com/pborman/uuid/uuid.go
deleted file mode 100644
index 2920fae63..000000000
--- a/Godeps/_workspace/src/github.com/pborman/uuid/uuid.go
+++ /dev/null
@@ -1,163 +0,0 @@
-// 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/github.com/pborman/uuid/uuid_test.go b/Godeps/_workspace/src/github.com/pborman/uuid/uuid_test.go
deleted file mode 100644
index 417ebeb26..000000000
--- a/Godeps/_workspace/src/github.com/pborman/uuid/uuid_test.go
+++ /dev/null
@@ -1,390 +0,0 @@
-// 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/github.com/pborman/uuid/version1.go b/Godeps/_workspace/src/github.com/pborman/uuid/version1.go
deleted file mode 100644
index 0127eacfa..000000000
--- a/Godeps/_workspace/src/github.com/pborman/uuid/version1.go
+++ /dev/null
@@ -1,41 +0,0 @@
-// 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/github.com/pborman/uuid/version4.go b/Godeps/_workspace/src/github.com/pborman/uuid/version4.go
deleted file mode 100644
index b3d4a368d..000000000
--- a/Godeps/_workspace/src/github.com/pborman/uuid/version4.go
+++ /dev/null
@@ -1,25 +0,0 @@
-// 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/prometheus/client_golang/extraction/discriminator.go b/Godeps/_workspace/src/github.com/prometheus/client_golang/extraction/discriminator.go
deleted file mode 100644
index a353c6378..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/client_golang/extraction/discriminator.go
+++ /dev/null
@@ -1,74 +0,0 @@
-// Copyright 2013 The Prometheus Authors
-// 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 extraction
-
-import (
-	"errors"
-	"fmt"
-	"mime"
-	"net/http"
-)
-
-// ProcessorForRequestHeader interprets a HTTP request header to determine
-// what Processor should be used for the given input.  If no acceptable
-// Processor can be found, an error is returned.
-func ProcessorForRequestHeader(header http.Header) (Processor, error) {
-	if header == nil {
-		return nil, errors.New("received illegal and nil header")
-	}
-
-	mediatype, params, err := mime.ParseMediaType(header.Get("Content-Type"))
-	if err != nil {
-		return nil, fmt.Errorf("invalid Content-Type header %q: %s", header.Get("Content-Type"), err)
-	}
-	switch mediatype {
-	case "application/vnd.google.protobuf":
-		if params["proto"] != "io.prometheus.client.MetricFamily" {
-			return nil, fmt.Errorf("unrecognized protocol message %s", params["proto"])
-		}
-		if params["encoding"] != "delimited" {
-			return nil, fmt.Errorf("unsupported encoding %s", params["encoding"])
-		}
-		return MetricFamilyProcessor, nil
-	case "text/plain":
-		switch params["version"] {
-		case "0.0.4":
-			return Processor004, nil
-		case "":
-			// Fallback: most recent version.
-			return Processor004, nil
-		default:
-			return nil, fmt.Errorf("unrecognized API version %s", params["version"])
-		}
-	case "application/json":
-		var prometheusAPIVersion string
-
-		if params["schema"] == "prometheus/telemetry" && params["version"] != "" {
-			prometheusAPIVersion = params["version"]
-		} else {
-			prometheusAPIVersion = header.Get("X-Prometheus-API-Version")
-		}
-
-		switch prometheusAPIVersion {
-		case "0.0.2":
-			return Processor002, nil
-		case "0.0.1":
-			return Processor001, nil
-		default:
-			return nil, fmt.Errorf("unrecognized API version %s", prometheusAPIVersion)
-		}
-	default:
-		return nil, fmt.Errorf("unsupported media type %q, expected %q", mediatype, "application/json")
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/extraction/discriminator_test.go b/Godeps/_workspace/src/github.com/prometheus/client_golang/extraction/discriminator_test.go
deleted file mode 100644
index 4f08248d6..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/client_golang/extraction/discriminator_test.go
+++ /dev/null
@@ -1,126 +0,0 @@
-// Copyright 2013 The Prometheus Authors
-// 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 extraction
-
-import (
-	"errors"
-	"net/http"
-	"testing"
-)
-
-func testDiscriminatorHTTPHeader(t testing.TB) {
-	var scenarios = []struct {
-		input  map[string]string
-		output Processor
-		err    error
-	}{
-		{
-			output: nil,
-			err:    errors.New("received illegal and nil header"),
-		},
-		{
-			input:  map[string]string{"Content-Type": "application/json", "X-Prometheus-API-Version": "0.0.0"},
-			output: nil,
-			err:    errors.New("unrecognized API version 0.0.0"),
-		},
-		{
-			input:  map[string]string{"Content-Type": "application/json", "X-Prometheus-API-Version": "0.0.1"},
-			output: Processor001,
-			err:    nil,
-		},
-		{
-			input:  map[string]string{"Content-Type": `application/json; schema="prometheus/telemetry"; version=0.0.0`},
-			output: nil,
-			err:    errors.New("unrecognized API version 0.0.0"),
-		},
-		{
-			input:  map[string]string{"Content-Type": `application/json; schema="prometheus/telemetry"; version=0.0.1`},
-			output: Processor001,
-			err:    nil,
-		},
-		{
-			input:  map[string]string{"Content-Type": `application/json; schema="prometheus/telemetry"; version=0.0.2`},
-			output: Processor002,
-			err:    nil,
-		},
-		{
-			input:  map[string]string{"Content-Type": `application/vnd.google.protobuf; proto="io.prometheus.client.MetricFamily"; encoding="delimited"`},
-			output: MetricFamilyProcessor,
-			err:    nil,
-		},
-		{
-			input:  map[string]string{"Content-Type": `application/vnd.google.protobuf; proto="illegal"; encoding="delimited"`},
-			output: nil,
-			err:    errors.New("unrecognized protocol message illegal"),
-		},
-		{
-			input:  map[string]string{"Content-Type": `application/vnd.google.protobuf; proto="io.prometheus.client.MetricFamily"; encoding="illegal"`},
-			output: nil,
-			err:    errors.New("unsupported encoding illegal"),
-		},
-		{
-			input:  map[string]string{"Content-Type": `text/plain; version=0.0.4`},
-			output: Processor004,
-			err:    nil,
-		},
-		{
-			input:  map[string]string{"Content-Type": `text/plain`},
-			output: Processor004,
-			err:    nil,
-		},
-		{
-			input:  map[string]string{"Content-Type": `text/plain; version=0.0.3`},
-			output: nil,
-			err:    errors.New("unrecognized API version 0.0.3"),
-		},
-	}
-
-	for i, scenario := range scenarios {
-		var header http.Header
-
-		if len(scenario.input) > 0 {
-			header = http.Header{}
-		}
-
-		for key, value := range scenario.input {
-			header.Add(key, value)
-		}
-
-		actual, err := ProcessorForRequestHeader(header)
-
-		if scenario.err != err {
-			if scenario.err != nil && err != nil {
-				if scenario.err.Error() != err.Error() {
-					t.Errorf("%d. expected %s, got %s", i, scenario.err, err)
-				}
-			} else if scenario.err != nil || err != nil {
-				t.Errorf("%d. expected %s, got %s", i, scenario.err, err)
-			}
-		}
-
-		if scenario.output != actual {
-			t.Errorf("%d. expected %s, got %s", i, scenario.output, actual)
-		}
-	}
-}
-
-func TestDiscriminatorHTTPHeader(t *testing.T) {
-	testDiscriminatorHTTPHeader(t)
-}
-
-func BenchmarkDiscriminatorHTTPHeader(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		testDiscriminatorHTTPHeader(b)
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/extraction/extraction.go b/Godeps/_workspace/src/github.com/prometheus/client_golang/extraction/extraction.go
deleted file mode 100644
index 31cdafad4..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/client_golang/extraction/extraction.go
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright 2013 The Prometheus Authors
-// 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 extraction decodes Prometheus clients' data streams for consumers.
-package extraction
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/extraction/fixtures/empty.json b/Godeps/_workspace/src/github.com/prometheus/client_golang/extraction/fixtures/empty.json
deleted file mode 100644
index e69de29bb..000000000
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/extraction/fixtures/test0_0_1-0_0_2-large.json b/Godeps/_workspace/src/github.com/prometheus/client_golang/extraction/fixtures/test0_0_1-0_0_2-large.json
deleted file mode 100644
index 7168338c8..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/client_golang/extraction/fixtures/test0_0_1-0_0_2-large.json
+++ /dev/null
@@ -1,1032 +0,0 @@
-[
-  {
-    "baseLabels": {
-      "__name__": "rpc_calls_total_0",
-      "job": "batch_job"
-    },
-    "docstring": "Total count of RPC calls.",
-    "metric": {
-      "type": "counter",
-      "value": [
-        {
-          "labels": {
-            "foo": "bar",
-            "service": "zed"
-          },
-          "value": 25
-        },
-        {
-          "labels": {
-            "foo": "baz",
-            "service": "bar"
-          },
-          "value": 25
-        },
-        {
-          "labels": {
-            "foo": "bar",
-            "service": "foo"
-          },
-          "value": 25
-        },
-        {
-          "labels": {
-            "foo": "baz",
-            "service": "foo"
-          },
-          "value": 25
-        }
-      ]
-    }
-  },
-  {
-    "baseLabels": {
-      "__name__": "rpc_latency_microseconds_0"
-    },
-    "docstring": "RPC latency summary.",
-    "metric": {
-      "type": "histogram",
-      "value": [
-        {
-          "labels": {
-            "foo": "bar",
-            "service": "foo"
-          },
-          "value": {
-            "0.010000": 15.890724674774395,
-            "0.050000": 15.890724674774395,
-            "0.500000": 84.63044031436561,
-            "0.900000": 160.21100853053224,
-            "0.990000": 172.49828748957728
-          }
-        },
-        {
-          "labels": {
-            "foo": "bar",
-            "service": "zed"
-          },
-          "value": {
-            "0.010000": 0.0459814091918713,
-            "0.050000": 0.0459814091918713,
-            "0.500000": 0.6120456642749681,
-            "0.900000": 1.355915069887731,
-            "0.990000": 1.772733213161236
-          }
-        },
-        {
-          "labels": {
-            "foo": "bar",
-            "service": "bar"
-          },
-          "value": {
-            "0.010000": 78.48563317257356,
-            "0.050000": 78.48563317257356,
-            "0.500000": 97.31798360385088,
-            "0.900000": 109.89202084295582,
-            "0.990000": 109.99626121011262
-          }
-        },
-        {
-          "labels": {
-            "foo": "baz",
-            "service": "bar"
-          },
-          "value": {
-            "0.010000": 78.48563317257356,
-            "0.050000": 78.48563317257356,
-            "0.500000": 97.31798360385088,
-            "0.900000": 109.89202084295582,
-            "0.990000": 109.99626121011262
-          }
-        }
-      ]
-    }
-  },
-  {
-    "baseLabels": {
-      "__name__": "rpc_calls_total_1",
-      "job": "batch_job"
-    },
-    "docstring": "Total count of RPC calls.",
-    "metric": {
-      "type": "counter",
-      "value": [
-        {
-          "labels": {
-            "foo": "bar",
-            "service": "zed"
-          },
-          "value": 25
-        },
-        {
-          "labels": {
-            "foo": "baz",
-            "service": "bar"
-          },
-          "value": 25
-        },
-        {
-          "labels": {
-            "foo": "bar",
-            "service": "foo"
-          },
-          "value": 25
-        },
-        {
-          "labels": {
-            "foo": "baz",
-            "service": "foo"
-          },
-          "value": 25
-        }
-      ]
-    }
-  },
-  {
-    "baseLabels": {
-      "__name__": "rpc_latency_microseconds_1"
-    },
-    "docstring": "RPC latency summary.",
-    "metric": {
-      "type": "histogram",
-      "value": [
-        {
-          "labels": {
-            "foo": "bar",
-            "service": "foo"
-          },
-          "value": {
-            "0.010000": 15.890724674774395,
-            "0.050000": 15.890724674774395,
-            "0.500000": 84.63044031436561,
-            "0.900000": 160.21100853053224,
-            "0.990000": 172.49828748957728
-          }
-        },
-        {
-          "labels": {
-            "foo": "bar",
-            "service": "zed"
-          },
-          "value": {
-            "0.010000": 0.0459814091918713,
-            "0.050000": 0.0459814091918713,
-            "0.500000": 0.6120456642749681,
-            "0.900000": 1.355915069887731,
-            "0.990000": 1.772733213161236
-          }
-        },
-        {
-          "labels": {
-            "foo": "bar",
-            "service": "bar"
-          },
-          "value": {
-            "0.010000": 78.48563317257356,
-            "0.050000": 78.48563317257356,
-            "0.500000": 97.31798360385088,
-            "0.900000": 109.89202084295582,
-            "0.990000": 109.99626121011262
-          }
-        },
-        {
-          "labels": {
-            "foo": "baz",
-            "service": "bar"
-          },
-          "value": {
-            "0.010000": 78.48563317257356,
-            "0.050000": 78.48563317257356,
-            "0.500000": 97.31798360385088,
-            "0.900000": 109.89202084295582,
-            "0.990000": 109.99626121011262
-          }
-        }
-      ]
-    }
-  },
-  {
-    "baseLabels": {
-      "__name__": "rpc_calls_total_2",
-      "job": "batch_job"
-    },
-    "docstring": "Total count of RPC calls.",
-    "metric": {
-      "type": "counter",
-      "value": [
-        {
-          "labels": {
-            "foo": "bar",
-            "service": "zed"
-          },
-          "value": 25
-        },
-        {
-          "labels": {
-            "foo": "baz",
-            "service": "bar"
-          },
-          "value": 25
-        },
-        {
-          "labels": {
-            "foo": "bar",
-            "service": "foo"
-          },
-          "value": 25
-        },
-        {
-          "labels": {
-            "foo": "baz",
-            "service": "foo"
-          },
-          "value": 25
-        }
-      ]
-    }
-  },
-  {
-    "baseLabels": {
-      "__name__": "rpc_latency_microseconds_2"
-    },
-    "docstring": "RPC latency summary.",
-    "metric": {
-      "type": "histogram",
-      "value": [
-        {
-          "labels": {
-            "foo": "bar",
-            "service": "foo"
-          },
-          "value": {
-            "0.010000": 15.890724674774395,
-            "0.050000": 15.890724674774395,
-            "0.500000": 84.63044031436561,
-            "0.900000": 160.21100853053224,
-            "0.990000": 172.49828748957728
-          }
-        },
-        {
-          "labels": {
-            "foo": "bar",
-            "service": "zed"
-          },
-          "value": {
-            "0.010000": 0.0459814091918713,
-            "0.050000": 0.0459814091918713,
-            "0.500000": 0.6120456642749681,
-            "0.900000": 1.355915069887731,
-            "0.990000": 1.772733213161236
-          }
-        },
-        {
-          "labels": {
-            "foo": "bar",
-            "service": "bar"
-          },
-          "value": {
-            "0.010000": 78.48563317257356,
-            "0.050000": 78.48563317257356,
-            "0.500000": 97.31798360385088,
-            "0.900000": 109.89202084295582,
-            "0.990000": 109.99626121011262
-          }
-        },
-        {
-          "labels": {
-            "foo": "baz",
-            "service": "bar"
-          },
-          "value": {
-            "0.010000": 78.48563317257356,
-            "0.050000": 78.48563317257356,
-            "0.500000": 97.31798360385088,
-            "0.900000": 109.89202084295582,
-            "0.990000": 109.99626121011262
-          }
-        }
-      ]
-    }
-  },
-  {
-    "baseLabels": {
-      "__name__": "rpc_calls_total_3",
-      "job": "batch_job"
-    },
-    "docstring": "Total count of RPC calls.",
-    "metric": {
-      "type": "counter",
-      "value": [
-        {
-          "labels": {
-            "foo": "bar",
-            "service": "zed"
-          },
-          "value": 25
-        },
-        {
-          "labels": {
-            "foo": "baz",
-            "service": "bar"
-          },
-          "value": 25
-        },
-        {
-          "labels": {
-            "foo": "bar",
-            "service": "foo"
-          },
-          "value": 25
-        },
-        {
-          "labels": {
-            "foo": "baz",
-            "service": "foo"
-          },
-          "value": 25
-        }
-      ]
-    }
-  },
-  {
-    "baseLabels": {
-      "__name__": "rpc_latency_microseconds_3"
-    },
-    "docstring": "RPC latency summary.",
-    "metric": {
-      "type": "histogram",
-      "value": [
-        {
-          "labels": {
-            "foo": "bar",
-            "service": "foo"
-          },
-          "value": {
-            "0.010000": 15.890724674774395,
-            "0.050000": 15.890724674774395,
-            "0.500000": 84.63044031436561,
-            "0.900000": 160.21100853053224,
-            "0.990000": 172.49828748957728
-          }
-        },
-        {
-          "labels": {
-            "foo": "bar",
-            "service": "zed"
-          },
-          "value": {
-            "0.010000": 0.0459814091918713,
-            "0.050000": 0.0459814091918713,
-            "0.500000": 0.6120456642749681,
-            "0.900000": 1.355915069887731,
-            "0.990000": 1.772733213161236
-          }
-        },
-        {
-          "labels": {
-            "foo": "bar",
-            "service": "bar"
-          },
-          "value": {
-            "0.010000": 78.48563317257356,
-            "0.050000": 78.48563317257356,
-            "0.500000": 97.31798360385088,
-            "0.900000": 109.89202084295582,
-            "0.990000": 109.99626121011262
-          }
-        },
-        {
-          "labels": {
-            "foo": "baz",
-            "service": "bar"
-          },
-          "value": {
-            "0.010000": 78.48563317257356,
-            "0.050000": 78.48563317257356,
-            "0.500000": 97.31798360385088,
-            "0.900000": 109.89202084295582,
-            "0.990000": 109.99626121011262
-          }
-        }
-      ]
-    }
-  },
-  {
-    "baseLabels": {
-      "__name__": "rpc_calls_total_4",
-      "job": "batch_job"
-    },
-    "docstring": "Total count of RPC calls.",
-    "metric": {
-      "type": "counter",
-      "value": [
-        {
-          "labels": {
-            "foo": "bar",
-            "service": "zed"
-          },
-          "value": 25
-        },
-        {
-          "labels": {
-            "foo": "baz",
-            "service": "bar"
-          },
-          "value": 25
-        },
-        {
-          "labels": {
-            "foo": "bar",
-            "service": "foo"
-          },
-          "value": 25
-        },
-        {
-          "labels": {
-            "foo": "baz",
-            "service": "foo"
-          },
-          "value": 25
-        }
-      ]
-    }
-  },
-  {
-    "baseLabels": {
-      "__name__": "rpc_latency_microseconds_4"
-    },
-    "docstring": "RPC latency summary.",
-    "metric": {
-      "type": "histogram",
-      "value": [
-        {
-          "labels": {
-            "foo": "bar",
-            "service": "foo"
-          },
-          "value": {
-            "0.010000": 15.890724674774395,
-            "0.050000": 15.890724674774395,
-            "0.500000": 84.63044031436561,
-            "0.900000": 160.21100853053224,
-            "0.990000": 172.49828748957728
-          }
-        },
-        {
-          "labels": {
-            "foo": "bar",
-            "service": "zed"
-          },
-          "value": {
-            "0.010000": 0.0459814091918713,
-            "0.050000": 0.0459814091918713,
-            "0.500000": 0.6120456642749681,
-            "0.900000": 1.355915069887731,
-            "0.990000": 1.772733213161236
-          }
-        },
-        {
-          "labels": {
-            "foo": "bar",
-            "service": "bar"
-          },
-          "value": {
-            "0.010000": 78.48563317257356,
-            "0.050000": 78.48563317257356,
-            "0.500000": 97.31798360385088,
-            "0.900000": 109.89202084295582,
-            "0.990000": 109.99626121011262
-          }
-        },
-        {
-          "labels": {
-            "foo": "baz",
-            "service": "bar"
-          },
-          "value": {
-            "0.010000": 78.48563317257356,
-            "0.050000": 78.48563317257356,
-            "0.500000": 97.31798360385088,
-            "0.900000": 109.89202084295582,
-            "0.990000": 109.99626121011262
-          }
-        }
-      ]
-    }
-  },
-  {
-    "baseLabels": {
-      "__name__": "rpc_calls_total_5",
-      "job": "batch_job"
-    },
-    "docstring": "Total count of RPC calls.",
-    "metric": {
-      "type": "counter",
-      "value": [
-        {
-          "labels": {
-            "foo": "bar",
-            "service": "zed"
-          },
-          "value": 25
-        },
-        {
-          "labels": {
-            "foo": "baz",
-            "service": "bar"
-          },
-          "value": 25
-        },
-        {
-          "labels": {
-            "foo": "bar",
-            "service": "foo"
-          },
-          "value": 25
-        },
-        {
-          "labels": {
-            "foo": "baz",
-            "service": "foo"
-          },
-          "value": 25
-        }
-      ]
-    }
-  },
-  {
-    "baseLabels": {
-      "__name__": "rpc_latency_microseconds_5"
-    },
-    "docstring": "RPC latency summary.",
-    "metric": {
-      "type": "histogram",
-      "value": [
-        {
-          "labels": {
-            "foo": "bar",
-            "service": "foo"
-          },
-          "value": {
-            "0.010000": 15.890724674774395,
-            "0.050000": 15.890724674774395,
-            "0.500000": 84.63044031436561,
-            "0.900000": 160.21100853053224,
-            "0.990000": 172.49828748957728
-          }
-        },
-        {
-          "labels": {
-            "foo": "bar",
-            "service": "zed"
-          },
-          "value": {
-            "0.010000": 0.0459814091918713,
-            "0.050000": 0.0459814091918713,
-            "0.500000": 0.6120456642749681,
-            "0.900000": 1.355915069887731,
-            "0.990000": 1.772733213161236
-          }
-        },
-        {
-          "labels": {
-            "foo": "bar",
-            "service": "bar"
-          },
-          "value": {
-            "0.010000": 78.48563317257356,
-            "0.050000": 78.48563317257356,
-            "0.500000": 97.31798360385088,
-            "0.900000": 109.89202084295582,
-            "0.990000": 109.99626121011262
-          }
-        },
-        {
-          "labels": {
-            "foo": "baz",
-            "service": "bar"
-          },
-          "value": {
-            "0.010000": 78.48563317257356,
-            "0.050000": 78.48563317257356,
-            "0.500000": 97.31798360385088,
-            "0.900000": 109.89202084295582,
-            "0.990000": 109.99626121011262
-          }
-        }
-      ]
-    }
-  },
-  {
-    "baseLabels": {
-      "__name__": "rpc_calls_total_6",
-      "job": "batch_job"
-    },
-    "docstring": "Total count of RPC calls.",
-    "metric": {
-      "type": "counter",
-      "value": [
-        {
-          "labels": {
-            "foo": "bar",
-            "service": "zed"
-          },
-          "value": 25
-        },
-        {
-          "labels": {
-            "foo": "baz",
-            "service": "bar"
-          },
-          "value": 25
-        },
-        {
-          "labels": {
-            "foo": "bar",
-            "service": "foo"
-          },
-          "value": 25
-        },
-        {
-          "labels": {
-            "foo": "baz",
-            "service": "foo"
-          },
-          "value": 25
-        }
-      ]
-    }
-  },
-  {
-    "baseLabels": {
-      "__name__": "rpc_latency_microseconds_6"
-    },
-    "docstring": "RPC latency summary.",
-    "metric": {
-      "type": "histogram",
-      "value": [
-        {
-          "labels": {
-            "foo": "bar",
-            "service": "foo"
-          },
-          "value": {
-            "0.010000": 15.890724674774395,
-            "0.050000": 15.890724674774395,
-            "0.500000": 84.63044031436561,
-            "0.900000": 160.21100853053224,
-            "0.990000": 172.49828748957728
-          }
-        },
-        {
-          "labels": {
-            "foo": "bar",
-            "service": "zed"
-          },
-          "value": {
-            "0.010000": 0.0459814091918713,
-            "0.050000": 0.0459814091918713,
-            "0.500000": 0.6120456642749681,
-            "0.900000": 1.355915069887731,
-            "0.990000": 1.772733213161236
-          }
-        },
-        {
-          "labels": {
-            "foo": "bar",
-            "service": "bar"
-          },
-          "value": {
-            "0.010000": 78.48563317257356,
-            "0.050000": 78.48563317257356,
-            "0.500000": 97.31798360385088,
-            "0.900000": 109.89202084295582,
-            "0.990000": 109.99626121011262
-          }
-        },
-        {
-          "labels": {
-            "foo": "baz",
-            "service": "bar"
-          },
-          "value": {
-            "0.010000": 78.48563317257356,
-            "0.050000": 78.48563317257356,
-            "0.500000": 97.31798360385088,
-            "0.900000": 109.89202084295582,
-            "0.990000": 109.99626121011262
-          }
-        }
-      ]
-    }
-  },
-  {
-    "baseLabels": {
-      "__name__": "rpc_calls_total_7",
-      "job": "batch_job"
-    },
-    "docstring": "Total count of RPC calls.",
-    "metric": {
-      "type": "counter",
-      "value": [
-        {
-          "labels": {
-            "foo": "bar",
-            "service": "zed"
-          },
-          "value": 25
-        },
-        {
-          "labels": {
-            "foo": "baz",
-            "service": "bar"
-          },
-          "value": 25
-        },
-        {
-          "labels": {
-            "foo": "bar",
-            "service": "foo"
-          },
-          "value": 25
-        },
-        {
-          "labels": {
-            "foo": "baz",
-            "service": "foo"
-          },
-          "value": 25
-        }
-      ]
-    }
-  },
-  {
-    "baseLabels": {
-      "__name__": "rpc_latency_microseconds_7"
-    },
-    "docstring": "RPC latency summary.",
-    "metric": {
-      "type": "histogram",
-      "value": [
-        {
-          "labels": {
-            "foo": "bar",
-            "service": "foo"
-          },
-          "value": {
-            "0.010000": 15.890724674774395,
-            "0.050000": 15.890724674774395,
-            "0.500000": 84.63044031436561,
-            "0.900000": 160.21100853053224,
-            "0.990000": 172.49828748957728
-          }
-        },
-        {
-          "labels": {
-            "foo": "bar",
-            "service": "zed"
-          },
-          "value": {
-            "0.010000": 0.0459814091918713,
-            "0.050000": 0.0459814091918713,
-            "0.500000": 0.6120456642749681,
-            "0.900000": 1.355915069887731,
-            "0.990000": 1.772733213161236
-          }
-        },
-        {
-          "labels": {
-            "foo": "bar",
-            "service": "bar"
-          },
-          "value": {
-            "0.010000": 78.48563317257356,
-            "0.050000": 78.48563317257356,
-            "0.500000": 97.31798360385088,
-            "0.900000": 109.89202084295582,
-            "0.990000": 109.99626121011262
-          }
-        },
-        {
-          "labels": {
-            "foo": "baz",
-            "service": "bar"
-          },
-          "value": {
-            "0.010000": 78.48563317257356,
-            "0.050000": 78.48563317257356,
-            "0.500000": 97.31798360385088,
-            "0.900000": 109.89202084295582,
-            "0.990000": 109.99626121011262
-          }
-        }
-      ]
-    }
-  },
-  {
-    "baseLabels": {
-      "__name__": "rpc_calls_total_8",
-      "job": "batch_job"
-    },
-    "docstring": "Total count of RPC calls.",
-    "metric": {
-      "type": "counter",
-      "value": [
-        {
-          "labels": {
-            "foo": "bar",
-            "service": "zed"
-          },
-          "value": 25
-        },
-        {
-          "labels": {
-            "foo": "baz",
-            "service": "bar"
-          },
-          "value": 25
-        },
-        {
-          "labels": {
-            "foo": "bar",
-            "service": "foo"
-          },
-          "value": 25
-        },
-        {
-          "labels": {
-            "foo": "baz",
-            "service": "foo"
-          },
-          "value": 25
-        }
-      ]
-    }
-  },
-  {
-    "baseLabels": {
-      "__name__": "rpc_latency_microseconds_8"
-    },
-    "docstring": "RPC latency summary.",
-    "metric": {
-      "type": "histogram",
-      "value": [
-        {
-          "labels": {
-            "foo": "bar",
-            "service": "foo"
-          },
-          "value": {
-            "0.010000": 15.890724674774395,
-            "0.050000": 15.890724674774395,
-            "0.500000": 84.63044031436561,
-            "0.900000": 160.21100853053224,
-            "0.990000": 172.49828748957728
-          }
-        },
-        {
-          "labels": {
-            "foo": "bar",
-            "service": "zed"
-          },
-          "value": {
-            "0.010000": 0.0459814091918713,
-            "0.050000": 0.0459814091918713,
-            "0.500000": 0.6120456642749681,
-            "0.900000": 1.355915069887731,
-            "0.990000": 1.772733213161236
-          }
-        },
-        {
-          "labels": {
-            "foo": "bar",
-            "service": "bar"
-          },
-          "value": {
-            "0.010000": 78.48563317257356,
-            "0.050000": 78.48563317257356,
-            "0.500000": 97.31798360385088,
-            "0.900000": 109.89202084295582,
-            "0.990000": 109.99626121011262
-          }
-        },
-        {
-          "labels": {
-            "foo": "baz",
-            "service": "bar"
-          },
-          "value": {
-            "0.010000": 78.48563317257356,
-            "0.050000": 78.48563317257356,
-            "0.500000": 97.31798360385088,
-            "0.900000": 109.89202084295582,
-            "0.990000": 109.99626121011262
-          }
-        }
-      ]
-    }
-  },
-  {
-    "baseLabels": {
-      "__name__": "rpc_calls_total_9",
-      "job": "batch_job"
-    },
-    "docstring": "Total count of RPC calls.",
-    "metric": {
-      "type": "counter",
-      "value": [
-        {
-          "labels": {
-            "foo": "bar",
-            "service": "zed"
-          },
-          "value": 25
-        },
-        {
-          "labels": {
-            "foo": "baz",
-            "service": "bar"
-          },
-          "value": 25
-        },
-        {
-          "labels": {
-            "foo": "bar",
-            "service": "foo"
-          },
-          "value": 25
-        },
-        {
-          "labels": {
-            "foo": "baz",
-            "service": "foo"
-          },
-          "value": 25
-        }
-      ]
-    }
-  },
-  {
-    "baseLabels": {
-      "__name__": "rpc_latency_microseconds_9"
-    },
-    "docstring": "RPC latency summary.",
-    "metric": {
-      "type": "histogram",
-      "value": [
-        {
-          "labels": {
-            "foo": "bar",
-            "service": "foo"
-          },
-          "value": {
-            "0.010000": 15.890724674774395,
-            "0.050000": 15.890724674774395,
-            "0.500000": 84.63044031436561,
-            "0.900000": 160.21100853053224,
-            "0.990000": 172.49828748957728
-          }
-        },
-        {
-          "labels": {
-            "foo": "bar",
-            "service": "zed"
-          },
-          "value": {
-            "0.010000": 0.0459814091918713,
-            "0.050000": 0.0459814091918713,
-            "0.500000": 0.6120456642749681,
-            "0.900000": 1.355915069887731,
-            "0.990000": 1.772733213161236
-          }
-        },
-        {
-          "labels": {
-            "foo": "bar",
-            "service": "bar"
-          },
-          "value": {
-            "0.010000": 78.48563317257356,
-            "0.050000": 78.48563317257356,
-            "0.500000": 97.31798360385088,
-            "0.900000": 109.89202084295582,
-            "0.990000": 109.99626121011262
-          }
-        },
-        {
-          "labels": {
-            "foo": "baz",
-            "service": "bar"
-          },
-          "value": {
-            "0.010000": 78.48563317257356,
-            "0.050000": 78.48563317257356,
-            "0.500000": 97.31798360385088,
-            "0.900000": 109.89202084295582,
-            "0.990000": 109.99626121011262
-          }
-        }
-      ]
-    }
-  }
-]
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/extraction/fixtures/test0_0_1-0_0_2.json b/Godeps/_workspace/src/github.com/prometheus/client_golang/extraction/fixtures/test0_0_1-0_0_2.json
deleted file mode 100644
index 1ac5be7d7..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/client_golang/extraction/fixtures/test0_0_1-0_0_2.json
+++ /dev/null
@@ -1,79 +0,0 @@
-[
-  {
-    "baseLabels": {
-      "__name__": "rpc_calls_total",
-      "job": "batch_job"
-    },
-    "docstring": "RPC calls.",
-    "metric": {
-      "type": "counter",
-      "value": [
-        {
-          "labels": {
-            "service": "zed"
-          },
-          "value": 25
-        },
-        {
-          "labels": {
-            "service": "bar"
-          },
-          "value": 25
-        },
-        {
-          "labels": {
-            "service": "foo"
-          },
-          "value": 25
-        }
-      ]
-    }
-  },
-  {
-    "baseLabels": {
-      "__name__": "rpc_latency_microseconds"
-    },
-      "docstring": "RPC latency.",
-      "metric": {
-        "type": "histogram",
-        "value": [
-          {
-            "labels": {
-              "service": "foo"
-            },
-            "value": {
-              "0.010000": 15.890724674774395,
-              "0.050000": 15.890724674774395,
-              "0.500000": 84.63044031436561,
-              "0.900000": 160.21100853053224,
-              "0.990000": 172.49828748957728
-            }
-          },
-          {
-            "labels": {
-              "service": "zed"
-            },
-            "value": {
-              "0.010000": 0.0459814091918713,
-              "0.050000": 0.0459814091918713,
-              "0.500000": 0.6120456642749681,
-              "0.900000": 1.355915069887731,
-              "0.990000": 1.772733213161236
-            }
-          },
-          {
-            "labels": {
-              "service": "bar"
-            },
-            "value": {
-              "0.010000": 78.48563317257356,
-              "0.050000": 78.48563317257356,
-              "0.500000": 97.31798360385088,
-              "0.900000": 109.89202084295582,
-              "0.990000": 109.99626121011262
-            }
-          }
-        ]
-      }
-  }
-]
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/extraction/metricfamilyprocessor.go b/Godeps/_workspace/src/github.com/prometheus/client_golang/extraction/metricfamilyprocessor.go
deleted file mode 100644
index 5a8f40bbf..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/client_golang/extraction/metricfamilyprocessor.go
+++ /dev/null
@@ -1,318 +0,0 @@
-// Copyright 2013 The Prometheus Authors
-// 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 extraction
-
-import (
-	"fmt"
-	"io"
-	"math"
-
-	dto "github.com/prometheus/client_model/go"
-
-	"github.com/matttproud/golang_protobuf_extensions/pbutil"
-
-	"github.com/prometheus/client_golang/model"
-)
-
-type metricFamilyProcessor struct{}
-
-// MetricFamilyProcessor decodes varint encoded record length-delimited streams
-// of io.prometheus.client.MetricFamily.
-//
-// See http://godoc.org/github.com/matttproud/golang_protobuf_extensions/ext for
-// more details.
-var MetricFamilyProcessor = &metricFamilyProcessor{}
-
-func (m *metricFamilyProcessor) ProcessSingle(i io.Reader, out Ingester, o *ProcessOptions) error {
-	family := &dto.MetricFamily{}
-
-	for {
-		family.Reset()
-
-		if _, err := pbutil.ReadDelimited(i, family); err != nil {
-			if err == io.EOF {
-				return nil
-			}
-			return err
-		}
-		if err := extractMetricFamily(out, o, family); err != nil {
-			return err
-		}
-	}
-}
-
-func extractMetricFamily(out Ingester, o *ProcessOptions, family *dto.MetricFamily) error {
-	switch family.GetType() {
-	case dto.MetricType_COUNTER:
-		if err := extractCounter(out, o, family); err != nil {
-			return err
-		}
-	case dto.MetricType_GAUGE:
-		if err := extractGauge(out, o, family); err != nil {
-			return err
-		}
-	case dto.MetricType_SUMMARY:
-		if err := extractSummary(out, o, family); err != nil {
-			return err
-		}
-	case dto.MetricType_UNTYPED:
-		if err := extractUntyped(out, o, family); err != nil {
-			return err
-		}
-	case dto.MetricType_HISTOGRAM:
-		if err := extractHistogram(out, o, family); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func extractCounter(out Ingester, o *ProcessOptions, f *dto.MetricFamily) error {
-	samples := make(model.Samples, 0, len(f.Metric))
-
-	for _, m := range f.Metric {
-		if m.Counter == nil {
-			continue
-		}
-
-		sample := &model.Sample{
-			Metric: model.Metric{},
-			Value:  model.SampleValue(m.Counter.GetValue()),
-		}
-		samples = append(samples, sample)
-
-		if m.TimestampMs != nil {
-			sample.Timestamp = model.TimestampFromUnixNano(*m.TimestampMs * 1000000)
-		} else {
-			sample.Timestamp = o.Timestamp
-		}
-
-		metric := sample.Metric
-		for _, p := range m.Label {
-			metric[model.LabelName(p.GetName())] = model.LabelValue(p.GetValue())
-		}
-		metric[model.MetricNameLabel] = model.LabelValue(f.GetName())
-	}
-
-	return out.Ingest(samples)
-}
-
-func extractGauge(out Ingester, o *ProcessOptions, f *dto.MetricFamily) error {
-	samples := make(model.Samples, 0, len(f.Metric))
-
-	for _, m := range f.Metric {
-		if m.Gauge == nil {
-			continue
-		}
-
-		sample := &model.Sample{
-			Metric: model.Metric{},
-			Value:  model.SampleValue(m.Gauge.GetValue()),
-		}
-		samples = append(samples, sample)
-
-		if m.TimestampMs != nil {
-			sample.Timestamp = model.TimestampFromUnixNano(*m.TimestampMs * 1000000)
-		} else {
-			sample.Timestamp = o.Timestamp
-		}
-
-		metric := sample.Metric
-		for _, p := range m.Label {
-			metric[model.LabelName(p.GetName())] = model.LabelValue(p.GetValue())
-		}
-		metric[model.MetricNameLabel] = model.LabelValue(f.GetName())
-	}
-
-	return out.Ingest(samples)
-}
-
-func extractSummary(out Ingester, o *ProcessOptions, f *dto.MetricFamily) error {
-	samples := make(model.Samples, 0, len(f.Metric))
-
-	for _, m := range f.Metric {
-		if m.Summary == nil {
-			continue
-		}
-
-		timestamp := o.Timestamp
-		if m.TimestampMs != nil {
-			timestamp = model.TimestampFromUnixNano(*m.TimestampMs * 1000000)
-		}
-
-		for _, q := range m.Summary.Quantile {
-			sample := &model.Sample{
-				Metric:    model.Metric{},
-				Value:     model.SampleValue(q.GetValue()),
-				Timestamp: timestamp,
-			}
-			samples = append(samples, sample)
-
-			metric := sample.Metric
-			for _, p := range m.Label {
-				metric[model.LabelName(p.GetName())] = model.LabelValue(p.GetValue())
-			}
-			// BUG(matt): Update other names to "quantile".
-			metric[model.LabelName(model.QuantileLabel)] = model.LabelValue(fmt.Sprint(q.GetQuantile()))
-			metric[model.MetricNameLabel] = model.LabelValue(f.GetName())
-		}
-
-		if m.Summary.SampleSum != nil {
-			sum := &model.Sample{
-				Metric:    model.Metric{},
-				Value:     model.SampleValue(m.Summary.GetSampleSum()),
-				Timestamp: timestamp,
-			}
-			samples = append(samples, sum)
-
-			metric := sum.Metric
-			for _, p := range m.Label {
-				metric[model.LabelName(p.GetName())] = model.LabelValue(p.GetValue())
-			}
-			metric[model.MetricNameLabel] = model.LabelValue(f.GetName() + "_sum")
-		}
-
-		if m.Summary.SampleCount != nil {
-			count := &model.Sample{
-				Metric:    model.Metric{},
-				Value:     model.SampleValue(m.Summary.GetSampleCount()),
-				Timestamp: timestamp,
-			}
-			samples = append(samples, count)
-
-			metric := count.Metric
-			for _, p := range m.Label {
-				metric[model.LabelName(p.GetName())] = model.LabelValue(p.GetValue())
-			}
-			metric[model.MetricNameLabel] = model.LabelValue(f.GetName() + "_count")
-		}
-	}
-
-	return out.Ingest(samples)
-}
-
-func extractUntyped(out Ingester, o *ProcessOptions, f *dto.MetricFamily) error {
-	samples := make(model.Samples, 0, len(f.Metric))
-
-	for _, m := range f.Metric {
-		if m.Untyped == nil {
-			continue
-		}
-
-		sample := &model.Sample{
-			Metric: model.Metric{},
-			Value:  model.SampleValue(m.Untyped.GetValue()),
-		}
-		samples = append(samples, sample)
-
-		if m.TimestampMs != nil {
-			sample.Timestamp = model.TimestampFromUnixNano(*m.TimestampMs * 1000000)
-		} else {
-			sample.Timestamp = o.Timestamp
-		}
-
-		metric := sample.Metric
-		for _, p := range m.Label {
-			metric[model.LabelName(p.GetName())] = model.LabelValue(p.GetValue())
-		}
-		metric[model.MetricNameLabel] = model.LabelValue(f.GetName())
-	}
-
-	return out.Ingest(samples)
-}
-
-func extractHistogram(out Ingester, o *ProcessOptions, f *dto.MetricFamily) error {
-	samples := make(model.Samples, 0, len(f.Metric))
-
-	for _, m := range f.Metric {
-		if m.Histogram == nil {
-			continue
-		}
-
-		timestamp := o.Timestamp
-		if m.TimestampMs != nil {
-			timestamp = model.TimestampFromUnixNano(*m.TimestampMs * 1000000)
-		}
-
-		infSeen := false
-
-		for _, q := range m.Histogram.Bucket {
-			sample := &model.Sample{
-				Metric:    model.Metric{},
-				Value:     model.SampleValue(q.GetCumulativeCount()),
-				Timestamp: timestamp,
-			}
-			samples = append(samples, sample)
-
-			metric := sample.Metric
-			for _, p := range m.Label {
-				metric[model.LabelName(p.GetName())] = model.LabelValue(p.GetValue())
-			}
-			metric[model.LabelName(model.BucketLabel)] = model.LabelValue(fmt.Sprint(q.GetUpperBound()))
-			metric[model.MetricNameLabel] = model.LabelValue(f.GetName() + "_bucket")
-
-			if math.IsInf(q.GetUpperBound(), +1) {
-				infSeen = true
-			}
-		}
-
-		if m.Histogram.SampleSum != nil {
-			sum := &model.Sample{
-				Metric:    model.Metric{},
-				Value:     model.SampleValue(m.Histogram.GetSampleSum()),
-				Timestamp: timestamp,
-			}
-			samples = append(samples, sum)
-
-			metric := sum.Metric
-			for _, p := range m.Label {
-				metric[model.LabelName(p.GetName())] = model.LabelValue(p.GetValue())
-			}
-			metric[model.MetricNameLabel] = model.LabelValue(f.GetName() + "_sum")
-		}
-
-		if m.Histogram.SampleCount != nil {
-			count := &model.Sample{
-				Metric:    model.Metric{},
-				Value:     model.SampleValue(m.Histogram.GetSampleCount()),
-				Timestamp: timestamp,
-			}
-			samples = append(samples, count)
-
-			metric := count.Metric
-			for _, p := range m.Label {
-				metric[model.LabelName(p.GetName())] = model.LabelValue(p.GetValue())
-			}
-			metric[model.MetricNameLabel] = model.LabelValue(f.GetName() + "_count")
-
-			if !infSeen {
-				infBucket := &model.Sample{
-					Metric:    model.Metric{},
-					Value:     count.Value,
-					Timestamp: timestamp,
-				}
-				samples = append(samples, infBucket)
-
-				metric := infBucket.Metric
-				for _, p := range m.Label {
-					metric[model.LabelName(p.GetName())] = model.LabelValue(p.GetValue())
-				}
-				metric[model.LabelName(model.BucketLabel)] = model.LabelValue("+Inf")
-				metric[model.MetricNameLabel] = model.LabelValue(f.GetName() + "_bucket")
-			}
-		}
-	}
-
-	return out.Ingest(samples)
-}
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/extraction/metricfamilyprocessor_test.go b/Godeps/_workspace/src/github.com/prometheus/client_golang/extraction/metricfamilyprocessor_test.go
deleted file mode 100644
index 9ba0fdbce..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/client_golang/extraction/metricfamilyprocessor_test.go
+++ /dev/null
@@ -1,153 +0,0 @@
-// Copyright 2013 The Prometheus Authors
-// 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 extraction
-
-import (
-	"sort"
-	"strings"
-	"testing"
-
-	"github.com/prometheus/client_golang/model"
-)
-
-var testTime = model.Now()
-
-type metricFamilyProcessorScenario struct {
-	in               string
-	expected, actual []model.Samples
-}
-
-func (s *metricFamilyProcessorScenario) Ingest(samples model.Samples) error {
-	s.actual = append(s.actual, samples)
-	return nil
-}
-
-func (s *metricFamilyProcessorScenario) test(t *testing.T, set int) {
-	i := strings.NewReader(s.in)
-
-	o := &ProcessOptions{
-		Timestamp: testTime,
-	}
-
-	err := MetricFamilyProcessor.ProcessSingle(i, s, o)
-	if err != nil {
-		t.Fatalf("%d. got error: %s", set, err)
-	}
-
-	if len(s.expected) != len(s.actual) {
-		t.Fatalf("%d. expected length %d, got %d", set, len(s.expected), len(s.actual))
-	}
-
-	for i, expected := range s.expected {
-		sort.Sort(s.actual[i])
-		sort.Sort(expected)
-
-		if !expected.Equal(s.actual[i]) {
-			t.Errorf("%d.%d. expected %s, got %s", set, i, expected, s.actual[i])
-		}
-	}
-}
-
-func TestMetricFamilyProcessor(t *testing.T) {
-	scenarios := []metricFamilyProcessorScenario{
-		{
-			in: "",
-		},
-		{
-			in: "\x8f\x01\n\rrequest_count\x12\x12Number of requests\x18\x00\"0\n#\n\x0fsome_label_name\x12\x10some_label_value\x1a\t\t\x00\x00\x00\x00\x00\x00E\xc0\"6\n)\n\x12another_label_name\x12\x13another_label_value\x1a\t\t\x00\x00\x00\x00\x00\x00U@",
-			expected: []model.Samples{
-				model.Samples{
-					&model.Sample{
-						Metric:    model.Metric{model.MetricNameLabel: "request_count", "some_label_name": "some_label_value"},
-						Value:     -42,
-						Timestamp: testTime,
-					},
-					&model.Sample{
-						Metric:    model.Metric{model.MetricNameLabel: "request_count", "another_label_name": "another_label_value"},
-						Value:     84,
-						Timestamp: testTime,
-					},
-				},
-			},
-		},
-		{
-			in: "\xb9\x01\n\rrequest_count\x12\x12Number of requests\x18\x02\"O\n#\n\x0fsome_label_name\x12\x10some_label_value\"(\x1a\x12\t\xaeG\xe1z\x14\xae\xef?\x11\x00\x00\x00\x00\x00\x00E\xc0\x1a\x12\t+\x87\x16\xd9\xce\xf7\xef?\x11\x00\x00\x00\x00\x00\x00U\xc0\"A\n)\n\x12another_label_name\x12\x13another_label_value\"\x14\x1a\x12\t\x00\x00\x00\x00\x00\x00\xe0?\x11\x00\x00\x00\x00\x00\x00$@",
-			expected: []model.Samples{
-				model.Samples{
-					&model.Sample{
-						Metric:    model.Metric{model.MetricNameLabel: "request_count", "some_label_name": "some_label_value", "quantile": "0.99"},
-						Value:     -42,
-						Timestamp: testTime,
-					},
-					&model.Sample{
-						Metric:    model.Metric{model.MetricNameLabel: "request_count", "some_label_name": "some_label_value", "quantile": "0.999"},
-						Value:     -84,
-						Timestamp: testTime,
-					},
-					&model.Sample{
-						Metric:    model.Metric{model.MetricNameLabel: "request_count", "another_label_name": "another_label_value", "quantile": "0.5"},
-						Value:     10,
-						Timestamp: testTime,
-					},
-				},
-			},
-		},
-		{
-			in: "\x8d\x01\n\x1drequest_duration_microseconds\x12\x15The response latency.\x18\x04\"S:Q\b\x85\x15\x11\xcd\xcc\xccL\x8f\xcb:A\x1a\v\b{\x11\x00\x00\x00\x00\x00\x00Y@\x1a\f\b\x9c\x03\x11\x00\x00\x00\x00\x00\x00^@\x1a\f\b\xd0\x04\x11\x00\x00\x00\x00\x00\x00b@\x1a\f\b\xf4\v\x11\x9a\x99\x99\x99\x99\x99e@\x1a\f\b\x85\x15\x11\x00\x00\x00\x00\x00\x00\xf0\u007f",
-			expected: []model.Samples{
-				model.Samples{
-					&model.Sample{
-						Metric:    model.Metric{model.MetricNameLabel: "request_duration_microseconds_bucket", "le": "100"},
-						Value:     123,
-						Timestamp: testTime,
-					},
-					&model.Sample{
-						Metric:    model.Metric{model.MetricNameLabel: "request_duration_microseconds_bucket", "le": "120"},
-						Value:     412,
-						Timestamp: testTime,
-					},
-					&model.Sample{
-						Metric:    model.Metric{model.MetricNameLabel: "request_duration_microseconds_bucket", "le": "144"},
-						Value:     592,
-						Timestamp: testTime,
-					},
-					&model.Sample{
-						Metric:    model.Metric{model.MetricNameLabel: "request_duration_microseconds_bucket", "le": "172.8"},
-						Value:     1524,
-						Timestamp: testTime,
-					},
-					&model.Sample{
-						Metric:    model.Metric{model.MetricNameLabel: "request_duration_microseconds_bucket", "le": "+Inf"},
-						Value:     2693,
-						Timestamp: testTime,
-					},
-					&model.Sample{
-						Metric:    model.Metric{model.MetricNameLabel: "request_duration_microseconds_sum"},
-						Value:     1756047.3,
-						Timestamp: testTime,
-					},
-					&model.Sample{
-						Metric:    model.Metric{model.MetricNameLabel: "request_duration_microseconds_count"},
-						Value:     2693,
-						Timestamp: testTime,
-					},
-				},
-			},
-		},
-	}
-
-	for i, scenario := range scenarios {
-		scenario.test(t, i)
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/extraction/processor.go b/Godeps/_workspace/src/github.com/prometheus/client_golang/extraction/processor.go
deleted file mode 100644
index 50c93c9e6..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/client_golang/extraction/processor.go
+++ /dev/null
@@ -1,84 +0,0 @@
-// Copyright 2013 The Prometheus Authors
-// 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 extraction
-
-import (
-	"io"
-	"time"
-
-	"github.com/prometheus/client_golang/model"
-)
-
-// ProcessOptions dictates how the interpreted stream should be rendered for
-// consumption.
-type ProcessOptions struct {
-	// Timestamp is added to each value from the stream that has no explicit
-	// timestamp set.
-	Timestamp model.Timestamp
-}
-
-// Ingester consumes result streams in whatever way is desired by the user.
-type Ingester interface {
-	Ingest(model.Samples) error
-}
-
-// Processor is responsible for decoding the actual message responses from
-// stream into a format that can be consumed with the end result written
-// to the results channel.
-type Processor interface {
-	// ProcessSingle treats the input as a single self-contained message body and
-	// transforms it accordingly.  It has no support for streaming.
-	ProcessSingle(in io.Reader, out Ingester, o *ProcessOptions) error
-}
-
-// Helper function to convert map[string]string into LabelSet.
-//
-// NOTE: This should be deleted when support for go 1.0.3 is removed; 1.1 is
-//       smart enough to unmarshal JSON objects into LabelSet directly.
-func labelSet(labels map[string]string) model.LabelSet {
-	labelset := make(model.LabelSet, len(labels))
-
-	for k, v := range labels {
-		labelset[model.LabelName(k)] = model.LabelValue(v)
-	}
-
-	return labelset
-}
-
-// A basic interface only useful in testing contexts for dispensing the time
-// in a controlled manner.
-type instantProvider interface {
-	// The current instant.
-	Now() time.Time
-}
-
-// Clock is a simple means for fluently wrapping around standard Go timekeeping
-// mechanisms to enhance testability without compromising code readability.
-//
-// It is sufficient for use on bare initialization.  A provider should be
-// set only for test contexts.  When not provided, it emits the current
-// system time.
-type clock struct {
-	// The underlying means through which time is provided, if supplied.
-	Provider instantProvider
-}
-
-// Emit the current instant.
-func (t *clock) Now() time.Time {
-	if t.Provider == nil {
-		return time.Now()
-	}
-
-	return t.Provider.Now()
-}
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/extraction/processor0_0_1.go b/Godeps/_workspace/src/github.com/prometheus/client_golang/extraction/processor0_0_1.go
deleted file mode 100644
index 7a728efb0..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/client_golang/extraction/processor0_0_1.go
+++ /dev/null
@@ -1,127 +0,0 @@
-// Copyright 2013 The Prometheus Authors
-// 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 extraction
-
-import (
-	"encoding/json"
-	"fmt"
-	"io"
-	"io/ioutil"
-
-	"github.com/prometheus/client_golang/model"
-)
-
-const (
-	baseLabels001 = "baseLabels"
-	counter001    = "counter"
-	docstring001  = "docstring"
-	gauge001      = "gauge"
-	histogram001  = "histogram"
-	labels001     = "labels"
-	metric001     = "metric"
-	type001       = "type"
-	value001      = "value"
-	percentile001 = "percentile"
-)
-
-// Processor001 is responsible for decoding payloads from protocol version
-// 0.0.1.
-var Processor001 = &processor001{}
-
-// processor001 is responsible for handling API version 0.0.1.
-type processor001 struct{}
-
-// entity001 represents a the JSON structure that 0.0.1 uses.
-type entity001 []struct {
-	BaseLabels map[string]string `json:"baseLabels"`
-	Docstring  string            `json:"docstring"`
-	Metric     struct {
-		MetricType string `json:"type"`
-		Value      []struct {
-			Labels map[string]string `json:"labels"`
-			Value  interface{}       `json:"value"`
-		} `json:"value"`
-	} `json:"metric"`
-}
-
-func (p *processor001) ProcessSingle(in io.Reader, out Ingester, o *ProcessOptions) error {
-	// TODO(matt): Replace with plain-jane JSON unmarshalling.
-	buffer, err := ioutil.ReadAll(in)
-	if err != nil {
-		return err
-	}
-
-	entities := entity001{}
-	if err = json.Unmarshal(buffer, &entities); err != nil {
-		return err
-	}
-
-	// TODO(matt): This outer loop is a great basis for parallelization.
-	pendingSamples := model.Samples{}
-	for _, entity := range entities {
-		for _, value := range entity.Metric.Value {
-			labels := labelSet(entity.BaseLabels).Merge(labelSet(value.Labels))
-
-			switch entity.Metric.MetricType {
-			case gauge001, counter001:
-				sampleValue, ok := value.Value.(float64)
-				if !ok {
-					return fmt.Errorf("could not convert value from %s %s to float64", entity, value)
-				}
-
-				pendingSamples = append(pendingSamples, &model.Sample{
-					Metric:    model.Metric(labels),
-					Timestamp: o.Timestamp,
-					Value:     model.SampleValue(sampleValue),
-				})
-
-				break
-
-			case histogram001:
-				sampleValue, ok := value.Value.(map[string]interface{})
-				if !ok {
-					return fmt.Errorf("could not convert value from %q to a map[string]interface{}", value.Value)
-				}
-
-				for percentile, percentileValue := range sampleValue {
-					individualValue, ok := percentileValue.(float64)
-					if !ok {
-						return fmt.Errorf("could not convert value from %q to a float64", percentileValue)
-					}
-
-					childMetric := make(map[model.LabelName]model.LabelValue, len(labels)+1)
-
-					for k, v := range labels {
-						childMetric[k] = v
-					}
-
-					childMetric[model.LabelName(percentile001)] = model.LabelValue(percentile)
-
-					pendingSamples = append(pendingSamples, &model.Sample{
-						Metric:    model.Metric(childMetric),
-						Timestamp: o.Timestamp,
-						Value:     model.SampleValue(individualValue),
-					})
-				}
-
-				break
-			}
-		}
-	}
-	if len(pendingSamples) > 0 {
-		return out.Ingest(pendingSamples)
-	}
-
-	return nil
-}
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/extraction/processor0_0_1_test.go b/Godeps/_workspace/src/github.com/prometheus/client_golang/extraction/processor0_0_1_test.go
deleted file mode 100644
index b970b03e9..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/client_golang/extraction/processor0_0_1_test.go
+++ /dev/null
@@ -1,185 +0,0 @@
-// Copyright 2013 The Prometheus Authors
-// 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 extraction
-
-import (
-	"errors"
-	"os"
-	"path"
-	"sort"
-	"testing"
-
-	"github.com/prometheus/client_golang/model"
-)
-
-var test001Time = model.Now()
-
-type testProcessor001ProcessScenario struct {
-	in               string
-	expected, actual []model.Samples
-	err              error
-}
-
-func (s *testProcessor001ProcessScenario) Ingest(samples model.Samples) error {
-	s.actual = append(s.actual, samples)
-	return nil
-}
-
-func (s *testProcessor001ProcessScenario) test(t testing.TB, set int) {
-	reader, err := os.Open(path.Join("fixtures", s.in))
-	if err != nil {
-		t.Fatalf("%d. couldn't open scenario input file %s: %s", set, s.in, err)
-	}
-
-	options := &ProcessOptions{
-		Timestamp: test001Time,
-	}
-	err = Processor001.ProcessSingle(reader, s, options)
-	if s.err != err && (s.err == nil || err == nil || err.Error() != s.err.Error()) {
-		t.Fatalf("%d. expected err of %s, got %s", set, s.err, err)
-	}
-
-	if len(s.actual) != len(s.expected) {
-		t.Fatalf("%d. expected output length of %d, got %d", set, len(s.expected), len(s.actual))
-	}
-
-	for i, expected := range s.expected {
-		sort.Sort(s.actual[i])
-		sort.Sort(expected)
-
-		if !expected.Equal(s.actual[i]) {
-			t.Errorf("%d.%d. expected %s, got %s", set, i, expected, s.actual[i])
-		}
-	}
-}
-
-func testProcessor001Process(t testing.TB) {
-	var scenarios = []testProcessor001ProcessScenario{
-		{
-			in:  "empty.json",
-			err: errors.New("unexpected end of JSON input"),
-		},
-		{
-			in: "test0_0_1-0_0_2.json",
-			expected: []model.Samples{
-				model.Samples{
-					&model.Sample{
-						Metric:    model.Metric{"service": "zed", model.MetricNameLabel: "rpc_calls_total", "job": "batch_job"},
-						Value:     25,
-						Timestamp: test001Time,
-					},
-					&model.Sample{
-						Metric:    model.Metric{"service": "bar", model.MetricNameLabel: "rpc_calls_total", "job": "batch_job"},
-						Value:     25,
-						Timestamp: test001Time,
-					},
-					&model.Sample{
-						Metric:    model.Metric{"service": "foo", model.MetricNameLabel: "rpc_calls_total", "job": "batch_job"},
-						Value:     25,
-						Timestamp: test001Time,
-					},
-					&model.Sample{
-						Metric:    model.Metric{"percentile": "0.010000", model.MetricNameLabel: "rpc_latency_microseconds", "service": "zed"},
-						Value:     0.0459814091918713,
-						Timestamp: test001Time,
-					},
-					&model.Sample{
-						Metric:    model.Metric{"percentile": "0.010000", model.MetricNameLabel: "rpc_latency_microseconds", "service": "bar"},
-						Value:     78.48563317257356,
-						Timestamp: test001Time,
-					},
-					&model.Sample{
-						Metric:    model.Metric{"percentile": "0.010000", model.MetricNameLabel: "rpc_latency_microseconds", "service": "foo"},
-						Value:     15.890724674774395,
-						Timestamp: test001Time,
-					},
-					&model.Sample{
-						Metric:    model.Metric{"percentile": "0.050000", model.MetricNameLabel: "rpc_latency_microseconds", "service": "zed"},
-						Value:     0.0459814091918713,
-						Timestamp: test001Time,
-					},
-					&model.Sample{
-						Metric:    model.Metric{"percentile": "0.050000", model.MetricNameLabel: "rpc_latency_microseconds", "service": "bar"},
-						Value:     78.48563317257356,
-						Timestamp: test001Time,
-					},
-					&model.Sample{
-						Metric:    model.Metric{"percentile": "0.050000", model.MetricNameLabel: "rpc_latency_microseconds", "service": "foo"},
-						Value:     15.890724674774395,
-						Timestamp: test001Time,
-					},
-					&model.Sample{
-						Metric:    model.Metric{"percentile": "0.500000", model.MetricNameLabel: "rpc_latency_microseconds", "service": "zed"},
-						Value:     0.6120456642749681,
-						Timestamp: test001Time,
-					},
-					&model.Sample{
-						Metric:    model.Metric{"percentile": "0.500000", model.MetricNameLabel: "rpc_latency_microseconds", "service": "bar"},
-						Value:     97.31798360385088,
-						Timestamp: test001Time,
-					},
-					&model.Sample{
-						Metric:    model.Metric{"percentile": "0.500000", model.MetricNameLabel: "rpc_latency_microseconds", "service": "foo"},
-						Value:     84.63044031436561,
-						Timestamp: test001Time,
-					},
-					&model.Sample{
-						Metric:    model.Metric{"percentile": "0.900000", model.MetricNameLabel: "rpc_latency_microseconds", "service": "zed"},
-						Value:     1.355915069887731,
-						Timestamp: test001Time,
-					},
-					&model.Sample{
-						Metric:    model.Metric{"percentile": "0.900000", model.MetricNameLabel: "rpc_latency_microseconds", "service": "bar"},
-						Value:     109.89202084295582,
-						Timestamp: test001Time,
-					},
-					&model.Sample{
-						Metric:    model.Metric{"percentile": "0.900000", model.MetricNameLabel: "rpc_latency_microseconds", "service": "foo"},
-						Value:     160.21100853053224,
-						Timestamp: test001Time,
-					},
-					&model.Sample{
-						Metric:    model.Metric{"percentile": "0.990000", model.MetricNameLabel: "rpc_latency_microseconds", "service": "zed"},
-						Value:     1.772733213161236,
-						Timestamp: test001Time,
-					},
-					&model.Sample{
-						Metric:    model.Metric{"percentile": "0.990000", model.MetricNameLabel: "rpc_latency_microseconds", "service": "bar"},
-						Value:     109.99626121011262,
-						Timestamp: test001Time,
-					},
-					&model.Sample{
-						Metric:    model.Metric{"percentile": "0.990000", model.MetricNameLabel: "rpc_latency_microseconds", "service": "foo"},
-						Value:     172.49828748957728,
-						Timestamp: test001Time,
-					},
-				},
-			},
-		},
-	}
-
-	for i, scenario := range scenarios {
-		scenario.test(t, i)
-	}
-}
-
-func TestProcessor001Process(t *testing.T) {
-	testProcessor001Process(t)
-}
-
-func BenchmarkProcessor001Process(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		testProcessor001Process(b)
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/extraction/processor0_0_2.go b/Godeps/_workspace/src/github.com/prometheus/client_golang/extraction/processor0_0_2.go
deleted file mode 100644
index 24c7e8155..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/client_golang/extraction/processor0_0_2.go
+++ /dev/null
@@ -1,106 +0,0 @@
-// Copyright 2013 The Prometheus Authors
-// 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 extraction
-
-import (
-	"encoding/json"
-	"fmt"
-	"io"
-
-	"github.com/prometheus/client_golang/model"
-)
-
-// Processor002 is responsible for decoding payloads from protocol version
-// 0.0.2.
-var Processor002 = &processor002{}
-
-type histogram002 struct {
-	Labels map[string]string            `json:"labels"`
-	Values map[string]model.SampleValue `json:"value"`
-}
-
-type counter002 struct {
-	Labels map[string]string `json:"labels"`
-	Value  model.SampleValue `json:"value"`
-}
-
-type processor002 struct{}
-
-func (p *processor002) ProcessSingle(in io.Reader, out Ingester, o *ProcessOptions) error {
-	// Processor for telemetry schema version 0.0.2.
-	// container for telemetry data
-	var entities []struct {
-		BaseLabels map[string]string `json:"baseLabels"`
-		Docstring  string            `json:"docstring"`
-		Metric     struct {
-			Type   string          `json:"type"`
-			Values json.RawMessage `json:"value"`
-		} `json:"metric"`
-	}
-
-	if err := json.NewDecoder(in).Decode(&entities); err != nil {
-		return err
-	}
-
-	pendingSamples := model.Samples{}
-	for _, entity := range entities {
-		switch entity.Metric.Type {
-		case "counter", "gauge":
-			var values []counter002
-
-			if err := json.Unmarshal(entity.Metric.Values, &values); err != nil {
-				return fmt.Errorf("could not extract %s value: %s", entity.Metric.Type, err)
-			}
-
-			for _, counter := range values {
-				labels := labelSet(entity.BaseLabels).Merge(labelSet(counter.Labels))
-
-				pendingSamples = append(pendingSamples, &model.Sample{
-					Metric:    model.Metric(labels),
-					Timestamp: o.Timestamp,
-					Value:     counter.Value,
-				})
-			}
-
-		case "histogram":
-			var values []histogram002
-
-			if err := json.Unmarshal(entity.Metric.Values, &values); err != nil {
-				return fmt.Errorf("could not extract %s value: %s", entity.Metric.Type, err)
-			}
-
-			for _, histogram := range values {
-				for percentile, value := range histogram.Values {
-					labels := labelSet(entity.BaseLabels).Merge(labelSet(histogram.Labels))
-					labels[model.LabelName("percentile")] = model.LabelValue(percentile)
-
-					pendingSamples = append(pendingSamples, &model.Sample{
-						Metric:    model.Metric(labels),
-						Timestamp: o.Timestamp,
-						Value:     value,
-					})
-				}
-			}
-
-		default:
-			return fmt.Errorf("unknown metric type %q", entity.Metric.Type)
-		}
-	}
-
-	if len(pendingSamples) > 0 {
-		return out.Ingest(pendingSamples)
-	}
-
-	return nil
-}
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/extraction/processor0_0_2_test.go b/Godeps/_workspace/src/github.com/prometheus/client_golang/extraction/processor0_0_2_test.go
deleted file mode 100644
index b2b758702..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/client_golang/extraction/processor0_0_2_test.go
+++ /dev/null
@@ -1,225 +0,0 @@
-// Copyright 2013 The Prometheus Authors
-// 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 extraction
-
-import (
-	"bytes"
-	"errors"
-	"io/ioutil"
-	"os"
-	"path"
-	"runtime"
-	"sort"
-	"testing"
-
-	"github.com/prometheus/client_golang/model"
-)
-
-var test002Time = model.Now()
-
-type testProcessor002ProcessScenario struct {
-	in               string
-	expected, actual []model.Samples
-	err              error
-}
-
-func (s *testProcessor002ProcessScenario) Ingest(samples model.Samples) error {
-	s.actual = append(s.actual, samples)
-	return nil
-}
-
-func (s *testProcessor002ProcessScenario) test(t testing.TB, set int) {
-	reader, err := os.Open(path.Join("fixtures", s.in))
-	if err != nil {
-		t.Fatalf("%d. couldn't open scenario input file %s: %s", set, s.in, err)
-	}
-
-	options := &ProcessOptions{
-		Timestamp: test002Time,
-	}
-	err = Processor002.ProcessSingle(reader, s, options)
-	if s.err != err && (s.err == nil || err == nil || err.Error() != s.err.Error()) {
-		t.Fatalf("%d. expected err of %s, got %s", set, s.err, err)
-	}
-
-	if len(s.actual) != len(s.expected) {
-		t.Fatalf("%d. expected output length of %d, got %d", set, len(s.expected), len(s.actual))
-	}
-
-	for i, expected := range s.expected {
-		sort.Sort(s.actual[i])
-		sort.Sort(expected)
-
-		if !expected.Equal(s.actual[i]) {
-			t.Fatalf("%d.%d. expected %s, got %s", set, i, expected, s.actual[i])
-		}
-	}
-}
-
-func testProcessor002Process(t testing.TB) {
-	var scenarios = []testProcessor002ProcessScenario{
-		{
-			in:  "empty.json",
-			err: errors.New("EOF"),
-		},
-		{
-			in: "test0_0_1-0_0_2.json",
-			expected: []model.Samples{
-				model.Samples{
-					&model.Sample{
-						Metric:    model.Metric{"service": "zed", model.MetricNameLabel: "rpc_calls_total", "job": "batch_job"},
-						Value:     25,
-						Timestamp: test002Time,
-					},
-					&model.Sample{
-						Metric:    model.Metric{"service": "bar", model.MetricNameLabel: "rpc_calls_total", "job": "batch_job"},
-						Value:     25,
-						Timestamp: test002Time,
-					},
-					&model.Sample{
-						Metric:    model.Metric{"service": "foo", model.MetricNameLabel: "rpc_calls_total", "job": "batch_job"},
-						Value:     25,
-						Timestamp: test002Time,
-					},
-					&model.Sample{
-						Metric:    model.Metric{"percentile": "0.010000", model.MetricNameLabel: "rpc_latency_microseconds", "service": "zed"},
-						Value:     0.0459814091918713,
-						Timestamp: test002Time,
-					},
-					&model.Sample{
-						Metric:    model.Metric{"percentile": "0.010000", model.MetricNameLabel: "rpc_latency_microseconds", "service": "bar"},
-						Value:     78.48563317257356,
-						Timestamp: test002Time,
-					},
-					&model.Sample{
-						Metric:    model.Metric{"percentile": "0.010000", model.MetricNameLabel: "rpc_latency_microseconds", "service": "foo"},
-						Value:     15.890724674774395,
-						Timestamp: test002Time,
-					},
-					&model.Sample{
-
-						Metric:    model.Metric{"percentile": "0.050000", model.MetricNameLabel: "rpc_latency_microseconds", "service": "zed"},
-						Value:     0.0459814091918713,
-						Timestamp: test002Time,
-					},
-					&model.Sample{
-						Metric:    model.Metric{"percentile": "0.050000", model.MetricNameLabel: "rpc_latency_microseconds", "service": "bar"},
-						Value:     78.48563317257356,
-						Timestamp: test002Time,
-					},
-					&model.Sample{
-						Metric:    model.Metric{"percentile": "0.050000", model.MetricNameLabel: "rpc_latency_microseconds", "service": "foo"},
-						Value:     15.890724674774395,
-						Timestamp: test002Time,
-					},
-					&model.Sample{
-						Metric:    model.Metric{"percentile": "0.500000", model.MetricNameLabel: "rpc_latency_microseconds", "service": "zed"},
-						Value:     0.6120456642749681,
-						Timestamp: test002Time,
-					},
-					&model.Sample{
-						Metric:    model.Metric{"percentile": "0.500000", model.MetricNameLabel: "rpc_latency_microseconds", "service": "bar"},
-						Value:     97.31798360385088,
-						Timestamp: test002Time,
-					},
-					&model.Sample{
-						Metric:    model.Metric{"percentile": "0.500000", model.MetricNameLabel: "rpc_latency_microseconds", "service": "foo"},
-						Value:     84.63044031436561,
-						Timestamp: test002Time,
-					},
-					&model.Sample{
-						Metric:    model.Metric{"percentile": "0.900000", model.MetricNameLabel: "rpc_latency_microseconds", "service": "zed"},
-						Value:     1.355915069887731,
-						Timestamp: test002Time,
-					},
-					&model.Sample{
-						Metric:    model.Metric{"percentile": "0.900000", model.MetricNameLabel: "rpc_latency_microseconds", "service": "bar"},
-						Value:     109.89202084295582,
-						Timestamp: test002Time,
-					},
-					&model.Sample{
-						Metric:    model.Metric{"percentile": "0.900000", model.MetricNameLabel: "rpc_latency_microseconds", "service": "foo"},
-						Value:     160.21100853053224,
-						Timestamp: test002Time,
-					},
-					&model.Sample{
-						Metric:    model.Metric{"percentile": "0.990000", model.MetricNameLabel: "rpc_latency_microseconds", "service": "zed"},
-						Value:     1.772733213161236,
-						Timestamp: test002Time,
-					},
-					&model.Sample{
-						Metric:    model.Metric{"percentile": "0.990000", model.MetricNameLabel: "rpc_latency_microseconds", "service": "bar"},
-						Value:     109.99626121011262,
-						Timestamp: test002Time,
-					},
-					&model.Sample{
-						Metric:    model.Metric{"percentile": "0.990000", model.MetricNameLabel: "rpc_latency_microseconds", "service": "foo"},
-						Value:     172.49828748957728,
-						Timestamp: test002Time,
-					},
-				},
-			},
-		},
-	}
-
-	for i, scenario := range scenarios {
-		scenario.test(t, i)
-	}
-}
-
-func TestProcessor002Process(t *testing.T) {
-	testProcessor002Process(t)
-}
-
-func BenchmarkProcessor002Process(b *testing.B) {
-	b.StopTimer()
-
-	pre := runtime.MemStats{}
-	runtime.ReadMemStats(&pre)
-
-	b.StartTimer()
-
-	for i := 0; i < b.N; i++ {
-		testProcessor002Process(b)
-	}
-
-	post := runtime.MemStats{}
-	runtime.ReadMemStats(&post)
-
-	allocated := post.TotalAlloc - pre.TotalAlloc
-
-	b.Logf("Allocated %d at %f per cycle with %d cycles.", allocated, float64(allocated)/float64(b.N), b.N)
-}
-
-func BenchmarkProcessor002ParseOnly(b *testing.B) {
-	b.StopTimer()
-	data, err := ioutil.ReadFile("fixtures/test0_0_1-0_0_2-large.json")
-	if err != nil {
-		b.Fatal(err)
-	}
-	ing := fakeIngester{}
-	b.StartTimer()
-
-	for i := 0; i < b.N; i++ {
-		if err := Processor002.ProcessSingle(bytes.NewReader(data), ing, &ProcessOptions{}); err != nil {
-			b.Fatal(err)
-		}
-	}
-}
-
-type fakeIngester struct{}
-
-func (i fakeIngester) Ingest(model.Samples) error {
-	return nil
-}
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/extraction/textprocessor.go b/Godeps/_workspace/src/github.com/prometheus/client_golang/extraction/textprocessor.go
deleted file mode 100644
index 2eca1c63a..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/client_golang/extraction/textprocessor.go
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright 2014 The Prometheus Authors
-// 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 extraction
-
-import (
-	"io"
-
-	"github.com/prometheus/client_golang/text"
-)
-
-type processor004 struct{}
-
-// Processor004 s responsible for decoding payloads from the text based variety
-// of protocol version 0.0.4.
-var Processor004 = &processor004{}
-
-func (t *processor004) ProcessSingle(i io.Reader, out Ingester, o *ProcessOptions) error {
-	var parser text.Parser
-	metricFamilies, err := parser.TextToMetricFamilies(i)
-	if err != nil {
-		return err
-	}
-	for _, metricFamily := range metricFamilies {
-		if err := extractMetricFamily(out, o, metricFamily); err != nil {
-			return err
-		}
-	}
-	return nil
-}
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/extraction/textprocessor_test.go b/Godeps/_workspace/src/github.com/prometheus/client_golang/extraction/textprocessor_test.go
deleted file mode 100644
index ff704a9bc..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/client_golang/extraction/textprocessor_test.go
+++ /dev/null
@@ -1,100 +0,0 @@
-// Copyright 2014 The Prometheus Authors
-// 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 extraction
-
-import (
-	"sort"
-	"strings"
-	"testing"
-
-	"github.com/prometheus/client_golang/model"
-)
-
-var (
-	ts = model.Now()
-	in = `
-# Only a quite simple scenario with two metric families.
-# More complicated tests of the parser itself can be found in the text package.
-# TYPE mf2 counter
-mf2 3
-mf1{label="value1"} -3.14 123456
-mf1{label="value2"} 42
-mf2 4
-`
-	out = map[model.LabelValue]model.Samples{
-		"mf1": model.Samples{
-			&model.Sample{
-				Metric:    model.Metric{model.MetricNameLabel: "mf1", "label": "value1"},
-				Value:     -3.14,
-				Timestamp: 123456,
-			},
-			&model.Sample{
-				Metric:    model.Metric{model.MetricNameLabel: "mf1", "label": "value2"},
-				Value:     42,
-				Timestamp: ts,
-			},
-		},
-		"mf2": model.Samples{
-			&model.Sample{
-				Metric:    model.Metric{model.MetricNameLabel: "mf2"},
-				Value:     3,
-				Timestamp: ts,
-			},
-			&model.Sample{
-				Metric:    model.Metric{model.MetricNameLabel: "mf2"},
-				Value:     4,
-				Timestamp: ts,
-			},
-		},
-	}
-)
-
-type testIngester struct {
-	results []model.Samples
-}
-
-func (i *testIngester) Ingest(s model.Samples) error {
-	i.results = append(i.results, s)
-	return nil
-}
-
-func TestTextProcessor(t *testing.T) {
-	var ingester testIngester
-	i := strings.NewReader(in)
-	o := &ProcessOptions{
-		Timestamp: ts,
-	}
-
-	err := Processor004.ProcessSingle(i, &ingester, o)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if expected, got := len(out), len(ingester.results); expected != got {
-		t.Fatalf("Expected length %d, got %d", expected, got)
-	}
-	for _, r := range ingester.results {
-		expected, ok := out[r[0].Metric[model.MetricNameLabel]]
-		if !ok {
-			t.Fatalf(
-				"Unexpected metric name %q",
-				r[0].Metric[model.MetricNameLabel],
-			)
-		}
-		sort.Sort(expected)
-		sort.Sort(r)
-		if !expected.Equal(r) {
-			t.Errorf("expected %s, got %s", expected, r)
-		}
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/model/fingerprinting.go b/Godeps/_workspace/src/github.com/prometheus/client_golang/model/fingerprinting.go
deleted file mode 100644
index 5b2ffe3bb..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/client_golang/model/fingerprinting.go
+++ /dev/null
@@ -1,110 +0,0 @@
-// Copyright 2013 The Prometheus Authors
-// 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 model
-
-import (
-	"fmt"
-	"strconv"
-)
-
-// Fingerprint provides a hash-capable representation of a Metric.
-// For our purposes, FNV-1A 64-bit is used.
-type Fingerprint uint64
-
-func (f Fingerprint) String() string {
-	return fmt.Sprintf("%016x", uint64(f))
-}
-
-// Less implements sort.Interface.
-func (f Fingerprint) Less(o Fingerprint) bool {
-	return f < o
-}
-
-// Equal implements sort.Interface.
-func (f Fingerprint) Equal(o Fingerprint) bool {
-	return f == o
-}
-
-// LoadFromString transforms a string representation into a Fingerprint.
-func (f *Fingerprint) LoadFromString(s string) error {
-	num, err := strconv.ParseUint(s, 16, 64)
-	if err != nil {
-		return err
-	}
-	*f = Fingerprint(num)
-	return nil
-}
-
-// Fingerprints represents a collection of Fingerprint subject to a given
-// natural sorting scheme. It implements sort.Interface.
-type Fingerprints []Fingerprint
-
-// Len implements sort.Interface.
-func (f Fingerprints) Len() int {
-	return len(f)
-}
-
-// Less implements sort.Interface.
-func (f Fingerprints) Less(i, j int) bool {
-	return f[i] < f[j]
-}
-
-// Swap implements sort.Interface.
-func (f Fingerprints) Swap(i, j int) {
-	f[i], f[j] = f[j], f[i]
-}
-
-// FingerprintSet is a set of Fingerprints.
-type FingerprintSet map[Fingerprint]struct{}
-
-// Equal returns true if both sets contain the same elements (and not more).
-func (s FingerprintSet) Equal(o FingerprintSet) bool {
-	if len(s) != len(o) {
-		return false
-	}
-
-	for k := range s {
-		if _, ok := o[k]; !ok {
-			return false
-		}
-	}
-
-	return true
-}
-
-// Intersection returns the elements contained in both sets.
-func (s FingerprintSet) Intersection(o FingerprintSet) FingerprintSet {
-	myLength, otherLength := len(s), len(o)
-	if myLength == 0 || otherLength == 0 {
-		return FingerprintSet{}
-	}
-
-	subSet := s
-	superSet := o
-
-	if otherLength < myLength {
-		subSet = o
-		superSet = s
-	}
-
-	out := FingerprintSet{}
-
-	for k := range subSet {
-		if _, ok := superSet[k]; ok {
-			out[k] = struct{}{}
-		}
-	}
-
-	return out
-}
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/model/labelname.go b/Godeps/_workspace/src/github.com/prometheus/client_golang/model/labelname.go
deleted file mode 100644
index 79ffed298..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/client_golang/model/labelname.go
+++ /dev/null
@@ -1,133 +0,0 @@
-// Copyright 2013 The Prometheus Authors
-// 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 model
-
-import (
-	"encoding/json"
-	"fmt"
-	"regexp"
-	"strings"
-)
-
-const (
-	// ExportedLabelPrefix is the prefix to prepend to the label names present in
-	// exported metrics if a label of the same name is added by the server.
-	ExportedLabelPrefix LabelName = "exported_"
-
-	// MetricNameLabel is the label name indicating the metric name of a
-	// timeseries.
-	MetricNameLabel LabelName = "__name__"
-
-	// SchemeLabel is the name of the label that holds the scheme on which to
-	// scrape a target.
-	SchemeLabel LabelName = "__scheme__"
-
-	// AddressLabel is the name of the label that holds the address of
-	// a scrape target.
-	AddressLabel LabelName = "__address__"
-
-	// MetricsPathLabel is the name of the label that holds the path on which to
-	// scrape a target.
-	MetricsPathLabel LabelName = "__metrics_path__"
-
-	// ReservedLabelPrefix is a prefix which is not legal in user-supplied
-	// label names.
-	ReservedLabelPrefix = "__"
-
-	// MetaLabelPrefix is a prefix for labels that provide meta information.
-	// Labels with this prefix are used for intermediate label processing and
-	// will not be attached to time series.
-	MetaLabelPrefix = "__meta_"
-
-	// TmpLabelPrefix is a prefix for temporary labels as part of relabelling.
-	// Labels with this prefix are used for intermediate label processing and
-	// will not be attached to time series. This is reserved for use in
-	// Prometheus configuration files by users.
-	TmpLabelPrefix = "__tmp_"
-
-	// ParamLabelPrefix is a prefix for labels that provide URL parameters
-	// used to scrape a target.
-	ParamLabelPrefix = "__param_"
-
-	// JobLabel is the label name indicating the job from which a timeseries
-	// was scraped.
-	JobLabel LabelName = "job"
-
-	// InstanceLabel is the label name used for the instance label.
-	InstanceLabel LabelName = "instance"
-
-	// BucketLabel is used for the label that defines the upper bound of a
-	// bucket of a histogram ("le" -> "less or equal").
-	BucketLabel = "le"
-
-	// QuantileLabel is used for the label that defines the quantile in a
-	// summary.
-	QuantileLabel = "quantile"
-)
-
-// LabelNameRE is a regular expression matching valid label names.
-var LabelNameRE = regexp.MustCompile("^[a-zA-Z_][a-zA-Z0-9_]*$")
-
-// A LabelName is a key for a LabelSet or Metric.  It has a value associated
-// therewith.
-type LabelName string
-
-// UnmarshalYAML implements the yaml.Unmarshaler interface.
-func (ln *LabelName) UnmarshalYAML(unmarshal func(interface{}) error) error {
-	var s string
-	if err := unmarshal(&s); err != nil {
-		return err
-	}
-	if !LabelNameRE.MatchString(s) {
-		return fmt.Errorf("%q is not a valid label name", s)
-	}
-	*ln = LabelName(s)
-	return nil
-}
-
-// UnmarshalJSON implements the json.Unmarshaler interface.
-func (ln *LabelName) UnmarshalJSON(b []byte) error {
-	var s string
-	if err := json.Unmarshal(b, &s); err != nil {
-		return err
-	}
-	if !LabelNameRE.MatchString(s) {
-		return fmt.Errorf("%q is not a valid label name", s)
-	}
-	*ln = LabelName(s)
-	return nil
-}
-
-// LabelNames is a sortable LabelName slice. In implements sort.Interface.
-type LabelNames []LabelName
-
-func (l LabelNames) Len() int {
-	return len(l)
-}
-
-func (l LabelNames) Less(i, j int) bool {
-	return l[i] < l[j]
-}
-
-func (l LabelNames) Swap(i, j int) {
-	l[i], l[j] = l[j], l[i]
-}
-
-func (l LabelNames) String() string {
-	labelStrings := make([]string, 0, len(l))
-	for _, label := range l {
-		labelStrings = append(labelStrings, string(label))
-	}
-	return strings.Join(labelStrings, ", ")
-}
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/model/labelname_test.go b/Godeps/_workspace/src/github.com/prometheus/client_golang/model/labelname_test.go
deleted file mode 100644
index 693228d34..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/client_golang/model/labelname_test.go
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright 2013 The Prometheus Authors
-// 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 model
-
-import (
-	"sort"
-	"testing"
-)
-
-func testLabelNames(t testing.TB) {
-	var scenarios = []struct {
-		in  LabelNames
-		out LabelNames
-	}{
-		{
-			in:  LabelNames{"ZZZ", "zzz"},
-			out: LabelNames{"ZZZ", "zzz"},
-		},
-		{
-			in:  LabelNames{"aaa", "AAA"},
-			out: LabelNames{"AAA", "aaa"},
-		},
-	}
-
-	for i, scenario := range scenarios {
-		sort.Sort(scenario.in)
-
-		for j, expected := range scenario.out {
-			if expected != scenario.in[j] {
-				t.Errorf("%d.%d expected %s, got %s", i, j, expected, scenario.in[j])
-			}
-		}
-	}
-}
-
-func TestLabelNames(t *testing.T) {
-	testLabelNames(t)
-}
-
-func BenchmarkLabelNames(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		testLabelNames(b)
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/model/labelset.go b/Godeps/_workspace/src/github.com/prometheus/client_golang/model/labelset.go
deleted file mode 100644
index 382ab62d3..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/client_golang/model/labelset.go
+++ /dev/null
@@ -1,83 +0,0 @@
-// Copyright 2013 The Prometheus Authors
-// 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 model
-
-import (
-	"encoding/json"
-	"fmt"
-	"sort"
-	"strings"
-)
-
-// A LabelSet is a collection of LabelName and LabelValue pairs.  The LabelSet
-// may be fully-qualified down to the point where it may resolve to a single
-// Metric in the data store or not.  All operations that occur within the realm
-// of a LabelSet can emit a vector of Metric entities to which the LabelSet may
-// match.
-type LabelSet map[LabelName]LabelValue
-
-// Merge is a helper function to non-destructively merge two label sets.
-func (l LabelSet) Merge(other LabelSet) LabelSet {
-	result := make(LabelSet, len(l))
-
-	for k, v := range l {
-		result[k] = v
-	}
-
-	for k, v := range other {
-		result[k] = v
-	}
-
-	return result
-}
-
-func (l LabelSet) String() string {
-	labelStrings := make([]string, 0, len(l))
-	for label, value := range l {
-		labelStrings = append(labelStrings, fmt.Sprintf("%s=%q", label, value))
-	}
-
-	switch len(labelStrings) {
-	case 0:
-		return ""
-	default:
-		sort.Strings(labelStrings)
-		return fmt.Sprintf("{%s}", strings.Join(labelStrings, ", "))
-	}
-}
-
-// MergeFromMetric merges Metric into this LabelSet.
-func (l LabelSet) MergeFromMetric(m Metric) {
-	for k, v := range m {
-		l[k] = v
-	}
-}
-
-// UnmarshalJSON implements the json.Unmarshaler interface.
-func (l *LabelSet) UnmarshalJSON(b []byte) error {
-	var m map[LabelName]LabelValue
-	if err := json.Unmarshal(b, &m); err != nil {
-		return err
-	}
-	// encoding/json only unmarshals maps of the form map[string]T. It treats
-	// LabelName as a string and does not call its UnmarshalJSON method.
-	// Thus, we have to replicate the behavior here.
-	for ln := range m {
-		if !LabelNameRE.MatchString(string(ln)) {
-			return fmt.Errorf("%q is not a valid label name", ln)
-		}
-	}
-	*l = LabelSet(m)
-	return nil
-}
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/model/labelvalue.go b/Godeps/_workspace/src/github.com/prometheus/client_golang/model/labelvalue.go
deleted file mode 100644
index df2d14cc1..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/client_golang/model/labelvalue.go
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright 2013 The Prometheus Authors
-// 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 model
-
-import (
-	"sort"
-)
-
-// A LabelValue is an associated value for a LabelName.
-type LabelValue string
-
-// LabelValues is a sortable LabelValue slice. It implements sort.Interface.
-type LabelValues []LabelValue
-
-func (l LabelValues) Len() int {
-	return len(l)
-}
-
-func (l LabelValues) Less(i, j int) bool {
-	return sort.StringsAreSorted([]string{string(l[i]), string(l[j])})
-}
-
-func (l LabelValues) Swap(i, j int) {
-	l[i], l[j] = l[j], l[i]
-}
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/model/labelvalue_test.go b/Godeps/_workspace/src/github.com/prometheus/client_golang/model/labelvalue_test.go
deleted file mode 100644
index 15904edf4..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/client_golang/model/labelvalue_test.go
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright 2013 The Prometheus Authors
-// 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 model
-
-import (
-	"sort"
-	"testing"
-)
-
-func testLabelValues(t testing.TB) {
-	var scenarios = []struct {
-		in  LabelValues
-		out LabelValues
-	}{
-		{
-			in:  LabelValues{"ZZZ", "zzz"},
-			out: LabelValues{"ZZZ", "zzz"},
-		},
-		{
-			in:  LabelValues{"aaa", "AAA"},
-			out: LabelValues{"AAA", "aaa"},
-		},
-	}
-
-	for i, scenario := range scenarios {
-		sort.Sort(scenario.in)
-
-		for j, expected := range scenario.out {
-			if expected != scenario.in[j] {
-				t.Errorf("%d.%d expected %s, got %s", i, j, expected, scenario.in[j])
-			}
-		}
-	}
-}
-
-func TestLabelValues(t *testing.T) {
-	testLabelValues(t)
-}
-
-func BenchmarkLabelValues(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		testLabelValues(b)
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/model/metric.go b/Godeps/_workspace/src/github.com/prometheus/client_golang/model/metric.go
deleted file mode 100644
index 864c012ec..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/client_golang/model/metric.go
+++ /dev/null
@@ -1,192 +0,0 @@
-// Copyright 2013 The Prometheus Authors
-// 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 model
-
-import (
-	"encoding/json"
-	"fmt"
-	"sort"
-	"strings"
-)
-
-var separator = []byte{0}
-
-// A Metric is similar to a LabelSet, but the key difference is that a Metric is
-// a singleton and refers to one and only one stream of samples.
-type Metric map[LabelName]LabelValue
-
-// Equal compares the metrics.
-func (m Metric) Equal(o Metric) bool {
-	if len(m) != len(o) {
-		return false
-	}
-	for ln, lv := range m {
-		olv, ok := o[ln]
-		if !ok {
-			return false
-		}
-		if olv != lv {
-			return false
-		}
-	}
-	return true
-}
-
-// Before compares the metrics, using the following criteria:
-//
-// If m has fewer labels than o, it is before o. If it has more, it is not.
-//
-// If the number of labels is the same, the superset of all label names is
-// sorted alphanumerically. The first differing label pair found in that order
-// determines the outcome: If the label does not exist at all in m, then m is
-// before o, and vice versa. Otherwise the label value is compared
-// alphanumerically.
-//
-// If m and o are equal, the method returns false.
-func (m Metric) Before(o Metric) bool {
-	if len(m) < len(o) {
-		return true
-	}
-	if len(m) > len(o) {
-		return false
-	}
-
-	lns := make(LabelNames, 0, len(m)+len(o))
-	for ln := range m {
-		lns = append(lns, ln)
-	}
-	for ln := range o {
-		lns = append(lns, ln)
-	}
-	// It's probably not worth it to de-dup lns.
-	sort.Sort(lns)
-	for _, ln := range lns {
-		mlv, ok := m[ln]
-		if !ok {
-			return true
-		}
-		olv, ok := o[ln]
-		if !ok {
-			return false
-		}
-		if mlv < olv {
-			return true
-		}
-		if mlv > olv {
-			return false
-		}
-	}
-	return false
-}
-
-// String implements Stringer.
-func (m Metric) String() string {
-	metricName, hasName := m[MetricNameLabel]
-	numLabels := len(m) - 1
-	if !hasName {
-		numLabels = len(m)
-	}
-	labelStrings := make([]string, 0, numLabels)
-	for label, value := range m {
-		if label != MetricNameLabel {
-			labelStrings = append(labelStrings, fmt.Sprintf("%s=%q", label, value))
-		}
-	}
-
-	switch numLabels {
-	case 0:
-		if hasName {
-			return string(metricName)
-		}
-		return "{}"
-	default:
-		sort.Strings(labelStrings)
-		return fmt.Sprintf("%s{%s}", metricName, strings.Join(labelStrings, ", "))
-	}
-}
-
-// Fingerprint returns a Metric's Fingerprint.
-func (m Metric) Fingerprint() Fingerprint {
-	return metricToFingerprint(m)
-}
-
-// FastFingerprint returns a Metric's Fingerprint calculated by a faster hashing
-// algorithm, which is, however, more susceptible to hash collisions.
-func (m Metric) FastFingerprint() Fingerprint {
-	return metricToFastFingerprint(m)
-}
-
-// Clone returns a copy of the Metric.
-func (m Metric) Clone() Metric {
-	clone := Metric{}
-	for k, v := range m {
-		clone[k] = v
-	}
-	return clone
-}
-
-// MergeFromLabelSet merges a label set into this Metric, prefixing a collision
-// prefix to the label names merged from the label set where required.
-func (m Metric) MergeFromLabelSet(labels LabelSet, collisionPrefix LabelName) {
-	for k, v := range labels {
-		if collisionPrefix != "" {
-			for {
-				if _, exists := m[k]; !exists {
-					break
-				}
-				k = collisionPrefix + k
-			}
-		}
-
-		m[k] = v
-	}
-}
-
-// COWMetric wraps a Metric to enable copy-on-write access patterns.
-type COWMetric struct {
-	Copied bool
-	Metric Metric
-}
-
-// Set sets a label name in the wrapped Metric to a given value and copies the
-// Metric initially, if it is not already a copy.
-func (m *COWMetric) Set(ln LabelName, lv LabelValue) {
-	m.doCOW()
-	m.Metric[ln] = lv
-}
-
-// Delete deletes a given label name from the wrapped Metric and copies the
-// Metric initially, if it is not already a copy.
-func (m *COWMetric) Delete(ln LabelName) {
-	m.doCOW()
-	delete(m.Metric, ln)
-}
-
-// doCOW copies the underlying Metric if it is not already a copy.
-func (m *COWMetric) doCOW() {
-	if !m.Copied {
-		m.Metric = m.Metric.Clone()
-		m.Copied = true
-	}
-}
-
-// String implements fmt.Stringer.
-func (m COWMetric) String() string {
-	return m.Metric.String()
-}
-
-// MarshalJSON implements json.Marshaler.
-func (m COWMetric) MarshalJSON() ([]byte, error) {
-	return json.Marshal(m.Metric)
-}
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/model/metric_test.go b/Godeps/_workspace/src/github.com/prometheus/client_golang/model/metric_test.go
deleted file mode 100644
index 5dbc02376..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/client_golang/model/metric_test.go
+++ /dev/null
@@ -1,130 +0,0 @@
-// Copyright 2013 The Prometheus Authors
-// 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 model
-
-import "testing"
-
-func testMetric(t testing.TB) {
-	var scenarios = []struct {
-		input           Metric
-		fingerprint     Fingerprint
-		fastFingerprint Fingerprint
-	}{
-		{
-			input:           Metric{},
-			fingerprint:     14695981039346656037,
-			fastFingerprint: 14695981039346656037,
-		},
-		{
-			input: Metric{
-				"first_name":   "electro",
-				"occupation":   "robot",
-				"manufacturer": "westinghouse",
-			},
-			fingerprint:     5911716720268894962,
-			fastFingerprint: 11310079640881077873,
-		},
-		{
-			input: Metric{
-				"x": "y",
-			},
-			fingerprint:     8241431561484471700,
-			fastFingerprint: 13948396922932177635,
-		},
-		{
-			input: Metric{
-				"a": "bb",
-				"b": "c",
-			},
-			fingerprint:     3016285359649981711,
-			fastFingerprint: 3198632812309449502,
-		},
-		{
-			input: Metric{
-				"a":  "b",
-				"bb": "c",
-			},
-			fingerprint:     7122421792099404749,
-			fastFingerprint: 5774953389407657638,
-		},
-	}
-
-	for i, scenario := range scenarios {
-		if scenario.fingerprint != scenario.input.Fingerprint() {
-			t.Errorf("%d. expected %d, got %d", i, scenario.fingerprint, scenario.input.Fingerprint())
-		}
-		if scenario.fastFingerprint != scenario.input.FastFingerprint() {
-			t.Errorf("%d. expected %d, got %d", i, scenario.fastFingerprint, scenario.input.FastFingerprint())
-		}
-	}
-}
-
-func TestMetric(t *testing.T) {
-	testMetric(t)
-}
-
-func BenchmarkMetric(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		testMetric(b)
-	}
-}
-
-func TestCOWMetric(t *testing.T) {
-	testMetric := Metric{
-		"to_delete": "test1",
-		"to_change": "test2",
-	}
-
-	scenarios := []struct {
-		fn  func(*COWMetric)
-		out Metric
-	}{
-		{
-			fn: func(cm *COWMetric) {
-				cm.Delete("to_delete")
-			},
-			out: Metric{
-				"to_change": "test2",
-			},
-		},
-		{
-			fn: func(cm *COWMetric) {
-				cm.Set("to_change", "changed")
-			},
-			out: Metric{
-				"to_delete": "test1",
-				"to_change": "changed",
-			},
-		},
-	}
-
-	for i, s := range scenarios {
-		orig := testMetric.Clone()
-		cm := &COWMetric{
-			Metric: orig,
-		}
-
-		s.fn(cm)
-
-		// Test that the original metric was not modified.
-		if !orig.Equal(testMetric) {
-			t.Fatalf("%d. original metric changed; expected %v, got %v", i, testMetric, orig)
-		}
-
-		// Test that the new metric has the right changes.
-		if !cm.Metric.Equal(s.out) {
-			t.Fatalf("%d. copied metric doesn't contain expected changes; expected %v, got %v", i, s.out, cm.Metric)
-		}
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/model/model.go b/Godeps/_workspace/src/github.com/prometheus/client_golang/model/model.go
deleted file mode 100644
index 189c5dcf6..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/client_golang/model/model.go
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright 2013 The Prometheus Authors
-// 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 model contains core representation of Prometheus client primitives.
-package model
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/model/sample.go b/Godeps/_workspace/src/github.com/prometheus/client_golang/model/sample.go
deleted file mode 100644
index c13a44d95..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/client_golang/model/sample.go
+++ /dev/null
@@ -1,79 +0,0 @@
-// Copyright 2013 The Prometheus Authors
-// 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 model
-
-// Sample is a sample value with a timestamp and a metric.
-type Sample struct {
-	Metric    Metric
-	Value     SampleValue
-	Timestamp Timestamp
-}
-
-// Equal compares first the metrics, then the timestamp, then the value.
-func (s *Sample) Equal(o *Sample) bool {
-	if s == o {
-		return true
-	}
-
-	if !s.Metric.Equal(o.Metric) {
-		return false
-	}
-	if !s.Timestamp.Equal(o.Timestamp) {
-		return false
-	}
-	if !s.Value.Equal(o.Value) {
-		return false
-	}
-
-	return true
-}
-
-// Samples is a sortable Sample slice. It implements sort.Interface.
-type Samples []*Sample
-
-func (s Samples) Len() int {
-	return len(s)
-}
-
-// Less compares first the metrics, then the timestamp.
-func (s Samples) Less(i, j int) bool {
-	switch {
-	case s[i].Metric.Before(s[j].Metric):
-		return true
-	case s[j].Metric.Before(s[i].Metric):
-		return false
-	case s[i].Timestamp.Before(s[j].Timestamp):
-		return true
-	default:
-		return false
-	}
-}
-
-func (s Samples) Swap(i, j int) {
-	s[i], s[j] = s[j], s[i]
-}
-
-// Equal compares two sets of samples and returns true if they are equal.
-func (s Samples) Equal(o Samples) bool {
-	if len(s) != len(o) {
-		return false
-	}
-
-	for i, sample := range s {
-		if !sample.Equal(o[i]) {
-			return false
-		}
-	}
-	return true
-}
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/model/sample_test.go b/Godeps/_workspace/src/github.com/prometheus/client_golang/model/sample_test.go
deleted file mode 100644
index d5e065d6c..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/client_golang/model/sample_test.go
+++ /dev/null
@@ -1,114 +0,0 @@
-// Copyright 2013 The Prometheus Authors
-// 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 model
-
-import (
-	"sort"
-	"testing"
-)
-
-func TestSamplesSort(t *testing.T) {
-	input := Samples{
-		&Sample{
-			Metric: Metric{
-				MetricNameLabel: "A",
-			},
-			Timestamp: 1,
-		},
-		&Sample{
-			Metric: Metric{
-				MetricNameLabel: "A",
-			},
-			Timestamp: 2,
-		},
-		&Sample{
-			Metric: Metric{
-				MetricNameLabel: "C",
-			},
-			Timestamp: 1,
-		},
-		&Sample{
-			Metric: Metric{
-				MetricNameLabel: "C",
-			},
-			Timestamp: 2,
-		},
-		&Sample{
-			Metric: Metric{
-				MetricNameLabel: "B",
-			},
-			Timestamp: 1,
-		},
-		&Sample{
-			Metric: Metric{
-				MetricNameLabel: "B",
-			},
-			Timestamp: 2,
-		},
-	}
-
-	expected := Samples{
-		&Sample{
-			Metric: Metric{
-				MetricNameLabel: "A",
-			},
-			Timestamp: 1,
-		},
-		&Sample{
-			Metric: Metric{
-				MetricNameLabel: "A",
-			},
-			Timestamp: 2,
-		},
-		&Sample{
-			Metric: Metric{
-				MetricNameLabel: "B",
-			},
-			Timestamp: 1,
-		},
-		&Sample{
-			Metric: Metric{
-				MetricNameLabel: "B",
-			},
-			Timestamp: 2,
-		},
-		&Sample{
-			Metric: Metric{
-				MetricNameLabel: "C",
-			},
-			Timestamp: 1,
-		},
-		&Sample{
-			Metric: Metric{
-				MetricNameLabel: "C",
-			},
-			Timestamp: 2,
-		},
-	}
-
-	sort.Sort(input)
-
-	for i, actual := range input {
-		actualFp := actual.Metric.Fingerprint()
-		expectedFp := expected[i].Metric.Fingerprint()
-
-		if !actualFp.Equal(expectedFp) {
-			t.Fatalf("%d. Incorrect fingerprint. Got %s; want %s", i, actualFp.String(), expectedFp.String())
-		}
-
-		if actual.Timestamp != expected[i].Timestamp {
-			t.Fatalf("%d. Incorrect timestamp. Got %s; want %s", i, actual.Timestamp, expected[i].Timestamp)
-		}
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/model/samplevalue.go b/Godeps/_workspace/src/github.com/prometheus/client_golang/model/samplevalue.go
deleted file mode 100644
index 469c2c0b0..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/client_golang/model/samplevalue.go
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright 2013 The Prometheus Authors
-// 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 model
-
-import (
-	"fmt"
-	"strconv"
-)
-
-// A SampleValue is a representation of a value for a given sample at a given
-// time.
-type SampleValue float64
-
-// Equal does a straight v==o.
-func (v SampleValue) Equal(o SampleValue) bool {
-	return v == o
-}
-
-// MarshalJSON implements json.Marshaler.
-func (v SampleValue) MarshalJSON() ([]byte, error) {
-	return []byte(fmt.Sprintf(`"%s"`, v)), nil
-}
-
-func (v SampleValue) String() string {
-	return strconv.FormatFloat(float64(v), 'f', -1, 64)
-}
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/model/signature.go b/Godeps/_workspace/src/github.com/prometheus/client_golang/model/signature.go
deleted file mode 100644
index 7bd58f4b0..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/client_golang/model/signature.go
+++ /dev/null
@@ -1,190 +0,0 @@
-// Copyright 2014 The Prometheus Authors
-// 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 model
-
-import (
-	"bytes"
-	"hash"
-	"hash/fnv"
-	"sort"
-	"sync"
-)
-
-// SeparatorByte is a byte that cannot occur in valid UTF-8 sequences and is
-// used to separate label names, label values, and other strings from each other
-// when calculating their combined hash value (aka signature aka fingerprint).
-const SeparatorByte byte = 255
-
-var (
-	// cache the signature of an empty label set.
-	emptyLabelSignature = fnv.New64a().Sum64()
-
-	hashAndBufPool sync.Pool
-)
-
-type hashAndBuf struct {
-	h hash.Hash64
-	b bytes.Buffer
-}
-
-func getHashAndBuf() *hashAndBuf {
-	hb := hashAndBufPool.Get()
-	if hb == nil {
-		return &hashAndBuf{h: fnv.New64a()}
-	}
-	return hb.(*hashAndBuf)
-}
-
-func putHashAndBuf(hb *hashAndBuf) {
-	hb.h.Reset()
-	hb.b.Reset()
-	hashAndBufPool.Put(hb)
-}
-
-// LabelsToSignature returns a quasi-unique signature (i.e., fingerprint) for a
-// given label set. (Collisions are possible but unlikely if the number of label
-// sets the function is applied to is small.)
-func LabelsToSignature(labels map[string]string) uint64 {
-	if len(labels) == 0 {
-		return emptyLabelSignature
-	}
-
-	labelNames := make([]string, 0, len(labels))
-	for labelName := range labels {
-		labelNames = append(labelNames, labelName)
-	}
-	sort.Strings(labelNames)
-
-	hb := getHashAndBuf()
-	defer putHashAndBuf(hb)
-
-	for _, labelName := range labelNames {
-		hb.b.WriteString(labelName)
-		hb.b.WriteByte(SeparatorByte)
-		hb.b.WriteString(labels[labelName])
-		hb.b.WriteByte(SeparatorByte)
-		hb.h.Write(hb.b.Bytes())
-		hb.b.Reset()
-	}
-	return hb.h.Sum64()
-}
-
-// metricToFingerprint works exactly as LabelsToSignature but takes a Metric as
-// parameter (rather than a label map) and returns a Fingerprint.
-func metricToFingerprint(m Metric) Fingerprint {
-	if len(m) == 0 {
-		return Fingerprint(emptyLabelSignature)
-	}
-
-	labelNames := make(LabelNames, 0, len(m))
-	for labelName := range m {
-		labelNames = append(labelNames, labelName)
-	}
-	sort.Sort(labelNames)
-
-	hb := getHashAndBuf()
-	defer putHashAndBuf(hb)
-
-	for _, labelName := range labelNames {
-		hb.b.WriteString(string(labelName))
-		hb.b.WriteByte(SeparatorByte)
-		hb.b.WriteString(string(m[labelName]))
-		hb.b.WriteByte(SeparatorByte)
-		hb.h.Write(hb.b.Bytes())
-		hb.b.Reset()
-	}
-	return Fingerprint(hb.h.Sum64())
-}
-
-// metricToFastFingerprint works similar to metricToFingerprint but uses a
-// faster and less allocation-heavy hash function, which is more susceptible to
-// create hash collisions. Therefore, collision detection should be applied.
-func metricToFastFingerprint(m Metric) Fingerprint {
-	if len(m) == 0 {
-		return Fingerprint(emptyLabelSignature)
-	}
-
-	var result uint64
-	hb := getHashAndBuf()
-	defer putHashAndBuf(hb)
-
-	for labelName, labelValue := range m {
-		hb.b.WriteString(string(labelName))
-		hb.b.WriteByte(SeparatorByte)
-		hb.b.WriteString(string(labelValue))
-		hb.h.Write(hb.b.Bytes())
-		result ^= hb.h.Sum64()
-		hb.h.Reset()
-		hb.b.Reset()
-	}
-	return Fingerprint(result)
-}
-
-// SignatureForLabels works like LabelsToSignature but takes a Metric as
-// parameter (rather than a label map) and only includes the labels with the
-// specified LabelNames into the signature calculation. The labels passed in
-// will be sorted by this function.
-func SignatureForLabels(m Metric, labels LabelNames) uint64 {
-	if len(m) == 0 || len(labels) == 0 {
-		return emptyLabelSignature
-	}
-
-	sort.Sort(labels)
-
-	hb := getHashAndBuf()
-	defer putHashAndBuf(hb)
-
-	for _, label := range labels {
-		hb.b.WriteString(string(label))
-		hb.b.WriteByte(SeparatorByte)
-		hb.b.WriteString(string(m[label]))
-		hb.b.WriteByte(SeparatorByte)
-		hb.h.Write(hb.b.Bytes())
-		hb.b.Reset()
-	}
-	return hb.h.Sum64()
-}
-
-// SignatureWithoutLabels works like LabelsToSignature but takes a Metric as
-// parameter (rather than a label map) and excludes the labels with any of the
-// specified LabelNames from the signature calculation.
-func SignatureWithoutLabels(m Metric, labels map[LabelName]struct{}) uint64 {
-	if len(m) == 0 {
-		return emptyLabelSignature
-	}
-
-	labelNames := make(LabelNames, 0, len(m))
-	for labelName := range m {
-		if _, exclude := labels[labelName]; !exclude {
-			labelNames = append(labelNames, labelName)
-		}
-	}
-	if len(labelNames) == 0 {
-		return emptyLabelSignature
-	}
-	sort.Sort(labelNames)
-
-	hb := getHashAndBuf()
-	defer putHashAndBuf(hb)
-
-	for _, labelName := range labelNames {
-		hb.b.WriteString(string(labelName))
-		hb.b.WriteByte(SeparatorByte)
-		hb.b.WriteString(string(m[labelName]))
-		hb.b.WriteByte(SeparatorByte)
-		hb.h.Write(hb.b.Bytes())
-		hb.b.Reset()
-	}
-	return hb.h.Sum64()
-}
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/model/signature_test.go b/Godeps/_workspace/src/github.com/prometheus/client_golang/model/signature_test.go
deleted file mode 100644
index 99443fb3c..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/client_golang/model/signature_test.go
+++ /dev/null
@@ -1,305 +0,0 @@
-// Copyright 2014 The Prometheus Authors
-// 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 model
-
-import (
-	"runtime"
-	"sync"
-	"testing"
-)
-
-func TestLabelsToSignature(t *testing.T) {
-	var scenarios = []struct {
-		in  map[string]string
-		out uint64
-	}{
-		{
-			in:  map[string]string{},
-			out: 14695981039346656037,
-		},
-		{
-			in:  map[string]string{"name": "garland, briggs", "fear": "love is not enough"},
-			out: 5799056148416392346,
-		},
-	}
-
-	for i, scenario := range scenarios {
-		actual := LabelsToSignature(scenario.in)
-
-		if actual != scenario.out {
-			t.Errorf("%d. expected %d, got %d", i, scenario.out, actual)
-		}
-	}
-}
-
-func TestMetricToFingerprint(t *testing.T) {
-	var scenarios = []struct {
-		in  Metric
-		out Fingerprint
-	}{
-		{
-			in:  Metric{},
-			out: 14695981039346656037,
-		},
-		{
-			in:  Metric{"name": "garland, briggs", "fear": "love is not enough"},
-			out: 5799056148416392346,
-		},
-	}
-
-	for i, scenario := range scenarios {
-		actual := metricToFingerprint(scenario.in)
-
-		if actual != scenario.out {
-			t.Errorf("%d. expected %d, got %d", i, scenario.out, actual)
-		}
-	}
-}
-
-func TestMetricToFastFingerprint(t *testing.T) {
-	var scenarios = []struct {
-		in  Metric
-		out Fingerprint
-	}{
-		{
-			in:  Metric{},
-			out: 14695981039346656037,
-		},
-		{
-			in:  Metric{"name": "garland, briggs", "fear": "love is not enough"},
-			out: 12952432476264840823,
-		},
-	}
-
-	for i, scenario := range scenarios {
-		actual := metricToFastFingerprint(scenario.in)
-
-		if actual != scenario.out {
-			t.Errorf("%d. expected %d, got %d", i, scenario.out, actual)
-		}
-	}
-}
-
-func TestSignatureForLabels(t *testing.T) {
-	var scenarios = []struct {
-		in     Metric
-		labels LabelNames
-		out    uint64
-	}{
-		{
-			in:     Metric{},
-			labels: nil,
-			out:    14695981039346656037,
-		},
-		{
-			in:     Metric{"name": "garland, briggs", "fear": "love is not enough"},
-			labels: LabelNames{"fear", "name"},
-			out:    5799056148416392346,
-		},
-		{
-			in:     Metric{"name": "garland, briggs", "fear": "love is not enough", "foo": "bar"},
-			labels: LabelNames{"fear", "name"},
-			out:    5799056148416392346,
-		},
-		{
-			in:     Metric{"name": "garland, briggs", "fear": "love is not enough"},
-			labels: LabelNames{},
-			out:    14695981039346656037,
-		},
-		{
-			in:     Metric{"name": "garland, briggs", "fear": "love is not enough"},
-			labels: nil,
-			out:    14695981039346656037,
-		},
-	}
-
-	for i, scenario := range scenarios {
-		actual := SignatureForLabels(scenario.in, scenario.labels)
-
-		if actual != scenario.out {
-			t.Errorf("%d. expected %d, got %d", i, scenario.out, actual)
-		}
-	}
-}
-
-func TestSignatureWithoutLabels(t *testing.T) {
-	var scenarios = []struct {
-		in     Metric
-		labels map[LabelName]struct{}
-		out    uint64
-	}{
-		{
-			in:     Metric{},
-			labels: nil,
-			out:    14695981039346656037,
-		},
-		{
-			in:     Metric{"name": "garland, briggs", "fear": "love is not enough"},
-			labels: map[LabelName]struct{}{"fear": struct{}{}, "name": struct{}{}},
-			out:    14695981039346656037,
-		},
-		{
-			in:     Metric{"name": "garland, briggs", "fear": "love is not enough", "foo": "bar"},
-			labels: map[LabelName]struct{}{"foo": struct{}{}},
-			out:    5799056148416392346,
-		},
-		{
-			in:     Metric{"name": "garland, briggs", "fear": "love is not enough"},
-			labels: map[LabelName]struct{}{},
-			out:    5799056148416392346,
-		},
-		{
-			in:     Metric{"name": "garland, briggs", "fear": "love is not enough"},
-			labels: nil,
-			out:    5799056148416392346,
-		},
-	}
-
-	for i, scenario := range scenarios {
-		actual := SignatureWithoutLabels(scenario.in, scenario.labels)
-
-		if actual != scenario.out {
-			t.Errorf("%d. expected %d, got %d", i, scenario.out, actual)
-		}
-	}
-}
-
-func benchmarkLabelToSignature(b *testing.B, l map[string]string, e uint64) {
-	for i := 0; i < b.N; i++ {
-		if a := LabelsToSignature(l); a != e {
-			b.Fatalf("expected signature of %d for %s, got %d", e, l, a)
-		}
-	}
-}
-
-func BenchmarkLabelToSignatureScalar(b *testing.B) {
-	benchmarkLabelToSignature(b, nil, 14695981039346656037)
-}
-
-func BenchmarkLabelToSignatureSingle(b *testing.B) {
-	benchmarkLabelToSignature(b, map[string]string{"first-label": "first-label-value"}, 5146282821936882169)
-}
-
-func BenchmarkLabelToSignatureDouble(b *testing.B) {
-	benchmarkLabelToSignature(b, map[string]string{"first-label": "first-label-value", "second-label": "second-label-value"}, 3195800080984914717)
-}
-
-func BenchmarkLabelToSignatureTriple(b *testing.B) {
-	benchmarkLabelToSignature(b, map[string]string{"first-label": "first-label-value", "second-label": "second-label-value", "third-label": "third-label-value"}, 13843036195897128121)
-}
-
-func benchmarkMetricToFingerprint(b *testing.B, m Metric, e Fingerprint) {
-	for i := 0; i < b.N; i++ {
-		if a := metricToFingerprint(m); a != e {
-			b.Fatalf("expected signature of %d for %s, got %d", e, m, a)
-		}
-	}
-}
-
-func BenchmarkMetricToFingerprintScalar(b *testing.B) {
-	benchmarkMetricToFingerprint(b, nil, 14695981039346656037)
-}
-
-func BenchmarkMetricToFingerprintSingle(b *testing.B) {
-	benchmarkMetricToFingerprint(b, Metric{"first-label": "first-label-value"}, 5146282821936882169)
-}
-
-func BenchmarkMetricToFingerprintDouble(b *testing.B) {
-	benchmarkMetricToFingerprint(b, Metric{"first-label": "first-label-value", "second-label": "second-label-value"}, 3195800080984914717)
-}
-
-func BenchmarkMetricToFingerprintTriple(b *testing.B) {
-	benchmarkMetricToFingerprint(b, Metric{"first-label": "first-label-value", "second-label": "second-label-value", "third-label": "third-label-value"}, 13843036195897128121)
-}
-
-func benchmarkMetricToFastFingerprint(b *testing.B, m Metric, e Fingerprint) {
-	for i := 0; i < b.N; i++ {
-		if a := metricToFastFingerprint(m); a != e {
-			b.Fatalf("expected signature of %d for %s, got %d", e, m, a)
-		}
-	}
-}
-
-func BenchmarkMetricToFastFingerprintScalar(b *testing.B) {
-	benchmarkMetricToFastFingerprint(b, nil, 14695981039346656037)
-}
-
-func BenchmarkMetricToFastFingerprintSingle(b *testing.B) {
-	benchmarkMetricToFastFingerprint(b, Metric{"first-label": "first-label-value"}, 5147259542624943964)
-}
-
-func BenchmarkMetricToFastFingerprintDouble(b *testing.B) {
-	benchmarkMetricToFastFingerprint(b, Metric{"first-label": "first-label-value", "second-label": "second-label-value"}, 18269973311206963528)
-}
-
-func BenchmarkMetricToFastFingerprintTriple(b *testing.B) {
-	benchmarkMetricToFastFingerprint(b, Metric{"first-label": "first-label-value", "second-label": "second-label-value", "third-label": "third-label-value"}, 15738406913934009676)
-}
-
-func BenchmarkEmptyLabelSignature(b *testing.B) {
-	b.StopTimer()
-	input := []map[string]string{nil, {}}
-
-	var ms runtime.MemStats
-	runtime.ReadMemStats(&ms)
-
-	alloc := ms.Alloc
-
-	for _, labels := range input {
-		LabelsToSignature(labels)
-	}
-
-	runtime.ReadMemStats(&ms)
-
-	if got := ms.Alloc; alloc != got {
-		b.Error("expected LabelsToSignature with empty labels not to perform allocations")
-	}
-}
-
-func benchmarkMetricToFastFingerprintConc(b *testing.B, m Metric, e Fingerprint, concLevel int) {
-	var start, end sync.WaitGroup
-	start.Add(1)
-	end.Add(concLevel)
-
-	for i := 0; i < concLevel; i++ {
-		go func() {
-			start.Wait()
-			for j := b.N / concLevel; j >= 0; j-- {
-				if a := metricToFastFingerprint(m); a != e {
-					b.Fatalf("expected signature of %d for %s, got %d", e, m, a)
-				}
-			}
-			end.Done()
-		}()
-	}
-	b.ResetTimer()
-	start.Done()
-	end.Wait()
-}
-
-func BenchmarkMetricToFastFingerprintTripleConc1(b *testing.B) {
-	benchmarkMetricToFastFingerprintConc(b, Metric{"first-label": "first-label-value", "second-label": "second-label-value", "third-label": "third-label-value"}, 15738406913934009676, 1)
-}
-
-func BenchmarkMetricToFastFingerprintTripleConc2(b *testing.B) {
-	benchmarkMetricToFastFingerprintConc(b, Metric{"first-label": "first-label-value", "second-label": "second-label-value", "third-label": "third-label-value"}, 15738406913934009676, 2)
-}
-
-func BenchmarkMetricToFastFingerprintTripleConc4(b *testing.B) {
-	benchmarkMetricToFastFingerprintConc(b, Metric{"first-label": "first-label-value", "second-label": "second-label-value", "third-label": "third-label-value"}, 15738406913934009676, 4)
-}
-
-func BenchmarkMetricToFastFingerprintTripleConc8(b *testing.B) {
-	benchmarkMetricToFastFingerprintConc(b, Metric{"first-label": "first-label-value", "second-label": "second-label-value", "third-label": "third-label-value"}, 15738406913934009676, 8)
-}
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/model/timestamp.go b/Godeps/_workspace/src/github.com/prometheus/client_golang/model/timestamp.go
deleted file mode 100644
index afffdcf75..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/client_golang/model/timestamp.go
+++ /dev/null
@@ -1,116 +0,0 @@
-// Copyright 2013 The Prometheus Authors
-// 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 model
-
-import (
-	"math"
-	"strconv"
-
-	native_time "time"
-)
-
-// Timestamp is the number of milliseconds since the epoch
-// (1970-01-01 00:00 UTC) excluding leap seconds.
-type Timestamp int64
-
-const (
-	// MinimumTick is the minimum supported time resolution. This has to be
-	// at least native_time.Second in order for the code below to work.
-	MinimumTick = native_time.Millisecond
-	// second is the timestamp duration equivalent to one second.
-	second = int64(native_time.Second / MinimumTick)
-	// The number of nanoseconds per minimum tick.
-	nanosPerTick = int64(MinimumTick / native_time.Nanosecond)
-
-	// Earliest is the earliest timestamp representable. Handy for
-	// initializing a high watermark.
-	Earliest = Timestamp(math.MinInt64)
-	// Latest is the latest timestamp representable. Handy for initializing
-	// a low watermark.
-	Latest = Timestamp(math.MaxInt64)
-)
-
-// Equal reports whether two timestamps represent the same instant.
-func (t Timestamp) Equal(o Timestamp) bool {
-	return t == o
-}
-
-// Before reports whether the timestamp t is before o.
-func (t Timestamp) Before(o Timestamp) bool {
-	return t < o
-}
-
-// After reports whether the timestamp t is after o.
-func (t Timestamp) After(o Timestamp) bool {
-	return t > o
-}
-
-// Add returns the Timestamp t + d.
-func (t Timestamp) Add(d native_time.Duration) Timestamp {
-	return t + Timestamp(d/MinimumTick)
-}
-
-// Sub returns the Duration t - o.
-func (t Timestamp) Sub(o Timestamp) native_time.Duration {
-	return native_time.Duration(t-o) * MinimumTick
-}
-
-// Time returns the time.Time representation of t.
-func (t Timestamp) Time() native_time.Time {
-	return native_time.Unix(int64(t)/second, (int64(t)%second)*nanosPerTick)
-}
-
-// Unix returns t as a Unix time, the number of seconds elapsed
-// since January 1, 1970 UTC.
-func (t Timestamp) Unix() int64 {
-	return int64(t) / second
-}
-
-// UnixNano returns t as a Unix time, the number of nanoseconds elapsed
-// since January 1, 1970 UTC.
-func (t Timestamp) UnixNano() int64 {
-	return int64(t) * nanosPerTick
-}
-
-// String returns a string representation of the timestamp.
-func (t Timestamp) String() string {
-	return strconv.FormatFloat(float64(t)/float64(second), 'f', -1, 64)
-}
-
-// MarshalJSON implements the json.Marshaler interface.
-func (t Timestamp) MarshalJSON() ([]byte, error) {
-	return []byte(t.String()), nil
-}
-
-// Now returns the current time as a Timestamp.
-func Now() Timestamp {
-	return TimestampFromTime(native_time.Now())
-}
-
-// TimestampFromTime returns the Timestamp equivalent to the time.Time t.
-func TimestampFromTime(t native_time.Time) Timestamp {
-	return TimestampFromUnixNano(t.UnixNano())
-}
-
-// TimestampFromUnix returns the Timestamp equivalent to the Unix timestamp t
-// provided in seconds.
-func TimestampFromUnix(t int64) Timestamp {
-	return Timestamp(t * second)
-}
-
-// TimestampFromUnixNano returns the Timestamp equivalent to the Unix timestamp
-// t provided in nanoseconds.
-func TimestampFromUnixNano(t int64) Timestamp {
-	return Timestamp(t / nanosPerTick)
-}
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/model/timestamp_test.go b/Godeps/_workspace/src/github.com/prometheus/client_golang/model/timestamp_test.go
deleted file mode 100644
index fa028a47d..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/client_golang/model/timestamp_test.go
+++ /dev/null
@@ -1,86 +0,0 @@
-// Copyright 2013 The Prometheus Authors
-// 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 model
-
-import (
-	"testing"
-	native_time "time"
-)
-
-func TestComparators(t *testing.T) {
-	t1a := TimestampFromUnix(0)
-	t1b := TimestampFromUnix(0)
-	t2 := TimestampFromUnix(2*second - 1)
-
-	if !t1a.Equal(t1b) {
-		t.Fatalf("Expected %s to be equal to %s", t1a, t1b)
-	}
-	if t1a.Equal(t2) {
-		t.Fatalf("Expected %s to not be equal to %s", t1a, t2)
-	}
-
-	if !t1a.Before(t2) {
-		t.Fatalf("Expected %s to be before %s", t1a, t2)
-	}
-	if t1a.Before(t1b) {
-		t.Fatalf("Expected %s to not be before %s", t1a, t1b)
-	}
-
-	if !t2.After(t1a) {
-		t.Fatalf("Expected %s to be after %s", t2, t1a)
-	}
-	if t1b.After(t1a) {
-		t.Fatalf("Expected %s to not be after %s", t1b, t1a)
-	}
-}
-
-func TestTimestampConversions(t *testing.T) {
-	unixSecs := int64(1136239445)
-	unixNsecs := int64(123456789)
-	unixNano := unixSecs*1000000000 + unixNsecs
-
-	t1 := native_time.Unix(unixSecs, unixNsecs-unixNsecs%nanosPerTick)
-	t2 := native_time.Unix(unixSecs, unixNsecs)
-
-	ts := TimestampFromUnixNano(unixNano)
-	if !ts.Time().Equal(t1) {
-		t.Fatalf("Expected %s, got %s", t1, ts.Time())
-	}
-
-	// Test available precision.
-	ts = TimestampFromTime(t2)
-	if !ts.Time().Equal(t1) {
-		t.Fatalf("Expected %s, got %s", t1, ts.Time())
-	}
-
-	if ts.UnixNano() != unixNano-unixNano%nanosPerTick {
-		t.Fatalf("Expected %d, got %d", unixNano, ts.UnixNano())
-	}
-}
-
-func TestDuration(t *testing.T) {
-	duration := native_time.Second + native_time.Minute + native_time.Hour
-	goTime := native_time.Unix(1136239445, 0)
-
-	ts := TimestampFromTime(goTime)
-	if !goTime.Add(duration).Equal(ts.Add(duration).Time()) {
-		t.Fatalf("Expected %s to be equal to %s", goTime.Add(duration), ts.Add(duration))
-	}
-
-	earlier := ts.Add(-duration)
-	delta := ts.Sub(earlier)
-	if delta != duration {
-		t.Fatalf("Expected %s to be equal to %s", delta, duration)
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/.gitignore b/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/.gitignore
deleted file mode 100644
index 3460f0346..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-command-line-arguments.test
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/README.md b/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/README.md
deleted file mode 100644
index 81032bed8..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/README.md
+++ /dev/null
@@ -1,53 +0,0 @@
-# Overview
-This is the [Prometheus](http://www.prometheus.io) telemetric
-instrumentation client [Go](http://golang.org) client library.  It
-enable authors to define process-space metrics for their servers and
-expose them through a web service interface for extraction,
-aggregation, and a whole slew of other post processing techniques.
-
-# Installing
-    $ go get github.com/prometheus/client_golang/prometheus
-
-# Example
-```go
-package main
-
-import (
-	"net/http"
-
-	"github.com/prometheus/client_golang/prometheus"
-)
-
-var (
-	indexed = prometheus.NewCounter(prometheus.CounterOpts{
-		Namespace: "my_company",
-		Subsystem: "indexer",
-		Name:      "documents_indexed",
-		Help:      "The number of documents indexed.",
-	})
-	size = prometheus.NewGauge(prometheus.GaugeOpts{
-		Namespace: "my_company",
-		Subsystem: "storage",
-		Name:      "documents_total_size_bytes",
-		Help:      "The total size of all documents in the storage.",
-	})
-)
-
-func main() {
-	http.Handle("/metrics", prometheus.Handler())
-
-	indexed.Inc()
-	size.Set(5)
-
-	http.ListenAndServe(":8080", nil)
-}
-
-func init() {
-	prometheus.MustRegister(indexed)
-	prometheus.MustRegister(size)
-}
-```
-
-# Documentation
-
-[![GoDoc](https://godoc.org/github.com/prometheus/client_golang?status.png)](https://godoc.org/github.com/prometheus/client_golang)
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/collector.go b/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/collector.go
deleted file mode 100644
index c04688009..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/collector.go
+++ /dev/null
@@ -1,75 +0,0 @@
-// Copyright 2014 The Prometheus Authors
-// 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 prometheus
-
-// Collector is the interface implemented by anything that can be used by
-// Prometheus to collect metrics. A Collector has to be registered for
-// collection. See Register, MustRegister, RegisterOrGet, and MustRegisterOrGet.
-//
-// The stock metrics provided by this package (like Gauge, Counter, Summary) are
-// also Collectors (which only ever collect one metric, namely itself). An
-// implementer of Collector may, however, collect multiple metrics in a
-// coordinated fashion and/or create metrics on the fly. Examples for collectors
-// already implemented in this library are the metric vectors (i.e. collection
-// of multiple instances of the same Metric but with different label values)
-// like GaugeVec or SummaryVec, and the ExpvarCollector.
-type Collector interface {
-	// Describe sends the super-set of all possible descriptors of metrics
-	// collected by this Collector to the provided channel and returns once
-	// the last descriptor has been sent. The sent descriptors fulfill the
-	// consistency and uniqueness requirements described in the Desc
-	// documentation. (It is valid if one and the same Collector sends
-	// duplicate descriptors. Those duplicates are simply ignored. However,
-	// two different Collectors must not send duplicate descriptors.) This
-	// method idempotently sends the same descriptors throughout the
-	// lifetime of the Collector. If a Collector encounters an error while
-	// executing this method, it must send an invalid descriptor (created
-	// with NewInvalidDesc) to signal the error to the registry.
-	Describe(chan<- *Desc)
-	// Collect is called by Prometheus when collecting metrics. The
-	// implementation sends each collected metric via the provided channel
-	// and returns once the last metric has been sent. The descriptor of
-	// each sent metric is one of those returned by Describe. Returned
-	// metrics that share the same descriptor must differ in their variable
-	// label values. This method may be called concurrently and must
-	// therefore be implemented in a concurrency safe way. Blocking occurs
-	// at the expense of total performance of rendering all registered
-	// metrics. Ideally, Collector implementations support concurrent
-	// readers.
-	Collect(chan<- Metric)
-}
-
-// SelfCollector implements Collector for a single Metric so that that the
-// Metric collects itself. Add it as an anonymous field to a struct that
-// implements Metric, and call Init with the Metric itself as an argument.
-type SelfCollector struct {
-	self Metric
-}
-
-// Init provides the SelfCollector with a reference to the metric it is supposed
-// to collect. It is usually called within the factory function to create a
-// metric. See example.
-func (c *SelfCollector) Init(self Metric) {
-	c.self = self
-}
-
-// Describe implements Collector.
-func (c *SelfCollector) Describe(ch chan<- *Desc) {
-	ch <- c.self.Desc()
-}
-
-// Collect implements Collector.
-func (c *SelfCollector) Collect(ch chan<- Metric) {
-	ch <- c.self
-}
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/counter.go b/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/counter.go
deleted file mode 100644
index a2952d1c8..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/counter.go
+++ /dev/null
@@ -1,175 +0,0 @@
-// Copyright 2014 The Prometheus Authors
-// 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 prometheus
-
-import (
-	"errors"
-	"hash/fnv"
-)
-
-// Counter is a Metric that represents a single numerical value that only ever
-// goes up. That implies that it cannot be used to count items whose number can
-// also go down, e.g. the number of currently running goroutines. Those
-// "counters" are represented by Gauges.
-//
-// A Counter is typically used to count requests served, tasks completed, errors
-// occurred, etc.
-//
-// To create Counter instances, use NewCounter.
-type Counter interface {
-	Metric
-	Collector
-
-	// Set is used to set the Counter to an arbitrary value. It is only used
-	// if you have to transfer a value from an external counter into this
-	// Prometheus metric. Do not use it for regular handling of a
-	// Prometheus counter (as it can be used to break the contract of
-	// monotonically increasing values).
-	Set(float64)
-	// Inc increments the counter by 1.
-	Inc()
-	// Add adds the given value to the counter. It panics if the value is <
-	// 0.
-	Add(float64)
-}
-
-// CounterOpts is an alias for Opts. See there for doc comments.
-type CounterOpts Opts
-
-// NewCounter creates a new Counter based on the provided CounterOpts.
-func NewCounter(opts CounterOpts) Counter {
-	desc := NewDesc(
-		BuildFQName(opts.Namespace, opts.Subsystem, opts.Name),
-		opts.Help,
-		nil,
-		opts.ConstLabels,
-	)
-	result := &counter{value: value{desc: desc, valType: CounterValue, labelPairs: desc.constLabelPairs}}
-	result.Init(result) // Init self-collection.
-	return result
-}
-
-type counter struct {
-	value
-}
-
-func (c *counter) Add(v float64) {
-	if v < 0 {
-		panic(errors.New("counter cannot decrease in value"))
-	}
-	c.value.Add(v)
-}
-
-// CounterVec is a Collector that bundles a set of Counters that all share the
-// same Desc, but have different values for their variable labels. This is used
-// if you want to count the same thing partitioned by various dimensions
-// (e.g. number of HTTP requests, partitioned by response code and
-// method). Create instances with NewCounterVec.
-//
-// CounterVec embeds MetricVec. See there for a full list of methods with
-// detailed documentation.
-type CounterVec struct {
-	MetricVec
-}
-
-// NewCounterVec creates a new CounterVec based on the provided CounterOpts and
-// partitioned by the given label names. At least one label name must be
-// provided.
-func NewCounterVec(opts CounterOpts, labelNames []string) *CounterVec {
-	desc := NewDesc(
-		BuildFQName(opts.Namespace, opts.Subsystem, opts.Name),
-		opts.Help,
-		labelNames,
-		opts.ConstLabels,
-	)
-	return &CounterVec{
-		MetricVec: MetricVec{
-			children: map[uint64]Metric{},
-			desc:     desc,
-			hash:     fnv.New64a(),
-			newMetric: func(lvs ...string) Metric {
-				result := &counter{value: value{
-					desc:       desc,
-					valType:    CounterValue,
-					labelPairs: makeLabelPairs(desc, lvs),
-				}}
-				result.Init(result) // Init self-collection.
-				return result
-			},
-		},
-	}
-}
-
-// GetMetricWithLabelValues replaces the method of the same name in
-// MetricVec. The difference is that this method returns a Counter and not a
-// Metric so that no type conversion is required.
-func (m *CounterVec) GetMetricWithLabelValues(lvs ...string) (Counter, error) {
-	metric, err := m.MetricVec.GetMetricWithLabelValues(lvs...)
-	if metric != nil {
-		return metric.(Counter), err
-	}
-	return nil, err
-}
-
-// GetMetricWith replaces the method of the same name in MetricVec. The
-// difference is that this method returns a Counter and not a Metric so that no
-// type conversion is required.
-func (m *CounterVec) GetMetricWith(labels Labels) (Counter, error) {
-	metric, err := m.MetricVec.GetMetricWith(labels)
-	if metric != nil {
-		return metric.(Counter), err
-	}
-	return nil, err
-}
-
-// WithLabelValues works as GetMetricWithLabelValues, but panics where
-// GetMetricWithLabelValues would have returned an error. By not returning an
-// error, WithLabelValues allows shortcuts like
-//     myVec.WithLabelValues("404", "GET").Add(42)
-func (m *CounterVec) WithLabelValues(lvs ...string) Counter {
-	return m.MetricVec.WithLabelValues(lvs...).(Counter)
-}
-
-// With works as GetMetricWith, but panics where GetMetricWithLabels would have
-// returned an error. By not returning an error, With allows shortcuts like
-//     myVec.With(Labels{"code": "404", "method": "GET"}).Add(42)
-func (m *CounterVec) With(labels Labels) Counter {
-	return m.MetricVec.With(labels).(Counter)
-}
-
-// CounterFunc is a Counter whose value is determined at collect time by calling a
-// provided function.
-//
-// To create CounterFunc instances, use NewCounterFunc.
-type CounterFunc interface {
-	Metric
-	Collector
-}
-
-// NewCounterFunc creates a new CounterFunc based on the provided
-// CounterOpts. The value reported is determined by calling the given function
-// from within the Write method. Take into account that metric collection may
-// happen concurrently. If that results in concurrent calls to Write, like in
-// the case where a CounterFunc is directly registered with Prometheus, the
-// provided function must be concurrency-safe. The function should also honor
-// the contract for a Counter (values only go up, not down), but compliance will
-// not be checked.
-func NewCounterFunc(opts CounterOpts, function func() float64) CounterFunc {
-	return newValueFunc(NewDesc(
-		BuildFQName(opts.Namespace, opts.Subsystem, opts.Name),
-		opts.Help,
-		nil,
-		opts.ConstLabels,
-	), CounterValue, function)
-}
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/desc.go b/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/desc.go
deleted file mode 100644
index fcde784d6..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/desc.go
+++ /dev/null
@@ -1,201 +0,0 @@
-package prometheus
-
-import (
-	"bytes"
-	"errors"
-	"fmt"
-	"hash/fnv"
-	"regexp"
-	"sort"
-	"strings"
-
-	"github.com/golang/protobuf/proto"
-
-	dto "github.com/prometheus/client_model/go"
-)
-
-var (
-	metricNameRE = regexp.MustCompile(`^[a-zA-Z_][a-zA-Z0-9_:]*$`)
-	labelNameRE  = regexp.MustCompile("^[a-zA-Z_][a-zA-Z0-9_]*$")
-)
-
-// reservedLabelPrefix is a prefix which is not legal in user-supplied
-// label names.
-const reservedLabelPrefix = "__"
-
-// Labels represents a collection of label name -> value mappings. This type is
-// commonly used with the With(Labels) and GetMetricWith(Labels) methods of
-// metric vector Collectors, e.g.:
-//     myVec.With(Labels{"code": "404", "method": "GET"}).Add(42)
-//
-// The other use-case is the specification of constant label pairs in Opts or to
-// create a Desc.
-type Labels map[string]string
-
-// Desc is the descriptor used by every Prometheus Metric. It is essentially
-// the immutable meta-data of a Metric. The normal Metric implementations
-// included in this package manage their Desc under the hood. Users only have to
-// deal with Desc if they use advanced features like the ExpvarCollector or
-// custom Collectors and Metrics.
-//
-// Descriptors registered with the same registry have to fulfill certain
-// consistency and uniqueness criteria if they share the same fully-qualified
-// name: They must have the same help string and the same label names (aka label
-// dimensions) in each, constLabels and variableLabels, but they must differ in
-// the values of the constLabels.
-//
-// Descriptors that share the same fully-qualified names and the same label
-// values of their constLabels are considered equal.
-//
-// Use NewDesc to create new Desc instances.
-type Desc struct {
-	// fqName has been built from Namespace, Subsystem, and Name.
-	fqName string
-	// help provides some helpful information about this metric.
-	help string
-	// constLabelPairs contains precalculated DTO label pairs based on
-	// the constant labels.
-	constLabelPairs []*dto.LabelPair
-	// VariableLabels contains names of labels for which the metric
-	// maintains variable values.
-	variableLabels []string
-	// id is a hash of the values of the ConstLabels and fqName. This
-	// must be unique among all registered descriptors and can therefore be
-	// used as an identifier of the descriptor.
-	id uint64
-	// dimHash is a hash of the label names (preset and variable) and the
-	// Help string. Each Desc with the same fqName must have the same
-	// dimHash.
-	dimHash uint64
-	// err is an error that occured during construction. It is reported on
-	// registration time.
-	err error
-}
-
-// NewDesc allocates and initializes a new Desc. Errors are recorded in the Desc
-// and will be reported on registration time. variableLabels and constLabels can
-// be nil if no such labels should be set. fqName and help must not be empty.
-//
-// variableLabels only contain the label names. Their label values are variable
-// and therefore not part of the Desc. (They are managed within the Metric.)
-//
-// For constLabels, the label values are constant. Therefore, they are fully
-// specified in the Desc. See the Opts documentation for the implications of
-// constant labels.
-func NewDesc(fqName, help string, variableLabels []string, constLabels Labels) *Desc {
-	d := &Desc{
-		fqName:         fqName,
-		help:           help,
-		variableLabels: variableLabels,
-	}
-	if help == "" {
-		d.err = errors.New("empty help string")
-		return d
-	}
-	if !metricNameRE.MatchString(fqName) {
-		d.err = fmt.Errorf("%q is not a valid metric name", fqName)
-		return d
-	}
-	// labelValues contains the label values of const labels (in order of
-	// their sorted label names) plus the fqName (at position 0).
-	labelValues := make([]string, 1, len(constLabels)+1)
-	labelValues[0] = fqName
-	labelNames := make([]string, 0, len(constLabels)+len(variableLabels))
-	labelNameSet := map[string]struct{}{}
-	// First add only the const label names and sort them...
-	for labelName := range constLabels {
-		if !checkLabelName(labelName) {
-			d.err = fmt.Errorf("%q is not a valid label name", labelName)
-			return d
-		}
-		labelNames = append(labelNames, labelName)
-		labelNameSet[labelName] = struct{}{}
-	}
-	sort.Strings(labelNames)
-	// ... so that we can now add const label values in the order of their names.
-	for _, labelName := range labelNames {
-		labelValues = append(labelValues, constLabels[labelName])
-	}
-	// Now add the variable label names, but prefix them with something that
-	// cannot be in a regular label name. That prevents matching the label
-	// dimension with a different mix between preset and variable labels.
-	for _, labelName := range variableLabels {
-		if !checkLabelName(labelName) {
-			d.err = fmt.Errorf("%q is not a valid label name", labelName)
-			return d
-		}
-		labelNames = append(labelNames, "$"+labelName)
-		labelNameSet[labelName] = struct{}{}
-	}
-	if len(labelNames) != len(labelNameSet) {
-		d.err = errors.New("duplicate label names")
-		return d
-	}
-	h := fnv.New64a()
-	var b bytes.Buffer // To copy string contents into, avoiding []byte allocations.
-	for _, val := range labelValues {
-		b.Reset()
-		b.WriteString(val)
-		b.WriteByte(separatorByte)
-		h.Write(b.Bytes())
-	}
-	d.id = h.Sum64()
-	// Sort labelNames so that order doesn't matter for the hash.
-	sort.Strings(labelNames)
-	// Now hash together (in this order) the help string and the sorted
-	// label names.
-	h.Reset()
-	b.Reset()
-	b.WriteString(help)
-	b.WriteByte(separatorByte)
-	h.Write(b.Bytes())
-	for _, labelName := range labelNames {
-		b.Reset()
-		b.WriteString(labelName)
-		b.WriteByte(separatorByte)
-		h.Write(b.Bytes())
-	}
-	d.dimHash = h.Sum64()
-
-	d.constLabelPairs = make([]*dto.LabelPair, 0, len(constLabels))
-	for n, v := range constLabels {
-		d.constLabelPairs = append(d.constLabelPairs, &dto.LabelPair{
-			Name:  proto.String(n),
-			Value: proto.String(v),
-		})
-	}
-	sort.Sort(LabelPairSorter(d.constLabelPairs))
-	return d
-}
-
-// NewInvalidDesc returns an invalid descriptor, i.e. a descriptor with the
-// provided error set. If a collector returning such a descriptor is registered,
-// registration will fail with the provided error. NewInvalidDesc can be used by
-// a Collector to signal inability to describe itself.
-func NewInvalidDesc(err error) *Desc {
-	return &Desc{
-		err: err,
-	}
-}
-
-func (d *Desc) String() string {
-	lpStrings := make([]string, 0, len(d.constLabelPairs))
-	for _, lp := range d.constLabelPairs {
-		lpStrings = append(
-			lpStrings,
-			fmt.Sprintf("%s=%q", lp.GetName(), lp.GetValue()),
-		)
-	}
-	return fmt.Sprintf(
-		"Desc{fqName: %q, help: %q, constLabels: {%s}, variableLabels: %v}",
-		d.fqName,
-		d.help,
-		strings.Join(lpStrings, ","),
-		d.variableLabels,
-	)
-}
-
-func checkLabelName(l string) bool {
-	return labelNameRE.MatchString(l) &&
-		!strings.HasPrefix(l, reservedLabelPrefix)
-}
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/doc.go b/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/doc.go
deleted file mode 100644
index 425fe8793..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/doc.go
+++ /dev/null
@@ -1,109 +0,0 @@
-// Copyright 2014 The Prometheus Authors
-// 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 prometheus provides embeddable metric primitives for servers and
-// standardized exposition of telemetry through a web services interface.
-//
-// All exported functions and methods are safe to be used concurrently unless
-// specified otherwise.
-//
-// To expose metrics registered with the Prometheus registry, an HTTP server
-// needs to know about the Prometheus handler. The usual endpoint is "/metrics".
-//
-//     http.Handle("/metrics", prometheus.Handler())
-//
-// As a starting point a very basic usage example:
-//
-//    package main
-//
-//    import (
-//    	"net/http"
-//
-//    	"github.com/prometheus/client_golang/prometheus"
-//    )
-//
-//    var (
-//    	cpuTemp = prometheus.NewGauge(prometheus.GaugeOpts{
-//    		Name: "cpu_temperature_celsius",
-//    		Help: "Current temperature of the CPU.",
-//    	})
-//    	hdFailures = prometheus.NewCounter(prometheus.CounterOpts{
-//    		Name: "hd_errors_total",
-//    		Help: "Number of hard-disk errors.",
-//    	})
-//    )
-//
-//    func init() {
-//    	prometheus.MustRegister(cpuTemp)
-//    	prometheus.MustRegister(hdFailures)
-//    }
-//
-//    func main() {
-//    	cpuTemp.Set(65.3)
-//    	hdFailures.Inc()
-//
-//    	http.Handle("/metrics", prometheus.Handler())
-//    	http.ListenAndServe(":8080", nil)
-//    }
-//
-//
-// This is a complete program that exports two metrics, a Gauge and a Counter.
-// It also exports some stats about the HTTP usage of the /metrics
-// endpoint. (See the Handler function for more detail.)
-//
-// Two more advanced metric types are the Summary and Histogram.
-//
-// In addition to the fundamental metric types Gauge, Counter, Summary, and
-// Histogram, a very important part of the Prometheus data model is the
-// partitioning of samples along dimensions called labels, which results in
-// metric vectors. The fundamental types are GaugeVec, CounterVec, SummaryVec,
-// and HistogramVec.
-//
-// Those are all the parts needed for basic usage. Detailed documentation and
-// examples are provided below.
-//
-// Everything else this package offers is essentially for "power users" only. A
-// few pointers to "power user features":
-//
-// All the various ...Opts structs have a ConstLabels field for labels that
-// never change their value (which is only useful under special circumstances,
-// see documentation of the Opts type).
-//
-// The Untyped metric behaves like a Gauge, but signals the Prometheus server
-// not to assume anything about its type.
-//
-// Functions to fine-tune how the metric registry works: EnableCollectChecks,
-// PanicOnCollectError, Register, Unregister, SetMetricFamilyInjectionHook.
-//
-// For custom metric collection, there are two entry points: Custom Metric
-// implementations and custom Collector implementations. A Metric is the
-// fundamental unit in the Prometheus data model: a sample at a point in time
-// together with its meta-data (like its fully-qualified name and any number of
-// pairs of label name and label value) that knows how to marshal itself into a
-// data transfer object (aka DTO, implemented as a protocol buffer). A Collector
-// gets registered with the Prometheus registry and manages the collection of
-// one or more Metrics. Many parts of this package are building blocks for
-// Metrics and Collectors. Desc is the metric descriptor, actually used by all
-// metrics under the hood, and by Collectors to describe the Metrics to be
-// collected, but only to be dealt with by users if they implement their own
-// Metrics or Collectors. To create a Desc, the BuildFQName function will come
-// in handy. Other useful components for Metric and Collector implementation
-// include: LabelPairSorter to sort the DTO version of label pairs,
-// NewConstMetric and MustNewConstMetric to create "throw away" Metrics at
-// collection time, MetricVec to bundle custom Metrics into a metric vector
-// Collector, SelfCollector to make a custom Metric collect itself.
-//
-// A good example for a custom Collector is the ExpVarCollector included in this
-// package, which exports variables exported via the "expvar" package as
-// Prometheus metrics.
-package prometheus
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/expvar.go b/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/expvar.go
deleted file mode 100644
index 0f7630d53..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/expvar.go
+++ /dev/null
@@ -1,119 +0,0 @@
-// Copyright 2014 The Prometheus Authors
-// 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 prometheus
-
-import (
-	"encoding/json"
-	"expvar"
-)
-
-// ExpvarCollector collects metrics from the expvar interface. It provides a
-// quick way to expose numeric values that are already exported via expvar as
-// Prometheus metrics. Note that the data models of expvar and Prometheus are
-// fundamentally different, and that the ExpvarCollector is inherently
-// slow. Thus, the ExpvarCollector is probably great for experiments and
-// prototying, but you should seriously consider a more direct implementation of
-// Prometheus metrics for monitoring production systems.
-//
-// Use NewExpvarCollector to create new instances.
-type ExpvarCollector struct {
-	exports map[string]*Desc
-}
-
-// NewExpvarCollector returns a newly allocated ExpvarCollector that still has
-// to be registered with the Prometheus registry.
-//
-// The exports map has the following meaning:
-//
-// The keys in the map correspond to expvar keys, i.e. for every expvar key you
-// want to export as Prometheus metric, you need an entry in the exports
-// map. The descriptor mapped to each key describes how to export the expvar
-// value. It defines the name and the help string of the Prometheus metric
-// proxying the expvar value. The type will always be Untyped.
-//
-// For descriptors without variable labels, the expvar value must be a number or
-// a bool. The number is then directly exported as the Prometheus sample
-// value. (For a bool, 'false' translates to 0 and 'true' to 1). Expvar values
-// that are not numbers or bools are silently ignored.
-//
-// If the descriptor has one variable label, the expvar value must be an expvar
-// map. The keys in the expvar map become the various values of the one
-// Prometheus label. The values in the expvar map must be numbers or bools again
-// as above.
-//
-// For descriptors with more than one variable label, the expvar must be a
-// nested expvar map, i.e. where the values of the topmost map are maps again
-// etc. until a depth is reached that corresponds to the number of labels. The
-// leaves of that structure must be numbers or bools as above to serve as the
-// sample values.
-//
-// Anything that does not fit into the scheme above is silently ignored.
-func NewExpvarCollector(exports map[string]*Desc) *ExpvarCollector {
-	return &ExpvarCollector{
-		exports: exports,
-	}
-}
-
-// Describe implements Collector.
-func (e *ExpvarCollector) Describe(ch chan<- *Desc) {
-	for _, desc := range e.exports {
-		ch <- desc
-	}
-}
-
-// Collect implements Collector.
-func (e *ExpvarCollector) Collect(ch chan<- Metric) {
-	for name, desc := range e.exports {
-		var m Metric
-		expVar := expvar.Get(name)
-		if expVar == nil {
-			continue
-		}
-		var v interface{}
-		labels := make([]string, len(desc.variableLabels))
-		if err := json.Unmarshal([]byte(expVar.String()), &v); err != nil {
-			ch <- NewInvalidMetric(desc, err)
-			continue
-		}
-		var processValue func(v interface{}, i int)
-		processValue = func(v interface{}, i int) {
-			if i >= len(labels) {
-				copiedLabels := append(make([]string, 0, len(labels)), labels...)
-				switch v := v.(type) {
-				case float64:
-					m = MustNewConstMetric(desc, UntypedValue, v, copiedLabels...)
-				case bool:
-					if v {
-						m = MustNewConstMetric(desc, UntypedValue, 1, copiedLabels...)
-					} else {
-						m = MustNewConstMetric(desc, UntypedValue, 0, copiedLabels...)
-					}
-				default:
-					return
-				}
-				ch <- m
-				return
-			}
-			vm, ok := v.(map[string]interface{})
-			if !ok {
-				return
-			}
-			for lv, val := range vm {
-				labels[i] = lv
-				processValue(val, i+1)
-			}
-		}
-		processValue(v, 0)
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/gauge.go b/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/gauge.go
deleted file mode 100644
index ba8a402ca..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/gauge.go
+++ /dev/null
@@ -1,147 +0,0 @@
-// Copyright 2014 The Prometheus Authors
-// 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 prometheus
-
-import "hash/fnv"
-
-// Gauge is a Metric that represents a single numerical value that can
-// arbitrarily go up and down.
-//
-// A Gauge is typically used for measured values like temperatures or current
-// memory usage, but also "counts" that can go up and down, like the number of
-// running goroutines.
-//
-// To create Gauge instances, use NewGauge.
-type Gauge interface {
-	Metric
-	Collector
-
-	// Set sets the Gauge to an arbitrary value.
-	Set(float64)
-	// Inc increments the Gauge by 1.
-	Inc()
-	// Dec decrements the Gauge by 1.
-	Dec()
-	// Add adds the given value to the Gauge. (The value can be
-	// negative, resulting in a decrease of the Gauge.)
-	Add(float64)
-	// Sub subtracts the given value from the Gauge. (The value can be
-	// negative, resulting in an increase of the Gauge.)
-	Sub(float64)
-}
-
-// GaugeOpts is an alias for Opts. See there for doc comments.
-type GaugeOpts Opts
-
-// NewGauge creates a new Gauge based on the provided GaugeOpts.
-func NewGauge(opts GaugeOpts) Gauge {
-	return newValue(NewDesc(
-		BuildFQName(opts.Namespace, opts.Subsystem, opts.Name),
-		opts.Help,
-		nil,
-		opts.ConstLabels,
-	), GaugeValue, 0)
-}
-
-// GaugeVec is a Collector that bundles a set of Gauges that all share the same
-// Desc, but have different values for their variable labels. This is used if
-// you want to count the same thing partitioned by various dimensions
-// (e.g. number of operations queued, partitioned by user and operation
-// type). Create instances with NewGaugeVec.
-type GaugeVec struct {
-	MetricVec
-}
-
-// NewGaugeVec creates a new GaugeVec based on the provided GaugeOpts and
-// partitioned by the given label names. At least one label name must be
-// provided.
-func NewGaugeVec(opts GaugeOpts, labelNames []string) *GaugeVec {
-	desc := NewDesc(
-		BuildFQName(opts.Namespace, opts.Subsystem, opts.Name),
-		opts.Help,
-		labelNames,
-		opts.ConstLabels,
-	)
-	return &GaugeVec{
-		MetricVec: MetricVec{
-			children: map[uint64]Metric{},
-			desc:     desc,
-			hash:     fnv.New64a(),
-			newMetric: func(lvs ...string) Metric {
-				return newValue(desc, GaugeValue, 0, lvs...)
-			},
-		},
-	}
-}
-
-// GetMetricWithLabelValues replaces the method of the same name in
-// MetricVec. The difference is that this method returns a Gauge and not a
-// Metric so that no type conversion is required.
-func (m *GaugeVec) GetMetricWithLabelValues(lvs ...string) (Gauge, error) {
-	metric, err := m.MetricVec.GetMetricWithLabelValues(lvs...)
-	if metric != nil {
-		return metric.(Gauge), err
-	}
-	return nil, err
-}
-
-// GetMetricWith replaces the method of the same name in MetricVec. The
-// difference is that this method returns a Gauge and not a Metric so that no
-// type conversion is required.
-func (m *GaugeVec) GetMetricWith(labels Labels) (Gauge, error) {
-	metric, err := m.MetricVec.GetMetricWith(labels)
-	if metric != nil {
-		return metric.(Gauge), err
-	}
-	return nil, err
-}
-
-// WithLabelValues works as GetMetricWithLabelValues, but panics where
-// GetMetricWithLabelValues would have returned an error. By not returning an
-// error, WithLabelValues allows shortcuts like
-//     myVec.WithLabelValues("404", "GET").Add(42)
-func (m *GaugeVec) WithLabelValues(lvs ...string) Gauge {
-	return m.MetricVec.WithLabelValues(lvs...).(Gauge)
-}
-
-// With works as GetMetricWith, but panics where GetMetricWithLabels would have
-// returned an error. By not returning an error, With allows shortcuts like
-//     myVec.With(Labels{"code": "404", "method": "GET"}).Add(42)
-func (m *GaugeVec) With(labels Labels) Gauge {
-	return m.MetricVec.With(labels).(Gauge)
-}
-
-// GaugeFunc is a Gauge whose value is determined at collect time by calling a
-// provided function.
-//
-// To create GaugeFunc instances, use NewGaugeFunc.
-type GaugeFunc interface {
-	Metric
-	Collector
-}
-
-// NewGaugeFunc creates a new GaugeFunc based on the provided GaugeOpts. The
-// value reported is determined by calling the given function from within the
-// Write method. Take into account that metric collection may happen
-// concurrently. If that results in concurrent calls to Write, like in the case
-// where a GaugeFunc is directly registered with Prometheus, the provided
-// function must be concurrency-safe.
-func NewGaugeFunc(opts GaugeOpts, function func() float64) GaugeFunc {
-	return newValueFunc(NewDesc(
-		BuildFQName(opts.Namespace, opts.Subsystem, opts.Name),
-		opts.Help,
-		nil,
-		opts.ConstLabels,
-	), GaugeValue, function)
-}
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/go_collector.go b/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/go_collector.go
deleted file mode 100644
index 8be247695..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/go_collector.go
+++ /dev/null
@@ -1,263 +0,0 @@
-package prometheus
-
-import (
-	"fmt"
-	"runtime"
-	"runtime/debug"
-	"time"
-)
-
-type goCollector struct {
-	goroutines Gauge
-	gcDesc     *Desc
-
-	// metrics to describe and collect
-	metrics memStatsMetrics
-}
-
-// NewGoCollector returns a collector which exports metrics about the current
-// go process.
-func NewGoCollector() *goCollector {
-	return &goCollector{
-		goroutines: NewGauge(GaugeOpts{
-			Namespace: "go",
-			Name:      "goroutines",
-			Help:      "Number of goroutines that currently exist.",
-		}),
-		gcDesc: NewDesc(
-			"go_gc_duration_seconds",
-			"A summary of the GC invocation durations.",
-			nil, nil),
-		metrics: memStatsMetrics{
-			{
-				desc: NewDesc(
-					memstatNamespace("alloc_bytes"),
-					"Number of bytes allocated and still in use.",
-					nil, nil,
-				),
-				eval:    func(ms *runtime.MemStats) float64 { return float64(ms.Alloc) },
-				valType: GaugeValue,
-			}, {
-				desc: NewDesc(
-					memstatNamespace("alloc_bytes_total"),
-					"Total number of bytes allocated, even if freed.",
-					nil, nil,
-				),
-				eval:    func(ms *runtime.MemStats) float64 { return float64(ms.TotalAlloc) },
-				valType: CounterValue,
-			}, {
-				desc: NewDesc(
-					memstatNamespace("sys_bytes"),
-					"Number of bytes obtained by system. Sum of all system allocations.",
-					nil, nil,
-				),
-				eval:    func(ms *runtime.MemStats) float64 { return float64(ms.Sys) },
-				valType: GaugeValue,
-			}, {
-				desc: NewDesc(
-					memstatNamespace("lookups_total"),
-					"Total number of pointer lookups.",
-					nil, nil,
-				),
-				eval:    func(ms *runtime.MemStats) float64 { return float64(ms.Lookups) },
-				valType: CounterValue,
-			}, {
-				desc: NewDesc(
-					memstatNamespace("mallocs_total"),
-					"Total number of mallocs.",
-					nil, nil,
-				),
-				eval:    func(ms *runtime.MemStats) float64 { return float64(ms.Mallocs) },
-				valType: CounterValue,
-			}, {
-				desc: NewDesc(
-					memstatNamespace("frees_total"),
-					"Total number of frees.",
-					nil, nil,
-				),
-				eval:    func(ms *runtime.MemStats) float64 { return float64(ms.Frees) },
-				valType: CounterValue,
-			}, {
-				desc: NewDesc(
-					memstatNamespace("heap_alloc_bytes"),
-					"Number of heap bytes allocated and still in use.",
-					nil, nil,
-				),
-				eval:    func(ms *runtime.MemStats) float64 { return float64(ms.HeapAlloc) },
-				valType: GaugeValue,
-			}, {
-				desc: NewDesc(
-					memstatNamespace("heap_sys_bytes"),
-					"Number of heap bytes obtained from system.",
-					nil, nil,
-				),
-				eval:    func(ms *runtime.MemStats) float64 { return float64(ms.HeapSys) },
-				valType: GaugeValue,
-			}, {
-				desc: NewDesc(
-					memstatNamespace("heap_idle_bytes"),
-					"Number of heap bytes waiting to be used.",
-					nil, nil,
-				),
-				eval:    func(ms *runtime.MemStats) float64 { return float64(ms.HeapIdle) },
-				valType: GaugeValue,
-			}, {
-				desc: NewDesc(
-					memstatNamespace("heap_inuse_bytes"),
-					"Number of heap bytes that are in use.",
-					nil, nil,
-				),
-				eval:    func(ms *runtime.MemStats) float64 { return float64(ms.HeapInuse) },
-				valType: GaugeValue,
-			}, {
-				desc: NewDesc(
-					memstatNamespace("heap_released_bytes_total"),
-					"Total number of heap bytes released to OS.",
-					nil, nil,
-				),
-				eval:    func(ms *runtime.MemStats) float64 { return float64(ms.HeapReleased) },
-				valType: CounterValue,
-			}, {
-				desc: NewDesc(
-					memstatNamespace("heap_objects"),
-					"Number of allocated objects.",
-					nil, nil,
-				),
-				eval:    func(ms *runtime.MemStats) float64 { return float64(ms.HeapObjects) },
-				valType: GaugeValue,
-			}, {
-				desc: NewDesc(
-					memstatNamespace("stack_inuse_bytes"),
-					"Number of bytes in use by the stack allocator.",
-					nil, nil,
-				),
-				eval:    func(ms *runtime.MemStats) float64 { return float64(ms.StackInuse) },
-				valType: GaugeValue,
-			}, {
-				desc: NewDesc(
-					memstatNamespace("stack_sys_bytes"),
-					"Number of bytes obtained from system for stack allocator.",
-					nil, nil,
-				),
-				eval:    func(ms *runtime.MemStats) float64 { return float64(ms.StackSys) },
-				valType: GaugeValue,
-			}, {
-				desc: NewDesc(
-					memstatNamespace("mspan_inuse_bytes"),
-					"Number of bytes in use by mspan structures.",
-					nil, nil,
-				),
-				eval:    func(ms *runtime.MemStats) float64 { return float64(ms.MSpanInuse) },
-				valType: GaugeValue,
-			}, {
-				desc: NewDesc(
-					memstatNamespace("mspan_sys_bytes"),
-					"Number of bytes used for mspan structures obtained from system.",
-					nil, nil,
-				),
-				eval:    func(ms *runtime.MemStats) float64 { return float64(ms.MSpanSys) },
-				valType: GaugeValue,
-			}, {
-				desc: NewDesc(
-					memstatNamespace("mcache_inuse_bytes"),
-					"Number of bytes in use by mcache structures.",
-					nil, nil,
-				),
-				eval:    func(ms *runtime.MemStats) float64 { return float64(ms.MCacheInuse) },
-				valType: GaugeValue,
-			}, {
-				desc: NewDesc(
-					memstatNamespace("mcache_sys_bytes"),
-					"Number of bytes used for mcache structures obtained from system.",
-					nil, nil,
-				),
-				eval:    func(ms *runtime.MemStats) float64 { return float64(ms.MCacheSys) },
-				valType: GaugeValue,
-			}, {
-				desc: NewDesc(
-					memstatNamespace("buck_hash_sys_bytes"),
-					"Number of bytes used by the profiling bucket hash table.",
-					nil, nil,
-				),
-				eval:    func(ms *runtime.MemStats) float64 { return float64(ms.BuckHashSys) },
-				valType: GaugeValue,
-			}, {
-				desc: NewDesc(
-					memstatNamespace("gc_sys_bytes"),
-					"Number of bytes used for garbage collection system metadata.",
-					nil, nil,
-				),
-				eval:    func(ms *runtime.MemStats) float64 { return float64(ms.GCSys) },
-				valType: GaugeValue,
-			}, {
-				desc: NewDesc(
-					memstatNamespace("other_sys_bytes"),
-					"Number of bytes used for other system allocations.",
-					nil, nil,
-				),
-				eval:    func(ms *runtime.MemStats) float64 { return float64(ms.OtherSys) },
-				valType: GaugeValue,
-			}, {
-				desc: NewDesc(
-					memstatNamespace("next_gc_bytes"),
-					"Number of heap bytes when next garbage collection will take place.",
-					nil, nil,
-				),
-				eval:    func(ms *runtime.MemStats) float64 { return float64(ms.NextGC) },
-				valType: GaugeValue,
-			}, {
-				desc: NewDesc(
-					memstatNamespace("last_gc_time_seconds"),
-					"Number of seconds since 1970 of last garbage collection.",
-					nil, nil,
-				),
-				eval:    func(ms *runtime.MemStats) float64 { return float64(ms.LastGC*10 ^ 9) },
-				valType: GaugeValue,
-			},
-		},
-	}
-}
-
-func memstatNamespace(s string) string {
-	return fmt.Sprintf("go_memstats_%s", s)
-}
-
-// Describe returns all descriptions of the collector.
-func (c *goCollector) Describe(ch chan<- *Desc) {
-	ch <- c.goroutines.Desc()
-	ch <- c.gcDesc
-
-	for _, i := range c.metrics {
-		ch <- i.desc
-	}
-}
-
-// Collect returns the current state of all metrics of the collector.
-func (c *goCollector) Collect(ch chan<- Metric) {
-	c.goroutines.Set(float64(runtime.NumGoroutine()))
-	ch <- c.goroutines
-
-	var stats debug.GCStats
-	stats.PauseQuantiles = make([]time.Duration, 5)
-	debug.ReadGCStats(&stats)
-
-	quantiles := make(map[float64]float64)
-	for idx, pq := range stats.PauseQuantiles[1:] {
-		quantiles[float64(idx+1)/float64(len(stats.PauseQuantiles)-1)] = pq.Seconds()
-	}
-	quantiles[0.0] = stats.PauseQuantiles[0].Seconds()
-	ch <- MustNewConstSummary(c.gcDesc, uint64(stats.NumGC), float64(stats.PauseTotal.Seconds()), quantiles)
-
-	ms := &runtime.MemStats{}
-	runtime.ReadMemStats(ms)
-	for _, i := range c.metrics {
-		ch <- MustNewConstMetric(i.desc, i.valType, i.eval(ms))
-	}
-}
-
-// memStatsMetrics provide description, value, and value type for memstat metrics.
-type memStatsMetrics []struct {
-	desc    *Desc
-	eval    func(*runtime.MemStats) float64
-	valType ValueType
-}
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/histogram.go b/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/histogram.go
deleted file mode 100644
index f98a41bc8..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/histogram.go
+++ /dev/null
@@ -1,450 +0,0 @@
-// Copyright 2015 The Prometheus Authors
-// 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 prometheus
-
-import (
-	"fmt"
-	"hash/fnv"
-	"math"
-	"sort"
-	"sync/atomic"
-
-	"github.com/golang/protobuf/proto"
-
-	dto "github.com/prometheus/client_model/go"
-)
-
-// A Histogram counts individual observations from an event or sample stream in
-// configurable buckets. Similar to a summary, it also provides a sum of
-// observations and an observation count.
-//
-// On the Prometheus server, quantiles can be calculated from a Histogram using
-// the histogram_quantile function in the query language.
-//
-// Note that Histograms, in contrast to Summaries, can be aggregated with the
-// Prometheus query language (see the documentation for detailed
-// procedures). However, Histograms require the user to pre-define suitable
-// buckets, and they are in general less accurate. The Observe method of a
-// Histogram has a very low performance overhead in comparison with the Observe
-// method of a Summary.
-//
-// To create Histogram instances, use NewHistogram.
-type Histogram interface {
-	Metric
-	Collector
-
-	// Observe adds a single observation to the histogram.
-	Observe(float64)
-}
-
-// bucketLabel is used for the label that defines the upper bound of a
-// bucket of a histogram ("le" -> "less or equal").
-const bucketLabel = "le"
-
-var (
-	// DefBuckets are the default Histogram buckets. The default buckets are
-	// tailored to broadly measure the response time (in seconds) of a
-	// network service. Most likely, however, you will be required to define
-	// buckets customized to your use case.
-	DefBuckets = []float64{.005, .01, .025, .05, .1, .25, .5, 1, 2.5, 5, 10}
-
-	errBucketLabelNotAllowed = fmt.Errorf(
-		"%q is not allowed as label name in histograms", bucketLabel,
-	)
-)
-
-// LinearBuckets creates 'count' buckets, each 'width' wide, where the lowest
-// bucket has an upper bound of 'start'. The final +Inf bucket is not counted
-// and not included in the returned slice. The returned slice is meant to be
-// used for the Buckets field of HistogramOpts.
-//
-// The function panics if 'count' is zero or negative.
-func LinearBuckets(start, width float64, count int) []float64 {
-	if count < 1 {
-		panic("LinearBuckets needs a positive count")
-	}
-	buckets := make([]float64, count)
-	for i := range buckets {
-		buckets[i] = start
-		start += width
-	}
-	return buckets
-}
-
-// ExponentialBuckets creates 'count' buckets, where the lowest bucket has an
-// upper bound of 'start' and each following bucket's upper bound is 'factor'
-// times the previous bucket's upper bound. The final +Inf bucket is not counted
-// and not included in the returned slice. The returned slice is meant to be
-// used for the Buckets field of HistogramOpts.
-//
-// The function panics if 'count' is 0 or negative, if 'start' is 0 or negative,
-// or if 'factor' is less than or equal 1.
-func ExponentialBuckets(start, factor float64, count int) []float64 {
-	if count < 1 {
-		panic("ExponentialBuckets needs a positive count")
-	}
-	if start <= 0 {
-		panic("ExponentialBuckets needs a positive start value")
-	}
-	if factor <= 1 {
-		panic("ExponentialBuckets needs a factor greater than 1")
-	}
-	buckets := make([]float64, count)
-	for i := range buckets {
-		buckets[i] = start
-		start *= factor
-	}
-	return buckets
-}
-
-// HistogramOpts bundles the options for creating a Histogram metric. It is
-// mandatory to set Name and Help to a non-empty string. All other fields are
-// optional and can safely be left at their zero value.
-type HistogramOpts struct {
-	// Namespace, Subsystem, and Name are components of the fully-qualified
-	// name of the Histogram (created by joining these components with
-	// "_"). Only Name is mandatory, the others merely help structuring the
-	// name. Note that the fully-qualified name of the Histogram must be a
-	// valid Prometheus metric name.
-	Namespace string
-	Subsystem string
-	Name      string
-
-	// Help provides information about this Histogram. Mandatory!
-	//
-	// Metrics with the same fully-qualified name must have the same Help
-	// string.
-	Help string
-
-	// ConstLabels are used to attach fixed labels to this
-	// Histogram. Histograms with the same fully-qualified name must have the
-	// same label names in their ConstLabels.
-	//
-	// Note that in most cases, labels have a value that varies during the
-	// lifetime of a process. Those labels are usually managed with a
-	// HistogramVec. ConstLabels serve only special purposes. One is for the
-	// special case where the value of a label does not change during the
-	// lifetime of a process, e.g. if the revision of the running binary is
-	// put into a label. Another, more advanced purpose is if more than one
-	// Collector needs to collect Histograms with the same fully-qualified
-	// name. In that case, those Summaries must differ in the values of
-	// their ConstLabels. See the Collector examples.
-	//
-	// If the value of a label never changes (not even between binaries),
-	// that label most likely should not be a label at all (but part of the
-	// metric name).
-	ConstLabels Labels
-
-	// Buckets defines the buckets into which observations are counted. Each
-	// element in the slice is the upper inclusive bound of a bucket. The
-	// values must be sorted in strictly increasing order. There is no need
-	// to add a highest bucket with +Inf bound, it will be added
-	// implicitly. The default value is DefBuckets.
-	Buckets []float64
-}
-
-// NewHistogram creates a new Histogram based on the provided HistogramOpts. It
-// panics if the buckets in HistogramOpts are not in strictly increasing order.
-func NewHistogram(opts HistogramOpts) Histogram {
-	return newHistogram(
-		NewDesc(
-			BuildFQName(opts.Namespace, opts.Subsystem, opts.Name),
-			opts.Help,
-			nil,
-			opts.ConstLabels,
-		),
-		opts,
-	)
-}
-
-func newHistogram(desc *Desc, opts HistogramOpts, labelValues ...string) Histogram {
-	if len(desc.variableLabels) != len(labelValues) {
-		panic(errInconsistentCardinality)
-	}
-
-	for _, n := range desc.variableLabels {
-		if n == bucketLabel {
-			panic(errBucketLabelNotAllowed)
-		}
-	}
-	for _, lp := range desc.constLabelPairs {
-		if lp.GetName() == bucketLabel {
-			panic(errBucketLabelNotAllowed)
-		}
-	}
-
-	if len(opts.Buckets) == 0 {
-		opts.Buckets = DefBuckets
-	}
-
-	h := &histogram{
-		desc:        desc,
-		upperBounds: opts.Buckets,
-		labelPairs:  makeLabelPairs(desc, labelValues),
-	}
-	for i, upperBound := range h.upperBounds {
-		if i < len(h.upperBounds)-1 {
-			if upperBound >= h.upperBounds[i+1] {
-				panic(fmt.Errorf(
-					"histogram buckets must be in increasing order: %f >= %f",
-					upperBound, h.upperBounds[i+1],
-				))
-			}
-		} else {
-			if math.IsInf(upperBound, +1) {
-				// The +Inf bucket is implicit. Remove it here.
-				h.upperBounds = h.upperBounds[:i]
-			}
-		}
-	}
-	// Finally we know the final length of h.upperBounds and can make counts.
-	h.counts = make([]uint64, len(h.upperBounds))
-
-	h.Init(h) // Init self-collection.
-	return h
-}
-
-type histogram struct {
-	// sumBits contains the bits of the float64 representing the sum of all
-	// observations. sumBits and count have to go first in the struct to
-	// guarantee alignment for atomic operations.
-	// http://golang.org/pkg/sync/atomic/#pkg-note-BUG
-	sumBits uint64
-	count   uint64
-
-	SelfCollector
-	// Note that there is no mutex required.
-
-	desc *Desc
-
-	upperBounds []float64
-	counts      []uint64
-
-	labelPairs []*dto.LabelPair
-}
-
-func (h *histogram) Desc() *Desc {
-	return h.desc
-}
-
-func (h *histogram) Observe(v float64) {
-	// TODO(beorn7): For small numbers of buckets (<30), a linear search is
-	// slightly faster than the binary search. If we really care, we could
-	// switch from one search strategy to the other depending on the number
-	// of buckets.
-	//
-	// Microbenchmarks (BenchmarkHistogramNoLabels):
-	// 11 buckets: 38.3 ns/op linear - binary 48.7 ns/op
-	// 100 buckets: 78.1 ns/op linear - binary 54.9 ns/op
-	// 300 buckets: 154 ns/op linear - binary 61.6 ns/op
-	i := sort.SearchFloat64s(h.upperBounds, v)
-	if i < len(h.counts) {
-		atomic.AddUint64(&h.counts[i], 1)
-	}
-	atomic.AddUint64(&h.count, 1)
-	for {
-		oldBits := atomic.LoadUint64(&h.sumBits)
-		newBits := math.Float64bits(math.Float64frombits(oldBits) + v)
-		if atomic.CompareAndSwapUint64(&h.sumBits, oldBits, newBits) {
-			break
-		}
-	}
-}
-
-func (h *histogram) Write(out *dto.Metric) error {
-	his := &dto.Histogram{}
-	buckets := make([]*dto.Bucket, len(h.upperBounds))
-
-	his.SampleSum = proto.Float64(math.Float64frombits(atomic.LoadUint64(&h.sumBits)))
-	his.SampleCount = proto.Uint64(atomic.LoadUint64(&h.count))
-	var count uint64
-	for i, upperBound := range h.upperBounds {
-		count += atomic.LoadUint64(&h.counts[i])
-		buckets[i] = &dto.Bucket{
-			CumulativeCount: proto.Uint64(count),
-			UpperBound:      proto.Float64(upperBound),
-		}
-	}
-	his.Bucket = buckets
-	out.Histogram = his
-	out.Label = h.labelPairs
-	return nil
-}
-
-// HistogramVec is a Collector that bundles a set of Histograms that all share the
-// same Desc, but have different values for their variable labels. This is used
-// if you want to count the same thing partitioned by various dimensions
-// (e.g. HTTP request latencies, partitioned by status code and method). Create
-// instances with NewHistogramVec.
-type HistogramVec struct {
-	MetricVec
-}
-
-// NewHistogramVec creates a new HistogramVec based on the provided HistogramOpts and
-// partitioned by the given label names. At least one label name must be
-// provided.
-func NewHistogramVec(opts HistogramOpts, labelNames []string) *HistogramVec {
-	desc := NewDesc(
-		BuildFQName(opts.Namespace, opts.Subsystem, opts.Name),
-		opts.Help,
-		labelNames,
-		opts.ConstLabels,
-	)
-	return &HistogramVec{
-		MetricVec: MetricVec{
-			children: map[uint64]Metric{},
-			desc:     desc,
-			hash:     fnv.New64a(),
-			newMetric: func(lvs ...string) Metric {
-				return newHistogram(desc, opts, lvs...)
-			},
-		},
-	}
-}
-
-// GetMetricWithLabelValues replaces the method of the same name in
-// MetricVec. The difference is that this method returns a Histogram and not a
-// Metric so that no type conversion is required.
-func (m *HistogramVec) GetMetricWithLabelValues(lvs ...string) (Histogram, error) {
-	metric, err := m.MetricVec.GetMetricWithLabelValues(lvs...)
-	if metric != nil {
-		return metric.(Histogram), err
-	}
-	return nil, err
-}
-
-// GetMetricWith replaces the method of the same name in MetricVec. The
-// difference is that this method returns a Histogram and not a Metric so that no
-// type conversion is required.
-func (m *HistogramVec) GetMetricWith(labels Labels) (Histogram, error) {
-	metric, err := m.MetricVec.GetMetricWith(labels)
-	if metric != nil {
-		return metric.(Histogram), err
-	}
-	return nil, err
-}
-
-// WithLabelValues works as GetMetricWithLabelValues, but panics where
-// GetMetricWithLabelValues would have returned an error. By not returning an
-// error, WithLabelValues allows shortcuts like
-//     myVec.WithLabelValues("404", "GET").Observe(42.21)
-func (m *HistogramVec) WithLabelValues(lvs ...string) Histogram {
-	return m.MetricVec.WithLabelValues(lvs...).(Histogram)
-}
-
-// With works as GetMetricWith, but panics where GetMetricWithLabels would have
-// returned an error. By not returning an error, With allows shortcuts like
-//     myVec.With(Labels{"code": "404", "method": "GET"}).Observe(42.21)
-func (m *HistogramVec) With(labels Labels) Histogram {
-	return m.MetricVec.With(labels).(Histogram)
-}
-
-type constHistogram struct {
-	desc       *Desc
-	count      uint64
-	sum        float64
-	buckets    map[float64]uint64
-	labelPairs []*dto.LabelPair
-}
-
-func (h *constHistogram) Desc() *Desc {
-	return h.desc
-}
-
-func (h *constHistogram) Write(out *dto.Metric) error {
-	his := &dto.Histogram{}
-	buckets := make([]*dto.Bucket, 0, len(h.buckets))
-
-	his.SampleCount = proto.Uint64(h.count)
-	his.SampleSum = proto.Float64(h.sum)
-
-	for upperBound, count := range h.buckets {
-		buckets = append(buckets, &dto.Bucket{
-			CumulativeCount: proto.Uint64(count),
-			UpperBound:      proto.Float64(upperBound),
-		})
-	}
-
-	if len(buckets) > 0 {
-		sort.Sort(buckSort(buckets))
-	}
-	his.Bucket = buckets
-
-	out.Histogram = his
-	out.Label = h.labelPairs
-
-	return nil
-}
-
-// NewConstHistogram returns a metric representing a Prometheus histogram with
-// fixed values for the count, sum, and bucket counts. As those parameters
-// cannot be changed, the returned value does not implement the Histogram
-// interface (but only the Metric interface). Users of this package will not
-// have much use for it in regular operations. However, when implementing custom
-// Collectors, it is useful as a throw-away metric that is generated on the fly
-// to send it to Prometheus in the Collect method.
-//
-// buckets is a map of upper bounds to cumulative counts, excluding the +Inf
-// bucket.
-//
-// NewConstHistogram returns an error if the length of labelValues is not
-// consistent with the variable labels in Desc.
-func NewConstHistogram(
-	desc *Desc,
-	count uint64,
-	sum float64,
-	buckets map[float64]uint64,
-	labelValues ...string,
-) (Metric, error) {
-	if len(desc.variableLabels) != len(labelValues) {
-		return nil, errInconsistentCardinality
-	}
-	return &constHistogram{
-		desc:       desc,
-		count:      count,
-		sum:        sum,
-		buckets:    buckets,
-		labelPairs: makeLabelPairs(desc, labelValues),
-	}, nil
-}
-
-// MustNewConstHistogram is a version of NewConstHistogram that panics where
-// NewConstMetric would have returned an error.
-func MustNewConstHistogram(
-	desc *Desc,
-	count uint64,
-	sum float64,
-	buckets map[float64]uint64,
-	labelValues ...string,
-) Metric {
-	m, err := NewConstHistogram(desc, count, sum, buckets, labelValues...)
-	if err != nil {
-		panic(err)
-	}
-	return m
-}
-
-type buckSort []*dto.Bucket
-
-func (s buckSort) Len() int {
-	return len(s)
-}
-
-func (s buckSort) Swap(i, j int) {
-	s[i], s[j] = s[j], s[i]
-}
-
-func (s buckSort) Less(i, j int) bool {
-	return s[i].GetUpperBound() < s[j].GetUpperBound()
-}
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/http.go b/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/http.go
deleted file mode 100644
index eabe60246..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/http.go
+++ /dev/null
@@ -1,361 +0,0 @@
-// Copyright 2014 The Prometheus Authors
-// 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 prometheus
-
-import (
-	"bufio"
-	"io"
-	"net"
-	"net/http"
-	"strconv"
-	"strings"
-	"time"
-)
-
-var instLabels = []string{"method", "code"}
-
-type nower interface {
-	Now() time.Time
-}
-
-type nowFunc func() time.Time
-
-func (n nowFunc) Now() time.Time {
-	return n()
-}
-
-var now nower = nowFunc(func() time.Time {
-	return time.Now()
-})
-
-func nowSeries(t ...time.Time) nower {
-	return nowFunc(func() time.Time {
-		defer func() {
-			t = t[1:]
-		}()
-
-		return t[0]
-	})
-}
-
-// InstrumentHandler wraps the given HTTP handler for instrumentation. It
-// registers four metric collectors (if not already done) and reports HTTP
-// metrics to the (newly or already) registered collectors: http_requests_total
-// (CounterVec), http_request_duration_microseconds (Summary),
-// http_request_size_bytes (Summary), http_response_size_bytes (Summary). Each
-// has a constant label named "handler" with the provided handlerName as
-// value. http_requests_total is a metric vector partitioned by HTTP method
-// (label name "method") and HTTP status code (label name "code").
-func InstrumentHandler(handlerName string, handler http.Handler) http.HandlerFunc {
-	return InstrumentHandlerFunc(handlerName, handler.ServeHTTP)
-}
-
-// InstrumentHandlerFunc wraps the given function for instrumentation. It
-// otherwise works in the same way as InstrumentHandler.
-func InstrumentHandlerFunc(handlerName string, handlerFunc func(http.ResponseWriter, *http.Request)) http.HandlerFunc {
-	return InstrumentHandlerFuncWithOpts(
-		SummaryOpts{
-			Subsystem:   "http",
-			ConstLabels: Labels{"handler": handlerName},
-		},
-		handlerFunc,
-	)
-}
-
-// InstrumentHandlerWithOpts works like InstrumentHandler but provides more
-// flexibility (at the cost of a more complex call syntax). As
-// InstrumentHandler, this function registers four metric collectors, but it
-// uses the provided SummaryOpts to create them. However, the fields "Name" and
-// "Help" in the SummaryOpts are ignored. "Name" is replaced by
-// "requests_total", "request_duration_microseconds", "request_size_bytes", and
-// "response_size_bytes", respectively. "Help" is replaced by an appropriate
-// help string. The names of the variable labels of the http_requests_total
-// CounterVec are "method" (get, post, etc.), and "code" (HTTP status code).
-//
-// If InstrumentHandlerWithOpts is called as follows, it mimics exactly the
-// behavior of InstrumentHandler:
-//
-//     prometheus.InstrumentHandlerWithOpts(
-//         prometheus.SummaryOpts{
-//              Subsystem:   "http",
-//              ConstLabels: prometheus.Labels{"handler": handlerName},
-//         },
-//         handler,
-//     )
-//
-// Technical detail: "requests_total" is a CounterVec, not a SummaryVec, so it
-// cannot use SummaryOpts. Instead, a CounterOpts struct is created internally,
-// and all its fields are set to the equally named fields in the provided
-// SummaryOpts.
-func InstrumentHandlerWithOpts(opts SummaryOpts, handler http.Handler) http.HandlerFunc {
-	return InstrumentHandlerFuncWithOpts(opts, handler.ServeHTTP)
-}
-
-// InstrumentHandlerFuncWithOpts works like InstrumentHandlerFunc but provides
-// more flexibility (at the cost of a more complex call syntax). See
-// InstrumentHandlerWithOpts for details how the provided SummaryOpts are used.
-func InstrumentHandlerFuncWithOpts(opts SummaryOpts, handlerFunc func(http.ResponseWriter, *http.Request)) http.HandlerFunc {
-	reqCnt := NewCounterVec(
-		CounterOpts{
-			Namespace:   opts.Namespace,
-			Subsystem:   opts.Subsystem,
-			Name:        "requests_total",
-			Help:        "Total number of HTTP requests made.",
-			ConstLabels: opts.ConstLabels,
-		},
-		instLabels,
-	)
-
-	opts.Name = "request_duration_microseconds"
-	opts.Help = "The HTTP request latencies in microseconds."
-	reqDur := NewSummary(opts)
-
-	opts.Name = "request_size_bytes"
-	opts.Help = "The HTTP request sizes in bytes."
-	reqSz := NewSummary(opts)
-
-	opts.Name = "response_size_bytes"
-	opts.Help = "The HTTP response sizes in bytes."
-	resSz := NewSummary(opts)
-
-	regReqCnt := MustRegisterOrGet(reqCnt).(*CounterVec)
-	regReqDur := MustRegisterOrGet(reqDur).(Summary)
-	regReqSz := MustRegisterOrGet(reqSz).(Summary)
-	regResSz := MustRegisterOrGet(resSz).(Summary)
-
-	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		now := time.Now()
-
-		delegate := &responseWriterDelegator{ResponseWriter: w}
-		out := make(chan int)
-		urlLen := 0
-		if r.URL != nil {
-			urlLen = len(r.URL.String())
-		}
-		go computeApproximateRequestSize(r, out, urlLen)
-
-		_, cn := w.(http.CloseNotifier)
-		_, fl := w.(http.Flusher)
-		_, hj := w.(http.Hijacker)
-		_, rf := w.(io.ReaderFrom)
-		var rw http.ResponseWriter
-		if cn && fl && hj && rf {
-			rw = &fancyResponseWriterDelegator{delegate}
-		} else {
-			rw = delegate
-		}
-		handlerFunc(rw, r)
-
-		elapsed := float64(time.Since(now)) / float64(time.Microsecond)
-
-		method := sanitizeMethod(r.Method)
-		code := sanitizeCode(delegate.status)
-		regReqCnt.WithLabelValues(method, code).Inc()
-		regReqDur.Observe(elapsed)
-		regResSz.Observe(float64(delegate.written))
-		regReqSz.Observe(float64(<-out))
-	})
-}
-
-func computeApproximateRequestSize(r *http.Request, out chan int, s int) {
-	s += len(r.Method)
-	s += len(r.Proto)
-	for name, values := range r.Header {
-		s += len(name)
-		for _, value := range values {
-			s += len(value)
-		}
-	}
-	s += len(r.Host)
-
-	// N.B. r.Form and r.MultipartForm are assumed to be included in r.URL.
-
-	if r.ContentLength != -1 {
-		s += int(r.ContentLength)
-	}
-	out <- s
-}
-
-type responseWriterDelegator struct {
-	http.ResponseWriter
-
-	handler, method string
-	status          int
-	written         int64
-	wroteHeader     bool
-}
-
-func (r *responseWriterDelegator) WriteHeader(code int) {
-	r.status = code
-	r.wroteHeader = true
-	r.ResponseWriter.WriteHeader(code)
-}
-
-func (r *responseWriterDelegator) Write(b []byte) (int, error) {
-	if !r.wroteHeader {
-		r.WriteHeader(http.StatusOK)
-	}
-	n, err := r.ResponseWriter.Write(b)
-	r.written += int64(n)
-	return n, err
-}
-
-type fancyResponseWriterDelegator struct {
-	*responseWriterDelegator
-}
-
-func (f *fancyResponseWriterDelegator) CloseNotify() <-chan bool {
-	return f.ResponseWriter.(http.CloseNotifier).CloseNotify()
-}
-
-func (f *fancyResponseWriterDelegator) Flush() {
-	f.ResponseWriter.(http.Flusher).Flush()
-}
-
-func (f *fancyResponseWriterDelegator) Hijack() (net.Conn, *bufio.ReadWriter, error) {
-	return f.ResponseWriter.(http.Hijacker).Hijack()
-}
-
-func (f *fancyResponseWriterDelegator) ReadFrom(r io.Reader) (int64, error) {
-	if !f.wroteHeader {
-		f.WriteHeader(http.StatusOK)
-	}
-	n, err := f.ResponseWriter.(io.ReaderFrom).ReadFrom(r)
-	f.written += n
-	return n, err
-}
-
-func sanitizeMethod(m string) string {
-	switch m {
-	case "GET", "get":
-		return "get"
-	case "PUT", "put":
-		return "put"
-	case "HEAD", "head":
-		return "head"
-	case "POST", "post":
-		return "post"
-	case "DELETE", "delete":
-		return "delete"
-	case "CONNECT", "connect":
-		return "connect"
-	case "OPTIONS", "options":
-		return "options"
-	case "NOTIFY", "notify":
-		return "notify"
-	default:
-		return strings.ToLower(m)
-	}
-}
-
-func sanitizeCode(s int) string {
-	switch s {
-	case 100:
-		return "100"
-	case 101:
-		return "101"
-
-	case 200:
-		return "200"
-	case 201:
-		return "201"
-	case 202:
-		return "202"
-	case 203:
-		return "203"
-	case 204:
-		return "204"
-	case 205:
-		return "205"
-	case 206:
-		return "206"
-
-	case 300:
-		return "300"
-	case 301:
-		return "301"
-	case 302:
-		return "302"
-	case 304:
-		return "304"
-	case 305:
-		return "305"
-	case 307:
-		return "307"
-
-	case 400:
-		return "400"
-	case 401:
-		return "401"
-	case 402:
-		return "402"
-	case 403:
-		return "403"
-	case 404:
-		return "404"
-	case 405:
-		return "405"
-	case 406:
-		return "406"
-	case 407:
-		return "407"
-	case 408:
-		return "408"
-	case 409:
-		return "409"
-	case 410:
-		return "410"
-	case 411:
-		return "411"
-	case 412:
-		return "412"
-	case 413:
-		return "413"
-	case 414:
-		return "414"
-	case 415:
-		return "415"
-	case 416:
-		return "416"
-	case 417:
-		return "417"
-	case 418:
-		return "418"
-
-	case 500:
-		return "500"
-	case 501:
-		return "501"
-	case 502:
-		return "502"
-	case 503:
-		return "503"
-	case 504:
-		return "504"
-	case 505:
-		return "505"
-
-	case 428:
-		return "428"
-	case 429:
-		return "429"
-	case 431:
-		return "431"
-	case 511:
-		return "511"
-
-	default:
-		return strconv.Itoa(s)
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/metric.go b/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/metric.go
deleted file mode 100644
index 86fd81c10..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/metric.go
+++ /dev/null
@@ -1,166 +0,0 @@
-// Copyright 2014 The Prometheus Authors
-// 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 prometheus
-
-import (
-	"strings"
-
-	dto "github.com/prometheus/client_model/go"
-)
-
-const separatorByte byte = 255
-
-// A Metric models a single sample value with its meta data being exported to
-// Prometheus. Implementers of Metric in this package inclued Gauge, Counter,
-// Untyped, and Summary. Users can implement their own Metric types, but that
-// should be rarely needed. See the example for SelfCollector, which is also an
-// example for a user-implemented Metric.
-type Metric interface {
-	// Desc returns the descriptor for the Metric. This method idempotently
-	// returns the same descriptor throughout the lifetime of the
-	// Metric. The returned descriptor is immutable by contract. A Metric
-	// unable to describe itself must return an invalid descriptor (created
-	// with NewInvalidDesc).
-	Desc() *Desc
-	// Write encodes the Metric into a "Metric" Protocol Buffer data
-	// transmission object.
-	//
-	// Implementers of custom Metric types must observe concurrency safety
-	// as reads of this metric may occur at any time, and any blocking
-	// occurs at the expense of total performance of rendering all
-	// registered metrics. Ideally Metric implementations should support
-	// concurrent readers.
-	//
-	// The Prometheus client library attempts to minimize memory allocations
-	// and will provide a pre-existing reset dto.Metric pointer. Prometheus
-	// may recycle the dto.Metric proto message, so Metric implementations
-	// should just populate the provided dto.Metric and then should not keep
-	// any reference to it.
-	//
-	// While populating dto.Metric, labels must be sorted lexicographically.
-	// (Implementers may find LabelPairSorter useful for that.)
-	Write(*dto.Metric) error
-}
-
-// Opts bundles the options for creating most Metric types. Each metric
-// implementation XXX has its own XXXOpts type, but in most cases, it is just be
-// an alias of this type (which might change when the requirement arises.)
-//
-// It is mandatory to set Name and Help to a non-empty string. All other fields
-// are optional and can safely be left at their zero value.
-type Opts struct {
-	// Namespace, Subsystem, and Name are components of the fully-qualified
-	// name of the Metric (created by joining these components with
-	// "_"). Only Name is mandatory, the others merely help structuring the
-	// name. Note that the fully-qualified name of the metric must be a
-	// valid Prometheus metric name.
-	Namespace string
-	Subsystem string
-	Name      string
-
-	// Help provides information about this metric. Mandatory!
-	//
-	// Metrics with the same fully-qualified name must have the same Help
-	// string.
-	Help string
-
-	// ConstLabels are used to attach fixed labels to this metric. Metrics
-	// with the same fully-qualified name must have the same label names in
-	// their ConstLabels.
-	//
-	// Note that in most cases, labels have a value that varies during the
-	// lifetime of a process. Those labels are usually managed with a metric
-	// vector collector (like CounterVec, GaugeVec, UntypedVec). ConstLabels
-	// serve only special purposes. One is for the special case where the
-	// value of a label does not change during the lifetime of a process,
-	// e.g. if the revision of the running binary is put into a
-	// label. Another, more advanced purpose is if more than one Collector
-	// needs to collect Metrics with the same fully-qualified name. In that
-	// case, those Metrics must differ in the values of their
-	// ConstLabels. See the Collector examples.
-	//
-	// If the value of a label never changes (not even between binaries),
-	// that label most likely should not be a label at all (but part of the
-	// metric name).
-	ConstLabels Labels
-}
-
-// BuildFQName joins the given three name components by "_". Empty name
-// components are ignored. If the name parameter itself is empty, an empty
-// string is returned, no matter what. Metric implementations included in this
-// library use this function internally to generate the fully-qualified metric
-// name from the name component in their Opts. Users of the library will only
-// need this function if they implement their own Metric or instantiate a Desc
-// (with NewDesc) directly.
-func BuildFQName(namespace, subsystem, name string) string {
-	if name == "" {
-		return ""
-	}
-	switch {
-	case namespace != "" && subsystem != "":
-		return strings.Join([]string{namespace, subsystem, name}, "_")
-	case namespace != "":
-		return strings.Join([]string{namespace, name}, "_")
-	case subsystem != "":
-		return strings.Join([]string{subsystem, name}, "_")
-	}
-	return name
-}
-
-// LabelPairSorter implements sort.Interface. It is used to sort a slice of
-// dto.LabelPair pointers. This is useful for implementing the Write method of
-// custom metrics.
-type LabelPairSorter []*dto.LabelPair
-
-func (s LabelPairSorter) Len() int {
-	return len(s)
-}
-
-func (s LabelPairSorter) Swap(i, j int) {
-	s[i], s[j] = s[j], s[i]
-}
-
-func (s LabelPairSorter) Less(i, j int) bool {
-	return s[i].GetName() < s[j].GetName()
-}
-
-type hashSorter []uint64
-
-func (s hashSorter) Len() int {
-	return len(s)
-}
-
-func (s hashSorter) Swap(i, j int) {
-	s[i], s[j] = s[j], s[i]
-}
-
-func (s hashSorter) Less(i, j int) bool {
-	return s[i] < s[j]
-}
-
-type invalidMetric struct {
-	desc *Desc
-	err  error
-}
-
-// NewInvalidMetric returns a metric whose Write method always returns the
-// provided error. It is useful if a Collector finds itself unable to collect
-// a metric and wishes to report an error to the registry.
-func NewInvalidMetric(desc *Desc, err error) Metric {
-	return &invalidMetric{desc, err}
-}
-
-func (m *invalidMetric) Desc() *Desc { return m.desc }
-
-func (m *invalidMetric) Write(*dto.Metric) error { return m.err }
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/process_collector.go b/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/process_collector.go
deleted file mode 100644
index d8cf0eda3..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/process_collector.go
+++ /dev/null
@@ -1,142 +0,0 @@
-// Copyright 2015 The Prometheus Authors
-// 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 prometheus
-
-import "github.com/prometheus/procfs"
-
-type processCollector struct {
-	pid             int
-	collectFn       func(chan<- Metric)
-	pidFn           func() (int, error)
-	cpuTotal        Counter
-	openFDs, maxFDs Gauge
-	vsize, rss      Gauge
-	startTime       Gauge
-}
-
-// NewProcessCollector returns a collector which exports the current state of
-// process metrics including cpu, memory and file descriptor usage as well as
-// the process start time for the given process id under the given namespace.
-func NewProcessCollector(pid int, namespace string) *processCollector {
-	return NewProcessCollectorPIDFn(
-		func() (int, error) { return pid, nil },
-		namespace,
-	)
-}
-
-// NewProcessCollectorPIDFn returns a collector which exports the current state
-// of process metrics including cpu, memory and file descriptor usage as well
-// as the process start time under the given namespace. The given pidFn is
-// called on each collect and is used to determine the process to export
-// metrics for.
-func NewProcessCollectorPIDFn(
-	pidFn func() (int, error),
-	namespace string,
-) *processCollector {
-	c := processCollector{
-		pidFn:     pidFn,
-		collectFn: func(chan<- Metric) {},
-
-		cpuTotal: NewCounter(CounterOpts{
-			Namespace: namespace,
-			Name:      "process_cpu_seconds_total",
-			Help:      "Total user and system CPU time spent in seconds.",
-		}),
-		openFDs: NewGauge(GaugeOpts{
-			Namespace: namespace,
-			Name:      "process_open_fds",
-			Help:      "Number of open file descriptors.",
-		}),
-		maxFDs: NewGauge(GaugeOpts{
-			Namespace: namespace,
-			Name:      "process_max_fds",
-			Help:      "Maximum number of open file descriptors.",
-		}),
-		vsize: NewGauge(GaugeOpts{
-			Namespace: namespace,
-			Name:      "process_virtual_memory_bytes",
-			Help:      "Virtual memory size in bytes.",
-		}),
-		rss: NewGauge(GaugeOpts{
-			Namespace: namespace,
-			Name:      "process_resident_memory_bytes",
-			Help:      "Resident memory size in bytes.",
-		}),
-		startTime: NewGauge(GaugeOpts{
-			Namespace: namespace,
-			Name:      "process_start_time_seconds",
-			Help:      "Start time of the process since unix epoch in seconds.",
-		}),
-	}
-
-	// Set up process metric collection if supported by the runtime.
-	if _, err := procfs.NewStat(); err == nil {
-		c.collectFn = c.processCollect
-	}
-
-	return &c
-}
-
-// Describe returns all descriptions of the collector.
-func (c *processCollector) Describe(ch chan<- *Desc) {
-	ch <- c.cpuTotal.Desc()
-	ch <- c.openFDs.Desc()
-	ch <- c.maxFDs.Desc()
-	ch <- c.vsize.Desc()
-	ch <- c.rss.Desc()
-	ch <- c.startTime.Desc()
-}
-
-// Collect returns the current state of all metrics of the collector.
-func (c *processCollector) Collect(ch chan<- Metric) {
-	c.collectFn(ch)
-}
-
-// TODO(ts): Bring back error reporting by reverting 7faf9e7 as soon as the
-// client allows users to configure the error behavior.
-func (c *processCollector) processCollect(ch chan<- Metric) {
-	pid, err := c.pidFn()
-	if err != nil {
-		return
-	}
-
-	p, err := procfs.NewProc(pid)
-	if err != nil {
-		return
-	}
-
-	if stat, err := p.NewStat(); err == nil {
-		c.cpuTotal.Set(stat.CPUTime())
-		ch <- c.cpuTotal
-		c.vsize.Set(float64(stat.VirtualMemory()))
-		ch <- c.vsize
-		c.rss.Set(float64(stat.ResidentMemory()))
-		ch <- c.rss
-
-		if startTime, err := stat.StartTime(); err == nil {
-			c.startTime.Set(startTime)
-			ch <- c.startTime
-		}
-	}
-
-	if fds, err := p.FileDescriptorsLen(); err == nil {
-		c.openFDs.Set(float64(fds))
-		ch <- c.openFDs
-	}
-
-	if limits, err := p.NewLimits(); err == nil {
-		c.maxFDs.Set(float64(limits.OpenFiles))
-		ch <- c.maxFDs
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/push.go b/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/push.go
deleted file mode 100644
index 1c33848a3..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/push.go
+++ /dev/null
@@ -1,65 +0,0 @@
-// Copyright 2015 The Prometheus Authors
-// 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.
-
-// Copyright (c) 2013, The Prometheus 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 prometheus
-
-// Push triggers a metric collection by the default registry and pushes all
-// collected metrics to the Pushgateway specified by addr. See the Pushgateway
-// documentation for detailed implications of the job and instance
-// parameter. instance can be left empty. You can use just host:port or ip:port
-// as url, in which case 'http://' is added automatically. You can also include
-// the schema in the URL. However, do not include the '/metrics/jobs/...' part.
-//
-// Note that all previously pushed metrics with the same job and instance will
-// be replaced with the metrics pushed by this call. (It uses HTTP method 'PUT'
-// to push to the Pushgateway.)
-func Push(job, instance, url string) error {
-	return defRegistry.Push(job, instance, url, "PUT")
-}
-
-// PushAdd works like Push, but only previously pushed metrics with the same
-// name (and the same job and instance) will be replaced. (It uses HTTP method
-// 'POST' to push to the Pushgateway.)
-func PushAdd(job, instance, url string) error {
-	return defRegistry.Push(job, instance, url, "POST")
-}
-
-// PushCollectors works like Push, but it does not collect from the default
-// registry. Instead, it collects from the provided collectors. It is a
-// convenient way to push only a few metrics.
-func PushCollectors(job, instance, url string, collectors ...Collector) error {
-	return pushCollectors(job, instance, url, "PUT", collectors...)
-}
-
-// PushAddCollectors works like PushAdd, but it does not collect from the
-// default registry. Instead, it collects from the provided collectors. It is a
-// convenient way to push only a few metrics.
-func PushAddCollectors(job, instance, url string, collectors ...Collector) error {
-	return pushCollectors(job, instance, url, "POST", collectors...)
-}
-
-func pushCollectors(job, instance, url, method string, collectors ...Collector) error {
-	r := newRegistry()
-	for _, collector := range collectors {
-		if _, err := r.Register(collector); err != nil {
-			return err
-		}
-	}
-	return r.Push(job, instance, url, method)
-}
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/registry.go b/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/registry.go
deleted file mode 100644
index 5970aaeeb..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/registry.go
+++ /dev/null
@@ -1,726 +0,0 @@
-// Copyright 2014 The Prometheus Authors
-// 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.
-
-// Copyright (c) 2013, The Prometheus 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 prometheus
-
-import (
-	"bytes"
-	"compress/gzip"
-	"errors"
-	"fmt"
-	"hash/fnv"
-	"io"
-	"net/http"
-	"net/url"
-	"os"
-	"sort"
-	"strings"
-	"sync"
-
-	"github.com/golang/protobuf/proto"
-	"github.com/prometheus/common/expfmt"
-
-	dto "github.com/prometheus/client_model/go"
-)
-
-var (
-	defRegistry   = newDefaultRegistry()
-	errAlreadyReg = errors.New("duplicate metrics collector registration attempted")
-)
-
-// Constants relevant to the HTTP interface.
-const (
-	// APIVersion is the version of the format of the exported data.  This
-	// will match this library's version, which subscribes to the Semantic
-	// Versioning scheme.
-	APIVersion = "0.0.4"
-
-	// DelimitedTelemetryContentType is the content type set on telemetry
-	// data responses in delimited protobuf format.
-	DelimitedTelemetryContentType = `application/vnd.google.protobuf; proto=io.prometheus.client.MetricFamily; encoding=delimited`
-	// TextTelemetryContentType is the content type set on telemetry data
-	// responses in text format.
-	TextTelemetryContentType = `text/plain; version=` + APIVersion
-	// ProtoTextTelemetryContentType is the content type set on telemetry
-	// data responses in protobuf text format.  (Only used for debugging.)
-	ProtoTextTelemetryContentType = `application/vnd.google.protobuf; proto=io.prometheus.client.MetricFamily; encoding=text`
-	// ProtoCompactTextTelemetryContentType is the content type set on
-	// telemetry data responses in protobuf compact text format.  (Only used
-	// for debugging.)
-	ProtoCompactTextTelemetryContentType = `application/vnd.google.protobuf; proto=io.prometheus.client.MetricFamily; encoding=compact-text`
-
-	// Constants for object pools.
-	numBufs           = 4
-	numMetricFamilies = 1000
-	numMetrics        = 10000
-
-	// Capacity for the channel to collect metrics and descriptors.
-	capMetricChan = 1000
-	capDescChan   = 10
-
-	contentTypeHeader     = "Content-Type"
-	contentLengthHeader   = "Content-Length"
-	contentEncodingHeader = "Content-Encoding"
-
-	acceptEncodingHeader = "Accept-Encoding"
-	acceptHeader         = "Accept"
-)
-
-// Handler returns the HTTP handler for the global Prometheus registry. It is
-// already instrumented with InstrumentHandler (using "prometheus" as handler
-// name). Usually the handler is used to handle the "/metrics" endpoint.
-func Handler() http.Handler {
-	return InstrumentHandler("prometheus", defRegistry)
-}
-
-// UninstrumentedHandler works in the same way as Handler, but the returned HTTP
-// handler is not instrumented. This is useful if no instrumentation is desired
-// (for whatever reason) or if the instrumentation has to happen with a
-// different handler name (or with a different instrumentation approach
-// altogether). See the InstrumentHandler example.
-func UninstrumentedHandler() http.Handler {
-	return defRegistry
-}
-
-// Register registers a new Collector to be included in metrics collection. It
-// returns an error if the descriptors provided by the Collector are invalid or
-// if they - in combination with descriptors of already registered Collectors -
-// do not fulfill the consistency and uniqueness criteria described in the Desc
-// documentation.
-//
-// Do not register the same Collector multiple times concurrently. (Registering
-// the same Collector twice would result in an error anyway, but on top of that,
-// it is not safe to do so concurrently.)
-func Register(m Collector) error {
-	_, err := defRegistry.Register(m)
-	return err
-}
-
-// MustRegister works like Register but panics where Register would have
-// returned an error.
-func MustRegister(m Collector) {
-	err := Register(m)
-	if err != nil {
-		panic(err)
-	}
-}
-
-// RegisterOrGet works like Register but does not return an error if a Collector
-// is registered that equals a previously registered Collector. (Two Collectors
-// are considered equal if their Describe method yields the same set of
-// descriptors.) Instead, the previously registered Collector is returned (which
-// is helpful if the new and previously registered Collectors are equal but not
-// identical, i.e. not pointers to the same object).
-//
-// As for Register, it is still not safe to call RegisterOrGet with the same
-// Collector multiple times concurrently.
-func RegisterOrGet(m Collector) (Collector, error) {
-	return defRegistry.RegisterOrGet(m)
-}
-
-// MustRegisterOrGet works like Register but panics where RegisterOrGet would
-// have returned an error.
-func MustRegisterOrGet(m Collector) Collector {
-	existing, err := RegisterOrGet(m)
-	if err != nil {
-		panic(err)
-	}
-	return existing
-}
-
-// Unregister unregisters the Collector that equals the Collector passed in as
-// an argument. (Two Collectors are considered equal if their Describe method
-// yields the same set of descriptors.) The function returns whether a Collector
-// was unregistered.
-func Unregister(c Collector) bool {
-	return defRegistry.Unregister(c)
-}
-
-// SetMetricFamilyInjectionHook sets a function that is called whenever metrics
-// are collected. The hook function must be set before metrics collection begins
-// (i.e. call SetMetricFamilyInjectionHook before setting the HTTP handler.) The
-// MetricFamily protobufs returned by the hook function are merged with the
-// metrics collected in the usual way.
-//
-// This is a way to directly inject MetricFamily protobufs managed and owned by
-// the caller. The caller has full responsibility. As no registration of the
-// injected metrics has happened, there is no descriptor to check against, and
-// there are no registration-time checks. If collect-time checks are disabled
-// (see function EnableCollectChecks), no sanity checks are performed on the
-// returned protobufs at all. If collect-checks are enabled, type and uniqueness
-// checks are performed, but no further consistency checks (which would require
-// knowledge of a metric descriptor).
-//
-// Sorting concerns: The caller is responsible for sorting the label pairs in
-// each metric. However, the order of metrics will be sorted by the registry as
-// it is required anyway after merging with the metric families collected
-// conventionally.
-//
-// The function must be callable at any time and concurrently.
-func SetMetricFamilyInjectionHook(hook func() []*dto.MetricFamily) {
-	defRegistry.metricFamilyInjectionHook = hook
-}
-
-// PanicOnCollectError sets the behavior whether a panic is caused upon an error
-// while metrics are collected and served to the HTTP endpoint. By default, an
-// internal server error (status code 500) is served with an error message.
-func PanicOnCollectError(b bool) {
-	defRegistry.panicOnCollectError = b
-}
-
-// EnableCollectChecks enables (or disables) additional consistency checks
-// during metrics collection. These additional checks are not enabled by default
-// because they inflict a performance penalty and the errors they check for can
-// only happen if the used Metric and Collector types have internal programming
-// errors. It can be helpful to enable these checks while working with custom
-// Collectors or Metrics whose correctness is not well established yet.
-func EnableCollectChecks(b bool) {
-	defRegistry.collectChecksEnabled = b
-}
-
-// encoder is a function that writes a dto.MetricFamily to an io.Writer in a
-// certain encoding. It returns the number of bytes written and any error
-// encountered.  Note that pbutil.WriteDelimited and pbutil.MetricFamilyToText
-// are encoders.
-type encoder func(io.Writer, *dto.MetricFamily) (int, error)
-
-type registry struct {
-	mtx                       sync.RWMutex
-	collectorsByID            map[uint64]Collector // ID is a hash of the descIDs.
-	descIDs                   map[uint64]struct{}
-	dimHashesByName           map[string]uint64
-	bufPool                   chan *bytes.Buffer
-	metricFamilyPool          chan *dto.MetricFamily
-	metricPool                chan *dto.Metric
-	metricFamilyInjectionHook func() []*dto.MetricFamily
-
-	panicOnCollectError, collectChecksEnabled bool
-}
-
-func (r *registry) Register(c Collector) (Collector, error) {
-	descChan := make(chan *Desc, capDescChan)
-	go func() {
-		c.Describe(descChan)
-		close(descChan)
-	}()
-
-	newDescIDs := map[uint64]struct{}{}
-	newDimHashesByName := map[string]uint64{}
-	var collectorID uint64 // Just a sum of all desc IDs.
-	var duplicateDescErr error
-
-	r.mtx.Lock()
-	defer r.mtx.Unlock()
-	// Coduct various tests...
-	for desc := range descChan {
-
-		// Is the descriptor valid at all?
-		if desc.err != nil {
-			return c, fmt.Errorf("descriptor %s is invalid: %s", desc, desc.err)
-		}
-
-		// Is the descID unique?
-		// (In other words: Is the fqName + constLabel combination unique?)
-		if _, exists := r.descIDs[desc.id]; exists {
-			duplicateDescErr = fmt.Errorf("descriptor %s already exists with the same fully-qualified name and const label values", desc)
-		}
-		// If it is not a duplicate desc in this collector, add it to
-		// the collectorID.  (We allow duplicate descs within the same
-		// collector, but their existence must be a no-op.)
-		if _, exists := newDescIDs[desc.id]; !exists {
-			newDescIDs[desc.id] = struct{}{}
-			collectorID += desc.id
-		}
-
-		// Are all the label names and the help string consistent with
-		// previous descriptors of the same name?
-		// First check existing descriptors...
-		if dimHash, exists := r.dimHashesByName[desc.fqName]; exists {
-			if dimHash != desc.dimHash {
-				return nil, fmt.Errorf("a previously registered descriptor with the same fully-qualified name as %s has different label names or a different help string", desc)
-			}
-		} else {
-			// ...then check the new descriptors already seen.
-			if dimHash, exists := newDimHashesByName[desc.fqName]; exists {
-				if dimHash != desc.dimHash {
-					return nil, fmt.Errorf("descriptors reported by collector have inconsistent label names or help strings for the same fully-qualified name, offender is %s", desc)
-				}
-			} else {
-				newDimHashesByName[desc.fqName] = desc.dimHash
-			}
-		}
-	}
-	// Did anything happen at all?
-	if len(newDescIDs) == 0 {
-		return nil, errors.New("collector has no descriptors")
-	}
-	if existing, exists := r.collectorsByID[collectorID]; exists {
-		return existing, errAlreadyReg
-	}
-	// If the collectorID is new, but at least one of the descs existed
-	// before, we are in trouble.
-	if duplicateDescErr != nil {
-		return nil, duplicateDescErr
-	}
-
-	// Only after all tests have passed, actually register.
-	r.collectorsByID[collectorID] = c
-	for hash := range newDescIDs {
-		r.descIDs[hash] = struct{}{}
-	}
-	for name, dimHash := range newDimHashesByName {
-		r.dimHashesByName[name] = dimHash
-	}
-	return c, nil
-}
-
-func (r *registry) RegisterOrGet(m Collector) (Collector, error) {
-	existing, err := r.Register(m)
-	if err != nil && err != errAlreadyReg {
-		return nil, err
-	}
-	return existing, nil
-}
-
-func (r *registry) Unregister(c Collector) bool {
-	descChan := make(chan *Desc, capDescChan)
-	go func() {
-		c.Describe(descChan)
-		close(descChan)
-	}()
-
-	descIDs := map[uint64]struct{}{}
-	var collectorID uint64 // Just a sum of the desc IDs.
-	for desc := range descChan {
-		if _, exists := descIDs[desc.id]; !exists {
-			collectorID += desc.id
-			descIDs[desc.id] = struct{}{}
-		}
-	}
-
-	r.mtx.RLock()
-	if _, exists := r.collectorsByID[collectorID]; !exists {
-		r.mtx.RUnlock()
-		return false
-	}
-	r.mtx.RUnlock()
-
-	r.mtx.Lock()
-	defer r.mtx.Unlock()
-
-	delete(r.collectorsByID, collectorID)
-	for id := range descIDs {
-		delete(r.descIDs, id)
-	}
-	// dimHashesByName is left untouched as those must be consistent
-	// throughout the lifetime of a program.
-	return true
-}
-
-func (r *registry) Push(job, instance, pushURL, method string) error {
-	if !strings.Contains(pushURL, "://") {
-		pushURL = "http://" + pushURL
-	}
-	pushURL = fmt.Sprintf("%s/metrics/jobs/%s", pushURL, url.QueryEscape(job))
-	if instance != "" {
-		pushURL += "/instances/" + url.QueryEscape(instance)
-	}
-	buf := r.getBuf()
-	defer r.giveBuf(buf)
-	if err := r.writePB(expfmt.NewEncoder(buf, expfmt.FmtProtoDelim)); err != nil {
-		if r.panicOnCollectError {
-			panic(err)
-		}
-		return err
-	}
-	req, err := http.NewRequest(method, pushURL, buf)
-	if err != nil {
-		return err
-	}
-	req.Header.Set(contentTypeHeader, DelimitedTelemetryContentType)
-	resp, err := http.DefaultClient.Do(req)
-	if err != nil {
-		return err
-	}
-	defer resp.Body.Close()
-	if resp.StatusCode != 202 {
-		return fmt.Errorf("unexpected status code %d while pushing to %s", resp.StatusCode, pushURL)
-	}
-	return nil
-}
-
-func (r *registry) ServeHTTP(w http.ResponseWriter, req *http.Request) {
-	contentType := expfmt.Negotiate(req.Header)
-	buf := r.getBuf()
-	defer r.giveBuf(buf)
-	writer, encoding := decorateWriter(req, buf)
-	if err := r.writePB(expfmt.NewEncoder(writer, contentType)); err != nil {
-		if r.panicOnCollectError {
-			panic(err)
-		}
-		http.Error(w, "An error has occurred:\n\n"+err.Error(), http.StatusInternalServerError)
-		return
-	}
-	if closer, ok := writer.(io.Closer); ok {
-		closer.Close()
-	}
-	header := w.Header()
-	header.Set(contentTypeHeader, string(contentType))
-	header.Set(contentLengthHeader, fmt.Sprint(buf.Len()))
-	if encoding != "" {
-		header.Set(contentEncodingHeader, encoding)
-	}
-	w.Write(buf.Bytes())
-}
-
-func (r *registry) writePB(encoder expfmt.Encoder) error {
-	var metricHashes map[uint64]struct{}
-	if r.collectChecksEnabled {
-		metricHashes = make(map[uint64]struct{})
-	}
-	metricChan := make(chan Metric, capMetricChan)
-	wg := sync.WaitGroup{}
-
-	r.mtx.RLock()
-	metricFamiliesByName := make(map[string]*dto.MetricFamily, len(r.dimHashesByName))
-
-	// Scatter.
-	// (Collectors could be complex and slow, so we call them all at once.)
-	wg.Add(len(r.collectorsByID))
-	go func() {
-		wg.Wait()
-		close(metricChan)
-	}()
-	for _, collector := range r.collectorsByID {
-		go func(collector Collector) {
-			defer wg.Done()
-			collector.Collect(metricChan)
-		}(collector)
-	}
-	r.mtx.RUnlock()
-
-	// Drain metricChan in case of premature return.
-	defer func() {
-		for _ = range metricChan {
-		}
-	}()
-
-	// Gather.
-	for metric := range metricChan {
-		// This could be done concurrently, too, but it required locking
-		// of metricFamiliesByName (and of metricHashes if checks are
-		// enabled). Most likely not worth it.
-		desc := metric.Desc()
-		metricFamily, ok := metricFamiliesByName[desc.fqName]
-		if !ok {
-			metricFamily = r.getMetricFamily()
-			defer r.giveMetricFamily(metricFamily)
-			metricFamily.Name = proto.String(desc.fqName)
-			metricFamily.Help = proto.String(desc.help)
-			metricFamiliesByName[desc.fqName] = metricFamily
-		}
-		dtoMetric := r.getMetric()
-		defer r.giveMetric(dtoMetric)
-		if err := metric.Write(dtoMetric); err != nil {
-			// TODO: Consider different means of error reporting so
-			// that a single erroneous metric could be skipped
-			// instead of blowing up the whole collection.
-			return fmt.Errorf("error collecting metric %v: %s", desc, err)
-		}
-		switch {
-		case metricFamily.Type != nil:
-			// Type already set. We are good.
-		case dtoMetric.Gauge != nil:
-			metricFamily.Type = dto.MetricType_GAUGE.Enum()
-		case dtoMetric.Counter != nil:
-			metricFamily.Type = dto.MetricType_COUNTER.Enum()
-		case dtoMetric.Summary != nil:
-			metricFamily.Type = dto.MetricType_SUMMARY.Enum()
-		case dtoMetric.Untyped != nil:
-			metricFamily.Type = dto.MetricType_UNTYPED.Enum()
-		case dtoMetric.Histogram != nil:
-			metricFamily.Type = dto.MetricType_HISTOGRAM.Enum()
-		default:
-			return fmt.Errorf("empty metric collected: %s", dtoMetric)
-		}
-		if r.collectChecksEnabled {
-			if err := r.checkConsistency(metricFamily, dtoMetric, desc, metricHashes); err != nil {
-				return err
-			}
-		}
-		metricFamily.Metric = append(metricFamily.Metric, dtoMetric)
-	}
-
-	if r.metricFamilyInjectionHook != nil {
-		for _, mf := range r.metricFamilyInjectionHook() {
-			existingMF, exists := metricFamiliesByName[mf.GetName()]
-			if !exists {
-				metricFamiliesByName[mf.GetName()] = mf
-				if r.collectChecksEnabled {
-					for _, m := range mf.Metric {
-						if err := r.checkConsistency(mf, m, nil, metricHashes); err != nil {
-							return err
-						}
-					}
-				}
-				continue
-			}
-			for _, m := range mf.Metric {
-				if r.collectChecksEnabled {
-					if err := r.checkConsistency(existingMF, m, nil, metricHashes); err != nil {
-						return err
-					}
-				}
-				existingMF.Metric = append(existingMF.Metric, m)
-			}
-		}
-	}
-
-	// Now that MetricFamilies are all set, sort their Metrics
-	// lexicographically by their label values.
-	for _, mf := range metricFamiliesByName {
-		sort.Sort(metricSorter(mf.Metric))
-	}
-
-	// Write out MetricFamilies sorted by their name.
-	names := make([]string, 0, len(metricFamiliesByName))
-	for name := range metricFamiliesByName {
-		names = append(names, name)
-	}
-	sort.Strings(names)
-
-	for _, name := range names {
-		if err := encoder.Encode(metricFamiliesByName[name]); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func (r *registry) checkConsistency(metricFamily *dto.MetricFamily, dtoMetric *dto.Metric, desc *Desc, metricHashes map[uint64]struct{}) error {
-
-	// Type consistency with metric family.
-	if metricFamily.GetType() == dto.MetricType_GAUGE && dtoMetric.Gauge == nil ||
-		metricFamily.GetType() == dto.MetricType_COUNTER && dtoMetric.Counter == nil ||
-		metricFamily.GetType() == dto.MetricType_SUMMARY && dtoMetric.Summary == nil ||
-		metricFamily.GetType() == dto.MetricType_HISTOGRAM && dtoMetric.Histogram == nil ||
-		metricFamily.GetType() == dto.MetricType_UNTYPED && dtoMetric.Untyped == nil {
-		return fmt.Errorf(
-			"collected metric %s %s is not a %s",
-			metricFamily.GetName(), dtoMetric, metricFamily.GetType(),
-		)
-	}
-
-	// Is the metric unique (i.e. no other metric with the same name and the same label values)?
-	h := fnv.New64a()
-	var buf bytes.Buffer
-	buf.WriteString(metricFamily.GetName())
-	buf.WriteByte(separatorByte)
-	h.Write(buf.Bytes())
-	// Make sure label pairs are sorted. We depend on it for the consistency
-	// check. Label pairs must be sorted by contract. But the point of this
-	// method is to check for contract violations. So we better do the sort
-	// now.
-	sort.Sort(LabelPairSorter(dtoMetric.Label))
-	for _, lp := range dtoMetric.Label {
-		buf.Reset()
-		buf.WriteString(lp.GetValue())
-		buf.WriteByte(separatorByte)
-		h.Write(buf.Bytes())
-	}
-	metricHash := h.Sum64()
-	if _, exists := metricHashes[metricHash]; exists {
-		return fmt.Errorf(
-			"collected metric %s %s was collected before with the same name and label values",
-			metricFamily.GetName(), dtoMetric,
-		)
-	}
-	metricHashes[metricHash] = struct{}{}
-
-	if desc == nil {
-		return nil // Nothing left to check if we have no desc.
-	}
-
-	// Desc consistency with metric family.
-	if metricFamily.GetName() != desc.fqName {
-		return fmt.Errorf(
-			"collected metric %s %s has name %q but should have %q",
-			metricFamily.GetName(), dtoMetric, metricFamily.GetName(), desc.fqName,
-		)
-	}
-	if metricFamily.GetHelp() != desc.help {
-		return fmt.Errorf(
-			"collected metric %s %s has help %q but should have %q",
-			metricFamily.GetName(), dtoMetric, metricFamily.GetHelp(), desc.help,
-		)
-	}
-
-	// Is the desc consistent with the content of the metric?
-	lpsFromDesc := make([]*dto.LabelPair, 0, len(dtoMetric.Label))
-	lpsFromDesc = append(lpsFromDesc, desc.constLabelPairs...)
-	for _, l := range desc.variableLabels {
-		lpsFromDesc = append(lpsFromDesc, &dto.LabelPair{
-			Name: proto.String(l),
-		})
-	}
-	if len(lpsFromDesc) != len(dtoMetric.Label) {
-		return fmt.Errorf(
-			"labels in collected metric %s %s are inconsistent with descriptor %s",
-			metricFamily.GetName(), dtoMetric, desc,
-		)
-	}
-	sort.Sort(LabelPairSorter(lpsFromDesc))
-	for i, lpFromDesc := range lpsFromDesc {
-		lpFromMetric := dtoMetric.Label[i]
-		if lpFromDesc.GetName() != lpFromMetric.GetName() ||
-			lpFromDesc.Value != nil && lpFromDesc.GetValue() != lpFromMetric.GetValue() {
-			return fmt.Errorf(
-				"labels in collected metric %s %s are inconsistent with descriptor %s",
-				metricFamily.GetName(), dtoMetric, desc,
-			)
-		}
-	}
-
-	r.mtx.RLock() // Remaining checks need the read lock.
-	defer r.mtx.RUnlock()
-
-	// Is the desc registered?
-	if _, exist := r.descIDs[desc.id]; !exist {
-		return fmt.Errorf(
-			"collected metric %s %s with unregistered descriptor %s",
-			metricFamily.GetName(), dtoMetric, desc,
-		)
-	}
-
-	return nil
-}
-
-func (r *registry) getBuf() *bytes.Buffer {
-	select {
-	case buf := <-r.bufPool:
-		return buf
-	default:
-		return &bytes.Buffer{}
-	}
-}
-
-func (r *registry) giveBuf(buf *bytes.Buffer) {
-	buf.Reset()
-	select {
-	case r.bufPool <- buf:
-	default:
-	}
-}
-
-func (r *registry) getMetricFamily() *dto.MetricFamily {
-	select {
-	case mf := <-r.metricFamilyPool:
-		return mf
-	default:
-		return &dto.MetricFamily{}
-	}
-}
-
-func (r *registry) giveMetricFamily(mf *dto.MetricFamily) {
-	mf.Reset()
-	select {
-	case r.metricFamilyPool <- mf:
-	default:
-	}
-}
-
-func (r *registry) getMetric() *dto.Metric {
-	select {
-	case m := <-r.metricPool:
-		return m
-	default:
-		return &dto.Metric{}
-	}
-}
-
-func (r *registry) giveMetric(m *dto.Metric) {
-	m.Reset()
-	select {
-	case r.metricPool <- m:
-	default:
-	}
-}
-
-func newRegistry() *registry {
-	return &registry{
-		collectorsByID:   map[uint64]Collector{},
-		descIDs:          map[uint64]struct{}{},
-		dimHashesByName:  map[string]uint64{},
-		bufPool:          make(chan *bytes.Buffer, numBufs),
-		metricFamilyPool: make(chan *dto.MetricFamily, numMetricFamilies),
-		metricPool:       make(chan *dto.Metric, numMetrics),
-	}
-}
-
-func newDefaultRegistry() *registry {
-	r := newRegistry()
-	r.Register(NewProcessCollector(os.Getpid(), ""))
-	r.Register(NewGoCollector())
-	return r
-}
-
-// decorateWriter wraps a writer to handle gzip compression if requested.  It
-// returns the decorated writer and the appropriate "Content-Encoding" header
-// (which is empty if no compression is enabled).
-func decorateWriter(request *http.Request, writer io.Writer) (io.Writer, string) {
-	header := request.Header.Get(acceptEncodingHeader)
-	parts := strings.Split(header, ",")
-	for _, part := range parts {
-		part := strings.TrimSpace(part)
-		if part == "gzip" || strings.HasPrefix(part, "gzip;") {
-			return gzip.NewWriter(writer), "gzip"
-		}
-	}
-	return writer, ""
-}
-
-type metricSorter []*dto.Metric
-
-func (s metricSorter) Len() int {
-	return len(s)
-}
-
-func (s metricSorter) Swap(i, j int) {
-	s[i], s[j] = s[j], s[i]
-}
-
-func (s metricSorter) Less(i, j int) bool {
-	if len(s[i].Label) != len(s[j].Label) {
-		// This should not happen. The metrics are
-		// inconsistent. However, we have to deal with the fact, as
-		// people might use custom collectors or metric family injection
-		// to create inconsistent metrics. So let's simply compare the
-		// number of labels in this case. That will still yield
-		// reproducible sorting.
-		return len(s[i].Label) < len(s[j].Label)
-	}
-	for n, lp := range s[i].Label {
-		vi := lp.GetValue()
-		vj := s[j].Label[n].GetValue()
-		if vi != vj {
-			return vi < vj
-		}
-	}
-	return true
-}
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/summary.go b/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/summary.go
deleted file mode 100644
index fe81e004f..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/summary.go
+++ /dev/null
@@ -1,540 +0,0 @@
-// Copyright 2014 The Prometheus Authors
-// 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 prometheus
-
-import (
-	"fmt"
-	"hash/fnv"
-	"math"
-	"sort"
-	"sync"
-	"time"
-
-	"github.com/beorn7/perks/quantile"
-	"github.com/golang/protobuf/proto"
-
-	dto "github.com/prometheus/client_model/go"
-)
-
-// quantileLabel is used for the label that defines the quantile in a
-// summary.
-const quantileLabel = "quantile"
-
-// A Summary captures individual observations from an event or sample stream and
-// summarizes them in a manner similar to traditional summary statistics: 1. sum
-// of observations, 2. observation count, 3. rank estimations.
-//
-// A typical use-case is the observation of request latencies. By default, a
-// Summary provides the median, the 90th and the 99th percentile of the latency
-// as rank estimations.
-//
-// Note that the rank estimations cannot be aggregated in a meaningful way with
-// the Prometheus query language (i.e. you cannot average or add them). If you
-// need aggregatable quantiles (e.g. you want the 99th percentile latency of all
-// queries served across all instances of a service), consider the Histogram
-// metric type. See the Prometheus documentation for more details.
-//
-// To create Summary instances, use NewSummary.
-type Summary interface {
-	Metric
-	Collector
-
-	// Observe adds a single observation to the summary.
-	Observe(float64)
-}
-
-var (
-	// DefObjectives are the default Summary quantile values.
-	DefObjectives = map[float64]float64{0.5: 0.05, 0.9: 0.01, 0.99: 0.001}
-
-	errQuantileLabelNotAllowed = fmt.Errorf(
-		"%q is not allowed as label name in summaries", quantileLabel,
-	)
-)
-
-// Default values for SummaryOpts.
-const (
-	// DefMaxAge is the default duration for which observations stay
-	// relevant.
-	DefMaxAge time.Duration = 10 * time.Minute
-	// DefAgeBuckets is the default number of buckets used to calculate the
-	// age of observations.
-	DefAgeBuckets = 5
-	// DefBufCap is the standard buffer size for collecting Summary observations.
-	DefBufCap = 500
-)
-
-// SummaryOpts bundles the options for creating a Summary metric. It is
-// mandatory to set Name and Help to a non-empty string. All other fields are
-// optional and can safely be left at their zero value.
-type SummaryOpts struct {
-	// Namespace, Subsystem, and Name are components of the fully-qualified
-	// name of the Summary (created by joining these components with
-	// "_"). Only Name is mandatory, the others merely help structuring the
-	// name. Note that the fully-qualified name of the Summary must be a
-	// valid Prometheus metric name.
-	Namespace string
-	Subsystem string
-	Name      string
-
-	// Help provides information about this Summary. Mandatory!
-	//
-	// Metrics with the same fully-qualified name must have the same Help
-	// string.
-	Help string
-
-	// ConstLabels are used to attach fixed labels to this
-	// Summary. Summaries with the same fully-qualified name must have the
-	// same label names in their ConstLabels.
-	//
-	// Note that in most cases, labels have a value that varies during the
-	// lifetime of a process. Those labels are usually managed with a
-	// SummaryVec. ConstLabels serve only special purposes. One is for the
-	// special case where the value of a label does not change during the
-	// lifetime of a process, e.g. if the revision of the running binary is
-	// put into a label. Another, more advanced purpose is if more than one
-	// Collector needs to collect Summaries with the same fully-qualified
-	// name. In that case, those Summaries must differ in the values of
-	// their ConstLabels. See the Collector examples.
-	//
-	// If the value of a label never changes (not even between binaries),
-	// that label most likely should not be a label at all (but part of the
-	// metric name).
-	ConstLabels Labels
-
-	// Objectives defines the quantile rank estimates with their respective
-	// absolute error. If Objectives[q] = e, then the value reported
-	// for q will be the φ-quantile value for some φ between q-e and q+e.
-	// The default value is DefObjectives.
-	Objectives map[float64]float64
-
-	// MaxAge defines the duration for which an observation stays relevant
-	// for the summary. Must be positive. The default value is DefMaxAge.
-	MaxAge time.Duration
-
-	// AgeBuckets is the number of buckets used to exclude observations that
-	// are older than MaxAge from the summary. A higher number has a
-	// resource penalty, so only increase it if the higher resolution is
-	// really required. For very high observation rates, you might want to
-	// reduce the number of age buckets. With only one age bucket, you will
-	// effectively see a complete reset of the summary each time MaxAge has
-	// passed. The default value is DefAgeBuckets.
-	AgeBuckets uint32
-
-	// BufCap defines the default sample stream buffer size.  The default
-	// value of DefBufCap should suffice for most uses. If there is a need
-	// to increase the value, a multiple of 500 is recommended (because that
-	// is the internal buffer size of the underlying package
-	// "github.com/bmizerany/perks/quantile").
-	BufCap uint32
-}
-
-// TODO: Great fuck-up with the sliding-window decay algorithm... The Merge
-// method of perk/quantile is actually not working as advertised - and it might
-// be unfixable, as the underlying algorithm is apparently not capable of
-// merging summaries in the first place. To avoid using Merge, we are currently
-// adding observations to _each_ age bucket, i.e. the effort to add a sample is
-// essentially multiplied by the number of age buckets. When rotating age
-// buckets, we empty the previous head stream. On scrape time, we simply take
-// the quantiles from the head stream (no merging required). Result: More effort
-// on observation time, less effort on scrape time, which is exactly the
-// opposite of what we try to accomplish, but at least the results are correct.
-//
-// The quite elegant previous contraption to merge the age buckets efficiently
-// on scrape time (see code up commit 6b9530d72ea715f0ba612c0120e6e09fbf1d49d0)
-// can't be used anymore.
-
-// NewSummary creates a new Summary based on the provided SummaryOpts.
-func NewSummary(opts SummaryOpts) Summary {
-	return newSummary(
-		NewDesc(
-			BuildFQName(opts.Namespace, opts.Subsystem, opts.Name),
-			opts.Help,
-			nil,
-			opts.ConstLabels,
-		),
-		opts,
-	)
-}
-
-func newSummary(desc *Desc, opts SummaryOpts, labelValues ...string) Summary {
-	if len(desc.variableLabels) != len(labelValues) {
-		panic(errInconsistentCardinality)
-	}
-
-	for _, n := range desc.variableLabels {
-		if n == quantileLabel {
-			panic(errQuantileLabelNotAllowed)
-		}
-	}
-	for _, lp := range desc.constLabelPairs {
-		if lp.GetName() == quantileLabel {
-			panic(errQuantileLabelNotAllowed)
-		}
-	}
-
-	if len(opts.Objectives) == 0 {
-		opts.Objectives = DefObjectives
-	}
-
-	if opts.MaxAge < 0 {
-		panic(fmt.Errorf("illegal max age MaxAge=%v", opts.MaxAge))
-	}
-	if opts.MaxAge == 0 {
-		opts.MaxAge = DefMaxAge
-	}
-
-	if opts.AgeBuckets == 0 {
-		opts.AgeBuckets = DefAgeBuckets
-	}
-
-	if opts.BufCap == 0 {
-		opts.BufCap = DefBufCap
-	}
-
-	s := &summary{
-		desc: desc,
-
-		objectives:       opts.Objectives,
-		sortedObjectives: make([]float64, 0, len(opts.Objectives)),
-
-		labelPairs: makeLabelPairs(desc, labelValues),
-
-		hotBuf:         make([]float64, 0, opts.BufCap),
-		coldBuf:        make([]float64, 0, opts.BufCap),
-		streamDuration: opts.MaxAge / time.Duration(opts.AgeBuckets),
-	}
-	s.headStreamExpTime = time.Now().Add(s.streamDuration)
-	s.hotBufExpTime = s.headStreamExpTime
-
-	for i := uint32(0); i < opts.AgeBuckets; i++ {
-		s.streams = append(s.streams, s.newStream())
-	}
-	s.headStream = s.streams[0]
-
-	for qu := range s.objectives {
-		s.sortedObjectives = append(s.sortedObjectives, qu)
-	}
-	sort.Float64s(s.sortedObjectives)
-
-	s.Init(s) // Init self-collection.
-	return s
-}
-
-type summary struct {
-	SelfCollector
-
-	bufMtx sync.Mutex // Protects hotBuf and hotBufExpTime.
-	mtx    sync.Mutex // Protects every other moving part.
-	// Lock bufMtx before mtx if both are needed.
-
-	desc *Desc
-
-	objectives       map[float64]float64
-	sortedObjectives []float64
-
-	labelPairs []*dto.LabelPair
-
-	sum float64
-	cnt uint64
-
-	hotBuf, coldBuf []float64
-
-	streams                          []*quantile.Stream
-	streamDuration                   time.Duration
-	headStream                       *quantile.Stream
-	headStreamIdx                    int
-	headStreamExpTime, hotBufExpTime time.Time
-}
-
-func (s *summary) Desc() *Desc {
-	return s.desc
-}
-
-func (s *summary) Observe(v float64) {
-	s.bufMtx.Lock()
-	defer s.bufMtx.Unlock()
-
-	now := time.Now()
-	if now.After(s.hotBufExpTime) {
-		s.asyncFlush(now)
-	}
-	s.hotBuf = append(s.hotBuf, v)
-	if len(s.hotBuf) == cap(s.hotBuf) {
-		s.asyncFlush(now)
-	}
-}
-
-func (s *summary) Write(out *dto.Metric) error {
-	sum := &dto.Summary{}
-	qs := make([]*dto.Quantile, 0, len(s.objectives))
-
-	s.bufMtx.Lock()
-	s.mtx.Lock()
-	// Swap bufs even if hotBuf is empty to set new hotBufExpTime.
-	s.swapBufs(time.Now())
-	s.bufMtx.Unlock()
-
-	s.flushColdBuf()
-	sum.SampleCount = proto.Uint64(s.cnt)
-	sum.SampleSum = proto.Float64(s.sum)
-
-	for _, rank := range s.sortedObjectives {
-		var q float64
-		if s.headStream.Count() == 0 {
-			q = math.NaN()
-		} else {
-			q = s.headStream.Query(rank)
-		}
-		qs = append(qs, &dto.Quantile{
-			Quantile: proto.Float64(rank),
-			Value:    proto.Float64(q),
-		})
-	}
-
-	s.mtx.Unlock()
-
-	if len(qs) > 0 {
-		sort.Sort(quantSort(qs))
-	}
-	sum.Quantile = qs
-
-	out.Summary = sum
-	out.Label = s.labelPairs
-	return nil
-}
-
-func (s *summary) newStream() *quantile.Stream {
-	return quantile.NewTargeted(s.objectives)
-}
-
-// asyncFlush needs bufMtx locked.
-func (s *summary) asyncFlush(now time.Time) {
-	s.mtx.Lock()
-	s.swapBufs(now)
-
-	// Unblock the original goroutine that was responsible for the mutation
-	// that triggered the compaction.  But hold onto the global non-buffer
-	// state mutex until the operation finishes.
-	go func() {
-		s.flushColdBuf()
-		s.mtx.Unlock()
-	}()
-}
-
-// rotateStreams needs mtx AND bufMtx locked.
-func (s *summary) maybeRotateStreams() {
-	for !s.hotBufExpTime.Equal(s.headStreamExpTime) {
-		s.headStream.Reset()
-		s.headStreamIdx++
-		if s.headStreamIdx >= len(s.streams) {
-			s.headStreamIdx = 0
-		}
-		s.headStream = s.streams[s.headStreamIdx]
-		s.headStreamExpTime = s.headStreamExpTime.Add(s.streamDuration)
-	}
-}
-
-// flushColdBuf needs mtx locked.
-func (s *summary) flushColdBuf() {
-	for _, v := range s.coldBuf {
-		for _, stream := range s.streams {
-			stream.Insert(v)
-		}
-		s.cnt++
-		s.sum += v
-	}
-	s.coldBuf = s.coldBuf[0:0]
-	s.maybeRotateStreams()
-}
-
-// swapBufs needs mtx AND bufMtx locked, coldBuf must be empty.
-func (s *summary) swapBufs(now time.Time) {
-	if len(s.coldBuf) != 0 {
-		panic("coldBuf is not empty")
-	}
-	s.hotBuf, s.coldBuf = s.coldBuf, s.hotBuf
-	// hotBuf is now empty and gets new expiration set.
-	for now.After(s.hotBufExpTime) {
-		s.hotBufExpTime = s.hotBufExpTime.Add(s.streamDuration)
-	}
-}
-
-type quantSort []*dto.Quantile
-
-func (s quantSort) Len() int {
-	return len(s)
-}
-
-func (s quantSort) Swap(i, j int) {
-	s[i], s[j] = s[j], s[i]
-}
-
-func (s quantSort) Less(i, j int) bool {
-	return s[i].GetQuantile() < s[j].GetQuantile()
-}
-
-// SummaryVec is a Collector that bundles a set of Summaries that all share the
-// same Desc, but have different values for their variable labels. This is used
-// if you want to count the same thing partitioned by various dimensions
-// (e.g. HTTP request latencies, partitioned by status code and method). Create
-// instances with NewSummaryVec.
-type SummaryVec struct {
-	MetricVec
-}
-
-// NewSummaryVec creates a new SummaryVec based on the provided SummaryOpts and
-// partitioned by the given label names. At least one label name must be
-// provided.
-func NewSummaryVec(opts SummaryOpts, labelNames []string) *SummaryVec {
-	desc := NewDesc(
-		BuildFQName(opts.Namespace, opts.Subsystem, opts.Name),
-		opts.Help,
-		labelNames,
-		opts.ConstLabels,
-	)
-	return &SummaryVec{
-		MetricVec: MetricVec{
-			children: map[uint64]Metric{},
-			desc:     desc,
-			hash:     fnv.New64a(),
-			newMetric: func(lvs ...string) Metric {
-				return newSummary(desc, opts, lvs...)
-			},
-		},
-	}
-}
-
-// GetMetricWithLabelValues replaces the method of the same name in
-// MetricVec. The difference is that this method returns a Summary and not a
-// Metric so that no type conversion is required.
-func (m *SummaryVec) GetMetricWithLabelValues(lvs ...string) (Summary, error) {
-	metric, err := m.MetricVec.GetMetricWithLabelValues(lvs...)
-	if metric != nil {
-		return metric.(Summary), err
-	}
-	return nil, err
-}
-
-// GetMetricWith replaces the method of the same name in MetricVec. The
-// difference is that this method returns a Summary and not a Metric so that no
-// type conversion is required.
-func (m *SummaryVec) GetMetricWith(labels Labels) (Summary, error) {
-	metric, err := m.MetricVec.GetMetricWith(labels)
-	if metric != nil {
-		return metric.(Summary), err
-	}
-	return nil, err
-}
-
-// WithLabelValues works as GetMetricWithLabelValues, but panics where
-// GetMetricWithLabelValues would have returned an error. By not returning an
-// error, WithLabelValues allows shortcuts like
-//     myVec.WithLabelValues("404", "GET").Observe(42.21)
-func (m *SummaryVec) WithLabelValues(lvs ...string) Summary {
-	return m.MetricVec.WithLabelValues(lvs...).(Summary)
-}
-
-// With works as GetMetricWith, but panics where GetMetricWithLabels would have
-// returned an error. By not returning an error, With allows shortcuts like
-//     myVec.With(Labels{"code": "404", "method": "GET"}).Observe(42.21)
-func (m *SummaryVec) With(labels Labels) Summary {
-	return m.MetricVec.With(labels).(Summary)
-}
-
-type constSummary struct {
-	desc       *Desc
-	count      uint64
-	sum        float64
-	quantiles  map[float64]float64
-	labelPairs []*dto.LabelPair
-}
-
-func (s *constSummary) Desc() *Desc {
-	return s.desc
-}
-
-func (s *constSummary) Write(out *dto.Metric) error {
-	sum := &dto.Summary{}
-	qs := make([]*dto.Quantile, 0, len(s.quantiles))
-
-	sum.SampleCount = proto.Uint64(s.count)
-	sum.SampleSum = proto.Float64(s.sum)
-
-	for rank, q := range s.quantiles {
-		qs = append(qs, &dto.Quantile{
-			Quantile: proto.Float64(rank),
-			Value:    proto.Float64(q),
-		})
-	}
-
-	if len(qs) > 0 {
-		sort.Sort(quantSort(qs))
-	}
-	sum.Quantile = qs
-
-	out.Summary = sum
-	out.Label = s.labelPairs
-
-	return nil
-}
-
-// NewConstSummary returns a metric representing a Prometheus summary with fixed
-// values for the count, sum, and quantiles. As those parameters cannot be
-// changed, the returned value does not implement the Summary interface (but
-// only the Metric interface). Users of this package will not have much use for
-// it in regular operations. However, when implementing custom Collectors, it is
-// useful as a throw-away metric that is generated on the fly to send it to
-// Prometheus in the Collect method.
-//
-// quantiles maps ranks to quantile values. For example, a median latency of
-// 0.23s and a 99th percentile latency of 0.56s would be expressed as:
-//     map[float64]float64{0.5: 0.23, 0.99: 0.56}
-//
-// NewConstSummary returns an error if the length of labelValues is not
-// consistent with the variable labels in Desc.
-func NewConstSummary(
-	desc *Desc,
-	count uint64,
-	sum float64,
-	quantiles map[float64]float64,
-	labelValues ...string,
-) (Metric, error) {
-	if len(desc.variableLabels) != len(labelValues) {
-		return nil, errInconsistentCardinality
-	}
-	return &constSummary{
-		desc:       desc,
-		count:      count,
-		sum:        sum,
-		quantiles:  quantiles,
-		labelPairs: makeLabelPairs(desc, labelValues),
-	}, nil
-}
-
-// MustNewConstSummary is a version of NewConstSummary that panics where
-// NewConstMetric would have returned an error.
-func MustNewConstSummary(
-	desc *Desc,
-	count uint64,
-	sum float64,
-	quantiles map[float64]float64,
-	labelValues ...string,
-) Metric {
-	m, err := NewConstSummary(desc, count, sum, quantiles, labelValues...)
-	if err != nil {
-		panic(err)
-	}
-	return m
-}
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/untyped.go b/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/untyped.go
deleted file mode 100644
index c65ab1c53..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/untyped.go
+++ /dev/null
@@ -1,145 +0,0 @@
-// Copyright 2014 The Prometheus Authors
-// 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 prometheus
-
-import "hash/fnv"
-
-// Untyped is a Metric that represents a single numerical value that can
-// arbitrarily go up and down.
-//
-// An Untyped metric works the same as a Gauge. The only difference is that to
-// no type information is implied.
-//
-// To create Untyped instances, use NewUntyped.
-type Untyped interface {
-	Metric
-	Collector
-
-	// Set sets the Untyped metric to an arbitrary value.
-	Set(float64)
-	// Inc increments the Untyped metric by 1.
-	Inc()
-	// Dec decrements the Untyped metric by 1.
-	Dec()
-	// Add adds the given value to the Untyped metric. (The value can be
-	// negative, resulting in a decrease.)
-	Add(float64)
-	// Sub subtracts the given value from the Untyped metric. (The value can
-	// be negative, resulting in an increase.)
-	Sub(float64)
-}
-
-// UntypedOpts is an alias for Opts. See there for doc comments.
-type UntypedOpts Opts
-
-// NewUntyped creates a new Untyped metric from the provided UntypedOpts.
-func NewUntyped(opts UntypedOpts) Untyped {
-	return newValue(NewDesc(
-		BuildFQName(opts.Namespace, opts.Subsystem, opts.Name),
-		opts.Help,
-		nil,
-		opts.ConstLabels,
-	), UntypedValue, 0)
-}
-
-// UntypedVec is a Collector that bundles a set of Untyped metrics that all
-// share the same Desc, but have different values for their variable
-// labels. This is used if you want to count the same thing partitioned by
-// various dimensions. Create instances with NewUntypedVec.
-type UntypedVec struct {
-	MetricVec
-}
-
-// NewUntypedVec creates a new UntypedVec based on the provided UntypedOpts and
-// partitioned by the given label names. At least one label name must be
-// provided.
-func NewUntypedVec(opts UntypedOpts, labelNames []string) *UntypedVec {
-	desc := NewDesc(
-		BuildFQName(opts.Namespace, opts.Subsystem, opts.Name),
-		opts.Help,
-		labelNames,
-		opts.ConstLabels,
-	)
-	return &UntypedVec{
-		MetricVec: MetricVec{
-			children: map[uint64]Metric{},
-			desc:     desc,
-			hash:     fnv.New64a(),
-			newMetric: func(lvs ...string) Metric {
-				return newValue(desc, UntypedValue, 0, lvs...)
-			},
-		},
-	}
-}
-
-// GetMetricWithLabelValues replaces the method of the same name in
-// MetricVec. The difference is that this method returns an Untyped and not a
-// Metric so that no type conversion is required.
-func (m *UntypedVec) GetMetricWithLabelValues(lvs ...string) (Untyped, error) {
-	metric, err := m.MetricVec.GetMetricWithLabelValues(lvs...)
-	if metric != nil {
-		return metric.(Untyped), err
-	}
-	return nil, err
-}
-
-// GetMetricWith replaces the method of the same name in MetricVec. The
-// difference is that this method returns an Untyped and not a Metric so that no
-// type conversion is required.
-func (m *UntypedVec) GetMetricWith(labels Labels) (Untyped, error) {
-	metric, err := m.MetricVec.GetMetricWith(labels)
-	if metric != nil {
-		return metric.(Untyped), err
-	}
-	return nil, err
-}
-
-// WithLabelValues works as GetMetricWithLabelValues, but panics where
-// GetMetricWithLabelValues would have returned an error. By not returning an
-// error, WithLabelValues allows shortcuts like
-//     myVec.WithLabelValues("404", "GET").Add(42)
-func (m *UntypedVec) WithLabelValues(lvs ...string) Untyped {
-	return m.MetricVec.WithLabelValues(lvs...).(Untyped)
-}
-
-// With works as GetMetricWith, but panics where GetMetricWithLabels would have
-// returned an error. By not returning an error, With allows shortcuts like
-//     myVec.With(Labels{"code": "404", "method": "GET"}).Add(42)
-func (m *UntypedVec) With(labels Labels) Untyped {
-	return m.MetricVec.With(labels).(Untyped)
-}
-
-// UntypedFunc is an Untyped whose value is determined at collect time by
-// calling a provided function.
-//
-// To create UntypedFunc instances, use NewUntypedFunc.
-type UntypedFunc interface {
-	Metric
-	Collector
-}
-
-// NewUntypedFunc creates a new UntypedFunc based on the provided
-// UntypedOpts. The value reported is determined by calling the given function
-// from within the Write method. Take into account that metric collection may
-// happen concurrently. If that results in concurrent calls to Write, like in
-// the case where an UntypedFunc is directly registered with Prometheus, the
-// provided function must be concurrency-safe.
-func NewUntypedFunc(opts UntypedOpts, function func() float64) UntypedFunc {
-	return newValueFunc(NewDesc(
-		BuildFQName(opts.Namespace, opts.Subsystem, opts.Name),
-		opts.Help,
-		nil,
-		opts.ConstLabels,
-	), UntypedValue, function)
-}
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/value.go b/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/value.go
deleted file mode 100644
index b54ac11e8..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/value.go
+++ /dev/null
@@ -1,234 +0,0 @@
-// Copyright 2014 The Prometheus Authors
-// 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 prometheus
-
-import (
-	"errors"
-	"fmt"
-	"math"
-	"sort"
-	"sync/atomic"
-
-	dto "github.com/prometheus/client_model/go"
-
-	"github.com/golang/protobuf/proto"
-)
-
-// ValueType is an enumeration of metric types that represent a simple value.
-type ValueType int
-
-// Possible values for the ValueType enum.
-const (
-	_ ValueType = iota
-	CounterValue
-	GaugeValue
-	UntypedValue
-)
-
-var errInconsistentCardinality = errors.New("inconsistent label cardinality")
-
-// value is a generic metric for simple values. It implements Metric, Collector,
-// Counter, Gauge, and Untyped. Its effective type is determined by
-// ValueType. This is a low-level building block used by the library to back the
-// implementations of Counter, Gauge, and Untyped.
-type value struct {
-	// valBits containst the bits of the represented float64 value. It has
-	// to go first in the struct to guarantee alignment for atomic
-	// operations.  http://golang.org/pkg/sync/atomic/#pkg-note-BUG
-	valBits uint64
-
-	SelfCollector
-
-	desc       *Desc
-	valType    ValueType
-	labelPairs []*dto.LabelPair
-}
-
-// newValue returns a newly allocated value with the given Desc, ValueType,
-// sample value and label values. It panics if the number of label
-// values is different from the number of variable labels in Desc.
-func newValue(desc *Desc, valueType ValueType, val float64, labelValues ...string) *value {
-	if len(labelValues) != len(desc.variableLabels) {
-		panic(errInconsistentCardinality)
-	}
-	result := &value{
-		desc:       desc,
-		valType:    valueType,
-		valBits:    math.Float64bits(val),
-		labelPairs: makeLabelPairs(desc, labelValues),
-	}
-	result.Init(result)
-	return result
-}
-
-func (v *value) Desc() *Desc {
-	return v.desc
-}
-
-func (v *value) Set(val float64) {
-	atomic.StoreUint64(&v.valBits, math.Float64bits(val))
-}
-
-func (v *value) Inc() {
-	v.Add(1)
-}
-
-func (v *value) Dec() {
-	v.Add(-1)
-}
-
-func (v *value) Add(val float64) {
-	for {
-		oldBits := atomic.LoadUint64(&v.valBits)
-		newBits := math.Float64bits(math.Float64frombits(oldBits) + val)
-		if atomic.CompareAndSwapUint64(&v.valBits, oldBits, newBits) {
-			return
-		}
-	}
-}
-
-func (v *value) Sub(val float64) {
-	v.Add(val * -1)
-}
-
-func (v *value) Write(out *dto.Metric) error {
-	val := math.Float64frombits(atomic.LoadUint64(&v.valBits))
-	return populateMetric(v.valType, val, v.labelPairs, out)
-}
-
-// valueFunc is a generic metric for simple values retrieved on collect time
-// from a function. It implements Metric and Collector. Its effective type is
-// determined by ValueType. This is a low-level building block used by the
-// library to back the implementations of CounterFunc, GaugeFunc, and
-// UntypedFunc.
-type valueFunc struct {
-	SelfCollector
-
-	desc       *Desc
-	valType    ValueType
-	function   func() float64
-	labelPairs []*dto.LabelPair
-}
-
-// newValueFunc returns a newly allocated valueFunc with the given Desc and
-// ValueType. The value reported is determined by calling the given function
-// from within the Write method. Take into account that metric collection may
-// happen concurrently. If that results in concurrent calls to Write, like in
-// the case where a valueFunc is directly registered with Prometheus, the
-// provided function must be concurrency-safe.
-func newValueFunc(desc *Desc, valueType ValueType, function func() float64) *valueFunc {
-	result := &valueFunc{
-		desc:       desc,
-		valType:    valueType,
-		function:   function,
-		labelPairs: makeLabelPairs(desc, nil),
-	}
-	result.Init(result)
-	return result
-}
-
-func (v *valueFunc) Desc() *Desc {
-	return v.desc
-}
-
-func (v *valueFunc) Write(out *dto.Metric) error {
-	return populateMetric(v.valType, v.function(), v.labelPairs, out)
-}
-
-// NewConstMetric returns a metric with one fixed value that cannot be
-// changed. Users of this package will not have much use for it in regular
-// operations. However, when implementing custom Collectors, it is useful as a
-// throw-away metric that is generated on the fly to send it to Prometheus in
-// the Collect method. NewConstMetric returns an error if the length of
-// labelValues is not consistent with the variable labels in Desc.
-func NewConstMetric(desc *Desc, valueType ValueType, value float64, labelValues ...string) (Metric, error) {
-	if len(desc.variableLabels) != len(labelValues) {
-		return nil, errInconsistentCardinality
-	}
-	return &constMetric{
-		desc:       desc,
-		valType:    valueType,
-		val:        value,
-		labelPairs: makeLabelPairs(desc, labelValues),
-	}, nil
-}
-
-// MustNewConstMetric is a version of NewConstMetric that panics where
-// NewConstMetric would have returned an error.
-func MustNewConstMetric(desc *Desc, valueType ValueType, value float64, labelValues ...string) Metric {
-	m, err := NewConstMetric(desc, valueType, value, labelValues...)
-	if err != nil {
-		panic(err)
-	}
-	return m
-}
-
-type constMetric struct {
-	desc       *Desc
-	valType    ValueType
-	val        float64
-	labelPairs []*dto.LabelPair
-}
-
-func (m *constMetric) Desc() *Desc {
-	return m.desc
-}
-
-func (m *constMetric) Write(out *dto.Metric) error {
-	return populateMetric(m.valType, m.val, m.labelPairs, out)
-}
-
-func populateMetric(
-	t ValueType,
-	v float64,
-	labelPairs []*dto.LabelPair,
-	m *dto.Metric,
-) error {
-	m.Label = labelPairs
-	switch t {
-	case CounterValue:
-		m.Counter = &dto.Counter{Value: proto.Float64(v)}
-	case GaugeValue:
-		m.Gauge = &dto.Gauge{Value: proto.Float64(v)}
-	case UntypedValue:
-		m.Untyped = &dto.Untyped{Value: proto.Float64(v)}
-	default:
-		return fmt.Errorf("encountered unknown type %v", t)
-	}
-	return nil
-}
-
-func makeLabelPairs(desc *Desc, labelValues []string) []*dto.LabelPair {
-	totalLen := len(desc.variableLabels) + len(desc.constLabelPairs)
-	if totalLen == 0 {
-		// Super fast path.
-		return nil
-	}
-	if len(desc.variableLabels) == 0 {
-		// Moderately fast path.
-		return desc.constLabelPairs
-	}
-	labelPairs := make([]*dto.LabelPair, 0, totalLen)
-	for i, n := range desc.variableLabels {
-		labelPairs = append(labelPairs, &dto.LabelPair{
-			Name:  proto.String(n),
-			Value: proto.String(labelValues[i]),
-		})
-	}
-	for _, lp := range desc.constLabelPairs {
-		labelPairs = append(labelPairs, lp)
-	}
-	sort.Sort(LabelPairSorter(labelPairs))
-	return labelPairs
-}
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/vec.go b/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/vec.go
deleted file mode 100644
index a1f3bdf37..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/vec.go
+++ /dev/null
@@ -1,247 +0,0 @@
-// Copyright 2014 The Prometheus Authors
-// 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 prometheus
-
-import (
-	"bytes"
-	"fmt"
-	"hash"
-	"sync"
-)
-
-// MetricVec is a Collector to bundle metrics of the same name that
-// differ in their label values. MetricVec is usually not used directly but as a
-// building block for implementations of vectors of a given metric
-// type. GaugeVec, CounterVec, SummaryVec, and UntypedVec are examples already
-// provided in this package.
-type MetricVec struct {
-	mtx      sync.RWMutex // Protects not only children, but also hash and buf.
-	children map[uint64]Metric
-	desc     *Desc
-
-	// hash is our own hash instance to avoid repeated allocations.
-	hash hash.Hash64
-	// buf is used to copy string contents into it for hashing,
-	// again to avoid allocations.
-	buf bytes.Buffer
-
-	newMetric func(labelValues ...string) Metric
-}
-
-// Describe implements Collector. The length of the returned slice
-// is always one.
-func (m *MetricVec) Describe(ch chan<- *Desc) {
-	ch <- m.desc
-}
-
-// Collect implements Collector.
-func (m *MetricVec) Collect(ch chan<- Metric) {
-	m.mtx.RLock()
-	defer m.mtx.RUnlock()
-
-	for _, metric := range m.children {
-		ch <- metric
-	}
-}
-
-// GetMetricWithLabelValues returns the Metric for the given slice of label
-// values (same order as the VariableLabels in Desc). If that combination of
-// label values is accessed for the first time, a new Metric is created.
-//
-// It is possible to call this method without using the returned Metric to only
-// create the new Metric but leave it at its start value (e.g. a Summary or
-// Histogram without any observations). See also the SummaryVec example.
-//
-// Keeping the Metric for later use is possible (and should be considered if
-// performance is critical), but keep in mind that Reset, DeleteLabelValues and
-// Delete can be used to delete the Metric from the MetricVec. In that case, the
-// Metric will still exist, but it will not be exported anymore, even if a
-// Metric with the same label values is created later. See also the CounterVec
-// example.
-//
-// An error is returned if the number of label values is not the same as the
-// number of VariableLabels in Desc.
-//
-// Note that for more than one label value, this method is prone to mistakes
-// caused by an incorrect order of arguments. Consider GetMetricWith(Labels) as
-// an alternative to avoid that type of mistake. For higher label numbers, the
-// latter has a much more readable (albeit more verbose) syntax, but it comes
-// with a performance overhead (for creating and processing the Labels map).
-// See also the GaugeVec example.
-func (m *MetricVec) GetMetricWithLabelValues(lvs ...string) (Metric, error) {
-	m.mtx.Lock()
-	defer m.mtx.Unlock()
-
-	h, err := m.hashLabelValues(lvs)
-	if err != nil {
-		return nil, err
-	}
-	return m.getOrCreateMetric(h, lvs...), nil
-}
-
-// GetMetricWith returns the Metric for the given Labels map (the label names
-// must match those of the VariableLabels in Desc). If that label map is
-// accessed for the first time, a new Metric is created. Implications of
-// creating a Metric without using it and keeping the Metric for later use are
-// the same as for GetMetricWithLabelValues.
-//
-// An error is returned if the number and names of the Labels are inconsistent
-// with those of the VariableLabels in Desc.
-//
-// This method is used for the same purpose as
-// GetMetricWithLabelValues(...string). See there for pros and cons of the two
-// methods.
-func (m *MetricVec) GetMetricWith(labels Labels) (Metric, error) {
-	m.mtx.Lock()
-	defer m.mtx.Unlock()
-
-	h, err := m.hashLabels(labels)
-	if err != nil {
-		return nil, err
-	}
-	lvs := make([]string, len(labels))
-	for i, label := range m.desc.variableLabels {
-		lvs[i] = labels[label]
-	}
-	return m.getOrCreateMetric(h, lvs...), nil
-}
-
-// WithLabelValues works as GetMetricWithLabelValues, but panics if an error
-// occurs. The method allows neat syntax like:
-//     httpReqs.WithLabelValues("404", "POST").Inc()
-func (m *MetricVec) WithLabelValues(lvs ...string) Metric {
-	metric, err := m.GetMetricWithLabelValues(lvs...)
-	if err != nil {
-		panic(err)
-	}
-	return metric
-}
-
-// With works as GetMetricWith, but panics if an error occurs. The method allows
-// neat syntax like:
-//     httpReqs.With(Labels{"status":"404", "method":"POST"}).Inc()
-func (m *MetricVec) With(labels Labels) Metric {
-	metric, err := m.GetMetricWith(labels)
-	if err != nil {
-		panic(err)
-	}
-	return metric
-}
-
-// DeleteLabelValues removes the metric where the variable labels are the same
-// as those passed in as labels (same order as the VariableLabels in Desc). It
-// returns true if a metric was deleted.
-//
-// It is not an error if the number of label values is not the same as the
-// number of VariableLabels in Desc.  However, such inconsistent label count can
-// never match an actual Metric, so the method will always return false in that
-// case.
-//
-// Note that for more than one label value, this method is prone to mistakes
-// caused by an incorrect order of arguments. Consider Delete(Labels) as an
-// alternative to avoid that type of mistake. For higher label numbers, the
-// latter has a much more readable (albeit more verbose) syntax, but it comes
-// with a performance overhead (for creating and processing the Labels map).
-// See also the CounterVec example.
-func (m *MetricVec) DeleteLabelValues(lvs ...string) bool {
-	m.mtx.Lock()
-	defer m.mtx.Unlock()
-
-	h, err := m.hashLabelValues(lvs)
-	if err != nil {
-		return false
-	}
-	if _, has := m.children[h]; !has {
-		return false
-	}
-	delete(m.children, h)
-	return true
-}
-
-// Delete deletes the metric where the variable labels are the same as those
-// passed in as labels. It returns true if a metric was deleted.
-//
-// It is not an error if the number and names of the Labels are inconsistent
-// with those of the VariableLabels in the Desc of the MetricVec. However, such
-// inconsistent Labels can never match an actual Metric, so the method will
-// always return false in that case.
-//
-// This method is used for the same purpose as DeleteLabelValues(...string). See
-// there for pros and cons of the two methods.
-func (m *MetricVec) Delete(labels Labels) bool {
-	m.mtx.Lock()
-	defer m.mtx.Unlock()
-
-	h, err := m.hashLabels(labels)
-	if err != nil {
-		return false
-	}
-	if _, has := m.children[h]; !has {
-		return false
-	}
-	delete(m.children, h)
-	return true
-}
-
-// Reset deletes all metrics in this vector.
-func (m *MetricVec) Reset() {
-	m.mtx.Lock()
-	defer m.mtx.Unlock()
-
-	for h := range m.children {
-		delete(m.children, h)
-	}
-}
-
-func (m *MetricVec) hashLabelValues(vals []string) (uint64, error) {
-	if len(vals) != len(m.desc.variableLabels) {
-		return 0, errInconsistentCardinality
-	}
-	m.hash.Reset()
-	for _, val := range vals {
-		m.buf.Reset()
-		m.buf.WriteString(val)
-		m.hash.Write(m.buf.Bytes())
-	}
-	return m.hash.Sum64(), nil
-}
-
-func (m *MetricVec) hashLabels(labels Labels) (uint64, error) {
-	if len(labels) != len(m.desc.variableLabels) {
-		return 0, errInconsistentCardinality
-	}
-	m.hash.Reset()
-	for _, label := range m.desc.variableLabels {
-		val, ok := labels[label]
-		if !ok {
-			return 0, fmt.Errorf("label name %q missing in label map", label)
-		}
-		m.buf.Reset()
-		m.buf.WriteString(val)
-		m.hash.Write(m.buf.Bytes())
-	}
-	return m.hash.Sum64(), nil
-}
-
-func (m *MetricVec) getOrCreateMetric(hash uint64, labelValues ...string) Metric {
-	metric, ok := m.children[hash]
-	if !ok {
-		// Copy labelValues. Otherwise, they would be allocated even if we don't go
-		// down this code path.
-		copiedLabelValues := append(make([]string, 0, len(labelValues)), labelValues...)
-		metric = m.newMetric(copiedLabelValues...)
-		m.children[hash] = metric
-	}
-	return metric
-}
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/text/bench_test.go b/Godeps/_workspace/src/github.com/prometheus/client_golang/text/bench_test.go
deleted file mode 100644
index c315eec36..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/client_golang/text/bench_test.go
+++ /dev/null
@@ -1,169 +0,0 @@
-// Copyright 2015 The Prometheus Authors
-// 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 text
-
-import (
-	"bytes"
-	"compress/gzip"
-	"io"
-	"io/ioutil"
-	"testing"
-
-	"github.com/matttproud/golang_protobuf_extensions/pbutil"
-
-	dto "github.com/prometheus/client_model/go"
-)
-
-// Benchmarks to show how much penalty text format parsing actually inflicts.
-//
-// Example results on Linux 3.13.0, Intel(R) Core(TM) i7-4700MQ CPU @ 2.40GHz, go1.4.
-//
-// BenchmarkParseText          1000           1188535 ns/op          205085 B/op       6135 allocs/op
-// BenchmarkParseTextGzip      1000           1376567 ns/op          246224 B/op       6151 allocs/op
-// BenchmarkParseProto        10000            172790 ns/op           52258 B/op       1160 allocs/op
-// BenchmarkParseProtoGzip     5000            324021 ns/op           94931 B/op       1211 allocs/op
-// BenchmarkParseProtoMap     10000            187946 ns/op           58714 B/op       1203 allocs/op
-//
-// CONCLUSION: The overhead for the map is negligible. Text format needs ~5x more allocations.
-// Without compression, it needs ~7x longer, but with compression (the more relevant scenario),
-// the difference becomes less relevant, only ~4x.
-//
-// The test data contains 248 samples.
-//
-// BenchmarkProcessor002ParseOnly in the extraction package is not quite
-// comparable to the benchmarks here, but it gives an idea: JSON parsing is even
-// slower than text parsing and needs a comparable amount of allocs.
-
-// BenchmarkParseText benchmarks the parsing of a text-format scrape into metric
-// family DTOs.
-func BenchmarkParseText(b *testing.B) {
-	b.StopTimer()
-	data, err := ioutil.ReadFile("testdata/text")
-	if err != nil {
-		b.Fatal(err)
-	}
-	b.StartTimer()
-
-	for i := 0; i < b.N; i++ {
-		if _, err := parser.TextToMetricFamilies(bytes.NewReader(data)); err != nil {
-			b.Fatal(err)
-		}
-	}
-}
-
-// BenchmarkParseTextGzip benchmarks the parsing of a gzipped text-format scrape
-// into metric family DTOs.
-func BenchmarkParseTextGzip(b *testing.B) {
-	b.StopTimer()
-	data, err := ioutil.ReadFile("testdata/text.gz")
-	if err != nil {
-		b.Fatal(err)
-	}
-	b.StartTimer()
-
-	for i := 0; i < b.N; i++ {
-		in, err := gzip.NewReader(bytes.NewReader(data))
-		if err != nil {
-			b.Fatal(err)
-		}
-		if _, err := parser.TextToMetricFamilies(in); err != nil {
-			b.Fatal(err)
-		}
-	}
-}
-
-// BenchmarkParseProto benchmarks the parsing of a protobuf-format scrape into
-// metric family DTOs. Note that this does not build a map of metric families
-// (as the text version does), because it is not required for Prometheus
-// ingestion either. (However, it is required for the text-format parsing, as
-// the metric family might be sprinkled all over the text, while the
-// protobuf-format guarantees bundling at one place.)
-func BenchmarkParseProto(b *testing.B) {
-	b.StopTimer()
-	data, err := ioutil.ReadFile("testdata/protobuf")
-	if err != nil {
-		b.Fatal(err)
-	}
-	b.StartTimer()
-
-	for i := 0; i < b.N; i++ {
-		family := &dto.MetricFamily{}
-		in := bytes.NewReader(data)
-		for {
-			family.Reset()
-			if _, err := pbutil.ReadDelimited(in, family); err != nil {
-				if err == io.EOF {
-					break
-				}
-				b.Fatal(err)
-			}
-		}
-	}
-}
-
-// BenchmarkParseProtoGzip is like BenchmarkParseProto above, but parses gzipped
-// protobuf format.
-func BenchmarkParseProtoGzip(b *testing.B) {
-	b.StopTimer()
-	data, err := ioutil.ReadFile("testdata/protobuf.gz")
-	if err != nil {
-		b.Fatal(err)
-	}
-	b.StartTimer()
-
-	for i := 0; i < b.N; i++ {
-		family := &dto.MetricFamily{}
-		in, err := gzip.NewReader(bytes.NewReader(data))
-		if err != nil {
-			b.Fatal(err)
-		}
-		for {
-			family.Reset()
-			if _, err := pbutil.ReadDelimited(in, family); err != nil {
-				if err == io.EOF {
-					break
-				}
-				b.Fatal(err)
-			}
-		}
-	}
-}
-
-// BenchmarkParseProtoMap is like BenchmarkParseProto but DOES put the parsed
-// metric family DTOs into a map. This is not happening during Prometheus
-// ingestion. It is just here to measure the overhead of that map creation and
-// separate it from the overhead of the text format parsing.
-func BenchmarkParseProtoMap(b *testing.B) {
-	b.StopTimer()
-	data, err := ioutil.ReadFile("testdata/protobuf")
-	if err != nil {
-		b.Fatal(err)
-	}
-	b.StartTimer()
-
-	for i := 0; i < b.N; i++ {
-		families := map[string]*dto.MetricFamily{}
-		in := bytes.NewReader(data)
-		for {
-			family := &dto.MetricFamily{}
-			if _, err := pbutil.ReadDelimited(in, family); err != nil {
-				if err == io.EOF {
-					break
-				}
-				b.Fatal(err)
-			}
-			families[family.GetName()] = family
-		}
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/text/create.go b/Godeps/_workspace/src/github.com/prometheus/client_golang/text/create.go
deleted file mode 100644
index 57def3219..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/client_golang/text/create.go
+++ /dev/null
@@ -1,315 +0,0 @@
-// Copyright 2014 The Prometheus Authors
-// 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 text contains helper functions to parse and create text-based
-// exchange formats. The package currently supports (only) version 0.0.4 of the
-// exchange format. Should other versions be supported in the future, some
-// versioning scheme has to be applied. Possibilities include separate packages
-// or separate functions. The best way depends on the nature of future changes,
-// which is the reason why no versioning scheme has been applied prematurely
-// here.
-package text
-
-import (
-	"bytes"
-	"fmt"
-	"io"
-	"math"
-	"strings"
-
-	"github.com/prometheus/client_golang/model"
-	dto "github.com/prometheus/client_model/go"
-)
-
-// MetricFamilyToText converts a MetricFamily proto message into text format and
-// writes the resulting lines to 'out'. It returns the number of bytes written
-// and any error encountered.  This function does not perform checks on the
-// content of the metric and label names, i.e. invalid metric or label names
-// will result in invalid text format output.
-// This method fulfills the type 'prometheus.encoder'.
-func MetricFamilyToText(out io.Writer, in *dto.MetricFamily) (int, error) {
-	var written int
-
-	// Fail-fast checks.
-	if len(in.Metric) == 0 {
-		return written, fmt.Errorf("MetricFamily has no metrics: %s", in)
-	}
-	name := in.GetName()
-	if name == "" {
-		return written, fmt.Errorf("MetricFamily has no name: %s", in)
-	}
-	if in.Type == nil {
-		return written, fmt.Errorf("MetricFamily has no type: %s", in)
-	}
-
-	// Comments, first HELP, then TYPE.
-	if in.Help != nil {
-		n, err := fmt.Fprintf(
-			out, "# HELP %s %s\n",
-			name, escapeString(*in.Help, false),
-		)
-		written += n
-		if err != nil {
-			return written, err
-		}
-	}
-	metricType := in.GetType()
-	n, err := fmt.Fprintf(
-		out, "# TYPE %s %s\n",
-		name, strings.ToLower(metricType.String()),
-	)
-	written += n
-	if err != nil {
-		return written, err
-	}
-
-	// Finally the samples, one line for each.
-	for _, metric := range in.Metric {
-		switch metricType {
-		case dto.MetricType_COUNTER:
-			if metric.Counter == nil {
-				return written, fmt.Errorf(
-					"expected counter in metric %s %s", name, metric,
-				)
-			}
-			n, err = writeSample(
-				name, metric, "", "",
-				metric.Counter.GetValue(),
-				out,
-			)
-		case dto.MetricType_GAUGE:
-			if metric.Gauge == nil {
-				return written, fmt.Errorf(
-					"expected gauge in metric %s %s", name, metric,
-				)
-			}
-			n, err = writeSample(
-				name, metric, "", "",
-				metric.Gauge.GetValue(),
-				out,
-			)
-		case dto.MetricType_UNTYPED:
-			if metric.Untyped == nil {
-				return written, fmt.Errorf(
-					"expected untyped in metric %s %s", name, metric,
-				)
-			}
-			n, err = writeSample(
-				name, metric, "", "",
-				metric.Untyped.GetValue(),
-				out,
-			)
-		case dto.MetricType_SUMMARY:
-			if metric.Summary == nil {
-				return written, fmt.Errorf(
-					"expected summary in metric %s %s", name, metric,
-				)
-			}
-			for _, q := range metric.Summary.Quantile {
-				n, err = writeSample(
-					name, metric,
-					model.QuantileLabel, fmt.Sprint(q.GetQuantile()),
-					q.GetValue(),
-					out,
-				)
-				written += n
-				if err != nil {
-					return written, err
-				}
-			}
-			n, err = writeSample(
-				name+"_sum", metric, "", "",
-				metric.Summary.GetSampleSum(),
-				out,
-			)
-			if err != nil {
-				return written, err
-			}
-			written += n
-			n, err = writeSample(
-				name+"_count", metric, "", "",
-				float64(metric.Summary.GetSampleCount()),
-				out,
-			)
-		case dto.MetricType_HISTOGRAM:
-			if metric.Histogram == nil {
-				return written, fmt.Errorf(
-					"expected histogram in metric %s %s", name, metric,
-				)
-			}
-			infSeen := false
-			for _, q := range metric.Histogram.Bucket {
-				n, err = writeSample(
-					name+"_bucket", metric,
-					model.BucketLabel, fmt.Sprint(q.GetUpperBound()),
-					float64(q.GetCumulativeCount()),
-					out,
-				)
-				written += n
-				if err != nil {
-					return written, err
-				}
-				if math.IsInf(q.GetUpperBound(), +1) {
-					infSeen = true
-				}
-			}
-			if !infSeen {
-				n, err = writeSample(
-					name+"_bucket", metric,
-					model.BucketLabel, "+Inf",
-					float64(metric.Histogram.GetSampleCount()),
-					out,
-				)
-				if err != nil {
-					return written, err
-				}
-				written += n
-			}
-			n, err = writeSample(
-				name+"_sum", metric, "", "",
-				metric.Histogram.GetSampleSum(),
-				out,
-			)
-			if err != nil {
-				return written, err
-			}
-			written += n
-			n, err = writeSample(
-				name+"_count", metric, "", "",
-				float64(metric.Histogram.GetSampleCount()),
-				out,
-			)
-		default:
-			return written, fmt.Errorf(
-				"unexpected type in metric %s %s", name, metric,
-			)
-		}
-		written += n
-		if err != nil {
-			return written, err
-		}
-	}
-	return written, nil
-}
-
-// writeSample writes a single sample in text format to out, given the metric
-// name, the metric proto message itself, optionally an additional label name
-// and value (use empty strings if not required), and the value. The function
-// returns the number of bytes written and any error encountered.
-func writeSample(
-	name string,
-	metric *dto.Metric,
-	additionalLabelName, additionalLabelValue string,
-	value float64,
-	out io.Writer,
-) (int, error) {
-	var written int
-	n, err := fmt.Fprint(out, name)
-	written += n
-	if err != nil {
-		return written, err
-	}
-	n, err = labelPairsToText(
-		metric.Label,
-		additionalLabelName, additionalLabelValue,
-		out,
-	)
-	written += n
-	if err != nil {
-		return written, err
-	}
-	n, err = fmt.Fprintf(out, " %v", value)
-	written += n
-	if err != nil {
-		return written, err
-	}
-	if metric.TimestampMs != nil {
-		n, err = fmt.Fprintf(out, " %v", *metric.TimestampMs)
-		written += n
-		if err != nil {
-			return written, err
-		}
-	}
-	n, err = out.Write([]byte{'\n'})
-	written += n
-	if err != nil {
-		return written, err
-	}
-	return written, nil
-}
-
-// labelPairsToText converts a slice of LabelPair proto messages plus the
-// explicitly given additional label pair into text formatted as required by the
-// text format and writes it to 'out'. An empty slice in combination with an
-// empty string 'additionalLabelName' results in nothing being
-// written. Otherwise, the label pairs are written, escaped as required by the
-// text format, and enclosed in '{...}'. The function returns the number of
-// bytes written and any error encountered.
-func labelPairsToText(
-	in []*dto.LabelPair,
-	additionalLabelName, additionalLabelValue string,
-	out io.Writer,
-) (int, error) {
-	if len(in) == 0 && additionalLabelName == "" {
-		return 0, nil
-	}
-	var written int
-	separator := '{'
-	for _, lp := range in {
-		n, err := fmt.Fprintf(
-			out, `%c%s="%s"`,
-			separator, lp.GetName(), escapeString(lp.GetValue(), true),
-		)
-		written += n
-		if err != nil {
-			return written, err
-		}
-		separator = ','
-	}
-	if additionalLabelName != "" {
-		n, err := fmt.Fprintf(
-			out, `%c%s="%s"`,
-			separator, additionalLabelName,
-			escapeString(additionalLabelValue, true),
-		)
-		written += n
-		if err != nil {
-			return written, err
-		}
-	}
-	n, err := out.Write([]byte{'}'})
-	written += n
-	if err != nil {
-		return written, err
-	}
-	return written, nil
-}
-
-// escapeString replaces '\' by '\\', new line character by '\n', and - if
-// includeDoubleQuote is true - '"' by '\"'.
-func escapeString(v string, includeDoubleQuote bool) string {
-	result := bytes.NewBuffer(make([]byte, 0, len(v)))
-	for _, c := range v {
-		switch {
-		case c == '\\':
-			result.WriteString(`\\`)
-		case includeDoubleQuote && c == '"':
-			result.WriteString(`\"`)
-		case c == '\n':
-			result.WriteString(`\n`)
-		default:
-			result.WriteRune(c)
-		}
-	}
-	return result.String()
-}
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/text/create_test.go b/Godeps/_workspace/src/github.com/prometheus/client_golang/text/create_test.go
deleted file mode 100644
index fe938de80..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/client_golang/text/create_test.go
+++ /dev/null
@@ -1,439 +0,0 @@
-// Copyright 2014 The Prometheus Authors
-// 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 text
-
-import (
-	"bytes"
-	"math"
-	"strings"
-	"testing"
-
-	"github.com/golang/protobuf/proto"
-	dto "github.com/prometheus/client_model/go"
-)
-
-func testCreate(t testing.TB) {
-	var scenarios = []struct {
-		in  *dto.MetricFamily
-		out string
-	}{
-		// 0: Counter, NaN as value, timestamp given.
-		{
-			in: &dto.MetricFamily{
-				Name: proto.String("name"),
-				Help: proto.String("two-line\n doc  str\\ing"),
-				Type: dto.MetricType_COUNTER.Enum(),
-				Metric: []*dto.Metric{
-					&dto.Metric{
-						Label: []*dto.LabelPair{
-							&dto.LabelPair{
-								Name:  proto.String("labelname"),
-								Value: proto.String("val1"),
-							},
-							&dto.LabelPair{
-								Name:  proto.String("basename"),
-								Value: proto.String("basevalue"),
-							},
-						},
-						Counter: &dto.Counter{
-							Value: proto.Float64(math.NaN()),
-						},
-					},
-					&dto.Metric{
-						Label: []*dto.LabelPair{
-							&dto.LabelPair{
-								Name:  proto.String("labelname"),
-								Value: proto.String("val2"),
-							},
-							&dto.LabelPair{
-								Name:  proto.String("basename"),
-								Value: proto.String("basevalue"),
-							},
-						},
-						Counter: &dto.Counter{
-							Value: proto.Float64(.23),
-						},
-						TimestampMs: proto.Int64(1234567890),
-					},
-				},
-			},
-			out: `# HELP name two-line\n doc  str\\ing
-# TYPE name counter
-name{labelname="val1",basename="basevalue"} NaN
-name{labelname="val2",basename="basevalue"} 0.23 1234567890
-`,
-		},
-		// 1: Gauge, some escaping required, +Inf as value, multi-byte characters in label values.
-		{
-			in: &dto.MetricFamily{
-				Name: proto.String("gauge_name"),
-				Help: proto.String("gauge\ndoc\nstr\"ing"),
-				Type: dto.MetricType_GAUGE.Enum(),
-				Metric: []*dto.Metric{
-					&dto.Metric{
-						Label: []*dto.LabelPair{
-							&dto.LabelPair{
-								Name:  proto.String("name_1"),
-								Value: proto.String("val with\nnew line"),
-							},
-							&dto.LabelPair{
-								Name:  proto.String("name_2"),
-								Value: proto.String("val with \\backslash and \"quotes\""),
-							},
-						},
-						Gauge: &dto.Gauge{
-							Value: proto.Float64(math.Inf(+1)),
-						},
-					},
-					&dto.Metric{
-						Label: []*dto.LabelPair{
-							&dto.LabelPair{
-								Name:  proto.String("name_1"),
-								Value: proto.String("Björn"),
-							},
-							&dto.LabelPair{
-								Name:  proto.String("name_2"),
-								Value: proto.String("佖佥"),
-							},
-						},
-						Gauge: &dto.Gauge{
-							Value: proto.Float64(3.14E42),
-						},
-					},
-				},
-			},
-			out: `# HELP gauge_name gauge\ndoc\nstr"ing
-# TYPE gauge_name gauge
-gauge_name{name_1="val with\nnew line",name_2="val with \\backslash and \"quotes\""} +Inf
-gauge_name{name_1="Björn",name_2="佖佥"} 3.14e+42
-`,
-		},
-		// 2: Untyped, no help, one sample with no labels and -Inf as value, another sample with one label.
-		{
-			in: &dto.MetricFamily{
-				Name: proto.String("untyped_name"),
-				Type: dto.MetricType_UNTYPED.Enum(),
-				Metric: []*dto.Metric{
-					&dto.Metric{
-						Untyped: &dto.Untyped{
-							Value: proto.Float64(math.Inf(-1)),
-						},
-					},
-					&dto.Metric{
-						Label: []*dto.LabelPair{
-							&dto.LabelPair{
-								Name:  proto.String("name_1"),
-								Value: proto.String("value 1"),
-							},
-						},
-						Untyped: &dto.Untyped{
-							Value: proto.Float64(-1.23e-45),
-						},
-					},
-				},
-			},
-			out: `# TYPE untyped_name untyped
-untyped_name -Inf
-untyped_name{name_1="value 1"} -1.23e-45
-`,
-		},
-		// 3: Summary.
-		{
-			in: &dto.MetricFamily{
-				Name: proto.String("summary_name"),
-				Help: proto.String("summary docstring"),
-				Type: dto.MetricType_SUMMARY.Enum(),
-				Metric: []*dto.Metric{
-					&dto.Metric{
-						Summary: &dto.Summary{
-							SampleCount: proto.Uint64(42),
-							SampleSum:   proto.Float64(-3.4567),
-							Quantile: []*dto.Quantile{
-								&dto.Quantile{
-									Quantile: proto.Float64(0.5),
-									Value:    proto.Float64(-1.23),
-								},
-								&dto.Quantile{
-									Quantile: proto.Float64(0.9),
-									Value:    proto.Float64(.2342354),
-								},
-								&dto.Quantile{
-									Quantile: proto.Float64(0.99),
-									Value:    proto.Float64(0),
-								},
-							},
-						},
-					},
-					&dto.Metric{
-						Label: []*dto.LabelPair{
-							&dto.LabelPair{
-								Name:  proto.String("name_1"),
-								Value: proto.String("value 1"),
-							},
-							&dto.LabelPair{
-								Name:  proto.String("name_2"),
-								Value: proto.String("value 2"),
-							},
-						},
-						Summary: &dto.Summary{
-							SampleCount: proto.Uint64(4711),
-							SampleSum:   proto.Float64(2010.1971),
-							Quantile: []*dto.Quantile{
-								&dto.Quantile{
-									Quantile: proto.Float64(0.5),
-									Value:    proto.Float64(1),
-								},
-								&dto.Quantile{
-									Quantile: proto.Float64(0.9),
-									Value:    proto.Float64(2),
-								},
-								&dto.Quantile{
-									Quantile: proto.Float64(0.99),
-									Value:    proto.Float64(3),
-								},
-							},
-						},
-					},
-				},
-			},
-			out: `# HELP summary_name summary docstring
-# TYPE summary_name summary
-summary_name{quantile="0.5"} -1.23
-summary_name{quantile="0.9"} 0.2342354
-summary_name{quantile="0.99"} 0
-summary_name_sum -3.4567
-summary_name_count 42
-summary_name{name_1="value 1",name_2="value 2",quantile="0.5"} 1
-summary_name{name_1="value 1",name_2="value 2",quantile="0.9"} 2
-summary_name{name_1="value 1",name_2="value 2",quantile="0.99"} 3
-summary_name_sum{name_1="value 1",name_2="value 2"} 2010.1971
-summary_name_count{name_1="value 1",name_2="value 2"} 4711
-`,
-		},
-		// 4: Histogram
-		{
-			in: &dto.MetricFamily{
-				Name: proto.String("request_duration_microseconds"),
-				Help: proto.String("The response latency."),
-				Type: dto.MetricType_HISTOGRAM.Enum(),
-				Metric: []*dto.Metric{
-					&dto.Metric{
-						Histogram: &dto.Histogram{
-							SampleCount: proto.Uint64(2693),
-							SampleSum:   proto.Float64(1756047.3),
-							Bucket: []*dto.Bucket{
-								&dto.Bucket{
-									UpperBound:      proto.Float64(100),
-									CumulativeCount: proto.Uint64(123),
-								},
-								&dto.Bucket{
-									UpperBound:      proto.Float64(120),
-									CumulativeCount: proto.Uint64(412),
-								},
-								&dto.Bucket{
-									UpperBound:      proto.Float64(144),
-									CumulativeCount: proto.Uint64(592),
-								},
-								&dto.Bucket{
-									UpperBound:      proto.Float64(172.8),
-									CumulativeCount: proto.Uint64(1524),
-								},
-								&dto.Bucket{
-									UpperBound:      proto.Float64(math.Inf(+1)),
-									CumulativeCount: proto.Uint64(2693),
-								},
-							},
-						},
-					},
-				},
-			},
-			out: `# HELP request_duration_microseconds The response latency.
-# TYPE request_duration_microseconds histogram
-request_duration_microseconds_bucket{le="100"} 123
-request_duration_microseconds_bucket{le="120"} 412
-request_duration_microseconds_bucket{le="144"} 592
-request_duration_microseconds_bucket{le="172.8"} 1524
-request_duration_microseconds_bucket{le="+Inf"} 2693
-request_duration_microseconds_sum 1.7560473e+06
-request_duration_microseconds_count 2693
-`,
-		},
-		// 5: Histogram with missing +Inf bucket.
-		{
-			in: &dto.MetricFamily{
-				Name: proto.String("request_duration_microseconds"),
-				Help: proto.String("The response latency."),
-				Type: dto.MetricType_HISTOGRAM.Enum(),
-				Metric: []*dto.Metric{
-					&dto.Metric{
-						Histogram: &dto.Histogram{
-							SampleCount: proto.Uint64(2693),
-							SampleSum:   proto.Float64(1756047.3),
-							Bucket: []*dto.Bucket{
-								&dto.Bucket{
-									UpperBound:      proto.Float64(100),
-									CumulativeCount: proto.Uint64(123),
-								},
-								&dto.Bucket{
-									UpperBound:      proto.Float64(120),
-									CumulativeCount: proto.Uint64(412),
-								},
-								&dto.Bucket{
-									UpperBound:      proto.Float64(144),
-									CumulativeCount: proto.Uint64(592),
-								},
-								&dto.Bucket{
-									UpperBound:      proto.Float64(172.8),
-									CumulativeCount: proto.Uint64(1524),
-								},
-							},
-						},
-					},
-				},
-			},
-			out: `# HELP request_duration_microseconds The response latency.
-# TYPE request_duration_microseconds histogram
-request_duration_microseconds_bucket{le="100"} 123
-request_duration_microseconds_bucket{le="120"} 412
-request_duration_microseconds_bucket{le="144"} 592
-request_duration_microseconds_bucket{le="172.8"} 1524
-request_duration_microseconds_bucket{le="+Inf"} 2693
-request_duration_microseconds_sum 1.7560473e+06
-request_duration_microseconds_count 2693
-`,
-		},
-	}
-
-	for i, scenario := range scenarios {
-		out := bytes.NewBuffer(make([]byte, 0, len(scenario.out)))
-		n, err := MetricFamilyToText(out, scenario.in)
-		if err != nil {
-			t.Errorf("%d. error: %s", i, err)
-			continue
-		}
-		if expected, got := len(scenario.out), n; expected != got {
-			t.Errorf(
-				"%d. expected %d bytes written, got %d",
-				i, expected, got,
-			)
-		}
-		if expected, got := scenario.out, out.String(); expected != got {
-			t.Errorf(
-				"%d. expected out=%q, got %q",
-				i, expected, got,
-			)
-		}
-	}
-
-}
-
-func TestCreate(t *testing.T) {
-	testCreate(t)
-}
-
-func BenchmarkCreate(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		testCreate(b)
-	}
-}
-
-func testCreateError(t testing.TB) {
-	var scenarios = []struct {
-		in  *dto.MetricFamily
-		err string
-	}{
-		// 0: No metric.
-		{
-			in: &dto.MetricFamily{
-				Name:   proto.String("name"),
-				Help:   proto.String("doc string"),
-				Type:   dto.MetricType_COUNTER.Enum(),
-				Metric: []*dto.Metric{},
-			},
-			err: "MetricFamily has no metrics",
-		},
-		// 1: No metric name.
-		{
-			in: &dto.MetricFamily{
-				Help: proto.String("doc string"),
-				Type: dto.MetricType_UNTYPED.Enum(),
-				Metric: []*dto.Metric{
-					&dto.Metric{
-						Untyped: &dto.Untyped{
-							Value: proto.Float64(math.Inf(-1)),
-						},
-					},
-				},
-			},
-			err: "MetricFamily has no name",
-		},
-		// 2: No metric type.
-		{
-			in: &dto.MetricFamily{
-				Name: proto.String("name"),
-				Help: proto.String("doc string"),
-				Metric: []*dto.Metric{
-					&dto.Metric{
-						Untyped: &dto.Untyped{
-							Value: proto.Float64(math.Inf(-1)),
-						},
-					},
-				},
-			},
-			err: "MetricFamily has no type",
-		},
-		// 3: Wrong type.
-		{
-			in: &dto.MetricFamily{
-				Name: proto.String("name"),
-				Help: proto.String("doc string"),
-				Type: dto.MetricType_COUNTER.Enum(),
-				Metric: []*dto.Metric{
-					&dto.Metric{
-						Untyped: &dto.Untyped{
-							Value: proto.Float64(math.Inf(-1)),
-						},
-					},
-				},
-			},
-			err: "expected counter in metric",
-		},
-	}
-
-	for i, scenario := range scenarios {
-		var out bytes.Buffer
-		_, err := MetricFamilyToText(&out, scenario.in)
-		if err == nil {
-			t.Errorf("%d. expected error, got nil", i)
-			continue
-		}
-		if expected, got := scenario.err, err.Error(); strings.Index(got, expected) != 0 {
-			t.Errorf(
-				"%d. expected error starting with %q, got %q",
-				i, expected, got,
-			)
-		}
-	}
-
-}
-
-func TestCreateError(t *testing.T) {
-	testCreateError(t)
-}
-
-func BenchmarkCreateError(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		testCreateError(b)
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/text/fuzz.go b/Godeps/_workspace/src/github.com/prometheus/client_golang/text/fuzz.go
deleted file mode 100644
index a7e4d7f8f..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/client_golang/text/fuzz.go
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright 2014 The Prometheus Authors
-// 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 only when actually fuzzing
-// +build gofuzz
-
-package text
-
-import "bytes"
-
-// Fuzz text metric parser with with github.com/dvyukov/go-fuzz:
-//
-//     go-fuzz-build github.com/prometheus/client_golang/text
-//     go-fuzz -bin text-fuzz.zip -workdir fuzz
-//
-// Further input samples should go in the folder fuzz/corpus.
-func Fuzz(in []byte) int {
-	parser := Parser{}
-	_, err := parser.TextToMetricFamilies(bytes.NewReader(in))
-
-	if err != nil {
-		return 0
-	}
-
-	return 1
-}
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/text/fuzz/corpus/from_test_parse_0 b/Godeps/_workspace/src/github.com/prometheus/client_golang/text/fuzz/corpus/from_test_parse_0
deleted file mode 100644
index 139597f9c..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/client_golang/text/fuzz/corpus/from_test_parse_0
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/text/fuzz/corpus/from_test_parse_1 b/Godeps/_workspace/src/github.com/prometheus/client_golang/text/fuzz/corpus/from_test_parse_1
deleted file mode 100644
index 2ae870679..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/client_golang/text/fuzz/corpus/from_test_parse_1
+++ /dev/null
@@ -1,6 +0,0 @@
-
-minimal_metric 1.234
-another_metric -3e3 103948
-# Even that:
-no_labels{} 3
-# HELP line for non-existing metric will be ignored.
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/text/fuzz/corpus/from_test_parse_2 b/Godeps/_workspace/src/github.com/prometheus/client_golang/text/fuzz/corpus/from_test_parse_2
deleted file mode 100644
index 5c351db36..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/client_golang/text/fuzz/corpus/from_test_parse_2
+++ /dev/null
@@ -1,12 +0,0 @@
-
-# A normal comment.
-#
-# TYPE name counter
-name{labelname="val1",basename="basevalue"} NaN
-name {labelname="val2",basename="base\"v\\al\nue"} 0.23 1234567890
-# HELP name two-line\n doc  str\\ing
-
- # HELP  name2  	doc str"ing 2
-  #    TYPE    name2 gauge
-name2{labelname="val2"	,basename   =   "basevalue2"		} +Inf 54321
-name2{ labelname = "val1" , }-Inf
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/text/fuzz/corpus/from_test_parse_3 b/Godeps/_workspace/src/github.com/prometheus/client_golang/text/fuzz/corpus/from_test_parse_3
deleted file mode 100644
index 0b3c345aa..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/client_golang/text/fuzz/corpus/from_test_parse_3
+++ /dev/null
@@ -1,22 +0,0 @@
-
-# TYPE my_summary summary
-my_summary{n1="val1",quantile="0.5"} 110
-decoy -1 -2
-my_summary{n1="val1",quantile="0.9"} 140 1
-my_summary_count{n1="val1"} 42
-# Latest timestamp wins in case of a summary.
-my_summary_sum{n1="val1"} 4711 2
-fake_sum{n1="val1"} 2001
-# TYPE another_summary summary
-another_summary_count{n2="val2",n1="val1"} 20
-my_summary_count{n2="val2",n1="val1"} 5 5
-another_summary{n1="val1",n2="val2",quantile=".3"} -1.2
-my_summary_sum{n1="val2"} 08 15
-my_summary{n1="val3", quantile="0.2"} 4711
-  my_summary{n1="val1",n2="val2",quantile="-12.34",} NaN
-# some
-# funny comments
-# HELP 
-# HELP
-# HELP my_summary
-# HELP my_summary 
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/text/fuzz/corpus/from_test_parse_4 b/Godeps/_workspace/src/github.com/prometheus/client_golang/text/fuzz/corpus/from_test_parse_4
deleted file mode 100644
index bde0a387a..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/client_golang/text/fuzz/corpus/from_test_parse_4
+++ /dev/null
@@ -1,10 +0,0 @@
-
-# HELP request_duration_microseconds The response latency.
-# TYPE request_duration_microseconds histogram
-request_duration_microseconds_bucket{le="100"} 123
-request_duration_microseconds_bucket{le="120"} 412
-request_duration_microseconds_bucket{le="144"} 592
-request_duration_microseconds_bucket{le="172.8"} 1524
-request_duration_microseconds_bucket{le="+Inf"} 2693
-request_duration_microseconds_sum 1.7560473e+06
-request_duration_microseconds_count 2693
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/text/fuzz/corpus/from_test_parse_error_0 b/Godeps/_workspace/src/github.com/prometheus/client_golang/text/fuzz/corpus/from_test_parse_error_0
deleted file mode 100644
index 4c67f9a19..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/client_golang/text/fuzz/corpus/from_test_parse_error_0
+++ /dev/null
@@ -1 +0,0 @@
-bla 3.14
\ No newline at end of file
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/text/fuzz/corpus/from_test_parse_error_1 b/Godeps/_workspace/src/github.com/prometheus/client_golang/text/fuzz/corpus/from_test_parse_error_1
deleted file mode 100644
index b853478ee..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/client_golang/text/fuzz/corpus/from_test_parse_error_1
+++ /dev/null
@@ -1 +0,0 @@
-metric{label="\t"} 3.14
\ No newline at end of file
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/text/fuzz/corpus/from_test_parse_error_10 b/Godeps/_workspace/src/github.com/prometheus/client_golang/text/fuzz/corpus/from_test_parse_error_10
deleted file mode 100644
index b5fe5f5a6..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/client_golang/text/fuzz/corpus/from_test_parse_error_10
+++ /dev/null
@@ -1 +0,0 @@
-metric{label="bla"} 3.14 2 3
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/text/fuzz/corpus/from_test_parse_error_11 b/Godeps/_workspace/src/github.com/prometheus/client_golang/text/fuzz/corpus/from_test_parse_error_11
deleted file mode 100644
index 57c7fbc0b..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/client_golang/text/fuzz/corpus/from_test_parse_error_11
+++ /dev/null
@@ -1 +0,0 @@
-metric{label="bla"} blubb
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/text/fuzz/corpus/from_test_parse_error_12 b/Godeps/_workspace/src/github.com/prometheus/client_golang/text/fuzz/corpus/from_test_parse_error_12
deleted file mode 100644
index 0a9df79a1..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/client_golang/text/fuzz/corpus/from_test_parse_error_12
+++ /dev/null
@@ -1,3 +0,0 @@
-
-# HELP metric one
-# HELP metric two
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/text/fuzz/corpus/from_test_parse_error_13 b/Godeps/_workspace/src/github.com/prometheus/client_golang/text/fuzz/corpus/from_test_parse_error_13
deleted file mode 100644
index 5bc742781..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/client_golang/text/fuzz/corpus/from_test_parse_error_13
+++ /dev/null
@@ -1,3 +0,0 @@
-
-# TYPE metric counter
-# TYPE metric untyped
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/text/fuzz/corpus/from_test_parse_error_14 b/Godeps/_workspace/src/github.com/prometheus/client_golang/text/fuzz/corpus/from_test_parse_error_14
deleted file mode 100644
index a9a24265b..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/client_golang/text/fuzz/corpus/from_test_parse_error_14
+++ /dev/null
@@ -1,3 +0,0 @@
-
-metric 4.12
-# TYPE metric counter
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/text/fuzz/corpus/from_test_parse_error_15 b/Godeps/_workspace/src/github.com/prometheus/client_golang/text/fuzz/corpus/from_test_parse_error_15
deleted file mode 100644
index 7e95ca8f4..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/client_golang/text/fuzz/corpus/from_test_parse_error_15
+++ /dev/null
@@ -1,2 +0,0 @@
-
-# TYPE metric bla
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/text/fuzz/corpus/from_test_parse_error_16 b/Godeps/_workspace/src/github.com/prometheus/client_golang/text/fuzz/corpus/from_test_parse_error_16
deleted file mode 100644
index 7825f8887..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/client_golang/text/fuzz/corpus/from_test_parse_error_16
+++ /dev/null
@@ -1,2 +0,0 @@
-
-# TYPE met-ric
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/text/fuzz/corpus/from_test_parse_error_17 b/Godeps/_workspace/src/github.com/prometheus/client_golang/text/fuzz/corpus/from_test_parse_error_17
deleted file mode 100644
index 8f35cae0c..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/client_golang/text/fuzz/corpus/from_test_parse_error_17
+++ /dev/null
@@ -1 +0,0 @@
-@invalidmetric{label="bla"} 3.14 2
\ No newline at end of file
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/text/fuzz/corpus/from_test_parse_error_18 b/Godeps/_workspace/src/github.com/prometheus/client_golang/text/fuzz/corpus/from_test_parse_error_18
deleted file mode 100644
index 7ca2cc268..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/client_golang/text/fuzz/corpus/from_test_parse_error_18
+++ /dev/null
@@ -1 +0,0 @@
-{label="bla"} 3.14 2
\ No newline at end of file
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/text/fuzz/corpus/from_test_parse_error_19 b/Godeps/_workspace/src/github.com/prometheus/client_golang/text/fuzz/corpus/from_test_parse_error_19
deleted file mode 100644
index 7a6ccc0dd..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/client_golang/text/fuzz/corpus/from_test_parse_error_19
+++ /dev/null
@@ -1,3 +0,0 @@
-
-# TYPE metric histogram
-metric_bucket{le="bla"} 3.14
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/text/fuzz/corpus/from_test_parse_error_2 b/Godeps/_workspace/src/github.com/prometheus/client_golang/text/fuzz/corpus/from_test_parse_error_2
deleted file mode 100644
index 726d0017c..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/client_golang/text/fuzz/corpus/from_test_parse_error_2
+++ /dev/null
@@ -1,3 +0,0 @@
-
-metric{label="new
-line"} 3.14
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/text/fuzz/corpus/from_test_parse_error_3 b/Godeps/_workspace/src/github.com/prometheus/client_golang/text/fuzz/corpus/from_test_parse_error_3
deleted file mode 100644
index 6aa9e3081..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/client_golang/text/fuzz/corpus/from_test_parse_error_3
+++ /dev/null
@@ -1 +0,0 @@
-metric{@="bla"} 3.14
\ No newline at end of file
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/text/fuzz/corpus/from_test_parse_error_4 b/Godeps/_workspace/src/github.com/prometheus/client_golang/text/fuzz/corpus/from_test_parse_error_4
deleted file mode 100644
index d112cb902..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/client_golang/text/fuzz/corpus/from_test_parse_error_4
+++ /dev/null
@@ -1 +0,0 @@
-metric{__name__="bla"} 3.14
\ No newline at end of file
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/text/fuzz/corpus/from_test_parse_error_5 b/Godeps/_workspace/src/github.com/prometheus/client_golang/text/fuzz/corpus/from_test_parse_error_5
deleted file mode 100644
index b34554a8d..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/client_golang/text/fuzz/corpus/from_test_parse_error_5
+++ /dev/null
@@ -1 +0,0 @@
-metric{label+="bla"} 3.14
\ No newline at end of file
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/text/fuzz/corpus/from_test_parse_error_6 b/Godeps/_workspace/src/github.com/prometheus/client_golang/text/fuzz/corpus/from_test_parse_error_6
deleted file mode 100644
index c4d7df3d1..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/client_golang/text/fuzz/corpus/from_test_parse_error_6
+++ /dev/null
@@ -1 +0,0 @@
-metric{label=bla} 3.14
\ No newline at end of file
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/text/fuzz/corpus/from_test_parse_error_7 b/Godeps/_workspace/src/github.com/prometheus/client_golang/text/fuzz/corpus/from_test_parse_error_7
deleted file mode 100644
index 97eafc4a6..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/client_golang/text/fuzz/corpus/from_test_parse_error_7
+++ /dev/null
@@ -1,3 +0,0 @@
-
-# TYPE metric summary
-metric{quantile="bla"} 3.14
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/text/fuzz/corpus/from_test_parse_error_8 b/Godeps/_workspace/src/github.com/prometheus/client_golang/text/fuzz/corpus/from_test_parse_error_8
deleted file mode 100644
index fc706496b..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/client_golang/text/fuzz/corpus/from_test_parse_error_8
+++ /dev/null
@@ -1 +0,0 @@
-metric{label="bla"+} 3.14
\ No newline at end of file
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/text/fuzz/corpus/from_test_parse_error_9 b/Godeps/_workspace/src/github.com/prometheus/client_golang/text/fuzz/corpus/from_test_parse_error_9
deleted file mode 100644
index 57b4879c0..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/client_golang/text/fuzz/corpus/from_test_parse_error_9
+++ /dev/null
@@ -1 +0,0 @@
-metric{label="bla"} 3.14 2.72
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/text/fuzz/corpus/minimal b/Godeps/_workspace/src/github.com/prometheus/client_golang/text/fuzz/corpus/minimal
deleted file mode 100644
index be1e6a369..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/client_golang/text/fuzz/corpus/minimal
+++ /dev/null
@@ -1 +0,0 @@
-m{} 0
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/text/parse.go b/Godeps/_workspace/src/github.com/prometheus/client_golang/text/parse.go
deleted file mode 100644
index 2f337a809..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/client_golang/text/parse.go
+++ /dev/null
@@ -1,746 +0,0 @@
-// Copyright 2014 The Prometheus Authors
-// 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 text
-
-import (
-	"bufio"
-	"bytes"
-	"fmt"
-	"io"
-	"math"
-	"strconv"
-	"strings"
-
-	dto "github.com/prometheus/client_model/go"
-
-	"github.com/golang/protobuf/proto"
-	"github.com/prometheus/client_golang/model"
-)
-
-// A stateFn is a function that represents a state in a state machine. By
-// executing it, the state is progressed to the next state. The stateFn returns
-// another stateFn, which represents the new state. The end state is represented
-// by nil.
-type stateFn func() stateFn
-
-// ParseError signals errors while parsing the simple and flat text-based
-// exchange format.
-type ParseError struct {
-	Line int
-	Msg  string
-}
-
-// Error implements the error interface.
-func (e ParseError) Error() string {
-	return fmt.Sprintf("text format parsing error in line %d: %s", e.Line, e.Msg)
-}
-
-// Parser is used to parse the simple and flat text-based exchange format. Its
-// nil value is ready to use.
-type Parser struct {
-	metricFamiliesByName map[string]*dto.MetricFamily
-	buf                  *bufio.Reader // Where the parsed input is read through.
-	err                  error         // Most recent error.
-	lineCount            int           // Tracks the line count for error messages.
-	currentByte          byte          // The most recent byte read.
-	currentToken         bytes.Buffer  // Re-used each time a token has to be gathered from multiple bytes.
-	currentMF            *dto.MetricFamily
-	currentMetric        *dto.Metric
-	currentLabelPair     *dto.LabelPair
-
-	// The remaining member variables are only used for summaries/histograms.
-	currentLabels map[string]string // All labels including '__name__' but excluding 'quantile'/'le'
-	// Summary specific.
-	summaries       map[uint64]*dto.Metric // Key is created with LabelsToSignature.
-	currentQuantile float64
-	// Histogram specific.
-	histograms    map[uint64]*dto.Metric // Key is created with LabelsToSignature.
-	currentBucket float64
-	// These tell us if the currently processed line ends on '_count' or
-	// '_sum' respectively and belong to a summary/histogram, representing the sample
-	// count and sum of that summary/histogram.
-	currentIsSummaryCount, currentIsSummarySum     bool
-	currentIsHistogramCount, currentIsHistogramSum bool
-}
-
-// TextToMetricFamilies reads 'in' as the simple and flat text-based exchange
-// format and creates MetricFamily proto messages. It returns the MetricFamily
-// proto messages in a map where the metric names are the keys, along with any
-// error encountered.
-//
-// If the input contains duplicate metrics (i.e. lines with the same metric name
-// and exactly the same label set), the resulting MetricFamily will contain
-// duplicate Metric proto messages. Similar is true for duplicate label
-// names. Checks for duplicates have to be performed separately, if required.
-// Also note that neither the metrics within each MetricFamily are sorted nor
-// the label pairs within each Metric. Sorting is not required for the most
-// frequent use of this method, which is sample ingestion in the Prometheus
-// server. However, for presentation purposes, you might want to sort the
-// metrics, and in some cases, you must sort the labels, e.g. for consumption by
-// the metric family injection hook of the Prometheus registry.
-//
-// Summaries and histograms are rather special beasts. You would probably not
-// use them in the simple text format anyway. This method can deal with
-// summaries and histograms if they are presented in exactly the way the
-// text.Create function creates them.
-//
-// This method must not be called concurrently. If you want to parse different
-// input concurrently, instantiate a separate Parser for each goroutine.
-func (p *Parser) TextToMetricFamilies(in io.Reader) (map[string]*dto.MetricFamily, error) {
-	p.reset(in)
-	for nextState := p.startOfLine; nextState != nil; nextState = nextState() {
-		// Magic happens here...
-	}
-	// Get rid of empty metric families.
-	for k, mf := range p.metricFamiliesByName {
-		if len(mf.GetMetric()) == 0 {
-			delete(p.metricFamiliesByName, k)
-		}
-	}
-	return p.metricFamiliesByName, p.err
-}
-
-func (p *Parser) reset(in io.Reader) {
-	p.metricFamiliesByName = map[string]*dto.MetricFamily{}
-	if p.buf == nil {
-		p.buf = bufio.NewReader(in)
-	} else {
-		p.buf.Reset(in)
-	}
-	p.err = nil
-	p.lineCount = 0
-	if p.summaries == nil || len(p.summaries) > 0 {
-		p.summaries = map[uint64]*dto.Metric{}
-	}
-	if p.histograms == nil || len(p.histograms) > 0 {
-		p.histograms = map[uint64]*dto.Metric{}
-	}
-	p.currentQuantile = math.NaN()
-	p.currentBucket = math.NaN()
-}
-
-// startOfLine represents the state where the next byte read from p.buf is the
-// start of a line (or whitespace leading up to it).
-func (p *Parser) startOfLine() stateFn {
-	p.lineCount++
-	if p.skipBlankTab(); p.err != nil {
-		// End of input reached. This is the only case where
-		// that is not an error but a signal that we are done.
-		p.err = nil
-		return nil
-	}
-	switch p.currentByte {
-	case '#':
-		return p.startComment
-	case '\n':
-		return p.startOfLine // Empty line, start the next one.
-	}
-	return p.readingMetricName
-}
-
-// startComment represents the state where the next byte read from p.buf is the
-// start of a comment (or whitespace leading up to it).
-func (p *Parser) startComment() stateFn {
-	if p.skipBlankTab(); p.err != nil {
-		return nil // Unexpected end of input.
-	}
-	if p.currentByte == '\n' {
-		return p.startOfLine
-	}
-	if p.readTokenUntilWhitespace(); p.err != nil {
-		return nil // Unexpected end of input.
-	}
-	// If we have hit the end of line already, there is nothing left
-	// to do. This is not considered a syntax error.
-	if p.currentByte == '\n' {
-		return p.startOfLine
-	}
-	keyword := p.currentToken.String()
-	if keyword != "HELP" && keyword != "TYPE" {
-		// Generic comment, ignore by fast forwarding to end of line.
-		for p.currentByte != '\n' {
-			if p.currentByte, p.err = p.buf.ReadByte(); p.err != nil {
-				return nil // Unexpected end of input.
-			}
-		}
-		return p.startOfLine
-	}
-	// There is something. Next has to be a metric name.
-	if p.skipBlankTab(); p.err != nil {
-		return nil // Unexpected end of input.
-	}
-	if p.readTokenAsMetricName(); p.err != nil {
-		return nil // Unexpected end of input.
-	}
-	if p.currentByte == '\n' {
-		// At the end of the line already.
-		// Again, this is not considered a syntax error.
-		return p.startOfLine
-	}
-	if !isBlankOrTab(p.currentByte) {
-		p.parseError("invalid metric name in comment")
-		return nil
-	}
-	p.setOrCreateCurrentMF()
-	if p.skipBlankTab(); p.err != nil {
-		return nil // Unexpected end of input.
-	}
-	if p.currentByte == '\n' {
-		// At the end of the line already.
-		// Again, this is not considered a syntax error.
-		return p.startOfLine
-	}
-	switch keyword {
-	case "HELP":
-		return p.readingHelp
-	case "TYPE":
-		return p.readingType
-	}
-	panic(fmt.Sprintf("code error: unexpected keyword %q", keyword))
-}
-
-// readingMetricName represents the state where the last byte read (now in
-// p.currentByte) is the first byte of a metric name.
-func (p *Parser) readingMetricName() stateFn {
-	if p.readTokenAsMetricName(); p.err != nil {
-		return nil
-	}
-	if p.currentToken.Len() == 0 {
-		p.parseError("invalid metric name")
-		return nil
-	}
-	p.setOrCreateCurrentMF()
-	// Now is the time to fix the type if it hasn't happened yet.
-	if p.currentMF.Type == nil {
-		p.currentMF.Type = dto.MetricType_UNTYPED.Enum()
-	}
-	p.currentMetric = &dto.Metric{}
-	// Do not append the newly created currentMetric to
-	// currentMF.Metric right now. First wait if this is a summary,
-	// and the metric exists already, which we can only know after
-	// having read all the labels.
-	if p.skipBlankTabIfCurrentBlankTab(); p.err != nil {
-		return nil // Unexpected end of input.
-	}
-	return p.readingLabels
-}
-
-// readingLabels represents the state where the last byte read (now in
-// p.currentByte) is either the first byte of the label set (i.e. a '{'), or the
-// first byte of the value (otherwise).
-func (p *Parser) readingLabels() stateFn {
-	// Summaries/histograms are special. We have to reset the
-	// currentLabels map, currentQuantile and currentBucket before starting to
-	// read labels.
-	if p.currentMF.GetType() == dto.MetricType_SUMMARY || p.currentMF.GetType() == dto.MetricType_HISTOGRAM {
-		p.currentLabels = map[string]string{}
-		p.currentLabels[string(model.MetricNameLabel)] = p.currentMF.GetName()
-		p.currentQuantile = math.NaN()
-		p.currentBucket = math.NaN()
-	}
-	if p.currentByte != '{' {
-		return p.readingValue
-	}
-	return p.startLabelName
-}
-
-// startLabelName represents the state where the next byte read from p.buf is
-// the start of a label name (or whitespace leading up to it).
-func (p *Parser) startLabelName() stateFn {
-	if p.skipBlankTab(); p.err != nil {
-		return nil // Unexpected end of input.
-	}
-	if p.currentByte == '}' {
-		if p.skipBlankTab(); p.err != nil {
-			return nil // Unexpected end of input.
-		}
-		return p.readingValue
-	}
-	if p.readTokenAsLabelName(); p.err != nil {
-		return nil // Unexpected end of input.
-	}
-	if p.currentToken.Len() == 0 {
-		p.parseError(fmt.Sprintf("invalid label name for metric %q", p.currentMF.GetName()))
-		return nil
-	}
-	p.currentLabelPair = &dto.LabelPair{Name: proto.String(p.currentToken.String())}
-	if p.currentLabelPair.GetName() == string(model.MetricNameLabel) {
-		p.parseError(fmt.Sprintf("label name %q is reserved", model.MetricNameLabel))
-		return nil
-	}
-	// Special summary/histogram treatment. Don't add 'quantile' and 'le'
-	// labels to 'real' labels.
-	if !(p.currentMF.GetType() == dto.MetricType_SUMMARY && p.currentLabelPair.GetName() == model.QuantileLabel) &&
-		!(p.currentMF.GetType() == dto.MetricType_HISTOGRAM && p.currentLabelPair.GetName() == model.BucketLabel) {
-		p.currentMetric.Label = append(p.currentMetric.Label, p.currentLabelPair)
-	}
-	if p.skipBlankTabIfCurrentBlankTab(); p.err != nil {
-		return nil // Unexpected end of input.
-	}
-	if p.currentByte != '=' {
-		p.parseError(fmt.Sprintf("expected '=' after label name, found %q", p.currentByte))
-		return nil
-	}
-	return p.startLabelValue
-}
-
-// startLabelValue represents the state where the next byte read from p.buf is
-// the start of a (quoted) label value (or whitespace leading up to it).
-func (p *Parser) startLabelValue() stateFn {
-	if p.skipBlankTab(); p.err != nil {
-		return nil // Unexpected end of input.
-	}
-	if p.currentByte != '"' {
-		p.parseError(fmt.Sprintf("expected '\"' at start of label value, found %q", p.currentByte))
-		return nil
-	}
-	if p.readTokenAsLabelValue(); p.err != nil {
-		return nil
-	}
-	p.currentLabelPair.Value = proto.String(p.currentToken.String())
-	// Special treatment of summaries:
-	// - Quantile labels are special, will result in dto.Quantile later.
-	// - Other labels have to be added to currentLabels for signature calculation.
-	if p.currentMF.GetType() == dto.MetricType_SUMMARY {
-		if p.currentLabelPair.GetName() == model.QuantileLabel {
-			if p.currentQuantile, p.err = strconv.ParseFloat(p.currentLabelPair.GetValue(), 64); p.err != nil {
-				// Create a more helpful error message.
-				p.parseError(fmt.Sprintf("expected float as value for 'quantile' label, got %q", p.currentLabelPair.GetValue()))
-				return nil
-			}
-		} else {
-			p.currentLabels[p.currentLabelPair.GetName()] = p.currentLabelPair.GetValue()
-		}
-	}
-	// Similar special treatment of histograms.
-	if p.currentMF.GetType() == dto.MetricType_HISTOGRAM {
-		if p.currentLabelPair.GetName() == model.BucketLabel {
-			if p.currentBucket, p.err = strconv.ParseFloat(p.currentLabelPair.GetValue(), 64); p.err != nil {
-				// Create a more helpful error message.
-				p.parseError(fmt.Sprintf("expected float as value for 'le' label, got %q", p.currentLabelPair.GetValue()))
-				return nil
-			}
-		} else {
-			p.currentLabels[p.currentLabelPair.GetName()] = p.currentLabelPair.GetValue()
-		}
-	}
-	if p.skipBlankTab(); p.err != nil {
-		return nil // Unexpected end of input.
-	}
-	switch p.currentByte {
-	case ',':
-		return p.startLabelName
-
-	case '}':
-		if p.skipBlankTab(); p.err != nil {
-			return nil // Unexpected end of input.
-		}
-		return p.readingValue
-	default:
-		p.parseError(fmt.Sprintf("unexpected end of label value %q", p.currentLabelPair.Value))
-		return nil
-	}
-}
-
-// readingValue represents the state where the last byte read (now in
-// p.currentByte) is the first byte of the sample value (i.e. a float).
-func (p *Parser) readingValue() stateFn {
-	// When we are here, we have read all the labels, so for the
-	// special case of a summary/histogram, we can finally find out
-	// if the metric already exists.
-	if p.currentMF.GetType() == dto.MetricType_SUMMARY {
-		signature := model.LabelsToSignature(p.currentLabels)
-		if summary := p.summaries[signature]; summary != nil {
-			p.currentMetric = summary
-		} else {
-			p.summaries[signature] = p.currentMetric
-			p.currentMF.Metric = append(p.currentMF.Metric, p.currentMetric)
-		}
-	} else if p.currentMF.GetType() == dto.MetricType_HISTOGRAM {
-		signature := model.LabelsToSignature(p.currentLabels)
-		if histogram := p.histograms[signature]; histogram != nil {
-			p.currentMetric = histogram
-		} else {
-			p.histograms[signature] = p.currentMetric
-			p.currentMF.Metric = append(p.currentMF.Metric, p.currentMetric)
-		}
-	} else {
-		p.currentMF.Metric = append(p.currentMF.Metric, p.currentMetric)
-	}
-	if p.readTokenUntilWhitespace(); p.err != nil {
-		return nil // Unexpected end of input.
-	}
-	value, err := strconv.ParseFloat(p.currentToken.String(), 64)
-	if err != nil {
-		// Create a more helpful error message.
-		p.parseError(fmt.Sprintf("expected float as value, got %q", p.currentToken.String()))
-		return nil
-	}
-	switch p.currentMF.GetType() {
-	case dto.MetricType_COUNTER:
-		p.currentMetric.Counter = &dto.Counter{Value: proto.Float64(value)}
-	case dto.MetricType_GAUGE:
-		p.currentMetric.Gauge = &dto.Gauge{Value: proto.Float64(value)}
-	case dto.MetricType_UNTYPED:
-		p.currentMetric.Untyped = &dto.Untyped{Value: proto.Float64(value)}
-	case dto.MetricType_SUMMARY:
-		// *sigh*
-		if p.currentMetric.Summary == nil {
-			p.currentMetric.Summary = &dto.Summary{}
-		}
-		switch {
-		case p.currentIsSummaryCount:
-			p.currentMetric.Summary.SampleCount = proto.Uint64(uint64(value))
-		case p.currentIsSummarySum:
-			p.currentMetric.Summary.SampleSum = proto.Float64(value)
-		case !math.IsNaN(p.currentQuantile):
-			p.currentMetric.Summary.Quantile = append(
-				p.currentMetric.Summary.Quantile,
-				&dto.Quantile{
-					Quantile: proto.Float64(p.currentQuantile),
-					Value:    proto.Float64(value),
-				},
-			)
-		}
-	case dto.MetricType_HISTOGRAM:
-		// *sigh*
-		if p.currentMetric.Histogram == nil {
-			p.currentMetric.Histogram = &dto.Histogram{}
-		}
-		switch {
-		case p.currentIsHistogramCount:
-			p.currentMetric.Histogram.SampleCount = proto.Uint64(uint64(value))
-		case p.currentIsHistogramSum:
-			p.currentMetric.Histogram.SampleSum = proto.Float64(value)
-		case !math.IsNaN(p.currentBucket):
-			p.currentMetric.Histogram.Bucket = append(
-				p.currentMetric.Histogram.Bucket,
-				&dto.Bucket{
-					UpperBound:      proto.Float64(p.currentBucket),
-					CumulativeCount: proto.Uint64(uint64(value)),
-				},
-			)
-		}
-	default:
-		p.err = fmt.Errorf("unexpected type for metric name %q", p.currentMF.GetName())
-	}
-	if p.currentByte == '\n' {
-		return p.startOfLine
-	}
-	return p.startTimestamp
-}
-
-// startTimestamp represents the state where the next byte read from p.buf is
-// the start of the timestamp (or whitespace leading up to it).
-func (p *Parser) startTimestamp() stateFn {
-	if p.skipBlankTab(); p.err != nil {
-		return nil // Unexpected end of input.
-	}
-	if p.readTokenUntilWhitespace(); p.err != nil {
-		return nil // Unexpected end of input.
-	}
-	timestamp, err := strconv.ParseInt(p.currentToken.String(), 10, 64)
-	if err != nil {
-		// Create a more helpful error message.
-		p.parseError(fmt.Sprintf("expected integer as timestamp, got %q", p.currentToken.String()))
-		return nil
-	}
-	p.currentMetric.TimestampMs = proto.Int64(timestamp)
-	if p.readTokenUntilNewline(false); p.err != nil {
-		return nil // Unexpected end of input.
-	}
-	if p.currentToken.Len() > 0 {
-		p.parseError(fmt.Sprintf("spurious string after timestamp: %q", p.currentToken.String()))
-		return nil
-	}
-	return p.startOfLine
-}
-
-// readingHelp represents the state where the last byte read (now in
-// p.currentByte) is the first byte of the docstring after 'HELP'.
-func (p *Parser) readingHelp() stateFn {
-	if p.currentMF.Help != nil {
-		p.parseError(fmt.Sprintf("second HELP line for metric name %q", p.currentMF.GetName()))
-		return nil
-	}
-	// Rest of line is the docstring.
-	if p.readTokenUntilNewline(true); p.err != nil {
-		return nil // Unexpected end of input.
-	}
-	p.currentMF.Help = proto.String(p.currentToken.String())
-	return p.startOfLine
-}
-
-// readingType represents the state where the last byte read (now in
-// p.currentByte) is the first byte of the type hint after 'HELP'.
-func (p *Parser) readingType() stateFn {
-	if p.currentMF.Type != nil {
-		p.parseError(fmt.Sprintf("second TYPE line for metric name %q, or TYPE reported after samples", p.currentMF.GetName()))
-		return nil
-	}
-	// Rest of line is the type.
-	if p.readTokenUntilNewline(false); p.err != nil {
-		return nil // Unexpected end of input.
-	}
-	metricType, ok := dto.MetricType_value[strings.ToUpper(p.currentToken.String())]
-	if !ok {
-		p.parseError(fmt.Sprintf("unknown metric type %q", p.currentToken.String()))
-		return nil
-	}
-	p.currentMF.Type = dto.MetricType(metricType).Enum()
-	return p.startOfLine
-}
-
-// parseError sets p.err to a ParseError at the current line with the given
-// message.
-func (p *Parser) parseError(msg string) {
-	p.err = ParseError{
-		Line: p.lineCount,
-		Msg:  msg,
-	}
-}
-
-// skipBlankTab reads (and discards) bytes from p.buf until it encounters a byte
-// that is neither ' ' nor '\t'. That byte is left in p.currentByte.
-func (p *Parser) skipBlankTab() {
-	for {
-		if p.currentByte, p.err = p.buf.ReadByte(); p.err != nil || !isBlankOrTab(p.currentByte) {
-			return
-		}
-	}
-}
-
-// skipBlankTabIfCurrentBlankTab works exactly as skipBlankTab but doesn't do
-// anything if p.currentByte is neither ' ' nor '\t'.
-func (p *Parser) skipBlankTabIfCurrentBlankTab() {
-	if isBlankOrTab(p.currentByte) {
-		p.skipBlankTab()
-	}
-}
-
-// readTokenUntilWhitespace copies bytes from p.buf into p.currentToken.  The
-// first byte considered is the byte already read (now in p.currentByte).  The
-// first whitespace byte encountered is still copied into p.currentByte, but not
-// into p.currentToken.
-func (p *Parser) readTokenUntilWhitespace() {
-	p.currentToken.Reset()
-	for p.err == nil && !isBlankOrTab(p.currentByte) && p.currentByte != '\n' {
-		p.currentToken.WriteByte(p.currentByte)
-		p.currentByte, p.err = p.buf.ReadByte()
-	}
-}
-
-// readTokenUntilNewline copies bytes from p.buf into p.currentToken.  The first
-// byte considered is the byte already read (now in p.currentByte).  The first
-// newline byte encountered is still copied into p.currentByte, but not into
-// p.currentToken. If recognizeEscapeSequence is true, two escape sequences are
-// recognized: '\\' tranlates into '\', and '\n' into a line-feed character. All
-// other escape sequences are invalid and cause an error.
-func (p *Parser) readTokenUntilNewline(recognizeEscapeSequence bool) {
-	p.currentToken.Reset()
-	escaped := false
-	for p.err == nil {
-		if recognizeEscapeSequence && escaped {
-			switch p.currentByte {
-			case '\\':
-				p.currentToken.WriteByte(p.currentByte)
-			case 'n':
-				p.currentToken.WriteByte('\n')
-			default:
-				p.parseError(fmt.Sprintf("invalid escape sequence '\\%c'", p.currentByte))
-				return
-			}
-			escaped = false
-		} else {
-			switch p.currentByte {
-			case '\n':
-				return
-			case '\\':
-				escaped = true
-			default:
-				p.currentToken.WriteByte(p.currentByte)
-			}
-		}
-		p.currentByte, p.err = p.buf.ReadByte()
-	}
-}
-
-// readTokenAsMetricName copies a metric name from p.buf into p.currentToken.
-// The first byte considered is the byte already read (now in p.currentByte).
-// The first byte not part of a metric name is still copied into p.currentByte,
-// but not into p.currentToken.
-func (p *Parser) readTokenAsMetricName() {
-	p.currentToken.Reset()
-	if !isValidMetricNameStart(p.currentByte) {
-		return
-	}
-	for {
-		p.currentToken.WriteByte(p.currentByte)
-		p.currentByte, p.err = p.buf.ReadByte()
-		if p.err != nil || !isValidMetricNameContinuation(p.currentByte) {
-			return
-		}
-	}
-}
-
-// readTokenAsLabelName copies a label name from p.buf into p.currentToken.
-// The first byte considered is the byte already read (now in p.currentByte).
-// The first byte not part of a label name is still copied into p.currentByte,
-// but not into p.currentToken.
-func (p *Parser) readTokenAsLabelName() {
-	p.currentToken.Reset()
-	if !isValidLabelNameStart(p.currentByte) {
-		return
-	}
-	for {
-		p.currentToken.WriteByte(p.currentByte)
-		p.currentByte, p.err = p.buf.ReadByte()
-		if p.err != nil || !isValidLabelNameContinuation(p.currentByte) {
-			return
-		}
-	}
-}
-
-// readTokenAsLabelValue copies a label value from p.buf into p.currentToken.
-// In contrast to the other 'readTokenAs...' functions, which start with the
-// last read byte in p.currentByte, this method ignores p.currentByte and starts
-// with reading a new byte from p.buf. The first byte not part of a label value
-// is still copied into p.currentByte, but not into p.currentToken.
-func (p *Parser) readTokenAsLabelValue() {
-	p.currentToken.Reset()
-	escaped := false
-	for {
-		if p.currentByte, p.err = p.buf.ReadByte(); p.err != nil {
-			return
-		}
-		if escaped {
-			switch p.currentByte {
-			case '"', '\\':
-				p.currentToken.WriteByte(p.currentByte)
-			case 'n':
-				p.currentToken.WriteByte('\n')
-			default:
-				p.parseError(fmt.Sprintf("invalid escape sequence '\\%c'", p.currentByte))
-				return
-			}
-			escaped = false
-			continue
-		}
-		switch p.currentByte {
-		case '"':
-			return
-		case '\n':
-			p.parseError(fmt.Sprintf("label value %q contains unescaped new-line", p.currentToken.String()))
-			return
-		case '\\':
-			escaped = true
-		default:
-			p.currentToken.WriteByte(p.currentByte)
-		}
-	}
-}
-
-func (p *Parser) setOrCreateCurrentMF() {
-	p.currentIsSummaryCount = false
-	p.currentIsSummarySum = false
-	p.currentIsHistogramCount = false
-	p.currentIsHistogramSum = false
-	name := p.currentToken.String()
-	if p.currentMF = p.metricFamiliesByName[name]; p.currentMF != nil {
-		return
-	}
-	// Try out if this is a _sum or _count for a summary/histogram.
-	summaryName := summaryMetricName(name)
-	if p.currentMF = p.metricFamiliesByName[summaryName]; p.currentMF != nil {
-		if p.currentMF.GetType() == dto.MetricType_SUMMARY {
-			if isCount(name) {
-				p.currentIsSummaryCount = true
-			}
-			if isSum(name) {
-				p.currentIsSummarySum = true
-			}
-			return
-		}
-	}
-	histogramName := histogramMetricName(name)
-	if p.currentMF = p.metricFamiliesByName[histogramName]; p.currentMF != nil {
-		if p.currentMF.GetType() == dto.MetricType_HISTOGRAM {
-			if isCount(name) {
-				p.currentIsHistogramCount = true
-			}
-			if isSum(name) {
-				p.currentIsHistogramSum = true
-			}
-			return
-		}
-	}
-	p.currentMF = &dto.MetricFamily{Name: proto.String(name)}
-	p.metricFamiliesByName[name] = p.currentMF
-}
-
-func isValidLabelNameStart(b byte) bool {
-	return (b >= 'a' && b <= 'z') || (b >= 'A' && b <= 'Z') || b == '_'
-}
-
-func isValidLabelNameContinuation(b byte) bool {
-	return isValidLabelNameStart(b) || (b >= '0' && b <= '9')
-}
-
-func isValidMetricNameStart(b byte) bool {
-	return isValidLabelNameStart(b) || b == ':'
-}
-
-func isValidMetricNameContinuation(b byte) bool {
-	return isValidLabelNameContinuation(b) || b == ':'
-}
-
-func isBlankOrTab(b byte) bool {
-	return b == ' ' || b == '\t'
-}
-
-func isCount(name string) bool {
-	return len(name) > 6 && name[len(name)-6:] == "_count"
-}
-
-func isSum(name string) bool {
-	return len(name) > 4 && name[len(name)-4:] == "_sum"
-}
-
-func isBucket(name string) bool {
-	return len(name) > 7 && name[len(name)-7:] == "_bucket"
-}
-
-func summaryMetricName(name string) string {
-	switch {
-	case isCount(name):
-		return name[:len(name)-6]
-	case isSum(name):
-		return name[:len(name)-4]
-	default:
-		return name
-	}
-}
-
-func histogramMetricName(name string) string {
-	switch {
-	case isCount(name):
-		return name[:len(name)-6]
-	case isSum(name):
-		return name[:len(name)-4]
-	case isBucket(name):
-		return name[:len(name)-7]
-	default:
-		return name
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/text/parse_test.go b/Godeps/_workspace/src/github.com/prometheus/client_golang/text/parse_test.go
deleted file mode 100644
index cc3e6470f..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/client_golang/text/parse_test.go
+++ /dev/null
@@ -1,588 +0,0 @@
-// Copyright 2014 The Prometheus Authors
-// 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 text
-
-import (
-	"math"
-	"strings"
-	"testing"
-
-	"github.com/golang/protobuf/proto"
-	dto "github.com/prometheus/client_model/go"
-)
-
-var parser Parser
-
-func testParse(t testing.TB) {
-	var scenarios = []struct {
-		in  string
-		out []*dto.MetricFamily
-	}{
-		// 0: Empty lines as input.
-		{
-			in: `
-
-`,
-			out: []*dto.MetricFamily{},
-		},
-		// 1: Minimal case.
-		{
-			in: `
-minimal_metric 1.234
-another_metric -3e3 103948
-# Even that:
-no_labels{} 3
-# HELP line for non-existing metric will be ignored.
-`,
-			out: []*dto.MetricFamily{
-				&dto.MetricFamily{
-					Name: proto.String("minimal_metric"),
-					Type: dto.MetricType_UNTYPED.Enum(),
-					Metric: []*dto.Metric{
-						&dto.Metric{
-							Untyped: &dto.Untyped{
-								Value: proto.Float64(1.234),
-							},
-						},
-					},
-				},
-				&dto.MetricFamily{
-					Name: proto.String("another_metric"),
-					Type: dto.MetricType_UNTYPED.Enum(),
-					Metric: []*dto.Metric{
-						&dto.Metric{
-							Untyped: &dto.Untyped{
-								Value: proto.Float64(-3e3),
-							},
-							TimestampMs: proto.Int64(103948),
-						},
-					},
-				},
-				&dto.MetricFamily{
-					Name: proto.String("no_labels"),
-					Type: dto.MetricType_UNTYPED.Enum(),
-					Metric: []*dto.Metric{
-						&dto.Metric{
-							Untyped: &dto.Untyped{
-								Value: proto.Float64(3),
-							},
-						},
-					},
-				},
-			},
-		},
-		// 2: Counters & gauges, docstrings, various whitespace, escape sequences.
-		{
-			in: `
-# A normal comment.
-#
-# TYPE name counter
-name{labelname="val1",basename="basevalue"} NaN
-name {labelname="val2",basename="base\"v\\al\nue"} 0.23 1234567890
-# HELP name two-line\n doc  str\\ing
-
- # HELP  name2  	doc str"ing 2
-  #    TYPE    name2 gauge
-name2{labelname="val2"	,basename   =   "basevalue2"		} +Inf 54321
-name2{ labelname = "val1" , }-Inf
-`,
-			out: []*dto.MetricFamily{
-				&dto.MetricFamily{
-					Name: proto.String("name"),
-					Help: proto.String("two-line\n doc  str\\ing"),
-					Type: dto.MetricType_COUNTER.Enum(),
-					Metric: []*dto.Metric{
-						&dto.Metric{
-							Label: []*dto.LabelPair{
-								&dto.LabelPair{
-									Name:  proto.String("labelname"),
-									Value: proto.String("val1"),
-								},
-								&dto.LabelPair{
-									Name:  proto.String("basename"),
-									Value: proto.String("basevalue"),
-								},
-							},
-							Counter: &dto.Counter{
-								Value: proto.Float64(math.NaN()),
-							},
-						},
-						&dto.Metric{
-							Label: []*dto.LabelPair{
-								&dto.LabelPair{
-									Name:  proto.String("labelname"),
-									Value: proto.String("val2"),
-								},
-								&dto.LabelPair{
-									Name:  proto.String("basename"),
-									Value: proto.String("base\"v\\al\nue"),
-								},
-							},
-							Counter: &dto.Counter{
-								Value: proto.Float64(.23),
-							},
-							TimestampMs: proto.Int64(1234567890),
-						},
-					},
-				},
-				&dto.MetricFamily{
-					Name: proto.String("name2"),
-					Help: proto.String("doc str\"ing 2"),
-					Type: dto.MetricType_GAUGE.Enum(),
-					Metric: []*dto.Metric{
-						&dto.Metric{
-							Label: []*dto.LabelPair{
-								&dto.LabelPair{
-									Name:  proto.String("labelname"),
-									Value: proto.String("val2"),
-								},
-								&dto.LabelPair{
-									Name:  proto.String("basename"),
-									Value: proto.String("basevalue2"),
-								},
-							},
-							Gauge: &dto.Gauge{
-								Value: proto.Float64(math.Inf(+1)),
-							},
-							TimestampMs: proto.Int64(54321),
-						},
-						&dto.Metric{
-							Label: []*dto.LabelPair{
-								&dto.LabelPair{
-									Name:  proto.String("labelname"),
-									Value: proto.String("val1"),
-								},
-							},
-							Gauge: &dto.Gauge{
-								Value: proto.Float64(math.Inf(-1)),
-							},
-						},
-					},
-				},
-			},
-		},
-		// 3: The evil summary, mixed with other types and funny comments.
-		{
-			in: `
-# TYPE my_summary summary
-my_summary{n1="val1",quantile="0.5"} 110
-decoy -1 -2
-my_summary{n1="val1",quantile="0.9"} 140 1
-my_summary_count{n1="val1"} 42
-# Latest timestamp wins in case of a summary.
-my_summary_sum{n1="val1"} 4711 2
-fake_sum{n1="val1"} 2001
-# TYPE another_summary summary
-another_summary_count{n2="val2",n1="val1"} 20
-my_summary_count{n2="val2",n1="val1"} 5 5
-another_summary{n1="val1",n2="val2",quantile=".3"} -1.2
-my_summary_sum{n1="val2"} 08 15
-my_summary{n1="val3", quantile="0.2"} 4711
-  my_summary{n1="val1",n2="val2",quantile="-12.34",} NaN
-# some
-# funny comments
-# HELP 
-# HELP
-# HELP my_summary
-# HELP my_summary 
-`,
-			out: []*dto.MetricFamily{
-				&dto.MetricFamily{
-					Name: proto.String("fake_sum"),
-					Type: dto.MetricType_UNTYPED.Enum(),
-					Metric: []*dto.Metric{
-						&dto.Metric{
-							Label: []*dto.LabelPair{
-								&dto.LabelPair{
-									Name:  proto.String("n1"),
-									Value: proto.String("val1"),
-								},
-							},
-							Untyped: &dto.Untyped{
-								Value: proto.Float64(2001),
-							},
-						},
-					},
-				},
-				&dto.MetricFamily{
-					Name: proto.String("decoy"),
-					Type: dto.MetricType_UNTYPED.Enum(),
-					Metric: []*dto.Metric{
-						&dto.Metric{
-							Untyped: &dto.Untyped{
-								Value: proto.Float64(-1),
-							},
-							TimestampMs: proto.Int64(-2),
-						},
-					},
-				},
-				&dto.MetricFamily{
-					Name: proto.String("my_summary"),
-					Type: dto.MetricType_SUMMARY.Enum(),
-					Metric: []*dto.Metric{
-						&dto.Metric{
-							Label: []*dto.LabelPair{
-								&dto.LabelPair{
-									Name:  proto.String("n1"),
-									Value: proto.String("val1"),
-								},
-							},
-							Summary: &dto.Summary{
-								SampleCount: proto.Uint64(42),
-								SampleSum:   proto.Float64(4711),
-								Quantile: []*dto.Quantile{
-									&dto.Quantile{
-										Quantile: proto.Float64(0.5),
-										Value:    proto.Float64(110),
-									},
-									&dto.Quantile{
-										Quantile: proto.Float64(0.9),
-										Value:    proto.Float64(140),
-									},
-								},
-							},
-							TimestampMs: proto.Int64(2),
-						},
-						&dto.Metric{
-							Label: []*dto.LabelPair{
-								&dto.LabelPair{
-									Name:  proto.String("n2"),
-									Value: proto.String("val2"),
-								},
-								&dto.LabelPair{
-									Name:  proto.String("n1"),
-									Value: proto.String("val1"),
-								},
-							},
-							Summary: &dto.Summary{
-								SampleCount: proto.Uint64(5),
-								Quantile: []*dto.Quantile{
-									&dto.Quantile{
-										Quantile: proto.Float64(-12.34),
-										Value:    proto.Float64(math.NaN()),
-									},
-								},
-							},
-							TimestampMs: proto.Int64(5),
-						},
-						&dto.Metric{
-							Label: []*dto.LabelPair{
-								&dto.LabelPair{
-									Name:  proto.String("n1"),
-									Value: proto.String("val2"),
-								},
-							},
-							Summary: &dto.Summary{
-								SampleSum: proto.Float64(8),
-							},
-							TimestampMs: proto.Int64(15),
-						},
-						&dto.Metric{
-							Label: []*dto.LabelPair{
-								&dto.LabelPair{
-									Name:  proto.String("n1"),
-									Value: proto.String("val3"),
-								},
-							},
-							Summary: &dto.Summary{
-								Quantile: []*dto.Quantile{
-									&dto.Quantile{
-										Quantile: proto.Float64(0.2),
-										Value:    proto.Float64(4711),
-									},
-								},
-							},
-						},
-					},
-				},
-				&dto.MetricFamily{
-					Name: proto.String("another_summary"),
-					Type: dto.MetricType_SUMMARY.Enum(),
-					Metric: []*dto.Metric{
-						&dto.Metric{
-							Label: []*dto.LabelPair{
-								&dto.LabelPair{
-									Name:  proto.String("n2"),
-									Value: proto.String("val2"),
-								},
-								&dto.LabelPair{
-									Name:  proto.String("n1"),
-									Value: proto.String("val1"),
-								},
-							},
-							Summary: &dto.Summary{
-								SampleCount: proto.Uint64(20),
-								Quantile: []*dto.Quantile{
-									&dto.Quantile{
-										Quantile: proto.Float64(0.3),
-										Value:    proto.Float64(-1.2),
-									},
-								},
-							},
-						},
-					},
-				},
-			},
-		},
-		// 4: The histogram.
-		{
-			in: `
-# HELP request_duration_microseconds The response latency.
-# TYPE request_duration_microseconds histogram
-request_duration_microseconds_bucket{le="100"} 123
-request_duration_microseconds_bucket{le="120"} 412
-request_duration_microseconds_bucket{le="144"} 592
-request_duration_microseconds_bucket{le="172.8"} 1524
-request_duration_microseconds_bucket{le="+Inf"} 2693
-request_duration_microseconds_sum 1.7560473e+06
-request_duration_microseconds_count 2693
-`,
-			out: []*dto.MetricFamily{
-				{
-					Name: proto.String("request_duration_microseconds"),
-					Help: proto.String("The response latency."),
-					Type: dto.MetricType_HISTOGRAM.Enum(),
-					Metric: []*dto.Metric{
-						&dto.Metric{
-							Histogram: &dto.Histogram{
-								SampleCount: proto.Uint64(2693),
-								SampleSum:   proto.Float64(1756047.3),
-								Bucket: []*dto.Bucket{
-									&dto.Bucket{
-										UpperBound:      proto.Float64(100),
-										CumulativeCount: proto.Uint64(123),
-									},
-									&dto.Bucket{
-										UpperBound:      proto.Float64(120),
-										CumulativeCount: proto.Uint64(412),
-									},
-									&dto.Bucket{
-										UpperBound:      proto.Float64(144),
-										CumulativeCount: proto.Uint64(592),
-									},
-									&dto.Bucket{
-										UpperBound:      proto.Float64(172.8),
-										CumulativeCount: proto.Uint64(1524),
-									},
-									&dto.Bucket{
-										UpperBound:      proto.Float64(math.Inf(+1)),
-										CumulativeCount: proto.Uint64(2693),
-									},
-								},
-							},
-						},
-					},
-				},
-			},
-		},
-	}
-
-	for i, scenario := range scenarios {
-		out, err := parser.TextToMetricFamilies(strings.NewReader(scenario.in))
-		if err != nil {
-			t.Errorf("%d. error: %s", i, err)
-			continue
-		}
-		if expected, got := len(scenario.out), len(out); expected != got {
-			t.Errorf(
-				"%d. expected %d MetricFamilies, got %d",
-				i, expected, got,
-			)
-		}
-		for _, expected := range scenario.out {
-			got, ok := out[expected.GetName()]
-			if !ok {
-				t.Errorf(
-					"%d. expected MetricFamily %q, found none",
-					i, expected.GetName(),
-				)
-				continue
-			}
-			if expected.String() != got.String() {
-				t.Errorf(
-					"%d. expected MetricFamily %s, got %s",
-					i, expected, got,
-				)
-			}
-		}
-	}
-}
-
-func TestParse(t *testing.T) {
-	testParse(t)
-}
-
-func BenchmarkParse(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		testParse(b)
-	}
-}
-
-func testParseError(t testing.TB) {
-	var scenarios = []struct {
-		in  string
-		err string
-	}{
-		// 0: No new-line at end of input.
-		{
-			in:  `bla 3.14`,
-			err: "EOF",
-		},
-		// 1: Invalid escape sequence in label value.
-		{
-			in:  `metric{label="\t"} 3.14`,
-			err: "text format parsing error in line 1: invalid escape sequence",
-		},
-		// 2: Newline in label value.
-		{
-			in: `
-metric{label="new
-line"} 3.14
-`,
-			err: `text format parsing error in line 2: label value "new" contains unescaped new-line`,
-		},
-		// 3:
-		{
-			in:  `metric{@="bla"} 3.14`,
-			err: "text format parsing error in line 1: invalid label name for metric",
-		},
-		// 4:
-		{
-			in:  `metric{__name__="bla"} 3.14`,
-			err: `text format parsing error in line 1: label name "__name__" is reserved`,
-		},
-		// 5:
-		{
-			in:  `metric{label+="bla"} 3.14`,
-			err: "text format parsing error in line 1: expected '=' after label name",
-		},
-		// 6:
-		{
-			in:  `metric{label=bla} 3.14`,
-			err: "text format parsing error in line 1: expected '\"' at start of label value",
-		},
-		// 7:
-		{
-			in: `
-# TYPE metric summary
-metric{quantile="bla"} 3.14
-`,
-			err: "text format parsing error in line 3: expected float as value for 'quantile' label",
-		},
-		// 8:
-		{
-			in:  `metric{label="bla"+} 3.14`,
-			err: "text format parsing error in line 1: unexpected end of label value",
-		},
-		// 9:
-		{
-			in: `metric{label="bla"} 3.14 2.72
-`,
-			err: "text format parsing error in line 1: expected integer as timestamp",
-		},
-		// 10:
-		{
-			in: `metric{label="bla"} 3.14 2 3
-`,
-			err: "text format parsing error in line 1: spurious string after timestamp",
-		},
-		// 11:
-		{
-			in: `metric{label="bla"} blubb
-`,
-			err: "text format parsing error in line 1: expected float as value",
-		},
-		// 12:
-		{
-			in: `
-# HELP metric one
-# HELP metric two
-`,
-			err: "text format parsing error in line 3: second HELP line for metric name",
-		},
-		// 13:
-		{
-			in: `
-# TYPE metric counter
-# TYPE metric untyped
-`,
-			err: `text format parsing error in line 3: second TYPE line for metric name "metric", or TYPE reported after samples`,
-		},
-		// 14:
-		{
-			in: `
-metric 4.12
-# TYPE metric counter
-`,
-			err: `text format parsing error in line 3: second TYPE line for metric name "metric", or TYPE reported after samples`,
-		},
-		// 14:
-		{
-			in: `
-# TYPE metric bla
-`,
-			err: "text format parsing error in line 2: unknown metric type",
-		},
-		// 15:
-		{
-			in: `
-# TYPE met-ric
-`,
-			err: "text format parsing error in line 2: invalid metric name in comment",
-		},
-		// 16:
-		{
-			in:  `@invalidmetric{label="bla"} 3.14 2`,
-			err: "text format parsing error in line 1: invalid metric name",
-		},
-		// 17:
-		{
-			in:  `{label="bla"} 3.14 2`,
-			err: "text format parsing error in line 1: invalid metric name",
-		},
-		// 18:
-		{
-			in: `
-# TYPE metric histogram
-metric_bucket{le="bla"} 3.14
-`,
-			err: "text format parsing error in line 3: expected float as value for 'le' label",
-		},
-	}
-
-	for i, scenario := range scenarios {
-		_, err := parser.TextToMetricFamilies(strings.NewReader(scenario.in))
-		if err == nil {
-			t.Errorf("%d. expected error, got nil", i)
-			continue
-		}
-		if expected, got := scenario.err, err.Error(); strings.Index(got, expected) != 0 {
-			t.Errorf(
-				"%d. expected error starting with %q, got %q",
-				i, expected, got,
-			)
-		}
-	}
-
-}
-
-func TestParseError(t *testing.T) {
-	testParseError(t)
-}
-
-func BenchmarkParseError(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		testParseError(b)
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/text/proto.go b/Godeps/_workspace/src/github.com/prometheus/client_golang/text/proto.go
deleted file mode 100644
index e82bbb3b4..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/client_golang/text/proto.go
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2014 The Prometheus Authors
-// 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 text
-
-import (
-	"fmt"
-	"io"
-
-	"github.com/golang/protobuf/proto"
-	"github.com/matttproud/golang_protobuf_extensions/pbutil"
-
-	dto "github.com/prometheus/client_model/go"
-)
-
-// WriteProtoDelimited writes the MetricFamily to the writer in delimited
-// protobuf format and returns the number of bytes written and any error
-// encountered.
-func WriteProtoDelimited(w io.Writer, p *dto.MetricFamily) (int, error) {
-	return pbutil.WriteDelimited(w, p)
-}
-
-// WriteProtoText writes the MetricFamily to the writer in text format and
-// returns the number of bytes written and any error encountered.
-func WriteProtoText(w io.Writer, p *dto.MetricFamily) (int, error) {
-	return fmt.Fprintf(w, "%s\n", proto.MarshalTextString(p))
-}
-
-// WriteProtoCompactText writes the MetricFamily to the writer in compact text
-// format and returns the number of bytes written and any error encountered.
-func WriteProtoCompactText(w io.Writer, p *dto.MetricFamily) (int, error) {
-	return fmt.Fprintf(w, "%s\n", p)
-}
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/text/testdata/protobuf b/Godeps/_workspace/src/github.com/prometheus/client_golang/text/testdata/protobuf
deleted file mode 100644
index df4825639..000000000
Binary files a/Godeps/_workspace/src/github.com/prometheus/client_golang/text/testdata/protobuf and /dev/null differ
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/text/testdata/protobuf.gz b/Godeps/_workspace/src/github.com/prometheus/client_golang/text/testdata/protobuf.gz
deleted file mode 100644
index 2c8704d69..000000000
Binary files a/Godeps/_workspace/src/github.com/prometheus/client_golang/text/testdata/protobuf.gz and /dev/null differ
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/text/testdata/text b/Godeps/_workspace/src/github.com/prometheus/client_golang/text/testdata/text
deleted file mode 100644
index f3d8c3784..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/client_golang/text/testdata/text
+++ /dev/null
@@ -1,322 +0,0 @@
-# HELP http_request_duration_microseconds The HTTP request latencies in microseconds.
-# TYPE http_request_duration_microseconds summary
-http_request_duration_microseconds{handler="/",quantile="0.5"} 0
-http_request_duration_microseconds{handler="/",quantile="0.9"} 0
-http_request_duration_microseconds{handler="/",quantile="0.99"} 0
-http_request_duration_microseconds_sum{handler="/"} 0
-http_request_duration_microseconds_count{handler="/"} 0
-http_request_duration_microseconds{handler="/alerts",quantile="0.5"} 0
-http_request_duration_microseconds{handler="/alerts",quantile="0.9"} 0
-http_request_duration_microseconds{handler="/alerts",quantile="0.99"} 0
-http_request_duration_microseconds_sum{handler="/alerts"} 0
-http_request_duration_microseconds_count{handler="/alerts"} 0
-http_request_duration_microseconds{handler="/api/metrics",quantile="0.5"} 0
-http_request_duration_microseconds{handler="/api/metrics",quantile="0.9"} 0
-http_request_duration_microseconds{handler="/api/metrics",quantile="0.99"} 0
-http_request_duration_microseconds_sum{handler="/api/metrics"} 0
-http_request_duration_microseconds_count{handler="/api/metrics"} 0
-http_request_duration_microseconds{handler="/api/query",quantile="0.5"} 0
-http_request_duration_microseconds{handler="/api/query",quantile="0.9"} 0
-http_request_duration_microseconds{handler="/api/query",quantile="0.99"} 0
-http_request_duration_microseconds_sum{handler="/api/query"} 0
-http_request_duration_microseconds_count{handler="/api/query"} 0
-http_request_duration_microseconds{handler="/api/query_range",quantile="0.5"} 0
-http_request_duration_microseconds{handler="/api/query_range",quantile="0.9"} 0
-http_request_duration_microseconds{handler="/api/query_range",quantile="0.99"} 0
-http_request_duration_microseconds_sum{handler="/api/query_range"} 0
-http_request_duration_microseconds_count{handler="/api/query_range"} 0
-http_request_duration_microseconds{handler="/api/targets",quantile="0.5"} 0
-http_request_duration_microseconds{handler="/api/targets",quantile="0.9"} 0
-http_request_duration_microseconds{handler="/api/targets",quantile="0.99"} 0
-http_request_duration_microseconds_sum{handler="/api/targets"} 0
-http_request_duration_microseconds_count{handler="/api/targets"} 0
-http_request_duration_microseconds{handler="/consoles/",quantile="0.5"} 0
-http_request_duration_microseconds{handler="/consoles/",quantile="0.9"} 0
-http_request_duration_microseconds{handler="/consoles/",quantile="0.99"} 0
-http_request_duration_microseconds_sum{handler="/consoles/"} 0
-http_request_duration_microseconds_count{handler="/consoles/"} 0
-http_request_duration_microseconds{handler="/graph",quantile="0.5"} 0
-http_request_duration_microseconds{handler="/graph",quantile="0.9"} 0
-http_request_duration_microseconds{handler="/graph",quantile="0.99"} 0
-http_request_duration_microseconds_sum{handler="/graph"} 0
-http_request_duration_microseconds_count{handler="/graph"} 0
-http_request_duration_microseconds{handler="/heap",quantile="0.5"} 0
-http_request_duration_microseconds{handler="/heap",quantile="0.9"} 0
-http_request_duration_microseconds{handler="/heap",quantile="0.99"} 0
-http_request_duration_microseconds_sum{handler="/heap"} 0
-http_request_duration_microseconds_count{handler="/heap"} 0
-http_request_duration_microseconds{handler="/static/",quantile="0.5"} 0
-http_request_duration_microseconds{handler="/static/",quantile="0.9"} 0
-http_request_duration_microseconds{handler="/static/",quantile="0.99"} 0
-http_request_duration_microseconds_sum{handler="/static/"} 0
-http_request_duration_microseconds_count{handler="/static/"} 0
-http_request_duration_microseconds{handler="prometheus",quantile="0.5"} 1307.275
-http_request_duration_microseconds{handler="prometheus",quantile="0.9"} 1858.632
-http_request_duration_microseconds{handler="prometheus",quantile="0.99"} 3087.384
-http_request_duration_microseconds_sum{handler="prometheus"} 179886.5000000001
-http_request_duration_microseconds_count{handler="prometheus"} 119
-# HELP http_request_size_bytes The HTTP request sizes in bytes.
-# TYPE http_request_size_bytes summary
-http_request_size_bytes{handler="/",quantile="0.5"} 0
-http_request_size_bytes{handler="/",quantile="0.9"} 0
-http_request_size_bytes{handler="/",quantile="0.99"} 0
-http_request_size_bytes_sum{handler="/"} 0
-http_request_size_bytes_count{handler="/"} 0
-http_request_size_bytes{handler="/alerts",quantile="0.5"} 0
-http_request_size_bytes{handler="/alerts",quantile="0.9"} 0
-http_request_size_bytes{handler="/alerts",quantile="0.99"} 0
-http_request_size_bytes_sum{handler="/alerts"} 0
-http_request_size_bytes_count{handler="/alerts"} 0
-http_request_size_bytes{handler="/api/metrics",quantile="0.5"} 0
-http_request_size_bytes{handler="/api/metrics",quantile="0.9"} 0
-http_request_size_bytes{handler="/api/metrics",quantile="0.99"} 0
-http_request_size_bytes_sum{handler="/api/metrics"} 0
-http_request_size_bytes_count{handler="/api/metrics"} 0
-http_request_size_bytes{handler="/api/query",quantile="0.5"} 0
-http_request_size_bytes{handler="/api/query",quantile="0.9"} 0
-http_request_size_bytes{handler="/api/query",quantile="0.99"} 0
-http_request_size_bytes_sum{handler="/api/query"} 0
-http_request_size_bytes_count{handler="/api/query"} 0
-http_request_size_bytes{handler="/api/query_range",quantile="0.5"} 0
-http_request_size_bytes{handler="/api/query_range",quantile="0.9"} 0
-http_request_size_bytes{handler="/api/query_range",quantile="0.99"} 0
-http_request_size_bytes_sum{handler="/api/query_range"} 0
-http_request_size_bytes_count{handler="/api/query_range"} 0
-http_request_size_bytes{handler="/api/targets",quantile="0.5"} 0
-http_request_size_bytes{handler="/api/targets",quantile="0.9"} 0
-http_request_size_bytes{handler="/api/targets",quantile="0.99"} 0
-http_request_size_bytes_sum{handler="/api/targets"} 0
-http_request_size_bytes_count{handler="/api/targets"} 0
-http_request_size_bytes{handler="/consoles/",quantile="0.5"} 0
-http_request_size_bytes{handler="/consoles/",quantile="0.9"} 0
-http_request_size_bytes{handler="/consoles/",quantile="0.99"} 0
-http_request_size_bytes_sum{handler="/consoles/"} 0
-http_request_size_bytes_count{handler="/consoles/"} 0
-http_request_size_bytes{handler="/graph",quantile="0.5"} 0
-http_request_size_bytes{handler="/graph",quantile="0.9"} 0
-http_request_size_bytes{handler="/graph",quantile="0.99"} 0
-http_request_size_bytes_sum{handler="/graph"} 0
-http_request_size_bytes_count{handler="/graph"} 0
-http_request_size_bytes{handler="/heap",quantile="0.5"} 0
-http_request_size_bytes{handler="/heap",quantile="0.9"} 0
-http_request_size_bytes{handler="/heap",quantile="0.99"} 0
-http_request_size_bytes_sum{handler="/heap"} 0
-http_request_size_bytes_count{handler="/heap"} 0
-http_request_size_bytes{handler="/static/",quantile="0.5"} 0
-http_request_size_bytes{handler="/static/",quantile="0.9"} 0
-http_request_size_bytes{handler="/static/",quantile="0.99"} 0
-http_request_size_bytes_sum{handler="/static/"} 0
-http_request_size_bytes_count{handler="/static/"} 0
-http_request_size_bytes{handler="prometheus",quantile="0.5"} 291
-http_request_size_bytes{handler="prometheus",quantile="0.9"} 291
-http_request_size_bytes{handler="prometheus",quantile="0.99"} 291
-http_request_size_bytes_sum{handler="prometheus"} 34488
-http_request_size_bytes_count{handler="prometheus"} 119
-# HELP http_requests_total Total number of HTTP requests made.
-# TYPE http_requests_total counter
-http_requests_total{code="200",handler="prometheus",method="get"} 119
-# HELP http_response_size_bytes The HTTP response sizes in bytes.
-# TYPE http_response_size_bytes summary
-http_response_size_bytes{handler="/",quantile="0.5"} 0
-http_response_size_bytes{handler="/",quantile="0.9"} 0
-http_response_size_bytes{handler="/",quantile="0.99"} 0
-http_response_size_bytes_sum{handler="/"} 0
-http_response_size_bytes_count{handler="/"} 0
-http_response_size_bytes{handler="/alerts",quantile="0.5"} 0
-http_response_size_bytes{handler="/alerts",quantile="0.9"} 0
-http_response_size_bytes{handler="/alerts",quantile="0.99"} 0
-http_response_size_bytes_sum{handler="/alerts"} 0
-http_response_size_bytes_count{handler="/alerts"} 0
-http_response_size_bytes{handler="/api/metrics",quantile="0.5"} 0
-http_response_size_bytes{handler="/api/metrics",quantile="0.9"} 0
-http_response_size_bytes{handler="/api/metrics",quantile="0.99"} 0
-http_response_size_bytes_sum{handler="/api/metrics"} 0
-http_response_size_bytes_count{handler="/api/metrics"} 0
-http_response_size_bytes{handler="/api/query",quantile="0.5"} 0
-http_response_size_bytes{handler="/api/query",quantile="0.9"} 0
-http_response_size_bytes{handler="/api/query",quantile="0.99"} 0
-http_response_size_bytes_sum{handler="/api/query"} 0
-http_response_size_bytes_count{handler="/api/query"} 0
-http_response_size_bytes{handler="/api/query_range",quantile="0.5"} 0
-http_response_size_bytes{handler="/api/query_range",quantile="0.9"} 0
-http_response_size_bytes{handler="/api/query_range",quantile="0.99"} 0
-http_response_size_bytes_sum{handler="/api/query_range"} 0
-http_response_size_bytes_count{handler="/api/query_range"} 0
-http_response_size_bytes{handler="/api/targets",quantile="0.5"} 0
-http_response_size_bytes{handler="/api/targets",quantile="0.9"} 0
-http_response_size_bytes{handler="/api/targets",quantile="0.99"} 0
-http_response_size_bytes_sum{handler="/api/targets"} 0
-http_response_size_bytes_count{handler="/api/targets"} 0
-http_response_size_bytes{handler="/consoles/",quantile="0.5"} 0
-http_response_size_bytes{handler="/consoles/",quantile="0.9"} 0
-http_response_size_bytes{handler="/consoles/",quantile="0.99"} 0
-http_response_size_bytes_sum{handler="/consoles/"} 0
-http_response_size_bytes_count{handler="/consoles/"} 0
-http_response_size_bytes{handler="/graph",quantile="0.5"} 0
-http_response_size_bytes{handler="/graph",quantile="0.9"} 0
-http_response_size_bytes{handler="/graph",quantile="0.99"} 0
-http_response_size_bytes_sum{handler="/graph"} 0
-http_response_size_bytes_count{handler="/graph"} 0
-http_response_size_bytes{handler="/heap",quantile="0.5"} 0
-http_response_size_bytes{handler="/heap",quantile="0.9"} 0
-http_response_size_bytes{handler="/heap",quantile="0.99"} 0
-http_response_size_bytes_sum{handler="/heap"} 0
-http_response_size_bytes_count{handler="/heap"} 0
-http_response_size_bytes{handler="/static/",quantile="0.5"} 0
-http_response_size_bytes{handler="/static/",quantile="0.9"} 0
-http_response_size_bytes{handler="/static/",quantile="0.99"} 0
-http_response_size_bytes_sum{handler="/static/"} 0
-http_response_size_bytes_count{handler="/static/"} 0
-http_response_size_bytes{handler="prometheus",quantile="0.5"} 2049
-http_response_size_bytes{handler="prometheus",quantile="0.9"} 2058
-http_response_size_bytes{handler="prometheus",quantile="0.99"} 2064
-http_response_size_bytes_sum{handler="prometheus"} 247001
-http_response_size_bytes_count{handler="prometheus"} 119
-# HELP process_cpu_seconds_total Total user and system CPU time spent in seconds.
-# TYPE process_cpu_seconds_total counter
-process_cpu_seconds_total 0.55
-# HELP go_goroutines Number of goroutines that currently exist.
-# TYPE go_goroutines gauge
-go_goroutines 70
-# HELP process_max_fds Maximum number of open file descriptors.
-# TYPE process_max_fds gauge
-process_max_fds 8192
-# HELP process_open_fds Number of open file descriptors.
-# TYPE process_open_fds gauge
-process_open_fds 29
-# HELP process_resident_memory_bytes Resident memory size in bytes.
-# TYPE process_resident_memory_bytes gauge
-process_resident_memory_bytes 5.3870592e+07
-# HELP process_start_time_seconds Start time of the process since unix epoch in seconds.
-# TYPE process_start_time_seconds gauge
-process_start_time_seconds 1.42236894836e+09
-# HELP process_virtual_memory_bytes Virtual memory size in bytes.
-# TYPE process_virtual_memory_bytes gauge
-process_virtual_memory_bytes 5.41478912e+08
-# HELP prometheus_dns_sd_lookup_failures_total The number of DNS-SD lookup failures.
-# TYPE prometheus_dns_sd_lookup_failures_total counter
-prometheus_dns_sd_lookup_failures_total 0
-# HELP prometheus_dns_sd_lookups_total The number of DNS-SD lookups.
-# TYPE prometheus_dns_sd_lookups_total counter
-prometheus_dns_sd_lookups_total 7
-# HELP prometheus_evaluator_duration_milliseconds The duration for all evaluations to execute.
-# TYPE prometheus_evaluator_duration_milliseconds summary
-prometheus_evaluator_duration_milliseconds{quantile="0.01"} 0
-prometheus_evaluator_duration_milliseconds{quantile="0.05"} 0
-prometheus_evaluator_duration_milliseconds{quantile="0.5"} 0
-prometheus_evaluator_duration_milliseconds{quantile="0.9"} 1
-prometheus_evaluator_duration_milliseconds{quantile="0.99"} 1
-prometheus_evaluator_duration_milliseconds_sum 12
-prometheus_evaluator_duration_milliseconds_count 23
-# HELP prometheus_local_storage_checkpoint_duration_milliseconds The duration (in milliseconds) it took to checkpoint in-memory metrics and head chunks.
-# TYPE prometheus_local_storage_checkpoint_duration_milliseconds gauge
-prometheus_local_storage_checkpoint_duration_milliseconds 0
-# HELP prometheus_local_storage_chunk_ops_total The total number of chunk operations by their type.
-# TYPE prometheus_local_storage_chunk_ops_total counter
-prometheus_local_storage_chunk_ops_total{type="create"} 598
-prometheus_local_storage_chunk_ops_total{type="persist"} 174
-prometheus_local_storage_chunk_ops_total{type="pin"} 920
-prometheus_local_storage_chunk_ops_total{type="transcode"} 415
-prometheus_local_storage_chunk_ops_total{type="unpin"} 920
-# HELP prometheus_local_storage_indexing_batch_latency_milliseconds Quantiles for batch indexing latencies in milliseconds.
-# TYPE prometheus_local_storage_indexing_batch_latency_milliseconds summary
-prometheus_local_storage_indexing_batch_latency_milliseconds{quantile="0.5"} 0
-prometheus_local_storage_indexing_batch_latency_milliseconds{quantile="0.9"} 0
-prometheus_local_storage_indexing_batch_latency_milliseconds{quantile="0.99"} 0
-prometheus_local_storage_indexing_batch_latency_milliseconds_sum 0
-prometheus_local_storage_indexing_batch_latency_milliseconds_count 1
-# HELP prometheus_local_storage_indexing_batch_sizes Quantiles for indexing batch sizes (number of metrics per batch).
-# TYPE prometheus_local_storage_indexing_batch_sizes summary
-prometheus_local_storage_indexing_batch_sizes{quantile="0.5"} 2
-prometheus_local_storage_indexing_batch_sizes{quantile="0.9"} 2
-prometheus_local_storage_indexing_batch_sizes{quantile="0.99"} 2
-prometheus_local_storage_indexing_batch_sizes_sum 2
-prometheus_local_storage_indexing_batch_sizes_count 1
-# HELP prometheus_local_storage_indexing_queue_capacity The capacity of the indexing queue.
-# TYPE prometheus_local_storage_indexing_queue_capacity gauge
-prometheus_local_storage_indexing_queue_capacity 16384
-# HELP prometheus_local_storage_indexing_queue_length The number of metrics waiting to be indexed.
-# TYPE prometheus_local_storage_indexing_queue_length gauge
-prometheus_local_storage_indexing_queue_length 0
-# HELP prometheus_local_storage_ingested_samples_total The total number of samples ingested.
-# TYPE prometheus_local_storage_ingested_samples_total counter
-prometheus_local_storage_ingested_samples_total 30473
-# HELP prometheus_local_storage_invalid_preload_requests_total The total number of preload requests referring to a non-existent series. This is an indication of outdated label indexes.
-# TYPE prometheus_local_storage_invalid_preload_requests_total counter
-prometheus_local_storage_invalid_preload_requests_total 0
-# HELP prometheus_local_storage_memory_chunkdescs The current number of chunk descriptors in memory.
-# TYPE prometheus_local_storage_memory_chunkdescs gauge
-prometheus_local_storage_memory_chunkdescs 1059
-# HELP prometheus_local_storage_memory_chunks The current number of chunks in memory, excluding cloned chunks (i.e. chunks without a descriptor).
-# TYPE prometheus_local_storage_memory_chunks gauge
-prometheus_local_storage_memory_chunks 1020
-# HELP prometheus_local_storage_memory_series The current number of series in memory.
-# TYPE prometheus_local_storage_memory_series gauge
-prometheus_local_storage_memory_series 424
-# HELP prometheus_local_storage_persist_latency_microseconds A summary of latencies for persisting each chunk.
-# TYPE prometheus_local_storage_persist_latency_microseconds summary
-prometheus_local_storage_persist_latency_microseconds{quantile="0.5"} 30.377
-prometheus_local_storage_persist_latency_microseconds{quantile="0.9"} 203.539
-prometheus_local_storage_persist_latency_microseconds{quantile="0.99"} 2626.463
-prometheus_local_storage_persist_latency_microseconds_sum 20424.415
-prometheus_local_storage_persist_latency_microseconds_count 174
-# HELP prometheus_local_storage_persist_queue_capacity The total capacity of the persist queue.
-# TYPE prometheus_local_storage_persist_queue_capacity gauge
-prometheus_local_storage_persist_queue_capacity 1024
-# HELP prometheus_local_storage_persist_queue_length The current number of chunks waiting in the persist queue.
-# TYPE prometheus_local_storage_persist_queue_length gauge
-prometheus_local_storage_persist_queue_length 0
-# HELP prometheus_local_storage_series_ops_total The total number of series operations by their type.
-# TYPE prometheus_local_storage_series_ops_total counter
-prometheus_local_storage_series_ops_total{type="create"} 2
-prometheus_local_storage_series_ops_total{type="maintenance_in_memory"} 11
-# HELP prometheus_notifications_latency_milliseconds Latency quantiles for sending alert notifications (not including dropped notifications).
-# TYPE prometheus_notifications_latency_milliseconds summary
-prometheus_notifications_latency_milliseconds{quantile="0.5"} 0
-prometheus_notifications_latency_milliseconds{quantile="0.9"} 0
-prometheus_notifications_latency_milliseconds{quantile="0.99"} 0
-prometheus_notifications_latency_milliseconds_sum 0
-prometheus_notifications_latency_milliseconds_count 0
-# HELP prometheus_notifications_queue_capacity The capacity of the alert notifications queue.
-# TYPE prometheus_notifications_queue_capacity gauge
-prometheus_notifications_queue_capacity 100
-# HELP prometheus_notifications_queue_length The number of alert notifications in the queue.
-# TYPE prometheus_notifications_queue_length gauge
-prometheus_notifications_queue_length 0
-# HELP prometheus_rule_evaluation_duration_milliseconds The duration for a rule to execute.
-# TYPE prometheus_rule_evaluation_duration_milliseconds summary
-prometheus_rule_evaluation_duration_milliseconds{rule_type="alerting",quantile="0.5"} 0
-prometheus_rule_evaluation_duration_milliseconds{rule_type="alerting",quantile="0.9"} 0
-prometheus_rule_evaluation_duration_milliseconds{rule_type="alerting",quantile="0.99"} 2
-prometheus_rule_evaluation_duration_milliseconds_sum{rule_type="alerting"} 12
-prometheus_rule_evaluation_duration_milliseconds_count{rule_type="alerting"} 115
-prometheus_rule_evaluation_duration_milliseconds{rule_type="recording",quantile="0.5"} 0
-prometheus_rule_evaluation_duration_milliseconds{rule_type="recording",quantile="0.9"} 0
-prometheus_rule_evaluation_duration_milliseconds{rule_type="recording",quantile="0.99"} 3
-prometheus_rule_evaluation_duration_milliseconds_sum{rule_type="recording"} 15
-prometheus_rule_evaluation_duration_milliseconds_count{rule_type="recording"} 115
-# HELP prometheus_rule_evaluation_failures_total The total number of rule evaluation failures.
-# TYPE prometheus_rule_evaluation_failures_total counter
-prometheus_rule_evaluation_failures_total 0
-# HELP prometheus_samples_queue_capacity Capacity of the queue for unwritten samples.
-# TYPE prometheus_samples_queue_capacity gauge
-prometheus_samples_queue_capacity 4096
-# HELP prometheus_samples_queue_length Current number of items in the queue for unwritten samples. Each item comprises all samples exposed by one target as one metric family (i.e. metrics of the same name).
-# TYPE prometheus_samples_queue_length gauge
-prometheus_samples_queue_length 0
-# HELP prometheus_target_interval_length_seconds Actual intervals between scrapes.
-# TYPE prometheus_target_interval_length_seconds summary
-prometheus_target_interval_length_seconds{interval="15s",quantile="0.01"} 14
-prometheus_target_interval_length_seconds{interval="15s",quantile="0.05"} 14
-prometheus_target_interval_length_seconds{interval="15s",quantile="0.5"} 15
-prometheus_target_interval_length_seconds{interval="15s",quantile="0.9"} 15
-prometheus_target_interval_length_seconds{interval="15s",quantile="0.99"} 15
-prometheus_target_interval_length_seconds_sum{interval="15s"} 175
-prometheus_target_interval_length_seconds_count{interval="15s"} 12
-prometheus_target_interval_length_seconds{interval="1s",quantile="0.01"} 0
-prometheus_target_interval_length_seconds{interval="1s",quantile="0.05"} 0
-prometheus_target_interval_length_seconds{interval="1s",quantile="0.5"} 0
-prometheus_target_interval_length_seconds{interval="1s",quantile="0.9"} 1
-prometheus_target_interval_length_seconds{interval="1s",quantile="0.99"} 1
-prometheus_target_interval_length_seconds_sum{interval="1s"} 55
-prometheus_target_interval_length_seconds_count{interval="1s"} 117
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/text/testdata/text.gz b/Godeps/_workspace/src/github.com/prometheus/client_golang/text/testdata/text.gz
deleted file mode 100644
index 46de5995a..000000000
Binary files a/Godeps/_workspace/src/github.com/prometheus/client_golang/text/testdata/text.gz and /dev/null differ
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_model/go/metrics.pb.go b/Godeps/_workspace/src/github.com/prometheus/client_model/go/metrics.pb.go
deleted file mode 100644
index b065f8683..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/client_model/go/metrics.pb.go
+++ /dev/null
@@ -1,364 +0,0 @@
-// Code generated by protoc-gen-go.
-// source: metrics.proto
-// DO NOT EDIT!
-
-/*
-Package io_prometheus_client is a generated protocol buffer package.
-
-It is generated from these files:
-	metrics.proto
-
-It has these top-level messages:
-	LabelPair
-	Gauge
-	Counter
-	Quantile
-	Summary
-	Untyped
-	Histogram
-	Bucket
-	Metric
-	MetricFamily
-*/
-package io_prometheus_client
-
-import proto "github.com/golang/protobuf/proto"
-import math "math"
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = math.Inf
-
-type MetricType int32
-
-const (
-	MetricType_COUNTER   MetricType = 0
-	MetricType_GAUGE     MetricType = 1
-	MetricType_SUMMARY   MetricType = 2
-	MetricType_UNTYPED   MetricType = 3
-	MetricType_HISTOGRAM MetricType = 4
-)
-
-var MetricType_name = map[int32]string{
-	0: "COUNTER",
-	1: "GAUGE",
-	2: "SUMMARY",
-	3: "UNTYPED",
-	4: "HISTOGRAM",
-}
-var MetricType_value = map[string]int32{
-	"COUNTER":   0,
-	"GAUGE":     1,
-	"SUMMARY":   2,
-	"UNTYPED":   3,
-	"HISTOGRAM": 4,
-}
-
-func (x MetricType) Enum() *MetricType {
-	p := new(MetricType)
-	*p = x
-	return p
-}
-func (x MetricType) String() string {
-	return proto.EnumName(MetricType_name, int32(x))
-}
-func (x *MetricType) UnmarshalJSON(data []byte) error {
-	value, err := proto.UnmarshalJSONEnum(MetricType_value, data, "MetricType")
-	if err != nil {
-		return err
-	}
-	*x = MetricType(value)
-	return nil
-}
-
-type LabelPair struct {
-	Name             *string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
-	Value            *string `protobuf:"bytes,2,opt,name=value" json:"value,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *LabelPair) Reset()         { *m = LabelPair{} }
-func (m *LabelPair) String() string { return proto.CompactTextString(m) }
-func (*LabelPair) ProtoMessage()    {}
-
-func (m *LabelPair) GetName() string {
-	if m != nil && m.Name != nil {
-		return *m.Name
-	}
-	return ""
-}
-
-func (m *LabelPair) GetValue() string {
-	if m != nil && m.Value != nil {
-		return *m.Value
-	}
-	return ""
-}
-
-type Gauge struct {
-	Value            *float64 `protobuf:"fixed64,1,opt,name=value" json:"value,omitempty"`
-	XXX_unrecognized []byte   `json:"-"`
-}
-
-func (m *Gauge) Reset()         { *m = Gauge{} }
-func (m *Gauge) String() string { return proto.CompactTextString(m) }
-func (*Gauge) ProtoMessage()    {}
-
-func (m *Gauge) GetValue() float64 {
-	if m != nil && m.Value != nil {
-		return *m.Value
-	}
-	return 0
-}
-
-type Counter struct {
-	Value            *float64 `protobuf:"fixed64,1,opt,name=value" json:"value,omitempty"`
-	XXX_unrecognized []byte   `json:"-"`
-}
-
-func (m *Counter) Reset()         { *m = Counter{} }
-func (m *Counter) String() string { return proto.CompactTextString(m) }
-func (*Counter) ProtoMessage()    {}
-
-func (m *Counter) GetValue() float64 {
-	if m != nil && m.Value != nil {
-		return *m.Value
-	}
-	return 0
-}
-
-type Quantile struct {
-	Quantile         *float64 `protobuf:"fixed64,1,opt,name=quantile" json:"quantile,omitempty"`
-	Value            *float64 `protobuf:"fixed64,2,opt,name=value" json:"value,omitempty"`
-	XXX_unrecognized []byte   `json:"-"`
-}
-
-func (m *Quantile) Reset()         { *m = Quantile{} }
-func (m *Quantile) String() string { return proto.CompactTextString(m) }
-func (*Quantile) ProtoMessage()    {}
-
-func (m *Quantile) GetQuantile() float64 {
-	if m != nil && m.Quantile != nil {
-		return *m.Quantile
-	}
-	return 0
-}
-
-func (m *Quantile) GetValue() float64 {
-	if m != nil && m.Value != nil {
-		return *m.Value
-	}
-	return 0
-}
-
-type Summary struct {
-	SampleCount      *uint64     `protobuf:"varint,1,opt,name=sample_count" json:"sample_count,omitempty"`
-	SampleSum        *float64    `protobuf:"fixed64,2,opt,name=sample_sum" json:"sample_sum,omitempty"`
-	Quantile         []*Quantile `protobuf:"bytes,3,rep,name=quantile" json:"quantile,omitempty"`
-	XXX_unrecognized []byte      `json:"-"`
-}
-
-func (m *Summary) Reset()         { *m = Summary{} }
-func (m *Summary) String() string { return proto.CompactTextString(m) }
-func (*Summary) ProtoMessage()    {}
-
-func (m *Summary) GetSampleCount() uint64 {
-	if m != nil && m.SampleCount != nil {
-		return *m.SampleCount
-	}
-	return 0
-}
-
-func (m *Summary) GetSampleSum() float64 {
-	if m != nil && m.SampleSum != nil {
-		return *m.SampleSum
-	}
-	return 0
-}
-
-func (m *Summary) GetQuantile() []*Quantile {
-	if m != nil {
-		return m.Quantile
-	}
-	return nil
-}
-
-type Untyped struct {
-	Value            *float64 `protobuf:"fixed64,1,opt,name=value" json:"value,omitempty"`
-	XXX_unrecognized []byte   `json:"-"`
-}
-
-func (m *Untyped) Reset()         { *m = Untyped{} }
-func (m *Untyped) String() string { return proto.CompactTextString(m) }
-func (*Untyped) ProtoMessage()    {}
-
-func (m *Untyped) GetValue() float64 {
-	if m != nil && m.Value != nil {
-		return *m.Value
-	}
-	return 0
-}
-
-type Histogram struct {
-	SampleCount      *uint64   `protobuf:"varint,1,opt,name=sample_count" json:"sample_count,omitempty"`
-	SampleSum        *float64  `protobuf:"fixed64,2,opt,name=sample_sum" json:"sample_sum,omitempty"`
-	Bucket           []*Bucket `protobuf:"bytes,3,rep,name=bucket" json:"bucket,omitempty"`
-	XXX_unrecognized []byte    `json:"-"`
-}
-
-func (m *Histogram) Reset()         { *m = Histogram{} }
-func (m *Histogram) String() string { return proto.CompactTextString(m) }
-func (*Histogram) ProtoMessage()    {}
-
-func (m *Histogram) GetSampleCount() uint64 {
-	if m != nil && m.SampleCount != nil {
-		return *m.SampleCount
-	}
-	return 0
-}
-
-func (m *Histogram) GetSampleSum() float64 {
-	if m != nil && m.SampleSum != nil {
-		return *m.SampleSum
-	}
-	return 0
-}
-
-func (m *Histogram) GetBucket() []*Bucket {
-	if m != nil {
-		return m.Bucket
-	}
-	return nil
-}
-
-type Bucket struct {
-	CumulativeCount  *uint64  `protobuf:"varint,1,opt,name=cumulative_count" json:"cumulative_count,omitempty"`
-	UpperBound       *float64 `protobuf:"fixed64,2,opt,name=upper_bound" json:"upper_bound,omitempty"`
-	XXX_unrecognized []byte   `json:"-"`
-}
-
-func (m *Bucket) Reset()         { *m = Bucket{} }
-func (m *Bucket) String() string { return proto.CompactTextString(m) }
-func (*Bucket) ProtoMessage()    {}
-
-func (m *Bucket) GetCumulativeCount() uint64 {
-	if m != nil && m.CumulativeCount != nil {
-		return *m.CumulativeCount
-	}
-	return 0
-}
-
-func (m *Bucket) GetUpperBound() float64 {
-	if m != nil && m.UpperBound != nil {
-		return *m.UpperBound
-	}
-	return 0
-}
-
-type Metric struct {
-	Label            []*LabelPair `protobuf:"bytes,1,rep,name=label" json:"label,omitempty"`
-	Gauge            *Gauge       `protobuf:"bytes,2,opt,name=gauge" json:"gauge,omitempty"`
-	Counter          *Counter     `protobuf:"bytes,3,opt,name=counter" json:"counter,omitempty"`
-	Summary          *Summary     `protobuf:"bytes,4,opt,name=summary" json:"summary,omitempty"`
-	Untyped          *Untyped     `protobuf:"bytes,5,opt,name=untyped" json:"untyped,omitempty"`
-	Histogram        *Histogram   `protobuf:"bytes,7,opt,name=histogram" json:"histogram,omitempty"`
-	TimestampMs      *int64       `protobuf:"varint,6,opt,name=timestamp_ms" json:"timestamp_ms,omitempty"`
-	XXX_unrecognized []byte       `json:"-"`
-}
-
-func (m *Metric) Reset()         { *m = Metric{} }
-func (m *Metric) String() string { return proto.CompactTextString(m) }
-func (*Metric) ProtoMessage()    {}
-
-func (m *Metric) GetLabel() []*LabelPair {
-	if m != nil {
-		return m.Label
-	}
-	return nil
-}
-
-func (m *Metric) GetGauge() *Gauge {
-	if m != nil {
-		return m.Gauge
-	}
-	return nil
-}
-
-func (m *Metric) GetCounter() *Counter {
-	if m != nil {
-		return m.Counter
-	}
-	return nil
-}
-
-func (m *Metric) GetSummary() *Summary {
-	if m != nil {
-		return m.Summary
-	}
-	return nil
-}
-
-func (m *Metric) GetUntyped() *Untyped {
-	if m != nil {
-		return m.Untyped
-	}
-	return nil
-}
-
-func (m *Metric) GetHistogram() *Histogram {
-	if m != nil {
-		return m.Histogram
-	}
-	return nil
-}
-
-func (m *Metric) GetTimestampMs() int64 {
-	if m != nil && m.TimestampMs != nil {
-		return *m.TimestampMs
-	}
-	return 0
-}
-
-type MetricFamily struct {
-	Name             *string     `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
-	Help             *string     `protobuf:"bytes,2,opt,name=help" json:"help,omitempty"`
-	Type             *MetricType `protobuf:"varint,3,opt,name=type,enum=io.prometheus.client.MetricType" json:"type,omitempty"`
-	Metric           []*Metric   `protobuf:"bytes,4,rep,name=metric" json:"metric,omitempty"`
-	XXX_unrecognized []byte      `json:"-"`
-}
-
-func (m *MetricFamily) Reset()         { *m = MetricFamily{} }
-func (m *MetricFamily) String() string { return proto.CompactTextString(m) }
-func (*MetricFamily) ProtoMessage()    {}
-
-func (m *MetricFamily) GetName() string {
-	if m != nil && m.Name != nil {
-		return *m.Name
-	}
-	return ""
-}
-
-func (m *MetricFamily) GetHelp() string {
-	if m != nil && m.Help != nil {
-		return *m.Help
-	}
-	return ""
-}
-
-func (m *MetricFamily) GetType() MetricType {
-	if m != nil && m.Type != nil {
-		return *m.Type
-	}
-	return MetricType_COUNTER
-}
-
-func (m *MetricFamily) GetMetric() []*Metric {
-	if m != nil {
-		return m.Metric
-	}
-	return nil
-}
-
-func init() {
-	proto.RegisterEnum("io.prometheus.client.MetricType", MetricType_name, MetricType_value)
-}
diff --git a/Godeps/_workspace/src/github.com/prometheus/common/expfmt/decode.go b/Godeps/_workspace/src/github.com/prometheus/common/expfmt/decode.go
deleted file mode 100644
index b72c9bede..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/common/expfmt/decode.go
+++ /dev/null
@@ -1,411 +0,0 @@
-// Copyright 2015 The Prometheus Authors
-// 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 expfmt
-
-import (
-	"fmt"
-	"io"
-	"math"
-	"mime"
-	"net/http"
-
-	dto "github.com/prometheus/client_model/go"
-
-	"github.com/matttproud/golang_protobuf_extensions/pbutil"
-	"github.com/prometheus/common/model"
-)
-
-// Decoder types decode an input stream into metric families.
-type Decoder interface {
-	Decode(*dto.MetricFamily) error
-}
-
-type DecodeOptions struct {
-	// Timestamp is added to each value from the stream that has no explicit timestamp set.
-	Timestamp model.Time
-}
-
-// ResponseFormat extracts the correct format from a HTTP response header.
-// If no matching format can be found FormatUnknown is returned.
-func ResponseFormat(h http.Header) Format {
-	ct := h.Get(hdrContentType)
-
-	mediatype, params, err := mime.ParseMediaType(ct)
-	if err != nil {
-		return FmtUnknown
-	}
-
-	const (
-		textType = "text/plain"
-		jsonType = "application/json"
-	)
-
-	switch mediatype {
-	case ProtoType:
-		if p, ok := params["proto"]; ok && p != ProtoProtocol {
-			return FmtUnknown
-		}
-		if e, ok := params["encoding"]; ok && e != "delimited" {
-			return FmtUnknown
-		}
-		return FmtProtoDelim
-
-	case textType:
-		if v, ok := params["version"]; ok && v != TextVersion {
-			return FmtUnknown
-		}
-		return FmtText
-
-	case jsonType:
-		var prometheusAPIVersion string
-
-		if params["schema"] == "prometheus/telemetry" && params["version"] != "" {
-			prometheusAPIVersion = params["version"]
-		} else {
-			prometheusAPIVersion = h.Get("X-Prometheus-API-Version")
-		}
-
-		switch prometheusAPIVersion {
-		case "0.0.2", "":
-			return fmtJSON2
-		default:
-			return FmtUnknown
-		}
-	}
-
-	return FmtUnknown
-}
-
-// NewDecoder returns a new decoder based on the given input format.
-// If the input format does not imply otherwise, a text format decoder is returned.
-func NewDecoder(r io.Reader, format Format) Decoder {
-	switch format {
-	case FmtProtoDelim:
-		return &protoDecoder{r: r}
-	case fmtJSON2:
-		return newJSON2Decoder(r)
-	}
-	return &textDecoder{r: r}
-}
-
-// protoDecoder implements the Decoder interface for protocol buffers.
-type protoDecoder struct {
-	r io.Reader
-}
-
-// Decode implements the Decoder interface.
-func (d *protoDecoder) Decode(v *dto.MetricFamily) error {
-	_, err := pbutil.ReadDelimited(d.r, v)
-	return err
-}
-
-// textDecoder implements the Decoder interface for the text protcol.
-type textDecoder struct {
-	r    io.Reader
-	p    TextParser
-	fams []*dto.MetricFamily
-}
-
-// Decode implements the Decoder interface.
-func (d *textDecoder) Decode(v *dto.MetricFamily) error {
-	// TODO(fabxc): Wrap this as a line reader to make streaming safer.
-	if len(d.fams) == 0 {
-		// No cached metric families, read everything and parse metrics.
-		fams, err := d.p.TextToMetricFamilies(d.r)
-		if err != nil {
-			return err
-		}
-		if len(fams) == 0 {
-			return io.EOF
-		}
-		d.fams = make([]*dto.MetricFamily, 0, len(fams))
-		for _, f := range fams {
-			d.fams = append(d.fams, f)
-		}
-	}
-
-	*v = *d.fams[0]
-	d.fams = d.fams[1:]
-
-	return nil
-}
-
-type SampleDecoder struct {
-	Dec  Decoder
-	Opts *DecodeOptions
-
-	f dto.MetricFamily
-}
-
-func (sd *SampleDecoder) Decode(s *model.Vector) error {
-	if err := sd.Dec.Decode(&sd.f); err != nil {
-		return err
-	}
-	*s = extractSamples(&sd.f, sd.Opts)
-	return nil
-}
-
-// Extract samples builds a slice of samples from the provided metric families.
-func ExtractSamples(o *DecodeOptions, fams ...*dto.MetricFamily) model.Vector {
-	var all model.Vector
-	for _, f := range fams {
-		all = append(all, extractSamples(f, o)...)
-	}
-	return all
-}
-
-func extractSamples(f *dto.MetricFamily, o *DecodeOptions) model.Vector {
-	switch f.GetType() {
-	case dto.MetricType_COUNTER:
-		return extractCounter(o, f)
-	case dto.MetricType_GAUGE:
-		return extractGauge(o, f)
-	case dto.MetricType_SUMMARY:
-		return extractSummary(o, f)
-	case dto.MetricType_UNTYPED:
-		return extractUntyped(o, f)
-	case dto.MetricType_HISTOGRAM:
-		return extractHistogram(o, f)
-	}
-	panic("expfmt.extractSamples: unknown metric family type")
-}
-
-func extractCounter(o *DecodeOptions, f *dto.MetricFamily) model.Vector {
-	samples := make(model.Vector, 0, len(f.Metric))
-
-	for _, m := range f.Metric {
-		if m.Counter == nil {
-			continue
-		}
-
-		lset := make(model.LabelSet, len(m.Label)+1)
-		for _, p := range m.Label {
-			lset[model.LabelName(p.GetName())] = model.LabelValue(p.GetValue())
-		}
-		lset[model.MetricNameLabel] = model.LabelValue(f.GetName())
-
-		smpl := &model.Sample{
-			Metric: model.Metric(lset),
-			Value:  model.SampleValue(m.Counter.GetValue()),
-		}
-
-		if m.TimestampMs != nil {
-			smpl.Timestamp = model.TimeFromUnixNano(*m.TimestampMs * 1000000)
-		} else {
-			smpl.Timestamp = o.Timestamp
-		}
-
-		samples = append(samples, smpl)
-	}
-
-	return samples
-}
-
-func extractGauge(o *DecodeOptions, f *dto.MetricFamily) model.Vector {
-	samples := make(model.Vector, 0, len(f.Metric))
-
-	for _, m := range f.Metric {
-		if m.Gauge == nil {
-			continue
-		}
-
-		lset := make(model.LabelSet, len(m.Label)+1)
-		for _, p := range m.Label {
-			lset[model.LabelName(p.GetName())] = model.LabelValue(p.GetValue())
-		}
-		lset[model.MetricNameLabel] = model.LabelValue(f.GetName())
-
-		smpl := &model.Sample{
-			Metric: model.Metric(lset),
-			Value:  model.SampleValue(m.Gauge.GetValue()),
-		}
-
-		if m.TimestampMs != nil {
-			smpl.Timestamp = model.TimeFromUnixNano(*m.TimestampMs * 1000000)
-		} else {
-			smpl.Timestamp = o.Timestamp
-		}
-
-		samples = append(samples, smpl)
-	}
-
-	return samples
-}
-
-func extractUntyped(o *DecodeOptions, f *dto.MetricFamily) model.Vector {
-	samples := make(model.Vector, 0, len(f.Metric))
-
-	for _, m := range f.Metric {
-		if m.Untyped == nil {
-			continue
-		}
-
-		lset := make(model.LabelSet, len(m.Label)+1)
-		for _, p := range m.Label {
-			lset[model.LabelName(p.GetName())] = model.LabelValue(p.GetValue())
-		}
-		lset[model.MetricNameLabel] = model.LabelValue(f.GetName())
-
-		smpl := &model.Sample{
-			Metric: model.Metric(lset),
-			Value:  model.SampleValue(m.Untyped.GetValue()),
-		}
-
-		if m.TimestampMs != nil {
-			smpl.Timestamp = model.TimeFromUnixNano(*m.TimestampMs * 1000000)
-		} else {
-			smpl.Timestamp = o.Timestamp
-		}
-
-		samples = append(samples, smpl)
-	}
-
-	return samples
-}
-
-func extractSummary(o *DecodeOptions, f *dto.MetricFamily) model.Vector {
-	samples := make(model.Vector, 0, len(f.Metric))
-
-	for _, m := range f.Metric {
-		if m.Summary == nil {
-			continue
-		}
-
-		timestamp := o.Timestamp
-		if m.TimestampMs != nil {
-			timestamp = model.TimeFromUnixNano(*m.TimestampMs * 1000000)
-		}
-
-		for _, q := range m.Summary.Quantile {
-			lset := make(model.LabelSet, len(m.Label)+2)
-			for _, p := range m.Label {
-				lset[model.LabelName(p.GetName())] = model.LabelValue(p.GetValue())
-			}
-			// BUG(matt): Update other names to "quantile".
-			lset[model.LabelName(model.QuantileLabel)] = model.LabelValue(fmt.Sprint(q.GetQuantile()))
-			lset[model.MetricNameLabel] = model.LabelValue(f.GetName())
-
-			samples = append(samples, &model.Sample{
-				Metric:    model.Metric(lset),
-				Value:     model.SampleValue(q.GetValue()),
-				Timestamp: timestamp,
-			})
-		}
-
-		lset := make(model.LabelSet, len(m.Label)+1)
-		for _, p := range m.Label {
-			lset[model.LabelName(p.GetName())] = model.LabelValue(p.GetValue())
-		}
-		lset[model.MetricNameLabel] = model.LabelValue(f.GetName() + "_sum")
-
-		samples = append(samples, &model.Sample{
-			Metric:    model.Metric(lset),
-			Value:     model.SampleValue(m.Summary.GetSampleSum()),
-			Timestamp: timestamp,
-		})
-
-		lset = make(model.LabelSet, len(m.Label)+1)
-		for _, p := range m.Label {
-			lset[model.LabelName(p.GetName())] = model.LabelValue(p.GetValue())
-		}
-		lset[model.MetricNameLabel] = model.LabelValue(f.GetName() + "_count")
-
-		samples = append(samples, &model.Sample{
-			Metric:    model.Metric(lset),
-			Value:     model.SampleValue(m.Summary.GetSampleCount()),
-			Timestamp: timestamp,
-		})
-	}
-
-	return samples
-}
-
-func extractHistogram(o *DecodeOptions, f *dto.MetricFamily) model.Vector {
-	samples := make(model.Vector, 0, len(f.Metric))
-
-	for _, m := range f.Metric {
-		if m.Histogram == nil {
-			continue
-		}
-
-		timestamp := o.Timestamp
-		if m.TimestampMs != nil {
-			timestamp = model.TimeFromUnixNano(*m.TimestampMs * 1000000)
-		}
-
-		infSeen := false
-
-		for _, q := range m.Histogram.Bucket {
-			lset := make(model.LabelSet, len(m.Label)+2)
-			for _, p := range m.Label {
-				lset[model.LabelName(p.GetName())] = model.LabelValue(p.GetValue())
-			}
-			lset[model.LabelName(model.BucketLabel)] = model.LabelValue(fmt.Sprint(q.GetUpperBound()))
-			lset[model.MetricNameLabel] = model.LabelValue(f.GetName() + "_bucket")
-
-			if math.IsInf(q.GetUpperBound(), +1) {
-				infSeen = true
-			}
-
-			samples = append(samples, &model.Sample{
-				Metric:    model.Metric(lset),
-				Value:     model.SampleValue(q.GetCumulativeCount()),
-				Timestamp: timestamp,
-			})
-		}
-
-		lset := make(model.LabelSet, len(m.Label)+1)
-		for _, p := range m.Label {
-			lset[model.LabelName(p.GetName())] = model.LabelValue(p.GetValue())
-		}
-		lset[model.MetricNameLabel] = model.LabelValue(f.GetName() + "_sum")
-
-		samples = append(samples, &model.Sample{
-			Metric:    model.Metric(lset),
-			Value:     model.SampleValue(m.Histogram.GetSampleSum()),
-			Timestamp: timestamp,
-		})
-
-		lset = make(model.LabelSet, len(m.Label)+1)
-		for _, p := range m.Label {
-			lset[model.LabelName(p.GetName())] = model.LabelValue(p.GetValue())
-		}
-		lset[model.MetricNameLabel] = model.LabelValue(f.GetName() + "_count")
-
-		count := &model.Sample{
-			Metric:    model.Metric(lset),
-			Value:     model.SampleValue(m.Histogram.GetSampleCount()),
-			Timestamp: timestamp,
-		}
-		samples = append(samples, count)
-
-		if !infSeen {
-			// Append an infinity bucket sample.
-			lset := make(model.LabelSet, len(m.Label)+2)
-			for _, p := range m.Label {
-				lset[model.LabelName(p.GetName())] = model.LabelValue(p.GetValue())
-			}
-			lset[model.LabelName(model.BucketLabel)] = model.LabelValue("+Inf")
-			lset[model.MetricNameLabel] = model.LabelValue(f.GetName() + "_bucket")
-
-			samples = append(samples, &model.Sample{
-				Metric:    model.Metric(lset),
-				Value:     count.Value,
-				Timestamp: timestamp,
-			})
-		}
-	}
-
-	return samples
-}
diff --git a/Godeps/_workspace/src/github.com/prometheus/common/expfmt/encode.go b/Godeps/_workspace/src/github.com/prometheus/common/expfmt/encode.go
deleted file mode 100644
index 392ca90ee..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/common/expfmt/encode.go
+++ /dev/null
@@ -1,88 +0,0 @@
-// Copyright 2015 The Prometheus Authors
-// 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 expfmt
-
-import (
-	"fmt"
-	"io"
-	"net/http"
-
-	"bitbucket.org/ww/goautoneg"
-	"github.com/golang/protobuf/proto"
-	"github.com/matttproud/golang_protobuf_extensions/pbutil"
-
-	dto "github.com/prometheus/client_model/go"
-)
-
-// Encoder types encode metric families into an underlying wire protocol.
-type Encoder interface {
-	Encode(*dto.MetricFamily) error
-}
-
-type encoder func(*dto.MetricFamily) error
-
-func (e encoder) Encode(v *dto.MetricFamily) error {
-	return e(v)
-}
-
-// Negotiate returns the Content-Type based on the given Accept header.
-// If no appropriate accepted type is found, FmtText is returned.
-func Negotiate(h http.Header) Format {
-	for _, ac := range goautoneg.ParseAccept(h.Get(hdrAccept)) {
-		// Check for protocol buffer
-		if ac.Type+"/"+ac.SubType == ProtoType && ac.Params["proto"] == ProtoProtocol {
-			switch ac.Params["encoding"] {
-			case "delimited":
-				return FmtProtoDelim
-			case "text":
-				return FmtProtoText
-			case "compact-text":
-				return FmtProtoCompact
-			}
-		}
-		// Check for text format.
-		ver := ac.Params["version"]
-		if ac.Type == "text" && ac.SubType == "plain" && (ver == TextVersion || ver == "") {
-			return FmtText
-		}
-	}
-	return FmtText
-}
-
-// NewEncoder returns a new encoder based on content type negotiation.
-func NewEncoder(w io.Writer, format Format) Encoder {
-	switch format {
-	case FmtProtoDelim:
-		return encoder(func(v *dto.MetricFamily) error {
-			_, err := pbutil.WriteDelimited(w, v)
-			return err
-		})
-	case FmtProtoCompact:
-		return encoder(func(v *dto.MetricFamily) error {
-			_, err := fmt.Fprintln(w, v.String())
-			return err
-		})
-	case FmtProtoText:
-		return encoder(func(v *dto.MetricFamily) error {
-			_, err := fmt.Fprintln(w, proto.MarshalTextString(v))
-			return err
-		})
-	case FmtText:
-		return encoder(func(v *dto.MetricFamily) error {
-			_, err := MetricFamilyToText(w, v)
-			return err
-		})
-	}
-	panic("expfmt.NewEncoder: unknown format")
-}
diff --git a/Godeps/_workspace/src/github.com/prometheus/common/expfmt/expfmt.go b/Godeps/_workspace/src/github.com/prometheus/common/expfmt/expfmt.go
deleted file mode 100644
index 366fbde98..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/common/expfmt/expfmt.go
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright 2015 The Prometheus Authors
-// 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.
-
-// A package for reading and writing Prometheus metrics.
-package expfmt
-
-type Format string
-
-const (
-	TextVersion = "0.0.4"
-
-	ProtoType     = `application/vnd.google.protobuf`
-	ProtoProtocol = `io.prometheus.client.MetricFamily`
-	ProtoFmt      = ProtoType + "; proto=" + ProtoProtocol + ";"
-
-	// The Content-Type values for the different wire protocols.
-	FmtUnknown      Format = `<unknown>`
-	FmtText         Format = `text/plain; version=` + TextVersion
-	FmtProtoDelim   Format = ProtoFmt + ` encoding=delimited`
-	FmtProtoText    Format = ProtoFmt + ` encoding=text`
-	FmtProtoCompact Format = ProtoFmt + ` encoding=compact-text`
-
-	// fmtJSON2 is hidden as it is deprecated.
-	fmtJSON2 Format = `application/json; version=0.0.2`
-)
-
-const (
-	hdrContentType = "Content-Type"
-	hdrAccept      = "Accept"
-)
diff --git a/Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz.go b/Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz.go
deleted file mode 100644
index 14f920146..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz.go
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright 2014 The Prometheus Authors
-// 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 only when actually fuzzing
-// +build gofuzz
-
-package expfmt
-
-import "bytes"
-
-// Fuzz text metric parser with with github.com/dvyukov/go-fuzz:
-//
-//     go-fuzz-build github.com/prometheus/client_golang/text
-//     go-fuzz -bin text-fuzz.zip -workdir fuzz
-//
-// Further input samples should go in the folder fuzz/corpus.
-func Fuzz(in []byte) int {
-	parser := TextParser{}
-	_, err := parser.TextToMetricFamilies(bytes.NewReader(in))
-
-	if err != nil {
-		return 0
-	}
-
-	return 1
-}
diff --git a/Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_0 b/Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_0
deleted file mode 100644
index 139597f9c..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_0
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
diff --git a/Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_1 b/Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_1
deleted file mode 100644
index 2ae870679..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_1
+++ /dev/null
@@ -1,6 +0,0 @@
-
-minimal_metric 1.234
-another_metric -3e3 103948
-# Even that:
-no_labels{} 3
-# HELP line for non-existing metric will be ignored.
diff --git a/Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_2 b/Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_2
deleted file mode 100644
index 5c351db36..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_2
+++ /dev/null
@@ -1,12 +0,0 @@
-
-# A normal comment.
-#
-# TYPE name counter
-name{labelname="val1",basename="basevalue"} NaN
-name {labelname="val2",basename="base\"v\\al\nue"} 0.23 1234567890
-# HELP name two-line\n doc  str\\ing
-
- # HELP  name2  	doc str"ing 2
-  #    TYPE    name2 gauge
-name2{labelname="val2"	,basename   =   "basevalue2"		} +Inf 54321
-name2{ labelname = "val1" , }-Inf
diff --git a/Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_3 b/Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_3
deleted file mode 100644
index 0b3c345aa..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_3
+++ /dev/null
@@ -1,22 +0,0 @@
-
-# TYPE my_summary summary
-my_summary{n1="val1",quantile="0.5"} 110
-decoy -1 -2
-my_summary{n1="val1",quantile="0.9"} 140 1
-my_summary_count{n1="val1"} 42
-# Latest timestamp wins in case of a summary.
-my_summary_sum{n1="val1"} 4711 2
-fake_sum{n1="val1"} 2001
-# TYPE another_summary summary
-another_summary_count{n2="val2",n1="val1"} 20
-my_summary_count{n2="val2",n1="val1"} 5 5
-another_summary{n1="val1",n2="val2",quantile=".3"} -1.2
-my_summary_sum{n1="val2"} 08 15
-my_summary{n1="val3", quantile="0.2"} 4711
-  my_summary{n1="val1",n2="val2",quantile="-12.34",} NaN
-# some
-# funny comments
-# HELP 
-# HELP
-# HELP my_summary
-# HELP my_summary 
diff --git a/Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_4 b/Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_4
deleted file mode 100644
index bde0a387a..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_4
+++ /dev/null
@@ -1,10 +0,0 @@
-
-# HELP request_duration_microseconds The response latency.
-# TYPE request_duration_microseconds histogram
-request_duration_microseconds_bucket{le="100"} 123
-request_duration_microseconds_bucket{le="120"} 412
-request_duration_microseconds_bucket{le="144"} 592
-request_duration_microseconds_bucket{le="172.8"} 1524
-request_duration_microseconds_bucket{le="+Inf"} 2693
-request_duration_microseconds_sum 1.7560473e+06
-request_duration_microseconds_count 2693
diff --git a/Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_0 b/Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_0
deleted file mode 100644
index 4c67f9a19..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_0
+++ /dev/null
@@ -1 +0,0 @@
-bla 3.14
\ No newline at end of file
diff --git a/Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_1 b/Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_1
deleted file mode 100644
index b853478ee..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_1
+++ /dev/null
@@ -1 +0,0 @@
-metric{label="\t"} 3.14
\ No newline at end of file
diff --git a/Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_10 b/Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_10
deleted file mode 100644
index b5fe5f5a6..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_10
+++ /dev/null
@@ -1 +0,0 @@
-metric{label="bla"} 3.14 2 3
diff --git a/Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_11 b/Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_11
deleted file mode 100644
index 57c7fbc0b..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_11
+++ /dev/null
@@ -1 +0,0 @@
-metric{label="bla"} blubb
diff --git a/Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_12 b/Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_12
deleted file mode 100644
index 0a9df79a1..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_12
+++ /dev/null
@@ -1,3 +0,0 @@
-
-# HELP metric one
-# HELP metric two
diff --git a/Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_13 b/Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_13
deleted file mode 100644
index 5bc742781..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_13
+++ /dev/null
@@ -1,3 +0,0 @@
-
-# TYPE metric counter
-# TYPE metric untyped
diff --git a/Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_14 b/Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_14
deleted file mode 100644
index a9a24265b..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_14
+++ /dev/null
@@ -1,3 +0,0 @@
-
-metric 4.12
-# TYPE metric counter
diff --git a/Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_15 b/Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_15
deleted file mode 100644
index 7e95ca8f4..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_15
+++ /dev/null
@@ -1,2 +0,0 @@
-
-# TYPE metric bla
diff --git a/Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_16 b/Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_16
deleted file mode 100644
index 7825f8887..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_16
+++ /dev/null
@@ -1,2 +0,0 @@
-
-# TYPE met-ric
diff --git a/Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_17 b/Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_17
deleted file mode 100644
index 8f35cae0c..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_17
+++ /dev/null
@@ -1 +0,0 @@
-@invalidmetric{label="bla"} 3.14 2
\ No newline at end of file
diff --git a/Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_18 b/Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_18
deleted file mode 100644
index 7ca2cc268..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_18
+++ /dev/null
@@ -1 +0,0 @@
-{label="bla"} 3.14 2
\ No newline at end of file
diff --git a/Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_19 b/Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_19
deleted file mode 100644
index 7a6ccc0dd..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_19
+++ /dev/null
@@ -1,3 +0,0 @@
-
-# TYPE metric histogram
-metric_bucket{le="bla"} 3.14
diff --git a/Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_2 b/Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_2
deleted file mode 100644
index 726d0017c..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_2
+++ /dev/null
@@ -1,3 +0,0 @@
-
-metric{label="new
-line"} 3.14
diff --git a/Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_3 b/Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_3
deleted file mode 100644
index 6aa9e3081..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_3
+++ /dev/null
@@ -1 +0,0 @@
-metric{@="bla"} 3.14
\ No newline at end of file
diff --git a/Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_4 b/Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_4
deleted file mode 100644
index d112cb902..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_4
+++ /dev/null
@@ -1 +0,0 @@
-metric{__name__="bla"} 3.14
\ No newline at end of file
diff --git a/Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_5 b/Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_5
deleted file mode 100644
index b34554a8d..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_5
+++ /dev/null
@@ -1 +0,0 @@
-metric{label+="bla"} 3.14
\ No newline at end of file
diff --git a/Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_6 b/Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_6
deleted file mode 100644
index c4d7df3d1..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_6
+++ /dev/null
@@ -1 +0,0 @@
-metric{label=bla} 3.14
\ No newline at end of file
diff --git a/Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_7 b/Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_7
deleted file mode 100644
index 97eafc4a6..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_7
+++ /dev/null
@@ -1,3 +0,0 @@
-
-# TYPE metric summary
-metric{quantile="bla"} 3.14
diff --git a/Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_8 b/Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_8
deleted file mode 100644
index fc706496b..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_8
+++ /dev/null
@@ -1 +0,0 @@
-metric{label="bla"+} 3.14
\ No newline at end of file
diff --git a/Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_9 b/Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_9
deleted file mode 100644
index 57b4879c0..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/from_test_parse_error_9
+++ /dev/null
@@ -1 +0,0 @@
-metric{label="bla"} 3.14 2.72
diff --git a/Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/minimal b/Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/minimal
deleted file mode 100644
index be1e6a369..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/common/expfmt/fuzz/corpus/minimal
+++ /dev/null
@@ -1 +0,0 @@
-m{} 0
diff --git a/Godeps/_workspace/src/github.com/prometheus/common/expfmt/json_decode.go b/Godeps/_workspace/src/github.com/prometheus/common/expfmt/json_decode.go
deleted file mode 100644
index 67e3a0d4d..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/common/expfmt/json_decode.go
+++ /dev/null
@@ -1,162 +0,0 @@
-// Copyright 2015 The Prometheus Authors
-// 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 expfmt
-
-import (
-	"encoding/json"
-	"fmt"
-	"io"
-	"sort"
-
-	"github.com/golang/protobuf/proto"
-	dto "github.com/prometheus/client_model/go"
-
-	"github.com/prometheus/common/model"
-)
-
-type json2Decoder struct {
-	dec  *json.Decoder
-	fams []*dto.MetricFamily
-}
-
-func newJSON2Decoder(r io.Reader) Decoder {
-	return &json2Decoder{
-		dec: json.NewDecoder(r),
-	}
-}
-
-type histogram002 struct {
-	Labels model.LabelSet     `json:"labels"`
-	Values map[string]float64 `json:"value"`
-}
-
-type counter002 struct {
-	Labels model.LabelSet `json:"labels"`
-	Value  float64        `json:"value"`
-}
-
-func protoLabelSet(base, ext model.LabelSet) []*dto.LabelPair {
-	labels := base.Clone().Merge(ext)
-	delete(labels, model.MetricNameLabel)
-
-	names := make([]string, 0, len(labels))
-	for ln := range labels {
-		names = append(names, string(ln))
-	}
-	sort.Strings(names)
-
-	pairs := make([]*dto.LabelPair, 0, len(labels))
-
-	for _, ln := range names {
-		lv := labels[model.LabelName(ln)]
-
-		pairs = append(pairs, &dto.LabelPair{
-			Name:  proto.String(ln),
-			Value: proto.String(string(lv)),
-		})
-	}
-
-	return pairs
-}
-
-func (d *json2Decoder) more() error {
-	var entities []struct {
-		BaseLabels model.LabelSet `json:"baseLabels"`
-		Docstring  string         `json:"docstring"`
-		Metric     struct {
-			Type   string          `json:"type"`
-			Values json.RawMessage `json:"value"`
-		} `json:"metric"`
-	}
-
-	if err := d.dec.Decode(&entities); err != nil {
-		return err
-	}
-	for _, e := range entities {
-		f := &dto.MetricFamily{
-			Name:   proto.String(string(e.BaseLabels[model.MetricNameLabel])),
-			Help:   proto.String(e.Docstring),
-			Type:   dto.MetricType_UNTYPED.Enum(),
-			Metric: []*dto.Metric{},
-		}
-
-		d.fams = append(d.fams, f)
-
-		switch e.Metric.Type {
-		case "counter", "gauge":
-			var values []counter002
-
-			if err := json.Unmarshal(e.Metric.Values, &values); err != nil {
-				return fmt.Errorf("could not extract %s value: %s", e.Metric.Type, err)
-			}
-
-			for _, ctr := range values {
-				f.Metric = append(f.Metric, &dto.Metric{
-					Label: protoLabelSet(e.BaseLabels, ctr.Labels),
-					Untyped: &dto.Untyped{
-						Value: proto.Float64(ctr.Value),
-					},
-				})
-			}
-
-		case "histogram":
-			var values []histogram002
-
-			if err := json.Unmarshal(e.Metric.Values, &values); err != nil {
-				return fmt.Errorf("could not extract %s value: %s", e.Metric.Type, err)
-			}
-
-			for _, hist := range values {
-				quants := make([]string, 0, len(values))
-				for q := range hist.Values {
-					quants = append(quants, q)
-				}
-
-				sort.Strings(quants)
-
-				for _, q := range quants {
-					value := hist.Values[q]
-					// The correct label is "quantile" but to not break old expressions
-					// this remains "percentile"
-					hist.Labels["percentile"] = model.LabelValue(q)
-
-					f.Metric = append(f.Metric, &dto.Metric{
-						Label: protoLabelSet(e.BaseLabels, hist.Labels),
-						Untyped: &dto.Untyped{
-							Value: proto.Float64(value),
-						},
-					})
-				}
-			}
-
-		default:
-			return fmt.Errorf("unknown metric type %q", e.Metric.Type)
-		}
-	}
-	return nil
-}
-
-// Decode implements the Decoder interface.
-func (d *json2Decoder) Decode(v *dto.MetricFamily) error {
-	if len(d.fams) == 0 {
-		if err := d.more(); err != nil {
-			return err
-		}
-	}
-
-	*v = *d.fams[0]
-	d.fams = d.fams[1:]
-
-	return nil
-}
diff --git a/Godeps/_workspace/src/github.com/prometheus/common/expfmt/text_create.go b/Godeps/_workspace/src/github.com/prometheus/common/expfmt/text_create.go
deleted file mode 100644
index 0bb9c14cc..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/common/expfmt/text_create.go
+++ /dev/null
@@ -1,305 +0,0 @@
-// Copyright 2014 The Prometheus Authors
-// 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 expfmt
-
-import (
-	"bytes"
-	"fmt"
-	"io"
-	"math"
-	"strings"
-
-	dto "github.com/prometheus/client_model/go"
-	"github.com/prometheus/common/model"
-)
-
-// MetricFamilyToText converts a MetricFamily proto message into text format and
-// writes the resulting lines to 'out'. It returns the number of bytes written
-// and any error encountered.  This function does not perform checks on the
-// content of the metric and label names, i.e. invalid metric or label names
-// will result in invalid text format output.
-// This method fulfills the type 'prometheus.encoder'.
-func MetricFamilyToText(out io.Writer, in *dto.MetricFamily) (int, error) {
-	var written int
-
-	// Fail-fast checks.
-	if len(in.Metric) == 0 {
-		return written, fmt.Errorf("MetricFamily has no metrics: %s", in)
-	}
-	name := in.GetName()
-	if name == "" {
-		return written, fmt.Errorf("MetricFamily has no name: %s", in)
-	}
-
-	// Comments, first HELP, then TYPE.
-	if in.Help != nil {
-		n, err := fmt.Fprintf(
-			out, "# HELP %s %s\n",
-			name, escapeString(*in.Help, false),
-		)
-		written += n
-		if err != nil {
-			return written, err
-		}
-	}
-	metricType := in.GetType()
-	n, err := fmt.Fprintf(
-		out, "# TYPE %s %s\n",
-		name, strings.ToLower(metricType.String()),
-	)
-	written += n
-	if err != nil {
-		return written, err
-	}
-
-	// Finally the samples, one line for each.
-	for _, metric := range in.Metric {
-		switch metricType {
-		case dto.MetricType_COUNTER:
-			if metric.Counter == nil {
-				return written, fmt.Errorf(
-					"expected counter in metric %s %s", name, metric,
-				)
-			}
-			n, err = writeSample(
-				name, metric, "", "",
-				metric.Counter.GetValue(),
-				out,
-			)
-		case dto.MetricType_GAUGE:
-			if metric.Gauge == nil {
-				return written, fmt.Errorf(
-					"expected gauge in metric %s %s", name, metric,
-				)
-			}
-			n, err = writeSample(
-				name, metric, "", "",
-				metric.Gauge.GetValue(),
-				out,
-			)
-		case dto.MetricType_UNTYPED:
-			if metric.Untyped == nil {
-				return written, fmt.Errorf(
-					"expected untyped in metric %s %s", name, metric,
-				)
-			}
-			n, err = writeSample(
-				name, metric, "", "",
-				metric.Untyped.GetValue(),
-				out,
-			)
-		case dto.MetricType_SUMMARY:
-			if metric.Summary == nil {
-				return written, fmt.Errorf(
-					"expected summary in metric %s %s", name, metric,
-				)
-			}
-			for _, q := range metric.Summary.Quantile {
-				n, err = writeSample(
-					name, metric,
-					model.QuantileLabel, fmt.Sprint(q.GetQuantile()),
-					q.GetValue(),
-					out,
-				)
-				written += n
-				if err != nil {
-					return written, err
-				}
-			}
-			n, err = writeSample(
-				name+"_sum", metric, "", "",
-				metric.Summary.GetSampleSum(),
-				out,
-			)
-			if err != nil {
-				return written, err
-			}
-			written += n
-			n, err = writeSample(
-				name+"_count", metric, "", "",
-				float64(metric.Summary.GetSampleCount()),
-				out,
-			)
-		case dto.MetricType_HISTOGRAM:
-			if metric.Histogram == nil {
-				return written, fmt.Errorf(
-					"expected histogram in metric %s %s", name, metric,
-				)
-			}
-			infSeen := false
-			for _, q := range metric.Histogram.Bucket {
-				n, err = writeSample(
-					name+"_bucket", metric,
-					model.BucketLabel, fmt.Sprint(q.GetUpperBound()),
-					float64(q.GetCumulativeCount()),
-					out,
-				)
-				written += n
-				if err != nil {
-					return written, err
-				}
-				if math.IsInf(q.GetUpperBound(), +1) {
-					infSeen = true
-				}
-			}
-			if !infSeen {
-				n, err = writeSample(
-					name+"_bucket", metric,
-					model.BucketLabel, "+Inf",
-					float64(metric.Histogram.GetSampleCount()),
-					out,
-				)
-				if err != nil {
-					return written, err
-				}
-				written += n
-			}
-			n, err = writeSample(
-				name+"_sum", metric, "", "",
-				metric.Histogram.GetSampleSum(),
-				out,
-			)
-			if err != nil {
-				return written, err
-			}
-			written += n
-			n, err = writeSample(
-				name+"_count", metric, "", "",
-				float64(metric.Histogram.GetSampleCount()),
-				out,
-			)
-		default:
-			return written, fmt.Errorf(
-				"unexpected type in metric %s %s", name, metric,
-			)
-		}
-		written += n
-		if err != nil {
-			return written, err
-		}
-	}
-	return written, nil
-}
-
-// writeSample writes a single sample in text format to out, given the metric
-// name, the metric proto message itself, optionally an additional label name
-// and value (use empty strings if not required), and the value. The function
-// returns the number of bytes written and any error encountered.
-func writeSample(
-	name string,
-	metric *dto.Metric,
-	additionalLabelName, additionalLabelValue string,
-	value float64,
-	out io.Writer,
-) (int, error) {
-	var written int
-	n, err := fmt.Fprint(out, name)
-	written += n
-	if err != nil {
-		return written, err
-	}
-	n, err = labelPairsToText(
-		metric.Label,
-		additionalLabelName, additionalLabelValue,
-		out,
-	)
-	written += n
-	if err != nil {
-		return written, err
-	}
-	n, err = fmt.Fprintf(out, " %v", value)
-	written += n
-	if err != nil {
-		return written, err
-	}
-	if metric.TimestampMs != nil {
-		n, err = fmt.Fprintf(out, " %v", *metric.TimestampMs)
-		written += n
-		if err != nil {
-			return written, err
-		}
-	}
-	n, err = out.Write([]byte{'\n'})
-	written += n
-	if err != nil {
-		return written, err
-	}
-	return written, nil
-}
-
-// labelPairsToText converts a slice of LabelPair proto messages plus the
-// explicitly given additional label pair into text formatted as required by the
-// text format and writes it to 'out'. An empty slice in combination with an
-// empty string 'additionalLabelName' results in nothing being
-// written. Otherwise, the label pairs are written, escaped as required by the
-// text format, and enclosed in '{...}'. The function returns the number of
-// bytes written and any error encountered.
-func labelPairsToText(
-	in []*dto.LabelPair,
-	additionalLabelName, additionalLabelValue string,
-	out io.Writer,
-) (int, error) {
-	if len(in) == 0 && additionalLabelName == "" {
-		return 0, nil
-	}
-	var written int
-	separator := '{'
-	for _, lp := range in {
-		n, err := fmt.Fprintf(
-			out, `%c%s="%s"`,
-			separator, lp.GetName(), escapeString(lp.GetValue(), true),
-		)
-		written += n
-		if err != nil {
-			return written, err
-		}
-		separator = ','
-	}
-	if additionalLabelName != "" {
-		n, err := fmt.Fprintf(
-			out, `%c%s="%s"`,
-			separator, additionalLabelName,
-			escapeString(additionalLabelValue, true),
-		)
-		written += n
-		if err != nil {
-			return written, err
-		}
-	}
-	n, err := out.Write([]byte{'}'})
-	written += n
-	if err != nil {
-		return written, err
-	}
-	return written, nil
-}
-
-// escapeString replaces '\' by '\\', new line character by '\n', and - if
-// includeDoubleQuote is true - '"' by '\"'.
-func escapeString(v string, includeDoubleQuote bool) string {
-	result := bytes.NewBuffer(make([]byte, 0, len(v)))
-	for _, c := range v {
-		switch {
-		case c == '\\':
-			result.WriteString(`\\`)
-		case includeDoubleQuote && c == '"':
-			result.WriteString(`\"`)
-		case c == '\n':
-			result.WriteString(`\n`)
-		default:
-			result.WriteRune(c)
-		}
-	}
-	return result.String()
-}
diff --git a/Godeps/_workspace/src/github.com/prometheus/common/expfmt/text_parse.go b/Godeps/_workspace/src/github.com/prometheus/common/expfmt/text_parse.go
deleted file mode 100644
index 84433bc4f..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/common/expfmt/text_parse.go
+++ /dev/null
@@ -1,746 +0,0 @@
-// Copyright 2014 The Prometheus Authors
-// 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 expfmt
-
-import (
-	"bufio"
-	"bytes"
-	"fmt"
-	"io"
-	"math"
-	"strconv"
-	"strings"
-
-	dto "github.com/prometheus/client_model/go"
-
-	"github.com/golang/protobuf/proto"
-	"github.com/prometheus/common/model"
-)
-
-// A stateFn is a function that represents a state in a state machine. By
-// executing it, the state is progressed to the next state. The stateFn returns
-// another stateFn, which represents the new state. The end state is represented
-// by nil.
-type stateFn func() stateFn
-
-// ParseError signals errors while parsing the simple and flat text-based
-// exchange format.
-type ParseError struct {
-	Line int
-	Msg  string
-}
-
-// Error implements the error interface.
-func (e ParseError) Error() string {
-	return fmt.Sprintf("text format parsing error in line %d: %s", e.Line, e.Msg)
-}
-
-// TextParser is used to parse the simple and flat text-based exchange format. Its
-// nil value is ready to use.
-type TextParser struct {
-	metricFamiliesByName map[string]*dto.MetricFamily
-	buf                  *bufio.Reader // Where the parsed input is read through.
-	err                  error         // Most recent error.
-	lineCount            int           // Tracks the line count for error messages.
-	currentByte          byte          // The most recent byte read.
-	currentToken         bytes.Buffer  // Re-used each time a token has to be gathered from multiple bytes.
-	currentMF            *dto.MetricFamily
-	currentMetric        *dto.Metric
-	currentLabelPair     *dto.LabelPair
-
-	// The remaining member variables are only used for summaries/histograms.
-	currentLabels map[string]string // All labels including '__name__' but excluding 'quantile'/'le'
-	// Summary specific.
-	summaries       map[uint64]*dto.Metric // Key is created with LabelsToSignature.
-	currentQuantile float64
-	// Histogram specific.
-	histograms    map[uint64]*dto.Metric // Key is created with LabelsToSignature.
-	currentBucket float64
-	// These tell us if the currently processed line ends on '_count' or
-	// '_sum' respectively and belong to a summary/histogram, representing the sample
-	// count and sum of that summary/histogram.
-	currentIsSummaryCount, currentIsSummarySum     bool
-	currentIsHistogramCount, currentIsHistogramSum bool
-}
-
-// TextToMetricFamilies reads 'in' as the simple and flat text-based exchange
-// format and creates MetricFamily proto messages. It returns the MetricFamily
-// proto messages in a map where the metric names are the keys, along with any
-// error encountered.
-//
-// If the input contains duplicate metrics (i.e. lines with the same metric name
-// and exactly the same label set), the resulting MetricFamily will contain
-// duplicate Metric proto messages. Similar is true for duplicate label
-// names. Checks for duplicates have to be performed separately, if required.
-// Also note that neither the metrics within each MetricFamily are sorted nor
-// the label pairs within each Metric. Sorting is not required for the most
-// frequent use of this method, which is sample ingestion in the Prometheus
-// server. However, for presentation purposes, you might want to sort the
-// metrics, and in some cases, you must sort the labels, e.g. for consumption by
-// the metric family injection hook of the Prometheus registry.
-//
-// Summaries and histograms are rather special beasts. You would probably not
-// use them in the simple text format anyway. This method can deal with
-// summaries and histograms if they are presented in exactly the way the
-// text.Create function creates them.
-//
-// This method must not be called concurrently. If you want to parse different
-// input concurrently, instantiate a separate Parser for each goroutine.
-func (p *TextParser) TextToMetricFamilies(in io.Reader) (map[string]*dto.MetricFamily, error) {
-	p.reset(in)
-	for nextState := p.startOfLine; nextState != nil; nextState = nextState() {
-		// Magic happens here...
-	}
-	// Get rid of empty metric families.
-	for k, mf := range p.metricFamiliesByName {
-		if len(mf.GetMetric()) == 0 {
-			delete(p.metricFamiliesByName, k)
-		}
-	}
-	return p.metricFamiliesByName, p.err
-}
-
-func (p *TextParser) reset(in io.Reader) {
-	p.metricFamiliesByName = map[string]*dto.MetricFamily{}
-	if p.buf == nil {
-		p.buf = bufio.NewReader(in)
-	} else {
-		p.buf.Reset(in)
-	}
-	p.err = nil
-	p.lineCount = 0
-	if p.summaries == nil || len(p.summaries) > 0 {
-		p.summaries = map[uint64]*dto.Metric{}
-	}
-	if p.histograms == nil || len(p.histograms) > 0 {
-		p.histograms = map[uint64]*dto.Metric{}
-	}
-	p.currentQuantile = math.NaN()
-	p.currentBucket = math.NaN()
-}
-
-// startOfLine represents the state where the next byte read from p.buf is the
-// start of a line (or whitespace leading up to it).
-func (p *TextParser) startOfLine() stateFn {
-	p.lineCount++
-	if p.skipBlankTab(); p.err != nil {
-		// End of input reached. This is the only case where
-		// that is not an error but a signal that we are done.
-		p.err = nil
-		return nil
-	}
-	switch p.currentByte {
-	case '#':
-		return p.startComment
-	case '\n':
-		return p.startOfLine // Empty line, start the next one.
-	}
-	return p.readingMetricName
-}
-
-// startComment represents the state where the next byte read from p.buf is the
-// start of a comment (or whitespace leading up to it).
-func (p *TextParser) startComment() stateFn {
-	if p.skipBlankTab(); p.err != nil {
-		return nil // Unexpected end of input.
-	}
-	if p.currentByte == '\n' {
-		return p.startOfLine
-	}
-	if p.readTokenUntilWhitespace(); p.err != nil {
-		return nil // Unexpected end of input.
-	}
-	// If we have hit the end of line already, there is nothing left
-	// to do. This is not considered a syntax error.
-	if p.currentByte == '\n' {
-		return p.startOfLine
-	}
-	keyword := p.currentToken.String()
-	if keyword != "HELP" && keyword != "TYPE" {
-		// Generic comment, ignore by fast forwarding to end of line.
-		for p.currentByte != '\n' {
-			if p.currentByte, p.err = p.buf.ReadByte(); p.err != nil {
-				return nil // Unexpected end of input.
-			}
-		}
-		return p.startOfLine
-	}
-	// There is something. Next has to be a metric name.
-	if p.skipBlankTab(); p.err != nil {
-		return nil // Unexpected end of input.
-	}
-	if p.readTokenAsMetricName(); p.err != nil {
-		return nil // Unexpected end of input.
-	}
-	if p.currentByte == '\n' {
-		// At the end of the line already.
-		// Again, this is not considered a syntax error.
-		return p.startOfLine
-	}
-	if !isBlankOrTab(p.currentByte) {
-		p.parseError("invalid metric name in comment")
-		return nil
-	}
-	p.setOrCreateCurrentMF()
-	if p.skipBlankTab(); p.err != nil {
-		return nil // Unexpected end of input.
-	}
-	if p.currentByte == '\n' {
-		// At the end of the line already.
-		// Again, this is not considered a syntax error.
-		return p.startOfLine
-	}
-	switch keyword {
-	case "HELP":
-		return p.readingHelp
-	case "TYPE":
-		return p.readingType
-	}
-	panic(fmt.Sprintf("code error: unexpected keyword %q", keyword))
-}
-
-// readingMetricName represents the state where the last byte read (now in
-// p.currentByte) is the first byte of a metric name.
-func (p *TextParser) readingMetricName() stateFn {
-	if p.readTokenAsMetricName(); p.err != nil {
-		return nil
-	}
-	if p.currentToken.Len() == 0 {
-		p.parseError("invalid metric name")
-		return nil
-	}
-	p.setOrCreateCurrentMF()
-	// Now is the time to fix the type if it hasn't happened yet.
-	if p.currentMF.Type == nil {
-		p.currentMF.Type = dto.MetricType_UNTYPED.Enum()
-	}
-	p.currentMetric = &dto.Metric{}
-	// Do not append the newly created currentMetric to
-	// currentMF.Metric right now. First wait if this is a summary,
-	// and the metric exists already, which we can only know after
-	// having read all the labels.
-	if p.skipBlankTabIfCurrentBlankTab(); p.err != nil {
-		return nil // Unexpected end of input.
-	}
-	return p.readingLabels
-}
-
-// readingLabels represents the state where the last byte read (now in
-// p.currentByte) is either the first byte of the label set (i.e. a '{'), or the
-// first byte of the value (otherwise).
-func (p *TextParser) readingLabels() stateFn {
-	// Summaries/histograms are special. We have to reset the
-	// currentLabels map, currentQuantile and currentBucket before starting to
-	// read labels.
-	if p.currentMF.GetType() == dto.MetricType_SUMMARY || p.currentMF.GetType() == dto.MetricType_HISTOGRAM {
-		p.currentLabels = map[string]string{}
-		p.currentLabels[string(model.MetricNameLabel)] = p.currentMF.GetName()
-		p.currentQuantile = math.NaN()
-		p.currentBucket = math.NaN()
-	}
-	if p.currentByte != '{' {
-		return p.readingValue
-	}
-	return p.startLabelName
-}
-
-// startLabelName represents the state where the next byte read from p.buf is
-// the start of a label name (or whitespace leading up to it).
-func (p *TextParser) startLabelName() stateFn {
-	if p.skipBlankTab(); p.err != nil {
-		return nil // Unexpected end of input.
-	}
-	if p.currentByte == '}' {
-		if p.skipBlankTab(); p.err != nil {
-			return nil // Unexpected end of input.
-		}
-		return p.readingValue
-	}
-	if p.readTokenAsLabelName(); p.err != nil {
-		return nil // Unexpected end of input.
-	}
-	if p.currentToken.Len() == 0 {
-		p.parseError(fmt.Sprintf("invalid label name for metric %q", p.currentMF.GetName()))
-		return nil
-	}
-	p.currentLabelPair = &dto.LabelPair{Name: proto.String(p.currentToken.String())}
-	if p.currentLabelPair.GetName() == string(model.MetricNameLabel) {
-		p.parseError(fmt.Sprintf("label name %q is reserved", model.MetricNameLabel))
-		return nil
-	}
-	// Special summary/histogram treatment. Don't add 'quantile' and 'le'
-	// labels to 'real' labels.
-	if !(p.currentMF.GetType() == dto.MetricType_SUMMARY && p.currentLabelPair.GetName() == model.QuantileLabel) &&
-		!(p.currentMF.GetType() == dto.MetricType_HISTOGRAM && p.currentLabelPair.GetName() == model.BucketLabel) {
-		p.currentMetric.Label = append(p.currentMetric.Label, p.currentLabelPair)
-	}
-	if p.skipBlankTabIfCurrentBlankTab(); p.err != nil {
-		return nil // Unexpected end of input.
-	}
-	if p.currentByte != '=' {
-		p.parseError(fmt.Sprintf("expected '=' after label name, found %q", p.currentByte))
-		return nil
-	}
-	return p.startLabelValue
-}
-
-// startLabelValue represents the state where the next byte read from p.buf is
-// the start of a (quoted) label value (or whitespace leading up to it).
-func (p *TextParser) startLabelValue() stateFn {
-	if p.skipBlankTab(); p.err != nil {
-		return nil // Unexpected end of input.
-	}
-	if p.currentByte != '"' {
-		p.parseError(fmt.Sprintf("expected '\"' at start of label value, found %q", p.currentByte))
-		return nil
-	}
-	if p.readTokenAsLabelValue(); p.err != nil {
-		return nil
-	}
-	p.currentLabelPair.Value = proto.String(p.currentToken.String())
-	// Special treatment of summaries:
-	// - Quantile labels are special, will result in dto.Quantile later.
-	// - Other labels have to be added to currentLabels for signature calculation.
-	if p.currentMF.GetType() == dto.MetricType_SUMMARY {
-		if p.currentLabelPair.GetName() == model.QuantileLabel {
-			if p.currentQuantile, p.err = strconv.ParseFloat(p.currentLabelPair.GetValue(), 64); p.err != nil {
-				// Create a more helpful error message.
-				p.parseError(fmt.Sprintf("expected float as value for 'quantile' label, got %q", p.currentLabelPair.GetValue()))
-				return nil
-			}
-		} else {
-			p.currentLabels[p.currentLabelPair.GetName()] = p.currentLabelPair.GetValue()
-		}
-	}
-	// Similar special treatment of histograms.
-	if p.currentMF.GetType() == dto.MetricType_HISTOGRAM {
-		if p.currentLabelPair.GetName() == model.BucketLabel {
-			if p.currentBucket, p.err = strconv.ParseFloat(p.currentLabelPair.GetValue(), 64); p.err != nil {
-				// Create a more helpful error message.
-				p.parseError(fmt.Sprintf("expected float as value for 'le' label, got %q", p.currentLabelPair.GetValue()))
-				return nil
-			}
-		} else {
-			p.currentLabels[p.currentLabelPair.GetName()] = p.currentLabelPair.GetValue()
-		}
-	}
-	if p.skipBlankTab(); p.err != nil {
-		return nil // Unexpected end of input.
-	}
-	switch p.currentByte {
-	case ',':
-		return p.startLabelName
-
-	case '}':
-		if p.skipBlankTab(); p.err != nil {
-			return nil // Unexpected end of input.
-		}
-		return p.readingValue
-	default:
-		p.parseError(fmt.Sprintf("unexpected end of label value %q", p.currentLabelPair.Value))
-		return nil
-	}
-}
-
-// readingValue represents the state where the last byte read (now in
-// p.currentByte) is the first byte of the sample value (i.e. a float).
-func (p *TextParser) readingValue() stateFn {
-	// When we are here, we have read all the labels, so for the
-	// special case of a summary/histogram, we can finally find out
-	// if the metric already exists.
-	if p.currentMF.GetType() == dto.MetricType_SUMMARY {
-		signature := model.LabelsToSignature(p.currentLabels)
-		if summary := p.summaries[signature]; summary != nil {
-			p.currentMetric = summary
-		} else {
-			p.summaries[signature] = p.currentMetric
-			p.currentMF.Metric = append(p.currentMF.Metric, p.currentMetric)
-		}
-	} else if p.currentMF.GetType() == dto.MetricType_HISTOGRAM {
-		signature := model.LabelsToSignature(p.currentLabels)
-		if histogram := p.histograms[signature]; histogram != nil {
-			p.currentMetric = histogram
-		} else {
-			p.histograms[signature] = p.currentMetric
-			p.currentMF.Metric = append(p.currentMF.Metric, p.currentMetric)
-		}
-	} else {
-		p.currentMF.Metric = append(p.currentMF.Metric, p.currentMetric)
-	}
-	if p.readTokenUntilWhitespace(); p.err != nil {
-		return nil // Unexpected end of input.
-	}
-	value, err := strconv.ParseFloat(p.currentToken.String(), 64)
-	if err != nil {
-		// Create a more helpful error message.
-		p.parseError(fmt.Sprintf("expected float as value, got %q", p.currentToken.String()))
-		return nil
-	}
-	switch p.currentMF.GetType() {
-	case dto.MetricType_COUNTER:
-		p.currentMetric.Counter = &dto.Counter{Value: proto.Float64(value)}
-	case dto.MetricType_GAUGE:
-		p.currentMetric.Gauge = &dto.Gauge{Value: proto.Float64(value)}
-	case dto.MetricType_UNTYPED:
-		p.currentMetric.Untyped = &dto.Untyped{Value: proto.Float64(value)}
-	case dto.MetricType_SUMMARY:
-		// *sigh*
-		if p.currentMetric.Summary == nil {
-			p.currentMetric.Summary = &dto.Summary{}
-		}
-		switch {
-		case p.currentIsSummaryCount:
-			p.currentMetric.Summary.SampleCount = proto.Uint64(uint64(value))
-		case p.currentIsSummarySum:
-			p.currentMetric.Summary.SampleSum = proto.Float64(value)
-		case !math.IsNaN(p.currentQuantile):
-			p.currentMetric.Summary.Quantile = append(
-				p.currentMetric.Summary.Quantile,
-				&dto.Quantile{
-					Quantile: proto.Float64(p.currentQuantile),
-					Value:    proto.Float64(value),
-				},
-			)
-		}
-	case dto.MetricType_HISTOGRAM:
-		// *sigh*
-		if p.currentMetric.Histogram == nil {
-			p.currentMetric.Histogram = &dto.Histogram{}
-		}
-		switch {
-		case p.currentIsHistogramCount:
-			p.currentMetric.Histogram.SampleCount = proto.Uint64(uint64(value))
-		case p.currentIsHistogramSum:
-			p.currentMetric.Histogram.SampleSum = proto.Float64(value)
-		case !math.IsNaN(p.currentBucket):
-			p.currentMetric.Histogram.Bucket = append(
-				p.currentMetric.Histogram.Bucket,
-				&dto.Bucket{
-					UpperBound:      proto.Float64(p.currentBucket),
-					CumulativeCount: proto.Uint64(uint64(value)),
-				},
-			)
-		}
-	default:
-		p.err = fmt.Errorf("unexpected type for metric name %q", p.currentMF.GetName())
-	}
-	if p.currentByte == '\n' {
-		return p.startOfLine
-	}
-	return p.startTimestamp
-}
-
-// startTimestamp represents the state where the next byte read from p.buf is
-// the start of the timestamp (or whitespace leading up to it).
-func (p *TextParser) startTimestamp() stateFn {
-	if p.skipBlankTab(); p.err != nil {
-		return nil // Unexpected end of input.
-	}
-	if p.readTokenUntilWhitespace(); p.err != nil {
-		return nil // Unexpected end of input.
-	}
-	timestamp, err := strconv.ParseInt(p.currentToken.String(), 10, 64)
-	if err != nil {
-		// Create a more helpful error message.
-		p.parseError(fmt.Sprintf("expected integer as timestamp, got %q", p.currentToken.String()))
-		return nil
-	}
-	p.currentMetric.TimestampMs = proto.Int64(timestamp)
-	if p.readTokenUntilNewline(false); p.err != nil {
-		return nil // Unexpected end of input.
-	}
-	if p.currentToken.Len() > 0 {
-		p.parseError(fmt.Sprintf("spurious string after timestamp: %q", p.currentToken.String()))
-		return nil
-	}
-	return p.startOfLine
-}
-
-// readingHelp represents the state where the last byte read (now in
-// p.currentByte) is the first byte of the docstring after 'HELP'.
-func (p *TextParser) readingHelp() stateFn {
-	if p.currentMF.Help != nil {
-		p.parseError(fmt.Sprintf("second HELP line for metric name %q", p.currentMF.GetName()))
-		return nil
-	}
-	// Rest of line is the docstring.
-	if p.readTokenUntilNewline(true); p.err != nil {
-		return nil // Unexpected end of input.
-	}
-	p.currentMF.Help = proto.String(p.currentToken.String())
-	return p.startOfLine
-}
-
-// readingType represents the state where the last byte read (now in
-// p.currentByte) is the first byte of the type hint after 'HELP'.
-func (p *TextParser) readingType() stateFn {
-	if p.currentMF.Type != nil {
-		p.parseError(fmt.Sprintf("second TYPE line for metric name %q, or TYPE reported after samples", p.currentMF.GetName()))
-		return nil
-	}
-	// Rest of line is the type.
-	if p.readTokenUntilNewline(false); p.err != nil {
-		return nil // Unexpected end of input.
-	}
-	metricType, ok := dto.MetricType_value[strings.ToUpper(p.currentToken.String())]
-	if !ok {
-		p.parseError(fmt.Sprintf("unknown metric type %q", p.currentToken.String()))
-		return nil
-	}
-	p.currentMF.Type = dto.MetricType(metricType).Enum()
-	return p.startOfLine
-}
-
-// parseError sets p.err to a ParseError at the current line with the given
-// message.
-func (p *TextParser) parseError(msg string) {
-	p.err = ParseError{
-		Line: p.lineCount,
-		Msg:  msg,
-	}
-}
-
-// skipBlankTab reads (and discards) bytes from p.buf until it encounters a byte
-// that is neither ' ' nor '\t'. That byte is left in p.currentByte.
-func (p *TextParser) skipBlankTab() {
-	for {
-		if p.currentByte, p.err = p.buf.ReadByte(); p.err != nil || !isBlankOrTab(p.currentByte) {
-			return
-		}
-	}
-}
-
-// skipBlankTabIfCurrentBlankTab works exactly as skipBlankTab but doesn't do
-// anything if p.currentByte is neither ' ' nor '\t'.
-func (p *TextParser) skipBlankTabIfCurrentBlankTab() {
-	if isBlankOrTab(p.currentByte) {
-		p.skipBlankTab()
-	}
-}
-
-// readTokenUntilWhitespace copies bytes from p.buf into p.currentToken.  The
-// first byte considered is the byte already read (now in p.currentByte).  The
-// first whitespace byte encountered is still copied into p.currentByte, but not
-// into p.currentToken.
-func (p *TextParser) readTokenUntilWhitespace() {
-	p.currentToken.Reset()
-	for p.err == nil && !isBlankOrTab(p.currentByte) && p.currentByte != '\n' {
-		p.currentToken.WriteByte(p.currentByte)
-		p.currentByte, p.err = p.buf.ReadByte()
-	}
-}
-
-// readTokenUntilNewline copies bytes from p.buf into p.currentToken.  The first
-// byte considered is the byte already read (now in p.currentByte).  The first
-// newline byte encountered is still copied into p.currentByte, but not into
-// p.currentToken. If recognizeEscapeSequence is true, two escape sequences are
-// recognized: '\\' tranlates into '\', and '\n' into a line-feed character. All
-// other escape sequences are invalid and cause an error.
-func (p *TextParser) readTokenUntilNewline(recognizeEscapeSequence bool) {
-	p.currentToken.Reset()
-	escaped := false
-	for p.err == nil {
-		if recognizeEscapeSequence && escaped {
-			switch p.currentByte {
-			case '\\':
-				p.currentToken.WriteByte(p.currentByte)
-			case 'n':
-				p.currentToken.WriteByte('\n')
-			default:
-				p.parseError(fmt.Sprintf("invalid escape sequence '\\%c'", p.currentByte))
-				return
-			}
-			escaped = false
-		} else {
-			switch p.currentByte {
-			case '\n':
-				return
-			case '\\':
-				escaped = true
-			default:
-				p.currentToken.WriteByte(p.currentByte)
-			}
-		}
-		p.currentByte, p.err = p.buf.ReadByte()
-	}
-}
-
-// readTokenAsMetricName copies a metric name from p.buf into p.currentToken.
-// The first byte considered is the byte already read (now in p.currentByte).
-// The first byte not part of a metric name is still copied into p.currentByte,
-// but not into p.currentToken.
-func (p *TextParser) readTokenAsMetricName() {
-	p.currentToken.Reset()
-	if !isValidMetricNameStart(p.currentByte) {
-		return
-	}
-	for {
-		p.currentToken.WriteByte(p.currentByte)
-		p.currentByte, p.err = p.buf.ReadByte()
-		if p.err != nil || !isValidMetricNameContinuation(p.currentByte) {
-			return
-		}
-	}
-}
-
-// readTokenAsLabelName copies a label name from p.buf into p.currentToken.
-// The first byte considered is the byte already read (now in p.currentByte).
-// The first byte not part of a label name is still copied into p.currentByte,
-// but not into p.currentToken.
-func (p *TextParser) readTokenAsLabelName() {
-	p.currentToken.Reset()
-	if !isValidLabelNameStart(p.currentByte) {
-		return
-	}
-	for {
-		p.currentToken.WriteByte(p.currentByte)
-		p.currentByte, p.err = p.buf.ReadByte()
-		if p.err != nil || !isValidLabelNameContinuation(p.currentByte) {
-			return
-		}
-	}
-}
-
-// readTokenAsLabelValue copies a label value from p.buf into p.currentToken.
-// In contrast to the other 'readTokenAs...' functions, which start with the
-// last read byte in p.currentByte, this method ignores p.currentByte and starts
-// with reading a new byte from p.buf. The first byte not part of a label value
-// is still copied into p.currentByte, but not into p.currentToken.
-func (p *TextParser) readTokenAsLabelValue() {
-	p.currentToken.Reset()
-	escaped := false
-	for {
-		if p.currentByte, p.err = p.buf.ReadByte(); p.err != nil {
-			return
-		}
-		if escaped {
-			switch p.currentByte {
-			case '"', '\\':
-				p.currentToken.WriteByte(p.currentByte)
-			case 'n':
-				p.currentToken.WriteByte('\n')
-			default:
-				p.parseError(fmt.Sprintf("invalid escape sequence '\\%c'", p.currentByte))
-				return
-			}
-			escaped = false
-			continue
-		}
-		switch p.currentByte {
-		case '"':
-			return
-		case '\n':
-			p.parseError(fmt.Sprintf("label value %q contains unescaped new-line", p.currentToken.String()))
-			return
-		case '\\':
-			escaped = true
-		default:
-			p.currentToken.WriteByte(p.currentByte)
-		}
-	}
-}
-
-func (p *TextParser) setOrCreateCurrentMF() {
-	p.currentIsSummaryCount = false
-	p.currentIsSummarySum = false
-	p.currentIsHistogramCount = false
-	p.currentIsHistogramSum = false
-	name := p.currentToken.String()
-	if p.currentMF = p.metricFamiliesByName[name]; p.currentMF != nil {
-		return
-	}
-	// Try out if this is a _sum or _count for a summary/histogram.
-	summaryName := summaryMetricName(name)
-	if p.currentMF = p.metricFamiliesByName[summaryName]; p.currentMF != nil {
-		if p.currentMF.GetType() == dto.MetricType_SUMMARY {
-			if isCount(name) {
-				p.currentIsSummaryCount = true
-			}
-			if isSum(name) {
-				p.currentIsSummarySum = true
-			}
-			return
-		}
-	}
-	histogramName := histogramMetricName(name)
-	if p.currentMF = p.metricFamiliesByName[histogramName]; p.currentMF != nil {
-		if p.currentMF.GetType() == dto.MetricType_HISTOGRAM {
-			if isCount(name) {
-				p.currentIsHistogramCount = true
-			}
-			if isSum(name) {
-				p.currentIsHistogramSum = true
-			}
-			return
-		}
-	}
-	p.currentMF = &dto.MetricFamily{Name: proto.String(name)}
-	p.metricFamiliesByName[name] = p.currentMF
-}
-
-func isValidLabelNameStart(b byte) bool {
-	return (b >= 'a' && b <= 'z') || (b >= 'A' && b <= 'Z') || b == '_'
-}
-
-func isValidLabelNameContinuation(b byte) bool {
-	return isValidLabelNameStart(b) || (b >= '0' && b <= '9')
-}
-
-func isValidMetricNameStart(b byte) bool {
-	return isValidLabelNameStart(b) || b == ':'
-}
-
-func isValidMetricNameContinuation(b byte) bool {
-	return isValidLabelNameContinuation(b) || b == ':'
-}
-
-func isBlankOrTab(b byte) bool {
-	return b == ' ' || b == '\t'
-}
-
-func isCount(name string) bool {
-	return len(name) > 6 && name[len(name)-6:] == "_count"
-}
-
-func isSum(name string) bool {
-	return len(name) > 4 && name[len(name)-4:] == "_sum"
-}
-
-func isBucket(name string) bool {
-	return len(name) > 7 && name[len(name)-7:] == "_bucket"
-}
-
-func summaryMetricName(name string) string {
-	switch {
-	case isCount(name):
-		return name[:len(name)-6]
-	case isSum(name):
-		return name[:len(name)-4]
-	default:
-		return name
-	}
-}
-
-func histogramMetricName(name string) string {
-	switch {
-	case isCount(name):
-		return name[:len(name)-6]
-	case isSum(name):
-		return name[:len(name)-4]
-	case isBucket(name):
-		return name[:len(name)-7]
-	default:
-		return name
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/prometheus/common/model/alert.go b/Godeps/_workspace/src/github.com/prometheus/common/model/alert.go
deleted file mode 100644
index b027e9f3d..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/common/model/alert.go
+++ /dev/null
@@ -1,109 +0,0 @@
-// Copyright 2013 The Prometheus Authors
-// 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 model
-
-import (
-	"fmt"
-	"time"
-)
-
-type AlertStatus string
-
-const (
-	AlertFiring   AlertStatus = "firing"
-	AlertResolved AlertStatus = "resolved"
-)
-
-// Alert is a generic representation of an alert in the Prometheus eco-system.
-type Alert struct {
-	// Label value pairs for purpose of aggregation, matching, and disposition
-	// dispatching. This must minimally include an "alertname" label.
-	Labels LabelSet `json:"labels"`
-
-	// Extra key/value information which does not define alert identity.
-	Annotations LabelSet `json:"annotations"`
-
-	// The known time range for this alert. Both ends are optional.
-	StartsAt time.Time `json:"startsAt,omitempty"`
-	EndsAt   time.Time `json:"endsAt,omitempty"`
-}
-
-// Name returns the name of the alert. It is equivalent to the "alertname" label.
-func (a *Alert) Name() string {
-	return string(a.Labels[AlertNameLabel])
-}
-
-// Fingerprint returns a unique hash for the alert. It is equivalent to
-// the fingerprint of the alert's label set.
-func (a *Alert) Fingerprint() Fingerprint {
-	return a.Labels.Fingerprint()
-}
-
-func (a *Alert) String() string {
-	s := fmt.Sprintf("%s[%s]", a.Name(), a.Fingerprint().String()[:7])
-	if a.Resolved() {
-		return s + "[resolved]"
-	}
-	return s + "[active]"
-}
-
-// Resolved returns true iff the activity interval ended in the past.
-func (a *Alert) Resolved() bool {
-	if a.EndsAt.IsZero() {
-		return false
-	}
-	return !a.EndsAt.After(time.Now())
-}
-
-// Status returns the status of the alert.
-func (a *Alert) Status() AlertStatus {
-	if a.Resolved() {
-		return AlertResolved
-	}
-	return AlertFiring
-}
-
-// Alert is a list of alerts that can be sorted in chronological order.
-type Alerts []*Alert
-
-func (as Alerts) Len() int      { return len(as) }
-func (as Alerts) Swap(i, j int) { as[i], as[j] = as[j], as[i] }
-
-func (as Alerts) Less(i, j int) bool {
-	if as[i].StartsAt.Before(as[j].StartsAt) {
-		return true
-	}
-	if as[i].EndsAt.Before(as[j].EndsAt) {
-		return true
-	}
-	return as[i].Fingerprint() < as[j].Fingerprint()
-}
-
-// HasFiring returns true iff one of the alerts is not resolved.
-func (as Alerts) HasFiring() bool {
-	for _, a := range as {
-		if !a.Resolved() {
-			return true
-		}
-	}
-	return false
-}
-
-// Status returns StatusFiring iff at least one of the alerts is firing.
-func (as Alerts) Status() AlertStatus {
-	if as.HasFiring() {
-		return AlertFiring
-	}
-	return AlertResolved
-}
diff --git a/Godeps/_workspace/src/github.com/prometheus/common/model/fingerprinting.go b/Godeps/_workspace/src/github.com/prometheus/common/model/fingerprinting.go
deleted file mode 100644
index fc4de4106..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/common/model/fingerprinting.go
+++ /dev/null
@@ -1,105 +0,0 @@
-// Copyright 2013 The Prometheus Authors
-// 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 model
-
-import (
-	"fmt"
-	"strconv"
-)
-
-// Fingerprint provides a hash-capable representation of a Metric.
-// For our purposes, FNV-1A 64-bit is used.
-type Fingerprint uint64
-
-// FingerprintFromString transforms a string representation into a Fingerprint.
-func FingerprintFromString(s string) (Fingerprint, error) {
-	num, err := strconv.ParseUint(s, 16, 64)
-	return Fingerprint(num), err
-}
-
-// ParseFingerprint parses the input string into a fingerprint.
-func ParseFingerprint(s string) (Fingerprint, error) {
-	num, err := strconv.ParseUint(s, 16, 64)
-	if err != nil {
-		return 0, err
-	}
-	return Fingerprint(num), nil
-}
-
-func (f Fingerprint) String() string {
-	return fmt.Sprintf("%016x", uint64(f))
-}
-
-// Fingerprints represents a collection of Fingerprint subject to a given
-// natural sorting scheme. It implements sort.Interface.
-type Fingerprints []Fingerprint
-
-// Len implements sort.Interface.
-func (f Fingerprints) Len() int {
-	return len(f)
-}
-
-// Less implements sort.Interface.
-func (f Fingerprints) Less(i, j int) bool {
-	return f[i] < f[j]
-}
-
-// Swap implements sort.Interface.
-func (f Fingerprints) Swap(i, j int) {
-	f[i], f[j] = f[j], f[i]
-}
-
-// FingerprintSet is a set of Fingerprints.
-type FingerprintSet map[Fingerprint]struct{}
-
-// Equal returns true if both sets contain the same elements (and not more).
-func (s FingerprintSet) Equal(o FingerprintSet) bool {
-	if len(s) != len(o) {
-		return false
-	}
-
-	for k := range s {
-		if _, ok := o[k]; !ok {
-			return false
-		}
-	}
-
-	return true
-}
-
-// Intersection returns the elements contained in both sets.
-func (s FingerprintSet) Intersection(o FingerprintSet) FingerprintSet {
-	myLength, otherLength := len(s), len(o)
-	if myLength == 0 || otherLength == 0 {
-		return FingerprintSet{}
-	}
-
-	subSet := s
-	superSet := o
-
-	if otherLength < myLength {
-		subSet = o
-		superSet = s
-	}
-
-	out := FingerprintSet{}
-
-	for k := range subSet {
-		if _, ok := superSet[k]; ok {
-			out[k] = struct{}{}
-		}
-	}
-
-	return out
-}
diff --git a/Godeps/_workspace/src/github.com/prometheus/common/model/labels.go b/Godeps/_workspace/src/github.com/prometheus/common/model/labels.go
deleted file mode 100644
index 6459c8f79..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/common/model/labels.go
+++ /dev/null
@@ -1,188 +0,0 @@
-// Copyright 2013 The Prometheus Authors
-// 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 model
-
-import (
-	"encoding/json"
-	"fmt"
-	"regexp"
-	"sort"
-	"strings"
-)
-
-const (
-	// AlertNameLabel is the name of the label containing the an alert's name.
-	AlertNameLabel = "alertname"
-
-	// ExportedLabelPrefix is the prefix to prepend to the label names present in
-	// exported metrics if a label of the same name is added by the server.
-	ExportedLabelPrefix = "exported_"
-
-	// MetricNameLabel is the label name indicating the metric name of a
-	// timeseries.
-	MetricNameLabel = "__name__"
-
-	// SchemeLabel is the name of the label that holds the scheme on which to
-	// scrape a target.
-	SchemeLabel = "__scheme__"
-
-	// AddressLabel is the name of the label that holds the address of
-	// a scrape target.
-	AddressLabel = "__address__"
-
-	// MetricsPathLabel is the name of the label that holds the path on which to
-	// scrape a target.
-	MetricsPathLabel = "__metrics_path__"
-
-	// ReservedLabelPrefix is a prefix which is not legal in user-supplied
-	// label names.
-	ReservedLabelPrefix = "__"
-
-	// MetaLabelPrefix is a prefix for labels that provide meta information.
-	// Labels with this prefix are used for intermediate label processing and
-	// will not be attached to time series.
-	MetaLabelPrefix = "__meta_"
-
-	// TmpLabelPrefix is a prefix for temporary labels as part of relabelling.
-	// Labels with this prefix are used for intermediate label processing and
-	// will not be attached to time series. This is reserved for use in
-	// Prometheus configuration files by users.
-	TmpLabelPrefix = "__tmp_"
-
-	// ParamLabelPrefix is a prefix for labels that provide URL parameters
-	// used to scrape a target.
-	ParamLabelPrefix = "__param_"
-
-	// JobLabel is the label name indicating the job from which a timeseries
-	// was scraped.
-	JobLabel = "job"
-
-	// InstanceLabel is the label name used for the instance label.
-	InstanceLabel = "instance"
-
-	// BucketLabel is used for the label that defines the upper bound of a
-	// bucket of a histogram ("le" -> "less or equal").
-	BucketLabel = "le"
-
-	// QuantileLabel is used for the label that defines the quantile in a
-	// summary.
-	QuantileLabel = "quantile"
-)
-
-// LabelNameRE is a regular expression matching valid label names.
-var LabelNameRE = regexp.MustCompile("^[a-zA-Z_][a-zA-Z0-9_]*$")
-
-// A LabelName is a key for a LabelSet or Metric.  It has a value associated
-// therewith.
-type LabelName string
-
-// UnmarshalYAML implements the yaml.Unmarshaler interface.
-func (ln *LabelName) UnmarshalYAML(unmarshal func(interface{}) error) error {
-	var s string
-	if err := unmarshal(&s); err != nil {
-		return err
-	}
-	if !LabelNameRE.MatchString(s) {
-		return fmt.Errorf("%q is not a valid label name", s)
-	}
-	*ln = LabelName(s)
-	return nil
-}
-
-// UnmarshalJSON implements the json.Unmarshaler interface.
-func (ln *LabelName) UnmarshalJSON(b []byte) error {
-	var s string
-	if err := json.Unmarshal(b, &s); err != nil {
-		return err
-	}
-	if !LabelNameRE.MatchString(s) {
-		return fmt.Errorf("%q is not a valid label name", s)
-	}
-	*ln = LabelName(s)
-	return nil
-}
-
-// LabelNames is a sortable LabelName slice. In implements sort.Interface.
-type LabelNames []LabelName
-
-func (l LabelNames) Len() int {
-	return len(l)
-}
-
-func (l LabelNames) Less(i, j int) bool {
-	return l[i] < l[j]
-}
-
-func (l LabelNames) Swap(i, j int) {
-	l[i], l[j] = l[j], l[i]
-}
-
-func (l LabelNames) String() string {
-	labelStrings := make([]string, 0, len(l))
-	for _, label := range l {
-		labelStrings = append(labelStrings, string(label))
-	}
-	return strings.Join(labelStrings, ", ")
-}
-
-// A LabelValue is an associated value for a LabelName.
-type LabelValue string
-
-// LabelValues is a sortable LabelValue slice. It implements sort.Interface.
-type LabelValues []LabelValue
-
-func (l LabelValues) Len() int {
-	return len(l)
-}
-
-func (l LabelValues) Less(i, j int) bool {
-	return sort.StringsAreSorted([]string{string(l[i]), string(l[j])})
-}
-
-func (l LabelValues) Swap(i, j int) {
-	l[i], l[j] = l[j], l[i]
-}
-
-// LabelPair pairs a name with a value.
-type LabelPair struct {
-	Name  LabelName
-	Value LabelValue
-}
-
-// LabelPairs is a sortable slice of LabelPair pointers. It implements
-// sort.Interface.
-type LabelPairs []*LabelPair
-
-func (l LabelPairs) Len() int {
-	return len(l)
-}
-
-func (l LabelPairs) Less(i, j int) bool {
-	switch {
-	case l[i].Name > l[j].Name:
-		return false
-	case l[i].Name < l[j].Name:
-		return true
-	case l[i].Value > l[j].Value:
-		return false
-	case l[i].Value < l[j].Value:
-		return true
-	default:
-		return false
-	}
-}
-
-func (l LabelPairs) Swap(i, j int) {
-	l[i], l[j] = l[j], l[i]
-}
diff --git a/Godeps/_workspace/src/github.com/prometheus/common/model/labelset.go b/Godeps/_workspace/src/github.com/prometheus/common/model/labelset.go
deleted file mode 100644
index 142b9d1e2..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/common/model/labelset.go
+++ /dev/null
@@ -1,153 +0,0 @@
-// Copyright 2013 The Prometheus Authors
-// 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 model
-
-import (
-	"encoding/json"
-	"fmt"
-	"sort"
-	"strings"
-)
-
-// A LabelSet is a collection of LabelName and LabelValue pairs.  The LabelSet
-// may be fully-qualified down to the point where it may resolve to a single
-// Metric in the data store or not.  All operations that occur within the realm
-// of a LabelSet can emit a vector of Metric entities to which the LabelSet may
-// match.
-type LabelSet map[LabelName]LabelValue
-
-func (ls LabelSet) Equal(o LabelSet) bool {
-	if len(ls) != len(o) {
-		return false
-	}
-	for ln, lv := range ls {
-		olv, ok := o[ln]
-		if !ok {
-			return false
-		}
-		if olv != lv {
-			return false
-		}
-	}
-	return true
-}
-
-// Before compares the metrics, using the following criteria:
-//
-// If m has fewer labels than o, it is before o. If it has more, it is not.
-//
-// If the number of labels is the same, the superset of all label names is
-// sorted alphanumerically. The first differing label pair found in that order
-// determines the outcome: If the label does not exist at all in m, then m is
-// before o, and vice versa. Otherwise the label value is compared
-// alphanumerically.
-//
-// If m and o are equal, the method returns false.
-func (ls LabelSet) Before(o LabelSet) bool {
-	if len(ls) < len(o) {
-		return true
-	}
-	if len(ls) > len(o) {
-		return false
-	}
-
-	lns := make(LabelNames, 0, len(ls)+len(o))
-	for ln := range ls {
-		lns = append(lns, ln)
-	}
-	for ln := range o {
-		lns = append(lns, ln)
-	}
-	// It's probably not worth it to de-dup lns.
-	sort.Sort(lns)
-	for _, ln := range lns {
-		mlv, ok := ls[ln]
-		if !ok {
-			return true
-		}
-		olv, ok := o[ln]
-		if !ok {
-			return false
-		}
-		if mlv < olv {
-			return true
-		}
-		if mlv > olv {
-			return false
-		}
-	}
-	return false
-}
-
-func (ls LabelSet) Clone() LabelSet {
-	lsn := make(LabelSet, len(ls))
-	for ln, lv := range ls {
-		lsn[ln] = lv
-	}
-	return lsn
-}
-
-// Merge is a helper function to non-destructively merge two label sets.
-func (l LabelSet) Merge(other LabelSet) LabelSet {
-	result := make(LabelSet, len(l))
-
-	for k, v := range l {
-		result[k] = v
-	}
-
-	for k, v := range other {
-		result[k] = v
-	}
-
-	return result
-}
-
-func (l LabelSet) String() string {
-	lstrs := make([]string, 0, len(l))
-	for l, v := range l {
-		lstrs = append(lstrs, fmt.Sprintf("%s=%q", l, v))
-	}
-
-	sort.Strings(lstrs)
-	return fmt.Sprintf("{%s}", strings.Join(lstrs, ", "))
-}
-
-// Fingerprint returns the LabelSet's fingerprint.
-func (ls LabelSet) Fingerprint() Fingerprint {
-	return labelSetToFingerprint(ls)
-}
-
-// FastFingerprint returns the LabelSet's Fingerprint calculated by a faster hashing
-// algorithm, which is, however, more susceptible to hash collisions.
-func (ls LabelSet) FastFingerprint() Fingerprint {
-	return labelSetToFastFingerprint(ls)
-}
-
-// UnmarshalJSON implements the json.Unmarshaler interface.
-func (l *LabelSet) UnmarshalJSON(b []byte) error {
-	var m map[LabelName]LabelValue
-	if err := json.Unmarshal(b, &m); err != nil {
-		return err
-	}
-	// encoding/json only unmarshals maps of the form map[string]T. It treats
-	// LabelName as a string and does not call its UnmarshalJSON method.
-	// Thus, we have to replicate the behavior here.
-	for ln := range m {
-		if !LabelNameRE.MatchString(string(ln)) {
-			return fmt.Errorf("%q is not a valid label name", ln)
-		}
-	}
-	*l = LabelSet(m)
-	return nil
-}
diff --git a/Godeps/_workspace/src/github.com/prometheus/common/model/metric.go b/Godeps/_workspace/src/github.com/prometheus/common/model/metric.go
deleted file mode 100644
index 25fc3c942..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/common/model/metric.go
+++ /dev/null
@@ -1,81 +0,0 @@
-// Copyright 2013 The Prometheus Authors
-// 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 model
-
-import (
-	"fmt"
-	"sort"
-	"strings"
-)
-
-var separator = []byte{0}
-
-// A Metric is similar to a LabelSet, but the key difference is that a Metric is
-// a singleton and refers to one and only one stream of samples.
-type Metric LabelSet
-
-// Equal compares the metrics.
-func (m Metric) Equal(o Metric) bool {
-	return LabelSet(m).Equal(LabelSet(o))
-}
-
-// Before compares the metrics' underlying label sets.
-func (m Metric) Before(o Metric) bool {
-	return LabelSet(m).Before(LabelSet(o))
-}
-
-// Clone returns a copy of the Metric.
-func (m Metric) Clone() Metric {
-	clone := Metric{}
-	for k, v := range m {
-		clone[k] = v
-	}
-	return clone
-}
-
-func (m Metric) String() string {
-	metricName, hasName := m[MetricNameLabel]
-	numLabels := len(m) - 1
-	if !hasName {
-		numLabels = len(m)
-	}
-	labelStrings := make([]string, 0, numLabels)
-	for label, value := range m {
-		if label != MetricNameLabel {
-			labelStrings = append(labelStrings, fmt.Sprintf("%s=%q", label, value))
-		}
-	}
-
-	switch numLabels {
-	case 0:
-		if hasName {
-			return string(metricName)
-		}
-		return "{}"
-	default:
-		sort.Strings(labelStrings)
-		return fmt.Sprintf("%s{%s}", metricName, strings.Join(labelStrings, ", "))
-	}
-}
-
-// Fingerprint returns a Metric's Fingerprint.
-func (m Metric) Fingerprint() Fingerprint {
-	return LabelSet(m).Fingerprint()
-}
-
-// FastFingerprint returns a Metric's Fingerprint calculated by a faster hashing
-// algorithm, which is, however, more susceptible to hash collisions.
-func (m Metric) FastFingerprint() Fingerprint {
-	return LabelSet(m).FastFingerprint()
-}
diff --git a/Godeps/_workspace/src/github.com/prometheus/common/model/model.go b/Godeps/_workspace/src/github.com/prometheus/common/model/model.go
deleted file mode 100644
index 88f013a47..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/common/model/model.go
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2013 The Prometheus Authors
-// 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 model contains common data structures that are shared across
-// Prometheus componenets and libraries.
-package model
diff --git a/Godeps/_workspace/src/github.com/prometheus/common/model/signature.go b/Godeps/_workspace/src/github.com/prometheus/common/model/signature.go
deleted file mode 100644
index 28f370065..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/common/model/signature.go
+++ /dev/null
@@ -1,190 +0,0 @@
-// Copyright 2014 The Prometheus Authors
-// 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 model
-
-import (
-	"bytes"
-	"hash"
-	"hash/fnv"
-	"sort"
-	"sync"
-)
-
-// SeparatorByte is a byte that cannot occur in valid UTF-8 sequences and is
-// used to separate label names, label values, and other strings from each other
-// when calculating their combined hash value (aka signature aka fingerprint).
-const SeparatorByte byte = 255
-
-var (
-	// cache the signature of an empty label set.
-	emptyLabelSignature = fnv.New64a().Sum64()
-
-	hashAndBufPool sync.Pool
-)
-
-type hashAndBuf struct {
-	h hash.Hash64
-	b bytes.Buffer
-}
-
-func getHashAndBuf() *hashAndBuf {
-	hb := hashAndBufPool.Get()
-	if hb == nil {
-		return &hashAndBuf{h: fnv.New64a()}
-	}
-	return hb.(*hashAndBuf)
-}
-
-func putHashAndBuf(hb *hashAndBuf) {
-	hb.h.Reset()
-	hb.b.Reset()
-	hashAndBufPool.Put(hb)
-}
-
-// LabelsToSignature returns a quasi-unique signature (i.e., fingerprint) for a
-// given label set. (Collisions are possible but unlikely if the number of label
-// sets the function is applied to is small.)
-func LabelsToSignature(labels map[string]string) uint64 {
-	if len(labels) == 0 {
-		return emptyLabelSignature
-	}
-
-	labelNames := make([]string, 0, len(labels))
-	for labelName := range labels {
-		labelNames = append(labelNames, labelName)
-	}
-	sort.Strings(labelNames)
-
-	hb := getHashAndBuf()
-	defer putHashAndBuf(hb)
-
-	for _, labelName := range labelNames {
-		hb.b.WriteString(labelName)
-		hb.b.WriteByte(SeparatorByte)
-		hb.b.WriteString(labels[labelName])
-		hb.b.WriteByte(SeparatorByte)
-		hb.h.Write(hb.b.Bytes())
-		hb.b.Reset()
-	}
-	return hb.h.Sum64()
-}
-
-// labelSetToFingerprint works exactly as LabelsToSignature but takes a LabelSet as
-// parameter (rather than a label map) and returns a Fingerprint.
-func labelSetToFingerprint(ls LabelSet) Fingerprint {
-	if len(ls) == 0 {
-		return Fingerprint(emptyLabelSignature)
-	}
-
-	labelNames := make(LabelNames, 0, len(ls))
-	for labelName := range ls {
-		labelNames = append(labelNames, labelName)
-	}
-	sort.Sort(labelNames)
-
-	hb := getHashAndBuf()
-	defer putHashAndBuf(hb)
-
-	for _, labelName := range labelNames {
-		hb.b.WriteString(string(labelName))
-		hb.b.WriteByte(SeparatorByte)
-		hb.b.WriteString(string(ls[labelName]))
-		hb.b.WriteByte(SeparatorByte)
-		hb.h.Write(hb.b.Bytes())
-		hb.b.Reset()
-	}
-	return Fingerprint(hb.h.Sum64())
-}
-
-// labelSetToFastFingerprint works similar to labelSetToFingerprint but uses a
-// faster and less allocation-heavy hash function, which is more susceptible to
-// create hash collisions. Therefore, collision detection should be applied.
-func labelSetToFastFingerprint(ls LabelSet) Fingerprint {
-	if len(ls) == 0 {
-		return Fingerprint(emptyLabelSignature)
-	}
-
-	var result uint64
-	hb := getHashAndBuf()
-	defer putHashAndBuf(hb)
-
-	for labelName, labelValue := range ls {
-		hb.b.WriteString(string(labelName))
-		hb.b.WriteByte(SeparatorByte)
-		hb.b.WriteString(string(labelValue))
-		hb.h.Write(hb.b.Bytes())
-		result ^= hb.h.Sum64()
-		hb.h.Reset()
-		hb.b.Reset()
-	}
-	return Fingerprint(result)
-}
-
-// SignatureForLabels works like LabelsToSignature but takes a Metric as
-// parameter (rather than a label map) and only includes the labels with the
-// specified LabelNames into the signature calculation. The labels passed in
-// will be sorted by this function.
-func SignatureForLabels(m Metric, labels ...LabelName) uint64 {
-	if len(m) == 0 || len(labels) == 0 {
-		return emptyLabelSignature
-	}
-
-	sort.Sort(LabelNames(labels))
-
-	hb := getHashAndBuf()
-	defer putHashAndBuf(hb)
-
-	for _, label := range labels {
-		hb.b.WriteString(string(label))
-		hb.b.WriteByte(SeparatorByte)
-		hb.b.WriteString(string(m[label]))
-		hb.b.WriteByte(SeparatorByte)
-		hb.h.Write(hb.b.Bytes())
-		hb.b.Reset()
-	}
-	return hb.h.Sum64()
-}
-
-// SignatureWithoutLabels works like LabelsToSignature but takes a Metric as
-// parameter (rather than a label map) and excludes the labels with any of the
-// specified LabelNames from the signature calculation.
-func SignatureWithoutLabels(m Metric, labels map[LabelName]struct{}) uint64 {
-	if len(m) == 0 {
-		return emptyLabelSignature
-	}
-
-	labelNames := make(LabelNames, 0, len(m))
-	for labelName := range m {
-		if _, exclude := labels[labelName]; !exclude {
-			labelNames = append(labelNames, labelName)
-		}
-	}
-	if len(labelNames) == 0 {
-		return emptyLabelSignature
-	}
-	sort.Sort(labelNames)
-
-	hb := getHashAndBuf()
-	defer putHashAndBuf(hb)
-
-	for _, labelName := range labelNames {
-		hb.b.WriteString(string(labelName))
-		hb.b.WriteByte(SeparatorByte)
-		hb.b.WriteString(string(m[labelName]))
-		hb.b.WriteByte(SeparatorByte)
-		hb.h.Write(hb.b.Bytes())
-		hb.b.Reset()
-	}
-	return hb.h.Sum64()
-}
diff --git a/Godeps/_workspace/src/github.com/prometheus/common/model/silence.go b/Godeps/_workspace/src/github.com/prometheus/common/model/silence.go
deleted file mode 100644
index b4b96eae9..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/common/model/silence.go
+++ /dev/null
@@ -1,60 +0,0 @@
-// Copyright 2015 The Prometheus Authors
-// 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 model
-
-import (
-	"encoding/json"
-	"fmt"
-	"regexp"
-	"time"
-)
-
-// Matcher describes a matches the value of a given label.
-type Matcher struct {
-	Name    LabelName `json:"name"`
-	Value   string    `json:"value"`
-	IsRegex bool      `json:"isRegex"`
-}
-
-func (m *Matcher) UnmarshalJSON(b []byte) error {
-	type plain Matcher
-	if err := json.Unmarshal(b, (*plain)(m)); err != nil {
-		return err
-	}
-
-	if len(m.Name) == 0 {
-		return fmt.Errorf("label name in matcher must not be empty")
-	}
-	if m.IsRegex {
-		if _, err := regexp.Compile(m.Value); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-// Silence defines the representation of a silence definiton
-// in the Prometheus eco-system.
-type Silence struct {
-	ID uint64 `json:"id,omitempty"`
-
-	Matchers []*Matcher `json:"matchers"`
-
-	StartsAt time.Time `json:"startsAt"`
-	EndsAt   time.Time `json:"endsAt"`
-
-	CreatedAt time.Time `json:"createdAt,omitempty"`
-	CreatedBy string    `json:"createdBy"`
-	Comment   string    `json:"comment,omitempty"`
-}
diff --git a/Godeps/_workspace/src/github.com/prometheus/common/model/time.go b/Godeps/_workspace/src/github.com/prometheus/common/model/time.go
deleted file mode 100644
index ebc8bf6cc..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/common/model/time.go
+++ /dev/null
@@ -1,230 +0,0 @@
-// Copyright 2013 The Prometheus Authors
-// 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 model
-
-import (
-	"fmt"
-	"math"
-	"regexp"
-	"strconv"
-	"strings"
-	"time"
-)
-
-const (
-	// MinimumTick is the minimum supported time resolution. This has to be
-	// at least time.Second in order for the code below to work.
-	minimumTick = time.Millisecond
-	// second is the Time duration equivalent to one second.
-	second = int64(time.Second / minimumTick)
-	// The number of nanoseconds per minimum tick.
-	nanosPerTick = int64(minimumTick / time.Nanosecond)
-
-	// Earliest is the earliest Time representable. Handy for
-	// initializing a high watermark.
-	Earliest = Time(math.MinInt64)
-	// Latest is the latest Time representable. Handy for initializing
-	// a low watermark.
-	Latest = Time(math.MaxInt64)
-)
-
-// Time is the number of milliseconds since the epoch
-// (1970-01-01 00:00 UTC) excluding leap seconds.
-type Time int64
-
-// Interval describes and interval between two timestamps.
-type Interval struct {
-	Start, End Time
-}
-
-// Now returns the current time as a Time.
-func Now() Time {
-	return TimeFromUnixNano(time.Now().UnixNano())
-}
-
-// TimeFromUnix returns the Time equivalent to the Unix Time t
-// provided in seconds.
-func TimeFromUnix(t int64) Time {
-	return Time(t * second)
-}
-
-// TimeFromUnixNano returns the Time equivalent to the Unix Time
-// t provided in nanoseconds.
-func TimeFromUnixNano(t int64) Time {
-	return Time(t / nanosPerTick)
-}
-
-// Equal reports whether two Times represent the same instant.
-func (t Time) Equal(o Time) bool {
-	return t == o
-}
-
-// Before reports whether the Time t is before o.
-func (t Time) Before(o Time) bool {
-	return t < o
-}
-
-// After reports whether the Time t is after o.
-func (t Time) After(o Time) bool {
-	return t > o
-}
-
-// Add returns the Time t + d.
-func (t Time) Add(d time.Duration) Time {
-	return t + Time(d/minimumTick)
-}
-
-// Sub returns the Duration t - o.
-func (t Time) Sub(o Time) time.Duration {
-	return time.Duration(t-o) * minimumTick
-}
-
-// Time returns the time.Time representation of t.
-func (t Time) Time() time.Time {
-	return time.Unix(int64(t)/second, (int64(t)%second)*nanosPerTick)
-}
-
-// Unix returns t as a Unix time, the number of seconds elapsed
-// since January 1, 1970 UTC.
-func (t Time) Unix() int64 {
-	return int64(t) / second
-}
-
-// UnixNano returns t as a Unix time, the number of nanoseconds elapsed
-// since January 1, 1970 UTC.
-func (t Time) UnixNano() int64 {
-	return int64(t) * nanosPerTick
-}
-
-// The number of digits after the dot.
-var dotPrecision = int(math.Log10(float64(second)))
-
-// String returns a string representation of the Time.
-func (t Time) String() string {
-	return strconv.FormatFloat(float64(t)/float64(second), 'f', -1, 64)
-}
-
-// MarshalJSON implements the json.Marshaler interface.
-func (t Time) MarshalJSON() ([]byte, error) {
-	return []byte(t.String()), nil
-}
-
-// UnmarshalJSON implements the json.Unmarshaler interface.
-func (t *Time) UnmarshalJSON(b []byte) error {
-	p := strings.Split(string(b), ".")
-	switch len(p) {
-	case 1:
-		v, err := strconv.ParseInt(string(p[0]), 10, 64)
-		if err != nil {
-			return err
-		}
-		*t = Time(v * second)
-
-	case 2:
-		v, err := strconv.ParseInt(string(p[0]), 10, 64)
-		if err != nil {
-			return err
-		}
-		v *= second
-
-		prec := dotPrecision - len(p[1])
-		if prec < 0 {
-			p[1] = p[1][:dotPrecision]
-		} else if prec > 0 {
-			p[1] = p[1] + strings.Repeat("0", prec)
-		}
-
-		va, err := strconv.ParseInt(p[1], 10, 32)
-		if err != nil {
-			return err
-		}
-
-		*t = Time(v + va)
-
-	default:
-		return fmt.Errorf("invalid time %q", string(b))
-	}
-	return nil
-}
-
-// Duration wraps time.Duration. It is used to parse the custom duration format
-// from YAML.
-// This type should not propagate beyond the scope of input/output processing.
-type Duration time.Duration
-
-// StringToDuration parses a string into a time.Duration, assuming that a year
-// a day always has 24h.
-func ParseDuration(durationStr string) (Duration, error) {
-	matches := durationRE.FindStringSubmatch(durationStr)
-	if len(matches) != 3 {
-		return 0, fmt.Errorf("not a valid duration string: %q", durationStr)
-	}
-	durSeconds, _ := strconv.Atoi(matches[1])
-	dur := time.Duration(durSeconds) * time.Second
-	unit := matches[2]
-	switch unit {
-	case "d":
-		dur *= 60 * 60 * 24
-	case "h":
-		dur *= 60 * 60
-	case "m":
-		dur *= 60
-	case "s":
-		dur *= 1
-	default:
-		return 0, fmt.Errorf("invalid time unit in duration string: %q", unit)
-	}
-	return Duration(dur), nil
-}
-
-var durationRE = regexp.MustCompile("^([0-9]+)([ywdhms]+)$")
-
-func (d Duration) String() string {
-	seconds := int64(time.Duration(d) / time.Second)
-	factors := map[string]int64{
-		"d": 60 * 60 * 24,
-		"h": 60 * 60,
-		"m": 60,
-		"s": 1,
-	}
-	unit := "s"
-	switch int64(0) {
-	case seconds % factors["d"]:
-		unit = "d"
-	case seconds % factors["h"]:
-		unit = "h"
-	case seconds % factors["m"]:
-		unit = "m"
-	}
-	return fmt.Sprintf("%v%v", seconds/factors[unit], unit)
-}
-
-// MarshalYAML implements the yaml.Marshaler interface.
-func (d Duration) MarshalYAML() (interface{}, error) {
-	return d.String(), nil
-}
-
-// UnmarshalYAML implements the yaml.Unmarshaler interface.
-func (d *Duration) UnmarshalYAML(unmarshal func(interface{}) error) error {
-	var s string
-	if err := unmarshal(&s); err != nil {
-		return err
-	}
-	dur, err := ParseDuration(s)
-	if err != nil {
-		return err
-	}
-	*d = dur
-	return nil
-}
diff --git a/Godeps/_workspace/src/github.com/prometheus/common/model/value.go b/Godeps/_workspace/src/github.com/prometheus/common/model/value.go
deleted file mode 100644
index 10ffb0bd6..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/common/model/value.go
+++ /dev/null
@@ -1,395 +0,0 @@
-// Copyright 2013 The Prometheus Authors
-// 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 model
-
-import (
-	"encoding/json"
-	"fmt"
-	"sort"
-	"strconv"
-	"strings"
-)
-
-// A SampleValue is a representation of a value for a given sample at a given
-// time.
-type SampleValue float64
-
-// MarshalJSON implements json.Marshaler.
-func (v SampleValue) MarshalJSON() ([]byte, error) {
-	return json.Marshal(v.String())
-}
-
-// UnmarshalJSON implements json.Unmarshaler.
-func (v *SampleValue) UnmarshalJSON(b []byte) error {
-	if len(b) < 2 || b[0] != '"' || b[len(b)-1] != '"' {
-		return fmt.Errorf("sample value must be a quoted string")
-	}
-	f, err := strconv.ParseFloat(string(b[1:len(b)-1]), 64)
-	if err != nil {
-		return err
-	}
-	*v = SampleValue(f)
-	return nil
-}
-
-func (v SampleValue) Equal(o SampleValue) bool {
-	return v == o
-}
-
-func (v SampleValue) String() string {
-	return strconv.FormatFloat(float64(v), 'f', -1, 64)
-}
-
-// SamplePair pairs a SampleValue with a Timestamp.
-type SamplePair struct {
-	Timestamp Time
-	Value     SampleValue
-}
-
-// MarshalJSON implements json.Marshaler.
-func (s SamplePair) MarshalJSON() ([]byte, error) {
-	t, err := json.Marshal(s.Timestamp)
-	if err != nil {
-		return nil, err
-	}
-	v, err := json.Marshal(s.Value)
-	if err != nil {
-		return nil, err
-	}
-	return []byte(fmt.Sprintf("[%s,%s]", t, v)), nil
-}
-
-// UnmarshalJSON implements json.Unmarshaler.
-func (s *SamplePair) UnmarshalJSON(b []byte) error {
-	v := [...]json.Unmarshaler{&s.Timestamp, &s.Value}
-	return json.Unmarshal(b, &v)
-}
-
-// Equal returns true if this SamplePair and o have equal Values and equal
-// Timestamps.
-func (s *SamplePair) Equal(o *SamplePair) bool {
-	return s == o || (s.Value == o.Value && s.Timestamp.Equal(o.Timestamp))
-}
-
-func (s SamplePair) String() string {
-	return fmt.Sprintf("%s @[%s]", s.Value, s.Timestamp)
-}
-
-// Sample is a sample pair associated with a metric.
-type Sample struct {
-	Metric    Metric      `json:"metric"`
-	Value     SampleValue `json:"value"`
-	Timestamp Time        `json:"timestamp"`
-}
-
-// Equal compares first the metrics, then the timestamp, then the value.
-func (s *Sample) Equal(o *Sample) bool {
-	if s == o {
-		return true
-	}
-
-	if !s.Metric.Equal(o.Metric) {
-		return false
-	}
-	if !s.Timestamp.Equal(o.Timestamp) {
-		return false
-	}
-	if s.Value != o.Value {
-		return false
-	}
-
-	return true
-}
-
-func (s Sample) String() string {
-	return fmt.Sprintf("%s => %s", s.Metric, SamplePair{
-		Timestamp: s.Timestamp,
-		Value:     s.Value,
-	})
-}
-
-// MarshalJSON implements json.Marshaler.
-func (s Sample) MarshalJSON() ([]byte, error) {
-	v := struct {
-		Metric Metric     `json:"metric"`
-		Value  SamplePair `json:"value"`
-	}{
-		Metric: s.Metric,
-		Value: SamplePair{
-			Timestamp: s.Timestamp,
-			Value:     s.Value,
-		},
-	}
-
-	return json.Marshal(&v)
-}
-
-// UnmarshalJSON implements json.Unmarshaler.
-func (s *Sample) UnmarshalJSON(b []byte) error {
-	v := struct {
-		Metric Metric     `json:"metric"`
-		Value  SamplePair `json:"value"`
-	}{
-		Metric: s.Metric,
-		Value: SamplePair{
-			Timestamp: s.Timestamp,
-			Value:     s.Value,
-		},
-	}
-
-	if err := json.Unmarshal(b, &v); err != nil {
-		return err
-	}
-
-	s.Metric = v.Metric
-	s.Timestamp = v.Value.Timestamp
-	s.Value = v.Value.Value
-
-	return nil
-}
-
-// Samples is a sortable Sample slice. It implements sort.Interface.
-type Samples []*Sample
-
-func (s Samples) Len() int {
-	return len(s)
-}
-
-// Less compares first the metrics, then the timestamp.
-func (s Samples) Less(i, j int) bool {
-	switch {
-	case s[i].Metric.Before(s[j].Metric):
-		return true
-	case s[j].Metric.Before(s[i].Metric):
-		return false
-	case s[i].Timestamp.Before(s[j].Timestamp):
-		return true
-	default:
-		return false
-	}
-}
-
-func (s Samples) Swap(i, j int) {
-	s[i], s[j] = s[j], s[i]
-}
-
-// Equal compares two sets of samples and returns true if they are equal.
-func (s Samples) Equal(o Samples) bool {
-	if len(s) != len(o) {
-		return false
-	}
-
-	for i, sample := range s {
-		if !sample.Equal(o[i]) {
-			return false
-		}
-	}
-	return true
-}
-
-// SampleStream is a stream of Values belonging to an attached COWMetric.
-type SampleStream struct {
-	Metric Metric       `json:"metric"`
-	Values []SamplePair `json:"values"`
-}
-
-func (ss SampleStream) String() string {
-	vals := make([]string, len(ss.Values))
-	for i, v := range ss.Values {
-		vals[i] = v.String()
-	}
-	return fmt.Sprintf("%s =>\n%s", ss.Metric, strings.Join(vals, "\n"))
-}
-
-// Value is a generic interface for values resulting from a query evaluation.
-type Value interface {
-	Type() ValueType
-	String() string
-}
-
-func (Matrix) Type() ValueType  { return ValMatrix }
-func (Vector) Type() ValueType  { return ValVector }
-func (*Scalar) Type() ValueType { return ValScalar }
-func (*String) Type() ValueType { return ValString }
-
-type ValueType int
-
-const (
-	ValNone ValueType = iota
-	ValScalar
-	ValVector
-	ValMatrix
-	ValString
-)
-
-// MarshalJSON implements json.Marshaler.
-func (et ValueType) MarshalJSON() ([]byte, error) {
-	return json.Marshal(et.String())
-}
-
-func (et *ValueType) UnmarshalJSON(b []byte) error {
-	var s string
-	if err := json.Unmarshal(b, &s); err != nil {
-		return err
-	}
-	switch s {
-	case "<ValNone>":
-		*et = ValNone
-	case "scalar":
-		*et = ValScalar
-	case "vector":
-		*et = ValVector
-	case "matrix":
-		*et = ValMatrix
-	case "string":
-		*et = ValString
-	default:
-		return fmt.Errorf("unknown value type %q", s)
-	}
-	return nil
-}
-
-func (e ValueType) String() string {
-	switch e {
-	case ValNone:
-		return "<ValNone>"
-	case ValScalar:
-		return "scalar"
-	case ValVector:
-		return "vector"
-	case ValMatrix:
-		return "matrix"
-	case ValString:
-		return "string"
-	}
-	panic("ValueType.String: unhandled value type")
-}
-
-// Scalar is a scalar value evaluated at the set timestamp.
-type Scalar struct {
-	Value     SampleValue `json:"value"`
-	Timestamp Time        `json:"timestamp"`
-}
-
-func (s Scalar) String() string {
-	return fmt.Sprintf("scalar: %v @[%v]", s.Value, s.Timestamp)
-}
-
-// MarshalJSON implements json.Marshaler.
-func (s Scalar) MarshalJSON() ([]byte, error) {
-	v := strconv.FormatFloat(float64(s.Value), 'f', -1, 64)
-	return json.Marshal([...]interface{}{s.Timestamp, string(v)})
-}
-
-// UnmarshalJSON implements json.Unmarshaler.
-func (s *Scalar) UnmarshalJSON(b []byte) error {
-	var f string
-	v := [...]interface{}{&s.Timestamp, &f}
-
-	if err := json.Unmarshal(b, &v); err != nil {
-		return err
-	}
-
-	value, err := strconv.ParseFloat(f, 64)
-	if err != nil {
-		return fmt.Errorf("error parsing sample value: %s", err)
-	}
-	s.Value = SampleValue(value)
-	return nil
-}
-
-// String is a string value evaluated at the set timestamp.
-type String struct {
-	Value     string `json:"value"`
-	Timestamp Time   `json:"timestamp"`
-}
-
-func (s *String) String() string {
-	return s.Value
-}
-
-// MarshalJSON implements json.Marshaler.
-func (s String) MarshalJSON() ([]byte, error) {
-	return json.Marshal([]interface{}{s.Timestamp, s.Value})
-}
-
-// UnmarshalJSON implements json.Unmarshaler.
-func (s *String) UnmarshalJSON(b []byte) error {
-	v := [...]interface{}{&s.Timestamp, &s.Value}
-	return json.Unmarshal(b, &v)
-}
-
-// Vector is basically only an alias for Samples, but the
-// contract is that in a Vector, all Samples have the same timestamp.
-type Vector []*Sample
-
-func (vec Vector) String() string {
-	entries := make([]string, len(vec))
-	for i, s := range vec {
-		entries[i] = s.String()
-	}
-	return strings.Join(entries, "\n")
-}
-
-func (vec Vector) Len() int      { return len(vec) }
-func (vec Vector) Swap(i, j int) { vec[i], vec[j] = vec[j], vec[i] }
-
-// Less compares first the metrics, then the timestamp.
-func (vec Vector) Less(i, j int) bool {
-	switch {
-	case vec[i].Metric.Before(vec[j].Metric):
-		return true
-	case vec[j].Metric.Before(vec[i].Metric):
-		return false
-	case vec[i].Timestamp.Before(vec[j].Timestamp):
-		return true
-	default:
-		return false
-	}
-}
-
-// Equal compares two sets of samples and returns true if they are equal.
-func (vec Vector) Equal(o Vector) bool {
-	if len(vec) != len(o) {
-		return false
-	}
-
-	for i, sample := range vec {
-		if !sample.Equal(o[i]) {
-			return false
-		}
-	}
-	return true
-}
-
-// Matrix is a list of time series.
-type Matrix []*SampleStream
-
-func (m Matrix) Len() int           { return len(m) }
-func (m Matrix) Less(i, j int) bool { return m[i].Metric.Before(m[j].Metric) }
-func (m Matrix) Swap(i, j int)      { m[i], m[j] = m[j], m[i] }
-
-func (mat Matrix) String() string {
-	matCp := make(Matrix, len(mat))
-	copy(matCp, mat)
-	sort.Sort(matCp)
-
-	strs := make([]string, len(matCp))
-
-	for i, ss := range matCp {
-		strs[i] = ss.String()
-	}
-
-	return strings.Join(strs, "\n")
-}
diff --git a/Godeps/_workspace/src/github.com/prometheus/procfs/.travis.yml b/Godeps/_workspace/src/github.com/prometheus/procfs/.travis.yml
deleted file mode 100644
index 25e169dd0..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/procfs/.travis.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-sudo: false
-language: go
-go:
-    - 1.3
-    - 1.4
-    - 1.5
-    - tip
diff --git a/Godeps/_workspace/src/github.com/prometheus/procfs/AUTHORS.md b/Godeps/_workspace/src/github.com/prometheus/procfs/AUTHORS.md
deleted file mode 100644
index f1c27ccb0..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/procfs/AUTHORS.md
+++ /dev/null
@@ -1,20 +0,0 @@
-The Prometheus project was started by Matt T. Proud (emeritus) and
-Julius Volz in 2012.
-
-Maintainers of this repository:
-
-* Tobias Schmidt <ts@soundcloud.com>
-
-The following individuals have contributed code to this repository
-(listed in alphabetical order):
-
-* Armen Baghumian <abaghumian@noggin.com.au>
-* Bjoern Rabenstein <beorn@soundcloud.com>
-* David Cournapeau <cournape@gmail.com>
-* Ji-Hoon, Seol <jihoon.seol@gmail.com>
-* Jonas Große Sundrup <cherti@letopolis.de>
-* Julius Volz <julius@soundcloud.com>
-* Matthias Rampke <mr@soundcloud.com>
-* Nicky Gerritsen <nicky@streamone.nl>
-* Rémi Audebert <contact@halfr.net>
-* Tobias Schmidt <tobidt@gmail.com>
diff --git a/Godeps/_workspace/src/github.com/prometheus/procfs/CONTRIBUTING.md b/Godeps/_workspace/src/github.com/prometheus/procfs/CONTRIBUTING.md
deleted file mode 100644
index 5705f0fbe..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/procfs/CONTRIBUTING.md
+++ /dev/null
@@ -1,18 +0,0 @@
-# Contributing
-
-Prometheus uses GitHub to manage reviews of pull requests.
-
-* If you have a trivial fix or improvement, go ahead and create a pull
-  request, addressing (with `@...`) one or more of the maintainers
-  (see [AUTHORS.md](AUTHORS.md)) in the description of the pull request.
-
-* If you plan to do something more involved, first discuss your ideas
-  on our [mailing list](https://groups.google.com/forum/?fromgroups#!forum/prometheus-developers).
-  This will avoid unnecessary work and surely give you and us a good deal
-  of inspiration.
-
-* Relevant coding style guidelines are the [Go Code Review
-  Comments](https://code.google.com/p/go-wiki/wiki/CodeReviewComments)
-  and the _Formatting and style_ section of Peter Bourgon's [Go: Best
-  Practices for Production
-  Environments](http://peter.bourgon.org/go-in-production/#formatting-and-style).
diff --git a/Godeps/_workspace/src/github.com/prometheus/procfs/LICENSE b/Godeps/_workspace/src/github.com/prometheus/procfs/LICENSE
deleted file mode 100644
index 261eeb9e9..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/procfs/LICENSE
+++ /dev/null
@@ -1,201 +0,0 @@
-                                 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/prometheus/procfs/Makefile b/Godeps/_workspace/src/github.com/prometheus/procfs/Makefile
deleted file mode 100644
index e8acbbc5e..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/procfs/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-ci:
-	go fmt
-	go vet
-	go test -v ./...
-	go get github.com/golang/lint/golint
-	golint *.go
diff --git a/Godeps/_workspace/src/github.com/prometheus/procfs/NOTICE b/Godeps/_workspace/src/github.com/prometheus/procfs/NOTICE
deleted file mode 100644
index 53c5e9aa1..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/procfs/NOTICE
+++ /dev/null
@@ -1,7 +0,0 @@
-procfs provides functions to retrieve system, kernel and process
-metrics from the pseudo-filesystem proc.
-
-Copyright 2014-2015 The Prometheus Authors
-
-This product includes software developed at
-SoundCloud Ltd. (http://soundcloud.com/).
diff --git a/Godeps/_workspace/src/github.com/prometheus/procfs/README.md b/Godeps/_workspace/src/github.com/prometheus/procfs/README.md
deleted file mode 100644
index 6e7ee6b8b..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/procfs/README.md
+++ /dev/null
@@ -1,10 +0,0 @@
-# procfs
-
-This procfs package provides functions to retrieve system, kernel and process
-metrics from the pseudo-filesystem proc.
-
-*WARNING*: This package is a work in progress. Its API may still break in
-backwards-incompatible ways without warnings. Use it at your own risk.
-
-[![GoDoc](https://godoc.org/github.com/prometheus/procfs?status.png)](https://godoc.org/github.com/prometheus/procfs)
-[![Build Status](https://travis-ci.org/prometheus/procfs.svg?branch=master)](https://travis-ci.org/prometheus/procfs)
diff --git a/Godeps/_workspace/src/github.com/prometheus/procfs/doc.go b/Godeps/_workspace/src/github.com/prometheus/procfs/doc.go
deleted file mode 100644
index e2acd6d40..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/procfs/doc.go
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright 2014 Prometheus Team
-// 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 procfs provides functions to retrieve system, kernel and process
-// metrics from the pseudo-filesystem proc.
-//
-// Example:
-//
-//    package main
-//
-//    import (
-//    	"fmt"
-//    	"log"
-//
-//    	"github.com/prometheus/procfs"
-//    )
-//
-//    func main() {
-//    	p, err := procfs.Self()
-//    	if err != nil {
-//    		log.Fatalf("could not get process: %s", err)
-//    	}
-//
-//    	stat, err := p.NewStat()
-//    	if err != nil {
-//    		log.Fatalf("could not get process stat: %s", err)
-//    	}
-//
-//    	fmt.Printf("command:  %s\n", stat.Comm)
-//    	fmt.Printf("cpu time: %fs\n", stat.CPUTime())
-//    	fmt.Printf("vsize:    %dB\n", stat.VirtualMemory())
-//    	fmt.Printf("rss:      %dB\n", stat.ResidentMemory())
-//    }
-//
-package procfs
diff --git a/Godeps/_workspace/src/github.com/prometheus/procfs/fixtures/26231/cmdline b/Godeps/_workspace/src/github.com/prometheus/procfs/fixtures/26231/cmdline
deleted file mode 100644
index d2d8ef887..000000000
Binary files a/Godeps/_workspace/src/github.com/prometheus/procfs/fixtures/26231/cmdline and /dev/null differ
diff --git a/Godeps/_workspace/src/github.com/prometheus/procfs/fixtures/26231/exe b/Godeps/_workspace/src/github.com/prometheus/procfs/fixtures/26231/exe
deleted file mode 120000
index a91bec4da..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/procfs/fixtures/26231/exe
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/vim
\ No newline at end of file
diff --git a/Godeps/_workspace/src/github.com/prometheus/procfs/fixtures/26231/fd/0 b/Godeps/_workspace/src/github.com/prometheus/procfs/fixtures/26231/fd/0
deleted file mode 120000
index da9c5dff3..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/procfs/fixtures/26231/fd/0
+++ /dev/null
@@ -1 +0,0 @@
-../../symlinktargets/abc
\ No newline at end of file
diff --git a/Godeps/_workspace/src/github.com/prometheus/procfs/fixtures/26231/fd/1 b/Godeps/_workspace/src/github.com/prometheus/procfs/fixtures/26231/fd/1
deleted file mode 120000
index ca47b50ca..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/procfs/fixtures/26231/fd/1
+++ /dev/null
@@ -1 +0,0 @@
-../../symlinktargets/def
\ No newline at end of file
diff --git a/Godeps/_workspace/src/github.com/prometheus/procfs/fixtures/26231/fd/10 b/Godeps/_workspace/src/github.com/prometheus/procfs/fixtures/26231/fd/10
deleted file mode 120000
index c08683168..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/procfs/fixtures/26231/fd/10
+++ /dev/null
@@ -1 +0,0 @@
-../../symlinktargets/xyz
\ No newline at end of file
diff --git a/Godeps/_workspace/src/github.com/prometheus/procfs/fixtures/26231/fd/2 b/Godeps/_workspace/src/github.com/prometheus/procfs/fixtures/26231/fd/2
deleted file mode 120000
index 66731c068..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/procfs/fixtures/26231/fd/2
+++ /dev/null
@@ -1 +0,0 @@
-../../symlinktargets/ghi
\ No newline at end of file
diff --git a/Godeps/_workspace/src/github.com/prometheus/procfs/fixtures/26231/fd/3 b/Godeps/_workspace/src/github.com/prometheus/procfs/fixtures/26231/fd/3
deleted file mode 120000
index 0135dce35..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/procfs/fixtures/26231/fd/3
+++ /dev/null
@@ -1 +0,0 @@
-../../symlinktargets/uvw
\ No newline at end of file
diff --git a/Godeps/_workspace/src/github.com/prometheus/procfs/fixtures/26231/io b/Godeps/_workspace/src/github.com/prometheus/procfs/fixtures/26231/io
deleted file mode 100644
index b6210a7a7..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/procfs/fixtures/26231/io
+++ /dev/null
@@ -1,7 +0,0 @@
-rchar: 750339
-wchar: 818609
-syscr: 7405
-syscw: 5245
-read_bytes: 1024
-write_bytes: 2048
-cancelled_write_bytes: -1024
diff --git a/Godeps/_workspace/src/github.com/prometheus/procfs/fixtures/26231/limits b/Godeps/_workspace/src/github.com/prometheus/procfs/fixtures/26231/limits
deleted file mode 100644
index 23c6b6898..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/procfs/fixtures/26231/limits
+++ /dev/null
@@ -1,17 +0,0 @@
-Limit                     Soft Limit           Hard Limit           Units
-Max cpu time              unlimited            unlimited            seconds
-Max file size             unlimited            unlimited            bytes
-Max data size             unlimited            unlimited            bytes
-Max stack size            8388608              unlimited            bytes
-Max core file size        0                    unlimited            bytes
-Max resident set          unlimited            unlimited            bytes
-Max processes             62898                62898                processes
-Max open files            2048                 4096                 files
-Max locked memory         65536                65536                bytes
-Max address space         unlimited            unlimited            bytes
-Max file locks            unlimited            unlimited            locks
-Max pending signals       62898                62898                signals
-Max msgqueue size         819200               819200               bytes
-Max nice priority         0                    0
-Max realtime priority     0                    0
-Max realtime timeout      unlimited            unlimited            us
diff --git a/Godeps/_workspace/src/github.com/prometheus/procfs/fixtures/26231/stat b/Godeps/_workspace/src/github.com/prometheus/procfs/fixtures/26231/stat
deleted file mode 100644
index 438aaa9dc..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/procfs/fixtures/26231/stat
+++ /dev/null
@@ -1 +0,0 @@
-26231 (vim) R 5392 7446 5392 34835 7446 4218880 32533 309516 26 82 1677 44 158 99 20 0 1 0 82375 56274944 1981 18446744073709551615 4194304 6294284 140736914091744 140736914087944 139965136429984 0 0 12288 1870679807 0 0 0 17 0 0 0 31 0 0 8391624 8481048 16420864 140736914093252 140736914093279 140736914093279 140736914096107 0
diff --git a/Godeps/_workspace/src/github.com/prometheus/procfs/fixtures/26232/cmdline b/Godeps/_workspace/src/github.com/prometheus/procfs/fixtures/26232/cmdline
deleted file mode 100644
index e69de29bb..000000000
diff --git a/Godeps/_workspace/src/github.com/prometheus/procfs/fixtures/26232/fd/0 b/Godeps/_workspace/src/github.com/prometheus/procfs/fixtures/26232/fd/0
deleted file mode 120000
index da9c5dff3..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/procfs/fixtures/26232/fd/0
+++ /dev/null
@@ -1 +0,0 @@
-../../symlinktargets/abc
\ No newline at end of file
diff --git a/Godeps/_workspace/src/github.com/prometheus/procfs/fixtures/26232/fd/1 b/Godeps/_workspace/src/github.com/prometheus/procfs/fixtures/26232/fd/1
deleted file mode 120000
index ca47b50ca..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/procfs/fixtures/26232/fd/1
+++ /dev/null
@@ -1 +0,0 @@
-../../symlinktargets/def
\ No newline at end of file
diff --git a/Godeps/_workspace/src/github.com/prometheus/procfs/fixtures/26232/fd/2 b/Godeps/_workspace/src/github.com/prometheus/procfs/fixtures/26232/fd/2
deleted file mode 120000
index 66731c068..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/procfs/fixtures/26232/fd/2
+++ /dev/null
@@ -1 +0,0 @@
-../../symlinktargets/ghi
\ No newline at end of file
diff --git a/Godeps/_workspace/src/github.com/prometheus/procfs/fixtures/26232/fd/3 b/Godeps/_workspace/src/github.com/prometheus/procfs/fixtures/26232/fd/3
deleted file mode 120000
index 0135dce35..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/procfs/fixtures/26232/fd/3
+++ /dev/null
@@ -1 +0,0 @@
-../../symlinktargets/uvw
\ No newline at end of file
diff --git a/Godeps/_workspace/src/github.com/prometheus/procfs/fixtures/26232/fd/4 b/Godeps/_workspace/src/github.com/prometheus/procfs/fixtures/26232/fd/4
deleted file mode 120000
index c08683168..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/procfs/fixtures/26232/fd/4
+++ /dev/null
@@ -1 +0,0 @@
-../../symlinktargets/xyz
\ No newline at end of file
diff --git a/Godeps/_workspace/src/github.com/prometheus/procfs/fixtures/26232/limits b/Godeps/_workspace/src/github.com/prometheus/procfs/fixtures/26232/limits
deleted file mode 100644
index 3f9bf16a9..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/procfs/fixtures/26232/limits
+++ /dev/null
@@ -1,17 +0,0 @@
-Limit                     Soft Limit           Hard Limit           Units     
-Max cpu time              unlimited            unlimited            seconds   
-Max file size             unlimited            unlimited            bytes     
-Max data size             unlimited            unlimited            bytes     
-Max stack size            8388608              unlimited            bytes     
-Max core file size        0                    unlimited            bytes     
-Max resident set          unlimited            unlimited            bytes     
-Max processes             29436                29436                processes 
-Max open files            1024                 4096                 files     
-Max locked memory         65536                65536                bytes     
-Max address space         unlimited            unlimited            bytes     
-Max file locks            unlimited            unlimited            locks     
-Max pending signals       29436                29436                signals   
-Max msgqueue size         819200               819200               bytes     
-Max nice priority         0                    0                    
-Max realtime priority     0                    0                    
-Max realtime timeout      unlimited            unlimited            us        
diff --git a/Godeps/_workspace/src/github.com/prometheus/procfs/fixtures/26232/stat b/Godeps/_workspace/src/github.com/prometheus/procfs/fixtures/26232/stat
deleted file mode 100644
index 321b16073..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/procfs/fixtures/26232/stat
+++ /dev/null
@@ -1 +0,0 @@
-33 (ata_sff) S 2 0 0 0 -1 69238880 0 0 0 0 0 0 0 0 0 -20 1 0 5 0 0 18446744073709551615 0 0 0 0 0 0 0 2147483647 0 18446744073709551615 0 0 17 1 0 0 0 0 0 0 0 0 0 0 0 0 0
diff --git a/Godeps/_workspace/src/github.com/prometheus/procfs/fixtures/584/stat b/Godeps/_workspace/src/github.com/prometheus/procfs/fixtures/584/stat
deleted file mode 100644
index 65b9369d1..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/procfs/fixtures/584/stat
+++ /dev/null
@@ -1,2 +0,0 @@
-1020 ((a b ) ( c d) ) R 28378 1020 28378 34842 1020 4218880 286 0 0 0 0 0 0 0 20 0 1 0 10839175 10395648 155 18446744073709551615 4194304 4238788 140736466511168 140736466511168 140609271124624 0 0 0 0 0 0 0 17 5 0 0 0 0 0 6336016 6337300 25579520 140736466515030 140736466515061 140736466515061 140736466518002 0
-#!/bin/cat /proc/self/stat
diff --git a/Godeps/_workspace/src/github.com/prometheus/procfs/fixtures/mdstat b/Godeps/_workspace/src/github.com/prometheus/procfs/fixtures/mdstat
deleted file mode 100644
index 4430bdee2..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/procfs/fixtures/mdstat
+++ /dev/null
@@ -1,26 +0,0 @@
-Personalities : [linear] [multipath] [raid0] [raid1] [raid6] [raid5] [raid4] [raid10]
-md3 : active raid6 sda1[8] sdh1[7] sdg1[6] sdf1[5] sde1[11] sdd1[3] sdc1[10] sdb1[9]
-      5853468288 blocks super 1.2 level 6, 64k chunk, algorithm 2 [8/8] [UUUUUUUU]
-      
-md127 : active raid1 sdi2[0] sdj2[1]
-      312319552 blocks [2/2] [UU]
-      
-md0 : active raid1 sdk[2](S) sdi1[0] sdj1[1]
-      248896 blocks [2/2] [UU]
-      
-md4 : inactive raid1 sda3[0] sdb3[1]
-      4883648 blocks [2/2] [UU]
-
-md6 : active raid1 sdb2[2] sda2[0]
-      195310144 blocks [2/1] [U_]
-      [=>...................]  recovery =  8.5% (16775552/195310144) finish=17.0min speed=259783K/sec
-
-md8 : active raid1 sdb1[1] sda1[0]
-      195310144 blocks [2/2] [UU]
-      [=>...................]  resync =  8.5% (16775552/195310144) finish=17.0min speed=259783K/sec
-
-md7 : active raid6 sdb1[0] sde1[3] sdd1[2] sdc1[1]
-      7813735424 blocks super 1.2 level 6, 512k chunk, algorithm 2 [4/3] [U_UU]
-      bitmap: 0/30 pages [0KB], 65536KB chunk
-
-unused devices: <none>
diff --git a/Godeps/_workspace/src/github.com/prometheus/procfs/fixtures/net/ip_vs b/Godeps/_workspace/src/github.com/prometheus/procfs/fixtures/net/ip_vs
deleted file mode 100644
index 6a6a97d7d..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/procfs/fixtures/net/ip_vs
+++ /dev/null
@@ -1,14 +0,0 @@
-IP Virtual Server version 1.2.1 (size=4096)
-Prot LocalAddress:Port Scheduler Flags
-  -> RemoteAddress:Port Forward Weight ActiveConn InActConn
-TCP  C0A80016:0CEA wlc  
-  -> C0A85216:0CEA      Tunnel  100    248        2         
-  -> C0A85318:0CEA      Tunnel  100    248        2         
-  -> C0A85315:0CEA      Tunnel  100    248        1         
-TCP  C0A80039:0CEA wlc  
-  -> C0A85416:0CEA      Tunnel  0      0          0         
-  -> C0A85215:0CEA      Tunnel  100    1499       0         
-  -> C0A83215:0CEA      Tunnel  100    1498       0         
-TCP  C0A80037:0CEA wlc  
-  -> C0A8321A:0CEA      Tunnel  0      0          0         
-  -> C0A83120:0CEA      Tunnel  100    0          0         
diff --git a/Godeps/_workspace/src/github.com/prometheus/procfs/fixtures/net/ip_vs_stats b/Godeps/_workspace/src/github.com/prometheus/procfs/fixtures/net/ip_vs_stats
deleted file mode 100644
index c00724e0f..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/procfs/fixtures/net/ip_vs_stats
+++ /dev/null
@@ -1,6 +0,0 @@
-   Total Incoming Outgoing         Incoming         Outgoing
-   Conns  Packets  Packets            Bytes            Bytes
- 16AA370 E33656E5        0     51D8C8883AB3                0
-
- Conns/s   Pkts/s   Pkts/s          Bytes/s          Bytes/s
-       4    1FB3C        0          1282A8F                0
diff --git a/Godeps/_workspace/src/github.com/prometheus/procfs/fixtures/self b/Godeps/_workspace/src/github.com/prometheus/procfs/fixtures/self
deleted file mode 120000
index 1eeedea3d..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/procfs/fixtures/self
+++ /dev/null
@@ -1 +0,0 @@
-26231
\ No newline at end of file
diff --git a/Godeps/_workspace/src/github.com/prometheus/procfs/fixtures/stat b/Godeps/_workspace/src/github.com/prometheus/procfs/fixtures/stat
deleted file mode 100644
index dabb96f74..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/procfs/fixtures/stat
+++ /dev/null
@@ -1,16 +0,0 @@
-cpu  301854 612 111922 8979004 3552 2 3944 0 0 0
-cpu0 44490 19 21045 1087069 220 1 3410 0 0 0
-cpu1 47869 23 16474 1110787 591 0 46 0 0 0
-cpu2 46504 36 15916 1112321 441 0 326 0 0 0
-cpu3 47054 102 15683 1113230 533 0 60 0 0 0
-cpu4 28413 25 10776 1140321 217 0 8 0 0 0
-cpu5 29271 101 11586 1136270 672 0 30 0 0 0
-cpu6 29152 36 10276 1139721 319 0 29 0 0 0
-cpu7 29098 268 10164 1139282 555 0 31 0 0 0
-intr 8885917 17 0 0 0 0 0 0 0 1 79281 0 0 0 0 0 0 0 231237 0 0 0 0 250586 103 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 223424 190745 13 906 1283803 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-ctxt 38014093
-btime 1418183276
-processes 26442
-procs_running 2
-procs_blocked 0
-softirq 5057579 250191 1481983 1647 211099 186066 0 1783454 622196 12499 508444
diff --git a/Godeps/_workspace/src/github.com/prometheus/procfs/fixtures/symlinktargets/README b/Godeps/_workspace/src/github.com/prometheus/procfs/fixtures/symlinktargets/README
deleted file mode 100644
index 5cf184ea0..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/procfs/fixtures/symlinktargets/README
+++ /dev/null
@@ -1,2 +0,0 @@
-This directory contains some empty files that are the symlinks the files in the "fd" directory point to.
-They are otherwise ignored by the tests
diff --git a/Godeps/_workspace/src/github.com/prometheus/procfs/fixtures/symlinktargets/abc b/Godeps/_workspace/src/github.com/prometheus/procfs/fixtures/symlinktargets/abc
deleted file mode 100644
index e69de29bb..000000000
diff --git a/Godeps/_workspace/src/github.com/prometheus/procfs/fixtures/symlinktargets/def b/Godeps/_workspace/src/github.com/prometheus/procfs/fixtures/symlinktargets/def
deleted file mode 100644
index e69de29bb..000000000
diff --git a/Godeps/_workspace/src/github.com/prometheus/procfs/fixtures/symlinktargets/ghi b/Godeps/_workspace/src/github.com/prometheus/procfs/fixtures/symlinktargets/ghi
deleted file mode 100644
index e69de29bb..000000000
diff --git a/Godeps/_workspace/src/github.com/prometheus/procfs/fixtures/symlinktargets/uvw b/Godeps/_workspace/src/github.com/prometheus/procfs/fixtures/symlinktargets/uvw
deleted file mode 100644
index e69de29bb..000000000
diff --git a/Godeps/_workspace/src/github.com/prometheus/procfs/fixtures/symlinktargets/xyz b/Godeps/_workspace/src/github.com/prometheus/procfs/fixtures/symlinktargets/xyz
deleted file mode 100644
index e69de29bb..000000000
diff --git a/Godeps/_workspace/src/github.com/prometheus/procfs/fs.go b/Godeps/_workspace/src/github.com/prometheus/procfs/fs.go
deleted file mode 100644
index 6a8d97b11..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/procfs/fs.go
+++ /dev/null
@@ -1,40 +0,0 @@
-package procfs
-
-import (
-	"fmt"
-	"os"
-	"path"
-)
-
-// FS represents the pseudo-filesystem proc, which provides an interface to
-// kernel data structures.
-type FS string
-
-// DefaultMountPoint is the common mount point of the proc filesystem.
-const DefaultMountPoint = "/proc"
-
-// NewFS returns a new FS mounted under the given mountPoint. It will error
-// if the mount point can't be read.
-func NewFS(mountPoint string) (FS, error) {
-	info, err := os.Stat(mountPoint)
-	if err != nil {
-		return "", fmt.Errorf("could not read %s: %s", mountPoint, err)
-	}
-	if !info.IsDir() {
-		return "", fmt.Errorf("mount point %s is not a directory", mountPoint)
-	}
-
-	return FS(mountPoint), nil
-}
-
-func (fs FS) stat(p string) (os.FileInfo, error) {
-	return os.Stat(path.Join(string(fs), p))
-}
-
-func (fs FS) open(p string) (*os.File, error) {
-	return os.Open(path.Join(string(fs), p))
-}
-
-func (fs FS) readlink(p string) (string, error) {
-	return os.Readlink(path.Join(string(fs), p))
-}
diff --git a/Godeps/_workspace/src/github.com/prometheus/procfs/ipvs.go b/Godeps/_workspace/src/github.com/prometheus/procfs/ipvs.go
deleted file mode 100644
index 26da5000e..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/procfs/ipvs.go
+++ /dev/null
@@ -1,223 +0,0 @@
-package procfs
-
-import (
-	"bufio"
-	"encoding/hex"
-	"errors"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"net"
-	"strconv"
-	"strings"
-)
-
-// IPVSStats holds IPVS statistics, as exposed by the kernel in `/proc/net/ip_vs_stats`.
-type IPVSStats struct {
-	// Total count of connections.
-	Connections uint64
-	// Total incoming packages processed.
-	IncomingPackets uint64
-	// Total outgoing packages processed.
-	OutgoingPackets uint64
-	// Total incoming traffic.
-	IncomingBytes uint64
-	// Total outgoing traffic.
-	OutgoingBytes uint64
-}
-
-// IPVSBackendStatus holds current metrics of one virtual / real address pair.
-type IPVSBackendStatus struct {
-	// The local (virtual) IP address.
-	LocalAddress net.IP
-	// The local (virtual) port.
-	LocalPort uint16
-	// The transport protocol (TCP, UDP).
-	Proto string
-	// The remote (real) IP address.
-	RemoteAddress net.IP
-	// The remote (real) port.
-	RemotePort uint16
-	// The current number of active connections for this virtual/real address pair.
-	ActiveConn uint64
-	// The current number of inactive connections for this virtual/real address pair.
-	InactConn uint64
-	// The current weight of this virtual/real address pair.
-	Weight uint64
-}
-
-// NewIPVSStats reads the IPVS statistics.
-func NewIPVSStats() (IPVSStats, error) {
-	fs, err := NewFS(DefaultMountPoint)
-	if err != nil {
-		return IPVSStats{}, err
-	}
-
-	return fs.NewIPVSStats()
-}
-
-// NewIPVSStats reads the IPVS statistics from the specified `proc` filesystem.
-func (fs FS) NewIPVSStats() (IPVSStats, error) {
-	file, err := fs.open("net/ip_vs_stats")
-	if err != nil {
-		return IPVSStats{}, err
-	}
-	defer file.Close()
-
-	return parseIPVSStats(file)
-}
-
-// parseIPVSStats performs the actual parsing of `ip_vs_stats`.
-func parseIPVSStats(file io.Reader) (IPVSStats, error) {
-	var (
-		statContent []byte
-		statLines   []string
-		statFields  []string
-		stats       IPVSStats
-	)
-
-	statContent, err := ioutil.ReadAll(file)
-	if err != nil {
-		return IPVSStats{}, err
-	}
-
-	statLines = strings.SplitN(string(statContent), "\n", 4)
-	if len(statLines) != 4 {
-		return IPVSStats{}, errors.New("ip_vs_stats corrupt: too short")
-	}
-
-	statFields = strings.Fields(statLines[2])
-	if len(statFields) != 5 {
-		return IPVSStats{}, errors.New("ip_vs_stats corrupt: unexpected number of fields")
-	}
-
-	stats.Connections, err = strconv.ParseUint(statFields[0], 16, 64)
-	if err != nil {
-		return IPVSStats{}, err
-	}
-	stats.IncomingPackets, err = strconv.ParseUint(statFields[1], 16, 64)
-	if err != nil {
-		return IPVSStats{}, err
-	}
-	stats.OutgoingPackets, err = strconv.ParseUint(statFields[2], 16, 64)
-	if err != nil {
-		return IPVSStats{}, err
-	}
-	stats.IncomingBytes, err = strconv.ParseUint(statFields[3], 16, 64)
-	if err != nil {
-		return IPVSStats{}, err
-	}
-	stats.OutgoingBytes, err = strconv.ParseUint(statFields[4], 16, 64)
-	if err != nil {
-		return IPVSStats{}, err
-	}
-
-	return stats, nil
-}
-
-// NewIPVSBackendStatus reads and returns the status of all (virtual,real) server pairs.
-func NewIPVSBackendStatus() ([]IPVSBackendStatus, error) {
-	fs, err := NewFS(DefaultMountPoint)
-	if err != nil {
-		return []IPVSBackendStatus{}, err
-	}
-
-	return fs.NewIPVSBackendStatus()
-}
-
-// NewIPVSBackendStatus reads and returns the status of all (virtual,real) server pairs from the specified `proc` filesystem.
-func (fs FS) NewIPVSBackendStatus() ([]IPVSBackendStatus, error) {
-	file, err := fs.open("net/ip_vs")
-	if err != nil {
-		return nil, err
-	}
-	defer file.Close()
-
-	return parseIPVSBackendStatus(file)
-}
-
-func parseIPVSBackendStatus(file io.Reader) ([]IPVSBackendStatus, error) {
-	var (
-		status       []IPVSBackendStatus
-		scanner      = bufio.NewScanner(file)
-		proto        string
-		localAddress net.IP
-		localPort    uint16
-		err          error
-	)
-
-	for scanner.Scan() {
-		fields := strings.Fields(string(scanner.Text()))
-		if len(fields) == 0 {
-			continue
-		}
-		switch {
-		case fields[0] == "IP" || fields[0] == "Prot" || fields[1] == "RemoteAddress:Port":
-			continue
-		case fields[0] == "TCP" || fields[0] == "UDP":
-			if len(fields) < 2 {
-				continue
-			}
-			proto = fields[0]
-			localAddress, localPort, err = parseIPPort(fields[1])
-			if err != nil {
-				return nil, err
-			}
-		case fields[0] == "->":
-			if len(fields) < 6 {
-				continue
-			}
-			remoteAddress, remotePort, err := parseIPPort(fields[1])
-			if err != nil {
-				return nil, err
-			}
-			weight, err := strconv.ParseUint(fields[3], 10, 64)
-			if err != nil {
-				return nil, err
-			}
-			activeConn, err := strconv.ParseUint(fields[4], 10, 64)
-			if err != nil {
-				return nil, err
-			}
-			inactConn, err := strconv.ParseUint(fields[5], 10, 64)
-			if err != nil {
-				return nil, err
-			}
-			status = append(status, IPVSBackendStatus{
-				LocalAddress:  localAddress,
-				LocalPort:     localPort,
-				RemoteAddress: remoteAddress,
-				RemotePort:    remotePort,
-				Proto:         proto,
-				Weight:        weight,
-				ActiveConn:    activeConn,
-				InactConn:     inactConn,
-			})
-		}
-	}
-	return status, nil
-}
-
-func parseIPPort(s string) (net.IP, uint16, error) {
-	tmp := strings.SplitN(s, ":", 2)
-
-	if len(tmp) != 2 {
-		return nil, 0, fmt.Errorf("invalid IP:Port: %s", s)
-	}
-
-	if len(tmp[0]) != 8 && len(tmp[0]) != 32 {
-		return nil, 0, fmt.Errorf("invalid IP: %s", tmp[0])
-	}
-
-	ip, err := hex.DecodeString(tmp[0])
-	if err != nil {
-		return nil, 0, err
-	}
-
-	port, err := strconv.ParseUint(tmp[1], 16, 16)
-	if err != nil {
-		return nil, 0, err
-	}
-
-	return ip, uint16(port), nil
-}
diff --git a/Godeps/_workspace/src/github.com/prometheus/procfs/mdstat.go b/Godeps/_workspace/src/github.com/prometheus/procfs/mdstat.go
deleted file mode 100644
index 09ed6b5eb..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/procfs/mdstat.go
+++ /dev/null
@@ -1,158 +0,0 @@
-package procfs
-
-import (
-	"fmt"
-	"io/ioutil"
-	"path"
-	"regexp"
-	"strconv"
-	"strings"
-)
-
-var (
-	statuslineRE = regexp.MustCompile(`(\d+) blocks .*\[(\d+)/(\d+)\] \[[U_]+\]`)
-	buildlineRE  = regexp.MustCompile(`\((\d+)/\d+\)`)
-)
-
-// MDStat holds info parsed from /proc/mdstat.
-type MDStat struct {
-	// Name of the device.
-	Name string
-	// activity-state of the device.
-	ActivityState string
-	// Number of active disks.
-	DisksActive int64
-	// Total number of disks the device consists of.
-	DisksTotal int64
-	// Number of blocks the device holds.
-	BlocksTotal int64
-	// Number of blocks on the device that are in sync.
-	BlocksSynced int64
-}
-
-// ParseMDStat parses an mdstat-file and returns a struct with the relevant infos.
-func (fs FS) ParseMDStat() (mdstates []MDStat, err error) {
-	mdStatusFilePath := path.Join(string(fs), "mdstat")
-	content, err := ioutil.ReadFile(mdStatusFilePath)
-	if err != nil {
-		return []MDStat{}, fmt.Errorf("error parsing %s: %s", mdStatusFilePath, err)
-	}
-
-	mdStatusFile := string(content)
-
-	lines := strings.Split(mdStatusFile, "\n")
-	var currentMD string
-
-	// Each md has at least the deviceline, statusline and one empty line afterwards
-	// so we will have probably something of the order len(lines)/3 devices
-	// so we use that for preallocation.
-	estimateMDs := len(lines) / 3
-	mdStates := make([]MDStat, 0, estimateMDs)
-
-	for i, l := range lines {
-		if l == "" {
-			// Skip entirely empty lines.
-			continue
-		}
-
-		if l[0] == ' ' {
-			// Those lines are not the beginning of a md-section.
-			continue
-		}
-
-		if strings.HasPrefix(l, "Personalities") || strings.HasPrefix(l, "unused") {
-			// We aren't interested in lines with general info.
-			continue
-		}
-
-		mainLine := strings.Split(l, " ")
-		if len(mainLine) < 3 {
-			return mdStates, fmt.Errorf("error parsing mdline: %s", l)
-		}
-		currentMD = mainLine[0]      // name of md-device
-		activityState := mainLine[2] // activity status of said md-device
-
-		if len(lines) <= i+3 {
-			return mdStates, fmt.Errorf("error parsing %s: entry for %s has fewer lines than expected", mdStatusFilePath, currentMD)
-		}
-
-		active, total, size, err := evalStatusline(lines[i+1]) // parse statusline, always present
-		if err != nil {
-			return mdStates, fmt.Errorf("error parsing %s: %s", mdStatusFilePath, err)
-		}
-
-		//
-		// Now get the number of synced blocks.
-		//
-
-		// Get the line number of the syncing-line.
-		var j int
-		if strings.Contains(lines[i+2], "bitmap") { // then skip the bitmap line
-			j = i + 3
-		} else {
-			j = i + 2
-		}
-
-		// If device is syncing at the moment, get the number of currently synced bytes,
-		// otherwise that number equals the size of the device.
-		syncedBlocks := size
-		if strings.Contains(lines[j], "recovery") || strings.Contains(lines[j], "resync") {
-			syncedBlocks, err = evalBuildline(lines[j])
-			if err != nil {
-				return mdStates, fmt.Errorf("error parsing %s: %s", mdStatusFilePath, err)
-			}
-		}
-
-		mdStates = append(mdStates, MDStat{currentMD, activityState, active, total, size, syncedBlocks})
-
-	}
-
-	return mdStates, nil
-}
-
-func evalStatusline(statusline string) (active, total, size int64, err error) {
-	matches := statuslineRE.FindStringSubmatch(statusline)
-
-	// +1 to make it more obvious that the whole string containing the info is also returned as matches[0].
-	if len(matches) != 3+1 {
-		return 0, 0, 0, fmt.Errorf("unexpected number matches found in statusline: %s", statusline)
-	}
-
-	size, err = strconv.ParseInt(matches[1], 10, 64)
-	if err != nil {
-		return 0, 0, 0, fmt.Errorf("%s in statusline: %s", err, statusline)
-	}
-
-	total, err = strconv.ParseInt(matches[2], 10, 64)
-	if err != nil {
-		return 0, 0, 0, fmt.Errorf("%s in statusline: %s", err, statusline)
-	}
-
-	active, err = strconv.ParseInt(matches[3], 10, 64)
-	if err != nil {
-		return 0, 0, 0, fmt.Errorf("%s in statusline: %s", err, statusline)
-	}
-
-	return active, total, size, nil
-}
-
-// Gets the size that has already been synced out of the sync-line.
-func evalBuildline(buildline string) (int64, error) {
-	matches := buildlineRE.FindStringSubmatch(buildline)
-
-	// +1 to make it more obvious that the whole string containing the info is also returned as matches[0].
-	if len(matches) < 1+1 {
-		return 0, fmt.Errorf("too few matches found in buildline: %s", buildline)
-	}
-
-	if len(matches) > 1+1 {
-		return 0, fmt.Errorf("too many matches found in buildline: %s", buildline)
-	}
-
-	syncedSize, err := strconv.ParseInt(matches[1], 10, 64)
-	if err != nil {
-		return 0, fmt.Errorf("%s in buildline: %s", err, buildline)
-	}
-
-	return syncedSize, nil
-}
diff --git a/Godeps/_workspace/src/github.com/prometheus/procfs/proc.go b/Godeps/_workspace/src/github.com/prometheus/procfs/proc.go
deleted file mode 100644
index efc850278..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/procfs/proc.go
+++ /dev/null
@@ -1,202 +0,0 @@
-package procfs
-
-import (
-	"fmt"
-	"io/ioutil"
-	"os"
-	"path"
-	"strconv"
-	"strings"
-)
-
-// Proc provides information about a running process.
-type Proc struct {
-	// The process ID.
-	PID int
-
-	fs FS
-}
-
-// Procs represents a list of Proc structs.
-type Procs []Proc
-
-func (p Procs) Len() int           { return len(p) }
-func (p Procs) Swap(i, j int)      { p[i], p[j] = p[j], p[i] }
-func (p Procs) Less(i, j int) bool { return p[i].PID < p[j].PID }
-
-// Self returns a process for the current process read via /proc/self.
-func Self() (Proc, error) {
-	fs, err := NewFS(DefaultMountPoint)
-	if err != nil {
-		return Proc{}, err
-	}
-	return fs.Self()
-}
-
-// NewProc returns a process for the given pid under /proc.
-func NewProc(pid int) (Proc, error) {
-	fs, err := NewFS(DefaultMountPoint)
-	if err != nil {
-		return Proc{}, err
-	}
-	return fs.NewProc(pid)
-}
-
-// AllProcs returns a list of all currently avaible processes under /proc.
-func AllProcs() (Procs, error) {
-	fs, err := NewFS(DefaultMountPoint)
-	if err != nil {
-		return Procs{}, err
-	}
-	return fs.AllProcs()
-}
-
-// Self returns a process for the current process.
-func (fs FS) Self() (Proc, error) {
-	p, err := fs.readlink("self")
-	if err != nil {
-		return Proc{}, err
-	}
-	pid, err := strconv.Atoi(strings.Replace(p, string(fs), "", -1))
-	if err != nil {
-		return Proc{}, err
-	}
-	return fs.NewProc(pid)
-}
-
-// NewProc returns a process for the given pid.
-func (fs FS) NewProc(pid int) (Proc, error) {
-	if _, err := fs.stat(strconv.Itoa(pid)); err != nil {
-		return Proc{}, err
-	}
-	return Proc{PID: pid, fs: fs}, nil
-}
-
-// AllProcs returns a list of all currently avaible processes.
-func (fs FS) AllProcs() (Procs, error) {
-	d, err := fs.open("")
-	if err != nil {
-		return Procs{}, err
-	}
-	defer d.Close()
-
-	names, err := d.Readdirnames(-1)
-	if err != nil {
-		return Procs{}, fmt.Errorf("could not read %s: %s", d.Name(), err)
-	}
-
-	p := Procs{}
-	for _, n := range names {
-		pid, err := strconv.ParseInt(n, 10, 64)
-		if err != nil {
-			continue
-		}
-		p = append(p, Proc{PID: int(pid), fs: fs})
-	}
-
-	return p, nil
-}
-
-// CmdLine returns the command line of a process.
-func (p Proc) CmdLine() ([]string, error) {
-	f, err := p.open("cmdline")
-	if err != nil {
-		return nil, err
-	}
-	defer f.Close()
-
-	data, err := ioutil.ReadAll(f)
-	if err != nil {
-		return nil, err
-	}
-
-	if len(data) < 1 {
-		return []string{}, nil
-	}
-
-	return strings.Split(string(data[:len(data)-1]), string(byte(0))), nil
-}
-
-// Executable returns the absolute path of the executable command of a process.
-func (p Proc) Executable() (string, error) {
-	exe, err := p.readlink("exe")
-
-	if os.IsNotExist(err) {
-		return "", nil
-	}
-
-	return exe, err
-}
-
-// FileDescriptors returns the currently open file descriptors of a process.
-func (p Proc) FileDescriptors() ([]uintptr, error) {
-	names, err := p.fileDescriptors()
-	if err != nil {
-		return nil, err
-	}
-
-	fds := make([]uintptr, len(names))
-	for i, n := range names {
-		fd, err := strconv.ParseInt(n, 10, 32)
-		if err != nil {
-			return nil, fmt.Errorf("could not parse fd %s: %s", n, err)
-		}
-		fds[i] = uintptr(fd)
-	}
-
-	return fds, nil
-}
-
-// FileDescriptorTargets returns the targets of all file descriptors of a process.
-// If a file descriptor is not a symlink to a file (like a socket), that value will be the empty string.
-func (p Proc) FileDescriptorTargets() ([]string, error) {
-	names, err := p.fileDescriptors()
-	if err != nil {
-		return nil, err
-	}
-
-	targets := make([]string, len(names))
-
-	for i, name := range names {
-		target, err := p.readlink("fd/" + name)
-		if err == nil {
-			targets[i] = target
-		}
-	}
-
-	return targets, nil
-}
-
-// FileDescriptorsLen returns the number of currently open file descriptors of
-// a process.
-func (p Proc) FileDescriptorsLen() (int, error) {
-	fds, err := p.fileDescriptors()
-	if err != nil {
-		return 0, err
-	}
-
-	return len(fds), nil
-}
-
-func (p Proc) fileDescriptors() ([]string, error) {
-	d, err := p.open("fd")
-	if err != nil {
-		return nil, err
-	}
-	defer d.Close()
-
-	names, err := d.Readdirnames(-1)
-	if err != nil {
-		return nil, fmt.Errorf("could not read %s: %s", d.Name(), err)
-	}
-
-	return names, nil
-}
-
-func (p Proc) open(pa string) (*os.File, error) {
-	return p.fs.open(path.Join(strconv.Itoa(p.PID), pa))
-}
-
-func (p Proc) readlink(pa string) (string, error) {
-	return p.fs.readlink(path.Join(strconv.Itoa(p.PID), pa))
-}
diff --git a/Godeps/_workspace/src/github.com/prometheus/procfs/proc_io.go b/Godeps/_workspace/src/github.com/prometheus/procfs/proc_io.go
deleted file mode 100644
index 7c6dc8697..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/procfs/proc_io.go
+++ /dev/null
@@ -1,54 +0,0 @@
-package procfs
-
-import (
-	"fmt"
-	"io/ioutil"
-)
-
-// ProcIO models the content of /proc/<pid>/io.
-type ProcIO struct {
-	// Chars read.
-	RChar uint64
-	// Chars written.
-	WChar uint64
-	// Read syscalls.
-	SyscR uint64
-	// Write syscalls.
-	SyscW uint64
-	// Bytes read.
-	ReadBytes uint64
-	// Bytes written.
-	WriteBytes uint64
-	// Bytes written, but taking into account truncation. See
-	// Documentation/filesystems/proc.txt in the kernel sources for
-	// detailed explanation.
-	CancelledWriteBytes int64
-}
-
-// NewIO creates a new ProcIO instance from a given Proc instance.
-func (p Proc) NewIO() (ProcIO, error) {
-	pio := ProcIO{}
-
-	f, err := p.open("io")
-	if err != nil {
-		return pio, err
-	}
-	defer f.Close()
-
-	data, err := ioutil.ReadAll(f)
-	if err != nil {
-		return pio, err
-	}
-
-	ioFormat := "rchar: %d\nwchar: %d\nsyscr: %d\nsyscw: %d\n" +
-		"read_bytes: %d\nwrite_bytes: %d\n" +
-		"cancelled_write_bytes: %d\n"
-
-	_, err = fmt.Sscanf(string(data), ioFormat, &pio.RChar, &pio.WChar, &pio.SyscR,
-		&pio.SyscW, &pio.ReadBytes, &pio.WriteBytes, &pio.CancelledWriteBytes)
-	if err != nil {
-		return pio, err
-	}
-
-	return pio, nil
-}
diff --git a/Godeps/_workspace/src/github.com/prometheus/procfs/proc_limits.go b/Godeps/_workspace/src/github.com/prometheus/procfs/proc_limits.go
deleted file mode 100644
index 9f080b9f6..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/procfs/proc_limits.go
+++ /dev/null
@@ -1,111 +0,0 @@
-package procfs
-
-import (
-	"bufio"
-	"fmt"
-	"regexp"
-	"strconv"
-)
-
-// ProcLimits represents the soft limits for each of the process's resource
-// limits.
-type ProcLimits struct {
-	CPUTime          int
-	FileSize         int
-	DataSize         int
-	StackSize        int
-	CoreFileSize     int
-	ResidentSet      int
-	Processes        int
-	OpenFiles        int
-	LockedMemory     int
-	AddressSpace     int
-	FileLocks        int
-	PendingSignals   int
-	MsqqueueSize     int
-	NicePriority     int
-	RealtimePriority int
-	RealtimeTimeout  int
-}
-
-const (
-	limitsFields    = 3
-	limitsUnlimited = "unlimited"
-)
-
-var (
-	limitsDelimiter = regexp.MustCompile("  +")
-)
-
-// NewLimits returns the current soft limits of the process.
-func (p Proc) NewLimits() (ProcLimits, error) {
-	f, err := p.open("limits")
-	if err != nil {
-		return ProcLimits{}, err
-	}
-	defer f.Close()
-
-	var (
-		l = ProcLimits{}
-		s = bufio.NewScanner(f)
-	)
-	for s.Scan() {
-		fields := limitsDelimiter.Split(s.Text(), limitsFields)
-		if len(fields) != limitsFields {
-			return ProcLimits{}, fmt.Errorf(
-				"couldn't parse %s line %s", f.Name(), s.Text())
-		}
-
-		switch fields[0] {
-		case "Max cpu time":
-			l.CPUTime, err = parseInt(fields[1])
-		case "Max file size":
-			l.FileLocks, err = parseInt(fields[1])
-		case "Max data size":
-			l.DataSize, err = parseInt(fields[1])
-		case "Max stack size":
-			l.StackSize, err = parseInt(fields[1])
-		case "Max core file size":
-			l.CoreFileSize, err = parseInt(fields[1])
-		case "Max resident set":
-			l.ResidentSet, err = parseInt(fields[1])
-		case "Max processes":
-			l.Processes, err = parseInt(fields[1])
-		case "Max open files":
-			l.OpenFiles, err = parseInt(fields[1])
-		case "Max locked memory":
-			l.LockedMemory, err = parseInt(fields[1])
-		case "Max address space":
-			l.AddressSpace, err = parseInt(fields[1])
-		case "Max file locks":
-			l.FileLocks, err = parseInt(fields[1])
-		case "Max pending signals":
-			l.PendingSignals, err = parseInt(fields[1])
-		case "Max msgqueue size":
-			l.MsqqueueSize, err = parseInt(fields[1])
-		case "Max nice priority":
-			l.NicePriority, err = parseInt(fields[1])
-		case "Max realtime priority":
-			l.RealtimePriority, err = parseInt(fields[1])
-		case "Max realtime timeout":
-			l.RealtimeTimeout, err = parseInt(fields[1])
-		}
-
-		if err != nil {
-			return ProcLimits{}, err
-		}
-	}
-
-	return l, s.Err()
-}
-
-func parseInt(s string) (int, error) {
-	if s == limitsUnlimited {
-		return -1, nil
-	}
-	i, err := strconv.ParseInt(s, 10, 32)
-	if err != nil {
-		return 0, fmt.Errorf("couldn't parse value %s: %s", s, err)
-	}
-	return int(i), nil
-}
diff --git a/Godeps/_workspace/src/github.com/prometheus/procfs/proc_stat.go b/Godeps/_workspace/src/github.com/prometheus/procfs/proc_stat.go
deleted file mode 100644
index 30a403b6c..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/procfs/proc_stat.go
+++ /dev/null
@@ -1,175 +0,0 @@
-package procfs
-
-import (
-	"bytes"
-	"fmt"
-	"io/ioutil"
-	"os"
-)
-
-// Originally, this USER_HZ value was dynamically retrieved via a sysconf call which
-// required cgo. However, that caused a lot of problems regarding
-// cross-compilation. Alternatives such as running a binary to determine the
-// value, or trying to derive it in some other way were all problematic.
-// After much research it was determined that USER_HZ is actually hardcoded to
-// 100 on all Go-supported platforms as of the time of this writing. This is
-// why we decided to hardcode it here as well. It is not impossible that there
-// could be systems with exceptions, but they should be very exotic edge cases,
-// and in that case, the worst outcome will be two misreported metrics.
-//
-// See also the following discussions:
-//
-// - https://github.com/prometheus/node_exporter/issues/52
-// - https://github.com/prometheus/procfs/pull/2
-// - http://stackoverflow.com/questions/17410841/how-does-user-hz-solve-the-jiffy-scaling-issue
-const userHZ = 100
-
-// ProcStat provides status information about the process,
-// read from /proc/[pid]/stat.
-type ProcStat struct {
-	// The process ID.
-	PID int
-	// The filename of the executable.
-	Comm string
-	// The process state.
-	State string
-	// The PID of the parent of this process.
-	PPID int
-	// The process group ID of the process.
-	PGRP int
-	// The session ID of the process.
-	Session int
-	// The controlling terminal of the process.
-	TTY int
-	// The ID of the foreground process group of the controlling terminal of
-	// the process.
-	TPGID int
-	// The kernel flags word of the process.
-	Flags uint
-	// The number of minor faults the process has made which have not required
-	// loading a memory page from disk.
-	MinFlt uint
-	// The number of minor faults that the process's waited-for children have
-	// made.
-	CMinFlt uint
-	// The number of major faults the process has made which have required
-	// loading a memory page from disk.
-	MajFlt uint
-	// The number of major faults that the process's waited-for children have
-	// made.
-	CMajFlt uint
-	// Amount of time that this process has been scheduled in user mode,
-	// measured in clock ticks.
-	UTime uint
-	// Amount of time that this process has been scheduled in kernel mode,
-	// measured in clock ticks.
-	STime uint
-	// Amount of time that this process's waited-for children have been
-	// scheduled in user mode, measured in clock ticks.
-	CUTime uint
-	// Amount of time that this process's waited-for children have been
-	// scheduled in kernel mode, measured in clock ticks.
-	CSTime uint
-	// For processes running a real-time scheduling policy, this is the negated
-	// scheduling priority, minus one.
-	Priority int
-	// The nice value, a value in the range 19 (low priority) to -20 (high
-	// priority).
-	Nice int
-	// Number of threads in this process.
-	NumThreads int
-	// The time the process started after system boot, the value is expressed
-	// in clock ticks.
-	Starttime uint64
-	// Virtual memory size in bytes.
-	VSize int
-	// Resident set size in pages.
-	RSS int
-
-	fs FS
-}
-
-// NewStat returns the current status information of the process.
-func (p Proc) NewStat() (ProcStat, error) {
-	f, err := p.open("stat")
-	if err != nil {
-		return ProcStat{}, err
-	}
-	defer f.Close()
-
-	data, err := ioutil.ReadAll(f)
-	if err != nil {
-		return ProcStat{}, err
-	}
-
-	var (
-		ignore int
-
-		s = ProcStat{PID: p.PID, fs: p.fs}
-		l = bytes.Index(data, []byte("("))
-		r = bytes.LastIndex(data, []byte(")"))
-	)
-
-	if l < 0 || r < 0 {
-		return ProcStat{}, fmt.Errorf(
-			"unexpected format, couldn't extract comm: %s",
-			data,
-		)
-	}
-
-	s.Comm = string(data[l+1 : r])
-	_, err = fmt.Fscan(
-		bytes.NewBuffer(data[r+2:]),
-		&s.State,
-		&s.PPID,
-		&s.PGRP,
-		&s.Session,
-		&s.TTY,
-		&s.TPGID,
-		&s.Flags,
-		&s.MinFlt,
-		&s.CMinFlt,
-		&s.MajFlt,
-		&s.CMajFlt,
-		&s.UTime,
-		&s.STime,
-		&s.CUTime,
-		&s.CSTime,
-		&s.Priority,
-		&s.Nice,
-		&s.NumThreads,
-		&ignore,
-		&s.Starttime,
-		&s.VSize,
-		&s.RSS,
-	)
-	if err != nil {
-		return ProcStat{}, err
-	}
-
-	return s, nil
-}
-
-// VirtualMemory returns the virtual memory size in bytes.
-func (s ProcStat) VirtualMemory() int {
-	return s.VSize
-}
-
-// ResidentMemory returns the resident memory size in bytes.
-func (s ProcStat) ResidentMemory() int {
-	return s.RSS * os.Getpagesize()
-}
-
-// StartTime returns the unix timestamp of the process in seconds.
-func (s ProcStat) StartTime() (float64, error) {
-	stat, err := s.fs.NewStat()
-	if err != nil {
-		return 0, err
-	}
-	return float64(stat.BootTime) + (float64(s.Starttime) / userHZ), nil
-}
-
-// CPUTime returns the total CPU user and system time in seconds.
-func (s ProcStat) CPUTime() float64 {
-	return float64(s.UTime+s.STime) / userHZ
-}
diff --git a/Godeps/_workspace/src/github.com/prometheus/procfs/stat.go b/Godeps/_workspace/src/github.com/prometheus/procfs/stat.go
deleted file mode 100644
index 26fefb0fa..000000000
--- a/Godeps/_workspace/src/github.com/prometheus/procfs/stat.go
+++ /dev/null
@@ -1,55 +0,0 @@
-package procfs
-
-import (
-	"bufio"
-	"fmt"
-	"strconv"
-	"strings"
-)
-
-// Stat represents kernel/system statistics.
-type Stat struct {
-	// Boot time in seconds since the Epoch.
-	BootTime int64
-}
-
-// NewStat returns kernel/system statistics read from /proc/stat.
-func NewStat() (Stat, error) {
-	fs, err := NewFS(DefaultMountPoint)
-	if err != nil {
-		return Stat{}, err
-	}
-
-	return fs.NewStat()
-}
-
-// NewStat returns an information about current kernel/system statistics.
-func (fs FS) NewStat() (Stat, error) {
-	f, err := fs.open("stat")
-	if err != nil {
-		return Stat{}, err
-	}
-	defer f.Close()
-
-	s := bufio.NewScanner(f)
-	for s.Scan() {
-		line := s.Text()
-		if !strings.HasPrefix(line, "btime") {
-			continue
-		}
-		fields := strings.Fields(line)
-		if len(fields) != 2 {
-			return Stat{}, fmt.Errorf("couldn't parse %s line %s", f.Name(), line)
-		}
-		i, err := strconv.ParseInt(fields[1], 10, 32)
-		if err != nil {
-			return Stat{}, fmt.Errorf("couldn't parse %s: %s", fields[1], err)
-		}
-		return Stat{BootTime: i}, nil
-	}
-	if err := s.Err(); err != nil {
-		return Stat{}, fmt.Errorf("couldn't parse %s: %s", f.Name(), err)
-	}
-
-	return Stat{}, fmt.Errorf("couldn't parse %s, missing btime", f.Name())
-}
diff --git a/Godeps/_workspace/src/github.com/samuel/go-zookeeper/zk/cluster_test.go b/Godeps/_workspace/src/github.com/samuel/go-zookeeper/zk/cluster_test.go
deleted file mode 100644
index b8571734e..000000000
--- a/Godeps/_workspace/src/github.com/samuel/go-zookeeper/zk/cluster_test.go
+++ /dev/null
@@ -1,166 +0,0 @@
-package zk
-
-import (
-	"fmt"
-	"strings"
-	"testing"
-	"time"
-)
-
-type logWriter struct {
-	t *testing.T
-	p string
-}
-
-func (lw logWriter) Write(b []byte) (int, error) {
-	lw.t.Logf("%s%s", lw.p, string(b))
-	return len(b), nil
-}
-
-func TestBasicCluster(t *testing.T) {
-	ts, err := StartTestCluster(3, nil, logWriter{t: t, p: "[ZKERR] "})
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer ts.Stop()
-	zk1, err := ts.Connect(0)
-	if err != nil {
-		t.Fatalf("Connect returned error: %+v", err)
-	}
-	defer zk1.Close()
-	zk2, err := ts.Connect(1)
-	if err != nil {
-		t.Fatalf("Connect returned error: %+v", err)
-	}
-	defer zk2.Close()
-
-	time.Sleep(time.Second * 5)
-
-	if _, err := zk1.Create("/gozk-test", []byte("foo-cluster"), 0, WorldACL(PermAll)); err != nil {
-		t.Fatalf("Create failed on node 1: %+v", err)
-	}
-	if by, _, err := zk2.Get("/gozk-test"); err != nil {
-		t.Fatalf("Get failed on node 2: %+v", err)
-	} else if string(by) != "foo-cluster" {
-		t.Fatal("Wrong data for node 2")
-	}
-}
-
-func TestClientClusterFailover(t *testing.T) {
-	ts, err := StartTestCluster(3, nil, logWriter{t: t, p: "[ZKERR] "})
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer ts.Stop()
-	zk, evCh, err := ts.ConnectAll()
-	if err != nil {
-		t.Fatalf("Connect returned error: %+v", err)
-	}
-	defer zk.Close()
-
-	hasSession := make(chan string, 1)
-	go func() {
-		for ev := range evCh {
-			if ev.Type == EventSession && ev.State == StateHasSession {
-				select {
-				case hasSession <- ev.Server:
-				default:
-				}
-			}
-		}
-	}()
-
-	waitSession := func() string {
-		select {
-		case srv := <-hasSession:
-			return srv
-		case <-time.After(time.Second * 8):
-			t.Fatal("Failed to connect and get a session")
-		}
-		return ""
-	}
-
-	srv := waitSession()
-	if _, err := zk.Create("/gozk-test", []byte("foo-cluster"), 0, WorldACL(PermAll)); err != nil {
-		t.Fatalf("Create failed on node 1: %+v", err)
-	}
-
-	stopped := false
-	for _, s := range ts.Servers {
-		if strings.HasSuffix(srv, fmt.Sprintf(":%d", s.Port)) {
-			s.Srv.Stop()
-			stopped = true
-			break
-		}
-	}
-	if !stopped {
-		t.Fatal("Failed to stop server")
-	}
-
-	waitSession()
-	if by, _, err := zk.Get("/gozk-test"); err != nil {
-		t.Fatalf("Get failed on node 2: %+v", err)
-	} else if string(by) != "foo-cluster" {
-		t.Fatal("Wrong data for node 2")
-	}
-}
-
-func TestWaitForClose(t *testing.T) {
-	ts, err := StartTestCluster(1, nil, logWriter{t: t, p: "[ZKERR] "})
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer ts.Stop()
-	zk, err := ts.Connect(0)
-	if err != nil {
-		t.Fatalf("Connect returned error: %+v", err)
-	}
-	timeout := time.After(30 * time.Second)
-CONNECTED:
-	for {
-		select {
-		case ev := <-zk.eventChan:
-			if ev.State == StateConnected {
-				break CONNECTED
-			}
-		case <-timeout:
-			zk.Close()
-			t.Fatal("Timeout")
-		}
-	}
-	zk.Close()
-	for {
-		select {
-		case _, ok := <-zk.eventChan:
-			if !ok {
-				return
-			}
-		case <-timeout:
-			t.Fatal("Timeout")
-		}
-	}
-}
-
-func TestBadSession(t *testing.T) {
-	ts, err := StartTestCluster(1, nil, logWriter{t: t, p: "[ZKERR] "})
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer ts.Stop()
-	zk, _, err := ts.ConnectAll()
-	if err != nil {
-		t.Fatalf("Connect returned error: %+v", err)
-	}
-	defer zk.Close()
-
-	if err := zk.Delete("/gozk-test", -1); err != nil && err != ErrNoNode {
-		t.Fatalf("Delete returned error: %+v", err)
-	}
-
-	zk.conn.Close()
-	time.Sleep(time.Millisecond * 100)
-
-	if err := zk.Delete("/gozk-test", -1); err != nil && err != ErrNoNode {
-		t.Fatalf("Delete returned error: %+v", err)
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/samuel/go-zookeeper/zk/conn.go b/Godeps/_workspace/src/github.com/samuel/go-zookeeper/zk/conn.go
deleted file mode 100644
index eef2572de..000000000
--- a/Godeps/_workspace/src/github.com/samuel/go-zookeeper/zk/conn.go
+++ /dev/null
@@ -1,871 +0,0 @@
-// Package zk is a native Go client library for the ZooKeeper orchestration service.
-package zk
-
-/*
-TODO:
-* make sure a ping response comes back in a reasonable time
-
-Possible watcher events:
-* Event{Type: EventNotWatching, State: StateDisconnected, Path: path, Err: err}
-*/
-
-import (
-	"crypto/rand"
-	"encoding/binary"
-	"errors"
-	"fmt"
-	"io"
-	"net"
-	"strconv"
-	"strings"
-	"sync"
-	"sync/atomic"
-	"time"
-)
-
-// ErrNoServer indicates that an operation cannot be completed
-// because attempts to connect to all servers in the list failed.
-var ErrNoServer = errors.New("zk: could not connect to a server")
-
-// ErrInvalidPath indicates that an operation was being attempted on
-// an invalid path. (e.g. empty path)
-var ErrInvalidPath = errors.New("zk: invalid path")
-
-// DefaultLogger uses the stdlib log package for logging.
-var DefaultLogger = defaultLogger{}
-
-const (
-	bufferSize      = 1536 * 1024
-	eventChanSize   = 6
-	sendChanSize    = 16
-	protectedPrefix = "_c_"
-)
-
-type watchType int
-
-const (
-	watchTypeData  = iota
-	watchTypeExist = iota
-	watchTypeChild = iota
-)
-
-type watchPathType struct {
-	path  string
-	wType watchType
-}
-
-type Dialer func(network, address string, timeout time.Duration) (net.Conn, error)
-
-// Logger is an interface that can be implemented to provide custom log output.
-type Logger interface {
-	Printf(string, ...interface{})
-}
-
-type Conn struct {
-	lastZxid  int64
-	sessionID int64
-	state     State // must be 32-bit aligned
-	xid       uint32
-	timeout   int32 // session timeout in milliseconds
-	passwd    []byte
-
-	dialer          Dialer
-	servers         []string
-	serverIndex     int // remember last server that was tried during connect to round-robin attempts to servers
-	lastServerIndex int // index of the last server that was successfully connected to and authenticated with
-	conn            net.Conn
-	eventChan       chan Event
-	shouldQuit      chan struct{}
-	pingInterval    time.Duration
-	recvTimeout     time.Duration
-	connectTimeout  time.Duration
-
-	sendChan     chan *request
-	requests     map[int32]*request // Xid -> pending request
-	requestsLock sync.Mutex
-	watchers     map[watchPathType][]chan Event
-	watchersLock sync.Mutex
-
-	// Debug (used by unit tests)
-	reconnectDelay time.Duration
-
-	logger Logger
-}
-
-type request struct {
-	xid        int32
-	opcode     int32
-	pkt        interface{}
-	recvStruct interface{}
-	recvChan   chan response
-
-	// Because sending and receiving happen in separate go routines, there's
-	// a possible race condition when creating watches from outside the read
-	// loop. We must ensure that a watcher gets added to the list synchronously
-	// with the response from the server on any request that creates a watch.
-	// In order to not hard code the watch logic for each opcode in the recv
-	// loop the caller can use recvFunc to insert some synchronously code
-	// after a response.
-	recvFunc func(*request, *responseHeader, error)
-}
-
-type response struct {
-	zxid int64
-	err  error
-}
-
-type Event struct {
-	Type   EventType
-	State  State
-	Path   string // For non-session events, the path of the watched node.
-	Err    error
-	Server string // For connection events
-}
-
-// Connect establishes a new connection to a pool of zookeeper servers
-// using the default net.Dialer. See ConnectWithDialer for further
-// information about session timeout.
-func Connect(servers []string, sessionTimeout time.Duration) (*Conn, <-chan Event, error) {
-	return ConnectWithDialer(servers, sessionTimeout, nil)
-}
-
-// ConnectWithDialer establishes a new connection to a pool of zookeeper
-// servers. The provided session timeout sets the amount of time for which
-// a session is considered valid after losing connection to a server. Within
-// the session timeout it's possible to reestablish a connection to a different
-// server and keep the same session. This is means any ephemeral nodes and
-// watches are maintained.
-func ConnectWithDialer(servers []string, sessionTimeout time.Duration, dialer Dialer) (*Conn, <-chan Event, error) {
-	if len(servers) == 0 {
-		return nil, nil, errors.New("zk: server list must not be empty")
-	}
-
-	recvTimeout := sessionTimeout * 2 / 3
-
-	srvs := make([]string, len(servers))
-
-	for i, addr := range servers {
-		if strings.Contains(addr, ":") {
-			srvs[i] = addr
-		} else {
-			srvs[i] = addr + ":" + strconv.Itoa(DefaultPort)
-		}
-	}
-
-	// Randomize the order of the servers to avoid creating hotspots
-	stringShuffle(srvs)
-
-	ec := make(chan Event, eventChanSize)
-	if dialer == nil {
-		dialer = net.DialTimeout
-	}
-	conn := Conn{
-		dialer:          dialer,
-		servers:         srvs,
-		serverIndex:     0,
-		lastServerIndex: -1,
-		conn:            nil,
-		state:           StateDisconnected,
-		eventChan:       ec,
-		shouldQuit:      make(chan struct{}),
-		recvTimeout:     recvTimeout,
-		pingInterval:    recvTimeout / 2,
-		connectTimeout:  1 * time.Second,
-		sendChan:        make(chan *request, sendChanSize),
-		requests:        make(map[int32]*request),
-		watchers:        make(map[watchPathType][]chan Event),
-		passwd:          emptyPassword,
-		timeout:         int32(sessionTimeout.Nanoseconds() / 1e6),
-		logger:          DefaultLogger,
-
-		// Debug
-		reconnectDelay: 0,
-	}
-	go func() {
-		conn.loop()
-		conn.flushRequests(ErrClosing)
-		conn.invalidateWatches(ErrClosing)
-		close(conn.eventChan)
-	}()
-	return &conn, ec, nil
-}
-
-func (c *Conn) Close() {
-	close(c.shouldQuit)
-
-	select {
-	case <-c.queueRequest(opClose, &closeRequest{}, &closeResponse{}, nil):
-	case <-time.After(time.Second):
-	}
-}
-
-// States returns the current state of the connection.
-func (c *Conn) State() State {
-	return State(atomic.LoadInt32((*int32)(&c.state)))
-}
-
-// SetLogger sets the logger to be used for printing errors.
-// Logger is an interface provided by this package.
-func (c *Conn) SetLogger(l Logger) {
-	c.logger = l
-}
-
-func (c *Conn) setState(state State) {
-	atomic.StoreInt32((*int32)(&c.state), int32(state))
-	select {
-	case c.eventChan <- Event{Type: EventSession, State: state, Server: c.servers[c.serverIndex]}:
-	default:
-		// panic("zk: event channel full - it must be monitored and never allowed to be full")
-	}
-}
-
-func (c *Conn) connect() error {
-	c.setState(StateConnecting)
-	for {
-		c.serverIndex = (c.serverIndex + 1) % len(c.servers)
-		if c.serverIndex == c.lastServerIndex {
-			c.flushUnsentRequests(ErrNoServer)
-			select {
-			case <-time.After(time.Second):
-				// pass
-			case <-c.shouldQuit:
-				c.setState(StateDisconnected)
-				c.flushUnsentRequests(ErrClosing)
-				return ErrClosing
-			}
-		} else if c.lastServerIndex < 0 {
-			// lastServerIndex defaults to -1 to avoid a delay on the initial connect
-			c.lastServerIndex = 0
-		}
-
-		zkConn, err := c.dialer("tcp", c.servers[c.serverIndex], c.connectTimeout)
-		if err == nil {
-			c.conn = zkConn
-			c.setState(StateConnected)
-			return nil
-		}
-
-		c.logger.Printf("Failed to connect to %s: %+v", c.servers[c.serverIndex], err)
-	}
-}
-
-func (c *Conn) loop() {
-	for {
-		if err := c.connect(); err != nil {
-			// c.Close() was called
-			return
-		}
-
-		err := c.authenticate()
-		switch {
-		case err == ErrSessionExpired:
-			c.invalidateWatches(err)
-		case err != nil && c.conn != nil:
-			c.conn.Close()
-		case err == nil:
-			c.lastServerIndex = c.serverIndex
-			closeChan := make(chan struct{}) // channel to tell send loop stop
-			var wg sync.WaitGroup
-
-			wg.Add(1)
-			go func() {
-				c.sendLoop(c.conn, closeChan)
-				c.conn.Close() // causes recv loop to EOF/exit
-				wg.Done()
-			}()
-
-			wg.Add(1)
-			go func() {
-				err = c.recvLoop(c.conn)
-				if err == nil {
-					panic("zk: recvLoop should never return nil error")
-				}
-				close(closeChan) // tell send loop to exit
-				wg.Done()
-			}()
-
-			wg.Wait()
-		}
-
-		c.setState(StateDisconnected)
-
-		// Yeesh
-		if err != io.EOF && err != ErrSessionExpired && !strings.Contains(err.Error(), "use of closed network connection") {
-			c.logger.Printf(err.Error())
-		}
-
-		select {
-		case <-c.shouldQuit:
-			c.flushRequests(ErrClosing)
-			return
-		default:
-		}
-
-		if err != ErrSessionExpired {
-			err = ErrConnectionClosed
-		}
-		c.flushRequests(err)
-
-		if c.reconnectDelay > 0 {
-			select {
-			case <-c.shouldQuit:
-				return
-			case <-time.After(c.reconnectDelay):
-			}
-		}
-	}
-}
-
-func (c *Conn) flushUnsentRequests(err error) {
-	for {
-		select {
-		default:
-			return
-		case req := <-c.sendChan:
-			req.recvChan <- response{-1, err}
-		}
-	}
-}
-
-// Send error to all pending requests and clear request map
-func (c *Conn) flushRequests(err error) {
-	c.requestsLock.Lock()
-	for _, req := range c.requests {
-		req.recvChan <- response{-1, err}
-	}
-	c.requests = make(map[int32]*request)
-	c.requestsLock.Unlock()
-}
-
-// Send error to all watchers and clear watchers map
-func (c *Conn) invalidateWatches(err error) {
-	c.watchersLock.Lock()
-	defer c.watchersLock.Unlock()
-
-	if len(c.watchers) >= 0 {
-		for pathType, watchers := range c.watchers {
-			ev := Event{Type: EventNotWatching, State: StateDisconnected, Path: pathType.path, Err: err}
-			for _, ch := range watchers {
-				ch <- ev
-				close(ch)
-			}
-		}
-		c.watchers = make(map[watchPathType][]chan Event)
-	}
-}
-
-func (c *Conn) sendSetWatches() {
-	c.watchersLock.Lock()
-	defer c.watchersLock.Unlock()
-
-	if len(c.watchers) == 0 {
-		return
-	}
-
-	req := &setWatchesRequest{
-		RelativeZxid: c.lastZxid,
-		DataWatches:  make([]string, 0),
-		ExistWatches: make([]string, 0),
-		ChildWatches: make([]string, 0),
-	}
-	n := 0
-	for pathType, watchers := range c.watchers {
-		if len(watchers) == 0 {
-			continue
-		}
-		switch pathType.wType {
-		case watchTypeData:
-			req.DataWatches = append(req.DataWatches, pathType.path)
-		case watchTypeExist:
-			req.ExistWatches = append(req.ExistWatches, pathType.path)
-		case watchTypeChild:
-			req.ChildWatches = append(req.ChildWatches, pathType.path)
-		}
-		n++
-	}
-	if n == 0 {
-		return
-	}
-
-	go func() {
-		res := &setWatchesResponse{}
-		_, err := c.request(opSetWatches, req, res, nil)
-		if err != nil {
-			c.logger.Printf("Failed to set previous watches: %s", err.Error())
-		}
-	}()
-}
-
-func (c *Conn) authenticate() error {
-	buf := make([]byte, 256)
-
-	// connect request
-
-	n, err := encodePacket(buf[4:], &connectRequest{
-		ProtocolVersion: protocolVersion,
-		LastZxidSeen:    c.lastZxid,
-		TimeOut:         c.timeout,
-		SessionID:       c.sessionID,
-		Passwd:          c.passwd,
-	})
-	if err != nil {
-		return err
-	}
-
-	binary.BigEndian.PutUint32(buf[:4], uint32(n))
-
-	c.conn.SetWriteDeadline(time.Now().Add(c.recvTimeout * 10))
-	_, err = c.conn.Write(buf[:n+4])
-	c.conn.SetWriteDeadline(time.Time{})
-	if err != nil {
-		return err
-	}
-
-	c.sendSetWatches()
-
-	// connect response
-
-	// package length
-	c.conn.SetReadDeadline(time.Now().Add(c.recvTimeout * 10))
-	_, err = io.ReadFull(c.conn, buf[:4])
-	c.conn.SetReadDeadline(time.Time{})
-	if err != nil {
-		// Sometimes zookeeper just drops connection on invalid session data,
-		// we prefer to drop session and start from scratch when that event
-		// occurs instead of dropping into loop of connect/disconnect attempts
-		c.sessionID = 0
-		c.passwd = emptyPassword
-		c.lastZxid = 0
-		c.setState(StateExpired)
-		return ErrSessionExpired
-	}
-
-	blen := int(binary.BigEndian.Uint32(buf[:4]))
-	if cap(buf) < blen {
-		buf = make([]byte, blen)
-	}
-
-	_, err = io.ReadFull(c.conn, buf[:blen])
-	if err != nil {
-		return err
-	}
-
-	r := connectResponse{}
-	_, err = decodePacket(buf[:blen], &r)
-	if err != nil {
-		return err
-	}
-	if r.SessionID == 0 {
-		c.sessionID = 0
-		c.passwd = emptyPassword
-		c.lastZxid = 0
-		c.setState(StateExpired)
-		return ErrSessionExpired
-	}
-
-	if c.sessionID != r.SessionID {
-		atomic.StoreUint32(&c.xid, 0)
-	}
-	c.timeout = r.TimeOut
-	c.sessionID = r.SessionID
-	c.passwd = r.Passwd
-	c.setState(StateHasSession)
-
-	return nil
-}
-
-func (c *Conn) sendLoop(conn net.Conn, closeChan <-chan struct{}) error {
-	pingTicker := time.NewTicker(c.pingInterval)
-	defer pingTicker.Stop()
-
-	buf := make([]byte, bufferSize)
-	for {
-		select {
-		case req := <-c.sendChan:
-			header := &requestHeader{req.xid, req.opcode}
-			n, err := encodePacket(buf[4:], header)
-			if err != nil {
-				req.recvChan <- response{-1, err}
-				continue
-			}
-
-			n2, err := encodePacket(buf[4+n:], req.pkt)
-			if err != nil {
-				req.recvChan <- response{-1, err}
-				continue
-			}
-
-			n += n2
-
-			binary.BigEndian.PutUint32(buf[:4], uint32(n))
-
-			c.requestsLock.Lock()
-			select {
-			case <-closeChan:
-				req.recvChan <- response{-1, ErrConnectionClosed}
-				c.requestsLock.Unlock()
-				return ErrConnectionClosed
-			default:
-			}
-			c.requests[req.xid] = req
-			c.requestsLock.Unlock()
-
-			conn.SetWriteDeadline(time.Now().Add(c.recvTimeout))
-			_, err = conn.Write(buf[:n+4])
-			conn.SetWriteDeadline(time.Time{})
-			if err != nil {
-				req.recvChan <- response{-1, err}
-				conn.Close()
-				return err
-			}
-		case <-pingTicker.C:
-			n, err := encodePacket(buf[4:], &requestHeader{Xid: -2, Opcode: opPing})
-			if err != nil {
-				panic("zk: opPing should never fail to serialize")
-			}
-
-			binary.BigEndian.PutUint32(buf[:4], uint32(n))
-
-			conn.SetWriteDeadline(time.Now().Add(c.recvTimeout))
-			_, err = conn.Write(buf[:n+4])
-			conn.SetWriteDeadline(time.Time{})
-			if err != nil {
-				conn.Close()
-				return err
-			}
-		case <-closeChan:
-			return nil
-		}
-	}
-}
-
-func (c *Conn) recvLoop(conn net.Conn) error {
-	buf := make([]byte, bufferSize)
-	for {
-		// package length
-		conn.SetReadDeadline(time.Now().Add(c.recvTimeout))
-		_, err := io.ReadFull(conn, buf[:4])
-		if err != nil {
-			return err
-		}
-
-		blen := int(binary.BigEndian.Uint32(buf[:4]))
-		if cap(buf) < blen {
-			buf = make([]byte, blen)
-		}
-
-		_, err = io.ReadFull(conn, buf[:blen])
-		conn.SetReadDeadline(time.Time{})
-		if err != nil {
-			return err
-		}
-
-		res := responseHeader{}
-		_, err = decodePacket(buf[:16], &res)
-		if err != nil {
-			return err
-		}
-
-		if res.Xid == -1 {
-			res := &watcherEvent{}
-			_, err := decodePacket(buf[16:16+blen], res)
-			if err != nil {
-				return err
-			}
-			ev := Event{
-				Type:  res.Type,
-				State: res.State,
-				Path:  res.Path,
-				Err:   nil,
-			}
-			select {
-			case c.eventChan <- ev:
-			default:
-			}
-			wTypes := make([]watchType, 0, 2)
-			switch res.Type {
-			case EventNodeCreated:
-				wTypes = append(wTypes, watchTypeExist)
-			case EventNodeDeleted, EventNodeDataChanged:
-				wTypes = append(wTypes, watchTypeExist, watchTypeData, watchTypeChild)
-			case EventNodeChildrenChanged:
-				wTypes = append(wTypes, watchTypeChild)
-			}
-			c.watchersLock.Lock()
-			for _, t := range wTypes {
-				wpt := watchPathType{res.Path, t}
-				if watchers := c.watchers[wpt]; watchers != nil && len(watchers) > 0 {
-					for _, ch := range watchers {
-						ch <- ev
-						close(ch)
-					}
-					delete(c.watchers, wpt)
-				}
-			}
-			c.watchersLock.Unlock()
-		} else if res.Xid == -2 {
-			// Ping response. Ignore.
-		} else if res.Xid < 0 {
-			c.logger.Printf("Xid < 0 (%d) but not ping or watcher event", res.Xid)
-		} else {
-			if res.Zxid > 0 {
-				c.lastZxid = res.Zxid
-			}
-
-			c.requestsLock.Lock()
-			req, ok := c.requests[res.Xid]
-			if ok {
-				delete(c.requests, res.Xid)
-			}
-			c.requestsLock.Unlock()
-
-			if !ok {
-				c.logger.Printf("Response for unknown request with xid %d", res.Xid)
-			} else {
-				if res.Err != 0 {
-					err = res.Err.toError()
-				} else {
-					_, err = decodePacket(buf[16:16+blen], req.recvStruct)
-				}
-				if req.recvFunc != nil {
-					req.recvFunc(req, &res, err)
-				}
-				req.recvChan <- response{res.Zxid, err}
-				if req.opcode == opClose {
-					return io.EOF
-				}
-			}
-		}
-	}
-}
-
-func (c *Conn) nextXid() int32 {
-	return int32(atomic.AddUint32(&c.xid, 1) & 0x7fffffff)
-}
-
-func (c *Conn) addWatcher(path string, watchType watchType) <-chan Event {
-	c.watchersLock.Lock()
-	defer c.watchersLock.Unlock()
-
-	ch := make(chan Event, 1)
-	wpt := watchPathType{path, watchType}
-	c.watchers[wpt] = append(c.watchers[wpt], ch)
-	return ch
-}
-
-func (c *Conn) queueRequest(opcode int32, req interface{}, res interface{}, recvFunc func(*request, *responseHeader, error)) <-chan response {
-	rq := &request{
-		xid:        c.nextXid(),
-		opcode:     opcode,
-		pkt:        req,
-		recvStruct: res,
-		recvChan:   make(chan response, 1),
-		recvFunc:   recvFunc,
-	}
-	c.sendChan <- rq
-	return rq.recvChan
-}
-
-func (c *Conn) request(opcode int32, req interface{}, res interface{}, recvFunc func(*request, *responseHeader, error)) (int64, error) {
-	r := <-c.queueRequest(opcode, req, res, recvFunc)
-	return r.zxid, r.err
-}
-
-func (c *Conn) AddAuth(scheme string, auth []byte) error {
-	_, err := c.request(opSetAuth, &setAuthRequest{Type: 0, Scheme: scheme, Auth: auth}, &setAuthResponse{}, nil)
-	return err
-}
-
-func (c *Conn) Children(path string) ([]string, *Stat, error) {
-	res := &getChildren2Response{}
-	_, err := c.request(opGetChildren2, &getChildren2Request{Path: path, Watch: false}, res, nil)
-	return res.Children, &res.Stat, err
-}
-
-func (c *Conn) ChildrenW(path string) ([]string, *Stat, <-chan Event, error) {
-	var ech <-chan Event
-	res := &getChildren2Response{}
-	_, err := c.request(opGetChildren2, &getChildren2Request{Path: path, Watch: true}, res, func(req *request, res *responseHeader, err error) {
-		if err == nil {
-			ech = c.addWatcher(path, watchTypeChild)
-		}
-	})
-	if err != nil {
-		return nil, nil, nil, err
-	}
-	return res.Children, &res.Stat, ech, err
-}
-
-func (c *Conn) Get(path string) ([]byte, *Stat, error) {
-	res := &getDataResponse{}
-	_, err := c.request(opGetData, &getDataRequest{Path: path, Watch: false}, res, nil)
-	return res.Data, &res.Stat, err
-}
-
-// GetW returns the contents of a znode and sets a watch
-func (c *Conn) GetW(path string) ([]byte, *Stat, <-chan Event, error) {
-	var ech <-chan Event
-	res := &getDataResponse{}
-	_, err := c.request(opGetData, &getDataRequest{Path: path, Watch: true}, res, func(req *request, res *responseHeader, err error) {
-		if err == nil {
-			ech = c.addWatcher(path, watchTypeData)
-		}
-	})
-	if err != nil {
-		return nil, nil, nil, err
-	}
-	return res.Data, &res.Stat, ech, err
-}
-
-func (c *Conn) Set(path string, data []byte, version int32) (*Stat, error) {
-	if path == "" {
-		return nil, ErrInvalidPath
-	}
-	res := &setDataResponse{}
-	_, err := c.request(opSetData, &SetDataRequest{path, data, version}, res, nil)
-	return &res.Stat, err
-}
-
-func (c *Conn) Create(path string, data []byte, flags int32, acl []ACL) (string, error) {
-	res := &createResponse{}
-	_, err := c.request(opCreate, &CreateRequest{path, data, acl, flags}, res, nil)
-	return res.Path, err
-}
-
-// CreateProtectedEphemeralSequential fixes a race condition if the server crashes
-// after it creates the node. On reconnect the session may still be valid so the
-// ephemeral node still exists. Therefore, on reconnect we need to check if a node
-// with a GUID generated on create exists.
-func (c *Conn) CreateProtectedEphemeralSequential(path string, data []byte, acl []ACL) (string, error) {
-	var guid [16]byte
-	_, err := io.ReadFull(rand.Reader, guid[:16])
-	if err != nil {
-		return "", err
-	}
-	guidStr := fmt.Sprintf("%x", guid)
-
-	parts := strings.Split(path, "/")
-	parts[len(parts)-1] = fmt.Sprintf("%s%s-%s", protectedPrefix, guidStr, parts[len(parts)-1])
-	rootPath := strings.Join(parts[:len(parts)-1], "/")
-	protectedPath := strings.Join(parts, "/")
-
-	var newPath string
-	for i := 0; i < 3; i++ {
-		newPath, err = c.Create(protectedPath, data, FlagEphemeral|FlagSequence, acl)
-		switch err {
-		case ErrSessionExpired:
-			// No need to search for the node since it can't exist. Just try again.
-		case ErrConnectionClosed:
-			children, _, err := c.Children(rootPath)
-			if err != nil {
-				return "", err
-			}
-			for _, p := range children {
-				parts := strings.Split(p, "/")
-				if pth := parts[len(parts)-1]; strings.HasPrefix(pth, protectedPrefix) {
-					if g := pth[len(protectedPrefix) : len(protectedPrefix)+32]; g == guidStr {
-						return rootPath + "/" + p, nil
-					}
-				}
-			}
-		case nil:
-			return newPath, nil
-		default:
-			return "", err
-		}
-	}
-	return "", err
-}
-
-func (c *Conn) Delete(path string, version int32) error {
-	_, err := c.request(opDelete, &DeleteRequest{path, version}, &deleteResponse{}, nil)
-	return err
-}
-
-func (c *Conn) Exists(path string) (bool, *Stat, error) {
-	res := &existsResponse{}
-	_, err := c.request(opExists, &existsRequest{Path: path, Watch: false}, res, nil)
-	exists := true
-	if err == ErrNoNode {
-		exists = false
-		err = nil
-	}
-	return exists, &res.Stat, err
-}
-
-func (c *Conn) ExistsW(path string) (bool, *Stat, <-chan Event, error) {
-	var ech <-chan Event
-	res := &existsResponse{}
-	_, err := c.request(opExists, &existsRequest{Path: path, Watch: true}, res, func(req *request, res *responseHeader, err error) {
-		if err == nil {
-			ech = c.addWatcher(path, watchTypeData)
-		} else if err == ErrNoNode {
-			ech = c.addWatcher(path, watchTypeExist)
-		}
-	})
-	exists := true
-	if err == ErrNoNode {
-		exists = false
-		err = nil
-	}
-	if err != nil {
-		return false, nil, nil, err
-	}
-	return exists, &res.Stat, ech, err
-}
-
-func (c *Conn) GetACL(path string) ([]ACL, *Stat, error) {
-	res := &getAclResponse{}
-	_, err := c.request(opGetAcl, &getAclRequest{Path: path}, res, nil)
-	return res.Acl, &res.Stat, err
-}
-
-func (c *Conn) SetACL(path string, acl []ACL, version int32) (*Stat, error) {
-	res := &setAclResponse{}
-	_, err := c.request(opSetAcl, &setAclRequest{Path: path, Acl: acl, Version: version}, res, nil)
-	return &res.Stat, err
-}
-
-func (c *Conn) Sync(path string) (string, error) {
-	res := &syncResponse{}
-	_, err := c.request(opSync, &syncRequest{Path: path}, res, nil)
-	return res.Path, err
-}
-
-type MultiResponse struct {
-	Stat   *Stat
-	String string
-}
-
-// Multi executes multiple ZooKeeper operations or none of them. The provided
-// ops must be one of *CreateRequest, *DeleteRequest, *SetDataRequest, or
-// *CheckVersionRequest.
-func (c *Conn) Multi(ops ...interface{}) ([]MultiResponse, error) {
-	req := &multiRequest{
-		Ops:        make([]multiRequestOp, 0, len(ops)),
-		DoneHeader: multiHeader{Type: -1, Done: true, Err: -1},
-	}
-	for _, op := range ops {
-		var opCode int32
-		switch op.(type) {
-		case *CreateRequest:
-			opCode = opCreate
-		case *SetDataRequest:
-			opCode = opSetData
-		case *DeleteRequest:
-			opCode = opDelete
-		case *CheckVersionRequest:
-			opCode = opCheck
-		default:
-			return nil, fmt.Errorf("uknown operation type %T", op)
-		}
-		req.Ops = append(req.Ops, multiRequestOp{multiHeader{opCode, false, -1}, op})
-	}
-	res := &multiResponse{}
-	_, err := c.request(opMulti, req, res, nil)
-	mr := make([]MultiResponse, len(res.Ops))
-	for i, op := range res.Ops {
-		mr[i] = MultiResponse{Stat: op.Stat, String: op.String}
-	}
-	return mr, err
-}
diff --git a/Godeps/_workspace/src/github.com/samuel/go-zookeeper/zk/constants.go b/Godeps/_workspace/src/github.com/samuel/go-zookeeper/zk/constants.go
deleted file mode 100644
index f9b39b904..000000000
--- a/Godeps/_workspace/src/github.com/samuel/go-zookeeper/zk/constants.go
+++ /dev/null
@@ -1,240 +0,0 @@
-package zk
-
-import (
-	"errors"
-)
-
-const (
-	protocolVersion = 0
-
-	DefaultPort = 2181
-)
-
-const (
-	opNotify       = 0
-	opCreate       = 1
-	opDelete       = 2
-	opExists       = 3
-	opGetData      = 4
-	opSetData      = 5
-	opGetAcl       = 6
-	opSetAcl       = 7
-	opGetChildren  = 8
-	opSync         = 9
-	opPing         = 11
-	opGetChildren2 = 12
-	opCheck        = 13
-	opMulti        = 14
-	opClose        = -11
-	opSetAuth      = 100
-	opSetWatches   = 101
-	// Not in protocol, used internally
-	opWatcherEvent = -2
-)
-
-const (
-	EventNodeCreated         = EventType(1)
-	EventNodeDeleted         = EventType(2)
-	EventNodeDataChanged     = EventType(3)
-	EventNodeChildrenChanged = EventType(4)
-
-	EventSession     = EventType(-1)
-	EventNotWatching = EventType(-2)
-)
-
-var (
-	eventNames = map[EventType]string{
-		EventNodeCreated:         "EventNodeCreated",
-		EventNodeDeleted:         "EventNodeDeleted",
-		EventNodeDataChanged:     "EventNodeDataChanged",
-		EventNodeChildrenChanged: "EventNodeChildrenChanged",
-		EventSession:             "EventSession",
-		EventNotWatching:         "EventNotWatching",
-	}
-)
-
-const (
-	StateUnknown           = State(-1)
-	StateDisconnected      = State(0)
-	StateConnecting        = State(1)
-	StateAuthFailed        = State(4)
-	StateConnectedReadOnly = State(5)
-	StateSaslAuthenticated = State(6)
-	StateExpired           = State(-112)
-	// StateAuthFailed        = State(-113)
-
-	StateConnected  = State(100)
-	StateHasSession = State(101)
-)
-
-const (
-	FlagEphemeral = 1
-	FlagSequence  = 2
-)
-
-var (
-	stateNames = map[State]string{
-		StateUnknown:           "StateUnknown",
-		StateDisconnected:      "StateDisconnected",
-		StateConnectedReadOnly: "StateConnectedReadOnly",
-		StateSaslAuthenticated: "StateSaslAuthenticated",
-		StateExpired:           "StateExpired",
-		StateAuthFailed:        "StateAuthFailed",
-		StateConnecting:        "StateConnecting",
-		StateConnected:         "StateConnected",
-		StateHasSession:        "StateHasSession",
-	}
-)
-
-type State int32
-
-func (s State) String() string {
-	if name := stateNames[s]; name != "" {
-		return name
-	}
-	return "Unknown"
-}
-
-type ErrCode int32
-
-var (
-	ErrConnectionClosed        = errors.New("zk: connection closed")
-	ErrUnknown                 = errors.New("zk: unknown error")
-	ErrAPIError                = errors.New("zk: api error")
-	ErrNoNode                  = errors.New("zk: node does not exist")
-	ErrNoAuth                  = errors.New("zk: not authenticated")
-	ErrBadVersion              = errors.New("zk: version conflict")
-	ErrNoChildrenForEphemerals = errors.New("zk: ephemeral nodes may not have children")
-	ErrNodeExists              = errors.New("zk: node already exists")
-	ErrNotEmpty                = errors.New("zk: node has children")
-	ErrSessionExpired          = errors.New("zk: session has been expired by the server")
-	ErrInvalidACL              = errors.New("zk: invalid ACL specified")
-	ErrAuthFailed              = errors.New("zk: client authentication failed")
-	ErrClosing                 = errors.New("zk: zookeeper is closing")
-	ErrNothing                 = errors.New("zk: no server responsees to process")
-	ErrSessionMoved            = errors.New("zk: session moved to another server, so operation is ignored")
-
-	// ErrInvalidCallback         = errors.New("zk: invalid callback specified")
-	errCodeToError = map[ErrCode]error{
-		0:                          nil,
-		errAPIError:                ErrAPIError,
-		errNoNode:                  ErrNoNode,
-		errNoAuth:                  ErrNoAuth,
-		errBadVersion:              ErrBadVersion,
-		errNoChildrenForEphemerals: ErrNoChildrenForEphemerals,
-		errNodeExists:              ErrNodeExists,
-		errNotEmpty:                ErrNotEmpty,
-		errSessionExpired:          ErrSessionExpired,
-		// errInvalidCallback:         ErrInvalidCallback,
-		errInvalidAcl:   ErrInvalidACL,
-		errAuthFailed:   ErrAuthFailed,
-		errClosing:      ErrClosing,
-		errNothing:      ErrNothing,
-		errSessionMoved: ErrSessionMoved,
-	}
-)
-
-func (e ErrCode) toError() error {
-	if err, ok := errCodeToError[e]; ok {
-		return err
-	}
-	return ErrUnknown
-}
-
-const (
-	errOk = 0
-	// System and server-side errors
-	errSystemError          = -1
-	errRuntimeInconsistency = -2
-	errDataInconsistency    = -3
-	errConnectionLoss       = -4
-	errMarshallingError     = -5
-	errUnimplemented        = -6
-	errOperationTimeout     = -7
-	errBadArguments         = -8
-	errInvalidState         = -9
-	// API errors
-	errAPIError                = ErrCode(-100)
-	errNoNode                  = ErrCode(-101) // *
-	errNoAuth                  = ErrCode(-102)
-	errBadVersion              = ErrCode(-103) // *
-	errNoChildrenForEphemerals = ErrCode(-108)
-	errNodeExists              = ErrCode(-110) // *
-	errNotEmpty                = ErrCode(-111)
-	errSessionExpired          = ErrCode(-112)
-	errInvalidCallback         = ErrCode(-113)
-	errInvalidAcl              = ErrCode(-114)
-	errAuthFailed              = ErrCode(-115)
-	errClosing                 = ErrCode(-116)
-	errNothing                 = ErrCode(-117)
-	errSessionMoved            = ErrCode(-118)
-)
-
-// Constants for ACL permissions
-const (
-	PermRead = 1 << iota
-	PermWrite
-	PermCreate
-	PermDelete
-	PermAdmin
-	PermAll = 0x1f
-)
-
-var (
-	emptyPassword = []byte{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
-	opNames       = map[int32]string{
-		opNotify:       "notify",
-		opCreate:       "create",
-		opDelete:       "delete",
-		opExists:       "exists",
-		opGetData:      "getData",
-		opSetData:      "setData",
-		opGetAcl:       "getACL",
-		opSetAcl:       "setACL",
-		opGetChildren:  "getChildren",
-		opSync:         "sync",
-		opPing:         "ping",
-		opGetChildren2: "getChildren2",
-		opCheck:        "check",
-		opMulti:        "multi",
-		opClose:        "close",
-		opSetAuth:      "setAuth",
-		opSetWatches:   "setWatches",
-
-		opWatcherEvent: "watcherEvent",
-	}
-)
-
-type EventType int32
-
-func (t EventType) String() string {
-	if name := eventNames[t]; name != "" {
-		return name
-	}
-	return "Unknown"
-}
-
-// Mode is used to build custom server modes (leader|follower|standalone).
-type Mode uint8
-
-func (m Mode) String() string {
-	if name := modeNames[m]; name != "" {
-		return name
-	}
-	return "unknown"
-}
-
-const (
-	ModeUnknown    Mode = iota
-	ModeLeader     Mode = iota
-	ModeFollower   Mode = iota
-	ModeStandalone Mode = iota
-)
-
-var (
-	modeNames = map[Mode]string{
-		ModeLeader:     "leader",
-		ModeFollower:   "follower",
-		ModeStandalone: "standalone",
-	}
-)
diff --git a/Godeps/_workspace/src/github.com/samuel/go-zookeeper/zk/constants_test.go b/Godeps/_workspace/src/github.com/samuel/go-zookeeper/zk/constants_test.go
deleted file mode 100644
index 9fe6b04ce..000000000
--- a/Godeps/_workspace/src/github.com/samuel/go-zookeeper/zk/constants_test.go
+++ /dev/null
@@ -1,24 +0,0 @@
-package zk
-
-import (
-	"fmt"
-	"testing"
-)
-
-func TestModeString(t *testing.T) {
-	if fmt.Sprintf("%v", ModeUnknown) != "unknown" {
-		t.Errorf("unknown value should be 'unknown'")
-	}
-
-	if fmt.Sprintf("%v", ModeLeader) != "leader" {
-		t.Errorf("leader value should be 'leader'")
-	}
-
-	if fmt.Sprintf("%v", ModeFollower) != "follower" {
-		t.Errorf("follower value should be 'follower'")
-	}
-
-	if fmt.Sprintf("%v", ModeStandalone) != "standalone" {
-		t.Errorf("standlone value should be 'standalone'")
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/samuel/go-zookeeper/zk/flw.go b/Godeps/_workspace/src/github.com/samuel/go-zookeeper/zk/flw.go
deleted file mode 100644
index c1225ffa2..000000000
--- a/Godeps/_workspace/src/github.com/samuel/go-zookeeper/zk/flw.go
+++ /dev/null
@@ -1,288 +0,0 @@
-package zk
-
-import (
-	"bufio"
-	"bytes"
-	"fmt"
-	"io/ioutil"
-	"math/big"
-	"net"
-	"regexp"
-	"strconv"
-	"time"
-)
-
-// FLWSrvr is a FourLetterWord helper function. In particular, this function pulls the srvr output
-// from the zookeeper instances and parses the output. A slice of *ServerStats structs are returned
-// as well as a boolean value to indicate whether this function processed successfully.
-//
-// If the boolean value is false there was a problem. If the *ServerStats slice is empty or nil,
-// then the error happened before we started to obtain 'srvr' values. Otherwise, one of the
-// servers had an issue and the "Error" value in the struct should be inspected to determine
-// which server had the issue.
-func FLWSrvr(servers []string, timeout time.Duration) ([]*ServerStats, bool) {
-	// different parts of the regular expression that are required to parse the srvr output
-	var (
-		zrVer   = `^Zookeeper version: ([A-Za-z0-9\.\-]+), built on (\d\d/\d\d/\d\d\d\d \d\d:\d\d [A-Za-z0-9:\+\-]+)`
-		zrLat   = `^Latency min/avg/max: (\d+)/(\d+)/(\d+)`
-		zrNet   = `^Received: (\d+).*\n^Sent: (\d+).*\n^Connections: (\d+).*\n^Outstanding: (\d+)`
-		zrState = `^Zxid: (0x[A-Za-z0-9]+).*\n^Mode: (\w+).*\n^Node count: (\d+)`
-	)
-
-	// build the regex from the pieces above
-	re, err := regexp.Compile(fmt.Sprintf(`(?m:\A%v.*\n%v.*\n%v.*\n%v)`, zrVer, zrLat, zrNet, zrState))
-
-	if err != nil {
-		return nil, false
-	}
-
-	imOk := true
-	servers = FormatServers(servers)
-	ss := make([]*ServerStats, len(servers))
-
-	for i := range ss {
-		response, err := fourLetterWord(servers[i], "srvr", timeout)
-
-		if err != nil {
-			ss[i] = &ServerStats{Error: err}
-			imOk = false
-			continue
-		}
-
-		match := re.FindAllStringSubmatch(string(response), -1)[0][1:]
-
-		if match == nil {
-			err := fmt.Errorf("unable to parse fields from zookeeper response (no regex matches)")
-			ss[i] = &ServerStats{Error: err}
-			imOk = false
-			continue
-		}
-
-		// determine current server
-		var srvrMode Mode
-		switch match[10] {
-		case "leader":
-			srvrMode = ModeLeader
-		case "follower":
-			srvrMode = ModeFollower
-		case "standalone":
-			srvrMode = ModeStandalone
-		default:
-			srvrMode = ModeUnknown
-		}
-
-		buildTime, err := time.Parse("01/02/2006 15:04 MST", match[1])
-
-		if err != nil {
-			ss[i] = &ServerStats{Error: err}
-			imOk = false
-			continue
-		}
-
-		parsedInt, err := strconv.ParseInt(match[9], 0, 64)
-
-		if err != nil {
-			ss[i] = &ServerStats{Error: err}
-			imOk = false
-			continue
-		}
-
-		// the ZxID value is an int64 with two int32s packed inside
-		// the high int32 is the epoch (i.e., number of leader elections)
-		// the low int32 is the counter
-		epoch := int32(parsedInt >> 32)
-		counter := int32(parsedInt & 0xFFFFFFFF)
-
-		// within the regex above, these values must be numerical
-		// so we can avoid useless checking of the error return value
-		minLatency, _ := strconv.ParseInt(match[2], 0, 64)
-		avgLatency, _ := strconv.ParseInt(match[3], 0, 64)
-		maxLatency, _ := strconv.ParseInt(match[4], 0, 64)
-		recv, _ := strconv.ParseInt(match[5], 0, 64)
-		sent, _ := strconv.ParseInt(match[6], 0, 64)
-		cons, _ := strconv.ParseInt(match[7], 0, 64)
-		outs, _ := strconv.ParseInt(match[8], 0, 64)
-		ncnt, _ := strconv.ParseInt(match[11], 0, 64)
-
-		ss[i] = &ServerStats{
-			Sent:        sent,
-			Received:    recv,
-			NodeCount:   ncnt,
-			MinLatency:  minLatency,
-			AvgLatency:  avgLatency,
-			MaxLatency:  maxLatency,
-			Connections: cons,
-			Outstanding: outs,
-			Epoch:       epoch,
-			Counter:     counter,
-			BuildTime:   buildTime,
-			Mode:        srvrMode,
-			Version:     match[0],
-		}
-	}
-
-	return ss, imOk
-}
-
-// FLWRuok is a FourLetterWord helper function. In particular, this function
-// pulls the ruok output from each server.
-func FLWRuok(servers []string, timeout time.Duration) []bool {
-	servers = FormatServers(servers)
-	oks := make([]bool, len(servers))
-
-	for i := range oks {
-		response, err := fourLetterWord(servers[i], "ruok", timeout)
-
-		if err != nil {
-			continue
-		}
-
-		if bytes.Equal(response[:4], []byte("imok")) {
-			oks[i] = true
-		}
-	}
-	return oks
-}
-
-// FLWCons is a FourLetterWord helper function. In particular, this function
-// pulls the ruok output from each server.
-//
-// As with FLWSrvr, the boolean value indicates whether one of the requests had
-// an issue. The Clients struct has an Error value that can be checked.
-func FLWCons(servers []string, timeout time.Duration) ([]*ServerClients, bool) {
-	var (
-		zrAddr = `^ /((?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?):(?:\d+))\[\d+\]`
-		zrPac  = `\(queued=(\d+),recved=(\d+),sent=(\d+),sid=(0x[A-Za-z0-9]+),lop=(\w+),est=(\d+),to=(\d+),`
-		zrSesh = `lcxid=(0x[A-Za-z0-9]+),lzxid=(0x[A-Za-z0-9]+),lresp=(\d+),llat=(\d+),minlat=(\d+),avglat=(\d+),maxlat=(\d+)\)`
-	)
-
-	re, err := regexp.Compile(fmt.Sprintf("%v%v%v", zrAddr, zrPac, zrSesh))
-
-	if err != nil {
-		return nil, false
-	}
-
-	servers = FormatServers(servers)
-	sc := make([]*ServerClients, len(servers))
-	imOk := true
-
-	for i := range sc {
-		response, err := fourLetterWord(servers[i], "cons", timeout)
-
-		if err != nil {
-			sc[i] = &ServerClients{Error: err}
-			imOk = false
-			continue
-		}
-
-		scan := bufio.NewScanner(bytes.NewReader(response))
-
-		var clients []*ServerClient
-
-		for scan.Scan() {
-			line := scan.Bytes()
-
-			if len(line) == 0 {
-				continue
-			}
-
-			m := re.FindAllStringSubmatch(string(line), -1)
-
-			if m == nil {
-				err := fmt.Errorf("unable to parse fields from zookeeper response (no regex matches)")
-				sc[i] = &ServerClients{Error: err}
-				imOk = false
-				continue
-			}
-
-			match := m[0][1:]
-
-			queued, _ := strconv.ParseInt(match[1], 0, 64)
-			recvd, _ := strconv.ParseInt(match[2], 0, 64)
-			sent, _ := strconv.ParseInt(match[3], 0, 64)
-			sid, _ := strconv.ParseInt(match[4], 0, 64)
-			est, _ := strconv.ParseInt(match[6], 0, 64)
-			timeout, _ := strconv.ParseInt(match[7], 0, 32)
-			lresp, _ := strconv.ParseInt(match[10], 0, 64)
-			llat, _ := strconv.ParseInt(match[11], 0, 32)
-			minlat, _ := strconv.ParseInt(match[12], 0, 32)
-			avglat, _ := strconv.ParseInt(match[13], 0, 32)
-			maxlat, _ := strconv.ParseInt(match[14], 0, 32)
-
-			// zookeeper returns a value, '0xffffffffffffffff', as the
-			// Lzxid for PING requests in the 'cons' output.
-			// unfortunately, in Go that is an invalid int64 and is not represented
-			// as -1.
-			// However, converting the string value to a big.Int and then back to
-			// and int64 properly sets the value to -1
-			lzxid, ok := new(big.Int).SetString(match[9], 0)
-
-			var errVal error
-
-			if !ok {
-				errVal = fmt.Errorf("failed to convert lzxid value to big.Int")
-				imOk = false
-			}
-
-			lcxid, ok := new(big.Int).SetString(match[8], 0)
-
-			if !ok && errVal == nil {
-				errVal = fmt.Errorf("failed to convert lcxid value to big.Int")
-				imOk = false
-			}
-
-			clients = append(clients, &ServerClient{
-				Queued:        queued,
-				Received:      recvd,
-				Sent:          sent,
-				SessionID:     sid,
-				Lcxid:         lcxid.Int64(),
-				Lzxid:         lzxid.Int64(),
-				Timeout:       int32(timeout),
-				LastLatency:   int32(llat),
-				MinLatency:    int32(minlat),
-				AvgLatency:    int32(avglat),
-				MaxLatency:    int32(maxlat),
-				Established:   time.Unix(est, 0),
-				LastResponse:  time.Unix(lresp, 0),
-				Addr:          match[0],
-				LastOperation: match[5],
-				Error:         errVal,
-			})
-		}
-
-		sc[i] = &ServerClients{Clients: clients}
-	}
-
-	return sc, imOk
-}
-
-func fourLetterWord(server, command string, timeout time.Duration) ([]byte, error) {
-	conn, err := net.DialTimeout("tcp", server, timeout)
-
-	if err != nil {
-		return nil, err
-	}
-
-	// the zookeeper server should automatically close this socket
-	// once the command has been processed, but better safe than sorry
-	defer conn.Close()
-
-	conn.SetWriteDeadline(time.Now().Add(timeout))
-
-	_, err = conn.Write([]byte(command))
-
-	if err != nil {
-		return nil, err
-	}
-
-	conn.SetReadDeadline(time.Now().Add(timeout))
-
-	resp, err := ioutil.ReadAll(conn)
-
-	if err != nil {
-		return nil, err
-	}
-
-	return resp, nil
-}
diff --git a/Godeps/_workspace/src/github.com/samuel/go-zookeeper/zk/flw_test.go b/Godeps/_workspace/src/github.com/samuel/go-zookeeper/zk/flw_test.go
deleted file mode 100644
index 63907268d..000000000
--- a/Godeps/_workspace/src/github.com/samuel/go-zookeeper/zk/flw_test.go
+++ /dev/null
@@ -1,367 +0,0 @@
-package zk
-
-import (
-	"net"
-	"testing"
-	"time"
-)
-
-var (
-	zkSrvrOut = `Zookeeper version: 3.4.6-1569965, built on 02/20/2014 09:09 GMT
-Latency min/avg/max: 0/1/10
-Received: 4207
-Sent: 4220
-Connections: 81
-Outstanding: 1
-Zxid: 0x110a7a8f37
-Mode: leader
-Node count: 306
-`
-	zkConsOut = ` /10.42.45.231:45361[1](queued=0,recved=9435,sent=9457,sid=0x94c2989e04716b5,lop=PING,est=1427238717217,to=20001,lcxid=0x55120915,lzxid=0xffffffffffffffff,lresp=1427259255908,llat=0,minlat=0,avglat=1,maxlat=17)
- /10.55.33.98:34342[1](queued=0,recved=9338,sent=9350,sid=0x94c2989e0471731,lop=PING,est=1427238849319,to=20001,lcxid=0x55120944,lzxid=0xffffffffffffffff,lresp=1427259252294,llat=0,minlat=0,avglat=1,maxlat=18)
- /10.44.145.114:46556[1](queued=0,recved=109253,sent=109617,sid=0x94c2989e0471709,lop=DELE,est=1427238791305,to=20001,lcxid=0x55139618,lzxid=0x110a7b187d,lresp=1427259257423,llat=2,minlat=0,avglat=1,maxlat=23)
-
-`
-)
-
-func TestFLWRuok(t *testing.T) {
-	l, err := net.Listen("tcp", "127.0.0.1:2181")
-
-	if err != nil {
-		t.Fatalf(err.Error())
-	}
-
-	go tcpServer(l, "")
-
-	var oks []bool
-	var ok bool
-
-	oks = FLWRuok([]string{"127.0.0.1"}, time.Second*10)
-
-	// close the connection, and pause shortly
-	// to cheat around a race condition
-	l.Close()
-	time.Sleep(time.Millisecond * 1)
-
-	if len(oks) == 0 {
-		t.Errorf("no values returned")
-	}
-
-	ok = oks[0]
-
-	if !ok {
-		t.Errorf("instance should be marked as OK")
-	}
-
-	//
-	// Confirm that it also returns false for dead instances
-	//
-	l, err = net.Listen("tcp", "127.0.0.1:2181")
-
-	if err != nil {
-		t.Fatalf(err.Error())
-	}
-
-	defer l.Close()
-
-	go tcpServer(l, "dead")
-
-	oks = FLWRuok([]string{"127.0.0.1"}, time.Second*10)
-
-	if len(oks) == 0 {
-		t.Errorf("no values returned")
-	}
-
-	ok = oks[0]
-
-	if ok {
-		t.Errorf("instance should be marked as not OK")
-	}
-}
-
-func TestFLWSrvr(t *testing.T) {
-	l, err := net.Listen("tcp", "127.0.0.1:2181")
-
-	if err != nil {
-		t.Fatalf(err.Error())
-	}
-
-	defer l.Close()
-
-	go tcpServer(l, "")
-
-	var statsSlice []*ServerStats
-	var stats *ServerStats
-	var ok bool
-
-	statsSlice, ok = FLWSrvr([]string{"127.0.0.1:2181"}, time.Second*10)
-
-	if !ok {
-		t.Errorf("failure indicated on 'srvr' parsing")
-	}
-
-	if len(statsSlice) == 0 {
-		t.Errorf("no *ServerStats instances returned")
-	}
-
-	stats = statsSlice[0]
-
-	if stats.Error != nil {
-		t.Fatalf("error seen in stats: %v", err.Error())
-	}
-
-	if stats.Sent != 4220 {
-		t.Errorf("Sent != 4220")
-	}
-
-	if stats.Received != 4207 {
-		t.Errorf("Received != 4207")
-	}
-
-	if stats.NodeCount != 306 {
-		t.Errorf("NodeCount != 306")
-	}
-
-	if stats.MinLatency != 0 {
-		t.Errorf("MinLatency != 0")
-	}
-
-	if stats.AvgLatency != 1 {
-		t.Errorf("AvgLatency != 1")
-	}
-
-	if stats.MaxLatency != 10 {
-		t.Errorf("MaxLatency != 10")
-	}
-
-	if stats.Connections != 81 {
-		t.Errorf("Connection != 81")
-	}
-
-	if stats.Outstanding != 1 {
-		t.Errorf("Outstanding != 1")
-	}
-
-	if stats.Epoch != 17 {
-		t.Errorf("Epoch != 17")
-	}
-
-	if stats.Counter != 175804215 {
-		t.Errorf("Counter != 175804215")
-	}
-
-	if stats.Mode != ModeLeader {
-		t.Errorf("Mode != ModeLeader")
-	}
-
-	if stats.Version != "3.4.6-1569965" {
-		t.Errorf("Version expected: 3.4.6-1569965")
-	}
-
-	buildTime, err := time.Parse("01/02/2006 15:04 MST", "02/20/2014 09:09 GMT")
-
-	if !stats.BuildTime.Equal(buildTime) {
-
-	}
-}
-
-func TestFLWCons(t *testing.T) {
-	l, err := net.Listen("tcp", "127.0.0.1:2181")
-
-	if err != nil {
-		t.Fatalf(err.Error())
-	}
-
-	defer l.Close()
-
-	go tcpServer(l, "")
-
-	var clients []*ServerClients
-	var ok bool
-
-	clients, ok = FLWCons([]string{"127.0.0.1"}, time.Second*10)
-
-	if !ok {
-		t.Errorf("failure indicated on 'cons' parsing")
-	}
-
-	if len(clients) == 0 {
-		t.Errorf("no *ServerClients instances returned")
-	}
-
-	results := []*ServerClient{
-		&ServerClient{
-			Queued:        0,
-			Received:      9435,
-			Sent:          9457,
-			SessionID:     669956116721374901,
-			LastOperation: "PING",
-			Established:   time.Unix(1427238717217, 0),
-			Timeout:       20001,
-			Lcxid:         1427245333,
-			Lzxid:         -1,
-			LastResponse:  time.Unix(1427259255908, 0),
-			LastLatency:   0,
-			MinLatency:    0,
-			AvgLatency:    1,
-			MaxLatency:    17,
-			Addr:          "10.42.45.231:45361",
-		},
-		&ServerClient{
-			Queued:        0,
-			Received:      9338,
-			Sent:          9350,
-			SessionID:     669956116721375025,
-			LastOperation: "PING",
-			Established:   time.Unix(1427238849319, 0),
-			Timeout:       20001,
-			Lcxid:         1427245380,
-			Lzxid:         -1,
-			LastResponse:  time.Unix(1427259252294, 0),
-			LastLatency:   0,
-			MinLatency:    0,
-			AvgLatency:    1,
-			MaxLatency:    18,
-			Addr:          "10.55.33.98:34342",
-		},
-		&ServerClient{
-			Queued:        0,
-			Received:      109253,
-			Sent:          109617,
-			SessionID:     669956116721374985,
-			LastOperation: "DELE",
-			Established:   time.Unix(1427238791305, 0),
-			Timeout:       20001,
-			Lcxid:         1427346968,
-			Lzxid:         73190283389,
-			LastResponse:  time.Unix(1427259257423, 0),
-			LastLatency:   2,
-			MinLatency:    0,
-			AvgLatency:    1,
-			MaxLatency:    23,
-			Addr:          "10.44.145.114:46556",
-		},
-	}
-
-	for _, z := range clients {
-		if z.Error != nil {
-			t.Errorf("error seen: %v", err.Error())
-		}
-
-		for i, v := range z.Clients {
-			c := results[i]
-
-			if v.Error != nil {
-				t.Errorf("client error seen: %v", err.Error())
-			}
-
-			if v.Queued != c.Queued {
-				t.Errorf("Queued value mismatch (%d/%d)", v.Queued, c.Queued)
-			}
-
-			if v.Received != c.Received {
-				t.Errorf("Received value mismatch (%d/%d)", v.Received, c.Received)
-			}
-
-			if v.Sent != c.Sent {
-				t.Errorf("Sent value mismatch (%d/%d)", v.Sent, c.Sent)
-			}
-
-			if v.SessionID != c.SessionID {
-				t.Errorf("SessionID value mismatch (%d/%d)", v.SessionID, c.SessionID)
-			}
-
-			if v.LastOperation != c.LastOperation {
-				t.Errorf("LastOperation value mismatch ('%v'/'%v')", v.LastOperation, c.LastOperation)
-			}
-
-			if v.Timeout != c.Timeout {
-				t.Errorf("Timeout value mismatch (%d/%d)", v.Timeout, c.Timeout)
-			}
-
-			if v.Lcxid != c.Lcxid {
-				t.Errorf("Lcxid value mismatch (%d/%d)", v.Lcxid, c.Lcxid)
-			}
-
-			if v.Lzxid != c.Lzxid {
-				t.Errorf("Lzxid value mismatch (%d/%d)", v.Lzxid, c.Lzxid)
-			}
-
-			if v.LastLatency != c.LastLatency {
-				t.Errorf("LastLatency value mismatch (%d/%d)", v.LastLatency, c.LastLatency)
-			}
-
-			if v.MinLatency != c.MinLatency {
-				t.Errorf("MinLatency value mismatch (%d/%d)", v.MinLatency, c.MinLatency)
-			}
-
-			if v.AvgLatency != c.AvgLatency {
-				t.Errorf("AvgLatency value mismatch (%d/%d)", v.AvgLatency, c.AvgLatency)
-			}
-
-			if v.MaxLatency != c.MaxLatency {
-				t.Errorf("MaxLatency value mismatch (%d/%d)", v.MaxLatency, c.MaxLatency)
-			}
-
-			if v.Addr != c.Addr {
-				t.Errorf("Addr value mismatch ('%v'/'%v')", v.Addr, c.Addr)
-			}
-
-			if !c.Established.Equal(v.Established) {
-				t.Errorf("Established value mismatch (%v/%v)", c.Established, v.Established)
-			}
-
-			if !c.LastResponse.Equal(v.LastResponse) {
-				t.Errorf("Established value mismatch (%v/%v)", c.LastResponse, v.LastResponse)
-			}
-		}
-	}
-}
-
-func tcpServer(listener net.Listener, thing string) {
-	for {
-		conn, err := listener.Accept()
-		if err != nil {
-			return
-		}
-		go connHandler(conn, thing)
-	}
-}
-
-func connHandler(conn net.Conn, thing string) {
-	defer conn.Close()
-
-	data := make([]byte, 4)
-
-	_, err := conn.Read(data)
-
-	if err != nil {
-		return
-	}
-
-	switch string(data) {
-	case "ruok":
-		switch thing {
-		case "dead":
-			return
-		default:
-			conn.Write([]byte("imok"))
-		}
-	case "srvr":
-		switch thing {
-		case "dead":
-			return
-		default:
-			conn.Write([]byte(zkSrvrOut))
-		}
-	case "cons":
-		switch thing {
-		case "dead":
-			return
-		default:
-			conn.Write([]byte(zkConsOut))
-		}
-	default:
-		conn.Write([]byte("This ZooKeeper instance is not currently serving requests."))
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/samuel/go-zookeeper/zk/lock.go b/Godeps/_workspace/src/github.com/samuel/go-zookeeper/zk/lock.go
deleted file mode 100644
index f13a8b0ba..000000000
--- a/Godeps/_workspace/src/github.com/samuel/go-zookeeper/zk/lock.go
+++ /dev/null
@@ -1,142 +0,0 @@
-package zk
-
-import (
-	"errors"
-	"fmt"
-	"strconv"
-	"strings"
-)
-
-var (
-	// ErrDeadlock is returned by Lock when trying to lock twice without unlocking first
-	ErrDeadlock = errors.New("zk: trying to acquire a lock twice")
-	// ErrNotLocked is returned by Unlock when trying to release a lock that has not first be acquired.
-	ErrNotLocked = errors.New("zk: not locked")
-)
-
-// Lock is a mutual exclusion lock.
-type Lock struct {
-	c        *Conn
-	path     string
-	acl      []ACL
-	lockPath string
-	seq      int
-}
-
-// NewLock creates a new lock instance using the provided connection, path, and acl.
-// The path must be a node that is only used by this lock. A lock instances starts
-// unlocked until Lock() is called.
-func NewLock(c *Conn, path string, acl []ACL) *Lock {
-	return &Lock{
-		c:    c,
-		path: path,
-		acl:  acl,
-	}
-}
-
-func parseSeq(path string) (int, error) {
-	parts := strings.Split(path, "-")
-	return strconv.Atoi(parts[len(parts)-1])
-}
-
-// Lock attempts to acquire the lock. It will wait to return until the lock
-// is acquired or an error occurs. If this instance already has the lock
-// then ErrDeadlock is returned.
-func (l *Lock) Lock() error {
-	if l.lockPath != "" {
-		return ErrDeadlock
-	}
-
-	prefix := fmt.Sprintf("%s/lock-", l.path)
-
-	path := ""
-	var err error
-	for i := 0; i < 3; i++ {
-		path, err = l.c.CreateProtectedEphemeralSequential(prefix, []byte{}, l.acl)
-		if err == ErrNoNode {
-			// Create parent node.
-			parts := strings.Split(l.path, "/")
-			pth := ""
-			for _, p := range parts[1:] {
-				pth += "/" + p
-				_, err := l.c.Create(pth, []byte{}, 0, l.acl)
-				if err != nil && err != ErrNodeExists {
-					return err
-				}
-			}
-		} else if err == nil {
-			break
-		} else {
-			return err
-		}
-	}
-	if err != nil {
-		return err
-	}
-
-	seq, err := parseSeq(path)
-	if err != nil {
-		return err
-	}
-
-	for {
-		children, _, err := l.c.Children(l.path)
-		if err != nil {
-			return err
-		}
-
-		lowestSeq := seq
-		prevSeq := 0
-		prevSeqPath := ""
-		for _, p := range children {
-			s, err := parseSeq(p)
-			if err != nil {
-				return err
-			}
-			if s < lowestSeq {
-				lowestSeq = s
-			}
-			if s < seq && s > prevSeq {
-				prevSeq = s
-				prevSeqPath = p
-			}
-		}
-
-		if seq == lowestSeq {
-			// Acquired the lock
-			break
-		}
-
-		// Wait on the node next in line for the lock
-		_, _, ch, err := l.c.GetW(l.path + "/" + prevSeqPath)
-		if err != nil && err != ErrNoNode {
-			return err
-		} else if err != nil && err == ErrNoNode {
-			// try again
-			continue
-		}
-
-		ev := <-ch
-		if ev.Err != nil {
-			return ev.Err
-		}
-	}
-
-	l.seq = seq
-	l.lockPath = path
-	return nil
-}
-
-// Unlock releases an acquired lock. If the lock is not currently acquired by
-// this Lock instance than ErrNotLocked is returned.
-func (l *Lock) Unlock() error {
-	if l.lockPath == "" {
-		return ErrNotLocked
-	}
-	if err := l.c.Delete(l.lockPath, -1); err != nil {
-		return err
-	}
-	l.lockPath = ""
-	l.seq = 0
-	return nil
-}
diff --git a/Godeps/_workspace/src/github.com/samuel/go-zookeeper/zk/lock_test.go b/Godeps/_workspace/src/github.com/samuel/go-zookeeper/zk/lock_test.go
deleted file mode 100644
index 8a3478a33..000000000
--- a/Godeps/_workspace/src/github.com/samuel/go-zookeeper/zk/lock_test.go
+++ /dev/null
@@ -1,94 +0,0 @@
-package zk
-
-import (
-	"testing"
-	"time"
-)
-
-func TestLock(t *testing.T) {
-	ts, err := StartTestCluster(1, nil, logWriter{t: t, p: "[ZKERR] "})
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer ts.Stop()
-	zk, _, err := ts.ConnectAll()
-	if err != nil {
-		t.Fatalf("Connect returned error: %+v", err)
-	}
-	defer zk.Close()
-
-	acls := WorldACL(PermAll)
-
-	l := NewLock(zk, "/test", acls)
-	if err := l.Lock(); err != nil {
-		t.Fatal(err)
-	}
-	if err := l.Unlock(); err != nil {
-		t.Fatal(err)
-	}
-
-	val := make(chan int, 3)
-
-	if err := l.Lock(); err != nil {
-		t.Fatal(err)
-	}
-
-	l2 := NewLock(zk, "/test", acls)
-	go func() {
-		if err := l2.Lock(); err != nil {
-			t.Fatal(err)
-		}
-		val <- 2
-		if err := l2.Unlock(); err != nil {
-			t.Fatal(err)
-		}
-		val <- 3
-	}()
-	time.Sleep(time.Millisecond * 100)
-
-	val <- 1
-	if err := l.Unlock(); err != nil {
-		t.Fatal(err)
-	}
-	if x := <-val; x != 1 {
-		t.Fatalf("Expected 1 instead of %d", x)
-	}
-	if x := <-val; x != 2 {
-		t.Fatalf("Expected 2 instead of %d", x)
-	}
-	if x := <-val; x != 3 {
-		t.Fatalf("Expected 3 instead of %d", x)
-	}
-}
-
-// This tests creating a lock with a path that's more than 1 node deep (e.g. "/test-multi-level/lock"),
-// when a part of that path already exists (i.e. "/test-multi-level" node already exists).
-func TestMultiLevelLock(t *testing.T) {
-	ts, err := StartTestCluster(1, nil, logWriter{t: t, p: "[ZKERR] "})
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer ts.Stop()
-	zk, _, err := ts.ConnectAll()
-	if err != nil {
-		t.Fatalf("Connect returned error: %+v", err)
-	}
-	defer zk.Close()
-
-	acls := WorldACL(PermAll)
-	path := "/test-multi-level"
-	if p, err := zk.Create(path, []byte{1, 2, 3, 4}, 0, WorldACL(PermAll)); err != nil {
-		t.Fatalf("Create returned error: %+v", err)
-	} else if p != path {
-		t.Fatalf("Create returned different path '%s' != '%s'", p, path)
-	}
-	l := NewLock(zk, "/test-multi-level/lock", acls)
-	defer zk.Delete("/test-multi-level", -1) // Clean up what we've created for this test
-	defer zk.Delete("/test-multi-level/lock", -1)
-	if err := l.Lock(); err != nil {
-		t.Fatal(err)
-	}
-	if err := l.Unlock(); err != nil {
-		t.Fatal(err)
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/samuel/go-zookeeper/zk/server_help.go b/Godeps/_workspace/src/github.com/samuel/go-zookeeper/zk/server_help.go
deleted file mode 100644
index 4a53772bd..000000000
--- a/Godeps/_workspace/src/github.com/samuel/go-zookeeper/zk/server_help.go
+++ /dev/null
@@ -1,119 +0,0 @@
-package zk
-
-import (
-	"fmt"
-	"io"
-	"io/ioutil"
-	"math/rand"
-	"os"
-	"path/filepath"
-	"time"
-)
-
-type TestServer struct {
-	Port int
-	Path string
-	Srv  *Server
-}
-
-type TestCluster struct {
-	Path    string
-	Servers []TestServer
-}
-
-func StartTestCluster(size int, stdout, stderr io.Writer) (*TestCluster, error) {
-	tmpPath, err := ioutil.TempDir("", "gozk")
-	if err != nil {
-		return nil, err
-	}
-	success := false
-	startPort := int(rand.Int31n(6000) + 10000)
-	cluster := &TestCluster{Path: tmpPath}
-	defer func() {
-		if !success {
-			cluster.Stop()
-		}
-	}()
-	for serverN := 0; serverN < size; serverN++ {
-		srvPath := filepath.Join(tmpPath, fmt.Sprintf("srv%d", serverN))
-		if err := os.Mkdir(srvPath, 0700); err != nil {
-			return nil, err
-		}
-		port := startPort + serverN*3
-		cfg := ServerConfig{
-			ClientPort: port,
-			DataDir:    srvPath,
-		}
-		for i := 0; i < size; i++ {
-			cfg.Servers = append(cfg.Servers, ServerConfigServer{
-				ID:                 i + 1,
-				Host:               "127.0.0.1",
-				PeerPort:           startPort + i*3 + 1,
-				LeaderElectionPort: startPort + i*3 + 2,
-			})
-		}
-		cfgPath := filepath.Join(srvPath, "zoo.cfg")
-		fi, err := os.Create(cfgPath)
-		if err != nil {
-			return nil, err
-		}
-		err = cfg.Marshall(fi)
-		fi.Close()
-		if err != nil {
-			return nil, err
-		}
-
-		fi, err = os.Create(filepath.Join(srvPath, "myid"))
-		if err != nil {
-			return nil, err
-		}
-		_, err = fmt.Fprintf(fi, "%d\n", serverN+1)
-		fi.Close()
-		if err != nil {
-			return nil, err
-		}
-
-		srv := &Server{
-			ConfigPath: cfgPath,
-			Stdout:     stdout,
-			Stderr:     stderr,
-		}
-		if err := srv.Start(); err != nil {
-			return nil, err
-		}
-		cluster.Servers = append(cluster.Servers, TestServer{
-			Path: srvPath,
-			Port: cfg.ClientPort,
-			Srv:  srv,
-		})
-	}
-	success = true
-	time.Sleep(time.Second) // Give the server time to become active. Should probably actually attempt to connect to verify.
-	return cluster, nil
-}
-
-func (ts *TestCluster) Connect(idx int) (*Conn, error) {
-	zk, _, err := Connect([]string{fmt.Sprintf("127.0.0.1:%d", ts.Servers[idx].Port)}, time.Second*15)
-	return zk, err
-}
-
-func (ts *TestCluster) ConnectAll() (*Conn, <-chan Event, error) {
-	return ts.ConnectAllTimeout(time.Second * 15)
-}
-
-func (ts *TestCluster) ConnectAllTimeout(sessionTimeout time.Duration) (*Conn, <-chan Event, error) {
-	hosts := make([]string, len(ts.Servers))
-	for i, srv := range ts.Servers {
-		hosts[i] = fmt.Sprintf("127.0.0.1:%d", srv.Port)
-	}
-	zk, ch, err := Connect(hosts, sessionTimeout)
-	return zk, ch, err
-}
-
-func (ts *TestCluster) Stop() error {
-	for _, srv := range ts.Servers {
-		srv.Srv.Stop()
-	}
-	defer os.RemoveAll(ts.Path)
-	return nil
-}
diff --git a/Godeps/_workspace/src/github.com/samuel/go-zookeeper/zk/server_java.go b/Godeps/_workspace/src/github.com/samuel/go-zookeeper/zk/server_java.go
deleted file mode 100644
index e553ec1d9..000000000
--- a/Godeps/_workspace/src/github.com/samuel/go-zookeeper/zk/server_java.go
+++ /dev/null
@@ -1,136 +0,0 @@
-package zk
-
-import (
-	"fmt"
-	"io"
-	"os"
-	"os/exec"
-	"path/filepath"
-)
-
-type ErrMissingServerConfigField string
-
-func (e ErrMissingServerConfigField) Error() string {
-	return fmt.Sprintf("zk: missing server config field '%s'", string(e))
-}
-
-const (
-	DefaultServerTickTime                 = 2000
-	DefaultServerInitLimit                = 10
-	DefaultServerSyncLimit                = 5
-	DefaultServerAutoPurgeSnapRetainCount = 3
-	DefaultPeerPort                       = 2888
-	DefaultLeaderElectionPort             = 3888
-)
-
-type ServerConfigServer struct {
-	ID                 int
-	Host               string
-	PeerPort           int
-	LeaderElectionPort int
-}
-
-type ServerConfig struct {
-	TickTime                 int    // Number of milliseconds of each tick
-	InitLimit                int    // Number of ticks that the initial synchronization phase can take
-	SyncLimit                int    // Number of ticks that can pass between sending a request and getting an acknowledgement
-	DataDir                  string // Direcrory where the snapshot is stored
-	ClientPort               int    // Port at which clients will connect
-	AutoPurgeSnapRetainCount int    // Number of snapshots to retain in dataDir
-	AutoPurgePurgeInterval   int    // Purge task internal in hours (0 to disable auto purge)
-	Servers                  []ServerConfigServer
-}
-
-func (sc ServerConfig) Marshall(w io.Writer) error {
-	if sc.DataDir == "" {
-		return ErrMissingServerConfigField("dataDir")
-	}
-	fmt.Fprintf(w, "dataDir=%s\n", sc.DataDir)
-	if sc.TickTime <= 0 {
-		sc.TickTime = DefaultServerTickTime
-	}
-	fmt.Fprintf(w, "tickTime=%d\n", sc.TickTime)
-	if sc.InitLimit <= 0 {
-		sc.InitLimit = DefaultServerInitLimit
-	}
-	fmt.Fprintf(w, "initLimit=%d\n", sc.InitLimit)
-	if sc.SyncLimit <= 0 {
-		sc.SyncLimit = DefaultServerSyncLimit
-	}
-	fmt.Fprintf(w, "syncLimit=%d\n", sc.SyncLimit)
-	if sc.ClientPort <= 0 {
-		sc.ClientPort = DefaultPort
-	}
-	fmt.Fprintf(w, "clientPort=%d\n", sc.ClientPort)
-	if sc.AutoPurgePurgeInterval > 0 {
-		if sc.AutoPurgeSnapRetainCount <= 0 {
-			sc.AutoPurgeSnapRetainCount = DefaultServerAutoPurgeSnapRetainCount
-		}
-		fmt.Fprintf(w, "autopurge.snapRetainCount=%d\n", sc.AutoPurgeSnapRetainCount)
-		fmt.Fprintf(w, "autopurge.purgeInterval=%d\n", sc.AutoPurgePurgeInterval)
-	}
-	if len(sc.Servers) > 0 {
-		for _, srv := range sc.Servers {
-			if srv.PeerPort <= 0 {
-				srv.PeerPort = DefaultPeerPort
-			}
-			if srv.LeaderElectionPort <= 0 {
-				srv.LeaderElectionPort = DefaultLeaderElectionPort
-			}
-			fmt.Fprintf(w, "server.%d=%s:%d:%d\n", srv.ID, srv.Host, srv.PeerPort, srv.LeaderElectionPort)
-		}
-	}
-	return nil
-}
-
-var jarSearchPaths = []string{
-	"zookeeper-*/contrib/fatjar/zookeeper-*-fatjar.jar",
-	"../zookeeper-*/contrib/fatjar/zookeeper-*-fatjar.jar",
-	"/usr/share/java/zookeeper-*.jar",
-	"/usr/local/zookeeper-*/contrib/fatjar/zookeeper-*-fatjar.jar",
-	"/usr/local/Cellar/zookeeper/*/libexec/contrib/fatjar/zookeeper-*-fatjar.jar",
-}
-
-func findZookeeperFatJar() string {
-	var paths []string
-	zkPath := os.Getenv("ZOOKEEPER_PATH")
-	if zkPath == "" {
-		paths = jarSearchPaths
-	} else {
-		paths = []string{filepath.Join(zkPath, "contrib/fatjar/zookeeper-*-fatjar.jar")}
-	}
-	for _, path := range paths {
-		matches, _ := filepath.Glob(path)
-		// TODO: could sort by version and pick latest
-		if len(matches) > 0 {
-			return matches[0]
-		}
-	}
-	return ""
-}
-
-type Server struct {
-	JarPath        string
-	ConfigPath     string
-	Stdout, Stderr io.Writer
-
-	cmd *exec.Cmd
-}
-
-func (srv *Server) Start() error {
-	if srv.JarPath == "" {
-		srv.JarPath = findZookeeperFatJar()
-		if srv.JarPath == "" {
-			return fmt.Errorf("zk: unable to find server jar")
-		}
-	}
-	srv.cmd = exec.Command("java", "-jar", srv.JarPath, "server", srv.ConfigPath)
-	srv.cmd.Stdout = srv.Stdout
-	srv.cmd.Stderr = srv.Stderr
-	return srv.cmd.Start()
-}
-
-func (srv *Server) Stop() error {
-	srv.cmd.Process.Signal(os.Kill)
-	return srv.cmd.Wait()
-}
diff --git a/Godeps/_workspace/src/github.com/samuel/go-zookeeper/zk/structs.go b/Godeps/_workspace/src/github.com/samuel/go-zookeeper/zk/structs.go
deleted file mode 100644
index 8fbc069ee..000000000
--- a/Godeps/_workspace/src/github.com/samuel/go-zookeeper/zk/structs.go
+++ /dev/null
@@ -1,640 +0,0 @@
-package zk
-
-import (
-	"encoding/binary"
-	"errors"
-	"log"
-	"reflect"
-	"runtime"
-	"time"
-)
-
-var (
-	ErrUnhandledFieldType = errors.New("zk: unhandled field type")
-	ErrPtrExpected        = errors.New("zk: encode/decode expect a non-nil pointer to struct")
-	ErrShortBuffer        = errors.New("zk: buffer too small")
-)
-
-type defaultLogger struct{}
-
-func (defaultLogger) Printf(format string, a ...interface{}) {
-	log.Printf(format, a...)
-}
-
-type ACL struct {
-	Perms  int32
-	Scheme string
-	ID     string
-}
-
-type Stat struct {
-	Czxid          int64 // The zxid of the change that caused this znode to be created.
-	Mzxid          int64 // The zxid of the change that last modified this znode.
-	Ctime          int64 // The time in milliseconds from epoch when this znode was created.
-	Mtime          int64 // The time in milliseconds from epoch when this znode was last modified.
-	Version        int32 // The number of changes to the data of this znode.
-	Cversion       int32 // The number of changes to the children of this znode.
-	Aversion       int32 // The number of changes to the ACL of this znode.
-	EphemeralOwner int64 // The session id of the owner of this znode if the znode is an ephemeral node. If it is not an ephemeral node, it will be zero.
-	DataLength     int32 // The length of the data field of this znode.
-	NumChildren    int32 // The number of children of this znode.
-	Pzxid          int64 // last modified children
-}
-
-// ServerClient is the information for a single Zookeeper client and its session.
-// This is used to parse/extract the output fo the `cons` command.
-type ServerClient struct {
-	Queued        int64
-	Received      int64
-	Sent          int64
-	SessionID     int64
-	Lcxid         int64
-	Lzxid         int64
-	Timeout       int32
-	LastLatency   int32
-	MinLatency    int32
-	AvgLatency    int32
-	MaxLatency    int32
-	Established   time.Time
-	LastResponse  time.Time
-	Addr          string
-	LastOperation string // maybe?
-	Error         error
-}
-
-// ServerClients is a struct for the FLWCons() function. It's used to provide
-// the list of Clients.
-//
-// This is needed because FLWCons() takes multiple servers.
-type ServerClients struct {
-	Clients []*ServerClient
-	Error   error
-}
-
-// ServerStats is the information pulled from the Zookeeper `stat` command.
-type ServerStats struct {
-	Sent        int64
-	Received    int64
-	NodeCount   int64
-	MinLatency  int64
-	AvgLatency  int64
-	MaxLatency  int64
-	Connections int64
-	Outstanding int64
-	Epoch       int32
-	Counter     int32
-	BuildTime   time.Time
-	Mode        Mode
-	Version     string
-	Error       error
-}
-
-type requestHeader struct {
-	Xid    int32
-	Opcode int32
-}
-
-type responseHeader struct {
-	Xid  int32
-	Zxid int64
-	Err  ErrCode
-}
-
-type multiHeader struct {
-	Type int32
-	Done bool
-	Err  ErrCode
-}
-
-type auth struct {
-	Type   int32
-	Scheme string
-	Auth   []byte
-}
-
-// Generic request structs
-
-type pathRequest struct {
-	Path string
-}
-
-type PathVersionRequest struct {
-	Path    string
-	Version int32
-}
-
-type pathWatchRequest struct {
-	Path  string
-	Watch bool
-}
-
-type pathResponse struct {
-	Path string
-}
-
-type statResponse struct {
-	Stat Stat
-}
-
-//
-
-type CheckVersionRequest PathVersionRequest
-type closeRequest struct{}
-type closeResponse struct{}
-
-type connectRequest struct {
-	ProtocolVersion int32
-	LastZxidSeen    int64
-	TimeOut         int32
-	SessionID       int64
-	Passwd          []byte
-}
-
-type connectResponse struct {
-	ProtocolVersion int32
-	TimeOut         int32
-	SessionID       int64
-	Passwd          []byte
-}
-
-type CreateRequest struct {
-	Path  string
-	Data  []byte
-	Acl   []ACL
-	Flags int32
-}
-
-type createResponse pathResponse
-type DeleteRequest PathVersionRequest
-type deleteResponse struct{}
-
-type errorResponse struct {
-	Err int32
-}
-
-type existsRequest pathWatchRequest
-type existsResponse statResponse
-type getAclRequest pathRequest
-
-type getAclResponse struct {
-	Acl  []ACL
-	Stat Stat
-}
-
-type getChildrenRequest pathRequest
-
-type getChildrenResponse struct {
-	Children []string
-}
-
-type getChildren2Request pathWatchRequest
-
-type getChildren2Response struct {
-	Children []string
-	Stat     Stat
-}
-
-type getDataRequest pathWatchRequest
-
-type getDataResponse struct {
-	Data []byte
-	Stat Stat
-}
-
-type getMaxChildrenRequest pathRequest
-
-type getMaxChildrenResponse struct {
-	Max int32
-}
-
-type getSaslRequest struct {
-	Token []byte
-}
-
-type pingRequest struct{}
-type pingResponse struct{}
-
-type setAclRequest struct {
-	Path    string
-	Acl     []ACL
-	Version int32
-}
-
-type setAclResponse statResponse
-
-type SetDataRequest struct {
-	Path    string
-	Data    []byte
-	Version int32
-}
-
-type setDataResponse statResponse
-
-type setMaxChildren struct {
-	Path string
-	Max  int32
-}
-
-type setSaslRequest struct {
-	Token string
-}
-
-type setSaslResponse struct {
-	Token string
-}
-
-type setWatchesRequest struct {
-	RelativeZxid int64
-	DataWatches  []string
-	ExistWatches []string
-	ChildWatches []string
-}
-
-type setWatchesResponse struct{}
-
-type syncRequest pathRequest
-type syncResponse pathResponse
-
-type setAuthRequest auth
-type setAuthResponse struct{}
-
-type multiRequestOp struct {
-	Header multiHeader
-	Op     interface{}
-}
-type multiRequest struct {
-	Ops        []multiRequestOp
-	DoneHeader multiHeader
-}
-type multiResponseOp struct {
-	Header multiHeader
-	String string
-	Stat   *Stat
-}
-type multiResponse struct {
-	Ops        []multiResponseOp
-	DoneHeader multiHeader
-}
-
-func (r *multiRequest) Encode(buf []byte) (int, error) {
-	total := 0
-	for _, op := range r.Ops {
-		op.Header.Done = false
-		n, err := encodePacketValue(buf[total:], reflect.ValueOf(op))
-		if err != nil {
-			return total, err
-		}
-		total += n
-	}
-	r.DoneHeader.Done = true
-	n, err := encodePacketValue(buf[total:], reflect.ValueOf(r.DoneHeader))
-	if err != nil {
-		return total, err
-	}
-	total += n
-
-	return total, nil
-}
-
-func (r *multiRequest) Decode(buf []byte) (int, error) {
-	r.Ops = make([]multiRequestOp, 0)
-	r.DoneHeader = multiHeader{-1, true, -1}
-	total := 0
-	for {
-		header := &multiHeader{}
-		n, err := decodePacketValue(buf[total:], reflect.ValueOf(header))
-		if err != nil {
-			return total, err
-		}
-		total += n
-		if header.Done {
-			r.DoneHeader = *header
-			break
-		}
-
-		req := requestStructForOp(header.Type)
-		if req == nil {
-			return total, ErrAPIError
-		}
-		n, err = decodePacketValue(buf[total:], reflect.ValueOf(req))
-		if err != nil {
-			return total, err
-		}
-		total += n
-		r.Ops = append(r.Ops, multiRequestOp{*header, req})
-	}
-	return total, nil
-}
-
-func (r *multiResponse) Decode(buf []byte) (int, error) {
-	r.Ops = make([]multiResponseOp, 0)
-	r.DoneHeader = multiHeader{-1, true, -1}
-	total := 0
-	for {
-		header := &multiHeader{}
-		n, err := decodePacketValue(buf[total:], reflect.ValueOf(header))
-		if err != nil {
-			return total, err
-		}
-		total += n
-		if header.Done {
-			r.DoneHeader = *header
-			break
-		}
-
-		res := multiResponseOp{Header: *header}
-		var w reflect.Value
-		switch header.Type {
-		default:
-			return total, ErrAPIError
-		case opCreate:
-			w = reflect.ValueOf(&res.String)
-		case opSetData:
-			res.Stat = new(Stat)
-			w = reflect.ValueOf(res.Stat)
-		case opCheck, opDelete:
-		}
-		if w.IsValid() {
-			n, err := decodePacketValue(buf[total:], w)
-			if err != nil {
-				return total, err
-			}
-			total += n
-		}
-		r.Ops = append(r.Ops, res)
-	}
-	return total, nil
-}
-
-type watcherEvent struct {
-	Type  EventType
-	State State
-	Path  string
-}
-
-type decoder interface {
-	Decode(buf []byte) (int, error)
-}
-
-type encoder interface {
-	Encode(buf []byte) (int, error)
-}
-
-func decodePacket(buf []byte, st interface{}) (n int, err error) {
-	defer func() {
-		if r := recover(); r != nil {
-			if e, ok := r.(runtime.Error); ok && e.Error() == "runtime error: slice bounds out of range" {
-				err = ErrShortBuffer
-			} else {
-				panic(r)
-			}
-		}
-	}()
-
-	v := reflect.ValueOf(st)
-	if v.Kind() != reflect.Ptr || v.IsNil() {
-		return 0, ErrPtrExpected
-	}
-	return decodePacketValue(buf, v)
-}
-
-func decodePacketValue(buf []byte, v reflect.Value) (int, error) {
-	rv := v
-	kind := v.Kind()
-	if kind == reflect.Ptr {
-		if v.IsNil() {
-			v.Set(reflect.New(v.Type().Elem()))
-		}
-		v = v.Elem()
-		kind = v.Kind()
-	}
-
-	n := 0
-	switch kind {
-	default:
-		return n, ErrUnhandledFieldType
-	case reflect.Struct:
-		if de, ok := rv.Interface().(decoder); ok {
-			return de.Decode(buf)
-		} else if de, ok := v.Interface().(decoder); ok {
-			return de.Decode(buf)
-		} else {
-			for i := 0; i < v.NumField(); i++ {
-				field := v.Field(i)
-				n2, err := decodePacketValue(buf[n:], field)
-				n += n2
-				if err != nil {
-					return n, err
-				}
-			}
-		}
-	case reflect.Bool:
-		v.SetBool(buf[n] != 0)
-		n++
-	case reflect.Int32:
-		v.SetInt(int64(binary.BigEndian.Uint32(buf[n : n+4])))
-		n += 4
-	case reflect.Int64:
-		v.SetInt(int64(binary.BigEndian.Uint64(buf[n : n+8])))
-		n += 8
-	case reflect.String:
-		ln := int(binary.BigEndian.Uint32(buf[n : n+4]))
-		v.SetString(string(buf[n+4 : n+4+ln]))
-		n += 4 + ln
-	case reflect.Slice:
-		switch v.Type().Elem().Kind() {
-		default:
-			count := int(binary.BigEndian.Uint32(buf[n : n+4]))
-			n += 4
-			values := reflect.MakeSlice(v.Type(), count, count)
-			v.Set(values)
-			for i := 0; i < count; i++ {
-				n2, err := decodePacketValue(buf[n:], values.Index(i))
-				n += n2
-				if err != nil {
-					return n, err
-				}
-			}
-		case reflect.Uint8:
-			ln := int(int32(binary.BigEndian.Uint32(buf[n : n+4])))
-			if ln < 0 {
-				n += 4
-				v.SetBytes(nil)
-			} else {
-				bytes := make([]byte, ln)
-				copy(bytes, buf[n+4:n+4+ln])
-				v.SetBytes(bytes)
-				n += 4 + ln
-			}
-		}
-	}
-	return n, nil
-}
-
-func encodePacket(buf []byte, st interface{}) (n int, err error) {
-	defer func() {
-		if r := recover(); r != nil {
-			if e, ok := r.(runtime.Error); ok && e.Error() == "runtime error: slice bounds out of range" {
-				err = ErrShortBuffer
-			} else {
-				panic(r)
-			}
-		}
-	}()
-
-	v := reflect.ValueOf(st)
-	if v.Kind() != reflect.Ptr || v.IsNil() {
-		return 0, ErrPtrExpected
-	}
-	return encodePacketValue(buf, v)
-}
-
-func encodePacketValue(buf []byte, v reflect.Value) (int, error) {
-	rv := v
-	for v.Kind() == reflect.Ptr || v.Kind() == reflect.Interface {
-		v = v.Elem()
-	}
-
-	n := 0
-	switch v.Kind() {
-	default:
-		return n, ErrUnhandledFieldType
-	case reflect.Struct:
-		if en, ok := rv.Interface().(encoder); ok {
-			return en.Encode(buf)
-		} else if en, ok := v.Interface().(encoder); ok {
-			return en.Encode(buf)
-		} else {
-			for i := 0; i < v.NumField(); i++ {
-				field := v.Field(i)
-				n2, err := encodePacketValue(buf[n:], field)
-				n += n2
-				if err != nil {
-					return n, err
-				}
-			}
-		}
-	case reflect.Bool:
-		if v.Bool() {
-			buf[n] = 1
-		} else {
-			buf[n] = 0
-		}
-		n++
-	case reflect.Int32:
-		binary.BigEndian.PutUint32(buf[n:n+4], uint32(v.Int()))
-		n += 4
-	case reflect.Int64:
-		binary.BigEndian.PutUint64(buf[n:n+8], uint64(v.Int()))
-		n += 8
-	case reflect.String:
-		str := v.String()
-		binary.BigEndian.PutUint32(buf[n:n+4], uint32(len(str)))
-		copy(buf[n+4:n+4+len(str)], []byte(str))
-		n += 4 + len(str)
-	case reflect.Slice:
-		switch v.Type().Elem().Kind() {
-		default:
-			count := v.Len()
-			startN := n
-			n += 4
-			for i := 0; i < count; i++ {
-				n2, err := encodePacketValue(buf[n:], v.Index(i))
-				n += n2
-				if err != nil {
-					return n, err
-				}
-			}
-			binary.BigEndian.PutUint32(buf[startN:startN+4], uint32(count))
-		case reflect.Uint8:
-			if v.IsNil() {
-				binary.BigEndian.PutUint32(buf[n:n+4], uint32(0xffffffff))
-				n += 4
-			} else {
-				bytes := v.Bytes()
-				binary.BigEndian.PutUint32(buf[n:n+4], uint32(len(bytes)))
-				copy(buf[n+4:n+4+len(bytes)], bytes)
-				n += 4 + len(bytes)
-			}
-		}
-	}
-	return n, nil
-}
-
-func requestStructForOp(op int32) interface{} {
-	switch op {
-	case opClose:
-		return &closeRequest{}
-	case opCreate:
-		return &CreateRequest{}
-	case opDelete:
-		return &DeleteRequest{}
-	case opExists:
-		return &existsRequest{}
-	case opGetAcl:
-		return &getAclRequest{}
-	case opGetChildren:
-		return &getChildrenRequest{}
-	case opGetChildren2:
-		return &getChildren2Request{}
-	case opGetData:
-		return &getDataRequest{}
-	case opPing:
-		return &pingRequest{}
-	case opSetAcl:
-		return &setAclRequest{}
-	case opSetData:
-		return &SetDataRequest{}
-	case opSetWatches:
-		return &setWatchesRequest{}
-	case opSync:
-		return &syncRequest{}
-	case opSetAuth:
-		return &setAuthRequest{}
-	case opCheck:
-		return &CheckVersionRequest{}
-	case opMulti:
-		return &multiRequest{}
-	}
-	return nil
-}
-
-func responseStructForOp(op int32) interface{} {
-	switch op {
-	case opClose:
-		return &closeResponse{}
-	case opCreate:
-		return &createResponse{}
-	case opDelete:
-		return &deleteResponse{}
-	case opExists:
-		return &existsResponse{}
-	case opGetAcl:
-		return &getAclResponse{}
-	case opGetChildren:
-		return &getChildrenResponse{}
-	case opGetChildren2:
-		return &getChildren2Response{}
-	case opGetData:
-		return &getDataResponse{}
-	case opPing:
-		return &pingResponse{}
-	case opSetAcl:
-		return &setAclResponse{}
-	case opSetData:
-		return &setDataResponse{}
-	case opSetWatches:
-		return &setWatchesResponse{}
-	case opSync:
-		return &syncResponse{}
-	case opWatcherEvent:
-		return &watcherEvent{}
-	case opSetAuth:
-		return &setAuthResponse{}
-	// case opCheck:
-	// 	return &checkVersionResponse{}
-	case opMulti:
-		return &multiResponse{}
-	}
-	return nil
-}
diff --git a/Godeps/_workspace/src/github.com/samuel/go-zookeeper/zk/structs_test.go b/Godeps/_workspace/src/github.com/samuel/go-zookeeper/zk/structs_test.go
deleted file mode 100644
index cafbbd95c..000000000
--- a/Godeps/_workspace/src/github.com/samuel/go-zookeeper/zk/structs_test.go
+++ /dev/null
@@ -1,71 +0,0 @@
-package zk
-
-import (
-	"reflect"
-	"testing"
-)
-
-func TestEncodeDecodePacket(t *testing.T) {
-	encodeDecodeTest(t, &requestHeader{-2, 5})
-	encodeDecodeTest(t, &connectResponse{1, 2, 3, nil})
-	encodeDecodeTest(t, &connectResponse{1, 2, 3, []byte{4, 5, 6}})
-	encodeDecodeTest(t, &getAclResponse{[]ACL{{12, "s", "anyone"}}, Stat{}})
-	encodeDecodeTest(t, &getChildrenResponse{[]string{"foo", "bar"}})
-	encodeDecodeTest(t, &pathWatchRequest{"path", true})
-	encodeDecodeTest(t, &pathWatchRequest{"path", false})
-	encodeDecodeTest(t, &CheckVersionRequest{"/", -1})
-	encodeDecodeTest(t, &multiRequest{Ops: []multiRequestOp{{multiHeader{opCheck, false, -1}, &CheckVersionRequest{"/", -1}}}})
-}
-
-func encodeDecodeTest(t *testing.T, r interface{}) {
-	buf := make([]byte, 1024)
-	n, err := encodePacket(buf, r)
-	if err != nil {
-		t.Errorf("encodePacket returned non-nil error %+v\n", err)
-		return
-	}
-	t.Logf("%+v %x", r, buf[:n])
-	r2 := reflect.New(reflect.ValueOf(r).Elem().Type()).Interface()
-	n2, err := decodePacket(buf[:n], r2)
-	if err != nil {
-		t.Errorf("decodePacket returned non-nil error %+v\n", err)
-		return
-	}
-	if n != n2 {
-		t.Errorf("sizes don't match: %d != %d", n, n2)
-		return
-	}
-	if !reflect.DeepEqual(r, r2) {
-		t.Errorf("results don't match: %+v != %+v", r, r2)
-		return
-	}
-}
-
-func TestEncodeShortBuffer(t *testing.T) {
-	buf := make([]byte, 0)
-	_, err := encodePacket(buf, &requestHeader{1, 2})
-	if err != ErrShortBuffer {
-		t.Errorf("encodePacket should return ErrShortBuffer on a short buffer instead of '%+v'", err)
-		return
-	}
-}
-
-func TestDecodeShortBuffer(t *testing.T) {
-	buf := make([]byte, 0)
-	_, err := decodePacket(buf, &responseHeader{})
-	if err != ErrShortBuffer {
-		t.Errorf("decodePacket should return ErrShortBuffer on a short buffer instead of '%+v'", err)
-		return
-	}
-}
-
-func BenchmarkEncode(b *testing.B) {
-	buf := make([]byte, 4096)
-	st := &connectRequest{Passwd: []byte("1234567890")}
-	b.ReportAllocs()
-	for i := 0; i < b.N; i++ {
-		if _, err := encodePacket(buf, st); err != nil {
-			b.Fatal(err)
-		}
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/samuel/go-zookeeper/zk/tracer.go b/Godeps/_workspace/src/github.com/samuel/go-zookeeper/zk/tracer.go
deleted file mode 100644
index 7af2e96bb..000000000
--- a/Godeps/_workspace/src/github.com/samuel/go-zookeeper/zk/tracer.go
+++ /dev/null
@@ -1,148 +0,0 @@
-package zk
-
-import (
-	"encoding/binary"
-	"fmt"
-	"io"
-	"net"
-	"sync"
-)
-
-var (
-	requests     = make(map[int32]int32) // Map of Xid -> Opcode
-	requestsLock = &sync.Mutex{}
-)
-
-func trace(conn1, conn2 net.Conn, client bool) {
-	defer conn1.Close()
-	defer conn2.Close()
-	buf := make([]byte, 10*1024)
-	init := true
-	for {
-		_, err := io.ReadFull(conn1, buf[:4])
-		if err != nil {
-			fmt.Println("1>", client, err)
-			return
-		}
-
-		blen := int(binary.BigEndian.Uint32(buf[:4]))
-
-		_, err = io.ReadFull(conn1, buf[4:4+blen])
-		if err != nil {
-			fmt.Println("2>", client, err)
-			return
-		}
-
-		var cr interface{}
-		opcode := int32(-1)
-		readHeader := true
-		if client {
-			if init {
-				cr = &connectRequest{}
-				readHeader = false
-			} else {
-				xid := int32(binary.BigEndian.Uint32(buf[4:8]))
-				opcode = int32(binary.BigEndian.Uint32(buf[8:12]))
-				requestsLock.Lock()
-				requests[xid] = opcode
-				requestsLock.Unlock()
-				cr = requestStructForOp(opcode)
-				if cr == nil {
-					fmt.Printf("Unknown opcode %d\n", opcode)
-				}
-			}
-		} else {
-			if init {
-				cr = &connectResponse{}
-				readHeader = false
-			} else {
-				xid := int32(binary.BigEndian.Uint32(buf[4:8]))
-				zxid := int64(binary.BigEndian.Uint64(buf[8:16]))
-				errnum := int32(binary.BigEndian.Uint32(buf[16:20]))
-				if xid != -1 || zxid != -1 {
-					requestsLock.Lock()
-					found := false
-					opcode, found = requests[xid]
-					if !found {
-						opcode = 0
-					}
-					delete(requests, xid)
-					requestsLock.Unlock()
-				} else {
-					opcode = opWatcherEvent
-				}
-				cr = responseStructForOp(opcode)
-				if cr == nil {
-					fmt.Printf("Unknown opcode %d\n", opcode)
-				}
-				if errnum != 0 {
-					cr = &struct{}{}
-				}
-			}
-		}
-		opname := "."
-		if opcode != -1 {
-			opname = opNames[opcode]
-		}
-		if cr == nil {
-			fmt.Printf("%+v %s %+v\n", client, opname, buf[4:4+blen])
-		} else {
-			n := 4
-			hdrStr := ""
-			if readHeader {
-				var hdr interface{}
-				if client {
-					hdr = &requestHeader{}
-				} else {
-					hdr = &responseHeader{}
-				}
-				if n2, err := decodePacket(buf[n:n+blen], hdr); err != nil {
-					fmt.Println(err)
-				} else {
-					n += n2
-				}
-				hdrStr = fmt.Sprintf(" %+v", hdr)
-			}
-			if _, err := decodePacket(buf[n:n+blen], cr); err != nil {
-				fmt.Println(err)
-			}
-			fmt.Printf("%+v %s%s %+v\n", client, opname, hdrStr, cr)
-		}
-
-		init = false
-
-		written, err := conn2.Write(buf[:4+blen])
-		if err != nil {
-			fmt.Println("3>", client, err)
-			return
-		} else if written != 4+blen {
-			fmt.Printf("Written != read: %d != %d\n", written, blen)
-			return
-		}
-	}
-}
-
-func handleConnection(addr string, conn net.Conn) {
-	zkConn, err := net.Dial("tcp", addr)
-	if err != nil {
-		fmt.Println(err)
-		return
-	}
-	go trace(conn, zkConn, true)
-	trace(zkConn, conn, false)
-}
-
-func StartTracer(listenAddr, serverAddr string) {
-	ln, err := net.Listen("tcp", listenAddr)
-	if err != nil {
-		panic(err)
-	}
-	for {
-		conn, err := ln.Accept()
-		if err != nil {
-			fmt.Println(err)
-			continue
-		}
-		go handleConnection(serverAddr, conn)
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/samuel/go-zookeeper/zk/util.go b/Godeps/_workspace/src/github.com/samuel/go-zookeeper/zk/util.go
deleted file mode 100644
index 769bbe878..000000000
--- a/Godeps/_workspace/src/github.com/samuel/go-zookeeper/zk/util.go
+++ /dev/null
@@ -1,54 +0,0 @@
-package zk
-
-import (
-	"crypto/sha1"
-	"encoding/base64"
-	"fmt"
-	"math/rand"
-	"strconv"
-	"strings"
-)
-
-// AuthACL produces an ACL list containing a single ACL which uses the
-// provided permissions, with the scheme "auth", and ID "", which is used
-// by ZooKeeper to represent any authenticated user.
-func AuthACL(perms int32) []ACL {
-	return []ACL{{perms, "auth", ""}}
-}
-
-// WorldACL produces an ACL list containing a single ACL which uses the
-// provided permissions, with the scheme "world", and ID "anyone", which
-// is used by ZooKeeper to represent any user at all.
-func WorldACL(perms int32) []ACL {
-	return []ACL{{perms, "world", "anyone"}}
-}
-
-func DigestACL(perms int32, user, password string) []ACL {
-	userPass := []byte(fmt.Sprintf("%s:%s", user, password))
-	h := sha1.New()
-	if n, err := h.Write(userPass); err != nil || n != len(userPass) {
-		panic("SHA1 failed")
-	}
-	digest := base64.StdEncoding.EncodeToString(h.Sum(nil))
-	return []ACL{{perms, "digest", fmt.Sprintf("%s:%s", user, digest)}}
-}
-
-// FormatServers takes a slice of addresses, and makes sure they are in a format
-// that resembles <addr>:<port>. If the server has no port provided, the
-// DefaultPort constant is added to the end.
-func FormatServers(servers []string) []string {
-	for i := range servers {
-		if !strings.Contains(servers[i], ":") {
-			servers[i] = servers[i] + ":" + strconv.Itoa(DefaultPort)
-		}
-	}
-	return servers
-}
-
-// stringShuffle performs a Fisher-Yates shuffle on a slice of strings
-func stringShuffle(s []string) {
-	for i := len(s) - 1; i > 0; i-- {
-		j := rand.Intn(i + 1)
-		s[i], s[j] = s[j], s[i]
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/samuel/go-zookeeper/zk/util_test.go b/Godeps/_workspace/src/github.com/samuel/go-zookeeper/zk/util_test.go
deleted file mode 100644
index b56f77550..000000000
--- a/Godeps/_workspace/src/github.com/samuel/go-zookeeper/zk/util_test.go
+++ /dev/null
@@ -1,17 +0,0 @@
-package zk
-
-import "testing"
-
-func TestFormatServers(t *testing.T) {
-	servers := []string{"127.0.0.1:2181", "127.0.0.42", "127.0.42.1:8811"}
-	r := []string{"127.0.0.1:2181", "127.0.0.42:2181", "127.0.42.1:8811"}
-
-	var s []string
-	s = FormatServers(servers)
-
-	for i := range s {
-		if s[i] != r[i] {
-			t.Errorf("%v should equal %v", s[i], r[i])
-		}
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/samuel/go-zookeeper/zk/zk_test.go b/Godeps/_workspace/src/github.com/samuel/go-zookeeper/zk/zk_test.go
deleted file mode 100644
index fdbe51727..000000000
--- a/Godeps/_workspace/src/github.com/samuel/go-zookeeper/zk/zk_test.go
+++ /dev/null
@@ -1,518 +0,0 @@
-package zk
-
-import (
-	"fmt"
-	"io"
-	"net"
-	"strings"
-	"testing"
-	"time"
-
-	"camlistore.org/pkg/throttle"
-)
-
-func TestCreate(t *testing.T) {
-	ts, err := StartTestCluster(1, nil, logWriter{t: t, p: "[ZKERR] "})
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer ts.Stop()
-	zk, _, err := ts.ConnectAll()
-	if err != nil {
-		t.Fatalf("Connect returned error: %+v", err)
-	}
-	defer zk.Close()
-
-	path := "/gozk-test"
-
-	if err := zk.Delete(path, -1); err != nil && err != ErrNoNode {
-		t.Fatalf("Delete returned error: %+v", err)
-	}
-	if p, err := zk.Create(path, []byte{1, 2, 3, 4}, 0, WorldACL(PermAll)); err != nil {
-		t.Fatalf("Create returned error: %+v", err)
-	} else if p != path {
-		t.Fatalf("Create returned different path '%s' != '%s'", p, path)
-	}
-	if data, stat, err := zk.Get(path); err != nil {
-		t.Fatalf("Get returned error: %+v", err)
-	} else if stat == nil {
-		t.Fatal("Get returned nil stat")
-	} else if len(data) < 4 {
-		t.Fatal("Get returned wrong size data")
-	}
-}
-
-func TestMulti(t *testing.T) {
-	ts, err := StartTestCluster(1, nil, logWriter{t: t, p: "[ZKERR] "})
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer ts.Stop()
-	zk, _, err := ts.ConnectAll()
-	if err != nil {
-		t.Fatalf("Connect returned error: %+v", err)
-	}
-	defer zk.Close()
-
-	path := "/gozk-test"
-
-	if err := zk.Delete(path, -1); err != nil && err != ErrNoNode {
-		t.Fatalf("Delete returned error: %+v", err)
-	}
-	ops := []interface{}{
-		&CreateRequest{Path: path, Data: []byte{1, 2, 3, 4}, Acl: WorldACL(PermAll)},
-		&SetDataRequest{Path: path, Data: []byte{1, 2, 3, 4}, Version: -1},
-	}
-	if res, err := zk.Multi(ops...); err != nil {
-		t.Fatalf("Multi returned error: %+v", err)
-	} else if len(res) != 2 {
-		t.Fatalf("Expected 2 responses got %d", len(res))
-	} else {
-		t.Logf("%+v", res)
-	}
-	if data, stat, err := zk.Get(path); err != nil {
-		t.Fatalf("Get returned error: %+v", err)
-	} else if stat == nil {
-		t.Fatal("Get returned nil stat")
-	} else if len(data) < 4 {
-		t.Fatal("Get returned wrong size data")
-	}
-}
-
-func TestGetSetACL(t *testing.T) {
-	ts, err := StartTestCluster(1, nil, logWriter{t: t, p: "[ZKERR] "})
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer ts.Stop()
-	zk, _, err := ts.ConnectAll()
-	if err != nil {
-		t.Fatalf("Connect returned error: %+v", err)
-	}
-	defer zk.Close()
-
-	if err := zk.AddAuth("digest", []byte("blah")); err != nil {
-		t.Fatalf("AddAuth returned error %+v", err)
-	}
-
-	path := "/gozk-test"
-
-	if err := zk.Delete(path, -1); err != nil && err != ErrNoNode {
-		t.Fatalf("Delete returned error: %+v", err)
-	}
-	if path, err := zk.Create(path, []byte{1, 2, 3, 4}, 0, WorldACL(PermAll)); err != nil {
-		t.Fatalf("Create returned error: %+v", err)
-	} else if path != "/gozk-test" {
-		t.Fatalf("Create returned different path '%s' != '/gozk-test'", path)
-	}
-
-	expected := WorldACL(PermAll)
-
-	if acl, stat, err := zk.GetACL(path); err != nil {
-		t.Fatalf("GetACL returned error %+v", err)
-	} else if stat == nil {
-		t.Fatalf("GetACL returned nil Stat")
-	} else if len(acl) != 1 || expected[0] != acl[0] {
-		t.Fatalf("GetACL mismatch expected %+v instead of %+v", expected, acl)
-	}
-
-	expected = []ACL{{PermAll, "ip", "127.0.0.1"}}
-
-	if stat, err := zk.SetACL(path, expected, -1); err != nil {
-		t.Fatalf("SetACL returned error %+v", err)
-	} else if stat == nil {
-		t.Fatalf("SetACL returned nil Stat")
-	}
-
-	if acl, stat, err := zk.GetACL(path); err != nil {
-		t.Fatalf("GetACL returned error %+v", err)
-	} else if stat == nil {
-		t.Fatalf("GetACL returned nil Stat")
-	} else if len(acl) != 1 || expected[0] != acl[0] {
-		t.Fatalf("GetACL mismatch expected %+v instead of %+v", expected, acl)
-	}
-}
-
-func TestAuth(t *testing.T) {
-	ts, err := StartTestCluster(1, nil, logWriter{t: t, p: "[ZKERR] "})
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer ts.Stop()
-	zk, _, err := ts.ConnectAll()
-	if err != nil {
-		t.Fatalf("Connect returned error: %+v", err)
-	}
-	defer zk.Close()
-
-	path := "/gozk-digest-test"
-	if err := zk.Delete(path, -1); err != nil && err != ErrNoNode {
-		t.Fatalf("Delete returned error: %+v", err)
-	}
-
-	acl := DigestACL(PermAll, "user", "password")
-
-	if p, err := zk.Create(path, []byte{1, 2, 3, 4}, 0, acl); err != nil {
-		t.Fatalf("Create returned error: %+v", err)
-	} else if p != path {
-		t.Fatalf("Create returned different path '%s' != '%s'", p, path)
-	}
-
-	if a, stat, err := zk.GetACL(path); err != nil {
-		t.Fatalf("GetACL returned error %+v", err)
-	} else if stat == nil {
-		t.Fatalf("GetACL returned nil Stat")
-	} else if len(a) != 1 || acl[0] != a[0] {
-		t.Fatalf("GetACL mismatch expected %+v instead of %+v", acl, a)
-	}
-
-	if _, _, err := zk.Get(path); err != ErrNoAuth {
-		t.Fatalf("Get returned error %+v instead of ErrNoAuth", err)
-	}
-
-	if err := zk.AddAuth("digest", []byte("user:password")); err != nil {
-		t.Fatalf("AddAuth returned error %+v", err)
-	}
-
-	if data, stat, err := zk.Get(path); err != nil {
-		t.Fatalf("Get returned error %+v", err)
-	} else if stat == nil {
-		t.Fatalf("Get returned nil Stat")
-	} else if len(data) != 4 {
-		t.Fatalf("Get returned wrong data length")
-	}
-}
-
-func TestChildWatch(t *testing.T) {
-	ts, err := StartTestCluster(1, nil, logWriter{t: t, p: "[ZKERR] "})
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer ts.Stop()
-	zk, _, err := ts.ConnectAll()
-	if err != nil {
-		t.Fatalf("Connect returned error: %+v", err)
-	}
-	defer zk.Close()
-
-	if err := zk.Delete("/gozk-test", -1); err != nil && err != ErrNoNode {
-		t.Fatalf("Delete returned error: %+v", err)
-	}
-
-	children, stat, childCh, err := zk.ChildrenW("/")
-	if err != nil {
-		t.Fatalf("Children returned error: %+v", err)
-	} else if stat == nil {
-		t.Fatal("Children returned nil stat")
-	} else if len(children) < 1 {
-		t.Fatal("Children should return at least 1 child")
-	}
-
-	if path, err := zk.Create("/gozk-test", []byte{1, 2, 3, 4}, 0, WorldACL(PermAll)); err != nil {
-		t.Fatalf("Create returned error: %+v", err)
-	} else if path != "/gozk-test" {
-		t.Fatalf("Create returned different path '%s' != '/gozk-test'", path)
-	}
-
-	select {
-	case ev := <-childCh:
-		if ev.Err != nil {
-			t.Fatalf("Child watcher error %+v", ev.Err)
-		}
-		if ev.Path != "/" {
-			t.Fatalf("Child watcher wrong path %s instead of %s", ev.Path, "/")
-		}
-	case _ = <-time.After(time.Second * 2):
-		t.Fatal("Child watcher timed out")
-	}
-
-	// Delete of the watched node should trigger the watch
-
-	children, stat, childCh, err = zk.ChildrenW("/gozk-test")
-	if err != nil {
-		t.Fatalf("Children returned error: %+v", err)
-	} else if stat == nil {
-		t.Fatal("Children returned nil stat")
-	} else if len(children) != 0 {
-		t.Fatal("Children should return 0 children")
-	}
-
-	if err := zk.Delete("/gozk-test", -1); err != nil && err != ErrNoNode {
-		t.Fatalf("Delete returned error: %+v", err)
-	}
-
-	select {
-	case ev := <-childCh:
-		if ev.Err != nil {
-			t.Fatalf("Child watcher error %+v", ev.Err)
-		}
-		if ev.Path != "/gozk-test" {
-			t.Fatalf("Child watcher wrong path %s instead of %s", ev.Path, "/")
-		}
-	case _ = <-time.After(time.Second * 2):
-		t.Fatal("Child watcher timed out")
-	}
-}
-
-func TestSetWatchers(t *testing.T) {
-	ts, err := StartTestCluster(1, nil, logWriter{t: t, p: "[ZKERR] "})
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer ts.Stop()
-	zk, _, err := ts.ConnectAll()
-	if err != nil {
-		t.Fatalf("Connect returned error: %+v", err)
-	}
-	defer zk.Close()
-
-	zk.reconnectDelay = time.Second
-
-	zk2, _, err := ts.ConnectAll()
-	if err != nil {
-		t.Fatalf("Connect returned error: %+v", err)
-	}
-	defer zk2.Close()
-
-	if err := zk.Delete("/gozk-test", -1); err != nil && err != ErrNoNode {
-		t.Fatalf("Delete returned error: %+v", err)
-	}
-
-	testPath, err := zk.Create("/gozk-test-2", []byte{}, 0, WorldACL(PermAll))
-	if err != nil {
-		t.Fatalf("Create returned: %+v", err)
-	}
-
-	_, _, testEvCh, err := zk.GetW(testPath)
-	if err != nil {
-		t.Fatalf("GetW returned: %+v", err)
-	}
-
-	children, stat, childCh, err := zk.ChildrenW("/")
-	if err != nil {
-		t.Fatalf("Children returned error: %+v", err)
-	} else if stat == nil {
-		t.Fatal("Children returned nil stat")
-	} else if len(children) < 1 {
-		t.Fatal("Children should return at least 1 child")
-	}
-
-	zk.conn.Close()
-	if err := zk2.Delete(testPath, -1); err != nil && err != ErrNoNode {
-		t.Fatalf("Delete returned error: %+v", err)
-	}
-	time.Sleep(time.Millisecond * 100)
-
-	if path, err := zk2.Create("/gozk-test", []byte{1, 2, 3, 4}, 0, WorldACL(PermAll)); err != nil {
-		t.Fatalf("Create returned error: %+v", err)
-	} else if path != "/gozk-test" {
-		t.Fatalf("Create returned different path '%s' != '/gozk-test'", path)
-	}
-
-	select {
-	case ev := <-testEvCh:
-		if ev.Err != nil {
-			t.Fatalf("GetW watcher error %+v", ev.Err)
-		}
-		if ev.Path != testPath {
-			t.Fatalf("GetW watcher wrong path %s instead of %s", ev.Path, testPath)
-		}
-	case <-time.After(2 * time.Second):
-		t.Fatal("GetW watcher timed out")
-	}
-
-	select {
-	case ev := <-childCh:
-		if ev.Err != nil {
-			t.Fatalf("Child watcher error %+v", ev.Err)
-		}
-		if ev.Path != "/" {
-			t.Fatalf("Child watcher wrong path %s instead of %s", ev.Path, "/")
-		}
-	case <-time.After(2 * time.Second):
-		t.Fatal("Child watcher timed out")
-	}
-}
-
-func TestExpiringWatch(t *testing.T) {
-	ts, err := StartTestCluster(1, nil, logWriter{t: t, p: "[ZKERR] "})
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer ts.Stop()
-	zk, _, err := ts.ConnectAll()
-	if err != nil {
-		t.Fatalf("Connect returned error: %+v", err)
-	}
-	defer zk.Close()
-
-	if err := zk.Delete("/gozk-test", -1); err != nil && err != ErrNoNode {
-		t.Fatalf("Delete returned error: %+v", err)
-	}
-
-	children, stat, childCh, err := zk.ChildrenW("/")
-	if err != nil {
-		t.Fatalf("Children returned error: %+v", err)
-	} else if stat == nil {
-		t.Fatal("Children returned nil stat")
-	} else if len(children) < 1 {
-		t.Fatal("Children should return at least 1 child")
-	}
-
-	zk.sessionID = 99999
-	zk.conn.Close()
-
-	select {
-	case ev := <-childCh:
-		if ev.Err != ErrSessionExpired {
-			t.Fatalf("Child watcher error %+v instead of expected ErrSessionExpired", ev.Err)
-		}
-		if ev.Path != "/" {
-			t.Fatalf("Child watcher wrong path %s instead of %s", ev.Path, "/")
-		}
-	case <-time.After(2 * time.Second):
-		t.Fatal("Child watcher timed out")
-	}
-}
-
-func TestRequestFail(t *testing.T) {
-	// If connecting fails to all servers in the list then pending requests
-	// should be errored out so they don't hang forever.
-
-	zk, _, err := Connect([]string{"127.0.0.1:32444"}, time.Second*15)
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer zk.Close()
-
-	ch := make(chan error)
-	go func() {
-		_, _, err := zk.Get("/blah")
-		ch <- err
-	}()
-	select {
-	case err := <-ch:
-		if err == nil {
-			t.Fatal("Expected non-nil error on failed request due to connection failure")
-		}
-	case <-time.After(time.Second * 2):
-		t.Fatal("Get hung when connection could not be made")
-	}
-}
-
-func TestSlowServer(t *testing.T) {
-	ts, err := StartTestCluster(1, nil, logWriter{t: t, p: "[ZKERR] "})
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer ts.Stop()
-
-	realAddr := fmt.Sprintf("127.0.0.1:%d", ts.Servers[0].Port)
-	proxyAddr, stopCh, err := startSlowProxy(t,
-		throttle.Rate{}, throttle.Rate{},
-		realAddr, func(ln *throttle.Listener) {
-			if ln.Up.Latency == 0 {
-				ln.Up.Latency = time.Millisecond * 2000
-				ln.Down.Latency = time.Millisecond * 2000
-			} else {
-				ln.Up.Latency = 0
-				ln.Down.Latency = 0
-			}
-		})
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer close(stopCh)
-
-	zk, _, err := Connect([]string{proxyAddr}, time.Millisecond*500)
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer zk.Close()
-
-	_, _, wch, err := zk.ChildrenW("/")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// Force a reconnect to get a throttled connection
-	zk.conn.Close()
-
-	time.Sleep(time.Millisecond * 100)
-
-	if err := zk.Delete("/gozk-test", -1); err == nil {
-		t.Fatal("Delete should have failed")
-	}
-
-	// The previous request should have timed out causing the server to be disconnected and reconnected
-
-	if _, err := zk.Create("/gozk-test", []byte{1, 2, 3, 4}, 0, WorldACL(PermAll)); err != nil {
-		t.Fatal(err)
-	}
-
-	// Make sure event is still returned because the session should not have been affected
-	select {
-	case ev := <-wch:
-		t.Logf("Received event: %+v", ev)
-	case <-time.After(time.Second):
-		t.Fatal("Expected to receive a watch event")
-	}
-}
-
-func startSlowProxy(t *testing.T, up, down throttle.Rate, upstream string, adj func(ln *throttle.Listener)) (string, chan bool, error) {
-	ln, err := net.Listen("tcp", "127.0.0.1:0")
-	if err != nil {
-		return "", nil, err
-	}
-	tln := &throttle.Listener{
-		Listener: ln,
-		Up:       up,
-		Down:     down,
-	}
-	stopCh := make(chan bool)
-	go func() {
-		<-stopCh
-		tln.Close()
-	}()
-	go func() {
-		for {
-			cn, err := tln.Accept()
-			if err != nil {
-				if !strings.Contains(err.Error(), "use of closed network connection") {
-					t.Fatalf("Accept failed: %s", err.Error())
-				}
-				return
-			}
-			if adj != nil {
-				adj(tln)
-			}
-			go func(cn net.Conn) {
-				defer cn.Close()
-				upcn, err := net.Dial("tcp", upstream)
-				if err != nil {
-					t.Log(err)
-					return
-				}
-				// This will leave hanging goroutines util stopCh is closed
-				// but it doesn't matter in the context of running tests.
-				go func() {
-					<-stopCh
-					upcn.Close()
-				}()
-				go func() {
-					if _, err := io.Copy(upcn, cn); err != nil {
-						if !strings.Contains(err.Error(), "use of closed network connection") {
-							// log.Printf("Upstream write failed: %s", err.Error())
-						}
-					}
-				}()
-				if _, err := io.Copy(cn, upcn); err != nil {
-					if !strings.Contains(err.Error(), "use of closed network connection") {
-						// log.Printf("Upstream read failed: %s", err.Error())
-					}
-				}
-			}(cn)
-		}
-	}()
-	return ln.Addr().String(), stopCh, nil
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/common/common.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/common/common.go
deleted file mode 100644
index d04cdfd7f..000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/common/common.go
+++ /dev/null
@@ -1,218 +0,0 @@
-//
-// gopsutil is a port of psutil(http://pythonhosted.org/psutil/).
-// This covers these architectures.
-//  - linux (amd64, arm)
-//  - freebsd (amd64)
-//  - windows (amd64)
-package common
-
-import (
-	"bufio"
-	"errors"
-	"io/ioutil"
-	"net/url"
-	"os"
-	"os/exec"
-	"path"
-	"reflect"
-	"runtime"
-	"strconv"
-	"strings"
-)
-
-type Invoker interface {
-	Command(string, ...string) ([]byte, error)
-}
-
-type Invoke struct{}
-
-func (i Invoke) Command(name string, arg ...string) ([]byte, error) {
-	return exec.Command(name, arg...).Output()
-}
-
-type FakeInvoke struct {
-	CommandExpectedDir string // CommandExpectedDir specifies dir which includes expected outputs.
-	Suffix             string // Suffix species expected file name suffix such as "fail"
-	Error              error  // If Error specfied, return the error.
-}
-
-// Command in FakeInvoke returns from expected file if exists.
-func (i FakeInvoke) Command(name string, arg ...string) ([]byte, error) {
-	if i.Error != nil {
-		return []byte{}, i.Error
-	}
-
-	arch := runtime.GOOS
-
-	fname := strings.Join(append([]string{name}, arg...), "")
-	fname = url.QueryEscape(fname)
-	var dir string
-	if i.CommandExpectedDir == "" {
-		dir = "expected"
-	} else {
-		dir = i.CommandExpectedDir
-	}
-	fpath := path.Join(dir, arch, fname)
-	if i.Suffix != "" {
-		fpath += "_" + i.Suffix
-	}
-	if PathExists(fpath) {
-		return ioutil.ReadFile(fpath)
-	} else {
-		return exec.Command(name, arg...).Output()
-	}
-}
-
-var NotImplementedError = errors.New("not implemented yet")
-
-// ReadLines reads contents from a file and splits them by new lines.
-// A convenience wrapper to ReadLinesOffsetN(filename, 0, -1).
-func ReadLines(filename string) ([]string, error) {
-	return ReadLinesOffsetN(filename, 0, -1)
-}
-
-// ReadLines reads contents from file and splits them by new line.
-// The offset tells at which line number to start.
-// The count determines the number of lines to read (starting from offset):
-//   n >= 0: at most n lines
-//   n < 0: whole file
-func ReadLinesOffsetN(filename string, offset uint, n int) ([]string, error) {
-	f, err := os.Open(filename)
-	if err != nil {
-		return []string{""}, err
-	}
-	defer f.Close()
-
-	var ret []string
-
-	r := bufio.NewReader(f)
-	for i := 0; i < n+int(offset) || n < 0; i++ {
-		line, err := r.ReadString('\n')
-		if err != nil {
-			break
-		}
-		if i < int(offset) {
-			continue
-		}
-		ret = append(ret, strings.Trim(line, "\n"))
-	}
-
-	return ret, nil
-}
-
-func IntToString(orig []int8) string {
-	ret := make([]byte, len(orig))
-	size := -1
-	for i, o := range orig {
-		if o == 0 {
-			size = i
-			break
-		}
-		ret[i] = byte(o)
-	}
-	if size == -1 {
-		size = len(orig)
-	}
-
-	return string(ret[0:size])
-}
-
-func ByteToString(orig []byte) string {
-	n := -1
-	l := -1
-	for i, b := range orig {
-		// skip left side null
-		if l == -1 && b == 0 {
-			continue
-		}
-		if l == -1 {
-			l = i
-		}
-
-		if b == 0 {
-			break
-		}
-		n = i + 1
-	}
-	if n == -1 {
-		return string(orig)
-	}
-	return string(orig[l:n])
-}
-
-// Parse to int32 without error
-func mustParseInt32(val string) int32 {
-	vv, _ := strconv.ParseInt(val, 10, 32)
-	return int32(vv)
-}
-
-// Parse to uint64 without error
-func mustParseUint64(val string) uint64 {
-	vv, _ := strconv.ParseInt(val, 10, 64)
-	return uint64(vv)
-}
-
-// Parse to Float64 without error
-func mustParseFloat64(val string) float64 {
-	vv, _ := strconv.ParseFloat(val, 64)
-	return vv
-}
-
-// StringsHas checks the target string slice containes src or not
-func StringsHas(target []string, src string) bool {
-	for _, t := range target {
-		if strings.TrimSpace(t) == src {
-			return true
-		}
-	}
-	return false
-}
-
-// StringsContains checks the src in any string of the target string slice
-func StringsContains(target []string, src string) bool {
-	for _, t := range target {
-		if strings.Contains(t, src) {
-			return true
-		}
-	}
-	return false
-}
-
-// get struct attributes.
-// This method is used only for debugging platform dependent code.
-func attributes(m interface{}) map[string]reflect.Type {
-	typ := reflect.TypeOf(m)
-	if typ.Kind() == reflect.Ptr {
-		typ = typ.Elem()
-	}
-
-	attrs := make(map[string]reflect.Type)
-	if typ.Kind() != reflect.Struct {
-		return nil
-	}
-
-	for i := 0; i < typ.NumField(); i++ {
-		p := typ.Field(i)
-		if !p.Anonymous {
-			attrs[p.Name] = p.Type
-		}
-	}
-
-	return attrs
-}
-
-func PathExists(filename string) bool {
-	if _, err := os.Stat(filename); err == nil {
-		return true
-	}
-	return false
-}
-
-//GetEnv retreives the environment variable key. If it does not exist it returns the default.
-func GetEnv(key string, dfault string) string {
-	value := os.Getenv(key)
-	if value == "" {
-		value = dfault
-	}
-	return value
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/common/common_darwin.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/common/common_darwin.go
deleted file mode 100644
index 7d6f3c692..000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/common/common_darwin.go
+++ /dev/null
@@ -1,60 +0,0 @@
-// +build darwin
-
-package common
-
-import (
-	"os/exec"
-	"strings"
-	"syscall"
-	"unsafe"
-)
-
-func DoSysctrl(mib string) ([]string, error) {
-	out, err := exec.Command("/usr/sbin/sysctl", "-n", mib).Output()
-	if err != nil {
-		return []string{}, err
-	}
-	v := strings.Replace(string(out), "{ ", "", 1)
-	v = strings.Replace(string(v), " }", "", 1)
-	values := strings.Fields(string(v))
-
-	return values, nil
-}
-
-func CallSyscall(mib []int32) ([]byte, uint64, error) {
-	miblen := uint64(len(mib))
-
-	// get required buffer size
-	length := uint64(0)
-	_, _, err := syscall.Syscall6(
-		syscall.SYS___SYSCTL,
-		uintptr(unsafe.Pointer(&mib[0])),
-		uintptr(miblen),
-		0,
-		uintptr(unsafe.Pointer(&length)),
-		0,
-		0)
-	if err != 0 {
-		var b []byte
-		return b, length, err
-	}
-	if length == 0 {
-		var b []byte
-		return b, length, err
-	}
-	// get proc info itself
-	buf := make([]byte, length)
-	_, _, err = syscall.Syscall6(
-		syscall.SYS___SYSCTL,
-		uintptr(unsafe.Pointer(&mib[0])),
-		uintptr(miblen),
-		uintptr(unsafe.Pointer(&buf[0])),
-		uintptr(unsafe.Pointer(&length)),
-		0,
-		0)
-	if err != 0 {
-		return buf, length, err
-	}
-
-	return buf, length, nil
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/common/common_freebsd.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/common/common_freebsd.go
deleted file mode 100644
index 3c1124655..000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/common/common_freebsd.go
+++ /dev/null
@@ -1,61 +0,0 @@
-// +build freebsd
-
-package common
-
-import (
-	"syscall"
-	"os/exec"
-	"strings"
-	"unsafe"
-)
-
-func DoSysctrl(mib string) ([]string, error) {
-	out, err := exec.Command("/sbin/sysctl", "-n", mib).Output()
-	if err != nil {
-		return []string{}, err
-	}
-	v := strings.Replace(string(out), "{ ", "", 1)
-	v = strings.Replace(string(v), " }", "", 1)
-	values := strings.Fields(string(v))
-
-	return values, nil
-}
-
-func CallSyscall(mib []int32) ([]byte, uint64, error) {
-	miblen := uint64(len(mib))
-
-	// get required buffer size
-	length := uint64(0)
-	_, _, err := syscall.Syscall6(
-		syscall.SYS___SYSCTL,
-		uintptr(unsafe.Pointer(&mib[0])),
-		uintptr(miblen),
-		0,
-		uintptr(unsafe.Pointer(&length)),
-		0,
-		0)
-	if err != 0 {
-		var b []byte
-		return b, length, err
-	}
-	if length == 0 {
-		var b []byte
-		return b, length, err
-	}
-	// get proc info itself
-	buf := make([]byte, length)
-	_, _, err = syscall.Syscall6(
-		syscall.SYS___SYSCTL,
-		uintptr(unsafe.Pointer(&mib[0])),
-		uintptr(miblen),
-		uintptr(unsafe.Pointer(&buf[0])),
-		uintptr(unsafe.Pointer(&length)),
-		0,
-		0)
-	if err != 0 {
-		return buf, length, err
-	}
-
-	return buf, length, nil
-}
-
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/common/common_linux.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/common/common_linux.go
deleted file mode 100644
index 0a122e9d6..000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/common/common_linux.go
+++ /dev/null
@@ -1,3 +0,0 @@
-// +build linux
-
-package common
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/common/common_test.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/common/common_test.go
deleted file mode 100644
index b2660b2af..000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/common/common_test.go
+++ /dev/null
@@ -1,90 +0,0 @@
-package common
-
-import (
-	"fmt"
-	"strings"
-	"testing"
-)
-
-func TestReadlines(t *testing.T) {
-	ret, err := ReadLines("common_test.go")
-	if err != nil {
-		t.Error(err)
-	}
-	if !strings.Contains(ret[0], "package common") {
-		t.Error("could not read correctly")
-	}
-}
-
-func TestReadLinesOffsetN(t *testing.T) {
-	ret, err := ReadLinesOffsetN("common_test.go", 2, 1)
-	if err != nil {
-		t.Error(err)
-	}
-	fmt.Println(ret[0])
-	if !strings.Contains(ret[0], `import (`) {
-		t.Error("could not read correctly")
-	}
-}
-
-func TestIntToString(t *testing.T) {
-	src := []int8{65, 66, 67}
-	dst := IntToString(src)
-	if dst != "ABC" {
-		t.Error("could not convert")
-	}
-}
-func TestByteToString(t *testing.T) {
-	src := []byte{65, 66, 67}
-	dst := ByteToString(src)
-	if dst != "ABC" {
-		t.Error("could not convert")
-	}
-
-	src = []byte{0, 65, 66, 67}
-	dst = ByteToString(src)
-	if dst != "ABC" {
-		t.Error("could not convert")
-	}
-}
-
-func TestmustParseInt32(t *testing.T) {
-	ret := mustParseInt32("11111")
-	if ret != int32(11111) {
-		t.Error("could not parse")
-	}
-}
-func TestmustParseUint64(t *testing.T) {
-	ret := mustParseUint64("11111")
-	if ret != uint64(11111) {
-		t.Error("could not parse")
-	}
-}
-func TestmustParseFloat64(t *testing.T) {
-	ret := mustParseFloat64("11111.11")
-	if ret != float64(11111.11) {
-		t.Error("could not parse")
-	}
-	ret = mustParseFloat64("11111")
-	if ret != float64(11111) {
-		t.Error("could not parse")
-	}
-}
-func TestStringsContains(t *testing.T) {
-	target, err := ReadLines("common_test.go")
-	if err != nil {
-		t.Error(err)
-	}
-	if !StringsContains(target, "func TestStringsContains(t *testing.T) {") {
-		t.Error("cloud not test correctly")
-	}
-}
-
-func TestPathExists(t *testing.T) {
-	if !PathExists("common_test.go") {
-		t.Error("exists but return not exists")
-	}
-	if PathExists("should_not_exists.go") {
-		t.Error("not exists but return exists")
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/common/common_unix.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/common/common_unix.go
deleted file mode 100644
index d0557ad25..000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/common/common_unix.go
+++ /dev/null
@@ -1,40 +0,0 @@
-// +build linux freebsd darwin
-
-package common
-
-import (
-	"os/exec"
-	"strconv"
-	"strings"
-)
-
-func CallLsof(invoke Invoker, pid int32, args ...string) ([]string, error) {
-	var cmd []string
-	if pid == 0 { // will get from all processes.
-		cmd = []string{"-a", "-n", "-P"}
-	} else {
-		cmd = []string{"-a", "-n", "-P", "-p", strconv.Itoa(int(pid))}
-	}
-	cmd = append(cmd, args...)
-	lsof, err := exec.LookPath("lsof")
-	if err != nil {
-		return []string{}, err
-	}
-	out, err := invoke.Command(lsof, cmd...)
-	if err != nil {
-		// if no pid found, lsof returnes code 1.
-		if err.Error() == "exit status 1" && len(out) == 0 {
-			return []string{}, nil
-		}
-	}
-	lines := strings.Split(string(out), "\n")
-
-	var ret []string
-	for _, l := range lines[1:] {
-		if len(l) == 0 {
-			continue
-		}
-		ret = append(ret, l)
-	}
-	return ret, nil
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/common/common_windows.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/common/common_windows.go
deleted file mode 100644
index d727378cb..000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/common/common_windows.go
+++ /dev/null
@@ -1,110 +0,0 @@
-// +build windows
-
-package common
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-// for double values
-type PDH_FMT_COUNTERVALUE_DOUBLE struct {
-	CStatus     uint32
-	DoubleValue float64
-}
-
-// for 64 bit integer values
-type PDH_FMT_COUNTERVALUE_LARGE struct {
-	CStatus    uint32
-	LargeValue int64
-}
-
-// for long values
-type PDH_FMT_COUNTERVALUE_LONG struct {
-	CStatus   uint32
-	LongValue int32
-	padding   [4]byte
-}
-
-// windows system const
-const (
-	ERROR_SUCCESS        = 0
-	ERROR_FILE_NOT_FOUND = 2
-	DRIVE_REMOVABLE      = 2
-	DRIVE_FIXED          = 3
-	HKEY_LOCAL_MACHINE   = 0x80000002
-	RRF_RT_REG_SZ        = 0x00000002
-	RRF_RT_REG_DWORD     = 0x00000010
-	PDH_FMT_LONG         = 0x00000100
-	PDH_FMT_DOUBLE       = 0x00000200
-	PDH_FMT_LARGE        = 0x00000400
-	PDH_INVALID_DATA     = 0xc0000bc6
-	PDH_INVALID_HANDLE   = 0xC0000bbc
-	PDH_NO_DATA          = 0x800007d5
-)
-
-var (
-	Modkernel32 = syscall.NewLazyDLL("kernel32.dll")
-	ModNt       = syscall.NewLazyDLL("ntdll.dll")
-	ModPdh      = syscall.NewLazyDLL("pdh.dll")
-
-	ProcGetSystemTimes           = Modkernel32.NewProc("GetSystemTimes")
-	ProcNtQuerySystemInformation = ModNt.NewProc("NtQuerySystemInformation")
-	PdhOpenQuery                 = ModPdh.NewProc("PdhOpenQuery")
-	PdhAddCounter                = ModPdh.NewProc("PdhAddCounterW")
-	PdhCollectQueryData          = ModPdh.NewProc("PdhCollectQueryData")
-	PdhGetFormattedCounterValue  = ModPdh.NewProc("PdhGetFormattedCounterValue")
-	PdhCloseQuery                = ModPdh.NewProc("PdhCloseQuery")
-)
-
-type FILETIME struct {
-	DwLowDateTime  uint32
-	DwHighDateTime uint32
-}
-
-// borrowed from net/interface_windows.go
-func BytePtrToString(p *uint8) string {
-	a := (*[10000]uint8)(unsafe.Pointer(p))
-	i := 0
-	for a[i] != 0 {
-		i++
-	}
-	return string(a[:i])
-}
-
-// CounterInfo
-// copied from https://github.com/mackerelio/mackerel-agent/
-type CounterInfo struct {
-	PostName    string
-	CounterName string
-	Counter     syscall.Handle
-}
-
-// CreateQuery XXX
-// copied from https://github.com/mackerelio/mackerel-agent/
-func CreateQuery() (syscall.Handle, error) {
-	var query syscall.Handle
-	r, _, err := PdhOpenQuery.Call(0, 0, uintptr(unsafe.Pointer(&query)))
-	if r != 0 {
-		return 0, err
-	}
-	return query, nil
-}
-
-// CreateCounter XXX
-func CreateCounter(query syscall.Handle, pname, cname string) (*CounterInfo, error) {
-	var counter syscall.Handle
-	r, _, err := PdhAddCounter.Call(
-		uintptr(query),
-		uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(cname))),
-		0,
-		uintptr(unsafe.Pointer(&counter)))
-	if r != 0 {
-		return nil, err
-	}
-	return &CounterInfo{
-		PostName:    pname,
-		CounterName: cname,
-		Counter:     counter,
-	}, nil
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/cpu/cpu.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/cpu/cpu.go
deleted file mode 100644
index b8e8edb44..000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/cpu/cpu.go
+++ /dev/null
@@ -1,74 +0,0 @@
-package cpu
-
-import (
-	"encoding/json"
-	"runtime"
-	"strconv"
-	"strings"
-)
-
-type CPUTimesStat struct {
-	CPU       string  `json:"cpu"`
-	User      float64 `json:"user"`
-	System    float64 `json:"system"`
-	Idle      float64 `json:"idle"`
-	Nice      float64 `json:"nice"`
-	Iowait    float64 `json:"iowait"`
-	Irq       float64 `json:"irq"`
-	Softirq   float64 `json:"softirq"`
-	Steal     float64 `json:"steal"`
-	Guest     float64 `json:"guest"`
-	GuestNice float64 `json:"guest_nice"`
-	Stolen    float64 `json:"stolen"`
-}
-
-type CPUInfoStat struct {
-	CPU        int32    `json:"cpu"`
-	VendorID   string   `json:"vendor_id"`
-	Family     string   `json:"family"`
-	Model      string   `json:"model"`
-	Stepping   int32    `json:"stepping"`
-	PhysicalID string   `json:"physical_id"`
-	CoreID     string   `json:"core_id"`
-	Cores      int32    `json:"cores"`
-	ModelName  string   `json:"model_name"`
-	Mhz        float64  `json:"mhz"`
-	CacheSize  int32    `json:"cache_size"`
-	Flags      []string `json:"flags"`
-}
-
-var lastCPUTimes []CPUTimesStat
-var lastPerCPUTimes []CPUTimesStat
-
-func CPUCounts(logical bool) (int, error) {
-	return runtime.NumCPU(), nil
-}
-
-func (c CPUTimesStat) String() string {
-	v := []string{
-		`"cpu":"` + c.CPU + `"`,
-		`"user":` + strconv.FormatFloat(c.User, 'f', 1, 64),
-		`"system":` + strconv.FormatFloat(c.System, 'f', 1, 64),
-		`"idle":` + strconv.FormatFloat(c.Idle, 'f', 1, 64),
-		`"nice":` + strconv.FormatFloat(c.Nice, 'f', 1, 64),
-		`"iowait":` + strconv.FormatFloat(c.Iowait, 'f', 1, 64),
-		`"irq":` + strconv.FormatFloat(c.Irq, 'f', 1, 64),
-		`"softirq":` + strconv.FormatFloat(c.Softirq, 'f', 1, 64),
-		`"steal":` + strconv.FormatFloat(c.Steal, 'f', 1, 64),
-		`"guest":` + strconv.FormatFloat(c.Guest, 'f', 1, 64),
-		`"guest_nice":` + strconv.FormatFloat(c.GuestNice, 'f', 1, 64),
-		`"stolen":` + strconv.FormatFloat(c.Stolen, 'f', 1, 64),
-	}
-
-	return `{` + strings.Join(v, ",") + `}`
-}
-
-func (c CPUInfoStat) String() string {
-	s, _ := json.Marshal(c)
-	return string(s)
-}
-
-func init() {
-	lastCPUTimes, _ = CPUTimes(false)
-	lastPerCPUTimes, _ = CPUTimes(true)
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/cpu/cpu_darwin.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/cpu/cpu_darwin.go
deleted file mode 100644
index 4066b6515..000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/cpu/cpu_darwin.go
+++ /dev/null
@@ -1,103 +0,0 @@
-// +build darwin
-
-package cpu
-
-import (
-	"os/exec"
-	"strconv"
-	"strings"
-)
-
-// sys/resource.h
-const (
-	CPUser    = 0
-	CPNice    = 1
-	CPSys     = 2
-	CPIntr    = 3
-	CPIdle    = 4
-	CPUStates = 5
-)
-
-// default value. from time.h
-var ClocksPerSec = float64(128)
-
-func CPUTimes(percpu bool) ([]CPUTimesStat, error) {
-	if percpu {
-		return perCPUTimes()
-	}
-
-	return allCPUTimes()
-}
-
-// Returns only one CPUInfoStat on FreeBSD
-func CPUInfo() ([]CPUInfoStat, error) {
-	var ret []CPUInfoStat
-
-	out, err := exec.Command("/usr/sbin/sysctl", "machdep.cpu").Output()
-	if err != nil {
-		return ret, err
-	}
-
-	c := CPUInfoStat{}
-	for _, line := range strings.Split(string(out), "\n") {
-		values := strings.Fields(line)
-		if len(values) < 1 {
-			continue
-		}
-
-		t, err := strconv.ParseInt(values[1], 10, 64)
-		// err is not checked here because some value is string.
-		if strings.HasPrefix(line, "machdep.cpu.brand_string") {
-			c.ModelName = strings.Join(values[1:], " ")
-		} else if strings.HasPrefix(line, "machdep.cpu.family") {
-			c.Family = values[1]
-		} else if strings.HasPrefix(line, "machdep.cpu.model") {
-			c.Model = values[1]
-		} else if strings.HasPrefix(line, "machdep.cpu.stepping") {
-			if err != nil {
-				return ret, err
-			}
-			c.Stepping = int32(t)
-		} else if strings.HasPrefix(line, "machdep.cpu.features") {
-			for _, v := range values[1:] {
-				c.Flags = append(c.Flags, strings.ToLower(v))
-			}
-		} else if strings.HasPrefix(line, "machdep.cpu.leaf7_features") {
-			for _, v := range values[1:] {
-				c.Flags = append(c.Flags, strings.ToLower(v))
-			}
-		} else if strings.HasPrefix(line, "machdep.cpu.extfeatures") {
-			for _, v := range values[1:] {
-				c.Flags = append(c.Flags, strings.ToLower(v))
-			}
-		} else if strings.HasPrefix(line, "machdep.cpu.core_count") {
-			if err != nil {
-				return ret, err
-			}
-			c.Cores = int32(t)
-		} else if strings.HasPrefix(line, "machdep.cpu.cache.size") {
-			if err != nil {
-				return ret, err
-			}
-			c.CacheSize = int32(t)
-		} else if strings.HasPrefix(line, "machdep.cpu.vendor") {
-			c.VendorID = values[1]
-		}
-	}
-
-	// Use the rated frequency of the CPU. This is a static value and does not
-	// account for low power or Turbo Boost modes.
-	out, err = exec.Command("/usr/sbin/sysctl", "hw.cpufrequency").Output()
-	if err != nil {
-		return ret, err
-	}
-
-	values := strings.Fields(string(out))
-	mhz, err := strconv.ParseFloat(values[1], 64)
-	if err != nil {
-		return ret, err
-	}
-	c.Mhz = mhz / 1000000.0
-
-	return append(ret, c), nil
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/cpu/cpu_darwin_cgo.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/cpu/cpu_darwin_cgo.go
deleted file mode 100644
index 29732172a..000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/cpu/cpu_darwin_cgo.go
+++ /dev/null
@@ -1,107 +0,0 @@
-// +build darwin
-// +build cgo
-
-package cpu
-
-/*
-#include <stdlib.h>
-#include <sys/sysctl.h>
-#include <sys/mount.h>
-#include <mach/mach_init.h>
-#include <mach/mach_host.h>
-#include <mach/host_info.h>
-#include <libproc.h>
-#include <mach/processor_info.h>
-#include <mach/vm_map.h>
-*/
-import "C"
-
-import (
-	"bytes"
-	"encoding/binary"
-	"fmt"
-	"unsafe"
-)
-
-// these CPU times for darwin is borrowed from influxdb/telegraf.
-
-func perCPUTimes() ([]CPUTimesStat, error) {
-	var (
-		count   C.mach_msg_type_number_t
-		cpuload *C.processor_cpu_load_info_data_t
-		ncpu    C.natural_t
-	)
-
-	status := C.host_processor_info(C.host_t(C.mach_host_self()),
-		C.PROCESSOR_CPU_LOAD_INFO,
-		&ncpu,
-		(*C.processor_info_array_t)(unsafe.Pointer(&cpuload)),
-		&count)
-
-	if status != C.KERN_SUCCESS {
-		return nil, fmt.Errorf("host_processor_info error=%d", status)
-	}
-
-	// jump through some cgo casting hoops and ensure we properly free
-	// the memory that cpuload points to
-	target := C.vm_map_t(C.mach_task_self_)
-	address := C.vm_address_t(uintptr(unsafe.Pointer(cpuload)))
-	defer C.vm_deallocate(target, address, C.vm_size_t(ncpu))
-
-	// the body of struct processor_cpu_load_info
-	// aka processor_cpu_load_info_data_t
-	var cpu_ticks [C.CPU_STATE_MAX]uint32
-
-	// copy the cpuload array to a []byte buffer
-	// where we can binary.Read the data
-	size := int(ncpu) * binary.Size(cpu_ticks)
-	buf := C.GoBytes(unsafe.Pointer(cpuload), C.int(size))
-
-	bbuf := bytes.NewBuffer(buf)
-
-	var ret []CPUTimesStat
-
-	for i := 0; i < int(ncpu); i++ {
-		err := binary.Read(bbuf, binary.LittleEndian, &cpu_ticks)
-		if err != nil {
-			return nil, err
-		}
-
-		c := CPUTimesStat{
-			CPU:    fmt.Sprintf("cpu%d", i),
-			User:   float64(cpu_ticks[C.CPU_STATE_USER]) / ClocksPerSec,
-			System: float64(cpu_ticks[C.CPU_STATE_SYSTEM]) / ClocksPerSec,
-			Nice:   float64(cpu_ticks[C.CPU_STATE_NICE]) / ClocksPerSec,
-			Idle:   float64(cpu_ticks[C.CPU_STATE_IDLE]) / ClocksPerSec,
-		}
-
-		ret = append(ret, c)
-	}
-
-	return ret, nil
-}
-
-func allCPUTimes() ([]CPUTimesStat, error) {
-	var count C.mach_msg_type_number_t = C.HOST_CPU_LOAD_INFO_COUNT
-	var cpuload C.host_cpu_load_info_data_t
-
-	status := C.host_statistics(C.host_t(C.mach_host_self()),
-		C.HOST_CPU_LOAD_INFO,
-		C.host_info_t(unsafe.Pointer(&cpuload)),
-		&count)
-
-	if status != C.KERN_SUCCESS {
-		return nil, fmt.Errorf("host_statistics error=%d", status)
-	}
-
-	c := CPUTimesStat{
-		CPU:    "cpu-total",
-		User:   float64(cpuload.cpu_ticks[C.CPU_STATE_USER]) / ClocksPerSec,
-		System: float64(cpuload.cpu_ticks[C.CPU_STATE_SYSTEM]) / ClocksPerSec,
-		Nice:   float64(cpuload.cpu_ticks[C.CPU_STATE_NICE]) / ClocksPerSec,
-		Idle:   float64(cpuload.cpu_ticks[C.CPU_STATE_IDLE]) / ClocksPerSec,
-	}
-
-	return []CPUTimesStat{c}, nil
-
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/cpu/cpu_darwin_nocgo.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/cpu/cpu_darwin_nocgo.go
deleted file mode 100644
index 0b7d1f999..000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/cpu/cpu_darwin_nocgo.go
+++ /dev/null
@@ -1,14 +0,0 @@
-// +build darwin
-// +build !cgo
-
-package cpu
-
-import "github.com/shirou/gopsutil/internal/common"
-
-func perCPUTimes() ([]CPUTimesStat, error) {
-	return []CPUTimesStat{}, common.NotImplementedError
-}
-
-func allCPUTimes() ([]CPUTimesStat, error) {
-	return []CPUTimesStat{}, common.NotImplementedError
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/cpu/cpu_freebsd.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/cpu/cpu_freebsd.go
deleted file mode 100644
index 5df67b3d4..000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/cpu/cpu_freebsd.go
+++ /dev/null
@@ -1,143 +0,0 @@
-// +build freebsd
-
-package cpu
-
-import (
-	"fmt"
-	"os/exec"
-	"regexp"
-	"strconv"
-	"strings"
-
-	"github.com/shirou/gopsutil/internal/common"
-)
-
-// sys/resource.h
-const (
-	CPUser    = 0
-	CPNice    = 1
-	CPSys     = 2
-	CPIntr    = 3
-	CPIdle    = 4
-	CPUStates = 5
-)
-
-var ClocksPerSec = float64(128)
-
-func init() {
-	out, err := exec.Command("/usr/bin/getconf", "CLK_TCK").Output()
-	// ignore errors
-	if err == nil {
-		i, err := strconv.ParseFloat(strings.TrimSpace(string(out)), 64)
-		if err == nil {
-			ClocksPerSec = float64(i)
-		}
-	}
-}
-
-func CPUTimes(percpu bool) ([]CPUTimesStat, error) {
-	var ret []CPUTimesStat
-
-	var sysctlCall string
-	var ncpu int
-	if percpu {
-		sysctlCall = "kern.cp_times"
-		ncpu, _ = CPUCounts(true)
-	} else {
-		sysctlCall = "kern.cp_time"
-		ncpu = 1
-	}
-
-	cpuTimes, err := common.DoSysctrl(sysctlCall)
-	if err != nil {
-		return ret, err
-	}
-
-	for i := 0; i < ncpu; i++ {
-		offset := CPUStates * i
-		user, err := strconv.ParseFloat(cpuTimes[CPUser+offset], 64)
-		if err != nil {
-			return ret, err
-		}
-		nice, err := strconv.ParseFloat(cpuTimes[CPNice+offset], 64)
-		if err != nil {
-			return ret, err
-		}
-		sys, err := strconv.ParseFloat(cpuTimes[CPSys+offset], 64)
-		if err != nil {
-			return ret, err
-		}
-		idle, err := strconv.ParseFloat(cpuTimes[CPIdle+offset], 64)
-		if err != nil {
-			return ret, err
-		}
-		intr, err := strconv.ParseFloat(cpuTimes[CPIntr+offset], 64)
-		if err != nil {
-			return ret, err
-		}
-
-		c := CPUTimesStat{
-			User:   float64(user / ClocksPerSec),
-			Nice:   float64(nice / ClocksPerSec),
-			System: float64(sys / ClocksPerSec),
-			Idle:   float64(idle / ClocksPerSec),
-			Irq:    float64(intr / ClocksPerSec),
-		}
-		if !percpu {
-			c.CPU = "cpu-total"
-		} else {
-			c.CPU = fmt.Sprintf("cpu%d", i)
-		}
-
-		ret = append(ret, c)
-	}
-
-	return ret, nil
-}
-
-// Returns only one CPUInfoStat on FreeBSD
-func CPUInfo() ([]CPUInfoStat, error) {
-	filename := "/var/run/dmesg.boot"
-	lines, _ := common.ReadLines(filename)
-
-	var ret []CPUInfoStat
-
-	c := CPUInfoStat{}
-	for _, line := range lines {
-		if matches := regexp.MustCompile(`CPU:\s+(.+) \(([\d.]+).+\)`).FindStringSubmatch(line); matches != nil {
-			c.ModelName = matches[1]
-			t, err := strconv.ParseFloat(matches[2], 64)
-			if err != nil {
-				return ret, nil
-			}
-			c.Mhz = t
-		} else if matches := regexp.MustCompile(`Origin = "(.+)"  Id = (.+)  Family = (.+)  Model = (.+)  Stepping = (.+)`).FindStringSubmatch(line); matches != nil {
-			c.VendorID = matches[1]
-			c.Family = matches[3]
-			c.Model = matches[4]
-			t, err := strconv.ParseInt(matches[5], 10, 32)
-			if err != nil {
-				return ret, nil
-			}
-			c.Stepping = int32(t)
-		} else if matches := regexp.MustCompile(`Features=.+<(.+)>`).FindStringSubmatch(line); matches != nil {
-			for _, v := range strings.Split(matches[1], ",") {
-				c.Flags = append(c.Flags, strings.ToLower(v))
-			}
-		} else if matches := regexp.MustCompile(`Features2=[a-f\dx]+<(.+)>`).FindStringSubmatch(line); matches != nil {
-			for _, v := range strings.Split(matches[1], ",") {
-				c.Flags = append(c.Flags, strings.ToLower(v))
-			}
-		} else if matches := regexp.MustCompile(`Logical CPUs per core: (\d+)`).FindStringSubmatch(line); matches != nil {
-			// FIXME: no this line?
-			t, err := strconv.ParseInt(matches[1], 10, 32)
-			if err != nil {
-				return ret, nil
-			}
-			c.Cores = int32(t)
-		}
-
-	}
-
-	return append(ret, c), nil
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/cpu/cpu_linux.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/cpu/cpu_linux.go
deleted file mode 100644
index 8dbbd8536..000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/cpu/cpu_linux.go
+++ /dev/null
@@ -1,240 +0,0 @@
-// +build linux
-
-package cpu
-
-import (
-	"errors"
-	"fmt"
-	"os/exec"
-	"strconv"
-	"strings"
-
-	"github.com/shirou/gopsutil/internal/common"
-)
-
-var cpu_tick = float64(100)
-
-func init() {
-	out, err := exec.Command("/usr/bin/getconf", "CLK_TCK").Output()
-	// ignore errors
-	if err == nil {
-		i, err := strconv.ParseFloat(strings.TrimSpace(string(out)), 64)
-		if err == nil {
-			cpu_tick = float64(i)
-		}
-	}
-}
-
-func CPUTimes(percpu bool) ([]CPUTimesStat, error) {
-	filename := common.HostProc("stat")
-	var lines = []string{}
-	if percpu {
-		var startIdx uint = 1
-		for {
-			linen, _ := common.ReadLinesOffsetN(filename, startIdx, 1)
-			line := linen[0]
-			if !strings.HasPrefix(line, "cpu") {
-				break
-			}
-			lines = append(lines, line)
-			startIdx += 1
-		}
-	} else {
-		lines, _ = common.ReadLinesOffsetN(filename, 0, 1)
-	}
-
-	ret := make([]CPUTimesStat, 0, len(lines))
-
-	for _, line := range lines {
-		ct, err := parseStatLine(line)
-		if err != nil {
-			continue
-		}
-		ret = append(ret, *ct)
-
-	}
-	return ret, nil
-}
-
-func sysCpuPath(cpu int32, relPath string) string {
-	return common.HostSys(fmt.Sprintf("devices/system/cpu/cpu%d", cpu), relPath)
-}
-
-func finishCPUInfo(c *CPUInfoStat) error {
-	if c.Mhz == 0 {
-		lines, err := common.ReadLines(sysCpuPath(c.CPU, "cpufreq/cpuinfo_max_freq"))
-		if err == nil {
-			value, err := strconv.ParseFloat(lines[0], 64)
-			if err != nil {
-				return err
-			}
-			c.Mhz = value
-		}
-	}
-	if len(c.CoreID) == 0 {
-		lines, err := common.ReadLines(sysCpuPath(c.CPU, "topology/core_id"))
-		if err == nil {
-			c.CoreID = lines[0]
-		}
-	}
-	return nil
-}
-
-// CPUInfo on linux will return 1 item per physical thread.
-//
-// CPUs have three levels of counting: sockets, cores, threads.
-// Cores with HyperThreading count as having 2 threads per core.
-// Sockets often come with many physical CPU cores.
-// For example a single socket board with two cores each with HT will
-// return 4 CPUInfoStat structs on Linux and the "Cores" field set to 1.
-func CPUInfo() ([]CPUInfoStat, error) {
-	filename := common.HostProc("cpuinfo")
-	lines, _ := common.ReadLines(filename)
-
-	var ret []CPUInfoStat
-
-	c := CPUInfoStat{CPU: -1, Cores: 1}
-	for _, line := range lines {
-		fields := strings.Split(line, ":")
-		if len(fields) < 2 {
-			continue
-		}
-		key := strings.TrimSpace(fields[0])
-		value := strings.TrimSpace(fields[1])
-
-		switch key {
-		case "processor":
-			if c.CPU >= 0 {
-				err := finishCPUInfo(&c)
-				if err != nil {
-					return ret, err
-				}
-				ret = append(ret, c)
-			}
-			c = CPUInfoStat{Cores: 1}
-			t, err := strconv.ParseInt(value, 10, 64)
-			if err != nil {
-				return ret, err
-			}
-			c.CPU = int32(t)
-		case "vendor_id":
-			c.VendorID = value
-		case "cpu family":
-			c.Family = value
-		case "model":
-			c.Model = value
-		case "model name":
-			c.ModelName = value
-		case "stepping":
-			t, err := strconv.ParseInt(value, 10, 64)
-			if err != nil {
-				return ret, err
-			}
-			c.Stepping = int32(t)
-		case "cpu MHz":
-			t, err := strconv.ParseFloat(value, 64)
-			if err != nil {
-				return ret, err
-			}
-			c.Mhz = t
-		case "cache size":
-			t, err := strconv.ParseInt(strings.Replace(value, " KB", "", 1), 10, 64)
-			if err != nil {
-				return ret, err
-			}
-			c.CacheSize = int32(t)
-		case "physical id":
-			c.PhysicalID = value
-		case "core id":
-			c.CoreID = value
-		case "flags", "Features":
-			c.Flags = strings.FieldsFunc(value, func(r rune) bool {
-				return r == ',' || r == ' '
-			})
-		}
-	}
-	if c.CPU >= 0 {
-		err := finishCPUInfo(&c)
-		if err != nil {
-			return ret, err
-		}
-		ret = append(ret, c)
-	}
-	return ret, nil
-}
-
-func parseStatLine(line string) (*CPUTimesStat, error) {
-	fields := strings.Fields(line)
-
-	if strings.HasPrefix(fields[0], "cpu") == false {
-		//		return CPUTimesStat{}, e
-		return nil, errors.New("not contain cpu")
-	}
-
-	cpu := fields[0]
-	if cpu == "cpu" {
-		cpu = "cpu-total"
-	}
-	user, err := strconv.ParseFloat(fields[1], 64)
-	if err != nil {
-		return nil, err
-	}
-	nice, err := strconv.ParseFloat(fields[2], 64)
-	if err != nil {
-		return nil, err
-	}
-	system, err := strconv.ParseFloat(fields[3], 64)
-	if err != nil {
-		return nil, err
-	}
-	idle, err := strconv.ParseFloat(fields[4], 64)
-	if err != nil {
-		return nil, err
-	}
-	iowait, err := strconv.ParseFloat(fields[5], 64)
-	if err != nil {
-		return nil, err
-	}
-	irq, err := strconv.ParseFloat(fields[6], 64)
-	if err != nil {
-		return nil, err
-	}
-	softirq, err := strconv.ParseFloat(fields[7], 64)
-	if err != nil {
-		return nil, err
-	}
-
-	ct := &CPUTimesStat{
-		CPU:     cpu,
-		User:    float64(user) / cpu_tick,
-		Nice:    float64(nice) / cpu_tick,
-		System:  float64(system) / cpu_tick,
-		Idle:    float64(idle) / cpu_tick,
-		Iowait:  float64(iowait) / cpu_tick,
-		Irq:     float64(irq) / cpu_tick,
-		Softirq: float64(softirq) / cpu_tick,
-	}
-	if len(fields) > 8 { // Linux >= 2.6.11
-		steal, err := strconv.ParseFloat(fields[8], 64)
-		if err != nil {
-			return nil, err
-		}
-		ct.Steal = float64(steal) / cpu_tick
-	}
-	if len(fields) > 9 { // Linux >= 2.6.24
-		guest, err := strconv.ParseFloat(fields[9], 64)
-		if err != nil {
-			return nil, err
-		}
-		ct.Guest = float64(guest) / cpu_tick
-	}
-	if len(fields) > 10 { // Linux >= 3.2.0
-		guestNice, err := strconv.ParseFloat(fields[10], 64)
-		if err != nil {
-			return nil, err
-		}
-		ct.GuestNice = float64(guestNice) / cpu_tick
-	}
-
-	return ct, nil
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/cpu/cpu_test.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/cpu/cpu_test.go
deleted file mode 100644
index 9695e35f4..000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/cpu/cpu_test.go
+++ /dev/null
@@ -1,99 +0,0 @@
-package cpu
-
-import (
-	"fmt"
-	"runtime"
-	"testing"
-	"time"
-)
-
-func TestCpu_times(t *testing.T) {
-	v, err := CPUTimes(false)
-	if err != nil {
-		t.Errorf("error %v", err)
-	}
-	if len(v) == 0 {
-		t.Error("could not get CPUs ", err)
-	}
-	empty := CPUTimesStat{}
-	for _, vv := range v {
-		if vv == empty {
-			t.Errorf("could not get CPU User: %v", vv)
-		}
-	}
-}
-
-func TestCpu_counts(t *testing.T) {
-	v, err := CPUCounts(true)
-	if err != nil {
-		t.Errorf("error %v", err)
-	}
-	if v == 0 {
-		t.Errorf("could not get CPU counts: %v", v)
-	}
-}
-
-func TestCPUTimeStat_String(t *testing.T) {
-	v := CPUTimesStat{
-		CPU:    "cpu0",
-		User:   100.1,
-		System: 200.1,
-		Idle:   300.1,
-	}
-	e := `{"cpu":"cpu0","user":100.1,"system":200.1,"idle":300.1,"nice":0.0,"iowait":0.0,"irq":0.0,"softirq":0.0,"steal":0.0,"guest":0.0,"guest_nice":0.0,"stolen":0.0}`
-	if e != fmt.Sprintf("%v", v) {
-		t.Errorf("CPUTimesStat string is invalid: %v", v)
-	}
-}
-
-func TestCpuInfo(t *testing.T) {
-	v, err := CPUInfo()
-	if err != nil {
-		t.Errorf("error %v", err)
-	}
-	if len(v) == 0 {
-		t.Errorf("could not get CPU Info")
-	}
-	for _, vv := range v {
-		if vv.ModelName == "" {
-			t.Errorf("could not get CPU Info: %v", vv)
-		}
-	}
-}
-
-func testCPUPercent(t *testing.T, percpu bool) {
-	numcpu := runtime.NumCPU()
-	testCount := 3
-
-	if runtime.GOOS != "windows" {
-		testCount = 100
-		v, err := CPUPercent(time.Millisecond, percpu)
-		if err != nil {
-			t.Errorf("error %v", err)
-		}
-		if (percpu && len(v) != numcpu) || (!percpu && len(v) != 1) {
-			t.Fatalf("wrong number of entries from CPUPercent: %v", v)
-		}
-	}
-	for i := 0; i < testCount; i++ {
-		duration := time.Duration(10) * time.Microsecond
-		v, err := CPUPercent(duration, percpu)
-		if err != nil {
-			t.Errorf("error %v", err)
-		}
-		for _, percent := range v {
-			// Check for slightly greater then 100% to account for any rounding issues.
-			if percent < 0.0 || percent > 100.0001*float64(numcpu) {
-				t.Fatalf("CPUPercent value is invalid: %f", percent)
-			}
-		}
-	}
-}
-
-func TestCPUPercent(t *testing.T) {
-	testCPUPercent(t, false)
-}
-
-func TestCPUPercentPerCpu(t *testing.T) {
-	testCPUPercent(t, true)
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/cpu/cpu_unix.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/cpu/cpu_unix.go
deleted file mode 100644
index fd488a284..000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/cpu/cpu_unix.go
+++ /dev/null
@@ -1,61 +0,0 @@
-// +build linux freebsd darwin
-
-package cpu
-
-import "time"
-
-func init() {
-	lastCPUTimes, _ = CPUTimes(false)
-	lastPerCPUTimes, _ = CPUTimes(true)
-}
-
-func CPUPercent(interval time.Duration, percpu bool) ([]float64, error) {
-	getAllBusy := func(t CPUTimesStat) (float64, float64) {
-		busy := t.User + t.System + t.Nice + t.Iowait + t.Irq +
-			t.Softirq + t.Steal + t.Guest + t.GuestNice + t.Stolen
-		return busy + t.Idle, busy
-	}
-
-	calculate := func(t1, t2 CPUTimesStat) float64 {
-		t1All, t1Busy := getAllBusy(t1)
-		t2All, t2Busy := getAllBusy(t2)
-
-		if t2Busy <= t1Busy {
-			return 0
-		}
-		if t2All <= t1All {
-			return 1
-		}
-		return (t2Busy - t1Busy) / (t2All - t1All) * 100
-	}
-
-	cpuTimes, err := CPUTimes(percpu)
-	if err != nil {
-		return nil, err
-	}
-
-	if interval > 0 {
-		if !percpu {
-			lastCPUTimes = cpuTimes
-		} else {
-			lastPerCPUTimes = cpuTimes
-		}
-		time.Sleep(interval)
-		cpuTimes, err = CPUTimes(percpu)
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	ret := make([]float64, len(cpuTimes))
-	if !percpu {
-		ret[0] = calculate(lastCPUTimes[0], cpuTimes[0])
-		lastCPUTimes = cpuTimes
-	} else {
-		for i, t := range cpuTimes {
-			ret[i] = calculate(lastPerCPUTimes[i], t)
-		}
-		lastPerCPUTimes = cpuTimes
-	}
-	return ret, nil
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/cpu/cpu_windows.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/cpu/cpu_windows.go
deleted file mode 100644
index 408d6a686..000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/cpu/cpu_windows.go
+++ /dev/null
@@ -1,105 +0,0 @@
-// +build windows
-
-package cpu
-
-import (
-	"fmt"
-	"syscall"
-	"time"
-	"unsafe"
-
-	"github.com/StackExchange/wmi"
-
-	"github.com/shirou/gopsutil/internal/common"
-)
-
-type Win32_Processor struct {
-	LoadPercentage            *uint16
-	Family                    uint16
-	Manufacturer              string
-	Name                      string
-	NumberOfLogicalProcessors uint32
-	ProcessorId               *string
-	Stepping                  *string
-	MaxClockSpeed             uint32
-}
-
-// TODO: Get percpu
-func CPUTimes(percpu bool) ([]CPUTimesStat, error) {
-	var ret []CPUTimesStat
-
-	var lpIdleTime common.FILETIME
-	var lpKernelTime common.FILETIME
-	var lpUserTime common.FILETIME
-	r, _, _ := common.ProcGetSystemTimes.Call(
-		uintptr(unsafe.Pointer(&lpIdleTime)),
-		uintptr(unsafe.Pointer(&lpKernelTime)),
-		uintptr(unsafe.Pointer(&lpUserTime)))
-	if r == 0 {
-		return ret, syscall.GetLastError()
-	}
-
-	LOT := float64(0.0000001)
-	HIT := (LOT * 4294967296.0)
-	idle := ((HIT * float64(lpIdleTime.DwHighDateTime)) + (LOT * float64(lpIdleTime.DwLowDateTime)))
-	user := ((HIT * float64(lpUserTime.DwHighDateTime)) + (LOT * float64(lpUserTime.DwLowDateTime)))
-	kernel := ((HIT * float64(lpKernelTime.DwHighDateTime)) + (LOT * float64(lpKernelTime.DwLowDateTime)))
-	system := (kernel - idle)
-
-	ret = append(ret, CPUTimesStat{
-		Idle:   float64(idle),
-		User:   float64(user),
-		System: float64(system),
-	})
-	return ret, nil
-}
-
-func CPUInfo() ([]CPUInfoStat, error) {
-	var ret []CPUInfoStat
-	var dst []Win32_Processor
-	q := wmi.CreateQuery(&dst, "")
-	err := wmi.Query(q, &dst)
-	if err != nil {
-		return ret, err
-	}
-
-	var procID string
-	for i, l := range dst {
-		procID = ""
-		if l.ProcessorId != nil {
-			procID = *l.ProcessorId
-		}
-
-		cpu := CPUInfoStat{
-			CPU:        int32(i),
-			Family:     fmt.Sprintf("%d", l.Family),
-			VendorID:   l.Manufacturer,
-			ModelName:  l.Name,
-			Cores:      int32(l.NumberOfLogicalProcessors),
-			PhysicalID: procID,
-			Mhz:        float64(l.MaxClockSpeed),
-			Flags:      []string{},
-		}
-		ret = append(ret, cpu)
-	}
-
-	return ret, nil
-}
-
-func CPUPercent(interval time.Duration, percpu bool) ([]float64, error) {
-	var ret []float64
-	var dst []Win32_Processor
-	q := wmi.CreateQuery(&dst, "")
-	err := wmi.Query(q, &dst)
-	if err != nil {
-		return ret, err
-	}
-	for _, l := range dst {
-		// use range but windows can only get one percent.
-		if l.LoadPercentage == nil {
-			continue
-		}
-		ret = append(ret, float64(*l.LoadPercentage))
-	}
-	return ret, nil
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/disk/binary.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/disk/binary.go
deleted file mode 100644
index 418e591f4..000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/disk/binary.go
+++ /dev/null
@@ -1,634 +0,0 @@
-// 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.
-
-// Package binary implements simple translation between numbers and byte
-// sequences and encoding and decoding of varints.
-//
-// Numbers are translated by reading and writing fixed-size values.
-// A fixed-size value is either a fixed-size arithmetic
-// type (int8, uint8, int16, float32, complex64, ...)
-// or an array or struct containing only fixed-size values.
-//
-// The varint functions encode and decode single integer values using
-// a variable-length encoding; smaller values require fewer bytes.
-// For a specification, see
-// http://code.google.com/apis/protocolbuffers/docs/encoding.html.
-//
-// This package favors simplicity over efficiency. Clients that require
-// high-performance serialization, especially for large data structures,
-// should look at more advanced solutions such as the encoding/gob
-// package or protocol buffers.
-package disk
-
-import (
-	"errors"
-	"io"
-	"math"
-	"reflect"
-)
-
-// A ByteOrder specifies how to convert byte sequences into
-// 16-, 32-, or 64-bit unsigned integers.
-type ByteOrder interface {
-	Uint16([]byte) uint16
-	Uint32([]byte) uint32
-	Uint64([]byte) uint64
-	PutUint16([]byte, uint16)
-	PutUint32([]byte, uint32)
-	PutUint64([]byte, uint64)
-	String() string
-}
-
-// LittleEndian is the little-endian implementation of ByteOrder.
-var LittleEndian littleEndian
-
-// BigEndian is the big-endian implementation of ByteOrder.
-var BigEndian bigEndian
-
-type littleEndian struct{}
-
-func (littleEndian) Uint16(b []byte) uint16 { return uint16(b[0]) | uint16(b[1])<<8 }
-
-func (littleEndian) PutUint16(b []byte, v uint16) {
-	b[0] = byte(v)
-	b[1] = byte(v >> 8)
-}
-
-func (littleEndian) Uint32(b []byte) uint32 {
-	return uint32(b[0]) | uint32(b[1])<<8 | uint32(b[2])<<16 | uint32(b[3])<<24
-}
-
-func (littleEndian) PutUint32(b []byte, v uint32) {
-	b[0] = byte(v)
-	b[1] = byte(v >> 8)
-	b[2] = byte(v >> 16)
-	b[3] = byte(v >> 24)
-}
-
-func (littleEndian) Uint64(b []byte) uint64 {
-	return uint64(b[0]) | uint64(b[1])<<8 | uint64(b[2])<<16 | uint64(b[3])<<24 |
-		uint64(b[4])<<32 | uint64(b[5])<<40 | uint64(b[6])<<48 | uint64(b[7])<<56
-}
-
-func (littleEndian) PutUint64(b []byte, v uint64) {
-	b[0] = byte(v)
-	b[1] = byte(v >> 8)
-	b[2] = byte(v >> 16)
-	b[3] = byte(v >> 24)
-	b[4] = byte(v >> 32)
-	b[5] = byte(v >> 40)
-	b[6] = byte(v >> 48)
-	b[7] = byte(v >> 56)
-}
-
-func (littleEndian) String() string { return "LittleEndian" }
-
-func (littleEndian) GoString() string { return "binary.LittleEndian" }
-
-type bigEndian struct{}
-
-func (bigEndian) Uint16(b []byte) uint16 { return uint16(b[1]) | uint16(b[0])<<8 }
-
-func (bigEndian) PutUint16(b []byte, v uint16) {
-	b[0] = byte(v >> 8)
-	b[1] = byte(v)
-}
-
-func (bigEndian) Uint32(b []byte) uint32 {
-	return uint32(b[3]) | uint32(b[2])<<8 | uint32(b[1])<<16 | uint32(b[0])<<24
-}
-
-func (bigEndian) PutUint32(b []byte, v uint32) {
-	b[0] = byte(v >> 24)
-	b[1] = byte(v >> 16)
-	b[2] = byte(v >> 8)
-	b[3] = byte(v)
-}
-
-func (bigEndian) Uint64(b []byte) uint64 {
-	return uint64(b[7]) | uint64(b[6])<<8 | uint64(b[5])<<16 | uint64(b[4])<<24 |
-		uint64(b[3])<<32 | uint64(b[2])<<40 | uint64(b[1])<<48 | uint64(b[0])<<56
-}
-
-func (bigEndian) PutUint64(b []byte, v uint64) {
-	b[0] = byte(v >> 56)
-	b[1] = byte(v >> 48)
-	b[2] = byte(v >> 40)
-	b[3] = byte(v >> 32)
-	b[4] = byte(v >> 24)
-	b[5] = byte(v >> 16)
-	b[6] = byte(v >> 8)
-	b[7] = byte(v)
-}
-
-func (bigEndian) String() string { return "BigEndian" }
-
-func (bigEndian) GoString() string { return "binary.BigEndian" }
-
-// Read reads structured binary data from r into data.
-// Data must be a pointer to a fixed-size value or a slice
-// of fixed-size values.
-// Bytes read from r are decoded using the specified byte order
-// and written to successive fields of the data.
-// When reading into structs, the field data for fields with
-// blank (_) field names is skipped; i.e., blank field names
-// may be used for padding.
-// When reading into a struct, all non-blank fields must be exported.
-func Read(r io.Reader, order ByteOrder, data interface{}) error {
-	// Fast path for basic types and slices.
-	if n := intDataSize(data); n != 0 {
-		var b [8]byte
-		var bs []byte
-		if n > len(b) {
-			bs = make([]byte, n)
-		} else {
-			bs = b[:n]
-		}
-		if _, err := io.ReadFull(r, bs); err != nil {
-			return err
-		}
-		switch data := data.(type) {
-		case *int8:
-			*data = int8(b[0])
-		case *uint8:
-			*data = b[0]
-		case *int16:
-			*data = int16(order.Uint16(bs))
-		case *uint16:
-			*data = order.Uint16(bs)
-		case *int32:
-			*data = int32(order.Uint32(bs))
-		case *uint32:
-			*data = order.Uint32(bs)
-		case *int64:
-			*data = int64(order.Uint64(bs))
-		case *uint64:
-			*data = order.Uint64(bs)
-		case []int8:
-			for i, x := range bs { // Easier to loop over the input for 8-bit values.
-				data[i] = int8(x)
-			}
-		case []uint8:
-			copy(data, bs)
-		case []int16:
-			for i := range data {
-				data[i] = int16(order.Uint16(bs[2*i:]))
-			}
-		case []uint16:
-			for i := range data {
-				data[i] = order.Uint16(bs[2*i:])
-			}
-		case []int32:
-			for i := range data {
-				data[i] = int32(order.Uint32(bs[4*i:]))
-			}
-		case []uint32:
-			for i := range data {
-				data[i] = order.Uint32(bs[4*i:])
-			}
-		case []int64:
-			for i := range data {
-				data[i] = int64(order.Uint64(bs[8*i:]))
-			}
-		case []uint64:
-			for i := range data {
-				data[i] = order.Uint64(bs[8*i:])
-			}
-		}
-		return nil
-	}
-
-	// Fallback to reflect-based decoding.
-	v := reflect.ValueOf(data)
-	size := -1
-	switch v.Kind() {
-	case reflect.Ptr:
-		v = v.Elem()
-		size = dataSize(v)
-	case reflect.Slice:
-		size = dataSize(v)
-	}
-	if size < 0 {
-		return errors.New("binary.Read: invalid type " + reflect.TypeOf(data).String())
-	}
-	d := &decoder{order: order, buf: make([]byte, size)}
-	if _, err := io.ReadFull(r, d.buf); err != nil {
-		return err
-	}
-	d.value(v)
-	return nil
-}
-
-// Write writes the binary representation of data into w.
-// Data must be a fixed-size value or a slice of fixed-size
-// values, or a pointer to such data.
-// Bytes written to w are encoded using the specified byte order
-// and read from successive fields of the data.
-// When writing structs, zero values are written for fields
-// with blank (_) field names.
-func Write(w io.Writer, order ByteOrder, data interface{}) error {
-	// Fast path for basic types and slices.
-	if n := intDataSize(data); n != 0 {
-		var b [8]byte
-		var bs []byte
-		if n > len(b) {
-			bs = make([]byte, n)
-		} else {
-			bs = b[:n]
-		}
-		switch v := data.(type) {
-		case *int8:
-			bs = b[:1]
-			b[0] = byte(*v)
-		case int8:
-			bs = b[:1]
-			b[0] = byte(v)
-		case []int8:
-			for i, x := range v {
-				bs[i] = byte(x)
-			}
-		case *uint8:
-			bs = b[:1]
-			b[0] = *v
-		case uint8:
-			bs = b[:1]
-			b[0] = byte(v)
-		case []uint8:
-			bs = v
-		case *int16:
-			bs = b[:2]
-			order.PutUint16(bs, uint16(*v))
-		case int16:
-			bs = b[:2]
-			order.PutUint16(bs, uint16(v))
-		case []int16:
-			for i, x := range v {
-				order.PutUint16(bs[2*i:], uint16(x))
-			}
-		case *uint16:
-			bs = b[:2]
-			order.PutUint16(bs, *v)
-		case uint16:
-			bs = b[:2]
-			order.PutUint16(bs, v)
-		case []uint16:
-			for i, x := range v {
-				order.PutUint16(bs[2*i:], x)
-			}
-		case *int32:
-			bs = b[:4]
-			order.PutUint32(bs, uint32(*v))
-		case int32:
-			bs = b[:4]
-			order.PutUint32(bs, uint32(v))
-		case []int32:
-			for i, x := range v {
-				order.PutUint32(bs[4*i:], uint32(x))
-			}
-		case *uint32:
-			bs = b[:4]
-			order.PutUint32(bs, *v)
-		case uint32:
-			bs = b[:4]
-			order.PutUint32(bs, v)
-		case []uint32:
-			for i, x := range v {
-				order.PutUint32(bs[4*i:], x)
-			}
-		case *int64:
-			bs = b[:8]
-			order.PutUint64(bs, uint64(*v))
-		case int64:
-			bs = b[:8]
-			order.PutUint64(bs, uint64(v))
-		case []int64:
-			for i, x := range v {
-				order.PutUint64(bs[8*i:], uint64(x))
-			}
-		case *uint64:
-			bs = b[:8]
-			order.PutUint64(bs, *v)
-		case uint64:
-			bs = b[:8]
-			order.PutUint64(bs, v)
-		case []uint64:
-			for i, x := range v {
-				order.PutUint64(bs[8*i:], x)
-			}
-		}
-		_, err := w.Write(bs)
-		return err
-	}
-
-	// Fallback to reflect-based encoding.
-	v := reflect.Indirect(reflect.ValueOf(data))
-	size := dataSize(v)
-	if size < 0 {
-		return errors.New("binary.Write: invalid type " + reflect.TypeOf(data).String())
-	}
-	buf := make([]byte, size)
-	e := &encoder{order: order, buf: buf}
-	e.value(v)
-	_, err := w.Write(buf)
-	return err
-}
-
-// Size returns how many bytes Write would generate to encode the value v, which
-// must be a fixed-size value or a slice of fixed-size values, or a pointer to such data.
-// If v is neither of these, Size returns -1.
-func Size(v interface{}) int {
-	return dataSize(reflect.Indirect(reflect.ValueOf(v)))
-}
-
-// dataSize returns the number of bytes the actual data represented by v occupies in memory.
-// For compound structures, it sums the sizes of the elements. Thus, for instance, for a slice
-// it returns the length of the slice times the element size and does not count the memory
-// occupied by the header. If the type of v is not acceptable, dataSize returns -1.
-func dataSize(v reflect.Value) int {
-	if v.Kind() == reflect.Slice {
-		if s := sizeof(v.Type().Elem()); s >= 0 {
-			return s * v.Len()
-		}
-		return -1
-	}
-	return sizeof(v.Type())
-}
-
-// sizeof returns the size >= 0 of variables for the given type or -1 if the type is not acceptable.
-func sizeof(t reflect.Type) int {
-	switch t.Kind() {
-	case reflect.Array:
-		if s := sizeof(t.Elem()); s >= 0 {
-			return s * t.Len()
-		}
-
-	case reflect.Struct:
-		sum := 0
-		for i, n := 0, t.NumField(); i < n; i++ {
-			s := sizeof(t.Field(i).Type)
-			if s < 0 {
-				return -1
-			}
-			sum += s
-		}
-		return sum
-
-	case reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64,
-		reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64,
-		reflect.Float32, reflect.Float64, reflect.Complex64, reflect.Complex128, reflect.Ptr:
-		return int(t.Size())
-	}
-
-	return -1
-}
-
-type coder struct {
-	order ByteOrder
-	buf   []byte
-}
-
-type decoder coder
-type encoder coder
-
-func (d *decoder) uint8() uint8 {
-	x := d.buf[0]
-	d.buf = d.buf[1:]
-	return x
-}
-
-func (e *encoder) uint8(x uint8) {
-	e.buf[0] = x
-	e.buf = e.buf[1:]
-}
-
-func (d *decoder) uint16() uint16 {
-	x := d.order.Uint16(d.buf[0:2])
-	d.buf = d.buf[2:]
-	return x
-}
-
-func (e *encoder) uint16(x uint16) {
-	e.order.PutUint16(e.buf[0:2], x)
-	e.buf = e.buf[2:]
-}
-
-func (d *decoder) uint32() uint32 {
-	x := d.order.Uint32(d.buf[0:4])
-	d.buf = d.buf[4:]
-	return x
-}
-
-func (e *encoder) uint32(x uint32) {
-	e.order.PutUint32(e.buf[0:4], x)
-	e.buf = e.buf[4:]
-}
-
-func (d *decoder) uint64() uint64 {
-	x := d.order.Uint64(d.buf[0:8])
-	d.buf = d.buf[8:]
-	return x
-}
-
-func (e *encoder) uint64(x uint64) {
-	e.order.PutUint64(e.buf[0:8], x)
-	e.buf = e.buf[8:]
-}
-
-func (d *decoder) int8() int8 { return int8(d.uint8()) }
-
-func (e *encoder) int8(x int8) { e.uint8(uint8(x)) }
-
-func (d *decoder) int16() int16 { return int16(d.uint16()) }
-
-func (e *encoder) int16(x int16) { e.uint16(uint16(x)) }
-
-func (d *decoder) int32() int32 { return int32(d.uint32()) }
-
-func (e *encoder) int32(x int32) { e.uint32(uint32(x)) }
-
-func (d *decoder) int64() int64 { return int64(d.uint64()) }
-
-func (e *encoder) int64(x int64) { e.uint64(uint64(x)) }
-
-func (d *decoder) value(v reflect.Value) {
-	switch v.Kind() {
-	case reflect.Array:
-		l := v.Len()
-		for i := 0; i < l; i++ {
-			d.value(v.Index(i))
-		}
-
-	case reflect.Struct:
-		t := v.Type()
-		l := v.NumField()
-		for i := 0; i < l; i++ {
-			// Note: Calling v.CanSet() below is an optimization.
-			// It would be sufficient to check the field name,
-			// but creating the StructField info for each field is
-			// costly (run "go test -bench=ReadStruct" and compare
-			// results when making changes to this code).
-			if v := v.Field(i); v.CanSet() || t.Field(i).Name != "_" {
-				d.value(v)
-			} else {
-				d.skip(v)
-			}
-		}
-
-	case reflect.Slice:
-		l := v.Len()
-		for i := 0; i < l; i++ {
-			d.value(v.Index(i))
-		}
-
-	case reflect.Int8:
-		v.SetInt(int64(d.int8()))
-	case reflect.Int16:
-		v.SetInt(int64(d.int16()))
-	case reflect.Int32:
-		v.SetInt(int64(d.int32()))
-	case reflect.Int64:
-		v.SetInt(d.int64())
-
-	case reflect.Uint8:
-		v.SetUint(uint64(d.uint8()))
-	case reflect.Uint16:
-		v.SetUint(uint64(d.uint16()))
-	case reflect.Uint32:
-		v.SetUint(uint64(d.uint32()))
-	case reflect.Uint64:
-		v.SetUint(d.uint64())
-
-	case reflect.Float32:
-		v.SetFloat(float64(math.Float32frombits(d.uint32())))
-	case reflect.Float64:
-		v.SetFloat(math.Float64frombits(d.uint64()))
-
-	case reflect.Complex64:
-		v.SetComplex(complex(
-			float64(math.Float32frombits(d.uint32())),
-			float64(math.Float32frombits(d.uint32())),
-		))
-	case reflect.Complex128:
-		v.SetComplex(complex(
-			math.Float64frombits(d.uint64()),
-			math.Float64frombits(d.uint64()),
-		))
-	}
-}
-
-func (e *encoder) value(v reflect.Value) {
-	switch v.Kind() {
-	case reflect.Array:
-		l := v.Len()
-		for i := 0; i < l; i++ {
-			e.value(v.Index(i))
-		}
-
-	case reflect.Struct:
-		t := v.Type()
-		l := v.NumField()
-		for i := 0; i < l; i++ {
-			// see comment for corresponding code in decoder.value()
-			if v := v.Field(i); v.CanSet() || t.Field(i).Name != "_" {
-				e.value(v)
-			} else {
-				e.skip(v)
-			}
-		}
-
-	case reflect.Slice:
-		l := v.Len()
-		for i := 0; i < l; i++ {
-			e.value(v.Index(i))
-		}
-
-	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
-		switch v.Type().Kind() {
-		case reflect.Int8:
-			e.int8(int8(v.Int()))
-		case reflect.Int16:
-			e.int16(int16(v.Int()))
-		case reflect.Int32:
-			e.int32(int32(v.Int()))
-		case reflect.Int64:
-			e.int64(v.Int())
-		}
-
-	case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uintptr:
-		switch v.Type().Kind() {
-		case reflect.Uint8:
-			e.uint8(uint8(v.Uint()))
-		case reflect.Uint16:
-			e.uint16(uint16(v.Uint()))
-		case reflect.Uint32:
-			e.uint32(uint32(v.Uint()))
-		case reflect.Uint64:
-			e.uint64(v.Uint())
-		}
-
-	case reflect.Float32, reflect.Float64:
-		switch v.Type().Kind() {
-		case reflect.Float32:
-			e.uint32(math.Float32bits(float32(v.Float())))
-		case reflect.Float64:
-			e.uint64(math.Float64bits(v.Float()))
-		}
-
-	case reflect.Complex64, reflect.Complex128:
-		switch v.Type().Kind() {
-		case reflect.Complex64:
-			x := v.Complex()
-			e.uint32(math.Float32bits(float32(real(x))))
-			e.uint32(math.Float32bits(float32(imag(x))))
-		case reflect.Complex128:
-			x := v.Complex()
-			e.uint64(math.Float64bits(real(x)))
-			e.uint64(math.Float64bits(imag(x)))
-		}
-	}
-}
-
-func (d *decoder) skip(v reflect.Value) {
-	d.buf = d.buf[dataSize(v):]
-}
-
-func (e *encoder) skip(v reflect.Value) {
-	n := dataSize(v)
-	for i := range e.buf[0:n] {
-		e.buf[i] = 0
-	}
-	e.buf = e.buf[n:]
-}
-
-// intDataSize returns the size of the data required to represent the data when encoded.
-// It returns zero if the type cannot be implemented by the fast path in Read or Write.
-func intDataSize(data interface{}) int {
-	switch data := data.(type) {
-	case int8, *int8, *uint8:
-		return 1
-	case []int8:
-		return len(data)
-	case []uint8:
-		return len(data)
-	case int16, *int16, *uint16:
-		return 2
-	case []int16:
-		return 2 * len(data)
-	case []uint16:
-		return 2 * len(data)
-	case int32, *int32, *uint32:
-		return 4
-	case []int32:
-		return 4 * len(data)
-	case []uint32:
-		return 4 * len(data)
-	case int64, *int64, *uint64:
-		return 8
-	case []int64:
-		return 8 * len(data)
-	case []uint64:
-		return 8 * len(data)
-	}
-	return 0
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/disk/disk.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/disk/disk.go
deleted file mode 100644
index 0aa26cd1b..000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/disk/disk.go
+++ /dev/null
@@ -1,52 +0,0 @@
-package disk
-
-import (
-	"encoding/json"
-)
-
-type DiskUsageStat struct {
-	Path              string  `json:"path"`
-	Fstype            string  `json:"fstype"`
-	Total             uint64  `json:"total"`
-	Free              uint64  `json:"free"`
-	Used              uint64  `json:"used"`
-	UsedPercent       float64 `json:"used_percent"`
-	InodesTotal       uint64  `json:"inodes_total"`
-	InodesUsed        uint64  `json:"inodes_used"`
-	InodesFree        uint64  `json:"inodes_free"`
-	InodesUsedPercent float64 `json:"inodes_used_percent"`
-}
-
-type DiskPartitionStat struct {
-	Device     string `json:"device"`
-	Mountpoint string `json:"mountpoint"`
-	Fstype     string `json:"fstype"`
-	Opts       string `json:"opts"`
-}
-
-type DiskIOCountersStat struct {
-	ReadCount    uint64 `json:"read_count"`
-	WriteCount   uint64 `json:"write_count"`
-	ReadBytes    uint64 `json:"read_bytes"`
-	WriteBytes   uint64 `json:"write_bytes"`
-	ReadTime     uint64 `json:"read_time"`
-	WriteTime    uint64 `json:"write_time"`
-	Name         string `json:"name"`
-	IoTime       uint64 `json:"io_time"`
-	SerialNumber string `json:"serial_number"`
-}
-
-func (d DiskUsageStat) String() string {
-	s, _ := json.Marshal(d)
-	return string(s)
-}
-
-func (d DiskPartitionStat) String() string {
-	s, _ := json.Marshal(d)
-	return string(s)
-}
-
-func (d DiskIOCountersStat) String() string {
-	s, _ := json.Marshal(d)
-	return string(s)
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/disk/disk_darwin.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/disk/disk_darwin.go
deleted file mode 100644
index fbf97c610..000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/disk/disk_darwin.go
+++ /dev/null
@@ -1,104 +0,0 @@
-// +build darwin
-
-package disk
-
-import (
-	"syscall"
-	"unsafe"
-
-	"github.com/shirou/gopsutil/internal/common"
-)
-
-func DiskPartitions(all bool) ([]DiskPartitionStat, error) {
-	var ret []DiskPartitionStat
-
-	count, err := Getfsstat(nil, MntWait)
-	if err != nil {
-		return ret, err
-	}
-	fs := make([]Statfs_t, count)
-	_, err = Getfsstat(fs, MntWait)
-	for _, stat := range fs {
-		opts := "rw"
-		if stat.Flags&MntReadOnly != 0 {
-			opts = "ro"
-		}
-		if stat.Flags&MntSynchronous != 0 {
-			opts += ",sync"
-		}
-		if stat.Flags&MntNoExec != 0 {
-			opts += ",noexec"
-		}
-		if stat.Flags&MntNoSuid != 0 {
-			opts += ",nosuid"
-		}
-		if stat.Flags&MntUnion != 0 {
-			opts += ",union"
-		}
-		if stat.Flags&MntAsync != 0 {
-			opts += ",async"
-		}
-		if stat.Flags&MntSuidDir != 0 {
-			opts += ",suiddir"
-		}
-		if stat.Flags&MntSoftDep != 0 {
-			opts += ",softdep"
-		}
-		if stat.Flags&MntNoSymFollow != 0 {
-			opts += ",nosymfollow"
-		}
-		if stat.Flags&MntGEOMJournal != 0 {
-			opts += ",gjounalc"
-		}
-		if stat.Flags&MntMultilabel != 0 {
-			opts += ",multilabel"
-		}
-		if stat.Flags&MntACLs != 0 {
-			opts += ",acls"
-		}
-		if stat.Flags&MntNoATime != 0 {
-			opts += ",noattime"
-		}
-		if stat.Flags&MntClusterRead != 0 {
-			opts += ",nocluster"
-		}
-		if stat.Flags&MntClusterWrite != 0 {
-			opts += ",noclusterw"
-		}
-		if stat.Flags&MntNFS4ACLs != 0 {
-			opts += ",nfs4acls"
-		}
-		d := DiskPartitionStat{
-			Device:     common.IntToString(stat.Mntfromname[:]),
-			Mountpoint: common.IntToString(stat.Mntonname[:]),
-			Fstype:     common.IntToString(stat.Fstypename[:]),
-			Opts:       opts,
-		}
-		ret = append(ret, d)
-	}
-
-	return ret, nil
-}
-
-func DiskIOCounters() (map[string]DiskIOCountersStat, error) {
-	return nil, common.NotImplementedError
-}
-
-func Getfsstat(buf []Statfs_t, flags int) (n int, err error) {
-	var _p0 unsafe.Pointer
-	var bufsize uintptr
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-		bufsize = unsafe.Sizeof(Statfs_t{}) * uintptr(len(buf))
-	}
-	r0, _, e1 := syscall.Syscall(SYS_GETFSSTAT64, uintptr(_p0), bufsize, uintptr(flags))
-	n = int(r0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func getFsType(stat syscall.Statfs_t) string {
-	return common.IntToString(stat.Fstypename[:])
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/disk/disk_darwin_amd64.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/disk/disk_darwin_amd64.go
deleted file mode 100644
index f58e21312..000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/disk/disk_darwin_amd64.go
+++ /dev/null
@@ -1,58 +0,0 @@
-// +build darwin
-// +build amd64
-
-package disk
-
-const (
-	MntWait    = 1
-	MfsNameLen = 15 /* length of fs type name, not inc. nul */
-	MNameLen   = 90 /* length of buffer for returned name */
-
-	MFSTYPENAMELEN = 16 /* length of fs type name including null */
-	MAXPATHLEN     = 1024
-	MNAMELEN       = MAXPATHLEN
-
-	SYS_GETFSSTAT64 = 347
-)
-
-type Fsid struct{ val [2]int32 } /* file system id type */
-type uid_t int32
-
-// sys/mount.h
-const (
-	MntReadOnly     = 0x00000001 /* read only filesystem */
-	MntSynchronous  = 0x00000002 /* filesystem written synchronously */
-	MntNoExec       = 0x00000004 /* can't exec from filesystem */
-	MntNoSuid       = 0x00000008 /* don't honor setuid bits on fs */
-	MntUnion        = 0x00000020 /* union with underlying filesystem */
-	MntAsync        = 0x00000040 /* filesystem written asynchronously */
-	MntSuidDir      = 0x00100000 /* special handling of SUID on dirs */
-	MntSoftDep      = 0x00200000 /* soft updates being done */
-	MntNoSymFollow  = 0x00400000 /* do not follow symlinks */
-	MntGEOMJournal  = 0x02000000 /* GEOM journal support enabled */
-	MntMultilabel   = 0x04000000 /* MAC support for individual objects */
-	MntACLs         = 0x08000000 /* ACL support enabled */
-	MntNoATime      = 0x10000000 /* disable update of file access time */
-	MntClusterRead  = 0x40000000 /* disable cluster read */
-	MntClusterWrite = 0x80000000 /* disable cluster write */
-	MntNFS4ACLs     = 0x00000010
-)
-
-type Statfs_t struct {
-	Bsize       uint32
-	Iosize      int32
-	Blocks      uint64
-	Bfree       uint64
-	Bavail      uint64
-	Files       uint64
-	Ffree       uint64
-	Fsid        Fsid
-	Owner       uint32
-	Type        uint32
-	Flags       uint32
-	Fssubtype   uint32
-	Fstypename  [16]int8
-	Mntonname   [1024]int8
-	Mntfromname [1024]int8
-	Reserved    [8]uint32
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/disk/disk_freebsd.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/disk/disk_freebsd.go
deleted file mode 100644
index 7e32c4b63..000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/disk/disk_freebsd.go
+++ /dev/null
@@ -1,179 +0,0 @@
-// +build freebsd
-
-package disk
-
-import (
-	"bytes"
-	"encoding/binary"
-	"strconv"
-	"syscall"
-	"unsafe"
-
-	"github.com/shirou/gopsutil/internal/common"
-)
-
-const (
-	CTLKern = 1
-	//	KernDevstat    = 773 // for freebsd 8.4
-	//	KernDevstatAll = 772 // for freebsd 8.4
-	KernDevstat    = 974
-	KernDevstatAll = 975
-)
-
-func DiskPartitions(all bool) ([]DiskPartitionStat, error) {
-	var ret []DiskPartitionStat
-
-	// get length
-	count, err := syscall.Getfsstat(nil, MNT_WAIT)
-	if err != nil {
-		return ret, err
-	}
-
-	fs := make([]Statfs, count)
-	_, err = Getfsstat(fs, MNT_WAIT)
-
-	for _, stat := range fs {
-		opts := "rw"
-		if stat.Flags&MNT_RDONLY != 0 {
-			opts = "ro"
-		}
-		if stat.Flags&MNT_SYNCHRONOUS != 0 {
-			opts += ",sync"
-		}
-		if stat.Flags&MNT_NOEXEC != 0 {
-			opts += ",noexec"
-		}
-		if stat.Flags&MNT_NOSUID != 0 {
-			opts += ",nosuid"
-		}
-		if stat.Flags&MNT_UNION != 0 {
-			opts += ",union"
-		}
-		if stat.Flags&MNT_ASYNC != 0 {
-			opts += ",async"
-		}
-		if stat.Flags&MNT_SUIDDIR != 0 {
-			opts += ",suiddir"
-		}
-		if stat.Flags&MNT_SOFTDEP != 0 {
-			opts += ",softdep"
-		}
-		if stat.Flags&MNT_NOSYMFOLLOW != 0 {
-			opts += ",nosymfollow"
-		}
-		if stat.Flags&MNT_GJOURNAL != 0 {
-			opts += ",gjounalc"
-		}
-		if stat.Flags&MNT_MULTILABEL != 0 {
-			opts += ",multilabel"
-		}
-		if stat.Flags&MNT_ACLS != 0 {
-			opts += ",acls"
-		}
-		if stat.Flags&MNT_NOATIME != 0 {
-			opts += ",noattime"
-		}
-		if stat.Flags&MNT_NOCLUSTERR != 0 {
-			opts += ",nocluster"
-		}
-		if stat.Flags&MNT_NOCLUSTERW != 0 {
-			opts += ",noclusterw"
-		}
-		if stat.Flags&MNT_NFS4ACLS != 0 {
-			opts += ",nfs4acls"
-		}
-
-		d := DiskPartitionStat{
-			Device:     common.IntToString(stat.Mntfromname[:]),
-			Mountpoint: common.IntToString(stat.Mntonname[:]),
-			Fstype:     common.IntToString(stat.Fstypename[:]),
-			Opts:       opts,
-		}
-		ret = append(ret, d)
-	}
-
-	return ret, nil
-}
-
-func DiskIOCounters() (map[string]DiskIOCountersStat, error) {
-	// statinfo->devinfo->devstat
-	// /usr/include/devinfo.h
-
-	//	sysctl.sysctl ('kern.devstat.all', 0)
-	ret := make(map[string]DiskIOCountersStat)
-	mib := []int32{CTLKern, KernDevstat, KernDevstatAll}
-
-	buf, length, err := common.CallSyscall(mib)
-	if err != nil {
-		return nil, err
-	}
-
-	ds := Devstat{}
-	devstatLen := int(unsafe.Sizeof(ds))
-	count := int(length / uint64(devstatLen))
-
-	buf = buf[8:] // devstat.all has version in the head.
-	// parse buf to Devstat
-	for i := 0; i < count; i++ {
-		b := buf[i*devstatLen : i*devstatLen+devstatLen]
-		d, err := parseDevstat(b)
-		if err != nil {
-			continue
-		}
-		un := strconv.Itoa(int(d.Unit_number))
-		name := common.IntToString(d.Device_name[:]) + un
-
-		ds := DiskIOCountersStat{
-			ReadCount:  d.Operations[DEVSTAT_READ],
-			WriteCount: d.Operations[DEVSTAT_WRITE],
-			ReadBytes:  d.Bytes[DEVSTAT_READ],
-			WriteBytes: d.Bytes[DEVSTAT_WRITE],
-			ReadTime:   d.Duration[DEVSTAT_READ].Compute(),
-			WriteTime:  d.Duration[DEVSTAT_WRITE].Compute(),
-			Name:       name,
-		}
-		ret[name] = ds
-	}
-
-	return ret, nil
-}
-
-func (b Bintime) Compute() uint64 {
-	BINTIME_SCALE := 5.42101086242752217003726400434970855712890625e-20
-	return uint64(b.Sec) + b.Frac*uint64(BINTIME_SCALE)
-}
-
-// BT2LD(time)     ((long double)(time).sec + (time).frac * BINTIME_SCALE)
-
-// Getfsstat is borrowed from pkg/syscall/syscall_freebsd.go
-// change Statfs_t to Statfs in order to get more information
-func Getfsstat(buf []Statfs, flags int) (n int, err error) {
-	var _p0 unsafe.Pointer
-	var bufsize uintptr
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-		bufsize = unsafe.Sizeof(Statfs{}) * uintptr(len(buf))
-	}
-	r0, _, e1 := syscall.Syscall(syscall.SYS_GETFSSTAT, uintptr(_p0), bufsize, uintptr(flags))
-	n = int(r0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func parseDevstat(buf []byte) (Devstat, error) {
-	var ds Devstat
-	br := bytes.NewReader(buf)
-	//	err := binary.Read(br, binary.LittleEndian, &ds)
-	err := Read(br, binary.LittleEndian, &ds)
-	if err != nil {
-		return ds, err
-	}
-
-	return ds, nil
-}
-
-func getFsType(stat syscall.Statfs_t) string {
-	return common.IntToString(stat.Fstypename[:])
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/disk/disk_freebsd_386.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/disk/disk_freebsd_386.go
deleted file mode 100644
index 7b6eff1be..000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/disk/disk_freebsd_386.go
+++ /dev/null
@@ -1,108 +0,0 @@
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs types_freebsd.go
-
-package disk
-
-const (
-	sizeofPtr        = 0x4
-	sizeofShort      = 0x2
-	sizeofInt        = 0x4
-	sizeofLong       = 0x4
-	sizeofLongLong   = 0x8
-	sizeofLongDouble = 0x8
-
-	DEVSTAT_NO_DATA = 0x00
-	DEVSTAT_READ    = 0x01
-	DEVSTAT_WRITE   = 0x02
-	DEVSTAT_FREE    = 0x03
-
-	MNT_RDONLY      = 0x00000001
-	MNT_SYNCHRONOUS = 0x00000002
-	MNT_NOEXEC      = 0x00000004
-	MNT_NOSUID      = 0x00000008
-	MNT_UNION       = 0x00000020
-	MNT_ASYNC       = 0x00000040
-	MNT_SUIDDIR     = 0x00100000
-	MNT_SOFTDEP     = 0x00200000
-	MNT_NOSYMFOLLOW = 0x00400000
-	MNT_GJOURNAL    = 0x02000000
-	MNT_MULTILABEL  = 0x04000000
-	MNT_ACLS        = 0x08000000
-	MNT_NOATIME     = 0x10000000
-	MNT_NOCLUSTERR  = 0x40000000
-	MNT_NOCLUSTERW  = 0x80000000
-	MNT_NFS4ACLS    = 0x00000010
-
-	MNT_WAIT    = 1
-	MNT_NOWAIT  = 2
-	MNT_LAZY    = 3
-	MNT_SUSPEND = 4
-)
-
-type (
-	_C_short       int16
-	_C_int         int32
-	_C_long        int32
-	_C_long_long   int64
-	_C_long_double int64
-)
-
-type Statfs struct {
-	Version     uint32
-	Type        uint32
-	Flags       uint64
-	Bsize       uint64
-	Iosize      uint64
-	Blocks      uint64
-	Bfree       uint64
-	Bavail      int64
-	Files       uint64
-	Ffree       int64
-	Syncwrites  uint64
-	Asyncwrites uint64
-	Syncreads   uint64
-	Asyncreads  uint64
-	Spare       [10]uint64
-	Namemax     uint32
-	Owner       uint32
-	Fsid        Fsid
-	Charspare   [80]int8
-	Fstypename  [16]int8
-	Mntfromname [88]int8
-	Mntonname   [88]int8
-}
-type Fsid struct {
-	Val [2]int32
-}
-
-type Devstat struct {
-	Sequence0     uint32
-	Allocated     int32
-	Start_count   uint32
-	End_count     uint32
-	Busy_from     Bintime
-	Dev_links     _Ctype_struct___0
-	Device_number uint32
-	Device_name   [16]int8
-	Unit_number   int32
-	Bytes         [4]uint64
-	Operations    [4]uint64
-	Duration      [4]Bintime
-	Busy_time     Bintime
-	Creation_time Bintime
-	Block_size    uint32
-	Tag_types     [3]uint64
-	Flags         uint32
-	Device_type   uint32
-	Priority      uint32
-	Id            *byte
-	Sequence1     uint32
-}
-type Bintime struct {
-	Sec  int32
-	Frac uint64
-}
-
-type _Ctype_struct___0 struct {
-	Empty uint32
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/disk/disk_freebsd_amd64.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/disk/disk_freebsd_amd64.go
deleted file mode 100644
index bbae1595c..000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/disk/disk_freebsd_amd64.go
+++ /dev/null
@@ -1,111 +0,0 @@
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs types_freebsd.go
-
-package disk
-
-const (
-	sizeofPtr        = 0x8
-	sizeofShort      = 0x2
-	sizeofInt        = 0x4
-	sizeofLong       = 0x8
-	sizeofLongLong   = 0x8
-	sizeofLongDouble = 0x8
-
-	DEVSTAT_NO_DATA = 0x00
-	DEVSTAT_READ    = 0x01
-	DEVSTAT_WRITE   = 0x02
-	DEVSTAT_FREE    = 0x03
-
-	MNT_RDONLY      = 0x00000001
-	MNT_SYNCHRONOUS = 0x00000002
-	MNT_NOEXEC      = 0x00000004
-	MNT_NOSUID      = 0x00000008
-	MNT_UNION       = 0x00000020
-	MNT_ASYNC       = 0x00000040
-	MNT_SUIDDIR     = 0x00100000
-	MNT_SOFTDEP     = 0x00200000
-	MNT_NOSYMFOLLOW = 0x00400000
-	MNT_GJOURNAL    = 0x02000000
-	MNT_MULTILABEL  = 0x04000000
-	MNT_ACLS        = 0x08000000
-	MNT_NOATIME     = 0x10000000
-	MNT_NOCLUSTERR  = 0x40000000
-	MNT_NOCLUSTERW  = 0x80000000
-	MNT_NFS4ACLS    = 0x00000010
-
-	MNT_WAIT    = 1
-	MNT_NOWAIT  = 2
-	MNT_LAZY    = 3
-	MNT_SUSPEND = 4
-)
-
-type (
-	_C_short       int16
-	_C_int         int32
-	_C_long        int64
-	_C_long_long   int64
-	_C_long_double int64
-)
-
-type Statfs struct {
-	Version     uint32
-	Type        uint32
-	Flags       uint64
-	Bsize       uint64
-	Iosize      uint64
-	Blocks      uint64
-	Bfree       uint64
-	Bavail      int64
-	Files       uint64
-	Ffree       int64
-	Syncwrites  uint64
-	Asyncwrites uint64
-	Syncreads   uint64
-	Asyncreads  uint64
-	Spare       [10]uint64
-	Namemax     uint32
-	Owner       uint32
-	Fsid        Fsid
-	Charspare   [80]int8
-	Fstypename  [16]int8
-	Mntfromname [88]int8
-	Mntonname   [88]int8
-}
-type Fsid struct {
-	Val [2]int32
-}
-
-type Devstat struct {
-	Sequence0     uint32
-	Allocated     int32
-	Start_count   uint32
-	End_count     uint32
-	Busy_from     Bintime
-	Dev_links     _Ctype_struct___0
-	Device_number uint32
-	Device_name   [16]int8
-	Unit_number   int32
-	Bytes         [4]uint64
-	Operations    [4]uint64
-	Duration      [4]Bintime
-	Busy_time     Bintime
-	Creation_time Bintime
-	Block_size    uint32
-	Pad_cgo_0     [4]byte
-	Tag_types     [3]uint64
-	Flags         uint32
-	Device_type   uint32
-	Priority      uint32
-	Pad_cgo_1     [4]byte
-	Id            *byte
-	Sequence1     uint32
-	Pad_cgo_2     [4]byte
-}
-type Bintime struct {
-	Sec  int64
-	Frac uint64
-}
-
-type _Ctype_struct___0 struct {
-	Empty uint64
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/disk/disk_linux.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/disk/disk_linux.go
deleted file mode 100644
index caa1e17f7..000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/disk/disk_linux.go
+++ /dev/null
@@ -1,327 +0,0 @@
-// +build linux
-
-package disk
-
-import (
-	"fmt"
-	"os/exec"
-	"strconv"
-	"strings"
-	"syscall"
-
-	"github.com/shirou/gopsutil/internal/common"
-)
-
-const (
-	SectorSize = 512
-)
-const (
-	// man statfs
-	ADFS_SUPER_MAGIC      = 0xadf5
-	AFFS_SUPER_MAGIC      = 0xADFF
-	BDEVFS_MAGIC          = 0x62646576
-	BEFS_SUPER_MAGIC      = 0x42465331
-	BFS_MAGIC             = 0x1BADFACE
-	BINFMTFS_MAGIC        = 0x42494e4d
-	BTRFS_SUPER_MAGIC     = 0x9123683E
-	CGROUP_SUPER_MAGIC    = 0x27e0eb
-	CIFS_MAGIC_NUMBER     = 0xFF534D42
-	CODA_SUPER_MAGIC      = 0x73757245
-	COH_SUPER_MAGIC       = 0x012FF7B7
-	CRAMFS_MAGIC          = 0x28cd3d45
-	DEBUGFS_MAGIC         = 0x64626720
-	DEVFS_SUPER_MAGIC     = 0x1373
-	DEVPTS_SUPER_MAGIC    = 0x1cd1
-	EFIVARFS_MAGIC        = 0xde5e81e4
-	EFS_SUPER_MAGIC       = 0x00414A53
-	EXT_SUPER_MAGIC       = 0x137D
-	EXT2_OLD_SUPER_MAGIC  = 0xEF51
-	EXT2_SUPER_MAGIC      = 0xEF53
-	EXT3_SUPER_MAGIC      = 0xEF53
-	EXT4_SUPER_MAGIC      = 0xEF53
-	FUSE_SUPER_MAGIC      = 0x65735546
-	FUTEXFS_SUPER_MAGIC   = 0xBAD1DEA
-	HFS_SUPER_MAGIC       = 0x4244
-	HOSTFS_SUPER_MAGIC    = 0x00c0ffee
-	HPFS_SUPER_MAGIC      = 0xF995E849
-	HUGETLBFS_MAGIC       = 0x958458f6
-	ISOFS_SUPER_MAGIC     = 0x9660
-	JFFS2_SUPER_MAGIC     = 0x72b6
-	JFS_SUPER_MAGIC       = 0x3153464a
-	MINIX_SUPER_MAGIC     = 0x137F /* orig. minix */
-	MINIX_SUPER_MAGIC2    = 0x138F /* 30 char minix */
-	MINIX2_SUPER_MAGIC    = 0x2468 /* minix V2 */
-	MINIX2_SUPER_MAGIC2   = 0x2478 /* minix V2, 30 char names */
-	MINIX3_SUPER_MAGIC    = 0x4d5a /* minix V3 fs, 60 char names */
-	MQUEUE_MAGIC          = 0x19800202
-	MSDOS_SUPER_MAGIC     = 0x4d44
-	NCP_SUPER_MAGIC       = 0x564c
-	NFS_SUPER_MAGIC       = 0x6969
-	NILFS_SUPER_MAGIC     = 0x3434
-	NTFS_SB_MAGIC         = 0x5346544e
-	OCFS2_SUPER_MAGIC     = 0x7461636f
-	OPENPROM_SUPER_MAGIC  = 0x9fa1
-	PIPEFS_MAGIC          = 0x50495045
-	PROC_SUPER_MAGIC      = 0x9fa0
-	PSTOREFS_MAGIC        = 0x6165676C
-	QNX4_SUPER_MAGIC      = 0x002f
-	QNX6_SUPER_MAGIC      = 0x68191122
-	RAMFS_MAGIC           = 0x858458f6
-	REISERFS_SUPER_MAGIC  = 0x52654973
-	ROMFS_MAGIC           = 0x7275
-	SELINUX_MAGIC         = 0xf97cff8c
-	SMACK_MAGIC           = 0x43415d53
-	SMB_SUPER_MAGIC       = 0x517B
-	SOCKFS_MAGIC          = 0x534F434B
-	SQUASHFS_MAGIC        = 0x73717368
-	SYSFS_MAGIC           = 0x62656572
-	SYSV2_SUPER_MAGIC     = 0x012FF7B6
-	SYSV4_SUPER_MAGIC     = 0x012FF7B5
-	TMPFS_MAGIC           = 0x01021994
-	UDF_SUPER_MAGIC       = 0x15013346
-	UFS_MAGIC             = 0x00011954
-	USBDEVICE_SUPER_MAGIC = 0x9fa2
-	V9FS_MAGIC            = 0x01021997
-	VXFS_SUPER_MAGIC      = 0xa501FCF5
-	XENFS_SUPER_MAGIC     = 0xabba1974
-	XENIX_SUPER_MAGIC     = 0x012FF7B4
-	XFS_SUPER_MAGIC       = 0x58465342
-	_XIAFS_SUPER_MAGIC    = 0x012FD16D
-
-	AFS_SUPER_MAGIC             = 0x5346414F
-	AUFS_SUPER_MAGIC            = 0x61756673
-	ANON_INODE_FS_SUPER_MAGIC   = 0x09041934
-	CEPH_SUPER_MAGIC            = 0x00C36400
-	ECRYPTFS_SUPER_MAGIC        = 0xF15F
-	FAT_SUPER_MAGIC             = 0x4006
-	FHGFS_SUPER_MAGIC           = 0x19830326
-	FUSEBLK_SUPER_MAGIC         = 0x65735546
-	FUSECTL_SUPER_MAGIC         = 0x65735543
-	GFS_SUPER_MAGIC             = 0x1161970
-	GPFS_SUPER_MAGIC            = 0x47504653
-	MTD_INODE_FS_SUPER_MAGIC    = 0x11307854
-	INOTIFYFS_SUPER_MAGIC       = 0x2BAD1DEA
-	ISOFS_R_WIN_SUPER_MAGIC     = 0x4004
-	ISOFS_WIN_SUPER_MAGIC       = 0x4000
-	JFFS_SUPER_MAGIC            = 0x07C0
-	KAFS_SUPER_MAGIC            = 0x6B414653
-	LUSTRE_SUPER_MAGIC          = 0x0BD00BD0
-	NFSD_SUPER_MAGIC            = 0x6E667364
-	PANFS_SUPER_MAGIC           = 0xAAD7AAEA
-	RPC_PIPEFS_SUPER_MAGIC      = 0x67596969
-	SECURITYFS_SUPER_MAGIC      = 0x73636673
-	UFS_BYTESWAPPED_SUPER_MAGIC = 0x54190100
-	VMHGFS_SUPER_MAGIC          = 0xBACBACBC
-	VZFS_SUPER_MAGIC            = 0x565A4653
-	ZFS_SUPER_MAGIC             = 0x2FC12FC1
-)
-
-// coreutils/src/stat.c
-var fsTypeMap = map[int64]string{
-	ADFS_SUPER_MAGIC:          "adfs",          /* 0xADF5 local */
-	AFFS_SUPER_MAGIC:          "affs",          /* 0xADFF local */
-	AFS_SUPER_MAGIC:           "afs",           /* 0x5346414F remote */
-	ANON_INODE_FS_SUPER_MAGIC: "anon-inode FS", /* 0x09041934 local */
-	AUFS_SUPER_MAGIC:          "aufs",          /* 0x61756673 remote */
-	//	AUTOFS_SUPER_MAGIC:          "autofs",              /* 0x0187 local */
-	BEFS_SUPER_MAGIC:            "befs",                /* 0x42465331 local */
-	BDEVFS_MAGIC:                "bdevfs",              /* 0x62646576 local */
-	BFS_MAGIC:                   "bfs",                 /* 0x1BADFACE local */
-	BINFMTFS_MAGIC:              "binfmt_misc",         /* 0x42494E4D local */
-	BTRFS_SUPER_MAGIC:           "btrfs",               /* 0x9123683E local */
-	CEPH_SUPER_MAGIC:            "ceph",                /* 0x00C36400 remote */
-	CGROUP_SUPER_MAGIC:          "cgroupfs",            /* 0x0027E0EB local */
-	CIFS_MAGIC_NUMBER:           "cifs",                /* 0xFF534D42 remote */
-	CODA_SUPER_MAGIC:            "coda",                /* 0x73757245 remote */
-	COH_SUPER_MAGIC:             "coh",                 /* 0x012FF7B7 local */
-	CRAMFS_MAGIC:                "cramfs",              /* 0x28CD3D45 local */
-	DEBUGFS_MAGIC:               "debugfs",             /* 0x64626720 local */
-	DEVFS_SUPER_MAGIC:           "devfs",               /* 0x1373 local */
-	DEVPTS_SUPER_MAGIC:          "devpts",              /* 0x1CD1 local */
-	ECRYPTFS_SUPER_MAGIC:        "ecryptfs",            /* 0xF15F local */
-	EFS_SUPER_MAGIC:             "efs",                 /* 0x00414A53 local */
-	EXT_SUPER_MAGIC:             "ext",                 /* 0x137D local */
-	EXT2_SUPER_MAGIC:            "ext2/ext3",           /* 0xEF53 local */
-	EXT2_OLD_SUPER_MAGIC:        "ext2",                /* 0xEF51 local */
-	FAT_SUPER_MAGIC:             "fat",                 /* 0x4006 local */
-	FHGFS_SUPER_MAGIC:           "fhgfs",               /* 0x19830326 remote */
-	FUSEBLK_SUPER_MAGIC:         "fuseblk",             /* 0x65735546 remote */
-	FUSECTL_SUPER_MAGIC:         "fusectl",             /* 0x65735543 remote */
-	FUTEXFS_SUPER_MAGIC:         "futexfs",             /* 0x0BAD1DEA local */
-	GFS_SUPER_MAGIC:             "gfs/gfs2",            /* 0x1161970 remote */
-	GPFS_SUPER_MAGIC:            "gpfs",                /* 0x47504653 remote */
-	HFS_SUPER_MAGIC:             "hfs",                 /* 0x4244 local */
-	HPFS_SUPER_MAGIC:            "hpfs",                /* 0xF995E849 local */
-	HUGETLBFS_MAGIC:             "hugetlbfs",           /* 0x958458F6 local */
-	MTD_INODE_FS_SUPER_MAGIC:    "inodefs",             /* 0x11307854 local */
-	INOTIFYFS_SUPER_MAGIC:       "inotifyfs",           /* 0x2BAD1DEA local */
-	ISOFS_SUPER_MAGIC:           "isofs",               /* 0x9660 local */
-	ISOFS_R_WIN_SUPER_MAGIC:     "isofs",               /* 0x4004 local */
-	ISOFS_WIN_SUPER_MAGIC:       "isofs",               /* 0x4000 local */
-	JFFS_SUPER_MAGIC:            "jffs",                /* 0x07C0 local */
-	JFFS2_SUPER_MAGIC:           "jffs2",               /* 0x72B6 local */
-	JFS_SUPER_MAGIC:             "jfs",                 /* 0x3153464A local */
-	KAFS_SUPER_MAGIC:            "k-afs",               /* 0x6B414653 remote */
-	LUSTRE_SUPER_MAGIC:          "lustre",              /* 0x0BD00BD0 remote */
-	MINIX_SUPER_MAGIC:           "minix",               /* 0x137F local */
-	MINIX_SUPER_MAGIC2:          "minix (30 char.)",    /* 0x138F local */
-	MINIX2_SUPER_MAGIC:          "minix v2",            /* 0x2468 local */
-	MINIX2_SUPER_MAGIC2:         "minix v2 (30 char.)", /* 0x2478 local */
-	MINIX3_SUPER_MAGIC:          "minix3",              /* 0x4D5A local */
-	MQUEUE_MAGIC:                "mqueue",              /* 0x19800202 local */
-	MSDOS_SUPER_MAGIC:           "msdos",               /* 0x4D44 local */
-	NCP_SUPER_MAGIC:             "novell",              /* 0x564C remote */
-	NFS_SUPER_MAGIC:             "nfs",                 /* 0x6969 remote */
-	NFSD_SUPER_MAGIC:            "nfsd",                /* 0x6E667364 remote */
-	NILFS_SUPER_MAGIC:           "nilfs",               /* 0x3434 local */
-	NTFS_SB_MAGIC:               "ntfs",                /* 0x5346544E local */
-	OPENPROM_SUPER_MAGIC:        "openprom",            /* 0x9FA1 local */
-	OCFS2_SUPER_MAGIC:           "ocfs2",               /* 0x7461636f remote */
-	PANFS_SUPER_MAGIC:           "panfs",               /* 0xAAD7AAEA remote */
-	PIPEFS_MAGIC:                "pipefs",              /* 0x50495045 remote */
-	PROC_SUPER_MAGIC:            "proc",                /* 0x9FA0 local */
-	PSTOREFS_MAGIC:              "pstorefs",            /* 0x6165676C local */
-	QNX4_SUPER_MAGIC:            "qnx4",                /* 0x002F local */
-	QNX6_SUPER_MAGIC:            "qnx6",                /* 0x68191122 local */
-	RAMFS_MAGIC:                 "ramfs",               /* 0x858458F6 local */
-	REISERFS_SUPER_MAGIC:        "reiserfs",            /* 0x52654973 local */
-	ROMFS_MAGIC:                 "romfs",               /* 0x7275 local */
-	RPC_PIPEFS_SUPER_MAGIC:      "rpc_pipefs",          /* 0x67596969 local */
-	SECURITYFS_SUPER_MAGIC:      "securityfs",          /* 0x73636673 local */
-	SELINUX_MAGIC:               "selinux",             /* 0xF97CFF8C local */
-	SMB_SUPER_MAGIC:             "smb",                 /* 0x517B remote */
-	SOCKFS_MAGIC:                "sockfs",              /* 0x534F434B local */
-	SQUASHFS_MAGIC:              "squashfs",            /* 0x73717368 local */
-	SYSFS_MAGIC:                 "sysfs",               /* 0x62656572 local */
-	SYSV2_SUPER_MAGIC:           "sysv2",               /* 0x012FF7B6 local */
-	SYSV4_SUPER_MAGIC:           "sysv4",               /* 0x012FF7B5 local */
-	TMPFS_MAGIC:                 "tmpfs",               /* 0x01021994 local */
-	UDF_SUPER_MAGIC:             "udf",                 /* 0x15013346 local */
-	UFS_MAGIC:                   "ufs",                 /* 0x00011954 local */
-	UFS_BYTESWAPPED_SUPER_MAGIC: "ufs",                 /* 0x54190100 local */
-	USBDEVICE_SUPER_MAGIC:       "usbdevfs",            /* 0x9FA2 local */
-	V9FS_MAGIC:                  "v9fs",                /* 0x01021997 local */
-	VMHGFS_SUPER_MAGIC:          "vmhgfs",              /* 0xBACBACBC remote */
-	VXFS_SUPER_MAGIC:            "vxfs",                /* 0xA501FCF5 local */
-	VZFS_SUPER_MAGIC:            "vzfs",                /* 0x565A4653 local */
-	XENFS_SUPER_MAGIC:           "xenfs",               /* 0xABBA1974 local */
-	XENIX_SUPER_MAGIC:           "xenix",               /* 0x012FF7B4 local */
-	XFS_SUPER_MAGIC:             "xfs",                 /* 0x58465342 local */
-	_XIAFS_SUPER_MAGIC:          "xia",                 /* 0x012FD16D local */
-	ZFS_SUPER_MAGIC:             "zfs",                 /* 0x2FC12FC1 local */
-}
-
-// Get disk partitions.
-// should use setmntent(3) but this implement use /etc/mtab file
-func DiskPartitions(all bool) ([]DiskPartitionStat, error) {
-
-	filename := "/etc/mtab"
-	lines, err := common.ReadLines(filename)
-	if err != nil {
-		return nil, err
-	}
-
-	ret := make([]DiskPartitionStat, 0, len(lines))
-
-	for _, line := range lines {
-		fields := strings.Fields(line)
-		d := DiskPartitionStat{
-			Device:     fields[0],
-			Mountpoint: fields[1],
-			Fstype:     fields[2],
-			Opts:       fields[3],
-		}
-		ret = append(ret, d)
-	}
-
-	return ret, nil
-}
-
-func DiskIOCounters() (map[string]DiskIOCountersStat, error) {
-	filename := common.HostProc("diskstats")
-	lines, err := common.ReadLines(filename)
-	if err != nil {
-		return nil, err
-	}
-	ret := make(map[string]DiskIOCountersStat, 0)
-	empty := DiskIOCountersStat{}
-
-	for _, line := range lines {
-		fields := strings.Fields(line)
-		name := fields[2]
-		reads, err := strconv.ParseUint((fields[3]), 10, 64)
-		if err != nil {
-			return ret, err
-		}
-		rbytes, err := strconv.ParseUint((fields[5]), 10, 64)
-		if err != nil {
-			return ret, err
-		}
-		rtime, err := strconv.ParseUint((fields[6]), 10, 64)
-		if err != nil {
-			return ret, err
-		}
-		writes, err := strconv.ParseUint((fields[7]), 10, 64)
-		if err != nil {
-			return ret, err
-		}
-		wbytes, err := strconv.ParseUint((fields[9]), 10, 64)
-		if err != nil {
-			return ret, err
-		}
-		wtime, err := strconv.ParseUint((fields[10]), 10, 64)
-		if err != nil {
-			return ret, err
-		}
-		iotime, err := strconv.ParseUint((fields[12]), 10, 64)
-		if err != nil {
-			return ret, err
-		}
-		d := DiskIOCountersStat{
-			ReadBytes:  rbytes * SectorSize,
-			WriteBytes: wbytes * SectorSize,
-			ReadCount:  reads,
-			WriteCount: writes,
-			ReadTime:   rtime,
-			WriteTime:  wtime,
-			IoTime:     iotime,
-		}
-		if d == empty {
-			continue
-		}
-		d.Name = name
-
-		d.SerialNumber = GetDiskSerialNumber(name)
-		ret[name] = d
-	}
-	return ret, nil
-}
-
-func GetDiskSerialNumber(name string) string {
-	n := fmt.Sprintf("--name=%s", name)
-	out, err := exec.Command("/sbin/udevadm", "info", "--query=property", n).Output()
-
-	// does not return error, just an empty string
-	if err != nil {
-		return ""
-	}
-	lines := strings.Split(string(out), "\n")
-	for _, line := range lines {
-		values := strings.Split(line, "=")
-		if len(values) < 2 || values[0] != "ID_SERIAL" {
-			// only get ID_SERIAL, not ID_SERIAL_SHORT
-			continue
-		}
-		return values[1]
-	}
-	return ""
-}
-
-func getFsType(stat syscall.Statfs_t) string {
-	t := int64(stat.Type)
-	ret, ok := fsTypeMap[t]
-	if !ok {
-		return ""
-	}
-	return ret
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/disk/disk_test.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/disk/disk_test.go
deleted file mode 100644
index 70eb675f4..000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/disk/disk_test.go
+++ /dev/null
@@ -1,97 +0,0 @@
-package disk
-
-import (
-	"fmt"
-	"runtime"
-	"testing"
-)
-
-func TestDisk_usage(t *testing.T) {
-	path := "/"
-	if runtime.GOOS == "windows" {
-		path = "C:"
-	}
-	v, err := DiskUsage(path)
-	if err != nil {
-		t.Errorf("error %v", err)
-	}
-	if v.Path != path {
-		t.Errorf("error %v", err)
-	}
-}
-
-func TestDisk_partitions(t *testing.T) {
-	ret, err := DiskPartitions(false)
-	if err != nil || len(ret) == 0 {
-		t.Errorf("error %v", err)
-	}
-	empty := DiskPartitionStat{}
-	for _, disk := range ret {
-		if disk == empty {
-			t.Errorf("Could not get device info %v", disk)
-		}
-	}
-}
-
-func TestDisk_io_counters(t *testing.T) {
-	ret, err := DiskIOCounters()
-	if err != nil {
-		t.Errorf("error %v", err)
-	}
-	if len(ret) == 0 {
-		t.Errorf("ret is empty, %v", ret)
-	}
-	empty := DiskIOCountersStat{}
-	for part, io := range ret {
-		if io == empty {
-			t.Errorf("io_counter error %v, %v", part, io)
-		}
-	}
-}
-
-func TestDiskUsageStat_String(t *testing.T) {
-	v := DiskUsageStat{
-		Path:              "/",
-		Total:             1000,
-		Free:              2000,
-		Used:              3000,
-		UsedPercent:       50.1,
-		InodesTotal:       4000,
-		InodesUsed:        5000,
-		InodesFree:        6000,
-		InodesUsedPercent: 49.1,
-		Fstype:            "ext4",
-	}
-	e := `{"path":"/","fstype":"ext4","total":1000,"free":2000,"used":3000,"used_percent":50.1,"inodes_total":4000,"inodes_used":5000,"inodes_free":6000,"inodes_used_percent":49.1}`
-	if e != fmt.Sprintf("%v", v) {
-		t.Errorf("DiskUsageStat string is invalid: %v", v)
-	}
-}
-
-func TestDiskPartitionStat_String(t *testing.T) {
-	v := DiskPartitionStat{
-		Device:     "sd01",
-		Mountpoint: "/",
-		Fstype:     "ext4",
-		Opts:       "ro",
-	}
-	e := `{"device":"sd01","mountpoint":"/","fstype":"ext4","opts":"ro"}`
-	if e != fmt.Sprintf("%v", v) {
-		t.Errorf("DiskUsageStat string is invalid: %v", v)
-	}
-}
-
-func TestDiskIOCountersStat_String(t *testing.T) {
-	v := DiskIOCountersStat{
-		Name:         "sd01",
-		ReadCount:    100,
-		WriteCount:   200,
-		ReadBytes:    300,
-		WriteBytes:   400,
-		SerialNumber: "SERIAL",
-	}
-	e := `{"read_count":100,"write_count":200,"read_bytes":300,"write_bytes":400,"read_time":0,"write_time":0,"name":"sd01","io_time":0,"serial_number":"SERIAL"}`
-	if e != fmt.Sprintf("%v", v) {
-		t.Errorf("DiskUsageStat string is invalid: %v", v)
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/disk/disk_unix.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/disk/disk_unix.go
deleted file mode 100644
index e081b9d47..000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/disk/disk_unix.go
+++ /dev/null
@@ -1,30 +0,0 @@
-// +build freebsd linux darwin
-
-package disk
-
-import "syscall"
-
-func DiskUsage(path string) (*DiskUsageStat, error) {
-	stat := syscall.Statfs_t{}
-	err := syscall.Statfs(path, &stat)
-	if err != nil {
-		return nil, err
-	}
-	bsize := stat.Bsize
-
-	ret := &DiskUsageStat{
-		Path:        path,
-		Fstype:      getFsType(stat),
-		Total:       (uint64(stat.Blocks) * uint64(bsize)),
-		Free:        (uint64(stat.Bavail) * uint64(bsize)),
-		InodesTotal: (uint64(stat.Files)),
-		InodesFree:  (uint64(stat.Ffree)),
-	}
-
-	ret.InodesUsed = (ret.InodesTotal - ret.InodesFree)
-	ret.InodesUsedPercent = (float64(ret.InodesUsed) / float64(ret.InodesTotal)) * 100.0
-	ret.Used = (uint64(stat.Blocks) - uint64(stat.Bfree)) * uint64(bsize)
-	ret.UsedPercent = (float64(ret.Used) / float64(ret.Total)) * 100.0
-
-	return ret, nil
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/disk/disk_windows.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/disk/disk_windows.go
deleted file mode 100644
index 5ebe2dbcb..000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/disk/disk_windows.go
+++ /dev/null
@@ -1,155 +0,0 @@
-// +build windows
-
-package disk
-
-import (
-	"bytes"
-	"syscall"
-	"unsafe"
-
-	"github.com/StackExchange/wmi"
-
-	"github.com/shirou/gopsutil/internal/common"
-)
-
-var (
-	procGetDiskFreeSpaceExW     = common.Modkernel32.NewProc("GetDiskFreeSpaceExW")
-	procGetLogicalDriveStringsW = common.Modkernel32.NewProc("GetLogicalDriveStringsW")
-	procGetDriveType            = common.Modkernel32.NewProc("GetDriveTypeW")
-	provGetVolumeInformation    = common.Modkernel32.NewProc("GetVolumeInformationW")
-)
-
-var (
-	FileFileCompression = int64(16)     // 0x00000010
-	FileReadOnlyVolume  = int64(524288) // 0x00080000
-)
-
-type Win32_PerfFormattedData struct {
-	Name                    string
-	AvgDiskBytesPerRead     uint64
-	AvgDiskBytesPerWrite    uint64
-	AvgDiskReadQueueLength  uint64
-	AvgDiskWriteQueueLength uint64
-	AvgDisksecPerRead       uint64
-	AvgDisksecPerWrite      uint64
-}
-
-const WaitMSec = 500
-
-func DiskUsage(path string) (*DiskUsageStat, error) {
-	ret := &DiskUsageStat{}
-
-	lpFreeBytesAvailable := int64(0)
-	lpTotalNumberOfBytes := int64(0)
-	lpTotalNumberOfFreeBytes := int64(0)
-	diskret, _, err := procGetDiskFreeSpaceExW.Call(
-		uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(path))),
-		uintptr(unsafe.Pointer(&lpFreeBytesAvailable)),
-		uintptr(unsafe.Pointer(&lpTotalNumberOfBytes)),
-		uintptr(unsafe.Pointer(&lpTotalNumberOfFreeBytes)))
-	if diskret == 0 {
-		return nil, err
-	}
-	ret = &DiskUsageStat{
-		Path:        path,
-		Total:       uint64(lpTotalNumberOfBytes),
-		Free:        uint64(lpTotalNumberOfFreeBytes),
-		Used:        uint64(lpTotalNumberOfBytes) - uint64(lpTotalNumberOfFreeBytes),
-		UsedPercent: (float64(lpTotalNumberOfBytes) - float64(lpTotalNumberOfFreeBytes)) / float64(lpTotalNumberOfBytes) * 100,
-		// InodesTotal: 0,
-		// InodesFree: 0,
-		// InodesUsed: 0,
-		// InodesUsedPercent: 0,
-	}
-	return ret, nil
-}
-
-func DiskPartitions(all bool) ([]DiskPartitionStat, error) {
-	var ret []DiskPartitionStat
-	lpBuffer := make([]byte, 254)
-	diskret, _, err := procGetLogicalDriveStringsW.Call(
-		uintptr(len(lpBuffer)),
-		uintptr(unsafe.Pointer(&lpBuffer[0])))
-	if diskret == 0 {
-		return ret, err
-	}
-	for _, v := range lpBuffer {
-		if v >= 65 && v <= 90 {
-			path := string(v) + ":"
-			if path == "A:" || path == "B:" { // skip floppy drives
-				continue
-			}
-			typepath, _ := syscall.UTF16PtrFromString(path)
-			typeret, _, _ := procGetDriveType.Call(uintptr(unsafe.Pointer(typepath)))
-			if typeret == 0 {
-				return ret, syscall.GetLastError()
-			}
-			// 2: DRIVE_REMOVABLE 3: DRIVE_FIXED 5: DRIVE_CDROM
-
-			if typeret == 2 || typeret == 3 || typeret == 5 {
-				lpVolumeNameBuffer := make([]byte, 256)
-				lpVolumeSerialNumber := int64(0)
-				lpMaximumComponentLength := int64(0)
-				lpFileSystemFlags := int64(0)
-				lpFileSystemNameBuffer := make([]byte, 256)
-				volpath, _ := syscall.UTF16PtrFromString(string(v) + ":/")
-				driveret, _, err := provGetVolumeInformation.Call(
-					uintptr(unsafe.Pointer(volpath)),
-					uintptr(unsafe.Pointer(&lpVolumeNameBuffer[0])),
-					uintptr(len(lpVolumeNameBuffer)),
-					uintptr(unsafe.Pointer(&lpVolumeSerialNumber)),
-					uintptr(unsafe.Pointer(&lpMaximumComponentLength)),
-					uintptr(unsafe.Pointer(&lpFileSystemFlags)),
-					uintptr(unsafe.Pointer(&lpFileSystemNameBuffer[0])),
-					uintptr(len(lpFileSystemNameBuffer)))
-				if driveret == 0 {
-					if typeret == 5 {
-						continue //device is not ready will happen if there is no disk in the drive
-					}
-					return ret, err
-				}
-				opts := "rw"
-				if lpFileSystemFlags&FileReadOnlyVolume != 0 {
-					opts = "ro"
-				}
-				if lpFileSystemFlags&FileFileCompression != 0 {
-					opts += ".compress"
-				}
-
-				d := DiskPartitionStat{
-					Mountpoint: path,
-					Device:     path,
-					Fstype:     string(bytes.Replace(lpFileSystemNameBuffer, []byte("\x00"), []byte(""), -1)),
-					Opts:       opts,
-				}
-				ret = append(ret, d)
-			}
-		}
-	}
-	return ret, nil
-}
-
-func DiskIOCounters() (map[string]DiskIOCountersStat, error) {
-	ret := make(map[string]DiskIOCountersStat, 0)
-	var dst []Win32_PerfFormattedData
-
-	err := wmi.Query("SELECT * FROM Win32_PerfFormattedData_PerfDisk_LogicalDisk ", &dst)
-	if err != nil {
-		return ret, err
-	}
-	for _, d := range dst {
-		if len(d.Name) > 3 { // not get _Total or Harddrive
-			continue
-		}
-		ret[d.Name] = DiskIOCountersStat{
-			Name:       d.Name,
-			ReadCount:  uint64(d.AvgDiskReadQueueLength),
-			WriteCount: d.AvgDiskWriteQueueLength,
-			ReadBytes:  uint64(d.AvgDiskBytesPerRead),
-			WriteBytes: uint64(d.AvgDiskBytesPerWrite),
-			ReadTime:   d.AvgDisksecPerRead,
-			WriteTime:  d.AvgDisksecPerWrite,
-		}
-	}
-	return ret, nil
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/disk/types_freebsd.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/disk/types_freebsd.go
deleted file mode 100644
index 44869042f..000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/disk/types_freebsd.go
+++ /dev/null
@@ -1,85 +0,0 @@
-// +build ignore
-// Hand writing: _Ctype_struct___0
-
-/*
-Input to cgo -godefs.
-
-*/
-
-package disk
-
-/*
-#include <sys/types.h>
-#include <sys/mount.h>
-#include <devstat.h>
-
-enum {
-	sizeofPtr = sizeof(void*),
-};
-
-// because statinfo has long double snap_time, redefine with changing long long
-struct statinfo2 {
-        long            cp_time[CPUSTATES];
-        long            tk_nin;
-        long            tk_nout;
-        struct devinfo  *dinfo;
-        long long       snap_time;
-};
-*/
-import "C"
-
-// Machine characteristics; for internal use.
-
-const (
-	sizeofPtr        = C.sizeofPtr
-	sizeofShort      = C.sizeof_short
-	sizeofInt        = C.sizeof_int
-	sizeofLong       = C.sizeof_long
-	sizeofLongLong   = C.sizeof_longlong
-	sizeofLongDouble = C.sizeof_longlong
-
-	DEVSTAT_NO_DATA = 0x00
-	DEVSTAT_READ    = 0x01
-	DEVSTAT_WRITE   = 0x02
-	DEVSTAT_FREE    = 0x03
-
-	// from sys/mount.h
-	MNT_RDONLY      = 0x00000001 /* read only filesystem */
-	MNT_SYNCHRONOUS = 0x00000002 /* filesystem written synchronously */
-	MNT_NOEXEC      = 0x00000004 /* can't exec from filesystem */
-	MNT_NOSUID      = 0x00000008 /* don't honor setuid bits on fs */
-	MNT_UNION       = 0x00000020 /* union with underlying filesystem */
-	MNT_ASYNC       = 0x00000040 /* filesystem written asynchronously */
-	MNT_SUIDDIR     = 0x00100000 /* special handling of SUID on dirs */
-	MNT_SOFTDEP     = 0x00200000 /* soft updates being done */
-	MNT_NOSYMFOLLOW = 0x00400000 /* do not follow symlinks */
-	MNT_GJOURNAL    = 0x02000000 /* GEOM journal support enabled */
-	MNT_MULTILABEL  = 0x04000000 /* MAC support for individual objects */
-	MNT_ACLS        = 0x08000000 /* ACL support enabled */
-	MNT_NOATIME     = 0x10000000 /* disable update of file access time */
-	MNT_NOCLUSTERR  = 0x40000000 /* disable cluster read */
-	MNT_NOCLUSTERW  = 0x80000000 /* disable cluster write */
-	MNT_NFS4ACLS    = 0x00000010
-
-	MNT_WAIT    = 1 /* synchronously wait for I/O to complete */
-	MNT_NOWAIT  = 2 /* start all I/O, but do not wait for it */
-	MNT_LAZY    = 3 /* push data not written by filesystem syncer */
-	MNT_SUSPEND = 4 /* Suspend file system after sync */
-
-)
-
-// Basic types
-
-type (
-	_C_short       C.short
-	_C_int         C.int
-	_C_long        C.long
-	_C_long_long   C.longlong
-	_C_long_double C.longlong
-)
-
-type Statfs C.struct_statfs
-type Fsid C.struct_fsid
-
-type Devstat C.struct_devstat
-type Bintime C.struct_bintime
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/docker/docker.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/docker/docker.go
deleted file mode 100644
index eda941d3f..000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/docker/docker.go
+++ /dev/null
@@ -1,41 +0,0 @@
-package docker
-
-import "errors"
-
-var ErrDockerNotAvailable = errors.New("docker not available")
-var ErrCgroupNotAvailable = errors.New("cgroup not available")
-
-type CgroupMemStat struct {
-	ContainerID             string `json:"container_id"`
-	Cache                   uint64 `json:"cache"`
-	RSS                     uint64 `json:"rss"`
-	RSSHuge                 uint64 `json:"rss_huge"`
-	MappedFile              uint64 `json:"mapped_file"`
-	Pgpgin                  uint64 `json:"pgpgin"`
-	Pgpgout                 uint64 `json:"pgpgout"`
-	Pgfault                 uint64 `json:"pgfault"`
-	Pgmajfault              uint64 `json:"pgmajfault"`
-	InactiveAnon            uint64 `json:"inactive_anon"`
-	ActiveAnon              uint64 `json:"active_anon"`
-	InactiveFile            uint64 `json:"inactive_file"`
-	ActiveFile              uint64 `json:"active_file"`
-	Unevictable             uint64 `json:"unevictable"`
-	HierarchicalMemoryLimit uint64 `json:"hierarchical_memory_limit"`
-	TotalCache              uint64 `json:"total_cache"`
-	TotalRSS                uint64 `json:"total_rss"`
-	TotalRSSHuge            uint64 `json:"total_rss_huge"`
-	TotalMappedFile         uint64 `json:"total_mapped_file"`
-	TotalPgpgIn             uint64 `json:"total_pgpgin"`
-	TotalPgpgOut            uint64 `json:"total_pgpgout"`
-	TotalPgFault            uint64 `json:"total_pgfault"`
-	TotalPgMajFault         uint64 `json:"total_pgmajfault"`
-	TotalInactiveAnon       uint64 `json:"total_inactive_anon"`
-	TotalActiveAnon         uint64 `json:"total_active_anon"`
-	TotalInactiveFile       uint64 `json:"total_inactive_file"`
-	TotalActiveFile         uint64 `json:"total_active_file"`
-	TotalUnevictable        uint64 `json:"total_unevictable"`
-	MemUsageInBytes         uint64 `json:"mem_usage_in_bytes"`
-	MemMaxUsageInBytes      uint64 `json:"mem_max_usage_in_bytes"`
-	MemLimitInBytes         uint64 `json:"memory.limit_in_bytes"`
-	MemFailCnt              uint64 `json:"memory.failcnt"`
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/docker/docker_linux.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/docker/docker_linux.go
deleted file mode 100644
index 1b6ac9a75..000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/docker/docker_linux.go
+++ /dev/null
@@ -1,213 +0,0 @@
-// +build linux
-
-package docker
-
-import (
-	"encoding/json"
-	"fmt"
-	"os"
-	"os/exec"
-	"path"
-	"strconv"
-	"strings"
-
-	cpu "github.com/shirou/gopsutil/cpu"
-	"github.com/shirou/gopsutil/internal/common"
-)
-
-// GetDockerIDList returnes a list of DockerID.
-// This requires certain permission.
-func GetDockerIDList() ([]string, error) {
-	path, err := exec.LookPath("docker")
-	if err != nil {
-		return nil, ErrDockerNotAvailable
-	}
-
-	out, err := exec.Command(path, "ps", "-q", "--no-trunc").Output()
-	if err != nil {
-		return []string{}, err
-	}
-	lines := strings.Split(string(out), "\n")
-	ret := make([]string, 0, len(lines))
-
-	for _, l := range lines {
-		if l == "" {
-			continue
-		}
-		ret = append(ret, l)
-	}
-
-	return ret, nil
-}
-
-// CgroupCPU returnes specified cgroup id CPU status.
-// containerId is same as docker id if you use docker.
-// If you use container via systemd.slice, you could use
-// containerId = docker-<container id>.scope and base=/sys/fs/cgroup/cpuacct/system.slice/
-func CgroupCPU(containerId string, base string) (*cpu.CPUTimesStat, error) {
-	statfile := getCgroupFilePath(containerId, base, "cpuacct", "cpuacct.stat")
-	lines, err := common.ReadLines(statfile)
-	if err != nil {
-		return nil, err
-	}
-	// empty containerId means all cgroup
-	if len(containerId) == 0 {
-		containerId = "all"
-	}
-	ret := &cpu.CPUTimesStat{CPU: containerId}
-	for _, line := range lines {
-		fields := strings.Split(line, " ")
-		if fields[0] == "user" {
-			user, err := strconv.ParseFloat(fields[1], 64)
-			if err == nil {
-				ret.User = float64(user)
-			}
-		}
-		if fields[0] == "system" {
-			system, err := strconv.ParseFloat(fields[1], 64)
-			if err == nil {
-				ret.System = float64(system)
-			}
-		}
-	}
-
-	return ret, nil
-}
-
-func CgroupCPUDocker(containerid string) (*cpu.CPUTimesStat, error) {
-	return CgroupCPU(containerid, common.HostSys("fs/cgroup/cpuacct/docker"))
-}
-
-func CgroupMem(containerId string, base string) (*CgroupMemStat, error) {
-	statfile := getCgroupFilePath(containerId, base, "memory", "memory.stat")
-
-	// empty containerId means all cgroup
-	if len(containerId) == 0 {
-		containerId = "all"
-	}
-	lines, err := common.ReadLines(statfile)
-	if err != nil {
-		return nil, err
-	}
-	ret := &CgroupMemStat{ContainerID: containerId}
-	for _, line := range lines {
-		fields := strings.Split(line, " ")
-		v, err := strconv.ParseUint(fields[1], 10, 64)
-		if err != nil {
-			continue
-		}
-		switch fields[0] {
-		case "cache":
-			ret.Cache = v
-		case "rss":
-			ret.RSS = v
-		case "rss_huge":
-			ret.RSSHuge = v
-		case "mapped_file":
-			ret.MappedFile = v
-		case "pgpgin":
-			ret.Pgpgin = v
-		case "pgpgout":
-			ret.Pgpgout = v
-		case "pgfault":
-			ret.Pgfault = v
-		case "pgmajfault":
-			ret.Pgmajfault = v
-		case "inactive_anon":
-			ret.InactiveAnon = v
-		case "active_anon":
-			ret.ActiveAnon = v
-		case "inactive_file":
-			ret.InactiveFile = v
-		case "active_file":
-			ret.ActiveFile = v
-		case "unevictable":
-			ret.Unevictable = v
-		case "hierarchical_memory_limit":
-			ret.HierarchicalMemoryLimit = v
-		case "total_cache":
-			ret.TotalCache = v
-		case "total_rss":
-			ret.TotalRSS = v
-		case "total_rss_huge":
-			ret.TotalRSSHuge = v
-		case "total_mapped_file":
-			ret.TotalMappedFile = v
-		case "total_pgpgin":
-			ret.TotalPgpgIn = v
-		case "total_pgpgout":
-			ret.TotalPgpgOut = v
-		case "total_pgfault":
-			ret.TotalPgFault = v
-		case "total_pgmajfault":
-			ret.TotalPgMajFault = v
-		case "total_inactive_anon":
-			ret.TotalInactiveAnon = v
-		case "total_active_anon":
-			ret.TotalActiveAnon = v
-		case "total_inactive_file":
-			ret.TotalInactiveFile = v
-		case "total_active_file":
-			ret.TotalActiveFile = v
-		case "total_unevictable":
-			ret.TotalUnevictable = v
-		}
-	}
-
-	r, err := getCgroupMemFile(containerId, base, "memory.usage_in_bytes")
-	if err == nil {
-		ret.MemUsageInBytes = r
-	}
-	r, err = getCgroupMemFile(containerId, base, "memory.max_usage_in_bytes")
-	if err == nil {
-		ret.MemMaxUsageInBytes = r
-	}
-	r, err = getCgroupMemFile(containerId, base, "memory.limit_in_bytes")
-	if err == nil {
-		ret.MemLimitInBytes = r
-	}
-	r, err = getCgroupMemFile(containerId, base, "memory.failcnt")
-	if err == nil {
-		ret.MemFailCnt = r
-	}
-
-	return ret, nil
-}
-
-func CgroupMemDocker(containerId string) (*CgroupMemStat, error) {
-	return CgroupMem(containerId, common.HostSys("fs/cgroup/memory/docker"))
-}
-
-func (m CgroupMemStat) String() string {
-	s, _ := json.Marshal(m)
-	return string(s)
-}
-
-// getCgroupFilePath constructs file path to get targetted stats file.
-func getCgroupFilePath(containerId, base, target, file string) string {
-	if len(base) == 0 {
-		base = common.HostSys(fmt.Sprintf("fs/cgroup/%s/docker", target))
-	}
-	statfile := path.Join(base, containerId, file)
-
-	if _, err := os.Stat(statfile); os.IsNotExist(err) {
-		statfile = path.Join(
-			common.HostSys(fmt.Sprintf("fs/cgroup/%s/system.slice", target)), "docker-"+containerId+".scope", file)
-	}
-
-	return statfile
-}
-
-// getCgroupMemFile reads a cgroup file and return the contents as uint64.
-func getCgroupMemFile(containerId, base, file string) (uint64, error) {
-
-	statfile := getCgroupFilePath(containerId, base, "memory", file)
-	lines, err := common.ReadLines(statfile)
-	if err != nil {
-		return 0, err
-	}
-	if len(lines) != 1 {
-		return 0, fmt.Errorf("wrong format file: %s", statfile)
-	}
-	return strconv.ParseUint(lines[0], 10, 64)
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/docker/docker_linux_test.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/docker/docker_linux_test.go
deleted file mode 100644
index c284d5a69..000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/docker/docker_linux_test.go
+++ /dev/null
@@ -1,58 +0,0 @@
-// +build linux
-
-package docker
-
-import "testing"
-
-func TestGetDockerIDList(t *testing.T) {
-	// If there is not docker environment, this test always fail.
-	// not tested here
-	/*
-		_, err := GetDockerIDList()
-		if err != nil {
-			t.Errorf("error %v", err)
-		}
-	*/
-}
-
-func TestCgroupCPU(t *testing.T) {
-	v, _ := GetDockerIDList()
-	for _, id := range v {
-		v, err := CgroupCPUDocker(id)
-		if err != nil {
-			t.Errorf("error %v", err)
-		}
-		if v.CPU == "" {
-			t.Errorf("could not get CgroupCPU %v", v)
-		}
-
-	}
-}
-
-func TestCgroupCPUInvalidId(t *testing.T) {
-	_, err := CgroupCPUDocker("bad id")
-	if err == nil {
-		t.Error("Expected path does not exist error")
-	}
-}
-
-func TestCgroupMem(t *testing.T) {
-	v, _ := GetDockerIDList()
-	for _, id := range v {
-		v, err := CgroupMemDocker(id)
-		if err != nil {
-			t.Errorf("error %v", err)
-		}
-		empty := &CgroupMemStat{}
-		if v == empty {
-			t.Errorf("Could not CgroupMemStat %v", v)
-		}
-	}
-}
-
-func TestCgroupMemInvalidId(t *testing.T) {
-	_, err := CgroupMemDocker("bad id")
-	if err == nil {
-		t.Error("Expected path does not exist error")
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/docker/docker_notlinux.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/docker/docker_notlinux.go
deleted file mode 100644
index b45f96c80..000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/docker/docker_notlinux.go
+++ /dev/null
@@ -1,41 +0,0 @@
-// +build !linux
-
-package docker
-
-import (
-	"encoding/json"
-
-	"github.com/shirou/gopsutil/cpu"
-        "github.com/shirou/gopsutil/internal/common"
-)
-
-// GetDockerIDList returnes a list of DockerID.
-// This requires certain permission.
-func GetDockerIDList() ([]string, error) {
-	return nil, ErrDockerNotAvailable
-}
-
-// CgroupCPU returnes specified cgroup id CPU status.
-// containerid is same as docker id if you use docker.
-// If you use container via systemd.slice, you could use
-// containerid = docker-<container id>.scope and base=/sys/fs/cgroup/cpuacct/system.slice/
-func CgroupCPU(containerid string, base string) (*cpu.CPUTimesStat, error) {
-	return nil, ErrCgroupNotAvailable
-}
-
-func CgroupCPUDocker(containerid string) (*cpu.CPUTimesStat, error) {
-	return CgroupCPU(containerid, common.HostSys("fs/cgroup/cpuacct/docker"))
-}
-
-func CgroupMem(containerid string, base string) (*CgroupMemStat, error) {
-	return nil, ErrCgroupNotAvailable
-}
-
-func CgroupMemDocker(containerid string) (*CgroupMemStat, error) {
-	return CgroupMem(containerid, common.HostSys("fs/cgroup/memory/docker"))
-}
-
-func (m CgroupMemStat) String() string {
-	s, _ := json.Marshal(m)
-	return string(s)
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/host/host.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/host/host.go
deleted file mode 100644
index 241ceb23e..000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/host/host.go
+++ /dev/null
@@ -1,38 +0,0 @@
-package host
-
-import (
-	"encoding/json"
-)
-
-// A HostInfoStat describes the host status.
-// This is not in the psutil but it useful.
-type HostInfoStat struct {
-	Hostname             string `json:"hostname"`
-	Uptime               uint64 `json:"uptime"`
-	BootTime             uint64 `json:"boot_time"`
-	Procs                uint64 `json:"procs"`           // number of processes
-	OS                   string `json:"os"`              // ex: freebsd, linux
-	Platform             string `json:"platform"`        // ex: ubuntu, linuxmint
-	PlatformFamily       string `json:"platform_family"` // ex: debian, rhel
-	PlatformVersion      string `json:"platform_version"`
-	VirtualizationSystem string `json:"virtualization_system"`
-	VirtualizationRole   string `json:"virtualization_role"` // guest or host
-
-}
-
-type UserStat struct {
-	User     string `json:"user"`
-	Terminal string `json:"terminal"`
-	Host     string `json:"host"`
-	Started  int    `json:"started"`
-}
-
-func (h HostInfoStat) String() string {
-	s, _ := json.Marshal(h)
-	return string(s)
-}
-
-func (u UserStat) String() string {
-	s, _ := json.Marshal(u)
-	return string(s)
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/host/host_darwin.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/host/host_darwin.go
deleted file mode 100644
index 069c6fa37..000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/host/host_darwin.go
+++ /dev/null
@@ -1,145 +0,0 @@
-// +build darwin
-
-package host
-
-import (
-	"bytes"
-	"encoding/binary"
-	"io/ioutil"
-	"os"
-	"os/exec"
-	"runtime"
-	"strconv"
-	"strings"
-	"time"
-	"unsafe"
-
-	"github.com/shirou/gopsutil/internal/common"
-)
-
-func HostInfo() (*HostInfoStat, error) {
-	ret := &HostInfoStat{
-		OS:             runtime.GOOS,
-		PlatformFamily: "darwin",
-	}
-
-	hostname, err := os.Hostname()
-	if err == nil {
-		ret.Hostname = hostname
-	}
-
-	platform, family, version, err := GetPlatformInformation()
-	if err == nil {
-		ret.Platform = platform
-		ret.PlatformFamily = family
-		ret.PlatformVersion = version
-	}
-	system, role, err := GetVirtualization()
-	if err == nil {
-		ret.VirtualizationSystem = system
-		ret.VirtualizationRole = role
-	}
-
-	boot, err := BootTime()
-	if err == nil {
-		ret.BootTime = boot
-		ret.Uptime = uptime(boot)
-	}
-
-	return ret, nil
-}
-
-func BootTime() (uint64, error) {
-	values, err := common.DoSysctrl("kern.boottime")
-	if err != nil {
-		return 0, err
-	}
-	// ex: { sec = 1392261637, usec = 627534 } Thu Feb 13 12:20:37 2014
-	v := strings.Replace(values[2], ",", "", 1)
-	boottime, err := strconv.ParseInt(v, 10, 64)
-	if err != nil {
-		return 0, err
-	}
-
-	return uint64(boottime), nil
-}
-
-func uptime(boot uint64) uint64 {
-	return uint64(time.Now().Unix()) - boot
-}
-
-func Uptime() (uint64, error) {
-	boot, err := BootTime()
-	if err != nil {
-		return 0, err
-	}
-	return uptime(boot), nil
-}
-
-func Users() ([]UserStat, error) {
-	utmpfile := "/var/run/utmpx"
-	var ret []UserStat
-
-	file, err := os.Open(utmpfile)
-	if err != nil {
-		return ret, err
-	}
-
-	buf, err := ioutil.ReadAll(file)
-	if err != nil {
-		return ret, err
-	}
-
-	u := Utmpx{}
-	entrySize := int(unsafe.Sizeof(u))
-	count := len(buf) / entrySize
-
-	for i := 0; i < count; i++ {
-		b := buf[i*entrySize : i*entrySize+entrySize]
-
-		var u Utmpx
-		br := bytes.NewReader(b)
-		err := binary.Read(br, binary.LittleEndian, &u)
-		if err != nil {
-			continue
-		}
-		if u.Type != 7 { // skip if not USERPROCESS
-			continue
-		}
-		user := UserStat{
-			User:     common.IntToString(u.User[:]),
-			Terminal: common.IntToString(u.Line[:]),
-			Host:     common.IntToString(u.Host[:]),
-			Started:  int(u.Tv.Sec),
-		}
-		ret = append(ret, user)
-	}
-
-	return ret, nil
-
-}
-
-func GetPlatformInformation() (string, string, string, error) {
-	platform := ""
-	family := ""
-	version := ""
-
-	out, err := exec.Command("uname", "-s").Output()
-	if err == nil {
-		platform = strings.ToLower(strings.TrimSpace(string(out)))
-	}
-
-	out, err = exec.Command("uname", "-r").Output()
-	if err == nil {
-		version = strings.ToLower(strings.TrimSpace(string(out)))
-	}
-
-	return platform, family, version, nil
-}
-
-func GetVirtualization() (string, string, error) {
-	system := ""
-	role := ""
-
-	return system, role, nil
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/host/host_darwin_amd64.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/host/host_darwin_amd64.go
deleted file mode 100644
index 3ea52d527..000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/host/host_darwin_amd64.go
+++ /dev/null
@@ -1,19 +0,0 @@
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs types_darwin.go
-
-package host
-
-type Utmpx struct {
-	User      [256]int8
-	Id        [4]int8
-	Line      [32]int8
-	Pid       int32
-	Type      int16
-	Pad_cgo_0 [6]byte
-	Tv        Timeval
-	Host      [256]int8
-	Pad       [16]uint32
-}
-type Timeval struct {
-	Sec int32
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/host/host_freebsd.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/host/host_freebsd.go
deleted file mode 100644
index 4a151fd84..000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/host/host_freebsd.go
+++ /dev/null
@@ -1,192 +0,0 @@
-// +build freebsd
-
-package host
-
-import (
-	"bytes"
-	"encoding/binary"
-	"io/ioutil"
-	"os"
-	"os/exec"
-	"runtime"
-	"strconv"
-	"strings"
-	"time"
-	"unsafe"
-
-	"github.com/shirou/gopsutil/internal/common"
-)
-
-const (
-	UTNameSize = 16 /* see MAXLOGNAME in <sys/param.h> */
-	UTLineSize = 8
-	UTHostSize = 16
-)
-
-func HostInfo() (*HostInfoStat, error) {
-	ret := &HostInfoStat{
-		OS:             runtime.GOOS,
-		PlatformFamily: "freebsd",
-	}
-
-	hostname, err := os.Hostname()
-	if err == nil {
-		ret.Hostname = hostname
-	}
-
-	platform, family, version, err := GetPlatformInformation()
-	if err == nil {
-		ret.Platform = platform
-		ret.PlatformFamily = family
-		ret.PlatformVersion = version
-	}
-	system, role, err := GetVirtualization()
-	if err == nil {
-		ret.VirtualizationSystem = system
-		ret.VirtualizationRole = role
-	}
-
-	boot, err := BootTime()
-	if err == nil {
-		ret.BootTime = boot
-		ret.Uptime = uptime(boot)
-	}
-
-	return ret, nil
-}
-
-func BootTime() (uint64, error) {
-	values, err := common.DoSysctrl("kern.boottime")
-	if err != nil {
-		return 0, err
-	}
-	// ex: { sec = 1392261637, usec = 627534 } Thu Feb 13 12:20:37 2014
-	v := strings.Replace(values[2], ",", "", 1)
-
-	boottime, err := strconv.ParseUint(v, 10, 64)
-	if err != nil {
-		return 0, err
-	}
-
-	return boottime, nil
-}
-
-func uptime(boot uint64) uint64 {
-	return uint64(time.Now().Unix()) - boot
-}
-
-func Uptime() (uint64, error) {
-	boot, err := BootTime()
-	if err != nil {
-		return 0, err
-	}
-	return uptime(boot), nil
-}
-
-func Users() ([]UserStat, error) {
-	utmpfile := "/var/run/utx.active"
-	if !common.PathExists(utmpfile) {
-		utmpfile = "/var/run/utmp" // before 9.0
-		return getUsersFromUtmp(utmpfile)
-	}
-
-	var ret []UserStat
-	file, err := os.Open(utmpfile)
-	if err != nil {
-		return ret, err
-	}
-
-	buf, err := ioutil.ReadAll(file)
-	if err != nil {
-		return ret, err
-	}
-
-	u := Utmpx{}
-	entrySize := int(unsafe.Sizeof(u)) - 3
-	entrySize = 197 // TODO: why should 197
-	count := len(buf) / entrySize
-
-	for i := 0; i < count; i++ {
-		b := buf[i*entrySize : i*entrySize+entrySize]
-		var u Utmpx
-		br := bytes.NewReader(b)
-		err := binary.Read(br, binary.LittleEndian, &u)
-		if err != nil || u.Type != 4 {
-			continue
-		}
-		sec := (binary.LittleEndian.Uint32(u.Tv.Sec[:])) / 2 // TODO:
-		user := UserStat{
-			User:     common.IntToString(u.User[:]),
-			Terminal: common.IntToString(u.Line[:]),
-			Host:     common.IntToString(u.Host[:]),
-			Started:  int(sec),
-		}
-
-		ret = append(ret, user)
-	}
-
-	return ret, nil
-
-}
-
-func GetPlatformInformation() (string, string, string, error) {
-	platform := ""
-	family := ""
-	version := ""
-
-	out, err := exec.Command("uname", "-s").Output()
-	if err == nil {
-		platform = strings.ToLower(strings.TrimSpace(string(out)))
-	}
-
-	out, err = exec.Command("uname", "-r").Output()
-	if err == nil {
-		version = strings.ToLower(strings.TrimSpace(string(out)))
-	}
-
-	return platform, family, version, nil
-}
-
-func GetVirtualization() (string, string, error) {
-	system := ""
-	role := ""
-
-	return system, role, nil
-}
-
-// before 9.0
-func getUsersFromUtmp(utmpfile string) ([]UserStat, error) {
-	var ret []UserStat
-	file, err := os.Open(utmpfile)
-	if err != nil {
-		return ret, err
-	}
-	buf, err := ioutil.ReadAll(file)
-	if err != nil {
-		return ret, err
-	}
-
-	u := Utmp{}
-	entrySize := int(unsafe.Sizeof(u))
-	count := len(buf) / entrySize
-
-	for i := 0; i < count; i++ {
-		b := buf[i*entrySize : i*entrySize+entrySize]
-		var u Utmp
-		br := bytes.NewReader(b)
-		err := binary.Read(br, binary.LittleEndian, &u)
-		if err != nil || u.Time == 0 {
-			continue
-		}
-		user := UserStat{
-			User:     common.IntToString(u.Name[:]),
-			Terminal: common.IntToString(u.Line[:]),
-			Host:     common.IntToString(u.Host[:]),
-			Started:  int(u.Time),
-		}
-
-		ret = append(ret, user)
-	}
-
-	return ret, nil
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/host/host_freebsd_amd64.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/host/host_freebsd_amd64.go
deleted file mode 100644
index 46be58688..000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/host/host_freebsd_amd64.go
+++ /dev/null
@@ -1,41 +0,0 @@
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs types_freebsd.go
-
-package host
-
-const (
-	sizeofPtr      = 0x8
-	sizeofShort    = 0x2
-	sizeofInt      = 0x4
-	sizeofLong     = 0x8
-	sizeofLongLong = 0x8
-)
-
-type (
-	_C_short     int16
-	_C_int       int32
-	_C_long      int64
-	_C_long_long int64
-)
-
-type Utmp struct {
-	Line [8]int8
-	Name [16]int8
-	Host [16]int8
-	Time int32
-}
-type Utmpx struct {
-	Type int16
-	Tv   Timeval
-	Id   [8]int8
-	Pid  int32
-	User [32]int8
-	Line [16]int8
-	Host [125]int8
-	//	Host [128]int8
-	//	X__ut_spare [64]int8
-}
-type Timeval struct {
-	Sec  [4]byte
-	Usec [3]byte
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/host/host_linux.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/host/host_linux.go
deleted file mode 100644
index 91b153074..000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/host/host_linux.go
+++ /dev/null
@@ -1,420 +0,0 @@
-// +build linux
-
-package host
-
-import (
-	"bytes"
-	"encoding/binary"
-	"fmt"
-	"io/ioutil"
-	"os"
-	"os/exec"
-	"regexp"
-	"runtime"
-	"strconv"
-	"strings"
-	"time"
-	"unsafe"
-
-	"github.com/shirou/gopsutil/internal/common"
-)
-
-type LSB struct {
-	ID          string
-	Release     string
-	Codename    string
-	Description string
-}
-
-func HostInfo() (*HostInfoStat, error) {
-	ret := &HostInfoStat{
-		OS: runtime.GOOS,
-	}
-
-	hostname, err := os.Hostname()
-	if err == nil {
-		ret.Hostname = hostname
-	}
-
-	platform, family, version, err := GetPlatformInformation()
-	if err == nil {
-		ret.Platform = platform
-		ret.PlatformFamily = family
-		ret.PlatformVersion = version
-	}
-	system, role, err := GetVirtualization()
-	if err == nil {
-		ret.VirtualizationSystem = system
-		ret.VirtualizationRole = role
-	}
-	boot, err := BootTime()
-	if err == nil {
-		ret.BootTime = boot
-		ret.Uptime = uptime(boot)
-	}
-
-	return ret, nil
-}
-
-// BootTime returns the system boot time expressed in seconds since the epoch.
-func BootTime() (uint64, error) {
-	filename := common.HostProc("stat")
-	lines, err := common.ReadLines(filename)
-	if err != nil {
-		return 0, err
-	}
-	for _, line := range lines {
-		if strings.HasPrefix(line, "btime") {
-			f := strings.Fields(line)
-			if len(f) != 2 {
-				return 0, fmt.Errorf("wrong btime format")
-			}
-			b, err := strconv.ParseInt(f[1], 10, 64)
-			if err != nil {
-				return 0, err
-			}
-			return uint64(b), nil
-		}
-	}
-
-	return 0, fmt.Errorf("could not find btime")
-}
-
-func uptime(boot uint64) uint64 {
-	return uint64(time.Now().Unix()) - boot
-}
-
-func Uptime() (uint64, error) {
-	boot, err := BootTime()
-	if err != nil {
-		return 0, err
-	}
-	return uptime(boot), nil
-}
-
-func Users() ([]UserStat, error) {
-	utmpfile := "/var/run/utmp"
-
-	file, err := os.Open(utmpfile)
-	if err != nil {
-		return nil, err
-	}
-
-	buf, err := ioutil.ReadAll(file)
-	if err != nil {
-		return nil, err
-	}
-
-	u := utmp{}
-	entrySize := int(unsafe.Sizeof(u))
-	count := len(buf) / entrySize
-
-	ret := make([]UserStat, 0, count)
-
-	for i := 0; i < count; i++ {
-		b := buf[i*entrySize : i*entrySize+entrySize]
-
-		var u utmp
-		br := bytes.NewReader(b)
-		err := binary.Read(br, binary.LittleEndian, &u)
-		if err != nil {
-			continue
-		}
-		user := UserStat{
-			User:     common.IntToString(u.User[:]),
-			Terminal: common.IntToString(u.Line[:]),
-			Host:     common.IntToString(u.Host[:]),
-			Started:  int(u.Tv.TvSec),
-		}
-		ret = append(ret, user)
-	}
-
-	return ret, nil
-
-}
-
-func getLSB() (*LSB, error) {
-	ret := &LSB{}
-	if common.PathExists("/etc/lsb-release") {
-		contents, err := common.ReadLines("/etc/lsb-release")
-		if err != nil {
-			return ret, err // return empty
-		}
-		for _, line := range contents {
-			field := strings.Split(line, "=")
-			if len(field) < 2 {
-				continue
-			}
-			switch field[0] {
-			case "DISTRIB_ID":
-				ret.ID = field[1]
-			case "DISTRIB_RELEASE":
-				ret.Release = field[1]
-			case "DISTRIB_CODENAME":
-				ret.Codename = field[1]
-			case "DISTRIB_DESCRIPTION":
-				ret.Description = field[1]
-			}
-		}
-	} else if common.PathExists("/usr/bin/lsb_release") {
-		out, err := exec.Command("/usr/bin/lsb_release").Output()
-		if err != nil {
-			return ret, err
-		}
-		for _, line := range strings.Split(string(out), "\n") {
-			field := strings.Split(line, ":")
-			if len(field) < 2 {
-				continue
-			}
-			switch field[0] {
-			case "Distributor ID":
-				ret.ID = field[1]
-			case "Release":
-				ret.Release = field[1]
-			case "Codename":
-				ret.Codename = field[1]
-			case "Description":
-				ret.Description = field[1]
-			}
-		}
-
-	}
-
-	return ret, nil
-}
-
-func GetPlatformInformation() (platform string, family string, version string, err error) {
-
-	lsb, err := getLSB()
-	if err != nil {
-		lsb = &LSB{}
-	}
-
-	if common.PathExists("/etc/oracle-release") {
-		platform = "oracle"
-		contents, err := common.ReadLines("/etc/oracle-release")
-		if err == nil {
-			version = getRedhatishVersion(contents)
-		}
-	} else if common.PathExists("/etc/enterprise-release") {
-		platform = "oracle"
-		contents, err := common.ReadLines("/etc/enterprise-release")
-		if err == nil {
-			version = getRedhatishVersion(contents)
-		}
-	} else if common.PathExists("/etc/debian_version") {
-		if lsb.ID == "Ubuntu" {
-			platform = "ubuntu"
-			version = lsb.Release
-		} else if lsb.ID == "LinuxMint" {
-			platform = "linuxmint"
-			version = lsb.Release
-		} else {
-			if common.PathExists("/usr/bin/raspi-config") {
-				platform = "raspbian"
-			} else {
-				platform = "debian"
-			}
-			contents, err := common.ReadLines("/etc/debian_version")
-			if err == nil {
-				version = contents[0]
-			}
-		}
-	} else if common.PathExists("/etc/redhat-release") {
-		contents, err := common.ReadLines("/etc/redhat-release")
-		if err == nil {
-			version = getRedhatishVersion(contents)
-			platform = getRedhatishPlatform(contents)
-		}
-	} else if common.PathExists("/etc/system-release") {
-		contents, err := common.ReadLines("/etc/system-release")
-		if err == nil {
-			version = getRedhatishVersion(contents)
-			platform = getRedhatishPlatform(contents)
-		}
-	} else if common.PathExists("/etc/gentoo-release") {
-		platform = "gentoo"
-		contents, err := common.ReadLines("/etc/gentoo-release")
-		if err == nil {
-			version = getRedhatishVersion(contents)
-		}
-	} else if common.PathExists("/etc/SuSE-release") {
-		contents, err := common.ReadLines("/etc/SuSE-release")
-		if err == nil {
-			version = getSuseVersion(contents)
-			platform = getSusePlatform(contents)
-		}
-		// TODO: slackware detecion
-	} else if common.PathExists("/etc/arch-release") {
-		platform = "arch"
-		// TODO: exherbo detection
-	} else if lsb.ID == "RedHat" {
-		platform = "redhat"
-		version = lsb.Release
-	} else if lsb.ID == "Amazon" {
-		platform = "amazon"
-		version = lsb.Release
-	} else if lsb.ID == "ScientificSL" {
-		platform = "scientific"
-		version = lsb.Release
-	} else if lsb.ID == "XenServer" {
-		platform = "xenserver"
-		version = lsb.Release
-	} else if lsb.ID != "" {
-		platform = strings.ToLower(lsb.ID)
-		version = lsb.Release
-	}
-
-	switch platform {
-	case "debian", "ubuntu", "linuxmint", "raspbian":
-		family = "debian"
-	case "fedora":
-		family = "fedora"
-	case "oracle", "centos", "redhat", "scientific", "enterpriseenterprise", "amazon", "xenserver", "cloudlinux", "ibm_powerkvm":
-		family = "rhel"
-	case "suse", "opensuse":
-		family = "suse"
-	case "gentoo":
-		family = "gentoo"
-	case "slackware":
-		family = "slackware"
-	case "arch":
-		family = "arch"
-	case "exherbo":
-		family = "exherbo"
-	}
-
-	return platform, family, version, nil
-
-}
-
-func getRedhatishVersion(contents []string) string {
-	c := strings.ToLower(strings.Join(contents, ""))
-
-	if strings.Contains(c, "rawhide") {
-		return "rawhide"
-	}
-	if matches := regexp.MustCompile(`release (\d[\d.]*)`).FindStringSubmatch(c); matches != nil {
-		return matches[1]
-	}
-	return ""
-}
-
-func getRedhatishPlatform(contents []string) string {
-	c := strings.ToLower(strings.Join(contents, ""))
-
-	if strings.Contains(c, "red hat") {
-		return "redhat"
-	}
-	f := strings.Split(c, " ")
-
-	return f[0]
-}
-
-func getSuseVersion(contents []string) string {
-	version := ""
-	for _, line := range contents {
-		if matches := regexp.MustCompile(`VERSION = ([\d.]+)`).FindStringSubmatch(line); matches != nil {
-			version = matches[1]
-		} else if matches := regexp.MustCompile(`PATCHLEVEL = ([\d]+)`).FindStringSubmatch(line); matches != nil {
-			version = version + "." + matches[1]
-		}
-	}
-	return version
-}
-
-func getSusePlatform(contents []string) string {
-	c := strings.ToLower(strings.Join(contents, ""))
-	if strings.Contains(c, "opensuse") {
-		return "opensuse"
-	}
-	return "suse"
-}
-
-func GetVirtualization() (string, string, error) {
-	var system string
-	var role string
-
-	filename := common.HostProc("xen")
-	if common.PathExists(filename) {
-		system = "xen"
-		role = "guest" // assume guest
-
-		if common.PathExists(filename + "/capabilities") {
-			contents, err := common.ReadLines(filename + "/capabilities")
-			if err == nil {
-				if common.StringsHas(contents, "control_d") {
-					role = "host"
-				}
-			}
-		}
-	}
-
-	filename = common.HostProc("modules")
-	if common.PathExists(filename) {
-		contents, err := common.ReadLines(filename)
-		if err == nil {
-			if common.StringsContains(contents, "kvm") {
-				system = "kvm"
-				role = "host"
-			} else if common.StringsContains(contents, "vboxdrv") {
-				system = "vbox"
-				role = "host"
-			} else if common.StringsContains(contents, "vboxguest") {
-				system = "vbox"
-				role = "guest"
-			}
-		}
-	}
-
-	filename = common.HostProc("cpuinfo")
-	if common.PathExists(filename) {
-		contents, err := common.ReadLines(filename)
-		if err == nil {
-			if common.StringsHas(contents, "QEMU Virtual CPU") ||
-				common.StringsHas(contents, "Common KVM processor") ||
-				common.StringsHas(contents, "Common 32-bit KVM processor") {
-				system = "kvm"
-				role = "guest"
-			}
-		}
-	}
-
-	filename = common.HostProc()
-	if common.PathExists(filename + "/bc/0") {
-		system = "openvz"
-		role = "host"
-	} else if common.PathExists(filename + "/vz") {
-		system = "openvz"
-		role = "guest"
-	}
-
-	// not use dmidecode because it requires root
-	if common.PathExists(filename + "/self/status") {
-		contents, err := common.ReadLines(filename + "/self/status")
-		if err == nil {
-
-			if common.StringsHas(contents, "s_context:") ||
-				common.StringsHas(contents, "VxID:") {
-				system = "linux-vserver"
-			}
-			// TODO: guest or host
-		}
-	}
-
-	if common.PathExists(filename + "/self/cgroup") {
-		contents, err := common.ReadLines(filename + "/self/cgroup")
-		if err == nil {
-			if common.StringsHas(contents, "lxc") ||
-				common.StringsHas(contents, "docker") {
-				system = "lxc"
-				role = "guest"
-			} else if common.PathExists("/usr/bin/lxc-version") { // TODO: which
-				system = "lxc"
-				role = "host"
-			}
-		}
-	}
-
-	return system, role, nil
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/host/host_linux_386.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/host/host_linux_386.go
deleted file mode 100644
index fb6d7a0f6..000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/host/host_linux_386.go
+++ /dev/null
@@ -1,44 +0,0 @@
-// ATTENTION - FILE MANUAL FIXED AFTER CGO.
-// Fixed line: Tv		_Ctype_struct_timeval -> Tv		UtTv
-// Created by cgo -godefs, MANUAL FIXED
-// cgo -godefs types_linux.go
-
-package host
-
-const (
-	sizeofPtr      = 0x4
-	sizeofShort    = 0x2
-	sizeofInt      = 0x4
-	sizeofLong     = 0x4
-	sizeofLongLong = 0x8
-)
-
-type (
-	_C_short     int16
-	_C_int       int32
-	_C_long      int32
-	_C_long_long int64
-)
-
-type utmp struct {
-	Type      int16
-	Pad_cgo_0 [2]byte
-	Pid       int32
-	Line      [32]int8
-	Id        [4]int8
-	User      [32]int8
-	Host      [256]int8
-	Exit      exit_status
-	Session   int32
-	Tv        UtTv
-	Addr_v6   [4]int32
-	X__unused [20]int8
-}
-type exit_status struct {
-	Termination int16
-	Exit        int16
-}
-type UtTv struct {
-	TvSec  int32
-	TvUsec int32
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/host/host_linux_amd64.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/host/host_linux_amd64.go
deleted file mode 100644
index b04fc17e3..000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/host/host_linux_amd64.go
+++ /dev/null
@@ -1,42 +0,0 @@
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs types_linux.go
-
-package host
-
-const (
-	sizeofPtr      = 0x8
-	sizeofShort    = 0x2
-	sizeofInt      = 0x4
-	sizeofLong     = 0x8
-	sizeofLongLong = 0x8
-)
-
-type (
-	_C_short     int16
-	_C_int       int32
-	_C_long      int64
-	_C_long_long int64
-)
-
-type utmp struct {
-	Type              int16
-	Pad_cgo_0         [2]byte
-	Pid               int32
-	Line              [32]int8
-	Id                [4]int8
-	User              [32]int8
-	Host              [256]int8
-	Exit              exit_status
-	Session           int32
-	Tv                UtTv
-	Addr_v6           [4]int32
-	X__glibc_reserved [20]int8
-}
-type exit_status struct {
-	Termination int16
-	Exit        int16
-}
-type UtTv struct {
-	TvSec  int32
-	TvUsec int32
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/host/host_linux_arm.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/host/host_linux_arm.go
deleted file mode 100644
index 329e530f7..000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/host/host_linux_arm.go
+++ /dev/null
@@ -1,42 +0,0 @@
-// +build linux
-// +build arm
-
-package host
-
-const (
-	sizeofPtr      = 0x8
-	sizeofShort    = 0x2
-	sizeofInt      = 0x4
-	sizeofLong     = 0x8
-	sizeofLongLong = 0x8
-)
-
-type (
-	_C_short     int16
-	_C_int       int32
-	_C_long      int64
-	_C_long_long int64
-)
-
-type utmp struct {
-	Type              int16
-	Pad_cgo_0         [2]byte
-	Pid               int32
-	Line              [32]int8
-	Id                [4]int8
-	User              [32]int8
-	Host              [256]int8
-	Exit              exit_status
-	Session           int32
-	Tv                UtTv
-	Addr_v6           [4]int32
-	X__glibc_reserved [20]int8
-}
-type exit_status struct {
-	Termination int16
-	Exit        int16
-}
-type UtTv struct {
-	TvSec  int32
-	TvUsec int32
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/host/host_linux_test.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/host/host_linux_test.go
deleted file mode 100644
index 7808eee3d..000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/host/host_linux_test.go
+++ /dev/null
@@ -1,61 +0,0 @@
-// +build linux
-
-package host
-
-import (
-	"testing"
-)
-
-func TestGetRedhatishVersion(t *testing.T) {
-	var ret string
-	c := []string{"Rawhide"}
-	ret = getRedhatishVersion(c)
-	if ret != "rawhide" {
-		t.Errorf("Could not get version rawhide: %v", ret)
-	}
-
-	c = []string{"Fedora release 15 (Lovelock)"}
-	ret = getRedhatishVersion(c)
-	if ret != "15" {
-		t.Errorf("Could not get version fedora: %v", ret)
-	}
-
-	c = []string{"Enterprise Linux Server release 5.5 (Carthage)"}
-	ret = getRedhatishVersion(c)
-	if ret != "5.5" {
-		t.Errorf("Could not get version redhat enterprise: %v", ret)
-	}
-
-	c = []string{""}
-	ret = getRedhatishVersion(c)
-	if ret != "" {
-		t.Errorf("Could not get version with no value: %v", ret)
-	}
-}
-
-func TestGetRedhatishPlatform(t *testing.T) {
-	var ret string
-	c := []string{"red hat"}
-	ret = getRedhatishPlatform(c)
-	if ret != "redhat" {
-		t.Errorf("Could not get platform redhat: %v", ret)
-	}
-
-	c = []string{"Fedora release 15 (Lovelock)"}
-	ret = getRedhatishPlatform(c)
-	if ret != "fedora" {
-		t.Errorf("Could not get platform fedora: %v", ret)
-	}
-
-	c = []string{"Enterprise Linux Server release 5.5 (Carthage)"}
-	ret = getRedhatishPlatform(c)
-	if ret != "enterprise" {
-		t.Errorf("Could not get platform redhat enterprise: %v", ret)
-	}
-
-	c = []string{""}
-	ret = getRedhatishPlatform(c)
-	if ret != "" {
-		t.Errorf("Could not get platform with no value: %v", ret)
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/host/host_test.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/host/host_test.go
deleted file mode 100644
index abcb0b6a3..000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/host/host_test.go
+++ /dev/null
@@ -1,68 +0,0 @@
-package host
-
-import (
-	"fmt"
-	"testing"
-)
-
-func TestHostInfo(t *testing.T) {
-	v, err := HostInfo()
-	if err != nil {
-		t.Errorf("error %v", err)
-	}
-	empty := &HostInfoStat{}
-	if v == empty {
-		t.Errorf("Could not get hostinfo %v", v)
-	}
-}
-
-func TestBoot_time(t *testing.T) {
-	v, err := BootTime()
-	if err != nil {
-		t.Errorf("error %v", err)
-	}
-	if v == 0 {
-		t.Errorf("Could not get boot time %v", v)
-	}
-}
-
-func TestUsers(t *testing.T) {
-	v, err := Users()
-	if err != nil {
-		t.Errorf("error %v", err)
-	}
-	empty := UserStat{}
-	for _, u := range v {
-		if u == empty {
-			t.Errorf("Could not Users %v", v)
-		}
-	}
-}
-
-func TestHostInfoStat_String(t *testing.T) {
-	v := HostInfoStat{
-		Hostname: "test",
-		Uptime:   3000,
-		Procs:    100,
-		OS:       "linux",
-		Platform: "ubuntu",
-		BootTime: 1447040000,
-	}
-	e := `{"hostname":"test","uptime":3000,"boot_time":1447040000,"procs":100,"os":"linux","platform":"ubuntu","platform_family":"","platform_version":"","virtualization_system":"","virtualization_role":""}`
-	if e != fmt.Sprintf("%v", v) {
-		t.Errorf("HostInfoStat string is invalid: %v", v)
-	}
-}
-
-func TestUserStat_String(t *testing.T) {
-	v := UserStat{
-		User:     "user",
-		Terminal: "term",
-		Host:     "host",
-		Started:  100,
-	}
-	e := `{"user":"user","terminal":"term","host":"host","started":100}`
-	if e != fmt.Sprintf("%v", v) {
-		t.Errorf("UserStat string is invalid: %v", v)
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/host/host_windows.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/host/host_windows.go
deleted file mode 100644
index 13890bf2b..000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/host/host_windows.go
+++ /dev/null
@@ -1,135 +0,0 @@
-// +build windows
-
-package host
-
-import (
-	"fmt"
-	"os"
-	"runtime"
-	"strings"
-	"time"
-
-	"github.com/StackExchange/wmi"
-
-	"github.com/shirou/gopsutil/internal/common"
-	process "github.com/shirou/gopsutil/process"
-)
-
-var (
-	procGetSystemTimeAsFileTime = common.Modkernel32.NewProc("GetSystemTimeAsFileTime")
-	osInfo                      *Win32_OperatingSystem
-)
-
-type Win32_OperatingSystem struct {
-	Version        string
-	Caption        string
-	ProductType    uint32
-	BuildNumber    string
-	LastBootUpTime time.Time
-}
-
-func HostInfo() (*HostInfoStat, error) {
-	ret := &HostInfoStat{
-		OS: runtime.GOOS,
-	}
-
-	hostname, err := os.Hostname()
-	if err == nil {
-		ret.Hostname = hostname
-	}
-
-	platform, family, version, err := GetPlatformInformation()
-	if err == nil {
-		ret.Platform = platform
-		ret.PlatformFamily = family
-		ret.PlatformVersion = version
-	} else {
-		return ret, err
-	}
-
-	boot, err := BootTime()
-	if err == nil {
-		ret.BootTime = boot
-		ret.Uptime = uptime(boot)
-	}
-
-	procs, err := process.Pids()
-	if err != nil {
-		return ret, err
-	}
-
-	ret.Procs = uint64(len(procs))
-
-	return ret, nil
-}
-
-func GetOSInfo() (Win32_OperatingSystem, error) {
-	var dst []Win32_OperatingSystem
-	q := wmi.CreateQuery(&dst, "")
-	err := wmi.Query(q, &dst)
-	if err != nil {
-		return Win32_OperatingSystem{}, err
-	}
-
-	osInfo = &dst[0]
-
-	return dst[0], nil
-}
-
-func BootTime() (uint64, error) {
-	if osInfo == nil {
-		_, err := GetOSInfo()
-		if err != nil {
-			return 0, err
-		}
-	}
-	now := time.Now()
-	t := osInfo.LastBootUpTime.Local()
-	return uint64(now.Sub(t).Seconds()), nil
-}
-
-func uptime(boot uint64) uint64 {
-	return uint64(time.Now().Unix()) - boot
-}
-
-func Uptime() (uint64, error) {
-	boot, err := BootTime()
-	if err != nil {
-		return 0, err
-	}
-	return uptime(boot), nil
-}
-
-func GetPlatformInformation() (platform string, family string, version string, err error) {
-	if osInfo == nil {
-		_, err = GetOSInfo()
-		if err != nil {
-			return
-		}
-	}
-
-	// Platform
-	platform = strings.Trim(osInfo.Caption, " ")
-
-	// PlatformFamily
-	switch osInfo.ProductType {
-	case 1:
-		family = "Standalone Workstation"
-	case 2:
-		family = "Server (Domain Controller)"
-	case 3:
-		family = "Server"
-	}
-
-	// Platform Version
-	version = fmt.Sprintf("%s Build %s", osInfo.Version, osInfo.BuildNumber)
-
-	return
-}
-
-func Users() ([]UserStat, error) {
-
-	var ret []UserStat
-
-	return ret, nil
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/host/types_darwin.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/host/types_darwin.go
deleted file mode 100644
index b85822788..000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/host/types_darwin.go
+++ /dev/null
@@ -1,17 +0,0 @@
-// +build ignore
-// plus hand editing about timeval
-
-/*
-Input to cgo -godefs.
-*/
-
-package host
-
-/*
-#include <sys/time.h>
-#include <utmpx.h>
-*/
-import "C"
-
-type Utmpx C.struct_utmpx
-type Timeval C.struct_timeval
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/host/types_freebsd.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/host/types_freebsd.go
deleted file mode 100644
index 113b22eea..000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/host/types_freebsd.go
+++ /dev/null
@@ -1,43 +0,0 @@
-// +build ignore
-
-/*
-Input to cgo -godefs.
-*/
-
-package host
-
-/*
-#define KERNEL
-#include <sys/types.h>
-#include <sys/time.h>
-#include <utmpx.h>
-
-enum {
-	sizeofPtr = sizeof(void*),
-};
-
-*/
-import "C"
-
-// Machine characteristics; for internal use.
-
-const (
-	sizeofPtr      = C.sizeofPtr
-	sizeofShort    = C.sizeof_short
-	sizeofInt      = C.sizeof_int
-	sizeofLong     = C.sizeof_long
-	sizeofLongLong = C.sizeof_longlong
-)
-
-// Basic types
-
-type (
-	_C_short     C.short
-	_C_int       C.int
-	_C_long      C.long
-	_C_long_long C.longlong
-)
-
-type Utmp C.struct_utmp
-type Utmpx C.struct_utmpx
-type Timeval C.struct_timeval
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/host/types_linux.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/host/types_linux.go
deleted file mode 100644
index 928545515..000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/host/types_linux.go
+++ /dev/null
@@ -1,45 +0,0 @@
-// +build ignore
-
-/*
-Input to cgo -godefs.
-*/
-
-package host
-
-/*
-#define KERNEL
-#include <sys/types.h>
-#include <utmp.h>
-
-enum {
-	sizeofPtr = sizeof(void*),
-};
-
-*/
-import "C"
-
-// Machine characteristics; for internal use.
-
-const (
-	sizeofPtr      = C.sizeofPtr
-	sizeofShort    = C.sizeof_short
-	sizeofInt      = C.sizeof_int
-	sizeofLong     = C.sizeof_long
-	sizeofLongLong = C.sizeof_longlong
-)
-
-// Basic types
-
-type (
-	_C_short     C.short
-	_C_int       C.int
-	_C_long      C.long
-	_C_long_long C.longlong
-)
-
-type utmp C.struct_utmp
-type exit_status C.struct_exit_status
-type UtTv struct {
-	TvSec  int32
-	TvUsec int32
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/load/load.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/load/load.go
deleted file mode 100644
index 58746e72e..000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/load/load.go
+++ /dev/null
@@ -1,16 +0,0 @@
-package load
-
-import (
-	"encoding/json"
-)
-
-type LoadAvgStat struct {
-	Load1  float64 `json:"load1"`
-	Load5  float64 `json:"load5"`
-	Load15 float64 `json:"load15"`
-}
-
-func (l LoadAvgStat) String() string {
-	s, _ := json.Marshal(l)
-	return string(s)
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/load/load_darwin.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/load/load_darwin.go
deleted file mode 100644
index 0d1c7ecc0..000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/load/load_darwin.go
+++ /dev/null
@@ -1,37 +0,0 @@
-// +build darwin
-
-package load
-
-import (
-	"strconv"
-
-	"github.com/shirou/gopsutil/internal/common"
-)
-
-func LoadAvg() (*LoadAvgStat, error) {
-	values, err := common.DoSysctrl("vm.loadavg")
-	if err != nil {
-		return nil, err
-	}
-
-	load1, err := strconv.ParseFloat(values[0], 64)
-	if err != nil {
-		return nil, err
-	}
-	load5, err := strconv.ParseFloat(values[1], 64)
-	if err != nil {
-		return nil, err
-	}
-	load15, err := strconv.ParseFloat(values[2], 64)
-	if err != nil {
-		return nil, err
-	}
-
-	ret := &LoadAvgStat{
-		Load1:  float64(load1),
-		Load5:  float64(load5),
-		Load15: float64(load15),
-	}
-
-	return ret, nil
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/load/load_freebsd.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/load/load_freebsd.go
deleted file mode 100644
index e97c5698b..000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/load/load_freebsd.go
+++ /dev/null
@@ -1,37 +0,0 @@
-// +build freebsd
-
-package load
-
-import (
-	"strconv"
-
-	"github.com/shirou/gopsutil/internal/common"
-)
-
-func LoadAvg() (*LoadAvgStat, error) {
-	values, err := common.DoSysctrl("vm.loadavg")
-	if err != nil {
-		return nil, err
-	}
-
-	load1, err := strconv.ParseFloat(values[0], 64)
-	if err != nil {
-		return nil, err
-	}
-	load5, err := strconv.ParseFloat(values[1], 64)
-	if err != nil {
-		return nil, err
-	}
-	load15, err := strconv.ParseFloat(values[2], 64)
-	if err != nil {
-		return nil, err
-	}
-
-	ret := &LoadAvgStat{
-		Load1:  float64(load1),
-		Load5:  float64(load5),
-		Load15: float64(load15),
-	}
-
-	return ret, nil
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/load/load_linux.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/load/load_linux.go
deleted file mode 100644
index 80621c966..000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/load/load_linux.go
+++ /dev/null
@@ -1,42 +0,0 @@
-// +build linux
-
-package load
-
-import (
-	"io/ioutil"
-	"strconv"
-	"strings"
-
-	"github.com/shirou/gopsutil/internal/common"
-)
-
-func LoadAvg() (*LoadAvgStat, error) {
-	filename := common.HostProc("loadavg")
-	line, err := ioutil.ReadFile(filename)
-	if err != nil {
-		return nil, err
-	}
-
-	values := strings.Fields(string(line))
-
-	load1, err := strconv.ParseFloat(values[0], 64)
-	if err != nil {
-		return nil, err
-	}
-	load5, err := strconv.ParseFloat(values[1], 64)
-	if err != nil {
-		return nil, err
-	}
-	load15, err := strconv.ParseFloat(values[2], 64)
-	if err != nil {
-		return nil, err
-	}
-
-	ret := &LoadAvgStat{
-		Load1:  load1,
-		Load5:  load5,
-		Load15: load15,
-	}
-
-	return ret, nil
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/load/load_test.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/load/load_test.go
deleted file mode 100644
index 39cee399f..000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/load/load_test.go
+++ /dev/null
@@ -1,30 +0,0 @@
-package load
-
-import (
-	"fmt"
-	"testing"
-)
-
-func TestLoad(t *testing.T) {
-	v, err := LoadAvg()
-	if err != nil {
-		t.Errorf("error %v", err)
-	}
-
-	empty := &LoadAvgStat{}
-	if v == empty {
-		t.Errorf("error load: %v", v)
-	}
-}
-
-func TestLoadAvgStat_String(t *testing.T) {
-	v := LoadAvgStat{
-		Load1:  10.1,
-		Load5:  20.1,
-		Load15: 30.1,
-	}
-	e := `{"load1":10.1,"load5":20.1,"load15":30.1}`
-	if e != fmt.Sprintf("%v", v) {
-		t.Errorf("LoadAvgStat string is invalid: %v", v)
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/load/load_windows.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/load/load_windows.go
deleted file mode 100644
index 65a6ba730..000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/load/load_windows.go
+++ /dev/null
@@ -1,13 +0,0 @@
-// +build windows
-
-package load
-
-import (
-	"github.com/shirou/gopsutil/internal/common"
-)
-
-func LoadAvg() (*LoadAvgStat, error) {
-	ret := LoadAvgStat{}
-
-	return &ret, common.NotImplementedError
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/mem/mem.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/mem/mem.go
deleted file mode 100644
index 67f8741e7..000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/mem/mem.go
+++ /dev/null
@@ -1,38 +0,0 @@
-package mem
-
-import (
-	"encoding/json"
-)
-
-type VirtualMemoryStat struct {
-	Total       uint64  `json:"total"`
-	Available   uint64  `json:"available"`
-	Used        uint64  `json:"used"`
-	UsedPercent float64 `json:"used_percent"`
-	Free        uint64  `json:"free"`
-	Active      uint64  `json:"active"`
-	Inactive    uint64  `json:"inactive"`
-	Buffers     uint64  `json:"buffers"`
-	Cached      uint64  `json:"cached"`
-	Wired       uint64  `json:"wired"`
-	Shared      uint64  `json:"shared"`
-}
-
-type SwapMemoryStat struct {
-	Total       uint64  `json:"total"`
-	Used        uint64  `json:"used"`
-	Free        uint64  `json:"free"`
-	UsedPercent float64 `json:"used_percent"`
-	Sin         uint64  `json:"sin"`
-	Sout        uint64  `json:"sout"`
-}
-
-func (m VirtualMemoryStat) String() string {
-	s, _ := json.Marshal(m)
-	return string(s)
-}
-
-func (m SwapMemoryStat) String() string {
-	s, _ := json.Marshal(m)
-	return string(s)
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/mem/mem_darwin.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/mem/mem_darwin.go
deleted file mode 100644
index ba4dbd826..000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/mem/mem_darwin.go
+++ /dev/null
@@ -1,153 +0,0 @@
-// +build darwin
-
-package mem
-
-import (
-	"os/exec"
-	"strconv"
-	"strings"
-
-	"github.com/shirou/gopsutil/internal/common"
-)
-
-func getPageSize() (uint64, error) {
-	out, err := exec.Command("pagesize").Output()
-	if err != nil {
-		return 0, err
-	}
-	o := strings.TrimSpace(string(out))
-	p, err := strconv.ParseUint(o, 10, 64)
-	if err != nil {
-		return 0, err
-	}
-	return p, nil
-}
-
-// Runs vm_stat and returns Free and inactive pages
-func getVmStat(pagesize uint64, vms *VirtualMemoryStat) error {
-	out, err := exec.Command("vm_stat").Output()
-	if err != nil {
-		return err
-	}
-	return parseVmStat(string(out), pagesize, vms)
-}
-
-func parseVmStat(out string, pagesize uint64, vms *VirtualMemoryStat) error {
-	var err error
-
-	lines := strings.Split(out, "\n")
-	for _, line := range lines {
-		fields := strings.Split(line, ":")
-		if len(fields) < 2 {
-			continue
-		}
-		key := strings.TrimSpace(fields[0])
-		value := strings.Trim(fields[1], " .")
-		switch key {
-		case "Pages free":
-			free, e := strconv.ParseUint(value, 10, 64)
-			if e != nil {
-				err = e
-			}
-			vms.Free = free * pagesize
-		case "Pages inactive":
-			inactive, e := strconv.ParseUint(value, 10, 64)
-			if e != nil {
-				err = e
-			}
-			vms.Cached += inactive * pagesize
-			vms.Inactive = inactive * pagesize
-		case "Pages active":
-			active, e := strconv.ParseUint(value, 10, 64)
-			if e != nil {
-				err = e
-			}
-			vms.Active = active * pagesize
-		case "Pages wired down":
-			wired, e := strconv.ParseUint(value, 10, 64)
-			if e != nil {
-				err = e
-			}
-			vms.Wired = wired * pagesize
-		case "Pages purgeable":
-			purgeable, e := strconv.ParseUint(value, 10, 64)
-			if e != nil {
-				err = e
-			}
-			vms.Cached += purgeable * pagesize
-		}
-	}
-	return err
-}
-
-// VirtualMemory returns VirtualmemoryStat.
-func VirtualMemory() (*VirtualMemoryStat, error) {
-	ret := &VirtualMemoryStat{}
-
-	p, err := getPageSize()
-	if err != nil {
-		return nil, err
-	}
-	t, err := common.DoSysctrl("hw.memsize")
-	if err != nil {
-		return nil, err
-	}
-	total, err := strconv.ParseUint(t[0], 10, 64)
-	if err != nil {
-		return nil, err
-	}
-	err = getVmStat(p, ret)
-	if err != nil {
-		return nil, err
-	}
-
-	ret.Available = ret.Free + ret.Cached
-	ret.Total = total
-
-	ret.Used = ret.Total - ret.Free
-	ret.UsedPercent = float64(ret.Total-ret.Available) / float64(ret.Total) * 100.0
-
-	return ret, nil
-}
-
-// SwapMemory returns swapinfo.
-func SwapMemory() (*SwapMemoryStat, error) {
-	var ret *SwapMemoryStat
-
-	swapUsage, err := common.DoSysctrl("vm.swapusage")
-	if err != nil {
-		return ret, err
-	}
-
-	total := strings.Replace(swapUsage[2], "M", "", 1)
-	used := strings.Replace(swapUsage[5], "M", "", 1)
-	free := strings.Replace(swapUsage[8], "M", "", 1)
-
-	total_v, err := strconv.ParseFloat(total, 64)
-	if err != nil {
-		return nil, err
-	}
-	used_v, err := strconv.ParseFloat(used, 64)
-	if err != nil {
-		return nil, err
-	}
-	free_v, err := strconv.ParseFloat(free, 64)
-	if err != nil {
-		return nil, err
-	}
-
-	u := float64(0)
-	if total_v != 0 {
-		u = ((total_v - free_v) / total_v) * 100.0
-	}
-
-	// vm.swapusage shows "M", multiply 1000
-	ret = &SwapMemoryStat{
-		Total:       uint64(total_v * 1000),
-		Used:        uint64(used_v * 1000),
-		Free:        uint64(free_v * 1000),
-		UsedPercent: u,
-	}
-
-	return ret, nil
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/mem/mem_darwin_test.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/mem/mem_darwin_test.go
deleted file mode 100644
index 730dc52f3..000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/mem/mem_darwin_test.go
+++ /dev/null
@@ -1,67 +0,0 @@
-// +build darwin
-
-package mem
-
-import (
-	"testing"
-)
-
-var vm_stat_out = `
-Mach Virtual Memory Statistics: (page size of 4096 bytes)
-Pages free:                              105885.
-Pages active:                            725641.
-Pages inactive:                          449242.
-Pages speculative:                         6155.
-Pages throttled:                              0.
-Pages wired down:                        560835.
-Pages purgeable:                         128967.
-"Translation faults":                 622528839.
-Pages copy-on-write:                   17697839.
-Pages zero filled:                    311034413.
-Pages reactivated:                      4705104.
-Pages purged:                           5605610.
-File-backed pages:                       349192.
-Anonymous pages:                         831846.
-Pages stored in compressor:              876507.
-Pages occupied by compressor:            249167.
-Decompressions:                         4555025.
-Compressions:                           7524729.
-Pageins:                               40532443.
-Pageouts:                                126496.
-Swapins:                                2988073.
-Swapouts:                               3283599.
-`
-
-func TestParseVmStat(t *testing.T) {
-	ret := &VirtualMemoryStat{}
-	err := parseVmStat(vm_stat_out, 4096, ret)
-
-	if err != nil {
-		t.Errorf("Expected no error, got %s\n", err.Error())
-	}
-
-	if ret.Free != uint64(105885*4096) {
-		t.Errorf("Free pages, actual: %d, expected: %d", ret.Free,
-			105885*4096)
-	}
-
-	if ret.Inactive != uint64(449242*4096) {
-		t.Errorf("Inactive pages, actual: %d, expected: %d", ret.Inactive,
-			449242*4096)
-	}
-
-	if ret.Active != uint64(725641*4096) {
-		t.Errorf("Active pages, actual: %d, expected: %d", ret.Active,
-			725641*4096)
-	}
-
-	if ret.Wired != uint64(560835*4096) {
-		t.Errorf("Wired pages, actual: %d, expected: %d", ret.Wired,
-			560835*4096)
-	}
-
-	if ret.Cached != uint64(128967*4096+449242.*4096) {
-		t.Errorf("Cached pages, actual: %d, expected: %f", ret.Cached,
-			128967*4096+449242.*4096)
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/mem/mem_freebsd.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/mem/mem_freebsd.go
deleted file mode 100644
index 0cb33abc4..000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/mem/mem_freebsd.go
+++ /dev/null
@@ -1,128 +0,0 @@
-// +build freebsd
-
-package mem
-
-import (
-	"os/exec"
-	"strconv"
-	"strings"
-	"errors"
-	"github.com/shirou/gopsutil/internal/common"
-)
-
-func VirtualMemory() (*VirtualMemoryStat, error) {
-	pageSize, err := common.DoSysctrl("vm.stats.vm.v_page_size")
-	if err != nil {
-		return nil, err
-	}
-	p, err := strconv.ParseUint(pageSize[0], 10, 64)
-	if err != nil {
-		return nil, err
-	}
-
-	pageCount, err := common.DoSysctrl("vm.stats.vm.v_page_count")
-	if err != nil {
-		return nil, err
-	}
-	free, err := common.DoSysctrl("vm.stats.vm.v_free_count")
-	if err != nil {
-		return nil, err
-	}
-	active, err := common.DoSysctrl("vm.stats.vm.v_active_count")
-	if err != nil {
-		return nil, err
-	}
-	inactive, err := common.DoSysctrl("vm.stats.vm.v_inactive_count")
-	if err != nil {
-		return nil, err
-	}
-	cache, err := common.DoSysctrl("vm.stats.vm.v_cache_count")
-	if err != nil {
-		return nil, err
-	}
-	buffer, err := common.DoSysctrl("vfs.bufspace")
-	if err != nil {
-		return nil, err
-	}
-	wired, err := common.DoSysctrl("vm.stats.vm.v_wire_count")
-	if err != nil {
-		return nil, err
-	}
-
-	parsed := make([]uint64, 0, 7)
-	vv := []string{
-		pageCount[0],
-		free[0],
-		active[0],
-		inactive[0],
-		cache[0],
-		buffer[0],
-		wired[0],
-	}
-	for _, target := range vv {
-		t, err := strconv.ParseUint(target, 10, 64)
-		if err != nil {
-			return nil, err
-		}
-		parsed = append(parsed, t)
-	}
-
-	ret := &VirtualMemoryStat{
-		Total:    parsed[0] * p,
-		Free:     parsed[1] * p,
-		Active:   parsed[2] * p,
-		Inactive: parsed[3] * p,
-		Cached:   parsed[4] * p,
-		Buffers:  parsed[5],
-		Wired:    parsed[6] * p,
-	}
-
-	ret.Available = ret.Inactive + ret.Cached + ret.Free
-	ret.Used = ret.Active + ret.Wired + ret.Cached
-	ret.UsedPercent = float64(ret.Total-ret.Available) / float64(ret.Total) * 100.0
-
-	return ret, nil
-}
-
-// Return swapinfo
-// FreeBSD can have multiple swap devices. but use only first device
-func SwapMemory() (*SwapMemoryStat, error) {
-	out, err := exec.Command("swapinfo").Output()
-	if err != nil {
-		return nil, err
-	}
-	for _, line := range strings.Split(string(out), "\n") {
-		values := strings.Fields(line)
-		// skip title line
-		if len(values) == 0 || values[0] == "Device" {
-			continue
-		}
-
-		u := strings.Replace(values[4], "%", "", 1)
-		total_v, err := strconv.ParseUint(values[1], 10, 64)
-		if err != nil {
-			return nil, err
-		}
-		used_v, err := strconv.ParseUint(values[2], 10, 64)
-		if err != nil {
-			return nil, err
-		}
-		free_v, err := strconv.ParseUint(values[3], 10, 64)
-		if err != nil {
-			return nil, err
-		}
-		up_v, err := strconv.ParseFloat(u, 64)
-		if err != nil {
-			return nil, err
-		}
-
-		return &SwapMemoryStat{
-			Total:       total_v,
-			Used:        used_v,
-			Free:        free_v,
-			UsedPercent: up_v,
-		}, nil
-	}
-
-	return nil, errors.New("no swap devices found")
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/mem/mem_linux.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/mem/mem_linux.go
deleted file mode 100644
index fc9226219..000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/mem/mem_linux.go
+++ /dev/null
@@ -1,100 +0,0 @@
-// +build linux
-
-package mem
-
-import (
-	"strconv"
-	"strings"
-	"syscall"
-
-	"github.com/shirou/gopsutil/internal/common"
-)
-
-func VirtualMemory() (*VirtualMemoryStat, error) {
-	filename := common.HostProc("meminfo")
-	lines, _ := common.ReadLines(filename)
-	// flag if MemAvailable is in /proc/meminfo (kernel 3.14+)
-	memavail := false
-
-	ret := &VirtualMemoryStat{}
-	for _, line := range lines {
-		fields := strings.Split(line, ":")
-		if len(fields) != 2 {
-			continue
-		}
-		key := strings.TrimSpace(fields[0])
-		value := strings.TrimSpace(fields[1])
-		value = strings.Replace(value, " kB", "", -1)
-
-		t, err := strconv.ParseUint(value, 10, 64)
-		if err != nil {
-			return ret, err
-		}
-		switch key {
-		case "MemTotal":
-			ret.Total = t * 1024
-		case "MemFree":
-			ret.Free = t * 1024
-		case "MemAvailable":
-			memavail = true
-			ret.Available = t * 1024
-		case "Buffers":
-			ret.Buffers = t * 1024
-		case "Cached":
-			ret.Cached = t * 1024
-		case "Active":
-			ret.Active = t * 1024
-		case "Inactive":
-			ret.Inactive = t * 1024
-		}
-	}
-	if !memavail {
-		ret.Available = ret.Free + ret.Buffers + ret.Cached
-	}
-	ret.Used = ret.Total - ret.Free
-	ret.UsedPercent = float64(ret.Total-ret.Available) / float64(ret.Total) * 100.0
-
-	return ret, nil
-}
-
-func SwapMemory() (*SwapMemoryStat, error) {
-	sysinfo := &syscall.Sysinfo_t{}
-
-	if err := syscall.Sysinfo(sysinfo); err != nil {
-		return nil, err
-	}
-	ret := &SwapMemoryStat{
-		Total: uint64(sysinfo.Totalswap),
-		Free:  uint64(sysinfo.Freeswap),
-	}
-	ret.Used = ret.Total - ret.Free
-	//check Infinity
-	if ret.Total != 0 {
-		ret.UsedPercent = float64(ret.Total-ret.Free) / float64(ret.Total) * 100.0
-	} else {
-		ret.UsedPercent = 0
-	}
-	filename := common.HostProc("vmstat")
-	lines, _ := common.ReadLines(filename)
-	for _, l := range lines {
-		fields := strings.Fields(l)
-		if len(fields) < 2 {
-			continue
-		}
-		switch fields[0] {
-		case "pswpin":
-			value, err := strconv.ParseUint(fields[1], 10, 64)
-			if err != nil {
-				continue
-			}
-			ret.Sin = value * 4 * 1024
-		case "pswpout":
-			value, err := strconv.ParseUint(fields[1], 10, 64)
-			if err != nil {
-				continue
-			}
-			ret.Sout = value * 4 * 1024
-		}
-	}
-	return ret, nil
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/mem/mem_test.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/mem/mem_test.go
deleted file mode 100644
index 28693574a..000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/mem/mem_test.go
+++ /dev/null
@@ -1,55 +0,0 @@
-package mem
-
-import (
-	"fmt"
-	"testing"
-)
-
-func TestVirtual_memory(t *testing.T) {
-	v, err := VirtualMemory()
-	if err != nil {
-		t.Errorf("error %v", err)
-	}
-	empty := &VirtualMemoryStat{}
-	if v == empty {
-		t.Errorf("error %v", v)
-	}
-}
-
-func TestSwap_memory(t *testing.T) {
-	v, err := SwapMemory()
-	if err != nil {
-		t.Errorf("error %v", err)
-	}
-	empty := &SwapMemoryStat{}
-	if v == empty {
-		t.Errorf("error %v", v)
-	}
-}
-
-func TestVirtualMemoryStat_String(t *testing.T) {
-	v := VirtualMemoryStat{
-		Total:       10,
-		Available:   20,
-		Used:        30,
-		UsedPercent: 30.1,
-		Free:        40,
-	}
-	e := `{"total":10,"available":20,"used":30,"used_percent":30.1,"free":40,"active":0,"inactive":0,"buffers":0,"cached":0,"wired":0,"shared":0}`
-	if e != fmt.Sprintf("%v", v) {
-		t.Errorf("VirtualMemoryStat string is invalid: %v", v)
-	}
-}
-
-func TestSwapMemoryStat_String(t *testing.T) {
-	v := SwapMemoryStat{
-		Total:       10,
-		Used:        30,
-		Free:        40,
-		UsedPercent: 30.1,
-	}
-	e := `{"total":10,"used":30,"free":40,"used_percent":30.1,"sin":0,"sout":0}`
-	if e != fmt.Sprintf("%v", v) {
-		t.Errorf("SwapMemoryStat string is invalid: %v", v)
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/mem/mem_windows.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/mem/mem_windows.go
deleted file mode 100644
index 2696da58e..000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/mem/mem_windows.go
+++ /dev/null
@@ -1,50 +0,0 @@
-// +build windows
-
-package mem
-
-import (
-	"syscall"
-	"unsafe"
-
-	"github.com/shirou/gopsutil/internal/common"
-)
-
-var (
-	procGlobalMemoryStatusEx = common.Modkernel32.NewProc("GlobalMemoryStatusEx")
-)
-
-type MEMORYSTATUSEX struct {
-	cbSize                  uint32
-	dwMemoryLoad            uint32
-	ullTotalPhys            uint64 // in bytes
-	ullAvailPhys            uint64
-	ullTotalPageFile        uint64
-	ullAvailPageFile        uint64
-	ullTotalVirtual         uint64
-	ullAvailVirtual         uint64
-	ullAvailExtendedVirtual uint64
-}
-
-func VirtualMemory() (*VirtualMemoryStat, error) {
-	var memInfo MEMORYSTATUSEX
-	memInfo.cbSize = uint32(unsafe.Sizeof(memInfo))
-	mem, _, _ := procGlobalMemoryStatusEx.Call(uintptr(unsafe.Pointer(&memInfo)))
-	if mem == 0 {
-		return nil, syscall.GetLastError()
-	}
-
-	ret := &VirtualMemoryStat{
-		Total:       memInfo.ullTotalPhys,
-		Available:   memInfo.ullAvailPhys,
-		UsedPercent: float64(memInfo.dwMemoryLoad),
-	}
-
-	ret.Used = ret.Total - ret.Available
-	return ret, nil
-}
-
-func SwapMemory() (*SwapMemoryStat, error) {
-	ret := &SwapMemoryStat{}
-
-	return ret, nil
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/net/net.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/net/net.go
deleted file mode 100644
index 61f9abf04..000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/net/net.go
+++ /dev/null
@@ -1,238 +0,0 @@
-package net
-
-import (
-	"encoding/json"
-	"fmt"
-	"net"
-	"strconv"
-	"strings"
-	"syscall"
-
-	"github.com/shirou/gopsutil/internal/common"
-)
-
-var invoke common.Invoker
-
-func init() {
-	invoke = common.Invoke{}
-}
-
-type NetIOCountersStat struct {
-	Name        string `json:"name"`         // interface name
-	BytesSent   uint64 `json:"bytes_sent"`   // number of bytes sent
-	BytesRecv   uint64 `json:"bytes_recv"`   // number of bytes received
-	PacketsSent uint64 `json:"packets_sent"` // number of packets sent
-	PacketsRecv uint64 `json:"packets_recv"` // number of packets received
-	Errin       uint64 `json:"errin"`        // total number of errors while receiving
-	Errout      uint64 `json:"errout"`       // total number of errors while sending
-	Dropin      uint64 `json:"dropin"`       // total number of incoming packets which were dropped
-	Dropout     uint64 `json:"dropout"`      // total number of outgoing packets which were dropped (always 0 on OSX and BSD)
-}
-
-// Addr is implemented compatibility to psutil
-type Addr struct {
-	IP   string `json:"ip"`
-	Port uint32 `json:"port"`
-}
-
-type NetConnectionStat struct {
-	Fd     uint32 `json:"fd"`
-	Family uint32 `json:"family"`
-	Type   uint32 `json:"type"`
-	Laddr  Addr   `json:"localaddr"`
-	Raddr  Addr   `json:"remoteaddr"`
-	Status string `json:"status"`
-	Pid    int32  `json:"pid"`
-}
-
-// System wide stats about different network protocols
-type NetProtoCountersStat struct {
-	Protocol string           `json:"protocol"`
-	Stats    map[string]int64 `json:"stats"`
-}
-
-// NetInterfaceAddr is designed for represent interface addresses
-type NetInterfaceAddr struct {
-	Addr string `json:"addr"`
-}
-
-type NetInterfaceStat struct {
-	MTU          int                `json:"mtu"`          // maximum transmission unit
-	Name         string             `json:"name"`         // e.g., "en0", "lo0", "eth0.100"
-	HardwareAddr string             `json:"hardwareaddr"` // IEEE MAC-48, EUI-48 and EUI-64 form
-	Flags        []string           `json:"flags"`        // e.g., FlagUp, FlagLoopback, FlagMulticast
-	Addrs        []NetInterfaceAddr `json:"addrs"`
-}
-
-var constMap = map[string]int{
-	"TCP":  syscall.SOCK_STREAM,
-	"UDP":  syscall.SOCK_DGRAM,
-	"IPv4": syscall.AF_INET,
-	"IPv6": syscall.AF_INET6,
-}
-
-func (n NetIOCountersStat) String() string {
-	s, _ := json.Marshal(n)
-	return string(s)
-}
-
-func (n NetConnectionStat) String() string {
-	s, _ := json.Marshal(n)
-	return string(s)
-}
-
-func (n NetProtoCountersStat) String() string {
-	s, _ := json.Marshal(n)
-	return string(s)
-}
-
-func (a Addr) String() string {
-	s, _ := json.Marshal(a)
-	return string(s)
-}
-
-func (n NetInterfaceStat) String() string {
-	s, _ := json.Marshal(n)
-	return string(s)
-}
-
-func (n NetInterfaceAddr) String() string {
-	s, _ := json.Marshal(n)
-	return string(s)
-}
-
-func NetInterfaces() ([]NetInterfaceStat, error) {
-	is, err := net.Interfaces()
-	if err != nil {
-		return nil, err
-	}
-	ret := make([]NetInterfaceStat, 0, len(is))
-	for _, ifi := range is {
-
-		var flags []string
-		if ifi.Flags&net.FlagUp != 0 {
-			flags = append(flags, "up")
-		}
-		if ifi.Flags&net.FlagBroadcast != 0 {
-			flags = append(flags, "broadcast")
-		}
-		if ifi.Flags&net.FlagLoopback != 0 {
-			flags = append(flags, "loopback")
-		}
-		if ifi.Flags&net.FlagPointToPoint != 0 {
-			flags = append(flags, "pointtopoint")
-		}
-		if ifi.Flags&net.FlagMulticast != 0 {
-			flags = append(flags, "multicast")
-		}
-
-		r := NetInterfaceStat{
-			Name:         ifi.Name,
-			MTU:          ifi.MTU,
-			HardwareAddr: ifi.HardwareAddr.String(),
-			Flags:        flags,
-		}
-		addrs, err := ifi.Addrs()
-		if err == nil {
-			r.Addrs = make([]NetInterfaceAddr, 0, len(addrs))
-			for _, addr := range addrs {
-				r.Addrs = append(r.Addrs, NetInterfaceAddr{
-					Addr: addr.String(),
-				})
-			}
-
-		}
-		ret = append(ret, r)
-	}
-
-	return ret, nil
-}
-
-func getNetIOCountersAll(n []NetIOCountersStat) ([]NetIOCountersStat, error) {
-	r := NetIOCountersStat{
-		Name: "all",
-	}
-	for _, nic := range n {
-		r.BytesRecv += nic.BytesRecv
-		r.PacketsRecv += nic.PacketsRecv
-		r.Errin += nic.Errin
-		r.Dropin += nic.Dropin
-		r.BytesSent += nic.BytesSent
-		r.PacketsSent += nic.PacketsSent
-		r.Errout += nic.Errout
-		r.Dropout += nic.Dropout
-	}
-
-	return []NetIOCountersStat{r}, nil
-}
-
-func parseNetLine(line string) (NetConnectionStat, error) {
-	f := strings.Fields(line)
-	if len(f) < 9 {
-		return NetConnectionStat{}, fmt.Errorf("wrong line,%s", line)
-	}
-
-	pid, err := strconv.Atoi(f[1])
-	if err != nil {
-		return NetConnectionStat{}, err
-	}
-	fd, err := strconv.Atoi(strings.Trim(f[3], "u"))
-	if err != nil {
-		return NetConnectionStat{}, fmt.Errorf("unknown fd, %s", f[3])
-	}
-	netFamily, ok := constMap[f[4]]
-	if !ok {
-		return NetConnectionStat{}, fmt.Errorf("unknown family, %s", f[4])
-	}
-	netType, ok := constMap[f[7]]
-	if !ok {
-		return NetConnectionStat{}, fmt.Errorf("unknown type, %s", f[7])
-	}
-
-	laddr, raddr, err := parseNetAddr(f[8])
-	if err != nil {
-		return NetConnectionStat{}, fmt.Errorf("failed to parse netaddr, %s", f[8])
-	}
-
-	n := NetConnectionStat{
-		Fd:     uint32(fd),
-		Family: uint32(netFamily),
-		Type:   uint32(netType),
-		Laddr:  laddr,
-		Raddr:  raddr,
-		Pid:    int32(pid),
-	}
-	if len(f) == 10 {
-		n.Status = strings.Trim(f[9], "()")
-	}
-
-	return n, nil
-}
-
-func parseNetAddr(line string) (laddr Addr, raddr Addr, err error) {
-	parse := func(l string) (Addr, error) {
-		host, port, err := net.SplitHostPort(l)
-		if err != nil {
-			return Addr{}, fmt.Errorf("wrong addr, %s", l)
-		}
-		lport, err := strconv.Atoi(port)
-		if err != nil {
-			return Addr{}, err
-		}
-		return Addr{IP: host, Port: uint32(lport)}, nil
-	}
-
-	addrs := strings.Split(line, "->")
-	if len(addrs) == 0 {
-		return laddr, raddr, fmt.Errorf("wrong netaddr, %s", line)
-	}
-	laddr, err = parse(addrs[0])
-	if len(addrs) == 2 { // remote addr exists
-		raddr, err = parse(addrs[1])
-		if err != nil {
-			return laddr, raddr, err
-		}
-	}
-
-	return laddr, raddr, err
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/net/net_darwin.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/net/net_darwin.go
deleted file mode 100644
index 7786f7c41..000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/net/net_darwin.go
+++ /dev/null
@@ -1,101 +0,0 @@
-// +build darwin
-
-package net
-
-import (
-	"errors"
-	"os/exec"
-	"strconv"
-	"strings"
-
-	"github.com/shirou/gopsutil/internal/common"
-)
-
-// example of netstat -idbn output on yosemite
-// Name  Mtu   Network       Address            Ipkts Ierrs     Ibytes    Opkts Oerrs     Obytes  Coll Drop
-// lo0   16384 <Link#1>                        869107     0  169411755   869107     0  169411755     0   0
-// lo0   16384 ::1/128     ::1                 869107     -  169411755   869107     -  169411755     -   -
-// lo0   16384 127           127.0.0.1         869107     -  169411755   869107     -  169411755     -   -
-func NetIOCounters(pernic bool) ([]NetIOCountersStat, error) {
-	out, err := exec.Command("/usr/sbin/netstat", "-ibdn").Output()
-	if err != nil {
-		return nil, err
-	}
-
-	lines := strings.Split(string(out), "\n")
-	ret := make([]NetIOCountersStat, 0, len(lines)-1)
-	exists := make([]string, 0, len(ret))
-
-	for _, line := range lines {
-		values := strings.Fields(line)
-		if len(values) < 1 || values[0] == "Name" {
-			// skip first line
-			continue
-		}
-		if common.StringsHas(exists, values[0]) {
-			// skip if already get
-			continue
-		}
-		exists = append(exists, values[0])
-
-		base := 1
-		// sometimes Address is ommitted
-		if len(values) < 11 {
-			base = 0
-		}
-
-		parsed := make([]uint64, 0, 7)
-		vv := []string{
-			values[base+3], // Ipkts == PacketsRecv
-			values[base+4], // Ierrs == Errin
-			values[base+5], // Ibytes == BytesRecv
-			values[base+6], // Opkts == PacketsSent
-			values[base+7], // Oerrs == Errout
-			values[base+8], // Obytes == BytesSent
-		}
-		if len(values) == 12 {
-			vv = append(vv, values[base+10])
-		}
-
-		for _, target := range vv {
-			if target == "-" {
-				parsed = append(parsed, 0)
-				continue
-			}
-
-			t, err := strconv.ParseUint(target, 10, 64)
-			if err != nil {
-				return nil, err
-			}
-			parsed = append(parsed, t)
-		}
-
-		n := NetIOCountersStat{
-			Name:        values[0],
-			PacketsRecv: parsed[0],
-			Errin:       parsed[1],
-			BytesRecv:   parsed[2],
-			PacketsSent: parsed[3],
-			Errout:      parsed[4],
-			BytesSent:   parsed[5],
-		}
-		if len(parsed) == 7 {
-			n.Dropout = parsed[6]
-		}
-		ret = append(ret, n)
-	}
-
-	if pernic == false {
-		return getNetIOCountersAll(ret)
-	}
-
-	return ret, nil
-}
-
-// NetProtoCounters returns network statistics for the entire system
-// If protocols is empty then all protocols are returned, otherwise
-// just the protocols in the list are returned.
-// Not Implemented for Darwin
-func NetProtoCounters(protocols []string) ([]NetProtoCountersStat, error) {
-	return nil, errors.New("NetProtoCounters not implemented for darwin")
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/net/net_freebsd.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/net/net_freebsd.go
deleted file mode 100644
index 6dc7a23d5..000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/net/net_freebsd.go
+++ /dev/null
@@ -1,92 +0,0 @@
-// +build freebsd
-
-package net
-
-import (
-	"errors"
-	"os/exec"
-	"strconv"
-	"strings"
-
-	"github.com/shirou/gopsutil/internal/common"
-)
-
-func NetIOCounters(pernic bool) ([]NetIOCountersStat, error) {
-	out, err := exec.Command("/usr/bin/netstat", "-ibdn").Output()
-	if err != nil {
-		return nil, err
-	}
-
-	lines := strings.Split(string(out), "\n")
-	ret := make([]NetIOCountersStat, 0, len(lines)-1)
-	exists := make([]string, 0, len(ret))
-
-	for _, line := range lines {
-		values := strings.Fields(line)
-		if len(values) < 1 || values[0] == "Name" {
-			continue
-		}
-		if common.StringsHas(exists, values[0]) {
-			// skip if already get
-			continue
-		}
-		exists = append(exists, values[0])
-
-		base := 1
-		// sometimes Address is ommitted
-		if len(values) < 13 {
-			base = 0
-		}
-
-		parsed := make([]uint64, 0, 8)
-		vv := []string{
-			values[base+3],  // PacketsRecv
-			values[base+4],  // Errin
-			values[base+5],  // Dropin
-			values[base+6],  // BytesRecvn
-			values[base+7],  // PacketSent
-			values[base+8],  // Errout
-			values[base+9],  // BytesSent
-			values[base+11], // Dropout
-		}
-		for _, target := range vv {
-			if target == "-" {
-				parsed = append(parsed, 0)
-				continue
-			}
-
-			t, err := strconv.ParseUint(target, 10, 64)
-			if err != nil {
-				return nil, err
-			}
-			parsed = append(parsed, t)
-		}
-
-		n := NetIOCountersStat{
-			Name:        values[0],
-			PacketsRecv: parsed[0],
-			Errin:       parsed[1],
-			Dropin:      parsed[2],
-			BytesRecv:   parsed[3],
-			PacketsSent: parsed[4],
-			Errout:      parsed[5],
-			BytesSent:   parsed[6],
-			Dropout:     parsed[7],
-		}
-		ret = append(ret, n)
-	}
-
-	if pernic == false {
-		return getNetIOCountersAll(ret)
-	}
-
-	return ret, nil
-}
-
-// NetProtoCounters returns network statistics for the entire system
-// If protocols is empty then all protocols are returned, otherwise
-// just the protocols in the list are returned.
-// Not Implemented for FreeBSD
-func NetProtoCounters(protocols []string) ([]NetProtoCountersStat, error) {
-	return nil, errors.New("NetProtoCounters not implemented for freebsd")
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/net/net_linux.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/net/net_linux.go
deleted file mode 100644
index 51d80913c..000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/net/net_linux.go
+++ /dev/null
@@ -1,162 +0,0 @@
-// +build linux
-
-package net
-
-import (
-	"errors"
-	"strconv"
-	"strings"
-
-	"github.com/shirou/gopsutil/internal/common"
-)
-
-// NetIOCounters returnes network I/O statistics for every network
-// interface installed on the system.  If pernic argument is false,
-// return only sum of all information (which name is 'all'). If true,
-// every network interface installed on the system is returned
-// separately.
-func NetIOCounters(pernic bool) ([]NetIOCountersStat, error) {
-	filename := common.HostProc("net/dev")
-	lines, err := common.ReadLines(filename)
-	if err != nil {
-		return nil, err
-	}
-
-	statlen := len(lines) - 1
-
-	ret := make([]NetIOCountersStat, 0, statlen)
-
-	for _, line := range lines[2:] {
-		parts := strings.SplitN(line, ":", 2)
-		if len(parts) != 2 {
-			continue
-		}
-		interfaceName := strings.TrimSpace(parts[0])
-		if interfaceName == "" {
-			continue
-		}
-
-		fields := strings.Fields(strings.TrimSpace(parts[1]))
-		bytesRecv, err := strconv.ParseUint(fields[0], 10, 64)
-		if err != nil {
-			return ret, err
-		}
-		packetsRecv, err := strconv.ParseUint(fields[1], 10, 64)
-		if err != nil {
-			return ret, err
-		}
-		errIn, err := strconv.ParseUint(fields[2], 10, 64)
-		if err != nil {
-			return ret, err
-		}
-		dropIn, err := strconv.ParseUint(fields[3], 10, 64)
-		if err != nil {
-			return ret, err
-		}
-		bytesSent, err := strconv.ParseUint(fields[8], 10, 64)
-		if err != nil {
-			return ret, err
-		}
-		packetsSent, err := strconv.ParseUint(fields[9], 10, 64)
-		if err != nil {
-			return ret, err
-		}
-		errOut, err := strconv.ParseUint(fields[10], 10, 64)
-		if err != nil {
-			return ret, err
-		}
-		dropOut, err := strconv.ParseUint(fields[13], 10, 64)
-		if err != nil {
-			return ret, err
-		}
-
-		nic := NetIOCountersStat{
-			Name:        interfaceName,
-			BytesRecv:   bytesRecv,
-			PacketsRecv: packetsRecv,
-			Errin:       errIn,
-			Dropin:      dropIn,
-			BytesSent:   bytesSent,
-			PacketsSent: packetsSent,
-			Errout:      errOut,
-			Dropout:     dropOut,
-		}
-		ret = append(ret, nic)
-	}
-
-	if pernic == false {
-		return getNetIOCountersAll(ret)
-	}
-
-	return ret, nil
-}
-
-var netProtocols = []string{
-	"ip",
-	"icmp",
-	"icmpmsg",
-	"tcp",
-	"udp",
-	"udplite",
-}
-
-// NetProtoCounters returns network statistics for the entire system
-// If protocols is empty then all protocols are returned, otherwise
-// just the protocols in the list are returned.
-// Available protocols:
-//   ip,icmp,icmpmsg,tcp,udp,udplite
-func NetProtoCounters(protocols []string) ([]NetProtoCountersStat, error) {
-	if len(protocols) == 0 {
-		protocols = netProtocols
-	}
-
-	stats := make([]NetProtoCountersStat, 0, len(protocols))
-	protos := make(map[string]bool, len(protocols))
-	for _, p := range protocols {
-		protos[p] = true
-	}
-
-	filename := "/proc/net/snmp"
-	lines, err := common.ReadLines(filename)
-	if err != nil {
-		return nil, err
-	}
-
-	linecount := len(lines)
-	for i := 0; i < linecount; i++ {
-		line := lines[i]
-		r := strings.IndexRune(line, ':')
-		if r == -1 {
-			return nil, errors.New(filename + " is not fomatted correctly, expected ':'.")
-		}
-		proto := strings.ToLower(line[:r])
-		if !protos[proto] {
-			// skip protocol and data line
-			i++
-			continue
-		}
-
-		// Read header line
-		statNames := strings.Split(line[r+2:], " ")
-
-		// Read data line
-		i++
-		statValues := strings.Split(lines[i][r+2:], " ")
-		if len(statNames) != len(statValues) {
-			return nil, errors.New(filename + " is not fomatted correctly, expected same number of columns.")
-		}
-		stat := NetProtoCountersStat{
-			Protocol: proto,
-			Stats:    make(map[string]int64, len(statNames)),
-		}
-		for j := range statNames {
-			value, err := strconv.ParseInt(statValues[j], 10, 64)
-			if err != nil {
-				return nil, err
-			}
-			stat.Stats[statNames[j]] = value
-		}
-		stats = append(stats, stat)
-	}
-	return stats, nil
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/net/net_test.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/net/net_test.go
deleted file mode 100644
index 187c320d1..000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/net/net_test.go
+++ /dev/null
@@ -1,198 +0,0 @@
-package net
-
-import (
-	"fmt"
-	"os"
-	"testing"
-)
-
-func TestAddrString(t *testing.T) {
-	v := Addr{IP: "192.168.0.1", Port: 8000}
-
-	s := fmt.Sprintf("%v", v)
-	if s != "{\"ip\":\"192.168.0.1\",\"port\":8000}" {
-		t.Errorf("Addr string is invalid: %v", v)
-	}
-}
-
-func TestNetIOCountersStatString(t *testing.T) {
-	v := NetIOCountersStat{
-		Name:      "test",
-		BytesSent: 100,
-	}
-	e := `{"name":"test","bytes_sent":100,"bytes_recv":0,"packets_sent":0,"packets_recv":0,"errin":0,"errout":0,"dropin":0,"dropout":0}`
-	if e != fmt.Sprintf("%v", v) {
-		t.Errorf("NetIOCountersStat string is invalid: %v", v)
-	}
-}
-
-func TestNetProtoCountersStatString(t *testing.T) {
-	v := NetProtoCountersStat{
-		Protocol: "tcp",
-		Stats: map[string]int64{
-			"MaxConn":      -1,
-			"ActiveOpens":  4000,
-			"PassiveOpens": 3000,
-		},
-	}
-	e := `{"protocol":"tcp","stats":{"ActiveOpens":4000,"MaxConn":-1,"PassiveOpens":3000}}`
-	if e != fmt.Sprintf("%v", v) {
-		t.Errorf("NetProtoCountersStat string is invalid: %v", v)
-	}
-
-}
-
-func TestNetConnectionStatString(t *testing.T) {
-	v := NetConnectionStat{
-		Fd:     10,
-		Family: 10,
-		Type:   10,
-	}
-	e := `{"fd":10,"family":10,"type":10,"localaddr":{"ip":"","port":0},"remoteaddr":{"ip":"","port":0},"status":"","pid":0}`
-	if e != fmt.Sprintf("%v", v) {
-		t.Errorf("NetConnectionStat string is invalid: %v", v)
-	}
-
-}
-
-func TestNetIOCountersAll(t *testing.T) {
-	v, err := NetIOCounters(false)
-	per, err := NetIOCounters(true)
-	if err != nil {
-		t.Errorf("Could not get NetIOCounters: %v", err)
-	}
-	if len(v) != 1 {
-		t.Errorf("Could not get NetIOCounters: %v", v)
-	}
-	if v[0].Name != "all" {
-		t.Errorf("Invalid NetIOCounters: %v", v)
-	}
-	var pr uint64
-	for _, p := range per {
-		pr += p.PacketsRecv
-	}
-	if v[0].PacketsRecv != pr {
-		t.Errorf("invalid sum value: %v, %v", v[0].PacketsRecv, pr)
-	}
-}
-
-func TestNetIOCountersPerNic(t *testing.T) {
-	v, err := NetIOCounters(true)
-	if err != nil {
-		t.Errorf("Could not get NetIOCounters: %v", err)
-	}
-	if len(v) == 0 {
-		t.Errorf("Could not get NetIOCounters: %v", v)
-	}
-	for _, vv := range v {
-		if vv.Name == "" {
-			t.Errorf("Invalid NetIOCounters: %v", vv)
-		}
-	}
-}
-
-func Test_getNetIOCountersAll(t *testing.T) {
-	n := []NetIOCountersStat{
-		NetIOCountersStat{
-			Name:        "a",
-			BytesRecv:   10,
-			PacketsRecv: 10,
-		},
-		NetIOCountersStat{
-			Name:        "b",
-			BytesRecv:   10,
-			PacketsRecv: 10,
-			Errin:       10,
-		},
-	}
-	ret, err := getNetIOCountersAll(n)
-	if err != nil {
-		t.Error(err)
-	}
-	if len(ret) != 1 {
-		t.Errorf("invalid return count")
-	}
-	if ret[0].Name != "all" {
-		t.Errorf("invalid return name")
-	}
-	if ret[0].BytesRecv != 20 {
-		t.Errorf("invalid count bytesrecv")
-	}
-	if ret[0].Errin != 10 {
-		t.Errorf("invalid count errin")
-	}
-}
-
-func TestNetInterfaces(t *testing.T) {
-	v, err := NetInterfaces()
-	if err != nil {
-		t.Errorf("Could not get NetInterfaceStat: %v", err)
-	}
-	if len(v) == 0 {
-		t.Errorf("Could not get NetInterfaceStat: %v", err)
-	}
-	for _, vv := range v {
-		if vv.Name == "" {
-			t.Errorf("Invalid NetInterface: %v", vv)
-		}
-	}
-}
-
-func TestNetProtoCountersStatsAll(t *testing.T) {
-	v, err := NetProtoCounters(nil)
-	if err != nil {
-		t.Fatalf("Could not get NetProtoCounters: %v", err)
-	}
-	if len(v) == 0 {
-		t.Fatalf("Could not get NetProtoCounters: %v", err)
-	}
-	for _, vv := range v {
-		if vv.Protocol == "" {
-			t.Errorf("Invalid NetProtoCountersStat: %v", vv)
-		}
-		if len(vv.Stats) == 0 {
-			t.Errorf("Invalid NetProtoCountersStat: %v", vv)
-		}
-	}
-}
-
-func TestNetProtoCountersStats(t *testing.T) {
-	v, err := NetProtoCounters([]string{"tcp", "ip"})
-	if err != nil {
-		t.Fatalf("Could not get NetProtoCounters: %v", err)
-	}
-	if len(v) == 0 {
-		t.Fatalf("Could not get NetProtoCounters: %v", err)
-	}
-	if len(v) != 2 {
-		t.Fatalf("Go incorrect number of NetProtoCounters: %v", err)
-	}
-	for _, vv := range v {
-		if vv.Protocol != "tcp" && vv.Protocol != "ip" {
-			t.Errorf("Invalid NetProtoCountersStat: %v", vv)
-		}
-		if len(vv.Stats) == 0 {
-			t.Errorf("Invalid NetProtoCountersStat: %v", vv)
-		}
-	}
-}
-
-func TestNetConnections(t *testing.T) {
-	if ci := os.Getenv("CI"); ci != "" { // skip if test on drone.io
-		return
-	}
-
-	v, err := NetConnections("inet")
-	if err != nil {
-		t.Errorf("could not get NetConnections: %v", err)
-	}
-	if len(v) == 0 {
-		t.Errorf("could not get NetConnections: %v", v)
-	}
-	for _, vv := range v {
-		if vv.Family == 0 {
-			t.Errorf("invalid NetConnections: %v", vv)
-		}
-	}
-
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/net/net_unix.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/net/net_unix.go
deleted file mode 100644
index fe2f1eb4d..000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/net/net_unix.go
+++ /dev/null
@@ -1,68 +0,0 @@
-// +build linux freebsd darwin
-
-package net
-
-import (
-	"strings"
-
-	"github.com/shirou/gopsutil/internal/common"
-)
-
-// Return a list of network connections opened.
-func NetConnections(kind string) ([]NetConnectionStat, error) {
-	return NetConnectionsPid(kind, 0)
-}
-
-// Return a list of network connections opened by a process.
-func NetConnectionsPid(kind string, pid int32) ([]NetConnectionStat, error) {
-	var ret []NetConnectionStat
-
-	args := []string{"-i"}
-	switch strings.ToLower(kind) {
-	default:
-		fallthrough
-	case "":
-		fallthrough
-	case "all":
-		fallthrough
-	case "inet":
-		args = append(args, "tcp", "-i", "udp")
-	case "inet4":
-		args = append(args, "4")
-	case "inet6":
-		args = append(args, "6")
-	case "tcp":
-		args = append(args, "tcp")
-	case "tcp4":
-		args = append(args, "4tcp")
-	case "tcp6":
-		args = append(args, "6tcp")
-	case "udp":
-		args = append(args, "udp")
-	case "udp4":
-		args = append(args, "6udp")
-	case "udp6":
-		args = append(args, "6udp")
-	case "unix":
-		return ret, common.NotImplementedError
-	}
-
-	r, err := common.CallLsof(invoke, pid, args...)
-	if err != nil {
-		return nil, err
-	}
-	for _, rr := range r {
-		if strings.HasPrefix(rr, "COMMAND") {
-			continue
-		}
-		n, err := parseNetLine(rr)
-		if err != nil {
-
-			continue
-		}
-
-		ret = append(ret, n)
-	}
-
-	return ret, nil
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/net/net_windows.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/net/net_windows.go
deleted file mode 100644
index 33aceb657..000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/net/net_windows.go
+++ /dev/null
@@ -1,107 +0,0 @@
-// +build windows
-
-package net
-
-import (
-	"errors"
-	"net"
-	"os"
-	"syscall"
-	"unsafe"
-
-	"github.com/shirou/gopsutil/internal/common"
-)
-
-var (
-	modiphlpapi             = syscall.NewLazyDLL("iphlpapi.dll")
-	procGetExtendedTcpTable = modiphlpapi.NewProc("GetExtendedTcpTable")
-	procGetExtendedUdpTable = modiphlpapi.NewProc("GetExtendedUdpTable")
-)
-
-const (
-	TCPTableBasicListener = iota
-	TCPTableBasicConnections
-	TCPTableBasicAll
-	TCPTableOwnerPIDListener
-	TCPTableOwnerPIDConnections
-	TCPTableOwnerPIDAll
-	TCPTableOwnerModuleListener
-	TCPTableOwnerModuleConnections
-	TCPTableOwnerModuleAll
-)
-
-func NetIOCounters(pernic bool) ([]NetIOCountersStat, error) {
-	ifs, err := net.Interfaces()
-	if err != nil {
-		return nil, err
-	}
-
-	ai, err := getAdapterList()
-	if err != nil {
-		return nil, err
-	}
-	var ret []NetIOCountersStat
-
-	for _, ifi := range ifs {
-		name := ifi.Name
-		for ; ai != nil; ai = ai.Next {
-			name = common.BytePtrToString(&ai.Description[0])
-			c := NetIOCountersStat{
-				Name: name,
-			}
-
-			row := syscall.MibIfRow{Index: ai.Index}
-			e := syscall.GetIfEntry(&row)
-			if e != nil {
-				return nil, os.NewSyscallError("GetIfEntry", e)
-			}
-			c.BytesSent = uint64(row.OutOctets)
-			c.BytesRecv = uint64(row.InOctets)
-			c.PacketsSent = uint64(row.OutUcastPkts)
-			c.PacketsRecv = uint64(row.InUcastPkts)
-			c.Errin = uint64(row.InErrors)
-			c.Errout = uint64(row.OutErrors)
-			c.Dropin = uint64(row.InDiscards)
-			c.Dropout = uint64(row.OutDiscards)
-
-			ret = append(ret, c)
-		}
-	}
-
-	if pernic == false {
-		return getNetIOCountersAll(ret)
-	}
-	return ret, nil
-}
-
-// Return a list of network connections opened by a process
-func NetConnections(kind string) ([]NetConnectionStat, error) {
-	var ret []NetConnectionStat
-
-	return ret, common.NotImplementedError
-}
-
-// borrowed from src/pkg/net/interface_windows.go
-func getAdapterList() (*syscall.IpAdapterInfo, error) {
-	b := make([]byte, 1000)
-	l := uint32(len(b))
-	a := (*syscall.IpAdapterInfo)(unsafe.Pointer(&b[0]))
-	err := syscall.GetAdaptersInfo(a, &l)
-	if err == syscall.ERROR_BUFFER_OVERFLOW {
-		b = make([]byte, l)
-		a = (*syscall.IpAdapterInfo)(unsafe.Pointer(&b[0]))
-		err = syscall.GetAdaptersInfo(a, &l)
-	}
-	if err != nil {
-		return nil, os.NewSyscallError("GetAdaptersInfo", err)
-	}
-	return a, nil
-}
-
-// NetProtoCounters returns network statistics for the entire system
-// If protocols is empty then all protocols are returned, otherwise
-// just the protocols in the list are returned.
-// Not Implemented for Windows
-func NetProtoCounters(protocols []string) ([]NetProtoCountersStat, error) {
-	return nil, errors.New("NetProtoCounters not implemented for windows")
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/process/binary.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/process/binary.go
deleted file mode 100644
index 8891f0f14..000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/process/binary.go
+++ /dev/null
@@ -1,634 +0,0 @@
-// 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.
-
-// Package binary implements simple translation between numbers and byte
-// sequences and encoding and decoding of varints.
-//
-// Numbers are translated by reading and writing fixed-size values.
-// A fixed-size value is either a fixed-size arithmetic
-// type (int8, uint8, int16, float32, complex64, ...)
-// or an array or struct containing only fixed-size values.
-//
-// The varint functions encode and decode single integer values using
-// a variable-length encoding; smaller values require fewer bytes.
-// For a specification, see
-// http://code.google.com/apis/protocolbuffers/docs/encoding.html.
-//
-// This package favors simplicity over efficiency. Clients that require
-// high-performance serialization, especially for large data structures,
-// should look at more advanced solutions such as the encoding/gob
-// package or protocol buffers.
-package process
-
-import (
-	"errors"
-	"io"
-	"math"
-	"reflect"
-)
-
-// A ByteOrder specifies how to convert byte sequences into
-// 16-, 32-, or 64-bit unsigned integers.
-type ByteOrder interface {
-	Uint16([]byte) uint16
-	Uint32([]byte) uint32
-	Uint64([]byte) uint64
-	PutUint16([]byte, uint16)
-	PutUint32([]byte, uint32)
-	PutUint64([]byte, uint64)
-	String() string
-}
-
-// LittleEndian is the little-endian implementation of ByteOrder.
-var LittleEndian littleEndian
-
-// BigEndian is the big-endian implementation of ByteOrder.
-var BigEndian bigEndian
-
-type littleEndian struct{}
-
-func (littleEndian) Uint16(b []byte) uint16 { return uint16(b[0]) | uint16(b[1])<<8 }
-
-func (littleEndian) PutUint16(b []byte, v uint16) {
-	b[0] = byte(v)
-	b[1] = byte(v >> 8)
-}
-
-func (littleEndian) Uint32(b []byte) uint32 {
-	return uint32(b[0]) | uint32(b[1])<<8 | uint32(b[2])<<16 | uint32(b[3])<<24
-}
-
-func (littleEndian) PutUint32(b []byte, v uint32) {
-	b[0] = byte(v)
-	b[1] = byte(v >> 8)
-	b[2] = byte(v >> 16)
-	b[3] = byte(v >> 24)
-}
-
-func (littleEndian) Uint64(b []byte) uint64 {
-	return uint64(b[0]) | uint64(b[1])<<8 | uint64(b[2])<<16 | uint64(b[3])<<24 |
-		uint64(b[4])<<32 | uint64(b[5])<<40 | uint64(b[6])<<48 | uint64(b[7])<<56
-}
-
-func (littleEndian) PutUint64(b []byte, v uint64) {
-	b[0] = byte(v)
-	b[1] = byte(v >> 8)
-	b[2] = byte(v >> 16)
-	b[3] = byte(v >> 24)
-	b[4] = byte(v >> 32)
-	b[5] = byte(v >> 40)
-	b[6] = byte(v >> 48)
-	b[7] = byte(v >> 56)
-}
-
-func (littleEndian) String() string { return "LittleEndian" }
-
-func (littleEndian) GoString() string { return "binary.LittleEndian" }
-
-type bigEndian struct{}
-
-func (bigEndian) Uint16(b []byte) uint16 { return uint16(b[1]) | uint16(b[0])<<8 }
-
-func (bigEndian) PutUint16(b []byte, v uint16) {
-	b[0] = byte(v >> 8)
-	b[1] = byte(v)
-}
-
-func (bigEndian) Uint32(b []byte) uint32 {
-	return uint32(b[3]) | uint32(b[2])<<8 | uint32(b[1])<<16 | uint32(b[0])<<24
-}
-
-func (bigEndian) PutUint32(b []byte, v uint32) {
-	b[0] = byte(v >> 24)
-	b[1] = byte(v >> 16)
-	b[2] = byte(v >> 8)
-	b[3] = byte(v)
-}
-
-func (bigEndian) Uint64(b []byte) uint64 {
-	return uint64(b[7]) | uint64(b[6])<<8 | uint64(b[5])<<16 | uint64(b[4])<<24 |
-		uint64(b[3])<<32 | uint64(b[2])<<40 | uint64(b[1])<<48 | uint64(b[0])<<56
-}
-
-func (bigEndian) PutUint64(b []byte, v uint64) {
-	b[0] = byte(v >> 56)
-	b[1] = byte(v >> 48)
-	b[2] = byte(v >> 40)
-	b[3] = byte(v >> 32)
-	b[4] = byte(v >> 24)
-	b[5] = byte(v >> 16)
-	b[6] = byte(v >> 8)
-	b[7] = byte(v)
-}
-
-func (bigEndian) String() string { return "BigEndian" }
-
-func (bigEndian) GoString() string { return "binary.BigEndian" }
-
-// Read reads structured binary data from r into data.
-// Data must be a pointer to a fixed-size value or a slice
-// of fixed-size values.
-// Bytes read from r are decoded using the specified byte order
-// and written to successive fields of the data.
-// When reading into structs, the field data for fields with
-// blank (_) field names is skipped; i.e., blank field names
-// may be used for padding.
-// When reading into a struct, all non-blank fields must be exported.
-func Read(r io.Reader, order ByteOrder, data interface{}) error {
-	// Fast path for basic types and slices.
-	if n := intDataSize(data); n != 0 {
-		var b [8]byte
-		var bs []byte
-		if n > len(b) {
-			bs = make([]byte, n)
-		} else {
-			bs = b[:n]
-		}
-		if _, err := io.ReadFull(r, bs); err != nil {
-			return err
-		}
-		switch data := data.(type) {
-		case *int8:
-			*data = int8(b[0])
-		case *uint8:
-			*data = b[0]
-		case *int16:
-			*data = int16(order.Uint16(bs))
-		case *uint16:
-			*data = order.Uint16(bs)
-		case *int32:
-			*data = int32(order.Uint32(bs))
-		case *uint32:
-			*data = order.Uint32(bs)
-		case *int64:
-			*data = int64(order.Uint64(bs))
-		case *uint64:
-			*data = order.Uint64(bs)
-		case []int8:
-			for i, x := range bs { // Easier to loop over the input for 8-bit values.
-				data[i] = int8(x)
-			}
-		case []uint8:
-			copy(data, bs)
-		case []int16:
-			for i := range data {
-				data[i] = int16(order.Uint16(bs[2*i:]))
-			}
-		case []uint16:
-			for i := range data {
-				data[i] = order.Uint16(bs[2*i:])
-			}
-		case []int32:
-			for i := range data {
-				data[i] = int32(order.Uint32(bs[4*i:]))
-			}
-		case []uint32:
-			for i := range data {
-				data[i] = order.Uint32(bs[4*i:])
-			}
-		case []int64:
-			for i := range data {
-				data[i] = int64(order.Uint64(bs[8*i:]))
-			}
-		case []uint64:
-			for i := range data {
-				data[i] = order.Uint64(bs[8*i:])
-			}
-		}
-		return nil
-	}
-
-	// Fallback to reflect-based decoding.
-	v := reflect.ValueOf(data)
-	size := -1
-	switch v.Kind() {
-	case reflect.Ptr:
-		v = v.Elem()
-		size = dataSize(v)
-	case reflect.Slice:
-		size = dataSize(v)
-	}
-	if size < 0 {
-		return errors.New("binary.Read: invalid type " + reflect.TypeOf(data).String())
-	}
-	d := &decoder{order: order, buf: make([]byte, size)}
-	if _, err := io.ReadFull(r, d.buf); err != nil {
-		return err
-	}
-	d.value(v)
-	return nil
-}
-
-// Write writes the binary representation of data into w.
-// Data must be a fixed-size value or a slice of fixed-size
-// values, or a pointer to such data.
-// Bytes written to w are encoded using the specified byte order
-// and read from successive fields of the data.
-// When writing structs, zero values are written for fields
-// with blank (_) field names.
-func Write(w io.Writer, order ByteOrder, data interface{}) error {
-	// Fast path for basic types and slices.
-	if n := intDataSize(data); n != 0 {
-		var b [8]byte
-		var bs []byte
-		if n > len(b) {
-			bs = make([]byte, n)
-		} else {
-			bs = b[:n]
-		}
-		switch v := data.(type) {
-		case *int8:
-			bs = b[:1]
-			b[0] = byte(*v)
-		case int8:
-			bs = b[:1]
-			b[0] = byte(v)
-		case []int8:
-			for i, x := range v {
-				bs[i] = byte(x)
-			}
-		case *uint8:
-			bs = b[:1]
-			b[0] = *v
-		case uint8:
-			bs = b[:1]
-			b[0] = byte(v)
-		case []uint8:
-			bs = v
-		case *int16:
-			bs = b[:2]
-			order.PutUint16(bs, uint16(*v))
-		case int16:
-			bs = b[:2]
-			order.PutUint16(bs, uint16(v))
-		case []int16:
-			for i, x := range v {
-				order.PutUint16(bs[2*i:], uint16(x))
-			}
-		case *uint16:
-			bs = b[:2]
-			order.PutUint16(bs, *v)
-		case uint16:
-			bs = b[:2]
-			order.PutUint16(bs, v)
-		case []uint16:
-			for i, x := range v {
-				order.PutUint16(bs[2*i:], x)
-			}
-		case *int32:
-			bs = b[:4]
-			order.PutUint32(bs, uint32(*v))
-		case int32:
-			bs = b[:4]
-			order.PutUint32(bs, uint32(v))
-		case []int32:
-			for i, x := range v {
-				order.PutUint32(bs[4*i:], uint32(x))
-			}
-		case *uint32:
-			bs = b[:4]
-			order.PutUint32(bs, *v)
-		case uint32:
-			bs = b[:4]
-			order.PutUint32(bs, v)
-		case []uint32:
-			for i, x := range v {
-				order.PutUint32(bs[4*i:], x)
-			}
-		case *int64:
-			bs = b[:8]
-			order.PutUint64(bs, uint64(*v))
-		case int64:
-			bs = b[:8]
-			order.PutUint64(bs, uint64(v))
-		case []int64:
-			for i, x := range v {
-				order.PutUint64(bs[8*i:], uint64(x))
-			}
-		case *uint64:
-			bs = b[:8]
-			order.PutUint64(bs, *v)
-		case uint64:
-			bs = b[:8]
-			order.PutUint64(bs, v)
-		case []uint64:
-			for i, x := range v {
-				order.PutUint64(bs[8*i:], x)
-			}
-		}
-		_, err := w.Write(bs)
-		return err
-	}
-
-	// Fallback to reflect-based encoding.
-	v := reflect.Indirect(reflect.ValueOf(data))
-	size := dataSize(v)
-	if size < 0 {
-		return errors.New("binary.Write: invalid type " + reflect.TypeOf(data).String())
-	}
-	buf := make([]byte, size)
-	e := &encoder{order: order, buf: buf}
-	e.value(v)
-	_, err := w.Write(buf)
-	return err
-}
-
-// Size returns how many bytes Write would generate to encode the value v, which
-// must be a fixed-size value or a slice of fixed-size values, or a pointer to such data.
-// If v is neither of these, Size returns -1.
-func Size(v interface{}) int {
-	return dataSize(reflect.Indirect(reflect.ValueOf(v)))
-}
-
-// dataSize returns the number of bytes the actual data represented by v occupies in memory.
-// For compound structures, it sums the sizes of the elements. Thus, for instance, for a slice
-// it returns the length of the slice times the element size and does not count the memory
-// occupied by the header. If the type of v is not acceptable, dataSize returns -1.
-func dataSize(v reflect.Value) int {
-	if v.Kind() == reflect.Slice {
-		if s := sizeof(v.Type().Elem()); s >= 0 {
-			return s * v.Len()
-		}
-		return -1
-	}
-	return sizeof(v.Type())
-}
-
-// sizeof returns the size >= 0 of variables for the given type or -1 if the type is not acceptable.
-func sizeof(t reflect.Type) int {
-	switch t.Kind() {
-	case reflect.Array:
-		if s := sizeof(t.Elem()); s >= 0 {
-			return s * t.Len()
-		}
-
-	case reflect.Struct:
-		sum := 0
-		for i, n := 0, t.NumField(); i < n; i++ {
-			s := sizeof(t.Field(i).Type)
-			if s < 0 {
-				return -1
-			}
-			sum += s
-		}
-		return sum
-
-	case reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64,
-		reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64,
-		reflect.Float32, reflect.Float64, reflect.Complex64, reflect.Complex128, reflect.Ptr:
-		return int(t.Size())
-	}
-
-	return -1
-}
-
-type coder struct {
-	order ByteOrder
-	buf   []byte
-}
-
-type decoder coder
-type encoder coder
-
-func (d *decoder) uint8() uint8 {
-	x := d.buf[0]
-	d.buf = d.buf[1:]
-	return x
-}
-
-func (e *encoder) uint8(x uint8) {
-	e.buf[0] = x
-	e.buf = e.buf[1:]
-}
-
-func (d *decoder) uint16() uint16 {
-	x := d.order.Uint16(d.buf[0:2])
-	d.buf = d.buf[2:]
-	return x
-}
-
-func (e *encoder) uint16(x uint16) {
-	e.order.PutUint16(e.buf[0:2], x)
-	e.buf = e.buf[2:]
-}
-
-func (d *decoder) uint32() uint32 {
-	x := d.order.Uint32(d.buf[0:4])
-	d.buf = d.buf[4:]
-	return x
-}
-
-func (e *encoder) uint32(x uint32) {
-	e.order.PutUint32(e.buf[0:4], x)
-	e.buf = e.buf[4:]
-}
-
-func (d *decoder) uint64() uint64 {
-	x := d.order.Uint64(d.buf[0:8])
-	d.buf = d.buf[8:]
-	return x
-}
-
-func (e *encoder) uint64(x uint64) {
-	e.order.PutUint64(e.buf[0:8], x)
-	e.buf = e.buf[8:]
-}
-
-func (d *decoder) int8() int8 { return int8(d.uint8()) }
-
-func (e *encoder) int8(x int8) { e.uint8(uint8(x)) }
-
-func (d *decoder) int16() int16 { return int16(d.uint16()) }
-
-func (e *encoder) int16(x int16) { e.uint16(uint16(x)) }
-
-func (d *decoder) int32() int32 { return int32(d.uint32()) }
-
-func (e *encoder) int32(x int32) { e.uint32(uint32(x)) }
-
-func (d *decoder) int64() int64 { return int64(d.uint64()) }
-
-func (e *encoder) int64(x int64) { e.uint64(uint64(x)) }
-
-func (d *decoder) value(v reflect.Value) {
-	switch v.Kind() {
-	case reflect.Array:
-		l := v.Len()
-		for i := 0; i < l; i++ {
-			d.value(v.Index(i))
-		}
-
-	case reflect.Struct:
-		t := v.Type()
-		l := v.NumField()
-		for i := 0; i < l; i++ {
-			// Note: Calling v.CanSet() below is an optimization.
-			// It would be sufficient to check the field name,
-			// but creating the StructField info for each field is
-			// costly (run "go test -bench=ReadStruct" and compare
-			// results when making changes to this code).
-			if v := v.Field(i); v.CanSet() || t.Field(i).Name != "_" {
-				d.value(v)
-			} else {
-				d.skip(v)
-			}
-		}
-
-	case reflect.Slice:
-		l := v.Len()
-		for i := 0; i < l; i++ {
-			d.value(v.Index(i))
-		}
-
-	case reflect.Int8:
-		v.SetInt(int64(d.int8()))
-	case reflect.Int16:
-		v.SetInt(int64(d.int16()))
-	case reflect.Int32:
-		v.SetInt(int64(d.int32()))
-	case reflect.Int64:
-		v.SetInt(d.int64())
-
-	case reflect.Uint8:
-		v.SetUint(uint64(d.uint8()))
-	case reflect.Uint16:
-		v.SetUint(uint64(d.uint16()))
-	case reflect.Uint32:
-		v.SetUint(uint64(d.uint32()))
-	case reflect.Uint64:
-		v.SetUint(d.uint64())
-
-	case reflect.Float32:
-		v.SetFloat(float64(math.Float32frombits(d.uint32())))
-	case reflect.Float64:
-		v.SetFloat(math.Float64frombits(d.uint64()))
-
-	case reflect.Complex64:
-		v.SetComplex(complex(
-			float64(math.Float32frombits(d.uint32())),
-			float64(math.Float32frombits(d.uint32())),
-		))
-	case reflect.Complex128:
-		v.SetComplex(complex(
-			math.Float64frombits(d.uint64()),
-			math.Float64frombits(d.uint64()),
-		))
-	}
-}
-
-func (e *encoder) value(v reflect.Value) {
-	switch v.Kind() {
-	case reflect.Array:
-		l := v.Len()
-		for i := 0; i < l; i++ {
-			e.value(v.Index(i))
-		}
-
-	case reflect.Struct:
-		t := v.Type()
-		l := v.NumField()
-		for i := 0; i < l; i++ {
-			// see comment for corresponding code in decoder.value()
-			if v := v.Field(i); v.CanSet() || t.Field(i).Name != "_" {
-				e.value(v)
-			} else {
-				e.skip(v)
-			}
-		}
-
-	case reflect.Slice:
-		l := v.Len()
-		for i := 0; i < l; i++ {
-			e.value(v.Index(i))
-		}
-
-	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
-		switch v.Type().Kind() {
-		case reflect.Int8:
-			e.int8(int8(v.Int()))
-		case reflect.Int16:
-			e.int16(int16(v.Int()))
-		case reflect.Int32:
-			e.int32(int32(v.Int()))
-		case reflect.Int64:
-			e.int64(v.Int())
-		}
-
-	case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uintptr:
-		switch v.Type().Kind() {
-		case reflect.Uint8:
-			e.uint8(uint8(v.Uint()))
-		case reflect.Uint16:
-			e.uint16(uint16(v.Uint()))
-		case reflect.Uint32:
-			e.uint32(uint32(v.Uint()))
-		case reflect.Uint64:
-			e.uint64(v.Uint())
-		}
-
-	case reflect.Float32, reflect.Float64:
-		switch v.Type().Kind() {
-		case reflect.Float32:
-			e.uint32(math.Float32bits(float32(v.Float())))
-		case reflect.Float64:
-			e.uint64(math.Float64bits(v.Float()))
-		}
-
-	case reflect.Complex64, reflect.Complex128:
-		switch v.Type().Kind() {
-		case reflect.Complex64:
-			x := v.Complex()
-			e.uint32(math.Float32bits(float32(real(x))))
-			e.uint32(math.Float32bits(float32(imag(x))))
-		case reflect.Complex128:
-			x := v.Complex()
-			e.uint64(math.Float64bits(real(x)))
-			e.uint64(math.Float64bits(imag(x)))
-		}
-	}
-}
-
-func (d *decoder) skip(v reflect.Value) {
-	d.buf = d.buf[dataSize(v):]
-}
-
-func (e *encoder) skip(v reflect.Value) {
-	n := dataSize(v)
-	for i := range e.buf[0:n] {
-		e.buf[i] = 0
-	}
-	e.buf = e.buf[n:]
-}
-
-// intDataSize returns the size of the data required to represent the data when encoded.
-// It returns zero if the type cannot be implemented by the fast path in Read or Write.
-func intDataSize(data interface{}) int {
-	switch data := data.(type) {
-	case int8, *int8, *uint8:
-		return 1
-	case []int8:
-		return len(data)
-	case []uint8:
-		return len(data)
-	case int16, *int16, *uint16:
-		return 2
-	case []int16:
-		return 2 * len(data)
-	case []uint16:
-		return 2 * len(data)
-	case int32, *int32, *uint32:
-		return 4
-	case []int32:
-		return 4 * len(data)
-	case []uint32:
-		return 4 * len(data)
-	case int64, *int64, *uint64:
-		return 8
-	case []int64:
-		return 8 * len(data)
-	case []uint64:
-		return 8 * len(data)
-	}
-	return 0
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/process/expected/darwin/%2Fbin%2Fps-x-opid_fail b/Godeps/_workspace/src/github.com/shirou/gopsutil/process/expected/darwin/%2Fbin%2Fps-x-opid_fail
deleted file mode 100644
index fce59efc0..000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/process/expected/darwin/%2Fbin%2Fps-x-opid_fail
+++ /dev/null
@@ -1,10 +0,0 @@
-  PID
-  245
-  247
-  248
-  249
-  254
-  262
-  264
-  265
-  267
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/process/process.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/process/process.go
deleted file mode 100644
index 0526f78a7..000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/process/process.go
+++ /dev/null
@@ -1,149 +0,0 @@
-package process
-
-import (
-	"encoding/json"
-	"runtime"
-	"time"
-
-	"github.com/shirou/gopsutil/cpu"
-	"github.com/shirou/gopsutil/internal/common"
-)
-
-var invoke common.Invoker
-
-func init() {
-	invoke = common.Invoke{}
-}
-
-type Process struct {
-	Pid            int32 `json:"pid"`
-	name           string
-	status         string
-	numCtxSwitches *NumCtxSwitchesStat
-	uids           []int32
-	gids           []int32
-	numThreads     int32
-	memInfo        *MemoryInfoStat
-
-	lastCPUTimes *cpu.CPUTimesStat
-	lastCPUTime  time.Time
-}
-
-type OpenFilesStat struct {
-	Path string `json:"path"`
-	Fd   uint64 `json:"fd"`
-}
-
-type MemoryInfoStat struct {
-	RSS  uint64 `json:"rss"`  // bytes
-	VMS  uint64 `json:"vms"`  // bytes
-	Swap uint64 `json:"swap"` // bytes
-}
-
-type RlimitStat struct {
-	Resource int32 `json:"resource"`
-	Soft     int32 `json:"soft"`
-	Hard     int32 `json:"hard"`
-}
-
-type IOCountersStat struct {
-	ReadCount  uint64 `json:"read_count"`
-	WriteCount uint64 `json:"write_count"`
-	ReadBytes  uint64 `json:"read_bytes"`
-	WriteBytes uint64 `json:"write_bytes"`
-}
-
-type NumCtxSwitchesStat struct {
-	Voluntary   int64 `json:"voluntary"`
-	Involuntary int64 `json:"involuntary"`
-}
-
-func (p Process) String() string {
-	s, _ := json.Marshal(p)
-	return string(s)
-}
-
-func (o OpenFilesStat) String() string {
-	s, _ := json.Marshal(o)
-	return string(s)
-}
-
-func (m MemoryInfoStat) String() string {
-	s, _ := json.Marshal(m)
-	return string(s)
-}
-
-func (r RlimitStat) String() string {
-	s, _ := json.Marshal(r)
-	return string(s)
-}
-
-func (i IOCountersStat) String() string {
-	s, _ := json.Marshal(i)
-	return string(s)
-}
-
-func (p NumCtxSwitchesStat) String() string {
-	s, _ := json.Marshal(p)
-	return string(s)
-}
-
-func PidExists(pid int32) (bool, error) {
-	pids, err := Pids()
-	if err != nil {
-		return false, err
-	}
-
-	for _, i := range pids {
-		if i == pid {
-			return true, err
-		}
-	}
-
-	return false, err
-}
-
-// If interval is 0, return difference from last call(non-blocking).
-// If interval > 0, wait interval sec and return diffrence between start and end.
-func (p *Process) CPUPercent(interval time.Duration) (float64, error) {
-	numcpu := runtime.NumCPU()
-	calculate := func(t1, t2 *cpu.CPUTimesStat, delta float64) float64 {
-		if delta == 0 {
-			return 0
-		}
-		delta_proc := (t2.User - t1.User) + (t2.System - t1.System)
-		overall_percent := ((delta_proc / delta) * 100) * float64(numcpu)
-		return overall_percent
-	}
-
-	cpuTimes, err := p.CPUTimes()
-	if err != nil {
-		return 0, err
-	}
-
-	if interval > 0 {
-		p.lastCPUTimes = cpuTimes
-		p.lastCPUTime = time.Now()
-		time.Sleep(interval)
-		cpuTimes, err = p.CPUTimes()
-		if err != nil {
-			return 0, err
-		}
-	} else {
-		if p.lastCPUTimes == nil {
-			// invoked first time
-			p.lastCPUTimes, err = p.CPUTimes()
-			if err != nil {
-				return 0, err
-			}
-			p.lastCPUTime = time.Now()
-			return 0, nil
-		}
-	}
-
-	delta := (time.Now().Sub(p.lastCPUTime).Seconds()) * float64(numcpu)
-	ret := calculate(p.lastCPUTimes, cpuTimes, float64(delta))
-	p.lastCPUTimes = cpuTimes
-	p.lastCPUTime = time.Now()
-	return ret, nil
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_darwin.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_darwin.go
deleted file mode 100644
index a8fce7d2e..000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_darwin.go
+++ /dev/null
@@ -1,433 +0,0 @@
-// +build darwin
-
-package process
-
-import (
-	"bytes"
-	"fmt"
-	"strconv"
-	"strings"
-	"syscall"
-	"unsafe"
-
-	"github.com/shirou/gopsutil/cpu"
-	"github.com/shirou/gopsutil/internal/common"
-	"github.com/shirou/gopsutil/net"
-)
-
-// copied from sys/sysctl.h
-const (
-	CTLKern          = 1  // "high kernel": proc, limits
-	KernProc         = 14 // struct: process entries
-	KernProcPID      = 1  // by process id
-	KernProcProc     = 8  // only return procs
-	KernProcAll      = 0  // everything
-	KernProcPathname = 12 // path to executable
-)
-
-const (
-	ClockTicks = 100 // C.sysconf(C._SC_CLK_TCK)
-)
-
-type _Ctype_struct___0 struct {
-	Pad uint64
-}
-
-// MemoryInfoExStat is different between OSes
-type MemoryInfoExStat struct {
-}
-
-type MemoryMapsStat struct {
-}
-
-func Pids() ([]int32, error) {
-	var ret []int32
-
-	pids, err := callPs("pid", 0, false)
-	if err != nil {
-		return ret, err
-	}
-
-	for _, pid := range pids {
-		v, err := strconv.Atoi(pid[0])
-		if err != nil {
-			return ret, err
-		}
-		ret = append(ret, int32(v))
-	}
-
-	return ret, nil
-}
-
-func (p *Process) Ppid() (int32, error) {
-	r, err := callPs("ppid", p.Pid, false)
-	v, err := strconv.Atoi(r[0][0])
-	if err != nil {
-		return 0, err
-	}
-
-	return int32(v), err
-}
-func (p *Process) Name() (string, error) {
-	k, err := p.getKProc()
-	if err != nil {
-		return "", err
-	}
-
-	return common.IntToString(k.Proc.P_comm[:]), nil
-}
-func (p *Process) Exe() (string, error) {
-	return "", common.NotImplementedError
-}
-func (p *Process) Cmdline() (string, error) {
-	r, err := callPs("command", p.Pid, false)
-	if err != nil {
-		return "", err
-	}
-	return strings.Join(r[0], " "), err
-}
-func (p *Process) CreateTime() (int64, error) {
-	return 0, common.NotImplementedError
-}
-func (p *Process) Cwd() (string, error) {
-	return "", common.NotImplementedError
-}
-func (p *Process) Parent() (*Process, error) {
-	rr, err := common.CallLsof(invoke, p.Pid, "-FR")
-	if err != nil {
-		return nil, err
-	}
-	for _, r := range rr {
-		if strings.HasPrefix(r, "p") { // skip if process
-			continue
-		}
-		l := string(r)
-		v, err := strconv.Atoi(strings.Replace(l, "R", "", 1))
-		if err != nil {
-			return nil, err
-		}
-		return NewProcess(int32(v))
-	}
-	return nil, fmt.Errorf("could not find parent line")
-}
-func (p *Process) Status() (string, error) {
-	r, err := callPs("state", p.Pid, false)
-	if err != nil {
-		return "", err
-	}
-
-	return r[0][0], err
-}
-func (p *Process) Uids() ([]int32, error) {
-	k, err := p.getKProc()
-	if err != nil {
-		return nil, err
-	}
-
-	uids := make([]int32, 0, 3)
-
-	uids = append(uids, int32(k.Eproc.Pcred.P_ruid), int32(k.Eproc.Ucred.Uid), int32(k.Eproc.Pcred.P_svuid))
-
-	return uids, nil
-}
-func (p *Process) Gids() ([]int32, error) {
-	k, err := p.getKProc()
-	if err != nil {
-		return nil, err
-	}
-
-	gids := make([]int32, 0, 3)
-	gids = append(gids, int32(k.Eproc.Pcred.P_rgid), int32(k.Eproc.Ucred.Ngroups), int32(k.Eproc.Pcred.P_svgid))
-
-	return gids, nil
-}
-func (p *Process) Terminal() (string, error) {
-	return "", common.NotImplementedError
-	/*
-		k, err := p.getKProc()
-		if err != nil {
-			return "", err
-		}
-
-		ttyNr := uint64(k.Eproc.Tdev)
-		termmap, err := getTerminalMap()
-		if err != nil {
-			return "", err
-		}
-
-		return termmap[ttyNr], nil
-	*/
-}
-func (p *Process) Nice() (int32, error) {
-	k, err := p.getKProc()
-	if err != nil {
-		return 0, err
-	}
-	return int32(k.Proc.P_nice), nil
-}
-func (p *Process) IOnice() (int32, error) {
-	return 0, common.NotImplementedError
-}
-func (p *Process) Rlimit() ([]RlimitStat, error) {
-	var rlimit []RlimitStat
-	return rlimit, common.NotImplementedError
-}
-func (p *Process) IOCounters() (*IOCountersStat, error) {
-	return nil, common.NotImplementedError
-}
-func (p *Process) NumCtxSwitches() (*NumCtxSwitchesStat, error) {
-	return nil, common.NotImplementedError
-}
-func (p *Process) NumFDs() (int32, error) {
-	return 0, common.NotImplementedError
-}
-func (p *Process) NumThreads() (int32, error) {
-	r, err := callPs("utime,stime", p.Pid, true)
-	if err != nil {
-		return 0, err
-	}
-	return int32(len(r)), nil
-}
-func (p *Process) Threads() (map[string]string, error) {
-	ret := make(map[string]string, 0)
-	return ret, common.NotImplementedError
-}
-
-func convertCpuTimes(s string) (ret float64, err error) {
-	var t int
-	var _tmp string
-	if strings.Contains(s, ":") {
-		_t := strings.Split(s, ":")
-		hour, err := strconv.Atoi(_t[0])
-		if err != nil {
-			return ret, err
-		}
-		t += hour * 60 * 100
-		_tmp = _t[1]
-	} else {
-		_tmp = s
-	}
-
-	_t := strings.Split(_tmp, ".")
-	if err != nil {
-		return ret, err
-	}
-	h, err := strconv.Atoi(_t[0])
-	t += h * 100
-	h, err = strconv.Atoi(_t[1])
-	t += h
-	return float64(t) / ClockTicks, nil
-}
-func (p *Process) CPUTimes() (*cpu.CPUTimesStat, error) {
-	r, err := callPs("utime,stime", p.Pid, false)
-
-	if err != nil {
-		return nil, err
-	}
-
-	utime, err := convertCpuTimes(r[0][0])
-	if err != nil {
-		return nil, err
-	}
-	stime, err := convertCpuTimes(r[0][1])
-	if err != nil {
-		return nil, err
-	}
-
-	ret := &cpu.CPUTimesStat{
-		CPU:    "cpu",
-		User:   utime,
-		System: stime,
-	}
-	return ret, nil
-}
-func (p *Process) CPUAffinity() ([]int32, error) {
-	return nil, common.NotImplementedError
-}
-func (p *Process) MemoryInfo() (*MemoryInfoStat, error) {
-	r, err := callPs("rss,vsize,pagein", p.Pid, false)
-	if err != nil {
-		return nil, err
-	}
-	rss, err := strconv.Atoi(r[0][0])
-	if err != nil {
-		return nil, err
-	}
-	vms, err := strconv.Atoi(r[0][1])
-	if err != nil {
-		return nil, err
-	}
-	pagein, err := strconv.Atoi(r[0][2])
-	if err != nil {
-		return nil, err
-	}
-
-	ret := &MemoryInfoStat{
-		RSS:  uint64(rss),
-		VMS:  uint64(vms),
-		Swap: uint64(pagein),
-	}
-
-	return ret, nil
-}
-func (p *Process) MemoryInfoEx() (*MemoryInfoExStat, error) {
-	return nil, common.NotImplementedError
-}
-func (p *Process) MemoryPercent() (float32, error) {
-	return 0, common.NotImplementedError
-}
-
-func (p *Process) Children() ([]*Process, error) {
-	pids, err := common.CallPgrep(invoke, p.Pid)
-	if err != nil {
-		return nil, err
-	}
-	ret := make([]*Process, 0, len(pids))
-	for _, pid := range pids {
-		np, err := NewProcess(pid)
-		if err != nil {
-			return nil, err
-		}
-		ret = append(ret, np)
-	}
-	return ret, nil
-}
-
-func (p *Process) OpenFiles() ([]OpenFilesStat, error) {
-	return nil, common.NotImplementedError
-}
-
-func (p *Process) Connections() ([]net.NetConnectionStat, error) {
-	return net.NetConnectionsPid("all", p.Pid)
-}
-
-func (p *Process) IsRunning() (bool, error) {
-	return true, common.NotImplementedError
-}
-func (p *Process) MemoryMaps(grouped bool) (*[]MemoryMapsStat, error) {
-	var ret []MemoryMapsStat
-	return &ret, common.NotImplementedError
-}
-
-func copyParams(k *KinfoProc, p *Process) error {
-
-	return nil
-}
-
-func processes() ([]Process, error) {
-	results := make([]Process, 0, 50)
-
-	mib := []int32{CTLKern, KernProc, KernProcAll, 0}
-	buf, length, err := common.CallSyscall(mib)
-	if err != nil {
-		return results, err
-	}
-
-	// get kinfo_proc size
-	k := KinfoProc{}
-	procinfoLen := int(unsafe.Sizeof(k))
-	count := int(length / uint64(procinfoLen))
-	/*
-		fmt.Println(length, procinfoLen, count)
-		b := buf[0*procinfoLen : 0*procinfoLen+procinfoLen]
-		fmt.Println(b)
-		kk, err := parseKinfoProc(b)
-		fmt.Printf("%#v", kk)
-	*/
-
-	// parse buf to procs
-	for i := 0; i < count; i++ {
-		b := buf[i*procinfoLen : i*procinfoLen+procinfoLen]
-		k, err := parseKinfoProc(b)
-		if err != nil {
-			continue
-		}
-		p, err := NewProcess(int32(k.Proc.P_pid))
-		if err != nil {
-			continue
-		}
-		copyParams(&k, p)
-
-		results = append(results, *p)
-	}
-
-	return results, nil
-}
-
-func parseKinfoProc(buf []byte) (KinfoProc, error) {
-	var k KinfoProc
-	br := bytes.NewReader(buf)
-
-	err := Read(br, LittleEndian, &k)
-	if err != nil {
-		return k, err
-	}
-
-	return k, nil
-}
-
-func (p *Process) getKProc() (*KinfoProc, error) {
-	mib := []int32{CTLKern, KernProc, KernProcPID, p.Pid}
-	procK := KinfoProc{}
-	length := uint64(unsafe.Sizeof(procK))
-	buf := make([]byte, length)
-	_, _, syserr := syscall.Syscall6(
-		syscall.SYS___SYSCTL,
-		uintptr(unsafe.Pointer(&mib[0])),
-		uintptr(len(mib)),
-		uintptr(unsafe.Pointer(&buf[0])),
-		uintptr(unsafe.Pointer(&length)),
-		0,
-		0)
-	if syserr != 0 {
-		return nil, syserr
-	}
-	k, err := parseKinfoProc(buf)
-	if err != nil {
-		return nil, err
-	}
-
-	return &k, nil
-}
-
-func NewProcess(pid int32) (*Process, error) {
-	p := &Process{Pid: pid}
-
-	return p, nil
-}
-
-// call ps command.
-// Return value deletes Header line(you must not input wrong arg).
-// And splited by Space. Caller have responsibility to manage.
-// If passed arg pid is 0, get information from all process.
-func callPs(arg string, pid int32, threadOption bool) ([][]string, error) {
-	var cmd []string
-	if pid == 0 { // will get from all processes.
-		cmd = []string{"-x", "-o", arg}
-	} else if threadOption {
-		cmd = []string{"-x", "-o", arg, "-M", "-p", strconv.Itoa(int(pid))}
-	} else {
-		cmd = []string{"-x", "-o", arg, "-p", strconv.Itoa(int(pid))}
-	}
-	out, err := invoke.Command("/bin/ps", cmd...)
-	if err != nil {
-		return [][]string{}, err
-	}
-	lines := strings.Split(string(out), "\n")
-
-	var ret [][]string
-	for _, l := range lines[1:] {
-		var lr []string
-		for _, r := range strings.Split(l, " ") {
-			if r == "" {
-				continue
-			}
-			lr = append(lr, strings.TrimSpace(r))
-		}
-		if len(lr) != 0 {
-			ret = append(ret, lr)
-		}
-	}
-
-	return ret, nil
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_darwin_amd64.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_darwin_amd64.go
deleted file mode 100644
index 7ac7bdd6b..000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_darwin_amd64.go
+++ /dev/null
@@ -1,234 +0,0 @@
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs types_darwin.go
-
-package process
-
-const (
-	sizeofPtr      = 0x8
-	sizeofShort    = 0x2
-	sizeofInt      = 0x4
-	sizeofLong     = 0x8
-	sizeofLongLong = 0x8
-)
-
-type (
-	_C_short     int16
-	_C_int       int32
-	_C_long      int64
-	_C_long_long int64
-)
-
-type Timespec struct {
-	Sec  int64
-	Nsec int64
-}
-
-type Timeval struct {
-	Sec       int64
-	Usec      int32
-	Pad_cgo_0 [4]byte
-}
-
-type Rusage struct {
-	Utime    Timeval
-	Stime    Timeval
-	Maxrss   int64
-	Ixrss    int64
-	Idrss    int64
-	Isrss    int64
-	Minflt   int64
-	Majflt   int64
-	Nswap    int64
-	Inblock  int64
-	Oublock  int64
-	Msgsnd   int64
-	Msgrcv   int64
-	Nsignals int64
-	Nvcsw    int64
-	Nivcsw   int64
-}
-
-type Rlimit struct {
-	Cur uint64
-	Max uint64
-}
-
-type UGid_t uint32
-
-type KinfoProc struct {
-	Proc  ExternProc
-	Eproc Eproc
-}
-
-type Eproc struct {
-	Paddr     *uint64
-	Sess      *Session
-	Pcred     Upcred
-	Ucred     Uucred
-	Pad_cgo_0 [4]byte
-	Vm        Vmspace
-	Ppid      int32
-	Pgid      int32
-	Jobc      int16
-	Pad_cgo_1 [2]byte
-	Tdev      int32
-	Tpgid     int32
-	Pad_cgo_2 [4]byte
-	Tsess     *Session
-	Wmesg     [8]int8
-	Xsize     int32
-	Xrssize   int16
-	Xccount   int16
-	Xswrss    int16
-	Pad_cgo_3 [2]byte
-	Flag      int32
-	Login     [12]int8
-	Spare     [4]int32
-	Pad_cgo_4 [4]byte
-}
-
-type Proc struct{}
-
-type Session struct{}
-
-type ucred struct {
-	Link  _Ctype_struct___0
-	Ref   uint64
-	Posix Posix_cred
-	Label *Label
-	Audit Au_session
-}
-
-type Uucred struct {
-	Ref       int32
-	Uid       uint32
-	Ngroups   int16
-	Pad_cgo_0 [2]byte
-	Groups    [16]uint32
-}
-
-type Upcred struct {
-	Pc_lock   [72]int8
-	Pc_ucred  *ucred
-	P_ruid    uint32
-	P_svuid   uint32
-	P_rgid    uint32
-	P_svgid   uint32
-	P_refcnt  int32
-	Pad_cgo_0 [4]byte
-}
-
-type Vmspace struct {
-	Dummy     int32
-	Pad_cgo_0 [4]byte
-	Dummy2    *int8
-	Dummy3    [5]int32
-	Pad_cgo_1 [4]byte
-	Dummy4    [3]*int8
-}
-
-type Sigacts struct{}
-
-type ExternProc struct {
-	P_un        [16]byte
-	P_vmspace   uint64
-	P_sigacts   uint64
-	Pad_cgo_0   [3]byte
-	P_flag      int32
-	P_stat      int8
-	P_pid       int32
-	P_oppid     int32
-	P_dupfd     int32
-	Pad_cgo_1   [4]byte
-	User_stack  uint64
-	Exit_thread uint64
-	P_debugger  int32
-	Sigwait     int32
-	P_estcpu    uint32
-	P_cpticks   int32
-	P_pctcpu    uint32
-	Pad_cgo_2   [4]byte
-	P_wchan     uint64
-	P_wmesg     uint64
-	P_swtime    uint32
-	P_slptime   uint32
-	P_realtimer Itimerval
-	P_rtime     Timeval
-	P_uticks    uint64
-	P_sticks    uint64
-	P_iticks    uint64
-	P_traceflag int32
-	Pad_cgo_3   [4]byte
-	P_tracep    uint64
-	P_siglist   int32
-	Pad_cgo_4   [4]byte
-	P_textvp    uint64
-	P_holdcnt   int32
-	P_sigmask   uint32
-	P_sigignore uint32
-	P_sigcatch  uint32
-	P_priority  uint8
-	P_usrpri    uint8
-	P_nice      int8
-	P_comm      [17]int8
-	Pad_cgo_5   [4]byte
-	P_pgrp      uint64
-	P_addr      uint64
-	P_xstat     uint16
-	P_acflag    uint16
-	Pad_cgo_6   [4]byte
-	P_ru        uint64
-}
-
-type Itimerval struct {
-	Interval Timeval
-	Value    Timeval
-}
-
-type Vnode struct{}
-
-type Pgrp struct{}
-
-type UserStruct struct{}
-
-type Au_session struct {
-	Aia_p *AuditinfoAddr
-	Mask  AuMask
-}
-
-type Posix_cred struct {
-	Uid       uint32
-	Ruid      uint32
-	Svuid     uint32
-	Ngroups   int16
-	Pad_cgo_0 [2]byte
-	Groups    [16]uint32
-	Rgid      uint32
-	Svgid     uint32
-	Gmuid     uint32
-	Flags     int32
-}
-
-type Label struct{}
-
-type AuditinfoAddr struct {
-	Auid   uint32
-	Mask   AuMask
-	Termid AuTidAddr
-	Asid   int32
-	Flags  uint64
-}
-type AuMask struct {
-	Success uint32
-	Failure uint32
-}
-type AuTidAddr struct {
-	Port int32
-	Type uint32
-	Addr [4]uint32
-}
-
-type UcredQueue struct {
-	Next *ucred
-	Prev **ucred
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_freebsd.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_freebsd.go
deleted file mode 100644
index ecd89204c..000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_freebsd.go
+++ /dev/null
@@ -1,303 +0,0 @@
-// +build freebsd
-
-package process
-
-import (
-	"bytes"
-	"encoding/binary"
-	"unsafe"
-	"strings"
-	"syscall"
-
-	cpu "github.com/shirou/gopsutil/cpu"
-	"github.com/shirou/gopsutil/internal/common"
-	net "github.com/shirou/gopsutil/net"
-)
-
-// MemoryInfoExStat is different between OSes
-type MemoryInfoExStat struct {
-}
-
-type MemoryMapsStat struct {
-}
-
-func Pids() ([]int32, error) {
-	var ret []int32
-	procs, err := processes()
-	if err != nil {
-		return ret, nil
-	}
-
-	for _, p := range procs {
-		ret = append(ret, p.Pid)
-	}
-
-	return ret, nil
-}
-
-func (p *Process) Ppid() (int32, error) {
-	k, err := p.getKProc()
-	if err != nil {
-		return 0, err
-	}
-
-	return k.KiPpid, nil
-}
-func (p *Process) Name() (string, error) {
-	k, err := p.getKProc()
-	if err != nil {
-		return "", err
-	}
-
-	return string(k.KiComm[:]), nil
-}
-func (p *Process) Exe() (string, error) {
-	return "", common.NotImplementedError
-}
-func (p *Process) Cmdline() (string, error) {
-	mib := []int32{CTLKern, KernProc, KernProcArgs, p.Pid}
-	buf, _, err := common.CallSyscall(mib)
-	if err != nil {
-		return "", err
-	}
-	ret := strings.FieldsFunc(string(buf), func(r rune) bool {
-		if r == '\u0000' {
-			return true
-		}
-		return false
-	})
-
-	return strings.Join(ret, " "), nil
-}
-func (p *Process) CreateTime() (int64, error) {
-	return 0, common.NotImplementedError
-}
-func (p *Process) Cwd() (string, error) {
-	return "", common.NotImplementedError
-}
-func (p *Process) Parent() (*Process, error) {
-	return p, common.NotImplementedError
-}
-func (p *Process) Status() (string, error) {
-	k, err := p.getKProc()
-	if err != nil {
-		return "", err
-	}
-
-	return string(k.KiStat[:]), nil
-}
-func (p *Process) Uids() ([]int32, error) {
-	k, err := p.getKProc()
-	if err != nil {
-		return nil, err
-	}
-
-	uids := make([]int32, 0, 3)
-
-	uids = append(uids, int32(k.KiRuid), int32(k.KiUID), int32(k.KiSvuid))
-
-	return uids, nil
-}
-func (p *Process) Gids() ([]int32, error) {
-	k, err := p.getKProc()
-	if err != nil {
-		return nil, err
-	}
-
-	gids := make([]int32, 0, 3)
-	gids = append(gids, int32(k.KiRgid), int32(k.KiNgroups[0]), int32(k.KiSvuid))
-
-	return gids, nil
-}
-func (p *Process) Terminal() (string, error) {
-	k, err := p.getKProc()
-	if err != nil {
-		return "", err
-	}
-
-	ttyNr := uint64(k.KiTdev)
-
-	termmap, err := getTerminalMap()
-	if err != nil {
-		return "", err
-	}
-
-	return termmap[ttyNr], nil
-}
-func (p *Process) Nice() (int32, error) {
-	return 0, common.NotImplementedError
-}
-func (p *Process) IOnice() (int32, error) {
-	return 0, common.NotImplementedError
-}
-func (p *Process) Rlimit() ([]RlimitStat, error) {
-	var rlimit []RlimitStat
-	return rlimit, common.NotImplementedError
-}
-func (p *Process) IOCounters() (*IOCountersStat, error) {
-	k, err := p.getKProc()
-	if err != nil {
-		return nil, err
-	}
-	return &IOCountersStat{
-		ReadCount:  uint64(k.KiRusage.Inblock),
-		WriteCount: uint64(k.KiRusage.Oublock),
-	}, nil
-}
-func (p *Process) NumCtxSwitches() (*NumCtxSwitchesStat, error) {
-	return nil, common.NotImplementedError
-}
-func (p *Process) NumFDs() (int32, error) {
-	return 0, common.NotImplementedError
-}
-func (p *Process) NumThreads() (int32, error) {
-	k, err := p.getKProc()
-	if err != nil {
-		return 0, err
-	}
-
-	return k.KiNumthreads, nil
-}
-func (p *Process) Threads() (map[string]string, error) {
-	ret := make(map[string]string, 0)
-	return ret, common.NotImplementedError
-}
-func (p *Process) CPUTimes() (*cpu.CPUTimesStat, error) {
-	k, err := p.getKProc()
-	if err != nil {
-		return nil, err
-	}
-	return &cpu.CPUTimesStat{
-		CPU:    "cpu",
-		User:   float64(k.KiRusage.Utime.Sec) + float64(k.KiRusage.Utime.Usec)/1000000,
-		System: float64(k.KiRusage.Stime.Sec) + float64(k.KiRusage.Stime.Usec)/1000000,
-	}, nil
-}
-func (p *Process) CPUAffinity() ([]int32, error) {
-	return nil, common.NotImplementedError
-}
-func (p *Process) MemoryInfo() (*MemoryInfoStat, error) {
-	k, err := p.getKProc()
-	if err != nil {
-		return nil, err
-	}
-	v, err := syscall.Sysctl("vm.stats.vm.v_page_size")
-	if err != nil {
-		return nil, err
-	}
-	pageSize := binary.LittleEndian.Uint16([]byte(v))
-
-	return &MemoryInfoStat{
-		RSS: uint64(k.KiRssize) * uint64(pageSize),
-		VMS: uint64(k.KiSize),
-	}, nil
-}
-func (p *Process) MemoryInfoEx() (*MemoryInfoExStat, error) {
-	return nil, common.NotImplementedError
-}
-func (p *Process) MemoryPercent() (float32, error) {
-	return 0, common.NotImplementedError
-}
-
-func (p *Process) Children() ([]*Process, error) {
-	pids, err := common.CallPgrep(invoke, p.Pid)
-	if err != nil {
-		return nil, err
-	}
-	ret := make([]*Process, 0, len(pids))
-	for _, pid := range pids {
-		np, err := NewProcess(pid)
-		if err != nil {
-			return nil, err
-		}
-		ret = append(ret, np)
-	}
-	return ret, nil
-}
-
-func (p *Process) OpenFiles() ([]OpenFilesStat, error) {
-	return nil, common.NotImplementedError
-}
-
-func (p *Process) Connections() ([]net.NetConnectionStat, error) {
-	return nil, common.NotImplementedError
-}
-
-func (p *Process) IsRunning() (bool, error) {
-	return true, common.NotImplementedError
-}
-func (p *Process) MemoryMaps(grouped bool) (*[]MemoryMapsStat, error) {
-	var ret []MemoryMapsStat
-	return &ret, common.NotImplementedError
-}
-
-func copyParams(k *KinfoProc, p *Process) error {
-
-	return nil
-}
-
-func processes() ([]Process, error) {
-	results := make([]Process, 0, 50)
-
-	mib := []int32{CTLKern, KernProc, KernProcProc, 0}
-	buf, length, err := common.CallSyscall(mib)
-	if err != nil {
-		return results, err
-	}
-
-	// get kinfo_proc size
-	k := KinfoProc{}
-	procinfoLen := int(unsafe.Sizeof(k))
-	count := int(length / uint64(procinfoLen))
-
-	// parse buf to procs
-	for i := 0; i < count; i++ {
-		b := buf[i*procinfoLen : i*procinfoLen+procinfoLen]
-		k, err := parseKinfoProc(b)
-		if err != nil {
-			continue
-		}
-		p, err := NewProcess(int32(k.KiPid))
-		if err != nil {
-			continue
-		}
-		copyParams(&k, p)
-
-		results = append(results, *p)
-	}
-
-	return results, nil
-}
-
-func parseKinfoProc(buf []byte) (KinfoProc, error) {
-	var k KinfoProc
-	br := bytes.NewReader(buf)
-	err := binary.Read(br, binary.LittleEndian, &k)
-	return k, err
-}
-
-func (p *Process) getKProc() (*KinfoProc, error) {
-	mib := []int32{CTLKern, KernProc, KernProcPID, p.Pid}
-
-	buf, length, err := common.CallSyscall(mib)
-	if err != nil {
-		return nil, err
-	}
-	procK := KinfoProc{}
-	if length != uint64(unsafe.Sizeof(procK)) {
-		return nil, err
-	}
-
-	k, err := parseKinfoProc(buf)
-	if err != nil {
-		return nil, err
-	}
-
-	return &k, nil
-}
-
-func NewProcess(pid int32) (*Process, error) {
-	p := &Process{Pid: pid}
-
-	return p, nil
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_freebsd_386.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_freebsd_386.go
deleted file mode 100644
index 6b3bdfc72..000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_freebsd_386.go
+++ /dev/null
@@ -1,126 +0,0 @@
-// +build freebsd
-// +build 386
-
-package process
-
-// copied from sys/sysctl.h
-const (
-	CTLKern          = 1  // "high kernel": proc, limits
-	KernProc         = 14 // struct: process entries
-	KernProcPID      = 1  // by process id
-	KernProcProc     = 8  // only return procs
-	KernProcPathname = 12 // path to executable
-	KernProcArgs     = 7  // get/set arguments/proctitle
-)
-
-type Timespec struct {
-	Sec  int32
-	Nsec int32
-}
-
-type Timeval struct {
-	Sec  int32
-	Usec int32
-}
-
-type Rusage struct {
-	Utime    Timeval
-	Stime    Timeval
-	Maxrss   int32
-	Ixrss    int32
-	Idrss    int32
-	Isrss    int32
-	Minflt   int32
-	Majflt   int32
-	Nswap    int32
-	Inblock  int32
-	Oublock  int32
-	Msgsnd   int32
-	Msgrcv   int32
-	Nsignals int32
-	Nvcsw    int32
-	Nivcsw   int32
-}
-
-// copied from sys/user.h
-type KinfoProc struct {
-	KiStructsize   int32
-	KiLayout       int32
-	KiArgs         int32
-	KiPaddr        int32
-	KiAddr         int32
-	KiTracep       int32
-	KiTextvp       int32
-	KiFd           int32
-	KiVmspace      int32
-	KiWchan        int32
-	KiPid          int32
-	KiPpid         int32
-	KiPgid         int32
-	KiTpgid        int32
-	KiSid          int32
-	KiTsid         int32
-	KiJobc         [2]byte
-	KiSpareShort1  [2]byte
-	KiTdev         int32
-	KiSiglist      [16]byte
-	KiSigmask      [16]byte
-	KiSigignore    [16]byte
-	KiSigcatch     [16]byte
-	KiUID          int32
-	KiRuid         int32
-	KiSvuid        int32
-	KiRgid         int32
-	KiSvgid        int32
-	KiNgroups      [2]byte
-	KiSpareShort2  [2]byte
-	KiGroups       [64]byte
-	KiSize         int32
-	KiRssize       int32
-	KiSwrss        int32
-	KiTsize        int32
-	KiDsize        int32
-	KiSsize        int32
-	KiXstat        [2]byte
-	KiAcflag       [2]byte
-	KiPctcpu       int32
-	KiEstcpu       int32
-	KiSlptime      int32
-	KiSwtime       int32
-	KiCow          int32
-	KiRuntime      int64
-	KiStart        [8]byte
-	KiChildtime    [8]byte
-	KiFlag         int32
-	KiKflag        int32
-	KiTraceflag    int32
-	KiStat         [1]byte
-	KiNice         [1]byte
-	KiLock         [1]byte
-	KiRqindex      [1]byte
-	KiOncpu        [1]byte
-	KiLastcpu      [1]byte
-	KiOcomm        [17]byte
-	KiWmesg        [9]byte
-	KiLogin        [18]byte
-	KiLockname     [9]byte
-	KiComm         [20]byte
-	KiEmul         [17]byte
-	KiSparestrings [68]byte
-	KiSpareints    [36]byte
-	KiCrFlags      int32
-	KiJid          int32
-	KiNumthreads   int32
-	KiTid          int32
-	KiPri          int32
-	KiRusage       Rusage
-	KiRusageCh     [72]byte
-	KiPcb          int32
-	KiKstack       int32
-	KiUdata        int32
-	KiTdaddr       int32
-	KiSpareptrs    [24]byte
-	KiSpareint64s  [48]byte
-	KiSflag        int32
-	KiTdflags      int32
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_freebsd_amd64.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_freebsd_amd64.go
deleted file mode 100644
index 69a352f34..000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_freebsd_amd64.go
+++ /dev/null
@@ -1,125 +0,0 @@
-// +build freebsd
-// +build amd64
-package process
-
-// copied from sys/sysctl.h
-const (
-	CTLKern          = 1  // "high kernel": proc, limits
-	KernProc         = 14 // struct: process entries
-	KernProcPID      = 1  // by process id
-	KernProcProc     = 8  // only return procs
-	KernProcPathname = 12 // path to executable
-	KernProcArgs     = 7  // get/set arguments/proctitle
-)
-
-type Timespec struct {
-	Sec  int64
-	Nsec int64
-}
-
-type Timeval struct {
-	Sec  int64
-	Usec int64
-}
-
-type Rusage struct {
-	Utime    Timeval
-	Stime    Timeval
-	Maxrss   int64
-	Ixrss    int64
-	Idrss    int64
-	Isrss    int64
-	Minflt   int64
-	Majflt   int64
-	Nswap    int64
-	Inblock  int64
-	Oublock  int64
-	Msgsnd   int64
-	Msgrcv   int64
-	Nsignals int64
-	Nvcsw    int64
-	Nivcsw   int64
-}
-
-// copied from sys/user.h
-type KinfoProc struct {
-	KiStructsize   int32
-	KiLayout       int32
-	KiArgs         int64
-	KiPaddr        int64
-	KiAddr         int64
-	KiTracep       int64
-	KiTextvp       int64
-	KiFd           int64
-	KiVmspace      int64
-	KiWchan        int64
-	KiPid          int32
-	KiPpid         int32
-	KiPgid         int32
-	KiTpgid        int32
-	KiSid          int32
-	KiTsid         int32
-	KiJobc         [2]byte
-	KiSpareShort1  [2]byte
-	KiTdev         int32
-	KiSiglist      [16]byte
-	KiSigmask      [16]byte
-	KiSigignore    [16]byte
-	KiSigcatch     [16]byte
-	KiUID          int32
-	KiRuid         int32
-	KiSvuid        int32
-	KiRgid         int32
-	KiSvgid        int32
-	KiNgroups      [2]byte
-	KiSpareShort2  [2]byte
-	KiGroups       [64]byte
-	KiSize         int64
-	KiRssize       int64
-	KiSwrss        int64
-	KiTsize        int64
-	KiDsize        int64
-	KiSsize        int64
-	KiXstat        [2]byte
-	KiAcflag       [2]byte
-	KiPctcpu       int32
-	KiEstcpu       int32
-	KiSlptime      int32
-	KiSwtime       int32
-	KiCow          int32
-	KiRuntime      int64
-	KiStart        [16]byte
-	KiChildtime    [16]byte
-	KiFlag         int64
-	KiKflag        int64
-	KiTraceflag    int32
-	KiStat         [1]byte
-	KiNice         [1]byte
-	KiLock         [1]byte
-	KiRqindex      [1]byte
-	KiOncpu        [1]byte
-	KiLastcpu      [1]byte
-	KiOcomm        [17]byte
-	KiWmesg        [9]byte
-	KiLogin        [18]byte
-	KiLockname     [9]byte
-	KiComm         [20]byte
-	KiEmul         [17]byte
-	KiSparestrings [68]byte
-	KiSpareints    [36]byte
-	KiCrFlags      int32
-	KiJid          int32
-	KiNumthreads   int32
-	KiTid          int32
-	KiPri          int32
-	KiRusage       Rusage
-	KiRusageCh     [144]byte
-	KiPcb          int64
-	KiKstack       int64
-	KiUdata        int64
-	KiTdaddr       int64
-	KiSpareptrs    [48]byte
-	KiSpareint64s  [96]byte
-	KiSflag        int64
-	KiTdflags      int64
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_linux.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_linux.go
deleted file mode 100644
index 116de00f9..000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_linux.go
+++ /dev/null
@@ -1,677 +0,0 @@
-// +build linux
-
-package process
-
-import (
-	"encoding/json"
-	"fmt"
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"strconv"
-	"strings"
-	"syscall"
-
-	"github.com/shirou/gopsutil/cpu"
-	"github.com/shirou/gopsutil/host"
-	"github.com/shirou/gopsutil/internal/common"
-	"github.com/shirou/gopsutil/net"
-)
-
-const (
-	PrioProcess = 0 // linux/resource.h
-)
-
-// MemoryInfoExStat is different between OSes
-type MemoryInfoExStat struct {
-	RSS    uint64 `json:"rss"`    // bytes
-	VMS    uint64 `json:"vms"`    // bytes
-	Shared uint64 `json:"shared"` // bytes
-	Text   uint64 `json:"text"`   // bytes
-	Lib    uint64 `json:"lib"`    // bytes
-	Data   uint64 `json:"data"`   // bytes
-	Dirty  uint64 `json:"dirty"`  // bytes
-}
-
-func (m MemoryInfoExStat) String() string {
-	s, _ := json.Marshal(m)
-	return string(s)
-}
-
-type MemoryMapsStat struct {
-	Path         string `json:"path"`
-	Rss          uint64 `json:"rss"`
-	Size         uint64 `json:"size"`
-	Pss          uint64 `json:"pss"`
-	SharedClean  uint64 `json:"shared_clean"`
-	SharedDirty  uint64 `json:"shared_dirty"`
-	PrivateClean uint64 `json:"private_clean"`
-	PrivateDirty uint64 `json:"private_dirty"`
-	Referenced   uint64 `json:"referenced"`
-	Anonymous    uint64 `json:"anonymous"`
-	Swap         uint64 `json:"swap"`
-}
-
-func (m MemoryMapsStat) String() string {
-	s, _ := json.Marshal(m)
-	return string(s)
-}
-
-// Create new Process instance
-// This only stores Pid
-func NewProcess(pid int32) (*Process, error) {
-	p := &Process{
-		Pid: int32(pid),
-	}
-	err := p.fillFromStatus()
-	return p, err
-}
-
-func (p *Process) Ppid() (int32, error) {
-	_, ppid, _, _, _, err := p.fillFromStat()
-	if err != nil {
-		return -1, err
-	}
-	return ppid, nil
-}
-func (p *Process) Name() (string, error) {
-	return p.name, nil
-}
-func (p *Process) Exe() (string, error) {
-	return p.fillFromExe()
-}
-func (p *Process) Cmdline() (string, error) {
-	return p.fillFromCmdline()
-}
-func (p *Process) CreateTime() (int64, error) {
-	_, _, _, createTime, _, err := p.fillFromStat()
-	if err != nil {
-		return 0, err
-	}
-	return createTime, nil
-}
-
-func (p *Process) Cwd() (string, error) {
-	return p.fillFromCwd()
-}
-func (p *Process) Parent() (*Process, error) {
-	r, err := callLsof("R", p.Pid)
-	if err != nil {
-		return nil, err
-	}
-	if len(r) != 1 { // TODO: pid 1
-		return nil, fmt.Errorf("wrong number of parents")
-	}
-	v, err := strconv.Atoi(r[0])
-	if err != nil {
-		return nil, err
-	}
-	return NewProcess(int32(v))
-}
-func (p *Process) Status() (string, error) {
-	err := p.fillFromStatus()
-	if err != nil {
-		return "", err
-	}
-	return p.status, nil
-}
-func (p *Process) Uids() ([]int32, error) {
-	err := p.fillFromStatus()
-	if err != nil {
-		return []int32{}, err
-	}
-	return p.uids, nil
-}
-func (p *Process) Gids() ([]int32, error) {
-	err := p.fillFromStatus()
-	if err != nil {
-		return []int32{}, err
-	}
-	return p.gids, nil
-}
-func (p *Process) Terminal() (string, error) {
-	terminal, _, _, _, _, err := p.fillFromStat()
-	if err != nil {
-		return "", err
-	}
-	return terminal, nil
-}
-func (p *Process) Nice() (int32, error) {
-	_, _, _, _, nice, err := p.fillFromStat()
-	if err != nil {
-		return 0, err
-	}
-	return nice, nil
-}
-func (p *Process) IOnice() (int32, error) {
-	return 0, common.NotImplementedError
-}
-func (p *Process) Rlimit() ([]RlimitStat, error) {
-	return nil, common.NotImplementedError
-}
-func (p *Process) IOCounters() (*IOCountersStat, error) {
-	return p.fillFromIO()
-}
-func (p *Process) NumCtxSwitches() (*NumCtxSwitchesStat, error) {
-	err := p.fillFromStatus()
-	if err != nil {
-		return nil, err
-	}
-	return p.numCtxSwitches, nil
-}
-func (p *Process) NumFDs() (int32, error) {
-	numFds, _, err := p.fillFromfd()
-	return numFds, err
-}
-func (p *Process) NumThreads() (int32, error) {
-	err := p.fillFromStatus()
-	if err != nil {
-		return 0, err
-	}
-	return p.numThreads, nil
-}
-func (p *Process) Threads() (map[string]string, error) {
-	ret := make(map[string]string, 0)
-	return ret, nil
-}
-func (p *Process) CPUTimes() (*cpu.CPUTimesStat, error) {
-	_, _, cpuTimes, _, _, err := p.fillFromStat()
-	if err != nil {
-		return nil, err
-	}
-	return cpuTimes, nil
-}
-func (p *Process) CPUAffinity() ([]int32, error) {
-	return nil, common.NotImplementedError
-}
-func (p *Process) MemoryInfo() (*MemoryInfoStat, error) {
-	_, _, err := p.fillFromStatm()
-	if err != nil {
-		return nil, err
-	}
-	return p.memInfo, nil
-}
-func (p *Process) MemoryInfoEx() (*MemoryInfoExStat, error) {
-	_, memInfoEx, err := p.fillFromStatm()
-	if err != nil {
-		return nil, err
-	}
-	return memInfoEx, nil
-}
-func (p *Process) MemoryPercent() (float32, error) {
-	return 0, common.NotImplementedError
-}
-
-func (p *Process) Children() ([]*Process, error) {
-	pids, err := common.CallPgrep(invoke, p.Pid)
-	if err != nil {
-		return nil, err
-	}
-	ret := make([]*Process, 0, len(pids))
-	for _, pid := range pids {
-		np, err := NewProcess(pid)
-		if err != nil {
-			return nil, err
-		}
-		ret = append(ret, np)
-	}
-	return ret, nil
-}
-
-func (p *Process) OpenFiles() ([]OpenFilesStat, error) {
-	_, ofs, err := p.fillFromfd()
-	if err != nil {
-		return nil, err
-	}
-	ret := make([]OpenFilesStat, 0, len(ofs))
-	for i, o := range ofs {
-		ret[i] = *o
-	}
-
-	return ret, nil
-}
-
-func (p *Process) Connections() ([]net.NetConnectionStat, error) {
-	return net.NetConnectionsPid("all", p.Pid)
-}
-
-func (p *Process) IsRunning() (bool, error) {
-	return true, common.NotImplementedError
-}
-
-// MemoryMaps get memory maps from /proc/(pid)/smaps
-func (p *Process) MemoryMaps(grouped bool) (*[]MemoryMapsStat, error) {
-	pid := p.Pid
-	var ret []MemoryMapsStat
-	smapsPath := common.HostProc(strconv.Itoa(int(pid)), "smaps")
-	contents, err := ioutil.ReadFile(smapsPath)
-	if err != nil {
-		return nil, err
-	}
-	lines := strings.Split(string(contents), "\n")
-
-	// function of parsing a block
-	getBlock := func(first_line []string, block []string) (MemoryMapsStat, error) {
-		m := MemoryMapsStat{}
-		m.Path = first_line[len(first_line)-1]
-
-		for _, line := range block {
-			if strings.Contains(line, "VmFlags") {
-				continue
-			}
-			field := strings.Split(line, ":")
-			if len(field) < 2 {
-				continue
-			}
-			v := strings.Trim(field[1], " kB") // remove last "kB"
-			t, err := strconv.ParseUint(v, 10, 64)
-			if err != nil {
-				return m, err
-			}
-
-			switch field[0] {
-			case "Size":
-				m.Size = t
-			case "Rss":
-				m.Rss = t
-			case "Pss":
-				m.Pss = t
-			case "Shared_Clean":
-				m.SharedClean = t
-			case "Shared_Dirty":
-				m.SharedDirty = t
-			case "Private_Clean":
-				m.PrivateClean = t
-			case "Private_Dirty":
-				m.PrivateDirty = t
-			case "Referenced":
-				m.Referenced = t
-			case "Anonymous":
-				m.Anonymous = t
-			case "Swap":
-				m.Swap = t
-			}
-		}
-		return m, nil
-	}
-
-	blocks := make([]string, 16)
-	for _, line := range lines {
-		field := strings.Split(line, " ")
-		if strings.HasSuffix(field[0], ":") == false {
-			// new block section
-			if len(blocks) > 0 {
-				g, err := getBlock(field, blocks)
-				if err != nil {
-					return &ret, err
-				}
-				ret = append(ret, g)
-			}
-			// starts new block
-			blocks = make([]string, 16)
-		} else {
-			blocks = append(blocks, line)
-		}
-	}
-
-	return &ret, nil
-}
-
-/**
-** Internal functions
-**/
-
-// Get num_fds from /proc/(pid)/fd
-func (p *Process) fillFromfd() (int32, []*OpenFilesStat, error) {
-	pid := p.Pid
-	statPath := common.HostProc(strconv.Itoa(int(pid)), "fd")
-	d, err := os.Open(statPath)
-	if err != nil {
-		return 0, nil, err
-	}
-	defer d.Close()
-	fnames, err := d.Readdirnames(-1)
-	numFDs := int32(len(fnames))
-
-	openfiles := make([]*OpenFilesStat, numFDs)
-	for _, fd := range fnames {
-		fpath := filepath.Join(statPath, fd)
-		filepath, err := os.Readlink(fpath)
-		if err != nil {
-			continue
-		}
-		t, err := strconv.ParseUint(fd, 10, 64)
-		if err != nil {
-			return numFDs, openfiles, err
-		}
-		o := &OpenFilesStat{
-			Path: filepath,
-			Fd:   t,
-		}
-		openfiles = append(openfiles, o)
-	}
-
-	return numFDs, openfiles, nil
-}
-
-// Get cwd from /proc/(pid)/cwd
-func (p *Process) fillFromCwd() (string, error) {
-	pid := p.Pid
-	cwdPath := common.HostProc(strconv.Itoa(int(pid)), "cwd")
-	cwd, err := os.Readlink(cwdPath)
-	if err != nil {
-		return "", err
-	}
-	return string(cwd), nil
-}
-
-// Get exe from /proc/(pid)/exe
-func (p *Process) fillFromExe() (string, error) {
-	pid := p.Pid
-	exePath := common.HostProc(strconv.Itoa(int(pid)), "exe")
-	exe, err := os.Readlink(exePath)
-	if err != nil {
-		return "", err
-	}
-	return string(exe), nil
-}
-
-// Get cmdline from /proc/(pid)/cmdline
-func (p *Process) fillFromCmdline() (string, error) {
-	pid := p.Pid
-	cmdPath := common.HostProc(strconv.Itoa(int(pid)), "cmdline")
-	cmdline, err := ioutil.ReadFile(cmdPath)
-	if err != nil {
-		return "", err
-	}
-	ret := strings.FieldsFunc(string(cmdline), func(r rune) bool {
-		if r == '\u0000' {
-			return true
-		}
-		return false
-	})
-
-	return strings.Join(ret, " "), nil
-}
-
-// Get IO status from /proc/(pid)/io
-func (p *Process) fillFromIO() (*IOCountersStat, error) {
-	pid := p.Pid
-	ioPath := common.HostProc(strconv.Itoa(int(pid)), "io")
-	ioline, err := ioutil.ReadFile(ioPath)
-	if err != nil {
-		return nil, err
-	}
-	lines := strings.Split(string(ioline), "\n")
-	ret := &IOCountersStat{}
-
-	for _, line := range lines {
-		field := strings.Fields(line)
-		if len(field) < 2 {
-			continue
-		}
-		t, err := strconv.ParseUint(field[1], 10, 64)
-		if err != nil {
-			return nil, err
-		}
-		param := field[0]
-		if strings.HasSuffix(param, ":") {
-			param = param[:len(param)-1]
-		}
-		switch param {
-		case "syscr":
-			ret.ReadCount = t
-		case "syscw":
-			ret.WriteCount = t
-		case "read_bytes":
-			ret.ReadBytes = t
-		case "write_bytes":
-			ret.WriteBytes = t
-		}
-	}
-
-	return ret, nil
-}
-
-// Get memory info from /proc/(pid)/statm
-func (p *Process) fillFromStatm() (*MemoryInfoStat, *MemoryInfoExStat, error) {
-	pid := p.Pid
-	memPath := common.HostProc(strconv.Itoa(int(pid)), "statm")
-	contents, err := ioutil.ReadFile(memPath)
-	if err != nil {
-		return nil, nil, err
-	}
-	fields := strings.Split(string(contents), " ")
-
-	vms, err := strconv.ParseUint(fields[0], 10, 64)
-	if err != nil {
-		return nil, nil, err
-	}
-	rss, err := strconv.ParseUint(fields[1], 10, 64)
-	if err != nil {
-		return nil, nil, err
-	}
-	memInfo := &MemoryInfoStat{
-		RSS: rss * PageSize,
-		VMS: vms * PageSize,
-	}
-
-	shared, err := strconv.ParseUint(fields[2], 10, 64)
-	if err != nil {
-		return nil, nil, err
-	}
-	text, err := strconv.ParseUint(fields[3], 10, 64)
-	if err != nil {
-		return nil, nil, err
-	}
-	lib, err := strconv.ParseUint(fields[4], 10, 64)
-	if err != nil {
-		return nil, nil, err
-	}
-	dirty, err := strconv.ParseUint(fields[5], 10, 64)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	memInfoEx := &MemoryInfoExStat{
-		RSS:    rss * PageSize,
-		VMS:    vms * PageSize,
-		Shared: shared * PageSize,
-		Text:   text * PageSize,
-		Lib:    lib * PageSize,
-		Dirty:  dirty * PageSize,
-	}
-
-	return memInfo, memInfoEx, nil
-}
-
-// Get various status from /proc/(pid)/status
-func (p *Process) fillFromStatus() error {
-	pid := p.Pid
-	statPath := common.HostProc(strconv.Itoa(int(pid)), "status")
-	contents, err := ioutil.ReadFile(statPath)
-	if err != nil {
-		return err
-	}
-	lines := strings.Split(string(contents), "\n")
-	p.numCtxSwitches = &NumCtxSwitchesStat{}
-	p.memInfo = &MemoryInfoStat{}
-	for _, line := range lines {
-		tabParts := strings.SplitN(line, "\t", 2)
-		if len(tabParts) < 2 {
-			continue
-		}
-		value := tabParts[1]
-		switch strings.TrimRight(tabParts[0], ":") {
-		case "Name":
-			p.name = strings.Trim(value, " \t")
-		case "State":
-			// get between "(" and ")"
-			s := strings.Index(value, "(") + 1
-			e := strings.Index(value, ")")
-			p.status = value[s:e]
-		case "Uid":
-			p.uids = make([]int32, 0, 4)
-			for _, i := range strings.Split(value, "\t") {
-				v, err := strconv.ParseInt(i, 10, 32)
-				if err != nil {
-					return err
-				}
-				p.uids = append(p.uids, int32(v))
-			}
-		case "Gid":
-			p.gids = make([]int32, 0, 4)
-			for _, i := range strings.Split(value, "\t") {
-				v, err := strconv.ParseInt(i, 10, 32)
-				if err != nil {
-					return err
-				}
-				p.gids = append(p.gids, int32(v))
-			}
-		case "Threads":
-			v, err := strconv.ParseInt(value, 10, 32)
-			if err != nil {
-				return err
-			}
-			p.numThreads = int32(v)
-		case "voluntary_ctxt_switches":
-			v, err := strconv.ParseInt(value, 10, 64)
-			if err != nil {
-				return err
-			}
-			p.numCtxSwitches.Voluntary = v
-		case "nonvoluntary_ctxt_switches":
-			v, err := strconv.ParseInt(value, 10, 64)
-			if err != nil {
-				return err
-			}
-			p.numCtxSwitches.Involuntary = v
-		case "VmRSS":
-			value := strings.Trim(value, " kB") // remove last "kB"
-			v, err := strconv.ParseUint(value, 10, 64)
-			if err != nil {
-				return err
-			}
-			p.memInfo.RSS = v * 1024
-		case "VmSize":
-			value := strings.Trim(value, " kB") // remove last "kB"
-			v, err := strconv.ParseUint(value, 10, 64)
-			if err != nil {
-				return err
-			}
-			p.memInfo.VMS = v * 1024
-		case "VmSwap":
-			value := strings.Trim(value, " kB") // remove last "kB"
-			v, err := strconv.ParseUint(value, 10, 64)
-			if err != nil {
-				return err
-			}
-			p.memInfo.Swap = v * 1024
-		}
-
-	}
-	return nil
-}
-
-func (p *Process) fillFromStat() (string, int32, *cpu.CPUTimesStat, int64, int32, error) {
-	pid := p.Pid
-	statPath := common.HostProc(strconv.Itoa(int(pid)), "stat")
-	contents, err := ioutil.ReadFile(statPath)
-	if err != nil {
-		return "", 0, nil, 0, 0, err
-	}
-	fields := strings.Fields(string(contents))
-
-	termmap, err := getTerminalMap()
-	terminal := ""
-	if err == nil {
-		t, err := strconv.ParseUint(fields[6], 10, 64)
-		if err != nil {
-			return "", 0, nil, 0, 0, err
-		}
-		terminal = termmap[t]
-	}
-
-	ppid, err := strconv.ParseInt(fields[3], 10, 32)
-	if err != nil {
-		return "", 0, nil, 0, 0, err
-	}
-	utime, err := strconv.ParseFloat(fields[13], 64)
-	if err != nil {
-		return "", 0, nil, 0, 0, err
-	}
-
-	stime, err := strconv.ParseFloat(fields[14], 64)
-	if err != nil {
-		return "", 0, nil, 0, 0, err
-	}
-
-	cpuTimes := &cpu.CPUTimesStat{
-		CPU:    "cpu",
-		User:   float64(utime / ClockTicks),
-		System: float64(stime / ClockTicks),
-	}
-
-	bootTime, _ := host.BootTime()
-	t, err := strconv.ParseUint(fields[21], 10, 64)
-	if err != nil {
-		return "", 0, nil, 0, 0, err
-	}
-	ctime := (t / uint64(ClockTicks)) + uint64(bootTime)
-	createTime := int64(ctime * 1000)
-
-	//	p.Nice = mustParseInt32(fields[18])
-	// use syscall instead of parse Stat file
-	snice, _ := syscall.Getpriority(PrioProcess, int(pid))
-	nice := int32(snice) // FIXME: is this true?
-
-	return terminal, int32(ppid), cpuTimes, createTime, nice, nil
-}
-
-func Pids() ([]int32, error) {
-	var ret []int32
-
-	d, err := os.Open(common.HostProc())
-	if err != nil {
-		return nil, err
-	}
-	defer d.Close()
-
-	fnames, err := d.Readdirnames(-1)
-	if err != nil {
-		return nil, err
-	}
-	for _, fname := range fnames {
-		pid, err := strconv.ParseInt(fname, 10, 32)
-		if err != nil {
-			// if not numeric name, just skip
-			continue
-		}
-		ret = append(ret, int32(pid))
-	}
-
-	return ret, nil
-}
-
-func callLsof(arg string, pid int32) ([]string, error) {
-	var cmd []string
-	if pid == 0 { // will get from all processes.
-		cmd = []string{"-F" + arg}
-	} else {
-		cmd = []string{"-a", "-F" + arg, "-p", strconv.Itoa(int(pid))}
-	}
-	out, err := invoke.Command("/usr/bin/lsof", cmd...)
-	if err != nil {
-		return []string{}, err
-	}
-	lines := strings.Split(string(out), "\n")
-
-	var ret []string
-	for _, l := range lines[1:] {
-		if strings.HasPrefix(l, arg) {
-			ret = append(ret, l[1:]) // delete first char
-		}
-	}
-
-	return ret, nil
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_linux_386.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_linux_386.go
deleted file mode 100644
index 541b854c7..000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_linux_386.go
+++ /dev/null
@@ -1,9 +0,0 @@
-// +build linux
-// +build 386
-
-package process
-
-const (
-	ClockTicks = 100  // C.sysconf(C._SC_CLK_TCK)
-	PageSize   = 4096 // C.sysconf(C._SC_PAGE_SIZE)
-)
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_linux_amd64.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_linux_amd64.go
deleted file mode 100644
index b4a4ce8b7..000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_linux_amd64.go
+++ /dev/null
@@ -1,9 +0,0 @@
-// +build linux
-// +build amd64
-
-package process
-
-const (
-	ClockTicks = 100  // C.sysconf(C._SC_CLK_TCK)
-	PageSize   = 4096 // C.sysconf(C._SC_PAGE_SIZE)
-)
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_linux_arm.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_linux_arm.go
deleted file mode 100644
index c6123a489..000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_linux_arm.go
+++ /dev/null
@@ -1,9 +0,0 @@
-// +build linux
-// +build arm
-
-package process
-
-const (
-	ClockTicks = 100  // C.sysconf(C._SC_CLK_TCK)
-	PageSize   = 4096 // C.sysconf(C._SC_PAGE_SIZE)
-)
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_posix.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_posix.go
deleted file mode 100644
index 38f06e9e7..000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_posix.go
+++ /dev/null
@@ -1,102 +0,0 @@
-// +build linux freebsd darwin
-
-package process
-
-import (
-	"os"
-	"os/exec"
-	"os/user"
-	"strconv"
-	"strings"
-	"syscall"
-)
-
-// POSIX
-func getTerminalMap() (map[uint64]string, error) {
-	ret := make(map[uint64]string)
-	var termfiles []string
-
-	d, err := os.Open("/dev")
-	if err != nil {
-		return nil, err
-	}
-	defer d.Close()
-
-	devnames, err := d.Readdirnames(-1)
-	for _, devname := range devnames {
-		if strings.HasPrefix(devname, "/dev/tty") {
-			termfiles = append(termfiles, "/dev/tty/"+devname)
-		}
-	}
-
-	ptsd, err := os.Open("/dev/pts")
-	if err != nil {
-		return nil, err
-	}
-	defer ptsd.Close()
-
-	ptsnames, err := ptsd.Readdirnames(-1)
-	for _, ptsname := range ptsnames {
-		termfiles = append(termfiles, "/dev/pts/"+ptsname)
-	}
-
-	for _, name := range termfiles {
-		stat := syscall.Stat_t{}
-		if err = syscall.Stat(name, &stat); err != nil {
-			return nil, err
-		}
-		rdev := uint64(stat.Rdev)
-		ret[rdev] = strings.Replace(name, "/dev", "", -1)
-	}
-	return ret, nil
-}
-
-func (p *Process) SendSignal(sig syscall.Signal) error {
-	sigAsStr := "INT"
-	switch sig {
-	case syscall.SIGSTOP:
-		sigAsStr = "STOP"
-	case syscall.SIGCONT:
-		sigAsStr = "CONT"
-	case syscall.SIGTERM:
-		sigAsStr = "TERM"
-	case syscall.SIGKILL:
-		sigAsStr = "KILL"
-	}
-
-	cmd := exec.Command("kill", "-s", sigAsStr, strconv.Itoa(int(p.Pid)))
-	cmd.Stderr = os.Stderr
-	err := cmd.Run()
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (p *Process) Suspend() error {
-	return p.SendSignal(syscall.SIGSTOP)
-}
-func (p *Process) Resume() error {
-	return p.SendSignal(syscall.SIGCONT)
-}
-func (p *Process) Terminate() error {
-	return p.SendSignal(syscall.SIGTERM)
-}
-func (p *Process) Kill() error {
-	return p.SendSignal(syscall.SIGKILL)
-}
-func (p *Process) Username() (string, error) {
-	uids, err := p.Uids()
-	if err != nil {
-		return "", err
-	}
-	if len(uids) > 0 {
-		u, err := user.LookupId(strconv.Itoa(int(uids[0])))
-		if err != nil {
-			return "", err
-		}
-		return u.Username, nil
-	}
-	return "", nil
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_posix_test.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_posix_test.go
deleted file mode 100644
index eb9129220..000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_posix_test.go
+++ /dev/null
@@ -1,19 +0,0 @@
-// +build linux freebsd
-
-package process
-
-import (
-	"os"
-	"syscall"
-	"testing"
-)
-
-func Test_SendSignal(t *testing.T) {
-	checkPid := os.Getpid()
-
-	p, _ := NewProcess(int32(checkPid))
-	err := p.SendSignal(syscall.SIGCONT)
-	if err != nil {
-		t.Errorf("send signal %v", err)
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_test.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_test.go
deleted file mode 100644
index 153302e7f..000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_test.go
+++ /dev/null
@@ -1,330 +0,0 @@
-package process
-
-import (
-	"os"
-	"runtime"
-	"strings"
-	"sync"
-	"testing"
-	"time"
-
-	"github.com/shirou/gopsutil/internal/common"
-)
-
-var mu sync.Mutex
-
-func testGetProcess() Process {
-	checkPid := os.Getpid() // process.test
-	ret, _ := NewProcess(int32(checkPid))
-	return *ret
-}
-
-func Test_Pids(t *testing.T) {
-	ret, err := Pids()
-	if err != nil {
-		t.Errorf("error %v", err)
-	}
-	if len(ret) == 0 {
-		t.Errorf("could not get pids %v", ret)
-	}
-}
-
-func Test_Pids_Fail(t *testing.T) {
-	if runtime.GOOS != "darwin" {
-		t.Skip("darwin only")
-	}
-
-	mu.Lock()
-	defer mu.Unlock()
-
-	invoke = common.FakeInvoke{Suffix: "fail"}
-	ret, err := Pids()
-	invoke = common.Invoke{}
-	if err != nil {
-		t.Errorf("error %v", err)
-	}
-	if len(ret) != 9 {
-		t.Errorf("wrong getted pid nums: %v/%d", ret, len(ret))
-	}
-}
-func Test_Pid_exists(t *testing.T) {
-	checkPid := os.Getpid()
-
-	ret, err := PidExists(int32(checkPid))
-	if err != nil {
-		t.Errorf("error %v", err)
-	}
-
-	if ret == false {
-		t.Errorf("could not get process exists: %v", ret)
-	}
-}
-
-func Test_NewProcess(t *testing.T) {
-	checkPid := os.Getpid()
-
-	ret, err := NewProcess(int32(checkPid))
-	if err != nil {
-		t.Errorf("error %v", err)
-	}
-	empty := &Process{}
-	if runtime.GOOS != "windows" { // Windows pid is 0
-		if empty == ret {
-			t.Errorf("error %v", ret)
-		}
-	}
-
-}
-
-func Test_Process_memory_maps(t *testing.T) {
-	checkPid := os.Getpid()
-
-	ret, err := NewProcess(int32(checkPid))
-
-	mmaps, err := ret.MemoryMaps(false)
-	if err != nil {
-		t.Errorf("memory map get error %v", err)
-	}
-	empty := MemoryMapsStat{}
-	for _, m := range *mmaps {
-		if m == empty {
-			t.Errorf("memory map get error %v", m)
-		}
-	}
-}
-func Test_Process_MemoryInfo(t *testing.T) {
-	p := testGetProcess()
-
-	v, err := p.MemoryInfo()
-	if err != nil {
-		t.Errorf("geting memory info error %v", err)
-	}
-	empty := MemoryInfoStat{}
-	if v == nil || *v == empty {
-		t.Errorf("could not get memory info %v", v)
-	}
-}
-
-func Test_Process_CmdLine(t *testing.T) {
-	p := testGetProcess()
-
-	v, err := p.Cmdline()
-	if err != nil {
-		t.Errorf("geting cmdline error %v", err)
-	}
-	if !strings.Contains(v, "process.test") {
-		t.Errorf("invalid cmd line %v", v)
-	}
-}
-
-func Test_Process_Ppid(t *testing.T) {
-	p := testGetProcess()
-
-	v, err := p.Ppid()
-	if err != nil {
-		t.Errorf("geting ppid error %v", err)
-	}
-	if v == 0 {
-		t.Errorf("return value is 0 %v", v)
-	}
-}
-
-func Test_Process_Status(t *testing.T) {
-	p := testGetProcess()
-
-	v, err := p.Status()
-	if err != nil {
-		t.Errorf("geting status error %v", err)
-	}
-	if !strings.HasPrefix(v, "S") && v != "running" && v != "sleeping" {
-		t.Errorf("could not get state %v", v)
-	}
-}
-
-func Test_Process_Terminal(t *testing.T) {
-	p := testGetProcess()
-
-	_, err := p.Terminal()
-	if err != nil {
-		t.Errorf("geting terminal error %v", err)
-	}
-
-	/*
-		if v == "" {
-			t.Errorf("could not get terminal %v", v)
-		}
-	*/
-}
-
-func Test_Process_IOCounters(t *testing.T) {
-	p := testGetProcess()
-
-	v, err := p.IOCounters()
-	if err != nil {
-		t.Errorf("geting iocounter error %v", err)
-		return
-	}
-	empty := &IOCountersStat{}
-	if v == empty {
-		t.Errorf("error %v", v)
-	}
-}
-
-func Test_Process_NumCtx(t *testing.T) {
-	p := testGetProcess()
-
-	_, err := p.NumCtxSwitches()
-	if err != nil {
-		t.Errorf("geting numctx error %v", err)
-		return
-	}
-}
-
-func Test_Process_Nice(t *testing.T) {
-	p := testGetProcess()
-
-	n, err := p.Nice()
-	if err != nil {
-		t.Errorf("geting nice error %v", err)
-	}
-	if n != 0 && n != 20 && n != 8 {
-		t.Errorf("invalid nice: %d", n)
-	}
-}
-func Test_Process_NumThread(t *testing.T) {
-	p := testGetProcess()
-
-	n, err := p.NumThreads()
-	if err != nil {
-		t.Errorf("geting NumThread error %v", err)
-	}
-	if n < 0 {
-		t.Errorf("invalid NumThread: %d", n)
-	}
-}
-
-func Test_Process_Name(t *testing.T) {
-	p := testGetProcess()
-
-	n, err := p.Name()
-	if err != nil {
-		t.Errorf("geting name error %v", err)
-	}
-	if !strings.Contains(n, "process.test") {
-		t.Errorf("invalid Exe %s", n)
-	}
-}
-func Test_Process_Exe(t *testing.T) {
-	p := testGetProcess()
-
-	n, err := p.Exe()
-	if err != nil {
-		t.Errorf("geting Exe error %v", err)
-	}
-	if !strings.Contains(n, "process.test") {
-		t.Errorf("invalid Exe %s", n)
-	}
-}
-
-func Test_Process_CpuPercent(t *testing.T) {
-	p := testGetProcess()
-	percent, err := p.CPUPercent(0)
-	if err != nil {
-		t.Errorf("error %v", err)
-	}
-	duration := time.Duration(1000) * time.Microsecond
-	time.Sleep(duration)
-	percent, err = p.CPUPercent(0)
-	if err != nil {
-		t.Errorf("error %v", err)
-	}
-
-	numcpu := runtime.NumCPU()
-	//	if percent < 0.0 || percent > 100.0*float64(numcpu) { // TODO
-	if percent < 0.0 {
-		t.Fatalf("CPUPercent value is invalid: %f, %d", percent, numcpu)
-	}
-}
-
-func Test_Process_CpuPercentLoop(t *testing.T) {
-	p := testGetProcess()
-	numcpu := runtime.NumCPU()
-
-	for i := 0; i < 2; i++ {
-		duration := time.Duration(100) * time.Microsecond
-		percent, err := p.CPUPercent(duration)
-		if err != nil {
-			t.Errorf("error %v", err)
-		}
-		//	if percent < 0.0 || percent > 100.0*float64(numcpu) { // TODO
-		if percent < 0.0 {
-			t.Fatalf("CPUPercent value is invalid: %f, %d", percent, numcpu)
-		}
-	}
-}
-
-func Test_Process_CreateTime(t *testing.T) {
-	p := testGetProcess()
-
-	c, err := p.CreateTime()
-	if err != nil {
-		t.Errorf("error %v", err)
-	}
-
-	if c < 1420000000 {
-		t.Errorf("process created time is wrong.")
-	}
-
-	gotElapsed := time.Since(time.Unix(int64(c/1000), 0))
-	maxElapsed := time.Duration(5 * time.Second)
-
-	if gotElapsed >= maxElapsed {
-		t.Errorf("this process has not been running for %v", gotElapsed)
-	}
-}
-
-func Test_Parent(t *testing.T) {
-	p := testGetProcess()
-
-	c, err := p.Parent()
-	if err != nil {
-		t.Fatalf("error %v", err)
-	}
-	if c == nil {
-		t.Fatalf("could not get parent")
-	}
-	if c.Pid == 0 {
-		t.Fatalf("wrong parent pid")
-	}
-}
-
-func Test_Connections(t *testing.T) {
-	p := testGetProcess()
-
-	c, err := p.Connections()
-	if err != nil {
-		t.Fatalf("error %v", err)
-	}
-	// TODO:
-	// Since go test open no conneciton, ret is empty.
-	// should invoke child process or other solutions.
-	if len(c) != 0 {
-		t.Fatalf("wrong connections")
-	}
-}
-
-func Test_Children(t *testing.T) {
-	p, err := NewProcess(1)
-	if err != nil {
-		t.Fatalf("new process error %v", err)
-	}
-
-	c, err := p.Children()
-	if err != nil {
-		t.Fatalf("error %v", err)
-	}
-	if len(c) == 0 {
-		t.Fatalf("children is empty")
-	}
-
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_windows.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_windows.go
deleted file mode 100644
index d7a4b1cb6..000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/process/process_windows.go
+++ /dev/null
@@ -1,344 +0,0 @@
-// +build windows
-
-package process
-
-import (
-	"errors"
-	"fmt"
-	"syscall"
-	"time"
-	"unsafe"
-
-	"github.com/StackExchange/wmi"
-	"github.com/shirou/w32"
-
-	"github.com/shirou/gopsutil/internal/common"
-	cpu "github.com/shirou/gopsutil/cpu"
-	net "github.com/shirou/gopsutil/net"
-)
-
-const (
-	NoMoreFiles   = 0x12
-	MaxPathLength = 260
-)
-
-type SystemProcessInformation struct {
-	NextEntryOffset   uint64
-	NumberOfThreads   uint64
-	Reserved1         [48]byte
-	Reserved2         [3]byte
-	UniqueProcessID   uintptr
-	Reserved3         uintptr
-	HandleCount       uint64
-	Reserved4         [4]byte
-	Reserved5         [11]byte
-	PeakPagefileUsage uint64
-	PrivatePageCount  uint64
-	Reserved6         [6]uint64
-}
-
-// Memory_info_ex is different between OSes
-type MemoryInfoExStat struct {
-}
-
-type MemoryMapsStat struct {
-}
-
-type Win32_Process struct {
-	Name           string
-	ExecutablePath *string
-	CommandLine    *string
-	Priority       uint32
-	CreationDate   *time.Time
-	ProcessId      uint32
-	ThreadCount    uint32
-
-	/*
-		CSCreationClassName   string
-		CSName                string
-		Caption               *string
-		CreationClassName     string
-		Description           *string
-		ExecutionState        *uint16
-		HandleCount           uint32
-		KernelModeTime        uint64
-		MaximumWorkingSetSize *uint32
-		MinimumWorkingSetSize *uint32
-		OSCreationClassName   string
-		OSName                string
-		OtherOperationCount   uint64
-		OtherTransferCount    uint64
-		PageFaults            uint32
-		PageFileUsage         uint32
-		ParentProcessId       uint32
-		PeakPageFileUsage     uint32
-		PeakVirtualSize       uint64
-		PeakWorkingSetSize    uint32
-		PrivatePageCount      uint64
-		ReadOperationCount    uint64
-		ReadTransferCount     uint64
-		Status                *string
-		TerminationDate       *time.Time
-		UserModeTime          uint64
-		WorkingSetSize        uint64
-		WriteOperationCount   uint64
-		WriteTransferCount    uint64
-	*/
-}
-
-func Pids() ([]int32, error) {
-	var ret []int32
-
-	procs, err := processes()
-	if err != nil {
-		return ret, nil
-	}
-
-	for _, proc := range procs {
-		ret = append(ret, proc.Pid)
-	}
-
-	return ret, nil
-}
-
-func (p *Process) Ppid() (int32, error) {
-	ret, _, _, err := p.getFromSnapProcess(p.Pid)
-	if err != nil {
-		return 0, err
-	}
-	return ret, nil
-}
-
-func GetWin32Proc(pid int32) ([]Win32_Process, error) {
-	var dst []Win32_Process
-	query := fmt.Sprintf("WHERE ProcessId = %d", pid)
-	q := wmi.CreateQuery(&dst, query)
-	err := wmi.Query(q, &dst)
-	if err != nil {
-		return []Win32_Process{}, fmt.Errorf("could not get win32Proc: %s", err)
-	}
-	if len(dst) != 1 {
-		return []Win32_Process{}, fmt.Errorf("could not get win32Proc: empty")
-	}
-	return dst, nil
-}
-
-func (p *Process) Name() (string, error) {
-	dst, err := GetWin32Proc(p.Pid)
-	if err != nil {
-		return "", fmt.Errorf("could not get Name: %s", err)
-	}
-	return dst[0].Name, nil
-}
-func (p *Process) Exe() (string, error) {
-	dst, err := GetWin32Proc(p.Pid)
-	if err != nil {
-		return "", fmt.Errorf("could not get ExecutablePath: %s", err)
-	}
-	return *dst[0].ExecutablePath, nil
-}
-func (p *Process) Cmdline() (string, error) {
-	dst, err := GetWin32Proc(p.Pid)
-	if err != nil {
-		return "", fmt.Errorf("could not get CommandLine: %s", err)
-	}
-	return *dst[0].CommandLine, nil
-}
-
-func (p *Process) CreateTime() (int64, error) {
-	dst, err := GetWin32Proc(p.Pid)
-	if err != nil {
-		return 0, fmt.Errorf("could not get CreationDate: %s", err)
-	}
-	date := *dst[0].CreationDate
-	return date.Unix(), nil
-}
-
-func (p *Process) Cwd() (string, error) {
-	return "", common.NotImplementedError
-}
-func (p *Process) Parent() (*Process, error) {
-	return p, common.NotImplementedError
-}
-func (p *Process) Status() (string, error) {
-	return "", common.NotImplementedError
-}
-func (p *Process) Username() (string, error) {
-	return "", common.NotImplementedError
-}
-func (p *Process) Uids() ([]int32, error) {
-	var uids []int32
-
-	return uids, common.NotImplementedError
-}
-func (p *Process) Gids() ([]int32, error) {
-	var gids []int32
-	return gids, common.NotImplementedError
-}
-func (p *Process) Terminal() (string, error) {
-	return "", common.NotImplementedError
-}
-
-// Nice returnes priority in Windows
-func (p *Process) Nice() (int32, error) {
-	dst, err := GetWin32Proc(p.Pid)
-	if err != nil {
-		return 0, fmt.Errorf("could not get Priority: %s", err)
-	}
-	return int32(dst[0].Priority), nil
-}
-func (p *Process) IOnice() (int32, error) {
-	return 0, common.NotImplementedError
-}
-func (p *Process) Rlimit() ([]RlimitStat, error) {
-	var rlimit []RlimitStat
-
-	return rlimit, common.NotImplementedError
-}
-func (p *Process) IOCounters() (*IOCountersStat, error) {
-	return nil, common.NotImplementedError
-}
-func (p *Process) NumCtxSwitches() (*NumCtxSwitchesStat, error) {
-	return nil, common.NotImplementedError
-}
-func (p *Process) NumFDs() (int32, error) {
-	return 0, common.NotImplementedError
-}
-func (p *Process) NumThreads() (int32, error) {
-	dst, err := GetWin32Proc(p.Pid)
-	if err != nil {
-		return 0, fmt.Errorf("could not get ThreadCount: %s", err)
-	}
-	return int32(dst[0].ThreadCount), nil
-}
-func (p *Process) Threads() (map[string]string, error) {
-	ret := make(map[string]string, 0)
-	return ret, common.NotImplementedError
-}
-func (p *Process) CPUTimes() (*cpu.CPUTimesStat, error) {
-	return nil, common.NotImplementedError
-}
-func (p *Process) CPUAffinity() ([]int32, error) {
-	return nil, common.NotImplementedError
-}
-func (p *Process) MemoryInfo() (*MemoryInfoStat, error) {
-	return nil, common.NotImplementedError
-}
-func (p *Process) MemoryInfoEx() (*MemoryInfoExStat, error) {
-	return nil, common.NotImplementedError
-}
-func (p *Process) MemoryPercent() (float32, error) {
-	return 0, common.NotImplementedError
-}
-
-func (p *Process) Children() ([]*Process, error) {
-	return nil, common.NotImplementedError
-}
-
-func (p *Process) OpenFiles() ([]OpenFilesStat, error) {
-	return nil, common.NotImplementedError
-}
-
-func (p *Process) Connections() ([]net.NetConnectionStat, error) {
-	return nil, common.NotImplementedError
-}
-
-func (p *Process) IsRunning() (bool, error) {
-	return true, common.NotImplementedError
-}
-
-func (p *Process) MemoryMaps(grouped bool) (*[]MemoryMapsStat, error) {
-	ret := make([]MemoryMapsStat, 0)
-	return &ret, common.NotImplementedError
-}
-
-func NewProcess(pid int32) (*Process, error) {
-	p := &Process{Pid: pid}
-
-	return p, nil
-}
-
-func (p *Process) SendSignal(sig syscall.Signal) error {
-	return common.NotImplementedError
-}
-
-func (p *Process) Suspend() error {
-	return common.NotImplementedError
-}
-func (p *Process) Resume() error {
-	return common.NotImplementedError
-}
-func (p *Process) Terminate() error {
-	return common.NotImplementedError
-}
-func (p *Process) Kill() error {
-	return common.NotImplementedError
-}
-
-func (p *Process) getFromSnapProcess(pid int32) (int32, int32, string, error) {
-	snap := w32.CreateToolhelp32Snapshot(w32.TH32CS_SNAPPROCESS, uint32(pid))
-	if snap == 0 {
-		return 0, 0, "", syscall.GetLastError()
-	}
-	defer w32.CloseHandle(snap)
-	var pe32 w32.PROCESSENTRY32
-	pe32.DwSize = uint32(unsafe.Sizeof(pe32))
-	if w32.Process32First(snap, &pe32) == false {
-		return 0, 0, "", syscall.GetLastError()
-	}
-
-	if pe32.Th32ProcessID == uint32(pid) {
-		szexe := syscall.UTF16ToString(pe32.SzExeFile[:])
-		return int32(pe32.Th32ParentProcessID), int32(pe32.CntThreads), szexe, nil
-	}
-
-	for w32.Process32Next(snap, &pe32) {
-		if pe32.Th32ProcessID == uint32(pid) {
-			szexe := syscall.UTF16ToString(pe32.SzExeFile[:])
-			return int32(pe32.Th32ParentProcessID), int32(pe32.CntThreads), szexe, nil
-		}
-	}
-	return 0, 0, "", errors.New("Couldn't find pid:" + string(pid))
-}
-
-// Get processes
-func processes() ([]*Process, error) {
-
-	var dst []Win32_Process
-	q := wmi.CreateQuery(&dst, "")
-	err := wmi.Query(q, &dst)
-	if err != nil {
-		return []*Process{}, err
-	}
-	if len(dst) == 0 {
-		return []*Process{}, fmt.Errorf("could not get Process")
-	}
-	results := make([]*Process, 0, len(dst))
-	for _, proc := range dst {
-		p, err := NewProcess(int32(proc.ProcessId))
-		if err != nil {
-			continue
-		}
-		results = append(results, p)
-	}
-
-	return results, nil
-}
-
-func getProcInfo(pid int32) (*SystemProcessInformation, error) {
-	initialBufferSize := uint64(0x4000)
-	bufferSize := initialBufferSize
-	buffer := make([]byte, bufferSize)
-
-	var sysProcInfo SystemProcessInformation
-	ret, _, _ := common.ProcNtQuerySystemInformation.Call(
-		uintptr(unsafe.Pointer(&sysProcInfo)),
-		uintptr(unsafe.Pointer(&buffer[0])),
-		uintptr(unsafe.Pointer(&bufferSize)),
-		uintptr(unsafe.Pointer(&bufferSize)))
-	if ret != 0 {
-		return nil, syscall.GetLastError()
-	}
-
-	return &sysProcInfo, nil
-}
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/process/types_darwin.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/process/types_darwin.go
deleted file mode 100644
index 21216cd09..000000000
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/process/types_darwin.go
+++ /dev/null
@@ -1,160 +0,0 @@
-// 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.
-
-// Hand Writing
-// - all pointer in ExternProc to uint64
-
-// +build ignore
-
-/*
-Input to cgo -godefs.
-*/
-
-// +godefs map struct_in_addr [4]byte /* in_addr */
-// +godefs map struct_in6_addr [16]byte /* in6_addr */
-// +godefs map struct_ [16]byte /* in6_addr */
-
-package process
-
-/*
-#define __DARWIN_UNIX03 0
-#define KERNEL
-#define _DARWIN_USE_64_BIT_INODE
-#include <dirent.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <termios.h>
-#include <unistd.h>
-#include <mach/mach.h>
-#include <mach/message.h>
-#include <sys/event.h>
-#include <sys/mman.h>
-#include <sys/mount.h>
-#include <sys/param.h>
-#include <sys/ptrace.h>
-#include <sys/resource.h>
-#include <sys/select.h>
-#include <sys/signal.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <sys/uio.h>
-#include <sys/un.h>
-#include <net/bpf.h>
-#include <net/if_dl.h>
-#include <net/if_var.h>
-#include <net/route.h>
-#include <netinet/in.h>
-
-#include <sys/sysctl.h>
-#include <sys/ucred.h>
-#include <sys/proc.h>
-#include <sys/time.h>
-#include <sys/_types/_timeval.h>
-#include <sys/appleapiopts.h>
-#include <sys/cdefs.h>
-#include <sys/param.h>
-#include <bsm/audit.h>
-#include <sys/queue.h>
-
-enum {
-	sizeofPtr = sizeof(void*),
-};
-
-union sockaddr_all {
-	struct sockaddr s1;	// this one gets used for fields
-	struct sockaddr_in s2;	// these pad it out
-	struct sockaddr_in6 s3;
-	struct sockaddr_un s4;
-	struct sockaddr_dl s5;
-};
-
-struct sockaddr_any {
-	struct sockaddr addr;
-	char pad[sizeof(union sockaddr_all) - sizeof(struct sockaddr)];
-};
-
-struct ucred_queue {
-        struct ucred *tqe_next;
-        struct ucred **tqe_prev;
-        TRACEBUF
-};
-
-*/
-import "C"
-
-// Machine characteristics; for internal use.
-
-const (
-	sizeofPtr      = C.sizeofPtr
-	sizeofShort    = C.sizeof_short
-	sizeofInt      = C.sizeof_int
-	sizeofLong     = C.sizeof_long
-	sizeofLongLong = C.sizeof_longlong
-)
-
-// Basic types
-
-type (
-	_C_short     C.short
-	_C_int       C.int
-	_C_long      C.long
-	_C_long_long C.longlong
-)
-
-// Time
-
-type Timespec C.struct_timespec
-
-type Timeval C.struct_timeval
-
-// Processes
-
-type Rusage C.struct_rusage
-
-type Rlimit C.struct_rlimit
-
-type UGid_t C.gid_t
-
-type KinfoProc C.struct_kinfo_proc
-
-type Eproc C.struct_eproc
-
-type Proc C.struct_proc
-
-type Session C.struct_session
-
-type ucred C.struct_ucred
-
-type Uucred C.struct__ucred
-
-type Upcred C.struct__pcred
-
-type Vmspace C.struct_vmspace
-
-type Sigacts C.struct_sigacts
-
-type ExternProc C.struct_extern_proc
-
-type Itimerval C.struct_itimerval
-
-type Vnode C.struct_vnode
-
-type Pgrp C.struct_pgrp
-
-type UserStruct C.struct_user
-
-type Au_session C.struct_au_session
-
-type Posix_cred C.struct_posix_cred
-
-type Label C.struct_label
-
-type AuditinfoAddr C.struct_auditinfo_addr
-type AuMask C.struct_au_mask
-type AuTidAddr C.struct_au_tid_addr
-
-// TAILQ(ucred)
-type UcredQueue C.struct_ucred_queue
diff --git a/Godeps/_workspace/src/github.com/streadway/amqp/.gitignore b/Godeps/_workspace/src/github.com/streadway/amqp/.gitignore
deleted file mode 100644
index 58b0e8f32..000000000
--- a/Godeps/_workspace/src/github.com/streadway/amqp/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-spec/spec
-examples/simple-consumer/simple-consumer
-examples/simple-producer/simple-producer
diff --git a/Godeps/_workspace/src/github.com/streadway/amqp/.travis.yml b/Godeps/_workspace/src/github.com/streadway/amqp/.travis.yml
deleted file mode 100644
index f1c275a2c..000000000
--- a/Godeps/_workspace/src/github.com/streadway/amqp/.travis.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-language: go
-
-go:
-  - 1.1
-  - 1.4
-  - 1.5
-
-services:
-  - rabbitmq
-
-env:
- - AMQP_URL=amqp://guest:guest@127.0.0.1:5672/ GOMAXPROCS=2
-
-script: go test -v -tags integration ./...
diff --git a/Godeps/_workspace/src/github.com/streadway/amqp/LICENSE b/Godeps/_workspace/src/github.com/streadway/amqp/LICENSE
deleted file mode 100644
index 243c0ce7c..000000000
--- a/Godeps/_workspace/src/github.com/streadway/amqp/LICENSE
+++ /dev/null
@@ -1,23 +0,0 @@
-Copyright (c) 2012, Sean Treadway, SoundCloud Ltd.
-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/streadway/amqp/README.md b/Godeps/_workspace/src/github.com/streadway/amqp/README.md
deleted file mode 100644
index c4291fb68..000000000
--- a/Godeps/_workspace/src/github.com/streadway/amqp/README.md
+++ /dev/null
@@ -1,81 +0,0 @@
-# AMQP
-
-AMQP 0.9.1 client with RabbitMQ extensions in Go.
-
-# Status
-
-*Beta*
-
-[![Build Status](https://secure.travis-ci.org/streadway/amqp.png)](http://travis-ci.org/streadway/amqp)
-
-API changes unlikely and will be discussed on [Github
-issues](https://github.com/streadway/amqp/issues) along with any bugs or
-enhancements.
-
-# Goals
-
-Provide an functional interface that closely represents the AMQP 0.9.1 model
-targeted to RabbitMQ as a server.  This includes the minimum necessary to
-interact the semantics of the protocol.
-
-# Non-goals
-
-Things not intended to be supported.
-
-  * Auto reconnect and re-synchronization of client and server topologies.
-    * Reconnection would require understanding the error paths when the
-      topology cannot be declared on reconnect.  This would require a new set
-      of types and code paths that are best suited at the call-site of this
-      package.  AMQP has a dynamic topology that needs all peers to agree. If
-      this doesn't happen, the behavior is undefined.  Instead of producing a
-      possible interface with undefined behavior, this package is designed to
-      be simple for the caller to implement the necessary connection-time
-      topology declaration so that reconnection is trivial and encapsulated in
-      the caller's application code.
-  * AMQP Protocol negotiation for forward or backward compatibility.
-    * 0.9.1 is stable and widely deployed.  Versions 0.10 and 1.0 are divergent
-      specifications that change the semantics and wire format of the protocol.
-      We will accept patches for other protocol support but have no plans for
-      implementation ourselves.
-  * Anything other than PLAIN and EXTERNAL authentication mechanisms.
-    * Keeping the mechanisms interface modular makes it possible to extend
-      outside of this package.  If other mechanisms prove to be popular, then
-      we would accept patches to include them in this pacakge.
-
-# Usage
-
-See the 'examples' subdirectory for simple producers and consumers executables.
-If you have a use-case in mind which isn't well-represented by the examples,
-please file an issue.
-
-# Documentation
-
-Use [Godoc documentation](http://godoc.org/github.com/streadway/amqp) for
-reference and usage.
-
-[RabbitMQ tutorials in
-Go](https://github.com/rabbitmq/rabbitmq-tutorials/tree/master/go) are also
-available.
-
-# Contributing
-
-Pull requests are very much welcomed.  Create your pull request on a non-master
-branch, make sure a test or example is included that covers your change and
-your commits represent coherent changes that include a reason for the change.
-
-To run the integration tests, make sure you have RabbitMQ running on any host,
-export the environment variable `AMQP_URL=amqp://host/` and run `go test -tags
-integration`.  TravisCI will also run the integration tests.
-
-Thanks to the [community of contributors](https://github.com/streadway/amqp/graphs/contributors).
-
-# External packages
-
-  * Google App Engine Dialer support: [https://github.com/soundtrackyourbrand/gaeamqp](https://github.com/soundtrackyourbrand/gaeamqp)
-  * RabbitMQ examples in Go: [https://github.com/rabbitmq/rabbitmq-tutorials/tree/master/go](https://github.com/rabbitmq/rabbitmq-tutorials/tree/master/go)
-
-# License
-
-BSD 2 clause - see LICENSE for more details.
-
-
diff --git a/Godeps/_workspace/src/github.com/streadway/amqp/allocator.go b/Godeps/_workspace/src/github.com/streadway/amqp/allocator.go
deleted file mode 100644
index 928418826..000000000
--- a/Godeps/_workspace/src/github.com/streadway/amqp/allocator.go
+++ /dev/null
@@ -1,106 +0,0 @@
-package amqp
-
-import (
-	"bytes"
-	"fmt"
-	"math/big"
-)
-
-const (
-	free      = 0
-	allocated = 1
-)
-
-// allocator maintains a bitset of allocated numbers.
-type allocator struct {
-	pool *big.Int
-	last int
-	low  int
-	high int
-}
-
-// NewAllocator reserves and frees integers out of a range between low and
-// high.
-//
-// O(N) worst case space used, where N is maximum allocated, divided by
-// sizeof(big.Word)
-func newAllocator(low, high int) *allocator {
-	return &allocator{
-		pool: big.NewInt(0),
-		last: low,
-		low:  low,
-		high: high,
-	}
-}
-
-// String returns a string describing the contents of the allocator like
-// "allocator[low..high] reserved..until"
-//
-// O(N) where N is high-low
-func (a allocator) String() string {
-	b := &bytes.Buffer{}
-	fmt.Fprintf(b, "allocator[%d..%d]", a.low, a.high)
-
-	for low := a.low; low <= a.high; low++ {
-		high := low
-		for a.reserved(high) && high <= a.high {
-			high++
-		}
-
-		if high > low+1 {
-			fmt.Fprintf(b, " %d..%d", low, high-1)
-		} else if high > low {
-			fmt.Fprintf(b, " %d", high-1)
-		}
-
-		low = high
-	}
-	return b.String()
-}
-
-// Next reserves and returns the next available number out of the range between
-// low and high.  If no number is available, false is returned.
-//
-// O(N) worst case runtime where N is allocated, but usually O(1) due to a
-// rolling index into the oldest allocation.
-func (a *allocator) next() (int, bool) {
-	wrapped := a.last
-
-	// Find trailing bit
-	for ; a.last <= a.high; a.last++ {
-		if a.reserve(a.last) {
-			return a.last, true
-		}
-	}
-
-	// Find preceeding free'd pool
-	a.last = a.low
-
-	for ; a.last < wrapped; a.last++ {
-		if a.reserve(a.last) {
-			return a.last, true
-		}
-	}
-
-	return 0, false
-}
-
-// reserve claims the bit if it is not already claimed, returning true if
-// succesfully claimed.
-func (a *allocator) reserve(n int) bool {
-	if a.reserved(n) {
-		return false
-	}
-	a.pool.SetBit(a.pool, n-a.low, allocated)
-	return true
-}
-
-// reserved returns true if the integer has been allocated
-func (a *allocator) reserved(n int) bool {
-	return a.pool.Bit(n-a.low) == allocated
-}
-
-// release frees the use of the number for another allocation
-func (a *allocator) release(n int) {
-	a.pool.SetBit(a.pool, n-a.low, free)
-}
diff --git a/Godeps/_workspace/src/github.com/streadway/amqp/allocator_test.go b/Godeps/_workspace/src/github.com/streadway/amqp/allocator_test.go
deleted file mode 100644
index 2d6fd5dba..000000000
--- a/Godeps/_workspace/src/github.com/streadway/amqp/allocator_test.go
+++ /dev/null
@@ -1,90 +0,0 @@
-package amqp
-
-import (
-	"math/rand"
-	"testing"
-)
-
-func TestAllocatorFirstShouldBeTheLow(t *testing.T) {
-	n, ok := newAllocator(1, 2).next()
-	if !ok {
-		t.Fatalf("expected to allocate between 1 and 2")
-	}
-
-	if want, got := 1, n; want != got {
-		t.Fatalf("expected to first allocation to be 1")
-	}
-}
-
-func TestAllocatorShouldBeBoundByHigh(t *testing.T) {
-	a := newAllocator(1, 2)
-
-	if n, ok := a.next(); n != 1 || !ok {
-		t.Fatalf("expected to allocate between 1 and 2, got %d, %v", n, ok)
-	}
-	if n, ok := a.next(); n != 2 || !ok {
-		t.Fatalf("expected to allocate between 1 and 2, got %d, %v", n, ok)
-	}
-	if _, ok := a.next(); ok {
-		t.Fatalf("expected not to allocate outside of 1 and 2")
-	}
-}
-
-func TestAllocatorStringShouldIncludeAllocatedRanges(t *testing.T) {
-	a := newAllocator(1, 10)
-	a.reserve(1)
-	a.reserve(2)
-	a.reserve(3)
-	a.reserve(5)
-	a.reserve(6)
-	a.reserve(8)
-	a.reserve(10)
-
-	if want, got := "allocator[1..10] 1..3 5..6 8 10", a.String(); want != got {
-		t.Fatalf("expected String of %q, got %q", want, got)
-	}
-}
-
-func TestAllocatorShouldReuseReleased(t *testing.T) {
-	a := newAllocator(1, 2)
-
-	first, _ := a.next()
-	if want, got := 1, first; want != got {
-		t.Fatalf("expected allocation to be %d, got: %d", want, got)
-	}
-
-	second, _ := a.next()
-	if want, got := 2, second; want != got {
-		t.Fatalf("expected allocation to be %d, got: %d", want, got)
-	}
-
-	a.release(first)
-
-	third, _ := a.next()
-	if want, got := first, third; want != got {
-		t.Fatalf("expected third allocation to be %d, got: %d", want, got)
-	}
-
-	_, ok := a.next()
-	if want, got := false, ok; want != got {
-		t.Fatalf("expected fourth allocation to saturate the pool")
-	}
-}
-
-func TestAllocatorReleasesKeepUpWithAllocationsForAllSizes(t *testing.T) {
-	const runs = 5
-	const max = 13
-
-	for lim := 1; lim < 2<<max; lim <<= 1 {
-		a := newAllocator(0, lim)
-
-		for i := 0; i < runs*lim; i++ {
-			if i >= lim { // fills the allocator
-				a.release(int(rand.Int63n(int64(lim))))
-			}
-			if _, ok := a.next(); !ok {
-				t.Fatalf("expected %d runs of random release of size %d not to fail on allocation %d", runs, lim, i)
-			}
-		}
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/streadway/amqp/auth.go b/Godeps/_workspace/src/github.com/streadway/amqp/auth.go
deleted file mode 100644
index bff7d7948..000000000
--- a/Godeps/_workspace/src/github.com/streadway/amqp/auth.go
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright (c) 2012, Sean Treadway, SoundCloud Ltd.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-// Source code and contact info at http://github.com/streadway/amqp
-
-package amqp
-
-import (
-	"fmt"
-)
-
-// Authentication interface provides a means for different SASL authentication
-// mechanisms to be used during connection tuning.
-type Authentication interface {
-	Mechanism() string
-	Response() string
-}
-
-// PlainAuth is a similar to Basic Auth in HTTP.
-type PlainAuth struct {
-	Username string
-	Password string
-}
-
-func (me *PlainAuth) Mechanism() string {
-	return "PLAIN"
-}
-
-func (me *PlainAuth) Response() string {
-	return fmt.Sprintf("\000%s\000%s", me.Username, me.Password)
-}
-
-// Finds the first mechanism preferred by the client that the server supports.
-func pickSASLMechanism(client []Authentication, serverMechanisms []string) (auth Authentication, ok bool) {
-	for _, auth = range client {
-		for _, mech := range serverMechanisms {
-			if auth.Mechanism() == mech {
-				return auth, true
-			}
-		}
-	}
-
-	return
-}
diff --git a/Godeps/_workspace/src/github.com/streadway/amqp/certs.sh b/Godeps/_workspace/src/github.com/streadway/amqp/certs.sh
deleted file mode 100644
index 834f42242..000000000
--- a/Godeps/_workspace/src/github.com/streadway/amqp/certs.sh
+++ /dev/null
@@ -1,159 +0,0 @@
-#!/bin/sh
-#
-# Creates the CA, server and client certs to be used by tls_test.go
-# http://www.rabbitmq.com/ssl.html
-#
-# Copy stdout into the const section of tls_test.go or use for RabbitMQ
-#
-root=$PWD/certs
-
-if [ -f $root/ca/serial ]; then
-  echo >&2 "Previous installation found"
-  echo >&2 "Remove $root/ca and rerun to overwrite"
-  exit 1
-fi
-
-mkdir -p $root/ca/private
-mkdir -p $root/ca/certs
-mkdir -p $root/server
-mkdir -p $root/client
-
-cd $root/ca
-
-chmod 700 private
-touch index.txt
-echo 'unique_subject = no' > index.txt.attr
-echo '01' > serial
-echo >openssl.cnf '
-[ ca ]
-default_ca = testca
-
-[ testca ]
-dir = .
-certificate = $dir/cacert.pem
-database = $dir/index.txt
-new_certs_dir = $dir/certs
-private_key = $dir/private/cakey.pem
-serial = $dir/serial
-
-default_crl_days = 7
-default_days = 3650
-default_md = sha1
-
-policy = testca_policy
-x509_extensions = certificate_extensions
-
-[ testca_policy ]
-commonName = supplied
-stateOrProvinceName = optional
-countryName = optional
-emailAddress = optional
-organizationName = optional
-organizationalUnitName = optional
-
-[ certificate_extensions ]
-basicConstraints = CA:false
-
-[ req ]
-default_bits = 2048
-default_keyfile = ./private/cakey.pem
-default_md = sha1
-prompt = yes
-distinguished_name = root_ca_distinguished_name
-x509_extensions = root_ca_extensions
-
-[ root_ca_distinguished_name ]
-commonName = hostname
-
-[ root_ca_extensions ]
-basicConstraints = CA:true
-keyUsage = keyCertSign, cRLSign
-
-[ client_ca_extensions ]
-basicConstraints = CA:false
-keyUsage = digitalSignature
-extendedKeyUsage = 1.3.6.1.5.5.7.3.2
-
-[ server_ca_extensions ]
-basicConstraints = CA:false
-keyUsage = keyEncipherment
-extendedKeyUsage = 1.3.6.1.5.5.7.3.1
-subjectAltName = @alt_names
-
-[ alt_names ]
-IP.1 = 127.0.0.1
-'
-
-openssl req \
-  -x509 \
-  -nodes \
-  -config openssl.cnf \
-  -newkey rsa:2048 \
-  -days 3650 \
-  -subj "/CN=MyTestCA/" \
-  -out cacert.pem \
-  -outform PEM
-
-openssl x509 \
-  -in cacert.pem \
-  -out cacert.cer \
-  -outform DER
-
-openssl genrsa -out $root/server/key.pem 2048
-openssl genrsa -out $root/client/key.pem 2048
-
-openssl req \
-  -new \
-  -nodes \
-  -config openssl.cnf \
-  -subj "/CN=127.0.0.1/O=server/" \
-  -key $root/server/key.pem \
-  -out $root/server/req.pem \
-  -outform PEM
-
-openssl req \
-  -new \
-  -nodes \
-  -config openssl.cnf \
-  -subj "/CN=127.0.0.1/O=client/" \
-  -key $root/client/key.pem \
-  -out $root/client/req.pem \
-  -outform PEM
-
-openssl ca \
-  -config openssl.cnf \
-  -in $root/server/req.pem \
-  -out $root/server/cert.pem \
-  -notext \
-  -batch \
-  -extensions server_ca_extensions
-
-openssl ca \
-  -config openssl.cnf \
-  -in $root/client/req.pem \
-  -out $root/client/cert.pem \
-  -notext \
-  -batch \
-  -extensions client_ca_extensions
-
-cat <<-END
-const caCert = \`
-`cat $root/ca/cacert.pem`
-\`
-
-const serverCert = \`
-`cat $root/server/cert.pem`
-\`
-
-const serverKey = \`
-`cat $root/server/key.pem`
-\`
-
-const clientCert = \`
-`cat $root/client/cert.pem`
-\`
-
-const clientKey = \`
-`cat $root/client/key.pem`
-\`
-END
diff --git a/Godeps/_workspace/src/github.com/streadway/amqp/channel.go b/Godeps/_workspace/src/github.com/streadway/amqp/channel.go
deleted file mode 100644
index 9cf93b4d2..000000000
--- a/Godeps/_workspace/src/github.com/streadway/amqp/channel.go
+++ /dev/null
@@ -1,1548 +0,0 @@
-// Copyright (c) 2012, Sean Treadway, SoundCloud Ltd.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-// Source code and contact info at http://github.com/streadway/amqp
-
-package amqp
-
-import (
-	"reflect"
-	"sync"
-)
-
-// 0      1         3             7                  size+7 size+8
-// +------+---------+-------------+  +------------+  +-----------+
-// | type | channel |     size    |  |  payload   |  | frame-end |
-// +------+---------+-------------+  +------------+  +-----------+
-//  octet   short         long         size octets       octet
-const frameHeaderSize = 1 + 2 + 4 + 1
-
-/*
-Channel represents an AMQP channel. Used as a context for valid message
-exchange.  Errors on methods with this Channel as a receiver means this channel
-should be discarded and a new channel established.
-
-*/
-type Channel struct {
-	destructor sync.Once
-	sendM      sync.Mutex // sequence channel frames
-	m          sync.Mutex // struct field mutex
-
-	connection *Connection
-
-	rpc       chan message
-	consumers *consumers
-
-	id uint16
-
-	// true when we will never notify again
-	noNotify bool
-
-	// Channel and Connection exceptions will be broadcast on these listeners.
-	closes []chan *Error
-
-	// Listeners for active=true flow control.  When true is sent to a listener,
-	// publishing should pause until false is sent to listeners.
-	flows []chan bool
-
-	// Listeners for returned publishings for unroutable messages on mandatory
-	// publishings or undeliverable messages on immediate publishings.
-	returns []chan Return
-
-	// Listeners for when the server notifies the client that
-	// a consumer has been cancelled.
-	cancels []chan string
-
-	// Allocated when in confirm mode in order to track publish counter and order confirms
-	confirms   *confirms
-	confirming bool
-
-	// Selects on any errors from shutdown during RPC
-	errors chan *Error
-
-	// State machine that manages frame order, must only be mutated by the connection
-	recv func(*Channel, frame) error
-
-	// State that manages the send behavior after before and after shutdown, must
-	// only be mutated in shutdown()
-	send func(*Channel, message) error
-
-	// Current state for frame re-assembly, only mutated from recv
-	message messageWithContent
-	header  *headerFrame
-	body    []byte
-}
-
-// Constructs a new channel with the given framing rules
-func newChannel(c *Connection, id uint16) *Channel {
-	return &Channel{
-		connection: c,
-		id:         id,
-		rpc:        make(chan message),
-		consumers:  makeConsumers(),
-		confirms:   newConfirms(),
-		recv:       (*Channel).recvMethod,
-		send:       (*Channel).sendOpen,
-		errors:     make(chan *Error, 1),
-	}
-}
-
-// shutdown is called by Connection after the channel has been removed from the
-// connection registry.
-func (me *Channel) shutdown(e *Error) {
-	me.destructor.Do(func() {
-		me.m.Lock()
-		defer me.m.Unlock()
-
-		// Broadcast abnormal shutdown
-		if e != nil {
-			for _, c := range me.closes {
-				c <- e
-			}
-		}
-
-		me.send = (*Channel).sendClosed
-
-		// Notify RPC if we're selecting
-		if e != nil {
-			me.errors <- e
-		}
-
-		me.consumers.closeAll()
-
-		for _, c := range me.closes {
-			close(c)
-		}
-
-		for _, c := range me.flows {
-			close(c)
-		}
-
-		for _, c := range me.returns {
-			close(c)
-		}
-
-		for _, c := range me.cancels {
-			close(c)
-		}
-
-		if me.confirms != nil {
-			me.confirms.Close()
-		}
-
-		me.noNotify = true
-	})
-}
-
-func (me *Channel) open() error {
-	return me.call(&channelOpen{}, &channelOpenOk{})
-}
-
-// Performs a request/response call for when the message is not NoWait and is
-// specified as Synchronous.
-func (me *Channel) call(req message, res ...message) error {
-	if err := me.send(me, req); err != nil {
-		return err
-	}
-
-	if req.wait() {
-		select {
-		case e := <-me.errors:
-			return e
-
-		case msg := <-me.rpc:
-			if msg != nil {
-				for _, try := range res {
-					if reflect.TypeOf(msg) == reflect.TypeOf(try) {
-						// *res = *msg
-						vres := reflect.ValueOf(try).Elem()
-						vmsg := reflect.ValueOf(msg).Elem()
-						vres.Set(vmsg)
-						return nil
-					}
-				}
-				return ErrCommandInvalid
-			} else {
-				// RPC channel has been closed without an error, likely due to a hard
-				// error on the Connection.  This indicates we have already been
-				// shutdown and if were waiting, will have returned from the errors chan.
-				return ErrClosed
-			}
-		}
-	}
-
-	return nil
-}
-
-func (me *Channel) sendClosed(msg message) (err error) {
-	me.sendM.Lock()
-	defer me.sendM.Unlock()
-
-	// After a 'channel.close' is sent or received the only valid response is
-	// channel.close-ok
-	if _, ok := msg.(*channelCloseOk); ok {
-		return me.connection.send(&methodFrame{
-			ChannelId: me.id,
-			Method:    msg,
-		})
-	}
-
-	return ErrClosed
-}
-
-func (me *Channel) sendOpen(msg message) (err error) {
-	me.sendM.Lock()
-	defer me.sendM.Unlock()
-
-	if content, ok := msg.(messageWithContent); ok {
-		props, body := content.getContent()
-		class, _ := content.id()
-		size := me.connection.Config.FrameSize - frameHeaderSize
-
-		if err = me.connection.send(&methodFrame{
-			ChannelId: me.id,
-			Method:    content,
-		}); err != nil {
-			return
-		}
-
-		if err = me.connection.send(&headerFrame{
-			ChannelId:  me.id,
-			ClassId:    class,
-			Size:       uint64(len(body)),
-			Properties: props,
-		}); err != nil {
-			return
-		}
-
-		for i, j := 0, size; i < len(body); i, j = j, j+size {
-			if j > len(body) {
-				j = len(body)
-			}
-
-			if err = me.connection.send(&bodyFrame{
-				ChannelId: me.id,
-				Body:      body[i:j],
-			}); err != nil {
-				return
-			}
-		}
-	} else {
-		err = me.connection.send(&methodFrame{
-			ChannelId: me.id,
-			Method:    msg,
-		})
-	}
-
-	return
-}
-
-// Eventually called via the state machine from the connection's reader
-// goroutine, so assumes serialized access.
-func (me *Channel) dispatch(msg message) {
-	switch m := msg.(type) {
-	case *channelClose:
-		me.connection.closeChannel(me, newError(m.ReplyCode, m.ReplyText))
-		me.send(me, &channelCloseOk{})
-
-	case *channelFlow:
-		for _, c := range me.flows {
-			c <- m.Active
-		}
-		me.send(me, &channelFlowOk{Active: m.Active})
-
-	case *basicCancel:
-		for _, c := range me.cancels {
-			c <- m.ConsumerTag
-		}
-		me.send(me, &basicCancelOk{ConsumerTag: m.ConsumerTag})
-
-	case *basicReturn:
-		ret := newReturn(*m)
-		for _, c := range me.returns {
-			c <- *ret
-		}
-
-	case *basicAck:
-		if me.confirming {
-			if m.Multiple {
-				me.confirms.Multiple(Confirmation{m.DeliveryTag, true})
-			} else {
-				me.confirms.One(Confirmation{m.DeliveryTag, true})
-			}
-		}
-
-	case *basicNack:
-		if me.confirming {
-			if m.Multiple {
-				me.confirms.Multiple(Confirmation{m.DeliveryTag, false})
-			} else {
-				me.confirms.One(Confirmation{m.DeliveryTag, false})
-			}
-		}
-
-	case *basicDeliver:
-		me.consumers.send(m.ConsumerTag, newDelivery(me, m))
-		// TODO log failed consumer and close channel, this can happen when
-		// deliveries are in flight and a no-wait cancel has happened
-
-	default:
-		me.rpc <- msg
-	}
-}
-
-func (me *Channel) transition(f func(*Channel, frame) error) error {
-	me.recv = f
-	return nil
-}
-
-func (me *Channel) recvMethod(f frame) error {
-	switch frame := f.(type) {
-	case *methodFrame:
-		if msg, ok := frame.Method.(messageWithContent); ok {
-			me.body = make([]byte, 0)
-			me.message = msg
-			return me.transition((*Channel).recvHeader)
-		}
-
-		me.dispatch(frame.Method) // termination state
-		return me.transition((*Channel).recvMethod)
-
-	case *headerFrame:
-		// drop
-		return me.transition((*Channel).recvMethod)
-
-	case *bodyFrame:
-		// drop
-		return me.transition((*Channel).recvMethod)
-
-	default:
-		panic("unexpected frame type")
-	}
-
-	panic("unreachable")
-}
-
-func (me *Channel) recvHeader(f frame) error {
-	switch frame := f.(type) {
-	case *methodFrame:
-		// interrupt content and handle method
-		return me.recvMethod(f)
-
-	case *headerFrame:
-		// start collecting if we expect body frames
-		me.header = frame
-
-		if frame.Size == 0 {
-			me.message.setContent(me.header.Properties, me.body)
-			me.dispatch(me.message) // termination state
-			return me.transition((*Channel).recvMethod)
-		} else {
-			return me.transition((*Channel).recvContent)
-		}
-
-	case *bodyFrame:
-		// drop and reset
-		return me.transition((*Channel).recvMethod)
-
-	default:
-		panic("unexpected frame type")
-	}
-
-	panic("unreachable")
-}
-
-// state after method + header and before the length
-// defined by the header has been reached
-func (me *Channel) recvContent(f frame) error {
-	switch frame := f.(type) {
-	case *methodFrame:
-		// interrupt content and handle method
-		return me.recvMethod(f)
-
-	case *headerFrame:
-		// drop and reset
-		return me.transition((*Channel).recvMethod)
-
-	case *bodyFrame:
-		me.body = append(me.body, frame.Body...)
-
-		if uint64(len(me.body)) >= me.header.Size {
-			me.message.setContent(me.header.Properties, me.body)
-			me.dispatch(me.message) // termination state
-			return me.transition((*Channel).recvMethod)
-		}
-
-		return me.transition((*Channel).recvContent)
-
-	default:
-		panic("unexpected frame type")
-	}
-
-	panic("unreachable")
-}
-
-/*
-Close initiate a clean channel closure by sending a close message with the error
-code set to '200'.
-
-It is safe to call this method multiple times.
-
-*/
-func (me *Channel) Close() error {
-	defer me.connection.closeChannel(me, nil)
-	return me.call(
-		&channelClose{ReplyCode: replySuccess},
-		&channelCloseOk{},
-	)
-}
-
-/*
-NotifyClose registers a listener for when the server sends a channel or
-connection exception in the form of a Connection.Close or Channel.Close method.
-Connection exceptions will be broadcast to all open channels and all channels
-will be closed, where channel exceptions will only be broadcast to listeners to
-this channel.
-
-The chan provided will be closed when the Channel is closed and on a
-graceful close, no error will be sent.
-
-*/
-func (me *Channel) NotifyClose(c chan *Error) chan *Error {
-	me.m.Lock()
-	defer me.m.Unlock()
-
-	if me.noNotify {
-		close(c)
-	} else {
-		me.closes = append(me.closes, c)
-	}
-
-	return c
-}
-
-/*
-NotifyFlow registers a listener for basic.flow methods sent by the server.
-When `true` is sent on one of the listener channels, all publishers should
-pause until a `false` is sent.
-
-The server may ask the producer to pause or restart the flow of Publishings
-sent by on a channel. This is a simple flow-control mechanism that a server can
-use to avoid overflowing its queues or otherwise finding itself receiving more
-messages than it can process. Note that this method is not intended for window
-control. It does not affect contents returned by basic.get-ok methods.
-
-When a new channel is opened, it is active (flow is active). Some
-applications assume that channels are inactive until started. To emulate
-this behavior a client MAY open the channel, then pause it.
-
-Publishers should respond to a flow messages as rapidly as possible and the
-server may disconnect over producing channels that do not respect these
-messages.
-
-basic.flow-ok methods will always be returned to the server regardless of
-the number of listeners there are.
-
-To control the flow of deliveries from the server.  Use the Channel.Flow()
-method instead.
-
-Note: RabbitMQ will rather use TCP pushback on the network connection instead
-of sending basic.flow.  This means that if a single channel is producing too
-much on the same connection, all channels using that connection will suffer,
-including acknowledgments from deliveries.  Use different Connections if you
-desire to interleave consumers and producers in the same process to avoid your
-basic.ack messages from getting rate limited with your basic.publish messages.
-
-*/
-func (me *Channel) NotifyFlow(c chan bool) chan bool {
-	me.m.Lock()
-	defer me.m.Unlock()
-
-	if me.noNotify {
-		close(c)
-	} else {
-		me.flows = append(me.flows, c)
-	}
-
-	return c
-}
-
-/*
-NotifyReturn registers a listener for basic.return methods.  These can be sent
-from the server when a publish is undeliverable either from the mandatory or
-immediate flags.
-
-A return struct has a copy of the Publishing along with some error
-information about why the publishing failed.
-
-*/
-func (me *Channel) NotifyReturn(c chan Return) chan Return {
-	me.m.Lock()
-	defer me.m.Unlock()
-
-	if me.noNotify {
-		close(c)
-	} else {
-		me.returns = append(me.returns, c)
-	}
-
-	return c
-}
-
-/*
-NotifyCancel registers a listener for basic.cancel methods.  These can be sent
-from the server when a queue is deleted or when consuming from a mirrored queue
-where the master has just failed (and was moved to another node)
-
-The subscription tag is returned to the listener.
-
-*/
-func (me *Channel) NotifyCancel(c chan string) chan string {
-	me.m.Lock()
-	defer me.m.Unlock()
-
-	if me.noNotify {
-		close(c)
-	} else {
-		me.cancels = append(me.cancels, c)
-	}
-
-	return c
-}
-
-/*
-NotifyConfirm calls NotifyPublish and starts a goroutines sending
-ordered Ack and Nack DeliveryTag to the respective channels.
-
-For strict ordering, use NotifyPublish instead.
-*/
-func (me *Channel) NotifyConfirm(ack, nack chan uint64) (chan uint64, chan uint64) {
-	confirms := me.NotifyPublish(make(chan Confirmation, len(ack)+len(nack)))
-
-	go func() {
-		for c := range confirms {
-			if c.Ack {
-				ack <- c.DeliveryTag
-			} else {
-				nack <- c.DeliveryTag
-			}
-		}
-		close(ack)
-		if nack != ack {
-			close(nack)
-		}
-	}()
-
-	return ack, nack
-}
-
-/*
-NotifyPublish registers a listener for reliable publishing. Receives from this
-chan for every publish after Channel.Confirm will be in order starting with
-DeliveryTag 1.
-
-There will be one and only one Confimration Publishing starting with the
-delviery tag of 1 and progressing sequentially until the total number of
-Publishings have been seen by the server.
-
-Acknowledgments will be received in the order of delivery from the
-NotifyPublish channels even if the server acknowledges them out of order.
-
-The listener chan will be closed when the Channel is closed.
-
-The capacity of the chan Confirmation must be at least as large as the
-number of outstanding publishings.  Not having enough buffered chans will
-create a deadlock if you attempt to perform other operations on the Connection
-or Channel while confirms are in-flight.
-
-It's advisable to wait for all Confirmations to arrive before calling
-Channel.Close() or Connection.Close().
-
-*/
-func (me *Channel) NotifyPublish(confirm chan Confirmation) chan Confirmation {
-	me.m.Lock()
-	defer me.m.Unlock()
-
-	if me.noNotify {
-		close(confirm)
-	} else {
-		me.confirms.Listen(confirm)
-	}
-
-	return confirm
-
-}
-
-/*
-Qos controls how many messages or how many bytes the server will try to keep on
-the network for consumers before receiving delivery acks.  The intent of Qos is
-to make sure the network buffers stay full between the server and client.
-
-With a prefetch count greater than zero, the server will deliver that many
-messages to consumers before acknowledgments are received.  The server ignores
-this option when consumers are started with noAck because no acknowledgments
-are expected or sent.
-
-With a prefetch size greater than zero, the server will try to keep at least
-that many bytes of deliveries flushed to the network before receiving
-acknowledgments from the consumers.  This option is ignored when consumers are
-started with noAck.
-
-When global is true, these Qos settings apply to all existing and future
-consumers on all channels on the same connection.  When false, the Channel.Qos
-settings will apply to all existing and future consumers on this channel.
-RabbitMQ does not implement the global flag.
-
-To get round-robin behavior between consumers consuming from the same queue on
-different connections, set the prefetch count to 1, and the next available
-message on the server will be delivered to the next available consumer.
-
-If your consumer work time is reasonably consistent and not much greater
-than two times your network round trip time, you will see significant
-throughput improvements starting with a prefetch count of 2 or slightly
-greater as described by benchmarks on RabbitMQ.
-
-http://www.rabbitmq.com/blog/2012/04/25/rabbitmq-performance-measurements-part-2/
-*/
-func (me *Channel) Qos(prefetchCount, prefetchSize int, global bool) error {
-	return me.call(
-		&basicQos{
-			PrefetchCount: uint16(prefetchCount),
-			PrefetchSize:  uint32(prefetchSize),
-			Global:        global,
-		},
-		&basicQosOk{},
-	)
-}
-
-/*
-Cancel stops deliveries to the consumer chan established in Channel.Consume and
-identified by consumer.
-
-Only use this method to cleanly stop receiving deliveries from the server and
-cleanly shut down the consumer chan identified by this tag.  Using this method
-and waiting for remaining messages to flush from the consumer chan will ensure
-all messages received on the network will be delivered to the receiver of your
-consumer chan.
-
-Continue consuming from the chan Delivery provided by Channel.Consume until the
-chan closes.
-
-When noWait is true, do not wait for the server to acknowledge the cancel.
-Only use this when you are certain there are no deliveries requiring
-acknowledgment are in-flight otherwise they will arrive and be dropped in the
-client without an ack and will not be redelivered to other consumers.
-
-*/
-func (me *Channel) Cancel(consumer string, noWait bool) error {
-	req := &basicCancel{
-		ConsumerTag: consumer,
-		NoWait:      noWait,
-	}
-	res := &basicCancelOk{}
-
-	if err := me.call(req, res); err != nil {
-		return err
-	}
-
-	if req.wait() {
-		me.consumers.close(res.ConsumerTag)
-	} else {
-		// Potentially could drop deliveries in flight
-		me.consumers.close(consumer)
-	}
-
-	return nil
-}
-
-/*
-QueueDeclare declares a queue to hold messages and deliver to consumers.
-Declaring creates a queue if it doesn't already exist, or ensures that an
-existing queue matches the same parameters.
-
-Every queue declared gets a default binding to the empty exchange "" which has
-the type "direct" with the routing key matching the queue's name.  With this
-default binding, it is possible to publish messages that route directly to
-this queue by publishing to "" with the routing key of the queue name.
-
-  QueueDeclare("alerts", true, false, false false, false, nil)
-  Publish("", "alerts", false, false, Publishing{Body: []byte("...")})
-
-  Delivery       Exchange  Key       Queue
-  -----------------------------------------------
-  key: alerts -> ""     -> alerts -> alerts
-
-The queue name may be empty, in which the server will generate a unique name
-which will be returned in the Name field of Queue struct.
-
-Durable and Non-Auto-Deleted queues will survive server restarts and remain
-when there are no remaining consumers or bindings.  Persistent publishings will
-be restored in this queue on server restart.  These queues are only able to be
-bound to durable exchanges.
-
-Non-Durable and Auto-Deleted queues will not be redeclared on server restart
-and will be deleted by the server after a short time when the last consumer is
-canceled or the last consumer's channel is closed.  Queues with this lifetime
-can also be deleted normally with QueueDelete.  These durable queues can only
-be bound to non-durable exchanges.
-
-Non-Durable and Non-Auto-Deleted queues will remain declared as long as the
-server is running regardless of how many consumers.  This lifetime is useful
-for temporary topologies that may have long delays between consumer activity.
-These queues can only be bound to non-durable exchanges.
-
-Durable and Auto-Deleted queues will be restored on server restart, but without
-active consumers, will not survive and be removed.  This Lifetime is unlikely
-to be useful.
-
-Exclusive queues are only accessible by the connection that declares them and
-will be deleted when the connection closes.  Channels on other connections
-will receive an error when attempting declare, bind, consume, purge or delete a
-queue with the same name.
-
-When noWait is true, the queue will assume to be declared on the server.  A
-channel exception will arrive if the conditions are met for existing queues
-or attempting to modify an existing queue from a different connection.
-
-When the error return value is not nil, you can assume the queue could not be
-declared with these parameters and the channel will be closed.
-
-*/
-func (me *Channel) QueueDeclare(name string, durable, autoDelete, exclusive, noWait bool, args Table) (Queue, error) {
-	if err := args.Validate(); err != nil {
-		return Queue{}, err
-	}
-
-	req := &queueDeclare{
-		Queue:      name,
-		Passive:    false,
-		Durable:    durable,
-		AutoDelete: autoDelete,
-		Exclusive:  exclusive,
-		NoWait:     noWait,
-		Arguments:  args,
-	}
-	res := &queueDeclareOk{}
-
-	if err := me.call(req, res); err != nil {
-		return Queue{}, err
-	}
-
-	if req.wait() {
-		return Queue{
-			Name:      res.Queue,
-			Messages:  int(res.MessageCount),
-			Consumers: int(res.ConsumerCount),
-		}, nil
-	}
-
-	return Queue{
-		Name: name,
-	}, nil
-
-	panic("unreachable")
-}
-
-/*
-
-QueueDeclarePassive is functionally and parametrically equivalent to
-QueueDeclare, except that it sets the "passive" attribute to true. A passive
-queue is assumed by RabbitMQ to already exist, and attempting to connect to a
-non-existent queue will cause RabbitMQ to throw an exception. This function
-can be used to test for the existence of a queue.
-
-*/
-func (me *Channel) QueueDeclarePassive(name string, durable, autoDelete, exclusive, noWait bool, args Table) (Queue, error) {
-	if err := args.Validate(); err != nil {
-		return Queue{}, err
-	}
-
-	req := &queueDeclare{
-		Queue:      name,
-		Passive:    true,
-		Durable:    durable,
-		AutoDelete: autoDelete,
-		Exclusive:  exclusive,
-		NoWait:     noWait,
-		Arguments:  args,
-	}
-	res := &queueDeclareOk{}
-
-	if err := me.call(req, res); err != nil {
-		return Queue{}, err
-	}
-
-	if req.wait() {
-		return Queue{
-			Name:      res.Queue,
-			Messages:  int(res.MessageCount),
-			Consumers: int(res.ConsumerCount),
-		}, nil
-	}
-
-	return Queue{
-		Name: name,
-	}, nil
-
-	panic("unreachable")
-}
-
-/*
-QueueInspect passively declares a queue by name to inspect the current message
-count, consumer count.
-
-Use this method to check how many unacknowledged messages reside in the queue
-and how many consumers are receiving deliveries and whether a queue by this
-name already exists.
-
-If the queue by this name exists, use Channel.QueueDeclare check if it is
-declared with specific parameters.
-
-If a queue by this name does not exist, an error will be returned and the
-channel will be closed.
-
-*/
-func (me *Channel) QueueInspect(name string) (Queue, error) {
-	req := &queueDeclare{
-		Queue:   name,
-		Passive: true,
-	}
-	res := &queueDeclareOk{}
-
-	err := me.call(req, res)
-
-	state := Queue{
-		Name:      name,
-		Messages:  int(res.MessageCount),
-		Consumers: int(res.ConsumerCount),
-	}
-
-	return state, err
-}
-
-/*
-QueueBind binds an exchange to a queue so that publishings to the exchange will
-be routed to the queue when the publishing routing key matches the binding
-routing key.
-
-  QueueBind("pagers", "alert", "log", false, nil)
-  QueueBind("emails", "info", "log", false, nil)
-
-  Delivery       Exchange  Key       Queue
-  -----------------------------------------------
-  key: alert --> log ----> alert --> pagers
-  key: info ---> log ----> info ---> emails
-  key: debug --> log       (none)    (dropped)
-
-If a binding with the same key and arguments already exists between the
-exchange and queue, the attempt to rebind will be ignored and the existing
-binding will be retained.
-
-In the case that multiple bindings may cause the message to be routed to the
-same queue, the server will only route the publishing once.  This is possible
-with topic exchanges.
-
-  QueueBind("pagers", "alert", "amq.topic", false, nil)
-  QueueBind("emails", "info", "amq.topic", false, nil)
-  QueueBind("emails", "#", "amq.topic", false, nil) // match everything
-
-  Delivery       Exchange        Key       Queue
-  -----------------------------------------------
-  key: alert --> amq.topic ----> alert --> pagers
-  key: info ---> amq.topic ----> # ------> emails
-                           \---> info ---/
-  key: debug --> amq.topic ----> # ------> emails
-
-It is only possible to bind a durable queue to a durable exchange regardless of
-whether the queue or exchange is auto-deleted.  Bindings between durable queues
-and exchanges will also be restored on server restart.
-
-If the binding could not complete, an error will be returned and the channel
-will be closed.
-
-When noWait is true and the queue could not be bound, the channel will be
-closed with an error.
-
-*/
-func (me *Channel) QueueBind(name, key, exchange string, noWait bool, args Table) error {
-	if err := args.Validate(); err != nil {
-		return err
-	}
-
-	return me.call(
-		&queueBind{
-			Queue:      name,
-			Exchange:   exchange,
-			RoutingKey: key,
-			NoWait:     noWait,
-			Arguments:  args,
-		},
-		&queueBindOk{},
-	)
-}
-
-/*
-QueueUnbind removes a binding between an exchange and queue matching the key and
-arguments.
-
-It is possible to send and empty string for the exchange name which means to
-unbind the queue from the default exchange.
-
-*/
-func (me *Channel) QueueUnbind(name, key, exchange string, args Table) error {
-	if err := args.Validate(); err != nil {
-		return err
-	}
-
-	return me.call(
-		&queueUnbind{
-			Queue:      name,
-			Exchange:   exchange,
-			RoutingKey: key,
-			Arguments:  args,
-		},
-		&queueUnbindOk{},
-	)
-}
-
-/*
-QueuePurge removes all messages from the named queue which are not waiting to
-be acknowledged.  Messages that have been delivered but have not yet been
-acknowledged will not be removed.
-
-When successful, returns the number of messages purged.
-
-If noWait is true, do not wait for the server response and the number of
-messages purged will not be meaningful.
-*/
-func (me *Channel) QueuePurge(name string, noWait bool) (int, error) {
-	req := &queuePurge{
-		Queue:  name,
-		NoWait: noWait,
-	}
-	res := &queuePurgeOk{}
-
-	err := me.call(req, res)
-
-	return int(res.MessageCount), err
-}
-
-/*
-QueueDelete removes the queue from the server including all bindings then
-purges the messages based on server configuration, returning the number of
-messages purged.
-
-When ifUnused is true, the queue will not be deleted if there are any
-consumers on the queue.  If there are consumers, an error will be returned and
-the channel will be closed.
-
-When ifEmpty is true, the queue will not be deleted if there are any messages
-remaining on the queue.  If there are messages, an error will be returned and
-the channel will be closed.
-
-When noWait is true, the queue will be deleted without waiting for a response
-from the server.  The purged message count will not be meaningful. If the queue
-could not be deleted, a channel exception will be raised and the channel will
-be closed.
-
-*/
-func (me *Channel) QueueDelete(name string, ifUnused, ifEmpty, noWait bool) (int, error) {
-	req := &queueDelete{
-		Queue:    name,
-		IfUnused: ifUnused,
-		IfEmpty:  ifEmpty,
-		NoWait:   noWait,
-	}
-	res := &queueDeleteOk{}
-
-	err := me.call(req, res)
-
-	return int(res.MessageCount), err
-}
-
-/*
-Consume immediately starts delivering queued messages.
-
-Begin receiving on the returned chan Delivery before any other operation on the
-Connection or Channel.
-
-Continues deliveries to the returned chan Delivery until Channel.Cancel,
-Connection.Close, Channel.Close, or an AMQP exception occurs.  Consumers must
-range over the chan to ensure all deliveries are received.  Unreceived
-deliveries will block all methods on the same connection.
-
-All deliveries in AMQP must be acknowledged.  It is expected of the consumer to
-call Delivery.Ack after it has successfully processed the delivery.  If the
-consumer is cancelled or the channel or connection is closed any unacknowledged
-deliveries will be requeued at the end of the same queue.
-
-The consumer is identified by a string that is unique and scoped for all
-consumers on this channel.  If you wish to eventually cancel the consumer, use
-the same non-empty idenfitier in Channel.Cancel.  An empty string will cause
-the library to generate a unique identity.  The consumer identity will be
-included in every Delivery in the ConsumerTag field
-
-When autoAck (also known as noAck) is true, the server will acknowledge
-deliveries to this consumer prior to writing the delivery to the network.  When
-autoAck is true, the consumer should not call Delivery.Ack.  Automatically
-acknowledging deliveries means that some deliveries may get lost if the
-consumer is unable to process them after the server delivers them.
-
-When exclusive is true, the server will ensure that this is the sole consumer
-from this queue.  When exclusive is false, the server will fairly distribute
-deliveries across multiple consumers.
-
-When noLocal is true, the server will not deliver publishing sent from the same
-connection to this consumer.  It's advisable to use separate connections for
-Channel.Publish and Channel.Consume so not to have TCP pushback on publishing
-affect the ability to consume messages, so this parameter is here mostly for
-completeness.
-
-When noWait is true, do not wait for the server to confirm the request and
-immediately begin deliveries.  If it is not possible to consume, a channel
-exception will be raised and the channel will be closed.
-
-Optional arguments can be provided that have specific semantics for the queue
-or server.
-
-When the channel or connection closes, all delivery chans will also close.
-
-Deliveries on the returned chan will be buffered indefinitely.  To limit memory
-of this buffer, use the Channel.Qos method to limit the amount of
-unacknowledged/buffered deliveries the server will deliver on this Channel.
-
-*/
-func (me *Channel) Consume(queue, consumer string, autoAck, exclusive, noLocal, noWait bool, args Table) (<-chan Delivery, error) {
-	// When we return from me.call, there may be a delivery already for the
-	// consumer that hasn't been added to the consumer hash yet.  Because of
-	// this, we never rely on the server picking a consumer tag for us.
-
-	if err := args.Validate(); err != nil {
-		return nil, err
-	}
-
-	if consumer == "" {
-		consumer = uniqueConsumerTag()
-	}
-
-	req := &basicConsume{
-		Queue:       queue,
-		ConsumerTag: consumer,
-		NoLocal:     noLocal,
-		NoAck:       autoAck,
-		Exclusive:   exclusive,
-		NoWait:      noWait,
-		Arguments:   args,
-	}
-	res := &basicConsumeOk{}
-
-	deliveries := make(chan Delivery)
-
-	me.consumers.add(consumer, deliveries)
-
-	if err := me.call(req, res); err != nil {
-		me.consumers.close(consumer)
-		return nil, err
-	}
-
-	return (<-chan Delivery)(deliveries), nil
-}
-
-/*
-ExchangeDeclare declares an exchange on the server. If the exchange does not
-already exist, the server will create it.  If the exchange exists, the server
-verifies that it is of the provided type, durability and auto-delete flags.
-
-Errors returned from this method will close the channel.
-
-Exchange names starting with "amq." are reserved for pre-declared and
-standardized exchanges. The client MAY declare an exchange starting with
-"amq." if the passive option is set, or the exchange already exists.  Names can
-consists of a non-empty sequence of letters, digits, hyphen, underscore,
-period, or colon.
-
-Each exchange belongs to one of a set of exchange kinds/types implemented by
-the server. The exchange types define the functionality of the exchange - i.e.
-how messages are routed through it. Once an exchange is declared, its type
-cannot be changed.  The common types are "direct", "fanout", "topic" and
-"headers".
-
-Durable and Non-Auto-Deleted exchanges will survive server restarts and remain
-declared when there are no remaining bindings.  This is the best lifetime for
-long-lived exchange configurations like stable routes and default exchanges.
-
-Non-Durable and Auto-Deleted exchanges will be deleted when there are no
-remaining bindings and not restored on server restart.  This lifetime is
-useful for temporary topologies that should not pollute the virtual host on
-failure or after the consumers have completed.
-
-Non-Durable and Non-Auto-deleted exchanges will remain as long as the server is
-running including when there are no remaining bindings.  This is useful for
-temporary topologies that may have long delays between bindings.
-
-Durable and Auto-Deleted exchanges will survive server restarts and will be
-removed before and after server restarts when there are no remaining bindings.
-These exchanges are useful for robust temporary topologies or when you require
-binding durable queues to auto-deleted exchanges.
-
-Note: RabbitMQ declares the default exchange types like 'amq.fanout' as
-durable, so queues that bind to these pre-declared exchanges must also be
-durable.
-
-Exchanges declared as `internal` do not accept accept publishings. Internal
-exchanges are useful for when you wish to implement inter-exchange topologies
-that should not be exposed to users of the broker.
-
-When noWait is true, declare without waiting for a confirmation from the server.
-The channel may be closed as a result of an error.  Add a NotifyClose listener
-to respond to any exceptions.
-
-Optional amqp.Table of arguments that are specific to the server's implementation of
-the exchange can be sent for exchange types that require extra parameters.
-*/
-func (me *Channel) ExchangeDeclare(name, kind string, durable, autoDelete, internal, noWait bool, args Table) error {
-	if err := args.Validate(); err != nil {
-		return err
-	}
-
-	return me.call(
-		&exchangeDeclare{
-			Exchange:   name,
-			Type:       kind,
-			Passive:    false,
-			Durable:    durable,
-			AutoDelete: autoDelete,
-			Internal:   internal,
-			NoWait:     noWait,
-			Arguments:  args,
-		},
-		&exchangeDeclareOk{},
-	)
-}
-
-/*
-
-ExchangeDeclarePassive is functionally and parametrically equivalent to
-ExchangeDeclare, except that it sets the "passive" attribute to true. A passive
-exchange is assumed by RabbitMQ to already exist, and attempting to connect to a
-non-existent exchange will cause RabbitMQ to throw an exception. This function
-can be used to detect the existence of an exchange.
-
-*/
-func (me *Channel) ExchangeDeclarePassive(name, kind string, durable, autoDelete, internal, noWait bool, args Table) error {
-	if err := args.Validate(); err != nil {
-		return err
-	}
-
-	return me.call(
-		&exchangeDeclare{
-			Exchange:   name,
-			Type:       kind,
-			Passive:    true,
-			Durable:    durable,
-			AutoDelete: autoDelete,
-			Internal:   internal,
-			NoWait:     noWait,
-			Arguments:  args,
-		},
-		&exchangeDeclareOk{},
-	)
-}
-
-/*
-ExchangeDelete removes the named exchange from the server. When an exchange is
-deleted all queue bindings on the exchange are also deleted.  If this exchange
-does not exist, the channel will be closed with an error.
-
-When ifUnused is true, the server will only delete the exchange if it has no queue
-bindings.  If the exchange has queue bindings the server does not delete it
-but close the channel with an exception instead.  Set this to true if you are
-not the sole owner of the exchange.
-
-When noWait is true, do not wait for a server confirmation that the exchange has
-been deleted.  Failing to delete the channel could close the channel.  Add a
-NotifyClose listener to respond to these channel exceptions.
-*/
-func (me *Channel) ExchangeDelete(name string, ifUnused, noWait bool) error {
-	return me.call(
-		&exchangeDelete{
-			Exchange: name,
-			IfUnused: ifUnused,
-			NoWait:   noWait,
-		},
-		&exchangeDeleteOk{},
-	)
-}
-
-/*
-ExchangeBind binds an exchange to another exchange to create inter-exchange
-routing topologies on the server.  This can decouple the private topology and
-routing exchanges from exchanges intended solely for publishing endpoints.
-
-Binding two exchanges with identical arguments will not create duplicate
-bindings.
-
-Binding one exchange to another with multiple bindings will only deliver a
-message once.  For example if you bind your exchange to `amq.fanout` with two
-different binding keys, only a single message will be delivered to your
-exchange even though multiple bindings will match.
-
-Given a message delivered to the source exchange, the message will be forwarded
-to the destination exchange when the routing key is matched.
-
-  ExchangeBind("sell", "MSFT", "trade", false, nil)
-  ExchangeBind("buy", "AAPL", "trade", false, nil)
-
-  Delivery       Source      Key      Destination
-  example        exchange             exchange
-  -----------------------------------------------
-  key: AAPL  --> trade ----> MSFT     sell
-                       \---> AAPL --> buy
-
-When noWait is true, do not wait for the server to confirm the binding.  If any
-error occurs the channel will be closed.  Add a listener to NotifyClose to
-handle these errors.
-
-Optional arguments specific to the exchanges bound can also be specified.
-*/
-func (me *Channel) ExchangeBind(destination, key, source string, noWait bool, args Table) error {
-	if err := args.Validate(); err != nil {
-		return err
-	}
-
-	return me.call(
-		&exchangeBind{
-			Destination: destination,
-			Source:      source,
-			RoutingKey:  key,
-			NoWait:      noWait,
-			Arguments:   args,
-		},
-		&exchangeBindOk{},
-	)
-}
-
-/*
-ExchangeUnbind unbinds the destination exchange from the source exchange on the
-server by removing the routing key between them.  This is the inverse of
-ExchangeBind.  If the binding does not currently exist, an error will be
-returned.
-
-When noWait is true, do not wait for the server to confirm the deletion of the
-binding.  If any error occurs the channel will be closed.  Add a listener to
-NotifyClose to handle these errors.
-
-Optional arguments that are specific to the type of exchanges bound can also be
-provided.  These must match the same arguments specified in ExchangeBind to
-identify the binding.
-*/
-func (me *Channel) ExchangeUnbind(destination, key, source string, noWait bool, args Table) error {
-	if err := args.Validate(); err != nil {
-		return err
-	}
-
-	return me.call(
-		&exchangeUnbind{
-			Destination: destination,
-			Source:      source,
-			RoutingKey:  key,
-			NoWait:      noWait,
-			Arguments:   args,
-		},
-		&exchangeUnbindOk{},
-	)
-}
-
-/*
-Publish sends a Publishing from the client to an exchange on the server.
-
-When you want a single message to be delivered to a single queue, you can
-publish to the default exchange with the routingKey of the queue name.  This is
-because every declared queue gets an implicit route to the default exchange.
-
-Since publishings are asynchronous, any undeliverable message will get returned
-by the server.  Add a listener with Channel.NotifyReturn to handle any
-undeliverable message when calling publish with either the mandatory or
-immediate parameters as true.
-
-Publishings can be undeliverable when the mandatory flag is true and no queue is
-bound that matches the routing key, or when the immediate flag is true and no
-consumer on the matched queue is ready to accept the delivery.
-
-This can return an error when the channel, connection or socket is closed.  The
-error or lack of an error does not indicate whether the server has received this
-publishing.
-
-It is possible for publishing to not reach the broker if the underlying socket
-is shutdown without pending publishing packets being flushed from the kernel
-buffers.  The easy way of making it probable that all publishings reach the
-server is to always call Connection.Close before terminating your publishing
-application.  The way to ensure that all publishings reach the server is to add
-a listener to Channel.NotifyPublish and put the channel in confirm mode with
-Channel.Confirm.  Publishing delivery tags and their corresponding
-confirmations start at 1.  Exit when all publishings are confirmed.
-
-When Publish does not return an error and the channel is in confirm mode, the
-internal counter for DeliveryTags with the first confirmation starting at 1.
-
-*/
-func (me *Channel) Publish(exchange, key string, mandatory, immediate bool, msg Publishing) error {
-	if err := msg.Headers.Validate(); err != nil {
-		return err
-	}
-
-	me.m.Lock()
-	defer me.m.Unlock()
-
-	if err := me.send(me, &basicPublish{
-		Exchange:   exchange,
-		RoutingKey: key,
-		Mandatory:  mandatory,
-		Immediate:  immediate,
-		Body:       msg.Body,
-		Properties: properties{
-			Headers:         msg.Headers,
-			ContentType:     msg.ContentType,
-			ContentEncoding: msg.ContentEncoding,
-			DeliveryMode:    msg.DeliveryMode,
-			Priority:        msg.Priority,
-			CorrelationId:   msg.CorrelationId,
-			ReplyTo:         msg.ReplyTo,
-			Expiration:      msg.Expiration,
-			MessageId:       msg.MessageId,
-			Timestamp:       msg.Timestamp,
-			Type:            msg.Type,
-			UserId:          msg.UserId,
-			AppId:           msg.AppId,
-		},
-	}); err != nil {
-		return err
-	}
-
-	if me.confirming {
-		me.confirms.Publish()
-	}
-
-	return nil
-}
-
-/*
-Get synchronously receives a single Delivery from the head of a queue from the
-server to the client.  In almost all cases, using Channel.Consume will be
-preferred.
-
-If there was a delivery waiting on the queue and that delivery was received the
-second return value will be true.  If there was no delivery waiting or an error
-occured, the ok bool will be false.
-
-All deliveries must be acknowledged including those from Channel.Get.  Call
-Delivery.Ack on the returned delivery when you have fully processed this
-delivery.
-
-When autoAck is true, the server will automatically acknowledge this message so
-you don't have to.  But if you are unable to fully process this message before
-the channel or connection is closed, the message will not get requeued.
-
-*/
-func (me *Channel) Get(queue string, autoAck bool) (msg Delivery, ok bool, err error) {
-	req := &basicGet{Queue: queue, NoAck: autoAck}
-	res := &basicGetOk{}
-	empty := &basicGetEmpty{}
-
-	if err := me.call(req, res, empty); err != nil {
-		return Delivery{}, false, err
-	}
-
-	if res.DeliveryTag > 0 {
-		return *(newDelivery(me, res)), true, nil
-	}
-
-	return Delivery{}, false, nil
-}
-
-/*
-Tx puts the channel into transaction mode on the server.  All publishings and
-acknowledgments following this method will be atomically committed or rolled
-back for a single queue.  Call either Channel.TxCommit or Channel.TxRollback to
-leave a this transaction and immediately start a new transaction.
-
-The atomicity across multiple queues is not defined as queue declarations and
-bindings are not included in the transaction.
-
-The behavior of publishings that are delivered as mandatory or immediate while
-the channel is in a transaction is not defined.
-
-Once a channel has been put into transaction mode, it cannot be taken out of
-transaction mode.  Use a different channel for non-transactional semantics.
-
-*/
-func (me *Channel) Tx() error {
-	return me.call(
-		&txSelect{},
-		&txSelectOk{},
-	)
-}
-
-/*
-TxCommit atomically commits all publishings and acknowledgments for a single
-queue and immediately start a new transaction.
-
-Calling this method without having called Channel.Tx is an error.
-
-*/
-func (me *Channel) TxCommit() error {
-	return me.call(
-		&txCommit{},
-		&txCommitOk{},
-	)
-}
-
-/*
-TxRollback atomically rolls back all publishings and acknowledgments for a
-single queue and immediately start a new transaction.
-
-Calling this method without having called Channel.Tx is an error.
-
-*/
-func (me *Channel) TxRollback() error {
-	return me.call(
-		&txRollback{},
-		&txRollbackOk{},
-	)
-}
-
-/*
-Flow pauses the delivery of messages to consumers on this channel.  Channels
-are opened with flow control not active, to open a channel with paused
-deliveries immediately call this method with true after calling
-Connection.Channel.
-
-When active is true, this method asks the server to temporarily pause deliveries
-until called again with active as false.
-
-Channel.Get methods will not be affected by flow control.
-
-This method is not intended to act as window control.  Use Channel.Qos to limit
-the number of unacknowledged messages or bytes in flight instead.
-
-The server may also send us flow methods to throttle our publishings.  A well
-behaving publishing client should add a listener with Channel.NotifyFlow and
-pause its publishings when true is sent on that channel.
-
-Note: RabbitMQ prefers to use TCP push back to control flow for all channels on
-a connection, so under high volume scenarios, it's wise to open separate
-Connections for publishings and deliveries.
-
-*/
-func (me *Channel) Flow(active bool) error {
-	return me.call(
-		&channelFlow{Active: active},
-		&channelFlowOk{},
-	)
-}
-
-/*
-Confirm puts this channel into confirm mode so that the client can ensure all
-publishings have successfully been received by the server.  After entering this
-mode, the server will send a basic.ack or basic.nack message with the deliver
-tag set to a 1 based incrementing index corresponding to every publishing
-received after the this method returns.
-
-Add a listener to Channel.NotifyPublish to respond to the Confirmations. If
-Channel.NotifyPublish is not called, the Confirmations will be silently
-ignored.
-
-The order of acknowledgments is not bound to the order of deliveries.
-
-Ack and Nack confirmations will arrive at some point in the future.
-
-Unroutable mandatory or immediate messages are acknowledged immediately after
-any Channel.NotifyReturn listeners have been notified.  Other messages are
-acknowledged when all queues that should have the message routed to them have
-either have received acknowledgment of delivery or have enqueued the message,
-persisting the message if necessary.
-
-When noWait is true, the client will not wait for a response.  A channel
-exception could occur if the server does not support this method.
-
-*/
-func (me *Channel) Confirm(noWait bool) error {
-	me.m.Lock()
-	defer me.m.Unlock()
-
-	if err := me.call(
-		&confirmSelect{Nowait: noWait},
-		&confirmSelectOk{},
-	); err != nil {
-		return err
-	}
-
-	me.confirming = true
-
-	return nil
-}
-
-/*
-Recover redelivers all unacknowledged deliveries on this channel.
-
-When requeue is false, messages will be redelivered to the original consumer.
-
-When requeue is true, messages will be redelivered to any available consumer,
-potentially including the original.
-
-If the deliveries cannot be recovered, an error will be returned and the channel
-will be closed.
-
-Note: this method is not implemented on RabbitMQ, use Delivery.Nack instead
-*/
-func (me *Channel) Recover(requeue bool) error {
-	return me.call(
-		&basicRecover{Requeue: requeue},
-		&basicRecoverOk{},
-	)
-}
-
-/*
-Ack acknowledges a delivery by its delivery tag when having been consumed with
-Channel.Consume or Channel.Get.
-
-Ack acknowledges all message received prior to the delivery tag when multiple
-is true.
-
-See also Delivery.Ack
-*/
-func (me *Channel) Ack(tag uint64, multiple bool) error {
-	return me.send(me, &basicAck{
-		DeliveryTag: tag,
-		Multiple:    multiple,
-	})
-}
-
-/*
-Nack negatively acknowledges a delivery by its delivery tag.  Prefer this
-method to notify the server that you were not able to process this delivery and
-it must be redelivered or dropped.
-
-See also Delivery.Nack
-*/
-func (me *Channel) Nack(tag uint64, multiple bool, requeue bool) error {
-	return me.send(me, &basicNack{
-		DeliveryTag: tag,
-		Multiple:    multiple,
-		Requeue:     requeue,
-	})
-}
-
-/*
-Reject negatively acknowledges a delivery by its delivery tag.  Prefer Nack
-over Reject when communicating with a RabbitMQ server because you can Nack
-multiple messages, reducing the amount of protocol messages to exchange.
-
-See also Delivery.Reject
-*/
-func (me *Channel) Reject(tag uint64, requeue bool) error {
-	return me.send(me, &basicReject{
-		DeliveryTag: tag,
-		Requeue:     requeue,
-	})
-}
diff --git a/Godeps/_workspace/src/github.com/streadway/amqp/client_test.go b/Godeps/_workspace/src/github.com/streadway/amqp/client_test.go
deleted file mode 100644
index be816bc38..000000000
--- a/Godeps/_workspace/src/github.com/streadway/amqp/client_test.go
+++ /dev/null
@@ -1,559 +0,0 @@
-// Copyright (c) 2012, Sean Treadway, SoundCloud Ltd.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-// Source code and contact info at http://github.com/streadway/amqp
-
-package amqp
-
-import (
-	"bytes"
-	"io"
-	"reflect"
-	"testing"
-	"time"
-)
-
-type server struct {
-	*testing.T
-	r reader             // framer <- client
-	w writer             // framer -> client
-	S io.ReadWriteCloser // Server IO
-	C io.ReadWriteCloser // Client IO
-
-	// captured client frames
-	start connectionStartOk
-	tune  connectionTuneOk
-}
-
-func defaultConfig() Config {
-	return Config{SASL: []Authentication{&PlainAuth{"guest", "guest"}}, Vhost: "/"}
-}
-
-func newSession(t *testing.T) (io.ReadWriteCloser, *server) {
-	rs, wc := io.Pipe()
-	rc, ws := io.Pipe()
-
-	rws := &logIO{t, "server", pipe{rs, ws}}
-	rwc := &logIO{t, "client", pipe{rc, wc}}
-
-	server := server{
-		T: t,
-		r: reader{rws},
-		w: writer{rws},
-		S: rws,
-		C: rwc,
-	}
-
-	return rwc, &server
-}
-
-func (t *server) expectBytes(b []byte) {
-	in := make([]byte, len(b))
-	if _, err := io.ReadFull(t.S, in); err != nil {
-		t.Fatalf("io error expecting bytes: %v", err)
-	}
-
-	if bytes.Compare(b, in) != 0 {
-		t.Fatalf("failed bytes: expected: %s got: %s", string(b), string(in))
-	}
-}
-
-func (t *server) send(channel int, m message) {
-	defer time.AfterFunc(time.Second, func() { panic("send deadlock") }).Stop()
-
-	if err := t.w.WriteFrame(&methodFrame{
-		ChannelId: uint16(channel),
-		Method:    m,
-	}); err != nil {
-		t.Fatalf("frame err, write: %s", err)
-	}
-}
-
-// drops all but method frames expected on the given channel
-func (t *server) recv(channel int, m message) message {
-	defer time.AfterFunc(time.Second, func() { panic("recv deadlock") }).Stop()
-
-	var remaining int
-	var header *headerFrame
-	var body []byte
-
-	for {
-		frame, err := t.r.ReadFrame()
-		if err != nil {
-			t.Fatalf("frame err, read: %s", err)
-		}
-
-		if frame.channel() != uint16(channel) {
-			t.Fatalf("expected frame on channel %d, got channel %d", channel, frame.channel())
-		}
-
-		switch f := frame.(type) {
-		case *heartbeatFrame:
-			// drop
-
-		case *headerFrame:
-			// start content state
-			header = f
-			remaining = int(header.Size)
-			if remaining == 0 {
-				m.(messageWithContent).setContent(header.Properties, nil)
-				return m
-			}
-
-		case *bodyFrame:
-			// continue until terminated
-			body = append(body, f.Body...)
-			remaining -= len(f.Body)
-			if remaining <= 0 {
-				m.(messageWithContent).setContent(header.Properties, body)
-				return m
-			}
-
-		case *methodFrame:
-			if reflect.TypeOf(m) == reflect.TypeOf(f.Method) {
-				wantv := reflect.ValueOf(m).Elem()
-				havev := reflect.ValueOf(f.Method).Elem()
-				wantv.Set(havev)
-				if _, ok := m.(messageWithContent); !ok {
-					return m
-				}
-			} else {
-				t.Fatalf("expected method type: %T, got: %T", m, f.Method)
-			}
-
-		default:
-			t.Fatalf("unexpected frame: %+v", f)
-		}
-	}
-
-	panic("unreachable")
-}
-
-func (t *server) expectAMQP() {
-	t.expectBytes([]byte{'A', 'M', 'Q', 'P', 0, 0, 9, 1})
-}
-
-func (t *server) connectionStart() {
-	t.send(0, &connectionStart{
-		VersionMajor: 0,
-		VersionMinor: 9,
-		Mechanisms:   "PLAIN",
-		Locales:      "en-us",
-	})
-
-	t.recv(0, &t.start)
-}
-
-func (t *server) connectionTune() {
-	t.send(0, &connectionTune{
-		ChannelMax: 11,
-		FrameMax:   20000,
-		Heartbeat:  10,
-	})
-
-	t.recv(0, &t.tune)
-}
-
-func (t *server) connectionOpen() {
-	t.expectAMQP()
-	t.connectionStart()
-	t.connectionTune()
-
-	t.recv(0, &connectionOpen{})
-	t.send(0, &connectionOpenOk{})
-}
-
-func (t *server) connectionClose() {
-	t.recv(0, &connectionClose{})
-	t.send(0, &connectionCloseOk{})
-}
-
-func (t *server) channelOpen(id int) {
-	t.recv(id, &channelOpen{})
-	t.send(id, &channelOpenOk{})
-}
-
-func TestDefaultClientProperties(t *testing.T) {
-	rwc, srv := newSession(t)
-
-	go func() {
-		srv.connectionOpen()
-		rwc.Close()
-	}()
-
-	if c, err := Open(rwc, defaultConfig()); err != nil {
-		t.Fatalf("could not create connection: %v (%s)", c, err)
-	}
-
-	if want, got := defaultProduct, srv.start.ClientProperties["product"]; want != got {
-		t.Errorf("expected product %s got: %s", want, got)
-	}
-
-	if want, got := defaultVersion, srv.start.ClientProperties["version"]; want != got {
-		t.Errorf("expected version %s got: %s", want, got)
-	}
-}
-
-func TestCustomClientProperties(t *testing.T) {
-	rwc, srv := newSession(t)
-
-	config := defaultConfig()
-	config.Properties = Table{
-		"product": "foo",
-		"version": "1.0",
-	}
-
-	go func() {
-		srv.connectionOpen()
-		rwc.Close()
-	}()
-
-	if c, err := Open(rwc, config); err != nil {
-		t.Fatalf("could not create connection: %v (%s)", c, err)
-	}
-
-	if want, got := config.Properties["product"], srv.start.ClientProperties["product"]; want != got {
-		t.Errorf("expected product %s got: %s", want, got)
-	}
-
-	if want, got := config.Properties["version"], srv.start.ClientProperties["version"]; want != got {
-		t.Errorf("expected version %s got: %s", want, got)
-	}
-}
-
-func TestOpen(t *testing.T) {
-	rwc, srv := newSession(t)
-	go func() {
-		srv.connectionOpen()
-		rwc.Close()
-	}()
-
-	if c, err := Open(rwc, defaultConfig()); err != nil {
-		t.Fatalf("could not create connection: %v (%s)", c, err)
-	}
-}
-
-func TestChannelOpen(t *testing.T) {
-	rwc, srv := newSession(t)
-
-	go func() {
-		srv.connectionOpen()
-		srv.channelOpen(1)
-
-		rwc.Close()
-	}()
-
-	c, err := Open(rwc, defaultConfig())
-	if err != nil {
-		t.Fatalf("could not create connection: %v (%s)", c, err)
-	}
-
-	ch, err := c.Channel()
-	if err != nil {
-		t.Fatalf("could not open channel: %v (%s)", ch, err)
-	}
-}
-
-func TestOpenFailedSASLUnsupportedMechanisms(t *testing.T) {
-	rwc, srv := newSession(t)
-
-	go func() {
-		srv.expectAMQP()
-		srv.send(0, &connectionStart{
-			VersionMajor: 0,
-			VersionMinor: 9,
-			Mechanisms:   "KERBEROS NTLM",
-			Locales:      "en-us",
-		})
-	}()
-
-	c, err := Open(rwc, defaultConfig())
-	if err != ErrSASL {
-		t.Fatalf("expected ErrSASL got: %+v on %+v", err, c)
-	}
-}
-
-func TestOpenFailedCredentials(t *testing.T) {
-	rwc, srv := newSession(t)
-
-	go func() {
-		srv.expectAMQP()
-		srv.connectionStart()
-		// Now kill/timeout the connection indicating bad auth
-		rwc.Close()
-	}()
-
-	c, err := Open(rwc, defaultConfig())
-	if err != ErrCredentials {
-		t.Fatalf("expected ErrCredentials got: %+v on %+v", err, c)
-	}
-}
-
-func TestOpenFailedVhost(t *testing.T) {
-	rwc, srv := newSession(t)
-
-	go func() {
-		srv.expectAMQP()
-		srv.connectionStart()
-		srv.connectionTune()
-		srv.recv(0, &connectionOpen{})
-
-		// Now kill/timeout the connection on bad Vhost
-		rwc.Close()
-	}()
-
-	c, err := Open(rwc, defaultConfig())
-	if err != ErrVhost {
-		t.Fatalf("expected ErrVhost got: %+v on %+v", err, c)
-	}
-}
-
-func TestConfirmMultipleOrdersDeliveryTags(t *testing.T) {
-	rwc, srv := newSession(t)
-	defer rwc.Close()
-
-	go func() {
-		srv.connectionOpen()
-		srv.channelOpen(1)
-
-		srv.recv(1, &confirmSelect{})
-		srv.send(1, &confirmSelectOk{})
-
-		srv.recv(1, &basicPublish{})
-		srv.recv(1, &basicPublish{})
-		srv.recv(1, &basicPublish{})
-		srv.recv(1, &basicPublish{})
-
-		// Single tag, plus multiple, should produce
-		// 2, 1, 3, 4
-		srv.send(1, &basicAck{DeliveryTag: 2})
-		srv.send(1, &basicAck{DeliveryTag: 1})
-		srv.send(1, &basicAck{DeliveryTag: 4, Multiple: true})
-
-		srv.recv(1, &basicPublish{})
-		srv.recv(1, &basicPublish{})
-		srv.recv(1, &basicPublish{})
-		srv.recv(1, &basicPublish{})
-
-		// And some more, but in reverse order, multiple then one
-		// 5, 6, 7, 8
-		srv.send(1, &basicAck{DeliveryTag: 6, Multiple: true})
-		srv.send(1, &basicAck{DeliveryTag: 8})
-		srv.send(1, &basicAck{DeliveryTag: 7})
-	}()
-
-	c, err := Open(rwc, defaultConfig())
-	if err != nil {
-		t.Fatalf("could not create connection: %v (%s)", c, err)
-	}
-
-	ch, err := c.Channel()
-	if err != nil {
-		t.Fatalf("could not open channel: %v (%s)", ch, err)
-	}
-
-	confirm := ch.NotifyPublish(make(chan Confirmation))
-
-	ch.Confirm(false)
-
-	go func() {
-		ch.Publish("", "q", false, false, Publishing{Body: []byte("pub 1")})
-		ch.Publish("", "q", false, false, Publishing{Body: []byte("pub 2")})
-		ch.Publish("", "q", false, false, Publishing{Body: []byte("pub 3")})
-		ch.Publish("", "q", false, false, Publishing{Body: []byte("pub 4")})
-	}()
-
-	// received out of order, consumed in order
-	for i, tag := range []uint64{1, 2, 3, 4} {
-		if ack := <-confirm; tag != ack.DeliveryTag {
-			t.Fatalf("failed ack, expected ack#%d to be %d, got %d", i, tag, ack.DeliveryTag)
-		}
-	}
-
-	go func() {
-		ch.Publish("", "q", false, false, Publishing{Body: []byte("pub 5")})
-		ch.Publish("", "q", false, false, Publishing{Body: []byte("pub 6")})
-		ch.Publish("", "q", false, false, Publishing{Body: []byte("pub 7")})
-		ch.Publish("", "q", false, false, Publishing{Body: []byte("pub 8")})
-	}()
-
-	for i, tag := range []uint64{5, 6, 7, 8} {
-		if ack := <-confirm; tag != ack.DeliveryTag {
-			t.Fatalf("failed ack, expected ack#%d to be %d, got %d", i, tag, ack.DeliveryTag)
-		}
-	}
-
-}
-
-func TestNotifyClosesReusedPublisherConfirmChan(t *testing.T) {
-	rwc, srv := newSession(t)
-
-	go func() {
-		srv.connectionOpen()
-		srv.channelOpen(1)
-
-		srv.recv(1, &confirmSelect{})
-		srv.send(1, &confirmSelectOk{})
-
-		srv.recv(0, &connectionClose{})
-		srv.send(0, &connectionCloseOk{})
-	}()
-
-	c, err := Open(rwc, defaultConfig())
-	if err != nil {
-		t.Fatalf("could not create connection: %v (%s)", c, err)
-	}
-
-	ch, err := c.Channel()
-	if err != nil {
-		t.Fatalf("could not open channel: %v (%s)", ch, err)
-	}
-
-	ackAndNack := make(chan uint64)
-	ch.NotifyConfirm(ackAndNack, ackAndNack)
-
-	if err := ch.Confirm(false); err != nil {
-		t.Fatalf("expected to enter confirm mode: %v", err)
-	}
-
-	if err := c.Close(); err != nil {
-		t.Fatalf("could not close connection: %v (%s)", c, err)
-	}
-}
-
-func TestNotifyClosesAllChansAfterConnectionClose(t *testing.T) {
-	rwc, srv := newSession(t)
-
-	go func() {
-		srv.connectionOpen()
-		srv.channelOpen(1)
-
-		srv.recv(0, &connectionClose{})
-		srv.send(0, &connectionCloseOk{})
-	}()
-
-	c, err := Open(rwc, defaultConfig())
-	if err != nil {
-		t.Fatalf("could not create connection: %v (%s)", c, err)
-	}
-
-	ch, err := c.Channel()
-	if err != nil {
-		t.Fatalf("could not open channel: %v (%s)", ch, err)
-	}
-
-	if err := c.Close(); err != nil {
-		t.Fatalf("could not close connection: %v (%s)", c, err)
-	}
-
-	select {
-	case <-c.NotifyClose(make(chan *Error)):
-	case <-time.After(time.Millisecond):
-		t.Errorf("expected to close NotifyClose chan after Connection.Close")
-	}
-
-	select {
-	case <-ch.NotifyClose(make(chan *Error)):
-	case <-time.After(time.Millisecond):
-		t.Errorf("expected to close Connection.NotifyClose chan after Connection.Close")
-	}
-
-	select {
-	case <-ch.NotifyFlow(make(chan bool)):
-	case <-time.After(time.Millisecond):
-		t.Errorf("expected to close Channel.NotifyFlow chan after Connection.Close")
-	}
-
-	select {
-	case <-ch.NotifyCancel(make(chan string)):
-	case <-time.After(time.Millisecond):
-		t.Errorf("expected to close Channel.NofityCancel chan after Connection.Close")
-	}
-
-	select {
-	case <-ch.NotifyReturn(make(chan Return)):
-	case <-time.After(time.Millisecond):
-		t.Errorf("expected to close Channel.NotifyReturn chan after Connection.Close")
-	}
-
-	confirms := ch.NotifyPublish(make(chan Confirmation))
-
-	select {
-	case <-confirms:
-	case <-time.After(time.Millisecond):
-		t.Errorf("expected to close confirms on Channel.NotifyPublish chan after Connection.Close")
-	}
-}
-
-// Should not panic when sending bodies split at differnet boundaries
-func TestPublishBodySliceIssue74(t *testing.T) {
-	rwc, srv := newSession(t)
-	defer rwc.Close()
-
-	const frameSize = 100
-	const publishings = frameSize * 3
-
-	done := make(chan bool)
-	base := make([]byte, publishings)
-
-	go func() {
-		srv.connectionOpen()
-		srv.channelOpen(1)
-
-		for i := 0; i < publishings; i++ {
-			srv.recv(1, &basicPublish{})
-		}
-
-		done <- true
-	}()
-
-	cfg := defaultConfig()
-	cfg.FrameSize = frameSize
-
-	c, err := Open(rwc, cfg)
-	if err != nil {
-		t.Fatalf("could not create connection: %v (%s)", c, err)
-	}
-
-	ch, err := c.Channel()
-	if err != nil {
-		t.Fatalf("could not open channel: %v (%s)", ch, err)
-	}
-
-	for i := 0; i < publishings; i++ {
-		go ch.Publish("", "q", false, false, Publishing{Body: base[0:i]})
-	}
-
-	<-done
-}
-
-func TestPublishAndShutdownDeadlockIssue84(t *testing.T) {
-	rwc, srv := newSession(t)
-	defer rwc.Close()
-
-	go func() {
-		srv.connectionOpen()
-		srv.channelOpen(1)
-		srv.recv(1, &basicPublish{})
-		// Mimic a broken io pipe so that Publish catches the error and goes into shutdown
-		srv.S.Close()
-	}()
-
-	c, err := Open(rwc, defaultConfig())
-	if err != nil {
-		t.Fatalf("couldn't create connection: %v (%s)", c, err)
-	}
-
-	ch, err := c.Channel()
-	if err != nil {
-		t.Fatalf("couldn't open channel: %v (%s)", ch, err)
-	}
-
-	defer time.AfterFunc(500*time.Millisecond, func() { panic("Publish deadlock") }).Stop()
-	for {
-		if err := ch.Publish("exchange", "q", false, false, Publishing{Body: []byte("test")}); err != nil {
-			t.Log("successfully caught disconnect error", err)
-			return
-		}
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/streadway/amqp/confirms.go b/Godeps/_workspace/src/github.com/streadway/amqp/confirms.go
deleted file mode 100644
index ebee9368b..000000000
--- a/Godeps/_workspace/src/github.com/streadway/amqp/confirms.go
+++ /dev/null
@@ -1,93 +0,0 @@
-package amqp
-
-import "sync"
-
-// confirms resequences and notifies one or multiple publisher confirmation listeners
-type confirms struct {
-	m         sync.Mutex
-	listeners []chan Confirmation
-	sequencer map[uint64]Confirmation
-	published uint64
-	expecting uint64
-}
-
-// newConfirms allocates a confirms
-func newConfirms() *confirms {
-	return &confirms{
-		sequencer: map[uint64]Confirmation{},
-		published: 0,
-		expecting: 1,
-	}
-}
-
-func (c *confirms) Listen(l chan Confirmation) {
-	c.m.Lock()
-	defer c.m.Unlock()
-
-	c.listeners = append(c.listeners, l)
-}
-
-// publish increments the publishing counter
-func (c *confirms) Publish() uint64 {
-	c.m.Lock()
-	defer c.m.Unlock()
-
-	c.published++
-	return c.published
-}
-
-// confirm confirms one publishing, increments the expecting delivery tag, and
-// removes bookkeeping for that delivery tag.
-func (c *confirms) confirm(confirmation Confirmation) {
-	delete(c.sequencer, c.expecting)
-	c.expecting++
-	for _, l := range c.listeners {
-		l <- confirmation
-	}
-}
-
-// resequence confirms any out of order delivered confirmations
-func (c *confirms) resequence() {
-	for c.expecting <= c.published {
-		sequenced, found := c.sequencer[c.expecting]
-		if !found {
-			return
-		}
-		c.confirm(sequenced)
-	}
-}
-
-// one confirms one publishing and all following in the publishing sequence
-func (c *confirms) One(confirmed Confirmation) {
-	c.m.Lock()
-	defer c.m.Unlock()
-
-	if c.expecting == confirmed.DeliveryTag {
-		c.confirm(confirmed)
-	} else {
-		c.sequencer[confirmed.DeliveryTag] = confirmed
-	}
-	c.resequence()
-}
-
-// multiple confirms all publishings up until the delivery tag
-func (c *confirms) Multiple(confirmed Confirmation) {
-	c.m.Lock()
-	defer c.m.Unlock()
-
-	for c.expecting <= confirmed.DeliveryTag {
-		c.confirm(Confirmation{c.expecting, confirmed.Ack})
-	}
-}
-
-// Close closes all listeners, discarding any out of sequence confirmations
-func (c *confirms) Close() error {
-	c.m.Lock()
-	defer c.m.Unlock()
-
-	for _, l := range c.listeners {
-		close(l)
-	}
-	c.listeners = nil
-	return nil
-}
diff --git a/Godeps/_workspace/src/github.com/streadway/amqp/confirms_test.go b/Godeps/_workspace/src/github.com/streadway/amqp/confirms_test.go
deleted file mode 100644
index 7eb2acc06..000000000
--- a/Godeps/_workspace/src/github.com/streadway/amqp/confirms_test.go
+++ /dev/null
@@ -1,119 +0,0 @@
-package amqp
-
-import (
-	"testing"
-	"time"
-)
-
-func TestConfirmOneResequences(t *testing.T) {
-	var (
-		fixtures = []Confirmation{
-			{1, true},
-			{2, false},
-			{3, true},
-		}
-		c = newConfirms()
-		l = make(chan Confirmation, len(fixtures))
-	)
-
-	c.Listen(l)
-
-	for i, _ := range fixtures {
-		if want, got := uint64(i+1), c.Publish(); want != got {
-			t.Fatalf("expected publish to return the 1 based delivery tag published, want: %d, got: %d", want, got)
-		}
-	}
-
-	c.One(fixtures[1])
-	c.One(fixtures[2])
-
-	select {
-	case confirm := <-l:
-		t.Fatalf("expected to wait in order to properly resequence results, got: %+v", confirm)
-	default:
-	}
-
-	c.One(fixtures[0])
-
-	for i, fix := range fixtures {
-		if want, got := fix, <-l; want != got {
-			t.Fatalf("expected to return confirmations in sequence for %d, want: %+v, got: %+v", i, want, got)
-		}
-	}
-}
-
-func TestConfirmMultipleResequences(t *testing.T) {
-	var (
-		fixtures = []Confirmation{
-			{1, true},
-			{2, true},
-			{3, true},
-			{4, true},
-		}
-		c = newConfirms()
-		l = make(chan Confirmation, len(fixtures))
-	)
-	c.Listen(l)
-
-	for _, _ = range fixtures {
-		c.Publish()
-	}
-
-	c.Multiple(fixtures[len(fixtures)-1])
-
-	for i, fix := range fixtures {
-		if want, got := fix, <-l; want != got {
-			t.Fatalf("expected to confirm multiple in sequence for %d, want: %+v, got: %+v", i, want, got)
-		}
-	}
-}
-
-func BenchmarkSequentialBufferedConfirms(t *testing.B) {
-	var (
-		c = newConfirms()
-		l = make(chan Confirmation, 10)
-	)
-
-	c.Listen(l)
-
-	for i := 0; i < t.N; i++ {
-		if i > cap(l)-1 {
-			<-l
-		}
-		c.One(Confirmation{c.Publish(), true})
-	}
-}
-
-func TestConfirmsIsThreadSafe(t *testing.T) {
-	const count = 1000
-	const timeout = 5 * time.Second
-	var (
-		c    = newConfirms()
-		l    = make(chan Confirmation)
-		pub  = make(chan Confirmation)
-		done = make(chan Confirmation)
-		late = time.After(timeout)
-	)
-
-	c.Listen(l)
-
-	for i := 0; i < count; i++ {
-		go func() { pub <- Confirmation{c.Publish(), true} }()
-	}
-
-	for i := 0; i < count; i++ {
-		go func() { c.One(<-pub) }()
-	}
-
-	for i := 0; i < count; i++ {
-		go func() { done <- <-l }()
-	}
-
-	for i := 0; i < count; i++ {
-		select {
-		case <-done:
-		case <-late:
-			t.Fatalf("expected all publish/confirms to finish after %s", timeout)
-		}
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/streadway/amqp/connection.go b/Godeps/_workspace/src/github.com/streadway/amqp/connection.go
deleted file mode 100644
index ad4007978..000000000
--- a/Godeps/_workspace/src/github.com/streadway/amqp/connection.go
+++ /dev/null
@@ -1,769 +0,0 @@
-// Copyright (c) 2012, Sean Treadway, SoundCloud Ltd.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-// Source code and contact info at http://github.com/streadway/amqp
-
-package amqp
-
-import (
-	"bufio"
-	"crypto/tls"
-	"io"
-	"net"
-	"reflect"
-	"strconv"
-	"strings"
-	"sync"
-	"time"
-)
-
-const (
-	maxChannelMax = (2 << 15) - 1
-
-	defaultHeartbeat         = 10 * time.Second
-	defaultConnectionTimeout = 30 * time.Second
-	defaultProduct           = "https://github.com/streadway/amqp"
-	defaultVersion           = "β"
-	defaultChannelMax        = maxChannelMax
-)
-
-// Config is used in DialConfig and Open to specify the desired tuning
-// parameters used during a connection open handshake.  The negotiated tuning
-// will be stored in the returned connection's Config field.
-type Config struct {
-	// The SASL mechanisms to try in the client request, and the successful
-	// mechanism used on the Connection object.
-	// If SASL is nil, PlainAuth from the URL is used.
-	SASL []Authentication
-
-	// Vhost specifies the namespace of permissions, exchanges, queues and
-	// bindings on the server.  Dial sets this to the path parsed from the URL.
-	Vhost string
-
-	ChannelMax int           // 0 max channels means 2^16 - 1
-	FrameSize  int           // 0 max bytes means unlimited
-	Heartbeat  time.Duration // less than 1s uses the server's interval
-
-	// TLSClientConfig specifies the client configuration of the TLS connection
-	// when establishing a tls transport.
-	// If the URL uses an amqps scheme, then an empty tls.Config with the
-	// ServerName from the URL is used.
-	TLSClientConfig *tls.Config
-
-	// Properties is table of properties that the client advertises to the server.
-	// This is an optional setting - if the application does not set this,
-	// the underlying library will use a generic set of client properties.
-	Properties Table
-
-	// Dial returns a net.Conn prepared for a TLS handshake with TSLClientConfig,
-	// then an AMQP connection handshake.
-	// If Dial is nil, net.DialTimeout with a 30s connection and 30s read
-	// deadline is used.
-	Dial func(network, addr string) (net.Conn, error)
-}
-
-// Connection manages the serialization and deserialization of frames from IO
-// and dispatches the frames to the appropriate channel.  All RPC methods and
-// asyncronous Publishing, Delivery, Ack, Nack and Return messages are
-// multiplexed on this channel.  There must always be active receivers for
-// every asynchronous message on this connection.
-type Connection struct {
-	destructor sync.Once  // shutdown once
-	sendM      sync.Mutex // conn writer mutex
-	m          sync.Mutex // struct field mutex
-
-	conn io.ReadWriteCloser
-
-	rpc       chan message
-	writer    *writer
-	sends     chan time.Time     // timestamps of each frame sent
-	deadlines chan readDeadliner // heartbeater updates read deadlines
-
-	allocator *allocator // id generator valid after openTune
-	channels  map[uint16]*Channel
-
-	noNotify bool // true when we will never notify again
-	closes   []chan *Error
-	blocks   []chan Blocking
-
-	errors chan *Error
-
-	Config Config // The negotiated Config after connection.open
-
-	Major      int   // Server's major version
-	Minor      int   // Server's minor version
-	Properties Table // Server properties
-}
-
-type readDeadliner interface {
-	SetReadDeadline(time.Time) error
-}
-
-type localNetAddr interface {
-	LocalAddr() net.Addr
-}
-
-// defaultDial establishes a connection when config.Dial is not provided
-func defaultDial(network, addr string) (net.Conn, error) {
-	conn, err := net.DialTimeout(network, addr, defaultConnectionTimeout)
-	if err != nil {
-		return nil, err
-	}
-
-	// Heartbeating hasn't started yet, don't stall forever on a dead server.
-	if err := conn.SetReadDeadline(time.Now().Add(defaultConnectionTimeout)); err != nil {
-		return nil, err
-	}
-
-	return conn, nil
-}
-
-// Dial accepts a string in the AMQP URI format and returns a new Connection
-// over TCP using PlainAuth.  Defaults to a server heartbeat interval of 10
-// seconds and sets the initial read deadline to 30 seconds.
-//
-// Dial uses the zero value of tls.Config when it encounters an amqps://
-// scheme.  It is equivalent to calling DialTLS(amqp, nil).
-func Dial(url string) (*Connection, error) {
-	return DialConfig(url, Config{
-		Heartbeat: defaultHeartbeat,
-	})
-}
-
-// DialTLS accepts a string in the AMQP URI format and returns a new Connection
-// over TCP using PlainAuth.  Defaults to a server heartbeat interval of 10
-// seconds and sets the initial read deadline to 30 seconds.
-//
-// DialTLS uses the provided tls.Config when encountering an amqps:// scheme.
-func DialTLS(url string, amqps *tls.Config) (*Connection, error) {
-	return DialConfig(url, Config{
-		Heartbeat:       defaultHeartbeat,
-		TLSClientConfig: amqps,
-	})
-}
-
-// DialConfig accepts a string in the AMQP URI format and a configuration for
-// the transport and connection setup, returning a new Connection.  Defaults to
-// a server heartbeat interval of 10 seconds and sets the initial read deadline
-// to 30 seconds.
-func DialConfig(url string, config Config) (*Connection, error) {
-	var err error
-	var conn net.Conn
-
-	uri, err := ParseURI(url)
-	if err != nil {
-		return nil, err
-	}
-
-	if config.SASL == nil {
-		config.SASL = []Authentication{uri.PlainAuth()}
-	}
-
-	if config.Vhost == "" {
-		config.Vhost = uri.Vhost
-	}
-
-	if uri.Scheme == "amqps" && config.TLSClientConfig == nil {
-		config.TLSClientConfig = new(tls.Config)
-	}
-
-	addr := net.JoinHostPort(uri.Host, strconv.FormatInt(int64(uri.Port), 10))
-
-	dialer := config.Dial
-	if dialer == nil {
-		dialer = defaultDial
-	}
-
-	conn, err = dialer("tcp", addr)
-	if err != nil {
-		return nil, err
-	}
-
-	if config.TLSClientConfig != nil {
-		// Use the URI's host for hostname validation unless otherwise set. Make a
-		// copy so not to modify the caller's reference when the caller reuses a
-		// tls.Config for a different URL.
-		if config.TLSClientConfig.ServerName == "" {
-			c := *config.TLSClientConfig
-			c.ServerName = uri.Host
-			config.TLSClientConfig = &c
-		}
-
-		client := tls.Client(conn, config.TLSClientConfig)
-		if err := client.Handshake(); err != nil {
-			conn.Close()
-			return nil, err
-		}
-
-		conn = client
-	}
-
-	return Open(conn, config)
-}
-
-/*
-Open accepts an already established connection, or other io.ReadWriteCloser as
-a transport.  Use this method if you have established a TLS connection or wish
-to use your own custom transport.
-
-*/
-func Open(conn io.ReadWriteCloser, config Config) (*Connection, error) {
-	me := &Connection{
-		conn:      conn,
-		writer:    &writer{bufio.NewWriter(conn)},
-		channels:  make(map[uint16]*Channel),
-		rpc:       make(chan message),
-		sends:     make(chan time.Time),
-		errors:    make(chan *Error, 1),
-		deadlines: make(chan readDeadliner, 1),
-	}
-	go me.reader(conn)
-	return me, me.open(config)
-}
-
-/*
-LocalAddr returns the local TCP peer address, or ":0" (the zero value of net.TCPAddr)
-as a fallback default value if the underlying transport does not support LocalAddr().
-*/
-func (me *Connection) LocalAddr() net.Addr {
-	if c, ok := me.conn.(localNetAddr); ok {
-		return c.LocalAddr()
-	}
-	return &net.TCPAddr{}
-}
-
-/*
-NotifyClose registers a listener for close events either initiated by an error
-accompaning a connection.close method or by a normal shutdown.
-
-On normal shutdowns, the chan will be closed.
-
-To reconnect after a transport or protocol error, register a listener here and
-re-run your setup process.
-
-*/
-func (me *Connection) NotifyClose(c chan *Error) chan *Error {
-	me.m.Lock()
-	defer me.m.Unlock()
-
-	if me.noNotify {
-		close(c)
-	} else {
-		me.closes = append(me.closes, c)
-	}
-
-	return c
-}
-
-/*
-NotifyBlock registers a listener for RabbitMQ specific TCP flow control method
-extensions connection.blocked and connection.unblocked.  Flow control is active
-with a reason when Blocking.Blocked is true.  When a Connection is blocked, all
-methods will block across all connections until server resources become free
-again.
-
-This optional extension is supported by the server when the
-"connection.blocked" server capability key is true.
-
-*/
-func (me *Connection) NotifyBlocked(c chan Blocking) chan Blocking {
-	me.m.Lock()
-	defer me.m.Unlock()
-
-	if me.noNotify {
-		close(c)
-	} else {
-		me.blocks = append(me.blocks, c)
-	}
-
-	return c
-}
-
-/*
-Close requests and waits for the response to close the AMQP connection.
-
-It's advisable to use this message when publishing to ensure all kernel buffers
-have been flushed on the server and client before exiting.
-
-An error indicates that server may not have received this request to close but
-the connection should be treated as closed regardless.
-
-After returning from this call, all resources associated with this connection,
-including the underlying io, Channels, Notify listeners and Channel consumers
-will also be closed.
-*/
-func (me *Connection) Close() error {
-	defer me.shutdown(nil)
-	return me.call(
-		&connectionClose{
-			ReplyCode: replySuccess,
-			ReplyText: "kthxbai",
-		},
-		&connectionCloseOk{},
-	)
-}
-
-func (me *Connection) closeWith(err *Error) error {
-	defer me.shutdown(err)
-	return me.call(
-		&connectionClose{
-			ReplyCode: uint16(err.Code),
-			ReplyText: err.Reason,
-		},
-		&connectionCloseOk{},
-	)
-}
-
-func (me *Connection) send(f frame) error {
-	me.sendM.Lock()
-	err := me.writer.WriteFrame(f)
-	me.sendM.Unlock()
-
-	if err != nil {
-		// shutdown could be re-entrant from signaling notify chans
-		go me.shutdown(&Error{
-			Code:   FrameError,
-			Reason: err.Error(),
-		})
-	} else {
-		// Broadcast we sent a frame, reducing heartbeats, only
-		// if there is something that can receive - like a non-reentrant
-		// call or if the heartbeater isn't running
-		select {
-		case me.sends <- time.Now():
-		default:
-		}
-	}
-
-	return err
-}
-
-func (me *Connection) shutdown(err *Error) {
-	me.destructor.Do(func() {
-		if err != nil {
-			for _, c := range me.closes {
-				c <- err
-			}
-		}
-
-		for _, ch := range me.channels {
-			me.closeChannel(ch, err)
-		}
-
-		if err != nil {
-			me.errors <- err
-		}
-
-		me.conn.Close()
-
-		for _, c := range me.closes {
-			close(c)
-		}
-
-		for _, c := range me.blocks {
-			close(c)
-		}
-
-		me.m.Lock()
-		me.noNotify = true
-		me.m.Unlock()
-	})
-}
-
-// All methods sent to the connection channel should be synchronous so we
-// can handle them directly without a framing component
-func (me *Connection) demux(f frame) {
-	if f.channel() == 0 {
-		me.dispatch0(f)
-	} else {
-		me.dispatchN(f)
-	}
-}
-
-func (me *Connection) dispatch0(f frame) {
-	switch mf := f.(type) {
-	case *methodFrame:
-		switch m := mf.Method.(type) {
-		case *connectionClose:
-			// Send immediately as shutdown will close our side of the writer.
-			me.send(&methodFrame{
-				ChannelId: 0,
-				Method:    &connectionCloseOk{},
-			})
-
-			me.shutdown(newError(m.ReplyCode, m.ReplyText))
-		case *connectionBlocked:
-			for _, c := range me.blocks {
-				c <- Blocking{Active: true, Reason: m.Reason}
-			}
-		case *connectionUnblocked:
-			for _, c := range me.blocks {
-				c <- Blocking{Active: false}
-			}
-		default:
-			me.rpc <- m
-		}
-	case *heartbeatFrame:
-		// kthx - all reads reset our deadline.  so we can drop this
-	default:
-		// lolwat - channel0 only responds to methods and heartbeats
-		me.closeWith(ErrUnexpectedFrame)
-	}
-}
-
-func (me *Connection) dispatchN(f frame) {
-	me.m.Lock()
-	channel := me.channels[f.channel()]
-	me.m.Unlock()
-
-	if channel != nil {
-		channel.recv(channel, f)
-	} else {
-		me.dispatchClosed(f)
-	}
-}
-
-// section 2.3.7: "When a peer decides to close a channel or connection, it
-// sends a Close method.  The receiving peer MUST respond to a Close with a
-// Close-Ok, and then both parties can close their channel or connection.  Note
-// that if peers ignore Close, deadlock can happen when both peers send Close
-// at the same time."
-//
-// When we don't have a channel, so we must respond with close-ok on a close
-// method.  This can happen between a channel exception on an asynchronous
-// method like basic.publish and a synchronous close with channel.close.
-// In that case, we'll get both a channel.close and channel.close-ok in any
-// order.
-func (me *Connection) dispatchClosed(f frame) {
-	// Only consider method frames, drop content/header frames
-	if mf, ok := f.(*methodFrame); ok {
-		switch mf.Method.(type) {
-		case *channelClose:
-			me.send(&methodFrame{
-				ChannelId: f.channel(),
-				Method:    &channelCloseOk{},
-			})
-		case *channelCloseOk:
-			// we are already closed, so do nothing
-		default:
-			// unexpected method on closed channel
-			me.closeWith(ErrClosed)
-		}
-	}
-}
-
-// Reads each frame off the IO and hand off to the connection object that
-// will demux the streams and dispatch to one of the opened channels or
-// handle on channel 0 (the connection channel).
-func (me *Connection) reader(r io.Reader) {
-	buf := bufio.NewReader(r)
-	frames := &reader{buf}
-	conn, haveDeadliner := r.(readDeadliner)
-
-	for {
-		frame, err := frames.ReadFrame()
-
-		if err != nil {
-			me.shutdown(&Error{Code: FrameError, Reason: err.Error()})
-			return
-		}
-
-		me.demux(frame)
-
-		if haveDeadliner {
-			me.deadlines <- conn
-		}
-	}
-}
-
-// Ensures that at least one frame is being sent at the tuned interval with a
-// jitter tolerance of 1s
-func (me *Connection) heartbeater(interval time.Duration, done chan *Error) {
-	const maxServerHeartbeatsInFlight = 3
-
-	var sendTicks <-chan time.Time
-	if interval > 0 {
-		ticker := time.NewTicker(interval)
-		defer ticker.Stop()
-		sendTicks = ticker.C
-	}
-
-	lastSent := time.Now()
-
-	for {
-		select {
-		case at, stillSending := <-me.sends:
-			// When actively sending, depend on sent frames to reset server timer
-			if stillSending {
-				lastSent = at
-			} else {
-				return
-			}
-
-		case at := <-sendTicks:
-			// When idle, fill the space with a heartbeat frame
-			if at.Sub(lastSent) > interval-time.Second {
-				if err := me.send(&heartbeatFrame{}); err != nil {
-					// send heartbeats even after close/closeOk so we
-					// tick until the connection starts erroring
-					return
-				}
-			}
-
-		case conn := <-me.deadlines:
-			// When reading, reset our side of the deadline, if we've negotiated one with
-			// a deadline that covers at least 2 server heartbeats
-			if interval > 0 {
-				conn.SetReadDeadline(time.Now().Add(maxServerHeartbeatsInFlight * interval))
-			}
-
-		case <-done:
-			return
-		}
-	}
-}
-
-// Convenience method to inspect the Connection.Properties["capabilities"]
-// Table for server identified capabilities like "basic.ack" or
-// "confirm.select".
-func (me *Connection) isCapable(featureName string) bool {
-	capabilities, _ := me.Properties["capabilities"].(Table)
-	hasFeature, _ := capabilities[featureName].(bool)
-	return hasFeature
-}
-
-// allocateChannel records but does not open a new channel with a unique id.
-// This method is the initial part of the channel lifecycle and paired with
-// releaseChannel
-func (me *Connection) allocateChannel() (*Channel, error) {
-	me.m.Lock()
-	defer me.m.Unlock()
-
-	id, ok := me.allocator.next()
-	if !ok {
-		return nil, ErrChannelMax
-	}
-
-	ch := newChannel(me, uint16(id))
-	me.channels[uint16(id)] = ch
-
-	return ch, nil
-}
-
-// releaseChannel removes a channel from the registry as the final part of the
-// channel lifecycle
-func (me *Connection) releaseChannel(id uint16) {
-	me.m.Lock()
-	defer me.m.Unlock()
-
-	delete(me.channels, id)
-	me.allocator.release(int(id))
-}
-
-// openChannel allocates and opens a channel, must be paired with closeChannel
-func (me *Connection) openChannel() (*Channel, error) {
-	ch, err := me.allocateChannel()
-	if err != nil {
-		return nil, err
-	}
-
-	if err := ch.open(); err != nil {
-		return nil, err
-	}
-	return ch, nil
-}
-
-// closeChannel releases and initiates a shutdown of the channel.  All channel
-// closures should be initiated here for proper channel lifecycle management on
-// this connection.
-func (me *Connection) closeChannel(ch *Channel, e *Error) {
-	ch.shutdown(e)
-	me.releaseChannel(ch.id)
-}
-
-/*
-Channel opens a unique, concurrent server channel to process the bulk of AMQP
-messages.  Any error from methods on this receiver will render the receiver
-invalid and a new Channel should be opened.
-
-*/
-func (me *Connection) Channel() (*Channel, error) {
-	return me.openChannel()
-}
-
-func (me *Connection) call(req message, res ...message) error {
-	// Special case for when the protocol header frame is sent insted of a
-	// request method
-	if req != nil {
-		if err := me.send(&methodFrame{ChannelId: 0, Method: req}); err != nil {
-			return err
-		}
-	}
-
-	select {
-	case err := <-me.errors:
-		return err
-
-	case msg := <-me.rpc:
-		// Try to match one of the result types
-		for _, try := range res {
-			if reflect.TypeOf(msg) == reflect.TypeOf(try) {
-				// *res = *msg
-				vres := reflect.ValueOf(try).Elem()
-				vmsg := reflect.ValueOf(msg).Elem()
-				vres.Set(vmsg)
-				return nil
-			}
-		}
-		return ErrCommandInvalid
-	}
-
-	panic("unreachable")
-}
-
-//    Connection          = open-Connection *use-Connection close-Connection
-//    open-Connection     = C:protocol-header
-//                          S:START C:START-OK
-//                          *challenge
-//                          S:TUNE C:TUNE-OK
-//                          C:OPEN S:OPEN-OK
-//    challenge           = S:SECURE C:SECURE-OK
-//    use-Connection      = *channel
-//    close-Connection    = C:CLOSE S:CLOSE-OK
-//                        / S:CLOSE C:CLOSE-OK
-func (me *Connection) open(config Config) error {
-	if err := me.send(&protocolHeader{}); err != nil {
-		return err
-	}
-
-	return me.openStart(config)
-}
-
-func (me *Connection) openStart(config Config) error {
-	start := &connectionStart{}
-
-	if err := me.call(nil, start); err != nil {
-		return err
-	}
-
-	me.Major = int(start.VersionMajor)
-	me.Minor = int(start.VersionMinor)
-	me.Properties = Table(start.ServerProperties)
-
-	// eventually support challenge/response here by also responding to
-	// connectionSecure.
-	auth, ok := pickSASLMechanism(config.SASL, strings.Split(start.Mechanisms, " "))
-	if !ok {
-		return ErrSASL
-	}
-
-	// Save this mechanism off as the one we chose
-	me.Config.SASL = []Authentication{auth}
-
-	return me.openTune(config, auth)
-}
-
-func (me *Connection) openTune(config Config, auth Authentication) error {
-	if len(config.Properties) == 0 {
-		config.Properties = Table{
-			"product": defaultProduct,
-			"version": defaultVersion,
-		}
-	}
-
-	config.Properties["capabilities"] = Table{
-		"connection.blocked":     true,
-		"consumer_cancel_notify": true,
-	}
-
-	ok := &connectionStartOk{
-		Mechanism:        auth.Mechanism(),
-		Response:         auth.Response(),
-		ClientProperties: config.Properties,
-	}
-	tune := &connectionTune{}
-
-	if err := me.call(ok, tune); err != nil {
-		// per spec, a connection can only be closed when it has been opened
-		// so at this point, we know it's an auth error, but the socket
-		// was closed instead.  Return a meaningful error.
-		return ErrCredentials
-	}
-
-	// When the server and client both use default 0, then the max channel is
-	// only limited by uint16.
-	me.Config.ChannelMax = pick(config.ChannelMax, int(tune.ChannelMax))
-	if me.Config.ChannelMax == 0 {
-		me.Config.ChannelMax = defaultChannelMax
-	}
-	me.Config.ChannelMax = min(me.Config.ChannelMax, maxChannelMax)
-
-	// Frame size includes headers and end byte (len(payload)+8), even if
-	// this is less than FrameMinSize, use what the server sends because the
-	// alternative is to stop the handshake here.
-	me.Config.FrameSize = pick(config.FrameSize, int(tune.FrameMax))
-
-	// Save this off for resetDeadline()
-	me.Config.Heartbeat = time.Second * time.Duration(pick(
-		int(config.Heartbeat/time.Second),
-		int(tune.Heartbeat)))
-
-	// "The client should start sending heartbeats after receiving a
-	// Connection.Tune method"
-	go me.heartbeater(me.Config.Heartbeat, me.NotifyClose(make(chan *Error, 1)))
-
-	if err := me.send(&methodFrame{
-		ChannelId: 0,
-		Method: &connectionTuneOk{
-			ChannelMax: uint16(me.Config.ChannelMax),
-			FrameMax:   uint32(me.Config.FrameSize),
-			Heartbeat:  uint16(me.Config.Heartbeat / time.Second),
-		},
-	}); err != nil {
-		return err
-	}
-
-	return me.openVhost(config)
-}
-
-func (me *Connection) openVhost(config Config) error {
-	req := &connectionOpen{VirtualHost: config.Vhost}
-	res := &connectionOpenOk{}
-
-	if err := me.call(req, res); err != nil {
-		// Cannot be closed yet, but we know it's a vhost problem
-		return ErrVhost
-	}
-
-	me.Config.Vhost = config.Vhost
-
-	return me.openComplete()
-}
-
-// openComplete performs any final Connection initialization dependent on the
-// connection handshake.
-func (me *Connection) openComplete() error {
-	me.allocator = newAllocator(1, me.Config.ChannelMax)
-	return nil
-}
-
-func max(a, b int) int {
-	if a > b {
-		return a
-	}
-	return b
-}
-
-func min(a, b int) int {
-	if a < b {
-		return a
-	}
-	return b
-}
-
-func pick(client, server int) int {
-	if client == 0 || server == 0 {
-		return max(client, server)
-	}
-	return min(client, server)
-}
diff --git a/Godeps/_workspace/src/github.com/streadway/amqp/consumers.go b/Godeps/_workspace/src/github.com/streadway/amqp/consumers.go
deleted file mode 100644
index b6bd60575..000000000
--- a/Godeps/_workspace/src/github.com/streadway/amqp/consumers.go
+++ /dev/null
@@ -1,118 +0,0 @@
-// Copyright (c) 2012, Sean Treadway, SoundCloud Ltd.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-// Source code and contact info at http://github.com/streadway/amqp
-
-package amqp
-
-import (
-	"fmt"
-	"os"
-	"sync"
-	"sync/atomic"
-)
-
-var consumerSeq uint64
-
-func uniqueConsumerTag() string {
-	return fmt.Sprintf("ctag-%s-%d", os.Args[0], atomic.AddUint64(&consumerSeq, 1))
-}
-
-type consumerBuffers map[string]chan *Delivery
-
-// Concurrent type that manages the consumerTag ->
-// ingress consumerBuffer mapping
-type consumers struct {
-	sync.Mutex
-	chans consumerBuffers
-}
-
-func makeConsumers() *consumers {
-	return &consumers{chans: make(consumerBuffers)}
-}
-
-func bufferDeliveries(in chan *Delivery, out chan Delivery) {
-	var queue []*Delivery
-	var queueIn = in
-
-	for delivery := range in {
-		select {
-		case out <- *delivery:
-			// delivered immediately while the consumer chan can receive
-		default:
-			queue = append(queue, delivery)
-		}
-
-		for len(queue) > 0 {
-			select {
-			case out <- *queue[0]:
-				queue = queue[1:]
-			case delivery, open := <-queueIn:
-				if open {
-					queue = append(queue, delivery)
-				} else {
-					// stop receiving to drain the queue
-					queueIn = nil
-				}
-			}
-		}
-	}
-
-	close(out)
-}
-
-// On key conflict, close the previous channel.
-func (me *consumers) add(tag string, consumer chan Delivery) {
-	me.Lock()
-	defer me.Unlock()
-
-	if prev, found := me.chans[tag]; found {
-		close(prev)
-	}
-
-	in := make(chan *Delivery)
-	go bufferDeliveries(in, consumer)
-
-	me.chans[tag] = in
-}
-
-func (me *consumers) close(tag string) (found bool) {
-	me.Lock()
-	defer me.Unlock()
-
-	ch, found := me.chans[tag]
-
-	if found {
-		delete(me.chans, tag)
-		close(ch)
-	}
-
-	return found
-}
-
-func (me *consumers) closeAll() {
-	me.Lock()
-	defer me.Unlock()
-
-	for _, ch := range me.chans {
-		close(ch)
-	}
-
-	me.chans = make(consumerBuffers)
-}
-
-// Sends a delivery to a the consumer identified by `tag`.
-// If unbuffered channels are used for Consume this method
-// could block all deliveries until the consumer
-// receives on the other end of the channel.
-func (me *consumers) send(tag string, msg *Delivery) bool {
-	me.Lock()
-	defer me.Unlock()
-
-	buffer, found := me.chans[tag]
-	if found {
-		buffer <- msg
-	}
-
-	return found
-}
diff --git a/Godeps/_workspace/src/github.com/streadway/amqp/delivery.go b/Godeps/_workspace/src/github.com/streadway/amqp/delivery.go
deleted file mode 100644
index f84ae4592..000000000
--- a/Godeps/_workspace/src/github.com/streadway/amqp/delivery.go
+++ /dev/null
@@ -1,173 +0,0 @@
-// Copyright (c) 2012, Sean Treadway, SoundCloud Ltd.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-// Source code and contact info at http://github.com/streadway/amqp
-
-package amqp
-
-import (
-	"errors"
-	"time"
-)
-
-var errDeliveryNotInitialized = errors.New("delivery not initialized")
-
-// Acknowledger notifies the server of successful or failed consumption of
-// delivieries via identifier found in the Delivery.DeliveryTag field.
-//
-// Applications can provide mock implementations in tests of Delivery handlers.
-type Acknowledger interface {
-	Ack(tag uint64, multiple bool) error
-	Nack(tag uint64, multiple bool, requeue bool) error
-	Reject(tag uint64, requeue bool) error
-}
-
-// Delivery captures the fields for a previously delivered message resident in
-// a queue to be delivered by the server to a consumer from Channel.Consume or
-// Channel.Get.
-type Delivery struct {
-	Acknowledger Acknowledger // the channel from which this delivery arrived
-
-	Headers Table // Application or header exchange table
-
-	// Properties
-	ContentType     string    // MIME content type
-	ContentEncoding string    // MIME content encoding
-	DeliveryMode    uint8     // queue implemention use - non-persistent (1) or persistent (2)
-	Priority        uint8     // queue implementation use - 0 to 9
-	CorrelationId   string    // application use - correlation identifier
-	ReplyTo         string    // application use - address to to reply to (ex: RPC)
-	Expiration      string    // implementation use - message expiration spec
-	MessageId       string    // application use - message identifier
-	Timestamp       time.Time // application use - message timestamp
-	Type            string    // application use - message type name
-	UserId          string    // application use - creating user - should be authenticated user
-	AppId           string    // application use - creating application id
-
-	// Valid only with Channel.Consume
-	ConsumerTag string
-
-	// Valid only with Channel.Get
-	MessageCount uint32
-
-	DeliveryTag uint64
-	Redelivered bool
-	Exchange    string // basic.publish exhange
-	RoutingKey  string // basic.publish routing key
-
-	Body []byte
-}
-
-func newDelivery(channel *Channel, msg messageWithContent) *Delivery {
-	props, body := msg.getContent()
-
-	delivery := Delivery{
-		Acknowledger: channel,
-
-		Headers:         props.Headers,
-		ContentType:     props.ContentType,
-		ContentEncoding: props.ContentEncoding,
-		DeliveryMode:    props.DeliveryMode,
-		Priority:        props.Priority,
-		CorrelationId:   props.CorrelationId,
-		ReplyTo:         props.ReplyTo,
-		Expiration:      props.Expiration,
-		MessageId:       props.MessageId,
-		Timestamp:       props.Timestamp,
-		Type:            props.Type,
-		UserId:          props.UserId,
-		AppId:           props.AppId,
-
-		Body: body,
-	}
-
-	// Properties for the delivery types
-	switch m := msg.(type) {
-	case *basicDeliver:
-		delivery.ConsumerTag = m.ConsumerTag
-		delivery.DeliveryTag = m.DeliveryTag
-		delivery.Redelivered = m.Redelivered
-		delivery.Exchange = m.Exchange
-		delivery.RoutingKey = m.RoutingKey
-
-	case *basicGetOk:
-		delivery.MessageCount = m.MessageCount
-		delivery.DeliveryTag = m.DeliveryTag
-		delivery.Redelivered = m.Redelivered
-		delivery.Exchange = m.Exchange
-		delivery.RoutingKey = m.RoutingKey
-	}
-
-	return &delivery
-}
-
-/*
-Ack delegates an acknowledgement through the Acknowledger interface that the
-client or server has finished work on a delivery.
-
-All deliveries in AMQP must be acknowledged.  If you called Channel.Consume
-with autoAck true then the server will be automatically ack each message and
-this method should not be called.  Otherwise, you must call Delivery.Ack after
-you have successfully processed this delivery.
-
-When multiple is true, this delivery and all prior unacknowledged deliveries
-on the same channel will be acknowledged.  This is useful for batch processing
-of deliveries.
-
-An error will indicate that the acknowledge could not be delivered to the
-channel it was sent from.
-
-Either Delivery.Ack, Delivery.Reject or Delivery.Nack must be called for every
-delivery that is not automatically acknowledged.
-*/
-func (me Delivery) Ack(multiple bool) error {
-	if me.Acknowledger == nil {
-		return errDeliveryNotInitialized
-	}
-	return me.Acknowledger.Ack(me.DeliveryTag, multiple)
-}
-
-/*
-Reject delegates a negatively acknowledgement through the Acknowledger interface.
-
-When requeue is true, queue this message to be delivered to a consumer on a
-different channel.  When requeue is false or the server is unable to queue this
-message, it will be dropped.
-
-If you are batch processing deliveries, and your server supports it, prefer
-Delivery.Nack.
-
-Either Delivery.Ack, Delivery.Reject or Delivery.Nack must be called for every
-delivery that is not automatically acknowledged.
-*/
-func (me Delivery) Reject(requeue bool) error {
-	if me.Acknowledger == nil {
-		return errDeliveryNotInitialized
-	}
-	return me.Acknowledger.Reject(me.DeliveryTag, requeue)
-}
-
-/*
-Nack negatively acknowledge the delivery of message(s) identified by the
-delivery tag from either the client or server.
-
-When multiple is true, nack messages up to and including delivered messages up
-until the delivery tag delivered on the same channel.
-
-When requeue is true, request the server to deliver this message to a different
-consumer.  If it is not possible or requeue is false, the message will be
-dropped or delivered to a server configured dead-letter queue.
-
-This method must not be used to select or requeue messages the client wishes
-not to handle, rather it is to inform the server that the client is incapable
-of handling this message at this time.
-
-Either Delivery.Ack, Delivery.Reject or Delivery.Nack must be called for every
-delivery that is not automatically acknowledged.
-*/
-func (me Delivery) Nack(multiple, requeue bool) error {
-	if me.Acknowledger == nil {
-		return errDeliveryNotInitialized
-	}
-	return me.Acknowledger.Nack(me.DeliveryTag, multiple, requeue)
-}
diff --git a/Godeps/_workspace/src/github.com/streadway/amqp/delivery_test.go b/Godeps/_workspace/src/github.com/streadway/amqp/delivery_test.go
deleted file mode 100644
index f126f87d8..000000000
--- a/Godeps/_workspace/src/github.com/streadway/amqp/delivery_test.go
+++ /dev/null
@@ -1,33 +0,0 @@
-package amqp
-
-import "testing"
-
-func shouldNotPanic(t *testing.T) {
-	if err := recover(); err != nil {
-		t.Fatalf("should not panic, got: %s", err)
-	}
-}
-
-// A closed delivery chan could produce zero value.  Ack/Nack/Reject on these
-// deliveries can produce a nil pointer panic.  Instead return an error when
-// the method can never be successful.
-func TestAckZeroValueAcknowledgerDoesNotPanic(t *testing.T) {
-	defer shouldNotPanic(t)
-	if err := (Delivery{}).Ack(false); err == nil {
-		t.Errorf("expected Delivery{}.Ack to error")
-	}
-}
-
-func TestNackZeroValueAcknowledgerDoesNotPanic(t *testing.T) {
-	defer shouldNotPanic(t)
-	if err := (Delivery{}).Nack(false, false); err == nil {
-		t.Errorf("expected Delivery{}.Ack to error")
-	}
-}
-
-func TestRejectZeroValueAcknowledgerDoesNotPanic(t *testing.T) {
-	defer shouldNotPanic(t)
-	if err := (Delivery{}).Reject(false); err == nil {
-		t.Errorf("expected Delivery{}.Ack to error")
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/streadway/amqp/doc.go b/Godeps/_workspace/src/github.com/streadway/amqp/doc.go
deleted file mode 100644
index 94c29f825..000000000
--- a/Godeps/_workspace/src/github.com/streadway/amqp/doc.go
+++ /dev/null
@@ -1,108 +0,0 @@
-// Copyright (c) 2012, Sean Treadway, SoundCloud Ltd.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-// Source code and contact info at http://github.com/streadway/amqp
-
-/*
-AMQP 0.9.1 client with RabbitMQ extensions
-
-Understand the AMQP 0.9.1 messaging model by reviewing these links first. Much
-of the terminology in this library directly relates to AMQP concepts.
-
-  Resources
-
-  http://www.rabbitmq.com/tutorials/amqp-concepts.html
-  http://www.rabbitmq.com/getstarted.html
-  http://www.rabbitmq.com/amqp-0-9-1-reference.html
-
-Design
-
-Most other broker clients publish to queues, but in AMQP, clients publish
-Exchanges instead.  AMQP is programmable, meaning that both the producers and
-consumers agree on the configuration of the broker, instead requiring an
-operator or system configuration that declares the logical topology in the
-broker.  The routing between producers and consumer queues is via Bindings.
-These bindings form the logical topology of the broker.
-
-In this library, a message sent from publisher is called a "Publishing" and a
-message received to a consumer is called a "Delivery".  The fields of
-Publishings and Deliveries are close but not exact mappings to the underlying
-wire format to maintain stronger types.  Many other libraries will combine
-message properties with message headers.  In this library, the message well
-known properties are strongly typed fields on the Publishings and Deliveries,
-whereas the user defined headers are in the Headers field.
-
-The method naming closely matches the protocol's method name with positional
-parameters mapping to named protocol message fields.  The motivation here is to
-present a comprehensive view over all possible interactions with the server.
-
-Generally, methods that map to protocol methods of the "basic" class will be
-elided in this interface, and "select" methods of various channel mode selectors
-will be elided for example Channel.Confirm and Channel.Tx.
-
-The library is intentionally designed to be synchronous, where responses for
-each protocol message are required to be received in an RPC manner.  Some
-methods have a noWait parameter like Channel.QueueDeclare, and some methods are
-asynchronous like Channel.Publish.  The error values should still be checked for
-these methods as they will indicate IO failures like when the underlying
-connection closes.
-
-Asynchronous Events
-
-Clients of this library may be interested in receiving some of the protocol
-messages other than Deliveries like basic.ack methods while a channel is in
-confirm mode.
-
-The Notify* methods with Connection and Channel receivers model the pattern of
-asynchronous events like closes due to exceptions, or messages that are sent out
-of band from an RPC call like basic.ack or basic.flow.
-
-Any asynchronous events, including Deliveries and Publishings must always have
-a receiver until the corresponding chans are closed.  Without asynchronous
-receivers, the sychronous methods will block.
-
-Use Case
-
-It's important as a client to an AMQP topology to ensure the state of the
-broker matches your expectations.  For both publish and consume use cases,
-make sure you declare the queues, exchanges and bindings you expect to exist
-prior to calling Channel.Publish or Channel.Consume.
-
-  // Connections start with amqp.Dial() typically from a command line argument
-  // or environment variable.
-  connection, err := amqp.Dial(os.Getenv("AMQP_URL"))
-
-  // To cleanly shutdown by flushing kernel buffers, make sure to close and
-  // wait for the response.
-  defer connection.Close()
-
-  // Most operations happen on a channel.  If any error is returned on a
-  // channel, the channel will no longer be valid, throw it away and try with
-  // a different channel.  If you use many channels, it's useful for the
-  // server to
-  channel, err := connection.Channel()
-
-  // Declare your topology here, if it doesn't exist, it will be created, if
-  // it existed already and is not what you expect, then that's considered an
-  // error.
-
-  // Use your connection on this topology with either Publish or Consume, or
-  // inspect your queues with QueueInspect.  It's unwise to mix Publish and
-  // Consume to let TCP do its job well.
-
-SSL/TLS - Secure connections
-
-When Dial encounters an amqps:// scheme, it will use the zero value of a
-tls.Config.  This will only perform server certificate and host verification.
-
-Use DialTLS when you wish to provide a client certificate (recommended),
-include a private certificate authority's certificate in the cert chain for
-server validity, or run insecure by not verifying the server certificate dial
-your own connection.  DialTLS will use the provided tls.Config when it
-encounters an amqps:// scheme and will dial a plain connection when it
-encounters an amqp:// scheme.
-
-SSL/TLS in RabbitMQ is documented here: http://www.rabbitmq.com/ssl.html
-
-*/
-package amqp
diff --git a/Godeps/_workspace/src/github.com/streadway/amqp/examples_test.go b/Godeps/_workspace/src/github.com/streadway/amqp/examples_test.go
deleted file mode 100644
index 8be53f427..000000000
--- a/Godeps/_workspace/src/github.com/streadway/amqp/examples_test.go
+++ /dev/null
@@ -1,393 +0,0 @@
-package amqp_test
-
-import (
-	"crypto/tls"
-	"crypto/x509"
-	"io/ioutil"
-	"log"
-	"net"
-	"runtime"
-	"time"
-
-	"github.com/streadway/amqp"
-)
-
-func ExampleConfig_timeout() {
-	// Provide your own anonymous Dial function that delgates to net.DialTimout
-	// for custom timeouts
-
-	conn, err := amqp.DialConfig("amqp:///", amqp.Config{
-		Dial: func(network, addr string) (net.Conn, error) {
-			return net.DialTimeout(network, addr, 2*time.Second)
-		},
-	})
-
-	log.Printf("conn: %v, err: %v", conn, err)
-}
-
-func ExampleDialTLS() {
-	// To get started with SSL/TLS follow the instructions for adding SSL/TLS
-	// support in RabbitMQ with a private certificate authority here:
-	//
-	// http://www.rabbitmq.com/ssl.html
-	//
-	// Then in your rabbitmq.config, disable the plain AMQP port, verify clients
-	// and fail if no certificate is presented with the following:
-	//
-	//   [
-	//   {rabbit, [
-	//     {tcp_listeners, []},     % listens on 127.0.0.1:5672
-	//     {ssl_listeners, [5671]}, % listens on 0.0.0.0:5671
-	//     {ssl_options, [{cacertfile,"/path/to/your/testca/cacert.pem"},
-	//                    {certfile,"/path/to/your/server/cert.pem"},
-	//                    {keyfile,"/path/to/your/server/key.pem"},
-	//                    {verify,verify_peer},
-	//                    {fail_if_no_peer_cert,true}]}
-	//     ]}
-	//   ].
-
-	cfg := new(tls.Config)
-
-	// The self-signing certificate authority's certificate must be included in
-	// the RootCAs to be trusted so that the server certificate can be verified.
-	//
-	// Alternatively to adding it to the tls.Config you can add the CA's cert to
-	// your system's root CAs.  The tls package will use the system roots
-	// specific to each support OS.  Under OS X, add (drag/drop) your cacert.pem
-	// file to the 'Certificates' section of KeyChain.app to add and always
-	// trust.
-	//
-	// Or with the command line add and trust the DER encoded certificate:
-	//
-	//   security add-certificate testca/cacert.cer
-	//   security add-trusted-cert testca/cacert.cer
-	//
-	// If you depend on the system root CAs, then use nil for the RootCAs field
-	// so the system roots will be loaded.
-
-	cfg.RootCAs = x509.NewCertPool()
-
-	if ca, err := ioutil.ReadFile("testca/cacert.pem"); err == nil {
-		cfg.RootCAs.AppendCertsFromPEM(ca)
-	}
-
-	// Move the client cert and key to a location specific to your application
-	// and load them here.
-
-	if cert, err := tls.LoadX509KeyPair("client/cert.pem", "client/key.pem"); err == nil {
-		cfg.Certificates = append(cfg.Certificates, cert)
-	}
-
-	// Server names are validated by the crypto/tls package, so the server
-	// certificate must be made for the hostname in the URL.  Find the commonName
-	// (CN) and make sure the hostname in the URL matches this common name.  Per
-	// the RabbitMQ instructions for a self-signed cert, this defautls to the
-	// current hostname.
-	//
-	//   openssl x509 -noout -in server/cert.pem -subject
-	//
-	// If your server name in your certificate is different than the host you are
-	// connecting to, set the hostname used for verification in
-	// ServerName field of the tls.Config struct.
-
-	conn, err := amqp.DialTLS("amqps://server-name-from-certificate/", cfg)
-
-	log.Printf("conn: %v, err: %v", conn, err)
-}
-
-func ExampleChannel_Confirm_bridge() {
-	// This example acts as a bridge, shoveling all messages sent from the source
-	// exchange "log" to destination exchange "log".
-
-	// Confirming publishes can help from overproduction and ensure every message
-	// is delivered.
-
-	// Setup the source of the store and forward
-	source, err := amqp.Dial("amqp://source/")
-	if err != nil {
-		log.Fatalf("connection.open source: %s", err)
-	}
-	defer source.Close()
-
-	chs, err := source.Channel()
-	if err != nil {
-		log.Fatalf("channel.open source: %s", err)
-	}
-
-	if err := chs.ExchangeDeclare("log", "topic", true, false, false, false, nil); err != nil {
-		log.Fatalf("exchange.declare destination: %s", err)
-	}
-
-	if _, err := chs.QueueDeclare("remote-tee", true, true, false, false, nil); err != nil {
-		log.Fatalf("queue.declare source: %s", err)
-	}
-
-	if err := chs.QueueBind("remote-tee", "#", "logs", false, nil); err != nil {
-		log.Fatalf("queue.bind source: %s", err)
-	}
-
-	shovel, err := chs.Consume("remote-tee", "shovel", false, false, false, false, nil)
-	if err != nil {
-		log.Fatalf("basic.consume source: %s", err)
-	}
-
-	// Setup the destination of the store and forward
-	destination, err := amqp.Dial("amqp://destination/")
-	if err != nil {
-		log.Fatalf("connection.open destination: %s", err)
-	}
-	defer destination.Close()
-
-	chd, err := destination.Channel()
-	if err != nil {
-		log.Fatalf("channel.open destination: %s", err)
-	}
-
-	if err := chd.ExchangeDeclare("log", "topic", true, false, false, false, nil); err != nil {
-		log.Fatalf("exchange.declare destination: %s", err)
-	}
-
-	// Buffer of 1 for our single outstanding publishing
-	confirms := chd.NotifyPublish(make(chan amqp.Confirmation, 1))
-
-	if err := chd.Confirm(false); err != nil {
-		log.Fatalf("confirm.select destination: %s", err)
-	}
-
-	// Now pump the messages, one by one, a smarter implementation
-	// would batch the deliveries and use multiple ack/nacks
-	for {
-		msg, ok := <-shovel
-		if !ok {
-			log.Fatalf("source channel closed, see the reconnect example for handling this")
-		}
-
-		err = chd.Publish("logs", msg.RoutingKey, false, false, amqp.Publishing{
-			// Copy all the properties
-			ContentType:     msg.ContentType,
-			ContentEncoding: msg.ContentEncoding,
-			DeliveryMode:    msg.DeliveryMode,
-			Priority:        msg.Priority,
-			CorrelationId:   msg.CorrelationId,
-			ReplyTo:         msg.ReplyTo,
-			Expiration:      msg.Expiration,
-			MessageId:       msg.MessageId,
-			Timestamp:       msg.Timestamp,
-			Type:            msg.Type,
-			UserId:          msg.UserId,
-			AppId:           msg.AppId,
-
-			// Custom headers
-			Headers: msg.Headers,
-
-			// And the body
-			Body: msg.Body,
-		})
-
-		if err != nil {
-			msg.Nack(false, false)
-			log.Fatalf("basic.publish destination: %s", msg)
-		}
-
-		// only ack the source delivery when the destination acks the publishing
-		if confirmed := <-confirms; confirmed.Ack {
-			msg.Ack(false)
-		} else {
-			msg.Nack(false, false)
-		}
-	}
-}
-
-func ExampleChannel_Consume() {
-	// Connects opens an AMQP connection from the credentials in the URL.
-	conn, err := amqp.Dial("amqp://guest:guest@localhost:5672/")
-	if err != nil {
-		log.Fatalf("connection.open: %s", err)
-	}
-	defer conn.Close()
-
-	c, err := conn.Channel()
-	if err != nil {
-		log.Fatalf("channel.open: %s", err)
-	}
-
-	// We declare our topology on both the publisher and consumer to ensure they
-	// are the same.  This is part of AMQP being a programmable messaging model.
-	//
-	// See the Channel.Publish example for the complimentary declare.
-	err = c.ExchangeDeclare("logs", "topic", true, false, false, false, nil)
-	if err != nil {
-		log.Fatalf("exchange.declare: %s", err)
-	}
-
-	// Establish our queue topologies that we are responsible for
-	type bind struct {
-		queue string
-		key   string
-	}
-
-	bindings := []bind{
-		bind{"page", "alert"},
-		bind{"email", "info"},
-		bind{"firehose", "#"},
-	}
-
-	for _, b := range bindings {
-		_, err = c.QueueDeclare(b.queue, true, false, false, false, nil)
-		if err != nil {
-			log.Fatalf("queue.declare: %v", err)
-		}
-
-		err = c.QueueBind(b.queue, b.key, "logs", false, nil)
-		if err != nil {
-			log.Fatalf("queue.bind: %v", err)
-		}
-	}
-
-	// Set our quality of service.  Since we're sharing 3 consumers on the same
-	// channel, we want at least 3 messages in flight.
-	err = c.Qos(3, 0, false)
-	if err != nil {
-		log.Fatalf("basic.qos: %v", err)
-	}
-
-	// Establish our consumers that have different responsibilities.  Our first
-	// two queues do not ack the messages on the server, so require to be acked
-	// on the client.
-
-	pages, err := c.Consume("page", "pager", false, false, false, false, nil)
-	if err != nil {
-		log.Fatalf("basic.consume: %v", err)
-	}
-
-	go func() {
-		for log := range pages {
-			// ... this consumer is responsible for sending pages per log
-			log.Ack(false)
-		}
-	}()
-
-	// Notice how the concern for which messages arrive here are in the AMQP
-	// topology and not in the queue.  We let the server pick a consumer tag this
-	// time.
-
-	emails, err := c.Consume("email", "", false, false, false, false, nil)
-	if err != nil {
-		log.Fatalf("basic.consume: %v", err)
-	}
-
-	go func() {
-		for log := range emails {
-			// ... this consumer is responsible for sending emails per log
-			log.Ack(false)
-		}
-	}()
-
-	// This consumer requests that every message is acknowledged as soon as it's
-	// delivered.
-
-	firehose, err := c.Consume("firehose", "", true, false, false, false, nil)
-	if err != nil {
-		log.Fatalf("basic.consume: %v", err)
-	}
-
-	// To show how to process the items in parallel, we'll use a work pool.
-	for i := 0; i < runtime.NumCPU(); i++ {
-		go func(work <-chan amqp.Delivery) {
-			for _ = range work {
-				// ... this consumer pulls from the firehose and doesn't need to acknowledge
-			}
-		}(firehose)
-	}
-
-	// Wait until you're ready to finish, could be a signal handler here.
-	time.Sleep(10 * time.Second)
-
-	// Cancelling a consumer by name will finish the range and gracefully end the
-	// goroutine
-	err = c.Cancel("pager", false)
-	if err != nil {
-		log.Fatalf("basic.cancel: %v", err)
-	}
-
-	// deferred closing the Connection will also finish the consumer's ranges of
-	// their delivery chans.  If you need every delivery to be processed, make
-	// sure to wait for all consumers goroutines to finish before exiting your
-	// process.
-}
-
-func ExampleChannel_Publish() {
-	// Connects opens an AMQP connection from the credentials in the URL.
-	conn, err := amqp.Dial("amqp://guest:guest@localhost:5672/")
-	if err != nil {
-		log.Fatalf("connection.open: %s", err)
-	}
-
-	// This waits for a server acknowledgment which means the sockets will have
-	// flushed all outbound publishings prior to returning.  It's important to
-	// block on Close to not lose any publishings.
-	defer conn.Close()
-
-	c, err := conn.Channel()
-	if err != nil {
-		log.Fatalf("channel.open: %s", err)
-	}
-
-	// We declare our topology on both the publisher and consumer to ensure they
-	// are the same.  This is part of AMQP being a programmable messaging model.
-	//
-	// See the Channel.Consume example for the complimentary declare.
-	err = c.ExchangeDeclare("logs", "topic", true, false, false, false, nil)
-	if err != nil {
-		log.Fatalf("exchange.declare: %v", err)
-	}
-
-	// Prepare this message to be persistent.  Your publishing requirements may
-	// be different.
-	msg := amqp.Publishing{
-		DeliveryMode: amqp.Persistent,
-		Timestamp:    time.Now(),
-		ContentType:  "text/plain",
-		Body:         []byte("Go Go AMQP!"),
-	}
-
-	// This is not a mandatory delivery, so it will be dropped if there are no
-	// queues bound to the logs exchange.
-	err = c.Publish("logs", "info", false, false, msg)
-	if err != nil {
-		// Since publish is asynchronous this can happen if the network connection
-		// is reset or if the server has run out of resources.
-		log.Fatalf("basic.publish: %v", err)
-	}
-}
-
-func publishAllTheThings(conn *amqp.Connection) {
-	// ... snarf snarf, barf barf
-}
-
-func ExampleConnection_NotifyBlocked() {
-	// Simply logs when the server throttles the TCP connection for publishers
-
-	// Test this by tuning your server to have a low memory watermark:
-	// rabbitmqctl set_vm_memory_high_watermark 0.00000001
-
-	conn, err := amqp.Dial("amqp://guest:guest@localhost:5672/")
-	if err != nil {
-		log.Fatalf("connection.open: %s", err)
-	}
-	defer conn.Close()
-
-	blockings := conn.NotifyBlocked(make(chan amqp.Blocking))
-	go func() {
-		for b := range blockings {
-			if b.Active {
-				log.Printf("TCP blocked: %q", b.Reason)
-			} else {
-				log.Printf("TCP unblocked")
-			}
-		}
-	}()
-
-	// Your application domain channel setup publishings
-	publishAllTheThings(conn)
-}
diff --git a/Godeps/_workspace/src/github.com/streadway/amqp/fuzz.go b/Godeps/_workspace/src/github.com/streadway/amqp/fuzz.go
deleted file mode 100644
index bf7c7689b..000000000
--- a/Godeps/_workspace/src/github.com/streadway/amqp/fuzz.go
+++ /dev/null
@@ -1,16 +0,0 @@
-// +build gofuzz
-package amqp
-
-import "bytes"
-
-func Fuzz(data []byte) int {
-	r := reader{bytes.NewReader(data)}
-	frame, err := r.ReadFrame()
-	if err != nil {
-		if frame != nil {
-			panic("frame is not nil")
-		}
-		return 0
-	}
-	return 1
-}
diff --git a/Godeps/_workspace/src/github.com/streadway/amqp/gen.sh b/Godeps/_workspace/src/github.com/streadway/amqp/gen.sh
deleted file mode 100644
index d46e19bd8..000000000
--- a/Godeps/_workspace/src/github.com/streadway/amqp/gen.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-go run spec/gen.go < spec/amqp0-9-1.stripped.extended.xml | gofmt > spec091.go
diff --git a/Godeps/_workspace/src/github.com/streadway/amqp/integration_test.go b/Godeps/_workspace/src/github.com/streadway/amqp/integration_test.go
deleted file mode 100644
index ec839f221..000000000
--- a/Godeps/_workspace/src/github.com/streadway/amqp/integration_test.go
+++ /dev/null
@@ -1,1796 +0,0 @@
-// Copyright (c) 2012, Sean Treadway, SoundCloud Ltd.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-// Source code and contact info at http://github.com/streadway/amqp
-
-// +build integration
-
-package amqp
-
-import (
-	"bytes"
-	devrand "crypto/rand"
-	"encoding/binary"
-	"fmt"
-	"hash/crc32"
-	"io"
-	"math/rand"
-	"net"
-	"os"
-	"reflect"
-	"strconv"
-	"sync"
-	"testing"
-	"testing/quick"
-	"time"
-)
-
-func TestIntegrationOpenClose(t *testing.T) {
-	if c := integrationConnection(t, "open-close"); c != nil {
-		t.Logf("have connection, calling connection close")
-		if err := c.Close(); err != nil {
-			t.Fatalf("connection close: %s", err)
-		}
-		t.Logf("connection close OK")
-	}
-}
-
-func TestIntegrationOpenCloseChannel(t *testing.T) {
-	if c := integrationConnection(t, "channel"); c != nil {
-		defer c.Close()
-
-		if _, err := c.Channel(); err != nil {
-			t.Errorf("Channel could not be opened: %s", err)
-		}
-	}
-}
-
-func TestIntegrationOpenConfig(t *testing.T) {
-	config := Config{}
-
-	c, err := DialConfig(integrationURLFromEnv(), config)
-	if err != nil {
-		t.Fatalf("expected to dial with config %+v integration server: %s", config, err)
-	}
-
-	if _, err := c.Channel(); err != nil {
-		t.Fatalf("expected to open channel: %s", err)
-	}
-
-	if err := c.Close(); err != nil {
-		t.Fatalf("connection close: %s", err)
-	}
-}
-
-func TestIntegrationOpenConfigWithNetDial(t *testing.T) {
-	config := Config{Dial: net.Dial}
-
-	c, err := DialConfig(integrationURLFromEnv(), config)
-	if err != nil {
-		t.Errorf("expected to dial with config %+v integration server: %s", config, err)
-	}
-
-	if _, err := c.Channel(); err != nil {
-		t.Fatalf("expected to open channel: %s", err)
-	}
-
-	if err := c.Close(); err != nil {
-		t.Fatalf("connection close: %s", err)
-	}
-}
-
-func TestIntegrationLocalAddr(t *testing.T) {
-	config := Config{}
-
-	c, err := DialConfig(integrationURLFromEnv(), config)
-	defer c.Close()
-	if err != nil {
-		t.Errorf("expected to dial with config %+v integration server: %s", config, err)
-	}
-
-	a := c.LocalAddr()
-	_, portString, err := net.SplitHostPort(a.String())
-	if err != nil {
-		t.Errorf("expected to get a local network address with config %+v integration server: %s", config, a.String())
-	}
-
-	port, err := strconv.Atoi(portString)
-	if err != nil {
-		t.Errorf("expected to get a TCP port number with config %+v integration server: %s", config, err)
-	}
-	t.Logf("Connected to port %d\n", port)
-}
-
-// https://github.com/streadway/amqp/issues/94
-func TestExchangePassiveOnMissingExchangeShouldError(t *testing.T) {
-	c := integrationConnection(t, "exch")
-	if c != nil {
-		defer c.Close()
-
-		ch, err := c.Channel()
-		if err != nil {
-			t.Fatalf("create channel 1: %s", err)
-		}
-		defer ch.Close()
-
-		if err := ch.ExchangeDeclarePassive(
-			"test-integration-missing-passive-exchange",
-			"direct", // type
-			false,    // duration (note: is durable)
-			true,     // auto-delete
-			false,    // internal
-			false,    // nowait
-			nil,      // args
-		); err == nil {
-			t.Fatal("ExchangeDeclarePassive of a missing exchange should return error")
-		}
-	}
-}
-
-// https://github.com/streadway/amqp/issues/94
-func TestIntegrationExchangeDeclarePassiveOnDeclaredShouldNotError(t *testing.T) {
-	c := integrationConnection(t, "exch")
-	if c != nil {
-		defer c.Close()
-
-		exchange := "test-integration-decalred-passive-exchange"
-
-		ch, err := c.Channel()
-		if err != nil {
-			t.Fatalf("create channel: %s", err)
-		}
-		defer ch.Close()
-
-		if err := ch.ExchangeDeclare(
-			exchange, // name
-			"direct", // type
-			false,    // durable
-			true,     // auto-delete
-			false,    // internal
-			false,    // nowait
-			nil,      // args
-		); err != nil {
-			t.Fatalf("declare exchange: %s", err)
-		}
-
-		if err := ch.ExchangeDeclarePassive(
-			exchange, // name
-			"direct", // type
-			false,    // durable
-			true,     // auto-delete
-			false,    // internal
-			false,    // nowait
-			nil,      // args
-		); err != nil {
-			t.Fatalf("ExchangeDeclarePassive on a declared exchange should not error, got: %q", err)
-		}
-	}
-}
-
-func TestIntegrationExchange(t *testing.T) {
-	c := integrationConnection(t, "exch")
-	if c != nil {
-		defer c.Close()
-
-		channel, err := c.Channel()
-		if err != nil {
-			t.Fatalf("create channel: %s", err)
-		}
-		t.Logf("create channel OK")
-
-		exchange := "test-integration-exchange"
-
-		if err := channel.ExchangeDeclare(
-			exchange, // name
-			"direct", // type
-			false,    // duration
-			true,     // auto-delete
-			false,    // internal
-			false,    // nowait
-			nil,      // args
-		); err != nil {
-			t.Fatalf("declare exchange: %s", err)
-		}
-		t.Logf("declare exchange OK")
-
-		if err := channel.ExchangeDelete(exchange, false, false); err != nil {
-			t.Fatalf("delete exchange: %s", err)
-		}
-		t.Logf("delete exchange OK")
-
-		if err := channel.Close(); err != nil {
-			t.Fatalf("close channel: %s", err)
-		}
-		t.Logf("close channel OK")
-	}
-}
-
-// https://github.com/streadway/amqp/issues/94
-func TestIntegrationQueueDeclarePassiveOnMissingExchangeShouldError(t *testing.T) {
-	c := integrationConnection(t, "queue")
-	if c != nil {
-		defer c.Close()
-
-		ch, err := c.Channel()
-		if err != nil {
-			t.Fatalf("create channel1: %s", err)
-		}
-		defer ch.Close()
-
-		if _, err := ch.QueueDeclarePassive(
-			"test-integration-missing-passive-queue", // name
-			false, // duration (note: not durable)
-			true,  // auto-delete
-			false, // exclusive
-			false, // noWait
-			nil,   // arguments
-		); err == nil {
-			t.Fatal("QueueDeclarePassive of a missing queue should error")
-		}
-	}
-}
-
-// https://github.com/streadway/amqp/issues/94
-func TestIntegrationPassiveQueue(t *testing.T) {
-	c := integrationConnection(t, "queue")
-	if c != nil {
-		defer c.Close()
-
-		name := "test-integration-declared-passive-queue"
-
-		ch, err := c.Channel()
-		if err != nil {
-			t.Fatalf("create channel1: %s", err)
-		}
-		defer ch.Close()
-
-		if _, err := ch.QueueDeclare(
-			name,  // name
-			false, // durable
-			true,  // auto-delete
-			false, // exclusive
-			false, // noWait
-			nil,   // arguments
-		); err != nil {
-			t.Fatalf("queue declare: %s", err)
-		}
-
-		if _, err := ch.QueueDeclarePassive(
-			name,  // name
-			false, // durable
-			true,  // auto-delete
-			false, // exclusive
-			false, // noWait
-			nil,   // arguments
-		); err != nil {
-			t.Fatalf("QueueDeclarePassive on declared queue should not error, got: %q", err)
-		}
-
-		if _, err := ch.QueueDeclarePassive(
-			name,  // name
-			true,  // durable (note: differs)
-			true,  // auto-delete
-			false, // exclusive
-			false, // noWait
-			nil,   // arguments
-		); err != nil {
-			t.Fatalf("QueueDeclarePassive on declared queue with different flags should error")
-		}
-	}
-}
-
-func TestIntegrationBasicQueueOperations(t *testing.T) {
-	c := integrationConnection(t, "queue")
-	if c != nil {
-		defer c.Close()
-
-		channel, err := c.Channel()
-		if err != nil {
-			t.Fatalf("create channel: %s", err)
-		}
-		t.Logf("create channel OK")
-
-		exchangeName := "test-basic-ops-exchange"
-		queueName := "test-basic-ops-queue"
-
-		deleteQueueFirstOptions := []bool{true, false}
-		for _, deleteQueueFirst := range deleteQueueFirstOptions {
-
-			if err := channel.ExchangeDeclare(
-				exchangeName, // name
-				"direct",     // type
-				true,         // duration (note: is durable)
-				false,        // auto-delete
-				false,        // internal
-				false,        // nowait
-				nil,          // args
-			); err != nil {
-				t.Fatalf("declare exchange: %s", err)
-			}
-			t.Logf("declare exchange OK")
-
-			if _, err := channel.QueueDeclare(
-				queueName, // name
-				true,      // duration (note: durable)
-				false,     // auto-delete
-				false,     // exclusive
-				false,     // noWait
-				nil,       // arguments
-			); err != nil {
-				t.Fatalf("queue declare: %s", err)
-			}
-			t.Logf("declare queue OK")
-
-			if err := channel.QueueBind(
-				queueName,    // name
-				"",           // routingKey
-				exchangeName, // sourceExchange
-				false,        // noWait
-				nil,          // arguments
-			); err != nil {
-				t.Fatalf("queue bind: %s", err)
-			}
-			t.Logf("queue bind OK")
-
-			if deleteQueueFirst {
-				if _, err := channel.QueueDelete(
-					queueName, // name
-					false,     // ifUnused (false=be aggressive)
-					false,     // ifEmpty (false=be aggressive)
-					false,     // noWait
-				); err != nil {
-					t.Fatalf("delete queue (first): %s", err)
-				}
-				t.Logf("delete queue (first) OK")
-
-				if err := channel.ExchangeDelete(exchangeName, false, false); err != nil {
-					t.Fatalf("delete exchange (after delete queue): %s", err)
-				}
-				t.Logf("delete exchange (after delete queue) OK")
-
-			} else { // deleteExchangeFirst
-				if err := channel.ExchangeDelete(exchangeName, false, false); err != nil {
-					t.Fatalf("delete exchange (first): %s", err)
-				}
-				t.Logf("delete exchange (first) OK")
-
-				if _, err := channel.QueueInspect(queueName); err != nil {
-					t.Fatalf("inspect queue state after deleting exchange: %s", err)
-				}
-				t.Logf("queue properly remains after exchange is deleted")
-
-				if _, err := channel.QueueDelete(
-					queueName,
-					false, // ifUnused
-					false, // ifEmpty
-					false, // noWait
-				); err != nil {
-					t.Fatalf("delete queue (after delete exchange): %s", err)
-				}
-				t.Logf("delete queue (after delete exchange) OK")
-			}
-		}
-
-		if err := channel.Close(); err != nil {
-			t.Fatalf("close channel: %s", err)
-		}
-		t.Logf("close channel OK")
-	}
-}
-
-func TestIntegrationConnectionNegotiatesMaxChannels(t *testing.T) {
-	config := Config{ChannelMax: 0}
-
-	c, err := DialConfig(integrationURLFromEnv(), config)
-	if err != nil {
-		t.Errorf("expected to dial with config %+v integration server: %s", config, err)
-	}
-	defer c.Close()
-
-	if want, got := defaultChannelMax, c.Config.ChannelMax; want != got {
-		t.Fatalf("expected connection to negotiate uint16 (%d) channels, got: %d", want, got)
-	}
-}
-
-func TestIntegrationConnectionNegotiatesClientMaxChannels(t *testing.T) {
-	config := Config{ChannelMax: 16}
-
-	c, err := DialConfig(integrationURLFromEnv(), config)
-	if err != nil {
-		t.Errorf("expected to dial with config %+v integration server: %s", config, err)
-	}
-	defer c.Close()
-
-	if want, got := config.ChannelMax, c.Config.ChannelMax; want != got {
-		t.Fatalf("expected client specified channel limit after handshake %d, got: %d", want, got)
-	}
-}
-
-func TestIntegrationChannelIDsExhausted(t *testing.T) {
-	config := Config{ChannelMax: 16}
-
-	c, err := DialConfig(integrationURLFromEnv(), config)
-	if err != nil {
-		t.Errorf("expected to dial with config %+v integration server: %s", config, err)
-	}
-	defer c.Close()
-
-	for i := 1; i <= c.Config.ChannelMax; i++ {
-		if _, err := c.Channel(); err != nil {
-			t.Fatalf("expected allocating all channel ids to succed, failed on %d with %v", i, err)
-		}
-	}
-
-	if _, err := c.Channel(); err != ErrChannelMax {
-		t.Fatalf("expected allocating all channels to produce the client side error %#v, got: %#v", ErrChannelMax, err)
-	}
-}
-
-func TestIntegrationChannelClosing(t *testing.T) {
-	c := integrationConnection(t, "closings")
-	if c != nil {
-		defer c.Close()
-
-		// This function is run on every channel after it is successfully
-		// opened. It can do something to verify something. It should be
-		// quick; many channels may be opened!
-		f := func(t *testing.T, c *Channel) {
-			return
-		}
-
-		// open and close
-		channel, err := c.Channel()
-		if err != nil {
-			t.Fatalf("basic create channel: %s", err)
-		}
-		t.Logf("basic create channel OK")
-
-		if err := channel.Close(); err != nil {
-			t.Fatalf("basic close channel: %s", err)
-		}
-		t.Logf("basic close channel OK")
-
-		// deferred close
-		signal := make(chan bool)
-		go func() {
-			channel, err := c.Channel()
-			if err != nil {
-				t.Fatalf("second create channel: %s", err)
-			}
-			t.Logf("second create channel OK")
-
-			<-signal // a bit of synchronization
-			f(t, channel)
-
-			defer func() {
-				if err := channel.Close(); err != nil {
-					t.Fatalf("deferred close channel: %s", err)
-				}
-				t.Logf("deferred close channel OK")
-				signal <- true
-			}()
-		}()
-		signal <- true
-		select {
-		case <-signal:
-			t.Logf("(got close signal OK)")
-			break
-		case <-time.After(250 * time.Millisecond):
-			t.Fatalf("deferred close: timeout")
-		}
-
-		// multiple channels
-		for _, n := range []int{2, 4, 8, 16, 32, 64, 128, 256} {
-			channels := make([]*Channel, n)
-			for i := 0; i < n; i++ {
-				var err error
-				if channels[i], err = c.Channel(); err != nil {
-					t.Fatalf("create channel %d/%d: %s", i+1, n, err)
-				}
-			}
-			f(t, channel)
-			for i, channel := range channels {
-				if err := channel.Close(); err != nil {
-					t.Fatalf("close channel %d/%d: %s", i+1, n, err)
-				}
-			}
-			t.Logf("created/closed %d channels OK", n)
-		}
-
-	}
-}
-
-func TestIntegrationMeaningfulChannelErrors(t *testing.T) {
-	c := integrationConnection(t, "pub")
-	if c != nil {
-		defer c.Close()
-
-		ch, err := c.Channel()
-		if err != nil {
-			t.Fatalf("Could not create channel")
-		}
-
-		queue := "test.integration.channel.error"
-
-		_, err = ch.QueueDeclare(queue, false, true, false, false, nil)
-		if err != nil {
-			t.Fatalf("Could not declare")
-		}
-
-		_, err = ch.QueueDeclare(queue, true, false, false, false, nil)
-		if err == nil {
-			t.Fatalf("Expected error, got nil")
-		}
-
-		e, ok := err.(*Error)
-		if !ok {
-			t.Fatalf("Expected type Error response, got %T", err)
-		}
-
-		if e.Code != PreconditionFailed {
-			t.Fatalf("Expected PreconditionFailed, got: %+v", e)
-		}
-
-		_, err = ch.QueueDeclare(queue, false, true, false, false, nil)
-		if err != ErrClosed {
-			t.Fatalf("Expected channel to be closed, got: %T", err)
-		}
-	}
-}
-
-// https://github.com/streadway/amqp/issues/6
-func TestIntegrationNonBlockingClose(t *testing.T) {
-	c := integrationConnection(t, "#6")
-	if c != nil {
-		defer c.Close()
-
-		ch, err := c.Channel()
-		if err != nil {
-			t.Fatalf("Could not create channel")
-		}
-
-		queue := "test.integration.blocking.close"
-
-		_, err = ch.QueueDeclare(queue, false, true, false, false, nil)
-		if err != nil {
-			t.Fatalf("Could not declare")
-		}
-
-		msgs, err := ch.Consume(queue, "", false, false, false, false, nil)
-		if err != nil {
-			t.Fatalf("Could not consume")
-		}
-
-		// Simulate a consumer
-		go func() {
-			for _ = range msgs {
-				t.Logf("Oh my, received message on an empty queue")
-			}
-		}()
-
-		succeed := make(chan bool)
-
-		go func() {
-			if err = ch.Close(); err != nil {
-				t.Fatalf("Close produced an error when it shouldn't")
-			}
-			succeed <- true
-		}()
-
-		select {
-		case <-succeed:
-			break
-		case <-time.After(1 * time.Second):
-			t.Fatalf("Close timed out after 1s")
-		}
-	}
-}
-
-func TestIntegrationPublishConsume(t *testing.T) {
-	queue := "test.integration.publish.consume"
-
-	c1 := integrationConnection(t, "pub")
-	c2 := integrationConnection(t, "sub")
-
-	if c1 != nil && c2 != nil {
-		defer c1.Close()
-		defer c2.Close()
-
-		pub, _ := c1.Channel()
-		sub, _ := c2.Channel()
-
-		pub.QueueDeclare(queue, false, true, false, false, nil)
-		sub.QueueDeclare(queue, false, true, false, false, nil)
-		defer pub.QueueDelete(queue, false, false, false)
-
-		messages, _ := sub.Consume(queue, "", false, false, false, false, nil)
-
-		pub.Publish("", queue, false, false, Publishing{Body: []byte("pub 1")})
-		pub.Publish("", queue, false, false, Publishing{Body: []byte("pub 2")})
-		pub.Publish("", queue, false, false, Publishing{Body: []byte("pub 3")})
-
-		assertConsumeBody(t, messages, []byte("pub 1"))
-		assertConsumeBody(t, messages, []byte("pub 2"))
-		assertConsumeBody(t, messages, []byte("pub 3"))
-	}
-}
-
-func TestIntegrationConsumeFlow(t *testing.T) {
-	queue := "test.integration.consumer-flow"
-
-	c1 := integrationConnection(t, "pub-flow")
-	c2 := integrationConnection(t, "sub-flow")
-
-	if c1 != nil && c2 != nil {
-		defer c1.Close()
-		defer c2.Close()
-
-		pub, _ := c1.Channel()
-		sub, _ := c2.Channel()
-
-		pub.QueueDeclare(queue, false, true, false, false, nil)
-		sub.QueueDeclare(queue, false, true, false, false, nil)
-		defer pub.QueueDelete(queue, false, false, false)
-
-		sub.Qos(1, 0, false)
-
-		messages, _ := sub.Consume(queue, "", false, false, false, false, nil)
-
-		pub.Publish("", queue, false, false, Publishing{Body: []byte("pub 1")})
-		pub.Publish("", queue, false, false, Publishing{Body: []byte("pub 2")})
-
-		msg := assertConsumeBody(t, messages, []byte("pub 1"))
-
-		if err := sub.Flow(false); err.(*Error).Code == NotImplemented {
-			t.Log("flow control is not supported on this version of rabbitmq")
-			return
-		}
-
-		msg.Ack(false)
-
-		select {
-		case <-messages:
-			t.Fatalf("message was delivered when flow was not active")
-		default:
-		}
-
-		sub.Flow(true)
-
-		msg = assertConsumeBody(t, messages, []byte("pub 2"))
-		msg.Ack(false)
-	}
-}
-
-func TestIntegrationRecoverNotImplemented(t *testing.T) {
-	queue := "test.recover"
-
-	if c, ch := integrationQueue(t, queue); c != nil {
-		if product, ok := c.Properties["product"]; ok && product.(string) == "RabbitMQ" {
-			defer c.Close()
-
-			err := ch.Recover(false)
-
-			if ex, ok := err.(*Error); !ok || ex.Code != 540 {
-				t.Fatalf("Expected NOT IMPLEMENTED got: %v", ex)
-			}
-		}
-	}
-}
-
-// This test is driven by a private API to simulate the server sending a channelFlow message
-func TestIntegrationPublishFlow(t *testing.T) {
-	// TODO - no idea how to test without affecting the server or mucking internal APIs
-	// i'd like to make sure the RW lock can be held by multiple publisher threads
-	// and that multiple channelFlow messages do not block the dispatch thread
-}
-
-func TestIntegrationConsumeCancel(t *testing.T) {
-	queue := "test.integration.consume-cancel"
-
-	c := integrationConnection(t, "pub")
-
-	if c != nil {
-		defer c.Close()
-
-		ch, _ := c.Channel()
-
-		ch.QueueDeclare(queue, false, true, false, false, nil)
-		defer ch.QueueDelete(queue, false, false, false)
-
-		messages, _ := ch.Consume(queue, "integration-tag", false, false, false, false, nil)
-
-		ch.Publish("", queue, false, false, Publishing{Body: []byte("1")})
-
-		assertConsumeBody(t, messages, []byte("1"))
-
-		err := ch.Cancel("integration-tag", false)
-		if err != nil {
-			t.Fatalf("error cancelling the consumer: %v", err)
-		}
-
-		ch.Publish("", queue, false, false, Publishing{Body: []byte("2")})
-
-		select {
-		case <-time.After(100 * time.Millisecond):
-			t.Fatalf("Timeout on Close")
-		case _, ok := <-messages:
-			if ok {
-				t.Fatalf("Extra message on consumer when consumer should have been closed")
-			}
-		}
-	}
-}
-
-func (c *Connection) Generate(r *rand.Rand, _ int) reflect.Value {
-	urlStr := os.Getenv("AMQP_URL")
-	if urlStr == "" {
-		return reflect.ValueOf(nil)
-	}
-
-	conn, err := Dial(urlStr)
-	if err != nil {
-		return reflect.ValueOf(nil)
-	}
-
-	return reflect.ValueOf(conn)
-}
-
-func (c Publishing) Generate(r *rand.Rand, _ int) reflect.Value {
-	var ok bool
-	var t reflect.Value
-
-	p := Publishing{}
-	//p.DeliveryMode = uint8(r.Intn(3))
-	//p.Priority = uint8(r.Intn(8))
-
-	if r.Intn(2) > 0 {
-		p.ContentType = "application/octet-stream"
-	}
-
-	if r.Intn(2) > 0 {
-		p.ContentEncoding = "gzip"
-	}
-
-	if r.Intn(2) > 0 {
-		p.CorrelationId = fmt.Sprintf("%d", r.Int())
-	}
-
-	if r.Intn(2) > 0 {
-		p.ReplyTo = fmt.Sprintf("%d", r.Int())
-	}
-
-	if r.Intn(2) > 0 {
-		p.MessageId = fmt.Sprintf("%d", r.Int())
-	}
-
-	if r.Intn(2) > 0 {
-		p.Type = fmt.Sprintf("%d", r.Int())
-	}
-
-	if r.Intn(2) > 0 {
-		p.AppId = fmt.Sprintf("%d", r.Int())
-	}
-
-	if r.Intn(2) > 0 {
-		p.Timestamp = time.Unix(r.Int63(), r.Int63())
-	}
-
-	if t, ok = quick.Value(reflect.TypeOf(p.Body), r); ok {
-		p.Body = t.Bytes()
-	}
-
-	return reflect.ValueOf(p)
-}
-
-func TestQuickPublishOnly(t *testing.T) {
-	if c := integrationConnection(t, "quick"); c != nil {
-		defer c.Close()
-		pub, err := c.Channel()
-		queue := "test-publish"
-
-		if _, err = pub.QueueDeclare(queue, false, true, false, false, nil); err != nil {
-			t.Errorf("Failed to declare: %s", err)
-			return
-		}
-
-		defer pub.QueueDelete(queue, false, false, false)
-
-		quick.Check(func(msg Publishing) bool {
-			return pub.Publish("", queue, false, false, msg) == nil
-		}, nil)
-	}
-}
-
-func TestPublishEmptyBody(t *testing.T) {
-	c := integrationConnection(t, "empty")
-	if c != nil {
-		defer c.Close()
-
-		ch, err := c.Channel()
-		if err != nil {
-			t.Errorf("Failed to create channel")
-			return
-		}
-
-		queue := "test-TestPublishEmptyBody"
-
-		if _, err := ch.QueueDeclare(queue, false, true, false, false, nil); err != nil {
-			t.Fatalf("Could not declare")
-		}
-
-		messages, err := ch.Consume(queue, "", false, false, false, false, nil)
-		if err != nil {
-			t.Fatalf("Could not consume")
-		}
-
-		err = ch.Publish("", queue, false, false, Publishing{})
-		if err != nil {
-			t.Fatalf("Could not publish")
-		}
-
-		select {
-		case msg := <-messages:
-			if len(msg.Body) != 0 {
-				t.Errorf("Received non empty body")
-			}
-		case <-time.After(200 * time.Millisecond):
-			t.Errorf("Timeout on receive")
-		}
-	}
-}
-
-func TestPublishEmptyBodyWithHeadersIssue67(t *testing.T) {
-	c := integrationConnection(t, "issue67")
-	if c != nil {
-		defer c.Close()
-
-		ch, err := c.Channel()
-		if err != nil {
-			t.Errorf("Failed to create channel")
-			return
-		}
-
-		queue := "test-TestPublishEmptyBodyWithHeaders"
-
-		if _, err := ch.QueueDeclare(queue, false, true, false, false, nil); err != nil {
-			t.Fatalf("Could not declare")
-		}
-
-		messages, err := ch.Consume(queue, "", false, false, false, false, nil)
-		if err != nil {
-			t.Fatalf("Could not consume")
-		}
-
-		headers := Table{
-			"ham": "spam",
-		}
-
-		err = ch.Publish("", queue, false, false, Publishing{Headers: headers})
-		if err != nil {
-			t.Fatalf("Could not publish")
-		}
-
-		select {
-		case msg := <-messages:
-			if msg.Headers["ham"] == nil {
-				t.Fatalf("Headers aren't sent")
-			}
-			if msg.Headers["ham"] != "spam" {
-				t.Fatalf("Headers are wrong")
-			}
-		case <-time.After(200 * time.Millisecond):
-			t.Errorf("Timeout on receive")
-		}
-	}
-}
-
-func TestQuickPublishConsumeOnly(t *testing.T) {
-	c1 := integrationConnection(t, "quick-pub")
-	c2 := integrationConnection(t, "quick-sub")
-
-	if c1 != nil && c2 != nil {
-		defer c1.Close()
-		defer c2.Close()
-
-		pub, err := c1.Channel()
-		sub, err := c2.Channel()
-
-		queue := "TestPublishConsumeOnly"
-
-		if _, err = pub.QueueDeclare(queue, false, true, false, false, nil); err != nil {
-			t.Errorf("Failed to declare: %s", err)
-			return
-		}
-
-		if _, err = sub.QueueDeclare(queue, false, true, false, false, nil); err != nil {
-			t.Errorf("Failed to declare: %s", err)
-			return
-		}
-
-		defer sub.QueueDelete(queue, false, false, false)
-
-		ch, err := sub.Consume(queue, "", false, false, false, false, nil)
-		if err != nil {
-			t.Errorf("Could not sub: %s", err)
-		}
-
-		quick.CheckEqual(
-			func(msg Publishing) []byte {
-				empty := Publishing{Body: msg.Body}
-				if pub.Publish("", queue, false, false, empty) != nil {
-					return []byte{'X'}
-				}
-				return msg.Body
-			},
-			func(msg Publishing) []byte {
-				out := <-ch
-				out.Ack(false)
-				return out.Body
-			},
-			nil)
-	}
-}
-
-func TestQuickPublishConsumeBigBody(t *testing.T) {
-	c1 := integrationConnection(t, "big-pub")
-	c2 := integrationConnection(t, "big-sub")
-
-	if c1 != nil && c2 != nil {
-		defer c1.Close()
-		defer c2.Close()
-
-		pub, err := c1.Channel()
-		sub, err := c2.Channel()
-
-		queue := "test-pubsub"
-
-		if _, err = sub.QueueDeclare(queue, false, true, false, false, nil); err != nil {
-			t.Errorf("Failed to declare: %s", err)
-			return
-		}
-
-		ch, err := sub.Consume(queue, "", false, false, false, false, nil)
-		if err != nil {
-			t.Errorf("Could not sub: %s", err)
-		}
-
-		fixture := Publishing{
-			Body: make([]byte, 1e4+1000),
-		}
-
-		if _, err = pub.QueueDeclare(queue, false, true, false, false, nil); err != nil {
-			t.Errorf("Failed to declare: %s", err)
-			return
-		}
-
-		err = pub.Publish("", queue, false, false, fixture)
-		if err != nil {
-			t.Errorf("Could not publish big body")
-		}
-
-		select {
-		case msg := <-ch:
-			if bytes.Compare(msg.Body, fixture.Body) != 0 {
-				t.Errorf("Consumed big body didn't match")
-			}
-		case <-time.After(200 * time.Millisecond):
-			t.Errorf("Timeout on receive")
-		}
-	}
-}
-
-func TestIntegrationGetOk(t *testing.T) {
-	if c := integrationConnection(t, "getok"); c != nil {
-		defer c.Close()
-
-		queue := "test.get-ok"
-		ch, _ := c.Channel()
-
-		ch.QueueDeclare(queue, false, true, false, false, nil)
-		ch.Publish("", queue, false, false, Publishing{Body: []byte("ok")})
-
-		msg, ok, err := ch.Get(queue, false)
-
-		if err != nil {
-			t.Fatalf("Failed get: %v", err)
-		}
-
-		if !ok {
-			t.Fatalf("Get on a queued message did not find the message")
-		}
-
-		if string(msg.Body) != "ok" {
-			t.Fatalf("Get did not get the correct message")
-		}
-	}
-}
-
-func TestIntegrationGetEmpty(t *testing.T) {
-	if c := integrationConnection(t, "getok"); c != nil {
-		defer c.Close()
-
-		queue := "test.get-ok"
-		ch, _ := c.Channel()
-
-		ch.QueueDeclare(queue, false, true, false, false, nil)
-
-		_, ok, err := ch.Get(queue, false)
-
-		if err != nil {
-			t.Fatalf("Failed get: %v", err)
-		}
-
-		if !ok {
-			t.Fatalf("Get on a queued message retrieved a message when it shouldn't have")
-		}
-	}
-}
-
-func TestIntegrationTxCommit(t *testing.T) {
-	if c := integrationConnection(t, "txcommit"); c != nil {
-		defer c.Close()
-
-		queue := "test.tx.commit"
-		ch, _ := c.Channel()
-
-		ch.QueueDeclare(queue, false, true, false, false, nil)
-
-		if err := ch.Tx(); err != nil {
-			t.Fatalf("tx.select failed")
-		}
-
-		ch.Publish("", queue, false, false, Publishing{Body: []byte("ok")})
-
-		if err := ch.TxCommit(); err != nil {
-			t.Fatalf("tx.commit failed")
-		}
-
-		msg, ok, err := ch.Get(queue, false)
-
-		if err != nil || !ok {
-			t.Fatalf("Failed get: %v", err)
-		}
-
-		if string(msg.Body) != "ok" {
-			t.Fatalf("Get did not get the correct message from the transaction")
-		}
-	}
-}
-
-func TestIntegrationTxRollback(t *testing.T) {
-	if c := integrationConnection(t, "txrollback"); c != nil {
-		defer c.Close()
-
-		queue := "test.tx.rollback"
-		ch, _ := c.Channel()
-
-		ch.QueueDeclare(queue, false, true, false, false, nil)
-
-		if err := ch.Tx(); err != nil {
-			t.Fatalf("tx.select failed")
-		}
-
-		ch.Publish("", queue, false, false, Publishing{Body: []byte("ok")})
-
-		if err := ch.TxRollback(); err != nil {
-			t.Fatalf("tx.rollback failed")
-		}
-
-		_, ok, err := ch.Get(queue, false)
-
-		if err != nil {
-			t.Fatalf("Failed get: %v", err)
-		}
-
-		if ok {
-			t.Fatalf("message was published when it should have been rolled back")
-		}
-	}
-}
-
-func TestIntegrationReturn(t *testing.T) {
-	if c, ch := integrationQueue(t, "return"); c != nil {
-		defer c.Close()
-
-		ret := make(chan Return, 1)
-
-		ch.NotifyReturn(ret)
-
-		// mandatory publish to an exchange without a binding should be returned
-		ch.Publish("", "return-without-binding", true, false, Publishing{Body: []byte("mandatory")})
-
-		select {
-		case res := <-ret:
-			if string(res.Body) != "mandatory" {
-				t.Fatalf("expected return of the same message")
-			}
-
-			if res.ReplyCode != NoRoute {
-				t.Fatalf("expected no consumers reply code on the Return result, got: %v", res.ReplyCode)
-			}
-
-		case <-time.After(200 * time.Millisecond):
-			t.Fatalf("no return was received within 200ms")
-		}
-	}
-}
-
-func TestIntegrationCancel(t *testing.T) {
-	queue := "cancel"
-	consumerTag := "test.cancel"
-
-	if c, ch := integrationQueue(t, queue); c != nil {
-		defer c.Close()
-
-		cancels := ch.NotifyCancel(make(chan string, 1))
-
-		go func() {
-			if _, err := ch.Consume(queue, consumerTag, false, false, false, false, nil); err != nil {
-				t.Fatalf("cannot consume from %q to test NotifyCancel: %v", queue, err)
-			}
-			if _, err := ch.QueueDelete(queue, false, false, false); err != nil {
-				t.Fatalf("cannot delete integration queue: %v", err)
-			}
-		}()
-
-		select {
-		case tag := <-cancels:
-			if want, got := consumerTag, tag; want != got {
-				t.Fatalf("expected to be notified of deleted queue with consumer tag, got: %q", got)
-			}
-		case <-time.After(200 * time.Millisecond):
-			t.Fatalf("expected to be notified of deleted queue with 200ms")
-		}
-	}
-}
-
-func TestIntegrationConfirm(t *testing.T) {
-	if c, ch := integrationQueue(t, "confirm"); c != nil {
-		defer c.Close()
-
-		confirms := ch.NotifyPublish(make(chan Confirmation, 1))
-
-		if err := ch.Confirm(false); err != nil {
-			t.Fatalf("could not confirm")
-		}
-
-		ch.Publish("", "confirm", false, false, Publishing{Body: []byte("confirm")})
-
-		select {
-		case confirmed := <-confirms:
-			if confirmed.DeliveryTag != 1 {
-				t.Fatalf("expected ack starting with delivery tag of 1")
-			}
-		case <-time.After(200 * time.Millisecond):
-			t.Fatalf("no ack was received within 200ms")
-		}
-	}
-}
-
-// https://github.com/streadway/amqp/issues/61
-func TestRoundTripAllFieldValueTypes61(t *testing.T) {
-	if conn := integrationConnection(t, "issue61"); conn != nil {
-		defer conn.Close()
-		timestamp := time.Unix(100000000, 0)
-
-		headers := Table{
-			"A": []interface{}{
-				[]interface{}{"nested array", int32(3)},
-				Decimal{2, 1},
-				Table{"S": "nested table in array"},
-				int32(2 << 20),
-				string("array string"),
-				timestamp,
-				nil,
-				byte(2),
-				float64(2.64),
-				float32(2.32),
-				int64(2 << 60),
-				int16(2 << 10),
-				bool(true),
-				[]byte{'b', '2'},
-			},
-			"D": Decimal{1, 1},
-			"F": Table{"S": "nested table in table"},
-			"I": int32(1 << 20),
-			"S": string("string"),
-			"T": timestamp,
-			"V": nil,
-			"b": byte(1),
-			"d": float64(1.64),
-			"f": float32(1.32),
-			"l": int64(1 << 60),
-			"s": int16(1 << 10),
-			"t": bool(true),
-			"x": []byte{'b', '1'},
-		}
-
-		queue := "test.issue61-roundtrip"
-		ch, _ := conn.Channel()
-
-		if _, err := ch.QueueDeclare(queue, false, true, false, false, nil); err != nil {
-			t.Fatalf("Could not declare")
-		}
-
-		msgs, err := ch.Consume(queue, "", false, false, false, false, nil)
-		if err != nil {
-			t.Fatalf("Could not consume")
-		}
-
-		err = ch.Publish("", queue, false, false, Publishing{Body: []byte("ignored"), Headers: headers})
-		if err != nil {
-			t.Fatalf("Could not publish: %v", err)
-		}
-
-		msg, ok := <-msgs
-
-		if !ok {
-			t.Fatalf("Channel closed prematurely likely due to publish exception")
-		}
-
-		for k, v := range headers {
-			if !reflect.DeepEqual(v, msg.Headers[k]) {
-				t.Errorf("Round trip header not the same for key %q: expected: %#v, got %#v", k, v, msg.Headers[k])
-			}
-		}
-	}
-}
-
-// Declares a queue with the x-message-ttl extension to exercise integer
-// serialization.
-//
-// Relates to https://github.com/streadway/amqp/issues/60
-//
-func TestDeclareArgsXMessageTTL(t *testing.T) {
-	if conn := integrationConnection(t, "declareTTL"); conn != nil {
-		defer conn.Close()
-
-		ch, _ := conn.Channel()
-		args := Table{"x-message-ttl": int32(9000000)}
-
-		// should not drop the connection
-		if _, err := ch.QueueDeclare("declareWithTTL", false, true, false, false, args); err != nil {
-			t.Fatalf("cannot declare with TTL: got: %v", err)
-		}
-	}
-}
-
-// Sets up the topology where rejected messages will be forwarded
-// to a fanout exchange, with a single queue bound.
-//
-// Relates to https://github.com/streadway/amqp/issues/56
-//
-func TestDeclareArgsRejectToDeadLetterQueue(t *testing.T) {
-	if conn := integrationConnection(t, "declareArgs"); conn != nil {
-		defer conn.Close()
-
-		ex, q := "declareArgs", "declareArgs-deliveries"
-		dlex, dlq := ex+"-dead-letter", q+"-dead-letter"
-
-		ch, _ := conn.Channel()
-
-		if err := ch.ExchangeDeclare(ex, "fanout", false, true, false, false, nil); err != nil {
-			t.Fatalf("cannot declare %v: got: %v", ex, err)
-		}
-
-		if err := ch.ExchangeDeclare(dlex, "fanout", false, true, false, false, nil); err != nil {
-			t.Fatalf("cannot declare %v: got: %v", dlex, err)
-		}
-
-		if _, err := ch.QueueDeclare(dlq, false, true, false, false, nil); err != nil {
-			t.Fatalf("cannot declare %v: got: %v", dlq, err)
-		}
-
-		if err := ch.QueueBind(dlq, "#", dlex, false, nil); err != nil {
-			t.Fatalf("cannot bind %v to %v: got: %v", dlq, dlex, err)
-		}
-
-		if _, err := ch.QueueDeclare(q, false, true, false, false, Table{
-			"x-dead-letter-exchange": dlex,
-		}); err != nil {
-			t.Fatalf("cannot declare %v with dlq %v: got: %v", q, dlex, err)
-		}
-
-		if err := ch.QueueBind(q, "#", ex, false, nil); err != nil {
-			t.Fatalf("cannot bind %v: got: %v", ex, err)
-		}
-
-		fails, err := ch.Consume(q, "", false, false, false, false, nil)
-		if err != nil {
-			t.Fatalf("cannot consume %v: got: %v", q, err)
-		}
-
-		// Reject everything consumed
-		go func() {
-			for d := range fails {
-				d.Reject(false)
-			}
-		}()
-
-		// Publish the 'poison'
-		if err := ch.Publish(ex, q, true, false, Publishing{Body: []byte("ignored")}); err != nil {
-			t.Fatalf("publishing failed")
-		}
-
-		// spin-get until message arrives on the dead-letter queue with a
-		// synchronous parse to exercise the array field (x-death) set by the
-		// server relating to issue-56
-		for i := 0; i < 10; i++ {
-			d, got, err := ch.Get(dlq, false)
-			if !got && err == nil {
-				continue
-			} else if err != nil {
-				t.Fatalf("expected success in parsing reject, got: %v", err)
-			} else {
-				// pass if we've parsed an array
-				if v, ok := d.Headers["x-death"]; ok {
-					if _, ok := v.([]interface{}); ok {
-						return
-					}
-				}
-				t.Fatalf("array field x-death expected in the headers, got: %v (%T)", d.Headers, d.Headers["x-death"])
-			}
-		}
-
-		t.Fatalf("expectd dead-letter after 10 get attempts")
-	}
-}
-
-// https://github.com/streadway/amqp/issues/48
-func TestDeadlockConsumerIssue48(t *testing.T) {
-	if conn := integrationConnection(t, "issue48"); conn != nil {
-		defer conn.Close()
-
-		deadline := make(chan bool)
-		go func() {
-			select {
-			case <-time.After(5 * time.Second):
-				panic("expected to receive 2 deliveries while in an RPC, got a deadlock")
-			case <-deadline:
-				// pass
-			}
-		}()
-
-		ch, err := conn.Channel()
-		if err != nil {
-			t.Fatalf("got error on channel.open: %v", err)
-		}
-
-		queue := "test-issue48"
-
-		if _, err := ch.QueueDeclare(queue, false, true, false, false, nil); err != nil {
-			t.Fatalf("expected to declare a queue: %v", err)
-		}
-
-		if err := ch.Confirm(false); err != nil {
-			t.Fatalf("got error on confirm: %v", err)
-		}
-
-		confirms := ch.NotifyPublish(make(chan Confirmation, 2))
-
-		for i := 0; i < cap(confirms); i++ {
-			// Fill the queue with some new or remaining publishings
-			ch.Publish("", queue, false, false, Publishing{Body: []byte("")})
-		}
-
-		for i := 0; i < cap(confirms); i++ {
-			// Wait for them to land on the queue so they'll be delivered on consume
-			<-confirms
-		}
-
-		// Consuming should send them all on the wire
-		msgs, err := ch.Consume(queue, "", false, false, false, false, nil)
-		if err != nil {
-			t.Fatalf("got error on consume: %v", err)
-		}
-
-		// We pop one off the chan, the other is on the wire
-		<-msgs
-
-		// Opening a new channel (any RPC) while another delivery is on the wire
-		if _, err := conn.Channel(); err != nil {
-			t.Fatalf("got error on consume: %v", err)
-		}
-
-		// We pop the next off the chan
-		<-msgs
-
-		deadline <- true
-	}
-}
-
-// https://github.com/streadway/amqp/issues/46
-func TestRepeatedChannelExceptionWithPublishAndMaxProcsIssue46(t *testing.T) {
-	conn := integrationConnection(t, "issue46")
-	if conn != nil {
-		for i := 0; i < 100; i++ {
-			ch, err := conn.Channel()
-			if err != nil {
-				t.Fatalf("expected error only on publish, got error on channel.open: %v", err)
-			}
-
-			for j := 0; j < 10; j++ {
-				err = ch.Publish("not-existing-exchange", "some-key", false, false, Publishing{Body: []byte("some-data")})
-				if err, ok := err.(Error); ok {
-					if err.Code != 504 {
-						t.Fatalf("expected channel only exception, got: %v", err)
-					}
-				}
-			}
-		}
-	}
-}
-
-// https://github.com/streadway/amqp/issues/43
-func TestChannelExceptionWithCloseIssue43(t *testing.T) {
-	conn := integrationConnection(t, "issue43")
-	if conn != nil {
-		go func() {
-			for err := range conn.NotifyClose(make(chan *Error)) {
-				t.Log(err.Error())
-			}
-		}()
-
-		c1, err := conn.Channel()
-		if err != nil {
-			panic(err)
-		}
-
-		go func() {
-			for err := range c1.NotifyClose(make(chan *Error)) {
-				t.Log("Channel1 Close: " + err.Error())
-			}
-		}()
-
-		c2, err := conn.Channel()
-		if err != nil {
-			panic(err)
-		}
-
-		go func() {
-			for err := range c2.NotifyClose(make(chan *Error)) {
-				t.Log("Channel2 Close: " + err.Error())
-			}
-		}()
-
-		// Cause an asynchronous channel exception causing the server
-		// to send a "channel.close" method either before or after the next
-		// asynchronous method.
-		err = c1.Publish("nonexisting-exchange", "", false, false, Publishing{})
-		if err != nil {
-			panic(err)
-		}
-
-		// Receive or send the channel close method, the channel shuts down
-		// but this expects a channel.close-ok to be received.
-		c1.Close()
-
-		// This ensures that the 2nd channel is unaffected by the channel exception
-		// on channel 1.
-		err = c2.ExchangeDeclare("test-channel-still-exists", "direct", false, true, false, false, nil)
-		if err != nil {
-			panic(err)
-		}
-	}
-}
-
-// https://github.com/streadway/amqp/issues/7
-func TestCorruptedMessageIssue7(t *testing.T) {
-	messageCount := 1024
-
-	c1 := integrationConnection(t, "")
-	c2 := integrationConnection(t, "")
-
-	if c1 != nil && c2 != nil {
-		defer c1.Close()
-		defer c2.Close()
-
-		pub, err := c1.Channel()
-		if err != nil {
-			t.Fatalf("Cannot create Channel")
-		}
-
-		sub, err := c2.Channel()
-		if err != nil {
-			t.Fatalf("Cannot create Channel")
-		}
-
-		queue := "test-corrupted-message-regression"
-
-		if _, err := pub.QueueDeclare(queue, false, true, false, false, nil); err != nil {
-			t.Fatalf("Cannot declare")
-		}
-
-		if _, err := sub.QueueDeclare(queue, false, true, false, false, nil); err != nil {
-			t.Fatalf("Cannot declare")
-		}
-
-		msgs, err := sub.Consume(queue, "", false, false, false, false, nil)
-		if err != nil {
-			t.Fatalf("Cannot consume")
-		}
-
-		for i := 0; i < messageCount; i++ {
-			err := pub.Publish("", queue, false, false, Publishing{
-				Body: generateCrc32Random(7 * i),
-			})
-
-			if err != nil {
-				t.Fatalf("Failed to publish")
-			}
-		}
-
-		for i := 0; i < messageCount; i++ {
-			select {
-			case msg := <-msgs:
-				assertMessageCrc32(t, msg.Body, fmt.Sprintf("missed match at %d", i))
-			case <-time.After(200 * time.Millisecond):
-				t.Fatalf("Timeout on recv")
-			}
-		}
-	}
-}
-
-// https://github.com/streadway/amqp/issues/136
-func TestChannelCounterShouldNotPanicIssue136(t *testing.T) {
-	if c := integrationConnection(t, "issue136"); c != nil {
-		defer c.Close()
-		var wg sync.WaitGroup
-
-		// exceeds 65535 channels
-		for i := 0; i < 8; i++ {
-			wg.Add(1)
-			go func(i int) {
-				for j := 0; j < 10000; j++ {
-					ch, err := c.Channel()
-					if err != nil {
-						t.Fatalf("failed to create channel %d:%d, got: %v", i, j, err)
-					}
-					if err := ch.Close(); err != nil {
-						t.Fatalf("failed to close channel %d:%d, got: %v", i, j, err)
-					}
-				}
-				wg.Done()
-			}(i)
-		}
-		wg.Wait()
-	}
-}
-
-func TestExchangeDeclarePrecondition(t *testing.T) {
-	c1 := integrationConnection(t, "exchange-double-declare")
-	c2 := integrationConnection(t, "exchange-double-declare-cleanup")
-	if c1 != nil && c2 != nil {
-		defer c1.Close()
-		defer c2.Close()
-
-		ch, err := c1.Channel()
-		if err != nil {
-			t.Fatalf("Create channel")
-		}
-
-		exchange := "test-mismatched-redeclare"
-
-		err = ch.ExchangeDeclare(
-			exchange,
-			"direct", // exchangeType
-			false,    // durable
-			true,     // auto-delete
-			false,    // internal
-			false,    // noWait
-			nil,      // arguments
-		)
-		if err != nil {
-			t.Fatalf("Could not initially declare exchange")
-		}
-
-		err = ch.ExchangeDeclare(
-			exchange,
-			"direct",
-			true, // different durability
-			true,
-			false,
-			false,
-			nil,
-		)
-
-		if err == nil {
-			t.Fatalf("Expected to fail a redeclare with different durability, didn't receive an error")
-		}
-
-		if err, ok := err.(Error); ok {
-			if err.Code != PreconditionFailed {
-				t.Fatalf("Expected precondition error")
-			}
-			if !err.Recover {
-				t.Fatalf("Expected to be able to recover")
-			}
-		}
-
-		ch2, _ := c2.Channel()
-		if err = ch2.ExchangeDelete(exchange, false, false); err != nil {
-			t.Fatalf("Could not delete exchange: %v", err)
-		}
-	}
-}
-
-func TestRabbitMQQueueTTLGet(t *testing.T) {
-	if c := integrationRabbitMQ(t, "ttl"); c != nil {
-		defer c.Close()
-
-		queue := "test.rabbitmq-message-ttl"
-		channel, err := c.Channel()
-		if err != nil {
-			t.Fatalf("channel: %v", err)
-		}
-
-		if _, err = channel.QueueDeclare(
-			queue,
-			false,
-			true,
-			false,
-			false,
-			Table{"x-message-ttl": int32(100)}, // in ms
-		); err != nil {
-			t.Fatalf("queue declare: %s", err)
-		}
-
-		channel.Publish("", queue, false, false, Publishing{Body: []byte("ttl")})
-
-		time.Sleep(200 * time.Millisecond)
-
-		_, ok, err := channel.Get(queue, false)
-
-		if ok {
-			t.Fatalf("Expected the message to expire in 100ms, it didn't expire after 200ms")
-		}
-
-		if err != nil {
-			t.Fatalf("Failed to get on ttl queue")
-		}
-	}
-}
-
-func TestRabbitMQQueueNackMultipleRequeue(t *testing.T) {
-	if c := integrationRabbitMQ(t, "nack"); c != nil {
-		defer c.Close()
-
-		if c.isCapable("basic.nack") {
-			queue := "test.rabbitmq-basic-nack"
-			channel, err := c.Channel()
-			if err != nil {
-				t.Fatalf("channel: %v", err)
-			}
-
-			if _, err = channel.QueueDeclare(queue, false, true, false, false, nil); err != nil {
-				t.Fatalf("queue declare: %s", err)
-			}
-
-			channel.Publish("", queue, false, false, Publishing{Body: []byte("1")})
-			channel.Publish("", queue, false, false, Publishing{Body: []byte("2")})
-
-			m1, ok, err := channel.Get(queue, false)
-			if !ok || err != nil || m1.Body[0] != '1' {
-				t.Fatalf("could not get message %v", m1)
-			}
-
-			m2, ok, err := channel.Get(queue, false)
-			if !ok || err != nil || m2.Body[0] != '2' {
-				t.Fatalf("could not get message %v", m2)
-			}
-
-			m2.Nack(true, true)
-
-			m1, ok, err = channel.Get(queue, false)
-			if !ok || err != nil || m1.Body[0] != '1' {
-				t.Fatalf("could not get message %v", m1)
-			}
-
-			m2, ok, err = channel.Get(queue, false)
-			if !ok || err != nil || m2.Body[0] != '2' {
-				t.Fatalf("could not get message %v", m2)
-			}
-		}
-	}
-}
-
-/*
- * Support for integration tests
- */
-
-func integrationURLFromEnv() string {
-	url := os.Getenv("AMQP_URL")
-	if url == "" {
-		url = "amqp://"
-	}
-	return url
-}
-
-func loggedConnection(t *testing.T, conn *Connection, name string) *Connection {
-	if name != "" {
-		conn.conn = &logIO{t, name, conn.conn}
-	}
-	return conn
-}
-
-// Returns a conneciton to the AMQP if the AMQP_URL environment
-// variable is set and a connnection can be established.
-func integrationConnection(t *testing.T, name string) *Connection {
-	conn, err := Dial(integrationURLFromEnv())
-	if err != nil {
-		t.Errorf("dial integration server: %s", err)
-		return nil
-	}
-	return loggedConnection(t, conn, name)
-}
-
-// Returns a connection, channel and delcares a queue when the AMQP_URL is in the environment
-func integrationQueue(t *testing.T, name string) (*Connection, *Channel) {
-	if conn := integrationConnection(t, name); conn != nil {
-		if channel, err := conn.Channel(); err == nil {
-			if _, err = channel.QueueDeclare(name, false, true, false, false, nil); err == nil {
-				return conn, channel
-			}
-		}
-	}
-	return nil, nil
-}
-
-// Delegates to integrationConnection and only returns a connection if the
-// product is RabbitMQ
-func integrationRabbitMQ(t *testing.T, name string) *Connection {
-	if conn := integrationConnection(t, "connect"); conn != nil {
-		if server, ok := conn.Properties["product"]; ok && server == "RabbitMQ" {
-			return conn
-		}
-	}
-
-	return nil
-}
-
-func assertConsumeBody(t *testing.T, messages <-chan Delivery, want []byte) (msg *Delivery) {
-	select {
-	case got := <-messages:
-		if bytes.Compare(want, got.Body) != 0 {
-			t.Fatalf("Message body does not match want: %v, got: %v, for: %+v", want, got.Body, got)
-		}
-		msg = &got
-	case <-time.After(200 * time.Millisecond):
-		t.Fatalf("Timeout waiting for %v", want)
-	}
-
-	return msg
-}
-
-// Pulls out the CRC and verifies the remaining content against the CRC
-func assertMessageCrc32(t *testing.T, msg []byte, assert string) {
-	size := binary.BigEndian.Uint32(msg[:4])
-
-	crc := crc32.NewIEEE()
-	crc.Write(msg[8:])
-
-	if binary.BigEndian.Uint32(msg[4:8]) != crc.Sum32() {
-		t.Fatalf("Message does not match CRC: %s", assert)
-	}
-
-	if int(size) != len(msg)-8 {
-		t.Fatalf("Message does not match size, should=%d, is=%d: %s", size, len(msg)-8, assert)
-	}
-}
-
-// Creates a random body size with a leading 32-bit CRC in network byte order
-// that verifies the remaining slice
-func generateCrc32Random(size int) []byte {
-	msg := make([]byte, size+8)
-	if _, err := io.ReadFull(devrand.Reader, msg); err != nil {
-		panic(err)
-	}
-
-	crc := crc32.NewIEEE()
-	crc.Write(msg[8:])
-
-	binary.BigEndian.PutUint32(msg[0:4], uint32(size))
-	binary.BigEndian.PutUint32(msg[4:8], crc.Sum32())
-
-	return msg
-}
diff --git a/Godeps/_workspace/src/github.com/streadway/amqp/read.go b/Godeps/_workspace/src/github.com/streadway/amqp/read.go
deleted file mode 100644
index 74e90ef8f..000000000
--- a/Godeps/_workspace/src/github.com/streadway/amqp/read.go
+++ /dev/null
@@ -1,447 +0,0 @@
-// Copyright (c) 2012, Sean Treadway, SoundCloud Ltd.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-// Source code and contact info at http://github.com/streadway/amqp
-
-package amqp
-
-import (
-	"bytes"
-	"encoding/binary"
-	"errors"
-	"io"
-	"time"
-)
-
-/*
-Reads a frame from an input stream and returns an interface that can be cast into
-one of the following:
-
-   methodFrame
-   PropertiesFrame
-   bodyFrame
-   heartbeatFrame
-
-2.3.5  frame Details
-
-All frames consist of a header (7 octets), a payload of arbitrary size, and a
-'frame-end' octet that detects malformed frames:
-
-  0      1         3             7                  size+7 size+8
-  +------+---------+-------------+  +------------+  +-----------+
-  | type | channel |     size    |  |  payload   |  | frame-end |
-  +------+---------+-------------+  +------------+  +-----------+
-   octet   short         long         size octets       octet
-
-To read a frame, we:
-  1. Read the header and check the frame type and channel.
-	2. Depending on the frame type, we read the payload and process it.
-  3. Read the frame end octet.
-
-In realistic implementations where performance is a concern, we would use
-“read-ahead buffering” or
-
-“gathering reads” to avoid doing three separate system calls to read a frame.
-*/
-func (me *reader) ReadFrame() (frame frame, err error) {
-	var scratch [7]byte
-
-	if _, err = io.ReadFull(me.r, scratch[:7]); err != nil {
-		return
-	}
-
-	typ := uint8(scratch[0])
-	channel := binary.BigEndian.Uint16(scratch[1:3])
-	size := binary.BigEndian.Uint32(scratch[3:7])
-
-	switch typ {
-	case frameMethod:
-		if frame, err = me.parseMethodFrame(channel, size); err != nil {
-			return
-		}
-
-	case frameHeader:
-		if frame, err = me.parseHeaderFrame(channel, size); err != nil {
-			return
-		}
-
-	case frameBody:
-		if frame, err = me.parseBodyFrame(channel, size); err != nil {
-			return nil, err
-		}
-
-	case frameHeartbeat:
-		if frame, err = me.parseHeartbeatFrame(channel, size); err != nil {
-			return
-		}
-
-	default:
-		return nil, ErrFrame
-	}
-
-	if _, err = io.ReadFull(me.r, scratch[:1]); err != nil {
-		return nil, err
-	}
-
-	if scratch[0] != frameEnd {
-		return nil, ErrFrame
-	}
-
-	return
-}
-
-func readShortstr(r io.Reader) (v string, err error) {
-	var length uint8
-	if err = binary.Read(r, binary.BigEndian, &length); err != nil {
-		return
-	}
-
-	bytes := make([]byte, length)
-	if _, err = io.ReadFull(r, bytes); err != nil {
-		return
-	}
-	return string(bytes), nil
-}
-
-func readLongstr(r io.Reader) (v string, err error) {
-	var length uint32
-	if err = binary.Read(r, binary.BigEndian, &length); err != nil {
-		return
-	}
-
-	bytes := make([]byte, length)
-	if _, err = io.ReadFull(r, bytes); err != nil {
-		return
-	}
-	return string(bytes), nil
-}
-
-func readDecimal(r io.Reader) (v Decimal, err error) {
-	if err = binary.Read(r, binary.BigEndian, &v.Scale); err != nil {
-		return
-	}
-	if err = binary.Read(r, binary.BigEndian, &v.Value); err != nil {
-		return
-	}
-	return
-}
-
-func readFloat32(r io.Reader) (v float32, err error) {
-	if err = binary.Read(r, binary.BigEndian, &v); err != nil {
-		return
-	}
-	return
-}
-
-func readFloat64(r io.Reader) (v float64, err error) {
-	if err = binary.Read(r, binary.BigEndian, &v); err != nil {
-		return
-	}
-	return
-}
-
-func readTimestamp(r io.Reader) (v time.Time, err error) {
-	var sec int64
-	if err = binary.Read(r, binary.BigEndian, &sec); err != nil {
-		return
-	}
-	return time.Unix(sec, 0), nil
-}
-
-/*
-'A': []interface{}
-'D': Decimal
-'F': Table
-'I': int32
-'S': string
-'T': time.Time
-'V': nil
-'b': byte
-'d': float64
-'f': float32
-'l': int64
-'s': int16
-'t': bool
-'x': []byte
-*/
-func readField(r io.Reader) (v interface{}, err error) {
-	var typ byte
-	if err = binary.Read(r, binary.BigEndian, &typ); err != nil {
-		return
-	}
-
-	switch typ {
-	case 't':
-		var value uint8
-		if err = binary.Read(r, binary.BigEndian, &value); err != nil {
-			return
-		}
-		return (value != 0), nil
-
-	case 'b':
-		var value [1]byte
-		if _, err = io.ReadFull(r, value[0:1]); err != nil {
-			return
-		}
-		return value[0], nil
-
-	case 's':
-		var value int16
-		if err = binary.Read(r, binary.BigEndian, &value); err != nil {
-			return
-		}
-		return value, nil
-
-	case 'I':
-		var value int32
-		if err = binary.Read(r, binary.BigEndian, &value); err != nil {
-			return
-		}
-		return value, nil
-
-	case 'l':
-		var value int64
-		if err = binary.Read(r, binary.BigEndian, &value); err != nil {
-			return
-		}
-		return value, nil
-
-	case 'f':
-		var value float32
-		if err = binary.Read(r, binary.BigEndian, &value); err != nil {
-			return
-		}
-		return value, nil
-
-	case 'd':
-		var value float64
-		if err = binary.Read(r, binary.BigEndian, &value); err != nil {
-			return
-		}
-		return value, nil
-
-	case 'D':
-		return readDecimal(r)
-
-	case 'S':
-		return readLongstr(r)
-
-	case 'A':
-		return readArray(r)
-
-	case 'T':
-		return readTimestamp(r)
-
-	case 'F':
-		return readTable(r)
-
-	case 'x':
-		var len int32
-		if err = binary.Read(r, binary.BigEndian, &len); err != nil {
-			return nil, err
-		}
-
-		value := make([]byte, len)
-		if _, err = io.ReadFull(r, value); err != nil {
-			return nil, err
-		}
-		return value, err
-
-	case 'V':
-		return nil, nil
-	}
-
-	return nil, ErrSyntax
-}
-
-/*
-	Field tables are long strings that contain packed name-value pairs.  The
-	name-value pairs are encoded as short string defining the name, and octet
-	defining the values type and then the value itself.   The valid field types for
-	tables are an extension of the native integer, bit, string, and timestamp
-	types, and are shown in the grammar.  Multi-octet integer fields are always
-	held in network byte order.
-*/
-func readTable(r io.Reader) (table Table, err error) {
-	var nested bytes.Buffer
-	var str string
-
-	if str, err = readLongstr(r); err != nil {
-		return
-	}
-
-	nested.Write([]byte(str))
-
-	table = make(Table)
-
-	for nested.Len() > 0 {
-		var key string
-		var value interface{}
-
-		if key, err = readShortstr(&nested); err != nil {
-			return
-		}
-
-		if value, err = readField(&nested); err != nil {
-			return
-		}
-
-		table[key] = value
-	}
-
-	return
-}
-
-func readArray(r io.Reader) ([]interface{}, error) {
-	var size uint32
-	var err error
-
-	if err = binary.Read(r, binary.BigEndian, &size); err != nil {
-		return nil, err
-	}
-
-	lim := &io.LimitedReader{R: r, N: int64(size)}
-	arr := make([]interface{}, 0)
-	var field interface{}
-
-	for {
-		if field, err = readField(lim); err != nil {
-			if err == io.EOF {
-				break
-			}
-			return nil, err
-		}
-		arr = append(arr, field)
-	}
-
-	return arr, nil
-}
-
-// Checks if this bit mask matches the flags bitset
-func hasProperty(mask uint16, prop int) bool {
-	return int(mask)&prop > 0
-}
-
-func (me *reader) parseHeaderFrame(channel uint16, size uint32) (frame frame, err error) {
-	hf := &headerFrame{
-		ChannelId: channel,
-	}
-
-	if err = binary.Read(me.r, binary.BigEndian, &hf.ClassId); err != nil {
-		return
-	}
-
-	if err = binary.Read(me.r, binary.BigEndian, &hf.weight); err != nil {
-		return
-	}
-
-	if err = binary.Read(me.r, binary.BigEndian, &hf.Size); err != nil {
-		return
-	}
-
-	var flags uint16
-
-	if err = binary.Read(me.r, binary.BigEndian, &flags); err != nil {
-		return
-	}
-
-	if hasProperty(flags, flagContentType) {
-		if hf.Properties.ContentType, err = readShortstr(me.r); err != nil {
-			return
-		}
-	}
-	if hasProperty(flags, flagContentEncoding) {
-		if hf.Properties.ContentEncoding, err = readShortstr(me.r); err != nil {
-			return
-		}
-	}
-	if hasProperty(flags, flagHeaders) {
-		if hf.Properties.Headers, err = readTable(me.r); err != nil {
-			return
-		}
-	}
-	if hasProperty(flags, flagDeliveryMode) {
-		if err = binary.Read(me.r, binary.BigEndian, &hf.Properties.DeliveryMode); err != nil {
-			return
-		}
-	}
-	if hasProperty(flags, flagPriority) {
-		if err = binary.Read(me.r, binary.BigEndian, &hf.Properties.Priority); err != nil {
-			return
-		}
-	}
-	if hasProperty(flags, flagCorrelationId) {
-		if hf.Properties.CorrelationId, err = readShortstr(me.r); err != nil {
-			return
-		}
-	}
-	if hasProperty(flags, flagReplyTo) {
-		if hf.Properties.ReplyTo, err = readShortstr(me.r); err != nil {
-			return
-		}
-	}
-	if hasProperty(flags, flagExpiration) {
-		if hf.Properties.Expiration, err = readShortstr(me.r); err != nil {
-			return
-		}
-	}
-	if hasProperty(flags, flagMessageId) {
-		if hf.Properties.MessageId, err = readShortstr(me.r); err != nil {
-			return
-		}
-	}
-	if hasProperty(flags, flagTimestamp) {
-		if hf.Properties.Timestamp, err = readTimestamp(me.r); err != nil {
-			return
-		}
-	}
-	if hasProperty(flags, flagType) {
-		if hf.Properties.Type, err = readShortstr(me.r); err != nil {
-			return
-		}
-	}
-	if hasProperty(flags, flagUserId) {
-		if hf.Properties.UserId, err = readShortstr(me.r); err != nil {
-			return
-		}
-	}
-	if hasProperty(flags, flagAppId) {
-		if hf.Properties.AppId, err = readShortstr(me.r); err != nil {
-			return
-		}
-	}
-	if hasProperty(flags, flagReserved1) {
-		if hf.Properties.reserved1, err = readShortstr(me.r); err != nil {
-			return
-		}
-	}
-
-	return hf, nil
-}
-
-func (me *reader) parseBodyFrame(channel uint16, size uint32) (frame frame, err error) {
-	bf := &bodyFrame{
-		ChannelId: channel,
-		Body:      make([]byte, size),
-	}
-
-	if _, err = io.ReadFull(me.r, bf.Body); err != nil {
-		return nil, err
-	}
-
-	return bf, nil
-}
-
-var errHeartbeatPayload = errors.New("Heartbeats should not have a payload")
-
-func (me *reader) parseHeartbeatFrame(channel uint16, size uint32) (frame frame, err error) {
-	hf := &heartbeatFrame{
-		ChannelId: channel,
-	}
-
-	if size > 0 {
-		return nil, errHeartbeatPayload
-	}
-
-	return hf, nil
-}
diff --git a/Godeps/_workspace/src/github.com/streadway/amqp/read_test.go b/Godeps/_workspace/src/github.com/streadway/amqp/read_test.go
deleted file mode 100644
index bb0e30f02..000000000
--- a/Godeps/_workspace/src/github.com/streadway/amqp/read_test.go
+++ /dev/null
@@ -1,22 +0,0 @@
-package amqp
-
-import (
-	"strings"
-	"testing"
-)
-
-func TestGoFuzzCrashers(t *testing.T) {
-	testData := []string{
-		"\b000000",
-		"\x02\x16\x10�[��\t\xbdui�" + "\x10\x01\x00\xff\xbf\xef\xbfｻn\x99\x00\x10r",
-		"\x0300\x00\x00\x00\x040000",
-	}
-
-	for idx, testStr := range testData {
-		r := reader{strings.NewReader(testStr)}
-		frame, err := r.ReadFrame()
-		if err != nil && frame != nil {
-			t.Errorf("%d. frame is not nil: %#v err = %v", idx, frame, err)
-		}
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/streadway/amqp/reconnect_test.go b/Godeps/_workspace/src/github.com/streadway/amqp/reconnect_test.go
deleted file mode 100644
index 5a06cb7ae..000000000
--- a/Godeps/_workspace/src/github.com/streadway/amqp/reconnect_test.go
+++ /dev/null
@@ -1,113 +0,0 @@
-package amqp_test
-
-import (
-	"fmt"
-	"github.com/streadway/amqp"
-	"os"
-)
-
-// Every connection should declare the topology they expect
-func setup(url, queue string) (*amqp.Connection, *amqp.Channel, error) {
-	conn, err := amqp.Dial(url)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	ch, err := conn.Channel()
-	if err != nil {
-		return nil, nil, err
-	}
-
-	if _, err := ch.QueueDeclare(queue, false, true, false, false, nil); err != nil {
-		return nil, nil, err
-	}
-
-	return conn, ch, nil
-}
-
-func consume(url, queue string) (*amqp.Connection, <-chan amqp.Delivery, error) {
-	conn, ch, err := setup(url, queue)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	// Indicate we only want 1 message to acknowledge at a time.
-	if err := ch.Qos(1, 0, false); err != nil {
-		return nil, nil, err
-	}
-
-	// Exclusive consumer
-	deliveries, err := ch.Consume(queue, "", false, true, false, false, nil)
-
-	return conn, deliveries, err
-}
-
-func ExampleConnection_reconnect() {
-	if url := os.Getenv("AMQP_URL"); url != "" {
-		queue := "example.reconnect"
-
-		// The connection/channel for publishing to interleave the ingress messages
-		// between reconnects, shares the same topology as the consumer.  If we rather
-		// sent all messages up front, the first consumer would receive every message.
-		// We would rather show how the messages are not lost between reconnects.
-		_, pub, err := setup(url, queue)
-		if err != nil {
-			fmt.Println("err publisher setup:", err)
-			return
-		}
-
-		// Purge the queue from the publisher side to establish initial state
-		if _, err := pub.QueuePurge(queue, false); err != nil {
-			fmt.Println("err purge:", err)
-			return
-		}
-
-		// Reconnect simulation, should be for { ... } in production
-		for i := 1; i <= 3; i++ {
-			fmt.Println("connect")
-
-			conn, deliveries, err := consume(url, queue)
-			if err != nil {
-				fmt.Println("err consume:", err)
-				return
-			}
-
-			// Simulate a producer on a different connection showing that consumers
-			// continue where they were left off after each reconnect.
-			if err := pub.Publish("", queue, false, false, amqp.Publishing{
-				Body: []byte(fmt.Sprintf("%d", i)),
-			}); err != nil {
-				fmt.Println("err publish:", err)
-				return
-			}
-
-			// Simulates a consumer that when the range finishes, will setup a new
-			// session and begin ranging over the deliveries again.
-			for msg := range deliveries {
-				fmt.Println(string(msg.Body))
-				msg.Ack(false)
-
-				// Simulate an error like a server restart, loss of route or operator
-				// intervention that results in the connection terminating
-				go conn.Close()
-			}
-		}
-	} else {
-		// pass with expected output when not running in an integration
-		// environment.
-		fmt.Println("connect")
-		fmt.Println("1")
-		fmt.Println("connect")
-		fmt.Println("2")
-		fmt.Println("connect")
-		fmt.Println("3")
-	}
-
-	// Output:
-	// connect
-	// 1
-	// connect
-	// 2
-	// connect
-	// 3
-}
diff --git a/Godeps/_workspace/src/github.com/streadway/amqp/return.go b/Godeps/_workspace/src/github.com/streadway/amqp/return.go
deleted file mode 100644
index dfebd635d..000000000
--- a/Godeps/_workspace/src/github.com/streadway/amqp/return.go
+++ /dev/null
@@ -1,64 +0,0 @@
-// Copyright (c) 2012, Sean Treadway, SoundCloud Ltd.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-// Source code and contact info at http://github.com/streadway/amqp
-
-package amqp
-
-import (
-	"time"
-)
-
-// Return captures a flattened struct of fields returned by the server when a
-// Publishing is unable to be delivered either due to the `mandatory` flag set
-// and no route found, or `immediate` flag set and no free consumer.
-type Return struct {
-	ReplyCode  uint16 // reason
-	ReplyText  string // description
-	Exchange   string // basic.publish exchange
-	RoutingKey string // basic.publish routing key
-
-	// Properties
-	ContentType     string    // MIME content type
-	ContentEncoding string    // MIME content encoding
-	Headers         Table     // Application or header exchange table
-	DeliveryMode    uint8     // queue implemention use - non-persistent (1) or persistent (2)
-	Priority        uint8     // queue implementation use - 0 to 9
-	CorrelationId   string    // application use - correlation identifier
-	ReplyTo         string    // application use - address to to reply to (ex: RPC)
-	Expiration      string    // implementation use - message expiration spec
-	MessageId       string    // application use - message identifier
-	Timestamp       time.Time // application use - message timestamp
-	Type            string    // application use - message type name
-	UserId          string    // application use - creating user id
-	AppId           string    // application use - creating application
-
-	Body []byte
-}
-
-func newReturn(msg basicReturn) *Return {
-	props, body := msg.getContent()
-
-	return &Return{
-		ReplyCode:  msg.ReplyCode,
-		ReplyText:  msg.ReplyText,
-		Exchange:   msg.Exchange,
-		RoutingKey: msg.RoutingKey,
-
-		Headers:         props.Headers,
-		ContentType:     props.ContentType,
-		ContentEncoding: props.ContentEncoding,
-		DeliveryMode:    props.DeliveryMode,
-		Priority:        props.Priority,
-		CorrelationId:   props.CorrelationId,
-		ReplyTo:         props.ReplyTo,
-		Expiration:      props.Expiration,
-		MessageId:       props.MessageId,
-		Timestamp:       props.Timestamp,
-		Type:            props.Type,
-		UserId:          props.UserId,
-		AppId:           props.AppId,
-
-		Body: body,
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/streadway/amqp/shared_test.go b/Godeps/_workspace/src/github.com/streadway/amqp/shared_test.go
deleted file mode 100644
index 2e4715fa0..000000000
--- a/Godeps/_workspace/src/github.com/streadway/amqp/shared_test.go
+++ /dev/null
@@ -1,71 +0,0 @@
-// Copyright (c) 2012, Sean Treadway, SoundCloud Ltd.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-// Source code and contact info at http://github.com/streadway/amqp
-
-package amqp
-
-import (
-	"encoding/hex"
-	"io"
-	"testing"
-)
-
-type pipe struct {
-	r *io.PipeReader
-	w *io.PipeWriter
-}
-
-func (p pipe) Read(b []byte) (int, error) {
-	return p.r.Read(b)
-}
-
-func (p pipe) Write(b []byte) (int, error) {
-	return p.w.Write(b)
-}
-
-func (p pipe) Close() error {
-	p.r.Close()
-	p.w.Close()
-	return nil
-}
-
-type logIO struct {
-	t      *testing.T
-	prefix string
-	proxy  io.ReadWriteCloser
-}
-
-func (me *logIO) Read(p []byte) (n int, err error) {
-	me.t.Logf("%s reading %d\n", me.prefix, len(p))
-	n, err = me.proxy.Read(p)
-	if err != nil {
-		me.t.Logf("%s read %x: %v\n", me.prefix, p[0:n], err)
-	} else {
-		me.t.Logf("%s read:\n%s\n", me.prefix, hex.Dump(p[0:n]))
-		//fmt.Printf("%s read:\n%s\n", me.prefix, hex.Dump(p[0:n]))
-	}
-	return
-}
-
-func (me *logIO) Write(p []byte) (n int, err error) {
-	me.t.Logf("%s writing %d\n", me.prefix, len(p))
-	n, err = me.proxy.Write(p)
-	if err != nil {
-		me.t.Logf("%s write %d, %x: %v\n", me.prefix, len(p), p[0:n], err)
-	} else {
-		me.t.Logf("%s write %d:\n%s", me.prefix, len(p), hex.Dump(p[0:n]))
-		//fmt.Printf("%s write %d:\n%s", me.prefix, len(p), hex.Dump(p[0:n]))
-	}
-	return
-}
-
-func (me *logIO) Close() (err error) {
-	err = me.proxy.Close()
-	if err != nil {
-		me.t.Logf("%s close : %v\n", me.prefix, err)
-	} else {
-		me.t.Logf("%s close\n", me.prefix, err)
-	}
-	return
-}
diff --git a/Godeps/_workspace/src/github.com/streadway/amqp/spec/amqp0-9-1.stripped.extended.xml b/Godeps/_workspace/src/github.com/streadway/amqp/spec/amqp0-9-1.stripped.extended.xml
deleted file mode 100644
index fbddb93a3..000000000
--- a/Godeps/_workspace/src/github.com/streadway/amqp/spec/amqp0-9-1.stripped.extended.xml
+++ /dev/null
@@ -1,537 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
-     WARNING: Modified from the official 0-9-1 specification XML by
-     the addition of:
-     confirm.select and confirm.select-ok,
-     exchange.bind and exchange.bind-ok,
-     exchange.unbind and exchange.unbind-ok,
-     basic.nack,
-     the ability for the Server to send basic.ack, basic.nack and
-      basic.cancel to the client, and
-     the un-deprecation of exchange.declare{auto-delete} and exchange.declare{internal}
-
-     Modifications are (c) 2010-2013 VMware, Inc. and may be distributed
-     under the same BSD license as below.
--->
-
-<!--
-Copyright (c) 2009 AMQP Working Group.
-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.
-3. The name of the author may not be used to endorse or promote products
-derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
--->
-<amqp major="0" minor="9" revision="1" port="5672">
-  <constant name="frame-method" value="1"/>
-  <constant name="frame-header" value="2"/>
-  <constant name="frame-body" value="3"/>
-  <constant name="frame-heartbeat" value="8"/>
-  <constant name="frame-min-size" value="4096"/>
-  <constant name="frame-end" value="206"/>
-  <constant name="reply-success" value="200"/>
-  <constant name="content-too-large" value="311" class="soft-error"/>
-  <constant name="no-route" value="312" class = "soft-error">
-    <doc>
-      Errata: Section 1.2 ought to define an exception 312 "No route", which used to
-      exist in 0-9 and is what RabbitMQ sends back with 'basic.return' when a
-      'mandatory' message cannot be delivered to any queue.
-    </doc>
-  </constant>
-  <constant name="no-consumers" value="313" class="soft-error"/>
-  <constant name="connection-forced" value="320" class="hard-error"/>
-  <constant name="invalid-path" value="402" class="hard-error"/>
-  <constant name="access-refused" value="403" class="soft-error"/>
-  <constant name="not-found" value="404" class="soft-error"/>
-  <constant name="resource-locked" value="405" class="soft-error"/>
-  <constant name="precondition-failed" value="406" class="soft-error"/>
-  <constant name="frame-error" value="501" class="hard-error"/>
-  <constant name="syntax-error" value="502" class="hard-error"/>
-  <constant name="command-invalid" value="503" class="hard-error"/>
-  <constant name="channel-error" value="504" class="hard-error"/>
-  <constant name="unexpected-frame" value="505" class="hard-error"/>
-  <constant name="resource-error" value="506" class="hard-error"/>
-  <constant name="not-allowed" value="530" class="hard-error"/>
-  <constant name="not-implemented" value="540" class="hard-error"/>
-  <constant name="internal-error" value="541" class="hard-error"/>
-  <domain name="class-id" type="short"/>
-  <domain name="consumer-tag" type="shortstr"/>
-  <domain name="delivery-tag" type="longlong"/>
-  <domain name="exchange-name" type="shortstr">
-    <assert check="length" value="127"/>
-    <assert check="regexp" value="^[a-zA-Z0-9-_.:]*$"/>
-  </domain>
-  <domain name="method-id" type="short"/>
-  <domain name="no-ack" type="bit"/>
-  <domain name="no-local" type="bit"/>
-  <domain name="no-wait" type="bit"/>
-  <domain name="path" type="shortstr">
-    <assert check="notnull"/>
-    <assert check="length" value="127"/>
-  </domain>
-  <domain name="peer-properties" type="table"/>
-  <domain name="queue-name" type="shortstr">
-    <assert check="length" value="127"/>
-    <assert check="regexp" value="^[a-zA-Z0-9-_.:]*$"/>
-  </domain>
-  <domain name="redelivered" type="bit"/>
-  <domain name="message-count" type="long"/>
-  <domain name="reply-code" type="short">
-    <assert check="notnull"/>
-  </domain>
-  <domain name="reply-text" type="shortstr">
-    <assert check="notnull"/>
-  </domain>
-  <domain name="bit" type="bit"/>
-  <domain name="octet" type="octet"/>
-  <domain name="short" type="short"/>
-  <domain name="long" type="long"/>
-  <domain name="longlong" type="longlong"/>
-  <domain name="shortstr" type="shortstr"/>
-  <domain name="longstr" type="longstr"/>
-  <domain name="timestamp" type="timestamp"/>
-  <domain name="table" type="table"/>
-  <class name="connection" handler="connection" index="10">
-    <chassis name="server" implement="MUST"/>
-    <chassis name="client" implement="MUST"/>
-    <method name="start" synchronous="1" index="10">
-      <chassis name="client" implement="MUST"/>
-      <response name="start-ok"/>
-      <field name="version-major" domain="octet"/>
-      <field name="version-minor" domain="octet"/>
-      <field name="server-properties" domain="peer-properties"/>
-      <field name="mechanisms" domain="longstr">
-        <assert check="notnull"/>
-      </field>
-      <field name="locales" domain="longstr">
-        <assert check="notnull"/>
-      </field>
-    </method>
-    <method name="start-ok" synchronous="1" index="11">
-      <chassis name="server" implement="MUST"/>
-      <field name="client-properties" domain="peer-properties"/>
-      <field name="mechanism" domain="shortstr">
-        <assert check="notnull"/>
-      </field>
-      <field name="response" domain="longstr">
-        <assert check="notnull"/>
-      </field>
-      <field name="locale" domain="shortstr">
-        <assert check="notnull"/>
-      </field>
-    </method>
-    <method name="secure" synchronous="1" index="20">
-      <chassis name="client" implement="MUST"/>
-      <response name="secure-ok"/>
-      <field name="challenge" domain="longstr"/>
-    </method>
-    <method name="secure-ok" synchronous="1" index="21">
-      <chassis name="server" implement="MUST"/>
-      <field name="response" domain="longstr">
-        <assert check="notnull"/>
-      </field>
-    </method>
-    <method name="tune" synchronous="1" index="30">
-      <chassis name="client" implement="MUST"/>
-      <response name="tune-ok"/>
-      <field name="channel-max" domain="short"/>
-      <field name="frame-max" domain="long"/>
-      <field name="heartbeat" domain="short"/>
-    </method>
-    <method name="tune-ok" synchronous="1" index="31">
-      <chassis name="server" implement="MUST"/>
-      <field name="channel-max" domain="short">
-        <assert check="notnull"/>
-        <assert check="le" method="tune" field="channel-max"/>
-      </field>
-      <field name="frame-max" domain="long"/>
-      <field name="heartbeat" domain="short"/>
-    </method>
-    <method name="open" synchronous="1" index="40">
-      <chassis name="server" implement="MUST"/>
-      <response name="open-ok"/>
-      <field name="virtual-host" domain="path"/>
-      <field name="reserved-1" type="shortstr" reserved="1"/>
-      <field name="reserved-2" type="bit" reserved="1"/>
-    </method>
-    <method name="open-ok" synchronous="1" index="41">
-      <chassis name="client" implement="MUST"/>
-      <field name="reserved-1" type="shortstr" reserved="1"/>
-    </method>
-    <method name="close" synchronous="1" index="50">
-      <chassis name="client" implement="MUST"/>
-      <chassis name="server" implement="MUST"/>
-      <response name="close-ok"/>
-      <field name="reply-code" domain="reply-code"/>
-      <field name="reply-text" domain="reply-text"/>
-      <field name="class-id" domain="class-id"/>
-      <field name="method-id" domain="method-id"/>
-    </method>
-    <method name="close-ok" synchronous="1" index="51">
-      <chassis name="client" implement="MUST"/>
-      <chassis name="server" implement="MUST"/>
-    </method>
-    <method name="blocked" index="60">
-      <chassis name="server" implement="MAY"/>
-      <field name="reason" type="shortstr"/>
-    </method>
-    <method name="unblocked" index="61">
-      <chassis name="server" implement="MAY"/>
-    </method>
-  </class>
-  <class name="channel" handler="channel" index="20">
-    <chassis name="server" implement="MUST"/>
-    <chassis name="client" implement="MUST"/>
-    <method name="open" synchronous="1" index="10">
-      <chassis name="server" implement="MUST"/>
-      <response name="open-ok"/>
-      <field name="reserved-1" type="shortstr" reserved="1"/>
-    </method>
-    <method name="open-ok" synchronous="1" index="11">
-      <chassis name="client" implement="MUST"/>
-      <field name="reserved-1" type="longstr" reserved="1"/>
-    </method>
-    <method name="flow" synchronous="1" index="20">
-      <chassis name="server" implement="MUST"/>
-      <chassis name="client" implement="MUST"/>
-      <response name="flow-ok"/>
-      <field name="active" domain="bit"/>
-    </method>
-    <method name="flow-ok" index="21">
-      <chassis name="server" implement="MUST"/>
-      <chassis name="client" implement="MUST"/>
-      <field name="active" domain="bit"/>
-    </method>
-    <method name="close" synchronous="1" index="40">
-      <chassis name="client" implement="MUST"/>
-      <chassis name="server" implement="MUST"/>
-      <response name="close-ok"/>
-      <field name="reply-code" domain="reply-code"/>
-      <field name="reply-text" domain="reply-text"/>
-      <field name="class-id" domain="class-id"/>
-      <field name="method-id" domain="method-id"/>
-    </method>
-    <method name="close-ok" synchronous="1" index="41">
-      <chassis name="client" implement="MUST"/>
-      <chassis name="server" implement="MUST"/>
-    </method>
-  </class>
-  <class name="exchange" handler="channel" index="40">
-    <chassis name="server" implement="MUST"/>
-    <chassis name="client" implement="MUST"/>
-    <method name="declare" synchronous="1" index="10">
-      <chassis name="server" implement="MUST"/>
-      <response name="declare-ok"/>
-      <field name="reserved-1" type="short" reserved="1"/>
-      <field name="exchange" domain="exchange-name">
-        <assert check="notnull"/>
-      </field>
-      <field name="type" domain="shortstr"/>
-      <field name="passive" domain="bit"/>
-      <field name="durable" domain="bit"/>
-      <field name="auto-delete" domain="bit"/>
-      <field name="internal" domain="bit"/>
-      <field name="no-wait" domain="no-wait"/>
-      <field name="arguments" domain="table"/>
-    </method>
-    <method name="declare-ok" synchronous="1" index="11">
-      <chassis name="client" implement="MUST"/>
-    </method>
-    <method name="delete" synchronous="1" index="20">
-      <chassis name="server" implement="MUST"/>
-      <response name="delete-ok"/>
-      <field name="reserved-1" type="short" reserved="1"/>
-      <field name="exchange" domain="exchange-name">
-        <assert check="notnull"/>
-      </field>
-      <field name="if-unused" domain="bit"/>
-      <field name="no-wait" domain="no-wait"/>
-    </method>
-    <method name="delete-ok" synchronous="1" index="21">
-      <chassis name="client" implement="MUST"/>
-    </method>
-    <method name="bind" synchronous="1" index="30">
-      <chassis name="server" implement="MUST"/>
-      <response name="bind-ok"/>
-      <field name="reserved-1" type="short" reserved="1"/>
-      <field name="destination" domain="exchange-name"/>
-      <field name="source" domain="exchange-name"/>
-      <field name="routing-key" domain="shortstr"/>
-      <field name="no-wait" domain="no-wait"/>
-      <field name="arguments" domain="table"/>
-    </method>
-    <method name="bind-ok" synchronous="1" index="31">
-      <chassis name="client" implement="MUST"/>
-    </method>
-    <method name="unbind" synchronous="1" index="40">
-      <chassis name="server" implement="MUST"/>
-      <response name="unbind-ok"/>
-      <field name="reserved-1" type="short" reserved="1"/>
-      <field name="destination" domain="exchange-name"/>
-      <field name="source" domain="exchange-name"/>
-      <field name="routing-key" domain="shortstr"/>
-      <field name="no-wait" domain="no-wait"/>
-      <field name="arguments" domain="table"/>
-    </method>
-    <method name="unbind-ok" synchronous="1" index="51">
-      <chassis name="client" implement="MUST"/>
-    </method>
-  </class>
-  <class name="queue" handler="channel" index="50">
-    <chassis name="server" implement="MUST"/>
-    <chassis name="client" implement="MUST"/>
-    <method name="declare" synchronous="1" index="10">
-      <chassis name="server" implement="MUST"/>
-      <response name="declare-ok"/>
-      <field name="reserved-1" type="short" reserved="1"/>
-      <field name="queue" domain="queue-name"/>
-      <field name="passive" domain="bit"/>
-      <field name="durable" domain="bit"/>
-      <field name="exclusive" domain="bit"/>
-      <field name="auto-delete" domain="bit"/>
-      <field name="no-wait" domain="no-wait"/>
-      <field name="arguments" domain="table"/>
-    </method>
-    <method name="declare-ok" synchronous="1" index="11">
-      <chassis name="client" implement="MUST"/>
-      <field name="queue" domain="queue-name">
-        <assert check="notnull"/>
-      </field>
-      <field name="message-count" domain="message-count"/>
-      <field name="consumer-count" domain="long"/>
-    </method>
-    <method name="bind" synchronous="1" index="20">
-      <chassis name="server" implement="MUST"/>
-      <response name="bind-ok"/>
-      <field name="reserved-1" type="short" reserved="1"/>
-      <field name="queue" domain="queue-name"/>
-      <field name="exchange" domain="exchange-name"/>
-      <field name="routing-key" domain="shortstr"/>
-      <field name="no-wait" domain="no-wait"/>
-      <field name="arguments" domain="table"/>
-    </method>
-    <method name="bind-ok" synchronous="1" index="21">
-      <chassis name="client" implement="MUST"/>
-    </method>
-    <method name="unbind" synchronous="1" index="50">
-      <chassis name="server" implement="MUST"/>
-      <response name="unbind-ok"/>
-      <field name="reserved-1" type="short" reserved="1"/>
-      <field name="queue" domain="queue-name"/>
-      <field name="exchange" domain="exchange-name"/>
-      <field name="routing-key" domain="shortstr"/>
-      <field name="arguments" domain="table"/>
-    </method>
-    <method name="unbind-ok" synchronous="1" index="51">
-      <chassis name="client" implement="MUST"/>
-    </method>
-    <method name="purge" synchronous="1" index="30">
-      <chassis name="server" implement="MUST"/>
-      <response name="purge-ok"/>
-      <field name="reserved-1" type="short" reserved="1"/>
-      <field name="queue" domain="queue-name"/>
-      <field name="no-wait" domain="no-wait"/>
-    </method>
-    <method name="purge-ok" synchronous="1" index="31">
-      <chassis name="client" implement="MUST"/>
-      <field name="message-count" domain="message-count"/>
-    </method>
-    <method name="delete" synchronous="1" index="40">
-      <chassis name="server" implement="MUST"/>
-      <response name="delete-ok"/>
-      <field name="reserved-1" type="short" reserved="1"/>
-      <field name="queue" domain="queue-name"/>
-      <field name="if-unused" domain="bit"/>
-      <field name="if-empty" domain="bit"/>
-      <field name="no-wait" domain="no-wait"/>
-    </method>
-    <method name="delete-ok" synchronous="1" index="41">
-      <chassis name="client" implement="MUST"/>
-      <field name="message-count" domain="message-count"/>
-    </method>
-  </class>
-  <class name="basic" handler="channel" index="60">
-    <chassis name="server" implement="MUST"/>
-    <chassis name="client" implement="MAY"/>
-    <field name="content-type" domain="shortstr"/>
-    <field name="content-encoding" domain="shortstr"/>
-    <field name="headers" domain="table"/>
-    <field name="delivery-mode" domain="octet"/>
-    <field name="priority" domain="octet"/>
-    <field name="correlation-id" domain="shortstr"/>
-    <field name="reply-to" domain="shortstr"/>
-    <field name="expiration" domain="shortstr"/>
-    <field name="message-id" domain="shortstr"/>
-    <field name="timestamp" domain="timestamp"/>
-    <field name="type" domain="shortstr"/>
-    <field name="user-id" domain="shortstr"/>
-    <field name="app-id" domain="shortstr"/>
-    <field name="reserved" domain="shortstr"/>
-    <method name="qos" synchronous="1" index="10">
-      <chassis name="server" implement="MUST"/>
-      <response name="qos-ok"/>
-      <field name="prefetch-size" domain="long"/>
-      <field name="prefetch-count" domain="short"/>
-      <field name="global" domain="bit"/>
-    </method>
-    <method name="qos-ok" synchronous="1" index="11">
-      <chassis name="client" implement="MUST"/>
-    </method>
-    <method name="consume" synchronous="1" index="20">
-      <chassis name="server" implement="MUST"/>
-      <response name="consume-ok"/>
-      <field name="reserved-1" type="short" reserved="1"/>
-      <field name="queue" domain="queue-name"/>
-      <field name="consumer-tag" domain="consumer-tag"/>
-      <field name="no-local" domain="no-local"/>
-      <field name="no-ack" domain="no-ack"/>
-      <field name="exclusive" domain="bit"/>
-      <field name="no-wait" domain="no-wait"/>
-      <field name="arguments" domain="table"/>
-    </method>
-    <method name="consume-ok" synchronous="1" index="21">
-      <chassis name="client" implement="MUST"/>
-      <field name="consumer-tag" domain="consumer-tag"/>
-    </method>
-    <method name="cancel" synchronous="1" index="30">
-      <chassis name="server" implement="MUST"/>
-      <chassis name="client" implement="SHOULD"/>
-      <response name="cancel-ok"/>
-      <field name="consumer-tag" domain="consumer-tag"/>
-      <field name="no-wait" domain="no-wait"/>
-    </method>
-    <method name="cancel-ok" synchronous="1" index="31">
-      <chassis name="client" implement="MUST"/>
-      <chassis name="server" implement="MAY"/>
-      <field name="consumer-tag" domain="consumer-tag"/>
-    </method>
-    <method name="publish" content="1" index="40">
-      <chassis name="server" implement="MUST"/>
-      <field name="reserved-1" type="short" reserved="1"/>
-      <field name="exchange" domain="exchange-name"/>
-      <field name="routing-key" domain="shortstr"/>
-      <field name="mandatory" domain="bit"/>
-      <field name="immediate" domain="bit"/>
-    </method>
-    <method name="return" content="1" index="50">
-      <chassis name="client" implement="MUST"/>
-      <field name="reply-code" domain="reply-code"/>
-      <field name="reply-text" domain="reply-text"/>
-      <field name="exchange" domain="exchange-name"/>
-      <field name="routing-key" domain="shortstr"/>
-    </method>
-    <method name="deliver" content="1" index="60">
-      <chassis name="client" implement="MUST"/>
-      <field name="consumer-tag" domain="consumer-tag"/>
-      <field name="delivery-tag" domain="delivery-tag"/>
-      <field name="redelivered" domain="redelivered"/>
-      <field name="exchange" domain="exchange-name"/>
-      <field name="routing-key" domain="shortstr"/>
-    </method>
-    <method name="get" synchronous="1" index="70">
-      <response name="get-ok"/>
-      <response name="get-empty"/>
-      <chassis name="server" implement="MUST"/>
-      <field name="reserved-1" type="short" reserved="1"/>
-      <field name="queue" domain="queue-name"/>
-      <field name="no-ack" domain="no-ack"/>
-    </method>
-    <method name="get-ok" synchronous="1" content="1" index="71">
-      <chassis name="client" implement="MAY"/>
-      <field name="delivery-tag" domain="delivery-tag"/>
-      <field name="redelivered" domain="redelivered"/>
-      <field name="exchange" domain="exchange-name"/>
-      <field name="routing-key" domain="shortstr"/>
-      <field name="message-count" domain="message-count"/>
-    </method>
-    <method name="get-empty" synchronous="1" index="72">
-      <chassis name="client" implement="MAY"/>
-      <field name="reserved-1" type="shortstr" reserved="1"/>
-    </method>
-    <method name="ack" index="80">
-      <chassis name="server" implement="MUST"/>
-      <chassis name="client" implement="MUST"/>
-      <field name="delivery-tag" domain="delivery-tag"/>
-      <field name="multiple" domain="bit"/>
-    </method>
-    <method name="reject" index="90">
-      <chassis name="server" implement="MUST"/>
-      <field name="delivery-tag" domain="delivery-tag"/>
-      <field name="requeue" domain="bit"/>
-    </method>
-    <method name="recover-async" index="100" deprecated="1">
-      <chassis name="server" implement="MAY"/>
-      <field name="requeue" domain="bit"/>
-    </method>
-    <method name="recover" synchronous="1" index="110">
-      <chassis name="server" implement="MUST"/>
-      <field name="requeue" domain="bit"/>
-    </method>
-    <method name="recover-ok" synchronous="1" index="111">
-      <chassis name="client" implement="MUST"/>
-    </method>
-    <method name="nack" index="120">
-      <chassis name="server" implement="MUST"/>
-      <chassis name="client" implement="MUST"/>
-      <field name="delivery-tag" domain="delivery-tag"/>
-      <field name="multiple" domain="bit"/>
-      <field name="requeue" domain="bit"/>
-    </method>
-  </class>
-  <class name="tx" handler="channel" index="90">
-    <chassis name="server" implement="SHOULD"/>
-    <chassis name="client" implement="MAY"/>
-    <method name="select" synchronous="1" index="10">
-      <chassis name="server" implement="MUST"/>
-      <response name="select-ok"/>
-    </method>
-    <method name="select-ok" synchronous="1" index="11">
-      <chassis name="client" implement="MUST"/>
-    </method>
-    <method name="commit" synchronous="1" index="20">
-      <chassis name="server" implement="MUST"/>
-      <response name="commit-ok"/>
-    </method>
-    <method name="commit-ok" synchronous="1" index="21">
-      <chassis name="client" implement="MUST"/>
-    </method>
-    <method name="rollback" synchronous="1" index="30">
-      <chassis name="server" implement="MUST"/>
-      <response name="rollback-ok"/>
-    </method>
-    <method name="rollback-ok" synchronous="1" index="31">
-      <chassis name="client" implement="MUST"/>
-    </method>
-  </class>
-  <class name="confirm" handler="channel" index="85">
-    <chassis name="server" implement="SHOULD"/>
-    <chassis name="client" implement="MAY"/>
-    <method name="select" synchronous="1" index="10">
-      <chassis name="server" implement="MUST"/>
-      <response name="select-ok"/>
-      <field name="nowait" type="bit"/>
-    </method>
-    <method name="select-ok" synchronous="1" index="11">
-      <chassis name="client" implement="MUST"/>
-    </method>
-  </class>
-</amqp>
diff --git a/Godeps/_workspace/src/github.com/streadway/amqp/spec/gen.go b/Godeps/_workspace/src/github.com/streadway/amqp/spec/gen.go
deleted file mode 100644
index 1861b9ebb..000000000
--- a/Godeps/_workspace/src/github.com/streadway/amqp/spec/gen.go
+++ /dev/null
@@ -1,536 +0,0 @@
-// Copyright (c) 2012, Sean Treadway, SoundCloud Ltd.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-// Source code and contact info at http://github.com/streadway/amqp
-
-// +build ignore
-
-package main
-
-import (
-	"bytes"
-	"encoding/xml"
-	"errors"
-	"fmt"
-	"io/ioutil"
-	"log"
-	"os"
-	"regexp"
-	"strings"
-	"text/template"
-)
-
-var (
-	ErrUnknownType   = errors.New("Unknown field type in gen")
-	ErrUnknownDomain = errors.New("Unknown domain type in gen")
-)
-
-var amqpTypeToNative = map[string]string{
-	"bit":        "bool",
-	"octet":      "byte",
-	"shortshort": "uint8",
-	"short":      "uint16",
-	"long":       "uint32",
-	"longlong":   "uint64",
-	"timestamp":  "time.Time",
-	"table":      "Table",
-	"shortstr":   "string",
-	"longstr":    "string",
-}
-
-type Rule struct {
-	Name string   `xml:"name,attr"`
-	Docs []string `xml:"doc"`
-}
-
-type Doc struct {
-	Type string `xml:"type,attr"`
-	Body string `xml:",innerxml"`
-}
-
-type Chassis struct {
-	Name      string `xml:"name,attr"`
-	Implement string `xml:"implement,attr"`
-}
-
-type Assert struct {
-	Check  string `xml:"check,attr"`
-	Value  string `xml:"value,attr"`
-	Method string `xml:"method,attr"`
-}
-
-type Field struct {
-	Name     string   `xml:"name,attr"`
-	Domain   string   `xml:"domain,attr"`
-	Type     string   `xml:"type,attr"`
-	Label    string   `xml:"label,attr"`
-	Reserved bool     `xml:"reserved,attr"`
-	Docs     []Doc    `xml:"doc"`
-	Asserts  []Assert `xml:"assert"`
-}
-
-type Response struct {
-	Name string `xml:"name,attr"`
-}
-
-type Method struct {
-	Name        string    `xml:"name,attr"`
-	Response    Response  `xml:"response"`
-	Synchronous bool      `xml:"synchronous,attr"`
-	Content     bool      `xml:"content,attr"`
-	Index       string    `xml:"index,attr"`
-	Label       string    `xml:"label,attr"`
-	Docs        []Doc     `xml:"doc"`
-	Rules       []Rule    `xml:"rule"`
-	Fields      []Field   `xml:"field"`
-	Chassis     []Chassis `xml:"chassis"`
-}
-
-type Class struct {
-	Name    string    `xml:"name,attr"`
-	Handler string    `xml:"handler,attr"`
-	Index   string    `xml:"index,attr"`
-	Label   string    `xml:"label,attr"`
-	Docs    []Doc     `xml:"doc"`
-	Methods []Method  `xml:"method"`
-	Chassis []Chassis `xml:"chassis"`
-}
-
-type Domain struct {
-	Name  string `xml:"name,attr"`
-	Type  string `xml:"type,attr"`
-	Label string `xml:"label,attr"`
-	Rules []Rule `xml:"rule"`
-	Docs  []Doc  `xml:"doc"`
-}
-
-type Constant struct {
-	Name  string `xml:"name,attr"`
-	Value int    `xml:"value,attr"`
-	Class string `xml:"class,attr"`
-	Doc   string `xml:"doc"`
-}
-
-type Amqp struct {
-	Major   int    `xml:"major,attr"`
-	Minor   int    `xml:"minor,attr"`
-	Port    int    `xml:"port,attr"`
-	Comment string `xml:"comment,attr"`
-
-	Constants []Constant `xml:"constant"`
-	Domains   []Domain   `xml:"domain"`
-	Classes   []Class    `xml:"class"`
-}
-
-type renderer struct {
-	Root       Amqp
-	bitcounter int
-}
-
-type fieldset struct {
-	AmqpType   string
-	NativeType string
-	Fields     []Field
-	*renderer
-}
-
-var (
-	helpers = template.FuncMap{
-		"public":  public,
-		"private": private,
-		"clean":   clean,
-	}
-
-	packageTemplate = template.Must(template.New("package").Funcs(helpers).Parse(`
-	// Copyright (c) 2012, Sean Treadway, SoundCloud Ltd.
-	// Use of this source code is governed by a BSD-style
-	// license that can be found in the LICENSE file.
-	// Source code and contact info at http://github.com/streadway/amqp
-
-  /* GENERATED FILE - DO NOT EDIT */
-  /* Rebuild from the spec/gen.go tool */
-
-  {{with .Root}}
-  package amqp
-
-  import (
-    "fmt"
-    "encoding/binary"
-    "io"
-  )
-
-	// Error codes that can be sent from the server during a connection or
-	// channel exception or used by the client to indicate a class of error like
-	// ErrCredentials.  The text of the error is likely more interesting than
-	// these constants.
-	const (
-	{{range $c := .Constants}}
-	{{if $c.IsError}}{{.Name | public}}{{else}}{{.Name | private}}{{end}} = {{.Value}}{{end}}
-  )
-
-	func isSoftExceptionCode(code int) bool {
-		switch code {
-		{{range $c := .Constants}} {{if $c.IsSoftError}} case {{$c.Value}}:
-			return true
-		{{end}}{{end}}
-		}
-		return false
-	}
-
-  {{range .Classes}}
-    {{$class := .}}
-    {{range .Methods}}
-      {{$method := .}}
-			{{$struct := $.StructName $class.Name $method.Name}}
-      {{if .Docs}}/* {{range .Docs}} {{.Body | clean}} {{end}} */{{end}}
-      type {{$struct}} struct {
-        {{range .Fields}}
-        {{$.FieldName .}} {{$.FieldType . | $.NativeType}} {{if .Label}}// {{.Label}}{{end}}{{end}}
-				{{if .Content}}Properties properties
-				Body []byte{{end}}
-      }
-
-			func (me *{{$struct}}) id() (uint16, uint16) {
-				return {{$class.Index}}, {{$method.Index}}
-			}
-
-			func (me *{{$struct}}) wait() (bool) {
-				return {{.Synchronous}}{{if $.HasField "NoWait" .}} && !me.NoWait{{end}}
-			}
-
-			{{if .Content}}
-      func (me *{{$struct}}) getContent() (properties, []byte) {
-        return me.Properties, me.Body
-      }
-
-      func (me *{{$struct}}) setContent(props properties, body []byte) {
-        me.Properties, me.Body = props, body
-      }
-			{{end}}
-      func (me *{{$struct}}) write(w io.Writer) (err error) {
-				{{if $.HasType "bit" $method}}var bits byte{{end}}
-        {{.Fields | $.Fieldsets | $.Partial "enc-"}}
-        return
-      }
-
-      func (me *{{$struct}}) read(r io.Reader) (err error) {
-				{{if $.HasType "bit" $method}}var bits byte{{end}}
-        {{.Fields | $.Fieldsets | $.Partial "dec-"}}
-        return
-      }
-    {{end}}
-  {{end}}
-
-  func (me *reader) parseMethodFrame(channel uint16, size uint32) (f frame, err error) {
-    mf := &methodFrame {
-      ChannelId: channel,
-    }
-
-    if err = binary.Read(me.r, binary.BigEndian, &mf.ClassId); err != nil {
-      return
-    }
-
-    if err = binary.Read(me.r, binary.BigEndian, &mf.MethodId); err != nil {
-      return
-    }
-
-    switch mf.ClassId {
-    {{range .Classes}}
-    {{$class := .}}
-    case {{.Index}}: // {{.Name}}
-      switch mf.MethodId {
-      {{range .Methods}}
-      case {{.Index}}: // {{$class.Name}} {{.Name}}
-        //fmt.Println("NextMethod: class:{{$class.Index}} method:{{.Index}}")
-        method := &{{$.StructName $class.Name .Name}}{}
-        if err = method.read(me.r); err != nil {
-          return
-        }
-        mf.Method = method
-      {{end}}
-      default:
-        return nil, fmt.Errorf("Bad method frame, unknown method %d for class %d", mf.MethodId, mf.ClassId)
-      }
-    {{end}}
-    default:
-      return nil, fmt.Errorf("Bad method frame, unknown class %d", mf.ClassId)
-    }
-
-    return mf, nil
-  }
-  {{end}}
-
-  {{define "enc-bit"}}
-    {{range $off, $field := .Fields}}
-    if me.{{$field | $.FieldName}} { bits |= 1 << {{$off}} }
-    {{end}}
-    if err = binary.Write(w, binary.BigEndian, bits); err != nil { return }
-  {{end}}
-  {{define "enc-octet"}}
-    {{range .Fields}} if err = binary.Write(w, binary.BigEndian, me.{{. | $.FieldName}}); err != nil { return }
-    {{end}}
-  {{end}}
-  {{define "enc-shortshort"}}
-    {{range .Fields}} if err = binary.Write(w, binary.BigEndian, me.{{. | $.FieldName}}); err != nil { return }
-    {{end}}
-  {{end}}
-  {{define "enc-short"}}
-    {{range .Fields}} if err = binary.Write(w, binary.BigEndian, me.{{. | $.FieldName}}); err != nil { return }
-    {{end}}
-  {{end}}
-  {{define "enc-long"}}
-    {{range .Fields}} if err = binary.Write(w, binary.BigEndian, me.{{. | $.FieldName}}); err != nil { return }
-    {{end}}
-  {{end}}
-  {{define "enc-longlong"}}
-    {{range .Fields}} if err = binary.Write(w, binary.BigEndian, me.{{. | $.FieldName}}); err != nil { return }
-    {{end}}
-  {{end}}
-  {{define "enc-timestamp"}}
-    {{range .Fields}} if err = writeTimestamp(w, me.{{. | $.FieldName}}); err != nil { return }
-    {{end}}
-  {{end}}
-  {{define "enc-shortstr"}}
-    {{range .Fields}} if err = writeShortstr(w, me.{{. | $.FieldName}}); err != nil { return }
-    {{end}}
-  {{end}}
-  {{define "enc-longstr"}}
-    {{range .Fields}} if err = writeLongstr(w, me.{{. | $.FieldName}}); err != nil { return }
-    {{end}}
-  {{end}}
-  {{define "enc-table"}}
-    {{range .Fields}} if err = writeTable(w, me.{{. | $.FieldName}}); err != nil { return }
-    {{end}}
-  {{end}}
-
-  {{define "dec-bit"}}
-    if err = binary.Read(r, binary.BigEndian, &bits); err != nil {
-      return
-    }
-    {{range $off, $field := .Fields}} me.{{$field | $.FieldName}} = (bits & (1 << {{$off}}) > 0)
-    {{end}}
-  {{end}}
-  {{define "dec-octet"}}
-    {{range .Fields}} if err = binary.Read(r, binary.BigEndian, &me.{{. | $.FieldName}}); err != nil { return }
-    {{end}}
-  {{end}}
-  {{define "dec-shortshort"}}
-    {{range .Fields}} if err = binary.Read(r, binary.BigEndian, &me.{{. | $.FieldName}}); err != nil { return }
-    {{end}}
-  {{end}}
-  {{define "dec-short"}}
-    {{range .Fields}} if err = binary.Read(r, binary.BigEndian, &me.{{. | $.FieldName}}); err != nil { return }
-    {{end}}
-  {{end}}
-  {{define "dec-long"}}
-    {{range .Fields}} if err = binary.Read(r, binary.BigEndian, &me.{{. | $.FieldName}}); err != nil { return }
-    {{end}}
-  {{end}}
-  {{define "dec-longlong"}}
-    {{range .Fields}} if err = binary.Read(r, binary.BigEndian, &me.{{. | $.FieldName}}); err != nil { return }
-    {{end}}
-  {{end}}
-  {{define "dec-timestamp"}}
-    {{range .Fields}} if me.{{. | $.FieldName}}, err = readTimestamp(r); err != nil { return }
-    {{end}}
-  {{end}}
-  {{define "dec-shortstr"}}
-    {{range .Fields}} if me.{{. | $.FieldName}}, err = readShortstr(r); err != nil { return }
-    {{end}}
-  {{end}}
-  {{define "dec-longstr"}}
-    {{range .Fields}} if me.{{. | $.FieldName}}, err = readLongstr(r); err != nil { return }
-    {{end}}
-  {{end}}
-  {{define "dec-table"}}
-    {{range .Fields}} if me.{{. | $.FieldName}}, err = readTable(r); err != nil { return }
-    {{end}}
-  {{end}}
-
-  `))
-)
-
-func (me *Constant) IsError() bool {
-	return strings.Contains(me.Class, "error")
-}
-
-func (me *Constant) IsSoftError() bool {
-	return me.Class == "soft-error"
-}
-
-func (me *renderer) Partial(prefix string, fields []fieldset) (s string, err error) {
-	var buf bytes.Buffer
-	for _, set := range fields {
-		name := prefix + set.AmqpType
-		t := packageTemplate.Lookup(name)
-		if t == nil {
-			return "", errors.New(fmt.Sprintf("Missing template: %s", name))
-		}
-		if err = t.Execute(&buf, set); err != nil {
-			return
-		}
-	}
-	return string(buf.Bytes()), nil
-}
-
-// Groups the fields so that the right encoder/decoder can be called
-func (me *renderer) Fieldsets(fields []Field) (f []fieldset, err error) {
-	if len(fields) > 0 {
-		for _, field := range fields {
-			cur := fieldset{}
-			cur.AmqpType, err = me.FieldType(field)
-			if err != nil {
-				return
-			}
-
-			cur.NativeType, err = me.NativeType(cur.AmqpType)
-			if err != nil {
-				return
-			}
-			cur.Fields = append(cur.Fields, field)
-			f = append(f, cur)
-		}
-
-		i, j := 0, 1
-		for j < len(f) {
-			if f[i].AmqpType == f[j].AmqpType {
-				f[i].Fields = append(f[i].Fields, f[j].Fields...)
-			} else {
-				i++
-				f[i] = f[j]
-			}
-			j++
-		}
-		return f[:i+1], nil
-	}
-
-	return
-}
-
-func (me *renderer) HasType(typ string, method Method) bool {
-	for _, f := range method.Fields {
-		name, _ := me.FieldType(f)
-		if name == typ {
-			return true
-		}
-	}
-	return false
-}
-
-func (me *renderer) HasField(field string, method Method) bool {
-	for _, f := range method.Fields {
-		name := me.FieldName(f)
-		if name == field {
-			return true
-		}
-	}
-	return false
-}
-
-func (me *renderer) Domain(field Field) (domain Domain, err error) {
-	for _, domain = range me.Root.Domains {
-		if field.Domain == domain.Name {
-			return
-		}
-	}
-	return domain, nil
-	//return domain, ErrUnknownDomain
-}
-
-func (me *renderer) FieldName(field Field) (t string) {
-	t = public(field.Name)
-
-	if field.Reserved {
-		t = strings.ToLower(t)
-	}
-
-	return
-}
-
-func (me *renderer) FieldType(field Field) (t string, err error) {
-	t = field.Type
-
-	if t == "" {
-		var domain Domain
-		domain, err = me.Domain(field)
-		if err != nil {
-			return "", err
-		}
-		t = domain.Type
-	}
-
-	return
-}
-
-func (me *renderer) NativeType(amqpType string) (t string, err error) {
-	if t, ok := amqpTypeToNative[amqpType]; ok {
-		return t, nil
-	}
-	return "", ErrUnknownType
-}
-
-func (me *renderer) Tag(d Domain) string {
-	label := "`"
-
-	label += `domain:"` + d.Name + `"`
-
-	if len(d.Type) > 0 {
-		label += `,type:"` + d.Type + `"`
-	}
-
-	label += "`"
-
-	return label
-}
-
-func (me *renderer) StructName(parts ...string) string {
-	return parts[0] + public(parts[1:]...)
-}
-
-func clean(body string) (res string) {
-	return strings.Replace(body, "\r", "", -1)
-}
-
-func private(parts ...string) string {
-	return export(regexp.MustCompile(`[-_]\w`), parts...)
-}
-
-func public(parts ...string) string {
-	return export(regexp.MustCompile(`^\w|[-_]\w`), parts...)
-}
-
-func export(delim *regexp.Regexp, parts ...string) (res string) {
-	for _, in := range parts {
-
-		res += delim.ReplaceAllStringFunc(in, func(match string) string {
-			switch len(match) {
-			case 1:
-				return strings.ToUpper(match)
-			case 2:
-				return strings.ToUpper(match[1:])
-			}
-			panic("unreachable")
-		})
-	}
-
-	return
-}
-
-func main() {
-	var r renderer
-
-	spec, err := ioutil.ReadAll(os.Stdin)
-	if err != nil {
-		log.Fatalln("Please pass spec on stdin", err)
-	}
-
-	err = xml.Unmarshal(spec, &r.Root)
-
-	if err != nil {
-		log.Fatalln("Could not parse XML:", err)
-	}
-
-	if err = packageTemplate.Execute(os.Stdout, &r); err != nil {
-		log.Fatalln("Generate error: ", err)
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/streadway/amqp/spec091.go b/Godeps/_workspace/src/github.com/streadway/amqp/spec091.go
deleted file mode 100644
index a95380303..000000000
--- a/Godeps/_workspace/src/github.com/streadway/amqp/spec091.go
+++ /dev/null
@@ -1,3306 +0,0 @@
-// Copyright (c) 2012, Sean Treadway, SoundCloud Ltd.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-// Source code and contact info at http://github.com/streadway/amqp
-
-/* GENERATED FILE - DO NOT EDIT */
-/* Rebuild from the spec/gen.go tool */
-
-package amqp
-
-import (
-	"encoding/binary"
-	"fmt"
-	"io"
-)
-
-// Error codes that can be sent from the server during a connection or
-// channel exception or used by the client to indicate a class of error like
-// ErrCredentials.  The text of the error is likely more interesting than
-// these constants.
-const (
-	frameMethod        = 1
-	frameHeader        = 2
-	frameBody          = 3
-	frameHeartbeat     = 8
-	frameMinSize       = 4096
-	frameEnd           = 206
-	replySuccess       = 200
-	ContentTooLarge    = 311
-	NoRoute            = 312
-	NoConsumers        = 313
-	ConnectionForced   = 320
-	InvalidPath        = 402
-	AccessRefused      = 403
-	NotFound           = 404
-	ResourceLocked     = 405
-	PreconditionFailed = 406
-	FrameError         = 501
-	SyntaxError        = 502
-	CommandInvalid     = 503
-	ChannelError       = 504
-	UnexpectedFrame    = 505
-	ResourceError      = 506
-	NotAllowed         = 530
-	NotImplemented     = 540
-	InternalError      = 541
-)
-
-func isSoftExceptionCode(code int) bool {
-	switch code {
-	case 311:
-		return true
-	case 312:
-		return true
-	case 313:
-		return true
-	case 403:
-		return true
-	case 404:
-		return true
-	case 405:
-		return true
-	case 406:
-		return true
-
-	}
-	return false
-}
-
-type connectionStart struct {
-	VersionMajor     byte
-	VersionMinor     byte
-	ServerProperties Table
-	Mechanisms       string
-	Locales          string
-}
-
-func (me *connectionStart) id() (uint16, uint16) {
-	return 10, 10
-}
-
-func (me *connectionStart) wait() bool {
-	return true
-}
-
-func (me *connectionStart) write(w io.Writer) (err error) {
-
-	if err = binary.Write(w, binary.BigEndian, me.VersionMajor); err != nil {
-		return
-	}
-	if err = binary.Write(w, binary.BigEndian, me.VersionMinor); err != nil {
-		return
-	}
-
-	if err = writeTable(w, me.ServerProperties); err != nil {
-		return
-	}
-
-	if err = writeLongstr(w, me.Mechanisms); err != nil {
-		return
-	}
-	if err = writeLongstr(w, me.Locales); err != nil {
-		return
-	}
-
-	return
-}
-
-func (me *connectionStart) read(r io.Reader) (err error) {
-
-	if err = binary.Read(r, binary.BigEndian, &me.VersionMajor); err != nil {
-		return
-	}
-	if err = binary.Read(r, binary.BigEndian, &me.VersionMinor); err != nil {
-		return
-	}
-
-	if me.ServerProperties, err = readTable(r); err != nil {
-		return
-	}
-
-	if me.Mechanisms, err = readLongstr(r); err != nil {
-		return
-	}
-	if me.Locales, err = readLongstr(r); err != nil {
-		return
-	}
-
-	return
-}
-
-type connectionStartOk struct {
-	ClientProperties Table
-	Mechanism        string
-	Response         string
-	Locale           string
-}
-
-func (me *connectionStartOk) id() (uint16, uint16) {
-	return 10, 11
-}
-
-func (me *connectionStartOk) wait() bool {
-	return true
-}
-
-func (me *connectionStartOk) write(w io.Writer) (err error) {
-
-	if err = writeTable(w, me.ClientProperties); err != nil {
-		return
-	}
-
-	if err = writeShortstr(w, me.Mechanism); err != nil {
-		return
-	}
-
-	if err = writeLongstr(w, me.Response); err != nil {
-		return
-	}
-
-	if err = writeShortstr(w, me.Locale); err != nil {
-		return
-	}
-
-	return
-}
-
-func (me *connectionStartOk) read(r io.Reader) (err error) {
-
-	if me.ClientProperties, err = readTable(r); err != nil {
-		return
-	}
-
-	if me.Mechanism, err = readShortstr(r); err != nil {
-		return
-	}
-
-	if me.Response, err = readLongstr(r); err != nil {
-		return
-	}
-
-	if me.Locale, err = readShortstr(r); err != nil {
-		return
-	}
-
-	return
-}
-
-type connectionSecure struct {
-	Challenge string
-}
-
-func (me *connectionSecure) id() (uint16, uint16) {
-	return 10, 20
-}
-
-func (me *connectionSecure) wait() bool {
-	return true
-}
-
-func (me *connectionSecure) write(w io.Writer) (err error) {
-
-	if err = writeLongstr(w, me.Challenge); err != nil {
-		return
-	}
-
-	return
-}
-
-func (me *connectionSecure) read(r io.Reader) (err error) {
-
-	if me.Challenge, err = readLongstr(r); err != nil {
-		return
-	}
-
-	return
-}
-
-type connectionSecureOk struct {
-	Response string
-}
-
-func (me *connectionSecureOk) id() (uint16, uint16) {
-	return 10, 21
-}
-
-func (me *connectionSecureOk) wait() bool {
-	return true
-}
-
-func (me *connectionSecureOk) write(w io.Writer) (err error) {
-
-	if err = writeLongstr(w, me.Response); err != nil {
-		return
-	}
-
-	return
-}
-
-func (me *connectionSecureOk) read(r io.Reader) (err error) {
-
-	if me.Response, err = readLongstr(r); err != nil {
-		return
-	}
-
-	return
-}
-
-type connectionTune struct {
-	ChannelMax uint16
-	FrameMax   uint32
-	Heartbeat  uint16
-}
-
-func (me *connectionTune) id() (uint16, uint16) {
-	return 10, 30
-}
-
-func (me *connectionTune) wait() bool {
-	return true
-}
-
-func (me *connectionTune) write(w io.Writer) (err error) {
-
-	if err = binary.Write(w, binary.BigEndian, me.ChannelMax); err != nil {
-		return
-	}
-
-	if err = binary.Write(w, binary.BigEndian, me.FrameMax); err != nil {
-		return
-	}
-
-	if err = binary.Write(w, binary.BigEndian, me.Heartbeat); err != nil {
-		return
-	}
-
-	return
-}
-
-func (me *connectionTune) read(r io.Reader) (err error) {
-
-	if err = binary.Read(r, binary.BigEndian, &me.ChannelMax); err != nil {
-		return
-	}
-
-	if err = binary.Read(r, binary.BigEndian, &me.FrameMax); err != nil {
-		return
-	}
-
-	if err = binary.Read(r, binary.BigEndian, &me.Heartbeat); err != nil {
-		return
-	}
-
-	return
-}
-
-type connectionTuneOk struct {
-	ChannelMax uint16
-	FrameMax   uint32
-	Heartbeat  uint16
-}
-
-func (me *connectionTuneOk) id() (uint16, uint16) {
-	return 10, 31
-}
-
-func (me *connectionTuneOk) wait() bool {
-	return true
-}
-
-func (me *connectionTuneOk) write(w io.Writer) (err error) {
-
-	if err = binary.Write(w, binary.BigEndian, me.ChannelMax); err != nil {
-		return
-	}
-
-	if err = binary.Write(w, binary.BigEndian, me.FrameMax); err != nil {
-		return
-	}
-
-	if err = binary.Write(w, binary.BigEndian, me.Heartbeat); err != nil {
-		return
-	}
-
-	return
-}
-
-func (me *connectionTuneOk) read(r io.Reader) (err error) {
-
-	if err = binary.Read(r, binary.BigEndian, &me.ChannelMax); err != nil {
-		return
-	}
-
-	if err = binary.Read(r, binary.BigEndian, &me.FrameMax); err != nil {
-		return
-	}
-
-	if err = binary.Read(r, binary.BigEndian, &me.Heartbeat); err != nil {
-		return
-	}
-
-	return
-}
-
-type connectionOpen struct {
-	VirtualHost string
-	reserved1   string
-	reserved2   bool
-}
-
-func (me *connectionOpen) id() (uint16, uint16) {
-	return 10, 40
-}
-
-func (me *connectionOpen) wait() bool {
-	return true
-}
-
-func (me *connectionOpen) write(w io.Writer) (err error) {
-	var bits byte
-
-	if err = writeShortstr(w, me.VirtualHost); err != nil {
-		return
-	}
-	if err = writeShortstr(w, me.reserved1); err != nil {
-		return
-	}
-
-	if me.reserved2 {
-		bits |= 1 << 0
-	}
-
-	if err = binary.Write(w, binary.BigEndian, bits); err != nil {
-		return
-	}
-
-	return
-}
-
-func (me *connectionOpen) read(r io.Reader) (err error) {
-	var bits byte
-
-	if me.VirtualHost, err = readShortstr(r); err != nil {
-		return
-	}
-	if me.reserved1, err = readShortstr(r); err != nil {
-		return
-	}
-
-	if err = binary.Read(r, binary.BigEndian, &bits); err != nil {
-		return
-	}
-	me.reserved2 = (bits&(1<<0) > 0)
-
-	return
-}
-
-type connectionOpenOk struct {
-	reserved1 string
-}
-
-func (me *connectionOpenOk) id() (uint16, uint16) {
-	return 10, 41
-}
-
-func (me *connectionOpenOk) wait() bool {
-	return true
-}
-
-func (me *connectionOpenOk) write(w io.Writer) (err error) {
-
-	if err = writeShortstr(w, me.reserved1); err != nil {
-		return
-	}
-
-	return
-}
-
-func (me *connectionOpenOk) read(r io.Reader) (err error) {
-
-	if me.reserved1, err = readShortstr(r); err != nil {
-		return
-	}
-
-	return
-}
-
-type connectionClose struct {
-	ReplyCode uint16
-	ReplyText string
-	ClassId   uint16
-	MethodId  uint16
-}
-
-func (me *connectionClose) id() (uint16, uint16) {
-	return 10, 50
-}
-
-func (me *connectionClose) wait() bool {
-	return true
-}
-
-func (me *connectionClose) write(w io.Writer) (err error) {
-
-	if err = binary.Write(w, binary.BigEndian, me.ReplyCode); err != nil {
-		return
-	}
-
-	if err = writeShortstr(w, me.ReplyText); err != nil {
-		return
-	}
-
-	if err = binary.Write(w, binary.BigEndian, me.ClassId); err != nil {
-		return
-	}
-	if err = binary.Write(w, binary.BigEndian, me.MethodId); err != nil {
-		return
-	}
-
-	return
-}
-
-func (me *connectionClose) read(r io.Reader) (err error) {
-
-	if err = binary.Read(r, binary.BigEndian, &me.ReplyCode); err != nil {
-		return
-	}
-
-	if me.ReplyText, err = readShortstr(r); err != nil {
-		return
-	}
-
-	if err = binary.Read(r, binary.BigEndian, &me.ClassId); err != nil {
-		return
-	}
-	if err = binary.Read(r, binary.BigEndian, &me.MethodId); err != nil {
-		return
-	}
-
-	return
-}
-
-type connectionCloseOk struct {
-}
-
-func (me *connectionCloseOk) id() (uint16, uint16) {
-	return 10, 51
-}
-
-func (me *connectionCloseOk) wait() bool {
-	return true
-}
-
-func (me *connectionCloseOk) write(w io.Writer) (err error) {
-
-	return
-}
-
-func (me *connectionCloseOk) read(r io.Reader) (err error) {
-
-	return
-}
-
-type connectionBlocked struct {
-	Reason string
-}
-
-func (me *connectionBlocked) id() (uint16, uint16) {
-	return 10, 60
-}
-
-func (me *connectionBlocked) wait() bool {
-	return false
-}
-
-func (me *connectionBlocked) write(w io.Writer) (err error) {
-
-	if err = writeShortstr(w, me.Reason); err != nil {
-		return
-	}
-
-	return
-}
-
-func (me *connectionBlocked) read(r io.Reader) (err error) {
-
-	if me.Reason, err = readShortstr(r); err != nil {
-		return
-	}
-
-	return
-}
-
-type connectionUnblocked struct {
-}
-
-func (me *connectionUnblocked) id() (uint16, uint16) {
-	return 10, 61
-}
-
-func (me *connectionUnblocked) wait() bool {
-	return false
-}
-
-func (me *connectionUnblocked) write(w io.Writer) (err error) {
-
-	return
-}
-
-func (me *connectionUnblocked) read(r io.Reader) (err error) {
-
-	return
-}
-
-type channelOpen struct {
-	reserved1 string
-}
-
-func (me *channelOpen) id() (uint16, uint16) {
-	return 20, 10
-}
-
-func (me *channelOpen) wait() bool {
-	return true
-}
-
-func (me *channelOpen) write(w io.Writer) (err error) {
-
-	if err = writeShortstr(w, me.reserved1); err != nil {
-		return
-	}
-
-	return
-}
-
-func (me *channelOpen) read(r io.Reader) (err error) {
-
-	if me.reserved1, err = readShortstr(r); err != nil {
-		return
-	}
-
-	return
-}
-
-type channelOpenOk struct {
-	reserved1 string
-}
-
-func (me *channelOpenOk) id() (uint16, uint16) {
-	return 20, 11
-}
-
-func (me *channelOpenOk) wait() bool {
-	return true
-}
-
-func (me *channelOpenOk) write(w io.Writer) (err error) {
-
-	if err = writeLongstr(w, me.reserved1); err != nil {
-		return
-	}
-
-	return
-}
-
-func (me *channelOpenOk) read(r io.Reader) (err error) {
-
-	if me.reserved1, err = readLongstr(r); err != nil {
-		return
-	}
-
-	return
-}
-
-type channelFlow struct {
-	Active bool
-}
-
-func (me *channelFlow) id() (uint16, uint16) {
-	return 20, 20
-}
-
-func (me *channelFlow) wait() bool {
-	return true
-}
-
-func (me *channelFlow) write(w io.Writer) (err error) {
-	var bits byte
-
-	if me.Active {
-		bits |= 1 << 0
-	}
-
-	if err = binary.Write(w, binary.BigEndian, bits); err != nil {
-		return
-	}
-
-	return
-}
-
-func (me *channelFlow) read(r io.Reader) (err error) {
-	var bits byte
-
-	if err = binary.Read(r, binary.BigEndian, &bits); err != nil {
-		return
-	}
-	me.Active = (bits&(1<<0) > 0)
-
-	return
-}
-
-type channelFlowOk struct {
-	Active bool
-}
-
-func (me *channelFlowOk) id() (uint16, uint16) {
-	return 20, 21
-}
-
-func (me *channelFlowOk) wait() bool {
-	return false
-}
-
-func (me *channelFlowOk) write(w io.Writer) (err error) {
-	var bits byte
-
-	if me.Active {
-		bits |= 1 << 0
-	}
-
-	if err = binary.Write(w, binary.BigEndian, bits); err != nil {
-		return
-	}
-
-	return
-}
-
-func (me *channelFlowOk) read(r io.Reader) (err error) {
-	var bits byte
-
-	if err = binary.Read(r, binary.BigEndian, &bits); err != nil {
-		return
-	}
-	me.Active = (bits&(1<<0) > 0)
-
-	return
-}
-
-type channelClose struct {
-	ReplyCode uint16
-	ReplyText string
-	ClassId   uint16
-	MethodId  uint16
-}
-
-func (me *channelClose) id() (uint16, uint16) {
-	return 20, 40
-}
-
-func (me *channelClose) wait() bool {
-	return true
-}
-
-func (me *channelClose) write(w io.Writer) (err error) {
-
-	if err = binary.Write(w, binary.BigEndian, me.ReplyCode); err != nil {
-		return
-	}
-
-	if err = writeShortstr(w, me.ReplyText); err != nil {
-		return
-	}
-
-	if err = binary.Write(w, binary.BigEndian, me.ClassId); err != nil {
-		return
-	}
-	if err = binary.Write(w, binary.BigEndian, me.MethodId); err != nil {
-		return
-	}
-
-	return
-}
-
-func (me *channelClose) read(r io.Reader) (err error) {
-
-	if err = binary.Read(r, binary.BigEndian, &me.ReplyCode); err != nil {
-		return
-	}
-
-	if me.ReplyText, err = readShortstr(r); err != nil {
-		return
-	}
-
-	if err = binary.Read(r, binary.BigEndian, &me.ClassId); err != nil {
-		return
-	}
-	if err = binary.Read(r, binary.BigEndian, &me.MethodId); err != nil {
-		return
-	}
-
-	return
-}
-
-type channelCloseOk struct {
-}
-
-func (me *channelCloseOk) id() (uint16, uint16) {
-	return 20, 41
-}
-
-func (me *channelCloseOk) wait() bool {
-	return true
-}
-
-func (me *channelCloseOk) write(w io.Writer) (err error) {
-
-	return
-}
-
-func (me *channelCloseOk) read(r io.Reader) (err error) {
-
-	return
-}
-
-type exchangeDeclare struct {
-	reserved1  uint16
-	Exchange   string
-	Type       string
-	Passive    bool
-	Durable    bool
-	AutoDelete bool
-	Internal   bool
-	NoWait     bool
-	Arguments  Table
-}
-
-func (me *exchangeDeclare) id() (uint16, uint16) {
-	return 40, 10
-}
-
-func (me *exchangeDeclare) wait() bool {
-	return true && !me.NoWait
-}
-
-func (me *exchangeDeclare) write(w io.Writer) (err error) {
-	var bits byte
-
-	if err = binary.Write(w, binary.BigEndian, me.reserved1); err != nil {
-		return
-	}
-
-	if err = writeShortstr(w, me.Exchange); err != nil {
-		return
-	}
-	if err = writeShortstr(w, me.Type); err != nil {
-		return
-	}
-
-	if me.Passive {
-		bits |= 1 << 0
-	}
-
-	if me.Durable {
-		bits |= 1 << 1
-	}
-
-	if me.AutoDelete {
-		bits |= 1 << 2
-	}
-
-	if me.Internal {
-		bits |= 1 << 3
-	}
-
-	if me.NoWait {
-		bits |= 1 << 4
-	}
-
-	if err = binary.Write(w, binary.BigEndian, bits); err != nil {
-		return
-	}
-
-	if err = writeTable(w, me.Arguments); err != nil {
-		return
-	}
-
-	return
-}
-
-func (me *exchangeDeclare) read(r io.Reader) (err error) {
-	var bits byte
-
-	if err = binary.Read(r, binary.BigEndian, &me.reserved1); err != nil {
-		return
-	}
-
-	if me.Exchange, err = readShortstr(r); err != nil {
-		return
-	}
-	if me.Type, err = readShortstr(r); err != nil {
-		return
-	}
-
-	if err = binary.Read(r, binary.BigEndian, &bits); err != nil {
-		return
-	}
-	me.Passive = (bits&(1<<0) > 0)
-	me.Durable = (bits&(1<<1) > 0)
-	me.AutoDelete = (bits&(1<<2) > 0)
-	me.Internal = (bits&(1<<3) > 0)
-	me.NoWait = (bits&(1<<4) > 0)
-
-	if me.Arguments, err = readTable(r); err != nil {
-		return
-	}
-
-	return
-}
-
-type exchangeDeclareOk struct {
-}
-
-func (me *exchangeDeclareOk) id() (uint16, uint16) {
-	return 40, 11
-}
-
-func (me *exchangeDeclareOk) wait() bool {
-	return true
-}
-
-func (me *exchangeDeclareOk) write(w io.Writer) (err error) {
-
-	return
-}
-
-func (me *exchangeDeclareOk) read(r io.Reader) (err error) {
-
-	return
-}
-
-type exchangeDelete struct {
-	reserved1 uint16
-	Exchange  string
-	IfUnused  bool
-	NoWait    bool
-}
-
-func (me *exchangeDelete) id() (uint16, uint16) {
-	return 40, 20
-}
-
-func (me *exchangeDelete) wait() bool {
-	return true && !me.NoWait
-}
-
-func (me *exchangeDelete) write(w io.Writer) (err error) {
-	var bits byte
-
-	if err = binary.Write(w, binary.BigEndian, me.reserved1); err != nil {
-		return
-	}
-
-	if err = writeShortstr(w, me.Exchange); err != nil {
-		return
-	}
-
-	if me.IfUnused {
-		bits |= 1 << 0
-	}
-
-	if me.NoWait {
-		bits |= 1 << 1
-	}
-
-	if err = binary.Write(w, binary.BigEndian, bits); err != nil {
-		return
-	}
-
-	return
-}
-
-func (me *exchangeDelete) read(r io.Reader) (err error) {
-	var bits byte
-
-	if err = binary.Read(r, binary.BigEndian, &me.reserved1); err != nil {
-		return
-	}
-
-	if me.Exchange, err = readShortstr(r); err != nil {
-		return
-	}
-
-	if err = binary.Read(r, binary.BigEndian, &bits); err != nil {
-		return
-	}
-	me.IfUnused = (bits&(1<<0) > 0)
-	me.NoWait = (bits&(1<<1) > 0)
-
-	return
-}
-
-type exchangeDeleteOk struct {
-}
-
-func (me *exchangeDeleteOk) id() (uint16, uint16) {
-	return 40, 21
-}
-
-func (me *exchangeDeleteOk) wait() bool {
-	return true
-}
-
-func (me *exchangeDeleteOk) write(w io.Writer) (err error) {
-
-	return
-}
-
-func (me *exchangeDeleteOk) read(r io.Reader) (err error) {
-
-	return
-}
-
-type exchangeBind struct {
-	reserved1   uint16
-	Destination string
-	Source      string
-	RoutingKey  string
-	NoWait      bool
-	Arguments   Table
-}
-
-func (me *exchangeBind) id() (uint16, uint16) {
-	return 40, 30
-}
-
-func (me *exchangeBind) wait() bool {
-	return true && !me.NoWait
-}
-
-func (me *exchangeBind) write(w io.Writer) (err error) {
-	var bits byte
-
-	if err = binary.Write(w, binary.BigEndian, me.reserved1); err != nil {
-		return
-	}
-
-	if err = writeShortstr(w, me.Destination); err != nil {
-		return
-	}
-	if err = writeShortstr(w, me.Source); err != nil {
-		return
-	}
-	if err = writeShortstr(w, me.RoutingKey); err != nil {
-		return
-	}
-
-	if me.NoWait {
-		bits |= 1 << 0
-	}
-
-	if err = binary.Write(w, binary.BigEndian, bits); err != nil {
-		return
-	}
-
-	if err = writeTable(w, me.Arguments); err != nil {
-		return
-	}
-
-	return
-}
-
-func (me *exchangeBind) read(r io.Reader) (err error) {
-	var bits byte
-
-	if err = binary.Read(r, binary.BigEndian, &me.reserved1); err != nil {
-		return
-	}
-
-	if me.Destination, err = readShortstr(r); err != nil {
-		return
-	}
-	if me.Source, err = readShortstr(r); err != nil {
-		return
-	}
-	if me.RoutingKey, err = readShortstr(r); err != nil {
-		return
-	}
-
-	if err = binary.Read(r, binary.BigEndian, &bits); err != nil {
-		return
-	}
-	me.NoWait = (bits&(1<<0) > 0)
-
-	if me.Arguments, err = readTable(r); err != nil {
-		return
-	}
-
-	return
-}
-
-type exchangeBindOk struct {
-}
-
-func (me *exchangeBindOk) id() (uint16, uint16) {
-	return 40, 31
-}
-
-func (me *exchangeBindOk) wait() bool {
-	return true
-}
-
-func (me *exchangeBindOk) write(w io.Writer) (err error) {
-
-	return
-}
-
-func (me *exchangeBindOk) read(r io.Reader) (err error) {
-
-	return
-}
-
-type exchangeUnbind struct {
-	reserved1   uint16
-	Destination string
-	Source      string
-	RoutingKey  string
-	NoWait      bool
-	Arguments   Table
-}
-
-func (me *exchangeUnbind) id() (uint16, uint16) {
-	return 40, 40
-}
-
-func (me *exchangeUnbind) wait() bool {
-	return true && !me.NoWait
-}
-
-func (me *exchangeUnbind) write(w io.Writer) (err error) {
-	var bits byte
-
-	if err = binary.Write(w, binary.BigEndian, me.reserved1); err != nil {
-		return
-	}
-
-	if err = writeShortstr(w, me.Destination); err != nil {
-		return
-	}
-	if err = writeShortstr(w, me.Source); err != nil {
-		return
-	}
-	if err = writeShortstr(w, me.RoutingKey); err != nil {
-		return
-	}
-
-	if me.NoWait {
-		bits |= 1 << 0
-	}
-
-	if err = binary.Write(w, binary.BigEndian, bits); err != nil {
-		return
-	}
-
-	if err = writeTable(w, me.Arguments); err != nil {
-		return
-	}
-
-	return
-}
-
-func (me *exchangeUnbind) read(r io.Reader) (err error) {
-	var bits byte
-
-	if err = binary.Read(r, binary.BigEndian, &me.reserved1); err != nil {
-		return
-	}
-
-	if me.Destination, err = readShortstr(r); err != nil {
-		return
-	}
-	if me.Source, err = readShortstr(r); err != nil {
-		return
-	}
-	if me.RoutingKey, err = readShortstr(r); err != nil {
-		return
-	}
-
-	if err = binary.Read(r, binary.BigEndian, &bits); err != nil {
-		return
-	}
-	me.NoWait = (bits&(1<<0) > 0)
-
-	if me.Arguments, err = readTable(r); err != nil {
-		return
-	}
-
-	return
-}
-
-type exchangeUnbindOk struct {
-}
-
-func (me *exchangeUnbindOk) id() (uint16, uint16) {
-	return 40, 51
-}
-
-func (me *exchangeUnbindOk) wait() bool {
-	return true
-}
-
-func (me *exchangeUnbindOk) write(w io.Writer) (err error) {
-
-	return
-}
-
-func (me *exchangeUnbindOk) read(r io.Reader) (err error) {
-
-	return
-}
-
-type queueDeclare struct {
-	reserved1  uint16
-	Queue      string
-	Passive    bool
-	Durable    bool
-	Exclusive  bool
-	AutoDelete bool
-	NoWait     bool
-	Arguments  Table
-}
-
-func (me *queueDeclare) id() (uint16, uint16) {
-	return 50, 10
-}
-
-func (me *queueDeclare) wait() bool {
-	return true && !me.NoWait
-}
-
-func (me *queueDeclare) write(w io.Writer) (err error) {
-	var bits byte
-
-	if err = binary.Write(w, binary.BigEndian, me.reserved1); err != nil {
-		return
-	}
-
-	if err = writeShortstr(w, me.Queue); err != nil {
-		return
-	}
-
-	if me.Passive {
-		bits |= 1 << 0
-	}
-
-	if me.Durable {
-		bits |= 1 << 1
-	}
-
-	if me.Exclusive {
-		bits |= 1 << 2
-	}
-
-	if me.AutoDelete {
-		bits |= 1 << 3
-	}
-
-	if me.NoWait {
-		bits |= 1 << 4
-	}
-
-	if err = binary.Write(w, binary.BigEndian, bits); err != nil {
-		return
-	}
-
-	if err = writeTable(w, me.Arguments); err != nil {
-		return
-	}
-
-	return
-}
-
-func (me *queueDeclare) read(r io.Reader) (err error) {
-	var bits byte
-
-	if err = binary.Read(r, binary.BigEndian, &me.reserved1); err != nil {
-		return
-	}
-
-	if me.Queue, err = readShortstr(r); err != nil {
-		return
-	}
-
-	if err = binary.Read(r, binary.BigEndian, &bits); err != nil {
-		return
-	}
-	me.Passive = (bits&(1<<0) > 0)
-	me.Durable = (bits&(1<<1) > 0)
-	me.Exclusive = (bits&(1<<2) > 0)
-	me.AutoDelete = (bits&(1<<3) > 0)
-	me.NoWait = (bits&(1<<4) > 0)
-
-	if me.Arguments, err = readTable(r); err != nil {
-		return
-	}
-
-	return
-}
-
-type queueDeclareOk struct {
-	Queue         string
-	MessageCount  uint32
-	ConsumerCount uint32
-}
-
-func (me *queueDeclareOk) id() (uint16, uint16) {
-	return 50, 11
-}
-
-func (me *queueDeclareOk) wait() bool {
-	return true
-}
-
-func (me *queueDeclareOk) write(w io.Writer) (err error) {
-
-	if err = writeShortstr(w, me.Queue); err != nil {
-		return
-	}
-
-	if err = binary.Write(w, binary.BigEndian, me.MessageCount); err != nil {
-		return
-	}
-	if err = binary.Write(w, binary.BigEndian, me.ConsumerCount); err != nil {
-		return
-	}
-
-	return
-}
-
-func (me *queueDeclareOk) read(r io.Reader) (err error) {
-
-	if me.Queue, err = readShortstr(r); err != nil {
-		return
-	}
-
-	if err = binary.Read(r, binary.BigEndian, &me.MessageCount); err != nil {
-		return
-	}
-	if err = binary.Read(r, binary.BigEndian, &me.ConsumerCount); err != nil {
-		return
-	}
-
-	return
-}
-
-type queueBind struct {
-	reserved1  uint16
-	Queue      string
-	Exchange   string
-	RoutingKey string
-	NoWait     bool
-	Arguments  Table
-}
-
-func (me *queueBind) id() (uint16, uint16) {
-	return 50, 20
-}
-
-func (me *queueBind) wait() bool {
-	return true && !me.NoWait
-}
-
-func (me *queueBind) write(w io.Writer) (err error) {
-	var bits byte
-
-	if err = binary.Write(w, binary.BigEndian, me.reserved1); err != nil {
-		return
-	}
-
-	if err = writeShortstr(w, me.Queue); err != nil {
-		return
-	}
-	if err = writeShortstr(w, me.Exchange); err != nil {
-		return
-	}
-	if err = writeShortstr(w, me.RoutingKey); err != nil {
-		return
-	}
-
-	if me.NoWait {
-		bits |= 1 << 0
-	}
-
-	if err = binary.Write(w, binary.BigEndian, bits); err != nil {
-		return
-	}
-
-	if err = writeTable(w, me.Arguments); err != nil {
-		return
-	}
-
-	return
-}
-
-func (me *queueBind) read(r io.Reader) (err error) {
-	var bits byte
-
-	if err = binary.Read(r, binary.BigEndian, &me.reserved1); err != nil {
-		return
-	}
-
-	if me.Queue, err = readShortstr(r); err != nil {
-		return
-	}
-	if me.Exchange, err = readShortstr(r); err != nil {
-		return
-	}
-	if me.RoutingKey, err = readShortstr(r); err != nil {
-		return
-	}
-
-	if err = binary.Read(r, binary.BigEndian, &bits); err != nil {
-		return
-	}
-	me.NoWait = (bits&(1<<0) > 0)
-
-	if me.Arguments, err = readTable(r); err != nil {
-		return
-	}
-
-	return
-}
-
-type queueBindOk struct {
-}
-
-func (me *queueBindOk) id() (uint16, uint16) {
-	return 50, 21
-}
-
-func (me *queueBindOk) wait() bool {
-	return true
-}
-
-func (me *queueBindOk) write(w io.Writer) (err error) {
-
-	return
-}
-
-func (me *queueBindOk) read(r io.Reader) (err error) {
-
-	return
-}
-
-type queueUnbind struct {
-	reserved1  uint16
-	Queue      string
-	Exchange   string
-	RoutingKey string
-	Arguments  Table
-}
-
-func (me *queueUnbind) id() (uint16, uint16) {
-	return 50, 50
-}
-
-func (me *queueUnbind) wait() bool {
-	return true
-}
-
-func (me *queueUnbind) write(w io.Writer) (err error) {
-
-	if err = binary.Write(w, binary.BigEndian, me.reserved1); err != nil {
-		return
-	}
-
-	if err = writeShortstr(w, me.Queue); err != nil {
-		return
-	}
-	if err = writeShortstr(w, me.Exchange); err != nil {
-		return
-	}
-	if err = writeShortstr(w, me.RoutingKey); err != nil {
-		return
-	}
-
-	if err = writeTable(w, me.Arguments); err != nil {
-		return
-	}
-
-	return
-}
-
-func (me *queueUnbind) read(r io.Reader) (err error) {
-
-	if err = binary.Read(r, binary.BigEndian, &me.reserved1); err != nil {
-		return
-	}
-
-	if me.Queue, err = readShortstr(r); err != nil {
-		return
-	}
-	if me.Exchange, err = readShortstr(r); err != nil {
-		return
-	}
-	if me.RoutingKey, err = readShortstr(r); err != nil {
-		return
-	}
-
-	if me.Arguments, err = readTable(r); err != nil {
-		return
-	}
-
-	return
-}
-
-type queueUnbindOk struct {
-}
-
-func (me *queueUnbindOk) id() (uint16, uint16) {
-	return 50, 51
-}
-
-func (me *queueUnbindOk) wait() bool {
-	return true
-}
-
-func (me *queueUnbindOk) write(w io.Writer) (err error) {
-
-	return
-}
-
-func (me *queueUnbindOk) read(r io.Reader) (err error) {
-
-	return
-}
-
-type queuePurge struct {
-	reserved1 uint16
-	Queue     string
-	NoWait    bool
-}
-
-func (me *queuePurge) id() (uint16, uint16) {
-	return 50, 30
-}
-
-func (me *queuePurge) wait() bool {
-	return true && !me.NoWait
-}
-
-func (me *queuePurge) write(w io.Writer) (err error) {
-	var bits byte
-
-	if err = binary.Write(w, binary.BigEndian, me.reserved1); err != nil {
-		return
-	}
-
-	if err = writeShortstr(w, me.Queue); err != nil {
-		return
-	}
-
-	if me.NoWait {
-		bits |= 1 << 0
-	}
-
-	if err = binary.Write(w, binary.BigEndian, bits); err != nil {
-		return
-	}
-
-	return
-}
-
-func (me *queuePurge) read(r io.Reader) (err error) {
-	var bits byte
-
-	if err = binary.Read(r, binary.BigEndian, &me.reserved1); err != nil {
-		return
-	}
-
-	if me.Queue, err = readShortstr(r); err != nil {
-		return
-	}
-
-	if err = binary.Read(r, binary.BigEndian, &bits); err != nil {
-		return
-	}
-	me.NoWait = (bits&(1<<0) > 0)
-
-	return
-}
-
-type queuePurgeOk struct {
-	MessageCount uint32
-}
-
-func (me *queuePurgeOk) id() (uint16, uint16) {
-	return 50, 31
-}
-
-func (me *queuePurgeOk) wait() bool {
-	return true
-}
-
-func (me *queuePurgeOk) write(w io.Writer) (err error) {
-
-	if err = binary.Write(w, binary.BigEndian, me.MessageCount); err != nil {
-		return
-	}
-
-	return
-}
-
-func (me *queuePurgeOk) read(r io.Reader) (err error) {
-
-	if err = binary.Read(r, binary.BigEndian, &me.MessageCount); err != nil {
-		return
-	}
-
-	return
-}
-
-type queueDelete struct {
-	reserved1 uint16
-	Queue     string
-	IfUnused  bool
-	IfEmpty   bool
-	NoWait    bool
-}
-
-func (me *queueDelete) id() (uint16, uint16) {
-	return 50, 40
-}
-
-func (me *queueDelete) wait() bool {
-	return true && !me.NoWait
-}
-
-func (me *queueDelete) write(w io.Writer) (err error) {
-	var bits byte
-
-	if err = binary.Write(w, binary.BigEndian, me.reserved1); err != nil {
-		return
-	}
-
-	if err = writeShortstr(w, me.Queue); err != nil {
-		return
-	}
-
-	if me.IfUnused {
-		bits |= 1 << 0
-	}
-
-	if me.IfEmpty {
-		bits |= 1 << 1
-	}
-
-	if me.NoWait {
-		bits |= 1 << 2
-	}
-
-	if err = binary.Write(w, binary.BigEndian, bits); err != nil {
-		return
-	}
-
-	return
-}
-
-func (me *queueDelete) read(r io.Reader) (err error) {
-	var bits byte
-
-	if err = binary.Read(r, binary.BigEndian, &me.reserved1); err != nil {
-		return
-	}
-
-	if me.Queue, err = readShortstr(r); err != nil {
-		return
-	}
-
-	if err = binary.Read(r, binary.BigEndian, &bits); err != nil {
-		return
-	}
-	me.IfUnused = (bits&(1<<0) > 0)
-	me.IfEmpty = (bits&(1<<1) > 0)
-	me.NoWait = (bits&(1<<2) > 0)
-
-	return
-}
-
-type queueDeleteOk struct {
-	MessageCount uint32
-}
-
-func (me *queueDeleteOk) id() (uint16, uint16) {
-	return 50, 41
-}
-
-func (me *queueDeleteOk) wait() bool {
-	return true
-}
-
-func (me *queueDeleteOk) write(w io.Writer) (err error) {
-
-	if err = binary.Write(w, binary.BigEndian, me.MessageCount); err != nil {
-		return
-	}
-
-	return
-}
-
-func (me *queueDeleteOk) read(r io.Reader) (err error) {
-
-	if err = binary.Read(r, binary.BigEndian, &me.MessageCount); err != nil {
-		return
-	}
-
-	return
-}
-
-type basicQos struct {
-	PrefetchSize  uint32
-	PrefetchCount uint16
-	Global        bool
-}
-
-func (me *basicQos) id() (uint16, uint16) {
-	return 60, 10
-}
-
-func (me *basicQos) wait() bool {
-	return true
-}
-
-func (me *basicQos) write(w io.Writer) (err error) {
-	var bits byte
-
-	if err = binary.Write(w, binary.BigEndian, me.PrefetchSize); err != nil {
-		return
-	}
-
-	if err = binary.Write(w, binary.BigEndian, me.PrefetchCount); err != nil {
-		return
-	}
-
-	if me.Global {
-		bits |= 1 << 0
-	}
-
-	if err = binary.Write(w, binary.BigEndian, bits); err != nil {
-		return
-	}
-
-	return
-}
-
-func (me *basicQos) read(r io.Reader) (err error) {
-	var bits byte
-
-	if err = binary.Read(r, binary.BigEndian, &me.PrefetchSize); err != nil {
-		return
-	}
-
-	if err = binary.Read(r, binary.BigEndian, &me.PrefetchCount); err != nil {
-		return
-	}
-
-	if err = binary.Read(r, binary.BigEndian, &bits); err != nil {
-		return
-	}
-	me.Global = (bits&(1<<0) > 0)
-
-	return
-}
-
-type basicQosOk struct {
-}
-
-func (me *basicQosOk) id() (uint16, uint16) {
-	return 60, 11
-}
-
-func (me *basicQosOk) wait() bool {
-	return true
-}
-
-func (me *basicQosOk) write(w io.Writer) (err error) {
-
-	return
-}
-
-func (me *basicQosOk) read(r io.Reader) (err error) {
-
-	return
-}
-
-type basicConsume struct {
-	reserved1   uint16
-	Queue       string
-	ConsumerTag string
-	NoLocal     bool
-	NoAck       bool
-	Exclusive   bool
-	NoWait      bool
-	Arguments   Table
-}
-
-func (me *basicConsume) id() (uint16, uint16) {
-	return 60, 20
-}
-
-func (me *basicConsume) wait() bool {
-	return true && !me.NoWait
-}
-
-func (me *basicConsume) write(w io.Writer) (err error) {
-	var bits byte
-
-	if err = binary.Write(w, binary.BigEndian, me.reserved1); err != nil {
-		return
-	}
-
-	if err = writeShortstr(w, me.Queue); err != nil {
-		return
-	}
-	if err = writeShortstr(w, me.ConsumerTag); err != nil {
-		return
-	}
-
-	if me.NoLocal {
-		bits |= 1 << 0
-	}
-
-	if me.NoAck {
-		bits |= 1 << 1
-	}
-
-	if me.Exclusive {
-		bits |= 1 << 2
-	}
-
-	if me.NoWait {
-		bits |= 1 << 3
-	}
-
-	if err = binary.Write(w, binary.BigEndian, bits); err != nil {
-		return
-	}
-
-	if err = writeTable(w, me.Arguments); err != nil {
-		return
-	}
-
-	return
-}
-
-func (me *basicConsume) read(r io.Reader) (err error) {
-	var bits byte
-
-	if err = binary.Read(r, binary.BigEndian, &me.reserved1); err != nil {
-		return
-	}
-
-	if me.Queue, err = readShortstr(r); err != nil {
-		return
-	}
-	if me.ConsumerTag, err = readShortstr(r); err != nil {
-		return
-	}
-
-	if err = binary.Read(r, binary.BigEndian, &bits); err != nil {
-		return
-	}
-	me.NoLocal = (bits&(1<<0) > 0)
-	me.NoAck = (bits&(1<<1) > 0)
-	me.Exclusive = (bits&(1<<2) > 0)
-	me.NoWait = (bits&(1<<3) > 0)
-
-	if me.Arguments, err = readTable(r); err != nil {
-		return
-	}
-
-	return
-}
-
-type basicConsumeOk struct {
-	ConsumerTag string
-}
-
-func (me *basicConsumeOk) id() (uint16, uint16) {
-	return 60, 21
-}
-
-func (me *basicConsumeOk) wait() bool {
-	return true
-}
-
-func (me *basicConsumeOk) write(w io.Writer) (err error) {
-
-	if err = writeShortstr(w, me.ConsumerTag); err != nil {
-		return
-	}
-
-	return
-}
-
-func (me *basicConsumeOk) read(r io.Reader) (err error) {
-
-	if me.ConsumerTag, err = readShortstr(r); err != nil {
-		return
-	}
-
-	return
-}
-
-type basicCancel struct {
-	ConsumerTag string
-	NoWait      bool
-}
-
-func (me *basicCancel) id() (uint16, uint16) {
-	return 60, 30
-}
-
-func (me *basicCancel) wait() bool {
-	return true && !me.NoWait
-}
-
-func (me *basicCancel) write(w io.Writer) (err error) {
-	var bits byte
-
-	if err = writeShortstr(w, me.ConsumerTag); err != nil {
-		return
-	}
-
-	if me.NoWait {
-		bits |= 1 << 0
-	}
-
-	if err = binary.Write(w, binary.BigEndian, bits); err != nil {
-		return
-	}
-
-	return
-}
-
-func (me *basicCancel) read(r io.Reader) (err error) {
-	var bits byte
-
-	if me.ConsumerTag, err = readShortstr(r); err != nil {
-		return
-	}
-
-	if err = binary.Read(r, binary.BigEndian, &bits); err != nil {
-		return
-	}
-	me.NoWait = (bits&(1<<0) > 0)
-
-	return
-}
-
-type basicCancelOk struct {
-	ConsumerTag string
-}
-
-func (me *basicCancelOk) id() (uint16, uint16) {
-	return 60, 31
-}
-
-func (me *basicCancelOk) wait() bool {
-	return true
-}
-
-func (me *basicCancelOk) write(w io.Writer) (err error) {
-
-	if err = writeShortstr(w, me.ConsumerTag); err != nil {
-		return
-	}
-
-	return
-}
-
-func (me *basicCancelOk) read(r io.Reader) (err error) {
-
-	if me.ConsumerTag, err = readShortstr(r); err != nil {
-		return
-	}
-
-	return
-}
-
-type basicPublish struct {
-	reserved1  uint16
-	Exchange   string
-	RoutingKey string
-	Mandatory  bool
-	Immediate  bool
-	Properties properties
-	Body       []byte
-}
-
-func (me *basicPublish) id() (uint16, uint16) {
-	return 60, 40
-}
-
-func (me *basicPublish) wait() bool {
-	return false
-}
-
-func (me *basicPublish) getContent() (properties, []byte) {
-	return me.Properties, me.Body
-}
-
-func (me *basicPublish) setContent(props properties, body []byte) {
-	me.Properties, me.Body = props, body
-}
-
-func (me *basicPublish) write(w io.Writer) (err error) {
-	var bits byte
-
-	if err = binary.Write(w, binary.BigEndian, me.reserved1); err != nil {
-		return
-	}
-
-	if err = writeShortstr(w, me.Exchange); err != nil {
-		return
-	}
-	if err = writeShortstr(w, me.RoutingKey); err != nil {
-		return
-	}
-
-	if me.Mandatory {
-		bits |= 1 << 0
-	}
-
-	if me.Immediate {
-		bits |= 1 << 1
-	}
-
-	if err = binary.Write(w, binary.BigEndian, bits); err != nil {
-		return
-	}
-
-	return
-}
-
-func (me *basicPublish) read(r io.Reader) (err error) {
-	var bits byte
-
-	if err = binary.Read(r, binary.BigEndian, &me.reserved1); err != nil {
-		return
-	}
-
-	if me.Exchange, err = readShortstr(r); err != nil {
-		return
-	}
-	if me.RoutingKey, err = readShortstr(r); err != nil {
-		return
-	}
-
-	if err = binary.Read(r, binary.BigEndian, &bits); err != nil {
-		return
-	}
-	me.Mandatory = (bits&(1<<0) > 0)
-	me.Immediate = (bits&(1<<1) > 0)
-
-	return
-}
-
-type basicReturn struct {
-	ReplyCode  uint16
-	ReplyText  string
-	Exchange   string
-	RoutingKey string
-	Properties properties
-	Body       []byte
-}
-
-func (me *basicReturn) id() (uint16, uint16) {
-	return 60, 50
-}
-
-func (me *basicReturn) wait() bool {
-	return false
-}
-
-func (me *basicReturn) getContent() (properties, []byte) {
-	return me.Properties, me.Body
-}
-
-func (me *basicReturn) setContent(props properties, body []byte) {
-	me.Properties, me.Body = props, body
-}
-
-func (me *basicReturn) write(w io.Writer) (err error) {
-
-	if err = binary.Write(w, binary.BigEndian, me.ReplyCode); err != nil {
-		return
-	}
-
-	if err = writeShortstr(w, me.ReplyText); err != nil {
-		return
-	}
-	if err = writeShortstr(w, me.Exchange); err != nil {
-		return
-	}
-	if err = writeShortstr(w, me.RoutingKey); err != nil {
-		return
-	}
-
-	return
-}
-
-func (me *basicReturn) read(r io.Reader) (err error) {
-
-	if err = binary.Read(r, binary.BigEndian, &me.ReplyCode); err != nil {
-		return
-	}
-
-	if me.ReplyText, err = readShortstr(r); err != nil {
-		return
-	}
-	if me.Exchange, err = readShortstr(r); err != nil {
-		return
-	}
-	if me.RoutingKey, err = readShortstr(r); err != nil {
-		return
-	}
-
-	return
-}
-
-type basicDeliver struct {
-	ConsumerTag string
-	DeliveryTag uint64
-	Redelivered bool
-	Exchange    string
-	RoutingKey  string
-	Properties  properties
-	Body        []byte
-}
-
-func (me *basicDeliver) id() (uint16, uint16) {
-	return 60, 60
-}
-
-func (me *basicDeliver) wait() bool {
-	return false
-}
-
-func (me *basicDeliver) getContent() (properties, []byte) {
-	return me.Properties, me.Body
-}
-
-func (me *basicDeliver) setContent(props properties, body []byte) {
-	me.Properties, me.Body = props, body
-}
-
-func (me *basicDeliver) write(w io.Writer) (err error) {
-	var bits byte
-
-	if err = writeShortstr(w, me.ConsumerTag); err != nil {
-		return
-	}
-
-	if err = binary.Write(w, binary.BigEndian, me.DeliveryTag); err != nil {
-		return
-	}
-
-	if me.Redelivered {
-		bits |= 1 << 0
-	}
-
-	if err = binary.Write(w, binary.BigEndian, bits); err != nil {
-		return
-	}
-
-	if err = writeShortstr(w, me.Exchange); err != nil {
-		return
-	}
-	if err = writeShortstr(w, me.RoutingKey); err != nil {
-		return
-	}
-
-	return
-}
-
-func (me *basicDeliver) read(r io.Reader) (err error) {
-	var bits byte
-
-	if me.ConsumerTag, err = readShortstr(r); err != nil {
-		return
-	}
-
-	if err = binary.Read(r, binary.BigEndian, &me.DeliveryTag); err != nil {
-		return
-	}
-
-	if err = binary.Read(r, binary.BigEndian, &bits); err != nil {
-		return
-	}
-	me.Redelivered = (bits&(1<<0) > 0)
-
-	if me.Exchange, err = readShortstr(r); err != nil {
-		return
-	}
-	if me.RoutingKey, err = readShortstr(r); err != nil {
-		return
-	}
-
-	return
-}
-
-type basicGet struct {
-	reserved1 uint16
-	Queue     string
-	NoAck     bool
-}
-
-func (me *basicGet) id() (uint16, uint16) {
-	return 60, 70
-}
-
-func (me *basicGet) wait() bool {
-	return true
-}
-
-func (me *basicGet) write(w io.Writer) (err error) {
-	var bits byte
-
-	if err = binary.Write(w, binary.BigEndian, me.reserved1); err != nil {
-		return
-	}
-
-	if err = writeShortstr(w, me.Queue); err != nil {
-		return
-	}
-
-	if me.NoAck {
-		bits |= 1 << 0
-	}
-
-	if err = binary.Write(w, binary.BigEndian, bits); err != nil {
-		return
-	}
-
-	return
-}
-
-func (me *basicGet) read(r io.Reader) (err error) {
-	var bits byte
-
-	if err = binary.Read(r, binary.BigEndian, &me.reserved1); err != nil {
-		return
-	}
-
-	if me.Queue, err = readShortstr(r); err != nil {
-		return
-	}
-
-	if err = binary.Read(r, binary.BigEndian, &bits); err != nil {
-		return
-	}
-	me.NoAck = (bits&(1<<0) > 0)
-
-	return
-}
-
-type basicGetOk struct {
-	DeliveryTag  uint64
-	Redelivered  bool
-	Exchange     string
-	RoutingKey   string
-	MessageCount uint32
-	Properties   properties
-	Body         []byte
-}
-
-func (me *basicGetOk) id() (uint16, uint16) {
-	return 60, 71
-}
-
-func (me *basicGetOk) wait() bool {
-	return true
-}
-
-func (me *basicGetOk) getContent() (properties, []byte) {
-	return me.Properties, me.Body
-}
-
-func (me *basicGetOk) setContent(props properties, body []byte) {
-	me.Properties, me.Body = props, body
-}
-
-func (me *basicGetOk) write(w io.Writer) (err error) {
-	var bits byte
-
-	if err = binary.Write(w, binary.BigEndian, me.DeliveryTag); err != nil {
-		return
-	}
-
-	if me.Redelivered {
-		bits |= 1 << 0
-	}
-
-	if err = binary.Write(w, binary.BigEndian, bits); err != nil {
-		return
-	}
-
-	if err = writeShortstr(w, me.Exchange); err != nil {
-		return
-	}
-	if err = writeShortstr(w, me.RoutingKey); err != nil {
-		return
-	}
-
-	if err = binary.Write(w, binary.BigEndian, me.MessageCount); err != nil {
-		return
-	}
-
-	return
-}
-
-func (me *basicGetOk) read(r io.Reader) (err error) {
-	var bits byte
-
-	if err = binary.Read(r, binary.BigEndian, &me.DeliveryTag); err != nil {
-		return
-	}
-
-	if err = binary.Read(r, binary.BigEndian, &bits); err != nil {
-		return
-	}
-	me.Redelivered = (bits&(1<<0) > 0)
-
-	if me.Exchange, err = readShortstr(r); err != nil {
-		return
-	}
-	if me.RoutingKey, err = readShortstr(r); err != nil {
-		return
-	}
-
-	if err = binary.Read(r, binary.BigEndian, &me.MessageCount); err != nil {
-		return
-	}
-
-	return
-}
-
-type basicGetEmpty struct {
-	reserved1 string
-}
-
-func (me *basicGetEmpty) id() (uint16, uint16) {
-	return 60, 72
-}
-
-func (me *basicGetEmpty) wait() bool {
-	return true
-}
-
-func (me *basicGetEmpty) write(w io.Writer) (err error) {
-
-	if err = writeShortstr(w, me.reserved1); err != nil {
-		return
-	}
-
-	return
-}
-
-func (me *basicGetEmpty) read(r io.Reader) (err error) {
-
-	if me.reserved1, err = readShortstr(r); err != nil {
-		return
-	}
-
-	return
-}
-
-type basicAck struct {
-	DeliveryTag uint64
-	Multiple    bool
-}
-
-func (me *basicAck) id() (uint16, uint16) {
-	return 60, 80
-}
-
-func (me *basicAck) wait() bool {
-	return false
-}
-
-func (me *basicAck) write(w io.Writer) (err error) {
-	var bits byte
-
-	if err = binary.Write(w, binary.BigEndian, me.DeliveryTag); err != nil {
-		return
-	}
-
-	if me.Multiple {
-		bits |= 1 << 0
-	}
-
-	if err = binary.Write(w, binary.BigEndian, bits); err != nil {
-		return
-	}
-
-	return
-}
-
-func (me *basicAck) read(r io.Reader) (err error) {
-	var bits byte
-
-	if err = binary.Read(r, binary.BigEndian, &me.DeliveryTag); err != nil {
-		return
-	}
-
-	if err = binary.Read(r, binary.BigEndian, &bits); err != nil {
-		return
-	}
-	me.Multiple = (bits&(1<<0) > 0)
-
-	return
-}
-
-type basicReject struct {
-	DeliveryTag uint64
-	Requeue     bool
-}
-
-func (me *basicReject) id() (uint16, uint16) {
-	return 60, 90
-}
-
-func (me *basicReject) wait() bool {
-	return false
-}
-
-func (me *basicReject) write(w io.Writer) (err error) {
-	var bits byte
-
-	if err = binary.Write(w, binary.BigEndian, me.DeliveryTag); err != nil {
-		return
-	}
-
-	if me.Requeue {
-		bits |= 1 << 0
-	}
-
-	if err = binary.Write(w, binary.BigEndian, bits); err != nil {
-		return
-	}
-
-	return
-}
-
-func (me *basicReject) read(r io.Reader) (err error) {
-	var bits byte
-
-	if err = binary.Read(r, binary.BigEndian, &me.DeliveryTag); err != nil {
-		return
-	}
-
-	if err = binary.Read(r, binary.BigEndian, &bits); err != nil {
-		return
-	}
-	me.Requeue = (bits&(1<<0) > 0)
-
-	return
-}
-
-type basicRecoverAsync struct {
-	Requeue bool
-}
-
-func (me *basicRecoverAsync) id() (uint16, uint16) {
-	return 60, 100
-}
-
-func (me *basicRecoverAsync) wait() bool {
-	return false
-}
-
-func (me *basicRecoverAsync) write(w io.Writer) (err error) {
-	var bits byte
-
-	if me.Requeue {
-		bits |= 1 << 0
-	}
-
-	if err = binary.Write(w, binary.BigEndian, bits); err != nil {
-		return
-	}
-
-	return
-}
-
-func (me *basicRecoverAsync) read(r io.Reader) (err error) {
-	var bits byte
-
-	if err = binary.Read(r, binary.BigEndian, &bits); err != nil {
-		return
-	}
-	me.Requeue = (bits&(1<<0) > 0)
-
-	return
-}
-
-type basicRecover struct {
-	Requeue bool
-}
-
-func (me *basicRecover) id() (uint16, uint16) {
-	return 60, 110
-}
-
-func (me *basicRecover) wait() bool {
-	return true
-}
-
-func (me *basicRecover) write(w io.Writer) (err error) {
-	var bits byte
-
-	if me.Requeue {
-		bits |= 1 << 0
-	}
-
-	if err = binary.Write(w, binary.BigEndian, bits); err != nil {
-		return
-	}
-
-	return
-}
-
-func (me *basicRecover) read(r io.Reader) (err error) {
-	var bits byte
-
-	if err = binary.Read(r, binary.BigEndian, &bits); err != nil {
-		return
-	}
-	me.Requeue = (bits&(1<<0) > 0)
-
-	return
-}
-
-type basicRecoverOk struct {
-}
-
-func (me *basicRecoverOk) id() (uint16, uint16) {
-	return 60, 111
-}
-
-func (me *basicRecoverOk) wait() bool {
-	return true
-}
-
-func (me *basicRecoverOk) write(w io.Writer) (err error) {
-
-	return
-}
-
-func (me *basicRecoverOk) read(r io.Reader) (err error) {
-
-	return
-}
-
-type basicNack struct {
-	DeliveryTag uint64
-	Multiple    bool
-	Requeue     bool
-}
-
-func (me *basicNack) id() (uint16, uint16) {
-	return 60, 120
-}
-
-func (me *basicNack) wait() bool {
-	return false
-}
-
-func (me *basicNack) write(w io.Writer) (err error) {
-	var bits byte
-
-	if err = binary.Write(w, binary.BigEndian, me.DeliveryTag); err != nil {
-		return
-	}
-
-	if me.Multiple {
-		bits |= 1 << 0
-	}
-
-	if me.Requeue {
-		bits |= 1 << 1
-	}
-
-	if err = binary.Write(w, binary.BigEndian, bits); err != nil {
-		return
-	}
-
-	return
-}
-
-func (me *basicNack) read(r io.Reader) (err error) {
-	var bits byte
-
-	if err = binary.Read(r, binary.BigEndian, &me.DeliveryTag); err != nil {
-		return
-	}
-
-	if err = binary.Read(r, binary.BigEndian, &bits); err != nil {
-		return
-	}
-	me.Multiple = (bits&(1<<0) > 0)
-	me.Requeue = (bits&(1<<1) > 0)
-
-	return
-}
-
-type txSelect struct {
-}
-
-func (me *txSelect) id() (uint16, uint16) {
-	return 90, 10
-}
-
-func (me *txSelect) wait() bool {
-	return true
-}
-
-func (me *txSelect) write(w io.Writer) (err error) {
-
-	return
-}
-
-func (me *txSelect) read(r io.Reader) (err error) {
-
-	return
-}
-
-type txSelectOk struct {
-}
-
-func (me *txSelectOk) id() (uint16, uint16) {
-	return 90, 11
-}
-
-func (me *txSelectOk) wait() bool {
-	return true
-}
-
-func (me *txSelectOk) write(w io.Writer) (err error) {
-
-	return
-}
-
-func (me *txSelectOk) read(r io.Reader) (err error) {
-
-	return
-}
-
-type txCommit struct {
-}
-
-func (me *txCommit) id() (uint16, uint16) {
-	return 90, 20
-}
-
-func (me *txCommit) wait() bool {
-	return true
-}
-
-func (me *txCommit) write(w io.Writer) (err error) {
-
-	return
-}
-
-func (me *txCommit) read(r io.Reader) (err error) {
-
-	return
-}
-
-type txCommitOk struct {
-}
-
-func (me *txCommitOk) id() (uint16, uint16) {
-	return 90, 21
-}
-
-func (me *txCommitOk) wait() bool {
-	return true
-}
-
-func (me *txCommitOk) write(w io.Writer) (err error) {
-
-	return
-}
-
-func (me *txCommitOk) read(r io.Reader) (err error) {
-
-	return
-}
-
-type txRollback struct {
-}
-
-func (me *txRollback) id() (uint16, uint16) {
-	return 90, 30
-}
-
-func (me *txRollback) wait() bool {
-	return true
-}
-
-func (me *txRollback) write(w io.Writer) (err error) {
-
-	return
-}
-
-func (me *txRollback) read(r io.Reader) (err error) {
-
-	return
-}
-
-type txRollbackOk struct {
-}
-
-func (me *txRollbackOk) id() (uint16, uint16) {
-	return 90, 31
-}
-
-func (me *txRollbackOk) wait() bool {
-	return true
-}
-
-func (me *txRollbackOk) write(w io.Writer) (err error) {
-
-	return
-}
-
-func (me *txRollbackOk) read(r io.Reader) (err error) {
-
-	return
-}
-
-type confirmSelect struct {
-	Nowait bool
-}
-
-func (me *confirmSelect) id() (uint16, uint16) {
-	return 85, 10
-}
-
-func (me *confirmSelect) wait() bool {
-	return true
-}
-
-func (me *confirmSelect) write(w io.Writer) (err error) {
-	var bits byte
-
-	if me.Nowait {
-		bits |= 1 << 0
-	}
-
-	if err = binary.Write(w, binary.BigEndian, bits); err != nil {
-		return
-	}
-
-	return
-}
-
-func (me *confirmSelect) read(r io.Reader) (err error) {
-	var bits byte
-
-	if err = binary.Read(r, binary.BigEndian, &bits); err != nil {
-		return
-	}
-	me.Nowait = (bits&(1<<0) > 0)
-
-	return
-}
-
-type confirmSelectOk struct {
-}
-
-func (me *confirmSelectOk) id() (uint16, uint16) {
-	return 85, 11
-}
-
-func (me *confirmSelectOk) wait() bool {
-	return true
-}
-
-func (me *confirmSelectOk) write(w io.Writer) (err error) {
-
-	return
-}
-
-func (me *confirmSelectOk) read(r io.Reader) (err error) {
-
-	return
-}
-
-func (me *reader) parseMethodFrame(channel uint16, size uint32) (f frame, err error) {
-	mf := &methodFrame{
-		ChannelId: channel,
-	}
-
-	if err = binary.Read(me.r, binary.BigEndian, &mf.ClassId); err != nil {
-		return
-	}
-
-	if err = binary.Read(me.r, binary.BigEndian, &mf.MethodId); err != nil {
-		return
-	}
-
-	switch mf.ClassId {
-
-	case 10: // connection
-		switch mf.MethodId {
-
-		case 10: // connection start
-			//fmt.Println("NextMethod: class:10 method:10")
-			method := &connectionStart{}
-			if err = method.read(me.r); err != nil {
-				return
-			}
-			mf.Method = method
-
-		case 11: // connection start-ok
-			//fmt.Println("NextMethod: class:10 method:11")
-			method := &connectionStartOk{}
-			if err = method.read(me.r); err != nil {
-				return
-			}
-			mf.Method = method
-
-		case 20: // connection secure
-			//fmt.Println("NextMethod: class:10 method:20")
-			method := &connectionSecure{}
-			if err = method.read(me.r); err != nil {
-				return
-			}
-			mf.Method = method
-
-		case 21: // connection secure-ok
-			//fmt.Println("NextMethod: class:10 method:21")
-			method := &connectionSecureOk{}
-			if err = method.read(me.r); err != nil {
-				return
-			}
-			mf.Method = method
-
-		case 30: // connection tune
-			//fmt.Println("NextMethod: class:10 method:30")
-			method := &connectionTune{}
-			if err = method.read(me.r); err != nil {
-				return
-			}
-			mf.Method = method
-
-		case 31: // connection tune-ok
-			//fmt.Println("NextMethod: class:10 method:31")
-			method := &connectionTuneOk{}
-			if err = method.read(me.r); err != nil {
-				return
-			}
-			mf.Method = method
-
-		case 40: // connection open
-			//fmt.Println("NextMethod: class:10 method:40")
-			method := &connectionOpen{}
-			if err = method.read(me.r); err != nil {
-				return
-			}
-			mf.Method = method
-
-		case 41: // connection open-ok
-			//fmt.Println("NextMethod: class:10 method:41")
-			method := &connectionOpenOk{}
-			if err = method.read(me.r); err != nil {
-				return
-			}
-			mf.Method = method
-
-		case 50: // connection close
-			//fmt.Println("NextMethod: class:10 method:50")
-			method := &connectionClose{}
-			if err = method.read(me.r); err != nil {
-				return
-			}
-			mf.Method = method
-
-		case 51: // connection close-ok
-			//fmt.Println("NextMethod: class:10 method:51")
-			method := &connectionCloseOk{}
-			if err = method.read(me.r); err != nil {
-				return
-			}
-			mf.Method = method
-
-		case 60: // connection blocked
-			//fmt.Println("NextMethod: class:10 method:60")
-			method := &connectionBlocked{}
-			if err = method.read(me.r); err != nil {
-				return
-			}
-			mf.Method = method
-
-		case 61: // connection unblocked
-			//fmt.Println("NextMethod: class:10 method:61")
-			method := &connectionUnblocked{}
-			if err = method.read(me.r); err != nil {
-				return
-			}
-			mf.Method = method
-
-		default:
-			return nil, fmt.Errorf("Bad method frame, unknown method %d for class %d", mf.MethodId, mf.ClassId)
-		}
-
-	case 20: // channel
-		switch mf.MethodId {
-
-		case 10: // channel open
-			//fmt.Println("NextMethod: class:20 method:10")
-			method := &channelOpen{}
-			if err = method.read(me.r); err != nil {
-				return
-			}
-			mf.Method = method
-
-		case 11: // channel open-ok
-			//fmt.Println("NextMethod: class:20 method:11")
-			method := &channelOpenOk{}
-			if err = method.read(me.r); err != nil {
-				return
-			}
-			mf.Method = method
-
-		case 20: // channel flow
-			//fmt.Println("NextMethod: class:20 method:20")
-			method := &channelFlow{}
-			if err = method.read(me.r); err != nil {
-				return
-			}
-			mf.Method = method
-
-		case 21: // channel flow-ok
-			//fmt.Println("NextMethod: class:20 method:21")
-			method := &channelFlowOk{}
-			if err = method.read(me.r); err != nil {
-				return
-			}
-			mf.Method = method
-
-		case 40: // channel close
-			//fmt.Println("NextMethod: class:20 method:40")
-			method := &channelClose{}
-			if err = method.read(me.r); err != nil {
-				return
-			}
-			mf.Method = method
-
-		case 41: // channel close-ok
-			//fmt.Println("NextMethod: class:20 method:41")
-			method := &channelCloseOk{}
-			if err = method.read(me.r); err != nil {
-				return
-			}
-			mf.Method = method
-
-		default:
-			return nil, fmt.Errorf("Bad method frame, unknown method %d for class %d", mf.MethodId, mf.ClassId)
-		}
-
-	case 40: // exchange
-		switch mf.MethodId {
-
-		case 10: // exchange declare
-			//fmt.Println("NextMethod: class:40 method:10")
-			method := &exchangeDeclare{}
-			if err = method.read(me.r); err != nil {
-				return
-			}
-			mf.Method = method
-
-		case 11: // exchange declare-ok
-			//fmt.Println("NextMethod: class:40 method:11")
-			method := &exchangeDeclareOk{}
-			if err = method.read(me.r); err != nil {
-				return
-			}
-			mf.Method = method
-
-		case 20: // exchange delete
-			//fmt.Println("NextMethod: class:40 method:20")
-			method := &exchangeDelete{}
-			if err = method.read(me.r); err != nil {
-				return
-			}
-			mf.Method = method
-
-		case 21: // exchange delete-ok
-			//fmt.Println("NextMethod: class:40 method:21")
-			method := &exchangeDeleteOk{}
-			if err = method.read(me.r); err != nil {
-				return
-			}
-			mf.Method = method
-
-		case 30: // exchange bind
-			//fmt.Println("NextMethod: class:40 method:30")
-			method := &exchangeBind{}
-			if err = method.read(me.r); err != nil {
-				return
-			}
-			mf.Method = method
-
-		case 31: // exchange bind-ok
-			//fmt.Println("NextMethod: class:40 method:31")
-			method := &exchangeBindOk{}
-			if err = method.read(me.r); err != nil {
-				return
-			}
-			mf.Method = method
-
-		case 40: // exchange unbind
-			//fmt.Println("NextMethod: class:40 method:40")
-			method := &exchangeUnbind{}
-			if err = method.read(me.r); err != nil {
-				return
-			}
-			mf.Method = method
-
-		case 51: // exchange unbind-ok
-			//fmt.Println("NextMethod: class:40 method:51")
-			method := &exchangeUnbindOk{}
-			if err = method.read(me.r); err != nil {
-				return
-			}
-			mf.Method = method
-
-		default:
-			return nil, fmt.Errorf("Bad method frame, unknown method %d for class %d", mf.MethodId, mf.ClassId)
-		}
-
-	case 50: // queue
-		switch mf.MethodId {
-
-		case 10: // queue declare
-			//fmt.Println("NextMethod: class:50 method:10")
-			method := &queueDeclare{}
-			if err = method.read(me.r); err != nil {
-				return
-			}
-			mf.Method = method
-
-		case 11: // queue declare-ok
-			//fmt.Println("NextMethod: class:50 method:11")
-			method := &queueDeclareOk{}
-			if err = method.read(me.r); err != nil {
-				return
-			}
-			mf.Method = method
-
-		case 20: // queue bind
-			//fmt.Println("NextMethod: class:50 method:20")
-			method := &queueBind{}
-			if err = method.read(me.r); err != nil {
-				return
-			}
-			mf.Method = method
-
-		case 21: // queue bind-ok
-			//fmt.Println("NextMethod: class:50 method:21")
-			method := &queueBindOk{}
-			if err = method.read(me.r); err != nil {
-				return
-			}
-			mf.Method = method
-
-		case 50: // queue unbind
-			//fmt.Println("NextMethod: class:50 method:50")
-			method := &queueUnbind{}
-			if err = method.read(me.r); err != nil {
-				return
-			}
-			mf.Method = method
-
-		case 51: // queue unbind-ok
-			//fmt.Println("NextMethod: class:50 method:51")
-			method := &queueUnbindOk{}
-			if err = method.read(me.r); err != nil {
-				return
-			}
-			mf.Method = method
-
-		case 30: // queue purge
-			//fmt.Println("NextMethod: class:50 method:30")
-			method := &queuePurge{}
-			if err = method.read(me.r); err != nil {
-				return
-			}
-			mf.Method = method
-
-		case 31: // queue purge-ok
-			//fmt.Println("NextMethod: class:50 method:31")
-			method := &queuePurgeOk{}
-			if err = method.read(me.r); err != nil {
-				return
-			}
-			mf.Method = method
-
-		case 40: // queue delete
-			//fmt.Println("NextMethod: class:50 method:40")
-			method := &queueDelete{}
-			if err = method.read(me.r); err != nil {
-				return
-			}
-			mf.Method = method
-
-		case 41: // queue delete-ok
-			//fmt.Println("NextMethod: class:50 method:41")
-			method := &queueDeleteOk{}
-			if err = method.read(me.r); err != nil {
-				return
-			}
-			mf.Method = method
-
-		default:
-			return nil, fmt.Errorf("Bad method frame, unknown method %d for class %d", mf.MethodId, mf.ClassId)
-		}
-
-	case 60: // basic
-		switch mf.MethodId {
-
-		case 10: // basic qos
-			//fmt.Println("NextMethod: class:60 method:10")
-			method := &basicQos{}
-			if err = method.read(me.r); err != nil {
-				return
-			}
-			mf.Method = method
-
-		case 11: // basic qos-ok
-			//fmt.Println("NextMethod: class:60 method:11")
-			method := &basicQosOk{}
-			if err = method.read(me.r); err != nil {
-				return
-			}
-			mf.Method = method
-
-		case 20: // basic consume
-			//fmt.Println("NextMethod: class:60 method:20")
-			method := &basicConsume{}
-			if err = method.read(me.r); err != nil {
-				return
-			}
-			mf.Method = method
-
-		case 21: // basic consume-ok
-			//fmt.Println("NextMethod: class:60 method:21")
-			method := &basicConsumeOk{}
-			if err = method.read(me.r); err != nil {
-				return
-			}
-			mf.Method = method
-
-		case 30: // basic cancel
-			//fmt.Println("NextMethod: class:60 method:30")
-			method := &basicCancel{}
-			if err = method.read(me.r); err != nil {
-				return
-			}
-			mf.Method = method
-
-		case 31: // basic cancel-ok
-			//fmt.Println("NextMethod: class:60 method:31")
-			method := &basicCancelOk{}
-			if err = method.read(me.r); err != nil {
-				return
-			}
-			mf.Method = method
-
-		case 40: // basic publish
-			//fmt.Println("NextMethod: class:60 method:40")
-			method := &basicPublish{}
-			if err = method.read(me.r); err != nil {
-				return
-			}
-			mf.Method = method
-
-		case 50: // basic return
-			//fmt.Println("NextMethod: class:60 method:50")
-			method := &basicReturn{}
-			if err = method.read(me.r); err != nil {
-				return
-			}
-			mf.Method = method
-
-		case 60: // basic deliver
-			//fmt.Println("NextMethod: class:60 method:60")
-			method := &basicDeliver{}
-			if err = method.read(me.r); err != nil {
-				return
-			}
-			mf.Method = method
-
-		case 70: // basic get
-			//fmt.Println("NextMethod: class:60 method:70")
-			method := &basicGet{}
-			if err = method.read(me.r); err != nil {
-				return
-			}
-			mf.Method = method
-
-		case 71: // basic get-ok
-			//fmt.Println("NextMethod: class:60 method:71")
-			method := &basicGetOk{}
-			if err = method.read(me.r); err != nil {
-				return
-			}
-			mf.Method = method
-
-		case 72: // basic get-empty
-			//fmt.Println("NextMethod: class:60 method:72")
-			method := &basicGetEmpty{}
-			if err = method.read(me.r); err != nil {
-				return
-			}
-			mf.Method = method
-
-		case 80: // basic ack
-			//fmt.Println("NextMethod: class:60 method:80")
-			method := &basicAck{}
-			if err = method.read(me.r); err != nil {
-				return
-			}
-			mf.Method = method
-
-		case 90: // basic reject
-			//fmt.Println("NextMethod: class:60 method:90")
-			method := &basicReject{}
-			if err = method.read(me.r); err != nil {
-				return
-			}
-			mf.Method = method
-
-		case 100: // basic recover-async
-			//fmt.Println("NextMethod: class:60 method:100")
-			method := &basicRecoverAsync{}
-			if err = method.read(me.r); err != nil {
-				return
-			}
-			mf.Method = method
-
-		case 110: // basic recover
-			//fmt.Println("NextMethod: class:60 method:110")
-			method := &basicRecover{}
-			if err = method.read(me.r); err != nil {
-				return
-			}
-			mf.Method = method
-
-		case 111: // basic recover-ok
-			//fmt.Println("NextMethod: class:60 method:111")
-			method := &basicRecoverOk{}
-			if err = method.read(me.r); err != nil {
-				return
-			}
-			mf.Method = method
-
-		case 120: // basic nack
-			//fmt.Println("NextMethod: class:60 method:120")
-			method := &basicNack{}
-			if err = method.read(me.r); err != nil {
-				return
-			}
-			mf.Method = method
-
-		default:
-			return nil, fmt.Errorf("Bad method frame, unknown method %d for class %d", mf.MethodId, mf.ClassId)
-		}
-
-	case 90: // tx
-		switch mf.MethodId {
-
-		case 10: // tx select
-			//fmt.Println("NextMethod: class:90 method:10")
-			method := &txSelect{}
-			if err = method.read(me.r); err != nil {
-				return
-			}
-			mf.Method = method
-
-		case 11: // tx select-ok
-			//fmt.Println("NextMethod: class:90 method:11")
-			method := &txSelectOk{}
-			if err = method.read(me.r); err != nil {
-				return
-			}
-			mf.Method = method
-
-		case 20: // tx commit
-			//fmt.Println("NextMethod: class:90 method:20")
-			method := &txCommit{}
-			if err = method.read(me.r); err != nil {
-				return
-			}
-			mf.Method = method
-
-		case 21: // tx commit-ok
-			//fmt.Println("NextMethod: class:90 method:21")
-			method := &txCommitOk{}
-			if err = method.read(me.r); err != nil {
-				return
-			}
-			mf.Method = method
-
-		case 30: // tx rollback
-			//fmt.Println("NextMethod: class:90 method:30")
-			method := &txRollback{}
-			if err = method.read(me.r); err != nil {
-				return
-			}
-			mf.Method = method
-
-		case 31: // tx rollback-ok
-			//fmt.Println("NextMethod: class:90 method:31")
-			method := &txRollbackOk{}
-			if err = method.read(me.r); err != nil {
-				return
-			}
-			mf.Method = method
-
-		default:
-			return nil, fmt.Errorf("Bad method frame, unknown method %d for class %d", mf.MethodId, mf.ClassId)
-		}
-
-	case 85: // confirm
-		switch mf.MethodId {
-
-		case 10: // confirm select
-			//fmt.Println("NextMethod: class:85 method:10")
-			method := &confirmSelect{}
-			if err = method.read(me.r); err != nil {
-				return
-			}
-			mf.Method = method
-
-		case 11: // confirm select-ok
-			//fmt.Println("NextMethod: class:85 method:11")
-			method := &confirmSelectOk{}
-			if err = method.read(me.r); err != nil {
-				return
-			}
-			mf.Method = method
-
-		default:
-			return nil, fmt.Errorf("Bad method frame, unknown method %d for class %d", mf.MethodId, mf.ClassId)
-		}
-
-	default:
-		return nil, fmt.Errorf("Bad method frame, unknown class %d", mf.ClassId)
-	}
-
-	return mf, nil
-}
diff --git a/Godeps/_workspace/src/github.com/streadway/amqp/tls_test.go b/Godeps/_workspace/src/github.com/streadway/amqp/tls_test.go
deleted file mode 100644
index a0795b641..000000000
--- a/Godeps/_workspace/src/github.com/streadway/amqp/tls_test.go
+++ /dev/null
@@ -1,218 +0,0 @@
-package amqp_test
-
-import (
-	"crypto/tls"
-	"crypto/x509"
-	"fmt"
-	"github.com/streadway/amqp"
-	"io"
-	"net"
-	"testing"
-	"time"
-)
-
-type tlsServer struct {
-	net.Listener
-	URL    string
-	Config *tls.Config
-	Header chan []byte
-}
-
-// Captures the header for each accepted connection
-func (s *tlsServer) Serve() {
-	for {
-		c, err := s.Accept()
-		if err != nil {
-			return
-		}
-
-		header := make([]byte, 4)
-		io.ReadFull(c, header)
-		s.Header <- header
-		c.Write([]byte{'A', 'M', 'Q', 'P', 0, 0, 0, 0})
-		c.Close()
-	}
-}
-
-func tlsConfig() *tls.Config {
-	cfg := new(tls.Config)
-
-	cfg.ClientCAs = x509.NewCertPool()
-	cfg.ClientCAs.AppendCertsFromPEM([]byte(caCert))
-
-	cert, err := tls.X509KeyPair([]byte(serverCert), []byte(serverKey))
-	if err != nil {
-		panic(err)
-	}
-
-	cfg.Certificates = append(cfg.Certificates, cert)
-	cfg.ClientAuth = tls.RequireAndVerifyClientCert
-
-	return cfg
-}
-
-func startTlsServer() tlsServer {
-	cfg := tlsConfig()
-
-	l, err := tls.Listen("tcp", "127.0.0.1:0", cfg)
-	if err != nil {
-		panic(err)
-	}
-
-	s := tlsServer{
-		Listener: l,
-		Config:   cfg,
-		URL:      fmt.Sprintf("amqps://%s/", l.Addr().String()),
-		Header:   make(chan []byte, 1),
-	}
-
-	go s.Serve()
-	return s
-}
-
-// Tests that the server has handshaked the connection and seen the client
-// protocol announcement.  Does not nest that the connection.open is successful.
-func TestTLSHandshake(t *testing.T) {
-	srv := startTlsServer()
-	defer srv.Close()
-
-	cfg := new(tls.Config)
-	cfg.RootCAs = x509.NewCertPool()
-	cfg.RootCAs.AppendCertsFromPEM([]byte(caCert))
-
-	cert, _ := tls.X509KeyPair([]byte(clientCert), []byte(clientKey))
-	cfg.Certificates = append(cfg.Certificates, cert)
-
-	_, err := amqp.DialTLS(srv.URL, cfg)
-
-	select {
-	case <-time.After(10 * time.Millisecond):
-		t.Fatalf("did not succeed to handshake the TLS connection after 10ms")
-	case header := <-srv.Header:
-		if string(header) != "AMQP" {
-			t.Fatalf("expected to handshake a TLS connection, got err: %v", err)
-		}
-	}
-}
-
-const caCert = `
------BEGIN CERTIFICATE-----
-MIICxjCCAa6gAwIBAgIJANWuMWMQSxvdMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-BAMTCE15VGVzdENBMB4XDTE0MDEyNzE5NTIyMloXDTI0MDEyNTE5NTIyMlowEzER
-MA8GA1UEAxMITXlUZXN0Q0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-AQDBsIrkW4ob9Z/gzR2/Maa2stbutry6/vvz8eiJwIKIbaHGwqtFOUGiWeKw7H76
-IH3SjTAhNQY2hoKPyH41D36sDJkYBRyHFJTK/6ffvOhpyLnuXJAnoS62eKPSNUAx
-5i/lkHj42ESutYAH9qbHCI/gBm9G4WmhGAyA16xzC1n07JObl6KFoY1PqHKl823z
-mvF47I24DzemEfjdwC9nAAX/pGYOg9FA9nQv7NnhlsJMxueCx55RNU1ADRoqsbfE
-T0CQTOT4ryugGrUp9J4Cwen6YbXZrS6+Kff5SQCAns0Qu8/bwj0DKkuBGLF+Mnwe
-mq9bMzyZPUrPM3Gu48ao8YAfAgMBAAGjHTAbMAwGA1UdEwQFMAMBAf8wCwYDVR0P
-BAQDAgEGMA0GCSqGSIb3DQEBBQUAA4IBAQCBwXGblRxIEOlEP6ANZ1C8AHWyG8lR
-CQduFclc0tmyCCz5fnyLK0aGu9LhXXe6/HSKqgs4mJqeqYOojdjkfOme/YdwDzjK
-WIf0kRYQHcB6NeyEZwW8C7subTP1Xw6zbAmjvQrtCGvRM+fi3/cs1sSSkd/EoRk4
-7GM9qQl/JIIoCOGncninf2NQm5YSpbit6/mOQD7EhqXsw+bX+IRh3DHC1Apv/PoA
-HlDNeM4vjWaBxsmvRSndrIvew1czboFM18oRSSIqAkU7dKZ0SbC11grzmNxMG2aD
-f9y8FIG6RK/SEaOZuc+uBGXx7tj7dczpE/2puqYcaVGwcv4kkrC/ZuRm
------END CERTIFICATE-----
-`
-
-const serverCert = `
------BEGIN CERTIFICATE-----
-MIIC8zCCAdugAwIBAgIBATANBgkqhkiG9w0BAQUFADATMREwDwYDVQQDEwhNeVRl
-c3RDQTAeFw0xNDAxMjcxOTUyMjNaFw0yNDAxMjUxOTUyMjNaMCUxEjAQBgNVBAMT
-CTEyNy4wLjAuMTEPMA0GA1UEChMGc2VydmVyMIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEAxYAKbeGyg0gP0xwVsZsufzk/SUCtD44Gp3lQYQ9QumQ1IVZu
-PmZWwPWrzI93a1Abruz6ZhXaB3jcL5QPAy1N44IiFgVN45CZXBsqkpJe/abzRFOV
-DRnHxattPDHdgwML5d3nURKGUM/7+ACj5E4pZEDlM3RIjIKVd+doJsL7n6myO8FE
-tIpt4vTz1MFp3F+ntPnHU3BZ/VZ1UjSlFWnCjT0CR0tnXsPmlIaC98HThS8x5zNB
-fvvSN+Zln8RWdNLnEVHVdqYtOQ828QbCx8s1HfClGgaVoSDrzz+qQgtZFO4wW264
-2CWkNd8DSJUJ/HlPNXmbXsrRMgvGaL7YUz2yRQIDAQABo0AwPjAJBgNVHRMEAjAA
-MAsGA1UdDwQEAwIFIDATBgNVHSUEDDAKBggrBgEFBQcDATAPBgNVHREECDAGhwR/
-AAABMA0GCSqGSIb3DQEBBQUAA4IBAQAE2g+wAFf9Xg5svcnb7+mfseYV16k9l5WG
-onrmR3FLsbTxfbr4PZJMHrswPbi2NRk0+ETPUpcv1RP7pUB7wSEvuS1NPGcU92iP
-58ycP3dYtLzmuu6BkgToZqwsCU8fC2zM0wt3+ifzPpDMffWWOioVuA3zdM9WPQYz
-+Ofajd0XaZwFZS8uTI5WXgObz7Xqfmln4tF3Sq1CTyuJ44qK4p83XOKFq+L04aD0
-d0c8w3YQNUENny/vMP9mDu3FQ3SnDz2GKl1LSjGe2TUnkoMkDfdk4wSzndTz/ecb
-QiCPKijwVPWNOWV3NDE2edMxDPxDoKoEm5F4UGfGjxSRnYCIoZLh
------END CERTIFICATE-----
-`
-
-const serverKey = `
------BEGIN RSA PRIVATE KEY-----
-MIIEowIBAAKCAQEAxYAKbeGyg0gP0xwVsZsufzk/SUCtD44Gp3lQYQ9QumQ1IVZu
-PmZWwPWrzI93a1Abruz6ZhXaB3jcL5QPAy1N44IiFgVN45CZXBsqkpJe/abzRFOV
-DRnHxattPDHdgwML5d3nURKGUM/7+ACj5E4pZEDlM3RIjIKVd+doJsL7n6myO8FE
-tIpt4vTz1MFp3F+ntPnHU3BZ/VZ1UjSlFWnCjT0CR0tnXsPmlIaC98HThS8x5zNB
-fvvSN+Zln8RWdNLnEVHVdqYtOQ828QbCx8s1HfClGgaVoSDrzz+qQgtZFO4wW264
-2CWkNd8DSJUJ/HlPNXmbXsrRMgvGaL7YUz2yRQIDAQABAoIBAGsyEvcPAGg3DbfE
-z5WFp9gPx2TIAOanbL8rnlAAEw4H47qDgfTGcSHsdeHioKuTYGMyZrpP8/YISGJe
-l0NfLJ5mfH+9Q0hXrJWMfS/u2DYOjo0wXH8u1fpZEEISwqsgVS3fonSjfFmSea1j
-E5GQRvEONBkYbWQuYFgjNqmLPS2r5lKbWCQvc1MB/vvVBwOTiO0ON7m/EkM5RKt9
-cDT5ZhhVjBpdmd9HpVbKTdBj8Q0l5/ZHZUEgZA6FDZEwYxTd9l87Z4YT+5SR0z9t
-k8/Z0CHd3x3Rv891t7m66ZJkaOda8NC65/432MQEQwJltmrKnc22dS8yI26rrmpp
-g3tcbSUCgYEA5nMXdQKS4vF+Kp10l/HqvGz2sU8qQaWYZQIg7Th3QJPo6N52po/s
-nn3UF0P5mT1laeZ5ZQJKx4gnmuPnIZ2ZtJQDyFhIbRPcZ+2hSNSuLYVcrumOC3EP
-3OZyFtFE1THO73aFe5e1jEdtoOne3Bds/Hq6NF45fkVdL+M9e8pfXIsCgYEA22W8
-zGjbWyrFOYvKknMQVtHnMx8BJEtsvWRknP6CWAv/8WyeZpE128Pve1m441AQnopS
-CuOF5wFK0iUXBFbS3Pe1/1j3em6yfVznuUHqJ7Qc+dNzxVvkTK8jGB6x+vm+M9Hg
-muHUM726IUxckoSNXbPNAVPIZab1NdSxam7F9m8CgYEAx55QZmIJXJ41XLKxqWC7
-peZ5NpPNlbncrTpPzUzJN94ntXfmrVckbxGt401VayEctMQYyZ9XqUlOjUP3FU5Q
-M3S3Zhba/eljVX8o406fZf0MkNLs4QpZ5E6V6x/xEP+pMhKng6yhbVb+JpIPIvUD
-yhyBKRWplbB+DRo5Sv685gsCgYA7l5m9h+m1DJv/cnn2Z2yTuHXtC8namuYRV1iA
-0ByFX9UINXGc+GpBpCnDPm6ax5+MAJQiQwSW52H0TIDA+/hQbrQvhHHL/o9av8Zt
-Kns4h5KrRQUYIUqUjamhnozHV9iS6LnyN87Usv8AlmY6oehoADN53dD702qdUYVT
-HH2G3wKBgCdvqyw78FR/n8cUWesTPnxx5HCeWJ1J+2BESnUnPmKZ71CV1H7uweja
-vPUxuuuGLKfNx84OKCfRDbtOgMOeyh9T1RmXry6Srz/7/udjlF0qmFiRXfBNAgoR
-tNb0+Ri/vY0AHrQ7UnCbl12qPVaqhEXLr+kCGNEPFqpMJPPEeMK0
------END RSA PRIVATE KEY-----
-`
-
-const clientCert = `
------BEGIN CERTIFICATE-----
-MIIC4jCCAcqgAwIBAgIBAjANBgkqhkiG9w0BAQUFADATMREwDwYDVQQDEwhNeVRl
-c3RDQTAeFw0xNDAxMjcxOTUyMjNaFw0yNDAxMjUxOTUyMjNaMCUxEjAQBgNVBAMT
-CTEyNy4wLjAuMTEPMA0GA1UEChMGY2xpZW50MIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEAu7LMqd+agoH168Bsi0WJ36ulYqDypq+GZPF7uWOo2pE0raKH
-B++31/hjnkt6yC5kLKVZZ0EfolBa9q4Cy6swfGaEMafy44ZCRneLnt1azL1N6Kfz
-+U0KsOqyQDoMxYJG1gVTEZN19/U/ew2eazcxKyERI3oGCQ4SbpkxBTbfxtAFk49e
-xIB3obsuMVUrmtXE4FkUkvG7NgpPUgrhp0yxYpj9zruZGzGGT1zNhcarbQ/4i7It
-ZMbnv6pqQWtYDgnGX2TDRcEiXGeO+KrzhfpTRLfO3K4np8e8cmTyXM+4lMlWUgma
-KrRdu1QXozGqRs47u2prGKGdSQWITpqNVCY8fQIDAQABoy8wLTAJBgNVHRMEAjAA
-MAsGA1UdDwQEAwIHgDATBgNVHSUEDDAKBggrBgEFBQcDAjANBgkqhkiG9w0BAQUF
-AAOCAQEAhCuBCLznPc4O96hT3P8Fx19L3ltrWbc/pWrx8JjxUaGk8kNmjMjY+/Mt
-JBbjUBx2kJwaY0EHMAfw7D1f1wcCeNycx/0dyb0E6xzhmPw5fY15GGNg8rzWwqSY
-+i/1iqU0IRkmRHV7XCF+trd2H0Ec+V1Fd/61E2ccJfOL5aSAyWbMCUtWxS3QMnqH
-FBfKdVEiY9WNht5hnvsXQBRaNhowJ6Cwa7/1/LZjmhcXiJ0xrc1Hggj3cvS+4vll
-Ew+20a0tPKjD/v/2oSQL+qkeYKV4fhCGkaBHCpPlSJrqorb7B6NmPy3nS26ETKE/
-o2UCfZc5g2MU1ENa31kT1iuhKZapsA==
------END CERTIFICATE-----
-`
-
-const clientKey = `
------BEGIN RSA PRIVATE KEY-----
-MIIEowIBAAKCAQEAu7LMqd+agoH168Bsi0WJ36ulYqDypq+GZPF7uWOo2pE0raKH
-B++31/hjnkt6yC5kLKVZZ0EfolBa9q4Cy6swfGaEMafy44ZCRneLnt1azL1N6Kfz
-+U0KsOqyQDoMxYJG1gVTEZN19/U/ew2eazcxKyERI3oGCQ4SbpkxBTbfxtAFk49e
-xIB3obsuMVUrmtXE4FkUkvG7NgpPUgrhp0yxYpj9zruZGzGGT1zNhcarbQ/4i7It
-ZMbnv6pqQWtYDgnGX2TDRcEiXGeO+KrzhfpTRLfO3K4np8e8cmTyXM+4lMlWUgma
-KrRdu1QXozGqRs47u2prGKGdSQWITpqNVCY8fQIDAQABAoIBAGSEn3hFyEAmCyYi
-2b5IEksXaC2GlgxQKb/7Vs/0oCPU6YonZPsKFMFzQx4tu+ZiecEzF8rlJGTPdbdv
-fw3FcuTcHeVd1QSmDO4h7UK5tnu40XVMJKsY6CXQun8M13QajYbmORNLjjypOULU
-C0fNueYoAj6mhX7p61MRdSAev/5+0+bVQQG/tSVDQzdngvKpaCunOphiB2VW2Aa0
-7aYPOFCoPB2uo0DwUmBB0yfx9x4hXX9ovQI0YFou7bq6iYJ0vlZBvYQ9YrVdxjKL
-avcz1N5xM3WFAkZJSVT/Ho5+uTbZx4RrJ8b5T+t2spOKmXyAjwS2rL/XMAh8YRZ1
-u44duoECgYEA4jpK2qshgQ0t49rjVHEDKX5x7ElEZefl0rHZ/2X/uHUDKpKj2fTq
-3TQzHquiQ4Aof7OEB9UE3DGrtpvo/j/PYxL5Luu5VR4AIEJm+CA8GYuE96+uIL0Z
-M2r3Lux6Bp30Z47Eit2KiY4fhrWs59WB3NHHoFxgzHSVbnuA02gcX2ECgYEA1GZw
-iXIVYaK07ED+q/0ObyS5hD1cMhJ7ifSN9BxuG0qUpSigbkTGj09fUDS4Fqsz9dvz
-F0P93fZvyia242TIfDUwJEsDQCgHk7SGa4Rx/p/3x/obIEERk7K76Hdg93U5NXhV
-NvczvgL0HYxnb+qtumwMgGPzncB4lGcTnRyOfp0CgYBTIsDnYwRI/KLknUf1fCKB
-WSpcfwBXwsS+jQVjygQTsUyclI8KResZp1kx6DkVPT+kzj+y8SF8GfTUgq844BJC
-gnJ4P8A3+3JoaH6WqKHtcUxICZOgDF36e1CjOdwOGnX6qIipz4hdzJDhXFpSSDAV
-CjKmR8x61k0j8NcC2buzgQKBgFr7eo9VwBTvpoJhIPY5UvqHB7S+uAR26FZi3H/J
-wdyM6PmKWpaBfXCb9l8cBhMnyP0y94FqzY9L5fz48nSbkkmqWvHg9AaCXySFOuNJ
-e68vhOszlnUNimLzOAzPPkkh/JyL7Cy8XXyyNTGHGDPXmg12BTDmH8/eR4iCUuOE
-/QD9AoGBALQ/SkvfO3D5+k9e/aTHRuMJ0+PWdLUMTZ39oJQxUx+qj7/xpjDvWTBn
-eDmF/wjnIAg+020oXyBYo6plEZfDz3EYJQZ+3kLLEU+O/A7VxCakPYPwCr7N/InL
-Ccg/TVSIXxw/6uJnojoAjMIEU45NoP6RMp0mWYYb2OlteEv08Ovp
------END RSA PRIVATE KEY-----
-`
diff --git a/Godeps/_workspace/src/github.com/streadway/amqp/types.go b/Godeps/_workspace/src/github.com/streadway/amqp/types.go
deleted file mode 100644
index 8071bf7cd..000000000
--- a/Godeps/_workspace/src/github.com/streadway/amqp/types.go
+++ /dev/null
@@ -1,390 +0,0 @@
-// Copyright (c) 2012, Sean Treadway, SoundCloud Ltd.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-// Source code and contact info at http://github.com/streadway/amqp
-
-package amqp
-
-import (
-	"fmt"
-	"io"
-	"time"
-)
-
-var (
-	// Errors that this library could return/emit from a channel or connection
-	ErrClosed          = &Error{Code: ChannelError, Reason: "channel/connection is not open"}
-	ErrChannelMax      = &Error{Code: ChannelError, Reason: "channel id space exhausted"}
-	ErrSASL            = &Error{Code: AccessRefused, Reason: "SASL could not negotiate a shared mechanism"}
-	ErrCredentials     = &Error{Code: AccessRefused, Reason: "username or password not allowed"}
-	ErrVhost           = &Error{Code: AccessRefused, Reason: "no access to this vhost"}
-	ErrSyntax          = &Error{Code: SyntaxError, Reason: "invalid field or value inside of a frame"}
-	ErrFrame           = &Error{Code: FrameError, Reason: "frame could not be parsed"}
-	ErrCommandInvalid  = &Error{Code: CommandInvalid, Reason: "unexpected command received"}
-	ErrUnexpectedFrame = &Error{Code: UnexpectedFrame, Reason: "unexpected frame received"}
-	ErrFieldType       = &Error{Code: SyntaxError, Reason: "unsupported table field type"}
-)
-
-// Error captures the code and reason a channel or connection has been closed
-// by the server.
-type Error struct {
-	Code    int    // constant code from the specification
-	Reason  string // description of the error
-	Server  bool   // true when initiated from the server, false when from this library
-	Recover bool   // true when this error can be recovered by retrying later or with differnet parameters
-}
-
-func newError(code uint16, text string) *Error {
-	return &Error{
-		Code:    int(code),
-		Reason:  text,
-		Recover: isSoftExceptionCode(int(code)),
-		Server:  true,
-	}
-}
-
-func (me Error) Error() string {
-	return fmt.Sprintf("Exception (%d) Reason: %q", me.Code, me.Reason)
-}
-
-// Used by header frames to capture routing and header information
-type properties struct {
-	ContentType     string    // MIME content type
-	ContentEncoding string    // MIME content encoding
-	Headers         Table     // Application or header exchange table
-	DeliveryMode    uint8     // queue implemention use - Transient (1) or Persistent (2)
-	Priority        uint8     // queue implementation use - 0 to 9
-	CorrelationId   string    // application use - correlation identifier
-	ReplyTo         string    // application use - address to to reply to (ex: RPC)
-	Expiration      string    // implementation use - message expiration spec
-	MessageId       string    // application use - message identifier
-	Timestamp       time.Time // application use - message timestamp
-	Type            string    // application use - message type name
-	UserId          string    // application use - creating user id
-	AppId           string    // application use - creating application
-	reserved1       string    // was cluster-id - process for buffer consumption
-}
-
-// DeliveryMode.  Transient means higher throughput but messages will not be
-// restored on broker restart.  The delivery mode of publishings is unrelated
-// to the durability of the queues they reside on.  Transient messages will
-// not be restored to durable queues, persistent messages will be restored to
-// durable queues and lost on non-durable queues during server restart.
-//
-// This remains typed as uint8 to match Publishing.DeliveryMode.  Other
-// delivery modes specific to custom queue implementations are not enumerated
-// here.
-const (
-	Transient  uint8 = 1
-	Persistent uint8 = 2
-)
-
-// The property flags are an array of bits that indicate the presence or
-// absence of each property value in sequence.  The bits are ordered from most
-// high to low - bit 15 indicates the first property.
-const (
-	flagContentType     = 0x8000
-	flagContentEncoding = 0x4000
-	flagHeaders         = 0x2000
-	flagDeliveryMode    = 0x1000
-	flagPriority        = 0x0800
-	flagCorrelationId   = 0x0400
-	flagReplyTo         = 0x0200
-	flagExpiration      = 0x0100
-	flagMessageId       = 0x0080
-	flagTimestamp       = 0x0040
-	flagType            = 0x0020
-	flagUserId          = 0x0010
-	flagAppId           = 0x0008
-	flagReserved1       = 0x0004
-)
-
-// Queue captures the current server state of the queue on the server returned
-// from Channel.QueueDeclare or Channel.QueueInspect.
-type Queue struct {
-	Name      string // server confirmed or generated name
-	Messages  int    // count of messages not awaiting acknowledgment
-	Consumers int    // number of consumers receiving deliveries
-}
-
-// Publishing captures the client message sent to the server.  The fields
-// outside of the Headers table included in this struct mirror the underlying
-// fields in the content frame.  They use native types for convenience and
-// efficiency.
-type Publishing struct {
-	// Application or exchange specific fields,
-	// the headers exchange will inspect this field.
-	Headers Table
-
-	// Properties
-	ContentType     string    // MIME content type
-	ContentEncoding string    // MIME content encoding
-	DeliveryMode    uint8     // Transient (0 or 1) or Persistent (2)
-	Priority        uint8     // 0 to 9
-	CorrelationId   string    // correlation identifier
-	ReplyTo         string    // address to to reply to (ex: RPC)
-	Expiration      string    // message expiration spec
-	MessageId       string    // message identifier
-	Timestamp       time.Time // message timestamp
-	Type            string    // message type name
-	UserId          string    // creating user id - ex: "guest"
-	AppId           string    // creating application id
-
-	// The application specific payload of the message
-	Body []byte
-}
-
-// Blocking notifies the server's TCP flow control of the Connection.  When a
-// server hits a memory or disk alarm it will block all connections until the
-// resources are reclaimed.  Use NotifyBlock on the Connection to receive these
-// events.
-type Blocking struct {
-	Active bool   // TCP pushback active/inactive on server
-	Reason string // Server reason for activation
-}
-
-// Confirmation notifies the acknowledgment or negative acknowledgement of a
-// publishing identified by its delivery tag.  Use NotifyPublish on the Channel
-// to consume these events.
-type Confirmation struct {
-	DeliveryTag uint64 // A 1 based counter of publishings from when the channel was put in Confirm mode
-	Ack         bool   // True when the server succesfully received the publishing
-}
-
-// Decimal matches the AMQP decimal type.  Scale is the number of decimal
-// digits Scale == 2, Value == 12345, Decimal == 123.45
-type Decimal struct {
-	Scale uint8
-	Value int32
-}
-
-// Table stores user supplied fields of the following types:
-//
-//   bool
-//   byte
-//   float32
-//   float64
-//   int16
-//   int32
-//   int64
-//   nil
-//   string
-//   time.Time
-//   amqp.Decimal
-//   amqp.Table
-//   []byte
-//   []interface{} - containing above types
-//
-// Functions taking a table will immediately fail when the table contains a
-// value of an unsupported type.
-//
-// The caller must be specific in which precision of integer it wishes to
-// encode.
-//
-// Use a type assertion when reading values from a table for type converstion.
-//
-// RabbitMQ expects int32 for integer values.
-//
-type Table map[string]interface{}
-
-func validateField(f interface{}) error {
-	switch fv := f.(type) {
-	case nil, bool, byte, int16, int32, int64, float32, float64, string, []byte, Decimal, time.Time:
-		return nil
-
-	case []interface{}:
-		for _, v := range fv {
-			if err := validateField(v); err != nil {
-				return fmt.Errorf("in array %s", err)
-			}
-		}
-		return nil
-
-	case Table:
-		for k, v := range fv {
-			if err := validateField(v); err != nil {
-				return fmt.Errorf("table field %q %s", k, err)
-			}
-		}
-		return nil
-	}
-
-	return fmt.Errorf("value %t not supported", f)
-}
-
-func (t Table) Validate() error {
-	return validateField(t)
-}
-
-// Heap interface for maintaining delivery tags
-type tagSet []uint64
-
-func (me tagSet) Len() int              { return len(me) }
-func (me tagSet) Less(i, j int) bool    { return (me)[i] < (me)[j] }
-func (me tagSet) Swap(i, j int)         { (me)[i], (me)[j] = (me)[j], (me)[i] }
-func (me *tagSet) Push(tag interface{}) { *me = append(*me, tag.(uint64)) }
-func (me *tagSet) Pop() interface{} {
-	val := (*me)[len(*me)-1]
-	*me = (*me)[:len(*me)-1]
-	return val
-}
-
-type message interface {
-	id() (uint16, uint16)
-	wait() bool
-	read(io.Reader) error
-	write(io.Writer) error
-}
-
-type messageWithContent interface {
-	message
-	getContent() (properties, []byte)
-	setContent(properties, []byte)
-}
-
-/*
-The base interface implemented as:
-
-2.3.5  frame Details
-
-All frames consist of a header (7 octets), a payload of arbitrary size, and a 'frame-end' octet that detects
-malformed frames:
-
-  0      1         3             7                  size+7 size+8
-  +------+---------+-------------+  +------------+  +-----------+
-  | type | channel |     size    |  |  payload   |  | frame-end |
-  +------+---------+-------------+  +------------+  +-----------+
-   octet   short         long         size octets       octet
-
-To read a frame, we:
-
- 1. Read the header and check the frame type and channel.
- 2. Depending on the frame type, we read the payload and process it.
- 3. Read the frame end octet.
-
-In realistic implementations where performance is a concern, we would use
-“read-ahead buffering” or “gathering reads” to avoid doing three separate
-system calls to read a frame.
-
-*/
-type frame interface {
-	write(io.Writer) error
-	channel() uint16
-}
-
-type reader struct {
-	r io.Reader
-}
-
-type writer struct {
-	w io.Writer
-}
-
-// Implements the frame interface for Connection RPC
-type protocolHeader struct{}
-
-func (protocolHeader) write(w io.Writer) error {
-	_, err := w.Write([]byte{'A', 'M', 'Q', 'P', 0, 0, 9, 1})
-	return err
-}
-
-func (protocolHeader) channel() uint16 {
-	panic("only valid as initial handshake")
-}
-
-/*
-Method frames carry the high-level protocol commands (which we call "methods").
-One method frame carries one command.  The method frame payload has this format:
-
-  0          2           4
-  +----------+-----------+-------------- - -
-  | class-id | method-id | arguments...
-  +----------+-----------+-------------- - -
-     short      short    ...
-
-To process a method frame, we:
- 1. Read the method frame payload.
- 2. Unpack it into a structure.  A given method always has the same structure,
- so we can unpack the method rapidly.  3. Check that the method is allowed in
- the current context.
- 4. Check that the method arguments are valid.
- 5. Execute the method.
-
-Method frame bodies are constructed as a list of AMQP data fields (bits,
-integers, strings and string tables).  The marshalling code is trivially
-generated directly from the protocol specifications, and can be very rapid.
-*/
-type methodFrame struct {
-	ChannelId uint16
-	ClassId   uint16
-	MethodId  uint16
-	Method    message
-}
-
-func (me *methodFrame) channel() uint16 { return me.ChannelId }
-
-/*
-Heartbeating is a technique designed to undo one of TCP/IP's features, namely
-its ability to recover from a broken physical connection by closing only after
-a quite long time-out.  In some scenarios we need to know very rapidly if a
-peer is disconnected or not responding for other reasons (e.g. it is looping).
-Since heartbeating can be done at a low level, we implement this as a special
-type of frame that peers exchange at the transport level, rather than as a
-class method.
-*/
-type heartbeatFrame struct {
-	ChannelId uint16
-}
-
-func (me *heartbeatFrame) channel() uint16 { return me.ChannelId }
-
-/*
-Certain methods (such as Basic.Publish, Basic.Deliver, etc.) are formally
-defined as carrying content.  When a peer sends such a method frame, it always
-follows it with a content header and zero or more content body frames.
-
-A content header frame has this format:
-
-    0          2        4           12               14
-    +----------+--------+-----------+----------------+------------- - -
-    | class-id | weight | body size | property flags | property list...
-    +----------+--------+-----------+----------------+------------- - -
-      short     short    long long       short        remainder...
-
-We place content body in distinct frames (rather than including it in the
-method) so that AMQP may support "zero copy" techniques in which content is
-never marshalled or encoded.  We place the content properties in their own
-frame so that recipients can selectively discard contents they do not want to
-process
-*/
-type headerFrame struct {
-	ChannelId  uint16
-	ClassId    uint16
-	weight     uint16
-	Size       uint64
-	Properties properties
-}
-
-func (me *headerFrame) channel() uint16 { return me.ChannelId }
-
-/*
-Content is the application data we carry from client-to-client via the AMQP
-server.  Content is, roughly speaking, a set of properties plus a binary data
-part.  The set of allowed properties are defined by the Basic class, and these
-form the "content header frame".  The data can be any size, and MAY be broken
-into several (or many) chunks, each forming a "content body frame".
-
-Looking at the frames for a specific channel, as they pass on the wire, we
-might see something like this:
-
-		[method]
-		[method] [header] [body] [body]
-		[method]
-		...
-*/
-type bodyFrame struct {
-	ChannelId uint16
-	Body      []byte
-}
-
-func (me *bodyFrame) channel() uint16 { return me.ChannelId }
diff --git a/Godeps/_workspace/src/github.com/streadway/amqp/uri.go b/Godeps/_workspace/src/github.com/streadway/amqp/uri.go
deleted file mode 100644
index 582464db5..000000000
--- a/Godeps/_workspace/src/github.com/streadway/amqp/uri.go
+++ /dev/null
@@ -1,170 +0,0 @@
-// Copyright (c) 2012, Sean Treadway, SoundCloud Ltd.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-// Source code and contact info at http://github.com/streadway/amqp
-
-package amqp
-
-import (
-	"errors"
-	"fmt"
-	"net/url"
-	"strconv"
-	"strings"
-)
-
-var errURIScheme = errors.New("AMQP scheme must be either 'amqp://' or 'amqps://'")
-
-var schemePorts = map[string]int{
-	"amqp":  5672,
-	"amqps": 5671,
-}
-
-var defaultURI = URI{
-	Scheme:   "amqp",
-	Host:     "localhost",
-	Port:     5672,
-	Username: "guest",
-	Password: "guest",
-	Vhost:    "/",
-}
-
-// URI represents a parsed AMQP URI string.
-type URI struct {
-	Scheme   string
-	Host     string
-	Port     int
-	Username string
-	Password string
-	Vhost    string
-}
-
-// ParseURI attempts to parse the given AMQP URI according to the spec.
-// See http://www.rabbitmq.com/uri-spec.html.
-//
-// Default values for the fields are:
-//
-//   Scheme: amqp
-//   Host: localhost
-//   Port: 5672
-//   Username: guest
-//   Password: guest
-//   Vhost: /
-//
-func ParseURI(uri string) (URI, error) {
-	me := defaultURI
-
-	u, err := url.Parse(uri)
-	if err != nil {
-		return me, err
-	}
-
-	defaultPort, okScheme := schemePorts[u.Scheme]
-
-	if okScheme {
-		me.Scheme = u.Scheme
-	} else {
-		return me, errURIScheme
-	}
-
-	host, port := splitHostPort(u.Host)
-
-	if host != "" {
-		me.Host = host
-	}
-
-	if port != "" {
-		port32, err := strconv.ParseInt(port, 10, 32)
-		if err != nil {
-			return me, err
-		}
-		me.Port = int(port32)
-	} else {
-		me.Port = defaultPort
-	}
-
-	if u.User != nil {
-		me.Username = u.User.Username()
-		if password, ok := u.User.Password(); ok {
-			me.Password = password
-		}
-	}
-
-	if u.Path != "" {
-		if strings.HasPrefix(u.Path, "/") {
-			if u.Host == "" && strings.HasPrefix(u.Path, "///") {
-				// net/url doesn't handle local context authorities and leaves that up
-				// to the scheme handler.  In our case, we translate amqp:/// into the
-				// default host and whatever the vhost should be
-				if len(u.Path) > 3 {
-					me.Vhost = u.Path[3:]
-				}
-			} else if len(u.Path) > 1 {
-				me.Vhost = u.Path[1:]
-			}
-		} else {
-			me.Vhost = u.Path
-		}
-	}
-
-	return me, nil
-}
-
-// Splits host:port, host, [ho:st]:port, or [ho:st].  Unlike net.SplitHostPort
-// which splits :port, host:port or [host]:port
-//
-// Handles hosts that have colons that are in brackets like [::1]:http
-func splitHostPort(addr string) (host, port string) {
-	i := strings.LastIndex(addr, ":")
-
-	if i >= 0 {
-		host, port = addr[:i], addr[i+1:]
-
-		if len(port) > 0 && port[len(port)-1] == ']' && addr[0] == '[' {
-			// we've split on an inner colon, the port was missing outside of the
-			// brackets so use the full addr.  We could assert that host should not
-			// contain any colons here
-			host, port = addr, ""
-		}
-	} else {
-		host = addr
-	}
-
-	return
-}
-
-// PlainAuth returns a PlainAuth structure based on the parsed URI's
-// Username and Password fields.
-func (me URI) PlainAuth() *PlainAuth {
-	return &PlainAuth{
-		Username: me.Username,
-		Password: me.Password,
-	}
-}
-
-func (me URI) String() string {
-	var authority string
-
-	if me.Username != defaultURI.Username || me.Password != defaultURI.Password {
-		authority += me.Username
-
-		if me.Password != defaultURI.Password {
-			authority += ":" + me.Password
-		}
-
-		authority += "@"
-	}
-
-	authority += me.Host
-
-	if defaultPort, found := schemePorts[me.Scheme]; !found || defaultPort != me.Port {
-		authority += ":" + strconv.FormatInt(int64(me.Port), 10)
-	}
-
-	var vhost string
-	if me.Vhost != defaultURI.Vhost {
-		vhost = me.Vhost
-	}
-
-	return fmt.Sprintf("%s://%s/%s", me.Scheme, authority, url.QueryEscape(vhost))
-}
diff --git a/Godeps/_workspace/src/github.com/streadway/amqp/uri_test.go b/Godeps/_workspace/src/github.com/streadway/amqp/uri_test.go
deleted file mode 100644
index 5d93e0bc7..000000000
--- a/Godeps/_workspace/src/github.com/streadway/amqp/uri_test.go
+++ /dev/null
@@ -1,328 +0,0 @@
-package amqp
-
-import (
-	"testing"
-)
-
-// Test matrix defined on http://www.rabbitmq.com/uri-spec.html
-type testURI struct {
-	url      string
-	username string
-	password string
-	host     string
-	port     int
-	vhost    string
-	canon    string
-}
-
-var uriTests = []testURI{
-	{
-		url:      "amqp://user:pass@host:10000/vhost",
-		username: "user",
-		password: "pass",
-		host:     "host",
-		port:     10000,
-		vhost:    "vhost",
-		canon:    "amqp://user:pass@host:10000/vhost",
-	},
-
-	// this fails due to net/url not parsing pct-encoding in host
-	// testURI{url: "amqp://user%61:%61pass@ho%61st:10000/v%2Fhost",
-	//	username: "usera",
-	//	password: "apass",
-	//	host:     "hoast",
-	//	port:     10000,
-	//	vhost:    "v/host",
-	// },
-
-	{
-		url:      "amqp://",
-		username: defaultURI.Username,
-		password: defaultURI.Password,
-		host:     defaultURI.Host,
-		port:     defaultURI.Port,
-		vhost:    defaultURI.Vhost,
-		canon:    "amqp://localhost/",
-	},
-
-	{
-		url:      "amqp://:@/",
-		username: "",
-		password: "",
-		host:     defaultURI.Host,
-		port:     defaultURI.Port,
-		vhost:    defaultURI.Vhost,
-		canon:    "amqp://:@localhost/",
-	},
-
-	{
-		url:      "amqp://user@",
-		username: "user",
-		password: defaultURI.Password,
-		host:     defaultURI.Host,
-		port:     defaultURI.Port,
-		vhost:    defaultURI.Vhost,
-		canon:    "amqp://user@localhost/",
-	},
-
-	{
-		url:      "amqp://user:pass@",
-		username: "user",
-		password: "pass",
-		host:     defaultURI.Host,
-		port:     defaultURI.Port,
-		vhost:    defaultURI.Vhost,
-		canon:    "amqp://user:pass@localhost/",
-	},
-
-	{
-		url:      "amqp://guest:pass@",
-		username: "guest",
-		password: "pass",
-		host:     defaultURI.Host,
-		port:     defaultURI.Port,
-		vhost:    defaultURI.Vhost,
-		canon:    "amqp://guest:pass@localhost/",
-	},
-
-	{
-		url:      "amqp://host",
-		username: defaultURI.Username,
-		password: defaultURI.Password,
-		host:     "host",
-		port:     defaultURI.Port,
-		vhost:    defaultURI.Vhost,
-		canon:    "amqp://host/",
-	},
-
-	{
-		url:      "amqp://:10000",
-		username: defaultURI.Username,
-		password: defaultURI.Password,
-		host:     defaultURI.Host,
-		port:     10000,
-		vhost:    defaultURI.Vhost,
-		canon:    "amqp://localhost:10000/",
-	},
-
-	{
-		url:      "amqp:///vhost",
-		username: defaultURI.Username,
-		password: defaultURI.Password,
-		host:     defaultURI.Host,
-		port:     defaultURI.Port,
-		vhost:    "vhost",
-		canon:    "amqp://localhost/vhost",
-	},
-
-	{
-		url:      "amqp://host/",
-		username: defaultURI.Username,
-		password: defaultURI.Password,
-		host:     "host",
-		port:     defaultURI.Port,
-		vhost:    defaultURI.Vhost,
-		canon:    "amqp://host/",
-	},
-
-	{
-		url:      "amqp://host/%2F",
-		username: defaultURI.Username,
-		password: defaultURI.Password,
-		host:     "host",
-		port:     defaultURI.Port,
-		vhost:    "/",
-		canon:    "amqp://host/",
-	},
-
-	{
-		url:      "amqp://host/%2F%2F",
-		username: defaultURI.Username,
-		password: defaultURI.Password,
-		host:     "host",
-		port:     defaultURI.Port,
-		vhost:    "//",
-		canon:    "amqp://host/%2F%2F",
-	},
-
-	{
-		url:      "amqp://host/%2Fslash%2F",
-		username: defaultURI.Username,
-		password: defaultURI.Password,
-		host:     "host",
-		port:     defaultURI.Port,
-		vhost:    "/slash/",
-		canon:    "amqp://host/%2Fslash%2F",
-	},
-
-	{
-		url:      "amqp://192.168.1.1:1000/",
-		username: defaultURI.Username,
-		password: defaultURI.Password,
-		host:     "192.168.1.1",
-		port:     1000,
-		vhost:    defaultURI.Vhost,
-		canon:    "amqp://192.168.1.1:1000/",
-	},
-
-	{
-		url:      "amqp://[::1]",
-		username: defaultURI.Username,
-		password: defaultURI.Password,
-		host:     "[::1]",
-		port:     defaultURI.Port,
-		vhost:    defaultURI.Vhost,
-		canon:    "amqp://[::1]/",
-	},
-
-	{
-		url:      "amqp://[::1]:1000",
-		username: defaultURI.Username,
-		password: defaultURI.Password,
-		host:     "[::1]",
-		port:     1000,
-		vhost:    defaultURI.Vhost,
-		canon:    "amqp://[::1]:1000/",
-	},
-
-	{
-		url:      "amqps:///",
-		username: defaultURI.Username,
-		password: defaultURI.Password,
-		host:     defaultURI.Host,
-		port:     schemePorts["amqps"],
-		vhost:    defaultURI.Vhost,
-		canon:    "amqps://localhost/",
-	},
-
-	{
-		url:      "amqps://host:1000/",
-		username: defaultURI.Username,
-		password: defaultURI.Password,
-		host:     "host",
-		port:     1000,
-		vhost:    defaultURI.Vhost,
-		canon:    "amqps://host:1000/",
-	},
-}
-
-func TestURISpec(t *testing.T) {
-	for _, test := range uriTests {
-		u, err := ParseURI(test.url)
-		if err != nil {
-			t.Fatal("Could not parse spec URI: ", test.url, " err: ", err)
-		}
-
-		if test.username != u.Username {
-			t.Error("For: ", test.url, " usernames do not match. want: ", test.username, " got: ", u.Username)
-		}
-
-		if test.password != u.Password {
-			t.Error("For: ", test.url, " passwords do not match. want: ", test.password, " got: ", u.Password)
-		}
-
-		if test.host != u.Host {
-			t.Error("For: ", test.url, " hosts do not match. want: ", test.host, " got: ", u.Host)
-		}
-
-		if test.port != u.Port {
-			t.Error("For: ", test.url, " ports do not match. want: ", test.port, " got: ", u.Port)
-		}
-
-		if test.vhost != u.Vhost {
-			t.Error("For: ", test.url, " vhosts do not match. want: ", test.vhost, " got: ", u.Vhost)
-		}
-
-		if test.canon != u.String() {
-			t.Error("For: ", test.url, " canonical string does not match. want: ", test.canon, " got: ", u.String())
-		}
-	}
-}
-
-func TestURIUnknownScheme(t *testing.T) {
-	if _, err := ParseURI("http://example.com/"); err == nil {
-		t.Fatal("Expected error when parsing non-amqp scheme")
-	}
-}
-
-func TestURIScheme(t *testing.T) {
-	if _, err := ParseURI("amqp://example.com/"); err != nil {
-		t.Fatalf("Expected to parse amqp scheme, got %v", err)
-	}
-
-	if _, err := ParseURI("amqps://example.com/"); err != nil {
-		t.Fatalf("Expected to parse amqps scheme, got %v", err)
-	}
-}
-
-func TestURIDefaults(t *testing.T) {
-	url := "amqp://"
-	uri, err := ParseURI(url)
-	if err != nil {
-		t.Fatal("Could not parse")
-	}
-
-	if uri.String() != "amqp://localhost/" {
-		t.Fatal("Defaults not encoded properly got:", uri.String())
-	}
-}
-
-func TestURIComplete(t *testing.T) {
-	url := "amqp://bob:dobbs@foo.bar:5678/private"
-	uri, err := ParseURI(url)
-	if err != nil {
-		t.Fatal("Could not parse")
-	}
-
-	if uri.String() != url {
-		t.Fatal("Defaults not encoded properly want:", url, " got:", uri.String())
-	}
-}
-
-func TestURIDefaultPortAmqpNotIncluded(t *testing.T) {
-	url := "amqp://foo.bar:5672/"
-	uri, err := ParseURI(url)
-	if err != nil {
-		t.Fatal("Could not parse")
-	}
-
-	if uri.String() != "amqp://foo.bar/" {
-		t.Fatal("Defaults not encoded properly got:", uri.String())
-	}
-}
-
-func TestURIDefaultPortAmqp(t *testing.T) {
-	url := "amqp://foo.bar/"
-	uri, err := ParseURI(url)
-	if err != nil {
-		t.Fatal("Could not parse")
-	}
-
-	if uri.Port != 5672 {
-		t.Fatal("Default port not correct for amqp, got:", uri.Port)
-	}
-}
-
-func TestURIDefaultPortAmqpsNotIncludedInString(t *testing.T) {
-	url := "amqps://foo.bar:5671/"
-	uri, err := ParseURI(url)
-	if err != nil {
-		t.Fatal("Could not parse")
-	}
-
-	if uri.String() != "amqps://foo.bar/" {
-		t.Fatal("Defaults not encoded properly got:", uri.String())
-	}
-}
-
-func TestURIDefaultPortAmqps(t *testing.T) {
-	url := "amqps://foo.bar/"
-	uri, err := ParseURI(url)
-	if err != nil {
-		t.Fatal("Could not parse")
-	}
-
-	if uri.Port != 5671 {
-		t.Fatal("Default port not correct for amqps, got:", uri.Port)
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/streadway/amqp/write.go b/Godeps/_workspace/src/github.com/streadway/amqp/write.go
deleted file mode 100644
index d392ca237..000000000
--- a/Godeps/_workspace/src/github.com/streadway/amqp/write.go
+++ /dev/null
@@ -1,411 +0,0 @@
-// Copyright (c) 2012, Sean Treadway, SoundCloud Ltd.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-// Source code and contact info at http://github.com/streadway/amqp
-
-package amqp
-
-import (
-	"bufio"
-	"bytes"
-	"encoding/binary"
-	"errors"
-	"io"
-	"math"
-	"time"
-)
-
-func (me *writer) WriteFrame(frame frame) (err error) {
-	if err = frame.write(me.w); err != nil {
-		return
-	}
-
-	if buf, ok := me.w.(*bufio.Writer); ok {
-		err = buf.Flush()
-	}
-
-	return
-}
-
-func (me *methodFrame) write(w io.Writer) (err error) {
-	var payload bytes.Buffer
-
-	if me.Method == nil {
-		return errors.New("malformed frame: missing method")
-	}
-
-	class, method := me.Method.id()
-
-	if err = binary.Write(&payload, binary.BigEndian, class); err != nil {
-		return
-	}
-
-	if err = binary.Write(&payload, binary.BigEndian, method); err != nil {
-		return
-	}
-
-	if err = me.Method.write(&payload); err != nil {
-		return
-	}
-
-	return writeFrame(w, frameMethod, me.ChannelId, payload.Bytes())
-}
-
-// Heartbeat
-//
-// Payload is empty
-func (me *heartbeatFrame) write(w io.Writer) (err error) {
-	return writeFrame(w, frameHeartbeat, me.ChannelId, []byte{})
-}
-
-// CONTENT HEADER
-// 0          2        4           12               14
-// +----------+--------+-----------+----------------+------------- - -
-// | class-id | weight | body size | property flags | property list...
-// +----------+--------+-----------+----------------+------------- - -
-//    short     short    long long       short        remainder...
-//
-func (me *headerFrame) write(w io.Writer) (err error) {
-	var payload bytes.Buffer
-	var zeroTime time.Time
-
-	if err = binary.Write(&payload, binary.BigEndian, me.ClassId); err != nil {
-		return
-	}
-
-	if err = binary.Write(&payload, binary.BigEndian, me.weight); err != nil {
-		return
-	}
-
-	if err = binary.Write(&payload, binary.BigEndian, me.Size); err != nil {
-		return
-	}
-
-	// First pass will build the mask to be serialized, second pass will serialize
-	// each of the fields that appear in the mask.
-
-	var mask uint16
-
-	if len(me.Properties.ContentType) > 0 {
-		mask = mask | flagContentType
-	}
-	if len(me.Properties.ContentEncoding) > 0 {
-		mask = mask | flagContentEncoding
-	}
-	if me.Properties.Headers != nil && len(me.Properties.Headers) > 0 {
-		mask = mask | flagHeaders
-	}
-	if me.Properties.DeliveryMode > 0 {
-		mask = mask | flagDeliveryMode
-	}
-	if me.Properties.Priority > 0 {
-		mask = mask | flagPriority
-	}
-	if len(me.Properties.CorrelationId) > 0 {
-		mask = mask | flagCorrelationId
-	}
-	if len(me.Properties.ReplyTo) > 0 {
-		mask = mask | flagReplyTo
-	}
-	if len(me.Properties.Expiration) > 0 {
-		mask = mask | flagExpiration
-	}
-	if len(me.Properties.MessageId) > 0 {
-		mask = mask | flagMessageId
-	}
-	if me.Properties.Timestamp != zeroTime {
-		mask = mask | flagTimestamp
-	}
-	if len(me.Properties.Type) > 0 {
-		mask = mask | flagType
-	}
-	if len(me.Properties.UserId) > 0 {
-		mask = mask | flagUserId
-	}
-	if len(me.Properties.AppId) > 0 {
-		mask = mask | flagAppId
-	}
-
-	if err = binary.Write(&payload, binary.BigEndian, mask); err != nil {
-		return
-	}
-
-	if hasProperty(mask, flagContentType) {
-		if err = writeShortstr(&payload, me.Properties.ContentType); err != nil {
-			return
-		}
-	}
-	if hasProperty(mask, flagContentEncoding) {
-		if err = writeShortstr(&payload, me.Properties.ContentEncoding); err != nil {
-			return
-		}
-	}
-	if hasProperty(mask, flagHeaders) {
-		if err = writeTable(&payload, me.Properties.Headers); err != nil {
-			return
-		}
-	}
-	if hasProperty(mask, flagDeliveryMode) {
-		if err = binary.Write(&payload, binary.BigEndian, me.Properties.DeliveryMode); err != nil {
-			return
-		}
-	}
-	if hasProperty(mask, flagPriority) {
-		if err = binary.Write(&payload, binary.BigEndian, me.Properties.Priority); err != nil {
-			return
-		}
-	}
-	if hasProperty(mask, flagCorrelationId) {
-		if err = writeShortstr(&payload, me.Properties.CorrelationId); err != nil {
-			return
-		}
-	}
-	if hasProperty(mask, flagReplyTo) {
-		if err = writeShortstr(&payload, me.Properties.ReplyTo); err != nil {
-			return
-		}
-	}
-	if hasProperty(mask, flagExpiration) {
-		if err = writeShortstr(&payload, me.Properties.Expiration); err != nil {
-			return
-		}
-	}
-	if hasProperty(mask, flagMessageId) {
-		if err = writeShortstr(&payload, me.Properties.MessageId); err != nil {
-			return
-		}
-	}
-	if hasProperty(mask, flagTimestamp) {
-		if err = binary.Write(&payload, binary.BigEndian, uint64(me.Properties.Timestamp.Unix())); err != nil {
-			return
-		}
-	}
-	if hasProperty(mask, flagType) {
-		if err = writeShortstr(&payload, me.Properties.Type); err != nil {
-			return
-		}
-	}
-	if hasProperty(mask, flagUserId) {
-		if err = writeShortstr(&payload, me.Properties.UserId); err != nil {
-			return
-		}
-	}
-	if hasProperty(mask, flagAppId) {
-		if err = writeShortstr(&payload, me.Properties.AppId); err != nil {
-			return
-		}
-	}
-
-	return writeFrame(w, frameHeader, me.ChannelId, payload.Bytes())
-}
-
-// Body
-//
-// Payload is one byterange from the full body who's size is declared in the
-// Header frame
-func (me *bodyFrame) write(w io.Writer) (err error) {
-	return writeFrame(w, frameBody, me.ChannelId, me.Body)
-}
-
-func writeFrame(w io.Writer, typ uint8, channel uint16, payload []byte) (err error) {
-	end := []byte{frameEnd}
-	size := uint(len(payload))
-
-	_, err = w.Write([]byte{
-		byte(typ),
-		byte((channel & 0xff00) >> 8),
-		byte((channel & 0x00ff) >> 0),
-		byte((size & 0xff000000) >> 24),
-		byte((size & 0x00ff0000) >> 16),
-		byte((size & 0x0000ff00) >> 8),
-		byte((size & 0x000000ff) >> 0),
-	})
-
-	if err != nil {
-		return
-	}
-
-	if _, err = w.Write(payload); err != nil {
-		return
-	}
-
-	if _, err = w.Write(end); err != nil {
-		return
-	}
-
-	return
-}
-
-func writeShortstr(w io.Writer, s string) (err error) {
-	b := []byte(s)
-
-	var length uint8 = uint8(len(b))
-
-	if err = binary.Write(w, binary.BigEndian, length); err != nil {
-		return
-	}
-
-	if _, err = w.Write(b[:length]); err != nil {
-		return
-	}
-
-	return
-}
-
-func writeLongstr(w io.Writer, s string) (err error) {
-	b := []byte(s)
-
-	var length uint32 = uint32(len(b))
-
-	if err = binary.Write(w, binary.BigEndian, length); err != nil {
-		return
-	}
-
-	if _, err = w.Write(b[:length]); err != nil {
-		return
-	}
-
-	return
-}
-
-/*
-'A': []interface{}
-'D': Decimal
-'F': Table
-'I': int32
-'S': string
-'T': time.Time
-'V': nil
-'b': byte
-'d': float64
-'f': float32
-'l': int64
-'s': int16
-'t': bool
-'x': []byte
-*/
-func writeField(w io.Writer, value interface{}) (err error) {
-	var buf [9]byte
-	var enc []byte
-
-	switch v := value.(type) {
-	case bool:
-		buf[0] = 't'
-		if v {
-			buf[1] = byte(1)
-		} else {
-			buf[1] = byte(0)
-		}
-		enc = buf[:2]
-
-	case byte:
-		buf[0] = 'b'
-		buf[1] = byte(v)
-		enc = buf[:2]
-
-	case int16:
-		buf[0] = 's'
-		binary.BigEndian.PutUint16(buf[1:3], uint16(v))
-		enc = buf[:3]
-
-	case int32:
-		buf[0] = 'I'
-		binary.BigEndian.PutUint32(buf[1:5], uint32(v))
-		enc = buf[:5]
-
-	case int64:
-		buf[0] = 'l'
-		binary.BigEndian.PutUint64(buf[1:9], uint64(v))
-		enc = buf[:9]
-
-	case float32:
-		buf[0] = 'f'
-		binary.BigEndian.PutUint32(buf[1:5], math.Float32bits(v))
-		enc = buf[:5]
-
-	case float64:
-		buf[0] = 'd'
-		binary.BigEndian.PutUint64(buf[1:9], math.Float64bits(v))
-		enc = buf[:9]
-
-	case Decimal:
-		buf[0] = 'D'
-		buf[1] = byte(v.Scale)
-		binary.BigEndian.PutUint32(buf[2:6], uint32(v.Value))
-		enc = buf[:6]
-
-	case string:
-		buf[0] = 'S'
-		binary.BigEndian.PutUint32(buf[1:5], uint32(len(v)))
-		enc = append(buf[:5], []byte(v)...)
-
-	case []interface{}: // field-array
-		buf[0] = 'A'
-
-		sec := new(bytes.Buffer)
-		for _, val := range v {
-			if err = writeField(sec, val); err != nil {
-				return
-			}
-		}
-
-		binary.BigEndian.PutUint32(buf[1:5], uint32(sec.Len()))
-		if _, err = w.Write(buf[:5]); err != nil {
-			return
-		}
-
-		if _, err = w.Write(sec.Bytes()); err != nil {
-			return
-		}
-
-		return
-
-	case time.Time:
-		buf[0] = 'T'
-		binary.BigEndian.PutUint64(buf[1:9], uint64(v.Unix()))
-		enc = buf[:9]
-
-	case Table:
-		if _, err = w.Write([]byte{'F'}); err != nil {
-			return
-		}
-		return writeTable(w, v)
-
-	case []byte:
-		buf[0] = 'x'
-		binary.BigEndian.PutUint32(buf[1:5], uint32(len(v)))
-		if _, err = w.Write(buf[0:5]); err != nil {
-			return
-		}
-		if _, err = w.Write(v); err != nil {
-			return
-		}
-		return
-
-	case nil:
-		buf[0] = 'V'
-		enc = buf[:1]
-
-	default:
-		return ErrFieldType
-	}
-
-	_, err = w.Write(enc)
-
-	return
-}
-
-func writeTable(w io.Writer, table Table) (err error) {
-	var buf bytes.Buffer
-
-	for key, val := range table {
-		if err = writeShortstr(&buf, key); err != nil {
-			return
-		}
-		if err = writeField(&buf, val); err != nil {
-			return
-		}
-	}
-
-	return writeLongstr(w, string(buf.Bytes()))
-}
diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/.gitignore b/Godeps/_workspace/src/github.com/stretchr/objx/.gitignore
deleted file mode 100644
index 00268614f..000000000
--- a/Godeps/_workspace/src/github.com/stretchr/objx/.gitignore
+++ /dev/null
@@ -1,22 +0,0 @@
-# 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
diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/LICENSE.md b/Godeps/_workspace/src/github.com/stretchr/objx/LICENSE.md
deleted file mode 100644
index 219994581..000000000
--- a/Godeps/_workspace/src/github.com/stretchr/objx/LICENSE.md
+++ /dev/null
@@ -1,23 +0,0 @@
-objx - by Mat Ryer and Tyler Bunnell
-
-The MIT License (MIT)
-
-Copyright (c) 2014 Stretchr, Inc.
-
-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/stretchr/objx/README.md b/Godeps/_workspace/src/github.com/stretchr/objx/README.md
deleted file mode 100644
index 4aa180687..000000000
--- a/Godeps/_workspace/src/github.com/stretchr/objx/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# objx
-
-  * Jump into the [API Documentation](http://godoc.org/github.com/stretchr/objx)
diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/accessors.go b/Godeps/_workspace/src/github.com/stretchr/objx/accessors.go
deleted file mode 100644
index 721bcac79..000000000
--- a/Godeps/_workspace/src/github.com/stretchr/objx/accessors.go
+++ /dev/null
@@ -1,179 +0,0 @@
-package objx
-
-import (
-	"fmt"
-	"regexp"
-	"strconv"
-	"strings"
-)
-
-// arrayAccesRegexString is the regex used to extract the array number
-// from the access path
-const arrayAccesRegexString = `^(.+)\[([0-9]+)\]$`
-
-// arrayAccesRegex is the compiled arrayAccesRegexString
-var arrayAccesRegex = regexp.MustCompile(arrayAccesRegexString)
-
-// Get gets the value using the specified selector and
-// returns it inside a new Obj object.
-//
-// If it cannot find the value, Get will return a nil
-// value inside an instance of Obj.
-//
-// Get can only operate directly on map[string]interface{} and []interface.
-//
-// Example
-//
-// To access the title of the third chapter of the second book, do:
-//
-//    o.Get("books[1].chapters[2].title")
-func (m Map) Get(selector string) *Value {
-	rawObj := access(m, selector, nil, false, false)
-	return &Value{data: rawObj}
-}
-
-// Set sets the value using the specified selector and
-// returns the object on which Set was called.
-//
-// Set can only operate directly on map[string]interface{} and []interface
-//
-// Example
-//
-// To set the title of the third chapter of the second book, do:
-//
-//    o.Set("books[1].chapters[2].title","Time to Go")
-func (m Map) Set(selector string, value interface{}) Map {
-	access(m, selector, value, true, false)
-	return m
-}
-
-// access accesses the object using the selector and performs the
-// appropriate action.
-func access(current, selector, value interface{}, isSet, panics bool) interface{} {
-
-	switch selector.(type) {
-	case int, int8, int16, int32, int64, uint, uint8, uint16, uint32, uint64:
-
-		if array, ok := current.([]interface{}); ok {
-			index := intFromInterface(selector)
-
-			if index >= len(array) {
-				if panics {
-					panic(fmt.Sprintf("objx: Index %d is out of range. Slice only contains %d items.", index, len(array)))
-				}
-				return nil
-			}
-
-			return array[index]
-		}
-
-		return nil
-
-	case string:
-
-		selStr := selector.(string)
-		selSegs := strings.SplitN(selStr, PathSeparator, 2)
-		thisSel := selSegs[0]
-		index := -1
-		var err error
-
-		// https://github.com/stretchr/objx/issues/12
-		if strings.Contains(thisSel, "[") {
-
-			arrayMatches := arrayAccesRegex.FindStringSubmatch(thisSel)
-
-			if len(arrayMatches) > 0 {
-
-				// Get the key into the map
-				thisSel = arrayMatches[1]
-
-				// Get the index into the array at the key
-				index, err = strconv.Atoi(arrayMatches[2])
-
-				if err != nil {
-					// This should never happen. If it does, something has gone
-					// seriously wrong. Panic.
-					panic("objx: Array index is not an integer.  Must use array[int].")
-				}
-
-			}
-		}
-
-		if curMap, ok := current.(Map); ok {
-			current = map[string]interface{}(curMap)
-		}
-
-		// get the object in question
-		switch current.(type) {
-		case map[string]interface{}:
-			curMSI := current.(map[string]interface{})
-			if len(selSegs) <= 1 && isSet {
-				curMSI[thisSel] = value
-				return nil
-			} else {
-				current = curMSI[thisSel]
-			}
-		default:
-			current = nil
-		}
-
-		if current == nil && panics {
-			panic(fmt.Sprintf("objx: '%v' invalid on object.", selector))
-		}
-
-		// do we need to access the item of an array?
-		if index > -1 {
-			if array, ok := current.([]interface{}); ok {
-				if index < len(array) {
-					current = array[index]
-				} else {
-					if panics {
-						panic(fmt.Sprintf("objx: Index %d is out of range. Slice only contains %d items.", index, len(array)))
-					}
-					current = nil
-				}
-			}
-		}
-
-		if len(selSegs) > 1 {
-			current = access(current, selSegs[1], value, isSet, panics)
-		}
-
-	}
-
-	return current
-
-}
-
-// intFromInterface converts an interface object to the largest
-// representation of an unsigned integer using a type switch and
-// assertions
-func intFromInterface(selector interface{}) int {
-	var value int
-	switch selector.(type) {
-	case int:
-		value = selector.(int)
-	case int8:
-		value = int(selector.(int8))
-	case int16:
-		value = int(selector.(int16))
-	case int32:
-		value = int(selector.(int32))
-	case int64:
-		value = int(selector.(int64))
-	case uint:
-		value = int(selector.(uint))
-	case uint8:
-		value = int(selector.(uint8))
-	case uint16:
-		value = int(selector.(uint16))
-	case uint32:
-		value = int(selector.(uint32))
-	case uint64:
-		value = int(selector.(uint64))
-	default:
-		panic("objx: array access argument is not an integer type (this should never happen)")
-	}
-
-	return value
-}
diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/accessors_test.go b/Godeps/_workspace/src/github.com/stretchr/objx/accessors_test.go
deleted file mode 100644
index ce5d8e4aa..000000000
--- a/Godeps/_workspace/src/github.com/stretchr/objx/accessors_test.go
+++ /dev/null
@@ -1,145 +0,0 @@
-package objx
-
-import (
-	"github.com/stretchr/testify/assert"
-	"testing"
-)
-
-func TestAccessorsAccessGetSingleField(t *testing.T) {
-
-	current := map[string]interface{}{"name": "Tyler"}
-	assert.Equal(t, "Tyler", access(current, "name", nil, false, true))
-
-}
-func TestAccessorsAccessGetDeep(t *testing.T) {
-
-	current := map[string]interface{}{"name": map[string]interface{}{"first": "Tyler", "last": "Bunnell"}}
-	assert.Equal(t, "Tyler", access(current, "name.first", nil, false, true))
-	assert.Equal(t, "Bunnell", access(current, "name.last", nil, false, true))
-
-}
-func TestAccessorsAccessGetDeepDeep(t *testing.T) {
-
-	current := map[string]interface{}{"one": map[string]interface{}{"two": map[string]interface{}{"three": map[string]interface{}{"four": 4}}}}
-	assert.Equal(t, 4, access(current, "one.two.three.four", nil, false, true))
-
-}
-func TestAccessorsAccessGetInsideArray(t *testing.T) {
-
-	current := map[string]interface{}{"names": []interface{}{map[string]interface{}{"first": "Tyler", "last": "Bunnell"}, map[string]interface{}{"first": "Capitol", "last": "Bollocks"}}}
-	assert.Equal(t, "Tyler", access(current, "names[0].first", nil, false, true))
-	assert.Equal(t, "Bunnell", access(current, "names[0].last", nil, false, true))
-	assert.Equal(t, "Capitol", access(current, "names[1].first", nil, false, true))
-	assert.Equal(t, "Bollocks", access(current, "names[1].last", nil, false, true))
-
-	assert.Panics(t, func() {
-		access(current, "names[2]", nil, false, true)
-	})
-	assert.Nil(t, access(current, "names[2]", nil, false, false))
-
-}
-
-func TestAccessorsAccessGetFromArrayWithInt(t *testing.T) {
-
-	current := []interface{}{map[string]interface{}{"first": "Tyler", "last": "Bunnell"}, map[string]interface{}{"first": "Capitol", "last": "Bollocks"}}
-	one := access(current, 0, nil, false, false)
-	two := access(current, 1, nil, false, false)
-	three := access(current, 2, nil, false, false)
-
-	assert.Equal(t, "Tyler", one.(map[string]interface{})["first"])
-	assert.Equal(t, "Capitol", two.(map[string]interface{})["first"])
-	assert.Nil(t, three)
-
-}
-
-func TestAccessorsGet(t *testing.T) {
-
-	current := New(map[string]interface{}{"name": "Tyler"})
-	assert.Equal(t, "Tyler", current.Get("name").data)
-
-}
-
-func TestAccessorsAccessSetSingleField(t *testing.T) {
-
-	current := map[string]interface{}{"name": "Tyler"}
-	access(current, "name", "Mat", true, false)
-	assert.Equal(t, current["name"], "Mat")
-
-	access(current, "age", 29, true, true)
-	assert.Equal(t, current["age"], 29)
-
-}
-
-func TestAccessorsAccessSetSingleFieldNotExisting(t *testing.T) {
-
-	current := map[string]interface{}{}
-	access(current, "name", "Mat", true, false)
-	assert.Equal(t, current["name"], "Mat")
-
-}
-
-func TestAccessorsAccessSetDeep(t *testing.T) {
-
-	current := map[string]interface{}{"name": map[string]interface{}{"first": "Tyler", "last": "Bunnell"}}
-
-	access(current, "name.first", "Mat", true, true)
-	access(current, "name.last", "Ryer", true, true)
-
-	assert.Equal(t, "Mat", access(current, "name.first", nil, false, true))
-	assert.Equal(t, "Ryer", access(current, "name.last", nil, false, true))
-
-}
-func TestAccessorsAccessSetDeepDeep(t *testing.T) {
-
-	current := map[string]interface{}{"one": map[string]interface{}{"two": map[string]interface{}{"three": map[string]interface{}{"four": 4}}}}
-
-	access(current, "one.two.three.four", 5, true, true)
-
-	assert.Equal(t, 5, access(current, "one.two.three.four", nil, false, true))
-
-}
-func TestAccessorsAccessSetArray(t *testing.T) {
-
-	current := map[string]interface{}{"names": []interface{}{"Tyler"}}
-
-	access(current, "names[0]", "Mat", true, true)
-
-	assert.Equal(t, "Mat", access(current, "names[0]", nil, false, true))
-
-}
-func TestAccessorsAccessSetInsideArray(t *testing.T) {
-
-	current := map[string]interface{}{"names": []interface{}{map[string]interface{}{"first": "Tyler", "last": "Bunnell"}, map[string]interface{}{"first": "Capitol", "last": "Bollocks"}}}
-
-	access(current, "names[0].first", "Mat", true, true)
-	access(current, "names[0].last", "Ryer", true, true)
-	access(current, "names[1].first", "Captain", true, true)
-	access(current, "names[1].last", "Underpants", true, true)
-
-	assert.Equal(t, "Mat", access(current, "names[0].first", nil, false, true))
-	assert.Equal(t, "Ryer", access(current, "names[0].last", nil, false, true))
-	assert.Equal(t, "Captain", access(current, "names[1].first", nil, false, true))
-	assert.Equal(t, "Underpants", access(current, "names[1].last", nil, false, true))
-
-}
-
-func TestAccessorsAccessSetFromArrayWithInt(t *testing.T) {
-
-	current := []interface{}{map[string]interface{}{"first": "Tyler", "last": "Bunnell"}, map[string]interface{}{"first": "Capitol", "last": "Bollocks"}}
-	one := access(current, 0, nil, false, false)
-	two := access(current, 1, nil, false, false)
-	three := access(current, 2, nil, false, false)
-
-	assert.Equal(t, "Tyler", one.(map[string]interface{})["first"])
-	assert.Equal(t, "Capitol", two.(map[string]interface{})["first"])
-	assert.Nil(t, three)
-
-}
-
-func TestAccessorsSet(t *testing.T) {
-
-	current := New(map[string]interface{}{"name": "Tyler"})
-	current.Set("name", "Mat")
-	assert.Equal(t, "Mat", current.Get("name").data)
-
-}
diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/codegen/array-access.txt b/Godeps/_workspace/src/github.com/stretchr/objx/codegen/array-access.txt
deleted file mode 100644
index 306023475..000000000
--- a/Godeps/_workspace/src/github.com/stretchr/objx/codegen/array-access.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-  case []{1}:
-    a := object.([]{1})
-    if isSet {
-      a[index] = value.({1})
-    } else {
-      if index >= len(a) {
-        if panics {
-          panic(fmt.Sprintf("objx: Index %d is out of range because the []{1} only contains %d items.", index, len(a)))
-        }
-        return nil
-      } else {
-        return a[index]
-      }
-    }
diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/codegen/index.html b/Godeps/_workspace/src/github.com/stretchr/objx/codegen/index.html
deleted file mode 100644
index 379ffc3c0..000000000
--- a/Godeps/_workspace/src/github.com/stretchr/objx/codegen/index.html
+++ /dev/null
@@ -1,86 +0,0 @@
-<html>
-	<head>
-	<title>
-		Codegen
-	</title>
-	<style>
-		body {
-			width: 800px;
-			margin: auto;
-		}
-		textarea {
-			width: 100%;
-			min-height: 100px;
-			font-family: Courier;
-		}
-	</style>
-	</head>
-	<body>
-
-		<h2>
-			Template
-		</h2>
-		<p>
-			Use <code>{x}</code> as a placeholder for each argument.
-		</p>
-		<textarea id="template"></textarea>
-
-		<h2>
-			Arguments (comma separated)
-		</h2>
-		<p>
-			One block per line
-		</p>
-		<textarea id="args"></textarea>
-
-		<h2>
-			Output
-		</h2>
-		<input id="go" type="button" value="Generate code" />
-
-		<textarea id="output"></textarea>
-
-		<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
-		<script>
-
-			$(function(){
-
-				$("#go").click(function(){
-
-					var output = ""
-					var template = $("#template").val()
-					var args = $("#args").val()
-
-					// collect the args
-					var argLines = args.split("\n")
-					for (var line in argLines) {
-
-						var argLine = argLines[line];
-						var thisTemp = template
-
-						// get individual args
-						var args = argLine.split(",")
-
-						for (var argI in args) {
-							var argText = args[argI];
-							var argPlaceholder = "{" + argI + "}";
-
-							while (thisTemp.indexOf(argPlaceholder) > -1) {
-								thisTemp = thisTemp.replace(argPlaceholder, argText);
-							}
-
-						}
-
-						output += thisTemp
-
-					}
-
-					$("#output").val(output);
-
-				});
-
-			});
-
-		</script>
-	</body>
-</html>
diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/codegen/template.txt b/Godeps/_workspace/src/github.com/stretchr/objx/codegen/template.txt
deleted file mode 100644
index b396900b8..000000000
--- a/Godeps/_workspace/src/github.com/stretchr/objx/codegen/template.txt
+++ /dev/null
@@ -1,286 +0,0 @@
-/*
-	{4} ({1} and []{1})
-	--------------------------------------------------
-*/
-
-// {4} gets the value as a {1}, returns the optionalDefault
-// value or a system default object if the value is the wrong type.
-func (v *Value) {4}(optionalDefault ...{1}) {1} {
-	if s, ok := v.data.({1}); ok {
-		return s
-	}
-	if len(optionalDefault) == 1 {
-		return optionalDefault[0]
-	}
-	return {3}
-}
-
-// Must{4} gets the value as a {1}.
-//
-// Panics if the object is not a {1}.
-func (v *Value) Must{4}() {1} {
-	return v.data.({1})
-}
-
-// {4}Slice gets the value as a []{1}, returns the optionalDefault
-// value or nil if the value is not a []{1}.
-func (v *Value) {4}Slice(optionalDefault ...[]{1}) []{1} {
-	if s, ok := v.data.([]{1}); ok {
-		return s
-	}
-	if len(optionalDefault) == 1 {
-		return optionalDefault[0]
-	}
-	return nil
-}
-
-// Must{4}Slice gets the value as a []{1}.
-//
-// Panics if the object is not a []{1}.
-func (v *Value) Must{4}Slice() []{1} {
-	return v.data.([]{1})
-}
-
-// Is{4} gets whether the object contained is a {1} or not.
-func (v *Value) Is{4}() bool {
-  _, ok := v.data.({1})
-  return ok
-}
-
-// Is{4}Slice gets whether the object contained is a []{1} or not.
-func (v *Value) Is{4}Slice() bool {
-	_, ok := v.data.([]{1})
-	return ok
-}
-
-// Each{4} calls the specified callback for each object
-// in the []{1}.
-//
-// Panics if the object is the wrong type.
-func (v *Value) Each{4}(callback func(int, {1}) bool) *Value {
-
-	for index, val := range v.Must{4}Slice() {
-		carryon := callback(index, val)
-		if carryon == false {
-			break
-		}
-	}
-
-	return v
-
-}
-
-// Where{4} uses the specified decider function to select items
-// from the []{1}.  The object contained in the result will contain
-// only the selected items.
-func (v *Value) Where{4}(decider func(int, {1}) bool) *Value {
-
-	var selected []{1}
-
-	v.Each{4}(func(index int, val {1}) bool {
-		shouldSelect := decider(index, val)
-		if shouldSelect == false {
-			selected = append(selected, val)
-		}
-		return true
-	})
-
-	return &Value{data:selected}
-
-}
-
-// Group{4} uses the specified grouper function to group the items
-// keyed by the return of the grouper.  The object contained in the
-// result will contain a map[string][]{1}.
-func (v *Value) Group{4}(grouper func(int, {1}) string) *Value {
-
-	groups := make(map[string][]{1})
-
-	v.Each{4}(func(index int, val {1}) bool {
-		group := grouper(index, val)
-		if _, ok := groups[group]; !ok {
-			groups[group] = make([]{1}, 0)
-		}
-		groups[group] = append(groups[group], val)
-		return true
-	})
-
-	return &Value{data:groups}
-
-}
-
-// Replace{4} uses the specified function to replace each {1}s
-// by iterating each item.  The data in the returned result will be a
-// []{1} containing the replaced items.
-func (v *Value) Replace{4}(replacer func(int, {1}) {1}) *Value {
-
-	arr := v.Must{4}Slice()
-	replaced := make([]{1}, len(arr))
-
-	v.Each{4}(func(index int, val {1}) bool {
-		replaced[index] = replacer(index, val)
-		return true
-	})
-
-	return &Value{data:replaced}
-
-}
-
-// Collect{4} uses the specified collector function to collect a value
-// for each of the {1}s in the slice.  The data returned will be a
-// []interface{}.
-func (v *Value) Collect{4}(collector func(int, {1}) interface{}) *Value {
-
-	arr := v.Must{4}Slice()
-	collected := make([]interface{}, len(arr))
-
-	v.Each{4}(func(index int, val {1}) bool {
-		collected[index] = collector(index, val)
-		return true
-	})
-
-	return &Value{data:collected}
-}
-
-// ************************************************************
-// TESTS
-// ************************************************************
-
-func Test{4}(t *testing.T) {
-
-  val := {1}( {2} )
-	m := map[string]interface{}{"value": val, "nothing": nil}
-	assert.Equal(t, val, New(m).Get("value").{4}())
-	assert.Equal(t, val, New(m).Get("value").Must{4}())
-	assert.Equal(t, {1}({3}), New(m).Get("nothing").{4}())
-	assert.Equal(t, val, New(m).Get("nothing").{4}({2}))
-
-	assert.Panics(t, func() {
-		New(m).Get("age").Must{4}()
-	})
-
-}
-
-func Test{4}Slice(t *testing.T) {
-
-  val := {1}( {2} )
-	m := map[string]interface{}{"value": []{1}{ val }, "nothing": nil}
-	assert.Equal(t, val, New(m).Get("value").{4}Slice()[0])
-	assert.Equal(t, val, New(m).Get("value").Must{4}Slice()[0])
-	assert.Equal(t, []{1}(nil), New(m).Get("nothing").{4}Slice())
-	assert.Equal(t, val, New(m).Get("nothing").{4}Slice( []{1}{ {1}({2}) } )[0])
-
-	assert.Panics(t, func() {
-		New(m).Get("nothing").Must{4}Slice()
-	})
-
-}
-
-func TestIs{4}(t *testing.T) {
-
-	var v *Value
-
-	v = &Value{data: {1}({2})}
-	assert.True(t, v.Is{4}())
-
-	v = &Value{data: []{1}{ {1}({2}) }}
-	assert.True(t, v.Is{4}Slice())
-
-}
-
-func TestEach{4}(t *testing.T) {
-
-	v := &Value{data: []{1}{ {1}({2}), {1}({2}), {1}({2}), {1}({2}), {1}({2}) }}
-	count := 0
-	replacedVals := make([]{1}, 0)
-	assert.Equal(t, v, v.Each{4}(func(i int, val {1}) bool {
-
-		count++
-		replacedVals = append(replacedVals, val)
-
-		// abort early
-		if i == 2 {
-			return false
-		}
-
-		return true
-
-	}))
-
-	assert.Equal(t, count, 3)
-	assert.Equal(t, replacedVals[0], v.Must{4}Slice()[0])
-	assert.Equal(t, replacedVals[1], v.Must{4}Slice()[1])
-	assert.Equal(t, replacedVals[2], v.Must{4}Slice()[2])
-
-}
-
-func TestWhere{4}(t *testing.T) {
-
-	v := &Value{data: []{1}{ {1}({2}), {1}({2}), {1}({2}), {1}({2}), {1}({2}), {1}({2}) }}
-
-	selected := v.Where{4}(func(i int, val {1}) bool {
-		return i%2==0
-	}).Must{4}Slice()
-
-	assert.Equal(t, 3, len(selected))
-
-}
-
-func TestGroup{4}(t *testing.T) {
-
-	v := &Value{data: []{1}{ {1}({2}), {1}({2}), {1}({2}), {1}({2}), {1}({2}), {1}({2}) }}
-
-	grouped := v.Group{4}(func(i int, val {1}) string {
-		return fmt.Sprintf("%v", i%2==0)
-	}).data.(map[string][]{1})
-
-	assert.Equal(t, 2, len(grouped))
-	assert.Equal(t, 3, len(grouped["true"]))
-	assert.Equal(t, 3, len(grouped["false"]))
-
-}
-
-func TestReplace{4}(t *testing.T) {
-
-	v := &Value{data: []{1}{ {1}({2}), {1}({2}), {1}({2}), {1}({2}), {1}({2}), {1}({2}) }}
-
-	rawArr := v.Must{4}Slice()
-
-	replaced := v.Replace{4}(func(index int, val {1}) {1} {
-		if index < len(rawArr)-1 {
-			return rawArr[index+1]
-		}
-		return rawArr[0]
-	})
-
-	replacedArr := replaced.Must{4}Slice()
-	if assert.Equal(t, 6, len(replacedArr)) {
-		assert.Equal(t, replacedArr[0], rawArr[1])
-		assert.Equal(t, replacedArr[1], rawArr[2])
-		assert.Equal(t, replacedArr[2], rawArr[3])
-		assert.Equal(t, replacedArr[3], rawArr[4])
-		assert.Equal(t, replacedArr[4], rawArr[5])
-		assert.Equal(t, replacedArr[5], rawArr[0])
-	}
-
-}
-
-func TestCollect{4}(t *testing.T) {
-
-	v := &Value{data: []{1}{ {1}({2}), {1}({2}), {1}({2}), {1}({2}), {1}({2}), {1}({2}) }}
-
-	collected := v.Collect{4}(func(index int, val {1}) interface{} {
-		return index
-	})
-
-	collectedArr := collected.MustInterSlice()
-	if assert.Equal(t, 6, len(collectedArr)) {
-		assert.Equal(t, collectedArr[0], 0)
-		assert.Equal(t, collectedArr[1], 1)
-		assert.Equal(t, collectedArr[2], 2)
-		assert.Equal(t, collectedArr[3], 3)
-		assert.Equal(t, collectedArr[4], 4)
-		assert.Equal(t, collectedArr[5], 5)
-	}
-
-}
diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/codegen/types_list.txt b/Godeps/_workspace/src/github.com/stretchr/objx/codegen/types_list.txt
deleted file mode 100644
index 069d43d8e..000000000
--- a/Godeps/_workspace/src/github.com/stretchr/objx/codegen/types_list.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-Interface,interface{},"something",nil,Inter
-Map,map[string]interface{},map[string]interface{}{"name":"Tyler"},nil,MSI
-ObjxMap,(Map),New(1),New(nil),ObjxMap
-Bool,bool,true,false,Bool
-String,string,"hello","",Str
-Int,int,1,0,Int
-Int8,int8,1,0,Int8
-Int16,int16,1,0,Int16
-Int32,int32,1,0,Int32
-Int64,int64,1,0,Int64
-Uint,uint,1,0,Uint
-Uint8,uint8,1,0,Uint8
-Uint16,uint16,1,0,Uint16
-Uint32,uint32,1,0,Uint32
-Uint64,uint64,1,0,Uint64
-Uintptr,uintptr,1,0,Uintptr
-Float32,float32,1,0,Float32
-Float64,float64,1,0,Float64
-Complex64,complex64,1,0,Complex64
-Complex128,complex128,1,0,Complex128
diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/constants.go b/Godeps/_workspace/src/github.com/stretchr/objx/constants.go
deleted file mode 100644
index f9eb42a25..000000000
--- a/Godeps/_workspace/src/github.com/stretchr/objx/constants.go
+++ /dev/null
@@ -1,13 +0,0 @@
-package objx
-
-const (
-	// PathSeparator is the character used to separate the elements
-	// of the keypath.
-	//
-	// For example, `location.address.city`
-	PathSeparator string = "."
-
-	// SignatureSeparator is the character that is used to
-	// separate the Base64 string from the security signature.
-	SignatureSeparator = "_"
-)
diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/conversions.go b/Godeps/_workspace/src/github.com/stretchr/objx/conversions.go
deleted file mode 100644
index 9cdfa9f9f..000000000
--- a/Godeps/_workspace/src/github.com/stretchr/objx/conversions.go
+++ /dev/null
@@ -1,117 +0,0 @@
-package objx
-
-import (
-	"bytes"
-	"encoding/base64"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"net/url"
-)
-
-// JSON converts the contained object to a JSON string
-// representation
-func (m Map) JSON() (string, error) {
-
-	result, err := json.Marshal(m)
-
-	if err != nil {
-		err = errors.New("objx: JSON encode failed with: " + err.Error())
-	}
-
-	return string(result), err
-
-}
-
-// MustJSON converts the contained object to a JSON string
-// representation and panics if there is an error
-func (m Map) MustJSON() string {
-	result, err := m.JSON()
-	if err != nil {
-		panic(err.Error())
-	}
-	return result
-}
-
-// Base64 converts the contained object to a Base64 string
-// representation of the JSON string representation
-func (m Map) Base64() (string, error) {
-
-	var buf bytes.Buffer
-
-	jsonData, err := m.JSON()
-	if err != nil {
-		return "", err
-	}
-
-	encoder := base64.NewEncoder(base64.StdEncoding, &buf)
-	encoder.Write([]byte(jsonData))
-	encoder.Close()
-
-	return buf.String(), nil
-
-}
-
-// MustBase64 converts the contained object to a Base64 string
-// representation of the JSON string representation and panics
-// if there is an error
-func (m Map) MustBase64() string {
-	result, err := m.Base64()
-	if err != nil {
-		panic(err.Error())
-	}
-	return result
-}
-
-// SignedBase64 converts the contained object to a Base64 string
-// representation of the JSON string representation and signs it
-// using the provided key.
-func (m Map) SignedBase64(key string) (string, error) {
-
-	base64, err := m.Base64()
-	if err != nil {
-		return "", err
-	}
-
-	sig := HashWithKey(base64, key)
-
-	return base64 + SignatureSeparator + sig, nil
-
-}
-
-// MustSignedBase64 converts the contained object to a Base64 string
-// representation of the JSON string representation and signs it
-// using the provided key and panics if there is an error
-func (m Map) MustSignedBase64(key string) string {
-	result, err := m.SignedBase64(key)
-	if err != nil {
-		panic(err.Error())
-	}
-	return result
-}
-
-/*
-	URL Query
-	------------------------------------------------
-*/
-
-// URLValues creates a url.Values object from an Obj. This
-// function requires that the wrapped object be a map[string]interface{}
-func (m Map) URLValues() url.Values {
-
-	vals := make(url.Values)
-
-	for k, v := range m {
-		//TODO: can this be done without sprintf?
-		vals.Set(k, fmt.Sprintf("%v", v))
-	}
-
-	return vals
-}
-
-// URLQuery gets an encoded URL query representing the given
-// Obj. This function requires that the wrapped object be a
-// map[string]interface{}
-func (m Map) URLQuery() (string, error) {
-	return m.URLValues().Encode(), nil
-}
diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/conversions_test.go b/Godeps/_workspace/src/github.com/stretchr/objx/conversions_test.go
deleted file mode 100644
index e9ccd2987..000000000
--- a/Godeps/_workspace/src/github.com/stretchr/objx/conversions_test.go
+++ /dev/null
@@ -1,94 +0,0 @@
-package objx
-
-import (
-	"github.com/stretchr/testify/assert"
-	"testing"
-)
-
-func TestConversionJSON(t *testing.T) {
-
-	jsonString := `{"name":"Mat"}`
-	o := MustFromJSON(jsonString)
-
-	result, err := o.JSON()
-
-	if assert.NoError(t, err) {
-		assert.Equal(t, jsonString, result)
-	}
-
-	assert.Equal(t, jsonString, o.MustJSON())
-
-}
-
-func TestConversionJSONWithError(t *testing.T) {
-
-	o := MSI()
-	o["test"] = func() {}
-
-	assert.Panics(t, func() {
-		o.MustJSON()
-	})
-
-	_, err := o.JSON()
-
-	assert.Error(t, err)
-
-}
-
-func TestConversionBase64(t *testing.T) {
-
-	o := New(map[string]interface{}{"name": "Mat"})
-
-	result, err := o.Base64()
-
-	if assert.NoError(t, err) {
-		assert.Equal(t, "eyJuYW1lIjoiTWF0In0=", result)
-	}
-
-	assert.Equal(t, "eyJuYW1lIjoiTWF0In0=", o.MustBase64())
-
-}
-
-func TestConversionBase64WithError(t *testing.T) {
-
-	o := MSI()
-	o["test"] = func() {}
-
-	assert.Panics(t, func() {
-		o.MustBase64()
-	})
-
-	_, err := o.Base64()
-
-	assert.Error(t, err)
-
-}
-
-func TestConversionSignedBase64(t *testing.T) {
-
-	o := New(map[string]interface{}{"name": "Mat"})
-
-	result, err := o.SignedBase64("key")
-
-	if assert.NoError(t, err) {
-		assert.Equal(t, "eyJuYW1lIjoiTWF0In0=_67ee82916f90b2c0d68c903266e8998c9ef0c3d6", result)
-	}
-
-	assert.Equal(t, "eyJuYW1lIjoiTWF0In0=_67ee82916f90b2c0d68c903266e8998c9ef0c3d6", o.MustSignedBase64("key"))
-
-}
-
-func TestConversionSignedBase64WithError(t *testing.T) {
-
-	o := MSI()
-	o["test"] = func() {}
-
-	assert.Panics(t, func() {
-		o.MustSignedBase64("key")
-	})
-
-	_, err := o.SignedBase64("key")
-
-	assert.Error(t, err)
-
-}
diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/doc.go b/Godeps/_workspace/src/github.com/stretchr/objx/doc.go
deleted file mode 100644
index 47bf85e46..000000000
--- a/Godeps/_workspace/src/github.com/stretchr/objx/doc.go
+++ /dev/null
@@ -1,72 +0,0 @@
-// objx - Go package for dealing with maps, slices, JSON and other data.
-//
-// Overview
-//
-// Objx provides the `objx.Map` type, which is a `map[string]interface{}` that exposes
-// a powerful `Get` method (among others) that allows you to easily and quickly get
-// access to data within the map, without having to worry too much about type assertions,
-// missing data, default values etc.
-//
-// Pattern
-//
-// Objx uses a preditable pattern to make access data from within `map[string]interface{}'s
-// easy.
-//
-// Call one of the `objx.` functions to create your `objx.Map` to get going:
-//
-//     m, err := objx.FromJSON(json)
-//
-// NOTE: Any methods or functions with the `Must` prefix will panic if something goes wrong,
-// the rest will be optimistic and try to figure things out without panicking.
-//
-// Use `Get` to access the value you're interested in.  You can use dot and array
-// notation too:
-//
-//     m.Get("places[0].latlng")
-//
-// Once you have saught the `Value` you're interested in, you can use the `Is*` methods
-// to determine its type.
-//
-//     if m.Get("code").IsStr() { /* ... */ }
-//
-// Or you can just assume the type, and use one of the strong type methods to
-// extract the real value:
-//
-//     m.Get("code").Int()
-//
-// If there's no value there (or if it's the wrong type) then a default value
-// will be returned, or you can be explicit about the default value.
-//
-//     Get("code").Int(-1)
-//
-// If you're dealing with a slice of data as a value, Objx provides many useful
-// methods for iterating, manipulating and selecting that data.  You can find out more
-// by exploring the index below.
-//
-// Reading data
-//
-// A simple example of how to use Objx:
-//
-//     // use MustFromJSON to make an objx.Map from some JSON
-//     m := objx.MustFromJSON(`{"name": "Mat", "age": 30}`)
-//
-//     // get the details
-//     name := m.Get("name").Str()
-//     age := m.Get("age").Int()
-//
-//     // get their nickname (or use their name if they
-//     // don't have one)
-//     nickname := m.Get("nickname").Str(name)
-//
-// Ranging
-//
-// Since `objx.Map` is a `map[string]interface{}` you can treat it as such.  For
-// example, to `range` the data, do what you would expect:
-//
-//     m := objx.MustFromJSON(json)
-//     for key, value := range m {
-//
-//       /* ... do your magic ... */
-//
-//     }
-package objx
diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/fixture_test.go b/Godeps/_workspace/src/github.com/stretchr/objx/fixture_test.go
deleted file mode 100644
index 27f7d9049..000000000
--- a/Godeps/_workspace/src/github.com/stretchr/objx/fixture_test.go
+++ /dev/null
@@ -1,98 +0,0 @@
-package objx
-
-import (
-	"github.com/stretchr/testify/assert"
-	"testing"
-)
-
-var fixtures = []struct {
-	// name is the name of the fixture (used for reporting
-	// failures)
-	name string
-	// data is the JSON data to be worked on
-	data string
-	// get is the argument(s) to pass to Get
-	get interface{}
-	// output is the expected output
-	output interface{}
-}{
-	{
-		name:   "Simple get",
-		data:   `{"name": "Mat"}`,
-		get:    "name",
-		output: "Mat",
-	},
-	{
-		name:   "Get with dot notation",
-		data:   `{"address": {"city": "Boulder"}}`,
-		get:    "address.city",
-		output: "Boulder",
-	},
-	{
-		name:   "Deep get with dot notation",
-		data:   `{"one": {"two": {"three": {"four": "hello"}}}}`,
-		get:    "one.two.three.four",
-		output: "hello",
-	},
-	{
-		name:   "Get missing with dot notation",
-		data:   `{"one": {"two": {"three": {"four": "hello"}}}}`,
-		get:    "one.ten",
-		output: nil,
-	},
-	{
-		name:   "Get with array notation",
-		data:   `{"tags": ["one", "two", "three"]}`,
-		get:    "tags[1]",
-		output: "two",
-	},
-	{
-		name:   "Get with array and dot notation",
-		data:   `{"types": { "tags": ["one", "two", "three"]}}`,
-		get:    "types.tags[1]",
-		output: "two",
-	},
-	{
-		name:   "Get with array and dot notation - field after array",
-		data:   `{"tags": [{"name":"one"}, {"name":"two"}, {"name":"three"}]}`,
-		get:    "tags[1].name",
-		output: "two",
-	},
-	{
-		name:   "Complex get with array and dot notation",
-		data:   `{"tags": [{"list": [{"one":"pizza"}]}]}`,
-		get:    "tags[0].list[0].one",
-		output: "pizza",
-	},
-	{
-		name:   "Get field from within string should be nil",
-		data:   `{"name":"Tyler"}`,
-		get:    "name.something",
-		output: nil,
-	},
-	{
-		name:   "Get field from within string (using array accessor) should be nil",
-		data:   `{"numbers":["one", "two", "three"]}`,
-		get:    "numbers[0].nope",
-		output: nil,
-	},
-}
-
-func TestFixtures(t *testing.T) {
-
-	for _, fixture := range fixtures {
-
-		m := MustFromJSON(fixture.data)
-
-		// get the value
-		t.Logf("Running get fixture: \"%s\" (%v)", fixture.name, fixture)
-		value := m.Get(fixture.get.(string))
-
-		// make sure it matches
-		assert.Equal(t, fixture.output, value.data,
-			"Get fixture \"%s\" failed: %v", fixture.name, fixture,
-		)
-
-	}
-
-}
diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/map.go b/Godeps/_workspace/src/github.com/stretchr/objx/map.go
deleted file mode 100644
index eb6ed8e28..000000000
--- a/Godeps/_workspace/src/github.com/stretchr/objx/map.go
+++ /dev/null
@@ -1,222 +0,0 @@
-package objx
-
-import (
-	"encoding/base64"
-	"encoding/json"
-	"errors"
-	"io/ioutil"
-	"net/url"
-	"strings"
-)
-
-// MSIConvertable is an interface that defines methods for converting your
-// custom types to a map[string]interface{} representation.
-type MSIConvertable interface {
-	// MSI gets a map[string]interface{} (msi) representing the
-	// object.
-	MSI() map[string]interface{}
-}
-
-// Map provides extended functionality for working with
-// untyped data, in particular map[string]interface (msi).
-type Map map[string]interface{}
-
-// Value returns the internal value instance
-func (m Map) Value() *Value {
-	return &Value{data: m}
-}
-
-// Nil represents a nil Map.
-var Nil Map = New(nil)
-
-// New creates a new Map containing the map[string]interface{} in the data argument.
-// If the data argument is not a map[string]interface, New attempts to call the
-// MSI() method on the MSIConvertable interface to create one.
-func New(data interface{}) Map {
-	if _, ok := data.(map[string]interface{}); !ok {
-		if converter, ok := data.(MSIConvertable); ok {
-			data = converter.MSI()
-		} else {
-			return nil
-		}
-	}
-	return Map(data.(map[string]interface{}))
-}
-
-// MSI creates a map[string]interface{} and puts it inside a new Map.
-//
-// The arguments follow a key, value pattern.
-//
-// Panics
-//
-// Panics if any key arugment is non-string or if there are an odd number of arguments.
-//
-// Example
-//
-// To easily create Maps:
-//
-//     m := objx.MSI("name", "Mat", "age", 29, "subobj", objx.MSI("active", true))
-//
-//     // creates an Map equivalent to
-//     m := objx.New(map[string]interface{}{"name": "Mat", "age": 29, "subobj": map[string]interface{}{"active": true}})
-func MSI(keyAndValuePairs ...interface{}) Map {
-
-	newMap := make(map[string]interface{})
-	keyAndValuePairsLen := len(keyAndValuePairs)
-
-	if keyAndValuePairsLen%2 != 0 {
-		panic("objx: MSI must have an even number of arguments following the 'key, value' pattern.")
-	}
-
-	for i := 0; i < keyAndValuePairsLen; i = i + 2 {
-
-		key := keyAndValuePairs[i]
-		value := keyAndValuePairs[i+1]
-
-		// make sure the key is a string
-		keyString, keyStringOK := key.(string)
-		if !keyStringOK {
-			panic("objx: MSI must follow 'string, interface{}' pattern.  " + keyString + " is not a valid key.")
-		}
-
-		newMap[keyString] = value
-
-	}
-
-	return New(newMap)
-}
-
-// ****** Conversion Constructors
-
-// MustFromJSON creates a new Map containing the data specified in the
-// jsonString.
-//
-// Panics if the JSON is invalid.
-func MustFromJSON(jsonString string) Map {
-	o, err := FromJSON(jsonString)
-
-	if err != nil {
-		panic("objx: MustFromJSON failed with error: " + err.Error())
-	}
-
-	return o
-}
-
-// FromJSON creates a new Map containing the data specified in the
-// jsonString.
-//
-// Returns an error if the JSON is invalid.
-func FromJSON(jsonString string) (Map, error) {
-
-	var data interface{}
-	err := json.Unmarshal([]byte(jsonString), &data)
-
-	if err != nil {
-		return Nil, err
-	}
-
-	return New(data), nil
-
-}
-
-// FromBase64 creates a new Obj containing the data specified
-// in the Base64 string.
-//
-// The string is an encoded JSON string returned by Base64
-func FromBase64(base64String string) (Map, error) {
-
-	decoder := base64.NewDecoder(base64.StdEncoding, strings.NewReader(base64String))
-
-	decoded, err := ioutil.ReadAll(decoder)
-	if err != nil {
-		return nil, err
-	}
-
-	return FromJSON(string(decoded))
-}
-
-// MustFromBase64 creates a new Obj containing the data specified
-// in the Base64 string and panics if there is an error.
-//
-// The string is an encoded JSON string returned by Base64
-func MustFromBase64(base64String string) Map {
-
-	result, err := FromBase64(base64String)
-
-	if err != nil {
-		panic("objx: MustFromBase64 failed with error: " + err.Error())
-	}
-
-	return result
-}
-
-// FromSignedBase64 creates a new Obj containing the data specified
-// in the Base64 string.
-//
-// The string is an encoded JSON string returned by SignedBase64
-func FromSignedBase64(base64String, key string) (Map, error) {
-	parts := strings.Split(base64String, SignatureSeparator)
-	if len(parts) != 2 {
-		return nil, errors.New("objx: Signed base64 string is malformed.")
-	}
-
-	sig := HashWithKey(parts[0], key)
-	if parts[1] != sig {
-		return nil, errors.New("objx: Signature for base64 data does not match.")
-	}
-
-	return FromBase64(parts[0])
-}
-
-// MustFromSignedBase64 creates a new Obj containing the data specified
-// in the Base64 string and panics if there is an error.
-//
-// The string is an encoded JSON string returned by Base64
-func MustFromSignedBase64(base64String, key string) Map {
-
-	result, err := FromSignedBase64(base64String, key)
-
-	if err != nil {
-		panic("objx: MustFromSignedBase64 failed with error: " + err.Error())
-	}
-
-	return result
-}
-
-// FromURLQuery generates a new Obj by parsing the specified
-// query.
-//
-// For queries with multiple values, the first value is selected.
-func FromURLQuery(query string) (Map, error) {
-
-	vals, err := url.ParseQuery(query)
-
-	if err != nil {
-		return nil, err
-	}
-
-	m := make(map[string]interface{})
-	for k, vals := range vals {
-		m[k] = vals[0]
-	}
-
-	return New(m), nil
-}
-
-// MustFromURLQuery generates a new Obj by parsing the specified
-// query.
-//
-// For queries with multiple values, the first value is selected.
-//
-// Panics if it encounters an error
-func MustFromURLQuery(query string) Map {
-
-	o, err := FromURLQuery(query)
-
-	if err != nil {
-		panic("objx: MustFromURLQuery failed with error: " + err.Error())
-	}
-
-	return o
-
-}
diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/map_for_test.go b/Godeps/_workspace/src/github.com/stretchr/objx/map_for_test.go
deleted file mode 100644
index 6beb50675..000000000
--- a/Godeps/_workspace/src/github.com/stretchr/objx/map_for_test.go
+++ /dev/null
@@ -1,10 +0,0 @@
-package objx
-
-var TestMap map[string]interface{} = map[string]interface{}{
-	"name": "Tyler",
-	"address": map[string]interface{}{
-		"city":  "Salt Lake City",
-		"state": "UT",
-	},
-	"numbers": []interface{}{"one", "two", "three", "four", "five"},
-}
diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/map_test.go b/Godeps/_workspace/src/github.com/stretchr/objx/map_test.go
deleted file mode 100644
index 1f8b45c61..000000000
--- a/Godeps/_workspace/src/github.com/stretchr/objx/map_test.go
+++ /dev/null
@@ -1,147 +0,0 @@
-package objx
-
-import (
-	"github.com/stretchr/testify/assert"
-	"testing"
-)
-
-type Convertable struct {
-	name string
-}
-
-func (c *Convertable) MSI() map[string]interface{} {
-	return map[string]interface{}{"name": c.name}
-}
-
-type Unconvertable struct {
-	name string
-}
-
-func TestMapCreation(t *testing.T) {
-
-	o := New(nil)
-	assert.Nil(t, o)
-
-	o = New("Tyler")
-	assert.Nil(t, o)
-
-	unconvertable := &Unconvertable{name: "Tyler"}
-	o = New(unconvertable)
-	assert.Nil(t, o)
-
-	convertable := &Convertable{name: "Tyler"}
-	o = New(convertable)
-	if assert.NotNil(t, convertable) {
-		assert.Equal(t, "Tyler", o["name"], "Tyler")
-	}
-
-	o = MSI()
-	if assert.NotNil(t, o) {
-		assert.NotNil(t, o)
-	}
-
-	o = MSI("name", "Tyler")
-	if assert.NotNil(t, o) {
-		if assert.NotNil(t, o) {
-			assert.Equal(t, o["name"], "Tyler")
-		}
-	}
-
-}
-
-func TestMapMustFromJSONWithError(t *testing.T) {
-
-	_, err := FromJSON(`"name":"Mat"}`)
-	assert.Error(t, err)
-
-}
-
-func TestMapFromJSON(t *testing.T) {
-
-	o := MustFromJSON(`{"name":"Mat"}`)
-
-	if assert.NotNil(t, o) {
-		if assert.NotNil(t, o) {
-			assert.Equal(t, "Mat", o["name"])
-		}
-	}
-
-}
-
-func TestMapFromJSONWithError(t *testing.T) {
-
-	var m Map
-
-	assert.Panics(t, func() {
-		m = MustFromJSON(`"name":"Mat"}`)
-	})
-
-	assert.Nil(t, m)
-
-}
-
-func TestMapFromBase64String(t *testing.T) {
-
-	base64String := "eyJuYW1lIjoiTWF0In0="
-
-	o, err := FromBase64(base64String)
-
-	if assert.NoError(t, err) {
-		assert.Equal(t, o.Get("name").Str(), "Mat")
-	}
-
-	assert.Equal(t, MustFromBase64(base64String).Get("name").Str(), "Mat")
-
-}
-
-func TestMapFromBase64StringWithError(t *testing.T) {
-
-	base64String := "eyJuYW1lIjoiTWFasd0In0="
-
-	_, err := FromBase64(base64String)
-
-	assert.Error(t, err)
-
-	assert.Panics(t, func() {
-		MustFromBase64(base64String)
-	})
-
-}
-
-func TestMapFromSignedBase64String(t *testing.T) {
-
-	base64String := "eyJuYW1lIjoiTWF0In0=_67ee82916f90b2c0d68c903266e8998c9ef0c3d6"
-
-	o, err := FromSignedBase64(base64String, "key")
-
-	if assert.NoError(t, err) {
-		assert.Equal(t, o.Get("name").Str(), "Mat")
-	}
-
-	assert.Equal(t, MustFromSignedBase64(base64String, "key").Get("name").Str(), "Mat")
-
-}
-
-func TestMapFromSignedBase64StringWithError(t *testing.T) {
-
-	base64String := "eyJuYW1lasdIjoiTWF0In0=_67ee82916f90b2c0d68c903266e8998c9ef0c3d6"
-
-	_, err := FromSignedBase64(base64String, "key")
-
-	assert.Error(t, err)
-
-	assert.Panics(t, func() {
-		MustFromSignedBase64(base64String, "key")
-	})
-
-}
-
-func TestMapFromURLQuery(t *testing.T) {
-
-	m, err := FromURLQuery("name=tyler&state=UT")
-	if assert.NoError(t, err) && assert.NotNil(t, m) {
-		assert.Equal(t, "tyler", m.Get("name").Str())
-		assert.Equal(t, "UT", m.Get("state").Str())
-	}
-
-}
diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/mutations.go b/Godeps/_workspace/src/github.com/stretchr/objx/mutations.go
deleted file mode 100644
index b35c86392..000000000
--- a/Godeps/_workspace/src/github.com/stretchr/objx/mutations.go
+++ /dev/null
@@ -1,81 +0,0 @@
-package objx
-
-// Exclude returns a new Map with the keys in the specified []string
-// excluded.
-func (d Map) Exclude(exclude []string) Map {
-
-	excluded := make(Map)
-	for k, v := range d {
-		var shouldInclude bool = true
-		for _, toExclude := range exclude {
-			if k == toExclude {
-				shouldInclude = false
-				break
-			}
-		}
-		if shouldInclude {
-			excluded[k] = v
-		}
-	}
-
-	return excluded
-}
-
-// Copy creates a shallow copy of the Obj.
-func (m Map) Copy() Map {
-	copied := make(map[string]interface{})
-	for k, v := range m {
-		copied[k] = v
-	}
-	return New(copied)
-}
-
-// Merge blends the specified map with a copy of this map and returns the result.
-//
-// Keys that appear in both will be selected from the specified map.
-// This method requires that the wrapped object be a map[string]interface{}
-func (m Map) Merge(merge Map) Map {
-	return m.Copy().MergeHere(merge)
-}
-
-// Merge blends the specified map with this map and returns the current map.
-//
-// Keys that appear in both will be selected from the specified map.  The original map
-// will be modified. This method requires that
-// the wrapped object be a map[string]interface{}
-func (m Map) MergeHere(merge Map) Map {
-
-	for k, v := range merge {
-		m[k] = v
-	}
-
-	return m
-
-}
-
-// Transform builds a new Obj giving the transformer a chance
-// to change the keys and values as it goes. This method requires that
-// the wrapped object be a map[string]interface{}
-func (m Map) Transform(transformer func(key string, value interface{}) (string, interface{})) Map {
-	newMap := make(map[string]interface{})
-	for k, v := range m {
-		modifiedKey, modifiedVal := transformer(k, v)
-		newMap[modifiedKey] = modifiedVal
-	}
-	return New(newMap)
-}
-
-// TransformKeys builds a new map using the specified key mapping.
-//
-// Unspecified keys will be unaltered.
-// This method requires that the wrapped object be a map[string]interface{}
-func (m Map) TransformKeys(mapping map[string]string) Map {
-	return m.Transform(func(key string, value interface{}) (string, interface{}) {
-
-		if newKey, ok := mapping[key]; ok {
-			return newKey, value
-		}
-
-		return key, value
-	})
-}
diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/mutations_test.go b/Godeps/_workspace/src/github.com/stretchr/objx/mutations_test.go
deleted file mode 100644
index e20ee23bc..000000000
--- a/Godeps/_workspace/src/github.com/stretchr/objx/mutations_test.go
+++ /dev/null
@@ -1,77 +0,0 @@
-package objx
-
-import (
-	"github.com/stretchr/testify/assert"
-	"testing"
-)
-
-func TestExclude(t *testing.T) {
-
-	d := make(Map)
-	d["name"] = "Mat"
-	d["age"] = 29
-	d["secret"] = "ABC"
-
-	excluded := d.Exclude([]string{"secret"})
-
-	assert.Equal(t, d["name"], excluded["name"])
-	assert.Equal(t, d["age"], excluded["age"])
-	assert.False(t, excluded.Has("secret"), "secret should be excluded")
-
-}
-
-func TestCopy(t *testing.T) {
-
-	d1 := make(map[string]interface{})
-	d1["name"] = "Tyler"
-	d1["location"] = "UT"
-
-	d1Obj := New(d1)
-	d2Obj := d1Obj.Copy()
-
-	d2Obj["name"] = "Mat"
-
-	assert.Equal(t, d1Obj.Get("name").Str(), "Tyler")
-	assert.Equal(t, d2Obj.Get("name").Str(), "Mat")
-
-}
-
-func TestMerge(t *testing.T) {
-
-	d := make(map[string]interface{})
-	d["name"] = "Mat"
-
-	d1 := make(map[string]interface{})
-	d1["name"] = "Tyler"
-	d1["location"] = "UT"
-
-	dObj := New(d)
-	d1Obj := New(d1)
-
-	merged := dObj.Merge(d1Obj)
-
-	assert.Equal(t, merged.Get("name").Str(), d1Obj.Get("name").Str())
-	assert.Equal(t, merged.Get("location").Str(), d1Obj.Get("location").Str())
-	assert.Empty(t, dObj.Get("location").Str())
-
-}
-
-func TestMergeHere(t *testing.T) {
-
-	d := make(map[string]interface{})
-	d["name"] = "Mat"
-
-	d1 := make(map[string]interface{})
-	d1["name"] = "Tyler"
-	d1["location"] = "UT"
-
-	dObj := New(d)
-	d1Obj := New(d1)
-
-	merged := dObj.MergeHere(d1Obj)
-
-	assert.Equal(t, dObj, merged, "With MergeHere, it should return the first modified map")
-	assert.Equal(t, merged.Get("name").Str(), d1Obj.Get("name").Str())
-	assert.Equal(t, merged.Get("location").Str(), d1Obj.Get("location").Str())
-	assert.Equal(t, merged.Get("location").Str(), dObj.Get("location").Str())
-}
diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/security.go b/Godeps/_workspace/src/github.com/stretchr/objx/security.go
deleted file mode 100644
index fdd6be9cf..000000000
--- a/Godeps/_workspace/src/github.com/stretchr/objx/security.go
+++ /dev/null
@@ -1,14 +0,0 @@
-package objx
-
-import (
-	"crypto/sha1"
-	"encoding/hex"
-)
-
-// HashWithKey hashes the specified string using the security
-// key.
-func HashWithKey(data, key string) string {
-	hash := sha1.New()
-	hash.Write([]byte(data + ":" + key))
-	return hex.EncodeToString(hash.Sum(nil))
-}
diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/security_test.go b/Godeps/_workspace/src/github.com/stretchr/objx/security_test.go
deleted file mode 100644
index 8f0898f62..000000000
--- a/Godeps/_workspace/src/github.com/stretchr/objx/security_test.go
+++ /dev/null
@@ -1,12 +0,0 @@
-package objx
-
-import (
-	"github.com/stretchr/testify/assert"
-	"testing"
-)
-
-func TestHashWithKey(t *testing.T) {
-
-	assert.Equal(t, "0ce84d8d01f2c7b6e0882b784429c54d280ea2d9", HashWithKey("abc", "def"))
-
-}
diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/simple_example_test.go b/Godeps/_workspace/src/github.com/stretchr/objx/simple_example_test.go
deleted file mode 100644
index 5408c7fd3..000000000
--- a/Godeps/_workspace/src/github.com/stretchr/objx/simple_example_test.go
+++ /dev/null
@@ -1,41 +0,0 @@
-package objx
-
-import (
-	"github.com/stretchr/testify/assert"
-	"testing"
-)
-
-func TestSimpleExample(t *testing.T) {
-
-	// build a map from a JSON object
-	o := MustFromJSON(`{"name":"Mat","foods":["indian","chinese"], "location":{"county":"hobbiton","city":"the shire"}}`)
-
-	// Map can be used as a straight map[string]interface{}
-	assert.Equal(t, o["name"], "Mat")
-
-	// Get an Value object
-	v := o.Get("name")
-	assert.Equal(t, v, &Value{data: "Mat"})
-
-	// Test the contained value
-	assert.False(t, v.IsInt())
-	assert.False(t, v.IsBool())
-	assert.True(t, v.IsStr())
-
-	// Get the contained value
-	assert.Equal(t, v.Str(), "Mat")
-
-	// Get a default value if the contained value is not of the expected type or does not exist
-	assert.Equal(t, 1, v.Int(1))
-
-	// Get a value by using array notation
-	assert.Equal(t, "indian", o.Get("foods[0]").Data())
-
-	// Set a value by using array notation
-	o.Set("foods[0]", "italian")
-	assert.Equal(t, "italian", o.Get("foods[0]").Str())
-
-	// Get a value by using dot notation
-	assert.Equal(t, "hobbiton", o.Get("location.county").Str())
-
-}
diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/tests.go b/Godeps/_workspace/src/github.com/stretchr/objx/tests.go
deleted file mode 100644
index d9e0b479a..000000000
--- a/Godeps/_workspace/src/github.com/stretchr/objx/tests.go
+++ /dev/null
@@ -1,17 +0,0 @@
-package objx
-
-// Has gets whether there is something at the specified selector
-// or not.
-//
-// If m is nil, Has will always return false.
-func (m Map) Has(selector string) bool {
-	if m == nil {
-		return false
-	}
-	return !m.Get(selector).IsNil()
-}
-
-// IsNil gets whether the data is nil or not.
-func (v *Value) IsNil() bool {
-	return v == nil || v.data == nil
-}
diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/tests_test.go b/Godeps/_workspace/src/github.com/stretchr/objx/tests_test.go
deleted file mode 100644
index bcc1eb03d..000000000
--- a/Godeps/_workspace/src/github.com/stretchr/objx/tests_test.go
+++ /dev/null
@@ -1,24 +0,0 @@
-package objx
-
-import (
-	"github.com/stretchr/testify/assert"
-	"testing"
-)
-
-func TestHas(t *testing.T) {
-
-	m := New(TestMap)
-
-	assert.True(t, m.Has("name"))
-	assert.True(t, m.Has("address.state"))
-	assert.True(t, m.Has("numbers[4]"))
-
-	assert.False(t, m.Has("address.state.nope"))
-	assert.False(t, m.Has("address.nope"))
-	assert.False(t, m.Has("nope"))
-	assert.False(t, m.Has("numbers[5]"))
-
-	m = nil
-	assert.False(t, m.Has("nothing"))
-
-}
diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/type_specific_codegen.go b/Godeps/_workspace/src/github.com/stretchr/objx/type_specific_codegen.go
deleted file mode 100644
index f3ecb29b9..000000000
--- a/Godeps/_workspace/src/github.com/stretchr/objx/type_specific_codegen.go
+++ /dev/null
@@ -1,2881 +0,0 @@
-package objx
-
-/*
-	Inter (interface{} and []interface{})
-	--------------------------------------------------
-*/
-
-// Inter gets the value as a interface{}, returns the optionalDefault
-// value or a system default object if the value is the wrong type.
-func (v *Value) Inter(optionalDefault ...interface{}) interface{} {
-	if s, ok := v.data.(interface{}); ok {
-		return s
-	}
-	if len(optionalDefault) == 1 {
-		return optionalDefault[0]
-	}
-	return nil
-}
-
-// MustInter gets the value as a interface{}.
-//
-// Panics if the object is not a interface{}.
-func (v *Value) MustInter() interface{} {
-	return v.data.(interface{})
-}
-
-// InterSlice gets the value as a []interface{}, returns the optionalDefault
-// value or nil if the value is not a []interface{}.
-func (v *Value) InterSlice(optionalDefault ...[]interface{}) []interface{} {
-	if s, ok := v.data.([]interface{}); ok {
-		return s
-	}
-	if len(optionalDefault) == 1 {
-		return optionalDefault[0]
-	}
-	return nil
-}
-
-// MustInterSlice gets the value as a []interface{}.
-//
-// Panics if the object is not a []interface{}.
-func (v *Value) MustInterSlice() []interface{} {
-	return v.data.([]interface{})
-}
-
-// IsInter gets whether the object contained is a interface{} or not.
-func (v *Value) IsInter() bool {
-	_, ok := v.data.(interface{})
-	return ok
-}
-
-// IsInterSlice gets whether the object contained is a []interface{} or not.
-func (v *Value) IsInterSlice() bool {
-	_, ok := v.data.([]interface{})
-	return ok
-}
-
-// EachInter calls the specified callback for each object
-// in the []interface{}.
-//
-// Panics if the object is the wrong type.
-func (v *Value) EachInter(callback func(int, interface{}) bool) *Value {
-
-	for index, val := range v.MustInterSlice() {
-		carryon := callback(index, val)
-		if carryon == false {
-			break
-		}
-	}
-
-	return v
-
-}
-
-// WhereInter uses the specified decider function to select items
-// from the []interface{}.  The object contained in the result will contain
-// only the selected items.
-func (v *Value) WhereInter(decider func(int, interface{}) bool) *Value {
-
-	var selected []interface{}
-
-	v.EachInter(func(index int, val interface{}) bool {
-		shouldSelect := decider(index, val)
-		if shouldSelect == false {
-			selected = append(selected, val)
-		}
-		return true
-	})
-
-	return &Value{data: selected}
-
-}
-
-// GroupInter uses the specified grouper function to group the items
-// keyed by the return of the grouper.  The object contained in the
-// result will contain a map[string][]interface{}.
-func (v *Value) GroupInter(grouper func(int, interface{}) string) *Value {
-
-	groups := make(map[string][]interface{})
-
-	v.EachInter(func(index int, val interface{}) bool {
-		group := grouper(index, val)
-		if _, ok := groups[group]; !ok {
-			groups[group] = make([]interface{}, 0)
-		}
-		groups[group] = append(groups[group], val)
-		return true
-	})
-
-	return &Value{data: groups}
-
-}
-
-// ReplaceInter uses the specified function to replace each interface{}s
-// by iterating each item.  The data in the returned result will be a
-// []interface{} containing the replaced items.
-func (v *Value) ReplaceInter(replacer func(int, interface{}) interface{}) *Value {
-
-	arr := v.MustInterSlice()
-	replaced := make([]interface{}, len(arr))
-
-	v.EachInter(func(index int, val interface{}) bool {
-		replaced[index] = replacer(index, val)
-		return true
-	})
-
-	return &Value{data: replaced}
-
-}
-
-// CollectInter uses the specified collector function to collect a value
-// for each of the interface{}s in the slice.  The data returned will be a
-// []interface{}.
-func (v *Value) CollectInter(collector func(int, interface{}) interface{}) *Value {
-
-	arr := v.MustInterSlice()
-	collected := make([]interface{}, len(arr))
-
-	v.EachInter(func(index int, val interface{}) bool {
-		collected[index] = collector(index, val)
-		return true
-	})
-
-	return &Value{data: collected}
-}
-
-/*
-	MSI (map[string]interface{} and []map[string]interface{})
-	--------------------------------------------------
-*/
-
-// MSI gets the value as a map[string]interface{}, returns the optionalDefault
-// value or a system default object if the value is the wrong type.
-func (v *Value) MSI(optionalDefault ...map[string]interface{}) map[string]interface{} {
-	if s, ok := v.data.(map[string]interface{}); ok {
-		return s
-	}
-	if len(optionalDefault) == 1 {
-		return optionalDefault[0]
-	}
-	return nil
-}
-
-// MustMSI gets the value as a map[string]interface{}.
-//
-// Panics if the object is not a map[string]interface{}.
-func (v *Value) MustMSI() map[string]interface{} {
-	return v.data.(map[string]interface{})
-}
-
-// MSISlice gets the value as a []map[string]interface{}, returns the optionalDefault
-// value or nil if the value is not a []map[string]interface{}.
-func (v *Value) MSISlice(optionalDefault ...[]map[string]interface{}) []map[string]interface{} {
-	if s, ok := v.data.([]map[string]interface{}); ok {
-		return s
-	}
-	if len(optionalDefault) == 1 {
-		return optionalDefault[0]
-	}
-	return nil
-}
-
-// MustMSISlice gets the value as a []map[string]interface{}.
-//
-// Panics if the object is not a []map[string]interface{}.
-func (v *Value) MustMSISlice() []map[string]interface{} {
-	return v.data.([]map[string]interface{})
-}
-
-// IsMSI gets whether the object contained is a map[string]interface{} or not.
-func (v *Value) IsMSI() bool {
-	_, ok := v.data.(map[string]interface{})
-	return ok
-}
-
-// IsMSISlice gets whether the object contained is a []map[string]interface{} or not.
-func (v *Value) IsMSISlice() bool {
-	_, ok := v.data.([]map[string]interface{})
-	return ok
-}
-
-// EachMSI calls the specified callback for each object
-// in the []map[string]interface{}.
-//
-// Panics if the object is the wrong type.
-func (v *Value) EachMSI(callback func(int, map[string]interface{}) bool) *Value {
-
-	for index, val := range v.MustMSISlice() {
-		carryon := callback(index, val)
-		if carryon == false {
-			break
-		}
-	}
-
-	return v
-
-}
-
-// WhereMSI uses the specified decider function to select items
-// from the []map[string]interface{}.  The object contained in the result will contain
-// only the selected items.
-func (v *Value) WhereMSI(decider func(int, map[string]interface{}) bool) *Value {
-
-	var selected []map[string]interface{}
-
-	v.EachMSI(func(index int, val map[string]interface{}) bool {
-		shouldSelect := decider(index, val)
-		if shouldSelect == false {
-			selected = append(selected, val)
-		}
-		return true
-	})
-
-	return &Value{data: selected}
-
-}
-
-// GroupMSI uses the specified grouper function to group the items
-// keyed by the return of the grouper.  The object contained in the
-// result will contain a map[string][]map[string]interface{}.
-func (v *Value) GroupMSI(grouper func(int, map[string]interface{}) string) *Value {
-
-	groups := make(map[string][]map[string]interface{})
-
-	v.EachMSI(func(index int, val map[string]interface{}) bool {
-		group := grouper(index, val)
-		if _, ok := groups[group]; !ok {
-			groups[group] = make([]map[string]interface{}, 0)
-		}
-		groups[group] = append(groups[group], val)
-		return true
-	})
-
-	return &Value{data: groups}
-
-}
-
-// ReplaceMSI uses the specified function to replace each map[string]interface{}s
-// by iterating each item.  The data in the returned result will be a
-// []map[string]interface{} containing the replaced items.
-func (v *Value) ReplaceMSI(replacer func(int, map[string]interface{}) map[string]interface{}) *Value {
-
-	arr := v.MustMSISlice()
-	replaced := make([]map[string]interface{}, len(arr))
-
-	v.EachMSI(func(index int, val map[string]interface{}) bool {
-		replaced[index] = replacer(index, val)
-		return true
-	})
-
-	return &Value{data: replaced}
-
-}
-
-// CollectMSI uses the specified collector function to collect a value
-// for each of the map[string]interface{}s in the slice.  The data returned will be a
-// []interface{}.
-func (v *Value) CollectMSI(collector func(int, map[string]interface{}) interface{}) *Value {
-
-	arr := v.MustMSISlice()
-	collected := make([]interface{}, len(arr))
-
-	v.EachMSI(func(index int, val map[string]interface{}) bool {
-		collected[index] = collector(index, val)
-		return true
-	})
-
-	return &Value{data: collected}
-}
-
-/*
-	ObjxMap ((Map) and [](Map))
-	--------------------------------------------------
-*/
-
-// ObjxMap gets the value as a (Map), returns the optionalDefault
-// value or a system default object if the value is the wrong type.
-func (v *Value) ObjxMap(optionalDefault ...(Map)) Map {
-	if s, ok := v.data.((Map)); ok {
-		return s
-	}
-	if len(optionalDefault) == 1 {
-		return optionalDefault[0]
-	}
-	return New(nil)
-}
-
-// MustObjxMap gets the value as a (Map).
-//
-// Panics if the object is not a (Map).
-func (v *Value) MustObjxMap() Map {
-	return v.data.((Map))
-}
-
-// ObjxMapSlice gets the value as a [](Map), returns the optionalDefault
-// value or nil if the value is not a [](Map).
-func (v *Value) ObjxMapSlice(optionalDefault ...[](Map)) [](Map) {
-	if s, ok := v.data.([](Map)); ok {
-		return s
-	}
-	if len(optionalDefault) == 1 {
-		return optionalDefault[0]
-	}
-	return nil
-}
-
-// MustObjxMapSlice gets the value as a [](Map).
-//
-// Panics if the object is not a [](Map).
-func (v *Value) MustObjxMapSlice() [](Map) {
-	return v.data.([](Map))
-}
-
-// IsObjxMap gets whether the object contained is a (Map) or not.
-func (v *Value) IsObjxMap() bool {
-	_, ok := v.data.((Map))
-	return ok
-}
-
-// IsObjxMapSlice gets whether the object contained is a [](Map) or not.
-func (v *Value) IsObjxMapSlice() bool {
-	_, ok := v.data.([](Map))
-	return ok
-}
-
-// EachObjxMap calls the specified callback for each object
-// in the [](Map).
-//
-// Panics if the object is the wrong type.
-func (v *Value) EachObjxMap(callback func(int, Map) bool) *Value {
-
-	for index, val := range v.MustObjxMapSlice() {
-		carryon := callback(index, val)
-		if carryon == false {
-			break
-		}
-	}
-
-	return v
-
-}
-
-// WhereObjxMap uses the specified decider function to select items
-// from the [](Map).  The object contained in the result will contain
-// only the selected items.
-func (v *Value) WhereObjxMap(decider func(int, Map) bool) *Value {
-
-	var selected [](Map)
-
-	v.EachObjxMap(func(index int, val Map) bool {
-		shouldSelect := decider(index, val)
-		if shouldSelect == false {
-			selected = append(selected, val)
-		}
-		return true
-	})
-
-	return &Value{data: selected}
-
-}
-
-// GroupObjxMap uses the specified grouper function to group the items
-// keyed by the return of the grouper.  The object contained in the
-// result will contain a map[string][](Map).
-func (v *Value) GroupObjxMap(grouper func(int, Map) string) *Value {
-
-	groups := make(map[string][](Map))
-
-	v.EachObjxMap(func(index int, val Map) bool {
-		group := grouper(index, val)
-		if _, ok := groups[group]; !ok {
-			groups[group] = make([](Map), 0)
-		}
-		groups[group] = append(groups[group], val)
-		return true
-	})
-
-	return &Value{data: groups}
-
-}
-
-// ReplaceObjxMap uses the specified function to replace each (Map)s
-// by iterating each item.  The data in the returned result will be a
-// [](Map) containing the replaced items.
-func (v *Value) ReplaceObjxMap(replacer func(int, Map) Map) *Value {
-
-	arr := v.MustObjxMapSlice()
-	replaced := make([](Map), len(arr))
-
-	v.EachObjxMap(func(index int, val Map) bool {
-		replaced[index] = replacer(index, val)
-		return true
-	})
-
-	return &Value{data: replaced}
-
-}
-
-// CollectObjxMap uses the specified collector function to collect a value
-// for each of the (Map)s in the slice.  The data returned will be a
-// []interface{}.
-func (v *Value) CollectObjxMap(collector func(int, Map) interface{}) *Value {
-
-	arr := v.MustObjxMapSlice()
-	collected := make([]interface{}, len(arr))
-
-	v.EachObjxMap(func(index int, val Map) bool {
-		collected[index] = collector(index, val)
-		return true
-	})
-
-	return &Value{data: collected}
-}
-
-/*
-	Bool (bool and []bool)
-	--------------------------------------------------
-*/
-
-// Bool gets the value as a bool, returns the optionalDefault
-// value or a system default object if the value is the wrong type.
-func (v *Value) Bool(optionalDefault ...bool) bool {
-	if s, ok := v.data.(bool); ok {
-		return s
-	}
-	if len(optionalDefault) == 1 {
-		return optionalDefault[0]
-	}
-	return false
-}
-
-// MustBool gets the value as a bool.
-//
-// Panics if the object is not a bool.
-func (v *Value) MustBool() bool {
-	return v.data.(bool)
-}
-
-// BoolSlice gets the value as a []bool, returns the optionalDefault
-// value or nil if the value is not a []bool.
-func (v *Value) BoolSlice(optionalDefault ...[]bool) []bool {
-	if s, ok := v.data.([]bool); ok {
-		return s
-	}
-	if len(optionalDefault) == 1 {
-		return optionalDefault[0]
-	}
-	return nil
-}
-
-// MustBoolSlice gets the value as a []bool.
-//
-// Panics if the object is not a []bool.
-func (v *Value) MustBoolSlice() []bool {
-	return v.data.([]bool)
-}
-
-// IsBool gets whether the object contained is a bool or not.
-func (v *Value) IsBool() bool {
-	_, ok := v.data.(bool)
-	return ok
-}
-
-// IsBoolSlice gets whether the object contained is a []bool or not.
-func (v *Value) IsBoolSlice() bool {
-	_, ok := v.data.([]bool)
-	return ok
-}
-
-// EachBool calls the specified callback for each object
-// in the []bool.
-//
-// Panics if the object is the wrong type.
-func (v *Value) EachBool(callback func(int, bool) bool) *Value {
-
-	for index, val := range v.MustBoolSlice() {
-		carryon := callback(index, val)
-		if carryon == false {
-			break
-		}
-	}
-
-	return v
-
-}
-
-// WhereBool uses the specified decider function to select items
-// from the []bool.  The object contained in the result will contain
-// only the selected items.
-func (v *Value) WhereBool(decider func(int, bool) bool) *Value {
-
-	var selected []bool
-
-	v.EachBool(func(index int, val bool) bool {
-		shouldSelect := decider(index, val)
-		if shouldSelect == false {
-			selected = append(selected, val)
-		}
-		return true
-	})
-
-	return &Value{data: selected}
-
-}
-
-// GroupBool uses the specified grouper function to group the items
-// keyed by the return of the grouper.  The object contained in the
-// result will contain a map[string][]bool.
-func (v *Value) GroupBool(grouper func(int, bool) string) *Value {
-
-	groups := make(map[string][]bool)
-
-	v.EachBool(func(index int, val bool) bool {
-		group := grouper(index, val)
-		if _, ok := groups[group]; !ok {
-			groups[group] = make([]bool, 0)
-		}
-		groups[group] = append(groups[group], val)
-		return true
-	})
-
-	return &Value{data: groups}
-
-}
-
-// ReplaceBool uses the specified function to replace each bools
-// by iterating each item.  The data in the returned result will be a
-// []bool containing the replaced items.
-func (v *Value) ReplaceBool(replacer func(int, bool) bool) *Value {
-
-	arr := v.MustBoolSlice()
-	replaced := make([]bool, len(arr))
-
-	v.EachBool(func(index int, val bool) bool {
-		replaced[index] = replacer(index, val)
-		return true
-	})
-
-	return &Value{data: replaced}
-
-}
-
-// CollectBool uses the specified collector function to collect a value
-// for each of the bools in the slice.  The data returned will be a
-// []interface{}.
-func (v *Value) CollectBool(collector func(int, bool) interface{}) *Value {
-
-	arr := v.MustBoolSlice()
-	collected := make([]interface{}, len(arr))
-
-	v.EachBool(func(index int, val bool) bool {
-		collected[index] = collector(index, val)
-		return true
-	})
-
-	return &Value{data: collected}
-}
-
-/*
-	Str (string and []string)
-	--------------------------------------------------
-*/
-
-// Str gets the value as a string, returns the optionalDefault
-// value or a system default object if the value is the wrong type.
-func (v *Value) Str(optionalDefault ...string) string {
-	if s, ok := v.data.(string); ok {
-		return s
-	}
-	if len(optionalDefault) == 1 {
-		return optionalDefault[0]
-	}
-	return ""
-}
-
-// MustStr gets the value as a string.
-//
-// Panics if the object is not a string.
-func (v *Value) MustStr() string {
-	return v.data.(string)
-}
-
-// StrSlice gets the value as a []string, returns the optionalDefault
-// value or nil if the value is not a []string.
-func (v *Value) StrSlice(optionalDefault ...[]string) []string {
-	if s, ok := v.data.([]string); ok {
-		return s
-	}
-	if len(optionalDefault) == 1 {
-		return optionalDefault[0]
-	}
-	return nil
-}
-
-// MustStrSlice gets the value as a []string.
-//
-// Panics if the object is not a []string.
-func (v *Value) MustStrSlice() []string {
-	return v.data.([]string)
-}
-
-// IsStr gets whether the object contained is a string or not.
-func (v *Value) IsStr() bool {
-	_, ok := v.data.(string)
-	return ok
-}
-
-// IsStrSlice gets whether the object contained is a []string or not.
-func (v *Value) IsStrSlice() bool {
-	_, ok := v.data.([]string)
-	return ok
-}
-
-// EachStr calls the specified callback for each object
-// in the []string.
-//
-// Panics if the object is the wrong type.
-func (v *Value) EachStr(callback func(int, string) bool) *Value {
-
-	for index, val := range v.MustStrSlice() {
-		carryon := callback(index, val)
-		if carryon == false {
-			break
-		}
-	}
-
-	return v
-
-}
-
-// WhereStr uses the specified decider function to select items
-// from the []string.  The object contained in the result will contain
-// only the selected items.
-func (v *Value) WhereStr(decider func(int, string) bool) *Value {
-
-	var selected []string
-
-	v.EachStr(func(index int, val string) bool {
-		shouldSelect := decider(index, val)
-		if shouldSelect == false {
-			selected = append(selected, val)
-		}
-		return true
-	})
-
-	return &Value{data: selected}
-
-}
-
-// GroupStr uses the specified grouper function to group the items
-// keyed by the return of the grouper.  The object contained in the
-// result will contain a map[string][]string.
-func (v *Value) GroupStr(grouper func(int, string) string) *Value {
-
-	groups := make(map[string][]string)
-
-	v.EachStr(func(index int, val string) bool {
-		group := grouper(index, val)
-		if _, ok := groups[group]; !ok {
-			groups[group] = make([]string, 0)
-		}
-		groups[group] = append(groups[group], val)
-		return true
-	})
-
-	return &Value{data: groups}
-
-}
-
-// ReplaceStr uses the specified function to replace each strings
-// by iterating each item.  The data in the returned result will be a
-// []string containing the replaced items.
-func (v *Value) ReplaceStr(replacer func(int, string) string) *Value {
-
-	arr := v.MustStrSlice()
-	replaced := make([]string, len(arr))
-
-	v.EachStr(func(index int, val string) bool {
-		replaced[index] = replacer(index, val)
-		return true
-	})
-
-	return &Value{data: replaced}
-
-}
-
-// CollectStr uses the specified collector function to collect a value
-// for each of the strings in the slice.  The data returned will be a
-// []interface{}.
-func (v *Value) CollectStr(collector func(int, string) interface{}) *Value {
-
-	arr := v.MustStrSlice()
-	collected := make([]interface{}, len(arr))
-
-	v.EachStr(func(index int, val string) bool {
-		collected[index] = collector(index, val)
-		return true
-	})
-
-	return &Value{data: collected}
-}
-
-/*
-	Int (int and []int)
-	--------------------------------------------------
-*/
-
-// Int gets the value as a int, returns the optionalDefault
-// value or a system default object if the value is the wrong type.
-func (v *Value) Int(optionalDefault ...int) int {
-	if s, ok := v.data.(int); ok {
-		return s
-	}
-	if len(optionalDefault) == 1 {
-		return optionalDefault[0]
-	}
-	return 0
-}
-
-// MustInt gets the value as a int.
-//
-// Panics if the object is not a int.
-func (v *Value) MustInt() int {
-	return v.data.(int)
-}
-
-// IntSlice gets the value as a []int, returns the optionalDefault
-// value or nil if the value is not a []int.
-func (v *Value) IntSlice(optionalDefault ...[]int) []int {
-	if s, ok := v.data.([]int); ok {
-		return s
-	}
-	if len(optionalDefault) == 1 {
-		return optionalDefault[0]
-	}
-	return nil
-}
-
-// MustIntSlice gets the value as a []int.
-//
-// Panics if the object is not a []int.
-func (v *Value) MustIntSlice() []int {
-	return v.data.([]int)
-}
-
-// IsInt gets whether the object contained is a int or not.
-func (v *Value) IsInt() bool {
-	_, ok := v.data.(int)
-	return ok
-}
-
-// IsIntSlice gets whether the object contained is a []int or not.
-func (v *Value) IsIntSlice() bool {
-	_, ok := v.data.([]int)
-	return ok
-}
-
-// EachInt calls the specified callback for each object
-// in the []int.
-//
-// Panics if the object is the wrong type.
-func (v *Value) EachInt(callback func(int, int) bool) *Value {
-
-	for index, val := range v.MustIntSlice() {
-		carryon := callback(index, val)
-		if carryon == false {
-			break
-		}
-	}
-
-	return v
-
-}
-
-// WhereInt uses the specified decider function to select items
-// from the []int.  The object contained in the result will contain
-// only the selected items.
-func (v *Value) WhereInt(decider func(int, int) bool) *Value {
-
-	var selected []int
-
-	v.EachInt(func(index int, val int) bool {
-		shouldSelect := decider(index, val)
-		if shouldSelect == false {
-			selected = append(selected, val)
-		}
-		return true
-	})
-
-	return &Value{data: selected}
-
-}
-
-// GroupInt uses the specified grouper function to group the items
-// keyed by the return of the grouper.  The object contained in the
-// result will contain a map[string][]int.
-func (v *Value) GroupInt(grouper func(int, int) string) *Value {
-
-	groups := make(map[string][]int)
-
-	v.EachInt(func(index int, val int) bool {
-		group := grouper(index, val)
-		if _, ok := groups[group]; !ok {
-			groups[group] = make([]int, 0)
-		}
-		groups[group] = append(groups[group], val)
-		return true
-	})
-
-	return &Value{data: groups}
-
-}
-
-// ReplaceInt uses the specified function to replace each ints
-// by iterating each item.  The data in the returned result will be a
-// []int containing the replaced items.
-func (v *Value) ReplaceInt(replacer func(int, int) int) *Value {
-
-	arr := v.MustIntSlice()
-	replaced := make([]int, len(arr))
-
-	v.EachInt(func(index int, val int) bool {
-		replaced[index] = replacer(index, val)
-		return true
-	})
-
-	return &Value{data: replaced}
-
-}
-
-// CollectInt uses the specified collector function to collect a value
-// for each of the ints in the slice.  The data returned will be a
-// []interface{}.
-func (v *Value) CollectInt(collector func(int, int) interface{}) *Value {
-
-	arr := v.MustIntSlice()
-	collected := make([]interface{}, len(arr))
-
-	v.EachInt(func(index int, val int) bool {
-		collected[index] = collector(index, val)
-		return true
-	})
-
-	return &Value{data: collected}
-}
-
-/*
-	Int8 (int8 and []int8)
-	--------------------------------------------------
-*/
-
-// Int8 gets the value as a int8, returns the optionalDefault
-// value or a system default object if the value is the wrong type.
-func (v *Value) Int8(optionalDefault ...int8) int8 {
-	if s, ok := v.data.(int8); ok {
-		return s
-	}
-	if len(optionalDefault) == 1 {
-		return optionalDefault[0]
-	}
-	return 0
-}
-
-// MustInt8 gets the value as a int8.
-//
-// Panics if the object is not a int8.
-func (v *Value) MustInt8() int8 {
-	return v.data.(int8)
-}
-
-// Int8Slice gets the value as a []int8, returns the optionalDefault
-// value or nil if the value is not a []int8.
-func (v *Value) Int8Slice(optionalDefault ...[]int8) []int8 {
-	if s, ok := v.data.([]int8); ok {
-		return s
-	}
-	if len(optionalDefault) == 1 {
-		return optionalDefault[0]
-	}
-	return nil
-}
-
-// MustInt8Slice gets the value as a []int8.
-//
-// Panics if the object is not a []int8.
-func (v *Value) MustInt8Slice() []int8 {
-	return v.data.([]int8)
-}
-
-// IsInt8 gets whether the object contained is a int8 or not.
-func (v *Value) IsInt8() bool {
-	_, ok := v.data.(int8)
-	return ok
-}
-
-// IsInt8Slice gets whether the object contained is a []int8 or not.
-func (v *Value) IsInt8Slice() bool {
-	_, ok := v.data.([]int8)
-	return ok
-}
-
-// EachInt8 calls the specified callback for each object
-// in the []int8.
-//
-// Panics if the object is the wrong type.
-func (v *Value) EachInt8(callback func(int, int8) bool) *Value {
-
-	for index, val := range v.MustInt8Slice() {
-		carryon := callback(index, val)
-		if carryon == false {
-			break
-		}
-	}
-
-	return v
-
-}
-
-// WhereInt8 uses the specified decider function to select items
-// from the []int8.  The object contained in the result will contain
-// only the selected items.
-func (v *Value) WhereInt8(decider func(int, int8) bool) *Value {
-
-	var selected []int8
-
-	v.EachInt8(func(index int, val int8) bool {
-		shouldSelect := decider(index, val)
-		if shouldSelect == false {
-			selected = append(selected, val)
-		}
-		return true
-	})
-
-	return &Value{data: selected}
-
-}
-
-// GroupInt8 uses the specified grouper function to group the items
-// keyed by the return of the grouper.  The object contained in the
-// result will contain a map[string][]int8.
-func (v *Value) GroupInt8(grouper func(int, int8) string) *Value {
-
-	groups := make(map[string][]int8)
-
-	v.EachInt8(func(index int, val int8) bool {
-		group := grouper(index, val)
-		if _, ok := groups[group]; !ok {
-			groups[group] = make([]int8, 0)
-		}
-		groups[group] = append(groups[group], val)
-		return true
-	})
-
-	return &Value{data: groups}
-
-}
-
-// ReplaceInt8 uses the specified function to replace each int8s
-// by iterating each item.  The data in the returned result will be a
-// []int8 containing the replaced items.
-func (v *Value) ReplaceInt8(replacer func(int, int8) int8) *Value {
-
-	arr := v.MustInt8Slice()
-	replaced := make([]int8, len(arr))
-
-	v.EachInt8(func(index int, val int8) bool {
-		replaced[index] = replacer(index, val)
-		return true
-	})
-
-	return &Value{data: replaced}
-
-}
-
-// CollectInt8 uses the specified collector function to collect a value
-// for each of the int8s in the slice.  The data returned will be a
-// []interface{}.
-func (v *Value) CollectInt8(collector func(int, int8) interface{}) *Value {
-
-	arr := v.MustInt8Slice()
-	collected := make([]interface{}, len(arr))
-
-	v.EachInt8(func(index int, val int8) bool {
-		collected[index] = collector(index, val)
-		return true
-	})
-
-	return &Value{data: collected}
-}
-
-/*
-	Int16 (int16 and []int16)
-	--------------------------------------------------
-*/
-
-// Int16 gets the value as a int16, returns the optionalDefault
-// value or a system default object if the value is the wrong type.
-func (v *Value) Int16(optionalDefault ...int16) int16 {
-	if s, ok := v.data.(int16); ok {
-		return s
-	}
-	if len(optionalDefault) == 1 {
-		return optionalDefault[0]
-	}
-	return 0
-}
-
-// MustInt16 gets the value as a int16.
-//
-// Panics if the object is not a int16.
-func (v *Value) MustInt16() int16 {
-	return v.data.(int16)
-}
-
-// Int16Slice gets the value as a []int16, returns the optionalDefault
-// value or nil if the value is not a []int16.
-func (v *Value) Int16Slice(optionalDefault ...[]int16) []int16 {
-	if s, ok := v.data.([]int16); ok {
-		return s
-	}
-	if len(optionalDefault) == 1 {
-		return optionalDefault[0]
-	}
-	return nil
-}
-
-// MustInt16Slice gets the value as a []int16.
-//
-// Panics if the object is not a []int16.
-func (v *Value) MustInt16Slice() []int16 {
-	return v.data.([]int16)
-}
-
-// IsInt16 gets whether the object contained is a int16 or not.
-func (v *Value) IsInt16() bool {
-	_, ok := v.data.(int16)
-	return ok
-}
-
-// IsInt16Slice gets whether the object contained is a []int16 or not.
-func (v *Value) IsInt16Slice() bool {
-	_, ok := v.data.([]int16)
-	return ok
-}
-
-// EachInt16 calls the specified callback for each object
-// in the []int16.
-//
-// Panics if the object is the wrong type.
-func (v *Value) EachInt16(callback func(int, int16) bool) *Value {
-
-	for index, val := range v.MustInt16Slice() {
-		carryon := callback(index, val)
-		if carryon == false {
-			break
-		}
-	}
-
-	return v
-
-}
-
-// WhereInt16 uses the specified decider function to select items
-// from the []int16.  The object contained in the result will contain
-// only the selected items.
-func (v *Value) WhereInt16(decider func(int, int16) bool) *Value {
-
-	var selected []int16
-
-	v.EachInt16(func(index int, val int16) bool {
-		shouldSelect := decider(index, val)
-		if shouldSelect == false {
-			selected = append(selected, val)
-		}
-		return true
-	})
-
-	return &Value{data: selected}
-
-}
-
-// GroupInt16 uses the specified grouper function to group the items
-// keyed by the return of the grouper.  The object contained in the
-// result will contain a map[string][]int16.
-func (v *Value) GroupInt16(grouper func(int, int16) string) *Value {
-
-	groups := make(map[string][]int16)
-
-	v.EachInt16(func(index int, val int16) bool {
-		group := grouper(index, val)
-		if _, ok := groups[group]; !ok {
-			groups[group] = make([]int16, 0)
-		}
-		groups[group] = append(groups[group], val)
-		return true
-	})
-
-	return &Value{data: groups}
-
-}
-
-// ReplaceInt16 uses the specified function to replace each int16s
-// by iterating each item.  The data in the returned result will be a
-// []int16 containing the replaced items.
-func (v *Value) ReplaceInt16(replacer func(int, int16) int16) *Value {
-
-	arr := v.MustInt16Slice()
-	replaced := make([]int16, len(arr))
-
-	v.EachInt16(func(index int, val int16) bool {
-		replaced[index] = replacer(index, val)
-		return true
-	})
-
-	return &Value{data: replaced}
-
-}
-
-// CollectInt16 uses the specified collector function to collect a value
-// for each of the int16s in the slice.  The data returned will be a
-// []interface{}.
-func (v *Value) CollectInt16(collector func(int, int16) interface{}) *Value {
-
-	arr := v.MustInt16Slice()
-	collected := make([]interface{}, len(arr))
-
-	v.EachInt16(func(index int, val int16) bool {
-		collected[index] = collector(index, val)
-		return true
-	})
-
-	return &Value{data: collected}
-}
-
-/*
-	Int32 (int32 and []int32)
-	--------------------------------------------------
-*/
-
-// Int32 gets the value as a int32, returns the optionalDefault
-// value or a system default object if the value is the wrong type.
-func (v *Value) Int32(optionalDefault ...int32) int32 {
-	if s, ok := v.data.(int32); ok {
-		return s
-	}
-	if len(optionalDefault) == 1 {
-		return optionalDefault[0]
-	}
-	return 0
-}
-
-// MustInt32 gets the value as a int32.
-//
-// Panics if the object is not a int32.
-func (v *Value) MustInt32() int32 {
-	return v.data.(int32)
-}
-
-// Int32Slice gets the value as a []int32, returns the optionalDefault
-// value or nil if the value is not a []int32.
-func (v *Value) Int32Slice(optionalDefault ...[]int32) []int32 {
-	if s, ok := v.data.([]int32); ok {
-		return s
-	}
-	if len(optionalDefault) == 1 {
-		return optionalDefault[0]
-	}
-	return nil
-}
-
-// MustInt32Slice gets the value as a []int32.
-//
-// Panics if the object is not a []int32.
-func (v *Value) MustInt32Slice() []int32 {
-	return v.data.([]int32)
-}
-
-// IsInt32 gets whether the object contained is a int32 or not.
-func (v *Value) IsInt32() bool {
-	_, ok := v.data.(int32)
-	return ok
-}
-
-// IsInt32Slice gets whether the object contained is a []int32 or not.
-func (v *Value) IsInt32Slice() bool {
-	_, ok := v.data.([]int32)
-	return ok
-}
-
-// EachInt32 calls the specified callback for each object
-// in the []int32.
-//
-// Panics if the object is the wrong type.
-func (v *Value) EachInt32(callback func(int, int32) bool) *Value {
-
-	for index, val := range v.MustInt32Slice() {
-		carryon := callback(index, val)
-		if carryon == false {
-			break
-		}
-	}
-
-	return v
-
-}
-
-// WhereInt32 uses the specified decider function to select items
-// from the []int32.  The object contained in the result will contain
-// only the selected items.
-func (v *Value) WhereInt32(decider func(int, int32) bool) *Value {
-
-	var selected []int32
-
-	v.EachInt32(func(index int, val int32) bool {
-		shouldSelect := decider(index, val)
-		if shouldSelect == false {
-			selected = append(selected, val)
-		}
-		return true
-	})
-
-	return &Value{data: selected}
-
-}
-
-// GroupInt32 uses the specified grouper function to group the items
-// keyed by the return of the grouper.  The object contained in the
-// result will contain a map[string][]int32.
-func (v *Value) GroupInt32(grouper func(int, int32) string) *Value {
-
-	groups := make(map[string][]int32)
-
-	v.EachInt32(func(index int, val int32) bool {
-		group := grouper(index, val)
-		if _, ok := groups[group]; !ok {
-			groups[group] = make([]int32, 0)
-		}
-		groups[group] = append(groups[group], val)
-		return true
-	})
-
-	return &Value{data: groups}
-
-}
-
-// ReplaceInt32 uses the specified function to replace each int32s
-// by iterating each item.  The data in the returned result will be a
-// []int32 containing the replaced items.
-func (v *Value) ReplaceInt32(replacer func(int, int32) int32) *Value {
-
-	arr := v.MustInt32Slice()
-	replaced := make([]int32, len(arr))
-
-	v.EachInt32(func(index int, val int32) bool {
-		replaced[index] = replacer(index, val)
-		return true
-	})
-
-	return &Value{data: replaced}
-
-}
-
-// CollectInt32 uses the specified collector function to collect a value
-// for each of the int32s in the slice.  The data returned will be a
-// []interface{}.
-func (v *Value) CollectInt32(collector func(int, int32) interface{}) *Value {
-
-	arr := v.MustInt32Slice()
-	collected := make([]interface{}, len(arr))
-
-	v.EachInt32(func(index int, val int32) bool {
-		collected[index] = collector(index, val)
-		return true
-	})
-
-	return &Value{data: collected}
-}
-
-/*
-	Int64 (int64 and []int64)
-	--------------------------------------------------
-*/
-
-// Int64 gets the value as a int64, returns the optionalDefault
-// value or a system default object if the value is the wrong type.
-func (v *Value) Int64(optionalDefault ...int64) int64 {
-	if s, ok := v.data.(int64); ok {
-		return s
-	}
-	if len(optionalDefault) == 1 {
-		return optionalDefault[0]
-	}
-	return 0
-}
-
-// MustInt64 gets the value as a int64.
-//
-// Panics if the object is not a int64.
-func (v *Value) MustInt64() int64 {
-	return v.data.(int64)
-}
-
-// Int64Slice gets the value as a []int64, returns the optionalDefault
-// value or nil if the value is not a []int64.
-func (v *Value) Int64Slice(optionalDefault ...[]int64) []int64 {
-	if s, ok := v.data.([]int64); ok {
-		return s
-	}
-	if len(optionalDefault) == 1 {
-		return optionalDefault[0]
-	}
-	return nil
-}
-
-// MustInt64Slice gets the value as a []int64.
-//
-// Panics if the object is not a []int64.
-func (v *Value) MustInt64Slice() []int64 {
-	return v.data.([]int64)
-}
-
-// IsInt64 gets whether the object contained is a int64 or not.
-func (v *Value) IsInt64() bool {
-	_, ok := v.data.(int64)
-	return ok
-}
-
-// IsInt64Slice gets whether the object contained is a []int64 or not.
-func (v *Value) IsInt64Slice() bool {
-	_, ok := v.data.([]int64)
-	return ok
-}
-
-// EachInt64 calls the specified callback for each object
-// in the []int64.
-//
-// Panics if the object is the wrong type.
-func (v *Value) EachInt64(callback func(int, int64) bool) *Value {
-
-	for index, val := range v.MustInt64Slice() {
-		carryon := callback(index, val)
-		if carryon == false {
-			break
-		}
-	}
-
-	return v
-
-}
-
-// WhereInt64 uses the specified decider function to select items
-// from the []int64.  The object contained in the result will contain
-// only the selected items.
-func (v *Value) WhereInt64(decider func(int, int64) bool) *Value {
-
-	var selected []int64
-
-	v.EachInt64(func(index int, val int64) bool {
-		shouldSelect := decider(index, val)
-		if shouldSelect == false {
-			selected = append(selected, val)
-		}
-		return true
-	})
-
-	return &Value{data: selected}
-
-}
-
-// GroupInt64 uses the specified grouper function to group the items
-// keyed by the return of the grouper.  The object contained in the
-// result will contain a map[string][]int64.
-func (v *Value) GroupInt64(grouper func(int, int64) string) *Value {
-
-	groups := make(map[string][]int64)
-
-	v.EachInt64(func(index int, val int64) bool {
-		group := grouper(index, val)
-		if _, ok := groups[group]; !ok {
-			groups[group] = make([]int64, 0)
-		}
-		groups[group] = append(groups[group], val)
-		return true
-	})
-
-	return &Value{data: groups}
-
-}
-
-// ReplaceInt64 uses the specified function to replace each int64s
-// by iterating each item.  The data in the returned result will be a
-// []int64 containing the replaced items.
-func (v *Value) ReplaceInt64(replacer func(int, int64) int64) *Value {
-
-	arr := v.MustInt64Slice()
-	replaced := make([]int64, len(arr))
-
-	v.EachInt64(func(index int, val int64) bool {
-		replaced[index] = replacer(index, val)
-		return true
-	})
-
-	return &Value{data: replaced}
-
-}
-
-// CollectInt64 uses the specified collector function to collect a value
-// for each of the int64s in the slice.  The data returned will be a
-// []interface{}.
-func (v *Value) CollectInt64(collector func(int, int64) interface{}) *Value {
-
-	arr := v.MustInt64Slice()
-	collected := make([]interface{}, len(arr))
-
-	v.EachInt64(func(index int, val int64) bool {
-		collected[index] = collector(index, val)
-		return true
-	})
-
-	return &Value{data: collected}
-}
-
-/*
-	Uint (uint and []uint)
-	--------------------------------------------------
-*/
-
-// Uint gets the value as a uint, returns the optionalDefault
-// value or a system default object if the value is the wrong type.
-func (v *Value) Uint(optionalDefault ...uint) uint {
-	if s, ok := v.data.(uint); ok {
-		return s
-	}
-	if len(optionalDefault) == 1 {
-		return optionalDefault[0]
-	}
-	return 0
-}
-
-// MustUint gets the value as a uint.
-//
-// Panics if the object is not a uint.
-func (v *Value) MustUint() uint {
-	return v.data.(uint)
-}
-
-// UintSlice gets the value as a []uint, returns the optionalDefault
-// value or nil if the value is not a []uint.
-func (v *Value) UintSlice(optionalDefault ...[]uint) []uint {
-	if s, ok := v.data.([]uint); ok {
-		return s
-	}
-	if len(optionalDefault) == 1 {
-		return optionalDefault[0]
-	}
-	return nil
-}
-
-// MustUintSlice gets the value as a []uint.
-//
-// Panics if the object is not a []uint.
-func (v *Value) MustUintSlice() []uint {
-	return v.data.([]uint)
-}
-
-// IsUint gets whether the object contained is a uint or not.
-func (v *Value) IsUint() bool {
-	_, ok := v.data.(uint)
-	return ok
-}
-
-// IsUintSlice gets whether the object contained is a []uint or not.
-func (v *Value) IsUintSlice() bool {
-	_, ok := v.data.([]uint)
-	return ok
-}
-
-// EachUint calls the specified callback for each object
-// in the []uint.
-//
-// Panics if the object is the wrong type.
-func (v *Value) EachUint(callback func(int, uint) bool) *Value {
-
-	for index, val := range v.MustUintSlice() {
-		carryon := callback(index, val)
-		if carryon == false {
-			break
-		}
-	}
-
-	return v
-
-}
-
-// WhereUint uses the specified decider function to select items
-// from the []uint.  The object contained in the result will contain
-// only the selected items.
-func (v *Value) WhereUint(decider func(int, uint) bool) *Value {
-
-	var selected []uint
-
-	v.EachUint(func(index int, val uint) bool {
-		shouldSelect := decider(index, val)
-		if shouldSelect == false {
-			selected = append(selected, val)
-		}
-		return true
-	})
-
-	return &Value{data: selected}
-
-}
-
-// GroupUint uses the specified grouper function to group the items
-// keyed by the return of the grouper.  The object contained in the
-// result will contain a map[string][]uint.
-func (v *Value) GroupUint(grouper func(int, uint) string) *Value {
-
-	groups := make(map[string][]uint)
-
-	v.EachUint(func(index int, val uint) bool {
-		group := grouper(index, val)
-		if _, ok := groups[group]; !ok {
-			groups[group] = make([]uint, 0)
-		}
-		groups[group] = append(groups[group], val)
-		return true
-	})
-
-	return &Value{data: groups}
-
-}
-
-// ReplaceUint uses the specified function to replace each uints
-// by iterating each item.  The data in the returned result will be a
-// []uint containing the replaced items.
-func (v *Value) ReplaceUint(replacer func(int, uint) uint) *Value {
-
-	arr := v.MustUintSlice()
-	replaced := make([]uint, len(arr))
-
-	v.EachUint(func(index int, val uint) bool {
-		replaced[index] = replacer(index, val)
-		return true
-	})
-
-	return &Value{data: replaced}
-
-}
-
-// CollectUint uses the specified collector function to collect a value
-// for each of the uints in the slice.  The data returned will be a
-// []interface{}.
-func (v *Value) CollectUint(collector func(int, uint) interface{}) *Value {
-
-	arr := v.MustUintSlice()
-	collected := make([]interface{}, len(arr))
-
-	v.EachUint(func(index int, val uint) bool {
-		collected[index] = collector(index, val)
-		return true
-	})
-
-	return &Value{data: collected}
-}
-
-/*
-	Uint8 (uint8 and []uint8)
-	--------------------------------------------------
-*/
-
-// Uint8 gets the value as a uint8, returns the optionalDefault
-// value or a system default object if the value is the wrong type.
-func (v *Value) Uint8(optionalDefault ...uint8) uint8 {
-	if s, ok := v.data.(uint8); ok {
-		return s
-	}
-	if len(optionalDefault) == 1 {
-		return optionalDefault[0]
-	}
-	return 0
-}
-
-// MustUint8 gets the value as a uint8.
-//
-// Panics if the object is not a uint8.
-func (v *Value) MustUint8() uint8 {
-	return v.data.(uint8)
-}
-
-// Uint8Slice gets the value as a []uint8, returns the optionalDefault
-// value or nil if the value is not a []uint8.
-func (v *Value) Uint8Slice(optionalDefault ...[]uint8) []uint8 {
-	if s, ok := v.data.([]uint8); ok {
-		return s
-	}
-	if len(optionalDefault) == 1 {
-		return optionalDefault[0]
-	}
-	return nil
-}
-
-// MustUint8Slice gets the value as a []uint8.
-//
-// Panics if the object is not a []uint8.
-func (v *Value) MustUint8Slice() []uint8 {
-	return v.data.([]uint8)
-}
-
-// IsUint8 gets whether the object contained is a uint8 or not.
-func (v *Value) IsUint8() bool {
-	_, ok := v.data.(uint8)
-	return ok
-}
-
-// IsUint8Slice gets whether the object contained is a []uint8 or not.
-func (v *Value) IsUint8Slice() bool {
-	_, ok := v.data.([]uint8)
-	return ok
-}
-
-// EachUint8 calls the specified callback for each object
-// in the []uint8.
-//
-// Panics if the object is the wrong type.
-func (v *Value) EachUint8(callback func(int, uint8) bool) *Value {
-
-	for index, val := range v.MustUint8Slice() {
-		carryon := callback(index, val)
-		if carryon == false {
-			break
-		}
-	}
-
-	return v
-
-}
-
-// WhereUint8 uses the specified decider function to select items
-// from the []uint8.  The object contained in the result will contain
-// only the selected items.
-func (v *Value) WhereUint8(decider func(int, uint8) bool) *Value {
-
-	var selected []uint8
-
-	v.EachUint8(func(index int, val uint8) bool {
-		shouldSelect := decider(index, val)
-		if shouldSelect == false {
-			selected = append(selected, val)
-		}
-		return true
-	})
-
-	return &Value{data: selected}
-
-}
-
-// GroupUint8 uses the specified grouper function to group the items
-// keyed by the return of the grouper.  The object contained in the
-// result will contain a map[string][]uint8.
-func (v *Value) GroupUint8(grouper func(int, uint8) string) *Value {
-
-	groups := make(map[string][]uint8)
-
-	v.EachUint8(func(index int, val uint8) bool {
-		group := grouper(index, val)
-		if _, ok := groups[group]; !ok {
-			groups[group] = make([]uint8, 0)
-		}
-		groups[group] = append(groups[group], val)
-		return true
-	})
-
-	return &Value{data: groups}
-
-}
-
-// ReplaceUint8 uses the specified function to replace each uint8s
-// by iterating each item.  The data in the returned result will be a
-// []uint8 containing the replaced items.
-func (v *Value) ReplaceUint8(replacer func(int, uint8) uint8) *Value {
-
-	arr := v.MustUint8Slice()
-	replaced := make([]uint8, len(arr))
-
-	v.EachUint8(func(index int, val uint8) bool {
-		replaced[index] = replacer(index, val)
-		return true
-	})
-
-	return &Value{data: replaced}
-
-}
-
-// CollectUint8 uses the specified collector function to collect a value
-// for each of the uint8s in the slice.  The data returned will be a
-// []interface{}.
-func (v *Value) CollectUint8(collector func(int, uint8) interface{}) *Value {
-
-	arr := v.MustUint8Slice()
-	collected := make([]interface{}, len(arr))
-
-	v.EachUint8(func(index int, val uint8) bool {
-		collected[index] = collector(index, val)
-		return true
-	})
-
-	return &Value{data: collected}
-}
-
-/*
-	Uint16 (uint16 and []uint16)
-	--------------------------------------------------
-*/
-
-// Uint16 gets the value as a uint16, returns the optionalDefault
-// value or a system default object if the value is the wrong type.
-func (v *Value) Uint16(optionalDefault ...uint16) uint16 {
-	if s, ok := v.data.(uint16); ok {
-		return s
-	}
-	if len(optionalDefault) == 1 {
-		return optionalDefault[0]
-	}
-	return 0
-}
-
-// MustUint16 gets the value as a uint16.
-//
-// Panics if the object is not a uint16.
-func (v *Value) MustUint16() uint16 {
-	return v.data.(uint16)
-}
-
-// Uint16Slice gets the value as a []uint16, returns the optionalDefault
-// value or nil if the value is not a []uint16.
-func (v *Value) Uint16Slice(optionalDefault ...[]uint16) []uint16 {
-	if s, ok := v.data.([]uint16); ok {
-		return s
-	}
-	if len(optionalDefault) == 1 {
-		return optionalDefault[0]
-	}
-	return nil
-}
-
-// MustUint16Slice gets the value as a []uint16.
-//
-// Panics if the object is not a []uint16.
-func (v *Value) MustUint16Slice() []uint16 {
-	return v.data.([]uint16)
-}
-
-// IsUint16 gets whether the object contained is a uint16 or not.
-func (v *Value) IsUint16() bool {
-	_, ok := v.data.(uint16)
-	return ok
-}
-
-// IsUint16Slice gets whether the object contained is a []uint16 or not.
-func (v *Value) IsUint16Slice() bool {
-	_, ok := v.data.([]uint16)
-	return ok
-}
-
-// EachUint16 calls the specified callback for each object
-// in the []uint16.
-//
-// Panics if the object is the wrong type.
-func (v *Value) EachUint16(callback func(int, uint16) bool) *Value {
-
-	for index, val := range v.MustUint16Slice() {
-		carryon := callback(index, val)
-		if carryon == false {
-			break
-		}
-	}
-
-	return v
-
-}
-
-// WhereUint16 uses the specified decider function to select items
-// from the []uint16.  The object contained in the result will contain
-// only the selected items.
-func (v *Value) WhereUint16(decider func(int, uint16) bool) *Value {
-
-	var selected []uint16
-
-	v.EachUint16(func(index int, val uint16) bool {
-		shouldSelect := decider(index, val)
-		if shouldSelect == false {
-			selected = append(selected, val)
-		}
-		return true
-	})
-
-	return &Value{data: selected}
-
-}
-
-// GroupUint16 uses the specified grouper function to group the items
-// keyed by the return of the grouper.  The object contained in the
-// result will contain a map[string][]uint16.
-func (v *Value) GroupUint16(grouper func(int, uint16) string) *Value {
-
-	groups := make(map[string][]uint16)
-
-	v.EachUint16(func(index int, val uint16) bool {
-		group := grouper(index, val)
-		if _, ok := groups[group]; !ok {
-			groups[group] = make([]uint16, 0)
-		}
-		groups[group] = append(groups[group], val)
-		return true
-	})
-
-	return &Value{data: groups}
-
-}
-
-// ReplaceUint16 uses the specified function to replace each uint16s
-// by iterating each item.  The data in the returned result will be a
-// []uint16 containing the replaced items.
-func (v *Value) ReplaceUint16(replacer func(int, uint16) uint16) *Value {
-
-	arr := v.MustUint16Slice()
-	replaced := make([]uint16, len(arr))
-
-	v.EachUint16(func(index int, val uint16) bool {
-		replaced[index] = replacer(index, val)
-		return true
-	})
-
-	return &Value{data: replaced}
-
-}
-
-// CollectUint16 uses the specified collector function to collect a value
-// for each of the uint16s in the slice.  The data returned will be a
-// []interface{}.
-func (v *Value) CollectUint16(collector func(int, uint16) interface{}) *Value {
-
-	arr := v.MustUint16Slice()
-	collected := make([]interface{}, len(arr))
-
-	v.EachUint16(func(index int, val uint16) bool {
-		collected[index] = collector(index, val)
-		return true
-	})
-
-	return &Value{data: collected}
-}
-
-/*
-	Uint32 (uint32 and []uint32)
-	--------------------------------------------------
-*/
-
-// Uint32 gets the value as a uint32, returns the optionalDefault
-// value or a system default object if the value is the wrong type.
-func (v *Value) Uint32(optionalDefault ...uint32) uint32 {
-	if s, ok := v.data.(uint32); ok {
-		return s
-	}
-	if len(optionalDefault) == 1 {
-		return optionalDefault[0]
-	}
-	return 0
-}
-
-// MustUint32 gets the value as a uint32.
-//
-// Panics if the object is not a uint32.
-func (v *Value) MustUint32() uint32 {
-	return v.data.(uint32)
-}
-
-// Uint32Slice gets the value as a []uint32, returns the optionalDefault
-// value or nil if the value is not a []uint32.
-func (v *Value) Uint32Slice(optionalDefault ...[]uint32) []uint32 {
-	if s, ok := v.data.([]uint32); ok {
-		return s
-	}
-	if len(optionalDefault) == 1 {
-		return optionalDefault[0]
-	}
-	return nil
-}
-
-// MustUint32Slice gets the value as a []uint32.
-//
-// Panics if the object is not a []uint32.
-func (v *Value) MustUint32Slice() []uint32 {
-	return v.data.([]uint32)
-}
-
-// IsUint32 gets whether the object contained is a uint32 or not.
-func (v *Value) IsUint32() bool {
-	_, ok := v.data.(uint32)
-	return ok
-}
-
-// IsUint32Slice gets whether the object contained is a []uint32 or not.
-func (v *Value) IsUint32Slice() bool {
-	_, ok := v.data.([]uint32)
-	return ok
-}
-
-// EachUint32 calls the specified callback for each object
-// in the []uint32.
-//
-// Panics if the object is the wrong type.
-func (v *Value) EachUint32(callback func(int, uint32) bool) *Value {
-
-	for index, val := range v.MustUint32Slice() {
-		carryon := callback(index, val)
-		if carryon == false {
-			break
-		}
-	}
-
-	return v
-
-}
-
-// WhereUint32 uses the specified decider function to select items
-// from the []uint32.  The object contained in the result will contain
-// only the selected items.
-func (v *Value) WhereUint32(decider func(int, uint32) bool) *Value {
-
-	var selected []uint32
-
-	v.EachUint32(func(index int, val uint32) bool {
-		shouldSelect := decider(index, val)
-		if shouldSelect == false {
-			selected = append(selected, val)
-		}
-		return true
-	})
-
-	return &Value{data: selected}
-
-}
-
-// GroupUint32 uses the specified grouper function to group the items
-// keyed by the return of the grouper.  The object contained in the
-// result will contain a map[string][]uint32.
-func (v *Value) GroupUint32(grouper func(int, uint32) string) *Value {
-
-	groups := make(map[string][]uint32)
-
-	v.EachUint32(func(index int, val uint32) bool {
-		group := grouper(index, val)
-		if _, ok := groups[group]; !ok {
-			groups[group] = make([]uint32, 0)
-		}
-		groups[group] = append(groups[group], val)
-		return true
-	})
-
-	return &Value{data: groups}
-
-}
-
-// ReplaceUint32 uses the specified function to replace each uint32s
-// by iterating each item.  The data in the returned result will be a
-// []uint32 containing the replaced items.
-func (v *Value) ReplaceUint32(replacer func(int, uint32) uint32) *Value {
-
-	arr := v.MustUint32Slice()
-	replaced := make([]uint32, len(arr))
-
-	v.EachUint32(func(index int, val uint32) bool {
-		replaced[index] = replacer(index, val)
-		return true
-	})
-
-	return &Value{data: replaced}
-
-}
-
-// CollectUint32 uses the specified collector function to collect a value
-// for each of the uint32s in the slice.  The data returned will be a
-// []interface{}.
-func (v *Value) CollectUint32(collector func(int, uint32) interface{}) *Value {
-
-	arr := v.MustUint32Slice()
-	collected := make([]interface{}, len(arr))
-
-	v.EachUint32(func(index int, val uint32) bool {
-		collected[index] = collector(index, val)
-		return true
-	})
-
-	return &Value{data: collected}
-}
-
-/*
-	Uint64 (uint64 and []uint64)
-	--------------------------------------------------
-*/
-
-// Uint64 gets the value as a uint64, returns the optionalDefault
-// value or a system default object if the value is the wrong type.
-func (v *Value) Uint64(optionalDefault ...uint64) uint64 {
-	if s, ok := v.data.(uint64); ok {
-		return s
-	}
-	if len(optionalDefault) == 1 {
-		return optionalDefault[0]
-	}
-	return 0
-}
-
-// MustUint64 gets the value as a uint64.
-//
-// Panics if the object is not a uint64.
-func (v *Value) MustUint64() uint64 {
-	return v.data.(uint64)
-}
-
-// Uint64Slice gets the value as a []uint64, returns the optionalDefault
-// value or nil if the value is not a []uint64.
-func (v *Value) Uint64Slice(optionalDefault ...[]uint64) []uint64 {
-	if s, ok := v.data.([]uint64); ok {
-		return s
-	}
-	if len(optionalDefault) == 1 {
-		return optionalDefault[0]
-	}
-	return nil
-}
-
-// MustUint64Slice gets the value as a []uint64.
-//
-// Panics if the object is not a []uint64.
-func (v *Value) MustUint64Slice() []uint64 {
-	return v.data.([]uint64)
-}
-
-// IsUint64 gets whether the object contained is a uint64 or not.
-func (v *Value) IsUint64() bool {
-	_, ok := v.data.(uint64)
-	return ok
-}
-
-// IsUint64Slice gets whether the object contained is a []uint64 or not.
-func (v *Value) IsUint64Slice() bool {
-	_, ok := v.data.([]uint64)
-	return ok
-}
-
-// EachUint64 calls the specified callback for each object
-// in the []uint64.
-//
-// Panics if the object is the wrong type.
-func (v *Value) EachUint64(callback func(int, uint64) bool) *Value {
-
-	for index, val := range v.MustUint64Slice() {
-		carryon := callback(index, val)
-		if carryon == false {
-			break
-		}
-	}
-
-	return v
-
-}
-
-// WhereUint64 uses the specified decider function to select items
-// from the []uint64.  The object contained in the result will contain
-// only the selected items.
-func (v *Value) WhereUint64(decider func(int, uint64) bool) *Value {
-
-	var selected []uint64
-
-	v.EachUint64(func(index int, val uint64) bool {
-		shouldSelect := decider(index, val)
-		if shouldSelect == false {
-			selected = append(selected, val)
-		}
-		return true
-	})
-
-	return &Value{data: selected}
-
-}
-
-// GroupUint64 uses the specified grouper function to group the items
-// keyed by the return of the grouper.  The object contained in the
-// result will contain a map[string][]uint64.
-func (v *Value) GroupUint64(grouper func(int, uint64) string) *Value {
-
-	groups := make(map[string][]uint64)
-
-	v.EachUint64(func(index int, val uint64) bool {
-		group := grouper(index, val)
-		if _, ok := groups[group]; !ok {
-			groups[group] = make([]uint64, 0)
-		}
-		groups[group] = append(groups[group], val)
-		return true
-	})
-
-	return &Value{data: groups}
-
-}
-
-// ReplaceUint64 uses the specified function to replace each uint64s
-// by iterating each item.  The data in the returned result will be a
-// []uint64 containing the replaced items.
-func (v *Value) ReplaceUint64(replacer func(int, uint64) uint64) *Value {
-
-	arr := v.MustUint64Slice()
-	replaced := make([]uint64, len(arr))
-
-	v.EachUint64(func(index int, val uint64) bool {
-		replaced[index] = replacer(index, val)
-		return true
-	})
-
-	return &Value{data: replaced}
-
-}
-
-// CollectUint64 uses the specified collector function to collect a value
-// for each of the uint64s in the slice.  The data returned will be a
-// []interface{}.
-func (v *Value) CollectUint64(collector func(int, uint64) interface{}) *Value {
-
-	arr := v.MustUint64Slice()
-	collected := make([]interface{}, len(arr))
-
-	v.EachUint64(func(index int, val uint64) bool {
-		collected[index] = collector(index, val)
-		return true
-	})
-
-	return &Value{data: collected}
-}
-
-/*
-	Uintptr (uintptr and []uintptr)
-	--------------------------------------------------
-*/
-
-// Uintptr gets the value as a uintptr, returns the optionalDefault
-// value or a system default object if the value is the wrong type.
-func (v *Value) Uintptr(optionalDefault ...uintptr) uintptr {
-	if s, ok := v.data.(uintptr); ok {
-		return s
-	}
-	if len(optionalDefault) == 1 {
-		return optionalDefault[0]
-	}
-	return 0
-}
-
-// MustUintptr gets the value as a uintptr.
-//
-// Panics if the object is not a uintptr.
-func (v *Value) MustUintptr() uintptr {
-	return v.data.(uintptr)
-}
-
-// UintptrSlice gets the value as a []uintptr, returns the optionalDefault
-// value or nil if the value is not a []uintptr.
-func (v *Value) UintptrSlice(optionalDefault ...[]uintptr) []uintptr {
-	if s, ok := v.data.([]uintptr); ok {
-		return s
-	}
-	if len(optionalDefault) == 1 {
-		return optionalDefault[0]
-	}
-	return nil
-}
-
-// MustUintptrSlice gets the value as a []uintptr.
-//
-// Panics if the object is not a []uintptr.
-func (v *Value) MustUintptrSlice() []uintptr {
-	return v.data.([]uintptr)
-}
-
-// IsUintptr gets whether the object contained is a uintptr or not.
-func (v *Value) IsUintptr() bool {
-	_, ok := v.data.(uintptr)
-	return ok
-}
-
-// IsUintptrSlice gets whether the object contained is a []uintptr or not.
-func (v *Value) IsUintptrSlice() bool {
-	_, ok := v.data.([]uintptr)
-	return ok
-}
-
-// EachUintptr calls the specified callback for each object
-// in the []uintptr.
-//
-// Panics if the object is the wrong type.
-func (v *Value) EachUintptr(callback func(int, uintptr) bool) *Value {
-
-	for index, val := range v.MustUintptrSlice() {
-		carryon := callback(index, val)
-		if carryon == false {
-			break
-		}
-	}
-
-	return v
-
-}
-
-// WhereUintptr uses the specified decider function to select items
-// from the []uintptr.  The object contained in the result will contain
-// only the selected items.
-func (v *Value) WhereUintptr(decider func(int, uintptr) bool) *Value {
-
-	var selected []uintptr
-
-	v.EachUintptr(func(index int, val uintptr) bool {
-		shouldSelect := decider(index, val)
-		if shouldSelect == false {
-			selected = append(selected, val)
-		}
-		return true
-	})
-
-	return &Value{data: selected}
-
-}
-
-// GroupUintptr uses the specified grouper function to group the items
-// keyed by the return of the grouper.  The object contained in the
-// result will contain a map[string][]uintptr.
-func (v *Value) GroupUintptr(grouper func(int, uintptr) string) *Value {
-
-	groups := make(map[string][]uintptr)
-
-	v.EachUintptr(func(index int, val uintptr) bool {
-		group := grouper(index, val)
-		if _, ok := groups[group]; !ok {
-			groups[group] = make([]uintptr, 0)
-		}
-		groups[group] = append(groups[group], val)
-		return true
-	})
-
-	return &Value{data: groups}
-
-}
-
-// ReplaceUintptr uses the specified function to replace each uintptrs
-// by iterating each item.  The data in the returned result will be a
-// []uintptr containing the replaced items.
-func (v *Value) ReplaceUintptr(replacer func(int, uintptr) uintptr) *Value {
-
-	arr := v.MustUintptrSlice()
-	replaced := make([]uintptr, len(arr))
-
-	v.EachUintptr(func(index int, val uintptr) bool {
-		replaced[index] = replacer(index, val)
-		return true
-	})
-
-	return &Value{data: replaced}
-
-}
-
-// CollectUintptr uses the specified collector function to collect a value
-// for each of the uintptrs in the slice.  The data returned will be a
-// []interface{}.
-func (v *Value) CollectUintptr(collector func(int, uintptr) interface{}) *Value {
-
-	arr := v.MustUintptrSlice()
-	collected := make([]interface{}, len(arr))
-
-	v.EachUintptr(func(index int, val uintptr) bool {
-		collected[index] = collector(index, val)
-		return true
-	})
-
-	return &Value{data: collected}
-}
-
-/*
-	Float32 (float32 and []float32)
-	--------------------------------------------------
-*/
-
-// Float32 gets the value as a float32, returns the optionalDefault
-// value or a system default object if the value is the wrong type.
-func (v *Value) Float32(optionalDefault ...float32) float32 {
-	if s, ok := v.data.(float32); ok {
-		return s
-	}
-	if len(optionalDefault) == 1 {
-		return optionalDefault[0]
-	}
-	return 0
-}
-
-// MustFloat32 gets the value as a float32.
-//
-// Panics if the object is not a float32.
-func (v *Value) MustFloat32() float32 {
-	return v.data.(float32)
-}
-
-// Float32Slice gets the value as a []float32, returns the optionalDefault
-// value or nil if the value is not a []float32.
-func (v *Value) Float32Slice(optionalDefault ...[]float32) []float32 {
-	if s, ok := v.data.([]float32); ok {
-		return s
-	}
-	if len(optionalDefault) == 1 {
-		return optionalDefault[0]
-	}
-	return nil
-}
-
-// MustFloat32Slice gets the value as a []float32.
-//
-// Panics if the object is not a []float32.
-func (v *Value) MustFloat32Slice() []float32 {
-	return v.data.([]float32)
-}
-
-// IsFloat32 gets whether the object contained is a float32 or not.
-func (v *Value) IsFloat32() bool {
-	_, ok := v.data.(float32)
-	return ok
-}
-
-// IsFloat32Slice gets whether the object contained is a []float32 or not.
-func (v *Value) IsFloat32Slice() bool {
-	_, ok := v.data.([]float32)
-	return ok
-}
-
-// EachFloat32 calls the specified callback for each object
-// in the []float32.
-//
-// Panics if the object is the wrong type.
-func (v *Value) EachFloat32(callback func(int, float32) bool) *Value {
-
-	for index, val := range v.MustFloat32Slice() {
-		carryon := callback(index, val)
-		if carryon == false {
-			break
-		}
-	}
-
-	return v
-
-}
-
-// WhereFloat32 uses the specified decider function to select items
-// from the []float32.  The object contained in the result will contain
-// only the selected items.
-func (v *Value) WhereFloat32(decider func(int, float32) bool) *Value {
-
-	var selected []float32
-
-	v.EachFloat32(func(index int, val float32) bool {
-		shouldSelect := decider(index, val)
-		if shouldSelect == false {
-			selected = append(selected, val)
-		}
-		return true
-	})
-
-	return &Value{data: selected}
-
-}
-
-// GroupFloat32 uses the specified grouper function to group the items
-// keyed by the return of the grouper.  The object contained in the
-// result will contain a map[string][]float32.
-func (v *Value) GroupFloat32(grouper func(int, float32) string) *Value {
-
-	groups := make(map[string][]float32)
-
-	v.EachFloat32(func(index int, val float32) bool {
-		group := grouper(index, val)
-		if _, ok := groups[group]; !ok {
-			groups[group] = make([]float32, 0)
-		}
-		groups[group] = append(groups[group], val)
-		return true
-	})
-
-	return &Value{data: groups}
-
-}
-
-// ReplaceFloat32 uses the specified function to replace each float32s
-// by iterating each item.  The data in the returned result will be a
-// []float32 containing the replaced items.
-func (v *Value) ReplaceFloat32(replacer func(int, float32) float32) *Value {
-
-	arr := v.MustFloat32Slice()
-	replaced := make([]float32, len(arr))
-
-	v.EachFloat32(func(index int, val float32) bool {
-		replaced[index] = replacer(index, val)
-		return true
-	})
-
-	return &Value{data: replaced}
-
-}
-
-// CollectFloat32 uses the specified collector function to collect a value
-// for each of the float32s in the slice.  The data returned will be a
-// []interface{}.
-func (v *Value) CollectFloat32(collector func(int, float32) interface{}) *Value {
-
-	arr := v.MustFloat32Slice()
-	collected := make([]interface{}, len(arr))
-
-	v.EachFloat32(func(index int, val float32) bool {
-		collected[index] = collector(index, val)
-		return true
-	})
-
-	return &Value{data: collected}
-}
-
-/*
-	Float64 (float64 and []float64)
-	--------------------------------------------------
-*/
-
-// Float64 gets the value as a float64, returns the optionalDefault
-// value or a system default object if the value is the wrong type.
-func (v *Value) Float64(optionalDefault ...float64) float64 {
-	if s, ok := v.data.(float64); ok {
-		return s
-	}
-	if len(optionalDefault) == 1 {
-		return optionalDefault[0]
-	}
-	return 0
-}
-
-// MustFloat64 gets the value as a float64.
-//
-// Panics if the object is not a float64.
-func (v *Value) MustFloat64() float64 {
-	return v.data.(float64)
-}
-
-// Float64Slice gets the value as a []float64, returns the optionalDefault
-// value or nil if the value is not a []float64.
-func (v *Value) Float64Slice(optionalDefault ...[]float64) []float64 {
-	if s, ok := v.data.([]float64); ok {
-		return s
-	}
-	if len(optionalDefault) == 1 {
-		return optionalDefault[0]
-	}
-	return nil
-}
-
-// MustFloat64Slice gets the value as a []float64.
-//
-// Panics if the object is not a []float64.
-func (v *Value) MustFloat64Slice() []float64 {
-	return v.data.([]float64)
-}
-
-// IsFloat64 gets whether the object contained is a float64 or not.
-func (v *Value) IsFloat64() bool {
-	_, ok := v.data.(float64)
-	return ok
-}
-
-// IsFloat64Slice gets whether the object contained is a []float64 or not.
-func (v *Value) IsFloat64Slice() bool {
-	_, ok := v.data.([]float64)
-	return ok
-}
-
-// EachFloat64 calls the specified callback for each object
-// in the []float64.
-//
-// Panics if the object is the wrong type.
-func (v *Value) EachFloat64(callback func(int, float64) bool) *Value {
-
-	for index, val := range v.MustFloat64Slice() {
-		carryon := callback(index, val)
-		if carryon == false {
-			break
-		}
-	}
-
-	return v
-
-}
-
-// WhereFloat64 uses the specified decider function to select items
-// from the []float64.  The object contained in the result will contain
-// only the selected items.
-func (v *Value) WhereFloat64(decider func(int, float64) bool) *Value {
-
-	var selected []float64
-
-	v.EachFloat64(func(index int, val float64) bool {
-		shouldSelect := decider(index, val)
-		if shouldSelect == false {
-			selected = append(selected, val)
-		}
-		return true
-	})
-
-	return &Value{data: selected}
-
-}
-
-// GroupFloat64 uses the specified grouper function to group the items
-// keyed by the return of the grouper.  The object contained in the
-// result will contain a map[string][]float64.
-func (v *Value) GroupFloat64(grouper func(int, float64) string) *Value {
-
-	groups := make(map[string][]float64)
-
-	v.EachFloat64(func(index int, val float64) bool {
-		group := grouper(index, val)
-		if _, ok := groups[group]; !ok {
-			groups[group] = make([]float64, 0)
-		}
-		groups[group] = append(groups[group], val)
-		return true
-	})
-
-	return &Value{data: groups}
-
-}
-
-// ReplaceFloat64 uses the specified function to replace each float64s
-// by iterating each item.  The data in the returned result will be a
-// []float64 containing the replaced items.
-func (v *Value) ReplaceFloat64(replacer func(int, float64) float64) *Value {
-
-	arr := v.MustFloat64Slice()
-	replaced := make([]float64, len(arr))
-
-	v.EachFloat64(func(index int, val float64) bool {
-		replaced[index] = replacer(index, val)
-		return true
-	})
-
-	return &Value{data: replaced}
-
-}
-
-// CollectFloat64 uses the specified collector function to collect a value
-// for each of the float64s in the slice.  The data returned will be a
-// []interface{}.
-func (v *Value) CollectFloat64(collector func(int, float64) interface{}) *Value {
-
-	arr := v.MustFloat64Slice()
-	collected := make([]interface{}, len(arr))
-
-	v.EachFloat64(func(index int, val float64) bool {
-		collected[index] = collector(index, val)
-		return true
-	})
-
-	return &Value{data: collected}
-}
-
-/*
-	Complex64 (complex64 and []complex64)
-	--------------------------------------------------
-*/
-
-// Complex64 gets the value as a complex64, returns the optionalDefault
-// value or a system default object if the value is the wrong type.
-func (v *Value) Complex64(optionalDefault ...complex64) complex64 {
-	if s, ok := v.data.(complex64); ok {
-		return s
-	}
-	if len(optionalDefault) == 1 {
-		return optionalDefault[0]
-	}
-	return 0
-}
-
-// MustComplex64 gets the value as a complex64.
-//
-// Panics if the object is not a complex64.
-func (v *Value) MustComplex64() complex64 {
-	return v.data.(complex64)
-}
-
-// Complex64Slice gets the value as a []complex64, returns the optionalDefault
-// value or nil if the value is not a []complex64.
-func (v *Value) Complex64Slice(optionalDefault ...[]complex64) []complex64 {
-	if s, ok := v.data.([]complex64); ok {
-		return s
-	}
-	if len(optionalDefault) == 1 {
-		return optionalDefault[0]
-	}
-	return nil
-}
-
-// MustComplex64Slice gets the value as a []complex64.
-//
-// Panics if the object is not a []complex64.
-func (v *Value) MustComplex64Slice() []complex64 {
-	return v.data.([]complex64)
-}
-
-// IsComplex64 gets whether the object contained is a complex64 or not.
-func (v *Value) IsComplex64() bool {
-	_, ok := v.data.(complex64)
-	return ok
-}
-
-// IsComplex64Slice gets whether the object contained is a []complex64 or not.
-func (v *Value) IsComplex64Slice() bool {
-	_, ok := v.data.([]complex64)
-	return ok
-}
-
-// EachComplex64 calls the specified callback for each object
-// in the []complex64.
-//
-// Panics if the object is the wrong type.
-func (v *Value) EachComplex64(callback func(int, complex64) bool) *Value {
-
-	for index, val := range v.MustComplex64Slice() {
-		carryon := callback(index, val)
-		if carryon == false {
-			break
-		}
-	}
-
-	return v
-
-}
-
-// WhereComplex64 uses the specified decider function to select items
-// from the []complex64.  The object contained in the result will contain
-// only the selected items.
-func (v *Value) WhereComplex64(decider func(int, complex64) bool) *Value {
-
-	var selected []complex64
-
-	v.EachComplex64(func(index int, val complex64) bool {
-		shouldSelect := decider(index, val)
-		if shouldSelect == false {
-			selected = append(selected, val)
-		}
-		return true
-	})
-
-	return &Value{data: selected}
-
-}
-
-// GroupComplex64 uses the specified grouper function to group the items
-// keyed by the return of the grouper.  The object contained in the
-// result will contain a map[string][]complex64.
-func (v *Value) GroupComplex64(grouper func(int, complex64) string) *Value {
-
-	groups := make(map[string][]complex64)
-
-	v.EachComplex64(func(index int, val complex64) bool {
-		group := grouper(index, val)
-		if _, ok := groups[group]; !ok {
-			groups[group] = make([]complex64, 0)
-		}
-		groups[group] = append(groups[group], val)
-		return true
-	})
-
-	return &Value{data: groups}
-
-}
-
-// ReplaceComplex64 uses the specified function to replace each complex64s
-// by iterating each item.  The data in the returned result will be a
-// []complex64 containing the replaced items.
-func (v *Value) ReplaceComplex64(replacer func(int, complex64) complex64) *Value {
-
-	arr := v.MustComplex64Slice()
-	replaced := make([]complex64, len(arr))
-
-	v.EachComplex64(func(index int, val complex64) bool {
-		replaced[index] = replacer(index, val)
-		return true
-	})
-
-	return &Value{data: replaced}
-
-}
-
-// CollectComplex64 uses the specified collector function to collect a value
-// for each of the complex64s in the slice.  The data returned will be a
-// []interface{}.
-func (v *Value) CollectComplex64(collector func(int, complex64) interface{}) *Value {
-
-	arr := v.MustComplex64Slice()
-	collected := make([]interface{}, len(arr))
-
-	v.EachComplex64(func(index int, val complex64) bool {
-		collected[index] = collector(index, val)
-		return true
-	})
-
-	return &Value{data: collected}
-}
-
-/*
-	Complex128 (complex128 and []complex128)
-	--------------------------------------------------
-*/
-
-// Complex128 gets the value as a complex128, returns the optionalDefault
-// value or a system default object if the value is the wrong type.
-func (v *Value) Complex128(optionalDefault ...complex128) complex128 {
-	if s, ok := v.data.(complex128); ok {
-		return s
-	}
-	if len(optionalDefault) == 1 {
-		return optionalDefault[0]
-	}
-	return 0
-}
-
-// MustComplex128 gets the value as a complex128.
-//
-// Panics if the object is not a complex128.
-func (v *Value) MustComplex128() complex128 {
-	return v.data.(complex128)
-}
-
-// Complex128Slice gets the value as a []complex128, returns the optionalDefault
-// value or nil if the value is not a []complex128.
-func (v *Value) Complex128Slice(optionalDefault ...[]complex128) []complex128 {
-	if s, ok := v.data.([]complex128); ok {
-		return s
-	}
-	if len(optionalDefault) == 1 {
-		return optionalDefault[0]
-	}
-	return nil
-}
-
-// MustComplex128Slice gets the value as a []complex128.
-//
-// Panics if the object is not a []complex128.
-func (v *Value) MustComplex128Slice() []complex128 {
-	return v.data.([]complex128)
-}
-
-// IsComplex128 gets whether the object contained is a complex128 or not.
-func (v *Value) IsComplex128() bool {
-	_, ok := v.data.(complex128)
-	return ok
-}
-
-// IsComplex128Slice gets whether the object contained is a []complex128 or not.
-func (v *Value) IsComplex128Slice() bool {
-	_, ok := v.data.([]complex128)
-	return ok
-}
-
-// EachComplex128 calls the specified callback for each object
-// in the []complex128.
-//
-// Panics if the object is the wrong type.
-func (v *Value) EachComplex128(callback func(int, complex128) bool) *Value {
-
-	for index, val := range v.MustComplex128Slice() {
-		carryon := callback(index, val)
-		if carryon == false {
-			break
-		}
-	}
-
-	return v
-
-}
-
-// WhereComplex128 uses the specified decider function to select items
-// from the []complex128.  The object contained in the result will contain
-// only the selected items.
-func (v *Value) WhereComplex128(decider func(int, complex128) bool) *Value {
-
-	var selected []complex128
-
-	v.EachComplex128(func(index int, val complex128) bool {
-		shouldSelect := decider(index, val)
-		if shouldSelect == false {
-			selected = append(selected, val)
-		}
-		return true
-	})
-
-	return &Value{data: selected}
-
-}
-
-// GroupComplex128 uses the specified grouper function to group the items
-// keyed by the return of the grouper.  The object contained in the
-// result will contain a map[string][]complex128.
-func (v *Value) GroupComplex128(grouper func(int, complex128) string) *Value {
-
-	groups := make(map[string][]complex128)
-
-	v.EachComplex128(func(index int, val complex128) bool {
-		group := grouper(index, val)
-		if _, ok := groups[group]; !ok {
-			groups[group] = make([]complex128, 0)
-		}
-		groups[group] = append(groups[group], val)
-		return true
-	})
-
-	return &Value{data: groups}
-
-}
-
-// ReplaceComplex128 uses the specified function to replace each complex128s
-// by iterating each item.  The data in the returned result will be a
-// []complex128 containing the replaced items.
-func (v *Value) ReplaceComplex128(replacer func(int, complex128) complex128) *Value {
-
-	arr := v.MustComplex128Slice()
-	replaced := make([]complex128, len(arr))
-
-	v.EachComplex128(func(index int, val complex128) bool {
-		replaced[index] = replacer(index, val)
-		return true
-	})
-
-	return &Value{data: replaced}
-
-}
-
-// CollectComplex128 uses the specified collector function to collect a value
-// for each of the complex128s in the slice.  The data returned will be a
-// []interface{}.
-func (v *Value) CollectComplex128(collector func(int, complex128) interface{}) *Value {
-
-	arr := v.MustComplex128Slice()
-	collected := make([]interface{}, len(arr))
-
-	v.EachComplex128(func(index int, val complex128) bool {
-		collected[index] = collector(index, val)
-		return true
-	})
-
-	return &Value{data: collected}
-}
diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/type_specific_codegen_test.go b/Godeps/_workspace/src/github.com/stretchr/objx/type_specific_codegen_test.go
deleted file mode 100644
index f7a4fceea..000000000
--- a/Godeps/_workspace/src/github.com/stretchr/objx/type_specific_codegen_test.go
+++ /dev/null
@@ -1,2867 +0,0 @@
-package objx
-
-import (
-	"fmt"
-	"github.com/stretchr/testify/assert"
-	"testing"
-)
-
-// ************************************************************
-// TESTS
-// ************************************************************
-
-func TestInter(t *testing.T) {
-
-	val := interface{}("something")
-	m := map[string]interface{}{"value": val, "nothing": nil}
-	assert.Equal(t, val, New(m).Get("value").Inter())
-	assert.Equal(t, val, New(m).Get("value").MustInter())
-	assert.Equal(t, interface{}(nil), New(m).Get("nothing").Inter())
-	assert.Equal(t, val, New(m).Get("nothing").Inter("something"))
-
-	assert.Panics(t, func() {
-		New(m).Get("age").MustInter()
-	})
-
-}
-
-func TestInterSlice(t *testing.T) {
-
-	val := interface{}("something")
-	m := map[string]interface{}{"value": []interface{}{val}, "nothing": nil}
-	assert.Equal(t, val, New(m).Get("value").InterSlice()[0])
-	assert.Equal(t, val, New(m).Get("value").MustInterSlice()[0])
-	assert.Equal(t, []interface{}(nil), New(m).Get("nothing").InterSlice())
-	assert.Equal(t, val, New(m).Get("nothing").InterSlice([]interface{}{interface{}("something")})[0])
-
-	assert.Panics(t, func() {
-		New(m).Get("nothing").MustInterSlice()
-	})
-
-}
-
-func TestIsInter(t *testing.T) {
-
-	var v *Value
-
-	v = &Value{data: interface{}("something")}
-	assert.True(t, v.IsInter())
-
-	v = &Value{data: []interface{}{interface{}("something")}}
-	assert.True(t, v.IsInterSlice())
-
-}
-
-func TestEachInter(t *testing.T) {
-
-	v := &Value{data: []interface{}{interface{}("something"), interface{}("something"), interface{}("something"), interface{}("something"), interface{}("something")}}
-	count := 0
-	replacedVals := make([]interface{}, 0)
-	assert.Equal(t, v, v.EachInter(func(i int, val interface{}) bool {
-
-		count++
-		replacedVals = append(replacedVals, val)
-
-		// abort early
-		if i == 2 {
-			return false
-		}
-
-		return true
-
-	}))
-
-	assert.Equal(t, count, 3)
-	assert.Equal(t, replacedVals[0], v.MustInterSlice()[0])
-	assert.Equal(t, replacedVals[1], v.MustInterSlice()[1])
-	assert.Equal(t, replacedVals[2], v.MustInterSlice()[2])
-
-}
-
-func TestWhereInter(t *testing.T) {
-
-	v := &Value{data: []interface{}{interface{}("something"), interface{}("something"), interface{}("something"), interface{}("something"), interface{}("something"), interface{}("something")}}
-
-	selected := v.WhereInter(func(i int, val interface{}) bool {
-		return i%2 == 0
-	}).MustInterSlice()
-
-	assert.Equal(t, 3, len(selected))
-
-}
-
-func TestGroupInter(t *testing.T) {
-
-	v := &Value{data: []interface{}{interface{}("something"), interface{}("something"), interface{}("something"), interface{}("something"), interface{}("something"), interface{}("something")}}
-
-	grouped := v.GroupInter(func(i int, val interface{}) string {
-		return fmt.Sprintf("%v", i%2 == 0)
-	}).data.(map[string][]interface{})
-
-	assert.Equal(t, 2, len(grouped))
-	assert.Equal(t, 3, len(grouped["true"]))
-	assert.Equal(t, 3, len(grouped["false"]))
-
-}
-
-func TestReplaceInter(t *testing.T) {
-
-	v := &Value{data: []interface{}{interface{}("something"), interface{}("something"), interface{}("something"), interface{}("something"), interface{}("something"), interface{}("something")}}
-
-	rawArr := v.MustInterSlice()
-
-	replaced := v.ReplaceInter(func(index int, val interface{}) interface{} {
-		if index < len(rawArr)-1 {
-			return rawArr[index+1]
-		}
-		return rawArr[0]
-	})
-
-	replacedArr := replaced.MustInterSlice()
-	if assert.Equal(t, 6, len(replacedArr)) {
-		assert.Equal(t, replacedArr[0], rawArr[1])
-		assert.Equal(t, replacedArr[1], rawArr[2])
-		assert.Equal(t, replacedArr[2], rawArr[3])
-		assert.Equal(t, replacedArr[3], rawArr[4])
-		assert.Equal(t, replacedArr[4], rawArr[5])
-		assert.Equal(t, replacedArr[5], rawArr[0])
-	}
-
-}
-
-func TestCollectInter(t *testing.T) {
-
-	v := &Value{data: []interface{}{interface{}("something"), interface{}("something"), interface{}("something"), interface{}("something"), interface{}("something"), interface{}("something")}}
-
-	collected := v.CollectInter(func(index int, val interface{}) interface{} {
-		return index
-	})
-
-	collectedArr := collected.MustInterSlice()
-	if assert.Equal(t, 6, len(collectedArr)) {
-		assert.Equal(t, collectedArr[0], 0)
-		assert.Equal(t, collectedArr[1], 1)
-		assert.Equal(t, collectedArr[2], 2)
-		assert.Equal(t, collectedArr[3], 3)
-		assert.Equal(t, collectedArr[4], 4)
-		assert.Equal(t, collectedArr[5], 5)
-	}
-
-}
-
-// ************************************************************
-// TESTS
-// ************************************************************
-
-func TestMSI(t *testing.T) {
-
-	val := map[string]interface{}(map[string]interface{}{"name": "Tyler"})
-	m := map[string]interface{}{"value": val, "nothing": nil}
-	assert.Equal(t, val, New(m).Get("value").MSI())
-	assert.Equal(t, val, New(m).Get("value").MustMSI())
-	assert.Equal(t, map[string]interface{}(nil), New(m).Get("nothing").MSI())
-	assert.Equal(t, val, New(m).Get("nothing").MSI(map[string]interface{}{"name": "Tyler"}))
-
-	assert.Panics(t, func() {
-		New(m).Get("age").MustMSI()
-	})
-
-}
-
-func TestMSISlice(t *testing.T) {
-
-	val := map[string]interface{}(map[string]interface{}{"name": "Tyler"})
-	m := map[string]interface{}{"value": []map[string]interface{}{val}, "nothing": nil}
-	assert.Equal(t, val, New(m).Get("value").MSISlice()[0])
-	assert.Equal(t, val, New(m).Get("value").MustMSISlice()[0])
-	assert.Equal(t, []map[string]interface{}(nil), New(m).Get("nothing").MSISlice())
-	assert.Equal(t, val, New(m).Get("nothing").MSISlice([]map[string]interface{}{map[string]interface{}(map[string]interface{}{"name": "Tyler"})})[0])
-
-	assert.Panics(t, func() {
-		New(m).Get("nothing").MustMSISlice()
-	})
-
-}
-
-func TestIsMSI(t *testing.T) {
-
-	var v *Value
-
-	v = &Value{data: map[string]interface{}(map[string]interface{}{"name": "Tyler"})}
-	assert.True(t, v.IsMSI())
-
-	v = &Value{data: []map[string]interface{}{map[string]interface{}(map[string]interface{}{"name": "Tyler"})}}
-	assert.True(t, v.IsMSISlice())
-
-}
-
-func TestEachMSI(t *testing.T) {
-
-	v := &Value{data: []map[string]interface{}{map[string]interface{}(map[string]interface{}{"name": "Tyler"}), map[string]interface{}(map[string]interface{}{"name": "Tyler"}), map[string]interface{}(map[string]interface{}{"name": "Tyler"}), map[string]interface{}(map[string]interface{}{"name": "Tyler"}), map[string]interface{}(map[string]interface{}{"name": "Tyler"})}}
-	count := 0
-	replacedVals := make([]map[string]interface{}, 0)
-	assert.Equal(t, v, v.EachMSI(func(i int, val map[string]interface{}) bool {
-
-		count++
-		replacedVals = append(replacedVals, val)
-
-		// abort early
-		if i == 2 {
-			return false
-		}
-
-		return true
-
-	}))
-
-	assert.Equal(t, count, 3)
-	assert.Equal(t, replacedVals[0], v.MustMSISlice()[0])
-	assert.Equal(t, replacedVals[1], v.MustMSISlice()[1])
-	assert.Equal(t, replacedVals[2], v.MustMSISlice()[2])
-
-}
-
-func TestWhereMSI(t *testing.T) {
-
-	v := &Value{data: []map[string]interface{}{map[string]interface{}(map[string]interface{}{"name": "Tyler"}), map[string]interface{}(map[string]interface{}{"name": "Tyler"}), map[string]interface{}(map[string]interface{}{"name": "Tyler"}), map[string]interface{}(map[string]interface{}{"name": "Tyler"}), map[string]interface{}(map[string]interface{}{"name": "Tyler"}), map[string]interface{}(map[string]interface{}{"name": "Tyler"})}}
-
-	selected := v.WhereMSI(func(i int, val map[string]interface{}) bool {
-		return i%2 == 0
-	}).MustMSISlice()
-
-	assert.Equal(t, 3, len(selected))
-
-}
-
-func TestGroupMSI(t *testing.T) {
-
-	v := &Value{data: []map[string]interface{}{map[string]interface{}(map[string]interface{}{"name": "Tyler"}), map[string]interface{}(map[string]interface{}{"name": "Tyler"}), map[string]interface{}(map[string]interface{}{"name": "Tyler"}), map[string]interface{}(map[string]interface{}{"name": "Tyler"}), map[string]interface{}(map[string]interface{}{"name": "Tyler"}), map[string]interface{}(map[string]interface{}{"name": "Tyler"})}}
-
-	grouped := v.GroupMSI(func(i int, val map[string]interface{}) string {
-		return fmt.Sprintf("%v", i%2 == 0)
-	}).data.(map[string][]map[string]interface{})
-
-	assert.Equal(t, 2, len(grouped))
-	assert.Equal(t, 3, len(grouped["true"]))
-	assert.Equal(t, 3, len(grouped["false"]))
-
-}
-
-func TestReplaceMSI(t *testing.T) {
-
-	v := &Value{data: []map[string]interface{}{map[string]interface{}(map[string]interface{}{"name": "Tyler"}), map[string]interface{}(map[string]interface{}{"name": "Tyler"}), map[string]interface{}(map[string]interface{}{"name": "Tyler"}), map[string]interface{}(map[string]interface{}{"name": "Tyler"}), map[string]interface{}(map[string]interface{}{"name": "Tyler"}), map[string]interface{}(map[string]interface{}{"name": "Tyler"})}}
-
-	rawArr := v.MustMSISlice()
-
-	replaced := v.ReplaceMSI(func(index int, val map[string]interface{}) map[string]interface{} {
-		if index < len(rawArr)-1 {
-			return rawArr[index+1]
-		}
-		return rawArr[0]
-	})
-
-	replacedArr := replaced.MustMSISlice()
-	if assert.Equal(t, 6, len(replacedArr)) {
-		assert.Equal(t, replacedArr[0], rawArr[1])
-		assert.Equal(t, replacedArr[1], rawArr[2])
-		assert.Equal(t, replacedArr[2], rawArr[3])
-		assert.Equal(t, replacedArr[3], rawArr[4])
-		assert.Equal(t, replacedArr[4], rawArr[5])
-		assert.Equal(t, replacedArr[5], rawArr[0])
-	}
-
-}
-
-func TestCollectMSI(t *testing.T) {
-
-	v := &Value{data: []map[string]interface{}{map[string]interface{}(map[string]interface{}{"name": "Tyler"}), map[string]interface{}(map[string]interface{}{"name": "Tyler"}), map[string]interface{}(map[string]interface{}{"name": "Tyler"}), map[string]interface{}(map[string]interface{}{"name": "Tyler"}), map[string]interface{}(map[string]interface{}{"name": "Tyler"}), map[string]interface{}(map[string]interface{}{"name": "Tyler"})}}
-
-	collected := v.CollectMSI(func(index int, val map[string]interface{}) interface{} {
-		return index
-	})
-
-	collectedArr := collected.MustInterSlice()
-	if assert.Equal(t, 6, len(collectedArr)) {
-		assert.Equal(t, collectedArr[0], 0)
-		assert.Equal(t, collectedArr[1], 1)
-		assert.Equal(t, collectedArr[2], 2)
-		assert.Equal(t, collectedArr[3], 3)
-		assert.Equal(t, collectedArr[4], 4)
-		assert.Equal(t, collectedArr[5], 5)
-	}
-
-}
-
-// ************************************************************
-// TESTS
-// ************************************************************
-
-func TestObjxMap(t *testing.T) {
-
-	val := (Map)(New(1))
-	m := map[string]interface{}{"value": val, "nothing": nil}
-	assert.Equal(t, val, New(m).Get("value").ObjxMap())
-	assert.Equal(t, val, New(m).Get("value").MustObjxMap())
-	assert.Equal(t, (Map)(New(nil)), New(m).Get("nothing").ObjxMap())
-	assert.Equal(t, val, New(m).Get("nothing").ObjxMap(New(1)))
-
-	assert.Panics(t, func() {
-		New(m).Get("age").MustObjxMap()
-	})
-
-}
-
-func TestObjxMapSlice(t *testing.T) {
-
-	val := (Map)(New(1))
-	m := map[string]interface{}{"value": [](Map){val}, "nothing": nil}
-	assert.Equal(t, val, New(m).Get("value").ObjxMapSlice()[0])
-	assert.Equal(t, val, New(m).Get("value").MustObjxMapSlice()[0])
-	assert.Equal(t, [](Map)(nil), New(m).Get("nothing").ObjxMapSlice())
-	assert.Equal(t, val, New(m).Get("nothing").ObjxMapSlice([](Map){(Map)(New(1))})[0])
-
-	assert.Panics(t, func() {
-		New(m).Get("nothing").MustObjxMapSlice()
-	})
-
-}
-
-func TestIsObjxMap(t *testing.T) {
-
-	var v *Value
-
-	v = &Value{data: (Map)(New(1))}
-	assert.True(t, v.IsObjxMap())
-
-	v = &Value{data: [](Map){(Map)(New(1))}}
-	assert.True(t, v.IsObjxMapSlice())
-
-}
-
-func TestEachObjxMap(t *testing.T) {
-
-	v := &Value{data: [](Map){(Map)(New(1)), (Map)(New(1)), (Map)(New(1)), (Map)(New(1)), (Map)(New(1))}}
-	count := 0
-	replacedVals := make([](Map), 0)
-	assert.Equal(t, v, v.EachObjxMap(func(i int, val Map) bool {
-
-		count++
-		replacedVals = append(replacedVals, val)
-
-		// abort early
-		if i == 2 {
-			return false
-		}
-
-		return true
-
-	}))
-
-	assert.Equal(t, count, 3)
-	assert.Equal(t, replacedVals[0], v.MustObjxMapSlice()[0])
-	assert.Equal(t, replacedVals[1], v.MustObjxMapSlice()[1])
-	assert.Equal(t, replacedVals[2], v.MustObjxMapSlice()[2])
-
-}
-
-func TestWhereObjxMap(t *testing.T) {
-
-	v := &Value{data: [](Map){(Map)(New(1)), (Map)(New(1)), (Map)(New(1)), (Map)(New(1)), (Map)(New(1)), (Map)(New(1))}}
-
-	selected := v.WhereObjxMap(func(i int, val Map) bool {
-		return i%2 == 0
-	}).MustObjxMapSlice()
-
-	assert.Equal(t, 3, len(selected))
-
-}
-
-func TestGroupObjxMap(t *testing.T) {
-
-	v := &Value{data: [](Map){(Map)(New(1)), (Map)(New(1)), (Map)(New(1)), (Map)(New(1)), (Map)(New(1)), (Map)(New(1))}}
-
-	grouped := v.GroupObjxMap(func(i int, val Map) string {
-		return fmt.Sprintf("%v", i%2 == 0)
-	}).data.(map[string][](Map))
-
-	assert.Equal(t, 2, len(grouped))
-	assert.Equal(t, 3, len(grouped["true"]))
-	assert.Equal(t, 3, len(grouped["false"]))
-
-}
-
-func TestReplaceObjxMap(t *testing.T) {
-
-	v := &Value{data: [](Map){(Map)(New(1)), (Map)(New(1)), (Map)(New(1)), (Map)(New(1)), (Map)(New(1)), (Map)(New(1))}}
-
-	rawArr := v.MustObjxMapSlice()
-
-	replaced := v.ReplaceObjxMap(func(index int, val Map) Map {
-		if index < len(rawArr)-1 {
-			return rawArr[index+1]
-		}
-		return rawArr[0]
-	})
-
-	replacedArr := replaced.MustObjxMapSlice()
-	if assert.Equal(t, 6, len(replacedArr)) {
-		assert.Equal(t, replacedArr[0], rawArr[1])
-		assert.Equal(t, replacedArr[1], rawArr[2])
-		assert.Equal(t, replacedArr[2], rawArr[3])
-		assert.Equal(t, replacedArr[3], rawArr[4])
-		assert.Equal(t, replacedArr[4], rawArr[5])
-		assert.Equal(t, replacedArr[5], rawArr[0])
-	}
-
-}
-
-func TestCollectObjxMap(t *testing.T) {
-
-	v := &Value{data: [](Map){(Map)(New(1)), (Map)(New(1)), (Map)(New(1)), (Map)(New(1)), (Map)(New(1)), (Map)(New(1))}}
-
-	collected := v.CollectObjxMap(func(index int, val Map) interface{} {
-		return index
-	})
-
-	collectedArr := collected.MustInterSlice()
-	if assert.Equal(t, 6, len(collectedArr)) {
-		assert.Equal(t, collectedArr[0], 0)
-		assert.Equal(t, collectedArr[1], 1)
-		assert.Equal(t, collectedArr[2], 2)
-		assert.Equal(t, collectedArr[3], 3)
-		assert.Equal(t, collectedArr[4], 4)
-		assert.Equal(t, collectedArr[5], 5)
-	}
-
-}
-
-// ************************************************************
-// TESTS
-// ************************************************************
-
-func TestBool(t *testing.T) {
-
-	val := bool(true)
-	m := map[string]interface{}{"value": val, "nothing": nil}
-	assert.Equal(t, val, New(m).Get("value").Bool())
-	assert.Equal(t, val, New(m).Get("value").MustBool())
-	assert.Equal(t, bool(false), New(m).Get("nothing").Bool())
-	assert.Equal(t, val, New(m).Get("nothing").Bool(true))
-
-	assert.Panics(t, func() {
-		New(m).Get("age").MustBool()
-	})
-
-}
-
-func TestBoolSlice(t *testing.T) {
-
-	val := bool(true)
-	m := map[string]interface{}{"value": []bool{val}, "nothing": nil}
-	assert.Equal(t, val, New(m).Get("value").BoolSlice()[0])
-	assert.Equal(t, val, New(m).Get("value").MustBoolSlice()[0])
-	assert.Equal(t, []bool(nil), New(m).Get("nothing").BoolSlice())
-	assert.Equal(t, val, New(m).Get("nothing").BoolSlice([]bool{bool(true)})[0])
-
-	assert.Panics(t, func() {
-		New(m).Get("nothing").MustBoolSlice()
-	})
-
-}
-
-func TestIsBool(t *testing.T) {
-
-	var v *Value
-
-	v = &Value{data: bool(true)}
-	assert.True(t, v.IsBool())
-
-	v = &Value{data: []bool{bool(true)}}
-	assert.True(t, v.IsBoolSlice())
-
-}
-
-func TestEachBool(t *testing.T) {
-
-	v := &Value{data: []bool{bool(true), bool(true), bool(true), bool(true), bool(true)}}
-	count := 0
-	replacedVals := make([]bool, 0)
-	assert.Equal(t, v, v.EachBool(func(i int, val bool) bool {
-
-		count++
-		replacedVals = append(replacedVals, val)
-
-		// abort early
-		if i == 2 {
-			return false
-		}
-
-		return true
-
-	}))
-
-	assert.Equal(t, count, 3)
-	assert.Equal(t, replacedVals[0], v.MustBoolSlice()[0])
-	assert.Equal(t, replacedVals[1], v.MustBoolSlice()[1])
-	assert.Equal(t, replacedVals[2], v.MustBoolSlice()[2])
-
-}
-
-func TestWhereBool(t *testing.T) {
-
-	v := &Value{data: []bool{bool(true), bool(true), bool(true), bool(true), bool(true), bool(true)}}
-
-	selected := v.WhereBool(func(i int, val bool) bool {
-		return i%2 == 0
-	}).MustBoolSlice()
-
-	assert.Equal(t, 3, len(selected))
-
-}
-
-func TestGroupBool(t *testing.T) {
-
-	v := &Value{data: []bool{bool(true), bool(true), bool(true), bool(true), bool(true), bool(true)}}
-
-	grouped := v.GroupBool(func(i int, val bool) string {
-		return fmt.Sprintf("%v", i%2 == 0)
-	}).data.(map[string][]bool)
-
-	assert.Equal(t, 2, len(grouped))
-	assert.Equal(t, 3, len(grouped["true"]))
-	assert.Equal(t, 3, len(grouped["false"]))
-
-}
-
-func TestReplaceBool(t *testing.T) {
-
-	v := &Value{data: []bool{bool(true), bool(true), bool(true), bool(true), bool(true), bool(true)}}
-
-	rawArr := v.MustBoolSlice()
-
-	replaced := v.ReplaceBool(func(index int, val bool) bool {
-		if index < len(rawArr)-1 {
-			return rawArr[index+1]
-		}
-		return rawArr[0]
-	})
-
-	replacedArr := replaced.MustBoolSlice()
-	if assert.Equal(t, 6, len(replacedArr)) {
-		assert.Equal(t, replacedArr[0], rawArr[1])
-		assert.Equal(t, replacedArr[1], rawArr[2])
-		assert.Equal(t, replacedArr[2], rawArr[3])
-		assert.Equal(t, replacedArr[3], rawArr[4])
-		assert.Equal(t, replacedArr[4], rawArr[5])
-		assert.Equal(t, replacedArr[5], rawArr[0])
-	}
-
-}
-
-func TestCollectBool(t *testing.T) {
-
-	v := &Value{data: []bool{bool(true), bool(true), bool(true), bool(true), bool(true), bool(true)}}
-
-	collected := v.CollectBool(func(index int, val bool) interface{} {
-		return index
-	})
-
-	collectedArr := collected.MustInterSlice()
-	if assert.Equal(t, 6, len(collectedArr)) {
-		assert.Equal(t, collectedArr[0], 0)
-		assert.Equal(t, collectedArr[1], 1)
-		assert.Equal(t, collectedArr[2], 2)
-		assert.Equal(t, collectedArr[3], 3)
-		assert.Equal(t, collectedArr[4], 4)
-		assert.Equal(t, collectedArr[5], 5)
-	}
-
-}
-
-// ************************************************************
-// TESTS
-// ************************************************************
-
-func TestStr(t *testing.T) {
-
-	val := string("hello")
-	m := map[string]interface{}{"value": val, "nothing": nil}
-	assert.Equal(t, val, New(m).Get("value").Str())
-	assert.Equal(t, val, New(m).Get("value").MustStr())
-	assert.Equal(t, string(""), New(m).Get("nothing").Str())
-	assert.Equal(t, val, New(m).Get("nothing").Str("hello"))
-
-	assert.Panics(t, func() {
-		New(m).Get("age").MustStr()
-	})
-
-}
-
-func TestStrSlice(t *testing.T) {
-
-	val := string("hello")
-	m := map[string]interface{}{"value": []string{val}, "nothing": nil}
-	assert.Equal(t, val, New(m).Get("value").StrSlice()[0])
-	assert.Equal(t, val, New(m).Get("value").MustStrSlice()[0])
-	assert.Equal(t, []string(nil), New(m).Get("nothing").StrSlice())
-	assert.Equal(t, val, New(m).Get("nothing").StrSlice([]string{string("hello")})[0])
-
-	assert.Panics(t, func() {
-		New(m).Get("nothing").MustStrSlice()
-	})
-
-}
-
-func TestIsStr(t *testing.T) {
-
-	var v *Value
-
-	v = &Value{data: string("hello")}
-	assert.True(t, v.IsStr())
-
-	v = &Value{data: []string{string("hello")}}
-	assert.True(t, v.IsStrSlice())
-
-}
-
-func TestEachStr(t *testing.T) {
-
-	v := &Value{data: []string{string("hello"), string("hello"), string("hello"), string("hello"), string("hello")}}
-	count := 0
-	replacedVals := make([]string, 0)
-	assert.Equal(t, v, v.EachStr(func(i int, val string) bool {
-
-		count++
-		replacedVals = append(replacedVals, val)
-
-		// abort early
-		if i == 2 {
-			return false
-		}
-
-		return true
-
-	}))
-
-	assert.Equal(t, count, 3)
-	assert.Equal(t, replacedVals[0], v.MustStrSlice()[0])
-	assert.Equal(t, replacedVals[1], v.MustStrSlice()[1])
-	assert.Equal(t, replacedVals[2], v.MustStrSlice()[2])
-
-}
-
-func TestWhereStr(t *testing.T) {
-
-	v := &Value{data: []string{string("hello"), string("hello"), string("hello"), string("hello"), string("hello"), string("hello")}}
-
-	selected := v.WhereStr(func(i int, val string) bool {
-		return i%2 == 0
-	}).MustStrSlice()
-
-	assert.Equal(t, 3, len(selected))
-
-}
-
-func TestGroupStr(t *testing.T) {
-
-	v := &Value{data: []string{string("hello"), string("hello"), string("hello"), string("hello"), string("hello"), string("hello")}}
-
-	grouped := v.GroupStr(func(i int, val string) string {
-		return fmt.Sprintf("%v", i%2 == 0)
-	}).data.(map[string][]string)
-
-	assert.Equal(t, 2, len(grouped))
-	assert.Equal(t, 3, len(grouped["true"]))
-	assert.Equal(t, 3, len(grouped["false"]))
-
-}
-
-func TestReplaceStr(t *testing.T) {
-
-	v := &Value{data: []string{string("hello"), string("hello"), string("hello"), string("hello"), string("hello"), string("hello")}}
-
-	rawArr := v.MustStrSlice()
-
-	replaced := v.ReplaceStr(func(index int, val string) string {
-		if index < len(rawArr)-1 {
-			return rawArr[index+1]
-		}
-		return rawArr[0]
-	})
-
-	replacedArr := replaced.MustStrSlice()
-	if assert.Equal(t, 6, len(replacedArr)) {
-		assert.Equal(t, replacedArr[0], rawArr[1])
-		assert.Equal(t, replacedArr[1], rawArr[2])
-		assert.Equal(t, replacedArr[2], rawArr[3])
-		assert.Equal(t, replacedArr[3], rawArr[4])
-		assert.Equal(t, replacedArr[4], rawArr[5])
-		assert.Equal(t, replacedArr[5], rawArr[0])
-	}
-
-}
-
-func TestCollectStr(t *testing.T) {
-
-	v := &Value{data: []string{string("hello"), string("hello"), string("hello"), string("hello"), string("hello"), string("hello")}}
-
-	collected := v.CollectStr(func(index int, val string) interface{} {
-		return index
-	})
-
-	collectedArr := collected.MustInterSlice()
-	if assert.Equal(t, 6, len(collectedArr)) {
-		assert.Equal(t, collectedArr[0], 0)
-		assert.Equal(t, collectedArr[1], 1)
-		assert.Equal(t, collectedArr[2], 2)
-		assert.Equal(t, collectedArr[3], 3)
-		assert.Equal(t, collectedArr[4], 4)
-		assert.Equal(t, collectedArr[5], 5)
-	}
-
-}
-
-// ************************************************************
-// TESTS
-// ************************************************************
-
-func TestInt(t *testing.T) {
-
-	val := int(1)
-	m := map[string]interface{}{"value": val, "nothing": nil}
-	assert.Equal(t, val, New(m).Get("value").Int())
-	assert.Equal(t, val, New(m).Get("value").MustInt())
-	assert.Equal(t, int(0), New(m).Get("nothing").Int())
-	assert.Equal(t, val, New(m).Get("nothing").Int(1))
-
-	assert.Panics(t, func() {
-		New(m).Get("age").MustInt()
-	})
-
-}
-
-func TestIntSlice(t *testing.T) {
-
-	val := int(1)
-	m := map[string]interface{}{"value": []int{val}, "nothing": nil}
-	assert.Equal(t, val, New(m).Get("value").IntSlice()[0])
-	assert.Equal(t, val, New(m).Get("value").MustIntSlice()[0])
-	assert.Equal(t, []int(nil), New(m).Get("nothing").IntSlice())
-	assert.Equal(t, val, New(m).Get("nothing").IntSlice([]int{int(1)})[0])
-
-	assert.Panics(t, func() {
-		New(m).Get("nothing").MustIntSlice()
-	})
-
-}
-
-func TestIsInt(t *testing.T) {
-
-	var v *Value
-
-	v = &Value{data: int(1)}
-	assert.True(t, v.IsInt())
-
-	v = &Value{data: []int{int(1)}}
-	assert.True(t, v.IsIntSlice())
-
-}
-
-func TestEachInt(t *testing.T) {
-
-	v := &Value{data: []int{int(1), int(1), int(1), int(1), int(1)}}
-	count := 0
-	replacedVals := make([]int, 0)
-	assert.Equal(t, v, v.EachInt(func(i int, val int) bool {
-
-		count++
-		replacedVals = append(replacedVals, val)
-
-		// abort early
-		if i == 2 {
-			return false
-		}
-
-		return true
-
-	}))
-
-	assert.Equal(t, count, 3)
-	assert.Equal(t, replacedVals[0], v.MustIntSlice()[0])
-	assert.Equal(t, replacedVals[1], v.MustIntSlice()[1])
-	assert.Equal(t, replacedVals[2], v.MustIntSlice()[2])
-
-}
-
-func TestWhereInt(t *testing.T) {
-
-	v := &Value{data: []int{int(1), int(1), int(1), int(1), int(1), int(1)}}
-
-	selected := v.WhereInt(func(i int, val int) bool {
-		return i%2 == 0
-	}).MustIntSlice()
-
-	assert.Equal(t, 3, len(selected))
-
-}
-
-func TestGroupInt(t *testing.T) {
-
-	v := &Value{data: []int{int(1), int(1), int(1), int(1), int(1), int(1)}}
-
-	grouped := v.GroupInt(func(i int, val int) string {
-		return fmt.Sprintf("%v", i%2 == 0)
-	}).data.(map[string][]int)
-
-	assert.Equal(t, 2, len(grouped))
-	assert.Equal(t, 3, len(grouped["true"]))
-	assert.Equal(t, 3, len(grouped["false"]))
-
-}
-
-func TestReplaceInt(t *testing.T) {
-
-	v := &Value{data: []int{int(1), int(1), int(1), int(1), int(1), int(1)}}
-
-	rawArr := v.MustIntSlice()
-
-	replaced := v.ReplaceInt(func(index int, val int) int {
-		if index < len(rawArr)-1 {
-			return rawArr[index+1]
-		}
-		return rawArr[0]
-	})
-
-	replacedArr := replaced.MustIntSlice()
-	if assert.Equal(t, 6, len(replacedArr)) {
-		assert.Equal(t, replacedArr[0], rawArr[1])
-		assert.Equal(t, replacedArr[1], rawArr[2])
-		assert.Equal(t, replacedArr[2], rawArr[3])
-		assert.Equal(t, replacedArr[3], rawArr[4])
-		assert.Equal(t, replacedArr[4], rawArr[5])
-		assert.Equal(t, replacedArr[5], rawArr[0])
-	}
-
-}
-
-func TestCollectInt(t *testing.T) {
-
-	v := &Value{data: []int{int(1), int(1), int(1), int(1), int(1), int(1)}}
-
-	collected := v.CollectInt(func(index int, val int) interface{} {
-		return index
-	})
-
-	collectedArr := collected.MustInterSlice()
-	if assert.Equal(t, 6, len(collectedArr)) {
-		assert.Equal(t, collectedArr[0], 0)
-		assert.Equal(t, collectedArr[1], 1)
-		assert.Equal(t, collectedArr[2], 2)
-		assert.Equal(t, collectedArr[3], 3)
-		assert.Equal(t, collectedArr[4], 4)
-		assert.Equal(t, collectedArr[5], 5)
-	}
-
-}
-
-// ************************************************************
-// TESTS
-// ************************************************************
-
-func TestInt8(t *testing.T) {
-
-	val := int8(1)
-	m := map[string]interface{}{"value": val, "nothing": nil}
-	assert.Equal(t, val, New(m).Get("value").Int8())
-	assert.Equal(t, val, New(m).Get("value").MustInt8())
-	assert.Equal(t, int8(0), New(m).Get("nothing").Int8())
-	assert.Equal(t, val, New(m).Get("nothing").Int8(1))
-
-	assert.Panics(t, func() {
-		New(m).Get("age").MustInt8()
-	})
-
-}
-
-func TestInt8Slice(t *testing.T) {
-
-	val := int8(1)
-	m := map[string]interface{}{"value": []int8{val}, "nothing": nil}
-	assert.Equal(t, val, New(m).Get("value").Int8Slice()[0])
-	assert.Equal(t, val, New(m).Get("value").MustInt8Slice()[0])
-	assert.Equal(t, []int8(nil), New(m).Get("nothing").Int8Slice())
-	assert.Equal(t, val, New(m).Get("nothing").Int8Slice([]int8{int8(1)})[0])
-
-	assert.Panics(t, func() {
-		New(m).Get("nothing").MustInt8Slice()
-	})
-
-}
-
-func TestIsInt8(t *testing.T) {
-
-	var v *Value
-
-	v = &Value{data: int8(1)}
-	assert.True(t, v.IsInt8())
-
-	v = &Value{data: []int8{int8(1)}}
-	assert.True(t, v.IsInt8Slice())
-
-}
-
-func TestEachInt8(t *testing.T) {
-
-	v := &Value{data: []int8{int8(1), int8(1), int8(1), int8(1), int8(1)}}
-	count := 0
-	replacedVals := make([]int8, 0)
-	assert.Equal(t, v, v.EachInt8(func(i int, val int8) bool {
-
-		count++
-		replacedVals = append(replacedVals, val)
-
-		// abort early
-		if i == 2 {
-			return false
-		}
-
-		return true
-
-	}))
-
-	assert.Equal(t, count, 3)
-	assert.Equal(t, replacedVals[0], v.MustInt8Slice()[0])
-	assert.Equal(t, replacedVals[1], v.MustInt8Slice()[1])
-	assert.Equal(t, replacedVals[2], v.MustInt8Slice()[2])
-
-}
-
-func TestWhereInt8(t *testing.T) {
-
-	v := &Value{data: []int8{int8(1), int8(1), int8(1), int8(1), int8(1), int8(1)}}
-
-	selected := v.WhereInt8(func(i int, val int8) bool {
-		return i%2 == 0
-	}).MustInt8Slice()
-
-	assert.Equal(t, 3, len(selected))
-
-}
-
-func TestGroupInt8(t *testing.T) {
-
-	v := &Value{data: []int8{int8(1), int8(1), int8(1), int8(1), int8(1), int8(1)}}
-
-	grouped := v.GroupInt8(func(i int, val int8) string {
-		return fmt.Sprintf("%v", i%2 == 0)
-	}).data.(map[string][]int8)
-
-	assert.Equal(t, 2, len(grouped))
-	assert.Equal(t, 3, len(grouped["true"]))
-	assert.Equal(t, 3, len(grouped["false"]))
-
-}
-
-func TestReplaceInt8(t *testing.T) {
-
-	v := &Value{data: []int8{int8(1), int8(1), int8(1), int8(1), int8(1), int8(1)}}
-
-	rawArr := v.MustInt8Slice()
-
-	replaced := v.ReplaceInt8(func(index int, val int8) int8 {
-		if index < len(rawArr)-1 {
-			return rawArr[index+1]
-		}
-		return rawArr[0]
-	})
-
-	replacedArr := replaced.MustInt8Slice()
-	if assert.Equal(t, 6, len(replacedArr)) {
-		assert.Equal(t, replacedArr[0], rawArr[1])
-		assert.Equal(t, replacedArr[1], rawArr[2])
-		assert.Equal(t, replacedArr[2], rawArr[3])
-		assert.Equal(t, replacedArr[3], rawArr[4])
-		assert.Equal(t, replacedArr[4], rawArr[5])
-		assert.Equal(t, replacedArr[5], rawArr[0])
-	}
-
-}
-
-func TestCollectInt8(t *testing.T) {
-
-	v := &Value{data: []int8{int8(1), int8(1), int8(1), int8(1), int8(1), int8(1)}}
-
-	collected := v.CollectInt8(func(index int, val int8) interface{} {
-		return index
-	})
-
-	collectedArr := collected.MustInterSlice()
-	if assert.Equal(t, 6, len(collectedArr)) {
-		assert.Equal(t, collectedArr[0], 0)
-		assert.Equal(t, collectedArr[1], 1)
-		assert.Equal(t, collectedArr[2], 2)
-		assert.Equal(t, collectedArr[3], 3)
-		assert.Equal(t, collectedArr[4], 4)
-		assert.Equal(t, collectedArr[5], 5)
-	}
-
-}
-
-// ************************************************************
-// TESTS
-// ************************************************************
-
-func TestInt16(t *testing.T) {
-
-	val := int16(1)
-	m := map[string]interface{}{"value": val, "nothing": nil}
-	assert.Equal(t, val, New(m).Get("value").Int16())
-	assert.Equal(t, val, New(m).Get("value").MustInt16())
-	assert.Equal(t, int16(0), New(m).Get("nothing").Int16())
-	assert.Equal(t, val, New(m).Get("nothing").Int16(1))
-
-	assert.Panics(t, func() {
-		New(m).Get("age").MustInt16()
-	})
-
-}
-
-func TestInt16Slice(t *testing.T) {
-
-	val := int16(1)
-	m := map[string]interface{}{"value": []int16{val}, "nothing": nil}
-	assert.Equal(t, val, New(m).Get("value").Int16Slice()[0])
-	assert.Equal(t, val, New(m).Get("value").MustInt16Slice()[0])
-	assert.Equal(t, []int16(nil), New(m).Get("nothing").Int16Slice())
-	assert.Equal(t, val, New(m).Get("nothing").Int16Slice([]int16{int16(1)})[0])
-
-	assert.Panics(t, func() {
-		New(m).Get("nothing").MustInt16Slice()
-	})
-
-}
-
-func TestIsInt16(t *testing.T) {
-
-	var v *Value
-
-	v = &Value{data: int16(1)}
-	assert.True(t, v.IsInt16())
-
-	v = &Value{data: []int16{int16(1)}}
-	assert.True(t, v.IsInt16Slice())
-
-}
-
-func TestEachInt16(t *testing.T) {
-
-	v := &Value{data: []int16{int16(1), int16(1), int16(1), int16(1), int16(1)}}
-	count := 0
-	replacedVals := make([]int16, 0)
-	assert.Equal(t, v, v.EachInt16(func(i int, val int16) bool {
-
-		count++
-		replacedVals = append(replacedVals, val)
-
-		// abort early
-		if i == 2 {
-			return false
-		}
-
-		return true
-
-	}))
-
-	assert.Equal(t, count, 3)
-	assert.Equal(t, replacedVals[0], v.MustInt16Slice()[0])
-	assert.Equal(t, replacedVals[1], v.MustInt16Slice()[1])
-	assert.Equal(t, replacedVals[2], v.MustInt16Slice()[2])
-
-}
-
-func TestWhereInt16(t *testing.T) {
-
-	v := &Value{data: []int16{int16(1), int16(1), int16(1), int16(1), int16(1), int16(1)}}
-
-	selected := v.WhereInt16(func(i int, val int16) bool {
-		return i%2 == 0
-	}).MustInt16Slice()
-
-	assert.Equal(t, 3, len(selected))
-
-}
-
-func TestGroupInt16(t *testing.T) {
-
-	v := &Value{data: []int16{int16(1), int16(1), int16(1), int16(1), int16(1), int16(1)}}
-
-	grouped := v.GroupInt16(func(i int, val int16) string {
-		return fmt.Sprintf("%v", i%2 == 0)
-	}).data.(map[string][]int16)
-
-	assert.Equal(t, 2, len(grouped))
-	assert.Equal(t, 3, len(grouped["true"]))
-	assert.Equal(t, 3, len(grouped["false"]))
-
-}
-
-func TestReplaceInt16(t *testing.T) {
-
-	v := &Value{data: []int16{int16(1), int16(1), int16(1), int16(1), int16(1), int16(1)}}
-
-	rawArr := v.MustInt16Slice()
-
-	replaced := v.ReplaceInt16(func(index int, val int16) int16 {
-		if index < len(rawArr)-1 {
-			return rawArr[index+1]
-		}
-		return rawArr[0]
-	})
-
-	replacedArr := replaced.MustInt16Slice()
-	if assert.Equal(t, 6, len(replacedArr)) {
-		assert.Equal(t, replacedArr[0], rawArr[1])
-		assert.Equal(t, replacedArr[1], rawArr[2])
-		assert.Equal(t, replacedArr[2], rawArr[3])
-		assert.Equal(t, replacedArr[3], rawArr[4])
-		assert.Equal(t, replacedArr[4], rawArr[5])
-		assert.Equal(t, replacedArr[5], rawArr[0])
-	}
-
-}
-
-func TestCollectInt16(t *testing.T) {
-
-	v := &Value{data: []int16{int16(1), int16(1), int16(1), int16(1), int16(1), int16(1)}}
-
-	collected := v.CollectInt16(func(index int, val int16) interface{} {
-		return index
-	})
-
-	collectedArr := collected.MustInterSlice()
-	if assert.Equal(t, 6, len(collectedArr)) {
-		assert.Equal(t, collectedArr[0], 0)
-		assert.Equal(t, collectedArr[1], 1)
-		assert.Equal(t, collectedArr[2], 2)
-		assert.Equal(t, collectedArr[3], 3)
-		assert.Equal(t, collectedArr[4], 4)
-		assert.Equal(t, collectedArr[5], 5)
-	}
-
-}
-
-// ************************************************************
-// TESTS
-// ************************************************************
-
-func TestInt32(t *testing.T) {
-
-	val := int32(1)
-	m := map[string]interface{}{"value": val, "nothing": nil}
-	assert.Equal(t, val, New(m).Get("value").Int32())
-	assert.Equal(t, val, New(m).Get("value").MustInt32())
-	assert.Equal(t, int32(0), New(m).Get("nothing").Int32())
-	assert.Equal(t, val, New(m).Get("nothing").Int32(1))
-
-	assert.Panics(t, func() {
-		New(m).Get("age").MustInt32()
-	})
-
-}
-
-func TestInt32Slice(t *testing.T) {
-
-	val := int32(1)
-	m := map[string]interface{}{"value": []int32{val}, "nothing": nil}
-	assert.Equal(t, val, New(m).Get("value").Int32Slice()[0])
-	assert.Equal(t, val, New(m).Get("value").MustInt32Slice()[0])
-	assert.Equal(t, []int32(nil), New(m).Get("nothing").Int32Slice())
-	assert.Equal(t, val, New(m).Get("nothing").Int32Slice([]int32{int32(1)})[0])
-
-	assert.Panics(t, func() {
-		New(m).Get("nothing").MustInt32Slice()
-	})
-
-}
-
-func TestIsInt32(t *testing.T) {
-
-	var v *Value
-
-	v = &Value{data: int32(1)}
-	assert.True(t, v.IsInt32())
-
-	v = &Value{data: []int32{int32(1)}}
-	assert.True(t, v.IsInt32Slice())
-
-}
-
-func TestEachInt32(t *testing.T) {
-
-	v := &Value{data: []int32{int32(1), int32(1), int32(1), int32(1), int32(1)}}
-	count := 0
-	replacedVals := make([]int32, 0)
-	assert.Equal(t, v, v.EachInt32(func(i int, val int32) bool {
-
-		count++
-		replacedVals = append(replacedVals, val)
-
-		// abort early
-		if i == 2 {
-			return false
-		}
-
-		return true
-
-	}))
-
-	assert.Equal(t, count, 3)
-	assert.Equal(t, replacedVals[0], v.MustInt32Slice()[0])
-	assert.Equal(t, replacedVals[1], v.MustInt32Slice()[1])
-	assert.Equal(t, replacedVals[2], v.MustInt32Slice()[2])
-
-}
-
-func TestWhereInt32(t *testing.T) {
-
-	v := &Value{data: []int32{int32(1), int32(1), int32(1), int32(1), int32(1), int32(1)}}
-
-	selected := v.WhereInt32(func(i int, val int32) bool {
-		return i%2 == 0
-	}).MustInt32Slice()
-
-	assert.Equal(t, 3, len(selected))
-
-}
-
-func TestGroupInt32(t *testing.T) {
-
-	v := &Value{data: []int32{int32(1), int32(1), int32(1), int32(1), int32(1), int32(1)}}
-
-	grouped := v.GroupInt32(func(i int, val int32) string {
-		return fmt.Sprintf("%v", i%2 == 0)
-	}).data.(map[string][]int32)
-
-	assert.Equal(t, 2, len(grouped))
-	assert.Equal(t, 3, len(grouped["true"]))
-	assert.Equal(t, 3, len(grouped["false"]))
-
-}
-
-func TestReplaceInt32(t *testing.T) {
-
-	v := &Value{data: []int32{int32(1), int32(1), int32(1), int32(1), int32(1), int32(1)}}
-
-	rawArr := v.MustInt32Slice()
-
-	replaced := v.ReplaceInt32(func(index int, val int32) int32 {
-		if index < len(rawArr)-1 {
-			return rawArr[index+1]
-		}
-		return rawArr[0]
-	})
-
-	replacedArr := replaced.MustInt32Slice()
-	if assert.Equal(t, 6, len(replacedArr)) {
-		assert.Equal(t, replacedArr[0], rawArr[1])
-		assert.Equal(t, replacedArr[1], rawArr[2])
-		assert.Equal(t, replacedArr[2], rawArr[3])
-		assert.Equal(t, replacedArr[3], rawArr[4])
-		assert.Equal(t, replacedArr[4], rawArr[5])
-		assert.Equal(t, replacedArr[5], rawArr[0])
-	}
-
-}
-
-func TestCollectInt32(t *testing.T) {
-
-	v := &Value{data: []int32{int32(1), int32(1), int32(1), int32(1), int32(1), int32(1)}}
-
-	collected := v.CollectInt32(func(index int, val int32) interface{} {
-		return index
-	})
-
-	collectedArr := collected.MustInterSlice()
-	if assert.Equal(t, 6, len(collectedArr)) {
-		assert.Equal(t, collectedArr[0], 0)
-		assert.Equal(t, collectedArr[1], 1)
-		assert.Equal(t, collectedArr[2], 2)
-		assert.Equal(t, collectedArr[3], 3)
-		assert.Equal(t, collectedArr[4], 4)
-		assert.Equal(t, collectedArr[5], 5)
-	}
-
-}
-
-// ************************************************************
-// TESTS
-// ************************************************************
-
-func TestInt64(t *testing.T) {
-
-	val := int64(1)
-	m := map[string]interface{}{"value": val, "nothing": nil}
-	assert.Equal(t, val, New(m).Get("value").Int64())
-	assert.Equal(t, val, New(m).Get("value").MustInt64())
-	assert.Equal(t, int64(0), New(m).Get("nothing").Int64())
-	assert.Equal(t, val, New(m).Get("nothing").Int64(1))
-
-	assert.Panics(t, func() {
-		New(m).Get("age").MustInt64()
-	})
-
-}
-
-func TestInt64Slice(t *testing.T) {
-
-	val := int64(1)
-	m := map[string]interface{}{"value": []int64{val}, "nothing": nil}
-	assert.Equal(t, val, New(m).Get("value").Int64Slice()[0])
-	assert.Equal(t, val, New(m).Get("value").MustInt64Slice()[0])
-	assert.Equal(t, []int64(nil), New(m).Get("nothing").Int64Slice())
-	assert.Equal(t, val, New(m).Get("nothing").Int64Slice([]int64{int64(1)})[0])
-
-	assert.Panics(t, func() {
-		New(m).Get("nothing").MustInt64Slice()
-	})
-
-}
-
-func TestIsInt64(t *testing.T) {
-
-	var v *Value
-
-	v = &Value{data: int64(1)}
-	assert.True(t, v.IsInt64())
-
-	v = &Value{data: []int64{int64(1)}}
-	assert.True(t, v.IsInt64Slice())
-
-}
-
-func TestEachInt64(t *testing.T) {
-
-	v := &Value{data: []int64{int64(1), int64(1), int64(1), int64(1), int64(1)}}
-	count := 0
-	replacedVals := make([]int64, 0)
-	assert.Equal(t, v, v.EachInt64(func(i int, val int64) bool {
-
-		count++
-		replacedVals = append(replacedVals, val)
-
-		// abort early
-		if i == 2 {
-			return false
-		}
-
-		return true
-
-	}))
-
-	assert.Equal(t, count, 3)
-	assert.Equal(t, replacedVals[0], v.MustInt64Slice()[0])
-	assert.Equal(t, replacedVals[1], v.MustInt64Slice()[1])
-	assert.Equal(t, replacedVals[2], v.MustInt64Slice()[2])
-
-}
-
-func TestWhereInt64(t *testing.T) {
-
-	v := &Value{data: []int64{int64(1), int64(1), int64(1), int64(1), int64(1), int64(1)}}
-
-	selected := v.WhereInt64(func(i int, val int64) bool {
-		return i%2 == 0
-	}).MustInt64Slice()
-
-	assert.Equal(t, 3, len(selected))
-
-}
-
-func TestGroupInt64(t *testing.T) {
-
-	v := &Value{data: []int64{int64(1), int64(1), int64(1), int64(1), int64(1), int64(1)}}
-
-	grouped := v.GroupInt64(func(i int, val int64) string {
-		return fmt.Sprintf("%v", i%2 == 0)
-	}).data.(map[string][]int64)
-
-	assert.Equal(t, 2, len(grouped))
-	assert.Equal(t, 3, len(grouped["true"]))
-	assert.Equal(t, 3, len(grouped["false"]))
-
-}
-
-func TestReplaceInt64(t *testing.T) {
-
-	v := &Value{data: []int64{int64(1), int64(1), int64(1), int64(1), int64(1), int64(1)}}
-
-	rawArr := v.MustInt64Slice()
-
-	replaced := v.ReplaceInt64(func(index int, val int64) int64 {
-		if index < len(rawArr)-1 {
-			return rawArr[index+1]
-		}
-		return rawArr[0]
-	})
-
-	replacedArr := replaced.MustInt64Slice()
-	if assert.Equal(t, 6, len(replacedArr)) {
-		assert.Equal(t, replacedArr[0], rawArr[1])
-		assert.Equal(t, replacedArr[1], rawArr[2])
-		assert.Equal(t, replacedArr[2], rawArr[3])
-		assert.Equal(t, replacedArr[3], rawArr[4])
-		assert.Equal(t, replacedArr[4], rawArr[5])
-		assert.Equal(t, replacedArr[5], rawArr[0])
-	}
-
-}
-
-func TestCollectInt64(t *testing.T) {
-
-	v := &Value{data: []int64{int64(1), int64(1), int64(1), int64(1), int64(1), int64(1)}}
-
-	collected := v.CollectInt64(func(index int, val int64) interface{} {
-		return index
-	})
-
-	collectedArr := collected.MustInterSlice()
-	if assert.Equal(t, 6, len(collectedArr)) {
-		assert.Equal(t, collectedArr[0], 0)
-		assert.Equal(t, collectedArr[1], 1)
-		assert.Equal(t, collectedArr[2], 2)
-		assert.Equal(t, collectedArr[3], 3)
-		assert.Equal(t, collectedArr[4], 4)
-		assert.Equal(t, collectedArr[5], 5)
-	}
-
-}
-
-// ************************************************************
-// TESTS
-// ************************************************************
-
-func TestUint(t *testing.T) {
-
-	val := uint(1)
-	m := map[string]interface{}{"value": val, "nothing": nil}
-	assert.Equal(t, val, New(m).Get("value").Uint())
-	assert.Equal(t, val, New(m).Get("value").MustUint())
-	assert.Equal(t, uint(0), New(m).Get("nothing").Uint())
-	assert.Equal(t, val, New(m).Get("nothing").Uint(1))
-
-	assert.Panics(t, func() {
-		New(m).Get("age").MustUint()
-	})
-
-}
-
-func TestUintSlice(t *testing.T) {
-
-	val := uint(1)
-	m := map[string]interface{}{"value": []uint{val}, "nothing": nil}
-	assert.Equal(t, val, New(m).Get("value").UintSlice()[0])
-	assert.Equal(t, val, New(m).Get("value").MustUintSlice()[0])
-	assert.Equal(t, []uint(nil), New(m).Get("nothing").UintSlice())
-	assert.Equal(t, val, New(m).Get("nothing").UintSlice([]uint{uint(1)})[0])
-
-	assert.Panics(t, func() {
-		New(m).Get("nothing").MustUintSlice()
-	})
-
-}
-
-func TestIsUint(t *testing.T) {
-
-	var v *Value
-
-	v = &Value{data: uint(1)}
-	assert.True(t, v.IsUint())
-
-	v = &Value{data: []uint{uint(1)}}
-	assert.True(t, v.IsUintSlice())
-
-}
-
-func TestEachUint(t *testing.T) {
-
-	v := &Value{data: []uint{uint(1), uint(1), uint(1), uint(1), uint(1)}}
-	count := 0
-	replacedVals := make([]uint, 0)
-	assert.Equal(t, v, v.EachUint(func(i int, val uint) bool {
-
-		count++
-		replacedVals = append(replacedVals, val)
-
-		// abort early
-		if i == 2 {
-			return false
-		}
-
-		return true
-
-	}))
-
-	assert.Equal(t, count, 3)
-	assert.Equal(t, replacedVals[0], v.MustUintSlice()[0])
-	assert.Equal(t, replacedVals[1], v.MustUintSlice()[1])
-	assert.Equal(t, replacedVals[2], v.MustUintSlice()[2])
-
-}
-
-func TestWhereUint(t *testing.T) {
-
-	v := &Value{data: []uint{uint(1), uint(1), uint(1), uint(1), uint(1), uint(1)}}
-
-	selected := v.WhereUint(func(i int, val uint) bool {
-		return i%2 == 0
-	}).MustUintSlice()
-
-	assert.Equal(t, 3, len(selected))
-
-}
-
-func TestGroupUint(t *testing.T) {
-
-	v := &Value{data: []uint{uint(1), uint(1), uint(1), uint(1), uint(1), uint(1)}}
-
-	grouped := v.GroupUint(func(i int, val uint) string {
-		return fmt.Sprintf("%v", i%2 == 0)
-	}).data.(map[string][]uint)
-
-	assert.Equal(t, 2, len(grouped))
-	assert.Equal(t, 3, len(grouped["true"]))
-	assert.Equal(t, 3, len(grouped["false"]))
-
-}
-
-func TestReplaceUint(t *testing.T) {
-
-	v := &Value{data: []uint{uint(1), uint(1), uint(1), uint(1), uint(1), uint(1)}}
-
-	rawArr := v.MustUintSlice()
-
-	replaced := v.ReplaceUint(func(index int, val uint) uint {
-		if index < len(rawArr)-1 {
-			return rawArr[index+1]
-		}
-		return rawArr[0]
-	})
-
-	replacedArr := replaced.MustUintSlice()
-	if assert.Equal(t, 6, len(replacedArr)) {
-		assert.Equal(t, replacedArr[0], rawArr[1])
-		assert.Equal(t, replacedArr[1], rawArr[2])
-		assert.Equal(t, replacedArr[2], rawArr[3])
-		assert.Equal(t, replacedArr[3], rawArr[4])
-		assert.Equal(t, replacedArr[4], rawArr[5])
-		assert.Equal(t, replacedArr[5], rawArr[0])
-	}
-
-}
-
-func TestCollectUint(t *testing.T) {
-
-	v := &Value{data: []uint{uint(1), uint(1), uint(1), uint(1), uint(1), uint(1)}}
-
-	collected := v.CollectUint(func(index int, val uint) interface{} {
-		return index
-	})
-
-	collectedArr := collected.MustInterSlice()
-	if assert.Equal(t, 6, len(collectedArr)) {
-		assert.Equal(t, collectedArr[0], 0)
-		assert.Equal(t, collectedArr[1], 1)
-		assert.Equal(t, collectedArr[2], 2)
-		assert.Equal(t, collectedArr[3], 3)
-		assert.Equal(t, collectedArr[4], 4)
-		assert.Equal(t, collectedArr[5], 5)
-	}
-
-}
-
-// ************************************************************
-// TESTS
-// ************************************************************
-
-func TestUint8(t *testing.T) {
-
-	val := uint8(1)
-	m := map[string]interface{}{"value": val, "nothing": nil}
-	assert.Equal(t, val, New(m).Get("value").Uint8())
-	assert.Equal(t, val, New(m).Get("value").MustUint8())
-	assert.Equal(t, uint8(0), New(m).Get("nothing").Uint8())
-	assert.Equal(t, val, New(m).Get("nothing").Uint8(1))
-
-	assert.Panics(t, func() {
-		New(m).Get("age").MustUint8()
-	})
-
-}
-
-func TestUint8Slice(t *testing.T) {
-
-	val := uint8(1)
-	m := map[string]interface{}{"value": []uint8{val}, "nothing": nil}
-	assert.Equal(t, val, New(m).Get("value").Uint8Slice()[0])
-	assert.Equal(t, val, New(m).Get("value").MustUint8Slice()[0])
-	assert.Equal(t, []uint8(nil), New(m).Get("nothing").Uint8Slice())
-	assert.Equal(t, val, New(m).Get("nothing").Uint8Slice([]uint8{uint8(1)})[0])
-
-	assert.Panics(t, func() {
-		New(m).Get("nothing").MustUint8Slice()
-	})
-
-}
-
-func TestIsUint8(t *testing.T) {
-
-	var v *Value
-
-	v = &Value{data: uint8(1)}
-	assert.True(t, v.IsUint8())
-
-	v = &Value{data: []uint8{uint8(1)}}
-	assert.True(t, v.IsUint8Slice())
-
-}
-
-func TestEachUint8(t *testing.T) {
-
-	v := &Value{data: []uint8{uint8(1), uint8(1), uint8(1), uint8(1), uint8(1)}}
-	count := 0
-	replacedVals := make([]uint8, 0)
-	assert.Equal(t, v, v.EachUint8(func(i int, val uint8) bool {
-
-		count++
-		replacedVals = append(replacedVals, val)
-
-		// abort early
-		if i == 2 {
-			return false
-		}
-
-		return true
-
-	}))
-
-	assert.Equal(t, count, 3)
-	assert.Equal(t, replacedVals[0], v.MustUint8Slice()[0])
-	assert.Equal(t, replacedVals[1], v.MustUint8Slice()[1])
-	assert.Equal(t, replacedVals[2], v.MustUint8Slice()[2])
-
-}
-
-func TestWhereUint8(t *testing.T) {
-
-	v := &Value{data: []uint8{uint8(1), uint8(1), uint8(1), uint8(1), uint8(1), uint8(1)}}
-
-	selected := v.WhereUint8(func(i int, val uint8) bool {
-		return i%2 == 0
-	}).MustUint8Slice()
-
-	assert.Equal(t, 3, len(selected))
-
-}
-
-func TestGroupUint8(t *testing.T) {
-
-	v := &Value{data: []uint8{uint8(1), uint8(1), uint8(1), uint8(1), uint8(1), uint8(1)}}
-
-	grouped := v.GroupUint8(func(i int, val uint8) string {
-		return fmt.Sprintf("%v", i%2 == 0)
-	}).data.(map[string][]uint8)
-
-	assert.Equal(t, 2, len(grouped))
-	assert.Equal(t, 3, len(grouped["true"]))
-	assert.Equal(t, 3, len(grouped["false"]))
-
-}
-
-func TestReplaceUint8(t *testing.T) {
-
-	v := &Value{data: []uint8{uint8(1), uint8(1), uint8(1), uint8(1), uint8(1), uint8(1)}}
-
-	rawArr := v.MustUint8Slice()
-
-	replaced := v.ReplaceUint8(func(index int, val uint8) uint8 {
-		if index < len(rawArr)-1 {
-			return rawArr[index+1]
-		}
-		return rawArr[0]
-	})
-
-	replacedArr := replaced.MustUint8Slice()
-	if assert.Equal(t, 6, len(replacedArr)) {
-		assert.Equal(t, replacedArr[0], rawArr[1])
-		assert.Equal(t, replacedArr[1], rawArr[2])
-		assert.Equal(t, replacedArr[2], rawArr[3])
-		assert.Equal(t, replacedArr[3], rawArr[4])
-		assert.Equal(t, replacedArr[4], rawArr[5])
-		assert.Equal(t, replacedArr[5], rawArr[0])
-	}
-
-}
-
-func TestCollectUint8(t *testing.T) {
-
-	v := &Value{data: []uint8{uint8(1), uint8(1), uint8(1), uint8(1), uint8(1), uint8(1)}}
-
-	collected := v.CollectUint8(func(index int, val uint8) interface{} {
-		return index
-	})
-
-	collectedArr := collected.MustInterSlice()
-	if assert.Equal(t, 6, len(collectedArr)) {
-		assert.Equal(t, collectedArr[0], 0)
-		assert.Equal(t, collectedArr[1], 1)
-		assert.Equal(t, collectedArr[2], 2)
-		assert.Equal(t, collectedArr[3], 3)
-		assert.Equal(t, collectedArr[4], 4)
-		assert.Equal(t, collectedArr[5], 5)
-	}
-
-}
-
-// ************************************************************
-// TESTS
-// ************************************************************
-
-func TestUint16(t *testing.T) {
-
-	val := uint16(1)
-	m := map[string]interface{}{"value": val, "nothing": nil}
-	assert.Equal(t, val, New(m).Get("value").Uint16())
-	assert.Equal(t, val, New(m).Get("value").MustUint16())
-	assert.Equal(t, uint16(0), New(m).Get("nothing").Uint16())
-	assert.Equal(t, val, New(m).Get("nothing").Uint16(1))
-
-	assert.Panics(t, func() {
-		New(m).Get("age").MustUint16()
-	})
-
-}
-
-func TestUint16Slice(t *testing.T) {
-
-	val := uint16(1)
-	m := map[string]interface{}{"value": []uint16{val}, "nothing": nil}
-	assert.Equal(t, val, New(m).Get("value").Uint16Slice()[0])
-	assert.Equal(t, val, New(m).Get("value").MustUint16Slice()[0])
-	assert.Equal(t, []uint16(nil), New(m).Get("nothing").Uint16Slice())
-	assert.Equal(t, val, New(m).Get("nothing").Uint16Slice([]uint16{uint16(1)})[0])
-
-	assert.Panics(t, func() {
-		New(m).Get("nothing").MustUint16Slice()
-	})
-
-}
-
-func TestIsUint16(t *testing.T) {
-
-	var v *Value
-
-	v = &Value{data: uint16(1)}
-	assert.True(t, v.IsUint16())
-
-	v = &Value{data: []uint16{uint16(1)}}
-	assert.True(t, v.IsUint16Slice())
-
-}
-
-func TestEachUint16(t *testing.T) {
-
-	v := &Value{data: []uint16{uint16(1), uint16(1), uint16(1), uint16(1), uint16(1)}}
-	count := 0
-	replacedVals := make([]uint16, 0)
-	assert.Equal(t, v, v.EachUint16(func(i int, val uint16) bool {
-
-		count++
-		replacedVals = append(replacedVals, val)
-
-		// abort early
-		if i == 2 {
-			return false
-		}
-
-		return true
-
-	}))
-
-	assert.Equal(t, count, 3)
-	assert.Equal(t, replacedVals[0], v.MustUint16Slice()[0])
-	assert.Equal(t, replacedVals[1], v.MustUint16Slice()[1])
-	assert.Equal(t, replacedVals[2], v.MustUint16Slice()[2])
-
-}
-
-func TestWhereUint16(t *testing.T) {
-
-	v := &Value{data: []uint16{uint16(1), uint16(1), uint16(1), uint16(1), uint16(1), uint16(1)}}
-
-	selected := v.WhereUint16(func(i int, val uint16) bool {
-		return i%2 == 0
-	}).MustUint16Slice()
-
-	assert.Equal(t, 3, len(selected))
-
-}
-
-func TestGroupUint16(t *testing.T) {
-
-	v := &Value{data: []uint16{uint16(1), uint16(1), uint16(1), uint16(1), uint16(1), uint16(1)}}
-
-	grouped := v.GroupUint16(func(i int, val uint16) string {
-		return fmt.Sprintf("%v", i%2 == 0)
-	}).data.(map[string][]uint16)
-
-	assert.Equal(t, 2, len(grouped))
-	assert.Equal(t, 3, len(grouped["true"]))
-	assert.Equal(t, 3, len(grouped["false"]))
-
-}
-
-func TestReplaceUint16(t *testing.T) {
-
-	v := &Value{data: []uint16{uint16(1), uint16(1), uint16(1), uint16(1), uint16(1), uint16(1)}}
-
-	rawArr := v.MustUint16Slice()
-
-	replaced := v.ReplaceUint16(func(index int, val uint16) uint16 {
-		if index < len(rawArr)-1 {
-			return rawArr[index+1]
-		}
-		return rawArr[0]
-	})
-
-	replacedArr := replaced.MustUint16Slice()
-	if assert.Equal(t, 6, len(replacedArr)) {
-		assert.Equal(t, replacedArr[0], rawArr[1])
-		assert.Equal(t, replacedArr[1], rawArr[2])
-		assert.Equal(t, replacedArr[2], rawArr[3])
-		assert.Equal(t, replacedArr[3], rawArr[4])
-		assert.Equal(t, replacedArr[4], rawArr[5])
-		assert.Equal(t, replacedArr[5], rawArr[0])
-	}
-
-}
-
-func TestCollectUint16(t *testing.T) {
-
-	v := &Value{data: []uint16{uint16(1), uint16(1), uint16(1), uint16(1), uint16(1), uint16(1)}}
-
-	collected := v.CollectUint16(func(index int, val uint16) interface{} {
-		return index
-	})
-
-	collectedArr := collected.MustInterSlice()
-	if assert.Equal(t, 6, len(collectedArr)) {
-		assert.Equal(t, collectedArr[0], 0)
-		assert.Equal(t, collectedArr[1], 1)
-		assert.Equal(t, collectedArr[2], 2)
-		assert.Equal(t, collectedArr[3], 3)
-		assert.Equal(t, collectedArr[4], 4)
-		assert.Equal(t, collectedArr[5], 5)
-	}
-
-}
-
-// ************************************************************
-// TESTS
-// ************************************************************
-
-func TestUint32(t *testing.T) {
-
-	val := uint32(1)
-	m := map[string]interface{}{"value": val, "nothing": nil}
-	assert.Equal(t, val, New(m).Get("value").Uint32())
-	assert.Equal(t, val, New(m).Get("value").MustUint32())
-	assert.Equal(t, uint32(0), New(m).Get("nothing").Uint32())
-	assert.Equal(t, val, New(m).Get("nothing").Uint32(1))
-
-	assert.Panics(t, func() {
-		New(m).Get("age").MustUint32()
-	})
-
-}
-
-func TestUint32Slice(t *testing.T) {
-
-	val := uint32(1)
-	m := map[string]interface{}{"value": []uint32{val}, "nothing": nil}
-	assert.Equal(t, val, New(m).Get("value").Uint32Slice()[0])
-	assert.Equal(t, val, New(m).Get("value").MustUint32Slice()[0])
-	assert.Equal(t, []uint32(nil), New(m).Get("nothing").Uint32Slice())
-	assert.Equal(t, val, New(m).Get("nothing").Uint32Slice([]uint32{uint32(1)})[0])
-
-	assert.Panics(t, func() {
-		New(m).Get("nothing").MustUint32Slice()
-	})
-
-}
-
-func TestIsUint32(t *testing.T) {
-
-	var v *Value
-
-	v = &Value{data: uint32(1)}
-	assert.True(t, v.IsUint32())
-
-	v = &Value{data: []uint32{uint32(1)}}
-	assert.True(t, v.IsUint32Slice())
-
-}
-
-func TestEachUint32(t *testing.T) {
-
-	v := &Value{data: []uint32{uint32(1), uint32(1), uint32(1), uint32(1), uint32(1)}}
-	count := 0
-	replacedVals := make([]uint32, 0)
-	assert.Equal(t, v, v.EachUint32(func(i int, val uint32) bool {
-
-		count++
-		replacedVals = append(replacedVals, val)
-
-		// abort early
-		if i == 2 {
-			return false
-		}
-
-		return true
-
-	}))
-
-	assert.Equal(t, count, 3)
-	assert.Equal(t, replacedVals[0], v.MustUint32Slice()[0])
-	assert.Equal(t, replacedVals[1], v.MustUint32Slice()[1])
-	assert.Equal(t, replacedVals[2], v.MustUint32Slice()[2])
-
-}
-
-func TestWhereUint32(t *testing.T) {
-
-	v := &Value{data: []uint32{uint32(1), uint32(1), uint32(1), uint32(1), uint32(1), uint32(1)}}
-
-	selected := v.WhereUint32(func(i int, val uint32) bool {
-		return i%2 == 0
-	}).MustUint32Slice()
-
-	assert.Equal(t, 3, len(selected))
-
-}
-
-func TestGroupUint32(t *testing.T) {
-
-	v := &Value{data: []uint32{uint32(1), uint32(1), uint32(1), uint32(1), uint32(1), uint32(1)}}
-
-	grouped := v.GroupUint32(func(i int, val uint32) string {
-		return fmt.Sprintf("%v", i%2 == 0)
-	}).data.(map[string][]uint32)
-
-	assert.Equal(t, 2, len(grouped))
-	assert.Equal(t, 3, len(grouped["true"]))
-	assert.Equal(t, 3, len(grouped["false"]))
-
-}
-
-func TestReplaceUint32(t *testing.T) {
-
-	v := &Value{data: []uint32{uint32(1), uint32(1), uint32(1), uint32(1), uint32(1), uint32(1)}}
-
-	rawArr := v.MustUint32Slice()
-
-	replaced := v.ReplaceUint32(func(index int, val uint32) uint32 {
-		if index < len(rawArr)-1 {
-			return rawArr[index+1]
-		}
-		return rawArr[0]
-	})
-
-	replacedArr := replaced.MustUint32Slice()
-	if assert.Equal(t, 6, len(replacedArr)) {
-		assert.Equal(t, replacedArr[0], rawArr[1])
-		assert.Equal(t, replacedArr[1], rawArr[2])
-		assert.Equal(t, replacedArr[2], rawArr[3])
-		assert.Equal(t, replacedArr[3], rawArr[4])
-		assert.Equal(t, replacedArr[4], rawArr[5])
-		assert.Equal(t, replacedArr[5], rawArr[0])
-	}
-
-}
-
-func TestCollectUint32(t *testing.T) {
-
-	v := &Value{data: []uint32{uint32(1), uint32(1), uint32(1), uint32(1), uint32(1), uint32(1)}}
-
-	collected := v.CollectUint32(func(index int, val uint32) interface{} {
-		return index
-	})
-
-	collectedArr := collected.MustInterSlice()
-	if assert.Equal(t, 6, len(collectedArr)) {
-		assert.Equal(t, collectedArr[0], 0)
-		assert.Equal(t, collectedArr[1], 1)
-		assert.Equal(t, collectedArr[2], 2)
-		assert.Equal(t, collectedArr[3], 3)
-		assert.Equal(t, collectedArr[4], 4)
-		assert.Equal(t, collectedArr[5], 5)
-	}
-
-}
-
-// ************************************************************
-// TESTS
-// ************************************************************
-
-func TestUint64(t *testing.T) {
-
-	val := uint64(1)
-	m := map[string]interface{}{"value": val, "nothing": nil}
-	assert.Equal(t, val, New(m).Get("value").Uint64())
-	assert.Equal(t, val, New(m).Get("value").MustUint64())
-	assert.Equal(t, uint64(0), New(m).Get("nothing").Uint64())
-	assert.Equal(t, val, New(m).Get("nothing").Uint64(1))
-
-	assert.Panics(t, func() {
-		New(m).Get("age").MustUint64()
-	})
-
-}
-
-func TestUint64Slice(t *testing.T) {
-
-	val := uint64(1)
-	m := map[string]interface{}{"value": []uint64{val}, "nothing": nil}
-	assert.Equal(t, val, New(m).Get("value").Uint64Slice()[0])
-	assert.Equal(t, val, New(m).Get("value").MustUint64Slice()[0])
-	assert.Equal(t, []uint64(nil), New(m).Get("nothing").Uint64Slice())
-	assert.Equal(t, val, New(m).Get("nothing").Uint64Slice([]uint64{uint64(1)})[0])
-
-	assert.Panics(t, func() {
-		New(m).Get("nothing").MustUint64Slice()
-	})
-
-}
-
-func TestIsUint64(t *testing.T) {
-
-	var v *Value
-
-	v = &Value{data: uint64(1)}
-	assert.True(t, v.IsUint64())
-
-	v = &Value{data: []uint64{uint64(1)}}
-	assert.True(t, v.IsUint64Slice())
-
-}
-
-func TestEachUint64(t *testing.T) {
-
-	v := &Value{data: []uint64{uint64(1), uint64(1), uint64(1), uint64(1), uint64(1)}}
-	count := 0
-	replacedVals := make([]uint64, 0)
-	assert.Equal(t, v, v.EachUint64(func(i int, val uint64) bool {
-
-		count++
-		replacedVals = append(replacedVals, val)
-
-		// abort early
-		if i == 2 {
-			return false
-		}
-
-		return true
-
-	}))
-
-	assert.Equal(t, count, 3)
-	assert.Equal(t, replacedVals[0], v.MustUint64Slice()[0])
-	assert.Equal(t, replacedVals[1], v.MustUint64Slice()[1])
-	assert.Equal(t, replacedVals[2], v.MustUint64Slice()[2])
-
-}
-
-func TestWhereUint64(t *testing.T) {
-
-	v := &Value{data: []uint64{uint64(1), uint64(1), uint64(1), uint64(1), uint64(1), uint64(1)}}
-
-	selected := v.WhereUint64(func(i int, val uint64) bool {
-		return i%2 == 0
-	}).MustUint64Slice()
-
-	assert.Equal(t, 3, len(selected))
-
-}
-
-func TestGroupUint64(t *testing.T) {
-
-	v := &Value{data: []uint64{uint64(1), uint64(1), uint64(1), uint64(1), uint64(1), uint64(1)}}
-
-	grouped := v.GroupUint64(func(i int, val uint64) string {
-		return fmt.Sprintf("%v", i%2 == 0)
-	}).data.(map[string][]uint64)
-
-	assert.Equal(t, 2, len(grouped))
-	assert.Equal(t, 3, len(grouped["true"]))
-	assert.Equal(t, 3, len(grouped["false"]))
-
-}
-
-func TestReplaceUint64(t *testing.T) {
-
-	v := &Value{data: []uint64{uint64(1), uint64(1), uint64(1), uint64(1), uint64(1), uint64(1)}}
-
-	rawArr := v.MustUint64Slice()
-
-	replaced := v.ReplaceUint64(func(index int, val uint64) uint64 {
-		if index < len(rawArr)-1 {
-			return rawArr[index+1]
-		}
-		return rawArr[0]
-	})
-
-	replacedArr := replaced.MustUint64Slice()
-	if assert.Equal(t, 6, len(replacedArr)) {
-		assert.Equal(t, replacedArr[0], rawArr[1])
-		assert.Equal(t, replacedArr[1], rawArr[2])
-		assert.Equal(t, replacedArr[2], rawArr[3])
-		assert.Equal(t, replacedArr[3], rawArr[4])
-		assert.Equal(t, replacedArr[4], rawArr[5])
-		assert.Equal(t, replacedArr[5], rawArr[0])
-	}
-
-}
-
-func TestCollectUint64(t *testing.T) {
-
-	v := &Value{data: []uint64{uint64(1), uint64(1), uint64(1), uint64(1), uint64(1), uint64(1)}}
-
-	collected := v.CollectUint64(func(index int, val uint64) interface{} {
-		return index
-	})
-
-	collectedArr := collected.MustInterSlice()
-	if assert.Equal(t, 6, len(collectedArr)) {
-		assert.Equal(t, collectedArr[0], 0)
-		assert.Equal(t, collectedArr[1], 1)
-		assert.Equal(t, collectedArr[2], 2)
-		assert.Equal(t, collectedArr[3], 3)
-		assert.Equal(t, collectedArr[4], 4)
-		assert.Equal(t, collectedArr[5], 5)
-	}
-
-}
-
-// ************************************************************
-// TESTS
-// ************************************************************
-
-func TestUintptr(t *testing.T) {
-
-	val := uintptr(1)
-	m := map[string]interface{}{"value": val, "nothing": nil}
-	assert.Equal(t, val, New(m).Get("value").Uintptr())
-	assert.Equal(t, val, New(m).Get("value").MustUintptr())
-	assert.Equal(t, uintptr(0), New(m).Get("nothing").Uintptr())
-	assert.Equal(t, val, New(m).Get("nothing").Uintptr(1))
-
-	assert.Panics(t, func() {
-		New(m).Get("age").MustUintptr()
-	})
-
-}
-
-func TestUintptrSlice(t *testing.T) {
-
-	val := uintptr(1)
-	m := map[string]interface{}{"value": []uintptr{val}, "nothing": nil}
-	assert.Equal(t, val, New(m).Get("value").UintptrSlice()[0])
-	assert.Equal(t, val, New(m).Get("value").MustUintptrSlice()[0])
-	assert.Equal(t, []uintptr(nil), New(m).Get("nothing").UintptrSlice())
-	assert.Equal(t, val, New(m).Get("nothing").UintptrSlice([]uintptr{uintptr(1)})[0])
-
-	assert.Panics(t, func() {
-		New(m).Get("nothing").MustUintptrSlice()
-	})
-
-}
-
-func TestIsUintptr(t *testing.T) {
-
-	var v *Value
-
-	v = &Value{data: uintptr(1)}
-	assert.True(t, v.IsUintptr())
-
-	v = &Value{data: []uintptr{uintptr(1)}}
-	assert.True(t, v.IsUintptrSlice())
-
-}
-
-func TestEachUintptr(t *testing.T) {
-
-	v := &Value{data: []uintptr{uintptr(1), uintptr(1), uintptr(1), uintptr(1), uintptr(1)}}
-	count := 0
-	replacedVals := make([]uintptr, 0)
-	assert.Equal(t, v, v.EachUintptr(func(i int, val uintptr) bool {
-
-		count++
-		replacedVals = append(replacedVals, val)
-
-		// abort early
-		if i == 2 {
-			return false
-		}
-
-		return true
-
-	}))
-
-	assert.Equal(t, count, 3)
-	assert.Equal(t, replacedVals[0], v.MustUintptrSlice()[0])
-	assert.Equal(t, replacedVals[1], v.MustUintptrSlice()[1])
-	assert.Equal(t, replacedVals[2], v.MustUintptrSlice()[2])
-
-}
-
-func TestWhereUintptr(t *testing.T) {
-
-	v := &Value{data: []uintptr{uintptr(1), uintptr(1), uintptr(1), uintptr(1), uintptr(1), uintptr(1)}}
-
-	selected := v.WhereUintptr(func(i int, val uintptr) bool {
-		return i%2 == 0
-	}).MustUintptrSlice()
-
-	assert.Equal(t, 3, len(selected))
-
-}
-
-func TestGroupUintptr(t *testing.T) {
-
-	v := &Value{data: []uintptr{uintptr(1), uintptr(1), uintptr(1), uintptr(1), uintptr(1), uintptr(1)}}
-
-	grouped := v.GroupUintptr(func(i int, val uintptr) string {
-		return fmt.Sprintf("%v", i%2 == 0)
-	}).data.(map[string][]uintptr)
-
-	assert.Equal(t, 2, len(grouped))
-	assert.Equal(t, 3, len(grouped["true"]))
-	assert.Equal(t, 3, len(grouped["false"]))
-
-}
-
-func TestReplaceUintptr(t *testing.T) {
-
-	v := &Value{data: []uintptr{uintptr(1), uintptr(1), uintptr(1), uintptr(1), uintptr(1), uintptr(1)}}
-
-	rawArr := v.MustUintptrSlice()
-
-	replaced := v.ReplaceUintptr(func(index int, val uintptr) uintptr {
-		if index < len(rawArr)-1 {
-			return rawArr[index+1]
-		}
-		return rawArr[0]
-	})
-
-	replacedArr := replaced.MustUintptrSlice()
-	if assert.Equal(t, 6, len(replacedArr)) {
-		assert.Equal(t, replacedArr[0], rawArr[1])
-		assert.Equal(t, replacedArr[1], rawArr[2])
-		assert.Equal(t, replacedArr[2], rawArr[3])
-		assert.Equal(t, replacedArr[3], rawArr[4])
-		assert.Equal(t, replacedArr[4], rawArr[5])
-		assert.Equal(t, replacedArr[5], rawArr[0])
-	}
-
-}
-
-func TestCollectUintptr(t *testing.T) {
-
-	v := &Value{data: []uintptr{uintptr(1), uintptr(1), uintptr(1), uintptr(1), uintptr(1), uintptr(1)}}
-
-	collected := v.CollectUintptr(func(index int, val uintptr) interface{} {
-		return index
-	})
-
-	collectedArr := collected.MustInterSlice()
-	if assert.Equal(t, 6, len(collectedArr)) {
-		assert.Equal(t, collectedArr[0], 0)
-		assert.Equal(t, collectedArr[1], 1)
-		assert.Equal(t, collectedArr[2], 2)
-		assert.Equal(t, collectedArr[3], 3)
-		assert.Equal(t, collectedArr[4], 4)
-		assert.Equal(t, collectedArr[5], 5)
-	}
-
-}
-
-// ************************************************************
-// TESTS
-// ************************************************************
-
-func TestFloat32(t *testing.T) {
-
-	val := float32(1)
-	m := map[string]interface{}{"value": val, "nothing": nil}
-	assert.Equal(t, val, New(m).Get("value").Float32())
-	assert.Equal(t, val, New(m).Get("value").MustFloat32())
-	assert.Equal(t, float32(0), New(m).Get("nothing").Float32())
-	assert.Equal(t, val, New(m).Get("nothing").Float32(1))
-
-	assert.Panics(t, func() {
-		New(m).Get("age").MustFloat32()
-	})
-
-}
-
-func TestFloat32Slice(t *testing.T) {
-
-	val := float32(1)
-	m := map[string]interface{}{"value": []float32{val}, "nothing": nil}
-	assert.Equal(t, val, New(m).Get("value").Float32Slice()[0])
-	assert.Equal(t, val, New(m).Get("value").MustFloat32Slice()[0])
-	assert.Equal(t, []float32(nil), New(m).Get("nothing").Float32Slice())
-	assert.Equal(t, val, New(m).Get("nothing").Float32Slice([]float32{float32(1)})[0])
-
-	assert.Panics(t, func() {
-		New(m).Get("nothing").MustFloat32Slice()
-	})
-
-}
-
-func TestIsFloat32(t *testing.T) {
-
-	var v *Value
-
-	v = &Value{data: float32(1)}
-	assert.True(t, v.IsFloat32())
-
-	v = &Value{data: []float32{float32(1)}}
-	assert.True(t, v.IsFloat32Slice())
-
-}
-
-func TestEachFloat32(t *testing.T) {
-
-	v := &Value{data: []float32{float32(1), float32(1), float32(1), float32(1), float32(1)}}
-	count := 0
-	replacedVals := make([]float32, 0)
-	assert.Equal(t, v, v.EachFloat32(func(i int, val float32) bool {
-
-		count++
-		replacedVals = append(replacedVals, val)
-
-		// abort early
-		if i == 2 {
-			return false
-		}
-
-		return true
-
-	}))
-
-	assert.Equal(t, count, 3)
-	assert.Equal(t, replacedVals[0], v.MustFloat32Slice()[0])
-	assert.Equal(t, replacedVals[1], v.MustFloat32Slice()[1])
-	assert.Equal(t, replacedVals[2], v.MustFloat32Slice()[2])
-
-}
-
-func TestWhereFloat32(t *testing.T) {
-
-	v := &Value{data: []float32{float32(1), float32(1), float32(1), float32(1), float32(1), float32(1)}}
-
-	selected := v.WhereFloat32(func(i int, val float32) bool {
-		return i%2 == 0
-	}).MustFloat32Slice()
-
-	assert.Equal(t, 3, len(selected))
-
-}
-
-func TestGroupFloat32(t *testing.T) {
-
-	v := &Value{data: []float32{float32(1), float32(1), float32(1), float32(1), float32(1), float32(1)}}
-
-	grouped := v.GroupFloat32(func(i int, val float32) string {
-		return fmt.Sprintf("%v", i%2 == 0)
-	}).data.(map[string][]float32)
-
-	assert.Equal(t, 2, len(grouped))
-	assert.Equal(t, 3, len(grouped["true"]))
-	assert.Equal(t, 3, len(grouped["false"]))
-
-}
-
-func TestReplaceFloat32(t *testing.T) {
-
-	v := &Value{data: []float32{float32(1), float32(1), float32(1), float32(1), float32(1), float32(1)}}
-
-	rawArr := v.MustFloat32Slice()
-
-	replaced := v.ReplaceFloat32(func(index int, val float32) float32 {
-		if index < len(rawArr)-1 {
-			return rawArr[index+1]
-		}
-		return rawArr[0]
-	})
-
-	replacedArr := replaced.MustFloat32Slice()
-	if assert.Equal(t, 6, len(replacedArr)) {
-		assert.Equal(t, replacedArr[0], rawArr[1])
-		assert.Equal(t, replacedArr[1], rawArr[2])
-		assert.Equal(t, replacedArr[2], rawArr[3])
-		assert.Equal(t, replacedArr[3], rawArr[4])
-		assert.Equal(t, replacedArr[4], rawArr[5])
-		assert.Equal(t, replacedArr[5], rawArr[0])
-	}
-
-}
-
-func TestCollectFloat32(t *testing.T) {
-
-	v := &Value{data: []float32{float32(1), float32(1), float32(1), float32(1), float32(1), float32(1)}}
-
-	collected := v.CollectFloat32(func(index int, val float32) interface{} {
-		return index
-	})
-
-	collectedArr := collected.MustInterSlice()
-	if assert.Equal(t, 6, len(collectedArr)) {
-		assert.Equal(t, collectedArr[0], 0)
-		assert.Equal(t, collectedArr[1], 1)
-		assert.Equal(t, collectedArr[2], 2)
-		assert.Equal(t, collectedArr[3], 3)
-		assert.Equal(t, collectedArr[4], 4)
-		assert.Equal(t, collectedArr[5], 5)
-	}
-
-}
-
-// ************************************************************
-// TESTS
-// ************************************************************
-
-func TestFloat64(t *testing.T) {
-
-	val := float64(1)
-	m := map[string]interface{}{"value": val, "nothing": nil}
-	assert.Equal(t, val, New(m).Get("value").Float64())
-	assert.Equal(t, val, New(m).Get("value").MustFloat64())
-	assert.Equal(t, float64(0), New(m).Get("nothing").Float64())
-	assert.Equal(t, val, New(m).Get("nothing").Float64(1))
-
-	assert.Panics(t, func() {
-		New(m).Get("age").MustFloat64()
-	})
-
-}
-
-func TestFloat64Slice(t *testing.T) {
-
-	val := float64(1)
-	m := map[string]interface{}{"value": []float64{val}, "nothing": nil}
-	assert.Equal(t, val, New(m).Get("value").Float64Slice()[0])
-	assert.Equal(t, val, New(m).Get("value").MustFloat64Slice()[0])
-	assert.Equal(t, []float64(nil), New(m).Get("nothing").Float64Slice())
-	assert.Equal(t, val, New(m).Get("nothing").Float64Slice([]float64{float64(1)})[0])
-
-	assert.Panics(t, func() {
-		New(m).Get("nothing").MustFloat64Slice()
-	})
-
-}
-
-func TestIsFloat64(t *testing.T) {
-
-	var v *Value
-
-	v = &Value{data: float64(1)}
-	assert.True(t, v.IsFloat64())
-
-	v = &Value{data: []float64{float64(1)}}
-	assert.True(t, v.IsFloat64Slice())
-
-}
-
-func TestEachFloat64(t *testing.T) {
-
-	v := &Value{data: []float64{float64(1), float64(1), float64(1), float64(1), float64(1)}}
-	count := 0
-	replacedVals := make([]float64, 0)
-	assert.Equal(t, v, v.EachFloat64(func(i int, val float64) bool {
-
-		count++
-		replacedVals = append(replacedVals, val)
-
-		// abort early
-		if i == 2 {
-			return false
-		}
-
-		return true
-
-	}))
-
-	assert.Equal(t, count, 3)
-	assert.Equal(t, replacedVals[0], v.MustFloat64Slice()[0])
-	assert.Equal(t, replacedVals[1], v.MustFloat64Slice()[1])
-	assert.Equal(t, replacedVals[2], v.MustFloat64Slice()[2])
-
-}
-
-func TestWhereFloat64(t *testing.T) {
-
-	v := &Value{data: []float64{float64(1), float64(1), float64(1), float64(1), float64(1), float64(1)}}
-
-	selected := v.WhereFloat64(func(i int, val float64) bool {
-		return i%2 == 0
-	}).MustFloat64Slice()
-
-	assert.Equal(t, 3, len(selected))
-
-}
-
-func TestGroupFloat64(t *testing.T) {
-
-	v := &Value{data: []float64{float64(1), float64(1), float64(1), float64(1), float64(1), float64(1)}}
-
-	grouped := v.GroupFloat64(func(i int, val float64) string {
-		return fmt.Sprintf("%v", i%2 == 0)
-	}).data.(map[string][]float64)
-
-	assert.Equal(t, 2, len(grouped))
-	assert.Equal(t, 3, len(grouped["true"]))
-	assert.Equal(t, 3, len(grouped["false"]))
-
-}
-
-func TestReplaceFloat64(t *testing.T) {
-
-	v := &Value{data: []float64{float64(1), float64(1), float64(1), float64(1), float64(1), float64(1)}}
-
-	rawArr := v.MustFloat64Slice()
-
-	replaced := v.ReplaceFloat64(func(index int, val float64) float64 {
-		if index < len(rawArr)-1 {
-			return rawArr[index+1]
-		}
-		return rawArr[0]
-	})
-
-	replacedArr := replaced.MustFloat64Slice()
-	if assert.Equal(t, 6, len(replacedArr)) {
-		assert.Equal(t, replacedArr[0], rawArr[1])
-		assert.Equal(t, replacedArr[1], rawArr[2])
-		assert.Equal(t, replacedArr[2], rawArr[3])
-		assert.Equal(t, replacedArr[3], rawArr[4])
-		assert.Equal(t, replacedArr[4], rawArr[5])
-		assert.Equal(t, replacedArr[5], rawArr[0])
-	}
-
-}
-
-func TestCollectFloat64(t *testing.T) {
-
-	v := &Value{data: []float64{float64(1), float64(1), float64(1), float64(1), float64(1), float64(1)}}
-
-	collected := v.CollectFloat64(func(index int, val float64) interface{} {
-		return index
-	})
-
-	collectedArr := collected.MustInterSlice()
-	if assert.Equal(t, 6, len(collectedArr)) {
-		assert.Equal(t, collectedArr[0], 0)
-		assert.Equal(t, collectedArr[1], 1)
-		assert.Equal(t, collectedArr[2], 2)
-		assert.Equal(t, collectedArr[3], 3)
-		assert.Equal(t, collectedArr[4], 4)
-		assert.Equal(t, collectedArr[5], 5)
-	}
-
-}
-
-// ************************************************************
-// TESTS
-// ************************************************************
-
-func TestComplex64(t *testing.T) {
-
-	val := complex64(1)
-	m := map[string]interface{}{"value": val, "nothing": nil}
-	assert.Equal(t, val, New(m).Get("value").Complex64())
-	assert.Equal(t, val, New(m).Get("value").MustComplex64())
-	assert.Equal(t, complex64(0), New(m).Get("nothing").Complex64())
-	assert.Equal(t, val, New(m).Get("nothing").Complex64(1))
-
-	assert.Panics(t, func() {
-		New(m).Get("age").MustComplex64()
-	})
-
-}
-
-func TestComplex64Slice(t *testing.T) {
-
-	val := complex64(1)
-	m := map[string]interface{}{"value": []complex64{val}, "nothing": nil}
-	assert.Equal(t, val, New(m).Get("value").Complex64Slice()[0])
-	assert.Equal(t, val, New(m).Get("value").MustComplex64Slice()[0])
-	assert.Equal(t, []complex64(nil), New(m).Get("nothing").Complex64Slice())
-	assert.Equal(t, val, New(m).Get("nothing").Complex64Slice([]complex64{complex64(1)})[0])
-
-	assert.Panics(t, func() {
-		New(m).Get("nothing").MustComplex64Slice()
-	})
-
-}
-
-func TestIsComplex64(t *testing.T) {
-
-	var v *Value
-
-	v = &Value{data: complex64(1)}
-	assert.True(t, v.IsComplex64())
-
-	v = &Value{data: []complex64{complex64(1)}}
-	assert.True(t, v.IsComplex64Slice())
-
-}
-
-func TestEachComplex64(t *testing.T) {
-
-	v := &Value{data: []complex64{complex64(1), complex64(1), complex64(1), complex64(1), complex64(1)}}
-	count := 0
-	replacedVals := make([]complex64, 0)
-	assert.Equal(t, v, v.EachComplex64(func(i int, val complex64) bool {
-
-		count++
-		replacedVals = append(replacedVals, val)
-
-		// abort early
-		if i == 2 {
-			return false
-		}
-
-		return true
-
-	}))
-
-	assert.Equal(t, count, 3)
-	assert.Equal(t, replacedVals[0], v.MustComplex64Slice()[0])
-	assert.Equal(t, replacedVals[1], v.MustComplex64Slice()[1])
-	assert.Equal(t, replacedVals[2], v.MustComplex64Slice()[2])
-
-}
-
-func TestWhereComplex64(t *testing.T) {
-
-	v := &Value{data: []complex64{complex64(1), complex64(1), complex64(1), complex64(1), complex64(1), complex64(1)}}
-
-	selected := v.WhereComplex64(func(i int, val complex64) bool {
-		return i%2 == 0
-	}).MustComplex64Slice()
-
-	assert.Equal(t, 3, len(selected))
-
-}
-
-func TestGroupComplex64(t *testing.T) {
-
-	v := &Value{data: []complex64{complex64(1), complex64(1), complex64(1), complex64(1), complex64(1), complex64(1)}}
-
-	grouped := v.GroupComplex64(func(i int, val complex64) string {
-		return fmt.Sprintf("%v", i%2 == 0)
-	}).data.(map[string][]complex64)
-
-	assert.Equal(t, 2, len(grouped))
-	assert.Equal(t, 3, len(grouped["true"]))
-	assert.Equal(t, 3, len(grouped["false"]))
-
-}
-
-func TestReplaceComplex64(t *testing.T) {
-
-	v := &Value{data: []complex64{complex64(1), complex64(1), complex64(1), complex64(1), complex64(1), complex64(1)}}
-
-	rawArr := v.MustComplex64Slice()
-
-	replaced := v.ReplaceComplex64(func(index int, val complex64) complex64 {
-		if index < len(rawArr)-1 {
-			return rawArr[index+1]
-		}
-		return rawArr[0]
-	})
-
-	replacedArr := replaced.MustComplex64Slice()
-	if assert.Equal(t, 6, len(replacedArr)) {
-		assert.Equal(t, replacedArr[0], rawArr[1])
-		assert.Equal(t, replacedArr[1], rawArr[2])
-		assert.Equal(t, replacedArr[2], rawArr[3])
-		assert.Equal(t, replacedArr[3], rawArr[4])
-		assert.Equal(t, replacedArr[4], rawArr[5])
-		assert.Equal(t, replacedArr[5], rawArr[0])
-	}
-
-}
-
-func TestCollectComplex64(t *testing.T) {
-
-	v := &Value{data: []complex64{complex64(1), complex64(1), complex64(1), complex64(1), complex64(1), complex64(1)}}
-
-	collected := v.CollectComplex64(func(index int, val complex64) interface{} {
-		return index
-	})
-
-	collectedArr := collected.MustInterSlice()
-	if assert.Equal(t, 6, len(collectedArr)) {
-		assert.Equal(t, collectedArr[0], 0)
-		assert.Equal(t, collectedArr[1], 1)
-		assert.Equal(t, collectedArr[2], 2)
-		assert.Equal(t, collectedArr[3], 3)
-		assert.Equal(t, collectedArr[4], 4)
-		assert.Equal(t, collectedArr[5], 5)
-	}
-
-}
-
-// ************************************************************
-// TESTS
-// ************************************************************
-
-func TestComplex128(t *testing.T) {
-
-	val := complex128(1)
-	m := map[string]interface{}{"value": val, "nothing": nil}
-	assert.Equal(t, val, New(m).Get("value").Complex128())
-	assert.Equal(t, val, New(m).Get("value").MustComplex128())
-	assert.Equal(t, complex128(0), New(m).Get("nothing").Complex128())
-	assert.Equal(t, val, New(m).Get("nothing").Complex128(1))
-
-	assert.Panics(t, func() {
-		New(m).Get("age").MustComplex128()
-	})
-
-}
-
-func TestComplex128Slice(t *testing.T) {
-
-	val := complex128(1)
-	m := map[string]interface{}{"value": []complex128{val}, "nothing": nil}
-	assert.Equal(t, val, New(m).Get("value").Complex128Slice()[0])
-	assert.Equal(t, val, New(m).Get("value").MustComplex128Slice()[0])
-	assert.Equal(t, []complex128(nil), New(m).Get("nothing").Complex128Slice())
-	assert.Equal(t, val, New(m).Get("nothing").Complex128Slice([]complex128{complex128(1)})[0])
-
-	assert.Panics(t, func() {
-		New(m).Get("nothing").MustComplex128Slice()
-	})
-
-}
-
-func TestIsComplex128(t *testing.T) {
-
-	var v *Value
-
-	v = &Value{data: complex128(1)}
-	assert.True(t, v.IsComplex128())
-
-	v = &Value{data: []complex128{complex128(1)}}
-	assert.True(t, v.IsComplex128Slice())
-
-}
-
-func TestEachComplex128(t *testing.T) {
-
-	v := &Value{data: []complex128{complex128(1), complex128(1), complex128(1), complex128(1), complex128(1)}}
-	count := 0
-	replacedVals := make([]complex128, 0)
-	assert.Equal(t, v, v.EachComplex128(func(i int, val complex128) bool {
-
-		count++
-		replacedVals = append(replacedVals, val)
-
-		// abort early
-		if i == 2 {
-			return false
-		}
-
-		return true
-
-	}))
-
-	assert.Equal(t, count, 3)
-	assert.Equal(t, replacedVals[0], v.MustComplex128Slice()[0])
-	assert.Equal(t, replacedVals[1], v.MustComplex128Slice()[1])
-	assert.Equal(t, replacedVals[2], v.MustComplex128Slice()[2])
-
-}
-
-func TestWhereComplex128(t *testing.T) {
-
-	v := &Value{data: []complex128{complex128(1), complex128(1), complex128(1), complex128(1), complex128(1), complex128(1)}}
-
-	selected := v.WhereComplex128(func(i int, val complex128) bool {
-		return i%2 == 0
-	}).MustComplex128Slice()
-
-	assert.Equal(t, 3, len(selected))
-
-}
-
-func TestGroupComplex128(t *testing.T) {
-
-	v := &Value{data: []complex128{complex128(1), complex128(1), complex128(1), complex128(1), complex128(1), complex128(1)}}
-
-	grouped := v.GroupComplex128(func(i int, val complex128) string {
-		return fmt.Sprintf("%v", i%2 == 0)
-	}).data.(map[string][]complex128)
-
-	assert.Equal(t, 2, len(grouped))
-	assert.Equal(t, 3, len(grouped["true"]))
-	assert.Equal(t, 3, len(grouped["false"]))
-
-}
-
-func TestReplaceComplex128(t *testing.T) {
-
-	v := &Value{data: []complex128{complex128(1), complex128(1), complex128(1), complex128(1), complex128(1), complex128(1)}}
-
-	rawArr := v.MustComplex128Slice()
-
-	replaced := v.ReplaceComplex128(func(index int, val complex128) complex128 {
-		if index < len(rawArr)-1 {
-			return rawArr[index+1]
-		}
-		return rawArr[0]
-	})
-
-	replacedArr := replaced.MustComplex128Slice()
-	if assert.Equal(t, 6, len(replacedArr)) {
-		assert.Equal(t, replacedArr[0], rawArr[1])
-		assert.Equal(t, replacedArr[1], rawArr[2])
-		assert.Equal(t, replacedArr[2], rawArr[3])
-		assert.Equal(t, replacedArr[3], rawArr[4])
-		assert.Equal(t, replacedArr[4], rawArr[5])
-		assert.Equal(t, replacedArr[5], rawArr[0])
-	}
-
-}
-
-func TestCollectComplex128(t *testing.T) {
-
-	v := &Value{data: []complex128{complex128(1), complex128(1), complex128(1), complex128(1), complex128(1), complex128(1)}}
-
-	collected := v.CollectComplex128(func(index int, val complex128) interface{} {
-		return index
-	})
-
-	collectedArr := collected.MustInterSlice()
-	if assert.Equal(t, 6, len(collectedArr)) {
-		assert.Equal(t, collectedArr[0], 0)
-		assert.Equal(t, collectedArr[1], 1)
-		assert.Equal(t, collectedArr[2], 2)
-		assert.Equal(t, collectedArr[3], 3)
-		assert.Equal(t, collectedArr[4], 4)
-		assert.Equal(t, collectedArr[5], 5)
-	}
-
-}
diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/value.go b/Godeps/_workspace/src/github.com/stretchr/objx/value.go
deleted file mode 100644
index 7aaef06b1..000000000
--- a/Godeps/_workspace/src/github.com/stretchr/objx/value.go
+++ /dev/null
@@ -1,13 +0,0 @@
-package objx
-
-// Value provides methods for extracting interface{} data in various
-// types.
-type Value struct {
-	// data contains the raw data being managed by this Value
-	data interface{}
-}
-
-// Data returns the raw data contained by this Value
-func (v *Value) Data() interface{} {
-	return v.data
-}
diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/value_test.go b/Godeps/_workspace/src/github.com/stretchr/objx/value_test.go
deleted file mode 100644
index 0bc65d92c..000000000
--- a/Godeps/_workspace/src/github.com/stretchr/objx/value_test.go
+++ /dev/null
@@ -1 +0,0 @@
-package objx
diff --git a/Godeps/_workspace/src/github.com/stretchr/testify/assert/assertions.go b/Godeps/_workspace/src/github.com/stretchr/testify/assert/assertions.go
deleted file mode 100644
index fbf03f4d8..000000000
--- a/Godeps/_workspace/src/github.com/stretchr/testify/assert/assertions.go
+++ /dev/null
@@ -1,895 +0,0 @@
-package assert
-
-import (
-	"bufio"
-	"bytes"
-	"fmt"
-	"math"
-	"reflect"
-	"regexp"
-	"runtime"
-	"strings"
-	"time"
-	"unicode"
-	"unicode/utf8"
-)
-
-// TestingT is an interface wrapper around *testing.T
-type TestingT interface {
-	Errorf(format string, args ...interface{})
-}
-
-// Comparison a custom function that returns true on success and false on failure
-type Comparison func() (success bool)
-
-/*
-	Helper functions
-*/
-
-// ObjectsAreEqual determines if two objects are considered equal.
-//
-// This function does no assertion of any kind.
-func ObjectsAreEqual(expected, actual interface{}) bool {
-
-	if expected == nil || actual == nil {
-		return expected == actual
-	}
-
-	if reflect.DeepEqual(expected, actual) {
-		return true
-	}
-
-	return false
-
-}
-
-// ObjectsAreEqualValues gets whether two objects are equal, or if their
-// values are equal.
-func ObjectsAreEqualValues(expected, actual interface{}) bool {
-	if ObjectsAreEqual(expected, actual) {
-		return true
-	}
-
-	actualType := reflect.TypeOf(actual)
-	expectedValue := reflect.ValueOf(expected)
-	if expectedValue.Type().ConvertibleTo(actualType) {
-		// Attempt comparison after type conversion
-		if reflect.DeepEqual(actual, expectedValue.Convert(actualType).Interface()) {
-			return true
-		}
-	}
-
-	return false
-}
-
-/* CallerInfo is necessary because the assert functions use the testing object
-internally, causing it to print the file:line of the assert method, rather than where
-the problem actually occured in calling code.*/
-
-// CallerInfo returns an array of strings containing the file and line number
-// of each stack frame leading from the current test to the assert call that
-// failed.
-func CallerInfo() []string {
-
-	pc := uintptr(0)
-	file := ""
-	line := 0
-	ok := false
-	name := ""
-
-	callers := []string{}
-	for i := 0; ; i++ {
-		pc, file, line, ok = runtime.Caller(i)
-		if !ok {
-			return nil
-		}
-
-		// This is a huge edge case, but it will panic if this is the case, see #180
-		if file == "<autogenerated>" {
-			break
-		}
-
-		parts := strings.Split(file, "/")
-		dir := parts[len(parts)-2]
-		file = parts[len(parts)-1]
-		if (dir != "assert" && dir != "mock" && dir != "require") || file == "mock_test.go" {
-			callers = append(callers, fmt.Sprintf("%s:%d", file, line))
-		}
-
-		f := runtime.FuncForPC(pc)
-		if f == nil {
-			break
-		}
-		name = f.Name()
-		// Drop the package
-		segments := strings.Split(name, ".")
-		name = segments[len(segments)-1]
-		if isTest(name, "Test") ||
-			isTest(name, "Benchmark") ||
-			isTest(name, "Example") {
-			break
-		}
-	}
-
-	return callers
-}
-
-// Stolen from the `go test` tool.
-// isTest tells whether name looks like a test (or benchmark, according to prefix).
-// It is a Test (say) if there is a character after Test that is not a lower-case letter.
-// We don't want TesticularCancer.
-func isTest(name, prefix string) bool {
-	if !strings.HasPrefix(name, prefix) {
-		return false
-	}
-	if len(name) == len(prefix) { // "Test" is ok
-		return true
-	}
-	rune, _ := utf8.DecodeRuneInString(name[len(prefix):])
-	return !unicode.IsLower(rune)
-}
-
-// getWhitespaceString returns a string that is long enough to overwrite the default
-// output from the go testing framework.
-func getWhitespaceString() string {
-
-	_, file, line, ok := runtime.Caller(1)
-	if !ok {
-		return ""
-	}
-	parts := strings.Split(file, "/")
-	file = parts[len(parts)-1]
-
-	return strings.Repeat(" ", len(fmt.Sprintf("%s:%d:      ", file, line)))
-
-}
-
-func messageFromMsgAndArgs(msgAndArgs ...interface{}) string {
-	if len(msgAndArgs) == 0 || msgAndArgs == nil {
-		return ""
-	}
-	if len(msgAndArgs) == 1 {
-		return msgAndArgs[0].(string)
-	}
-	if len(msgAndArgs) > 1 {
-		return fmt.Sprintf(msgAndArgs[0].(string), msgAndArgs[1:]...)
-	}
-	return ""
-}
-
-// Indents all lines of the message by appending a number of tabs to each line, in an output format compatible with Go's
-// test printing (see inner comment for specifics)
-func indentMessageLines(message string, tabs int) string {
-	outBuf := new(bytes.Buffer)
-
-	for i, scanner := 0, bufio.NewScanner(strings.NewReader(message)); scanner.Scan(); i++ {
-		if i != 0 {
-			outBuf.WriteRune('\n')
-		}
-		for ii := 0; ii < tabs; ii++ {
-			outBuf.WriteRune('\t')
-			// Bizarrely, all lines except the first need one fewer tabs prepended, so deliberately advance the counter
-			// by 1 prematurely.
-			if ii == 0 && i > 0 {
-				ii++
-			}
-		}
-		outBuf.WriteString(scanner.Text())
-	}
-
-	return outBuf.String()
-}
-
-// Fail reports a failure through
-func Fail(t TestingT, failureMessage string, msgAndArgs ...interface{}) bool {
-
-	message := messageFromMsgAndArgs(msgAndArgs...)
-
-	errorTrace := strings.Join(CallerInfo(), "\n\r\t\t\t")
-	if len(message) > 0 {
-		t.Errorf("\r%s\r\tError Trace:\t%s\n"+
-			"\r\tError:%s\n"+
-			"\r\tMessages:\t%s\n\r",
-			getWhitespaceString(),
-			errorTrace,
-			indentMessageLines(failureMessage, 2),
-			message)
-	} else {
-		t.Errorf("\r%s\r\tError Trace:\t%s\n"+
-			"\r\tError:%s\n\r",
-			getWhitespaceString(),
-			errorTrace,
-			indentMessageLines(failureMessage, 2))
-	}
-
-	return false
-}
-
-// Implements asserts that an object is implemented by the specified interface.
-//
-//    assert.Implements(t, (*MyInterface)(nil), new(MyObject), "MyObject")
-func Implements(t TestingT, interfaceObject interface{}, object interface{}, msgAndArgs ...interface{}) bool {
-
-	interfaceType := reflect.TypeOf(interfaceObject).Elem()
-
-	if !reflect.TypeOf(object).Implements(interfaceType) {
-		return Fail(t, fmt.Sprintf("Object must implement %v", interfaceType), msgAndArgs...)
-	}
-
-	return true
-
-}
-
-// IsType asserts that the specified objects are of the same type.
-func IsType(t TestingT, expectedType interface{}, object interface{}, msgAndArgs ...interface{}) bool {
-
-	if !ObjectsAreEqual(reflect.TypeOf(object), reflect.TypeOf(expectedType)) {
-		return Fail(t, fmt.Sprintf("Object expected to be of type %v, but was %v", reflect.TypeOf(expectedType), reflect.TypeOf(object)), msgAndArgs...)
-	}
-
-	return true
-}
-
-// Equal asserts that two objects are equal.
-//
-//    assert.Equal(t, 123, 123, "123 and 123 should be equal")
-//
-// Returns whether the assertion was successful (true) or not (false).
-func Equal(t TestingT, expected, actual interface{}, msgAndArgs ...interface{}) bool {
-
-	if !ObjectsAreEqual(expected, actual) {
-		return Fail(t, fmt.Sprintf("Not equal: %#v (expected)\n"+
-			"        != %#v (actual)", expected, actual), msgAndArgs...)
-	}
-
-	return true
-
-}
-
-// EqualValues asserts that two objects are equal or convertable to the same types
-// and equal.
-//
-//    assert.EqualValues(t, uint32(123), int32(123), "123 and 123 should be equal")
-//
-// Returns whether the assertion was successful (true) or not (false).
-func EqualValues(t TestingT, expected, actual interface{}, msgAndArgs ...interface{}) bool {
-
-	if !ObjectsAreEqualValues(expected, actual) {
-		return Fail(t, fmt.Sprintf("Not equal: %#v (expected)\n"+
-			"        != %#v (actual)", expected, actual), msgAndArgs...)
-	}
-
-	return true
-
-}
-
-// Exactly asserts that two objects are equal is value and type.
-//
-//    assert.Exactly(t, int32(123), int64(123), "123 and 123 should NOT be equal")
-//
-// Returns whether the assertion was successful (true) or not (false).
-func Exactly(t TestingT, expected, actual interface{}, msgAndArgs ...interface{}) bool {
-
-	aType := reflect.TypeOf(expected)
-	bType := reflect.TypeOf(actual)
-
-	if aType != bType {
-		return Fail(t, "Types expected to match exactly", "%v != %v", aType, bType)
-	}
-
-	return Equal(t, expected, actual, msgAndArgs...)
-
-}
-
-// NotNil asserts that the specified object is not nil.
-//
-//    assert.NotNil(t, err, "err should be something")
-//
-// Returns whether the assertion was successful (true) or not (false).
-func NotNil(t TestingT, object interface{}, msgAndArgs ...interface{}) bool {
-
-	success := true
-
-	if object == nil {
-		success = false
-	} else {
-		value := reflect.ValueOf(object)
-		kind := value.Kind()
-		if kind >= reflect.Chan && kind <= reflect.Slice && value.IsNil() {
-			success = false
-		}
-	}
-
-	if !success {
-		Fail(t, "Expected value not to be nil.", msgAndArgs...)
-	}
-
-	return success
-}
-
-// isNil checks if a specified object is nil or not, without Failing.
-func isNil(object interface{}) bool {
-	if object == nil {
-		return true
-	}
-
-	value := reflect.ValueOf(object)
-	kind := value.Kind()
-	if kind >= reflect.Chan && kind <= reflect.Slice && value.IsNil() {
-		return true
-	}
-
-	return false
-}
-
-// Nil asserts that the specified object is nil.
-//
-//    assert.Nil(t, err, "err should be nothing")
-//
-// Returns whether the assertion was successful (true) or not (false).
-func Nil(t TestingT, object interface{}, msgAndArgs ...interface{}) bool {
-	if isNil(object) {
-		return true
-	}
-	return Fail(t, fmt.Sprintf("Expected nil, but got: %#v", object), msgAndArgs...)
-}
-
-var zeros = []interface{}{
-	int(0),
-	int8(0),
-	int16(0),
-	int32(0),
-	int64(0),
-	uint(0),
-	uint8(0),
-	uint16(0),
-	uint32(0),
-	uint64(0),
-	float32(0),
-	float64(0),
-}
-
-// isEmpty gets whether the specified object is considered empty or not.
-func isEmpty(object interface{}) bool {
-
-	if object == nil {
-		return true
-	} else if object == "" {
-		return true
-	} else if object == false {
-		return true
-	}
-
-	for _, v := range zeros {
-		if object == v {
-			return true
-		}
-	}
-
-	objValue := reflect.ValueOf(object)
-
-	switch objValue.Kind() {
-	case reflect.Map:
-		fallthrough
-	case reflect.Slice, reflect.Chan:
-		{
-			return (objValue.Len() == 0)
-		}
-	case reflect.Ptr:
-		{
-			switch object.(type) {
-			case *time.Time:
-				return object.(*time.Time).IsZero()
-			default:
-				return false
-			}
-		}
-	}
-	return false
-}
-
-// Empty asserts that the specified object is empty.  I.e. nil, "", false, 0 or either
-// a slice or a channel with len == 0.
-//
-// assert.Empty(t, obj)
-//
-// Returns whether the assertion was successful (true) or not (false).
-func Empty(t TestingT, object interface{}, msgAndArgs ...interface{}) bool {
-
-	pass := isEmpty(object)
-	if !pass {
-		Fail(t, fmt.Sprintf("Should be empty, but was %v", object), msgAndArgs...)
-	}
-
-	return pass
-
-}
-
-// NotEmpty asserts that the specified object is NOT empty.  I.e. not nil, "", false, 0 or either
-// a slice or a channel with len == 0.
-//
-// if assert.NotEmpty(t, obj) {
-//   assert.Equal(t, "two", obj[1])
-// }
-//
-// Returns whether the assertion was successful (true) or not (false).
-func NotEmpty(t TestingT, object interface{}, msgAndArgs ...interface{}) bool {
-
-	pass := !isEmpty(object)
-	if !pass {
-		Fail(t, fmt.Sprintf("Should NOT be empty, but was %v", object), msgAndArgs...)
-	}
-
-	return pass
-
-}
-
-// getLen try to get length of object.
-// return (false, 0) if impossible.
-func getLen(x interface{}) (ok bool, length int) {
-	v := reflect.ValueOf(x)
-	defer func() {
-		if e := recover(); e != nil {
-			ok = false
-		}
-	}()
-	return true, v.Len()
-}
-
-// Len asserts that the specified object has specific length.
-// Len also fails if the object has a type that len() not accept.
-//
-//    assert.Len(t, mySlice, 3, "The size of slice is not 3")
-//
-// Returns whether the assertion was successful (true) or not (false).
-func Len(t TestingT, object interface{}, length int, msgAndArgs ...interface{}) bool {
-	ok, l := getLen(object)
-	if !ok {
-		return Fail(t, fmt.Sprintf("\"%s\" could not be applied builtin len()", object), msgAndArgs...)
-	}
-
-	if l != length {
-		return Fail(t, fmt.Sprintf("\"%s\" should have %d item(s), but has %d", object, length, l), msgAndArgs...)
-	}
-	return true
-}
-
-// True asserts that the specified value is true.
-//
-//    assert.True(t, myBool, "myBool should be true")
-//
-// Returns whether the assertion was successful (true) or not (false).
-func True(t TestingT, value bool, msgAndArgs ...interface{}) bool {
-
-	if value != true {
-		return Fail(t, "Should be true", msgAndArgs...)
-	}
-
-	return true
-
-}
-
-// False asserts that the specified value is true.
-//
-//    assert.False(t, myBool, "myBool should be false")
-//
-// Returns whether the assertion was successful (true) or not (false).
-func False(t TestingT, value bool, msgAndArgs ...interface{}) bool {
-
-	if value != false {
-		return Fail(t, "Should be false", msgAndArgs...)
-	}
-
-	return true
-
-}
-
-// NotEqual asserts that the specified values are NOT equal.
-//
-//    assert.NotEqual(t, obj1, obj2, "two objects shouldn't be equal")
-//
-// Returns whether the assertion was successful (true) or not (false).
-func NotEqual(t TestingT, expected, actual interface{}, msgAndArgs ...interface{}) bool {
-
-	if ObjectsAreEqual(expected, actual) {
-		return Fail(t, "Should not be equal", msgAndArgs...)
-	}
-
-	return true
-
-}
-
-// containsElement try loop over the list check if the list includes the element.
-// return (false, false) if impossible.
-// return (true, false) if element was not found.
-// return (true, true) if element was found.
-func includeElement(list interface{}, element interface{}) (ok, found bool) {
-
-	listValue := reflect.ValueOf(list)
-	elementValue := reflect.ValueOf(element)
-	defer func() {
-		if e := recover(); e != nil {
-			ok = false
-			found = false
-		}
-	}()
-
-	if reflect.TypeOf(list).Kind() == reflect.String {
-		return true, strings.Contains(listValue.String(), elementValue.String())
-	}
-
-	for i := 0; i < listValue.Len(); i++ {
-		if ObjectsAreEqual(listValue.Index(i).Interface(), element) {
-			return true, true
-		}
-	}
-	return true, false
-
-}
-
-// Contains asserts that the specified string or list(array, slice...) contains the
-// specified substring or element.
-//
-//    assert.Contains(t, "Hello World", "World", "But 'Hello World' does contain 'World'")
-//    assert.Contains(t, ["Hello", "World"], "World", "But ["Hello", "World"] does contain 'World'")
-//
-// Returns whether the assertion was successful (true) or not (false).
-func Contains(t TestingT, s, contains interface{}, msgAndArgs ...interface{}) bool {
-
-	ok, found := includeElement(s, contains)
-	if !ok {
-		return Fail(t, fmt.Sprintf("\"%s\" could not be applied builtin len()", s), msgAndArgs...)
-	}
-	if !found {
-		return Fail(t, fmt.Sprintf("\"%s\" does not contain \"%s\"", s, contains), msgAndArgs...)
-	}
-
-	return true
-
-}
-
-// NotContains asserts that the specified string or list(array, slice...) does NOT contain the
-// specified substring or element.
-//
-//    assert.NotContains(t, "Hello World", "Earth", "But 'Hello World' does NOT contain 'Earth'")
-//    assert.NotContains(t, ["Hello", "World"], "Earth", "But ['Hello', 'World'] does NOT contain 'Earth'")
-//
-// Returns whether the assertion was successful (true) or not (false).
-func NotContains(t TestingT, s, contains interface{}, msgAndArgs ...interface{}) bool {
-
-	ok, found := includeElement(s, contains)
-	if !ok {
-		return Fail(t, fmt.Sprintf("\"%s\" could not be applied builtin len()", s), msgAndArgs...)
-	}
-	if found {
-		return Fail(t, fmt.Sprintf("\"%s\" should not contain \"%s\"", s, contains), msgAndArgs...)
-	}
-
-	return true
-
-}
-
-// Condition uses a Comparison to assert a complex condition.
-func Condition(t TestingT, comp Comparison, msgAndArgs ...interface{}) bool {
-	result := comp()
-	if !result {
-		Fail(t, "Condition failed!", msgAndArgs...)
-	}
-	return result
-}
-
-// PanicTestFunc defines a func that should be passed to the assert.Panics and assert.NotPanics
-// methods, and represents a simple func that takes no arguments, and returns nothing.
-type PanicTestFunc func()
-
-// didPanic returns true if the function passed to it panics. Otherwise, it returns false.
-func didPanic(f PanicTestFunc) (bool, interface{}) {
-
-	didPanic := false
-	var message interface{}
-	func() {
-
-		defer func() {
-			if message = recover(); message != nil {
-				didPanic = true
-			}
-		}()
-
-		// call the target function
-		f()
-
-	}()
-
-	return didPanic, message
-
-}
-
-// Panics asserts that the code inside the specified PanicTestFunc panics.
-//
-//   assert.Panics(t, func(){
-//     GoCrazy()
-//   }, "Calling GoCrazy() should panic")
-//
-// Returns whether the assertion was successful (true) or not (false).
-func Panics(t TestingT, f PanicTestFunc, msgAndArgs ...interface{}) bool {
-
-	if funcDidPanic, panicValue := didPanic(f); !funcDidPanic {
-		return Fail(t, fmt.Sprintf("func %#v should panic\n\r\tPanic value:\t%v", f, panicValue), msgAndArgs...)
-	}
-
-	return true
-}
-
-// NotPanics asserts that the code inside the specified PanicTestFunc does NOT panic.
-//
-//   assert.NotPanics(t, func(){
-//     RemainCalm()
-//   }, "Calling RemainCalm() should NOT panic")
-//
-// Returns whether the assertion was successful (true) or not (false).
-func NotPanics(t TestingT, f PanicTestFunc, msgAndArgs ...interface{}) bool {
-
-	if funcDidPanic, panicValue := didPanic(f); funcDidPanic {
-		return Fail(t, fmt.Sprintf("func %#v should not panic\n\r\tPanic value:\t%v", f, panicValue), msgAndArgs...)
-	}
-
-	return true
-}
-
-// WithinDuration asserts that the two times are within duration delta of each other.
-//
-//   assert.WithinDuration(t, time.Now(), time.Now(), 10*time.Second, "The difference should not be more than 10s")
-//
-// Returns whether the assertion was successful (true) or not (false).
-func WithinDuration(t TestingT, expected, actual time.Time, delta time.Duration, msgAndArgs ...interface{}) bool {
-
-	dt := expected.Sub(actual)
-	if dt < -delta || dt > delta {
-		return Fail(t, fmt.Sprintf("Max difference between %v and %v allowed is %v, but difference was %v", expected, actual, delta, dt), msgAndArgs...)
-	}
-
-	return true
-}
-
-func toFloat(x interface{}) (float64, bool) {
-	var xf float64
-	xok := true
-
-	switch xn := x.(type) {
-	case uint8:
-		xf = float64(xn)
-	case uint16:
-		xf = float64(xn)
-	case uint32:
-		xf = float64(xn)
-	case uint64:
-		xf = float64(xn)
-	case int:
-		xf = float64(xn)
-	case int8:
-		xf = float64(xn)
-	case int16:
-		xf = float64(xn)
-	case int32:
-		xf = float64(xn)
-	case int64:
-		xf = float64(xn)
-	case float32:
-		xf = float64(xn)
-	case float64:
-		xf = float64(xn)
-	default:
-		xok = false
-	}
-
-	return xf, xok
-}
-
-// InDelta asserts that the two numerals are within delta of each other.
-//
-// 	 assert.InDelta(t, math.Pi, (22 / 7.0), 0.01)
-//
-// Returns whether the assertion was successful (true) or not (false).
-func InDelta(t TestingT, expected, actual interface{}, delta float64, msgAndArgs ...interface{}) bool {
-
-	af, aok := toFloat(expected)
-	bf, bok := toFloat(actual)
-
-	if !aok || !bok {
-		return Fail(t, fmt.Sprintf("Parameters must be numerical"), msgAndArgs...)
-	}
-
-	if math.IsNaN(af) {
-		return Fail(t, fmt.Sprintf("Actual must not be NaN"), msgAndArgs...)
-	}
-
-	if math.IsNaN(bf) {
-		return Fail(t, fmt.Sprintf("Expected %v with delta %v, but was NaN", expected, delta), msgAndArgs...)
-	}
-
-	dt := af - bf
-	if dt < -delta || dt > delta {
-		return Fail(t, fmt.Sprintf("Max difference between %v and %v allowed is %v, but difference was %v", expected, actual, delta, dt), msgAndArgs...)
-	}
-
-	return true
-}
-
-// InDeltaSlice is the same as InDelta, except it compares two slices.
-func InDeltaSlice(t TestingT, expected, actual interface{}, delta float64, msgAndArgs ...interface{}) bool {
-	if expected == nil || actual == nil ||
-		reflect.TypeOf(actual).Kind() != reflect.Slice ||
-		reflect.TypeOf(expected).Kind() != reflect.Slice {
-		return Fail(t, fmt.Sprintf("Parameters must be slice"), msgAndArgs...)
-	}
-
-	actualSlice := reflect.ValueOf(actual)
-	expectedSlice := reflect.ValueOf(expected)
-
-	for i := 0; i < actualSlice.Len(); i++ {
-		result := InDelta(t, actualSlice.Index(i).Interface(), expectedSlice.Index(i).Interface(), delta)
-		if !result {
-			return result
-		}
-	}
-
-	return true
-}
-
-// min(|expected|, |actual|) * epsilon
-func calcEpsilonDelta(expected, actual interface{}, epsilon float64) float64 {
-	af, aok := toFloat(expected)
-	bf, bok := toFloat(actual)
-
-	if !aok || !bok {
-		// invalid input
-		return 0
-	}
-
-	if af < 0 {
-		af = -af
-	}
-	if bf < 0 {
-		bf = -bf
-	}
-	var delta float64
-	if af < bf {
-		delta = af * epsilon
-	} else {
-		delta = bf * epsilon
-	}
-	return delta
-}
-
-// InEpsilon asserts that expected and actual have a relative error less than epsilon
-//
-// Returns whether the assertion was successful (true) or not (false).
-func InEpsilon(t TestingT, expected, actual interface{}, epsilon float64, msgAndArgs ...interface{}) bool {
-	delta := calcEpsilonDelta(expected, actual, epsilon)
-
-	return InDelta(t, expected, actual, delta, msgAndArgs...)
-}
-
-// InEpsilonSlice is the same as InEpsilon, except it compares two slices.
-func InEpsilonSlice(t TestingT, expected, actual interface{}, delta float64, msgAndArgs ...interface{}) bool {
-	if expected == nil || actual == nil ||
-		reflect.TypeOf(actual).Kind() != reflect.Slice ||
-		reflect.TypeOf(expected).Kind() != reflect.Slice {
-		return Fail(t, fmt.Sprintf("Parameters must be slice"), msgAndArgs...)
-	}
-
-	actualSlice := reflect.ValueOf(actual)
-	expectedSlice := reflect.ValueOf(expected)
-
-	for i := 0; i < actualSlice.Len(); i++ {
-		result := InEpsilon(t, actualSlice.Index(i).Interface(), expectedSlice.Index(i).Interface(), delta)
-		if !result {
-			return result
-		}
-	}
-
-	return true
-}
-
-/*
-	Errors
-*/
-
-// NoError asserts that a function returned no error (i.e. `nil`).
-//
-//   actualObj, err := SomeFunction()
-//   if assert.NoError(t, err) {
-//	   assert.Equal(t, actualObj, expectedObj)
-//   }
-//
-// Returns whether the assertion was successful (true) or not (false).
-func NoError(t TestingT, err error, msgAndArgs ...interface{}) bool {
-	if isNil(err) {
-		return true
-	}
-
-	return Fail(t, fmt.Sprintf("No error is expected but got %v", err), msgAndArgs...)
-}
-
-// Error asserts that a function returned an error (i.e. not `nil`).
-//
-//   actualObj, err := SomeFunction()
-//   if assert.Error(t, err, "An error was expected") {
-//	   assert.Equal(t, err, expectedError)
-//   }
-//
-// Returns whether the assertion was successful (true) or not (false).
-func Error(t TestingT, err error, msgAndArgs ...interface{}) bool {
-
-	message := messageFromMsgAndArgs(msgAndArgs...)
-	return NotNil(t, err, "An error is expected but got nil. %s", message)
-
-}
-
-// EqualError asserts that a function returned an error (i.e. not `nil`)
-// and that it is equal to the provided error.
-//
-//   actualObj, err := SomeFunction()
-//   if assert.Error(t, err, "An error was expected") {
-//	   assert.Equal(t, err, expectedError)
-//   }
-//
-// Returns whether the assertion was successful (true) or not (false).
-func EqualError(t TestingT, theError error, errString string, msgAndArgs ...interface{}) bool {
-
-	message := messageFromMsgAndArgs(msgAndArgs...)
-	if !NotNil(t, theError, "An error is expected but got nil. %s", message) {
-		return false
-	}
-	s := "An error with value \"%s\" is expected but got \"%s\". %s"
-	return Equal(t, theError.Error(), errString,
-		s, errString, theError.Error(), message)
-}
-
-// matchRegexp return true if a specified regexp matches a string.
-func matchRegexp(rx interface{}, str interface{}) bool {
-
-	var r *regexp.Regexp
-	if rr, ok := rx.(*regexp.Regexp); ok {
-		r = rr
-	} else {
-		r = regexp.MustCompile(fmt.Sprint(rx))
-	}
-
-	return (r.FindStringIndex(fmt.Sprint(str)) != nil)
-
-}
-
-// Regexp asserts that a specified regexp matches a string.
-//
-//  assert.Regexp(t, regexp.MustCompile("start"), "it's starting")
-//  assert.Regexp(t, "start...$", "it's not starting")
-//
-// Returns whether the assertion was successful (true) or not (false).
-func Regexp(t TestingT, rx interface{}, str interface{}, msgAndArgs ...interface{}) bool {
-
-	match := matchRegexp(rx, str)
-
-	if !match {
-		Fail(t, fmt.Sprintf("Expect \"%v\" to match \"%v\"", str, rx), msgAndArgs...)
-	}
-
-	return match
-}
-
-// NotRegexp asserts that a specified regexp does not match a string.
-//
-//  assert.NotRegexp(t, regexp.MustCompile("starts"), "it's starting")
-//  assert.NotRegexp(t, "^start", "it's not starting")
-//
-// Returns whether the assertion was successful (true) or not (false).
-func NotRegexp(t TestingT, rx interface{}, str interface{}, msgAndArgs ...interface{}) bool {
-	match := matchRegexp(rx, str)
-
-	if match {
-		Fail(t, fmt.Sprintf("Expect \"%v\" to NOT match \"%v\"", str, rx), msgAndArgs...)
-	}
-
-	return !match
-
-}
diff --git a/Godeps/_workspace/src/github.com/stretchr/testify/assert/assertions_test.go b/Godeps/_workspace/src/github.com/stretchr/testify/assert/assertions_test.go
deleted file mode 100644
index 36c671eef..000000000
--- a/Godeps/_workspace/src/github.com/stretchr/testify/assert/assertions_test.go
+++ /dev/null
@@ -1,813 +0,0 @@
-package assert
-
-import (
-	"errors"
-	"io"
-	"math"
-	"regexp"
-	"testing"
-	"time"
-)
-
-// AssertionTesterInterface defines an interface to be used for testing assertion methods
-type AssertionTesterInterface interface {
-	TestMethod()
-}
-
-// AssertionTesterConformingObject is an object that conforms to the AssertionTesterInterface interface
-type AssertionTesterConformingObject struct {
-}
-
-func (a *AssertionTesterConformingObject) TestMethod() {
-}
-
-// AssertionTesterNonConformingObject is an object that does not conform to the AssertionTesterInterface interface
-type AssertionTesterNonConformingObject struct {
-}
-
-func TestObjectsAreEqual(t *testing.T) {
-
-	if !ObjectsAreEqual("Hello World", "Hello World") {
-		t.Error("objectsAreEqual should return true")
-	}
-	if !ObjectsAreEqual(123, 123) {
-		t.Error("objectsAreEqual should return true")
-	}
-	if !ObjectsAreEqual(123.5, 123.5) {
-		t.Error("objectsAreEqual should return true")
-	}
-	if !ObjectsAreEqual([]byte("Hello World"), []byte("Hello World")) {
-		t.Error("objectsAreEqual should return true")
-	}
-	if !ObjectsAreEqual(nil, nil) {
-		t.Error("objectsAreEqual should return true")
-	}
-	if ObjectsAreEqual(map[int]int{5: 10}, map[int]int{10: 20}) {
-		t.Error("objectsAreEqual should return false")
-	}
-	if ObjectsAreEqual('x', "x") {
-		t.Error("objectsAreEqual should return false")
-	}
-	if ObjectsAreEqual("x", 'x') {
-		t.Error("objectsAreEqual should return false")
-	}
-	if ObjectsAreEqual(0, 0.1) {
-		t.Error("objectsAreEqual should return false")
-	}
-	if ObjectsAreEqual(0.1, 0) {
-		t.Error("objectsAreEqual should return false")
-	}
-	if ObjectsAreEqual(uint32(10), int32(10)) {
-		t.Error("objectsAreEqual should return false")
-	}
-	if !ObjectsAreEqualValues(uint32(10), int32(10)) {
-		t.Error("ObjectsAreEqualValues should return true")
-	}
-
-}
-
-func TestImplements(t *testing.T) {
-
-	mockT := new(testing.T)
-
-	if !Implements(mockT, (*AssertionTesterInterface)(nil), new(AssertionTesterConformingObject)) {
-		t.Error("Implements method should return true: AssertionTesterConformingObject implements AssertionTesterInterface")
-	}
-	if Implements(mockT, (*AssertionTesterInterface)(nil), new(AssertionTesterNonConformingObject)) {
-		t.Error("Implements method should return false: AssertionTesterNonConformingObject does not implements AssertionTesterInterface")
-	}
-
-}
-
-func TestIsType(t *testing.T) {
-
-	mockT := new(testing.T)
-
-	if !IsType(mockT, new(AssertionTesterConformingObject), new(AssertionTesterConformingObject)) {
-		t.Error("IsType should return true: AssertionTesterConformingObject is the same type as AssertionTesterConformingObject")
-	}
-	if IsType(mockT, new(AssertionTesterConformingObject), new(AssertionTesterNonConformingObject)) {
-		t.Error("IsType should return false: AssertionTesterConformingObject is not the same type as AssertionTesterNonConformingObject")
-	}
-
-}
-
-func TestEqual(t *testing.T) {
-
-	mockT := new(testing.T)
-
-	if !Equal(mockT, "Hello World", "Hello World") {
-		t.Error("Equal should return true")
-	}
-	if !Equal(mockT, 123, 123) {
-		t.Error("Equal should return true")
-	}
-	if !Equal(mockT, 123.5, 123.5) {
-		t.Error("Equal should return true")
-	}
-	if !Equal(mockT, []byte("Hello World"), []byte("Hello World")) {
-		t.Error("Equal should return true")
-	}
-	if !Equal(mockT, nil, nil) {
-		t.Error("Equal should return true")
-	}
-	if !Equal(mockT, int32(123), int32(123)) {
-		t.Error("Equal should return true")
-	}
-	if !Equal(mockT, uint64(123), uint64(123)) {
-		t.Error("Equal should return true")
-	}
-
-}
-
-func TestNotNil(t *testing.T) {
-
-	mockT := new(testing.T)
-
-	if !NotNil(mockT, new(AssertionTesterConformingObject)) {
-		t.Error("NotNil should return true: object is not nil")
-	}
-	if NotNil(mockT, nil) {
-		t.Error("NotNil should return false: object is nil")
-	}
-
-}
-
-func TestNil(t *testing.T) {
-
-	mockT := new(testing.T)
-
-	if !Nil(mockT, nil) {
-		t.Error("Nil should return true: object is nil")
-	}
-	if Nil(mockT, new(AssertionTesterConformingObject)) {
-		t.Error("Nil should return false: object is not nil")
-	}
-
-}
-
-func TestTrue(t *testing.T) {
-
-	mockT := new(testing.T)
-
-	if !True(mockT, true) {
-		t.Error("True should return true")
-	}
-	if True(mockT, false) {
-		t.Error("True should return false")
-	}
-
-}
-
-func TestFalse(t *testing.T) {
-
-	mockT := new(testing.T)
-
-	if !False(mockT, false) {
-		t.Error("False should return true")
-	}
-	if False(mockT, true) {
-		t.Error("False should return false")
-	}
-
-}
-
-func TestExactly(t *testing.T) {
-
-	mockT := new(testing.T)
-
-	a := float32(1)
-	b := float64(1)
-	c := float32(1)
-	d := float32(2)
-
-	if Exactly(mockT, a, b) {
-		t.Error("Exactly should return false")
-	}
-	if Exactly(mockT, a, d) {
-		t.Error("Exactly should return false")
-	}
-	if !Exactly(mockT, a, c) {
-		t.Error("Exactly should return true")
-	}
-
-	if Exactly(mockT, nil, a) {
-		t.Error("Exactly should return false")
-	}
-	if Exactly(mockT, a, nil) {
-		t.Error("Exactly should return false")
-	}
-
-}
-
-func TestNotEqual(t *testing.T) {
-
-	mockT := new(testing.T)
-
-	if !NotEqual(mockT, "Hello World", "Hello World!") {
-		t.Error("NotEqual should return true")
-	}
-	if !NotEqual(mockT, 123, 1234) {
-		t.Error("NotEqual should return true")
-	}
-	if !NotEqual(mockT, 123.5, 123.55) {
-		t.Error("NotEqual should return true")
-	}
-	if !NotEqual(mockT, []byte("Hello World"), []byte("Hello World!")) {
-		t.Error("NotEqual should return true")
-	}
-	if !NotEqual(mockT, nil, new(AssertionTesterConformingObject)) {
-		t.Error("NotEqual should return true")
-	}
-	funcA := func() int { return 23 }
-	funcB := func() int { return 42 }
-	if !NotEqual(mockT, funcA, funcB) {
-		t.Error("NotEqual should return true")
-	}
-
-	if NotEqual(mockT, "Hello World", "Hello World") {
-		t.Error("NotEqual should return false")
-	}
-	if NotEqual(mockT, 123, 123) {
-		t.Error("NotEqual should return false")
-	}
-	if NotEqual(mockT, 123.5, 123.5) {
-		t.Error("NotEqual should return false")
-	}
-	if NotEqual(mockT, []byte("Hello World"), []byte("Hello World")) {
-		t.Error("NotEqual should return false")
-	}
-	if NotEqual(mockT, new(AssertionTesterConformingObject), new(AssertionTesterConformingObject)) {
-		t.Error("NotEqual should return false")
-	}
-}
-
-type A struct {
-	Name, Value string
-}
-
-func TestContains(t *testing.T) {
-
-	mockT := new(testing.T)
-	list := []string{"Foo", "Bar"}
-	complexList := []*A{
-		{"b", "c"},
-		{"d", "e"},
-		{"g", "h"},
-		{"j", "k"},
-	}
-
-	if !Contains(mockT, "Hello World", "Hello") {
-		t.Error("Contains should return true: \"Hello World\" contains \"Hello\"")
-	}
-	if Contains(mockT, "Hello World", "Salut") {
-		t.Error("Contains should return false: \"Hello World\" does not contain \"Salut\"")
-	}
-
-	if !Contains(mockT, list, "Bar") {
-		t.Error("Contains should return true: \"[\"Foo\", \"Bar\"]\" contains \"Bar\"")
-	}
-	if Contains(mockT, list, "Salut") {
-		t.Error("Contains should return false: \"[\"Foo\", \"Bar\"]\" does not contain \"Salut\"")
-	}
-	if !Contains(mockT, complexList, &A{"g", "h"}) {
-		t.Error("Contains should return true: complexList contains {\"g\", \"h\"}")
-	}
-	if Contains(mockT, complexList, &A{"g", "e"}) {
-		t.Error("Contains should return false: complexList contains {\"g\", \"e\"}")
-	}
-}
-
-func TestNotContains(t *testing.T) {
-
-	mockT := new(testing.T)
-	list := []string{"Foo", "Bar"}
-
-	if !NotContains(mockT, "Hello World", "Hello!") {
-		t.Error("NotContains should return true: \"Hello World\" does not contain \"Hello!\"")
-	}
-	if NotContains(mockT, "Hello World", "Hello") {
-		t.Error("NotContains should return false: \"Hello World\" contains \"Hello\"")
-	}
-
-	if !NotContains(mockT, list, "Foo!") {
-		t.Error("NotContains should return true: \"[\"Foo\", \"Bar\"]\" does not contain \"Foo!\"")
-	}
-	if NotContains(mockT, list, "Foo") {
-		t.Error("NotContains should return false: \"[\"Foo\", \"Bar\"]\" contains \"Foo\"")
-	}
-
-}
-
-func Test_includeElement(t *testing.T) {
-
-	list1 := []string{"Foo", "Bar"}
-	list2 := []int{1, 2}
-
-	ok, found := includeElement("Hello World", "World")
-	True(t, ok)
-	True(t, found)
-
-	ok, found = includeElement(list1, "Foo")
-	True(t, ok)
-	True(t, found)
-
-	ok, found = includeElement(list1, "Bar")
-	True(t, ok)
-	True(t, found)
-
-	ok, found = includeElement(list2, 1)
-	True(t, ok)
-	True(t, found)
-
-	ok, found = includeElement(list2, 2)
-	True(t, ok)
-	True(t, found)
-
-	ok, found = includeElement(list1, "Foo!")
-	True(t, ok)
-	False(t, found)
-
-	ok, found = includeElement(list2, 3)
-	True(t, ok)
-	False(t, found)
-
-	ok, found = includeElement(list2, "1")
-	True(t, ok)
-	False(t, found)
-
-	ok, found = includeElement(1433, "1")
-	False(t, ok)
-	False(t, found)
-
-}
-
-func TestCondition(t *testing.T) {
-	mockT := new(testing.T)
-
-	if !Condition(mockT, func() bool { return true }, "Truth") {
-		t.Error("Condition should return true")
-	}
-
-	if Condition(mockT, func() bool { return false }, "Lie") {
-		t.Error("Condition should return false")
-	}
-
-}
-
-func TestDidPanic(t *testing.T) {
-
-	if funcDidPanic, _ := didPanic(func() {
-		panic("Panic!")
-	}); !funcDidPanic {
-		t.Error("didPanic should return true")
-	}
-
-	if funcDidPanic, _ := didPanic(func() {
-	}); funcDidPanic {
-		t.Error("didPanic should return false")
-	}
-
-}
-
-func TestPanics(t *testing.T) {
-
-	mockT := new(testing.T)
-
-	if !Panics(mockT, func() {
-		panic("Panic!")
-	}) {
-		t.Error("Panics should return true")
-	}
-
-	if Panics(mockT, func() {
-	}) {
-		t.Error("Panics should return false")
-	}
-
-}
-
-func TestNotPanics(t *testing.T) {
-
-	mockT := new(testing.T)
-
-	if !NotPanics(mockT, func() {
-	}) {
-		t.Error("NotPanics should return true")
-	}
-
-	if NotPanics(mockT, func() {
-		panic("Panic!")
-	}) {
-		t.Error("NotPanics should return false")
-	}
-
-}
-
-func TestNoError(t *testing.T) {
-
-	mockT := new(testing.T)
-
-	// start with a nil error
-	var err error
-
-	True(t, NoError(mockT, err), "NoError should return True for nil arg")
-
-	// now set an error
-	err = errors.New("some error")
-
-	False(t, NoError(mockT, err), "NoError with error should return False")
-
-}
-
-func TestError(t *testing.T) {
-
-	mockT := new(testing.T)
-
-	// start with a nil error
-	var err error
-
-	False(t, Error(mockT, err), "Error should return False for nil arg")
-
-	// now set an error
-	err = errors.New("some error")
-
-	True(t, Error(mockT, err), "Error with error should return True")
-
-}
-
-func TestEqualError(t *testing.T) {
-	mockT := new(testing.T)
-
-	// start with a nil error
-	var err error
-	False(t, EqualError(mockT, err, ""),
-		"EqualError should return false for nil arg")
-
-	// now set an error
-	err = errors.New("some error")
-	False(t, EqualError(mockT, err, "Not some error"),
-		"EqualError should return false for different error string")
-	True(t, EqualError(mockT, err, "some error"),
-		"EqualError should return true")
-}
-
-func Test_isEmpty(t *testing.T) {
-
-	chWithValue := make(chan struct{}, 1)
-	chWithValue <- struct{}{}
-
-	True(t, isEmpty(""))
-	True(t, isEmpty(nil))
-	True(t, isEmpty([]string{}))
-	True(t, isEmpty(0))
-	True(t, isEmpty(int32(0)))
-	True(t, isEmpty(int64(0)))
-	True(t, isEmpty(false))
-	True(t, isEmpty(map[string]string{}))
-	True(t, isEmpty(new(time.Time)))
-	True(t, isEmpty(make(chan struct{})))
-	False(t, isEmpty("something"))
-	False(t, isEmpty(errors.New("something")))
-	False(t, isEmpty([]string{"something"}))
-	False(t, isEmpty(1))
-	False(t, isEmpty(true))
-	False(t, isEmpty(map[string]string{"Hello": "World"}))
-	False(t, isEmpty(chWithValue))
-
-}
-
-func TestEmpty(t *testing.T) {
-
-	mockT := new(testing.T)
-	chWithValue := make(chan struct{}, 1)
-	chWithValue <- struct{}{}
-
-	True(t, Empty(mockT, ""), "Empty string is empty")
-	True(t, Empty(mockT, nil), "Nil is empty")
-	True(t, Empty(mockT, []string{}), "Empty string array is empty")
-	True(t, Empty(mockT, 0), "Zero int value is empty")
-	True(t, Empty(mockT, false), "False value is empty")
-	True(t, Empty(mockT, make(chan struct{})), "Channel without values is empty")
-
-	False(t, Empty(mockT, "something"), "Non Empty string is not empty")
-	False(t, Empty(mockT, errors.New("something")), "Non nil object is not empty")
-	False(t, Empty(mockT, []string{"something"}), "Non empty string array is not empty")
-	False(t, Empty(mockT, 1), "Non-zero int value is not empty")
-	False(t, Empty(mockT, true), "True value is not empty")
-	False(t, Empty(mockT, chWithValue), "Channel with values is not empty")
-}
-
-func TestNotEmpty(t *testing.T) {
-
-	mockT := new(testing.T)
-	chWithValue := make(chan struct{}, 1)
-	chWithValue <- struct{}{}
-
-	False(t, NotEmpty(mockT, ""), "Empty string is empty")
-	False(t, NotEmpty(mockT, nil), "Nil is empty")
-	False(t, NotEmpty(mockT, []string{}), "Empty string array is empty")
-	False(t, NotEmpty(mockT, 0), "Zero int value is empty")
-	False(t, NotEmpty(mockT, false), "False value is empty")
-	False(t, NotEmpty(mockT, make(chan struct{})), "Channel without values is empty")
-
-	True(t, NotEmpty(mockT, "something"), "Non Empty string is not empty")
-	True(t, NotEmpty(mockT, errors.New("something")), "Non nil object is not empty")
-	True(t, NotEmpty(mockT, []string{"something"}), "Non empty string array is not empty")
-	True(t, NotEmpty(mockT, 1), "Non-zero int value is not empty")
-	True(t, NotEmpty(mockT, true), "True value is not empty")
-	True(t, NotEmpty(mockT, chWithValue), "Channel with values is not empty")
-}
-
-func Test_getLen(t *testing.T) {
-	falseCases := []interface{}{
-		nil,
-		0,
-		true,
-		false,
-		'A',
-		struct{}{},
-	}
-	for _, v := range falseCases {
-		ok, l := getLen(v)
-		False(t, ok, "Expected getLen fail to get length of %#v", v)
-		Equal(t, 0, l, "getLen should return 0 for %#v", v)
-	}
-
-	ch := make(chan int, 5)
-	ch <- 1
-	ch <- 2
-	ch <- 3
-	trueCases := []struct {
-		v interface{}
-		l int
-	}{
-		{[]int{1, 2, 3}, 3},
-		{[...]int{1, 2, 3}, 3},
-		{"ABC", 3},
-		{map[int]int{1: 2, 2: 4, 3: 6}, 3},
-		{ch, 3},
-
-		{[]int{}, 0},
-		{map[int]int{}, 0},
-		{make(chan int), 0},
-
-		{[]int(nil), 0},
-		{map[int]int(nil), 0},
-		{(chan int)(nil), 0},
-	}
-
-	for _, c := range trueCases {
-		ok, l := getLen(c.v)
-		True(t, ok, "Expected getLen success to get length of %#v", c.v)
-		Equal(t, c.l, l)
-	}
-}
-
-func TestLen(t *testing.T) {
-	mockT := new(testing.T)
-
-	False(t, Len(mockT, nil, 0), "nil does not have length")
-	False(t, Len(mockT, 0, 0), "int does not have length")
-	False(t, Len(mockT, true, 0), "true does not have length")
-	False(t, Len(mockT, false, 0), "false does not have length")
-	False(t, Len(mockT, 'A', 0), "Rune does not have length")
-	False(t, Len(mockT, struct{}{}, 0), "Struct does not have length")
-
-	ch := make(chan int, 5)
-	ch <- 1
-	ch <- 2
-	ch <- 3
-
-	cases := []struct {
-		v interface{}
-		l int
-	}{
-		{[]int{1, 2, 3}, 3},
-		{[...]int{1, 2, 3}, 3},
-		{"ABC", 3},
-		{map[int]int{1: 2, 2: 4, 3: 6}, 3},
-		{ch, 3},
-
-		{[]int{}, 0},
-		{map[int]int{}, 0},
-		{make(chan int), 0},
-
-		{[]int(nil), 0},
-		{map[int]int(nil), 0},
-		{(chan int)(nil), 0},
-	}
-
-	for _, c := range cases {
-		True(t, Len(mockT, c.v, c.l), "%#v have %d items", c.v, c.l)
-	}
-
-	cases = []struct {
-		v interface{}
-		l int
-	}{
-		{[]int{1, 2, 3}, 4},
-		{[...]int{1, 2, 3}, 2},
-		{"ABC", 2},
-		{map[int]int{1: 2, 2: 4, 3: 6}, 4},
-		{ch, 2},
-
-		{[]int{}, 1},
-		{map[int]int{}, 1},
-		{make(chan int), 1},
-
-		{[]int(nil), 1},
-		{map[int]int(nil), 1},
-		{(chan int)(nil), 1},
-	}
-
-	for _, c := range cases {
-		False(t, Len(mockT, c.v, c.l), "%#v have %d items", c.v, c.l)
-	}
-}
-
-func TestWithinDuration(t *testing.T) {
-
-	mockT := new(testing.T)
-	a := time.Now()
-	b := a.Add(10 * time.Second)
-
-	True(t, WithinDuration(mockT, a, b, 10*time.Second), "A 10s difference is within a 10s time difference")
-	True(t, WithinDuration(mockT, b, a, 10*time.Second), "A 10s difference is within a 10s time difference")
-
-	False(t, WithinDuration(mockT, a, b, 9*time.Second), "A 10s difference is not within a 9s time difference")
-	False(t, WithinDuration(mockT, b, a, 9*time.Second), "A 10s difference is not within a 9s time difference")
-
-	False(t, WithinDuration(mockT, a, b, -9*time.Second), "A 10s difference is not within a 9s time difference")
-	False(t, WithinDuration(mockT, b, a, -9*time.Second), "A 10s difference is not within a 9s time difference")
-
-	False(t, WithinDuration(mockT, a, b, -11*time.Second), "A 10s difference is not within a 9s time difference")
-	False(t, WithinDuration(mockT, b, a, -11*time.Second), "A 10s difference is not within a 9s time difference")
-}
-
-func TestInDelta(t *testing.T) {
-	mockT := new(testing.T)
-
-	True(t, InDelta(mockT, 1.001, 1, 0.01), "|1.001 - 1| <= 0.01")
-	True(t, InDelta(mockT, 1, 1.001, 0.01), "|1 - 1.001| <= 0.01")
-	True(t, InDelta(mockT, 1, 2, 1), "|1 - 2| <= 1")
-	False(t, InDelta(mockT, 1, 2, 0.5), "Expected |1 - 2| <= 0.5 to fail")
-	False(t, InDelta(mockT, 2, 1, 0.5), "Expected |2 - 1| <= 0.5 to fail")
-	False(t, InDelta(mockT, "", nil, 1), "Expected non numerals to fail")
-	False(t, InDelta(mockT, 42, math.NaN(), 0.01), "Expected NaN for actual to fail")
-	False(t, InDelta(mockT, math.NaN(), 42, 0.01), "Expected NaN for expected to fail")
-
-	cases := []struct {
-		a, b  interface{}
-		delta float64
-	}{
-		{uint8(2), uint8(1), 1},
-		{uint16(2), uint16(1), 1},
-		{uint32(2), uint32(1), 1},
-		{uint64(2), uint64(1), 1},
-
-		{int(2), int(1), 1},
-		{int8(2), int8(1), 1},
-		{int16(2), int16(1), 1},
-		{int32(2), int32(1), 1},
-		{int64(2), int64(1), 1},
-
-		{float32(2), float32(1), 1},
-		{float64(2), float64(1), 1},
-	}
-
-	for _, tc := range cases {
-		True(t, InDelta(mockT, tc.a, tc.b, tc.delta), "Expected |%V - %V| <= %v", tc.a, tc.b, tc.delta)
-	}
-}
-
-func TestInDeltaSlice(t *testing.T) {
-	mockT := new(testing.T)
-
-	True(t, InDeltaSlice(mockT,
-		[]float64{1.001, 0.999},
-		[]float64{1, 1},
-		0.1), "{1.001, 0.009} is element-wise close to {1, 1} in delta=0.1")
-
-	True(t, InDeltaSlice(mockT,
-		[]float64{1, 2},
-		[]float64{0, 3},
-		1), "{1, 2} is element-wise close to {0, 3} in delta=1")
-
-	False(t, InDeltaSlice(mockT,
-		[]float64{1, 2},
-		[]float64{0, 3},
-		0.1), "{1, 2} is not element-wise close to {0, 3} in delta=0.1")
-
-	False(t, InDeltaSlice(mockT, "", nil, 1), "Expected non numeral slices to fail")
-}
-
-func TestInEpsilon(t *testing.T) {
-	mockT := new(testing.T)
-
-	cases := []struct {
-		a, b    interface{}
-		epsilon float64
-	}{
-		{uint8(2), uint16(2), .001},
-		{2.1, 2.2, 0.1},
-		{2.2, 2.1, 0.1},
-		{-2.1, -2.2, 0.1},
-		{-2.2, -2.1, 0.1},
-		{uint64(100), uint8(101), 0.01},
-		{0.1, -0.1, 2},
-	}
-
-	for _, tc := range cases {
-		True(t, InEpsilon(mockT, tc.a, tc.b, tc.epsilon, "Expected %V and %V to have a relative difference of %v", tc.a, tc.b, tc.epsilon))
-	}
-
-	cases = []struct {
-		a, b    interface{}
-		epsilon float64
-	}{
-		{uint8(2), int16(-2), .001},
-		{uint64(100), uint8(102), 0.01},
-		{2.1, 2.2, 0.001},
-		{2.2, 2.1, 0.001},
-		{2.1, -2.2, 1},
-		{2.1, "bla-bla", 0},
-		{0.1, -0.1, 1.99},
-	}
-
-	for _, tc := range cases {
-		False(t, InEpsilon(mockT, tc.a, tc.b, tc.epsilon, "Expected %V and %V to have a relative difference of %v", tc.a, tc.b, tc.epsilon))
-	}
-
-}
-
-func TestInEpsilonSlice(t *testing.T) {
-	mockT := new(testing.T)
-
-	True(t, InEpsilonSlice(mockT,
-		[]float64{2.2, 2.0},
-		[]float64{2.1, 2.1},
-		0.06), "{2.2, 2.0} is element-wise close to {2.1, 2.1} in espilon=0.06")
-
-	False(t, InEpsilonSlice(mockT,
-		[]float64{2.2, 2.0},
-		[]float64{2.1, 2.1},
-		0.04), "{2.2, 2.0} is not element-wise close to {2.1, 2.1} in espilon=0.04")
-
-	False(t, InEpsilonSlice(mockT, "", nil, 1), "Expected non numeral slices to fail")
-}
-
-func TestRegexp(t *testing.T) {
-	mockT := new(testing.T)
-
-	cases := []struct {
-		rx, str string
-	}{
-		{"^start", "start of the line"},
-		{"end$", "in the end"},
-		{"[0-9]{3}[.-]?[0-9]{2}[.-]?[0-9]{2}", "My phone number is 650.12.34"},
-	}
-
-	for _, tc := range cases {
-		True(t, Regexp(mockT, tc.rx, tc.str))
-		True(t, Regexp(mockT, regexp.MustCompile(tc.rx), tc.str))
-		False(t, NotRegexp(mockT, tc.rx, tc.str))
-		False(t, NotRegexp(mockT, regexp.MustCompile(tc.rx), tc.str))
-	}
-
-	cases = []struct {
-		rx, str string
-	}{
-		{"^asdfastart", "Not the start of the line"},
-		{"end$", "in the end."},
-		{"[0-9]{3}[.-]?[0-9]{2}[.-]?[0-9]{2}", "My phone number is 650.12a.34"},
-	}
-
-	for _, tc := range cases {
-		False(t, Regexp(mockT, tc.rx, tc.str), "Expected \"%s\" to not match \"%s\"", tc.rx, tc.str)
-		False(t, Regexp(mockT, regexp.MustCompile(tc.rx), tc.str))
-		True(t, NotRegexp(mockT, tc.rx, tc.str))
-		True(t, NotRegexp(mockT, regexp.MustCompile(tc.rx), tc.str))
-	}
-}
-
-func testAutogeneratedFunction() {
-	defer func() {
-		if err := recover(); err == nil {
-			panic("did not panic")
-		}
-		CallerInfo()
-	}()
-	t := struct {
-		io.Closer
-	}{}
-	var c io.Closer
-	c = t
-	c.Close()
-}
-
-func TestCallerInfoWithAutogeneratedFunctions(t *testing.T) {
-	NotPanics(t, func() {
-		testAutogeneratedFunction()
-	})
-}
diff --git a/Godeps/_workspace/src/github.com/stretchr/testify/assert/doc.go b/Godeps/_workspace/src/github.com/stretchr/testify/assert/doc.go
deleted file mode 100644
index d10a8a14e..000000000
--- a/Godeps/_workspace/src/github.com/stretchr/testify/assert/doc.go
+++ /dev/null
@@ -1,154 +0,0 @@
-// Package assert provides a set of comprehensive testing tools for use with the normal Go testing system.
-//
-// Example Usage
-//
-// The following is a complete example using assert in a standard test function:
-//    import (
-//      "testing"
-//      "github.com/stretchr/testify/assert"
-//    )
-//
-//    func TestSomething(t *testing.T) {
-//
-//      var a string = "Hello"
-//      var b string = "Hello"
-//
-//      assert.Equal(t, a, b, "The two words should be the same.")
-//
-//    }
-//
-// if you assert many times, use the format below:
-//
-//    import (
-//      "testing"
-//      "github.com/stretchr/testify/assert"
-//    )
-//
-//    func TestSomething(t *testing.T) {
-//      assert := assert.New(t)
-//
-//      var a string = "Hello"
-//      var b string = "Hello"
-//
-//      assert.Equal(a, b, "The two words should be the same.")
-//    }
-//
-// Assertions
-//
-// Assertions allow you to easily write test code, and are global funcs in the `assert` package.
-// All assertion functions take, as the first argument, the `*testing.T` object provided by the
-// testing framework. This allows the assertion funcs to write the failings and other details to
-// the correct place.
-//
-// Every assertion function also takes an optional string message as the final argument,
-// allowing custom error messages to be appended to the message the assertion method outputs.
-//
-// Here is an overview of the assert functions:
-//
-//    assert.Equal(t, expected, actual [, message [, format-args]])
-//
-//    assert.EqualValues(t, expected, actual [, message [, format-args]])
-//
-//    assert.NotEqual(t, notExpected, actual [, message [, format-args]])
-//
-//    assert.True(t, actualBool [, message [, format-args]])
-//
-//    assert.False(t, actualBool [, message [, format-args]])
-//
-//    assert.Nil(t, actualObject [, message [, format-args]])
-//
-//    assert.NotNil(t, actualObject [, message [, format-args]])
-//
-//    assert.Empty(t, actualObject [, message [, format-args]])
-//
-//    assert.NotEmpty(t, actualObject [, message [, format-args]])
-//
-//    assert.Len(t, actualObject, expectedLength, [, message [, format-args]])
-//
-//    assert.Error(t, errorObject [, message [, format-args]])
-//
-//    assert.NoError(t, errorObject [, message [, format-args]])
-//
-//    assert.EqualError(t, theError, errString [, message [, format-args]])
-//
-//    assert.Implements(t, (*MyInterface)(nil), new(MyObject) [,message [, format-args]])
-//
-//    assert.IsType(t, expectedObject, actualObject [, message [, format-args]])
-//
-//    assert.Contains(t, stringOrSlice, substringOrElement [, message [, format-args]])
-//
-//    assert.NotContains(t, stringOrSlice, substringOrElement [, message [, format-args]])
-//
-//    assert.Panics(t, func(){
-//
-//	    // call code that should panic
-//
-//    } [, message [, format-args]])
-//
-//    assert.NotPanics(t, func(){
-//
-//	    // call code that should not panic
-//
-//    } [, message [, format-args]])
-//
-//    assert.WithinDuration(t, timeA, timeB, deltaTime, [, message [, format-args]])
-//
-//    assert.InDelta(t, numA, numB, delta, [, message [, format-args]])
-//
-//    assert.InEpsilon(t, numA, numB, epsilon, [, message [, format-args]])
-//
-// assert package contains Assertions object. it has assertion methods.
-//
-// Here is an overview of the assert functions:
-//    assert.Equal(expected, actual [, message [, format-args]])
-//
-//    assert.EqualValues(expected, actual [, message [, format-args]])
-//
-//    assert.NotEqual(notExpected, actual [, message [, format-args]])
-//
-//    assert.True(actualBool [, message [, format-args]])
-//
-//    assert.False(actualBool [, message [, format-args]])
-//
-//    assert.Nil(actualObject [, message [, format-args]])
-//
-//    assert.NotNil(actualObject [, message [, format-args]])
-//
-//    assert.Empty(actualObject [, message [, format-args]])
-//
-//    assert.NotEmpty(actualObject [, message [, format-args]])
-//
-//    assert.Len(actualObject, expectedLength, [, message [, format-args]])
-//
-//    assert.Error(errorObject [, message [, format-args]])
-//
-//    assert.NoError(errorObject [, message [, format-args]])
-//
-//    assert.EqualError(theError, errString [, message [, format-args]])
-//
-//    assert.Implements((*MyInterface)(nil), new(MyObject) [,message [, format-args]])
-//
-//    assert.IsType(expectedObject, actualObject [, message [, format-args]])
-//
-//    assert.Contains(stringOrSlice, substringOrElement [, message [, format-args]])
-//
-//    assert.NotContains(stringOrSlice, substringOrElement [, message [, format-args]])
-//
-//    assert.Panics(func(){
-//
-//	    // call code that should panic
-//
-//    } [, message [, format-args]])
-//
-//    assert.NotPanics(func(){
-//
-//	    // call code that should not panic
-//
-//    } [, message [, format-args]])
-//
-//    assert.WithinDuration(timeA, timeB, deltaTime, [, message [, format-args]])
-//
-//    assert.InDelta(numA, numB, delta, [, message [, format-args]])
-//
-//    assert.InEpsilon(numA, numB, epsilon, [, message [, format-args]])
-package assert
diff --git a/Godeps/_workspace/src/github.com/stretchr/testify/assert/errors.go b/Godeps/_workspace/src/github.com/stretchr/testify/assert/errors.go
deleted file mode 100644
index ac9dc9d1d..000000000
--- a/Godeps/_workspace/src/github.com/stretchr/testify/assert/errors.go
+++ /dev/null
@@ -1,10 +0,0 @@
-package assert
-
-import (
-	"errors"
-)
-
-// AnError is an error instance useful for testing.  If the code does not care
-// about error specifics, and only needs to return the error for example, this
-// error should be used to make the test code more readable.
-var AnError = errors.New("assert.AnError general error for testing")
diff --git a/Godeps/_workspace/src/github.com/stretchr/testify/assert/forward_assertions.go b/Godeps/_workspace/src/github.com/stretchr/testify/assert/forward_assertions.go
deleted file mode 100644
index d8d3f531e..000000000
--- a/Godeps/_workspace/src/github.com/stretchr/testify/assert/forward_assertions.go
+++ /dev/null
@@ -1,265 +0,0 @@
-package assert
-
-import "time"
-
-// Assertions provides assertion methods around the
-// TestingT interface.
-type Assertions struct {
-	t TestingT
-}
-
-// New makes a new Assertions object for the specified TestingT.
-func New(t TestingT) *Assertions {
-	return &Assertions{
-		t: t,
-	}
-}
-
-// Fail reports a failure through
-func (a *Assertions) Fail(failureMessage string, msgAndArgs ...interface{}) bool {
-	return Fail(a.t, failureMessage, msgAndArgs...)
-}
-
-// Implements asserts that an object is implemented by the specified interface.
-//
-//    assert.Implements((*MyInterface)(nil), new(MyObject), "MyObject")
-func (a *Assertions) Implements(interfaceObject interface{}, object interface{}, msgAndArgs ...interface{}) bool {
-	return Implements(a.t, interfaceObject, object, msgAndArgs...)
-}
-
-// IsType asserts that the specified objects are of the same type.
-func (a *Assertions) IsType(expectedType interface{}, object interface{}, msgAndArgs ...interface{}) bool {
-	return IsType(a.t, expectedType, object, msgAndArgs...)
-}
-
-// Equal asserts that two objects are equal.
-//
-//    assert.Equal(123, 123, "123 and 123 should be equal")
-//
-// Returns whether the assertion was successful (true) or not (false).
-func (a *Assertions) Equal(expected, actual interface{}, msgAndArgs ...interface{}) bool {
-	return Equal(a.t, expected, actual, msgAndArgs...)
-}
-
-// EqualValues asserts that two objects are equal or convertable to the same types
-// and equal.
-//
-//    assert.EqualValues(uint32(123), int32(123), "123 and 123 should be equal")
-//
-// Returns whether the assertion was successful (true) or not (false).
-func (a *Assertions) EqualValues(expected, actual interface{}, msgAndArgs ...interface{}) bool {
-	return EqualValues(a.t, expected, actual, msgAndArgs...)
-}
-
-// Exactly asserts that two objects are equal is value and type.
-//
-//    assert.Exactly(int32(123), int64(123), "123 and 123 should NOT be equal")
-//
-// Returns whether the assertion was successful (true) or not (false).
-func (a *Assertions) Exactly(expected, actual interface{}, msgAndArgs ...interface{}) bool {
-	return Exactly(a.t, expected, actual, msgAndArgs...)
-}
-
-// NotNil asserts that the specified object is not nil.
-//
-//    assert.NotNil(err, "err should be something")
-//
-// Returns whether the assertion was successful (true) or not (false).
-func (a *Assertions) NotNil(object interface{}, msgAndArgs ...interface{}) bool {
-	return NotNil(a.t, object, msgAndArgs...)
-}
-
-// Nil asserts that the specified object is nil.
-//
-//    assert.Nil(err, "err should be nothing")
-//
-// Returns whether the assertion was successful (true) or not (false).
-func (a *Assertions) Nil(object interface{}, msgAndArgs ...interface{}) bool {
-	return Nil(a.t, object, msgAndArgs...)
-}
-
-// Empty asserts that the specified object is empty.  I.e. nil, "", false, 0 or a
-// slice with len == 0.
-//
-// assert.Empty(obj)
-//
-// Returns whether the assertion was successful (true) or not (false).
-func (a *Assertions) Empty(object interface{}, msgAndArgs ...interface{}) bool {
-	return Empty(a.t, object, msgAndArgs...)
-}
-
-// NotEmpty asserts that the specified object is NOT empty.  I.e. not nil, "", false, 0 or a
-// slice with len == 0.
-//
-// if assert.NotEmpty(obj) {
-//   assert.Equal("two", obj[1])
-// }
-//
-// Returns whether the assertion was successful (true) or not (false).
-func (a *Assertions) NotEmpty(object interface{}, msgAndArgs ...interface{}) bool {
-	return NotEmpty(a.t, object, msgAndArgs...)
-}
-
-// Len asserts that the specified object has specific length.
-// Len also fails if the object has a type that len() not accept.
-//
-//    assert.Len(mySlice, 3, "The size of slice is not 3")
-//
-// Returns whether the assertion was successful (true) or not (false).
-func (a *Assertions) Len(object interface{}, length int, msgAndArgs ...interface{}) bool {
-	return Len(a.t, object, length, msgAndArgs...)
-}
-
-// True asserts that the specified value is true.
-//
-//    assert.True(myBool, "myBool should be true")
-//
-// Returns whether the assertion was successful (true) or not (false).
-func (a *Assertions) True(value bool, msgAndArgs ...interface{}) bool {
-	return True(a.t, value, msgAndArgs...)
-}
-
-// False asserts that the specified value is true.
-//
-//    assert.False(myBool, "myBool should be false")
-//
-// Returns whether the assertion was successful (true) or not (false).
-func (a *Assertions) False(value bool, msgAndArgs ...interface{}) bool {
-	return False(a.t, value, msgAndArgs...)
-}
-
-// NotEqual asserts that the specified values are NOT equal.
-//
-//    assert.NotEqual(obj1, obj2, "two objects shouldn't be equal")
-//
-// Returns whether the assertion was successful (true) or not (false).
-func (a *Assertions) NotEqual(expected, actual interface{}, msgAndArgs ...interface{}) bool {
-	return NotEqual(a.t, expected, actual, msgAndArgs...)
-}
-
-// Contains asserts that the specified string contains the specified substring.
-//
-//    assert.Contains("Hello World", "World", "But 'Hello World' does contain 'World'")
-//
-// Returns whether the assertion was successful (true) or not (false).
-func (a *Assertions) Contains(s, contains interface{}, msgAndArgs ...interface{}) bool {
-	return Contains(a.t, s, contains, msgAndArgs...)
-}
-
-// NotContains asserts that the specified string does NOT contain the specified substring.
-//
-//    assert.NotContains("Hello World", "Earth", "But 'Hello World' does NOT contain 'Earth'")
-//
-// Returns whether the assertion was successful (true) or not (false).
-func (a *Assertions) NotContains(s, contains interface{}, msgAndArgs ...interface{}) bool {
-	return NotContains(a.t, s, contains, msgAndArgs...)
-}
-
-// Condition uses a Comparison to assert a complex condition.
-func (a *Assertions) Condition(comp Comparison, msgAndArgs ...interface{}) bool {
-	return Condition(a.t, comp, msgAndArgs...)
-}
-
-// Panics asserts that the code inside the specified PanicTestFunc panics.
-//
-//   assert.Panics(func(){
-//     GoCrazy()
-//   }, "Calling GoCrazy() should panic")
-//
-// Returns whether the assertion was successful (true) or not (false).
-func (a *Assertions) Panics(f PanicTestFunc, msgAndArgs ...interface{}) bool {
-	return Panics(a.t, f, msgAndArgs...)
-}
-
-// NotPanics asserts that the code inside the specified PanicTestFunc does NOT panic.
-//
-//   assert.NotPanics(func(){
-//     RemainCalm()
-//   }, "Calling RemainCalm() should NOT panic")
-//
-// Returns whether the assertion was successful (true) or not (false).
-func (a *Assertions) NotPanics(f PanicTestFunc, msgAndArgs ...interface{}) bool {
-	return NotPanics(a.t, f, msgAndArgs...)
-}
-
-// WithinDuration asserts that the two times are within duration delta of each other.
-//
-//   assert.WithinDuration(time.Now(), time.Now(), 10*time.Second, "The difference should not be more than 10s")
-//
-// Returns whether the assertion was successful (true) or not (false).
-func (a *Assertions) WithinDuration(expected, actual time.Time, delta time.Duration, msgAndArgs ...interface{}) bool {
-	return WithinDuration(a.t, expected, actual, delta, msgAndArgs...)
-}
-
-// InDelta asserts that the two numerals are within delta of each other.
-//
-// 	 assert.InDelta(t, math.Pi, (22 / 7.0), 0.01)
-//
-// Returns whether the assertion was successful (true) or not (false).
-func (a *Assertions) InDelta(expected, actual interface{}, delta float64, msgAndArgs ...interface{}) bool {
-	return InDelta(a.t, expected, actual, delta, msgAndArgs...)
-}
-
-// InEpsilon asserts that expected and actual have a relative error less than epsilon
-//
-// Returns whether the assertion was successful (true) or not (false).
-func (a *Assertions) InEpsilon(expected, actual interface{}, epsilon float64, msgAndArgs ...interface{}) bool {
-	return InEpsilon(a.t, expected, actual, epsilon, msgAndArgs...)
-}
-
-// NoError asserts that a function returned no error (i.e. `nil`).
-//
-//   actualObj, err := SomeFunction()
-//   if assert.NoError(err) {
-//	   assert.Equal(actualObj, expectedObj)
-//   }
-//
-// Returns whether the assertion was successful (true) or not (false).
-func (a *Assertions) NoError(theError error, msgAndArgs ...interface{}) bool {
-	return NoError(a.t, theError, msgAndArgs...)
-}
-
-// Error asserts that a function returned an error (i.e. not `nil`).
-//
-//   actualObj, err := SomeFunction()
-//   if assert.Error(err, "An error was expected") {
-//	   assert.Equal(err, expectedError)
-//   }
-//
-// Returns whether the assertion was successful (true) or not (false).
-func (a *Assertions) Error(theError error, msgAndArgs ...interface{}) bool {
-	return Error(a.t, theError, msgAndArgs...)
-}
-
-// EqualError asserts that a function returned an error (i.e. not `nil`)
-// and that it is equal to the provided error.
-//
-//   actualObj, err := SomeFunction()
-//   if assert.Error(err, "An error was expected") {
-//	   assert.Equal(err, expectedError)
-//   }
-//
-// Returns whether the assertion was successful (true) or not (false).
-func (a *Assertions) EqualError(theError error, errString string, msgAndArgs ...interface{}) bool {
-	return EqualError(a.t, theError, errString, msgAndArgs...)
-}
-
-// Regexp asserts that a specified regexp matches a string.
-//
-//  assert.Regexp(t, regexp.MustCompile("start"), "it's starting")
-//  assert.Regexp(t, "start...$", "it's not starting")
-//
-// Returns whether the assertion was successful (true) or not (false).
-func (a *Assertions) Regexp(rx interface{}, str interface{}, msgAndArgs ...interface{}) bool {
-	return Regexp(a.t, rx, str, msgAndArgs...)
-}
-
-// NotRegexp asserts that a specified regexp does not match a string.
-//
-//  assert.NotRegexp(t, regexp.MustCompile("starts"), "it's starting")
-//  assert.NotRegexp(t, "^start", "it's not starting")
-//
-// Returns whether the assertion was successful (true) or not (false).
-func (a *Assertions) NotRegexp(rx interface{}, str interface{}, msgAndArgs ...interface{}) bool {
-	return NotRegexp(a.t, rx, str, msgAndArgs...)
-}
diff --git a/Godeps/_workspace/src/github.com/stretchr/testify/assert/forward_assertions_test.go b/Godeps/_workspace/src/github.com/stretchr/testify/assert/forward_assertions_test.go
deleted file mode 100644
index 3df3f3917..000000000
--- a/Godeps/_workspace/src/github.com/stretchr/testify/assert/forward_assertions_test.go
+++ /dev/null
@@ -1,511 +0,0 @@
-package assert
-
-import (
-	"errors"
-	"regexp"
-	"testing"
-	"time"
-)
-
-func TestImplementsWrapper(t *testing.T) {
-	assert := New(new(testing.T))
-
-	if !assert.Implements((*AssertionTesterInterface)(nil), new(AssertionTesterConformingObject)) {
-		t.Error("Implements method should return true: AssertionTesterConformingObject implements AssertionTesterInterface")
-	}
-	if assert.Implements((*AssertionTesterInterface)(nil), new(AssertionTesterNonConformingObject)) {
-		t.Error("Implements method should return false: AssertionTesterNonConformingObject does not implements AssertionTesterInterface")
-	}
-}
-
-func TestIsTypeWrapper(t *testing.T) {
-	assert := New(new(testing.T))
-
-	if !assert.IsType(new(AssertionTesterConformingObject), new(AssertionTesterConformingObject)) {
-		t.Error("IsType should return true: AssertionTesterConformingObject is the same type as AssertionTesterConformingObject")
-	}
-	if assert.IsType(new(AssertionTesterConformingObject), new(AssertionTesterNonConformingObject)) {
-		t.Error("IsType should return false: AssertionTesterConformingObject is not the same type as AssertionTesterNonConformingObject")
-	}
-
-}
-
-func TestEqualWrapper(t *testing.T) {
-	assert := New(new(testing.T))
-
-	if !assert.Equal("Hello World", "Hello World") {
-		t.Error("Equal should return true")
-	}
-	if !assert.Equal(123, 123) {
-		t.Error("Equal should return true")
-	}
-	if !assert.Equal(123.5, 123.5) {
-		t.Error("Equal should return true")
-	}
-	if !assert.Equal([]byte("Hello World"), []byte("Hello World")) {
-		t.Error("Equal should return true")
-	}
-	if !assert.Equal(nil, nil) {
-		t.Error("Equal should return true")
-	}
-}
-
-func TestEqualValuesWrapper(t *testing.T) {
-	assert := New(new(testing.T))
-
-	if !assert.EqualValues(uint32(10), int32(10)) {
-		t.Error("EqualValues should return true")
-	}
-}
-
-func TestNotNilWrapper(t *testing.T) {
-	assert := New(new(testing.T))
-
-	if !assert.NotNil(new(AssertionTesterConformingObject)) {
-		t.Error("NotNil should return true: object is not nil")
-	}
-	if assert.NotNil(nil) {
-		t.Error("NotNil should return false: object is nil")
-	}
-
-}
-
-func TestNilWrapper(t *testing.T) {
-	assert := New(new(testing.T))
-
-	if !assert.Nil(nil) {
-		t.Error("Nil should return true: object is nil")
-	}
-	if assert.Nil(new(AssertionTesterConformingObject)) {
-		t.Error("Nil should return false: object is not nil")
-	}
-
-}
-
-func TestTrueWrapper(t *testing.T) {
-	assert := New(new(testing.T))
-
-	if !assert.True(true) {
-		t.Error("True should return true")
-	}
-	if assert.True(false) {
-		t.Error("True should return false")
-	}
-
-}
-
-func TestFalseWrapper(t *testing.T) {
-	assert := New(new(testing.T))
-
-	if !assert.False(false) {
-		t.Error("False should return true")
-	}
-	if assert.False(true) {
-		t.Error("False should return false")
-	}
-
-}
-
-func TestExactlyWrapper(t *testing.T) {
-	assert := New(new(testing.T))
-
-	a := float32(1)
-	b := float64(1)
-	c := float32(1)
-	d := float32(2)
-
-	if assert.Exactly(a, b) {
-		t.Error("Exactly should return false")
-	}
-	if assert.Exactly(a, d) {
-		t.Error("Exactly should return false")
-	}
-	if !assert.Exactly(a, c) {
-		t.Error("Exactly should return true")
-	}
-
-	if assert.Exactly(nil, a) {
-		t.Error("Exactly should return false")
-	}
-	if assert.Exactly(a, nil) {
-		t.Error("Exactly should return false")
-	}
-
-}
-
-func TestNotEqualWrapper(t *testing.T) {
-
-	assert := New(new(testing.T))
-
-	if !assert.NotEqual("Hello World", "Hello World!") {
-		t.Error("NotEqual should return true")
-	}
-	if !assert.NotEqual(123, 1234) {
-		t.Error("NotEqual should return true")
-	}
-	if !assert.NotEqual(123.5, 123.55) {
-		t.Error("NotEqual should return true")
-	}
-	if !assert.NotEqual([]byte("Hello World"), []byte("Hello World!")) {
-		t.Error("NotEqual should return true")
-	}
-	if !assert.NotEqual(nil, new(AssertionTesterConformingObject)) {
-		t.Error("NotEqual should return true")
-	}
-}
-
-func TestContainsWrapper(t *testing.T) {
-
-	assert := New(new(testing.T))
-	list := []string{"Foo", "Bar"}
-
-	if !assert.Contains("Hello World", "Hello") {
-		t.Error("Contains should return true: \"Hello World\" contains \"Hello\"")
-	}
-	if assert.Contains("Hello World", "Salut") {
-		t.Error("Contains should return false: \"Hello World\" does not contain \"Salut\"")
-	}
-
-	if !assert.Contains(list, "Foo") {
-		t.Error("Contains should return true: \"[\"Foo\", \"Bar\"]\" contains \"Foo\"")
-	}
-	if assert.Contains(list, "Salut") {
-		t.Error("Contains should return false: \"[\"Foo\", \"Bar\"]\" does not contain \"Salut\"")
-	}
-
-}
-
-func TestNotContainsWrapper(t *testing.T) {
-
-	assert := New(new(testing.T))
-	list := []string{"Foo", "Bar"}
-
-	if !assert.NotContains("Hello World", "Hello!") {
-		t.Error("NotContains should return true: \"Hello World\" does not contain \"Hello!\"")
-	}
-	if assert.NotContains("Hello World", "Hello") {
-		t.Error("NotContains should return false: \"Hello World\" contains \"Hello\"")
-	}
-
-	if !assert.NotContains(list, "Foo!") {
-		t.Error("NotContains should return true: \"[\"Foo\", \"Bar\"]\" does not contain \"Foo!\"")
-	}
-	if assert.NotContains(list, "Foo") {
-		t.Error("NotContains should return false: \"[\"Foo\", \"Bar\"]\" contains \"Foo\"")
-	}
-
-}
-
-func TestConditionWrapper(t *testing.T) {
-
-	assert := New(new(testing.T))
-
-	if !assert.Condition(func() bool { return true }, "Truth") {
-		t.Error("Condition should return true")
-	}
-
-	if assert.Condition(func() bool { return false }, "Lie") {
-		t.Error("Condition should return false")
-	}
-
-}
-
-func TestDidPanicWrapper(t *testing.T) {
-
-	if funcDidPanic, _ := didPanic(func() {
-		panic("Panic!")
-	}); !funcDidPanic {
-		t.Error("didPanic should return true")
-	}
-
-	if funcDidPanic, _ := didPanic(func() {
-	}); funcDidPanic {
-		t.Error("didPanic should return false")
-	}
-
-}
-
-func TestPanicsWrapper(t *testing.T) {
-
-	assert := New(new(testing.T))
-
-	if !assert.Panics(func() {
-		panic("Panic!")
-	}) {
-		t.Error("Panics should return true")
-	}
-
-	if assert.Panics(func() {
-	}) {
-		t.Error("Panics should return false")
-	}
-
-}
-
-func TestNotPanicsWrapper(t *testing.T) {
-
-	assert := New(new(testing.T))
-
-	if !assert.NotPanics(func() {
-	}) {
-		t.Error("NotPanics should return true")
-	}
-
-	if assert.NotPanics(func() {
-		panic("Panic!")
-	}) {
-		t.Error("NotPanics should return false")
-	}
-
-}
-
-func TestNoErrorWrapper(t *testing.T) {
-	assert := New(t)
-	mockAssert := New(new(testing.T))
-
-	// start with a nil error
-	var err error
-
-	assert.True(mockAssert.NoError(err), "NoError should return True for nil arg")
-
-	// now set an error
-	err = errors.New("Some error")
-
-	assert.False(mockAssert.NoError(err), "NoError with error should return False")
-
-}
-
-func TestErrorWrapper(t *testing.T) {
-	assert := New(t)
-	mockAssert := New(new(testing.T))
-
-	// start with a nil error
-	var err error
-
-	assert.False(mockAssert.Error(err), "Error should return False for nil arg")
-
-	// now set an error
-	err = errors.New("Some error")
-
-	assert.True(mockAssert.Error(err), "Error with error should return True")
-
-}
-
-func TestEqualErrorWrapper(t *testing.T) {
-	assert := New(t)
-	mockAssert := New(new(testing.T))
-
-	// start with a nil error
-	var err error
-	assert.False(mockAssert.EqualError(err, ""),
-		"EqualError should return false for nil arg")
-
-	// now set an error
-	err = errors.New("some error")
-	assert.False(mockAssert.EqualError(err, "Not some error"),
-		"EqualError should return false for different error string")
-	assert.True(mockAssert.EqualError(err, "some error"),
-		"EqualError should return true")
-}
-
-func TestEmptyWrapper(t *testing.T) {
-	assert := New(t)
-	mockAssert := New(new(testing.T))
-
-	assert.True(mockAssert.Empty(""), "Empty string is empty")
-	assert.True(mockAssert.Empty(nil), "Nil is empty")
-	assert.True(mockAssert.Empty([]string{}), "Empty string array is empty")
-	assert.True(mockAssert.Empty(0), "Zero int value is empty")
-	assert.True(mockAssert.Empty(false), "False value is empty")
-
-	assert.False(mockAssert.Empty("something"), "Non Empty string is not empty")
-	assert.False(mockAssert.Empty(errors.New("something")), "Non nil object is not empty")
-	assert.False(mockAssert.Empty([]string{"something"}), "Non empty string array is not empty")
-	assert.False(mockAssert.Empty(1), "Non-zero int value is not empty")
-	assert.False(mockAssert.Empty(true), "True value is not empty")
-
-}
-
-func TestNotEmptyWrapper(t *testing.T) {
-	assert := New(t)
-	mockAssert := New(new(testing.T))
-
-	assert.False(mockAssert.NotEmpty(""), "Empty string is empty")
-	assert.False(mockAssert.NotEmpty(nil), "Nil is empty")
-	assert.False(mockAssert.NotEmpty([]string{}), "Empty string array is empty")
-	assert.False(mockAssert.NotEmpty(0), "Zero int value is empty")
-	assert.False(mockAssert.NotEmpty(false), "False value is empty")
-
-	assert.True(mockAssert.NotEmpty("something"), "Non Empty string is not empty")
-	assert.True(mockAssert.NotEmpty(errors.New("something")), "Non nil object is not empty")
-	assert.True(mockAssert.NotEmpty([]string{"something"}), "Non empty string array is not empty")
-	assert.True(mockAssert.NotEmpty(1), "Non-zero int value is not empty")
-	assert.True(mockAssert.NotEmpty(true), "True value is not empty")
-
-}
-
-func TestLenWrapper(t *testing.T) {
-	assert := New(t)
-	mockAssert := New(new(testing.T))
-
-	assert.False(mockAssert.Len(nil, 0), "nil does not have length")
-	assert.False(mockAssert.Len(0, 0), "int does not have length")
-	assert.False(mockAssert.Len(true, 0), "true does not have length")
-	assert.False(mockAssert.Len(false, 0), "false does not have length")
-	assert.False(mockAssert.Len('A', 0), "Rune does not have length")
-	assert.False(mockAssert.Len(struct{}{}, 0), "Struct does not have length")
-
-	ch := make(chan int, 5)
-	ch <- 1
-	ch <- 2
-	ch <- 3
-
-	cases := []struct {
-		v interface{}
-		l int
-	}{
-		{[]int{1, 2, 3}, 3},
-		{[...]int{1, 2, 3}, 3},
-		{"ABC", 3},
-		{map[int]int{1: 2, 2: 4, 3: 6}, 3},
-		{ch, 3},
-
-		{[]int{}, 0},
-		{map[int]int{}, 0},
-		{make(chan int), 0},
-
-		{[]int(nil), 0},
-		{map[int]int(nil), 0},
-		{(chan int)(nil), 0},
-	}
-
-	for _, c := range cases {
-		assert.True(mockAssert.Len(c.v, c.l), "%#v have %d items", c.v, c.l)
-	}
-}
-
-func TestWithinDurationWrapper(t *testing.T) {
-	assert := New(t)
-	mockAssert := New(new(testing.T))
-	a := time.Now()
-	b := a.Add(10 * time.Second)
-
-	assert.True(mockAssert.WithinDuration(a, b, 10*time.Second), "A 10s difference is within a 10s time difference")
-	assert.True(mockAssert.WithinDuration(b, a, 10*time.Second), "A 10s difference is within a 10s time difference")
-
-	assert.False(mockAssert.WithinDuration(a, b, 9*time.Second), "A 10s difference is not within a 9s time difference")
-	assert.False(mockAssert.WithinDuration(b, a, 9*time.Second), "A 10s difference is not within a 9s time difference")
-
-	assert.False(mockAssert.WithinDuration(a, b, -9*time.Second), "A 10s difference is not within a 9s time difference")
-	assert.False(mockAssert.WithinDuration(b, a, -9*time.Second), "A 10s difference is not within a 9s time difference")
-
-	assert.False(mockAssert.WithinDuration(a, b, -11*time.Second), "A 10s difference is not within a 9s time difference")
-	assert.False(mockAssert.WithinDuration(b, a, -11*time.Second), "A 10s difference is not within a 9s time difference")
-}
-
-func TestInDeltaWrapper(t *testing.T) {
-	assert := New(new(testing.T))
-
-	True(t, assert.InDelta(1.001, 1, 0.01), "|1.001 - 1| <= 0.01")
-	True(t, assert.InDelta(1, 1.001, 0.01), "|1 - 1.001| <= 0.01")
-	True(t, assert.InDelta(1, 2, 1), "|1 - 2| <= 1")
-	False(t, assert.InDelta(1, 2, 0.5), "Expected |1 - 2| <= 0.5 to fail")
-	False(t, assert.InDelta(2, 1, 0.5), "Expected |2 - 1| <= 0.5 to fail")
-	False(t, assert.InDelta("", nil, 1), "Expected non numerals to fail")
-
-	cases := []struct {
-		a, b  interface{}
-		delta float64
-	}{
-		{uint8(2), uint8(1), 1},
-		{uint16(2), uint16(1), 1},
-		{uint32(2), uint32(1), 1},
-		{uint64(2), uint64(1), 1},
-
-		{int(2), int(1), 1},
-		{int8(2), int8(1), 1},
-		{int16(2), int16(1), 1},
-		{int32(2), int32(1), 1},
-		{int64(2), int64(1), 1},
-
-		{float32(2), float32(1), 1},
-		{float64(2), float64(1), 1},
-	}
-
-	for _, tc := range cases {
-		True(t, assert.InDelta(tc.a, tc.b, tc.delta), "Expected |%V - %V| <= %v", tc.a, tc.b, tc.delta)
-	}
-}
-
-func TestInEpsilonWrapper(t *testing.T) {
-	assert := New(new(testing.T))
-
-	cases := []struct {
-		a, b    interface{}
-		epsilon float64
-	}{
-		{uint8(2), uint16(2), .001},
-		{2.1, 2.2, 0.1},
-		{2.2, 2.1, 0.1},
-		{-2.1, -2.2, 0.1},
-		{-2.2, -2.1, 0.1},
-		{uint64(100), uint8(101), 0.01},
-		{0.1, -0.1, 2},
-	}
-
-	for _, tc := range cases {
-		True(t, assert.InEpsilon(tc.a, tc.b, tc.epsilon, "Expected %V and %V to have a relative difference of %v", tc.a, tc.b, tc.epsilon))
-	}
-
-	cases = []struct {
-		a, b    interface{}
-		epsilon float64
-	}{
-		{uint8(2), int16(-2), .001},
-		{uint64(100), uint8(102), 0.01},
-		{2.1, 2.2, 0.001},
-		{2.2, 2.1, 0.001},
-		{2.1, -2.2, 1},
-		{2.1, "bla-bla", 0},
-		{0.1, -0.1, 1.99},
-	}
-
-	for _, tc := range cases {
-		False(t, assert.InEpsilon(tc.a, tc.b, tc.epsilon, "Expected %V and %V to have a relative difference of %v", tc.a, tc.b, tc.epsilon))
-	}
-}
-
-func TestRegexpWrapper(t *testing.T) {
-
-	assert := New(new(testing.T))
-
-	cases := []struct {
-		rx, str string
-	}{
-		{"^start", "start of the line"},
-		{"end$", "in the end"},
-		{"[0-9]{3}[.-]?[0-9]{2}[.-]?[0-9]{2}", "My phone number is 650.12.34"},
-	}
-
-	for _, tc := range cases {
-		True(t, assert.Regexp(tc.rx, tc.str))
-		True(t, assert.Regexp(regexp.MustCompile(tc.rx), tc.str))
-		False(t, assert.NotRegexp(tc.rx, tc.str))
-		False(t, assert.NotRegexp(regexp.MustCompile(tc.rx), tc.str))
-	}
-
-	cases = []struct {
-		rx, str string
-	}{
-		{"^asdfastart", "Not the start of the line"},
-		{"end$", "in the end."},
-		{"[0-9]{3}[.-]?[0-9]{2}[.-]?[0-9]{2}", "My phone number is 650.12a.34"},
-	}
-
-	for _, tc := range cases {
-		False(t, assert.Regexp(tc.rx, tc.str), "Expected \"%s\" to not match \"%s\"", tc.rx, tc.str)
-		False(t, assert.Regexp(regexp.MustCompile(tc.rx), tc.str))
-		True(t, assert.NotRegexp(tc.rx, tc.str))
-		True(t, assert.NotRegexp(regexp.MustCompile(tc.rx), tc.str))
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/stretchr/testify/assert/http_assertions.go b/Godeps/_workspace/src/github.com/stretchr/testify/assert/http_assertions.go
deleted file mode 100644
index 437a86ce4..000000000
--- a/Godeps/_workspace/src/github.com/stretchr/testify/assert/http_assertions.go
+++ /dev/null
@@ -1,157 +0,0 @@
-package assert
-
-import (
-	"fmt"
-	"net/http"
-	"net/http/httptest"
-	"net/url"
-	"strings"
-)
-
-// httpCode is a helper that returns HTTP code of the response. It returns -1
-// if building a new request fails.
-func httpCode(handler http.HandlerFunc, method, url string, values url.Values) int {
-	w := httptest.NewRecorder()
-	req, err := http.NewRequest(method, url+"?"+values.Encode(), nil)
-	if err != nil {
-		return -1
-	}
-	handler(w, req)
-	return w.Code
-}
-
-// HTTPSuccess asserts that a specified handler returns a success status code.
-//
-//  assert.HTTPSuccess(t, myHandler, "POST", "http://www.google.com", nil)
-//
-// Returns whether the assertion was successful (true) or not (false).
-func HTTPSuccess(t TestingT, handler http.HandlerFunc, method, url string, values url.Values) bool {
-	code := httpCode(handler, method, url, values)
-	if code == -1 {
-		return false
-	}
-	return code >= http.StatusOK && code <= http.StatusPartialContent
-}
-
-// HTTPRedirect asserts that a specified handler returns a redirect status code.
-//
-//  assert.HTTPRedirect(t, myHandler, "GET", "/a/b/c", url.Values{"a": []string{"b", "c"}}
-//
-// Returns whether the assertion was successful (true) or not (false).
-func HTTPRedirect(t TestingT, handler http.HandlerFunc, method, url string, values url.Values) bool {
-	code := httpCode(handler, method, url, values)
-	if code == -1 {
-		return false
-	}
-	return code >= http.StatusMultipleChoices && code <= http.StatusTemporaryRedirect
-}
-
-// HTTPError asserts that a specified handler returns an error status code.
-//
-//  assert.HTTPError(t, myHandler, "POST", "/a/b/c", url.Values{"a": []string{"b", "c"}}
-//
-// Returns whether the assertion was successful (true) or not (false).
-func HTTPError(t TestingT, handler http.HandlerFunc, method, url string, values url.Values) bool {
-	code := httpCode(handler, method, url, values)
-	if code == -1 {
-		return false
-	}
-	return code >= http.StatusBadRequest
-}
-
-// HTTPBody is a helper that returns HTTP body of the response. It returns
-// empty string if building a new request fails.
-func HTTPBody(handler http.HandlerFunc, method, url string, values url.Values) string {
-	w := httptest.NewRecorder()
-	req, err := http.NewRequest(method, url+"?"+values.Encode(), nil)
-	if err != nil {
-		return ""
-	}
-	handler(w, req)
-	return w.Body.String()
-}
-
-// HTTPBodyContains asserts that a specified handler returns a
-// body that contains a string.
-//
-//  assert.HTTPBodyContains(t, myHandler, "www.google.com", nil, "I'm Feeling Lucky")
-//
-// Returns whether the assertion was successful (true) or not (false).
-func HTTPBodyContains(t TestingT, handler http.HandlerFunc, method, url string, values url.Values, str interface{}) bool {
-	body := HTTPBody(handler, method, url, values)
-
-	contains := strings.Contains(body, fmt.Sprint(str))
-	if !contains {
-		Fail(t, fmt.Sprintf("Expected response body for \"%s\" to contain \"%s\" but found \"%s\"", url+"?"+values.Encode(), str, body))
-	}
-
-	return contains
-}
-
-// HTTPBodyNotContains asserts that a specified handler returns a
-// body that does not contain a string.
-//
-//  assert.HTTPBodyNotContains(t, myHandler, "www.google.com", nil, "I'm Feeling Lucky")
-//
-// Returns whether the assertion was successful (true) or not (false).
-func HTTPBodyNotContains(t TestingT, handler http.HandlerFunc, method, url string, values url.Values, str interface{}) bool {
-	body := HTTPBody(handler, method, url, values)
-
-	contains := strings.Contains(body, fmt.Sprint(str))
-	if contains {
-		Fail(t, "Expected response body for %s to NOT contain \"%s\" but found \"%s\"", url+"?"+values.Encode(), str, body)
-	}
-
-	return !contains
-}
-
-//
-// Assertions Wrappers
-//
-
-// HTTPSuccess asserts that a specified handler returns a success status code.
-//
-//  assert.HTTPSuccess(myHandler, "POST", "http://www.google.com", nil)
-//
-// Returns whether the assertion was successful (true) or not (false).
-func (a *Assertions) HTTPSuccess(handler http.HandlerFunc, method, url string, values url.Values) bool {
-	return HTTPSuccess(a.t, handler, method, url, values)
-}
-
-// HTTPRedirect asserts that a specified handler returns a redirect status code.
-//
-//  assert.HTTPRedirect(myHandler, "GET", "/a/b/c", url.Values{"a": []string{"b", "c"}}
-//
-// Returns whether the assertion was successful (true) or not (false).
-func (a *Assertions) HTTPRedirect(handler http.HandlerFunc, method, url string, values url.Values) bool {
-	return HTTPRedirect(a.t, handler, method, url, values)
-}
-
-// HTTPError asserts that a specified handler returns an error status code.
-//
-//  assert.HTTPError(myHandler, "POST", "/a/b/c", url.Values{"a": []string{"b", "c"}}
-//
-// Returns whether the assertion was successful (true) or not (false).
-func (a *Assertions) HTTPError(handler http.HandlerFunc, method, url string, values url.Values) bool {
-	return HTTPError(a.t, handler, method, url, values)
-}
-
-// HTTPBodyContains asserts that a specified handler returns a
-// body that contains a string.
-//
-//  assert.HTTPBodyContains(t, myHandler, "www.google.com", nil, "I'm Feeling Lucky")
-//
-// Returns whether the assertion was successful (true) or not (false).
-func (a *Assertions) HTTPBodyContains(handler http.HandlerFunc, method, url string, values url.Values, str interface{}) bool {
-	return HTTPBodyContains(a.t, handler, method, url, values, str)
-}
-
-// HTTPBodyNotContains asserts that a specified handler returns a
-// body that does not contain a string.
-//
-//  assert.HTTPBodyNotContains(t, myHandler, "www.google.com", nil, "I'm Feeling Lucky")
-//
-// Returns whether the assertion was successful (true) or not (false).
-func (a *Assertions) HTTPBodyNotContains(handler http.HandlerFunc, method, url string, values url.Values, str interface{}) bool {
-	return HTTPBodyNotContains(a.t, handler, method, url, values, str)
-}
diff --git a/Godeps/_workspace/src/github.com/stretchr/testify/assert/http_assertions_test.go b/Godeps/_workspace/src/github.com/stretchr/testify/assert/http_assertions_test.go
deleted file mode 100644
index 684c2d5d1..000000000
--- a/Godeps/_workspace/src/github.com/stretchr/testify/assert/http_assertions_test.go
+++ /dev/null
@@ -1,86 +0,0 @@
-package assert
-
-import (
-	"fmt"
-	"net/http"
-	"net/url"
-	"testing"
-)
-
-func httpOK(w http.ResponseWriter, r *http.Request) {
-	w.WriteHeader(http.StatusOK)
-}
-
-func httpRedirect(w http.ResponseWriter, r *http.Request) {
-	w.WriteHeader(http.StatusTemporaryRedirect)
-}
-
-func httpError(w http.ResponseWriter, r *http.Request) {
-	w.WriteHeader(http.StatusInternalServerError)
-}
-
-func TestHTTPStatuses(t *testing.T) {
-	assert := New(t)
-	mockT := new(testing.T)
-
-	assert.Equal(HTTPSuccess(mockT, httpOK, "GET", "/", nil), true)
-	assert.Equal(HTTPSuccess(mockT, httpRedirect, "GET", "/", nil), false)
-	assert.Equal(HTTPSuccess(mockT, httpError, "GET", "/", nil), false)
-
-	assert.Equal(HTTPRedirect(mockT, httpOK, "GET", "/", nil), false)
-	assert.Equal(HTTPRedirect(mockT, httpRedirect, "GET", "/", nil), true)
-	assert.Equal(HTTPRedirect(mockT, httpError, "GET", "/", nil), false)
-
-	assert.Equal(HTTPError(mockT, httpOK, "GET", "/", nil), false)
-	assert.Equal(HTTPError(mockT, httpRedirect, "GET", "/", nil), false)
-	assert.Equal(HTTPError(mockT, httpError, "GET", "/", nil), true)
-}
-
-func TestHTTPStatusesWrapper(t *testing.T) {
-	assert := New(t)
-	mockAssert := New(new(testing.T))
-
-	assert.Equal(mockAssert.HTTPSuccess(httpOK, "GET", "/", nil), true)
-	assert.Equal(mockAssert.HTTPSuccess(httpRedirect, "GET", "/", nil), false)
-	assert.Equal(mockAssert.HTTPSuccess(httpError, "GET", "/", nil), false)
-
-	assert.Equal(mockAssert.HTTPRedirect(httpOK, "GET", "/", nil), false)
-	assert.Equal(mockAssert.HTTPRedirect(httpRedirect, "GET", "/", nil), true)
-	assert.Equal(mockAssert.HTTPRedirect(httpError, "GET", "/", nil), false)
-
-	assert.Equal(mockAssert.HTTPError(httpOK, "GET", "/", nil), false)
-	assert.Equal(mockAssert.HTTPError(httpRedirect, "GET", "/", nil), false)
-	assert.Equal(mockAssert.HTTPError(httpError, "GET", "/", nil), true)
-}
-
-func httpHelloName(w http.ResponseWriter, r *http.Request) {
-	name := r.FormValue("name")
-	w.Write([]byte(fmt.Sprintf("Hello, %s!", name)))
-}
-
-func TestHttpBody(t *testing.T) {
-	assert := New(t)
-	mockT := new(testing.T)
-
-	assert.True(HTTPBodyContains(mockT, httpHelloName, "GET", "/", url.Values{"name": []string{"World"}}, "Hello, World!"))
-	assert.True(HTTPBodyContains(mockT, httpHelloName, "GET", "/", url.Values{"name": []string{"World"}}, "World"))
-	assert.False(HTTPBodyContains(mockT, httpHelloName, "GET", "/", url.Values{"name": []string{"World"}}, "world"))
-
-	assert.False(HTTPBodyNotContains(mockT, httpHelloName, "GET", "/", url.Values{"name": []string{"World"}}, "Hello, World!"))
-	assert.False(HTTPBodyNotContains(mockT, httpHelloName, "GET", "/", url.Values{"name": []string{"World"}}, "World"))
-	assert.True(HTTPBodyNotContains(mockT, httpHelloName, "GET", "/", url.Values{"name": []string{"World"}}, "world"))
-}
-
-func TestHttpBodyWrappers(t *testing.T) {
-	assert := New(t)
-	mockAssert := New(new(testing.T))
-
-	assert.True(mockAssert.HTTPBodyContains(httpHelloName, "GET", "/", url.Values{"name": []string{"World"}}, "Hello, World!"))
-	assert.True(mockAssert.HTTPBodyContains(httpHelloName, "GET", "/", url.Values{"name": []string{"World"}}, "World"))
-	assert.False(mockAssert.HTTPBodyContains(httpHelloName, "GET", "/", url.Values{"name": []string{"World"}}, "world"))
-
-	assert.False(mockAssert.HTTPBodyNotContains(httpHelloName, "GET", "/", url.Values{"name": []string{"World"}}, "Hello, World!"))
-	assert.False(mockAssert.HTTPBodyNotContains(httpHelloName, "GET", "/", url.Values{"name": []string{"World"}}, "World"))
-	assert.True(mockAssert.HTTPBodyNotContains(httpHelloName, "GET", "/", url.Values{"name": []string{"World"}}, "world"))
-
-}
diff --git a/Godeps/_workspace/src/github.com/stretchr/testify/mock/doc.go b/Godeps/_workspace/src/github.com/stretchr/testify/mock/doc.go
deleted file mode 100644
index dd385074b..000000000
--- a/Godeps/_workspace/src/github.com/stretchr/testify/mock/doc.go
+++ /dev/null
@@ -1,43 +0,0 @@
-// Provides a system by which it is possible to mock your objects and verify calls are happening as expected.
-//
-// Example Usage
-//
-// The mock package provides an object, Mock, that tracks activity on another object.  It is usually
-// embedded into a test object as shown below:
-//
-//   type MyTestObject struct {
-//     // add a Mock object instance
-//     mock.Mock
-//
-//     // other fields go here as normal
-//   }
-//
-// When implementing the methods of an interface, you wire your functions up
-// to call the Mock.Called(args...) method, and return the appropriate values.
-//
-// For example, to mock a method that saves the name and age of a person and returns
-// the year of their birth or an error, you might write this:
-//
-//     func (o *MyTestObject) SavePersonDetails(firstname, lastname string, age int) (int, error) {
-//       args := o.Called(firstname, lastname, age)
-//       return args.Int(0), args.Error(1)
-//     }
-//
-// The Int, Error and Bool methods are examples of strongly typed getters that take the argument
-// index position. Given this argument list:
-//
-//     (12, true, "Something")
-//
-// You could read them out strongly typed like this:
-//
-//     args.Int(0)
-//     args.Bool(1)
-//     args.String(2)
-//
-// For objects of your own type, use the generic Arguments.Get(index) method and make a type assertion:
-//
-//     return args.Get(0).(*MyObject), args.Get(1).(*AnotherObjectOfMine)
-//
-// This may cause a panic if the object you are getting is nil (the type assertion will fail), in those
-// cases you should check for nil first.
-package mock
diff --git a/Godeps/_workspace/src/github.com/stretchr/testify/mock/mock.go b/Godeps/_workspace/src/github.com/stretchr/testify/mock/mock.go
deleted file mode 100644
index 007643f62..000000000
--- a/Godeps/_workspace/src/github.com/stretchr/testify/mock/mock.go
+++ /dev/null
@@ -1,594 +0,0 @@
-package mock
-
-import (
-	"fmt"
-	"reflect"
-	"runtime"
-	"strings"
-	"sync"
-	"time"
-
-	"github.com/stretchr/objx"
-	"github.com/stretchr/testify/assert"
-)
-
-// TestingT is an interface wrapper around *testing.T
-type TestingT interface {
-	Logf(format string, args ...interface{})
-	Errorf(format string, args ...interface{})
-}
-
-/*
-	Call
-*/
-
-// Call represents a method call and is used for setting expectations,
-// as well as recording activity.
-type Call struct {
-
-	// The name of the method that was or will be called.
-	Method string
-
-	// Holds the arguments of the method.
-	Arguments Arguments
-
-	// Holds the arguments that should be returned when
-	// this method is called.
-	ReturnArguments Arguments
-
-	// The number of times to return the return arguments when setting
-	// expectations. 0 means to always return the value.
-	Repeatability int
-
-	// Holds a channel that will be used to block the Return until it either
-	// recieves a message or is closed. nil means it returns immediately.
-	WaitFor <-chan time.Time
-
-	// Holds a handler used to manipulate arguments content that are passed by
-	// reference. It's useful when mocking methods such as unmarshalers or
-	// decoders.
-	Run func(Arguments)
-}
-
-// Mock is the workhorse used to track activity on another object.
-// For an example of its usage, refer to the "Example Usage" section at the top of this document.
-type Mock struct {
-
-	// The method name that is currently
-	// being referred to by the On method.
-	onMethodName string
-
-	// An array of the arguments that are
-	// currently being referred to by the On method.
-	onMethodArguments Arguments
-
-	// Represents the calls that are expected of
-	// an object.
-	ExpectedCalls []Call
-
-	// Holds the calls that were made to this mocked object.
-	Calls []Call
-
-	// TestData holds any data that might be useful for testing.  Testify ignores
-	// this data completely allowing you to do whatever you like with it.
-	testData objx.Map
-
-	mutex sync.Mutex
-}
-
-// TestData holds any data that might be useful for testing.  Testify ignores
-// this data completely allowing you to do whatever you like with it.
-func (m *Mock) TestData() objx.Map {
-
-	if m.testData == nil {
-		m.testData = make(objx.Map)
-	}
-
-	return m.testData
-}
-
-/*
-	Setting expectations
-*/
-
-// On starts a description of an expectation of the specified method
-// being called.
-//
-//     Mock.On("MyMethod", arg1, arg2)
-func (m *Mock) On(methodName string, arguments ...interface{}) *Mock {
-	m.onMethodName = methodName
-	m.onMethodArguments = arguments
-
-	for _, arg := range arguments {
-		if v := reflect.ValueOf(arg); v.Kind() == reflect.Func {
-			panic(fmt.Sprintf("cannot use Func in expectations. Use mock.AnythingOfType(\"%T\")", arg))
-		}
-	}
-
-	return m
-}
-
-// Return finishes a description of an expectation of the method (and arguments)
-// specified in the most recent On method call.
-//
-//     Mock.On("MyMethod", arg1, arg2).Return(returnArg1, returnArg2)
-func (m *Mock) Return(returnArguments ...interface{}) *Mock {
-	m.mutex.Lock()
-	defer m.mutex.Unlock()
-
-	m.ExpectedCalls = append(m.ExpectedCalls, Call{m.onMethodName, m.onMethodArguments, returnArguments, 0, nil, nil})
-	return m
-}
-
-// Once indicates that that the mock should only return the value once.
-//
-//    Mock.On("MyMethod", arg1, arg2).Return(returnArg1, returnArg2).Once()
-func (m *Mock) Once() {
-	m.mutex.Lock()
-	m.ExpectedCalls[len(m.ExpectedCalls)-1].Repeatability = 1
-	m.mutex.Unlock()
-}
-
-// Twice indicates that that the mock should only return the value twice.
-//
-//    Mock.On("MyMethod", arg1, arg2).Return(returnArg1, returnArg2).Twice()
-func (m *Mock) Twice() {
-	m.mutex.Lock()
-	m.ExpectedCalls[len(m.ExpectedCalls)-1].Repeatability = 2
-	m.mutex.Unlock()
-}
-
-// Times indicates that that the mock should only return the indicated number
-// of times.
-//
-//    Mock.On("MyMethod", arg1, arg2).Return(returnArg1, returnArg2).Times(5)
-func (m *Mock) Times(i int) {
-	m.mutex.Lock()
-	m.ExpectedCalls[len(m.ExpectedCalls)-1].Repeatability = i
-	m.mutex.Unlock()
-}
-
-// WaitUntil sets the channel that will block the mock's return until its closed
-// or a message is received.
-//
-//    Mock.On("MyMethod", arg1, arg2).WaitUntil(time.After(time.Second))
-func (m *Mock) WaitUntil(w <-chan time.Time) *Mock {
-	m.mutex.Lock()
-	m.ExpectedCalls[len(m.ExpectedCalls)-1].WaitFor = w
-	m.mutex.Unlock()
-	return m
-}
-
-// After sets how long to block until the call returns
-//
-//    Mock.On("MyMethod", arg1, arg2).After(time.Second)
-func (m *Mock) After(d time.Duration) *Mock {
-	return m.WaitUntil(time.After(d))
-}
-
-// Run sets a handler to be called before returning. It can be used when
-// mocking a method such as unmarshalers that takes a pointer to a struct and
-// sets properties in such struct
-//
-//    Mock.On("Unmarshal", AnythingOfType("*map[string]interface{}").Return().Run(function(args Arguments) {
-//    	arg := args.Get(0).(*map[string]interface{})
-//    	arg["foo"] = "bar"
-//    })
-func (m *Mock) Run(fn func(Arguments)) *Mock {
-	m.mutex.Lock()
-	m.ExpectedCalls[len(m.ExpectedCalls)-1].Run = fn
-	m.mutex.Unlock()
-	return m
-}
-
-/*
-	Recording and responding to activity
-*/
-
-func (m *Mock) findExpectedCall(method string, arguments ...interface{}) (int, *Call) {
-	for i, call := range m.expectedCalls() {
-		if call.Method == method && call.Repeatability > -1 {
-
-			_, diffCount := call.Arguments.Diff(arguments)
-			if diffCount == 0 {
-				return i, &call
-			}
-
-		}
-	}
-	return -1, nil
-}
-
-func (m *Mock) findClosestCall(method string, arguments ...interface{}) (bool, *Call) {
-	diffCount := 0
-	var closestCall *Call = nil
-
-	for _, call := range m.expectedCalls() {
-		if call.Method == method {
-
-			_, tempDiffCount := call.Arguments.Diff(arguments)
-			if tempDiffCount < diffCount || diffCount == 0 {
-				diffCount = tempDiffCount
-				closestCall = &call
-			}
-
-		}
-	}
-
-	if closestCall == nil {
-		return false, nil
-	}
-
-	return true, closestCall
-}
-
-func callString(method string, arguments Arguments, includeArgumentValues bool) string {
-
-	var argValsString string = ""
-	if includeArgumentValues {
-		var argVals []string
-		for argIndex, arg := range arguments {
-			argVals = append(argVals, fmt.Sprintf("%d: %v", argIndex, arg))
-		}
-		argValsString = fmt.Sprintf("\n\t\t%s", strings.Join(argVals, "\n\t\t"))
-	}
-
-	return fmt.Sprintf("%s(%s)%s", method, arguments.String(), argValsString)
-}
-
-// Called tells the mock object that a method has been called, and gets an array
-// of arguments to return.  Panics if the call is unexpected (i.e. not preceeded by
-// appropriate .On .Return() calls)
-// If Call.WaitFor is set, blocks until the channel is closed or receives a message.
-func (m *Mock) Called(arguments ...interface{}) Arguments {
-	// get the calling function's name
-	pc, _, _, ok := runtime.Caller(1)
-	if !ok {
-		panic("Couldn't get the caller information")
-	}
-	functionPath := runtime.FuncForPC(pc).Name()
-	parts := strings.Split(functionPath, ".")
-	functionName := parts[len(parts)-1]
-
-	found, call := m.findExpectedCall(functionName, arguments...)
-
-	if found < 0 {
-		// we have to fail here - because we don't know what to do
-		// as the return arguments.  This is because:
-		//
-		//   a) this is a totally unexpected call to this method,
-		//   b) the arguments are not what was expected, or
-		//   c) the developer has forgotten to add an accompanying On...Return pair.
-
-		closestFound, closestCall := m.findClosestCall(functionName, arguments...)
-
-		if closestFound {
-			panic(fmt.Sprintf("\n\nmock: Unexpected Method Call\n-----------------------------\n\n%s\n\nThe closest call I have is: \n\n%s\n", callString(functionName, arguments, true), callString(functionName, closestCall.Arguments, true)))
-		} else {
-			panic(fmt.Sprintf("\nassert: mock: I don't know what to return because the method call was unexpected.\n\tEither do Mock.On(\"%s\").Return(...) first, or remove the %s() call.\n\tThis method was unexpected:\n\t\t%s\n\tat: %s", functionName, functionName, callString(functionName, arguments, true), assert.CallerInfo()))
-		}
-	} else {
-		m.mutex.Lock()
-		switch {
-		case call.Repeatability == 1:
-			call.Repeatability = -1
-			m.ExpectedCalls[found] = *call
-		case call.Repeatability > 1:
-			call.Repeatability -= 1
-			m.ExpectedCalls[found] = *call
-		}
-		m.mutex.Unlock()
-	}
-
-	// add the call
-	m.mutex.Lock()
-	m.Calls = append(m.Calls, Call{functionName, arguments, make([]interface{}, 0), 0, nil, nil})
-	m.mutex.Unlock()
-
-	// block if specified
-	if call.WaitFor != nil {
-		<-call.WaitFor
-	}
-
-	if call.Run != nil {
-		call.Run(arguments)
-	}
-
-	return call.ReturnArguments
-
-}
-
-/*
-	Assertions
-*/
-
-// AssertExpectationsForObjects asserts that everything specified with On and Return
-// of the specified objects was in fact called as expected.
-//
-// Calls may have occurred in any order.
-func AssertExpectationsForObjects(t TestingT, testObjects ...interface{}) bool {
-	var success bool = true
-	for _, obj := range testObjects {
-		mockObj := obj.(Mock)
-		success = success && mockObj.AssertExpectations(t)
-	}
-	return success
-}
-
-// AssertExpectations asserts that everything specified with On and Return was
-// in fact called as expected.  Calls may have occurred in any order.
-func (m *Mock) AssertExpectations(t TestingT) bool {
-	var somethingMissing bool = false
-	var failedExpectations int = 0
-
-	// iterate through each expectation
-	expectedCalls := m.expectedCalls()
-	for _, expectedCall := range expectedCalls {
-		switch {
-		case !m.methodWasCalled(expectedCall.Method, expectedCall.Arguments):
-			somethingMissing = true
-			failedExpectations++
-			t.Logf("\u274C\t%s(%s)", expectedCall.Method, expectedCall.Arguments.String())
-		case expectedCall.Repeatability > 0:
-			somethingMissing = true
-			failedExpectations++
-		default:
-			t.Logf("\u2705\t%s(%s)", expectedCall.Method, expectedCall.Arguments.String())
-		}
-	}
-
-	if somethingMissing {
-		t.Errorf("FAIL: %d out of %d expectation(s) were met.\n\tThe code you are testing needs to make %d more call(s).\n\tat: %s", len(expectedCalls)-failedExpectations, len(expectedCalls), failedExpectations, assert.CallerInfo())
-	}
-
-	return !somethingMissing
-}
-
-// AssertNumberOfCalls asserts that the method was called expectedCalls times.
-func (m *Mock) AssertNumberOfCalls(t TestingT, methodName string, expectedCalls int) bool {
-	var actualCalls int = 0
-	for _, call := range m.calls() {
-		if call.Method == methodName {
-			actualCalls++
-		}
-	}
-	return assert.Equal(t, actualCalls, expectedCalls, fmt.Sprintf("Expected number of calls (%d) does not match the actual number of calls (%d).", expectedCalls, actualCalls))
-}
-
-// AssertCalled asserts that the method was called.
-func (m *Mock) AssertCalled(t TestingT, methodName string, arguments ...interface{}) bool {
-	if !assert.True(t, m.methodWasCalled(methodName, arguments), fmt.Sprintf("The \"%s\" method should have been called with %d argument(s), but was not.", methodName, len(arguments))) {
-		t.Logf("%v", m.expectedCalls())
-		return false
-	}
-	return true
-}
-
-// AssertNotCalled asserts that the method was not called.
-func (m *Mock) AssertNotCalled(t TestingT, methodName string, arguments ...interface{}) bool {
-	if !assert.False(t, m.methodWasCalled(methodName, arguments), fmt.Sprintf("The \"%s\" method was called with %d argument(s), but should NOT have been.", methodName, len(arguments))) {
-		t.Logf("%v", m.expectedCalls())
-		return false
-	}
-	return true
-}
-
-func (m *Mock) methodWasCalled(methodName string, expected []interface{}) bool {
-	for _, call := range m.calls() {
-		if call.Method == methodName {
-
-			_, differences := Arguments(expected).Diff(call.Arguments)
-
-			if differences == 0 {
-				// found the expected call
-				return true
-			}
-
-		}
-	}
-	// we didn't find the expected call
-	return false
-}
-
-func (m *Mock) expectedCalls() []Call {
-	m.mutex.Lock()
-	defer m.mutex.Unlock()
-	return append([]Call{}, m.ExpectedCalls...)
-}
-
-func (m *Mock) calls() []Call {
-	m.mutex.Lock()
-	defer m.mutex.Unlock()
-	return append([]Call{}, m.Calls...)
-}
-
-/*
-	Arguments
-*/
-
-// Arguments holds an array of method arguments or return values.
-type Arguments []interface{}
-
-const (
-	// The "any" argument.  Used in Diff and Assert when
-	// the argument being tested shouldn't be taken into consideration.
-	Anything string = "mock.Anything"
-)
-
-// AnythingOfTypeArgument is a string that contains the type of an argument
-// for use when type checking.  Used in Diff and Assert.
-type AnythingOfTypeArgument string
-
-// AnythingOfType returns an AnythingOfTypeArgument object containing the
-// name of the type to check for.  Used in Diff and Assert.
-//
-// For example:
-//	Assert(t, AnythingOfType("string"), AnythingOfType("int"))
-func AnythingOfType(t string) AnythingOfTypeArgument {
-	return AnythingOfTypeArgument(t)
-}
-
-// Get Returns the argument at the specified index.
-func (args Arguments) Get(index int) interface{} {
-	if index+1 > len(args) {
-		panic(fmt.Sprintf("assert: arguments: Cannot call Get(%d) because there are %d argument(s).", index, len(args)))
-	}
-	return args[index]
-}
-
-// Is gets whether the objects match the arguments specified.
-func (args Arguments) Is(objects ...interface{}) bool {
-	for i, obj := range args {
-		if obj != objects[i] {
-			return false
-		}
-	}
-	return true
-}
-
-// Diff gets a string describing the differences between the arguments
-// and the specified objects.
-//
-// Returns the diff string and number of differences found.
-func (args Arguments) Diff(objects []interface{}) (string, int) {
-
-	var output string = "\n"
-	var differences int
-
-	var maxArgCount int = len(args)
-	if len(objects) > maxArgCount {
-		maxArgCount = len(objects)
-	}
-
-	for i := 0; i < maxArgCount; i++ {
-		var actual, expected interface{}
-
-		if len(objects) <= i {
-			actual = "(Missing)"
-		} else {
-			actual = objects[i]
-		}
-
-		if len(args) <= i {
-			expected = "(Missing)"
-		} else {
-			expected = args[i]
-		}
-
-		if reflect.TypeOf(expected) == reflect.TypeOf((*AnythingOfTypeArgument)(nil)).Elem() {
-
-			// type checking
-			if reflect.TypeOf(actual).Name() != string(expected.(AnythingOfTypeArgument)) && reflect.TypeOf(actual).String() != string(expected.(AnythingOfTypeArgument)) {
-				// not match
-				differences++
-				output = fmt.Sprintf("%s\t%d: \u274C  type %s != type %s - %s\n", output, i, expected, reflect.TypeOf(actual).Name(), actual)
-			}
-
-		} else {
-
-			// normal checking
-
-			if assert.ObjectsAreEqual(expected, Anything) || assert.ObjectsAreEqual(actual, Anything) || assert.ObjectsAreEqual(actual, expected) {
-				// match
-				output = fmt.Sprintf("%s\t%d: \u2705  %s == %s\n", output, i, actual, expected)
-			} else {
-				// not match
-				differences++
-				output = fmt.Sprintf("%s\t%d: \u274C  %s != %s\n", output, i, actual, expected)
-			}
-		}
-
-	}
-
-	if differences == 0 {
-		return "No differences.", differences
-	}
-
-	return output, differences
-
-}
-
-// Assert compares the arguments with the specified objects and fails if
-// they do not exactly match.
-func (args Arguments) Assert(t TestingT, objects ...interface{}) bool {
-
-	// get the differences
-	diff, diffCount := args.Diff(objects)
-
-	if diffCount == 0 {
-		return true
-	}
-
-	// there are differences... report them...
-	t.Logf(diff)
-	t.Errorf("%sArguments do not match.", assert.CallerInfo())
-
-	return false
-
-}
-
-// String gets the argument at the specified index. Panics if there is no argument, or
-// if the argument is of the wrong type.
-//
-// If no index is provided, String() returns a complete string representation
-// of the arguments.
-func (args Arguments) String(indexOrNil ...int) string {
-
-	if len(indexOrNil) == 0 {
-		// normal String() method - return a string representation of the args
-		var argsStr []string
-		for _, arg := range args {
-			argsStr = append(argsStr, fmt.Sprintf("%s", reflect.TypeOf(arg)))
-		}
-		return strings.Join(argsStr, ",")
-	} else if len(indexOrNil) == 1 {
-		// Index has been specified - get the argument at that index
-		var index int = indexOrNil[0]
-		var s string
-		var ok bool
-		if s, ok = args.Get(index).(string); !ok {
-			panic(fmt.Sprintf("assert: arguments: String(%d) failed because object wasn't correct type: %s", index, args.Get(index)))
-		}
-		return s
-	}
-
-	panic(fmt.Sprintf("assert: arguments: Wrong number of arguments passed to String.  Must be 0 or 1, not %d", len(indexOrNil)))
-
-}
-
-// Int gets the argument at the specified index. Panics if there is no argument, or
-// if the argument is of the wrong type.
-func (args Arguments) Int(index int) int {
-	var s int
-	var ok bool
-	if s, ok = args.Get(index).(int); !ok {
-		panic(fmt.Sprintf("assert: arguments: Int(%d) failed because object wasn't correct type: %v", index, args.Get(index)))
-	}
-	return s
-}
-
-// Error gets the argument at the specified index. Panics if there is no argument, or
-// if the argument is of the wrong type.
-func (args Arguments) Error(index int) error {
-	obj := args.Get(index)
-	var s error
-	var ok bool
-	if obj == nil {
-		return nil
-	}
-	if s, ok = obj.(error); !ok {
-		panic(fmt.Sprintf("assert: arguments: Error(%d) failed because object wasn't correct type: %v", index, args.Get(index)))
-	}
-	return s
-}
-
-// Bool gets the argument at the specified index. Panics if there is no argument, or
-// if the argument is of the wrong type.
-func (args Arguments) Bool(index int) bool {
-	var s bool
-	var ok bool
-	if s, ok = args.Get(index).(bool); !ok {
-		panic(fmt.Sprintf("assert: arguments: Bool(%d) failed because object wasn't correct type: %v", index, args.Get(index)))
-	}
-	return s
-}
diff --git a/Godeps/_workspace/src/github.com/stretchr/testify/mock/mock_test.go b/Godeps/_workspace/src/github.com/stretchr/testify/mock/mock_test.go
deleted file mode 100644
index b1ee95451..000000000
--- a/Godeps/_workspace/src/github.com/stretchr/testify/mock/mock_test.go
+++ /dev/null
@@ -1,908 +0,0 @@
-package mock
-
-import (
-	"errors"
-	"github.com/stretchr/testify/assert"
-	"testing"
-	"time"
-)
-
-/*
-	Test objects
-*/
-
-// ExampleInterface represents an example interface.
-type ExampleInterface interface {
-	TheExampleMethod(a, b, c int) (int, error)
-}
-
-// TestExampleImplementation is a test implementation of ExampleInterface
-type TestExampleImplementation struct {
-	Mock
-}
-
-func (i *TestExampleImplementation) TheExampleMethod(a, b, c int) (int, error) {
-	args := i.Called(a, b, c)
-	return args.Int(0), errors.New("Whoops")
-}
-
-func (i *TestExampleImplementation) TheExampleMethod2(yesorno bool) {
-	i.Called(yesorno)
-}
-
-type ExampleType struct {
-	ran bool
-}
-
-func (i *TestExampleImplementation) TheExampleMethod3(et *ExampleType) error {
-	args := i.Called(et)
-	return args.Error(0)
-}
-
-func (i *TestExampleImplementation) TheExampleMethodFunc(fn func(string) error) error {
-	args := i.Called(fn)
-	return args.Error(0)
-}
-
-func (i *TestExampleImplementation) TheExampleMethodVariadic(a ...int) error {
-	args := i.Called(a)
-	return args.Error(0)
-}
-
-func (i *TestExampleImplementation) TheExampleMethodVariadicInterface(a ...interface{}) error {
-	args := i.Called(a)
-	return args.Error(0)
-}
-
-type ExampleFuncType func(string) error
-
-func (i *TestExampleImplementation) TheExampleMethodFuncType(fn ExampleFuncType) error {
-	args := i.Called(fn)
-	return args.Error(0)
-}
-
-/*
-	Mock
-*/
-
-func Test_Mock_TestData(t *testing.T) {
-
-	var mockedService *TestExampleImplementation = new(TestExampleImplementation)
-
-	if assert.NotNil(t, mockedService.TestData()) {
-
-		mockedService.TestData().Set("something", 123)
-		assert.Equal(t, 123, mockedService.TestData().Get("something").Data())
-
-	}
-
-}
-
-func Test_Mock_On(t *testing.T) {
-
-	// make a test impl object
-	var mockedService *TestExampleImplementation = new(TestExampleImplementation)
-
-	assert.Equal(t, mockedService.On("TheExampleMethod"), &mockedService.Mock)
-	assert.Equal(t, "TheExampleMethod", mockedService.onMethodName)
-
-}
-
-func Test_Mock_On_WithArgs(t *testing.T) {
-
-	// make a test impl object
-	var mockedService *TestExampleImplementation = new(TestExampleImplementation)
-
-	assert.Equal(t, mockedService.On("TheExampleMethod", 1, 2, 3), &mockedService.Mock)
-	assert.Equal(t, "TheExampleMethod", mockedService.onMethodName)
-	assert.Equal(t, 1, mockedService.onMethodArguments[0])
-	assert.Equal(t, 2, mockedService.onMethodArguments[1])
-	assert.Equal(t, 3, mockedService.onMethodArguments[2])
-
-}
-
-func Test_Mock_On_WithFuncArg(t *testing.T) {
-
-	// make a test impl object
-	var mockedService *TestExampleImplementation = new(TestExampleImplementation)
-
-	assert.Equal(t, mockedService.On("TheExampleMethodFunc", AnythingOfType("func(string) error")).Return(nil), &mockedService.Mock)
-	assert.Equal(t, "TheExampleMethodFunc", mockedService.onMethodName)
-	assert.Equal(t, AnythingOfType("func(string) error"), mockedService.onMethodArguments[0])
-
-	fn := func(string) error { return nil }
-	mockedService.TheExampleMethodFunc(fn)
-
-}
-
-func Test_Mock_On_WithVariadicFunc(t *testing.T) {
-
-	// make a test impl object
-	var mockedService *TestExampleImplementation = new(TestExampleImplementation)
-
-	assert.Equal(t, mockedService.On("TheExampleMethodVariadic", []int{1, 2, 3}).Return(nil), &mockedService.Mock)
-	assert.Equal(t, "TheExampleMethodVariadic", mockedService.onMethodName)
-	assert.Equal(t, []int{1, 2, 3}, mockedService.onMethodArguments[0])
-
-	assert.NotPanics(t, func() {
-		mockedService.TheExampleMethodVariadic(1, 2, 3)
-	})
-	assert.Panics(t, func() {
-		mockedService.TheExampleMethodVariadic(1, 2)
-	})
-
-}
-
-func Test_Mock_On_WithVariadicFuncWithInterface(t *testing.T) {
-
-	// make a test impl object
-	var mockedService *TestExampleImplementation = new(TestExampleImplementation)
-
-	assert.Equal(t, mockedService.On("TheExampleMethodVariadicInterface", []interface{}{1, 2, 3}).Return(nil), &mockedService.Mock)
-	assert.Equal(t, "TheExampleMethodVariadicInterface", mockedService.onMethodName)
-	assert.Equal(t, []interface{}{1, 2, 3}, mockedService.onMethodArguments[0])
-
-	assert.NotPanics(t, func() {
-		mockedService.TheExampleMethodVariadicInterface(1, 2, 3)
-	})
-	assert.Panics(t, func() {
-		mockedService.TheExampleMethodVariadicInterface(1, 2)
-	})
-
-}
-
-func Test_Mock_On_WithVariadicFuncWithEmptyInterfaceArray(t *testing.T) {
-
-	// make a test impl object
-	var mockedService *TestExampleImplementation = new(TestExampleImplementation)
-
-	var expected []interface{}
-	assert.Equal(t, mockedService.On("TheExampleMethodVariadicInterface", expected).Return(nil), &mockedService.Mock)
-	assert.Equal(t, "TheExampleMethodVariadicInterface", mockedService.onMethodName)
-	assert.Equal(t, expected, mockedService.onMethodArguments[0])
-
-	assert.NotPanics(t, func() {
-		mockedService.TheExampleMethodVariadicInterface()
-	})
-	assert.Panics(t, func() {
-		mockedService.TheExampleMethodVariadicInterface(1, 2)
-	})
-
-}
-
-func Test_Mock_On_WithFuncPanics(t *testing.T) {
-	// make a test impl object
-	var mockedService *TestExampleImplementation = new(TestExampleImplementation)
-
-	assert.Panics(t, func() {
-		mockedService.On("TheExampleMethodFunc", func(string) error { return nil })
-	})
-}
-
-func Test_Mock_On_WithFuncTypeArg(t *testing.T) {
-
-	// make a test impl object
-	var mockedService *TestExampleImplementation = new(TestExampleImplementation)
-
-	assert.Equal(t, mockedService.On("TheExampleMethodFuncType", AnythingOfType("mock.ExampleFuncType")).Return(nil), &mockedService.Mock)
-	assert.Equal(t, "TheExampleMethodFuncType", mockedService.onMethodName)
-	assert.Equal(t, AnythingOfType("mock.ExampleFuncType"), mockedService.onMethodArguments[0])
-
-	fn := func(string) error { return nil }
-	mockedService.TheExampleMethodFuncType(fn)
-
-}
-
-func Test_Mock_Return(t *testing.T) {
-
-	// make a test impl object
-	var mockedService *TestExampleImplementation = new(TestExampleImplementation)
-
-	assert.Equal(t, mockedService.On("TheExampleMethod", "A", "B", true).Return(1, "two", true), &mockedService.Mock)
-
-	// ensure the call was created
-	if assert.Equal(t, 1, len(mockedService.ExpectedCalls)) {
-		call := mockedService.ExpectedCalls[0]
-
-		assert.Equal(t, "TheExampleMethod", call.Method)
-		assert.Equal(t, "A", call.Arguments[0])
-		assert.Equal(t, "B", call.Arguments[1])
-		assert.Equal(t, true, call.Arguments[2])
-		assert.Equal(t, 1, call.ReturnArguments[0])
-		assert.Equal(t, "two", call.ReturnArguments[1])
-		assert.Equal(t, true, call.ReturnArguments[2])
-		assert.Equal(t, 0, call.Repeatability)
-		assert.Nil(t, call.WaitFor)
-
-	}
-
-}
-
-func Test_Mock_Return_WaitUntil(t *testing.T) {
-
-	// make a test impl object
-	var mockedService *TestExampleImplementation = new(TestExampleImplementation)
-	ch := time.After(time.Second)
-
-	assert.Equal(t, mockedService.Mock.On("TheExampleMethod", "A", "B", true).Return(1, "two", true).WaitUntil(ch), &mockedService.Mock)
-
-	// ensure the call was created
-	if assert.Equal(t, 1, len(mockedService.Mock.ExpectedCalls)) {
-		call := mockedService.Mock.ExpectedCalls[0]
-
-		assert.Equal(t, "TheExampleMethod", call.Method)
-		assert.Equal(t, "A", call.Arguments[0])
-		assert.Equal(t, "B", call.Arguments[1])
-		assert.Equal(t, true, call.Arguments[2])
-		assert.Equal(t, 1, call.ReturnArguments[0])
-		assert.Equal(t, "two", call.ReturnArguments[1])
-		assert.Equal(t, true, call.ReturnArguments[2])
-		assert.Equal(t, 0, call.Repeatability)
-		assert.Equal(t, ch, call.WaitFor)
-
-	}
-
-}
-
-func Test_Mock_Return_After(t *testing.T) {
-
-	// make a test impl object
-	var mockedService *TestExampleImplementation = new(TestExampleImplementation)
-
-	assert.Equal(t, mockedService.Mock.On("TheExampleMethod", "A", "B", true).Return(1, "two", true).After(time.Second), &mockedService.Mock)
-
-	// ensure the call was created
-	if assert.Equal(t, 1, len(mockedService.Mock.ExpectedCalls)) {
-		call := mockedService.Mock.ExpectedCalls[0]
-
-		assert.Equal(t, "TheExampleMethod", call.Method)
-		assert.Equal(t, "A", call.Arguments[0])
-		assert.Equal(t, "B", call.Arguments[1])
-		assert.Equal(t, true, call.Arguments[2])
-		assert.Equal(t, 1, call.ReturnArguments[0])
-		assert.Equal(t, "two", call.ReturnArguments[1])
-		assert.Equal(t, true, call.ReturnArguments[2])
-		assert.Equal(t, 0, call.Repeatability)
-		assert.NotEqual(t, nil, call.WaitFor)
-
-	}
-
-}
-
-func Test_Mock_Return_Run(t *testing.T) {
-
-	// make a test impl object
-	var mockedService *TestExampleImplementation = new(TestExampleImplementation)
-
-	assert.Equal(t, mockedService.Mock.On("TheExampleMethod3", AnythingOfType("*mock.ExampleType")).Return(nil).Run(func(args Arguments) {
-		arg := args.Get(0).(*ExampleType)
-		arg.ran = true
-	}), &mockedService.Mock)
-
-	// ensure the call was created
-	if assert.Equal(t, 1, len(mockedService.Mock.ExpectedCalls)) {
-		call := mockedService.Mock.ExpectedCalls[0]
-
-		assert.Equal(t, "TheExampleMethod3", call.Method)
-		assert.Equal(t, AnythingOfType("*mock.ExampleType"), call.Arguments[0])
-		assert.Equal(t, nil, call.ReturnArguments[0])
-		assert.Equal(t, 0, call.Repeatability)
-		assert.NotEqual(t, nil, call.WaitFor)
-		assert.NotNil(t, call.Run)
-
-	}
-
-	et := ExampleType{}
-	assert.Equal(t, false, et.ran)
-	mockedService.TheExampleMethod3(&et)
-	assert.Equal(t, true, et.ran)
-
-}
-
-func Test_Mock_Return_Once(t *testing.T) {
-
-	// make a test impl object
-	var mockedService *TestExampleImplementation = new(TestExampleImplementation)
-
-	mockedService.On("TheExampleMethod", "A", "B", true).Return(1, "two", true).Once()
-
-	// ensure the call was created
-	if assert.Equal(t, 1, len(mockedService.ExpectedCalls)) {
-		call := mockedService.ExpectedCalls[0]
-
-		assert.Equal(t, "TheExampleMethod", call.Method)
-		assert.Equal(t, "A", call.Arguments[0])
-		assert.Equal(t, "B", call.Arguments[1])
-		assert.Equal(t, true, call.Arguments[2])
-		assert.Equal(t, 1, call.ReturnArguments[0])
-		assert.Equal(t, "two", call.ReturnArguments[1])
-		assert.Equal(t, true, call.ReturnArguments[2])
-		assert.Equal(t, 1, call.Repeatability)
-		assert.Nil(t, call.WaitFor)
-
-	}
-
-}
-
-func Test_Mock_Return_Twice(t *testing.T) {
-
-	// make a test impl object
-	var mockedService *TestExampleImplementation = new(TestExampleImplementation)
-
-	mockedService.On("TheExampleMethod", "A", "B", true).Return(1, "two", true).Twice()
-
-	// ensure the call was created
-	if assert.Equal(t, 1, len(mockedService.ExpectedCalls)) {
-		call := mockedService.ExpectedCalls[0]
-
-		assert.Equal(t, "TheExampleMethod", call.Method)
-		assert.Equal(t, "A", call.Arguments[0])
-		assert.Equal(t, "B", call.Arguments[1])
-		assert.Equal(t, true, call.Arguments[2])
-		assert.Equal(t, 1, call.ReturnArguments[0])
-		assert.Equal(t, "two", call.ReturnArguments[1])
-		assert.Equal(t, true, call.ReturnArguments[2])
-		assert.Equal(t, 2, call.Repeatability)
-		assert.Nil(t, call.WaitFor)
-
-	}
-
-}
-
-func Test_Mock_Return_Times(t *testing.T) {
-
-	// make a test impl object
-	var mockedService *TestExampleImplementation = new(TestExampleImplementation)
-
-	mockedService.On("TheExampleMethod", "A", "B", true).Return(1, "two", true).Times(5)
-
-	// ensure the call was created
-	if assert.Equal(t, 1, len(mockedService.ExpectedCalls)) {
-		call := mockedService.ExpectedCalls[0]
-
-		assert.Equal(t, "TheExampleMethod", call.Method)
-		assert.Equal(t, "A", call.Arguments[0])
-		assert.Equal(t, "B", call.Arguments[1])
-		assert.Equal(t, true, call.Arguments[2])
-		assert.Equal(t, 1, call.ReturnArguments[0])
-		assert.Equal(t, "two", call.ReturnArguments[1])
-		assert.Equal(t, true, call.ReturnArguments[2])
-		assert.Equal(t, 5, call.Repeatability)
-		assert.Nil(t, call.WaitFor)
-
-	}
-
-}
-
-func Test_Mock_Return_Nothing(t *testing.T) {
-
-	// make a test impl object
-	var mockedService *TestExampleImplementation = new(TestExampleImplementation)
-
-	assert.Equal(t, mockedService.On("TheExampleMethod", "A", "B", true).Return(), &mockedService.Mock)
-
-	// ensure the call was created
-	if assert.Equal(t, 1, len(mockedService.ExpectedCalls)) {
-		call := mockedService.ExpectedCalls[0]
-
-		assert.Equal(t, "TheExampleMethod", call.Method)
-		assert.Equal(t, "A", call.Arguments[0])
-		assert.Equal(t, "B", call.Arguments[1])
-		assert.Equal(t, true, call.Arguments[2])
-		assert.Equal(t, 0, len(call.ReturnArguments))
-
-	}
-
-}
-
-func Test_Mock_findExpectedCall(t *testing.T) {
-
-	m := new(Mock)
-	m.On("One", 1).Return("one")
-	m.On("Two", 2).Return("two")
-	m.On("Two", 3).Return("three")
-
-	f, c := m.findExpectedCall("Two", 3)
-
-	if assert.Equal(t, 2, f) {
-		if assert.NotNil(t, c) {
-			assert.Equal(t, "Two", c.Method)
-			assert.Equal(t, 3, c.Arguments[0])
-			assert.Equal(t, "three", c.ReturnArguments[0])
-		}
-	}
-
-}
-
-func Test_Mock_findExpectedCall_For_Unknown_Method(t *testing.T) {
-
-	m := new(Mock)
-	m.On("One", 1).Return("one")
-	m.On("Two", 2).Return("two")
-	m.On("Two", 3).Return("three")
-
-	f, _ := m.findExpectedCall("Two")
-
-	assert.Equal(t, -1, f)
-
-}
-
-func Test_Mock_findExpectedCall_Respects_Repeatability(t *testing.T) {
-
-	m := new(Mock)
-	m.On("One", 1).Return("one")
-	m.On("Two", 2).Return("two").Once()
-	m.On("Two", 3).Return("three").Twice()
-	m.On("Two", 3).Return("three").Times(8)
-
-	f, c := m.findExpectedCall("Two", 3)
-
-	if assert.Equal(t, 2, f) {
-		if assert.NotNil(t, c) {
-			assert.Equal(t, "Two", c.Method)
-			assert.Equal(t, 3, c.Arguments[0])
-			assert.Equal(t, "three", c.ReturnArguments[0])
-		}
-	}
-
-}
-
-func Test_callString(t *testing.T) {
-
-	assert.Equal(t, `Method(int,bool,string)`, callString("Method", []interface{}{1, true, "something"}, false))
-
-}
-
-func Test_Mock_Called(t *testing.T) {
-
-	var mockedService *TestExampleImplementation = new(TestExampleImplementation)
-
-	mockedService.On("Test_Mock_Called", 1, 2, 3).Return(5, "6", true)
-
-	returnArguments := mockedService.Called(1, 2, 3)
-
-	if assert.Equal(t, 1, len(mockedService.Calls)) {
-		assert.Equal(t, "Test_Mock_Called", mockedService.Calls[0].Method)
-		assert.Equal(t, 1, mockedService.Calls[0].Arguments[0])
-		assert.Equal(t, 2, mockedService.Calls[0].Arguments[1])
-		assert.Equal(t, 3, mockedService.Calls[0].Arguments[2])
-	}
-
-	if assert.Equal(t, 3, len(returnArguments)) {
-		assert.Equal(t, 5, returnArguments[0])
-		assert.Equal(t, "6", returnArguments[1])
-		assert.Equal(t, true, returnArguments[2])
-	}
-
-}
-
-func asyncCall(m *Mock, ch chan Arguments) {
-	ch <- m.Called(1, 2, 3)
-}
-
-func Test_Mock_Called_blocks(t *testing.T) {
-
-	var mockedService *TestExampleImplementation = new(TestExampleImplementation)
-
-	mockedService.Mock.On("asyncCall", 1, 2, 3).Return(5, "6", true).After(2 * time.Millisecond)
-
-	ch := make(chan Arguments)
-
-	go asyncCall(&mockedService.Mock, ch)
-
-	select {
-	case <-ch:
-		t.Fatal("should have waited")
-	case <-time.After(1 * time.Millisecond):
-	}
-
-	returnArguments := <-ch
-
-	if assert.Equal(t, 1, len(mockedService.Mock.Calls)) {
-		assert.Equal(t, "asyncCall", mockedService.Mock.Calls[0].Method)
-		assert.Equal(t, 1, mockedService.Mock.Calls[0].Arguments[0])
-		assert.Equal(t, 2, mockedService.Mock.Calls[0].Arguments[1])
-		assert.Equal(t, 3, mockedService.Mock.Calls[0].Arguments[2])
-	}
-
-	if assert.Equal(t, 3, len(returnArguments)) {
-		assert.Equal(t, 5, returnArguments[0])
-		assert.Equal(t, "6", returnArguments[1])
-		assert.Equal(t, true, returnArguments[2])
-	}
-
-}
-
-func Test_Mock_Called_For_Bounded_Repeatability(t *testing.T) {
-
-	var mockedService *TestExampleImplementation = new(TestExampleImplementation)
-
-	mockedService.On("Test_Mock_Called_For_Bounded_Repeatability", 1, 2, 3).Return(5, "6", true).Once()
-	mockedService.On("Test_Mock_Called_For_Bounded_Repeatability", 1, 2, 3).Return(-1, "hi", false)
-
-	returnArguments1 := mockedService.Called(1, 2, 3)
-	returnArguments2 := mockedService.Called(1, 2, 3)
-
-	if assert.Equal(t, 2, len(mockedService.Calls)) {
-		assert.Equal(t, "Test_Mock_Called_For_Bounded_Repeatability", mockedService.Calls[0].Method)
-		assert.Equal(t, 1, mockedService.Calls[0].Arguments[0])
-		assert.Equal(t, 2, mockedService.Calls[0].Arguments[1])
-		assert.Equal(t, 3, mockedService.Calls[0].Arguments[2])
-
-		assert.Equal(t, "Test_Mock_Called_For_Bounded_Repeatability", mockedService.Calls[1].Method)
-		assert.Equal(t, 1, mockedService.Calls[1].Arguments[0])
-		assert.Equal(t, 2, mockedService.Calls[1].Arguments[1])
-		assert.Equal(t, 3, mockedService.Calls[1].Arguments[2])
-	}
-
-	if assert.Equal(t, 3, len(returnArguments1)) {
-		assert.Equal(t, 5, returnArguments1[0])
-		assert.Equal(t, "6", returnArguments1[1])
-		assert.Equal(t, true, returnArguments1[2])
-	}
-
-	if assert.Equal(t, 3, len(returnArguments2)) {
-		assert.Equal(t, -1, returnArguments2[0])
-		assert.Equal(t, "hi", returnArguments2[1])
-		assert.Equal(t, false, returnArguments2[2])
-	}
-
-}
-
-func Test_Mock_Called_For_SetTime_Expectation(t *testing.T) {
-
-	var mockedService *TestExampleImplementation = new(TestExampleImplementation)
-
-	mockedService.On("TheExampleMethod", 1, 2, 3).Return(5, "6", true).Times(4)
-
-	mockedService.TheExampleMethod(1, 2, 3)
-	mockedService.TheExampleMethod(1, 2, 3)
-	mockedService.TheExampleMethod(1, 2, 3)
-	mockedService.TheExampleMethod(1, 2, 3)
-	assert.Panics(t, func() {
-		mockedService.TheExampleMethod(1, 2, 3)
-	})
-
-}
-
-func Test_Mock_Called_Unexpected(t *testing.T) {
-
-	var mockedService *TestExampleImplementation = new(TestExampleImplementation)
-
-	// make sure it panics if no expectation was made
-	assert.Panics(t, func() {
-		mockedService.Called(1, 2, 3)
-	}, "Calling unexpected method should panic")
-
-}
-
-func Test_AssertExpectationsForObjects_Helper(t *testing.T) {
-
-	var mockedService1 *TestExampleImplementation = new(TestExampleImplementation)
-	var mockedService2 *TestExampleImplementation = new(TestExampleImplementation)
-	var mockedService3 *TestExampleImplementation = new(TestExampleImplementation)
-
-	mockedService1.On("Test_AssertExpectationsForObjects_Helper", 1).Return()
-	mockedService2.On("Test_AssertExpectationsForObjects_Helper", 2).Return()
-	mockedService3.On("Test_AssertExpectationsForObjects_Helper", 3).Return()
-
-	mockedService1.Called(1)
-	mockedService2.Called(2)
-	mockedService3.Called(3)
-
-	assert.True(t, AssertExpectationsForObjects(t, mockedService1.Mock, mockedService2.Mock, mockedService3.Mock))
-
-}
-
-func Test_AssertExpectationsForObjects_Helper_Failed(t *testing.T) {
-
-	var mockedService1 *TestExampleImplementation = new(TestExampleImplementation)
-	var mockedService2 *TestExampleImplementation = new(TestExampleImplementation)
-	var mockedService3 *TestExampleImplementation = new(TestExampleImplementation)
-
-	mockedService1.On("Test_AssertExpectationsForObjects_Helper_Failed", 1).Return()
-	mockedService2.On("Test_AssertExpectationsForObjects_Helper_Failed", 2).Return()
-	mockedService3.On("Test_AssertExpectationsForObjects_Helper_Failed", 3).Return()
-
-	mockedService1.Called(1)
-	mockedService3.Called(3)
-
-	tt := new(testing.T)
-	assert.False(t, AssertExpectationsForObjects(tt, mockedService1.Mock, mockedService2.Mock, mockedService3.Mock))
-
-}
-
-func Test_Mock_AssertExpectations(t *testing.T) {
-
-	var mockedService *TestExampleImplementation = new(TestExampleImplementation)
-
-	mockedService.On("Test_Mock_AssertExpectations", 1, 2, 3).Return(5, 6, 7)
-
-	tt := new(testing.T)
-	assert.False(t, mockedService.AssertExpectations(tt))
-
-	// make the call now
-	mockedService.Called(1, 2, 3)
-
-	// now assert expectations
-	assert.True(t, mockedService.AssertExpectations(tt))
-
-}
-
-func Test_Mock_AssertExpectationsCustomType(t *testing.T) {
-
-	var mockedService *TestExampleImplementation = new(TestExampleImplementation)
-
-	mockedService.On("TheExampleMethod3", AnythingOfType("*mock.ExampleType")).Return(nil).Once()
-
-	tt := new(testing.T)
-	assert.False(t, mockedService.AssertExpectations(tt))
-
-	// make the call now
-	mockedService.TheExampleMethod3(&ExampleType{})
-
-	// now assert expectations
-	assert.True(t, mockedService.AssertExpectations(tt))
-
-}
-
-func Test_Mock_AssertExpectations_With_Repeatability(t *testing.T) {
-
-	var mockedService *TestExampleImplementation = new(TestExampleImplementation)
-
-	mockedService.On("Test_Mock_AssertExpectations_With_Repeatability", 1, 2, 3).Return(5, 6, 7).Twice()
-
-	tt := new(testing.T)
-	assert.False(t, mockedService.AssertExpectations(tt))
-
-	// make the call now
-	mockedService.Called(1, 2, 3)
-
-	assert.False(t, mockedService.AssertExpectations(tt))
-
-	mockedService.Called(1, 2, 3)
-
-	// now assert expectations
-	assert.True(t, mockedService.AssertExpectations(tt))
-
-}
-
-func Test_Mock_TwoCallsWithDifferentArguments(t *testing.T) {
-
-	var mockedService *TestExampleImplementation = new(TestExampleImplementation)
-
-	mockedService.On("Test_Mock_TwoCallsWithDifferentArguments", 1, 2, 3).Return(5, 6, 7)
-	mockedService.On("Test_Mock_TwoCallsWithDifferentArguments", 4, 5, 6).Return(5, 6, 7)
-
-	args1 := mockedService.Called(1, 2, 3)
-	assert.Equal(t, 5, args1.Int(0))
-	assert.Equal(t, 6, args1.Int(1))
-	assert.Equal(t, 7, args1.Int(2))
-
-	args2 := mockedService.Called(4, 5, 6)
-	assert.Equal(t, 5, args2.Int(0))
-	assert.Equal(t, 6, args2.Int(1))
-	assert.Equal(t, 7, args2.Int(2))
-
-}
-
-func Test_Mock_AssertNumberOfCalls(t *testing.T) {
-
-	var mockedService *TestExampleImplementation = new(TestExampleImplementation)
-
-	mockedService.On("Test_Mock_AssertNumberOfCalls", 1, 2, 3).Return(5, 6, 7)
-
-	mockedService.Called(1, 2, 3)
-	assert.True(t, mockedService.AssertNumberOfCalls(t, "Test_Mock_AssertNumberOfCalls", 1))
-
-	mockedService.Called(1, 2, 3)
-	assert.True(t, mockedService.AssertNumberOfCalls(t, "Test_Mock_AssertNumberOfCalls", 2))
-
-}
-
-func Test_Mock_AssertCalled(t *testing.T) {
-
-	var mockedService *TestExampleImplementation = new(TestExampleImplementation)
-
-	mockedService.On("Test_Mock_AssertCalled", 1, 2, 3).Return(5, 6, 7)
-
-	mockedService.Called(1, 2, 3)
-
-	assert.True(t, mockedService.AssertCalled(t, "Test_Mock_AssertCalled", 1, 2, 3))
-
-}
-
-func Test_Mock_AssertCalled_WithAnythingOfTypeArgument(t *testing.T) {
-
-	var mockedService *TestExampleImplementation = new(TestExampleImplementation)
-
-	mockedService.On("Test_Mock_AssertCalled_WithAnythingOfTypeArgument", Anything, Anything, Anything).Return()
-
-	mockedService.Called(1, "two", []uint8("three"))
-
-	assert.True(t, mockedService.AssertCalled(t, "Test_Mock_AssertCalled_WithAnythingOfTypeArgument", AnythingOfType("int"), AnythingOfType("string"), AnythingOfType("[]uint8")))
-
-}
-
-func Test_Mock_AssertCalled_WithArguments(t *testing.T) {
-
-	var mockedService *TestExampleImplementation = new(TestExampleImplementation)
-
-	mockedService.On("Test_Mock_AssertCalled_WithArguments", 1, 2, 3).Return(5, 6, 7)
-
-	mockedService.Called(1, 2, 3)
-
-	tt := new(testing.T)
-	assert.True(t, mockedService.AssertCalled(tt, "Test_Mock_AssertCalled_WithArguments", 1, 2, 3))
-	assert.False(t, mockedService.AssertCalled(tt, "Test_Mock_AssertCalled_WithArguments", 2, 3, 4))
-
-}
-
-func Test_Mock_AssertCalled_WithArguments_With_Repeatability(t *testing.T) {
-
-	var mockedService *TestExampleImplementation = new(TestExampleImplementation)
-
-	mockedService.On("Test_Mock_AssertCalled_WithArguments_With_Repeatability", 1, 2, 3).Return(5, 6, 7).Once()
-	mockedService.On("Test_Mock_AssertCalled_WithArguments_With_Repeatability", 2, 3, 4).Return(5, 6, 7).Once()
-
-	mockedService.Called(1, 2, 3)
-	mockedService.Called(2, 3, 4)
-
-	tt := new(testing.T)
-	assert.True(t, mockedService.AssertCalled(tt, "Test_Mock_AssertCalled_WithArguments_With_Repeatability", 1, 2, 3))
-	assert.True(t, mockedService.AssertCalled(tt, "Test_Mock_AssertCalled_WithArguments_With_Repeatability", 2, 3, 4))
-	assert.False(t, mockedService.AssertCalled(tt, "Test_Mock_AssertCalled_WithArguments_With_Repeatability", 3, 4, 5))
-
-}
-
-func Test_Mock_AssertNotCalled(t *testing.T) {
-
-	var mockedService *TestExampleImplementation = new(TestExampleImplementation)
-
-	mockedService.On("Test_Mock_AssertNotCalled", 1, 2, 3).Return(5, 6, 7)
-
-	mockedService.Called(1, 2, 3)
-
-	assert.True(t, mockedService.AssertNotCalled(t, "Test_Mock_NotCalled"))
-
-}
-
-/*
-	Arguments helper methods
-*/
-func Test_Arguments_Get(t *testing.T) {
-
-	var args Arguments = []interface{}{"string", 123, true}
-
-	assert.Equal(t, "string", args.Get(0).(string))
-	assert.Equal(t, 123, args.Get(1).(int))
-	assert.Equal(t, true, args.Get(2).(bool))
-
-}
-
-func Test_Arguments_Is(t *testing.T) {
-
-	var args Arguments = []interface{}{"string", 123, true}
-
-	assert.True(t, args.Is("string", 123, true))
-	assert.False(t, args.Is("wrong", 456, false))
-
-}
-
-func Test_Arguments_Diff(t *testing.T) {
-
-	var args Arguments = []interface{}{"Hello World", 123, true}
-	var diff string
-	var count int
-	diff, count = args.Diff([]interface{}{"Hello World", 456, "false"})
-
-	assert.Equal(t, 2, count)
-	assert.Contains(t, diff, `%!s(int=456) != %!s(int=123)`)
-	assert.Contains(t, diff, `false != %!s(bool=true)`)
-
-}
-
-func Test_Arguments_Diff_DifferentNumberOfArgs(t *testing.T) {
-
-	var args Arguments = []interface{}{"string", 123, true}
-	var diff string
-	var count int
-	diff, count = args.Diff([]interface{}{"string", 456, "false", "extra"})
-
-	assert.Equal(t, 3, count)
-	assert.Contains(t, diff, `extra != (Missing)`)
-
-}
-
-func Test_Arguments_Diff_WithAnythingArgument(t *testing.T) {
-
-	var args Arguments = []interface{}{"string", 123, true}
-	var count int
-	_, count = args.Diff([]interface{}{"string", Anything, true})
-
-	assert.Equal(t, 0, count)
-
-}
-
-func Test_Arguments_Diff_WithAnythingArgument_InActualToo(t *testing.T) {
-
-	var args Arguments = []interface{}{"string", Anything, true}
-	var count int
-	_, count = args.Diff([]interface{}{"string", 123, true})
-
-	assert.Equal(t, 0, count)
-
-}
-
-func Test_Arguments_Diff_WithAnythingOfTypeArgument(t *testing.T) {
-
-	var args Arguments = []interface{}{"string", AnythingOfType("int"), true}
-	var count int
-	_, count = args.Diff([]interface{}{"string", 123, true})
-
-	assert.Equal(t, 0, count)
-
-}
-
-func Test_Arguments_Diff_WithAnythingOfTypeArgument_Failing(t *testing.T) {
-
-	var args Arguments = []interface{}{"string", AnythingOfType("string"), true}
-	var count int
-	var diff string
-	diff, count = args.Diff([]interface{}{"string", 123, true})
-
-	assert.Equal(t, 1, count)
-	assert.Contains(t, diff, `string != type int - %!s(int=123)`)
-
-}
-
-func Test_Arguments_Assert(t *testing.T) {
-
-	var args Arguments = []interface{}{"string", 123, true}
-
-	assert.True(t, args.Assert(t, "string", 123, true))
-
-}
-
-func Test_Arguments_String_Representation(t *testing.T) {
-
-	var args Arguments = []interface{}{"string", 123, true}
-	assert.Equal(t, `string,int,bool`, args.String())
-
-}
-
-func Test_Arguments_String(t *testing.T) {
-
-	var args Arguments = []interface{}{"string", 123, true}
-	assert.Equal(t, "string", args.String(0))
-
-}
-
-func Test_Arguments_Error(t *testing.T) {
-
-	var err error = errors.New("An Error")
-	var args Arguments = []interface{}{"string", 123, true, err}
-	assert.Equal(t, err, args.Error(3))
-
-}
-
-func Test_Arguments_Error_Nil(t *testing.T) {
-
-	var args Arguments = []interface{}{"string", 123, true, nil}
-	assert.Equal(t, nil, args.Error(3))
-
-}
-
-func Test_Arguments_Int(t *testing.T) {
-
-	var args Arguments = []interface{}{"string", 123, true}
-	assert.Equal(t, 123, args.Int(1))
-
-}
-
-func Test_Arguments_Bool(t *testing.T) {
-
-	var args Arguments = []interface{}{"string", 123, true}
-	assert.Equal(t, true, args.Bool(2))
-
-}
diff --git a/Godeps/_workspace/src/github.com/stretchr/testify/require/doc.go b/Godeps/_workspace/src/github.com/stretchr/testify/require/doc.go
deleted file mode 100644
index 7b38438f5..000000000
--- a/Godeps/_workspace/src/github.com/stretchr/testify/require/doc.go
+++ /dev/null
@@ -1,77 +0,0 @@
-// Alternative testing tools which stop test execution if test failed.
-//
-// Example Usage
-//
-// The following is a complete example using require in a standard test function:
-//    import (
-//      "testing"
-//      "github.com/stretchr/testify/require"
-//    )
-//
-//    func TestSomething(t *testing.T) {
-//
-//      var a string = "Hello"
-//      var b string = "Hello"
-//
-//      require.Equal(t, a, b, "The two words should be the same.")
-//
-//    }
-//
-// Assertions
-//
-// The `require` package have same global functions as in the `assert` package,
-// but instead of returning a boolean result they call `t.FailNow()`.
-//
-// Every assertion function also takes an optional string message as the final argument,
-// allowing custom error messages to be appended to the message the assertion method outputs.
-//
-// Here is an overview of the assert functions:
-//
-//    require.Equal(t, expected, actual [, message [, format-args])
-//
-//    require.NotEqual(t, notExpected, actual [, message [, format-args]])
-//
-//    require.True(t, actualBool [, message [, format-args]])
-//
-//    require.False(t, actualBool [, message [, format-args]])
-//
-//    require.Nil(t, actualObject [, message [, format-args]])
-//
-//    require.NotNil(t, actualObject [, message [, format-args]])
-//
-//    require.Empty(t, actualObject [, message [, format-args]])
-//
-//    require.NotEmpty(t, actualObject [, message [, format-args]])
-//
-//    require.Error(t, errorObject [, message [, format-args]])
-//
-//    require.NoError(t, errorObject [, message [, format-args]])
-//
-//    require.EqualError(t, theError, errString [, message [, format-args]])
-//
-//    require.Implements(t, (*MyInterface)(nil), new(MyObject) [,message [, format-args]])
-//
-//    require.IsType(t, expectedObject, actualObject [, message [, format-args]])
-//
-//    require.Contains(t, string, substring [, message [, format-args]])
-//
-//    require.NotContains(t, string, substring [, message [, format-args]])
-//
-//    require.Panics(t, func(){
-//
-//	    // call code that should panic
-//
-//    } [, message [, format-args]])
-//
-//    require.NotPanics(t, func(){
-//
-//	    // call code that should not panic
-//
-//    } [, message [, format-args]])
-//
-//    require.WithinDuration(t, timeA, timeB, deltaTime, [, message [, format-args]])
-//
-//    require.InDelta(t, numA, numB, delta, [, message [, format-args]])
-//
-//    require.InEpsilon(t, numA, numB, epsilon, [, message [, format-args]])
-package require
diff --git a/Godeps/_workspace/src/github.com/stretchr/testify/require/forward_requirements.go b/Godeps/_workspace/src/github.com/stretchr/testify/require/forward_requirements.go
deleted file mode 100644
index 069d41984..000000000
--- a/Godeps/_workspace/src/github.com/stretchr/testify/require/forward_requirements.go
+++ /dev/null
@@ -1,211 +0,0 @@
-package require
-
-import (
-	"time"
-
-	"github.com/stretchr/testify/assert"
-)
-
-type Assertions struct {
-	t TestingT
-}
-
-func New(t TestingT) *Assertions {
-	return &Assertions{
-		t: t,
-	}
-}
-
-// Fail reports a failure through
-func (a *Assertions) Fail(failureMessage string, msgAndArgs ...interface{}) {
-	FailNow(a.t, failureMessage, msgAndArgs...)
-}
-
-// Implements asserts that an object is implemented by the specified interface.
-
-func (a *Assertions) Implements(interfaceObject interface{}, object interface{}, msgAndArgs ...interface{}) {
-	Implements(a.t, interfaceObject, object, msgAndArgs...)
-}
-
-// IsType asserts that the specified objects are of the same type.
-func (a *Assertions) IsType(expectedType interface{}, object interface{}, msgAndArgs ...interface{}) {
-	IsType(a.t, expectedType, object, msgAndArgs...)
-}
-
-// Equal asserts that two objects are equal.
-//
-//    require.Equal(123, 123, "123 and 123 should be equal")
-func (a *Assertions) Equal(expected, actual interface{}, msgAndArgs ...interface{}) {
-	Equal(a.t, expected, actual, msgAndArgs...)
-}
-
-// Exactly asserts that two objects are equal is value and type.
-//
-//    require.Exactly(int32(123), int64(123), "123 and 123 should NOT be equal")
-func (a *Assertions) Exactly(expected, actual interface{}, msgAndArgs ...interface{}) {
-	Exactly(a.t, expected, actual, msgAndArgs...)
-}
-
-// NotNil asserts that the specified object is not nil.
-//
-//    require.NotNil(err, "err should be something")
-func (a *Assertions) NotNil(object interface{}, msgAndArgs ...interface{}) {
-	NotNil(a.t, object, msgAndArgs...)
-}
-
-// Nil asserts that the specified object is nil.
-//
-//    require.Nil(err, "err should be nothing")
-func (a *Assertions) Nil(object interface{}, msgAndArgs ...interface{}) {
-	Nil(a.t, object, msgAndArgs...)
-}
-
-// Empty asserts that the specified object is empty.  I.e. nil, "", false, 0 or a
-// slice with len == 0.
-//
-// require.Empty(obj)
-func (a *Assertions) Empty(object interface{}, msgAndArgs ...interface{}) {
-	Empty(a.t, object, msgAndArgs...)
-}
-
-// Empty asserts that the specified object is NOT empty.  I.e. not nil, "", false, 0 or a
-// slice with len == 0.
-//
-// if require.NotEmpty(obj) {
-//   require.Equal("two", obj[1])
-// }
-func (a *Assertions) NotEmpty(object interface{}, msgAndArgs ...interface{}) {
-	NotEmpty(a.t, object, msgAndArgs...)
-}
-
-// Len asserts that the specified object has specific length.
-// Len also fails if the object has a type that len() not accept.
-//
-//    require.Len(mySlice, 3, "The size of slice is not 3")
-func (a *Assertions) Len(object interface{}, length int, msgAndArgs ...interface{}) {
-	Len(a.t, object, length, msgAndArgs...)
-}
-
-// True asserts that the specified value is true.
-//
-//    require.True(myBool, "myBool should be true")
-func (a *Assertions) True(value bool, msgAndArgs ...interface{}) {
-	True(a.t, value, msgAndArgs...)
-}
-
-// False asserts that the specified value is true.
-//
-//    require.False(myBool, "myBool should be false")
-func (a *Assertions) False(value bool, msgAndArgs ...interface{}) {
-	False(a.t, value, msgAndArgs...)
-}
-
-// NotEqual asserts that the specified values are NOT equal.
-//
-//    require.NotEqual(obj1, obj2, "two objects shouldn't be equal")
-func (a *Assertions) NotEqual(expected, actual interface{}, msgAndArgs ...interface{}) {
-	NotEqual(a.t, expected, actual, msgAndArgs...)
-}
-
-// Contains asserts that the specified string contains the specified substring.
-//
-//    require.Contains("Hello World", "World", "But 'Hello World' does contain 'World'")
-func (a *Assertions) Contains(s, contains interface{}, msgAndArgs ...interface{}) {
-	Contains(a.t, s, contains, msgAndArgs...)
-}
-
-// NotContains asserts that the specified string does NOT contain the specified substring.
-//
-//    require.NotContains("Hello World", "Earth", "But 'Hello World' does NOT contain 'Earth'")
-func (a *Assertions) NotContains(s, contains interface{}, msgAndArgs ...interface{}) {
-	NotContains(a.t, s, contains, msgAndArgs...)
-}
-
-// Uses a Comparison to assert a complex condition.
-func (a *Assertions) Condition(comp assert.Comparison, msgAndArgs ...interface{}) {
-	Condition(a.t, comp, msgAndArgs...)
-}
-
-// Panics asserts that the code inside the specified PanicTestFunc panics.
-//
-//   require.Panics(func(){
-//     GoCrazy()
-//   }, "Calling GoCrazy() should panic")
-func (a *Assertions) Panics(f assert.PanicTestFunc, msgAndArgs ...interface{}) {
-	Panics(a.t, f, msgAndArgs...)
-}
-
-// NotPanics asserts that the code inside the specified PanicTestFunc does NOT panic.
-//
-//   require.NotPanics(func(){
-//     RemainCalm()
-//   }, "Calling RemainCalm() should NOT panic")
-func (a *Assertions) NotPanics(f assert.PanicTestFunc, msgAndArgs ...interface{}) {
-	NotPanics(a.t, f, msgAndArgs...)
-}
-
-// WithinDuration asserts that the two times are within duration delta of each other.
-//
-//   require.WithinDuration(time.Now(), time.Now(), 10*time.Second, "The difference should not be more than 10s")
-func (a *Assertions) WithinDuration(expected, actual time.Time, delta time.Duration, msgAndArgs ...interface{}) {
-	WithinDuration(a.t, expected, actual, delta, msgAndArgs...)
-}
-
-// InDelta asserts that the two numerals are within delta of each other.
-//
-// 	 require.InDelta(t, math.Pi, (22 / 7.0), 0.01)
-func (a *Assertions) InDelta(expected, actual interface{}, delta float64, msgAndArgs ...interface{}) {
-	InDelta(a.t, expected, actual, delta, msgAndArgs...)
-}
-
-// InEpsilon asserts that expected and actual have a relative error less than epsilon
-func (a *Assertions) InEpsilon(expected, actual interface{}, epsilon float64, msgAndArgs ...interface{}) {
-	InEpsilon(a.t, expected, actual, epsilon, msgAndArgs...)
-}
-
-// NoError asserts that a function returned no error (i.e. `nil`).
-//
-//   actualObj, err := SomeFunction()
-//   if require.NoError(err) {
-//	   require.Equal(actualObj, expectedObj)
-//   }
-func (a *Assertions) NoError(theError error, msgAndArgs ...interface{}) {
-	NoError(a.t, theError, msgAndArgs...)
-}
-
-// Error asserts that a function returned an error (i.e. not `nil`).
-//
-//   actualObj, err := SomeFunction()
-//   if require.Error(err, "An error was expected") {
-//	   require.Equal(err, expectedError)
-//   }
-func (a *Assertions) Error(theError error, msgAndArgs ...interface{}) {
-	Error(a.t, theError, msgAndArgs...)
-}
-
-// EqualError asserts that a function returned an error (i.e. not `nil`)
-// and that it is equal to the provided error.
-//
-//   actualObj, err := SomeFunction()
-//   if require.Error(err, "An error was expected") {
-//	   require.Equal(err, expectedError)
-//   }
-func (a *Assertions) EqualError(theError error, errString string, msgAndArgs ...interface{}) {
-	EqualError(a.t, theError, errString, msgAndArgs...)
-}
-
-// Regexp asserts that a specified regexp matches a string.
-//
-//  require.Regexp(t, regexp.MustCompile("start"), "it's starting")
-//  require.Regexp(t, "start...$", "it's not starting")
-func (a *Assertions) Regexp(rx interface{}, str interface{}, msgAndArgs ...interface{}) {
-	Regexp(a.t, rx, str, msgAndArgs...)
-}
-
-// NotRegexp asserts that a specified regexp does not match a string.
-//
-//  require.NotRegexp(t, regexp.MustCompile("starts"), "it's starting")
-//  require.NotRegexp(t, "^start", "it's not starting")
-func (a *Assertions) NotRegexp(rx interface{}, str interface{}, msgAndArgs ...interface{}) {
-	NotRegexp(a.t, rx, str, msgAndArgs...)
-}
diff --git a/Godeps/_workspace/src/github.com/stretchr/testify/require/forward_requirements_test.go b/Godeps/_workspace/src/github.com/stretchr/testify/require/forward_requirements_test.go
deleted file mode 100644
index 02be2916e..000000000
--- a/Godeps/_workspace/src/github.com/stretchr/testify/require/forward_requirements_test.go
+++ /dev/null
@@ -1,260 +0,0 @@
-package require
-
-import (
-	"errors"
-	"testing"
-	"time"
-)
-
-func TestImplementsWrapper(t *testing.T) {
-	require := New(t)
-
-	require.Implements((*AssertionTesterInterface)(nil), new(AssertionTesterConformingObject))
-
-	mockT := new(MockT)
-	mockRequire := New(mockT)
-	mockRequire.Implements((*AssertionTesterInterface)(nil), new(AssertionTesterNonConformingObject))
-	if !mockT.Failed {
-		t.Error("Check should fail")
-	}
-}
-
-func TestIsTypeWrapper(t *testing.T) {
-	require := New(t)
-	require.IsType(new(AssertionTesterConformingObject), new(AssertionTesterConformingObject))
-
-	mockT := new(MockT)
-	mockRequire := New(mockT)
-	mockRequire.IsType(new(AssertionTesterConformingObject), new(AssertionTesterNonConformingObject))
-	if !mockT.Failed {
-		t.Error("Check should fail")
-	}
-}
-
-func TestEqualWrapper(t *testing.T) {
-	require := New(t)
-	require.Equal(1, 1)
-
-	mockT := new(MockT)
-	mockRequire := New(mockT)
-	mockRequire.Equal(1, 2)
-	if !mockT.Failed {
-		t.Error("Check should fail")
-	}
-}
-
-func TestNotEqualWrapper(t *testing.T) {
-	require := New(t)
-	require.NotEqual(1, 2)
-
-	mockT := new(MockT)
-	mockRequire := New(mockT)
-	mockRequire.NotEqual(2, 2)
-	if !mockT.Failed {
-		t.Error("Check should fail")
-	}
-}
-
-func TestExactlyWrapper(t *testing.T) {
-	require := New(t)
-
-	a := float32(1)
-	b := float32(1)
-	c := float64(1)
-
-	require.Exactly(a, b)
-
-	mockT := new(MockT)
-	mockRequire := New(mockT)
-	mockRequire.Exactly(a, c)
-	if !mockT.Failed {
-		t.Error("Check should fail")
-	}
-}
-
-func TestNotNilWrapper(t *testing.T) {
-	require := New(t)
-	require.NotNil(t, new(AssertionTesterConformingObject))
-
-	mockT := new(MockT)
-	mockRequire := New(mockT)
-	mockRequire.NotNil(nil)
-	if !mockT.Failed {
-		t.Error("Check should fail")
-	}
-}
-
-func TestNilWrapper(t *testing.T) {
-	require := New(t)
-	require.Nil(nil)
-
-	mockT := new(MockT)
-	mockRequire := New(mockT)
-	mockRequire.Nil(new(AssertionTesterConformingObject))
-	if !mockT.Failed {
-		t.Error("Check should fail")
-	}
-}
-
-func TestTrueWrapper(t *testing.T) {
-	require := New(t)
-	require.True(true)
-
-	mockT := new(MockT)
-	mockRequire := New(mockT)
-	mockRequire.True(false)
-	if !mockT.Failed {
-		t.Error("Check should fail")
-	}
-}
-
-func TestFalseWrapper(t *testing.T) {
-	require := New(t)
-	require.False(false)
-
-	mockT := new(MockT)
-	mockRequire := New(mockT)
-	mockRequire.False(true)
-	if !mockT.Failed {
-		t.Error("Check should fail")
-	}
-}
-
-func TestContainsWrapper(t *testing.T) {
-	require := New(t)
-	require.Contains("Hello World", "Hello")
-
-	mockT := new(MockT)
-	mockRequire := New(mockT)
-	mockRequire.Contains("Hello World", "Salut")
-	if !mockT.Failed {
-		t.Error("Check should fail")
-	}
-}
-
-func TestNotContainsWrapper(t *testing.T) {
-	require := New(t)
-	require.NotContains("Hello World", "Hello!")
-
-	mockT := new(MockT)
-	mockRequire := New(mockT)
-	mockRequire.NotContains("Hello World", "Hello")
-	if !mockT.Failed {
-		t.Error("Check should fail")
-	}
-}
-
-func TestPanicsWrapper(t *testing.T) {
-	require := New(t)
-	require.Panics(func() {
-		panic("Panic!")
-	})
-
-	mockT := new(MockT)
-	mockRequire := New(mockT)
-	mockRequire.Panics(func() {})
-	if !mockT.Failed {
-		t.Error("Check should fail")
-	}
-}
-
-func TestNotPanicsWrapper(t *testing.T) {
-	require := New(t)
-	require.NotPanics(func() {})
-
-	mockT := new(MockT)
-	mockRequire := New(mockT)
-	mockRequire.NotPanics(func() {
-		panic("Panic!")
-	})
-	if !mockT.Failed {
-		t.Error("Check should fail")
-	}
-}
-
-func TestNoErrorWrapper(t *testing.T) {
-	require := New(t)
-	require.NoError(nil)
-
-	mockT := new(MockT)
-	mockRequire := New(mockT)
-	mockRequire.NoError(errors.New("some error"))
-	if !mockT.Failed {
-		t.Error("Check should fail")
-	}
-}
-
-func TestErrorWrapper(t *testing.T) {
-	require := New(t)
-	require.Error(errors.New("some error"))
-
-	mockT := new(MockT)
-	mockRequire := New(mockT)
-	mockRequire.Error(nil)
-	if !mockT.Failed {
-		t.Error("Check should fail")
-	}
-}
-
-func TestEqualErrorWrapper(t *testing.T) {
-	require := New(t)
-	require.EqualError(errors.New("some error"), "some error")
-
-	mockT := new(MockT)
-	mockRequire := New(mockT)
-	mockRequire.EqualError(errors.New("some error"), "Not some error")
-	if !mockT.Failed {
-		t.Error("Check should fail")
-	}
-}
-
-func TestEmptyWrapper(t *testing.T) {
-	require := New(t)
-	require.Empty("")
-
-	mockT := new(MockT)
-	mockRequire := New(mockT)
-	mockRequire.Empty("x")
-	if !mockT.Failed {
-		t.Error("Check should fail")
-	}
-}
-
-func TestNotEmptyWrapper(t *testing.T) {
-	require := New(t)
-	require.NotEmpty("x")
-
-	mockT := new(MockT)
-	mockRequire := New(mockT)
-	mockRequire.NotEmpty("")
-	if !mockT.Failed {
-		t.Error("Check should fail")
-	}
-}
-
-func TestWithinDurationWrapper(t *testing.T) {
-	require := New(t)
-	a := time.Now()
-	b := a.Add(10 * time.Second)
-
-	require.WithinDuration(a, b, 15*time.Second)
-
-	mockT := new(MockT)
-	mockRequire := New(mockT)
-	mockRequire.WithinDuration(a, b, 5*time.Second)
-	if !mockT.Failed {
-		t.Error("Check should fail")
-	}
-}
-
-func TestInDeltaWrapper(t *testing.T) {
-	require := New(t)
-	require.InDelta(1.001, 1, 0.01)
-
-	mockT := new(MockT)
-	mockRequire := New(mockT)
-	mockRequire.InDelta(1, 2, 0.5)
-	if !mockT.Failed {
-		t.Error("Check should fail")
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/stretchr/testify/require/requirements.go b/Godeps/_workspace/src/github.com/stretchr/testify/require/requirements.go
deleted file mode 100644
index 122a3f3ab..000000000
--- a/Godeps/_workspace/src/github.com/stretchr/testify/require/requirements.go
+++ /dev/null
@@ -1,271 +0,0 @@
-package require
-
-import (
-	"time"
-
-	"github.com/stretchr/testify/assert"
-)
-
-type TestingT interface {
-	Errorf(format string, args ...interface{})
-	FailNow()
-}
-
-// Fail reports a failure through
-func FailNow(t TestingT, failureMessage string, msgAndArgs ...interface{}) {
-	assert.Fail(t, failureMessage, msgAndArgs...)
-	t.FailNow()
-}
-
-// Implements asserts that an object is implemented by the specified interface.
-//
-//    require.Implements(t, (*MyInterface)(nil), new(MyObject), "MyObject")
-func Implements(t TestingT, interfaceObject interface{}, object interface{}, msgAndArgs ...interface{}) {
-	if !assert.Implements(t, interfaceObject, object, msgAndArgs...) {
-		t.FailNow()
-	}
-}
-
-// IsType asserts that the specified objects are of the same type.
-func IsType(t TestingT, expectedType interface{}, object interface{}, msgAndArgs ...interface{}) {
-	if !assert.IsType(t, expectedType, object, msgAndArgs...) {
-		t.FailNow()
-	}
-}
-
-// Equal asserts that two objects are equal.
-//
-//    require.Equal(t, 123, 123, "123 and 123 should be equal")
-func Equal(t TestingT, expected, actual interface{}, msgAndArgs ...interface{}) {
-	if !assert.Equal(t, expected, actual, msgAndArgs...) {
-		t.FailNow()
-	}
-}
-
-// EqualValues asserts that two objects are equal or convertable to each other.
-//
-//    require.EqualValues(t, uint32(123), int32(123), "123 and 123 should be equal")
-func EqualValues(t TestingT, expected, actual interface{}, msgAndArgs ...interface{}) {
-	if !assert.EqualValues(t, expected, actual, msgAndArgs...) {
-		t.FailNow()
-	}
-}
-
-// Exactly asserts that two objects are equal is value and type.
-//
-//    require.Exactly(t, int32(123), int64(123), "123 and 123 should NOT be equal")
-func Exactly(t TestingT, expected, actual interface{}, msgAndArgs ...interface{}) {
-	if !assert.Exactly(t, expected, actual, msgAndArgs...) {
-		t.FailNow()
-	}
-}
-
-// NotNil asserts that the specified object is not nil.
-//
-//    require.NotNil(t, err, "err should be something")
-func NotNil(t TestingT, object interface{}, msgAndArgs ...interface{}) {
-	if !assert.NotNil(t, object, msgAndArgs...) {
-		t.FailNow()
-	}
-}
-
-// Nil asserts that the specified object is nil.
-//
-//    require.Nil(t, err, "err should be nothing")
-func Nil(t TestingT, object interface{}, msgAndArgs ...interface{}) {
-	if !assert.Nil(t, object, msgAndArgs...) {
-		t.FailNow()
-	}
-}
-
-// Empty asserts that the specified object is empty.  I.e. nil, "", false, 0 or either
-// a slice or a channel with len == 0.
-//
-// require.Empty(t, obj)
-func Empty(t TestingT, object interface{}, msgAndArgs ...interface{}) {
-	if !assert.Empty(t, object, msgAndArgs...) {
-		t.FailNow()
-	}
-}
-
-// NotEmpty asserts that the specified object is NOT empty.  I.e. not nil, "", false, 0 or either
-// a slice or a channel with len == 0.
-//
-// require.NotEmpty(t, obj)
-// require.Equal(t, "one", obj[0])
-func NotEmpty(t TestingT, object interface{}, msgAndArgs ...interface{}) {
-	if !assert.NotEmpty(t, object, msgAndArgs...) {
-		t.FailNow()
-	}
-}
-
-// Len asserts that the specified object has specific length.
-// Len also fails if the object has a type that len() not accept.
-//
-//    require.Len(t, mySlice, 3, "The size of slice is not 3")
-func Len(t TestingT, object interface{}, length int, msgAndArgs ...interface{}) {
-	if !assert.Len(t, object, length, msgAndArgs...) {
-		t.FailNow()
-	}
-}
-
-// True asserts that the specified value is true.
-//
-//    require.True(t, myBool, "myBool should be true")
-func True(t TestingT, value bool, msgAndArgs ...interface{}) {
-	if !assert.True(t, value, msgAndArgs...) {
-		t.FailNow()
-	}
-}
-
-// False asserts that the specified value is true.
-//
-//    require.False(t, myBool, "myBool should be false")
-func False(t TestingT, value bool, msgAndArgs ...interface{}) {
-	if !assert.False(t, value, msgAndArgs...) {
-		t.FailNow()
-	}
-}
-
-// NotEqual asserts that the specified values are NOT equal.
-//
-//    require.NotEqual(t, obj1, obj2, "two objects shouldn't be equal")
-func NotEqual(t TestingT, expected, actual interface{}, msgAndArgs ...interface{}) {
-	if !assert.NotEqual(t, expected, actual, msgAndArgs...) {
-		t.FailNow()
-	}
-}
-
-// Contains asserts that the specified string contains the specified substring.
-//
-//    require.Contains(t, "Hello World", "World", "But 'Hello World' does contain 'World'")
-func Contains(t TestingT, s, contains interface{}, msgAndArgs ...interface{}) {
-	if !assert.Contains(t, s, contains, msgAndArgs...) {
-		t.FailNow()
-	}
-}
-
-// NotContains asserts that the specified string does NOT contain the specified substring.
-//
-//    require.NotContains(t, "Hello World", "Earth", "But 'Hello World' does NOT contain 'Earth'")
-func NotContains(t TestingT, s, contains interface{}, msgAndArgs ...interface{}) {
-	if !assert.NotContains(t, s, contains, msgAndArgs...) {
-		t.FailNow()
-	}
-}
-
-// Condition uses a Comparison to assert a complex condition.
-func Condition(t TestingT, comp assert.Comparison, msgAndArgs ...interface{}) {
-	if !assert.Condition(t, comp, msgAndArgs...) {
-		t.FailNow()
-	}
-}
-
-// Panics asserts that the code inside the specified PanicTestFunc panics.
-//
-//   require.Panics(t, func(){
-//     GoCrazy()
-//   }, "Calling GoCrazy() should panic")
-func Panics(t TestingT, f assert.PanicTestFunc, msgAndArgs ...interface{}) {
-	if !assert.Panics(t, f, msgAndArgs...) {
-		t.FailNow()
-	}
-}
-
-// NotPanics asserts that the code inside the specified PanicTestFunc does NOT panic.
-//
-//   require.NotPanics(t, func(){
-//     RemainCalm()
-//   }, "Calling RemainCalm() should NOT panic")
-func NotPanics(t TestingT, f assert.PanicTestFunc, msgAndArgs ...interface{}) {
-	if !assert.NotPanics(t, f, msgAndArgs...) {
-		t.FailNow()
-	}
-}
-
-// WithinDuration asserts that the two times are within duration delta of each other.
-//
-//   require.WithinDuration(t, time.Now(), time.Now(), 10*time.Second, "The difference should not be more than 10s")
-func WithinDuration(t TestingT, expected, actual time.Time, delta time.Duration, msgAndArgs ...interface{}) {
-	if !assert.WithinDuration(t, expected, actual, delta, msgAndArgs...) {
-		t.FailNow()
-	}
-}
-
-// InDelta asserts that the two numerals are within delta of each other.
-//
-//   require.InDelta(t, math.Pi, (22 / 7.0), 0.01)
-func InDelta(t TestingT, expected, actual interface{}, delta float64, msgAndArgs ...interface{}) {
-	if !assert.InDelta(t, expected, actual, delta, msgAndArgs...) {
-		t.FailNow()
-	}
-}
-
-// InEpsilon asserts that expected and actual have a relative error less than epsilon
-func InEpsilon(t TestingT, expected, actual interface{}, epsilon float64, msgAndArgs ...interface{}) {
-	if !assert.InEpsilon(t, expected, actual, epsilon, msgAndArgs...) {
-		t.FailNow()
-	}
-}
-
-// Regexp asserts that a specified regexp matches a string.
-//
-//  require.Regexp(t, regexp.MustCompile("start"), "it's starting")
-//  require.Regexp(t, "start...$", "it's not starting")
-func Regexp(t TestingT, rx interface{}, str interface{}, msgAndArgs ...interface{}) {
-	if !assert.Regexp(t, rx, str, msgAndArgs...) {
-		t.FailNow()
-	}
-}
-
-// NotRegexp asserts that a specified regexp does not match a string.
-//
-//  require.NotRegexp(t, regexp.MustCompile("starts"), "it's starting")
-//  require.NotRegexp(t, "^start", "it's not starting")
-func NotRegexp(t TestingT, rx interface{}, str interface{}, msgAndArgs ...interface{}) {
-	if !assert.NotRegexp(t, rx, str, msgAndArgs...) {
-		t.FailNow()
-	}
-}
-
-/*
-	Errors
-*/
-
-// NoError asserts that a function returned no error (i.e. `nil`).
-//
-//   actualObj, err := SomeFunction()
-//   require.NoError(t, err)
-//   require.Equal(t, actualObj, expectedObj)
-//
-// Returns whether the assertion was successful (true) or not (false).
-func NoError(t TestingT, err error, msgAndArgs ...interface{}) {
-	if !assert.NoError(t, err, msgAndArgs...) {
-		t.FailNow()
-	}
-}
-
-// Error asserts that a function returned an error (i.e. not `nil`).
-//
-//   actualObj, err := SomeFunction()
-//   require.Error(t, err, "An error was expected")
-//   require.Equal(t, err, expectedError)
-//   }
-func Error(t TestingT, err error, msgAndArgs ...interface{}) {
-	if !assert.Error(t, err, msgAndArgs...) {
-		t.FailNow()
-	}
-}
-
-// EqualError asserts that a function returned an error (i.e. not `nil`)
-// and that it is equal to the provided error.
-//
-//   actualObj, err := SomeFunction()
-//   require.Error(t, err, "An error was expected")
-//   require.Equal(t, err, expectedError)
-//   }
-func EqualError(t TestingT, theError error, errString string, msgAndArgs ...interface{}) {
-	if !assert.EqualError(t, theError, errString, msgAndArgs...) {
-		t.FailNow()
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/stretchr/testify/require/requirements_test.go b/Godeps/_workspace/src/github.com/stretchr/testify/require/requirements_test.go
deleted file mode 100644
index 9131b2f4d..000000000
--- a/Godeps/_workspace/src/github.com/stretchr/testify/require/requirements_test.go
+++ /dev/null
@@ -1,266 +0,0 @@
-package require
-
-import (
-	"errors"
-	"testing"
-	"time"
-)
-
-// AssertionTesterInterface defines an interface to be used for testing assertion methods
-type AssertionTesterInterface interface {
-	TestMethod()
-}
-
-// AssertionTesterConformingObject is an object that conforms to the AssertionTesterInterface interface
-type AssertionTesterConformingObject struct {
-}
-
-func (a *AssertionTesterConformingObject) TestMethod() {
-}
-
-// AssertionTesterNonConformingObject is an object that does not conform to the AssertionTesterInterface interface
-type AssertionTesterNonConformingObject struct {
-}
-
-type MockT struct {
-	Failed bool
-}
-
-func (t *MockT) FailNow() {
-	t.Failed = true
-}
-
-func (t *MockT) Errorf(format string, args ...interface{}) {
-	_, _ = format, args
-}
-
-func TestImplements(t *testing.T) {
-
-	Implements(t, (*AssertionTesterInterface)(nil), new(AssertionTesterConformingObject))
-
-	mockT := new(MockT)
-	Implements(mockT, (*AssertionTesterInterface)(nil), new(AssertionTesterNonConformingObject))
-	if !mockT.Failed {
-		t.Error("Check should fail")
-	}
-}
-
-func TestIsType(t *testing.T) {
-
-	IsType(t, new(AssertionTesterConformingObject), new(AssertionTesterConformingObject))
-
-	mockT := new(MockT)
-	IsType(mockT, new(AssertionTesterConformingObject), new(AssertionTesterNonConformingObject))
-	if !mockT.Failed {
-		t.Error("Check should fail")
-	}
-}
-
-func TestEqual(t *testing.T) {
-
-	Equal(t, 1, 1)
-
-	mockT := new(MockT)
-	Equal(mockT, 1, 2)
-	if !mockT.Failed {
-		t.Error("Check should fail")
-	}
-
-}
-
-func TestNotEqual(t *testing.T) {
-
-	NotEqual(t, 1, 2)
-	mockT := new(MockT)
-	NotEqual(mockT, 2, 2)
-	if !mockT.Failed {
-		t.Error("Check should fail")
-	}
-}
-
-func TestExactly(t *testing.T) {
-
-	a := float32(1)
-	b := float32(1)
-	c := float64(1)
-
-	Exactly(t, a, b)
-
-	mockT := new(MockT)
-	Exactly(mockT, a, c)
-	if !mockT.Failed {
-		t.Error("Check should fail")
-	}
-}
-
-func TestNotNil(t *testing.T) {
-
-	NotNil(t, new(AssertionTesterConformingObject))
-
-	mockT := new(MockT)
-	NotNil(mockT, nil)
-	if !mockT.Failed {
-		t.Error("Check should fail")
-	}
-}
-
-func TestNil(t *testing.T) {
-
-	Nil(t, nil)
-
-	mockT := new(MockT)
-	Nil(mockT, new(AssertionTesterConformingObject))
-	if !mockT.Failed {
-		t.Error("Check should fail")
-	}
-}
-
-func TestTrue(t *testing.T) {
-
-	True(t, true)
-
-	mockT := new(MockT)
-	True(mockT, false)
-	if !mockT.Failed {
-		t.Error("Check should fail")
-	}
-}
-
-func TestFalse(t *testing.T) {
-
-	False(t, false)
-
-	mockT := new(MockT)
-	False(mockT, true)
-	if !mockT.Failed {
-		t.Error("Check should fail")
-	}
-}
-
-func TestContains(t *testing.T) {
-
-	Contains(t, "Hello World", "Hello")
-
-	mockT := new(MockT)
-	Contains(mockT, "Hello World", "Salut")
-	if !mockT.Failed {
-		t.Error("Check should fail")
-	}
-}
-
-func TestNotContains(t *testing.T) {
-
-	NotContains(t, "Hello World", "Hello!")
-
-	mockT := new(MockT)
-	NotContains(mockT, "Hello World", "Hello")
-	if !mockT.Failed {
-		t.Error("Check should fail")
-	}
-}
-
-func TestPanics(t *testing.T) {
-
-	Panics(t, func() {
-		panic("Panic!")
-	})
-
-	mockT := new(MockT)
-	Panics(mockT, func() {})
-	if !mockT.Failed {
-		t.Error("Check should fail")
-	}
-}
-
-func TestNotPanics(t *testing.T) {
-
-	NotPanics(t, func() {})
-
-	mockT := new(MockT)
-	NotPanics(mockT, func() {
-		panic("Panic!")
-	})
-	if !mockT.Failed {
-		t.Error("Check should fail")
-	}
-}
-
-func TestNoError(t *testing.T) {
-
-	NoError(t, nil)
-
-	mockT := new(MockT)
-	NoError(mockT, errors.New("some error"))
-	if !mockT.Failed {
-		t.Error("Check should fail")
-	}
-}
-
-func TestError(t *testing.T) {
-
-	Error(t, errors.New("some error"))
-
-	mockT := new(MockT)
-	Error(mockT, nil)
-	if !mockT.Failed {
-		t.Error("Check should fail")
-	}
-}
-
-func TestEqualError(t *testing.T) {
-
-	EqualError(t, errors.New("some error"), "some error")
-
-	mockT := new(MockT)
-	EqualError(mockT, errors.New("some error"), "Not some error")
-	if !mockT.Failed {
-		t.Error("Check should fail")
-	}
-}
-
-func TestEmpty(t *testing.T) {
-
-	Empty(t, "")
-
-	mockT := new(MockT)
-	Empty(mockT, "x")
-	if !mockT.Failed {
-		t.Error("Check should fail")
-	}
-}
-
-func TestNotEmpty(t *testing.T) {
-
-	NotEmpty(t, "x")
-
-	mockT := new(MockT)
-	NotEmpty(mockT, "")
-	if !mockT.Failed {
-		t.Error("Check should fail")
-	}
-}
-
-func TestWithinDuration(t *testing.T) {
-
-	a := time.Now()
-	b := a.Add(10 * time.Second)
-
-	WithinDuration(t, a, b, 15*time.Second)
-
-	mockT := new(MockT)
-	WithinDuration(mockT, a, b, 5*time.Second)
-	if !mockT.Failed {
-		t.Error("Check should fail")
-	}
-}
-
-func TestInDelta(t *testing.T) {
-
-	InDelta(t, 1.001, 1, 0.01)
-
-	mockT := new(MockT)
-	InDelta(mockT, 1, 2, 0.5)
-	if !mockT.Failed {
-		t.Error("Check should fail")
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/stretchr/testify/suite/doc.go b/Godeps/_workspace/src/github.com/stretchr/testify/suite/doc.go
deleted file mode 100644
index 3731eaa30..000000000
--- a/Godeps/_workspace/src/github.com/stretchr/testify/suite/doc.go
+++ /dev/null
@@ -1,65 +0,0 @@
-// The suite package contains logic for creating testing suite structs
-// and running the methods on those structs as tests.  The most useful
-// piece of this package is that you can create setup/teardown methods
-// on your testing suites, which will run before/after the whole suite
-// or individual tests (depending on which interface(s) you
-// implement).
-//
-// A testing suite is usually built by first extending the built-in
-// suite functionality from suite.Suite in testify.  Alternatively,
-// you could reproduce that logic on your own if you wanted (you
-// just need to implement the TestingSuite interface from
-// suite/interfaces.go).
-//
-// After that, you can implement any of the interfaces in
-// suite/interfaces.go to add setup/teardown functionality to your
-// suite, and add any methods that start with "Test" to add tests.
-// Methods that do not match any suite interfaces and do not begin
-// with "Test" will not be run by testify, and can safely be used as
-// helper methods.
-//
-// Once you've built your testing suite, you need to run the suite
-// (using suite.Run from testify) inside any function that matches the
-// identity that "go test" is already looking for (i.e.
-// func(*testing.T)).
-//
-// Regular expression to select test suites specified command-line
-// argument "-run". Regular expression to select the methods
-// of test suites specified command-line argument "-m".
-// Suite object has assertion methods.
-//
-// A crude example:
-//     // Basic imports
-//     import (
-//         "testing"
-//         "github.com/stretchr/testify/assert"
-//         "github.com/stretchr/testify/suite"
-//     )
-//
-//     // Define the suite, and absorb the built-in basic suite
-//     // functionality from testify - including a T() method which
-//     // returns the current testing context
-//     type ExampleTestSuite struct {
-//         suite.Suite
-//         VariableThatShouldStartAtFive int
-//     }
-//
-//     // Make sure that VariableThatShouldStartAtFive is set to five
-//     // before each test
-//     func (suite *ExampleTestSuite) SetupTest() {
-//         suite.VariableThatShouldStartAtFive = 5
-//     }
-//
-//     // All methods that begin with "Test" are run as tests within a
-//     // suite.
-//     func (suite *ExampleTestSuite) TestExample() {
-//         assert.Equal(suite.T(), suite.VariableThatShouldStartAtFive, 5)
-//         suite.Equal(suite.VariableThatShouldStartAtFive, 5)
-//     }
-//
-//     // In order for 'go test' to run this suite, we need to create
-//     // a normal test function and pass our suite to suite.Run
-//     func TestExampleTestSuite(t *testing.T) {
-//         suite.Run(t, new(ExampleTestSuite))
-//     }
-package suite
diff --git a/Godeps/_workspace/src/github.com/stretchr/testify/suite/interfaces.go b/Godeps/_workspace/src/github.com/stretchr/testify/suite/interfaces.go
deleted file mode 100644
index 20969472c..000000000
--- a/Godeps/_workspace/src/github.com/stretchr/testify/suite/interfaces.go
+++ /dev/null
@@ -1,34 +0,0 @@
-package suite
-
-import "testing"
-
-// TestingSuite can store and return the current *testing.T context
-// generated by 'go test'.
-type TestingSuite interface {
-	T() *testing.T
-	SetT(*testing.T)
-}
-
-// SetupAllSuite has a SetupSuite method, which will run before the
-// tests in the suite are run.
-type SetupAllSuite interface {
-	SetupSuite()
-}
-
-// SetupTestSuite has a SetupTest method, which will run before each
-// test in the suite.
-type SetupTestSuite interface {
-	SetupTest()
-}
-
-// TearDownAllSuite has a TearDownSuite method, which will run after
-// all the tests in the suite have been run.
-type TearDownAllSuite interface {
-	TearDownSuite()
-}
-
-// TearDownTestSuite has a TearDownTest method, which will run after
-// each test in the suite.
-type TearDownTestSuite interface {
-	TearDownTest()
-}
diff --git a/Godeps/_workspace/src/github.com/stretchr/testify/suite/suite.go b/Godeps/_workspace/src/github.com/stretchr/testify/suite/suite.go
deleted file mode 100644
index ac6744d47..000000000
--- a/Godeps/_workspace/src/github.com/stretchr/testify/suite/suite.go
+++ /dev/null
@@ -1,114 +0,0 @@
-package suite
-
-import (
-	"flag"
-	"fmt"
-	"os"
-	"reflect"
-	"regexp"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-)
-
-var matchMethod = flag.String("m", "", "regular expression to select tests of the suite to run")
-
-// Suite is a basic testing suite with methods for storing and
-// retrieving the current *testing.T context.
-type Suite struct {
-	*assert.Assertions
-	require *require.Assertions
-	t       *testing.T
-}
-
-// T retrieves the current *testing.T context.
-func (suite *Suite) T() *testing.T {
-	return suite.t
-}
-
-// SetT sets the current *testing.T context.
-func (suite *Suite) SetT(t *testing.T) {
-	suite.t = t
-	suite.Assertions = assert.New(t)
-}
-
-// Require returns a require context for suite.
-func (suite *Suite) Require() *require.Assertions {
-	if suite.require == nil {
-		suite.require = require.New(suite.T())
-	}
-	return suite.require
-}
-
-// Assert returns an assert context for suite.  Normally, you can call
-// `suite.NoError(expected, actual)`, but for situations where the embedded
-// methods are overridden (for example, you might want to override
-// assert.Assertions with require.Assertions), this method is provided so you
-// can call `suite.Assert().NoError()`.
-func (suite *Suite) Assert() *assert.Assertions {
-	if suite.Assertions == nil {
-		suite.Assertions = assert.New(suite.T())
-	}
-	return suite.Assertions
-}
-
-// Run takes a testing suite and runs all of the tests attached
-// to it.
-func Run(t *testing.T, suite TestingSuite) {
-	suite.SetT(t)
-
-	if setupAllSuite, ok := suite.(SetupAllSuite); ok {
-		setupAllSuite.SetupSuite()
-	}
-	defer func() {
-		if tearDownAllSuite, ok := suite.(TearDownAllSuite); ok {
-			tearDownAllSuite.TearDownSuite()
-		}
-	}()
-
-	methodFinder := reflect.TypeOf(suite)
-	tests := []testing.InternalTest{}
-	for index := 0; index < methodFinder.NumMethod(); index++ {
-		method := methodFinder.Method(index)
-		ok, err := methodFilter(method.Name)
-		if err != nil {
-			fmt.Fprintf(os.Stderr, "testify: invalid regexp for -m: %s\n", err)
-			os.Exit(1)
-		}
-		if ok {
-			test := testing.InternalTest{
-				Name: method.Name,
-				F: func(t *testing.T) {
-					parentT := suite.T()
-					suite.SetT(t)
-					if setupTestSuite, ok := suite.(SetupTestSuite); ok {
-						setupTestSuite.SetupTest()
-					}
-					defer func() {
-						if tearDownTestSuite, ok := suite.(TearDownTestSuite); ok {
-							tearDownTestSuite.TearDownTest()
-						}
-						suite.SetT(parentT)
-					}()
-					method.Func.Call([]reflect.Value{reflect.ValueOf(suite)})
-				},
-			}
-			tests = append(tests, test)
-		}
-	}
-
-	if !testing.RunTests(func(_, _ string) (bool, error) { return true, nil },
-		tests) {
-		t.Fail()
-	}
-}
-
-// Filtering method according to set regular expression
-// specified command-line argument -m
-func methodFilter(name string) (bool, error) {
-	if ok, _ := regexp.MatchString("^Test", name); !ok {
-		return false, nil
-	}
-	return regexp.MatchString(*matchMethod, name)
-}
diff --git a/Godeps/_workspace/src/github.com/wvanbergen/kafka/consumergroup/consumer_group.go b/Godeps/_workspace/src/github.com/wvanbergen/kafka/consumergroup/consumer_group.go
deleted file mode 100644
index 29e97facf..000000000
--- a/Godeps/_workspace/src/github.com/wvanbergen/kafka/consumergroup/consumer_group.go
+++ /dev/null
@@ -1,419 +0,0 @@
-package consumergroup
-
-import (
-	"errors"
-	"fmt"
-	"sync"
-	"time"
-
-	"github.com/wvanbergen/kazoo-go"
-	"github.com/Shopify/sarama"
-)
-
-var (
-	AlreadyClosing = errors.New("The consumer group is already shutting down.")
-)
-
-type Config struct {
-	*sarama.Config
-
-	Zookeeper *kazoo.Config
-
-	Offsets struct {
-		Initial           int64         // The initial offset method to use if the consumer has no previously stored offset. Must be either sarama.OffsetOldest (default) or sarama.OffsetNewest.
-		ProcessingTimeout time.Duration // Time to wait for all the offsets for a partition to be processed after stopping to consume from it. Defaults to 1 minute.
-		CommitInterval    time.Duration // The interval between which the prossed offsets are commited.
-	}
-}
-
-func NewConfig() *Config {
-	config := &Config{}
-	config.Config = sarama.NewConfig()
-	config.Zookeeper = kazoo.NewConfig()
-	config.Offsets.Initial = sarama.OffsetOldest
-	config.Offsets.ProcessingTimeout = 60 * time.Second
-	config.Offsets.CommitInterval = 10 * time.Second
-
-	return config
-}
-
-func (cgc *Config) Validate() error {
-	if cgc.Zookeeper.Timeout <= 0 {
-		return sarama.ConfigurationError("ZookeeperTimeout should have a duration > 0")
-	}
-
-	if cgc.Offsets.CommitInterval <= 0 {
-		return sarama.ConfigurationError("CommitInterval should have a duration > 0")
-	}
-
-	if cgc.Offsets.Initial != sarama.OffsetOldest && cgc.Offsets.Initial != sarama.OffsetNewest {
-		return errors.New("Offsets.Initial should be sarama.OffsetOldest or sarama.OffsetNewest.")
-	}
-
-	if cgc.Config != nil {
-		if err := cgc.Config.Validate(); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-// The ConsumerGroup type holds all the information for a consumer that is part
-// of a consumer group. Call JoinConsumerGroup to start a consumer.
-type ConsumerGroup struct {
-	config *Config
-
-	consumer sarama.Consumer
-	kazoo    *kazoo.Kazoo
-	group    *kazoo.Consumergroup
-	instance *kazoo.ConsumergroupInstance
-
-	wg             sync.WaitGroup
-	singleShutdown sync.Once
-
-	messages chan *sarama.ConsumerMessage
-	errors   chan *sarama.ConsumerError
-	stopper  chan struct{}
-
-	consumers kazoo.ConsumergroupInstanceList
-
-	offsetManager OffsetManager
-}
-
-// Connects to a consumer group, using Zookeeper for auto-discovery
-func JoinConsumerGroup(name string, topics []string, zookeeper []string, config *Config) (cg *ConsumerGroup, err error) {
-
-	if name == "" {
-		return nil, sarama.ConfigurationError("Empty consumergroup name")
-	}
-
-	if len(topics) == 0 {
-		return nil, sarama.ConfigurationError("No topics provided")
-	}
-
-	if len(zookeeper) == 0 {
-		return nil, errors.New("You need to provide at least one zookeeper node address!")
-	}
-
-	if config == nil {
-		config = NewConfig()
-	}
-	config.ClientID = name
-
-	// Validate configuration
-	if err = config.Validate(); err != nil {
-		return
-	}
-
-	var kz *kazoo.Kazoo
-	if kz, err = kazoo.NewKazoo(zookeeper, config.Zookeeper); err != nil {
-		return
-	}
-
-	brokers, err := kz.BrokerList()
-	if err != nil {
-		kz.Close()
-		return
-	}
-
-	group := kz.Consumergroup(name)
-	instance := group.NewInstance()
-
-	var consumer sarama.Consumer
-	if consumer, err = sarama.NewConsumer(brokers, config.Config); err != nil {
-		kz.Close()
-		return
-	}
-
-	cg = &ConsumerGroup{
-		config:   config,
-		consumer: consumer,
-
-		kazoo:    kz,
-		group:    group,
-		instance: instance,
-
-		messages: make(chan *sarama.ConsumerMessage, config.ChannelBufferSize),
-		errors:   make(chan *sarama.ConsumerError, config.ChannelBufferSize),
-		stopper:  make(chan struct{}),
-	}
-
-	// Register consumer group
-	if exists, err := cg.group.Exists(); err != nil {
-		cg.Logf("FAILED to check for existence of consumergroup: %s!\n", err)
-		_ = consumer.Close()
-		_ = kz.Close()
-		return nil, err
-	} else if !exists {
-		cg.Logf("Consumergroup `%s` does not yet exists, creating...\n", cg.group.Name)
-		if err := cg.group.Create(); err != nil {
-			cg.Logf("FAILED to create consumergroup in Zookeeper: %s!\n", err)
-			_ = consumer.Close()
-			_ = kz.Close()
-			return nil, err
-		}
-	}
-
-	// Register itself with zookeeper
-	if err := cg.instance.Register(topics); err != nil {
-		cg.Logf("FAILED to register consumer instance: %s!\n", err)
-		return nil, err
-	} else {
-		cg.Logf("Consumer instance registered (%s).", cg.instance.ID)
-	}
-
-	offsetConfig := OffsetManagerConfig{CommitInterval: config.Offsets.CommitInterval}
-	cg.offsetManager = NewZookeeperOffsetManager(cg, &offsetConfig)
-
-	go cg.topicListConsumer(topics)
-
-	return
-}
-
-// Returns a channel that you can read to obtain events from Kafka to process.
-func (cg *ConsumerGroup) Messages() <-chan *sarama.ConsumerMessage {
-	return cg.messages
-}
-
-// Returns a channel that you can read to obtain events from Kafka to process.
-func (cg *ConsumerGroup) Errors() <-chan *sarama.ConsumerError {
-	return cg.errors
-}
-
-func (cg *ConsumerGroup) Closed() bool {
-	return cg.instance == nil
-}
-
-func (cg *ConsumerGroup) Close() error {
-	shutdownError := AlreadyClosing
-	cg.singleShutdown.Do(func() {
-		defer cg.kazoo.Close()
-
-		shutdownError = nil
-
-		close(cg.stopper)
-		cg.wg.Wait()
-
-		if err := cg.offsetManager.Close(); err != nil {
-			cg.Logf("FAILED closing the offset manager: %s!\n", err)
-		}
-
-		if shutdownError = cg.instance.Deregister(); shutdownError != nil {
-			cg.Logf("FAILED deregistering consumer instance: %s!\n", shutdownError)
-		} else {
-			cg.Logf("Deregistered consumer instance %s.\n", cg.instance.ID)
-		}
-
-		if shutdownError = cg.consumer.Close(); shutdownError != nil {
-			cg.Logf("FAILED closing the Sarama client: %s\n", shutdownError)
-		}
-
-		close(cg.messages)
-		close(cg.errors)
-		cg.instance = nil
-	})
-
-	return shutdownError
-}
-
-func (cg *ConsumerGroup) Logf(format string, args ...interface{}) {
-	var identifier string
-	if cg.instance == nil {
-		identifier = "(defunct)"
-	} else {
-		identifier = cg.instance.ID[len(cg.instance.ID)-12:]
-	}
-	sarama.Logger.Printf("[%s/%s] %s", cg.group.Name, identifier, fmt.Sprintf(format, args...))
-}
-
-func (cg *ConsumerGroup) InstanceRegistered() (bool, error) {
-	return cg.instance.Registered()
-}
-
-func (cg *ConsumerGroup) CommitUpto(message *sarama.ConsumerMessage) error {
-	cg.offsetManager.MarkAsProcessed(message.Topic, message.Partition, message.Offset)
-	return nil
-}
-
-func (cg *ConsumerGroup) topicListConsumer(topics []string) {
-	for {
-		select {
-		case <-cg.stopper:
-			return
-		default:
-		}
-
-		consumers, consumerChanges, err := cg.group.WatchInstances()
-		if err != nil {
-			cg.Logf("FAILED to get list of registered consumer instances: %s\n", err)
-			return
-		}
-
-		cg.consumers = consumers
-		cg.Logf("Currently registered consumers: %d\n", len(cg.consumers))
-
-		stopper := make(chan struct{})
-
-		for _, topic := range topics {
-			cg.wg.Add(1)
-			go cg.topicConsumer(topic, cg.messages, cg.errors, stopper)
-		}
-
-		select {
-		case <-cg.stopper:
-			close(stopper)
-			return
-
-		case <-consumerChanges:
-			cg.Logf("Triggering rebalance due to consumer list change\n")
-			close(stopper)
-			cg.wg.Wait()
-		}
-	}
-}
-
-func (cg *ConsumerGroup) topicConsumer(topic string, messages chan<- *sarama.ConsumerMessage, errors chan<- *sarama.ConsumerError, stopper <-chan struct{}) {
-	defer cg.wg.Done()
-
-	select {
-	case <-stopper:
-		return
-	default:
-	}
-
-	cg.Logf("%s :: Started topic consumer\n", topic)
-
-	// Fetch a list of partition IDs
-	partitions, err := cg.kazoo.Topic(topic).Partitions()
-	if err != nil {
-		cg.Logf("%s :: FAILED to get list of partitions: %s\n", topic, err)
-		cg.errors <- &sarama.ConsumerError{
-			Topic:     topic,
-			Partition: -1,
-			Err:       err,
-		}
-		return
-	}
-
-	partitionLeaders, err := retrievePartitionLeaders(partitions)
-	if err != nil {
-		cg.Logf("%s :: FAILED to get leaders of partitions: %s\n", topic, err)
-		cg.errors <- &sarama.ConsumerError{
-			Topic:     topic,
-			Partition: -1,
-			Err:       err,
-		}
-		return
-	}
-
-	dividedPartitions := dividePartitionsBetweenConsumers(cg.consumers, partitionLeaders)
-	myPartitions := dividedPartitions[cg.instance.ID]
-	cg.Logf("%s :: Claiming %d of %d partitions", topic, len(myPartitions), len(partitionLeaders))
-
-	// Consume all the assigned partitions
-	var wg sync.WaitGroup
-	for _, pid := range myPartitions {
-
-		wg.Add(1)
-		go cg.partitionConsumer(topic, pid.ID, messages, errors, &wg, stopper)
-	}
-
-	wg.Wait()
-	cg.Logf("%s :: Stopped topic consumer\n", topic)
-}
-
-// Consumes a partition
-func (cg *ConsumerGroup) partitionConsumer(topic string, partition int32, messages chan<- *sarama.ConsumerMessage, errors chan<- *sarama.ConsumerError, wg *sync.WaitGroup, stopper <-chan struct{}) {
-	defer wg.Done()
-
-	select {
-	case <-stopper:
-		return
-	default:
-	}
-
-	err := cg.instance.ClaimPartition(topic, partition)
-	if err != nil {
-		cg.Logf("%s/%d :: FAILED to claim the partition: %s\n", topic, partition, err)
-		return
-	}
-	defer cg.instance.ReleasePartition(topic, partition)
-
-	nextOffset, err := cg.offsetManager.InitializePartition(topic, partition)
-	if err != nil {
-		cg.Logf("%s/%d :: FAILED to determine initial offset: %s\n", topic, partition, err)
-		return
-	}
-
-	if nextOffset > 0 {
-		cg.Logf("%s/%d :: Partition consumer starting at offset %d.\n", topic, partition, nextOffset)
-	} else {
-		nextOffset = cg.config.Offsets.Initial
-		if nextOffset == sarama.OffsetOldest {
-			cg.Logf("%s/%d :: Partition consumer starting at the oldest available offset.\n", topic, partition)
-		} else if nextOffset == sarama.OffsetNewest {
-			cg.Logf("%s/%d :: Partition consumer listening for new messages only.\n", topic, partition)
-		}
-	}
-
-	consumer, err := cg.consumer.ConsumePartition(topic, partition, nextOffset)
-	if (err == sarama.ErrOffsetOutOfRange) {
-		cg.Logf("%s/%d :: Partition consumer offset out of Range.\n", topic, partition)
-		// if the offset is out of range, simplistically decide whether to use OffsetNewest or OffsetOldest
-		// if the configuration specified offsetOldest, then switch to the oldest available offset, else
-		// switch to the newest available offset. 
-		if (cg.config.Offsets.Initial == sarama.OffsetOldest) {
-			nextOffset = sarama.OffsetOldest
-			cg.Logf("%s/%d :: Partition consumer offset reset to oldest available offset.\n", topic, partition)
-		} else {
-			nextOffset = sarama.OffsetNewest
-			cg.Logf("%s/%d :: Partition consumer offset reset to newest available offset.\n", topic, partition)
-		}
-		// retry the consumePartition with the adjusted offset
-		consumer, err = cg.consumer.ConsumePartition(topic, partition, nextOffset)
-	}
-	if err != nil {
-		cg.Logf("%s/%d :: FAILED to start partition consumer: %s\n", topic, partition, err)
-		return
-	}
-	defer consumer.Close()
-
-	err = nil
-	var lastOffset int64 = -1 // aka unknown
-partitionConsumerLoop:
-	for {
-		select {
-		case <-stopper:
-			break partitionConsumerLoop
-
-		case err := <-consumer.Errors():
-			for {
-				select {
-				case errors <- err:
-					continue partitionConsumerLoop
-
-				case <-stopper:
-					break partitionConsumerLoop
-				}
-			}
-
-		case message := <-consumer.Messages():
-			for {
-				select {
-				case <-stopper:
-					break partitionConsumerLoop
-
-				case messages <- message:
-					lastOffset = message.Offset
-					continue partitionConsumerLoop
-				}
-			}
-		}
-	}
-
-	cg.Logf("%s/%d :: Stopping partition consumer at offset %d\n", topic, partition, lastOffset)
-	if err := cg.offsetManager.FinalizePartition(topic, partition, lastOffset, cg.config.Offsets.ProcessingTimeout); err != nil {
-		cg.Logf("%s/%d :: %s\n", topic, partition, err)
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/wvanbergen/kafka/consumergroup/consumer_group_test.go b/Godeps/_workspace/src/github.com/wvanbergen/kafka/consumergroup/consumer_group_test.go
deleted file mode 100644
index 399a15193..000000000
--- a/Godeps/_workspace/src/github.com/wvanbergen/kafka/consumergroup/consumer_group_test.go
+++ /dev/null
@@ -1,67 +0,0 @@
-package consumergroup
-
-import (
-	"fmt"
-	"github.com/wvanbergen/kazoo-go"
-	"testing"
-)
-
-func createTestConsumerGroupInstanceList(size int) kazoo.ConsumergroupInstanceList {
-	k := make(kazoo.ConsumergroupInstanceList, size)
-	for i := range k {
-		k[i] = &kazoo.ConsumergroupInstance{ID: fmt.Sprintf("consumer%d", i)}
-	}
-	return k
-}
-
-func createTestPartitions(count int) []partitionLeader {
-	p := make([]partitionLeader, count)
-	for i := range p {
-		p[i] = partitionLeader{id: int32(i), leader: 1, partition: &kazoo.Partition{ID: int32(i)}}
-	}
-	return p
-}
-
-func Test_PartitionDivision(t *testing.T) {
-	consumerPartitionTestCases := [][2]int{
-		// {number of Consumers, number of Partitions}
-		[2]int{2, 5},
-		[2]int{5, 2},
-		[2]int{9, 32},
-		[2]int{10, 50},
-	}
-	for _, v := range consumerPartitionTestCases {
-		consumers := createTestConsumerGroupInstanceList(v[0])
-		partitions := createTestPartitions(v[1])
-		division := dividePartitionsBetweenConsumers(consumers, partitions)
-
-		// make sure every partition is used once
-		grouping := make(map[int32]struct{})
-		maxConsumed := 0
-		minConsumed := len(partitions) + 1
-		for _, v := range division {
-			if len(v) > maxConsumed {
-				maxConsumed = len(v)
-			}
-			if len(v) < minConsumed {
-				minConsumed = len(v)
-			}
-			for _, partition := range v {
-				if _, ok := grouping[partition.ID]; ok {
-					t.Errorf("PartitionDivision: Partition %v was assigned more than once!", partition.ID)
-				} else {
-					grouping[partition.ID] = struct{}{}
-				}
-			}
-		}
-		if len(grouping) != len(partitions) {
-			t.Errorf("PartitionDivision: Expected to divide %d partitions among consumers, but only %d partitions were consumed.", len(partitions), len(grouping))
-		}
-		if (maxConsumed - minConsumed) > 1 {
-			t.Errorf("PartitionDivision: Partitions weren't divided evenly, consumers shouldn't have a difference of more than 1 in the number of partitions consumed (was %d).", maxConsumed-minConsumed)
-		}
-		if minConsumed > 1 && len(consumers) != len(division) {
-			t.Errorf("PartitionDivision: Partitions weren't divided evenly, some consumers didn't get any paritions even though there were %d partitions and %d consumers.", len(partitions), len(consumers))
-		}
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/wvanbergen/kafka/consumergroup/consumergroup_integration_test.go b/Godeps/_workspace/src/github.com/wvanbergen/kafka/consumergroup/consumergroup_integration_test.go
deleted file mode 100644
index c818a0f12..000000000
--- a/Godeps/_workspace/src/github.com/wvanbergen/kafka/consumergroup/consumergroup_integration_test.go
+++ /dev/null
@@ -1,276 +0,0 @@
-package consumergroup
-
-import (
-	"fmt"
-	"log"
-	"os"
-	"os/signal"
-	"strings"
-	"testing"
-	"time"
-
-	"github.com/wvanbergen/kazoo-go"
-	"github.com/Shopify/sarama"
-)
-
-const (
-	TopicWithSinglePartition    = "test.1"
-	TopicWithMultiplePartitions = "test.4"
-)
-
-var (
-	// By default, assume we're using Sarama's vagrant cluster when running tests
-	zookeeperPeers = []string{"192.168.100.67:2181", "192.168.100.67:2182", "192.168.100.67:2183", "192.168.100.67:2184", "192.168.100.67:2185"}
-	kafkaPeers     = []string{"192.168.100.67:9091", "192.168.100.67:9092", "192.168.100.67:9093", "192.168.100.67:9094", "192.168.100.67:9095"}
-)
-
-func init() {
-	if zookeeperPeersEnv := os.Getenv("ZOOKEEPER_PEERS"); zookeeperPeersEnv != "" {
-		zookeeperPeers = strings.Split(zookeeperPeersEnv, ",")
-	}
-	if kafkaPeersEnv := os.Getenv("KAFKA_PEERS"); kafkaPeersEnv != "" {
-		kafkaPeers = strings.Split(kafkaPeersEnv, ",")
-	}
-
-	fmt.Printf("Using Zookeeper cluster at %v\n", zookeeperPeers)
-	fmt.Printf("Using Kafka cluster at %v\n", kafkaPeers)
-}
-
-////////////////////////////////////////////////////////////////////
-// Examples
-////////////////////////////////////////////////////////////////////
-
-func ExampleConsumerGroup() {
-	consumer, consumerErr := JoinConsumerGroup(
-		"ExampleConsumerGroup",
-		[]string{TopicWithSinglePartition, TopicWithMultiplePartitions},
-		zookeeperPeers,
-		nil)
-
-	if consumerErr != nil {
-		log.Fatalln(consumerErr)
-	}
-
-	c := make(chan os.Signal, 1)
-	signal.Notify(c, os.Interrupt)
-	go func() {
-		<-c
-		consumer.Close()
-	}()
-
-	eventCount := 0
-
-	for event := range consumer.Messages() {
-		// Process event
-		log.Println(string(event.Value))
-		eventCount += 1
-
-		// Ack event
-		consumer.CommitUpto(event)
-	}
-
-	log.Printf("Processed %d events.", eventCount)
-}
-
-////////////////////////////////////////////////////////////////////
-// Integration tests
-////////////////////////////////////////////////////////////////////
-
-func TestIntegrationMultipleTopicsSingleConsumer(t *testing.T) {
-	consumerGroup := "TestIntegrationMultipleTopicsSingleConsumer"
-	setupZookeeper(t, consumerGroup, TopicWithSinglePartition, 1)
-	setupZookeeper(t, consumerGroup, TopicWithMultiplePartitions, 4)
-
-	// Produce 100 events that we will consume
-	go produceEvents(t, consumerGroup, TopicWithSinglePartition, 100)
-	go produceEvents(t, consumerGroup, TopicWithMultiplePartitions, 200)
-
-	consumer, err := JoinConsumerGroup(consumerGroup, []string{TopicWithSinglePartition, TopicWithMultiplePartitions}, zookeeperPeers, nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer consumer.Close()
-
-	var offsets = make(OffsetMap)
-	assertEvents(t, consumer, 300, offsets)
-}
-
-func TestIntegrationSingleTopicParallelConsumers(t *testing.T) {
-	consumerGroup := "TestIntegrationSingleTopicParallelConsumers"
-	setupZookeeper(t, consumerGroup, TopicWithMultiplePartitions, 4)
-	go produceEvents(t, consumerGroup, TopicWithMultiplePartitions, 200)
-
-	consumer1, err := JoinConsumerGroup(consumerGroup, []string{TopicWithMultiplePartitions}, zookeeperPeers, nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer consumer1.Close()
-
-	consumer2, err := JoinConsumerGroup(consumerGroup, []string{TopicWithMultiplePartitions}, zookeeperPeers, nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer consumer2.Close()
-
-	var eventCount1, eventCount2 int64
-	offsets := make(map[int32]int64)
-
-	events1 := consumer1.Messages()
-	events2 := consumer2.Messages()
-
-	handleEvent := func(message *sarama.ConsumerMessage, ok bool) {
-		if !ok {
-			t.Fatal("Event stream closed prematurely")
-		}
-
-		if offsets[message.Partition] != 0 && offsets[message.Partition]+1 != message.Offset {
-			t.Fatalf("Unecpected offset on partition %d. Expected %d, got %d.", message.Partition, offsets[message.Partition]+1, message.Offset)
-		}
-
-		offsets[message.Partition] = message.Offset
-	}
-
-	for eventCount1+eventCount2 < 200 {
-		select {
-		case <-time.After(15 * time.Second):
-			t.Fatalf("Consumer timeout; read %d instead of %d messages", eventCount1+eventCount2, 200)
-
-		case event1, ok1 := <-events1:
-			handleEvent(event1, ok1)
-			eventCount1 += 1
-			consumer1.CommitUpto(event1)
-
-		case event2, ok2 := <-events2:
-			handleEvent(event2, ok2)
-			eventCount2 += 1
-			consumer2.CommitUpto(event2)
-		}
-	}
-
-	if eventCount1 == 0 || eventCount2 == 0 {
-		t.Error("Expected events to be consumed by both consumers!")
-	} else {
-		t.Logf("Successfully read %d and %d messages, closing!", eventCount1, eventCount2)
-	}
-}
-
-func TestSingleTopicSequentialConsumer(t *testing.T) {
-	consumerGroup := "TestSingleTopicSequentialConsumer"
-	setupZookeeper(t, consumerGroup, TopicWithSinglePartition, 1)
-	go produceEvents(t, consumerGroup, TopicWithSinglePartition, 20)
-
-	offsets := make(OffsetMap)
-
-	// If the channel is buffered, the consumer will enqueue more events in the channel,
-	// which assertEvents will simply skip. When consumer 2 starts it will skip a bunch of
-	// events because of this. Transactional processing will fix this.
-	config := NewConfig()
-	config.ChannelBufferSize = 0
-
-	consumer1, err := JoinConsumerGroup(consumerGroup, []string{TopicWithSinglePartition}, zookeeperPeers, config)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	assertEvents(t, consumer1, 10, offsets)
-	consumer1.Close()
-
-	consumer2, err := JoinConsumerGroup(consumerGroup, []string{TopicWithSinglePartition}, zookeeperPeers, nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	assertEvents(t, consumer2, 10, offsets)
-	consumer2.Close()
-}
-
-////////////////////////////////////////////////////////////////////
-// Helper functions and types
-////////////////////////////////////////////////////////////////////
-
-type OffsetMap map[string]map[int32]int64
-
-func assertEvents(t *testing.T, cg *ConsumerGroup, count int64, offsets OffsetMap) {
-	var processed int64
-	for processed < count {
-		select {
-		case <-time.After(5 * time.Second):
-			t.Fatalf("Reader timeout after %d events!", processed)
-
-		case message, ok := <-cg.Messages():
-			if !ok {
-				t.Fatal("Event stream closed prematurely")
-			}
-
-			if offsets != nil {
-				if offsets[message.Topic] == nil {
-					offsets[message.Topic] = make(map[int32]int64)
-				}
-				if offsets[message.Topic][message.Partition] != 0 && offsets[message.Topic][message.Partition]+1 != message.Offset {
-					t.Fatalf("Unexpected offset on %s/%d. Expected %d, got %d.", message.Topic, message.Partition, offsets[message.Topic][message.Partition]+1, message.Offset)
-				}
-
-				processed += 1
-				offsets[message.Topic][message.Partition] = message.Offset
-				cg.CommitUpto(message)
-			}
-
-		}
-	}
-	t.Logf("Successfully asserted %d events.", count)
-}
-
-func saramaClient() sarama.Client {
-	client, err := sarama.NewClient(kafkaPeers, nil)
-	if err != nil {
-		panic(err)
-	}
-	return client
-}
-
-func produceEvents(t *testing.T, consumerGroup string, topic string, amount int64) error {
-	producer, err := sarama.NewSyncProducer(kafkaPeers, nil)
-	if err != nil {
-		return err
-	}
-	defer producer.Close()
-
-	for i := int64(1); i <= amount; i++ {
-		msg := &sarama.ProducerMessage{Topic: topic, Value: sarama.StringEncoder(fmt.Sprintf("testing %d", i))}
-		_, _, err = producer.SendMessage(msg)
-
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-func setupZookeeper(t *testing.T, consumerGroup string, topic string, partitions int32) {
-	client := saramaClient()
-	defer client.Close()
-
-	// Connect to zookeeper to commit the last seen offset.
-	// This way we should only produce events that we produce ourselves in this test.
-	kz, err := kazoo.NewKazoo(zookeeperPeers, nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer kz.Close()
-
-	group := kz.Consumergroup(consumerGroup)
-	for partition := int32(0); partition < partitions; partition++ {
-		// Retrieve the offset that Sarama will use for the next message on the topic/partition.
-		nextOffset, offsetErr := client.GetOffset(topic, partition, sarama.OffsetNewest)
-		if offsetErr != nil {
-			t.Fatal(offsetErr)
-		} else {
-			t.Logf("Next offset for %s/%d = %d", topic, partition, nextOffset)
-		}
-
-		if err := group.CommitOffset(topic, partition, nextOffset); err != nil {
-			t.Fatal(err)
-		}
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/wvanbergen/kafka/consumergroup/offset_manager.go b/Godeps/_workspace/src/github.com/wvanbergen/kafka/consumergroup/offset_manager.go
deleted file mode 100644
index b557488a6..000000000
--- a/Godeps/_workspace/src/github.com/wvanbergen/kafka/consumergroup/offset_manager.go
+++ /dev/null
@@ -1,268 +0,0 @@
-package consumergroup
-
-import (
-	"errors"
-	"fmt"
-	"sync"
-	"time"
-)
-
-// OffsetManager is the main interface consumergroup requires to manage offsets of the consumergroup.
-type OffsetManager interface {
-
-	// InitializePartition is called when the consumergroup is starting to consume a
-	// partition. It should return the last processed offset for this partition. Note:
-	// the same partition can be initialized multiple times during a single run of a
-	// consumer group due to other consumer instances coming online and offline.
-	InitializePartition(topic string, partition int32) (int64, error)
-
-	// MarkAsProcessed tells the offset manager than a certain message has been successfully
-	// processed by the consumer, and should be committed. The implementation does not have
-	// to store this offset right away, but should return true if it intends to do this at
-	// some point.
-	//
-	// Offsets should generally be increasing if the consumer
-	// processes events serially, but this cannot be guaranteed if the consumer does any
-	// asynchronous processing. This can be handled in various ways, e.g. by only accepting
-	// offsets that are higehr than the offsets seen before for the same partition.
-	MarkAsProcessed(topic string, partition int32, offset int64) bool
-
-	// FinalizePartition is called when the consumergroup is done consuming a
-	// partition. In this method, the offset manager can flush any remaining offsets to its
-	// backend store. It should return an error if it was not able to commit the offset.
-	// Note: it's possible that the consumergroup instance will start to consume the same
-	// partition again after this function is called.
-	FinalizePartition(topic string, partition int32, lastOffset int64, timeout time.Duration) error
-
-	// Close is called when the consumergroup is shutting down. In normal circumstances, all
-	// offsets are committed because FinalizePartition is called for all the running partition
-	// consumers. You may want to check for this to be true, and try to commit any outstanding
-	// offsets. If this doesn't succeed, it should return an error.
-	Close() error
-}
-
-var (
-	UncleanClose = errors.New("Not all offsets were committed before shutdown was completed")
-)
-
-// OffsetManagerConfig holds configuration setting son how the offset manager should behave.
-type OffsetManagerConfig struct {
-	CommitInterval time.Duration // Interval between offset flushes to the backend store.
-	VerboseLogging bool          // Whether to enable verbose logging.
-}
-
-// NewOffsetManagerConfig returns a new OffsetManagerConfig with sane defaults.
-func NewOffsetManagerConfig() *OffsetManagerConfig {
-	return &OffsetManagerConfig{
-		CommitInterval: 10 * time.Second,
-	}
-}
-
-type (
-	topicOffsets    map[int32]*partitionOffsetTracker
-	offsetsMap      map[string]topicOffsets
-	offsetCommitter func(int64) error
-)
-
-type partitionOffsetTracker struct {
-	l                      sync.Mutex
-	waitingForOffset       int64
-	highestProcessedOffset int64
-	lastCommittedOffset    int64
-	done                   chan struct{}
-}
-
-type zookeeperOffsetManager struct {
-	config  *OffsetManagerConfig
-	l       sync.RWMutex
-	offsets offsetsMap
-	cg      *ConsumerGroup
-
-	closing, closed chan struct{}
-}
-
-// NewZookeeperOffsetManager returns an offset manager that uses Zookeeper
-// to store offsets.
-func NewZookeeperOffsetManager(cg *ConsumerGroup, config *OffsetManagerConfig) OffsetManager {
-	if config == nil {
-		config = NewOffsetManagerConfig()
-	}
-
-	zom := &zookeeperOffsetManager{
-		config:  config,
-		cg:      cg,
-		offsets: make(offsetsMap),
-		closing: make(chan struct{}),
-		closed:  make(chan struct{}),
-	}
-
-	go zom.offsetCommitter()
-
-	return zom
-}
-
-func (zom *zookeeperOffsetManager) InitializePartition(topic string, partition int32) (int64, error) {
-	zom.l.Lock()
-	defer zom.l.Unlock()
-
-	if zom.offsets[topic] == nil {
-		zom.offsets[topic] = make(topicOffsets)
-	}
-
-	nextOffset, err := zom.cg.group.FetchOffset(topic, partition)
-	if err != nil {
-		return 0, err
-	}
-
-	zom.offsets[topic][partition] = &partitionOffsetTracker{
-		highestProcessedOffset: nextOffset - 1,
-		lastCommittedOffset:    nextOffset - 1,
-		done:                   make(chan struct{}),
-	}
-
-	return nextOffset, nil
-}
-
-func (zom *zookeeperOffsetManager) FinalizePartition(topic string, partition int32, lastOffset int64, timeout time.Duration) error {
-	zom.l.RLock()
-	tracker := zom.offsets[topic][partition]
-	zom.l.RUnlock()
-
-	if lastOffset-tracker.highestProcessedOffset > 0 {
-		zom.cg.Logf("%s/%d :: Last processed offset: %d. Waiting up to %ds for another %d messages to process...", topic, partition, tracker.highestProcessedOffset, timeout/time.Second, lastOffset-tracker.highestProcessedOffset)
-		if !tracker.waitForOffset(lastOffset, timeout) {
-			return fmt.Errorf("TIMEOUT waiting for offset %d. Last committed offset: %d", lastOffset, tracker.lastCommittedOffset)
-		}
-	}
-
-	if err := zom.commitOffset(topic, partition, tracker); err != nil {
-		return fmt.Errorf("FAILED to commit offset %d to Zookeeper. Last committed offset: %d", tracker.highestProcessedOffset, tracker.lastCommittedOffset)
-	}
-
-	zom.l.Lock()
-	delete(zom.offsets[topic], partition)
-	zom.l.Unlock()
-
-	return nil
-}
-
-func (zom *zookeeperOffsetManager) MarkAsProcessed(topic string, partition int32, offset int64) bool {
-	zom.l.RLock()
-	defer zom.l.RUnlock()
-	return zom.offsets[topic][partition].markAsProcessed(offset)
-}
-
-func (zom *zookeeperOffsetManager) Close() error {
-	close(zom.closing)
-	<-zom.closed
-
-	zom.l.Lock()
-	defer zom.l.Unlock()
-
-	var closeError error
-	for _, partitionOffsets := range zom.offsets {
-		if len(partitionOffsets) > 0 {
-			closeError = UncleanClose
-		}
-	}
-
-	return closeError
-}
-
-func (zom *zookeeperOffsetManager) offsetCommitter() {
-	commitTicker := time.NewTicker(zom.config.CommitInterval)
-	defer commitTicker.Stop()
-
-	for {
-		select {
-		case <-zom.closing:
-			close(zom.closed)
-			return
-		case <-commitTicker.C:
-			zom.commitOffsets()
-		}
-	}
-}
-
-func (zom *zookeeperOffsetManager) commitOffsets() error {
-	zom.l.RLock()
-	defer zom.l.RUnlock()
-
-	var returnErr error
-	for topic, partitionOffsets := range zom.offsets {
-		for partition, offsetTracker := range partitionOffsets {
-			err := zom.commitOffset(topic, partition, offsetTracker)
-			switch err {
-			case nil:
-				// noop
-			default:
-				returnErr = err
-			}
-		}
-	}
-	return returnErr
-}
-
-func (zom *zookeeperOffsetManager) commitOffset(topic string, partition int32, tracker *partitionOffsetTracker) error {
-	err := tracker.commit(func(offset int64) error {
-		return zom.cg.group.CommitOffset(topic, partition, offset+1)
-	})
-
-	if err != nil {
-		zom.cg.Logf("FAILED to commit offset %d for %s/%d!", tracker.highestProcessedOffset, topic, partition)
-	} else if zom.config.VerboseLogging {
-		zom.cg.Logf("Committed offset %d for %s/%d!", tracker.lastCommittedOffset, topic, partition)
-	}
-
-	return err
-}
-
-// MarkAsProcessed marks the provided offset as highest processed offset if
-// it's higehr than any previous offset it has received.
-func (pot *partitionOffsetTracker) markAsProcessed(offset int64) bool {
-	pot.l.Lock()
-	defer pot.l.Unlock()
-	if offset > pot.highestProcessedOffset {
-		pot.highestProcessedOffset = offset
-		if pot.waitingForOffset == pot.highestProcessedOffset {
-			close(pot.done)
-		}
-		return true
-	} else {
-		return false
-	}
-}
-
-// Commit calls a committer function if the highest processed offset is out
-// of sync with the last committed offset.
-func (pot *partitionOffsetTracker) commit(committer offsetCommitter) error {
-	pot.l.Lock()
-	defer pot.l.Unlock()
-
-	if pot.highestProcessedOffset > pot.lastCommittedOffset {
-		if err := committer(pot.highestProcessedOffset); err != nil {
-			return err
-		}
-		pot.lastCommittedOffset = pot.highestProcessedOffset
-		return nil
-	} else {
-		return nil
-	}
-}
-
-func (pot *partitionOffsetTracker) waitForOffset(offset int64, timeout time.Duration) bool {
-	pot.l.Lock()
-	if offset > pot.highestProcessedOffset {
-		pot.waitingForOffset = offset
-		pot.l.Unlock()
-		select {
-		case <-pot.done:
-			return true
-		case <-time.After(timeout):
-			return false
-		}
-	} else {
-		pot.l.Unlock()
-		return true
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/wvanbergen/kafka/consumergroup/utils.go b/Godeps/_workspace/src/github.com/wvanbergen/kafka/consumergroup/utils.go
deleted file mode 100644
index 6c5845a64..000000000
--- a/Godeps/_workspace/src/github.com/wvanbergen/kafka/consumergroup/utils.go
+++ /dev/null
@@ -1,113 +0,0 @@
-package consumergroup
-
-import (
-	"crypto/rand"
-	"fmt"
-	"io"
-	"os"
-	"sort"
-
-	"github.com/wvanbergen/kazoo-go"
-)
-
-func retrievePartitionLeaders(partitions kazoo.PartitionList) (partitionLeaders, error) {
-
-	pls := make(partitionLeaders, 0, len(partitions))
-	for _, partition := range partitions {
-		leader, err := partition.Leader()
-		if err != nil {
-			return nil, err
-		}
-
-		pl := partitionLeader{id: partition.ID, leader: leader, partition: partition}
-		pls = append(pls, pl)
-	}
-
-	return pls, nil
-}
-
-// Divides a set of partitions between a set of consumers.
-func dividePartitionsBetweenConsumers(consumers kazoo.ConsumergroupInstanceList, partitions partitionLeaders) map[string][]*kazoo.Partition {
-	result := make(map[string][]*kazoo.Partition)
-
-	plen := len(partitions)
-	clen := len(consumers)
-	if clen == 0 {
-		return result
-	}
-
-	sort.Sort(partitions)
-	sort.Sort(consumers)
-
-	n := plen / clen
-	m := plen % clen
-	p := 0
-	for i, consumer := range consumers {
-		first := p
-		last := first + n
-		if m > 0 && i < m {
-			last++
-		}
-		if last > plen {
-			last = plen
-		}
-
-		for _, pl := range partitions[first:last] {
-			result[consumer.ID] = append(result[consumer.ID], pl.partition)
-		}
-		p = last
-	}
-
-	return result
-}
-
-type partitionLeader struct {
-	id        int32
-	leader    int32
-	partition *kazoo.Partition
-}
-
-// A sortable slice of PartitionLeader structs
-type partitionLeaders []partitionLeader
-
-func (pls partitionLeaders) Len() int {
-	return len(pls)
-}
-
-func (pls partitionLeaders) Less(i, j int) bool {
-	return pls[i].leader < pls[j].leader || (pls[i].leader == pls[j].leader && pls[i].id < pls[j].id)
-}
-
-func (s partitionLeaders) Swap(i, j int) {
-	s[i], s[j] = s[j], s[i]
-}
-
-func generateUUID() (string, error) {
-	uuid := make([]byte, 16)
-	n, err := io.ReadFull(rand.Reader, uuid)
-	if n != len(uuid) || err != nil {
-		return "", err
-	}
-	// variant bits; see section 4.1.1
-	uuid[8] = uuid[8]&^0xc0 | 0x80
-	// version 4 (pseudo-random); see section 4.1.3
-	uuid[6] = uuid[6]&^0xf0 | 0x40
-	return fmt.Sprintf("%x-%x-%x-%x-%x", uuid[0:4], uuid[4:6], uuid[6:8], uuid[8:10], uuid[10:]), nil
-}
-
-func generateConsumerID() (consumerID string, err error) {
-	var uuid, hostname string
-
-	uuid, err = generateUUID()
-	if err != nil {
-		return
-	}
-
-	hostname, err = os.Hostname()
-	if err != nil {
-		return
-	}
-
-	consumerID = fmt.Sprintf("%s:%s", hostname, uuid)
-	return
-}
diff --git a/Godeps/_workspace/src/github.com/wvanbergen/kazoo-go/.gitignore b/Godeps/_workspace/src/github.com/wvanbergen/kazoo-go/.gitignore
deleted file mode 100644
index cc8fabd6d..000000000
--- a/Godeps/_workspace/src/github.com/wvanbergen/kazoo-go/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-kazoo.test
-confluent/
diff --git a/Godeps/_workspace/src/github.com/wvanbergen/kazoo-go/.travis.yml b/Godeps/_workspace/src/github.com/wvanbergen/kazoo-go/.travis.yml
deleted file mode 100644
index 5ad88a38c..000000000
--- a/Godeps/_workspace/src/github.com/wvanbergen/kazoo-go/.travis.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-language: go
-go:
-- 1.3.3
-- 1.4.2
-
-env:
-  global:
-  - ZOOKEEPER_PEERS=localhost:2181
-  - DEBUG=true
-
-install:
-- make dependencies
-
-before_script:
-- make confluent/kafka/start
-- make test/create_kafka_topics
-
-script:
-- make test
-- make vet
-- make errcheck
-- make fmt
-
-matrix:
-  include:
-    - go: tip
-  allow_failures:
-    - go: tip
-  fast_finish: true
-
-sudo: false
diff --git a/Godeps/_workspace/src/github.com/wvanbergen/kazoo-go/MIT-LICENSE b/Godeps/_workspace/src/github.com/wvanbergen/kazoo-go/MIT-LICENSE
deleted file mode 100644
index 87d428031..000000000
--- a/Godeps/_workspace/src/github.com/wvanbergen/kazoo-go/MIT-LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2015 Willem van Bergen
-
-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/wvanbergen/kazoo-go/Makefile b/Godeps/_workspace/src/github.com/wvanbergen/kazoo-go/Makefile
deleted file mode 100644
index f695cfc32..000000000
--- a/Godeps/_workspace/src/github.com/wvanbergen/kazoo-go/Makefile
+++ /dev/null
@@ -1,86 +0,0 @@
-.PHONY: confluent/kafka/* confluent/zookeeper/* confluent/registry/* confluent/start confluent/stop fmt vet errcheck test test/create_kafka_topics dependencies dependencies/*
-
-
-default: fmt vet errcheck test
-
-
-# Confluent platform tasks
-
-confluent/start: confluent/rest/start
-
-confluent/stop: confluent/rest/stop confluent/registry/stop confluent/kafka/stop confluent/zookeeper/stop
-
-# Download & extract tasks
-
-confluent/confluent.tgz:
-	mkdir -p confluent && wget http://packages.confluent.io/archive/1.0/confluent-1.0-2.10.4.tar.gz -O confluent/confluent.tgz
-
-confluent/EXTRACTED: confluent/confluent.tgz
-	tar xzf confluent/confluent.tgz -C confluent --strip-components 1 && mkdir confluent/logs && touch confluent/EXTRACTED
-
-# Zookeeper tasks
-
-confluent/zookeeper/start: confluent/EXTRACTED
-	nohup confluent/bin/zookeeper-server-start confluent/etc/kafka/zookeeper.properties 2> confluent/logs/zookeeper.err > confluent/logs/zookeeper.out < /dev/null &
-	while ! nc localhost 2181 </dev/null; do echo "Waiting for zookeeper..."; sleep 1; done
-
-confluent/zookeeper/stop: confluent/EXTRACTED
-	confluent/bin/zookeeper-server-stop
-
-# Kafka tasks
-
-confluent/kafka/start: confluent/zookeeper/start confluent/EXTRACTED
-	nohup confluent/bin/kafka-server-start confluent/etc/kafka/server.properties 2> confluent/logs/kafka.err > confluent/logs/kafka.out < /dev/null &
-	while ! nc localhost 9092 </dev/null; do echo "Waiting for Kafka..."; sleep 1; done
-
-confluent/kafka/stop: confluent/EXTRACTED
-	confluent/bin/kafka-server-stop
-
-# schema-registry tasks
-
-confluent/registry/start: confluent/kafka/start confluent/EXTRACTED
-	nohup confluent/bin/schema-registry-start confluent/etc/schema-registry/schema-registry.properties 2> confluent/logs/schema-registry.err > confluent/logs/schema-registry.out < /dev/null &
-	while ! nc localhost 8081 </dev/null; do echo "Waiting for schema registry..."; sleep 1; done
-
-confluent/registry/stop: confluent/EXTRACTED
-	confluent/bin/kafka-server-stop
-
-# REST proxy tasks
-
-confluent/rest/start: confluent/registry/start confluent/EXTRACTED
-	nohup confluent/bin/kafka-rest-start confluent/etc/kafka-rest/kafka-rest.properties 2> confluent/logs/kafka-rest.err > confluent/logs/kafka-rest.out < /dev/null &
-	while ! nc localhost 8082 </dev/null; do echo "Waiting for REST proxy..."; sleep 1; done
-
-confluent/rest/stop: confluent/EXTRACTED
-	confluent/bin/kafka-rest-stop
-
-
-# CI tasks
-
-test:
-	go test -v -race ./...
-
-vet:
-	go vet ./...
-
-errcheck:
-	errcheck ./...
-
-fmt:
-	@if [ -n "$$(go fmt ./...)" ]; then echo 'Please run go fmt on your code.' && exit 1; fi
-
-dependencies: dependencies/errcheck dependencies/vet dependencies/get
-
-dependencies/errcheck:
-	go get github.com/kisielk/errcheck
-
-dependencies/vet:
-	go get golang.org/x/tools/cmd/vet
-
-dependencies/get:
-	go get -t ./...
-
-test/create_kafka_topics: confluent/kafka/start
-	confluent/bin/kafka-topics --create --partitions  1 --replication-factor 1 --topic test.1  --zookeeper localhost:2181
-	confluent/bin/kafka-topics --create --partitions  4 --replication-factor 1 --topic test.4  --zookeeper localhost:2181 --config retention.ms=604800000
-	confluent/bin/kafka-topics --create --partitions 64 --replication-factor 1 --topic test.64 --zookeeper localhost:2181
diff --git a/Godeps/_workspace/src/github.com/wvanbergen/kazoo-go/README.md b/Godeps/_workspace/src/github.com/wvanbergen/kazoo-go/README.md
deleted file mode 100644
index c8d53ba90..000000000
--- a/Godeps/_workspace/src/github.com/wvanbergen/kazoo-go/README.md
+++ /dev/null
@@ -1,6 +0,0 @@
-# Kazoo
-
-Kazoo is a library to interact with the Kafka metadata that lives in Zookeeper.
-It provides discovery of the cluster's brokers, topic metadata, and consumer groups.
-
-API documentation can be found on [godoc.org](http://godoc.org/github.com/wvanbergen/kazoo-go).
diff --git a/Godeps/_workspace/src/github.com/wvanbergen/kazoo-go/consumergroup.go b/Godeps/_workspace/src/github.com/wvanbergen/kazoo-go/consumergroup.go
deleted file mode 100644
index 2e2276520..000000000
--- a/Godeps/_workspace/src/github.com/wvanbergen/kazoo-go/consumergroup.go
+++ /dev/null
@@ -1,409 +0,0 @@
-package kazoo
-
-import (
-	"crypto/rand"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"io"
-	"os"
-	"strconv"
-	"time"
-
-	"github.com/samuel/go-zookeeper/zk"
-)
-
-var (
-	ErrRunningInstances          = errors.New("Cannot deregister a consumergroup with running instances")
-	ErrInstanceAlreadyRegistered = errors.New("Cannot register consumer instance because it already is registered")
-	ErrInstanceNotRegistered     = errors.New("Cannot deregister consumer instance because it not registered")
-	ErrPartitionClaimedByOther   = errors.New("Cannot claim partition: it is already claimed by another instance")
-	ErrPartitionNotClaimed       = errors.New("Cannot release partition: it is not claimed by this instance")
-)
-
-// Consumergroup represents a high-level consumer that is registered in Zookeeper,
-type Consumergroup struct {
-	kz   *Kazoo
-	Name string
-}
-
-// ConsumergroupInstance represents an instance of a Consumergroup.
-type ConsumergroupInstance struct {
-	cg *Consumergroup
-	ID string
-}
-
-type ConsumergroupList []*Consumergroup
-type ConsumergroupInstanceList []*ConsumergroupInstance
-
-type Registration struct {
-	Pattern      RegPattern     `json:"pattern"`
-	Subscription map[string]int `json:"subscription"`
-	Timestamp    int64          `json:"timestamp"`
-	Version      RegVersion     `json:"version"`
-}
-
-type RegPattern string
-
-const (
-	RegPatternStatic    RegPattern = "static"
-	RegPatternWhiteList RegPattern = "white_list"
-	RegPatternBlackList RegPattern = "black_list"
-)
-
-type RegVersion int
-
-const (
-	RegDefaultVersion RegVersion = 1
-)
-
-// Consumergroups returns all the registered consumergroups
-func (kz *Kazoo) Consumergroups() (ConsumergroupList, error) {
-	root := fmt.Sprintf("%s/consumers", kz.conf.Chroot)
-	cgs, _, err := kz.conn.Children(root)
-	if err != nil {
-		return nil, err
-	}
-
-	result := make(ConsumergroupList, 0, len(cgs))
-	for _, cg := range cgs {
-		result = append(result, kz.Consumergroup(cg))
-	}
-	return result, nil
-}
-
-// Consumergroup instantiates a new consumergroup.
-func (kz *Kazoo) Consumergroup(name string) *Consumergroup {
-	return &Consumergroup{Name: name, kz: kz}
-}
-
-// Exists checks whether the consumergroup has been registered in Zookeeper
-func (cg *Consumergroup) Exists() (bool, error) {
-	return cg.kz.exists(fmt.Sprintf("%s/consumers/%s", cg.kz.conf.Chroot, cg.Name))
-}
-
-// Create registers the consumergroup in zookeeper
-func (cg *Consumergroup) Create() error {
-	return cg.kz.mkdirRecursive(fmt.Sprintf("%s/consumers/%s", cg.kz.conf.Chroot, cg.Name))
-}
-
-// Delete removes the consumergroup from zookeeper
-func (cg *Consumergroup) Delete() error {
-	if instances, err := cg.Instances(); err != nil {
-		return err
-	} else if len(instances) > 0 {
-		return ErrRunningInstances
-	}
-
-	return cg.kz.deleteRecursive(fmt.Sprintf("%s/consumers/%s", cg.kz.conf.Chroot, cg.Name))
-}
-
-// Instances returns a map of all running instances inside this consumergroup.
-func (cg *Consumergroup) Instances() (ConsumergroupInstanceList, error) {
-	root := fmt.Sprintf("%s/consumers/%s/ids", cg.kz.conf.Chroot, cg.Name)
-	if exists, err := cg.kz.exists(root); err != nil {
-		return nil, err
-	} else if exists {
-		cgis, _, err := cg.kz.conn.Children(root)
-		if err != nil {
-			return nil, err
-		}
-
-		result := make(ConsumergroupInstanceList, 0, len(cgis))
-		for _, cgi := range cgis {
-			result = append(result, cg.Instance(cgi))
-		}
-		return result, nil
-	} else {
-		result := make(ConsumergroupInstanceList, 0)
-		return result, nil
-	}
-}
-
-// WatchInstances returns a ConsumergroupInstanceList, and a channel that will be closed
-// as soon the instance list changes.
-func (cg *Consumergroup) WatchInstances() (ConsumergroupInstanceList, <-chan struct{}, error) {
-	node := fmt.Sprintf("%s/consumers/%s/ids", cg.kz.conf.Chroot, cg.Name)
-	if exists, err := cg.kz.exists(node); err != nil {
-		return nil, nil, err
-	} else if !exists {
-		if err := cg.kz.mkdirRecursive(node); err != nil {
-			return nil, nil, err
-		}
-	}
-
-	cgis, _, c, err := cg.kz.conn.ChildrenW(node)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	result := make(ConsumergroupInstanceList, 0, len(cgis))
-	for _, cgi := range cgis {
-		result = append(result, cg.Instance(cgi))
-	}
-
-	channel := make(chan struct{})
-	go func() {
-		<-c
-		close(channel)
-	}()
-
-	return result, channel, nil
-}
-
-// NewInstance instantiates a new ConsumergroupInstance inside this consumer group,
-// using a newly generated ID.
-func (cg *Consumergroup) NewInstance() *ConsumergroupInstance {
-	id, err := generateConsumerInstanceID()
-	if err != nil {
-		panic(err)
-	}
-	return cg.Instance(id)
-}
-
-// Instance instantiates a new ConsumergroupInstance inside this consumer group,
-// using an existing ID.
-func (cg *Consumergroup) Instance(id string) *ConsumergroupInstance {
-	return &ConsumergroupInstance{cg: cg, ID: id}
-}
-
-// PartitionOwner returns the ConsumergroupInstance that has claimed the given partition.
-// This can be nil if nobody has claime dit yet.
-func (cg *Consumergroup) PartitionOwner(topic string, partition int32) (*ConsumergroupInstance, error) {
-	node := fmt.Sprintf("%s/consumers/%s/owners/%s/%d", cg.kz.conf.Chroot, cg.Name, topic, partition)
-	val, _, err := cg.kz.conn.Get(node)
-
-	// If the node does not exists, nobody has claimed it.
-	switch err {
-	case nil:
-		return &ConsumergroupInstance{cg: cg, ID: string(val)}, nil
-	case zk.ErrNoNode:
-		return nil, nil
-	default:
-		return nil, err
-	}
-}
-
-// Registered checks whether the consumergroup instance is registered in Zookeeper.
-func (cgi *ConsumergroupInstance) Registered() (bool, error) {
-	node := fmt.Sprintf("%s/consumers/%s/ids/%s", cgi.cg.kz.conf.Chroot, cgi.cg.Name, cgi.ID)
-	return cgi.cg.kz.exists(node)
-}
-
-// Registered returns current registration of the consumer group instance.
-func (cgi *ConsumergroupInstance) Registration() (*Registration, error) {
-	node := fmt.Sprintf("%s/consumers/%s/ids/%s", cgi.cg.kz.conf.Chroot, cgi.cg.Name, cgi.ID)
-	val, _, err := cgi.cg.kz.conn.Get(node)
-	if err != nil {
-		return nil, err
-	}
-
-	reg := &Registration{}
-	if err := json.Unmarshal(val, reg); err != nil {
-		return nil, err
-	}
-	return reg, nil
-}
-
-// Register registers the consumergroup instance in Zookeeper.
-func (cgi *ConsumergroupInstance) Register(topics []string) error {
-	if exists, err := cgi.Registered(); err != nil {
-		return err
-	} else if exists {
-		return ErrInstanceAlreadyRegistered
-	}
-
-	subscription := make(map[string]int)
-	for _, topic := range topics {
-		subscription[topic] = 1
-	}
-	data, err := json.Marshal(&Registration{
-		Pattern:      RegPatternStatic,
-		Subscription: subscription,
-		Timestamp:    time.Now().Unix(),
-		Version:      RegDefaultVersion,
-	})
-	if err != nil {
-		return err
-	}
-
-	// Create an ephemeral node for the the consumergroup instance.
-	node := fmt.Sprintf("%s/consumers/%s/ids/%s", cgi.cg.kz.conf.Chroot, cgi.cg.Name, cgi.ID)
-	return cgi.cg.kz.create(node, data, true)
-}
-
-// Deregister removes the registration of the instance from zookeeper.
-func (cgi *ConsumergroupInstance) Deregister() error {
-	node := fmt.Sprintf("%s/consumers/%s/ids/%s", cgi.cg.kz.conf.Chroot, cgi.cg.Name, cgi.ID)
-	exists, stat, err := cgi.cg.kz.conn.Exists(node)
-	if err != nil {
-		return err
-	} else if !exists {
-		return ErrInstanceNotRegistered
-	}
-
-	return cgi.cg.kz.conn.Delete(node, stat.Version)
-}
-
-// Claim claims a topic/partition ownership for a consumer ID within a group. If the
-// partition is already claimed by another running instance, it will return ErrAlreadyClaimed.
-func (cgi *ConsumergroupInstance) ClaimPartition(topic string, partition int32) error {
-	root := fmt.Sprintf("%s/consumers/%s/owners/%s", cgi.cg.kz.conf.Chroot, cgi.cg.Name, topic)
-	if err := cgi.cg.kz.mkdirRecursive(root); err != nil {
-		return err
-	}
-
-	// Create an ephemeral node for the partition to claim the partition for this instance
-	node := fmt.Sprintf("%s/%d", root, partition)
-	err := cgi.cg.kz.create(node, []byte(cgi.ID), true)
-	switch err {
-	case zk.ErrNodeExists:
-		data, _, err := cgi.cg.kz.conn.Get(node)
-		if err != nil {
-			return err
-		}
-		if string(data) != cgi.ID {
-			// Return a separate error for this, to allow for implementing a retry mechanism.
-			return ErrPartitionClaimedByOther
-		}
-		return nil
-	default:
-		return err
-	}
-}
-
-// ReleasePartition releases a claim to a partition.
-func (cgi *ConsumergroupInstance) ReleasePartition(topic string, partition int32) error {
-	owner, err := cgi.cg.PartitionOwner(topic, partition)
-	if err != nil {
-		return err
-	}
-	if owner == nil || owner.ID != cgi.ID {
-		return ErrPartitionNotClaimed
-	}
-
-	node := fmt.Sprintf("%s/consumers/%s/owners/%s/%d", cgi.cg.kz.conf.Chroot, cgi.cg.Name, topic, partition)
-	return cgi.cg.kz.conn.Delete(node, 0)
-}
-
-// Topics retrieves the list of topics the consumergroup has claimed ownership of at some point.
-func (cg *Consumergroup) Topics() (TopicList, error) {
-	root := fmt.Sprintf("%s/consumers/%s/owners", cg.kz.conf.Chroot, cg.Name)
-	children, _, err := cg.kz.conn.Children(root)
-	if err != nil {
-		return nil, err
-	}
-
-	result := make(TopicList, 0, len(children))
-	for _, name := range children {
-		result = append(result, cg.kz.Topic(name))
-	}
-	return result, nil
-}
-
-// CommitOffset commits an offset to a group/topic/partition
-func (cg *Consumergroup) CommitOffset(topic string, partition int32, offset int64) error {
-	node := fmt.Sprintf("%s/consumers/%s/offsets/%s/%d", cg.kz.conf.Chroot, cg.Name, topic, partition)
-	data := []byte(fmt.Sprintf("%d", offset))
-
-	_, stat, err := cg.kz.conn.Get(node)
-	switch err {
-	case zk.ErrNoNode: // Create a new node
-		return cg.kz.create(node, data, false)
-
-	case nil: // Update the existing node
-		_, err := cg.kz.conn.Set(node, data, stat.Version)
-		return err
-
-	default:
-		return err
-	}
-}
-
-// FetchOffset retrieves an offset to a group/topic/partition
-func (cg *Consumergroup) FetchOffset(topic string, partition int32) (int64, error) {
-	node := fmt.Sprintf("%s/consumers/%s/offsets/%s/%d", cg.kz.conf.Chroot, cg.Name, topic, partition)
-	val, _, err := cg.kz.conn.Get(node)
-	if err == zk.ErrNoNode {
-		return 0, nil
-	} else if err != nil {
-		return -1, err
-	}
-	return strconv.ParseInt(string(val), 10, 64)
-}
-
-// generateUUID Generates a UUIDv4.
-func generateUUID() (string, error) {
-	uuid := make([]byte, 16)
-	n, err := io.ReadFull(rand.Reader, uuid)
-	if n != len(uuid) || err != nil {
-		return "", err
-	}
-	// variant bits; see section 4.1.1
-	uuid[8] = uuid[8]&^0xc0 | 0x80
-	// version 4 (pseudo-random); see section 4.1.3
-	uuid[6] = uuid[6]&^0xf0 | 0x40
-	return fmt.Sprintf("%x-%x-%x-%x-%x", uuid[0:4], uuid[4:6], uuid[6:8], uuid[8:10], uuid[10:]), nil
-}
-
-// generateConsumerInstanceID generates a consumergroup Instance ID
-// that is almost certain to be unique.
-func generateConsumerInstanceID() (string, error) {
-	uuid, err := generateUUID()
-	if err != nil {
-		return "", err
-	}
-
-	hostname, err := os.Hostname()
-	if err != nil {
-		return "", err
-	}
-
-	return fmt.Sprintf("%s:%s", hostname, uuid), nil
-}
-
-// Find returns the consumergroup with the given name if it exists in the list.
-// Otherwise it will return `nil`.
-func (cgl ConsumergroupList) Find(name string) *Consumergroup {
-	for _, cg := range cgl {
-		if cg.Name == name {
-			return cg
-		}
-	}
-	return nil
-}
-
-func (cgl ConsumergroupList) Len() int {
-	return len(cgl)
-}
-
-func (cgl ConsumergroupList) Less(i, j int) bool {
-	return cgl[i].Name < cgl[j].Name
-}
-
-func (cgl ConsumergroupList) Swap(i, j int) {
-	cgl[i], cgl[j] = cgl[j], cgl[i]
-}
-
-// Find returns the consumergroup instance with the given ID if it exists in the list.
-// Otherwise it will return `nil`.
-func (cgil ConsumergroupInstanceList) Find(id string) *ConsumergroupInstance {
-	for _, cgi := range cgil {
-		if cgi.ID == id {
-			return cgi
-		}
-	}
-	return nil
-}
-
-func (cgil ConsumergroupInstanceList) Len() int {
-	return len(cgil)
-}
-
-func (cgil ConsumergroupInstanceList) Less(i, j int) bool {
-	return cgil[i].ID < cgil[j].ID
-}
-
-func (cgil ConsumergroupInstanceList) Swap(i, j int) {
-	cgil[i], cgil[j] = cgil[j], cgil[i]
-}
diff --git a/Godeps/_workspace/src/github.com/wvanbergen/kazoo-go/functional_cluster_test.go b/Godeps/_workspace/src/github.com/wvanbergen/kazoo-go/functional_cluster_test.go
deleted file mode 100644
index e679254e8..000000000
--- a/Godeps/_workspace/src/github.com/wvanbergen/kazoo-go/functional_cluster_test.go
+++ /dev/null
@@ -1,98 +0,0 @@
-package kazoo
-
-import (
-	"fmt"
-	"net"
-	"os"
-	"strings"
-	"testing"
-	"time"
-)
-
-var (
-	// By default, assume we're using Sarama's vagrant cluster when running tests
-	zookeeperPeers []string = []string{"192.168.100.67:2181", "192.168.100.67:2182", "192.168.100.67:2183", "192.168.100.67:2184", "192.168.100.67:2185"}
-)
-
-func init() {
-	if zookeeperPeersEnv := os.Getenv("ZOOKEEPER_PEERS"); zookeeperPeersEnv != "" {
-		zookeeperPeers = strings.Split(zookeeperPeersEnv, ",")
-	}
-
-	fmt.Printf("Using Zookeeper cluster at %v\n", zookeeperPeers)
-}
-
-func TestBrokers(t *testing.T) {
-	kz, err := NewKazoo(zookeeperPeers, nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	brokers, err := kz.Brokers()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if len(brokers) == 0 {
-		t.Error("Expected at least one broker")
-	}
-
-	for id, addr := range brokers {
-		if conn, err := net.DialTimeout("tcp", addr, 100*time.Millisecond); err != nil {
-			t.Errorf("Failed to connect to Kafka broker %d at %s", id, addr)
-		} else {
-			_ = conn.Close()
-		}
-	}
-
-	assertSuccessfulClose(t, kz)
-}
-
-func TestBrokerList(t *testing.T) {
-	kz, err := NewKazoo(zookeeperPeers, nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	brokers, err := kz.BrokerList()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if len(brokers) == 0 {
-		t.Error("Expected at least one broker")
-	}
-
-	for _, addr := range brokers {
-		if conn, err := net.DialTimeout("tcp", addr, 100*time.Millisecond); err != nil {
-			t.Errorf("Failed to connect to Kafka broker at %s", addr)
-		} else {
-			_ = conn.Close()
-		}
-	}
-
-	assertSuccessfulClose(t, kz)
-}
-
-func TestController(t *testing.T) {
-	kz, err := NewKazoo(zookeeperPeers, nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	brokers, err := kz.Brokers()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	controller, err := kz.Controller()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if _, ok := brokers[controller]; !ok {
-		t.Error("Expected the controller's BrokerID to be an existing one")
-	}
-
-	assertSuccessfulClose(t, kz)
-}
diff --git a/Godeps/_workspace/src/github.com/wvanbergen/kazoo-go/functional_consumergroup_test.go b/Godeps/_workspace/src/github.com/wvanbergen/kazoo-go/functional_consumergroup_test.go
deleted file mode 100644
index 05de005a9..000000000
--- a/Godeps/_workspace/src/github.com/wvanbergen/kazoo-go/functional_consumergroup_test.go
+++ /dev/null
@@ -1,447 +0,0 @@
-package kazoo
-
-import (
-	"testing"
-	"time"
-
-	//	"github.com/samuel/go-zookeeper/zk"
-	"github.com/samuel/go-zookeeper/zk"
-	"reflect"
-)
-
-func TestConsumergroups(t *testing.T) {
-	kz, err := NewKazoo(zookeeperPeers, nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer assertSuccessfulClose(t, kz)
-
-	cg := kz.Consumergroup("test.kazoo.TestConsumergroups")
-
-	cgs, err := kz.Consumergroups()
-	if err != nil {
-		t.Error(err)
-	}
-	originalCount := len(cgs)
-
-	if cg := cgs.Find(cg.Name); cg != nil {
-		t.Error("Consumergoup `test.kazoo.TestConsumergroups` should not be found")
-	}
-
-	if exists, _ := cg.Exists(); exists {
-		t.Error("Consumergoup `test.kazoo.TestConsumergroups` should not be registered yet")
-	}
-
-	if err := cg.Create(); err != nil {
-		t.Error(err)
-	}
-
-	if exists, _ := cg.Exists(); !exists {
-		t.Error("Consumergoup `test.kazoo.TestConsumergroups` should be registered now")
-	}
-
-	cgs, err = kz.Consumergroups()
-	if err != nil {
-		t.Error(err)
-	}
-
-	if len(cgs) != originalCount+1 {
-		t.Error("Should have one more consumergroup than at the start")
-	}
-
-	if err := cg.Delete(); err != nil {
-		t.Error(err)
-	}
-
-	if exists, _ := cg.Exists(); exists {
-		t.Error("Consumergoup `test.kazoo.TestConsumergroups` should not be registered anymore")
-	}
-
-	cgs, err = kz.Consumergroups()
-	if err != nil {
-		t.Error(err)
-	}
-
-	if len(cgs) != originalCount {
-		t.Error("Should have the original number of consumergroups again")
-	}
-}
-
-func TestConsumergroupInstances(t *testing.T) {
-	kz, err := NewKazoo(zookeeperPeers, nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer assertSuccessfulClose(t, kz)
-
-	cg := kz.Consumergroup("test.kazoo.TestConsumergroupInstances")
-	if err := cg.Create(); err != nil {
-		t.Fatal(err)
-	}
-	defer func() {
-		if err := cg.Delete(); err != nil {
-			t.Error(err)
-		}
-	}()
-
-	if instances, err := cg.Instances(); err != nil {
-		t.Error(err)
-	} else if len(instances) != 0 {
-		t.Fatal("Expected no active consumergroup instances")
-	}
-
-	instance1 := cg.NewInstance()
-	// Make sure that the instance is unregistered.
-	if reg, err := instance1.Registration(); err != zk.ErrNoNode || reg != nil {
-		t.Errorf("Expected no registration: reg=%v, err=(%v)", reg, err)
-	}
-
-	// Register a new instance
-	if instance1.ID == "" {
-		t.Error("It should generate a valid instance ID")
-	}
-	if err := instance1.Register([]string{"topic"}); err != nil {
-		t.Error(err)
-	}
-
-	// Verify registration
-	reg, err := instance1.Registration()
-	if err != nil {
-		t.Error(err)
-	}
-	if !reflect.DeepEqual(reg.Subscription, map[string]int{"topic": 1}) {
-		t.Errorf("Unexpected registration: %v", reg)
-	}
-
-	// Try to register an instance with the same ID.
-	if err := cg.Instance(instance1.ID).Register([]string{"topic"}); err != ErrInstanceAlreadyRegistered {
-		t.Error("The instance should already be registered")
-	}
-
-	instance2 := cg.Instance("test")
-	if err := instance2.Register([]string{"topic"}); err != nil {
-		t.Error(err)
-	}
-
-	time.Sleep(50 * time.Millisecond)
-
-	if instances, err := cg.Instances(); err != nil {
-		t.Error(err)
-	} else {
-		if len(instances) != 2 {
-			t.Error("Expected 2 active consumergroup instances")
-		}
-		if i := instances.Find(instance1.ID); i == nil {
-			t.Error("Expected instance1 to be registered.")
-		}
-		if i := instances.Find(instance2.ID); i == nil {
-			t.Error("Expected instance2 to be registered.")
-		}
-	}
-
-	// Deregister the two running instances
-	if err := instance1.Deregister(); err != nil {
-		t.Error(err)
-	}
-	if err := instance2.Deregister(); err != nil {
-		t.Error(err)
-	}
-
-	// Try to deregister an instance that was not register
-	instance3 := cg.NewInstance()
-	if err := instance3.Deregister(); err != ErrInstanceNotRegistered {
-		t.Error("Expected new instance to not be registered")
-	}
-
-	if instances, err := cg.Instances(); err != nil {
-		t.Error(err)
-	} else if len(instances) != 0 {
-		t.Error("Expected no active consumergroup instances")
-	}
-}
-
-func TestConsumergroupInstanceCrash(t *testing.T) {
-	kz, err := NewKazoo(zookeeperPeers, nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer assertSuccessfulClose(t, kz)
-
-	cg := kz.Consumergroup("test.kazoo.TestConsumergroupInstancesEphemeral")
-	if err := cg.Create(); err != nil {
-		t.Fatal(err)
-	}
-	defer func() {
-		if err := cg.Delete(); err != nil {
-			t.Error(err)
-		}
-	}()
-
-	// Create a kazoo instance on which we will simulate a crash.
-	config := NewConfig()
-	config.Timeout = 50 * time.Millisecond
-	crashingKazoo, err := NewKazoo(zookeeperPeers, config)
-	if err != nil {
-		t.Fatal(err)
-	}
-	crashingCG := crashingKazoo.Consumergroup(cg.Name)
-
-	// Instantiate and register the instance.
-	instance := crashingCG.NewInstance()
-	if err := instance.Register([]string{"test.1"}); err != nil {
-		t.Error(err)
-	}
-
-	time.Sleep(50 * time.Millisecond)
-	if instances, err := cg.Instances(); err != nil {
-		t.Error(err)
-	} else if len(instances) != 1 {
-		t.Error("Should have 1 running instance, found", len(instances))
-	}
-
-	// Simulate a crash, and wait for Zookeeper to pick it up
-	_ = crashingKazoo.Close()
-	time.Sleep(200 * time.Millisecond)
-
-	if instances, err := cg.Instances(); err != nil {
-		t.Error(err)
-	} else if len(instances) != 0 {
-		t.Error("Should have 0 running instances")
-	}
-}
-
-func TestConsumergroupWatchInstances(t *testing.T) {
-	kz, err := NewKazoo(zookeeperPeers, nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer assertSuccessfulClose(t, kz)
-
-	cg := kz.Consumergroup("test.kazoo.TestConsumergroupWatchInstances")
-	if err := cg.Create(); err != nil {
-		t.Fatal(err)
-	}
-	defer func() {
-		if err := cg.Delete(); err != nil {
-			t.Error(err)
-		}
-	}()
-
-	instances, c, err := cg.WatchInstances()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if len(instances) != 0 {
-		t.Error("Expected 0 running instances")
-	}
-
-	instance := cg.NewInstance()
-	if err := instance.Register([]string{"topic"}); err != nil {
-		t.Fatal(err)
-	}
-
-	// The instance watch should have been triggered
-	<-c
-
-	instances, c, err = cg.WatchInstances()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if len(instances) != 1 {
-		t.Error("Expected 1 running instance")
-	}
-
-	if err := instance.Deregister(); err != nil {
-		t.Fatal(err)
-	}
-
-	// The instance watch should have been triggered again
-	<-c
-
-	instances, err = cg.Instances()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if len(instances) != 0 {
-		t.Error("Expected 0 running instances")
-	}
-}
-
-func TestConsumergroupInstanceClaimPartition(t *testing.T) {
-	kz, err := NewKazoo(zookeeperPeers, nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer assertSuccessfulClose(t, kz)
-
-	cg := kz.Consumergroup("test.kazoo.TestConsumergroupInstanceClaimPartition")
-	if err := cg.Create(); err != nil {
-		t.Fatal(err)
-	}
-	defer func() {
-		if err := cg.Delete(); err != nil {
-			t.Error(err)
-		}
-	}()
-
-	// Create two instances for this consumergroup
-
-	i1 := cg.NewInstance()
-	if err := i1.Register([]string{"test.4"}); err != nil {
-		t.Fatal(err)
-	}
-	i2 := cg.NewInstance()
-	if err := i2.Register([]string{"test.4"}); err != nil {
-		t.Fatal(err)
-	}
-
-	// Claim all partitions divided by instance 1 and 2
-
-	if err := i1.ClaimPartition("test.4", 0); err != nil {
-		t.Error(err)
-	}
-	if err := i1.ClaimPartition("test.4", 1); err != nil {
-		t.Error(err)
-	}
-	if err := i2.ClaimPartition("test.4", 2); err != nil {
-		t.Error(err)
-	}
-	if err := i2.ClaimPartition("test.4", 3); err != nil {
-		t.Error(err)
-	}
-
-	// Try to claim more partitions
-	if err := i1.ClaimPartition("test.4", 3); err != ErrPartitionClaimedByOther {
-		t.Error("Expected ErrPartitionClaimedByOther to be returned, found", err)
-	}
-
-	if err := i2.ClaimPartition("test.4", 0); err != ErrPartitionClaimedByOther {
-		t.Error("Expected ErrPartitionClaimedByOther to be returned, found", err)
-	}
-
-	// Instance 1: release some partitions
-
-	if err := i1.ReleasePartition("test.4", 0); err != nil {
-		t.Error(err)
-	}
-	if err := i1.ReleasePartition("test.4", 1); err != nil {
-		t.Error(err)
-	}
-
-	// Instance 2: claim the released partitions
-
-	if err := i2.ClaimPartition("test.4", 0); err != nil {
-		t.Error(err)
-	}
-	if err := i2.ClaimPartition("test.4", 1); err != nil {
-		t.Error(err)
-	}
-
-	// Instance 2: release all partitions
-
-	if err := i2.ReleasePartition("test.4", 0); err != nil {
-		t.Error(err)
-	}
-	if err := i2.ReleasePartition("test.4", 1); err != nil {
-		t.Error(err)
-	}
-	if err := i2.ReleasePartition("test.4", 2); err != nil {
-		t.Error(err)
-	}
-	if err := i2.ReleasePartition("test.4", 3); err != nil {
-		t.Error(err)
-	}
-
-	if err := i1.Deregister(); err != nil {
-		t.Error(err)
-	}
-	if err := i2.Deregister(); err != nil {
-		t.Error(err)
-	}
-}
-
-func TestConsumergroupInstanceClaimPartitionSame(t *testing.T) {
-	// Given
-	kz, err := NewKazoo(zookeeperPeers, nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer assertSuccessfulClose(t, kz)
-
-	cg := kz.Consumergroup("test.kazoo.TestConsumergroupInstanceClaimPartition2")
-	if err := cg.Create(); err != nil {
-		t.Fatal(err)
-	}
-	defer func() {
-		if err := cg.Delete(); err != nil {
-			t.Error(err)
-		}
-	}()
-
-	instance := cg.NewInstance()
-	if err := instance.Register([]string{"test.4"}); err != nil {
-		t.Fatal(err)
-	}
-
-	if err := instance.ClaimPartition("test.4", 0); err != nil {
-		t.Error(err)
-	}
-
-	// When: claim the same partition again
-	err = instance.ClaimPartition("test.4", 0)
-
-	// Then
-	if err != nil {
-		t.Error(err)
-	}
-
-	// Cleanup
-	if err := instance.ReleasePartition("test.4", 0); err != nil {
-		t.Error(err)
-	}
-	if err := instance.Deregister(); err != nil {
-		t.Error(err)
-	}
-}
-
-func TestConsumergroupOffsets(t *testing.T) {
-	kz, err := NewKazoo(zookeeperPeers, nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer assertSuccessfulClose(t, kz)
-
-	cg := kz.Consumergroup("test.kazoo.TestConsumergroupOffsets")
-	if err := cg.Create(); err != nil {
-		t.Fatal(err)
-	}
-	defer func() {
-		if err := cg.Delete(); err != nil {
-			t.Error(err)
-		}
-	}()
-
-	offset, err := cg.FetchOffset("test", 0)
-	if err != nil {
-		t.Error(err)
-	}
-
-	if offset != 0 {
-		t.Error("Expected to get offset 0 for a partition that hasn't seen an offset commit yet")
-	}
-
-	if err := cg.CommitOffset("test", 0, 1234); err != nil {
-		t.Error(err)
-	}
-
-	offset, err = cg.FetchOffset("test", 0)
-	if err != nil {
-		t.Error(err)
-	}
-	if offset != 1234 {
-		t.Error("Expected to get the offset that was committed.")
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/wvanbergen/kazoo-go/functional_topic_metadata_test.go b/Godeps/_workspace/src/github.com/wvanbergen/kazoo-go/functional_topic_metadata_test.go
deleted file mode 100644
index 34c8f42b6..000000000
--- a/Godeps/_workspace/src/github.com/wvanbergen/kazoo-go/functional_topic_metadata_test.go
+++ /dev/null
@@ -1,111 +0,0 @@
-package kazoo
-
-import (
-	"testing"
-)
-
-func TestTopics(t *testing.T) {
-	kz, err := NewKazoo(zookeeperPeers, nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	topics, err := kz.Topics()
-	if err != nil {
-		t.Error(err)
-	}
-
-	existingTopic := topics.Find("test.4")
-	if existingTopic == nil {
-		t.Error("Expected topic test.4 to be returned")
-	} else if existingTopic.Name != "test.4" {
-		t.Error("Expected topic test.4 to have its name set")
-	}
-
-	nonexistingTopic := topics.Find("__nonexistent__")
-	if nonexistingTopic != nil {
-		t.Error("Expected __nonexistent__ topic to not be defined")
-	}
-
-	assertSuccessfulClose(t, kz)
-}
-
-func TestTopicPartitions(t *testing.T) {
-	kz, err := NewKazoo(zookeeperPeers, nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	partitions, err := kz.Topic("test.4").Partitions()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if len(partitions) != 4 {
-		t.Errorf("Expected test.4 to have 4 partitions")
-	}
-
-	brokers, err := kz.Brokers()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	for index, partition := range partitions {
-		if partition.ID != int32(index) {
-			t.Error("partition.ID is not set properly")
-		}
-
-		leader, err := partition.Leader()
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		if _, ok := brokers[leader]; !ok {
-			t.Errorf("Expected the leader of test.4/%d to be an existing broker.", partition.ID)
-		}
-
-		isr, err := partition.ISR()
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		for _, brokerID := range isr {
-			if _, ok := brokers[brokerID]; !ok {
-				t.Errorf("Expected all ISRs of test.4/%d to be existing brokers.", partition.ID)
-			}
-		}
-	}
-
-	assertSuccessfulClose(t, kz)
-}
-
-func TestTopicConfig(t *testing.T) {
-	kz, err := NewKazoo(zookeeperPeers, nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	topicConfig, err := kz.Topic("test.4").Config()
-	if err != nil {
-		t.Error(err)
-	}
-	if topicConfig["retention.ms"] != "604800000" {
-		t.Error("Expected retention.ms config for test.4 to be set to 604800000")
-	}
-
-	topicConfig, err = kz.Topic("test.1").Config()
-	if err != nil {
-		t.Error(err)
-	}
-	if len(topicConfig) > 0 {
-		t.Error("Expected no topic level configuration to be set for test.1")
-	}
-
-	assertSuccessfulClose(t, kz)
-}
-
-func assertSuccessfulClose(t *testing.T, kz *Kazoo) {
-	if err := kz.Close(); err != nil {
-		t.Error(err)
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/wvanbergen/kazoo-go/kazoo.go b/Godeps/_workspace/src/github.com/wvanbergen/kazoo-go/kazoo.go
deleted file mode 100644
index e53be6de0..000000000
--- a/Godeps/_workspace/src/github.com/wvanbergen/kazoo-go/kazoo.go
+++ /dev/null
@@ -1,210 +0,0 @@
-package kazoo
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-	"path"
-	"strconv"
-	"strings"
-	"time"
-
-	"github.com/samuel/go-zookeeper/zk"
-)
-
-var (
-	FailedToClaimPartition = errors.New("Failed to claim partition for this consumer instance. Do you have a rogue consumer running?")
-)
-
-// ParseConnectionString parses a zookeeper connection string in the form of
-// host1:2181,host2:2181/chroot and returns the list of servers, and the chroot.
-func ParseConnectionString(zookeeper string) (nodes []string, chroot string) {
-	nodesAndChroot := strings.SplitN(zookeeper, "/", 2)
-	if len(nodesAndChroot) == 2 {
-		chroot = fmt.Sprintf("/%s", nodesAndChroot[1])
-	}
-	nodes = strings.Split(nodesAndChroot[0], ",")
-	return
-}
-
-// Kazoo interacts with the Kafka metadata in Zookeeper
-type Kazoo struct {
-	conn *zk.Conn
-	conf *Config
-}
-
-// Config holds configuration values f.
-type Config struct {
-	// The chroot the Kafka installation is registerde under. Defaults to "".
-	Chroot string
-
-	// The amount of time the Zookeeper client can be disconnected from the Zookeeper cluster
-	// before the cluster will get rid of watches and ephemeral nodes. Defaults to 1 second.
-	Timeout time.Duration
-}
-
-// NewConfig instantiates a new Config struct with sane defaults.
-func NewConfig() *Config {
-	return &Config{Timeout: 1 * time.Second}
-}
-
-// NewKazoo creates a new connection instance
-func NewKazoo(servers []string, conf *Config) (*Kazoo, error) {
-	if conf == nil {
-		conf = NewConfig()
-	}
-
-	conn, _, err := zk.Connect(servers, conf.Timeout)
-	if err != nil {
-		return nil, err
-	}
-	return &Kazoo{conn, conf}, nil
-}
-
-// NewKazooFromConnectionString creates a new connection instance
-// based on a zookeeer connection string that can include a chroot.
-func NewKazooFromConnectionString(connectionString string, conf *Config) (*Kazoo, error) {
-	if conf == nil {
-		conf = NewConfig()
-	}
-
-	nodes, chroot := ParseConnectionString(connectionString)
-	conf.Chroot = chroot
-	return NewKazoo(nodes, conf)
-}
-
-// Brokers returns a map of all the brokers that make part of the
-// Kafka cluster that is regeistered in Zookeeper.
-func (kz *Kazoo) Brokers() (map[int32]string, error) {
-	root := fmt.Sprintf("%s/brokers/ids", kz.conf.Chroot)
-	children, _, err := kz.conn.Children(root)
-	if err != nil {
-		return nil, err
-	}
-
-	type brokerEntry struct {
-		Host string `json:"host"`
-		Port int    `json:"port"`
-	}
-
-	result := make(map[int32]string)
-	for _, child := range children {
-		brokerID, err := strconv.ParseInt(child, 10, 32)
-		if err != nil {
-			return nil, err
-		}
-
-		value, _, err := kz.conn.Get(path.Join(root, child))
-		if err != nil {
-			return nil, err
-		}
-
-		var brokerNode brokerEntry
-		if err := json.Unmarshal(value, &brokerNode); err != nil {
-			return nil, err
-		}
-
-		result[int32(brokerID)] = fmt.Sprintf("%s:%d", brokerNode.Host, brokerNode.Port)
-	}
-
-	return result, nil
-}
-
-// BrokerList returns a slice of broker addresses that can be used to connect to
-// the Kafka cluster, e.g. using `sarama.NewAsyncProducer()`.
-func (kz *Kazoo) BrokerList() ([]string, error) {
-	brokers, err := kz.Brokers()
-	if err != nil {
-		return nil, err
-	}
-
-	result := make([]string, 0, len(brokers))
-	for _, broker := range brokers {
-		result = append(result, broker)
-	}
-
-	return result, nil
-}
-
-// Controller returns what broker is currently acting as controller of the Kafka cluster
-func (kz *Kazoo) Controller() (int32, error) {
-	type controllerEntry struct {
-		BrokerID int32 `json:"brokerid"`
-	}
-
-	node := fmt.Sprintf("%s/controller", kz.conf.Chroot)
-	data, _, err := kz.conn.Get(node)
-	if err != nil {
-		return -1, err
-	}
-
-	var controllerNode controllerEntry
-	if err := json.Unmarshal(data, &controllerNode); err != nil {
-		return -1, err
-	}
-
-	return controllerNode.BrokerID, nil
-}
-
-func (kz *Kazoo) Close() error {
-	kz.conn.Close()
-	return nil
-}
-
-////////////////////////////////////////////////////////////////////////
-// Util methods
-////////////////////////////////////////////////////////////////////////
-
-// Exists checks existence of a node
-func (kz *Kazoo) exists(node string) (ok bool, err error) {
-	ok, _, err = kz.conn.Exists(node)
-	return
-}
-
-// DeleteAll deletes a node recursively
-func (kz *Kazoo) deleteRecursive(node string) (err error) {
-	children, stat, err := kz.conn.Children(node)
-	if err == zk.ErrNoNode {
-		return nil
-	} else if err != nil {
-		return
-	}
-
-	for _, child := range children {
-		if err = kz.deleteRecursive(path.Join(node, child)); err != nil {
-			return
-		}
-	}
-
-	return kz.conn.Delete(node, stat.Version)
-}
-
-// MkdirAll creates a directory recursively
-func (kz *Kazoo) mkdirRecursive(node string) (err error) {
-	parent := path.Dir(node)
-	if parent != "/" {
-		if err = kz.mkdirRecursive(parent); err != nil {
-			return
-		}
-	}
-
-	_, err = kz.conn.Create(node, nil, 0, zk.WorldACL(zk.PermAll))
-	if err == zk.ErrNodeExists {
-		err = nil
-	}
-	return
-}
-
-// Create stores a new value at node. Fails if already set.
-func (kz *Kazoo) create(node string, value []byte, ephemeral bool) (err error) {
-	if err = kz.mkdirRecursive(path.Dir(node)); err != nil {
-		return
-	}
-
-	flags := int32(0)
-	if ephemeral {
-		flags = zk.FlagEphemeral
-	}
-	_, err = kz.conn.Create(node, value, flags, zk.WorldACL(zk.PermAll))
-	return
-}
diff --git a/Godeps/_workspace/src/github.com/wvanbergen/kazoo-go/kazoo_test.go b/Godeps/_workspace/src/github.com/wvanbergen/kazoo-go/kazoo_test.go
deleted file mode 100644
index 8525ae3ff..000000000
--- a/Godeps/_workspace/src/github.com/wvanbergen/kazoo-go/kazoo_test.go
+++ /dev/null
@@ -1,44 +0,0 @@
-package kazoo
-
-import (
-	"testing"
-)
-
-func TestParseConnectionString(t *testing.T) {
-	var (
-		nodes  []string
-		chroot string
-	)
-
-	nodes, chroot = ParseConnectionString("zookeeper/chroot")
-	if len(nodes) != 1 || nodes[0] != "zookeeper" {
-		t.Error("Parsed nodes incorrectly:", nodes)
-	}
-	if chroot != "/chroot" {
-		t.Error("Parsed chroot incorrectly:", chroot)
-	}
-
-	nodes, chroot = ParseConnectionString("zk1:2181,zk2:2181,zk3:2181")
-	if len(nodes) != 3 || nodes[0] != "zk1:2181" || nodes[1] != "zk2:2181" || nodes[2] != "zk3:2181" {
-		t.Error("Parsed nodes incorrectly:", nodes)
-	}
-	if chroot != "" {
-		t.Error("Parsed chroot incorrectly:", chroot)
-	}
-
-	nodes, chroot = ParseConnectionString("zk1:2181,zk2/nested/chroot")
-	if len(nodes) != 2 || nodes[0] != "zk1:2181" || nodes[1] != "zk2" {
-		t.Error("Parsed nodes incorrectly:", nodes)
-	}
-	if chroot != "/nested/chroot" {
-		t.Error("Parsed chroot incorrectly:", chroot)
-	}
-
-	nodes, chroot = ParseConnectionString("")
-	if len(nodes) != 1 || nodes[0] != "" {
-		t.Error("Parsed nodes incorrectly:", nodes)
-	}
-	if chroot != "" {
-		t.Error("Parsed chroot incorrectly:", chroot)
-	}
-}
diff --git a/Godeps/_workspace/src/github.com/wvanbergen/kazoo-go/tools/kafka-topics/.gitignore b/Godeps/_workspace/src/github.com/wvanbergen/kazoo-go/tools/kafka-topics/.gitignore
deleted file mode 100644
index c93d3c5bd..000000000
--- a/Godeps/_workspace/src/github.com/wvanbergen/kazoo-go/tools/kafka-topics/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-kafka-topics
-kafka-topics.test
diff --git a/Godeps/_workspace/src/github.com/wvanbergen/kazoo-go/tools/kafka-topics/kafka-topics.go b/Godeps/_workspace/src/github.com/wvanbergen/kazoo-go/tools/kafka-topics/kafka-topics.go
deleted file mode 100644
index 2262f8de0..000000000
--- a/Godeps/_workspace/src/github.com/wvanbergen/kazoo-go/tools/kafka-topics/kafka-topics.go
+++ /dev/null
@@ -1,93 +0,0 @@
-package main
-
-import (
-	"bytes"
-	"flag"
-	"fmt"
-	"os"
-	"sort"
-	"sync"
-	"time"
-
-	"github.com/wvanbergen/kazoo-go"
-)
-
-var (
-	zookeeper        = flag.String("zookeeper", os.Getenv("ZOOKEEPER_PEERS"), "Zookeeper connection string. It can include a chroot.")
-	zookeeperTimeout = flag.Int("zookeeper-timeout", 1000, "Zookeeper timeout in milliseconds.")
-)
-
-func main() {
-	flag.Parse()
-
-	if *zookeeper == "" {
-		printUsageErrorAndExit("You have to provide a zookeeper connection string using -zookeeper, or the ZOOKEEPER_PEERS environment variable")
-	}
-
-	conf := kazoo.NewConfig()
-	conf.Timeout = time.Duration(*zookeeperTimeout) * time.Millisecond
-
-	kz, err := kazoo.NewKazooFromConnectionString(*zookeeper, conf)
-	if err != nil {
-		printErrorAndExit(69, "Failed to connect to Zookeeper: %v", err)
-	}
-	defer func() { _ = kz.Close() }()
-
-	topics, err := kz.Topics()
-	if err != nil {
-		printErrorAndExit(69, "Failed to get Kafka topics from Zookeeper: %v", err)
-	}
-	sort.Sort(topics)
-
-	var (
-		wg     sync.WaitGroup
-		l      sync.Mutex
-		stdout = make([]string, len(topics))
-	)
-
-	for i, topic := range topics {
-		wg.Add(1)
-		go func(i int, topic *kazoo.Topic) {
-			defer wg.Done()
-
-			buffer := bytes.NewBuffer(make([]byte, 0))
-
-			partitions, err := topic.Partitions()
-			if err != nil {
-				printErrorAndExit(69, "Failed to get Kafka topic partitions from Zookeeper: %v", err)
-			}
-
-			fmt.Fprintf(buffer, "Topic: %s\tPartitions: %d\n", topic.Name, len(partitions))
-
-			for _, partition := range partitions {
-				leader, _ := partition.Leader()
-				isr, _ := partition.ISR()
-
-				fmt.Fprintf(buffer, "\tPartition: %d\tReplicas: %v\tLeader: %d\tISR: %v\n", partition.ID, partition.Replicas, leader, isr)
-			}
-
-			l.Lock()
-			stdout[i] = buffer.String()
-			l.Unlock()
-		}(i, topic)
-	}
-
-	wg.Wait()
-	for _, msg := range stdout {
-		fmt.Print(msg)
-	}
-}
-
-func printUsageErrorAndExit(format string, values ...interface{}) {
-	fmt.Fprintf(os.Stderr, "ERROR: %s\n", fmt.Sprintf(format, values...))
-	fmt.Fprintln(os.Stderr)
-	fmt.Fprintln(os.Stderr, "Available command line options:")
-	flag.PrintDefaults()
-	os.Exit(64)
-}
-
-func printErrorAndExit(code int, format string, values ...interface{}) {
-	fmt.Fprintf(os.Stderr, "ERROR: %s\n", fmt.Sprintf(format, values...))
-	fmt.Fprintln(os.Stderr)
-	os.Exit(code)
-}
diff --git a/Godeps/_workspace/src/github.com/wvanbergen/kazoo-go/topic_metadata.go b/Godeps/_workspace/src/github.com/wvanbergen/kazoo-go/topic_metadata.go
deleted file mode 100644
index 5e06060ce..000000000
--- a/Godeps/_workspace/src/github.com/wvanbergen/kazoo-go/topic_metadata.go
+++ /dev/null
@@ -1,190 +0,0 @@
-package kazoo
-
-import (
-	"encoding/json"
-	"fmt"
-	"strconv"
-)
-
-// Topic interacts with Kafka's topic metadata in Zookeeper.
-type Topic struct {
-	Name string
-	kz   *Kazoo
-}
-
-type TopicList []*Topic
-
-// Partition interacts with Kafka's partition metadata in Zookeeper.
-type Partition struct {
-	topic    *Topic
-	ID       int32
-	Replicas []int32
-}
-
-type PartitionList []*Partition
-
-// Topics returns a map of all registered Kafka topics.
-func (kz *Kazoo) Topics() (TopicList, error) {
-	root := fmt.Sprintf("%s/brokers/topics", kz.conf.Chroot)
-	children, _, err := kz.conn.Children(root)
-	if err != nil {
-		return nil, err
-	}
-
-	result := make(TopicList, 0, len(children))
-	for _, name := range children {
-		result = append(result, kz.Topic(name))
-	}
-	return result, nil
-}
-
-// Topic returns a Topic instance for a given topic name
-func (kz *Kazoo) Topic(topic string) *Topic {
-	return &Topic{Name: topic, kz: kz}
-}
-
-// Partitions returns a map of all partitions for the topic.
-func (t *Topic) Partitions() (PartitionList, error) {
-	node := fmt.Sprintf("%s/brokers/topics/%s", t.kz.conf.Chroot, t.Name)
-	value, _, err := t.kz.conn.Get(node)
-	if err != nil {
-		return nil, err
-	}
-
-	type topicMetadata struct {
-		Partitions map[string][]int32 `json:"partitions"`
-	}
-
-	var tm topicMetadata
-	if err := json.Unmarshal(value, &tm); err != nil {
-		return nil, err
-	}
-
-	result := make(PartitionList, len(tm.Partitions))
-	for partitionNumber, replicas := range tm.Partitions {
-		partitionID, err := strconv.ParseInt(partitionNumber, 10, 32)
-		if err != nil {
-			return nil, err
-		}
-
-		replicaIDs := make([]int32, 0, len(replicas))
-		for _, r := range replicas {
-			replicaIDs = append(replicaIDs, int32(r))
-		}
-		result[partitionID] = t.Partition(int32(partitionID), replicaIDs)
-	}
-
-	return result, nil
-}
-
-// Partition returns a Partition instance for the topic.
-func (t *Topic) Partition(id int32, replicas []int32) *Partition {
-	return &Partition{ID: id, Replicas: replicas, topic: t}
-}
-
-// Config returns topic-level configuration settings as a map.
-func (t *Topic) Config() (map[string]string, error) {
-	value, _, err := t.kz.conn.Get(fmt.Sprintf("%s/config/topics/%s", t.kz.conf.Chroot, t.Name))
-	if err != nil {
-		return nil, err
-	}
-
-	var topicConfig struct {
-		ConfigMap map[string]string `json:"config"`
-	}
-
-	if err := json.Unmarshal(value, &topicConfig); err != nil {
-		return nil, err
-	}
-
-	return topicConfig.ConfigMap, nil
-}
-
-// Leader returns the broker ID of the broker that is currently the leader for the partition.
-func (p *Partition) Leader() (int32, error) {
-	if state, err := p.state(); err != nil {
-		return -1, err
-	} else {
-		return state.Leader, nil
-	}
-}
-
-// ISR returns the broker IDs of the current in-sync replica set for the partition
-func (p *Partition) ISR() ([]int32, error) {
-	if state, err := p.state(); err != nil {
-		return nil, err
-	} else {
-		return state.ISR, nil
-	}
-}
-
-func (p *Partition) UnderReplicated() (bool, error) {
-	if state, err := p.state(); err != nil {
-		return false, err
-	} else {
-		return len(state.ISR) < len(p.Replicas), nil
-	}
-}
-
-func (p *Partition) UsesPreferredReplica() (bool, error) {
-	if state, err := p.state(); err != nil {
-		return false, err
-	} else {
-		return len(state.ISR) > 0 && state.ISR[0] == p.Replicas[0], nil
-	}
-}
-
-type partitionState struct {
-	Leader int32   `json:"leader"`
-	ISR    []int32 `json:"isr"`
-}
-
-func (p *Partition) state() (partitionState, error) {
-	var state partitionState
-	node := fmt.Sprintf("%s/brokers/topics/%s/partitions/%d/state", p.topic.kz.conf.Chroot, p.topic.Name, p.ID)
-	value, _, err := p.topic.kz.conn.Get(node)
-	if err != nil {
-		return state, err
-	}
-
-	if err := json.Unmarshal(value, &state); err != nil {
-		return state, err
-	}
-
-	return state, nil
-}
-
-// Find returns the topic with the given name if it exists in the topic list,
-// and will return `nil` otherwise.
-func (tl TopicList) Find(name string) *Topic {
-	for _, topic := range tl {
-		if topic.Name == name {
-			return topic
-		}
-	}
-	return nil
-}
-
-func (tl TopicList) Len() int {
-	return len(tl)
-}
-
-func (tl TopicList) Less(i, j int) bool {
-	return tl[i].Name < tl[j].Name
-}
-
-func (tl TopicList) Swap(i, j int) {
-	tl[i], tl[j] = tl[j], tl[i]
-}
-
-func (pl PartitionList) Len() int {
-	return len(pl)
-}
-
-func (pl PartitionList) Less(i, j int) bool {
-	return pl[i].ID < pl[j].ID
-}
-
-func (pl PartitionList) Swap(i, j int) {
-	pl[i], pl[j] = pl[j], pl[i]
-}
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/bcrypt/base64.go b/Godeps/_workspace/src/golang.org/x/crypto/bcrypt/base64.go
deleted file mode 100644
index fc3116090..000000000
--- a/Godeps/_workspace/src/golang.org/x/crypto/bcrypt/base64.go
+++ /dev/null
@@ -1,35 +0,0 @@
-// 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
deleted file mode 100644
index b8e18d744..000000000
--- a/Godeps/_workspace/src/golang.org/x/crypto/bcrypt/bcrypt.go
+++ /dev/null
@@ -1,294 +0,0 @@
-// 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
-
-// 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
deleted file mode 100644
index f08a6f5b2..000000000
--- a/Godeps/_workspace/src/golang.org/x/crypto/bcrypt/bcrypt_test.go
+++ /dev/null
@@ -1,226 +0,0 @@
-// 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
deleted file mode 100644
index 9d80f1952..000000000
--- a/Godeps/_workspace/src/golang.org/x/crypto/blowfish/block.go
+++ /dev/null
@@ -1,159 +0,0 @@
-// 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
deleted file mode 100644
index 7afa1fdf3..000000000
--- a/Godeps/_workspace/src/golang.org/x/crypto/blowfish/blowfish_test.go
+++ /dev/null
@@ -1,274 +0,0 @@
-// 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
deleted file mode 100644
index 5019658a4..000000000
--- a/Godeps/_workspace/src/golang.org/x/crypto/blowfish/cipher.go
+++ /dev/null
@@ -1,91 +0,0 @@
-// 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
-
-// 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
deleted file mode 100644
index 8c5ee4cb0..000000000
--- a/Godeps/_workspace/src/golang.org/x/crypto/blowfish/const.go
+++ /dev/null
@@ -1,199 +0,0 @@
-// 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/websocket/client.go b/Godeps/_workspace/src/golang.org/x/net/websocket/client.go
deleted file mode 100644
index 20d1e1e38..000000000
--- a/Godeps/_workspace/src/golang.org/x/net/websocket/client.go
+++ /dev/null
@@ -1,113 +0,0 @@
-// 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.
-
-package websocket
-
-import (
-	"bufio"
-	"crypto/tls"
-	"io"
-	"net"
-	"net/http"
-	"net/url"
-)
-
-// DialError is an error that occurs while dialling a websocket server.
-type DialError struct {
-	*Config
-	Err error
-}
-
-func (e *DialError) Error() string {
-	return "websocket.Dial " + e.Config.Location.String() + ": " + e.Err.Error()
-}
-
-// NewConfig creates a new WebSocket config for client connection.
-func NewConfig(server, origin string) (config *Config, err error) {
-	config = new(Config)
-	config.Version = ProtocolVersionHybi13
-	config.Location, err = url.ParseRequestURI(server)
-	if err != nil {
-		return
-	}
-	config.Origin, err = url.ParseRequestURI(origin)
-	if err != nil {
-		return
-	}
-	config.Header = http.Header(make(map[string][]string))
-	return
-}
-
-// NewClient creates a new WebSocket client connection over rwc.
-func NewClient(config *Config, rwc io.ReadWriteCloser) (ws *Conn, err error) {
-	br := bufio.NewReader(rwc)
-	bw := bufio.NewWriter(rwc)
-	err = hybiClientHandshake(config, br, bw)
-	if err != nil {
-		return
-	}
-	buf := bufio.NewReadWriter(br, bw)
-	ws = newHybiClientConn(config, buf, rwc)
-	return
-}
-
-// Dial opens a new client connection to a WebSocket.
-func Dial(url_, protocol, origin string) (ws *Conn, err error) {
-	config, err := NewConfig(url_, origin)
-	if err != nil {
-		return nil, err
-	}
-	if protocol != "" {
-		config.Protocol = []string{protocol}
-	}
-	return DialConfig(config)
-}
-
-var portMap = map[string]string{
-	"ws":  "80",
-	"wss": "443",
-}
-
-func parseAuthority(location *url.URL) string {
-	if _, ok := portMap[location.Scheme]; ok {
-		if _, _, err := net.SplitHostPort(location.Host); err != nil {
-			return net.JoinHostPort(location.Host, portMap[location.Scheme])
-		}
-	}
-	return location.Host
-}
-
-// DialConfig opens a new client connection to a WebSocket with a config.
-func DialConfig(config *Config) (ws *Conn, err error) {
-	var client net.Conn
-	if config.Location == nil {
-		return nil, &DialError{config, ErrBadWebSocketLocation}
-	}
-	if config.Origin == nil {
-		return nil, &DialError{config, ErrBadWebSocketOrigin}
-	}
-	switch config.Location.Scheme {
-	case "ws":
-		client, err = net.Dial("tcp", parseAuthority(config.Location))
-
-	case "wss":
-		client, err = tls.Dial("tcp", parseAuthority(config.Location), config.TlsConfig)
-
-	default:
-		err = ErrBadScheme
-	}
-	if err != nil {
-		goto Error
-	}
-
-	ws, err = NewClient(config, client)
-	if err != nil {
-		client.Close()
-		goto Error
-	}
-	return
-
-Error:
-	return nil, &DialError{config, err}
-}
diff --git a/Godeps/_workspace/src/golang.org/x/net/websocket/exampledial_test.go b/Godeps/_workspace/src/golang.org/x/net/websocket/exampledial_test.go
deleted file mode 100644
index 72bb9d48e..000000000
--- a/Godeps/_workspace/src/golang.org/x/net/websocket/exampledial_test.go
+++ /dev/null
@@ -1,31 +0,0 @@
-// 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 websocket_test
-
-import (
-	"fmt"
-	"log"
-
-	"golang.org/x/net/websocket"
-)
-
-// This example demonstrates a trivial client.
-func ExampleDial() {
-	origin := "http://localhost/"
-	url := "ws://localhost:12345/ws"
-	ws, err := websocket.Dial(url, "", origin)
-	if err != nil {
-		log.Fatal(err)
-	}
-	if _, err := ws.Write([]byte("hello, world!\n")); err != nil {
-		log.Fatal(err)
-	}
-	var msg = make([]byte, 512)
-	var n int
-	if n, err = ws.Read(msg); err != nil {
-		log.Fatal(err)
-	}
-	fmt.Printf("Received: %s.\n", msg[:n])
-}
diff --git a/Godeps/_workspace/src/golang.org/x/net/websocket/examplehandler_test.go b/Godeps/_workspace/src/golang.org/x/net/websocket/examplehandler_test.go
deleted file mode 100644
index f22a98fcd..000000000
--- a/Godeps/_workspace/src/golang.org/x/net/websocket/examplehandler_test.go
+++ /dev/null
@@ -1,26 +0,0 @@
-// 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 websocket_test
-
-import (
-	"io"
-	"net/http"
-
-	"golang.org/x/net/websocket"
-)
-
-// Echo the data received on the WebSocket.
-func EchoServer(ws *websocket.Conn) {
-	io.Copy(ws, ws)
-}
-
-// This example demonstrates a trivial echo server.
-func ExampleHandler() {
-	http.Handle("/echo", websocket.Handler(EchoServer))
-	err := http.ListenAndServe(":12345", nil)
-	if err != nil {
-		panic("ListenAndServe: " + err.Error())
-	}
-}
diff --git a/Godeps/_workspace/src/golang.org/x/net/websocket/hybi.go b/Godeps/_workspace/src/golang.org/x/net/websocket/hybi.go
deleted file mode 100644
index 60bbc8418..000000000
--- a/Godeps/_workspace/src/golang.org/x/net/websocket/hybi.go
+++ /dev/null
@@ -1,586 +0,0 @@
-// 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 websocket
-
-// This file implements a protocol of hybi draft.
-// http://tools.ietf.org/html/draft-ietf-hybi-thewebsocketprotocol-17
-
-import (
-	"bufio"
-	"bytes"
-	"crypto/rand"
-	"crypto/sha1"
-	"encoding/base64"
-	"encoding/binary"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"net/http"
-	"net/url"
-	"strings"
-)
-
-const (
-	websocketGUID = "258EAFA5-E914-47DA-95CA-C5AB0DC85B11"
-
-	closeStatusNormal            = 1000
-	closeStatusGoingAway         = 1001
-	closeStatusProtocolError     = 1002
-	closeStatusUnsupportedData   = 1003
-	closeStatusFrameTooLarge     = 1004
-	closeStatusNoStatusRcvd      = 1005
-	closeStatusAbnormalClosure   = 1006
-	closeStatusBadMessageData    = 1007
-	closeStatusPolicyViolation   = 1008
-	closeStatusTooBigData        = 1009
-	closeStatusExtensionMismatch = 1010
-
-	maxControlFramePayloadLength = 125
-)
-
-var (
-	ErrBadMaskingKey         = &ProtocolError{"bad masking key"}
-	ErrBadPongMessage        = &ProtocolError{"bad pong message"}
-	ErrBadClosingStatus      = &ProtocolError{"bad closing status"}
-	ErrUnsupportedExtensions = &ProtocolError{"unsupported extensions"}
-	ErrNotImplemented        = &ProtocolError{"not implemented"}
-
-	handshakeHeader = map[string]bool{
-		"Host":                   true,
-		"Upgrade":                true,
-		"Connection":             true,
-		"Sec-Websocket-Key":      true,
-		"Sec-Websocket-Origin":   true,
-		"Sec-Websocket-Version":  true,
-		"Sec-Websocket-Protocol": true,
-		"Sec-Websocket-Accept":   true,
-	}
-)
-
-// A hybiFrameHeader is a frame header as defined in hybi draft.
-type hybiFrameHeader struct {
-	Fin        bool
-	Rsv        [3]bool
-	OpCode     byte
-	Length     int64
-	MaskingKey []byte
-
-	data *bytes.Buffer
-}
-
-// A hybiFrameReader is a reader for hybi frame.
-type hybiFrameReader struct {
-	reader io.Reader
-
-	header hybiFrameHeader
-	pos    int64
-	length int
-}
-
-func (frame *hybiFrameReader) Read(msg []byte) (n int, err error) {
-	n, err = frame.reader.Read(msg)
-	if err != nil {
-		return 0, err
-	}
-	if frame.header.MaskingKey != nil {
-		for i := 0; i < n; i++ {
-			msg[i] = msg[i] ^ frame.header.MaskingKey[frame.pos%4]
-			frame.pos++
-		}
-	}
-	return n, err
-}
-
-func (frame *hybiFrameReader) PayloadType() byte { return frame.header.OpCode }
-
-func (frame *hybiFrameReader) HeaderReader() io.Reader {
-	if frame.header.data == nil {
-		return nil
-	}
-	if frame.header.data.Len() == 0 {
-		return nil
-	}
-	return frame.header.data
-}
-
-func (frame *hybiFrameReader) TrailerReader() io.Reader { return nil }
-
-func (frame *hybiFrameReader) Len() (n int) { return frame.length }
-
-// A hybiFrameReaderFactory creates new frame reader based on its frame type.
-type hybiFrameReaderFactory struct {
-	*bufio.Reader
-}
-
-// NewFrameReader reads a frame header from the connection, and creates new reader for the frame.
-// See Section 5.2 Base Framing protocol for detail.
-// http://tools.ietf.org/html/draft-ietf-hybi-thewebsocketprotocol-17#section-5.2
-func (buf hybiFrameReaderFactory) NewFrameReader() (frame frameReader, err error) {
-	hybiFrame := new(hybiFrameReader)
-	frame = hybiFrame
-	var header []byte
-	var b byte
-	// First byte. FIN/RSV1/RSV2/RSV3/OpCode(4bits)
-	b, err = buf.ReadByte()
-	if err != nil {
-		return
-	}
-	header = append(header, b)
-	hybiFrame.header.Fin = ((header[0] >> 7) & 1) != 0
-	for i := 0; i < 3; i++ {
-		j := uint(6 - i)
-		hybiFrame.header.Rsv[i] = ((header[0] >> j) & 1) != 0
-	}
-	hybiFrame.header.OpCode = header[0] & 0x0f
-
-	// Second byte. Mask/Payload len(7bits)
-	b, err = buf.ReadByte()
-	if err != nil {
-		return
-	}
-	header = append(header, b)
-	mask := (b & 0x80) != 0
-	b &= 0x7f
-	lengthFields := 0
-	switch {
-	case b <= 125: // Payload length 7bits.
-		hybiFrame.header.Length = int64(b)
-	case b == 126: // Payload length 7+16bits
-		lengthFields = 2
-	case b == 127: // Payload length 7+64bits
-		lengthFields = 8
-	}
-	for i := 0; i < lengthFields; i++ {
-		b, err = buf.ReadByte()
-		if err != nil {
-			return
-		}
-		if lengthFields == 8 && i == 0 { // MSB must be zero when 7+64 bits
-			b &= 0x7f
-		}
-		header = append(header, b)
-		hybiFrame.header.Length = hybiFrame.header.Length*256 + int64(b)
-	}
-	if mask {
-		// Masking key. 4 bytes.
-		for i := 0; i < 4; i++ {
-			b, err = buf.ReadByte()
-			if err != nil {
-				return
-			}
-			header = append(header, b)
-			hybiFrame.header.MaskingKey = append(hybiFrame.header.MaskingKey, b)
-		}
-	}
-	hybiFrame.reader = io.LimitReader(buf.Reader, hybiFrame.header.Length)
-	hybiFrame.header.data = bytes.NewBuffer(header)
-	hybiFrame.length = len(header) + int(hybiFrame.header.Length)
-	return
-}
-
-// A HybiFrameWriter is a writer for hybi frame.
-type hybiFrameWriter struct {
-	writer *bufio.Writer
-
-	header *hybiFrameHeader
-}
-
-func (frame *hybiFrameWriter) Write(msg []byte) (n int, err error) {
-	var header []byte
-	var b byte
-	if frame.header.Fin {
-		b |= 0x80
-	}
-	for i := 0; i < 3; i++ {
-		if frame.header.Rsv[i] {
-			j := uint(6 - i)
-			b |= 1 << j
-		}
-	}
-	b |= frame.header.OpCode
-	header = append(header, b)
-	if frame.header.MaskingKey != nil {
-		b = 0x80
-	} else {
-		b = 0
-	}
-	lengthFields := 0
-	length := len(msg)
-	switch {
-	case length <= 125:
-		b |= byte(length)
-	case length < 65536:
-		b |= 126
-		lengthFields = 2
-	default:
-		b |= 127
-		lengthFields = 8
-	}
-	header = append(header, b)
-	for i := 0; i < lengthFields; i++ {
-		j := uint((lengthFields - i - 1) * 8)
-		b = byte((length >> j) & 0xff)
-		header = append(header, b)
-	}
-	if frame.header.MaskingKey != nil {
-		if len(frame.header.MaskingKey) != 4 {
-			return 0, ErrBadMaskingKey
-		}
-		header = append(header, frame.header.MaskingKey...)
-		frame.writer.Write(header)
-		data := make([]byte, length)
-		for i := range data {
-			data[i] = msg[i] ^ frame.header.MaskingKey[i%4]
-		}
-		frame.writer.Write(data)
-		err = frame.writer.Flush()
-		return length, err
-	}
-	frame.writer.Write(header)
-	frame.writer.Write(msg)
-	err = frame.writer.Flush()
-	return length, err
-}
-
-func (frame *hybiFrameWriter) Close() error { return nil }
-
-type hybiFrameWriterFactory struct {
-	*bufio.Writer
-	needMaskingKey bool
-}
-
-func (buf hybiFrameWriterFactory) NewFrameWriter(payloadType byte) (frame frameWriter, err error) {
-	frameHeader := &hybiFrameHeader{Fin: true, OpCode: payloadType}
-	if buf.needMaskingKey {
-		frameHeader.MaskingKey, err = generateMaskingKey()
-		if err != nil {
-			return nil, err
-		}
-	}
-	return &hybiFrameWriter{writer: buf.Writer, header: frameHeader}, nil
-}
-
-type hybiFrameHandler struct {
-	conn        *Conn
-	payloadType byte
-}
-
-func (handler *hybiFrameHandler) HandleFrame(frame frameReader) (frameReader, error) {
-	if handler.conn.IsServerConn() {
-		// The client MUST mask all frames sent to the server.
-		if frame.(*hybiFrameReader).header.MaskingKey == nil {
-			handler.WriteClose(closeStatusProtocolError)
-			return nil, io.EOF
-		}
-	} else {
-		// The server MUST NOT mask all frames.
-		if frame.(*hybiFrameReader).header.MaskingKey != nil {
-			handler.WriteClose(closeStatusProtocolError)
-			return nil, io.EOF
-		}
-	}
-	if header := frame.HeaderReader(); header != nil {
-		io.Copy(ioutil.Discard, header)
-	}
-	switch frame.PayloadType() {
-	case ContinuationFrame:
-		frame.(*hybiFrameReader).header.OpCode = handler.payloadType
-	case TextFrame, BinaryFrame:
-		handler.payloadType = frame.PayloadType()
-	case CloseFrame:
-		return nil, io.EOF
-	case PingFrame, PongFrame:
-		b := make([]byte, maxControlFramePayloadLength)
-		n, err := io.ReadFull(frame, b)
-		if err != nil && err != io.EOF && err != io.ErrUnexpectedEOF {
-			return nil, err
-		}
-		io.Copy(ioutil.Discard, frame)
-		if frame.PayloadType() == PingFrame {
-			if _, err := handler.WritePong(b[:n]); err != nil {
-				return nil, err
-			}
-		}
-		return nil, nil
-	}
-	return frame, nil
-}
-
-func (handler *hybiFrameHandler) WriteClose(status int) (err error) {
-	handler.conn.wio.Lock()
-	defer handler.conn.wio.Unlock()
-	w, err := handler.conn.frameWriterFactory.NewFrameWriter(CloseFrame)
-	if err != nil {
-		return err
-	}
-	msg := make([]byte, 2)
-	binary.BigEndian.PutUint16(msg, uint16(status))
-	_, err = w.Write(msg)
-	w.Close()
-	return err
-}
-
-func (handler *hybiFrameHandler) WritePong(msg []byte) (n int, err error) {
-	handler.conn.wio.Lock()
-	defer handler.conn.wio.Unlock()
-	w, err := handler.conn.frameWriterFactory.NewFrameWriter(PongFrame)
-	if err != nil {
-		return 0, err
-	}
-	n, err = w.Write(msg)
-	w.Close()
-	return n, err
-}
-
-// newHybiConn creates a new WebSocket connection speaking hybi draft protocol.
-func newHybiConn(config *Config, buf *bufio.ReadWriter, rwc io.ReadWriteCloser, request *http.Request) *Conn {
-	if buf == nil {
-		br := bufio.NewReader(rwc)
-		bw := bufio.NewWriter(rwc)
-		buf = bufio.NewReadWriter(br, bw)
-	}
-	ws := &Conn{config: config, request: request, buf: buf, rwc: rwc,
-		frameReaderFactory: hybiFrameReaderFactory{buf.Reader},
-		frameWriterFactory: hybiFrameWriterFactory{
-			buf.Writer, request == nil},
-		PayloadType:        TextFrame,
-		defaultCloseStatus: closeStatusNormal}
-	ws.frameHandler = &hybiFrameHandler{conn: ws}
-	return ws
-}
-
-// generateMaskingKey generates a masking key for a frame.
-func generateMaskingKey() (maskingKey []byte, err error) {
-	maskingKey = make([]byte, 4)
-	if _, err = io.ReadFull(rand.Reader, maskingKey); err != nil {
-		return
-	}
-	return
-}
-
-// generateNonce generates a nonce consisting of a randomly selected 16-byte
-// value that has been base64-encoded.
-func generateNonce() (nonce []byte) {
-	key := make([]byte, 16)
-	if _, err := io.ReadFull(rand.Reader, key); err != nil {
-		panic(err)
-	}
-	nonce = make([]byte, 24)
-	base64.StdEncoding.Encode(nonce, key)
-	return
-}
-
-// removeZone removes IPv6 zone identifer from host.
-// E.g., "[fe80::1%en0]:8080" to "[fe80::1]:8080"
-func removeZone(host string) string {
-	if !strings.HasPrefix(host, "[") {
-		return host
-	}
-	i := strings.LastIndex(host, "]")
-	if i < 0 {
-		return host
-	}
-	j := strings.LastIndex(host[:i], "%")
-	if j < 0 {
-		return host
-	}
-	return host[:j] + host[i:]
-}
-
-// getNonceAccept computes the base64-encoded SHA-1 of the concatenation of
-// the nonce ("Sec-WebSocket-Key" value) with the websocket GUID string.
-func getNonceAccept(nonce []byte) (expected []byte, err error) {
-	h := sha1.New()
-	if _, err = h.Write(nonce); err != nil {
-		return
-	}
-	if _, err = h.Write([]byte(websocketGUID)); err != nil {
-		return
-	}
-	expected = make([]byte, 28)
-	base64.StdEncoding.Encode(expected, h.Sum(nil))
-	return
-}
-
-// Client handshake described in draft-ietf-hybi-thewebsocket-protocol-17
-func hybiClientHandshake(config *Config, br *bufio.Reader, bw *bufio.Writer) (err error) {
-	bw.WriteString("GET " + config.Location.RequestURI() + " HTTP/1.1\r\n")
-
-	// According to RFC 6874, an HTTP client, proxy, or other
-	// intermediary must remove any IPv6 zone identifier attached
-	// to an outgoing URI.
-	bw.WriteString("Host: " + removeZone(config.Location.Host) + "\r\n")
-	bw.WriteString("Upgrade: websocket\r\n")
-	bw.WriteString("Connection: Upgrade\r\n")
-	nonce := generateNonce()
-	if config.handshakeData != nil {
-		nonce = []byte(config.handshakeData["key"])
-	}
-	bw.WriteString("Sec-WebSocket-Key: " + string(nonce) + "\r\n")
-	bw.WriteString("Origin: " + strings.ToLower(config.Origin.String()) + "\r\n")
-
-	if config.Version != ProtocolVersionHybi13 {
-		return ErrBadProtocolVersion
-	}
-
-	bw.WriteString("Sec-WebSocket-Version: " + fmt.Sprintf("%d", config.Version) + "\r\n")
-	if len(config.Protocol) > 0 {
-		bw.WriteString("Sec-WebSocket-Protocol: " + strings.Join(config.Protocol, ", ") + "\r\n")
-	}
-	// TODO(ukai): send Sec-WebSocket-Extensions.
-	err = config.Header.WriteSubset(bw, handshakeHeader)
-	if err != nil {
-		return err
-	}
-
-	bw.WriteString("\r\n")
-	if err = bw.Flush(); err != nil {
-		return err
-	}
-
-	resp, err := http.ReadResponse(br, &http.Request{Method: "GET"})
-	if err != nil {
-		return err
-	}
-	if resp.StatusCode != 101 {
-		return ErrBadStatus
-	}
-	if strings.ToLower(resp.Header.Get("Upgrade")) != "websocket" ||
-		strings.ToLower(resp.Header.Get("Connection")) != "upgrade" {
-		return ErrBadUpgrade
-	}
-	expectedAccept, err := getNonceAccept(nonce)
-	if err != nil {
-		return err
-	}
-	if resp.Header.Get("Sec-WebSocket-Accept") != string(expectedAccept) {
-		return ErrChallengeResponse
-	}
-	if resp.Header.Get("Sec-WebSocket-Extensions") != "" {
-		return ErrUnsupportedExtensions
-	}
-	offeredProtocol := resp.Header.Get("Sec-WebSocket-Protocol")
-	if offeredProtocol != "" {
-		protocolMatched := false
-		for i := 0; i < len(config.Protocol); i++ {
-			if config.Protocol[i] == offeredProtocol {
-				protocolMatched = true
-				break
-			}
-		}
-		if !protocolMatched {
-			return ErrBadWebSocketProtocol
-		}
-		config.Protocol = []string{offeredProtocol}
-	}
-
-	return nil
-}
-
-// newHybiClientConn creates a client WebSocket connection after handshake.
-func newHybiClientConn(config *Config, buf *bufio.ReadWriter, rwc io.ReadWriteCloser) *Conn {
-	return newHybiConn(config, buf, rwc, nil)
-}
-
-// A HybiServerHandshaker performs a server handshake using hybi draft protocol.
-type hybiServerHandshaker struct {
-	*Config
-	accept []byte
-}
-
-func (c *hybiServerHandshaker) ReadHandshake(buf *bufio.Reader, req *http.Request) (code int, err error) {
-	c.Version = ProtocolVersionHybi13
-	if req.Method != "GET" {
-		return http.StatusMethodNotAllowed, ErrBadRequestMethod
-	}
-	// HTTP version can be safely ignored.
-
-	if strings.ToLower(req.Header.Get("Upgrade")) != "websocket" ||
-		!strings.Contains(strings.ToLower(req.Header.Get("Connection")), "upgrade") {
-		return http.StatusBadRequest, ErrNotWebSocket
-	}
-
-	key := req.Header.Get("Sec-Websocket-Key")
-	if key == "" {
-		return http.StatusBadRequest, ErrChallengeResponse
-	}
-	version := req.Header.Get("Sec-Websocket-Version")
-	switch version {
-	case "13":
-		c.Version = ProtocolVersionHybi13
-	default:
-		return http.StatusBadRequest, ErrBadWebSocketVersion
-	}
-	var scheme string
-	if req.TLS != nil {
-		scheme = "wss"
-	} else {
-		scheme = "ws"
-	}
-	c.Location, err = url.ParseRequestURI(scheme + "://" + req.Host + req.URL.RequestURI())
-	if err != nil {
-		return http.StatusBadRequest, err
-	}
-	protocol := strings.TrimSpace(req.Header.Get("Sec-Websocket-Protocol"))
-	if protocol != "" {
-		protocols := strings.Split(protocol, ",")
-		for i := 0; i < len(protocols); i++ {
-			c.Protocol = append(c.Protocol, strings.TrimSpace(protocols[i]))
-		}
-	}
-	c.accept, err = getNonceAccept([]byte(key))
-	if err != nil {
-		return http.StatusInternalServerError, err
-	}
-	return http.StatusSwitchingProtocols, nil
-}
-
-// Origin parses the Origin header in req.
-// If the Origin header is not set, it returns nil and nil.
-func Origin(config *Config, req *http.Request) (*url.URL, error) {
-	var origin string
-	switch config.Version {
-	case ProtocolVersionHybi13:
-		origin = req.Header.Get("Origin")
-	}
-	if origin == "" {
-		return nil, nil
-	}
-	return url.ParseRequestURI(origin)
-}
-
-func (c *hybiServerHandshaker) AcceptHandshake(buf *bufio.Writer) (err error) {
-	if len(c.Protocol) > 0 {
-		if len(c.Protocol) != 1 {
-			// You need choose a Protocol in Handshake func in Server.
-			return ErrBadWebSocketProtocol
-		}
-	}
-	buf.WriteString("HTTP/1.1 101 Switching Protocols\r\n")
-	buf.WriteString("Upgrade: websocket\r\n")
-	buf.WriteString("Connection: Upgrade\r\n")
-	buf.WriteString("Sec-WebSocket-Accept: " + string(c.accept) + "\r\n")
-	if len(c.Protocol) > 0 {
-		buf.WriteString("Sec-WebSocket-Protocol: " + c.Protocol[0] + "\r\n")
-	}
-	// TODO(ukai): send Sec-WebSocket-Extensions.
-	if c.Header != nil {
-		err := c.Header.WriteSubset(buf, handshakeHeader)
-		if err != nil {
-			return err
-		}
-	}
-	buf.WriteString("\r\n")
-	return buf.Flush()
-}
-
-func (c *hybiServerHandshaker) NewServerConn(buf *bufio.ReadWriter, rwc io.ReadWriteCloser, request *http.Request) *Conn {
-	return newHybiServerConn(c.Config, buf, rwc, request)
-}
-
-// newHybiServerConn returns a new WebSocket connection speaking hybi draft protocol.
-func newHybiServerConn(config *Config, buf *bufio.ReadWriter, rwc io.ReadWriteCloser, request *http.Request) *Conn {
-	return newHybiConn(config, buf, rwc, request)
-}
diff --git a/Godeps/_workspace/src/golang.org/x/net/websocket/hybi_test.go b/Godeps/_workspace/src/golang.org/x/net/websocket/hybi_test.go
deleted file mode 100644
index 9504aa2d3..000000000
--- a/Godeps/_workspace/src/golang.org/x/net/websocket/hybi_test.go
+++ /dev/null
@@ -1,608 +0,0 @@
-// 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 websocket
-
-import (
-	"bufio"
-	"bytes"
-	"fmt"
-	"io"
-	"net/http"
-	"net/url"
-	"strings"
-	"testing"
-)
-
-// Test the getNonceAccept function with values in
-// http://tools.ietf.org/html/draft-ietf-hybi-thewebsocketprotocol-17
-func TestSecWebSocketAccept(t *testing.T) {
-	nonce := []byte("dGhlIHNhbXBsZSBub25jZQ==")
-	expected := []byte("s3pPLMBiTxaQ9kYGzzhZRbK+xOo=")
-	accept, err := getNonceAccept(nonce)
-	if err != nil {
-		t.Errorf("getNonceAccept: returned error %v", err)
-		return
-	}
-	if !bytes.Equal(expected, accept) {
-		t.Errorf("getNonceAccept: expected %q got %q", expected, accept)
-	}
-}
-
-func TestHybiClientHandshake(t *testing.T) {
-	type test struct {
-		url, host string
-	}
-	tests := []test{
-		{"ws://server.example.com/chat", "server.example.com"},
-		{"ws://127.0.0.1/chat", "127.0.0.1"},
-	}
-	if _, err := url.ParseRequestURI("http://[fe80::1%25lo0]"); err == nil {
-		tests = append(tests, test{"ws://[fe80::1%25lo0]/chat", "[fe80::1]"})
-	}
-
-	for _, tt := range tests {
-		var b bytes.Buffer
-		bw := bufio.NewWriter(&b)
-		br := bufio.NewReader(strings.NewReader(`HTTP/1.1 101 Switching Protocols
-Upgrade: websocket
-Connection: Upgrade
-Sec-WebSocket-Accept: s3pPLMBiTxaQ9kYGzzhZRbK+xOo=
-Sec-WebSocket-Protocol: chat
-
-`))
-		var err error
-		var config Config
-		config.Location, err = url.ParseRequestURI(tt.url)
-		if err != nil {
-			t.Fatal("location url", err)
-		}
-		config.Origin, err = url.ParseRequestURI("http://example.com")
-		if err != nil {
-			t.Fatal("origin url", err)
-		}
-		config.Protocol = append(config.Protocol, "chat")
-		config.Protocol = append(config.Protocol, "superchat")
-		config.Version = ProtocolVersionHybi13
-		config.handshakeData = map[string]string{
-			"key": "dGhlIHNhbXBsZSBub25jZQ==",
-		}
-		if err := hybiClientHandshake(&config, br, bw); err != nil {
-			t.Fatal("handshake", err)
-		}
-		req, err := http.ReadRequest(bufio.NewReader(&b))
-		if err != nil {
-			t.Fatal("read request", err)
-		}
-		if req.Method != "GET" {
-			t.Errorf("request method expected GET, but got %s", req.Method)
-		}
-		if req.URL.Path != "/chat" {
-			t.Errorf("request path expected /chat, but got %s", req.URL.Path)
-		}
-		if req.Proto != "HTTP/1.1" {
-			t.Errorf("request proto expected HTTP/1.1, but got %s", req.Proto)
-		}
-		if req.Host != tt.host {
-			t.Errorf("request host expected %s, but got %s", tt.host, req.Host)
-		}
-		var expectedHeader = map[string]string{
-			"Connection":             "Upgrade",
-			"Upgrade":                "websocket",
-			"Sec-Websocket-Key":      config.handshakeData["key"],
-			"Origin":                 config.Origin.String(),
-			"Sec-Websocket-Protocol": "chat, superchat",
-			"Sec-Websocket-Version":  fmt.Sprintf("%d", ProtocolVersionHybi13),
-		}
-		for k, v := range expectedHeader {
-			if req.Header.Get(k) != v {
-				t.Errorf("%s expected %s, but got %v", k, v, req.Header.Get(k))
-			}
-		}
-	}
-}
-
-func TestHybiClientHandshakeWithHeader(t *testing.T) {
-	b := bytes.NewBuffer([]byte{})
-	bw := bufio.NewWriter(b)
-	br := bufio.NewReader(strings.NewReader(`HTTP/1.1 101 Switching Protocols
-Upgrade: websocket
-Connection: Upgrade
-Sec-WebSocket-Accept: s3pPLMBiTxaQ9kYGzzhZRbK+xOo=
-Sec-WebSocket-Protocol: chat
-
-`))
-	var err error
-	config := new(Config)
-	config.Location, err = url.ParseRequestURI("ws://server.example.com/chat")
-	if err != nil {
-		t.Fatal("location url", err)
-	}
-	config.Origin, err = url.ParseRequestURI("http://example.com")
-	if err != nil {
-		t.Fatal("origin url", err)
-	}
-	config.Protocol = append(config.Protocol, "chat")
-	config.Protocol = append(config.Protocol, "superchat")
-	config.Version = ProtocolVersionHybi13
-	config.Header = http.Header(make(map[string][]string))
-	config.Header.Add("User-Agent", "test")
-
-	config.handshakeData = map[string]string{
-		"key": "dGhlIHNhbXBsZSBub25jZQ==",
-	}
-	err = hybiClientHandshake(config, br, bw)
-	if err != nil {
-		t.Errorf("handshake failed: %v", err)
-	}
-	req, err := http.ReadRequest(bufio.NewReader(b))
-	if err != nil {
-		t.Fatalf("read request: %v", err)
-	}
-	if req.Method != "GET" {
-		t.Errorf("request method expected GET, but got %q", req.Method)
-	}
-	if req.URL.Path != "/chat" {
-		t.Errorf("request path expected /chat, but got %q", req.URL.Path)
-	}
-	if req.Proto != "HTTP/1.1" {
-		t.Errorf("request proto expected HTTP/1.1, but got %q", req.Proto)
-	}
-	if req.Host != "server.example.com" {
-		t.Errorf("request Host expected server.example.com, but got %v", req.Host)
-	}
-	var expectedHeader = map[string]string{
-		"Connection":             "Upgrade",
-		"Upgrade":                "websocket",
-		"Sec-Websocket-Key":      config.handshakeData["key"],
-		"Origin":                 config.Origin.String(),
-		"Sec-Websocket-Protocol": "chat, superchat",
-		"Sec-Websocket-Version":  fmt.Sprintf("%d", ProtocolVersionHybi13),
-		"User-Agent":             "test",
-	}
-	for k, v := range expectedHeader {
-		if req.Header.Get(k) != v {
-			t.Errorf(fmt.Sprintf("%s expected %q but got %q", k, v, req.Header.Get(k)))
-		}
-	}
-}
-
-func TestHybiServerHandshake(t *testing.T) {
-	config := new(Config)
-	handshaker := &hybiServerHandshaker{Config: config}
-	br := bufio.NewReader(strings.NewReader(`GET /chat HTTP/1.1
-Host: server.example.com
-Upgrade: websocket
-Connection: Upgrade
-Sec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==
-Origin: http://example.com
-Sec-WebSocket-Protocol: chat, superchat
-Sec-WebSocket-Version: 13
-
-`))
-	req, err := http.ReadRequest(br)
-	if err != nil {
-		t.Fatal("request", err)
-	}
-	code, err := handshaker.ReadHandshake(br, req)
-	if err != nil {
-		t.Errorf("handshake failed: %v", err)
-	}
-	if code != http.StatusSwitchingProtocols {
-		t.Errorf("status expected %q but got %q", http.StatusSwitchingProtocols, code)
-	}
-	expectedProtocols := []string{"chat", "superchat"}
-	if fmt.Sprintf("%v", config.Protocol) != fmt.Sprintf("%v", expectedProtocols) {
-		t.Errorf("protocol expected %q but got %q", expectedProtocols, config.Protocol)
-	}
-	b := bytes.NewBuffer([]byte{})
-	bw := bufio.NewWriter(b)
-
-	config.Protocol = config.Protocol[:1]
-
-	err = handshaker.AcceptHandshake(bw)
-	if err != nil {
-		t.Errorf("handshake response failed: %v", err)
-	}
-	expectedResponse := strings.Join([]string{
-		"HTTP/1.1 101 Switching Protocols",
-		"Upgrade: websocket",
-		"Connection: Upgrade",
-		"Sec-WebSocket-Accept: s3pPLMBiTxaQ9kYGzzhZRbK+xOo=",
-		"Sec-WebSocket-Protocol: chat",
-		"", ""}, "\r\n")
-
-	if b.String() != expectedResponse {
-		t.Errorf("handshake expected %q but got %q", expectedResponse, b.String())
-	}
-}
-
-func TestHybiServerHandshakeNoSubProtocol(t *testing.T) {
-	config := new(Config)
-	handshaker := &hybiServerHandshaker{Config: config}
-	br := bufio.NewReader(strings.NewReader(`GET /chat HTTP/1.1
-Host: server.example.com
-Upgrade: websocket
-Connection: Upgrade
-Sec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==
-Origin: http://example.com
-Sec-WebSocket-Version: 13
-
-`))
-	req, err := http.ReadRequest(br)
-	if err != nil {
-		t.Fatal("request", err)
-	}
-	code, err := handshaker.ReadHandshake(br, req)
-	if err != nil {
-		t.Errorf("handshake failed: %v", err)
-	}
-	if code != http.StatusSwitchingProtocols {
-		t.Errorf("status expected %q but got %q", http.StatusSwitchingProtocols, code)
-	}
-	if len(config.Protocol) != 0 {
-		t.Errorf("len(config.Protocol) expected 0, but got %q", len(config.Protocol))
-	}
-	b := bytes.NewBuffer([]byte{})
-	bw := bufio.NewWriter(b)
-
-	err = handshaker.AcceptHandshake(bw)
-	if err != nil {
-		t.Errorf("handshake response failed: %v", err)
-	}
-	expectedResponse := strings.Join([]string{
-		"HTTP/1.1 101 Switching Protocols",
-		"Upgrade: websocket",
-		"Connection: Upgrade",
-		"Sec-WebSocket-Accept: s3pPLMBiTxaQ9kYGzzhZRbK+xOo=",
-		"", ""}, "\r\n")
-
-	if b.String() != expectedResponse {
-		t.Errorf("handshake expected %q but got %q", expectedResponse, b.String())
-	}
-}
-
-func TestHybiServerHandshakeHybiBadVersion(t *testing.T) {
-	config := new(Config)
-	handshaker := &hybiServerHandshaker{Config: config}
-	br := bufio.NewReader(strings.NewReader(`GET /chat HTTP/1.1
-Host: server.example.com
-Upgrade: websocket
-Connection: Upgrade
-Sec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==
-Sec-WebSocket-Origin: http://example.com
-Sec-WebSocket-Protocol: chat, superchat
-Sec-WebSocket-Version: 9
-
-`))
-	req, err := http.ReadRequest(br)
-	if err != nil {
-		t.Fatal("request", err)
-	}
-	code, err := handshaker.ReadHandshake(br, req)
-	if err != ErrBadWebSocketVersion {
-		t.Errorf("handshake expected err %q but got %q", ErrBadWebSocketVersion, err)
-	}
-	if code != http.StatusBadRequest {
-		t.Errorf("status expected %q but got %q", http.StatusBadRequest, code)
-	}
-}
-
-func testHybiFrame(t *testing.T, testHeader, testPayload, testMaskedPayload []byte, frameHeader *hybiFrameHeader) {
-	b := bytes.NewBuffer([]byte{})
-	frameWriterFactory := &hybiFrameWriterFactory{bufio.NewWriter(b), false}
-	w, _ := frameWriterFactory.NewFrameWriter(TextFrame)
-	w.(*hybiFrameWriter).header = frameHeader
-	_, err := w.Write(testPayload)
-	w.Close()
-	if err != nil {
-		t.Errorf("Write error %q", err)
-	}
-	var expectedFrame []byte
-	expectedFrame = append(expectedFrame, testHeader...)
-	expectedFrame = append(expectedFrame, testMaskedPayload...)
-	if !bytes.Equal(expectedFrame, b.Bytes()) {
-		t.Errorf("frame expected %q got %q", expectedFrame, b.Bytes())
-	}
-	frameReaderFactory := &hybiFrameReaderFactory{bufio.NewReader(b)}
-	r, err := frameReaderFactory.NewFrameReader()
-	if err != nil {
-		t.Errorf("Read error %q", err)
-	}
-	if header := r.HeaderReader(); header == nil {
-		t.Errorf("no header")
-	} else {
-		actualHeader := make([]byte, r.Len())
-		n, err := header.Read(actualHeader)
-		if err != nil {
-			t.Errorf("Read header error %q", err)
-		} else {
-			if n < len(testHeader) {
-				t.Errorf("header too short %q got %q", testHeader, actualHeader[:n])
-			}
-			if !bytes.Equal(testHeader, actualHeader[:n]) {
-				t.Errorf("header expected %q got %q", testHeader, actualHeader[:n])
-			}
-		}
-	}
-	if trailer := r.TrailerReader(); trailer != nil {
-		t.Errorf("unexpected trailer %q", trailer)
-	}
-	frame := r.(*hybiFrameReader)
-	if frameHeader.Fin != frame.header.Fin ||
-		frameHeader.OpCode != frame.header.OpCode ||
-		len(testPayload) != int(frame.header.Length) {
-		t.Errorf("mismatch %v (%d) vs %v", frameHeader, len(testPayload), frame)
-	}
-	payload := make([]byte, len(testPayload))
-	_, err = r.Read(payload)
-	if err != nil && err != io.EOF {
-		t.Errorf("read %v", err)
-	}
-	if !bytes.Equal(testPayload, payload) {
-		t.Errorf("payload %q vs %q", testPayload, payload)
-	}
-}
-
-func TestHybiShortTextFrame(t *testing.T) {
-	frameHeader := &hybiFrameHeader{Fin: true, OpCode: TextFrame}
-	payload := []byte("hello")
-	testHybiFrame(t, []byte{0x81, 0x05}, payload, payload, frameHeader)
-
-	payload = make([]byte, 125)
-	testHybiFrame(t, []byte{0x81, 125}, payload, payload, frameHeader)
-}
-
-func TestHybiShortMaskedTextFrame(t *testing.T) {
-	frameHeader := &hybiFrameHeader{Fin: true, OpCode: TextFrame,
-		MaskingKey: []byte{0xcc, 0x55, 0x80, 0x20}}
-	payload := []byte("hello")
-	maskedPayload := []byte{0xa4, 0x30, 0xec, 0x4c, 0xa3}
-	header := []byte{0x81, 0x85}
-	header = append(header, frameHeader.MaskingKey...)
-	testHybiFrame(t, header, payload, maskedPayload, frameHeader)
-}
-
-func TestHybiShortBinaryFrame(t *testing.T) {
-	frameHeader := &hybiFrameHeader{Fin: true, OpCode: BinaryFrame}
-	payload := []byte("hello")
-	testHybiFrame(t, []byte{0x82, 0x05}, payload, payload, frameHeader)
-
-	payload = make([]byte, 125)
-	testHybiFrame(t, []byte{0x82, 125}, payload, payload, frameHeader)
-}
-
-func TestHybiControlFrame(t *testing.T) {
-	payload := []byte("hello")
-
-	frameHeader := &hybiFrameHeader{Fin: true, OpCode: PingFrame}
-	testHybiFrame(t, []byte{0x89, 0x05}, payload, payload, frameHeader)
-
-	frameHeader = &hybiFrameHeader{Fin: true, OpCode: PingFrame}
-	testHybiFrame(t, []byte{0x89, 0x00}, nil, nil, frameHeader)
-
-	frameHeader = &hybiFrameHeader{Fin: true, OpCode: PongFrame}
-	testHybiFrame(t, []byte{0x8A, 0x05}, payload, payload, frameHeader)
-
-	frameHeader = &hybiFrameHeader{Fin: true, OpCode: PongFrame}
-	testHybiFrame(t, []byte{0x8A, 0x00}, nil, nil, frameHeader)
-
-	frameHeader = &hybiFrameHeader{Fin: true, OpCode: CloseFrame}
-	payload = []byte{0x03, 0xe8} // 1000
-	testHybiFrame(t, []byte{0x88, 0x02}, payload, payload, frameHeader)
-}
-
-func TestHybiLongFrame(t *testing.T) {
-	frameHeader := &hybiFrameHeader{Fin: true, OpCode: TextFrame}
-	payload := make([]byte, 126)
-	testHybiFrame(t, []byte{0x81, 126, 0x00, 126}, payload, payload, frameHeader)
-
-	payload = make([]byte, 65535)
-	testHybiFrame(t, []byte{0x81, 126, 0xff, 0xff}, payload, payload, frameHeader)
-
-	payload = make([]byte, 65536)
-	testHybiFrame(t, []byte{0x81, 127, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00}, payload, payload, frameHeader)
-}
-
-func TestHybiClientRead(t *testing.T) {
-	wireData := []byte{0x81, 0x05, 'h', 'e', 'l', 'l', 'o',
-		0x89, 0x05, 'h', 'e', 'l', 'l', 'o', // ping
-		0x81, 0x05, 'w', 'o', 'r', 'l', 'd'}
-	br := bufio.NewReader(bytes.NewBuffer(wireData))
-	bw := bufio.NewWriter(bytes.NewBuffer([]byte{}))
-	conn := newHybiConn(newConfig(t, "/"), bufio.NewReadWriter(br, bw), nil, nil)
-
-	msg := make([]byte, 512)
-	n, err := conn.Read(msg)
-	if err != nil {
-		t.Errorf("read 1st frame, error %q", err)
-	}
-	if n != 5 {
-		t.Errorf("read 1st frame, expect 5, got %d", n)
-	}
-	if !bytes.Equal(wireData[2:7], msg[:n]) {
-		t.Errorf("read 1st frame %v, got %v", wireData[2:7], msg[:n])
-	}
-	n, err = conn.Read(msg)
-	if err != nil {
-		t.Errorf("read 2nd frame, error %q", err)
-	}
-	if n != 5 {
-		t.Errorf("read 2nd frame, expect 5, got %d", n)
-	}
-	if !bytes.Equal(wireData[16:21], msg[:n]) {
-		t.Errorf("read 2nd frame %v, got %v", wireData[16:21], msg[:n])
-	}
-	n, err = conn.Read(msg)
-	if err == nil {
-		t.Errorf("read not EOF")
-	}
-	if n != 0 {
-		t.Errorf("expect read 0, got %d", n)
-	}
-}
-
-func TestHybiShortRead(t *testing.T) {
-	wireData := []byte{0x81, 0x05, 'h', 'e', 'l', 'l', 'o',
-		0x89, 0x05, 'h', 'e', 'l', 'l', 'o', // ping
-		0x81, 0x05, 'w', 'o', 'r', 'l', 'd'}
-	br := bufio.NewReader(bytes.NewBuffer(wireData))
-	bw := bufio.NewWriter(bytes.NewBuffer([]byte{}))
-	conn := newHybiConn(newConfig(t, "/"), bufio.NewReadWriter(br, bw), nil, nil)
-
-	step := 0
-	pos := 0
-	expectedPos := []int{2, 5, 16, 19}
-	expectedLen := []int{3, 2, 3, 2}
-	for {
-		msg := make([]byte, 3)
-		n, err := conn.Read(msg)
-		if step >= len(expectedPos) {
-			if err == nil {
-				t.Errorf("read not EOF")
-			}
-			if n != 0 {
-				t.Errorf("expect read 0, got %d", n)
-			}
-			return
-		}
-		pos = expectedPos[step]
-		endPos := pos + expectedLen[step]
-		if err != nil {
-			t.Errorf("read from %d, got error %q", pos, err)
-			return
-		}
-		if n != endPos-pos {
-			t.Errorf("read from %d, expect %d, got %d", pos, endPos-pos, n)
-		}
-		if !bytes.Equal(wireData[pos:endPos], msg[:n]) {
-			t.Errorf("read from %d, frame %v, got %v", pos, wireData[pos:endPos], msg[:n])
-		}
-		step++
-	}
-}
-
-func TestHybiServerRead(t *testing.T) {
-	wireData := []byte{0x81, 0x85, 0xcc, 0x55, 0x80, 0x20,
-		0xa4, 0x30, 0xec, 0x4c, 0xa3, // hello
-		0x89, 0x85, 0xcc, 0x55, 0x80, 0x20,
-		0xa4, 0x30, 0xec, 0x4c, 0xa3, // ping: hello
-		0x81, 0x85, 0xed, 0x83, 0xb4, 0x24,
-		0x9a, 0xec, 0xc6, 0x48, 0x89, // world
-	}
-	br := bufio.NewReader(bytes.NewBuffer(wireData))
-	bw := bufio.NewWriter(bytes.NewBuffer([]byte{}))
-	conn := newHybiConn(newConfig(t, "/"), bufio.NewReadWriter(br, bw), nil, new(http.Request))
-
-	expected := [][]byte{[]byte("hello"), []byte("world")}
-
-	msg := make([]byte, 512)
-	n, err := conn.Read(msg)
-	if err != nil {
-		t.Errorf("read 1st frame, error %q", err)
-	}
-	if n != 5 {
-		t.Errorf("read 1st frame, expect 5, got %d", n)
-	}
-	if !bytes.Equal(expected[0], msg[:n]) {
-		t.Errorf("read 1st frame %q, got %q", expected[0], msg[:n])
-	}
-
-	n, err = conn.Read(msg)
-	if err != nil {
-		t.Errorf("read 2nd frame, error %q", err)
-	}
-	if n != 5 {
-		t.Errorf("read 2nd frame, expect 5, got %d", n)
-	}
-	if !bytes.Equal(expected[1], msg[:n]) {
-		t.Errorf("read 2nd frame %q, got %q", expected[1], msg[:n])
-	}
-
-	n, err = conn.Read(msg)
-	if err == nil {
-		t.Errorf("read not EOF")
-	}
-	if n != 0 {
-		t.Errorf("expect read 0, got %d", n)
-	}
-}
-
-func TestHybiServerReadWithoutMasking(t *testing.T) {
-	wireData := []byte{0x81, 0x05, 'h', 'e', 'l', 'l', 'o'}
-	br := bufio.NewReader(bytes.NewBuffer(wireData))
-	bw := bufio.NewWriter(bytes.NewBuffer([]byte{}))
-	conn := newHybiConn(newConfig(t, "/"), bufio.NewReadWriter(br, bw), nil, new(http.Request))
-	// server MUST close the connection upon receiving a non-masked frame.
-	msg := make([]byte, 512)
-	_, err := conn.Read(msg)
-	if err != io.EOF {
-		t.Errorf("read 1st frame, expect %q, but got %q", io.EOF, err)
-	}
-}
-
-func TestHybiClientReadWithMasking(t *testing.T) {
-	wireData := []byte{0x81, 0x85, 0xcc, 0x55, 0x80, 0x20,
-		0xa4, 0x30, 0xec, 0x4c, 0xa3, // hello
-	}
-	br := bufio.NewReader(bytes.NewBuffer(wireData))
-	bw := bufio.NewWriter(bytes.NewBuffer([]byte{}))
-	conn := newHybiConn(newConfig(t, "/"), bufio.NewReadWriter(br, bw), nil, nil)
-
-	// client MUST close the connection upon receiving a masked frame.
-	msg := make([]byte, 512)
-	_, err := conn.Read(msg)
-	if err != io.EOF {
-		t.Errorf("read 1st frame, expect %q, but got %q", io.EOF, err)
-	}
-}
-
-// Test the hybiServerHandshaker supports firefox implementation and
-// checks Connection request header include (but it's not necessary
-// equal to) "upgrade"
-func TestHybiServerFirefoxHandshake(t *testing.T) {
-	config := new(Config)
-	handshaker := &hybiServerHandshaker{Config: config}
-	br := bufio.NewReader(strings.NewReader(`GET /chat HTTP/1.1
-Host: server.example.com
-Upgrade: websocket
-Connection: keep-alive, upgrade
-Sec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==
-Origin: http://example.com
-Sec-WebSocket-Protocol: chat, superchat
-Sec-WebSocket-Version: 13
-
-`))
-	req, err := http.ReadRequest(br)
-	if err != nil {
-		t.Fatal("request", err)
-	}
-	code, err := handshaker.ReadHandshake(br, req)
-	if err != nil {
-		t.Errorf("handshake failed: %v", err)
-	}
-	if code != http.StatusSwitchingProtocols {
-		t.Errorf("status expected %q but got %q", http.StatusSwitchingProtocols, code)
-	}
-	b := bytes.NewBuffer([]byte{})
-	bw := bufio.NewWriter(b)
-
-	config.Protocol = []string{"chat"}
-
-	err = handshaker.AcceptHandshake(bw)
-	if err != nil {
-		t.Errorf("handshake response failed: %v", err)
-	}
-	expectedResponse := strings.Join([]string{
-		"HTTP/1.1 101 Switching Protocols",
-		"Upgrade: websocket",
-		"Connection: Upgrade",
-		"Sec-WebSocket-Accept: s3pPLMBiTxaQ9kYGzzhZRbK+xOo=",
-		"Sec-WebSocket-Protocol: chat",
-		"", ""}, "\r\n")
-
-	if b.String() != expectedResponse {
-		t.Errorf("handshake expected %q but got %q", expectedResponse, b.String())
-	}
-}
diff --git a/Godeps/_workspace/src/golang.org/x/net/websocket/server.go b/Godeps/_workspace/src/golang.org/x/net/websocket/server.go
deleted file mode 100644
index 0895dea19..000000000
--- a/Godeps/_workspace/src/golang.org/x/net/websocket/server.go
+++ /dev/null
@@ -1,113 +0,0 @@
-// 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.
-
-package websocket
-
-import (
-	"bufio"
-	"fmt"
-	"io"
-	"net/http"
-)
-
-func newServerConn(rwc io.ReadWriteCloser, buf *bufio.ReadWriter, req *http.Request, config *Config, handshake func(*Config, *http.Request) error) (conn *Conn, err error) {
-	var hs serverHandshaker = &hybiServerHandshaker{Config: config}
-	code, err := hs.ReadHandshake(buf.Reader, req)
-	if err == ErrBadWebSocketVersion {
-		fmt.Fprintf(buf, "HTTP/1.1 %03d %s\r\n", code, http.StatusText(code))
-		fmt.Fprintf(buf, "Sec-WebSocket-Version: %s\r\n", SupportedProtocolVersion)
-		buf.WriteString("\r\n")
-		buf.WriteString(err.Error())
-		buf.Flush()
-		return
-	}
-	if err != nil {
-		fmt.Fprintf(buf, "HTTP/1.1 %03d %s\r\n", code, http.StatusText(code))
-		buf.WriteString("\r\n")
-		buf.WriteString(err.Error())
-		buf.Flush()
-		return
-	}
-	if handshake != nil {
-		err = handshake(config, req)
-		if err != nil {
-			code = http.StatusForbidden
-			fmt.Fprintf(buf, "HTTP/1.1 %03d %s\r\n", code, http.StatusText(code))
-			buf.WriteString("\r\n")
-			buf.Flush()
-			return
-		}
-	}
-	err = hs.AcceptHandshake(buf.Writer)
-	if err != nil {
-		code = http.StatusBadRequest
-		fmt.Fprintf(buf, "HTTP/1.1 %03d %s\r\n", code, http.StatusText(code))
-		buf.WriteString("\r\n")
-		buf.Flush()
-		return
-	}
-	conn = hs.NewServerConn(buf, rwc, req)
-	return
-}
-
-// Server represents a server of a WebSocket.
-type Server struct {
-	// Config is a WebSocket configuration for new WebSocket connection.
-	Config
-
-	// Handshake is an optional function in WebSocket handshake.
-	// For example, you can check, or don't check Origin header.
-	// Another example, you can select config.Protocol.
-	Handshake func(*Config, *http.Request) error
-
-	// Handler handles a WebSocket connection.
-	Handler
-}
-
-// ServeHTTP implements the http.Handler interface for a WebSocket
-func (s Server) ServeHTTP(w http.ResponseWriter, req *http.Request) {
-	s.serveWebSocket(w, req)
-}
-
-func (s Server) serveWebSocket(w http.ResponseWriter, req *http.Request) {
-	rwc, buf, err := w.(http.Hijacker).Hijack()
-	if err != nil {
-		panic("Hijack failed: " + err.Error())
-	}
-	// The server should abort the WebSocket connection if it finds
-	// the client did not send a handshake that matches with protocol
-	// specification.
-	defer rwc.Close()
-	conn, err := newServerConn(rwc, buf, req, &s.Config, s.Handshake)
-	if err != nil {
-		return
-	}
-	if conn == nil {
-		panic("unexpected nil conn")
-	}
-	s.Handler(conn)
-}
-
-// Handler is a simple interface to a WebSocket browser client.
-// It checks if Origin header is valid URL by default.
-// You might want to verify websocket.Conn.Config().Origin in the func.
-// If you use Server instead of Handler, you could call websocket.Origin and
-// check the origin in your Handshake func. So, if you want to accept
-// non-browser clients, which do not send an Origin header, set a
-// Server.Handshake that does not check the origin.
-type Handler func(*Conn)
-
-func checkOrigin(config *Config, req *http.Request) (err error) {
-	config.Origin, err = Origin(config, req)
-	if err == nil && config.Origin == nil {
-		return fmt.Errorf("null origin")
-	}
-	return err
-}
-
-// ServeHTTP implements the http.Handler interface for a WebSocket
-func (h Handler) ServeHTTP(w http.ResponseWriter, req *http.Request) {
-	s := Server{Handler: h, Handshake: checkOrigin}
-	s.serveWebSocket(w, req)
-}
diff --git a/Godeps/_workspace/src/golang.org/x/net/websocket/websocket.go b/Godeps/_workspace/src/golang.org/x/net/websocket/websocket.go
deleted file mode 100644
index 606840098..000000000
--- a/Godeps/_workspace/src/golang.org/x/net/websocket/websocket.go
+++ /dev/null
@@ -1,412 +0,0 @@
-// 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.
-
-// Package websocket implements a client and server for the WebSocket protocol
-// as specified in RFC 6455.
-package websocket // import "golang.org/x/net/websocket"
-
-import (
-	"bufio"
-	"crypto/tls"
-	"encoding/json"
-	"errors"
-	"io"
-	"io/ioutil"
-	"net"
-	"net/http"
-	"net/url"
-	"sync"
-	"time"
-)
-
-const (
-	ProtocolVersionHybi13    = 13
-	ProtocolVersionHybi      = ProtocolVersionHybi13
-	SupportedProtocolVersion = "13"
-
-	ContinuationFrame = 0
-	TextFrame         = 1
-	BinaryFrame       = 2
-	CloseFrame        = 8
-	PingFrame         = 9
-	PongFrame         = 10
-	UnknownFrame      = 255
-)
-
-// ProtocolError represents WebSocket protocol errors.
-type ProtocolError struct {
-	ErrorString string
-}
-
-func (err *ProtocolError) Error() string { return err.ErrorString }
-
-var (
-	ErrBadProtocolVersion   = &ProtocolError{"bad protocol version"}
-	ErrBadScheme            = &ProtocolError{"bad scheme"}
-	ErrBadStatus            = &ProtocolError{"bad status"}
-	ErrBadUpgrade           = &ProtocolError{"missing or bad upgrade"}
-	ErrBadWebSocketOrigin   = &ProtocolError{"missing or bad WebSocket-Origin"}
-	ErrBadWebSocketLocation = &ProtocolError{"missing or bad WebSocket-Location"}
-	ErrBadWebSocketProtocol = &ProtocolError{"missing or bad WebSocket-Protocol"}
-	ErrBadWebSocketVersion  = &ProtocolError{"missing or bad WebSocket Version"}
-	ErrChallengeResponse    = &ProtocolError{"mismatch challenge/response"}
-	ErrBadFrame             = &ProtocolError{"bad frame"}
-	ErrBadFrameBoundary     = &ProtocolError{"not on frame boundary"}
-	ErrNotWebSocket         = &ProtocolError{"not websocket protocol"}
-	ErrBadRequestMethod     = &ProtocolError{"bad method"}
-	ErrNotSupported         = &ProtocolError{"not supported"}
-)
-
-// Addr is an implementation of net.Addr for WebSocket.
-type Addr struct {
-	*url.URL
-}
-
-// Network returns the network type for a WebSocket, "websocket".
-func (addr *Addr) Network() string { return "websocket" }
-
-// Config is a WebSocket configuration
-type Config struct {
-	// A WebSocket server address.
-	Location *url.URL
-
-	// A Websocket client origin.
-	Origin *url.URL
-
-	// WebSocket subprotocols.
-	Protocol []string
-
-	// WebSocket protocol version.
-	Version int
-
-	// TLS config for secure WebSocket (wss).
-	TlsConfig *tls.Config
-
-	// Additional header fields to be sent in WebSocket opening handshake.
-	Header http.Header
-
-	handshakeData map[string]string
-}
-
-// serverHandshaker is an interface to handle WebSocket server side handshake.
-type serverHandshaker interface {
-	// ReadHandshake reads handshake request message from client.
-	// Returns http response code and error if any.
-	ReadHandshake(buf *bufio.Reader, req *http.Request) (code int, err error)
-
-	// AcceptHandshake accepts the client handshake request and sends
-	// handshake response back to client.
-	AcceptHandshake(buf *bufio.Writer) (err error)
-
-	// NewServerConn creates a new WebSocket connection.
-	NewServerConn(buf *bufio.ReadWriter, rwc io.ReadWriteCloser, request *http.Request) (conn *Conn)
-}
-
-// frameReader is an interface to read a WebSocket frame.
-type frameReader interface {
-	// Reader is to read payload of the frame.
-	io.Reader
-
-	// PayloadType returns payload type.
-	PayloadType() byte
-
-	// HeaderReader returns a reader to read header of the frame.
-	HeaderReader() io.Reader
-
-	// TrailerReader returns a reader to read trailer of the frame.
-	// If it returns nil, there is no trailer in the frame.
-	TrailerReader() io.Reader
-
-	// Len returns total length of the frame, including header and trailer.
-	Len() int
-}
-
-// frameReaderFactory is an interface to creates new frame reader.
-type frameReaderFactory interface {
-	NewFrameReader() (r frameReader, err error)
-}
-
-// frameWriter is an interface to write a WebSocket frame.
-type frameWriter interface {
-	// Writer is to write payload of the frame.
-	io.WriteCloser
-}
-
-// frameWriterFactory is an interface to create new frame writer.
-type frameWriterFactory interface {
-	NewFrameWriter(payloadType byte) (w frameWriter, err error)
-}
-
-type frameHandler interface {
-	HandleFrame(frame frameReader) (r frameReader, err error)
-	WriteClose(status int) (err error)
-}
-
-// Conn represents a WebSocket connection.
-type Conn struct {
-	config  *Config
-	request *http.Request
-
-	buf *bufio.ReadWriter
-	rwc io.ReadWriteCloser
-
-	rio sync.Mutex
-	frameReaderFactory
-	frameReader
-
-	wio sync.Mutex
-	frameWriterFactory
-
-	frameHandler
-	PayloadType        byte
-	defaultCloseStatus int
-}
-
-// Read implements the io.Reader interface:
-// it reads data of a frame from the WebSocket connection.
-// if msg is not large enough for the frame data, it fills the msg and next Read
-// will read the rest of the frame data.
-// it reads Text frame or Binary frame.
-func (ws *Conn) Read(msg []byte) (n int, err error) {
-	ws.rio.Lock()
-	defer ws.rio.Unlock()
-again:
-	if ws.frameReader == nil {
-		frame, err := ws.frameReaderFactory.NewFrameReader()
-		if err != nil {
-			return 0, err
-		}
-		ws.frameReader, err = ws.frameHandler.HandleFrame(frame)
-		if err != nil {
-			return 0, err
-		}
-		if ws.frameReader == nil {
-			goto again
-		}
-	}
-	n, err = ws.frameReader.Read(msg)
-	if err == io.EOF {
-		if trailer := ws.frameReader.TrailerReader(); trailer != nil {
-			io.Copy(ioutil.Discard, trailer)
-		}
-		ws.frameReader = nil
-		goto again
-	}
-	return n, err
-}
-
-// Write implements the io.Writer interface:
-// it writes data as a frame to the WebSocket connection.
-func (ws *Conn) Write(msg []byte) (n int, err error) {
-	ws.wio.Lock()
-	defer ws.wio.Unlock()
-	w, err := ws.frameWriterFactory.NewFrameWriter(ws.PayloadType)
-	if err != nil {
-		return 0, err
-	}
-	n, err = w.Write(msg)
-	w.Close()
-	if err != nil {
-		return n, err
-	}
-	return n, err
-}
-
-// Close implements the io.Closer interface.
-func (ws *Conn) Close() error {
-	err := ws.frameHandler.WriteClose(ws.defaultCloseStatus)
-	err1 := ws.rwc.Close()
-	if err != nil {
-		return err
-	}
-	return err1
-}
-
-func (ws *Conn) IsClientConn() bool { return ws.request == nil }
-func (ws *Conn) IsServerConn() bool { return ws.request != nil }
-
-// LocalAddr returns the WebSocket Origin for the connection for client, or
-// the WebSocket location for server.
-func (ws *Conn) LocalAddr() net.Addr {
-	if ws.IsClientConn() {
-		return &Addr{ws.config.Origin}
-	}
-	return &Addr{ws.config.Location}
-}
-
-// RemoteAddr returns the WebSocket location for the connection for client, or
-// the Websocket Origin for server.
-func (ws *Conn) RemoteAddr() net.Addr {
-	if ws.IsClientConn() {
-		return &Addr{ws.config.Location}
-	}
-	return &Addr{ws.config.Origin}
-}
-
-var errSetDeadline = errors.New("websocket: cannot set deadline: not using a net.Conn")
-
-// SetDeadline sets the connection's network read & write deadlines.
-func (ws *Conn) SetDeadline(t time.Time) error {
-	if conn, ok := ws.rwc.(net.Conn); ok {
-		return conn.SetDeadline(t)
-	}
-	return errSetDeadline
-}
-
-// SetReadDeadline sets the connection's network read deadline.
-func (ws *Conn) SetReadDeadline(t time.Time) error {
-	if conn, ok := ws.rwc.(net.Conn); ok {
-		return conn.SetReadDeadline(t)
-	}
-	return errSetDeadline
-}
-
-// SetWriteDeadline sets the connection's network write deadline.
-func (ws *Conn) SetWriteDeadline(t time.Time) error {
-	if conn, ok := ws.rwc.(net.Conn); ok {
-		return conn.SetWriteDeadline(t)
-	}
-	return errSetDeadline
-}
-
-// Config returns the WebSocket config.
-func (ws *Conn) Config() *Config { return ws.config }
-
-// Request returns the http request upgraded to the WebSocket.
-// It is nil for client side.
-func (ws *Conn) Request() *http.Request { return ws.request }
-
-// Codec represents a symmetric pair of functions that implement a codec.
-type Codec struct {
-	Marshal   func(v interface{}) (data []byte, payloadType byte, err error)
-	Unmarshal func(data []byte, payloadType byte, v interface{}) (err error)
-}
-
-// Send sends v marshaled by cd.Marshal as single frame to ws.
-func (cd Codec) Send(ws *Conn, v interface{}) (err error) {
-	data, payloadType, err := cd.Marshal(v)
-	if err != nil {
-		return err
-	}
-	ws.wio.Lock()
-	defer ws.wio.Unlock()
-	w, err := ws.frameWriterFactory.NewFrameWriter(payloadType)
-	if err != nil {
-		return err
-	}
-	_, err = w.Write(data)
-	w.Close()
-	return err
-}
-
-// Receive receives single frame from ws, unmarshaled by cd.Unmarshal and stores in v.
-func (cd Codec) Receive(ws *Conn, v interface{}) (err error) {
-	ws.rio.Lock()
-	defer ws.rio.Unlock()
-	if ws.frameReader != nil {
-		_, err = io.Copy(ioutil.Discard, ws.frameReader)
-		if err != nil {
-			return err
-		}
-		ws.frameReader = nil
-	}
-again:
-	frame, err := ws.frameReaderFactory.NewFrameReader()
-	if err != nil {
-		return err
-	}
-	frame, err = ws.frameHandler.HandleFrame(frame)
-	if err != nil {
-		return err
-	}
-	if frame == nil {
-		goto again
-	}
-	payloadType := frame.PayloadType()
-	data, err := ioutil.ReadAll(frame)
-	if err != nil {
-		return err
-	}
-	return cd.Unmarshal(data, payloadType, v)
-}
-
-func marshal(v interface{}) (msg []byte, payloadType byte, err error) {
-	switch data := v.(type) {
-	case string:
-		return []byte(data), TextFrame, nil
-	case []byte:
-		return data, BinaryFrame, nil
-	}
-	return nil, UnknownFrame, ErrNotSupported
-}
-
-func unmarshal(msg []byte, payloadType byte, v interface{}) (err error) {
-	switch data := v.(type) {
-	case *string:
-		*data = string(msg)
-		return nil
-	case *[]byte:
-		*data = msg
-		return nil
-	}
-	return ErrNotSupported
-}
-
-/*
-Message is a codec to send/receive text/binary data in a frame on WebSocket connection.
-To send/receive text frame, use string type.
-To send/receive binary frame, use []byte type.
-
-Trivial usage:
-
-	import "websocket"
-
-	// receive text frame
-	var message string
-	websocket.Message.Receive(ws, &message)
-
-	// send text frame
-	message = "hello"
-	websocket.Message.Send(ws, message)
-
-	// receive binary frame
-	var data []byte
-	websocket.Message.Receive(ws, &data)
-
-	// send binary frame
-	data = []byte{0, 1, 2}
-	websocket.Message.Send(ws, data)
-
-*/
-var Message = Codec{marshal, unmarshal}
-
-func jsonMarshal(v interface{}) (msg []byte, payloadType byte, err error) {
-	msg, err = json.Marshal(v)
-	return msg, TextFrame, err
-}
-
-func jsonUnmarshal(msg []byte, payloadType byte, v interface{}) (err error) {
-	return json.Unmarshal(msg, v)
-}
-
-/*
-JSON is a codec to send/receive JSON data in a frame from a WebSocket connection.
-
-Trivial usage:
-
-	import "websocket"
-
-	type T struct {
-		Msg string
-		Count int
-	}
-
-	// receive JSON type T
-	var data T
-	websocket.JSON.Receive(ws, &data)
-
-	// send JSON type T
-	websocket.JSON.Send(ws, data)
-*/
-var JSON = Codec{jsonMarshal, jsonUnmarshal}
diff --git a/Godeps/_workspace/src/golang.org/x/net/websocket/websocket_test.go b/Godeps/_workspace/src/golang.org/x/net/websocket/websocket_test.go
deleted file mode 100644
index 05b7e5356..000000000
--- a/Godeps/_workspace/src/golang.org/x/net/websocket/websocket_test.go
+++ /dev/null
@@ -1,587 +0,0 @@
-// 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.
-
-package websocket
-
-import (
-	"bytes"
-	"fmt"
-	"io"
-	"log"
-	"net"
-	"net/http"
-	"net/http/httptest"
-	"net/url"
-	"reflect"
-	"runtime"
-	"strings"
-	"sync"
-	"testing"
-	"time"
-)
-
-var serverAddr string
-var once sync.Once
-
-func echoServer(ws *Conn) {
-	defer ws.Close()
-	io.Copy(ws, ws)
-}
-
-type Count struct {
-	S string
-	N int
-}
-
-func countServer(ws *Conn) {
-	defer ws.Close()
-	for {
-		var count Count
-		err := JSON.Receive(ws, &count)
-		if err != nil {
-			return
-		}
-		count.N++
-		count.S = strings.Repeat(count.S, count.N)
-		err = JSON.Send(ws, count)
-		if err != nil {
-			return
-		}
-	}
-}
-
-type testCtrlAndDataHandler struct {
-	hybiFrameHandler
-}
-
-func (h *testCtrlAndDataHandler) WritePing(b []byte) (int, error) {
-	h.hybiFrameHandler.conn.wio.Lock()
-	defer h.hybiFrameHandler.conn.wio.Unlock()
-	w, err := h.hybiFrameHandler.conn.frameWriterFactory.NewFrameWriter(PingFrame)
-	if err != nil {
-		return 0, err
-	}
-	n, err := w.Write(b)
-	w.Close()
-	return n, err
-}
-
-func ctrlAndDataServer(ws *Conn) {
-	defer ws.Close()
-	h := &testCtrlAndDataHandler{hybiFrameHandler: hybiFrameHandler{conn: ws}}
-	ws.frameHandler = h
-
-	go func() {
-		for i := 0; ; i++ {
-			var b []byte
-			if i%2 != 0 { // with or without payload
-				b = []byte(fmt.Sprintf("#%d-CONTROL-FRAME-FROM-SERVER", i))
-			}
-			if _, err := h.WritePing(b); err != nil {
-				break
-			}
-			if _, err := h.WritePong(b); err != nil { // unsolicited pong
-				break
-			}
-			time.Sleep(10 * time.Millisecond)
-		}
-	}()
-
-	b := make([]byte, 128)
-	for {
-		n, err := ws.Read(b)
-		if err != nil {
-			break
-		}
-		if _, err := ws.Write(b[:n]); err != nil {
-			break
-		}
-	}
-}
-
-func subProtocolHandshake(config *Config, req *http.Request) error {
-	for _, proto := range config.Protocol {
-		if proto == "chat" {
-			config.Protocol = []string{proto}
-			return nil
-		}
-	}
-	return ErrBadWebSocketProtocol
-}
-
-func subProtoServer(ws *Conn) {
-	for _, proto := range ws.Config().Protocol {
-		io.WriteString(ws, proto)
-	}
-}
-
-func startServer() {
-	http.Handle("/echo", Handler(echoServer))
-	http.Handle("/count", Handler(countServer))
-	http.Handle("/ctrldata", Handler(ctrlAndDataServer))
-	subproto := Server{
-		Handshake: subProtocolHandshake,
-		Handler:   Handler(subProtoServer),
-	}
-	http.Handle("/subproto", subproto)
-	server := httptest.NewServer(nil)
-	serverAddr = server.Listener.Addr().String()
-	log.Print("Test WebSocket server listening on ", serverAddr)
-}
-
-func newConfig(t *testing.T, path string) *Config {
-	config, _ := NewConfig(fmt.Sprintf("ws://%s%s", serverAddr, path), "http://localhost")
-	return config
-}
-
-func TestEcho(t *testing.T) {
-	once.Do(startServer)
-
-	// websocket.Dial()
-	client, err := net.Dial("tcp", serverAddr)
-	if err != nil {
-		t.Fatal("dialing", err)
-	}
-	conn, err := NewClient(newConfig(t, "/echo"), client)
-	if err != nil {
-		t.Errorf("WebSocket handshake error: %v", err)
-		return
-	}
-
-	msg := []byte("hello, world\n")
-	if _, err := conn.Write(msg); err != nil {
-		t.Errorf("Write: %v", err)
-	}
-	var actual_msg = make([]byte, 512)
-	n, err := conn.Read(actual_msg)
-	if err != nil {
-		t.Errorf("Read: %v", err)
-	}
-	actual_msg = actual_msg[0:n]
-	if !bytes.Equal(msg, actual_msg) {
-		t.Errorf("Echo: expected %q got %q", msg, actual_msg)
-	}
-	conn.Close()
-}
-
-func TestAddr(t *testing.T) {
-	once.Do(startServer)
-
-	// websocket.Dial()
-	client, err := net.Dial("tcp", serverAddr)
-	if err != nil {
-		t.Fatal("dialing", err)
-	}
-	conn, err := NewClient(newConfig(t, "/echo"), client)
-	if err != nil {
-		t.Errorf("WebSocket handshake error: %v", err)
-		return
-	}
-
-	ra := conn.RemoteAddr().String()
-	if !strings.HasPrefix(ra, "ws://") || !strings.HasSuffix(ra, "/echo") {
-		t.Errorf("Bad remote addr: %v", ra)
-	}
-	la := conn.LocalAddr().String()
-	if !strings.HasPrefix(la, "http://") {
-		t.Errorf("Bad local addr: %v", la)
-	}
-	conn.Close()
-}
-
-func TestCount(t *testing.T) {
-	once.Do(startServer)
-
-	// websocket.Dial()
-	client, err := net.Dial("tcp", serverAddr)
-	if err != nil {
-		t.Fatal("dialing", err)
-	}
-	conn, err := NewClient(newConfig(t, "/count"), client)
-	if err != nil {
-		t.Errorf("WebSocket handshake error: %v", err)
-		return
-	}
-
-	var count Count
-	count.S = "hello"
-	if err := JSON.Send(conn, count); err != nil {
-		t.Errorf("Write: %v", err)
-	}
-	if err := JSON.Receive(conn, &count); err != nil {
-		t.Errorf("Read: %v", err)
-	}
-	if count.N != 1 {
-		t.Errorf("count: expected %d got %d", 1, count.N)
-	}
-	if count.S != "hello" {
-		t.Errorf("count: expected %q got %q", "hello", count.S)
-	}
-	if err := JSON.Send(conn, count); err != nil {
-		t.Errorf("Write: %v", err)
-	}
-	if err := JSON.Receive(conn, &count); err != nil {
-		t.Errorf("Read: %v", err)
-	}
-	if count.N != 2 {
-		t.Errorf("count: expected %d got %d", 2, count.N)
-	}
-	if count.S != "hellohello" {
-		t.Errorf("count: expected %q got %q", "hellohello", count.S)
-	}
-	conn.Close()
-}
-
-func TestWithQuery(t *testing.T) {
-	once.Do(startServer)
-
-	client, err := net.Dial("tcp", serverAddr)
-	if err != nil {
-		t.Fatal("dialing", err)
-	}
-
-	config := newConfig(t, "/echo")
-	config.Location, err = url.ParseRequestURI(fmt.Sprintf("ws://%s/echo?q=v", serverAddr))
-	if err != nil {
-		t.Fatal("location url", err)
-	}
-
-	ws, err := NewClient(config, client)
-	if err != nil {
-		t.Errorf("WebSocket handshake: %v", err)
-		return
-	}
-	ws.Close()
-}
-
-func testWithProtocol(t *testing.T, subproto []string) (string, error) {
-	once.Do(startServer)
-
-	client, err := net.Dial("tcp", serverAddr)
-	if err != nil {
-		t.Fatal("dialing", err)
-	}
-
-	config := newConfig(t, "/subproto")
-	config.Protocol = subproto
-
-	ws, err := NewClient(config, client)
-	if err != nil {
-		return "", err
-	}
-	msg := make([]byte, 16)
-	n, err := ws.Read(msg)
-	if err != nil {
-		return "", err
-	}
-	ws.Close()
-	return string(msg[:n]), nil
-}
-
-func TestWithProtocol(t *testing.T) {
-	proto, err := testWithProtocol(t, []string{"chat"})
-	if err != nil {
-		t.Errorf("SubProto: unexpected error: %v", err)
-	}
-	if proto != "chat" {
-		t.Errorf("SubProto: expected %q, got %q", "chat", proto)
-	}
-}
-
-func TestWithTwoProtocol(t *testing.T) {
-	proto, err := testWithProtocol(t, []string{"test", "chat"})
-	if err != nil {
-		t.Errorf("SubProto: unexpected error: %v", err)
-	}
-	if proto != "chat" {
-		t.Errorf("SubProto: expected %q, got %q", "chat", proto)
-	}
-}
-
-func TestWithBadProtocol(t *testing.T) {
-	_, err := testWithProtocol(t, []string{"test"})
-	if err != ErrBadStatus {
-		t.Errorf("SubProto: expected %v, got %v", ErrBadStatus, err)
-	}
-}
-
-func TestHTTP(t *testing.T) {
-	once.Do(startServer)
-
-	// If the client did not send a handshake that matches the protocol
-	// specification, the server MUST return an HTTP response with an
-	// appropriate error code (such as 400 Bad Request)
-	resp, err := http.Get(fmt.Sprintf("http://%s/echo", serverAddr))
-	if err != nil {
-		t.Errorf("Get: error %#v", err)
-		return
-	}
-	if resp == nil {
-		t.Error("Get: resp is null")
-		return
-	}
-	if resp.StatusCode != http.StatusBadRequest {
-		t.Errorf("Get: expected %q got %q", http.StatusBadRequest, resp.StatusCode)
-	}
-}
-
-func TestTrailingSpaces(t *testing.T) {
-	// http://code.google.com/p/go/issues/detail?id=955
-	// The last runs of this create keys with trailing spaces that should not be
-	// generated by the client.
-	once.Do(startServer)
-	config := newConfig(t, "/echo")
-	for i := 0; i < 30; i++ {
-		// body
-		ws, err := DialConfig(config)
-		if err != nil {
-			t.Errorf("Dial #%d failed: %v", i, err)
-			break
-		}
-		ws.Close()
-	}
-}
-
-func TestDialConfigBadVersion(t *testing.T) {
-	once.Do(startServer)
-	config := newConfig(t, "/echo")
-	config.Version = 1234
-
-	_, err := DialConfig(config)
-
-	if dialerr, ok := err.(*DialError); ok {
-		if dialerr.Err != ErrBadProtocolVersion {
-			t.Errorf("dial expected err %q but got %q", ErrBadProtocolVersion, dialerr.Err)
-		}
-	}
-}
-
-func TestSmallBuffer(t *testing.T) {
-	// http://code.google.com/p/go/issues/detail?id=1145
-	// Read should be able to handle reading a fragment of a frame.
-	once.Do(startServer)
-
-	// websocket.Dial()
-	client, err := net.Dial("tcp", serverAddr)
-	if err != nil {
-		t.Fatal("dialing", err)
-	}
-	conn, err := NewClient(newConfig(t, "/echo"), client)
-	if err != nil {
-		t.Errorf("WebSocket handshake error: %v", err)
-		return
-	}
-
-	msg := []byte("hello, world\n")
-	if _, err := conn.Write(msg); err != nil {
-		t.Errorf("Write: %v", err)
-	}
-	var small_msg = make([]byte, 8)
-	n, err := conn.Read(small_msg)
-	if err != nil {
-		t.Errorf("Read: %v", err)
-	}
-	if !bytes.Equal(msg[:len(small_msg)], small_msg) {
-		t.Errorf("Echo: expected %q got %q", msg[:len(small_msg)], small_msg)
-	}
-	var second_msg = make([]byte, len(msg))
-	n, err = conn.Read(second_msg)
-	if err != nil {
-		t.Errorf("Read: %v", err)
-	}
-	second_msg = second_msg[0:n]
-	if !bytes.Equal(msg[len(small_msg):], second_msg) {
-		t.Errorf("Echo: expected %q got %q", msg[len(small_msg):], second_msg)
-	}
-	conn.Close()
-}
-
-var parseAuthorityTests = []struct {
-	in  *url.URL
-	out string
-}{
-	{
-		&url.URL{
-			Scheme: "ws",
-			Host:   "www.google.com",
-		},
-		"www.google.com:80",
-	},
-	{
-		&url.URL{
-			Scheme: "wss",
-			Host:   "www.google.com",
-		},
-		"www.google.com:443",
-	},
-	{
-		&url.URL{
-			Scheme: "ws",
-			Host:   "www.google.com:80",
-		},
-		"www.google.com:80",
-	},
-	{
-		&url.URL{
-			Scheme: "wss",
-			Host:   "www.google.com:443",
-		},
-		"www.google.com:443",
-	},
-	// some invalid ones for parseAuthority. parseAuthority doesn't
-	// concern itself with the scheme unless it actually knows about it
-	{
-		&url.URL{
-			Scheme: "http",
-			Host:   "www.google.com",
-		},
-		"www.google.com",
-	},
-	{
-		&url.URL{
-			Scheme: "http",
-			Host:   "www.google.com:80",
-		},
-		"www.google.com:80",
-	},
-	{
-		&url.URL{
-			Scheme: "asdf",
-			Host:   "127.0.0.1",
-		},
-		"127.0.0.1",
-	},
-	{
-		&url.URL{
-			Scheme: "asdf",
-			Host:   "www.google.com",
-		},
-		"www.google.com",
-	},
-}
-
-func TestParseAuthority(t *testing.T) {
-	for _, tt := range parseAuthorityTests {
-		out := parseAuthority(tt.in)
-		if out != tt.out {
-			t.Errorf("got %v; want %v", out, tt.out)
-		}
-	}
-}
-
-type closerConn struct {
-	net.Conn
-	closed int // count of the number of times Close was called
-}
-
-func (c *closerConn) Close() error {
-	c.closed++
-	return c.Conn.Close()
-}
-
-func TestClose(t *testing.T) {
-	if runtime.GOOS == "plan9" {
-		t.Skip("see golang.org/issue/11454")
-	}
-
-	once.Do(startServer)
-
-	conn, err := net.Dial("tcp", serverAddr)
-	if err != nil {
-		t.Fatal("dialing", err)
-	}
-
-	cc := closerConn{Conn: conn}
-
-	client, err := NewClient(newConfig(t, "/echo"), &cc)
-	if err != nil {
-		t.Fatalf("WebSocket handshake: %v", err)
-	}
-
-	// set the deadline to ten minutes ago, which will have expired by the time
-	// client.Close sends the close status frame.
-	conn.SetDeadline(time.Now().Add(-10 * time.Minute))
-
-	if err := client.Close(); err == nil {
-		t.Errorf("ws.Close(): expected error, got %v", err)
-	}
-	if cc.closed < 1 {
-		t.Fatalf("ws.Close(): expected underlying ws.rwc.Close to be called > 0 times, got: %v", cc.closed)
-	}
-}
-
-var originTests = []struct {
-	req    *http.Request
-	origin *url.URL
-}{
-	{
-		req: &http.Request{
-			Header: http.Header{
-				"Origin": []string{"http://www.example.com"},
-			},
-		},
-		origin: &url.URL{
-			Scheme: "http",
-			Host:   "www.example.com",
-		},
-	},
-	{
-		req: &http.Request{},
-	},
-}
-
-func TestOrigin(t *testing.T) {
-	conf := newConfig(t, "/echo")
-	conf.Version = ProtocolVersionHybi13
-	for i, tt := range originTests {
-		origin, err := Origin(conf, tt.req)
-		if err != nil {
-			t.Error(err)
-			continue
-		}
-		if !reflect.DeepEqual(origin, tt.origin) {
-			t.Errorf("#%d: got origin %v; want %v", i, origin, tt.origin)
-			continue
-		}
-	}
-}
-
-func TestCtrlAndData(t *testing.T) {
-	once.Do(startServer)
-
-	c, err := net.Dial("tcp", serverAddr)
-	if err != nil {
-		t.Fatal(err)
-	}
-	ws, err := NewClient(newConfig(t, "/ctrldata"), c)
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer ws.Close()
-
-	h := &testCtrlAndDataHandler{hybiFrameHandler: hybiFrameHandler{conn: ws}}
-	ws.frameHandler = h
-
-	b := make([]byte, 128)
-	for i := 0; i < 2; i++ {
-		data := []byte(fmt.Sprintf("#%d-DATA-FRAME-FROM-CLIENT", i))
-		if _, err := ws.Write(data); err != nil {
-			t.Fatalf("#%d: %v", i, err)
-		}
-		var ctrl []byte
-		if i%2 != 0 { // with or without payload
-			ctrl = []byte(fmt.Sprintf("#%d-CONTROL-FRAME-FROM-CLIENT", i))
-		}
-		if _, err := h.WritePing(ctrl); err != nil {
-			t.Fatalf("#%d: %v", i, err)
-		}
-		n, err := ws.Read(b)
-		if err != nil {
-			t.Fatalf("#%d: %v", i, err)
-		}
-		if !bytes.Equal(b[:n], data) {
-			t.Fatalf("#%d: got %v; want %v", i, b[:n], data)
-		}
-	}
-}
diff --git a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/.gitignore b/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/.gitignore
deleted file mode 100644
index 125f317e4..000000000
--- a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/.gitignore
+++ /dev/null
@@ -1,27 +0,0 @@
-# Compiled Object files, Static and Dynamic libs (Shared Objects)
-*.o
-*.a
-*.so
-
-#vim
-*.swp
-*.swo
-
-# 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
-.wercker
diff --git a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/.travis.yml b/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/.travis.yml
deleted file mode 100644
index 67d790927..000000000
--- a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/.travis.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-language: go
-
-gobuild_args: -tags='cluster'
-
-go:
-  - 1.4
-  - tip
-
-cache: apt
-
-before_script:
-  - source /etc/lsb-release && echo "deb http://download.rethinkdb.com/apt $DISTRIB_CODENAME main" | sudo tee /etc/apt/sources.list.d/rethinkdb.list
-  - wget -qO- http://download.rethinkdb.com/apt/pubkey.gpg | sudo apt-key add -
-  - sudo apt-get update
-  - sudo apt-get install rethinkdb
-  - rethinkdb > /dev/null 2>&1 &
-  - rethinkdb --port-offset 1 --directory rethinkdb_data1 --join localhost:29016 > /dev/null 2>&1 &
-  - rethinkdb --port-offset 2 --directory rethinkdb_data2 --join localhost:29016 > /dev/null 2>&1 &
-  - rethinkdb --port-offset 3 --directory rethinkdb_data3 --join localhost:29016 > /dev/null 2>&1 &
diff --git a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/CHANGELOG.md b/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/CHANGELOG.md
deleted file mode 100644
index ad527fa79..000000000
--- a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/CHANGELOG.md
+++ /dev/null
@@ -1,230 +0,0 @@
-# Change Log
-All notable changes to this project will be documented in this file.
-This project adheres to [Semantic Versioning](http://semver.org/).
-
-## v1.0.0 - 2015-06-27
-
-1.0.0 is finally here, This is the first stable production ready release of GoRethink!
-
-![GoRethink Logo](https://raw.github.com/wiki/dancannon/gorethink/gopher-and-thinker.png "Golang Gopher and RethinkDB Thinker")
-
-In an attempt to make this library more "idiomatic" some functions have been renamed, for the full list of changes and bug fixes see below.
-
-### Added
- - Added more documentation.
- - Added `Shards`, `Replicas` and `PrimaryReplicaTag` optional arguments in `TableCreateOpts`.
- - Added `MultiGroup` and `MultiGroupByIndex` which are equivalent to the running `group` with the `multi` optional argument set to true.
-
-### Changed 
- - Renamed `Db` to `DB`.
- - Renamed `DbCreate` to `DBCreate`.
- - Renamed `DbDrop` to `DBDrop`.
- - Renamed `RqlConnectionError` to `RQLConnectionError`.
- - Renamed `RqlDriverError` to `RQLDriverError`.
- - Renamed `RqlClientError` to `RQLClientError`.
- - Renamed `RqlRuntimeError` to `RQLRuntimeError`.
- - Renamed `RqlCompileError` to `RQLCompileError`.
- - Renamed `Js` to `JS`.
- - Renamed `Json` to `JSON`.
- - Renamed `Http` to `HTTP`.
- - Renamed `GeoJson` to `GeoJSON`.
- - Renamed `ToGeoJson` to `ToGeoJSON`.
- - Renamed `WriteChanges` to `ChangeResponse`, this is now a general type and can be used when dealing with changefeeds.
- - Removed depth limit when encoding values using `Expr`
-
-### Fixed
- - Fixed issue causing errors when closing a changefeed cursor (#191)
- - Fixed issue causing nodes to remain unhealthy when host discovery is disabled (#195)
- - Fixed issue causing driver to fail when connecting to DB which did not have its canonical address set correctly (#200).
-- Fixed ongoing queries not being properly stopped when closing the cursor.
-
-### Removed
- - Removed `CacheSize` and `DataCenter` optional arguments in `TableCreateOpts`.
- - Removed `CacheSize` optional argument from `InsertOpts`
-
-## v0.7.2 - 2015-05-05
-### Added
- - Added support for connecting to a server using TLS (#179)
-
-### Fixed
- - Fixed issue causing driver to fail to connect to servers with the HTTP admin interface disabled (#181)
- - Fixed errors in documentation (#182, #184)
- - Fixed RunWrite not closing the cursor (#185)
-
-## v0.7.1 - 2015-04-19
-### Changed
-- Improved logging of connection errors.
-
-### Fixed
-- Fixed bug causing empty times to be inserted into the DB even when the omitempty tag was set.
-- Fixed node status refresh loop leaking goroutines.
-
-## v0.7.0 - 2015-03-30
-
-This release includes support for RethinkDB 2.0 and connecting to clusters. To connect to a cluster you should use the new `Addresses` field in `ConnectOpts`, for example:
-
-```go
-session, err := r.Connect(r.ConnectOpts{
-    Addresses: []string{"localhost:28015", "localhost:28016"},
-})
-if err != nil {
-    log.Fatalln(err.Error())
-}
-```
-
-Also added was the ability to read from a cursor using a channel, this is especially useful when using changefeeds. For more information see this [gist](https://gist.github.com/dancannon/2865686d163ed78bbc3c)
-
-```go
-cursor, err := r.Table("items").Changes()
-ch := make(chan map[string]interface{})
-cursor.Listen(ch)
-```
-
-For more details checkout the [README](https://github.com/dancannon/gorethink/blob/master/README.md) and [godoc](https://godoc.org/github.com/dancannon/gorethink). As always if you have any further questions send me a message on [Gitter](https://gitter.im/dancannon/gorethink).
-
-- Added the ability to connect to multiple nodes, queries are then distributed between these nodes. If a node stops responding then queries stop being sent to this node.
-- Added the `DiscoverHosts` optional argument to `ConnectOpts`, when this value is `true` the driver will listen for new nodes added to the cluster.
-- Added the `Addresses` optional argument to `ConnectOpts`, this allows the driver to connect to multiple nodes in a cluster.
-- Added the `IncludeStates` optional argument to `Changes`.
-- Added `MinVal` and `MaxVal` which represent the smallest and largest possible values.
-- Added the `Listen` cursor helper function which publishes database results to a channel.
-- Added support for optional  arguments for the `Wait` function.
-- Added the `Type` function to the `Cursor`, by default this value will be "Cursor" unless using a changefeed.
-- Changed the `IndexesOf` function to `OffsetsOf` .
-- Changed driver to use the v0.4 protocol (used to use v0.3).
-- Fixed geometry tests not properly checking the expected results.
-- Fixed bug causing nil pointer panics when using an `Unmarshaler`
-- Fixed dropped millisecond precision if given value is too old
-
-## v0.6.3 - 2015-03-04
-### Added
-- Add `IdentifierFormat` optarg to `TableOpts` (#158)
-
-### Fixed
-- Fix struct alignment for ARM and x86-32 builds (#153)
-- Fix sprintf format for geometry error message (#157)
-- Fix duplicate if block (#159)
-- Fix incorrect assertion in decoder tests
-
-## v0.6.2 - 2015-02-15
-
-- Fixed `writeQuery` being too small when sending large queries
-
-## v0.6.1 - 2015-02-13
-
-- Reduce GC by using buffers when reading and writing
-- Fixed encoding `time.Time` ignoring millseconds
-- Fixed pointers in structs that implement the `Marshaler`/`Unmarshaler` interfaces being ignored
-
-## v0.6.0 - 2015-01-01
-
-There are some major changes to the driver with this release that are not related to the RethinkDB v1.16 release. Please have a read through them:
-- Improvements to result decoding by caching reflection calls.
-- Finished implementing the `Marshaler`/`Unmarshaler` interfaces
-- Connection pool overhauled. There were a couple of issues with connections in the previous releases so this release replaces the `fatih/pool` package with a connection pool based on the `database/sql` connection pool.
-- Another change is the removal of the prefetching mechanism as the connection+cursor logic was becoming quite complex and causing bugs, hopefully this will be added back in the near future but for now I am focusing my efforts on ensuring the driver is as stable as possible #130 #137
-- Due to the above change the API for connecting has changed slightly (The API is now closer to the `database/sql` API. `ConnectOpts` changes:
-  - `MaxActive` renamed to `MaxOpen`
-  - `IdleTimeout` renamed to `Timeout`
-- `Cursor`s are now only closed automatically when calling either `All` or `One`
-- `Exec` now takes `ExecOpts` instead of `RunOpts`. The only difference is that `Exec` has the `NoReply` field
-
-With that out the way here are the v1.16 changes:
-
-- Added `Range` which generates all numbers from a given range
-- Added an optional squash argument to the changes command, which lets the server combine multiple changes to the same document (defaults to true)
-- Added new admin functions (`Config`, `Rebalance`, `Reconfigure`, `Status`, `Wait`)
-- Added support for `SUCCESS_ATOM_FEED`
-- Added `MinIndex` + `MaxInde`x functions
-- Added `ToJSON` function
-- Updated `WriteResponse` type
-
-Since this release has a lot of changes and although I have tested these changes sometimes things fall through the gaps. If you discover any bugs please let me know and I will try to fix them as soon as possible.
-
-## v.0.5.1 - 2014-12-14
-
-- Fixed empty slices being returned as `[]T(nil)` not `[]T{}` #138
-
-## v0.5.0 - 2014-10-06
-
-- Added geospatial terms (`Circle`, `Distance`, `Fill`, `Geojson`, `ToGeojson`, `GetIntersecting`, `GetNearest`, `Includes`, `Intersects`, `Line`, `Point`, `Polygon`, `PolygonSub`)
-- Added `UUID` term for generating unique IDs
-- Added `AtIndex` term, combines `Nth` and `GetField`
-- Added the `Geometry` type, see the types package
-- Updated the `BatchConf` field in `RunOpts`, now uses the `BatchOpts` type
-- Removed support for the `FieldMapper` interface
-
-Internal Changes
-
-- Fixed encoding performance issues, greatly improves writes/second
-- Updated `Next` to zero the destination value every time it is called.
-
-## v0.4.2 - 2014-09-06
-
-- Fixed issue causing `Close` to start an infinite loop
-- Tidied up connection closing logic
-
-## v0.4.1 - 2014-09-05
-
-- Fixed bug causing Pseudotypes to not be decoded properly (#117)
-- Updated github.com/fatih/pool to v2 (#118)
-
-## v0.4.0 - 2014-08-13
-
-- Updated the driver to support RethinkDB v1.14 (#116)
-- Added the Binary data type
-- Added the Binary command which takes a `[]byte` or `bytes.Buffer{}` as an argument.
-- Added the `BinaryFormat` optional argument to `RunOpts` 
-- Added the `GroupFormat` optional argument to `RunOpts` 
-- Added the `ArrayLimit` optional argument to `RunOpts` 
-- Renamed the `ReturnVals` optional argument to `ReturnChanges` 
-- Renamed the `Upsert` optional argument to `Conflict` 
-- Added the `IndexRename` command
-- Updated `Distinct` to now take the `Index` optional argument (using `DistinctOpts`)
-
-Internal Changes
-
-- Updated to use the new JSON protocol
-- Switched the connection pool code to use github.com/fatih/pool
-- Added some benchmarks
-
-## v0.3.2 - 2014-08-17
-
-- Fixed issue causing connections not to be closed correctly (#109)
-- Fixed issue causing terms in optional arguments to be encoded incorrectly (#114)
-
-## v0.3.1 - 2014-06-14
-
-- Fixed "Token ## not in stream cache" error (#103)
-- Changed Exec to no longer use NoReply. It now waits for the server to respond.
-
-## v0.3.0 - 2014-06-26
-
-- Replaced `ResultRows`/`ResultRow` with `Cursor`, `Cursor` has the `Next`, `All` and `One` methods which stores the relevant value in the value pointed at by result. For more information check the examples.
-- Changed the time constants (Days and Months) to package globals instead of functions
-- Added the `Args` term and changed the arguments for many terms to `args ...interface{}` to allow argument splicing
-- Added the `Changes` term and support for the feed response type
-- Added the `Random` term
-- Added the `Http` term
-- The second argument for `Slice` is now optional
-- `EqJoin` now accepts a function as its first argument
-- `Nth` now returns a selection
-
-## v0.2.0 - 2014-04-13
-
-* Changed `Connect` to use `ConnectOpts` instead of `map[string]interface{}`
-* Migrated to new `Group`/`Ungroup` functions, these replace `GroupedMapReduce` and `GroupBy`
-* Added new aggregators
-* Removed base parameter for `Reduce`
-* Added `Object` function
-* Added `Upcase`, `Downcase` and `Split` string functions
-* Added `GROUPED_DATA` pseudotype
-* Fixed query printing
-
-## v0.1.0 - 2013-11-27
-
-* Added noreply writes
-* Added the new terms `index_status`, `index_wait` and `sync`
-* Added the profile flag to the run functions
-* Optional arguments are now structs instead of key, pair strings. Almost all of the struct fields are of type interface{} as they can have terms inside them. For example: `r.TableCreateOpts{ PrimaryKey: r.Expr("index") }`
-* Returned arrays are now properly loaded into ResultRows. In the past when running `r.Expr([]interface{}{1,2,3})` would require you to use `RunRow` followed by `Scan`. You can now use `Run` followed by `ScanAll`
diff --git a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/LICENSE b/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/LICENSE
deleted file mode 100644
index dd64ae290..000000000
--- a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/LICENSE
+++ /dev/null
@@ -1,191 +0,0 @@
-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:
-
-You must give any other recipients of the Work or Derivative Works a copy of
-this License; and
-You must cause any modified files to carry prominent notices stating that You
-changed the files; and
-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
-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/gopkg.in/dancannon/gorethink.v1/README.md b/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/README.md
deleted file mode 100644
index 2098cd25d..000000000
--- a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/README.md
+++ /dev/null
@@ -1,270 +0,0 @@
-# GoRethink - RethinkDB Driver for Go 
-
-[![GitHub tag](https://img.shields.io/github/tag/dancannon/gorethink.svg?style=flat)](https://github.com/dancannon/gorethink/releases/tag/v1.0.0-rc.3)
-[![GoDoc](https://godoc.org/github.com/dancannon/gorethink?status.png)](https://godoc.org/github.com/dancannon/gorethink)
-[![build status](https://img.shields.io/travis/dancannon/gorethink/master.svg "build status")](https://travis-ci.org/dancannon/gorethink) 
-
-[Go](http://golang.org/) driver for [RethinkDB](http://www.rethinkdb.com/) 
-
-![GoRethink Logo](https://raw.github.com/wiki/dancannon/gorethink/gopher-and-thinker-s.png "Golang Gopher and RethinkDB Thinker")
-
-Current version: v1.0.0 (RethinkDB v2.0)
-
-Please note that this version of the driver only supports versions of RethinkDB using the v0.4 protocol (any versions of the driver older than RethinkDB 2.0 will not work).
-
-[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/dancannon/gorethink?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
-
-## Installation
-
-```sh
-go get -u github.com/dancannon/gorethink
-```
-
-Or (pinned to the v1.x.x tag)
-```
-go get gopkg.in/dancannon/gorethink.v1
-```
-
-## Connection
-
-### Basic Connection
-
-Setting up a basic connection with RethinkDB is simple:
-
-```go
-import (
-    r "github.com/dancannon/gorethink"
-)
-
-var session *r.Session
-
-session, err := r.Connect(r.ConnectOpts{
-    Address: "localhost:28015",
-})
-if err != nil {
-    log.Fatalln(err.Error())
-}
-
-```
-See the [documentation](http://godoc.org/github.com/dancannon/gorethink#Connect) for a list of supported arguments to Connect().
-
-### Connection Pool
-
-The driver uses a connection pool at all times, by default it creates and frees connections automatically. It's safe for concurrent use by multiple goroutines.
-
-To configure the connection pool `MaxIdle`, `MaxOpen` and `Timeout` can be specified during connection. If you wish to change the value of `MaxIdle` or `MaxOpen` during runtime then the functions `SetMaxIdleConns` and `SetMaxOpenConns` can be used.
-
-```go
-var session *r.Session
-
-session, err := r.Connect(r.ConnectOpts{
-    Address: "localhost:28015",
-    Database: "test",
-    MaxIdle: 10,
-    MaxOpen: 10,
-})
-if err != nil {
-    log.Fatalln(err.Error())
-}
-
-session.SetMaxOpenConns(5)
-```
-
-### Connect to a cluster
-
-To connect to a RethinkDB cluster which has multiple nodes you can use the following syntax. When connecting to a cluster with multiple nodes queries will be distributed between these nodes.
-
-```go
-var session *r.Session
-
-session, err := r.Connect(r.ConnectOpts{
-    Addresses: []string{"localhost:28015", "localhost:28016"},
-    Database: "test",
-    AuthKey:  "14daak1cad13dj",
-    DiscoverHosts: true,
-})
-if err != nil {
-    log.Fatalln(err.Error())
-}
-```
-
-When `DiscoverHosts` is true any nodes are added to the cluster after the initial connection then the new node will be added to the pool of available nodes used by GoRethink. Unfortunately the canonical address of each server in the cluster **MUST** be set as otherwise clients will try to connect to the database nodes locally. For more information about how to set a RethinkDB servers canonical address set this page http://www.rethinkdb.com/docs/config-file/.
-
-
-## Query Functions
-
-This library is based on the official drivers so the code on the [API](http://www.rethinkdb.com/api/) page should require very few changes to work.
-
-To view full documentation for the query functions check the [API reference](https://github.com/dancannon/gorethink/wiki/Go-ReQL-command-reference) or [GoDoc](http://godoc.org/github.com/dancannon/gorethink#Term)
-
-Slice Expr Example
-```go
-r.Expr([]interface{}{1, 2, 3, 4, 5}).Run(session)
-```
-Map Expr Example
-```go
-r.Expr(map[string]interface{}{"a": 1, "b": 2, "c": 3}).Run(session)
-```
-Get Example
-```go
-r.Db("database").Table("table").Get("GUID").Run(session)
-```
-Map Example (Func)
-```go
-r.Expr([]interface{}{1, 2, 3, 4, 5}).Map(func (row Term) interface{} {
-    return row.Add(1)
-}).Run(session)
-```
-Map Example (Implicit)
-```go
-r.Expr([]interface{}{1, 2, 3, 4, 5}).Map(r.Row.Add(1)).Run(session)
-```
-Between (Optional Args) Example
-```go
-r.Db("database").Table("table").Between(1, 10, r.BetweenOpts{
-    Index: "num",
-    RightBound: "closed",
-}).Run(session)
-```
-
-### Optional Arguments
-
-As shown above in the Between example optional arguments are passed to the function as a struct. Each function that has optional arguments as a related struct. This structs are named in the format FunctionNameOpts, for example BetweenOpts is the related struct for Between.
-
-## Results
-
-Different result types are returned depending on what function is used to execute the query.
-
-- `Run` returns a cursor which can be used to view all rows returned.
-- `RunWrite` returns a WriteResponse and should be used for queries such as Insert, Update, etc...
-- `Exec` sends a query to the server and closes the connection immediately after reading the response from the database. If you do not wish to wait for the response then you can set the `NoReply` flag.
-
-Example:
-
-```go
-res, err := r.Db("database").Table("tablename").Get(key).Run(session)
-if err != nil {
-    // error
-}
-defer res.Close() // Always ensure you close the cursor to ensure connections are not leaked
-```
-
-Cursors have a number of methods available for accessing the query results
-
-- `Next` retrieves the next document from the result set, blocking if necessary.
-- `All` retrieves all documents from the result set into the provided slice.
-- `One` retrieves the first document from the result set.
-
-Examples:
-
-```go
-var row interface{}
-for res.Next(&row) {
-    // Do something with row
-}
-if res.Err() != nil {
-    // error
-}
-```
-
-```go
-var rows []interface{}
-err := res.All(&rows)
-if err != nil {
-    // error
-}
-```
-
-```go
-var row interface{}
-err := res.One(&row)
-if err == r.ErrEmptyResult {
-    // row not found
-}
-if err != nil {
-    // error
-}
-```
-
-## Encoding/Decoding Structs
-When passing structs to Expr(And functions that use Expr such as Insert, Update) the structs are encoded into a map before being sent to the server. Each exported field is added to the map unless
-
-  - the field's tag is "-", or
-  - the field is empty and its tag specifies the "omitempty" option.
-
-Each fields default name in the map is the field name but can be specified in the struct field's tag value. The "gorethink" key in
-the struct field's tag value is the key name, followed by an optional comma
-and options. Examples:
-
-```go
-// Field is ignored by this package.
-Field int `gorethink:"-"`
-// Field appears as key "myName".
-Field int `gorethink:"myName"`
-// Field appears as key "myName" and
-// the field is omitted from the object if its value is empty,
-// as defined above.
-Field int `gorethink:"myName,omitempty"`
-// Field appears as key "Field" (the default), but
-// the field is skipped if empty.
-// Note the leading comma.
-Field int `gorethink:",omitempty"`
-```
-
-**NOTE:** It is strongly recommended that struct tags are used to explicitly define the mapping between your Go type and how the data is stored by RethinkDB. This is especially important when using an `Id` field as by default RethinkDB will create a field named `id` as the primary key (note that the RethinkDB field is lowercase but the Go version starts with a capital letter).
-
-## Benchmarks
-
-Everyone wants their project's benchmarks to be speedy. And while we know that rethinkDb and the gorethink driver are quite fast, our primary goal is for our benchmarks to be correct. They are designed to give you, the user, an accurate picture of writes per second (w/s). If you come up with a accurate test that meets this aim, submit a pull request please. 
-
-Thanks to @jaredfolkins for the contribution.
-
-| Type    |  Value   |
-| --- | --- |
-| **Model Name** | MacBook Pro |
-| **Model Identifier** | MacBookPro11,3 |
-| **Processor Name** | Intel Core i7 | 
-| **Processor Speed** | 2.3 GHz | 
-| **Number of Processors** | 1 |
-| **Total Number of Cores** | 4 |
-| **L2 Cache (per Core)** | 256 KB | 
-| **L3 Cache** | 6 MB | 
-| **Memory** | 16 GB |
-
-```bash
-BenchmarkBatch200RandomWrites                20                              557227775                     ns/op
-BenchmarkBatch200RandomWritesParallel10      30                              354465417                     ns/op
-BenchmarkBatch200SoftRandomWritesParallel10  100                             761639276                     ns/op
-BenchmarkRandomWrites                        100                             10456580                      ns/op
-BenchmarkRandomWritesParallel10              1000                            1614175                       ns/op
-BenchmarkRandomSoftWrites                    3000                            589660                        ns/op
-BenchmarkRandomSoftWritesParallel10          10000                           247588                        ns/op
-BenchmarkSequentialWrites                    50                              24408285                      ns/op
-BenchmarkSequentialWritesParallel10          1000                            1755373                       ns/op
-BenchmarkSequentialSoftWrites                3000                            631211                        ns/op
-BenchmarkSequentialSoftWritesParallel10      10000                           263481                        ns/op
-```
-
-## Examples
-
-Many functions have examples and are viewable in the godoc, alternatively view some more full features examples on the [wiki](https://github.com/dancannon/gorethink/wiki/Examples).
-
-## License
-
-Copyright 2013 Daniel Cannon
-
-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.
-
-## Donations
-
-[![Donations](https://pledgie.com/campaigns/29517.png "Donations")](https://pledgie.com/campaigns/29517) 
diff --git a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/benchmarks_test.go b/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/benchmarks_test.go
deleted file mode 100644
index e01ba0d02..000000000
--- a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/benchmarks_test.go
+++ /dev/null
@@ -1,284 +0,0 @@
-package gorethink
-
-import (
-	"math/rand"
-	"strconv"
-	"sync"
-	"testing"
-	"time"
-)
-
-func BenchmarkBatch200RandomWrites(b *testing.B) {
-
-	var term Term
-	var data []map[string]interface{}
-
-	for i := 0; i < b.N; i++ {
-
-		for is := 0; is < 200; is++ {
-			r := rand.New(rand.NewSource(time.Now().UnixNano()))
-			cid := map[string]interface{}{
-				"customer_id": strconv.FormatInt(r.Int63(), 10),
-			}
-			data = append(data, cid)
-		}
-
-		// Insert the new item into the database
-		term = DB("benchmarks").Table("benchmarks").Insert(data)
-
-		// Insert the new item into the database
-		_, err := term.RunWrite(session, RunOpts{
-			MinBatchRows: 200,
-			MaxBatchRows: 200,
-		})
-		if err != nil {
-			b.Errorf("insert failed [%s] ", err)
-		}
-	}
-
-}
-
-func BenchmarkBatch200RandomWritesParallel10(b *testing.B) {
-
-	var term Term
-	var data []map[string]interface{}
-
-	b.SetParallelism(10)
-
-	b.RunParallel(func(pb *testing.PB) {
-
-		for pb.Next() {
-			for is := 0; is < 200; is++ {
-				r := rand.New(rand.NewSource(time.Now().UnixNano()))
-				cid := map[string]interface{}{
-					"customer_id": strconv.FormatInt(r.Int63(), 10),
-				}
-				data = append(data, cid)
-			}
-
-			// Insert the new item into the database
-			term = DB("benchmarks").Table("benchmarks").Insert(data)
-
-			// Insert the new item into the database
-			_, err := term.RunWrite(session, RunOpts{
-				MinBatchRows: 200,
-				MaxBatchRows: 200,
-			})
-			if err != nil {
-				b.Errorf("insert failed [%s] ", err)
-			}
-		}
-	})
-
-}
-
-func BenchmarkBatch200SoftRandomWritesParallel10(b *testing.B) {
-
-	var term Term
-	var data []map[string]interface{}
-
-	b.SetParallelism(10)
-
-	b.RunParallel(func(pb *testing.PB) {
-
-		for pb.Next() {
-
-			opts := InsertOpts{Durability: "soft"}
-
-			for is := 0; is < 200; is++ {
-				r := rand.New(rand.NewSource(time.Now().UnixNano()))
-				cid := map[string]interface{}{
-					"customer_id": strconv.FormatInt(r.Int63(), 10),
-				}
-				data = append(data, cid)
-			}
-
-			// Insert the new item into the database
-			term = DB("benchmarks").Table("benchmarks").Insert(data, opts)
-
-			// Insert the new item into the database
-			_, err := term.RunWrite(session, RunOpts{
-				MinBatchRows: 200,
-				MaxBatchRows: 200,
-			})
-			if err != nil {
-				b.Errorf("insert failed [%s] ", err)
-			}
-		}
-	})
-
-}
-
-func BenchmarkRandomWrites(b *testing.B) {
-
-	for i := 0; i < b.N; i++ {
-		r := rand.New(rand.NewSource(time.Now().UnixNano()))
-		data := map[string]interface{}{
-			"customer_id": strconv.FormatInt(r.Int63(), 10),
-		}
-		// Insert the new item into the database
-		_, err := DB("benchmarks").Table("benchmarks").Insert(data).RunWrite(session)
-		if err != nil {
-			b.Errorf("insert failed [%s] ", err)
-		}
-	}
-
-}
-
-func BenchmarkRandomWritesParallel10(b *testing.B) {
-
-	// p*GOMAXPROCS
-	b.SetParallelism(10)
-
-	b.RunParallel(func(pb *testing.PB) {
-		for pb.Next() {
-			r := rand.New(rand.NewSource(time.Now().UnixNano()))
-			data := map[string]interface{}{
-				"customer_id": strconv.FormatInt(r.Int63(), 10),
-			}
-			// Insert the new item into the database
-			_, err := DB("benchmarks").Table("benchmarks").Insert(data).RunWrite(session)
-			if err != nil {
-				b.Errorf("insert failed [%s] ", err)
-			}
-		}
-	})
-
-}
-
-func BenchmarkRandomSoftWrites(b *testing.B) {
-
-	for i := 0; i < b.N; i++ {
-		data := map[string]interface{}{
-			"customer_id": strconv.FormatInt(rand.Int63(), 10),
-		}
-		// Insert the new item into the database
-		opts := InsertOpts{Durability: "soft"}
-		_, err := DB("benchmarks").Table("benchmarks").Insert(data, opts).RunWrite(session)
-		if err != nil {
-			b.Errorf("insert failed [%s] ", err)
-		}
-	}
-
-}
-
-func BenchmarkRandomSoftWritesParallel10(b *testing.B) {
-
-	// p*GOMAXPROCS
-	b.SetParallelism(10)
-
-	b.RunParallel(func(pb *testing.PB) {
-		for pb.Next() {
-			r := rand.New(rand.NewSource(time.Now().UnixNano()))
-			data := map[string]interface{}{
-				"customer_id": strconv.FormatInt(r.Int63(), 10),
-			}
-
-			// Insert the new item into the database
-			opts := InsertOpts{Durability: "soft"}
-			_, err := DB("benchmarks").Table("benchmarks").Insert(data, opts).RunWrite(session)
-			if err != nil {
-				b.Errorf("insert failed [%s] ", err)
-			}
-		}
-	})
-
-}
-
-func BenchmarkSequentialWrites(b *testing.B) {
-
-	si := 0
-	for i := 0; i < b.N; i++ {
-		si++
-		data := map[string]interface{}{
-			"customer_id": si,
-		}
-
-		// Insert the new item into the database
-		_, err := DB("benchmarks").Table("benchmarks").Insert(data).RunWrite(session)
-		if err != nil {
-			b.Errorf("insert failed [%s] ", err)
-			return
-		}
-	}
-}
-
-func BenchmarkSequentialWritesParallel10(b *testing.B) {
-
-	var mu sync.Mutex
-	si := 0
-
-	// p*GOMAXPROCS
-	b.SetParallelism(10)
-
-	b.RunParallel(func(pb *testing.PB) {
-		for pb.Next() {
-			mu.Lock()
-			si++
-			mu.Unlock()
-
-			data := map[string]interface{}{
-				"customer_id": si,
-			}
-
-			// Insert the new item into the database
-			_, err := DB("benchmarks").Table("benchmarks").Insert(data).RunWrite(session)
-			if err != nil {
-				b.Errorf("insert failed [%s] ", err)
-				return
-			}
-		}
-	})
-
-}
-
-func BenchmarkSequentialSoftWrites(b *testing.B) {
-
-	opts := InsertOpts{Durability: "soft"}
-	si := 0
-
-	for i := 0; i < b.N; i++ {
-		si++
-		data := map[string]interface{}{
-			"customer_id": si,
-		}
-
-		// Insert the new item into the database
-		_, err := Table("benchmarks").Insert(data, opts).RunWrite(session)
-		if err != nil {
-			b.Errorf("insert failed [%s] ", err)
-			return
-		}
-	}
-}
-
-func BenchmarkSequentialSoftWritesParallel10(b *testing.B) {
-
-	var mu sync.Mutex
-	si := 0
-
-	// p*GOMAXPROCS
-	b.SetParallelism(10)
-
-	b.RunParallel(func(pb *testing.PB) {
-		for pb.Next() {
-			mu.Lock()
-			si++
-			mu.Unlock()
-
-			data := map[string]interface{}{
-				"customer_id": si,
-			}
-
-			opts := InsertOpts{Durability: "soft"}
-
-			// Insert the new item into the database
-			_, err := Table("benchmarks").Insert(data, opts).RunWrite(session)
-			if err != nil {
-				b.Errorf("insert failed [%s] ", err)
-				return
-			}
-		}
-	})
-
-}
diff --git a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/buffer.go b/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/buffer.go
deleted file mode 100644
index 4884583df..000000000
--- a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/buffer.go
+++ /dev/null
@@ -1,143 +0,0 @@
-package gorethink
-
-import "io"
-
-const defaultBufSize = 4096
-
-// A buffer which is used for both reading and writing.
-// This is possible since communication on each connection is synchronous.
-// In other words, we can't write and read simultaneously on the same connection.
-// The buffer is similar to bufio.Reader / Writer but zero-copy-ish
-// Also highly optimized for this particular use case.
-type buffer struct {
-	buf    []byte
-	rd     io.Reader
-	idx    int
-	length int
-}
-
-func newBuffer(rd io.Reader) buffer {
-	var b [defaultBufSize]byte
-	return buffer{
-		buf: b[:],
-		rd:  rd,
-	}
-}
-
-// fill reads into the buffer until at least _need_ bytes are in it
-func (b *buffer) fill(need int) error {
-	n := b.length
-
-	// move existing data to the beginning
-	if n > 0 && b.idx > 0 {
-		copy(b.buf[0:n], b.buf[b.idx:])
-	}
-
-	// grow buffer if necessary
-	// TODO: let the buffer shrink again at some point
-	//       Maybe keep the org buf slice and swap back?
-	if need > len(b.buf) {
-		// Round up to the next multiple of the default size
-		newBuf := make([]byte, ((need/defaultBufSize)+1)*defaultBufSize)
-		copy(newBuf, b.buf)
-		b.buf = newBuf
-	}
-
-	b.idx = 0
-
-	for {
-		nn, err := b.rd.Read(b.buf[n:])
-		n += nn
-
-		switch err {
-		case nil:
-			if n < need {
-				continue
-			}
-			b.length = n
-			return nil
-
-		case io.EOF:
-			if n >= need {
-				b.length = n
-				return nil
-			}
-			return io.ErrUnexpectedEOF
-
-		default:
-			return err
-		}
-	}
-}
-
-// returns next N bytes from buffer.
-// The returned slice is only guaranteed to be valid until the next read
-func (b *buffer) readNext(need int) ([]byte, error) {
-	if b.length < need {
-		// refill
-		if err := b.fill(need); err != nil {
-			return nil, err
-		}
-	}
-
-	offset := b.idx
-	b.idx += need
-	b.length -= need
-	return b.buf[offset:b.idx], nil
-}
-
-// returns a buffer with the requested size.
-// If possible, a slice from the existing buffer is returned.
-// Otherwise a bigger buffer is made.
-// Only one buffer (total) can be used at a time.
-func (b *buffer) takeBuffer(length int) []byte {
-	if b.length > 0 {
-		return nil
-	}
-
-	// test (cheap) general case first
-	if length <= defaultBufSize || length <= cap(b.buf) {
-		return b.buf[:length]
-	}
-
-	return make([]byte, length)
-}
-
-// shortcut which can be used if the requested buffer is guaranteed to be
-// smaller than defaultBufSize
-// Only one buffer (total) can be used at a time.
-func (b *buffer) takeSmallBuffer(length int) []byte {
-	if b.length == 0 {
-		return b.buf[:length]
-	}
-	return nil
-}
-
-// takeCompleteBuffer returns the complete existing buffer.
-// This can be used if the necessary buffer size is unknown.
-// Only one buffer (total) can be used at a time.
-func (b *buffer) takeCompleteBuffer() []byte {
-	if b.length == 0 {
-		return b.buf
-	}
-	return nil
-}
-
-var responseCache = make(chan *Response, 16)
-
-func newCachedResponse() *Response {
-	select {
-	case r := <-responseCache:
-		return r
-	default:
-		return new(Response)
-	}
-}
-
-func putResponse(r *Response) {
-	*r = Response{} // zero it
-	select {
-	case responseCache <- r:
-	default:
-	}
-}
diff --git a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/checkers_test.go b/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/checkers_test.go
deleted file mode 100644
index 9659db78c..000000000
--- a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/checkers_test.go
+++ /dev/null
@@ -1,168 +0,0 @@
-package gorethink
-
-import (
-	"encoding/json"
-	"fmt"
-
-	test "gopkg.in/check.v1"
-
-	"github.com/dancannon/gorethink/types"
-)
-
-type jsonChecker struct {
-	*test.CheckerInfo
-}
-
-func (j jsonChecker) Check(params []interface{}, names []string) (result bool, error string) {
-	var jsonParams []interface{}
-	for _, param := range params {
-		jsonParam, err := json.Marshal(param)
-		if err != nil {
-			return false, err.Error()
-		}
-		jsonParams = append(jsonParams, jsonParam)
-	}
-	return test.DeepEquals.Check(jsonParams, names)
-}
-
-// jsonEquals compares two interface{} objects by converting them to JSON and
-// seeing if the strings match
-var jsonEquals = &jsonChecker{
-	&test.CheckerInfo{Name: "jsonEquals", Params: []string{"obtained", "expected"}},
-}
-
-type geometryChecker struct {
-	*test.CheckerInfo
-}
-
-func (j geometryChecker) Check(params []interface{}, names []string) (result bool, error string) {
-	obtained, ok := params[0].(types.Geometry)
-	if !ok {
-		return false, "obtained must be a Geometry"
-	}
-	expectedType, ok := params[1].(string)
-	if !ok {
-		return false, "expectedType must be a string"
-	}
-
-	switch expectedType {
-	case "Polygon":
-		expectedCoords, ok := params[2].([][][]float64)
-		if !ok {
-			return false, "expectedCoords must be a [][][]float64"
-		}
-
-		return comparePolygon(expectedCoords, obtained)
-	case "LineString":
-		expectedCoords, ok := params[2].([][]float64)
-		if !ok {
-			return false, "expectedCoords must be a [][]float64"
-		}
-
-		return compareLineString(expectedCoords, obtained)
-	case "Point":
-		expectedCoords, ok := params[2].([]float64)
-		if !ok {
-			return false, "expectedCoords must be a []float64"
-		}
-
-		return comparePoint(expectedCoords, obtained)
-	default:
-		return false, "unknown expectedType"
-	}
-}
-
-// geometryEquals compares two geometry values, all coordinates are compared with a small amount of tolerance
-var geometryEquals = &geometryChecker{
-	&test.CheckerInfo{Name: "geometryEquals", Params: []string{"obtained", "expectedType", "expectedCoords"}},
-}
-
-/* BEGIN FLOAT HELPERS */
-
-// totally ripped off from math/all_test.go
-// https://github.com/golang/go/blob/master/src/math/all_test.go#L1723-L1749
-func tolerance(a, b, e float64) bool {
-	d := a - b
-	if d < 0 {
-		d = -d
-
-	}
-
-	if a != 0 {
-		e = e * a
-		if e < 0 {
-			e = -e
-
-		}
-
-	}
-	return d < e
-}
-
-func mehclose(a, b float64) bool    { return tolerance(a, b, 1e-2) }
-func kindaclose(a, b float64) bool  { return tolerance(a, b, 1e-8) }
-func prettyclose(a, b float64) bool { return tolerance(a, b, 1e-14) }
-func veryclose(a, b float64) bool   { return tolerance(a, b, 4e-16) }
-func soclose(a, b, e float64) bool  { return tolerance(a, b, e) }
-
-func comparePolygon(expected [][][]float64, obtained types.Geometry) (result bool, error string) {
-	if obtained.Type != "Polygon" {
-		return false, fmt.Sprintf("obtained geometry has incorrect type, has %s but expected Polygon", obtained.Type)
-	}
-
-	for i, line := range obtained.Lines {
-		for j, point := range line {
-			ok, err := assertPointsEqual(
-				expected[i][j][0], point.Lon, // Lon
-				expected[i][j][1], point.Lat, // Lat
-			)
-			if !ok {
-				return false, err
-			}
-		}
-	}
-
-	return true, ""
-}
-
-func compareLineString(expected [][]float64, obtained types.Geometry) (result bool, error string) {
-	if obtained.Type != "LineString" {
-		return false, fmt.Sprintf("obtained geometry has incorrect type, has %s but expected LineString", obtained.Type)
-	}
-
-	for j, point := range obtained.Line {
-		ok, err := assertPointsEqual(
-			expected[j][0], point.Lon, // Lon
-			expected[j][1], point.Lat, // Lat
-		)
-		if !ok {
-			return false, err
-		}
-	}
-
-	return true, ""
-}
-
-func comparePoint(expected []float64, obtained types.Geometry) (result bool, error string) {
-	if obtained.Type != "Point" {
-		return false, fmt.Sprintf("obtained geometry has incorrect type, has %s but expected Point", obtained.Type)
-	}
-
-	return assertPointsEqual(
-		expected[0], obtained.Point.Lon, // Lon
-		expected[1], obtained.Point.Lat, // Lat
-	)
-}
-
-func assertPointsEqual(expectedLon, obtainedLon, expectedLat, obtainedLat float64) (result bool, error string) {
-	if !kindaclose(expectedLon, obtainedLon) {
-		return false, fmt.Sprintf("the deviation between the compared floats is too great [%v:%v]", expectedLon, obtainedLon)
-	}
-	if !kindaclose(expectedLat, obtainedLat) {
-		return false, fmt.Sprintf("the deviation between the compared floats is too great [%v:%v]", expectedLat, obtainedLat)
-	}
-
-	return true, ""
-}
-
-/* END FLOAT HELPERS */
diff --git a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/cluster.go b/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/cluster.go
deleted file mode 100644
index faceb281f..000000000
--- a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/cluster.go
+++ /dev/null
@@ -1,411 +0,0 @@
-package gorethink
-
-import (
-	"fmt"
-	"math"
-	"strings"
-	"sync"
-	"sync/atomic"
-	"time"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/cenkalti/backoff"
-)
-
-// A Cluster represents a connection to a RethinkDB cluster, a cluster is created
-// by the Session and should rarely be created manually.
-//
-// The cluster keeps track of all nodes in the cluster and if requested can listen
-// for cluster changes and start tracking a new node if one appears. Currently
-// nodes are removed from the pool if they become unhealthy (100 failed queries).
-// This should hopefully soon be replaced by a backoff system.
-type Cluster struct {
-	opts *ConnectOpts
-
-	mu     sync.RWMutex
-	seeds  []Host  // Initial host nodes specified by user.
-	nodes  []*Node // Active nodes in cluster.
-	closed bool
-
-	nodeIndex int64
-}
-
-// NewCluster creates a new cluster by connecting to the given hosts.
-func NewCluster(hosts []Host, opts *ConnectOpts) (*Cluster, error) {
-	c := &Cluster{
-		seeds: hosts,
-		opts:  opts,
-	}
-
-	//Check that hosts in the ClusterConfig is not empty
-	c.connectNodes(c.getSeeds())
-	if !c.IsConnected() {
-		return nil, ErrNoConnectionsStarted
-	}
-
-	if opts.DiscoverHosts {
-		go c.discover()
-	}
-
-	return c, nil
-}
-
-// Query executes a ReQL query using the cluster to connect to the database
-func (c *Cluster) Query(q Query) (cursor *Cursor, err error) {
-	node, err := c.GetRandomNode()
-	if err != nil {
-		return nil, err
-	}
-
-	return node.Query(q)
-}
-
-// Exec executes a ReQL query using the cluster to connect to the database
-func (c *Cluster) Exec(q Query) (err error) {
-	node, err := c.GetRandomNode()
-	if err != nil {
-		return err
-	}
-
-	return node.Exec(q)
-}
-
-// SetMaxIdleConns sets the maximum number of connections in the idle
-// connection pool.
-func (c *Cluster) SetMaxIdleConns(n int) {
-	for _, node := range c.GetNodes() {
-		node.SetMaxIdleConns(n)
-	}
-}
-
-// SetMaxOpenConns sets the maximum number of open connections to the database.
-func (c *Cluster) SetMaxOpenConns(n int) {
-	for _, node := range c.GetNodes() {
-		node.SetMaxOpenConns(n)
-	}
-}
-
-// Close closes the cluster
-func (c *Cluster) Close(optArgs ...CloseOpts) error {
-	if c.closed {
-		return nil
-	}
-
-	for _, node := range c.GetNodes() {
-		err := node.Close(optArgs...)
-		if err != nil {
-			return err
-		}
-	}
-
-	c.closed = true
-
-	return nil
-}
-
-// discover attempts to find new nodes in the cluster using the current nodes
-func (c *Cluster) discover() {
-	// Keep retrying with exponential backoff.
-	b := backoff.NewExponentialBackOff()
-	// Never finish retrying (max interval is still 60s)
-	b.MaxElapsedTime = 0
-
-	// Keep trying to discover new nodes
-	for {
-		backoff.RetryNotify(func() error {
-			// If no hosts try seeding nodes
-			if len(c.GetNodes()) == 0 {
-				c.connectNodes(c.getSeeds())
-			}
-
-			return c.listenForNodeChanges()
-		}, b, func(err error, wait time.Duration) {
-			log.Debugf("Error discovering hosts %s, waiting %s", err, wait)
-		})
-	}
-}
-
-// listenForNodeChanges listens for changes to node status using change feeds.
-// This function will block until the query fails
-func (c *Cluster) listenForNodeChanges() error {
-	// Start listening to changes from a random active node
-	node, err := c.GetRandomNode()
-	if err != nil {
-		return err
-	}
-
-	cursor, err := node.Query(newQuery(
-		DB("rethinkdb").Table("server_status").Changes(),
-		map[string]interface{}{},
-		c.opts,
-	))
-	if err != nil {
-		return err
-	}
-
-	// Keep reading node status updates from changefeed
-	var result struct {
-		NewVal nodeStatus `gorethink:"new_val"`
-		OldVal nodeStatus `gorethink:"old_val"`
-	}
-	for cursor.Next(&result) {
-		addr := fmt.Sprintf("%s:%d", result.NewVal.Network.Hostname, result.NewVal.Network.ReqlPort)
-		addr = strings.ToLower(addr)
-
-		switch result.NewVal.Status {
-		case "connected":
-			// Connect to node using exponential backoff (give up after waiting 5s)
-			// to give the node time to start-up.
-			b := backoff.NewExponentialBackOff()
-			b.MaxElapsedTime = time.Second * 5
-
-			backoff.Retry(func() error {
-				node, err := c.connectNodeWithStatus(result.NewVal)
-				if err == nil {
-					if !c.nodeExists(node) {
-						c.addNode(node)
-
-						log.WithFields(logrus.Fields{
-							"id":   node.ID,
-							"host": node.Host.String(),
-						}).Debug("Connected to node")
-					}
-				}
-
-				return err
-			}, b)
-		}
-	}
-
-	return cursor.Err()
-}
-
-func (c *Cluster) connectNodes(hosts []Host) {
-	// Add existing nodes to map
-	nodeSet := map[string]*Node{}
-	for _, node := range c.GetNodes() {
-		nodeSet[node.ID] = node
-	}
-
-	// Attempt to connect to each seed host
-	for _, host := range hosts {
-		conn, err := NewConnection(host.String(), c.opts)
-		if err != nil {
-			log.Warnf("Error creating connection %s", err.Error())
-			continue
-		}
-		defer conn.Close()
-
-		_, cursor, err := conn.Query(newQuery(
-			DB("rethinkdb").Table("server_status"),
-			map[string]interface{}{},
-			c.opts,
-		))
-		if err != nil {
-			log.Warnf("Error fetching cluster status %s", err)
-			continue
-		}
-
-		if c.opts.DiscoverHosts {
-			var results []nodeStatus
-			err = cursor.All(&results)
-			if err != nil {
-				continue
-			}
-
-			for _, result := range results {
-				node, err := c.connectNodeWithStatus(result)
-				if err == nil {
-					if _, ok := nodeSet[node.ID]; !ok {
-						log.WithFields(logrus.Fields{
-							"id":   node.ID,
-							"host": node.Host.String(),
-						}).Debug("Connected to node")
-						nodeSet[node.ID] = node
-					}
-				}
-			}
-		} else {
-			node, err := c.connectNode(host.String(), []Host{host})
-			if err == nil {
-				if _, ok := nodeSet[node.ID]; !ok {
-					log.WithFields(logrus.Fields{
-						"id":   node.ID,
-						"host": node.Host.String(),
-					}).Debug("Connected to node")
-					nodeSet[node.ID] = node
-				}
-			}
-		}
-	}
-
-	nodes := []*Node{}
-	for _, node := range nodeSet {
-		nodes = append(nodes, node)
-	}
-
-	c.setNodes(nodes)
-}
-
-func (c *Cluster) connectNodeWithStatus(s nodeStatus) (*Node, error) {
-	aliases := make([]Host, len(s.Network.CanonicalAddresses))
-	for i, aliasAddress := range s.Network.CanonicalAddresses {
-		aliases[i] = NewHost(aliasAddress.Host, int(s.Network.ReqlPort))
-	}
-
-	return c.connectNode(s.ID, aliases)
-}
-
-func (c *Cluster) connectNode(id string, aliases []Host) (*Node, error) {
-	var pool *Pool
-	var err error
-
-	for len(aliases) > 0 {
-		pool, err = NewPool(aliases[0], c.opts)
-		if err != nil {
-			aliases = aliases[1:]
-			continue
-		}
-
-		err = pool.Ping()
-		if err != nil {
-			aliases = aliases[1:]
-			continue
-		}
-
-		// Ping successful so break out of loop
-		break
-	}
-
-	if err != nil {
-		return nil, err
-	}
-	if len(aliases) == 0 {
-		return nil, ErrInvalidNode
-	}
-
-	return newNode(id, aliases, c, pool), nil
-}
-
-// IsConnected returns true if cluster has nodes and is not already closed.
-func (c *Cluster) IsConnected() bool {
-	c.mu.RLock()
-	closed := c.closed
-	c.mu.RUnlock()
-
-	return (len(c.GetNodes()) > 0) && !closed
-}
-
-// AddSeeds adds new seed hosts to the cluster.
-func (c *Cluster) AddSeeds(hosts []Host) {
-	c.mu.Lock()
-	c.seeds = append(c.seeds, hosts...)
-	c.mu.Unlock()
-}
-
-func (c *Cluster) getSeeds() []Host {
-	c.mu.RLock()
-	seeds := c.seeds
-	c.mu.RUnlock()
-
-	return seeds
-}
-
-// GetRandomNode returns a random node on the cluster
-// TODO(dancannon) replace with hostpool
-func (c *Cluster) GetRandomNode() (*Node, error) {
-	if !c.IsConnected() {
-		return nil, ErrClusterClosed
-	}
-	// Must copy array reference for copy on write semantics to work.
-	nodeArray := c.GetNodes()
-	length := len(nodeArray)
-	for i := 0; i < length; i++ {
-		// Must handle concurrency with other non-tending goroutines, so nodeIndex is consistent.
-		index := int(math.Abs(float64(c.nextNodeIndex() % int64(length))))
-		node := nodeArray[index]
-
-		if !node.Closed() && node.IsHealthy() {
-			return node, nil
-		}
-	}
-	return nil, ErrNoConnections
-}
-
-// GetNodes returns a list of all nodes in the cluster
-func (c *Cluster) GetNodes() []*Node {
-	c.mu.RLock()
-	nodes := c.nodes
-	c.mu.RUnlock()
-
-	return nodes
-}
-
-// GetHealthyNodes returns a list of all healthy nodes in the cluster
-func (c *Cluster) GetHealthyNodes() []*Node {
-	c.mu.RLock()
-	nodes := []*Node{}
-	for _, node := range c.nodes {
-		if node.IsHealthy() {
-			nodes = append(nodes, node)
-		}
-	}
-	c.mu.RUnlock()
-
-	return nodes
-}
-
-func (c *Cluster) nodeExists(search *Node) bool {
-	for _, node := range c.GetNodes() {
-		if node.ID == search.ID {
-			return true
-		}
-	}
-	return false
-}
-
-func (c *Cluster) addNode(node *Node) {
-	c.mu.Lock()
-	c.nodes = append(c.nodes, node)
-	c.mu.Unlock()
-}
-
-func (c *Cluster) addNodes(nodesToAdd []*Node) {
-	c.mu.Lock()
-	c.nodes = append(c.nodes, nodesToAdd...)
-	c.mu.Unlock()
-}
-
-func (c *Cluster) setNodes(nodes []*Node) {
-	c.mu.Lock()
-	c.nodes = nodes
-	c.mu.Unlock()
-}
-
-func (c *Cluster) removeNode(nodeID string) {
-	nodes := c.GetNodes()
-	nodeArray := make([]*Node, len(nodes)-1)
-	count := 0
-
-	// Add nodes that are not in remove list.
-	for _, n := range nodes {
-		if n.ID != nodeID {
-			nodeArray[count] = n
-			count++
-		}
-	}
-
-	// Do sanity check to make sure assumptions are correct.
-	if count < len(nodeArray) {
-		// Resize array.
-		nodeArray2 := make([]*Node, count)
-		copy(nodeArray2, nodeArray)
-		nodeArray = nodeArray2
-	}
-
-	c.setNodes(nodeArray)
-}
-
-func (c *Cluster) nextNodeIndex() int64 {
-	return atomic.AddInt64(&c.nodeIndex, 1)
-}
diff --git a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/cluster_integration_test.go b/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/cluster_integration_test.go
deleted file mode 100644
index d340f0191..000000000
--- a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/cluster_integration_test.go
+++ /dev/null
@@ -1,99 +0,0 @@
-// +build cluster
-// +build integration
-
-package gorethink
-
-import (
-	"time"
-
-	test "gopkg.in/check.v1"
-)
-
-func (s *RethinkSuite) TestClusterDetectNewNode(c *test.C) {
-	session, err := Connect(ConnectOpts{
-		Addresses:           []string{url, url2},
-		DiscoverHosts:       true,
-		NodeRefreshInterval: time.Second,
-	})
-	c.Assert(err, test.IsNil)
-
-	t := time.NewTimer(time.Second * 30)
-	for {
-		select {
-		// Fail if deadline has passed
-		case <-t.C:
-			c.Fatal("No node was added to the cluster")
-		default:
-			// Pass if another node was added
-			if len(session.cluster.GetNodes()) >= 3 {
-				return
-			}
-		}
-	}
-}
-
-func (s *RethinkSuite) TestClusterRecoverAfterNoNodes(c *test.C) {
-	session, err := Connect(ConnectOpts{
-		Addresses:           []string{url, url2},
-		DiscoverHosts:       true,
-		NodeRefreshInterval: time.Second,
-	})
-	c.Assert(err, test.IsNil)
-
-	t := time.NewTimer(time.Second * 30)
-	hasHadZeroNodes := false
-	for {
-		select {
-		// Fail if deadline has passed
-		case <-t.C:
-			c.Fatal("No node was added to the cluster")
-		default:
-			// Check if there are no nodes
-			if len(session.cluster.GetNodes()) == 0 {
-				hasHadZeroNodes = true
-			}
-
-			// Pass if another node was added
-			if len(session.cluster.GetNodes()) >= 1 && hasHadZeroNodes {
-				return
-			}
-		}
-	}
-}
-
-func (s *RethinkSuite) TestClusterNodeHealth(c *test.C) {
-	session, err := Connect(ConnectOpts{
-		Addresses:           []string{url, url2, url3},
-		DiscoverHosts:       true,
-		NodeRefreshInterval: time.Second,
-		MaxIdle:             50,
-		MaxOpen:             200,
-	})
-	c.Assert(err, test.IsNil)
-
-	attempts := 0
-	failed := 0
-	seconds := 0
-
-	t := time.NewTimer(time.Second * 10)
-	tick := time.NewTicker(time.Second)
-	for {
-		select {
-		// Fail if deadline has passed
-		case <-tick.C:
-			seconds++
-			c.Logf("%ds elapsed", seconds)
-		case <-t.C:
-			// Execute queries for 10s and check that at most 5% of the queries fail
-			c.Logf("%d of the %d(%d%%) queries failed", failed, attempts, (failed / attempts))
-			c.Assert(failed <= 100, test.Equals, true)
-			return
-		default:
-			attempts++
-			if err := Expr(1).Exec(session); err != nil {
-				c.Logf("Query failed, %s", err)
-				failed++
-			}
-		}
-	}
-}
diff --git a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/cluster_test.go b/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/cluster_test.go
deleted file mode 100644
index 376444d8a..000000000
--- a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/cluster_test.go
+++ /dev/null
@@ -1,63 +0,0 @@
-// +build cluster
-
-package gorethink
-
-import (
-	"fmt"
-	"time"
-
-	test "gopkg.in/check.v1"
-)
-
-func (s *RethinkSuite) TestClusterConnect(c *test.C) {
-	session, err := Connect(ConnectOpts{
-		Addresses: []string{url1, url2, url3},
-	})
-	c.Assert(err, test.IsNil)
-
-	row, err := Expr("Hello World").Run(session)
-	c.Assert(err, test.IsNil)
-
-	var response string
-	err = row.One(&response)
-	c.Assert(err, test.IsNil)
-	c.Assert(response, test.Equals, "Hello World")
-}
-
-func (s *RethinkSuite) TestClusterMultipleQueries(c *test.C) {
-	session, err := Connect(ConnectOpts{
-		Addresses: []string{url1, url2, url3},
-	})
-	c.Assert(err, test.IsNil)
-
-	for i := 0; i < 1000; i++ {
-		row, err := Expr(fmt.Sprintf("Hello World", i)).Run(session)
-		c.Assert(err, test.IsNil)
-
-		var response string
-		err = row.One(&response)
-		c.Assert(err, test.IsNil)
-		c.Assert(response, test.Equals, fmt.Sprintf("Hello World", i))
-	}
-}
-
-func (s *RethinkSuite) TestClusterConnectError(c *test.C) {
-	var err error
-	_, err = Connect(ConnectOpts{
-		Addresses: []string{"nonexistanturl"},
-		Timeout:   time.Second,
-	})
-	c.Assert(err, test.NotNil)
-}
-
-func (s *RethinkSuite) TestClusterConnectDatabase(c *test.C) {
-	session, err := Connect(ConnectOpts{
-		Addresses: []string{url1, url2, url3},
-		Database:  "test2",
-	})
-	c.Assert(err, test.IsNil)
-
-	_, err = Table("test2").Run(session)
-	c.Assert(err, test.NotNil)
-	c.Assert(err.Error(), test.Equals, "gorethink: Database `test2` does not exist. in: \nr.Table(\"test2\")")
-}
diff --git a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/connection.go b/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/connection.go
deleted file mode 100644
index 360095061..000000000
--- a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/connection.go
+++ /dev/null
@@ -1,305 +0,0 @@
-package gorethink
-
-import (
-	"crypto/tls"
-	"encoding/binary"
-	"encoding/json"
-	"net"
-	"sync/atomic"
-	"time"
-
-	p "github.com/dancannon/gorethink/ql2"
-)
-
-const (
-	respHeaderLen = 12
-)
-
-// Response represents the raw response from a query, most of the time you
-// should instead use a Cursor when reading from the database.
-type Response struct {
-	Token     int64
-	Type      p.Response_ResponseType   `json:"t"`
-	Notes     []p.Response_ResponseNote `json:"n"`
-	Responses []json.RawMessage         `json:"r"`
-	Backtrace []interface{}             `json:"b"`
-	Profile   interface{}               `json:"p"`
-}
-
-// Connection is a connection to a rethinkdb database. Connection is not thread
-// safe and should only be accessed be a single goroutine
-type Connection struct {
-	address string
-	opts    *ConnectOpts
-	conn    net.Conn
-	_       [4]byte
-	token   int64
-	cursors map[int64]*Cursor
-	bad     bool
-
-	headerBuf [respHeaderLen]byte
-	buf       buffer
-}
-
-// NewConnection creates a new connection to the database server
-func NewConnection(address string, opts *ConnectOpts) (*Connection, error) {
-	var err error
-	c := &Connection{
-		address: address,
-		opts:    opts,
-		cursors: make(map[int64]*Cursor),
-	}
-	// Connect to Server
-	nd := net.Dialer{Timeout: c.opts.Timeout}
-	if c.opts.TLSConfig == nil {
-		c.conn, err = nd.Dial("tcp", address)
-	} else {
-		c.conn, err = tls.DialWithDialer(&nd, "tcp", address, c.opts.TLSConfig)
-	}
-	if err != nil {
-		return nil, err
-	}
-	// Enable TCP Keepalives on TCP connections
-	if tc, ok := c.conn.(*net.TCPConn); ok {
-		if err := tc.SetKeepAlive(true); err != nil {
-			// Don't send COM_QUIT before handshake.
-			c.conn.Close()
-			c.conn = nil
-			return nil, err
-		}
-	}
-	c.buf = newBuffer(c.conn)
-	// Send handshake request
-	if err = c.writeHandshakeReq(); err != nil {
-		c.Close()
-		return nil, err
-	}
-	// Read handshake response
-	err = c.readHandshakeSuccess()
-	if err != nil {
-		c.Close()
-		return nil, err
-	}
-
-	return c, nil
-}
-
-// Close closes the underlying net.Conn
-func (c *Connection) Close() error {
-	if c.conn != nil {
-		c.conn.Close()
-		c.conn = nil
-	}
-
-	c.cursors = nil
-
-	return nil
-}
-
-// Query sends a Query to the database, returning both the raw Response and a
-// Cursor which should be used to view the query's response.
-//
-// This function is used internally by Run which should be used for most queries.
-func (c *Connection) Query(q Query) (*Response, *Cursor, error) {
-	if c == nil {
-		return nil, nil, nil
-	}
-	if c.conn == nil {
-		c.bad = true
-		return nil, nil, nil
-	}
-
-	// Add token if query is a START/NOREPLY_WAIT
-	if q.Type == p.Query_START || q.Type == p.Query_NOREPLY_WAIT {
-		q.Token = c.nextToken()
-		if c.opts.Database != "" {
-			q.Opts["db"] = DB(c.opts.Database).build()
-		}
-	}
-
-	err := c.sendQuery(q)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	if noreply, ok := q.Opts["noreply"]; ok && noreply.(bool) {
-		return nil, nil, nil
-	}
-
-	for {
-		response, err := c.readResponse()
-		if err != nil {
-			return nil, nil, err
-		}
-
-		if response.Token == q.Token {
-			// If this was the requested response process and return
-			return c.processResponse(q, response)
-		} else if _, ok := c.cursors[response.Token]; ok {
-			// If the token is in the cursor cache then process the response
-			c.processResponse(q, response)
-		} else {
-			putResponse(response)
-		}
-	}
-}
-
-// sendQuery marshals the Query and sends the JSON to the server.
-func (c *Connection) sendQuery(q Query) error {
-	// Build query
-	b, err := json.Marshal(q.build())
-	if err != nil {
-		return RQLDriverError{"Error building query"}
-	}
-
-	// Set timeout
-	if c.opts.Timeout == 0 {
-		c.conn.SetWriteDeadline(time.Time{})
-	} else {
-		c.conn.SetWriteDeadline(time.Now().Add(c.opts.Timeout))
-	}
-
-	// Send the JSON encoding of the query itself.
-	if err = c.writeQuery(q.Token, b); err != nil {
-		c.bad = true
-		return RQLConnectionError{err.Error()}
-	}
-
-	return nil
-}
-
-// getToken generates the next query token, used to number requests and match
-// responses with requests.
-func (c *Connection) nextToken() int64 {
-	// requires c.token to be 64-bit aligned on ARM
-	return atomic.AddInt64(&c.token, 1)
-}
-
-// readResponse attempts to read a Response from the server, if no response
-// could be read then an error is returned.
-func (c *Connection) readResponse() (*Response, error) {
-	// Set timeout
-	if c.opts.Timeout == 0 {
-		c.conn.SetReadDeadline(time.Time{})
-	} else {
-		c.conn.SetReadDeadline(time.Now().Add(c.opts.Timeout))
-	}
-
-	// Read response header (token+length)
-	if _, err := c.read(c.headerBuf[:], respHeaderLen); err != nil {
-		return nil, err
-	}
-
-	responseToken := int64(binary.LittleEndian.Uint64(c.headerBuf[:8]))
-	messageLength := binary.LittleEndian.Uint32(c.headerBuf[8:])
-
-	// Read the JSON encoding of the Response itself.
-	b := c.buf.takeBuffer(int(messageLength))
-
-	if _, err := c.read(b, int(messageLength)); err != nil {
-		c.bad = true
-		return nil, RQLConnectionError{err.Error()}
-	}
-
-	// Decode the response
-	var response = newCachedResponse()
-	if err := json.Unmarshal(b, response); err != nil {
-		c.bad = true
-		return nil, RQLDriverError{err.Error()}
-	}
-	response.Token = responseToken
-
-	return response, nil
-}
-
-func (c *Connection) processResponse(q Query, response *Response) (*Response, *Cursor, error) {
-	switch response.Type {
-	case p.Response_CLIENT_ERROR:
-		return c.processErrorResponse(q, response, RQLClientError{rqlResponseError{response, q.Term}})
-	case p.Response_COMPILE_ERROR:
-		return c.processErrorResponse(q, response, RQLCompileError{rqlResponseError{response, q.Term}})
-	case p.Response_RUNTIME_ERROR:
-		return c.processErrorResponse(q, response, RQLRuntimeError{rqlResponseError{response, q.Term}})
-	case p.Response_SUCCESS_ATOM:
-		return c.processAtomResponse(q, response)
-	case p.Response_SUCCESS_PARTIAL:
-		return c.processPartialResponse(q, response)
-	case p.Response_SUCCESS_SEQUENCE:
-		return c.processSequenceResponse(q, response)
-	case p.Response_WAIT_COMPLETE:
-		return c.processWaitResponse(q, response)
-	default:
-		putResponse(response)
-		return nil, nil, RQLDriverError{"Unexpected response type"}
-	}
-}
-
-func (c *Connection) processErrorResponse(q Query, response *Response, err error) (*Response, *Cursor, error) {
-	cursor := c.cursors[response.Token]
-
-	delete(c.cursors, response.Token)
-
-	return response, cursor, err
-}
-
-func (c *Connection) processAtomResponse(q Query, response *Response) (*Response, *Cursor, error) {
-	// Create cursor
-	cursor := newCursor(c, "Cursor", response.Token, q.Term, q.Opts)
-	cursor.profile = response.Profile
-
-	cursor.extend(response)
-
-	return response, cursor, nil
-}
-
-func (c *Connection) processPartialResponse(q Query, response *Response) (*Response, *Cursor, error) {
-	cursorType := "Cursor"
-	if len(response.Notes) > 0 {
-		switch response.Notes[0] {
-		case p.Response_SEQUENCE_FEED:
-			cursorType = "Feed"
-		case p.Response_ATOM_FEED:
-			cursorType = "AtomFeed"
-		case p.Response_ORDER_BY_LIMIT_FEED:
-			cursorType = "OrderByLimitFeed"
-		case p.Response_UNIONED_FEED:
-			cursorType = "UnionedFeed"
-		case p.Response_INCLUDES_STATES:
-			cursorType = "IncludesFeed"
-		}
-	}
-
-	cursor, ok := c.cursors[response.Token]
-	if !ok {
-		// Create a new cursor if needed
-		cursor = newCursor(c, cursorType, response.Token, q.Term, q.Opts)
-		cursor.profile = response.Profile
-
-		c.cursors[response.Token] = cursor
-	}
-
-	cursor.extend(response)
-
-	return response, cursor, nil
-}
-
-func (c *Connection) processSequenceResponse(q Query, response *Response) (*Response, *Cursor, error) {
-	cursor, ok := c.cursors[response.Token]
-	if !ok {
-		// Create a new cursor if needed
-		cursor = newCursor(c, "Cursor", response.Token, q.Term, q.Opts)
-		cursor.profile = response.Profile
-	}
-
-	delete(c.cursors, response.Token)
-
-	cursor.extend(response)
-
-	return response, cursor, nil
-}
-
-func (c *Connection) processWaitResponse(q Query, response *Response) (*Response, *Cursor, error) {
-	delete(c.cursors, response.Token)
-
-	return response, nil, nil
-}
diff --git a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/connection_helper.go b/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/connection_helper.go
deleted file mode 100644
index b523f7040..000000000
--- a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/connection_helper.go
+++ /dev/null
@@ -1,108 +0,0 @@
-package gorethink
-
-import (
-	"bufio"
-	"encoding/binary"
-	"fmt"
-	"io"
-	"strings"
-
-	p "github.com/dancannon/gorethink/ql2"
-)
-
-// Write 'data' to conn
-func (c *Connection) writeData(data []byte) error {
-	_, err := c.conn.Write(data[:])
-	if err != nil {
-		return RQLConnectionError{err.Error()}
-	}
-
-	return nil
-}
-
-func (c *Connection) writeHandshakeReq() error {
-	pos := 0
-	dataLen := 4 + 4 + len(c.opts.AuthKey) + 4
-
-	data := c.buf.takeSmallBuffer(dataLen)
-	if data == nil {
-		return RQLDriverError{"Busy buffer"}
-	}
-
-	// Send the protocol version to the server as a 4-byte little-endian-encoded integer
-	binary.LittleEndian.PutUint32(data[pos:], uint32(p.VersionDummy_V0_4))
-	pos += 4
-
-	// Send the length of the auth key to the server as a 4-byte little-endian-encoded integer
-	binary.LittleEndian.PutUint32(data[pos:], uint32(len(c.opts.AuthKey)))
-	pos += 4
-
-	// Send the auth key as an ASCII string
-	if len(c.opts.AuthKey) > 0 {
-		pos += copy(data[pos:], c.opts.AuthKey)
-	}
-
-	// Send the protocol type as a 4-byte little-endian-encoded integer
-	binary.LittleEndian.PutUint32(data[pos:], uint32(p.VersionDummy_JSON))
-	pos += 4
-
-	return c.writeData(data)
-}
-
-func (c *Connection) readHandshakeSuccess() error {
-	reader := bufio.NewReader(c.conn)
-	line, err := reader.ReadBytes('\x00')
-	if err != nil {
-		if err == io.EOF {
-			return fmt.Errorf("Unexpected EOF: %s", string(line))
-		}
-		return RQLConnectionError{err.Error()}
-	}
-	// convert to string and remove trailing NUL byte
-	response := string(line[:len(line)-1])
-	if response != "SUCCESS" {
-		response = strings.TrimSpace(response)
-		// we failed authorization or something else terrible happened
-		return RQLDriverError{fmt.Sprintf("Server dropped connection with message: \"%s\"", response)}
-	}
-
-	return nil
-}
-
-func (c *Connection) read(buf []byte, length int) (total int, err error) {
-	var n int
-	for total < length {
-		if n, err = c.conn.Read(buf[total:length]); err != nil {
-			break
-		}
-		total += n
-	}
-	if err != nil {
-		return total, err
-	}
-
-	return total, nil
-}
-
-func (c *Connection) writeQuery(token int64, q []byte) error {
-	pos := 0
-	dataLen := 8 + 4 + len(q)
-
-	data := c.buf.takeBuffer(dataLen)
-	if data == nil {
-		return RQLDriverError{"Busy Buffer"}
-	}
-
-	// Send the protocol version to the server as a 4-byte little-endian-encoded integer
-	binary.LittleEndian.PutUint64(data[pos:], uint64(token))
-	pos += 8
-
-	// Send the length of the auth key to the server as a 4-byte little-endian-encoded integer
-	binary.LittleEndian.PutUint32(data[pos:], uint32(len(q)))
-	pos += 4
-
-	// Send the auth key as an ASCII string
-	pos += copy(data[pos:], q)
-
-	return c.writeData(data)
-}
diff --git a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/cursor.go b/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/cursor.go
deleted file mode 100644
index 6e56ae233..000000000
--- a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/cursor.go
+++ /dev/null
@@ -1,467 +0,0 @@
-package gorethink
-
-import (
-	"encoding/json"
-	"errors"
-	"reflect"
-	"sync/atomic"
-
-	"github.com/dancannon/gorethink/encoding"
-	p "github.com/dancannon/gorethink/ql2"
-)
-
-var (
-	errCursorClosed = errors.New("connection closed, cannot read cursor")
-)
-
-func newCursor(conn *Connection, cursorType string, token int64, term *Term, opts map[string]interface{}) *Cursor {
-	if cursorType == "" {
-		cursorType = "Cursor"
-	}
-
-	cursor := &Cursor{
-		conn:       conn,
-		token:      token,
-		cursorType: cursorType,
-		term:       term,
-		opts:       opts,
-	}
-
-	return cursor
-}
-
-// Cursor is the result of a query. Its cursor starts before the first row
-// of the result set. A Cursor is not thread safe and should only be accessed
-// by a single goroutine at any given time. Use Next to advance through the
-// rows:
-//
-//     cursor, err := query.Run(session)
-//     ...
-//     defer cursor.Close()
-//
-//     var response interface{}
-//     for cursor.Next(&response) {
-//         ...
-//     }
-//     err = cursor.Err() // get any error encountered during iteration
-//     ...
-type Cursor struct {
-	releaseConn func(error)
-
-	conn       *Connection
-	token      int64
-	cursorType string
-	term       *Term
-	opts       map[string]interface{}
-
-	lastErr   error
-	fetching  bool
-	closed    int32
-	finished  bool
-	isAtom    bool
-	buffer    queue
-	responses queue
-	profile   interface{}
-}
-
-// Profile returns the information returned from the query profiler.
-func (c *Cursor) Profile() interface{} {
-	return c.profile
-}
-
-// Type returns the cursor type (by default "Cursor")
-func (c *Cursor) Type() string {
-	return c.cursorType
-}
-
-// Err returns nil if no errors happened during iteration, or the actual
-// error otherwise.
-func (c *Cursor) Err() error {
-	return c.lastErr
-}
-
-// Close closes the cursor, preventing further enumeration. If the end is
-// encountered, the cursor is closed automatically. Close is idempotent.
-func (c *Cursor) Close() error {
-	var err error
-
-	if c.closed != 0 || !atomic.CompareAndSwapInt32(&c.closed, 0, 1) {
-		return nil
-	}
-
-	conn := c.conn
-	if conn == nil {
-		return nil
-	}
-	if conn.conn == nil {
-		return nil
-	}
-
-	// Stop any unfinished queries
-	if !c.finished {
-		q := Query{
-			Type:  p.Query_STOP,
-			Token: c.token,
-		}
-
-		_, _, err = conn.Query(q)
-	}
-
-	if c.releaseConn != nil {
-		c.releaseConn(err)
-	}
-
-	c.conn = nil
-	c.buffer.elems = nil
-	c.responses.elems = nil
-
-	return err
-}
-
-// Next retrieves the next document from the result set, blocking if necessary.
-// This method will also automatically retrieve another batch of documents from
-// the server when the current one is exhausted, or before that in background
-// if possible.
-//
-// Next returns true if a document was successfully unmarshalled onto result,
-// and false at the end of the result set or if an error happened.
-// When Next returns false, the Err method should be called to verify if
-// there was an error during iteration.
-//
-// Also note that you are able to reuse the same variable multiple times as
-// `Next` zeroes the value before scanning in the result.
-func (c *Cursor) Next(dest interface{}) bool {
-	if c.closed != 0 {
-		return false
-	}
-
-	hasMore, err := c.loadNext(dest)
-	if c.handleError(err) != nil {
-		c.Close()
-		return false
-	}
-
-	if !hasMore {
-		c.Close()
-	}
-
-	return hasMore
-}
-
-func (c *Cursor) loadNext(dest interface{}) (bool, error) {
-	for c.lastErr == nil {
-		// Check if response is closed/finished
-		if c.buffer.Len() == 0 && c.responses.Len() == 0 && c.closed != 0 {
-			return false, errCursorClosed
-		}
-
-		if c.buffer.Len() == 0 && c.responses.Len() == 0 && !c.finished {
-			err := c.fetchMore()
-			if err != nil {
-				return false, err
-			}
-		}
-
-		if c.buffer.Len() == 0 && c.responses.Len() == 0 && c.finished {
-			return false, nil
-		}
-
-		if c.buffer.Len() == 0 && c.responses.Len() > 0 {
-			if response, ok := c.responses.Pop().(json.RawMessage); ok {
-				var value interface{}
-				err := json.Unmarshal(response, &value)
-				if err != nil {
-					return false, err
-				}
-
-				value, err = recursivelyConvertPseudotype(value, c.opts)
-				if err != nil {
-					return false, err
-				}
-
-				// If response is an ATOM then try and convert to an array
-				if data, ok := value.([]interface{}); ok && c.isAtom {
-					for _, v := range data {
-						c.buffer.Push(v)
-					}
-				} else if value == nil {
-					c.buffer.Push(nil)
-				} else {
-					c.buffer.Push(value)
-				}
-			}
-		}
-
-		if c.buffer.Len() > 0 {
-			data := c.buffer.Pop()
-
-			err := encoding.Decode(dest, data)
-			if err != nil {
-				return false, err
-			}
-
-			return true, nil
-		}
-	}
-
-	return false, c.lastErr
-}
-
-// All retrieves all documents from the result set into the provided slice
-// and closes the cursor.
-//
-// The result argument must necessarily be the address for a slice. The slice
-// may be nil or previously allocated.
-//
-// Also note that you are able to reuse the same variable multiple times as
-// `All` zeroes the value before scanning in the result. It also attempts
-// to reuse the existing slice without allocating any more space by either
-// resizing or returning a selection of the slice if necessary.
-func (c *Cursor) All(result interface{}) error {
-	resultv := reflect.ValueOf(result)
-	if resultv.Kind() != reflect.Ptr || resultv.Elem().Kind() != reflect.Slice {
-		panic("result argument must be a slice address")
-	}
-	slicev := resultv.Elem()
-	slicev = slicev.Slice(0, slicev.Cap())
-	elemt := slicev.Type().Elem()
-	i := 0
-	for {
-		if slicev.Len() == i {
-			elemp := reflect.New(elemt)
-			if !c.Next(elemp.Interface()) {
-				break
-			}
-			slicev = reflect.Append(slicev, elemp.Elem())
-			slicev = slicev.Slice(0, slicev.Cap())
-		} else {
-			if !c.Next(slicev.Index(i).Addr().Interface()) {
-				break
-			}
-		}
-		i++
-	}
-	resultv.Elem().Set(slicev.Slice(0, i))
-
-	if err := c.Err(); err != nil {
-		c.Close()
-		return err
-	}
-
-	if err := c.Close(); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-// One retrieves a single document from the result set into the provided
-// slice and closes the cursor.
-//
-// Also note that you are able to reuse the same variable multiple times as
-// `One` zeroes the value before scanning in the result.
-func (c *Cursor) One(result interface{}) error {
-	if c.IsNil() {
-		c.Close()
-		return ErrEmptyResult
-	}
-
-	hasResult := c.Next(result)
-
-	if err := c.Err(); err != nil {
-		c.Close()
-		return err
-	}
-
-	if err := c.Close(); err != nil {
-		return err
-	}
-
-	if !hasResult {
-		return ErrEmptyResult
-	}
-
-	return nil
-}
-
-// Listen listens for rows from the database and sends the result onto the given
-// channel. The type that the row is scanned into is determined by the element
-// type of the channel.
-//
-// Also note that this function returns immediately.
-//
-//     cursor, err := r.Expr([]int{1,2,3}).Run(session)
-//     if err != nil {
-//         panic(err)
-//     }
-//
-//     ch := make(chan int)
-//     cursor.Listen(ch)
-//     <- ch // 1
-//     <- ch // 2
-//     <- ch // 3
-func (c *Cursor) Listen(channel interface{}) {
-	go func() {
-		channelv := reflect.ValueOf(channel)
-		if channelv.Kind() != reflect.Chan {
-			panic("input argument must be a channel")
-		}
-		elemt := channelv.Type().Elem()
-		for {
-			elemp := reflect.New(elemt)
-			if !c.Next(elemp.Interface()) {
-				break
-			}
-
-			channelv.Send(elemp.Elem())
-		}
-
-		c.Close()
-		channelv.Close()
-	}()
-}
-
-// IsNil tests if the current row is nil.
-func (c *Cursor) IsNil() bool {
-	if c.buffer.Len() > 0 {
-		bufferedItem := c.buffer.Peek()
-		if bufferedItem == nil {
-			return true
-		}
-
-		return false
-	}
-
-	if c.responses.Len() > 0 {
-		response := c.responses.Peek()
-		if response == nil {
-			return true
-		}
-
-		if response, ok := response.(json.RawMessage); ok {
-			if string(response) == "null" {
-				return true
-			}
-		}
-
-		return false
-	}
-
-	return true
-}
-
-// fetchMore fetches more rows from the database.
-//
-// If wait is true then it will wait for the database to reply otherwise it
-// will return after sending the continue query.
-func (c *Cursor) fetchMore() error {
-	var err error
-	if !c.fetching {
-		c.fetching = true
-
-		if c.closed != 0 {
-			return errCursorClosed
-		}
-
-		q := Query{
-			Type:  p.Query_CONTINUE,
-			Token: c.token,
-		}
-
-		_, _, err = c.conn.Query(q)
-		c.handleError(err)
-	}
-
-	return err
-}
-
-// handleError sets the value of lastErr to err if lastErr is not yet set.
-func (c *Cursor) handleError(err error) error {
-	return c.handleErrorLocked(err)
-}
-
-// handleError sets the value of lastErr to err if lastErr is not yet set.
-func (c *Cursor) handleErrorLocked(err error) error {
-	if c.lastErr == nil {
-		c.lastErr = err
-	}
-
-	return c.lastErr
-}
-
-// extend adds the result of a continue query to the cursor.
-func (c *Cursor) extend(response *Response) {
-	for _, response := range response.Responses {
-		c.responses.Push(response)
-	}
-
-	c.finished = response.Type != p.Response_SUCCESS_PARTIAL
-	c.fetching = false
-	c.isAtom = response.Type == p.Response_SUCCESS_ATOM
-
-	putResponse(response)
-}
-
-// Queue structure used for storing responses
-
-type queue struct {
-	elems               []interface{}
-	nelems, popi, pushi int
-}
-
-func (q *queue) Len() int {
-	if len(q.elems) == 0 {
-		return 0
-	}
-
-	return q.nelems
-}
-func (q *queue) Push(elem interface{}) {
-	if q.nelems == len(q.elems) {
-		q.expand()
-	}
-	q.elems[q.pushi] = elem
-	q.nelems++
-	q.pushi = (q.pushi + 1) % len(q.elems)
-}
-func (q *queue) Pop() (elem interface{}) {
-	if q.nelems == 0 {
-		return nil
-	}
-	elem = q.elems[q.popi]
-	q.elems[q.popi] = nil // Help GC.
-	q.nelems--
-	q.popi = (q.popi + 1) % len(q.elems)
-	return elem
-}
-func (q *queue) Peek() (elem interface{}) {
-	if q.nelems == 0 {
-		return nil
-	}
-	return q.elems[q.popi]
-}
-func (q *queue) expand() {
-	curcap := len(q.elems)
-	var newcap int
-	if curcap == 0 {
-		newcap = 8
-	} else if curcap < 1024 {
-		newcap = curcap * 2
-	} else {
-		newcap = curcap + (curcap / 4)
-	}
-	elems := make([]interface{}, newcap)
-	if q.popi == 0 {
-		copy(elems, q.elems)
-		q.pushi = curcap
-	} else {
-		newpopi := newcap - (curcap - q.popi)
-		copy(elems, q.elems[:q.popi])
-		copy(elems[newpopi:], q.elems[q.popi:])
-		q.popi = newpopi
-	}
-	for i := range q.elems {
-		q.elems[i] = nil // Help GC.
-	}
-	q.elems = elems
-}
diff --git a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/cursor_test.go b/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/cursor_test.go
deleted file mode 100644
index f83e7cb60..000000000
--- a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/cursor_test.go
+++ /dev/null
@@ -1,398 +0,0 @@
-package gorethink
-
-import (
-	"time"
-
-	test "gopkg.in/check.v1"
-)
-
-type object struct {
-	ID    int64  `gorethink:"id,omitempty"`
-	Name  string `gorethink:"name"`
-	Attrs []attr
-}
-
-type attr struct {
-	Name  string
-	Value interface{}
-}
-
-func (s *RethinkSuite) TestCursorLiteral(c *test.C) {
-	res, err := Expr(5).Run(session)
-	c.Assert(err, test.IsNil)
-	c.Assert(res.Type(), test.Equals, "Cursor")
-
-	var response interface{}
-	err = res.One(&response)
-	c.Assert(err, test.IsNil)
-	c.Assert(response, jsonEquals, 5)
-}
-
-func (s *RethinkSuite) TestCursorSlice(c *test.C) {
-	res, err := Expr([]interface{}{1, 2, 3, 4, 5}).Run(session)
-	c.Assert(err, test.IsNil)
-	c.Assert(res.Type(), test.Equals, "Cursor")
-
-	var response []interface{}
-	err = res.All(&response)
-	c.Assert(err, test.IsNil)
-	c.Assert(response, jsonEquals, []interface{}{1, 2, 3, 4, 5})
-}
-
-func (s *RethinkSuite) TestCursorPartiallyNilSlice(c *test.C) {
-	res, err := Expr(map[string]interface{}{
-		"item": []interface{}{
-			map[string]interface{}{"num": 1},
-			nil,
-		},
-	}).Run(session)
-	c.Assert(err, test.IsNil)
-	c.Assert(res.Type(), test.Equals, "Cursor")
-
-	var response map[string]interface{}
-	err = res.One(&response)
-	c.Assert(err, test.IsNil)
-	c.Assert(response, jsonEquals, map[string]interface{}{
-		"item": []interface{}{
-			map[string]interface{}{"num": 1},
-			nil,
-		},
-	})
-}
-
-func (s *RethinkSuite) TestCursorMap(c *test.C) {
-	res, err := Expr(map[string]interface{}{
-		"id":   2,
-		"name": "Object 1",
-	}).Run(session)
-	c.Assert(err, test.IsNil)
-	c.Assert(res.Type(), test.Equals, "Cursor")
-
-	var response map[string]interface{}
-	err = res.One(&response)
-	c.Assert(err, test.IsNil)
-	c.Assert(response, jsonEquals, map[string]interface{}{
-		"id":   2,
-		"name": "Object 1",
-	})
-}
-
-func (s *RethinkSuite) TestCursorMapIntoInterface(c *test.C) {
-	res, err := Expr(map[string]interface{}{
-		"id":   2,
-		"name": "Object 1",
-	}).Run(session)
-	c.Assert(err, test.IsNil)
-	c.Assert(res.Type(), test.Equals, "Cursor")
-
-	var response interface{}
-	err = res.One(&response)
-	c.Assert(err, test.IsNil)
-	c.Assert(response, jsonEquals, map[string]interface{}{
-		"id":   2,
-		"name": "Object 1",
-	})
-}
-
-func (s *RethinkSuite) TestCursorMapNested(c *test.C) {
-	res, err := Expr(map[string]interface{}{
-		"id":   2,
-		"name": "Object 1",
-		"attr": []interface{}{map[string]interface{}{
-			"name":  "attr 1",
-			"value": "value 1",
-		}},
-	}).Run(session)
-	c.Assert(err, test.IsNil)
-	c.Assert(res.Type(), test.Equals, "Cursor")
-
-	var response interface{}
-	err = res.One(&response)
-	c.Assert(err, test.IsNil)
-	c.Assert(response, jsonEquals, map[string]interface{}{
-		"id":   2,
-		"name": "Object 1",
-		"attr": []interface{}{map[string]interface{}{
-			"name":  "attr 1",
-			"value": "value 1",
-		}},
-	})
-}
-
-func (s *RethinkSuite) TestCursorStruct(c *test.C) {
-	res, err := Expr(map[string]interface{}{
-		"id":   2,
-		"name": "Object 1",
-		"Attrs": []interface{}{map[string]interface{}{
-			"Name":  "attr 1",
-			"Value": "value 1",
-		}},
-	}).Run(session)
-	c.Assert(err, test.IsNil)
-	c.Assert(res.Type(), test.Equals, "Cursor")
-
-	var response object
-	err = res.One(&response)
-	c.Assert(err, test.IsNil)
-	c.Assert(response, test.DeepEquals, object{
-		ID:   2,
-		Name: "Object 1",
-		Attrs: []attr{attr{
-			Name:  "attr 1",
-			Value: "value 1",
-		}},
-	})
-}
-
-func (s *RethinkSuite) TestCursorStructPseudoTypes(c *test.C) {
-	var zeroTime time.Time
-	t := time.Now()
-
-	res, err := Expr(map[string]interface{}{
-		"T": time.Unix(t.Unix(), 0).In(time.UTC),
-		"Z": zeroTime,
-		"B": []byte("hello"),
-	}).Run(session)
-	c.Assert(err, test.IsNil)
-
-	var response PseudoTypes
-	err = res.One(&response)
-	c.Assert(err, test.IsNil)
-	c.Assert(res.Type(), test.Equals, "Cursor")
-
-	c.Assert(response.T.Equal(time.Unix(t.Unix(), 0)), test.Equals, true)
-	c.Assert(response.Z.Equal(zeroTime), test.Equals, true)
-	c.Assert(response.B, jsonEquals, []byte("hello"))
-}
-
-func (s *RethinkSuite) TestCursorAtomString(c *test.C) {
-	res, err := Expr("a").Run(session)
-	c.Assert(err, test.IsNil)
-	c.Assert(res.Type(), test.Equals, "Cursor")
-
-	var response string
-	err = res.One(&response)
-	c.Assert(err, test.IsNil)
-	c.Assert(response, test.Equals, "a")
-}
-
-func (s *RethinkSuite) TestCursorAtomArray(c *test.C) {
-	res, err := Expr([]interface{}{1, 2, 3, 4, 5, 6, 7, 8, 9, 0}).Run(session)
-	c.Assert(err, test.IsNil)
-	c.Assert(res.Type(), test.Equals, "Cursor")
-
-	var response []int
-	err = res.All(&response)
-	c.Assert(err, test.IsNil)
-	c.Assert(response, test.DeepEquals, []int{1, 2, 3, 4, 5, 6, 7, 8, 9, 0})
-}
-
-func (s *RethinkSuite) TestEmptyResults(c *test.C) {
-	DBCreate("test").Exec(session)
-	DB("test").TableCreate("test").Exec(session)
-	res, err := DB("test").Table("test").Get("missing value").Run(session)
-	c.Assert(err, test.IsNil)
-	c.Assert(res.IsNil(), test.Equals, true)
-
-	res, err = DB("test").Table("test").Get("missing value").Run(session)
-	c.Assert(err, test.IsNil)
-	var response interface{}
-	err = res.One(&response)
-	c.Assert(err, test.Equals, ErrEmptyResult)
-	c.Assert(res.IsNil(), test.Equals, true)
-
-	res, err = Expr(nil).Run(session)
-	c.Assert(err, test.IsNil)
-	c.Assert(res.IsNil(), test.Equals, true)
-
-	res, err = DB("test").Table("test").Get("missing value").Run(session)
-	c.Assert(err, test.IsNil)
-	c.Assert(res.IsNil(), test.Equals, true)
-
-	res, err = DB("test").Table("test").GetAll("missing value", "another missing value").Run(session)
-	c.Assert(err, test.IsNil)
-	c.Assert(res.Next(&response), test.Equals, false)
-
-	var obj object
-	obj.Name = "missing value"
-	res, err = DB("test").Table("test").Filter(obj).Run(session)
-	c.Assert(err, test.IsNil)
-	c.Assert(res.IsNil(), test.Equals, true)
-}
-
-func (s *RethinkSuite) TestCursorAll(c *test.C) {
-	// Ensure table + database exist
-	DBCreate("test").Exec(session)
-	DB("test").TableDrop("Table3").Exec(session)
-	DB("test").TableCreate("Table3").Exec(session)
-	DB("test").Table("Table3").IndexCreate("num").Exec(session)
-
-	// Insert rows
-	DB("test").Table("Table3").Insert([]interface{}{
-		map[string]interface{}{
-			"id":   2,
-			"name": "Object 1",
-			"Attrs": []interface{}{map[string]interface{}{
-				"Name":  "attr 1",
-				"Value": "value 1",
-			}},
-		},
-		map[string]interface{}{
-			"id":   3,
-			"name": "Object 2",
-			"Attrs": []interface{}{map[string]interface{}{
-				"Name":  "attr 1",
-				"Value": "value 1",
-			}},
-		},
-	}).Exec(session)
-
-	// Test query
-	query := DB("test").Table("Table3").OrderBy("id")
-	res, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	var response []object
-	err = res.All(&response)
-	c.Assert(err, test.IsNil)
-	c.Assert(response, test.HasLen, 2)
-	c.Assert(response, test.DeepEquals, []object{
-		object{
-			ID:   2,
-			Name: "Object 1",
-			Attrs: []attr{attr{
-				Name:  "attr 1",
-				Value: "value 1",
-			}},
-		},
-		object{
-			ID:   3,
-			Name: "Object 2",
-			Attrs: []attr{attr{
-				Name:  "attr 1",
-				Value: "value 1",
-			}},
-		},
-	})
-}
-
-func (s *RethinkSuite) TestCursorListen(c *test.C) {
-	// Ensure table + database exist
-	DBCreate("test").Exec(session)
-	DB("test").TableDrop("Table3").Exec(session)
-	DB("test").TableCreate("Table3").Exec(session)
-	DB("test").Table("Table3").IndexCreate("num").Exec(session)
-
-	// Insert rows
-	DB("test").Table("Table3").Insert([]interface{}{
-		map[string]interface{}{
-			"id":   2,
-			"name": "Object 1",
-			"Attrs": []interface{}{map[string]interface{}{
-				"Name":  "attr 1",
-				"Value": "value 1",
-			}},
-		},
-		map[string]interface{}{
-			"id":   3,
-			"name": "Object 2",
-			"Attrs": []interface{}{map[string]interface{}{
-				"Name":  "attr 1",
-				"Value": "value 1",
-			}},
-		},
-	}).Exec(session)
-
-	// Test query
-	query := DB("test").Table("Table3").OrderBy("id")
-	res, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	ch := make(chan object)
-	res.Listen(ch)
-	var response []object
-	for v := range ch {
-		response = append(response, v)
-	}
-
-	c.Assert(response, test.HasLen, 2)
-	c.Assert(response, test.DeepEquals, []object{
-		object{
-			ID:   2,
-			Name: "Object 1",
-			Attrs: []attr{attr{
-				Name:  "attr 1",
-				Value: "value 1",
-			}},
-		},
-		object{
-			ID:   3,
-			Name: "Object 2",
-			Attrs: []attr{attr{
-				Name:  "attr 1",
-				Value: "value 1",
-			}},
-		},
-	})
-}
-
-func (s *RethinkSuite) TestCursorReuseResult(c *test.C) {
-	// Test query
-	query := Expr([]interface{}{
-		map[string]interface{}{
-			"A": "a",
-		},
-		map[string]interface{}{
-			"B": 1,
-		},
-		map[string]interface{}{
-			"A": "a",
-		},
-		map[string]interface{}{
-			"B": 1,
-		},
-		map[string]interface{}{
-			"A": "a",
-			"B": 1,
-		},
-	})
-	res, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	var i int
-	var result SimpleT
-	for res.Next(&result) {
-		switch i {
-		case 0:
-			c.Assert(result, test.DeepEquals, SimpleT{
-				A: "a",
-				B: 0,
-			})
-		case 1:
-			c.Assert(result, test.DeepEquals, SimpleT{
-				A: "",
-				B: 1,
-			})
-		case 2:
-			c.Assert(result, test.DeepEquals, SimpleT{
-				A: "a",
-				B: 0,
-			})
-		case 3:
-			c.Assert(result, test.DeepEquals, SimpleT{
-				A: "",
-				B: 1,
-			})
-		case 4:
-			c.Assert(result, test.DeepEquals, SimpleT{
-				A: "a",
-				B: 1,
-			})
-		default:
-			c.Fatalf("Unexpected number of results")
-		}
-
-		i++
-	}
-	c.Assert(res.Err(), test.IsNil)
-}
diff --git a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/doc.go b/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/doc.go
deleted file mode 100644
index e14feb965..000000000
--- a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/doc.go
+++ /dev/null
@@ -1,6 +0,0 @@
-// Package gorethink implements a Go driver for RethinkDB
-//
-// Current version: v1.0.0 (RethinkDB v2.0)
-// For more in depth information on how to use RethinkDB check out the API docs
-// at http://rethinkdb.com/api
-package gorethink
diff --git a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/encoding/cache.go b/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/encoding/cache.go
deleted file mode 100644
index feb28f2a5..000000000
--- a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/encoding/cache.go
+++ /dev/null
@@ -1,258 +0,0 @@
-// This code is based on encoding/json and gorilla/schema
-
-package encoding
-
-import (
-	"reflect"
-	"sort"
-	"sync"
-)
-
-// A field represents a single field found in a struct.
-type field struct {
-	name      string
-	nameBytes []byte // []byte(name)
-	equalFold func(s, t []byte) bool
-
-	tag       bool
-	index     []int
-	typ       reflect.Type
-	omitEmpty bool
-	quoted    bool
-}
-
-func fillField(f field) field {
-	f.nameBytes = []byte(f.name)
-	f.equalFold = foldFunc(f.nameBytes)
-
-	return f
-}
-
-// byName sorts field by name, breaking ties with depth,
-// then breaking ties with "name came from tag", then
-// breaking ties with index sequence.
-type byName []field
-
-func (x byName) Len() int { return len(x) }
-
-func (x byName) Swap(i, j int) { x[i], x[j] = x[j], x[i] }
-
-func (x byName) Less(i, j int) bool {
-	if x[i].name != x[j].name {
-		return x[i].name < x[j].name
-	}
-	if len(x[i].index) != len(x[j].index) {
-		return len(x[i].index) < len(x[j].index)
-	}
-	if x[i].tag != x[j].tag {
-		return x[i].tag
-	}
-	return byIndex(x).Less(i, j)
-}
-
-// byIndex sorts field by index sequence.
-type byIndex []field
-
-func (x byIndex) Len() int { return len(x) }
-
-func (x byIndex) Swap(i, j int) { x[i], x[j] = x[j], x[i] }
-
-func (x byIndex) Less(i, j int) bool {
-	for k, xik := range x[i].index {
-		if k >= len(x[j].index) {
-			return false
-		}
-		if xik != x[j].index[k] {
-			return xik < x[j].index[k]
-		}
-	}
-	return len(x[i].index) < len(x[j].index)
-}
-
-// typeFields returns a list of fields that should be recognized for the given type.
-// The algorithm is breadth-first search over the set of structs to include - the top struct
-// and then any reachable anonymous structs.
-func typeFields(t reflect.Type) []field {
-	// Anonymous fields to explore at the current level and the next.
-	current := []field{}
-	next := []field{{typ: t}}
-
-	// Count of queued names for current level and the next.
-	count := map[reflect.Type]int{}
-	nextCount := map[reflect.Type]int{}
-
-	// Types already visited at an earlier level.
-	visited := map[reflect.Type]bool{}
-
-	// Fields found.
-	var fields []field
-
-	for len(next) > 0 {
-		current, next = next, current[:0]
-		count, nextCount = nextCount, map[reflect.Type]int{}
-
-		for _, f := range current {
-			if visited[f.typ] {
-				continue
-			}
-			visited[f.typ] = true
-
-			// Scan f.typ for fields to include.
-			for i := 0; i < f.typ.NumField(); i++ {
-				sf := f.typ.Field(i)
-				if sf.PkgPath != "" { // unexported
-					continue
-				}
-				tag := getTag(sf)
-				if tag == "-" {
-					continue
-				}
-				name, opts := parseTag(tag)
-				if !isValidTag(name) {
-					name = ""
-				}
-				index := make([]int, len(f.index)+1)
-				copy(index, f.index)
-				index[len(f.index)] = i
-
-				ft := sf.Type
-				if ft.Name() == "" && ft.Kind() == reflect.Ptr {
-					// Follow pointer.
-					ft = ft.Elem()
-				}
-
-				// Record found field and index sequence.
-				if name != "" || !sf.Anonymous || ft.Kind() != reflect.Struct {
-					tagged := name != ""
-					if name == "" {
-						name = sf.Name
-					}
-					fields = append(fields, fillField(field{
-						name:      name,
-						tag:       tagged,
-						index:     index,
-						typ:       ft,
-						omitEmpty: opts.Contains("omitempty"),
-					}))
-					if count[f.typ] > 1 {
-						// If there were multiple instances, add a second,
-						// so that the annihilation code will see a duplicate.
-						// It only cares about the distinction between 1 or 2,
-						// so don't bother generating any more copies.
-						fields = append(fields, fields[len(fields)-1])
-					}
-					continue
-				}
-
-				// Record new anonymous struct to explore in next round.
-				nextCount[ft]++
-				if nextCount[ft] == 1 {
-					next = append(next, fillField(field{name: ft.Name(), index: index, typ: ft}))
-				}
-			}
-		}
-	}
-
-	sort.Sort(byName(fields))
-
-	// Delete all fields that are hidden by the Go rules for embedded fields,
-	// except that fields with valid tags are promoted.
-
-	// The fields are sorted in primary order of name, secondary order
-	// of field index length. Loop over names; for each name, delete
-	// hidden fields by choosing the one dominant field that survives.
-	out := fields[:0]
-	for advance, i := 0, 0; i < len(fields); i += advance {
-		// One iteration per name.
-		// Find the sequence of fields with the name of this first field.
-		fi := fields[i]
-		name := fi.name
-		for advance = 1; i+advance < len(fields); advance++ {
-			fj := fields[i+advance]
-			if fj.name != name {
-				break
-			}
-		}
-		if advance == 1 { // Only one field with this name
-			out = append(out, fi)
-			continue
-		}
-		dominant, ok := dominantField(fields[i : i+advance])
-		if ok {
-			out = append(out, dominant)
-		}
-	}
-
-	fields = out
-	sort.Sort(byIndex(fields))
-
-	return fields
-}
-
-// dominantField looks through the fields, all of which are known to
-// have the same name, to find the single field that dominates the
-// others using Go's embedding rules, modified by the presence of
-// valid tags. If there are multiple top-level fields, the boolean
-// will be false: This condition is an error in Go and we skip all
-// the fields.
-func dominantField(fields []field) (field, bool) {
-	// The fields are sorted in increasing index-length order. The winner
-	// must therefore be one with the shortest index length. Drop all
-	// longer entries, which is easy: just truncate the slice.
-	length := len(fields[0].index)
-	tagged := -1 // Index of first tagged field.
-	for i, f := range fields {
-		if len(f.index) > length {
-			fields = fields[:i]
-			break
-		}
-		if f.tag {
-			if tagged >= 0 {
-				// Multiple tagged fields at the same level: conflict.
-				// Return no field.
-				return field{}, false
-			}
-			tagged = i
-		}
-	}
-	if tagged >= 0 {
-		return fields[tagged], true
-	}
-	// All remaining fields have the same length. If there's more than one,
-	// we have a conflict (two fields named "X" at the same level) and we
-	// return no field.
-	if len(fields) > 1 {
-		return field{}, false
-	}
-	return fields[0], true
-}
-
-var fieldCache struct {
-	sync.RWMutex
-	m map[reflect.Type][]field
-}
-
-// cachedTypeFields is like typeFields but uses a cache to avoid repeated work.
-func cachedTypeFields(t reflect.Type) []field {
-	fieldCache.RLock()
-	f := fieldCache.m[t]
-	fieldCache.RUnlock()
-	if f != nil {
-		return f
-	}
-
-	// Compute fields without lock.
-	// Might duplicate effort but won't hold other computations back.
-	f = typeFields(t)
-	if f == nil {
-		f = []field{}
-	}
-
-	fieldCache.Lock()
-	if fieldCache.m == nil {
-		fieldCache.m = map[reflect.Type][]field{}
-	}
-	fieldCache.m[t] = f
-	fieldCache.Unlock()
-	return f
-}
diff --git a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/encoding/decoder.go b/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/encoding/decoder.go
deleted file mode 100644
index f50478abb..000000000
--- a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/encoding/decoder.go
+++ /dev/null
@@ -1,141 +0,0 @@
-package encoding
-
-import (
-	"errors"
-	"reflect"
-	"runtime"
-	"sync"
-)
-
-var byteSliceType = reflect.TypeOf([]byte(nil))
-
-type decoderFunc func(dv reflect.Value, sv reflect.Value)
-
-// Decode decodes map[string]interface{} into a struct. The first parameter
-// must be a pointer.
-func Decode(dst interface{}, src interface{}) (err error) {
-	defer func() {
-		if r := recover(); r != nil {
-			if _, ok := r.(runtime.Error); ok {
-				panic(r)
-			}
-			if v, ok := r.(string); ok {
-				err = errors.New(v)
-			} else {
-				err = r.(error)
-			}
-		}
-	}()
-
-	dv := reflect.ValueOf(dst)
-	sv := reflect.ValueOf(src)
-	if dv.Kind() != reflect.Ptr {
-		return &DecodeTypeError{
-			DestType: dv.Type(),
-			SrcType:  sv.Type(),
-			Reason:   "must be a pointer",
-		}
-	}
-
-	dv = dv.Elem()
-	if !dv.CanAddr() {
-		return &DecodeTypeError{
-			DestType: dv.Type(),
-			SrcType:  sv.Type(),
-			Reason:   "must be addressable",
-		}
-	}
-
-	decode(dv, sv)
-	return nil
-}
-
-// decode decodes the source value into the destination value
-func decode(dv, sv reflect.Value) {
-	valueDecoder(dv, sv)(dv, sv)
-}
-
-type decoderCacheKey struct {
-	dt, st reflect.Type
-}
-
-var decoderCache struct {
-	sync.RWMutex
-	m map[decoderCacheKey]decoderFunc
-}
-
-func valueDecoder(dv, sv reflect.Value) decoderFunc {
-	if !sv.IsValid() {
-		return invalidValueDecoder
-	}
-
-	if dv.IsValid() {
-		dv = indirect(dv, false)
-		dv.Set(reflect.Zero(dv.Type()))
-	}
-
-	return typeDecoder(dv.Type(), sv.Type())
-}
-
-func typeDecoder(dt, st reflect.Type) decoderFunc {
-	decoderCache.RLock()
-	f := decoderCache.m[decoderCacheKey{dt, st}]
-	decoderCache.RUnlock()
-	if f != nil {
-		return f
-	}
-
-	// To deal with recursive types, populate the map with an
-	// indirect func before we build it. This type waits on the
-	// real func (f) to be ready and then calls it.  This indirect
-	// func is only used for recursive types.
-	decoderCache.Lock()
-	var wg sync.WaitGroup
-	wg.Add(1)
-	decoderCache.m[decoderCacheKey{dt, st}] = func(dv, sv reflect.Value) {
-		wg.Wait()
-		f(dv, sv)
-	}
-	decoderCache.Unlock()
-
-	// Compute fields without lock.
-	// Might duplicate effort but won't hold other computations back.
-	f = newTypeDecoder(dt, st)
-	wg.Done()
-	decoderCache.Lock()
-	decoderCache.m[decoderCacheKey{dt, st}] = f
-	decoderCache.Unlock()
-	return f
-}
-
-// indirect walks down v allocating pointers as needed,
-// until it gets to a non-pointer.
-func indirect(v reflect.Value, decodeNull bool) reflect.Value {
-	// If v is a named type and is addressable,
-	// start with its address, so that if the type has pointer methods,
-	// we find them.
-	if v.Kind() != reflect.Ptr && v.Type().Name() != "" && v.CanAddr() {
-		v = v.Addr()
-	}
-	for {
-		// Load value from interface, but only if the result will be
-		// usefully addressable.
-		if v.Kind() == reflect.Interface && !v.IsNil() {
-			e := v.Elem()
-			if e.Kind() == reflect.Ptr && !e.IsNil() && (!decodeNull || e.Elem().Kind() == reflect.Ptr) {
-				v = e
-				continue
-			}
-		}
-
-		if v.Kind() != reflect.Ptr {
-			break
-		}
-
-		if v.IsNil() {
-			v.Set(reflect.New(v.Type().Elem()))
-		}
-		v = v.Elem()
-	}
-	return v
-}
diff --git a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/encoding/decoder_test.go b/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/encoding/decoder_test.go
deleted file mode 100644
index 909b2cc2d..000000000
--- a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/encoding/decoder_test.go
+++ /dev/null
@@ -1,426 +0,0 @@
-package encoding
-
-import (
-	"bytes"
-	"encoding/json"
-	"image"
-	"reflect"
-	"testing"
-)
-
-type T struct {
-	X string
-	Y int
-	Z int `gorethink:"-"`
-}
-
-type U struct {
-	Alphabet string `gorethink:"alpha"`
-}
-
-type V struct {
-	F1 interface{}
-	F2 int32
-	F3 string
-}
-
-type tx struct {
-	x int
-}
-
-var txType = reflect.TypeOf((*tx)(nil)).Elem()
-
-// Test data structures for anonymous fields.
-
-type Point struct {
-	Z int
-}
-
-type Top struct {
-	Level0 int
-	Embed0
-	*Embed0a
-	*Embed0b `gorethink:"e,omitempty"` // treated as named
-	Embed0c  `gorethink:"-"`           // ignored
-	Loop
-	Embed0p // has Point with X, Y, used
-	Embed0q // has Point with Z, used
-}
-
-type Embed0 struct {
-	Level1a int // overridden by Embed0a's Level1a with tag
-	Level1b int // used because Embed0a's Level1b is renamed
-	Level1c int // used because Embed0a's Level1c is ignored
-	Level1d int // annihilated by Embed0a's Level1d
-	Level1e int `gorethink:"x"` // annihilated by Embed0a.Level1e
-}
-
-type Embed0a struct {
-	Level1a int `gorethink:"Level1a,omitempty"`
-	Level1b int `gorethink:"LEVEL1B,omitempty"`
-	Level1c int `gorethink:"-"`
-	Level1d int // annihilated by Embed0's Level1d
-	Level1f int `gorethink:"x"` // annihilated by Embed0's Level1e
-}
-
-type Embed0b Embed0
-
-type Embed0c Embed0
-
-type Embed0p struct {
-	image.Point
-}
-
-type Embed0q struct {
-	Point
-}
-
-type Loop struct {
-	Loop1 int `gorethink:",omitempty"`
-	Loop2 int `gorethink:",omitempty"`
-	*Loop
-}
-
-// From reflect test:
-// The X in S6 and S7 annihilate, but they also block the X in S8.S9.
-type S5 struct {
-	S6
-	S7
-	S8
-}
-
-type S6 struct {
-	X int
-}
-
-type S7 S6
-
-type S8 struct {
-	S9
-}
-
-type S9 struct {
-	X int
-	Y int
-}
-
-// From reflect test:
-// The X in S11.S6 and S12.S6 annihilate, but they also block the X in S13.S8.S9.
-type S10 struct {
-	S11
-	S12
-	S13
-}
-
-type S11 struct {
-	S6
-}
-
-type S12 struct {
-	S6
-}
-
-type S13 struct {
-	S8
-}
-
-type Pointer struct {
-	PPoint *Point
-	Point  Point
-}
-
-type decodeTest struct {
-	in  interface{}
-	ptr interface{}
-	out interface{}
-	err error
-}
-
-type Ambig struct {
-	// Given "hello", the first match should win.
-	First  int `gorethink:"HELLO"`
-	Second int `gorethink:"Hello"`
-}
-
-var decodeTests = []decodeTest{
-	// basic types
-	{in: true, ptr: new(bool), out: true},
-	{in: 1, ptr: new(int), out: 1},
-	{in: 1.2, ptr: new(float64), out: 1.2},
-	{in: -5, ptr: new(int16), out: int16(-5)},
-	{in: 2, ptr: new(string), out: string("2")},
-	{in: float64(2.0), ptr: new(interface{}), out: float64(2.0)},
-	{in: string("2"), ptr: new(interface{}), out: string("2")},
-	{in: "a\u1234", ptr: new(string), out: "a\u1234"},
-	{in: []interface{}{}, ptr: new([]string), out: []string{}},
-	{in: map[string]interface{}{"X": []interface{}{1, 2, 3}, "Y": 4}, ptr: new(T), out: T{}, err: &DecodeTypeError{reflect.TypeOf(""), reflect.TypeOf([]interface{}{}), ""}},
-	{in: map[string]interface{}{"x": 1}, ptr: new(tx), out: tx{}},
-	{in: map[string]interface{}{"F1": float64(1), "F2": 2, "F3": 3}, ptr: new(V), out: V{F1: float64(1), F2: int32(2), F3: string("3")}},
-	{in: map[string]interface{}{"F1": string("1"), "F2": 2, "F3": 3}, ptr: new(V), out: V{F1: string("1"), F2: int32(2), F3: string("3")}},
-	{
-		in:  map[string]interface{}{"k1": int64(1), "k2": "s", "k3": []interface{}{int64(1), 2.0, 3e-3}, "k4": map[string]interface{}{"kk1": "s", "kk2": int64(2)}},
-		out: map[string]interface{}{"k1": int64(1), "k2": "s", "k3": []interface{}{int64(1), 2.0, 3e-3}, "k4": map[string]interface{}{"kk1": "s", "kk2": int64(2)}},
-		ptr: new(interface{}),
-	},
-
-	// Z has a "-" tag.
-	{in: map[string]interface{}{"Y": 1, "Z": 2}, ptr: new(T), out: T{Y: 1}},
-
-	{in: map[string]interface{}{"alpha": "abc", "alphabet": "xyz"}, ptr: new(U), out: U{Alphabet: "abc"}},
-	{in: map[string]interface{}{"alpha": "abc"}, ptr: new(U), out: U{Alphabet: "abc"}},
-	{in: map[string]interface{}{"alphabet": "xyz"}, ptr: new(U), out: U{}},
-
-	// array tests
-	{in: []interface{}{1, 2, 3}, ptr: new([3]int), out: [3]int{1, 2, 3}},
-	{in: []interface{}{1, 2, 3}, ptr: new([1]int), out: [1]int{1}},
-	{in: []interface{}{1, 2, 3}, ptr: new([5]int), out: [5]int{1, 2, 3, 0, 0}},
-
-	// empty array to interface test
-	{in: map[string]interface{}{"T": []interface{}{}}, ptr: new(map[string]interface{}), out: map[string]interface{}{"T": []interface{}{}}},
-
-	{
-		in: map[string]interface{}{
-			"Level0":  1,
-			"Level1b": 2,
-			"Level1c": 3,
-			"level1d": 4,
-			"Level1a": 5,
-			"LEVEL1B": 6,
-			"e": map[string]interface{}{
-				"Level1a": 8,
-				"Level1b": 9,
-				"Level1c": 10,
-				"Level1d": 11,
-				"x":       12,
-			},
-			"Loop1": 13,
-			"Loop2": 14,
-			"X":     15,
-			"Y":     16,
-			"Z":     17,
-		},
-		ptr: new(Top),
-		out: Top{
-			Level0: 1,
-			Embed0: Embed0{
-				Level1b: 2,
-				Level1c: 3,
-			},
-			Embed0a: &Embed0a{
-				Level1a: 5,
-				Level1b: 6,
-			},
-			Embed0b: &Embed0b{
-				Level1a: 8,
-				Level1b: 9,
-				Level1c: 10,
-				Level1d: 11,
-			},
-			Loop: Loop{
-				Loop1: 13,
-				Loop2: 14,
-			},
-			Embed0p: Embed0p{
-				Point: image.Point{X: 15, Y: 16},
-			},
-			Embed0q: Embed0q{
-				Point: Point{Z: 17},
-			},
-		},
-	},
-	{
-		in:  map[string]interface{}{"hello": 1},
-		ptr: new(Ambig),
-		out: Ambig{First: 1},
-	},
-	{
-		in:  map[string]interface{}{"X": 1, "Y": 2},
-		ptr: new(S5),
-		out: S5{S8: S8{S9: S9{Y: 2}}},
-	},
-	{
-		in:  map[string]interface{}{"X": 1, "Y": 2},
-		ptr: new(S10),
-		out: S10{S13: S13{S8: S8{S9: S9{Y: 2}}}},
-	},
-	{
-		in:  map[string]interface{}{"PPoint": map[string]interface{}{"Z": 1}, "Point": map[string]interface{}{"Z": 2}},
-		ptr: new(Pointer),
-		out: Pointer{PPoint: &Point{Z: 1}, Point: Point{Z: 2}},
-	},
-	{
-		in:  map[string]interface{}{"Point": map[string]interface{}{"Z": 2}},
-		ptr: new(Pointer),
-		out: Pointer{PPoint: nil, Point: Point{Z: 2}},
-	},
-}
-
-func TestDecode(t *testing.T) {
-	for i, tt := range decodeTests {
-		if tt.ptr == nil {
-			continue
-		}
-
-		// v = new(right-type)
-		v := reflect.New(reflect.TypeOf(tt.ptr).Elem())
-
-		err := Decode(v.Interface(), tt.in)
-		if !jsonEqual(err, tt.err) {
-			t.Errorf("#%d: got error %v want %v", i, err, tt.err)
-			continue
-		}
-
-		if tt.err == nil && !jsonEqual(v.Elem().Interface(), tt.out) {
-			t.Errorf("#%d: mismatch\nhave: %+v\nwant: %+v", i, v.Elem().Interface(), tt.out)
-			continue
-		}
-
-		// Check round trip.
-		if tt.err == nil {
-			enc, err := Encode(v.Interface())
-			if err != nil {
-				t.Errorf("#%d: error re-marshaling: %v", i, err)
-				continue
-			}
-			vv := reflect.New(reflect.TypeOf(tt.ptr).Elem())
-
-			if err := Decode(vv.Interface(), enc); err != nil {
-				t.Errorf("#%d: error re-decodeing: %v", i, err)
-				continue
-			}
-			if !jsonEqual(v.Elem().Interface(), vv.Elem().Interface()) {
-				t.Errorf("#%d: mismatch\nhave: %#+v\nwant: %#+v", i, v.Elem().Interface(), vv.Elem().Interface())
-				continue
-			}
-		}
-	}
-}
-
-func TestStringKind(t *testing.T) {
-	type aMap map[string]int
-
-	var m1, m2 map[string]int
-	m1 = map[string]int{
-		"foo": 42,
-	}
-
-	data, err := Encode(m1)
-	if err != nil {
-		t.Errorf("Unexpected error encoding: %v", err)
-	}
-
-	err = Decode(&m2, data)
-	if err != nil {
-		t.Errorf("Unexpected error decoding: %v", err)
-	}
-
-	if !jsonEqual(m1, m2) {
-		t.Error("Items should be equal after encoding and then decoding")
-	}
-
-}
-
-// Test handling of unexported fields that should be ignored.
-type unexportedFields struct {
-	Name string
-	m    map[string]interface{} `gorethink:"-"`
-	m2   map[string]interface{} `gorethink:"abcd"`
-}
-
-func TestDecodeUnexported(t *testing.T) {
-	input := map[string]interface{}{
-		"Name": "Bob",
-		"m": map[string]interface{}{
-			"x": 123,
-		},
-		"m2": map[string]interface{}{
-			"y": 123,
-		},
-		"abcd": map[string]interface{}{
-			"z": 789,
-		},
-	}
-	want := &unexportedFields{Name: "Bob"}
-
-	out := &unexportedFields{}
-	err := Decode(out, input)
-	if err != nil {
-		t.Errorf("got error %v, expected nil", err)
-	}
-	if !jsonEqual(out, want) {
-		t.Errorf("got %q, want %q", out, want)
-	}
-}
-
-type Foo struct {
-	FooBar interface{} `gorethink:"foobar"`
-}
-type Bar struct {
-	Baz int `gorethink:"baz"`
-}
-
-type UnmarshalerPointer struct {
-	Value *UnmarshalerValue
-}
-
-type UnmarshalerValue struct {
-	ValueInt    int64
-	ValueString string
-}
-
-func (v *UnmarshalerValue) MarshalRQL() (interface{}, error) {
-	if v.ValueInt != int64(0) {
-		return Encode(v.ValueInt)
-	}
-	if v.ValueString != "" {
-		return Encode(v.ValueString)
-	}
-
-	return Encode(nil)
-}
-
-func (v *UnmarshalerValue) UnmarshalRQL(b interface{}) (err error) {
-	n, s := int64(0), ""
-
-	if err = Decode(&s, b); err == nil {
-		v.ValueString = s
-		return
-	}
-	if err = Decode(&n, b); err == nil {
-		v.ValueInt = n
-
-	}
-
-	return
-}
-
-func TestDecodeUnmarshalerPointer(t *testing.T) {
-	input := map[string]interface{}{
-		"Value": "abc",
-	}
-	want := &UnmarshalerPointer{
-		Value: &UnmarshalerValue{ValueString: "abc"},
-	}
-
-	out := &UnmarshalerPointer{}
-	err := Decode(out, input)
-	if err != nil {
-		t.Errorf("got error %v, expected nil", err)
-	}
-	if !jsonEqual(out, want) {
-		t.Errorf("got %q, want %q", out, want)
-	}
-}
-
-func jsonEqual(a, b interface{}) bool {
-	ba, err := json.Marshal(a)
-	if err != nil {
-		panic(err)
-	}
-	bb, err := json.Marshal(b)
-	if err != nil {
-		panic(err)
-	}
-
-	return bytes.Compare(ba, bb) == 0
-}
diff --git a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/encoding/decoder_types.go b/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/encoding/decoder_types.go
deleted file mode 100644
index 61d268f83..000000000
--- a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/encoding/decoder_types.go
+++ /dev/null
@@ -1,524 +0,0 @@
-package encoding
-
-import (
-	"bytes"
-	"fmt"
-	"reflect"
-	"strconv"
-)
-
-// newTypeDecoder constructs an decoderFunc for a type.
-func newTypeDecoder(dt, st reflect.Type) decoderFunc {
-	if reflect.PtrTo(dt).Implements(unmarshalerType) ||
-		dt.Implements(unmarshalerType) {
-		return unmarshalerDecoder
-	}
-
-	if st.Kind() == reflect.Interface {
-		return interfaceAsTypeDecoder
-	}
-
-	switch dt.Kind() {
-	case reflect.Bool:
-		switch st.Kind() {
-		case reflect.Bool:
-			return boolAsBoolDecoder
-		case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
-			return intAsBoolDecoder
-		case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uintptr:
-			return uintAsBoolDecoder
-		case reflect.Float32, reflect.Float64:
-			return floatAsBoolDecoder
-		case reflect.String:
-			return stringAsBoolDecoder
-		default:
-			return decodeTypeError
-		}
-	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
-		switch st.Kind() {
-		case reflect.Bool:
-			return boolAsIntDecoder
-		case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
-			return intAsIntDecoder
-		case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uintptr:
-			return uintAsIntDecoder
-		case reflect.Float32, reflect.Float64:
-			return floatAsIntDecoder
-		case reflect.String:
-			return stringAsIntDecoder
-		default:
-			return decodeTypeError
-		}
-	case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uintptr:
-		switch st.Kind() {
-		case reflect.Bool:
-			return boolAsUintDecoder
-		case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
-			return intAsUintDecoder
-		case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uintptr:
-			return uintAsUintDecoder
-		case reflect.Float32, reflect.Float64:
-			return floatAsUintDecoder
-		case reflect.String:
-			return stringAsUintDecoder
-		default:
-			return decodeTypeError
-		}
-	case reflect.Float32, reflect.Float64:
-		switch st.Kind() {
-		case reflect.Bool:
-			return boolAsFloatDecoder
-		case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
-			return intAsFloatDecoder
-		case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uintptr:
-			return uintAsFloatDecoder
-		case reflect.Float32, reflect.Float64:
-			return floatAsFloatDecoder
-		case reflect.String:
-			return stringAsFloatDecoder
-		default:
-			return decodeTypeError
-		}
-	case reflect.String:
-		switch st.Kind() {
-		case reflect.Bool:
-			return boolAsStringDecoder
-		case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
-			return intAsStringDecoder
-		case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uintptr:
-			return uintAsStringDecoder
-		case reflect.Float32, reflect.Float64:
-			return floatAsStringDecoder
-		case reflect.String:
-			return stringAsStringDecoder
-		default:
-			return decodeTypeError
-		}
-	case reflect.Interface:
-		if !st.AssignableTo(dt) {
-			return decodeTypeError
-		}
-
-		return interfaceDecoder
-	case reflect.Ptr:
-		return newPtrDecoder(dt, st)
-	case reflect.Map:
-		if st.AssignableTo(dt) {
-			return interfaceDecoder
-		}
-
-		switch st.Kind() {
-		case reflect.Map:
-			return newMapAsMapDecoder(dt, st)
-		default:
-			return decodeTypeError
-		}
-	case reflect.Struct:
-		if st.AssignableTo(dt) {
-			return interfaceDecoder
-		}
-
-		switch st.Kind() {
-		case reflect.Map:
-			if kind := st.Key().Kind(); kind != reflect.String && kind != reflect.Interface {
-				return newDecodeTypeError(fmt.Errorf("map needs string keys"))
-			}
-
-			return newMapAsStructDecoder(dt, st)
-		default:
-			return decodeTypeError
-		}
-	case reflect.Slice:
-		if st.AssignableTo(dt) {
-			return interfaceDecoder
-		}
-
-		switch st.Kind() {
-		case reflect.Array, reflect.Slice:
-			return newSliceDecoder(dt, st)
-		default:
-			return decodeTypeError
-		}
-	case reflect.Array:
-		if st.AssignableTo(dt) {
-			return interfaceDecoder
-		}
-
-		switch st.Kind() {
-		case reflect.Array, reflect.Slice:
-			return newArrayDecoder(dt, st)
-		default:
-			return decodeTypeError
-		}
-	default:
-		return unsupportedTypeDecoder
-	}
-}
-
-func invalidValueDecoder(dv, sv reflect.Value) {
-	dv.Set(reflect.Zero(dv.Type()))
-}
-
-func unsupportedTypeDecoder(dv, sv reflect.Value) {
-	panic(&UnsupportedTypeError{dv.Type()})
-}
-
-func decodeTypeError(dv, sv reflect.Value) {
-	panic(&DecodeTypeError{
-		DestType: dv.Type(),
-		SrcType:  sv.Type(),
-	})
-}
-
-func newDecodeTypeError(err error) decoderFunc {
-	return func(dv, sv reflect.Value) {
-		panic(&DecodeTypeError{
-			DestType: dv.Type(),
-			SrcType:  sv.Type(),
-			Reason:   err.Error(),
-		})
-	}
-}
-
-func interfaceDecoder(dv, sv reflect.Value) {
-	dv.Set(sv)
-}
-
-func interfaceAsTypeDecoder(dv, sv reflect.Value) {
-	decode(dv, sv.Elem())
-}
-
-type ptrDecoder struct {
-	elemDec decoderFunc
-}
-
-func (d *ptrDecoder) decode(dv, sv reflect.Value) {
-	v := reflect.New(dv.Type().Elem())
-	d.elemDec(v, sv)
-	dv.Set(v)
-}
-
-func newPtrDecoder(dt, st reflect.Type) decoderFunc {
-	dec := &ptrDecoder{typeDecoder(dt.Elem(), st)}
-
-	return dec.decode
-}
-
-func unmarshalerDecoder(dv, sv reflect.Value) {
-	// modeled off of https://golang.org/src/encoding/json/decode.go?#L325
-	if dv.Kind() != reflect.Ptr && dv.Type().Name() != "" && dv.CanAddr() {
-		dv = dv.Addr()
-	}
-
-	if dv.IsNil() {
-		dv.Set(reflect.New(dv.Type().Elem()))
-	}
-
-	u := dv.Interface().(Unmarshaler)
-	err := u.UnmarshalRQL(sv.Interface())
-	if err != nil {
-		panic(&DecodeTypeError{dv.Type(), sv.Type(), err.Error()})
-	}
-}
-
-// Boolean decoders
-
-func boolAsBoolDecoder(dv, sv reflect.Value) {
-	dv.SetBool(sv.Bool())
-}
-func boolAsIntDecoder(dv, sv reflect.Value) {
-	if sv.Bool() {
-		dv.SetInt(1)
-	} else {
-		dv.SetInt(0)
-	}
-}
-func boolAsUintDecoder(dv, sv reflect.Value) {
-	if sv.Bool() {
-		dv.SetUint(1)
-	} else {
-		dv.SetUint(0)
-	}
-}
-func boolAsFloatDecoder(dv, sv reflect.Value) {
-	if sv.Bool() {
-		dv.SetFloat(1)
-	} else {
-		dv.SetFloat(0)
-	}
-}
-func boolAsStringDecoder(dv, sv reflect.Value) {
-	if sv.Bool() {
-		dv.SetString("1")
-	} else {
-		dv.SetString("0")
-	}
-}
-
-// Int decoders
-
-func intAsBoolDecoder(dv, sv reflect.Value) {
-	dv.SetBool(sv.Int() != 0)
-}
-func intAsIntDecoder(dv, sv reflect.Value) {
-	dv.SetInt(sv.Int())
-}
-func intAsUintDecoder(dv, sv reflect.Value) {
-	dv.SetUint(uint64(sv.Int()))
-}
-func intAsFloatDecoder(dv, sv reflect.Value) {
-	dv.SetFloat(float64(sv.Int()))
-}
-func intAsStringDecoder(dv, sv reflect.Value) {
-	dv.SetString(strconv.FormatInt(sv.Int(), 10))
-}
-
-// Uint decoders
-
-func uintAsBoolDecoder(dv, sv reflect.Value) {
-	dv.SetBool(sv.Uint() != 0)
-}
-func uintAsIntDecoder(dv, sv reflect.Value) {
-	dv.SetInt(int64(sv.Uint()))
-}
-func uintAsUintDecoder(dv, sv reflect.Value) {
-	dv.SetUint(sv.Uint())
-}
-func uintAsFloatDecoder(dv, sv reflect.Value) {
-	dv.SetFloat(float64(sv.Uint()))
-}
-func uintAsStringDecoder(dv, sv reflect.Value) {
-	dv.SetString(strconv.FormatUint(sv.Uint(), 10))
-}
-
-// Float decoders
-
-func floatAsBoolDecoder(dv, sv reflect.Value) {
-	dv.SetBool(sv.Float() != 0)
-}
-func floatAsIntDecoder(dv, sv reflect.Value) {
-	dv.SetInt(int64(sv.Float()))
-}
-func floatAsUintDecoder(dv, sv reflect.Value) {
-	dv.SetUint(uint64(sv.Float()))
-}
-func floatAsFloatDecoder(dv, sv reflect.Value) {
-	dv.SetFloat(float64(sv.Float()))
-}
-func floatAsStringDecoder(dv, sv reflect.Value) {
-	dv.SetString(strconv.FormatFloat(sv.Float(), 'f', -1, 64))
-}
-
-// String decoders
-
-func stringAsBoolDecoder(dv, sv reflect.Value) {
-	b, err := strconv.ParseBool(sv.String())
-	if err == nil {
-		dv.SetBool(b)
-	} else if sv.String() == "" {
-		dv.SetBool(false)
-	} else {
-		panic(&DecodeTypeError{dv.Type(), sv.Type(), err.Error()})
-	}
-}
-func stringAsIntDecoder(dv, sv reflect.Value) {
-	i, err := strconv.ParseInt(sv.String(), 0, dv.Type().Bits())
-	if err == nil {
-		dv.SetInt(i)
-	} else {
-		panic(&DecodeTypeError{dv.Type(), sv.Type(), err.Error()})
-	}
-}
-func stringAsUintDecoder(dv, sv reflect.Value) {
-	i, err := strconv.ParseUint(sv.String(), 0, dv.Type().Bits())
-	if err == nil {
-		dv.SetUint(i)
-	} else {
-		panic(&DecodeTypeError{dv.Type(), sv.Type(), err.Error()})
-	}
-}
-func stringAsFloatDecoder(dv, sv reflect.Value) {
-	f, err := strconv.ParseFloat(sv.String(), dv.Type().Bits())
-	if err == nil {
-		dv.SetFloat(f)
-	} else {
-		panic(&DecodeTypeError{dv.Type(), sv.Type(), err.Error()})
-	}
-}
-func stringAsStringDecoder(dv, sv reflect.Value) {
-	dv.SetString(sv.String())
-}
-
-// Slice/Array decoder
-
-type sliceDecoder struct {
-	arrayDec decoderFunc
-}
-
-func (d *sliceDecoder) decode(dv, sv reflect.Value) {
-	if dv.Kind() == reflect.Slice {
-		dv.Set(reflect.MakeSlice(dv.Type(), dv.Len(), dv.Cap()))
-	}
-
-	if !sv.IsNil() {
-		d.arrayDec(dv, sv)
-	}
-}
-
-func newSliceDecoder(dt, st reflect.Type) decoderFunc {
-	// Byte slices get special treatment; arrays don't.
-	// if t.Elem().Kind() == reflect.Uint8 {
-	// 	return decodeByteSlice
-	// }
-	dec := &sliceDecoder{newArrayDecoder(dt, st)}
-	return dec.decode
-}
-
-type arrayDecoder struct {
-	elemDec decoderFunc
-}
-
-func (d *arrayDecoder) decode(dv, sv reflect.Value) {
-	// Iterate through the slice/array and decode each element before adding it
-	// to the dest slice/array
-	i := 0
-	for i < sv.Len() {
-		if dv.Kind() == reflect.Slice {
-			// Get element of array, growing if necessary.
-			if i >= dv.Cap() {
-				newcap := dv.Cap() + dv.Cap()/2
-				if newcap < 4 {
-					newcap = 4
-				}
-				newdv := reflect.MakeSlice(dv.Type(), dv.Len(), newcap)
-				reflect.Copy(newdv, dv)
-				dv.Set(newdv)
-			}
-			if i >= dv.Len() {
-				dv.SetLen(i + 1)
-			}
-		}
-
-		if i < dv.Len() {
-			// Decode into element.
-			d.elemDec(dv.Index(i), sv.Index(i))
-		}
-
-		i++
-	}
-
-	// Ensure that the destination is the correct size
-	if i < dv.Len() {
-		if dv.Kind() == reflect.Array {
-			// Array.  Zero the rest.
-			z := reflect.Zero(dv.Type().Elem())
-			for ; i < dv.Len(); i++ {
-				dv.Index(i).Set(z)
-			}
-		} else {
-			dv.SetLen(i)
-		}
-	}
-}
-
-func newArrayDecoder(dt, st reflect.Type) decoderFunc {
-	dec := &arrayDecoder{typeDecoder(dt.Elem(), st.Elem())}
-	return dec.decode
-}
-
-// Map decoder
-
-type mapAsMapDecoder struct {
-	keyDec, elemDec decoderFunc
-}
-
-func (d *mapAsMapDecoder) decode(dv, sv reflect.Value) {
-	dt := dv.Type()
-	dv.Set(reflect.MakeMap(reflect.MapOf(dt.Key(), dt.Elem())))
-
-	var mapKey reflect.Value
-	var mapElem reflect.Value
-
-	keyType := dv.Type().Key()
-	elemType := dv.Type().Elem()
-
-	for _, sElemKey := range sv.MapKeys() {
-		var dElemKey reflect.Value
-		var dElemVal reflect.Value
-
-		if !mapKey.IsValid() {
-			mapKey = reflect.New(keyType).Elem()
-		} else {
-			mapKey.Set(reflect.Zero(keyType))
-		}
-		dElemKey = mapKey
-
-		if !mapElem.IsValid() {
-			mapElem = reflect.New(elemType).Elem()
-		} else {
-			mapElem.Set(reflect.Zero(elemType))
-		}
-		dElemVal = mapElem
-
-		d.keyDec(dElemKey, sElemKey)
-		d.elemDec(dElemVal, sv.MapIndex(sElemKey))
-
-		dv.SetMapIndex(dElemKey, dElemVal)
-	}
-}
-
-func newMapAsMapDecoder(dt, st reflect.Type) decoderFunc {
-	d := &mapAsMapDecoder{typeDecoder(dt.Key(), st.Key()), typeDecoder(dt.Elem(), st.Elem())}
-	return d.decode
-}
-
-type mapAsStructDecoder struct {
-	fields    []field
-	fieldDecs []decoderFunc
-}
-
-func (d *mapAsStructDecoder) decode(dv, sv reflect.Value) {
-	for _, kv := range sv.MapKeys() {
-		var f *field
-		var fieldDec decoderFunc
-		key := []byte(kv.String())
-		for i := range d.fields {
-			ff := &d.fields[i]
-			ffd := d.fieldDecs[i]
-			if bytes.Equal(ff.nameBytes, key) {
-				f = ff
-				fieldDec = ffd
-				break
-			}
-			if f == nil && ff.equalFold(ff.nameBytes, key) {
-				f = ff
-				fieldDec = ffd
-			}
-		}
-
-		if f == nil {
-			continue
-		}
-
-		dElemVal := fieldByIndex(dv, f.index)
-		sElemVal := sv.MapIndex(kv)
-
-		if !sElemVal.IsValid() || !dElemVal.CanSet() {
-			continue
-		}
-
-		fieldDec(dElemVal, sElemVal)
-	}
-}
-
-func newMapAsStructDecoder(dt, st reflect.Type) decoderFunc {
-	fields := cachedTypeFields(dt)
-	se := &mapAsStructDecoder{
-		fields:    fields,
-		fieldDecs: make([]decoderFunc, len(fields)),
-	}
-	for i, f := range fields {
-		se.fieldDecs[i] = typeDecoder(typeByIndex(dt, f.index), st.Elem())
-	}
-	return se.decode
-}
diff --git a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/encoding/encoder.go b/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/encoding/encoder.go
deleted file mode 100644
index 3b0d3508d..000000000
--- a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/encoding/encoder.go
+++ /dev/null
@@ -1,89 +0,0 @@
-// This code is based on encoding/json and gorilla/schema
-
-package encoding
-
-import (
-	"errors"
-	"reflect"
-	"runtime"
-	"sync"
-)
-
-type encoderFunc func(v reflect.Value) interface{}
-
-// Encode returns the encoded value of v.
-//
-// Encode  traverses the value v recursively and looks for structs. If a struct
-// is found then it is checked for tagged fields and convert to
-// map[string]interface{}
-func Encode(v interface{}) (ev interface{}, err error) {
-	defer func() {
-		if r := recover(); r != nil {
-			if _, ok := r.(runtime.Error); ok {
-				panic(r)
-			}
-			if v, ok := r.(string); ok {
-				err = errors.New(v)
-			} else {
-				err = r.(error)
-			}
-		}
-	}()
-
-	return encode(reflect.ValueOf(v)), nil
-}
-
-func encode(v reflect.Value) interface{} {
-	return valueEncoder(v)(v)
-}
-
-var encoderCache struct {
-	sync.RWMutex
-	m map[reflect.Type]encoderFunc
-}
-
-func valueEncoder(v reflect.Value) encoderFunc {
-	if !v.IsValid() {
-		return invalidValueEncoder
-	}
-	return typeEncoder(v.Type())
-}
-
-func typeEncoder(t reflect.Type) encoderFunc {
-	encoderCache.RLock()
-	f := encoderCache.m[t]
-	encoderCache.RUnlock()
-	if f != nil {
-		return f
-	}
-
-	// To deal with recursive types, populate the map with an
-	// indirect func before we build it. This type waits on the
-	// real func (f) to
-	//  be ready and then calls it.  This indirect
-	// func is only used for recursive types.
-	encoderCache.Lock()
-	var wg sync.WaitGroup
-	wg.Add(1)
-	encoderCache.m[t] = func(v reflect.Value) interface{} {
-		wg.Wait()
-		return f(v)
-	}
-	encoderCache.Unlock()
-
-	// Compute fields without lock.
-	// Might duplicate effort but won't hold other computations back.
-	f = newTypeEncoder(t, true)
-	wg.Done()
-	encoderCache.Lock()
-	encoderCache.m[t] = f
-	encoderCache.Unlock()
-	return f
-}
-
-// IgnoreType causes the encoder to ignore a type when encoding
-func IgnoreType(t reflect.Type) {
-	encoderCache.Lock()
-	encoderCache.m[t] = doNothingEncoder
-	encoderCache.Unlock()
-}
diff --git a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/encoding/encoder_test.go b/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/encoding/encoder_test.go
deleted file mode 100644
index 7b1ee0614..000000000
--- a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/encoding/encoder_test.go
+++ /dev/null
@@ -1,262 +0,0 @@
-package encoding
-
-import (
-	"image"
-	"reflect"
-	"testing"
-	"time"
-)
-
-var encodeExpected = map[string]interface{}{
-	"Level0":  int64(1),
-	"Level1b": int64(2),
-	"Level1c": int64(3),
-	"Level1a": int64(5),
-	"LEVEL1B": int64(6),
-	"e": map[string]interface{}{
-		"Level1a": int64(8),
-		"Level1b": int64(9),
-		"Level1c": int64(10),
-		"Level1d": int64(11),
-		"x":       int64(12),
-	},
-	"Loop1": int64(13),
-	"Loop2": int64(14),
-	"X":     int64(15),
-	"Y":     int64(16),
-	"Z":     int64(17),
-}
-
-func TestEncode(t *testing.T) {
-	// Top is defined in decoder_test.go
-	var in = Top{
-		Level0: 1,
-		Embed0: Embed0{
-			Level1b: 2,
-			Level1c: 3,
-		},
-		Embed0a: &Embed0a{
-			Level1a: 5,
-			Level1b: 6,
-		},
-		Embed0b: &Embed0b{
-			Level1a: 8,
-			Level1b: 9,
-			Level1c: 10,
-			Level1d: 11,
-			Level1e: 12,
-		},
-		Loop: Loop{
-			Loop1: 13,
-			Loop2: 14,
-		},
-		Embed0p: Embed0p{
-			Point: image.Point{X: 15, Y: 16},
-		},
-		Embed0q: Embed0q{
-			Point: Point{Z: 17},
-		},
-	}
-
-	got, err := Encode(&in)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if !reflect.DeepEqual(got, encodeExpected) {
-		t.Errorf(" got: %v\nwant: %v\n", got, encodeExpected)
-	}
-}
-
-type Optionals struct {
-	Sr string `gorethink:"sr"`
-	So string `gorethink:"so,omitempty"`
-	Sw string `gorethink:"-"`
-
-	Ir int `gorethink:"omitempty"` // actually named omitempty, not an option
-	Io int `gorethink:"io,omitempty"`
-
-	Tr time.Time `gorethink:"tr"`
-	To time.Time `gorethink:"to,omitempty"`
-
-	Slr []string `gorethink:"slr"`
-	Slo []string `gorethink:"slo,omitempty"`
-
-	Mr map[string]interface{} `gorethink:"mr"`
-	Mo map[string]interface{} `gorethink:",omitempty"`
-}
-
-var optionalsExpected = map[string]interface{}{
-	"sr":        "",
-	"omitempty": int64(0),
-	"tr":        map[string]interface{}{"$reql_type$": "TIME", "epoch_time": 0, "timezone": "+00:00"},
-	"slr":       []interface{}{},
-	"mr":        map[string]interface{}{},
-}
-
-func TestOmitEmpty(t *testing.T) {
-	var o Optionals
-	o.Sw = "something"
-	o.Tr = time.Unix(0, 0)
-	o.Mr = map[string]interface{}{}
-	o.Mo = map[string]interface{}{}
-
-	got, err := Encode(&o)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if !jsonEqual(got, optionalsExpected) {
-		t.Errorf("\ngot:  %#v\nwant: %#v\n", got, optionalsExpected)
-	}
-}
-
-type IntType int
-
-type MyStruct struct {
-	IntType
-}
-
-func TestAnonymousNonstruct(t *testing.T) {
-	var i IntType = 11
-	a := MyStruct{i}
-	var want = map[string]interface{}{"IntType": int64(11)}
-
-	got, err := Encode(a)
-	if err != nil {
-		t.Fatalf("Encode: %v", err)
-	}
-	if !reflect.DeepEqual(got, want) {
-		t.Errorf("got %v, want %v", got, want)
-	}
-}
-
-func TestEncodePointer(t *testing.T) {
-	v := Pointer{PPoint: &Point{Z: 1}, Point: Point{Z: 2}}
-	var want = map[string]interface{}{
-		"PPoint": map[string]interface{}{"Z": int64(1)},
-		"Point":  map[string]interface{}{"Z": int64(2)},
-	}
-
-	got, err := Encode(v)
-	if err != nil {
-		t.Fatalf("Encode: %v", err)
-	}
-	if !reflect.DeepEqual(got, want) {
-		t.Errorf("got %v, want %v", got, want)
-	}
-}
-
-func TestEncodeNilPointer(t *testing.T) {
-	v := Pointer{PPoint: nil, Point: Point{Z: 2}}
-	var want = map[string]interface{}{
-		"PPoint": nil,
-		"Point":  map[string]interface{}{"Z": int64(2)},
-	}
-
-	got, err := Encode(v)
-	if err != nil {
-		t.Fatalf("Encode: %v", err)
-	}
-	if !reflect.DeepEqual(got, want) {
-		t.Errorf("got %v, want %v", got, want)
-	}
-}
-
-type BugA struct {
-	S string
-}
-
-type BugB struct {
-	BugA
-	S string
-}
-
-type BugC struct {
-	S string
-}
-
-// Legal Go: We never use the repeated embedded field (S).
-type BugX struct {
-	A int
-	BugA
-	BugB
-}
-
-// Issue 5245.
-func TestEmbeddedBug(t *testing.T) {
-	v := BugB{
-		BugA{"A"},
-		"B",
-	}
-	got, err := Encode(v)
-	if err != nil {
-		t.Fatal("Encode:", err)
-	}
-	want := map[string]interface{}{"S": "B"}
-	if !reflect.DeepEqual(got, want) {
-		t.Fatalf("Encode: got %v want %v", got, want)
-	}
-	// Now check that the duplicate field, S, does not appear.
-	x := BugX{
-		A: 23,
-	}
-	got, err = Encode(x)
-	if err != nil {
-		t.Fatal("Encode:", err)
-	}
-	want = map[string]interface{}{"A": int64(23)}
-	if !reflect.DeepEqual(got, want) {
-		t.Fatalf("Encode: got %v want %v", got, want)
-	}
-}
-
-type BugD struct { // Same as BugA after tagging.
-	XXX string `gorethink:"S"`
-}
-
-// BugD's tagged S field should dominate BugA's.
-type BugY struct {
-	BugA
-	BugD
-}
-
-// Test that a field with a tag dominates untagged fields.
-func TestTaggedFieldDominates(t *testing.T) {
-	v := BugY{
-		BugA{"BugA"},
-		BugD{"BugD"},
-	}
-	got, err := Encode(v)
-	if err != nil {
-		t.Fatal("Encode:", err)
-	}
-	want := map[string]interface{}{"S": "BugD"}
-	if !reflect.DeepEqual(got, want) {
-		t.Fatalf("Encode: got %v want %v", got, want)
-	}
-}
-
-// There are no tags here, so S should not appear.
-type BugZ struct {
-	BugA
-	BugC
-	BugY // Contains a tagged S field through BugD; should not dominate.
-}
-
-func TestDuplicatedFieldDisappears(t *testing.T) {
-	v := BugZ{
-		BugA{"BugA"},
-		BugC{"BugC"},
-		BugY{
-			BugA{"nested BugA"},
-			BugD{"nested BugD"},
-		},
-	}
-	got, err := Encode(v)
-	if err != nil {
-		t.Fatal("Encode:", err)
-	}
-	want := map[string]interface{}{}
-	if !reflect.DeepEqual(got, want) {
-		t.Fatalf("Encode: got %v want %v", got, want)
-	}
-}
diff --git a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/encoding/encoder_types.go b/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/encoding/encoder_types.go
deleted file mode 100644
index de38a1905..000000000
--- a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/encoding/encoder_types.go
+++ /dev/null
@@ -1,303 +0,0 @@
-package encoding
-
-import (
-	"encoding/base64"
-	"math"
-	"reflect"
-	"time"
-)
-
-// newTypeEncoder constructs an encoderFunc for a type.
-// The returned encoder only checks CanAddr when allowAddr is true.
-func newTypeEncoder(t reflect.Type, allowAddr bool) encoderFunc {
-	if t.Implements(marshalerType) {
-		return marshalerEncoder
-	}
-	if t.Kind() != reflect.Ptr && allowAddr {
-		if reflect.PtrTo(t).Implements(marshalerType) {
-			return newCondAddrEncoder(addrMarshalerEncoder, newTypeEncoder(t, false))
-		}
-	}
-
-	// Check for psuedo-types first
-	switch t {
-	case timeType:
-		return timePseudoTypeEncoder
-	}
-
-	switch t.Kind() {
-	case reflect.Bool:
-		return boolEncoder
-	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
-		return intEncoder
-	case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uintptr:
-		return uintEncoder
-	case reflect.Float32, reflect.Float64:
-		return floatEncoder
-	case reflect.String:
-		return stringEncoder
-	case reflect.Interface:
-		return interfaceEncoder
-	case reflect.Struct:
-		return newStructEncoder(t)
-	case reflect.Map:
-		return newMapEncoder(t)
-	case reflect.Slice:
-		return newSliceEncoder(t)
-	case reflect.Array:
-		return newArrayEncoder(t)
-	case reflect.Ptr:
-		return newPtrEncoder(t)
-	default:
-		return unsupportedTypeEncoder
-	}
-}
-
-func invalidValueEncoder(v reflect.Value) interface{} {
-	return nil
-}
-
-func doNothingEncoder(v reflect.Value) interface{} {
-	return v.Interface()
-}
-
-func marshalerEncoder(v reflect.Value) interface{} {
-	if v.Kind() == reflect.Ptr && v.IsNil() {
-		return nil
-	}
-	m := v.Interface().(Marshaler)
-	ev, err := m.MarshalRQL()
-	if err != nil {
-		panic(&MarshalerError{v.Type(), err})
-	}
-
-	return ev
-}
-
-func addrMarshalerEncoder(v reflect.Value) interface{} {
-	va := v.Addr()
-	if va.IsNil() {
-		return nil
-	}
-	m := va.Interface().(Marshaler)
-	ev, err := m.MarshalRQL()
-	if err != nil {
-		panic(&MarshalerError{v.Type(), err})
-	}
-
-	return ev
-}
-
-func boolEncoder(v reflect.Value) interface{} {
-	if v.Bool() {
-		return true
-	} else {
-		return false
-	}
-}
-
-func intEncoder(v reflect.Value) interface{} {
-	return v.Int()
-}
-
-func uintEncoder(v reflect.Value) interface{} {
-	return v.Uint()
-}
-
-func floatEncoder(v reflect.Value) interface{} {
-	return v.Float()
-}
-
-func stringEncoder(v reflect.Value) interface{} {
-	return v.String()
-}
-
-func interfaceEncoder(v reflect.Value) interface{} {
-	if v.IsNil() {
-		return nil
-	}
-	return encode(v.Elem())
-}
-
-func unsupportedTypeEncoder(v reflect.Value) interface{} {
-	panic(&UnsupportedTypeError{v.Type()})
-}
-
-type structEncoder struct {
-	fields    []field
-	fieldEncs []encoderFunc
-}
-
-func (se *structEncoder) encode(v reflect.Value) interface{} {
-	m := make(map[string]interface{})
-
-	for i, f := range se.fields {
-		fv := fieldByIndex(v, f.index)
-		if !fv.IsValid() || f.omitEmpty && se.isEmptyValue(fv) {
-			continue
-		}
-
-		m[f.name] = se.fieldEncs[i](fv)
-	}
-
-	return m
-}
-
-func (se *structEncoder) isEmptyValue(v reflect.Value) bool {
-	if v.Type() == timeType {
-		return v.Interface().(time.Time) == time.Time{}
-	}
-
-	return isEmptyValue(v)
-}
-
-func newStructEncoder(t reflect.Type) encoderFunc {
-	fields := cachedTypeFields(t)
-	se := &structEncoder{
-		fields:    fields,
-		fieldEncs: make([]encoderFunc, len(fields)),
-	}
-	for i, f := range fields {
-		se.fieldEncs[i] = typeEncoder(typeByIndex(t, f.index))
-	}
-	return se.encode
-}
-
-type mapEncoder struct {
-	elemEnc encoderFunc
-}
-
-func (me *mapEncoder) encode(v reflect.Value) interface{} {
-	if v.IsNil() {
-		return nil
-	}
-
-	m := make(map[string]interface{})
-
-	for _, k := range v.MapKeys() {
-		m[k.String()] = me.elemEnc(v.MapIndex(k))
-	}
-
-	return m
-}
-
-func newMapEncoder(t reflect.Type) encoderFunc {
-	if t.Key().Kind() != reflect.String {
-		return unsupportedTypeEncoder
-	}
-	me := &mapEncoder{typeEncoder(t.Elem())}
-	return me.encode
-}
-
-// sliceEncoder just wraps an arrayEncoder, checking to make sure the value isn't nil.
-type sliceEncoder struct {
-	arrayEnc encoderFunc
-}
-
-func (se *sliceEncoder) encode(v reflect.Value) interface{} {
-	if v.IsNil() {
-		return []interface{}{}
-	}
-	return se.arrayEnc(v)
-}
-
-func newSliceEncoder(t reflect.Type) encoderFunc {
-	// Byte slices get special treatment; arrays don't.
-	if t.Elem().Kind() == reflect.Uint8 {
-		return encodeByteSlice
-	}
-	enc := &sliceEncoder{newArrayEncoder(t)}
-	return enc.encode
-}
-
-type arrayEncoder struct {
-	elemEnc encoderFunc
-}
-
-func (ae *arrayEncoder) encode(v reflect.Value) interface{} {
-	n := v.Len()
-
-	a := make([]interface{}, n)
-	for i := 0; i < n; i++ {
-		a[i] = ae.elemEnc(v.Index(i))
-	}
-
-	return a
-}
-
-func newArrayEncoder(t reflect.Type) encoderFunc {
-	enc := &arrayEncoder{typeEncoder(t.Elem())}
-	return enc.encode
-}
-
-type ptrEncoder struct {
-	elemEnc encoderFunc
-}
-
-func (pe *ptrEncoder) encode(v reflect.Value) interface{} {
-	if v.IsNil() {
-		return nil
-	}
-	return pe.elemEnc(v.Elem())
-}
-
-func newPtrEncoder(t reflect.Type) encoderFunc {
-	enc := &ptrEncoder{typeEncoder(t.Elem())}
-	return enc.encode
-}
-
-type condAddrEncoder struct {
-	canAddrEnc, elseEnc encoderFunc
-}
-
-func (ce *condAddrEncoder) encode(v reflect.Value) interface{} {
-	if v.CanAddr() {
-		return ce.canAddrEnc(v)
-	} else {
-		return ce.elseEnc(v)
-	}
-}
-
-// newCondAddrEncoder returns an encoder that checks whether its value
-// CanAddr and delegates to canAddrEnc if so, else to elseEnc.
-func newCondAddrEncoder(canAddrEnc, elseEnc encoderFunc) encoderFunc {
-	enc := &condAddrEncoder{canAddrEnc: canAddrEnc, elseEnc: elseEnc}
-	return enc.encode
-}
-
-// Pseudo-type encoders
-
-// Encode a time.Time value to the TIME RQL type
-func timePseudoTypeEncoder(v reflect.Value) interface{} {
-	t := v.Interface().(time.Time)
-
-	timeVal := float64(t.UnixNano()) / float64(time.Second)
-
-	// use seconds-since-epoch precision if time.Time `t`
-	// is before the oldest nanosecond time
-	if t.Before(time.Unix(0, math.MinInt64)) {
-		timeVal = float64(t.Unix())
-	}
-
-	return map[string]interface{}{
-		"$reql_type$": "TIME",
-		"epoch_time":  timeVal,
-		"timezone":    "+00:00",
-	}
-}
-
-// Encode a byte slice to the BINARY RQL type
-func encodeByteSlice(v reflect.Value) interface{} {
-	var b []byte
-	if !v.IsNil() {
-		b = v.Bytes()
-	}
-
-	dst := make([]byte, base64.StdEncoding.EncodedLen(len(b)))
-	base64.StdEncoding.Encode(dst, b)
-
-	return map[string]interface{}{
-		"$reql_type$": "BINARY",
-		"data":        string(dst),
-	}
-}
diff --git a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/encoding/encoding.go b/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/encoding/encoding.go
deleted file mode 100644
index 0169e1448..000000000
--- a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/encoding/encoding.go
+++ /dev/null
@@ -1,32 +0,0 @@
-package encoding
-
-import (
-	"reflect"
-	"time"
-)
-
-var (
-	// type constants
-	stringType = reflect.TypeOf("")
-	timeType   = reflect.TypeOf(new(time.Time)).Elem()
-
-	marshalerType   = reflect.TypeOf(new(Marshaler)).Elem()
-	unmarshalerType = reflect.TypeOf(new(Unmarshaler)).Elem()
-)
-
-// Marshaler is the interface implemented by objects that
-// can marshal themselves into a valid RQL psuedo-type.
-type Marshaler interface {
-	MarshalRQL() (interface{}, error)
-}
-
-// Unmarshaler is the interface implemented by objects
-// that can unmarshal a psuedo-type object of themselves.
-type Unmarshaler interface {
-	UnmarshalRQL(interface{}) error
-}
-
-func init() {
-	encoderCache.m = make(map[reflect.Type]encoderFunc)
-	decoderCache.m = make(map[decoderCacheKey]decoderFunc)
-}
diff --git a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/encoding/errors.go b/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/encoding/errors.go
deleted file mode 100644
index 8b9ac2c52..000000000
--- a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/encoding/errors.go
+++ /dev/null
@@ -1,102 +0,0 @@
-package encoding
-
-import (
-	"fmt"
-	"reflect"
-	"strings"
-)
-
-type MarshalerError struct {
-	Type reflect.Type
-	Err  error
-}
-
-func (e *MarshalerError) Error() string {
-	return "gorethink: error calling MarshalRQL for type " + e.Type.String() + ": " + e.Err.Error()
-}
-
-type InvalidUnmarshalError struct {
-	Type reflect.Type
-}
-
-func (e *InvalidUnmarshalError) Error() string {
-	if e.Type == nil {
-		return "gorethink: UnmarshalRQL(nil)"
-	}
-
-	if e.Type.Kind() != reflect.Ptr {
-		return "gorethink: UnmarshalRQL(non-pointer " + e.Type.String() + ")"
-	}
-	return "gorethink: UnmarshalRQL(nil " + e.Type.String() + ")"
-}
-
-// An InvalidTypeError describes a value that was
-// not appropriate for a value of a specific Go type.
-type DecodeTypeError struct {
-	DestType, SrcType reflect.Type
-	Reason            string
-}
-
-func (e *DecodeTypeError) Error() string {
-	if e.Reason != "" {
-		return "gorethink: could not decode type " + e.SrcType.String() + " into Go value of type " + e.DestType.String() + ": " + e.Reason
-	} else {
-		return "gorethink: could not decode type " + e.SrcType.String() + " into Go value of type " + e.DestType.String()
-
-	}
-}
-
-// An UnsupportedTypeError is returned by Marshal when attempting
-// to encode an unsupported value type.
-type UnsupportedTypeError struct {
-	Type reflect.Type
-}
-
-func (e *UnsupportedTypeError) Error() string {
-	return "gorethink: unsupported type: " + e.Type.String()
-}
-
-// An UnsupportedTypeError is returned by Marshal when attempting
-// to encode an unexpected value type.
-type UnexpectedTypeError struct {
-	DestType, SrcType reflect.Type
-}
-
-func (e *UnexpectedTypeError) Error() string {
-	return "gorethink: expected type: " + e.DestType.String() + ", got " + e.SrcType.String()
-}
-
-type UnsupportedValueError struct {
-	Value reflect.Value
-	Str   string
-}
-
-func (e *UnsupportedValueError) Error() string {
-	return "gorethink: unsupported value: " + e.Str
-}
-
-// Error implements the error interface and can represents multiple
-// errors that occur in the course of a single decode.
-type Error struct {
-	Errors []string
-}
-
-func (e *Error) Error() string {
-	points := make([]string, len(e.Errors))
-	for i, err := range e.Errors {
-		points[i] = fmt.Sprintf("* %s", err)
-	}
-
-	return fmt.Sprintf(
-		"%d error(s) decoding:\n\n%s",
-		len(e.Errors), strings.Join(points, "\n"))
-}
-
-func appendErrors(errors []string, err error) []string {
-	switch e := err.(type) {
-	case *Error:
-		return append(errors, e.Errors...)
-	default:
-		return append(errors, e.Error())
-	}
-}
diff --git a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/encoding/fold.go b/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/encoding/fold.go
deleted file mode 100644
index 21c9e68e4..000000000
--- a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/encoding/fold.go
+++ /dev/null
@@ -1,139 +0,0 @@
-package encoding
-
-import (
-	"bytes"
-	"unicode/utf8"
-)
-
-const (
-	caseMask     = ^byte(0x20) // Mask to ignore case in ASCII.
-	kelvin       = '\u212a'
-	smallLongEss = '\u017f'
-)
-
-// foldFunc returns one of four different case folding equivalence
-// functions, from most general (and slow) to fastest:
-//
-// 1) bytes.EqualFold, if the key s contains any non-ASCII UTF-8
-// 2) equalFoldRight, if s contains special folding ASCII ('k', 'K', 's', 'S')
-// 3) asciiEqualFold, no special, but includes non-letters (including _)
-// 4) simpleLetterEqualFold, no specials, no non-letters.
-//
-// The letters S and K are special because they map to 3 runes, not just 2:
-//  * S maps to s and to U+017F 'ſ' Latin small letter long s
-//  * k maps to K and to U+212A 'K' Kelvin sign
-// See http://play.golang.org/p/tTxjOc0OGo
-//
-// The returned function is specialized for matching against s and
-// should only be given s. It's not curried for performance reasons.
-func foldFunc(s []byte) func(s, t []byte) bool {
-	nonLetter := false
-	special := false // special letter
-	for _, b := range s {
-		if b >= utf8.RuneSelf {
-			return bytes.EqualFold
-		}
-		upper := b & caseMask
-		if upper < 'A' || upper > 'Z' {
-			nonLetter = true
-		} else if upper == 'K' || upper == 'S' {
-			// See above for why these letters are special.
-			special = true
-		}
-	}
-	if special {
-		return equalFoldRight
-	}
-	if nonLetter {
-		return asciiEqualFold
-	}
-	return simpleLetterEqualFold
-}
-
-// equalFoldRight is a specialization of bytes.EqualFold when s is
-// known to be all ASCII (including punctuation), but contains an 's',
-// 'S', 'k', or 'K', requiring a Unicode fold on the bytes in t.
-// See comments on foldFunc.
-func equalFoldRight(s, t []byte) bool {
-	for _, sb := range s {
-		if len(t) == 0 {
-			return false
-		}
-		tb := t[0]
-		if tb < utf8.RuneSelf {
-			if sb != tb {
-				sbUpper := sb & caseMask
-				if 'A' <= sbUpper && sbUpper <= 'Z' {
-					if sbUpper != tb&caseMask {
-						return false
-					}
-				} else {
-					return false
-				}
-			}
-			t = t[1:]
-			continue
-		}
-		// sb is ASCII and t is not. t must be either kelvin
-		// sign or long s; sb must be s, S, k, or K.
-		tr, size := utf8.DecodeRune(t)
-		switch sb {
-		case 's', 'S':
-			if tr != smallLongEss {
-				return false
-			}
-		case 'k', 'K':
-			if tr != kelvin {
-				return false
-			}
-		default:
-			return false
-		}
-		t = t[size:]
-
-	}
-	if len(t) > 0 {
-		return false
-	}
-	return true
-}
-
-// asciiEqualFold is a specialization of bytes.EqualFold for use when
-// s is all ASCII (but may contain non-letters) and contains no
-// special-folding letters.
-// See comments on foldFunc.
-func asciiEqualFold(s, t []byte) bool {
-	if len(s) != len(t) {
-		return false
-	}
-	for i, sb := range s {
-		tb := t[i]
-		if sb == tb {
-			continue
-		}
-		if ('a' <= sb && sb <= 'z') || ('A' <= sb && sb <= 'Z') {
-			if sb&caseMask != tb&caseMask {
-				return false
-			}
-		} else {
-			return false
-		}
-	}
-	return true
-}
-
-// simpleLetterEqualFold is a specialization of bytes.EqualFold for
-// use when s is all ASCII letters (no underscores, etc) and also
-// doesn't contain 'k', 'K', 's', or 'S'.
-// See comments on foldFunc.
-func simpleLetterEqualFold(s, t []byte) bool {
-	if len(s) != len(t) {
-		return false
-	}
-	for i, b := range s {
-		if b&caseMask != t[i]&caseMask {
-			return false
-		}
-	}
-	return true
-}
diff --git a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/encoding/tags.go b/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/encoding/tags.go
deleted file mode 100644
index cea3edaf1..000000000
--- a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/encoding/tags.go
+++ /dev/null
@@ -1,69 +0,0 @@
-// This code is based on encoding/json and gorilla/schema
-
-package encoding
-
-import (
-	"reflect"
-	"strings"
-	"unicode"
-)
-
-const TagName = "gorethink"
-
-// tagOptions is the string following a comma in a struct field's
-// tag, or the empty string. It does not include the leading comma.
-type tagOptions string
-
-func getTag(sf reflect.StructField) string {
-	return sf.Tag.Get(TagName)
-}
-
-// parseTag splits a struct field's tag into its name and
-// comma-separated options.
-func parseTag(tag string) (string, tagOptions) {
-	if idx := strings.Index(tag, ","); idx != -1 {
-		return tag[:idx], tagOptions(tag[idx+1:])
-	}
-	return tag, tagOptions("")
-}
-
-func isValidTag(s string) bool {
-	if s == "" {
-		return false
-	}
-	for _, c := range s {
-		switch {
-		case strings.ContainsRune("!#$%&()*+-./:<=>?@[]^_{|}~ ", c):
-			// Backslash and quote chars are reserved, but
-			// otherwise any punctuation chars are allowed
-			// in a tag name.
-		default:
-			if !unicode.IsLetter(c) && !unicode.IsDigit(c) {
-				return false
-			}
-		}
-	}
-	return true
-}
-
-// Contains returns whether checks that a comma-separated list of options
-// contains a particular substr flag. substr must be surrounded by a
-// string boundary or commas.
-func (o tagOptions) Contains(optionName string) bool {
-	if len(o) == 0 {
-		return false
-	}
-	s := string(o)
-	for s != "" {
-		var next string
-		i := strings.Index(s, ",")
-		if i >= 0 {
-			s, next = s[:i], s[i+1:]
-		}
-		if s == optionName {
-			return true
-		}
-		s = next
-	}
-	return false
-}
diff --git a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/encoding/utils.go b/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/encoding/utils.go
deleted file mode 100644
index 0ca2c7734..000000000
--- a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/encoding/utils.go
+++ /dev/null
@@ -1,72 +0,0 @@
-package encoding
-
-import "reflect"
-
-func getTypeKind(t reflect.Type) reflect.Kind {
-	kind := t.Kind()
-
-	switch {
-	case kind >= reflect.Int && kind <= reflect.Int64:
-		return reflect.Int
-	case kind >= reflect.Uint && kind <= reflect.Uint64:
-		return reflect.Uint
-	case kind >= reflect.Float32 && kind <= reflect.Float64:
-		return reflect.Float32
-	default:
-		return kind
-	}
-}
-
-func isEmptyValue(v reflect.Value) bool {
-	switch v.Kind() {
-	case reflect.Array, reflect.Map, reflect.Slice, reflect.String:
-		return v.Len() == 0
-	case reflect.Bool:
-		return !v.Bool()
-	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
-		return v.Int() == 0
-	case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uintptr:
-		return v.Uint() == 0
-	case reflect.Float32, reflect.Float64:
-		return v.Float() == 0
-	case reflect.Interface, reflect.Ptr:
-		return v.IsNil()
-	}
-	return false
-}
-
-func fieldByIndex(v reflect.Value, index []int) reflect.Value {
-	for _, i := range index {
-		if v.Kind() == reflect.Ptr {
-			if v.IsNil() {
-				v.Set(reflect.New(v.Type().Elem()))
-			}
-			v = v.Elem()
-		}
-		v = v.Field(i)
-	}
-
-	return v
-}
-
-func typeByIndex(t reflect.Type, index []int) reflect.Type {
-	for _, i := range index {
-		if t.Kind() == reflect.Ptr {
-			t = t.Elem()
-		}
-		t = t.Field(i).Type
-	}
-	return t
-}
-
-// valueByString sorts reflect.Value by the string value, this is useful for
-// sorting the result of MapKeys
-type valueByString []reflect.Value
-
-func (x valueByString) Len() int { return len(x) }
-
-func (x valueByString) Swap(i, j int) { x[i], x[j] = x[j], x[i] }
-
-func (x valueByString) Less(i, j int) bool {
-	return x[i].String() < x[j].String()
-}
diff --git a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/errors.go b/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/errors.go
deleted file mode 100644
index 522605e7a..000000000
--- a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/errors.go
+++ /dev/null
@@ -1,143 +0,0 @@
-package gorethink
-
-import (
-	"bytes"
-	"encoding/json"
-	"errors"
-	"fmt"
-
-	p "github.com/dancannon/gorethink/ql2"
-)
-
-var (
-	// ErrNoHosts is returned when no hosts to the Connect method.
-	ErrNoHosts = errors.New("no hosts provided")
-	// ErrNoConnectionsStarted is returned when the driver couldn't to any of
-	// the provided hosts.
-	ErrNoConnectionsStarted = errors.New("no connections were made when creating the session")
-	// ErrInvalidNode is returned when attempting to connect to a node which
-	// returns an invalid response.
-	ErrInvalidNode = errors.New("invalid node")
-	// ErrClusterClosed is returned when a query is executed after the connection
-	// to the cluster has been closed.
-	ErrClusterClosed = errors.New("cluster closed")
-	// ErrNoConnections is returned when there are no active connections in the
-	// clusters connection pool.
-	ErrNoConnections = errors.New("gorethink: no connections were available")
-	// ErrConnectionClosed is returned when trying to send a query with a closed
-	// connection.
-	ErrConnectionClosed = errors.New("gorethink: the connection is closed")
-)
-
-func printCarrots(t Term, frames []*p.Frame) string {
-	var frame *p.Frame
-	if len(frames) > 1 {
-		frame, frames = frames[0], frames[1:]
-	} else if len(frames) == 1 {
-		frame, frames = frames[0], []*p.Frame{}
-	}
-
-	for i, arg := range t.args {
-		if frame.GetPos() == int64(i) {
-			t.args[i] = Term{
-				termType: p.Term_DATUM,
-				data:     printCarrots(arg, frames),
-			}
-		}
-	}
-
-	for k, arg := range t.optArgs {
-		if frame.GetOpt() == k {
-			t.optArgs[k] = Term{
-				termType: p.Term_DATUM,
-				data:     printCarrots(arg, frames),
-			}
-		}
-	}
-
-	b := &bytes.Buffer{}
-	for _, c := range t.String() {
-		if c != '^' {
-			b.WriteString(" ")
-		} else {
-			b.WriteString("^")
-		}
-	}
-
-	return b.String()
-}
-
-// Error constants
-var ErrEmptyResult = errors.New("The result does not contain any more rows")
-
-// Connection/Response errors
-
-// rqlResponseError is the base type for all errors, it formats both
-// for the response and query if set.
-type rqlResponseError struct {
-	response *Response
-	term     *Term
-}
-
-func (e rqlResponseError) Error() string {
-	var err = "An error occurred"
-	if e.response != nil {
-		json.Unmarshal(e.response.Responses[0], &err)
-	}
-
-	if e.term == nil {
-		return fmt.Sprintf("gorethink: %s", err)
-	}
-
-	return fmt.Sprintf("gorethink: %s in: \n%s", err, e.term.String())
-
-}
-
-func (e rqlResponseError) String() string {
-	return e.Error()
-}
-
-// RQLCompileError represents an error that occurs when compiling a query on
-// the database server.
-type RQLCompileError struct {
-	rqlResponseError
-}
-
-// RQLRuntimeError represents an error when executing an error on the database
-// server, this is also returned by the database when using the `Error` term.
-type RQLRuntimeError struct {
-	rqlResponseError
-}
-
-// RQLClientError represents a client error returned from the database.
-type RQLClientError struct {
-	rqlResponseError
-}
-
-// RQLDriverError represents an unexpected error with the driver, if this error
-// persists please create an issue.
-type RQLDriverError struct {
-	message string
-}
-
-func (e RQLDriverError) Error() string {
-	return fmt.Sprintf("gorethink: %s", e.message)
-}
-
-func (e RQLDriverError) String() string {
-	return e.Error()
-}
-
-// RQLConnectionError represents an error when communicating with the database
-// server.
-type RQLConnectionError struct {
-	message string
-}
-
-func (e RQLConnectionError) Error() string {
-	return fmt.Sprintf("gorethink: %s", e.message)
-}
-
-func (e RQLConnectionError) String() string {
-	return e.Error()
-}
diff --git a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/example_query_aggregation_test.go b/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/example_query_aggregation_test.go
deleted file mode 100644
index 2206e7eac..000000000
--- a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/example_query_aggregation_test.go
+++ /dev/null
@@ -1,113 +0,0 @@
-package gorethink
-
-import (
-	"fmt"
-)
-
-// Group games by player.
-func ExampleTerm_Group() {
-	cur, err := DB("examples").Table("games").Group("player").Run(session)
-	if err != nil {
-		fmt.Print(err)
-		return
-	}
-
-	var res []interface{}
-	err = cur.All(&res)
-	if err != nil {
-		fmt.Print(err)
-		return
-	}
-
-	fmt.Print(res)
-}
-
-// Group games by the index type.
-func ExampleTerm_GroupByIndex() {
-	cur, err := DB("examples").Table("games").GroupByIndex("type").Run(session)
-	if err != nil {
-		fmt.Print(err)
-		return
-	}
-
-	var res []interface{}
-	err = cur.All(&res)
-	if err != nil {
-		fmt.Print(err)
-		return
-	}
-
-	fmt.Print(res)
-}
-
-// Suppose that the table games2 has the following data:
-//
-//   [
-// 	     { id: 1, matches: {'a': [1, 2, 3], 'b': [4, 5, 6]} },
-// 	     { id: 2, matches: {'b': [100], 'c': [7, 8, 9]} },
-// 	     { id: 3, matches: {'a': [10, 20], 'c': [70, 80]} }
-//   ]
-// Using MultiGroup we can group data by match A, B or C.
-func ExampleTerm_MultiGroup() {
-	cur, err := DB("examples").Table("games2").MultiGroup(Row.Field("matches").Keys()).Run(session)
-	if err != nil {
-		fmt.Print(err)
-		return
-	}
-
-	var res []interface{}
-	err = cur.All(&res)
-	if err != nil {
-		fmt.Print(err)
-		return
-	}
-
-	fmt.Print(res)
-}
-
-// Ungrouping grouped data.
-func ExampleTerm_Ungroup() {
-	cur, err := DB("examples").Table("games").
-		Group("player").
-		Max("points").Field("points").
-		Ungroup().
-		Run(session)
-	if err != nil {
-		fmt.Print(err)
-		return
-	}
-
-	var res []interface{}
-	err = cur.All(&res)
-	if err != nil {
-		fmt.Print(err)
-		return
-	}
-
-	fmt.Print(res)
-}
-
-// Return the number of documents in the table posts.
-func ExampleTerm_Reduce() {
-	cur, err := DB("examples").Table("posts").
-		Map(func(doc Term) interface{} {
-		return 1
-	}).
-		Reduce(func(left, right Term) interface{} {
-		return left.Add(right)
-	}).
-		Run(session)
-	if err != nil {
-		fmt.Print(err)
-		return
-	}
-
-	var res int
-	err = cur.One(&res)
-	if err != nil {
-		fmt.Print(err)
-		return
-	}
-
-	fmt.Print(res)
-}
diff --git a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/example_query_control_test.go b/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/example_query_control_test.go
deleted file mode 100644
index 58d1a3c7b..000000000
--- a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/example_query_control_test.go
+++ /dev/null
@@ -1,220 +0,0 @@
-package gorethink
-
-import (
-	"fmt"
-)
-
-// Return heroes and superheroes.
-func ExampleBranch() {
-	cur, err := DB("examples").Table("marvel").OrderBy("name").Map(Branch(
-		Row.Field("victories").Gt(100),
-		Row.Field("name").Add(" is a superhero"),
-		Row.Field("name").Add(" is a hero"),
-	)).Run(session)
-	if err != nil {
-		fmt.Print(err)
-		return
-	}
-
-	var strs []string
-	err = cur.All(&strs)
-	if err != nil {
-		fmt.Print(err)
-		return
-	}
-
-	for _, str := range strs {
-		fmt.Println(str)
-	}
-
-	// Output:
-	// Iron Man is a superhero
-	// Jubilee is a hero
-}
-
-// Return an error
-func ExampleError() {
-	err := Error("this is a runtime error").Exec(session)
-	fmt.Println(err)
-}
-
-// Suppose we want to retrieve the titles and authors of the table posts. In the
-// case where the author field is missing or null, we want to retrieve the
-// string "Anonymous".
-func ExampleTerm_Default() {
-	cur, err := DB("examples").Table("posts").Map(map[string]interface{}{
-		"title":  Row.Field("title"),
-		"author": Row.Field("author").Default("Anonymous"),
-	}).Run(session)
-	if err != nil {
-		fmt.Print(err)
-		return
-	}
-
-	var res map[string]interface{}
-	err = cur.One(&res)
-	if err != nil {
-		fmt.Print(err)
-		return
-	}
-
-	fmt.Print(res)
-}
-
-// Convert a Go integer to a ReQL object
-func ExampleExpr_int() {
-	cur, err := Expr(1).Run(session)
-	if err != nil {
-		fmt.Print(err)
-		return
-	}
-
-	var res interface{}
-	err = cur.One(&res)
-	if err != nil {
-		fmt.Print(err)
-		return
-	}
-
-	jsonPrint(res)
-
-	// Output: 1
-}
-
-// Convert a Go slice to a ReQL object
-func ExampleExpr_slice() {
-	cur, err := Expr([]int{1, 2, 3}).Run(session)
-	if err != nil {
-		fmt.Print(err)
-		return
-	}
-
-	var res []interface{}
-	err = cur.All(&res)
-	if err != nil {
-		fmt.Print(err)
-		return
-	}
-
-	jsonPrint(res)
-
-	// Output:
-	// [
-	//     1,
-	//     2,
-	//     3
-	// ]
-}
-
-// Convert a Go slice to a ReQL object
-func ExampleExpr_map() {
-	cur, err := Expr(map[string]interface{}{
-		"a": 1,
-		"b": "b",
-	}).Run(session)
-	if err != nil {
-		fmt.Print(err)
-		return
-	}
-
-	var res interface{}
-	err = cur.One(&res)
-	if err != nil {
-		fmt.Print(err)
-		return
-	}
-
-	jsonPrint(res)
-
-	// Output:
-	// {
-	//     "a": 1,
-	//     "b": "b"
-	// }
-}
-
-// Convert a Go slice to a ReQL object
-func ExampleExpr_struct() {
-	type ExampleTypeNested struct {
-		N int
-	}
-
-	type ExampleTypeEmbed struct {
-		C string
-	}
-
-	type ExampleTypeA struct {
-		ExampleTypeEmbed
-
-		A      int
-		B      string
-		Nested ExampleTypeNested
-	}
-
-	cur, err := Expr(ExampleTypeA{
-		A: 1,
-		B: "b",
-		ExampleTypeEmbed: ExampleTypeEmbed{
-			C: "c",
-		},
-		Nested: ExampleTypeNested{
-			N: 2,
-		},
-	}).Run(session)
-	if err != nil {
-		fmt.Print(err)
-		return
-	}
-
-	var res interface{}
-	err = cur.One(&res)
-	if err != nil {
-		fmt.Print(err)
-		return
-	}
-
-	jsonPrint(res)
-
-	// Output:
-	// {
-	//     "A": 1,
-	//     "B": "b",
-	//     "C": "c",
-	//     "Nested": {
-	//         "N": 2
-	//     }
-	// }
-}
-
-// Convert a Go struct (with gorethink tags) to a ReQL object. The tags allow
-// the field names to be changed.
-func ExampleExpr_structTags() {
-	type ExampleType struct {
-		A int    `gorethink:"field_a"`
-		B string `gorethink:"field_b"`
-	}
-
-	cur, err := Expr(ExampleType{
-		A: 1,
-		B: "b",
-	}).Run(session)
-	if err != nil {
-		fmt.Print(err)
-		return
-	}
-
-	var res interface{}
-	err = cur.One(&res)
-	if err != nil {
-		fmt.Print(err)
-		return
-	}
-
-	jsonPrint(res)
-
-	// Output:
-	// {
-	//     "field_a": 1,
-	//     "field_b": "b"
-	// }
-}
diff --git a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/example_query_db_test.go b/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/example_query_db_test.go
deleted file mode 100644
index afe0382a6..000000000
--- a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/example_query_db_test.go
+++ /dev/null
@@ -1,34 +0,0 @@
-package gorethink
-
-import (
-	"fmt"
-)
-
-// Create a database named ’superheroes’.
-func ExampleDBCreate() {
-	resp, err := DBCreate("superheroes").RunWrite(session)
-	if err != nil {
-		fmt.Print(err)
-	}
-
-	fmt.Printf("%d DB created", resp.DBsCreated)
-	// Output:
-	// 1 DB created
-}
-
-// Drop a database named ‘superheroes’.
-func ExampleDBDrop() {
-	// Setup database + tables
-	DBCreate("superheroes").Exec(session)
-	DB("superheroes").TableCreate("superheroes").Exec(session)
-	DB("superheroes").TableCreate("battles").Exec(session)
-
-	resp, err := DBDrop("superheroes").RunWrite(session)
-	if err != nil {
-		fmt.Print(err)
-	}
-
-	fmt.Printf("%d DB dropped, %d tables dropped", resp.DBsDropped, resp.TablesDropped)
-	// Output:
-	// 1 DB dropped, 2 tables dropped
-}
diff --git a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/example_query_manipulation_test.go b/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/example_query_manipulation_test.go
deleted file mode 100644
index 51616c9b7..000000000
--- a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/example_query_manipulation_test.go
+++ /dev/null
@@ -1,25 +0,0 @@
-package gorethink
-
-import (
-	"fmt"
-)
-
-// Get john's age
-func ExampleTerm_Field() {
-	cur, err := DB("examples").Table("users").Get("john").Field("age").Run(session)
-	if err != nil {
-		fmt.Print(err)
-		return
-	}
-
-	var res int
-	err = cur.One(&res)
-	if err != nil {
-		fmt.Print(err)
-		return
-	}
-
-	fmt.Print(res)
-
-	// Output: 19
-}
diff --git a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/example_query_select_test.go b/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/example_query_select_test.go
deleted file mode 100644
index 93dac2a00..000000000
--- a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/example_query_select_test.go
+++ /dev/null
@@ -1,129 +0,0 @@
-package gorethink
-
-import (
-	"fmt"
-)
-
-// Find a document by ID.
-func ExampleTerm_Get() {
-	// Fetch the row from the database
-	res, err := DB("examples").Table("heroes").Get(2).Run(session)
-	if err != nil {
-		fmt.Print(err)
-		return
-	}
-	defer res.Close()
-
-	if res.IsNil() {
-		fmt.Print("Row not found")
-		return
-	}
-
-	var hero map[string]interface{}
-	err = res.One(&hero)
-	if err != nil {
-		fmt.Print("Error scanning database result: %s", err)
-		return
-	}
-	fmt.Print(hero["name"])
-
-	// Output: Superman
-}
-
-// Find a document and merge another document with it.
-func ExampleTerm_Get_merge() {
-	// Fetch the row from the database
-	res, err := DB("examples").Table("heroes").Get(4).Merge(map[string]interface{}{
-		"powers": []string{"speed"},
-	}).Run(session)
-	if err != nil {
-		fmt.Print(err)
-		return
-	}
-	defer res.Close()
-
-	if res.IsNil() {
-		fmt.Print("Row not found")
-		return
-	}
-
-	var hero map[string]interface{}
-	err = res.One(&hero)
-	if err != nil {
-		fmt.Print("Error scanning database result: %s", err)
-		return
-	}
-	fmt.Printf("%s: %v", hero["name"], hero["powers"])
-
-	// Output: The Flash: [speed]
-}
-
-// Get all users who are 30 years old.
-func ExampleTerm_Filter() {
-	// Fetch the row from the database
-	res, err := DB("examples").Table("users").Filter(map[string]interface{}{
-		"age": 30,
-	}).Run(session)
-	if err != nil {
-		fmt.Print(err)
-		return
-	}
-	defer res.Close()
-
-	// Scan query result into the person variable
-	var users []interface{}
-	err = res.All(&users)
-	if err != nil {
-		fmt.Print("Error scanning database result: %s", err)
-		return
-	}
-	fmt.Printf("%d users", len(users))
-
-	// Output: 2 users
-}
-
-// Get all users who are more than 25 years old.
-func ExampleTerm_Filter_row() {
-	// Fetch the row from the database
-	res, err := DB("examples").Table("users").Filter(Row.Field("age").Gt(25)).Run(session)
-	if err != nil {
-		fmt.Print(err)
-		return
-	}
-	defer res.Close()
-
-	// Scan query result into the person variable
-	var users []interface{}
-	err = res.All(&users)
-	if err != nil {
-		fmt.Print("Error scanning database result: %s", err)
-		return
-	}
-	fmt.Printf("%d users", len(users))
-
-	// Output: 3 users
-}
-
-// Retrieve all users who have a gmail account (whose field email ends with @gmail.com).
-func ExampleTerm_Filter_function() {
-	// Fetch the row from the database
-	res, err := DB("examples").Table("users").Filter(func(user Term) Term {
-		return user.Field("email").Match("@gmail.com$")
-	}).Run(session)
-	if err != nil {
-		fmt.Print(err)
-		return
-	}
-	defer res.Close()
-
-	// Scan query result into the person variable
-	var users []interface{}
-	err = res.All(&users)
-	if err != nil {
-		fmt.Print("Error scanning database result: %s", err)
-		return
-	}
-	fmt.Printf("%d users", len(users))
-
-	// Output: 1 users
-}
diff --git a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/example_query_table_test.go b/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/example_query_table_test.go
deleted file mode 100644
index 4bc935e61..000000000
--- a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/example_query_table_test.go
+++ /dev/null
@@ -1,57 +0,0 @@
-package gorethink
-
-import (
-	"fmt"
-)
-
-// Create a table named "table" with the default settings.
-func ExampleTerm_TableCreate() {
-	// Setup database
-	DB("examples").TableDrop("table").Run(session)
-
-	response, err := DB("examples").TableCreate("table").RunWrite(session)
-	if err != nil {
-		log.Fatalf("Error creating table: %s", err)
-	}
-
-	fmt.Printf("%d table created", response.TablesCreated)
-
-	// Output:
-	// 1 table created
-}
-
-// Create a simple index based on the field name.
-func ExampleTerm_IndexCreate() {
-	// Setup database
-	DB("examples").TableDrop("table").Run(session)
-	DB("examples").TableCreate("table").Run(session)
-
-	response, err := DB("examples").Table("table").IndexCreate("name").RunWrite(session)
-	if err != nil {
-		log.Fatalf("Error creating index: %s", err)
-	}
-
-	fmt.Printf("%d index created", response.Created)
-
-	// Output:
-	// 1 index created
-}
-
-// Create a compound index based on the fields first_name and last_name.
-func ExampleTerm_IndexCreate_compound() {
-	// Setup database
-	DB("examples").TableDrop("table").Run(session)
-	DB("examples").TableCreate("table").Run(session)
-
-	response, err := DB("examples").Table("table").IndexCreateFunc("full_name", func(row Term) interface{} {
-		return []interface{}{row.Field("first_name"), row.Field("last_name")}
-	}).RunWrite(session)
-	if err != nil {
-		log.Fatalf("Error creating index: %s", err)
-	}
-
-	fmt.Printf("%d index created", response.Created)
-
-	// Output:
-	// 1 index created
-}
diff --git a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/example_query_transformation_test.go b/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/example_query_transformation_test.go
deleted file mode 100644
index 6ec80ee2a..000000000
--- a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/example_query_transformation_test.go
+++ /dev/null
@@ -1,161 +0,0 @@
-package gorethink
-
-import (
-	"fmt"
-)
-
-// Return the first five squares.
-func ExampleTerm_Map() {
-	cur, err := Expr([]int{1, 2, 3, 4, 5}).Map(func(val Term) Term {
-		return val.Mul(val)
-	}).Run(session)
-	if err != nil {
-		fmt.Print(err)
-		return
-	}
-
-	var res []int
-	err = cur.All(&res)
-	if err != nil {
-		fmt.Print(err)
-		return
-	}
-
-	fmt.Print(res)
-
-	// Output:
-	// [1 4 9 16 25]
-}
-
-// Sum the elements of three sequences.
-func ExampleMap_multipleSequences() {
-	var sequence1 = []int{100, 200, 300, 400}
-	var sequence2 = []int{10, 20, 30, 40}
-	var sequence3 = []int{1, 2, 3, 4}
-
-	cur, err := Map(sequence1, sequence2, sequence3, func(val1, val2, val3 Term) Term {
-		return val1.Add(val2).Add(val3)
-	}).Run(session)
-	if err != nil {
-		fmt.Print(err)
-		return
-	}
-
-	var res []int
-	err = cur.All(&res)
-	if err != nil {
-		fmt.Print(err)
-		return
-	}
-
-	fmt.Print(res)
-
-	// Output:
-	// [111 222 333 444]
-}
-
-// Order all the posts using the index date.
-func ExampleTerm_OrderBy_index() {
-	cur, err := DB("examples").Table("posts").OrderBy(OrderByOpts{
-		Index: "date",
-	}).Run(session)
-	if err != nil {
-		fmt.Print(err)
-		return
-	}
-
-	var res []interface{}
-	err = cur.All(&res)
-	if err != nil {
-		fmt.Print(err)
-		return
-	}
-
-	fmt.Print(res)
-}
-
-// Order all the posts using the index date in descending order.
-func ExampleTerm_OrderBy_indexDesc() {
-	cur, err := DB("examples").Table("posts").OrderBy(OrderByOpts{
-		Index: Desc("date"),
-	}).Run(session)
-	if err != nil {
-		fmt.Print(err)
-		return
-	}
-
-	var res []interface{}
-	err = cur.All(&res)
-	if err != nil {
-		fmt.Print(err)
-		return
-	}
-
-	fmt.Print(res)
-}
-
-// You can efficiently order using multiple fields by using a compound index.
-// For example order by date and title.
-func ExampleTerm_OrderBy_compound() {
-	cur, err := DB("examples").Table("posts").OrderBy(OrderByOpts{
-		Index: Desc("dateAndTitle"),
-	}).Run(session)
-	if err != nil {
-		fmt.Print(err)
-		return
-	}
-
-	var res []interface{}
-	err = cur.All(&res)
-	if err != nil {
-		fmt.Print(err)
-		return
-	}
-
-	fmt.Print(res)
-}
-
-// If you have a sequence with fewer documents than the arrayLimit, you can order
-// it by multiple fields without an index.
-func ExampleTerm_OrderBy_multiple() {
-	cur, err := DB("examples").Table("posts").OrderBy(
-		"title",
-		OrderByOpts{Index: Desc("date")},
-	).Run(session)
-	if err != nil {
-		fmt.Print(err)
-		return
-	}
-
-	var res []interface{}
-	err = cur.All(&res)
-	if err != nil {
-		fmt.Print(err)
-		return
-	}
-
-	fmt.Print(res)
-}
-
-// Notice that an index ordering always has highest precedence. The following
-// query orders posts by date, and if multiple posts were published on the same
-// date, they will be ordered by title.
-func ExampleTerm_OrderBy_multipleWithIndex() {
-	cur, err := DB("examples").Table("posts").OrderBy(
-		"title",
-		OrderByOpts{Index: Desc("date")},
-	).Run(session)
-	if err != nil {
-		fmt.Print(err)
-		return
-	}
-
-	var res []interface{}
-	err = cur.All(&res)
-	if err != nil {
-		fmt.Print(err)
-		return
-	}
-
-	fmt.Print(res)
-}
diff --git a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/example_query_write_test.go b/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/example_query_write_test.go
deleted file mode 100644
index 4fb3c56a2..000000000
--- a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/example_query_write_test.go
+++ /dev/null
@@ -1,228 +0,0 @@
-package gorethink
-
-import (
-	"fmt"
-)
-
-// Insert a document into the table posts using a struct.
-func ExampleTerm_Insert_struct() {
-	type Post struct {
-		ID      int    `gorethink:"id"`
-		Title   string `gorethink:"title"`
-		Content string `gorethink:"content"`
-	}
-
-	resp, err := DB("examples").Table("posts").Insert(Post{
-		ID:      1,
-		Title:   "Lorem ipsum",
-		Content: "Dolor sit amet",
-	}).RunWrite(session)
-	if err != nil {
-		fmt.Print(err)
-		return
-	}
-
-	fmt.Printf("%d row inserted", resp.Inserted)
-
-	// Output:
-	// 1 row inserted
-}
-
-// Insert a document without a defined primary key into the table posts where
-// the primary key is id.
-func ExampleTerm_Insert_generatedKey() {
-	type Post struct {
-		Title   string `gorethink:"title"`
-		Content string `gorethink:"content"`
-	}
-
-	resp, err := DB("examples").Table("posts").Insert(map[string]interface{}{
-		"title":   "Lorem ipsum",
-		"content": "Dolor sit amet",
-	}).RunWrite(session)
-	if err != nil {
-		fmt.Print(err)
-		return
-	}
-
-	fmt.Printf("%d row inserted, %d key generated", resp.Inserted, len(resp.GeneratedKeys))
-
-	// Output:
-	// 1 row inserted, 1 key generated
-}
-
-// Insert a document into the table posts using a map.
-func ExampleTerm_Insert_map() {
-	resp, err := DB("examples").Table("posts").Insert(map[string]interface{}{
-		"id":      2,
-		"title":   "Lorem ipsum",
-		"content": "Dolor sit amet",
-	}).RunWrite(session)
-	if err != nil {
-		fmt.Print(err)
-		return
-	}
-
-	fmt.Printf("%d row inserted", resp.Inserted)
-
-	// Output:
-	// 1 row inserted
-}
-
-// Insert multiple documents into the table posts.
-func ExampleTerm_Insert_multiple() {
-	resp, err := DB("examples").Table("posts").Insert([]interface{}{
-		map[string]interface{}{
-			"title":   "Lorem ipsum",
-			"content": "Dolor sit amet",
-		},
-		map[string]interface{}{
-			"title":   "Lorem ipsum",
-			"content": "Dolor sit amet",
-		},
-	}).RunWrite(session)
-	if err != nil {
-		fmt.Print(err)
-		return
-	}
-
-	fmt.Printf("%d rows inserted", resp.Inserted)
-
-	// Output:
-	// 2 rows inserted
-}
-
-// Insert a document into the table posts, replacing the document if it already
-// exists.
-func ExampleTerm_Insert_upsert() {
-	resp, err := DB("examples").Table("posts").Insert(map[string]interface{}{
-		"id":    1,
-		"title": "Lorem ipsum 2",
-	}, InsertOpts{
-		Conflict: "replace",
-	}).RunWrite(session)
-	if err != nil {
-		fmt.Print(err)
-		return
-	}
-
-	fmt.Printf("%d row replaced", resp.Replaced)
-
-	// Output:
-	// 1 row replaced
-}
-
-// Update the status of the post with id of 1 to published.
-func ExampleTerm_Update() {
-	resp, err := DB("examples").Table("posts").Get(2).Update(map[string]interface{}{
-		"status": "published",
-	}).RunWrite(session)
-	if err != nil {
-		fmt.Print(err)
-		return
-	}
-
-	fmt.Printf("%d row replaced", resp.Replaced)
-
-	// Output:
-	// 1 row replaced
-}
-
-// Update bob's cell phone number.
-func ExampleTerm_Update_nested() {
-	resp, err := DB("examples").Table("users").Get("bob").Update(map[string]interface{}{
-		"contact": map[string]interface{}{
-			"phone": "408-555-4242",
-		},
-	}).RunWrite(session)
-	if err != nil {
-		fmt.Print(err)
-		return
-	}
-
-	fmt.Printf("%d row replaced", resp.Replaced)
-
-	// Output:
-	// 1 row replaced
-}
-
-// Update the status of all posts to published.
-func ExampleTerm_Update_all() {
-	resp, err := DB("examples").Table("posts").Update(map[string]interface{}{
-		"status": "published",
-	}).RunWrite(session)
-	if err != nil {
-		fmt.Print(err)
-		return
-	}
-
-	fmt.Printf("%d row replaced", resp.Replaced)
-
-	// Output:
-	// 4 row replaced
-}
-
-// Increment the field view of the post with id of 1. If the field views does not
-// exist, it will be set to 0.
-func ExampleTerm_Update_increment() {
-	resp, err := DB("examples").Table("posts").Get(1).Update(map[string]interface{}{
-		"views": Row.Field("views").Add(1).Default(0),
-	}).RunWrite(session)
-	if err != nil {
-		fmt.Print(err)
-		return
-	}
-
-	fmt.Printf("%d row replaced", resp.Replaced)
-
-	// Output:
-	// 1 row replaced
-}
-
-// Update the status of the post with id of 1 using soft durability.
-func ExampleTerm_Update_softDurability() {
-	resp, err := DB("examples").Table("posts").Get(2).Update(map[string]interface{}{
-		"status": "draft",
-	}, UpdateOpts{
-		Durability: "soft",
-	}).RunWrite(session)
-	if err != nil {
-		fmt.Print(err)
-		return
-	}
-
-	fmt.Printf("%d row replaced", resp.Replaced)
-
-	// Output:
-	// 1 row replaced
-}
-
-// Delete a single document from the table posts.
-func ExampleTerm_Delete() {
-	resp, err := DB("examples").Table("posts").Get(2).Delete().RunWrite(session)
-	if err != nil {
-		fmt.Print(err)
-		return
-	}
-
-	fmt.Printf("%d row deleted", resp.Deleted)
-
-	// Output:
-	// 1 row deleted
-}
-
-// Delete all comments where the field status is published
-func ExampleTerm_Delete_many() {
-	resp, err := DB("examples").Table("posts").Filter(map[string]interface{}{
-		"status": "published",
-	}).Delete().RunWrite(session)
-	if err != nil {
-		fmt.Print(err)
-		return
-	}
-
-	fmt.Printf("%d rows deleted", resp.Deleted)
-
-	// Output:
-	// 4 rows deleted
-}
diff --git a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/example_test.go b/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/example_test.go
deleted file mode 100644
index 5214fd45d..000000000
--- a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/example_test.go
+++ /dev/null
@@ -1,30 +0,0 @@
-package gorethink
-
-import (
-	"fmt"
-)
-
-func Example() {
-	session, err := Connect(ConnectOpts{
-		Address: url,
-	})
-	if err != nil {
-		log.Fatalln(err.Error())
-	}
-
-	res, err := Expr("Hello World").Run(session)
-	if err != nil {
-		log.Fatalln(err.Error())
-	}
-
-	var response string
-	err = res.One(&response)
-	if err != nil {
-		log.Fatalln(err.Error())
-	}
-
-	fmt.Println(response)
-
-	// Output:
-	// Hello World
-}
diff --git a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/gorethink.go b/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/gorethink.go
deleted file mode 100644
index 14edf79c9..000000000
--- a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/gorethink.go
+++ /dev/null
@@ -1,31 +0,0 @@
-package gorethink
-
-import (
-	"reflect"
-
-	"github.com/Sirupsen/logrus"
-
-	"github.com/dancannon/gorethink/encoding"
-)
-
-var (
-	log *logrus.Logger
-)
-
-func init() {
-	// Set encoding package
-	encoding.IgnoreType(reflect.TypeOf(Term{}))
-
-	log = logrus.New()
-}
-
-// SetVerbose allows the driver logging level to be set. If true is passed then
-// the log level is set to Debug otherwise it defaults to Info.
-func SetVerbose(verbose bool) {
-	if verbose {
-		log.Level = logrus.DebugLevel
-		return
-	}
-
-	log.Level = logrus.InfoLevel
-}
diff --git a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/gorethink_test.go b/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/gorethink_test.go
deleted file mode 100644
index bd89d9099..000000000
--- a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/gorethink_test.go
+++ /dev/null
@@ -1,434 +0,0 @@
-package gorethink
-
-import (
-	"encoding/json"
-	"flag"
-	"fmt"
-	"math/rand"
-	"os"
-	"runtime"
-	"sync"
-	"testing"
-	"time"
-
-	test "gopkg.in/check.v1"
-)
-
-var session *Session
-var debug = flag.Bool("gorethink.debug", false, "print query trees")
-var url, url1, url2, url3, db, authKey string
-
-func init() {
-	flag.Parse()
-	SetVerbose(true)
-
-	// If the test is being run by wercker look for the rethink url
-	url = os.Getenv("RETHINKDB_URL")
-	if url == "" {
-		url = "localhost:28015"
-	}
-
-	url2 = os.Getenv("RETHINKDB_URL_1")
-	if url2 == "" {
-		url2 = "localhost:28016"
-	}
-
-	url2 = os.Getenv("RETHINKDB_URL_2")
-	if url2 == "" {
-		url2 = "localhost:28017"
-	}
-
-	url3 = os.Getenv("RETHINKDB_URL_3")
-	if url3 == "" {
-		url3 = "localhost:28018"
-	}
-
-	db = os.Getenv("RETHINKDB_DB")
-	if db == "" {
-		db = "test"
-	}
-
-	// Needed for running tests for RethinkDB with a non-empty authkey
-	authKey = os.Getenv("RETHINKDB_AUTHKEY")
-}
-
-//
-// Begin TestMain(), Setup, Teardown
-//
-func testSetup(m *testing.M) {
-	var err error
-	session, err = Connect(ConnectOpts{
-		Address: url,
-		AuthKey: authKey,
-	})
-	if err != nil {
-		log.Fatalln(err.Error())
-	}
-
-	setupTestData()
-}
-func testTeardown(m *testing.M) {
-	session.Close()
-}
-
-func testBenchmarkSetup() {
-	DBDrop("benchmarks").Exec(session)
-	DBCreate("benchmarks").Exec(session)
-
-	DB("benchmarks").TableDrop("benchmarks").Run(session)
-	DB("benchmarks").TableCreate("benchmarks").Run(session)
-}
-
-func testBenchmarkTeardown() {
-	DBDrop("benchmarks").Run(session)
-}
-
-func TestMain(m *testing.M) {
-	// seed randomness for use with tests
-	rand.Seed(time.Now().UTC().UnixNano())
-
-	testSetup(m)
-	testBenchmarkSetup()
-	res := m.Run()
-	testBenchmarkTeardown()
-	testTeardown(m)
-
-	os.Exit(res)
-}
-
-//
-// End TestMain(), Setup, Teardown
-//
-
-// Hook up gocheck into the gotest runner.
-func Test(t *testing.T) { test.TestingT(t) }
-
-type RethinkSuite struct{}
-
-var _ = test.Suite(&RethinkSuite{})
-
-// Expressions used in tests
-var now = time.Now()
-var arr = []interface{}{1, 2, 3, 4, 5, 6, 7, 8, 9}
-var darr = []interface{}{1, 1, 2, 2, 3, 3, 5, 5, 6}
-var narr = []interface{}{
-	1, 2, 3, 4, 5, 6, []interface{}{
-		7.1, 7.2, 7.3,
-	},
-}
-var obj = map[string]interface{}{"a": 1, "b": 2, "c": 3}
-var nobj = map[string]interface{}{
-	"A": 1,
-	"B": 2,
-	"C": map[string]interface{}{
-		"1": 3,
-		"2": 4,
-	},
-}
-var noDupNumObjList = []interface{}{
-	map[string]interface{}{"id": 1, "g1": 1, "g2": 1, "num": 0},
-	map[string]interface{}{"id": 2, "g1": 2, "g2": 2, "num": 5},
-	map[string]interface{}{"id": 3, "g1": 3, "g2": 2, "num": 10},
-	map[string]interface{}{"id": 5, "g1": 2, "g2": 3, "num": 100},
-	map[string]interface{}{"id": 6, "g1": 1, "g2": 1, "num": 15},
-	map[string]interface{}{"id": 8, "g1": 4, "g2": 2, "num": 50},
-	map[string]interface{}{"id": 9, "g1": 2, "g2": 3, "num": 25},
-}
-var objList = []interface{}{
-	map[string]interface{}{"id": 1, "g1": 1, "g2": 1, "num": 0},
-	map[string]interface{}{"id": 2, "g1": 2, "g2": 2, "num": 5},
-	map[string]interface{}{"id": 3, "g1": 3, "g2": 2, "num": 10},
-	map[string]interface{}{"id": 4, "g1": 2, "g2": 3, "num": 0},
-	map[string]interface{}{"id": 5, "g1": 2, "g2": 3, "num": 100},
-	map[string]interface{}{"id": 6, "g1": 1, "g2": 1, "num": 15},
-	map[string]interface{}{"id": 7, "g1": 1, "g2": 2, "num": 0},
-	map[string]interface{}{"id": 8, "g1": 4, "g2": 2, "num": 50},
-	map[string]interface{}{"id": 9, "g1": 2, "g2": 3, "num": 25},
-}
-var nameList = []interface{}{
-	map[string]interface{}{"id": 1, "first_name": "John", "last_name": "Smith", "gender": "M"},
-	map[string]interface{}{"id": 2, "first_name": "Jane", "last_name": "Smith", "gender": "F"},
-}
-var defaultObjList = []interface{}{
-	map[string]interface{}{"a": 1},
-	map[string]interface{}{},
-}
-var joinTable1 = []interface{}{
-	map[string]interface{}{"id": 0, "name": "bob"},
-	map[string]interface{}{"id": 1, "name": "tom"},
-	map[string]interface{}{"id": 2, "name": "joe"},
-}
-var joinTable2 = []interface{}{
-	map[string]interface{}{"id": 0, "title": "goof"},
-	map[string]interface{}{"id": 2, "title": "lmoe"},
-}
-var joinTable3 = []interface{}{
-	map[string]interface{}{"it": 0, "title": "goof"},
-	map[string]interface{}{"it": 2, "title": "lmoe"},
-}
-
-type TStr string
-type TMap map[string]interface{}
-
-type T struct {
-	A string `gorethink:"id, omitempty"`
-	B int
-	C int `gorethink:"-"`
-	D map[string]interface{}
-	E []interface{}
-	F X
-}
-
-type SimpleT struct {
-	A string
-	B int
-}
-
-type X struct {
-	XA int
-	XB string
-	XC []string
-	XD Y
-	XE TStr
-	XF []TStr
-}
-
-type Y struct {
-	YA int
-	YB map[string]interface{}
-	YC map[string]string
-	YD TMap
-}
-
-type PseudoTypes struct {
-	T time.Time
-	Z time.Time
-	B []byte
-}
-
-var str = T{
-	A: "A",
-	B: 1,
-	C: 1,
-	D: map[string]interface{}{
-		"D1": 1,
-		"D2": "2",
-	},
-	E: []interface{}{
-		"E1", "E2", "E3", 4,
-	},
-	F: X{
-		XA: 2,
-		XB: "B",
-		XC: []string{"XC1", "XC2"},
-		XD: Y{
-			YA: 3,
-			YB: map[string]interface{}{
-				"1": "1",
-				"2": "2",
-				"3": 3,
-			},
-			YC: map[string]string{
-				"YC1": "YC1",
-			},
-			YD: TMap{
-				"YD1": "YD1",
-			},
-		},
-		XE: "XE",
-		XF: []TStr{
-			"XE1", "XE2",
-		},
-	},
-}
-
-func (s *RethinkSuite) BenchmarkExpr(c *test.C) {
-	for i := 0; i < c.N; i++ {
-		// Test query
-		query := Expr(true)
-		err := query.Exec(session)
-		c.Assert(err, test.IsNil)
-	}
-}
-
-func (s *RethinkSuite) BenchmarkNoReplyExpr(c *test.C) {
-	for i := 0; i < c.N; i++ {
-		// Test query
-		query := Expr(true)
-		err := query.Exec(session, ExecOpts{NoReply: true})
-		c.Assert(err, test.IsNil)
-	}
-}
-
-func (s *RethinkSuite) BenchmarkGet(c *test.C) {
-	// Ensure table + database exist
-	DBCreate("test").RunWrite(session)
-	DB("test").TableCreate("TestMany").RunWrite(session)
-	DB("test").Table("TestMany").Delete().RunWrite(session)
-
-	// Insert rows
-	data := []interface{}{}
-	for i := 0; i < 100; i++ {
-		data = append(data, map[string]interface{}{
-			"id": i,
-		})
-	}
-	DB("test").Table("TestMany").Insert(data).Run(session)
-
-	for i := 0; i < c.N; i++ {
-		n := rand.Intn(100)
-
-		// Test query
-		var response interface{}
-		query := DB("test").Table("TestMany").Get(n)
-		res, err := query.Run(session)
-		c.Assert(err, test.IsNil)
-
-		err = res.One(&response)
-
-		c.Assert(err, test.IsNil)
-		c.Assert(response, jsonEquals, map[string]interface{}{"id": n})
-	}
-}
-
-func (s *RethinkSuite) BenchmarkGetStruct(c *test.C) {
-	// Ensure table + database exist
-	DBCreate("test").RunWrite(session)
-	DB("test").TableCreate("TestMany").RunWrite(session)
-	DB("test").Table("TestMany").Delete().RunWrite(session)
-
-	// Insert rows
-	data := []interface{}{}
-	for i := 0; i < 100; i++ {
-		data = append(data, map[string]interface{}{
-			"id":   i,
-			"name": "Object 1",
-			"Attrs": []interface{}{map[string]interface{}{
-				"Name":  "attr 1",
-				"Value": "value 1",
-			}},
-		})
-	}
-	DB("test").Table("TestMany").Insert(data).Run(session)
-
-	for i := 0; i < c.N; i++ {
-		n := rand.Intn(100)
-
-		// Test query
-		var resObj object
-		query := DB("test").Table("TestMany").Get(n)
-		res, err := query.Run(session)
-		c.Assert(err, test.IsNil)
-
-		err = res.One(&resObj)
-
-		c.Assert(err, test.IsNil)
-	}
-}
-
-func (s *RethinkSuite) BenchmarkSelectMany(c *test.C) {
-	// Ensure table + database exist
-	DBCreate("test").RunWrite(session)
-	DB("test").TableCreate("TestMany").RunWrite(session)
-	DB("test").Table("TestMany").Delete().RunWrite(session)
-
-	// Insert rows
-	data := []interface{}{}
-	for i := 0; i < 100; i++ {
-		data = append(data, map[string]interface{}{
-			"id": i,
-		})
-	}
-	DB("test").Table("TestMany").Insert(data).Run(session)
-
-	for i := 0; i < c.N; i++ {
-		// Test query
-		res, err := DB("test").Table("TestMany").Run(session)
-		c.Assert(err, test.IsNil)
-
-		var response []map[string]interface{}
-		err = res.All(&response)
-
-		c.Assert(err, test.IsNil)
-		c.Assert(response, test.HasLen, 100)
-	}
-}
-
-func (s *RethinkSuite) BenchmarkSelectManyStruct(c *test.C) {
-	// Ensure table + database exist
-	DBCreate("test").RunWrite(session)
-	DB("test").TableCreate("TestMany").RunWrite(session)
-	DB("test").Table("TestMany").Delete().RunWrite(session)
-
-	// Insert rows
-	data := []interface{}{}
-	for i := 0; i < 100; i++ {
-		data = append(data, map[string]interface{}{
-			"id":   i,
-			"name": "Object 1",
-			"Attrs": []interface{}{map[string]interface{}{
-				"Name":  "attr 1",
-				"Value": "value 1",
-			}},
-		})
-	}
-	DB("test").Table("TestMany").Insert(data).Run(session)
-
-	for i := 0; i < c.N; i++ {
-		// Test query
-		res, err := DB("test").Table("TestMany").Run(session)
-		c.Assert(err, test.IsNil)
-
-		var response []object
-		err = res.All(&response)
-
-		c.Assert(err, test.IsNil)
-		c.Assert(response, test.HasLen, 100)
-	}
-}
-
-func doConcurrentTest(c *test.C, ct func()) {
-	maxProcs, numReqs := 1, 150
-	if testing.Short() {
-		maxProcs, numReqs = 4, 50
-	}
-	defer runtime.GOMAXPROCS(runtime.GOMAXPROCS(maxProcs))
-
-	var wg sync.WaitGroup
-	wg.Add(numReqs)
-
-	reqs := make(chan bool)
-	defer close(reqs)
-
-	for i := 0; i < maxProcs*2; i++ {
-		go func() {
-			for _ = range reqs {
-				ct()
-				if c.Failed() {
-					wg.Done()
-					continue
-				}
-				wg.Done()
-			}
-		}()
-	}
-
-	for i := 0; i < numReqs; i++ {
-		reqs <- true
-	}
-
-	wg.Wait()
-}
-
-// Test utils
-
-// Print variable as JSON
-func jsonPrint(v interface{}) {
-	b, err := json.MarshalIndent(v, "", "    ")
-	if err != nil {
-		fmt.Println(err)
-		return
-	}
-
-	fmt.Println(string(b))
-}
diff --git a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/host.go b/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/host.go
deleted file mode 100644
index 44228eb7d..000000000
--- a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/host.go
+++ /dev/null
@@ -1,24 +0,0 @@
-package gorethink
-
-import (
-	"fmt"
-)
-
-// Host name and port of server
-type Host struct {
-	Name string
-	Port int
-}
-
-// NewHost create a new Host
-func NewHost(name string, port int) Host {
-	return Host{
-		Name: name,
-		Port: port,
-	}
-}
-
-// Returns host address (name:port)
-func (h Host) String() string {
-	return fmt.Sprintf("%s:%d", h.Name, h.Port)
-}
diff --git a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/node.go b/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/node.go
deleted file mode 100644
index 463e54ba8..000000000
--- a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/node.go
+++ /dev/null
@@ -1,230 +0,0 @@
-package gorethink
-
-import (
-	"sync"
-	"sync/atomic"
-	"time"
-
-	p "github.com/dancannon/gorethink/ql2"
-)
-
-const (
-	maxNodeHealth = 100
-)
-
-// Node represents a database server in the cluster
-type Node struct {
-	ID      string
-	Host    Host
-	aliases []Host
-
-	cluster         *Cluster
-	pool            *Pool
-	refreshDoneChan chan struct{}
-
-	mu     sync.RWMutex
-	closed bool
-	health int64
-}
-
-func newNode(id string, aliases []Host, cluster *Cluster, pool *Pool) *Node {
-	node := &Node{
-		ID:              id,
-		Host:            aliases[0],
-		aliases:         aliases,
-		cluster:         cluster,
-		pool:            pool,
-		health:          maxNodeHealth,
-		refreshDoneChan: make(chan struct{}),
-	}
-	// Start node refresh loop
-	refreshInterval := cluster.opts.NodeRefreshInterval
-	if refreshInterval <= 0 {
-		// Default to refresh every 30 seconds
-		refreshInterval = time.Second * 30
-	}
-
-	go func() {
-		refreshTicker := time.NewTicker(refreshInterval)
-		for {
-			select {
-			case <-refreshTicker.C:
-				node.Refresh()
-			case <-node.refreshDoneChan:
-				return
-			}
-		}
-	}()
-
-	return node
-}
-
-// Closed returns true if the node is closed
-func (n *Node) Closed() bool {
-	n.mu.RLock()
-	defer n.mu.RUnlock()
-
-	return n.closed
-}
-
-// Close closes the session
-func (n *Node) Close(optArgs ...CloseOpts) error {
-	n.mu.Lock()
-	defer n.mu.Unlock()
-
-	if n.closed {
-		return nil
-	}
-
-	if len(optArgs) >= 1 {
-		if optArgs[0].NoReplyWait {
-			n.NoReplyWait()
-		}
-	}
-
-	n.refreshDoneChan <- struct{}{}
-	if n.pool != nil {
-		n.pool.Close()
-	}
-	n.pool = nil
-	n.closed = true
-
-	return nil
-}
-
-// SetMaxIdleConns sets the maximum number of connections in the idle
-// connection pool.
-func (n *Node) SetMaxIdleConns(idleConns int) {
-	n.pool.SetMaxIdleConns(idleConns)
-}
-
-// SetMaxOpenConns sets the maximum number of open connections to the database.
-func (n *Node) SetMaxOpenConns(openConns int) {
-	n.pool.SetMaxOpenConns(openConns)
-}
-
-// NoReplyWait ensures that previous queries with the noreply flag have been
-// processed by the server. Note that this guarantee only applies to queries
-// run on the given connection
-func (n *Node) NoReplyWait() error {
-	return n.pool.Exec(Query{
-		Type: p.Query_NOREPLY_WAIT,
-	})
-}
-
-// Query executes a ReQL query using this nodes connection pool.
-func (n *Node) Query(q Query) (cursor *Cursor, err error) {
-	if n.Closed() {
-		return nil, ErrInvalidNode
-	}
-
-	cursor, err = n.pool.Query(q)
-	if err != nil {
-		n.DecrementHealth()
-	}
-
-	return cursor, err
-}
-
-// Exec executes a ReQL query using this nodes connection pool.
-func (n *Node) Exec(q Query) (err error) {
-	if n.Closed() {
-		return ErrInvalidNode
-	}
-
-	err = n.pool.Exec(q)
-	if err != nil {
-		n.DecrementHealth()
-	}
-
-	return err
-}
-
-// Refresh attempts to connect to the node and check that it is still connected
-// to the cluster.
-//
-// If an error occurred or the node is no longer connected then
-// the nodes health is decrease, if there were no issues then the node is marked
-// as being healthy.
-func (n *Node) Refresh() {
-	if n.cluster.opts.DiscoverHosts {
-		// If host discovery is enabled then check the servers status
-		cursor, err := n.pool.Query(newQuery(
-			DB("rethinkdb").Table("server_status").Get(n.ID),
-			map[string]interface{}{},
-			n.cluster.opts,
-		))
-		if err != nil {
-			n.DecrementHealth()
-			return
-		}
-		defer cursor.Close()
-
-		var status nodeStatus
-		err = cursor.One(&status)
-		if err != nil {
-			return
-		}
-
-		if status.Status != "connected" {
-			n.DecrementHealth()
-			return
-		}
-	} else {
-		// If host discovery is disabled just execute a simple ping query
-		cursor, err := n.pool.Query(newQuery(
-			Expr("OK"),
-			map[string]interface{}{},
-			n.cluster.opts,
-		))
-		if err != nil {
-			n.DecrementHealth()
-			return
-		}
-		defer cursor.Close()
-
-		var status string
-		err = cursor.One(&status)
-		if err != nil {
-			return
-		}
-
-		if status != "OK" {
-			n.DecrementHealth()
-			return
-		}
-	}
-
-	// If status check was successful reset health
-	n.ResetHealth()
-}
-
-// DecrementHealth decreases the nodes health by 1 (the nodes health starts at maxNodeHealth)
-func (n *Node) DecrementHealth() {
-	atomic.AddInt64(&n.health, -1)
-}
-
-// ResetHealth sets the nodes health back to maxNodeHealth (fully healthy)
-func (n *Node) ResetHealth() {
-	atomic.StoreInt64(&n.health, maxNodeHealth)
-}
-
-// IsHealthy checks the nodes health by ensuring that the health counter is above 0.
-func (n *Node) IsHealthy() bool {
-	return n.health > 0
-}
-
-type nodeStatus struct {
-	ID      string `gorethink:"id"`
-	Name    string `gorethink:"name"`
-	Status  string `gorethink:"status"`
-	Network struct {
-		Hostname           string `gorethink:"hostname"`
-		ClusterPort        int64  `gorethink:"cluster_port"`
-		ReqlPort           int64  `gorethink:"reql_port"`
-		CanonicalAddresses []struct {
-			Host string `gorethink:"host"`
-			Port int64  `gorethink:"port"`
-		} `gorethink:"canonical_addresses"`
-	} `gorethink:"network"`
-}
diff --git a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/pool.go b/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/pool.go
deleted file mode 100644
index d2bcf00bc..000000000
--- a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/pool.go
+++ /dev/null
@@ -1,539 +0,0 @@
-package gorethink
-
-import (
-	"errors"
-	"fmt"
-	"runtime"
-	"sync"
-)
-
-const defaultMaxIdleConns = 1
-
-// maxBadConnRetries is the number of maximum retries if the driver returns
-// driver.ErrBadConn to signal a broken connection.
-const maxBadConnRetries = 10
-
-var (
-	connectionRequestQueueSize = 1000000
-
-	errPoolClosed = errors.New("gorethink: pool is closed")
-	errConnClosed = errors.New("gorethink: conn is closed")
-	errConnBusy   = errors.New("gorethink: conn is busy")
-)
-
-// depSet is a finalCloser's outstanding dependencies
-type depSet map[interface{}]bool // set of true bools
-// The finalCloser interface is used by (*Pool).addDep and related
-// dependency reference counting.
-type finalCloser interface {
-	// finalClose is called when the reference count of an object
-	// goes to zero. (*Pool).mu is not held while calling it.
-	finalClose() error
-}
-
-// A Pool is used to store a pool of connections to a single RethinkDB server
-type Pool struct {
-	host Host
-	opts *ConnectOpts
-
-	mu           sync.Mutex // protects following fields
-	freeConn     []*poolConn
-	connRequests []chan connRequest
-	numOpen      int
-	pendingOpens int
-	// Used to signal the need for new connections
-	// a goroutine running connectionOpener() reads on this chan and
-	// maybeOpenNewConnections sends on the chan (one send per needed connection)
-	// It is closed during p.Close(). The close tells the connectionOpener
-	// goroutine to exit.
-	openerCh chan struct{}
-	closed   bool
-	dep      map[finalCloser]depSet
-	lastPut  map[*poolConn]string // stacktrace of last conn's put; debug only
-	maxIdle  int                  // zero means defaultMaxIdleConns; negative means 0
-	maxOpen  int                  // <= 0 means unlimited
-}
-
-// NewPool creates a new connection pool for the given host
-func NewPool(host Host, opts *ConnectOpts) (*Pool, error) {
-	p := &Pool{
-		host:     host,
-		opts:     opts,
-		openerCh: make(chan struct{}, connectionRequestQueueSize),
-		lastPut:  make(map[*poolConn]string),
-	}
-
-	p.SetMaxIdleConns(opts.MaxIdle)
-	p.SetMaxOpenConns(opts.MaxOpen)
-
-	go p.connectionOpener()
-	return p, nil
-}
-
-// Ping verifies a connection to the database is still alive,
-// establishing a connection if necessary.
-func (p *Pool) Ping() error {
-	pc, err := p.conn()
-	if err != nil {
-		return err
-	}
-	p.putConn(pc, nil)
-	return nil
-}
-
-// Close closes the database, releasing any open resources.
-//
-// It is rare to Close a Pool, as the Pool handle is meant to be
-// long-lived and shared between many goroutines.
-func (p *Pool) Close() error {
-	p.mu.Lock()
-	if p.closed { // Make Pool.Close idempotent
-		p.mu.Unlock()
-		return nil
-	}
-	close(p.openerCh)
-	var err error
-	fns := make([]func() error, 0, len(p.freeConn))
-	for _, pc := range p.freeConn {
-		fns = append(fns, pc.closePoolLocked())
-	}
-	p.freeConn = nil
-	p.closed = true
-	for _, req := range p.connRequests {
-		close(req)
-	}
-	p.mu.Unlock()
-	for _, fn := range fns {
-		err1 := fn()
-		if err1 != nil {
-			err = err1
-		}
-	}
-	return err
-}
-
-func (p *Pool) maxIdleConnsLocked() int {
-	n := p.maxIdle
-	switch {
-	case n == 0:
-		return defaultMaxIdleConns
-	case n < 0:
-		return 0
-	default:
-		return n
-	}
-}
-
-// SetMaxIdleConns sets the maximum number of connections in the idle
-// connection pool.
-//
-// If MaxOpenConns is greater than 0 but less than the new MaxIdleConns
-// then the new MaxIdleConns will be reduced to match the MaxOpenConns limit
-//
-// If n <= 0, no idle connections are retained.
-func (p *Pool) SetMaxIdleConns(n int) {
-	p.mu.Lock()
-	if n > 0 {
-		p.maxIdle = n
-	} else {
-		// No idle connections.
-		p.maxIdle = -1
-	}
-	// Make sure maxIdle doesn't exceed maxOpen
-	if p.maxOpen > 0 && p.maxIdleConnsLocked() > p.maxOpen {
-		p.maxIdle = p.maxOpen
-	}
-	var closing []*poolConn
-	idleCount := len(p.freeConn)
-	maxIdle := p.maxIdleConnsLocked()
-	if idleCount > maxIdle {
-		closing = p.freeConn[maxIdle:]
-		p.freeConn = p.freeConn[:maxIdle]
-	}
-	p.mu.Unlock()
-	for _, c := range closing {
-		c.Close()
-	}
-}
-
-// SetMaxOpenConns sets the maximum number of open connections to the database.
-//
-// If MaxIdleConns is greater than 0 and the new MaxOpenConns is less than
-// MaxIdleConns, then MaxIdleConns will be reduced to match the new
-// MaxOpenConns limit
-//
-// If n <= 0, then there is no limit on the number of open connections.
-// The default is 0 (unlimited).
-func (p *Pool) SetMaxOpenConns(n int) {
-	p.mu.Lock()
-	p.maxOpen = n
-	if n < 0 {
-		p.maxOpen = 0
-	}
-	syncMaxIdle := p.maxOpen > 0 && p.maxIdleConnsLocked() > p.maxOpen
-	p.mu.Unlock()
-	if syncMaxIdle {
-		p.SetMaxIdleConns(n)
-	}
-}
-
-// Assumes p.mu is locked.
-// If there are connRequests and the connection limit hasn't been reached,
-// then tell the connectionOpener to open new connections.
-func (p *Pool) maybeOpenNewConnections() {
-	numRequests := len(p.connRequests) - p.pendingOpens
-	if p.maxOpen > 0 {
-		numCanOpen := p.maxOpen - (p.numOpen + p.pendingOpens)
-		if numRequests > numCanOpen {
-			numRequests = numCanOpen
-		}
-	}
-	for numRequests > 0 {
-		p.pendingOpens++
-		numRequests--
-		p.openerCh <- struct{}{}
-	}
-}
-
-// Runs in a separate goroutine, opens new connections when requested.
-func (p *Pool) connectionOpener() {
-	for _ = range p.openerCh {
-		p.openNewConnection()
-	}
-}
-
-// Open one new connection
-func (p *Pool) openNewConnection() {
-	ci, err := NewConnection(p.host.String(), p.opts)
-	p.mu.Lock()
-	defer p.mu.Unlock()
-	if p.closed {
-		if err == nil {
-			ci.Close()
-		}
-		return
-	}
-	p.pendingOpens--
-	if err != nil {
-		p.putConnPoolLocked(nil, err)
-		return
-	}
-	pc := &poolConn{
-		p:  p,
-		ci: ci,
-	}
-	if p.putConnPoolLocked(pc, err) {
-		p.addDepLocked(pc, pc)
-		p.numOpen++
-	} else {
-		ci.Close()
-	}
-}
-
-// connRequest represents one request for a new connection
-// When there are no idle connections available, Pool.conn will create
-// a new connRequest and put it on the p.connRequests list.
-type connRequest struct {
-	conn *poolConn
-	err  error
-}
-
-// conn returns a newly-opened or cached *poolConn
-func (p *Pool) conn() (*poolConn, error) {
-	p.mu.Lock()
-	if p.closed {
-		p.mu.Unlock()
-		return nil, errPoolClosed
-	}
-	// If p.maxOpen > 0 and the number of open connections is over the limit
-	// and there are no free connection, make a request and wait.
-	if p.maxOpen > 0 && p.numOpen >= p.maxOpen && len(p.freeConn) == 0 {
-		// Make the connRequest channel. It's buffered so that the
-		// connectionOpener doesn't block while waiting for the req to be read.
-		req := make(chan connRequest, 1)
-		p.connRequests = append(p.connRequests, req)
-		p.mu.Unlock()
-		ret := <-req
-		return ret.conn, ret.err
-	}
-	if c := len(p.freeConn); c > 0 {
-		conn := p.freeConn[0]
-		copy(p.freeConn, p.freeConn[1:])
-		p.freeConn = p.freeConn[:c-1]
-		conn.inUse = true
-		p.mu.Unlock()
-		return conn, nil
-	}
-	p.numOpen++ // optimistically
-	p.mu.Unlock()
-	ci, err := NewConnection(p.host.String(), p.opts)
-	if err != nil {
-		p.mu.Lock()
-		p.numOpen-- // correct for earlier optimism
-		p.mu.Unlock()
-		return nil, err
-	}
-	p.mu.Lock()
-	pc := &poolConn{
-		p:  p,
-		ci: ci,
-	}
-	p.addDepLocked(pc, pc)
-	pc.inUse = true
-	p.mu.Unlock()
-	return pc, nil
-}
-
-// connIfFree returns (wanted, nil) if wanted is still a valid conn and
-// isn't in use.
-//
-// The error is errConnClosed if the connection if the requested connection
-// is invalid because it's been closed.
-//
-// The error is errConnBusy if the connection is in use.
-func (p *Pool) connIfFree(wanted *poolConn) (*poolConn, error) {
-	p.mu.Lock()
-	defer p.mu.Unlock()
-	if wanted.pmuClosed {
-		return nil, errConnClosed
-	}
-	if wanted.inUse {
-		return nil, errConnBusy
-	}
-	idx := -1
-	for ii, v := range p.freeConn {
-		if v == wanted {
-			idx = ii
-			break
-		}
-	}
-	if idx >= 0 {
-		p.freeConn = append(p.freeConn[:idx], p.freeConn[idx+1:]...)
-		wanted.inUse = true
-		return wanted, nil
-	}
-
-	panic("connIfFree call requested a non-closed, non-busy, non-free conn")
-}
-
-// noteUnusedCursor notes that si is no longer used and should
-// be closed whenever possible (when c is next not in use), unless c is
-// already closed.
-func (p *Pool) noteUnusedCursor(c *poolConn, ci *Cursor) {
-	p.mu.Lock()
-	defer p.mu.Unlock()
-	if c.inUse {
-		c.onPut = append(c.onPut, func() {
-			ci.Close()
-		})
-	} else {
-		c.Lock()
-		defer c.Unlock()
-		if !c.finalClosed {
-			ci.Close()
-		}
-	}
-}
-
-// debugGetPut determines whether getConn & putConn calls' stack traces
-// are returned for more verbose crashes.
-const debugGetPut = false
-
-// putConn adds a connection to the free pool.
-// err is optionally the last error that occurred on this connection.
-func (p *Pool) putConn(pc *poolConn, err error) {
-	p.mu.Lock()
-	if !pc.inUse {
-		if debugGetPut {
-			fmt.Printf("putConn(%v) DUPLICATE was: %s\n\nPREVIOUS was: %s", pc, stack(), p.lastPut[pc])
-		}
-		panic("gorethink: connection returned that was never out")
-	}
-	if debugGetPut {
-		p.lastPut[pc] = stack()
-	}
-	pc.inUse = false
-	for _, fn := range pc.onPut {
-		fn()
-	}
-	pc.onPut = nil
-	if err != nil && pc.ci.bad {
-		// Don't reuse bad connections.
-		// Since the conn is considered bad and is being discarded, treat it
-		// as closed. Don't decrement the open count here, finalClose will
-		// take care of that.
-		p.maybeOpenNewConnections()
-		p.mu.Unlock()
-		pc.Close()
-		return
-	}
-	added := p.putConnPoolLocked(pc, nil)
-	p.mu.Unlock()
-	if !added {
-		pc.Close()
-	}
-}
-
-// Satisfy a connRequest or put the poolConn in the idle pool and return true
-// or return false.
-// putConnPoolLocked will satisfy a connRequest if there is one, or it will
-// return the *poolConn to the freeConn list if err == nil and the idle
-// connection limit will not be exceeded.
-// If err != nil, the value of pc is ignored.
-// If err == nil, then pc must not equal nil.
-// If a connRequest was fulfilled or the *poolConn was placed in the
-// freeConn list, then true is returned, otherwise false is returned.
-func (p *Pool) putConnPoolLocked(pc *poolConn, err error) bool {
-	if p.maxOpen > 0 && p.numOpen > p.maxOpen {
-		return false
-	}
-	if c := len(p.connRequests); c > 0 {
-		req := p.connRequests[0]
-		// This copy is O(n) but in practice faster than a linked list.
-		// TODO: consider compacting it down less often and
-		// moving the base instead?
-		copy(p.connRequests, p.connRequests[1:])
-		p.connRequests = p.connRequests[:c-1]
-		if err == nil {
-			pc.inUse = true
-		}
-		req <- connRequest{
-			conn: pc,
-			err:  err,
-		}
-		return true
-	} else if err == nil && !p.closed && p.maxIdleConnsLocked() > len(p.freeConn) {
-		p.freeConn = append(p.freeConn, pc)
-		return true
-	}
-	return false
-}
-
-// addDep notes that x now depends on dep, and x's finalClose won't be
-// called until all of x's dependencies are removed with removeDep.
-func (p *Pool) addDep(x finalCloser, dep interface{}) {
-	//println(fmt.Sprintf("addDep(%T %p, %T %p)", x, x, dep, dep))
-	p.mu.Lock()
-	defer p.mu.Unlock()
-	p.addDepLocked(x, dep)
-}
-
-func (p *Pool) addDepLocked(x finalCloser, dep interface{}) {
-	if p.dep == nil {
-		p.dep = make(map[finalCloser]depSet)
-	}
-	xdep := p.dep[x]
-	if xdep == nil {
-		xdep = make(depSet)
-		p.dep[x] = xdep
-	}
-	xdep[dep] = true
-}
-
-// removeDep notes that x no longer depends on dep.
-// If x still has dependencies, nil is returned.
-// If x no longer has any dependencies, its finalClose method will be
-// called and its error value will be returned.
-func (p *Pool) removeDep(x finalCloser, dep interface{}) error {
-	p.mu.Lock()
-	fn := p.removeDepLocked(x, dep)
-	p.mu.Unlock()
-	return fn()
-}
-
-func (p *Pool) removeDepLocked(x finalCloser, dep interface{}) func() error {
-	//println(fmt.Sprintf("removeDep(%T %p, %T %p)", x, x, dep, dep))
-	xdep, ok := p.dep[x]
-	if !ok {
-		panic(fmt.Sprintf("unpaired removeDep: no deps for %T", x))
-	}
-	l0 := len(xdep)
-	delete(xdep, dep)
-	switch len(xdep) {
-	case l0:
-		// Nothing removed. Shouldn't happen.
-		panic(fmt.Sprintf("unpaired removeDep: no %T dep on %T", dep, x))
-	case 0:
-		// No more dependencies.
-		delete(p.dep, x)
-		return x.finalClose
-	default:
-		// Dependencies remain.
-		return func() error { return nil }
-	}
-}
-
-// Query execution functions
-
-// Exec executes a query without waiting for any response.
-func (p *Pool) Exec(q Query) error {
-	var err error
-	for i := 0; i < maxBadConnRetries; i++ {
-		err = p.exec(q)
-		if err != ErrBadConn {
-			break
-		}
-	}
-	return err
-}
-func (p *Pool) exec(q Query) (err error) {
-	pc, err := p.conn()
-	if err != nil {
-		return err
-	}
-	defer func() {
-		p.putConn(pc, err)
-	}()
-
-	pc.Lock()
-	_, _, err = pc.ci.Query(q)
-	pc.Unlock()
-
-	if err != nil {
-		return err
-	}
-	return nil
-}
-
-// Query executes a query and waits for the response
-func (p *Pool) Query(q Query) (*Cursor, error) {
-	var cursor *Cursor
-	var err error
-	for i := 0; i < maxBadConnRetries; i++ {
-		cursor, err = p.query(q)
-		if err != ErrBadConn {
-			break
-		}
-	}
-	return cursor, err
-}
-func (p *Pool) query(query Query) (*Cursor, error) {
-	ci, err := p.conn()
-	if err != nil {
-		return nil, err
-	}
-	return p.queryConn(ci, ci.releaseConn, query)
-}
-
-// queryConn executes a query on the given connection.
-// The connection gets released by the releaseConn function.
-func (p *Pool) queryConn(pc *poolConn, releaseConn func(error), q Query) (*Cursor, error) {
-	pc.Lock()
-	_, cursor, err := pc.ci.Query(q)
-	pc.Unlock()
-	if err != nil {
-		releaseConn(err)
-		return nil, err
-	}
-
-	cursor.releaseConn = releaseConn
-
-	return cursor, nil
-}
-
-// Helper functions
-
-func stack() string {
-	var buf [2 << 10]byte
-	return string(buf[:runtime.Stack(buf[:], false)])
-}
diff --git a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/pool_conn.go b/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/pool_conn.go
deleted file mode 100644
index 300b73547..000000000
--- a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/pool_conn.go
+++ /dev/null
@@ -1,75 +0,0 @@
-package gorethink
-
-import (
-	"errors"
-	"sync"
-)
-
-// ErrBadConn should be returned by a connection operation to signal to the
-// pool that a driver.Conn is in a bad state (such as the server
-// having earlier closed the connection) and the pool should retry on a
-// new connection.
-//
-// To prevent duplicate operations, ErrBadConn should NOT be returned
-// if there's a possibility that the database server might have
-// performed the operation. Even if the server sends back an error,
-// you shouldn't return ErrBadConn.
-var ErrBadConn = errors.New("gorethink: bad connection")
-
-type poolConn struct {
-	p *Pool
-
-	sync.Mutex  // guards following
-	ci          *Connection
-	closed      bool
-	finalClosed bool // ci.Close has been called
-
-	// guarded by p.mu
-	inUse     bool
-	onPut     []func() // code (with p.mu held) run when conn is next returned
-	pmuClosed bool     // same as closed, but guarded by p.mu, for connIfFree
-}
-
-func (pc *poolConn) releaseConn(err error) {
-	pc.p.putConn(pc, err)
-}
-
-// the pc.p's Mutex is held.
-func (pc *poolConn) closePoolLocked() func() error {
-	pc.Lock()
-	defer pc.Unlock()
-	if pc.closed {
-		return func() error { return errors.New("gorethink: duplicate driverConn close") }
-	}
-	pc.closed = true
-	return pc.p.removeDepLocked(pc, pc)
-}
-
-func (pc *poolConn) Close() error {
-	pc.Lock()
-	if pc.closed {
-		pc.Unlock()
-		return errors.New("gorethink: duplicate driverConn close")
-	}
-	pc.closed = true
-	pc.Unlock() // not defer; removeDep finalClose calls may need to lock
-	// And now updates that require holding pc.mu.Lock.
-	pc.p.mu.Lock()
-	pc.pmuClosed = true
-	fn := pc.p.removeDepLocked(pc, pc)
-	pc.p.mu.Unlock()
-	return fn()
-}
-
-func (pc *poolConn) finalClose() error {
-	pc.Lock()
-	err := pc.ci.Close()
-	pc.ci = nil
-	pc.finalClosed = true
-	pc.Unlock()
-	pc.p.mu.Lock()
-	pc.p.numOpen--
-	pc.p.maybeOpenNewConnections()
-	pc.p.mu.Unlock()
-	return err
-}
diff --git a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/pseudotypes.go b/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/pseudotypes.go
deleted file mode 100644
index a34b9dd97..000000000
--- a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/pseudotypes.go
+++ /dev/null
@@ -1,220 +0,0 @@
-package gorethink
-
-import (
-	"encoding/base64"
-	"math"
-	"strconv"
-	"time"
-
-	"github.com/dancannon/gorethink/types"
-
-	"fmt"
-)
-
-func convertPseudotype(obj map[string]interface{}, opts map[string]interface{}) (interface{}, error) {
-	if reqlType, ok := obj["$reql_type$"]; ok {
-		if reqlType == "TIME" {
-			// load timeFormat, set to native if the option was not set
-			timeFormat := "native"
-			if opt, ok := opts["time_format"]; ok {
-				if sopt, ok := opt.(string); ok {
-					timeFormat = sopt
-				} else {
-					return nil, fmt.Errorf("Invalid time_format run option \"%s\".", opt)
-				}
-			}
-
-			if timeFormat == "native" {
-				return reqlTimeToNativeTime(obj["epoch_time"].(float64), obj["timezone"].(string))
-			} else if timeFormat == "raw" {
-				return obj, nil
-			} else {
-				return nil, fmt.Errorf("Unknown time_format run option \"%s\".", reqlType)
-			}
-		} else if reqlType == "GROUPED_DATA" {
-			// load groupFormat, set to native if the option was not set
-			groupFormat := "native"
-			if opt, ok := opts["group_format"]; ok {
-				if sopt, ok := opt.(string); ok {
-					groupFormat = sopt
-				} else {
-					return nil, fmt.Errorf("Invalid group_format run option \"%s\".", opt)
-				}
-			}
-
-			if groupFormat == "native" {
-				return reqlGroupedDataToObj(obj)
-			} else if groupFormat == "raw" {
-				return obj, nil
-			} else {
-				return nil, fmt.Errorf("Unknown group_format run option \"%s\".", reqlType)
-			}
-		} else if reqlType == "BINARY" {
-			binaryFormat := "native"
-			if opt, ok := opts["binary_format"]; ok {
-				if sopt, ok := opt.(string); ok {
-					binaryFormat = sopt
-				} else {
-					return nil, fmt.Errorf("Invalid binary_format run option \"%s\".", opt)
-				}
-			}
-
-			if binaryFormat == "native" {
-				return reqlBinaryToNativeBytes(obj)
-			} else if binaryFormat == "raw" {
-				return obj, nil
-			} else {
-				return nil, fmt.Errorf("Unknown binary_format run option \"%s\".", reqlType)
-			}
-		} else if reqlType == "GEOMETRY" {
-			geometryFormat := "native"
-			if opt, ok := opts["geometry_format"]; ok {
-				if sopt, ok := opt.(string); ok {
-					geometryFormat = sopt
-				} else {
-					return nil, fmt.Errorf("Invalid geometry_format run option \"%s\".", opt)
-				}
-			}
-
-			if geometryFormat == "native" {
-				return reqlGeometryToNativeGeometry(obj)
-			} else if geometryFormat == "raw" {
-				return obj, nil
-			} else {
-				return nil, fmt.Errorf("Unknown geometry_format run option \"%s\".", reqlType)
-			}
-		} else {
-			return obj, nil
-		}
-	}
-
-	return obj, nil
-}
-
-func recursivelyConvertPseudotype(obj interface{}, opts map[string]interface{}) (interface{}, error) {
-	var err error
-
-	switch obj := obj.(type) {
-	case []interface{}:
-		for key, val := range obj {
-			obj[key], err = recursivelyConvertPseudotype(val, opts)
-			if err != nil {
-				return nil, err
-			}
-		}
-	case map[string]interface{}:
-		for key, val := range obj {
-			obj[key], err = recursivelyConvertPseudotype(val, opts)
-			if err != nil {
-				return nil, err
-			}
-		}
-
-		pobj, err := convertPseudotype(obj, opts)
-		if err != nil {
-			return nil, err
-		}
-
-		return pobj, nil
-	}
-
-	return obj, nil
-}
-
-// Pseudo-type helper functions
-
-func reqlTimeToNativeTime(timestamp float64, timezone string) (time.Time, error) {
-	sec, ms := math.Modf(timestamp)
-
-	t := time.Unix(int64(sec), int64(ms*1000*1000*1000))
-
-	// Caclulate the timezone
-	if timezone != "" {
-		hours, err := strconv.Atoi(timezone[1:3])
-		if err != nil {
-			return time.Time{}, err
-		}
-		minutes, err := strconv.Atoi(timezone[4:6])
-		if err != nil {
-			return time.Time{}, err
-		}
-		tzOffset := ((hours * 60) + minutes) * 60
-		if timezone[:1] == "-" {
-			tzOffset = 0 - tzOffset
-		}
-
-		t = t.In(time.FixedZone(timezone, tzOffset))
-	}
-
-	return t, nil
-}
-
-func reqlGroupedDataToObj(obj map[string]interface{}) (interface{}, error) {
-	if data, ok := obj["data"]; ok {
-		ret := []interface{}{}
-		for _, v := range data.([]interface{}) {
-			v := v.([]interface{})
-			ret = append(ret, map[string]interface{}{
-				"group":     v[0],
-				"reduction": v[1],
-			})
-		}
-		return ret, nil
-	}
-	return nil, fmt.Errorf("pseudo-type GROUPED_DATA object %v does not have the expected field \"data\"", obj)
-}
-
-func reqlBinaryToNativeBytes(obj map[string]interface{}) (interface{}, error) {
-	if data, ok := obj["data"]; ok {
-		if data, ok := data.(string); ok {
-			b, err := base64.StdEncoding.DecodeString(data)
-			if err != nil {
-				return nil, fmt.Errorf("error decoding pseudo-type BINARY object %v", obj)
-			}
-
-			return b, nil
-		}
-		return nil, fmt.Errorf("pseudo-type BINARY object %v field \"data\" is not valid", obj)
-	}
-	return nil, fmt.Errorf("pseudo-type BINARY object %v does not have the expected field \"data\"", obj)
-}
-
-func reqlGeometryToNativeGeometry(obj map[string]interface{}) (interface{}, error) {
-	if typ, ok := obj["type"]; !ok {
-		return nil, fmt.Errorf("pseudo-type GEOMETRY object %v does not have the expected field \"type\"", obj)
-	} else if typ, ok := typ.(string); !ok {
-		return nil, fmt.Errorf("pseudo-type GEOMETRY object %v field \"type\" is not valid", obj)
-	} else if coords, ok := obj["coordinates"]; !ok {
-		return nil, fmt.Errorf("pseudo-type GEOMETRY object %v does not have the expected field \"coordinates\"", obj)
-	} else if typ == "Point" {
-		point, err := types.UnmarshalPoint(coords)
-		if err != nil {
-			return nil, err
-		}
-
-		return types.Geometry{
-			Type:  "Point",
-			Point: point,
-		}, nil
-	} else if typ == "LineString" {
-		line, err := types.UnmarshalLineString(coords)
-		if err != nil {
-			return nil, err
-		}
-		return types.Geometry{
-			Type: "LineString",
-			Line: line,
-		}, nil
-	} else if typ == "Polygon" {
-		lines, err := types.UnmarshalPolygon(coords)
-		if err != nil {
-			return nil, err
-		}
-		return types.Geometry{
-			Type:  "Polygon",
-			Lines: lines,
-		}, nil
-	} else {
-		return nil, fmt.Errorf("pseudo-type GEOMETRY object %v field has unknown type %s", obj, typ)
-	}
-}
diff --git a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/ql2/ql2.pb.go b/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/ql2/ql2.pb.go
deleted file mode 100644
index 54ac15198..000000000
--- a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/ql2/ql2.pb.go
+++ /dev/null
@@ -1,1243 +0,0 @@
-// Code generated by protoc-gen-go.
-// source: ql2.proto
-// DO NOT EDIT!
-
-package ql2
-
-import proto "github.com/golang/protobuf/proto"
-import json "encoding/json"
-import math "math"
-
-// Reference proto, json, and math imports to suppress error if they are not otherwise used.
-var _ = proto.Marshal
-var _ = &json.SyntaxError{}
-var _ = math.Inf
-
-type VersionDummy_Version int32
-
-const (
-	VersionDummy_V0_1 VersionDummy_Version = 1063369270
-	VersionDummy_V0_2 VersionDummy_Version = 1915781601
-	VersionDummy_V0_3 VersionDummy_Version = 1601562686
-	VersionDummy_V0_4 VersionDummy_Version = 1074539808
-)
-
-var VersionDummy_Version_name = map[int32]string{
-	1063369270: "V0_1",
-	1915781601: "V0_2",
-	1601562686: "V0_3",
-	1074539808: "V0_4",
-}
-var VersionDummy_Version_value = map[string]int32{
-	"V0_1": 1063369270,
-	"V0_2": 1915781601,
-	"V0_3": 1601562686,
-	"V0_4": 1074539808,
-}
-
-func (x VersionDummy_Version) Enum() *VersionDummy_Version {
-	p := new(VersionDummy_Version)
-	*p = x
-	return p
-}
-func (x VersionDummy_Version) String() string {
-	return proto.EnumName(VersionDummy_Version_name, int32(x))
-}
-func (x VersionDummy_Version) MarshalJSON() ([]byte, error) {
-	return json.Marshal(x.String())
-}
-func (x *VersionDummy_Version) UnmarshalJSON(data []byte) error {
-	value, err := proto.UnmarshalJSONEnum(VersionDummy_Version_value, data, "VersionDummy_Version")
-	if err != nil {
-		return err
-	}
-	*x = VersionDummy_Version(value)
-	return nil
-}
-
-type VersionDummy_Protocol int32
-
-const (
-	VersionDummy_PROTOBUF VersionDummy_Protocol = 656407617
-	VersionDummy_JSON     VersionDummy_Protocol = 2120839367
-)
-
-var VersionDummy_Protocol_name = map[int32]string{
-	656407617:  "PROTOBUF",
-	2120839367: "JSON",
-}
-var VersionDummy_Protocol_value = map[string]int32{
-	"PROTOBUF": 656407617,
-	"JSON":     2120839367,
-}
-
-func (x VersionDummy_Protocol) Enum() *VersionDummy_Protocol {
-	p := new(VersionDummy_Protocol)
-	*p = x
-	return p
-}
-func (x VersionDummy_Protocol) String() string {
-	return proto.EnumName(VersionDummy_Protocol_name, int32(x))
-}
-func (x VersionDummy_Protocol) MarshalJSON() ([]byte, error) {
-	return json.Marshal(x.String())
-}
-func (x *VersionDummy_Protocol) UnmarshalJSON(data []byte) error {
-	value, err := proto.UnmarshalJSONEnum(VersionDummy_Protocol_value, data, "VersionDummy_Protocol")
-	if err != nil {
-		return err
-	}
-	*x = VersionDummy_Protocol(value)
-	return nil
-}
-
-type Query_QueryType int32
-
-const (
-	Query_START        Query_QueryType = 1
-	Query_CONTINUE     Query_QueryType = 2
-	Query_STOP         Query_QueryType = 3
-	Query_NOREPLY_WAIT Query_QueryType = 4
-)
-
-var Query_QueryType_name = map[int32]string{
-	1: "START",
-	2: "CONTINUE",
-	3: "STOP",
-	4: "NOREPLY_WAIT",
-}
-var Query_QueryType_value = map[string]int32{
-	"START":        1,
-	"CONTINUE":     2,
-	"STOP":         3,
-	"NOREPLY_WAIT": 4,
-}
-
-func (x Query_QueryType) Enum() *Query_QueryType {
-	p := new(Query_QueryType)
-	*p = x
-	return p
-}
-func (x Query_QueryType) String() string {
-	return proto.EnumName(Query_QueryType_name, int32(x))
-}
-func (x Query_QueryType) MarshalJSON() ([]byte, error) {
-	return json.Marshal(x.String())
-}
-func (x *Query_QueryType) UnmarshalJSON(data []byte) error {
-	value, err := proto.UnmarshalJSONEnum(Query_QueryType_value, data, "Query_QueryType")
-	if err != nil {
-		return err
-	}
-	*x = Query_QueryType(value)
-	return nil
-}
-
-type Frame_FrameType int32
-
-const (
-	Frame_POS Frame_FrameType = 1
-	Frame_OPT Frame_FrameType = 2
-)
-
-var Frame_FrameType_name = map[int32]string{
-	1: "POS",
-	2: "OPT",
-}
-var Frame_FrameType_value = map[string]int32{
-	"POS": 1,
-	"OPT": 2,
-}
-
-func (x Frame_FrameType) Enum() *Frame_FrameType {
-	p := new(Frame_FrameType)
-	*p = x
-	return p
-}
-func (x Frame_FrameType) String() string {
-	return proto.EnumName(Frame_FrameType_name, int32(x))
-}
-func (x Frame_FrameType) MarshalJSON() ([]byte, error) {
-	return json.Marshal(x.String())
-}
-func (x *Frame_FrameType) UnmarshalJSON(data []byte) error {
-	value, err := proto.UnmarshalJSONEnum(Frame_FrameType_value, data, "Frame_FrameType")
-	if err != nil {
-		return err
-	}
-	*x = Frame_FrameType(value)
-	return nil
-}
-
-type Response_ResponseType int32
-
-const (
-	Response_SUCCESS_ATOM     Response_ResponseType = 1
-	Response_SUCCESS_SEQUENCE Response_ResponseType = 2
-	Response_SUCCESS_PARTIAL  Response_ResponseType = 3
-	Response_WAIT_COMPLETE    Response_ResponseType = 4
-	Response_CLIENT_ERROR     Response_ResponseType = 16
-	Response_COMPILE_ERROR    Response_ResponseType = 17
-	Response_RUNTIME_ERROR    Response_ResponseType = 18
-)
-
-var Response_ResponseType_name = map[int32]string{
-	1:  "SUCCESS_ATOM",
-	2:  "SUCCESS_SEQUENCE",
-	3:  "SUCCESS_PARTIAL",
-	4:  "WAIT_COMPLETE",
-	16: "CLIENT_ERROR",
-	17: "COMPILE_ERROR",
-	18: "RUNTIME_ERROR",
-}
-var Response_ResponseType_value = map[string]int32{
-	"SUCCESS_ATOM":     1,
-	"SUCCESS_SEQUENCE": 2,
-	"SUCCESS_PARTIAL":  3,
-	"WAIT_COMPLETE":    4,
-	"CLIENT_ERROR":     16,
-	"COMPILE_ERROR":    17,
-	"RUNTIME_ERROR":    18,
-}
-
-func (x Response_ResponseType) Enum() *Response_ResponseType {
-	p := new(Response_ResponseType)
-	*p = x
-	return p
-}
-func (x Response_ResponseType) String() string {
-	return proto.EnumName(Response_ResponseType_name, int32(x))
-}
-func (x Response_ResponseType) MarshalJSON() ([]byte, error) {
-	return json.Marshal(x.String())
-}
-func (x *Response_ResponseType) UnmarshalJSON(data []byte) error {
-	value, err := proto.UnmarshalJSONEnum(Response_ResponseType_value, data, "Response_ResponseType")
-	if err != nil {
-		return err
-	}
-	*x = Response_ResponseType(value)
-	return nil
-}
-
-type Response_ResponseNote int32
-
-const (
-	Response_SEQUENCE_FEED       Response_ResponseNote = 1
-	Response_ATOM_FEED           Response_ResponseNote = 2
-	Response_ORDER_BY_LIMIT_FEED Response_ResponseNote = 3
-	Response_UNIONED_FEED        Response_ResponseNote = 4
-	Response_INCLUDES_STATES     Response_ResponseNote = 5
-)
-
-var Response_ResponseNote_name = map[int32]string{
-	1: "SEQUENCE_FEED",
-	2: "ATOM_FEED",
-	3: "ORDER_BY_LIMIT_FEED",
-	4: "UNIONED_FEED",
-	5: "INCLUDES_STATES",
-}
-var Response_ResponseNote_value = map[string]int32{
-	"SEQUENCE_FEED":       1,
-	"ATOM_FEED":           2,
-	"ORDER_BY_LIMIT_FEED": 3,
-	"UNIONED_FEED":        4,
-	"INCLUDES_STATES":     5,
-}
-
-func (x Response_ResponseNote) Enum() *Response_ResponseNote {
-	p := new(Response_ResponseNote)
-	*p = x
-	return p
-}
-func (x Response_ResponseNote) String() string {
-	return proto.EnumName(Response_ResponseNote_name, int32(x))
-}
-func (x Response_ResponseNote) MarshalJSON() ([]byte, error) {
-	return json.Marshal(x.String())
-}
-func (x *Response_ResponseNote) UnmarshalJSON(data []byte) error {
-	value, err := proto.UnmarshalJSONEnum(Response_ResponseNote_value, data, "Response_ResponseNote")
-	if err != nil {
-		return err
-	}
-	*x = Response_ResponseNote(value)
-	return nil
-}
-
-type Datum_DatumType int32
-
-const (
-	Datum_R_NULL   Datum_DatumType = 1
-	Datum_R_BOOL   Datum_DatumType = 2
-	Datum_R_NUM    Datum_DatumType = 3
-	Datum_R_STR    Datum_DatumType = 4
-	Datum_R_ARRAY  Datum_DatumType = 5
-	Datum_R_OBJECT Datum_DatumType = 6
-	Datum_R_JSON   Datum_DatumType = 7
-)
-
-var Datum_DatumType_name = map[int32]string{
-	1: "R_NULL",
-	2: "R_BOOL",
-	3: "R_NUM",
-	4: "R_STR",
-	5: "R_ARRAY",
-	6: "R_OBJECT",
-	7: "R_JSON",
-}
-var Datum_DatumType_value = map[string]int32{
-	"R_NULL":   1,
-	"R_BOOL":   2,
-	"R_NUM":    3,
-	"R_STR":    4,
-	"R_ARRAY":  5,
-	"R_OBJECT": 6,
-	"R_JSON":   7,
-}
-
-func (x Datum_DatumType) Enum() *Datum_DatumType {
-	p := new(Datum_DatumType)
-	*p = x
-	return p
-}
-func (x Datum_DatumType) String() string {
-	return proto.EnumName(Datum_DatumType_name, int32(x))
-}
-func (x Datum_DatumType) MarshalJSON() ([]byte, error) {
-	return json.Marshal(x.String())
-}
-func (x *Datum_DatumType) UnmarshalJSON(data []byte) error {
-	value, err := proto.UnmarshalJSONEnum(Datum_DatumType_value, data, "Datum_DatumType")
-	if err != nil {
-		return err
-	}
-	*x = Datum_DatumType(value)
-	return nil
-}
-
-type Term_TermType int32
-
-const (
-	Term_DATUM              Term_TermType = 1
-	Term_MAKE_ARRAY         Term_TermType = 2
-	Term_MAKE_OBJ           Term_TermType = 3
-	Term_VAR                Term_TermType = 10
-	Term_JAVASCRIPT         Term_TermType = 11
-	Term_UUID               Term_TermType = 169
-	Term_HTTP               Term_TermType = 153
-	Term_ERROR              Term_TermType = 12
-	Term_IMPLICIT_VAR       Term_TermType = 13
-	Term_DB                 Term_TermType = 14
-	Term_TABLE              Term_TermType = 15
-	Term_GET                Term_TermType = 16
-	Term_GET_ALL            Term_TermType = 78
-	Term_EQ                 Term_TermType = 17
-	Term_NE                 Term_TermType = 18
-	Term_LT                 Term_TermType = 19
-	Term_LE                 Term_TermType = 20
-	Term_GT                 Term_TermType = 21
-	Term_GE                 Term_TermType = 22
-	Term_NOT                Term_TermType = 23
-	Term_ADD                Term_TermType = 24
-	Term_SUB                Term_TermType = 25
-	Term_MUL                Term_TermType = 26
-	Term_DIV                Term_TermType = 27
-	Term_MOD                Term_TermType = 28
-	Term_APPEND             Term_TermType = 29
-	Term_PREPEND            Term_TermType = 80
-	Term_DIFFERENCE         Term_TermType = 95
-	Term_SET_INSERT         Term_TermType = 88
-	Term_SET_INTERSECTION   Term_TermType = 89
-	Term_SET_UNION          Term_TermType = 90
-	Term_SET_DIFFERENCE     Term_TermType = 91
-	Term_SLICE              Term_TermType = 30
-	Term_SKIP               Term_TermType = 70
-	Term_LIMIT              Term_TermType = 71
-	Term_OFFSETS_OF         Term_TermType = 87
-	Term_CONTAINS           Term_TermType = 93
-	Term_GET_FIELD          Term_TermType = 31
-	Term_KEYS               Term_TermType = 94
-	Term_OBJECT             Term_TermType = 143
-	Term_HAS_FIELDS         Term_TermType = 32
-	Term_WITH_FIELDS        Term_TermType = 96
-	Term_PLUCK              Term_TermType = 33
-	Term_WITHOUT            Term_TermType = 34
-	Term_MERGE              Term_TermType = 35
-	Term_BETWEEN_DEPRECATED Term_TermType = 36
-	Term_BETWEEN            Term_TermType = 182
-	Term_REDUCE             Term_TermType = 37
-	Term_MAP                Term_TermType = 38
-	Term_FILTER             Term_TermType = 39
-	Term_CONCAT_MAP         Term_TermType = 40
-	Term_ORDER_BY           Term_TermType = 41
-	Term_DISTINCT           Term_TermType = 42
-	Term_COUNT              Term_TermType = 43
-	Term_IS_EMPTY           Term_TermType = 86
-	Term_UNION              Term_TermType = 44
-	Term_NTH                Term_TermType = 45
-	Term_BRACKET            Term_TermType = 170
-	Term_INNER_JOIN         Term_TermType = 48
-	Term_OUTER_JOIN         Term_TermType = 49
-	Term_EQ_JOIN            Term_TermType = 50
-	Term_ZIP                Term_TermType = 72
-	Term_RANGE              Term_TermType = 173
-	Term_INSERT_AT          Term_TermType = 82
-	Term_DELETE_AT          Term_TermType = 83
-	Term_CHANGE_AT          Term_TermType = 84
-	Term_SPLICE_AT          Term_TermType = 85
-	Term_COERCE_TO          Term_TermType = 51
-	Term_TYPE_OF            Term_TermType = 52
-	Term_UPDATE             Term_TermType = 53
-	Term_DELETE             Term_TermType = 54
-	Term_REPLACE            Term_TermType = 55
-	Term_INSERT             Term_TermType = 56
-	Term_DB_CREATE          Term_TermType = 57
-	Term_DB_DROP            Term_TermType = 58
-	Term_DB_LIST            Term_TermType = 59
-	Term_TABLE_CREATE       Term_TermType = 60
-	Term_TABLE_DROP         Term_TermType = 61
-	Term_TABLE_LIST         Term_TermType = 62
-	Term_CONFIG             Term_TermType = 174
-	Term_STATUS             Term_TermType = 175
-	Term_WAIT               Term_TermType = 177
-	Term_RECONFIGURE        Term_TermType = 176
-	Term_REBALANCE          Term_TermType = 179
-	Term_SYNC               Term_TermType = 138
-	Term_INDEX_CREATE       Term_TermType = 75
-	Term_INDEX_DROP         Term_TermType = 76
-	Term_INDEX_LIST         Term_TermType = 77
-	Term_INDEX_STATUS       Term_TermType = 139
-	Term_INDEX_WAIT         Term_TermType = 140
-	Term_INDEX_RENAME       Term_TermType = 156
-	Term_FUNCALL            Term_TermType = 64
-	Term_BRANCH             Term_TermType = 65
-	Term_OR                 Term_TermType = 66
-	Term_AND                Term_TermType = 67
-	Term_FOR_EACH           Term_TermType = 68
-	Term_FUNC               Term_TermType = 69
-	Term_ASC                Term_TermType = 73
-	Term_DESC               Term_TermType = 74
-	Term_INFO               Term_TermType = 79
-	Term_MATCH              Term_TermType = 97
-	Term_UPCASE             Term_TermType = 141
-	Term_DOWNCASE           Term_TermType = 142
-	Term_SAMPLE             Term_TermType = 81
-	Term_DEFAULT            Term_TermType = 92
-	Term_JSON               Term_TermType = 98
-	Term_TO_JSON_STRING     Term_TermType = 172
-	Term_ISO8601            Term_TermType = 99
-	Term_TO_ISO8601         Term_TermType = 100
-	Term_EPOCH_TIME         Term_TermType = 101
-	Term_TO_EPOCH_TIME      Term_TermType = 102
-	Term_NOW                Term_TermType = 103
-	Term_IN_TIMEZONE        Term_TermType = 104
-	Term_DURING             Term_TermType = 105
-	Term_DATE               Term_TermType = 106
-	Term_TIME_OF_DAY        Term_TermType = 126
-	Term_TIMEZONE           Term_TermType = 127
-	Term_YEAR               Term_TermType = 128
-	Term_MONTH              Term_TermType = 129
-	Term_DAY                Term_TermType = 130
-	Term_DAY_OF_WEEK        Term_TermType = 131
-	Term_DAY_OF_YEAR        Term_TermType = 132
-	Term_HOURS              Term_TermType = 133
-	Term_MINUTES            Term_TermType = 134
-	Term_SECONDS            Term_TermType = 135
-	Term_TIME               Term_TermType = 136
-	Term_MONDAY             Term_TermType = 107
-	Term_TUESDAY            Term_TermType = 108
-	Term_WEDNESDAY          Term_TermType = 109
-	Term_THURSDAY           Term_TermType = 110
-	Term_FRIDAY             Term_TermType = 111
-	Term_SATURDAY           Term_TermType = 112
-	Term_SUNDAY             Term_TermType = 113
-	Term_JANUARY            Term_TermType = 114
-	Term_FEBRUARY           Term_TermType = 115
-	Term_MARCH              Term_TermType = 116
-	Term_APRIL              Term_TermType = 117
-	Term_MAY                Term_TermType = 118
-	Term_JUNE               Term_TermType = 119
-	Term_JULY               Term_TermType = 120
-	Term_AUGUST             Term_TermType = 121
-	Term_SEPTEMBER          Term_TermType = 122
-	Term_OCTOBER            Term_TermType = 123
-	Term_NOVEMBER           Term_TermType = 124
-	Term_DECEMBER           Term_TermType = 125
-	Term_LITERAL            Term_TermType = 137
-	Term_GROUP              Term_TermType = 144
-	Term_SUM                Term_TermType = 145
-	Term_AVG                Term_TermType = 146
-	Term_MIN                Term_TermType = 147
-	Term_MAX                Term_TermType = 148
-	Term_SPLIT              Term_TermType = 149
-	Term_UNGROUP            Term_TermType = 150
-	Term_RANDOM             Term_TermType = 151
-	Term_CHANGES            Term_TermType = 152
-	Term_ARGS               Term_TermType = 154
-	Term_BINARY             Term_TermType = 155
-	Term_GEOJSON            Term_TermType = 157
-	Term_TO_GEOJSON         Term_TermType = 158
-	Term_POINT              Term_TermType = 159
-	Term_LINE               Term_TermType = 160
-	Term_POLYGON            Term_TermType = 161
-	Term_DISTANCE           Term_TermType = 162
-	Term_INTERSECTS         Term_TermType = 163
-	Term_INCLUDES           Term_TermType = 164
-	Term_CIRCLE             Term_TermType = 165
-	Term_GET_INTERSECTING   Term_TermType = 166
-	Term_FILL               Term_TermType = 167
-	Term_GET_NEAREST        Term_TermType = 168
-	Term_POLYGON_SUB        Term_TermType = 171
-	Term_MINVAL             Term_TermType = 180
-	Term_MAXVAL             Term_TermType = 181
-)
-
-var Term_TermType_name = map[int32]string{
-	1:   "DATUM",
-	2:   "MAKE_ARRAY",
-	3:   "MAKE_OBJ",
-	10:  "VAR",
-	11:  "JAVASCRIPT",
-	169: "UUID",
-	153: "HTTP",
-	12:  "ERROR",
-	13:  "IMPLICIT_VAR",
-	14:  "DB",
-	15:  "TABLE",
-	16:  "GET",
-	78:  "GET_ALL",
-	17:  "EQ",
-	18:  "NE",
-	19:  "LT",
-	20:  "LE",
-	21:  "GT",
-	22:  "GE",
-	23:  "NOT",
-	24:  "ADD",
-	25:  "SUB",
-	26:  "MUL",
-	27:  "DIV",
-	28:  "MOD",
-	29:  "APPEND",
-	80:  "PREPEND",
-	95:  "DIFFERENCE",
-	88:  "SET_INSERT",
-	89:  "SET_INTERSECTION",
-	90:  "SET_UNION",
-	91:  "SET_DIFFERENCE",
-	30:  "SLICE",
-	70:  "SKIP",
-	71:  "LIMIT",
-	87:  "OFFSETS_OF",
-	93:  "CONTAINS",
-	31:  "GET_FIELD",
-	94:  "KEYS",
-	143: "OBJECT",
-	32:  "HAS_FIELDS",
-	96:  "WITH_FIELDS",
-	33:  "PLUCK",
-	34:  "WITHOUT",
-	35:  "MERGE",
-	36:  "BETWEEN_DEPRECATED",
-	182: "BETWEEN",
-	37:  "REDUCE",
-	38:  "MAP",
-	39:  "FILTER",
-	40:  "CONCAT_MAP",
-	41:  "ORDER_BY",
-	42:  "DISTINCT",
-	43:  "COUNT",
-	86:  "IS_EMPTY",
-	44:  "UNION",
-	45:  "NTH",
-	170: "BRACKET",
-	48:  "INNER_JOIN",
-	49:  "OUTER_JOIN",
-	50:  "EQ_JOIN",
-	72:  "ZIP",
-	173: "RANGE",
-	82:  "INSERT_AT",
-	83:  "DELETE_AT",
-	84:  "CHANGE_AT",
-	85:  "SPLICE_AT",
-	51:  "COERCE_TO",
-	52:  "TYPE_OF",
-	53:  "UPDATE",
-	54:  "DELETE",
-	55:  "REPLACE",
-	56:  "INSERT",
-	57:  "DB_CREATE",
-	58:  "DB_DROP",
-	59:  "DB_LIST",
-	60:  "TABLE_CREATE",
-	61:  "TABLE_DROP",
-	62:  "TABLE_LIST",
-	174: "CONFIG",
-	175: "STATUS",
-	177: "WAIT",
-	176: "RECONFIGURE",
-	179: "REBALANCE",
-	138: "SYNC",
-	75:  "INDEX_CREATE",
-	76:  "INDEX_DROP",
-	77:  "INDEX_LIST",
-	139: "INDEX_STATUS",
-	140: "INDEX_WAIT",
-	156: "INDEX_RENAME",
-	64:  "FUNCALL",
-	65:  "BRANCH",
-	66:  "OR",
-	67:  "AND",
-	68:  "FOR_EACH",
-	69:  "FUNC",
-	73:  "ASC",
-	74:  "DESC",
-	79:  "INFO",
-	97:  "MATCH",
-	141: "UPCASE",
-	142: "DOWNCASE",
-	81:  "SAMPLE",
-	92:  "DEFAULT",
-	98:  "JSON",
-	172: "TO_JSON_STRING",
-	99:  "ISO8601",
-	100: "TO_ISO8601",
-	101: "EPOCH_TIME",
-	102: "TO_EPOCH_TIME",
-	103: "NOW",
-	104: "IN_TIMEZONE",
-	105: "DURING",
-	106: "DATE",
-	126: "TIME_OF_DAY",
-	127: "TIMEZONE",
-	128: "YEAR",
-	129: "MONTH",
-	130: "DAY",
-	131: "DAY_OF_WEEK",
-	132: "DAY_OF_YEAR",
-	133: "HOURS",
-	134: "MINUTES",
-	135: "SECONDS",
-	136: "TIME",
-	107: "MONDAY",
-	108: "TUESDAY",
-	109: "WEDNESDAY",
-	110: "THURSDAY",
-	111: "FRIDAY",
-	112: "SATURDAY",
-	113: "SUNDAY",
-	114: "JANUARY",
-	115: "FEBRUARY",
-	116: "MARCH",
-	117: "APRIL",
-	118: "MAY",
-	119: "JUNE",
-	120: "JULY",
-	121: "AUGUST",
-	122: "SEPTEMBER",
-	123: "OCTOBER",
-	124: "NOVEMBER",
-	125: "DECEMBER",
-	137: "LITERAL",
-	144: "GROUP",
-	145: "SUM",
-	146: "AVG",
-	147: "MIN",
-	148: "MAX",
-	149: "SPLIT",
-	150: "UNGROUP",
-	151: "RANDOM",
-	152: "CHANGES",
-	154: "ARGS",
-	155: "BINARY",
-	157: "GEOJSON",
-	158: "TO_GEOJSON",
-	159: "POINT",
-	160: "LINE",
-	161: "POLYGON",
-	162: "DISTANCE",
-	163: "INTERSECTS",
-	164: "INCLUDES",
-	165: "CIRCLE",
-	166: "GET_INTERSECTING",
-	167: "FILL",
-	168: "GET_NEAREST",
-	171: "POLYGON_SUB",
-	180: "MINVAL",
-	181: "MAXVAL",
-}
-var Term_TermType_value = map[string]int32{
-	"DATUM":              1,
-	"MAKE_ARRAY":         2,
-	"MAKE_OBJ":           3,
-	"VAR":                10,
-	"JAVASCRIPT":         11,
-	"UUID":               169,
-	"HTTP":               153,
-	"ERROR":              12,
-	"IMPLICIT_VAR":       13,
-	"DB":                 14,
-	"TABLE":              15,
-	"GET":                16,
-	"GET_ALL":            78,
-	"EQ":                 17,
-	"NE":                 18,
-	"LT":                 19,
-	"LE":                 20,
-	"GT":                 21,
-	"GE":                 22,
-	"NOT":                23,
-	"ADD":                24,
-	"SUB":                25,
-	"MUL":                26,
-	"DIV":                27,
-	"MOD":                28,
-	"APPEND":             29,
-	"PREPEND":            80,
-	"DIFFERENCE":         95,
-	"SET_INSERT":         88,
-	"SET_INTERSECTION":   89,
-	"SET_UNION":          90,
-	"SET_DIFFERENCE":     91,
-	"SLICE":              30,
-	"SKIP":               70,
-	"LIMIT":              71,
-	"OFFSETS_OF":         87,
-	"CONTAINS":           93,
-	"GET_FIELD":          31,
-	"KEYS":               94,
-	"OBJECT":             143,
-	"HAS_FIELDS":         32,
-	"WITH_FIELDS":        96,
-	"PLUCK":              33,
-	"WITHOUT":            34,
-	"MERGE":              35,
-	"BETWEEN_DEPRECATED": 36,
-	"BETWEEN":            182,
-	"REDUCE":             37,
-	"MAP":                38,
-	"FILTER":             39,
-	"CONCAT_MAP":         40,
-	"ORDER_BY":           41,
-	"DISTINCT":           42,
-	"COUNT":              43,
-	"IS_EMPTY":           86,
-	"UNION":              44,
-	"NTH":                45,
-	"BRACKET":            170,
-	"INNER_JOIN":         48,
-	"OUTER_JOIN":         49,
-	"EQ_JOIN":            50,
-	"ZIP":                72,
-	"RANGE":              173,
-	"INSERT_AT":          82,
-	"DELETE_AT":          83,
-	"CHANGE_AT":          84,
-	"SPLICE_AT":          85,
-	"COERCE_TO":          51,
-	"TYPE_OF":            52,
-	"UPDATE":             53,
-	"DELETE":             54,
-	"REPLACE":            55,
-	"INSERT":             56,
-	"DB_CREATE":          57,
-	"DB_DROP":            58,
-	"DB_LIST":            59,
-	"TABLE_CREATE":       60,
-	"TABLE_DROP":         61,
-	"TABLE_LIST":         62,
-	"CONFIG":             174,
-	"STATUS":             175,
-	"WAIT":               177,
-	"RECONFIGURE":        176,
-	"REBALANCE":          179,
-	"SYNC":               138,
-	"INDEX_CREATE":       75,
-	"INDEX_DROP":         76,
-	"INDEX_LIST":         77,
-	"INDEX_STATUS":       139,
-	"INDEX_WAIT":         140,
-	"INDEX_RENAME":       156,
-	"FUNCALL":            64,
-	"BRANCH":             65,
-	"OR":                 66,
-	"AND":                67,
-	"FOR_EACH":           68,
-	"FUNC":               69,
-	"ASC":                73,
-	"DESC":               74,
-	"INFO":               79,
-	"MATCH":              97,
-	"UPCASE":             141,
-	"DOWNCASE":           142,
-	"SAMPLE":             81,
-	"DEFAULT":            92,
-	"JSON":               98,
-	"TO_JSON_STRING":     172,
-	"ISO8601":            99,
-	"TO_ISO8601":         100,
-	"EPOCH_TIME":         101,
-	"TO_EPOCH_TIME":      102,
-	"NOW":                103,
-	"IN_TIMEZONE":        104,
-	"DURING":             105,
-	"DATE":               106,
-	"TIME_OF_DAY":        126,
-	"TIMEZONE":           127,
-	"YEAR":               128,
-	"MONTH":              129,
-	"DAY":                130,
-	"DAY_OF_WEEK":        131,
-	"DAY_OF_YEAR":        132,
-	"HOURS":              133,
-	"MINUTES":            134,
-	"SECONDS":            135,
-	"TIME":               136,
-	"MONDAY":             107,
-	"TUESDAY":            108,
-	"WEDNESDAY":          109,
-	"THURSDAY":           110,
-	"FRIDAY":             111,
-	"SATURDAY":           112,
-	"SUNDAY":             113,
-	"JANUARY":            114,
-	"FEBRUARY":           115,
-	"MARCH":              116,
-	"APRIL":              117,
-	"MAY":                118,
-	"JUNE":               119,
-	"JULY":               120,
-	"AUGUST":             121,
-	"SEPTEMBER":          122,
-	"OCTOBER":            123,
-	"NOVEMBER":           124,
-	"DECEMBER":           125,
-	"LITERAL":            137,
-	"GROUP":              144,
-	"SUM":                145,
-	"AVG":                146,
-	"MIN":                147,
-	"MAX":                148,
-	"SPLIT":              149,
-	"UNGROUP":            150,
-	"RANDOM":             151,
-	"CHANGES":            152,
-	"ARGS":               154,
-	"BINARY":             155,
-	"GEOJSON":            157,
-	"TO_GEOJSON":         158,
-	"POINT":              159,
-	"LINE":               160,
-	"POLYGON":            161,
-	"DISTANCE":           162,
-	"INTERSECTS":         163,
-	"INCLUDES":           164,
-	"CIRCLE":             165,
-	"GET_INTERSECTING":   166,
-	"FILL":               167,
-	"GET_NEAREST":        168,
-	"POLYGON_SUB":        171,
-	"MINVAL":             180,
-	"MAXVAL":             181,
-}
-
-func (x Term_TermType) Enum() *Term_TermType {
-	p := new(Term_TermType)
-	*p = x
-	return p
-}
-func (x Term_TermType) String() string {
-	return proto.EnumName(Term_TermType_name, int32(x))
-}
-func (x Term_TermType) MarshalJSON() ([]byte, error) {
-	return json.Marshal(x.String())
-}
-func (x *Term_TermType) UnmarshalJSON(data []byte) error {
-	value, err := proto.UnmarshalJSONEnum(Term_TermType_value, data, "Term_TermType")
-	if err != nil {
-		return err
-	}
-	*x = Term_TermType(value)
-	return nil
-}
-
-type VersionDummy struct {
-	XXX_unrecognized []byte `json:"-"`
-}
-
-func (m *VersionDummy) Reset()         { *m = VersionDummy{} }
-func (m *VersionDummy) String() string { return proto.CompactTextString(m) }
-func (*VersionDummy) ProtoMessage()    {}
-
-type Query struct {
-	Type             *Query_QueryType   `protobuf:"varint,1,opt,name=type,enum=Query_QueryType" json:"type,omitempty"`
-	Query            *Term              `protobuf:"bytes,2,opt,name=query" json:"query,omitempty"`
-	Token            *int64             `protobuf:"varint,3,opt,name=token" json:"token,omitempty"`
-	OBSOLETENoreply  *bool              `protobuf:"varint,4,opt,name=OBSOLETE_noreply,def=0" json:"OBSOLETE_noreply,omitempty"`
-	AcceptsRJson     *bool              `protobuf:"varint,5,opt,name=accepts_r_json,def=0" json:"accepts_r_json,omitempty"`
-	GlobalOptargs    []*Query_AssocPair `protobuf:"bytes,6,rep,name=global_optargs" json:"global_optargs,omitempty"`
-	XXX_unrecognized []byte             `json:"-"`
-}
-
-func (m *Query) Reset()         { *m = Query{} }
-func (m *Query) String() string { return proto.CompactTextString(m) }
-func (*Query) ProtoMessage()    {}
-
-const Default_Query_OBSOLETENoreply bool = false
-const Default_Query_AcceptsRJson bool = false
-
-func (m *Query) GetType() Query_QueryType {
-	if m != nil && m.Type != nil {
-		return *m.Type
-	}
-	return 0
-}
-
-func (m *Query) GetQuery() *Term {
-	if m != nil {
-		return m.Query
-	}
-	return nil
-}
-
-func (m *Query) GetToken() int64 {
-	if m != nil && m.Token != nil {
-		return *m.Token
-	}
-	return 0
-}
-
-func (m *Query) GetOBSOLETENoreply() bool {
-	if m != nil && m.OBSOLETENoreply != nil {
-		return *m.OBSOLETENoreply
-	}
-	return Default_Query_OBSOLETENoreply
-}
-
-func (m *Query) GetAcceptsRJson() bool {
-	if m != nil && m.AcceptsRJson != nil {
-		return *m.AcceptsRJson
-	}
-	return Default_Query_AcceptsRJson
-}
-
-func (m *Query) GetGlobalOptargs() []*Query_AssocPair {
-	if m != nil {
-		return m.GlobalOptargs
-	}
-	return nil
-}
-
-type Query_AssocPair struct {
-	Key              *string `protobuf:"bytes,1,opt,name=key" json:"key,omitempty"`
-	Val              *Term   `protobuf:"bytes,2,opt,name=val" json:"val,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *Query_AssocPair) Reset()         { *m = Query_AssocPair{} }
-func (m *Query_AssocPair) String() string { return proto.CompactTextString(m) }
-func (*Query_AssocPair) ProtoMessage()    {}
-
-func (m *Query_AssocPair) GetKey() string {
-	if m != nil && m.Key != nil {
-		return *m.Key
-	}
-	return ""
-}
-
-func (m *Query_AssocPair) GetVal() *Term {
-	if m != nil {
-		return m.Val
-	}
-	return nil
-}
-
-type Frame struct {
-	Type             *Frame_FrameType `protobuf:"varint,1,opt,name=type,enum=Frame_FrameType" json:"type,omitempty"`
-	Pos              *int64           `protobuf:"varint,2,opt,name=pos" json:"pos,omitempty"`
-	Opt              *string          `protobuf:"bytes,3,opt,name=opt" json:"opt,omitempty"`
-	XXX_unrecognized []byte           `json:"-"`
-}
-
-func (m *Frame) Reset()         { *m = Frame{} }
-func (m *Frame) String() string { return proto.CompactTextString(m) }
-func (*Frame) ProtoMessage()    {}
-
-func (m *Frame) GetType() Frame_FrameType {
-	if m != nil && m.Type != nil {
-		return *m.Type
-	}
-	return 0
-}
-
-func (m *Frame) GetPos() int64 {
-	if m != nil && m.Pos != nil {
-		return *m.Pos
-	}
-	return 0
-}
-
-func (m *Frame) GetOpt() string {
-	if m != nil && m.Opt != nil {
-		return *m.Opt
-	}
-	return ""
-}
-
-type Backtrace struct {
-	Frames           []*Frame `protobuf:"bytes,1,rep,name=frames" json:"frames,omitempty"`
-	XXX_unrecognized []byte   `json:"-"`
-}
-
-func (m *Backtrace) Reset()         { *m = Backtrace{} }
-func (m *Backtrace) String() string { return proto.CompactTextString(m) }
-func (*Backtrace) ProtoMessage()    {}
-
-func (m *Backtrace) GetFrames() []*Frame {
-	if m != nil {
-		return m.Frames
-	}
-	return nil
-}
-
-type Response struct {
-	Type             *Response_ResponseType  `protobuf:"varint,1,opt,name=type,enum=Response_ResponseType" json:"type,omitempty"`
-	Notes            []Response_ResponseNote `protobuf:"varint,6,rep,name=notes,enum=Response_ResponseNote" json:"notes,omitempty"`
-	Token            *int64                  `protobuf:"varint,2,opt,name=token" json:"token,omitempty"`
-	Response         []*Datum                `protobuf:"bytes,3,rep,name=response" json:"response,omitempty"`
-	Backtrace        *Backtrace              `protobuf:"bytes,4,opt,name=backtrace" json:"backtrace,omitempty"`
-	Profile          *Datum                  `protobuf:"bytes,5,opt,name=profile" json:"profile,omitempty"`
-	XXX_unrecognized []byte                  `json:"-"`
-}
-
-func (m *Response) Reset()         { *m = Response{} }
-func (m *Response) String() string { return proto.CompactTextString(m) }
-func (*Response) ProtoMessage()    {}
-
-func (m *Response) GetType() Response_ResponseType {
-	if m != nil && m.Type != nil {
-		return *m.Type
-	}
-	return 0
-}
-
-func (m *Response) GetNotes() []Response_ResponseNote {
-	if m != nil {
-		return m.Notes
-	}
-	return nil
-}
-
-func (m *Response) GetToken() int64 {
-	if m != nil && m.Token != nil {
-		return *m.Token
-	}
-	return 0
-}
-
-func (m *Response) GetResponse() []*Datum {
-	if m != nil {
-		return m.Response
-	}
-	return nil
-}
-
-func (m *Response) GetBacktrace() *Backtrace {
-	if m != nil {
-		return m.Backtrace
-	}
-	return nil
-}
-
-func (m *Response) GetProfile() *Datum {
-	if m != nil {
-		return m.Profile
-	}
-	return nil
-}
-
-type Datum struct {
-	Type             *Datum_DatumType          `protobuf:"varint,1,opt,name=type,enum=Datum_DatumType" json:"type,omitempty"`
-	RBool            *bool                     `protobuf:"varint,2,opt,name=r_bool" json:"r_bool,omitempty"`
-	RNum             *float64                  `protobuf:"fixed64,3,opt,name=r_num" json:"r_num,omitempty"`
-	RStr             *string                   `protobuf:"bytes,4,opt,name=r_str" json:"r_str,omitempty"`
-	RArray           []*Datum                  `protobuf:"bytes,5,rep,name=r_array" json:"r_array,omitempty"`
-	RObject          []*Datum_AssocPair        `protobuf:"bytes,6,rep,name=r_object" json:"r_object,omitempty"`
-	XXX_extensions   map[int32]proto.Extension `json:"-"`
-	XXX_unrecognized []byte                    `json:"-"`
-}
-
-func (m *Datum) Reset()         { *m = Datum{} }
-func (m *Datum) String() string { return proto.CompactTextString(m) }
-func (*Datum) ProtoMessage()    {}
-
-var extRange_Datum = []proto.ExtensionRange{
-	{10000, 20000},
-}
-
-func (*Datum) ExtensionRangeArray() []proto.ExtensionRange {
-	return extRange_Datum
-}
-func (m *Datum) ExtensionMap() map[int32]proto.Extension {
-	if m.XXX_extensions == nil {
-		m.XXX_extensions = make(map[int32]proto.Extension)
-	}
-	return m.XXX_extensions
-}
-
-func (m *Datum) GetType() Datum_DatumType {
-	if m != nil && m.Type != nil {
-		return *m.Type
-	}
-	return 0
-}
-
-func (m *Datum) GetRBool() bool {
-	if m != nil && m.RBool != nil {
-		return *m.RBool
-	}
-	return false
-}
-
-func (m *Datum) GetRNum() float64 {
-	if m != nil && m.RNum != nil {
-		return *m.RNum
-	}
-	return 0
-}
-
-func (m *Datum) GetRStr() string {
-	if m != nil && m.RStr != nil {
-		return *m.RStr
-	}
-	return ""
-}
-
-func (m *Datum) GetRArray() []*Datum {
-	if m != nil {
-		return m.RArray
-	}
-	return nil
-}
-
-func (m *Datum) GetRObject() []*Datum_AssocPair {
-	if m != nil {
-		return m.RObject
-	}
-	return nil
-}
-
-type Datum_AssocPair struct {
-	Key              *string `protobuf:"bytes,1,opt,name=key" json:"key,omitempty"`
-	Val              *Datum  `protobuf:"bytes,2,opt,name=val" json:"val,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *Datum_AssocPair) Reset()         { *m = Datum_AssocPair{} }
-func (m *Datum_AssocPair) String() string { return proto.CompactTextString(m) }
-func (*Datum_AssocPair) ProtoMessage()    {}
-
-func (m *Datum_AssocPair) GetKey() string {
-	if m != nil && m.Key != nil {
-		return *m.Key
-	}
-	return ""
-}
-
-func (m *Datum_AssocPair) GetVal() *Datum {
-	if m != nil {
-		return m.Val
-	}
-	return nil
-}
-
-type Term struct {
-	Type             *Term_TermType            `protobuf:"varint,1,opt,name=type,enum=Term_TermType" json:"type,omitempty"`
-	Datum            *Datum                    `protobuf:"bytes,2,opt,name=datum" json:"datum,omitempty"`
-	Args             []*Term                   `protobuf:"bytes,3,rep,name=args" json:"args,omitempty"`
-	Optargs          []*Term_AssocPair         `protobuf:"bytes,4,rep,name=optargs" json:"optargs,omitempty"`
-	XXX_extensions   map[int32]proto.Extension `json:"-"`
-	XXX_unrecognized []byte                    `json:"-"`
-}
-
-func (m *Term) Reset()         { *m = Term{} }
-func (m *Term) String() string { return proto.CompactTextString(m) }
-func (*Term) ProtoMessage()    {}
-
-var extRange_Term = []proto.ExtensionRange{
-	{10000, 20000},
-}
-
-func (*Term) ExtensionRangeArray() []proto.ExtensionRange {
-	return extRange_Term
-}
-func (m *Term) ExtensionMap() map[int32]proto.Extension {
-	if m.XXX_extensions == nil {
-		m.XXX_extensions = make(map[int32]proto.Extension)
-	}
-	return m.XXX_extensions
-}
-
-func (m *Term) GetType() Term_TermType {
-	if m != nil && m.Type != nil {
-		return *m.Type
-	}
-	return 0
-}
-
-func (m *Term) GetDatum() *Datum {
-	if m != nil {
-		return m.Datum
-	}
-	return nil
-}
-
-func (m *Term) GetArgs() []*Term {
-	if m != nil {
-		return m.Args
-	}
-	return nil
-}
-
-func (m *Term) GetOptargs() []*Term_AssocPair {
-	if m != nil {
-		return m.Optargs
-	}
-	return nil
-}
-
-type Term_AssocPair struct {
-	Key              *string `protobuf:"bytes,1,opt,name=key" json:"key,omitempty"`
-	Val              *Term   `protobuf:"bytes,2,opt,name=val" json:"val,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *Term_AssocPair) Reset()         { *m = Term_AssocPair{} }
-func (m *Term_AssocPair) String() string { return proto.CompactTextString(m) }
-func (*Term_AssocPair) ProtoMessage()    {}
-
-func (m *Term_AssocPair) GetKey() string {
-	if m != nil && m.Key != nil {
-		return *m.Key
-	}
-	return ""
-}
-
-func (m *Term_AssocPair) GetVal() *Term {
-	if m != nil {
-		return m.Val
-	}
-	return nil
-}
-
-func init() {
-	proto.RegisterEnum("VersionDummy_Version", VersionDummy_Version_name, VersionDummy_Version_value)
-	proto.RegisterEnum("VersionDummy_Protocol", VersionDummy_Protocol_name, VersionDummy_Protocol_value)
-	proto.RegisterEnum("Query_QueryType", Query_QueryType_name, Query_QueryType_value)
-	proto.RegisterEnum("Frame_FrameType", Frame_FrameType_name, Frame_FrameType_value)
-	proto.RegisterEnum("Response_ResponseType", Response_ResponseType_name, Response_ResponseType_value)
-	proto.RegisterEnum("Response_ResponseNote", Response_ResponseNote_name, Response_ResponseNote_value)
-	proto.RegisterEnum("Datum_DatumType", Datum_DatumType_name, Datum_DatumType_value)
-	proto.RegisterEnum("Term_TermType", Term_TermType_name, Term_TermType_value)
-}
diff --git a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/ql2/ql2.proto b/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/ql2/ql2.proto
deleted file mode 100644
index 3ad50a2dc..000000000
--- a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/ql2/ql2.proto
+++ /dev/null
@@ -1,805 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//                            THE HIGH-LEVEL VIEW                             //
-////////////////////////////////////////////////////////////////////////////////
-
-// Process: When you first open a connection, send the magic number
-// for the version of the protobuf you're targeting (in the [Version]
-// enum).  This should **NOT** be sent as a protobuf; just send the
-// little-endian 32-bit integer over the wire raw.  This number should
-// only be sent once per connection.
-
-// The magic number shall be followed by an authorization key.  The
-// first 4 bytes are the length of the key to be sent as a little-endian
-// 32-bit integer, followed by the key string.  Even if there is no key,
-// an empty string should be sent (length 0 and no data).
-
-// Following the authorization key, the client shall send a magic number
-// for the communication protocol they want to use (in the [Protocol]
-// enum).  This shall be a little-endian 32-bit integer.
-
-// The server will then respond with a NULL-terminated string response.
-// "SUCCESS" indicates that the connection has been accepted. Any other
-// response indicates an error, and the response string should describe
-// the error.
-
-// Next, for each query you want to send, construct a [Query] protobuf
-// and serialize it to a binary blob.  Send the blob's size to the
-// server encoded as a little-endian 32-bit integer, followed by the
-// blob itself.  You will recieve a [Response] protobuf back preceded
-// by its own size, once again encoded as a little-endian 32-bit
-// integer.  You can see an example exchange below in **EXAMPLE**.
-
-// A query consists of a [Term] to evaluate and a unique-per-connection
-// [token].
-
-// Tokens are used for two things:
-// * Keeping track of which responses correspond to which queries.
-// * Batched queries.  Some queries return lots of results, so we send back
-//   batches of <1000, and you need to send a [CONTINUE] query with the same
-//   token to get more results from the original query.
-////////////////////////////////////////////////////////////////////////////////
-
-message VersionDummy { // We need to wrap it like this for some
-                       // non-conforming protobuf libraries
-    // This enum contains the magic numbers for your version.  See **THE HIGH-LEVEL
-    // VIEW** for what to do with it.
-    enum Version {
-        V0_1      = 0x3f61ba36;
-        V0_2      = 0x723081e1; // Authorization key during handshake
-        V0_3      = 0x5f75e83e; // Authorization key and protocol during handshake
-        V0_4      = 0x400c2d20; // Queries execute in parallel
-    }
-
-    // The protocol to use after the handshake, specified in V0_3
-    enum Protocol {
-        PROTOBUF  = 0x271ffc41;
-        JSON      = 0x7e6970c7;
-    }
-}
-
-// You send one of:
-// * A [START] query with a [Term] to evaluate and a unique-per-connection token.
-// * A [CONTINUE] query with the same token as a [START] query that returned
-//   [SUCCESS_PARTIAL] in its [Response].
-// * A [STOP] query with the same token as a [START] query that you want to stop.
-// * A [NOREPLY_WAIT] query with a unique per-connection token. The server answers
-//   with a [WAIT_COMPLETE] [Response].
-message Query {
-    enum QueryType {
-        START    = 1; // Start a new query.
-        CONTINUE = 2; // Continue a query that returned [SUCCESS_PARTIAL]
-                      // (see [Response]).
-        STOP     = 3; // Stop a query partway through executing.
-        NOREPLY_WAIT = 4;
-                      // Wait for noreply operations to finish.
-    }
-    optional QueryType type = 1;
-    // A [Term] is how we represent the operations we want a query to perform.
-    optional Term query = 2; // only present when [type] = [START]
-    optional int64 token = 3;
-    // This flag is ignored on the server.  `noreply` should be added
-    // to `global_optargs` instead (the key "noreply" should map to
-    // either true or false).
-    optional bool OBSOLETE_noreply = 4 [default = false];
-
-    // If this is set to [true], then [Datum] values will sometimes be
-    // of [DatumType] [R_JSON] (see below).  This can provide enormous
-    // speedups in languages with poor protobuf libraries.
-    optional bool accepts_r_json = 5 [default = false];
-
-    message AssocPair {
-        optional string key = 1;
-        optional Term val = 2;
-    }
-    repeated AssocPair global_optargs = 6;
-}
-
-// A backtrace frame (see `backtrace` in Response below)
-message Frame {
-    enum FrameType {
-        POS = 1; // Error occured in a positional argument.
-        OPT = 2; // Error occured in an optional argument.
-    }
-    optional FrameType type = 1;
-    optional int64 pos = 2; // The index of the positional argument.
-    optional string opt = 3; // The name of the optional argument.
-}
-message Backtrace {
-    repeated Frame frames = 1;
-}
-
-// You get back a response with the same [token] as your query.
-message Response {
-    enum ResponseType {
-        // These response types indicate success.
-        SUCCESS_ATOM      = 1; // Query returned a single RQL datatype.
-        SUCCESS_SEQUENCE  = 2; // Query returned a sequence of RQL datatypes.
-        SUCCESS_PARTIAL   = 3; // Query returned a partial sequence of RQL
-                               // datatypes.  If you send a [CONTINUE] query with
-                               // the same token as this response, you will get
-                               // more of the sequence.  Keep sending [CONTINUE]
-                               // queries until you get back [SUCCESS_SEQUENCE].
-        WAIT_COMPLETE     = 4; // A [NOREPLY_WAIT] query completed.
-
-        // These response types indicate failure.
-        CLIENT_ERROR  = 16; // Means the client is buggy.  An example is if the
-                            // client sends a malformed protobuf, or tries to
-                            // send [CONTINUE] for an unknown token.
-        COMPILE_ERROR = 17; // Means the query failed during parsing or type
-                            // checking.  For example, if you pass too many
-                            // arguments to a function.
-        RUNTIME_ERROR = 18; // Means the query failed at runtime.  An example is
-                            // if you add together two values from a table, but
-                            // they turn out at runtime to be booleans rather
-                            // than numbers.
-    }
-    optional ResponseType type = 1;
-
-    // ResponseNotes are used to provide information about the query
-    // response that may be useful for people writing drivers or ORMs.
-    // Currently all the notes we send indicate that a stream has certain
-    // special properties.
-    enum ResponseNote {
-        // The stream is a changefeed stream (e.g. `r.table('test').changes()`).
-        SEQUENCE_FEED = 1;
-        // The stream is a point changefeed stream
-        // (e.g. `r.table('test').get(0).changes()`).
-        ATOM_FEED = 2;
-        // The stream is an order_by_limit changefeed stream
-        // (e.g. `r.table('test').order_by(index: 'id').limit(5).changes()`).
-        ORDER_BY_LIMIT_FEED = 3;
-        // The stream is a union of multiple changefeed types that can't be
-        // collapsed to a single type
-        // (e.g. `r.table('test').changes().union(r.table('test').get(0).changes())`).
-        UNIONED_FEED = 4;
-        // The stream is a changefeed stream and includes notes on what state
-        // the changefeed stream is in (e.g. objects of the form `{state:
-        // 'initializing'}`).
-        INCLUDES_STATES = 5;
-    }
-    repeated ResponseNote notes = 6;
-
-    optional int64 token = 2; // Indicates what [Query] this response corresponds to.
-
-    // [response] contains 1 RQL datum if [type] is [SUCCESS_ATOM], or many RQL
-    // data if [type] is [SUCCESS_SEQUENCE] or [SUCCESS_PARTIAL].  It contains 1
-    // error message (of type [R_STR]) in all other cases.
-    repeated Datum response = 3;
-
-    // If [type] is [CLIENT_ERROR], [TYPE_ERROR], or [RUNTIME_ERROR], then a
-    // backtrace will be provided.  The backtrace says where in the query the
-    // error occured.  Ideally this information will be presented to the user as
-    // a pretty-printed version of their query with the erroneous section
-    // underlined.  A backtrace is a series of 0 or more [Frame]s, each of which
-    // specifies either the index of a positional argument or the name of an
-    // optional argument.  (Those words will make more sense if you look at the
-    // [Term] message below.)
-    optional Backtrace backtrace = 4; // Contains n [Frame]s when you get back an error.
-
-    // If the [global_optargs] in the [Query] that this [Response] is a
-    // response to contains a key "profile" which maps to a static value of
-    // true then [profile] will contain a [Datum] which provides profiling
-    // information about the execution of the query. This field should be
-    // returned to the user along with the result that would normally be
-    // returned (a datum or a cursor). In official drivers this is accomplished
-    // by putting them inside of an object with "value" mapping to the return
-    // value and "profile" mapping to the profile object.
-    optional Datum profile = 5;
-}
-
-// A [Datum] is a chunk of data that can be serialized to disk or returned to
-// the user in a Response.  Currently we only support JSON types, but we may
-// support other types in the future (e.g., a date type or an integer type).
-message Datum {
-    enum DatumType {
-        R_NULL   = 1;
-        R_BOOL   = 2;
-        R_NUM    = 3; // a double
-        R_STR    = 4;
-        R_ARRAY  = 5;
-        R_OBJECT = 6;
-        // This [DatumType] will only be used if [accepts_r_json] is
-        // set to [true] in [Query].  [r_str] will be filled with a
-        // JSON encoding of the [Datum].
-        R_JSON   = 7; // uses r_str
-    }
-    optional DatumType type = 1;
-    optional bool r_bool = 2;
-    optional double r_num = 3;
-    optional string r_str = 4;
-
-    repeated Datum r_array = 5;
-    message AssocPair {
-        optional string key = 1;
-        optional Datum val = 2;
-    }
-    repeated AssocPair r_object = 6;
-
-    extensions 10000 to 20000;
-}
-
-// A [Term] is either a piece of data (see **Datum** above), or an operator and
-// its operands.  If you have a [Datum], it's stored in the member [datum].  If
-// you have an operator, its positional arguments are stored in [args] and its
-// optional arguments are stored in [optargs].
-//
-// A note about type signatures:
-// We use the following notation to denote types:
-//   arg1_type, arg2_type, argrest_type... -> result_type
-// So, for example, if we have a function `avg` that takes any number of
-// arguments and averages them, we might write:
-//   NUMBER... -> NUMBER
-// Or if we had a function that took one number modulo another:
-//   NUMBER, NUMBER -> NUMBER
-// Or a function that takes a table and a primary key of any Datum type, then
-// retrieves the entry with that primary key:
-//   Table, DATUM -> OBJECT
-// Some arguments must be provided as literal values (and not the results of sub
-// terms).  These are marked with a `!`.
-// Optional arguments are specified within curly braces as argname `:` value
-// type (e.x `{use_outdated:BOOL}`)
-// Many RQL operations are polymorphic. For these, alterantive type signatures
-// are separated by `|`.
-//
-// The RQL type hierarchy is as follows:
-//   Top
-//     DATUM
-//       NULL
-//       BOOL
-//       NUMBER
-//       STRING
-//       OBJECT
-//         SingleSelection
-//       ARRAY
-//     Sequence
-//       ARRAY
-//       Stream
-//         StreamSelection
-//           Table
-//     Database
-//     Function
-//     Ordering - used only by ORDER_BY
-//     Pathspec -- an object, string, or array that specifies a path
-//   Error
-message Term {
-    enum TermType {
-        // A RQL datum, stored in `datum` below.
-        DATUM = 1;
-
-        MAKE_ARRAY = 2; // DATUM... -> ARRAY
-        // Evaluate the terms in [optargs] and make an object
-        MAKE_OBJ   = 3; // {...} -> OBJECT
-
-        // * Compound types
-
-        // Takes an integer representing a variable and returns the value stored
-        // in that variable.  It's the responsibility of the client to translate
-        // from their local representation of a variable to a unique _non-negative_
-        // integer for that variable.  (We do it this way instead of letting
-        // clients provide variable names as strings to discourage
-        // variable-capturing client libraries, and because it's more efficient
-        // on the wire.)
-        VAR          = 10; // !NUMBER -> DATUM
-        // Takes some javascript code and executes it.
-        JAVASCRIPT   = 11; // STRING {timeout: !NUMBER} -> DATUM |
-                           // STRING {timeout: !NUMBER} -> Function(*)
-        UUID = 169; // () -> DATUM
-
-        // Takes an HTTP URL and gets it.  If the get succeeds and
-        //  returns valid JSON, it is converted into a DATUM
-        HTTP = 153; // STRING {data: OBJECT | STRING,
-                    //         timeout: !NUMBER,
-                    //         method: STRING,
-                    //         params: OBJECT,
-                    //         header: OBJECT | ARRAY,
-                    //         attempts: NUMBER,
-                    //         redirects: NUMBER,
-                    //         verify: BOOL,
-                    //         page: FUNC | STRING,
-                    //         page_limit: NUMBER,
-                    //         auth: OBJECT,
-                    //         result_format: STRING,
-                    //         } -> STRING | STREAM
-
-        // Takes a string and throws an error with that message.
-        // Inside of a `default` block, you can omit the first
-        // argument to rethrow whatever error you catch (this is most
-        // useful as an argument to the `default` filter optarg).
-        ERROR        = 12; // STRING -> Error | -> Error
-        // Takes nothing and returns a reference to the implicit variable.
-        IMPLICIT_VAR = 13; // -> DATUM
-
-        // * Data Operators
-        // Returns a reference to a database.
-        DB    = 14; // STRING -> Database
-        // Returns a reference to a table.
-        TABLE = 15; // Database, STRING, {use_outdated:BOOL, identifier_format:STRING} -> Table
-                    // STRING, {use_outdated:BOOL, identifier_format:STRING} -> Table
-        // Gets a single element from a table by its primary or a secondary key.
-        GET   = 16; // Table, STRING -> SingleSelection | Table, NUMBER -> SingleSelection |
-                    // Table, STRING -> NULL            | Table, NUMBER -> NULL |
-        GET_ALL = 78; // Table, DATUM..., {index:!STRING} => ARRAY
-
-        // Simple DATUM Ops
-        EQ  = 17; // DATUM... -> BOOL
-        NE  = 18; // DATUM... -> BOOL
-        LT  = 19; // DATUM... -> BOOL
-        LE  = 20; // DATUM... -> BOOL
-        GT  = 21; // DATUM... -> BOOL
-        GE  = 22; // DATUM... -> BOOL
-        NOT = 23; // BOOL -> BOOL
-        // ADD can either add two numbers or concatenate two arrays.
-        ADD = 24; // NUMBER... -> NUMBER | STRING... -> STRING
-        SUB = 25; // NUMBER... -> NUMBER
-        MUL = 26; // NUMBER... -> NUMBER
-        DIV = 27; // NUMBER... -> NUMBER
-        MOD = 28; // NUMBER, NUMBER -> NUMBER
-
-        // DATUM Array Ops
-        // Append a single element to the end of an array (like `snoc`).
-        APPEND = 29; // ARRAY, DATUM -> ARRAY
-        // Prepend a single element to the end of an array (like `cons`).
-        PREPEND = 80; // ARRAY, DATUM -> ARRAY
-        //Remove the elements of one array from another array.
-        DIFFERENCE = 95; // ARRAY, ARRAY -> ARRAY
-
-        // DATUM Set Ops
-        // Set ops work on arrays. They don't use actual sets and thus have
-        // performance characteristics you would expect from arrays rather than
-        // from sets. All set operations have the post condition that they
-        // array they return contains no duplicate values.
-        SET_INSERT = 88; // ARRAY, DATUM -> ARRAY
-        SET_INTERSECTION = 89; // ARRAY, ARRAY -> ARRAY
-        SET_UNION = 90; // ARRAY, ARRAY -> ARRAY
-        SET_DIFFERENCE = 91; // ARRAY, ARRAY -> ARRAY
-
-        SLICE  = 30; // Sequence, NUMBER, NUMBER -> Sequence
-        SKIP  = 70; // Sequence, NUMBER -> Sequence
-        LIMIT = 71; // Sequence, NUMBER -> Sequence
-        OFFSETS_OF = 87; // Sequence, DATUM -> Sequence | Sequence, Function(1) -> Sequence
-        CONTAINS = 93; // Sequence, DATUM -> BOOL | Sequence, Function(1) -> BOOL
-
-        // Stream/Object Ops
-        // Get a particular field from an object, or map that over a
-        // sequence.
-        GET_FIELD  = 31; // OBJECT, STRING -> DATUM
-                         // | Sequence, STRING -> Sequence
-        // Return an array containing the keys of the object.
-        KEYS = 94; // OBJECT -> ARRAY
-        // Creates an object
-        OBJECT = 143; // STRING, DATUM, ... -> OBJECT
-        // Check whether an object contains all the specified fields,
-        // or filters a sequence so that all objects inside of it
-        // contain all the specified fields.
-        HAS_FIELDS = 32; // OBJECT, Pathspec... -> BOOL
-        // x.with_fields(...) <=> x.has_fields(...).pluck(...)
-        WITH_FIELDS = 96; // Sequence, Pathspec... -> Sequence
-        // Get a subset of an object by selecting some attributes to preserve,
-        // or map that over a sequence.  (Both pick and pluck, polymorphic.)
-        PLUCK    = 33; // Sequence, Pathspec... -> Sequence | OBJECT, Pathspec... -> OBJECT
-        // Get a subset of an object by selecting some attributes to discard, or
-        // map that over a sequence.  (Both unpick and without, polymorphic.)
-        WITHOUT  = 34; // Sequence, Pathspec... -> Sequence | OBJECT, Pathspec... -> OBJECT
-        // Merge objects (right-preferential)
-        MERGE    = 35; // OBJECT... -> OBJECT | Sequence -> Sequence
-
-        // Sequence Ops
-        // Get all elements of a sequence between two values.
-        // Half-open by default, but the openness of either side can be
-        // changed by passing 'closed' or 'open for `right_bound` or
-        // `left_bound`.
-        BETWEEN_DEPRECATED = 36; // Deprecated version of between, which allows `null` to specify unboundedness
-                                 // With the newer version, clients should use `r.minval` and `r.maxval` for unboundedness
-        BETWEEN   = 182; // StreamSelection, DATUM, DATUM, {index:!STRING, right_bound:STRING, left_bound:STRING} -> StreamSelection
-        REDUCE    = 37; // Sequence, Function(2) -> DATUM
-        MAP       = 38; // Sequence, Function(1) -> Sequence
-                        // The arity of the function should be
-                        // Sequence..., Function(sizeof...(Sequence)) -> Sequence
-
-        // Filter a sequence with either a function or a shortcut
-        // object (see API docs for details).  The body of FILTER is
-        // wrapped in an implicit `.default(false)`, and you can
-        // change the default value by specifying the `default`
-        // optarg.  If you make the default `r.error`, all errors
-        // caught by `default` will be rethrown as if the `default`
-        // did not exist.
-        FILTER    = 39; // Sequence, Function(1), {default:DATUM} -> Sequence |
-                        // Sequence, OBJECT, {default:DATUM} -> Sequence
-        // Map a function over a sequence and then concatenate the results together.
-        CONCAT_MAP = 40; // Sequence, Function(1) -> Sequence
-        // Order a sequence based on one or more attributes.
-        ORDER_BY   = 41; // Sequence, (!STRING | Ordering)... -> Sequence
-        // Get all distinct elements of a sequence (like `uniq`).
-        DISTINCT  = 42; // Sequence -> Sequence
-        // Count the number of elements in a sequence, or only the elements that match
-        // a given filter.
-        COUNT     = 43; // Sequence -> NUMBER | Sequence, DATUM -> NUMBER | Sequence, Function(1) -> NUMBER
-        IS_EMPTY = 86; // Sequence -> BOOL
-        // Take the union of multiple sequences (preserves duplicate elements! (use distinct)).
-        UNION     = 44; // Sequence... -> Sequence
-        // Get the Nth element of a sequence.
-        NTH       = 45; // Sequence, NUMBER -> DATUM
-        // do NTH or GET_FIELD depending on target object
-        BRACKET            = 170; // Sequence | OBJECT, NUMBER | STRING -> DATUM
-        // OBSOLETE_GROUPED_MAPREDUCE = 46;
-        // OBSOLETE_GROUPBY = 47;
-
-        INNER_JOIN         = 48; // Sequence, Sequence, Function(2) -> Sequence
-        OUTER_JOIN         = 49; // Sequence, Sequence, Function(2) -> Sequence
-        // An inner-join that does an equality comparison on two attributes.
-        EQ_JOIN            = 50; // Sequence, !STRING, Sequence, {index:!STRING} -> Sequence
-        ZIP                = 72; // Sequence -> Sequence
-        RANGE              = 173; // -> Sequence                        [0, +inf)
-                                  // NUMBER -> Sequence                 [0, a)
-                                  // NUMBER, NUMBER -> Sequence         [a, b)
-
-        // Array Ops
-        // Insert an element in to an array at a given index.
-        INSERT_AT          = 82; // ARRAY, NUMBER, DATUM -> ARRAY
-        // Remove an element at a given index from an array.
-        DELETE_AT          = 83; // ARRAY, NUMBER -> ARRAY |
-                                 // ARRAY, NUMBER, NUMBER -> ARRAY
-        // Change the element at a given index of an array.
-        CHANGE_AT          = 84; // ARRAY, NUMBER, DATUM -> ARRAY
-        // Splice one array in to another array.
-        SPLICE_AT          = 85; // ARRAY, NUMBER, ARRAY -> ARRAY
-
-        // * Type Ops
-        // Coerces a datum to a named type (e.g. "bool").
-        // If you previously used `stream_to_array`, you should use this instead
-        // with the type "array".
-        COERCE_TO = 51; // Top, STRING -> Top
-        // Returns the named type of a datum (e.g. TYPE_OF(true) = "BOOL")
-        TYPE_OF = 52; // Top -> STRING
-
-        // * Write Ops (the OBJECTs contain data about number of errors etc.)
-        // Updates all the rows in a selection.  Calls its Function with the row
-        // to be updated, and then merges the result of that call.
-        UPDATE   = 53; // StreamSelection, Function(1), {non_atomic:BOOL, durability:STRING, return_changes:BOOL} -> OBJECT |
-                       // SingleSelection, Function(1), {non_atomic:BOOL, durability:STRING, return_changes:BOOL} -> OBJECT |
-                       // StreamSelection, OBJECT,      {non_atomic:BOOL, durability:STRING, return_changes:BOOL} -> OBJECT |
-                       // SingleSelection, OBJECT,      {non_atomic:BOOL, durability:STRING, return_changes:BOOL} -> OBJECT
-        // Deletes all the rows in a selection.
-        DELETE   = 54; // StreamSelection, {durability:STRING, return_changes:BOOL} -> OBJECT | SingleSelection -> OBJECT
-        // Replaces all the rows in a selection.  Calls its Function with the row
-        // to be replaced, and then discards it and stores the result of that
-        // call.
-        REPLACE  = 55; // StreamSelection, Function(1), {non_atomic:BOOL, durability:STRING, return_changes:BOOL} -> OBJECT | SingleSelection, Function(1), {non_atomic:BOOL, durability:STRING, return_changes:BOOL} -> OBJECT
-        // Inserts into a table.  If `conflict` is replace, overwrites
-        // entries with the same primary key.  If `conflict` is
-        // update, does an update on the entry.  If `conflict` is
-        // error, or is omitted, conflicts will trigger an error.
-        INSERT   = 56; // Table, OBJECT, {conflict:STRING, durability:STRING, return_changes:BOOL} -> OBJECT | Table, Sequence, {conflict:STRING, durability:STRING, return_changes:BOOL} -> OBJECT
-
-        // * Administrative OPs
-        // Creates a database with a particular name.
-        DB_CREATE     = 57; // STRING -> OBJECT
-        // Drops a database with a particular name.
-        DB_DROP       = 58; // STRING -> OBJECT
-        // Lists all the databases by name.  (Takes no arguments)
-        DB_LIST       = 59; // -> ARRAY
-        // Creates a table with a particular name in a particular
-        // database.  (You may omit the first argument to use the
-        // default database.)
-        TABLE_CREATE  = 60; // Database, STRING, {primary_key:STRING, shards:NUMBER, replicas:NUMBER, primary_replica_tag:STRING} -> OBJECT
-                            // Database, STRING, {primary_key:STRING, shards:NUMBER, replicas:OBJECT, primary_replica_tag:STRING} -> OBJECT
-                            // STRING, {primary_key:STRING, shards:NUMBER, replicas:NUMBER, primary_replica_tag:STRING} -> OBJECT
-                            // STRING, {primary_key:STRING, shards:NUMBER, replicas:OBJECT, primary_replica_tag:STRING} -> OBJECT
-        // Drops a table with a particular name from a particular
-        // database.  (You may omit the first argument to use the
-        // default database.)
-        TABLE_DROP    = 61; // Database, STRING -> OBJECT
-                                // STRING -> OBJECT
-        // Lists all the tables in a particular database.  (You may
-        // omit the first argument to use the default database.)
-        TABLE_LIST    = 62; // Database -> ARRAY
-                            //  -> ARRAY
-        // Returns the row in the `rethinkdb.table_config` or `rethinkdb.db_config` table
-        // that corresponds to the given database or table.
-        CONFIG  = 174; // Database -> SingleSelection
-                       // Table -> SingleSelection
-        // Returns the row in the `rethinkdb.table_status` table that corresponds to the
-        // given table.
-        STATUS  = 175; // Table -> SingleSelection
-        // Called on a table, waits for that table to be ready for read/write operations.
-        // Called on a database, waits for all of the tables in the database to be ready.
-        // Returns the corresponding row or rows from the `rethinkdb.table_status` table.
-        WAIT    = 177; // Table -> OBJECT
-                       // Database -> OBJECT
-        // Generates a new config for the given table, or all tables in the given database
-        // The `shards` and `replicas` arguments are required
-        RECONFIGURE   = 176; // Database, {shards:NUMBER, replicas:NUMBER[, primary_replica_tag:STRING, dry_run:BOOLEAN]} -> OBJECT
-                             // Database, {shards:NUMBER, replicas:OBJECT[, primary_replica_tag:STRING, dry_run:BOOLEAN]} -> OBJECT
-                             // Table, {shards:NUMBER, replicas:NUMBER[, primary_replica_tag:STRING, dry_run:BOOLEAN]} -> OBJECT
-                             // Table, {shards:NUMBER, replicas:OBJECT[, primary_replica_tag:STRING, dry_run:BOOLEAN]} -> OBJECT
-        // Balances the table's shards but leaves everything else the same. Can also be
-        // applied to an entire database at once.
-        REBALANCE     = 179; // Table -> OBJECT
-                             // Database -> OBJECT
-
-        // Ensures that previously issued soft-durability writes are complete and
-        // written to disk.
-        SYNC          = 138; // Table -> OBJECT
-
-        // * Secondary indexes OPs
-        // Creates a new secondary index with a particular name and definition.
-        INDEX_CREATE = 75; // Table, STRING, Function(1), {multi:BOOL} -> OBJECT
-        // Drops a secondary index with a particular name from the specified table.
-        INDEX_DROP   = 76; // Table, STRING -> OBJECT
-        // Lists all secondary indexes on a particular table.
-        INDEX_LIST   = 77; // Table -> ARRAY
-        // Gets information about whether or not a set of indexes are ready to
-        // be accessed. Returns a list of objects that look like this:
-        // {index:STRING, ready:BOOL[, blocks_processed:NUMBER, blocks_total:NUMBER]}
-        INDEX_STATUS = 139; // Table, STRING... -> ARRAY
-        // Blocks until a set of indexes are ready to be accessed. Returns the
-        // same values INDEX_STATUS.
-        INDEX_WAIT = 140; // Table, STRING... -> ARRAY
-        // Renames the given index to a new name
-        INDEX_RENAME = 156; // Table, STRING, STRING, {overwrite:BOOL} -> OBJECT
-
-        // * Control Operators
-        // Calls a function on data
-        FUNCALL  = 64; // Function(*), DATUM... -> DATUM
-        // Executes its first argument, and returns its second argument if it
-        // got [true] or its third argument if it got [false] (like an `if`
-        // statement).
-        BRANCH  = 65; // BOOL, Top, Top -> Top
-        // Returns true if any of its arguments returns true (short-circuits).
-        OR      = 66; // BOOL... -> BOOL
-        // Returns true if all of its arguments return true (short-circuits).
-        AND     = 67; // BOOL... -> BOOL
-        // Calls its Function with each entry in the sequence
-        // and executes the array of terms that Function returns.
-        FOR_EACH = 68; // Sequence, Function(1) -> OBJECT
-
-////////////////////////////////////////////////////////////////////////////////
-////////// Special Terms
-////////////////////////////////////////////////////////////////////////////////
-
-        // An anonymous function.  Takes an array of numbers representing
-        // variables (see [VAR] above), and a [Term] to execute with those in
-        // scope.  Returns a function that may be passed an array of arguments,
-        // then executes the Term with those bound to the variable names.  The
-        // user will never construct this directly.  We use it internally for
-        // things like `map` which take a function.  The "arity" of a [Function] is
-        // the number of arguments it takes.
-        // For example, here's what `_X_.map{|x| x+2}` turns into:
-        // Term {
-        //   type = MAP;
-        //   args = [_X_,
-        //           Term {
-        //             type = Function;
-        //             args = [Term {
-        //                       type = DATUM;
-        //                       datum = Datum {
-        //                         type = R_ARRAY;
-        //                         r_array = [Datum { type = R_NUM; r_num = 1; }];
-        //                       };
-        //                     },
-        //                     Term {
-        //                       type = ADD;
-        //                       args = [Term {
-        //                                 type = VAR;
-        //                                 args = [Term {
-        //                                           type = DATUM;
-        //                                           datum = Datum { type = R_NUM;
-        //                                                           r_num = 1};
-        //                                         }];
-        //                               },
-        //                               Term {
-        //                                 type = DATUM;
-        //                                 datum = Datum { type = R_NUM; r_num = 2; };
-        //                               }];
-        //                     }];
-        //           }];
-        FUNC = 69; // ARRAY, Top -> ARRAY -> Top
-
-        // Indicates to ORDER_BY that this attribute is to be sorted in ascending order.
-        ASC = 73; // !STRING -> Ordering
-        // Indicates to ORDER_BY that this attribute is to be sorted in descending order.
-        DESC = 74; // !STRING -> Ordering
-
-        // Gets info about anything.  INFO is most commonly called on tables.
-        INFO = 79; // Top -> OBJECT
-
-        // `a.match(b)` returns a match object if the string `a`
-        // matches the regular expression `b`.
-        MATCH = 97; // STRING, STRING -> DATUM
-
-        // Change the case of a string.
-        UPCASE   = 141; // STRING -> STRING
-        DOWNCASE = 142; // STRING -> STRING
-
-        // Select a number of elements from sequence with uniform distribution.
-        SAMPLE = 81; // Sequence, NUMBER -> Sequence
-
-        // Evaluates its first argument.  If that argument returns
-        // NULL or throws an error related to the absence of an
-        // expected value (for instance, accessing a non-existent
-        // field or adding NULL to an integer), DEFAULT will either
-        // return its second argument or execute it if it's a
-        // function.  If the second argument is a function, it will be
-        // passed either the text of the error or NULL as its
-        // argument.
-        DEFAULT = 92; // Top, Top -> Top
-
-        // Parses its first argument as a json string and returns it as a
-        // datum.
-        JSON = 98; // STRING -> DATUM
-        // Returns the datum as a JSON string.
-        // N.B.: we would really prefer this be named TO_JSON and that exists as
-        // an alias in Python and JavaScript drivers; however it conflicts with the
-        // standard `to_json` method defined by Ruby's standard json library.
-        TO_JSON_STRING = 172; // DATUM -> STRING
-
-        // Parses its first arguments as an ISO 8601 time and returns it as a
-        // datum.
-        ISO8601 = 99; // STRING -> PSEUDOTYPE(TIME)
-        // Prints a time as an ISO 8601 time.
-        TO_ISO8601 = 100; // PSEUDOTYPE(TIME) -> STRING
-
-        // Returns a time given seconds since epoch in UTC.
-        EPOCH_TIME = 101; // NUMBER -> PSEUDOTYPE(TIME)
-        // Returns seconds since epoch in UTC given a time.
-        TO_EPOCH_TIME = 102; // PSEUDOTYPE(TIME) -> NUMBER
-
-        // The time the query was received by the server.
-        NOW = 103; // -> PSEUDOTYPE(TIME)
-        // Puts a time into an ISO 8601 timezone.
-        IN_TIMEZONE = 104; // PSEUDOTYPE(TIME), STRING -> PSEUDOTYPE(TIME)
-        // a.during(b, c) returns whether a is in the range [b, c)
-        DURING = 105; // PSEUDOTYPE(TIME), PSEUDOTYPE(TIME), PSEUDOTYPE(TIME) -> BOOL
-        // Retrieves the date portion of a time.
-        DATE = 106; // PSEUDOTYPE(TIME) -> PSEUDOTYPE(TIME)
-        // x.time_of_day == x.date - x
-        TIME_OF_DAY = 126; // PSEUDOTYPE(TIME) -> NUMBER
-        // Returns the timezone of a time.
-        TIMEZONE = 127; // PSEUDOTYPE(TIME) -> STRING
-
-        // These access the various components of a time.
-        YEAR = 128; // PSEUDOTYPE(TIME) -> NUMBER
-        MONTH = 129; // PSEUDOTYPE(TIME) -> NUMBER
-        DAY = 130; // PSEUDOTYPE(TIME) -> NUMBER
-        DAY_OF_WEEK = 131; // PSEUDOTYPE(TIME) -> NUMBER
-        DAY_OF_YEAR = 132; // PSEUDOTYPE(TIME) -> NUMBER
-        HOURS = 133; // PSEUDOTYPE(TIME) -> NUMBER
-        MINUTES = 134; // PSEUDOTYPE(TIME) -> NUMBER
-        SECONDS = 135; // PSEUDOTYPE(TIME) -> NUMBER
-
-        // Construct a time from a date and optional timezone or a
-        // date+time and optional timezone.
-        TIME = 136; // NUMBER, NUMBER, NUMBER, STRING -> PSEUDOTYPE(TIME) |
-                    // NUMBER, NUMBER, NUMBER, NUMBER, NUMBER, NUMBER, STRING -> PSEUDOTYPE(TIME) |
-
-        // Constants for ISO 8601 days of the week.
-        MONDAY = 107;    // -> 1
-        TUESDAY = 108;   // -> 2
-        WEDNESDAY = 109; // -> 3
-        THURSDAY = 110;  // -> 4
-        FRIDAY = 111;    // -> 5
-        SATURDAY = 112;  // -> 6
-        SUNDAY = 113;    // -> 7
-
-        // Constants for ISO 8601 months.
-        JANUARY = 114;   // -> 1
-        FEBRUARY = 115;  // -> 2
-        MARCH = 116;     // -> 3
-        APRIL = 117;     // -> 4
-        MAY = 118;       // -> 5
-        JUNE = 119;      // -> 6
-        JULY = 120;      // -> 7
-        AUGUST = 121;    // -> 8
-        SEPTEMBER = 122; // -> 9
-        OCTOBER = 123;   // -> 10
-        NOVEMBER = 124;  // -> 11
-        DECEMBER = 125;  // -> 12
-
-        // Indicates to MERGE to replace the other object rather than merge it.
-        LITERAL = 137; // JSON -> Merging
-
-        // SEQUENCE, STRING -> GROUPED_SEQUENCE | SEQUENCE, FUNCTION -> GROUPED_SEQUENCE
-        GROUP = 144;
-        SUM = 145;
-        AVG = 146;
-        MIN = 147;
-        MAX = 148;
-
-        // `str.split()` splits on whitespace
-        // `str.split(" ")` splits on spaces only
-        // `str.split(" ", 5)` splits on spaces with at most 5 results
-        // `str.split(nil, 5)` splits on whitespace with at most 5 results
-        SPLIT = 149; // STRING -> ARRAY | STRING, STRING -> ARRAY | STRING, STRING, NUMBER -> ARRAY | STRING, NULL, NUMBER -> ARRAY
-
-        UNGROUP = 150; // GROUPED_DATA -> ARRAY
-
-        // Takes a range of numbers and returns a random number within the range
-        RANDOM = 151; // NUMBER, NUMBER {float:BOOL} -> DATUM
-
-        CHANGES = 152; // TABLE -> STREAM
-        ARGS = 154; // ARRAY -> SPECIAL (used to splice arguments)
-
-        // BINARY is client-only at the moment, it is not supported on the server
-        BINARY = 155; // STRING -> PSEUDOTYPE(BINARY)
-
-        GEOJSON = 157;           // OBJECT -> PSEUDOTYPE(GEOMETRY)
-        TO_GEOJSON = 158;        // PSEUDOTYPE(GEOMETRY) -> OBJECT
-        POINT = 159;             // NUMBER, NUMBER -> PSEUDOTYPE(GEOMETRY)
-        LINE = 160;              // (ARRAY | PSEUDOTYPE(GEOMETRY))... -> PSEUDOTYPE(GEOMETRY)
-        POLYGON = 161;           // (ARRAY | PSEUDOTYPE(GEOMETRY))... -> PSEUDOTYPE(GEOMETRY)
-        DISTANCE = 162;          // PSEUDOTYPE(GEOMETRY), PSEUDOTYPE(GEOMETRY) {geo_system:STRING, unit:STRING} -> NUMBER
-        INTERSECTS = 163;        // PSEUDOTYPE(GEOMETRY), PSEUDOTYPE(GEOMETRY) -> BOOL
-        INCLUDES = 164;          // PSEUDOTYPE(GEOMETRY), PSEUDOTYPE(GEOMETRY) -> BOOL
-        CIRCLE = 165;            // PSEUDOTYPE(GEOMETRY), NUMBER {num_vertices:NUMBER, geo_system:STRING, unit:STRING, fill:BOOL} -> PSEUDOTYPE(GEOMETRY)
-        GET_INTERSECTING = 166;  // TABLE, PSEUDOTYPE(GEOMETRY) {index:!STRING} -> StreamSelection
-        FILL = 167;              // PSEUDOTYPE(GEOMETRY) -> PSEUDOTYPE(GEOMETRY)
-        GET_NEAREST = 168;       // TABLE, PSEUDOTYPE(GEOMETRY) {index:!STRING, max_results:NUM, max_dist:NUM, geo_system:STRING, unit:STRING} -> ARRAY
-        POLYGON_SUB = 171;       // PSEUDOTYPE(GEOMETRY), PSEUDOTYPE(GEOMETRY) -> PSEUDOTYPE(GEOMETRY)
-
-        // Constants for specifying key ranges
-        MINVAL = 180;
-        MAXVAL = 181;
-    }
-    optional TermType type = 1;
-
-    // This is only used when type is DATUM.
-    optional Datum datum = 2;
-
-    repeated Term args = 3; // Holds the positional arguments of the query.
-    message AssocPair {
-        optional string key = 1;
-        optional Term val = 2;
-    }
-    repeated AssocPair optargs = 4; // Holds the optional arguments of the query.
-    // (Note that the order of the optional arguments doesn't matter; think of a
-    // Hash.)
-
-    extensions 10000 to 20000;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-//                                  EXAMPLE                                   //
-////////////////////////////////////////////////////////////////////////////////
-//   ```ruby
-//   r.table('tbl', {:use_outdated => true}).insert([{:id => 0}, {:id => 1}])
-//   ```
-// Would turn into:
-//   Term {
-//     type = INSERT;
-//     args = [Term {
-//               type = TABLE;
-//               args = [Term {
-//                         type = DATUM;
-//                         datum = Datum { type = R_STR; r_str = "tbl"; };
-//                       }];
-//               optargs = [["use_outdated",
-//                           Term {
-//                             type = DATUM;
-//                             datum = Datum { type = R_BOOL; r_bool = true; };
-//                           }]];
-//             },
-//             Term {
-//               type = MAKE_ARRAY;
-//               args = [Term {
-//                         type = DATUM;
-//                         datum = Datum { type = R_OBJECT; r_object = [["id", 0]]; };
-//                       },
-//                       Term {
-//                         type = DATUM;
-//                         datum = Datum { type = R_OBJECT; r_object = [["id", 1]]; };
-//                       }];
-//             }]
-//   }
-// And the server would reply:
-//   Response {
-//     type = SUCCESS_ATOM;
-//     token = 1;
-//     response = [Datum { type = R_OBJECT; r_object = [["inserted", 2]]; }];
-//   }
-// Or, if there were an error:
-//   Response {
-//     type = RUNTIME_ERROR;
-//     token = 1;
-//     response = [Datum { type = R_STR; r_str = "The table `tbl` doesn't exist!"; }];
-//     backtrace = [Frame { type = POS; pos = 0; }, Frame { type = POS; pos = 0; }];
-//   }
diff --git a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/query.go b/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/query.go
deleted file mode 100644
index 9d9561dd4..000000000
--- a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/query.go
+++ /dev/null
@@ -1,290 +0,0 @@
-package gorethink
-
-import (
-	"fmt"
-	"strconv"
-	"strings"
-
-	p "github.com/dancannon/gorethink/ql2"
-)
-
-// A Query represents a query ready to be sent to the database, A Query differs
-// from a Term as it contains both a query type and token. These values are used
-// by the database to determine if the query is continuing a previous request
-// and also allows the driver to identify the response as they can come out of
-// order.
-type Query struct {
-	Type  p.Query_QueryType
-	Token int64
-	Term  *Term
-	Opts  map[string]interface{}
-}
-
-func (q *Query) build() []interface{} {
-	res := []interface{}{int(q.Type)}
-	if q.Term != nil {
-		res = append(res, q.Term.build())
-	}
-
-	if len(q.Opts) > 0 {
-		res = append(res, q.Opts)
-	}
-
-	return res
-}
-
-type termsList []Term
-type termsObj map[string]Term
-
-// A Term represents a query that is being built. Terms consist of a an array of
-// "sub-terms" and a term type. When a Term is a sub-term the first element of
-// the terms data is its parent Term.
-//
-// When built the term becomes a JSON array, for more information on the format
-// see http://rethinkdb.com/docs/writing-drivers/.
-type Term struct {
-	name     string
-	rootTerm bool
-	termType p.Term_TermType
-	data     interface{}
-	args     []Term
-	optArgs  map[string]Term
-}
-
-// build takes the query tree and prepares it to be sent as a JSON
-// expression
-func (t Term) build() interface{} {
-	switch t.termType {
-	case p.Term_DATUM:
-		return t.data
-	case p.Term_MAKE_OBJ:
-		res := map[string]interface{}{}
-		for k, v := range t.optArgs {
-			res[k] = v.build()
-		}
-		return res
-	case p.Term_BINARY:
-		if len(t.args) == 0 {
-			return map[string]interface{}{
-				"$reql_type$": "BINARY",
-				"data":        t.data,
-			}
-		}
-	}
-
-	args := []interface{}{}
-	optArgs := map[string]interface{}{}
-
-	for _, v := range t.args {
-		args = append(args, v.build())
-	}
-
-	for k, v := range t.optArgs {
-		optArgs[k] = v.build()
-	}
-
-	ret := []interface{}{int(t.termType)}
-
-	if len(args) > 0 {
-		ret = append(ret, args)
-	}
-	if len(optArgs) > 0 {
-		ret = append(ret, optArgs)
-	}
-
-	return ret
-}
-
-// String returns a string representation of the query tree
-func (t Term) String() string {
-	switch t.termType {
-	case p.Term_MAKE_ARRAY:
-		return fmt.Sprintf("[%s]", strings.Join(argsToStringSlice(t.args), ", "))
-	case p.Term_MAKE_OBJ:
-		return fmt.Sprintf("{%s}", strings.Join(optArgsToStringSlice(t.optArgs), ", "))
-	case p.Term_FUNC:
-		// Get string representation of each argument
-		args := []string{}
-		for _, v := range t.args[0].args {
-			args = append(args, fmt.Sprintf("var_%d", v.data))
-		}
-
-		return fmt.Sprintf("func(%s r.Term) r.Term { return %s }",
-			strings.Join(args, ", "),
-			t.args[1].String(),
-		)
-	case p.Term_VAR:
-		return fmt.Sprintf("var_%s", t.args[0])
-	case p.Term_IMPLICIT_VAR:
-		return "r.Row"
-	case p.Term_DATUM:
-		switch v := t.data.(type) {
-		case string:
-			return strconv.Quote(v)
-		default:
-			return fmt.Sprintf("%v", v)
-		}
-	case p.Term_BINARY:
-		if len(t.args) == 0 {
-			return fmt.Sprintf("r.binary(<data>)")
-		}
-	}
-
-	if t.rootTerm {
-		return fmt.Sprintf("r.%s(%s)", t.name, strings.Join(allArgsToStringSlice(t.args, t.optArgs), ", "))
-	}
-	return fmt.Sprintf("%s.%s(%s)", t.args[0].String(), t.name, strings.Join(allArgsToStringSlice(t.args[1:], t.optArgs), ", "))
-}
-
-// OptArgs is an interface used to represent a terms optional arguments. All
-// optional argument types have a toMap function, the returned map can be encoded
-// and sent as part of the query.
-type OptArgs interface {
-	toMap() map[string]interface{}
-}
-
-// WriteResponse is a helper type used when dealing with the response of a
-// write query. It is also returned by the RunWrite function.
-type WriteResponse struct {
-	Errors        int              `gorethink:"errors"`
-	Inserted      int              `gorethink:"inserted"`
-	Updated       int              `gorethink:"updated"`
-	Unchanged     int              `gorethink:"unchanged"`
-	Replaced      int              `gorethink:"replaced"`
-	Renamed       int              `gorethink:"renamed"`
-	Skipped       int              `gorethink:"skipped"`
-	Deleted       int              `gorethink:"deleted"`
-	Created       int              `gorethink:"created"`
-	DBsCreated    int              `gorethink:"dbs_created"`
-	TablesCreated int              `gorethink:"tables_created"`
-	Dropped       int              `gorethink:"dropped"`
-	DBsDropped    int              `gorethink:"dbs_dropped"`
-	TablesDropped int              `gorethink:"tables_dropped"`
-	GeneratedKeys []string         `gorethink:"generated_keys"`
-	FirstError    string           `gorethink:"first_error"` // populated if Errors > 0
-	ConfigChanges []ChangeResponse `gorethink:"config_changes"`
-	Changes       []ChangeResponse
-}
-
-// ChangeResponse is a helper type used when dealing with changefeeds. The type
-// contains both the value before the query and the new value.
-type ChangeResponse struct {
-	NewValue interface{} `gorethink:"new_val"`
-	OldValue interface{} `gorethink:"old_val"`
-}
-
-// RunOpts contains the optional arguments for the Run function.
-type RunOpts struct {
-	Db             interface{} `gorethink:"db,omitempty"`
-	Profile        interface{} `gorethink:"profile,omitempty"`
-	UseOutdated    interface{} `gorethink:"use_outdated,omitempty"`
-	ArrayLimit     interface{} `gorethink:"array_limit,omitempty"`
-	TimeFormat     interface{} `gorethink:"time_format,omitempty"`
-	GroupFormat    interface{} `gorethink:"group_format,omitempty"`
-	BinaryFormat   interface{} `gorethink:"binary_format,omitempty"`
-	GeometryFormat interface{} `gorethink:"geometry_format,omitempty"`
-
-	MinBatchRows              interface{} `gorethink:"min_batch_rows,omitempty"`
-	MaxBatchRows              interface{} `gorethink:"max_batch_rows,omitempty"`
-	MaxBatchBytes             interface{} `gorethink:"max_batch_bytes,omitempty"`
-	MaxBatchSeconds           interface{} `gorethink:"max_batch_seconds,omitempty"`
-	FirstBatchScaledownFactor interface{} `gorethink:"first_batch_scaledown_factor,omitempty"`
-}
-
-func (o *RunOpts) toMap() map[string]interface{} {
-	return optArgsToMap(o)
-}
-
-// Run runs a query using the given connection.
-//
-//	rows, err := query.Run(sess)
-//	if err != nil {
-//		// error
-//	}
-//
-//  var doc MyDocumentType
-//	for rows.Next(&doc) {
-//      // Do something with document
-//	}
-func (t Term) Run(s *Session, optArgs ...RunOpts) (*Cursor, error) {
-	opts := map[string]interface{}{}
-	if len(optArgs) >= 1 {
-		opts = optArgs[0].toMap()
-	}
-
-	return s.Query(s.newQuery(t, opts))
-}
-
-// RunWrite runs a query using the given connection but unlike Run automatically
-// scans the result into a variable of type WriteResponss. This function should be used
-// if you are running a write query (such as Insert,  Update, TableCreate, etc...).
-//
-// If an error occurs when running the write query the first error is returned.
-//
-//	res, err := r.Db("database").Table("table").Insert(doc).RunWrite(sess)
-func (t Term) RunWrite(s *Session, optArgs ...RunOpts) (WriteResponse, error) {
-	var response WriteResponse
-
-	res, err := t.Run(s, optArgs...)
-	if err != nil {
-		return response, err
-	}
-
-	if err = res.One(&response); err != nil {
-		return response, err
-	}
-
-	if err = res.Close(); err != nil {
-		return response, err
-	}
-
-	if response.Errors > 0 {
-		return response, fmt.Errorf(response.FirstError)
-	}
-
-	return response, nil
-}
-
-// ExecOpts contains the optional arguments for the Exec function and  inherits
-// its options from RunOpts, the only difference is the addition of the NoReply
-// field.
-//
-// When NoReply is true it causes the driver not to wait to receive the result
-// and return immediately.
-type ExecOpts struct {
-	Db             interface{} `gorethink:"db,omitempty"`
-	Profile        interface{} `gorethink:"profile,omitempty"`
-	UseOutdated    interface{} `gorethink:"use_outdated,omitempty"`
-	ArrayLimit     interface{} `gorethink:"array_limit,omitempty"`
-	TimeFormat     interface{} `gorethink:"time_format,omitempty"`
-	GroupFormat    interface{} `gorethink:"group_format,omitempty"`
-	BinaryFormat   interface{} `gorethink:"binary_format,omitempty"`
-	GeometryFormat interface{} `gorethink:"geometry_format,omitempty"`
-
-	MinBatchRows              interface{} `gorethink:"min_batch_rows,omitempty"`
-	MaxBatchRows              interface{} `gorethink:"max_batch_rows,omitempty"`
-	MaxBatchBytes             interface{} `gorethink:"max_batch_bytes,omitempty"`
-	MaxBatchSeconds           interface{} `gorethink:"max_batch_seconds,omitempty"`
-	FirstBatchScaledownFactor interface{} `gorethink:"first_batch_scaledown_factor,omitempty"`
-
-	NoReply interface{} `gorethink:"noreply,omitempty"`
-}
-
-func (o *ExecOpts) toMap() map[string]interface{} {
-	return optArgsToMap(o)
-}
-
-// Exec runs the query but does not return the result. Exec will still wait for
-// the response to be received unless the NoReply field is true.
-//
-//	err := r.Db("database").Table("table").Insert(doc).Exec(sess, r.ExecOpts{
-//		NoReply: true,
-//	})
-func (t Term) Exec(s *Session, optArgs ...ExecOpts) error {
-	opts := map[string]interface{}{}
-	if len(optArgs) >= 1 {
-		opts = optArgs[0].toMap()
-	}
-
-	return s.Exec(s.newQuery(t, opts))
-}
diff --git a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/query_admin.go b/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/query_admin.go
deleted file mode 100644
index d26d775ec..000000000
--- a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/query_admin.go
+++ /dev/null
@@ -1,71 +0,0 @@
-package gorethink
-
-import (
-	p "github.com/dancannon/gorethink/ql2"
-)
-
-// Config can be used to read and/or update the configurations for individual
-// tables or databases.
-func (t Term) Config() Term {
-	return constructMethodTerm(t, "Config", p.Term_CONFIG, []interface{}{}, map[string]interface{}{})
-}
-
-// Rebalance rebalances the shards of a table. When called on a database, all
-// the tables in that database will be rebalanced.
-func (t Term) Rebalance() Term {
-	return constructMethodTerm(t, "Rebalance", p.Term_REBALANCE, []interface{}{}, map[string]interface{}{})
-}
-
-// ReconfigureOpts contains the optional arguments for the Reconfigure term.
-type ReconfigureOpts struct {
-	Shards     interface{} `gorethink:"shards,omitempty"`
-	Replicas   interface{} `gorethink:"replicas,omitempty"`
-	PrimaryTag interface{} `gorethink:"primary_replicas_tag,omitempty"`
-	DryRun     interface{} `gorethink:"dry_run,omitempty"`
-}
-
-func (o *ReconfigureOpts) toMap() map[string]interface{} {
-	return optArgsToMap(o)
-}
-
-// Reconfigure a table's sharding and replication.
-func (t Term) Reconfigure(opts ReconfigureOpts) Term {
-	return constructMethodTerm(t, "Reconfigure", p.Term_RECONFIGURE, []interface{}{}, opts.toMap())
-}
-
-// Status return the status of a table
-func (t Term) Status() Term {
-	return constructMethodTerm(t, "Status", p.Term_STATUS, []interface{}{}, map[string]interface{}{})
-}
-
-// WaitOpts contains the optional arguments for the Wait term.
-type WaitOpts struct {
-	WaitFor interface{} `gorethink:"wait_for,omitempty"`
-	Timeout interface{} `gorethink:"timeout,omitempty"`
-}
-
-func (o *WaitOpts) toMap() map[string]interface{} {
-	return optArgsToMap(o)
-}
-
-// Wait for a table or all the tables in a database to be ready. A table may be
-// temporarily unavailable after creation, rebalancing or reconfiguring. The
-// wait command blocks until the given table (or database) is fully up to date.
-func Wait(optArgs ...WaitOpts) Term {
-	opts := map[string]interface{}{}
-	if len(optArgs) >= 1 {
-		opts = optArgs[0].toMap()
-	}
-	return constructRootTerm("Wait", p.Term_WAIT, []interface{}{}, opts)
-}
-
-// Wait for a table or all the tables in a database to be ready. A table may be
-// temporarily unavailable after creation, rebalancing or reconfiguring. The
-// wait command blocks until the given table (or database) is fully up to date.
-func (t Term) Wait(optArgs ...WaitOpts) Term {
-	opts := map[string]interface{}{}
-	if len(optArgs) >= 1 {
-		opts = optArgs[0].toMap()
-	}
-	return constructMethodTerm(t, "Wait", p.Term_WAIT, []interface{}{}, opts)
-}
diff --git a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/query_admin_test.go b/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/query_admin_test.go
deleted file mode 100644
index 9c99d1390..000000000
--- a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/query_admin_test.go
+++ /dev/null
@@ -1,110 +0,0 @@
-package gorethink
-
-import (
-	test "gopkg.in/check.v1"
-)
-
-func (s *RethinkSuite) TestAdminDbConfig(c *test.C) {
-	DB("test").TableDrop("test").Exec(session)
-	DB("test").TableCreate("test").Exec(session)
-
-	// Test index rename
-	query := DB("test").Table("test").Config()
-
-	res, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	var response map[string]interface{}
-	err = res.One(&response)
-	c.Assert(err, test.IsNil)
-
-	c.Assert(response["name"], test.Equals, "test")
-}
-
-func (s *RethinkSuite) TestAdminTableConfig(c *test.C) {
-	DB("test").TableDrop("test").Exec(session)
-	DB("test").TableCreate("test").Exec(session)
-
-	// Test index rename
-	query := DB("test").Config()
-
-	res, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	var response map[string]interface{}
-	err = res.One(&response)
-	c.Assert(err, test.IsNil)
-
-	c.Assert(response["name"], test.Equals, "test")
-}
-
-func (s *RethinkSuite) TestAdminTableStatus(c *test.C) {
-	DB("test").TableDrop("test").Exec(session)
-	DB("test").TableCreate("test").Exec(session)
-
-	// Test index rename
-	query := DB("test").Table("test").Status()
-
-	res, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	var response map[string]interface{}
-	err = res.One(&response)
-	c.Assert(err, test.IsNil)
-
-	c.Assert(response["name"], test.Equals, "test")
-	c.Assert(response["status"], test.NotNil)
-}
-
-func (s *RethinkSuite) TestAdminWait(c *test.C) {
-	DB("test").TableDrop("test").Exec(session)
-	DB("test").TableCreate("test").Exec(session)
-
-	// Test index rename
-	query := Wait()
-
-	res, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	var response map[string]interface{}
-	err = res.One(&response)
-	c.Assert(err, test.IsNil)
-
-	c.Assert(response["ready"].(float64) > 0, test.Equals, true)
-}
-
-func (s *RethinkSuite) TestAdminWaitOpts(c *test.C) {
-	DB("test").TableDrop("test").Exec(session)
-	DB("test").TableCreate("test").Exec(session)
-
-	query := DB("test").Table("test").Wait(WaitOpts{
-		WaitFor: "all_replicas_ready",
-		Timeout: 10,
-	})
-
-	res, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	var response map[string]interface{}
-	err = res.One(&response)
-	c.Assert(err, test.IsNil)
-
-	c.Assert(response["ready"].(float64) > 0, test.Equals, true)
-}
-
-func (s *RethinkSuite) TestAdminStatus(c *test.C) {
-	DB("test").TableDrop("test").Exec(session)
-	DB("test").TableCreate("test").Exec(session)
-
-	// Test index rename
-	query := DB("test").Table("test").Wait()
-
-	res, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	var response map[string]interface{}
-	err = res.One(&response)
-	c.Assert(err, test.IsNil)
-
-	c.Assert(response["ready"], test.Equals, float64(1))
-}
diff --git a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/query_aggregation.go b/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/query_aggregation.go
deleted file mode 100644
index 1dca1a54a..000000000
--- a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/query_aggregation.go
+++ /dev/null
@@ -1,169 +0,0 @@
-package gorethink
-
-import (
-	p "github.com/dancannon/gorethink/ql2"
-)
-
-// Aggregation
-// These commands are used to compute smaller values from large sequences.
-
-// Reduce produces a single value from a sequence through repeated application
-// of a reduction function
-//
-// It takes one argument of type `func (r.Term, r.Term) interface{}`, for
-// example this query sums all elements in an array:
-//
-//     r.Expr([]int{1,3,6}).Reduce(func (left, right r.Term) interface{} {
-//         return left.Add(right)
-//     })
-func (t Term) Reduce(args ...interface{}) Term {
-	return constructMethodTerm(t, "Reduce", p.Term_REDUCE, funcWrapArgs(args), map[string]interface{}{})
-}
-
-// DistinctOpts contains the optional arguments for the Distinct term
-type DistinctOpts struct {
-	Index interface{} `gorethink:"index,omitempty"`
-}
-
-func (o *DistinctOpts) toMap() map[string]interface{} {
-	return optArgsToMap(o)
-}
-
-// Distinct removes duplicate elements from the sequence.
-func (t Term) Distinct(optArgs ...DistinctOpts) Term {
-	opts := map[string]interface{}{}
-	if len(optArgs) >= 1 {
-		opts = optArgs[0].toMap()
-	}
-	return constructMethodTerm(t, "Distinct", p.Term_DISTINCT, []interface{}{}, opts)
-}
-
-// Group takes a stream and partitions it into multiple groups based on the
-// fields or functions provided. Commands chained after group will be
-// called on each of these grouped sub-streams, producing grouped data.
-func (t Term) Group(fieldOrFunctions ...interface{}) Term {
-	return constructMethodTerm(t, "Group", p.Term_GROUP, funcWrapArgs(fieldOrFunctions), map[string]interface{}{})
-}
-
-// MultiGroup takes a stream and partitions it into multiple groups based on the
-// fields or functions provided. Commands chained after group will be
-// called on each of these grouped sub-streams, producing grouped data.
-//
-// Unlike Group single documents can be assigned to multiple groups, similar
-// to the behavior of multi-indexes. When the grouping value is an array, documents
-// will be placed in each group that corresponds to the elements of the array. If
-// the array is empty the row will be ignored.
-func (t Term) MultiGroup(fieldOrFunctions ...interface{}) Term {
-	return constructMethodTerm(t, "Group", p.Term_GROUP, funcWrapArgs(fieldOrFunctions), map[string]interface{}{
-		"multi": true,
-	})
-}
-
-// GroupByIndex takes a stream and partitions it into multiple groups based on the
-// fields or functions provided. Commands chained after group will be
-// called on each of these grouped sub-streams, producing grouped data.
-func (t Term) GroupByIndex(index interface{}, fieldOrFunctions ...interface{}) Term {
-	return constructMethodTerm(t, "Group", p.Term_GROUP, funcWrapArgs(fieldOrFunctions), map[string]interface{}{
-		"index": index,
-	})
-}
-
-// MultiGroupByIndex takes a stream and partitions it into multiple groups based on the
-// fields or functions provided. Commands chained after group will be
-// called on each of these grouped sub-streams, producing grouped data.
-//
-// Unlike Group single documents can be assigned to multiple groups, similar
-// to the behavior of multi-indexes. When the grouping value is an array, documents
-// will be placed in each group that corresponds to the elements of the array. If
-// the array is empty the row will be ignored.
-func (t Term) MultiGroupByIndex(index interface{}, fieldOrFunctions ...interface{}) Term {
-	return constructMethodTerm(t, "Group", p.Term_GROUP, funcWrapArgs(fieldOrFunctions), map[string]interface{}{
-		"index": index,
-		"mutli": true,
-	})
-}
-
-// Ungroup takes a grouped stream or grouped data and turns it into an array of
-// objects representing the groups. Any commands chained after Ungroup will
-// operate on this array, rather than operating on each group individually.
-// This is useful if you want to e.g. order the groups by the value of their
-// reduction.
-func (t Term) Ungroup(args ...interface{}) Term {
-	return constructMethodTerm(t, "Ungroup", p.Term_UNGROUP, args, map[string]interface{}{})
-}
-
-// Contains returns whether or not a sequence contains all the specified values,
-// or if functions are provided instead, returns whether or not a sequence
-// contains values matching all the specified functions.
-func (t Term) Contains(args ...interface{}) Term {
-	return constructMethodTerm(t, "Contains", p.Term_CONTAINS, args, map[string]interface{}{})
-}
-
-// Aggregators
-// These standard aggregator objects are to be used in conjunction with Group.
-
-// Count the number of elements in the sequence. With a single argument,
-// count the number of elements equal to it. If the argument is a function,
-// it is equivalent to calling filter before count.
-func (t Term) Count(args ...interface{}) Term {
-	return constructMethodTerm(t, "Count", p.Term_COUNT, funcWrapArgs(args), map[string]interface{}{})
-}
-
-// Sum returns the sum of all the elements of a sequence. If called with a field
-// name, sums all the values of that field in the sequence, skipping elements of
-// the sequence that lack that field. If called with a function, calls that
-// function on every element of the sequence and sums the results, skipping
-// elements of the sequence where that function returns null or a non-existence
-// error.
-func (t Term) Sum(args ...interface{}) Term {
-	return constructMethodTerm(t, "Sum", p.Term_SUM, funcWrapArgs(args), map[string]interface{}{})
-}
-
-// Avg returns the average of all the elements of a sequence. If called with a field
-// name, averages all the values of that field in the sequence, skipping elements of
-// the sequence that lack that field. If called with a function, calls that function
-// on every element of the sequence and averages the results, skipping elements of the
-// sequence where that function returns null or a non-existence error.
-func (t Term) Avg(args ...interface{}) Term {
-	return constructMethodTerm(t, "Avg", p.Term_AVG, funcWrapArgs(args), map[string]interface{}{})
-}
-
-// Min finds the minimum of a sequence. If called with a field name, finds the element
-// of that sequence with the smallest value in that field. If called with a function,
-// calls that function on every element of the sequence and returns the element
-// which produced the smallest value, ignoring any elements where the function
-// returns null or produces a non-existence error.
-func (t Term) Min(args ...interface{}) Term {
-	return constructMethodTerm(t, "Min", p.Term_MIN, funcWrapArgs(args), map[string]interface{}{})
-}
-
-// MinIndex finds the minimum of a sequence. If called with a field name, finds the element
-// of that sequence with the smallest value in that field. If called with a function,
-// calls that function on every element of the sequence and returns the element
-// which produced the smallest value, ignoring any elements where the function
-// returns null or produces a non-existence error.
-func (t Term) MinIndex(index interface{}, args ...interface{}) Term {
-	return constructMethodTerm(t, "Min", p.Term_MIN, funcWrapArgs(args), map[string]interface{}{
-		"index": index,
-	})
-}
-
-// Max finds the maximum of a sequence. If called with a field name, finds the element
-// of that sequence with the largest value in that field. If called with a function,
-// calls that function on every element of the sequence and returns the element
-// which produced the largest value, ignoring any elements where the function
-// returns null or produces a non-existence error.
-func (t Term) Max(args ...interface{}) Term {
-	return constructMethodTerm(t, "Max", p.Term_MAX, funcWrapArgs(args), map[string]interface{}{})
-}
-
-// MaxIndex finds the maximum of a sequence. If called with a field name, finds the element
-// of that sequence with the largest value in that field. If called with a function,
-// calls that function on every element of the sequence and returns the element
-// which produced the largest value, ignoring any elements where the function
-// returns null or produces a non-existence error.
-func (t Term) MaxIndex(index interface{}, args ...interface{}) Term {
-	return constructMethodTerm(t, "Max", p.Term_MAX, funcWrapArgs(args), map[string]interface{}{
-		"index": index,
-	})
-}
diff --git a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/query_aggregation_test.go b/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/query_aggregation_test.go
deleted file mode 100644
index bf2760d7c..000000000
--- a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/query_aggregation_test.go
+++ /dev/null
@@ -1,320 +0,0 @@
-package gorethink
-
-import (
-	test "gopkg.in/check.v1"
-)
-
-func (s *RethinkSuite) TestAggregationReduce(c *test.C) {
-	var response int
-	query := Expr(arr).Reduce(func(acc, val Term) Term {
-		return acc.Add(val)
-	})
-	res, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.One(&response)
-	c.Assert(err, test.IsNil)
-	c.Assert(response, test.Equals, 45)
-}
-
-func (s *RethinkSuite) TestAggregationExprCount(c *test.C) {
-	var response int
-	query := Expr(arr).Count()
-	res, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.One(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response, test.Equals, 9)
-}
-
-func (s *RethinkSuite) TestAggregationDistinct(c *test.C) {
-	var response []int
-	query := Expr(darr).Distinct()
-	res, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.All(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response, test.HasLen, 5)
-}
-
-func (s *RethinkSuite) TestAggregationGroupMapReduce(c *test.C) {
-	var response []interface{}
-	query := Expr(objList).Group(func(row Term) Term {
-		return row.Field("id").Mod(2).Eq(0)
-	}).Map(func(row Term) Term {
-		return row.Field("num")
-	}).Reduce(func(acc, num Term) Term {
-		return acc.Add(num)
-	})
-	res, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.All(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response, jsonEquals, []interface{}{
-		map[string]interface{}{"reduction": 135, "group": false},
-		map[string]interface{}{"reduction": 70, "group": true},
-	})
-}
-
-func (s *RethinkSuite) TestAggregationGroupMapReduceUngroup(c *test.C) {
-	var response []interface{}
-	query := Expr(objList).Group(func(row Term) Term {
-		return row.Field("id").Mod(2).Eq(0)
-	}).Map(func(row Term) Term {
-		return row.Field("num")
-	}).Reduce(func(acc, num Term) Term {
-		return acc.Add(num)
-	}).Ungroup().OrderBy("reduction")
-	res, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.All(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response, jsonEquals, []interface{}{
-		map[string]interface{}{"reduction": 70, "group": true},
-		map[string]interface{}{"reduction": 135, "group": false},
-	})
-}
-
-func (s *RethinkSuite) TestAggregationGroupMapReduceTable(c *test.C) {
-	// Ensure table + database exist
-	DBCreate("test").Exec(session)
-	DB("test").TableCreate("TestAggregationGroupedMapReduceTable").Exec(session)
-
-	// Insert rows
-	err := DB("test").Table("TestAggregationGroupedMapReduceTable").Insert(objList).Exec(session)
-	c.Assert(err, test.IsNil)
-
-	var response []interface{}
-	query := DB("test").Table("TestAggregationGroupedMapReduceTable").Group(func(row Term) Term {
-		return row.Field("id").Mod(2).Eq(0)
-	}).Map(func(row Term) Term {
-		return row.Field("num")
-	}).Reduce(func(acc, num Term) Term {
-		return acc.Add(num)
-	})
-	res, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.All(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response, jsonEquals, []interface{}{
-		map[string]interface{}{"reduction": 135, "group": false},
-		map[string]interface{}{"reduction": 70, "group": true},
-	})
-}
-
-func (s *RethinkSuite) TestAggregationGroupCount(c *test.C) {
-	var response []interface{}
-	query := Expr(objList).Group("g1")
-	res, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.All(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response, jsonEquals, []interface{}{
-		map[string]interface{}{"group": 1, "reduction": []interface{}{
-			map[string]interface{}{"id": 1, "num": 0, "g1": 1, "g2": 1},
-			map[string]interface{}{"num": 15, "g1": 1, "g2": 1, "id": 6},
-			map[string]interface{}{"id": 7, "num": 0, "g1": 1, "g2": 2},
-		}},
-		map[string]interface{}{"group": 2, "reduction": []interface{}{
-			map[string]interface{}{"g1": 2, "g2": 2, "id": 2, "num": 5},
-			map[string]interface{}{"num": 0, "g1": 2, "g2": 3, "id": 4},
-			map[string]interface{}{"num": 100, "g1": 2, "g2": 3, "id": 5},
-			map[string]interface{}{"g2": 3, "id": 9, "num": 25, "g1": 2},
-		}},
-		map[string]interface{}{"group": 3, "reduction": []interface{}{
-			map[string]interface{}{"num": 10, "g1": 3, "g2": 2, "id": 3},
-		}},
-		map[string]interface{}{"group": 4, "reduction": []interface{}{
-			map[string]interface{}{"id": 8, "num": 50, "g1": 4, "g2": 2},
-		}},
-	})
-}
-
-func (s *RethinkSuite) TestAggregationGroupSum(c *test.C) {
-	var response []interface{}
-	query := Expr(objList).Group("g1").Sum("num")
-	res, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.All(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response, jsonEquals, []interface{}{
-		map[string]interface{}{"group": 1, "reduction": 15},
-		map[string]interface{}{"reduction": 130, "group": 2},
-		map[string]interface{}{"reduction": 10, "group": 3},
-		map[string]interface{}{"group": 4, "reduction": 50},
-	})
-}
-
-func (s *RethinkSuite) TestAggregationGroupAvg(c *test.C) {
-	var response []interface{}
-	query := Expr(objList).Group("g1").Avg("num")
-	res, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.All(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response, jsonEquals, []interface{}{
-		map[string]interface{}{"group": 1, "reduction": 5},
-		map[string]interface{}{"group": 2, "reduction": 32.5},
-		map[string]interface{}{"group": 3, "reduction": 10},
-		map[string]interface{}{"group": 4, "reduction": 50},
-	})
-}
-
-func (s *RethinkSuite) TestAggregationGroupMin(c *test.C) {
-	var response []interface{}
-	query := Expr(objList).Group("g1").Min("num")
-	res, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.All(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response, jsonEquals, []interface{}{
-		map[string]interface{}{"group": 1, "reduction": map[string]interface{}{"id": 1, "num": 0, "g1": 1, "g2": 1}},
-		map[string]interface{}{"reduction": map[string]interface{}{"num": 0, "g1": 2, "g2": 3, "id": 4}, "group": 2},
-		map[string]interface{}{"group": 3, "reduction": map[string]interface{}{"num": 10, "g1": 3, "g2": 2, "id": 3}},
-		map[string]interface{}{"group": 4, "reduction": map[string]interface{}{"g2": 2, "id": 8, "num": 50, "g1": 4}},
-	})
-}
-
-func (s *RethinkSuite) TestAggregationGroupMax(c *test.C) {
-	var response []interface{}
-	query := Expr(objList).Group("g1").Max("num")
-	res, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.All(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response, jsonEquals, []interface{}{
-		map[string]interface{}{"reduction": map[string]interface{}{"num": 15, "g1": 1, "g2": 1, "id": 6}, "group": 1},
-		map[string]interface{}{"group": 2, "reduction": map[string]interface{}{"num": 100, "g1": 2, "g2": 3, "id": 5}},
-		map[string]interface{}{"group": 3, "reduction": map[string]interface{}{"num": 10, "g1": 3, "g2": 2, "id": 3}},
-		map[string]interface{}{"group": 4, "reduction": map[string]interface{}{"g2": 2, "id": 8, "num": 50, "g1": 4}},
-	})
-}
-
-func (s *RethinkSuite) TestAggregationMin(c *test.C) {
-	// Ensure table + database exist
-	DBCreate("test").Exec(session)
-	DB("test").TableCreate("Table2").Exec(session)
-	DB("test").Table("Table2").IndexCreate("num").Exec(session)
-
-	// Insert rows
-	DB("test").Table("Table2").Insert(objList).Exec(session)
-
-	// Test query
-	var response interface{}
-	query := DB("test").Table("Table2").MinIndex("num")
-	res, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.One(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response, jsonEquals, map[string]interface{}{"id": 1, "g1": 1, "g2": 1, "num": 0})
-}
-
-func (s *RethinkSuite) TestAggregationMaxIndex(c *test.C) {
-	// Ensure table + database exist
-	DBCreate("test").Exec(session)
-	DB("test").TableCreate("Table2").Exec(session)
-	DB("test").Table("Table2").IndexCreate("num").Exec(session)
-
-	// Insert rows
-	DB("test").Table("Table2").Insert(objList).Exec(session)
-
-	// Test query
-	var response interface{}
-	query := DB("test").Table("Table2").MaxIndex("num")
-	res, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.One(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response, jsonEquals, map[string]interface{}{"id": 5, "g1": 2, "g2": 3, "num": 100})
-}
-
-func (s *RethinkSuite) TestAggregationMultipleGroupSum(c *test.C) {
-	var response []interface{}
-	query := Expr(objList).Group("g1", "g2").Sum("num")
-	res, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.All(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response, jsonEquals, []interface{}{
-		map[string]interface{}{"group": []interface{}{1, 1}, "reduction": 15},
-		map[string]interface{}{"reduction": 0, "group": []interface{}{1, 2}},
-		map[string]interface{}{"group": []interface{}{2, 2}, "reduction": 5},
-		map[string]interface{}{"reduction": 125, "group": []interface{}{2, 3}},
-		map[string]interface{}{"group": []interface{}{3, 2}, "reduction": 10},
-		map[string]interface{}{"group": []interface{}{4, 2}, "reduction": 50},
-	})
-}
-
-func (s *RethinkSuite) TestAggregationGroupChained(c *test.C) {
-	var response []interface{}
-	query := Expr(objList).Group("g1").Max("num").Field("g2")
-	res, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.All(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response, jsonEquals, []interface{}{
-		map[string]interface{}{"group": 1, "reduction": 1},
-		map[string]interface{}{"group": 2, "reduction": 3},
-		map[string]interface{}{"group": 3, "reduction": 2},
-		map[string]interface{}{"group": 4, "reduction": 2},
-	})
-}
-
-func (s *RethinkSuite) TestAggregationGroupUngroup(c *test.C) {
-	var response []interface{}
-	query := Expr(objList).Group("g1", "g2").Max("num").Ungroup()
-	res, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.All(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response, jsonEquals, []interface{}{
-		map[string]interface{}{"group": []interface{}{1, 1}, "reduction": map[string]interface{}{"g1": 1, "g2": 1, "id": 6, "num": 15}},
-		map[string]interface{}{"group": []interface{}{1, 2}, "reduction": map[string]interface{}{"g1": 1, "g2": 2, "id": 7, "num": 0}},
-		map[string]interface{}{"group": []interface{}{2, 2}, "reduction": map[string]interface{}{"g1": 2, "g2": 2, "id": 2, "num": 5}},
-		map[string]interface{}{"group": []interface{}{2, 3}, "reduction": map[string]interface{}{"g1": 2, "g2": 3, "id": 5, "num": 100}},
-		map[string]interface{}{"group": []interface{}{3, 2}, "reduction": map[string]interface{}{"g2": 2, "id": 3, "num": 10, "g1": 3}},
-		map[string]interface{}{"reduction": map[string]interface{}{"num": 50, "g1": 4, "g2": 2, "id": 8}, "group": []interface{}{4, 2}},
-	})
-}
-
-func (s *RethinkSuite) TestAggregationContains(c *test.C) {
-	var response interface{}
-	query := Expr(arr).Contains(2)
-	res, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.One(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response, test.Equals, true)
-}
diff --git a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/query_control.go b/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/query_control.go
deleted file mode 100644
index 77d867372..000000000
--- a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/query_control.go
+++ /dev/null
@@ -1,299 +0,0 @@
-package gorethink
-
-import (
-	"encoding/base64"
-
-	"reflect"
-
-	p "github.com/dancannon/gorethink/ql2"
-)
-
-// Expr converts any value to an expression and is also used by many other terms
-// such as Insert and Update. This function can convert the following basic Go
-// types (bool, int, uint, string, float) and even pointers, maps and structs.
-//
-// When evaluating structs they are encoded into a map before being sent to the
-// server. Each exported field is added to the map unless
-//
-//  - the field's tag is "-", or
-//  - the field is empty and its tag specifies the "omitempty" option.
-//
-// Each fields default name in the map is the field name but can be specified
-// in the struct field's tag value. The "gorethink" key in the struct field's
-// tag value is the key name, followed by an optional comma and options. Examples:
-//
-//   // Field is ignored by this package.
-//   Field int `gorethink:"-"`
-//   // Field appears as key "myName".
-//   Field int `gorethink:"myName"`
-//   // Field appears as key "myName" and
-//   // the field is omitted from the object if its value is empty,
-//   // as defined above.
-//   Field int `gorethink:"myName,omitempty"`
-//   // Field appears as key "Field" (the default), but
-//   // the field is skipped if empty.
-//   // Note the leading comma.
-//   Field int `gorethink:",omitempty"`
-func Expr(val interface{}) Term {
-	if val == nil {
-		return Term{
-			termType: p.Term_DATUM,
-			data:     nil,
-		}
-	}
-
-	switch val := val.(type) {
-	case Term:
-		return val
-	case []interface{}:
-		vals := make([]Term, len(val))
-		for i, v := range val {
-			vals[i] = Expr(v)
-		}
-
-		return makeArray(vals)
-	case map[string]interface{}:
-		vals := make(map[string]Term, len(val))
-		for k, v := range val {
-			vals[k] = Expr(v)
-		}
-
-		return makeObject(vals)
-	default:
-		// Use reflection to check for other types
-		valType := reflect.TypeOf(val)
-		valValue := reflect.ValueOf(val)
-
-		switch valType.Kind() {
-		case reflect.Func:
-			return makeFunc(val)
-		case reflect.Struct, reflect.Ptr:
-			data, err := encode(val)
-
-			if err != nil || data == nil {
-				return Term{
-					termType: p.Term_DATUM,
-					data:     nil,
-				}
-			}
-
-			return Expr(data)
-
-		case reflect.Slice, reflect.Array:
-			// Check if slice is a byte slice
-			if valType.Elem().Kind() == reflect.Uint8 {
-				data, err := encode(val)
-
-				if err != nil || data == nil {
-					return Term{
-						termType: p.Term_DATUM,
-						data:     nil,
-					}
-				}
-
-				return Expr(data)
-			}
-
-			vals := make([]Term, valValue.Len())
-			for i := 0; i < valValue.Len(); i++ {
-				vals[i] = Expr(valValue.Index(i).Interface())
-			}
-
-			return makeArray(vals)
-		case reflect.Map:
-			vals := make(map[string]Term, len(valValue.MapKeys()))
-			for _, k := range valValue.MapKeys() {
-				vals[k.String()] = Expr(valValue.MapIndex(k).Interface())
-			}
-
-			return makeObject(vals)
-		default:
-			return Term{
-				termType: p.Term_DATUM,
-				data:     val,
-			}
-		}
-	}
-}
-
-// JS creates a JavaScript expression which is evaluated by the database when
-// running the query.
-func JS(jssrc interface{}) Term {
-	return constructRootTerm("Js", p.Term_JAVASCRIPT, []interface{}{jssrc}, map[string]interface{}{})
-}
-
-// HTTPOpts contains the optional arguments for the HTTP term
-type HTTPOpts struct {
-	// General Options
-	Timeout      interface{} `gorethink:"timeout,omitempty"`
-	Reattempts   interface{} `gorethink:"reattempts,omitempty"`
-	Redirects    interface{} `gorethink:"redirect,omitempty"`
-	Verify       interface{} `gorethink:"verify,omitempty"`
-	ResultFormat interface{} `gorethink:"resul_format,omitempty"`
-
-	// Request Options
-	Method interface{} `gorethink:"method,omitempty"`
-	Auth   interface{} `gorethink:"auth,omitempty"`
-	Params interface{} `gorethink:"params,omitempty"`
-	Header interface{} `gorethink:"header,omitempty"`
-	Data   interface{} `gorethink:"data,omitempty"`
-
-	// Pagination
-	Page      interface{} `gorethink:"page,omitempty"`
-	PageLimit interface{} `gorethink:"page_limit,omitempty"`
-}
-
-func (o *HTTPOpts) toMap() map[string]interface{} {
-	return optArgsToMap(o)
-}
-
-// HTTP retrieves data from the specified URL over HTTP. The return type depends
-// on the resultFormat option, which checks the Content-Type of the response by
-// default.
-func HTTP(url interface{}, optArgs ...HTTPOpts) Term {
-	opts := map[string]interface{}{}
-	if len(optArgs) >= 1 {
-		opts = optArgs[0].toMap()
-	}
-	return constructRootTerm("Http", p.Term_HTTP, []interface{}{url}, opts)
-}
-
-// JSON parses a JSON string on the server.
-func JSON(args ...interface{}) Term {
-	return constructRootTerm("Json", p.Term_JSON, args, map[string]interface{}{})
-}
-
-// Error throws a runtime error. If called with no arguments inside the second argument
-// to `default`, re-throw the current error.
-func Error(args ...interface{}) Term {
-	return constructRootTerm("Error", p.Term_ERROR, args, map[string]interface{}{})
-}
-
-// Args is a special term usd to splice an array of arguments into another term.
-// This is useful when you want to call a varadic term such as GetAll with a set
-// of arguments provided at runtime.
-func Args(args ...interface{}) Term {
-	return constructRootTerm("Args", p.Term_ARGS, args, map[string]interface{}{})
-}
-
-// Binary encapsulates binary data within a query.
-//
-// The type of data binary accepts depends on the client language. In Go, it
-// expects either a byte array/slice or a bytes.Buffer.
-//
-// Only a limited subset of ReQL commands may be chained after binary:
-//  - coerceTo can coerce binary objects to string types
-//  - count will return the number of bytes in the object
-//  - slice will treat bytes like array indexes (i.e., slice(10,20) will return bytes 10–19)
-//  - typeOf returns PTYPE<BINARY>
-//  - info will return information on a binary object.
-func Binary(data interface{}) Term {
-	var b []byte
-
-	switch data := data.(type) {
-	case Term:
-		return constructRootTerm("Binary", p.Term_BINARY, []interface{}{data}, map[string]interface{}{})
-	case []byte:
-		b = data
-	default:
-		typ := reflect.TypeOf(data)
-		if (typ.Kind() == reflect.Slice || typ.Kind() == reflect.Array) &&
-			typ.Elem().Kind() == reflect.Uint8 {
-			return Binary(reflect.ValueOf(data).Bytes())
-		}
-		panic("Unsupported binary type")
-	}
-
-	return binaryTerm(base64.StdEncoding.EncodeToString(b))
-}
-
-func binaryTerm(data string) Term {
-	t := constructRootTerm("Binary", p.Term_BINARY, []interface{}{}, map[string]interface{}{})
-	t.data = data
-
-	return t
-}
-
-// Do evaluates the expr in the context of one or more value bindings. The type of
-// the result is the type of the value returned from expr.
-func (t Term) Do(args ...interface{}) Term {
-	newArgs := []interface{}{}
-	newArgs = append(newArgs, funcWrap(args[len(args)-1]))
-	newArgs = append(newArgs, t)
-	newArgs = append(newArgs, args[:len(args)-1]...)
-
-	return constructRootTerm("Do", p.Term_FUNCALL, newArgs, map[string]interface{}{})
-}
-
-// Do evaluates the expr in the context of one or more value bindings. The type of
-// the result is the type of the value returned from expr.
-func Do(args ...interface{}) Term {
-	newArgs := []interface{}{}
-	newArgs = append(newArgs, funcWrap(args[len(args)-1]))
-	newArgs = append(newArgs, args[:len(args)-1]...)
-
-	return constructRootTerm("Do", p.Term_FUNCALL, newArgs, map[string]interface{}{})
-}
-
-// Branch evaluates one of two control paths based on the value of an expression.
-// branch is effectively an if renamed due to language constraints.
-//
-// The type of the result is determined by the type of the branch that gets executed.
-func Branch(args ...interface{}) Term {
-	return constructRootTerm("Branch", p.Term_BRANCH, args, map[string]interface{}{})
-}
-
-// ForEach loops over a sequence, evaluating the given write query for each element.
-//
-// It takes one argument of type `func (r.Term) interface{}`, for
-// example clones a table:
-//
-//     r.Table("table").ForEach(func (row r.Term) interface{} {
-//         return r.Table("new_table").Insert(row)
-//     })
-func (t Term) ForEach(args ...interface{}) Term {
-	return constructMethodTerm(t, "Foreach", p.Term_FOR_EACH, funcWrapArgs(args), map[string]interface{}{})
-}
-
-// Range generates a stream of sequential integers in a specified range. It
-// accepts 0, 1, or 2 arguments, all of which should be numbers.
-func Range(args ...interface{}) Term {
-	return constructRootTerm("Range", p.Term_RANGE, args, map[string]interface{}{})
-}
-
-// Default handles non-existence errors. Tries to evaluate and return its first argument.
-// If an error related to the absence of a value is thrown in the process, or if
-// its first argument returns null, returns its second argument. (Alternatively,
-// the second argument may be a function which will be called with either the
-// text of the non-existence error or null.)
-func (t Term) Default(args ...interface{}) Term {
-	return constructMethodTerm(t, "Default", p.Term_DEFAULT, args, map[string]interface{}{})
-}
-
-// CoerceTo converts a value of one type into another.
-//
-// You can convert: a selection, sequence, or object into an ARRAY, an array of
-// pairs into an OBJECT, and any DATUM into a STRING.
-func (t Term) CoerceTo(args ...interface{}) Term {
-	return constructMethodTerm(t, "CoerceTo", p.Term_COERCE_TO, args, map[string]interface{}{})
-}
-
-// TypeOf gets the type of a value.
-func (t Term) TypeOf(args ...interface{}) Term {
-	return constructMethodTerm(t, "TypeOf", p.Term_TYPE_OF, args, map[string]interface{}{})
-}
-
-// ToJSON converts a ReQL value or object to a JSON string.
-func (t Term) ToJSON() Term {
-	return constructMethodTerm(t, "ToJSON", p.Term_TO_JSON_STRING, []interface{}{}, map[string]interface{}{})
-}
-
-// Info gets information about a RQL value.
-func (t Term) Info(args ...interface{}) Term {
-	return constructMethodTerm(t, "Info", p.Term_INFO, args, map[string]interface{}{})
-}
-
-// UUID returns a UUID (universally unique identifier), a string that can be used as a unique ID.
-func UUID(args ...interface{}) Term {
-	return constructRootTerm("UUID", p.Term_UUID, []interface{}{}, map[string]interface{}{})
-}
diff --git a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/query_control_test.go b/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/query_control_test.go
deleted file mode 100644
index 5f6f06fa3..000000000
--- a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/query_control_test.go
+++ /dev/null
@@ -1,448 +0,0 @@
-package gorethink
-
-import (
-	"bytes"
-	"testing"
-	"time"
-
-	test "gopkg.in/check.v1"
-)
-
-func (s *RethinkSuite) TestControlExprNil(c *test.C) {
-	var response interface{}
-	query := Expr(nil)
-	res, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.One(&response)
-
-	c.Assert(err, test.Equals, ErrEmptyResult)
-	c.Assert(response, test.Equals, nil)
-}
-
-func (s *RethinkSuite) TestControlExprSimple(c *test.C) {
-	var response int
-	query := Expr(1)
-	res, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.One(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response, test.Equals, 1)
-}
-
-func (s *RethinkSuite) TestControlExprList(c *test.C) {
-	var response []interface{}
-	query := Expr(narr)
-	res, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.All(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response, jsonEquals, []interface{}{
-		1, 2, 3, 4, 5, 6, []interface{}{
-			7.1, 7.2, 7.3,
-		},
-	})
-}
-
-func (s *RethinkSuite) TestControlExprObj(c *test.C) {
-	var response map[string]interface{}
-	query := Expr(nobj)
-	res, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.One(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response, jsonEquals, map[string]interface{}{
-		"A": 1,
-		"B": 2,
-		"C": map[string]interface{}{
-			"1": 3,
-			"2": 4,
-		},
-	})
-}
-
-func (s *RethinkSuite) TestControlStruct(c *test.C) {
-	var response map[string]interface{}
-	query := Expr(str)
-	res, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.One(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response, jsonEquals, map[string]interface{}{
-		"id": "A",
-		"B":  1,
-		"D":  map[string]interface{}{"D2": "2", "D1": 1},
-		"E":  []interface{}{"E1", "E2", "E3", 4},
-		"F": map[string]interface{}{
-			"XA": 2,
-			"XB": "B",
-			"XC": []interface{}{"XC1", "XC2"},
-			"XD": map[string]interface{}{
-				"YA": 3,
-				"YB": map[string]interface{}{
-					"1": "1",
-					"2": "2",
-					"3": 3,
-				},
-				"YC": map[string]interface{}{
-					"YC1": "YC1",
-				},
-				"YD": map[string]interface{}{
-					"YD1": "YD1",
-				},
-			},
-			"XE": "XE",
-			"XF": []interface{}{"XE1", "XE2"},
-		},
-	})
-}
-
-func (s *RethinkSuite) TestControlMapTypeAlias(c *test.C) {
-	var response TMap
-	query := Expr(TMap{"A": 1, "B": 2})
-	res, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.One(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response, jsonEquals, TMap{"A": 1, "B": 2})
-}
-
-func (s *RethinkSuite) TestControlStringTypeAlias(c *test.C) {
-	var response TStr
-	query := Expr(TStr("Hello"))
-	res, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.One(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response, jsonEquals, TStr("Hello"))
-}
-
-func (s *RethinkSuite) TestControlExprTypes(c *test.C) {
-	var response []interface{}
-	query := Expr([]interface{}{int64(1), uint64(1), float64(1.0), int32(1), uint32(1), float32(1), "1", true, false})
-	res, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.All(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response, jsonEquals, []interface{}{int64(1), uint64(1), float64(1.0), int32(1), uint32(1), float32(1), "1", true, false})
-}
-
-func (s *RethinkSuite) TestControlJs(c *test.C) {
-	var response int
-	query := JS("1;")
-	res, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.One(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response, test.Equals, 1)
-}
-
-func (s *RethinkSuite) TestControlHttp(c *test.C) {
-	if testing.Short() {
-		c.Skip("-short set")
-	}
-
-	var response map[string]interface{}
-	query := HTTP("httpbin.org/get?data=1")
-	res, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.One(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response["args"], jsonEquals, map[string]interface{}{
-		"data": "1",
-	})
-}
-
-func (s *RethinkSuite) TestControlJson(c *test.C) {
-	var response []int
-	query := JSON("[1,2,3]")
-	res, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.All(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response, jsonEquals, []interface{}{1, 2, 3})
-}
-
-func (s *RethinkSuite) TestControlError(c *test.C) {
-	query := Error("An error occurred")
-	err := query.Exec(session)
-	c.Assert(err, test.NotNil)
-
-	c.Assert(err, test.NotNil)
-	c.Assert(err, test.FitsTypeOf, RQLRuntimeError{})
-
-	c.Assert(err.Error(), test.Equals, "gorethink: An error occurred in: \nr.Error(\"An error occurred\")")
-}
-
-func (s *RethinkSuite) TestControlDoNothing(c *test.C) {
-	var response []interface{}
-	query := Do([]interface{}{map[string]interface{}{"a": 1}, map[string]interface{}{"a": 2}, map[string]interface{}{"a": 3}})
-	res, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.All(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response, jsonEquals, []interface{}{map[string]interface{}{"a": 1}, map[string]interface{}{"a": 2}, map[string]interface{}{"a": 3}})
-}
-
-func (s *RethinkSuite) TestControlArgs(c *test.C) {
-	var response time.Time
-	query := Time(Args(Expr([]interface{}{2014, 7, 12, "Z"})))
-	res, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.One(&response)
-	c.Assert(err, test.IsNil)
-	c.Assert(response.Unix(), test.Equals, int64(1405123200))
-}
-
-func (s *RethinkSuite) TestControlBinaryByteArray(c *test.C) {
-	var response []byte
-
-	query := Binary([]byte("Hello World"))
-	res, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.One(&response)
-	c.Assert(err, test.IsNil)
-	c.Assert(bytes.Equal(response, []byte("Hello World")), test.Equals, true)
-}
-
-type byteArray []byte
-
-func (s *RethinkSuite) TestControlBinaryByteArrayAlias(c *test.C) {
-	var response []byte
-
-	query := Binary(byteArray("Hello World"))
-	res, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.One(&response)
-	c.Assert(err, test.IsNil)
-	c.Assert(bytes.Equal(response, []byte("Hello World")), test.Equals, true)
-}
-
-func (s *RethinkSuite) TestControlBinaryExpr(c *test.C) {
-	var response []byte
-
-	query := Expr([]byte("Hello World"))
-	res, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.One(&response)
-	c.Assert(err, test.IsNil)
-	c.Assert(bytes.Equal(response, []byte("Hello World")), test.Equals, true)
-}
-
-func (s *RethinkSuite) TestControlBinaryExprAlias(c *test.C) {
-	var response []byte
-
-	query := Expr(byteArray("Hello World"))
-	res, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.One(&response)
-	c.Assert(err, test.IsNil)
-	c.Assert(bytes.Equal(response, []byte("Hello World")), test.Equals, true)
-}
-
-func (s *RethinkSuite) TestControlBinaryTerm(c *test.C) {
-	var response []byte
-
-	query := Binary(Expr([]byte("Hello World")))
-	res, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.One(&response)
-	c.Assert(err, test.IsNil)
-	c.Assert(bytes.Equal(response, []byte("Hello World")), test.Equals, true)
-}
-
-func (s *RethinkSuite) TestControlBinaryElemTerm(c *test.C) {
-	var response map[string]interface{}
-
-	query := Expr(map[string]interface{}{
-		"bytes": []byte("Hello World"),
-	})
-	res, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.One(&response)
-	c.Assert(err, test.IsNil)
-	c.Assert(bytes.Equal(response["bytes"].([]byte), []byte("Hello World")), test.Equals, true)
-}
-
-func (s *RethinkSuite) TestControlDo(c *test.C) {
-	var response []interface{}
-	query := Do([]interface{}{
-		map[string]interface{}{"a": 1},
-		map[string]interface{}{"a": 2},
-		map[string]interface{}{"a": 3},
-	}, func(row Term) Term {
-		return row.Field("a")
-	})
-	res, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.All(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response, jsonEquals, []interface{}{1, 2, 3})
-}
-
-func (s *RethinkSuite) TestControlDoWithExpr(c *test.C) {
-	var response []interface{}
-	query := Expr([]interface{}{
-		map[string]interface{}{"a": 1},
-		map[string]interface{}{"a": 2},
-		map[string]interface{}{"a": 3},
-	}).Do(func(row Term) Term {
-		return row.Field("a")
-	})
-	res, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.All(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response, jsonEquals, []interface{}{1, 2, 3})
-}
-
-func (s *RethinkSuite) TestControlBranchSimple(c *test.C) {
-	var response int
-	query := Branch(
-		true,
-		1,
-		2,
-	)
-	res, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.One(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response, test.Equals, 1)
-}
-
-func (s *RethinkSuite) TestControlBranchWithMapExpr(c *test.C) {
-	var response []interface{}
-	query := Expr([]interface{}{1, 2, 3}).Map(Branch(
-		Row.Eq(2),
-		Row.Sub(1),
-		Row.Add(1),
-	))
-	res, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.All(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response, jsonEquals, []interface{}{2, 1, 4})
-}
-
-func (s *RethinkSuite) TestControlDefault(c *test.C) {
-	var response []interface{}
-	query := Expr(defaultObjList).Map(func(row Term) Term {
-		return row.Field("a").Default(1)
-	})
-	res, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.All(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response, jsonEquals, []interface{}{1, 1})
-}
-
-func (s *RethinkSuite) TestControlCoerceTo(c *test.C) {
-	var response string
-	query := Expr(1).CoerceTo("STRING")
-	res, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.One(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response, test.Equals, "1")
-}
-
-func (s *RethinkSuite) TestControlTypeOf(c *test.C) {
-	var response string
-	query := Expr(1).TypeOf()
-	res, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.One(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response, test.Equals, "NUMBER")
-}
-
-func (s *RethinkSuite) TestControlRangeNoArgs(c *test.C) {
-	var response []int
-	query := Range().Limit(100)
-	res, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.All(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(len(response), test.Equals, 100)
-}
-
-func (s *RethinkSuite) TestControlRangeSingleArgs(c *test.C) {
-	var response []int
-	query := Range(4)
-	res, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.All(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response, test.DeepEquals, []int{0, 1, 2, 3})
-}
-
-func (s *RethinkSuite) TestControlRangeTwoArgs(c *test.C) {
-	var response []int
-	query := Range(4, 6)
-	res, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.All(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response, test.DeepEquals, []int{4, 5})
-}
-
-func (s *RethinkSuite) TestControlToJSON(c *test.C) {
-	var response string
-	query := Expr([]int{4, 5}).ToJSON()
-	res, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.One(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response, test.Equals, "[4,5]")
-}
diff --git a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/query_db.go b/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/query_db.go
deleted file mode 100644
index ff9aeca28..000000000
--- a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/query_db.go
+++ /dev/null
@@ -1,25 +0,0 @@
-package gorethink
-
-import (
-	p "github.com/dancannon/gorethink/ql2"
-)
-
-// DBCreate creates a database. A RethinkDB database is a collection of tables,
-// similar to relational databases.
-//
-// Note: that you can only use alphanumeric characters and underscores for the
-// database name.
-func DBCreate(args ...interface{}) Term {
-	return constructRootTerm("DBCreate", p.Term_DB_CREATE, args, map[string]interface{}{})
-}
-
-// DBDrop drops a database. The database, all its tables, and corresponding data
-// will be deleted.
-func DBDrop(args ...interface{}) Term {
-	return constructRootTerm("DBDrop", p.Term_DB_DROP, args, map[string]interface{}{})
-}
-
-// DBList lists all database names in the system.
-func DBList(args ...interface{}) Term {
-	return constructRootTerm("DBList", p.Term_DB_LIST, args, map[string]interface{}{})
-}
diff --git a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/query_db_test.go b/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/query_db_test.go
deleted file mode 100644
index 48275c396..000000000
--- a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/query_db_test.go
+++ /dev/null
@@ -1,57 +0,0 @@
-package gorethink
-
-import (
-	test "gopkg.in/check.v1"
-)
-
-func (s *RethinkSuite) TestDbCreate(c *test.C) {
-	// Delete the test2 database if it already exists
-	DBDrop("test").Exec(session)
-
-	// Test database creation
-	query := DBCreate("test")
-
-	response, err := query.RunWrite(session)
-	c.Assert(err, test.IsNil)
-	c.Assert(response.DBsCreated, jsonEquals, 1)
-}
-
-func (s *RethinkSuite) TestDbList(c *test.C) {
-	var response []interface{}
-
-	// create database
-	DBCreate("test").Exec(session)
-
-	// Try and find it in the list
-	success := false
-	res, err := DBList().Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.All(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response, test.FitsTypeOf, []interface{}{})
-
-	for _, db := range response {
-		if db == "test" {
-			success = true
-		}
-	}
-
-	c.Assert(success, test.Equals, true)
-}
-
-func (s *RethinkSuite) TestDbDelete(c *test.C) {
-	// Delete the test2 database if it already exists
-	DBCreate("test").Exec(session)
-
-	// Test database creation
-	query := DBDrop("test")
-
-	response, err := query.RunWrite(session)
-	c.Assert(err, test.IsNil)
-	c.Assert(response.DBsDropped, jsonEquals, 1)
-
-	// Ensure that there is still a test DB after the test has finished
-	DBCreate("test").Exec(session)
-}
diff --git a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/query_geospatial.go b/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/query_geospatial.go
deleted file mode 100644
index 868c9303b..000000000
--- a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/query_geospatial.go
+++ /dev/null
@@ -1,170 +0,0 @@
-package gorethink
-
-import (
-	p "github.com/dancannon/gorethink/ql2"
-)
-
-// CircleOpts contains the optional arguments for the Circle term.
-type CircleOpts struct {
-	NumVertices interface{} `gorethink:"num_vertices,omitempty"`
-	GeoSystem   interface{} `gorethink:"geo_system,omitempty"`
-	Unit        interface{} `gorethink:"unit,omitempty"`
-	Fill        interface{} `gorethink:"fill,omitempty"`
-}
-
-func (o *CircleOpts) toMap() map[string]interface{} {
-	return optArgsToMap(o)
-}
-
-// Circle constructs a circular line or polygon. A circle in RethinkDB is
-// a polygon or line approximating a circle of a given radius around a given
-// center, consisting of a specified number of vertices (default 32).
-func Circle(point, radius interface{}, optArgs ...CircleOpts) Term {
-	opts := map[string]interface{}{}
-	if len(optArgs) >= 1 {
-		opts = optArgs[0].toMap()
-	}
-
-	return constructRootTerm("Circle", p.Term_CIRCLE, []interface{}{point, radius}, opts)
-}
-
-// DistanceOpts contains the optional arguments for the Distance term.
-type DistanceOpts struct {
-	GeoSystem interface{} `gorethink:"geo_system,omitempty"`
-	Unit      interface{} `gorethink:"unit,omitempty"`
-}
-
-func (o *DistanceOpts) toMap() map[string]interface{} {
-	return optArgsToMap(o)
-}
-
-// Distance calculates the Haversine distance between two points. At least one
-// of the geometry objects specified must be a point.
-func (t Term) Distance(point interface{}, optArgs ...DistanceOpts) Term {
-	opts := map[string]interface{}{}
-	if len(optArgs) >= 1 {
-		opts = optArgs[0].toMap()
-	}
-
-	return constructMethodTerm(t, "Distance", p.Term_DISTANCE, []interface{}{point}, opts)
-}
-
-// Distance calculates the Haversine distance between two points. At least one
-// of the geometry objects specified must be a point.
-func Distance(point1, point2 interface{}, optArgs ...DistanceOpts) Term {
-	opts := map[string]interface{}{}
-	if len(optArgs) >= 1 {
-		opts = optArgs[0].toMap()
-	}
-
-	return constructRootTerm("Distance", p.Term_DISTANCE, []interface{}{point1, point2}, opts)
-}
-
-// Fill converts a Line object into a Polygon object. If the last point does not
-// specify the same coordinates as the first point, polygon will close the
-// polygon by connecting them
-func (t Term) Fill() Term {
-	return constructMethodTerm(t, "Fill", p.Term_FILL, []interface{}{}, map[string]interface{}{})
-}
-
-// GeoJSON converts a GeoJSON object to a ReQL geometry object.
-func GeoJSON(args ...interface{}) Term {
-	return constructRootTerm("GeoJSON", p.Term_GEOJSON, args, map[string]interface{}{})
-}
-
-// ToGeoJSON converts a ReQL geometry object to a GeoJSON object.
-func (t Term) ToGeoJSON(args ...interface{}) Term {
-	return constructMethodTerm(t, "ToGeoJSON", p.Term_TO_GEOJSON, args, map[string]interface{}{})
-}
-
-// GetIntersectingOpts contains the optional arguments for the GetIntersecting term.
-type GetIntersectingOpts struct {
-	Index interface{} `gorethink:"index,omitempty"`
-}
-
-func (o *GetIntersectingOpts) toMap() map[string]interface{} {
-	return optArgsToMap(o)
-}
-
-// GetIntersecting gets all documents where the given geometry object intersects
-// the geometry object of the requested geospatial index.
-func (t Term) GetIntersecting(args interface{}, optArgs ...GetIntersectingOpts) Term {
-	opts := map[string]interface{}{}
-	if len(optArgs) >= 1 {
-		opts = optArgs[0].toMap()
-	}
-
-	return constructMethodTerm(t, "GetIntersecting", p.Term_GET_INTERSECTING, []interface{}{args}, opts)
-}
-
-// GetNearestOpts contains the optional arguments for the GetNearest term.
-type GetNearestOpts struct {
-	Index      interface{} `gorethink:"index,omitempty"`
-	MaxResults interface{} `gorethink:"max_results,omitempty"`
-	MaxDist    interface{} `gorethink:"max_dist,omitempty"`
-	Unit       interface{} `gorethink:"unit,omitempty"`
-	GeoSystem  interface{} `gorethink:"geo_system,omitempty"`
-}
-
-func (o *GetNearestOpts) toMap() map[string]interface{} {
-	return optArgsToMap(o)
-}
-
-// GetNearest gets all documents where the specified geospatial index is within a
-// certain distance of the specified point (default 100 kilometers).
-func (t Term) GetNearest(point interface{}, optArgs ...GetNearestOpts) Term {
-	opts := map[string]interface{}{}
-	if len(optArgs) >= 1 {
-		opts = optArgs[0].toMap()
-	}
-
-	return constructMethodTerm(t, "GetNearest", p.Term_GET_NEAREST, []interface{}{point}, opts)
-}
-
-// Includes tests whether a geometry object is completely contained within another.
-// When applied to a sequence of geometry objects, includes acts as a filter,
-// returning a sequence of objects from the sequence that include the argument.
-func (t Term) Includes(args ...interface{}) Term {
-	return constructMethodTerm(t, "Includes", p.Term_INCLUDES, args, map[string]interface{}{})
-}
-
-// Intersects tests whether two geometry objects intersect with one another.
-// When applied to a sequence of geometry objects, intersects acts as a filter,
-// returning a sequence of objects from the sequence that intersect with the
-// argument.
-func (t Term) Intersects(args ...interface{}) Term {
-	return constructMethodTerm(t, "Intersects", p.Term_INTERSECTS, args, map[string]interface{}{})
-}
-
-// Line constructs a geometry object of type Line. The line can be specified in
-// one of two ways:
-//  - Two or more two-item arrays, specifying longitude and latitude numbers of
-//   the line's vertices;
-//  - Two or more Point objects specifying the line's vertices.
-func Line(args ...interface{}) Term {
-	return constructRootTerm("Line", p.Term_LINE, args, map[string]interface{}{})
-}
-
-// Point constructs a geometry object of type Point. The point is specified by
-// two floating point numbers, the longitude (−180 to 180) and latitude
-// (−90 to 90) of the point on a perfect sphere.
-func Point(lon, lat interface{}) Term {
-	return constructRootTerm("Point", p.Term_POINT, []interface{}{lon, lat}, map[string]interface{}{})
-}
-
-// Polygon constructs a geometry object of type Polygon. The Polygon can be
-// specified in one of two ways:
-//  - Three or more two-item arrays, specifying longitude and latitude numbers of the polygon's vertices;
-//  - Three or more Point objects specifying the polygon's vertices.
-func Polygon(args ...interface{}) Term {
-	return constructRootTerm("Polygon", p.Term_POLYGON, args, map[string]interface{}{})
-}
-
-// PolygonSub "punches a hole" out of the parent polygon using the polygon passed
-// to the function.
-//   polygon1.PolygonSub(polygon2) -> polygon
-// In the example above polygon2 must be completely contained within polygon1
-// and must have no holes itself (it must not be the output of polygon_sub itself).
-func (t Term) PolygonSub(args ...interface{}) Term {
-	return constructMethodTerm(t, "PolygonSub", p.Term_POLYGON_SUB, args, map[string]interface{}{})
-}
diff --git a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/query_geospatial_test.go b/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/query_geospatial_test.go
deleted file mode 100644
index 40d13e8d7..000000000
--- a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/query_geospatial_test.go
+++ /dev/null
@@ -1,515 +0,0 @@
-package gorethink
-
-import (
-	test "gopkg.in/check.v1"
-
-	"github.com/dancannon/gorethink/types"
-)
-
-func (s *RethinkSuite) TestGeospatialDecodeGeometryPseudoType(c *test.C) {
-	var response types.Geometry
-
-	// setup coordinates
-	coords := [][][]float64{
-		{
-			{-122.423246, 37.779388},
-			{-122.423246, 37.329898},
-			{-121.88642, 37.329898},
-			{-121.88642, 37.329898},
-			{-122.423246, 37.779388},
-		},
-	}
-
-	gt := "Polygon"
-	res, err := Expr(map[string]interface{}{
-		"$reql_type$": "GEOMETRY",
-		"type":        "Polygon",
-		"coordinates": coords,
-	}).Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.One(&response)
-	c.Assert(err, test.IsNil)
-
-	// test shape
-	if response.Type != gt {
-		c.Errorf("expected [%v], instead [%v]", gt, response.Type)
-	}
-
-	// assert points are within threshold
-	c.Assert(response, geometryEquals, "Polygon", coords)
-}
-
-func (s *RethinkSuite) TestGeospatialEncodeGeometryPseudoType(c *test.C) {
-	encoded, err := encode(types.Geometry{
-		Type: "Polygon",
-		Lines: types.Lines{
-			types.Line{
-				types.Point{Lon: -122.423246, Lat: 37.779388},
-				types.Point{Lon: -122.423246, Lat: 37.329898},
-				types.Point{Lon: -121.88642, Lat: 37.329898},
-				types.Point{Lon: -121.88642, Lat: 37.779388},
-				types.Point{Lon: -122.423246, Lat: 37.779388},
-			},
-		},
-	})
-	c.Assert(err, test.IsNil)
-	c.Assert(encoded, jsonEquals, map[string]interface{}{
-		"$reql_type$": "GEOMETRY",
-		"type":        "Polygon",
-		"coordinates": []interface{}{
-			[]interface{}{
-				[]interface{}{-122.423246, 37.779388},
-				[]interface{}{-122.423246, 37.329898},
-				[]interface{}{-121.88642, 37.329898},
-				[]interface{}{-121.88642, 37.779388},
-				[]interface{}{-122.423246, 37.779388},
-			},
-		},
-	})
-}
-
-func (s *RethinkSuite) TestGeospatialCircle(c *test.C) {
-	var response types.Geometry
-	res, err := Circle([]float64{-122.423246, 37.779388}, 10).Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.One(&response)
-	c.Assert(err, test.IsNil)
-	c.Assert(response, geometryEquals, "Polygon", [][][]float64{
-		{
-			{-122.423246, 37.77929790366427},
-			{-122.42326814543915, 37.77929963483801},
-			{-122.4232894398445, 37.779304761831504},
-			{-122.42330906488651, 37.77931308761787},
-			{-122.42332626638755, 37.77932429224285},
-			{-122.42334038330416, 37.77933794512014},
-			{-122.42335087313059, 37.77935352157849},
-			{-122.42335733274696, 37.77937042302436},
-			{-122.4233595139113, 37.77938799994533},
-			{-122.42335733279968, 37.7794055768704},
-			{-122.42335087322802, 37.779422478327966},
-			{-122.42334038343147, 37.77943805480385},
-			{-122.42332626652532, 37.779451707701796},
-			{-122.42330906501378, 37.77946291234741},
-			{-122.42328943994191, 37.77947123815131},
-			{-122.42326814549187, 37.77947636515649},
-			{-122.423246, 37.779478096334365},
-			{-122.42322385450814, 37.77947636515649},
-			{-122.4232025600581, 37.77947123815131},
-			{-122.42318293498623, 37.77946291234741},
-			{-122.42316573347469, 37.779451707701796},
-			{-122.42315161656855, 37.77943805480385},
-			{-122.423141126772, 37.779422478327966},
-			{-122.42313466720033, 37.7794055768704},
-			{-122.42313248608872, 37.77938799994533},
-			{-122.42313466725305, 37.77937042302436},
-			{-122.42314112686942, 37.77935352157849},
-			{-122.42315161669585, 37.77933794512014},
-			{-122.42316573361246, 37.77932429224285},
-			{-122.4231829351135, 37.77931308761787},
-			{-122.42320256015552, 37.779304761831504},
-			{-122.42322385456086, 37.77929963483801},
-			{-122.423246, 37.77929790366427},
-		},
-	})
-}
-
-func (s *RethinkSuite) TestGeospatialCirclePoint(c *test.C) {
-	var response types.Geometry
-	res, err := Circle(Point(-122.423246, 37.779388), 10).Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.One(&response)
-	c.Assert(err, test.IsNil)
-	c.Assert(response, geometryEquals, "Polygon", [][][]float64{
-		{
-			{-122.423246, 37.77929790366427},
-			{-122.42326814543915, 37.77929963483801},
-			{-122.4232894398445, 37.779304761831504},
-			{-122.42330906488651, 37.77931308761787},
-			{-122.42332626638755, 37.77932429224285},
-			{-122.42334038330416, 37.77933794512014},
-			{-122.42335087313059, 37.77935352157849},
-			{-122.42335733274696, 37.77937042302436},
-			{-122.4233595139113, 37.77938799994533},
-			{-122.42335733279968, 37.7794055768704},
-			{-122.42335087322802, 37.779422478327966},
-			{-122.42334038343147, 37.77943805480385},
-			{-122.42332626652532, 37.779451707701796},
-			{-122.42330906501378, 37.77946291234741},
-			{-122.42328943994191, 37.77947123815131},
-			{-122.42326814549187, 37.77947636515649},
-			{-122.423246, 37.779478096334365},
-			{-122.42322385450814, 37.77947636515649},
-			{-122.4232025600581, 37.77947123815131},
-			{-122.42318293498623, 37.77946291234741},
-			{-122.42316573347469, 37.779451707701796},
-			{-122.42315161656855, 37.77943805480385},
-			{-122.423141126772, 37.779422478327966},
-			{-122.42313466720033, 37.7794055768704},
-			{-122.42313248608872, 37.77938799994533},
-			{-122.42313466725305, 37.77937042302436},
-			{-122.42314112686942, 37.77935352157849},
-			{-122.42315161669585, 37.77933794512014},
-			{-122.42316573361246, 37.77932429224285},
-			{-122.4231829351135, 37.77931308761787},
-			{-122.42320256015552, 37.779304761831504},
-			{-122.42322385456086, 37.77929963483801},
-			{-122.423246, 37.77929790366427},
-		},
-	})
-}
-
-func (s *RethinkSuite) TestGeospatialCirclePointFill(c *test.C) {
-	var response types.Geometry
-	res, err := Circle(Point(-122.423246, 37.779388), 10, CircleOpts{Fill: true}).Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.One(&response)
-	c.Assert(err, test.IsNil)
-	c.Assert(response, geometryEquals, "Polygon", [][][]float64{
-		{
-			{-122.423246, 37.77929790366427},
-			{-122.42326814543915, 37.77929963483801},
-			{-122.4232894398445, 37.779304761831504},
-			{-122.42330906488651, 37.77931308761787},
-			{-122.42332626638755, 37.77932429224285},
-			{-122.42334038330416, 37.77933794512014},
-			{-122.42335087313059, 37.77935352157849},
-			{-122.42335733274696, 37.77937042302436},
-			{-122.4233595139113, 37.77938799994533},
-			{-122.42335733279968, 37.7794055768704},
-			{-122.42335087322802, 37.779422478327966},
-			{-122.42334038343147, 37.77943805480385},
-			{-122.42332626652532, 37.779451707701796},
-			{-122.42330906501378, 37.77946291234741},
-			{-122.42328943994191, 37.77947123815131},
-			{-122.42326814549187, 37.77947636515649},
-			{-122.423246, 37.779478096334365},
-			{-122.42322385450814, 37.77947636515649},
-			{-122.4232025600581, 37.77947123815131},
-			{-122.42318293498623, 37.77946291234741},
-			{-122.42316573347469, 37.779451707701796},
-			{-122.42315161656855, 37.77943805480385},
-			{-122.423141126772, 37.779422478327966},
-			{-122.42313466720033, 37.7794055768704},
-			{-122.42313248608872, 37.77938799994533},
-			{-122.42313466725305, 37.77937042302436},
-			{-122.42314112686942, 37.77935352157849},
-			{-122.42315161669585, 37.77933794512014},
-			{-122.42316573361246, 37.77932429224285},
-			{-122.4231829351135, 37.77931308761787},
-			{-122.42320256015552, 37.779304761831504},
-			{-122.42322385456086, 37.77929963483801},
-			{-122.423246, 37.77929790366427},
-		},
-	})
-
-}
-
-func (s *RethinkSuite) TestGeospatialPointDistanceMethod(c *test.C) {
-	var response float64
-	f := 734125.249602186
-	res, err := Point(-122.423246, 37.779388).Distance(Point(-117.220406, 32.719464)).Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.One(&response)
-	c.Assert(err, test.IsNil)
-	if !kindaclose(response, f) {
-		c.Errorf("the deviation between the compared floats is too great [%v:%v]", response, f)
-	}
-}
-
-func (s *RethinkSuite) TestGeospatialPointDistanceRoot(c *test.C) {
-	var response float64
-	f := 734125.249602186
-	res, err := Distance(Point(-122.423246, 37.779388), Point(-117.220406, 32.719464)).Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.One(&response)
-	c.Assert(err, test.IsNil)
-	if !kindaclose(response, f) {
-		c.Errorf("the deviation between the compared floats is too great [%v:%v]", response, f)
-	}
-}
-
-func (s *RethinkSuite) TestGeospatialPointDistanceRootKm(c *test.C) {
-	var response float64
-	f := 734.125249602186
-	res, err := Distance(Point(-122.423246, 37.779388), Point(-117.220406, 32.719464), DistanceOpts{Unit: "km"}).Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.One(&response)
-	c.Assert(err, test.IsNil)
-	if !kindaclose(response, f) {
-		c.Errorf("the deviation between the compared floats is too great [%v:%v]", response, f)
-	}
-}
-
-func (s *RethinkSuite) TestGeospatialFill(c *test.C) {
-	var response types.Geometry
-	res, err := Line(
-		[]float64{-122.423246, 37.779388},
-		[]float64{-122.423246, 37.329898},
-		[]float64{-121.886420, 37.329898},
-		[]float64{-121.886420, 37.779388},
-	).Fill().Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.One(&response)
-	c.Assert(err, test.IsNil)
-	c.Assert(response, geometryEquals, "Polygon", [][][]float64{
-		{
-			{-122.423246, 37.779388},
-			{-122.423246, 37.329898},
-			{-121.88642, 37.329898},
-			{-121.88642, 37.779388},
-			{-122.423246, 37.779388},
-		},
-	})
-}
-
-func (s *RethinkSuite) TestGeospatialGeoJSON(c *test.C) {
-	var response types.Geometry
-	res, err := GeoJSON(map[string]interface{}{
-		"type":        "Point",
-		"coordinates": []interface{}{-122.423246, 37.779388},
-	}).Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.One(&response)
-	c.Assert(err, test.IsNil)
-	c.Assert(response, geometryEquals, "Point", []float64{-122.423246, 37.779388})
-}
-
-func (s *RethinkSuite) TestGeospatialToGeoJSON(c *test.C) {
-	var response map[string]interface{}
-	res, err := Point(-122.423246, 37.779388).ToGeoJSON().Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.One(&response)
-	c.Assert(err, test.IsNil)
-	c.Assert(response, jsonEquals, map[string]interface{}{
-		"type":        "Point",
-		"coordinates": []interface{}{-122.423246, 37.779388},
-	})
-}
-
-func (s *RethinkSuite) TestGeospatialGetIntersecting(c *test.C) {
-	// Setup table
-	DB("test").TableDrop("geospatial").Run(session)
-	DB("test").TableCreate("geospatial").Run(session)
-	DB("test").Table("geospatial").IndexCreate("area", IndexCreateOpts{
-		Geo: true,
-	}).Run(session)
-	DB("test").Table("geospatial").Insert([]interface{}{
-		map[string]interface{}{"area": Circle(Point(-117.220406, 32.719464), 100000)},
-		map[string]interface{}{"area": Circle(Point(-100.220406, 20.719464), 100000)},
-		map[string]interface{}{"area": Circle(Point(-117.200406, 32.723464), 100000)},
-	}).Run(session)
-
-	var response []interface{}
-	res, err := DB("test").Table("geospatial").GetIntersecting(
-		Circle(Point(-117.220406, 32.719464), 100000),
-		GetIntersectingOpts{
-			Index: "area",
-		},
-	).Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.All(&response)
-	c.Assert(err, test.IsNil)
-	c.Assert(response, test.HasLen, 2)
-}
-
-func (s *RethinkSuite) TestGeospatialGetNearest(c *test.C) {
-	// Setup table
-	DB("test").TableDrop("geospatial").Run(session)
-	DB("test").TableCreate("geospatial").Run(session)
-	DB("test").Table("geospatial").IndexCreate("area", IndexCreateOpts{
-		Geo: true,
-	}).Run(session)
-	DB("test").Table("geospatial").Insert([]interface{}{
-		map[string]interface{}{"area": Circle(Point(-117.220406, 32.719464), 100000)},
-		map[string]interface{}{"area": Circle(Point(-100.220406, 20.719464), 100000)},
-		map[string]interface{}{"area": Circle(Point(-115.210306, 32.733364), 100000)},
-	}).Run(session)
-
-	var response []interface{}
-	res, err := DB("test").Table("geospatial").GetNearest(
-		Point(-117.220406, 32.719464),
-		GetNearestOpts{
-			Index:   "area",
-			MaxDist: 1,
-		},
-	).Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.All(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response, test.HasLen, 1)
-}
-
-func (s *RethinkSuite) TestGeospatialIncludesTrue(c *test.C) {
-	var response bool
-	res, err := Polygon(
-		Point(-122.4, 37.7),
-		Point(-122.4, 37.3),
-		Point(-121.8, 37.3),
-		Point(-121.8, 37.7),
-	).Includes(Point(-122.3, 37.4)).Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.One(&response)
-	c.Assert(err, test.IsNil)
-	c.Assert(response, test.Equals, true)
-}
-
-func (s *RethinkSuite) TestGeospatialIncludesFalse(c *test.C) {
-	var response bool
-	res, err := Polygon(
-		Point(-122.4, 37.7),
-		Point(-122.4, 37.3),
-		Point(-121.8, 37.3),
-		Point(-121.8, 37.7),
-	).Includes(Point(100.3, 37.4)).Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.One(&response)
-	c.Assert(err, test.IsNil)
-	c.Assert(response, test.Equals, false)
-}
-
-func (s *RethinkSuite) TestGeospatialIntersectsTrue(c *test.C) {
-	var response bool
-	res, err := Polygon(
-		Point(-122.4, 37.7),
-		Point(-122.4, 37.3),
-		Point(-121.8, 37.3),
-		Point(-121.8, 37.7),
-	).Intersects(Polygon(
-		Point(-122.3, 37.4),
-		Point(-122.4, 37.3),
-		Point(-121.8, 37.3),
-		Point(-121.8, 37.4),
-	)).Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.One(&response)
-	c.Assert(err, test.IsNil)
-	c.Assert(response, test.Equals, true)
-}
-
-func (s *RethinkSuite) TestGeospatialIntersectsFalse(c *test.C) {
-	var response bool
-	res, err := Polygon(
-		Point(-122.4, 37.7),
-		Point(-122.4, 37.3),
-		Point(-121.8, 37.3),
-		Point(-121.8, 37.7),
-	).Intersects(Polygon(
-		Point(-102.4, 37.7),
-		Point(-102.4, 37.3),
-		Point(-101.8, 37.3),
-		Point(-101.8, 37.7),
-	)).Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.One(&response)
-	c.Assert(err, test.IsNil)
-	c.Assert(response, test.Equals, false)
-}
-
-func (s *RethinkSuite) TestGeospatialLineLatLon(c *test.C) {
-	var response types.Geometry
-	res, err := Line([]float64{-122.423246, 37.779388}, []float64{-121.886420, 37.329898}).Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.One(&response)
-	c.Assert(err, test.IsNil)
-	c.Assert(response, geometryEquals, "LineString", [][]float64{
-		{-122.423246, 37.779388},
-		{-121.886420, 37.329898},
-	})
-}
-
-func (s *RethinkSuite) TestGeospatialLinePoint(c *test.C) {
-	var response types.Geometry
-	res, err := Line(Point(-122.423246, 37.779388), Point(-121.886420, 37.329898)).Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.One(&response)
-	c.Assert(err, test.IsNil)
-	c.Assert(response, geometryEquals, "LineString", [][]float64{
-		{-122.423246, 37.779388},
-		{-121.886420, 37.329898},
-	})
-}
-
-func (s *RethinkSuite) TestGeospatialPoint(c *test.C) {
-	var response types.Geometry
-	res, err := Point(-122.423246, 37.779388).Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.One(&response)
-	c.Assert(err, test.IsNil)
-	c.Assert(response, jsonEquals, types.Geometry{
-		Type:  "Point",
-		Point: types.Point{Lon: -122.423246, Lat: 37.779388},
-	})
-	c.Assert(response, geometryEquals, "Point", []float64{-122.423246, 37.779388})
-}
-
-func (s *RethinkSuite) TestGeospatialPolygon(c *test.C) {
-	var response types.Geometry
-	res, err := Polygon(Point(-122.423246, 37.779388), Point(-122.423246, 37.329898), Point(-121.886420, 37.329898)).Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.One(&response)
-	c.Assert(err, test.IsNil)
-	c.Assert(response, geometryEquals, "Polygon", [][][]float64{
-		{
-			{-122.423246, 37.779388},
-			{-122.423246, 37.329898},
-			{-121.88642, 37.329898},
-			{-122.423246, 37.779388},
-		},
-	})
-}
-
-func (s *RethinkSuite) TestGeospatialPolygonSub(c *test.C) {
-	var response types.Geometry
-	res, err := Polygon(
-		Point(-122.4, 37.7),
-		Point(-122.4, 37.3),
-		Point(-121.8, 37.3),
-		Point(-121.8, 37.7),
-	).PolygonSub(Polygon(
-		Point(-122.3, 37.4),
-		Point(-122.3, 37.6),
-		Point(-122.0, 37.6),
-		Point(-122.0, 37.4),
-	)).Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.One(&response)
-	c.Assert(err, test.IsNil)
-	c.Assert(response, geometryEquals, "Polygon", [][][]float64{
-		{
-			{-122.4, 37.7},
-			{-122.4, 37.3},
-			{-121.8, 37.3},
-			{-121.8, 37.7},
-			{-122.4, 37.7},
-		},
-		{
-			{-122.3, 37.4},
-			{-122.3, 37.6},
-			{-122, 37.6},
-			{-122, 37.4},
-			{-122.3, 37.4},
-		},
-	})
-}
diff --git a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/query_join.go b/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/query_join.go
deleted file mode 100644
index 57487d31f..000000000
--- a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/query_join.go
+++ /dev/null
@@ -1,46 +0,0 @@
-package gorethink
-
-import (
-	p "github.com/dancannon/gorethink/ql2"
-)
-
-// InnerJoin returns the inner product of two sequences (e.g. a table, a filter result)
-// filtered by the predicate. The query compares each row of the left sequence
-// with each row of the right sequence to find all pairs of rows which satisfy
-// the predicate. When the predicate is satisfied, each matched pair of rows
-// of both sequences are combined into a result row.
-func (t Term) InnerJoin(args ...interface{}) Term {
-	return constructMethodTerm(t, "InnerJoin", p.Term_INNER_JOIN, args, map[string]interface{}{})
-}
-
-// OuterJoin computes a left outer join by retaining each row in the left table even
-// if no match was found in the right table.
-func (t Term) OuterJoin(args ...interface{}) Term {
-	return constructMethodTerm(t, "OuterJoin", p.Term_OUTER_JOIN, args, map[string]interface{}{})
-}
-
-// EqJoinOpts contains the optional arguments for the EqJoin term.
-type EqJoinOpts struct {
-	Index interface{} `gorethink:"index,omitempty"`
-}
-
-func (o *EqJoinOpts) toMap() map[string]interface{} {
-	return optArgsToMap(o)
-}
-
-// EqJoin is an efficient join that looks up elements in the right table by primary key.
-//
-// Optional arguments: "index" (string - name of the index to use in right table instead of the primary key)
-func (t Term) EqJoin(left, right interface{}, optArgs ...EqJoinOpts) Term {
-	opts := map[string]interface{}{}
-	if len(optArgs) >= 1 {
-		opts = optArgs[0].toMap()
-	}
-	return constructMethodTerm(t, "EqJoin", p.Term_EQ_JOIN, []interface{}{funcWrap(left), right}, opts)
-}
-
-// Zip is used to 'zip' up the result of a join by merging the 'right' fields into 'left'
-// fields of each member of the sequence.
-func (t Term) Zip(args ...interface{}) Term {
-	return constructMethodTerm(t, "Zip", p.Term_ZIP, args, map[string]interface{}{})
-}
diff --git a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/query_join_test.go b/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/query_join_test.go
deleted file mode 100644
index eb98531a4..000000000
--- a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/query_join_test.go
+++ /dev/null
@@ -1,177 +0,0 @@
-package gorethink
-
-import (
-	test "gopkg.in/check.v1"
-)
-
-func (s *RethinkSuite) TestJoinInnerJoin(c *test.C) {
-	// Ensure table + database exist
-	DBCreate("test").Exec(session)
-	DB("test").TableCreate("Join1").Exec(session)
-	DB("test").TableCreate("Join2").Exec(session)
-
-	// Insert rows
-	DB("test").Table("Join1").Insert(joinTable1).Exec(session)
-	DB("test").Table("Join2").Insert(joinTable2).Exec(session)
-
-	// Test query
-	var response []interface{}
-	query := DB("test").Table("Join1").InnerJoin(DB("test").Table("Join2"), func(a, b Term) Term {
-		return a.Field("id").Eq(b.Field("id"))
-	})
-	res, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-	err = res.All(&response)
-
-	c.Assert(response, jsonEquals, []interface{}{
-		map[string]interface{}{
-			"right": map[string]interface{}{"title": "goof", "id": 0},
-			"left":  map[string]interface{}{"name": "bob", "id": 0},
-		},
-		map[string]interface{}{
-			"right": map[string]interface{}{"title": "lmoe", "id": 2},
-			"left":  map[string]interface{}{"name": "joe", "id": 2},
-		},
-	})
-}
-
-func (s *RethinkSuite) TestJoinInnerJoinZip(c *test.C) {
-	// Ensure table + database exist
-	DBCreate("test").Exec(session)
-	DB("test").TableCreate("Join1").Exec(session)
-	DB("test").TableCreate("Join2").Exec(session)
-
-	// Insert rows
-	DB("test").Table("Join1").Insert(joinTable1).Exec(session)
-	DB("test").Table("Join2").Insert(joinTable2).Exec(session)
-
-	// Test query
-	var response []interface{}
-	query := DB("test").Table("Join1").InnerJoin(DB("test").Table("Join2"), func(a, b Term) Term {
-		return a.Field("id").Eq(b.Field("id"))
-	}).Zip()
-	res, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.All(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response, jsonEquals, []interface{}{
-		map[string]interface{}{"title": "goof", "name": "bob", "id": 0},
-		map[string]interface{}{"title": "lmoe", "name": "joe", "id": 2},
-	})
-}
-
-func (s *RethinkSuite) TestJoinOuterJoinZip(c *test.C) {
-	// Ensure table + database exist
-	DBCreate("test").Exec(session)
-	DB("test").TableCreate("Join1").Exec(session)
-	DB("test").TableCreate("Join2").Exec(session)
-
-	// Insert rows
-	DB("test").Table("Join1").Insert(joinTable1).Exec(session)
-	DB("test").Table("Join2").Insert(joinTable2).Exec(session)
-
-	// Test query
-	var response []interface{}
-	query := DB("test").Table("Join1").OuterJoin(DB("test").Table("Join2"), func(a, b Term) Term {
-		return a.Field("id").Eq(b.Field("id"))
-	}).Zip().OrderBy("id")
-	res, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.All(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response, jsonEquals, []interface{}{
-		map[string]interface{}{"title": "goof", "name": "bob", "id": 0},
-		map[string]interface{}{"name": "tom", "id": 1},
-		map[string]interface{}{"title": "lmoe", "name": "joe", "id": 2},
-	})
-}
-
-func (s *RethinkSuite) TestJoinEqJoinZip(c *test.C) {
-	// Ensure table + database exist
-	DBCreate("test").Exec(session)
-	DB("test").TableCreate("Join1").Exec(session)
-	DB("test").TableCreate("Join2").Exec(session)
-
-	// Insert rows
-	DB("test").Table("Join1").Insert(joinTable1).Exec(session)
-	DB("test").Table("Join2").Insert(joinTable2).Exec(session)
-
-	// Test query
-	var response []interface{}
-	query := DB("test").Table("Join1").EqJoin("id", DB("test").Table("Join2")).Zip()
-	res, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.All(&response)
-	c.Assert(response, jsonEquals, []interface{}{
-		map[string]interface{}{"title": "goof", "name": "bob", "id": 0},
-		map[string]interface{}{"title": "lmoe", "name": "joe", "id": 2},
-	})
-}
-
-func (s *RethinkSuite) TestJoinEqJoinDiffIdsZip(c *test.C) {
-	// Ensure table + database exist
-	DBCreate("test").Exec(session)
-	DB("test").TableCreate("Join1").Exec(session)
-	err := DB("test").TableCreate("Join3", TableCreateOpts{
-		PrimaryKey: "it",
-	}).Exec(session)
-	c.Assert(err, test.IsNil)
-	DB("test").Table("Join3").IndexCreate("it").Exec(session)
-
-	// Insert rows
-	DB("test").Table("Join1").Delete().Exec(session)
-	DB("test").Table("Join3").Delete().Exec(session)
-	DB("test").Table("Join1").Insert(joinTable1).Exec(session)
-	DB("test").Table("Join3").Insert(joinTable3).Exec(session)
-
-	// Test query
-	var response []interface{}
-	query := DB("test").Table("Join1").EqJoin("id", DB("test").Table("Join3"), EqJoinOpts{
-		Index: "it",
-	}).Zip()
-	res, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.All(&response)
-	c.Assert(response, jsonEquals, []interface{}{
-		map[string]interface{}{"title": "goof", "name": "bob", "id": 0, "it": 0},
-		map[string]interface{}{"title": "lmoe", "name": "joe", "id": 2, "it": 2},
-	})
-}
-
-func (s *RethinkSuite) TestOrderByJoinEq(c *test.C) {
-	type Map map[string]interface{}
-	var err error
-
-	// Ensure table + database exist
-	DBCreate("test").Exec(session)
-	DB("test").TableCreate("test").Exec(session)
-	DB("test").TableCreate("test2").Exec(session)
-	tab := DB("test").Table("test")
-	tab2 := DB("test").Table("test2")
-
-	// insert rows
-	err = tab.Insert(Map{"S": "s1", "T": 2}).Exec(session)
-	err = tab.Insert(Map{"S": "s1", "T": 1}).Exec(session)
-	err = tab.Insert(Map{"S": "s1", "T": 3}).Exec(session)
-	err = tab.Insert(Map{"S": "s2", "T": 3}).Exec(session)
-	c.Assert(err, test.IsNil)
-
-	err = tab2.Insert(Map{"id": "s1", "N": "Rob"}).Exec(session)
-	err = tab2.Insert(Map{"id": "s2", "N": "Zar"}).Exec(session)
-	c.Assert(err, test.IsNil)
-
-	// Test query
-	var response []Map
-	res, err := tab.OrderBy("T").EqJoin("S", tab2).Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.All(&response)
-	c.Assert(err, test.IsNil)
-	c.Check(len(response), test.Equals, 4, test.Commentf("%v", response))
-}
diff --git a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/query_manipulation.go b/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/query_manipulation.go
deleted file mode 100644
index 812c698a9..000000000
--- a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/query_manipulation.go
+++ /dev/null
@@ -1,117 +0,0 @@
-package gorethink
-
-import (
-	p "github.com/dancannon/gorethink/ql2"
-)
-
-// Row returns the currently visited document. Note that Row does not work within
-// subqueries to access nested documents; you should use anonymous functions to
-// access those documents instead. Also note that unlike in other drivers to
-// access a rows fields you should call Field. For example:
-//   r.row("fieldname") should instead be r.Row.Field("fieldname")
-var Row = constructRootTerm("Doc", p.Term_IMPLICIT_VAR, []interface{}{}, map[string]interface{}{})
-
-// Literal replaces an object in a field instead of merging it with an existing
-// object in a merge or update operation.
-func Literal(args ...interface{}) Term {
-	return constructRootTerm("Literal", p.Term_LITERAL, args, map[string]interface{}{})
-}
-
-// Field gets a single field from an object. If called on a sequence, gets that field
-// from every object in the sequence, skipping objects that lack it.
-func (t Term) Field(args ...interface{}) Term {
-	return constructMethodTerm(t, "Field", p.Term_GET_FIELD, args, map[string]interface{}{})
-}
-
-// HasFields tests if an object has all of the specified fields. An object has a field if
-// it has the specified key and that key maps to a non-null value. For instance,
-//  the object `{'a':1,'b':2,'c':null}` has the fields `a` and `b`.
-func (t Term) HasFields(args ...interface{}) Term {
-	return constructMethodTerm(t, "HasFields", p.Term_HAS_FIELDS, args, map[string]interface{}{})
-}
-
-// Pluck plucks out one or more attributes from either an object or a sequence of
-// objects (projection).
-func (t Term) Pluck(args ...interface{}) Term {
-	return constructMethodTerm(t, "Pluck", p.Term_PLUCK, args, map[string]interface{}{})
-}
-
-// Without is the opposite of pluck; takes an object or a sequence of objects, and returns
-// them with the specified paths removed.
-func (t Term) Without(args ...interface{}) Term {
-	return constructMethodTerm(t, "Without", p.Term_WITHOUT, args, map[string]interface{}{})
-}
-
-// Merge merges two objects together to construct a new object with properties from both.
-// Gives preference to attributes from other when there is a conflict.
-func (t Term) Merge(args ...interface{}) Term {
-	return constructMethodTerm(t, "Merge", p.Term_MERGE, funcWrapArgs(args), map[string]interface{}{})
-}
-
-// Append appends a value to an array.
-func (t Term) Append(args ...interface{}) Term {
-	return constructMethodTerm(t, "Append", p.Term_APPEND, args, map[string]interface{}{})
-}
-
-// Prepend prepends a value to an array.
-func (t Term) Prepend(args ...interface{}) Term {
-	return constructMethodTerm(t, "Prepend", p.Term_PREPEND, args, map[string]interface{}{})
-}
-
-// Difference removes the elements of one array from another array.
-func (t Term) Difference(args ...interface{}) Term {
-	return constructMethodTerm(t, "Difference", p.Term_DIFFERENCE, args, map[string]interface{}{})
-}
-
-// SetInsert adds a value to an array and return it as a set (an array with distinct values).
-func (t Term) SetInsert(args ...interface{}) Term {
-	return constructMethodTerm(t, "SetInsert", p.Term_SET_INSERT, args, map[string]interface{}{})
-}
-
-// SetUnion adds several values to an array and return it as a set (an array with
-// distinct values).
-func (t Term) SetUnion(args ...interface{}) Term {
-	return constructMethodTerm(t, "SetUnion", p.Term_SET_UNION, args, map[string]interface{}{})
-}
-
-// SetIntersection calculates the intersection of two arrays returning values that
-// occur in both of them as a set (an array with distinct values).
-func (t Term) SetIntersection(args ...interface{}) Term {
-	return constructMethodTerm(t, "SetIntersection", p.Term_SET_INTERSECTION, args, map[string]interface{}{})
-}
-
-// SetDifference removes the elements of one array from another and return them as a set (an
-// array with distinct values).
-func (t Term) SetDifference(args ...interface{}) Term {
-	return constructMethodTerm(t, "SetDifference", p.Term_SET_DIFFERENCE, args, map[string]interface{}{})
-}
-
-// InsertAt inserts a value in to an array at a given index. Returns the modified array.
-func (t Term) InsertAt(args ...interface{}) Term {
-	return constructMethodTerm(t, "InsertAt", p.Term_INSERT_AT, args, map[string]interface{}{})
-}
-
-// SpliceAt inserts several values in to an array at a given index. Returns the modified array.
-func (t Term) SpliceAt(args ...interface{}) Term {
-	return constructMethodTerm(t, "SpliceAt", p.Term_SPLICE_AT, args, map[string]interface{}{})
-}
-
-// DeleteAt removes an element from an array at a given index. Returns the modified array.
-func (t Term) DeleteAt(args ...interface{}) Term {
-	return constructMethodTerm(t, "DeleteAt", p.Term_DELETE_AT, args, map[string]interface{}{})
-}
-
-// ChangeAt changes a value in an array at a given index. Returns the modified array.
-func (t Term) ChangeAt(args ...interface{}) Term {
-	return constructMethodTerm(t, "ChangeAt", p.Term_CHANGE_AT, args, map[string]interface{}{})
-}
-
-// Keys returns an array containing all of the object's keys.
-func (t Term) Keys(args ...interface{}) Term {
-	return constructMethodTerm(t, "Keys", p.Term_KEYS, args, map[string]interface{}{})
-}
-
-// Object creates an object from a list of key-value pairs, where the keys must be strings.
-func Object(args ...interface{}) Term {
-	return constructRootTerm("Object", p.Term_OBJECT, args, map[string]interface{}{})
-}
diff --git a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/query_manipulation_test.go b/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/query_manipulation_test.go
deleted file mode 100644
index 5f6689aaa..000000000
--- a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/query_manipulation_test.go
+++ /dev/null
@@ -1,318 +0,0 @@
-package gorethink
-
-import (
-	test "gopkg.in/check.v1"
-)
-
-func (s *RethinkSuite) TestManipulationDocField(c *test.C) {
-	query := Expr(map[string]interface{}{"a": 1}).Do(Row.Field("a"))
-
-	var response int
-	res, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.One(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response, test.Equals, 1)
-}
-
-func (s *RethinkSuite) TestManipulationPluck(c *test.C) {
-	query := Expr(map[string]interface{}{"a": 1, "b": 2, "c": 3}).Pluck("a", "c")
-
-	var response map[string]interface{}
-	res, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.One(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response, jsonEquals, map[string]interface{}{"a": 1, "c": 3})
-}
-
-func (s *RethinkSuite) TestManipulationWithout(c *test.C) {
-	query := Expr(map[string]interface{}{"a": 1, "b": 2, "c": 3}).Pluck("a", "c")
-
-	var response map[string]interface{}
-	res, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.One(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response, jsonEquals, map[string]interface{}{"a": 1, "c": 3})
-}
-
-func (s *RethinkSuite) TestManipulationMerge(c *test.C) {
-	query := Expr(map[string]interface{}{"a": 1, "c": 3}).Merge(map[string]interface{}{"b": 2})
-
-	var response map[string]interface{}
-	res, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.One(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response, jsonEquals, map[string]interface{}{"a": 1, "b": 2, "c": 3})
-}
-
-func (s *RethinkSuite) TestManipulationMergeLiteral(c *test.C) {
-	query := Expr(map[string]interface{}{
-		"a": map[string]interface{}{
-			"aa": map[string]interface{}{
-				"aaa": 1,
-				"aab": 2,
-			},
-			"ab": map[string]interface{}{
-				"aba": 3,
-				"abb": 4,
-			},
-		},
-	}).Merge(map[string]interface{}{"a": map[string]interface{}{"ab": Literal()}})
-
-	var response map[string]interface{}
-	res, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.One(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response, jsonEquals, map[string]interface{}{"a": map[string]interface{}{"aa": map[string]interface{}{"aab": 2, "aaa": 1}}})
-}
-
-func (s *RethinkSuite) TestManipulationAppend(c *test.C) {
-	query := Expr([]interface{}{1, 2, 3}).Append(4).Append(5)
-
-	var response []interface{}
-	res, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.All(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response, jsonEquals, []interface{}{1, 2, 3, 4, 5})
-}
-
-func (s *RethinkSuite) TestManipulationPrepend(c *test.C) {
-	query := Expr([]interface{}{3, 4, 5}).Prepend(2).Prepend(1)
-
-	var response []interface{}
-	res, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.All(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response, jsonEquals, []interface{}{1, 2, 3, 4, 5})
-}
-
-func (s *RethinkSuite) TestManipulationDifference(c *test.C) {
-	query := Expr([]interface{}{3, 4, 5}).Difference([]interface{}{3, 4})
-
-	var response []interface{}
-	res, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.All(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response, jsonEquals, []interface{}{5})
-}
-
-func (s *RethinkSuite) TestManipulationSetInsert(c *test.C) {
-	query := Expr([]interface{}{1, 2, 3}).SetInsert(3).SetInsert(4)
-
-	var response []interface{}
-	res, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.All(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response, jsonEquals, []interface{}{1, 2, 3, 4})
-}
-
-func (s *RethinkSuite) TestManipulationSetUnion(c *test.C) {
-	query := Expr([]interface{}{1, 2, 3}).SetUnion([]interface{}{3, 4})
-
-	var response []interface{}
-	res, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.All(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response, jsonEquals, []interface{}{1, 2, 3, 4})
-}
-
-func (s *RethinkSuite) TestManipulationSetIntersection(c *test.C) {
-	query := Expr([]interface{}{1, 2, 3}).SetIntersection([]interface{}{2, 3, 3, 4})
-
-	var response []interface{}
-	res, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.All(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response, jsonEquals, []interface{}{2, 3})
-}
-
-func (s *RethinkSuite) TestManipulationSetDifference(c *test.C) {
-	query := Expr([]interface{}{1, 2, 3}).SetDifference([]interface{}{2, 3, 4, 4})
-
-	var response []interface{}
-	res, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.All(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response, jsonEquals, []interface{}{1})
-}
-
-func (s *RethinkSuite) TestManipulationHasFieldsTrue(c *test.C) {
-	query := Expr(map[string]interface{}{"a": 1}).HasFields("a")
-
-	var response bool
-	r, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = r.One(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response, test.Equals, true)
-}
-
-func (s *RethinkSuite) TestManipulationHasFieldsNested(c *test.C) {
-	query := Expr(map[string]interface{}{"a": map[string]interface{}{"b": 1}}).HasFields(map[string]interface{}{"a": map[string]interface{}{"b": true}})
-
-	var response bool
-	res, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.One(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response, test.Equals, true)
-}
-
-func (s *RethinkSuite) TestManipulationHasFieldsNestedShort(c *test.C) {
-	query := Expr(map[string]interface{}{"a": map[string]interface{}{"b": 1}}).HasFields(map[string]interface{}{"a": "b"})
-
-	var response bool
-	res, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.One(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response, test.Equals, true)
-}
-
-func (s *RethinkSuite) TestManipulationHasFieldsFalse(c *test.C) {
-	query := Expr(map[string]interface{}{"a": 1}).HasFields("b")
-
-	var response bool
-	res, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.One(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response, test.Equals, false)
-}
-
-func (s *RethinkSuite) TestManipulationInsertAt(c *test.C) {
-	query := Expr([]interface{}{1, 2, 3}).InsertAt(1, 1.5)
-
-	var response []interface{}
-	res, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.All(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response, jsonEquals, []interface{}{1, 1.5, 2, 3})
-}
-
-func (s *RethinkSuite) TestManipulationSpliceAt(c *test.C) {
-	query := Expr([]interface{}{1, 2, 3}).SpliceAt(1, []interface{}{1.25, 1.5, 1.75})
-
-	var response []interface{}
-	res, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.All(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response, jsonEquals, []interface{}{1, 1.25, 1.5, 1.75, 2, 3})
-}
-
-func (s *RethinkSuite) TestManipulationDeleteAt(c *test.C) {
-	query := Expr([]interface{}{1, 2, 3}).DeleteAt(1)
-
-	var response []interface{}
-	res, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.All(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response, jsonEquals, []interface{}{1, 3})
-}
-
-func (s *RethinkSuite) TestManipulationDeleteAtRange(c *test.C) {
-	query := Expr([]interface{}{1, 2, 3, 4}).DeleteAt(1, 3)
-
-	var response []interface{}
-	res, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.All(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response, jsonEquals, []interface{}{1, 4})
-}
-
-func (s *RethinkSuite) TestManipulationChangeAt(c *test.C) {
-	query := Expr([]interface{}{1, 5, 3, 4}).ChangeAt(1, 2)
-
-	var response []interface{}
-	res, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.All(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response, jsonEquals, []interface{}{1, 2, 3, 4})
-}
-
-func (s *RethinkSuite) TestManipulationKeys(c *test.C) {
-	query := Expr(map[string]interface{}{"a": 1, "b": 2, "c": 3}).Keys()
-
-	var response []interface{}
-	res, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.All(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response, jsonEquals, []interface{}{"a", "b", "c"})
-}
-
-func (s *RethinkSuite) TestManipulationObject(c *test.C) {
-	query := Object("a", 1, "b", 2)
-
-	var response interface{}
-	res, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.One(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response, jsonEquals, map[string]interface{}{
-		"a": 1,
-		"b": 2,
-	})
-}
diff --git a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/query_math.go b/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/query_math.go
deleted file mode 100644
index 564a5f907..000000000
--- a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/query_math.go
+++ /dev/null
@@ -1,186 +0,0 @@
-package gorethink
-
-import (
-	p "github.com/dancannon/gorethink/ql2"
-)
-
-var (
-	// MinVal represents the smallest possible value RethinkDB can store
-	MinVal = constructRootTerm("MinVal", p.Term_MINVAL, []interface{}{}, map[string]interface{}{})
-	// MaxVal represents the smallest possible value RethinkDB can store
-	MaxVal = constructRootTerm("MaxVal", p.Term_MAXVAL, []interface{}{}, map[string]interface{}{})
-)
-
-// Add sums two numbers or concatenates two arrays.
-func (t Term) Add(args ...interface{}) Term {
-	return constructMethodTerm(t, "Add", p.Term_ADD, args, map[string]interface{}{})
-}
-
-// Add sums two numbers or concatenates two arrays.
-func Add(args ...interface{}) Term {
-	return constructRootTerm("Add", p.Term_ADD, args, map[string]interface{}{})
-}
-
-// Sub subtracts two numbers.
-func (t Term) Sub(args ...interface{}) Term {
-	return constructMethodTerm(t, "Sub", p.Term_SUB, args, map[string]interface{}{})
-}
-
-// Sub subtracts two numbers.
-func Sub(args ...interface{}) Term {
-	return constructRootTerm("Sub", p.Term_SUB, args, map[string]interface{}{})
-}
-
-// Mul multiplies two numbers.
-func (t Term) Mul(args ...interface{}) Term {
-	return constructMethodTerm(t, "Mul", p.Term_MUL, args, map[string]interface{}{})
-}
-
-// Mul multiplies two numbers.
-func Mul(args ...interface{}) Term {
-	return constructRootTerm("Mul", p.Term_MUL, args, map[string]interface{}{})
-}
-
-// Div divides two numbers.
-func (t Term) Div(args ...interface{}) Term {
-	return constructMethodTerm(t, "Div", p.Term_DIV, args, map[string]interface{}{})
-}
-
-// Div divides two numbers.
-func Div(args ...interface{}) Term {
-	return constructRootTerm("Div", p.Term_DIV, args, map[string]interface{}{})
-}
-
-// Mod divides two numbers and returns the remainder.
-func (t Term) Mod(args ...interface{}) Term {
-	return constructMethodTerm(t, "Mod", p.Term_MOD, args, map[string]interface{}{})
-}
-
-// Mod divides two numbers and returns the remainder.
-func Mod(args ...interface{}) Term {
-	return constructRootTerm("Mod", p.Term_MOD, args, map[string]interface{}{})
-}
-
-// And performs a logical and on two values.
-func (t Term) And(args ...interface{}) Term {
-	return constructMethodTerm(t, "And", p.Term_AND, args, map[string]interface{}{})
-}
-
-// And performs a logical and on two values.
-func And(args ...interface{}) Term {
-	return constructRootTerm("And", p.Term_AND, args, map[string]interface{}{})
-}
-
-// Or performs a logical or on two values.
-func (t Term) Or(args ...interface{}) Term {
-	return constructMethodTerm(t, "Or", p.Term_OR, args, map[string]interface{}{})
-}
-
-// Or performs a logical or on two values.
-func Or(args ...interface{}) Term {
-	return constructRootTerm("Or", p.Term_OR, args, map[string]interface{}{})
-}
-
-// Eq returns true if two values are equal.
-func (t Term) Eq(args ...interface{}) Term {
-	return constructMethodTerm(t, "Eq", p.Term_EQ, args, map[string]interface{}{})
-}
-
-// Eq returns true if two values are equal.
-func Eq(args ...interface{}) Term {
-	return constructRootTerm("Eq", p.Term_EQ, args, map[string]interface{}{})
-}
-
-// Ne returns true if two values are not equal.
-func (t Term) Ne(args ...interface{}) Term {
-	return constructMethodTerm(t, "Ne", p.Term_NE, args, map[string]interface{}{})
-}
-
-// Ne returns true if two values are not equal.
-func Ne(args ...interface{}) Term {
-	return constructRootTerm("Ne", p.Term_NE, args, map[string]interface{}{})
-}
-
-// Gt returns true if the first value is greater than the second.
-func (t Term) Gt(args ...interface{}) Term {
-	return constructMethodTerm(t, "Gt", p.Term_GT, args, map[string]interface{}{})
-}
-
-// Gt returns true if the first value is greater than the second.
-func Gt(args ...interface{}) Term {
-	return constructRootTerm("Gt", p.Term_GT, args, map[string]interface{}{})
-}
-
-// Ge returns true if the first value is greater than or equal to the second.
-func (t Term) Ge(args ...interface{}) Term {
-	return constructMethodTerm(t, "Ge", p.Term_GE, args, map[string]interface{}{})
-}
-
-// Ge returns true if the first value is greater than or equal to the second.
-func Ge(args ...interface{}) Term {
-	return constructRootTerm("Ge", p.Term_GE, args, map[string]interface{}{})
-}
-
-// Lt returns true if the first value is less than the second.
-func (t Term) Lt(args ...interface{}) Term {
-	return constructMethodTerm(t, "Lt", p.Term_LT, args, map[string]interface{}{})
-}
-
-// Lt returns true if the first value is less than the second.
-func Lt(args ...interface{}) Term {
-	return constructRootTerm("Lt", p.Term_LT, args, map[string]interface{}{})
-}
-
-// Le returns true if the first value is less than or equal to the second.
-func (t Term) Le(args ...interface{}) Term {
-	return constructMethodTerm(t, "Le", p.Term_LE, args, map[string]interface{}{})
-}
-
-// Le returns true if the first value is less than or equal to the second.
-func Le(args ...interface{}) Term {
-	return constructRootTerm("Le", p.Term_LE, args, map[string]interface{}{})
-}
-
-// Not performs a logical not on a value.
-func (t Term) Not(args ...interface{}) Term {
-	return constructMethodTerm(t, "Not", p.Term_NOT, args, map[string]interface{}{})
-}
-
-// Not performs a logical not on a value.
-func Not(args ...interface{}) Term {
-	return constructRootTerm("Not", p.Term_NOT, args, map[string]interface{}{})
-}
-
-// RandomOpts contains the optional arguments for the Random term.
-type RandomOpts struct {
-	Float interface{} `gorethink:"float,omitempty"`
-}
-
-func (o *RandomOpts) toMap() map[string]interface{} {
-	return optArgsToMap(o)
-}
-
-// Random generates a random number between the given bounds. If no arguments
-// are given, the result will be a floating-point number in the range [0,1).
-//
-// When passing a single argument, r.random(x), the result will be in the
-// range [0,x), and when passing two arguments, r.random(x,y), the range is
-// [x,y). If x and y are equal, an error will occur, unless generating a
-// floating-point number, for which x will be returned.
-//
-// Note: The last argument given will always be the 'open' side of the range,
-// but when generating a floating-point number, the 'open' side may be less
-// than the 'closed' side.
-func (t Term) Random(args ...interface{}) Term {
-	var opts = map[string]interface{}{}
-
-	// Look for options map
-	if len(args) > 0 {
-		if possibleOpts, ok := args[len(args)-1].(RandomOpts); ok {
-			opts = possibleOpts.toMap()
-			args = args[:len(args)-1]
-		}
-	}
-
-	return constructMethodTerm(t, "Random", p.Term_RANDOM, args, opts)
-}
diff --git a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/query_math_test.go b/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/query_math_test.go
deleted file mode 100644
index b2a80b8e5..000000000
--- a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/query_math_test.go
+++ /dev/null
@@ -1,252 +0,0 @@
-package gorethink
-
-import (
-	test "gopkg.in/check.v1"
-)
-
-func (s *RethinkSuite) TestMathAdd(c *test.C) {
-	query := Expr(1).Add(2)
-
-	var response int
-	r, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = r.One(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response, test.Equals, 3)
-}
-
-func (s *RethinkSuite) TestMathSub(c *test.C) {
-	query := Expr(2).Sub(1)
-
-	var response int
-	r, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = r.One(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response, test.Equals, 1)
-}
-
-func (s *RethinkSuite) TestMathSubNegative(c *test.C) {
-	query := Expr(1).Sub(2)
-
-	var response int
-	r, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = r.One(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response, test.Equals, -1)
-}
-
-func (s *RethinkSuite) TestMathMul(c *test.C) {
-	query := Expr(5).Mul(4)
-
-	var response int
-	r, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = r.One(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response, test.Equals, 20)
-}
-
-func (s *RethinkSuite) TestMathDiv(c *test.C) {
-	query := Expr(8).Div(4)
-
-	var response int
-	r, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = r.One(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response, test.Equals, 2)
-}
-
-func (s *RethinkSuite) TestMathMod(c *test.C) {
-	query := Expr(7).Mod(2)
-
-	var response int
-	r, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = r.One(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response, test.Equals, 1)
-}
-
-func (s *RethinkSuite) TestMathEqTrue(c *test.C) {
-	query := Expr(1).Eq(1)
-
-	var response bool
-	r, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = r.One(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response, test.Equals, true)
-}
-
-func (s *RethinkSuite) TestMathEqFalse(c *test.C) {
-	query := Expr(1).Eq(2)
-
-	var response bool
-	r, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = r.One(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response, test.Equals, false)
-}
-
-func (s *RethinkSuite) TestMathEqStringTrue(c *test.C) {
-	query := Expr("test").Eq("test")
-
-	var response bool
-	r, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = r.One(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response, test.Equals, true)
-}
-
-func (s *RethinkSuite) TestCompareLt(c *test.C) {
-	query := Expr(2).Lt(1)
-
-	var response bool
-	r, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = r.One(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response, test.Equals, false)
-}
-
-func (s *RethinkSuite) TestCompareLe(c *test.C) {
-	query := Expr(2).Le(1)
-
-	var response bool
-	r, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = r.One(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response, test.Equals, false)
-}
-
-func (s *RethinkSuite) TestCompareLeEqual(c *test.C) {
-	query := Expr(2).Le(2)
-
-	var response bool
-	r, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = r.One(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response, test.Equals, true)
-}
-
-func (s *RethinkSuite) TestCompareGt(c *test.C) {
-	query := Expr(2).Gt(1)
-
-	var response bool
-	r, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = r.One(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response, test.Equals, true)
-}
-
-func (s *RethinkSuite) TestCompareGe(c *test.C) {
-	query := Expr(2).Ge(1)
-
-	var response bool
-	r, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = r.One(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response, test.Equals, true)
-}
-
-func (s *RethinkSuite) TestCompareGeEqual(c *test.C) {
-	query := Expr(2).Le(2)
-
-	var response bool
-	r, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = r.One(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response, test.Equals, true)
-}
-
-func (s *RethinkSuite) TestBoolNotTrue(c *test.C) {
-	query := Expr(true).Not()
-
-	var response bool
-	r, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = r.One(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response, test.Equals, false)
-}
-
-func (s *RethinkSuite) TestBoolAnd(c *test.C) {
-	query := Expr(true).And(true)
-
-	var response bool
-	r, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = r.One(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response, test.Equals, true)
-}
-
-func (s *RethinkSuite) TestBoolOr(c *test.C) {
-	query := Expr(true).Or(false)
-
-	var response bool
-	r, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = r.One(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response, test.Equals, true)
-}
-
-func (s *RethinkSuite) TestBoolDeMorgan(c *test.C) {
-	query := Expr(true).And(false).Eq(Expr(true).Not().Or(Expr(false).Not()).Not())
-
-	var response bool
-	r, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = r.One(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response, test.Equals, true)
-}
diff --git a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/query_select.go b/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/query_select.go
deleted file mode 100644
index 6dbaba560..000000000
--- a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/query_select.go
+++ /dev/null
@@ -1,128 +0,0 @@
-package gorethink
-
-import (
-	p "github.com/dancannon/gorethink/ql2"
-)
-
-// DB references a database.
-func DB(args ...interface{}) Term {
-	return constructRootTerm("DB", p.Term_DB, args, map[string]interface{}{})
-}
-
-// TableOpts contains the optional arguments for the Table term
-type TableOpts struct {
-	UseOutdated      interface{} `gorethink:"use_outdated,omitempty"`
-	IdentifierFormat interface{} `gorethink:"identifier_format,omitempty"`
-}
-
-func (o *TableOpts) toMap() map[string]interface{} {
-	return optArgsToMap(o)
-}
-
-// Table selects all documents in a table. This command can be chained with
-// other commands to do further processing on the data.
-//
-// There are two optional arguments.
-//   - useOutdated: if true, this allows potentially out-of-date data to be
-//     returned, with potentially faster reads. It also allows you to perform reads
-//     from a secondary replica if a primary has failed. Default false.
-//   - identifierFormat: possible values are name and uuid, with a default of name.
-//     If set to uuid, then system tables will refer to servers, databases and tables
-//     by UUID rather than name. (This only has an effect when used with system tables.)
-func Table(name interface{}, optArgs ...TableOpts) Term {
-	opts := map[string]interface{}{}
-	if len(optArgs) >= 1 {
-		opts = optArgs[0].toMap()
-	}
-	return constructRootTerm("Table", p.Term_TABLE, []interface{}{name}, opts)
-}
-
-// Table selects all documents in a table. This command can be chained with
-// other commands to do further processing on the data.
-//
-// There are two optional arguments.
-//   - useOutdated: if true, this allows potentially out-of-date data to be
-//     returned, with potentially faster reads. It also allows you to perform reads
-//     from a secondary replica if a primary has failed. Default false.
-//   - identifierFormat: possible values are name and uuid, with a default of name.
-//     If set to uuid, then system tables will refer to servers, databases and tables
-//     by UUID rather than name. (This only has an effect when used with system tables.)
-func (t Term) Table(name interface{}, optArgs ...TableOpts) Term {
-	opts := map[string]interface{}{}
-	if len(optArgs) >= 1 {
-		opts = optArgs[0].toMap()
-	}
-	return constructMethodTerm(t, "Table", p.Term_TABLE, []interface{}{name}, opts)
-}
-
-// Get gets a document by primary key. If nothing was found, RethinkDB will return a nil value.
-func (t Term) Get(args ...interface{}) Term {
-	return constructMethodTerm(t, "Get", p.Term_GET, args, map[string]interface{}{})
-}
-
-// GetAll gets all documents where the given value matches the value of the primary index.
-func (t Term) GetAll(keys ...interface{}) Term {
-	return constructMethodTerm(t, "GetAll", p.Term_GET_ALL, keys, map[string]interface{}{})
-}
-
-// GetAllByIndex gets all documents where the given value matches the value of
-// the requested index.
-func (t Term) GetAllByIndex(index interface{}, keys ...interface{}) Term {
-	return constructMethodTerm(t, "GetAll", p.Term_GET_ALL, keys, map[string]interface{}{"index": index})
-}
-
-// BetweenOpts contains the optional arguments for the Between term
-type BetweenOpts struct {
-	Index      interface{} `gorethink:"index,omitempty"`
-	LeftBound  interface{} `gorethink:"left_bound,omitempty"`
-	RightBound interface{} `gorethink:"right_bound,omitempty"`
-}
-
-func (o *BetweenOpts) toMap() map[string]interface{} {
-	return optArgsToMap(o)
-}
-
-// Between gets all documents between two keys. Accepts three optional arguments:
-// index, leftBound, and rightBound. If index is set to the name of a secondary
-// index, between will return all documents where that index’s value is in the
-// specified range (it uses the primary key by default). leftBound or rightBound
-// may be set to open or closed to indicate whether or not to include that endpoint
-// of the range (by default, leftBound is closed and rightBound is open).
-//
-// You may also use the special constants r.minval and r.maxval for boundaries,
-// which represent “less than any index key” and “more than any index key”
-// respectively. For instance, if you use r.minval as the lower key, then between
-// will return all documents whose primary keys (or indexes) are less than the
-// specified upper key.
-func (t Term) Between(lowerKey, upperKey interface{}, optArgs ...BetweenOpts) Term {
-	opts := map[string]interface{}{}
-	if len(optArgs) >= 1 {
-		opts = optArgs[0].toMap()
-	}
-	return constructMethodTerm(t, "Between", p.Term_BETWEEN, []interface{}{lowerKey, upperKey}, opts)
-}
-
-// FilterOpts contains the optional arguments for the Filter term
-type FilterOpts struct {
-	Default interface{} `gorethink:"default,omitempty"`
-}
-
-func (o *FilterOpts) toMap() map[string]interface{} {
-	return optArgsToMap(o)
-}
-
-// Filter gets all the documents for which the given predicate is true.
-//
-// Filter can be called on a sequence, selection, or a field containing an array
-// of elements. The return type is the same as the type on which the function was
-// called on. The body of every filter is wrapped in an implicit `.default(false)`,
-// and the default value can be changed by passing the optional argument `default`.
-// Setting this optional argument to `r.error()` will cause any non-existence
-// errors to abort the filter.
-func (t Term) Filter(f interface{}, optArgs ...FilterOpts) Term {
-	opts := map[string]interface{}{}
-	if len(optArgs) >= 1 {
-		opts = optArgs[0].toMap()
-	}
-	return constructMethodTerm(t, "Filter", p.Term_FILTER, []interface{}{funcWrap(f)}, opts)
-}
diff --git a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/query_select_test.go b/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/query_select_test.go
deleted file mode 100644
index 963835ae9..000000000
--- a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/query_select_test.go
+++ /dev/null
@@ -1,492 +0,0 @@
-package gorethink
-
-import (
-	"fmt"
-	"math/rand"
-	"testing"
-	"time"
-
-	test "gopkg.in/check.v1"
-)
-
-func (s *RethinkSuite) TestSelectGet(c *test.C) {
-	// Ensure table + database exist
-	DBCreate("test").Exec(session)
-	DB("test").TableCreate("Table1").Exec(session)
-
-	// Insert rows
-	DB("test").Table("Table1").Insert(objList).Exec(session)
-
-	// Test query
-	var response interface{}
-	query := DB("test").Table("Table1").Get(6)
-	res, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.One(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response, jsonEquals, map[string]interface{}{"id": 6, "g1": 1, "g2": 1, "num": 15})
-
-	res.Close()
-}
-
-func (s *RethinkSuite) TestSelectGetAll(c *test.C) {
-	// Ensure table + database exist
-	DBCreate("test").Exec(session)
-	DB("test").TableCreate("Table1").Exec(session)
-	DB("test").Table("Table1").IndexCreate("num").Exec(session)
-
-	// Insert rows
-	DB("test").Table("Table1").Insert(objList).Exec(session)
-
-	// Test query
-	var response []interface{}
-	query := DB("test").Table("Table1").GetAll(6).OrderBy("id")
-	res, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.All(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response, jsonEquals, []interface{}{
-		map[string]interface{}{"num": 15, "id": 6, "g2": 1, "g1": 1},
-	})
-
-	res.Close()
-}
-
-func (s *RethinkSuite) TestSelectGetAllMultiple(c *test.C) {
-	// Ensure table + database exist
-	DBCreate("test").Exec(session)
-	DB("test").TableCreate("Table1").Exec(session)
-	DB("test").Table("Table1").IndexCreate("num").Exec(session)
-
-	// Insert rows
-	DB("test").Table("Table1").Insert(objList).Exec(session)
-
-	// Test query
-	var response []interface{}
-	query := DB("test").Table("Table1").GetAll(1, 2, 3).OrderBy("id")
-	res, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.All(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response, jsonEquals, []interface{}{
-		map[string]interface{}{"num": 0, "id": 1, "g2": 1, "g1": 1},
-		map[string]interface{}{"num": 5, "id": 2, "g2": 2, "g1": 2},
-		map[string]interface{}{"num": 10, "id": 3, "g2": 2, "g1": 3},
-	})
-
-	res.Close()
-}
-
-func (s *RethinkSuite) TestSelectGetAllByIndex(c *test.C) {
-	// Ensure table + database exist
-	DBCreate("test").Exec(session)
-	DB("test").TableCreate("Table1").Exec(session)
-	DB("test").Table("Table1").IndexCreate("num").Exec(session)
-
-	// Insert rows
-	DB("test").Table("Table1").Insert(objList).Exec(session)
-
-	// Test query
-	var response interface{}
-	query := DB("test").Table("Table1").GetAllByIndex("num", 15).OrderBy("id")
-	res, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.One(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response, jsonEquals, map[string]interface{}{"id": 6, "g1": 1, "g2": 1, "num": 15})
-
-	res.Close()
-}
-
-func (s *RethinkSuite) TestSelectGetAllMultipleByIndex(c *test.C) {
-	// Ensure table + database exist
-	DBCreate("test").Exec(session)
-	DB("test").TableCreate("Table2").Exec(session)
-	DB("test").Table("Table2").IndexCreate("num").Exec(session)
-
-	// Insert rows
-	DB("test").Table("Table2").Insert(objList).Exec(session)
-
-	// Test query
-	var response interface{}
-	query := DB("test").Table("Table2").GetAllByIndex("num", 15).OrderBy("id")
-	res, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.One(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response, jsonEquals, map[string]interface{}{"id": 6, "g1": 1, "g2": 1, "num": 15})
-
-	res.Close()
-}
-
-func (s *RethinkSuite) TestSelectGetAllCompoundIndex(c *test.C) {
-	// Ensure table + database exist
-	DBCreate("test").Exec(session)
-	DB("test").TableDrop("TableCompound").Exec(session)
-	DB("test").TableCreate("TableCompound").Exec(session)
-	write, err := DB("test").Table("TableCompound").IndexCreateFunc("full_name", func(row Term) interface{} {
-		return []interface{}{row.Field("first_name"), row.Field("last_name")}
-	}).RunWrite(session)
-	c.Assert(err, test.IsNil)
-	c.Assert(write.Created, test.Equals, 1)
-
-	// Insert rows
-	DB("test").Table("TableCompound").Insert(nameList).Exec(session)
-
-	// Test query
-	var response interface{}
-	query := DB("test").Table("TableCompound").GetAllByIndex("full_name", []interface{}{"John", "Smith"})
-	res, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.One(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response, jsonEquals, map[string]interface{}{"id": 1, "first_name": "John", "last_name": "Smith", "gender": "M"})
-
-	res.Close()
-}
-
-func (s *RethinkSuite) TestSelectBetween(c *test.C) {
-	// Ensure table + database exist
-	DBCreate("test").Exec(session)
-	DB("test").TableCreate("Table1").Exec(session)
-
-	// Insert rows
-	DB("test").Table("Table1").Insert(objList).Exec(session)
-
-	// Test query
-	var response []interface{}
-	query := DB("test").Table("Table1").Between(1, 3).OrderBy("id")
-	res, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.All(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response, jsonEquals, []interface{}{
-		map[string]interface{}{"num": 0, "id": 1, "g2": 1, "g1": 1},
-		map[string]interface{}{"num": 5, "id": 2, "g2": 2, "g1": 2},
-	})
-
-	res.Close()
-}
-
-func (s *RethinkSuite) TestSelectBetweenWithIndex(c *test.C) {
-	// Ensure table + database exist
-	DBCreate("test").Exec(session)
-	DB("test").TableCreate("Table2").Exec(session)
-	DB("test").Table("Table2").IndexCreate("num").Exec(session)
-
-	// Insert rows
-	DB("test").Table("Table2").Insert(objList).Exec(session)
-
-	// Test query
-	var response []interface{}
-	query := DB("test").Table("Table2").Between(10, 50, BetweenOpts{
-		Index: "num",
-	}).OrderBy("id")
-	res, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.All(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response, jsonEquals, []interface{}{
-		map[string]interface{}{"num": 10, "id": 3, "g2": 2, "g1": 3},
-		map[string]interface{}{"num": 15, "id": 6, "g2": 1, "g1": 1},
-		map[string]interface{}{"num": 25, "id": 9, "g2": 3, "g1": 2},
-	})
-
-	res.Close()
-}
-
-func (s *RethinkSuite) TestSelectBetweenWithOptions(c *test.C) {
-	// Ensure table + database exist
-	DBCreate("test").Exec(session)
-	DB("test").TableCreate("Table2").Exec(session)
-	DB("test").Table("Table2").IndexCreate("num").Exec(session)
-
-	// Insert rows
-	DB("test").Table("Table2").Insert(objList).Exec(session)
-
-	// Test query
-	var response []interface{}
-	query := DB("test").Table("Table2").Between(10, 50, BetweenOpts{
-		Index:      "num",
-		RightBound: "closed",
-	}).OrderBy("id")
-	res, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.All(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response, jsonEquals, []interface{}{
-		map[string]interface{}{"num": 10, "id": 3, "g2": 2, "g1": 3},
-		map[string]interface{}{"num": 15, "id": 6, "g2": 1, "g1": 1},
-		map[string]interface{}{"num": 50, "id": 8, "g2": 2, "g1": 4},
-		map[string]interface{}{"num": 25, "id": 9, "g2": 3, "g1": 2},
-	})
-
-	res.Close()
-}
-
-func (s *RethinkSuite) TestSelectFilterImplicit(c *test.C) {
-	// Ensure table + database exist
-	DBCreate("test").Exec(session)
-	DB("test").TableCreate("Table1").Exec(session)
-
-	// Insert rows
-	DB("test").Table("Table1").Insert(objList).Exec(session)
-
-	// Test query
-	var response []interface{}
-	query := DB("test").Table("Table1").Filter(Row.Field("num").Ge(50)).OrderBy("id")
-	res, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.All(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response, jsonEquals, []interface{}{
-		map[string]interface{}{"num": 100, "id": 5, "g2": 3, "g1": 2},
-		map[string]interface{}{"num": 50, "id": 8, "g2": 2, "g1": 4},
-	})
-
-	res.Close()
-}
-
-func (s *RethinkSuite) TestSelectFilterFunc(c *test.C) {
-	// Ensure table + database exist
-	DBCreate("test").Exec(session)
-	DB("test").TableCreate("Table1").Exec(session)
-
-	// Insert rows
-	DB("test").Table("Table1").Insert(objList).Exec(session)
-
-	// Test query
-	var response []interface{}
-	query := DB("test").Table("Table1").Filter(func(row Term) Term {
-		return row.Field("num").Ge(50)
-	}).OrderBy("id")
-	res, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.All(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response, jsonEquals, []interface{}{
-		map[string]interface{}{"num": 100, "id": 5, "g2": 3, "g1": 2},
-		map[string]interface{}{"num": 50, "id": 8, "g2": 2, "g1": 4},
-	})
-
-	res.Close()
-}
-
-func (s *RethinkSuite) TestSelectManyRows(c *test.C) {
-	// Ensure table + database exist
-	DBCreate("test").RunWrite(session)
-	DB("test").TableCreate("TestMany").RunWrite(session)
-	DB("test").Table("TestMany").Delete().RunWrite(session)
-
-	// Insert rows
-	for i := 0; i < 100; i++ {
-		data := []interface{}{}
-
-		for j := 0; j < 100; j++ {
-			data = append(data, map[string]interface{}{
-				"i": i,
-				"j": j,
-			})
-		}
-
-		DB("test").Table("TestMany").Insert(data).RunWrite(session)
-	}
-
-	// Test query
-	res, err := DB("test").Table("TestMany").Run(session, RunOpts{
-		MaxBatchRows: 1,
-	})
-	c.Assert(err, test.IsNil)
-
-	var n int
-	var response map[string]interface{}
-	for res.Next(&response) {
-		n++
-	}
-
-	c.Assert(res.Err(), test.IsNil)
-	c.Assert(n, test.Equals, 10000)
-
-	res.Close()
-}
-
-func (s *RethinkSuite) TestConcurrentSelectManyWorkers(c *test.C) {
-	if testing.Short() {
-		c.Skip("Skipping long test")
-	}
-
-	rand.Seed(time.Now().UnixNano())
-	sess, _ := Connect(ConnectOpts{
-		Address: url,
-		AuthKey: authKey,
-		MaxOpen: 200,
-		MaxIdle: 200,
-	})
-
-	// Ensure table + database exist
-	DBCreate("test").RunWrite(sess)
-	DB("test").TableDrop("TestConcurrent").RunWrite(sess)
-	DB("test").TableCreate("TestConcurrent").RunWrite(sess)
-	DB("test").TableDrop("TestConcurrent2").RunWrite(sess)
-	DB("test").TableCreate("TestConcurrent2").RunWrite(sess)
-
-	// Insert rows
-	for j := 0; j < 200; j++ {
-		DB("test").Table("TestConcurrent").Insert(map[string]interface{}{
-			"id": j,
-			"i":  j,
-		}).Exec(sess)
-		DB("test").Table("TestConcurrent2").Insert(map[string]interface{}{
-			"j": j,
-			"k": j * 2,
-		}).Exec(sess)
-	}
-
-	// Test queries concurrently
-	numQueries := 1000
-	numWorkers := 10
-	queryChan := make(chan int)
-	doneChan := make(chan error)
-
-	// Start workers
-	for i := 0; i < numWorkers; i++ {
-		go func() {
-			for _ = range queryChan {
-				res, err := DB("test").Table("TestConcurrent2").EqJoin("j", DB("test").Table("TestConcurrent")).Zip().Run(sess)
-				if err != nil {
-					doneChan <- err
-					return
-				}
-
-				var response []map[string]interface{}
-				err = res.All(&response)
-				if err != nil {
-					doneChan <- err
-					return
-				}
-				if err := res.Close(); err != nil {
-					doneChan <- err
-					return
-				}
-
-				if len(response) != 200 {
-					doneChan <- fmt.Errorf("expected response length 200, received %d", len(response))
-					return
-				}
-
-				res, err = DB("test").Table("TestConcurrent").Get(response[rand.Intn(len(response))]["id"]).Run(sess)
-				if err != nil {
-					doneChan <- err
-					return
-				}
-
-				err = res.All(&response)
-				if err != nil {
-					doneChan <- err
-					return
-				}
-				if err := res.Close(); err != nil {
-					doneChan <- err
-					return
-				}
-
-				if len(response) != 1 {
-					doneChan <- fmt.Errorf("expected response length 1, received %d", len(response))
-					return
-				}
-
-				doneChan <- nil
-			}
-		}()
-	}
-
-	go func() {
-		for i := 0; i < numQueries; i++ {
-			queryChan <- i
-		}
-	}()
-
-	for i := 0; i < numQueries; i++ {
-		ret := <-doneChan
-		if ret != nil {
-			c.Fatalf("non-nil error returned (%s)", ret)
-		}
-	}
-}
-
-func (s *RethinkSuite) TestConcurrentSelectManyRows(c *test.C) {
-	if testing.Short() {
-		c.Skip("Skipping long test")
-	}
-
-	// Ensure table + database exist
-	DBCreate("test").RunWrite(session)
-	DB("test").TableCreate("TestMany").RunWrite(session)
-	DB("test").Table("TestMany").Delete().RunWrite(session)
-
-	// Insert rows
-	for i := 0; i < 100; i++ {
-		DB("test").Table("TestMany").Insert(map[string]interface{}{
-			"i": i,
-		}).Exec(session)
-	}
-
-	// Test queries concurrently
-	attempts := 10
-	waitChannel := make(chan error, attempts)
-
-	for i := 0; i < attempts; i++ {
-		go func(i int, c chan error) {
-			res, err := DB("test").Table("TestMany").Run(session)
-			if err != nil {
-				c <- err
-				return
-			}
-
-			var response []map[string]interface{}
-			err = res.All(&response)
-			if err != nil {
-				c <- err
-				return
-			}
-
-			if len(response) != 100 {
-				c <- fmt.Errorf("expected response length 100, received %d", len(response))
-				return
-			}
-
-			res.Close()
-
-			c <- nil
-		}(i, waitChannel)
-	}
-
-	for i := 0; i < attempts; i++ {
-		ret := <-waitChannel
-		if ret != nil {
-			c.Fatalf("non-nil error returned (%s)", ret)
-		}
-	}
-}
diff --git a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/query_string.go b/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/query_string.go
deleted file mode 100644
index 9227137c8..000000000
--- a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/query_string.go
+++ /dev/null
@@ -1,44 +0,0 @@
-package gorethink
-
-import (
-	p "github.com/dancannon/gorethink/ql2"
-)
-
-// Match matches against a regular expression. If no match is found, returns
-// null. If there is a match then an object with the following fields is
-// returned:
-//   str: The matched string
-//   start: The matched string’s start
-//   end: The matched string’s end
-//   groups: The capture groups defined with parentheses
-//
-// Accepts RE2 syntax (https://code.google.com/p/re2/wiki/Syntax). You can
-// enable case-insensitive matching by prefixing the regular expression with
-// (?i). See the linked RE2 documentation for more flags.
-//
-// The match command does not support backreferences.
-func (t Term) Match(args ...interface{}) Term {
-	return constructMethodTerm(t, "Match", p.Term_MATCH, args, map[string]interface{}{})
-}
-
-// Split splits a string into substrings. Splits on whitespace when called with no arguments.
-// When called with a separator, splits on that separator. When called with a separator
-// and a maximum number of splits, splits on that separator at most max_splits times.
-// (Can be called with null as the separator if you want to split on whitespace while still
-// specifying max_splits.)
-//
-// Mimics the behavior of Python's string.split in edge cases, except for splitting on the
-// empty string, which instead produces an array of single-character strings.
-func (t Term) Split(args ...interface{}) Term {
-	return constructMethodTerm(t, "Split", p.Term_SPLIT, funcWrapArgs(args), map[string]interface{}{})
-}
-
-// Upcase upper-cases a string.
-func (t Term) Upcase(args ...interface{}) Term {
-	return constructMethodTerm(t, "Upcase", p.Term_UPCASE, args, map[string]interface{}{})
-}
-
-// Downcase lower-cases a string.
-func (t Term) Downcase(args ...interface{}) Term {
-	return constructMethodTerm(t, "Downcase", p.Term_DOWNCASE, args, map[string]interface{}{})
-}
diff --git a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/query_string_test.go b/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/query_string_test.go
deleted file mode 100644
index d493981a8..000000000
--- a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/query_string_test.go
+++ /dev/null
@@ -1,91 +0,0 @@
-package gorethink
-
-import (
-	test "gopkg.in/check.v1"
-)
-
-func (s *RethinkSuite) TestStringMatchSuccess(c *test.C) {
-	query := Expr("id:0,name:mlucy,foo:bar").Match("name:(\\w+)").Field("groups").Nth(0).Field("str")
-
-	var response string
-	res, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.One(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response, test.Equals, "mlucy")
-}
-
-func (s *RethinkSuite) TestStringMatchFail(c *test.C) {
-	query := Expr("id:0,foo:bar").Match("name:(\\w+)")
-
-	res, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-	c.Assert(res.IsNil(), test.Equals, true)
-}
-
-func (s *RethinkSuite) TestStringSplit(c *test.C) {
-	query := Expr("a,b,c").Split(",")
-
-	var response []string
-	res, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.All(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response, test.DeepEquals, []string{"a", "b", "c"})
-}
-
-func (s *RethinkSuite) TestStringSplitMax(c *test.C) {
-	query := Expr("a,b,c").Split(",", 1)
-
-	var response []string
-	res, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.All(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response, test.DeepEquals, []string{"a", "b,c"})
-}
-
-func (s *RethinkSuite) TestStringSplitWhitespace(c *test.C) {
-	query := Expr("a b c").Split()
-
-	var response []string
-	res, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.All(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response, test.DeepEquals, []string{"a", "b", "c"})
-}
-
-func (s *RethinkSuite) TestStringMatchUpcase(c *test.C) {
-	query := Expr("tESt").Upcase()
-
-	var response string
-	res, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.One(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response, test.Equals, "TEST")
-}
-
-func (s *RethinkSuite) TestStringMatchDowncase(c *test.C) {
-	query := Expr("tESt").Downcase()
-
-	var response string
-	res, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.One(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response, test.Equals, "test")
-}
diff --git a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/query_table.go b/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/query_table.go
deleted file mode 100644
index ccec4d59d..000000000
--- a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/query_table.go
+++ /dev/null
@@ -1,142 +0,0 @@
-package gorethink
-
-import (
-	p "github.com/dancannon/gorethink/ql2"
-)
-
-// TableCreateOpts contains the optional arguments for the TableCreate term
-type TableCreateOpts struct {
-	PrimaryKey        interface{} `gorethink:"primary_key,omitempty"`
-	Durability        interface{} `gorethink:"durability,omitempty"`
-	Shards            interface{} `gorethink:"shards,omitempty"`
-	DataCenter        interface{} `gorethink:"replicas,omitempty"`
-	PrimaryReplicaTag interface{} `gorethink:"primary_replica_tag,omitempty"`
-}
-
-func (o *TableCreateOpts) toMap() map[string]interface{} {
-	return optArgsToMap(o)
-}
-
-// TableCreate creates a table. A RethinkDB table is a collection of JSON
-// documents.
-//
-// Note: Only alphanumeric characters and underscores are valid for the table name.
-func (t Term) TableCreate(name interface{}, optArgs ...TableCreateOpts) Term {
-	opts := map[string]interface{}{}
-	if len(optArgs) >= 1 {
-		opts = optArgs[0].toMap()
-	}
-	return constructMethodTerm(t, "TableCreate", p.Term_TABLE_CREATE, []interface{}{name}, opts)
-}
-
-// TableDrop deletes a table. The table and all its data will be deleted.
-func (t Term) TableDrop(args ...interface{}) Term {
-	return constructMethodTerm(t, "TableDrop", p.Term_TABLE_DROP, args, map[string]interface{}{})
-}
-
-// TableList lists all table names in a database.
-func (t Term) TableList(args ...interface{}) Term {
-	return constructMethodTerm(t, "TableList", p.Term_TABLE_LIST, args, map[string]interface{}{})
-}
-
-// IndexCreateOpts contains the optional arguments for the IndexCreate term
-type IndexCreateOpts struct {
-	Multi interface{} `gorethink:"multi,omitempty"`
-	Geo   interface{} `gorethink:"geo,omitempty"`
-}
-
-func (o *IndexCreateOpts) toMap() map[string]interface{} {
-	return optArgsToMap(o)
-}
-
-// IndexCreate creates a new secondary index on a table. Secondary indexes
-// improve the speed of many read queries at the slight cost of increased
-// storage space and decreased write performance.
-//
-// IndexCreate supports the creation of the following types of indexes, to create
-// indexes using arbitrary expressions use IndexCreateFunc.
-//   - Simple indexes based on the value of a single field.
-//   - Compound indexes based on multiple fields.
-//   - Multi indexes based on arrays of values, created when the multi optional argument is true.
-//   - Geospatial indexes based on indexes of geometry objects, created when the geo optional argument is true.
-func (t Term) IndexCreate(name interface{}, optArgs ...IndexCreateOpts) Term {
-	opts := map[string]interface{}{}
-	if len(optArgs) >= 1 {
-		opts = optArgs[0].toMap()
-	}
-	return constructMethodTerm(t, "IndexCreate", p.Term_INDEX_CREATE, []interface{}{name}, opts)
-}
-
-// IndexCreateFunc creates a new secondary index on a table. Secondary indexes
-// improve the speed of many read queries at the slight cost of increased
-// storage space and decreased write performance.
-//
-// The indexFunction can be an anonymous function or a binary representation
-// obtained from the function field of indexStatus.
-func (t Term) IndexCreateFunc(name, indexFunction interface{}, optArgs ...IndexCreateOpts) Term {
-	opts := map[string]interface{}{}
-	if len(optArgs) >= 1 {
-		opts = optArgs[0].toMap()
-	}
-	return constructMethodTerm(t, "IndexCreate", p.Term_INDEX_CREATE, []interface{}{name, funcWrap(indexFunction)}, opts)
-}
-
-// IndexDrop deletes a previously created secondary index of a table.
-func (t Term) IndexDrop(args ...interface{}) Term {
-	return constructMethodTerm(t, "IndexDrop", p.Term_INDEX_DROP, args, map[string]interface{}{})
-}
-
-// IndexList lists all the secondary indexes of a table.
-func (t Term) IndexList(args ...interface{}) Term {
-	return constructMethodTerm(t, "IndexList", p.Term_INDEX_LIST, args, map[string]interface{}{})
-}
-
-// IndexRenameOpts contains the optional arguments for the IndexRename term
-type IndexRenameOpts struct {
-	Overwrite interface{} `gorethink:"overwrite,omitempty"`
-}
-
-func (o *IndexRenameOpts) toMap() map[string]interface{} {
-	return optArgsToMap(o)
-}
-
-// IndexRename renames an existing secondary index on a table.
-func (t Term) IndexRename(oldName, newName interface{}, optArgs ...IndexRenameOpts) Term {
-	opts := map[string]interface{}{}
-	if len(optArgs) >= 1 {
-		opts = optArgs[0].toMap()
-	}
-	return constructMethodTerm(t, "IndexRename", p.Term_INDEX_RENAME, []interface{}{oldName, newName}, opts)
-}
-
-// IndexStatus gets the status of the specified indexes on this table, or the
-// status of all indexes on this table if no indexes are specified.
-func (t Term) IndexStatus(args ...interface{}) Term {
-	return constructMethodTerm(t, "IndexStatus", p.Term_INDEX_STATUS, args, map[string]interface{}{})
-}
-
-// IndexWait waits for the specified indexes on this table to be ready, or for
-// all indexes on this table to be ready if no indexes are specified.
-func (t Term) IndexWait(args ...interface{}) Term {
-	return constructMethodTerm(t, "IndexWait", p.Term_INDEX_WAIT, args, map[string]interface{}{})
-}
-
-// ChangesOpts contains the optional arguments for the Changes term
-type ChangesOpts struct {
-	Squash        interface{} `gorethink:"squash,omitempty"`
-	IncludeStates interface{} `gorethink:"include_states,omitempty"`
-}
-
-// ChangesOpts contains the optional arguments for the Changes term
-func (o *ChangesOpts) toMap() map[string]interface{} {
-	return optArgsToMap(o)
-}
-
-// Changes returns an infinite stream of objects representing changes to a query.
-func (t Term) Changes(optArgs ...ChangesOpts) Term {
-	opts := map[string]interface{}{}
-	if len(optArgs) >= 1 {
-		opts = optArgs[0].toMap()
-	}
-	return constructMethodTerm(t, "Changes", p.Term_CHANGES, []interface{}{}, opts)
-}
diff --git a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/query_table_test.go b/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/query_table_test.go
deleted file mode 100644
index 63cebb87b..000000000
--- a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/query_table_test.go
+++ /dev/null
@@ -1,255 +0,0 @@
-package gorethink
-
-import (
-	"sync"
-	"time"
-
-	test "gopkg.in/check.v1"
-)
-
-func (s *RethinkSuite) TestTableCreate(c *test.C) {
-	DB("test").TableDrop("test").Exec(session)
-
-	// Test database creation
-	query := DB("test").TableCreate("test")
-
-	response, err := query.RunWrite(session)
-	c.Assert(err, test.IsNil)
-	c.Assert(response.TablesCreated, jsonEquals, 1)
-}
-
-func (s *RethinkSuite) TestTableCreatePrimaryKey(c *test.C) {
-	DB("test").TableDrop("testOpts").Exec(session)
-
-	// Test database creation
-	query := DB("test").TableCreate("testOpts", TableCreateOpts{
-		PrimaryKey: "it",
-	})
-
-	response, err := query.RunWrite(session)
-	c.Assert(err, test.IsNil)
-	c.Assert(response.TablesCreated, jsonEquals, 1)
-}
-
-func (s *RethinkSuite) TestTableCreateSoftDurability(c *test.C) {
-	DB("test").TableDrop("testOpts").Exec(session)
-
-	// Test database creation
-	query := DB("test").TableCreate("testOpts", TableCreateOpts{
-		Durability: "soft",
-	})
-
-	response, err := query.RunWrite(session)
-	c.Assert(err, test.IsNil)
-	c.Assert(response.TablesCreated, jsonEquals, 1)
-}
-
-func (s *RethinkSuite) TestTableCreateSoftMultipleOpts(c *test.C) {
-	DB("test").TableDrop("testOpts").Exec(session)
-
-	// Test database creation
-	query := DB("test").TableCreate("testOpts", TableCreateOpts{
-		PrimaryKey: "it",
-		Durability: "soft",
-	})
-
-	response, err := query.RunWrite(session)
-	c.Assert(err, test.IsNil)
-	c.Assert(response.TablesCreated, jsonEquals, 1)
-
-	DB("test").TableDrop("test").Exec(session)
-}
-
-func (s *RethinkSuite) TestTableList(c *test.C) {
-	var response []interface{}
-
-	DB("test").TableCreate("test").Exec(session)
-
-	// Try and find it in the list
-	success := false
-	res, err := DB("test").TableList().Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.All(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response, test.FitsTypeOf, []interface{}{})
-
-	for _, db := range response {
-		if db == "test" {
-			success = true
-		}
-	}
-
-	c.Assert(success, test.Equals, true)
-}
-
-func (s *RethinkSuite) TestTableDelete(c *test.C) {
-	DB("test").TableCreate("test").Exec(session)
-
-	// Test database creation
-	query := DB("test").TableDrop("test")
-
-	response, err := query.RunWrite(session)
-	c.Assert(err, test.IsNil)
-	c.Assert(response.TablesDropped, jsonEquals, 1)
-}
-
-func (s *RethinkSuite) TestTableIndexCreate(c *test.C) {
-	DB("test").TableCreate("test").Exec(session)
-	DB("test").Table("test").IndexDrop("test").Exec(session)
-
-	// Test database creation
-	query := DB("test").Table("test").IndexCreate("test", IndexCreateOpts{
-		Multi: true,
-	})
-
-	response, err := query.RunWrite(session)
-	c.Assert(err, test.IsNil)
-	c.Assert(response.Created, jsonEquals, 1)
-}
-
-func (s *RethinkSuite) TestTableCompoundIndexCreate(c *test.C) {
-	DBCreate("test").Exec(session)
-	DB("test").TableDrop("TableCompound").Exec(session)
-	DB("test").TableCreate("TableCompound").Exec(session)
-	response, err := DB("test").Table("TableCompound").IndexCreateFunc("full_name", func(row Term) interface{} {
-		return []interface{}{row.Field("first_name"), row.Field("last_name")}
-	}).RunWrite(session)
-	c.Assert(err, test.IsNil)
-	c.Assert(response.Created, test.Equals, 1)
-}
-
-func (s *RethinkSuite) TestTableIndexList(c *test.C) {
-	var response []interface{}
-
-	DB("test").TableCreate("test").Exec(session)
-	DB("test").Table("test").IndexCreate("test").Exec(session)
-
-	// Try and find it in the list
-	success := false
-	res, err := DB("test").Table("test").IndexList().Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.All(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response, test.FitsTypeOf, []interface{}{})
-
-	for _, db := range response {
-		if db == "test" {
-			success = true
-		}
-	}
-
-	c.Assert(success, test.Equals, true)
-}
-
-func (s *RethinkSuite) TestTableIndexDelete(c *test.C) {
-	DB("test").TableCreate("test").Exec(session)
-	DB("test").Table("test").IndexCreate("test").Exec(session)
-
-	// Test database creation
-	query := DB("test").Table("test").IndexDrop("test")
-
-	response, err := query.RunWrite(session)
-	c.Assert(err, test.IsNil)
-	c.Assert(response.Dropped, jsonEquals, 1)
-}
-
-func (s *RethinkSuite) TestTableIndexRename(c *test.C) {
-	DB("test").TableDrop("test").Exec(session)
-	DB("test").TableCreate("test").Exec(session)
-	DB("test").Table("test").IndexCreate("test").Exec(session)
-
-	// Test index rename
-	query := DB("test").Table("test").IndexRename("test", "test2")
-
-	response, err := query.RunWrite(session)
-	c.Assert(err, test.IsNil)
-	c.Assert(response.Renamed, jsonEquals, 1)
-}
-
-func (s *RethinkSuite) TestTableChanges(c *test.C) {
-	DB("test").TableDrop("changes").Exec(session)
-	DB("test").TableCreate("changes").Exec(session)
-
-	var n int
-
-	res, err := DB("test").Table("changes").Changes().Run(session)
-	if err != nil {
-		c.Fatal(err.Error())
-	}
-	c.Assert(res.Type(), test.Equals, "Feed")
-
-	wg := &sync.WaitGroup{}
-	wg.Add(1)
-
-	// Use goroutine to wait for changes. Prints the first 10 results
-	go func() {
-		var response interface{}
-		for n < 10 && res.Next(&response) {
-			n++
-		}
-
-		if res.Err() != nil {
-			c.Fatal(res.Err())
-		}
-
-		wg.Done()
-	}()
-
-	DB("test").Table("changes").Insert(map[string]interface{}{"n": 1}).Exec(session)
-	DB("test").Table("changes").Insert(map[string]interface{}{"n": 2}).Exec(session)
-	DB("test").Table("changes").Insert(map[string]interface{}{"n": 3}).Exec(session)
-	DB("test").Table("changes").Insert(map[string]interface{}{"n": 4}).Exec(session)
-	DB("test").Table("changes").Insert(map[string]interface{}{"n": 5}).Exec(session)
-	DB("test").Table("changes").Insert(map[string]interface{}{"n": 6}).Exec(session)
-	DB("test").Table("changes").Insert(map[string]interface{}{"n": 7}).Exec(session)
-	DB("test").Table("changes").Insert(map[string]interface{}{"n": 8}).Exec(session)
-	DB("test").Table("changes").Insert(map[string]interface{}{"n": 9}).Exec(session)
-	DB("test").Table("changes").Insert(map[string]interface{}{"n": 10}).Exec(session)
-
-	wg.Wait()
-
-	c.Assert(n, test.Equals, 10)
-}
-
-func (s *RethinkSuite) TestTableChangesExit(c *test.C) {
-	DB("test").TableDrop("changes").Exec(session)
-	DB("test").TableCreate("changes").Exec(session)
-
-	var n int
-
-	res, err := DB("test").Table("changes").Changes().Run(session)
-	if err != nil {
-		c.Fatal(err.Error())
-	}
-	c.Assert(res.Type(), test.Equals, "Feed")
-
-	change := make(chan ChangeResponse)
-
-	// Close cursor after one second
-	go func() {
-		<-time.After(time.Second)
-		res.Close()
-	}()
-
-	// Insert 5 docs
-	DB("test").Table("changes").Insert(map[string]interface{}{"n": 1}).Exec(session)
-	DB("test").Table("changes").Insert(map[string]interface{}{"n": 2}).Exec(session)
-	DB("test").Table("changes").Insert(map[string]interface{}{"n": 3}).Exec(session)
-	DB("test").Table("changes").Insert(map[string]interface{}{"n": 4}).Exec(session)
-	DB("test").Table("changes").Insert(map[string]interface{}{"n": 5}).Exec(session)
-
-	// Listen for changes
-	res.Listen(change)
-	for _ = range change {
-		n++
-	}
-	if res.Err() != nil {
-		c.Fatal(res.Err())
-	}
-
-	c.Assert(n, test.Equals, 5)
-}
diff --git a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/query_test.go b/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/query_test.go
deleted file mode 100644
index 3d38fe534..000000000
--- a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/query_test.go
+++ /dev/null
@@ -1,50 +0,0 @@
-package gorethink
-
-import test "gopkg.in/check.v1"
-
-func (s *RethinkSuite) TestQueryRun(c *test.C) {
-	var response string
-
-	res, err := Expr("Test").Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.One(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response, test.Equals, "Test")
-}
-
-func (s *RethinkSuite) TestQueryExec(c *test.C) {
-	err := Expr("Test").Exec(session)
-	c.Assert(err, test.IsNil)
-}
-
-func (s *RethinkSuite) TestQueryProfile(c *test.C) {
-	var response string
-
-	res, err := Expr("Test").Run(session, RunOpts{
-		Profile: true,
-	})
-	c.Assert(err, test.IsNil)
-
-	err = res.One(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(res.Profile(), test.NotNil)
-	c.Assert(response, test.Equals, "Test")
-}
-
-func (s *RethinkSuite) TestQueryRunRawTime(c *test.C) {
-	var response map[string]interface{}
-
-	res, err := Now().Run(session, RunOpts{
-		TimeFormat: "raw",
-	})
-	c.Assert(err, test.IsNil)
-
-	err = res.One(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response["$reql_type$"], test.NotNil)
-	c.Assert(response["$reql_type$"], test.Equals, "TIME")
-}
diff --git a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/query_time.go b/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/query_time.go
deleted file mode 100644
index 78ba9e1d1..000000000
--- a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/query_time.go
+++ /dev/null
@@ -1,187 +0,0 @@
-package gorethink
-
-import (
-	p "github.com/dancannon/gorethink/ql2"
-)
-
-// Now returns a time object representing the current time in UTC
-func Now(args ...interface{}) Term {
-	return constructRootTerm("Now", p.Term_NOW, args, map[string]interface{}{})
-}
-
-// Time creates a time object for a specific time
-func Time(args ...interface{}) Term {
-	return constructRootTerm("Time", p.Term_TIME, args, map[string]interface{}{})
-}
-
-// EpochTime returns a time object based on seconds since epoch
-func EpochTime(args ...interface{}) Term {
-	return constructRootTerm("EpochTime", p.Term_EPOCH_TIME, args, map[string]interface{}{})
-}
-
-// ISO8601Opts contains the optional arguments for the ISO8601 term
-type ISO8601Opts struct {
-	DefaultTimezone interface{} `gorethink:"default_timezone,omitempty"`
-}
-
-func (o *ISO8601Opts) toMap() map[string]interface{} {
-	return optArgsToMap(o)
-}
-
-// ISO8601 returns a time object based on an ISO8601 formatted date-time string
-func ISO8601(date interface{}, optArgs ...ISO8601Opts) Term {
-
-	opts := map[string]interface{}{}
-	if len(optArgs) >= 1 {
-		opts = optArgs[0].toMap()
-	}
-	return constructRootTerm("ISO8601", p.Term_ISO8601, []interface{}{date}, opts)
-}
-
-// InTimezone returns a new time object with a different time zone. While the
-// time stays the same, the results returned by methods such as hours() will
-// change since they take the timezone into account. The timezone argument
-// has to be of the ISO 8601 format.
-func (t Term) InTimezone(args ...interface{}) Term {
-	return constructMethodTerm(t, "InTimezone", p.Term_IN_TIMEZONE, args, map[string]interface{}{})
-}
-
-// Timezone returns the timezone of the time object
-func (t Term) Timezone(args ...interface{}) Term {
-	return constructMethodTerm(t, "Timezone", p.Term_TIMEZONE, args, map[string]interface{}{})
-}
-
-// DuringOpts contains the optional arguments for the During term
-type DuringOpts struct {
-	LeftBound  interface{} `gorethink:"left_bound,omitempty"`
-	RightBound interface{} `gorethink:"right_bound,omitempty"`
-}
-
-func (o *DuringOpts) toMap() map[string]interface{} {
-	return optArgsToMap(o)
-}
-
-// During returns true if a time is between two other times
-// (by default, inclusive for the start, exclusive for the end).
-func (t Term) During(startTime, endTime interface{}, optArgs ...DuringOpts) Term {
-	opts := map[string]interface{}{}
-	if len(optArgs) >= 1 {
-		opts = optArgs[0].toMap()
-	}
-	return constructMethodTerm(t, "During", p.Term_DURING, []interface{}{startTime, endTime}, opts)
-}
-
-// Date returns a new time object only based on the day, month and year
-// (ie. the same day at 00:00).
-func (t Term) Date(args ...interface{}) Term {
-	return constructMethodTerm(t, "Date", p.Term_DATE, args, map[string]interface{}{})
-}
-
-// TimeOfDay returns the number of seconds elapsed since the beginning of the
-// day stored in the time object.
-func (t Term) TimeOfDay(args ...interface{}) Term {
-	return constructMethodTerm(t, "TimeOfDay", p.Term_TIME_OF_DAY, args, map[string]interface{}{})
-}
-
-// Year returns the year of a time object.
-func (t Term) Year(args ...interface{}) Term {
-	return constructMethodTerm(t, "Year", p.Term_YEAR, args, map[string]interface{}{})
-}
-
-// Month returns the month of a time object as a number between 1 and 12.
-// For your convenience, the terms r.January(), r.February() etc. are
-// defined and map to the appropriate integer.
-func (t Term) Month(args ...interface{}) Term {
-	return constructMethodTerm(t, "Month", p.Term_MONTH, args, map[string]interface{}{})
-}
-
-// Day return the day of a time object as a number between 1 and 31.
-func (t Term) Day(args ...interface{}) Term {
-	return constructMethodTerm(t, "Day", p.Term_DAY, args, map[string]interface{}{})
-}
-
-// DayOfWeek returns the day of week of a time object as a number between
-// 1 and 7 (following ISO 8601 standard). For your convenience,
-// the terms r.Monday(), r.Tuesday() etc. are defined and map to
-// the appropriate integer.
-func (t Term) DayOfWeek(args ...interface{}) Term {
-	return constructMethodTerm(t, "DayOfWeek", p.Term_DAY_OF_WEEK, args, map[string]interface{}{})
-}
-
-// DayOfYear returns the day of the year of a time object as a number between
-// 1 and 366 (following ISO 8601 standard).
-func (t Term) DayOfYear(args ...interface{}) Term {
-	return constructMethodTerm(t, "DayOfYear", p.Term_DAY_OF_YEAR, args, map[string]interface{}{})
-}
-
-// Hours returns the hour in a time object as a number between 0 and 23.
-func (t Term) Hours(args ...interface{}) Term {
-	return constructMethodTerm(t, "Hours", p.Term_HOURS, args, map[string]interface{}{})
-}
-
-// Minutes returns the minute in a time object as a number between 0 and 59.
-func (t Term) Minutes(args ...interface{}) Term {
-	return constructMethodTerm(t, "Minutes", p.Term_MINUTES, args, map[string]interface{}{})
-}
-
-// Seconds returns the seconds in a time object as a number between 0 and
-// 59.999 (double precision).
-func (t Term) Seconds(args ...interface{}) Term {
-	return constructMethodTerm(t, "Seconds", p.Term_SECONDS, args, map[string]interface{}{})
-}
-
-// ToISO8601 converts a time object to its iso 8601 format.
-func (t Term) ToISO8601(args ...interface{}) Term {
-	return constructMethodTerm(t, "ToISO8601", p.Term_TO_ISO8601, args, map[string]interface{}{})
-}
-
-// ToEpochTime converts a time object to its epoch time.
-func (t Term) ToEpochTime(args ...interface{}) Term {
-	return constructMethodTerm(t, "ToEpochTime", p.Term_TO_EPOCH_TIME, args, map[string]interface{}{})
-}
-
-var (
-	// Days
-
-	// Monday is a constant representing the day of the week Monday
-	Monday = constructRootTerm("Monday", p.Term_MONDAY, []interface{}{}, map[string]interface{}{})
-	// Tuesday is a constant representing the day of the week Tuesday
-	Tuesday = constructRootTerm("Tuesday", p.Term_TUESDAY, []interface{}{}, map[string]interface{}{})
-	// Wednesday is a constant representing the day of the week Wednesday
-	Wednesday = constructRootTerm("Wednesday", p.Term_WEDNESDAY, []interface{}{}, map[string]interface{}{})
-	// Thursday is a constant representing the day of the week Thursday
-	Thursday = constructRootTerm("Thursday", p.Term_THURSDAY, []interface{}{}, map[string]interface{}{})
-	// Friday is a constant representing the day of the week Friday
-	Friday = constructRootTerm("Friday", p.Term_FRIDAY, []interface{}{}, map[string]interface{}{})
-	// Saturday is a constant representing the day of the week Saturday
-	Saturday = constructRootTerm("Saturday", p.Term_SATURDAY, []interface{}{}, map[string]interface{}{})
-	// Sunday is a constant representing the day of the week Sunday
-	Sunday = constructRootTerm("Sunday", p.Term_SUNDAY, []interface{}{}, map[string]interface{}{})
-
-	// Months
-
-	// January is a constant representing the month January
-	January = constructRootTerm("January", p.Term_JANUARY, []interface{}{}, map[string]interface{}{})
-	// February is a constant representing the month February
-	February = constructRootTerm("February", p.Term_FEBRUARY, []interface{}{}, map[string]interface{}{})
-	// March is a constant representing the month March
-	March = constructRootTerm("March", p.Term_MARCH, []interface{}{}, map[string]interface{}{})
-	// April is a constant representing the month April
-	April = constructRootTerm("April", p.Term_APRIL, []interface{}{}, map[string]interface{}{})
-	// May is a constant representing the month May
-	May = constructRootTerm("May", p.Term_MAY, []interface{}{}, map[string]interface{}{})
-	// June is a constant representing the month June
-	June = constructRootTerm("June", p.Term_JUNE, []interface{}{}, map[string]interface{}{})
-	// July is a constant representing the month July
-	July = constructRootTerm("July", p.Term_JULY, []interface{}{}, map[string]interface{}{})
-	// August is a constant representing the month August
-	August = constructRootTerm("August", p.Term_AUGUST, []interface{}{}, map[string]interface{}{})
-	// September is a constant representing the month September
-	September = constructRootTerm("September", p.Term_SEPTEMBER, []interface{}{}, map[string]interface{}{})
-	// October is a constant representing the month October
-	October = constructRootTerm("October", p.Term_OCTOBER, []interface{}{}, map[string]interface{}{})
-	// November is a constant representing the month November
-	November = constructRootTerm("November", p.Term_NOVEMBER, []interface{}{}, map[string]interface{}{})
-	// December is a constant representing the month December
-	December = constructRootTerm("December", p.Term_DECEMBER, []interface{}{}, map[string]interface{}{})
-)
diff --git a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/query_time_test.go b/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/query_time_test.go
deleted file mode 100644
index 1f044ed1c..000000000
--- a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/query_time_test.go
+++ /dev/null
@@ -1,137 +0,0 @@
-package gorethink
-
-import (
-	"time"
-
-	test "gopkg.in/check.v1"
-)
-
-func (s *RethinkSuite) TestTimeTime(c *test.C) {
-	var response time.Time
-	res, err := Time(1986, 11, 3, 12, 30, 15, "Z").Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.One(&response)
-	c.Assert(err, test.IsNil)
-	c.Assert(response.Equal(time.Date(1986, 11, 3, 12, 30, 15, 0, time.UTC)), test.Equals, true)
-}
-
-func (s *RethinkSuite) TestTimeTimeMillisecond(c *test.C) {
-	var response time.Time
-	res, err := Time(1986, 11, 3, 12, 30, 15.679, "Z").Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.One(&response)
-	c.Assert(err, test.IsNil)
-	c.Assert(response.Equal(time.Date(1986, 11, 3, 12, 30, 15, 679.00002*1000*1000, time.UTC)), test.Equals, true)
-}
-
-func (s *RethinkSuite) TestTimeEpochTime(c *test.C) {
-	var response time.Time
-	res, err := EpochTime(531360000).Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.One(&response)
-	c.Assert(err, test.IsNil)
-	c.Assert(response.Equal(time.Date(1986, 11, 3, 0, 0, 0, 0, time.UTC)), test.Equals, true)
-}
-
-func (s *RethinkSuite) TestTimeExpr(c *test.C) {
-	var response time.Time
-	t := time.Unix(531360000, 0)
-	res, err := Expr(Expr(t)).Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.One(&response)
-	c.Assert(err, test.IsNil)
-}
-
-func (s *RethinkSuite) TestTimeExprMillisecond(c *test.C) {
-	var response time.Time
-	t := time.Unix(531360000, 679000000)
-	res, err := Expr(t).Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.One(&response)
-	c.Assert(err, test.IsNil)
-	c.Assert(float64(response.UnixNano()), test.Equals, float64(t.UnixNano()))
-}
-
-func (s *RethinkSuite) TestTimeISO8601(c *test.C) {
-	var t1, t2 time.Time
-	t2, _ = time.Parse("2006-01-02T15:04:05-07:00", "1986-11-03T08:30:00-07:00")
-	res, err := ISO8601("1986-11-03T08:30:00-07:00").Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.One(&t1)
-	c.Assert(err, test.IsNil)
-	c.Assert(t1.Equal(t2), test.Equals, true)
-}
-
-func (s *RethinkSuite) TestTimeInTimezone(c *test.C) {
-	loc, err := time.LoadLocation("MST")
-	c.Assert(err, test.IsNil)
-	var response []time.Time
-	res, err2 := Expr([]interface{}{Now(), Now().InTimezone("-07:00")}).Run(session)
-	c.Assert(err2, test.IsNil)
-
-	err = res.All(&response)
-	c.Assert(err, test.IsNil)
-	c.Assert(response[1].Equal(response[0].In(loc)), test.Equals, true)
-}
-
-func (s *RethinkSuite) TestTimeBetween(c *test.C) {
-	var response interface{}
-
-	times := Expr([]interface{}{
-		Time(1986, 9, 3, 12, 30, 15, "Z"),
-		Time(1986, 10, 3, 12, 30, 15, "Z"),
-		Time(1986, 11, 3, 12, 30, 15, "Z"),
-		Time(1986, 12, 3, 12, 30, 15, "Z"),
-	})
-	res, err := times.Filter(func(row Term) Term {
-		return row.During(Time(1986, 9, 3, 12, 30, 15, "Z"), Time(1986, 11, 3, 12, 30, 15, "Z"))
-	}).Count().Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.One(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(int(response.(float64)), test.Equals, 2)
-}
-
-func (s *RethinkSuite) TestTimeYear(c *test.C) {
-	var response interface{}
-
-	res, err := Time(1986, 12, 3, 12, 30, 15, "Z").Year().Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.One(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(int(response.(float64)), test.Equals, 1986)
-}
-
-func (s *RethinkSuite) TestTimeMonth(c *test.C) {
-	var response interface{}
-
-	res, err := Time(1986, 12, 3, 12, 30, 15, "Z").Month().Eq(December).Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.One(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response.(bool), test.Equals, true)
-}
-
-func (s *RethinkSuite) TestTimeDay(c *test.C) {
-	var response interface{}
-
-	res, err := Time(1986, 12, 3, 12, 30, 15, "Z").Day().Eq(Wednesday).Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.One(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response.(bool), test.Equals, true)
-}
diff --git a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/query_transformation.go b/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/query_transformation.go
deleted file mode 100644
index 5f944af81..000000000
--- a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/query_transformation.go
+++ /dev/null
@@ -1,163 +0,0 @@
-package gorethink
-
-import p "github.com/dancannon/gorethink/ql2"
-
-// Map transform each element of the sequence by applying the given mapping
-// function. It takes two arguments, a sequence and a function of type
-// `func (r.Term) interface{}`.
-//
-// For example this query doubles each element in an array:
-//
-//     r.Map([]int{1,3,6}, func (row r.Term) interface{} {
-//         return row.Mul(2)
-//     })
-func Map(args ...interface{}) Term {
-	if len(args) > 0 {
-		args = append(args[:len(args)-1], funcWrapArgs(args[len(args)-1:])...)
-	}
-
-	return constructRootTerm("Map", p.Term_MAP, funcWrapArgs(args), map[string]interface{}{})
-}
-
-// Map transforms each element of the sequence by applying the given mapping
-// function. It takes one argument of type `func (r.Term) interface{}`.
-//
-// For example this query doubles each element in an array:
-//
-//     r.Expr([]int{1,3,6}).Map(func (row r.Term) interface{} {
-//         return row.Mul(2)
-//     })
-func (t Term) Map(args ...interface{}) Term {
-	return constructMethodTerm(t, "Map", p.Term_MAP, funcWrapArgs(args), map[string]interface{}{})
-}
-
-// WithFields takes a sequence of objects and a list of fields. If any objects in the
-// sequence don't have all of the specified fields, they're dropped from the
-// sequence. The remaining objects have the specified fields plucked out.
-// (This is identical to `HasFields` followed by `Pluck` on a sequence.)
-func (t Term) WithFields(args ...interface{}) Term {
-	return constructMethodTerm(t, "WithFields", p.Term_WITH_FIELDS, args, map[string]interface{}{})
-}
-
-// ConcatMap concatenates one or more elements into a single sequence using a
-// mapping function. ConcatMap works in a similar fashion to Map, applying the
-// given function to each element in a sequence, but it will always return a
-// single sequence.
-func (t Term) ConcatMap(args ...interface{}) Term {
-	return constructMethodTerm(t, "ConcatMap", p.Term_CONCAT_MAP, funcWrapArgs(args), map[string]interface{}{})
-}
-
-// OrderByOpts contains the optional arguments for the OrderBy term
-type OrderByOpts struct {
-	Index interface{} `gorethink:"index,omitempty"`
-}
-
-func (o *OrderByOpts) toMap() map[string]interface{} {
-	return optArgsToMap(o)
-}
-
-// OrderBy sorts the sequence by document values of the given key(s). To specify
-// the ordering, wrap the attribute with either r.Asc or r.Desc (defaults to
-// ascending).
-//
-// Sorting without an index requires the server to hold the sequence in memory,
-// and is limited to 100,000 documents (or the setting of the ArrayLimit option
-// for run). Sorting with an index can be done on arbitrarily large tables, or
-// after a between command using the same index.
-func (t Term) OrderBy(args ...interface{}) Term {
-	var opts = map[string]interface{}{}
-
-	// Look for options map
-	if len(args) > 0 {
-		if possibleOpts, ok := args[len(args)-1].(OrderByOpts); ok {
-			opts = possibleOpts.toMap()
-			args = args[:len(args)-1]
-		}
-	}
-
-	for k, arg := range args {
-		if t, ok := arg.(Term); !(ok && (t.termType == p.Term_DESC || t.termType == p.Term_ASC)) {
-			args[k] = funcWrap(arg)
-		}
-	}
-
-	return constructMethodTerm(t, "OrderBy", p.Term_ORDER_BY, args, opts)
-}
-
-// Desc is used by the OrderBy term to specify the ordering to be descending.
-func Desc(args ...interface{}) Term {
-	return constructRootTerm("Desc", p.Term_DESC, funcWrapArgs(args), map[string]interface{}{})
-}
-
-// Asc is used by the OrderBy term to specify that the ordering be ascending (the
-// default).
-func Asc(args ...interface{}) Term {
-	return constructRootTerm("Asc", p.Term_ASC, funcWrapArgs(args), map[string]interface{}{})
-}
-
-// Skip skips a number of elements from the head of the sequence.
-func (t Term) Skip(args ...interface{}) Term {
-	return constructMethodTerm(t, "Skip", p.Term_SKIP, args, map[string]interface{}{})
-}
-
-// Limit ends the sequence after the given number of elements.
-func (t Term) Limit(args ...interface{}) Term {
-	return constructMethodTerm(t, "Limit", p.Term_LIMIT, args, map[string]interface{}{})
-}
-
-// SliceOpts contains the optional arguments for the Slice term
-type SliceOpts struct {
-	LeftBound  interface{} `gorethink:"left_bound,omitempty"`
-	RightBound interface{} `gorethink:"right_bound,omitempty"`
-}
-
-func (o *SliceOpts) toMap() map[string]interface{} {
-	return optArgsToMap(o)
-}
-
-// Slice trims the sequence to within the bounds provided.
-func (t Term) Slice(args ...interface{}) Term {
-	var opts = map[string]interface{}{}
-
-	// Look for options map
-	if len(args) > 0 {
-		if possibleOpts, ok := args[len(args)-1].(SliceOpts); ok {
-			opts = possibleOpts.toMap()
-			args = args[:len(args)-1]
-		}
-	}
-
-	return constructMethodTerm(t, "Slice", p.Term_SLICE, args, opts)
-}
-
-// AtIndex gets a single field from an object or the nth element from a sequence.
-func (t Term) AtIndex(args ...interface{}) Term {
-	return constructMethodTerm(t, "AtIndex", p.Term_BRACKET, args, map[string]interface{}{})
-}
-
-// Nth gets the nth element from a sequence.
-func (t Term) Nth(args ...interface{}) Term {
-	return constructMethodTerm(t, "Nth", p.Term_NTH, args, map[string]interface{}{})
-}
-
-// OffsetsOf gets the indexes of an element in a sequence. If the argument is a
-// predicate, get the indexes of all elements matching it.
-func (t Term) OffsetsOf(args ...interface{}) Term {
-	return constructMethodTerm(t, "OffsetsOf", p.Term_OFFSETS_OF, funcWrapArgs(args), map[string]interface{}{})
-}
-
-// IsEmpty tests if a sequence is empty.
-func (t Term) IsEmpty(args ...interface{}) Term {
-	return constructMethodTerm(t, "IsEmpty", p.Term_IS_EMPTY, args, map[string]interface{}{})
-}
-
-// Union concatenates two sequences.
-func (t Term) Union(args ...interface{}) Term {
-	return constructMethodTerm(t, "Union", p.Term_UNION, args, map[string]interface{}{})
-}
-
-// Sample selects a given number of elements from a sequence with uniform random
-// distribution. Selection is done without replacement.
-func (t Term) Sample(args ...interface{}) Term {
-	return constructMethodTerm(t, "Sample", p.Term_SAMPLE, args, map[string]interface{}{})
-}
diff --git a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/query_transformation_test.go b/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/query_transformation_test.go
deleted file mode 100644
index 512bfb1cf..000000000
--- a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/query_transformation_test.go
+++ /dev/null
@@ -1,426 +0,0 @@
-package gorethink
-
-import (
-	test "gopkg.in/check.v1"
-)
-
-func (s *RethinkSuite) TestTransformationMapImplicit(c *test.C) {
-	query := Expr(arr).Map(Row.Add(1))
-
-	var response []interface{}
-	res, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.All(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response, jsonEquals, []interface{}{2, 3, 4, 5, 6, 7, 8, 9, 10})
-}
-
-func (s *RethinkSuite) TestTransformationMapFunc(c *test.C) {
-	query := Expr(arr).Map(func(row Term) Term {
-		return row.Add(1)
-	})
-
-	var response []interface{}
-	res, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.All(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response, jsonEquals, []interface{}{2, 3, 4, 5, 6, 7, 8, 9, 10})
-}
-
-func (s *RethinkSuite) TestTransformationWithFields(c *test.C) {
-	query := Expr(objList).WithFields("id", "num").OrderBy("id")
-
-	var response []interface{}
-	res, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.All(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response, jsonEquals, []interface{}{
-		map[string]interface{}{"num": 0, "id": 1},
-		map[string]interface{}{"num": 5, "id": 2},
-		map[string]interface{}{"num": 10, "id": 3},
-		map[string]interface{}{"num": 0, "id": 4},
-		map[string]interface{}{"num": 100, "id": 5},
-		map[string]interface{}{"num": 15, "id": 6},
-		map[string]interface{}{"num": 0, "id": 7},
-		map[string]interface{}{"num": 50, "id": 8},
-		map[string]interface{}{"num": 25, "id": 9},
-	})
-}
-
-func (s *RethinkSuite) TestTransformationConcatMap(c *test.C) {
-	query := Expr(objList).ConcatMap(func(row Term) Term {
-		return Expr([]interface{}{row.Field("num")})
-	})
-
-	var response []interface{}
-	res, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.All(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response, jsonEquals, []interface{}{0, 5, 10, 0, 100, 15, 0, 50, 25})
-}
-
-func (s *RethinkSuite) TestTransformationVariadicMap(c *test.C) {
-	query := Range(5).Map(Range(5), func(a, b Term) interface{} {
-		return []interface{}{a, b}
-	})
-
-	var response []interface{}
-	res, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.All(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response, jsonEquals, [][]int{
-		{0, 0},
-		{1, 1},
-		{2, 2},
-		{3, 3},
-		{4, 4},
-	})
-}
-
-func (s *RethinkSuite) TestTransformationVariadicRootMap(c *test.C) {
-	query := Map(Range(5), Range(5), func(a, b Term) interface{} {
-		return []interface{}{a, b}
-	})
-
-	var response []interface{}
-	res, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.All(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response, jsonEquals, [][]int{
-		{0, 0},
-		{1, 1},
-		{2, 2},
-		{3, 3},
-		{4, 4},
-	})
-}
-
-func (s *RethinkSuite) TestTransformationOrderByDesc(c *test.C) {
-	query := Expr(noDupNumObjList).OrderBy(Desc("num"))
-
-	var response []interface{}
-	res, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.All(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response, jsonEquals, []interface{}{
-		map[string]interface{}{"num": 100, "id": 5, "g2": 3, "g1": 2},
-		map[string]interface{}{"num": 50, "id": 8, "g2": 2, "g1": 4},
-		map[string]interface{}{"num": 25, "id": 9, "g2": 3, "g1": 2},
-		map[string]interface{}{"num": 15, "id": 6, "g2": 1, "g1": 1},
-		map[string]interface{}{"num": 10, "id": 3, "g2": 2, "g1": 3},
-		map[string]interface{}{"num": 5, "id": 2, "g2": 2, "g1": 2},
-		map[string]interface{}{"num": 0, "id": 1, "g2": 1, "g1": 1},
-	})
-}
-
-func (s *RethinkSuite) TestTransformationOrderByAsc(c *test.C) {
-	query := Expr(noDupNumObjList).OrderBy(Asc("num"))
-
-	var response []interface{}
-	res, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.All(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response, jsonEquals, []interface{}{
-		map[string]interface{}{"num": 0, "id": 1, "g2": 1, "g1": 1},
-		map[string]interface{}{"num": 5, "id": 2, "g2": 2, "g1": 2},
-		map[string]interface{}{"num": 10, "id": 3, "g2": 2, "g1": 3},
-		map[string]interface{}{"num": 15, "id": 6, "g2": 1, "g1": 1},
-		map[string]interface{}{"num": 25, "id": 9, "g2": 3, "g1": 2},
-		map[string]interface{}{"num": 50, "id": 8, "g2": 2, "g1": 4},
-		map[string]interface{}{"num": 100, "id": 5, "g2": 3, "g1": 2},
-	})
-}
-
-func (s *RethinkSuite) TestTransformationOrderByIndex(c *test.C) {
-	DB("test").TableCreate("OrderByIndex").Exec(session)
-	DB("test").Table("test").IndexDrop("OrderByIndex").Exec(session)
-
-	// Test database creation
-	DB("test").Table("OrderByIndex").IndexCreateFunc("test", Row.Field("num")).Exec(session)
-	DB("test").Table("OrderByIndex").Insert(noDupNumObjList).Exec(session)
-
-	query := DB("test").Table("OrderByIndex").OrderBy(OrderByOpts{
-		Index: "test",
-	})
-
-	var response []interface{}
-	res, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.All(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response, jsonEquals, []interface{}{
-		map[string]interface{}{"num": 0, "id": 1, "g2": 1, "g1": 1},
-		map[string]interface{}{"num": 5, "id": 2, "g2": 2, "g1": 2},
-		map[string]interface{}{"num": 10, "id": 3, "g2": 2, "g1": 3},
-		map[string]interface{}{"num": 15, "id": 6, "g2": 1, "g1": 1},
-		map[string]interface{}{"num": 25, "id": 9, "g2": 3, "g1": 2},
-		map[string]interface{}{"num": 50, "id": 8, "g2": 2, "g1": 4},
-		map[string]interface{}{"num": 100, "id": 5, "g2": 3, "g1": 2},
-	})
-}
-
-func (s *RethinkSuite) TestTransformationOrderByIndexAsc(c *test.C) {
-	DB("test").TableCreate("OrderByIndex").Exec(session)
-	DB("test").Table("test").IndexDrop("OrderByIndex").Exec(session)
-
-	// Test database creation
-	DB("test").Table("OrderByIndex").IndexCreateFunc("test", Row.Field("num")).Exec(session)
-	DB("test").Table("OrderByIndex").Insert(noDupNumObjList).Exec(session)
-
-	query := DB("test").Table("OrderByIndex").OrderBy(OrderByOpts{
-		Index: Asc("test"),
-	})
-
-	var response []interface{}
-	res, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.All(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response, jsonEquals, []interface{}{
-		map[string]interface{}{"num": 0, "id": 1, "g2": 1, "g1": 1},
-		map[string]interface{}{"num": 5, "id": 2, "g2": 2, "g1": 2},
-		map[string]interface{}{"num": 10, "id": 3, "g2": 2, "g1": 3},
-		map[string]interface{}{"num": 15, "id": 6, "g2": 1, "g1": 1},
-		map[string]interface{}{"num": 25, "id": 9, "g2": 3, "g1": 2},
-		map[string]interface{}{"num": 50, "id": 8, "g2": 2, "g1": 4},
-		map[string]interface{}{"num": 100, "id": 5, "g2": 3, "g1": 2},
-	})
-}
-
-func (s *RethinkSuite) TestTransformationOrderByMultiple(c *test.C) {
-	query := Expr(objList).OrderBy(Desc("num"), Asc("id"))
-
-	var response []interface{}
-	res, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.All(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response, jsonEquals, []interface{}{
-		map[string]interface{}{"num": 100, "id": 5, "g2": 3, "g1": 2},
-		map[string]interface{}{"num": 50, "id": 8, "g2": 2, "g1": 4},
-		map[string]interface{}{"num": 25, "id": 9, "g2": 3, "g1": 2},
-		map[string]interface{}{"num": 15, "id": 6, "g2": 1, "g1": 1},
-		map[string]interface{}{"num": 10, "id": 3, "g2": 2, "g1": 3},
-		map[string]interface{}{"num": 5, "id": 2, "g2": 2, "g1": 2},
-		map[string]interface{}{"num": 0, "id": 1, "g2": 1, "g1": 1},
-		map[string]interface{}{"num": 0, "id": 4, "g2": 3, "g1": 2},
-		map[string]interface{}{"num": 0, "id": 7, "g2": 2, "g1": 1},
-	})
-}
-
-func (s *RethinkSuite) TestTransformationOrderByFunc(c *test.C) {
-	query := Expr(objList).OrderBy(func(row Term) Term {
-		return row.Field("num").Add(row.Field("id"))
-	})
-
-	var response []interface{}
-	res, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.All(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response, jsonEquals, []interface{}{
-		map[string]interface{}{"num": 0, "id": 1, "g2": 1, "g1": 1},
-		map[string]interface{}{"num": 0, "id": 4, "g2": 3, "g1": 2},
-		map[string]interface{}{"num": 5, "id": 2, "g2": 2, "g1": 2},
-		map[string]interface{}{"num": 0, "id": 7, "g2": 2, "g1": 1},
-		map[string]interface{}{"num": 10, "id": 3, "g2": 2, "g1": 3},
-		map[string]interface{}{"num": 15, "id": 6, "g2": 1, "g1": 1},
-		map[string]interface{}{"num": 25, "id": 9, "g2": 3, "g1": 2},
-		map[string]interface{}{"num": 50, "id": 8, "g2": 2, "g1": 4},
-		map[string]interface{}{"num": 100, "id": 5, "g2": 3, "g1": 2},
-	})
-}
-
-func (s *RethinkSuite) TestTransformationSkip(c *test.C) {
-	query := Expr(arr).Skip(7)
-
-	var response []interface{}
-	res, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.All(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response, jsonEquals, []interface{}{8, 9})
-}
-
-func (s *RethinkSuite) TestTransformationLimit(c *test.C) {
-	query := Expr(arr).Limit(2)
-
-	var response []interface{}
-	res, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.All(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response, jsonEquals, []interface{}{1, 2})
-}
-
-func (s *RethinkSuite) TestTransformationSlice(c *test.C) {
-	query := Expr(arr).Slice(4)
-
-	var response []interface{}
-	res, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.All(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response, jsonEquals, []interface{}{5, 6, 7, 8, 9})
-}
-
-func (s *RethinkSuite) TestTransformationSliceRight(c *test.C) {
-	query := Expr(arr).Slice(5, 6)
-
-	var response []interface{}
-	res, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.All(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response, jsonEquals, []interface{}{6})
-}
-
-func (s *RethinkSuite) TestTransformationSliceOpts(c *test.C) {
-	query := Expr(arr).Slice(4, SliceOpts{LeftBound: "open"})
-
-	var response []interface{}
-	res, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.All(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response, jsonEquals, []interface{}{6, 7, 8, 9})
-}
-
-func (s *RethinkSuite) TestTransformationSliceRightOpts(c *test.C) {
-	query := Expr(arr).Slice(5, 6, SliceOpts{RightBound: "closed"})
-
-	var response []interface{}
-	res, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.All(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response, jsonEquals, []interface{}{6, 7})
-}
-
-func (s *RethinkSuite) TestTransformationNth(c *test.C) {
-	query := Expr(arr).Nth(2)
-
-	var response interface{}
-	r, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = r.One(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response, jsonEquals, 3)
-}
-
-func (s *RethinkSuite) TestTransformationAtIndexNth(c *test.C) {
-	query := Expr([]interface{}{1}).AtIndex(Expr(0))
-
-	var response interface{}
-	r, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = r.One(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response, jsonEquals, 1)
-}
-
-func (s *RethinkSuite) TestTransformationAtIndexField(c *test.C) {
-	query := Expr(map[string]interface{}{"foo": 1}).AtIndex(Expr("foo"))
-
-	var response interface{}
-	r, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = r.One(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response, jsonEquals, 1)
-}
-
-func (s *RethinkSuite) TestTransformationAtIndexArrayField(c *test.C) {
-	query := Expr([]interface{}{1}).AtIndex(Expr("foo"))
-
-	_, err := query.Run(session)
-	c.Assert(err, test.NotNil)
-}
-
-func (s *RethinkSuite) TestTransformationOffsetsOf(c *test.C) {
-	query := Expr(arr).OffsetsOf(2)
-
-	var response []interface{}
-	res, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.All(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response, jsonEquals, []interface{}{1})
-}
-
-func (s *RethinkSuite) TestTransformationIsEmpty(c *test.C) {
-	query := Expr([]interface{}{}).IsEmpty()
-
-	var response bool
-	r, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = r.One(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response, test.Equals, true)
-}
-
-func (s *RethinkSuite) TestTransformationUnion(c *test.C) {
-	query := Expr(arr).Union(arr)
-
-	var response []interface{}
-	res, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.All(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response, jsonEquals, []interface{}{1, 2, 3, 4, 5, 6, 7, 8, 9, 1, 2, 3, 4, 5, 6, 7, 8, 9})
-}
diff --git a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/query_write.go b/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/query_write.go
deleted file mode 100644
index fa92cb115..000000000
--- a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/query_write.go
+++ /dev/null
@@ -1,97 +0,0 @@
-package gorethink
-
-import (
-	p "github.com/dancannon/gorethink/ql2"
-)
-
-// InsertOpts contains the optional arguments for the Insert term
-type InsertOpts struct {
-	Durability    interface{} `gorethink:"durability,omitempty"`
-	ReturnChanges interface{} `gorethink:"return_changes,omitempty"`
-	Conflict      interface{} `gorethink:"conflict,omitempty"`
-}
-
-func (o *InsertOpts) toMap() map[string]interface{} {
-	return optArgsToMap(o)
-}
-
-// Insert documents into a table. Accepts a single document or an array
-// of documents.
-func (t Term) Insert(arg interface{}, optArgs ...InsertOpts) Term {
-	opts := map[string]interface{}{}
-	if len(optArgs) >= 1 {
-		opts = optArgs[0].toMap()
-	}
-	return constructMethodTerm(t, "Insert", p.Term_INSERT, []interface{}{Expr(arg)}, opts)
-}
-
-// UpdateOpts contains the optional arguments for the Update term
-type UpdateOpts struct {
-	Durability    interface{} `gorethink:"durability,omitempty"`
-	ReturnChanges interface{} `gorethink:"return_changes,omitempty"`
-	NotAtomic     interface{} `gorethink:"non_atomic,omitempty"`
-}
-
-func (o *UpdateOpts) toMap() map[string]interface{} {
-	return optArgsToMap(o)
-}
-
-// Update JSON documents in a table. Accepts a JSON document, a ReQL expression,
-// or a combination of the two. You can pass options like returnChanges that will
-// return the old and new values of the row you have modified.
-func (t Term) Update(arg interface{}, optArgs ...UpdateOpts) Term {
-	opts := map[string]interface{}{}
-	if len(optArgs) >= 1 {
-		opts = optArgs[0].toMap()
-	}
-	return constructMethodTerm(t, "Update", p.Term_UPDATE, []interface{}{funcWrap(arg)}, opts)
-}
-
-// ReplaceOpts contains the optional arguments for the Replace term
-type ReplaceOpts struct {
-	Durability    interface{} `gorethink:"durability,omitempty"`
-	ReturnChanges interface{} `gorethink:"return_changes,omitempty"`
-	NotAtomic     interface{} `gorethink:"non_atomic,omitempty"`
-}
-
-func (o *ReplaceOpts) toMap() map[string]interface{} {
-	return optArgsToMap(o)
-}
-
-// Replace documents in a table. Accepts a JSON document or a ReQL expression,
-// and replaces the original document with the new one. The new document must
-// have the same primary key as the original document.
-func (t Term) Replace(arg interface{}, optArgs ...ReplaceOpts) Term {
-	opts := map[string]interface{}{}
-	if len(optArgs) >= 1 {
-		opts = optArgs[0].toMap()
-	}
-	return constructMethodTerm(t, "Replace", p.Term_REPLACE, []interface{}{funcWrap(arg)}, opts)
-}
-
-// DeleteOpts contains the optional arguments for the Delete term
-type DeleteOpts struct {
-	Durability    interface{} `gorethink:"durability,omitempty"`
-	ReturnChanges interface{} `gorethink:"return_changes,omitempty"`
-}
-
-func (o *DeleteOpts) toMap() map[string]interface{} {
-	return optArgsToMap(o)
-}
-
-// Delete one or more documents from a table.
-func (t Term) Delete(optArgs ...DeleteOpts) Term {
-	opts := map[string]interface{}{}
-	if len(optArgs) >= 1 {
-		opts = optArgs[0].toMap()
-	}
-	return constructMethodTerm(t, "Delete", p.Term_DELETE, []interface{}{}, opts)
-}
-
-// Sync ensures that writes on a given table are written to permanent storage.
-// Queries that specify soft durability do not give such guarantees, so Sync
-// can be used to ensure the state of these queries. A call to Sync does not
-// return until all previous writes to the table are persisted.
-func (t Term) Sync(args ...interface{}) Term {
-	return constructMethodTerm(t, "Sync", p.Term_SYNC, args, map[string]interface{}{})
-}
diff --git a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/query_write_test.go b/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/query_write_test.go
deleted file mode 100644
index 2c51b267e..000000000
--- a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/query_write_test.go
+++ /dev/null
@@ -1,99 +0,0 @@
-package gorethink
-
-import (
-	test "gopkg.in/check.v1"
-)
-
-func (s *RethinkSuite) TestWriteInsert(c *test.C) {
-	query := DB("test").Table("test").Insert(map[string]interface{}{"num": 1})
-	_, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-}
-
-func (s *RethinkSuite) TestWriteInsertChanges(c *test.C) {
-	query := DB("test").Table("test").Insert([]interface{}{
-		map[string]interface{}{"num": 1},
-		map[string]interface{}{"num": 2},
-	}, InsertOpts{ReturnChanges: true})
-	res, err := query.RunWrite(session)
-	c.Assert(err, test.IsNil)
-	c.Assert(res.Inserted, test.Equals, 2)
-	c.Assert(len(res.Changes), test.Equals, 2)
-}
-
-func (s *RethinkSuite) TestWriteInsertStruct(c *test.C) {
-	var response map[string]interface{}
-	o := object{
-		Name: "map[string]interface{}ect 3",
-		Attrs: []attr{
-			attr{
-				Name:  "Attr 2",
-				Value: "Value",
-			},
-		},
-	}
-
-	query := DB("test").Table("test").Insert(o)
-	res, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.One(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response["inserted"], test.Equals, float64(1))
-}
-
-func (s *RethinkSuite) TestWriteInsertStructPointer(c *test.C) {
-	var response map[string]interface{}
-	o := object{
-		Name: "map[string]interface{}ect 3",
-		Attrs: []attr{
-			attr{
-				Name:  "Attr 2",
-				Value: "Value",
-			},
-		},
-	}
-
-	query := DB("test").Table("test").Insert(&o)
-	res, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = res.One(&response)
-
-	c.Assert(err, test.IsNil)
-	c.Assert(response["inserted"], test.Equals, float64(1))
-}
-
-func (s *RethinkSuite) TestWriteUpdate(c *test.C) {
-	query := DB("test").Table("test").Insert(map[string]interface{}{"num": 1})
-	_, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	// Update the first row in the table
-	query = DB("test").Table("test").Sample(1).Update(map[string]interface{}{"num": 2})
-	_, err = query.Run(session)
-	c.Assert(err, test.IsNil)
-}
-
-func (s *RethinkSuite) TestWriteReplace(c *test.C) {
-	query := DB("test").Table("test").Insert(map[string]interface{}{"num": 1})
-	_, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	// Replace the first row in the table
-	query = DB("test").Table("test").Sample(1).Update(map[string]interface{}{"num": 2})
-	_, err = query.Run(session)
-	c.Assert(err, test.IsNil)
-}
-
-func (s *RethinkSuite) TestWriteDelete(c *test.C) {
-	query := DB("test").Table("test").Insert(map[string]interface{}{"num": 1})
-	_, err := query.Run(session)
-	c.Assert(err, test.IsNil)
-
-	// Delete the first row in the table
-	query = DB("test").Table("test").Sample(1).Delete()
-	_, err = query.Run(session)
-	c.Assert(err, test.IsNil)
-}
diff --git a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/session.go b/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/session.go
deleted file mode 100644
index c4e594341..000000000
--- a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/session.go
+++ /dev/null
@@ -1,190 +0,0 @@
-package gorethink
-
-import (
-	"crypto/tls"
-	"time"
-
-	p "github.com/dancannon/gorethink/ql2"
-)
-
-// A Session represents a connection to a RethinkDB cluster and should be used
-// when executing queries.
-type Session struct {
-	hosts   []Host
-	opts    *ConnectOpts
-	cluster *Cluster
-	closed  bool
-}
-
-// ConnectOpts is used to specify optional arguments when connecting to a cluster.
-type ConnectOpts struct {
-	Address   string        `gorethink:"address,omitempty"`
-	Addresses []string      `gorethink:"addresses,omitempty"`
-	Database  string        `gorethink:"database,omitempty"`
-	AuthKey   string        `gorethink:"authkey,omitempty"`
-	Timeout   time.Duration `gorethink:"timeout,omitempty"`
-	TLSConfig *tls.Config   `gorethink:"tlsconfig,omitempty"`
-
-	MaxIdle int `gorethink:"max_idle,omitempty"`
-	MaxOpen int `gorethink:"max_open,omitempty"`
-
-	// Below options are for cluster discovery, please note there is a high
-	// probability of these changing as the API is still being worked on.
-
-	// DiscoverHosts is used to enable host discovery, when true the driver
-	// will attempt to discover any new nodes added to the cluster and then
-	// start sending queries to these new nodes.
-	DiscoverHosts bool `gorethink:"discover_hosts,omitempty"`
-	// NodeRefreshInterval is used to determine how often the driver should
-	// refresh the status of a node.
-	NodeRefreshInterval time.Duration `gorethink:"node_refresh_interval,omitempty"`
-}
-
-func (o *ConnectOpts) toMap() map[string]interface{} {
-	return optArgsToMap(o)
-}
-
-// Connect creates a new database session. To view the available connection
-// options see ConnectOpts.
-//
-// By default maxIdle and maxOpen are set to 1: passing values greater
-// than the default (e.g. MaxIdle: "10", MaxOpen: "20") will provide a
-// pool of re-usable connections.
-//
-// Basic connection example:
-//
-// 	session, err := r.Connect(r.ConnectOpts{
-// 		Host: "localhost:28015",
-// 		Database: "test",
-// 		AuthKey:  "14daak1cad13dj",
-// 	})
-//
-// Cluster connection example:
-//
-// 	session, err := r.Connect(r.ConnectOpts{
-// 		Hosts: []string{"localhost:28015", "localhost:28016"},
-// 		Database: "test",
-// 		AuthKey:  "14daak1cad13dj",
-// 	})
-func Connect(opts ConnectOpts) (*Session, error) {
-	var addresses = opts.Addresses
-	if len(addresses) == 0 {
-		addresses = []string{opts.Address}
-	}
-
-	hosts := make([]Host, len(addresses))
-	for i, address := range addresses {
-		hostname, port := splitAddress(address)
-		hosts[i] = NewHost(hostname, port)
-	}
-	if len(hosts) <= 0 {
-		return nil, ErrNoHosts
-	}
-
-	// Connect
-	s := &Session{
-		hosts: hosts,
-		opts:  &opts,
-	}
-
-	err := s.Reconnect()
-	if err != nil {
-		return nil, err
-	}
-
-	return s, nil
-}
-
-// CloseOpts allows calls to the Close function to be configured.
-type CloseOpts struct {
-	NoReplyWait bool `gorethink:"noreplyWait,omitempty"`
-}
-
-func (o *CloseOpts) toMap() map[string]interface{} {
-	return optArgsToMap(o)
-}
-
-// Reconnect closes and re-opens a session.
-func (s *Session) Reconnect(optArgs ...CloseOpts) error {
-	var err error
-
-	if err = s.Close(optArgs...); err != nil {
-		return err
-	}
-
-	s.cluster, err = NewCluster(s.hosts, s.opts)
-	if err != nil {
-		return err
-	}
-
-	s.closed = false
-
-	return nil
-}
-
-// Close closes the session
-func (s *Session) Close(optArgs ...CloseOpts) error {
-	if s.closed {
-		return nil
-	}
-
-	if len(optArgs) >= 1 {
-		if optArgs[0].NoReplyWait {
-			s.NoReplyWait()
-		}
-	}
-
-	if s.cluster != nil {
-		s.cluster.Close()
-	}
-	s.cluster = nil
-	s.closed = true
-
-	return nil
-}
-
-// SetMaxIdleConns sets the maximum number of connections in the idle
-// connection pool.
-func (s *Session) SetMaxIdleConns(n int) {
-	s.opts.MaxIdle = n
-	s.cluster.SetMaxIdleConns(n)
-}
-
-// SetMaxOpenConns sets the maximum number of open connections to the database.
-func (s *Session) SetMaxOpenConns(n int) {
-	s.opts.MaxOpen = n
-	s.cluster.SetMaxOpenConns(n)
-}
-
-// NoReplyWait ensures that previous queries with the noreply flag have been
-// processed by the server. Note that this guarantee only applies to queries
-// run on the given connection
-func (s *Session) NoReplyWait() error {
-	return s.cluster.Exec(Query{
-		Type: p.Query_NOREPLY_WAIT,
-	})
-}
-
-// Use changes the default database used
-func (s *Session) Use(database string) {
-	s.opts.Database = database
-}
-
-// Query executes a ReQL query using the session to connect to the database
-func (s *Session) Query(q Query) (*Cursor, error) {
-	return s.cluster.Query(q)
-}
-
-// Exec executes a ReQL query using the session to connect to the database
-func (s *Session) Exec(q Query) error {
-	return s.cluster.Exec(q)
-}
-
-// SetHosts resets the hosts used when connecting to the RethinkDB cluster
-func (s *Session) SetHosts(hosts []Host) {
-	s.hosts = hosts
-}
-
-func (s *Session) newQuery(t Term, opts map[string]interface{}) Query {
-	return newQuery(t, opts, s.opts)
-}
diff --git a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/session_test.go b/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/session_test.go
deleted file mode 100644
index a7b623747..000000000
--- a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/session_test.go
+++ /dev/null
@@ -1,72 +0,0 @@
-package gorethink
-
-import (
-	"os"
-	"time"
-
-	test "gopkg.in/check.v1"
-)
-
-func (s *RethinkSuite) TestSessionConnect(c *test.C) {
-	session, err := Connect(ConnectOpts{
-		Address: url,
-		AuthKey: os.Getenv("RETHINKDB_AUTHKEY"),
-	})
-	c.Assert(err, test.IsNil)
-
-	row, err := Expr("Hello World").Run(session)
-	c.Assert(err, test.IsNil)
-
-	var response string
-	err = row.One(&response)
-	c.Assert(err, test.IsNil)
-	c.Assert(response, test.Equals, "Hello World")
-}
-
-func (s *RethinkSuite) TestSessionReconnect(c *test.C) {
-	session, err := Connect(ConnectOpts{
-		Address: url,
-		AuthKey: os.Getenv("RETHINKDB_AUTHKEY"),
-	})
-	c.Assert(err, test.IsNil)
-
-	row, err := Expr("Hello World").Run(session)
-	c.Assert(err, test.IsNil)
-
-	var response string
-	err = row.One(&response)
-	c.Assert(err, test.IsNil)
-	c.Assert(response, test.Equals, "Hello World")
-
-	err = session.Reconnect()
-	c.Assert(err, test.IsNil)
-
-	row, err = Expr("Hello World 2").Run(session)
-	c.Assert(err, test.IsNil)
-
-	err = row.One(&response)
-	c.Assert(err, test.IsNil)
-	c.Assert(response, test.Equals, "Hello World 2")
-}
-
-func (s *RethinkSuite) TestSessionConnectError(c *test.C) {
-	var err error
-	_, err = Connect(ConnectOpts{
-		Address: "nonexistanturl",
-		Timeout: time.Second,
-	})
-	c.Assert(err, test.NotNil)
-}
-
-func (s *RethinkSuite) TestSessionConnectDatabase(c *test.C) {
-	session, err := Connect(ConnectOpts{
-		Address:  url,
-		AuthKey:  os.Getenv("RETHINKDB_AUTHKEY"),
-		Database: "test2",
-	})
-	c.Assert(err, test.IsNil)
-
-	_, err = Table("test2").Run(session)
-	c.Assert(err, test.NotNil)
-	c.Assert(err.Error(), test.Equals, "gorethink: Database `test2` does not exist. in: \nr.Table(\"test2\")")
-}
diff --git a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/testdata_test.go b/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/testdata_test.go
deleted file mode 100644
index 87e813fe1..000000000
--- a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/testdata_test.go
+++ /dev/null
@@ -1,105 +0,0 @@
-package gorethink
-
-func setupTestData() {
-	// Delete any preexisting databases
-	DBDrop("test").Exec(session)
-	DBDrop("examples").Exec(session)
-	DBDrop("superheroes").Exec(session)
-
-	DBCreate("test").Exec(session)
-	DBCreate("examples").Exec(session)
-
-	DB("examples").TableCreate("posts").Exec(session)
-	DB("examples").TableCreate("heroes").Exec(session)
-	DB("examples").TableCreate("users").Exec(session)
-	DB("examples").TableCreate("games").Exec(session)
-	DB("examples").TableCreate("games2").Exec(session)
-	DB("examples").TableCreate("marvel").Exec(session)
-
-	DB("examples").Table("posts").IndexCreate("date").Exec(session)
-	DB("examples").Table("posts").IndexCreateFunc(
-		"dateAndTitle",
-		[]interface{}{Row.Field("date"), Row.Field("title")},
-	).Exec(session)
-
-	DB("examples").Table("games").IndexCreate("type").Exec(session)
-
-	// Create heroes table
-	DB("examples").Table("heroes").Insert([]interface{}{
-		map[string]interface{}{
-			"id":        1,
-			"code_name": "batman",
-			"name":      "Batman",
-		},
-		map[string]interface{}{
-			"id":        2,
-			"code_name": "man_of_steel",
-			"name":      "Superman",
-		},
-		map[string]interface{}{
-			"id":        3,
-			"code_name": "ant_man",
-			"name":      "Ant Man",
-		},
-		map[string]interface{}{
-			"id":        4,
-			"code_name": "flash",
-			"name":      "The Flash",
-		},
-	}).Exec(session)
-
-	// Create users table
-	DB("examples").Table("users").Insert([]interface{}{
-		map[string]interface{}{
-			"id":    "william",
-			"email": "william@rethinkdb.com",
-			"age":   30,
-		},
-		map[string]interface{}{
-			"id":    "lara",
-			"email": "lara@rethinkdb.com",
-			"age":   30,
-		},
-		map[string]interface{}{
-			"id":    "john",
-			"email": "john@rethinkdb.com",
-			"age":   19,
-		},
-		map[string]interface{}{
-			"id":    "jane",
-			"email": "jane@rethinkdb.com",
-			"age":   45,
-		},
-		map[string]interface{}{
-			"id":    "bob",
-			"email": "bob@rethinkdb.com",
-			"age":   24,
-		},
-		map[string]interface{}{
-			"id":    "brad",
-			"email": "brad@gmail.com",
-			"age":   15,
-		},
-	}).Exec(session)
-
-	// Create games table
-	DB("examples").Table("games").Insert([]interface{}{
-		map[string]interface{}{"id": 2, "player": "Bob", "points": 15, "type": "ranked"},
-		map[string]interface{}{"id": 5, "player": "Alice", "points": 7, "type": "free"},
-		map[string]interface{}{"id": 11, "player": "Bob", "points": 10, "type": "free"},
-		map[string]interface{}{"id": 12, "player": "Alice", "points": 2, "type": "free"},
-	}).Exec(session)
-
-	// Create games2 table
-	DB("examples").Table("games2").Insert([]interface{}{
-		map[string]interface{}{"id": 1, "matches": map[string]interface{}{"a": []int{1, 2, 3}, "b": []int{4, 5, 6}}},
-		map[string]interface{}{"id": 2, "matches": map[string]interface{}{"b": []int{100}, "c": []int{7, 8, 9}}},
-		map[string]interface{}{"id": 3, "matches": map[string]interface{}{"a": []int{10, 20}, "c": []int{70, 80}}},
-	}).Exec(session)
-
-	// Create marvel table
-	DB("examples").Table("marvel").Insert([]interface{}{
-		map[string]interface{}{"name": "Iron Man", "victories": 214},
-		map[string]interface{}{"name": "Jubilee", "victories": 9},
-	}).Exec(session)
-}
diff --git a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/types/geometry.go b/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/types/geometry.go
deleted file mode 100644
index 00ff80f0d..000000000
--- a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/types/geometry.go
+++ /dev/null
@@ -1,225 +0,0 @@
-package types
-
-import (
-	"fmt"
-)
-
-type Geometry struct {
-	Type  string
-	Point Point
-	Line  Line
-	Lines Lines
-}
-
-func (g Geometry) MarshalRQL() (interface{}, error) {
-	switch g.Type {
-	case "Point":
-		return g.Point.MarshalRQL()
-	case "LineString":
-		return g.Line.MarshalRQL()
-	case "Polygon":
-		return g.Lines.MarshalRQL()
-	default:
-		return nil, fmt.Errorf("pseudo-type GEOMETRY object field 'type' %s is not valid", g.Type)
-	}
-}
-
-func (g *Geometry) UnmarshalRQL(data interface{}) error {
-	if data, ok := data.(Geometry); ok {
-		g.Type = data.Type
-		g.Point = data.Point
-		g.Line = data.Line
-		g.Lines = data.Lines
-
-		return nil
-	}
-
-	m, ok := data.(map[string]interface{})
-	if !ok {
-		return fmt.Errorf("pseudo-type GEOMETRY object is not valid")
-	}
-
-	typ, ok := m["type"]
-	if !ok {
-		return fmt.Errorf("pseudo-type GEOMETRY object is not valid, expects 'type' field")
-	}
-	coords, ok := m["coordinates"]
-	if !ok {
-		return fmt.Errorf("pseudo-type GEOMETRY object is not valid, expects 'coordinates' field")
-	}
-
-	var err error
-	switch typ {
-	case "Point":
-		g.Type = "Point"
-		g.Point, err = UnmarshalPoint(coords)
-	case "LineString":
-		g.Type = "LineString"
-		g.Line, err = UnmarshalLineString(coords)
-	case "Polygon":
-		g.Type = "Polygon"
-		g.Lines, err = UnmarshalPolygon(coords)
-	default:
-		return fmt.Errorf("pseudo-type GEOMETRY object has invalid type")
-	}
-
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-type Point struct {
-	Lon float64
-	Lat float64
-}
-type Line []Point
-type Lines []Line
-
-func (p Point) Coords() interface{} {
-	return []interface{}{p.Lon, p.Lat}
-}
-
-func (p Point) MarshalRQL() (interface{}, error) {
-	return map[string]interface{}{
-		"$reql_type$": "GEOMETRY",
-		"coordinates": p.Coords(),
-		"type":        "Point",
-	}, nil
-}
-
-func (p *Point) UnmarshalRQL(data interface{}) error {
-	g := &Geometry{}
-	err := g.UnmarshalRQL(data)
-	if err != nil {
-		return err
-	}
-	if g.Type != "Point" {
-		return fmt.Errorf("pseudo-type GEOMETRY object has type %s, expected type %s", g.Type, "Point")
-	}
-
-	p.Lat = g.Point.Lat
-	p.Lon = g.Point.Lon
-
-	return nil
-}
-
-func (l Line) Coords() interface{} {
-	coords := make([]interface{}, len(l))
-	for i, point := range l {
-		coords[i] = point.Coords()
-	}
-	return coords
-}
-
-func (l Line) MarshalRQL() (interface{}, error) {
-	return map[string]interface{}{
-		"$reql_type$": "GEOMETRY",
-		"coordinates": l.Coords(),
-		"type":        "LineString",
-	}, nil
-}
-
-func (l *Line) UnmarshalRQL(data interface{}) error {
-	g := &Geometry{}
-	err := g.UnmarshalRQL(data)
-	if err != nil {
-		return err
-	}
-	if g.Type != "LineString" {
-		return fmt.Errorf("pseudo-type GEOMETRY object has type %s, expected type %s", g.Type, "LineString")
-	}
-
-	*l = g.Line
-
-	return nil
-}
-
-func (l Lines) Coords() interface{} {
-	coords := make([]interface{}, len(l))
-	for i, line := range l {
-		coords[i] = line.Coords()
-	}
-	return coords
-}
-
-func (l Lines) MarshalRQL() (interface{}, error) {
-	return map[string]interface{}{
-		"$reql_type$": "GEOMETRY",
-		"coordinates": l.Coords(),
-		"type":        "Polygon",
-	}, nil
-}
-
-func (l *Lines) UnmarshalRQL(data interface{}) error {
-	g := &Geometry{}
-	err := g.UnmarshalRQL(data)
-	if err != nil {
-		return err
-	}
-	if g.Type != "Polygon" {
-		return fmt.Errorf("pseudo-type GEOMETRY object has type %s, expected type %s", g.Type, "Polygon")
-	}
-
-	*l = g.Lines
-
-	return nil
-}
-
-func UnmarshalPoint(v interface{}) (Point, error) {
-	coords, ok := v.([]interface{})
-	if !ok {
-		return Point{}, fmt.Errorf("pseudo-type GEOMETRY object field 'coordinates' is not valid")
-	}
-	if len(coords) != 2 {
-		return Point{}, fmt.Errorf("pseudo-type GEOMETRY object field 'coordinates' is not valid")
-	}
-	lon, ok := coords[0].(float64)
-	if !ok {
-		return Point{}, fmt.Errorf("pseudo-type GEOMETRY object field 'coordinates' is not valid")
-	}
-	lat, ok := coords[1].(float64)
-	if !ok {
-		return Point{}, fmt.Errorf("pseudo-type GEOMETRY object field 'coordinates' is not valid")
-	}
-
-	return Point{
-		Lon: lon,
-		Lat: lat,
-	}, nil
-}
-
-func UnmarshalLineString(v interface{}) (Line, error) {
-	points, ok := v.([]interface{})
-	if !ok {
-		return Line{}, fmt.Errorf("pseudo-type GEOMETRY object field 'coordinates' is not valid")
-	}
-
-	var err error
-	line := make(Line, len(points))
-	for i, coords := range points {
-		line[i], err = UnmarshalPoint(coords)
-		if err != nil {
-			return Line{}, err
-		}
-	}
-	return line, nil
-}
-
-func UnmarshalPolygon(v interface{}) (Lines, error) {
-	lines, ok := v.([]interface{})
-	if !ok {
-		return Lines{}, fmt.Errorf("pseudo-type GEOMETRY object field 'coordinates' is not valid")
-	}
-
-	var err error
-	polygon := make(Lines, len(lines))
-	for i, line := range lines {
-		polygon[i], err = UnmarshalLineString(line)
-		if err != nil {
-			return Lines{}, err
-		}
-	}
-	return polygon, nil
-}
diff --git a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/utils.go b/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/utils.go
deleted file mode 100644
index 38940c11d..000000000
--- a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/utils.go
+++ /dev/null
@@ -1,249 +0,0 @@
-package gorethink
-
-import (
-	"reflect"
-	"strconv"
-	"strings"
-	"sync/atomic"
-
-	"github.com/dancannon/gorethink/encoding"
-
-	p "github.com/dancannon/gorethink/ql2"
-)
-
-// Helper functions for constructing terms
-
-// constructRootTerm is an alias for creating a new term.
-func constructRootTerm(name string, termType p.Term_TermType, args []interface{}, optArgs map[string]interface{}) Term {
-	return Term{
-		name:     name,
-		rootTerm: true,
-		termType: termType,
-		args:     convertTermList(args),
-		optArgs:  convertTermObj(optArgs),
-	}
-}
-
-// constructMethodTerm is an alias for creating a new term. Unlike constructRootTerm
-// this function adds the previous expression in the tree to the argument list to
-// create a method term.
-func constructMethodTerm(prevVal Term, name string, termType p.Term_TermType, args []interface{}, optArgs map[string]interface{}) Term {
-	args = append([]interface{}{prevVal}, args...)
-
-	return Term{
-		name:     name,
-		rootTerm: false,
-		termType: termType,
-		args:     convertTermList(args),
-		optArgs:  convertTermObj(optArgs),
-	}
-}
-
-// Helper functions for creating internal RQL types
-
-func newQuery(t Term, qopts map[string]interface{}, copts *ConnectOpts) Query {
-	queryOpts := map[string]interface{}{}
-	for k, v := range qopts {
-		queryOpts[k] = Expr(v).build()
-	}
-	if copts.Database != "" {
-		queryOpts["db"] = DB(copts.Database).build()
-	}
-
-	// Construct query
-	return Query{
-		Type: p.Query_START,
-		Term: &t,
-		Opts: queryOpts,
-	}
-}
-
-// makeArray takes a slice of terms and produces a single MAKE_ARRAY term
-func makeArray(args termsList) Term {
-	return Term{
-		name:     "[...]",
-		termType: p.Term_MAKE_ARRAY,
-		args:     args,
-	}
-}
-
-// makeObject takes a map of terms and produces a single MAKE_OBJECT term
-func makeObject(args termsObj) Term {
-	return Term{
-		name:     "{...}",
-		termType: p.Term_MAKE_OBJ,
-		optArgs:  args,
-	}
-}
-
-var nextVarID int64
-
-func makeFunc(f interface{}) Term {
-	value := reflect.ValueOf(f)
-	valueType := value.Type()
-
-	var argNums = make([]interface{}, valueType.NumIn())
-	var args = make([]reflect.Value, valueType.NumIn())
-	for i := 0; i < valueType.NumIn(); i++ {
-		// Get a slice of the VARs to use as the function arguments
-		args[i] = reflect.ValueOf(constructRootTerm("var", p.Term_VAR, []interface{}{nextVarID}, map[string]interface{}{}))
-		argNums[i] = nextVarID
-		atomic.AddInt64(&nextVarID, 1)
-
-		// make sure all input arguments are of type Term
-		if valueType.In(i).String() != "gorethink.Term" {
-			panic("Function argument is not of type Term")
-		}
-	}
-
-	if valueType.NumOut() != 1 {
-		panic("Function does not have a single return value")
-	}
-
-	body := value.Call(args)[0].Interface()
-	argsArr := makeArray(convertTermList(argNums))
-
-	return constructRootTerm("func", p.Term_FUNC, []interface{}{argsArr, body}, map[string]interface{}{})
-}
-
-func funcWrap(value interface{}) Term {
-	val := Expr(value)
-
-	if implVarScan(val) && val.termType != p.Term_ARGS {
-		return makeFunc(func(x Term) Term {
-			return val
-		})
-	}
-	return val
-}
-
-func funcWrapArgs(args []interface{}) []interface{} {
-	for i, arg := range args {
-		args[i] = funcWrap(arg)
-	}
-
-	return args
-}
-
-// implVarScan recursivly checks a value to see if it contains an
-// IMPLICIT_VAR term. If it does it returns true
-func implVarScan(value Term) bool {
-	if value.termType == p.Term_IMPLICIT_VAR {
-		return true
-	}
-	for _, v := range value.args {
-		if implVarScan(v) {
-			return true
-		}
-	}
-
-	for _, v := range value.optArgs {
-		if implVarScan(v) {
-			return true
-		}
-	}
-
-	return false
-}
-
-// Convert an opt args struct to a map.
-func optArgsToMap(optArgs OptArgs) map[string]interface{} {
-	data, err := encode(optArgs)
-
-	if err == nil && data != nil {
-		if m, ok := data.(map[string]interface{}); ok {
-			return m
-		}
-	}
-
-	return map[string]interface{}{}
-}
-
-// Convert a list into a slice of terms
-func convertTermList(l []interface{}) termsList {
-	terms := make(termsList, len(l))
-	for i, v := range l {
-		terms[i] = Expr(v)
-	}
-
-	return terms
-}
-
-// Convert a map into a map of terms
-func convertTermObj(o map[string]interface{}) termsObj {
-	terms := make(termsObj, len(o))
-	for k, v := range o {
-		terms[k] = Expr(v)
-	}
-
-	return terms
-}
-
-// Helper functions for debugging
-
-func allArgsToStringSlice(args termsList, optArgs termsObj) []string {
-	allArgs := make([]string, len(args)+len(optArgs))
-	i := 0
-
-	for _, v := range args {
-		allArgs[i] = v.String()
-		i++
-	}
-	for k, v := range optArgs {
-		allArgs[i] = k + "=" + v.String()
-		i++
-	}
-
-	return allArgs
-}
-
-func argsToStringSlice(args termsList) []string {
-	allArgs := make([]string, len(args))
-
-	for i, v := range args {
-		allArgs[i] = v.String()
-	}
-
-	return allArgs
-}
-
-func optArgsToStringSlice(optArgs termsObj) []string {
-	allArgs := make([]string, len(optArgs))
-	i := 0
-
-	for k, v := range optArgs {
-		allArgs[i] = k + "=" + v.String()
-		i++
-	}
-
-	return allArgs
-}
-
-func splitAddress(address string) (hostname string, port int) {
-	hostname = "localhost"
-	port = 28015
-
-	addrParts := strings.Split(address, ":")
-
-	if len(addrParts) >= 1 {
-		hostname = addrParts[0]
-	}
-	if len(addrParts) >= 2 {
-		port, _ = strconv.Atoi(addrParts[1])
-	}
-
-	return
-}
-
-func encode(data interface{}) (interface{}, error) {
-	if _, ok := data.(Term); ok {
-		return data, nil
-	}
-
-	v, err := encoding.Encode(data)
-	if err != nil {
-		return nil, err
-	}
-
-	return v, nil
-}
diff --git a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/wercker.yml b/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/wercker.yml
deleted file mode 100644
index 7e1f4183e..000000000
--- a/Godeps/_workspace/src/gopkg.in/dancannon/gorethink.v1/wercker.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-box: google/golang
-# Services
-services:
-    - rethinkdb
-# Build definition
-build:
-    # The steps that will be executed on build
-    steps:
-        - setup-go-workspace
-        
-        - script:
-            name: set rethinkdb_url
-            code: |
-              export RETHINKDB_URL=$RETHINKDB_PORT_28015_TCP_ADDR
-
-        # Gets the dependencies
-        - script:
-            name: get dependencies
-            code: |
-                go get ./...
-        # Build the project
-        - script:
-            name: build
-            code: |
-                go build ./...
-        # Test the project
-        - script:
-            name: Test
-            code: |-
-                go get -u gopkg.in/check.v1
-                go test ./... -short
diff --git a/Godeps/_workspace/src/gopkg.in/fatih/pool.v2/.gitignore b/Godeps/_workspace/src/gopkg.in/fatih/pool.v2/.gitignore
deleted file mode 100644
index 00268614f..000000000
--- a/Godeps/_workspace/src/gopkg.in/fatih/pool.v2/.gitignore
+++ /dev/null
@@ -1,22 +0,0 @@
-# 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
diff --git a/Godeps/_workspace/src/gopkg.in/fatih/pool.v2/.travis.yml b/Godeps/_workspace/src/gopkg.in/fatih/pool.v2/.travis.yml
deleted file mode 100644
index d7acc295a..000000000
--- a/Godeps/_workspace/src/gopkg.in/fatih/pool.v2/.travis.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-language: go
-go: 1.3
diff --git a/Godeps/_workspace/src/gopkg.in/fatih/pool.v2/LICENSE b/Godeps/_workspace/src/gopkg.in/fatih/pool.v2/LICENSE
deleted file mode 100644
index 25fdaf639..000000000
--- a/Godeps/_workspace/src/gopkg.in/fatih/pool.v2/LICENSE
+++ /dev/null
@@ -1,20 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2013 Fatih Arslan
-
-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/gopkg.in/fatih/pool.v2/README.md b/Godeps/_workspace/src/gopkg.in/fatih/pool.v2/README.md
deleted file mode 100644
index 1c7171835..000000000
--- a/Godeps/_workspace/src/gopkg.in/fatih/pool.v2/README.md
+++ /dev/null
@@ -1,59 +0,0 @@
-# Pool [![GoDoc](http://img.shields.io/badge/go-documentation-blue.svg?style=flat-square)](https://godoc.org/gopkg.in/fatih/pool.v2) [![Build Status](http://img.shields.io/travis/fatih/pool.svg?style=flat-square)](https://travis-ci.org/fatih/pool)
-
-
-Pool is a thread safe connection pool for net.Conn interface. It can be used to
-manage and reuse connections.
-
-
-## Install and Usage
-
-Install the package with:
-
-```bash
-go get gopkg.in/fatih/pool.v2
-```
-
-Import it with:
-
-```go
-import "gopkg.in/fatih/pool.v2"
-```
-
-and use `pool` as the package name inside the code.
-
-## Example
-
-```go
-// create a factory() to be used with channel based pool
-factory    := func() (net.Conn, error) { return net.Dial("tcp", "127.0.0.1:4000") }
-
-// create a new channel based pool with an initial capacity of 5 and maximum
-// capacity of 30. The factory will create 5 initial connections and put it
-// into the pool.
-p, err := pool.NewChannelPool(5, 30, factory)
-
-// now you can get a connection from the pool, if there is no connection
-// available it will create a new one via the factory function.
-conn, err := p.Get()
-
-// do something with conn and put it back to the pool by closing the connection
-// (this doesn't close the underlying connection instead it's putting it back
-// to the pool).
-conn.Close()
-
-// close pool any time you want, this closes all the connections inside a pool
-p.Close()
-
-// currently available connections in the pool
-current := p.Len()
-```
-
-
-## Credits
-
- * [Fatih Arslan](https://github.com/fatih)
- * [sougou](https://github.com/sougou)
-
-## License
-
-The MIT License (MIT) - see LICENSE for more details
diff --git a/Godeps/_workspace/src/gopkg.in/fatih/pool.v2/channel.go b/Godeps/_workspace/src/gopkg.in/fatih/pool.v2/channel.go
deleted file mode 100644
index 6218fe152..000000000
--- a/Godeps/_workspace/src/gopkg.in/fatih/pool.v2/channel.go
+++ /dev/null
@@ -1,131 +0,0 @@
-package pool
-
-import (
-	"errors"
-	"fmt"
-	"net"
-	"sync"
-)
-
-// channelPool implements the Pool interface based on buffered channels.
-type channelPool struct {
-	// storage for our net.Conn connections
-	mu    sync.Mutex
-	conns chan net.Conn
-
-	// net.Conn generator
-	factory Factory
-}
-
-// Factory is a function to create new connections.
-type Factory func() (net.Conn, error)
-
-// NewChannelPool returns a new pool based on buffered channels with an initial
-// capacity and maximum capacity. Factory is used when initial capacity is
-// greater than zero to fill the pool. A zero initialCap doesn't fill the Pool
-// until a new Get() is called. During a Get(), If there is no new connection
-// available in the pool, a new connection will be created via the Factory()
-// method.
-func NewChannelPool(initialCap, maxCap int, factory Factory) (Pool, error) {
-	if initialCap < 0 || maxCap <= 0 || initialCap > maxCap {
-		return nil, errors.New("invalid capacity settings")
-	}
-
-	c := &channelPool{
-		conns:   make(chan net.Conn, maxCap),
-		factory: factory,
-	}
-
-	// create initial connections, if something goes wrong,
-	// just close the pool error out.
-	for i := 0; i < initialCap; i++ {
-		conn, err := factory()
-		if err != nil {
-			c.Close()
-			return nil, fmt.Errorf("factory is not able to fill the pool: %s", err)
-		}
-		c.conns <- conn
-	}
-
-	return c, nil
-}
-
-func (c *channelPool) getConns() chan net.Conn {
-	c.mu.Lock()
-	conns := c.conns
-	c.mu.Unlock()
-	return conns
-}
-
-// Get implements the Pool interfaces Get() method. If there is no new
-// connection available in the pool, a new connection will be created via the
-// Factory() method.
-func (c *channelPool) Get() (net.Conn, error) {
-	conns := c.getConns()
-	if conns == nil {
-		return nil, ErrClosed
-	}
-
-	// wrap our connections with out custom net.Conn implementation (wrapConn
-	// method) that puts the connection back to the pool if it's closed.
-	select {
-	case conn := <-conns:
-		if conn == nil {
-			return nil, ErrClosed
-		}
-
-		return c.wrapConn(conn), nil
-	default:
-		conn, err := c.factory()
-		if err != nil {
-			return nil, err
-		}
-
-		return c.wrapConn(conn), nil
-	}
-}
-
-// put puts the connection back to the pool. If the pool is full or closed,
-// conn is simply closed. A nil conn will be rejected.
-func (c *channelPool) put(conn net.Conn) error {
-	if conn == nil {
-		return errors.New("connection is nil. rejecting")
-	}
-
-	c.mu.Lock()
-	defer c.mu.Unlock()
-
-	if c.conns == nil {
-		// pool is closed, close passed connection
-		return conn.Close()
-	}
-
-	// put the resource back into the pool. If the pool is full, this will
-	// block and the default case will be executed.
-	select {
-	case c.conns <- conn:
-		return nil
-	default:
-		// pool is full, close passed connection
-		return conn.Close()
-	}
-}
-
-func (c *channelPool) Close() {
-	c.mu.Lock()
-	conns := c.conns
-	c.conns = nil
-	c.factory = nil
-	c.mu.Unlock()
-
-	if conns == nil {
-		return
-	}
-
-	close(conns)
-	for conn := range conns {
-		conn.Close()
-	}
-}
-
-func (c *channelPool) Len() int { return len(c.getConns()) }
diff --git a/Godeps/_workspace/src/gopkg.in/fatih/pool.v2/channel_test.go b/Godeps/_workspace/src/gopkg.in/fatih/pool.v2/channel_test.go
deleted file mode 100644
index 7d5522f85..000000000
--- a/Godeps/_workspace/src/gopkg.in/fatih/pool.v2/channel_test.go
+++ /dev/null
@@ -1,274 +0,0 @@
-package pool
-
-import (
-	"log"
-	"math/rand"
-	"net"
-	"sync"
-	"testing"
-	"time"
-)
-
-var (
-	InitialCap = 5
-	MaximumCap = 30
-	network    = "tcp"
-	address    = "127.0.0.1:7777"
-	factory    = func() (net.Conn, error) { return net.Dial(network, address) }
-)
-
-func init() {
-	// used for factory function
-	go simpleTCPServer()
-	time.Sleep(time.Millisecond * 300) // wait until tcp server has been settled
-
-	rand.Seed(time.Now().UTC().UnixNano())
-}
-
-func TestNew(t *testing.T) {
-	_, err := newChannelPool()
-	if err != nil {
-		t.Errorf("New error: %s", err)
-	}
-}
-func TestPool_Get_Impl(t *testing.T) {
-	p, _ := newChannelPool()
-	defer p.Close()
-
-	conn, err := p.Get()
-	if err != nil {
-		t.Errorf("Get error: %s", err)
-	}
-
-	_, ok := conn.(*PoolConn)
-	if !ok {
-		t.Errorf("Conn is not of type poolConn")
-	}
-}
-
-func TestPool_Get(t *testing.T) {
-	p, _ := newChannelPool()
-	defer p.Close()
-
-	_, err := p.Get()
-	if err != nil {
-		t.Errorf("Get error: %s", err)
-	}
-
-	// after one get, current capacity should be lowered by one.
-	if p.Len() != (InitialCap - 1) {
-		t.Errorf("Get error. Expecting %d, got %d",
-			(InitialCap - 1), p.Len())
-	}
-
-	// get them all
-	var wg sync.WaitGroup
-	for i := 0; i < (InitialCap - 1); i++ {
-		wg.Add(1)
-		go func() {
-			defer wg.Done()
-			_, err := p.Get()
-			if err != nil {
-				t.Errorf("Get error: %s", err)
-			}
-		}()
-	}
-	wg.Wait()
-
-	if p.Len() != 0 {
-		t.Errorf("Get error. Expecting %d, got %d",
-			(InitialCap - 1), p.Len())
-	}
-
-	_, err = p.Get()
-	if err != nil {
-		t.Errorf("Get error: %s", err)
-	}
-}
-
-func TestPool_Put(t *testing.T) {
-	p, err := NewChannelPool(0, 30, factory)
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer p.Close()
-
-	// get/create from the pool
-	conns := make([]net.Conn, MaximumCap)
-	for i := 0; i < MaximumCap; i++ {
-		conn, _ := p.Get()
-		conns[i] = conn
-	}
-
-	// now put them all back
-	for _, conn := range conns {
-		conn.Close()
-	}
-
-	if p.Len() != MaximumCap {
-		t.Errorf("Put error len. Expecting %d, got %d",
-			1, p.Len())
-	}
-
-	conn, _ := p.Get()
-	p.Close() // close pool
-
-	conn.Close() // try to put into a full pool
-	if p.Len() != 0 {
-		t.Errorf("Put error. Closed pool shouldn't allow to put connections.")
-	}
-}
-
-func TestPool_PutUnusableConn(t *testing.T) {
-	p, _ := newChannelPool()
-	defer p.Close()
-
-	// ensure pool is not empty
-	conn, _ := p.Get()
-	conn.Close()
-
-	poolSize := p.Len()
-	conn, _ = p.Get()
-	conn.Close()
-	if p.Len() != poolSize {
-		t.Errorf("Pool size is expected to be equal to initial size")
-	}
-
-	conn, _ = p.Get()
-	if pc, ok := conn.(*PoolConn); !ok {
-		t.Errorf("impossible")
-	} else {
-		pc.MarkUnusable()
-	}
-	conn.Close()
-	if p.Len() != poolSize-1 {
-		t.Errorf("Pool size is expected to be initial_size - 1", p.Len(), poolSize-1)
-	}
-}
-
-func TestPool_UsedCapacity(t *testing.T) {
-	p, _ := newChannelPool()
-	defer p.Close()
-
-	if p.Len() != InitialCap {
-		t.Errorf("InitialCap error. Expecting %d, got %d",
-			InitialCap, p.Len())
-	}
-}
-
-func TestPool_Close(t *testing.T) {
-	p, _ := newChannelPool()
-
-	// now close it and test all cases we are expecting.
-	p.Close()
-
-	c := p.(*channelPool)
-
-	if c.conns != nil {
-		t.Errorf("Close error, conns channel should be nil")
-	}
-
-	if c.factory != nil {
-		t.Errorf("Close error, factory should be nil")
-	}
-
-	_, err := p.Get()
-	if err == nil {
-		t.Errorf("Close error, get conn should return an error")
-	}
-
-	if p.Len() != 0 {
-		t.Errorf("Close error used capacity. Expecting 0, got %d", p.Len())
-	}
-}
-
-func TestPoolConcurrent(t *testing.T) {
-	p, _ := newChannelPool()
-	pipe := make(chan net.Conn, 0)
-
-	go func() {
-		p.Close()
-	}()
-
-	for i := 0; i < MaximumCap; i++ {
-		go func() {
-			conn, _ := p.Get()
-
-			pipe <- conn
-		}()
-
-		go func() {
-			conn := <-pipe
-			if conn == nil {
-				return
-			}
-			conn.Close()
-		}()
-	}
-}
-
-func TestPoolWriteRead(t *testing.T) {
-	p, _ := NewChannelPool(0, 30, factory)
-
-	conn, _ := p.Get()
-
-	msg := "hello"
-	_, err := conn.Write([]byte(msg))
-	if err != nil {
-		t.Error(err)
-	}
-}
-
-func TestPoolConcurrent2(t *testing.T) {
-	p, _ := NewChannelPool(0, 30, factory)
-
-	var wg sync.WaitGroup
-
-	go func() {
-		for i := 0; i < 10; i++ {
-			wg.Add(1)
-			go func(i int) {
-				conn, _ := p.Get()
-				time.Sleep(time.Millisecond * time.Duration(rand.Intn(100)))
-				conn.Close()
-				wg.Done()
-			}(i)
-		}
-	}()
-
-	for i := 0; i < 10; i++ {
-		wg.Add(1)
-		go func(i int) {
-			conn, _ := p.Get()
-			time.Sleep(time.Millisecond * time.Duration(rand.Intn(100)))
-			conn.Close()
-			wg.Done()
-		}(i)
-	}
-
-	wg.Wait()
-}
-
-func newChannelPool() (Pool, error) {
-	return NewChannelPool(InitialCap, MaximumCap, factory)
-}
-
-func simpleTCPServer() {
-	l, err := net.Listen(network, address)
-	if err != nil {
-		log.Fatal(err)
-	}
-	defer l.Close()
-
-	for {
-		conn, err := l.Accept()
-		if err != nil {
-			log.Fatal(err)
-		}
-
-		go func() {
-			buffer := make([]byte, 256)
-			conn.Read(buffer)
-		}()
-	}
-}
diff --git a/Godeps/_workspace/src/gopkg.in/fatih/pool.v2/conn.go b/Godeps/_workspace/src/gopkg.in/fatih/pool.v2/conn.go
deleted file mode 100644
index bc2d70587..000000000
--- a/Godeps/_workspace/src/gopkg.in/fatih/pool.v2/conn.go
+++ /dev/null
@@ -1,34 +0,0 @@
-package pool
-
-import "net"
-
-// PoolConn is a wrapper around net.Conn to modify the the behavior of
-// net.Conn's Close() method.
-type PoolConn struct {
-	net.Conn
-	c          *channelPool
-	unusable bool
-}
-
-// Close() puts the given connects back to the pool instead of closing it.
-func (p PoolConn) Close() error {
-	if p.unusable {
-		if p.Conn != nil {
-			return p.Conn.Close()
-		}
-		return nil
-	}
-	return p.c.put(p.Conn)
-}
-
-// MarkUnusable() marks the connection not usable any more, to let the pool close it instead of returning it to pool.
-func (p *PoolConn) MarkUnusable() {
-	p.unusable = true
-}
-
-// newConn wraps a standard net.Conn to a poolConn net.Conn.
-func (c *channelPool) wrapConn(conn net.Conn) net.Conn {
-	p := &PoolConn{c: c}
-	p.Conn = conn
-	return p
-}
diff --git a/Godeps/_workspace/src/gopkg.in/fatih/pool.v2/conn_test.go b/Godeps/_workspace/src/gopkg.in/fatih/pool.v2/conn_test.go
deleted file mode 100644
index 55f9237f3..000000000
--- a/Godeps/_workspace/src/gopkg.in/fatih/pool.v2/conn_test.go
+++ /dev/null
@@ -1,10 +0,0 @@
-package pool
-
-import (
-	"net"
-	"testing"
-)
-
-func TestConn_Impl(t *testing.T) {
-	var _ net.Conn = new(PoolConn)
-}
diff --git a/Godeps/_workspace/src/gopkg.in/fatih/pool.v2/pool.go b/Godeps/_workspace/src/gopkg.in/fatih/pool.v2/pool.go
deleted file mode 100644
index f88f2acbb..000000000
--- a/Godeps/_workspace/src/gopkg.in/fatih/pool.v2/pool.go
+++ /dev/null
@@ -1,28 +0,0 @@
-// Package pool implements a pool of net.Conn interfaces to manage and reuse them.
-package pool
-
-import (
-	"errors"
-	"net"
-)
-
-var (
-	// ErrClosed is the error resulting if the pool is closed via pool.Close().
-	ErrClosed = errors.New("pool is closed")
-)
-
-// Pool interface describes a pool implementation. A pool should have maximum
-// capacity. An ideal pool is threadsafe and easy to use.
-type Pool interface {
-	// Get returns a new connection from the pool. Closing the connections puts
-	// it back to the Pool. Closing it when the pool is destroyed or full will
-	// be counted as an error.
-	Get() (net.Conn, error)
-
-	// Close closes the pool and all its connections. After Close() the pool is
-	// no longer usable.
-	Close()
-
-	// Len returns the current number of connections of the pool.
-	Len() int
-}
diff --git a/Godeps/_workspace/src/gopkg.in/mgo.v2/LICENSE b/Godeps/_workspace/src/gopkg.in/mgo.v2/LICENSE
deleted file mode 100644
index 770c7672b..000000000
--- a/Godeps/_workspace/src/gopkg.in/mgo.v2/LICENSE
+++ /dev/null
@@ -1,25 +0,0 @@
-mgo - MongoDB driver for Go
-
-Copyright (c) 2010-2013 - Gustavo Niemeyer <gustavo@niemeyer.net>
-
-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 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/gopkg.in/mgo.v2/Makefile b/Godeps/_workspace/src/gopkg.in/mgo.v2/Makefile
deleted file mode 100644
index 51bee7322..000000000
--- a/Godeps/_workspace/src/gopkg.in/mgo.v2/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-startdb:
-	@testdb/setup.sh start
-
-stopdb:
-	@testdb/setup.sh stop
diff --git a/Godeps/_workspace/src/gopkg.in/mgo.v2/README.md b/Godeps/_workspace/src/gopkg.in/mgo.v2/README.md
deleted file mode 100644
index f4e452c04..000000000
--- a/Godeps/_workspace/src/gopkg.in/mgo.v2/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-The MongoDB driver for Go
--------------------------
-
-Please go to [http://labix.org/mgo](http://labix.org/mgo) for all project details.
diff --git a/Godeps/_workspace/src/gopkg.in/mgo.v2/auth.go b/Godeps/_workspace/src/gopkg.in/mgo.v2/auth.go
deleted file mode 100644
index dc26e52f5..000000000
--- a/Godeps/_workspace/src/gopkg.in/mgo.v2/auth.go
+++ /dev/null
@@ -1,467 +0,0 @@
-// mgo - MongoDB driver for Go
-//
-// Copyright (c) 2010-2012 - Gustavo Niemeyer <gustavo@niemeyer.net>
-//
-// 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 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.
-
-package mgo
-
-import (
-	"crypto/md5"
-	"crypto/sha1"
-	"encoding/hex"
-	"errors"
-	"fmt"
-	"sync"
-
-	"gopkg.in/mgo.v2/bson"
-	"gopkg.in/mgo.v2/internal/scram"
-)
-
-type authCmd struct {
-	Authenticate int
-
-	Nonce string
-	User  string
-	Key   string
-}
-
-type startSaslCmd struct {
-	StartSASL int `bson:"startSasl"`
-}
-
-type authResult struct {
-	ErrMsg string
-	Ok     bool
-}
-
-type getNonceCmd struct {
-	GetNonce int
-}
-
-type getNonceResult struct {
-	Nonce string
-	Err   string "$err"
-	Code  int
-}
-
-type logoutCmd struct {
-	Logout int
-}
-
-type saslCmd struct {
-	Start          int    `bson:"saslStart,omitempty"`
-	Continue       int    `bson:"saslContinue,omitempty"`
-	ConversationId int    `bson:"conversationId,omitempty"`
-	Mechanism      string `bson:"mechanism,omitempty"`
-	Payload        []byte
-}
-
-type saslResult struct {
-	Ok    bool `bson:"ok"`
-	NotOk bool `bson:"code"` // Server <= 2.3.2 returns ok=1 & code>0 on errors (WTF?)
-	Done  bool
-
-	ConversationId int `bson:"conversationId"`
-	Payload        []byte
-	ErrMsg         string
-}
-
-type saslStepper interface {
-	Step(serverData []byte) (clientData []byte, done bool, err error)
-	Close()
-}
-
-func (socket *mongoSocket) getNonce() (nonce string, err error) {
-	socket.Lock()
-	for socket.cachedNonce == "" && socket.dead == nil {
-		debugf("Socket %p to %s: waiting for nonce", socket, socket.addr)
-		socket.gotNonce.Wait()
-	}
-	if socket.cachedNonce == "mongos" {
-		socket.Unlock()
-		return "", errors.New("Can't authenticate with mongos; see http://j.mp/mongos-auth")
-	}
-	debugf("Socket %p to %s: got nonce", socket, socket.addr)
-	nonce, err = socket.cachedNonce, socket.dead
-	socket.cachedNonce = ""
-	socket.Unlock()
-	if err != nil {
-		nonce = ""
-	}
-	return
-}
-
-func (socket *mongoSocket) resetNonce() {
-	debugf("Socket %p to %s: requesting a new nonce", socket, socket.addr)
-	op := &queryOp{}
-	op.query = &getNonceCmd{GetNonce: 1}
-	op.collection = "admin.$cmd"
-	op.limit = -1
-	op.replyFunc = func(err error, reply *replyOp, docNum int, docData []byte) {
-		if err != nil {
-			socket.kill(errors.New("getNonce: "+err.Error()), true)
-			return
-		}
-		result := &getNonceResult{}
-		err = bson.Unmarshal(docData, &result)
-		if err != nil {
-			socket.kill(errors.New("Failed to unmarshal nonce: "+err.Error()), true)
-			return
-		}
-		debugf("Socket %p to %s: nonce unmarshalled: %#v", socket, socket.addr, result)
-		if result.Code == 13390 {
-			// mongos doesn't yet support auth (see http://j.mp/mongos-auth)
-			result.Nonce = "mongos"
-		} else if result.Nonce == "" {
-			var msg string
-			if result.Err != "" {
-				msg = fmt.Sprintf("Got an empty nonce: %s (%d)", result.Err, result.Code)
-			} else {
-				msg = "Got an empty nonce"
-			}
-			socket.kill(errors.New(msg), true)
-			return
-		}
-		socket.Lock()
-		if socket.cachedNonce != "" {
-			socket.Unlock()
-			panic("resetNonce: nonce already cached")
-		}
-		socket.cachedNonce = result.Nonce
-		socket.gotNonce.Signal()
-		socket.Unlock()
-	}
-	err := socket.Query(op)
-	if err != nil {
-		socket.kill(errors.New("resetNonce: "+err.Error()), true)
-	}
-}
-
-func (socket *mongoSocket) Login(cred Credential) error {
-	socket.Lock()
-	if cred.Mechanism == "" && socket.serverInfo.MaxWireVersion >= 3 {
-		cred.Mechanism = "SCRAM-SHA-1"
-	}
-	for _, sockCred := range socket.creds {
-		if sockCred == cred {
-			debugf("Socket %p to %s: login: db=%q user=%q (already logged in)", socket, socket.addr, cred.Source, cred.Username)
-			socket.Unlock()
-			return nil
-		}
-	}
-	if socket.dropLogout(cred) {
-		debugf("Socket %p to %s: login: db=%q user=%q (cached)", socket, socket.addr, cred.Source, cred.Username)
-		socket.creds = append(socket.creds, cred)
-		socket.Unlock()
-		return nil
-	}
-	socket.Unlock()
-
-	debugf("Socket %p to %s: login: db=%q user=%q", socket, socket.addr, cred.Source, cred.Username)
-
-	var err error
-	switch cred.Mechanism {
-	case "", "MONGODB-CR", "MONGO-CR": // Name changed to MONGODB-CR in SERVER-8501.
-		err = socket.loginClassic(cred)
-	case "PLAIN":
-		err = socket.loginPlain(cred)
-	case "MONGODB-X509":
-		err = socket.loginX509(cred)
-	default:
-		// Try SASL for everything else, if it is available.
-		err = socket.loginSASL(cred)
-	}
-
-	if err != nil {
-		debugf("Socket %p to %s: login error: %s", socket, socket.addr, err)
-	} else {
-		debugf("Socket %p to %s: login successful", socket, socket.addr)
-	}
-	return err
-}
-
-func (socket *mongoSocket) loginClassic(cred Credential) error {
-	// Note that this only works properly because this function is
-	// synchronous, which means the nonce won't get reset while we're
-	// using it and any other login requests will block waiting for a
-	// new nonce provided in the defer call below.
-	nonce, err := socket.getNonce()
-	if err != nil {
-		return err
-	}
-	defer socket.resetNonce()
-
-	psum := md5.New()
-	psum.Write([]byte(cred.Username + ":mongo:" + cred.Password))
-
-	ksum := md5.New()
-	ksum.Write([]byte(nonce + cred.Username))
-	ksum.Write([]byte(hex.EncodeToString(psum.Sum(nil))))
-
-	key := hex.EncodeToString(ksum.Sum(nil))
-
-	cmd := authCmd{Authenticate: 1, User: cred.Username, Nonce: nonce, Key: key}
-	res := authResult{}
-	return socket.loginRun(cred.Source, &cmd, &res, func() error {
-		if !res.Ok {
-			return errors.New(res.ErrMsg)
-		}
-		socket.Lock()
-		socket.dropAuth(cred.Source)
-		socket.creds = append(socket.creds, cred)
-		socket.Unlock()
-		return nil
-	})
-}
-
-type authX509Cmd struct {
-	Authenticate int
-	User         string
-	Mechanism    string
-}
-
-func (socket *mongoSocket) loginX509(cred Credential) error {
-	cmd := authX509Cmd{Authenticate: 1, User: cred.Username, Mechanism: "MONGODB-X509"}
-	res := authResult{}
-	return socket.loginRun(cred.Source, &cmd, &res, func() error {
-		if !res.Ok {
-			return errors.New(res.ErrMsg)
-		}
-		socket.Lock()
-		socket.dropAuth(cred.Source)
-		socket.creds = append(socket.creds, cred)
-		socket.Unlock()
-		return nil
-	})
-}
-
-func (socket *mongoSocket) loginPlain(cred Credential) error {
-	cmd := saslCmd{Start: 1, Mechanism: "PLAIN", Payload: []byte("\x00" + cred.Username + "\x00" + cred.Password)}
-	res := authResult{}
-	return socket.loginRun(cred.Source, &cmd, &res, func() error {
-		if !res.Ok {
-			return errors.New(res.ErrMsg)
-		}
-		socket.Lock()
-		socket.dropAuth(cred.Source)
-		socket.creds = append(socket.creds, cred)
-		socket.Unlock()
-		return nil
-	})
-}
-
-func (socket *mongoSocket) loginSASL(cred Credential) error {
-	var sasl saslStepper
-	var err error
-	if cred.Mechanism == "SCRAM-SHA-1" {
-		// SCRAM is handled without external libraries.
-		sasl = saslNewScram(cred)
-	} else if len(cred.ServiceHost) > 0 {
-		sasl, err = saslNew(cred, cred.ServiceHost)
-	} else {
-		sasl, err = saslNew(cred, socket.Server().Addr)
-	}
-	if err != nil {
-		return err
-	}
-	defer sasl.Close()
-
-	// The goal of this logic is to carry a locked socket until the
-	// local SASL step confirms the auth is valid; the socket needs to be
-	// locked so that concurrent action doesn't leave the socket in an
-	// auth state that doesn't reflect the operations that took place.
-	// As a simple case, imagine inverting login=>logout to logout=>login.
-	//
-	// The logic below works because the lock func isn't called concurrently.
-	locked := false
-	lock := func(b bool) {
-		if locked != b {
-			locked = b
-			if b {
-				socket.Lock()
-			} else {
-				socket.Unlock()
-			}
-		}
-	}
-
-	lock(true)
-	defer lock(false)
-
-	start := 1
-	cmd := saslCmd{}
-	res := saslResult{}
-	for {
-		payload, done, err := sasl.Step(res.Payload)
-		if err != nil {
-			return err
-		}
-		if done && res.Done {
-			socket.dropAuth(cred.Source)
-			socket.creds = append(socket.creds, cred)
-			break
-		}
-		lock(false)
-
-		cmd = saslCmd{
-			Start:          start,
-			Continue:       1 - start,
-			ConversationId: res.ConversationId,
-			Mechanism:      cred.Mechanism,
-			Payload:        payload,
-		}
-		start = 0
-		err = socket.loginRun(cred.Source, &cmd, &res, func() error {
-			// See the comment on lock for why this is necessary.
-			lock(true)
-			if !res.Ok || res.NotOk {
-				return fmt.Errorf("server returned error on SASL authentication step: %s", res.ErrMsg)
-			}
-			return nil
-		})
-		if err != nil {
-			return err
-		}
-		if done && res.Done {
-			socket.dropAuth(cred.Source)
-			socket.creds = append(socket.creds, cred)
-			break
-		}
-	}
-
-	return nil
-}
-
-func saslNewScram(cred Credential) *saslScram {
-	credsum := md5.New()
-	credsum.Write([]byte(cred.Username + ":mongo:" + cred.Password))
-	client := scram.NewClient(sha1.New, cred.Username, hex.EncodeToString(credsum.Sum(nil)))
-	return &saslScram{cred: cred, client: client}
-}
-
-type saslScram struct {
-	cred   Credential
-	client *scram.Client
-}
-
-func (s *saslScram) Close() {}
-
-func (s *saslScram) Step(serverData []byte) (clientData []byte, done bool, err error) {
-	more := s.client.Step(serverData)
-	return s.client.Out(), !more, s.client.Err()
-}
-
-func (socket *mongoSocket) loginRun(db string, query, result interface{}, f func() error) error {
-	var mutex sync.Mutex
-	var replyErr error
-	mutex.Lock()
-
-	op := queryOp{}
-	op.query = query
-	op.collection = db + ".$cmd"
-	op.limit = -1
-	op.replyFunc = func(err error, reply *replyOp, docNum int, docData []byte) {
-		defer mutex.Unlock()
-
-		if err != nil {
-			replyErr = err
-			return
-		}
-
-		err = bson.Unmarshal(docData, result)
-		if err != nil {
-			replyErr = err
-		} else {
-			// Must handle this within the read loop for the socket, so
-			// that concurrent login requests are properly ordered.
-			replyErr = f()
-		}
-	}
-
-	err := socket.Query(&op)
-	if err != nil {
-		return err
-	}
-	mutex.Lock() // Wait.
-	return replyErr
-}
-
-func (socket *mongoSocket) Logout(db string) {
-	socket.Lock()
-	cred, found := socket.dropAuth(db)
-	if found {
-		debugf("Socket %p to %s: logout: db=%q (flagged)", socket, socket.addr, db)
-		socket.logout = append(socket.logout, cred)
-	}
-	socket.Unlock()
-}
-
-func (socket *mongoSocket) LogoutAll() {
-	socket.Lock()
-	if l := len(socket.creds); l > 0 {
-		debugf("Socket %p to %s: logout all (flagged %d)", socket, socket.addr, l)
-		socket.logout = append(socket.logout, socket.creds...)
-		socket.creds = socket.creds[0:0]
-	}
-	socket.Unlock()
-}
-
-func (socket *mongoSocket) flushLogout() (ops []interface{}) {
-	socket.Lock()
-	if l := len(socket.logout); l > 0 {
-		debugf("Socket %p to %s: logout all (flushing %d)", socket, socket.addr, l)
-		for i := 0; i != l; i++ {
-			op := queryOp{}
-			op.query = &logoutCmd{1}
-			op.collection = socket.logout[i].Source + ".$cmd"
-			op.limit = -1
-			ops = append(ops, &op)
-		}
-		socket.logout = socket.logout[0:0]
-	}
-	socket.Unlock()
-	return
-}
-
-func (socket *mongoSocket) dropAuth(db string) (cred Credential, found bool) {
-	for i, sockCred := range socket.creds {
-		if sockCred.Source == db {
-			copy(socket.creds[i:], socket.creds[i+1:])
-			socket.creds = socket.creds[:len(socket.creds)-1]
-			return sockCred, true
-		}
-	}
-	return cred, false
-}
-
-func (socket *mongoSocket) dropLogout(cred Credential) (found bool) {
-	for i, sockCred := range socket.logout {
-		if sockCred == cred {
-			copy(socket.logout[i:], socket.logout[i+1:])
-			socket.logout = socket.logout[:len(socket.logout)-1]
-			return true
-		}
-	}
-	return false
-}
diff --git a/Godeps/_workspace/src/gopkg.in/mgo.v2/auth_test.go b/Godeps/_workspace/src/gopkg.in/mgo.v2/auth_test.go
deleted file mode 100644
index eb42ab1d6..000000000
--- a/Godeps/_workspace/src/gopkg.in/mgo.v2/auth_test.go
+++ /dev/null
@@ -1,1180 +0,0 @@
-// mgo - MongoDB driver for Go
-//
-// Copyright (c) 2010-2012 - Gustavo Niemeyer <gustavo@niemeyer.net>
-//
-// 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 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.
-
-package mgo_test
-
-import (
-	"crypto/tls"
-	"flag"
-	"fmt"
-	"io/ioutil"
-	"net"
-	"net/url"
-	"os"
-	"runtime"
-	"sync"
-	"time"
-
-	. "gopkg.in/check.v1"
-	"gopkg.in/mgo.v2"
-)
-
-func (s *S) TestAuthLoginDatabase(c *C) {
-	// Test both with a normal database and with an authenticated shard.
-	for _, addr := range []string{"localhost:40002", "localhost:40203"} {
-		session, err := mgo.Dial(addr)
-		c.Assert(err, IsNil)
-		defer session.Close()
-
-		coll := session.DB("mydb").C("mycoll")
-		err = coll.Insert(M{"n": 1})
-		c.Assert(err, ErrorMatches, "unauthorized|need to login|not authorized .*")
-
-		admindb := session.DB("admin")
-
-		err = admindb.Login("root", "wrong")
-		c.Assert(err, ErrorMatches, "auth fail(s|ed)|.*Authentication failed.")
-
-		err = admindb.Login("root", "rapadura")
-		c.Assert(err, IsNil)
-
-		err = coll.Insert(M{"n": 1})
-		c.Assert(err, IsNil)
-	}
-}
-
-func (s *S) TestAuthLoginSession(c *C) {
-	// Test both with a normal database and with an authenticated shard.
-	for _, addr := range []string{"localhost:40002", "localhost:40203"} {
-		session, err := mgo.Dial(addr)
-		c.Assert(err, IsNil)
-		defer session.Close()
-
-		coll := session.DB("mydb").C("mycoll")
-		err = coll.Insert(M{"n": 1})
-		c.Assert(err, ErrorMatches, "unauthorized|need to login|not authorized .*")
-
-		cred := mgo.Credential{
-			Username: "root",
-			Password: "wrong",
-		}
-		err = session.Login(&cred)
-		c.Assert(err, ErrorMatches, "auth fail(s|ed)|.*Authentication failed.")
-
-		cred.Password = "rapadura"
-
-		err = session.Login(&cred)
-		c.Assert(err, IsNil)
-
-		err = coll.Insert(M{"n": 1})
-		c.Assert(err, IsNil)
-	}
-}
-
-func (s *S) TestAuthLoginLogout(c *C) {
-	// Test both with a normal database and with an authenticated shard.
-	for _, addr := range []string{"localhost:40002", "localhost:40203"} {
-		session, err := mgo.Dial(addr)
-		c.Assert(err, IsNil)
-		defer session.Close()
-
-		admindb := session.DB("admin")
-		err = admindb.Login("root", "rapadura")
-		c.Assert(err, IsNil)
-
-		admindb.Logout()
-
-		coll := session.DB("mydb").C("mycoll")
-		err = coll.Insert(M{"n": 1})
-		c.Assert(err, ErrorMatches, "unauthorized|need to login|not authorized .*")
-
-		// Must have dropped auth from the session too.
-		session = session.Copy()
-		defer session.Close()
-
-		coll = session.DB("mydb").C("mycoll")
-		err = coll.Insert(M{"n": 1})
-		c.Assert(err, ErrorMatches, "unauthorized|need to login|not authorized .*")
-	}
-}
-
-func (s *S) TestAuthLoginLogoutAll(c *C) {
-	session, err := mgo.Dial("localhost:40002")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	admindb := session.DB("admin")
-	err = admindb.Login("root", "rapadura")
-	c.Assert(err, IsNil)
-
-	session.LogoutAll()
-
-	coll := session.DB("mydb").C("mycoll")
-	err = coll.Insert(M{"n": 1})
-	c.Assert(err, ErrorMatches, "unauthorized|need to login|not authorized .*")
-
-	// Must have dropped auth from the session too.
-	session = session.Copy()
-	defer session.Close()
-
-	coll = session.DB("mydb").C("mycoll")
-	err = coll.Insert(M{"n": 1})
-	c.Assert(err, ErrorMatches, "unauthorized|need to login|not authorized .*")
-}
-
-func (s *S) TestAuthUpsertUserErrors(c *C) {
-	session, err := mgo.Dial("localhost:40002")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	admindb := session.DB("admin")
-	err = admindb.Login("root", "rapadura")
-	c.Assert(err, IsNil)
-
-	mydb := session.DB("mydb")
-
-	err = mydb.UpsertUser(&mgo.User{})
-	c.Assert(err, ErrorMatches, "user has no Username")
-
-	err = mydb.UpsertUser(&mgo.User{Username: "user", Password: "pass", UserSource: "source"})
-	c.Assert(err, ErrorMatches, "user has both Password/PasswordHash and UserSource set")
-
-	err = mydb.UpsertUser(&mgo.User{Username: "user", Password: "pass", OtherDBRoles: map[string][]mgo.Role{"db": nil}})
-	c.Assert(err, ErrorMatches, "user with OtherDBRoles is only supported in the admin or \\$external databases")
-}
-
-func (s *S) TestAuthUpsertUser(c *C) {
-	if !s.versionAtLeast(2, 4) {
-		c.Skip("UpsertUser only works on 2.4+")
-	}
-	session, err := mgo.Dial("localhost:40002")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	admindb := session.DB("admin")
-	err = admindb.Login("root", "rapadura")
-	c.Assert(err, IsNil)
-
-	mydb := session.DB("mydb")
-
-	ruser := &mgo.User{
-		Username: "myruser",
-		Password: "mypass",
-		Roles:    []mgo.Role{mgo.RoleRead},
-	}
-	rwuser := &mgo.User{
-		Username: "myrwuser",
-		Password: "mypass",
-		Roles:    []mgo.Role{mgo.RoleReadWrite},
-	}
-
-	err = mydb.UpsertUser(ruser)
-	c.Assert(err, IsNil)
-	err = mydb.UpsertUser(rwuser)
-	c.Assert(err, IsNil)
-
-	err = mydb.Login("myruser", "mypass")
-	c.Assert(err, IsNil)
-
-	admindb.Logout()
-
-	coll := session.DB("mydb").C("mycoll")
-	err = coll.Insert(M{"n": 1})
-	c.Assert(err, ErrorMatches, "unauthorized|not authorized .*")
-
-	err = mydb.Login("myrwuser", "mypass")
-	c.Assert(err, IsNil)
-
-	err = coll.Insert(M{"n": 1})
-	c.Assert(err, IsNil)
-
-	myotherdb := session.DB("myotherdb")
-
-	err = admindb.Login("root", "rapadura")
-	c.Assert(err, IsNil)
-
-	// Test UserSource.
-	rwuserother := &mgo.User{
-		Username:   "myrwuser",
-		UserSource: "mydb",
-		Roles:      []mgo.Role{mgo.RoleRead},
-	}
-
-	err = myotherdb.UpsertUser(rwuserother)
-	if s.versionAtLeast(2, 6) {
-		c.Assert(err, ErrorMatches, `MongoDB 2.6\+ does not support the UserSource setting`)
-		return
-	}
-	c.Assert(err, IsNil)
-
-	admindb.Logout()
-
-	// Test indirection via UserSource: we can't write to it, because
-	// the roles for myrwuser are different there.
-	othercoll := myotherdb.C("myothercoll")
-	err = othercoll.Insert(M{"n": 1})
-	c.Assert(err, ErrorMatches, "unauthorized|not authorized .*")
-
-	// Reading works, though.
-	err = othercoll.Find(nil).One(nil)
-	c.Assert(err, Equals, mgo.ErrNotFound)
-
-	// Can't login directly into the database using UserSource, though.
-	err = myotherdb.Login("myrwuser", "mypass")
-	c.Assert(err, ErrorMatches, "auth fail(s|ed)|.*Authentication failed.")
-}
-
-func (s *S) TestAuthUpsertUserOtherDBRoles(c *C) {
-	if !s.versionAtLeast(2, 4) {
-		c.Skip("UpsertUser only works on 2.4+")
-	}
-	session, err := mgo.Dial("localhost:40002")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	admindb := session.DB("admin")
-	err = admindb.Login("root", "rapadura")
-	c.Assert(err, IsNil)
-
-	ruser := &mgo.User{
-		Username:     "myruser",
-		Password:     "mypass",
-		OtherDBRoles: map[string][]mgo.Role{"mydb": []mgo.Role{mgo.RoleRead}},
-	}
-
-	err = admindb.UpsertUser(ruser)
-	c.Assert(err, IsNil)
-	defer admindb.RemoveUser("myruser")
-
-	admindb.Logout()
-	err = admindb.Login("myruser", "mypass")
-
-	coll := session.DB("mydb").C("mycoll")
-	err = coll.Insert(M{"n": 1})
-	c.Assert(err, ErrorMatches, "unauthorized|not authorized .*")
-
-	err = coll.Find(nil).One(nil)
-	c.Assert(err, Equals, mgo.ErrNotFound)
-}
-
-func (s *S) TestAuthUpsertUserUpdates(c *C) {
-	if !s.versionAtLeast(2, 4) {
-		c.Skip("UpsertUser only works on 2.4+")
-	}
-	session, err := mgo.Dial("localhost:40002")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	admindb := session.DB("admin")
-	err = admindb.Login("root", "rapadura")
-	c.Assert(err, IsNil)
-
-	mydb := session.DB("mydb")
-
-	// Insert a user that can read.
-	user := &mgo.User{
-		Username: "myruser",
-		Password: "mypass",
-		Roles:    []mgo.Role{mgo.RoleRead},
-	}
-	err = mydb.UpsertUser(user)
-	c.Assert(err, IsNil)
-
-	// Now update the user password.
-	user = &mgo.User{
-		Username: "myruser",
-		Password: "mynewpass",
-	}
-	err = mydb.UpsertUser(user)
-	c.Assert(err, IsNil)
-
-	// Login with the new user.
-	usession, err := mgo.Dial("myruser:mynewpass@localhost:40002/mydb")
-	c.Assert(err, IsNil)
-	defer usession.Close()
-
-	// Can read, but not write.
-	err = usession.DB("mydb").C("mycoll").Find(nil).One(nil)
-	c.Assert(err, Equals, mgo.ErrNotFound)
-	err = usession.DB("mydb").C("mycoll").Insert(M{"ok": 1})
-	c.Assert(err, ErrorMatches, "unauthorized|not authorized .*")
-
-	// Update the user role.
-	user = &mgo.User{
-		Username: "myruser",
-		Roles:    []mgo.Role{mgo.RoleReadWrite},
-	}
-	err = mydb.UpsertUser(user)
-	c.Assert(err, IsNil)
-
-	// Dial again to ensure the password hasn't changed.
-	usession, err = mgo.Dial("myruser:mynewpass@localhost:40002/mydb")
-	c.Assert(err, IsNil)
-	defer usession.Close()
-
-	// Now it can write.
-	err = usession.DB("mydb").C("mycoll").Insert(M{"ok": 1})
-	c.Assert(err, IsNil)
-}
-
-func (s *S) TestAuthAddUser(c *C) {
-	session, err := mgo.Dial("localhost:40002")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	admindb := session.DB("admin")
-	err = admindb.Login("root", "rapadura")
-	c.Assert(err, IsNil)
-
-	mydb := session.DB("mydb")
-	err = mydb.AddUser("myruser", "mypass", true)
-	c.Assert(err, IsNil)
-	err = mydb.AddUser("mywuser", "mypass", false)
-	c.Assert(err, IsNil)
-
-	err = mydb.Login("myruser", "mypass")
-	c.Assert(err, IsNil)
-
-	admindb.Logout()
-
-	coll := session.DB("mydb").C("mycoll")
-	err = coll.Insert(M{"n": 1})
-	c.Assert(err, ErrorMatches, "unauthorized|not authorized .*")
-
-	err = mydb.Login("mywuser", "mypass")
-	c.Assert(err, IsNil)
-
-	err = coll.Insert(M{"n": 1})
-	c.Assert(err, IsNil)
-}
-
-func (s *S) TestAuthAddUserReplaces(c *C) {
-	session, err := mgo.Dial("localhost:40002")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	admindb := session.DB("admin")
-	err = admindb.Login("root", "rapadura")
-	c.Assert(err, IsNil)
-
-	mydb := session.DB("mydb")
-	err = mydb.AddUser("myuser", "myoldpass", false)
-	c.Assert(err, IsNil)
-	err = mydb.AddUser("myuser", "mynewpass", true)
-	c.Assert(err, IsNil)
-
-	admindb.Logout()
-
-	err = mydb.Login("myuser", "myoldpass")
-	c.Assert(err, ErrorMatches, "auth fail(s|ed)|.*Authentication failed.")
-	err = mydb.Login("myuser", "mynewpass")
-	c.Assert(err, IsNil)
-
-	// ReadOnly flag was changed too.
-	err = mydb.C("mycoll").Insert(M{"n": 1})
-	c.Assert(err, ErrorMatches, "unauthorized|not authorized .*")
-}
-
-func (s *S) TestAuthRemoveUser(c *C) {
-	session, err := mgo.Dial("localhost:40002")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	admindb := session.DB("admin")
-	err = admindb.Login("root", "rapadura")
-	c.Assert(err, IsNil)
-
-	mydb := session.DB("mydb")
-	err = mydb.AddUser("myuser", "mypass", true)
-	c.Assert(err, IsNil)
-	err = mydb.RemoveUser("myuser")
-	c.Assert(err, IsNil)
-	err = mydb.RemoveUser("myuser")
-	c.Assert(err, Equals, mgo.ErrNotFound)
-
-	err = mydb.Login("myuser", "mypass")
-	c.Assert(err, ErrorMatches, "auth fail(s|ed)|.*Authentication failed.")
-}
-
-func (s *S) TestAuthLoginTwiceDoesNothing(c *C) {
-	session, err := mgo.Dial("localhost:40002")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	admindb := session.DB("admin")
-	err = admindb.Login("root", "rapadura")
-	c.Assert(err, IsNil)
-
-	oldStats := mgo.GetStats()
-
-	err = admindb.Login("root", "rapadura")
-	c.Assert(err, IsNil)
-
-	newStats := mgo.GetStats()
-	c.Assert(newStats.SentOps, Equals, oldStats.SentOps)
-}
-
-func (s *S) TestAuthLoginLogoutLoginDoesNothing(c *C) {
-	session, err := mgo.Dial("localhost:40002")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	admindb := session.DB("admin")
-	err = admindb.Login("root", "rapadura")
-	c.Assert(err, IsNil)
-
-	oldStats := mgo.GetStats()
-
-	admindb.Logout()
-	err = admindb.Login("root", "rapadura")
-	c.Assert(err, IsNil)
-
-	newStats := mgo.GetStats()
-	c.Assert(newStats.SentOps, Equals, oldStats.SentOps)
-}
-
-func (s *S) TestAuthLoginSwitchUser(c *C) {
-	session, err := mgo.Dial("localhost:40002")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	admindb := session.DB("admin")
-	err = admindb.Login("root", "rapadura")
-	c.Assert(err, IsNil)
-
-	coll := session.DB("mydb").C("mycoll")
-	err = coll.Insert(M{"n": 1})
-	c.Assert(err, IsNil)
-
-	err = admindb.Login("reader", "rapadura")
-	c.Assert(err, IsNil)
-
-	// Can't write.
-	err = coll.Insert(M{"n": 1})
-	c.Assert(err, ErrorMatches, "unauthorized|not authorized .*")
-
-	// But can read.
-	result := struct{ N int }{}
-	err = coll.Find(nil).One(&result)
-	c.Assert(err, IsNil)
-	c.Assert(result.N, Equals, 1)
-}
-
-func (s *S) TestAuthLoginChangePassword(c *C) {
-	session, err := mgo.Dial("localhost:40002")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	admindb := session.DB("admin")
-	err = admindb.Login("root", "rapadura")
-	c.Assert(err, IsNil)
-
-	mydb := session.DB("mydb")
-	err = mydb.AddUser("myuser", "myoldpass", false)
-	c.Assert(err, IsNil)
-
-	err = mydb.Login("myuser", "myoldpass")
-	c.Assert(err, IsNil)
-
-	err = mydb.AddUser("myuser", "mynewpass", true)
-	c.Assert(err, IsNil)
-
-	err = mydb.Login("myuser", "mynewpass")
-	c.Assert(err, IsNil)
-
-	admindb.Logout()
-
-	// The second login must be in effect, which means read-only.
-	err = mydb.C("mycoll").Insert(M{"n": 1})
-	c.Assert(err, ErrorMatches, "unauthorized|not authorized .*")
-}
-
-func (s *S) TestAuthLoginCachingWithSessionRefresh(c *C) {
-	session, err := mgo.Dial("localhost:40002")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	admindb := session.DB("admin")
-	err = admindb.Login("root", "rapadura")
-	c.Assert(err, IsNil)
-
-	session.Refresh()
-
-	coll := session.DB("mydb").C("mycoll")
-	err = coll.Insert(M{"n": 1})
-	c.Assert(err, IsNil)
-}
-
-func (s *S) TestAuthLoginCachingWithSessionCopy(c *C) {
-	session, err := mgo.Dial("localhost:40002")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	admindb := session.DB("admin")
-	err = admindb.Login("root", "rapadura")
-	c.Assert(err, IsNil)
-
-	session = session.Copy()
-	defer session.Close()
-
-	coll := session.DB("mydb").C("mycoll")
-	err = coll.Insert(M{"n": 1})
-	c.Assert(err, IsNil)
-}
-
-func (s *S) TestAuthLoginCachingWithSessionClone(c *C) {
-	session, err := mgo.Dial("localhost:40002")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	admindb := session.DB("admin")
-	err = admindb.Login("root", "rapadura")
-	c.Assert(err, IsNil)
-
-	session = session.Clone()
-	defer session.Close()
-
-	coll := session.DB("mydb").C("mycoll")
-	err = coll.Insert(M{"n": 1})
-	c.Assert(err, IsNil)
-}
-
-func (s *S) TestAuthLoginCachingWithNewSession(c *C) {
-	session, err := mgo.Dial("localhost:40002")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	admindb := session.DB("admin")
-	err = admindb.Login("root", "rapadura")
-	c.Assert(err, IsNil)
-
-	session = session.New()
-	defer session.Close()
-
-	coll := session.DB("mydb").C("mycoll")
-	err = coll.Insert(M{"n": 1})
-	c.Assert(err, ErrorMatches, "unauthorized|need to login|not authorized .*")
-}
-
-func (s *S) TestAuthLoginCachingAcrossPool(c *C) {
-	// Logins are cached even when the conenction goes back
-	// into the pool.
-
-	session, err := mgo.Dial("localhost:40002")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	admindb := session.DB("admin")
-	err = admindb.Login("root", "rapadura")
-	c.Assert(err, IsNil)
-
-	// Add another user to test the logout case at the same time.
-	mydb := session.DB("mydb")
-	err = mydb.AddUser("myuser", "mypass", false)
-	c.Assert(err, IsNil)
-
-	err = mydb.Login("myuser", "mypass")
-	c.Assert(err, IsNil)
-
-	// Logout root explicitly, to test both cases.
-	admindb.Logout()
-
-	// Give socket back to pool.
-	session.Refresh()
-
-	// Brand new session, should use socket from the pool.
-	other := session.New()
-	defer other.Close()
-
-	oldStats := mgo.GetStats()
-
-	err = other.DB("admin").Login("root", "rapadura")
-	c.Assert(err, IsNil)
-	err = other.DB("mydb").Login("myuser", "mypass")
-	c.Assert(err, IsNil)
-
-	// Both logins were cached, so no ops.
-	newStats := mgo.GetStats()
-	c.Assert(newStats.SentOps, Equals, oldStats.SentOps)
-
-	// And they actually worked.
-	err = other.DB("mydb").C("mycoll").Insert(M{"n": 1})
-	c.Assert(err, IsNil)
-
-	other.DB("admin").Logout()
-
-	err = other.DB("mydb").C("mycoll").Insert(M{"n": 1})
-	c.Assert(err, IsNil)
-}
-
-func (s *S) TestAuthLoginCachingAcrossPoolWithLogout(c *C) {
-	// Now verify that logouts are properly flushed if they
-	// are not revalidated after leaving the pool.
-
-	session, err := mgo.Dial("localhost:40002")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	admindb := session.DB("admin")
-	err = admindb.Login("root", "rapadura")
-	c.Assert(err, IsNil)
-
-	// Add another user to test the logout case at the same time.
-	mydb := session.DB("mydb")
-	err = mydb.AddUser("myuser", "mypass", true)
-	c.Assert(err, IsNil)
-
-	err = mydb.Login("myuser", "mypass")
-	c.Assert(err, IsNil)
-
-	// Just some data to query later.
-	err = session.DB("mydb").C("mycoll").Insert(M{"n": 1})
-	c.Assert(err, IsNil)
-
-	// Give socket back to pool.
-	session.Refresh()
-
-	// Brand new session, should use socket from the pool.
-	other := session.New()
-	defer other.Close()
-
-	oldStats := mgo.GetStats()
-
-	err = other.DB("mydb").Login("myuser", "mypass")
-	c.Assert(err, IsNil)
-
-	// Login was cached, so no ops.
-	newStats := mgo.GetStats()
-	c.Assert(newStats.SentOps, Equals, oldStats.SentOps)
-
-	// Can't write, since root has been implicitly logged out
-	// when the collection went into the pool, and not revalidated.
-	err = other.DB("mydb").C("mycoll").Insert(M{"n": 1})
-	c.Assert(err, ErrorMatches, "unauthorized|not authorized .*")
-
-	// But can read due to the revalidated myuser login.
-	result := struct{ N int }{}
-	err = other.DB("mydb").C("mycoll").Find(nil).One(&result)
-	c.Assert(err, IsNil)
-	c.Assert(result.N, Equals, 1)
-}
-
-func (s *S) TestAuthEventual(c *C) {
-	// Eventual sessions don't keep sockets around, so they are
-	// an interesting test case.
-	session, err := mgo.Dial("localhost:40002")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	admindb := session.DB("admin")
-	err = admindb.Login("root", "rapadura")
-	c.Assert(err, IsNil)
-
-	err = session.DB("mydb").C("mycoll").Insert(M{"n": 1})
-	c.Assert(err, IsNil)
-
-	var wg sync.WaitGroup
-	wg.Add(20)
-
-	for i := 0; i != 10; i++ {
-		go func() {
-			defer wg.Done()
-			var result struct{ N int }
-			err := session.DB("mydb").C("mycoll").Find(nil).One(&result)
-			c.Assert(err, IsNil)
-			c.Assert(result.N, Equals, 1)
-		}()
-	}
-
-	for i := 0; i != 10; i++ {
-		go func() {
-			defer wg.Done()
-			err := session.DB("mydb").C("mycoll").Insert(M{"n": 1})
-			c.Assert(err, IsNil)
-		}()
-	}
-
-	wg.Wait()
-}
-
-func (s *S) TestAuthURL(c *C) {
-	session, err := mgo.Dial("mongodb://root:rapadura@localhost:40002/")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	err = session.DB("mydb").C("mycoll").Insert(M{"n": 1})
-	c.Assert(err, IsNil)
-}
-
-func (s *S) TestAuthURLWrongCredentials(c *C) {
-	session, err := mgo.Dial("mongodb://root:wrong@localhost:40002/")
-	if session != nil {
-		session.Close()
-	}
-	c.Assert(err, ErrorMatches, "auth fail(s|ed)|.*Authentication failed.")
-	c.Assert(session, IsNil)
-}
-
-func (s *S) TestAuthURLWithNewSession(c *C) {
-	// When authentication is in the URL, the new session will
-	// actually carry it on as well, even if logged out explicitly.
-	session, err := mgo.Dial("mongodb://root:rapadura@localhost:40002/")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	session.DB("admin").Logout()
-
-	// Do it twice to ensure it passes the needed data on.
-	session = session.New()
-	defer session.Close()
-	session = session.New()
-	defer session.Close()
-
-	err = session.DB("mydb").C("mycoll").Insert(M{"n": 1})
-	c.Assert(err, IsNil)
-}
-
-func (s *S) TestAuthURLWithDatabase(c *C) {
-	session, err := mgo.Dial("mongodb://root:rapadura@localhost:40002")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	mydb := session.DB("mydb")
-	err = mydb.AddUser("myruser", "mypass", true)
-	c.Assert(err, IsNil)
-
-	// Test once with database, and once with source.
-	for i := 0; i < 2; i++ {
-		var url string
-		if i == 0 {
-			url = "mongodb://myruser:mypass@localhost:40002/mydb"
-		} else {
-			url = "mongodb://myruser:mypass@localhost:40002/admin?authSource=mydb"
-		}
-		usession, err := mgo.Dial(url)
-		c.Assert(err, IsNil)
-		defer usession.Close()
-
-		ucoll := usession.DB("mydb").C("mycoll")
-		err = ucoll.FindId(0).One(nil)
-		c.Assert(err, Equals, mgo.ErrNotFound)
-		err = ucoll.Insert(M{"n": 1})
-		c.Assert(err, ErrorMatches, "unauthorized|not authorized .*")
-	}
-}
-
-func (s *S) TestDefaultDatabase(c *C) {
-	tests := []struct{ url, db string }{
-		{"mongodb://root:rapadura@localhost:40002", "test"},
-		{"mongodb://root:rapadura@localhost:40002/admin", "admin"},
-		{"mongodb://localhost:40001", "test"},
-		{"mongodb://localhost:40001/", "test"},
-		{"mongodb://localhost:40001/mydb", "mydb"},
-	}
-
-	for _, test := range tests {
-		session, err := mgo.Dial(test.url)
-		c.Assert(err, IsNil)
-		defer session.Close()
-
-		c.Logf("test: %#v", test)
-		c.Assert(session.DB("").Name, Equals, test.db)
-
-		scopy := session.Copy()
-		c.Check(scopy.DB("").Name, Equals, test.db)
-		scopy.Close()
-	}
-}
-
-func (s *S) TestAuthDirect(c *C) {
-	// Direct connections must work to the master and slaves.
-	for _, port := range []string{"40031", "40032", "40033"} {
-		url := fmt.Sprintf("mongodb://root:rapadura@localhost:%s/?connect=direct", port)
-		session, err := mgo.Dial(url)
-		c.Assert(err, IsNil)
-		defer session.Close()
-
-		session.SetMode(mgo.Monotonic, true)
-
-		var result struct{}
-		err = session.DB("mydb").C("mycoll").Find(nil).One(&result)
-		c.Assert(err, Equals, mgo.ErrNotFound)
-	}
-}
-
-func (s *S) TestAuthDirectWithLogin(c *C) {
-	// Direct connections must work to the master and slaves.
-	for _, port := range []string{"40031", "40032", "40033"} {
-		url := fmt.Sprintf("mongodb://localhost:%s/?connect=direct", port)
-		session, err := mgo.Dial(url)
-		c.Assert(err, IsNil)
-		defer session.Close()
-
-		session.SetMode(mgo.Monotonic, true)
-		session.SetSyncTimeout(3 * time.Second)
-
-		err = session.DB("admin").Login("root", "rapadura")
-		c.Assert(err, IsNil)
-
-		var result struct{}
-		err = session.DB("mydb").C("mycoll").Find(nil).One(&result)
-		c.Assert(err, Equals, mgo.ErrNotFound)
-	}
-}
-
-func (s *S) TestAuthScramSha1Cred(c *C) {
-	if !s.versionAtLeast(2, 7, 7) {
-		c.Skip("SCRAM-SHA-1 tests depend on 2.7.7")
-	}
-	cred := &mgo.Credential{
-		Username:  "root",
-		Password:  "rapadura",
-		Mechanism: "SCRAM-SHA-1",
-		Source:    "admin",
-	}
-	host := "localhost:40002"
-	c.Logf("Connecting to %s...", host)
-	session, err := mgo.Dial(host)
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	mycoll := session.DB("admin").C("mycoll")
-
-	c.Logf("Connected! Testing the need for authentication...")
-	err = mycoll.Find(nil).One(nil)
-	c.Assert(err, ErrorMatches, "unauthorized|not authorized .*")
-
-	c.Logf("Authenticating...")
-	err = session.Login(cred)
-	c.Assert(err, IsNil)
-	c.Logf("Authenticated!")
-
-	c.Logf("Connected! Testing the need for authentication...")
-	err = mycoll.Find(nil).One(nil)
-	c.Assert(err, Equals, mgo.ErrNotFound)
-}
-
-func (s *S) TestAuthScramSha1URL(c *C) {
-	if !s.versionAtLeast(2, 7, 7) {
-		c.Skip("SCRAM-SHA-1 tests depend on 2.7.7")
-	}
-	host := "localhost:40002"
-	c.Logf("Connecting to %s...", host)
-	session, err := mgo.Dial(fmt.Sprintf("root:rapadura@%s?authMechanism=SCRAM-SHA-1", host))
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	mycoll := session.DB("admin").C("mycoll")
-
-	c.Logf("Connected! Testing the need for authentication...")
-	err = mycoll.Find(nil).One(nil)
-	c.Assert(err, Equals, mgo.ErrNotFound)
-}
-
-func (s *S) TestAuthX509Cred(c *C) {
-	session, err := mgo.Dial("localhost:40001")
-	c.Assert(err, IsNil)
-	defer session.Close()
-	binfo, err := session.BuildInfo()
-	c.Assert(err, IsNil)
-	if binfo.OpenSSLVersion == "" {
-		c.Skip("server does not support SSL")
-	}
-
-	clientCertPEM, err := ioutil.ReadFile("testdb/client.pem")
-	c.Assert(err, IsNil)
-
-	clientCert, err := tls.X509KeyPair(clientCertPEM, clientCertPEM)
-	c.Assert(err, IsNil)
-
-	tlsConfig := &tls.Config{
-		// Isolating tests to client certs, don't care about server validation.
-		InsecureSkipVerify: true,
-		Certificates:       []tls.Certificate{clientCert},
-	}
-
-	var host = "localhost:40003"
-	c.Logf("Connecting to %s...", host)
-	session, err = mgo.DialWithInfo(&mgo.DialInfo{
-		Addrs: []string{host},
-		DialServer: func(addr *mgo.ServerAddr) (net.Conn, error) {
-			return tls.Dial("tcp", addr.String(), tlsConfig)
-		},
-	})
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	err = session.Login(&mgo.Credential{Username: "root", Password: "rapadura"})
-	c.Assert(err, IsNil)
-
-	// This needs to be kept in sync with client.pem
-	x509Subject := "CN=localhost,OU=Client,O=MGO,L=MGO,ST=MGO,C=GO"
-
-	externalDB := session.DB("$external")
-	var x509User mgo.User = mgo.User{
-		Username:     x509Subject,
-		OtherDBRoles: map[string][]mgo.Role{"admin": []mgo.Role{mgo.RoleRoot}},
-	}
-	err = externalDB.UpsertUser(&x509User)
-	c.Assert(err, IsNil)
-
-	session.LogoutAll()
-
-	c.Logf("Connected! Ensuring authentication is required...")
-	names, err := session.DatabaseNames()
-	c.Assert(err, ErrorMatches, "not authorized .*")
-
-	cred := &mgo.Credential{
-		Username:  x509Subject,
-		Mechanism: "MONGODB-X509",
-		Source:    "$external",
-	}
-
-	c.Logf("Authenticating...")
-	err = session.Login(cred)
-	c.Assert(err, IsNil)
-	c.Logf("Authenticated!")
-
-	names, err = session.DatabaseNames()
-	c.Assert(err, IsNil)
-	c.Assert(len(names) > 0, Equals, true)
-}
-
-var (
-	plainFlag = flag.String("plain", "", "Host to test PLAIN authentication against (depends on custom environment)")
-	plainUser = "einstein"
-	plainPass = "password"
-)
-
-func (s *S) TestAuthPlainCred(c *C) {
-	if *plainFlag == "" {
-		c.Skip("no -plain")
-	}
-	cred := &mgo.Credential{
-		Username:  plainUser,
-		Password:  plainPass,
-		Source:    "$external",
-		Mechanism: "PLAIN",
-	}
-	c.Logf("Connecting to %s...", *plainFlag)
-	session, err := mgo.Dial(*plainFlag)
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	records := session.DB("records").C("records")
-
-	c.Logf("Connected! Testing the need for authentication...")
-	err = records.Find(nil).One(nil)
-	c.Assert(err, ErrorMatches, "unauthorized|not authorized .*")
-
-	c.Logf("Authenticating...")
-	err = session.Login(cred)
-	c.Assert(err, IsNil)
-	c.Logf("Authenticated!")
-
-	c.Logf("Connected! Testing the need for authentication...")
-	err = records.Find(nil).One(nil)
-	c.Assert(err, Equals, mgo.ErrNotFound)
-}
-
-func (s *S) TestAuthPlainURL(c *C) {
-	if *plainFlag == "" {
-		c.Skip("no -plain")
-	}
-	c.Logf("Connecting to %s...", *plainFlag)
-	session, err := mgo.Dial(fmt.Sprintf("%s:%s@%s?authMechanism=PLAIN", url.QueryEscape(plainUser), url.QueryEscape(plainPass), *plainFlag))
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	c.Logf("Connected! Testing the need for authentication...")
-	err = session.DB("records").C("records").Find(nil).One(nil)
-	c.Assert(err, Equals, mgo.ErrNotFound)
-}
-
-var (
-	kerberosFlag = flag.Bool("kerberos", false, "Test Kerberos authentication (depends on custom environment)")
-	kerberosHost = "ldaptest.10gen.cc"
-	kerberosUser = "drivers@LDAPTEST.10GEN.CC"
-
-	winKerberosPasswordEnv = "MGO_KERBEROS_PASSWORD"
-)
-
-// Kerberos has its own suite because it talks to a remote server
-// that is prepared to authenticate against a kerberos deployment.
-type KerberosSuite struct{}
-
-var _ = Suite(&KerberosSuite{})
-
-func (kerberosSuite *KerberosSuite) SetUpSuite(c *C) {
-	mgo.SetDebug(true)
-	mgo.SetStats(true)
-}
-
-func (kerberosSuite *KerberosSuite) TearDownSuite(c *C) {
-	mgo.SetDebug(false)
-	mgo.SetStats(false)
-}
-
-func (kerberosSuite *KerberosSuite) SetUpTest(c *C) {
-	mgo.SetLogger((*cLogger)(c))
-	mgo.ResetStats()
-}
-
-func (kerberosSuite *KerberosSuite) TearDownTest(c *C) {
-	mgo.SetLogger(nil)
-}
-
-func (kerberosSuite *KerberosSuite) TestAuthKerberosCred(c *C) {
-	if !*kerberosFlag {
-		c.Skip("no -kerberos")
-	}
-	cred := &mgo.Credential{
-		Username:  kerberosUser,
-		Mechanism: "GSSAPI",
-	}
-	windowsAppendPasswordToCredential(cred)
-	c.Logf("Connecting to %s...", kerberosHost)
-	session, err := mgo.Dial(kerberosHost)
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	c.Logf("Connected! Testing the need for authentication...")
-	n, err := session.DB("kerberos").C("test").Find(M{}).Count()
-	c.Assert(err, ErrorMatches, ".*authorized.*")
-
-	c.Logf("Authenticating...")
-	err = session.Login(cred)
-	c.Assert(err, IsNil)
-	c.Logf("Authenticated!")
-
-	n, err = session.DB("kerberos").C("test").Find(M{}).Count()
-	c.Assert(err, IsNil)
-	c.Assert(n, Equals, 1)
-}
-
-func (kerberosSuite *KerberosSuite) TestAuthKerberosURL(c *C) {
-	if !*kerberosFlag {
-		c.Skip("no -kerberos")
-	}
-	c.Logf("Connecting to %s...", kerberosHost)
-	connectUri := url.QueryEscape(kerberosUser) + "@" + kerberosHost + "?authMechanism=GSSAPI"
-	if runtime.GOOS == "windows" {
-		connectUri = url.QueryEscape(kerberosUser) + ":" + url.QueryEscape(getWindowsKerberosPassword()) + "@" + kerberosHost + "?authMechanism=GSSAPI"
-	}
-	session, err := mgo.Dial(connectUri)
-	c.Assert(err, IsNil)
-	defer session.Close()
-	n, err := session.DB("kerberos").C("test").Find(M{}).Count()
-	c.Assert(err, IsNil)
-	c.Assert(n, Equals, 1)
-}
-
-func (kerberosSuite *KerberosSuite) TestAuthKerberosServiceName(c *C) {
-	if !*kerberosFlag {
-		c.Skip("no -kerberos")
-	}
-
-	wrongServiceName := "wrong"
-	rightServiceName := "mongodb"
-
-	cred := &mgo.Credential{
-		Username:  kerberosUser,
-		Mechanism: "GSSAPI",
-		Service:   wrongServiceName,
-	}
-	windowsAppendPasswordToCredential(cred)
-
-	c.Logf("Connecting to %s...", kerberosHost)
-	session, err := mgo.Dial(kerberosHost)
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	c.Logf("Authenticating with incorrect service name...")
-	err = session.Login(cred)
-	c.Assert(err, ErrorMatches, ".*@LDAPTEST.10GEN.CC not found.*")
-
-	cred.Service = rightServiceName
-	c.Logf("Authenticating with correct service name...")
-	err = session.Login(cred)
-	c.Assert(err, IsNil)
-	c.Logf("Authenticated!")
-
-	n, err := session.DB("kerberos").C("test").Find(M{}).Count()
-	c.Assert(err, IsNil)
-	c.Assert(n, Equals, 1)
-}
-
-func (kerberosSuite *KerberosSuite) TestAuthKerberosServiceHost(c *C) {
-	if !*kerberosFlag {
-		c.Skip("no -kerberos")
-	}
-
-	wrongServiceHost := "eggs.bacon.tk"
-	rightServiceHost := kerberosHost
-
-	cred := &mgo.Credential{
-		Username:    kerberosUser,
-		Mechanism:   "GSSAPI",
-		ServiceHost: wrongServiceHost,
-	}
-	windowsAppendPasswordToCredential(cred)
-
-	c.Logf("Connecting to %s...", kerberosHost)
-	session, err := mgo.Dial(kerberosHost)
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	c.Logf("Authenticating with incorrect service host...")
-	err = session.Login(cred)
-	c.Assert(err, ErrorMatches, ".*@LDAPTEST.10GEN.CC not found.*")
-
-	cred.ServiceHost = rightServiceHost
-	c.Logf("Authenticating with correct service host...")
-	err = session.Login(cred)
-	c.Assert(err, IsNil)
-	c.Logf("Authenticated!")
-
-	n, err := session.DB("kerberos").C("test").Find(M{}).Count()
-	c.Assert(err, IsNil)
-	c.Assert(n, Equals, 1)
-}
-
-// No kinit on SSPI-style Kerberos, so we need to provide a password. In order
-// to avoid inlining password, require it to be set as an environment variable,
-// for instance: `SET MGO_KERBEROS_PASSWORD=this_isnt_the_password`
-func getWindowsKerberosPassword() string {
-	pw := os.Getenv(winKerberosPasswordEnv)
-	if pw == "" {
-		panic(fmt.Sprintf("Need to set %v environment variable to run Kerberos tests on Windows", winKerberosPasswordEnv))
-	}
-	return pw
-}
-
-func windowsAppendPasswordToCredential(cred *mgo.Credential) {
-	if runtime.GOOS == "windows" {
-		cred.Password = getWindowsKerberosPassword()
-	}
-}
diff --git a/Godeps/_workspace/src/gopkg.in/mgo.v2/bson/LICENSE b/Godeps/_workspace/src/gopkg.in/mgo.v2/bson/LICENSE
deleted file mode 100644
index 890326017..000000000
--- a/Godeps/_workspace/src/gopkg.in/mgo.v2/bson/LICENSE
+++ /dev/null
@@ -1,25 +0,0 @@
-BSON library for Go
-
-Copyright (c) 2010-2012 - Gustavo Niemeyer <gustavo@niemeyer.net>
-
-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 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/gopkg.in/mgo.v2/bson/bson.go b/Godeps/_workspace/src/gopkg.in/mgo.v2/bson/bson.go
deleted file mode 100644
index 41816b874..000000000
--- a/Godeps/_workspace/src/gopkg.in/mgo.v2/bson/bson.go
+++ /dev/null
@@ -1,705 +0,0 @@
-// BSON library for Go
-//
-// Copyright (c) 2010-2012 - Gustavo Niemeyer <gustavo@niemeyer.net>
-//
-// 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 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.
-
-// Package bson is an implementation of the BSON specification for Go:
-//
-//     http://bsonspec.org
-//
-// It was created as part of the mgo MongoDB driver for Go, but is standalone
-// and may be used on its own without the driver.
-package bson
-
-import (
-	"bytes"
-	"crypto/md5"
-	"crypto/rand"
-	"encoding/binary"
-	"encoding/hex"
-	"errors"
-	"fmt"
-	"io"
-	"os"
-	"reflect"
-	"runtime"
-	"strings"
-	"sync"
-	"sync/atomic"
-	"time"
-)
-
-// --------------------------------------------------------------------------
-// The public API.
-
-// A value implementing the bson.Getter interface will have its GetBSON
-// method called when the given value has to be marshalled, and the result
-// of this method will be marshaled in place of the actual object.
-//
-// If GetBSON returns return a non-nil error, the marshalling procedure
-// will stop and error out with the provided value.
-type Getter interface {
-	GetBSON() (interface{}, error)
-}
-
-// A value implementing the bson.Setter interface will receive the BSON
-// value via the SetBSON method during unmarshaling, and the object
-// itself will not be changed as usual.
-//
-// If setting the value works, the method should return nil or alternatively
-// bson.SetZero to set the respective field to its zero value (nil for
-// pointer types). If SetBSON returns a value of type bson.TypeError, the
-// BSON value will be omitted from a map or slice being decoded and the
-// unmarshalling will continue. If it returns any other non-nil error, the
-// unmarshalling procedure will stop and error out with the provided value.
-//
-// This interface is generally useful in pointer receivers, since the method
-// will want to change the receiver. A type field that implements the Setter
-// interface doesn't have to be a pointer, though.
-//
-// Unlike the usual behavior, unmarshalling onto a value that implements a
-// Setter interface will NOT reset the value to its zero state. This allows
-// the value to decide by itself how to be unmarshalled.
-//
-// For example:
-//
-//     type MyString string
-//
-//     func (s *MyString) SetBSON(raw bson.Raw) error {
-//         return raw.Unmarshal(s)
-//     }
-//
-type Setter interface {
-	SetBSON(raw Raw) error
-}
-
-// SetZero may be returned from a SetBSON method to have the value set to
-// its respective zero value. When used in pointer values, this will set the
-// field to nil rather than to the pre-allocated value.
-var SetZero = errors.New("set to zero")
-
-// M is a convenient alias for a map[string]interface{} map, useful for
-// dealing with BSON in a native way.  For instance:
-//
-//     bson.M{"a": 1, "b": true}
-//
-// There's no special handling for this type in addition to what's done anyway
-// for an equivalent map type.  Elements in the map will be dumped in an
-// undefined ordered. See also the bson.D type for an ordered alternative.
-type M map[string]interface{}
-
-// D represents a BSON document containing ordered elements. For example:
-//
-//     bson.D{{"a", 1}, {"b", true}}
-//
-// In some situations, such as when creating indexes for MongoDB, the order in
-// which the elements are defined is important.  If the order is not important,
-// using a map is generally more comfortable. See bson.M and bson.RawD.
-type D []DocElem
-
-// DocElem is an element of the bson.D document representation.
-type DocElem struct {
-	Name  string
-	Value interface{}
-}
-
-// Map returns a map out of the ordered element name/value pairs in d.
-func (d D) Map() (m M) {
-	m = make(M, len(d))
-	for _, item := range d {
-		m[item.Name] = item.Value
-	}
-	return m
-}
-
-// The Raw type represents raw unprocessed BSON documents and elements.
-// Kind is the kind of element as defined per the BSON specification, and
-// Data is the raw unprocessed data for the respective element.
-// Using this type it is possible to unmarshal or marshal values partially.
-//
-// Relevant documentation:
-//
-//     http://bsonspec.org/#/specification
-//
-type Raw struct {
-	Kind byte
-	Data []byte
-}
-
-// RawD represents a BSON document containing raw unprocessed elements.
-// This low-level representation may be useful when lazily processing
-// documents of uncertain content, or when manipulating the raw content
-// documents in general.
-type RawD []RawDocElem
-
-// See the RawD type.
-type RawDocElem struct {
-	Name  string
-	Value Raw
-}
-
-// ObjectId is a unique ID identifying a BSON value. It must be exactly 12 bytes
-// long. MongoDB objects by default have such a property set in their "_id"
-// property.
-//
-// http://www.mongodb.org/display/DOCS/Object+IDs
-type ObjectId string
-
-// ObjectIdHex returns an ObjectId from the provided hex representation.
-// Calling this function with an invalid hex representation will
-// cause a runtime panic. See the IsObjectIdHex function.
-func ObjectIdHex(s string) ObjectId {
-	d, err := hex.DecodeString(s)
-	if err != nil || len(d) != 12 {
-		panic(fmt.Sprintf("Invalid input to ObjectIdHex: %q", s))
-	}
-	return ObjectId(d)
-}
-
-// IsObjectIdHex returns whether s is a valid hex representation of
-// an ObjectId. See the ObjectIdHex function.
-func IsObjectIdHex(s string) bool {
-	if len(s) != 24 {
-		return false
-	}
-	_, err := hex.DecodeString(s)
-	return err == nil
-}
-
-// objectIdCounter is atomically incremented when generating a new ObjectId
-// using NewObjectId() function. It's used as a counter part of an id.
-var objectIdCounter uint32 = 0
-
-// machineId stores machine id generated once and used in subsequent calls
-// to NewObjectId function.
-var machineId = readMachineId()
-
-// readMachineId generates machine id and puts it into the machineId global
-// variable. If this function fails to get the hostname, it will cause
-// a runtime error.
-func readMachineId() []byte {
-	var sum [3]byte
-	id := sum[:]
-	hostname, err1 := os.Hostname()
-	if err1 != nil {
-		_, err2 := io.ReadFull(rand.Reader, id)
-		if err2 != nil {
-			panic(fmt.Errorf("cannot get hostname: %v; %v", err1, err2))
-		}
-		return id
-	}
-	hw := md5.New()
-	hw.Write([]byte(hostname))
-	copy(id, hw.Sum(nil))
-	return id
-}
-
-// NewObjectId returns a new unique ObjectId.
-func NewObjectId() ObjectId {
-	var b [12]byte
-	// Timestamp, 4 bytes, big endian
-	binary.BigEndian.PutUint32(b[:], uint32(time.Now().Unix()))
-	// Machine, first 3 bytes of md5(hostname)
-	b[4] = machineId[0]
-	b[5] = machineId[1]
-	b[6] = machineId[2]
-	// Pid, 2 bytes, specs don't specify endianness, but we use big endian.
-	pid := os.Getpid()
-	b[7] = byte(pid >> 8)
-	b[8] = byte(pid)
-	// Increment, 3 bytes, big endian
-	i := atomic.AddUint32(&objectIdCounter, 1)
-	b[9] = byte(i >> 16)
-	b[10] = byte(i >> 8)
-	b[11] = byte(i)
-	return ObjectId(b[:])
-}
-
-// NewObjectIdWithTime returns a dummy ObjectId with the timestamp part filled
-// with the provided number of seconds from epoch UTC, and all other parts
-// filled with zeroes. It's not safe to insert a document with an id generated
-// by this method, it is useful only for queries to find documents with ids
-// generated before or after the specified timestamp.
-func NewObjectIdWithTime(t time.Time) ObjectId {
-	var b [12]byte
-	binary.BigEndian.PutUint32(b[:4], uint32(t.Unix()))
-	return ObjectId(string(b[:]))
-}
-
-// String returns a hex string representation of the id.
-// Example: ObjectIdHex("4d88e15b60f486e428412dc9").
-func (id ObjectId) String() string {
-	return fmt.Sprintf(`ObjectIdHex("%x")`, string(id))
-}
-
-// Hex returns a hex representation of the ObjectId.
-func (id ObjectId) Hex() string {
-	return hex.EncodeToString([]byte(id))
-}
-
-// MarshalJSON turns a bson.ObjectId into a json.Marshaller.
-func (id ObjectId) MarshalJSON() ([]byte, error) {
-	return []byte(fmt.Sprintf(`"%x"`, string(id))), nil
-}
-
-var nullBytes = []byte("null")
-
-// UnmarshalJSON turns *bson.ObjectId into a json.Unmarshaller.
-func (id *ObjectId) UnmarshalJSON(data []byte) error {
-	if len(data) == 2 && data[0] == '"' && data[1] == '"' || bytes.Equal(data, nullBytes) {
-		*id = ""
-		return nil
-	}
-	if len(data) != 26 || data[0] != '"' || data[25] != '"' {
-		return errors.New(fmt.Sprintf("Invalid ObjectId in JSON: %s", string(data)))
-	}
-	var buf [12]byte
-	_, err := hex.Decode(buf[:], data[1:25])
-	if err != nil {
-		return errors.New(fmt.Sprintf("Invalid ObjectId in JSON: %s (%s)", string(data), err))
-	}
-	*id = ObjectId(string(buf[:]))
-	return nil
-}
-
-// Valid returns true if id is valid. A valid id must contain exactly 12 bytes.
-func (id ObjectId) Valid() bool {
-	return len(id) == 12
-}
-
-// byteSlice returns byte slice of id from start to end.
-// Calling this function with an invalid id will cause a runtime panic.
-func (id ObjectId) byteSlice(start, end int) []byte {
-	if len(id) != 12 {
-		panic(fmt.Sprintf("Invalid ObjectId: %q", string(id)))
-	}
-	return []byte(string(id)[start:end])
-}
-
-// Time returns the timestamp part of the id.
-// It's a runtime error to call this method with an invalid id.
-func (id ObjectId) Time() time.Time {
-	// First 4 bytes of ObjectId is 32-bit big-endian seconds from epoch.
-	secs := int64(binary.BigEndian.Uint32(id.byteSlice(0, 4)))
-	return time.Unix(secs, 0)
-}
-
-// Machine returns the 3-byte machine id part of the id.
-// It's a runtime error to call this method with an invalid id.
-func (id ObjectId) Machine() []byte {
-	return id.byteSlice(4, 7)
-}
-
-// Pid returns the process id part of the id.
-// It's a runtime error to call this method with an invalid id.
-func (id ObjectId) Pid() uint16 {
-	return binary.BigEndian.Uint16(id.byteSlice(7, 9))
-}
-
-// Counter returns the incrementing value part of the id.
-// It's a runtime error to call this method with an invalid id.
-func (id ObjectId) Counter() int32 {
-	b := id.byteSlice(9, 12)
-	// Counter is stored as big-endian 3-byte value
-	return int32(uint32(b[0])<<16 | uint32(b[1])<<8 | uint32(b[2]))
-}
-
-// The Symbol type is similar to a string and is used in languages with a
-// distinct symbol type.
-type Symbol string
-
-// Now returns the current time with millisecond precision. MongoDB stores
-// timestamps with the same precision, so a Time returned from this method
-// will not change after a roundtrip to the database. That's the only reason
-// why this function exists. Using the time.Now function also works fine
-// otherwise.
-func Now() time.Time {
-	return time.Unix(0, time.Now().UnixNano()/1e6*1e6)
-}
-
-// MongoTimestamp is a special internal type used by MongoDB that for some
-// strange reason has its own datatype defined in BSON.
-type MongoTimestamp int64
-
-type orderKey int64
-
-// MaxKey is a special value that compares higher than all other possible BSON
-// values in a MongoDB database.
-var MaxKey = orderKey(1<<63 - 1)
-
-// MinKey is a special value that compares lower than all other possible BSON
-// values in a MongoDB database.
-var MinKey = orderKey(-1 << 63)
-
-type undefined struct{}
-
-// Undefined represents the undefined BSON value.
-var Undefined undefined
-
-// Binary is a representation for non-standard binary values.  Any kind should
-// work, but the following are known as of this writing:
-//
-//   0x00 - Generic. This is decoded as []byte(data), not Binary{0x00, data}.
-//   0x01 - Function (!?)
-//   0x02 - Obsolete generic.
-//   0x03 - UUID
-//   0x05 - MD5
-//   0x80 - User defined.
-//
-type Binary struct {
-	Kind byte
-	Data []byte
-}
-
-// RegEx represents a regular expression.  The Options field may contain
-// individual characters defining the way in which the pattern should be
-// applied, and must be sorted. Valid options as of this writing are 'i' for
-// case insensitive matching, 'm' for multi-line matching, 'x' for verbose
-// mode, 'l' to make \w, \W, and similar be locale-dependent, 's' for dot-all
-// mode (a '.' matches everything), and 'u' to make \w, \W, and similar match
-// unicode. The value of the Options parameter is not verified before being
-// marshaled into the BSON format.
-type RegEx struct {
-	Pattern string
-	Options string
-}
-
-// JavaScript is a type that holds JavaScript code. If Scope is non-nil, it
-// will be marshaled as a mapping from identifiers to values that may be
-// used when evaluating the provided Code.
-type JavaScript struct {
-	Code  string
-	Scope interface{}
-}
-
-// DBPointer refers to a document id in a namespace.
-//
-// This type is deprecated in the BSON specification and should not be used
-// except for backwards compatibility with ancient applications.
-type DBPointer struct {
-	Namespace string
-	Id        ObjectId
-}
-
-const initialBufferSize = 64
-
-func handleErr(err *error) {
-	if r := recover(); r != nil {
-		if _, ok := r.(runtime.Error); ok {
-			panic(r)
-		} else if _, ok := r.(externalPanic); ok {
-			panic(r)
-		} else if s, ok := r.(string); ok {
-			*err = errors.New(s)
-		} else if e, ok := r.(error); ok {
-			*err = e
-		} else {
-			panic(r)
-		}
-	}
-}
-
-// Marshal serializes the in value, which may be a map or a struct value.
-// In the case of struct values, only exported fields will be serialized.
-// The lowercased field name is used as the key for each exported field,
-// but this behavior may be changed using the respective field tag.
-// The tag may also contain flags to tweak the marshalling behavior for
-// the field. The tag formats accepted are:
-//
-//     "[<key>][,<flag1>[,<flag2>]]"
-//
-//     `(...) bson:"[<key>][,<flag1>[,<flag2>]]" (...)`
-//
-// The following flags are currently supported:
-//
-//     omitempty  Only include the field if it's not set to the zero
-//                value for the type or to empty slices or maps.
-//
-//     minsize    Marshal an int64 value as an int32, if that's feasible
-//                while preserving the numeric value.
-//
-//     inline     Inline the field, which must be a struct or a map,
-//                causing all of its fields or keys to be processed as if
-//                they were part of the outer struct. For maps, keys must
-//                not conflict with the bson keys of other struct fields.
-//
-// Some examples:
-//
-//     type T struct {
-//         A bool
-//         B int    "myb"
-//         C string "myc,omitempty"
-//         D string `bson:",omitempty" json:"jsonkey"`
-//         E int64  ",minsize"
-//         F int64  "myf,omitempty,minsize"
-//     }
-//
-func Marshal(in interface{}) (out []byte, err error) {
-	defer handleErr(&err)
-	e := &encoder{make([]byte, 0, initialBufferSize)}
-	e.addDoc(reflect.ValueOf(in))
-	return e.out, nil
-}
-
-// Unmarshal deserializes data from in into the out value.  The out value
-// must be a map, a pointer to a struct, or a pointer to a bson.D value.
-// The lowercased field name is used as the key for each exported field,
-// but this behavior may be changed using the respective field tag.
-// The tag may also contain flags to tweak the marshalling behavior for
-// the field. The tag formats accepted are:
-//
-//     "[<key>][,<flag1>[,<flag2>]]"
-//
-//     `(...) bson:"[<key>][,<flag1>[,<flag2>]]" (...)`
-//
-// The following flags are currently supported during unmarshal (see the
-// Marshal method for other flags):
-//
-//     inline     Inline the field, which must be a struct or a map.
-//                Inlined structs are handled as if its fields were part
-//                of the outer struct. An inlined map causes keys that do
-//                not match any other struct field to be inserted in the
-//                map rather than being discarded as usual.
-//
-// The target field or element types of out may not necessarily match
-// the BSON values of the provided data.  The following conversions are
-// made automatically:
-//
-// - Numeric types are converted if at least the integer part of the
-//   value would be preserved correctly
-// - Bools are converted to numeric types as 1 or 0
-// - Numeric types are converted to bools as true if not 0 or false otherwise
-// - Binary and string BSON data is converted to a string, array or byte slice
-//
-// If the value would not fit the type and cannot be converted, it's
-// silently skipped.
-//
-// Pointer values are initialized when necessary.
-func Unmarshal(in []byte, out interface{}) (err error) {
-	if raw, ok := out.(*Raw); ok {
-		raw.Kind = 3
-		raw.Data = in
-		return nil
-	}
-	defer handleErr(&err)
-	v := reflect.ValueOf(out)
-	switch v.Kind() {
-	case reflect.Ptr:
-		fallthrough
-	case reflect.Map:
-		d := newDecoder(in)
-		d.readDocTo(v)
-	case reflect.Struct:
-		return errors.New("Unmarshal can't deal with struct values. Use a pointer.")
-	default:
-		return errors.New("Unmarshal needs a map or a pointer to a struct.")
-	}
-	return nil
-}
-
-// Unmarshal deserializes raw into the out value.  If the out value type
-// is not compatible with raw, a *bson.TypeError is returned.
-//
-// See the Unmarshal function documentation for more details on the
-// unmarshalling process.
-func (raw Raw) Unmarshal(out interface{}) (err error) {
-	defer handleErr(&err)
-	v := reflect.ValueOf(out)
-	switch v.Kind() {
-	case reflect.Ptr:
-		v = v.Elem()
-		fallthrough
-	case reflect.Map:
-		d := newDecoder(raw.Data)
-		good := d.readElemTo(v, raw.Kind)
-		if !good {
-			return &TypeError{v.Type(), raw.Kind}
-		}
-	case reflect.Struct:
-		return errors.New("Raw Unmarshal can't deal with struct values. Use a pointer.")
-	default:
-		return errors.New("Raw Unmarshal needs a map or a valid pointer.")
-	}
-	return nil
-}
-
-type TypeError struct {
-	Type reflect.Type
-	Kind byte
-}
-
-func (e *TypeError) Error() string {
-	return fmt.Sprintf("BSON kind 0x%02x isn't compatible with type %s", e.Kind, e.Type.String())
-}
-
-// --------------------------------------------------------------------------
-// Maintain a mapping of keys to structure field indexes
-
-type structInfo struct {
-	FieldsMap  map[string]fieldInfo
-	FieldsList []fieldInfo
-	InlineMap  int
-	Zero       reflect.Value
-}
-
-type fieldInfo struct {
-	Key       string
-	Num       int
-	OmitEmpty bool
-	MinSize   bool
-	Inline    []int
-}
-
-var structMap = make(map[reflect.Type]*structInfo)
-var structMapMutex sync.RWMutex
-
-type externalPanic string
-
-func (e externalPanic) String() string {
-	return string(e)
-}
-
-func getStructInfo(st reflect.Type) (*structInfo, error) {
-	structMapMutex.RLock()
-	sinfo, found := structMap[st]
-	structMapMutex.RUnlock()
-	if found {
-		return sinfo, nil
-	}
-	n := st.NumField()
-	fieldsMap := make(map[string]fieldInfo)
-	fieldsList := make([]fieldInfo, 0, n)
-	inlineMap := -1
-	for i := 0; i != n; i++ {
-		field := st.Field(i)
-		if field.PkgPath != "" {
-			continue // Private field
-		}
-
-		info := fieldInfo{Num: i}
-
-		tag := field.Tag.Get("bson")
-		if tag == "" && strings.Index(string(field.Tag), ":") < 0 {
-			tag = string(field.Tag)
-		}
-		if tag == "-" {
-			continue
-		}
-
-		// XXX Drop this after a few releases.
-		if s := strings.Index(tag, "/"); s >= 0 {
-			recommend := tag[:s]
-			for _, c := range tag[s+1:] {
-				switch c {
-				case 'c':
-					recommend += ",omitempty"
-				case 's':
-					recommend += ",minsize"
-				default:
-					msg := fmt.Sprintf("Unsupported flag %q in tag %q of type %s", string([]byte{uint8(c)}), tag, st)
-					panic(externalPanic(msg))
-				}
-			}
-			msg := fmt.Sprintf("Replace tag %q in field %s of type %s by %q", tag, field.Name, st, recommend)
-			panic(externalPanic(msg))
-		}
-
-		inline := false
-		fields := strings.Split(tag, ",")
-		if len(fields) > 1 {
-			for _, flag := range fields[1:] {
-				switch flag {
-				case "omitempty":
-					info.OmitEmpty = true
-				case "minsize":
-					info.MinSize = true
-				case "inline":
-					inline = true
-				default:
-					msg := fmt.Sprintf("Unsupported flag %q in tag %q of type %s", flag, tag, st)
-					panic(externalPanic(msg))
-				}
-			}
-			tag = fields[0]
-		}
-
-		if inline {
-			switch field.Type.Kind() {
-			case reflect.Map:
-				if inlineMap >= 0 {
-					return nil, errors.New("Multiple ,inline maps in struct " + st.String())
-				}
-				if field.Type.Key() != reflect.TypeOf("") {
-					return nil, errors.New("Option ,inline needs a map with string keys in struct " + st.String())
-				}
-				inlineMap = info.Num
-			case reflect.Struct:
-				sinfo, err := getStructInfo(field.Type)
-				if err != nil {
-					return nil, err
-				}
-				for _, finfo := range sinfo.FieldsList {
-					if _, found := fieldsMap[finfo.Key]; found {
-						msg := "Duplicated key '" + finfo.Key + "' in struct " + st.String()
-						return nil, errors.New(msg)
-					}
-					if finfo.Inline == nil {
-						finfo.Inline = []int{i, finfo.Num}
-					} else {
-						finfo.Inline = append([]int{i}, finfo.Inline...)
-					}
-					fieldsMap[finfo.Key] = finfo
-					fieldsList = append(fieldsList, finfo)
-				}
-			default:
-				panic("Option ,inline needs a struct value or map field")
-			}
-			continue
-		}
-
-		if tag != "" {
-			info.Key = tag
-		} else {
-			info.Key = strings.ToLower(field.Name)
-		}
-
-		if _, found = fieldsMap[info.Key]; found {
-			msg := "Duplicated key '" + info.Key + "' in struct " + st.String()
-			return nil, errors.New(msg)
-		}
-
-		fieldsList = append(fieldsList, info)
-		fieldsMap[info.Key] = info
-	}
-	sinfo = &structInfo{
-		fieldsMap,
-		fieldsList,
-		inlineMap,
-		reflect.New(st).Elem(),
-	}
-	structMapMutex.Lock()
-	structMap[st] = sinfo
-	structMapMutex.Unlock()
-	return sinfo, nil
-}
diff --git a/Godeps/_workspace/src/gopkg.in/mgo.v2/bson/bson_test.go b/Godeps/_workspace/src/gopkg.in/mgo.v2/bson/bson_test.go
deleted file mode 100644
index eb2e9f41e..000000000
--- a/Godeps/_workspace/src/gopkg.in/mgo.v2/bson/bson_test.go
+++ /dev/null
@@ -1,1605 +0,0 @@
-// BSON library for Go
-//
-// Copyright (c) 2010-2012 - Gustavo Niemeyer <gustavo@niemeyer.net>
-//
-// 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 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.
-// gobson - BSON library for Go.
-
-package bson_test
-
-import (
-	"encoding/binary"
-	"encoding/json"
-	"errors"
-	"net/url"
-	"reflect"
-	"testing"
-	"time"
-
-	. "gopkg.in/check.v1"
-	"gopkg.in/mgo.v2/bson"
-)
-
-func TestAll(t *testing.T) {
-	TestingT(t)
-}
-
-type S struct{}
-
-var _ = Suite(&S{})
-
-// Wrap up the document elements contained in data, prepending the int32
-// length of the data, and appending the '\x00' value closing the document.
-func wrapInDoc(data string) string {
-	result := make([]byte, len(data)+5)
-	binary.LittleEndian.PutUint32(result, uint32(len(result)))
-	copy(result[4:], []byte(data))
-	return string(result)
-}
-
-func makeZeroDoc(value interface{}) (zero interface{}) {
-	v := reflect.ValueOf(value)
-	t := v.Type()
-	switch t.Kind() {
-	case reflect.Map:
-		mv := reflect.MakeMap(t)
-		zero = mv.Interface()
-	case reflect.Ptr:
-		pv := reflect.New(v.Type().Elem())
-		zero = pv.Interface()
-	case reflect.Slice, reflect.Int:
-		zero = reflect.New(t).Interface()
-	default:
-		panic("unsupported doc type")
-	}
-	return zero
-}
-
-func testUnmarshal(c *C, data string, obj interface{}) {
-	zero := makeZeroDoc(obj)
-	err := bson.Unmarshal([]byte(data), zero)
-	c.Assert(err, IsNil)
-	c.Assert(zero, DeepEquals, obj)
-}
-
-type testItemType struct {
-	obj  interface{}
-	data string
-}
-
-// --------------------------------------------------------------------------
-// Samples from bsonspec.org:
-
-var sampleItems = []testItemType{
-	{bson.M{"hello": "world"},
-		"\x16\x00\x00\x00\x02hello\x00\x06\x00\x00\x00world\x00\x00"},
-	{bson.M{"BSON": []interface{}{"awesome", float64(5.05), 1986}},
-		"1\x00\x00\x00\x04BSON\x00&\x00\x00\x00\x020\x00\x08\x00\x00\x00" +
-			"awesome\x00\x011\x00333333\x14@\x102\x00\xc2\x07\x00\x00\x00\x00"},
-}
-
-func (s *S) TestMarshalSampleItems(c *C) {
-	for i, item := range sampleItems {
-		data, err := bson.Marshal(item.obj)
-		c.Assert(err, IsNil)
-		c.Assert(string(data), Equals, item.data, Commentf("Failed on item %d", i))
-	}
-}
-
-func (s *S) TestUnmarshalSampleItems(c *C) {
-	for i, item := range sampleItems {
-		value := bson.M{}
-		err := bson.Unmarshal([]byte(item.data), value)
-		c.Assert(err, IsNil)
-		c.Assert(value, DeepEquals, item.obj, Commentf("Failed on item %d", i))
-	}
-}
-
-// --------------------------------------------------------------------------
-// Every type, ordered by the type flag. These are not wrapped with the
-// length and last \x00 from the document. wrapInDoc() computes them.
-// Note that all of them should be supported as two-way conversions.
-
-var allItems = []testItemType{
-	{bson.M{},
-		""},
-	{bson.M{"_": float64(5.05)},
-		"\x01_\x00333333\x14@"},
-	{bson.M{"_": "yo"},
-		"\x02_\x00\x03\x00\x00\x00yo\x00"},
-	{bson.M{"_": bson.M{"a": true}},
-		"\x03_\x00\x09\x00\x00\x00\x08a\x00\x01\x00"},
-	{bson.M{"_": []interface{}{true, false}},
-		"\x04_\x00\r\x00\x00\x00\x080\x00\x01\x081\x00\x00\x00"},
-	{bson.M{"_": []byte("yo")},
-		"\x05_\x00\x02\x00\x00\x00\x00yo"},
-	{bson.M{"_": bson.Binary{0x80, []byte("udef")}},
-		"\x05_\x00\x04\x00\x00\x00\x80udef"},
-	{bson.M{"_": bson.Undefined}, // Obsolete, but still seen in the wild.
-		"\x06_\x00"},
-	{bson.M{"_": bson.ObjectId("0123456789ab")},
-		"\x07_\x000123456789ab"},
-	{bson.M{"_": bson.DBPointer{"testnamespace", bson.ObjectId("0123456789ab")}},
-		"\x0C_\x00\x0e\x00\x00\x00testnamespace\x000123456789ab"},
-	{bson.M{"_": false},
-		"\x08_\x00\x00"},
-	{bson.M{"_": true},
-		"\x08_\x00\x01"},
-	{bson.M{"_": time.Unix(0, 258e6)}, // Note the NS <=> MS conversion.
-		"\x09_\x00\x02\x01\x00\x00\x00\x00\x00\x00"},
-	{bson.M{"_": nil},
-		"\x0A_\x00"},
-	{bson.M{"_": bson.RegEx{"ab", "cd"}},
-		"\x0B_\x00ab\x00cd\x00"},
-	{bson.M{"_": bson.JavaScript{"code", nil}},
-		"\x0D_\x00\x05\x00\x00\x00code\x00"},
-	{bson.M{"_": bson.Symbol("sym")},
-		"\x0E_\x00\x04\x00\x00\x00sym\x00"},
-	{bson.M{"_": bson.JavaScript{"code", bson.M{"": nil}}},
-		"\x0F_\x00\x14\x00\x00\x00\x05\x00\x00\x00code\x00" +
-			"\x07\x00\x00\x00\x0A\x00\x00"},
-	{bson.M{"_": 258},
-		"\x10_\x00\x02\x01\x00\x00"},
-	{bson.M{"_": bson.MongoTimestamp(258)},
-		"\x11_\x00\x02\x01\x00\x00\x00\x00\x00\x00"},
-	{bson.M{"_": int64(258)},
-		"\x12_\x00\x02\x01\x00\x00\x00\x00\x00\x00"},
-	{bson.M{"_": int64(258 << 32)},
-		"\x12_\x00\x00\x00\x00\x00\x02\x01\x00\x00"},
-	{bson.M{"_": bson.MaxKey},
-		"\x7F_\x00"},
-	{bson.M{"_": bson.MinKey},
-		"\xFF_\x00"},
-}
-
-func (s *S) TestMarshalAllItems(c *C) {
-	for i, item := range allItems {
-		data, err := bson.Marshal(item.obj)
-		c.Assert(err, IsNil)
-		c.Assert(string(data), Equals, wrapInDoc(item.data), Commentf("Failed on item %d: %#v", i, item))
-	}
-}
-
-func (s *S) TestUnmarshalAllItems(c *C) {
-	for i, item := range allItems {
-		value := bson.M{}
-		err := bson.Unmarshal([]byte(wrapInDoc(item.data)), value)
-		c.Assert(err, IsNil)
-		c.Assert(value, DeepEquals, item.obj, Commentf("Failed on item %d: %#v", i, item))
-	}
-}
-
-func (s *S) TestUnmarshalRawAllItems(c *C) {
-	for i, item := range allItems {
-		if len(item.data) == 0 {
-			continue
-		}
-		value := item.obj.(bson.M)["_"]
-		if value == nil {
-			continue
-		}
-		pv := reflect.New(reflect.ValueOf(value).Type())
-		raw := bson.Raw{item.data[0], []byte(item.data[3:])}
-		c.Logf("Unmarshal raw: %#v, %#v", raw, pv.Interface())
-		err := raw.Unmarshal(pv.Interface())
-		c.Assert(err, IsNil)
-		c.Assert(pv.Elem().Interface(), DeepEquals, value, Commentf("Failed on item %d: %#v", i, item))
-	}
-}
-
-func (s *S) TestUnmarshalRawIncompatible(c *C) {
-	raw := bson.Raw{0x08, []byte{0x01}} // true
-	err := raw.Unmarshal(&struct{}{})
-	c.Assert(err, ErrorMatches, "BSON kind 0x08 isn't compatible with type struct \\{\\}")
-}
-
-func (s *S) TestUnmarshalZeroesStruct(c *C) {
-	data, err := bson.Marshal(bson.M{"b": 2})
-	c.Assert(err, IsNil)
-	type T struct{ A, B int }
-	v := T{A: 1}
-	err = bson.Unmarshal(data, &v)
-	c.Assert(err, IsNil)
-	c.Assert(v.A, Equals, 0)
-	c.Assert(v.B, Equals, 2)
-}
-
-func (s *S) TestUnmarshalZeroesMap(c *C) {
-	data, err := bson.Marshal(bson.M{"b": 2})
-	c.Assert(err, IsNil)
-	m := bson.M{"a": 1}
-	err = bson.Unmarshal(data, &m)
-	c.Assert(err, IsNil)
-	c.Assert(m, DeepEquals, bson.M{"b": 2})
-}
-
-func (s *S) TestUnmarshalNonNilInterface(c *C) {
-	data, err := bson.Marshal(bson.M{"b": 2})
-	c.Assert(err, IsNil)
-	m := bson.M{"a": 1}
-	var i interface{}
-	i = m
-	err = bson.Unmarshal(data, &i)
-	c.Assert(err, IsNil)
-	c.Assert(i, DeepEquals, bson.M{"b": 2})
-	c.Assert(m, DeepEquals, bson.M{"a": 1})
-}
-
-// --------------------------------------------------------------------------
-// Some one way marshaling operations which would unmarshal differently.
-
-var oneWayMarshalItems = []testItemType{
-	// These are being passed as pointers, and will unmarshal as values.
-	{bson.M{"": &bson.Binary{0x02, []byte("old")}},
-		"\x05\x00\x07\x00\x00\x00\x02\x03\x00\x00\x00old"},
-	{bson.M{"": &bson.Binary{0x80, []byte("udef")}},
-		"\x05\x00\x04\x00\x00\x00\x80udef"},
-	{bson.M{"": &bson.RegEx{"ab", "cd"}},
-		"\x0B\x00ab\x00cd\x00"},
-	{bson.M{"": &bson.JavaScript{"code", nil}},
-		"\x0D\x00\x05\x00\x00\x00code\x00"},
-	{bson.M{"": &bson.JavaScript{"code", bson.M{"": nil}}},
-		"\x0F\x00\x14\x00\x00\x00\x05\x00\x00\x00code\x00" +
-			"\x07\x00\x00\x00\x0A\x00\x00"},
-
-	// There's no float32 type in BSON.  Will encode as a float64.
-	{bson.M{"": float32(5.05)},
-		"\x01\x00\x00\x00\x00@33\x14@"},
-
-	// The array will be unmarshaled as a slice instead.
-	{bson.M{"": [2]bool{true, false}},
-		"\x04\x00\r\x00\x00\x00\x080\x00\x01\x081\x00\x00\x00"},
-
-	// The typed slice will be unmarshaled as []interface{}.
-	{bson.M{"": []bool{true, false}},
-		"\x04\x00\r\x00\x00\x00\x080\x00\x01\x081\x00\x00\x00"},
-
-	// Will unmarshal as a []byte.
-	{bson.M{"": bson.Binary{0x00, []byte("yo")}},
-		"\x05\x00\x02\x00\x00\x00\x00yo"},
-	{bson.M{"": bson.Binary{0x02, []byte("old")}},
-		"\x05\x00\x07\x00\x00\x00\x02\x03\x00\x00\x00old"},
-
-	// No way to preserve the type information here. We might encode as a zero
-	// value, but this would mean that pointer values in structs wouldn't be
-	// able to correctly distinguish between unset and set to the zero value.
-	{bson.M{"": (*byte)(nil)},
-		"\x0A\x00"},
-
-	// No int types smaller than int32 in BSON. Could encode this as a char,
-	// but it would still be ambiguous, take more, and be awkward in Go when
-	// loaded without typing information.
-	{bson.M{"": byte(8)},
-		"\x10\x00\x08\x00\x00\x00"},
-
-	// There are no unsigned types in BSON.  Will unmarshal as int32 or int64.
-	{bson.M{"": uint32(258)},
-		"\x10\x00\x02\x01\x00\x00"},
-	{bson.M{"": uint64(258)},
-		"\x12\x00\x02\x01\x00\x00\x00\x00\x00\x00"},
-	{bson.M{"": uint64(258 << 32)},
-		"\x12\x00\x00\x00\x00\x00\x02\x01\x00\x00"},
-
-	// This will unmarshal as int.
-	{bson.M{"": int32(258)},
-		"\x10\x00\x02\x01\x00\x00"},
-
-	// That's a special case. The unsigned value is too large for an int32,
-	// so an int64 is used instead.
-	{bson.M{"": uint32(1<<32 - 1)},
-		"\x12\x00\xFF\xFF\xFF\xFF\x00\x00\x00\x00"},
-	{bson.M{"": uint(1<<32 - 1)},
-		"\x12\x00\xFF\xFF\xFF\xFF\x00\x00\x00\x00"},
-}
-
-func (s *S) TestOneWayMarshalItems(c *C) {
-	for i, item := range oneWayMarshalItems {
-		data, err := bson.Marshal(item.obj)
-		c.Assert(err, IsNil)
-		c.Assert(string(data), Equals, wrapInDoc(item.data),
-			Commentf("Failed on item %d", i))
-	}
-}
-
-// --------------------------------------------------------------------------
-// Two-way tests for user-defined structures using the samples
-// from bsonspec.org.
-
-type specSample1 struct {
-	Hello string
-}
-
-type specSample2 struct {
-	BSON []interface{} "BSON"
-}
-
-var structSampleItems = []testItemType{
-	{&specSample1{"world"},
-		"\x16\x00\x00\x00\x02hello\x00\x06\x00\x00\x00world\x00\x00"},
-	{&specSample2{[]interface{}{"awesome", float64(5.05), 1986}},
-		"1\x00\x00\x00\x04BSON\x00&\x00\x00\x00\x020\x00\x08\x00\x00\x00" +
-			"awesome\x00\x011\x00333333\x14@\x102\x00\xc2\x07\x00\x00\x00\x00"},
-}
-
-func (s *S) TestMarshalStructSampleItems(c *C) {
-	for i, item := range structSampleItems {
-		data, err := bson.Marshal(item.obj)
-		c.Assert(err, IsNil)
-		c.Assert(string(data), Equals, item.data,
-			Commentf("Failed on item %d", i))
-	}
-}
-
-func (s *S) TestUnmarshalStructSampleItems(c *C) {
-	for _, item := range structSampleItems {
-		testUnmarshal(c, item.data, item.obj)
-	}
-}
-
-func (s *S) Test64bitInt(c *C) {
-	var i int64 = (1 << 31)
-	if int(i) > 0 {
-		data, err := bson.Marshal(bson.M{"i": int(i)})
-		c.Assert(err, IsNil)
-		c.Assert(string(data), Equals, wrapInDoc("\x12i\x00\x00\x00\x00\x80\x00\x00\x00\x00"))
-
-		var result struct{ I int }
-		err = bson.Unmarshal(data, &result)
-		c.Assert(err, IsNil)
-		c.Assert(int64(result.I), Equals, i)
-	}
-}
-
-// --------------------------------------------------------------------------
-// Generic two-way struct marshaling tests.
-
-var bytevar = byte(8)
-var byteptr = &bytevar
-
-var structItems = []testItemType{
-	{&struct{ Ptr *byte }{nil},
-		"\x0Aptr\x00"},
-	{&struct{ Ptr *byte }{&bytevar},
-		"\x10ptr\x00\x08\x00\x00\x00"},
-	{&struct{ Ptr **byte }{&byteptr},
-		"\x10ptr\x00\x08\x00\x00\x00"},
-	{&struct{ Byte byte }{8},
-		"\x10byte\x00\x08\x00\x00\x00"},
-	{&struct{ Byte byte }{0},
-		"\x10byte\x00\x00\x00\x00\x00"},
-	{&struct {
-		V byte "Tag"
-	}{8},
-		"\x10Tag\x00\x08\x00\x00\x00"},
-	{&struct {
-		V *struct {
-			Byte byte
-		}
-	}{&struct{ Byte byte }{8}},
-		"\x03v\x00" + "\x0f\x00\x00\x00\x10byte\x00\b\x00\x00\x00\x00"},
-	{&struct{ priv byte }{}, ""},
-
-	// The order of the dumped fields should be the same in the struct.
-	{&struct{ A, C, B, D, F, E *byte }{},
-		"\x0Aa\x00\x0Ac\x00\x0Ab\x00\x0Ad\x00\x0Af\x00\x0Ae\x00"},
-
-	{&struct{ V bson.Raw }{bson.Raw{0x03, []byte("\x0f\x00\x00\x00\x10byte\x00\b\x00\x00\x00\x00")}},
-		"\x03v\x00" + "\x0f\x00\x00\x00\x10byte\x00\b\x00\x00\x00\x00"},
-	{&struct{ V bson.Raw }{bson.Raw{0x10, []byte("\x00\x00\x00\x00")}},
-		"\x10v\x00" + "\x00\x00\x00\x00"},
-
-	// Byte arrays.
-	{&struct{ V [2]byte }{[2]byte{'y', 'o'}},
-		"\x05v\x00\x02\x00\x00\x00\x00yo"},
-}
-
-func (s *S) TestMarshalStructItems(c *C) {
-	for i, item := range structItems {
-		data, err := bson.Marshal(item.obj)
-		c.Assert(err, IsNil)
-		c.Assert(string(data), Equals, wrapInDoc(item.data),
-			Commentf("Failed on item %d", i))
-	}
-}
-
-func (s *S) TestUnmarshalStructItems(c *C) {
-	for _, item := range structItems {
-		testUnmarshal(c, wrapInDoc(item.data), item.obj)
-	}
-}
-
-func (s *S) TestUnmarshalRawStructItems(c *C) {
-	for i, item := range structItems {
-		raw := bson.Raw{0x03, []byte(wrapInDoc(item.data))}
-		zero := makeZeroDoc(item.obj)
-		err := raw.Unmarshal(zero)
-		c.Assert(err, IsNil)
-		c.Assert(zero, DeepEquals, item.obj, Commentf("Failed on item %d: %#v", i, item))
-	}
-}
-
-func (s *S) TestUnmarshalRawNil(c *C) {
-	// Regression test: shouldn't try to nil out the pointer itself,
-	// as it's not settable.
-	raw := bson.Raw{0x0A, []byte{}}
-	err := raw.Unmarshal(&struct{}{})
-	c.Assert(err, IsNil)
-}
-
-// --------------------------------------------------------------------------
-// One-way marshaling tests.
-
-type dOnIface struct {
-	D interface{}
-}
-
-type ignoreField struct {
-	Before string
-	Ignore string `bson:"-"`
-	After  string
-}
-
-var marshalItems = []testItemType{
-	// Ordered document dump.  Will unmarshal as a dictionary by default.
-	{bson.D{{"a", nil}, {"c", nil}, {"b", nil}, {"d", nil}, {"f", nil}, {"e", true}},
-		"\x0Aa\x00\x0Ac\x00\x0Ab\x00\x0Ad\x00\x0Af\x00\x08e\x00\x01"},
-	{MyD{{"a", nil}, {"c", nil}, {"b", nil}, {"d", nil}, {"f", nil}, {"e", true}},
-		"\x0Aa\x00\x0Ac\x00\x0Ab\x00\x0Ad\x00\x0Af\x00\x08e\x00\x01"},
-	{&dOnIface{bson.D{{"a", nil}, {"c", nil}, {"b", nil}, {"d", true}}},
-		"\x03d\x00" + wrapInDoc("\x0Aa\x00\x0Ac\x00\x0Ab\x00\x08d\x00\x01")},
-
-	{bson.RawD{{"a", bson.Raw{0x0A, nil}}, {"c", bson.Raw{0x0A, nil}}, {"b", bson.Raw{0x08, []byte{0x01}}}},
-		"\x0Aa\x00" + "\x0Ac\x00" + "\x08b\x00\x01"},
-	{MyRawD{{"a", bson.Raw{0x0A, nil}}, {"c", bson.Raw{0x0A, nil}}, {"b", bson.Raw{0x08, []byte{0x01}}}},
-		"\x0Aa\x00" + "\x0Ac\x00" + "\x08b\x00\x01"},
-	{&dOnIface{bson.RawD{{"a", bson.Raw{0x0A, nil}}, {"c", bson.Raw{0x0A, nil}}, {"b", bson.Raw{0x08, []byte{0x01}}}}},
-		"\x03d\x00" + wrapInDoc("\x0Aa\x00"+"\x0Ac\x00"+"\x08b\x00\x01")},
-
-	{&ignoreField{"before", "ignore", "after"},
-		"\x02before\x00\a\x00\x00\x00before\x00\x02after\x00\x06\x00\x00\x00after\x00"},
-
-	// Marshalling a Raw document does nothing.
-	{bson.Raw{0x03, []byte(wrapInDoc("anything"))},
-		"anything"},
-	{bson.Raw{Data: []byte(wrapInDoc("anything"))},
-		"anything"},
-}
-
-func (s *S) TestMarshalOneWayItems(c *C) {
-	for _, item := range marshalItems {
-		data, err := bson.Marshal(item.obj)
-		c.Assert(err, IsNil)
-		c.Assert(string(data), Equals, wrapInDoc(item.data))
-	}
-}
-
-// --------------------------------------------------------------------------
-// One-way unmarshaling tests.
-
-var unmarshalItems = []testItemType{
-	// Field is private.  Should not attempt to unmarshal it.
-	{&struct{ priv byte }{},
-		"\x10priv\x00\x08\x00\x00\x00"},
-
-	// Wrong casing. Field names are lowercased.
-	{&struct{ Byte byte }{},
-		"\x10Byte\x00\x08\x00\x00\x00"},
-
-	// Ignore non-existing field.
-	{&struct{ Byte byte }{9},
-		"\x10boot\x00\x08\x00\x00\x00" + "\x10byte\x00\x09\x00\x00\x00"},
-
-	// Do not unmarshal on ignored field.
-	{&ignoreField{"before", "", "after"},
-		"\x02before\x00\a\x00\x00\x00before\x00" +
-			"\x02-\x00\a\x00\x00\x00ignore\x00" +
-			"\x02after\x00\x06\x00\x00\x00after\x00"},
-
-	// Ignore unsuitable types silently.
-	{map[string]string{"str": "s"},
-		"\x02str\x00\x02\x00\x00\x00s\x00" + "\x10int\x00\x01\x00\x00\x00"},
-	{map[string][]int{"array": []int{5, 9}},
-		"\x04array\x00" + wrapInDoc("\x100\x00\x05\x00\x00\x00"+"\x021\x00\x02\x00\x00\x00s\x00"+"\x102\x00\x09\x00\x00\x00")},
-
-	// Wrong type. Shouldn't init pointer.
-	{&struct{ Str *byte }{},
-		"\x02str\x00\x02\x00\x00\x00s\x00"},
-	{&struct{ Str *struct{ Str string } }{},
-		"\x02str\x00\x02\x00\x00\x00s\x00"},
-
-	// Ordered document.
-	{&struct{ bson.D }{bson.D{{"a", nil}, {"c", nil}, {"b", nil}, {"d", true}}},
-		"\x03d\x00" + wrapInDoc("\x0Aa\x00\x0Ac\x00\x0Ab\x00\x08d\x00\x01")},
-
-	// Raw document.
-	{&bson.Raw{0x03, []byte(wrapInDoc("\x10byte\x00\x08\x00\x00\x00"))},
-		"\x10byte\x00\x08\x00\x00\x00"},
-
-	// RawD document.
-	{&struct{ bson.RawD }{bson.RawD{{"a", bson.Raw{0x0A, []byte{}}}, {"c", bson.Raw{0x0A, []byte{}}}, {"b", bson.Raw{0x08, []byte{0x01}}}}},
-		"\x03rawd\x00" + wrapInDoc("\x0Aa\x00\x0Ac\x00\x08b\x00\x01")},
-
-	// Decode old binary.
-	{bson.M{"_": []byte("old")},
-		"\x05_\x00\x07\x00\x00\x00\x02\x03\x00\x00\x00old"},
-
-	// Decode old binary without length. According to the spec, this shouldn't happen.
-	{bson.M{"_": []byte("old")},
-		"\x05_\x00\x03\x00\x00\x00\x02old"},
-}
-
-func (s *S) TestUnmarshalOneWayItems(c *C) {
-	for _, item := range unmarshalItems {
-		testUnmarshal(c, wrapInDoc(item.data), item.obj)
-	}
-}
-
-func (s *S) TestUnmarshalNilInStruct(c *C) {
-	// Nil is the default value, so we need to ensure it's indeed being set.
-	b := byte(1)
-	v := &struct{ Ptr *byte }{&b}
-	err := bson.Unmarshal([]byte(wrapInDoc("\x0Aptr\x00")), v)
-	c.Assert(err, IsNil)
-	c.Assert(v, DeepEquals, &struct{ Ptr *byte }{nil})
-}
-
-// --------------------------------------------------------------------------
-// Marshalling error cases.
-
-type structWithDupKeys struct {
-	Name  byte
-	Other byte "name" // Tag should precede.
-}
-
-var marshalErrorItems = []testItemType{
-	{bson.M{"": uint64(1 << 63)},
-		"BSON has no uint64 type, and value is too large to fit correctly in an int64"},
-	{bson.M{"": bson.ObjectId("tooshort")},
-		"ObjectIDs must be exactly 12 bytes long \\(got 8\\)"},
-	{int64(123),
-		"Can't marshal int64 as a BSON document"},
-	{bson.M{"": 1i},
-		"Can't marshal complex128 in a BSON document"},
-	{&structWithDupKeys{},
-		"Duplicated key 'name' in struct bson_test.structWithDupKeys"},
-	{bson.Raw{0x0A, []byte{}},
-		"Attempted to unmarshal Raw kind 10 as a document"},
-	{&inlineCantPtr{&struct{ A, B int }{1, 2}},
-		"Option ,inline needs a struct value or map field"},
-	{&inlineDupName{1, struct{ A, B int }{2, 3}},
-		"Duplicated key 'a' in struct bson_test.inlineDupName"},
-	{&inlineDupMap{},
-		"Multiple ,inline maps in struct bson_test.inlineDupMap"},
-	{&inlineBadKeyMap{},
-		"Option ,inline needs a map with string keys in struct bson_test.inlineBadKeyMap"},
-	{&inlineMap{A: 1, M: map[string]interface{}{"a": 1}},
-		`Can't have key "a" in inlined map; conflicts with struct field`},
-}
-
-func (s *S) TestMarshalErrorItems(c *C) {
-	for _, item := range marshalErrorItems {
-		data, err := bson.Marshal(item.obj)
-		c.Assert(err, ErrorMatches, item.data)
-		c.Assert(data, IsNil)
-	}
-}
-
-// --------------------------------------------------------------------------
-// Unmarshalling error cases.
-
-type unmarshalErrorType struct {
-	obj   interface{}
-	data  string
-	error string
-}
-
-var unmarshalErrorItems = []unmarshalErrorType{
-	// Tag name conflicts with existing parameter.
-	{&structWithDupKeys{},
-		"\x10name\x00\x08\x00\x00\x00",
-		"Duplicated key 'name' in struct bson_test.structWithDupKeys"},
-
-	// Non-string map key.
-	{map[int]interface{}{},
-		"\x10name\x00\x08\x00\x00\x00",
-		"BSON map must have string keys. Got: map\\[int\\]interface \\{\\}"},
-
-	{nil,
-		"\xEEname\x00",
-		"Unknown element kind \\(0xEE\\)"},
-
-	{struct{ Name bool }{},
-		"\x10name\x00\x08\x00\x00\x00",
-		"Unmarshal can't deal with struct values. Use a pointer."},
-
-	{123,
-		"\x10name\x00\x08\x00\x00\x00",
-		"Unmarshal needs a map or a pointer to a struct."},
-}
-
-func (s *S) TestUnmarshalErrorItems(c *C) {
-	for _, item := range unmarshalErrorItems {
-		data := []byte(wrapInDoc(item.data))
-		var value interface{}
-		switch reflect.ValueOf(item.obj).Kind() {
-		case reflect.Map, reflect.Ptr:
-			value = makeZeroDoc(item.obj)
-		case reflect.Invalid:
-			value = bson.M{}
-		default:
-			value = item.obj
-		}
-		err := bson.Unmarshal(data, value)
-		c.Assert(err, ErrorMatches, item.error)
-	}
-}
-
-type unmarshalRawErrorType struct {
-	obj   interface{}
-	raw   bson.Raw
-	error string
-}
-
-var unmarshalRawErrorItems = []unmarshalRawErrorType{
-	// Tag name conflicts with existing parameter.
-	{&structWithDupKeys{},
-		bson.Raw{0x03, []byte("\x10byte\x00\x08\x00\x00\x00")},
-		"Duplicated key 'name' in struct bson_test.structWithDupKeys"},
-
-	{&struct{}{},
-		bson.Raw{0xEE, []byte{}},
-		"Unknown element kind \\(0xEE\\)"},
-
-	{struct{ Name bool }{},
-		bson.Raw{0x10, []byte("\x08\x00\x00\x00")},
-		"Raw Unmarshal can't deal with struct values. Use a pointer."},
-
-	{123,
-		bson.Raw{0x10, []byte("\x08\x00\x00\x00")},
-		"Raw Unmarshal needs a map or a valid pointer."},
-}
-
-func (s *S) TestUnmarshalRawErrorItems(c *C) {
-	for i, item := range unmarshalRawErrorItems {
-		err := item.raw.Unmarshal(item.obj)
-		c.Assert(err, ErrorMatches, item.error, Commentf("Failed on item %d: %#v\n", i, item))
-	}
-}
-
-var corruptedData = []string{
-	"\x04\x00\x00\x00\x00",         // Shorter than minimum
-	"\x06\x00\x00\x00\x00",         // Not enough data
-	"\x05\x00\x00",                 // Broken length
-	"\x05\x00\x00\x00\xff",         // Corrupted termination
-	"\x0A\x00\x00\x00\x0Aooop\x00", // Unfinished C string
-
-	// Array end past end of string (s[2]=0x07 is correct)
-	wrapInDoc("\x04\x00\x09\x00\x00\x00\x0A\x00\x00"),
-
-	// Array end within string, but past acceptable.
-	wrapInDoc("\x04\x00\x08\x00\x00\x00\x0A\x00\x00"),
-
-	// Document end within string, but past acceptable.
-	wrapInDoc("\x03\x00\x08\x00\x00\x00\x0A\x00\x00"),
-
-	// String with corrupted end.
-	wrapInDoc("\x02\x00\x03\x00\x00\x00yo\xFF"),
-}
-
-func (s *S) TestUnmarshalMapDocumentTooShort(c *C) {
-	for _, data := range corruptedData {
-		err := bson.Unmarshal([]byte(data), bson.M{})
-		c.Assert(err, ErrorMatches, "Document is corrupted")
-
-		err = bson.Unmarshal([]byte(data), &struct{}{})
-		c.Assert(err, ErrorMatches, "Document is corrupted")
-	}
-}
-
-// --------------------------------------------------------------------------
-// Setter test cases.
-
-var setterResult = map[string]error{}
-
-type setterType struct {
-	received interface{}
-}
-
-func (o *setterType) SetBSON(raw bson.Raw) error {
-	err := raw.Unmarshal(&o.received)
-	if err != nil {
-		panic("The panic:" + err.Error())
-	}
-	if s, ok := o.received.(string); ok {
-		if result, ok := setterResult[s]; ok {
-			return result
-		}
-	}
-	return nil
-}
-
-type ptrSetterDoc struct {
-	Field *setterType "_"
-}
-
-type valSetterDoc struct {
-	Field setterType "_"
-}
-
-func (s *S) TestUnmarshalAllItemsWithPtrSetter(c *C) {
-	for _, item := range allItems {
-		for i := 0; i != 2; i++ {
-			var field *setterType
-			if i == 0 {
-				obj := &ptrSetterDoc{}
-				err := bson.Unmarshal([]byte(wrapInDoc(item.data)), obj)
-				c.Assert(err, IsNil)
-				field = obj.Field
-			} else {
-				obj := &valSetterDoc{}
-				err := bson.Unmarshal([]byte(wrapInDoc(item.data)), obj)
-				c.Assert(err, IsNil)
-				field = &obj.Field
-			}
-			if item.data == "" {
-				// Nothing to unmarshal. Should be untouched.
-				if i == 0 {
-					c.Assert(field, IsNil)
-				} else {
-					c.Assert(field.received, IsNil)
-				}
-			} else {
-				expected := item.obj.(bson.M)["_"]
-				c.Assert(field, NotNil, Commentf("Pointer not initialized (%#v)", expected))
-				c.Assert(field.received, DeepEquals, expected)
-			}
-		}
-	}
-}
-
-func (s *S) TestUnmarshalWholeDocumentWithSetter(c *C) {
-	obj := &setterType{}
-	err := bson.Unmarshal([]byte(sampleItems[0].data), obj)
-	c.Assert(err, IsNil)
-	c.Assert(obj.received, DeepEquals, bson.M{"hello": "world"})
-}
-
-func (s *S) TestUnmarshalSetterOmits(c *C) {
-	setterResult["2"] = &bson.TypeError{}
-	setterResult["4"] = &bson.TypeError{}
-	defer func() {
-		delete(setterResult, "2")
-		delete(setterResult, "4")
-	}()
-
-	m := map[string]*setterType{}
-	data := wrapInDoc("\x02abc\x00\x02\x00\x00\x001\x00" +
-		"\x02def\x00\x02\x00\x00\x002\x00" +
-		"\x02ghi\x00\x02\x00\x00\x003\x00" +
-		"\x02jkl\x00\x02\x00\x00\x004\x00")
-	err := bson.Unmarshal([]byte(data), m)
-	c.Assert(err, IsNil)
-	c.Assert(m["abc"], NotNil)
-	c.Assert(m["def"], IsNil)
-	c.Assert(m["ghi"], NotNil)
-	c.Assert(m["jkl"], IsNil)
-
-	c.Assert(m["abc"].received, Equals, "1")
-	c.Assert(m["ghi"].received, Equals, "3")
-}
-
-func (s *S) TestUnmarshalSetterErrors(c *C) {
-	boom := errors.New("BOOM")
-	setterResult["2"] = boom
-	defer delete(setterResult, "2")
-
-	m := map[string]*setterType{}
-	data := wrapInDoc("\x02abc\x00\x02\x00\x00\x001\x00" +
-		"\x02def\x00\x02\x00\x00\x002\x00" +
-		"\x02ghi\x00\x02\x00\x00\x003\x00")
-	err := bson.Unmarshal([]byte(data), m)
-	c.Assert(err, Equals, boom)
-	c.Assert(m["abc"], NotNil)
-	c.Assert(m["def"], IsNil)
-	c.Assert(m["ghi"], IsNil)
-
-	c.Assert(m["abc"].received, Equals, "1")
-}
-
-func (s *S) TestDMap(c *C) {
-	d := bson.D{{"a", 1}, {"b", 2}}
-	c.Assert(d.Map(), DeepEquals, bson.M{"a": 1, "b": 2})
-}
-
-func (s *S) TestUnmarshalSetterSetZero(c *C) {
-	setterResult["foo"] = bson.SetZero
-	defer delete(setterResult, "field")
-
-	data, err := bson.Marshal(bson.M{"field": "foo"})
-	c.Assert(err, IsNil)
-
-	m := map[string]*setterType{}
-	err = bson.Unmarshal([]byte(data), m)
-	c.Assert(err, IsNil)
-
-	value, ok := m["field"]
-	c.Assert(ok, Equals, true)
-	c.Assert(value, IsNil)
-}
-
-// --------------------------------------------------------------------------
-// Getter test cases.
-
-type typeWithGetter struct {
-	result interface{}
-	err    error
-}
-
-func (t *typeWithGetter) GetBSON() (interface{}, error) {
-	if t == nil {
-		return "<value is nil>", nil
-	}
-	return t.result, t.err
-}
-
-type docWithGetterField struct {
-	Field *typeWithGetter "_"
-}
-
-func (s *S) TestMarshalAllItemsWithGetter(c *C) {
-	for i, item := range allItems {
-		if item.data == "" {
-			continue
-		}
-		obj := &docWithGetterField{}
-		obj.Field = &typeWithGetter{result: item.obj.(bson.M)["_"]}
-		data, err := bson.Marshal(obj)
-		c.Assert(err, IsNil)
-		c.Assert(string(data), Equals, wrapInDoc(item.data),
-			Commentf("Failed on item #%d", i))
-	}
-}
-
-func (s *S) TestMarshalWholeDocumentWithGetter(c *C) {
-	obj := &typeWithGetter{result: sampleItems[0].obj}
-	data, err := bson.Marshal(obj)
-	c.Assert(err, IsNil)
-	c.Assert(string(data), Equals, sampleItems[0].data)
-}
-
-func (s *S) TestGetterErrors(c *C) {
-	e := errors.New("oops")
-
-	obj1 := &docWithGetterField{}
-	obj1.Field = &typeWithGetter{sampleItems[0].obj, e}
-	data, err := bson.Marshal(obj1)
-	c.Assert(err, ErrorMatches, "oops")
-	c.Assert(data, IsNil)
-
-	obj2 := &typeWithGetter{sampleItems[0].obj, e}
-	data, err = bson.Marshal(obj2)
-	c.Assert(err, ErrorMatches, "oops")
-	c.Assert(data, IsNil)
-}
-
-type intGetter int64
-
-func (t intGetter) GetBSON() (interface{}, error) {
-	return int64(t), nil
-}
-
-type typeWithIntGetter struct {
-	V intGetter ",minsize"
-}
-
-func (s *S) TestMarshalShortWithGetter(c *C) {
-	obj := typeWithIntGetter{42}
-	data, err := bson.Marshal(obj)
-	c.Assert(err, IsNil)
-	m := bson.M{}
-	err = bson.Unmarshal(data, m)
-	c.Assert(err, IsNil)
-	c.Assert(m["v"], Equals, 42)
-}
-
-func (s *S) TestMarshalWithGetterNil(c *C) {
-	obj := docWithGetterField{}
-	data, err := bson.Marshal(obj)
-	c.Assert(err, IsNil)
-	m := bson.M{}
-	err = bson.Unmarshal(data, m)
-	c.Assert(err, IsNil)
-	c.Assert(m, DeepEquals, bson.M{"_": "<value is nil>"})
-}
-
-// --------------------------------------------------------------------------
-// Cross-type conversion tests.
-
-type crossTypeItem struct {
-	obj1 interface{}
-	obj2 interface{}
-}
-
-type condStr struct {
-	V string ",omitempty"
-}
-type condStrNS struct {
-	V string `a:"A" bson:",omitempty" b:"B"`
-}
-type condBool struct {
-	V bool ",omitempty"
-}
-type condInt struct {
-	V int ",omitempty"
-}
-type condUInt struct {
-	V uint ",omitempty"
-}
-type condFloat struct {
-	V float64 ",omitempty"
-}
-type condIface struct {
-	V interface{} ",omitempty"
-}
-type condPtr struct {
-	V *bool ",omitempty"
-}
-type condSlice struct {
-	V []string ",omitempty"
-}
-type condMap struct {
-	V map[string]int ",omitempty"
-}
-type namedCondStr struct {
-	V string "myv,omitempty"
-}
-type condTime struct {
-	V time.Time ",omitempty"
-}
-type condStruct struct {
-	V struct{ A []int } ",omitempty"
-}
-
-type shortInt struct {
-	V int64 ",minsize"
-}
-type shortUint struct {
-	V uint64 ",minsize"
-}
-type shortIface struct {
-	V interface{} ",minsize"
-}
-type shortPtr struct {
-	V *int64 ",minsize"
-}
-type shortNonEmptyInt struct {
-	V int64 ",minsize,omitempty"
-}
-
-type inlineInt struct {
-	V struct{ A, B int } ",inline"
-}
-type inlineCantPtr struct {
-	V *struct{ A, B int } ",inline"
-}
-type inlineDupName struct {
-	A int
-	V struct{ A, B int } ",inline"
-}
-type inlineMap struct {
-	A int
-	M map[string]interface{} ",inline"
-}
-type inlineMapInt struct {
-	A int
-	M map[string]int ",inline"
-}
-type inlineMapMyM struct {
-	A int
-	M MyM ",inline"
-}
-type inlineDupMap struct {
-	M1 map[string]interface{} ",inline"
-	M2 map[string]interface{} ",inline"
-}
-type inlineBadKeyMap struct {
-	M map[int]int ",inline"
-}
-
-type getterSetterD bson.D
-
-func (s getterSetterD) GetBSON() (interface{}, error) {
-	if len(s) == 0 {
-		return bson.D{}, nil
-	}
-	return bson.D(s[:len(s)-1]), nil
-}
-
-func (s *getterSetterD) SetBSON(raw bson.Raw) error {
-	var doc bson.D
-	err := raw.Unmarshal(&doc)
-	doc = append(doc, bson.DocElem{"suffix", true})
-	*s = getterSetterD(doc)
-	return err
-}
-
-type getterSetterInt int
-
-func (i getterSetterInt) GetBSON() (interface{}, error) {
-	return bson.D{{"a", int(i)}}, nil
-}
-
-func (i *getterSetterInt) SetBSON(raw bson.Raw) error {
-	var doc struct{ A int }
-	err := raw.Unmarshal(&doc)
-	*i = getterSetterInt(doc.A)
-	return err
-}
-
-type ifaceType interface {
-	Hello()
-}
-
-type ifaceSlice []ifaceType
-
-func (s *ifaceSlice) SetBSON(raw bson.Raw) error {
-	var ns []int
-	if err := raw.Unmarshal(&ns); err != nil {
-		return err
-	}
-	*s = make(ifaceSlice, ns[0])
-	return nil
-}
-
-func (s ifaceSlice) GetBSON() (interface{}, error) {
-	return []int{len(s)}, nil
-}
-
-type (
-	MyString string
-	MyBytes  []byte
-	MyBool   bool
-	MyD      []bson.DocElem
-	MyRawD   []bson.RawDocElem
-	MyM      map[string]interface{}
-)
-
-var (
-	truevar  = true
-	falsevar = false
-
-	int64var = int64(42)
-	int64ptr = &int64var
-	intvar   = int(42)
-	intptr   = &intvar
-
-	gsintvar = getterSetterInt(42)
-)
-
-func parseURL(s string) *url.URL {
-	u, err := url.Parse(s)
-	if err != nil {
-		panic(err)
-	}
-	return u
-}
-
-// That's a pretty fun test.  It will dump the first item, generate a zero
-// value equivalent to the second one, load the dumped data onto it, and then
-// verify that the resulting value is deep-equal to the untouched second value.
-// Then, it will do the same in the *opposite* direction!
-var twoWayCrossItems = []crossTypeItem{
-	// int<=>int
-	{&struct{ I int }{42}, &struct{ I int8 }{42}},
-	{&struct{ I int }{42}, &struct{ I int32 }{42}},
-	{&struct{ I int }{42}, &struct{ I int64 }{42}},
-	{&struct{ I int8 }{42}, &struct{ I int32 }{42}},
-	{&struct{ I int8 }{42}, &struct{ I int64 }{42}},
-	{&struct{ I int32 }{42}, &struct{ I int64 }{42}},
-
-	// uint<=>uint
-	{&struct{ I uint }{42}, &struct{ I uint8 }{42}},
-	{&struct{ I uint }{42}, &struct{ I uint32 }{42}},
-	{&struct{ I uint }{42}, &struct{ I uint64 }{42}},
-	{&struct{ I uint8 }{42}, &struct{ I uint32 }{42}},
-	{&struct{ I uint8 }{42}, &struct{ I uint64 }{42}},
-	{&struct{ I uint32 }{42}, &struct{ I uint64 }{42}},
-
-	// float32<=>float64
-	{&struct{ I float32 }{42}, &struct{ I float64 }{42}},
-
-	// int<=>uint
-	{&struct{ I uint }{42}, &struct{ I int }{42}},
-	{&struct{ I uint }{42}, &struct{ I int8 }{42}},
-	{&struct{ I uint }{42}, &struct{ I int32 }{42}},
-	{&struct{ I uint }{42}, &struct{ I int64 }{42}},
-	{&struct{ I uint8 }{42}, &struct{ I int }{42}},
-	{&struct{ I uint8 }{42}, &struct{ I int8 }{42}},
-	{&struct{ I uint8 }{42}, &struct{ I int32 }{42}},
-	{&struct{ I uint8 }{42}, &struct{ I int64 }{42}},
-	{&struct{ I uint32 }{42}, &struct{ I int }{42}},
-	{&struct{ I uint32 }{42}, &struct{ I int8 }{42}},
-	{&struct{ I uint32 }{42}, &struct{ I int32 }{42}},
-	{&struct{ I uint32 }{42}, &struct{ I int64 }{42}},
-	{&struct{ I uint64 }{42}, &struct{ I int }{42}},
-	{&struct{ I uint64 }{42}, &struct{ I int8 }{42}},
-	{&struct{ I uint64 }{42}, &struct{ I int32 }{42}},
-	{&struct{ I uint64 }{42}, &struct{ I int64 }{42}},
-
-	// int <=> float
-	{&struct{ I int }{42}, &struct{ I float64 }{42}},
-
-	// int <=> bool
-	{&struct{ I int }{1}, &struct{ I bool }{true}},
-	{&struct{ I int }{0}, &struct{ I bool }{false}},
-
-	// uint <=> float64
-	{&struct{ I uint }{42}, &struct{ I float64 }{42}},
-
-	// uint <=> bool
-	{&struct{ I uint }{1}, &struct{ I bool }{true}},
-	{&struct{ I uint }{0}, &struct{ I bool }{false}},
-
-	// float64 <=> bool
-	{&struct{ I float64 }{1}, &struct{ I bool }{true}},
-	{&struct{ I float64 }{0}, &struct{ I bool }{false}},
-
-	// string <=> string and string <=> []byte
-	{&struct{ S []byte }{[]byte("abc")}, &struct{ S string }{"abc"}},
-	{&struct{ S []byte }{[]byte("def")}, &struct{ S bson.Symbol }{"def"}},
-	{&struct{ S string }{"ghi"}, &struct{ S bson.Symbol }{"ghi"}},
-
-	// map <=> struct
-	{&struct {
-		A struct {
-			B, C int
-		}
-	}{struct{ B, C int }{1, 2}},
-		map[string]map[string]int{"a": map[string]int{"b": 1, "c": 2}}},
-
-	{&struct{ A bson.Symbol }{"abc"}, map[string]string{"a": "abc"}},
-	{&struct{ A bson.Symbol }{"abc"}, map[string][]byte{"a": []byte("abc")}},
-	{&struct{ A []byte }{[]byte("abc")}, map[string]string{"a": "abc"}},
-	{&struct{ A uint }{42}, map[string]int{"a": 42}},
-	{&struct{ A uint }{42}, map[string]float64{"a": 42}},
-	{&struct{ A uint }{1}, map[string]bool{"a": true}},
-	{&struct{ A int }{42}, map[string]uint{"a": 42}},
-	{&struct{ A int }{42}, map[string]float64{"a": 42}},
-	{&struct{ A int }{1}, map[string]bool{"a": true}},
-	{&struct{ A float64 }{42}, map[string]float32{"a": 42}},
-	{&struct{ A float64 }{42}, map[string]int{"a": 42}},
-	{&struct{ A float64 }{42}, map[string]uint{"a": 42}},
-	{&struct{ A float64 }{1}, map[string]bool{"a": true}},
-	{&struct{ A bool }{true}, map[string]int{"a": 1}},
-	{&struct{ A bool }{true}, map[string]uint{"a": 1}},
-	{&struct{ A bool }{true}, map[string]float64{"a": 1}},
-	{&struct{ A **byte }{&byteptr}, map[string]byte{"a": 8}},
-
-	// url.URL <=> string
-	{&struct{ URL *url.URL }{parseURL("h://e.c/p")}, map[string]string{"url": "h://e.c/p"}},
-	{&struct{ URL url.URL }{*parseURL("h://e.c/p")}, map[string]string{"url": "h://e.c/p"}},
-
-	// Slices
-	{&struct{ S []int }{[]int{1, 2, 3}}, map[string][]int{"s": []int{1, 2, 3}}},
-	{&struct{ S *[]int }{&[]int{1, 2, 3}}, map[string][]int{"s": []int{1, 2, 3}}},
-
-	// Conditionals
-	{&condBool{true}, map[string]bool{"v": true}},
-	{&condBool{}, map[string]bool{}},
-	{&condInt{1}, map[string]int{"v": 1}},
-	{&condInt{}, map[string]int{}},
-	{&condUInt{1}, map[string]uint{"v": 1}},
-	{&condUInt{}, map[string]uint{}},
-	{&condFloat{}, map[string]int{}},
-	{&condStr{"yo"}, map[string]string{"v": "yo"}},
-	{&condStr{}, map[string]string{}},
-	{&condStrNS{"yo"}, map[string]string{"v": "yo"}},
-	{&condStrNS{}, map[string]string{}},
-	{&condSlice{[]string{"yo"}}, map[string][]string{"v": []string{"yo"}}},
-	{&condSlice{}, map[string][]string{}},
-	{&condMap{map[string]int{"k": 1}}, bson.M{"v": bson.M{"k": 1}}},
-	{&condMap{}, map[string][]string{}},
-	{&condIface{"yo"}, map[string]string{"v": "yo"}},
-	{&condIface{""}, map[string]string{"v": ""}},
-	{&condIface{}, map[string]string{}},
-	{&condPtr{&truevar}, map[string]bool{"v": true}},
-	{&condPtr{&falsevar}, map[string]bool{"v": false}},
-	{&condPtr{}, map[string]string{}},
-
-	{&condTime{time.Unix(123456789, 123e6)}, map[string]time.Time{"v": time.Unix(123456789, 123e6)}},
-	{&condTime{}, map[string]string{}},
-
-	{&condStruct{struct{ A []int }{[]int{1}}}, bson.M{"v": bson.M{"a": []interface{}{1}}}},
-	{&condStruct{struct{ A []int }{}}, bson.M{}},
-
-	{&namedCondStr{"yo"}, map[string]string{"myv": "yo"}},
-	{&namedCondStr{}, map[string]string{}},
-
-	{&shortInt{1}, map[string]interface{}{"v": 1}},
-	{&shortInt{1 << 30}, map[string]interface{}{"v": 1 << 30}},
-	{&shortInt{1 << 31}, map[string]interface{}{"v": int64(1 << 31)}},
-	{&shortUint{1 << 30}, map[string]interface{}{"v": 1 << 30}},
-	{&shortUint{1 << 31}, map[string]interface{}{"v": int64(1 << 31)}},
-	{&shortIface{int64(1) << 31}, map[string]interface{}{"v": int64(1 << 31)}},
-	{&shortPtr{int64ptr}, map[string]interface{}{"v": intvar}},
-
-	{&shortNonEmptyInt{1}, map[string]interface{}{"v": 1}},
-	{&shortNonEmptyInt{1 << 31}, map[string]interface{}{"v": int64(1 << 31)}},
-	{&shortNonEmptyInt{}, map[string]interface{}{}},
-
-	{&inlineInt{struct{ A, B int }{1, 2}}, map[string]interface{}{"a": 1, "b": 2}},
-	{&inlineMap{A: 1, M: map[string]interface{}{"b": 2}}, map[string]interface{}{"a": 1, "b": 2}},
-	{&inlineMap{A: 1, M: nil}, map[string]interface{}{"a": 1}},
-	{&inlineMapInt{A: 1, M: map[string]int{"b": 2}}, map[string]int{"a": 1, "b": 2}},
-	{&inlineMapInt{A: 1, M: nil}, map[string]int{"a": 1}},
-	{&inlineMapMyM{A: 1, M: MyM{"b": MyM{"c": 3}}}, map[string]interface{}{"a": 1, "b": map[string]interface{}{"c": 3}}},
-
-	// []byte <=> MyBytes
-	{&struct{ B MyBytes }{[]byte("abc")}, map[string]string{"b": "abc"}},
-	{&struct{ B MyBytes }{[]byte{}}, map[string]string{"b": ""}},
-	{&struct{ B MyBytes }{}, map[string]bool{}},
-	{&struct{ B []byte }{[]byte("abc")}, map[string]MyBytes{"b": []byte("abc")}},
-
-	// bool <=> MyBool
-	{&struct{ B MyBool }{true}, map[string]bool{"b": true}},
-	{&struct{ B MyBool }{}, map[string]bool{"b": false}},
-	{&struct{ B MyBool }{}, map[string]string{}},
-	{&struct{ B bool }{}, map[string]MyBool{"b": false}},
-
-	// arrays
-	{&struct{ V [2]int }{[...]int{1, 2}}, map[string][2]int{"v": [2]int{1, 2}}},
-	{&struct{ V [2]byte }{[...]byte{1, 2}}, map[string][2]byte{"v": [2]byte{1, 2}}},
-
-	// zero time
-	{&struct{ V time.Time }{}, map[string]interface{}{"v": time.Time{}}},
-
-	// zero time + 1 second + 1 millisecond; overflows int64 as nanoseconds
-	{&struct{ V time.Time }{time.Unix(-62135596799, 1e6).Local()},
-		map[string]interface{}{"v": time.Unix(-62135596799, 1e6).Local()}},
-
-	// bson.D <=> []DocElem
-	{&bson.D{{"a", bson.D{{"b", 1}, {"c", 2}}}}, &bson.D{{"a", bson.D{{"b", 1}, {"c", 2}}}}},
-	{&bson.D{{"a", bson.D{{"b", 1}, {"c", 2}}}}, &MyD{{"a", MyD{{"b", 1}, {"c", 2}}}}},
-	{&struct{ V MyD }{MyD{{"a", 1}}}, &bson.D{{"v", bson.D{{"a", 1}}}}},
-
-	// bson.RawD <=> []RawDocElem
-	{&bson.RawD{{"a", bson.Raw{0x08, []byte{0x01}}}}, &bson.RawD{{"a", bson.Raw{0x08, []byte{0x01}}}}},
-	{&bson.RawD{{"a", bson.Raw{0x08, []byte{0x01}}}}, &MyRawD{{"a", bson.Raw{0x08, []byte{0x01}}}}},
-
-	// bson.M <=> map
-	{bson.M{"a": bson.M{"b": 1, "c": 2}}, MyM{"a": MyM{"b": 1, "c": 2}}},
-	{bson.M{"a": bson.M{"b": 1, "c": 2}}, map[string]interface{}{"a": map[string]interface{}{"b": 1, "c": 2}}},
-
-	// bson.M <=> map[MyString]
-	{bson.M{"a": bson.M{"b": 1, "c": 2}}, map[MyString]interface{}{"a": map[MyString]interface{}{"b": 1, "c": 2}}},
-
-	// json.Number <=> int64, float64
-	{&struct{ N json.Number }{"5"}, map[string]interface{}{"n": int64(5)}},
-	{&struct{ N json.Number }{"5.05"}, map[string]interface{}{"n": 5.05}},
-	{&struct{ N json.Number }{"9223372036854776000"}, map[string]interface{}{"n": float64(1 << 63)}},
-
-	// bson.D <=> non-struct getter/setter
-	{&bson.D{{"a", 1}}, &getterSetterD{{"a", 1}, {"suffix", true}}},
-	{&bson.D{{"a", 42}}, &gsintvar},
-
-	// Interface slice setter.
-	{&struct{ V ifaceSlice }{ifaceSlice{nil, nil, nil}}, bson.M{"v": []interface{}{3}}},
-}
-
-// Same thing, but only one way (obj1 => obj2).
-var oneWayCrossItems = []crossTypeItem{
-	// map <=> struct
-	{map[string]interface{}{"a": 1, "b": "2", "c": 3}, map[string]int{"a": 1, "c": 3}},
-
-	// inline map elides badly typed values
-	{map[string]interface{}{"a": 1, "b": "2", "c": 3}, &inlineMapInt{A: 1, M: map[string]int{"c": 3}}},
-
-	// Can't decode int into struct.
-	{bson.M{"a": bson.M{"b": 2}}, &struct{ A bool }{}},
-
-	// Would get decoded into a int32 too in the opposite direction.
-	{&shortIface{int64(1) << 30}, map[string]interface{}{"v": 1 << 30}},
-
-	// Ensure omitempty on struct with private fields works properly.
-	{&struct {
-		V struct{ v time.Time } ",omitempty"
-	}{}, map[string]interface{}{}},
-}
-
-func testCrossPair(c *C, dump interface{}, load interface{}) {
-	c.Logf("Dump: %#v", dump)
-	c.Logf("Load: %#v", load)
-	zero := makeZeroDoc(load)
-	data, err := bson.Marshal(dump)
-	c.Assert(err, IsNil)
-	c.Logf("Dumped: %#v", string(data))
-	err = bson.Unmarshal(data, zero)
-	c.Assert(err, IsNil)
-	c.Logf("Loaded: %#v", zero)
-	c.Assert(zero, DeepEquals, load)
-}
-
-func (s *S) TestTwoWayCrossPairs(c *C) {
-	for _, item := range twoWayCrossItems {
-		testCrossPair(c, item.obj1, item.obj2)
-		testCrossPair(c, item.obj2, item.obj1)
-	}
-}
-
-func (s *S) TestOneWayCrossPairs(c *C) {
-	for _, item := range oneWayCrossItems {
-		testCrossPair(c, item.obj1, item.obj2)
-	}
-}
-
-// --------------------------------------------------------------------------
-// ObjectId hex representation test.
-
-func (s *S) TestObjectIdHex(c *C) {
-	id := bson.ObjectIdHex("4d88e15b60f486e428412dc9")
-	c.Assert(id.String(), Equals, `ObjectIdHex("4d88e15b60f486e428412dc9")`)
-	c.Assert(id.Hex(), Equals, "4d88e15b60f486e428412dc9")
-}
-
-func (s *S) TestIsObjectIdHex(c *C) {
-	test := []struct {
-		id    string
-		valid bool
-	}{
-		{"4d88e15b60f486e428412dc9", true},
-		{"4d88e15b60f486e428412dc", false},
-		{"4d88e15b60f486e428412dc9e", false},
-		{"4d88e15b60f486e428412dcx", false},
-	}
-	for _, t := range test {
-		c.Assert(bson.IsObjectIdHex(t.id), Equals, t.valid)
-	}
-}
-
-// --------------------------------------------------------------------------
-// ObjectId parts extraction tests.
-
-type objectIdParts struct {
-	id        bson.ObjectId
-	timestamp int64
-	machine   []byte
-	pid       uint16
-	counter   int32
-}
-
-var objectIds = []objectIdParts{
-	objectIdParts{
-		bson.ObjectIdHex("4d88e15b60f486e428412dc9"),
-		1300816219,
-		[]byte{0x60, 0xf4, 0x86},
-		0xe428,
-		4271561,
-	},
-	objectIdParts{
-		bson.ObjectIdHex("000000000000000000000000"),
-		0,
-		[]byte{0x00, 0x00, 0x00},
-		0x0000,
-		0,
-	},
-	objectIdParts{
-		bson.ObjectIdHex("00000000aabbccddee000001"),
-		0,
-		[]byte{0xaa, 0xbb, 0xcc},
-		0xddee,
-		1,
-	},
-}
-
-func (s *S) TestObjectIdPartsExtraction(c *C) {
-	for i, v := range objectIds {
-		t := time.Unix(v.timestamp, 0)
-		c.Assert(v.id.Time(), Equals, t, Commentf("#%d Wrong timestamp value", i))
-		c.Assert(v.id.Machine(), DeepEquals, v.machine, Commentf("#%d Wrong machine id value", i))
-		c.Assert(v.id.Pid(), Equals, v.pid, Commentf("#%d Wrong pid value", i))
-		c.Assert(v.id.Counter(), Equals, v.counter, Commentf("#%d Wrong counter value", i))
-	}
-}
-
-func (s *S) TestNow(c *C) {
-	before := time.Now()
-	time.Sleep(1e6)
-	now := bson.Now()
-	time.Sleep(1e6)
-	after := time.Now()
-	c.Assert(now.After(before) && now.Before(after), Equals, true, Commentf("now=%s, before=%s, after=%s", now, before, after))
-}
-
-// --------------------------------------------------------------------------
-// ObjectId generation tests.
-
-func (s *S) TestNewObjectId(c *C) {
-	// Generate 10 ids
-	ids := make([]bson.ObjectId, 10)
-	for i := 0; i < 10; i++ {
-		ids[i] = bson.NewObjectId()
-	}
-	for i := 1; i < 10; i++ {
-		prevId := ids[i-1]
-		id := ids[i]
-		// Test for uniqueness among all other 9 generated ids
-		for j, tid := range ids {
-			if j != i {
-				c.Assert(id, Not(Equals), tid, Commentf("Generated ObjectId is not unique"))
-			}
-		}
-		// Check that timestamp was incremented and is within 30 seconds of the previous one
-		secs := id.Time().Sub(prevId.Time()).Seconds()
-		c.Assert((secs >= 0 && secs <= 30), Equals, true, Commentf("Wrong timestamp in generated ObjectId"))
-		// Check that machine ids are the same
-		c.Assert(id.Machine(), DeepEquals, prevId.Machine())
-		// Check that pids are the same
-		c.Assert(id.Pid(), Equals, prevId.Pid())
-		// Test for proper increment
-		delta := int(id.Counter() - prevId.Counter())
-		c.Assert(delta, Equals, 1, Commentf("Wrong increment in generated ObjectId"))
-	}
-}
-
-func (s *S) TestNewObjectIdWithTime(c *C) {
-	t := time.Unix(12345678, 0)
-	id := bson.NewObjectIdWithTime(t)
-	c.Assert(id.Time(), Equals, t)
-	c.Assert(id.Machine(), DeepEquals, []byte{0x00, 0x00, 0x00})
-	c.Assert(int(id.Pid()), Equals, 0)
-	c.Assert(int(id.Counter()), Equals, 0)
-}
-
-// --------------------------------------------------------------------------
-// ObjectId JSON marshalling.
-
-type jsonType struct {
-	Id bson.ObjectId
-}
-
-var jsonIdTests = []struct {
-	value     jsonType
-	json      string
-	marshal   bool
-	unmarshal bool
-	error     string
-}{{
-	value:     jsonType{Id: bson.ObjectIdHex("4d88e15b60f486e428412dc9")},
-	json:      `{"Id":"4d88e15b60f486e428412dc9"}`,
-	marshal:   true,
-	unmarshal: true,
-}, {
-	value:     jsonType{},
-	json:      `{"Id":""}`,
-	marshal:   true,
-	unmarshal: true,
-}, {
-	value:     jsonType{},
-	json:      `{"Id":null}`,
-	marshal:   false,
-	unmarshal: true,
-}, {
-	json:      `{"Id":"4d88e15b60f486e428412dc9A"}`,
-	error:     `Invalid ObjectId in JSON: "4d88e15b60f486e428412dc9A"`,
-	marshal:   false,
-	unmarshal: true,
-}, {
-	json:      `{"Id":"4d88e15b60f486e428412dcZ"}`,
-	error:     `Invalid ObjectId in JSON: "4d88e15b60f486e428412dcZ" .*`,
-	marshal:   false,
-	unmarshal: true,
-}}
-
-func (s *S) TestObjectIdJSONMarshaling(c *C) {
-	for _, test := range jsonIdTests {
-		if test.marshal {
-			data, err := json.Marshal(&test.value)
-			if test.error == "" {
-				c.Assert(err, IsNil)
-				c.Assert(string(data), Equals, test.json)
-			} else {
-				c.Assert(err, ErrorMatches, test.error)
-			}
-		}
-
-		if test.unmarshal {
-			var value jsonType
-			err := json.Unmarshal([]byte(test.json), &value)
-			if test.error == "" {
-				c.Assert(err, IsNil)
-				c.Assert(value, DeepEquals, test.value)
-			} else {
-				c.Assert(err, ErrorMatches, test.error)
-			}
-		}
-	}
-}
-
-// --------------------------------------------------------------------------
-// Some simple benchmarks.
-
-type BenchT struct {
-	A, B, C, D, E, F string
-}
-
-type BenchRawT struct {
-	A string
-	B int
-	C bson.M
-	D []float64
-}
-
-func (s *S) BenchmarkUnmarhsalStruct(c *C) {
-	v := BenchT{A: "A", D: "D", E: "E"}
-	data, err := bson.Marshal(&v)
-	if err != nil {
-		panic(err)
-	}
-	c.ResetTimer()
-	for i := 0; i < c.N; i++ {
-		err = bson.Unmarshal(data, &v)
-	}
-	if err != nil {
-		panic(err)
-	}
-}
-
-func (s *S) BenchmarkUnmarhsalMap(c *C) {
-	m := bson.M{"a": "a", "d": "d", "e": "e"}
-	data, err := bson.Marshal(&m)
-	if err != nil {
-		panic(err)
-	}
-	c.ResetTimer()
-	for i := 0; i < c.N; i++ {
-		err = bson.Unmarshal(data, &m)
-	}
-	if err != nil {
-		panic(err)
-	}
-}
-
-func (s *S) BenchmarkUnmarshalRaw(c *C) {
-	var err error
-	m := BenchRawT{
-		A: "test_string",
-		B: 123,
-		C: bson.M{
-			"subdoc_int": 12312,
-			"subdoc_doc": bson.M{"1": 1},
-		},
-		D: []float64{0.0, 1.3333, -99.9997, 3.1415},
-	}
-	data, err := bson.Marshal(&m)
-	if err != nil {
-		panic(err)
-	}
-	raw := bson.Raw{}
-	c.ResetTimer()
-	for i := 0; i < c.N; i++ {
-		err = bson.Unmarshal(data, &raw)
-	}
-	if err != nil {
-		panic(err)
-	}
-}
diff --git a/Godeps/_workspace/src/gopkg.in/mgo.v2/bson/decode.go b/Godeps/_workspace/src/gopkg.in/mgo.v2/bson/decode.go
deleted file mode 100644
index bdd2e0287..000000000
--- a/Godeps/_workspace/src/gopkg.in/mgo.v2/bson/decode.go
+++ /dev/null
@@ -1,825 +0,0 @@
-// BSON library for Go
-//
-// Copyright (c) 2010-2012 - Gustavo Niemeyer <gustavo@niemeyer.net>
-//
-// 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 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.
-// gobson - BSON library for Go.
-
-package bson
-
-import (
-	"fmt"
-	"math"
-	"net/url"
-	"reflect"
-	"strconv"
-	"sync"
-	"time"
-)
-
-type decoder struct {
-	in      []byte
-	i       int
-	docType reflect.Type
-}
-
-var typeM = reflect.TypeOf(M{})
-
-func newDecoder(in []byte) *decoder {
-	return &decoder{in, 0, typeM}
-}
-
-// --------------------------------------------------------------------------
-// Some helper functions.
-
-func corrupted() {
-	panic("Document is corrupted")
-}
-
-func settableValueOf(i interface{}) reflect.Value {
-	v := reflect.ValueOf(i)
-	sv := reflect.New(v.Type()).Elem()
-	sv.Set(v)
-	return sv
-}
-
-// --------------------------------------------------------------------------
-// Unmarshaling of documents.
-
-const (
-	setterUnknown = iota
-	setterNone
-	setterType
-	setterAddr
-)
-
-var setterStyles map[reflect.Type]int
-var setterIface reflect.Type
-var setterMutex sync.RWMutex
-
-func init() {
-	var iface Setter
-	setterIface = reflect.TypeOf(&iface).Elem()
-	setterStyles = make(map[reflect.Type]int)
-}
-
-func setterStyle(outt reflect.Type) int {
-	setterMutex.RLock()
-	style := setterStyles[outt]
-	setterMutex.RUnlock()
-	if style == setterUnknown {
-		setterMutex.Lock()
-		defer setterMutex.Unlock()
-		if outt.Implements(setterIface) {
-			setterStyles[outt] = setterType
-		} else if reflect.PtrTo(outt).Implements(setterIface) {
-			setterStyles[outt] = setterAddr
-		} else {
-			setterStyles[outt] = setterNone
-		}
-		style = setterStyles[outt]
-	}
-	return style
-}
-
-func getSetter(outt reflect.Type, out reflect.Value) Setter {
-	style := setterStyle(outt)
-	if style == setterNone {
-		return nil
-	}
-	if style == setterAddr {
-		if !out.CanAddr() {
-			return nil
-		}
-		out = out.Addr()
-	} else if outt.Kind() == reflect.Ptr && out.IsNil() {
-		out.Set(reflect.New(outt.Elem()))
-	}
-	return out.Interface().(Setter)
-}
-
-func clearMap(m reflect.Value) {
-	var none reflect.Value
-	for _, k := range m.MapKeys() {
-		m.SetMapIndex(k, none)
-	}
-}
-
-func (d *decoder) readDocTo(out reflect.Value) {
-	var elemType reflect.Type
-	outt := out.Type()
-	outk := outt.Kind()
-
-	for {
-		if outk == reflect.Ptr && out.IsNil() {
-			out.Set(reflect.New(outt.Elem()))
-		}
-		if setter := getSetter(outt, out); setter != nil {
-			var raw Raw
-			d.readDocTo(reflect.ValueOf(&raw))
-			err := setter.SetBSON(raw)
-			if _, ok := err.(*TypeError); err != nil && !ok {
-				panic(err)
-			}
-			return
-		}
-		if outk == reflect.Ptr {
-			out = out.Elem()
-			outt = out.Type()
-			outk = out.Kind()
-			continue
-		}
-		break
-	}
-
-	var fieldsMap map[string]fieldInfo
-	var inlineMap reflect.Value
-	start := d.i
-
-	origout := out
-	if outk == reflect.Interface {
-		if d.docType.Kind() == reflect.Map {
-			mv := reflect.MakeMap(d.docType)
-			out.Set(mv)
-			out = mv
-		} else {
-			dv := reflect.New(d.docType).Elem()
-			out.Set(dv)
-			out = dv
-		}
-		outt = out.Type()
-		outk = outt.Kind()
-	}
-
-	docType := d.docType
-	keyType := typeString
-	convertKey := false
-	switch outk {
-	case reflect.Map:
-		keyType = outt.Key()
-		if keyType.Kind() != reflect.String {
-			panic("BSON map must have string keys. Got: " + outt.String())
-		}
-		if keyType != typeString {
-			convertKey = true
-		}
-		elemType = outt.Elem()
-		if elemType == typeIface {
-			d.docType = outt
-		}
-		if out.IsNil() {
-			out.Set(reflect.MakeMap(out.Type()))
-		} else if out.Len() > 0 {
-			clearMap(out)
-		}
-	case reflect.Struct:
-		if outt != typeRaw {
-			sinfo, err := getStructInfo(out.Type())
-			if err != nil {
-				panic(err)
-			}
-			fieldsMap = sinfo.FieldsMap
-			out.Set(sinfo.Zero)
-			if sinfo.InlineMap != -1 {
-				inlineMap = out.Field(sinfo.InlineMap)
-				if !inlineMap.IsNil() && inlineMap.Len() > 0 {
-					clearMap(inlineMap)
-				}
-				elemType = inlineMap.Type().Elem()
-				if elemType == typeIface {
-					d.docType = inlineMap.Type()
-				}
-			}
-		}
-	case reflect.Slice:
-		switch outt.Elem() {
-		case typeDocElem:
-			origout.Set(d.readDocElems(outt))
-			return
-		case typeRawDocElem:
-			origout.Set(d.readRawDocElems(outt))
-			return
-		}
-		fallthrough
-	default:
-		panic("Unsupported document type for unmarshalling: " + out.Type().String())
-	}
-
-	end := int(d.readInt32())
-	end += d.i - 4
-	if end <= d.i || end > len(d.in) || d.in[end-1] != '\x00' {
-		corrupted()
-	}
-	for d.in[d.i] != '\x00' {
-		kind := d.readByte()
-		name := d.readCStr()
-		if d.i >= end {
-			corrupted()
-		}
-
-		switch outk {
-		case reflect.Map:
-			e := reflect.New(elemType).Elem()
-			if d.readElemTo(e, kind) {
-				k := reflect.ValueOf(name)
-				if convertKey {
-					k = k.Convert(keyType)
-				}
-				out.SetMapIndex(k, e)
-			}
-		case reflect.Struct:
-			if outt == typeRaw {
-				d.dropElem(kind)
-			} else {
-				if info, ok := fieldsMap[name]; ok {
-					if info.Inline == nil {
-						d.readElemTo(out.Field(info.Num), kind)
-					} else {
-						d.readElemTo(out.FieldByIndex(info.Inline), kind)
-					}
-				} else if inlineMap.IsValid() {
-					if inlineMap.IsNil() {
-						inlineMap.Set(reflect.MakeMap(inlineMap.Type()))
-					}
-					e := reflect.New(elemType).Elem()
-					if d.readElemTo(e, kind) {
-						inlineMap.SetMapIndex(reflect.ValueOf(name), e)
-					}
-				} else {
-					d.dropElem(kind)
-				}
-			}
-		case reflect.Slice:
-		}
-
-		if d.i >= end {
-			corrupted()
-		}
-	}
-	d.i++ // '\x00'
-	if d.i != end {
-		corrupted()
-	}
-	d.docType = docType
-
-	if outt == typeRaw {
-		out.Set(reflect.ValueOf(Raw{0x03, d.in[start:d.i]}))
-	}
-}
-
-func (d *decoder) readArrayDocTo(out reflect.Value) {
-	end := int(d.readInt32())
-	end += d.i - 4
-	if end <= d.i || end > len(d.in) || d.in[end-1] != '\x00' {
-		corrupted()
-	}
-	i := 0
-	l := out.Len()
-	for d.in[d.i] != '\x00' {
-		if i >= l {
-			panic("Length mismatch on array field")
-		}
-		kind := d.readByte()
-		for d.i < end && d.in[d.i] != '\x00' {
-			d.i++
-		}
-		if d.i >= end {
-			corrupted()
-		}
-		d.i++
-		d.readElemTo(out.Index(i), kind)
-		if d.i >= end {
-			corrupted()
-		}
-		i++
-	}
-	if i != l {
-		panic("Length mismatch on array field")
-	}
-	d.i++ // '\x00'
-	if d.i != end {
-		corrupted()
-	}
-}
-
-func (d *decoder) readSliceDoc(t reflect.Type) interface{} {
-	tmp := make([]reflect.Value, 0, 8)
-	elemType := t.Elem()
-
-	end := int(d.readInt32())
-	end += d.i - 4
-	if end <= d.i || end > len(d.in) || d.in[end-1] != '\x00' {
-		corrupted()
-	}
-	for d.in[d.i] != '\x00' {
-		kind := d.readByte()
-		for d.i < end && d.in[d.i] != '\x00' {
-			d.i++
-		}
-		if d.i >= end {
-			corrupted()
-		}
-		d.i++
-		e := reflect.New(elemType).Elem()
-		if d.readElemTo(e, kind) {
-			tmp = append(tmp, e)
-		}
-		if d.i >= end {
-			corrupted()
-		}
-	}
-	d.i++ // '\x00'
-	if d.i != end {
-		corrupted()
-	}
-
-	n := len(tmp)
-	slice := reflect.MakeSlice(t, n, n)
-	for i := 0; i != n; i++ {
-		slice.Index(i).Set(tmp[i])
-	}
-	return slice.Interface()
-}
-
-var typeSlice = reflect.TypeOf([]interface{}{})
-var typeIface = typeSlice.Elem()
-
-func (d *decoder) readDocElems(typ reflect.Type) reflect.Value {
-	docType := d.docType
-	d.docType = typ
-	slice := make([]DocElem, 0, 8)
-	d.readDocWith(func(kind byte, name string) {
-		e := DocElem{Name: name}
-		v := reflect.ValueOf(&e.Value)
-		if d.readElemTo(v.Elem(), kind) {
-			slice = append(slice, e)
-		}
-	})
-	slicev := reflect.New(typ).Elem()
-	slicev.Set(reflect.ValueOf(slice))
-	d.docType = docType
-	return slicev
-}
-
-func (d *decoder) readRawDocElems(typ reflect.Type) reflect.Value {
-	docType := d.docType
-	d.docType = typ
-	slice := make([]RawDocElem, 0, 8)
-	d.readDocWith(func(kind byte, name string) {
-		e := RawDocElem{Name: name}
-		v := reflect.ValueOf(&e.Value)
-		if d.readElemTo(v.Elem(), kind) {
-			slice = append(slice, e)
-		}
-	})
-	slicev := reflect.New(typ).Elem()
-	slicev.Set(reflect.ValueOf(slice))
-	d.docType = docType
-	return slicev
-}
-
-func (d *decoder) readDocWith(f func(kind byte, name string)) {
-	end := int(d.readInt32())
-	end += d.i - 4
-	if end <= d.i || end > len(d.in) || d.in[end-1] != '\x00' {
-		corrupted()
-	}
-	for d.in[d.i] != '\x00' {
-		kind := d.readByte()
-		name := d.readCStr()
-		if d.i >= end {
-			corrupted()
-		}
-		f(kind, name)
-		if d.i >= end {
-			corrupted()
-		}
-	}
-	d.i++ // '\x00'
-	if d.i != end {
-		corrupted()
-	}
-}
-
-// --------------------------------------------------------------------------
-// Unmarshaling of individual elements within a document.
-
-var blackHole = settableValueOf(struct{}{})
-
-func (d *decoder) dropElem(kind byte) {
-	d.readElemTo(blackHole, kind)
-}
-
-// Attempt to decode an element from the document and put it into out.
-// If the types are not compatible, the returned ok value will be
-// false and out will be unchanged.
-func (d *decoder) readElemTo(out reflect.Value, kind byte) (good bool) {
-
-	start := d.i
-
-	if kind == '\x03' {
-		// Delegate unmarshaling of documents.
-		outt := out.Type()
-		outk := out.Kind()
-		switch outk {
-		case reflect.Interface, reflect.Ptr, reflect.Struct, reflect.Map:
-			d.readDocTo(out)
-			return true
-		}
-		if setterStyle(outt) != setterNone {
-			d.readDocTo(out)
-			return true
-		}
-		if outk == reflect.Slice {
-			switch outt.Elem() {
-			case typeDocElem:
-				out.Set(d.readDocElems(outt))
-			case typeRawDocElem:
-				out.Set(d.readRawDocElems(outt))
-			}
-			return true
-		}
-		d.readDocTo(blackHole)
-		return true
-	}
-
-	var in interface{}
-
-	switch kind {
-	case 0x01: // Float64
-		in = d.readFloat64()
-	case 0x02: // UTF-8 string
-		in = d.readStr()
-	case 0x03: // Document
-		panic("Can't happen. Handled above.")
-	case 0x04: // Array
-		outt := out.Type()
-		if setterStyle(outt) != setterNone {
-			// Skip the value so its data is handed to the setter below.
-			d.dropElem(kind)
-			break
-		}
-		for outt.Kind() == reflect.Ptr {
-			outt = outt.Elem()
-		}
-		switch outt.Kind() {
-		case reflect.Array:
-			d.readArrayDocTo(out)
-			return true
-		case reflect.Slice:
-			in = d.readSliceDoc(outt)
-		default:
-			in = d.readSliceDoc(typeSlice)
-		}
-	case 0x05: // Binary
-		b := d.readBinary()
-		if b.Kind == 0x00 || b.Kind == 0x02 {
-			in = b.Data
-		} else {
-			in = b
-		}
-	case 0x06: // Undefined (obsolete, but still seen in the wild)
-		in = Undefined
-	case 0x07: // ObjectId
-		in = ObjectId(d.readBytes(12))
-	case 0x08: // Bool
-		in = d.readBool()
-	case 0x09: // Timestamp
-		// MongoDB handles timestamps as milliseconds.
-		i := d.readInt64()
-		if i == -62135596800000 {
-			in = time.Time{} // In UTC for convenience.
-		} else {
-			in = time.Unix(i/1e3, i%1e3*1e6)
-		}
-	case 0x0A: // Nil
-		in = nil
-	case 0x0B: // RegEx
-		in = d.readRegEx()
-	case 0x0C:
-		in = DBPointer{Namespace: d.readStr(), Id: ObjectId(d.readBytes(12))}
-	case 0x0D: // JavaScript without scope
-		in = JavaScript{Code: d.readStr()}
-	case 0x0E: // Symbol
-		in = Symbol(d.readStr())
-	case 0x0F: // JavaScript with scope
-		d.i += 4 // Skip length
-		js := JavaScript{d.readStr(), make(M)}
-		d.readDocTo(reflect.ValueOf(js.Scope))
-		in = js
-	case 0x10: // Int32
-		in = int(d.readInt32())
-	case 0x11: // Mongo-specific timestamp
-		in = MongoTimestamp(d.readInt64())
-	case 0x12: // Int64
-		in = d.readInt64()
-	case 0x7F: // Max key
-		in = MaxKey
-	case 0xFF: // Min key
-		in = MinKey
-	default:
-		panic(fmt.Sprintf("Unknown element kind (0x%02X)", kind))
-	}
-
-	outt := out.Type()
-
-	if outt == typeRaw {
-		out.Set(reflect.ValueOf(Raw{kind, d.in[start:d.i]}))
-		return true
-	}
-
-	if setter := getSetter(outt, out); setter != nil {
-		err := setter.SetBSON(Raw{kind, d.in[start:d.i]})
-		if err == SetZero {
-			out.Set(reflect.Zero(outt))
-			return true
-		}
-		if err == nil {
-			return true
-		}
-		if _, ok := err.(*TypeError); !ok {
-			panic(err)
-		}
-		return false
-	}
-
-	if in == nil {
-		out.Set(reflect.Zero(outt))
-		return true
-	}
-
-	outk := outt.Kind()
-
-	// Dereference and initialize pointer if necessary.
-	first := true
-	for outk == reflect.Ptr {
-		if !out.IsNil() {
-			out = out.Elem()
-		} else {
-			elem := reflect.New(outt.Elem())
-			if first {
-				// Only set if value is compatible.
-				first = false
-				defer func(out, elem reflect.Value) {
-					if good {
-						out.Set(elem)
-					}
-				}(out, elem)
-			} else {
-				out.Set(elem)
-			}
-			out = elem
-		}
-		outt = out.Type()
-		outk = outt.Kind()
-	}
-
-	inv := reflect.ValueOf(in)
-	if outt == inv.Type() {
-		out.Set(inv)
-		return true
-	}
-
-	switch outk {
-	case reflect.Interface:
-		out.Set(inv)
-		return true
-	case reflect.String:
-		switch inv.Kind() {
-		case reflect.String:
-			out.SetString(inv.String())
-			return true
-		case reflect.Slice:
-			if b, ok := in.([]byte); ok {
-				out.SetString(string(b))
-				return true
-			}
-		case reflect.Int, reflect.Int64:
-			if outt == typeJSONNumber {
-				out.SetString(strconv.FormatInt(inv.Int(), 10))
-				return true
-			}
-		case reflect.Float64:
-			if outt == typeJSONNumber {
-				out.SetString(strconv.FormatFloat(inv.Float(), 'f', -1, 64))
-				return true
-			}
-		}
-	case reflect.Slice, reflect.Array:
-		// Remember, array (0x04) slices are built with the correct
-		// element type.  If we are here, must be a cross BSON kind
-		// conversion (e.g. 0x05 unmarshalling on string).
-		if outt.Elem().Kind() != reflect.Uint8 {
-			break
-		}
-		switch inv.Kind() {
-		case reflect.String:
-			slice := []byte(inv.String())
-			out.Set(reflect.ValueOf(slice))
-			return true
-		case reflect.Slice:
-			switch outt.Kind() {
-			case reflect.Array:
-				reflect.Copy(out, inv)
-			case reflect.Slice:
-				out.SetBytes(inv.Bytes())
-			}
-			return true
-		}
-	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
-		switch inv.Kind() {
-		case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
-			out.SetInt(inv.Int())
-			return true
-		case reflect.Float32, reflect.Float64:
-			out.SetInt(int64(inv.Float()))
-			return true
-		case reflect.Bool:
-			if inv.Bool() {
-				out.SetInt(1)
-			} else {
-				out.SetInt(0)
-			}
-			return true
-		case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uintptr:
-			panic("can't happen: no uint types in BSON (!?)")
-		}
-	case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uintptr:
-		switch inv.Kind() {
-		case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
-			out.SetUint(uint64(inv.Int()))
-			return true
-		case reflect.Float32, reflect.Float64:
-			out.SetUint(uint64(inv.Float()))
-			return true
-		case reflect.Bool:
-			if inv.Bool() {
-				out.SetUint(1)
-			} else {
-				out.SetUint(0)
-			}
-			return true
-		case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uintptr:
-			panic("Can't happen. No uint types in BSON.")
-		}
-	case reflect.Float32, reflect.Float64:
-		switch inv.Kind() {
-		case reflect.Float32, reflect.Float64:
-			out.SetFloat(inv.Float())
-			return true
-		case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
-			out.SetFloat(float64(inv.Int()))
-			return true
-		case reflect.Bool:
-			if inv.Bool() {
-				out.SetFloat(1)
-			} else {
-				out.SetFloat(0)
-			}
-			return true
-		case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uintptr:
-			panic("Can't happen. No uint types in BSON?")
-		}
-	case reflect.Bool:
-		switch inv.Kind() {
-		case reflect.Bool:
-			out.SetBool(inv.Bool())
-			return true
-		case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
-			out.SetBool(inv.Int() != 0)
-			return true
-		case reflect.Float32, reflect.Float64:
-			out.SetBool(inv.Float() != 0)
-			return true
-		case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uintptr:
-			panic("Can't happen. No uint types in BSON?")
-		}
-	case reflect.Struct:
-		if outt == typeURL && inv.Kind() == reflect.String {
-			u, err := url.Parse(inv.String())
-			if err != nil {
-				panic(err)
-			}
-			out.Set(reflect.ValueOf(u).Elem())
-			return true
-		}
-	}
-
-	return false
-}
-
-// --------------------------------------------------------------------------
-// Parsers of basic types.
-
-func (d *decoder) readRegEx() RegEx {
-	re := RegEx{}
-	re.Pattern = d.readCStr()
-	re.Options = d.readCStr()
-	return re
-}
-
-func (d *decoder) readBinary() Binary {
-	l := d.readInt32()
-	b := Binary{}
-	b.Kind = d.readByte()
-	b.Data = d.readBytes(l)
-	if b.Kind == 0x02 && len(b.Data) >= 4 {
-		// Weird obsolete format with redundant length.
-		b.Data = b.Data[4:]
-	}
-	return b
-}
-
-func (d *decoder) readStr() string {
-	l := d.readInt32()
-	b := d.readBytes(l - 1)
-	if d.readByte() != '\x00' {
-		corrupted()
-	}
-	return string(b)
-}
-
-func (d *decoder) readCStr() string {
-	start := d.i
-	end := start
-	l := len(d.in)
-	for ; end != l; end++ {
-		if d.in[end] == '\x00' {
-			break
-		}
-	}
-	d.i = end + 1
-	if d.i > l {
-		corrupted()
-	}
-	return string(d.in[start:end])
-}
-
-func (d *decoder) readBool() bool {
-	if d.readByte() == 1 {
-		return true
-	}
-	return false
-}
-
-func (d *decoder) readFloat64() float64 {
-	return math.Float64frombits(uint64(d.readInt64()))
-}
-
-func (d *decoder) readInt32() int32 {
-	b := d.readBytes(4)
-	return int32((uint32(b[0]) << 0) |
-		(uint32(b[1]) << 8) |
-		(uint32(b[2]) << 16) |
-		(uint32(b[3]) << 24))
-}
-
-func (d *decoder) readInt64() int64 {
-	b := d.readBytes(8)
-	return int64((uint64(b[0]) << 0) |
-		(uint64(b[1]) << 8) |
-		(uint64(b[2]) << 16) |
-		(uint64(b[3]) << 24) |
-		(uint64(b[4]) << 32) |
-		(uint64(b[5]) << 40) |
-		(uint64(b[6]) << 48) |
-		(uint64(b[7]) << 56))
-}
-
-func (d *decoder) readByte() byte {
-	i := d.i
-	d.i++
-	if d.i > len(d.in) {
-		corrupted()
-	}
-	return d.in[i]
-}
-
-func (d *decoder) readBytes(length int32) []byte {
-	start := d.i
-	d.i += int(length)
-	if d.i > len(d.in) {
-		corrupted()
-	}
-	return d.in[start : start+int(length)]
-}
diff --git a/Godeps/_workspace/src/gopkg.in/mgo.v2/bson/encode.go b/Godeps/_workspace/src/gopkg.in/mgo.v2/bson/encode.go
deleted file mode 100644
index e1015091b..000000000
--- a/Godeps/_workspace/src/gopkg.in/mgo.v2/bson/encode.go
+++ /dev/null
@@ -1,503 +0,0 @@
-// BSON library for Go
-//
-// Copyright (c) 2010-2012 - Gustavo Niemeyer <gustavo@niemeyer.net>
-//
-// 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 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.
-// gobson - BSON library for Go.
-
-package bson
-
-import (
-	"encoding/json"
-	"fmt"
-	"math"
-	"net/url"
-	"reflect"
-	"strconv"
-	"time"
-)
-
-// --------------------------------------------------------------------------
-// Some internal infrastructure.
-
-var (
-	typeBinary         = reflect.TypeOf(Binary{})
-	typeObjectId       = reflect.TypeOf(ObjectId(""))
-	typeDBPointer      = reflect.TypeOf(DBPointer{"", ObjectId("")})
-	typeSymbol         = reflect.TypeOf(Symbol(""))
-	typeMongoTimestamp = reflect.TypeOf(MongoTimestamp(0))
-	typeOrderKey       = reflect.TypeOf(MinKey)
-	typeDocElem        = reflect.TypeOf(DocElem{})
-	typeRawDocElem     = reflect.TypeOf(RawDocElem{})
-	typeRaw            = reflect.TypeOf(Raw{})
-	typeURL            = reflect.TypeOf(url.URL{})
-	typeTime           = reflect.TypeOf(time.Time{})
-	typeString         = reflect.TypeOf("")
-	typeJSONNumber     = reflect.TypeOf(json.Number(""))
-)
-
-const itoaCacheSize = 32
-
-var itoaCache []string
-
-func init() {
-	itoaCache = make([]string, itoaCacheSize)
-	for i := 0; i != itoaCacheSize; i++ {
-		itoaCache[i] = strconv.Itoa(i)
-	}
-}
-
-func itoa(i int) string {
-	if i < itoaCacheSize {
-		return itoaCache[i]
-	}
-	return strconv.Itoa(i)
-}
-
-// --------------------------------------------------------------------------
-// Marshaling of the document value itself.
-
-type encoder struct {
-	out []byte
-}
-
-func (e *encoder) addDoc(v reflect.Value) {
-	for {
-		if vi, ok := v.Interface().(Getter); ok {
-			getv, err := vi.GetBSON()
-			if err != nil {
-				panic(err)
-			}
-			v = reflect.ValueOf(getv)
-			continue
-		}
-		if v.Kind() == reflect.Ptr {
-			v = v.Elem()
-			continue
-		}
-		break
-	}
-
-	if v.Type() == typeRaw {
-		raw := v.Interface().(Raw)
-		if raw.Kind != 0x03 && raw.Kind != 0x00 {
-			panic("Attempted to unmarshal Raw kind " + strconv.Itoa(int(raw.Kind)) + " as a document")
-		}
-		e.addBytes(raw.Data...)
-		return
-	}
-
-	start := e.reserveInt32()
-
-	switch v.Kind() {
-	case reflect.Map:
-		e.addMap(v)
-	case reflect.Struct:
-		e.addStruct(v)
-	case reflect.Array, reflect.Slice:
-		e.addSlice(v)
-	default:
-		panic("Can't marshal " + v.Type().String() + " as a BSON document")
-	}
-
-	e.addBytes(0)
-	e.setInt32(start, int32(len(e.out)-start))
-}
-
-func (e *encoder) addMap(v reflect.Value) {
-	for _, k := range v.MapKeys() {
-		e.addElem(k.String(), v.MapIndex(k), false)
-	}
-}
-
-func (e *encoder) addStruct(v reflect.Value) {
-	sinfo, err := getStructInfo(v.Type())
-	if err != nil {
-		panic(err)
-	}
-	var value reflect.Value
-	if sinfo.InlineMap >= 0 {
-		m := v.Field(sinfo.InlineMap)
-		if m.Len() > 0 {
-			for _, k := range m.MapKeys() {
-				ks := k.String()
-				if _, found := sinfo.FieldsMap[ks]; found {
-					panic(fmt.Sprintf("Can't have key %q in inlined map; conflicts with struct field", ks))
-				}
-				e.addElem(ks, m.MapIndex(k), false)
-			}
-		}
-	}
-	for _, info := range sinfo.FieldsList {
-		if info.Inline == nil {
-			value = v.Field(info.Num)
-		} else {
-			value = v.FieldByIndex(info.Inline)
-		}
-		if info.OmitEmpty && isZero(value) {
-			continue
-		}
-		e.addElem(info.Key, value, info.MinSize)
-	}
-}
-
-func isZero(v reflect.Value) bool {
-	switch v.Kind() {
-	case reflect.String:
-		return len(v.String()) == 0
-	case reflect.Ptr, reflect.Interface:
-		return v.IsNil()
-	case reflect.Slice:
-		return v.Len() == 0
-	case reflect.Map:
-		return v.Len() == 0
-	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
-		return v.Int() == 0
-	case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uintptr:
-		return v.Uint() == 0
-	case reflect.Float32, reflect.Float64:
-		return v.Float() == 0
-	case reflect.Bool:
-		return !v.Bool()
-	case reflect.Struct:
-		vt := v.Type()
-		if vt == typeTime {
-			return v.Interface().(time.Time).IsZero()
-		}
-		for i := 0; i < v.NumField(); i++ {
-			if vt.Field(i).PkgPath != "" {
-				continue // Private field
-			}
-			if !isZero(v.Field(i)) {
-				return false
-			}
-		}
-		return true
-	}
-	return false
-}
-
-func (e *encoder) addSlice(v reflect.Value) {
-	vi := v.Interface()
-	if d, ok := vi.(D); ok {
-		for _, elem := range d {
-			e.addElem(elem.Name, reflect.ValueOf(elem.Value), false)
-		}
-		return
-	}
-	if d, ok := vi.(RawD); ok {
-		for _, elem := range d {
-			e.addElem(elem.Name, reflect.ValueOf(elem.Value), false)
-		}
-		return
-	}
-	l := v.Len()
-	et := v.Type().Elem()
-	if et == typeDocElem {
-		for i := 0; i < l; i++ {
-			elem := v.Index(i).Interface().(DocElem)
-			e.addElem(elem.Name, reflect.ValueOf(elem.Value), false)
-		}
-		return
-	}
-	if et == typeRawDocElem {
-		for i := 0; i < l; i++ {
-			elem := v.Index(i).Interface().(RawDocElem)
-			e.addElem(elem.Name, reflect.ValueOf(elem.Value), false)
-		}
-		return
-	}
-	for i := 0; i < l; i++ {
-		e.addElem(itoa(i), v.Index(i), false)
-	}
-}
-
-// --------------------------------------------------------------------------
-// Marshaling of elements in a document.
-
-func (e *encoder) addElemName(kind byte, name string) {
-	e.addBytes(kind)
-	e.addBytes([]byte(name)...)
-	e.addBytes(0)
-}
-
-func (e *encoder) addElem(name string, v reflect.Value, minSize bool) {
-
-	if !v.IsValid() {
-		e.addElemName('\x0A', name)
-		return
-	}
-
-	if getter, ok := v.Interface().(Getter); ok {
-		getv, err := getter.GetBSON()
-		if err != nil {
-			panic(err)
-		}
-		e.addElem(name, reflect.ValueOf(getv), minSize)
-		return
-	}
-
-	switch v.Kind() {
-
-	case reflect.Interface:
-		e.addElem(name, v.Elem(), minSize)
-
-	case reflect.Ptr:
-		e.addElem(name, v.Elem(), minSize)
-
-	case reflect.String:
-		s := v.String()
-		switch v.Type() {
-		case typeObjectId:
-			if len(s) != 12 {
-				panic("ObjectIDs must be exactly 12 bytes long (got " +
-					strconv.Itoa(len(s)) + ")")
-			}
-			e.addElemName('\x07', name)
-			e.addBytes([]byte(s)...)
-		case typeSymbol:
-			e.addElemName('\x0E', name)
-			e.addStr(s)
-		case typeJSONNumber:
-			n := v.Interface().(json.Number)
-			if i, err := n.Int64(); err == nil {
-				e.addElemName('\x12', name)
-				e.addInt64(i)
-			} else if f, err := n.Float64(); err == nil {
-				e.addElemName('\x01', name)
-				e.addFloat64(f)
-			} else {
-				panic("failed to convert json.Number to a number: " + s)
-			}
-		default:
-			e.addElemName('\x02', name)
-			e.addStr(s)
-		}
-
-	case reflect.Float32, reflect.Float64:
-		e.addElemName('\x01', name)
-		e.addFloat64(v.Float())
-
-	case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uintptr:
-		u := v.Uint()
-		if int64(u) < 0 {
-			panic("BSON has no uint64 type, and value is too large to fit correctly in an int64")
-		} else if u <= math.MaxInt32 && (minSize || v.Kind() <= reflect.Uint32) {
-			e.addElemName('\x10', name)
-			e.addInt32(int32(u))
-		} else {
-			e.addElemName('\x12', name)
-			e.addInt64(int64(u))
-		}
-
-	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
-		switch v.Type() {
-		case typeMongoTimestamp:
-			e.addElemName('\x11', name)
-			e.addInt64(v.Int())
-
-		case typeOrderKey:
-			if v.Int() == int64(MaxKey) {
-				e.addElemName('\x7F', name)
-			} else {
-				e.addElemName('\xFF', name)
-			}
-
-		default:
-			i := v.Int()
-			if (minSize || v.Type().Kind() != reflect.Int64) && i >= math.MinInt32 && i <= math.MaxInt32 {
-				// It fits into an int32, encode as such.
-				e.addElemName('\x10', name)
-				e.addInt32(int32(i))
-			} else {
-				e.addElemName('\x12', name)
-				e.addInt64(i)
-			}
-		}
-
-	case reflect.Bool:
-		e.addElemName('\x08', name)
-		if v.Bool() {
-			e.addBytes(1)
-		} else {
-			e.addBytes(0)
-		}
-
-	case reflect.Map:
-		e.addElemName('\x03', name)
-		e.addDoc(v)
-
-	case reflect.Slice:
-		vt := v.Type()
-		et := vt.Elem()
-		if et.Kind() == reflect.Uint8 {
-			e.addElemName('\x05', name)
-			e.addBinary('\x00', v.Bytes())
-		} else if et == typeDocElem || et == typeRawDocElem {
-			e.addElemName('\x03', name)
-			e.addDoc(v)
-		} else {
-			e.addElemName('\x04', name)
-			e.addDoc(v)
-		}
-
-	case reflect.Array:
-		et := v.Type().Elem()
-		if et.Kind() == reflect.Uint8 {
-			e.addElemName('\x05', name)
-			if v.CanAddr() {
-				e.addBinary('\x00', v.Slice(0, v.Len()).Interface().([]byte))
-			} else {
-				n := v.Len()
-				e.addInt32(int32(n))
-				e.addBytes('\x00')
-				for i := 0; i < n; i++ {
-					el := v.Index(i)
-					e.addBytes(byte(el.Uint()))
-				}
-			}
-		} else {
-			e.addElemName('\x04', name)
-			e.addDoc(v)
-		}
-
-	case reflect.Struct:
-		switch s := v.Interface().(type) {
-
-		case Raw:
-			kind := s.Kind
-			if kind == 0x00 {
-				kind = 0x03
-			}
-			e.addElemName(kind, name)
-			e.addBytes(s.Data...)
-
-		case Binary:
-			e.addElemName('\x05', name)
-			e.addBinary(s.Kind, s.Data)
-
-		case DBPointer:
-			e.addElemName('\x0C', name)
-			e.addStr(s.Namespace)
-			if len(s.Id) != 12 {
-				panic("ObjectIDs must be exactly 12 bytes long (got " +
-					strconv.Itoa(len(s.Id)) + ")")
-			}
-			e.addBytes([]byte(s.Id)...)
-
-		case RegEx:
-			e.addElemName('\x0B', name)
-			e.addCStr(s.Pattern)
-			e.addCStr(s.Options)
-
-		case JavaScript:
-			if s.Scope == nil {
-				e.addElemName('\x0D', name)
-				e.addStr(s.Code)
-			} else {
-				e.addElemName('\x0F', name)
-				start := e.reserveInt32()
-				e.addStr(s.Code)
-				e.addDoc(reflect.ValueOf(s.Scope))
-				e.setInt32(start, int32(len(e.out)-start))
-			}
-
-		case time.Time:
-			// MongoDB handles timestamps as milliseconds.
-			e.addElemName('\x09', name)
-			e.addInt64(s.Unix()*1000 + int64(s.Nanosecond()/1e6))
-
-		case url.URL:
-			e.addElemName('\x02', name)
-			e.addStr(s.String())
-
-		case undefined:
-			e.addElemName('\x06', name)
-
-		default:
-			e.addElemName('\x03', name)
-			e.addDoc(v)
-		}
-
-	default:
-		panic("Can't marshal " + v.Type().String() + " in a BSON document")
-	}
-}
-
-// --------------------------------------------------------------------------
-// Marshaling of base types.
-
-func (e *encoder) addBinary(subtype byte, v []byte) {
-	if subtype == 0x02 {
-		// Wonder how that brilliant idea came to life. Obsolete, luckily.
-		e.addInt32(int32(len(v) + 4))
-		e.addBytes(subtype)
-		e.addInt32(int32(len(v)))
-	} else {
-		e.addInt32(int32(len(v)))
-		e.addBytes(subtype)
-	}
-	e.addBytes(v...)
-}
-
-func (e *encoder) addStr(v string) {
-	e.addInt32(int32(len(v) + 1))
-	e.addCStr(v)
-}
-
-func (e *encoder) addCStr(v string) {
-	e.addBytes([]byte(v)...)
-	e.addBytes(0)
-}
-
-func (e *encoder) reserveInt32() (pos int) {
-	pos = len(e.out)
-	e.addBytes(0, 0, 0, 0)
-	return pos
-}
-
-func (e *encoder) setInt32(pos int, v int32) {
-	e.out[pos+0] = byte(v)
-	e.out[pos+1] = byte(v >> 8)
-	e.out[pos+2] = byte(v >> 16)
-	e.out[pos+3] = byte(v >> 24)
-}
-
-func (e *encoder) addInt32(v int32) {
-	u := uint32(v)
-	e.addBytes(byte(u), byte(u>>8), byte(u>>16), byte(u>>24))
-}
-
-func (e *encoder) addInt64(v int64) {
-	u := uint64(v)
-	e.addBytes(byte(u), byte(u>>8), byte(u>>16), byte(u>>24),
-		byte(u>>32), byte(u>>40), byte(u>>48), byte(u>>56))
-}
-
-func (e *encoder) addFloat64(v float64) {
-	e.addInt64(int64(math.Float64bits(v)))
-}
-
-func (e *encoder) addBytes(v ...byte) {
-	e.out = append(e.out, v...)
-}
diff --git a/Godeps/_workspace/src/gopkg.in/mgo.v2/bulk.go b/Godeps/_workspace/src/gopkg.in/mgo.v2/bulk.go
deleted file mode 100644
index 23f450853..000000000
--- a/Godeps/_workspace/src/gopkg.in/mgo.v2/bulk.go
+++ /dev/null
@@ -1,71 +0,0 @@
-package mgo
-
-// Bulk represents an operation that can be prepared with several
-// orthogonal changes before being delivered to the server.
-//
-// WARNING: This API is still experimental.
-//
-// Relevant documentation:
-//
-//   http://blog.mongodb.org/post/84922794768/mongodbs-new-bulk-api
-//
-type Bulk struct {
-	c       *Collection
-	ordered bool
-	inserts []interface{}
-}
-
-// BulkError holds an error returned from running a Bulk operation.
-//
-// TODO: This is private for the moment, until we understand exactly how
-//       to report these multi-errors in a useful and convenient way.
-type bulkError struct {
-	err error
-}
-
-// BulkResult holds the results for a bulk operation.
-type BulkResult struct {
-	// Be conservative while we understand exactly how to report these
-	// results in a useful and convenient way, and also how to emulate
-	// them with prior servers.
-	private bool
-}
-
-func (e *bulkError) Error() string {
-	return e.err.Error()
-}
-
-// Bulk returns a value to prepare the execution of a bulk operation.
-//
-// WARNING: This API is still experimental.
-//
-func (c *Collection) Bulk() *Bulk {
-	return &Bulk{c: c, ordered: true}
-}
-
-// Unordered puts the bulk operation in unordered mode.
-//
-// In unordered mode the indvidual operations may be sent
-// out of order, which means latter operations may proceed
-// even if prior ones have failed.
-func (b *Bulk) Unordered() {
-	b.ordered = false
-}
-
-// Insert queues up the provided documents for insertion.
-func (b *Bulk) Insert(docs ...interface{}) {
-	b.inserts = append(b.inserts, docs...)
-}
-
-// Run runs all the operations queued up.
-func (b *Bulk) Run() (*BulkResult, error) {
-	op := &insertOp{b.c.FullName, b.inserts, 0}
-	if !b.ordered {
-		op.flags = 1 // ContinueOnError
-	}
-	_, err := b.c.writeQuery(op)
-	if err != nil {
-		return nil, &bulkError{err}
-	}
-	return &BulkResult{}, nil
-}
diff --git a/Godeps/_workspace/src/gopkg.in/mgo.v2/bulk_test.go b/Godeps/_workspace/src/gopkg.in/mgo.v2/bulk_test.go
deleted file mode 100644
index d231d59d0..000000000
--- a/Godeps/_workspace/src/gopkg.in/mgo.v2/bulk_test.go
+++ /dev/null
@@ -1,131 +0,0 @@
-// mgo - MongoDB driver for Go
-//
-// Copyright (c) 2010-2014 - Gustavo Niemeyer <gustavo@niemeyer.net>
-//
-// 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 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.
-
-package mgo_test
-
-import (
-	. "gopkg.in/check.v1"
-	"gopkg.in/mgo.v2"
-)
-
-func (s *S) TestBulkInsert(c *C) {
-	session, err := mgo.Dial("localhost:40001")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	coll := session.DB("mydb").C("mycoll")
-	bulk := coll.Bulk()
-	bulk.Insert(M{"n": 1})
-	bulk.Insert(M{"n": 2}, M{"n": 3})
-	r, err := bulk.Run()
-	c.Assert(err, IsNil)
-	c.Assert(r, FitsTypeOf, &mgo.BulkResult{})
-
-	type doc struct{ N int }
-	var res []doc
-	err = coll.Find(nil).Sort("n").All(&res)
-	c.Assert(err, IsNil)
-	c.Assert(res, DeepEquals, []doc{{1}, {2}, {3}})
-}
-
-func (s *S) TestBulkInsertError(c *C) {
-	session, err := mgo.Dial("localhost:40001")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	coll := session.DB("mydb").C("mycoll")
-	bulk := coll.Bulk()
-	bulk.Insert(M{"_id": 1}, M{"_id": 2}, M{"_id": 2}, M{"_id": 3})
-	_, err = bulk.Run()
-	c.Assert(err, ErrorMatches, ".*duplicate key.*")
-
-	type doc struct {
-		N int `_id`
-	}
-	var res []doc
-	err = coll.Find(nil).Sort("_id").All(&res)
-	c.Assert(err, IsNil)
-	c.Assert(res, DeepEquals, []doc{{1}, {2}})
-}
-
-func (s *S) TestBulkInsertErrorUnordered(c *C) {
-	session, err := mgo.Dial("localhost:40001")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	coll := session.DB("mydb").C("mycoll")
-	bulk := coll.Bulk()
-	bulk.Unordered()
-	bulk.Insert(M{"_id": 1}, M{"_id": 2}, M{"_id": 2}, M{"_id": 3})
-	_, err = bulk.Run()
-	c.Assert(err, ErrorMatches, ".*duplicate key.*")
-
-	type doc struct {
-		N int `_id`
-	}
-	var res []doc
-	err = coll.Find(nil).Sort("_id").All(&res)
-	c.Assert(err, IsNil)
-	c.Assert(res, DeepEquals, []doc{{1}, {2}, {3}})
-}
-
-func (s *S) TestBulkInsertErrorUnorderedSplitBatch(c *C) {
-	// The server has a batch limit of 1000 documents when using write commands.
-	// This artificial limit did not exist with the old wire protocol, so to
-	// avoid compatibility issues the implementation internally split batches
-	// into the proper size and delivers them one by one. This test ensures that
-	// the behavior of unordered (that is, continue on error) remains correct
-	// when errors happen and there are batches left.
-	session, err := mgo.Dial("localhost:40001")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	coll := session.DB("mydb").C("mycoll")
-	bulk := coll.Bulk()
-	bulk.Unordered()
-
-	const total = 4096
-	type doc struct {
-		Id int `_id`
-	}
-	docs := make([]interface{}, total)
-	for i := 0; i < total; i++ {
-		docs[i] = doc{i}
-	}
-	docs[1] = doc{0}
-	bulk.Insert(docs...)
-	_, err = bulk.Run()
-	c.Assert(err, ErrorMatches, ".*duplicate key.*")
-
-	n, err := coll.Count()
-	c.Assert(err, IsNil)
-	c.Assert(n, Equals, total-1)
-
-	var res doc
-	err = coll.FindId(1500).One(&res)
-	c.Assert(err, IsNil)
-	c.Assert(res.Id, Equals, 1500)
-}
diff --git a/Godeps/_workspace/src/gopkg.in/mgo.v2/cluster.go b/Godeps/_workspace/src/gopkg.in/mgo.v2/cluster.go
deleted file mode 100644
index 55bb7bbc0..000000000
--- a/Godeps/_workspace/src/gopkg.in/mgo.v2/cluster.go
+++ /dev/null
@@ -1,632 +0,0 @@
-// mgo - MongoDB driver for Go
-//
-// Copyright (c) 2010-2012 - Gustavo Niemeyer <gustavo@niemeyer.net>
-//
-// 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 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.
-
-package mgo
-
-import (
-	"errors"
-	"fmt"
-	"net"
-	"sync"
-	"time"
-
-	"gopkg.in/mgo.v2/bson"
-)
-
-// ---------------------------------------------------------------------------
-// Mongo cluster encapsulation.
-//
-// A cluster enables the communication with one or more servers participating
-// in a mongo cluster.  This works with individual servers, a replica set,
-// a replica pair, one or multiple mongos routers, etc.
-
-type mongoCluster struct {
-	sync.RWMutex
-	serverSynced sync.Cond
-	userSeeds    []string
-	dynaSeeds    []string
-	servers      mongoServers
-	masters      mongoServers
-	references   int
-	syncing      bool
-	direct       bool
-	failFast     bool
-	syncCount    uint
-	setName      string
-	cachedIndex  map[string]bool
-	sync         chan bool
-	dial         dialer
-}
-
-func newCluster(userSeeds []string, direct, failFast bool, dial dialer, setName string) *mongoCluster {
-	cluster := &mongoCluster{
-		userSeeds:  userSeeds,
-		references: 1,
-		direct:     direct,
-		failFast:   failFast,
-		dial:       dial,
-		setName:    setName,
-	}
-	cluster.serverSynced.L = cluster.RWMutex.RLocker()
-	cluster.sync = make(chan bool, 1)
-	stats.cluster(+1)
-	go cluster.syncServersLoop()
-	return cluster
-}
-
-// Acquire increases the reference count for the cluster.
-func (cluster *mongoCluster) Acquire() {
-	cluster.Lock()
-	cluster.references++
-	debugf("Cluster %p acquired (refs=%d)", cluster, cluster.references)
-	cluster.Unlock()
-}
-
-// Release decreases the reference count for the cluster. Once
-// it reaches zero, all servers will be closed.
-func (cluster *mongoCluster) Release() {
-	cluster.Lock()
-	if cluster.references == 0 {
-		panic("cluster.Release() with references == 0")
-	}
-	cluster.references--
-	debugf("Cluster %p released (refs=%d)", cluster, cluster.references)
-	if cluster.references == 0 {
-		for _, server := range cluster.servers.Slice() {
-			server.Close()
-		}
-		// Wake up the sync loop so it can die.
-		cluster.syncServers()
-		stats.cluster(-1)
-	}
-	cluster.Unlock()
-}
-
-func (cluster *mongoCluster) LiveServers() (servers []string) {
-	cluster.RLock()
-	for _, serv := range cluster.servers.Slice() {
-		servers = append(servers, serv.Addr)
-	}
-	cluster.RUnlock()
-	return servers
-}
-
-func (cluster *mongoCluster) removeServer(server *mongoServer) {
-	cluster.Lock()
-	cluster.masters.Remove(server)
-	other := cluster.servers.Remove(server)
-	cluster.Unlock()
-	if other != nil {
-		other.Close()
-		log("Removed server ", server.Addr, " from cluster.")
-	}
-	server.Close()
-}
-
-type isMasterResult struct {
-	IsMaster       bool
-	Secondary      bool
-	Primary        string
-	Hosts          []string
-	Passives       []string
-	Tags           bson.D
-	Msg            string
-	SetName        string `bson:"setName"`
-	MaxWireVersion int    `bson:"maxWireVersion"`
-}
-
-func (cluster *mongoCluster) isMaster(socket *mongoSocket, result *isMasterResult) error {
-	// Monotonic let's it talk to a slave and still hold the socket.
-	session := newSession(Monotonic, cluster, 10*time.Second)
-	session.setSocket(socket)
-	err := session.Run("ismaster", result)
-	session.Close()
-	return err
-}
-
-type possibleTimeout interface {
-	Timeout() bool
-}
-
-var syncSocketTimeout = 5 * time.Second
-
-func (cluster *mongoCluster) syncServer(server *mongoServer) (info *mongoServerInfo, hosts []string, err error) {
-	var syncTimeout time.Duration
-	if raceDetector {
-		// This variable is only ever touched by tests.
-		globalMutex.Lock()
-		syncTimeout = syncSocketTimeout
-		globalMutex.Unlock()
-	} else {
-		syncTimeout = syncSocketTimeout
-	}
-
-	addr := server.Addr
-	log("SYNC Processing ", addr, "...")
-
-	// Retry a few times to avoid knocking a server down for a hiccup.
-	var result isMasterResult
-	var tryerr error
-	for retry := 0; ; retry++ {
-		if retry == 3 || retry == 1 && cluster.failFast {
-			return nil, nil, tryerr
-		}
-		if retry > 0 {
-			// Don't abuse the server needlessly if there's something actually wrong.
-			if err, ok := tryerr.(possibleTimeout); ok && err.Timeout() {
-				// Give a chance for waiters to timeout as well.
-				cluster.serverSynced.Broadcast()
-			}
-			time.Sleep(syncShortDelay)
-		}
-
-		// It's not clear what would be a good timeout here. Is it
-		// better to wait longer or to retry?
-		socket, _, err := server.AcquireSocket(0, syncTimeout)
-		if err != nil {
-			tryerr = err
-			logf("SYNC Failed to get socket to %s: %v", addr, err)
-			continue
-		}
-		err = cluster.isMaster(socket, &result)
-		socket.Release()
-		if err != nil {
-			tryerr = err
-			logf("SYNC Command 'ismaster' to %s failed: %v", addr, err)
-			continue
-		}
-		debugf("SYNC Result of 'ismaster' from %s: %#v", addr, result)
-		break
-	}
-
-	if cluster.setName != "" && result.SetName != cluster.setName {
-		logf("SYNC Server %s is not a member of replica set %q", addr, cluster.setName)
-		return nil, nil, fmt.Errorf("server %s is not a member of replica set %q", addr, cluster.setName)
-	}
-
-	if result.IsMaster {
-		debugf("SYNC %s is a master.", addr)
-		if !server.info.Master {
-			// Made an incorrect assumption above, so fix stats.
-			stats.conn(-1, false)
-			stats.conn(+1, true)
-		}
-	} else if result.Secondary {
-		debugf("SYNC %s is a slave.", addr)
-	} else if cluster.direct {
-		logf("SYNC %s in unknown state. Pretending it's a slave due to direct connection.", addr)
-	} else {
-		logf("SYNC %s is neither a master nor a slave.", addr)
-		// Let stats track it as whatever was known before.
-		return nil, nil, errors.New(addr + " is not a master nor slave")
-	}
-
-	info = &mongoServerInfo{
-		Master:         result.IsMaster,
-		Mongos:         result.Msg == "isdbgrid",
-		Tags:           result.Tags,
-		SetName:        result.SetName,
-		MaxWireVersion: result.MaxWireVersion,
-	}
-
-	hosts = make([]string, 0, 1+len(result.Hosts)+len(result.Passives))
-	if result.Primary != "" {
-		// First in the list to speed up master discovery.
-		hosts = append(hosts, result.Primary)
-	}
-	hosts = append(hosts, result.Hosts...)
-	hosts = append(hosts, result.Passives...)
-
-	debugf("SYNC %s knows about the following peers: %#v", addr, hosts)
-	return info, hosts, nil
-}
-
-type syncKind bool
-
-const (
-	completeSync syncKind = true
-	partialSync  syncKind = false
-)
-
-func (cluster *mongoCluster) addServer(server *mongoServer, info *mongoServerInfo, syncKind syncKind) {
-	cluster.Lock()
-	current := cluster.servers.Search(server.ResolvedAddr)
-	if current == nil {
-		if syncKind == partialSync {
-			cluster.Unlock()
-			server.Close()
-			log("SYNC Discarding unknown server ", server.Addr, " due to partial sync.")
-			return
-		}
-		cluster.servers.Add(server)
-		if info.Master {
-			cluster.masters.Add(server)
-			log("SYNC Adding ", server.Addr, " to cluster as a master.")
-		} else {
-			log("SYNC Adding ", server.Addr, " to cluster as a slave.")
-		}
-	} else {
-		if server != current {
-			panic("addServer attempting to add duplicated server")
-		}
-		if server.Info().Master != info.Master {
-			if info.Master {
-				log("SYNC Server ", server.Addr, " is now a master.")
-				cluster.masters.Add(server)
-			} else {
-				log("SYNC Server ", server.Addr, " is now a slave.")
-				cluster.masters.Remove(server)
-			}
-		}
-	}
-	server.SetInfo(info)
-	debugf("SYNC Broadcasting availability of server %s", server.Addr)
-	cluster.serverSynced.Broadcast()
-	cluster.Unlock()
-}
-
-func (cluster *mongoCluster) getKnownAddrs() []string {
-	cluster.RLock()
-	max := len(cluster.userSeeds) + len(cluster.dynaSeeds) + cluster.servers.Len()
-	seen := make(map[string]bool, max)
-	known := make([]string, 0, max)
-
-	add := func(addr string) {
-		if _, found := seen[addr]; !found {
-			seen[addr] = true
-			known = append(known, addr)
-		}
-	}
-
-	for _, addr := range cluster.userSeeds {
-		add(addr)
-	}
-	for _, addr := range cluster.dynaSeeds {
-		add(addr)
-	}
-	for _, serv := range cluster.servers.Slice() {
-		add(serv.Addr)
-	}
-	cluster.RUnlock()
-
-	return known
-}
-
-// syncServers injects a value into the cluster.sync channel to force
-// an iteration of the syncServersLoop function.
-func (cluster *mongoCluster) syncServers() {
-	select {
-	case cluster.sync <- true:
-	default:
-	}
-}
-
-// How long to wait for a checkup of the cluster topology if nothing
-// else kicks a synchronization before that.
-const syncServersDelay = 30 * time.Second
-const syncShortDelay = 500 * time.Millisecond
-
-// syncServersLoop loops while the cluster is alive to keep its idea of
-// the server topology up-to-date. It must be called just once from
-// newCluster.  The loop iterates once syncServersDelay has passed, or
-// if somebody injects a value into the cluster.sync channel to force a
-// synchronization.  A loop iteration will contact all servers in
-// parallel, ask them about known peers and their own role within the
-// cluster, and then attempt to do the same with all the peers
-// retrieved.
-func (cluster *mongoCluster) syncServersLoop() {
-	for {
-		debugf("SYNC Cluster %p is starting a sync loop iteration.", cluster)
-
-		cluster.Lock()
-		if cluster.references == 0 {
-			cluster.Unlock()
-			break
-		}
-		cluster.references++ // Keep alive while syncing.
-		direct := cluster.direct
-		cluster.Unlock()
-
-		cluster.syncServersIteration(direct)
-
-		// We just synchronized, so consume any outstanding requests.
-		select {
-		case <-cluster.sync:
-		default:
-		}
-
-		cluster.Release()
-
-		// Hold off before allowing another sync. No point in
-		// burning CPU looking for down servers.
-		if !cluster.failFast {
-			time.Sleep(syncShortDelay)
-		}
-
-		cluster.Lock()
-		if cluster.references == 0 {
-			cluster.Unlock()
-			break
-		}
-		cluster.syncCount++
-		// Poke all waiters so they have a chance to timeout or
-		// restart syncing if they wish to.
-		cluster.serverSynced.Broadcast()
-		// Check if we have to restart immediately either way.
-		restart := !direct && cluster.masters.Empty() || cluster.servers.Empty()
-		cluster.Unlock()
-
-		if restart {
-			log("SYNC No masters found. Will synchronize again.")
-			time.Sleep(syncShortDelay)
-			continue
-		}
-
-		debugf("SYNC Cluster %p waiting for next requested or scheduled sync.", cluster)
-
-		// Hold off until somebody explicitly requests a synchronization
-		// or it's time to check for a cluster topology change again.
-		select {
-		case <-cluster.sync:
-		case <-time.After(syncServersDelay):
-		}
-	}
-	debugf("SYNC Cluster %p is stopping its sync loop.", cluster)
-}
-
-func (cluster *mongoCluster) server(addr string, tcpaddr *net.TCPAddr) *mongoServer {
-	cluster.RLock()
-	server := cluster.servers.Search(tcpaddr.String())
-	cluster.RUnlock()
-	if server != nil {
-		return server
-	}
-	return newServer(addr, tcpaddr, cluster.sync, cluster.dial)
-}
-
-func resolveAddr(addr string) (*net.TCPAddr, error) {
-	// This hack allows having a timeout on resolution.
-	conn, err := net.DialTimeout("udp", addr, 10*time.Second)
-	if err != nil {
-		log("SYNC Failed to resolve server address: ", addr)
-		return nil, errors.New("failed to resolve server address: " + addr)
-	}
-	tcpaddr := (*net.TCPAddr)(conn.RemoteAddr().(*net.UDPAddr))
-	conn.Close()
-	if tcpaddr.String() != addr {
-		debug("SYNC Address ", addr, " resolved as ", tcpaddr.String())
-	}
-	return tcpaddr, nil
-}
-
-type pendingAdd struct {
-	server *mongoServer
-	info   *mongoServerInfo
-}
-
-func (cluster *mongoCluster) syncServersIteration(direct bool) {
-	log("SYNC Starting full topology synchronization...")
-
-	var wg sync.WaitGroup
-	var m sync.Mutex
-	notYetAdded := make(map[string]pendingAdd)
-	addIfFound := make(map[string]bool)
-	seen := make(map[string]bool)
-	syncKind := partialSync
-
-	var spawnSync func(addr string, byMaster bool)
-	spawnSync = func(addr string, byMaster bool) {
-		wg.Add(1)
-		go func() {
-			defer wg.Done()
-
-			tcpaddr, err := resolveAddr(addr)
-			if err != nil {
-				log("SYNC Failed to start sync of ", addr, ": ", err.Error())
-				return
-			}
-			resolvedAddr := tcpaddr.String()
-
-			m.Lock()
-			if byMaster {
-				if pending, ok := notYetAdded[resolvedAddr]; ok {
-					delete(notYetAdded, resolvedAddr)
-					m.Unlock()
-					cluster.addServer(pending.server, pending.info, completeSync)
-					return
-				}
-				addIfFound[resolvedAddr] = true
-			}
-			if seen[resolvedAddr] {
-				m.Unlock()
-				return
-			}
-			seen[resolvedAddr] = true
-			m.Unlock()
-
-			server := cluster.server(addr, tcpaddr)
-			info, hosts, err := cluster.syncServer(server)
-			if err != nil {
-				cluster.removeServer(server)
-				return
-			}
-
-			m.Lock()
-			add := direct || info.Master || addIfFound[resolvedAddr]
-			if add {
-				syncKind = completeSync
-			} else {
-				notYetAdded[resolvedAddr] = pendingAdd{server, info}
-			}
-			m.Unlock()
-			if add {
-				cluster.addServer(server, info, completeSync)
-			}
-			if !direct {
-				for _, addr := range hosts {
-					spawnSync(addr, info.Master)
-				}
-			}
-		}()
-	}
-
-	knownAddrs := cluster.getKnownAddrs()
-	for _, addr := range knownAddrs {
-		spawnSync(addr, false)
-	}
-	wg.Wait()
-
-	if syncKind == completeSync {
-		logf("SYNC Synchronization was complete (got data from primary).")
-		for _, pending := range notYetAdded {
-			cluster.removeServer(pending.server)
-		}
-	} else {
-		logf("SYNC Synchronization was partial (cannot talk to primary).")
-		for _, pending := range notYetAdded {
-			cluster.addServer(pending.server, pending.info, partialSync)
-		}
-	}
-
-	cluster.Lock()
-	ml := cluster.masters.Len()
-	logf("SYNC Synchronization completed: %d master(s) and %d slave(s) alive.", ml, cluster.servers.Len()-ml)
-
-	// Update dynamic seeds, but only if we have any good servers. Otherwise,
-	// leave them alone for better chances of a successful sync in the future.
-	if syncKind == completeSync {
-		dynaSeeds := make([]string, cluster.servers.Len())
-		for i, server := range cluster.servers.Slice() {
-			dynaSeeds[i] = server.Addr
-		}
-		cluster.dynaSeeds = dynaSeeds
-		debugf("SYNC New dynamic seeds: %#v\n", dynaSeeds)
-	}
-	cluster.Unlock()
-}
-
-// AcquireSocket returns a socket to a server in the cluster.  If slaveOk is
-// true, it will attempt to return a socket to a slave server.  If it is
-// false, the socket will necessarily be to a master server.
-func (cluster *mongoCluster) AcquireSocket(slaveOk bool, syncTimeout time.Duration, socketTimeout time.Duration, serverTags []bson.D, poolLimit int) (s *mongoSocket, err error) {
-	var started time.Time
-	var syncCount uint
-	warnedLimit := false
-	for {
-		cluster.RLock()
-		for {
-			ml := cluster.masters.Len()
-			sl := cluster.servers.Len()
-			debugf("Cluster has %d known masters and %d known slaves.", ml, sl-ml)
-			if ml > 0 || slaveOk && sl > 0 {
-				break
-			}
-			if started.IsZero() {
-				// Initialize after fast path above.
-				started = time.Now()
-				syncCount = cluster.syncCount
-			} else if syncTimeout != 0 && started.Before(time.Now().Add(-syncTimeout)) || cluster.failFast && cluster.syncCount != syncCount {
-				cluster.RUnlock()
-				return nil, errors.New("no reachable servers")
-			}
-			log("Waiting for servers to synchronize...")
-			cluster.syncServers()
-
-			// Remember: this will release and reacquire the lock.
-			cluster.serverSynced.Wait()
-		}
-
-		var server *mongoServer
-		if slaveOk {
-			server = cluster.servers.BestFit(serverTags)
-		} else {
-			server = cluster.masters.BestFit(nil)
-		}
-		cluster.RUnlock()
-
-		if server == nil {
-			// Must have failed the requested tags. Sleep to avoid spinning.
-			time.Sleep(1e8)
-			continue
-		}
-
-		s, abended, err := server.AcquireSocket(poolLimit, socketTimeout)
-		if err == errPoolLimit {
-			if !warnedLimit {
-				warnedLimit = true
-				log("WARNING: Per-server connection limit reached.")
-			}
-			time.Sleep(100 * time.Millisecond)
-			continue
-		}
-		if err != nil {
-			cluster.removeServer(server)
-			cluster.syncServers()
-			continue
-		}
-		if abended && !slaveOk {
-			var result isMasterResult
-			err := cluster.isMaster(s, &result)
-			if err != nil || !result.IsMaster {
-				logf("Cannot confirm server %s as master (%v)", server.Addr, err)
-				s.Release()
-				cluster.syncServers()
-				time.Sleep(100 * time.Millisecond)
-				continue
-			}
-		}
-		return s, nil
-	}
-	panic("unreached")
-}
-
-func (cluster *mongoCluster) CacheIndex(cacheKey string, exists bool) {
-	cluster.Lock()
-	if cluster.cachedIndex == nil {
-		cluster.cachedIndex = make(map[string]bool)
-	}
-	if exists {
-		cluster.cachedIndex[cacheKey] = true
-	} else {
-		delete(cluster.cachedIndex, cacheKey)
-	}
-	cluster.Unlock()
-}
-
-func (cluster *mongoCluster) HasCachedIndex(cacheKey string) (result bool) {
-	cluster.RLock()
-	if cluster.cachedIndex != nil {
-		result = cluster.cachedIndex[cacheKey]
-	}
-	cluster.RUnlock()
-	return
-}
-
-func (cluster *mongoCluster) ResetIndexCache() {
-	cluster.Lock()
-	cluster.cachedIndex = make(map[string]bool)
-	cluster.Unlock()
-}
diff --git a/Godeps/_workspace/src/gopkg.in/mgo.v2/cluster_test.go b/Godeps/_workspace/src/gopkg.in/mgo.v2/cluster_test.go
deleted file mode 100644
index 0b0b09a4b..000000000
--- a/Godeps/_workspace/src/gopkg.in/mgo.v2/cluster_test.go
+++ /dev/null
@@ -1,1657 +0,0 @@
-// mgo - MongoDB driver for Go
-//
-// Copyright (c) 2010-2012 - Gustavo Niemeyer <gustavo@niemeyer.net>
-//
-// 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 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.
-
-package mgo_test
-
-import (
-	"fmt"
-	"io"
-	"net"
-	"strings"
-	"sync"
-	"time"
-
-	. "gopkg.in/check.v1"
-	"gopkg.in/mgo.v2"
-	"gopkg.in/mgo.v2/bson"
-)
-
-func (s *S) TestNewSession(c *C) {
-	session, err := mgo.Dial("localhost:40001")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	// Do a dummy operation to wait for connection.
-	coll := session.DB("mydb").C("mycoll")
-	err = coll.Insert(M{"_id": 1})
-	c.Assert(err, IsNil)
-
-	// Tweak safety and query settings to ensure other has copied those.
-	session.SetSafe(nil)
-	session.SetBatch(-1)
-	other := session.New()
-	defer other.Close()
-	session.SetSafe(&mgo.Safe{})
-
-	// Clone was copied while session was unsafe, so no errors.
-	otherColl := other.DB("mydb").C("mycoll")
-	err = otherColl.Insert(M{"_id": 1})
-	c.Assert(err, IsNil)
-
-	// Original session was made safe again.
-	err = coll.Insert(M{"_id": 1})
-	c.Assert(err, NotNil)
-
-	// With New(), each session has its own socket now.
-	stats := mgo.GetStats()
-	c.Assert(stats.MasterConns, Equals, 2)
-	c.Assert(stats.SocketsInUse, Equals, 2)
-
-	// Ensure query parameters were cloned.
-	err = otherColl.Insert(M{"_id": 2})
-	c.Assert(err, IsNil)
-
-	// Ping the database to ensure the nonce has been received already.
-	c.Assert(other.Ping(), IsNil)
-
-	mgo.ResetStats()
-
-	iter := otherColl.Find(M{}).Iter()
-	c.Assert(err, IsNil)
-
-	m := M{}
-	ok := iter.Next(m)
-	c.Assert(ok, Equals, true)
-	err = iter.Close()
-	c.Assert(err, IsNil)
-
-	// If Batch(-1) is in effect, a single document must have been received.
-	stats = mgo.GetStats()
-	c.Assert(stats.ReceivedDocs, Equals, 1)
-}
-
-func (s *S) TestCloneSession(c *C) {
-	session, err := mgo.Dial("localhost:40001")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	// Do a dummy operation to wait for connection.
-	coll := session.DB("mydb").C("mycoll")
-	err = coll.Insert(M{"_id": 1})
-	c.Assert(err, IsNil)
-
-	// Tweak safety and query settings to ensure clone is copying those.
-	session.SetSafe(nil)
-	session.SetBatch(-1)
-	clone := session.Clone()
-	defer clone.Close()
-	session.SetSafe(&mgo.Safe{})
-
-	// Clone was copied while session was unsafe, so no errors.
-	cloneColl := clone.DB("mydb").C("mycoll")
-	err = cloneColl.Insert(M{"_id": 1})
-	c.Assert(err, IsNil)
-
-	// Original session was made safe again.
-	err = coll.Insert(M{"_id": 1})
-	c.Assert(err, NotNil)
-
-	// With Clone(), same socket is shared between sessions now.
-	stats := mgo.GetStats()
-	c.Assert(stats.SocketsInUse, Equals, 1)
-	c.Assert(stats.SocketRefs, Equals, 2)
-
-	// Refreshing one of them should let the original socket go,
-	// while preserving the safety settings.
-	clone.Refresh()
-	err = cloneColl.Insert(M{"_id": 1})
-	c.Assert(err, IsNil)
-
-	// Must have used another connection now.
-	stats = mgo.GetStats()
-	c.Assert(stats.SocketsInUse, Equals, 2)
-	c.Assert(stats.SocketRefs, Equals, 2)
-
-	// Ensure query parameters were cloned.
-	err = cloneColl.Insert(M{"_id": 2})
-	c.Assert(err, IsNil)
-
-	// Ping the database to ensure the nonce has been received already.
-	c.Assert(clone.Ping(), IsNil)
-
-	mgo.ResetStats()
-
-	iter := cloneColl.Find(M{}).Iter()
-	c.Assert(err, IsNil)
-
-	m := M{}
-	ok := iter.Next(m)
-	c.Assert(ok, Equals, true)
-	err = iter.Close()
-	c.Assert(err, IsNil)
-
-	// If Batch(-1) is in effect, a single document must have been received.
-	stats = mgo.GetStats()
-	c.Assert(stats.ReceivedDocs, Equals, 1)
-}
-
-func (s *S) TestSetModeStrong(c *C) {
-	session, err := mgo.Dial("localhost:40012")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	session.SetMode(mgo.Monotonic, false)
-	session.SetMode(mgo.Strong, false)
-
-	c.Assert(session.Mode(), Equals, mgo.Strong)
-
-	result := M{}
-	cmd := session.DB("admin").C("$cmd")
-	err = cmd.Find(M{"ismaster": 1}).One(&result)
-	c.Assert(err, IsNil)
-	c.Assert(result["ismaster"], Equals, true)
-
-	coll := session.DB("mydb").C("mycoll")
-	err = coll.Insert(M{"a": 1})
-	c.Assert(err, IsNil)
-
-	// Wait since the sync also uses sockets.
-	for len(session.LiveServers()) != 3 {
-		c.Log("Waiting for cluster sync to finish...")
-		time.Sleep(5e8)
-	}
-
-	stats := mgo.GetStats()
-	c.Assert(stats.MasterConns, Equals, 1)
-	c.Assert(stats.SlaveConns, Equals, 2)
-	c.Assert(stats.SocketsInUse, Equals, 1)
-
-	session.SetMode(mgo.Strong, true)
-
-	stats = mgo.GetStats()
-	c.Assert(stats.SocketsInUse, Equals, 0)
-}
-
-func (s *S) TestSetModeMonotonic(c *C) {
-	// Must necessarily connect to a slave, otherwise the
-	// master connection will be available first.
-	session, err := mgo.Dial("localhost:40012")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	session.SetMode(mgo.Monotonic, false)
-
-	c.Assert(session.Mode(), Equals, mgo.Monotonic)
-
-	result := M{}
-	cmd := session.DB("admin").C("$cmd")
-	err = cmd.Find(M{"ismaster": 1}).One(&result)
-	c.Assert(err, IsNil)
-	c.Assert(result["ismaster"], Equals, false)
-
-	coll := session.DB("mydb").C("mycoll")
-	err = coll.Insert(M{"a": 1})
-	c.Assert(err, IsNil)
-
-	result = M{}
-	err = cmd.Find(M{"ismaster": 1}).One(&result)
-	c.Assert(err, IsNil)
-	c.Assert(result["ismaster"], Equals, true)
-
-	// Wait since the sync also uses sockets.
-	for len(session.LiveServers()) != 3 {
-		c.Log("Waiting for cluster sync to finish...")
-		time.Sleep(5e8)
-	}
-
-	stats := mgo.GetStats()
-	c.Assert(stats.MasterConns, Equals, 1)
-	c.Assert(stats.SlaveConns, Equals, 2)
-	c.Assert(stats.SocketsInUse, Equals, 2)
-
-	session.SetMode(mgo.Monotonic, true)
-
-	stats = mgo.GetStats()
-	c.Assert(stats.SocketsInUse, Equals, 0)
-}
-
-func (s *S) TestSetModeMonotonicAfterStrong(c *C) {
-	// Test that a strong session shifting to a monotonic
-	// one preserves the socket untouched.
-
-	session, err := mgo.Dial("localhost:40012")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	// Insert something to force a connection to the master.
-	coll := session.DB("mydb").C("mycoll")
-	err = coll.Insert(M{"a": 1})
-	c.Assert(err, IsNil)
-
-	session.SetMode(mgo.Monotonic, false)
-
-	// Wait since the sync also uses sockets.
-	for len(session.LiveServers()) != 3 {
-		c.Log("Waiting for cluster sync to finish...")
-		time.Sleep(5e8)
-	}
-
-	// Master socket should still be reserved.
-	stats := mgo.GetStats()
-	c.Assert(stats.SocketsInUse, Equals, 1)
-
-	// Confirm it's the master even though it's Monotonic by now.
-	result := M{}
-	cmd := session.DB("admin").C("$cmd")
-	err = cmd.Find(M{"ismaster": 1}).One(&result)
-	c.Assert(err, IsNil)
-	c.Assert(result["ismaster"], Equals, true)
-}
-
-func (s *S) TestSetModeStrongAfterMonotonic(c *C) {
-	// Test that shifting from Monotonic to Strong while
-	// using a slave socket will keep the socket reserved
-	// until the master socket is necessary, so that no
-	// switch over occurs unless it's actually necessary.
-
-	// Must necessarily connect to a slave, otherwise the
-	// master connection will be available first.
-	session, err := mgo.Dial("localhost:40012")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	session.SetMode(mgo.Monotonic, false)
-
-	// Ensure we're talking to a slave, and reserve the socket.
-	result := M{}
-	err = session.Run("ismaster", &result)
-	c.Assert(err, IsNil)
-	c.Assert(result["ismaster"], Equals, false)
-
-	// Switch to a Strong session.
-	session.SetMode(mgo.Strong, false)
-
-	// Wait since the sync also uses sockets.
-	for len(session.LiveServers()) != 3 {
-		c.Log("Waiting for cluster sync to finish...")
-		time.Sleep(5e8)
-	}
-
-	// Slave socket should still be reserved.
-	stats := mgo.GetStats()
-	c.Assert(stats.SocketsInUse, Equals, 1)
-
-	// But any operation will switch it to the master.
-	result = M{}
-	err = session.Run("ismaster", &result)
-	c.Assert(err, IsNil)
-	c.Assert(result["ismaster"], Equals, true)
-}
-
-func (s *S) TestSetModeMonotonicWriteOnIteration(c *C) {
-	// Must necessarily connect to a slave, otherwise the
-	// master connection will be available first.
-	session, err := mgo.Dial("localhost:40012")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	session.SetMode(mgo.Monotonic, false)
-
-	c.Assert(session.Mode(), Equals, mgo.Monotonic)
-
-	coll1 := session.DB("mydb").C("mycoll1")
-	coll2 := session.DB("mydb").C("mycoll2")
-
-	ns := []int{40, 41, 42, 43, 44, 45, 46}
-	for _, n := range ns {
-		err := coll1.Insert(M{"n": n})
-		c.Assert(err, IsNil)
-	}
-
-	// Release master so we can grab a slave again.
-	session.Refresh()
-
-	// Wait until synchronization is done.
-	for {
-		n, err := coll1.Count()
-		c.Assert(err, IsNil)
-		if n == len(ns) {
-			break
-		}
-	}
-
-	iter := coll1.Find(nil).Batch(2).Iter()
-	i := 0
-	m := M{}
-	for iter.Next(&m) {
-		i++
-		if i > 3 {
-			err := coll2.Insert(M{"n": 47 + i})
-			c.Assert(err, IsNil)
-		}
-	}
-	c.Assert(i, Equals, len(ns))
-}
-
-func (s *S) TestSetModeEventual(c *C) {
-	// Must necessarily connect to a slave, otherwise the
-	// master connection will be available first.
-	session, err := mgo.Dial("localhost:40012")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	session.SetMode(mgo.Eventual, false)
-
-	c.Assert(session.Mode(), Equals, mgo.Eventual)
-
-	result := M{}
-	err = session.Run("ismaster", &result)
-	c.Assert(err, IsNil)
-	c.Assert(result["ismaster"], Equals, false)
-
-	coll := session.DB("mydb").C("mycoll")
-	err = coll.Insert(M{"a": 1})
-	c.Assert(err, IsNil)
-
-	result = M{}
-	err = session.Run("ismaster", &result)
-	c.Assert(err, IsNil)
-	c.Assert(result["ismaster"], Equals, false)
-
-	// Wait since the sync also uses sockets.
-	for len(session.LiveServers()) != 3 {
-		c.Log("Waiting for cluster sync to finish...")
-		time.Sleep(5e8)
-	}
-
-	stats := mgo.GetStats()
-	c.Assert(stats.MasterConns, Equals, 1)
-	c.Assert(stats.SlaveConns, Equals, 2)
-	c.Assert(stats.SocketsInUse, Equals, 0)
-}
-
-func (s *S) TestSetModeEventualAfterStrong(c *C) {
-	// Test that a strong session shifting to an eventual
-	// one preserves the socket untouched.
-
-	session, err := mgo.Dial("localhost:40012")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	// Insert something to force a connection to the master.
-	coll := session.DB("mydb").C("mycoll")
-	err = coll.Insert(M{"a": 1})
-	c.Assert(err, IsNil)
-
-	session.SetMode(mgo.Eventual, false)
-
-	// Wait since the sync also uses sockets.
-	for len(session.LiveServers()) != 3 {
-		c.Log("Waiting for cluster sync to finish...")
-		time.Sleep(5e8)
-	}
-
-	// Master socket should still be reserved.
-	stats := mgo.GetStats()
-	c.Assert(stats.SocketsInUse, Equals, 1)
-
-	// Confirm it's the master even though it's Eventual by now.
-	result := M{}
-	cmd := session.DB("admin").C("$cmd")
-	err = cmd.Find(M{"ismaster": 1}).One(&result)
-	c.Assert(err, IsNil)
-	c.Assert(result["ismaster"], Equals, true)
-
-	session.SetMode(mgo.Eventual, true)
-
-	stats = mgo.GetStats()
-	c.Assert(stats.SocketsInUse, Equals, 0)
-}
-
-func (s *S) TestPrimaryShutdownStrong(c *C) {
-	if *fast {
-		c.Skip("-fast")
-	}
-
-	session, err := mgo.Dial("localhost:40021")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	// With strong consistency, this will open a socket to the master.
-	result := &struct{ Host string }{}
-	err = session.Run("serverStatus", result)
-	c.Assert(err, IsNil)
-
-	// Kill the master.
-	host := result.Host
-	s.Stop(host)
-
-	// This must fail, since the connection was broken.
-	err = session.Run("serverStatus", result)
-	c.Assert(err, Equals, io.EOF)
-
-	// With strong consistency, it fails again until reset.
-	err = session.Run("serverStatus", result)
-	c.Assert(err, Equals, io.EOF)
-
-	session.Refresh()
-
-	// Now we should be able to talk to the new master.
-	// Increase the timeout since this may take quite a while.
-	session.SetSyncTimeout(3 * time.Minute)
-
-	err = session.Run("serverStatus", result)
-	c.Assert(err, IsNil)
-	c.Assert(result.Host, Not(Equals), host)
-
-	// Insert some data to confirm it's indeed a master.
-	err = session.DB("mydb").C("mycoll").Insert(M{"n": 42})
-	c.Assert(err, IsNil)
-}
-
-func (s *S) TestPrimaryHiccup(c *C) {
-	if *fast {
-		c.Skip("-fast")
-	}
-
-	session, err := mgo.Dial("localhost:40021")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	// With strong consistency, this will open a socket to the master.
-	result := &struct{ Host string }{}
-	err = session.Run("serverStatus", result)
-	c.Assert(err, IsNil)
-
-	// Establish a few extra sessions to create spare sockets to
-	// the master. This increases a bit the chances of getting an
-	// incorrect cached socket.
-	var sessions []*mgo.Session
-	for i := 0; i < 20; i++ {
-		sessions = append(sessions, session.Copy())
-		err = sessions[len(sessions)-1].Run("serverStatus", result)
-		c.Assert(err, IsNil)
-	}
-	for i := range sessions {
-		sessions[i].Close()
-	}
-
-	// Kill the master, but bring it back immediatelly.
-	host := result.Host
-	s.Stop(host)
-	s.StartAll()
-
-	// This must fail, since the connection was broken.
-	err = session.Run("serverStatus", result)
-	c.Assert(err, Equals, io.EOF)
-
-	// With strong consistency, it fails again until reset.
-	err = session.Run("serverStatus", result)
-	c.Assert(err, Equals, io.EOF)
-
-	session.Refresh()
-
-	// Now we should be able to talk to the new master.
-	// Increase the timeout since this may take quite a while.
-	session.SetSyncTimeout(3 * time.Minute)
-
-	// Insert some data to confirm it's indeed a master.
-	err = session.DB("mydb").C("mycoll").Insert(M{"n": 42})
-	c.Assert(err, IsNil)
-}
-
-func (s *S) TestPrimaryShutdownMonotonic(c *C) {
-	if *fast {
-		c.Skip("-fast")
-	}
-
-	session, err := mgo.Dial("localhost:40021")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	session.SetMode(mgo.Monotonic, true)
-
-	// Insert something to force a switch to the master.
-	coll := session.DB("mydb").C("mycoll")
-	err = coll.Insert(M{"a": 1})
-	c.Assert(err, IsNil)
-
-	// Wait a bit for this to be synchronized to slaves.
-	time.Sleep(3 * time.Second)
-
-	result := &struct{ Host string }{}
-	err = session.Run("serverStatus", result)
-	c.Assert(err, IsNil)
-
-	// Kill the master.
-	host := result.Host
-	s.Stop(host)
-
-	// This must fail, since the connection was broken.
-	err = session.Run("serverStatus", result)
-	c.Assert(err, Equals, io.EOF)
-
-	// With monotonic consistency, it fails again until reset.
-	err = session.Run("serverStatus", result)
-	c.Assert(err, Equals, io.EOF)
-
-	session.Refresh()
-
-	// Now we should be able to talk to the new master.
-	err = session.Run("serverStatus", result)
-	c.Assert(err, IsNil)
-	c.Assert(result.Host, Not(Equals), host)
-}
-
-func (s *S) TestPrimaryShutdownMonotonicWithSlave(c *C) {
-	if *fast {
-		c.Skip("-fast")
-	}
-
-	session, err := mgo.Dial("localhost:40021")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	ssresult := &struct{ Host string }{}
-	imresult := &struct{ IsMaster bool }{}
-
-	// Figure the master while still using the strong session.
-	err = session.Run("serverStatus", ssresult)
-	c.Assert(err, IsNil)
-	err = session.Run("isMaster", imresult)
-	c.Assert(err, IsNil)
-	master := ssresult.Host
-	c.Assert(imresult.IsMaster, Equals, true, Commentf("%s is not the master", master))
-
-	// Create new monotonic session with an explicit address to ensure
-	// a slave is synchronized before the master, otherwise a connection
-	// with the master may be used below for lack of other options.
-	var addr string
-	switch {
-	case strings.HasSuffix(ssresult.Host, ":40021"):
-		addr = "localhost:40022"
-	case strings.HasSuffix(ssresult.Host, ":40022"):
-		addr = "localhost:40021"
-	case strings.HasSuffix(ssresult.Host, ":40023"):
-		addr = "localhost:40021"
-	default:
-		c.Fatal("Unknown host: ", ssresult.Host)
-	}
-
-	session, err = mgo.Dial(addr)
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	session.SetMode(mgo.Monotonic, true)
-
-	// Check the address of the socket associated with the monotonic session.
-	c.Log("Running serverStatus and isMaster with monotonic session")
-	err = session.Run("serverStatus", ssresult)
-	c.Assert(err, IsNil)
-	err = session.Run("isMaster", imresult)
-	c.Assert(err, IsNil)
-	slave := ssresult.Host
-	c.Assert(imresult.IsMaster, Equals, false, Commentf("%s is not a slave", slave))
-
-	c.Assert(master, Not(Equals), slave)
-
-	// Kill the master.
-	s.Stop(master)
-
-	// Session must still be good, since we were talking to a slave.
-	err = session.Run("serverStatus", ssresult)
-	c.Assert(err, IsNil)
-
-	c.Assert(ssresult.Host, Equals, slave,
-		Commentf("Monotonic session moved from %s to %s", slave, ssresult.Host))
-
-	// If we try to insert something, it'll have to hold until the new
-	// master is available to move the connection, and work correctly.
-	coll := session.DB("mydb").C("mycoll")
-	err = coll.Insert(M{"a": 1})
-	c.Assert(err, IsNil)
-
-	// Must now be talking to the new master.
-	err = session.Run("serverStatus", ssresult)
-	c.Assert(err, IsNil)
-	err = session.Run("isMaster", imresult)
-	c.Assert(err, IsNil)
-	c.Assert(imresult.IsMaster, Equals, true, Commentf("%s is not the master", master))
-
-	// ... which is not the old one, since it's still dead.
-	c.Assert(ssresult.Host, Not(Equals), master)
-}
-
-func (s *S) TestPrimaryShutdownEventual(c *C) {
-	if *fast {
-		c.Skip("-fast")
-	}
-
-	session, err := mgo.Dial("localhost:40021")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	result := &struct{ Host string }{}
-	err = session.Run("serverStatus", result)
-	c.Assert(err, IsNil)
-	master := result.Host
-
-	session.SetMode(mgo.Eventual, true)
-
-	// Should connect to the master when needed.
-	coll := session.DB("mydb").C("mycoll")
-	err = coll.Insert(M{"a": 1})
-	c.Assert(err, IsNil)
-
-	// Wait a bit for this to be synchronized to slaves.
-	time.Sleep(3 * time.Second)
-
-	// Kill the master.
-	s.Stop(master)
-
-	// Should still work, with the new master now.
-	coll = session.DB("mydb").C("mycoll")
-	err = coll.Insert(M{"a": 1})
-	c.Assert(err, IsNil)
-
-	err = session.Run("serverStatus", result)
-	c.Assert(err, IsNil)
-	c.Assert(result.Host, Not(Equals), master)
-}
-
-func (s *S) TestPreserveSocketCountOnSync(c *C) {
-	if *fast {
-		c.Skip("-fast")
-	}
-
-	session, err := mgo.Dial("localhost:40011")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	stats := mgo.GetStats()
-	for stats.MasterConns+stats.SlaveConns != 3 {
-		stats = mgo.GetStats()
-		c.Log("Waiting for all connections to be established...")
-		time.Sleep(5e8)
-	}
-
-	c.Assert(stats.SocketsAlive, Equals, 3)
-
-	// Kill the master (with rs1, 'a' is always the master).
-	s.Stop("localhost:40011")
-
-	// Wait for the logic to run for a bit and bring it back.
-	startedAll := make(chan bool)
-	go func() {
-		time.Sleep(5e9)
-		s.StartAll()
-		startedAll <- true
-	}()
-
-	// Do not allow the test to return before the goroutine above is done.
-	defer func() {
-		<-startedAll
-	}()
-
-	// Do an action to kick the resync logic in, and also to
-	// wait until the cluster recognizes the server is back.
-	result := struct{ Ok bool }{}
-	err = session.Run("getLastError", &result)
-	c.Assert(err, IsNil)
-	c.Assert(result.Ok, Equals, true)
-
-	for i := 0; i != 20; i++ {
-		stats = mgo.GetStats()
-		if stats.SocketsAlive == 3 {
-			break
-		}
-		c.Logf("Waiting for 3 sockets alive, have %d", stats.SocketsAlive)
-		time.Sleep(5e8)
-	}
-
-	// Ensure the number of sockets is preserved after syncing.
-	stats = mgo.GetStats()
-	c.Assert(stats.SocketsAlive, Equals, 3)
-	c.Assert(stats.SocketsInUse, Equals, 1)
-	c.Assert(stats.SocketRefs, Equals, 1)
-}
-
-// Connect to the master of a deployment with a single server,
-// run an insert, and then ensure the insert worked and that a
-// single connection was established.
-func (s *S) TestTopologySyncWithSingleMaster(c *C) {
-	// Use hostname here rather than IP, to make things trickier.
-	session, err := mgo.Dial("localhost:40001")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	coll := session.DB("mydb").C("mycoll")
-	err = coll.Insert(M{"a": 1, "b": 2})
-	c.Assert(err, IsNil)
-
-	// One connection used for discovery. Master socket recycled for
-	// insert. Socket is reserved after insert.
-	stats := mgo.GetStats()
-	c.Assert(stats.MasterConns, Equals, 1)
-	c.Assert(stats.SlaveConns, Equals, 0)
-	c.Assert(stats.SocketsInUse, Equals, 1)
-
-	// Refresh session and socket must be released.
-	session.Refresh()
-	stats = mgo.GetStats()
-	c.Assert(stats.SocketsInUse, Equals, 0)
-}
-
-func (s *S) TestTopologySyncWithSlaveSeed(c *C) {
-	// That's supposed to be a slave. Must run discovery
-	// and find out master to insert successfully.
-	session, err := mgo.Dial("localhost:40012")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	coll := session.DB("mydb").C("mycoll")
-	coll.Insert(M{"a": 1, "b": 2})
-
-	result := struct{ Ok bool }{}
-	err = session.Run("getLastError", &result)
-	c.Assert(err, IsNil)
-	c.Assert(result.Ok, Equals, true)
-
-	// One connection to each during discovery. Master
-	// socket recycled for insert.
-	stats := mgo.GetStats()
-	c.Assert(stats.MasterConns, Equals, 1)
-	c.Assert(stats.SlaveConns, Equals, 2)
-
-	// Only one socket reference alive, in the master socket owned
-	// by the above session.
-	c.Assert(stats.SocketsInUse, Equals, 1)
-
-	// Refresh it, and it must be gone.
-	session.Refresh()
-	stats = mgo.GetStats()
-	c.Assert(stats.SocketsInUse, Equals, 0)
-}
-
-func (s *S) TestSyncTimeout(c *C) {
-	if *fast {
-		c.Skip("-fast")
-	}
-
-	session, err := mgo.Dial("localhost:40001")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	s.Stop("localhost:40001")
-
-	timeout := 3 * time.Second
-	session.SetSyncTimeout(timeout)
-	started := time.Now()
-
-	// Do something.
-	result := struct{ Ok bool }{}
-	err = session.Run("getLastError", &result)
-	c.Assert(err, ErrorMatches, "no reachable servers")
-	c.Assert(started.Before(time.Now().Add(-timeout)), Equals, true)
-	c.Assert(started.After(time.Now().Add(-timeout*2)), Equals, true)
-}
-
-func (s *S) TestDialWithTimeout(c *C) {
-	if *fast {
-		c.Skip("-fast")
-	}
-
-	timeout := 2 * time.Second
-	started := time.Now()
-
-	// 40009 isn't used by the test servers.
-	session, err := mgo.DialWithTimeout("localhost:40009", timeout)
-	if session != nil {
-		session.Close()
-	}
-	c.Assert(err, ErrorMatches, "no reachable servers")
-	c.Assert(session, IsNil)
-	c.Assert(started.Before(time.Now().Add(-timeout)), Equals, true)
-	c.Assert(started.After(time.Now().Add(-timeout*2)), Equals, true)
-}
-
-func (s *S) TestSocketTimeout(c *C) {
-	if *fast {
-		c.Skip("-fast")
-	}
-
-	session, err := mgo.Dial("localhost:40001")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	s.Freeze("localhost:40001")
-
-	timeout := 3 * time.Second
-	session.SetSocketTimeout(timeout)
-	started := time.Now()
-
-	// Do something.
-	result := struct{ Ok bool }{}
-	err = session.Run("getLastError", &result)
-	c.Assert(err, ErrorMatches, ".*: i/o timeout")
-	c.Assert(started.Before(time.Now().Add(-timeout)), Equals, true)
-	c.Assert(started.After(time.Now().Add(-timeout*2)), Equals, true)
-}
-
-func (s *S) TestSocketTimeoutOnDial(c *C) {
-	if *fast {
-		c.Skip("-fast")
-	}
-
-	timeout := 1 * time.Second
-
-	defer mgo.HackSyncSocketTimeout(timeout)()
-
-	s.Freeze("localhost:40001")
-
-	started := time.Now()
-
-	session, err := mgo.DialWithTimeout("localhost:40001", timeout)
-	c.Assert(err, ErrorMatches, "no reachable servers")
-	c.Assert(session, IsNil)
-
-	c.Assert(started.Before(time.Now().Add(-timeout)), Equals, true)
-	c.Assert(started.After(time.Now().Add(-20*time.Second)), Equals, true)
-}
-
-func (s *S) TestSocketTimeoutOnInactiveSocket(c *C) {
-	if *fast {
-		c.Skip("-fast")
-	}
-
-	session, err := mgo.Dial("localhost:40001")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	timeout := 2 * time.Second
-	session.SetSocketTimeout(timeout)
-
-	// Do something that relies on the timeout and works.
-	c.Assert(session.Ping(), IsNil)
-
-	// Freeze and wait for the timeout to go by.
-	s.Freeze("localhost:40001")
-	time.Sleep(timeout + 500*time.Millisecond)
-	s.Thaw("localhost:40001")
-
-	// Do something again. The timeout above should not have killed
-	// the socket as there was nothing to be done.
-	c.Assert(session.Ping(), IsNil)
-}
-
-func (s *S) TestDialWithReplicaSetName(c *C) {
-	seedLists := [][]string{
-		// rs1 primary and rs2 primary
-		[]string{"localhost:40011", "localhost:40021"},
-		// rs1 primary and rs2 secondary
-		[]string{"localhost:40011", "localhost:40022"},
-		// rs1 secondary and rs2 primary
-		[]string{"localhost:40012", "localhost:40021"},
-		// rs1 secondary and rs2 secondary
-		[]string{"localhost:40012", "localhost:40022"},
-	}
-
-	rs2Members := []string{":40021", ":40022", ":40023"}
-
-	verifySyncedServers := func(session *mgo.Session, numServers int) {
-		// wait for the server(s) to be synced
-		for len(session.LiveServers()) != numServers {
-			c.Log("Waiting for cluster sync to finish...")
-			time.Sleep(5e8)
-		}
-
-		// ensure none of the rs2 set members are communicated with
-		for _, addr := range session.LiveServers() {
-			for _, rs2Member := range rs2Members {
-				c.Assert(strings.HasSuffix(addr, rs2Member), Equals, false)
-			}
-		}
-	}
-
-	// only communication with rs1 members is expected
-	for _, seedList := range seedLists {
-		info := mgo.DialInfo{
-			Addrs:          seedList,
-			Timeout:        5 * time.Second,
-			ReplicaSetName: "rs1",
-		}
-
-		session, err := mgo.DialWithInfo(&info)
-		c.Assert(err, IsNil)
-		verifySyncedServers(session, 3)
-		session.Close()
-
-		info.Direct = true
-		session, err = mgo.DialWithInfo(&info)
-		c.Assert(err, IsNil)
-		verifySyncedServers(session, 1)
-		session.Close()
-
-		connectionUrl := fmt.Sprintf("mongodb://%v/?replicaSet=rs1", strings.Join(seedList, ","))
-		session, err = mgo.Dial(connectionUrl)
-		c.Assert(err, IsNil)
-		verifySyncedServers(session, 3)
-		session.Close()
-
-		connectionUrl += "&connect=direct"
-		session, err = mgo.Dial(connectionUrl)
-		c.Assert(err, IsNil)
-		verifySyncedServers(session, 1)
-		session.Close()
-	}
-
-}
-
-func (s *S) TestDirect(c *C) {
-	session, err := mgo.Dial("localhost:40012?connect=direct")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	// We know that server is a slave.
-	session.SetMode(mgo.Monotonic, true)
-
-	result := &struct{ Host string }{}
-	err = session.Run("serverStatus", result)
-	c.Assert(err, IsNil)
-	c.Assert(strings.HasSuffix(result.Host, ":40012"), Equals, true)
-
-	stats := mgo.GetStats()
-	c.Assert(stats.SocketsAlive, Equals, 1)
-	c.Assert(stats.SocketsInUse, Equals, 1)
-	c.Assert(stats.SocketRefs, Equals, 1)
-
-	// We've got no master, so it'll timeout.
-	session.SetSyncTimeout(5e8 * time.Nanosecond)
-
-	coll := session.DB("mydb").C("mycoll")
-	err = coll.Insert(M{"test": 1})
-	c.Assert(err, ErrorMatches, "no reachable servers")
-
-	// Writing to the local database is okay.
-	coll = session.DB("local").C("mycoll")
-	defer coll.RemoveAll(nil)
-	id := bson.NewObjectId()
-	err = coll.Insert(M{"_id": id})
-	c.Assert(err, IsNil)
-
-	// Data was stored in the right server.
-	n, err := coll.Find(M{"_id": id}).Count()
-	c.Assert(err, IsNil)
-	c.Assert(n, Equals, 1)
-
-	// Server hasn't changed.
-	result.Host = ""
-	err = session.Run("serverStatus", result)
-	c.Assert(err, IsNil)
-	c.Assert(strings.HasSuffix(result.Host, ":40012"), Equals, true)
-}
-
-func (s *S) TestDirectToUnknownStateMember(c *C) {
-	session, err := mgo.Dial("localhost:40041?connect=direct")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	session.SetMode(mgo.Monotonic, true)
-
-	result := &struct{ Host string }{}
-	err = session.Run("serverStatus", result)
-	c.Assert(err, IsNil)
-	c.Assert(strings.HasSuffix(result.Host, ":40041"), Equals, true)
-
-	// We've got no master, so it'll timeout.
-	session.SetSyncTimeout(5e8 * time.Nanosecond)
-
-	coll := session.DB("mydb").C("mycoll")
-	err = coll.Insert(M{"test": 1})
-	c.Assert(err, ErrorMatches, "no reachable servers")
-
-	// Slave is still reachable.
-	result.Host = ""
-	err = session.Run("serverStatus", result)
-	c.Assert(err, IsNil)
-	c.Assert(strings.HasSuffix(result.Host, ":40041"), Equals, true)
-}
-
-func (s *S) TestFailFast(c *C) {
-	info := mgo.DialInfo{
-		Addrs:    []string{"localhost:99999"},
-		Timeout:  5 * time.Second,
-		FailFast: true,
-	}
-
-	started := time.Now()
-
-	_, err := mgo.DialWithInfo(&info)
-	c.Assert(err, ErrorMatches, "no reachable servers")
-
-	c.Assert(started.After(time.Now().Add(-time.Second)), Equals, true)
-}
-
-type OpCounters struct {
-	Insert  int
-	Query   int
-	Update  int
-	Delete  int
-	GetMore int
-	Command int
-}
-
-func getOpCounters(server string) (c *OpCounters, err error) {
-	session, err := mgo.Dial(server + "?connect=direct")
-	if err != nil {
-		return nil, err
-	}
-	defer session.Close()
-	session.SetMode(mgo.Monotonic, true)
-	result := struct{ OpCounters }{}
-	err = session.Run("serverStatus", &result)
-	return &result.OpCounters, err
-}
-
-func (s *S) TestMonotonicSlaveOkFlagWithMongos(c *C) {
-	session, err := mgo.Dial("localhost:40021")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	ssresult := &struct{ Host string }{}
-	imresult := &struct{ IsMaster bool }{}
-
-	// Figure the master while still using the strong session.
-	err = session.Run("serverStatus", ssresult)
-	c.Assert(err, IsNil)
-	err = session.Run("isMaster", imresult)
-	c.Assert(err, IsNil)
-	master := ssresult.Host
-	c.Assert(imresult.IsMaster, Equals, true, Commentf("%s is not the master", master))
-
-	// Collect op counters for everyone.
-	opc21a, err := getOpCounters("localhost:40021")
-	c.Assert(err, IsNil)
-	opc22a, err := getOpCounters("localhost:40022")
-	c.Assert(err, IsNil)
-	opc23a, err := getOpCounters("localhost:40023")
-	c.Assert(err, IsNil)
-
-	// Do a SlaveOk query through MongoS
-
-	mongos, err := mgo.Dial("localhost:40202")
-	c.Assert(err, IsNil)
-	defer mongos.Close()
-
-	mongos.SetMode(mgo.Monotonic, true)
-
-	coll := mongos.DB("mydb").C("mycoll")
-	result := &struct{}{}
-	for i := 0; i != 5; i++ {
-		err := coll.Find(nil).One(result)
-		c.Assert(err, Equals, mgo.ErrNotFound)
-	}
-
-	// Collect op counters for everyone again.
-	opc21b, err := getOpCounters("localhost:40021")
-	c.Assert(err, IsNil)
-	opc22b, err := getOpCounters("localhost:40022")
-	c.Assert(err, IsNil)
-	opc23b, err := getOpCounters("localhost:40023")
-	c.Assert(err, IsNil)
-
-	masterPort := master[strings.Index(master, ":")+1:]
-
-	var masterDelta, slaveDelta int
-	switch masterPort {
-	case "40021":
-		masterDelta = opc21b.Query - opc21a.Query
-		slaveDelta = (opc22b.Query - opc22a.Query) + (opc23b.Query - opc23a.Query)
-	case "40022":
-		masterDelta = opc22b.Query - opc22a.Query
-		slaveDelta = (opc21b.Query - opc21a.Query) + (opc23b.Query - opc23a.Query)
-	case "40023":
-		masterDelta = opc23b.Query - opc23a.Query
-		slaveDelta = (opc21b.Query - opc21a.Query) + (opc22b.Query - opc22a.Query)
-	default:
-		c.Fatal("Uh?")
-	}
-
-	c.Check(masterDelta, Equals, 0) // Just the counting itself.
-	c.Check(slaveDelta, Equals, 5)  // The counting for both, plus 5 queries above.
-}
-
-func (s *S) TestRemovalOfClusterMember(c *C) {
-	if *fast {
-		c.Skip("-fast")
-	}
-
-	master, err := mgo.Dial("localhost:40021")
-	c.Assert(err, IsNil)
-	defer master.Close()
-
-	// Wait for cluster to fully sync up.
-	for i := 0; i < 10; i++ {
-		if len(master.LiveServers()) == 3 {
-			break
-		}
-		time.Sleep(5e8)
-	}
-	if len(master.LiveServers()) != 3 {
-		c.Fatalf("Test started with bad cluster state: %v", master.LiveServers())
-	}
-
-	result := &struct {
-		IsMaster bool
-		Me       string
-	}{}
-	slave := master.Copy()
-	slave.SetMode(mgo.Monotonic, true) // Monotonic can hold a non-master socket persistently.
-	err = slave.Run("isMaster", result)
-	c.Assert(err, IsNil)
-	c.Assert(result.IsMaster, Equals, false)
-	slaveAddr := result.Me
-
-	defer func() {
-		master.Refresh()
-		master.Run(bson.D{{"$eval", `rs.add("` + slaveAddr + `")`}}, nil)
-		master.Close()
-		slave.Close()
-	}()
-
-	c.Logf("========== Removing slave: %s ==========", slaveAddr)
-
-	master.Run(bson.D{{"$eval", `rs.remove("` + slaveAddr + `")`}}, nil)
-
-	master.Refresh()
-
-	// Give the cluster a moment to catch up by doing a roundtrip to the master.
-	err = master.Ping()
-	c.Assert(err, IsNil)
-
-	time.Sleep(3e9)
-
-	// This must fail since the slave has been taken off the cluster.
-	err = slave.Ping()
-	c.Assert(err, NotNil)
-
-	for i := 0; i < 15; i++ {
-		if len(master.LiveServers()) == 2 {
-			break
-		}
-		time.Sleep(time.Second)
-	}
-	live := master.LiveServers()
-	if len(live) != 2 {
-		c.Errorf("Removed server still considered live: %#s", live)
-	}
-
-	c.Log("========== Test succeeded. ==========")
-}
-
-func (s *S) TestPoolLimitSimple(c *C) {
-	for test := 0; test < 2; test++ {
-		var session *mgo.Session
-		var err error
-		if test == 0 {
-			session, err = mgo.Dial("localhost:40001")
-			c.Assert(err, IsNil)
-			session.SetPoolLimit(1)
-		} else {
-			session, err = mgo.Dial("localhost:40001?maxPoolSize=1")
-			c.Assert(err, IsNil)
-		}
-		defer session.Close()
-
-		// Put one socket in use.
-		c.Assert(session.Ping(), IsNil)
-
-		done := make(chan time.Duration)
-
-		// Now block trying to get another one due to the pool limit.
-		go func() {
-			copy := session.Copy()
-			defer copy.Close()
-			started := time.Now()
-			c.Check(copy.Ping(), IsNil)
-			done <- time.Now().Sub(started)
-		}()
-
-		time.Sleep(300 * time.Millisecond)
-
-		// Put the one socket back in the pool, freeing it for the copy.
-		session.Refresh()
-		delay := <-done
-		c.Assert(delay > 300*time.Millisecond, Equals, true, Commentf("Delay: %s", delay))
-	}
-}
-
-func (s *S) TestPoolLimitMany(c *C) {
-	if *fast {
-		c.Skip("-fast")
-	}
-
-	session, err := mgo.Dial("localhost:40011")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	stats := mgo.GetStats()
-	for stats.MasterConns+stats.SlaveConns != 3 {
-		stats = mgo.GetStats()
-		c.Log("Waiting for all connections to be established...")
-		time.Sleep(500 * time.Millisecond)
-	}
-	c.Assert(stats.SocketsAlive, Equals, 3)
-
-	const poolLimit = 64
-	session.SetPoolLimit(poolLimit)
-
-	// Consume the whole limit for the master.
-	var master []*mgo.Session
-	for i := 0; i < poolLimit; i++ {
-		s := session.Copy()
-		defer s.Close()
-		c.Assert(s.Ping(), IsNil)
-		master = append(master, s)
-	}
-
-	before := time.Now()
-	go func() {
-		time.Sleep(3e9)
-		master[0].Refresh()
-	}()
-
-	// Then, a single ping must block, since it would need another
-	// connection to the master, over the limit. Once the goroutine
-	// above releases its socket, it should move on.
-	session.Ping()
-	delay := time.Now().Sub(before)
-	c.Assert(delay > 3e9, Equals, true)
-	c.Assert(delay < 6e9, Equals, true)
-}
-
-func (s *S) TestSetModeEventualIterBug(c *C) {
-	session1, err := mgo.Dial("localhost:40011")
-	c.Assert(err, IsNil)
-	defer session1.Close()
-
-	session1.SetMode(mgo.Eventual, false)
-
-	coll1 := session1.DB("mydb").C("mycoll")
-
-	const N = 100
-	for i := 0; i < N; i++ {
-		err = coll1.Insert(M{"_id": i})
-		c.Assert(err, IsNil)
-	}
-
-	c.Logf("Waiting until secondary syncs")
-	for {
-		n, err := coll1.Count()
-		c.Assert(err, IsNil)
-		if n == N {
-			c.Logf("Found all")
-			break
-		}
-	}
-
-	session2, err := mgo.Dial("localhost:40011")
-	c.Assert(err, IsNil)
-	defer session2.Close()
-
-	session2.SetMode(mgo.Eventual, false)
-
-	coll2 := session2.DB("mydb").C("mycoll")
-
-	i := 0
-	iter := coll2.Find(nil).Batch(10).Iter()
-	var result struct{}
-	for iter.Next(&result) {
-		i++
-	}
-	c.Assert(iter.Close(), Equals, nil)
-	c.Assert(i, Equals, N)
-}
-
-func (s *S) TestCustomDialOld(c *C) {
-	dials := make(chan bool, 16)
-	dial := func(addr net.Addr) (net.Conn, error) {
-		tcpaddr, ok := addr.(*net.TCPAddr)
-		if !ok {
-			return nil, fmt.Errorf("unexpected address type: %T", addr)
-		}
-		dials <- true
-		return net.DialTCP("tcp", nil, tcpaddr)
-	}
-	info := mgo.DialInfo{
-		Addrs: []string{"localhost:40012"},
-		Dial:  dial,
-	}
-
-	// Use hostname here rather than IP, to make things trickier.
-	session, err := mgo.DialWithInfo(&info)
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	const N = 3
-	for i := 0; i < N; i++ {
-		select {
-		case <-dials:
-		case <-time.After(5 * time.Second):
-			c.Fatalf("expected %d dials, got %d", N, i)
-		}
-	}
-	select {
-	case <-dials:
-		c.Fatalf("got more dials than expected")
-	case <-time.After(100 * time.Millisecond):
-	}
-}
-
-func (s *S) TestCustomDialNew(c *C) {
-	dials := make(chan bool, 16)
-	dial := func(addr *mgo.ServerAddr) (net.Conn, error) {
-		dials <- true
-		if addr.TCPAddr().Port == 40012 {
-			c.Check(addr.String(), Equals, "localhost:40012")
-		}
-		return net.DialTCP("tcp", nil, addr.TCPAddr())
-	}
-	info := mgo.DialInfo{
-		Addrs:      []string{"localhost:40012"},
-		DialServer: dial,
-	}
-
-	// Use hostname here rather than IP, to make things trickier.
-	session, err := mgo.DialWithInfo(&info)
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	const N = 3
-	for i := 0; i < N; i++ {
-		select {
-		case <-dials:
-		case <-time.After(5 * time.Second):
-			c.Fatalf("expected %d dials, got %d", N, i)
-		}
-	}
-	select {
-	case <-dials:
-		c.Fatalf("got more dials than expected")
-	case <-time.After(100 * time.Millisecond):
-	}
-}
-
-func (s *S) TestPrimaryShutdownOnAuthShard(c *C) {
-	if *fast {
-		c.Skip("-fast")
-	}
-
-	// Dial the shard.
-	session, err := mgo.Dial("localhost:40203")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	// Login and insert something to make it more realistic.
-	session.DB("admin").Login("root", "rapadura")
-	coll := session.DB("mydb").C("mycoll")
-	err = coll.Insert(bson.M{"n": 1})
-	c.Assert(err, IsNil)
-
-	// Dial the replica set to figure the master out.
-	rs, err := mgo.Dial("root:rapadura@localhost:40031")
-	c.Assert(err, IsNil)
-	defer rs.Close()
-
-	// With strong consistency, this will open a socket to the master.
-	result := &struct{ Host string }{}
-	err = rs.Run("serverStatus", result)
-	c.Assert(err, IsNil)
-
-	// Kill the master.
-	host := result.Host
-	s.Stop(host)
-
-	// This must fail, since the connection was broken.
-	err = rs.Run("serverStatus", result)
-	c.Assert(err, Equals, io.EOF)
-
-	// This won't work because the master just died.
-	err = coll.Insert(bson.M{"n": 2})
-	c.Assert(err, NotNil)
-
-	// Refresh session and wait for re-election.
-	session.Refresh()
-	for i := 0; i < 60; i++ {
-		err = coll.Insert(bson.M{"n": 3})
-		if err == nil {
-			break
-		}
-		c.Logf("Waiting for replica set to elect a new master. Last error: %v", err)
-		time.Sleep(500 * time.Millisecond)
-	}
-	c.Assert(err, IsNil)
-
-	count, err := coll.Count()
-	c.Assert(count > 1, Equals, true)
-}
-
-func (s *S) TestNearestSecondary(c *C) {
-	defer mgo.HackPingDelay(3 * time.Second)()
-
-	rs1a := "127.0.0.1:40011"
-	rs1b := "127.0.0.1:40012"
-	rs1c := "127.0.0.1:40013"
-	s.Freeze(rs1b)
-
-	session, err := mgo.Dial(rs1a)
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	// Wait for the sync up to run through the first couple of servers.
-	for len(session.LiveServers()) != 2 {
-		c.Log("Waiting for two servers to be alive...")
-		time.Sleep(100 * time.Millisecond)
-	}
-
-	// Extra delay to ensure the third server gets penalized.
-	time.Sleep(500 * time.Millisecond)
-
-	// Release third server.
-	s.Thaw(rs1b)
-
-	// Wait for it to come up.
-	for len(session.LiveServers()) != 3 {
-		c.Log("Waiting for all servers to be alive...")
-		time.Sleep(100 * time.Millisecond)
-	}
-
-	session.SetMode(mgo.Monotonic, true)
-	var result struct{ Host string }
-
-	// See which slave picks the line, several times to avoid chance.
-	for i := 0; i < 10; i++ {
-		session.Refresh()
-		err = session.Run("serverStatus", &result)
-		c.Assert(err, IsNil)
-		c.Assert(hostPort(result.Host), Equals, hostPort(rs1c))
-	}
-
-	if *fast {
-		// Don't hold back for several seconds.
-		return
-	}
-
-	// Now hold the other server for long enough to penalize it.
-	s.Freeze(rs1c)
-	time.Sleep(5 * time.Second)
-	s.Thaw(rs1c)
-
-	// Wait for the ping to be processed.
-	time.Sleep(500 * time.Millisecond)
-
-	// Repeating the test should now pick the former server consistently.
-	for i := 0; i < 10; i++ {
-		session.Refresh()
-		err = session.Run("serverStatus", &result)
-		c.Assert(err, IsNil)
-		c.Assert(hostPort(result.Host), Equals, hostPort(rs1b))
-	}
-}
-
-func (s *S) TestConnectCloseConcurrency(c *C) {
-	restore := mgo.HackPingDelay(500 * time.Millisecond)
-	defer restore()
-	var wg sync.WaitGroup
-	const n = 500
-	wg.Add(n)
-	for i := 0; i < n; i++ {
-		go func() {
-			defer wg.Done()
-			session, err := mgo.Dial("localhost:40001")
-			if err != nil {
-				c.Fatal(err)
-			}
-			time.Sleep(1)
-			session.Close()
-		}()
-	}
-	wg.Wait()
-}
-
-func (s *S) TestSelectServers(c *C) {
-	if !s.versionAtLeast(2, 2) {
-		c.Skip("read preferences introduced in 2.2")
-	}
-
-	session, err := mgo.Dial("localhost:40011")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	session.SetMode(mgo.Eventual, true)
-
-	var result struct{ Host string }
-
-	session.Refresh()
-	session.SelectServers(bson.D{{"rs1", "b"}})
-	err = session.Run("serverStatus", &result)
-	c.Assert(err, IsNil)
-	c.Assert(hostPort(result.Host), Equals, "40012")
-
-	session.Refresh()
-	session.SelectServers(bson.D{{"rs1", "c"}})
-	err = session.Run("serverStatus", &result)
-	c.Assert(err, IsNil)
-	c.Assert(hostPort(result.Host), Equals, "40013")
-}
-
-func (s *S) TestSelectServersWithMongos(c *C) {
-	if !s.versionAtLeast(2, 2) {
-		c.Skip("read preferences introduced in 2.2")
-	}
-
-	session, err := mgo.Dial("localhost:40021")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	ssresult := &struct{ Host string }{}
-	imresult := &struct{ IsMaster bool }{}
-
-	// Figure the master while still using the strong session.
-	err = session.Run("serverStatus", ssresult)
-	c.Assert(err, IsNil)
-	err = session.Run("isMaster", imresult)
-	c.Assert(err, IsNil)
-	master := ssresult.Host
-	c.Assert(imresult.IsMaster, Equals, true, Commentf("%s is not the master", master))
-
-	var slave1, slave2 string
-	switch hostPort(master) {
-	case "40021":
-		slave1, slave2 = "b", "c"
-	case "40022":
-		slave1, slave2 = "a", "c"
-	case "40023":
-		slave1, slave2 = "a", "b"
-	}
-
-	// Collect op counters for everyone.
-	opc21a, err := getOpCounters("localhost:40021")
-	c.Assert(err, IsNil)
-	opc22a, err := getOpCounters("localhost:40022")
-	c.Assert(err, IsNil)
-	opc23a, err := getOpCounters("localhost:40023")
-	c.Assert(err, IsNil)
-
-	// Do a SlaveOk query through MongoS
-	mongos, err := mgo.Dial("localhost:40202")
-	c.Assert(err, IsNil)
-	defer mongos.Close()
-
-	mongos.SetMode(mgo.Monotonic, true)
-
-	mongos.Refresh()
-	mongos.SelectServers(bson.D{{"rs2", slave1}})
-	coll := mongos.DB("mydb").C("mycoll")
-	result := &struct{}{}
-	for i := 0; i != 5; i++ {
-		err := coll.Find(nil).One(result)
-		c.Assert(err, Equals, mgo.ErrNotFound)
-	}
-
-	mongos.Refresh()
-	mongos.SelectServers(bson.D{{"rs2", slave2}})
-	coll = mongos.DB("mydb").C("mycoll")
-	for i := 0; i != 7; i++ {
-		err := coll.Find(nil).One(result)
-		c.Assert(err, Equals, mgo.ErrNotFound)
-	}
-
-	// Collect op counters for everyone again.
-	opc21b, err := getOpCounters("localhost:40021")
-	c.Assert(err, IsNil)
-	opc22b, err := getOpCounters("localhost:40022")
-	c.Assert(err, IsNil)
-	opc23b, err := getOpCounters("localhost:40023")
-	c.Assert(err, IsNil)
-
-	switch hostPort(master) {
-	case "40021":
-		c.Check(opc21b.Query-opc21a.Query, Equals, 0)
-		c.Check(opc22b.Query-opc22a.Query, Equals, 5)
-		c.Check(opc23b.Query-opc23a.Query, Equals, 7)
-	case "40022":
-		c.Check(opc21b.Query-opc21a.Query, Equals, 5)
-		c.Check(opc22b.Query-opc22a.Query, Equals, 0)
-		c.Check(opc23b.Query-opc23a.Query, Equals, 7)
-	case "40023":
-		c.Check(opc21b.Query-opc21a.Query, Equals, 5)
-		c.Check(opc22b.Query-opc22a.Query, Equals, 7)
-		c.Check(opc23b.Query-opc23a.Query, Equals, 0)
-	default:
-		c.Fatal("Uh?")
-	}
-}
diff --git a/Godeps/_workspace/src/gopkg.in/mgo.v2/dbtest/dbserver.go b/Godeps/_workspace/src/gopkg.in/mgo.v2/dbtest/dbserver.go
deleted file mode 100644
index dc9fe9e1d..000000000
--- a/Godeps/_workspace/src/gopkg.in/mgo.v2/dbtest/dbserver.go
+++ /dev/null
@@ -1,196 +0,0 @@
-package dbtest
-
-import (
-	"bytes"
-	"fmt"
-	"net"
-	"os"
-	"os/exec"
-	"strconv"
-	"time"
-
-	"gopkg.in/mgo.v2"
-	"gopkg.in/tomb.v2"
-)
-
-// DBServer controls a MongoDB server process to be used within test suites.
-//
-// The test server is started when Session is called the first time and should
-// remain running for the duration of all tests, with the Wipe method being
-// called between tests (before each of them) to clear stored data. After all tests
-// are done, the Stop method should be called to stop the test server.
-//
-// Before the DBServer is used the SetPath method must be called to define
-// the location for the database files to be stored.
-type DBServer struct {
-	session *mgo.Session
-	output  bytes.Buffer
-	server  *exec.Cmd
-	dbpath  string
-	host    string
-	tomb    tomb.Tomb
-}
-
-// SetPath defines the path to the directory where the database files will be
-// stored if it is started. The directory path itself is not created or removed
-// by the test helper.
-func (dbs *DBServer) SetPath(dbpath string) {
-	dbs.dbpath = dbpath
-}
-
-func (dbs *DBServer) start() {
-	if dbs.server != nil {
-		panic("DBServer already started")
-	}
-	if dbs.dbpath == "" {
-		panic("DBServer.SetPath must be called before using the server")
-	}
-	mgo.SetStats(true)
-	l, err := net.Listen("tcp", "127.0.0.1:0")
-	if err != nil {
-		panic("unable to listen on a local address: " + err.Error())
-	}
-	addr := l.Addr().(*net.TCPAddr)
-	l.Close()
-	dbs.host = addr.String()
-
-	args := []string{
-		"--dbpath", dbs.dbpath,
-		"--bind_ip", "127.0.0.1",
-		"--port", strconv.Itoa(addr.Port),
-		"--nssize", "1",
-		"--noprealloc",
-		"--smallfiles",
-		"--nojournal",
-	}
-	dbs.tomb = tomb.Tomb{}
-	dbs.server = exec.Command("mongod", args...)
-	dbs.server.Stdout = &dbs.output
-	dbs.server.Stderr = &dbs.output
-	err = dbs.server.Start()
-	if err != nil {
-		panic(err)
-	}
-	dbs.tomb.Go(dbs.monitor)
-	dbs.Wipe()
-}
-
-func (dbs *DBServer) monitor() error {
-	dbs.server.Process.Wait()
-	if dbs.tomb.Alive() {
-		// Present some debugging information.
-		fmt.Fprintf(os.Stderr, "---- mongod process died unexpectedly:\n")
-		fmt.Fprintf(os.Stderr, "%s", dbs.output.Bytes())
-		fmt.Fprintf(os.Stderr, "---- mongod processes running right now:\n")
-		cmd := exec.Command("/bin/sh", "-c", "ps auxw | grep mongod")
-		cmd.Stdout = os.Stderr
-		cmd.Stderr = os.Stderr
-		cmd.Run()
-		fmt.Fprintf(os.Stderr, "----------------------------------------\n")
-
-		panic("mongod process died unexpectedly")
-	}
-	return nil
-}
-
-// Stop stops the test server process, if it is running.
-//
-// It's okay to call Stop multiple times. After the test server is
-// stopped it cannot be restarted.
-//
-// All database sessions must be closed before or while the Stop method
-// is running. Otherwise Stop will panic after a timeout informing that
-// there is a session leak.
-func (dbs *DBServer) Stop() {
-	if dbs.session != nil {
-		dbs.checkSessions()
-		if dbs.session != nil {
-			dbs.session.Close()
-			dbs.session = nil
-		}
-	}
-	if dbs.server != nil {
-		dbs.tomb.Kill(nil)
-		dbs.server.Process.Kill()
-		select {
-		case <-dbs.tomb.Dead():
-		case <-time.After(5 * time.Second):
-			panic("timeout waiting for mongod process to die")
-		}
-		dbs.server = nil
-	}
-}
-
-// Session returns a new session to the server. The returned session
-// must be closed after the test is done with it.
-//
-// The first Session obtained from a DBServer will start it.
-func (dbs *DBServer) Session() *mgo.Session {
-	if dbs.server == nil {
-		dbs.start()
-	}
-	if dbs.session == nil {
-		mgo.ResetStats()
-		var err error
-		dbs.session, err = mgo.Dial(dbs.host + "/test")
-		if err != nil {
-			panic(err)
-		}
-	}
-	return dbs.session.Copy()
-}
-
-// checkSessions ensures all mgo sessions opened were properly closed.
-// For slightly faster tests, it may be disabled setting the
-// environmnet variable CHECK_SESSIONS to 0.
-func (dbs *DBServer) checkSessions() {
-	if check := os.Getenv("CHECK_SESSIONS"); check == "0" || dbs.server == nil || dbs.session == nil {
-		return
-	}
-	dbs.session.Close()
-	dbs.session = nil
-	for i := 0; i < 100; i++ {
-		stats := mgo.GetStats()
-		if stats.SocketsInUse == 0 && stats.SocketsAlive == 0 {
-			return
-		}
-		time.Sleep(100 * time.Millisecond)
-	}
-	panic("There are mgo sessions still alive.")
-}
-
-// Wipe drops all created databases and their data.
-//
-// The MongoDB server remains running if it was prevoiusly running,
-// or stopped if it was previously stopped.
-//
-// All database sessions must be closed before or while the Wipe method
-// is running. Otherwise Wipe will panic after a timeout informing that
-// there is a session leak.
-func (dbs *DBServer) Wipe() {
-	if dbs.server == nil || dbs.session == nil {
-		return
-	}
-	dbs.checkSessions()
-	sessionUnset := dbs.session == nil
-	session := dbs.Session()
-	defer session.Close()
-	if sessionUnset {
-		dbs.session.Close()
-		dbs.session = nil
-	}
-	names, err := session.DatabaseNames()
-	if err != nil {
-		panic(err)
-	}
-	for _, name := range names {
-		switch name {
-		case "admin", "local", "config":
-		default:
-			err = session.DB(name).DropDatabase()
-			if err != nil {
-				panic(err)
-			}
-		}
-	}
-}
diff --git a/Godeps/_workspace/src/gopkg.in/mgo.v2/dbtest/dbserver_test.go b/Godeps/_workspace/src/gopkg.in/mgo.v2/dbtest/dbserver_test.go
deleted file mode 100644
index 79812fde3..000000000
--- a/Godeps/_workspace/src/gopkg.in/mgo.v2/dbtest/dbserver_test.go
+++ /dev/null
@@ -1,108 +0,0 @@
-package dbtest_test
-
-import (
-	"os"
-	"testing"
-	"time"
-
-	. "gopkg.in/check.v1"
-
-	"gopkg.in/mgo.v2"
-	"gopkg.in/mgo.v2/dbtest"
-)
-
-type M map[string]interface{}
-
-func TestAll(t *testing.T) {
-	TestingT(t)
-}
-
-type S struct {
-	oldCheckSessions string
-}
-
-var _ = Suite(&S{})
-
-func (s *S) SetUpTest(c *C) {
-	s.oldCheckSessions = os.Getenv("CHECK_SESSIONS")
-	os.Setenv("CHECK_SESSIONS", "")
-}
-
-func (s *S) TearDownTest(c *C) {
-	os.Setenv("CHECK_SESSIONS", s.oldCheckSessions)
-}
-
-func (s *S) TestWipeData(c *C) {
-	var server dbtest.DBServer
-	server.SetPath(c.MkDir())
-	defer server.Stop()
-
-	session := server.Session()
-	err := session.DB("mydb").C("mycoll").Insert(M{"a": 1})
-	session.Close()
-	c.Assert(err, IsNil)
-
-	server.Wipe()
-
-	session = server.Session()
-	names, err := session.DatabaseNames()
-	session.Close()
-	c.Assert(err, IsNil)
-	for _, name := range names {
-		if name != "local" && name != "admin" {
-			c.Fatalf("Wipe should have removed this database: %s", name)
-		}
-	}
-}
-
-func (s *S) TestStop(c *C) {
-	var server dbtest.DBServer
-	server.SetPath(c.MkDir())
-	defer server.Stop()
-
-	// Server should not be running.
-	process := server.ProcessTest()
-	c.Assert(process, IsNil)
-
-	session := server.Session()
-	addr := session.LiveServers()[0]
-	session.Close()
-
-	// Server should be running now.
-	process = server.ProcessTest()
-	p, err := os.FindProcess(process.Pid)
-	c.Assert(err, IsNil)
-	p.Release()
-
-	server.Stop()
-
-	// Server should not be running anymore.
-	session, err = mgo.DialWithTimeout(addr, 500*time.Millisecond)
-	if session != nil {
-		session.Close()
-		c.Fatalf("Stop did not stop the server")
-	}
-}
-
-func (s *S) TestCheckSessions(c *C) {
-	var server dbtest.DBServer
-	server.SetPath(c.MkDir())
-	defer server.Stop()
-
-	session := server.Session()
-	defer session.Close()
-	c.Assert(server.Wipe, PanicMatches, "There are mgo sessions still alive.")
-}
-
-func (s *S) TestCheckSessionsDisabled(c *C) {
-	var server dbtest.DBServer
-	server.SetPath(c.MkDir())
-	defer server.Stop()
-
-	os.Setenv("CHECK_SESSIONS", "0")
-
-	// Should not panic, although it looks to Wipe like this session will leak.
-	session := server.Session()
-	defer session.Close()
-	server.Wipe()
-}
diff --git a/Godeps/_workspace/src/gopkg.in/mgo.v2/dbtest/export_test.go b/Godeps/_workspace/src/gopkg.in/mgo.v2/dbtest/export_test.go
deleted file mode 100644
index 65f1cb023..000000000
--- a/Godeps/_workspace/src/gopkg.in/mgo.v2/dbtest/export_test.go
+++ /dev/null
@@ -1,12 +0,0 @@
-package dbtest
-
-import (
-	"os"
-)
-
-func (dbs *DBServer) ProcessTest() *os.Process {
-	if dbs.server == nil {
-		return nil
-	}
-	return dbs.server.Process
-}
diff --git a/Godeps/_workspace/src/gopkg.in/mgo.v2/doc.go b/Godeps/_workspace/src/gopkg.in/mgo.v2/doc.go
deleted file mode 100644
index 9316c5554..000000000
--- a/Godeps/_workspace/src/gopkg.in/mgo.v2/doc.go
+++ /dev/null
@@ -1,31 +0,0 @@
-// Package mgo offers a rich MongoDB driver for Go.
-//
-// Details about the mgo project (pronounced as "mango") are found
-// in its web page:
-//
-//     http://labix.org/mgo
-//
-// Usage of the driver revolves around the concept of sessions.  To
-// get started, obtain a session using the Dial function:
-//
-//     session, err := mgo.Dial(url)
-//
-// This will establish one or more connections with the cluster of
-// servers defined by the url parameter.  From then on, the cluster
-// may be queried with multiple consistency rules (see SetMode) and
-// documents retrieved with statements such as:
-//
-//     c := session.DB(database).C(collection)
-//     err := c.Find(query).One(&result)
-//
-// New sessions are typically created by calling session.Copy on the
-// initial session obtained at dial time. These new sessions will share
-// the same cluster information and connection cache, and may be easily
-// handed into other methods and functions for organizing logic.
-// Every session created must have its Close method called at the end
-// of its life time, so its resources may be put back in the pool or
-// collected, depending on the case.
-//
-// For more details, see the documentation for the types and methods.
-//
-package mgo
diff --git a/Godeps/_workspace/src/gopkg.in/mgo.v2/export_test.go b/Godeps/_workspace/src/gopkg.in/mgo.v2/export_test.go
deleted file mode 100644
index 690f84d38..000000000
--- a/Godeps/_workspace/src/gopkg.in/mgo.v2/export_test.go
+++ /dev/null
@@ -1,33 +0,0 @@
-package mgo
-
-import (
-	"time"
-)
-
-func HackPingDelay(newDelay time.Duration) (restore func()) {
-	globalMutex.Lock()
-	defer globalMutex.Unlock()
-
-	oldDelay := pingDelay
-	restore = func() {
-		globalMutex.Lock()
-		pingDelay = oldDelay
-		globalMutex.Unlock()
-	}
-	pingDelay = newDelay
-	return
-}
-
-func HackSyncSocketTimeout(newTimeout time.Duration) (restore func()) {
-	globalMutex.Lock()
-	defer globalMutex.Unlock()
-
-	oldTimeout := syncSocketTimeout
-	restore = func() {
-		globalMutex.Lock()
-		syncSocketTimeout = oldTimeout
-		globalMutex.Unlock()
-	}
-	syncSocketTimeout = newTimeout
-	return
-}
diff --git a/Godeps/_workspace/src/gopkg.in/mgo.v2/gridfs.go b/Godeps/_workspace/src/gopkg.in/mgo.v2/gridfs.go
deleted file mode 100644
index 54b3dd50e..000000000
--- a/Godeps/_workspace/src/gopkg.in/mgo.v2/gridfs.go
+++ /dev/null
@@ -1,755 +0,0 @@
-// mgo - MongoDB driver for Go
-//
-// Copyright (c) 2010-2012 - Gustavo Niemeyer <gustavo@niemeyer.net>
-//
-// 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 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.
-
-package mgo
-
-import (
-	"crypto/md5"
-	"encoding/hex"
-	"errors"
-	"hash"
-	"io"
-	"os"
-	"sync"
-	"time"
-
-	"gopkg.in/mgo.v2/bson"
-)
-
-type GridFS struct {
-	Files  *Collection
-	Chunks *Collection
-}
-
-type gfsFileMode int
-
-const (
-	gfsClosed  gfsFileMode = 0
-	gfsReading gfsFileMode = 1
-	gfsWriting gfsFileMode = 2
-)
-
-type GridFile struct {
-	m    sync.Mutex
-	c    sync.Cond
-	gfs  *GridFS
-	mode gfsFileMode
-	err  error
-
-	chunk  int
-	offset int64
-
-	wpending int
-	wbuf     []byte
-	wsum     hash.Hash
-
-	rbuf   []byte
-	rcache *gfsCachedChunk
-
-	doc gfsFile
-}
-
-type gfsFile struct {
-	Id          interface{} "_id"
-	ChunkSize   int         "chunkSize"
-	UploadDate  time.Time   "uploadDate"
-	Length      int64       ",minsize"
-	MD5         string
-	Filename    string    ",omitempty"
-	ContentType string    "contentType,omitempty"
-	Metadata    *bson.Raw ",omitempty"
-}
-
-type gfsChunk struct {
-	Id      interface{} "_id"
-	FilesId interface{} "files_id"
-	N       int
-	Data    []byte
-}
-
-type gfsCachedChunk struct {
-	wait sync.Mutex
-	n    int
-	data []byte
-	err  error
-}
-
-func newGridFS(db *Database, prefix string) *GridFS {
-	return &GridFS{db.C(prefix + ".files"), db.C(prefix + ".chunks")}
-}
-
-func (gfs *GridFS) newFile() *GridFile {
-	file := &GridFile{gfs: gfs}
-	file.c.L = &file.m
-	//runtime.SetFinalizer(file, finalizeFile)
-	return file
-}
-
-func finalizeFile(file *GridFile) {
-	file.Close()
-}
-
-// Create creates a new file with the provided name in the GridFS.  If the file
-// name already exists, a new version will be inserted with an up-to-date
-// uploadDate that will cause it to be atomically visible to the Open and
-// OpenId methods.  If the file name is not important, an empty name may be
-// provided and the file Id used instead.
-//
-// It's important to Close files whether they are being written to
-// or read from, and to check the err result to ensure the operation
-// completed successfully.
-//
-// A simple example inserting a new file:
-//
-//     func check(err error) {
-//         if err != nil {
-//             panic(err.String())
-//         }
-//     }
-//     file, err := db.GridFS("fs").Create("myfile.txt")
-//     check(err)
-//     n, err := file.Write([]byte("Hello world!"))
-//     check(err)
-//     err = file.Close()
-//     check(err)
-//     fmt.Printf("%d bytes written\n", n)
-//
-// The io.Writer interface is implemented by *GridFile and may be used to
-// help on the file creation.  For example:
-//
-//     file, err := db.GridFS("fs").Create("myfile.txt")
-//     check(err)
-//     messages, err := os.Open("/var/log/messages")
-//     check(err)
-//     defer messages.Close()
-//     err = io.Copy(file, messages)
-//     check(err)
-//     err = file.Close()
-//     check(err)
-//
-func (gfs *GridFS) Create(name string) (file *GridFile, err error) {
-	file = gfs.newFile()
-	file.mode = gfsWriting
-	file.wsum = md5.New()
-	file.doc = gfsFile{Id: bson.NewObjectId(), ChunkSize: 255 * 1024, Filename: name}
-	return
-}
-
-// OpenId returns the file with the provided id, for reading.
-// If the file isn't found, err will be set to mgo.ErrNotFound.
-//
-// It's important to Close files whether they are being written to
-// or read from, and to check the err result to ensure the operation
-// completed successfully.
-//
-// The following example will print the first 8192 bytes from the file:
-//
-//     func check(err error) {
-//         if err != nil {
-//             panic(err.String())
-//         }
-//     }
-//     file, err := db.GridFS("fs").OpenId(objid)
-//     check(err)
-//     b := make([]byte, 8192)
-//     n, err := file.Read(b)
-//     check(err)
-//     fmt.Println(string(b))
-//     check(err)
-//     err = file.Close()
-//     check(err)
-//     fmt.Printf("%d bytes read\n", n)
-//
-// The io.Reader interface is implemented by *GridFile and may be used to
-// deal with it.  As an example, the following snippet will dump the whole
-// file into the standard output:
-//
-//     file, err := db.GridFS("fs").OpenId(objid)
-//     check(err)
-//     err = io.Copy(os.Stdout, file)
-//     check(err)
-//     err = file.Close()
-//     check(err)
-//
-func (gfs *GridFS) OpenId(id interface{}) (file *GridFile, err error) {
-	var doc gfsFile
-	err = gfs.Files.Find(bson.M{"_id": id}).One(&doc)
-	if err != nil {
-		return
-	}
-	file = gfs.newFile()
-	file.mode = gfsReading
-	file.doc = doc
-	return
-}
-
-// Open returns the most recently uploaded file with the provided
-// name, for reading. If the file isn't found, err will be set
-// to mgo.ErrNotFound.
-//
-// It's important to Close files whether they are being written to
-// or read from, and to check the err result to ensure the operation
-// completed successfully.
-//
-// The following example will print the first 8192 bytes from the file:
-//
-//     file, err := db.GridFS("fs").Open("myfile.txt")
-//     check(err)
-//     b := make([]byte, 8192)
-//     n, err := file.Read(b)
-//     check(err)
-//     fmt.Println(string(b))
-//     check(err)
-//     err = file.Close()
-//     check(err)
-//     fmt.Printf("%d bytes read\n", n)
-//
-// The io.Reader interface is implemented by *GridFile and may be used to
-// deal with it.  As an example, the following snippet will dump the whole
-// file into the standard output:
-//
-//     file, err := db.GridFS("fs").Open("myfile.txt")
-//     check(err)
-//     err = io.Copy(os.Stdout, file)
-//     check(err)
-//     err = file.Close()
-//     check(err)
-//
-func (gfs *GridFS) Open(name string) (file *GridFile, err error) {
-	var doc gfsFile
-	err = gfs.Files.Find(bson.M{"filename": name}).Sort("-uploadDate").One(&doc)
-	if err != nil {
-		return
-	}
-	file = gfs.newFile()
-	file.mode = gfsReading
-	file.doc = doc
-	return
-}
-
-// OpenNext opens the next file from iter for reading, sets *file to it,
-// and returns true on the success case. If no more documents are available
-// on iter or an error occurred, *file is set to nil and the result is false.
-// Errors will be available via iter.Err().
-//
-// The iter parameter must be an iterator on the GridFS files collection.
-// Using the GridFS.Find method is an easy way to obtain such an iterator,
-// but any iterator on the collection will work.
-//
-// If the provided *file is non-nil, OpenNext will close it before attempting
-// to iterate to the next element. This means that in a loop one only
-// has to worry about closing files when breaking out of the loop early
-// (break, return, or panic).
-//
-// For example:
-//
-//     gfs := db.GridFS("fs")
-//     query := gfs.Find(nil).Sort("filename")
-//     iter := query.Iter()
-//     var f *mgo.GridFile
-//     for gfs.OpenNext(iter, &f) {
-//         fmt.Printf("Filename: %s\n", f.Name())
-//     }
-//     if iter.Close() != nil {
-//         panic(iter.Close())
-//     }
-//
-func (gfs *GridFS) OpenNext(iter *Iter, file **GridFile) bool {
-	if *file != nil {
-		// Ignoring the error here shouldn't be a big deal
-		// as we're reading the file and the loop iteration
-		// for this file is finished.
-		_ = (*file).Close()
-	}
-	var doc gfsFile
-	if !iter.Next(&doc) {
-		*file = nil
-		return false
-	}
-	f := gfs.newFile()
-	f.mode = gfsReading
-	f.doc = doc
-	*file = f
-	return true
-}
-
-// Find runs query on GridFS's files collection and returns
-// the resulting Query.
-//
-// This logic:
-//
-//     gfs := db.GridFS("fs")
-//     iter := gfs.Find(nil).Iter()
-//
-// Is equivalent to:
-//
-//     files := db.C("fs" + ".files")
-//     iter := files.Find(nil).Iter()
-//
-func (gfs *GridFS) Find(query interface{}) *Query {
-	return gfs.Files.Find(query)
-}
-
-// RemoveId deletes the file with the provided id from the GridFS.
-func (gfs *GridFS) RemoveId(id interface{}) error {
-	err := gfs.Files.Remove(bson.M{"_id": id})
-	if err != nil {
-		return err
-	}
-	_, err = gfs.Chunks.RemoveAll(bson.D{{"files_id", id}})
-	return err
-}
-
-type gfsDocId struct {
-	Id interface{} "_id"
-}
-
-// Remove deletes all files with the provided name from the GridFS.
-func (gfs *GridFS) Remove(name string) (err error) {
-	iter := gfs.Files.Find(bson.M{"filename": name}).Select(bson.M{"_id": 1}).Iter()
-	var doc gfsDocId
-	for iter.Next(&doc) {
-		if e := gfs.RemoveId(doc.Id); e != nil {
-			err = e
-		}
-	}
-	if err == nil {
-		err = iter.Close()
-	}
-	return err
-}
-
-func (file *GridFile) assertMode(mode gfsFileMode) {
-	switch file.mode {
-	case mode:
-		return
-	case gfsWriting:
-		panic("GridFile is open for writing")
-	case gfsReading:
-		panic("GridFile is open for reading")
-	case gfsClosed:
-		panic("GridFile is closed")
-	default:
-		panic("internal error: missing GridFile mode")
-	}
-}
-
-// SetChunkSize sets size of saved chunks.  Once the file is written to, it
-// will be split in blocks of that size and each block saved into an
-// independent chunk document.  The default chunk size is 256kb.
-//
-// It is a runtime error to call this function once the file has started
-// being written to.
-func (file *GridFile) SetChunkSize(bytes int) {
-	file.assertMode(gfsWriting)
-	debugf("GridFile %p: setting chunk size to %d", file, bytes)
-	file.m.Lock()
-	file.doc.ChunkSize = bytes
-	file.m.Unlock()
-}
-
-// Id returns the current file Id.
-func (file *GridFile) Id() interface{} {
-	return file.doc.Id
-}
-
-// SetId changes the current file Id.
-//
-// It is a runtime error to call this function once the file has started
-// being written to, or when the file is not open for writing.
-func (file *GridFile) SetId(id interface{}) {
-	file.assertMode(gfsWriting)
-	file.m.Lock()
-	file.doc.Id = id
-	file.m.Unlock()
-}
-
-// Name returns the optional file name.  An empty string will be returned
-// in case it is unset.
-func (file *GridFile) Name() string {
-	return file.doc.Filename
-}
-
-// SetName changes the optional file name.  An empty string may be used to
-// unset it.
-//
-// It is a runtime error to call this function when the file is not open
-// for writing.
-func (file *GridFile) SetName(name string) {
-	file.assertMode(gfsWriting)
-	file.m.Lock()
-	file.doc.Filename = name
-	file.m.Unlock()
-}
-
-// ContentType returns the optional file content type.  An empty string will be
-// returned in case it is unset.
-func (file *GridFile) ContentType() string {
-	return file.doc.ContentType
-}
-
-// ContentType changes the optional file content type.  An empty string may be
-// used to unset it.
-//
-// It is a runtime error to call this function when the file is not open
-// for writing.
-func (file *GridFile) SetContentType(ctype string) {
-	file.assertMode(gfsWriting)
-	file.m.Lock()
-	file.doc.ContentType = ctype
-	file.m.Unlock()
-}
-
-// GetMeta unmarshals the optional "metadata" field associated with the
-// file into the result parameter. The meaning of keys under that field
-// is user-defined. For example:
-//
-//     result := struct{ INode int }{}
-//     err = file.GetMeta(&result)
-//     if err != nil {
-//         panic(err.String())
-//     }
-//     fmt.Printf("inode: %d\n", result.INode)
-//
-func (file *GridFile) GetMeta(result interface{}) (err error) {
-	file.m.Lock()
-	if file.doc.Metadata != nil {
-		err = bson.Unmarshal(file.doc.Metadata.Data, result)
-	}
-	file.m.Unlock()
-	return
-}
-
-// SetMeta changes the optional "metadata" field associated with the
-// file. The meaning of keys under that field is user-defined.
-// For example:
-//
-//     file.SetMeta(bson.M{"inode": inode})
-//
-// It is a runtime error to call this function when the file is not open
-// for writing.
-func (file *GridFile) SetMeta(metadata interface{}) {
-	file.assertMode(gfsWriting)
-	data, err := bson.Marshal(metadata)
-	file.m.Lock()
-	if err != nil && file.err == nil {
-		file.err = err
-	} else {
-		file.doc.Metadata = &bson.Raw{Data: data}
-	}
-	file.m.Unlock()
-}
-
-// Size returns the file size in bytes.
-func (file *GridFile) Size() (bytes int64) {
-	file.m.Lock()
-	bytes = file.doc.Length
-	file.m.Unlock()
-	return
-}
-
-// MD5 returns the file MD5 as a hex-encoded string.
-func (file *GridFile) MD5() (md5 string) {
-	return file.doc.MD5
-}
-
-// UploadDate returns the file upload time.
-func (file *GridFile) UploadDate() time.Time {
-	return file.doc.UploadDate
-}
-
-// SetUploadDate changes the file upload time.
-//
-// It is a runtime error to call this function when the file is not open
-// for writing.
-func (file *GridFile) SetUploadDate(t time.Time) {
-	file.assertMode(gfsWriting)
-	file.m.Lock()
-	file.doc.UploadDate = t
-	file.m.Unlock()
-}
-
-// Close flushes any pending changes in case the file is being written
-// to, waits for any background operations to finish, and closes the file.
-//
-// It's important to Close files whether they are being written to
-// or read from, and to check the err result to ensure the operation
-// completed successfully.
-func (file *GridFile) Close() (err error) {
-	file.m.Lock()
-	defer file.m.Unlock()
-	if file.mode == gfsWriting {
-		if len(file.wbuf) > 0 && file.err == nil {
-			file.insertChunk(file.wbuf)
-			file.wbuf = file.wbuf[0:0]
-		}
-		file.completeWrite()
-	} else if file.mode == gfsReading && file.rcache != nil {
-		file.rcache.wait.Lock()
-		file.rcache = nil
-	}
-	file.mode = gfsClosed
-	debugf("GridFile %p: closed", file)
-	return file.err
-}
-
-func (file *GridFile) completeWrite() {
-	for file.wpending > 0 {
-		debugf("GridFile %p: waiting for %d pending chunks to complete file write", file, file.wpending)
-		file.c.Wait()
-	}
-	if file.err == nil {
-		hexsum := hex.EncodeToString(file.wsum.Sum(nil))
-		if file.doc.UploadDate.IsZero() {
-			file.doc.UploadDate = bson.Now()
-		}
-		file.doc.MD5 = hexsum
-		file.err = file.gfs.Files.Insert(file.doc)
-		file.gfs.Chunks.EnsureIndexKey("files_id", "n")
-	}
-	if file.err != nil {
-		file.gfs.Chunks.RemoveAll(bson.D{{"files_id", file.doc.Id}})
-	}
-}
-
-// Abort cancels an in-progress write, preventing the file from being
-// automically created and ensuring previously written chunks are
-// removed when the file is closed.
-//
-// It is a runtime error to call Abort when the file was not opened
-// for writing.
-func (file *GridFile) Abort() {
-	if file.mode != gfsWriting {
-		panic("file.Abort must be called on file opened for writing")
-	}
-	file.err = errors.New("write aborted")
-}
-
-// Write writes the provided data to the file and returns the
-// number of bytes written and an error in case something
-// wrong happened.
-//
-// The file will internally cache the data so that all but the last
-// chunk sent to the database have the size defined by SetChunkSize.
-// This also means that errors may be deferred until a future call
-// to Write or Close.
-//
-// The parameters and behavior of this function turn the file
-// into an io.Writer.
-func (file *GridFile) Write(data []byte) (n int, err error) {
-	file.assertMode(gfsWriting)
-	file.m.Lock()
-	debugf("GridFile %p: writing %d bytes", file, len(data))
-	defer file.m.Unlock()
-
-	if file.err != nil {
-		return 0, file.err
-	}
-
-	n = len(data)
-	file.doc.Length += int64(n)
-	chunkSize := file.doc.ChunkSize
-
-	if len(file.wbuf)+len(data) < chunkSize {
-		file.wbuf = append(file.wbuf, data...)
-		return
-	}
-
-	// First, flush file.wbuf complementing with data.
-	if len(file.wbuf) > 0 {
-		missing := chunkSize - len(file.wbuf)
-		if missing > len(data) {
-			missing = len(data)
-		}
-		file.wbuf = append(file.wbuf, data[:missing]...)
-		data = data[missing:]
-		file.insertChunk(file.wbuf)
-		file.wbuf = file.wbuf[0:0]
-	}
-
-	// Then, flush all chunks from data without copying.
-	for len(data) > chunkSize {
-		size := chunkSize
-		if size > len(data) {
-			size = len(data)
-		}
-		file.insertChunk(data[:size])
-		data = data[size:]
-	}
-
-	// And append the rest for a future call.
-	file.wbuf = append(file.wbuf, data...)
-
-	return n, file.err
-}
-
-func (file *GridFile) insertChunk(data []byte) {
-	n := file.chunk
-	file.chunk++
-	debugf("GridFile %p: adding to checksum: %q", file, string(data))
-	file.wsum.Write(data)
-
-	for file.doc.ChunkSize*file.wpending >= 1024*1024 {
-		// Hold on.. we got a MB pending.
-		file.c.Wait()
-		if file.err != nil {
-			return
-		}
-	}
-
-	file.wpending++
-
-	debugf("GridFile %p: inserting chunk %d with %d bytes", file, n, len(data))
-
-	// We may not own the memory of data, so rather than
-	// simply copying it, we'll marshal the document ahead of time.
-	data, err := bson.Marshal(gfsChunk{bson.NewObjectId(), file.doc.Id, n, data})
-	if err != nil {
-		file.err = err
-		return
-	}
-
-	go func() {
-		err := file.gfs.Chunks.Insert(bson.Raw{Data: data})
-		file.m.Lock()
-		file.wpending--
-		if err != nil && file.err == nil {
-			file.err = err
-		}
-		file.c.Broadcast()
-		file.m.Unlock()
-	}()
-}
-
-// Seek sets the offset for the next Read or Write on file to
-// offset, interpreted according to whence: 0 means relative to
-// the origin of the file, 1 means relative to the current offset,
-// and 2 means relative to the end. It returns the new offset and
-// an error, if any.
-func (file *GridFile) Seek(offset int64, whence int) (pos int64, err error) {
-	file.m.Lock()
-	debugf("GridFile %p: seeking for %s (whence=%d)", file, offset, whence)
-	defer file.m.Unlock()
-	switch whence {
-	case os.SEEK_SET:
-	case os.SEEK_CUR:
-		offset += file.offset
-	case os.SEEK_END:
-		offset += file.doc.Length
-	default:
-		panic("unsupported whence value")
-	}
-	if offset > file.doc.Length {
-		return file.offset, errors.New("seek past end of file")
-	}
-	if offset == file.doc.Length {
-		// If we're seeking to the end of the file,
-		// no need to read anything. This enables
-		// a client to find the size of the file using only the
-		// io.ReadSeeker interface with low overhead.
-		file.offset = offset
-		return file.offset, nil
-	}
-	chunk := int(offset / int64(file.doc.ChunkSize))
-	if chunk+1 == file.chunk && offset >= file.offset {
-		file.rbuf = file.rbuf[int(offset-file.offset):]
-		file.offset = offset
-		return file.offset, nil
-	}
-	file.offset = offset
-	file.chunk = chunk
-	file.rbuf = nil
-	file.rbuf, err = file.getChunk()
-	if err == nil {
-		file.rbuf = file.rbuf[int(file.offset-int64(chunk)*int64(file.doc.ChunkSize)):]
-	}
-	return file.offset, err
-}
-
-// Read reads into b the next available data from the file and
-// returns the number of bytes written and an error in case
-// something wrong happened.  At the end of the file, n will
-// be zero and err will be set to os.EOF.
-//
-// The parameters and behavior of this function turn the file
-// into an io.Reader.
-func (file *GridFile) Read(b []byte) (n int, err error) {
-	file.assertMode(gfsReading)
-	file.m.Lock()
-	debugf("GridFile %p: reading at offset %d into buffer of length %d", file, file.offset, len(b))
-	defer file.m.Unlock()
-	if file.offset == file.doc.Length {
-		return 0, io.EOF
-	}
-	for err == nil {
-		i := copy(b, file.rbuf)
-		n += i
-		file.offset += int64(i)
-		file.rbuf = file.rbuf[i:]
-		if i == len(b) || file.offset == file.doc.Length {
-			break
-		}
-		b = b[i:]
-		file.rbuf, err = file.getChunk()
-	}
-	return n, err
-}
-
-func (file *GridFile) getChunk() (data []byte, err error) {
-	cache := file.rcache
-	file.rcache = nil
-	if cache != nil && cache.n == file.chunk {
-		debugf("GridFile %p: Getting chunk %d from cache", file, file.chunk)
-		cache.wait.Lock()
-		data, err = cache.data, cache.err
-	} else {
-		debugf("GridFile %p: Fetching chunk %d", file, file.chunk)
-		var doc gfsChunk
-		err = file.gfs.Chunks.Find(bson.D{{"files_id", file.doc.Id}, {"n", file.chunk}}).One(&doc)
-		data = doc.Data
-	}
-	file.chunk++
-	if int64(file.chunk)*int64(file.doc.ChunkSize) < file.doc.Length {
-		// Read the next one in background.
-		cache = &gfsCachedChunk{n: file.chunk}
-		cache.wait.Lock()
-		debugf("GridFile %p: Scheduling chunk %d for background caching", file, file.chunk)
-		// Clone the session to avoid having it closed in between.
-		chunks := file.gfs.Chunks
-		session := chunks.Database.Session.Clone()
-		go func(id interface{}, n int) {
-			defer session.Close()
-			chunks = chunks.With(session)
-			var doc gfsChunk
-			cache.err = chunks.Find(bson.D{{"files_id", id}, {"n", n}}).One(&doc)
-			cache.data = doc.Data
-			cache.wait.Unlock()
-		}(file.doc.Id, file.chunk)
-		file.rcache = cache
-	}
-	debugf("Returning err: %#v", err)
-	return
-}
diff --git a/Godeps/_workspace/src/gopkg.in/mgo.v2/gridfs_test.go b/Godeps/_workspace/src/gopkg.in/mgo.v2/gridfs_test.go
deleted file mode 100644
index 5a6ed5559..000000000
--- a/Godeps/_workspace/src/gopkg.in/mgo.v2/gridfs_test.go
+++ /dev/null
@@ -1,708 +0,0 @@
-// mgo - MongoDB driver for Go
-//
-// Copyright (c) 2010-2012 - Gustavo Niemeyer <gustavo@niemeyer.net>
-//
-// 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 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.
-
-package mgo_test
-
-import (
-	"io"
-	"os"
-	"time"
-
-	. "gopkg.in/check.v1"
-	"gopkg.in/mgo.v2"
-	"gopkg.in/mgo.v2/bson"
-)
-
-func (s *S) TestGridFSCreate(c *C) {
-	session, err := mgo.Dial("localhost:40011")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	db := session.DB("mydb")
-
-	before := bson.Now()
-
-	gfs := db.GridFS("fs")
-	file, err := gfs.Create("")
-	c.Assert(err, IsNil)
-
-	n, err := file.Write([]byte("some data"))
-	c.Assert(err, IsNil)
-	c.Assert(n, Equals, 9)
-
-	err = file.Close()
-	c.Assert(err, IsNil)
-
-	after := bson.Now()
-
-	// Check the file information.
-	result := M{}
-	err = db.C("fs.files").Find(nil).One(result)
-	c.Assert(err, IsNil)
-
-	fileId, ok := result["_id"].(bson.ObjectId)
-	c.Assert(ok, Equals, true)
-	c.Assert(fileId.Valid(), Equals, true)
-	result["_id"] = "<id>"
-
-	ud, ok := result["uploadDate"].(time.Time)
-	c.Assert(ok, Equals, true)
-	c.Assert(ud.After(before) && ud.Before(after), Equals, true)
-	result["uploadDate"] = "<timestamp>"
-
-	expected := M{
-		"_id":        "<id>",
-		"length":     9,
-		"chunkSize":  255 * 1024,
-		"uploadDate": "<timestamp>",
-		"md5":        "1e50210a0202497fb79bc38b6ade6c34",
-	}
-	c.Assert(result, DeepEquals, expected)
-
-	// Check the chunk.
-	result = M{}
-	err = db.C("fs.chunks").Find(nil).One(result)
-	c.Assert(err, IsNil)
-
-	chunkId, ok := result["_id"].(bson.ObjectId)
-	c.Assert(ok, Equals, true)
-	c.Assert(chunkId.Valid(), Equals, true)
-	result["_id"] = "<id>"
-
-	expected = M{
-		"_id":      "<id>",
-		"files_id": fileId,
-		"n":        0,
-		"data":     []byte("some data"),
-	}
-	c.Assert(result, DeepEquals, expected)
-
-	// Check that an index was created.
-	indexes, err := db.C("fs.chunks").Indexes()
-	c.Assert(err, IsNil)
-	c.Assert(len(indexes), Equals, 2)
-	c.Assert(indexes[1].Key, DeepEquals, []string{"files_id", "n"})
-}
-
-func (s *S) TestGridFSFileDetails(c *C) {
-	session, err := mgo.Dial("localhost:40011")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	db := session.DB("mydb")
-
-	gfs := db.GridFS("fs")
-
-	file, err := gfs.Create("myfile1.txt")
-	c.Assert(err, IsNil)
-
-	n, err := file.Write([]byte("some"))
-	c.Assert(err, IsNil)
-	c.Assert(n, Equals, 4)
-
-	c.Assert(file.Size(), Equals, int64(4))
-
-	n, err = file.Write([]byte(" data"))
-	c.Assert(err, IsNil)
-	c.Assert(n, Equals, 5)
-
-	c.Assert(file.Size(), Equals, int64(9))
-
-	id, _ := file.Id().(bson.ObjectId)
-	c.Assert(id.Valid(), Equals, true)
-	c.Assert(file.Name(), Equals, "myfile1.txt")
-	c.Assert(file.ContentType(), Equals, "")
-
-	var info interface{}
-	err = file.GetMeta(&info)
-	c.Assert(err, IsNil)
-	c.Assert(info, IsNil)
-
-	file.SetId("myid")
-	file.SetName("myfile2.txt")
-	file.SetContentType("text/plain")
-	file.SetMeta(M{"any": "thing"})
-
-	c.Assert(file.Id(), Equals, "myid")
-	c.Assert(file.Name(), Equals, "myfile2.txt")
-	c.Assert(file.ContentType(), Equals, "text/plain")
-
-	err = file.GetMeta(&info)
-	c.Assert(err, IsNil)
-	c.Assert(info, DeepEquals, bson.M{"any": "thing"})
-
-	err = file.Close()
-	c.Assert(err, IsNil)
-
-	c.Assert(file.MD5(), Equals, "1e50210a0202497fb79bc38b6ade6c34")
-
-	ud := file.UploadDate()
-	now := time.Now()
-	c.Assert(ud.Before(now), Equals, true)
-	c.Assert(ud.After(now.Add(-3*time.Second)), Equals, true)
-
-	result := M{}
-	err = db.C("fs.files").Find(nil).One(result)
-	c.Assert(err, IsNil)
-
-	result["uploadDate"] = "<timestamp>"
-
-	expected := M{
-		"_id":         "myid",
-		"length":      9,
-		"chunkSize":   255 * 1024,
-		"uploadDate":  "<timestamp>",
-		"md5":         "1e50210a0202497fb79bc38b6ade6c34",
-		"filename":    "myfile2.txt",
-		"contentType": "text/plain",
-		"metadata":    M{"any": "thing"},
-	}
-	c.Assert(result, DeepEquals, expected)
-}
-
-func (s *S) TestGridFSSetUploadDate(c *C) {
-	session, err := mgo.Dial("localhost:40011")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	db := session.DB("mydb")
-
-	gfs := db.GridFS("fs")
-	file, err := gfs.Create("")
-	c.Assert(err, IsNil)
-
-	t := time.Date(2014, 1, 1, 1, 1, 1, 0, time.Local)
-	file.SetUploadDate(t)
-
-	err = file.Close()
-	c.Assert(err, IsNil)
-
-	// Check the file information.
-	result := M{}
-	err = db.C("fs.files").Find(nil).One(result)
-	c.Assert(err, IsNil)
-
-	ud := result["uploadDate"].(time.Time)
-	if !ud.Equal(t) {
-		c.Fatalf("want upload date %s, got %s", t, ud)
-	}
-}
-
-func (s *S) TestGridFSCreateWithChunking(c *C) {
-	session, err := mgo.Dial("localhost:40011")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	db := session.DB("mydb")
-
-	gfs := db.GridFS("fs")
-
-	file, err := gfs.Create("")
-	c.Assert(err, IsNil)
-
-	file.SetChunkSize(5)
-
-	// Smaller than the chunk size.
-	n, err := file.Write([]byte("abc"))
-	c.Assert(err, IsNil)
-	c.Assert(n, Equals, 3)
-
-	// Boundary in the middle.
-	n, err = file.Write([]byte("defg"))
-	c.Assert(err, IsNil)
-	c.Assert(n, Equals, 4)
-
-	// Boundary at the end.
-	n, err = file.Write([]byte("hij"))
-	c.Assert(err, IsNil)
-	c.Assert(n, Equals, 3)
-
-	// Larger than the chunk size, with 3 chunks.
-	n, err = file.Write([]byte("klmnopqrstuv"))
-	c.Assert(err, IsNil)
-	c.Assert(n, Equals, 12)
-
-	err = file.Close()
-	c.Assert(err, IsNil)
-
-	// Check the file information.
-	result := M{}
-	err = db.C("fs.files").Find(nil).One(result)
-	c.Assert(err, IsNil)
-
-	fileId, _ := result["_id"].(bson.ObjectId)
-	c.Assert(fileId.Valid(), Equals, true)
-	result["_id"] = "<id>"
-	result["uploadDate"] = "<timestamp>"
-
-	expected := M{
-		"_id":        "<id>",
-		"length":     22,
-		"chunkSize":  5,
-		"uploadDate": "<timestamp>",
-		"md5":        "44a66044834cbe55040089cabfc102d5",
-	}
-	c.Assert(result, DeepEquals, expected)
-
-	// Check the chunks.
-	iter := db.C("fs.chunks").Find(nil).Sort("n").Iter()
-	dataChunks := []string{"abcde", "fghij", "klmno", "pqrst", "uv"}
-	for i := 0; ; i++ {
-		result = M{}
-		if !iter.Next(result) {
-			if i != 5 {
-				c.Fatalf("Expected 5 chunks, got %d", i)
-			}
-			break
-		}
-		c.Assert(iter.Close(), IsNil)
-
-		result["_id"] = "<id>"
-
-		expected = M{
-			"_id":      "<id>",
-			"files_id": fileId,
-			"n":        i,
-			"data":     []byte(dataChunks[i]),
-		}
-		c.Assert(result, DeepEquals, expected)
-	}
-}
-
-func (s *S) TestGridFSAbort(c *C) {
-	session, err := mgo.Dial("localhost:40011")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	db := session.DB("mydb")
-
-	gfs := db.GridFS("fs")
-	file, err := gfs.Create("")
-	c.Assert(err, IsNil)
-
-	file.SetChunkSize(5)
-
-	n, err := file.Write([]byte("some data"))
-	c.Assert(err, IsNil)
-	c.Assert(n, Equals, 9)
-
-	var count int
-	for i := 0; i < 10; i++ {
-		count, err = db.C("fs.chunks").Count()
-		if count > 0 || err != nil {
-			break
-		}
-	}
-	c.Assert(err, IsNil)
-	c.Assert(count, Equals, 1)
-
-	file.Abort()
-
-	err = file.Close()
-	c.Assert(err, ErrorMatches, "write aborted")
-
-	count, err = db.C("fs.chunks").Count()
-	c.Assert(err, IsNil)
-	c.Assert(count, Equals, 0)
-}
-
-func (s *S) TestGridFSCloseConflict(c *C) {
-	session, err := mgo.Dial("localhost:40011")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	db := session.DB("mydb")
-
-	db.C("fs.files").EnsureIndex(mgo.Index{Key: []string{"filename"}, Unique: true})
-
-	// For a closing-time conflict
-	err = db.C("fs.files").Insert(M{"filename": "foo.txt"})
-	c.Assert(err, IsNil)
-
-	gfs := db.GridFS("fs")
-	file, err := gfs.Create("foo.txt")
-	c.Assert(err, IsNil)
-
-	_, err = file.Write([]byte("some data"))
-	c.Assert(err, IsNil)
-
-	err = file.Close()
-	c.Assert(mgo.IsDup(err), Equals, true)
-
-	count, err := db.C("fs.chunks").Count()
-	c.Assert(err, IsNil)
-	c.Assert(count, Equals, 0)
-}
-
-func (s *S) TestGridFSOpenNotFound(c *C) {
-	session, err := mgo.Dial("localhost:40011")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	db := session.DB("mydb")
-
-	gfs := db.GridFS("fs")
-	file, err := gfs.OpenId("non-existent")
-	c.Assert(err == mgo.ErrNotFound, Equals, true)
-	c.Assert(file, IsNil)
-
-	file, err = gfs.Open("non-existent")
-	c.Assert(err == mgo.ErrNotFound, Equals, true)
-	c.Assert(file, IsNil)
-}
-
-func (s *S) TestGridFSReadAll(c *C) {
-	session, err := mgo.Dial("localhost:40011")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	db := session.DB("mydb")
-
-	gfs := db.GridFS("fs")
-	file, err := gfs.Create("")
-	c.Assert(err, IsNil)
-	id := file.Id()
-
-	file.SetChunkSize(5)
-
-	n, err := file.Write([]byte("abcdefghijklmnopqrstuv"))
-	c.Assert(err, IsNil)
-	c.Assert(n, Equals, 22)
-
-	err = file.Close()
-	c.Assert(err, IsNil)
-
-	file, err = gfs.OpenId(id)
-	c.Assert(err, IsNil)
-
-	b := make([]byte, 30)
-	n, err = file.Read(b)
-	c.Assert(n, Equals, 22)
-	c.Assert(err, IsNil)
-
-	n, err = file.Read(b)
-	c.Assert(n, Equals, 0)
-	c.Assert(err == io.EOF, Equals, true)
-
-	err = file.Close()
-	c.Assert(err, IsNil)
-}
-
-func (s *S) TestGridFSReadChunking(c *C) {
-	session, err := mgo.Dial("localhost:40011")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	db := session.DB("mydb")
-
-	gfs := db.GridFS("fs")
-
-	file, err := gfs.Create("")
-	c.Assert(err, IsNil)
-
-	id := file.Id()
-
-	file.SetChunkSize(5)
-
-	n, err := file.Write([]byte("abcdefghijklmnopqrstuv"))
-	c.Assert(err, IsNil)
-	c.Assert(n, Equals, 22)
-
-	err = file.Close()
-	c.Assert(err, IsNil)
-
-	file, err = gfs.OpenId(id)
-	c.Assert(err, IsNil)
-
-	b := make([]byte, 30)
-
-	// Smaller than the chunk size.
-	n, err = file.Read(b[:3])
-	c.Assert(err, IsNil)
-	c.Assert(n, Equals, 3)
-	c.Assert(b[:3], DeepEquals, []byte("abc"))
-
-	// Boundary in the middle.
-	n, err = file.Read(b[:4])
-	c.Assert(err, IsNil)
-	c.Assert(n, Equals, 4)
-	c.Assert(b[:4], DeepEquals, []byte("defg"))
-
-	// Boundary at the end.
-	n, err = file.Read(b[:3])
-	c.Assert(err, IsNil)
-	c.Assert(n, Equals, 3)
-	c.Assert(b[:3], DeepEquals, []byte("hij"))
-
-	// Larger than the chunk size, with 3 chunks.
-	n, err = file.Read(b)
-	c.Assert(err, IsNil)
-	c.Assert(n, Equals, 12)
-	c.Assert(b[:12], DeepEquals, []byte("klmnopqrstuv"))
-
-	n, err = file.Read(b)
-	c.Assert(n, Equals, 0)
-	c.Assert(err == io.EOF, Equals, true)
-
-	err = file.Close()
-	c.Assert(err, IsNil)
-}
-
-func (s *S) TestGridFSOpen(c *C) {
-	session, err := mgo.Dial("localhost:40011")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	db := session.DB("mydb")
-
-	gfs := db.GridFS("fs")
-
-	file, err := gfs.Create("myfile.txt")
-	c.Assert(err, IsNil)
-	file.Write([]byte{'1'})
-	file.Close()
-
-	file, err = gfs.Create("myfile.txt")
-	c.Assert(err, IsNil)
-	file.Write([]byte{'2'})
-	file.Close()
-
-	file, err = gfs.Open("myfile.txt")
-	c.Assert(err, IsNil)
-	defer file.Close()
-
-	var b [1]byte
-
-	_, err = file.Read(b[:])
-	c.Assert(err, IsNil)
-	c.Assert(string(b[:]), Equals, "2")
-}
-
-func (s *S) TestGridFSSeek(c *C) {
-	session, err := mgo.Dial("localhost:40011")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	db := session.DB("mydb")
-
-	gfs := db.GridFS("fs")
-	file, err := gfs.Create("")
-	c.Assert(err, IsNil)
-	id := file.Id()
-
-	file.SetChunkSize(5)
-
-	n, err := file.Write([]byte("abcdefghijklmnopqrstuv"))
-	c.Assert(err, IsNil)
-	c.Assert(n, Equals, 22)
-
-	err = file.Close()
-	c.Assert(err, IsNil)
-
-	b := make([]byte, 5)
-
-	file, err = gfs.OpenId(id)
-	c.Assert(err, IsNil)
-
-	o, err := file.Seek(3, os.SEEK_SET)
-	c.Assert(err, IsNil)
-	c.Assert(o, Equals, int64(3))
-	_, err = file.Read(b)
-	c.Assert(err, IsNil)
-	c.Assert(b, DeepEquals, []byte("defgh"))
-
-	o, err = file.Seek(5, os.SEEK_CUR)
-	c.Assert(err, IsNil)
-	c.Assert(o, Equals, int64(13))
-	_, err = file.Read(b)
-	c.Assert(err, IsNil)
-	c.Assert(b, DeepEquals, []byte("nopqr"))
-
-	o, err = file.Seek(0, os.SEEK_END)
-	c.Assert(err, IsNil)
-	c.Assert(o, Equals, int64(22))
-	n, err = file.Read(b)
-	c.Assert(err, Equals, io.EOF)
-	c.Assert(n, Equals, 0)
-
-	o, err = file.Seek(-10, os.SEEK_END)
-	c.Assert(err, IsNil)
-	c.Assert(o, Equals, int64(12))
-	_, err = file.Read(b)
-	c.Assert(err, IsNil)
-	c.Assert(b, DeepEquals, []byte("mnopq"))
-
-	o, err = file.Seek(8, os.SEEK_SET)
-	c.Assert(err, IsNil)
-	c.Assert(o, Equals, int64(8))
-	_, err = file.Read(b)
-	c.Assert(err, IsNil)
-	c.Assert(b, DeepEquals, []byte("ijklm"))
-
-	// Trivial seek forward within same chunk. Already
-	// got the data, shouldn't touch the database.
-	sent := mgo.GetStats().SentOps
-	o, err = file.Seek(1, os.SEEK_CUR)
-	c.Assert(err, IsNil)
-	c.Assert(o, Equals, int64(14))
-	c.Assert(mgo.GetStats().SentOps, Equals, sent)
-	_, err = file.Read(b)
-	c.Assert(err, IsNil)
-	c.Assert(b, DeepEquals, []byte("opqrs"))
-
-	// Try seeking past end of file.
-	file.Seek(3, os.SEEK_SET)
-	o, err = file.Seek(23, os.SEEK_SET)
-	c.Assert(err, ErrorMatches, "seek past end of file")
-	c.Assert(o, Equals, int64(3))
-}
-
-func (s *S) TestGridFSRemoveId(c *C) {
-	session, err := mgo.Dial("localhost:40011")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	db := session.DB("mydb")
-
-	gfs := db.GridFS("fs")
-
-	file, err := gfs.Create("myfile.txt")
-	c.Assert(err, IsNil)
-	file.Write([]byte{'1'})
-	file.Close()
-
-	file, err = gfs.Create("myfile.txt")
-	c.Assert(err, IsNil)
-	file.Write([]byte{'2'})
-	id := file.Id()
-	file.Close()
-
-	err = gfs.RemoveId(id)
-	c.Assert(err, IsNil)
-
-	file, err = gfs.Open("myfile.txt")
-	c.Assert(err, IsNil)
-	defer file.Close()
-
-	var b [1]byte
-
-	_, err = file.Read(b[:])
-	c.Assert(err, IsNil)
-	c.Assert(string(b[:]), Equals, "1")
-
-	n, err := db.C("fs.chunks").Find(M{"files_id": id}).Count()
-	c.Assert(err, IsNil)
-	c.Assert(n, Equals, 0)
-}
-
-func (s *S) TestGridFSRemove(c *C) {
-	session, err := mgo.Dial("localhost:40011")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	db := session.DB("mydb")
-
-	gfs := db.GridFS("fs")
-
-	file, err := gfs.Create("myfile.txt")
-	c.Assert(err, IsNil)
-	file.Write([]byte{'1'})
-	file.Close()
-
-	file, err = gfs.Create("myfile.txt")
-	c.Assert(err, IsNil)
-	file.Write([]byte{'2'})
-	file.Close()
-
-	err = gfs.Remove("myfile.txt")
-	c.Assert(err, IsNil)
-
-	_, err = gfs.Open("myfile.txt")
-	c.Assert(err == mgo.ErrNotFound, Equals, true)
-
-	n, err := db.C("fs.chunks").Find(nil).Count()
-	c.Assert(err, IsNil)
-	c.Assert(n, Equals, 0)
-}
-
-func (s *S) TestGridFSOpenNext(c *C) {
-	session, err := mgo.Dial("localhost:40011")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	db := session.DB("mydb")
-
-	gfs := db.GridFS("fs")
-
-	file, err := gfs.Create("myfile1.txt")
-	c.Assert(err, IsNil)
-	file.Write([]byte{'1'})
-	file.Close()
-
-	file, err = gfs.Create("myfile2.txt")
-	c.Assert(err, IsNil)
-	file.Write([]byte{'2'})
-	file.Close()
-
-	var f *mgo.GridFile
-	var b [1]byte
-
-	iter := gfs.Find(nil).Sort("-filename").Iter()
-
-	ok := gfs.OpenNext(iter, &f)
-	c.Assert(ok, Equals, true)
-	c.Check(f.Name(), Equals, "myfile2.txt")
-
-	_, err = f.Read(b[:])
-	c.Assert(err, IsNil)
-	c.Assert(string(b[:]), Equals, "2")
-
-	ok = gfs.OpenNext(iter, &f)
-	c.Assert(ok, Equals, true)
-	c.Check(f.Name(), Equals, "myfile1.txt")
-
-	_, err = f.Read(b[:])
-	c.Assert(err, IsNil)
-	c.Assert(string(b[:]), Equals, "1")
-
-	ok = gfs.OpenNext(iter, &f)
-	c.Assert(ok, Equals, false)
-	c.Assert(iter.Close(), IsNil)
-	c.Assert(f, IsNil)
-
-	// Do it again with a more restrictive query to make sure
-	// it's actually taken into account.
-	iter = gfs.Find(bson.M{"filename": "myfile1.txt"}).Iter()
-
-	ok = gfs.OpenNext(iter, &f)
-	c.Assert(ok, Equals, true)
-	c.Check(f.Name(), Equals, "myfile1.txt")
-
-	ok = gfs.OpenNext(iter, &f)
-	c.Assert(ok, Equals, false)
-	c.Assert(iter.Close(), IsNil)
-	c.Assert(f, IsNil)
-}
diff --git a/Godeps/_workspace/src/gopkg.in/mgo.v2/internal/sasl/sasl.c b/Godeps/_workspace/src/gopkg.in/mgo.v2/internal/sasl/sasl.c
deleted file mode 100644
index 8be0bc459..000000000
--- a/Godeps/_workspace/src/gopkg.in/mgo.v2/internal/sasl/sasl.c
+++ /dev/null
@@ -1,77 +0,0 @@
-// +build !windows
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <sasl/sasl.h>
-
-static int mgo_sasl_simple(void *context, int id, const char **result, unsigned int *len)
-{
-	if (!result) {
-		return SASL_BADPARAM;
-	}
-	switch (id) {
-	case SASL_CB_USER:
-		*result = (char *)context;
-		break;
-	case SASL_CB_AUTHNAME:
-		*result = (char *)context;
-		break;
-	case SASL_CB_LANGUAGE:
-		*result = NULL;
-		break;
-	default:
-		return SASL_BADPARAM;
-	}
-	if (len) {
-		*len = *result ? strlen(*result) : 0;
-	}
-	return SASL_OK;
-}
-
-typedef int (*callback)(void);
-
-static int mgo_sasl_secret(sasl_conn_t *conn, void *context, int id, sasl_secret_t **result)
-{
-	if (!conn || !result || id != SASL_CB_PASS) {
-		return SASL_BADPARAM;
-	}
-	*result = (sasl_secret_t *)context;
-	return SASL_OK;
-}
-
-sasl_callback_t *mgo_sasl_callbacks(const char *username, const char *password)
-{
-	sasl_callback_t *cb = malloc(4 * sizeof(sasl_callback_t));
-	int n = 0;
-
-	size_t len = strlen(password);
-	sasl_secret_t *secret = (sasl_secret_t*)malloc(sizeof(sasl_secret_t) + len);
-	if (!secret) {
-		free(cb);
-		return NULL;
-	}
-	strcpy((char *)secret->data, password);
-	secret->len = len;
-
-	cb[n].id = SASL_CB_PASS;
-	cb[n].proc = (callback)&mgo_sasl_secret;
-	cb[n].context = secret;
-	n++;
-
-	cb[n].id = SASL_CB_USER;
-	cb[n].proc = (callback)&mgo_sasl_simple;
-	cb[n].context = (char*)username;
-	n++;
-
-	cb[n].id = SASL_CB_AUTHNAME;
-	cb[n].proc = (callback)&mgo_sasl_simple;
-	cb[n].context = (char*)username;
-	n++;
-
-	cb[n].id = SASL_CB_LIST_END;
-	cb[n].proc = NULL;
-	cb[n].context = NULL;
-
-	return cb;
-}
diff --git a/Godeps/_workspace/src/gopkg.in/mgo.v2/internal/sasl/sasl.go b/Godeps/_workspace/src/gopkg.in/mgo.v2/internal/sasl/sasl.go
deleted file mode 100644
index 8375dddf8..000000000
--- a/Godeps/_workspace/src/gopkg.in/mgo.v2/internal/sasl/sasl.go
+++ /dev/null
@@ -1,138 +0,0 @@
-// Package sasl is an implementation detail of the mgo package.
-//
-// This package is not meant to be used by itself.
-//
-
-// +build !windows
-
-package sasl
-
-// #cgo LDFLAGS: -lsasl2
-//
-// struct sasl_conn {};
-//
-// #include <stdlib.h>
-// #include <sasl/sasl.h>
-//
-// sasl_callback_t *mgo_sasl_callbacks(const char *username, const char *password);
-//
-import "C"
-
-import (
-	"fmt"
-	"strings"
-	"sync"
-	"unsafe"
-)
-
-type saslStepper interface {
-	Step(serverData []byte) (clientData []byte, done bool, err error)
-	Close()
-}
-
-type saslSession struct {
-	conn *C.sasl_conn_t
-	step int
-	mech string
-
-	cstrings  []*C.char
-	callbacks *C.sasl_callback_t
-}
-
-var initError error
-var initOnce sync.Once
-
-func initSASL() {
-	rc := C.sasl_client_init(nil)
-	if rc != C.SASL_OK {
-		initError = saslError(rc, nil, "cannot initialize SASL library")
-	}
-}
-
-func New(username, password, mechanism, service, host string) (saslStepper, error) {
-	initOnce.Do(initSASL)
-	if initError != nil {
-		return nil, initError
-	}
-
-	ss := &saslSession{mech: mechanism}
-	if service == "" {
-		service = "mongodb"
-	}
-	if i := strings.Index(host, ":"); i >= 0 {
-		host = host[:i]
-	}
-	ss.callbacks = C.mgo_sasl_callbacks(ss.cstr(username), ss.cstr(password))
-	rc := C.sasl_client_new(ss.cstr(service), ss.cstr(host), nil, nil, ss.callbacks, 0, &ss.conn)
-	if rc != C.SASL_OK {
-		ss.Close()
-		return nil, saslError(rc, nil, "cannot create new SASL client")
-	}
-	return ss, nil
-}
-
-func (ss *saslSession) cstr(s string) *C.char {
-	cstr := C.CString(s)
-	ss.cstrings = append(ss.cstrings, cstr)
-	return cstr
-}
-
-func (ss *saslSession) Close() {
-	for _, cstr := range ss.cstrings {
-		C.free(unsafe.Pointer(cstr))
-	}
-	ss.cstrings = nil
-
-	if ss.callbacks != nil {
-		C.free(unsafe.Pointer(ss.callbacks))
-	}
-
-	// The documentation of SASL dispose makes it clear that this should only
-	// be done when the connection is done, not when the authentication phase
-	// is done, because an encryption layer may have been negotiated.
-	// Even then, we'll do this for now, because it's simpler and prevents
-	// keeping track of this state for every socket. If it breaks, we'll fix it.
-	C.sasl_dispose(&ss.conn)
-}
-
-func (ss *saslSession) Step(serverData []byte) (clientData []byte, done bool, err error) {
-	ss.step++
-	if ss.step > 10 {
-		return nil, false, fmt.Errorf("too many SASL steps without authentication")
-	}
-	var cclientData *C.char
-	var cclientDataLen C.uint
-	var rc C.int
-	if ss.step == 1 {
-		var mechanism *C.char // ignored - must match cred
-		rc = C.sasl_client_start(ss.conn, ss.cstr(ss.mech), nil, &cclientData, &cclientDataLen, &mechanism)
-	} else {
-		var cserverData *C.char
-		var cserverDataLen C.uint
-		if len(serverData) > 0 {
-			cserverData = (*C.char)(unsafe.Pointer(&serverData[0]))
-			cserverDataLen = C.uint(len(serverData))
-		}
-		rc = C.sasl_client_step(ss.conn, cserverData, cserverDataLen, nil, &cclientData, &cclientDataLen)
-	}
-	if cclientData != nil && cclientDataLen > 0 {
-		clientData = C.GoBytes(unsafe.Pointer(cclientData), C.int(cclientDataLen))
-	}
-	if rc == C.SASL_OK {
-		return clientData, true, nil
-	}
-	if rc == C.SASL_CONTINUE {
-		return clientData, false, nil
-	}
-	return nil, false, saslError(rc, ss.conn, "cannot establish SASL session")
-}
-
-func saslError(rc C.int, conn *C.sasl_conn_t, msg string) error {
-	var detail string
-	if conn == nil {
-		detail = C.GoString(C.sasl_errstring(rc, nil, nil))
-	} else {
-		detail = C.GoString(C.sasl_errdetail(conn))
-	}
-	return fmt.Errorf(msg + ": " + detail)
-}
diff --git a/Godeps/_workspace/src/gopkg.in/mgo.v2/internal/sasl/sasl_windows.c b/Godeps/_workspace/src/gopkg.in/mgo.v2/internal/sasl/sasl_windows.c
deleted file mode 100644
index dd6a88ab6..000000000
--- a/Godeps/_workspace/src/gopkg.in/mgo.v2/internal/sasl/sasl_windows.c
+++ /dev/null
@@ -1,118 +0,0 @@
-#include "sasl_windows.h"
-
-static const LPSTR SSPI_PACKAGE_NAME = "kerberos";
-
-SECURITY_STATUS SEC_ENTRY sspi_acquire_credentials_handle(CredHandle *cred_handle, char *username, char *password, char *domain)
-{
-	SEC_WINNT_AUTH_IDENTITY auth_identity;
-	SECURITY_INTEGER ignored;
-
-	auth_identity.Flags = SEC_WINNT_AUTH_IDENTITY_ANSI;
-	auth_identity.User = (LPSTR) username;
-	auth_identity.UserLength = strlen(username);
-	auth_identity.Password = (LPSTR) password;
-	auth_identity.PasswordLength = strlen(password);
-	auth_identity.Domain = (LPSTR) domain;
-	auth_identity.DomainLength = strlen(domain);
-	return call_sspi_acquire_credentials_handle(NULL, SSPI_PACKAGE_NAME, SECPKG_CRED_OUTBOUND, NULL, &auth_identity, NULL, NULL, cred_handle, &ignored);
-}
-
-int sspi_step(CredHandle *cred_handle, int has_context, CtxtHandle *context, PVOID *buffer, ULONG *buffer_length, char *target)
-{
-	SecBufferDesc inbuf;
-	SecBuffer in_bufs[1];
-	SecBufferDesc outbuf;
-	SecBuffer out_bufs[1];
-
-	if (has_context > 0) {
-		// If we already have a context, we now have data to send.
-		// Put this data in an inbuf.
-		inbuf.ulVersion = SECBUFFER_VERSION;
-		inbuf.cBuffers = 1;
-		inbuf.pBuffers = in_bufs;
-		in_bufs[0].pvBuffer = *buffer;
-		in_bufs[0].cbBuffer = *buffer_length;
-		in_bufs[0].BufferType = SECBUFFER_TOKEN;
-	}
-
-	outbuf.ulVersion = SECBUFFER_VERSION;
-	outbuf.cBuffers = 1;
-	outbuf.pBuffers = out_bufs;
-	out_bufs[0].pvBuffer = NULL;
-	out_bufs[0].cbBuffer = 0;
-	out_bufs[0].BufferType = SECBUFFER_TOKEN;
-
-	ULONG context_attr = 0;
-
-	int ret = call_sspi_initialize_security_context(cred_handle,
-	          has_context > 0 ? context : NULL,
-	          (LPSTR) target,
-	          ISC_REQ_ALLOCATE_MEMORY | ISC_REQ_MUTUAL_AUTH,
-	          0,
-	          SECURITY_NETWORK_DREP,
-	          has_context > 0 ? &inbuf : NULL,
-	          0,
-	          context,
-	          &outbuf,
-	          &context_attr,
-	          NULL);
-
-	*buffer = malloc(out_bufs[0].cbBuffer);
-	*buffer_length = out_bufs[0].cbBuffer;
-	memcpy(*buffer, out_bufs[0].pvBuffer, *buffer_length);
-
-	return ret;
-}
-
-int sspi_send_client_authz_id(CtxtHandle *context, PVOID *buffer, ULONG *buffer_length, char *user_plus_realm)
-{
-	SecPkgContext_Sizes sizes;
-	SECURITY_STATUS status = call_sspi_query_context_attributes(context, SECPKG_ATTR_SIZES, &sizes);
-
-	if (status != SEC_E_OK) {
-		return status;
-	}
-
-	size_t user_plus_realm_length = strlen(user_plus_realm);
-	int msgSize = 4 + user_plus_realm_length;
-	char *msg = malloc((sizes.cbSecurityTrailer + msgSize + sizes.cbBlockSize) * sizeof(char));
-	msg[sizes.cbSecurityTrailer + 0] = 1;
-	msg[sizes.cbSecurityTrailer + 1] = 0;
-	msg[sizes.cbSecurityTrailer + 2] = 0;
-	msg[sizes.cbSecurityTrailer + 3] = 0;
-	memcpy(&msg[sizes.cbSecurityTrailer + 4], user_plus_realm, user_plus_realm_length);
-
-	SecBuffer wrapBufs[3];
-	SecBufferDesc wrapBufDesc;
-	wrapBufDesc.cBuffers = 3;
-	wrapBufDesc.pBuffers = wrapBufs;
-	wrapBufDesc.ulVersion = SECBUFFER_VERSION;
-
-	wrapBufs[0].cbBuffer = sizes.cbSecurityTrailer;
-	wrapBufs[0].BufferType = SECBUFFER_TOKEN;
-	wrapBufs[0].pvBuffer = msg;
-
-	wrapBufs[1].cbBuffer = msgSize;
-	wrapBufs[1].BufferType = SECBUFFER_DATA;
-	wrapBufs[1].pvBuffer = msg + sizes.cbSecurityTrailer;
-
-	wrapBufs[2].cbBuffer = sizes.cbBlockSize;
-	wrapBufs[2].BufferType = SECBUFFER_PADDING;
-	wrapBufs[2].pvBuffer = msg + sizes.cbSecurityTrailer + msgSize;
-
-	status = call_sspi_encrypt_message(context, SECQOP_WRAP_NO_ENCRYPT, &wrapBufDesc, 0);
-	if (status != SEC_E_OK) {
-		free(msg);
-		return status;
-	}
-
-	*buffer_length = wrapBufs[0].cbBuffer + wrapBufs[1].cbBuffer + wrapBufs[2].cbBuffer;
-	*buffer = malloc(*buffer_length);
-
-	memcpy(*buffer, wrapBufs[0].pvBuffer, wrapBufs[0].cbBuffer);
-	memcpy(*buffer + wrapBufs[0].cbBuffer, wrapBufs[1].pvBuffer, wrapBufs[1].cbBuffer);
-	memcpy(*buffer + wrapBufs[0].cbBuffer + wrapBufs[1].cbBuffer, wrapBufs[2].pvBuffer, wrapBufs[2].cbBuffer);
-
-	free(msg);
-	return SEC_E_OK;
-}
diff --git a/Godeps/_workspace/src/gopkg.in/mgo.v2/internal/sasl/sasl_windows.go b/Godeps/_workspace/src/gopkg.in/mgo.v2/internal/sasl/sasl_windows.go
deleted file mode 100644
index 3302cfe05..000000000
--- a/Godeps/_workspace/src/gopkg.in/mgo.v2/internal/sasl/sasl_windows.go
+++ /dev/null
@@ -1,140 +0,0 @@
-package sasl
-
-// #include "sasl_windows.h"
-import "C"
-
-import (
-	"fmt"
-	"strings"
-	"sync"
-	"unsafe"
-)
-
-type saslStepper interface {
-	Step(serverData []byte) (clientData []byte, done bool, err error)
-	Close()
-}
-
-type saslSession struct {
-	// Credentials
-	mech          string
-	service       string
-	host          string
-	userPlusRealm string
-	target        string
-	domain        string
-
-	// Internal state
-	authComplete bool
-	errored      bool
-	step         int
-
-	// C internal state
-	credHandle C.CredHandle
-	context    C.CtxtHandle
-	hasContext C.int
-
-	// Keep track of pointers we need to explicitly free
-	stringsToFree []*C.char
-}
-
-var initError error
-var initOnce sync.Once
-
-func initSSPI() {
-	rc := C.load_secur32_dll()
-	if rc != 0 {
-		initError = fmt.Errorf("Error loading libraries: %v", rc)
-	}
-}
-
-func New(username, password, mechanism, service, host string) (saslStepper, error) {
-	initOnce.Do(initSSPI)
-	ss := &saslSession{mech: mechanism, hasContext: 0, userPlusRealm: username}
-	if service == "" {
-		service = "mongodb"
-	}
-	if i := strings.Index(host, ":"); i >= 0 {
-		host = host[:i]
-	}
-	ss.service = service
-	ss.host = host
-
-	usernameComponents := strings.Split(username, "@")
-	if len(usernameComponents) < 2 {
-		return nil, fmt.Errorf("Username '%v' doesn't contain a realm!", username)
-	}
-	user := usernameComponents[0]
-	ss.domain = usernameComponents[1]
-	ss.target = fmt.Sprintf("%s/%s", ss.service, ss.host)
-
-	var status C.SECURITY_STATUS
-	// Step 0: call AcquireCredentialsHandle to get a nice SSPI CredHandle
-	if len(password) > 0 {
-		status = C.sspi_acquire_credentials_handle(&ss.credHandle, ss.cstr(user), ss.cstr(password), ss.cstr(ss.domain))
-	} else {
-		status = C.sspi_acquire_credentials_handle(&ss.credHandle, ss.cstr(user), nil, ss.cstr(ss.domain))
-	}
-	if status != C.SEC_E_OK {
-		ss.errored = true
-		return nil, fmt.Errorf("Couldn't create new SSPI client, error code %v", status)
-	}
-	return ss, nil
-}
-
-func (ss *saslSession) cstr(s string) *C.char {
-	cstr := C.CString(s)
-	ss.stringsToFree = append(ss.stringsToFree, cstr)
-	return cstr
-}
-
-func (ss *saslSession) Close() {
-	for _, cstr := range ss.stringsToFree {
-		C.free(unsafe.Pointer(cstr))
-	}
-}
-
-func (ss *saslSession) Step(serverData []byte) (clientData []byte, done bool, err error) {
-	ss.step++
-	if ss.step > 10 {
-		return nil, false, fmt.Errorf("too many SSPI steps without authentication")
-	}
-	var buffer C.PVOID
-	var bufferLength C.ULONG
-	if len(serverData) > 0 {
-		buffer = (C.PVOID)(unsafe.Pointer(&serverData[0]))
-		bufferLength = C.ULONG(len(serverData))
-	}
-	var status C.int
-	if ss.authComplete {
-		// Step 3: last bit of magic to use the correct server credentials
-		status = C.sspi_send_client_authz_id(&ss.context, &buffer, &bufferLength, ss.cstr(ss.userPlusRealm))
-	} else {
-		// Step 1 + Step 2: set up security context with the server and TGT
-		status = C.sspi_step(&ss.credHandle, ss.hasContext, &ss.context, &buffer, &bufferLength, ss.cstr(ss.target))
-	}
-	if buffer != C.PVOID(nil) {
-		defer C.free(unsafe.Pointer(buffer))
-	}
-	if status != C.SEC_E_OK && status != C.SEC_I_CONTINUE_NEEDED {
-		ss.errored = true
-		return nil, false, ss.handleSSPIErrorCode(status)
-	}
-
-	clientData = C.GoBytes(unsafe.Pointer(buffer), C.int(bufferLength))
-	if status == C.SEC_E_OK {
-		ss.authComplete = true
-		return clientData, true, nil
-	} else {
-		ss.hasContext = 1
-		return clientData, false, nil
-	}
-}
-
-func (ss *saslSession) handleSSPIErrorCode(code C.int) error {
-	switch {
-	case code == C.SEC_E_TARGET_UNKNOWN:
-		return fmt.Errorf("Target %v@%v not found", ss.target, ss.domain)
-	}
-	return fmt.Errorf("Unknown error doing step %v, error code %v", ss.step, code)
-}
diff --git a/Godeps/_workspace/src/gopkg.in/mgo.v2/internal/sasl/sasl_windows.h b/Godeps/_workspace/src/gopkg.in/mgo.v2/internal/sasl/sasl_windows.h
deleted file mode 100644
index 94321b208..000000000
--- a/Godeps/_workspace/src/gopkg.in/mgo.v2/internal/sasl/sasl_windows.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <windows.h>
-
-#include "sspi_windows.h"
-
-SECURITY_STATUS SEC_ENTRY sspi_acquire_credentials_handle(CredHandle* cred_handle, char* username, char* password, char* domain);
-int sspi_step(CredHandle* cred_handle, int has_context, CtxtHandle* context, PVOID* buffer, ULONG* buffer_length, char* target);
-int sspi_send_client_authz_id(CtxtHandle* context, PVOID* buffer, ULONG* buffer_length, char* user_plus_realm);
diff --git a/Godeps/_workspace/src/gopkg.in/mgo.v2/internal/sasl/sspi_windows.c b/Godeps/_workspace/src/gopkg.in/mgo.v2/internal/sasl/sspi_windows.c
deleted file mode 100644
index 63f9a6f86..000000000
--- a/Godeps/_workspace/src/gopkg.in/mgo.v2/internal/sasl/sspi_windows.c
+++ /dev/null
@@ -1,96 +0,0 @@
-// Code adapted from the NodeJS kerberos library:
-// 
-//   https://github.com/christkv/kerberos/tree/master/lib/win32/kerberos_sspi.c
-//
-// Under the terms of the Apache License, Version 2.0:
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-#include <stdlib.h>
-
-#include "sspi_windows.h"
-
-static HINSTANCE sspi_secur32_dll = NULL;
-
-int load_secur32_dll()
-{
-	sspi_secur32_dll = LoadLibrary("secur32.dll");
-	if (sspi_secur32_dll == NULL) {
-		return GetLastError();
-	}
-	return 0;
-}
-
-SECURITY_STATUS SEC_ENTRY call_sspi_encrypt_message(PCtxtHandle phContext, unsigned long fQOP, PSecBufferDesc pMessage, unsigned long MessageSeqNo)
-{
-	if (sspi_secur32_dll == NULL) {
-		return -1;
-	}
-	encryptMessage_fn pfn_encryptMessage = (encryptMessage_fn) GetProcAddress(sspi_secur32_dll, "EncryptMessage");
-	if (!pfn_encryptMessage) {
-		return -2;
-	}
-	return (*pfn_encryptMessage)(phContext, fQOP, pMessage, MessageSeqNo);
-}
-
-SECURITY_STATUS SEC_ENTRY call_sspi_acquire_credentials_handle(
-	LPSTR pszPrincipal, LPSTR pszPackage, unsigned long fCredentialUse,
-        void *pvLogonId, void *pAuthData, SEC_GET_KEY_FN pGetKeyFn, void *pvGetKeyArgument,
-        PCredHandle phCredential, PTimeStamp ptsExpiry)
-{
-	if (sspi_secur32_dll == NULL) {
-		return -1;
-	}
-	acquireCredentialsHandle_fn pfn_acquireCredentialsHandle;
-#ifdef _UNICODE
-	pfn_acquireCredentialsHandle = (acquireCredentialsHandle_fn) GetProcAddress(sspi_secur32_dll, "AcquireCredentialsHandleW");
-#else
-	pfn_acquireCredentialsHandle = (acquireCredentialsHandle_fn) GetProcAddress(sspi_secur32_dll, "AcquireCredentialsHandleA");
-#endif
-	if (!pfn_acquireCredentialsHandle) {
-		return -2;
-	}
-	return (*pfn_acquireCredentialsHandle)(
-		pszPrincipal, pszPackage, fCredentialUse, pvLogonId, pAuthData,
-	        pGetKeyFn, pvGetKeyArgument, phCredential, ptsExpiry);
-}
-
-SECURITY_STATUS SEC_ENTRY call_sspi_initialize_security_context(
-	PCredHandle phCredential, PCtxtHandle phContext, LPSTR pszTargetName,
-	unsigned long fContextReq, unsigned long Reserved1, unsigned long TargetDataRep,
-	PSecBufferDesc pInput, unsigned long Reserved2, PCtxtHandle phNewContext,
-	PSecBufferDesc pOutput, unsigned long *pfContextAttr, PTimeStamp ptsExpiry)
-{
-	if (sspi_secur32_dll == NULL) {
-		return -1;
-	}
-	initializeSecurityContext_fn pfn_initializeSecurityContext;
-#ifdef _UNICODE
-	pfn_initializeSecurityContext = (initializeSecurityContext_fn) GetProcAddress(sspi_secur32_dll, "InitializeSecurityContextW");
-#else
-	pfn_initializeSecurityContext = (initializeSecurityContext_fn) GetProcAddress(sspi_secur32_dll, "InitializeSecurityContextA");
-#endif
-	if (!pfn_initializeSecurityContext) {
-		return -2;
-	}
-	return (*pfn_initializeSecurityContext)(
-		phCredential, phContext, pszTargetName, fContextReq, Reserved1, TargetDataRep,
-		pInput, Reserved2, phNewContext, pOutput, pfContextAttr, ptsExpiry);
-}
-
-SECURITY_STATUS SEC_ENTRY call_sspi_query_context_attributes(PCtxtHandle phContext, unsigned long ulAttribute, void *pBuffer)
-{
-	if (sspi_secur32_dll == NULL) {
-		return -1;
-	}
-	queryContextAttributes_fn pfn_queryContextAttributes;
-#ifdef _UNICODE
-	pfn_queryContextAttributes = (queryContextAttributes_fn) GetProcAddress(sspi_secur32_dll, "QueryContextAttributesW");
-#else
-	pfn_queryContextAttributes = (queryContextAttributes_fn) GetProcAddress(sspi_secur32_dll, "QueryContextAttributesA");
-#endif
-	if (!pfn_queryContextAttributes) {
-		return -2;
-	}
-	return (*pfn_queryContextAttributes)(phContext, ulAttribute, pBuffer);
-}
diff --git a/Godeps/_workspace/src/gopkg.in/mgo.v2/internal/sasl/sspi_windows.h b/Godeps/_workspace/src/gopkg.in/mgo.v2/internal/sasl/sspi_windows.h
deleted file mode 100644
index d28327031..000000000
--- a/Godeps/_workspace/src/gopkg.in/mgo.v2/internal/sasl/sspi_windows.h
+++ /dev/null
@@ -1,70 +0,0 @@
-// Code adapted from the NodeJS kerberos library:
-// 
-//   https://github.com/christkv/kerberos/tree/master/lib/win32/kerberos_sspi.h
-//
-// Under the terms of the Apache License, Version 2.0:
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-#ifndef SSPI_WINDOWS_H
-#define SSPI_WINDOWS_H
-
-#define SECURITY_WIN32 1
-
-#include <windows.h>
-#include <sspi.h>
-
-int load_secur32_dll();
-
-SECURITY_STATUS SEC_ENTRY call_sspi_encrypt_message(PCtxtHandle phContext, unsigned long fQOP, PSecBufferDesc pMessage, unsigned long MessageSeqNo);
-
-typedef DWORD (WINAPI *encryptMessage_fn)(PCtxtHandle phContext, ULONG fQOP, PSecBufferDesc pMessage, ULONG MessageSeqNo);
-
-SECURITY_STATUS SEC_ENTRY call_sspi_acquire_credentials_handle(
-    LPSTR pszPrincipal,             // Name of principal
-    LPSTR pszPackage,               // Name of package
-    unsigned long fCredentialUse,   // Flags indicating use
-    void *pvLogonId,                // Pointer to logon ID
-    void *pAuthData,                // Package specific data
-    SEC_GET_KEY_FN pGetKeyFn,       // Pointer to GetKey() func
-    void *pvGetKeyArgument,         // Value to pass to GetKey()
-    PCredHandle phCredential,       // (out) Cred Handle
-    PTimeStamp ptsExpiry            // (out) Lifetime (optional)
-);
-
-typedef DWORD (WINAPI *acquireCredentialsHandle_fn)(
-    LPSTR pszPrincipal, LPSTR pszPackage, unsigned long fCredentialUse,
-    void *pvLogonId, void *pAuthData, SEC_GET_KEY_FN pGetKeyFn, void *pvGetKeyArgument,
-    PCredHandle phCredential, PTimeStamp ptsExpiry
-);
-
-SECURITY_STATUS SEC_ENTRY call_sspi_initialize_security_context(
-    PCredHandle phCredential,       // Cred to base context
-    PCtxtHandle phContext,          // Existing context (OPT)
-    LPSTR pszTargetName,            // Name of target
-    unsigned long fContextReq,      // Context Requirements
-    unsigned long Reserved1,        // Reserved, MBZ
-    unsigned long TargetDataRep,    // Data rep of target
-    PSecBufferDesc pInput,          // Input Buffers
-    unsigned long Reserved2,        // Reserved, MBZ
-    PCtxtHandle phNewContext,       // (out) New Context handle
-    PSecBufferDesc pOutput,         // (inout) Output Buffers
-    unsigned long *pfContextAttr,   // (out) Context attrs
-    PTimeStamp ptsExpiry            // (out) Life span (OPT)
-);
-
-typedef DWORD (WINAPI *initializeSecurityContext_fn)(
-    PCredHandle phCredential, PCtxtHandle phContext, LPSTR pszTargetName, unsigned long fContextReq,
-    unsigned long Reserved1, unsigned long TargetDataRep, PSecBufferDesc pInput, unsigned long Reserved2,
-    PCtxtHandle phNewContext, PSecBufferDesc pOutput, unsigned long *pfContextAttr, PTimeStamp ptsExpiry);
-
-SECURITY_STATUS SEC_ENTRY call_sspi_query_context_attributes(
-    PCtxtHandle phContext,          // Context to query
-    unsigned long ulAttribute,      // Attribute to query
-    void *pBuffer                   // Buffer for attributes
-);
-
-typedef DWORD (WINAPI *queryContextAttributes_fn)(
-    PCtxtHandle phContext, unsigned long ulAttribute, void *pBuffer);
-
-#endif // SSPI_WINDOWS_H
diff --git a/Godeps/_workspace/src/gopkg.in/mgo.v2/internal/scram/scram.go b/Godeps/_workspace/src/gopkg.in/mgo.v2/internal/scram/scram.go
deleted file mode 100644
index 80cda9135..000000000
--- a/Godeps/_workspace/src/gopkg.in/mgo.v2/internal/scram/scram.go
+++ /dev/null
@@ -1,266 +0,0 @@
-// mgo - MongoDB driver for Go
-//
-// Copyright (c) 2014 - Gustavo Niemeyer <gustavo@niemeyer.net>
-//
-// 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 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.
-
-// Pacakage scram implements a SCRAM-{SHA-1,etc} client per RFC5802.
-//
-// http://tools.ietf.org/html/rfc5802
-//
-package scram
-
-import (
-	"bytes"
-	"crypto/hmac"
-	"crypto/rand"
-	"encoding/base64"
-	"fmt"
-	"hash"
-	"strconv"
-	"strings"
-)
-
-// Client implements a SCRAM-* client (SCRAM-SHA-1, SCRAM-SHA-256, etc).
-//
-// A Client may be used within a SASL conversation with logic resembling:
-//
-//    var in []byte
-//    var client = scram.NewClient(sha1.New, user, pass)
-//    for client.Step(in) {
-//            out := client.Out()
-//            // send out to server
-//            in := serverOut
-//    }
-//    if client.Err() != nil {
-//            // auth failed
-//    }
-//
-type Client struct {
-	newHash func() hash.Hash
-
-	user string
-	pass string
-	step int
-	out  bytes.Buffer
-	err  error
-
-	clientNonce []byte
-	serverNonce []byte
-	saltedPass  []byte
-	authMsg     bytes.Buffer
-}
-
-// NewClient returns a new SCRAM-* client with the provided hash algorithm.
-//
-// For SCRAM-SHA-1, for example, use:
-//
-//    client := scram.NewClient(sha1.New, user, pass)
-//
-func NewClient(newHash func() hash.Hash, user, pass string) *Client {
-	c := &Client{
-		newHash: newHash,
-		user:    user,
-		pass:    pass,
-	}
-	c.out.Grow(256)
-	c.authMsg.Grow(256)
-	return c
-}
-
-// Out returns the data to be sent to the server in the current step.
-func (c *Client) Out() []byte {
-	if c.out.Len() == 0 {
-		return nil
-	}
-	return c.out.Bytes()
-}
-
-// Err returns the error that ocurred, or nil if there were no errors.
-func (c *Client) Err() error {
-	return c.err
-}
-
-// SetNonce sets the client nonce to the provided value.
-// If not set, the nonce is generated automatically out of crypto/rand on the first step.
-func (c *Client) SetNonce(nonce []byte) {
-	c.clientNonce = nonce
-}
-
-var escaper = strings.NewReplacer("=", "=3D", ",", "=2C")
-
-// Step processes the incoming data from the server and makes the
-// next round of data for the server available via Client.Out.
-// Step returns false if there are no errors and more data is
-// still expected.
-func (c *Client) Step(in []byte) bool {
-	c.out.Reset()
-	if c.step > 2 || c.err != nil {
-		return false
-	}
-	c.step++
-	switch c.step {
-	case 1:
-		c.err = c.step1(in)
-	case 2:
-		c.err = c.step2(in)
-	case 3:
-		c.err = c.step3(in)
-	}
-	return c.step > 2 || c.err != nil
-}
-
-func (c *Client) step1(in []byte) error {
-	if len(c.clientNonce) == 0 {
-		const nonceLen = 6
-		buf := make([]byte, nonceLen + b64.EncodedLen(nonceLen))
-		if _, err := rand.Read(buf[:nonceLen]); err != nil {
-			return fmt.Errorf("cannot read random SCRAM-SHA-1 nonce from operating system: %v", err)
-		}
-		c.clientNonce = buf[nonceLen:]
-		b64.Encode(c.clientNonce, buf[:nonceLen])
-	}
-	c.authMsg.WriteString("n=")
-	escaper.WriteString(&c.authMsg, c.user)
-	c.authMsg.WriteString(",r=")
-	c.authMsg.Write(c.clientNonce)
-
-	c.out.WriteString("n,,")
-	c.out.Write(c.authMsg.Bytes())
-	return nil
-}
-
-var b64 = base64.StdEncoding
-
-func (c *Client) step2(in []byte) error {
-	c.authMsg.WriteByte(',')
-	c.authMsg.Write(in)
-
-	fields := bytes.Split(in, []byte(","))
-	if len(fields) != 3 {
-		return fmt.Errorf("expected 3 fields in first SCRAM-SHA-1 server message, got %d: %q", len(fields), in)
-	}
-	if !bytes.HasPrefix(fields[0], []byte("r=")) || len(fields[0]) < 2 {
-		return fmt.Errorf("server sent an invalid SCRAM-SHA-1 nonce: %q", fields[0])
-	}
-	if !bytes.HasPrefix(fields[1], []byte("s=")) || len(fields[1]) < 6 {
-		return fmt.Errorf("server sent an invalid SCRAM-SHA-1 salt: %q", fields[1])
-	}
-	if !bytes.HasPrefix(fields[2], []byte("i=")) || len(fields[2]) < 6 {
-		return fmt.Errorf("server sent an invalid SCRAM-SHA-1 iteration count: %q", fields[2])
-	}
-
-	c.serverNonce = fields[0][2:]
-	if !bytes.HasPrefix(c.serverNonce, c.clientNonce) {
-		return fmt.Errorf("server SCRAM-SHA-1 nonce is not prefixed by client nonce: got %q, want %q+\"...\"", c.serverNonce, c.clientNonce)
-	}
-
-	salt := make([]byte, b64.DecodedLen(len(fields[1][2:])))
-	n, err := b64.Decode(salt, fields[1][2:])
-	if err != nil {
-		return fmt.Errorf("cannot decode SCRAM-SHA-1 salt sent by server: %q", fields[1])
-	}
-	salt = salt[:n]
-	iterCount, err := strconv.Atoi(string(fields[2][2:]))
-	if err != nil {
-		return fmt.Errorf("server sent an invalid SCRAM-SHA-1 iteration count: %q", fields[2])
-	}
-	c.saltPassword(salt, iterCount)
-
-	c.authMsg.WriteString(",c=biws,r=")
-	c.authMsg.Write(c.serverNonce)
-
-	c.out.WriteString("c=biws,r=")
-	c.out.Write(c.serverNonce)
-	c.out.WriteString(",p=")
-	c.out.Write(c.clientProof())
-	return nil
-}
-
-func (c *Client) step3(in []byte) error {
-	var isv, ise bool
-	var fields = bytes.Split(in, []byte(","))
-	if len(fields) == 1 {
-		isv = bytes.HasPrefix(fields[0], []byte("v="))
-		ise = bytes.HasPrefix(fields[0], []byte("e="))
-	}
-	if ise {
-		return fmt.Errorf("SCRAM-SHA-1 authentication error: %s", fields[0][2:])
-	} else if !isv {
-		return fmt.Errorf("unsupported SCRAM-SHA-1 final message from server: %q", in)
-	}
-	if !bytes.Equal(c.serverSignature(), fields[0][2:]) {
-		return fmt.Errorf("cannot authenticate SCRAM-SHA-1 server signature: %q", fields[0][2:])
-	}
-	return nil
-}
-
-func (c *Client) saltPassword(salt []byte, iterCount int) {
-	mac := hmac.New(c.newHash, []byte(c.pass))
-	mac.Write(salt)
-	mac.Write([]byte{0, 0, 0, 1})
-	ui := mac.Sum(nil)
-	hi := make([]byte, len(ui))
-	copy(hi, ui)
-	for i := 1; i < iterCount; i++ {
-		mac.Reset()
-		mac.Write(ui)
-		mac.Sum(ui[:0])
-		for j, b := range ui {
-			hi[j] ^= b
-		}
-	}
-	c.saltedPass = hi
-}
-
-func (c *Client) clientProof() []byte {
-	mac := hmac.New(c.newHash, c.saltedPass)
-	mac.Write([]byte("Client Key"))
-	clientKey := mac.Sum(nil)
-	hash := c.newHash()
-	hash.Write(clientKey)
-	storedKey := hash.Sum(nil)
-	mac = hmac.New(c.newHash, storedKey)
-	mac.Write(c.authMsg.Bytes())
-	clientProof := mac.Sum(nil)
-	for i, b := range clientKey {
-		clientProof[i] ^= b
-	}
-	clientProof64 := make([]byte, b64.EncodedLen(len(clientProof)))
-	b64.Encode(clientProof64, clientProof)
-	return clientProof64
-}
-
-func (c *Client) serverSignature() []byte {
-	mac := hmac.New(c.newHash, c.saltedPass)
-	mac.Write([]byte("Server Key"))
-	serverKey := mac.Sum(nil)
-
-	mac = hmac.New(c.newHash, serverKey)
-	mac.Write(c.authMsg.Bytes())
-	serverSignature := mac.Sum(nil)
-
-	encoded := make([]byte, b64.EncodedLen(len(serverSignature)))
-	b64.Encode(encoded, serverSignature)
-	return encoded
-}
diff --git a/Godeps/_workspace/src/gopkg.in/mgo.v2/internal/scram/scram_test.go b/Godeps/_workspace/src/gopkg.in/mgo.v2/internal/scram/scram_test.go
deleted file mode 100644
index 9c20fdfc4..000000000
--- a/Godeps/_workspace/src/gopkg.in/mgo.v2/internal/scram/scram_test.go
+++ /dev/null
@@ -1,67 +0,0 @@
-package scram_test
-
-import (
-	"crypto/sha1"
-	"testing"
-
-	. "gopkg.in/check.v1"
-	"gopkg.in/mgo.v2/internal/scram"
-	"strings"
-)
-
-var _ = Suite(&S{})
-
-func Test(t *testing.T) { TestingT(t) }
-
-type S struct{}
-
-var tests = [][]string{{
-	"U: user pencil",
-	"N: fyko+d2lbbFgONRv9qkxdawL",
-	"C: n,,n=user,r=fyko+d2lbbFgONRv9qkxdawL",
-	"S: r=fyko+d2lbbFgONRv9qkxdawL3rfcNHYJY1ZVvWVs7j,s=QSXCR+Q6sek8bf92,i=4096",
-	"C: c=biws,r=fyko+d2lbbFgONRv9qkxdawL3rfcNHYJY1ZVvWVs7j,p=v0X8v3Bz2T0CJGbJQyF0X+HI4Ts=",
-	"S: v=rmF9pqV8S7suAoZWja4dJRkFsKQ=",
-}, {
-	"U: root fe8c89e308ec08763df36333cbf5d3a2",
-	"N: OTcxNDk5NjM2MzE5",
-	"C: n,,n=root,r=OTcxNDk5NjM2MzE5",
-	"S: r=OTcxNDk5NjM2MzE581Ra3provgG0iDsMkDiIAlrh4532dDLp,s=XRDkVrFC9JuL7/F4tG0acQ==,i=10000",
-	"C: c=biws,r=OTcxNDk5NjM2MzE581Ra3provgG0iDsMkDiIAlrh4532dDLp,p=6y1jp9R7ETyouTXS9fW9k5UHdBc=",
-	"S: v=LBnd9dUJRxdqZiEq91NKP3z/bHA=",
-}}
-
-func (s *S) TestExamples(c *C) {
-	for _, steps := range tests {
-		if len(steps) < 2 || len(steps[0]) < 3 || !strings.HasPrefix(steps[0], "U: ") {
-			c.Fatalf("Invalid test: %#v", steps)
-		}
-		auth := strings.Fields(steps[0][3:])
-		client := scram.NewClient(sha1.New, auth[0], auth[1])
-		first, done := true, false
-		c.Logf("-----")
-		c.Logf("%s", steps[0])
-		for _, step := range steps[1:] {
-			c.Logf("%s", step)
-			switch step[:3] {
-			case "N: ":
-				client.SetNonce([]byte(step[3:]))
-			case "C: ":
-				if first {
-					first = false
-					done = client.Step(nil)
-				}
-				c.Assert(done, Equals, false)
-				c.Assert(client.Err(), IsNil)
-				c.Assert(string(client.Out()), Equals, step[3:])
-			case "S: ":
-				first = false
-				done = client.Step([]byte(step[3:]))
-			default:
-				panic("invalid test line: " + step)
-			}
-		}
-		c.Assert(done, Equals, true)
-		c.Assert(client.Err(), IsNil)
-	}
-}
diff --git a/Godeps/_workspace/src/gopkg.in/mgo.v2/log.go b/Godeps/_workspace/src/gopkg.in/mgo.v2/log.go
deleted file mode 100644
index 53eb4237b..000000000
--- a/Godeps/_workspace/src/gopkg.in/mgo.v2/log.go
+++ /dev/null
@@ -1,133 +0,0 @@
-// mgo - MongoDB driver for Go
-//
-// Copyright (c) 2010-2012 - Gustavo Niemeyer <gustavo@niemeyer.net>
-//
-// 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 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.
-
-package mgo
-
-import (
-	"fmt"
-	"sync"
-)
-
-// ---------------------------------------------------------------------------
-// Logging integration.
-
-// Avoid importing the log type information unnecessarily.  There's a small cost
-// associated with using an interface rather than the type.  Depending on how
-// often the logger is plugged in, it would be worth using the type instead.
-type log_Logger interface {
-	Output(calldepth int, s string) error
-}
-
-var (
-	globalLogger log_Logger
-	globalDebug  bool
-	globalMutex  sync.Mutex
-)
-
-// RACE WARNING: There are known data races when logging, which are manually
-// silenced when the race detector is in use. These data races won't be
-// observed in typical use, because logging is supposed to be set up once when
-// the application starts. Having raceDetector as a constant, the compiler
-// should elide the locks altogether in actual use.
-
-// Specify the *log.Logger object where log messages should be sent to.
-func SetLogger(logger log_Logger) {
-	if raceDetector {
-		globalMutex.Lock()
-		defer globalMutex.Unlock()
-	}
-	globalLogger = logger
-}
-
-// Enable the delivery of debug messages to the logger.  Only meaningful
-// if a logger is also set.
-func SetDebug(debug bool) {
-	if raceDetector {
-		globalMutex.Lock()
-		defer globalMutex.Unlock()
-	}
-	globalDebug = debug
-}
-
-func log(v ...interface{}) {
-	if raceDetector {
-		globalMutex.Lock()
-		defer globalMutex.Unlock()
-	}
-	if globalLogger != nil {
-		globalLogger.Output(2, fmt.Sprint(v...))
-	}
-}
-
-func logln(v ...interface{}) {
-	if raceDetector {
-		globalMutex.Lock()
-		defer globalMutex.Unlock()
-	}
-	if globalLogger != nil {
-		globalLogger.Output(2, fmt.Sprintln(v...))
-	}
-}
-
-func logf(format string, v ...interface{}) {
-	if raceDetector {
-		globalMutex.Lock()
-		defer globalMutex.Unlock()
-	}
-	if globalLogger != nil {
-		globalLogger.Output(2, fmt.Sprintf(format, v...))
-	}
-}
-
-func debug(v ...interface{}) {
-	if raceDetector {
-		globalMutex.Lock()
-		defer globalMutex.Unlock()
-	}
-	if globalDebug && globalLogger != nil {
-		globalLogger.Output(2, fmt.Sprint(v...))
-	}
-}
-
-func debugln(v ...interface{}) {
-	if raceDetector {
-		globalMutex.Lock()
-		defer globalMutex.Unlock()
-	}
-	if globalDebug && globalLogger != nil {
-		globalLogger.Output(2, fmt.Sprintln(v...))
-	}
-}
-
-func debugf(format string, v ...interface{}) {
-	if raceDetector {
-		globalMutex.Lock()
-		defer globalMutex.Unlock()
-	}
-	if globalDebug && globalLogger != nil {
-		globalLogger.Output(2, fmt.Sprintf(format, v...))
-	}
-}
diff --git a/Godeps/_workspace/src/gopkg.in/mgo.v2/queue.go b/Godeps/_workspace/src/gopkg.in/mgo.v2/queue.go
deleted file mode 100644
index e9245de70..000000000
--- a/Godeps/_workspace/src/gopkg.in/mgo.v2/queue.go
+++ /dev/null
@@ -1,91 +0,0 @@
-// mgo - MongoDB driver for Go
-//
-// Copyright (c) 2010-2012 - Gustavo Niemeyer <gustavo@niemeyer.net>
-//
-// 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 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.
-
-package mgo
-
-type queue struct {
-	elems               []interface{}
-	nelems, popi, pushi int
-}
-
-func (q *queue) Len() int {
-	return q.nelems
-}
-
-func (q *queue) Push(elem interface{}) {
-	//debugf("Pushing(pushi=%d popi=%d cap=%d): %#v\n",
-	//       q.pushi, q.popi, len(q.elems), elem)
-	if q.nelems == len(q.elems) {
-		q.expand()
-	}
-	q.elems[q.pushi] = elem
-	q.nelems++
-	q.pushi = (q.pushi + 1) % len(q.elems)
-	//debugf(" Pushed(pushi=%d popi=%d cap=%d): %#v\n",
-	//       q.pushi, q.popi, len(q.elems), elem)
-}
-
-func (q *queue) Pop() (elem interface{}) {
-	//debugf("Popping(pushi=%d popi=%d cap=%d)\n",
-	//       q.pushi, q.popi, len(q.elems))
-	if q.nelems == 0 {
-		return nil
-	}
-	elem = q.elems[q.popi]
-	q.elems[q.popi] = nil // Help GC.
-	q.nelems--
-	q.popi = (q.popi + 1) % len(q.elems)
-	//debugf(" Popped(pushi=%d popi=%d cap=%d): %#v\n",
-	//       q.pushi, q.popi, len(q.elems), elem)
-	return elem
-}
-
-func (q *queue) expand() {
-	curcap := len(q.elems)
-	var newcap int
-	if curcap == 0 {
-		newcap = 8
-	} else if curcap < 1024 {
-		newcap = curcap * 2
-	} else {
-		newcap = curcap + (curcap / 4)
-	}
-	elems := make([]interface{}, newcap)
-
-	if q.popi == 0 {
-		copy(elems, q.elems)
-		q.pushi = curcap
-	} else {
-		newpopi := newcap - (curcap - q.popi)
-		copy(elems, q.elems[:q.popi])
-		copy(elems[newpopi:], q.elems[q.popi:])
-		q.popi = newpopi
-	}
-	for i := range q.elems {
-		q.elems[i] = nil // Help GC.
-	}
-	q.elems = elems
-}
diff --git a/Godeps/_workspace/src/gopkg.in/mgo.v2/queue_test.go b/Godeps/_workspace/src/gopkg.in/mgo.v2/queue_test.go
deleted file mode 100644
index bd0ab550f..000000000
--- a/Godeps/_workspace/src/gopkg.in/mgo.v2/queue_test.go
+++ /dev/null
@@ -1,101 +0,0 @@
-// mgo - MongoDB driver for Go
-//
-// Copyright (c) 2010-2012 - Gustavo Niemeyer <gustavo@niemeyer.net>
-//
-// 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 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.
-
-package mgo
-
-import (
-	. "gopkg.in/check.v1"
-)
-
-type QS struct{}
-
-var _ = Suite(&QS{})
-
-func (s *QS) TestSequentialGrowth(c *C) {
-	q := queue{}
-	n := 2048
-	for i := 0; i != n; i++ {
-		q.Push(i)
-	}
-	for i := 0; i != n; i++ {
-		c.Assert(q.Pop(), Equals, i)
-	}
-}
-
-var queueTestLists = [][]int{
-	// {0, 1, 2, 3, 4, 5, 6, 7, 8, 9}
-	{0, 1, 2, 3, 4, 5, 6, 7, 8, 9},
-
-	// {8, 9, 10, 11, ... 2, 3, 4, 5, 6, 7}
-	{0, 1, 2, 3, 4, 5, 6, 7, -1, -1, 8, 9, 10, 11},
-
-	// {8, 9, 10, 11, ... 2, 3, 4, 5, 6, 7}
-	{0, 1, 2, 3, -1, -1, 4, 5, 6, 7, 8, 9, 10, 11},
-
-	// {0, 1, 2, 3, 4, 5, 6, 7, 8}
-	{0, 1, 2, 3, 4, 5, 6, 7, 8,
-		-1, -1, -1, -1, -1, -1, -1, -1, -1,
-		0, 1, 2, 3, 4, 5, 6, 7, 8},
-}
-
-func (s *QS) TestQueueTestLists(c *C) {
-	test := []int{}
-	testi := 0
-	reset := func() {
-		test = test[0:0]
-		testi = 0
-	}
-	push := func(i int) {
-		test = append(test, i)
-	}
-	pop := func() (i int) {
-		if testi == len(test) {
-			return -1
-		}
-		i = test[testi]
-		testi++
-		return
-	}
-
-	for _, list := range queueTestLists {
-		reset()
-		q := queue{}
-		for _, n := range list {
-			if n == -1 {
-				c.Assert(q.Pop(), Equals, pop(), Commentf("With list %#v", list))
-			} else {
-				q.Push(n)
-				push(n)
-			}
-		}
-
-		for n := pop(); n != -1; n = pop() {
-			c.Assert(q.Pop(), Equals, n, Commentf("With list %#v", list))
-		}
-
-		c.Assert(q.Pop(), Equals, nil, Commentf("With list %#v", list))
-	}
-}
diff --git a/Godeps/_workspace/src/gopkg.in/mgo.v2/raceoff.go b/Godeps/_workspace/src/gopkg.in/mgo.v2/raceoff.go
deleted file mode 100644
index e60b14144..000000000
--- a/Godeps/_workspace/src/gopkg.in/mgo.v2/raceoff.go
+++ /dev/null
@@ -1,5 +0,0 @@
-// +build !race
-
-package mgo
-
-const raceDetector = false
diff --git a/Godeps/_workspace/src/gopkg.in/mgo.v2/raceon.go b/Godeps/_workspace/src/gopkg.in/mgo.v2/raceon.go
deleted file mode 100644
index 737b08ece..000000000
--- a/Godeps/_workspace/src/gopkg.in/mgo.v2/raceon.go
+++ /dev/null
@@ -1,5 +0,0 @@
-// +build race
-
-package mgo
-
-const raceDetector = true
diff --git a/Godeps/_workspace/src/gopkg.in/mgo.v2/saslimpl.go b/Godeps/_workspace/src/gopkg.in/mgo.v2/saslimpl.go
deleted file mode 100644
index 0d25f25cb..000000000
--- a/Godeps/_workspace/src/gopkg.in/mgo.v2/saslimpl.go
+++ /dev/null
@@ -1,11 +0,0 @@
-//+build sasl
-
-package mgo
-
-import (
-	"gopkg.in/mgo.v2/internal/sasl"
-)
-
-func saslNew(cred Credential, host string) (saslStepper, error) {
-	return sasl.New(cred.Username, cred.Password, cred.Mechanism, cred.Service, host)
-}
diff --git a/Godeps/_workspace/src/gopkg.in/mgo.v2/saslstub.go b/Godeps/_workspace/src/gopkg.in/mgo.v2/saslstub.go
deleted file mode 100644
index 6e9e30986..000000000
--- a/Godeps/_workspace/src/gopkg.in/mgo.v2/saslstub.go
+++ /dev/null
@@ -1,11 +0,0 @@
-//+build !sasl
-
-package mgo
-
-import (
-	"fmt"
-)
-
-func saslNew(cred Credential, host string) (saslStepper, error) {
-	return nil, fmt.Errorf("SASL support not enabled during build (-tags sasl)")
-}
diff --git a/Godeps/_workspace/src/gopkg.in/mgo.v2/server.go b/Godeps/_workspace/src/gopkg.in/mgo.v2/server.go
deleted file mode 100644
index d5086a290..000000000
--- a/Godeps/_workspace/src/gopkg.in/mgo.v2/server.go
+++ /dev/null
@@ -1,448 +0,0 @@
-// mgo - MongoDB driver for Go
-//
-// Copyright (c) 2010-2012 - Gustavo Niemeyer <gustavo@niemeyer.net>
-//
-// 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 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.
-
-package mgo
-
-import (
-	"errors"
-	"net"
-	"sort"
-	"sync"
-	"time"
-
-	"gopkg.in/mgo.v2/bson"
-)
-
-// ---------------------------------------------------------------------------
-// Mongo server encapsulation.
-
-type mongoServer struct {
-	sync.RWMutex
-	Addr          string
-	ResolvedAddr  string
-	tcpaddr       *net.TCPAddr
-	unusedSockets []*mongoSocket
-	liveSockets   []*mongoSocket
-	closed        bool
-	abended       bool
-	sync          chan bool
-	dial          dialer
-	pingValue     time.Duration
-	pingIndex     int
-	pingCount     uint32
-	pingWindow    [6]time.Duration
-	info          *mongoServerInfo
-}
-
-type dialer struct {
-	old func(addr net.Addr) (net.Conn, error)
-	new func(addr *ServerAddr) (net.Conn, error)
-}
-
-func (dial dialer) isSet() bool {
-	return dial.old != nil || dial.new != nil
-}
-
-type mongoServerInfo struct {
-	Master         bool
-	Mongos         bool
-	Tags           bson.D
-	MaxWireVersion int
-	SetName        string
-}
-
-var defaultServerInfo mongoServerInfo
-
-func newServer(addr string, tcpaddr *net.TCPAddr, sync chan bool, dial dialer) *mongoServer {
-	server := &mongoServer{
-		Addr:         addr,
-		ResolvedAddr: tcpaddr.String(),
-		tcpaddr:      tcpaddr,
-		sync:         sync,
-		dial:         dial,
-		info:         &defaultServerInfo,
-	}
-	// Once so the server gets a ping value, then loop in background.
-	server.pinger(false)
-	go server.pinger(true)
-	return server
-}
-
-var errPoolLimit = errors.New("per-server connection limit reached")
-var errServerClosed = errors.New("server was closed")
-
-// AcquireSocket returns a socket for communicating with the server.
-// This will attempt to reuse an old connection, if one is available. Otherwise,
-// it will establish a new one. The returned socket is owned by the call site,
-// and will return to the cache when the socket has its Release method called
-// the same number of times as AcquireSocket + Acquire were called for it.
-// If the poolLimit argument is greater than zero and the number of sockets in
-// use in this server is greater than the provided limit, errPoolLimit is
-// returned.
-func (server *mongoServer) AcquireSocket(poolLimit int, timeout time.Duration) (socket *mongoSocket, abended bool, err error) {
-	for {
-		server.Lock()
-		abended = server.abended
-		if server.closed {
-			server.Unlock()
-			return nil, abended, errServerClosed
-		}
-		n := len(server.unusedSockets)
-		if poolLimit > 0 && len(server.liveSockets)-n >= poolLimit {
-			server.Unlock()
-			return nil, false, errPoolLimit
-		}
-		if n > 0 {
-			socket = server.unusedSockets[n-1]
-			server.unusedSockets[n-1] = nil // Help GC.
-			server.unusedSockets = server.unusedSockets[:n-1]
-			info := server.info
-			server.Unlock()
-			err = socket.InitialAcquire(info, timeout)
-			if err != nil {
-				continue
-			}
-		} else {
-			server.Unlock()
-			socket, err = server.Connect(timeout)
-			if err == nil {
-				server.Lock()
-				// We've waited for the Connect, see if we got
-				// closed in the meantime
-				if server.closed {
-					server.Unlock()
-					socket.Release()
-					socket.Close()
-					return nil, abended, errServerClosed
-				}
-				server.liveSockets = append(server.liveSockets, socket)
-				server.Unlock()
-			}
-		}
-		return
-	}
-	panic("unreachable")
-}
-
-// Connect establishes a new connection to the server. This should
-// generally be done through server.AcquireSocket().
-func (server *mongoServer) Connect(timeout time.Duration) (*mongoSocket, error) {
-	server.RLock()
-	master := server.info.Master
-	dial := server.dial
-	server.RUnlock()
-
-	logf("Establishing new connection to %s (timeout=%s)...", server.Addr, timeout)
-	var conn net.Conn
-	var err error
-	switch {
-	case !dial.isSet():
-		// Cannot do this because it lacks timeout support. :-(
-		//conn, err = net.DialTCP("tcp", nil, server.tcpaddr)
-		conn, err = net.DialTimeout("tcp", server.ResolvedAddr, timeout)
-	case dial.old != nil:
-		conn, err = dial.old(server.tcpaddr)
-	case dial.new != nil:
-		conn, err = dial.new(&ServerAddr{server.Addr, server.tcpaddr})
-	default:
-		panic("dialer is set, but both dial.old and dial.new are nil")
-	}
-	if err != nil {
-		logf("Connection to %s failed: %v", server.Addr, err.Error())
-		return nil, err
-	}
-	logf("Connection to %s established.", server.Addr)
-
-	stats.conn(+1, master)
-	return newSocket(server, conn, timeout), nil
-}
-
-// Close forces closing all sockets that are alive, whether
-// they're currently in use or not.
-func (server *mongoServer) Close() {
-	server.Lock()
-	server.closed = true
-	liveSockets := server.liveSockets
-	unusedSockets := server.unusedSockets
-	server.liveSockets = nil
-	server.unusedSockets = nil
-	server.Unlock()
-	logf("Connections to %s closing (%d live sockets).", server.Addr, len(liveSockets))
-	for i, s := range liveSockets {
-		s.Close()
-		liveSockets[i] = nil
-	}
-	for i := range unusedSockets {
-		unusedSockets[i] = nil
-	}
-}
-
-// RecycleSocket puts socket back into the unused cache.
-func (server *mongoServer) RecycleSocket(socket *mongoSocket) {
-	server.Lock()
-	if !server.closed {
-		server.unusedSockets = append(server.unusedSockets, socket)
-	}
-	server.Unlock()
-}
-
-func removeSocket(sockets []*mongoSocket, socket *mongoSocket) []*mongoSocket {
-	for i, s := range sockets {
-		if s == socket {
-			copy(sockets[i:], sockets[i+1:])
-			n := len(sockets) - 1
-			sockets[n] = nil
-			sockets = sockets[:n]
-			break
-		}
-	}
-	return sockets
-}
-
-// AbendSocket notifies the server that the given socket has terminated
-// abnormally, and thus should be discarded rather than cached.
-func (server *mongoServer) AbendSocket(socket *mongoSocket) {
-	server.Lock()
-	server.abended = true
-	if server.closed {
-		server.Unlock()
-		return
-	}
-	server.liveSockets = removeSocket(server.liveSockets, socket)
-	server.unusedSockets = removeSocket(server.unusedSockets, socket)
-	server.Unlock()
-	// Maybe just a timeout, but suggest a cluster sync up just in case.
-	select {
-	case server.sync <- true:
-	default:
-	}
-}
-
-func (server *mongoServer) SetInfo(info *mongoServerInfo) {
-	server.Lock()
-	server.info = info
-	server.Unlock()
-}
-
-func (server *mongoServer) Info() *mongoServerInfo {
-	server.Lock()
-	info := server.info
-	server.Unlock()
-	return info
-}
-
-func (server *mongoServer) hasTags(serverTags []bson.D) bool {
-NextTagSet:
-	for _, tags := range serverTags {
-	NextReqTag:
-		for _, req := range tags {
-			for _, has := range server.info.Tags {
-				if req.Name == has.Name {
-					if req.Value == has.Value {
-						continue NextReqTag
-					}
-					continue NextTagSet
-				}
-			}
-			continue NextTagSet
-		}
-		return true
-	}
-	return false
-}
-
-var pingDelay = 5 * time.Second
-
-func (server *mongoServer) pinger(loop bool) {
-	var delay time.Duration
-	if raceDetector {
-		// This variable is only ever touched by tests.
-		globalMutex.Lock()
-		delay = pingDelay
-		globalMutex.Unlock()
-	} else {
-		delay = pingDelay
-	}
-	op := queryOp{
-		collection: "admin.$cmd",
-		query:      bson.D{{"ping", 1}},
-		flags:      flagSlaveOk,
-		limit:      -1,
-	}
-	for {
-		if loop {
-			time.Sleep(delay)
-		}
-		op := op
-		socket, _, err := server.AcquireSocket(0, 3*delay)
-		if err == nil {
-			start := time.Now()
-			_, _ = socket.SimpleQuery(&op)
-			delay := time.Now().Sub(start)
-
-			server.pingWindow[server.pingIndex] = delay
-			server.pingIndex = (server.pingIndex + 1) % len(server.pingWindow)
-			server.pingCount++
-			var max time.Duration
-			for i := 0; i < len(server.pingWindow) && uint32(i) < server.pingCount; i++ {
-				if server.pingWindow[i] > max {
-					max = server.pingWindow[i]
-				}
-			}
-			socket.Release()
-			server.Lock()
-			if server.closed {
-				loop = false
-			}
-			server.pingValue = max
-			server.Unlock()
-			logf("Ping for %s is %d ms", server.Addr, max/time.Millisecond)
-		} else if err == errServerClosed {
-			return
-		}
-		if !loop {
-			return
-		}
-	}
-}
-
-type mongoServerSlice []*mongoServer
-
-func (s mongoServerSlice) Len() int {
-	return len(s)
-}
-
-func (s mongoServerSlice) Less(i, j int) bool {
-	return s[i].ResolvedAddr < s[j].ResolvedAddr
-}
-
-func (s mongoServerSlice) Swap(i, j int) {
-	s[i], s[j] = s[j], s[i]
-}
-
-func (s mongoServerSlice) Sort() {
-	sort.Sort(s)
-}
-
-func (s mongoServerSlice) Search(resolvedAddr string) (i int, ok bool) {
-	n := len(s)
-	i = sort.Search(n, func(i int) bool {
-		return s[i].ResolvedAddr >= resolvedAddr
-	})
-	return i, i != n && s[i].ResolvedAddr == resolvedAddr
-}
-
-type mongoServers struct {
-	slice mongoServerSlice
-}
-
-func (servers *mongoServers) Search(resolvedAddr string) (server *mongoServer) {
-	if i, ok := servers.slice.Search(resolvedAddr); ok {
-		return servers.slice[i]
-	}
-	return nil
-}
-
-func (servers *mongoServers) Add(server *mongoServer) {
-	servers.slice = append(servers.slice, server)
-	servers.slice.Sort()
-}
-
-func (servers *mongoServers) Remove(other *mongoServer) (server *mongoServer) {
-	if i, found := servers.slice.Search(other.ResolvedAddr); found {
-		server = servers.slice[i]
-		copy(servers.slice[i:], servers.slice[i+1:])
-		n := len(servers.slice) - 1
-		servers.slice[n] = nil // Help GC.
-		servers.slice = servers.slice[:n]
-	}
-	return
-}
-
-func (servers *mongoServers) Slice() []*mongoServer {
-	return ([]*mongoServer)(servers.slice)
-}
-
-func (servers *mongoServers) Get(i int) *mongoServer {
-	return servers.slice[i]
-}
-
-func (servers *mongoServers) Len() int {
-	return len(servers.slice)
-}
-
-func (servers *mongoServers) Empty() bool {
-	return len(servers.slice) == 0
-}
-
-// BestFit returns the best guess of what would be the most interesting
-// server to perform operations on at this point in time.
-func (servers *mongoServers) BestFit(serverTags []bson.D) *mongoServer {
-	var best *mongoServer
-	for _, next := range servers.slice {
-		if best == nil {
-			best = next
-			best.RLock()
-			if serverTags != nil && !next.info.Mongos && !best.hasTags(serverTags) {
-				best.RUnlock()
-				best = nil
-			}
-			continue
-		}
-		next.RLock()
-		swap := false
-		switch {
-		case serverTags != nil && !next.info.Mongos && !next.hasTags(serverTags):
-			// Must have requested tags.
-		case next.info.Master != best.info.Master:
-			// Prefer slaves.
-			swap = best.info.Master
-		case absDuration(next.pingValue-best.pingValue) > 15*time.Millisecond:
-			// Prefer nearest server.
-			swap = next.pingValue < best.pingValue
-		case len(next.liveSockets)-len(next.unusedSockets) < len(best.liveSockets)-len(best.unusedSockets):
-			// Prefer servers with less connections.
-			swap = true
-		}
-		if swap {
-			best.RUnlock()
-			best = next
-		} else {
-			next.RUnlock()
-		}
-	}
-	if best != nil {
-		best.RUnlock()
-	}
-	return best
-}
-
-func absDuration(d time.Duration) time.Duration {
-	if d < 0 {
-		return -d
-	}
-	return d
-}
diff --git a/Godeps/_workspace/src/gopkg.in/mgo.v2/session.go b/Godeps/_workspace/src/gopkg.in/mgo.v2/session.go
deleted file mode 100644
index 036f44a63..000000000
--- a/Godeps/_workspace/src/gopkg.in/mgo.v2/session.go
+++ /dev/null
@@ -1,4224 +0,0 @@
-// mgo - MongoDB driver for Go
-//
-// Copyright (c) 2010-2012 - Gustavo Niemeyer <gustavo@niemeyer.net>
-//
-// 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 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.
-
-package mgo
-
-import (
-	"crypto/md5"
-	"encoding/hex"
-	"errors"
-	"fmt"
-	"math"
-	"net"
-	"net/url"
-	"reflect"
-	"sort"
-	"strconv"
-	"strings"
-	"sync"
-	"time"
-
-	"gopkg.in/mgo.v2/bson"
-)
-
-type mode int
-
-const (
-	Eventual  mode = 0
-	Monotonic mode = 1
-	Strong    mode = 2
-)
-
-// When changing the Session type, check if newSession and copySession
-// need to be updated too.
-
-type Session struct {
-	m            sync.RWMutex
-	cluster_     *mongoCluster
-	slaveSocket  *mongoSocket
-	masterSocket *mongoSocket
-	slaveOk      bool
-	consistency  mode
-	queryConfig  query
-	safeOp       *queryOp
-	syncTimeout  time.Duration
-	sockTimeout  time.Duration
-	defaultdb    string
-	sourcedb     string
-	dialCred     *Credential
-	creds        []Credential
-	poolLimit    int
-}
-
-type Database struct {
-	Session *Session
-	Name    string
-}
-
-type Collection struct {
-	Database *Database
-	Name     string // "collection"
-	FullName string // "db.collection"
-}
-
-type Query struct {
-	m       sync.Mutex
-	session *Session
-	query   // Enables default settings in session.
-}
-
-type query struct {
-	op       queryOp
-	prefetch float64
-	limit    int32
-}
-
-type getLastError struct {
-	CmdName  int         "getLastError,omitempty"
-	W        interface{} "w,omitempty"
-	WTimeout int         "wtimeout,omitempty"
-	FSync    bool        "fsync,omitempty"
-	J        bool        "j,omitempty"
-}
-
-type Iter struct {
-	m              sync.Mutex
-	gotReply       sync.Cond
-	session        *Session
-	server         *mongoServer
-	docData        queue
-	err            error
-	op             getMoreOp
-	prefetch       float64
-	limit          int32
-	docsToReceive  int
-	docsBeforeMore int
-	timeout        time.Duration
-	timedout       bool
-}
-
-var (
-	ErrNotFound = errors.New("not found")
-	ErrCursor   = errors.New("invalid cursor")
-)
-
-const defaultPrefetch = 0.25
-
-// Dial establishes a new session to the cluster identified by the given seed
-// server(s). The session will enable communication with all of the servers in
-// the cluster, so the seed servers are used only to find out about the cluster
-// topology.
-//
-// Dial will timeout after 10 seconds if a server isn't reached. The returned
-// session will timeout operations after one minute by default if servers
-// aren't available. To customize the timeout, see DialWithTimeout,
-// SetSyncTimeout, and SetSocketTimeout.
-//
-// This method is generally called just once for a given cluster.  Further
-// sessions to the same cluster are then established using the New or Copy
-// methods on the obtained session. This will make them share the underlying
-// cluster, and manage the pool of connections appropriately.
-//
-// Once the session is not useful anymore, Close must be called to release the
-// resources appropriately.
-//
-// The seed servers must be provided in the following format:
-//
-//     [mongodb://][user:pass@]host1[:port1][,host2[:port2],...][/database][?options]
-//
-// For example, it may be as simple as:
-//
-//     localhost
-//
-// Or more involved like:
-//
-//     mongodb://myuser:mypass@localhost:40001,otherhost:40001/mydb
-//
-// If the port number is not provided for a server, it defaults to 27017.
-//
-// The username and password provided in the URL will be used to authenticate
-// into the database named after the slash at the end of the host names, or
-// into the "admin" database if none is provided.  The authentication information
-// will persist in sessions obtained through the New method as well.
-//
-// The following connection options are supported after the question mark:
-//
-//     connect=direct
-//
-//         Disables the automatic replica set server discovery logic, and
-//         forces the use of servers provided only (even if secondaries).
-//         Note that to talk to a secondary the consistency requirements
-//         must be relaxed to Monotonic or Eventual via SetMode.
-//
-//
-//     authSource=<db>
-//
-//         Informs the database used to establish credentials and privileges
-//         with a MongoDB server. Defaults to the database name provided via
-//         the URL path, and "admin" if that's unset.
-//
-//
-//     authMechanism=<mechanism>
-//
-//        Defines the protocol for credential negotiation. Defaults to "MONGODB-CR",
-//        which is the default username/password challenge-response mechanism.
-//
-//
-//     gssapiServiceName=<name>
-//
-//        Defines the service name to use when authenticating with the GSSAPI
-//        mechanism. Defaults to "mongodb".
-//
-//     maxPoolSize=<limit>
-//
-//        Defines the per-server socket pool limit. Defaults to 4096.
-//        See Session.SetPoolLimit for details.
-//
-//
-// Relevant documentation:
-//
-//     http://docs.mongodb.org/manual/reference/connection-string/
-//
-func Dial(url string) (*Session, error) {
-	session, err := DialWithTimeout(url, 10*time.Second)
-	if err == nil {
-		session.SetSyncTimeout(1 * time.Minute)
-		session.SetSocketTimeout(1 * time.Minute)
-	}
-	return session, err
-}
-
-// DialWithTimeout works like Dial, but uses timeout as the amount of time to
-// wait for a server to respond when first connecting and also on follow up
-// operations in the session. If timeout is zero, the call may block
-// forever waiting for a connection to be made.
-//
-// See SetSyncTimeout for customizing the timeout for the session.
-func DialWithTimeout(url string, timeout time.Duration) (*Session, error) {
-	info, err := ParseURL(url)
-	if err != nil {
-		return nil, err
-	}
-	info.Timeout = timeout
-	return DialWithInfo(info)
-}
-
-// ParseURL parses a MongoDB URL as accepted by the Dial function and returns
-// a value suitable for providing into DialWithInfo.
-//
-// See Dial for more details on the format of url.
-func ParseURL(url string) (*DialInfo, error) {
-	uinfo, err := extractURL(url)
-	if err != nil {
-		return nil, err
-	}
-	direct := false
-	mechanism := ""
-	service := ""
-	source := ""
-	setName := ""
-	poolLimit := 0
-	for k, v := range uinfo.options {
-		switch k {
-		case "authSource":
-			source = v
-		case "authMechanism":
-			mechanism = v
-		case "gssapiServiceName":
-			service = v
-		case "replicaSet":
-			setName = v
-		case "maxPoolSize":
-			poolLimit, err = strconv.Atoi(v)
-			if err != nil {
-				return nil, errors.New("bad value for maxPoolSize: " + v)
-			}
-		case "connect":
-			if v == "direct" {
-				direct = true
-				break
-			}
-			if v == "replicaSet" {
-				break
-			}
-			fallthrough
-		default:
-			return nil, errors.New("unsupported connection URL option: " + k + "=" + v)
-		}
-	}
-	info := DialInfo{
-		Addrs:          uinfo.addrs,
-		Direct:         direct,
-		Database:       uinfo.db,
-		Username:       uinfo.user,
-		Password:       uinfo.pass,
-		Mechanism:      mechanism,
-		Service:        service,
-		Source:         source,
-		PoolLimit:      poolLimit,
-		ReplicaSetName: setName,
-	}
-	return &info, nil
-}
-
-// DialInfo holds options for establishing a session with a MongoDB cluster.
-// To use a URL, see the Dial function.
-type DialInfo struct {
-	// Addrs holds the addresses for the seed servers.
-	Addrs []string
-
-	// Direct informs whether to establish connections only with the
-	// specified seed servers, or to obtain information for the whole
-	// cluster and establish connections with further servers too.
-	Direct bool
-
-	// Timeout is the amount of time to wait for a server to respond when
-	// first connecting and on follow up operations in the session. If
-	// timeout is zero, the call may block forever waiting for a connection
-	// to be established.
-	Timeout time.Duration
-
-	// FailFast will cause connection and query attempts to fail faster when
-	// the server is unavailable, instead of retrying until the configured
-	// timeout period. Note that an unavailable server may silently drop
-	// packets instead of rejecting them, in which case it's impossible to
-	// distinguish it from a slow server, so the timeout stays relevant.
-	FailFast bool
-
-	// Database is the default database name used when the Session.DB method
-	// is called with an empty name, and is also used during the intial
-	// authentication if Source is unset.
-	Database string
-
-	// ReplicaSetName, if specified, will prevent the obtained session from
-	// communicating with any server which is not part of a replica set
-	// with the given name. The default is to communicate with any server
-	// specified or discovered via the servers contacted.
-	ReplicaSetName string
-
-	// Source is the database used to establish credentials and privileges
-	// with a MongoDB server. Defaults to the value of Database, if that is
-	// set, or "admin" otherwise.
-	Source string
-
-	// Service defines the service name to use when authenticating with the GSSAPI
-	// mechanism. Defaults to "mongodb".
-	Service string
-
-	// ServiceHost defines which hostname to use when authenticating
-	// with the GSSAPI mechanism. If not specified, defaults to the MongoDB
-	// server's address.
-	ServiceHost string
-
-	// Mechanism defines the protocol for credential negotiation.
-	// Defaults to "MONGODB-CR".
-	Mechanism string
-
-	// Username and Password inform the credentials for the initial authentication
-	// done on the database defined by the Source field. See Session.Login.
-	Username string
-	Password string
-
-	// PoolLimit defines the per-server socket pool limit. Defaults to 4096.
-	// See Session.SetPoolLimit for details.
-	PoolLimit int
-
-	// DialServer optionally specifies the dial function for establishing
-	// connections with the MongoDB servers.
-	DialServer func(addr *ServerAddr) (net.Conn, error)
-
-	// WARNING: This field is obsolete. See DialServer above.
-	Dial func(addr net.Addr) (net.Conn, error)
-}
-
-// ServerAddr represents the address for establishing a connection to an
-// individual MongoDB server.
-type ServerAddr struct {
-	str string
-	tcp *net.TCPAddr
-}
-
-// String returns the address that was provided for the server before resolution.
-func (addr *ServerAddr) String() string {
-	return addr.str
-}
-
-// TCPAddr returns the resolved TCP address for the server.
-func (addr *ServerAddr) TCPAddr() *net.TCPAddr {
-	return addr.tcp
-}
-
-// DialWithInfo establishes a new session to the cluster identified by info.
-func DialWithInfo(info *DialInfo) (*Session, error) {
-	addrs := make([]string, len(info.Addrs))
-	for i, addr := range info.Addrs {
-		p := strings.LastIndexAny(addr, "]:")
-		if p == -1 || addr[p] != ':' {
-			// XXX This is untested. The test suite doesn't use the standard port.
-			addr += ":27017"
-		}
-		addrs[i] = addr
-	}
-	cluster := newCluster(addrs, info.Direct, info.FailFast, dialer{info.Dial, info.DialServer}, info.ReplicaSetName)
-	session := newSession(Eventual, cluster, info.Timeout)
-	session.defaultdb = info.Database
-	if session.defaultdb == "" {
-		session.defaultdb = "test"
-	}
-	session.sourcedb = info.Source
-	if session.sourcedb == "" {
-		session.sourcedb = info.Database
-		if session.sourcedb == "" {
-			session.sourcedb = "admin"
-		}
-	}
-	if info.Username != "" {
-		source := session.sourcedb
-		if info.Source == "" &&
-			(info.Mechanism == "GSSAPI" || info.Mechanism == "PLAIN" || info.Mechanism == "MONGODB-X509") {
-			source = "$external"
-		}
-		session.dialCred = &Credential{
-			Username:    info.Username,
-			Password:    info.Password,
-			Mechanism:   info.Mechanism,
-			Service:     info.Service,
-			ServiceHost: info.ServiceHost,
-			Source:      source,
-		}
-		session.creds = []Credential{*session.dialCred}
-	}
-	if info.PoolLimit > 0 {
-		session.poolLimit = info.PoolLimit
-	}
-	cluster.Release()
-
-	// People get confused when we return a session that is not actually
-	// established to any servers yet (e.g. what if url was wrong). So,
-	// ping the server to ensure there's someone there, and abort if it
-	// fails.
-	if err := session.Ping(); err != nil {
-		session.Close()
-		return nil, err
-	}
-	session.SetMode(Strong, true)
-	return session, nil
-}
-
-func isOptSep(c rune) bool {
-	return c == ';' || c == '&'
-}
-
-type urlInfo struct {
-	addrs   []string
-	user    string
-	pass    string
-	db      string
-	options map[string]string
-}
-
-func extractURL(s string) (*urlInfo, error) {
-	if strings.HasPrefix(s, "mongodb://") {
-		s = s[10:]
-	}
-	info := &urlInfo{options: make(map[string]string)}
-	if c := strings.Index(s, "?"); c != -1 {
-		for _, pair := range strings.FieldsFunc(s[c+1:], isOptSep) {
-			l := strings.SplitN(pair, "=", 2)
-			if len(l) != 2 || l[0] == "" || l[1] == "" {
-				return nil, errors.New("connection option must be key=value: " + pair)
-			}
-			info.options[l[0]] = l[1]
-		}
-		s = s[:c]
-	}
-	if c := strings.Index(s, "@"); c != -1 {
-		pair := strings.SplitN(s[:c], ":", 2)
-		if len(pair) > 2 || pair[0] == "" {
-			return nil, errors.New("credentials must be provided as user:pass@host")
-		}
-		var err error
-		info.user, err = url.QueryUnescape(pair[0])
-		if err != nil {
-			return nil, fmt.Errorf("cannot unescape username in URL: %q", pair[0])
-		}
-		if len(pair) > 1 {
-			info.pass, err = url.QueryUnescape(pair[1])
-			if err != nil {
-				return nil, fmt.Errorf("cannot unescape password in URL")
-			}
-		}
-		s = s[c+1:]
-	}
-	if c := strings.Index(s, "/"); c != -1 {
-		info.db = s[c+1:]
-		s = s[:c]
-	}
-	info.addrs = strings.Split(s, ",")
-	return info, nil
-}
-
-func newSession(consistency mode, cluster *mongoCluster, timeout time.Duration) (session *Session) {
-	cluster.Acquire()
-	session = &Session{
-		cluster_:    cluster,
-		syncTimeout: timeout,
-		sockTimeout: timeout,
-		poolLimit:   4096,
-	}
-	debugf("New session %p on cluster %p", session, cluster)
-	session.SetMode(consistency, true)
-	session.SetSafe(&Safe{})
-	session.queryConfig.prefetch = defaultPrefetch
-	return session
-}
-
-func copySession(session *Session, keepCreds bool) (s *Session) {
-	cluster := session.cluster()
-	cluster.Acquire()
-	if session.masterSocket != nil {
-		session.masterSocket.Acquire()
-	}
-	if session.slaveSocket != nil {
-		session.slaveSocket.Acquire()
-	}
-	var creds []Credential
-	if keepCreds {
-		creds = make([]Credential, len(session.creds))
-		copy(creds, session.creds)
-	} else if session.dialCred != nil {
-		creds = []Credential{*session.dialCred}
-	}
-	scopy := *session
-	scopy.m = sync.RWMutex{}
-	scopy.creds = creds
-	s = &scopy
-	debugf("New session %p on cluster %p (copy from %p)", s, cluster, session)
-	return s
-}
-
-// LiveServers returns a list of server addresses which are
-// currently known to be alive.
-func (s *Session) LiveServers() (addrs []string) {
-	s.m.RLock()
-	addrs = s.cluster().LiveServers()
-	s.m.RUnlock()
-	return addrs
-}
-
-// DB returns a value representing the named database. If name
-// is empty, the database name provided in the dialed URL is
-// used instead. If that is also empty, "test" is used as a
-// fallback in a way equivalent to the mongo shell.
-//
-// Creating this value is a very lightweight operation, and
-// involves no network communication.
-func (s *Session) DB(name string) *Database {
-	if name == "" {
-		name = s.defaultdb
-	}
-	return &Database{s, name}
-}
-
-// C returns a value representing the named collection.
-//
-// Creating this value is a very lightweight operation, and
-// involves no network communication.
-func (db *Database) C(name string) *Collection {
-	return &Collection{db, name, db.Name + "." + name}
-}
-
-// With returns a copy of db that uses session s.
-func (db *Database) With(s *Session) *Database {
-	newdb := *db
-	newdb.Session = s
-	return &newdb
-}
-
-// With returns a copy of c that uses session s.
-func (c *Collection) With(s *Session) *Collection {
-	newdb := *c.Database
-	newdb.Session = s
-	newc := *c
-	newc.Database = &newdb
-	return &newc
-}
-
-// GridFS returns a GridFS value representing collections in db that
-// follow the standard GridFS specification.
-// The provided prefix (sometimes known as root) will determine which
-// collections to use, and is usually set to "fs" when there is a
-// single GridFS in the database.
-//
-// See the GridFS Create, Open, and OpenId methods for more details.
-//
-// Relevant documentation:
-//
-//     http://www.mongodb.org/display/DOCS/GridFS
-//     http://www.mongodb.org/display/DOCS/GridFS+Tools
-//     http://www.mongodb.org/display/DOCS/GridFS+Specification
-//
-func (db *Database) GridFS(prefix string) *GridFS {
-	return newGridFS(db, prefix)
-}
-
-// Run issues the provided command on the db database and unmarshals
-// its result in the respective argument. The cmd argument may be either
-// a string with the command name itself, in which case an empty document of
-// the form bson.M{cmd: 1} will be used, or it may be a full command document.
-//
-// Note that MongoDB considers the first marshalled key as the command
-// name, so when providing a command with options, it's important to
-// use an ordering-preserving document, such as a struct value or an
-// instance of bson.D.  For instance:
-//
-//     db.Run(bson.D{{"create", "mycollection"}, {"size", 1024}})
-//
-// For privilleged commands typically run on the "admin" database, see
-// the Run method in the Session type.
-//
-// Relevant documentation:
-//
-//     http://www.mongodb.org/display/DOCS/Commands
-//     http://www.mongodb.org/display/DOCS/List+of+Database+CommandSkips
-//
-func (db *Database) Run(cmd interface{}, result interface{}) error {
-	socket, err := db.Session.acquireSocket(true)
-	if err != nil {
-		return err
-	}
-	defer socket.Release()
-
-	// This is an optimized form of db.C("$cmd").Find(cmd).One(result).
-	return db.run(socket, cmd, result)
-}
-
-// Credential holds details to authenticate with a MongoDB server.
-type Credential struct {
-	// Username and Password hold the basic details for authentication.
-	// Password is optional with some authentication mechanisms.
-	Username string
-	Password string
-
-	// Source is the database used to establish credentials and privileges
-	// with a MongoDB server. Defaults to the default database provided
-	// during dial, or "admin" if that was unset.
-	Source string
-
-	// Service defines the service name to use when authenticating with the GSSAPI
-	// mechanism. Defaults to "mongodb".
-	Service string
-
-	// ServiceHost defines which hostname to use when authenticating
-	// with the GSSAPI mechanism. If not specified, defaults to the MongoDB
-	// server's address.
-	ServiceHost string
-
-	// Mechanism defines the protocol for credential negotiation.
-	// Defaults to "MONGODB-CR".
-	Mechanism string
-}
-
-// Login authenticates with MongoDB using the provided credential.  The
-// authentication is valid for the whole session and will stay valid until
-// Logout is explicitly called for the same database, or the session is
-// closed.
-func (db *Database) Login(user, pass string) error {
-	return db.Session.Login(&Credential{Username: user, Password: pass, Source: db.Name})
-}
-
-// Login authenticates with MongoDB using the provided credential.  The
-// authentication is valid for the whole session and will stay valid until
-// Logout is explicitly called for the same database, or the session is
-// closed.
-func (s *Session) Login(cred *Credential) error {
-	socket, err := s.acquireSocket(true)
-	if err != nil {
-		return err
-	}
-	defer socket.Release()
-
-	credCopy := *cred
-	if cred.Source == "" {
-		if cred.Mechanism == "GSSAPI" {
-			credCopy.Source = "$external"
-		} else {
-			credCopy.Source = s.sourcedb
-		}
-	}
-	err = socket.Login(credCopy)
-	if err != nil {
-		return err
-	}
-
-	s.m.Lock()
-	s.creds = append(s.creds, credCopy)
-	s.m.Unlock()
-	return nil
-}
-
-func (s *Session) socketLogin(socket *mongoSocket) error {
-	for _, cred := range s.creds {
-		if err := socket.Login(cred); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-// Logout removes any established authentication credentials for the database.
-func (db *Database) Logout() {
-	session := db.Session
-	dbname := db.Name
-	session.m.Lock()
-	found := false
-	for i, cred := range session.creds {
-		if cred.Source == dbname {
-			copy(session.creds[i:], session.creds[i+1:])
-			session.creds = session.creds[:len(session.creds)-1]
-			found = true
-			break
-		}
-	}
-	if found {
-		if session.masterSocket != nil {
-			session.masterSocket.Logout(dbname)
-		}
-		if session.slaveSocket != nil {
-			session.slaveSocket.Logout(dbname)
-		}
-	}
-	session.m.Unlock()
-}
-
-// LogoutAll removes all established authentication credentials for the session.
-func (s *Session) LogoutAll() {
-	s.m.Lock()
-	for _, cred := range s.creds {
-		if s.masterSocket != nil {
-			s.masterSocket.Logout(cred.Source)
-		}
-		if s.slaveSocket != nil {
-			s.slaveSocket.Logout(cred.Source)
-		}
-	}
-	s.creds = s.creds[0:0]
-	s.m.Unlock()
-}
-
-// User represents a MongoDB user.
-//
-// Relevant documentation:
-//
-//     http://docs.mongodb.org/manual/reference/privilege-documents/
-//     http://docs.mongodb.org/manual/reference/user-privileges/
-//
-type User struct {
-	// Username is how the user identifies itself to the system.
-	Username string `bson:"user"`
-
-	// Password is the plaintext password for the user. If set,
-	// the UpsertUser method will hash it into PasswordHash and
-	// unset it before the user is added to the database.
-	Password string `bson:",omitempty"`
-
-	// PasswordHash is the MD5 hash of Username+":mongo:"+Password.
-	PasswordHash string `bson:"pwd,omitempty"`
-
-	// CustomData holds arbitrary data admins decide to associate
-	// with this user, such as the full name or employee id.
-	CustomData interface{} `bson:"customData,omitempty"`
-
-	// Roles indicates the set of roles the user will be provided.
-	// See the Role constants.
-	Roles []Role `bson:"roles"`
-
-	// OtherDBRoles allows assigning roles in other databases from
-	// user documents inserted in the admin database. This field
-	// only works in the admin database.
-	OtherDBRoles map[string][]Role `bson:"otherDBRoles,omitempty"`
-
-	// UserSource indicates where to look for this user's credentials.
-	// It may be set to a database name, or to "$external" for
-	// consulting an external resource such as Kerberos. UserSource
-	// must not be set if Password or PasswordHash are present.
-	//
-	// WARNING: This setting was only ever supported in MongoDB 2.4,
-	// and is now obsolete.
-	UserSource string `bson:"userSource,omitempty"`
-}
-
-type Role string
-
-const (
-	// Relevant documentation:
-	//
-	//     http://docs.mongodb.org/manual/reference/user-privileges/
-	//
-	RoleRoot         Role = "root"
-	RoleRead         Role = "read"
-	RoleReadAny      Role = "readAnyDatabase"
-	RoleReadWrite    Role = "readWrite"
-	RoleReadWriteAny Role = "readWriteAnyDatabase"
-	RoleDBAdmin      Role = "dbAdmin"
-	RoleDBAdminAny   Role = "dbAdminAnyDatabase"
-	RoleUserAdmin    Role = "userAdmin"
-	RoleUserAdminAny Role = "userAdminAnyDatabase"
-	RoleClusterAdmin Role = "clusterAdmin"
-)
-
-// UpsertUser updates the authentication credentials and the roles for
-// a MongoDB user within the db database. If the named user doesn't exist
-// it will be created.
-//
-// This method should only be used from MongoDB 2.4 and on. For older
-// MongoDB releases, use the obsolete AddUser method instead.
-//
-// Relevant documentation:
-//
-//     http://docs.mongodb.org/manual/reference/user-privileges/
-//     http://docs.mongodb.org/manual/reference/privilege-documents/
-//
-func (db *Database) UpsertUser(user *User) error {
-	if user.Username == "" {
-		return fmt.Errorf("user has no Username")
-	}
-	if (user.Password != "" || user.PasswordHash != "") && user.UserSource != "" {
-		return fmt.Errorf("user has both Password/PasswordHash and UserSource set")
-	}
-	if len(user.OtherDBRoles) > 0 && db.Name != "admin" && db.Name != "$external" {
-		return fmt.Errorf("user with OtherDBRoles is only supported in the admin or $external databases")
-	}
-
-	// Attempt to run this using 2.6+ commands.
-	rundb := db
-	if user.UserSource != "" {
-		// Compatibility logic for the userSource field of MongoDB <= 2.4.X
-		rundb = db.Session.DB(user.UserSource)
-	}
-	err := rundb.runUserCmd("updateUser", user)
-	// retry with createUser when isAuthError in order to enable the "localhost exception"
-	if isNotFound(err) || isAuthError(err) {
-		return rundb.runUserCmd("createUser", user)
-	}
-	if !isNoCmd(err) {
-		return err
-	}
-
-	// Command does not exist. Fallback to pre-2.6 behavior.
-	var set, unset bson.D
-	if user.Password != "" {
-		psum := md5.New()
-		psum.Write([]byte(user.Username + ":mongo:" + user.Password))
-		set = append(set, bson.DocElem{"pwd", hex.EncodeToString(psum.Sum(nil))})
-		unset = append(unset, bson.DocElem{"userSource", 1})
-	} else if user.PasswordHash != "" {
-		set = append(set, bson.DocElem{"pwd", user.PasswordHash})
-		unset = append(unset, bson.DocElem{"userSource", 1})
-	}
-	if user.UserSource != "" {
-		set = append(set, bson.DocElem{"userSource", user.UserSource})
-		unset = append(unset, bson.DocElem{"pwd", 1})
-	}
-	if user.Roles != nil || user.OtherDBRoles != nil {
-		set = append(set, bson.DocElem{"roles", user.Roles})
-		if len(user.OtherDBRoles) > 0 {
-			set = append(set, bson.DocElem{"otherDBRoles", user.OtherDBRoles})
-		} else {
-			unset = append(unset, bson.DocElem{"otherDBRoles", 1})
-		}
-	}
-	users := db.C("system.users")
-	err = users.Update(bson.D{{"user", user.Username}}, bson.D{{"$unset", unset}, {"$set", set}})
-	if err == ErrNotFound {
-		set = append(set, bson.DocElem{"user", user.Username})
-		if user.Roles == nil && user.OtherDBRoles == nil {
-			// Roles must be sent, as it's the way MongoDB distinguishes
-			// old-style documents from new-style documents in pre-2.6.
-			set = append(set, bson.DocElem{"roles", user.Roles})
-		}
-		err = users.Insert(set)
-	}
-	return err
-}
-
-func isNoCmd(err error) bool {
-	e, ok := err.(*QueryError)
-	return ok && (e.Code == 59 || e.Code == 13390 || strings.HasPrefix(e.Message, "no such cmd:"))
-}
-
-func isNotFound(err error) bool {
-	e, ok := err.(*QueryError)
-	return ok && e.Code == 11
-}
-
-func isAuthError(err error) bool {
-	e, ok := err.(*QueryError)
-	return ok && e.Code == 13
-}
-
-func (db *Database) runUserCmd(cmdName string, user *User) error {
-	cmd := make(bson.D, 0, 16)
-	cmd = append(cmd, bson.DocElem{cmdName, user.Username})
-	if user.Password != "" {
-		cmd = append(cmd, bson.DocElem{"pwd", user.Password})
-	}
-	var roles []interface{}
-	for _, role := range user.Roles {
-		roles = append(roles, role)
-	}
-	for db, dbroles := range user.OtherDBRoles {
-		for _, role := range dbroles {
-			roles = append(roles, bson.D{{"role", role}, {"db", db}})
-		}
-	}
-	if roles != nil || user.Roles != nil || cmdName == "createUser" {
-		cmd = append(cmd, bson.DocElem{"roles", roles})
-	}
-	err := db.Run(cmd, nil)
-	if !isNoCmd(err) && user.UserSource != "" && (user.UserSource != "$external" || db.Name != "$external") {
-		return fmt.Errorf("MongoDB 2.6+ does not support the UserSource setting")
-	}
-	return err
-}
-
-// AddUser creates or updates the authentication credentials of user within
-// the db database.
-//
-// WARNING: This method is obsolete and should only be used with MongoDB 2.2
-// or earlier. For MongoDB 2.4 and on, use UpsertUser instead.
-func (db *Database) AddUser(username, password string, readOnly bool) error {
-	// Try to emulate the old behavior on 2.6+
-	user := &User{Username: username, Password: password}
-	if db.Name == "admin" {
-		if readOnly {
-			user.Roles = []Role{RoleReadAny}
-		} else {
-			user.Roles = []Role{RoleReadWriteAny}
-		}
-	} else {
-		if readOnly {
-			user.Roles = []Role{RoleRead}
-		} else {
-			user.Roles = []Role{RoleReadWrite}
-		}
-	}
-	err := db.runUserCmd("updateUser", user)
-	if isNotFound(err) {
-		return db.runUserCmd("createUser", user)
-	}
-	if !isNoCmd(err) {
-		return err
-	}
-
-	// Command doesn't exist. Fallback to pre-2.6 behavior.
-	psum := md5.New()
-	psum.Write([]byte(username + ":mongo:" + password))
-	digest := hex.EncodeToString(psum.Sum(nil))
-	c := db.C("system.users")
-	_, err = c.Upsert(bson.M{"user": username}, bson.M{"$set": bson.M{"user": username, "pwd": digest, "readOnly": readOnly}})
-	return err
-}
-
-// RemoveUser removes the authentication credentials of user from the database.
-func (db *Database) RemoveUser(user string) error {
-	err := db.Run(bson.D{{"dropUser", user}}, nil)
-	if isNoCmd(err) {
-		users := db.C("system.users")
-		return users.Remove(bson.M{"user": user})
-	}
-	if isNotFound(err) {
-		return ErrNotFound
-	}
-	return err
-}
-
-type indexSpec struct {
-	Name, NS         string
-	Key              bson.D
-	Unique           bool    ",omitempty"
-	DropDups         bool    "dropDups,omitempty"
-	Background       bool    ",omitempty"
-	Sparse           bool    ",omitempty"
-	Bits, Min, Max   int     ",omitempty"
-	BucketSize       float64 "bucketSize,omitempty"
-	ExpireAfter      int     "expireAfterSeconds,omitempty"
-	Weights          bson.D  ",omitempty"
-	DefaultLanguage  string  "default_language,omitempty"
-	LanguageOverride string  "language_override,omitempty"
-}
-
-type Index struct {
-	Key        []string // Index key fields; prefix name with dash (-) for descending order
-	Unique     bool     // Prevent two documents from having the same index key
-	DropDups   bool     // Drop documents with the same index key as a previously indexed one
-	Background bool     // Build index in background and return immediately
-	Sparse     bool     // Only index documents containing the Key fields
-
-	// If ExpireAfter is defined the server will periodically delete
-	// documents with indexed time.Time older than the provided delta.
-	ExpireAfter time.Duration
-
-	// Name holds the stored index name. On creation this field is ignored and the index name
-	// is automatically computed by EnsureIndex based on the index key
-	Name string
-
-	// Properties for spatial indexes.
-	Bits, Min, Max int
-	BucketSize     float64
-
-	// Properties for text indexes.
-	DefaultLanguage  string
-	LanguageOverride string
-
-	// Weights defines the significance of provided fields relative to other
-	// fields in a text index. The score for a given word in a document is derived
-	// from the weighted sum of the frequency for each of the indexed fields in
-	// that document. The default field weight is 1.
-	Weights map[string]int
-}
-
-type indexKeyInfo struct {
-	name    string
-	key     bson.D
-	weights bson.D
-}
-
-func parseIndexKey(key []string) (*indexKeyInfo, error) {
-	var keyInfo indexKeyInfo
-	isText := false
-	var order interface{}
-	for _, field := range key {
-		raw := field
-		if keyInfo.name != "" {
-			keyInfo.name += "_"
-		}
-		var kind string
-		if field != "" {
-			if field[0] == '$' {
-				if c := strings.Index(field, ":"); c > 1 && c < len(field)-1 {
-					kind = field[1:c]
-					field = field[c+1:]
-					keyInfo.name += field + "_" + kind
-				} else {
-					field = "\x00"
-				}
-			}
-			switch field[0] {
-			case 0:
-				// Logic above failed. Reset and error.
-				field = ""
-			case '@':
-				order = "2d"
-				field = field[1:]
-				// The shell used to render this field as key_ instead of key_2d,
-				// and mgo followed suit. This has been fixed in recent server
-				// releases, and mgo followed as well.
-				keyInfo.name += field + "_2d"
-			case '-':
-				order = -1
-				field = field[1:]
-				keyInfo.name += field + "_-1"
-			case '+':
-				field = field[1:]
-				fallthrough
-			default:
-				if kind == "" {
-					order = 1
-					keyInfo.name += field + "_1"
-				} else {
-					order = kind
-				}
-			}
-		}
-		if field == "" || kind != "" && order != kind {
-			return nil, fmt.Errorf(`invalid index key: want "[$<kind>:][-]<field name>", got %q`, raw)
-		}
-		if kind == "text" {
-			if !isText {
-				keyInfo.key = append(keyInfo.key, bson.DocElem{"_fts", "text"}, bson.DocElem{"_ftsx", 1})
-				isText = true
-			}
-			keyInfo.weights = append(keyInfo.weights, bson.DocElem{field, 1})
-		} else {
-			keyInfo.key = append(keyInfo.key, bson.DocElem{field, order})
-		}
-	}
-	if keyInfo.name == "" {
-		return nil, errors.New("invalid index key: no fields provided")
-	}
-	return &keyInfo, nil
-}
-
-// EnsureIndexKey ensures an index with the given key exists, creating it
-// if necessary.
-//
-// This example:
-//
-//     err := collection.EnsureIndexKey("a", "b")
-//
-// Is equivalent to:
-//
-//     err := collection.EnsureIndex(mgo.Index{Key: []string{"a", "b"}})
-//
-// See the EnsureIndex method for more details.
-func (c *Collection) EnsureIndexKey(key ...string) error {
-	return c.EnsureIndex(Index{Key: key})
-}
-
-// EnsureIndex ensures an index with the given key exists, creating it with
-// the provided parameters if necessary. EnsureIndex does not modify a previously
-// existent index with a matching key. The old index must be dropped first instead.
-//
-// Once EnsureIndex returns successfully, following requests for the same index
-// will not contact the server unless Collection.DropIndex is used to drop the
-// same index, or Session.ResetIndexCache is called.
-//
-// For example:
-//
-//     index := Index{
-//         Key: []string{"lastname", "firstname"},
-//         Unique: true,
-//         DropDups: true,
-//         Background: true, // See notes.
-//         Sparse: true,
-//     }
-//     err := collection.EnsureIndex(index)
-//
-// The Key value determines which fields compose the index. The index ordering
-// will be ascending by default.  To obtain an index with a descending order,
-// the field name should be prefixed by a dash (e.g. []string{"-time"}). It can
-// also be optionally prefixed by an index kind, as in "$text:summary" or
-// "$2d:-point". The key string format is:
-//
-//     [$<kind>:][-]<field name>
-//
-// If the Unique field is true, the index must necessarily contain only a single
-// document per Key.  With DropDups set to true, documents with the same key
-// as a previously indexed one will be dropped rather than an error returned.
-//
-// If Background is true, other connections will be allowed to proceed using
-// the collection without the index while it's being built. Note that the
-// session executing EnsureIndex will be blocked for as long as it takes for
-// the index to be built.
-//
-// If Sparse is true, only documents containing the provided Key fields will be
-// included in the index.  When using a sparse index for sorting, only indexed
-// documents will be returned.
-//
-// If ExpireAfter is non-zero, the server will periodically scan the collection
-// and remove documents containing an indexed time.Time field with a value
-// older than ExpireAfter. See the documentation for details:
-//
-//     http://docs.mongodb.org/manual/tutorial/expire-data
-//
-// Other kinds of indexes are also supported through that API. Here is an example:
-//
-//     index := Index{
-//         Key: []string{"$2d:loc"},
-//         Bits: 26,
-//     }
-//     err := collection.EnsureIndex(index)
-//
-// The example above requests the creation of a "2d" index for the "loc" field.
-//
-// The 2D index bounds may be changed using the Min and Max attributes of the
-// Index value.  The default bound setting of (-180, 180) is suitable for
-// latitude/longitude pairs.
-//
-// The Bits parameter sets the precision of the 2D geohash values.  If not
-// provided, 26 bits are used, which is roughly equivalent to 1 foot of
-// precision for the default (-180, 180) index bounds.
-//
-// Relevant documentation:
-//
-//     http://www.mongodb.org/display/DOCS/Indexes
-//     http://www.mongodb.org/display/DOCS/Indexing+Advice+and+FAQ
-//     http://www.mongodb.org/display/DOCS/Indexing+as+a+Background+Operation
-//     http://www.mongodb.org/display/DOCS/Geospatial+Indexing
-//     http://www.mongodb.org/display/DOCS/Multikeys
-//
-func (c *Collection) EnsureIndex(index Index) error {
-	keyInfo, err := parseIndexKey(index.Key)
-	if err != nil {
-		return err
-	}
-
-	session := c.Database.Session
-	cacheKey := c.FullName + "\x00" + keyInfo.name
-	if session.cluster().HasCachedIndex(cacheKey) {
-		return nil
-	}
-
-	spec := indexSpec{
-		Name:             keyInfo.name,
-		NS:               c.FullName,
-		Key:              keyInfo.key,
-		Unique:           index.Unique,
-		DropDups:         index.DropDups,
-		Background:       index.Background,
-		Sparse:           index.Sparse,
-		Bits:             index.Bits,
-		Min:              index.Min,
-		Max:              index.Max,
-		BucketSize:       index.BucketSize,
-		ExpireAfter:      int(index.ExpireAfter / time.Second),
-		Weights:          keyInfo.weights,
-		DefaultLanguage:  index.DefaultLanguage,
-		LanguageOverride: index.LanguageOverride,
-	}
-
-NextField:
-	for name, weight := range index.Weights {
-		for i, elem := range spec.Weights {
-			if elem.Name == name {
-				spec.Weights[i].Value = weight
-				continue NextField
-			}
-		}
-		panic("weight provided for field that is not part of index key: " + name)
-	}
-
-	cloned := session.Clone()
-	defer cloned.Close()
-	cloned.SetMode(Strong, false)
-	cloned.EnsureSafe(&Safe{})
-	db := c.Database.With(cloned)
-
-	// Try with a command first.
-	err = db.Run(bson.D{{"createIndexes", c.Name}, {"indexes", []indexSpec{spec}}}, nil)
-	if isNoCmd(err) {
-		// Command not yet supported. Insert into the indexes collection instead.
-		err = db.C("system.indexes").Insert(&spec)
-	}
-	if err == nil {
-		session.cluster().CacheIndex(cacheKey, true)
-	}
-	return err
-}
-
-// DropIndex removes the index with key from the collection.
-//
-// The key value determines which fields compose the index. The index ordering
-// will be ascending by default.  To obtain an index with a descending order,
-// the field name should be prefixed by a dash (e.g. []string{"-time"}).
-//
-// For example:
-//
-//     err := collection.DropIndex("lastname", "firstname")
-//
-// See the EnsureIndex method for more details on indexes.
-func (c *Collection) DropIndex(key ...string) error {
-	keyInfo, err := parseIndexKey(key)
-	if err != nil {
-		return err
-	}
-
-	session := c.Database.Session
-	cacheKey := c.FullName + "\x00" + keyInfo.name
-	session.cluster().CacheIndex(cacheKey, false)
-
-	session = session.Clone()
-	defer session.Close()
-	session.SetMode(Strong, false)
-
-	db := c.Database.With(session)
-	result := struct {
-		ErrMsg string
-		Ok     bool
-	}{}
-	err = db.Run(bson.D{{"dropIndexes", c.Name}, {"index", keyInfo.name}}, &result)
-	if err != nil {
-		return err
-	}
-	if !result.Ok {
-		return errors.New(result.ErrMsg)
-	}
-	return nil
-}
-
-// Indexes returns a list of all indexes for the collection.
-//
-// For example, this snippet would drop all available indexes:
-//
-//   indexes, err := collection.Indexes()
-//   if err != nil {
-//       return err
-//   }
-//   for _, index := range indexes {
-//       err = collection.DropIndex(index.Key...)
-//       if err != nil {
-//           return err
-//       }
-//   }
-//
-// See the EnsureIndex method for more details on indexes.
-func (c *Collection) Indexes() (indexes []Index, err error) {
-	// Clone session and set it to Monotonic mode so that the server
-	// used for the query may be safely obtained afterwards, if
-	// necessary for iteration when a cursor is received.
-	session := c.Database.Session
-	cloned := session.Clone()
-	cloned.SetMode(Monotonic, false)
-	defer cloned.Close()
-
-	batchSize := int(cloned.queryConfig.op.limit)
-
-	// Try with a command.
-	var result struct {
-		Indexes []bson.Raw
-
-		Cursor struct {
-			FirstBatch []bson.Raw "firstBatch"
-			NS         string
-			Id         int64
-		}
-	}
-	var iter *Iter
-	err = c.Database.With(cloned).Run(bson.D{{"listIndexes", c.Name}, {"cursor", bson.D{{"batchSize", batchSize}}}}, &result)
-	if err == nil {
-		firstBatch := result.Indexes
-		if firstBatch == nil {
-			firstBatch = result.Cursor.FirstBatch
-		}
-		ns := strings.SplitN(result.Cursor.NS, ".", 2)
-		if len(ns) < 2 {
-			iter = c.With(cloned).NewIter(nil, firstBatch, result.Cursor.Id, nil)
-		} else {
-			iter = cloned.DB(ns[0]).C(ns[1]).NewIter(nil, firstBatch, result.Cursor.Id, nil)
-		}
-	} else if isNoCmd(err) {
-		// Command not yet supported. Query the database instead.
-		iter = c.Database.C("system.indexes").Find(bson.M{"ns": c.FullName}).Iter()
-	} else {
-		return nil, err
-	}
-
-	var spec indexSpec
-	for iter.Next(&spec) {
-		indexes = append(indexes, indexFromSpec(spec))
-	}
-	if err = iter.Close(); err != nil {
-		return nil, err
-	}
-	sort.Sort(indexSlice(indexes))
-	return indexes, nil
-}
-
-func indexFromSpec(spec indexSpec) Index {
-	return Index{
-		Name:        spec.Name,
-		Key:         simpleIndexKey(spec.Key),
-		Unique:      spec.Unique,
-		DropDups:    spec.DropDups,
-		Background:  spec.Background,
-		Sparse:      spec.Sparse,
-		ExpireAfter: time.Duration(spec.ExpireAfter) * time.Second,
-	}
-}
-
-type indexSlice []Index
-
-func (idxs indexSlice) Len() int           { return len(idxs) }
-func (idxs indexSlice) Less(i, j int) bool { return idxs[i].Name < idxs[j].Name }
-func (idxs indexSlice) Swap(i, j int)      { idxs[i], idxs[j] = idxs[j], idxs[i] }
-
-func simpleIndexKey(realKey bson.D) (key []string) {
-	for i := range realKey {
-		field := realKey[i].Name
-		vi, ok := realKey[i].Value.(int)
-		if !ok {
-			vf, _ := realKey[i].Value.(float64)
-			vi = int(vf)
-		}
-		if vi == 1 {
-			key = append(key, field)
-			continue
-		}
-		if vi == -1 {
-			key = append(key, "-"+field)
-			continue
-		}
-		if vs, ok := realKey[i].Value.(string); ok {
-			key = append(key, "$"+vs+":"+field)
-			continue
-		}
-		panic("Got unknown index key type for field " + field)
-	}
-	return
-}
-
-// ResetIndexCache() clears the cache of previously ensured indexes.
-// Following requests to EnsureIndex will contact the server.
-func (s *Session) ResetIndexCache() {
-	s.cluster().ResetIndexCache()
-}
-
-// New creates a new session with the same parameters as the original
-// session, including consistency, batch size, prefetching, safety mode,
-// etc. The returned session will use sockets from the pool, so there's
-// a chance that writes just performed in another session may not yet
-// be visible.
-//
-// Login information from the original session will not be copied over
-// into the new session unless it was provided through the initial URL
-// for the Dial function.
-//
-// See the Copy and Clone methods.
-//
-func (s *Session) New() *Session {
-	s.m.Lock()
-	scopy := copySession(s, false)
-	s.m.Unlock()
-	scopy.Refresh()
-	return scopy
-}
-
-// Copy works just like New, but preserves the exact authentication
-// information from the original session.
-func (s *Session) Copy() *Session {
-	s.m.Lock()
-	scopy := copySession(s, true)
-	s.m.Unlock()
-	scopy.Refresh()
-	return scopy
-}
-
-// Clone works just like Copy, but also reuses the same socket as the original
-// session, in case it had already reserved one due to its consistency
-// guarantees.  This behavior ensures that writes performed in the old session
-// are necessarily observed when using the new session, as long as it was a
-// strong or monotonic session.  That said, it also means that long operations
-// may cause other goroutines using the original session to wait.
-func (s *Session) Clone() *Session {
-	s.m.Lock()
-	scopy := copySession(s, true)
-	s.m.Unlock()
-	return scopy
-}
-
-// Close terminates the session.  It's a runtime error to use a session
-// after it has been closed.
-func (s *Session) Close() {
-	s.m.Lock()
-	if s.cluster_ != nil {
-		debugf("Closing session %p", s)
-		s.unsetSocket()
-		s.cluster_.Release()
-		s.cluster_ = nil
-	}
-	s.m.Unlock()
-}
-
-func (s *Session) cluster() *mongoCluster {
-	if s.cluster_ == nil {
-		panic("Session already closed")
-	}
-	return s.cluster_
-}
-
-// Refresh puts back any reserved sockets in use and restarts the consistency
-// guarantees according to the current consistency setting for the session.
-func (s *Session) Refresh() {
-	s.m.Lock()
-	s.slaveOk = s.consistency != Strong
-	s.unsetSocket()
-	s.m.Unlock()
-}
-
-// SetMode changes the consistency mode for the session.
-//
-// In the Strong consistency mode reads and writes will always be made to
-// the primary server using a unique connection so that reads and writes are
-// fully consistent, ordered, and observing the most up-to-date data.
-// This offers the least benefits in terms of distributing load, but the
-// most guarantees.  See also Monotonic and Eventual.
-//
-// In the Monotonic consistency mode reads may not be entirely up-to-date,
-// but they will always see the history of changes moving forward, the data
-// read will be consistent across sequential queries in the same session,
-// and modifications made within the session will be observed in following
-// queries (read-your-writes).
-//
-// In practice, the Monotonic mode is obtained by performing initial reads
-// on a unique connection to an arbitrary secondary, if one is available,
-// and once the first write happens, the session connection is switched over
-// to the primary server.  This manages to distribute some of the reading
-// load with secondaries, while maintaining some useful guarantees.
-//
-// In the Eventual consistency mode reads will be made to any secondary in the
-// cluster, if one is available, and sequential reads will not necessarily
-// be made with the same connection.  This means that data may be observed
-// out of order.  Writes will of course be issued to the primary, but
-// independent writes in the same Eventual session may also be made with
-// independent connections, so there are also no guarantees in terms of
-// write ordering (no read-your-writes guarantees either).
-//
-// The Eventual mode is the fastest and most resource-friendly, but is
-// also the one offering the least guarantees about ordering of the data
-// read and written.
-//
-// If refresh is true, in addition to ensuring the session is in the given
-// consistency mode, the consistency guarantees will also be reset (e.g.
-// a Monotonic session will be allowed to read from secondaries again).
-// This is equivalent to calling the Refresh function.
-//
-// Shifting between Monotonic and Strong modes will keep a previously
-// reserved connection for the session unless refresh is true or the
-// connection is unsuitable (to a secondary server in a Strong session).
-func (s *Session) SetMode(consistency mode, refresh bool) {
-	s.m.Lock()
-	debugf("Session %p: setting mode %d with refresh=%v (master=%p, slave=%p)", s, consistency, refresh, s.masterSocket, s.slaveSocket)
-	s.consistency = consistency
-	if refresh {
-		s.slaveOk = s.consistency != Strong
-		s.unsetSocket()
-	} else if s.consistency == Strong {
-		s.slaveOk = false
-	} else if s.masterSocket == nil {
-		s.slaveOk = true
-	}
-	s.m.Unlock()
-}
-
-// Mode returns the current consistency mode for the session.
-func (s *Session) Mode() mode {
-	s.m.RLock()
-	mode := s.consistency
-	s.m.RUnlock()
-	return mode
-}
-
-// SetSyncTimeout sets the amount of time an operation with this session
-// will wait before returning an error in case a connection to a usable
-// server can't be established. Set it to zero to wait forever. The
-// default value is 7 seconds.
-func (s *Session) SetSyncTimeout(d time.Duration) {
-	s.m.Lock()
-	s.syncTimeout = d
-	s.m.Unlock()
-}
-
-// SetSocketTimeout sets the amount of time to wait for a non-responding
-// socket to the database before it is forcefully closed.
-func (s *Session) SetSocketTimeout(d time.Duration) {
-	s.m.Lock()
-	s.sockTimeout = d
-	if s.masterSocket != nil {
-		s.masterSocket.SetTimeout(d)
-	}
-	if s.slaveSocket != nil {
-		s.slaveSocket.SetTimeout(d)
-	}
-	s.m.Unlock()
-}
-
-// SetCursorTimeout changes the standard timeout period that the server
-// enforces on created cursors. The only supported value right now is
-// 0, which disables the timeout. The standard server timeout is 10 minutes.
-func (s *Session) SetCursorTimeout(d time.Duration) {
-	s.m.Lock()
-	if d == 0 {
-		s.queryConfig.op.flags |= flagNoCursorTimeout
-	} else {
-		panic("SetCursorTimeout: only 0 (disable timeout) supported for now")
-	}
-	s.m.Unlock()
-}
-
-// SetPoolLimit sets the maximum number of sockets in use in a single server
-// before this session will block waiting for a socket to be available.
-// The default limit is 4096.
-//
-// This limit must be set to cover more than any expected workload of the
-// application. It is a bad practice and an unsupported use case to use the
-// database driver to define the concurrency limit of an application. Prevent
-// such concurrency "at the door" instead, by properly restricting the amount
-// of used resources and number of goroutines before they are created.
-func (s *Session) SetPoolLimit(limit int) {
-	s.m.Lock()
-	s.poolLimit = limit
-	s.m.Unlock()
-}
-
-// SetBatch sets the default batch size used when fetching documents from the
-// database. It's possible to change this setting on a per-query basis as
-// well, using the Query.Batch method.
-//
-// The default batch size is defined by the database itself.  As of this
-// writing, MongoDB will use an initial size of min(100 docs, 4MB) on the
-// first batch, and 4MB on remaining ones.
-func (s *Session) SetBatch(n int) {
-	if n == 1 {
-		// Server interprets 1 as -1 and closes the cursor (!?)
-		n = 2
-	}
-	s.m.Lock()
-	s.queryConfig.op.limit = int32(n)
-	s.m.Unlock()
-}
-
-// SetPrefetch sets the default point at which the next batch of results will be
-// requested.  When there are p*batch_size remaining documents cached in an
-// Iter, the next batch will be requested in background. For instance, when
-// using this:
-//
-//     session.SetBatch(200)
-//     session.SetPrefetch(0.25)
-//
-// and there are only 50 documents cached in the Iter to be processed, the
-// next batch of 200 will be requested. It's possible to change this setting on
-// a per-query basis as well, using the Prefetch method of Query.
-//
-// The default prefetch value is 0.25.
-func (s *Session) SetPrefetch(p float64) {
-	s.m.Lock()
-	s.queryConfig.prefetch = p
-	s.m.Unlock()
-}
-
-// See SetSafe for details on the Safe type.
-type Safe struct {
-	W        int    // Min # of servers to ack before success
-	WMode    string // Write mode for MongoDB 2.0+ (e.g. "majority")
-	WTimeout int    // Milliseconds to wait for W before timing out
-	FSync    bool   // Should servers sync to disk before returning success
-	J        bool   // Wait for next group commit if journaling; no effect otherwise
-}
-
-// Safe returns the current safety mode for the session.
-func (s *Session) Safe() (safe *Safe) {
-	s.m.Lock()
-	defer s.m.Unlock()
-	if s.safeOp != nil {
-		cmd := s.safeOp.query.(*getLastError)
-		safe = &Safe{WTimeout: cmd.WTimeout, FSync: cmd.FSync, J: cmd.J}
-		switch w := cmd.W.(type) {
-		case string:
-			safe.WMode = w
-		case int:
-			safe.W = w
-		}
-	}
-	return
-}
-
-// SetSafe changes the session safety mode.
-//
-// If the safe parameter is nil, the session is put in unsafe mode, and writes
-// become fire-and-forget, without error checking.  The unsafe mode is faster
-// since operations won't hold on waiting for a confirmation.
-//
-// If the safe parameter is not nil, any changing query (insert, update, ...)
-// will be followed by a getLastError command with the specified parameters,
-// to ensure the request was correctly processed.
-//
-// The safe.W parameter determines how many servers should confirm a write
-// before the operation is considered successful.  If set to 0 or 1, the
-// command will return as soon as the primary is done with the request.
-// If safe.WTimeout is greater than zero, it determines how many milliseconds
-// to wait for the safe.W servers to respond before returning an error.
-//
-// Starting with MongoDB 2.0.0 the safe.WMode parameter can be used instead
-// of W to request for richer semantics. If set to "majority" the server will
-// wait for a majority of members from the replica set to respond before
-// returning. Custom modes may also be defined within the server to create
-// very detailed placement schemas. See the data awareness documentation in
-// the links below for more details (note that MongoDB internally reuses the
-// "w" field name for WMode).
-//
-// If safe.FSync is true and journaling is disabled, the servers will be
-// forced to sync all files to disk immediately before returning. If the
-// same option is true but journaling is enabled, the server will instead
-// await for the next group commit before returning.
-//
-// Since MongoDB 2.0.0, the safe.J option can also be used instead of FSync
-// to force the server to wait for a group commit in case journaling is
-// enabled. The option has no effect if the server has journaling disabled.
-//
-// For example, the following statement will make the session check for
-// errors, without imposing further constraints:
-//
-//     session.SetSafe(&mgo.Safe{})
-//
-// The following statement will force the server to wait for a majority of
-// members of a replica set to return (MongoDB 2.0+ only):
-//
-//     session.SetSafe(&mgo.Safe{WMode: "majority"})
-//
-// The following statement, on the other hand, ensures that at least two
-// servers have flushed the change to disk before confirming the success
-// of operations:
-//
-//     session.EnsureSafe(&mgo.Safe{W: 2, FSync: true})
-//
-// The following statement, on the other hand, disables the verification
-// of errors entirely:
-//
-//     session.SetSafe(nil)
-//
-// See also the EnsureSafe method.
-//
-// Relevant documentation:
-//
-//     http://www.mongodb.org/display/DOCS/getLastError+Command
-//     http://www.mongodb.org/display/DOCS/Verifying+Propagation+of+Writes+with+getLastError
-//     http://www.mongodb.org/display/DOCS/Data+Center+Awareness
-//
-func (s *Session) SetSafe(safe *Safe) {
-	s.m.Lock()
-	s.safeOp = nil
-	s.ensureSafe(safe)
-	s.m.Unlock()
-}
-
-// EnsureSafe compares the provided safety parameters with the ones
-// currently in use by the session and picks the most conservative
-// choice for each setting.
-//
-// That is:
-//
-//     - safe.WMode is always used if set.
-//     - safe.W is used if larger than the current W and WMode is empty.
-//     - safe.FSync is always used if true.
-//     - safe.J is used if FSync is false.
-//     - safe.WTimeout is used if set and smaller than the current WTimeout.
-//
-// For example, the following statement will ensure the session is
-// at least checking for errors, without enforcing further constraints.
-// If a more conservative SetSafe or EnsureSafe call was previously done,
-// the following call will be ignored.
-//
-//     session.EnsureSafe(&mgo.Safe{})
-//
-// See also the SetSafe method for details on what each option means.
-//
-// Relevant documentation:
-//
-//     http://www.mongodb.org/display/DOCS/getLastError+Command
-//     http://www.mongodb.org/display/DOCS/Verifying+Propagation+of+Writes+with+getLastError
-//     http://www.mongodb.org/display/DOCS/Data+Center+Awareness
-//
-func (s *Session) EnsureSafe(safe *Safe) {
-	s.m.Lock()
-	s.ensureSafe(safe)
-	s.m.Unlock()
-}
-
-func (s *Session) ensureSafe(safe *Safe) {
-	if safe == nil {
-		return
-	}
-
-	var w interface{}
-	if safe.WMode != "" {
-		w = safe.WMode
-	} else if safe.W > 0 {
-		w = safe.W
-	}
-
-	var cmd getLastError
-	if s.safeOp == nil {
-		cmd = getLastError{1, w, safe.WTimeout, safe.FSync, safe.J}
-	} else {
-		// Copy.  We don't want to mutate the existing query.
-		cmd = *(s.safeOp.query.(*getLastError))
-		if cmd.W == nil {
-			cmd.W = w
-		} else if safe.WMode != "" {
-			cmd.W = safe.WMode
-		} else if i, ok := cmd.W.(int); ok && safe.W > i {
-			cmd.W = safe.W
-		}
-		if safe.WTimeout > 0 && safe.WTimeout < cmd.WTimeout {
-			cmd.WTimeout = safe.WTimeout
-		}
-		if safe.FSync {
-			cmd.FSync = true
-			cmd.J = false
-		} else if safe.J && !cmd.FSync {
-			cmd.J = true
-		}
-	}
-	s.safeOp = &queryOp{
-		query:      &cmd,
-		collection: "admin.$cmd",
-		limit:      -1,
-	}
-}
-
-// Run issues the provided command on the "admin" database and
-// and unmarshals its result in the respective argument. The cmd
-// argument may be either a string with the command name itself, in
-// which case an empty document of the form bson.M{cmd: 1} will be used,
-// or it may be a full command document.
-//
-// Note that MongoDB considers the first marshalled key as the command
-// name, so when providing a command with options, it's important to
-// use an ordering-preserving document, such as a struct value or an
-// instance of bson.D.  For instance:
-//
-//     db.Run(bson.D{{"create", "mycollection"}, {"size", 1024}})
-//
-// For commands on arbitrary databases, see the Run method in
-// the Database type.
-//
-// Relevant documentation:
-//
-//     http://www.mongodb.org/display/DOCS/Commands
-//     http://www.mongodb.org/display/DOCS/List+of+Database+CommandSkips
-//
-func (s *Session) Run(cmd interface{}, result interface{}) error {
-	return s.DB("admin").Run(cmd, result)
-}
-
-// SelectServers restricts communication to servers configured with the
-// given tags. For example, the following statement restricts servers
-// used for reading operations to those with both tag "disk" set to
-// "ssd" and tag "rack" set to 1:
-//
-//     session.SelectSlaves(bson.D{{"disk", "ssd"}, {"rack", 1}})
-//
-// Multiple sets of tags may be provided, in which case the used server
-// must match all tags within any one set.
-//
-// If a connection was previously assigned to the session due to the
-// current session mode (see Session.SetMode), the tag selection will
-// only be enforced after the session is refreshed.
-//
-// Relevant documentation:
-//
-//     http://docs.mongodb.org/manual/tutorial/configure-replica-set-tag-sets
-//
-func (s *Session) SelectServers(tags ...bson.D) {
-	s.m.Lock()
-	s.queryConfig.op.serverTags = tags
-	s.m.Unlock()
-}
-
-// Ping runs a trivial ping command just to get in touch with the server.
-func (s *Session) Ping() error {
-	return s.Run("ping", nil)
-}
-
-// Fsync flushes in-memory writes to disk on the server the session
-// is established with. If async is true, the call returns immediately,
-// otherwise it returns after the flush has been made.
-func (s *Session) Fsync(async bool) error {
-	return s.Run(bson.D{{"fsync", 1}, {"async", async}}, nil)
-}
-
-// FsyncLock locks all writes in the specific server the session is
-// established with and returns. Any writes attempted to the server
-// after it is successfully locked will block until FsyncUnlock is
-// called for the same server.
-//
-// This method works on secondaries as well, preventing the oplog from
-// being flushed while the server is locked, but since only the server
-// connected to is locked, for locking specific secondaries it may be
-// necessary to establish a connection directly to the secondary (see
-// Dial's connect=direct option).
-//
-// As an important caveat, note that once a write is attempted and
-// blocks, follow up reads will block as well due to the way the
-// lock is internally implemented in the server. More details at:
-//
-//     https://jira.mongodb.org/browse/SERVER-4243
-//
-// FsyncLock is often used for performing consistent backups of
-// the database files on disk.
-//
-// Relevant documentation:
-//
-//     http://www.mongodb.org/display/DOCS/fsync+Command
-//     http://www.mongodb.org/display/DOCS/Backups
-//
-func (s *Session) FsyncLock() error {
-	return s.Run(bson.D{{"fsync", 1}, {"lock", true}}, nil)
-}
-
-// FsyncUnlock releases the server for writes. See FsyncLock for details.
-func (s *Session) FsyncUnlock() error {
-	return s.DB("admin").C("$cmd.sys.unlock").Find(nil).One(nil) // WTF?
-}
-
-// Find prepares a query using the provided document.  The document may be a
-// map or a struct value capable of being marshalled with bson.  The map
-// may be a generic one using interface{} for its key and/or values, such as
-// bson.M, or it may be a properly typed map.  Providing nil as the document
-// is equivalent to providing an empty document such as bson.M{}.
-//
-// Further details of the query may be tweaked using the resulting Query value,
-// and then executed to retrieve results using methods such as One, For,
-// Iter, or Tail.
-//
-// In case the resulting document includes a field named $err or errmsg, which
-// are standard ways for MongoDB to return query errors, the returned err will
-// be set to a *QueryError value including the Err message and the Code.  In
-// those cases, the result argument is still unmarshalled into with the
-// received document so that any other custom values may be obtained if
-// desired.
-//
-// Relevant documentation:
-//
-//     http://www.mongodb.org/display/DOCS/Querying
-//     http://www.mongodb.org/display/DOCS/Advanced+Queries
-//
-func (c *Collection) Find(query interface{}) *Query {
-	session := c.Database.Session
-	session.m.RLock()
-	q := &Query{session: session, query: session.queryConfig}
-	session.m.RUnlock()
-	q.op.query = query
-	q.op.collection = c.FullName
-	return q
-}
-
-type repairCmd struct {
-	RepairCursor string           `bson:"repairCursor"`
-	Cursor       *repairCmdCursor ",omitempty"
-}
-
-type repairCmdCursor struct {
-	BatchSize int `bson:"batchSize,omitempty"`
-}
-
-// Repair returns an iterator that goes over all recovered documents in the
-// collection, in a best-effort manner. This is most useful when there are
-// damaged data files. Multiple copies of the same document may be returned
-// by the iterator.
-//
-// Repair is supported in MongoDB 2.7.8 and later.
-func (c *Collection) Repair() *Iter {
-	// Clone session and set it to Monotonic mode so that the server
-	// used for the query may be safely obtained afterwards, if
-	// necessary for iteration when a cursor is received.
-	session := c.Database.Session
-	cloned := session.Clone()
-	cloned.SetMode(Monotonic, false)
-	defer cloned.Close()
-
-	batchSize := int(cloned.queryConfig.op.limit)
-
-	var result struct {
-		Cursor struct {
-			FirstBatch []bson.Raw "firstBatch"
-			Id         int64
-		}
-	}
-
-	cmd := repairCmd{
-		RepairCursor: c.Name,
-		Cursor:       &repairCmdCursor{batchSize},
-	}
-
-	clonedc := c.With(cloned)
-	err := clonedc.Database.Run(cmd, &result)
-	return clonedc.NewIter(session, result.Cursor.FirstBatch, result.Cursor.Id, err)
-}
-
-// FindId is a convenience helper equivalent to:
-//
-//     query := collection.Find(bson.M{"_id": id})
-//
-// See the Find method for more details.
-func (c *Collection) FindId(id interface{}) *Query {
-	return c.Find(bson.D{{"_id", id}})
-}
-
-type Pipe struct {
-	session    *Session
-	collection *Collection
-	pipeline   interface{}
-	allowDisk  bool
-	batchSize  int
-}
-
-type pipeCmd struct {
-	Aggregate string
-	Pipeline  interface{}
-	Cursor    *pipeCmdCursor ",omitempty"
-	Explain   bool           ",omitempty"
-	AllowDisk bool           "allowDiskUse,omitempty"
-}
-
-type pipeCmdCursor struct {
-	BatchSize int `bson:"batchSize,omitempty"`
-}
-
-// Pipe prepares a pipeline to aggregate. The pipeline document
-// must be a slice built in terms of the aggregation framework language.
-//
-// For example:
-//
-//     pipe := collection.Pipe([]bson.M{{"$match": bson.M{"name": "Otavio"}}})
-//     iter := pipe.Iter()
-//
-// Relevant documentation:
-//
-//     http://docs.mongodb.org/manual/reference/aggregation
-//     http://docs.mongodb.org/manual/applications/aggregation
-//     http://docs.mongodb.org/manual/tutorial/aggregation-examples
-//
-func (c *Collection) Pipe(pipeline interface{}) *Pipe {
-	session := c.Database.Session
-	session.m.RLock()
-	batchSize := int(session.queryConfig.op.limit)
-	session.m.RUnlock()
-	return &Pipe{
-		session:    session,
-		collection: c,
-		pipeline:   pipeline,
-		batchSize:  batchSize,
-	}
-}
-
-// Iter executes the pipeline and returns an iterator capable of going
-// over all the generated results.
-func (p *Pipe) Iter() *Iter {
-	// Clone session and set it to Monotonic mode so that the server
-	// used for the query may be safely obtained afterwards, if
-	// necessary for iteration when a cursor is received.
-	cloned := p.session.Clone()
-	cloned.SetMode(Monotonic, false)
-	defer cloned.Close()
-	c := p.collection.With(cloned)
-
-	var result struct {
-		// 2.4, no cursors.
-		Result []bson.Raw
-
-		// 2.6+, with cursors.
-		Cursor struct {
-			FirstBatch []bson.Raw "firstBatch"
-			Id         int64
-		}
-	}
-
-	cmd := pipeCmd{
-		Aggregate: c.Name,
-		Pipeline:  p.pipeline,
-		AllowDisk: p.allowDisk,
-		Cursor:    &pipeCmdCursor{p.batchSize},
-	}
-	err := c.Database.Run(cmd, &result)
-	if e, ok := err.(*QueryError); ok && e.Message == `unrecognized field "cursor` {
-		cmd.Cursor = nil
-		cmd.AllowDisk = false
-		err = c.Database.Run(cmd, &result)
-	}
-	firstBatch := result.Result
-	if firstBatch == nil {
-		firstBatch = result.Cursor.FirstBatch
-	}
-	return c.NewIter(p.session, firstBatch, result.Cursor.Id, err)
-}
-
-// NewIter returns a newly created iterator with the provided parameters.
-// Using this method is not recommended unless the desired functionality
-// is not yet exposed via a more convenient interface (Find, Pipe, etc).
-//
-// The optional session parameter associates the lifetime of the returned
-// iterator to an arbitrary session. If nil, the iterator will be bound to
-// c's session.
-//
-// Documents in firstBatch will be individually provided by the returned
-// iterator before documents from cursorId are made available. If cursorId
-// is zero, only the documents in firstBatch are provided.
-//
-// If err is not nil, the iterator's Err method will report it after
-// exhausting documents in firstBatch.
-//
-// NewIter must be called right after the cursor id is obtained, and must not
-// be called on a collection in Eventual mode, because the cursor id is
-// associated with the specific server that returned it. The provided session
-// parameter may be in any mode or state, though.
-//
-func (c *Collection) NewIter(session *Session, firstBatch []bson.Raw, cursorId int64, err error) *Iter {
-	var server *mongoServer
-	csession := c.Database.Session
-	csession.m.RLock()
-	socket := csession.masterSocket
-	if socket == nil {
-		socket = csession.slaveSocket
-	}
-	if socket != nil {
-		server = socket.Server()
-	}
-	csession.m.RUnlock()
-
-	if server == nil {
-		if csession.Mode() == Eventual {
-			panic("Collection.NewIter called in Eventual mode")
-		}
-		if err == nil {
-			err = errors.New("server not available")
-		}
-	}
-
-	if session == nil {
-		session = csession
-	}
-
-	iter := &Iter{
-		session: session,
-		server:  server,
-		timeout: -1,
-		err:     err,
-	}
-	iter.gotReply.L = &iter.m
-	for _, doc := range firstBatch {
-		iter.docData.Push(doc.Data)
-	}
-	if cursorId != 0 {
-		iter.op.cursorId = cursorId
-		iter.op.collection = c.FullName
-		iter.op.replyFunc = iter.replyFunc()
-	}
-	return iter
-}
-
-// All works like Iter.All.
-func (p *Pipe) All(result interface{}) error {
-	return p.Iter().All(result)
-}
-
-// One executes the pipeline and unmarshals the first item from the
-// result set into the result parameter.
-// It returns ErrNotFound if no items are generated by the pipeline.
-func (p *Pipe) One(result interface{}) error {
-	iter := p.Iter()
-	if iter.Next(result) {
-		return nil
-	}
-	if err := iter.Err(); err != nil {
-		return err
-	}
-	return ErrNotFound
-}
-
-// Explain returns a number of details about how the MongoDB server would
-// execute the requested pipeline, such as the number of objects examined,
-// the number of times the read lock was yielded to allow writes to go in,
-// and so on.
-//
-// For example:
-//
-//     var m bson.M
-//     err := collection.Pipe(pipeline).Explain(&m)
-//     if err == nil {
-//         fmt.Printf("Explain: %#v\n", m)
-//     }
-//
-func (p *Pipe) Explain(result interface{}) error {
-	c := p.collection
-	cmd := pipeCmd{
-		Aggregate: c.Name,
-		Pipeline:  p.pipeline,
-		AllowDisk: p.allowDisk,
-		Explain:   true,
-	}
-	return c.Database.Run(cmd, result)
-}
-
-// AllowDiskUse enables writing to the "<dbpath>/_tmp" server directory so
-// that aggregation pipelines do not have to be held entirely in memory.
-func (p *Pipe) AllowDiskUse() *Pipe {
-	p.allowDisk = true
-	return p
-}
-
-// Batch sets the batch size used when fetching documents from the database.
-// It's possible to change this setting on a per-session basis as well, using
-// the Batch method of Session.
-//
-// The default batch size is defined by the database server.
-func (p *Pipe) Batch(n int) *Pipe {
-	p.batchSize = n
-	return p
-}
-
-type LastError struct {
-	Err             string
-	Code, N, Waited int
-	FSyncFiles      int `bson:"fsyncFiles"`
-	WTimeout        bool
-	UpdatedExisting bool        `bson:"updatedExisting"`
-	UpsertedId      interface{} `bson:"upserted"`
-}
-
-func (err *LastError) Error() string {
-	return err.Err
-}
-
-type queryError struct {
-	Err           string "$err"
-	ErrMsg        string
-	Assertion     string
-	Code          int
-	AssertionCode int        "assertionCode"
-	LastError     *LastError "lastErrorObject"
-}
-
-type QueryError struct {
-	Code      int
-	Message   string
-	Assertion bool
-}
-
-func (err *QueryError) Error() string {
-	return err.Message
-}
-
-// IsDup returns whether err informs of a duplicate key error because
-// a primary key index or a secondary unique index already has an entry
-// with the given value.
-func IsDup(err error) bool {
-	// Besides being handy, helps with MongoDB bugs SERVER-7164 and SERVER-11493.
-	// What follows makes me sad. Hopefully conventions will be more clear over time.
-	switch e := err.(type) {
-	case *LastError:
-		return e.Code == 11000 || e.Code == 11001 || e.Code == 12582 || e.Code == 16460 && strings.Contains(e.Err, " E11000 ")
-	case *QueryError:
-		return e.Code == 11000 || e.Code == 11001 || e.Code == 12582
-	}
-	return false
-}
-
-// Insert inserts one or more documents in the respective collection.  In
-// case the session is in safe mode (see the SetSafe method) and an error
-// happens while inserting the provided documents, the returned error will
-// be of type *LastError.
-func (c *Collection) Insert(docs ...interface{}) error {
-	_, err := c.writeQuery(&insertOp{c.FullName, docs, 0})
-	return err
-}
-
-// Update finds a single document matching the provided selector document
-// and modifies it according to the update document.
-// If the session is in safe mode (see SetSafe) a ErrNotFound error is
-// returned if a document isn't found, or a value of type *LastError
-// when some other error is detected.
-//
-// Relevant documentation:
-//
-//     http://www.mongodb.org/display/DOCS/Updating
-//     http://www.mongodb.org/display/DOCS/Atomic+Operations
-//
-func (c *Collection) Update(selector interface{}, update interface{}) error {
-	lerr, err := c.writeQuery(&updateOp{c.FullName, selector, update, 0})
-	if err == nil && lerr != nil && !lerr.UpdatedExisting {
-		return ErrNotFound
-	}
-	return err
-}
-
-// UpdateId is a convenience helper equivalent to:
-//
-//     err := collection.Update(bson.M{"_id": id}, update)
-//
-// See the Update method for more details.
-func (c *Collection) UpdateId(id interface{}, update interface{}) error {
-	return c.Update(bson.D{{"_id", id}}, update)
-}
-
-// ChangeInfo holds details about the outcome of an update operation.
-type ChangeInfo struct {
-	Updated    int         // Number of existing documents updated
-	Removed    int         // Number of documents removed
-	UpsertedId interface{} // Upserted _id field, when not explicitly provided
-}
-
-// UpdateAll finds all documents matching the provided selector document
-// and modifies them according to the update document.
-// If the session is in safe mode (see SetSafe) details of the executed
-// operation are returned in info or an error of type *LastError when
-// some problem is detected. It is not an error for the update to not be
-// applied on any documents because the selector doesn't match.
-//
-// Relevant documentation:
-//
-//     http://www.mongodb.org/display/DOCS/Updating
-//     http://www.mongodb.org/display/DOCS/Atomic+Operations
-//
-func (c *Collection) UpdateAll(selector interface{}, update interface{}) (info *ChangeInfo, err error) {
-	lerr, err := c.writeQuery(&updateOp{c.FullName, selector, update, 2})
-	if err == nil && lerr != nil {
-		info = &ChangeInfo{Updated: lerr.N}
-	}
-	return info, err
-}
-
-// Upsert finds a single document matching the provided selector document
-// and modifies it according to the update document.  If no document matching
-// the selector is found, the update document is applied to the selector
-// document and the result is inserted in the collection.
-// If the session is in safe mode (see SetSafe) details of the executed
-// operation are returned in info, or an error of type *LastError when
-// some problem is detected.
-//
-// Relevant documentation:
-//
-//     http://www.mongodb.org/display/DOCS/Updating
-//     http://www.mongodb.org/display/DOCS/Atomic+Operations
-//
-func (c *Collection) Upsert(selector interface{}, update interface{}) (info *ChangeInfo, err error) {
-	lerr, err := c.writeQuery(&updateOp{c.FullName, selector, update, 1})
-	if err == nil && lerr != nil {
-		info = &ChangeInfo{}
-		if lerr.UpdatedExisting {
-			info.Updated = lerr.N
-		} else {
-			info.UpsertedId = lerr.UpsertedId
-		}
-	}
-	return info, err
-}
-
-// UpsertId is a convenience helper equivalent to:
-//
-//     info, err := collection.Upsert(bson.M{"_id": id}, update)
-//
-// See the Upsert method for more details.
-func (c *Collection) UpsertId(id interface{}, update interface{}) (info *ChangeInfo, err error) {
-	return c.Upsert(bson.D{{"_id", id}}, update)
-}
-
-// Remove finds a single document matching the provided selector document
-// and removes it from the database.
-// If the session is in safe mode (see SetSafe) a ErrNotFound error is
-// returned if a document isn't found, or a value of type *LastError
-// when some other error is detected.
-//
-// Relevant documentation:
-//
-//     http://www.mongodb.org/display/DOCS/Removing
-//
-func (c *Collection) Remove(selector interface{}) error {
-	lerr, err := c.writeQuery(&deleteOp{c.FullName, selector, 1})
-	if err == nil && lerr != nil && lerr.N == 0 {
-		return ErrNotFound
-	}
-	return err
-}
-
-// RemoveId is a convenience helper equivalent to:
-//
-//     err := collection.Remove(bson.M{"_id": id})
-//
-// See the Remove method for more details.
-func (c *Collection) RemoveId(id interface{}) error {
-	return c.Remove(bson.D{{"_id", id}})
-}
-
-// RemoveAll finds all documents matching the provided selector document
-// and removes them from the database.  In case the session is in safe mode
-// (see the SetSafe method) and an error happens when attempting the change,
-// the returned error will be of type *LastError.
-//
-// Relevant documentation:
-//
-//     http://www.mongodb.org/display/DOCS/Removing
-//
-func (c *Collection) RemoveAll(selector interface{}) (info *ChangeInfo, err error) {
-	lerr, err := c.writeQuery(&deleteOp{c.FullName, selector, 0})
-	if err == nil && lerr != nil {
-		info = &ChangeInfo{Removed: lerr.N}
-	}
-	return info, err
-}
-
-// DropDatabase removes the entire database including all of its collections.
-func (db *Database) DropDatabase() error {
-	return db.Run(bson.D{{"dropDatabase", 1}}, nil)
-}
-
-// DropCollection removes the entire collection including all of its documents.
-func (c *Collection) DropCollection() error {
-	return c.Database.Run(bson.D{{"drop", c.Name}}, nil)
-}
-
-// The CollectionInfo type holds metadata about a collection.
-//
-// Relevant documentation:
-//
-//     http://www.mongodb.org/display/DOCS/createCollection+Command
-//     http://www.mongodb.org/display/DOCS/Capped+Collections
-//
-type CollectionInfo struct {
-	// DisableIdIndex prevents the automatic creation of the index
-	// on the _id field for the collection.
-	DisableIdIndex bool
-
-	// ForceIdIndex enforces the automatic creation of the index
-	// on the _id field for the collection. Capped collections,
-	// for example, do not have such an index by default.
-	ForceIdIndex bool
-
-	// If Capped is true new documents will replace old ones when
-	// the collection is full. MaxBytes must necessarily be set
-	// to define the size when the collection wraps around.
-	// MaxDocs optionally defines the number of documents when it
-	// wraps, but MaxBytes still needs to be set.
-	Capped   bool
-	MaxBytes int
-	MaxDocs  int
-}
-
-// Create explicitly creates the c collection with details of info.
-// MongoDB creates collections automatically on use, so this method
-// is only necessary when creating collection with non-default
-// characteristics, such as capped collections.
-//
-// Relevant documentation:
-//
-//     http://www.mongodb.org/display/DOCS/createCollection+Command
-//     http://www.mongodb.org/display/DOCS/Capped+Collections
-//
-func (c *Collection) Create(info *CollectionInfo) error {
-	cmd := make(bson.D, 0, 4)
-	cmd = append(cmd, bson.DocElem{"create", c.Name})
-	if info.Capped {
-		if info.MaxBytes < 1 {
-			return fmt.Errorf("Collection.Create: with Capped, MaxBytes must also be set")
-		}
-		cmd = append(cmd, bson.DocElem{"capped", true})
-		cmd = append(cmd, bson.DocElem{"size", info.MaxBytes})
-		if info.MaxDocs > 0 {
-			cmd = append(cmd, bson.DocElem{"max", info.MaxDocs})
-		}
-	}
-	if info.DisableIdIndex {
-		cmd = append(cmd, bson.DocElem{"autoIndexId", false})
-	}
-	if info.ForceIdIndex {
-		cmd = append(cmd, bson.DocElem{"autoIndexId", true})
-	}
-	return c.Database.Run(cmd, nil)
-}
-
-// Batch sets the batch size used when fetching documents from the database.
-// It's possible to change this setting on a per-session basis as well, using
-// the Batch method of Session.
-//
-// The default batch size is defined by the database itself.  As of this
-// writing, MongoDB will use an initial size of min(100 docs, 4MB) on the
-// first batch, and 4MB on remaining ones.
-func (q *Query) Batch(n int) *Query {
-	if n == 1 {
-		// Server interprets 1 as -1 and closes the cursor (!?)
-		n = 2
-	}
-	q.m.Lock()
-	q.op.limit = int32(n)
-	q.m.Unlock()
-	return q
-}
-
-// Prefetch sets the point at which the next batch of results will be requested.
-// When there are p*batch_size remaining documents cached in an Iter, the next
-// batch will be requested in background. For instance, when using this:
-//
-//     query.Batch(200).Prefetch(0.25)
-//
-// and there are only 50 documents cached in the Iter to be processed, the
-// next batch of 200 will be requested. It's possible to change this setting on
-// a per-session basis as well, using the SetPrefetch method of Session.
-//
-// The default prefetch value is 0.25.
-func (q *Query) Prefetch(p float64) *Query {
-	q.m.Lock()
-	q.prefetch = p
-	q.m.Unlock()
-	return q
-}
-
-// Skip skips over the n initial documents from the query results.  Note that
-// this only makes sense with capped collections where documents are naturally
-// ordered by insertion time, or with sorted results.
-func (q *Query) Skip(n int) *Query {
-	q.m.Lock()
-	q.op.skip = int32(n)
-	q.m.Unlock()
-	return q
-}
-
-// Limit restricts the maximum number of documents retrieved to n, and also
-// changes the batch size to the same value.  Once n documents have been
-// returned by Next, the following call will return ErrNotFound.
-func (q *Query) Limit(n int) *Query {
-	q.m.Lock()
-	switch {
-	case n == 1:
-		q.limit = 1
-		q.op.limit = -1
-	case n == math.MinInt32: // -MinInt32 == -MinInt32
-		q.limit = math.MaxInt32
-		q.op.limit = math.MinInt32 + 1
-	case n < 0:
-		q.limit = int32(-n)
-		q.op.limit = int32(n)
-	default:
-		q.limit = int32(n)
-		q.op.limit = int32(n)
-	}
-	q.m.Unlock()
-	return q
-}
-
-// Select enables selecting which fields should be retrieved for the results
-// found. For example, the following query would only retrieve the name field:
-//
-//     err := collection.Find(nil).Select(bson.M{"name": 1}).One(&result)
-//
-// Relevant documentation:
-//
-//     http://www.mongodb.org/display/DOCS/Retrieving+a+Subset+of+Fields
-//
-func (q *Query) Select(selector interface{}) *Query {
-	q.m.Lock()
-	q.op.selector = selector
-	q.m.Unlock()
-	return q
-}
-
-// Sort asks the database to order returned documents according to the
-// provided field names. A field name may be prefixed by - (minus) for
-// it to be sorted in reverse order.
-//
-// For example:
-//
-//     query1 := collection.Find(nil).Sort("firstname", "lastname")
-//     query2 := collection.Find(nil).Sort("-age")
-//     query3 := collection.Find(nil).Sort("$natural")
-//     query4 := collection.Find(nil).Select(bson.M{"score": bson.M{"$meta": "textScore"}}).Sort("$textScore:score")
-//
-// Relevant documentation:
-//
-//     http://www.mongodb.org/display/DOCS/Sorting+and+Natural+Order
-//
-func (q *Query) Sort(fields ...string) *Query {
-	q.m.Lock()
-	var order bson.D
-	for _, field := range fields {
-		n := 1
-		var kind string
-		if field != "" {
-			if field[0] == '$' {
-				if c := strings.Index(field, ":"); c > 1 && c < len(field)-1 {
-					kind = field[1:c]
-					field = field[c+1:]
-				}
-			}
-			switch field[0] {
-			case '+':
-				field = field[1:]
-			case '-':
-				n = -1
-				field = field[1:]
-			}
-		}
-		if field == "" {
-			panic("Sort: empty field name")
-		}
-		if kind == "textScore" {
-			order = append(order, bson.DocElem{field, bson.M{"$meta": kind}})
-		} else {
-			order = append(order, bson.DocElem{field, n})
-		}
-	}
-	q.op.options.OrderBy = order
-	q.op.hasOptions = true
-	q.m.Unlock()
-	return q
-}
-
-// Explain returns a number of details about how the MongoDB server would
-// execute the requested query, such as the number of objects examined,
-// the number of times the read lock was yielded to allow writes to go in,
-// and so on.
-//
-// For example:
-//
-//     m := bson.M{}
-//     err := collection.Find(bson.M{"filename": name}).Explain(m)
-//     if err == nil {
-//         fmt.Printf("Explain: %#v\n", m)
-//     }
-//
-// Relevant documentation:
-//
-//     http://www.mongodb.org/display/DOCS/Optimization
-//     http://www.mongodb.org/display/DOCS/Query+Optimizer
-//
-func (q *Query) Explain(result interface{}) error {
-	q.m.Lock()
-	clone := &Query{session: q.session, query: q.query}
-	q.m.Unlock()
-	clone.op.options.Explain = true
-	clone.op.hasOptions = true
-	if clone.op.limit > 0 {
-		clone.op.limit = -q.op.limit
-	}
-	iter := clone.Iter()
-	if iter.Next(result) {
-		return nil
-	}
-	return iter.Close()
-}
-
-// Hint will include an explicit "hint" in the query to force the server
-// to use a specified index, potentially improving performance in some
-// situations.  The provided parameters are the fields that compose the
-// key of the index to be used.  For details on how the indexKey may be
-// built, see the EnsureIndex method.
-//
-// For example:
-//
-//     query := collection.Find(bson.M{"firstname": "Joe", "lastname": "Winter"})
-//     query.Hint("lastname", "firstname")
-//
-// Relevant documentation:
-//
-//     http://www.mongodb.org/display/DOCS/Optimization
-//     http://www.mongodb.org/display/DOCS/Query+Optimizer
-//
-func (q *Query) Hint(indexKey ...string) *Query {
-	q.m.Lock()
-	keyInfo, err := parseIndexKey(indexKey)
-	q.op.options.Hint = keyInfo.key
-	q.op.hasOptions = true
-	q.m.Unlock()
-	if err != nil {
-		panic(err)
-	}
-	return q
-}
-
-// SetMaxScan constrains the query to stop after scanning the specified
-// number of documents.
-//
-// This modifier is generally used to prevent potentially long running
-// queries from disrupting performance by scanning through too much data.
-func (q *Query) SetMaxScan(n int) *Query {
-	q.m.Lock()
-	q.op.options.MaxScan = n
-	q.op.hasOptions = true
-	q.m.Unlock()
-	return q
-}
-
-// SetMaxTime constrains the query to stop after running for the specified time.
-//
-// When the time limit is reached MongoDB automatically cancels the query.
-// This can be used to efficiently prevent and identify unexpectedly slow queries.
-//
-// A few important notes about the mechanism enforcing this limit:
-//
-//  - Requests can block behind locking operations on the server, and that blocking
-//    time is not accounted for. In other words, the timer starts ticking only after
-//    the actual start of the query when it initially acquires the appropriate lock;
-//
-//  - Operations are interrupted only at interrupt points where an operation can be
-//    safely aborted – the total execution time may exceed the specified value;
-//
-//  - The limit can be applied to both CRUD operations and commands, but not all
-//    commands are interruptible;
-//
-//  - While iterating over results, computing follow up batches is included in the
-//    total time and the iteration continues until the alloted time is over, but
-//    network roundtrips are not taken into account for the limit.
-//
-//  - This limit does not override the inactive cursor timeout for idle cursors
-//    (default is 10 min).
-//
-// This mechanism was introduced in MongoDB 2.6.
-//
-// Relevant documentation:
-//
-//   http://blog.mongodb.org/post/83621787773/maxtimems-and-query-optimizer-introspection-in
-//
-func (q *Query) SetMaxTime(d time.Duration) *Query {
-	q.m.Lock()
-	q.op.options.MaxTimeMS = int(d / time.Millisecond)
-	q.op.hasOptions = true
-	q.m.Unlock()
-	return q
-}
-
-// Snapshot will force the performed query to make use of an available
-// index on the _id field to prevent the same document from being returned
-// more than once in a single iteration. This might happen without this
-// setting in situations when the document changes in size and thus has to
-// be moved while the iteration is running.
-//
-// Because snapshot mode traverses the _id index, it may not be used with
-// sorting or explicit hints. It also cannot use any other index for the
-// query.
-//
-// Even with snapshot mode, items inserted or deleted during the query may
-// or may not be returned; that is, this mode is not a true point-in-time
-// snapshot.
-//
-// The same effect of Snapshot may be obtained by using any unique index on
-// field(s) that will not be modified (best to use Hint explicitly too).
-// A non-unique index (such as creation time) may be made unique by
-// appending _id to the index when creating it.
-//
-// Relevant documentation:
-//
-//     http://www.mongodb.org/display/DOCS/How+to+do+Snapshotted+Queries+in+the+Mongo+Database
-//
-func (q *Query) Snapshot() *Query {
-	q.m.Lock()
-	q.op.options.Snapshot = true
-	q.op.hasOptions = true
-	q.m.Unlock()
-	return q
-}
-
-// Comment adds a comment to the query to identify it in the database profiler output.
-//
-// Relevant documentation:
-//
-//     http://docs.mongodb.org/manual/reference/operator/meta/comment
-//     http://docs.mongodb.org/manual/reference/command/profile
-//     http://docs.mongodb.org/manual/administration/analyzing-mongodb-performance/#database-profiling
-//
-func (q *Query) Comment(comment string) *Query {
-	q.m.Lock()
-	q.op.options.Comment = comment
-	q.op.hasOptions = true
-	q.m.Unlock()
-	return q
-}
-
-// LogReplay enables an option that optimizes queries that are typically
-// made on the MongoDB oplog for replaying it. This is an internal
-// implementation aspect and most likely uninteresting for other uses.
-// It has seen at least one use case, though, so it's exposed via the API.
-func (q *Query) LogReplay() *Query {
-	q.m.Lock()
-	q.op.flags |= flagLogReplay
-	q.m.Unlock()
-	return q
-}
-
-func checkQueryError(fullname string, d []byte) error {
-	l := len(d)
-	if l < 16 {
-		return nil
-	}
-	if d[5] == '$' && d[6] == 'e' && d[7] == 'r' && d[8] == 'r' && d[9] == '\x00' && d[4] == '\x02' {
-		goto Error
-	}
-	if len(fullname) < 5 || fullname[len(fullname)-5:] != ".$cmd" {
-		return nil
-	}
-	for i := 0; i+8 < l; i++ {
-		if d[i] == '\x02' && d[i+1] == 'e' && d[i+2] == 'r' && d[i+3] == 'r' && d[i+4] == 'm' && d[i+5] == 's' && d[i+6] == 'g' && d[i+7] == '\x00' {
-			goto Error
-		}
-	}
-	return nil
-
-Error:
-	result := &queryError{}
-	bson.Unmarshal(d, result)
-	if result.LastError != nil {
-		return result.LastError
-	}
-	if result.Err == "" && result.ErrMsg == "" {
-		return nil
-	}
-	if result.AssertionCode != 0 && result.Assertion != "" {
-		return &QueryError{Code: result.AssertionCode, Message: result.Assertion, Assertion: true}
-	}
-	if result.Err != "" {
-		return &QueryError{Code: result.Code, Message: result.Err}
-	}
-	return &QueryError{Code: result.Code, Message: result.ErrMsg}
-}
-
-// One executes the query and unmarshals the first obtained document into the
-// result argument.  The result must be a struct or map value capable of being
-// unmarshalled into by gobson.  This function blocks until either a result
-// is available or an error happens.  For example:
-//
-//     err := collection.Find(bson.M{"a", 1}).One(&result)
-//
-// In case the resulting document includes a field named $err or errmsg, which
-// are standard ways for MongoDB to return query errors, the returned err will
-// be set to a *QueryError value including the Err message and the Code.  In
-// those cases, the result argument is still unmarshalled into with the
-// received document so that any other custom values may be obtained if
-// desired.
-//
-func (q *Query) One(result interface{}) (err error) {
-	q.m.Lock()
-	session := q.session
-	op := q.op // Copy.
-	q.m.Unlock()
-
-	socket, err := session.acquireSocket(true)
-	if err != nil {
-		return err
-	}
-	defer socket.Release()
-
-	op.flags |= session.slaveOkFlag()
-	op.limit = -1
-
-	data, err := socket.SimpleQuery(&op)
-	if err != nil {
-		return err
-	}
-	if data == nil {
-		return ErrNotFound
-	}
-	if result != nil {
-		err = bson.Unmarshal(data, result)
-		if err == nil {
-			debugf("Query %p document unmarshaled: %#v", q, result)
-		} else {
-			debugf("Query %p document unmarshaling failed: %#v", q, err)
-			return err
-		}
-	}
-	return checkQueryError(op.collection, data)
-}
-
-// run duplicates the behavior of collection.Find(query).One(&result)
-// as performed by Database.Run, specializing the logic for running
-// database commands on a given socket.
-func (db *Database) run(socket *mongoSocket, cmd, result interface{}) (err error) {
-	// Database.Run:
-	if name, ok := cmd.(string); ok {
-		cmd = bson.D{{name, 1}}
-	}
-
-	// Collection.Find:
-	session := db.Session
-	session.m.RLock()
-	op := session.queryConfig.op // Copy.
-	session.m.RUnlock()
-	op.query = cmd
-	op.collection = db.Name + ".$cmd"
-
-	// Query.One:
-	op.flags |= session.slaveOkFlag()
-	op.limit = -1
-
-	data, err := socket.SimpleQuery(&op)
-	if err != nil {
-		return err
-	}
-	if data == nil {
-		return ErrNotFound
-	}
-	if result != nil {
-		err = bson.Unmarshal(data, result)
-		if err == nil {
-			var res bson.M
-			bson.Unmarshal(data, &res)
-			debugf("Run command unmarshaled: %#v, result: %#v", op, res)
-		} else {
-			debugf("Run command unmarshaling failed: %#v", op, err)
-			return err
-		}
-	}
-	return checkQueryError(op.collection, data)
-}
-
-// The DBRef type implements support for the database reference MongoDB
-// convention as supported by multiple drivers.  This convention enables
-// cross-referencing documents between collections and databases using
-// a structure which includes a collection name, a document id, and
-// optionally a database name.
-//
-// See the FindRef methods on Session and on Database.
-//
-// Relevant documentation:
-//
-//     http://www.mongodb.org/display/DOCS/Database+References
-//
-type DBRef struct {
-	Collection string      `bson:"$ref"`
-	Id         interface{} `bson:"$id"`
-	Database   string      `bson:"$db,omitempty"`
-}
-
-// NOTE: Order of fields for DBRef above does matter, per documentation.
-
-// FindRef returns a query that looks for the document in the provided
-// reference. If the reference includes the DB field, the document will
-// be retrieved from the respective database.
-//
-// See also the DBRef type and the FindRef method on Session.
-//
-// Relevant documentation:
-//
-//     http://www.mongodb.org/display/DOCS/Database+References
-//
-func (db *Database) FindRef(ref *DBRef) *Query {
-	var c *Collection
-	if ref.Database == "" {
-		c = db.C(ref.Collection)
-	} else {
-		c = db.Session.DB(ref.Database).C(ref.Collection)
-	}
-	return c.FindId(ref.Id)
-}
-
-// FindRef returns a query that looks for the document in the provided
-// reference. For a DBRef to be resolved correctly at the session level
-// it must necessarily have the optional DB field defined.
-//
-// See also the DBRef type and the FindRef method on Database.
-//
-// Relevant documentation:
-//
-//     http://www.mongodb.org/display/DOCS/Database+References
-//
-func (s *Session) FindRef(ref *DBRef) *Query {
-	if ref.Database == "" {
-		panic(errors.New(fmt.Sprintf("Can't resolve database for %#v", ref)))
-	}
-	c := s.DB(ref.Database).C(ref.Collection)
-	return c.FindId(ref.Id)
-}
-
-// CollectionNames returns the collection names present in the db database.
-func (db *Database) CollectionNames() (names []string, err error) {
-	// Clone session and set it to Monotonic mode so that the server
-	// used for the query may be safely obtained afterwards, if
-	// necessary for iteration when a cursor is received.
-	session := db.Session
-	cloned := session.Clone()
-	cloned.SetMode(Monotonic, false)
-	defer cloned.Close()
-
-	batchSize := int(cloned.queryConfig.op.limit)
-
-	// Try with a command.
-	var result struct {
-		Collections []bson.Raw
-
-		Cursor struct {
-			FirstBatch []bson.Raw "firstBatch"
-			NS         string
-			Id         int64
-		}
-	}
-	err = db.With(cloned).Run(bson.D{{"listCollections", 1}, {"cursor", bson.D{{"batchSize", batchSize}}}}, &result)
-	if err == nil {
-		firstBatch := result.Collections
-		if firstBatch == nil {
-			firstBatch = result.Cursor.FirstBatch
-		}
-		var iter *Iter
-		ns := strings.SplitN(result.Cursor.NS, ".", 2)
-		if len(ns) < 2 {
-			iter = db.With(cloned).C("").NewIter(nil, firstBatch, result.Cursor.Id, nil)
-		} else {
-			iter = cloned.DB(ns[0]).C(ns[1]).NewIter(nil, firstBatch, result.Cursor.Id, nil)
-		}
-		var coll struct{ Name string }
-		for iter.Next(&coll) {
-			names = append(names, coll.Name)
-		}
-		if err := iter.Close(); err != nil {
-			return nil, err
-		}
-		sort.Strings(names)
-		return names, err
-	}
-	if err != nil && !isNoCmd(err) {
-		return nil, err
-	}
-
-	// Command not yet supported. Query the database instead.
-	nameIndex := len(db.Name) + 1
-	iter := db.C("system.namespaces").Find(nil).Iter()
-	var coll struct{ Name string }
-	for iter.Next(&coll) {
-		if strings.Index(coll.Name, "$") < 0 || strings.Index(coll.Name, ".oplog.$") >= 0 {
-			names = append(names, coll.Name[nameIndex:])
-		}
-	}
-	if err := iter.Close(); err != nil {
-		return nil, err
-	}
-	sort.Strings(names)
-	return names, nil
-}
-
-type dbNames struct {
-	Databases []struct {
-		Name  string
-		Empty bool
-	}
-}
-
-// DatabaseNames returns the names of non-empty databases present in the cluster.
-func (s *Session) DatabaseNames() (names []string, err error) {
-	var result dbNames
-	err = s.Run("listDatabases", &result)
-	if err != nil {
-		return nil, err
-	}
-	for _, db := range result.Databases {
-		if !db.Empty {
-			names = append(names, db.Name)
-		}
-	}
-	sort.Strings(names)
-	return names, nil
-}
-
-// Iter executes the query and returns an iterator capable of going over all
-// the results. Results will be returned in batches of configurable
-// size (see the Batch method) and more documents will be requested when a
-// configurable number of documents is iterated over (see the Prefetch method).
-func (q *Query) Iter() *Iter {
-	q.m.Lock()
-	session := q.session
-	op := q.op
-	prefetch := q.prefetch
-	limit := q.limit
-	q.m.Unlock()
-
-	iter := &Iter{
-		session:  session,
-		prefetch: prefetch,
-		limit:    limit,
-		timeout:  -1,
-	}
-	iter.gotReply.L = &iter.m
-	iter.op.collection = op.collection
-	iter.op.limit = op.limit
-	iter.op.replyFunc = iter.replyFunc()
-	iter.docsToReceive++
-	op.replyFunc = iter.op.replyFunc
-	op.flags |= session.slaveOkFlag()
-
-	socket, err := session.acquireSocket(true)
-	if err != nil {
-		iter.err = err
-	} else {
-		iter.server = socket.Server()
-		err = socket.Query(&op)
-		if err != nil {
-			// Must lock as the query above may call replyFunc.
-			iter.m.Lock()
-			iter.err = err
-			iter.m.Unlock()
-		}
-		socket.Release()
-	}
-	return iter
-}
-
-// Tail returns a tailable iterator. Unlike a normal iterator, a
-// tailable iterator may wait for new values to be inserted in the
-// collection once the end of the current result set is reached,
-// A tailable iterator may only be used with capped collections.
-//
-// The timeout parameter indicates how long Next will block waiting
-// for a result before timing out.  If set to -1, Next will not
-// timeout, and will continue waiting for a result for as long as
-// the cursor is valid and the session is not closed. If set to 0,
-// Next times out as soon as it reaches the end of the result set.
-// Otherwise, Next will wait for at least the given number of
-// seconds for a new document to be available before timing out.
-//
-// On timeouts, Next will unblock and return false, and the Timeout
-// method will return true if called. In these cases, Next may still
-// be called again on the same iterator to check if a new value is
-// available at the current cursor position, and again it will block
-// according to the specified timeoutSecs. If the cursor becomes
-// invalid, though, both Next and Timeout will return false and
-// the query must be restarted.
-//
-// The following example demonstrates timeout handling and query
-// restarting:
-//
-//    iter := collection.Find(nil).Sort("$natural").Tail(5 * time.Second)
-//    for {
-//         for iter.Next(&result) {
-//             fmt.Println(result.Id)
-//             lastId = result.Id
-//         }
-//         if iter.Err() != nil {
-//             return iter.Close()
-//         }
-//         if iter.Timeout() {
-//             continue
-//         }
-//         query := collection.Find(bson.M{"_id": bson.M{"$gt": lastId}})
-//         iter = query.Sort("$natural").Tail(5 * time.Second)
-//    }
-//    iter.Close()
-//
-// Relevant documentation:
-//
-//     http://www.mongodb.org/display/DOCS/Tailable+Cursors
-//     http://www.mongodb.org/display/DOCS/Capped+Collections
-//     http://www.mongodb.org/display/DOCS/Sorting+and+Natural+Order
-//
-func (q *Query) Tail(timeout time.Duration) *Iter {
-	q.m.Lock()
-	session := q.session
-	op := q.op
-	prefetch := q.prefetch
-	q.m.Unlock()
-
-	iter := &Iter{session: session, prefetch: prefetch}
-	iter.gotReply.L = &iter.m
-	iter.timeout = timeout
-	iter.op.collection = op.collection
-	iter.op.limit = op.limit
-	iter.op.replyFunc = iter.replyFunc()
-	iter.docsToReceive++
-	op.replyFunc = iter.op.replyFunc
-	op.flags |= flagTailable | flagAwaitData | session.slaveOkFlag()
-
-	socket, err := session.acquireSocket(true)
-	if err != nil {
-		iter.err = err
-	} else {
-		iter.server = socket.Server()
-		err = socket.Query(&op)
-		if err != nil {
-			// Must lock as the query above may call replyFunc.
-			iter.m.Lock()
-			iter.err = err
-			iter.m.Unlock()
-		}
-		socket.Release()
-	}
-	return iter
-}
-
-func (s *Session) slaveOkFlag() (flag queryOpFlags) {
-	s.m.RLock()
-	if s.slaveOk {
-		flag = flagSlaveOk
-	}
-	s.m.RUnlock()
-	return
-}
-
-// Err returns nil if no errors happened during iteration, or the actual
-// error otherwise.
-//
-// In case a resulting document included a field named $err or errmsg, which are
-// standard ways for MongoDB to report an improper query, the returned value has
-// a *QueryError type, and includes the Err message and the Code.
-func (iter *Iter) Err() error {
-	iter.m.Lock()
-	err := iter.err
-	iter.m.Unlock()
-	if err == ErrNotFound {
-		return nil
-	}
-	return err
-}
-
-// Close kills the server cursor used by the iterator, if any, and returns
-// nil if no errors happened during iteration, or the actual error otherwise.
-//
-// Server cursors are automatically closed at the end of an iteration, which
-// means close will do nothing unless the iteration was interrupted before
-// the server finished sending results to the driver. If Close is not called
-// in such a situation, the cursor will remain available at the server until
-// the default cursor timeout period is reached. No further problems arise.
-//
-// Close is idempotent. That means it can be called repeatedly and will
-// return the same result every time.
-//
-// In case a resulting document included a field named $err or errmsg, which are
-// standard ways for MongoDB to report an improper query, the returned value has
-// a *QueryError type.
-func (iter *Iter) Close() error {
-	iter.m.Lock()
-	cursorId := iter.op.cursorId
-	iter.op.cursorId = 0
-	err := iter.err
-	iter.m.Unlock()
-	if cursorId == 0 {
-		if err == ErrNotFound {
-			return nil
-		}
-		return err
-	}
-	socket, err := iter.acquireSocket()
-	if err == nil {
-		// TODO Batch kills.
-		err = socket.Query(&killCursorsOp{[]int64{cursorId}})
-		socket.Release()
-	}
-
-	iter.m.Lock()
-	if err != nil && (iter.err == nil || iter.err == ErrNotFound) {
-		iter.err = err
-	} else if iter.err != ErrNotFound {
-		err = iter.err
-	}
-	iter.m.Unlock()
-	return err
-}
-
-// Timeout returns true if Next returned false due to a timeout of
-// a tailable cursor. In those cases, Next may be called again to continue
-// the iteration at the previous cursor position.
-func (iter *Iter) Timeout() bool {
-	iter.m.Lock()
-	result := iter.timedout
-	iter.m.Unlock()
-	return result
-}
-
-// Next retrieves the next document from the result set, blocking if necessary.
-// This method will also automatically retrieve another batch of documents from
-// the server when the current one is exhausted, or before that in background
-// if pre-fetching is enabled (see the Query.Prefetch and Session.SetPrefetch
-// methods).
-//
-// Next returns true if a document was successfully unmarshalled onto result,
-// and false at the end of the result set or if an error happened.
-// When Next returns false, the Err method should be called to verify if
-// there was an error during iteration.
-//
-// For example:
-//
-//    iter := collection.Find(nil).Iter()
-//    for iter.Next(&result) {
-//        fmt.Printf("Result: %v\n", result.Id)
-//    }
-//    if err := iter.Close(); err != nil {
-//        return err
-//    }
-//
-func (iter *Iter) Next(result interface{}) bool {
-	iter.m.Lock()
-	iter.timedout = false
-	timeout := time.Time{}
-	for iter.err == nil && iter.docData.Len() == 0 && (iter.docsToReceive > 0 || iter.op.cursorId != 0) {
-		if iter.docsToReceive == 0 {
-			if iter.timeout >= 0 {
-				if timeout.IsZero() {
-					timeout = time.Now().Add(iter.timeout)
-				}
-				if time.Now().After(timeout) {
-					iter.timedout = true
-					iter.m.Unlock()
-					return false
-				}
-			}
-			iter.getMore()
-			if iter.err != nil {
-				break
-			}
-		}
-		iter.gotReply.Wait()
-	}
-
-	// Exhaust available data before reporting any errors.
-	if docData, ok := iter.docData.Pop().([]byte); ok {
-		close := false
-		if iter.limit > 0 {
-			iter.limit--
-			if iter.limit == 0 {
-				if iter.docData.Len() > 0 {
-					iter.m.Unlock()
-					panic(fmt.Errorf("data remains after limit exhausted: %d", iter.docData.Len()))
-				}
-				iter.err = ErrNotFound
-				close = true
-			}
-		}
-		if iter.op.cursorId != 0 && iter.err == nil {
-			iter.docsBeforeMore--
-			if iter.docsBeforeMore == -1 {
-				iter.getMore()
-			}
-		}
-		iter.m.Unlock()
-
-		if close {
-			iter.Close()
-		}
-		err := bson.Unmarshal(docData, result)
-		if err != nil {
-			debugf("Iter %p document unmarshaling failed: %#v", iter, err)
-			iter.m.Lock()
-			if iter.err == nil {
-				iter.err = err
-			}
-			iter.m.Unlock()
-			return false
-		}
-		debugf("Iter %p document unmarshaled: %#v", iter, result)
-		// XXX Only have to check first document for a query error?
-		err = checkQueryError(iter.op.collection, docData)
-		if err != nil {
-			iter.m.Lock()
-			if iter.err == nil {
-				iter.err = err
-			}
-			iter.m.Unlock()
-			return false
-		}
-		return true
-	} else if iter.err != nil {
-		debugf("Iter %p returning false: %s", iter, iter.err)
-		iter.m.Unlock()
-		return false
-	} else if iter.op.cursorId == 0 {
-		iter.err = ErrNotFound
-		debugf("Iter %p exhausted with cursor=0", iter)
-		iter.m.Unlock()
-		return false
-	}
-
-	panic("unreachable")
-}
-
-// All retrieves all documents from the result set into the provided slice
-// and closes the iterator.
-//
-// The result argument must necessarily be the address for a slice. The slice
-// may be nil or previously allocated.
-//
-// WARNING: Obviously, All must not be used with result sets that may be
-// potentially large, since it may consume all memory until the system
-// crashes. Consider building the query with a Limit clause to ensure the
-// result size is bounded.
-//
-// For instance:
-//
-//    var result []struct{ Value int }
-//    iter := collection.Find(nil).Limit(100).Iter()
-//    err := iter.All(&result)
-//    if err != nil {
-//        return err
-//    }
-//
-func (iter *Iter) All(result interface{}) error {
-	resultv := reflect.ValueOf(result)
-	if resultv.Kind() != reflect.Ptr || resultv.Elem().Kind() != reflect.Slice {
-		panic("result argument must be a slice address")
-	}
-	slicev := resultv.Elem()
-	slicev = slicev.Slice(0, slicev.Cap())
-	elemt := slicev.Type().Elem()
-	i := 0
-	for {
-		if slicev.Len() == i {
-			elemp := reflect.New(elemt)
-			if !iter.Next(elemp.Interface()) {
-				break
-			}
-			slicev = reflect.Append(slicev, elemp.Elem())
-			slicev = slicev.Slice(0, slicev.Cap())
-		} else {
-			if !iter.Next(slicev.Index(i).Addr().Interface()) {
-				break
-			}
-		}
-		i++
-	}
-	resultv.Elem().Set(slicev.Slice(0, i))
-	return iter.Close()
-}
-
-// All works like Iter.All.
-func (q *Query) All(result interface{}) error {
-	return q.Iter().All(result)
-}
-
-// The For method is obsolete and will be removed in a future release.
-// See Iter as an elegant replacement.
-func (q *Query) For(result interface{}, f func() error) error {
-	return q.Iter().For(result, f)
-}
-
-// The For method is obsolete and will be removed in a future release.
-// See Iter as an elegant replacement.
-func (iter *Iter) For(result interface{}, f func() error) (err error) {
-	valid := false
-	v := reflect.ValueOf(result)
-	if v.Kind() == reflect.Ptr {
-		v = v.Elem()
-		switch v.Kind() {
-		case reflect.Map, reflect.Ptr, reflect.Interface, reflect.Slice:
-			valid = v.IsNil()
-		}
-	}
-	if !valid {
-		panic("For needs a pointer to nil reference value.  See the documentation.")
-	}
-	zero := reflect.Zero(v.Type())
-	for {
-		v.Set(zero)
-		if !iter.Next(result) {
-			break
-		}
-		err = f()
-		if err != nil {
-			return err
-		}
-	}
-	return iter.Err()
-}
-
-// acquireSocket acquires a socket from the same server that the iterator
-// cursor was obtained from.
-//
-// WARNING: This method must not be called with iter.m locked. Acquiring the
-// socket depends on the cluster sync loop, and the cluster sync loop might
-// attempt actions which cause replyFunc to be called, inducing a deadlock.
-func (iter *Iter) acquireSocket() (*mongoSocket, error) {
-	socket, err := iter.session.acquireSocket(true)
-	if err != nil {
-		return nil, err
-	}
-	if socket.Server() != iter.server {
-		// Socket server changed during iteration. This may happen
-		// with Eventual sessions, if a Refresh is done, or if a
-		// monotonic session gets a write and shifts from secondary
-		// to primary. Our cursor is in a specific server, though.
-		iter.session.m.Lock()
-		sockTimeout := iter.session.sockTimeout
-		iter.session.m.Unlock()
-		socket.Release()
-		socket, _, err = iter.server.AcquireSocket(0, sockTimeout)
-		if err != nil {
-			return nil, err
-		}
-		err := iter.session.socketLogin(socket)
-		if err != nil {
-			socket.Release()
-			return nil, err
-		}
-	}
-	return socket, nil
-}
-
-func (iter *Iter) getMore() {
-	// Increment now so that unlocking the iterator won't cause a
-	// different goroutine to get here as well.
-	iter.docsToReceive++
-	iter.m.Unlock()
-	socket, err := iter.acquireSocket()
-	iter.m.Lock()
-	if err != nil {
-		iter.err = err
-		return
-	}
-	defer socket.Release()
-
-	debugf("Iter %p requesting more documents", iter)
-	if iter.limit > 0 {
-		// The -1 below accounts for the fact docsToReceive was incremented above.
-		limit := iter.limit - int32(iter.docsToReceive-1) - int32(iter.docData.Len())
-		if limit < iter.op.limit {
-			iter.op.limit = limit
-		}
-	}
-	if err := socket.Query(&iter.op); err != nil {
-		iter.docsToReceive--
-		iter.err = err
-	}
-}
-
-type countCmd struct {
-	Count string
-	Query interface{}
-	Limit int32 ",omitempty"
-	Skip  int32 ",omitempty"
-}
-
-// Count returns the total number of documents in the result set.
-func (q *Query) Count() (n int, err error) {
-	q.m.Lock()
-	session := q.session
-	op := q.op
-	limit := q.limit
-	q.m.Unlock()
-
-	c := strings.Index(op.collection, ".")
-	if c < 0 {
-		return 0, errors.New("Bad collection name: " + op.collection)
-	}
-
-	dbname := op.collection[:c]
-	cname := op.collection[c+1:]
-	query := op.query
-	if query == nil {
-		query = bson.D{}
-	}
-	result := struct{ N int }{}
-	err = session.DB(dbname).Run(countCmd{cname, query, limit, op.skip}, &result)
-	return result.N, err
-}
-
-// Count returns the total number of documents in the collection.
-func (c *Collection) Count() (n int, err error) {
-	return c.Find(nil).Count()
-}
-
-type distinctCmd struct {
-	Collection string "distinct"
-	Key        string
-	Query      interface{} ",omitempty"
-}
-
-// Distinct unmarshals into result the list of distinct values for the given key.
-//
-// For example:
-//
-//     var result []int
-//     err := collection.Find(bson.M{"gender": "F"}).Distinct("age", &result)
-//
-// Relevant documentation:
-//
-//     http://www.mongodb.org/display/DOCS/Aggregation
-//
-func (q *Query) Distinct(key string, result interface{}) error {
-	q.m.Lock()
-	session := q.session
-	op := q.op // Copy.
-	q.m.Unlock()
-
-	c := strings.Index(op.collection, ".")
-	if c < 0 {
-		return errors.New("Bad collection name: " + op.collection)
-	}
-
-	dbname := op.collection[:c]
-	cname := op.collection[c+1:]
-
-	var doc struct{ Values bson.Raw }
-	err := session.DB(dbname).Run(distinctCmd{cname, key, op.query}, &doc)
-	if err != nil {
-		return err
-	}
-	return doc.Values.Unmarshal(result)
-}
-
-type mapReduceCmd struct {
-	Collection string "mapreduce"
-	Map        string ",omitempty"
-	Reduce     string ",omitempty"
-	Finalize   string ",omitempty"
-	Limit      int32  ",omitempty"
-	Out        interface{}
-	Query      interface{} ",omitempty"
-	Sort       interface{} ",omitempty"
-	Scope      interface{} ",omitempty"
-	Verbose    bool        ",omitempty"
-}
-
-type mapReduceResult struct {
-	Results    bson.Raw
-	Result     bson.Raw
-	TimeMillis int64 "timeMillis"
-	Counts     struct{ Input, Emit, Output int }
-	Ok         bool
-	Err        string
-	Timing     *MapReduceTime
-}
-
-type MapReduce struct {
-	Map      string      // Map Javascript function code (required)
-	Reduce   string      // Reduce Javascript function code (required)
-	Finalize string      // Finalize Javascript function code (optional)
-	Out      interface{} // Output collection name or document. If nil, results are inlined into the result parameter.
-	Scope    interface{} // Optional global scope for Javascript functions
-	Verbose  bool
-}
-
-type MapReduceInfo struct {
-	InputCount  int            // Number of documents mapped
-	EmitCount   int            // Number of times reduce called emit
-	OutputCount int            // Number of documents in resulting collection
-	Database    string         // Output database, if results are not inlined
-	Collection  string         // Output collection, if results are not inlined
-	Time        int64          // Time to run the job, in nanoseconds
-	VerboseTime *MapReduceTime // Only defined if Verbose was true
-}
-
-type MapReduceTime struct {
-	Total    int64 // Total time, in nanoseconds
-	Map      int64 "mapTime"  // Time within map function, in nanoseconds
-	EmitLoop int64 "emitLoop" // Time within the emit/map loop, in nanoseconds
-}
-
-// MapReduce executes a map/reduce job for documents covered by the query.
-// That kind of job is suitable for very flexible bulk aggregation of data
-// performed at the server side via Javascript functions.
-//
-// Results from the job may be returned as a result of the query itself
-// through the result parameter in case they'll certainly fit in memory
-// and in a single document.  If there's the possibility that the amount
-// of data might be too large, results must be stored back in an alternative
-// collection or even a separate database, by setting the Out field of the
-// provided MapReduce job.  In that case, provide nil as the result parameter.
-//
-// These are some of the ways to set Out:
-//
-//     nil
-//         Inline results into the result parameter.
-//
-//     bson.M{"replace": "mycollection"}
-//         The output will be inserted into a collection which replaces any
-//         existing collection with the same name.
-//
-//     bson.M{"merge": "mycollection"}
-//         This option will merge new data into the old output collection. In
-//         other words, if the same key exists in both the result set and the
-//         old collection, the new key will overwrite the old one.
-//
-//     bson.M{"reduce": "mycollection"}
-//         If documents exist for a given key in the result set and in the old
-//         collection, then a reduce operation (using the specified reduce
-//         function) will be performed on the two values and the result will be
-//         written to the output collection. If a finalize function was
-//         provided, this will be run after the reduce as well.
-//
-//     bson.M{...., "db": "mydb"}
-//         Any of the above options can have the "db" key included for doing
-//         the respective action in a separate database.
-//
-// The following is a trivial example which will count the number of
-// occurrences of a field named n on each document in a collection, and
-// will return results inline:
-//
-//     job := &mgo.MapReduce{
-//             Map:      "function() { emit(this.n, 1) }",
-//             Reduce:   "function(key, values) { return Array.sum(values) }",
-//     }
-//     var result []struct { Id int "_id"; Value int }
-//     _, err := collection.Find(nil).MapReduce(job, &result)
-//     if err != nil {
-//         return err
-//     }
-//     for _, item := range result {
-//         fmt.Println(item.Value)
-//     }
-//
-// This function is compatible with MongoDB 1.7.4+.
-//
-// Relevant documentation:
-//
-//     http://www.mongodb.org/display/DOCS/MapReduce
-//
-func (q *Query) MapReduce(job *MapReduce, result interface{}) (info *MapReduceInfo, err error) {
-	q.m.Lock()
-	session := q.session
-	op := q.op // Copy.
-	limit := q.limit
-	q.m.Unlock()
-
-	c := strings.Index(op.collection, ".")
-	if c < 0 {
-		return nil, errors.New("Bad collection name: " + op.collection)
-	}
-
-	dbname := op.collection[:c]
-	cname := op.collection[c+1:]
-
-	cmd := mapReduceCmd{
-		Collection: cname,
-		Map:        job.Map,
-		Reduce:     job.Reduce,
-		Finalize:   job.Finalize,
-		Out:        fixMROut(job.Out),
-		Scope:      job.Scope,
-		Verbose:    job.Verbose,
-		Query:      op.query,
-		Sort:       op.options.OrderBy,
-		Limit:      limit,
-	}
-
-	if cmd.Out == nil {
-		cmd.Out = bson.D{{"inline", 1}}
-	}
-
-	var doc mapReduceResult
-	err = session.DB(dbname).Run(&cmd, &doc)
-	if err != nil {
-		return nil, err
-	}
-	if doc.Err != "" {
-		return nil, errors.New(doc.Err)
-	}
-
-	info = &MapReduceInfo{
-		InputCount:  doc.Counts.Input,
-		EmitCount:   doc.Counts.Emit,
-		OutputCount: doc.Counts.Output,
-		Time:        doc.TimeMillis * 1e6,
-	}
-
-	if doc.Result.Kind == 0x02 {
-		err = doc.Result.Unmarshal(&info.Collection)
-		info.Database = dbname
-	} else if doc.Result.Kind == 0x03 {
-		var v struct{ Collection, Db string }
-		err = doc.Result.Unmarshal(&v)
-		info.Collection = v.Collection
-		info.Database = v.Db
-	}
-
-	if doc.Timing != nil {
-		info.VerboseTime = doc.Timing
-		info.VerboseTime.Total *= 1e6
-		info.VerboseTime.Map *= 1e6
-		info.VerboseTime.EmitLoop *= 1e6
-	}
-
-	if err != nil {
-		return nil, err
-	}
-	if result != nil {
-		return info, doc.Results.Unmarshal(result)
-	}
-	return info, nil
-}
-
-// The "out" option in the MapReduce command must be ordered. This was
-// found after the implementation was accepting maps for a long time,
-// so rather than breaking the API, we'll fix the order if necessary.
-// Details about the order requirement may be seen in MongoDB's code:
-//
-//     http://goo.gl/L8jwJX
-//
-func fixMROut(out interface{}) interface{} {
-	outv := reflect.ValueOf(out)
-	if outv.Kind() != reflect.Map || outv.Type().Key() != reflect.TypeOf("") {
-		return out
-	}
-	outs := make(bson.D, outv.Len())
-
-	outTypeIndex := -1
-	for i, k := range outv.MapKeys() {
-		ks := k.String()
-		outs[i].Name = ks
-		outs[i].Value = outv.MapIndex(k).Interface()
-		switch ks {
-		case "normal", "replace", "merge", "reduce", "inline":
-			outTypeIndex = i
-		}
-	}
-	if outTypeIndex > 0 {
-		outs[0], outs[outTypeIndex] = outs[outTypeIndex], outs[0]
-	}
-	return outs
-}
-
-// Change holds fields for running a findAndModify MongoDB command via
-// the Query.Apply method.
-type Change struct {
-	Update    interface{} // The update document
-	Upsert    bool        // Whether to insert in case the document isn't found
-	Remove    bool        // Whether to remove the document found rather than updating
-	ReturnNew bool        // Should the modified document be returned rather than the old one
-}
-
-type findModifyCmd struct {
-	Collection                  string      "findAndModify"
-	Query, Update, Sort, Fields interface{} ",omitempty"
-	Upsert, Remove, New         bool        ",omitempty"
-}
-
-type valueResult struct {
-	Value     bson.Raw
-	LastError LastError "lastErrorObject"
-}
-
-// Apply runs the findAndModify MongoDB command, which allows updating, upserting
-// or removing a document matching a query and atomically returning either the old
-// version (the default) or the new version of the document (when ReturnNew is true).
-// If no objects are found Apply returns ErrNotFound.
-//
-// The Sort and Select query methods affect the result of Apply.  In case
-// multiple documents match the query, Sort enables selecting which document to
-// act upon by ordering it first.  Select enables retrieving only a selection
-// of fields of the new or old document.
-//
-// This simple example increments a counter and prints its new value:
-//
-//     change := mgo.Change{
-//             Update: bson.M{"$inc": bson.M{"n": 1}},
-//             ReturnNew: true,
-//     }
-//     info, err = col.Find(M{"_id": id}).Apply(change, &doc)
-//     fmt.Println(doc.N)
-//
-// This method depends on MongoDB >= 2.0 to work properly.
-//
-// Relevant documentation:
-//
-//     http://www.mongodb.org/display/DOCS/findAndModify+Command
-//     http://www.mongodb.org/display/DOCS/Updating
-//     http://www.mongodb.org/display/DOCS/Atomic+Operations
-//
-func (q *Query) Apply(change Change, result interface{}) (info *ChangeInfo, err error) {
-	q.m.Lock()
-	session := q.session
-	op := q.op // Copy.
-	q.m.Unlock()
-
-	c := strings.Index(op.collection, ".")
-	if c < 0 {
-		return nil, errors.New("bad collection name: " + op.collection)
-	}
-
-	dbname := op.collection[:c]
-	cname := op.collection[c+1:]
-
-	cmd := findModifyCmd{
-		Collection: cname,
-		Update:     change.Update,
-		Upsert:     change.Upsert,
-		Remove:     change.Remove,
-		New:        change.ReturnNew,
-		Query:      op.query,
-		Sort:       op.options.OrderBy,
-		Fields:     op.selector,
-	}
-
-	session = session.Clone()
-	defer session.Close()
-	session.SetMode(Strong, false)
-
-	var doc valueResult
-	err = session.DB(dbname).Run(&cmd, &doc)
-	if err != nil {
-		if qerr, ok := err.(*QueryError); ok && qerr.Message == "No matching object found" {
-			return nil, ErrNotFound
-		}
-		return nil, err
-	}
-	if doc.LastError.N == 0 {
-		return nil, ErrNotFound
-	}
-	if doc.Value.Kind != 0x0A && result != nil {
-		err = doc.Value.Unmarshal(result)
-		if err != nil {
-			return nil, err
-		}
-	}
-	info = &ChangeInfo{}
-	lerr := &doc.LastError
-	if lerr.UpdatedExisting {
-		info.Updated = lerr.N
-	} else if change.Remove {
-		info.Removed = lerr.N
-	} else if change.Upsert {
-		info.UpsertedId = lerr.UpsertedId
-	}
-	return info, nil
-}
-
-// The BuildInfo type encapsulates details about the running MongoDB server.
-//
-// Note that the VersionArray field was introduced in MongoDB 2.0+, but it is
-// internally assembled from the Version information for previous versions.
-// In both cases, VersionArray is guaranteed to have at least 4 entries.
-type BuildInfo struct {
-	Version        string
-	VersionArray   []int  `bson:"versionArray"` // On MongoDB 2.0+; assembled from Version otherwise
-	GitVersion     string `bson:"gitVersion"`
-	OpenSSLVersion string `bson:"OpenSSLVersion"`
-	SysInfo        string `bson:"sysInfo"`
-	Bits           int
-	Debug          bool
-	MaxObjectSize  int `bson:"maxBsonObjectSize"`
-}
-
-// VersionAtLeast returns whether the BuildInfo version is greater than or
-// equal to the provided version number. If more than one number is
-// provided, numbers will be considered as major, minor, and so on.
-func (bi *BuildInfo) VersionAtLeast(version ...int) bool {
-	for i := range version {
-		if i == len(bi.VersionArray) {
-			return false
-		}
-		if bi.VersionArray[i] < version[i] {
-			return false
-		}
-	}
-	return true
-}
-
-// BuildInfo retrieves the version and other details about the
-// running MongoDB server.
-func (s *Session) BuildInfo() (info BuildInfo, err error) {
-	err = s.Run(bson.D{{"buildInfo", "1"}}, &info)
-	if len(info.VersionArray) == 0 {
-		for _, a := range strings.Split(info.Version, ".") {
-			i, err := strconv.Atoi(a)
-			if err != nil {
-				break
-			}
-			info.VersionArray = append(info.VersionArray, i)
-		}
-	}
-	for len(info.VersionArray) < 4 {
-		info.VersionArray = append(info.VersionArray, 0)
-	}
-	if i := strings.IndexByte(info.GitVersion, ' '); i >= 0 {
-		// Strip off the " modules: enterprise" suffix. This is a _git version_.
-		// That information may be moved to another field if people need it.
-		info.GitVersion = info.GitVersion[:i]
-	}
-	return
-}
-
-// ---------------------------------------------------------------------------
-// Internal session handling helpers.
-
-func (s *Session) acquireSocket(slaveOk bool) (*mongoSocket, error) {
-
-	// Read-only lock to check for previously reserved socket.
-	s.m.RLock()
-	if s.masterSocket != nil {
-		socket := s.masterSocket
-		socket.Acquire()
-		s.m.RUnlock()
-		return socket, nil
-	}
-	if s.slaveSocket != nil && s.slaveOk && slaveOk {
-		socket := s.slaveSocket
-		socket.Acquire()
-		s.m.RUnlock()
-		return socket, nil
-	}
-	s.m.RUnlock()
-
-	// No go.  We may have to request a new socket and change the session,
-	// so try again but with an exclusive lock now.
-	s.m.Lock()
-	defer s.m.Unlock()
-
-	if s.masterSocket != nil {
-		s.masterSocket.Acquire()
-		return s.masterSocket, nil
-	}
-	if s.slaveSocket != nil && s.slaveOk && slaveOk {
-		s.slaveSocket.Acquire()
-		return s.slaveSocket, nil
-	}
-
-	// Still not good.  We need a new socket.
-	sock, err := s.cluster().AcquireSocket(slaveOk && s.slaveOk, s.syncTimeout, s.sockTimeout, s.queryConfig.op.serverTags, s.poolLimit)
-	if err != nil {
-		return nil, err
-	}
-
-	// Authenticate the new socket.
-	if err = s.socketLogin(sock); err != nil {
-		sock.Release()
-		return nil, err
-	}
-
-	// Keep track of the new socket, if necessary.
-	// Note that, as a special case, if the Eventual session was
-	// not refreshed (s.slaveSocket != nil), it means the developer
-	// asked to preserve an existing reserved socket, so we'll
-	// keep a master one around too before a Refresh happens.
-	if s.consistency != Eventual || s.slaveSocket != nil {
-		s.setSocket(sock)
-	}
-
-	// Switch over a Monotonic session to the master.
-	if !slaveOk && s.consistency == Monotonic {
-		s.slaveOk = false
-	}
-
-	return sock, nil
-}
-
-// setSocket binds socket to this section.
-func (s *Session) setSocket(socket *mongoSocket) {
-	info := socket.Acquire()
-	if info.Master {
-		if s.masterSocket != nil {
-			panic("setSocket(master) with existing master socket reserved")
-		}
-		s.masterSocket = socket
-	} else {
-		if s.slaveSocket != nil {
-			panic("setSocket(slave) with existing slave socket reserved")
-		}
-		s.slaveSocket = socket
-	}
-}
-
-// unsetSocket releases any slave and/or master sockets reserved.
-func (s *Session) unsetSocket() {
-	if s.masterSocket != nil {
-		s.masterSocket.Release()
-	}
-	if s.slaveSocket != nil {
-		s.slaveSocket.Release()
-	}
-	s.masterSocket = nil
-	s.slaveSocket = nil
-}
-
-func (iter *Iter) replyFunc() replyFunc {
-	return func(err error, op *replyOp, docNum int, docData []byte) {
-		iter.m.Lock()
-		iter.docsToReceive--
-		if err != nil {
-			iter.err = err
-			debugf("Iter %p received an error: %s", iter, err.Error())
-		} else if docNum == -1 {
-			debugf("Iter %p received no documents (cursor=%d).", iter, op.cursorId)
-			if op != nil && op.cursorId != 0 {
-				// It's a tailable cursor.
-				iter.op.cursorId = op.cursorId
-			} else if op != nil && op.cursorId == 0 && op.flags&1 == 1 {
-				// Cursor likely timed out.
-				iter.err = ErrCursor
-			} else {
-				iter.err = ErrNotFound
-			}
-		} else {
-			rdocs := int(op.replyDocs)
-			if docNum == 0 {
-				iter.docsToReceive += rdocs - 1
-				docsToProcess := iter.docData.Len() + rdocs
-				if iter.limit == 0 || int32(docsToProcess) < iter.limit {
-					iter.docsBeforeMore = docsToProcess - int(iter.prefetch*float64(rdocs))
-				} else {
-					iter.docsBeforeMore = -1
-				}
-				iter.op.cursorId = op.cursorId
-			}
-			// XXX Handle errors and flags.
-			debugf("Iter %p received reply document %d/%d (cursor=%d)", iter, docNum+1, rdocs, op.cursorId)
-			iter.docData.Push(docData)
-		}
-		iter.gotReply.Broadcast()
-		iter.m.Unlock()
-	}
-}
-
-type writeCmdResult struct {
-	Ok        bool
-	N         int
-	NModified int `bson:"nModified"`
-	Upserted  []struct {
-		Index int
-		Id    interface{} `_id`
-	}
-	Errors []struct {
-		Ok     bool
-		Index  int
-		Code   int
-		N      int
-		ErrMsg string
-	} `bson:"writeErrors"`
-	ConcernError struct {
-		Code   int
-		ErrMsg string
-	} `bson:"writeConcernError"`
-}
-
-// writeQuery runs the given modifying operation, potentially followed up
-// by a getLastError command in case the session is in safe mode.  The
-// LastError result is made available in lerr, and if lerr.Err is set it
-// will also be returned as err.
-func (c *Collection) writeQuery(op interface{}) (lerr *LastError, err error) {
-	s := c.Database.Session
-	dbname := c.Database.Name
-	socket, err := s.acquireSocket(dbname == "local")
-	if err != nil {
-		return nil, err
-	}
-	defer socket.Release()
-
-	s.m.RLock()
-	safeOp := s.safeOp
-	s.m.RUnlock()
-
-	// TODO Enable this path for wire version 2 as well.
-	if socket.ServerInfo().MaxWireVersion >= 3 {
-		// Servers with a more recent write protocol benefit from write commands.
-		if op, ok := op.(*insertOp); ok && len(op.documents) > 1000 {
-			var firstErr error
-			// Maximum batch size is 1000. Must split out in separate operations for compatibility.
-			all := op.documents
-			for i := 0; i < len(all); i += 1000 {
-				l := i + 1000
-				if l > len(all) {
-					l = len(all)
-				}
-				op.documents = all[i:l]
-				_, err := c.writeCommand(socket, safeOp, op)
-				if err != nil {
-					if op.flags&1 != 0 {
-						if firstErr == nil {
-							firstErr = err
-						}
-					} else {
-						return nil, err
-					}
-				}
-			}
-			return nil, firstErr
-		}
-		return c.writeCommand(socket, safeOp, op)
-	}
-
-	if safeOp == nil {
-		return nil, socket.Query(op)
-	}
-
-	var mutex sync.Mutex
-	var replyData []byte
-	var replyErr error
-	mutex.Lock()
-	query := *safeOp // Copy the data.
-	query.collection = dbname + ".$cmd"
-	query.replyFunc = func(err error, reply *replyOp, docNum int, docData []byte) {
-		replyData = docData
-		replyErr = err
-		mutex.Unlock()
-	}
-	err = socket.Query(op, &query)
-	if err != nil {
-		return nil, err
-	}
-	mutex.Lock() // Wait.
-	if replyErr != nil {
-		return nil, replyErr // XXX TESTME
-	}
-	if hasErrMsg(replyData) {
-		// Looks like getLastError itself failed.
-		err = checkQueryError(query.collection, replyData)
-		if err != nil {
-			return nil, err
-		}
-	}
-	result := &LastError{}
-	bson.Unmarshal(replyData, &result)
-	debugf("Result from writing query: %#v", result)
-	if result.Err != "" {
-		return result, result
-	}
-	return result, nil
-}
-
-func (c *Collection) writeCommand(socket *mongoSocket, safeOp *queryOp, op interface{}) (lerr *LastError, err error) {
-	var writeConcern interface{}
-	if safeOp == nil {
-		writeConcern = bson.D{{"w", 0}}
-	} else {
-		writeConcern = safeOp.query.(*getLastError)
-	}
-
-	var cmd bson.D
-	switch op := op.(type) {
-	case *insertOp:
-		// http://docs.mongodb.org/manual/reference/command/insert
-		cmd = bson.D{
-			{"insert", c.Name},
-			{"documents", op.documents},
-			{"writeConcern", writeConcern},
-			{"ordered", op.flags&1 == 0},
-		}
-	case *updateOp:
-		// http://docs.mongodb.org/manual/reference/command/update
-		selector := op.selector
-		if selector == nil {
-			selector = bson.D{}
-		}
-		cmd = bson.D{
-			{"update", c.Name},
-			{"updates", []bson.D{{{"q", selector}, {"u", op.update}, {"upsert", op.flags&1 != 0}, {"multi", op.flags&2 != 0}}}},
-			{"writeConcern", writeConcern},
-			//{"ordered", <bool>},
-		}
-	case *deleteOp:
-		// http://docs.mongodb.org/manual/reference/command/delete
-		selector := op.selector
-		if selector == nil {
-			selector = bson.D{}
-		}
-		cmd = bson.D{
-			{"delete", c.Name},
-			{"deletes", []bson.D{{{"q", selector}, {"limit", op.flags & 1}}}},
-			{"writeConcern", writeConcern},
-			//{"ordered", <bool>},
-		}
-	}
-
-	var result writeCmdResult
-	err = c.Database.run(socket, cmd, &result)
-	debugf("Write command result: %#v (err=%v)", result, err)
-	lerr = &LastError{
-		UpdatedExisting: result.N > 0 && len(result.Upserted) == 0,
-		N: result.N,
-	}
-	if len(result.Upserted) > 0 {
-		lerr.UpsertedId = result.Upserted[0].Id
-	}
-	if len(result.Errors) > 0 {
-		e := result.Errors[0]
-		if !e.Ok {
-			lerr.Code = e.Code
-			lerr.Err = e.ErrMsg
-			err = lerr
-		}
-	} else if result.ConcernError.Code != 0 {
-		e := result.ConcernError
-		lerr.Code = e.Code
-		lerr.Err = e.ErrMsg
-		err = lerr
-	}
-
-	if err == nil && safeOp == nil {
-		return nil, nil
-	}
-	return lerr, err
-}
-
-func hasErrMsg(d []byte) bool {
-	l := len(d)
-	for i := 0; i+8 < l; i++ {
-		if d[i] == '\x02' && d[i+1] == 'e' && d[i+2] == 'r' && d[i+3] == 'r' && d[i+4] == 'm' && d[i+5] == 's' && d[i+6] == 'g' && d[i+7] == '\x00' {
-			return true
-		}
-	}
-	return false
-}
diff --git a/Godeps/_workspace/src/gopkg.in/mgo.v2/session_test.go b/Godeps/_workspace/src/gopkg.in/mgo.v2/session_test.go
deleted file mode 100644
index 3ec5550a4..000000000
--- a/Godeps/_workspace/src/gopkg.in/mgo.v2/session_test.go
+++ /dev/null
@@ -1,3704 +0,0 @@
-// mgo - MongoDB driver for Go
-//
-// Copyright (c) 2010-2012 - Gustavo Niemeyer <gustavo@niemeyer.net>
-//
-// 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 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.
-
-package mgo_test
-
-import (
-	"flag"
-	"fmt"
-	"math"
-	"reflect"
-	"runtime"
-	"sort"
-	"strconv"
-	"strings"
-	"time"
-
-	. "gopkg.in/check.v1"
-	"gopkg.in/mgo.v2"
-	"gopkg.in/mgo.v2/bson"
-)
-
-func (s *S) TestRunString(c *C) {
-	session, err := mgo.Dial("localhost:40001")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	result := struct{ Ok int }{}
-	err = session.Run("ping", &result)
-	c.Assert(err, IsNil)
-	c.Assert(result.Ok, Equals, 1)
-}
-
-func (s *S) TestRunValue(c *C) {
-	session, err := mgo.Dial("localhost:40001")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	result := struct{ Ok int }{}
-	err = session.Run(M{"ping": 1}, &result)
-	c.Assert(err, IsNil)
-	c.Assert(result.Ok, Equals, 1)
-}
-
-func (s *S) TestPing(c *C) {
-	session, err := mgo.Dial("localhost:40001")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	// Just ensure the nonce has been received.
-	result := struct{}{}
-	err = session.Run("ping", &result)
-
-	mgo.ResetStats()
-
-	err = session.Ping()
-	c.Assert(err, IsNil)
-
-	// Pretty boring.
-	stats := mgo.GetStats()
-	c.Assert(stats.SentOps, Equals, 1)
-	c.Assert(stats.ReceivedOps, Equals, 1)
-}
-
-func (s *S) TestURLSingle(c *C) {
-	session, err := mgo.Dial("mongodb://localhost:40001/")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	result := struct{ Ok int }{}
-	err = session.Run("ping", &result)
-	c.Assert(err, IsNil)
-	c.Assert(result.Ok, Equals, 1)
-}
-
-func (s *S) TestURLMany(c *C) {
-	session, err := mgo.Dial("mongodb://localhost:40011,localhost:40012/")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	result := struct{ Ok int }{}
-	err = session.Run("ping", &result)
-	c.Assert(err, IsNil)
-	c.Assert(result.Ok, Equals, 1)
-}
-
-func (s *S) TestURLParsing(c *C) {
-	urls := []string{
-		"localhost:40001?foo=1&bar=2",
-		"localhost:40001?foo=1;bar=2",
-	}
-	for _, url := range urls {
-		session, err := mgo.Dial(url)
-		if session != nil {
-			session.Close()
-		}
-		c.Assert(err, ErrorMatches, "unsupported connection URL option: (foo=1|bar=2)")
-	}
-}
-
-func (s *S) TestInsertFindOne(c *C) {
-	session, err := mgo.Dial("localhost:40001")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	coll := session.DB("mydb").C("mycoll")
-	err = coll.Insert(M{"a": 1, "b": 2})
-	c.Assert(err, IsNil)
-	err = coll.Insert(M{"a": 1, "b": 3})
-	c.Assert(err, IsNil)
-
-	result := struct{ A, B int }{}
-
-	err = coll.Find(M{"a": 1}).Sort("b").One(&result)
-	c.Assert(err, IsNil)
-	c.Assert(result.A, Equals, 1)
-	c.Assert(result.B, Equals, 2)
-}
-
-func (s *S) TestInsertFindOneNil(c *C) {
-	session, err := mgo.Dial("localhost:40002")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	coll := session.DB("mydb").C("mycoll")
-	err = coll.Find(nil).One(nil)
-	c.Assert(err, ErrorMatches, "unauthorized.*|not authorized.*")
-}
-
-func (s *S) TestInsertFindOneMap(c *C) {
-	session, err := mgo.Dial("localhost:40001")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	coll := session.DB("mydb").C("mycoll")
-	err = coll.Insert(M{"a": 1, "b": 2})
-	c.Assert(err, IsNil)
-	result := make(M)
-	err = coll.Find(M{"a": 1}).One(result)
-	c.Assert(err, IsNil)
-	c.Assert(result["a"], Equals, 1)
-	c.Assert(result["b"], Equals, 2)
-}
-
-func (s *S) TestInsertFindAll(c *C) {
-	session, err := mgo.Dial("localhost:40001")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	coll := session.DB("mydb").C("mycoll")
-	err = coll.Insert(M{"a": 1, "b": 2})
-	c.Assert(err, IsNil)
-	err = coll.Insert(M{"a": 3, "b": 4})
-	c.Assert(err, IsNil)
-
-	type R struct{ A, B int }
-	var result []R
-
-	assertResult := func() {
-		c.Assert(len(result), Equals, 2)
-		c.Assert(result[0].A, Equals, 1)
-		c.Assert(result[0].B, Equals, 2)
-		c.Assert(result[1].A, Equals, 3)
-		c.Assert(result[1].B, Equals, 4)
-	}
-
-	// nil slice
-	err = coll.Find(nil).Sort("a").All(&result)
-	c.Assert(err, IsNil)
-	assertResult()
-
-	// Previously allocated slice
-	allocd := make([]R, 5)
-	result = allocd
-	err = coll.Find(nil).Sort("a").All(&result)
-	c.Assert(err, IsNil)
-	assertResult()
-
-	// Ensure result is backed by the originally allocated array
-	c.Assert(&result[0], Equals, &allocd[0])
-
-	// Non-pointer slice error
-	f := func() { coll.Find(nil).All(result) }
-	c.Assert(f, Panics, "result argument must be a slice address")
-
-	// Non-slice error
-	f = func() { coll.Find(nil).All(new(int)) }
-	c.Assert(f, Panics, "result argument must be a slice address")
-}
-
-func (s *S) TestFindRef(c *C) {
-	session, err := mgo.Dial("localhost:40001")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	db1 := session.DB("db1")
-	db1col1 := db1.C("col1")
-
-	db2 := session.DB("db2")
-	db2col1 := db2.C("col1")
-
-	err = db1col1.Insert(M{"_id": 1, "n": 1})
-	c.Assert(err, IsNil)
-	err = db1col1.Insert(M{"_id": 2, "n": 2})
-	c.Assert(err, IsNil)
-	err = db2col1.Insert(M{"_id": 2, "n": 3})
-	c.Assert(err, IsNil)
-
-	result := struct{ N int }{}
-
-	ref1 := &mgo.DBRef{Collection: "col1", Id: 1}
-	ref2 := &mgo.DBRef{Collection: "col1", Id: 2, Database: "db2"}
-
-	err = db1.FindRef(ref1).One(&result)
-	c.Assert(err, IsNil)
-	c.Assert(result.N, Equals, 1)
-
-	err = db1.FindRef(ref2).One(&result)
-	c.Assert(err, IsNil)
-	c.Assert(result.N, Equals, 3)
-
-	err = db2.FindRef(ref1).One(&result)
-	c.Assert(err, Equals, mgo.ErrNotFound)
-
-	err = db2.FindRef(ref2).One(&result)
-	c.Assert(err, IsNil)
-	c.Assert(result.N, Equals, 3)
-
-	err = session.FindRef(ref2).One(&result)
-	c.Assert(err, IsNil)
-	c.Assert(result.N, Equals, 3)
-
-	f := func() { session.FindRef(ref1).One(&result) }
-	c.Assert(f, PanicMatches, "Can't resolve database for &mgo.DBRef{Collection:\"col1\", Id:1, Database:\"\"}")
-}
-
-func (s *S) TestDatabaseAndCollectionNames(c *C) {
-	session, err := mgo.Dial("localhost:40001")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	db1 := session.DB("db1")
-	db1col1 := db1.C("col1")
-	db1col2 := db1.C("col2")
-
-	db2 := session.DB("db2")
-	db2col1 := db2.C("col3")
-
-	err = db1col1.Insert(M{"_id": 1})
-	c.Assert(err, IsNil)
-	err = db1col2.Insert(M{"_id": 1})
-	c.Assert(err, IsNil)
-	err = db2col1.Insert(M{"_id": 1})
-	c.Assert(err, IsNil)
-
-	names, err := session.DatabaseNames()
-	c.Assert(err, IsNil)
-	if !reflect.DeepEqual(names, []string{"db1", "db2"}) {
-		// 2.4+ has "local" as well.
-		c.Assert(names, DeepEquals, []string{"db1", "db2", "local"})
-	}
-
-	// Try to exercise cursor logic. 2.8.0-rc3 still ignores this.
-	session.SetBatch(2)
-
-	names, err = db1.CollectionNames()
-	c.Assert(err, IsNil)
-	c.Assert(names, DeepEquals, []string{"col1", "col2", "system.indexes"})
-
-	names, err = db2.CollectionNames()
-	c.Assert(err, IsNil)
-	c.Assert(names, DeepEquals, []string{"col3", "system.indexes"})
-}
-
-func (s *S) TestSelect(c *C) {
-	session, err := mgo.Dial("localhost:40001")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	coll := session.DB("mydb").C("mycoll")
-	coll.Insert(M{"a": 1, "b": 2})
-
-	result := struct{ A, B int }{}
-
-	err = coll.Find(M{"a": 1}).Select(M{"b": 1}).One(&result)
-	c.Assert(err, IsNil)
-	c.Assert(result.A, Equals, 0)
-	c.Assert(result.B, Equals, 2)
-}
-
-func (s *S) TestInlineMap(c *C) {
-	session, err := mgo.Dial("localhost:40001")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	coll := session.DB("mydb").C("mycoll")
-
-	var v, result1 struct {
-		A int
-		M map[string]int ",inline"
-	}
-
-	v.A = 1
-	v.M = map[string]int{"b": 2}
-	err = coll.Insert(v)
-	c.Assert(err, IsNil)
-
-	noId := M{"_id": 0}
-
-	err = coll.Find(nil).Select(noId).One(&result1)
-	c.Assert(err, IsNil)
-	c.Assert(result1.A, Equals, 1)
-	c.Assert(result1.M, DeepEquals, map[string]int{"b": 2})
-
-	var result2 M
-	err = coll.Find(nil).Select(noId).One(&result2)
-	c.Assert(err, IsNil)
-	c.Assert(result2, DeepEquals, M{"a": 1, "b": 2})
-
-}
-
-func (s *S) TestUpdate(c *C) {
-	session, err := mgo.Dial("localhost:40001")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	coll := session.DB("mydb").C("mycoll")
-
-	ns := []int{40, 41, 42, 43, 44, 45, 46}
-	for _, n := range ns {
-		err := coll.Insert(M{"k": n, "n": n})
-		c.Assert(err, IsNil)
-	}
-
-	// No changes is a no-op and shouldn't return an error.
-	err = coll.Update(M{"k": 42}, M{"$set": M{"n": 42}})
-	c.Assert(err, IsNil)
-
-	err = coll.Update(M{"k": 42}, M{"$inc": M{"n": 1}})
-	c.Assert(err, IsNil)
-
-	result := make(M)
-	err = coll.Find(M{"k": 42}).One(result)
-	c.Assert(err, IsNil)
-	c.Assert(result["n"], Equals, 43)
-
-	err = coll.Update(M{"k": 47}, M{"k": 47, "n": 47})
-	c.Assert(err, Equals, mgo.ErrNotFound)
-
-	err = coll.Find(M{"k": 47}).One(result)
-	c.Assert(err, Equals, mgo.ErrNotFound)
-}
-
-func (s *S) TestUpdateId(c *C) {
-	session, err := mgo.Dial("localhost:40001")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	coll := session.DB("mydb").C("mycoll")
-
-	ns := []int{40, 41, 42, 43, 44, 45, 46}
-	for _, n := range ns {
-		err := coll.Insert(M{"_id": n, "n": n})
-		c.Assert(err, IsNil)
-	}
-
-	err = coll.UpdateId(42, M{"$inc": M{"n": 1}})
-	c.Assert(err, IsNil)
-
-	result := make(M)
-	err = coll.FindId(42).One(result)
-	c.Assert(err, IsNil)
-	c.Assert(result["n"], Equals, 43)
-
-	err = coll.UpdateId(47, M{"k": 47, "n": 47})
-	c.Assert(err, Equals, mgo.ErrNotFound)
-
-	err = coll.FindId(47).One(result)
-	c.Assert(err, Equals, mgo.ErrNotFound)
-}
-
-func (s *S) TestUpdateNil(c *C) {
-	session, err := mgo.Dial("localhost:40001")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	coll := session.DB("mydb").C("mycoll")
-
-	err = coll.Insert(M{"k": 42, "n": 42})
-	c.Assert(err, IsNil)
-	err = coll.Update(nil, M{"$inc": M{"n": 1}})
-	c.Assert(err, IsNil)
-
-	result := make(M)
-	err = coll.Find(M{"k": 42}).One(result)
-	c.Assert(err, IsNil)
-	c.Assert(result["n"], Equals, 43)
-
-	err = coll.Insert(M{"k": 45, "n": 45})
-	c.Assert(err, IsNil)
-	_, err = coll.UpdateAll(nil, M{"$inc": M{"n": 1}})
-	c.Assert(err, IsNil)
-
-	err = coll.Find(M{"k": 42}).One(result)
-	c.Assert(err, IsNil)
-	c.Assert(result["n"], Equals, 44)
-	err = coll.Find(M{"k": 45}).One(result)
-	c.Assert(err, IsNil)
-	c.Assert(result["n"], Equals, 46)
-}
-
-func (s *S) TestUpsert(c *C) {
-	session, err := mgo.Dial("localhost:40001")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	coll := session.DB("mydb").C("mycoll")
-
-	ns := []int{40, 41, 42, 43, 44, 45, 46}
-	for _, n := range ns {
-		err := coll.Insert(M{"k": n, "n": n})
-		c.Assert(err, IsNil)
-	}
-
-	info, err := coll.Upsert(M{"k": 42}, M{"k": 42, "n": 24})
-	c.Assert(err, IsNil)
-	c.Assert(info.Updated, Equals, 1)
-	c.Assert(info.UpsertedId, IsNil)
-
-	result := M{}
-	err = coll.Find(M{"k": 42}).One(result)
-	c.Assert(err, IsNil)
-	c.Assert(result["n"], Equals, 24)
-
-	// Insert with internally created id.
-	info, err = coll.Upsert(M{"k": 47}, M{"k": 47, "n": 47})
-	c.Assert(err, IsNil)
-	c.Assert(info.Updated, Equals, 0)
-	c.Assert(info.UpsertedId, NotNil)
-
-	err = coll.Find(M{"k": 47}).One(result)
-	c.Assert(err, IsNil)
-	c.Assert(result["n"], Equals, 47)
-
-	result = M{}
-	err = coll.Find(M{"_id": info.UpsertedId}).One(result)
-	c.Assert(err, IsNil)
-	c.Assert(result["n"], Equals, 47)
-
-	// Insert with provided id.
-	info, err = coll.Upsert(M{"k": 48}, M{"k": 48, "n": 48, "_id": 48})
-	c.Assert(err, IsNil)
-	c.Assert(info.Updated, Equals, 0)
-	if s.versionAtLeast(2, 6) {
-		c.Assert(info.UpsertedId, Equals, 48)
-	} else {
-		c.Assert(info.UpsertedId, IsNil) // Unfortunate, but that's what Mongo gave us.
-	}
-
-	err = coll.Find(M{"k": 48}).One(result)
-	c.Assert(err, IsNil)
-	c.Assert(result["n"], Equals, 48)
-}
-
-func (s *S) TestUpsertId(c *C) {
-	session, err := mgo.Dial("localhost:40001")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	coll := session.DB("mydb").C("mycoll")
-
-	ns := []int{40, 41, 42, 43, 44, 45, 46}
-	for _, n := range ns {
-		err := coll.Insert(M{"_id": n, "n": n})
-		c.Assert(err, IsNil)
-	}
-
-	info, err := coll.UpsertId(42, M{"n": 24})
-	c.Assert(err, IsNil)
-	c.Assert(info.Updated, Equals, 1)
-	c.Assert(info.UpsertedId, IsNil)
-
-	result := M{}
-	err = coll.FindId(42).One(result)
-	c.Assert(err, IsNil)
-	c.Assert(result["n"], Equals, 24)
-
-	info, err = coll.UpsertId(47, M{"_id": 47, "n": 47})
-	c.Assert(err, IsNil)
-	c.Assert(info.Updated, Equals, 0)
-	if s.versionAtLeast(2, 6) {
-		c.Assert(info.UpsertedId, Equals, 47)
-	} else {
-		c.Assert(info.UpsertedId, IsNil)
-	}
-
-	err = coll.FindId(47).One(result)
-	c.Assert(err, IsNil)
-	c.Assert(result["n"], Equals, 47)
-}
-
-func (s *S) TestUpdateAll(c *C) {
-	session, err := mgo.Dial("localhost:40001")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	coll := session.DB("mydb").C("mycoll")
-
-	ns := []int{40, 41, 42, 43, 44, 45, 46}
-	for _, n := range ns {
-		err := coll.Insert(M{"k": n, "n": n})
-		c.Assert(err, IsNil)
-	}
-
-	// Don't actually modify the documents. Should still report 4 matching updates.
-	info, err := coll.UpdateAll(M{"k": M{"$gt": 42}}, M{"$unset": M{"missing": 1}})
-	c.Assert(err, IsNil)
-	c.Assert(info.Updated, Equals, 4)
-
-	info, err = coll.UpdateAll(M{"k": M{"$gt": 42}}, M{"$inc": M{"n": 1}})
-	c.Assert(err, IsNil)
-	c.Assert(info.Updated, Equals, 4)
-
-	result := make(M)
-	err = coll.Find(M{"k": 42}).One(result)
-	c.Assert(err, IsNil)
-	c.Assert(result["n"], Equals, 42)
-
-	err = coll.Find(M{"k": 43}).One(result)
-	c.Assert(err, IsNil)
-	c.Assert(result["n"], Equals, 44)
-
-	err = coll.Find(M{"k": 44}).One(result)
-	c.Assert(err, IsNil)
-	c.Assert(result["n"], Equals, 45)
-
-	if !s.versionAtLeast(2, 6) {
-		// 2.6 made this invalid.
-		info, err = coll.UpdateAll(M{"k": 47}, M{"k": 47, "n": 47})
-		c.Assert(err, Equals, nil)
-		c.Assert(info.Updated, Equals, 0)
-	}
-}
-
-func (s *S) TestRemove(c *C) {
-	session, err := mgo.Dial("localhost:40001")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	coll := session.DB("mydb").C("mycoll")
-
-	ns := []int{40, 41, 42, 43, 44, 45, 46}
-	for _, n := range ns {
-		err := coll.Insert(M{"n": n})
-		c.Assert(err, IsNil)
-	}
-
-	err = coll.Remove(M{"n": M{"$gt": 42}})
-	c.Assert(err, IsNil)
-
-	result := &struct{ N int }{}
-	err = coll.Find(M{"n": 42}).One(result)
-	c.Assert(err, IsNil)
-	c.Assert(result.N, Equals, 42)
-
-	err = coll.Find(M{"n": 43}).One(result)
-	c.Assert(err, Equals, mgo.ErrNotFound)
-
-	err = coll.Find(M{"n": 44}).One(result)
-	c.Assert(err, IsNil)
-	c.Assert(result.N, Equals, 44)
-}
-
-func (s *S) TestRemoveId(c *C) {
-	session, err := mgo.Dial("localhost:40001")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	coll := session.DB("mydb").C("mycoll")
-
-	err = coll.Insert(M{"_id": 40}, M{"_id": 41}, M{"_id": 42})
-	c.Assert(err, IsNil)
-
-	err = coll.RemoveId(41)
-	c.Assert(err, IsNil)
-
-	c.Assert(coll.FindId(40).One(nil), IsNil)
-	c.Assert(coll.FindId(41).One(nil), Equals, mgo.ErrNotFound)
-	c.Assert(coll.FindId(42).One(nil), IsNil)
-}
-
-func (s *S) TestRemoveUnsafe(c *C) {
-	session, err := mgo.Dial("localhost:40001")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	session.SetSafe(nil)
-
-	coll := session.DB("mydb").C("mycoll")
-
-	err = coll.Insert(M{"_id": 40}, M{"_id": 41}, M{"_id": 42})
-	c.Assert(err, IsNil)
-
-	err = coll.RemoveId(41)
-	c.Assert(err, IsNil)
-
-	c.Assert(coll.FindId(40).One(nil), IsNil)
-	c.Assert(coll.FindId(41).One(nil), Equals, mgo.ErrNotFound)
-	c.Assert(coll.FindId(42).One(nil), IsNil)
-}
-
-func (s *S) TestRemoveAll(c *C) {
-	session, err := mgo.Dial("localhost:40001")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	coll := session.DB("mydb").C("mycoll")
-
-	ns := []int{40, 41, 42, 43, 44, 45, 46}
-	for _, n := range ns {
-		err := coll.Insert(M{"n": n})
-		c.Assert(err, IsNil)
-	}
-
-	info, err := coll.RemoveAll(M{"n": M{"$gt": 42}})
-	c.Assert(err, IsNil)
-	c.Assert(info.Updated, Equals, 0)
-	c.Assert(info.Removed, Equals, 4)
-	c.Assert(info.UpsertedId, IsNil)
-
-	result := &struct{ N int }{}
-	err = coll.Find(M{"n": 42}).One(result)
-	c.Assert(err, IsNil)
-	c.Assert(result.N, Equals, 42)
-
-	err = coll.Find(M{"n": 43}).One(result)
-	c.Assert(err, Equals, mgo.ErrNotFound)
-
-	err = coll.Find(M{"n": 44}).One(result)
-	c.Assert(err, Equals, mgo.ErrNotFound)
-
-	info, err = coll.RemoveAll(nil)
-	c.Assert(err, IsNil)
-	c.Assert(info.Updated, Equals, 0)
-	c.Assert(info.Removed, Equals, 3)
-	c.Assert(info.UpsertedId, IsNil)
-
-	n, err := coll.Find(nil).Count()
-	c.Assert(err, IsNil)
-	c.Assert(n, Equals, 0)
-}
-
-func (s *S) TestDropDatabase(c *C) {
-	session, err := mgo.Dial("localhost:40001")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	db1 := session.DB("db1")
-	db1.C("col").Insert(M{"_id": 1})
-
-	db2 := session.DB("db2")
-	db2.C("col").Insert(M{"_id": 1})
-
-	err = db1.DropDatabase()
-	c.Assert(err, IsNil)
-
-	names, err := session.DatabaseNames()
-	c.Assert(err, IsNil)
-	if !reflect.DeepEqual(names, []string{"db2"}) {
-		// 2.4+ has "local" as well.
-		c.Assert(names, DeepEquals, []string{"db2", "local"})
-	}
-
-	err = db2.DropDatabase()
-	c.Assert(err, IsNil)
-
-	names, err = session.DatabaseNames()
-	c.Assert(err, IsNil)
-	if !reflect.DeepEqual(names, []string(nil)) {
-		// 2.4+ has "local" as well.
-		c.Assert(names, DeepEquals, []string{"local"})
-	}
-}
-
-func (s *S) TestDropCollection(c *C) {
-	session, err := mgo.Dial("localhost:40001")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	db := session.DB("db1")
-	db.C("col1").Insert(M{"_id": 1})
-	db.C("col2").Insert(M{"_id": 1})
-
-	err = db.C("col1").DropCollection()
-	c.Assert(err, IsNil)
-
-	names, err := db.CollectionNames()
-	c.Assert(err, IsNil)
-	c.Assert(names, DeepEquals, []string{"col2", "system.indexes"})
-
-	err = db.C("col2").DropCollection()
-	c.Assert(err, IsNil)
-
-	names, err = db.CollectionNames()
-	c.Assert(err, IsNil)
-	c.Assert(names, DeepEquals, []string{"system.indexes"})
-}
-
-func (s *S) TestCreateCollectionCapped(c *C) {
-	session, err := mgo.Dial("localhost:40001")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	coll := session.DB("mydb").C("mycoll")
-
-	info := &mgo.CollectionInfo{
-		Capped:   true,
-		MaxBytes: 1024,
-		MaxDocs:  3,
-	}
-	err = coll.Create(info)
-	c.Assert(err, IsNil)
-
-	ns := []int{1, 2, 3, 4, 5}
-	for _, n := range ns {
-		err := coll.Insert(M{"n": n})
-		c.Assert(err, IsNil)
-	}
-
-	n, err := coll.Find(nil).Count()
-	c.Assert(err, IsNil)
-	c.Assert(n, Equals, 3)
-}
-
-func (s *S) TestCreateCollectionNoIndex(c *C) {
-	session, err := mgo.Dial("localhost:40001")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	coll := session.DB("mydb").C("mycoll")
-
-	info := &mgo.CollectionInfo{
-		DisableIdIndex: true,
-	}
-	err = coll.Create(info)
-	c.Assert(err, IsNil)
-
-	err = coll.Insert(M{"n": 1})
-	c.Assert(err, IsNil)
-
-	indexes, err := coll.Indexes()
-	c.Assert(indexes, HasLen, 0)
-}
-
-func (s *S) TestCreateCollectionForceIndex(c *C) {
-	session, err := mgo.Dial("localhost:40001")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	coll := session.DB("mydb").C("mycoll")
-
-	info := &mgo.CollectionInfo{
-		ForceIdIndex: true,
-		Capped:       true,
-		MaxBytes:     1024,
-	}
-	err = coll.Create(info)
-	c.Assert(err, IsNil)
-
-	err = coll.Insert(M{"n": 1})
-	c.Assert(err, IsNil)
-
-	indexes, err := coll.Indexes()
-	c.Assert(indexes, HasLen, 1)
-}
-
-func (s *S) TestIsDupValues(c *C) {
-	c.Assert(mgo.IsDup(nil), Equals, false)
-	c.Assert(mgo.IsDup(&mgo.LastError{Code: 1}), Equals, false)
-	c.Assert(mgo.IsDup(&mgo.QueryError{Code: 1}), Equals, false)
-	c.Assert(mgo.IsDup(&mgo.LastError{Code: 11000}), Equals, true)
-	c.Assert(mgo.IsDup(&mgo.QueryError{Code: 11000}), Equals, true)
-	c.Assert(mgo.IsDup(&mgo.LastError{Code: 11001}), Equals, true)
-	c.Assert(mgo.IsDup(&mgo.QueryError{Code: 11001}), Equals, true)
-	c.Assert(mgo.IsDup(&mgo.LastError{Code: 12582}), Equals, true)
-	c.Assert(mgo.IsDup(&mgo.QueryError{Code: 12582}), Equals, true)
-	lerr := &mgo.LastError{Code: 16460, Err: "error inserting 1 documents to shard ... caused by :: E11000 duplicate key error index: ..."}
-	c.Assert(mgo.IsDup(lerr), Equals, true)
-}
-
-func (s *S) TestIsDupPrimary(c *C) {
-	session, err := mgo.Dial("localhost:40001")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	coll := session.DB("mydb").C("mycoll")
-
-	err = coll.Insert(M{"_id": 1})
-	c.Assert(err, IsNil)
-	err = coll.Insert(M{"_id": 1})
-	c.Assert(err, ErrorMatches, ".*duplicate key error.*")
-	c.Assert(mgo.IsDup(err), Equals, true)
-}
-
-func (s *S) TestIsDupUnique(c *C) {
-	session, err := mgo.Dial("localhost:40001")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	index := mgo.Index{
-		Key:    []string{"a", "b"},
-		Unique: true,
-	}
-
-	coll := session.DB("mydb").C("mycoll")
-
-	err = coll.EnsureIndex(index)
-	c.Assert(err, IsNil)
-
-	err = coll.Insert(M{"a": 1, "b": 1})
-	c.Assert(err, IsNil)
-	err = coll.Insert(M{"a": 1, "b": 1})
-	c.Assert(err, ErrorMatches, ".*duplicate key error.*")
-	c.Assert(mgo.IsDup(err), Equals, true)
-}
-
-func (s *S) TestIsDupCapped(c *C) {
-	session, err := mgo.Dial("localhost:40001")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	coll := session.DB("mydb").C("mycoll")
-
-	info := &mgo.CollectionInfo{
-		ForceIdIndex: true,
-		Capped:       true,
-		MaxBytes:     1024,
-	}
-	err = coll.Create(info)
-	c.Assert(err, IsNil)
-
-	err = coll.Insert(M{"_id": 1})
-	c.Assert(err, IsNil)
-	err = coll.Insert(M{"_id": 1})
-	// The error was different for capped collections before 2.6.
-	c.Assert(err, ErrorMatches, ".*duplicate key.*")
-	// The issue is reduced by using IsDup.
-	c.Assert(mgo.IsDup(err), Equals, true)
-}
-
-func (s *S) TestIsDupFindAndModify(c *C) {
-	session, err := mgo.Dial("localhost:40001")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	coll := session.DB("mydb").C("mycoll")
-
-	err = coll.EnsureIndex(mgo.Index{Key: []string{"n"}, Unique: true})
-	c.Assert(err, IsNil)
-
-	err = coll.Insert(M{"n": 1})
-	c.Assert(err, IsNil)
-	err = coll.Insert(M{"n": 2})
-	c.Assert(err, IsNil)
-	_, err = coll.Find(M{"n": 1}).Apply(mgo.Change{Update: M{"$inc": M{"n": 1}}}, bson.M{})
-	c.Assert(err, ErrorMatches, ".*duplicate key error.*")
-	c.Assert(mgo.IsDup(err), Equals, true)
-}
-
-func (s *S) TestFindAndModify(c *C) {
-	session, err := mgo.Dial("localhost:40011")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	coll := session.DB("mydb").C("mycoll")
-
-	err = coll.Insert(M{"n": 42})
-
-	session.SetMode(mgo.Monotonic, true)
-
-	result := M{}
-	info, err := coll.Find(M{"n": 42}).Apply(mgo.Change{Update: M{"$inc": M{"n": 1}}}, result)
-	c.Assert(err, IsNil)
-	c.Assert(result["n"], Equals, 42)
-	c.Assert(info.Updated, Equals, 1)
-	c.Assert(info.Removed, Equals, 0)
-	c.Assert(info.UpsertedId, IsNil)
-
-	// A nil result parameter should be acceptable.
-	info, err = coll.Find(M{"n": 43}).Apply(mgo.Change{Update: M{"$unset": M{"missing": 1}}}, nil)
-	c.Assert(err, IsNil)
-	c.Assert(info.Updated, Equals, 1)
-	c.Assert(info.Removed, Equals, 0)
-	c.Assert(info.UpsertedId, IsNil)
-
-	result = M{}
-	info, err = coll.Find(M{"n": 43}).Apply(mgo.Change{Update: M{"$inc": M{"n": 1}}, ReturnNew: true}, result)
-	c.Assert(err, IsNil)
-	c.Assert(result["n"], Equals, 44)
-	c.Assert(info.Updated, Equals, 1)
-	c.Assert(info.Removed, Equals, 0)
-	c.Assert(info.UpsertedId, IsNil)
-
-	result = M{}
-	info, err = coll.Find(M{"n": 50}).Apply(mgo.Change{Upsert: true, Update: M{"n": 51, "o": 52}}, result)
-	c.Assert(err, IsNil)
-	c.Assert(result["n"], IsNil)
-	c.Assert(info.Updated, Equals, 0)
-	c.Assert(info.Removed, Equals, 0)
-	c.Assert(info.UpsertedId, NotNil)
-
-	result = M{}
-	info, err = coll.Find(nil).Sort("-n").Apply(mgo.Change{Update: M{"$inc": M{"n": 1}}, ReturnNew: true}, result)
-	c.Assert(err, IsNil)
-	c.Assert(result["n"], Equals, 52)
-	c.Assert(info.Updated, Equals, 1)
-	c.Assert(info.Removed, Equals, 0)
-	c.Assert(info.UpsertedId, IsNil)
-
-	result = M{}
-	info, err = coll.Find(M{"n": 52}).Select(M{"o": 1}).Apply(mgo.Change{Remove: true}, result)
-	c.Assert(err, IsNil)
-	c.Assert(result["n"], IsNil)
-	c.Assert(result["o"], Equals, 52)
-	c.Assert(info.Updated, Equals, 0)
-	c.Assert(info.Removed, Equals, 1)
-	c.Assert(info.UpsertedId, IsNil)
-
-	result = M{}
-	info, err = coll.Find(M{"n": 60}).Apply(mgo.Change{Remove: true}, result)
-	c.Assert(err, Equals, mgo.ErrNotFound)
-	c.Assert(len(result), Equals, 0)
-	c.Assert(info, IsNil)
-}
-
-func (s *S) TestFindAndModifyBug997828(c *C) {
-	session, err := mgo.Dial("localhost:40001")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	coll := session.DB("mydb").C("mycoll")
-
-	err = coll.Insert(M{"n": "not-a-number"})
-
-	result := make(M)
-	_, err = coll.Find(M{"n": "not-a-number"}).Apply(mgo.Change{Update: M{"$inc": M{"n": 1}}}, result)
-	c.Assert(err, ErrorMatches, `(exception: )?Cannot apply \$inc .*`)
-	if s.versionAtLeast(2, 1) {
-		qerr, _ := err.(*mgo.QueryError)
-		c.Assert(qerr, NotNil, Commentf("err: %#v", err))
-		if s.versionAtLeast(2, 6) {
-			// Oh, the dance of error codes. :-(
-			c.Assert(qerr.Code, Equals, 16837)
-		} else {
-			c.Assert(qerr.Code, Equals, 10140)
-		}
-	} else {
-		lerr, _ := err.(*mgo.LastError)
-		c.Assert(lerr, NotNil, Commentf("err: %#v", err))
-		c.Assert(lerr.Code, Equals, 10140)
-	}
-}
-
-func (s *S) TestCountCollection(c *C) {
-	session, err := mgo.Dial("localhost:40001")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	coll := session.DB("mydb").C("mycoll")
-
-	ns := []int{40, 41, 42}
-	for _, n := range ns {
-		err := coll.Insert(M{"n": n})
-		c.Assert(err, IsNil)
-	}
-
-	n, err := coll.Count()
-	c.Assert(err, IsNil)
-	c.Assert(n, Equals, 3)
-}
-
-func (s *S) TestCountQuery(c *C) {
-	session, err := mgo.Dial("localhost:40001")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	coll := session.DB("mydb").C("mycoll")
-
-	ns := []int{40, 41, 42}
-	for _, n := range ns {
-		err := coll.Insert(M{"n": n})
-		c.Assert(err, IsNil)
-	}
-
-	n, err := coll.Find(M{"n": M{"$gt": 40}}).Count()
-	c.Assert(err, IsNil)
-	c.Assert(n, Equals, 2)
-}
-
-func (s *S) TestCountQuerySorted(c *C) {
-	session, err := mgo.Dial("localhost:40001")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	coll := session.DB("mydb").C("mycoll")
-
-	ns := []int{40, 41, 42}
-	for _, n := range ns {
-		err := coll.Insert(M{"n": n})
-		c.Assert(err, IsNil)
-	}
-
-	n, err := coll.Find(M{"n": M{"$gt": 40}}).Sort("n").Count()
-	c.Assert(err, IsNil)
-	c.Assert(n, Equals, 2)
-}
-
-func (s *S) TestCountSkipLimit(c *C) {
-	session, err := mgo.Dial("localhost:40001")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	coll := session.DB("mydb").C("mycoll")
-
-	ns := []int{40, 41, 42, 43, 44}
-	for _, n := range ns {
-		err := coll.Insert(M{"n": n})
-		c.Assert(err, IsNil)
-	}
-
-	n, err := coll.Find(nil).Skip(1).Limit(3).Count()
-	c.Assert(err, IsNil)
-	c.Assert(n, Equals, 3)
-
-	n, err = coll.Find(nil).Skip(1).Limit(5).Count()
-	c.Assert(err, IsNil)
-	c.Assert(n, Equals, 4)
-}
-
-func (s *S) TestQueryExplain(c *C) {
-	session, err := mgo.Dial("localhost:40001")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	coll := session.DB("mydb").C("mycoll")
-
-	ns := []int{40, 41, 42}
-	for _, n := range ns {
-		err := coll.Insert(M{"n": n})
-		c.Assert(err, IsNil)
-	}
-
-	m := M{}
-	query := coll.Find(nil).Limit(2)
-	err = query.Explain(m)
-	c.Assert(err, IsNil)
-	if m["queryPlanner"] != nil {
-		c.Assert(m["executionStats"].(M)["totalDocsExamined"], Equals, 2)
-	} else {
-		c.Assert(m["cursor"], Equals, "BasicCursor")
-		c.Assert(m["nscanned"], Equals, 2)
-		c.Assert(m["n"], Equals, 2)
-	}
-
-	n := 0
-	var result M
-	iter := query.Iter()
-	for iter.Next(&result) {
-		n++
-	}
-	c.Assert(iter.Close(), IsNil)
-	c.Assert(n, Equals, 2)
-}
-
-func (s *S) TestQuerySetMaxScan(c *C) {
-	session, err := mgo.Dial("localhost:40001")
-	c.Assert(err, IsNil)
-	defer session.Close()
-	coll := session.DB("mydb").C("mycoll")
-
-	ns := []int{40, 41, 42}
-	for _, n := range ns {
-		err := coll.Insert(M{"n": n})
-		c.Assert(err, IsNil)
-	}
-
-	query := coll.Find(nil).SetMaxScan(2)
-	var result []M
-	err = query.All(&result)
-	c.Assert(err, IsNil)
-	c.Assert(result, HasLen, 2)
-}
-
-func (s *S) TestQuerySetMaxTime(c *C) {
-	if !s.versionAtLeast(2, 6) {
-		c.Skip("SetMaxTime only supported in 2.6+")
-	}
-
-	session, err := mgo.Dial("localhost:40001")
-	c.Assert(err, IsNil)
-	defer session.Close()
-	coll := session.DB("mydb").C("mycoll")
-
-	for i := 0; i < 1000; i++ {
-		err := coll.Insert(M{"n": i})
-		c.Assert(err, IsNil)
-	}
-
-	query := coll.Find(nil)
-	query.SetMaxTime(1 * time.Millisecond)
-	query.Batch(2)
-	var result []M
-	err = query.All(&result)
-	c.Assert(err, ErrorMatches, "operation exceeded time limit")
-}
-
-func (s *S) TestQueryHint(c *C) {
-	session, err := mgo.Dial("localhost:40001")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	coll := session.DB("mydb").C("mycoll")
-	coll.EnsureIndexKey("a")
-
-	m := M{}
-	err = coll.Find(nil).Hint("a").Explain(m)
-	c.Assert(err, IsNil)
-
-	if m["queryPlanner"] != nil {
-		m = m["queryPlanner"].(M)
-		m = m["winningPlan"].(M)
-		m = m["inputStage"].(M)
-		c.Assert(m["indexName"], Equals, "a_1")
-	} else {
-		c.Assert(m["indexBounds"], NotNil)
-		c.Assert(m["indexBounds"].(M)["a"], NotNil)
-	}
-}
-
-func (s *S) TestQueryComment(c *C) {
-	session, err := mgo.Dial("localhost:40001")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	db := session.DB("mydb")
-	coll := db.C("mycoll")
-
-	err = db.Run(bson.M{"profile": 2}, nil)
-	c.Assert(err, IsNil)
-
-	ns := []int{40, 41, 42}
-	for _, n := range ns {
-		err := coll.Insert(M{"n": n})
-		c.Assert(err, IsNil)
-	}
-
-	query := coll.Find(bson.M{"n": 41})
-	query.Comment("some comment")
-	err = query.One(nil)
-	c.Assert(err, IsNil)
-
-	query = coll.Find(bson.M{"n": 41})
-	query.Comment("another comment")
-	err = query.One(nil)
-	c.Assert(err, IsNil)
-
-	n, err := session.DB("mydb").C("system.profile").Find(bson.M{"query.$query.n": 41, "query.$comment": "some comment"}).Count()
-	c.Assert(err, IsNil)
-	c.Assert(n, Equals, 1)
-}
-
-func (s *S) TestFindOneNotFound(c *C) {
-	session, err := mgo.Dial("localhost:40001")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	coll := session.DB("mydb").C("mycoll")
-
-	result := struct{ A, B int }{}
-	err = coll.Find(M{"a": 1}).One(&result)
-	c.Assert(err, Equals, mgo.ErrNotFound)
-	c.Assert(err, ErrorMatches, "not found")
-	c.Assert(err == mgo.ErrNotFound, Equals, true)
-}
-
-func (s *S) TestFindNil(c *C) {
-	session, err := mgo.Dial("localhost:40001")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	coll := session.DB("mydb").C("mycoll")
-	err = coll.Insert(M{"n": 1})
-	c.Assert(err, IsNil)
-
-	result := struct{ N int }{}
-
-	err = coll.Find(nil).One(&result)
-	c.Assert(err, IsNil)
-	c.Assert(result.N, Equals, 1)
-}
-
-func (s *S) TestFindId(c *C) {
-	session, err := mgo.Dial("localhost:40001")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	coll := session.DB("mydb").C("mycoll")
-	err = coll.Insert(M{"_id": 41, "n": 41})
-	c.Assert(err, IsNil)
-	err = coll.Insert(M{"_id": 42, "n": 42})
-	c.Assert(err, IsNil)
-
-	result := struct{ N int }{}
-
-	err = coll.FindId(42).One(&result)
-	c.Assert(err, IsNil)
-	c.Assert(result.N, Equals, 42)
-}
-
-func (s *S) TestFindIterAll(c *C) {
-	session, err := mgo.Dial("localhost:40001")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	coll := session.DB("mydb").C("mycoll")
-
-	ns := []int{40, 41, 42, 43, 44, 45, 46}
-	for _, n := range ns {
-		coll.Insert(M{"n": n})
-	}
-
-	session.Refresh() // Release socket.
-
-	mgo.ResetStats()
-
-	iter := coll.Find(M{"n": M{"$gte": 42}}).Sort("$natural").Prefetch(0).Batch(2).Iter()
-	result := struct{ N int }{}
-	for i := 2; i < 7; i++ {
-		ok := iter.Next(&result)
-		c.Assert(ok, Equals, true)
-		c.Assert(result.N, Equals, ns[i])
-		if i == 1 {
-			stats := mgo.GetStats()
-			c.Assert(stats.ReceivedDocs, Equals, 2)
-		}
-	}
-
-	ok := iter.Next(&result)
-	c.Assert(ok, Equals, false)
-	c.Assert(iter.Close(), IsNil)
-
-	session.Refresh() // Release socket.
-
-	stats := mgo.GetStats()
-	c.Assert(stats.SentOps, Equals, 3)     // 1*QUERY_OP + 2*GET_MORE_OP
-	c.Assert(stats.ReceivedOps, Equals, 3) // and their REPLY_OPs.
-	c.Assert(stats.ReceivedDocs, Equals, 5)
-	c.Assert(stats.SocketsInUse, Equals, 0)
-}
-
-func (s *S) TestFindIterTwiceWithSameQuery(c *C) {
-	session, err := mgo.Dial("localhost:40001")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	coll := session.DB("mydb").C("mycoll")
-
-	for i := 40; i != 47; i++ {
-		coll.Insert(M{"n": i})
-	}
-
-	query := coll.Find(M{}).Sort("n")
-
-	result1 := query.Skip(1).Iter()
-	result2 := query.Skip(2).Iter()
-
-	result := struct{ N int }{}
-	ok := result2.Next(&result)
-	c.Assert(ok, Equals, true)
-	c.Assert(result.N, Equals, 42)
-	ok = result1.Next(&result)
-	c.Assert(ok, Equals, true)
-	c.Assert(result.N, Equals, 41)
-}
-
-func (s *S) TestFindIterWithoutResults(c *C) {
-	session, err := mgo.Dial("localhost:40001")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	coll := session.DB("mydb").C("mycoll")
-	coll.Insert(M{"n": 42})
-
-	iter := coll.Find(M{"n": 0}).Iter()
-
-	result := struct{ N int }{}
-	ok := iter.Next(&result)
-	c.Assert(ok, Equals, false)
-	c.Assert(iter.Close(), IsNil)
-	c.Assert(result.N, Equals, 0)
-}
-
-func (s *S) TestFindIterLimit(c *C) {
-	session, err := mgo.Dial("localhost:40001")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	coll := session.DB("mydb").C("mycoll")
-
-	ns := []int{40, 41, 42, 43, 44, 45, 46}
-	for _, n := range ns {
-		coll.Insert(M{"n": n})
-	}
-
-	session.Refresh() // Release socket.
-
-	mgo.ResetStats()
-
-	query := coll.Find(M{"n": M{"$gte": 42}}).Sort("$natural").Limit(3)
-	iter := query.Iter()
-
-	result := struct{ N int }{}
-	for i := 2; i < 5; i++ {
-		ok := iter.Next(&result)
-		c.Assert(ok, Equals, true)
-		c.Assert(result.N, Equals, ns[i])
-	}
-
-	ok := iter.Next(&result)
-	c.Assert(ok, Equals, false)
-	c.Assert(iter.Close(), IsNil)
-
-	session.Refresh() // Release socket.
-
-	stats := mgo.GetStats()
-	c.Assert(stats.SentOps, Equals, 2)     // 1*QUERY_OP + 1*KILL_CURSORS_OP
-	c.Assert(stats.ReceivedOps, Equals, 1) // and its REPLY_OP
-	c.Assert(stats.ReceivedDocs, Equals, 3)
-	c.Assert(stats.SocketsInUse, Equals, 0)
-}
-
-var cursorTimeout = flag.Bool("cursor-timeout", false, "Enable cursor timeout test")
-
-func (s *S) TestFindIterCursorTimeout(c *C) {
-	if !*cursorTimeout {
-		c.Skip("-cursor-timeout")
-	}
-	session, err := mgo.Dial("localhost:40001")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	type Doc struct {
-		Id int "_id"
-	}
-
-	coll := session.DB("test").C("test")
-	coll.Remove(nil)
-	for i := 0; i < 100; i++ {
-		err = coll.Insert(Doc{i})
-		c.Assert(err, IsNil)
-	}
-
-	session.SetBatch(1)
-	iter := coll.Find(nil).Iter()
-	var doc Doc
-	if !iter.Next(&doc) {
-		c.Fatalf("iterator failed to return any documents")
-	}
-
-	for i := 10; i > 0; i-- {
-		c.Logf("Sleeping... %d minutes to go...", i)
-		time.Sleep(1*time.Minute + 2*time.Second)
-	}
-
-	// Drain any existing documents that were fetched.
-	if !iter.Next(&doc) {
-		c.Fatalf("iterator with timed out cursor failed to return previously cached document")
-	}
-	if iter.Next(&doc) {
-		c.Fatalf("timed out cursor returned document")
-	}
-
-	c.Assert(iter.Err(), Equals, mgo.ErrCursor)
-}
-
-func (s *S) TestTooManyItemsLimitBug(c *C) {
-	if *fast {
-		c.Skip("-fast")
-	}
-
-	session, err := mgo.Dial("localhost:40001")
-	c.Assert(err, IsNil)
-	defer session.Close()
-	defer runtime.GOMAXPROCS(runtime.GOMAXPROCS(runtime.NumCPU()))
-
-	mgo.SetDebug(false)
-	coll := session.DB("mydb").C("mycoll")
-	words := strings.Split("foo bar baz", " ")
-	for i := 0; i < 5; i++ {
-		words = append(words, words...)
-	}
-	doc := bson.D{{"words", words}}
-	inserts := 10000
-	limit := 5000
-	iters := 0
-	c.Assert(inserts > limit, Equals, true)
-	for i := 0; i < inserts; i++ {
-		err := coll.Insert(&doc)
-		c.Assert(err, IsNil)
-	}
-	iter := coll.Find(nil).Limit(limit).Iter()
-	for iter.Next(&doc) {
-		if iters%100 == 0 {
-			c.Logf("Seen %d docments", iters)
-		}
-		iters++
-	}
-	c.Assert(iter.Close(), IsNil)
-	c.Assert(iters, Equals, limit)
-}
-
-func serverCursorsOpen(session *mgo.Session) int {
-	var result struct {
-		Cursors struct {
-			TotalOpen int `bson:"totalOpen"`
-			TimedOut  int `bson:"timedOut"`
-		}
-	}
-	err := session.Run("serverStatus", &result)
-	if err != nil {
-		panic(err)
-	}
-	return result.Cursors.TotalOpen
-}
-
-func (s *S) TestFindIterLimitWithMore(c *C) {
-	session, err := mgo.Dial("localhost:40001")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	coll := session.DB("mydb").C("mycoll")
-
-	// Insane amounts of logging otherwise due to the
-	// amount of data being shuffled.
-	mgo.SetDebug(false)
-	defer mgo.SetDebug(true)
-
-	// Should amount to more than 4MB bson payload,
-	// the default limit per result chunk.
-	const total = 4096
-	var d struct{ A [1024]byte }
-	docs := make([]interface{}, total)
-	for i := 0; i < total; i++ {
-		docs[i] = &d
-	}
-	err = coll.Insert(docs...)
-	c.Assert(err, IsNil)
-
-	n, err := coll.Count()
-	c.Assert(err, IsNil)
-	c.Assert(n, Equals, total)
-
-	// First, try restricting to a single chunk with a negative limit.
-	nresults := 0
-	iter := coll.Find(nil).Limit(-total).Iter()
-	var discard struct{}
-	for iter.Next(&discard) {
-		nresults++
-	}
-	if nresults < total/2 || nresults >= total {
-		c.Fatalf("Bad result size with negative limit: %d", nresults)
-	}
-
-	cursorsOpen := serverCursorsOpen(session)
-
-	// Try again, with a positive limit. Should reach the end now,
-	// using multiple chunks.
-	nresults = 0
-	iter = coll.Find(nil).Limit(total).Iter()
-	for iter.Next(&discard) {
-		nresults++
-	}
-	c.Assert(nresults, Equals, total)
-
-	// Ensure the cursor used is properly killed.
-	c.Assert(serverCursorsOpen(session), Equals, cursorsOpen)
-
-	// Edge case, -MinInt == -MinInt.
-	nresults = 0
-	iter = coll.Find(nil).Limit(math.MinInt32).Iter()
-	for iter.Next(&discard) {
-		nresults++
-	}
-	if nresults < total/2 || nresults >= total {
-		c.Fatalf("Bad result size with MinInt32 limit: %d", nresults)
-	}
-}
-
-func (s *S) TestFindIterLimitWithBatch(c *C) {
-	session, err := mgo.Dial("localhost:40001")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	coll := session.DB("mydb").C("mycoll")
-
-	ns := []int{40, 41, 42, 43, 44, 45, 46}
-	for _, n := range ns {
-		coll.Insert(M{"n": n})
-	}
-
-	// Ping the database to ensure the nonce has been received already.
-	c.Assert(session.Ping(), IsNil)
-
-	session.Refresh() // Release socket.
-
-	mgo.ResetStats()
-
-	query := coll.Find(M{"n": M{"$gte": 42}}).Sort("$natural").Limit(3).Batch(2)
-	iter := query.Iter()
-	result := struct{ N int }{}
-	for i := 2; i < 5; i++ {
-		ok := iter.Next(&result)
-		c.Assert(ok, Equals, true)
-		c.Assert(result.N, Equals, ns[i])
-		if i == 3 {
-			stats := mgo.GetStats()
-			c.Assert(stats.ReceivedDocs, Equals, 2)
-		}
-	}
-
-	ok := iter.Next(&result)
-	c.Assert(ok, Equals, false)
-	c.Assert(iter.Close(), IsNil)
-
-	session.Refresh() // Release socket.
-
-	stats := mgo.GetStats()
-	c.Assert(stats.SentOps, Equals, 3)     // 1*QUERY_OP + 1*GET_MORE_OP + 1*KILL_CURSORS_OP
-	c.Assert(stats.ReceivedOps, Equals, 2) // and its REPLY_OPs
-	c.Assert(stats.ReceivedDocs, Equals, 3)
-	c.Assert(stats.SocketsInUse, Equals, 0)
-}
-
-func (s *S) TestFindIterSortWithBatch(c *C) {
-	session, err := mgo.Dial("localhost:40001")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	coll := session.DB("mydb").C("mycoll")
-
-	ns := []int{40, 41, 42, 43, 44, 45, 46}
-	for _, n := range ns {
-		coll.Insert(M{"n": n})
-	}
-
-	// Without this, the logic above breaks because Mongo refuses to
-	// return a cursor with an in-memory sort.
-	coll.EnsureIndexKey("n")
-
-	// Ping the database to ensure the nonce has been received already.
-	c.Assert(session.Ping(), IsNil)
-
-	session.Refresh() // Release socket.
-
-	mgo.ResetStats()
-
-	query := coll.Find(M{"n": M{"$lte": 44}}).Sort("-n").Batch(2)
-	iter := query.Iter()
-	ns = []int{46, 45, 44, 43, 42, 41, 40}
-	result := struct{ N int }{}
-	for i := 2; i < len(ns); i++ {
-		c.Logf("i=%d", i)
-		ok := iter.Next(&result)
-		c.Assert(ok, Equals, true)
-		c.Assert(result.N, Equals, ns[i])
-		if i == 3 {
-			stats := mgo.GetStats()
-			c.Assert(stats.ReceivedDocs, Equals, 2)
-		}
-	}
-
-	ok := iter.Next(&result)
-	c.Assert(ok, Equals, false)
-	c.Assert(iter.Close(), IsNil)
-
-	session.Refresh() // Release socket.
-
-	stats := mgo.GetStats()
-	c.Assert(stats.SentOps, Equals, 3)     // 1*QUERY_OP + 2*GET_MORE_OP
-	c.Assert(stats.ReceivedOps, Equals, 3) // and its REPLY_OPs
-	c.Assert(stats.ReceivedDocs, Equals, 5)
-	c.Assert(stats.SocketsInUse, Equals, 0)
-}
-
-// Test tailable cursors in a situation where Next has to sleep to
-// respect the timeout requested on Tail.
-func (s *S) TestFindTailTimeoutWithSleep(c *C) {
-	if *fast {
-		c.Skip("-fast")
-	}
-
-	session, err := mgo.Dial("localhost:40001")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	cresult := struct{ ErrMsg string }{}
-
-	db := session.DB("mydb")
-	err = db.Run(bson.D{{"create", "mycoll"}, {"capped", true}, {"size", 1024}}, &cresult)
-	c.Assert(err, IsNil)
-	c.Assert(cresult.ErrMsg, Equals, "")
-	coll := db.C("mycoll")
-
-	ns := []int{40, 41, 42, 43, 44, 45, 46}
-	for _, n := range ns {
-		coll.Insert(M{"n": n})
-	}
-
-	session.Refresh() // Release socket.
-
-	mgo.ResetStats()
-
-	timeout := 3 * time.Second
-
-	query := coll.Find(M{"n": M{"$gte": 42}}).Sort("$natural").Prefetch(0).Batch(2)
-	iter := query.Tail(timeout)
-
-	n := len(ns)
-	result := struct{ N int }{}
-	for i := 2; i != n; i++ {
-		ok := iter.Next(&result)
-		c.Assert(ok, Equals, true)
-		c.Assert(iter.Err(), IsNil)
-		c.Assert(iter.Timeout(), Equals, false)
-		c.Assert(result.N, Equals, ns[i])
-		if i == 3 { // The batch boundary.
-			stats := mgo.GetStats()
-			c.Assert(stats.ReceivedDocs, Equals, 2)
-		}
-	}
-
-	mgo.ResetStats()
-
-	// The following call to Next will block.
-	go func() {
-		// The internal AwaitData timing of MongoDB is around 2 seconds,
-		// so this should force mgo to sleep at least once by itself to
-		// respect the requested timeout.
-		time.Sleep(timeout + 5e8*time.Nanosecond)
-		session := session.New()
-		defer session.Close()
-		coll := session.DB("mydb").C("mycoll")
-		coll.Insert(M{"n": 47})
-	}()
-
-	c.Log("Will wait for Next with N=47...")
-	ok := iter.Next(&result)
-	c.Assert(ok, Equals, true)
-	c.Assert(iter.Err(), IsNil)
-	c.Assert(iter.Timeout(), Equals, false)
-	c.Assert(result.N, Equals, 47)
-	c.Log("Got Next with N=47!")
-
-	// The following may break because it depends a bit on the internal
-	// timing used by MongoDB's AwaitData logic.  If it does, the problem
-	// will be observed as more GET_MORE_OPs than predicted:
-	// 1*QUERY for nonce + 1*GET_MORE_OP on Next + 1*GET_MORE_OP on Next after sleep +
-	// 1*INSERT_OP + 1*QUERY_OP for getLastError on insert of 47
-	stats := mgo.GetStats()
-	if s.versionAtLeast(3, 0) { // TODO Will be 2.6 when write commands are enabled for it.
-		c.Assert(stats.SentOps, Equals, 4)
-	} else {
-		c.Assert(stats.SentOps, Equals, 5)
-	}
-	c.Assert(stats.ReceivedOps, Equals, 4)  // REPLY_OPs for 1*QUERY_OP for nonce + 2*GET_MORE_OPs + 1*QUERY_OP
-	c.Assert(stats.ReceivedDocs, Equals, 3) // nonce + N=47 result + getLastError response
-
-	c.Log("Will wait for a result which will never come...")
-
-	started := time.Now()
-	ok = iter.Next(&result)
-	c.Assert(ok, Equals, false)
-	c.Assert(iter.Err(), IsNil)
-	c.Assert(iter.Timeout(), Equals, true)
-	c.Assert(started.Before(time.Now().Add(-timeout)), Equals, true)
-
-	c.Log("Will now reuse the timed out tail cursor...")
-
-	coll.Insert(M{"n": 48})
-	ok = iter.Next(&result)
-	c.Assert(ok, Equals, true)
-	c.Assert(iter.Close(), IsNil)
-	c.Assert(iter.Timeout(), Equals, false)
-	c.Assert(result.N, Equals, 48)
-}
-
-// Test tailable cursors in a situation where Next never gets to sleep once
-// to respect the timeout requested on Tail.
-func (s *S) TestFindTailTimeoutNoSleep(c *C) {
-	session, err := mgo.Dial("localhost:40001")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	cresult := struct{ ErrMsg string }{}
-
-	db := session.DB("mydb")
-	err = db.Run(bson.D{{"create", "mycoll"}, {"capped", true}, {"size", 1024}}, &cresult)
-	c.Assert(err, IsNil)
-	c.Assert(cresult.ErrMsg, Equals, "")
-	coll := db.C("mycoll")
-
-	ns := []int{40, 41, 42, 43, 44, 45, 46}
-	for _, n := range ns {
-		coll.Insert(M{"n": n})
-	}
-
-	session.Refresh() // Release socket.
-
-	mgo.ResetStats()
-
-	timeout := 1 * time.Second
-
-	query := coll.Find(M{"n": M{"$gte": 42}}).Sort("$natural").Prefetch(0).Batch(2)
-	iter := query.Tail(timeout)
-
-	n := len(ns)
-	result := struct{ N int }{}
-	for i := 2; i != n; i++ {
-		ok := iter.Next(&result)
-		c.Assert(ok, Equals, true)
-		c.Assert(iter.Err(), IsNil)
-		c.Assert(iter.Timeout(), Equals, false)
-		c.Assert(result.N, Equals, ns[i])
-		if i == 3 { // The batch boundary.
-			stats := mgo.GetStats()
-			c.Assert(stats.ReceivedDocs, Equals, 2)
-		}
-	}
-
-	mgo.ResetStats()
-
-	// The following call to Next will block.
-	go func() {
-		// The internal AwaitData timing of MongoDB is around 2 seconds,
-		// so this item should arrive within the AwaitData threshold.
-		time.Sleep(5e8)
-		session := session.New()
-		defer session.Close()
-		coll := session.DB("mydb").C("mycoll")
-		coll.Insert(M{"n": 47})
-	}()
-
-	c.Log("Will wait for Next with N=47...")
-	ok := iter.Next(&result)
-	c.Assert(ok, Equals, true)
-	c.Assert(iter.Err(), IsNil)
-	c.Assert(iter.Timeout(), Equals, false)
-	c.Assert(result.N, Equals, 47)
-	c.Log("Got Next with N=47!")
-
-	// The following may break because it depends a bit on the internal
-	// timing used by MongoDB's AwaitData logic.  If it does, the problem
-	// will be observed as more GET_MORE_OPs than predicted:
-	// 1*QUERY_OP for nonce + 1*GET_MORE_OP on Next +
-	// 1*INSERT_OP + 1*QUERY_OP for getLastError on insert of 47
-	stats := mgo.GetStats()
-	if s.versionAtLeast(3, 0) { // TODO Will be 2.6 when write commands are enabled for it.
-		c.Assert(stats.SentOps, Equals, 3)
-	} else {
-		c.Assert(stats.SentOps, Equals, 4)
-	}
-	c.Assert(stats.ReceivedOps, Equals, 3)  // REPLY_OPs for 1*QUERY_OP for nonce + 1*GET_MORE_OPs and 1*QUERY_OP
-	c.Assert(stats.ReceivedDocs, Equals, 3) // nonce + N=47 result + getLastError response
-
-	c.Log("Will wait for a result which will never come...")
-
-	started := time.Now()
-	ok = iter.Next(&result)
-	c.Assert(ok, Equals, false)
-	c.Assert(iter.Err(), IsNil)
-	c.Assert(iter.Timeout(), Equals, true)
-	c.Assert(started.Before(time.Now().Add(-timeout)), Equals, true)
-
-	c.Log("Will now reuse the timed out tail cursor...")
-
-	coll.Insert(M{"n": 48})
-	ok = iter.Next(&result)
-	c.Assert(ok, Equals, true)
-	c.Assert(iter.Close(), IsNil)
-	c.Assert(iter.Timeout(), Equals, false)
-	c.Assert(result.N, Equals, 48)
-}
-
-// Test tailable cursors in a situation where Next never gets to sleep once
-// to respect the timeout requested on Tail.
-func (s *S) TestFindTailNoTimeout(c *C) {
-	if *fast {
-		c.Skip("-fast")
-	}
-
-	session, err := mgo.Dial("localhost:40001")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	cresult := struct{ ErrMsg string }{}
-
-	db := session.DB("mydb")
-	err = db.Run(bson.D{{"create", "mycoll"}, {"capped", true}, {"size", 1024}}, &cresult)
-	c.Assert(err, IsNil)
-	c.Assert(cresult.ErrMsg, Equals, "")
-	coll := db.C("mycoll")
-
-	ns := []int{40, 41, 42, 43, 44, 45, 46}
-	for _, n := range ns {
-		coll.Insert(M{"n": n})
-	}
-
-	session.Refresh() // Release socket.
-
-	mgo.ResetStats()
-
-	query := coll.Find(M{"n": M{"$gte": 42}}).Sort("$natural").Prefetch(0).Batch(2)
-	iter := query.Tail(-1)
-	c.Assert(err, IsNil)
-
-	n := len(ns)
-	result := struct{ N int }{}
-	for i := 2; i != n; i++ {
-		ok := iter.Next(&result)
-		c.Assert(ok, Equals, true)
-		c.Assert(result.N, Equals, ns[i])
-		if i == 3 { // The batch boundary.
-			stats := mgo.GetStats()
-			c.Assert(stats.ReceivedDocs, Equals, 2)
-		}
-	}
-
-	mgo.ResetStats()
-
-	// The following call to Next will block.
-	go func() {
-		time.Sleep(5e8)
-		session := session.New()
-		defer session.Close()
-		coll := session.DB("mydb").C("mycoll")
-		coll.Insert(M{"n": 47})
-	}()
-
-	c.Log("Will wait for Next with N=47...")
-	ok := iter.Next(&result)
-	c.Assert(ok, Equals, true)
-	c.Assert(iter.Err(), IsNil)
-	c.Assert(iter.Timeout(), Equals, false)
-	c.Assert(result.N, Equals, 47)
-	c.Log("Got Next with N=47!")
-
-	// The following may break because it depends a bit on the internal
-	// timing used by MongoDB's AwaitData logic.  If it does, the problem
-	// will be observed as more GET_MORE_OPs than predicted:
-	// 1*QUERY_OP for nonce + 1*GET_MORE_OP on Next +
-	// 1*INSERT_OP + 1*QUERY_OP for getLastError on insert of 47
-	stats := mgo.GetStats()
-	if s.versionAtLeast(3, 0) { // TODO Will be 2.6 when write commands are enabled for it.
-		c.Assert(stats.SentOps, Equals, 3)
-	} else {
-		c.Assert(stats.SentOps, Equals, 4)
-	}
-	c.Assert(stats.ReceivedOps, Equals, 3)  // REPLY_OPs for 1*QUERY_OP for nonce + 1*GET_MORE_OPs and 1*QUERY_OP
-	c.Assert(stats.ReceivedDocs, Equals, 3) // nonce + N=47 result + getLastError response
-
-	c.Log("Will wait for a result which will never come...")
-
-	gotNext := make(chan bool)
-	go func() {
-		ok := iter.Next(&result)
-		gotNext <- ok
-	}()
-
-	select {
-	case ok := <-gotNext:
-		c.Fatalf("Next returned: %v", ok)
-	case <-time.After(3e9):
-		// Good. Should still be sleeping at that point.
-	}
-
-	// Closing the session should cause Next to return.
-	session.Close()
-
-	select {
-	case ok := <-gotNext:
-		c.Assert(ok, Equals, false)
-		c.Assert(iter.Err(), ErrorMatches, "Closed explicitly")
-		c.Assert(iter.Timeout(), Equals, false)
-	case <-time.After(1e9):
-		c.Fatal("Closing the session did not unblock Next")
-	}
-}
-
-func (s *S) TestIterNextResetsResult(c *C) {
-	session, err := mgo.Dial("localhost:40001")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	coll := session.DB("mydb").C("mycoll")
-
-	ns := []int{1, 2, 3}
-	for _, n := range ns {
-		coll.Insert(M{"n" + strconv.Itoa(n): n})
-	}
-
-	query := coll.Find(nil).Sort("$natural")
-
-	i := 0
-	var sresult *struct{ N1, N2, N3 int }
-	iter := query.Iter()
-	for iter.Next(&sresult) {
-		switch i {
-		case 0:
-			c.Assert(sresult.N1, Equals, 1)
-			c.Assert(sresult.N2+sresult.N3, Equals, 0)
-		case 1:
-			c.Assert(sresult.N2, Equals, 2)
-			c.Assert(sresult.N1+sresult.N3, Equals, 0)
-		case 2:
-			c.Assert(sresult.N3, Equals, 3)
-			c.Assert(sresult.N1+sresult.N2, Equals, 0)
-		}
-		i++
-	}
-	c.Assert(iter.Close(), IsNil)
-
-	i = 0
-	var mresult M
-	iter = query.Iter()
-	for iter.Next(&mresult) {
-		delete(mresult, "_id")
-		switch i {
-		case 0:
-			c.Assert(mresult, DeepEquals, M{"n1": 1})
-		case 1:
-			c.Assert(mresult, DeepEquals, M{"n2": 2})
-		case 2:
-			c.Assert(mresult, DeepEquals, M{"n3": 3})
-		}
-		i++
-	}
-	c.Assert(iter.Close(), IsNil)
-
-	i = 0
-	var iresult interface{}
-	iter = query.Iter()
-	for iter.Next(&iresult) {
-		mresult, ok := iresult.(bson.M)
-		c.Assert(ok, Equals, true, Commentf("%#v", iresult))
-		delete(mresult, "_id")
-		switch i {
-		case 0:
-			c.Assert(mresult, DeepEquals, bson.M{"n1": 1})
-		case 1:
-			c.Assert(mresult, DeepEquals, bson.M{"n2": 2})
-		case 2:
-			c.Assert(mresult, DeepEquals, bson.M{"n3": 3})
-		}
-		i++
-	}
-	c.Assert(iter.Close(), IsNil)
-}
-
-func (s *S) TestFindForOnIter(c *C) {
-	session, err := mgo.Dial("localhost:40001")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	coll := session.DB("mydb").C("mycoll")
-
-	ns := []int{40, 41, 42, 43, 44, 45, 46}
-	for _, n := range ns {
-		coll.Insert(M{"n": n})
-	}
-
-	session.Refresh() // Release socket.
-
-	mgo.ResetStats()
-
-	query := coll.Find(M{"n": M{"$gte": 42}}).Sort("$natural").Prefetch(0).Batch(2)
-	iter := query.Iter()
-
-	i := 2
-	var result *struct{ N int }
-	err = iter.For(&result, func() error {
-		c.Assert(i < 7, Equals, true)
-		c.Assert(result.N, Equals, ns[i])
-		if i == 1 {
-			stats := mgo.GetStats()
-			c.Assert(stats.ReceivedDocs, Equals, 2)
-		}
-		i++
-		return nil
-	})
-	c.Assert(err, IsNil)
-
-	session.Refresh() // Release socket.
-
-	stats := mgo.GetStats()
-	c.Assert(stats.SentOps, Equals, 3)     // 1*QUERY_OP + 2*GET_MORE_OP
-	c.Assert(stats.ReceivedOps, Equals, 3) // and their REPLY_OPs.
-	c.Assert(stats.ReceivedDocs, Equals, 5)
-	c.Assert(stats.SocketsInUse, Equals, 0)
-}
-
-func (s *S) TestFindFor(c *C) {
-	session, err := mgo.Dial("localhost:40001")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	coll := session.DB("mydb").C("mycoll")
-
-	ns := []int{40, 41, 42, 43, 44, 45, 46}
-	for _, n := range ns {
-		coll.Insert(M{"n": n})
-	}
-
-	session.Refresh() // Release socket.
-
-	mgo.ResetStats()
-
-	query := coll.Find(M{"n": M{"$gte": 42}}).Sort("$natural").Prefetch(0).Batch(2)
-
-	i := 2
-	var result *struct{ N int }
-	err = query.For(&result, func() error {
-		c.Assert(i < 7, Equals, true)
-		c.Assert(result.N, Equals, ns[i])
-		if i == 1 {
-			stats := mgo.GetStats()
-			c.Assert(stats.ReceivedDocs, Equals, 2)
-		}
-		i++
-		return nil
-	})
-	c.Assert(err, IsNil)
-
-	session.Refresh() // Release socket.
-
-	stats := mgo.GetStats()
-	c.Assert(stats.SentOps, Equals, 3)     // 1*QUERY_OP + 2*GET_MORE_OP
-	c.Assert(stats.ReceivedOps, Equals, 3) // and their REPLY_OPs.
-	c.Assert(stats.ReceivedDocs, Equals, 5)
-	c.Assert(stats.SocketsInUse, Equals, 0)
-}
-
-func (s *S) TestFindForStopOnError(c *C) {
-	session, err := mgo.Dial("localhost:40001")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	coll := session.DB("mydb").C("mycoll")
-
-	ns := []int{40, 41, 42, 43, 44, 45, 46}
-	for _, n := range ns {
-		coll.Insert(M{"n": n})
-	}
-
-	query := coll.Find(M{"n": M{"$gte": 42}})
-	i := 2
-	var result *struct{ N int }
-	err = query.For(&result, func() error {
-		c.Assert(i < 4, Equals, true)
-		c.Assert(result.N, Equals, ns[i])
-		if i == 3 {
-			return fmt.Errorf("stop!")
-		}
-		i++
-		return nil
-	})
-	c.Assert(err, ErrorMatches, "stop!")
-}
-
-func (s *S) TestFindForResetsResult(c *C) {
-	session, err := mgo.Dial("localhost:40001")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	coll := session.DB("mydb").C("mycoll")
-
-	ns := []int{1, 2, 3}
-	for _, n := range ns {
-		coll.Insert(M{"n" + strconv.Itoa(n): n})
-	}
-
-	query := coll.Find(nil).Sort("$natural")
-
-	i := 0
-	var sresult *struct{ N1, N2, N3 int }
-	err = query.For(&sresult, func() error {
-		switch i {
-		case 0:
-			c.Assert(sresult.N1, Equals, 1)
-			c.Assert(sresult.N2+sresult.N3, Equals, 0)
-		case 1:
-			c.Assert(sresult.N2, Equals, 2)
-			c.Assert(sresult.N1+sresult.N3, Equals, 0)
-		case 2:
-			c.Assert(sresult.N3, Equals, 3)
-			c.Assert(sresult.N1+sresult.N2, Equals, 0)
-		}
-		i++
-		return nil
-	})
-	c.Assert(err, IsNil)
-
-	i = 0
-	var mresult M
-	err = query.For(&mresult, func() error {
-		delete(mresult, "_id")
-		switch i {
-		case 0:
-			c.Assert(mresult, DeepEquals, M{"n1": 1})
-		case 1:
-			c.Assert(mresult, DeepEquals, M{"n2": 2})
-		case 2:
-			c.Assert(mresult, DeepEquals, M{"n3": 3})
-		}
-		i++
-		return nil
-	})
-	c.Assert(err, IsNil)
-
-	i = 0
-	var iresult interface{}
-	err = query.For(&iresult, func() error {
-		mresult, ok := iresult.(bson.M)
-		c.Assert(ok, Equals, true, Commentf("%#v", iresult))
-		delete(mresult, "_id")
-		switch i {
-		case 0:
-			c.Assert(mresult, DeepEquals, bson.M{"n1": 1})
-		case 1:
-			c.Assert(mresult, DeepEquals, bson.M{"n2": 2})
-		case 2:
-			c.Assert(mresult, DeepEquals, bson.M{"n3": 3})
-		}
-		i++
-		return nil
-	})
-	c.Assert(err, IsNil)
-}
-
-func (s *S) TestFindIterSnapshot(c *C) {
-	session, err := mgo.Dial("localhost:40001")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	// Insane amounts of logging otherwise due to the
-	// amount of data being shuffled.
-	mgo.SetDebug(false)
-	defer mgo.SetDebug(true)
-
-	coll := session.DB("mydb").C("mycoll")
-
-	var a [1024000]byte
-
-	for n := 0; n < 10; n++ {
-		err := coll.Insert(M{"_id": n, "n": n, "a1": &a})
-		c.Assert(err, IsNil)
-	}
-
-	query := coll.Find(M{"n": M{"$gt": -1}}).Batch(2).Prefetch(0)
-	query.Snapshot()
-	iter := query.Iter()
-
-	seen := map[int]bool{}
-	result := struct {
-		Id int "_id"
-	}{}
-	for iter.Next(&result) {
-		if len(seen) == 2 {
-			// Grow all entries so that they have to move.
-			// Backwards so that the order is inverted.
-			for n := 10; n >= 0; n-- {
-				_, err := coll.Upsert(M{"_id": n}, M{"$set": M{"a2": &a}})
-				c.Assert(err, IsNil)
-			}
-		}
-		if seen[result.Id] {
-			c.Fatalf("seen duplicated key: %d", result.Id)
-		}
-		seen[result.Id] = true
-	}
-	c.Assert(iter.Close(), IsNil)
-}
-
-func (s *S) TestSort(c *C) {
-	session, err := mgo.Dial("localhost:40001")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	coll := session.DB("mydb").C("mycoll")
-
-	coll.Insert(M{"a": 1, "b": 1})
-	coll.Insert(M{"a": 2, "b": 2})
-	coll.Insert(M{"a": 2, "b": 1})
-	coll.Insert(M{"a": 0, "b": 1})
-	coll.Insert(M{"a": 2, "b": 0})
-	coll.Insert(M{"a": 0, "b": 2})
-	coll.Insert(M{"a": 1, "b": 2})
-	coll.Insert(M{"a": 0, "b": 0})
-	coll.Insert(M{"a": 1, "b": 0})
-
-	query := coll.Find(M{})
-	query.Sort("-a") // Should be ignored.
-	query.Sort("-b", "a")
-	iter := query.Iter()
-
-	l := make([]int, 18)
-	r := struct{ A, B int }{}
-	for i := 0; i != len(l); i += 2 {
-		ok := iter.Next(&r)
-		c.Assert(ok, Equals, true)
-		c.Assert(err, IsNil)
-		l[i] = r.A
-		l[i+1] = r.B
-	}
-
-	c.Assert(l, DeepEquals, []int{0, 2, 1, 2, 2, 2, 0, 1, 1, 1, 2, 1, 0, 0, 1, 0, 2, 0})
-}
-
-func (s *S) TestSortWithBadArgs(c *C) {
-	session, err := mgo.Dial("localhost:40001")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	coll := session.DB("mydb").C("mycoll")
-
-	f1 := func() { coll.Find(nil).Sort("") }
-	f2 := func() { coll.Find(nil).Sort("+") }
-	f3 := func() { coll.Find(nil).Sort("foo", "-") }
-
-	for _, f := range []func(){f1, f2, f3} {
-		c.Assert(f, PanicMatches, "Sort: empty field name")
-	}
-}
-
-func (s *S) TestSortScoreText(c *C) {
-	session, err := mgo.Dial("localhost:40001")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	coll := session.DB("mydb").C("mycoll")
-
-	err = coll.EnsureIndex(mgo.Index{
-		Key: []string{"$text:a", "$text:b"},
-	})
-	c.Assert(err, IsNil)
-
-	err = coll.Insert(M{
-		"a": "none",
-		"b": "twice: foo foo",
-	})
-	c.Assert(err, IsNil)
-	err = coll.Insert(M{
-		"a": "just once: foo",
-		"b": "none",
-	})
-	c.Assert(err, IsNil)
-	err = coll.Insert(M{
-		"a": "many: foo foo foo",
-		"b": "none",
-	})
-	c.Assert(err, IsNil)
-	err = coll.Insert(M{
-		"a": "none",
-		"b": "none",
-		"c": "ignore: foo",
-	})
-	c.Assert(err, IsNil)
-
-	query := coll.Find(M{"$text": M{"$search": "foo"}})
-	query.Select(M{"score": M{"$meta": "textScore"}})
-	query.Sort("$textScore:score")
-	iter := query.Iter()
-
-	var r struct{ A, B string }
-	var results []string
-	for iter.Next(&r) {
-		results = append(results, r.A, r.B)
-	}
-
-	c.Assert(results, DeepEquals, []string{
-		"many: foo foo foo", "none",
-		"none", "twice: foo foo",
-		"just once: foo", "none",
-	})
-}
-
-func (s *S) TestPrefetching(c *C) {
-	session, err := mgo.Dial("localhost:40001")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	coll := session.DB("mydb").C("mycoll")
-
-	const total = 600
-	mgo.SetDebug(false)
-	docs := make([]interface{}, total)
-	for i := 0; i != total; i++ {
-		docs[i] = bson.D{{"n", i}}
-	}
-	err = coll.Insert(docs...)
-	c.Assert(err, IsNil)
-
-	for testi := 0; testi < 5; testi++ {
-		mgo.ResetStats()
-
-		var iter *mgo.Iter
-		var beforeMore int
-
-		switch testi {
-		case 0: // The default session value.
-			session.SetBatch(100)
-			iter = coll.Find(M{}).Iter()
-			beforeMore = 75
-
-		case 2: // Changing the session value.
-			session.SetBatch(100)
-			session.SetPrefetch(0.27)
-			iter = coll.Find(M{}).Iter()
-			beforeMore = 73
-
-		case 1: // Changing via query methods.
-			iter = coll.Find(M{}).Prefetch(0.27).Batch(100).Iter()
-			beforeMore = 73
-
-		case 3: // With prefetch on first document.
-			iter = coll.Find(M{}).Prefetch(1.0).Batch(100).Iter()
-			beforeMore = 0
-
-		case 4: // Without prefetch.
-			iter = coll.Find(M{}).Prefetch(0).Batch(100).Iter()
-			beforeMore = 100
-		}
-
-		pings := 0
-		for batchi := 0; batchi < len(docs)/100-1; batchi++ {
-			c.Logf("Iterating over %d documents on batch %d", beforeMore, batchi)
-			var result struct{ N int }
-			for i := 0; i < beforeMore; i++ {
-				ok := iter.Next(&result)
-				c.Assert(ok, Equals, true, Commentf("iter.Err: %v", iter.Err()))
-			}
-			beforeMore = 99
-			c.Logf("Done iterating.")
-
-			session.Run("ping", nil) // Roundtrip to settle down.
-			pings++
-
-			stats := mgo.GetStats()
-			c.Assert(stats.ReceivedDocs, Equals, (batchi+1)*100+pings)
-
-			c.Logf("Iterating over one more document on batch %d", batchi)
-			ok := iter.Next(&result)
-			c.Assert(ok, Equals, true, Commentf("iter.Err: %v", iter.Err()))
-			c.Logf("Done iterating.")
-
-			session.Run("ping", nil) // Roundtrip to settle down.
-			pings++
-
-			stats = mgo.GetStats()
-			c.Assert(stats.ReceivedDocs, Equals, (batchi+2)*100+pings)
-		}
-	}
-}
-
-func (s *S) TestSafeSetting(c *C) {
-	session, err := mgo.Dial("localhost:40001")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	// Check the default
-	safe := session.Safe()
-	c.Assert(safe.W, Equals, 0)
-	c.Assert(safe.WMode, Equals, "")
-	c.Assert(safe.WTimeout, Equals, 0)
-	c.Assert(safe.FSync, Equals, false)
-	c.Assert(safe.J, Equals, false)
-
-	// Tweak it
-	session.SetSafe(&mgo.Safe{W: 1, WTimeout: 2, FSync: true})
-	safe = session.Safe()
-	c.Assert(safe.W, Equals, 1)
-	c.Assert(safe.WMode, Equals, "")
-	c.Assert(safe.WTimeout, Equals, 2)
-	c.Assert(safe.FSync, Equals, true)
-	c.Assert(safe.J, Equals, false)
-
-	// Reset it again.
-	session.SetSafe(&mgo.Safe{})
-	safe = session.Safe()
-	c.Assert(safe.W, Equals, 0)
-	c.Assert(safe.WMode, Equals, "")
-	c.Assert(safe.WTimeout, Equals, 0)
-	c.Assert(safe.FSync, Equals, false)
-	c.Assert(safe.J, Equals, false)
-
-	// Ensure safety to something more conservative.
-	session.SetSafe(&mgo.Safe{W: 5, WTimeout: 6, J: true})
-	safe = session.Safe()
-	c.Assert(safe.W, Equals, 5)
-	c.Assert(safe.WMode, Equals, "")
-	c.Assert(safe.WTimeout, Equals, 6)
-	c.Assert(safe.FSync, Equals, false)
-	c.Assert(safe.J, Equals, true)
-
-	// Ensure safety to something less conservative won't change it.
-	session.EnsureSafe(&mgo.Safe{W: 4, WTimeout: 7})
-	safe = session.Safe()
-	c.Assert(safe.W, Equals, 5)
-	c.Assert(safe.WMode, Equals, "")
-	c.Assert(safe.WTimeout, Equals, 6)
-	c.Assert(safe.FSync, Equals, false)
-	c.Assert(safe.J, Equals, true)
-
-	// But to something more conservative will.
-	session.EnsureSafe(&mgo.Safe{W: 6, WTimeout: 4, FSync: true})
-	safe = session.Safe()
-	c.Assert(safe.W, Equals, 6)
-	c.Assert(safe.WMode, Equals, "")
-	c.Assert(safe.WTimeout, Equals, 4)
-	c.Assert(safe.FSync, Equals, true)
-	c.Assert(safe.J, Equals, false)
-
-	// Even more conservative.
-	session.EnsureSafe(&mgo.Safe{WMode: "majority", WTimeout: 2})
-	safe = session.Safe()
-	c.Assert(safe.W, Equals, 0)
-	c.Assert(safe.WMode, Equals, "majority")
-	c.Assert(safe.WTimeout, Equals, 2)
-	c.Assert(safe.FSync, Equals, true)
-	c.Assert(safe.J, Equals, false)
-
-	// WMode always overrides, whatever it is, but J doesn't.
-	session.EnsureSafe(&mgo.Safe{WMode: "something", J: true})
-	safe = session.Safe()
-	c.Assert(safe.W, Equals, 0)
-	c.Assert(safe.WMode, Equals, "something")
-	c.Assert(safe.WTimeout, Equals, 2)
-	c.Assert(safe.FSync, Equals, true)
-	c.Assert(safe.J, Equals, false)
-
-	// EnsureSafe with nil does nothing.
-	session.EnsureSafe(nil)
-	safe = session.Safe()
-	c.Assert(safe.W, Equals, 0)
-	c.Assert(safe.WMode, Equals, "something")
-	c.Assert(safe.WTimeout, Equals, 2)
-	c.Assert(safe.FSync, Equals, true)
-	c.Assert(safe.J, Equals, false)
-
-	// Changing the safety of a cloned session doesn't touch the original.
-	clone := session.Clone()
-	defer clone.Close()
-	clone.EnsureSafe(&mgo.Safe{WMode: "foo"})
-	safe = session.Safe()
-	c.Assert(safe.WMode, Equals, "something")
-}
-
-func (s *S) TestSafeInsert(c *C) {
-	session, err := mgo.Dial("localhost:40001")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	coll := session.DB("mydb").C("mycoll")
-
-	// Insert an element with a predefined key.
-	err = coll.Insert(M{"_id": 1})
-	c.Assert(err, IsNil)
-
-	mgo.ResetStats()
-
-	// Session should be safe by default, so inserting it again must fail.
-	err = coll.Insert(M{"_id": 1})
-	c.Assert(err, ErrorMatches, ".*E11000 duplicate.*")
-	c.Assert(err.(*mgo.LastError).Code, Equals, 11000)
-
-	// It must have sent two operations (INSERT_OP + getLastError QUERY_OP)
-	stats := mgo.GetStats()
-
-	// TODO Will be 2.6 when write commands are enabled for it.
-	if s.versionAtLeast(3, 0) {
-		c.Assert(stats.SentOps, Equals, 1)
-	} else {
-		c.Assert(stats.SentOps, Equals, 2)
-	}
-
-	mgo.ResetStats()
-
-	// If we disable safety, though, it won't complain.
-	session.SetSafe(nil)
-	err = coll.Insert(M{"_id": 1})
-	c.Assert(err, IsNil)
-
-	// Must have sent a single operation this time (just the INSERT_OP)
-	stats = mgo.GetStats()
-	c.Assert(stats.SentOps, Equals, 1)
-}
-
-func (s *S) TestSafeParameters(c *C) {
-	session, err := mgo.Dial("localhost:40011")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	coll := session.DB("mydb").C("mycoll")
-
-	// Tweak the safety parameters to something unachievable.
-	session.SetSafe(&mgo.Safe{W: 4, WTimeout: 100})
-	err = coll.Insert(M{"_id": 1})
-	c.Assert(err, ErrorMatches, "timeout|timed out waiting for slaves|Not enough data-bearing nodes|waiting for replication timed out") // :-(
-	if !s.versionAtLeast(2, 6) {
-		// 2.6 turned it into a query error.
-		c.Assert(err.(*mgo.LastError).WTimeout, Equals, true)
-	}
-}
-
-func (s *S) TestQueryErrorOne(c *C) {
-	session, err := mgo.Dial("localhost:40001")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	coll := session.DB("mydb").C("mycoll")
-
-	result := struct {
-		Err string "$err"
-	}{}
-
-	err = coll.Find(M{"a": 1}).Select(M{"a": M{"b": 1}}).One(&result)
-	c.Assert(err, ErrorMatches, ".*Unsupported projection option:.*")
-	c.Assert(err.(*mgo.QueryError).Message, Matches, ".*Unsupported projection option:.*")
-	if s.versionAtLeast(2, 6) {
-		// Oh, the dance of error codes. :-(
-		c.Assert(err.(*mgo.QueryError).Code, Equals, 17287)
-	} else {
-		c.Assert(err.(*mgo.QueryError).Code, Equals, 13097)
-	}
-
-	// The result should be properly unmarshalled with QueryError
-	c.Assert(result.Err, Matches, ".*Unsupported projection option:.*")
-}
-
-func (s *S) TestQueryErrorNext(c *C) {
-	session, err := mgo.Dial("localhost:40001")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	coll := session.DB("mydb").C("mycoll")
-
-	result := struct {
-		Err string "$err"
-	}{}
-
-	iter := coll.Find(M{"a": 1}).Select(M{"a": M{"b": 1}}).Iter()
-
-	ok := iter.Next(&result)
-	c.Assert(ok, Equals, false)
-
-	err = iter.Close()
-	c.Assert(err, ErrorMatches, ".*Unsupported projection option:.*")
-	c.Assert(err.(*mgo.QueryError).Message, Matches, ".*Unsupported projection option:.*")
-	if s.versionAtLeast(2, 6) {
-		// Oh, the dance of error codes. :-(
-		c.Assert(err.(*mgo.QueryError).Code, Equals, 17287)
-	} else {
-		c.Assert(err.(*mgo.QueryError).Code, Equals, 13097)
-	}
-	c.Assert(iter.Err(), Equals, err)
-
-	// The result should be properly unmarshalled with QueryError
-	c.Assert(result.Err, Matches, ".*Unsupported projection option:.*")
-}
-
-var indexTests = []struct {
-	index    mgo.Index
-	expected M
-}{{
-	mgo.Index{
-		Key:        []string{"a"},
-		Background: true,
-	},
-	M{
-		"name":       "a_1",
-		"key":        M{"a": 1},
-		"ns":         "mydb.mycoll",
-		"background": true,
-	},
-}, {
-	mgo.Index{
-		Key:      []string{"a", "-b"},
-		Unique:   true,
-		DropDups: true,
-	},
-	M{
-		"name":     "a_1_b_-1",
-		"key":      M{"a": 1, "b": -1},
-		"ns":       "mydb.mycoll",
-		"unique":   true,
-		"dropDups": true,
-	},
-}, {
-	mgo.Index{
-		Key:  []string{"@loc_old"}, // Obsolete
-		Min:  -500,
-		Max:  500,
-		Bits: 32,
-	},
-	M{
-		"name": "loc_old_2d",
-		"key":  M{"loc_old": "2d"},
-		"ns":   "mydb.mycoll",
-		"min":  -500,
-		"max":  500,
-		"bits": 32,
-	},
-}, {
-	mgo.Index{
-		Key:  []string{"$2d:loc"},
-		Min:  -500,
-		Max:  500,
-		Bits: 32,
-	},
-	M{
-		"name": "loc_2d",
-		"key":  M{"loc": "2d"},
-		"ns":   "mydb.mycoll",
-		"min":  -500,
-		"max":  500,
-		"bits": 32,
-	},
-}, {
-	mgo.Index{
-		Key:        []string{"$geoHaystack:loc", "type"},
-		BucketSize: 1,
-	},
-	M{
-		"name":       "loc_geoHaystack_type_1",
-		"key":        M{"loc": "geoHaystack", "type": 1},
-		"ns":         "mydb.mycoll",
-		"bucketSize": 1.0,
-	},
-}, {
-	mgo.Index{
-		Key:     []string{"$text:a", "$text:b"},
-		Weights: map[string]int{"b": 42},
-	},
-	M{
-		"name":              "a_text_b_text",
-		"key":               M{"_fts": "text", "_ftsx": 1},
-		"ns":                "mydb.mycoll",
-		"weights":           M{"a": 1, "b": 42},
-		"default_language":  "english",
-		"language_override": "language",
-		"textIndexVersion":  2,
-	},
-}, {
-	mgo.Index{
-		Key:              []string{"$text:a"},
-		DefaultLanguage:  "portuguese",
-		LanguageOverride: "idioma",
-	},
-	M{
-		"name":              "a_text",
-		"key":               M{"_fts": "text", "_ftsx": 1},
-		"ns":                "mydb.mycoll",
-		"weights":           M{"a": 1},
-		"default_language":  "portuguese",
-		"language_override": "idioma",
-		"textIndexVersion":  2,
-	},
-}, {
-	mgo.Index{
-		Key: []string{"$text:$**"},
-	},
-	M{
-		"name":              "$**_text",
-		"key":               M{"_fts": "text", "_ftsx": 1},
-		"ns":                "mydb.mycoll",
-		"weights":           M{"$**": 1},
-		"default_language":  "english",
-		"language_override": "language",
-		"textIndexVersion":  2,
-	},
-}}
-
-func (s *S) TestEnsureIndex(c *C) {
-	session, err := mgo.Dial("localhost:40001")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	coll := session.DB("mydb").C("mycoll")
-	idxs := session.DB("mydb").C("system.indexes")
-
-	for _, test := range indexTests {
-		if !s.versionAtLeast(2, 4) && test.expected["weights"] != nil {
-			// No text indexes until 2.4.
-			continue
-		}
-
-		err = coll.EnsureIndex(test.index)
-		c.Assert(err, IsNil)
-
-		obtained := M{}
-		err = idxs.Find(M{"name": test.expected["name"]}).One(obtained)
-		c.Assert(err, IsNil)
-
-		delete(obtained, "v")
-
-		if s.versionAtLeast(2, 7) {
-			// Was deprecated in 2.6, and not being reported by 2.7+.
-			delete(test.expected, "dropDups")
-		}
-
-		c.Assert(obtained, DeepEquals, test.expected)
-
-		err = coll.DropIndex(test.index.Key...)
-		c.Assert(err, IsNil)
-	}
-}
-
-func (s *S) TestEnsureIndexWithBadInfo(c *C) {
-	session, err := mgo.Dial("localhost:40001")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	coll := session.DB("mydb").C("mycoll")
-
-	err = coll.EnsureIndex(mgo.Index{})
-	c.Assert(err, ErrorMatches, "invalid index key:.*")
-
-	err = coll.EnsureIndex(mgo.Index{Key: []string{""}})
-	c.Assert(err, ErrorMatches, "invalid index key:.*")
-}
-
-func (s *S) TestEnsureIndexWithUnsafeSession(c *C) {
-	session, err := mgo.Dial("localhost:40001")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	session.SetSafe(nil)
-
-	coll := session.DB("mydb").C("mycoll")
-
-	err = coll.Insert(M{"a": 1})
-	c.Assert(err, IsNil)
-
-	err = coll.Insert(M{"a": 1})
-	c.Assert(err, IsNil)
-
-	// Should fail since there are duplicated entries.
-	index := mgo.Index{
-		Key:    []string{"a"},
-		Unique: true,
-	}
-
-	err = coll.EnsureIndex(index)
-	c.Assert(err, ErrorMatches, ".*duplicate key error.*")
-}
-
-func (s *S) TestEnsureIndexKey(c *C) {
-	session, err := mgo.Dial("localhost:40001")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	coll := session.DB("mydb").C("mycoll")
-
-	err = coll.EnsureIndexKey("a")
-	c.Assert(err, IsNil)
-
-	err = coll.EnsureIndexKey("a", "-b")
-	c.Assert(err, IsNil)
-
-	sysidx := session.DB("mydb").C("system.indexes")
-
-	result1 := M{}
-	err = sysidx.Find(M{"name": "a_1"}).One(result1)
-	c.Assert(err, IsNil)
-
-	result2 := M{}
-	err = sysidx.Find(M{"name": "a_1_b_-1"}).One(result2)
-	c.Assert(err, IsNil)
-
-	delete(result1, "v")
-	expected1 := M{
-		"name": "a_1",
-		"key":  M{"a": 1},
-		"ns":   "mydb.mycoll",
-	}
-	c.Assert(result1, DeepEquals, expected1)
-
-	delete(result2, "v")
-	expected2 := M{
-		"name": "a_1_b_-1",
-		"key":  M{"a": 1, "b": -1},
-		"ns":   "mydb.mycoll",
-	}
-	c.Assert(result2, DeepEquals, expected2)
-}
-
-func (s *S) TestEnsureIndexDropIndex(c *C) {
-	session, err := mgo.Dial("localhost:40001")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	coll := session.DB("mydb").C("mycoll")
-
-	err = coll.EnsureIndexKey("a")
-	c.Assert(err, IsNil)
-
-	err = coll.EnsureIndexKey("-b")
-	c.Assert(err, IsNil)
-
-	err = coll.DropIndex("-b")
-	c.Assert(err, IsNil)
-
-	sysidx := session.DB("mydb").C("system.indexes")
-	dummy := &struct{}{}
-
-	err = sysidx.Find(M{"name": "a_1"}).One(dummy)
-	c.Assert(err, IsNil)
-
-	err = sysidx.Find(M{"name": "b_1"}).One(dummy)
-	c.Assert(err, Equals, mgo.ErrNotFound)
-
-	err = coll.DropIndex("a")
-	c.Assert(err, IsNil)
-
-	err = sysidx.Find(M{"name": "a_1"}).One(dummy)
-	c.Assert(err, Equals, mgo.ErrNotFound)
-
-	err = coll.DropIndex("a")
-	c.Assert(err, ErrorMatches, "index not found.*")
-}
-
-func (s *S) TestEnsureIndexCaching(c *C) {
-	session, err := mgo.Dial("localhost:40001")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	coll := session.DB("mydb").C("mycoll")
-
-	err = coll.EnsureIndexKey("a")
-	c.Assert(err, IsNil)
-
-	mgo.ResetStats()
-
-	// Second EnsureIndex should be cached and do nothing.
-	err = coll.EnsureIndexKey("a")
-	c.Assert(err, IsNil)
-
-	stats := mgo.GetStats()
-	c.Assert(stats.SentOps, Equals, 0)
-
-	// Resetting the cache should make it contact the server again.
-	session.ResetIndexCache()
-
-	err = coll.EnsureIndexKey("a")
-	c.Assert(err, IsNil)
-
-	stats = mgo.GetStats()
-	c.Assert(stats.SentOps > 0, Equals, true)
-
-	// Dropping the index should also drop the cached index key.
-	err = coll.DropIndex("a")
-	c.Assert(err, IsNil)
-
-	mgo.ResetStats()
-
-	err = coll.EnsureIndexKey("a")
-	c.Assert(err, IsNil)
-
-	stats = mgo.GetStats()
-	c.Assert(stats.SentOps > 0, Equals, true)
-}
-
-func (s *S) TestEnsureIndexGetIndexes(c *C) {
-	session, err := mgo.Dial("localhost:40001")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	coll := session.DB("mydb").C("mycoll")
-
-	err = coll.EnsureIndexKey("-b")
-	c.Assert(err, IsNil)
-
-	err = coll.EnsureIndexKey("a")
-	c.Assert(err, IsNil)
-
-	// Obsolete.
-	err = coll.EnsureIndexKey("@c")
-	c.Assert(err, IsNil)
-
-	err = coll.EnsureIndexKey("$2d:d")
-	c.Assert(err, IsNil)
-
-	// Try to exercise cursor logic. 2.8.0-rc3 still ignores this.
-	session.SetBatch(2)
-
-	indexes, err := coll.Indexes()
-	c.Assert(err, IsNil)
-
-	c.Assert(indexes[0].Name, Equals, "_id_")
-	c.Assert(indexes[1].Name, Equals, "a_1")
-	c.Assert(indexes[1].Key, DeepEquals, []string{"a"})
-	c.Assert(indexes[2].Name, Equals, "b_-1")
-	c.Assert(indexes[2].Key, DeepEquals, []string{"-b"})
-	c.Assert(indexes[3].Name, Equals, "c_2d")
-	c.Assert(indexes[3].Key, DeepEquals, []string{"$2d:c"})
-	c.Assert(indexes[4].Name, Equals, "d_2d")
-	c.Assert(indexes[4].Key, DeepEquals, []string{"$2d:d"})
-}
-
-func (s *S) TestEnsureIndexEvalGetIndexes(c *C) {
-	session, err := mgo.Dial("localhost:40001")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	coll := session.DB("mydb").C("mycoll")
-
-	err = session.Run(bson.D{{"eval", "db.getSiblingDB('mydb').mycoll.ensureIndex({b: -1})"}}, nil)
-	c.Assert(err, IsNil)
-	err = session.Run(bson.D{{"eval", "db.getSiblingDB('mydb').mycoll.ensureIndex({a: 1})"}}, nil)
-	c.Assert(err, IsNil)
-	err = session.Run(bson.D{{"eval", "db.getSiblingDB('mydb').mycoll.ensureIndex({c: -1, e: 1})"}}, nil)
-	c.Assert(err, IsNil)
-	err = session.Run(bson.D{{"eval", "db.getSiblingDB('mydb').mycoll.ensureIndex({d: '2d'})"}}, nil)
-	c.Assert(err, IsNil)
-
-	indexes, err := coll.Indexes()
-	c.Assert(err, IsNil)
-
-	c.Assert(indexes[0].Name, Equals, "_id_")
-	c.Assert(indexes[1].Name, Equals, "a_1")
-	c.Assert(indexes[1].Key, DeepEquals, []string{"a"})
-	c.Assert(indexes[2].Name, Equals, "b_-1")
-	c.Assert(indexes[2].Key, DeepEquals, []string{"-b"})
-	c.Assert(indexes[3].Name, Equals, "c_-1_e_1")
-	c.Assert(indexes[3].Key, DeepEquals, []string{"-c", "e"})
-	if s.versionAtLeast(2, 2) {
-		c.Assert(indexes[4].Name, Equals, "d_2d")
-		c.Assert(indexes[4].Key, DeepEquals, []string{"$2d:d"})
-	} else {
-		c.Assert(indexes[4].Name, Equals, "d_")
-		c.Assert(indexes[4].Key, DeepEquals, []string{"$2d:d"})
-	}
-}
-
-var testTTL = flag.Bool("test-ttl", false, "test TTL collections (may take 1 minute)")
-
-func (s *S) TestEnsureIndexExpireAfter(c *C) {
-	session, err := mgo.Dial("localhost:40001")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	session.SetSafe(nil)
-
-	coll := session.DB("mydb").C("mycoll")
-
-	err = coll.Insert(M{"n": 1, "t": time.Now().Add(-120 * time.Second)})
-	c.Assert(err, IsNil)
-	err = coll.Insert(M{"n": 2, "t": time.Now()})
-	c.Assert(err, IsNil)
-
-	// Should fail since there are duplicated entries.
-	index := mgo.Index{
-		Key:         []string{"t"},
-		ExpireAfter: 1 * time.Minute,
-	}
-
-	err = coll.EnsureIndex(index)
-	c.Assert(err, IsNil)
-
-	indexes, err := coll.Indexes()
-	c.Assert(err, IsNil)
-	c.Assert(indexes[1].Name, Equals, "t_1")
-	c.Assert(indexes[1].ExpireAfter, Equals, 1*time.Minute)
-
-	if *testTTL {
-		worked := false
-		stop := time.Now().Add(70 * time.Second)
-		for time.Now().Before(stop) {
-			n, err := coll.Count()
-			c.Assert(err, IsNil)
-			if n == 1 {
-				worked = true
-				break
-			}
-			c.Assert(n, Equals, 2)
-			c.Logf("Still has 2 entries...")
-			time.Sleep(1 * time.Second)
-		}
-		if !worked {
-			c.Fatalf("TTL index didn't work")
-		}
-	}
-}
-
-func (s *S) TestDistinct(c *C) {
-	session, err := mgo.Dial("localhost:40001")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	coll := session.DB("mydb").C("mycoll")
-
-	for _, i := range []int{1, 4, 6, 2, 2, 3, 4} {
-		coll.Insert(M{"n": i})
-	}
-
-	var result []int
-	err = coll.Find(M{"n": M{"$gt": 2}}).Sort("n").Distinct("n", &result)
-
-	sort.IntSlice(result).Sort()
-	c.Assert(result, DeepEquals, []int{3, 4, 6})
-}
-
-func (s *S) TestMapReduce(c *C) {
-	session, err := mgo.Dial("localhost:40001")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	coll := session.DB("mydb").C("mycoll")
-
-	for _, i := range []int{1, 4, 6, 2, 2, 3, 4} {
-		coll.Insert(M{"n": i})
-	}
-
-	job := &mgo.MapReduce{
-		Map:    "function() { emit(this.n, 1); }",
-		Reduce: "function(key, values) { return Array.sum(values); }",
-	}
-	var result []struct {
-		Id    int "_id"
-		Value int
-	}
-
-	info, err := coll.Find(M{"n": M{"$gt": 2}}).MapReduce(job, &result)
-	c.Assert(err, IsNil)
-	c.Assert(info.InputCount, Equals, 4)
-	c.Assert(info.EmitCount, Equals, 4)
-	c.Assert(info.OutputCount, Equals, 3)
-	c.Assert(info.VerboseTime, IsNil)
-
-	expected := map[int]int{3: 1, 4: 2, 6: 1}
-	for _, item := range result {
-		c.Logf("Item: %#v", &item)
-		c.Assert(item.Value, Equals, expected[item.Id])
-		expected[item.Id] = -1
-	}
-}
-
-func (s *S) TestMapReduceFinalize(c *C) {
-	session, err := mgo.Dial("localhost:40001")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	coll := session.DB("mydb").C("mycoll")
-
-	for _, i := range []int{1, 4, 6, 2, 2, 3, 4} {
-		coll.Insert(M{"n": i})
-	}
-
-	job := &mgo.MapReduce{
-		Map:      "function() { emit(this.n, 1) }",
-		Reduce:   "function(key, values) { return Array.sum(values) }",
-		Finalize: "function(key, count) { return {count: count} }",
-	}
-	var result []struct {
-		Id    int "_id"
-		Value struct{ Count int }
-	}
-	_, err = coll.Find(nil).MapReduce(job, &result)
-	c.Assert(err, IsNil)
-
-	expected := map[int]int{1: 1, 2: 2, 3: 1, 4: 2, 6: 1}
-	for _, item := range result {
-		c.Logf("Item: %#v", &item)
-		c.Assert(item.Value.Count, Equals, expected[item.Id])
-		expected[item.Id] = -1
-	}
-}
-
-func (s *S) TestMapReduceToCollection(c *C) {
-	session, err := mgo.Dial("localhost:40001")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	coll := session.DB("mydb").C("mycoll")
-
-	for _, i := range []int{1, 4, 6, 2, 2, 3, 4} {
-		coll.Insert(M{"n": i})
-	}
-
-	job := &mgo.MapReduce{
-		Map:    "function() { emit(this.n, 1); }",
-		Reduce: "function(key, values) { return Array.sum(values); }",
-		Out:    "mr",
-	}
-
-	info, err := coll.Find(nil).MapReduce(job, nil)
-	c.Assert(err, IsNil)
-	c.Assert(info.InputCount, Equals, 7)
-	c.Assert(info.EmitCount, Equals, 7)
-	c.Assert(info.OutputCount, Equals, 5)
-	c.Assert(info.Collection, Equals, "mr")
-	c.Assert(info.Database, Equals, "mydb")
-
-	expected := map[int]int{1: 1, 2: 2, 3: 1, 4: 2, 6: 1}
-	var item *struct {
-		Id    int "_id"
-		Value int
-	}
-	mr := session.DB("mydb").C("mr")
-	iter := mr.Find(nil).Iter()
-	for iter.Next(&item) {
-		c.Logf("Item: %#v", &item)
-		c.Assert(item.Value, Equals, expected[item.Id])
-		expected[item.Id] = -1
-	}
-	c.Assert(iter.Close(), IsNil)
-}
-
-func (s *S) TestMapReduceToOtherDb(c *C) {
-	session, err := mgo.Dial("localhost:40001")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	coll := session.DB("mydb").C("mycoll")
-
-	for _, i := range []int{1, 4, 6, 2, 2, 3, 4} {
-		coll.Insert(M{"n": i})
-	}
-
-	job := &mgo.MapReduce{
-		Map:    "function() { emit(this.n, 1); }",
-		Reduce: "function(key, values) { return Array.sum(values); }",
-		Out:    bson.D{{"replace", "mr"}, {"db", "otherdb"}},
-	}
-
-	info, err := coll.Find(nil).MapReduce(job, nil)
-	c.Assert(err, IsNil)
-	c.Assert(info.InputCount, Equals, 7)
-	c.Assert(info.EmitCount, Equals, 7)
-	c.Assert(info.OutputCount, Equals, 5)
-	c.Assert(info.Collection, Equals, "mr")
-	c.Assert(info.Database, Equals, "otherdb")
-
-	expected := map[int]int{1: 1, 2: 2, 3: 1, 4: 2, 6: 1}
-	var item *struct {
-		Id    int "_id"
-		Value int
-	}
-	mr := session.DB("otherdb").C("mr")
-	iter := mr.Find(nil).Iter()
-	for iter.Next(&item) {
-		c.Logf("Item: %#v", &item)
-		c.Assert(item.Value, Equals, expected[item.Id])
-		expected[item.Id] = -1
-	}
-	c.Assert(iter.Close(), IsNil)
-}
-
-func (s *S) TestMapReduceOutOfOrder(c *C) {
-	session, err := mgo.Dial("localhost:40001")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	coll := session.DB("mydb").C("mycoll")
-
-	for _, i := range []int{1, 4, 6, 2, 2, 3, 4} {
-		coll.Insert(M{"n": i})
-	}
-
-	job := &mgo.MapReduce{
-		Map:    "function() { emit(this.n, 1); }",
-		Reduce: "function(key, values) { return Array.sum(values); }",
-		Out:    bson.M{"a": "a", "z": "z", "replace": "mr", "db": "otherdb", "b": "b", "y": "y"},
-	}
-
-	info, err := coll.Find(nil).MapReduce(job, nil)
-	c.Assert(err, IsNil)
-	c.Assert(info.Collection, Equals, "mr")
-	c.Assert(info.Database, Equals, "otherdb")
-}
-
-func (s *S) TestMapReduceScope(c *C) {
-	session, err := mgo.Dial("localhost:40001")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	coll := session.DB("mydb").C("mycoll")
-
-	coll.Insert(M{"n": 1})
-
-	job := &mgo.MapReduce{
-		Map:    "function() { emit(this.n, x); }",
-		Reduce: "function(key, values) { return Array.sum(values); }",
-		Scope:  M{"x": 42},
-	}
-
-	var result []bson.M
-	_, err = coll.Find(nil).MapReduce(job, &result)
-	c.Assert(len(result), Equals, 1)
-	c.Assert(result[0]["value"], Equals, 42.0)
-}
-
-func (s *S) TestMapReduceVerbose(c *C) {
-	session, err := mgo.Dial("localhost:40001")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	coll := session.DB("mydb").C("mycoll")
-
-	for i := 0; i < 100; i++ {
-		err = coll.Insert(M{"n": i})
-		c.Assert(err, IsNil)
-	}
-
-	job := &mgo.MapReduce{
-		Map:     "function() { emit(this.n, 1); }",
-		Reduce:  "function(key, values) { return Array.sum(values); }",
-		Verbose: true,
-	}
-
-	info, err := coll.Find(nil).MapReduce(job, nil)
-	c.Assert(err, IsNil)
-	c.Assert(info.VerboseTime, NotNil)
-}
-
-func (s *S) TestMapReduceLimit(c *C) {
-	session, err := mgo.Dial("localhost:40001")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	coll := session.DB("mydb").C("mycoll")
-
-	for _, i := range []int{1, 4, 6, 2, 2, 3, 4} {
-		coll.Insert(M{"n": i})
-	}
-
-	job := &mgo.MapReduce{
-		Map:    "function() { emit(this.n, 1); }",
-		Reduce: "function(key, values) { return Array.sum(values); }",
-	}
-
-	var result []bson.M
-	_, err = coll.Find(nil).Limit(3).MapReduce(job, &result)
-	c.Assert(err, IsNil)
-	c.Assert(len(result), Equals, 3)
-}
-
-func (s *S) TestBuildInfo(c *C) {
-	session, err := mgo.Dial("localhost:40001")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	info, err := session.BuildInfo()
-	c.Assert(err, IsNil)
-
-	var v []int
-	for i, a := range strings.Split(info.Version, ".") {
-		for _, token := range []string{"-rc", "-pre"} {
-			if i == 2 && strings.Contains(a, token) {
-				a = a[:strings.Index(a, token)]
-				info.VersionArray[len(info.VersionArray)-1] = 0
-			}
-		}
-		n, err := strconv.Atoi(a)
-		c.Assert(err, IsNil)
-		v = append(v, n)
-	}
-	for len(v) < 4 {
-		v = append(v, 0)
-	}
-
-	c.Assert(info.VersionArray, DeepEquals, v)
-	c.Assert(info.GitVersion, Matches, "[a-z0-9]+")
-	c.Assert(info.SysInfo, Matches, ".*[0-9:]+.*")
-	if info.Bits != 32 && info.Bits != 64 {
-		c.Fatalf("info.Bits is %d", info.Bits)
-	}
-	if info.MaxObjectSize < 8192 {
-		c.Fatalf("info.MaxObjectSize seems too small: %d", info.MaxObjectSize)
-	}
-}
-
-func (s *S) TestZeroTimeRoundtrip(c *C) {
-	session, err := mgo.Dial("localhost:40001")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	var d struct{ T time.Time }
-	conn := session.DB("mydb").C("mycoll")
-	err = conn.Insert(d)
-	c.Assert(err, IsNil)
-
-	var result bson.M
-	err = conn.Find(nil).One(&result)
-	c.Assert(err, IsNil)
-	t, isTime := result["t"].(time.Time)
-	c.Assert(isTime, Equals, true)
-	c.Assert(t, Equals, time.Time{})
-}
-
-func (s *S) TestFsyncLock(c *C) {
-	session, err := mgo.Dial("localhost:40001")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	clone := session.Clone()
-	defer clone.Close()
-
-	err = session.FsyncLock()
-	c.Assert(err, IsNil)
-
-	done := make(chan time.Time)
-	go func() {
-		time.Sleep(3e9)
-		now := time.Now()
-		err := session.FsyncUnlock()
-		c.Check(err, IsNil)
-		done <- now
-	}()
-
-	err = clone.DB("mydb").C("mycoll").Insert(bson.M{"n": 1})
-	unlocked := time.Now()
-	unlocking := <-done
-	c.Assert(err, IsNil)
-
-	c.Assert(unlocked.After(unlocking), Equals, true)
-	c.Assert(unlocked.Sub(unlocking) < 1e9, Equals, true)
-}
-
-func (s *S) TestFsync(c *C) {
-	session, err := mgo.Dial("localhost:40001")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	// Not much to do here. Just a smoke check.
-	err = session.Fsync(false)
-	c.Assert(err, IsNil)
-	err = session.Fsync(true)
-	c.Assert(err, IsNil)
-}
-
-func (s *S) TestRepairCursor(c *C) {
-	if !s.versionAtLeast(2, 7) {
-		c.Skip("RepairCursor only works on 2.7+")
-	}
-
-	session, err := mgo.Dial("localhost:40001")
-	c.Assert(err, IsNil)
-	defer session.Close()
-	session.SetBatch(2)
-
-	coll := session.DB("mydb").C("mycoll3")
-	err = coll.DropCollection()
-
-	ns := []int{0, 10, 20, 30, 40, 50}
-	for _, n := range ns {
-		coll.Insert(M{"n": n})
-	}
-
-	repairIter := coll.Repair()
-
-	c.Assert(repairIter.Err(), IsNil)
-
-	result := struct{ N int }{}
-	resultCounts := map[int]int{}
-	for repairIter.Next(&result) {
-		resultCounts[result.N]++
-	}
-
-	c.Assert(repairIter.Next(&result), Equals, false)
-	c.Assert(repairIter.Err(), IsNil)
-	c.Assert(repairIter.Close(), IsNil)
-
-	// Verify that the results of the repair cursor are valid.
-	// The repair cursor can return multiple copies
-	// of the same document, so to check correctness we only
-	// need to verify that at least 1 of each document was returned.
-
-	for _, key := range ns {
-		c.Assert(resultCounts[key] > 0, Equals, true)
-	}
-}
-
-func (s *S) TestPipeIter(c *C) {
-	if !s.versionAtLeast(2, 1) {
-		c.Skip("Pipe only works on 2.1+")
-	}
-
-	session, err := mgo.Dial("localhost:40001")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	coll := session.DB("mydb").C("mycoll")
-
-	ns := []int{40, 41, 42, 43, 44, 45, 46}
-	for _, n := range ns {
-		coll.Insert(M{"n": n})
-	}
-
-	pipe := coll.Pipe([]M{{"$match": M{"n": M{"$gte": 42}}}})
-
-	// Ensure cursor logic is working by forcing a small batch.
-	pipe.Batch(2)
-
-	// Smoke test for AllowDiskUse.
-	pipe.AllowDiskUse()
-
-	iter := pipe.Iter()
-	result := struct{ N int }{}
-	for i := 2; i < 7; i++ {
-		ok := iter.Next(&result)
-		c.Assert(ok, Equals, true)
-		c.Assert(result.N, Equals, ns[i])
-	}
-
-	c.Assert(iter.Next(&result), Equals, false)
-	c.Assert(iter.Close(), IsNil)
-}
-
-func (s *S) TestPipeAll(c *C) {
-	if !s.versionAtLeast(2, 1) {
-		c.Skip("Pipe only works on 2.1+")
-	}
-
-	session, err := mgo.Dial("localhost:40001")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	coll := session.DB("mydb").C("mycoll")
-
-	ns := []int{40, 41, 42, 43, 44, 45, 46}
-	for _, n := range ns {
-		err := coll.Insert(M{"n": n})
-		c.Assert(err, IsNil)
-	}
-
-	var result []struct{ N int }
-	err = coll.Pipe([]M{{"$match": M{"n": M{"$gte": 42}}}}).All(&result)
-	c.Assert(err, IsNil)
-	for i := 2; i < 7; i++ {
-		c.Assert(result[i-2].N, Equals, ns[i])
-	}
-}
-
-func (s *S) TestPipeOne(c *C) {
-	if !s.versionAtLeast(2, 1) {
-		c.Skip("Pipe only works on 2.1+")
-	}
-
-	session, err := mgo.Dial("localhost:40001")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	coll := session.DB("mydb").C("mycoll")
-	coll.Insert(M{"a": 1, "b": 2})
-
-	result := struct{ A, B int }{}
-
-	pipe := coll.Pipe([]M{{"$project": M{"a": 1, "b": M{"$add": []interface{}{"$b", 1}}}}})
-	err = pipe.One(&result)
-	c.Assert(err, IsNil)
-	c.Assert(result.A, Equals, 1)
-	c.Assert(result.B, Equals, 3)
-
-	pipe = coll.Pipe([]M{{"$match": M{"a": 2}}})
-	err = pipe.One(&result)
-	c.Assert(err, Equals, mgo.ErrNotFound)
-}
-
-func (s *S) TestPipeExplain(c *C) {
-	if !s.versionAtLeast(2, 1) {
-		c.Skip("Pipe only works on 2.1+")
-	}
-
-	session, err := mgo.Dial("localhost:40001")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	coll := session.DB("mydb").C("mycoll")
-	coll.Insert(M{"a": 1, "b": 2})
-
-	pipe := coll.Pipe([]M{{"$project": M{"a": 1, "b": M{"$add": []interface{}{"$b", 1}}}}})
-
-	// The explain command result changes across versions.
-	var result struct{ Ok int }
-	err = pipe.Explain(&result)
-	c.Assert(err, IsNil)
-	c.Assert(result.Ok, Equals, 1)
-}
-
-func (s *S) TestBatch1Bug(c *C) {
-	session, err := mgo.Dial("localhost:40001")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	coll := session.DB("mydb").C("mycoll")
-
-	for i := 0; i < 3; i++ {
-		err := coll.Insert(M{"n": i})
-		c.Assert(err, IsNil)
-	}
-
-	var ns []struct{ N int }
-	err = coll.Find(nil).Batch(1).All(&ns)
-	c.Assert(err, IsNil)
-	c.Assert(len(ns), Equals, 3)
-
-	session.SetBatch(1)
-	err = coll.Find(nil).All(&ns)
-	c.Assert(err, IsNil)
-	c.Assert(len(ns), Equals, 3)
-}
-
-func (s *S) TestInterfaceIterBug(c *C) {
-	session, err := mgo.Dial("localhost:40001")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	coll := session.DB("mydb").C("mycoll")
-
-	for i := 0; i < 3; i++ {
-		err := coll.Insert(M{"n": i})
-		c.Assert(err, IsNil)
-	}
-
-	var result interface{}
-
-	i := 0
-	iter := coll.Find(nil).Sort("n").Iter()
-	for iter.Next(&result) {
-		c.Assert(result.(bson.M)["n"], Equals, i)
-		i++
-	}
-	c.Assert(iter.Close(), IsNil)
-}
-
-func (s *S) TestFindIterCloseKillsCursor(c *C) {
-	session, err := mgo.Dial("localhost:40001")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	cursors := serverCursorsOpen(session)
-
-	coll := session.DB("mydb").C("mycoll")
-	ns := []int{40, 41, 42, 43, 44, 45, 46}
-	for _, n := range ns {
-		err = coll.Insert(M{"n": n})
-		c.Assert(err, IsNil)
-	}
-
-	iter := coll.Find(nil).Batch(2).Iter()
-	c.Assert(iter.Next(bson.M{}), Equals, true)
-
-	c.Assert(iter.Close(), IsNil)
-	c.Assert(serverCursorsOpen(session), Equals, cursors)
-}
-
-func (s *S) TestLogReplay(c *C) {
-	session, err := mgo.Dial("localhost:40001")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	coll := session.DB("mydb").C("mycoll")
-	for i := 0; i < 5; i++ {
-		err = coll.Insert(M{"ts": time.Now()})
-		c.Assert(err, IsNil)
-	}
-
-	iter := coll.Find(nil).LogReplay().Iter()
-	if s.versionAtLeast(2, 6) {
-		// This used to fail in 2.4. Now it's just a smoke test.
-		c.Assert(iter.Err(), IsNil)
-	} else {
-		c.Assert(iter.Next(bson.M{}), Equals, false)
-		c.Assert(iter.Err(), ErrorMatches, "no ts field in query")
-	}
-}
-
-func (s *S) TestSetCursorTimeout(c *C) {
-	session, err := mgo.Dial("localhost:40001")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	coll := session.DB("mydb").C("mycoll")
-	err = coll.Insert(M{"n": 42})
-
-	// This is just a smoke test. Won't wait 10 minutes for an actual timeout.
-
-	session.SetCursorTimeout(0)
-
-	var result struct{ N int }
-	iter := coll.Find(nil).Iter()
-	c.Assert(iter.Next(&result), Equals, true)
-	c.Assert(result.N, Equals, 42)
-	c.Assert(iter.Next(&result), Equals, false)
-}
-
-func (s *S) TestNewIterNoServer(c *C) {
-	session, err := mgo.Dial("localhost:40001")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	data, err := bson.Marshal(bson.M{"a": 1})
-
-	coll := session.DB("mydb").C("mycoll")
-	iter := coll.NewIter(nil, []bson.Raw{{3, data}}, 42, nil)
-
-	var result struct{ A int }
-	ok := iter.Next(&result)
-	c.Assert(ok, Equals, true)
-	c.Assert(result.A, Equals, 1)
-
-	ok = iter.Next(&result)
-	c.Assert(ok, Equals, false)
-
-	c.Assert(iter.Err(), ErrorMatches, "server not available")
-}
-
-func (s *S) TestNewIterNoServerPresetErr(c *C) {
-	session, err := mgo.Dial("localhost:40001")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	data, err := bson.Marshal(bson.M{"a": 1})
-
-	coll := session.DB("mydb").C("mycoll")
-	iter := coll.NewIter(nil, []bson.Raw{{3, data}}, 42, fmt.Errorf("my error"))
-
-	var result struct{ A int }
-	ok := iter.Next(&result)
-	c.Assert(ok, Equals, true)
-	c.Assert(result.A, Equals, 1)
-
-	ok = iter.Next(&result)
-	c.Assert(ok, Equals, false)
-
-	c.Assert(iter.Err(), ErrorMatches, "my error")
-}
-
-// --------------------------------------------------------------------------
-// Some benchmarks that require a running database.
-
-func (s *S) BenchmarkFindIterRaw(c *C) {
-	session, err := mgo.Dial("localhost:40001")
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	coll := session.DB("mydb").C("mycoll")
-	doc := bson.D{
-		{"f2", "a short string"},
-		{"f3", bson.D{{"1", "one"}, {"2", 2.0}}},
-		{"f4", []string{"a", "b", "c", "d", "e", "f", "g"}},
-	}
-
-	for i := 0; i < c.N+1; i++ {
-		err := coll.Insert(doc)
-		c.Assert(err, IsNil)
-	}
-
-	session.SetBatch(c.N)
-
-	var raw bson.Raw
-	iter := coll.Find(nil).Iter()
-	iter.Next(&raw)
-	c.ResetTimer()
-	i := 0
-	for iter.Next(&raw) {
-		i++
-	}
-	c.StopTimer()
-	c.Assert(iter.Err(), IsNil)
-	c.Assert(i, Equals, c.N)
-}
diff --git a/Godeps/_workspace/src/gopkg.in/mgo.v2/socket.go b/Godeps/_workspace/src/gopkg.in/mgo.v2/socket.go
deleted file mode 100644
index f6882d501..000000000
--- a/Godeps/_workspace/src/gopkg.in/mgo.v2/socket.go
+++ /dev/null
@@ -1,677 +0,0 @@
-// mgo - MongoDB driver for Go
-//
-// Copyright (c) 2010-2012 - Gustavo Niemeyer <gustavo@niemeyer.net>
-//
-// 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 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.
-
-package mgo
-
-import (
-	"errors"
-	"net"
-	"sync"
-	"time"
-
-	"gopkg.in/mgo.v2/bson"
-)
-
-type replyFunc func(err error, reply *replyOp, docNum int, docData []byte)
-
-type mongoSocket struct {
-	sync.Mutex
-	server        *mongoServer // nil when cached
-	conn          net.Conn
-	timeout       time.Duration
-	addr          string // For debugging only.
-	nextRequestId uint32
-	replyFuncs    map[uint32]replyFunc
-	references    int
-	creds         []Credential
-	logout        []Credential
-	cachedNonce   string
-	gotNonce      sync.Cond
-	dead          error
-	serverInfo    *mongoServerInfo
-}
-
-type queryOpFlags uint32
-
-const (
-	_ queryOpFlags = 1 << iota
-	flagTailable
-	flagSlaveOk
-	flagLogReplay
-	flagNoCursorTimeout
-	flagAwaitData
-)
-
-type queryOp struct {
-	collection string
-	query      interface{}
-	skip       int32
-	limit      int32
-	selector   interface{}
-	flags      queryOpFlags
-	replyFunc  replyFunc
-
-	options    queryWrapper
-	hasOptions bool
-	serverTags []bson.D
-}
-
-type queryWrapper struct {
-	Query          interface{} "$query"
-	OrderBy        interface{} "$orderby,omitempty"
-	Hint           interface{} "$hint,omitempty"
-	Explain        bool        "$explain,omitempty"
-	Snapshot       bool        "$snapshot,omitempty"
-	ReadPreference bson.D      "$readPreference,omitempty"
-	MaxScan        int         "$maxScan,omitempty"
-	MaxTimeMS      int         "$maxTimeMS,omitempty"
-	Comment        string      "$comment,omitempty"
-}
-
-func (op *queryOp) finalQuery(socket *mongoSocket) interface{} {
-	if op.flags&flagSlaveOk != 0 && len(op.serverTags) > 0 && socket.ServerInfo().Mongos {
-		op.hasOptions = true
-		op.options.ReadPreference = bson.D{{"mode", "secondaryPreferred"}, {"tags", op.serverTags}}
-	}
-	if op.hasOptions {
-		if op.query == nil {
-			var empty bson.D
-			op.options.Query = empty
-		} else {
-			op.options.Query = op.query
-		}
-		debugf("final query is %#v\n", &op.options)
-		return &op.options
-	}
-	return op.query
-}
-
-type getMoreOp struct {
-	collection string
-	limit      int32
-	cursorId   int64
-	replyFunc  replyFunc
-}
-
-type replyOp struct {
-	flags     uint32
-	cursorId  int64
-	firstDoc  int32
-	replyDocs int32
-}
-
-type insertOp struct {
-	collection string        // "database.collection"
-	documents  []interface{} // One or more documents to insert
-	flags      uint32
-}
-
-type updateOp struct {
-	collection string // "database.collection"
-	selector   interface{}
-	update     interface{}
-	flags      uint32
-}
-
-type deleteOp struct {
-	collection string // "database.collection"
-	selector   interface{}
-	flags      uint32
-}
-
-type killCursorsOp struct {
-	cursorIds []int64
-}
-
-type requestInfo struct {
-	bufferPos int
-	replyFunc replyFunc
-}
-
-func newSocket(server *mongoServer, conn net.Conn, timeout time.Duration) *mongoSocket {
-	socket := &mongoSocket{
-		conn:       conn,
-		addr:       server.Addr,
-		server:     server,
-		replyFuncs: make(map[uint32]replyFunc),
-	}
-	socket.gotNonce.L = &socket.Mutex
-	if err := socket.InitialAcquire(server.Info(), timeout); err != nil {
-		panic("newSocket: InitialAcquire returned error: " + err.Error())
-	}
-	stats.socketsAlive(+1)
-	debugf("Socket %p to %s: initialized", socket, socket.addr)
-	socket.resetNonce()
-	go socket.readLoop()
-	return socket
-}
-
-// Server returns the server that the socket is associated with.
-// It returns nil while the socket is cached in its respective server.
-func (socket *mongoSocket) Server() *mongoServer {
-	socket.Lock()
-	server := socket.server
-	socket.Unlock()
-	return server
-}
-
-// ServerInfo returns details for the server at the time the socket
-// was initially acquired.
-func (socket *mongoSocket) ServerInfo() *mongoServerInfo {
-	socket.Lock()
-	serverInfo := socket.serverInfo
-	socket.Unlock()
-	return serverInfo
-}
-
-// InitialAcquire obtains the first reference to the socket, either
-// right after the connection is made or once a recycled socket is
-// being put back in use.
-func (socket *mongoSocket) InitialAcquire(serverInfo *mongoServerInfo, timeout time.Duration) error {
-	socket.Lock()
-	if socket.references > 0 {
-		panic("Socket acquired out of cache with references")
-	}
-	if socket.dead != nil {
-		dead := socket.dead
-		socket.Unlock()
-		return dead
-	}
-	socket.references++
-	socket.serverInfo = serverInfo
-	socket.timeout = timeout
-	stats.socketsInUse(+1)
-	stats.socketRefs(+1)
-	socket.Unlock()
-	return nil
-}
-
-// Acquire obtains an additional reference to the socket.
-// The socket will only be recycled when it's released as many
-// times as it's been acquired.
-func (socket *mongoSocket) Acquire() (info *mongoServerInfo) {
-	socket.Lock()
-	if socket.references == 0 {
-		panic("Socket got non-initial acquire with references == 0")
-	}
-	// We'll track references to dead sockets as well.
-	// Caller is still supposed to release the socket.
-	socket.references++
-	stats.socketRefs(+1)
-	serverInfo := socket.serverInfo
-	socket.Unlock()
-	return serverInfo
-}
-
-// Release decrements a socket reference. The socket will be
-// recycled once its released as many times as it's been acquired.
-func (socket *mongoSocket) Release() {
-	socket.Lock()
-	if socket.references == 0 {
-		panic("socket.Release() with references == 0")
-	}
-	socket.references--
-	stats.socketRefs(-1)
-	if socket.references == 0 {
-		stats.socketsInUse(-1)
-		server := socket.server
-		socket.Unlock()
-		socket.LogoutAll()
-		// If the socket is dead server is nil.
-		if server != nil {
-			server.RecycleSocket(socket)
-		}
-	} else {
-		socket.Unlock()
-	}
-}
-
-// SetTimeout changes the timeout used on socket operations.
-func (socket *mongoSocket) SetTimeout(d time.Duration) {
-	socket.Lock()
-	socket.timeout = d
-	socket.Unlock()
-}
-
-type deadlineType int
-
-const (
-	readDeadline  deadlineType = 1
-	writeDeadline deadlineType = 2
-)
-
-func (socket *mongoSocket) updateDeadline(which deadlineType) {
-	var when time.Time
-	if socket.timeout > 0 {
-		when = time.Now().Add(socket.timeout)
-	}
-	whichstr := ""
-	switch which {
-	case readDeadline | writeDeadline:
-		whichstr = "read/write"
-		socket.conn.SetDeadline(when)
-	case readDeadline:
-		whichstr = "read"
-		socket.conn.SetReadDeadline(when)
-	case writeDeadline:
-		whichstr = "write"
-		socket.conn.SetWriteDeadline(when)
-	default:
-		panic("invalid parameter to updateDeadline")
-	}
-	debugf("Socket %p to %s: updated %s deadline to %s ahead (%s)", socket, socket.addr, whichstr, socket.timeout, when)
-}
-
-// Close terminates the socket use.
-func (socket *mongoSocket) Close() {
-	socket.kill(errors.New("Closed explicitly"), false)
-}
-
-func (socket *mongoSocket) kill(err error, abend bool) {
-	socket.Lock()
-	if socket.dead != nil {
-		debugf("Socket %p to %s: killed again: %s (previously: %s)", socket, socket.addr, err.Error(), socket.dead.Error())
-		socket.Unlock()
-		return
-	}
-	logf("Socket %p to %s: closing: %s (abend=%v)", socket, socket.addr, err.Error(), abend)
-	socket.dead = err
-	socket.conn.Close()
-	stats.socketsAlive(-1)
-	replyFuncs := socket.replyFuncs
-	socket.replyFuncs = make(map[uint32]replyFunc)
-	server := socket.server
-	socket.server = nil
-	socket.gotNonce.Broadcast()
-	socket.Unlock()
-	for _, replyFunc := range replyFuncs {
-		logf("Socket %p to %s: notifying replyFunc of closed socket: %s", socket, socket.addr, err.Error())
-		replyFunc(err, nil, -1, nil)
-	}
-	if abend {
-		server.AbendSocket(socket)
-	}
-}
-
-func (socket *mongoSocket) SimpleQuery(op *queryOp) (data []byte, err error) {
-	var wait, change sync.Mutex
-	var replyDone bool
-	var replyData []byte
-	var replyErr error
-	wait.Lock()
-	op.replyFunc = func(err error, reply *replyOp, docNum int, docData []byte) {
-		change.Lock()
-		if !replyDone {
-			replyDone = true
-			replyErr = err
-			if err == nil {
-				replyData = docData
-			}
-		}
-		change.Unlock()
-		wait.Unlock()
-	}
-	err = socket.Query(op)
-	if err != nil {
-		return nil, err
-	}
-	wait.Lock()
-	change.Lock()
-	data = replyData
-	err = replyErr
-	change.Unlock()
-	return data, err
-}
-
-func (socket *mongoSocket) Query(ops ...interface{}) (err error) {
-
-	if lops := socket.flushLogout(); len(lops) > 0 {
-		ops = append(lops, ops...)
-	}
-
-	buf := make([]byte, 0, 256)
-
-	// Serialize operations synchronously to avoid interrupting
-	// other goroutines while we can't really be sending data.
-	// Also, record id positions so that we can compute request
-	// ids at once later with the lock already held.
-	requests := make([]requestInfo, len(ops))
-	requestCount := 0
-
-	for _, op := range ops {
-		debugf("Socket %p to %s: serializing op: %#v", socket, socket.addr, op)
-		start := len(buf)
-		var replyFunc replyFunc
-		switch op := op.(type) {
-
-		case *updateOp:
-			buf = addHeader(buf, 2001)
-			buf = addInt32(buf, 0) // Reserved
-			buf = addCString(buf, op.collection)
-			buf = addInt32(buf, int32(op.flags))
-			debugf("Socket %p to %s: serializing selector document: %#v", socket, socket.addr, op.selector)
-			buf, err = addBSON(buf, op.selector)
-			if err != nil {
-				return err
-			}
-			debugf("Socket %p to %s: serializing update document: %#v", socket, socket.addr, op.update)
-			buf, err = addBSON(buf, op.update)
-			if err != nil {
-				return err
-			}
-
-		case *insertOp:
-			buf = addHeader(buf, 2002)
-			buf = addInt32(buf, int32(op.flags))
-			buf = addCString(buf, op.collection)
-			for _, doc := range op.documents {
-				debugf("Socket %p to %s: serializing document for insertion: %#v", socket, socket.addr, doc)
-				buf, err = addBSON(buf, doc)
-				if err != nil {
-					return err
-				}
-			}
-
-		case *queryOp:
-			buf = addHeader(buf, 2004)
-			buf = addInt32(buf, int32(op.flags))
-			buf = addCString(buf, op.collection)
-			buf = addInt32(buf, op.skip)
-			buf = addInt32(buf, op.limit)
-			buf, err = addBSON(buf, op.finalQuery(socket))
-			if err != nil {
-				return err
-			}
-			if op.selector != nil {
-				buf, err = addBSON(buf, op.selector)
-				if err != nil {
-					return err
-				}
-			}
-			replyFunc = op.replyFunc
-
-		case *getMoreOp:
-			buf = addHeader(buf, 2005)
-			buf = addInt32(buf, 0) // Reserved
-			buf = addCString(buf, op.collection)
-			buf = addInt32(buf, op.limit)
-			buf = addInt64(buf, op.cursorId)
-			replyFunc = op.replyFunc
-
-		case *deleteOp:
-			buf = addHeader(buf, 2006)
-			buf = addInt32(buf, 0) // Reserved
-			buf = addCString(buf, op.collection)
-			buf = addInt32(buf, int32(op.flags))
-			debugf("Socket %p to %s: serializing selector document: %#v", socket, socket.addr, op.selector)
-			buf, err = addBSON(buf, op.selector)
-			if err != nil {
-				return err
-			}
-
-		case *killCursorsOp:
-			buf = addHeader(buf, 2007)
-			buf = addInt32(buf, 0) // Reserved
-			buf = addInt32(buf, int32(len(op.cursorIds)))
-			for _, cursorId := range op.cursorIds {
-				buf = addInt64(buf, cursorId)
-			}
-
-		default:
-			panic("internal error: unknown operation type")
-		}
-
-		setInt32(buf, start, int32(len(buf)-start))
-
-		if replyFunc != nil {
-			request := &requests[requestCount]
-			request.replyFunc = replyFunc
-			request.bufferPos = start
-			requestCount++
-		}
-	}
-
-	// Buffer is ready for the pipe.  Lock, allocate ids, and enqueue.
-
-	socket.Lock()
-	if socket.dead != nil {
-		dead := socket.dead
-		socket.Unlock()
-		debugf("Socket %p to %s: failing query, already closed: %s", socket, socket.addr, socket.dead.Error())
-		// XXX This seems necessary in case the session is closed concurrently
-		// with a query being performed, but it's not yet tested:
-		for i := 0; i != requestCount; i++ {
-			request := &requests[i]
-			if request.replyFunc != nil {
-				request.replyFunc(dead, nil, -1, nil)
-			}
-		}
-		return dead
-	}
-
-	wasWaiting := len(socket.replyFuncs) > 0
-
-	// Reserve id 0 for requests which should have no responses.
-	requestId := socket.nextRequestId + 1
-	if requestId == 0 {
-		requestId++
-	}
-	socket.nextRequestId = requestId + uint32(requestCount)
-	for i := 0; i != requestCount; i++ {
-		request := &requests[i]
-		setInt32(buf, request.bufferPos+4, int32(requestId))
-		socket.replyFuncs[requestId] = request.replyFunc
-		requestId++
-	}
-
-	debugf("Socket %p to %s: sending %d op(s) (%d bytes)", socket, socket.addr, len(ops), len(buf))
-	stats.sentOps(len(ops))
-
-	socket.updateDeadline(writeDeadline)
-	_, err = socket.conn.Write(buf)
-	if !wasWaiting && requestCount > 0 {
-		socket.updateDeadline(readDeadline)
-	}
-	socket.Unlock()
-	return err
-}
-
-func fill(r net.Conn, b []byte) error {
-	l := len(b)
-	n, err := r.Read(b)
-	for n != l && err == nil {
-		var ni int
-		ni, err = r.Read(b[n:])
-		n += ni
-	}
-	return err
-}
-
-// Estimated minimum cost per socket: 1 goroutine + memory for the largest
-// document ever seen.
-func (socket *mongoSocket) readLoop() {
-	p := make([]byte, 36) // 16 from header + 20 from OP_REPLY fixed fields
-	s := make([]byte, 4)
-	conn := socket.conn // No locking, conn never changes.
-	for {
-		// XXX Handle timeouts, , etc
-		err := fill(conn, p)
-		if err != nil {
-			socket.kill(err, true)
-			return
-		}
-
-		totalLen := getInt32(p, 0)
-		responseTo := getInt32(p, 8)
-		opCode := getInt32(p, 12)
-
-		// Don't use socket.server.Addr here.  socket is not
-		// locked and socket.server may go away.
-		debugf("Socket %p to %s: got reply (%d bytes)", socket, socket.addr, totalLen)
-
-		_ = totalLen
-
-		if opCode != 1 {
-			socket.kill(errors.New("opcode != 1, corrupted data?"), true)
-			return
-		}
-
-		reply := replyOp{
-			flags:     uint32(getInt32(p, 16)),
-			cursorId:  getInt64(p, 20),
-			firstDoc:  getInt32(p, 28),
-			replyDocs: getInt32(p, 32),
-		}
-
-		stats.receivedOps(+1)
-		stats.receivedDocs(int(reply.replyDocs))
-
-		socket.Lock()
-		replyFunc, ok := socket.replyFuncs[uint32(responseTo)]
-		if ok {
-			delete(socket.replyFuncs, uint32(responseTo))
-		}
-		socket.Unlock()
-
-		if replyFunc != nil && reply.replyDocs == 0 {
-			replyFunc(nil, &reply, -1, nil)
-		} else {
-			for i := 0; i != int(reply.replyDocs); i++ {
-				err := fill(conn, s)
-				if err != nil {
-					if replyFunc != nil {
-						replyFunc(err, nil, -1, nil)
-					}
-					socket.kill(err, true)
-					return
-				}
-
-				b := make([]byte, int(getInt32(s, 0)))
-
-				// copy(b, s) in an efficient way.
-				b[0] = s[0]
-				b[1] = s[1]
-				b[2] = s[2]
-				b[3] = s[3]
-
-				err = fill(conn, b[4:])
-				if err != nil {
-					if replyFunc != nil {
-						replyFunc(err, nil, -1, nil)
-					}
-					socket.kill(err, true)
-					return
-				}
-
-				if globalDebug && globalLogger != nil {
-					m := bson.M{}
-					if err := bson.Unmarshal(b, m); err == nil {
-						debugf("Socket %p to %s: received document: %#v", socket, socket.addr, m)
-					}
-				}
-
-				if replyFunc != nil {
-					replyFunc(nil, &reply, i, b)
-				}
-
-				// XXX Do bound checking against totalLen.
-			}
-		}
-
-		socket.Lock()
-		if len(socket.replyFuncs) == 0 {
-			// Nothing else to read for now. Disable deadline.
-			socket.conn.SetReadDeadline(time.Time{})
-		} else {
-			socket.updateDeadline(readDeadline)
-		}
-		socket.Unlock()
-
-		// XXX Do bound checking against totalLen.
-	}
-}
-
-var emptyHeader = []byte{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
-
-func addHeader(b []byte, opcode int) []byte {
-	i := len(b)
-	b = append(b, emptyHeader...)
-	// Enough for current opcodes.
-	b[i+12] = byte(opcode)
-	b[i+13] = byte(opcode >> 8)
-	return b
-}
-
-func addInt32(b []byte, i int32) []byte {
-	return append(b, byte(i), byte(i>>8), byte(i>>16), byte(i>>24))
-}
-
-func addInt64(b []byte, i int64) []byte {
-	return append(b, byte(i), byte(i>>8), byte(i>>16), byte(i>>24),
-		byte(i>>32), byte(i>>40), byte(i>>48), byte(i>>56))
-}
-
-func addCString(b []byte, s string) []byte {
-	b = append(b, []byte(s)...)
-	b = append(b, 0)
-	return b
-}
-
-func addBSON(b []byte, doc interface{}) ([]byte, error) {
-	if doc == nil {
-		return append(b, 5, 0, 0, 0, 0), nil
-	}
-	data, err := bson.Marshal(doc)
-	if err != nil {
-		return b, err
-	}
-	return append(b, data...), nil
-}
-
-func setInt32(b []byte, pos int, i int32) {
-	b[pos] = byte(i)
-	b[pos+1] = byte(i >> 8)
-	b[pos+2] = byte(i >> 16)
-	b[pos+3] = byte(i >> 24)
-}
-
-func getInt32(b []byte, pos int) int32 {
-	return (int32(b[pos+0])) |
-		(int32(b[pos+1]) << 8) |
-		(int32(b[pos+2]) << 16) |
-		(int32(b[pos+3]) << 24)
-}
-
-func getInt64(b []byte, pos int) int64 {
-	return (int64(b[pos+0])) |
-		(int64(b[pos+1]) << 8) |
-		(int64(b[pos+2]) << 16) |
-		(int64(b[pos+3]) << 24) |
-		(int64(b[pos+4]) << 32) |
-		(int64(b[pos+5]) << 40) |
-		(int64(b[pos+6]) << 48) |
-		(int64(b[pos+7]) << 56)
-}
diff --git a/Godeps/_workspace/src/gopkg.in/mgo.v2/stats.go b/Godeps/_workspace/src/gopkg.in/mgo.v2/stats.go
deleted file mode 100644
index 59723e60c..000000000
--- a/Godeps/_workspace/src/gopkg.in/mgo.v2/stats.go
+++ /dev/null
@@ -1,147 +0,0 @@
-// mgo - MongoDB driver for Go
-//
-// Copyright (c) 2010-2012 - Gustavo Niemeyer <gustavo@niemeyer.net>
-//
-// 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 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.
-
-package mgo
-
-import (
-	"sync"
-)
-
-var stats *Stats
-var statsMutex sync.Mutex
-
-func SetStats(enabled bool) {
-	statsMutex.Lock()
-	if enabled {
-		if stats == nil {
-			stats = &Stats{}
-		}
-	} else {
-		stats = nil
-	}
-	statsMutex.Unlock()
-}
-
-func GetStats() (snapshot Stats) {
-	statsMutex.Lock()
-	snapshot = *stats
-	statsMutex.Unlock()
-	return
-}
-
-func ResetStats() {
-	statsMutex.Lock()
-	debug("Resetting stats")
-	old := stats
-	stats = &Stats{}
-	// These are absolute values:
-	stats.Clusters = old.Clusters
-	stats.SocketsInUse = old.SocketsInUse
-	stats.SocketsAlive = old.SocketsAlive
-	stats.SocketRefs = old.SocketRefs
-	statsMutex.Unlock()
-	return
-}
-
-type Stats struct {
-	Clusters     int
-	MasterConns  int
-	SlaveConns   int
-	SentOps      int
-	ReceivedOps  int
-	ReceivedDocs int
-	SocketsAlive int
-	SocketsInUse int
-	SocketRefs   int
-}
-
-func (stats *Stats) cluster(delta int) {
-	if stats != nil {
-		statsMutex.Lock()
-		stats.Clusters += delta
-		statsMutex.Unlock()
-	}
-}
-
-func (stats *Stats) conn(delta int, master bool) {
-	if stats != nil {
-		statsMutex.Lock()
-		if master {
-			stats.MasterConns += delta
-		} else {
-			stats.SlaveConns += delta
-		}
-		statsMutex.Unlock()
-	}
-}
-
-func (stats *Stats) sentOps(delta int) {
-	if stats != nil {
-		statsMutex.Lock()
-		stats.SentOps += delta
-		statsMutex.Unlock()
-	}
-}
-
-func (stats *Stats) receivedOps(delta int) {
-	if stats != nil {
-		statsMutex.Lock()
-		stats.ReceivedOps += delta
-		statsMutex.Unlock()
-	}
-}
-
-func (stats *Stats) receivedDocs(delta int) {
-	if stats != nil {
-		statsMutex.Lock()
-		stats.ReceivedDocs += delta
-		statsMutex.Unlock()
-	}
-}
-
-func (stats *Stats) socketsInUse(delta int) {
-	if stats != nil {
-		statsMutex.Lock()
-		stats.SocketsInUse += delta
-		statsMutex.Unlock()
-	}
-}
-
-func (stats *Stats) socketsAlive(delta int) {
-	if stats != nil {
-		statsMutex.Lock()
-		stats.SocketsAlive += delta
-		statsMutex.Unlock()
-	}
-}
-
-func (stats *Stats) socketRefs(delta int) {
-	if stats != nil {
-		statsMutex.Lock()
-		stats.SocketRefs += delta
-		statsMutex.Unlock()
-	}
-}
diff --git a/Godeps/_workspace/src/gopkg.in/mgo.v2/suite_test.go b/Godeps/_workspace/src/gopkg.in/mgo.v2/suite_test.go
deleted file mode 100644
index 140e5a09a..000000000
--- a/Godeps/_workspace/src/gopkg.in/mgo.v2/suite_test.go
+++ /dev/null
@@ -1,254 +0,0 @@
-// mgo - MongoDB driver for Go
-//
-// Copyright (c) 2010-2012 - Gustavo Niemeyer <gustavo@niemeyer.net>
-//
-// 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 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.
-
-package mgo_test
-
-import (
-	"errors"
-	"flag"
-	"fmt"
-	"net"
-	"os/exec"
-	"runtime"
-	"strconv"
-	"testing"
-	"time"
-
-	. "gopkg.in/check.v1"
-	"gopkg.in/mgo.v2"
-	"gopkg.in/mgo.v2/bson"
-)
-
-var fast = flag.Bool("fast", false, "Skip slow tests")
-
-type M bson.M
-
-type cLogger C
-
-func (c *cLogger) Output(calldepth int, s string) error {
-	ns := time.Now().UnixNano()
-	t := float64(ns%100e9) / 1e9
-	((*C)(c)).Logf("[LOG] %.05f %s", t, s)
-	return nil
-}
-
-func TestAll(t *testing.T) {
-	TestingT(t)
-}
-
-type S struct {
-	session *mgo.Session
-	stopped bool
-	build   mgo.BuildInfo
-	frozen  []string
-}
-
-func (s *S) versionAtLeast(v ...int) (result bool) {
-	for i := range v {
-		if i == len(s.build.VersionArray) {
-			return false
-		}
-		if s.build.VersionArray[i] != v[i] {
-			return s.build.VersionArray[i] >= v[i]
-		}
-	}
-	return true
-}
-
-var _ = Suite(&S{})
-
-func (s *S) SetUpSuite(c *C) {
-	mgo.SetDebug(true)
-	mgo.SetStats(true)
-	s.StartAll()
-
-	session, err := mgo.Dial("localhost:40001")
-	c.Assert(err, IsNil)
-	s.build, err = session.BuildInfo()
-	c.Check(err, IsNil)
-	session.Close()
-}
-
-func (s *S) SetUpTest(c *C) {
-	err := run("mongo --nodb testdb/dropall.js")
-	if err != nil {
-		panic(err.Error())
-	}
-	mgo.SetLogger((*cLogger)(c))
-	mgo.ResetStats()
-}
-
-func (s *S) TearDownTest(c *C) {
-	if s.stopped {
-		s.StartAll()
-	}
-	for _, host := range s.frozen {
-		if host != "" {
-			s.Thaw(host)
-		}
-	}
-	var stats mgo.Stats
-	for i := 0; ; i++ {
-		stats = mgo.GetStats()
-		if stats.SocketsInUse == 0 && stats.SocketsAlive == 0 {
-			break
-		}
-		if i == 20 {
-			c.Fatal("Test left sockets in a dirty state")
-		}
-		c.Logf("Waiting for sockets to die: %d in use, %d alive", stats.SocketsInUse, stats.SocketsAlive)
-		time.Sleep(500 * time.Millisecond)
-	}
-	for i := 0; ; i++ {
-		stats = mgo.GetStats()
-		if stats.Clusters == 0 {
-			break
-		}
-		if i == 60 {
-			c.Fatal("Test left clusters alive")
-		}
-		c.Logf("Waiting for clusters to die: %d alive", stats.Clusters)
-		time.Sleep(1 * time.Second)
-	}
-}
-
-func (s *S) Stop(host string) {
-	// Give a moment for slaves to sync and avoid getting rollback issues.
-	panicOnWindows()
-	time.Sleep(2 * time.Second)
-	err := run("cd _testdb && supervisorctl stop " + supvName(host))
-	if err != nil {
-		panic(err)
-	}
-	s.stopped = true
-}
-
-func (s *S) pid(host string) int {
-	output, err := exec.Command("lsof", "-iTCP:"+hostPort(host), "-sTCP:LISTEN", "-Fp").CombinedOutput()
-	if err != nil {
-		panic(err)
-	}
-	pidstr := string(output[1 : len(output)-1])
-	pid, err := strconv.Atoi(pidstr)
-	if err != nil {
-		panic("cannot convert pid to int: " + pidstr)
-	}
-	return pid
-}
-
-func (s *S) Freeze(host string) {
-	err := stop(s.pid(host))
-	if err != nil {
-		panic(err)
-	}
-	s.frozen = append(s.frozen, host)
-}
-
-func (s *S) Thaw(host string) {
-	err := cont(s.pid(host))
-	if err != nil {
-		panic(err)
-	}
-	for i, frozen := range s.frozen {
-		if frozen == host {
-			s.frozen[i] = ""
-		}
-	}
-}
-
-func (s *S) StartAll() {
-	// Restart any stopped nodes.
-	run("cd _testdb && supervisorctl start all")
-	err := run("cd testdb && mongo --nodb wait.js")
-	if err != nil {
-		panic(err)
-	}
-	s.stopped = false
-}
-
-func run(command string) error {
-	var output []byte
-	var err error
-	if runtime.GOOS == "windows" {
-		output, err = exec.Command("cmd", "/C", command).CombinedOutput()
-	} else {
-		output, err = exec.Command("/bin/sh", "-c", command).CombinedOutput()
-	}
-
-	if err != nil {
-		msg := fmt.Sprintf("Failed to execute: %s: %s\n%s", command, err.Error(), string(output))
-		return errors.New(msg)
-	}
-	return nil
-}
-
-var supvNames = map[string]string{
-	"40001": "db1",
-	"40002": "db2",
-	"40011": "rs1a",
-	"40012": "rs1b",
-	"40013": "rs1c",
-	"40021": "rs2a",
-	"40022": "rs2b",
-	"40023": "rs2c",
-	"40031": "rs3a",
-	"40032": "rs3b",
-	"40033": "rs3c",
-	"40041": "rs4a",
-	"40101": "cfg1",
-	"40102": "cfg2",
-	"40103": "cfg3",
-	"40201": "s1",
-	"40202": "s2",
-	"40203": "s3",
-}
-
-// supvName returns the supervisord name for the given host address.
-func supvName(host string) string {
-	host, port, err := net.SplitHostPort(host)
-	if err != nil {
-		panic(err)
-	}
-	name, ok := supvNames[port]
-	if !ok {
-		panic("Unknown host: " + host)
-	}
-	return name
-}
-
-func hostPort(host string) string {
-	_, port, err := net.SplitHostPort(host)
-	if err != nil {
-		panic(err)
-	}
-	return port
-}
-
-func panicOnWindows() {
-	if runtime.GOOS == "windows" {
-		panic("the test suite is not yet fully supported on Windows")
-	}
-}
diff --git a/Godeps/_workspace/src/gopkg.in/mgo.v2/syscall_test.go b/Godeps/_workspace/src/gopkg.in/mgo.v2/syscall_test.go
deleted file mode 100644
index b8bbd7b34..000000000
--- a/Godeps/_workspace/src/gopkg.in/mgo.v2/syscall_test.go
+++ /dev/null
@@ -1,15 +0,0 @@
-// +build !windows
-
-package mgo_test
-
-import (
-	"syscall"
-)
-
-func stop(pid int) (err error) {
-	return syscall.Kill(pid, syscall.SIGSTOP)
-}
-
-func cont(pid int) (err error) {
-	return syscall.Kill(pid, syscall.SIGCONT)
-}
diff --git a/Godeps/_workspace/src/gopkg.in/mgo.v2/syscall_windows_test.go b/Godeps/_workspace/src/gopkg.in/mgo.v2/syscall_windows_test.go
deleted file mode 100644
index f2deaca86..000000000
--- a/Godeps/_workspace/src/gopkg.in/mgo.v2/syscall_windows_test.go
+++ /dev/null
@@ -1,11 +0,0 @@
-package mgo_test
-
-func stop(pid int) (err error) {
-	panicOnWindows() // Always does.
-	return nil
-}
-
-func cont(pid int) (err error) {
-	panicOnWindows() // Always does.
-	return nil
-}
diff --git a/Godeps/_workspace/src/gopkg.in/mgo.v2/testdb/client.pem b/Godeps/_workspace/src/gopkg.in/mgo.v2/testdb/client.pem
deleted file mode 100644
index cc57eec7a..000000000
--- a/Godeps/_workspace/src/gopkg.in/mgo.v2/testdb/client.pem
+++ /dev/null
@@ -1,44 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEpAIBAAKCAQEAwE2sl8YeTTSetwo9kykJ5mCZ/FtfPtn/0X4nOlTM2Qc/uWzA
-sjSYoSV4UkuOiWjKQQH2EDeXaltshOo7F0oCY5ozVeQe+phe987iKTvLtf7NoXJD
-KqNqR4Kb4ylbCrEky7+Xvw6yrrqw8qgWy+9VsrilR3q8LsETE9SBMtfp3BUaaNQp
-peNm+iAhx3uZSv3mdzSLFSA/o61kAyG0scLExYDjo/7xyMNQoloLvNmx4Io160+y
-lOz077/qqU620tmuDLRz1QdxK/bptmXTnsBCRxl+U8nzbwVZgWFENhXplbcN+SjN
-LhdnvTiU2qFhgZmc7ZtCKdPIpx3W6pH9bx7kTwIDAQABAoIBAQCOQygyo8NY9FuS
-J8ZDrvF+9+oS8fm1QorpDT2x/ngI+j7fSyAG9bgQRusLXpAVAWvWyb+iYa3nZbkT
-X0DVys+XpcTifr+YPc7L3sYbIPxkKBsxm5kq2vfN7Uart7V9ZG1HOfblxdbUQpKT
-AVzUA7vPWqATEC5VHEqjuerWlTqRr9YLZE/nkE7ICLISqdl4WDYfUYJwoXWfYkXQ
-Lfl5Qh2leyri9S3urvDrhnURTQ1lM182IbTRA+9rUiFzsRW+9U4HPY7Ao2Itp8dr
-GRP4rcq4TP+NcF0Ky64cNfKXCWmwqTBRFYAlTD6gwjN/s2BzvWD/2nlnc0DYAXrB
-TgFCPk7xAoGBAOwuHICwwTxtzrdWjuRGU3RxL4eLEXedtL8yon/yPci3e+8eploX
-1Fp0rEK2gIGDp/X8DiOtrKXih8XPusCwE/I3EvjHdI0RylLZXTPOp1Ei21dXRsiV
-YxcF+d5s11q5tJtF+5ISUeIz2iSc9Z2LBnb8JDK1jcCRa5Q212q3ZWW5AoGBANBw
-9CoMbxINLG1q0NvOOSwMKDk2OB+9JbQ5lwF4ijZl2I6qRoOCzQ3lBs0Qv/AeBjNR
-SerDs2+eWnIBUbgSdiqcOKnXAI/Qbl1IkVFYV/2g9m6dgu1fNWNBv8NIYDHCLfDx
-W3fpO5JMf+iE5XC4XqCfSBIME2yxPSGQjal6tB5HAoGAddYDzolhv/6hVoPPQ0F7
-PeuC5UOTcXSzy3k97kw0W0KAiStnoCengYIYuChKMVQ4ptgdTdvG+fTt/NnJuX2g
-Vgb4ZjtNgVzQ70kX4VNH04lqmkcnP8iY6dHHexwezls9KwNdouGVDSEFw6K0QOgu
-T4s5nDtNADkNzaMXE11xL7ECgYBoML3rstFmTY1ymB0Uck3jtaP5jR+axdpt7weL
-Zax4qooILhcXL6++DUhMAt5ecTOaPTzci7xKw/Xj3MLzZs8IV5R/WQhf2sj/+gEh
-jy5UijwEaNmEO74dAkWPoMLsvGpocMzO8JeldnXNTXi+0noCgfvtgXnIMAQlnfMh
-z0LviwKBgQCg5KR9JC4iuKses7Kfv2YelcO8vOZkRzBu3NdRWMsiJQC+qfetgd57
-RjRjlRWd1WCHJ5Kmx3hkUaZZOrX5knqfsRW3Nl0I74xgWl7Bli2eSJ9VWl59bcd6
-DqphhY7/gcW+QZlhXpnqbf0W8jB2gPhTYERyCBoS9LfhZWZu/11wuQ==
------END RSA PRIVATE KEY-----
------BEGIN CERTIFICATE-----
-MIICyTCCAjKgAwIBAgIBATANBgkqhkiG9w0BAQUFADBcMQswCQYDVQQGEwJHTzEM
-MAoGA1UECBMDTUdPMQwwCgYDVQQHEwNNR08xDDAKBgNVBAoTA01HTzEPMA0GA1UE
-CxMGU2VydmVyMRIwEAYDVQQDEwlsb2NhbGhvc3QwHhcNMTQwOTI0MTQwMzUzWhcN
-MTUwOTI0MTQwMzUzWjBcMQswCQYDVQQGEwJHTzEMMAoGA1UECBMDTUdPMQwwCgYD
-VQQHEwNNR08xDDAKBgNVBAoTA01HTzEPMA0GA1UECxMGQ2xpZW50MRIwEAYDVQQD
-Ewlsb2NhbGhvc3QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDATayX
-xh5NNJ63Cj2TKQnmYJn8W18+2f/Rfic6VMzZBz+5bMCyNJihJXhSS46JaMpBAfYQ
-N5dqW2yE6jsXSgJjmjNV5B76mF73zuIpO8u1/s2hckMqo2pHgpvjKVsKsSTLv5e/
-DrKuurDyqBbL71WyuKVHerwuwRMT1IEy1+ncFRpo1Cml42b6ICHHe5lK/eZ3NIsV
-ID+jrWQDIbSxwsTFgOOj/vHIw1CiWgu82bHgijXrT7KU7PTvv+qpTrbS2a4MtHPV
-B3Er9um2ZdOewEJHGX5TyfNvBVmBYUQ2FemVtw35KM0uF2e9OJTaoWGBmZztm0Ip
-08inHdbqkf1vHuRPAgMBAAGjFzAVMBMGA1UdJQQMMAoGCCsGAQUFBwMCMA0GCSqG
-SIb3DQEBBQUAA4GBAJZD7idSIRzhGlJYARPKWnX2CxD4VVB0F5cH5Mlc2YnoUSU/
-rKuPZFuOYND3awKqez6K3rNb3+tQmNitmoOT8ImmX1uJKBo5w9tuo4B2MmLQcPMk
-3fhPePuQCjtlArSmKVrNTrYPkyB9NwKS6q0+FzseFTw9ZJUIKiO9sSjMe+HP
------END CERTIFICATE-----
diff --git a/Godeps/_workspace/src/gopkg.in/mgo.v2/testdb/dropall.js b/Godeps/_workspace/src/gopkg.in/mgo.v2/testdb/dropall.js
deleted file mode 100644
index 2059349db..000000000
--- a/Godeps/_workspace/src/gopkg.in/mgo.v2/testdb/dropall.js
+++ /dev/null
@@ -1,66 +0,0 @@
-
-var ports = [40001, 40002, 40011, 40012, 40013, 40021, 40022, 40023, 40041, 40101, 40102, 40103, 40201, 40202, 40203]
-var auth = [40002, 40103, 40203, 40031]
-var db1 = new Mongo("localhost:40001")
-
-if (db1.getDB("admin").serverBuildInfo().OpenSSLVersion) {
-    ports.push(40003)
-    auth.push(40003)
-}
-
-for (var i in ports) {
-    var port = ports[i]
-    var server = "localhost:" + port
-    var mongo = new Mongo("localhost:" + port)
-    var admin = mongo.getDB("admin")
-
-    for (var j in auth) {
-        if (auth[j] == port) {
-            admin.auth("root", "rapadura")
-            admin.system.users.find().forEach(function(u) {
-                if (u.user == "root" || u.user == "reader") {
-                        return;
-                }
-                if (typeof admin.dropUser == "function") {
-                    mongo.getDB(u.db).dropUser(u.user);
-                } else {
-                    admin.removeUser(u.user);
-                }
-            })
-            break
-        }
-    }
-    var result = admin.runCommand({"listDatabases": 1})
-    for (var j = 0; j != 100; j++) {
-        if (typeof result.databases != "undefined" || notMaster(result)) {
-            break
-        }
-        result = admin.runCommand({"listDatabases": 1})
-    }
-    if (notMaster(result)) {
-        continue
-    }
-    if (typeof result.databases == "undefined") {
-        print("Could not list databases. Command result:")
-        print(JSON.stringify(result))
-        quit(12)
-    }
-    var dbs = result.databases
-    for (var j = 0; j != dbs.length; j++) {
-        var db = dbs[j]
-        switch (db.name) {
-        case "admin":
-        case "local":
-        case "config":
-            break
-        default:
-            mongo.getDB(db.name).dropDatabase()
-        }
-    }
-}
-
-function notMaster(result) {
-        return typeof result.errmsg != "undefined" && result.errmsg.indexOf("not master") >= 0
-}
-
-// vim:ts=4:sw=4:et
diff --git a/Godeps/_workspace/src/gopkg.in/mgo.v2/testdb/init.js b/Godeps/_workspace/src/gopkg.in/mgo.v2/testdb/init.js
deleted file mode 100644
index 8e5d80115..000000000
--- a/Godeps/_workspace/src/gopkg.in/mgo.v2/testdb/init.js
+++ /dev/null
@@ -1,110 +0,0 @@
-//var settings = {heartbeatSleep: 0.05, heartbeatTimeout: 0.5}
-var settings = {};
-
-// We know the master of the first set (pri=1), but not of the second.
-var rs1cfg = {_id: "rs1",
-              members: [{_id: 1, host: "127.0.0.1:40011", priority: 1, tags: {rs1: "a"}},
-                        {_id: 2, host: "127.0.0.1:40012", priority: 0, tags: {rs1: "b"}},
-                        {_id: 3, host: "127.0.0.1:40013", priority: 0, tags: {rs1: "c"}}],
-              settings: settings}
-var rs2cfg = {_id: "rs2",
-              members: [{_id: 1, host: "127.0.0.1:40021", priority: 1, tags: {rs2: "a"}},
-                        {_id: 2, host: "127.0.0.1:40022", priority: 1, tags: {rs2: "b"}},
-                        {_id: 3, host: "127.0.0.1:40023", priority: 1, tags: {rs2: "c"}}],
-              settings: settings}
-var rs3cfg = {_id: "rs3",
-              members: [{_id: 1, host: "127.0.0.1:40031", priority: 1, tags: {rs3: "a"}},
-                        {_id: 2, host: "127.0.0.1:40032", priority: 1, tags: {rs3: "b"}},
-                        {_id: 3, host: "127.0.0.1:40033", priority: 1, tags: {rs3: "c"}}],
-              settings: settings}
-
-for (var i = 0; i != 60; i++) {
-	try {
-		db1 = new Mongo("127.0.0.1:40001").getDB("admin")
-		db2 = new Mongo("127.0.0.1:40002").getDB("admin")
-		rs1a = new Mongo("127.0.0.1:40011").getDB("admin")
-		rs2a = new Mongo("127.0.0.1:40021").getDB("admin")
-		rs3a = new Mongo("127.0.0.1:40031").getDB("admin")
-		break
-	} catch(err) {
-		print("Can't connect yet...")
-	}
-	sleep(1000)
-}
-
-function hasSSL() {
-    return Boolean(db1.serverBuildInfo().OpenSSLVersion)
-}
-
-rs1a.runCommand({replSetInitiate: rs1cfg})
-rs2a.runCommand({replSetInitiate: rs2cfg})
-rs3a.runCommand({replSetInitiate: rs3cfg})
-
-function configShards() {
-    cfg1 = new Mongo("127.0.0.1:40201").getDB("admin")
-    cfg1.runCommand({addshard: "127.0.0.1:40001"})
-    cfg1.runCommand({addshard: "rs1/127.0.0.1:40011"})
-
-    cfg2 = new Mongo("127.0.0.1:40202").getDB("admin")
-    cfg2.runCommand({addshard: "rs2/127.0.0.1:40021"})
-
-    cfg3 = new Mongo("127.0.0.1:40203").getDB("admin")
-    cfg3.runCommand({addshard: "rs3/127.0.0.1:40031"})
-}
-
-function configAuth() {
-    var addrs = ["127.0.0.1:40002", "127.0.0.1:40203", "127.0.0.1:40031"]
-    if (hasSSL()) {
-        addrs.push("127.0.0.1:40003")
-    }
-    for (var i in addrs) {
-        var db = new Mongo(addrs[i]).getDB("admin")
-        var v = db.serverBuildInfo().versionArray
-        if (v < [2, 5]) {
-            db.addUser("root", "rapadura")
-        } else {
-            db.createUser({user: "root", pwd: "rapadura", roles: ["root"]})
-        }
-        db.auth("root", "rapadura")
-        if (v >= [2, 6]) {
-            db.createUser({user: "reader", pwd: "rapadura", roles: ["readAnyDatabase"]})
-        } else if (v >= [2, 4]) {
-            db.addUser({user: "reader", pwd: "rapadura", roles: ["readAnyDatabase"]})
-        } else {
-            db.addUser("reader", "rapadura", true)
-        }
-    }
-}
-
-function countHealthy(rs) {
-    var status = rs.runCommand({replSetGetStatus: 1})
-    var count = 0
-    if (typeof status.members != "undefined") {
-        for (var i = 0; i != status.members.length; i++) {
-            var m = status.members[i]
-            if (m.health == 1 && (m.state == 1 || m.state == 2)) {
-                count += 1
-            }
-        }
-    }
-    return count
-}
-
-var totalRSMembers = rs1cfg.members.length + rs2cfg.members.length + rs3cfg.members.length
-
-for (var i = 0; i != 60; i++) {
-    var count = countHealthy(rs1a) + countHealthy(rs2a) + countHealthy(rs3a)
-    print("Replica sets have", count, "healthy nodes.")
-    if (count == totalRSMembers) {
-        sleep(2000)
-        configShards()
-        configAuth()
-        quit(0)
-    }
-    sleep(1000)
-}
-
-print("Replica sets didn't sync up properly.")
-quit(12)
-
-// vim:ts=4:sw=4:et
diff --git a/Godeps/_workspace/src/gopkg.in/mgo.v2/testdb/server.pem b/Godeps/_workspace/src/gopkg.in/mgo.v2/testdb/server.pem
deleted file mode 100644
index 16fbef16b..000000000
--- a/Godeps/_workspace/src/gopkg.in/mgo.v2/testdb/server.pem
+++ /dev/null
@@ -1,33 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIC+DCCAmGgAwIBAgIJAJ5pBAq2HXAsMA0GCSqGSIb3DQEBBQUAMFwxCzAJBgNV
-BAYTAkdPMQwwCgYDVQQIEwNNR08xDDAKBgNVBAcTA01HTzEMMAoGA1UEChMDTUdP
-MQ8wDQYDVQQLEwZTZXJ2ZXIxEjAQBgNVBAMTCWxvY2FsaG9zdDAeFw0xNDA5MjQx
-MzUxMTBaFw0xNTA5MjQxMzUxMTBaMFwxCzAJBgNVBAYTAkdPMQwwCgYDVQQIEwNN
-R08xDDAKBgNVBAcTA01HTzEMMAoGA1UEChMDTUdPMQ8wDQYDVQQLEwZTZXJ2ZXIx
-EjAQBgNVBAMTCWxvY2FsaG9zdDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-pQ5wO2L23xMI4PzpVt/Ftvez82IvA9amwr3fUd7RjlYwiFsFeMnG24a4CUoOeKF0
-fpQWc9rmCs0EeP5ofZ2otOsfxoVWXZAZWdgauuwlYB6EeFaAMH3fxVH3IiH+21RR
-q2w9sH/s4fqh5stavUfyPdVmCcb8NW0jD8jlqniJL0kCAwEAAaOBwTCBvjAdBgNV
-HQ4EFgQUjyVWGMHBrmPDGwCY5VusHsKIpzIwgY4GA1UdIwSBhjCBg4AUjyVWGMHB
-rmPDGwCY5VusHsKIpzKhYKReMFwxCzAJBgNVBAYTAkdPMQwwCgYDVQQIEwNNR08x
-DDAKBgNVBAcTA01HTzEMMAoGA1UEChMDTUdPMQ8wDQYDVQQLEwZTZXJ2ZXIxEjAQ
-BgNVBAMTCWxvY2FsaG9zdIIJAJ5pBAq2HXAsMAwGA1UdEwQFMAMBAf8wDQYJKoZI
-hvcNAQEFBQADgYEAa65TgDKp3SRUDNAILSuQOCEbenWh/DMPL4vTVgo/Dxd4emoO
-7i8/4HMTa0XeYIVbAsxO+dqtxqt32IcV7DurmQozdUZ7q0ueJRXon6APnCN0IqPC
-sF71w63xXfpmnvTAfQXi7x6TUAyAQ2nScHExAjzc000DF1dO/6+nIINqNQE=
------END CERTIFICATE-----
------BEGIN RSA PRIVATE KEY-----
-MIICWwIBAAKBgQClDnA7YvbfEwjg/OlW38W297PzYi8D1qbCvd9R3tGOVjCIWwV4
-ycbbhrgJSg54oXR+lBZz2uYKzQR4/mh9nai06x/GhVZdkBlZ2Bq67CVgHoR4VoAw
-fd/FUfciIf7bVFGrbD2wf+zh+qHmy1q9R/I91WYJxvw1bSMPyOWqeIkvSQIDAQAB
-AoGABA9S22MXx2zkbwRJiQWAC3wURQxJM8L33xpkf9MHPIUKNJBolgwAhC3QIQpd
-SMJP5z0lQDxGJEXesksvrsdN+vsgbleRfQsAIcY/rEhr9h8m6auM08f+69oIX32o
-aTOWJJRofjbgzE5c/RijqhIaYGdq54a0EE9mAaODwZoa2/ECQQDRGrIRI5L3pdRA
-yifDKNjvAFOk6TbdGe+J9zHFw4F7bA2In/b+rno9vrj+EanOevD8LRLzeFshzXrG
-WQFzZ69/AkEAyhLSY7WNiQTeJWCwXawVnoSl5AMSRYFA/A2sEUokfORR5BS7gqvL
-mmEKmvslnZp5qlMtM4AyrW2OaoGvE6sFNwJACB3xK5kl61cUli9Cu+CqCx0IIi6r
-YonPMpvV4sdkD1ZycAtFmz1KoXr102b8IHfFQwS855aUcwt26Jwr4j70IQJAXv9+
-PTXq9hF9xiCwiTkPaNh/jLQM8PQU8uoSjIZIpRZJkWpVxNay/z7D15xeULuAmxxD
-UcThDjtFCrkw75Qk/QJAFfcM+5r31R1RrBGM1QPKwDqkFTGsFKnMWuS/pXyLTTOv
-I+In9ZJyA/R5zKeJZjM7xtZs0ANU9HpOpgespq6CvA==
------END RSA PRIVATE KEY-----
diff --git a/Godeps/_workspace/src/gopkg.in/mgo.v2/testdb/setup.sh b/Godeps/_workspace/src/gopkg.in/mgo.v2/testdb/setup.sh
deleted file mode 100644
index 317e8e5ab..000000000
--- a/Godeps/_workspace/src/gopkg.in/mgo.v2/testdb/setup.sh
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/bin/sh -e
-
-start() {
-    mkdir _testdb
-    cd _testdb
-    mkdir db1 db2 db3 rs1a rs1b rs1c rs2a rs2b rs2c rs3a rs3b rs3c rs4a cfg1 cfg2 cfg3
-    cp ../testdb/supervisord.conf supervisord.conf
-    cp ../testdb/server.pem server.pem
-    echo keyfile > keyfile
-    chmod 600 keyfile
-    COUNT=$(grep '^\[program' supervisord.conf | wc -l | tr -d ' ')
-    if ! mongod --help | grep -q -- --ssl; then
-        COUNT=$(($COUNT - 1))
-    fi
-    echo "Running supervisord..."
-    supervisord || ( echo "Supervisord failed executing ($?)" && exit 1 )
-    echo "Supervisord is up, starting $COUNT processes..."
-    for i in $(seq 10); do
-        RUNNING=$(supervisorctl status | grep RUNNING | wc -l | tr -d ' ')
-        echo "$RUNNING processes running..."
-        if [ x$COUNT = x$RUNNING ]; then
-            echo "Running setup.js with mongo..."
-            mongo --nodb ../testdb/init.js
-            exit 0
-        fi
-        sleep 1
-    done
-    echo "Failed to start all processes. Check out what's up at $PWD now!"
-    exit 1
-}
-
-stop() {
-    if [ -d _testdb ]; then
-        echo "Shutting down test cluster..."
-        (cd _testdb && supervisorctl shutdown)
-        rm -rf _testdb
-    fi
-}
-
-
-if [ ! -f suite_test.go ]; then
-    echo "This script must be run from within the source directory."
-    exit 1
-fi
-
-case "$1" in
-
-    start)
-        start $2
-        ;;
-
-    stop)
-        stop $2
-        ;;
-
-esac
-
-# vim:ts=4:sw=4:et
diff --git a/Godeps/_workspace/src/gopkg.in/mgo.v2/testdb/supervisord.conf b/Godeps/_workspace/src/gopkg.in/mgo.v2/testdb/supervisord.conf
deleted file mode 100644
index 1c2b859a2..000000000
--- a/Godeps/_workspace/src/gopkg.in/mgo.v2/testdb/supervisord.conf
+++ /dev/null
@@ -1,65 +0,0 @@
-[supervisord]
-logfile = %(here)s/supervisord.log
-pidfile = %(here)s/supervisord.pid
-directory = %(here)s
-#nodaemon = true
-
-[inet_http_server]
-port = 127.0.0.1:9001
-
-[supervisorctl]
-serverurl = http://127.0.0.1:9001
-
-[rpcinterface:supervisor]
-supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
-
-[program:db1]
-command = mongod --nohttpinterface --noprealloc --nojournal --smallfiles --nssize=1 --oplogSize=1 --shardsvr --dbpath %(here)s/db1 --bind_ip=127.0.0.1 --port 40001
-
-[program:db2]
-command = mongod --nohttpinterface --noprealloc --nojournal --smallfiles --nssize=1 --oplogSize=1 --shardsvr --dbpath %(here)s/db2 --bind_ip=127.0.0.1 --port 40002 --auth 
-
-[program:db3]
-command = mongod -nohttpinterface --noprealloc --nojournal --smallfiles --nssize=1 --oplogSize=1 --dbpath %(here)s/db3 --bind_ip=127.0.0.1 --port 40003 --auth --sslMode preferSSL --sslCAFile %(here)s/server.pem --sslPEMKeyFile %(here)s/server.pem
-
-[program:rs1a]
-command = mongod --nohttpinterface --noprealloc --nojournal --smallfiles --nssize=1 --oplogSize=1 --shardsvr --replSet rs1 --dbpath %(here)s/rs1a --bind_ip=127.0.0.1 --port 40011
-[program:rs1b]
-command = mongod --nohttpinterface --noprealloc --nojournal --smallfiles --nssize=1 --oplogSize=1 --shardsvr --replSet rs1 --dbpath %(here)s/rs1b --bind_ip=127.0.0.1 --port 40012
-[program:rs1c]
-command = mongod --nohttpinterface --noprealloc --nojournal --smallfiles --nssize=1 --oplogSize=1 --shardsvr --replSet rs1 --dbpath %(here)s/rs1c --bind_ip=127.0.0.1 --port 40013
- 
-[program:rs2a]
-command = mongod --nohttpinterface --noprealloc --nojournal --smallfiles --nssize=1 --oplogSize=1 --shardsvr --replSet rs2 --dbpath %(here)s/rs2a --bind_ip=127.0.0.1 --port 40021
-[program:rs2b]
-command = mongod --nohttpinterface --noprealloc --nojournal --smallfiles --nssize=1 --oplogSize=1 --shardsvr --replSet rs2 --dbpath %(here)s/rs2b --bind_ip=127.0.0.1 --port 40022
-[program:rs2c]
-command = mongod --nohttpinterface --noprealloc --nojournal --smallfiles --nssize=1 --oplogSize=1 --shardsvr --replSet rs2 --dbpath %(here)s/rs2c --bind_ip=127.0.0.1 --port 40023
-
-[program:rs3a]
-command = mongod --nohttpinterface --noprealloc --nojournal --smallfiles --nssize=1 --oplogSize=1 --shardsvr --replSet rs3 --dbpath %(here)s/rs3a --bind_ip=127.0.0.1 --port 40031 --auth --keyFile=%(here)s/keyfile
-[program:rs3b]                                                                                                                                                                                                      
-command = mongod --nohttpinterface --noprealloc --nojournal --smallfiles --nssize=1 --oplogSize=1 --shardsvr --replSet rs3 --dbpath %(here)s/rs3b --bind_ip=127.0.0.1 --port 40032 --auth --keyFile=%(here)s/keyfile
-[program:rs3c]                                                                                                                                                                                                      
-command = mongod --nohttpinterface --noprealloc --nojournal --smallfiles --nssize=1 --oplogSize=1 --shardsvr --replSet rs3 --dbpath %(here)s/rs3c --bind_ip=127.0.0.1 --port 40033 --auth --keyFile=%(here)s/keyfile
-
-[program:rs4a]
-command = mongod --nohttpinterface --noprealloc --nojournal --smallfiles --nssize=1 --oplogSize=1 --shardsvr --replSet rs4 --dbpath %(here)s/rs4a --bind_ip=127.0.0.1 --port 40041
-
-[program:cfg1]
-command = mongod --nohttpinterface --noprealloc --nojournal --smallfiles --nssize=1 --oplogSize=1 --configsvr --dbpath %(here)s/cfg1 --bind_ip=127.0.0.1 --port 40101
-
-[program:cfg2]
-command = mongod --nohttpinterface --noprealloc --nojournal --smallfiles --nssize=1 --oplogSize=1 --configsvr --dbpath %(here)s/cfg2 --bind_ip=127.0.0.1 --port 40102
-
-[program:cfg3]
-command = mongod --nohttpinterface --noprealloc --nojournal --smallfiles --nssize=1 --oplogSize=1 --configsvr --dbpath %(here)s/cfg3 --bind_ip=127.0.0.1 --port 40103 --auth --keyFile=%(here)s/keyfile
-
-[program:s1]
-command = mongos --configdb 127.0.0.1:40101 --bind_ip=127.0.0.1 --port 40201 --chunkSize 1
-
-[program:s2]
-command = mongos --configdb 127.0.0.1:40102 --bind_ip=127.0.0.1 --port 40202 --chunkSize 1
-
-[program:s3]
-command = mongos --configdb 127.0.0.1:40103 --bind_ip=127.0.0.1 --port 40203 --chunkSize 1 --keyFile=%(here)s/keyfile
diff --git a/Godeps/_workspace/src/gopkg.in/mgo.v2/testdb/wait.js b/Godeps/_workspace/src/gopkg.in/mgo.v2/testdb/wait.js
deleted file mode 100644
index de0d66075..000000000
--- a/Godeps/_workspace/src/gopkg.in/mgo.v2/testdb/wait.js
+++ /dev/null
@@ -1,58 +0,0 @@
-// We know the master of the first set (pri=1), but not of the second.
-var settings = {}
-var rs1cfg = {_id: "rs1",
-              members: [{_id: 1, host: "127.0.0.1:40011", priority: 1},
-                        {_id: 2, host: "127.0.0.1:40012", priority: 0},
-                        {_id: 3, host: "127.0.0.1:40013", priority: 0}]}
-var rs2cfg = {_id: "rs2",
-              members: [{_id: 1, host: "127.0.0.1:40021", priority: 1},
-                        {_id: 2, host: "127.0.0.1:40022", priority: 1},
-                        {_id: 3, host: "127.0.0.1:40023", priority: 0}]}
-var rs3cfg = {_id: "rs3",
-              members: [{_id: 1, host: "127.0.0.1:40031", priority: 1},
-                        {_id: 2, host: "127.0.0.1:40032", priority: 1},
-                        {_id: 3, host: "127.0.0.1:40033", priority: 1}],
-              settings: settings}
-
-for (var i = 0; i != 60; i++) {
-	try {
-		rs1a = new Mongo("127.0.0.1:40011").getDB("admin")
-		rs2a = new Mongo("127.0.0.1:40021").getDB("admin")
-		rs3a = new Mongo("127.0.0.1:40031").getDB("admin")
-		rs3a.auth("root", "rapadura")
-		db1 = new Mongo("127.0.0.1:40001").getDB("admin")
-		db2 = new Mongo("127.0.0.1:40002").getDB("admin")
-		break
-	} catch(err) {
-		print("Can't connect yet...")
-	}
-	sleep(1000)
-}
-
-function countHealthy(rs) {
-    var status = rs.runCommand({replSetGetStatus: 1})
-    var count = 0
-    if (typeof status.members != "undefined") {
-        for (var i = 0; i != status.members.length; i++) {
-            var m = status.members[i]
-            if (m.health == 1 && (m.state == 1 || m.state == 2)) {
-                count += 1
-            }
-        }
-    }
-    return count
-}
-
-var totalRSMembers = rs1cfg.members.length + rs2cfg.members.length + rs3cfg.members.length
-
-for (var i = 0; i != 60; i++) {
-    var count = countHealthy(rs1a) + countHealthy(rs2a) + countHealthy(rs3a)
-    print("Replica sets have", count, "healthy nodes.")
-    if (count == totalRSMembers) {
-        quit(0)
-    }
-    sleep(1000)
-}
-
-print("Replica sets didn't sync up properly.")
-quit(12)
diff --git a/Godeps/_workspace/src/gopkg.in/mgo.v2/testserver/export_test.go b/Godeps/_workspace/src/gopkg.in/mgo.v2/testserver/export_test.go
deleted file mode 100644
index 2b2e093fc..000000000
--- a/Godeps/_workspace/src/gopkg.in/mgo.v2/testserver/export_test.go
+++ /dev/null
@@ -1,12 +0,0 @@
-package testserver
-
-import (
-	"os"
-)
-
-func (ts *TestServer) ProcessTest() *os.Process {
-	if ts.server == nil {
-		return nil
-	}
-	return ts.server.Process
-}
diff --git a/Godeps/_workspace/src/gopkg.in/mgo.v2/testserver/testserver.go b/Godeps/_workspace/src/gopkg.in/mgo.v2/testserver/testserver.go
deleted file mode 100644
index 9058f844b..000000000
--- a/Godeps/_workspace/src/gopkg.in/mgo.v2/testserver/testserver.go
+++ /dev/null
@@ -1,168 +0,0 @@
-// WARNING: This package was replaced by mgo.v2/dbtest.
-package testserver
-
-import (
-	"bytes"
-	"fmt"
-	"net"
-	"os"
-	"os/exec"
-	"strconv"
-	"time"
-
-	"gopkg.in/mgo.v2"
-	"gopkg.in/tomb.v2"
-)
-
-// WARNING: This package was replaced by mgo.v2/dbtest.
-type TestServer struct {
-	session *mgo.Session
-	output  bytes.Buffer
-	server  *exec.Cmd
-	dbpath  string
-	host    string
-	tomb    tomb.Tomb
-}
-
-// WARNING: This package was replaced by mgo.v2/dbtest.
-func (ts *TestServer) SetPath(dbpath string) {
-	ts.dbpath = dbpath
-}
-
-func (ts *TestServer) start() {
-	if ts.server != nil {
-		panic("TestServer already started")
-	}
-	if ts.dbpath == "" {
-		panic("TestServer.SetPath must be called before using the server")
-	}
-	mgo.SetStats(true)
-	l, err := net.Listen("tcp", "127.0.0.1:0")
-	if err != nil {
-		panic("unable to listen on a local address: " + err.Error())
-	}
-	addr := l.Addr().(*net.TCPAddr)
-	l.Close()
-	ts.host = addr.String()
-
-	args := []string{
-		"--dbpath", ts.dbpath,
-		"--bind_ip", "127.0.0.1",
-		"--port", strconv.Itoa(addr.Port),
-		"--nssize", "1",
-		"--noprealloc",
-		"--smallfiles",
-		"--nojournal",
-	}
-	ts.tomb = tomb.Tomb{}
-	ts.server = exec.Command("mongod", args...)
-	ts.server.Stdout = &ts.output
-	ts.server.Stderr = &ts.output
-	err = ts.server.Start()
-	if err != nil {
-		panic(err)
-	}
-	ts.tomb.Go(ts.monitor)
-	ts.Wipe()
-}
-
-func (ts *TestServer) monitor() error {
-	ts.server.Process.Wait()
-	if ts.tomb.Alive() {
-		// Present some debugging information.
-		fmt.Fprintf(os.Stderr, "---- mongod process died unexpectedly:\n")
-		fmt.Fprintf(os.Stderr, "%s", ts.output.Bytes())
-		fmt.Fprintf(os.Stderr, "---- mongod processes running right now:\n")
-		cmd := exec.Command("/bin/sh", "-c", "ps auxw | grep mongod")
-		cmd.Stdout = os.Stderr
-		cmd.Stderr = os.Stderr
-		cmd.Run()
-		fmt.Fprintf(os.Stderr, "----------------------------------------\n")
-
-		panic("mongod process died unexpectedly")
-	}
-	return nil
-}
-
-// WARNING: This package was replaced by mgo.v2/dbtest.
-func (ts *TestServer) Stop() {
-	if ts.session != nil {
-		ts.checkSessions()
-		if ts.session != nil {
-			ts.session.Close()
-			ts.session = nil
-		}
-	}
-	if ts.server != nil {
-		ts.tomb.Kill(nil)
-		ts.server.Process.Kill()
-		select {
-		case <-ts.tomb.Dead():
-		case <-time.After(5 * time.Second):
-			panic("timeout waiting for mongod process to die")
-		}
-		ts.server = nil
-	}
-}
-
-// WARNING: This package was replaced by mgo.v2/dbtest.
-func (ts *TestServer) Session() *mgo.Session {
-	if ts.server == nil {
-		ts.start()
-	}
-	if ts.session == nil {
-		mgo.ResetStats()
-		var err error
-		ts.session, err = mgo.Dial(ts.host + "/test")
-		if err != nil {
-			panic(err)
-		}
-	}
-	return ts.session.Copy()
-}
-
-// WARNING: This package was replaced by mgo.v2/dbtest.
-func (ts *TestServer) checkSessions() {
-	if check := os.Getenv("CHECK_SESSIONS"); check == "0" || ts.server == nil || ts.session == nil {
-		return
-	}
-	ts.session.Close()
-	ts.session = nil
-	for i := 0; i < 100; i++ {
-		stats := mgo.GetStats()
-		if stats.SocketsInUse == 0 && stats.SocketsAlive == 0 {
-			return
-		}
-		time.Sleep(100 * time.Millisecond)
-	}
-	panic("There are mgo sessions still alive.")
-}
-
-// WARNING: This package was replaced by mgo.v2/dbtest.
-func (ts *TestServer) Wipe() {
-	if ts.server == nil || ts.session == nil {
-		return
-	}
-	ts.checkSessions()
-	sessionUnset := ts.session == nil
-	session := ts.Session()
-	defer session.Close()
-	if sessionUnset {
-		ts.session.Close()
-		ts.session = nil
-	}
-	names, err := session.DatabaseNames()
-	if err != nil {
-		panic(err)
-	}
-	for _, name := range names {
-		switch name {
-		case "admin", "local", "config":
-		default:
-			err = session.DB(name).DropDatabase()
-			if err != nil {
-				panic(err)
-			}
-		}
-	}
-}
diff --git a/Godeps/_workspace/src/gopkg.in/mgo.v2/testserver/testserver_test.go b/Godeps/_workspace/src/gopkg.in/mgo.v2/testserver/testserver_test.go
deleted file mode 100644
index 754eb677b..000000000
--- a/Godeps/_workspace/src/gopkg.in/mgo.v2/testserver/testserver_test.go
+++ /dev/null
@@ -1,108 +0,0 @@
-package testserver_test
-
-import (
-	"os"
-	"testing"
-	"time"
-
-	. "gopkg.in/check.v1"
-
-	"gopkg.in/mgo.v2"
-	"gopkg.in/mgo.v2/testserver"
-)
-
-type M map[string]interface{}
-
-func TestAll(t *testing.T) {
-	TestingT(t)
-}
-
-type S struct {
-	oldCheckSessions string
-}
-
-var _ = Suite(&S{})
-
-func (s *S) SetUpTest(c *C) {
-	s.oldCheckSessions = os.Getenv("CHECK_SESSIONS")
-	os.Setenv("CHECK_SESSIONS", "")
-}
-
-func (s *S) TearDownTest(c *C) {
-	os.Setenv("CHECK_SESSIONS", s.oldCheckSessions)
-}
-
-func (s *S) TestWipeData(c *C) {
-	var server testserver.TestServer
-	server.SetPath(c.MkDir())
-	defer server.Stop()
-
-	session := server.Session()
-	err := session.DB("mydb").C("mycoll").Insert(M{"a": 1})
-	session.Close()
-	c.Assert(err, IsNil)
-
-	server.Wipe()
-
-	session = server.Session()
-	names, err := session.DatabaseNames()
-	session.Close()
-	c.Assert(err, IsNil)
-	for _, name := range names {
-		if name != "local" && name != "admin" {
-			c.Fatalf("Wipe should have removed this database: %s", name)
-		}
-	}
-}
-
-func (s *S) TestStop(c *C) {
-	var server testserver.TestServer
-	server.SetPath(c.MkDir())
-	defer server.Stop()
-
-	// Server should not be running.
-	process := server.ProcessTest()
-	c.Assert(process, IsNil)
-
-	session := server.Session()
-	addr := session.LiveServers()[0]
-	session.Close()
-
-	// Server should be running now.
-	process = server.ProcessTest()
-	p, err := os.FindProcess(process.Pid)
-	c.Assert(err, IsNil)
-	p.Release()
-
-	server.Stop()
-
-	// Server should not be running anymore.
-	session, err = mgo.DialWithTimeout(addr, 500*time.Millisecond)
-	if session != nil {
-		session.Close()
-		c.Fatalf("Stop did not stop the server")
-	}
-}
-
-func (s *S) TestCheckSessions(c *C) {
-	var server testserver.TestServer
-	server.SetPath(c.MkDir())
-	defer server.Stop()
-
-	session := server.Session()
-	defer session.Close()
-	c.Assert(server.Wipe, PanicMatches, "There are mgo sessions still alive.")
-}
-
-func (s *S) TestCheckSessionsDisabled(c *C) {
-	var server testserver.TestServer
-	server.SetPath(c.MkDir())
-	defer server.Stop()
-
-	os.Setenv("CHECK_SESSIONS", "0")
-
-	// Should not panic, although it looks to Wipe like this session will leak.
-	session := server.Session()
-	defer session.Close()
-	server.Wipe()
-}
diff --git a/Godeps/_workspace/src/gopkg.in/mgo.v2/txn/chaos.go b/Godeps/_workspace/src/gopkg.in/mgo.v2/txn/chaos.go
deleted file mode 100644
index c98adb91d..000000000
--- a/Godeps/_workspace/src/gopkg.in/mgo.v2/txn/chaos.go
+++ /dev/null
@@ -1,68 +0,0 @@
-package txn
-
-import (
-	mrand "math/rand"
-	"time"
-)
-
-var chaosEnabled = false
-var chaosSetting Chaos
-
-// Chaos holds parameters for the failure injection mechanism.
-type Chaos struct {
-	// KillChance is the 0.0 to 1.0 chance that a given checkpoint
-	// within the algorithm will raise an interruption that will
-	// stop the procedure.
-	KillChance float64
-
-	// SlowdownChance is the 0.0 to 1.0 chance that a given checkpoint
-	// within the algorithm will be delayed by Slowdown before
-	// continuing.
-	SlowdownChance float64
-	Slowdown       time.Duration
-
-	// If Breakpoint is set, the above settings will only affect the
-	// named breakpoint.
-	Breakpoint string
-}
-
-// SetChaos sets the failure injection parameters to c.
-func SetChaos(c Chaos) {
-	chaosSetting = c
-	chaosEnabled = c.KillChance > 0 || c.SlowdownChance > 0
-}
-
-func chaos(bpname string) {
-	if !chaosEnabled {
-		return
-	}
-	switch chaosSetting.Breakpoint {
-	case "", bpname:
-		kc := chaosSetting.KillChance
-		if kc > 0 && mrand.Intn(1000) < int(kc*1000) {
-			panic(chaosError{})
-		}
-		if bpname == "insert" {
-			return
-		}
-		sc := chaosSetting.SlowdownChance
-		if sc > 0 && mrand.Intn(1000) < int(sc*1000) {
-			time.Sleep(chaosSetting.Slowdown)
-		}
-	}
-}
-
-type chaosError struct{}
-
-func (f *flusher) handleChaos(err *error) {
-	v := recover()
-	if v == nil {
-		return
-	}
-	if _, ok := v.(chaosError); ok {
-		f.debugf("Killed by chaos!")
-		*err = ErrChaos
-		return
-	}
-	panic(v)
-}
diff --git a/Godeps/_workspace/src/gopkg.in/mgo.v2/txn/debug.go b/Godeps/_workspace/src/gopkg.in/mgo.v2/txn/debug.go
deleted file mode 100644
index 8224bb313..000000000
--- a/Godeps/_workspace/src/gopkg.in/mgo.v2/txn/debug.go
+++ /dev/null
@@ -1,109 +0,0 @@
-package txn
-
-import (
-	"bytes"
-	"fmt"
-	"sort"
-	"sync/atomic"
-
-	"gopkg.in/mgo.v2/bson"
-)
-
-var (
-	debugEnabled bool
-	logger       log_Logger
-)
-
-type log_Logger interface {
-	Output(calldepth int, s string) error
-}
-
-// Specify the *log.Logger where logged messages should be sent to.
-func SetLogger(l log_Logger) {
-	logger = l
-}
-
-// SetDebug enables or disables debugging.
-func SetDebug(debug bool) {
-	debugEnabled = debug
-}
-
-var ErrChaos = fmt.Errorf("interrupted by chaos")
-
-var debugId uint32
-
-func debugPrefix() string {
-	d := atomic.AddUint32(&debugId, 1) - 1
-	s := make([]byte, 0, 10)
-	for i := uint(0); i < 8; i++ {
-		s = append(s, "abcdefghijklmnop"[(d>>(4*i))&0xf])
-		if d>>(4*(i+1)) == 0 {
-			break
-		}
-	}
-	s = append(s, ')', ' ')
-	return string(s)
-}
-
-func logf(format string, args ...interface{}) {
-	if logger != nil {
-		logger.Output(2, fmt.Sprintf(format, argsForLog(args)...))
-	}
-}
-
-func debugf(format string, args ...interface{}) {
-	if debugEnabled && logger != nil {
-		logger.Output(2, fmt.Sprintf(format, argsForLog(args)...))
-	}
-}
-
-func argsForLog(args []interface{}) []interface{} {
-	for i, arg := range args {
-		switch v := arg.(type) {
-		case bson.ObjectId:
-			args[i] = v.Hex()
-		case []bson.ObjectId:
-			lst := make([]string, len(v))
-			for j, id := range v {
-				lst[j] = id.Hex()
-			}
-			args[i] = lst
-		case map[docKey][]bson.ObjectId:
-			buf := &bytes.Buffer{}
-			var dkeys docKeys
-			for dkey := range v {
-				dkeys = append(dkeys, dkey)
-			}
-			sort.Sort(dkeys)
-			for i, dkey := range dkeys {
-				if i > 0 {
-					buf.WriteByte(' ')
-				}
-				buf.WriteString(fmt.Sprintf("%v: {", dkey))
-				for j, id := range v[dkey] {
-					if j > 0 {
-						buf.WriteByte(' ')
-					}
-					buf.WriteString(id.Hex())
-				}
-				buf.WriteByte('}')
-			}
-			args[i] = buf.String()
-		case map[docKey][]int64:
-			buf := &bytes.Buffer{}
-			var dkeys docKeys
-			for dkey := range v {
-				dkeys = append(dkeys, dkey)
-			}
-			sort.Sort(dkeys)
-			for i, dkey := range dkeys {
-				if i > 0 {
-					buf.WriteByte(' ')
-				}
-				buf.WriteString(fmt.Sprintf("%v: %v", dkey, v[dkey]))
-			}
-			args[i] = buf.String()
-		}
-	}
-	return args
-}
diff --git a/Godeps/_workspace/src/gopkg.in/mgo.v2/txn/dockey_test.go b/Godeps/_workspace/src/gopkg.in/mgo.v2/txn/dockey_test.go
deleted file mode 100644
index e8dee952c..000000000
--- a/Godeps/_workspace/src/gopkg.in/mgo.v2/txn/dockey_test.go
+++ /dev/null
@@ -1,205 +0,0 @@
-package txn
-
-import (
-	"sort"
-
-	. "gopkg.in/check.v1"
-)
-
-type DocKeySuite struct{}
-
-var _ = Suite(&DocKeySuite{})
-
-type T struct {
-	A int
-	B string
-}
-
-type T2 struct {
-	A int
-	B string
-}
-
-type T3 struct {
-	A int
-	B string
-}
-
-type T4 struct {
-	A int
-	B string
-}
-
-type T5 struct {
-	F int
-	Q string
-}
-
-type T6 struct {
-	A int
-	B string
-}
-
-type T7 struct {
-	A bool
-	B float64
-}
-
-type T8 struct {
-	A int
-	B string
-}
-
-type T9 struct {
-	A int
-	B string
-	C bool
-}
-
-type T10 struct {
-	C int    `bson:"a"`
-	D string `bson:"b,omitempty"`
-}
-
-type T11 struct {
-	C int
-	D string
-}
-
-type T12 struct {
-	S string
-}
-
-type T13 struct {
-	p, q, r bool
-	S       string
-}
-
-var docKeysTests = [][]docKeys{
-	{{
-		{"c", 1},
-		{"c", 5},
-		{"c", 2},
-	}, {
-		{"c", 1},
-		{"c", 2},
-		{"c", 5},
-	}}, {{
-		{"c", "foo"},
-		{"c", "bar"},
-		{"c", "bob"},
-	}, {
-		{"c", "bar"},
-		{"c", "bob"},
-		{"c", "foo"},
-	}}, {{
-		{"c", 0.2},
-		{"c", 0.07},
-		{"c", 0.9},
-	}, {
-		{"c", 0.07},
-		{"c", 0.2},
-		{"c", 0.9},
-	}}, {{
-		{"c", true},
-		{"c", false},
-		{"c", true},
-	}, {
-		{"c", false},
-		{"c", true},
-		{"c", true},
-	}}, {{
-		{"c", T{1, "b"}},
-		{"c", T{1, "a"}},
-		{"c", T{0, "b"}},
-		{"c", T{0, "a"}},
-	}, {
-		{"c", T{0, "a"}},
-		{"c", T{0, "b"}},
-		{"c", T{1, "a"}},
-		{"c", T{1, "b"}},
-	}}, {{
-		{"c", T{1, "a"}},
-		{"c", T{0, "a"}},
-	}, {
-		{"c", T{0, "a"}},
-		{"c", T{1, "a"}},
-	}}, {{
-		{"c", T3{0, "b"}},
-		{"c", T2{1, "b"}},
-		{"c", T3{1, "a"}},
-		{"c", T2{0, "a"}},
-	}, {
-		{"c", T2{0, "a"}},
-		{"c", T3{0, "b"}},
-		{"c", T3{1, "a"}},
-		{"c", T2{1, "b"}},
-	}}, {{
-		{"c", T5{1, "b"}},
-		{"c", T4{1, "b"}},
-		{"c", T5{0, "a"}},
-		{"c", T4{0, "a"}},
-	}, {
-		{"c", T4{0, "a"}},
-		{"c", T5{0, "a"}},
-		{"c", T4{1, "b"}},
-		{"c", T5{1, "b"}},
-	}}, {{
-		{"c", T6{1, "b"}},
-		{"c", T7{true, 0.2}},
-		{"c", T6{0, "a"}},
-		{"c", T7{false, 0.04}},
-	}, {
-		{"c", T6{0, "a"}},
-		{"c", T6{1, "b"}},
-		{"c", T7{false, 0.04}},
-		{"c", T7{true, 0.2}},
-	}}, {{
-		{"c", T9{1, "b", true}},
-		{"c", T8{1, "b"}},
-		{"c", T9{0, "a", false}},
-		{"c", T8{0, "a"}},
-	}, {
-		{"c", T9{0, "a", false}},
-		{"c", T8{0, "a"}},
-		{"c", T9{1, "b", true}},
-		{"c", T8{1, "b"}},
-	}}, {{
-		{"b", 2},
-		{"a", 5},
-		{"c", 2},
-		{"b", 1},
-	}, {
-		{"a", 5},
-		{"b", 1},
-		{"b", 2},
-		{"c", 2},
-	}}, {{
-		{"c", T11{1, "a"}},
-		{"c", T11{1, "a"}},
-		{"c", T10{1, "a"}},
-	}, {
-		{"c", T10{1, "a"}},
-		{"c", T11{1, "a"}},
-		{"c", T11{1, "a"}},
-	}}, {{
-		{"c", T12{"a"}},
-		{"c", T13{false, true, false, "a"}},
-		{"c", T12{"b"}},
-		{"c", T13{false, true, false, "b"}},
-	}, {
-		{"c", T12{"a"}},
-		{"c", T13{false, true, false, "a"}},
-		{"c", T12{"b"}},
-		{"c", T13{false, true, false, "b"}},
-	}},
-}
-
-func (s *DocKeySuite) TestSort(c *C) {
-	for _, test := range docKeysTests {
-		keys := test[0]
-		expected := test[1]
-		sort.Sort(keys)
-		c.Check(keys, DeepEquals, expected)
-	}
-}
diff --git a/Godeps/_workspace/src/gopkg.in/mgo.v2/txn/flusher.go b/Godeps/_workspace/src/gopkg.in/mgo.v2/txn/flusher.go
deleted file mode 100644
index b890e60cb..000000000
--- a/Godeps/_workspace/src/gopkg.in/mgo.v2/txn/flusher.go
+++ /dev/null
@@ -1,985 +0,0 @@
-package txn
-
-import (
-	"fmt"
-
-	"gopkg.in/mgo.v2"
-	"gopkg.in/mgo.v2/bson"
-)
-
-func flush(r *Runner, t *transaction) error {
-	f := &flusher{
-		Runner:   r,
-		goal:     t,
-		goalKeys: make(map[docKey]bool),
-		queue:    make(map[docKey][]token),
-		debugId:  debugPrefix(),
-	}
-	for _, dkey := range f.goal.docKeys() {
-		f.goalKeys[dkey] = true
-	}
-	return f.run()
-}
-
-type flusher struct {
-	*Runner
-	goal     *transaction
-	goalKeys map[docKey]bool
-	queue    map[docKey][]token
-	debugId  string
-}
-
-func (f *flusher) run() (err error) {
-	if chaosEnabled {
-		defer f.handleChaos(&err)
-	}
-
-	f.debugf("Processing %s", f.goal)
-	seen := make(map[bson.ObjectId]*transaction)
-	if err := f.recurse(f.goal, seen); err != nil {
-		return err
-	}
-	if f.goal.done() {
-		return nil
-	}
-
-	// Sparse workloads will generally be managed entirely by recurse.
-	// Getting here means one or more transactions have dependencies
-	// and perhaps cycles.
-
-	// Build successors data for Tarjan's sort. Must consider
-	// that entries in txn-queue are not necessarily valid.
-	successors := make(map[bson.ObjectId][]bson.ObjectId)
-	ready := true
-	for _, dqueue := range f.queue {
-	NextPair:
-		for i := 0; i < len(dqueue); i++ {
-			pred := dqueue[i]
-			predid := pred.id()
-			predt := seen[predid]
-			if predt == nil || predt.Nonce != pred.nonce() {
-				continue
-			}
-			predsuccids, ok := successors[predid]
-			if !ok {
-				successors[predid] = nil
-			}
-
-			for j := i + 1; j < len(dqueue); j++ {
-				succ := dqueue[j]
-				succid := succ.id()
-				succt := seen[succid]
-				if succt == nil || succt.Nonce != succ.nonce() {
-					continue
-				}
-				if _, ok := successors[succid]; !ok {
-					successors[succid] = nil
-				}
-
-				// Found a valid pred/succ pair.
-				i = j - 1
-				for _, predsuccid := range predsuccids {
-					if predsuccid == succid {
-						continue NextPair
-					}
-				}
-				successors[predid] = append(predsuccids, succid)
-				if succid == f.goal.Id {
-					// There are still pre-requisites to handle.
-					ready = false
-				}
-				continue NextPair
-			}
-		}
-	}
-	f.debugf("Queues: %v", f.queue)
-	f.debugf("Successors: %v", successors)
-	if ready {
-		f.debugf("Goal %s has no real pre-requisites", f.goal)
-		return f.advance(f.goal, nil, true)
-	}
-
-	// Robert Tarjan's algorithm for detecting strongly-connected
-	// components is used for topological sorting and detecting
-	// cycles at once. The order in which transactions are applied
-	// in commonly affected documents must be a global agreement.
-	sorted := tarjanSort(successors)
-	if debugEnabled {
-		f.debugf("Tarjan output: %v", sorted)
-	}
-	pull := make(map[bson.ObjectId]*transaction)
-	for i := len(sorted) - 1; i >= 0; i-- {
-		scc := sorted[i]
-		f.debugf("Flushing %v", scc)
-		if len(scc) == 1 {
-			pull[scc[0]] = seen[scc[0]]
-		}
-		for _, id := range scc {
-			if err := f.advance(seen[id], pull, true); err != nil {
-				return err
-			}
-		}
-		if len(scc) > 1 {
-			for _, id := range scc {
-				pull[id] = seen[id]
-			}
-		}
-	}
-	return nil
-}
-
-func (f *flusher) recurse(t *transaction, seen map[bson.ObjectId]*transaction) error {
-	seen[t.Id] = t
-	err := f.advance(t, nil, false)
-	if err != errPreReqs {
-		return err
-	}
-	for _, dkey := range t.docKeys() {
-		for _, dtt := range f.queue[dkey] {
-			id := dtt.id()
-			if seen[id] != nil {
-				continue
-			}
-			qt, err := f.load(id)
-			if err != nil {
-				return err
-			}
-			err = f.recurse(qt, seen)
-			if err != nil {
-				return err
-			}
-		}
-	}
-	return nil
-}
-
-func (f *flusher) advance(t *transaction, pull map[bson.ObjectId]*transaction, force bool) error {
-	for {
-		switch t.State {
-		case tpreparing, tprepared:
-			revnos, err := f.prepare(t, force)
-			if err != nil {
-				return err
-			}
-			if t.State != tprepared {
-				continue
-			}
-			if err = f.assert(t, revnos, pull); err != nil {
-				return err
-			}
-			if t.State != tprepared {
-				continue
-			}
-			if err = f.checkpoint(t, revnos); err != nil {
-				return err
-			}
-		case tapplying:
-			return f.apply(t, pull)
-		case taborting:
-			return f.abortOrReload(t, nil, pull)
-		case tapplied, taborted:
-			return nil
-		default:
-			panic(fmt.Errorf("transaction in unknown state: %q", t.State))
-		}
-	}
-	panic("unreachable")
-}
-
-type stash string
-
-const (
-	stashStable stash = ""
-	stashInsert stash = "insert"
-	stashRemove stash = "remove"
-)
-
-type txnInfo struct {
-	Queue  []token       `bson:"txn-queue"`
-	Revno  int64         `bson:"txn-revno,omitempty"`
-	Insert bson.ObjectId `bson:"txn-insert,omitempty"`
-	Remove bson.ObjectId `bson:"txn-remove,omitempty"`
-}
-
-type stashState string
-
-const (
-	stashNew       stashState = ""
-	stashInserting stashState = "inserting"
-)
-
-var txnFields = bson.D{{"txn-queue", 1}, {"txn-revno", 1}, {"txn-remove", 1}, {"txn-insert", 1}}
-
-var errPreReqs = fmt.Errorf("transaction has pre-requisites and force is false")
-
-// prepare injects t's id onto txn-queue for all affected documents
-// and collects the current txn-queue and txn-revno values during
-// the process. If the prepared txn-queue indicates that there are
-// pre-requisite transactions to be applied and the force parameter
-// is false, errPreReqs will be returned. Otherwise, the current
-// tip revision numbers for all the documents are returned.
-func (f *flusher) prepare(t *transaction, force bool) (revnos []int64, err error) {
-	if t.State != tpreparing {
-		return f.rescan(t, force)
-	}
-	f.debugf("Preparing %s", t)
-
-	// dkeys being sorted means stable iteration across all runners. This
-	// isn't strictly required, but reduces the chances of cycles.
-	dkeys := t.docKeys()
-
-	revno := make(map[docKey]int64)
-	info := txnInfo{}
-	tt := tokenFor(t)
-NextDoc:
-	for _, dkey := range dkeys {
-		change := mgo.Change{
-			Update:    bson.D{{"$addToSet", bson.D{{"txn-queue", tt}}}},
-			ReturnNew: true,
-		}
-		c := f.tc.Database.C(dkey.C)
-		cquery := c.FindId(dkey.Id).Select(txnFields)
-
-	RetryDoc:
-		change.Upsert = false
-		chaos("")
-		if _, err := cquery.Apply(change, &info); err == nil {
-			if info.Remove == "" {
-				// Fast path, unless workload is insert/remove heavy.
-				revno[dkey] = info.Revno
-				f.queue[dkey] = info.Queue
-				f.debugf("[A] Prepared document %v with revno %d and queue: %v", dkey, info.Revno, info.Queue)
-				continue NextDoc
-			} else {
-				// Handle remove in progress before preparing it.
-				if err := f.loadAndApply(info.Remove); err != nil {
-					return nil, err
-				}
-				goto RetryDoc
-			}
-		} else if err != mgo.ErrNotFound {
-			return nil, err
-		}
-
-		// Document missing. Use stash collection.
-		change.Upsert = true
-		chaos("")
-		_, err := f.sc.FindId(dkey).Apply(change, &info)
-		if err != nil {
-			return nil, err
-		}
-		if info.Insert != "" {
-			// Handle insert in progress before preparing it.
-			if err := f.loadAndApply(info.Insert); err != nil {
-				return nil, err
-			}
-			goto RetryDoc
-		}
-
-		// Must confirm stash is still in use and is the same one
-		// prepared, since applying a remove overwrites the stash.
-		docFound := false
-		stashFound := false
-		if err = c.FindId(dkey.Id).Select(txnFields).One(&info); err == nil {
-			docFound = true
-		} else if err != mgo.ErrNotFound {
-			return nil, err
-		} else if err = f.sc.FindId(dkey).One(&info); err == nil {
-			stashFound = true
-			if info.Revno == 0 {
-				// Missing revno in the stash only happens when it
-				// has been upserted, in which case it defaults to -1.
-				// Txn-inserted documents get revno -1 while in the stash
-				// for the first time, and -revno-1 == 2 when they go live.
-				info.Revno = -1
-			}
-		} else if err != mgo.ErrNotFound {
-			return nil, err
-		}
-
-		if docFound && info.Remove == "" || stashFound && info.Insert == "" {
-			for _, dtt := range info.Queue {
-				if dtt != tt {
-					continue
-				}
-				// Found tt properly prepared.
-				if stashFound {
-					f.debugf("[B] Prepared document %v on stash with revno %d and queue: %v", dkey, info.Revno, info.Queue)
-				} else {
-					f.debugf("[B] Prepared document %v with revno %d and queue: %v", dkey, info.Revno, info.Queue)
-				}
-				revno[dkey] = info.Revno
-				f.queue[dkey] = info.Queue
-				continue NextDoc
-			}
-		}
-
-		// The stash wasn't valid and tt got overwriten. Try again.
-		f.unstashToken(tt, dkey)
-		goto RetryDoc
-	}
-
-	// Save the prepared nonce onto t.
-	nonce := tt.nonce()
-	qdoc := bson.D{{"_id", t.Id}, {"s", tpreparing}}
-	udoc := bson.D{{"$set", bson.D{{"s", tprepared}, {"n", nonce}}}}
-	chaos("set-prepared")
-	err = f.tc.Update(qdoc, udoc)
-	if err == nil {
-		t.State = tprepared
-		t.Nonce = nonce
-	} else if err == mgo.ErrNotFound {
-		f.debugf("Can't save nonce of %s: LOST RACE", tt)
-		if err := f.reload(t); err != nil {
-			return nil, err
-		} else if t.State == tpreparing {
-			panic("can't save nonce yet transaction is still preparing")
-		} else if t.State != tprepared {
-			return t.Revnos, nil
-		}
-		tt = t.token()
-	} else if err != nil {
-		return nil, err
-	}
-
-	prereqs, found := f.hasPreReqs(tt, dkeys)
-	if !found {
-		// Must only happen when reloading above.
-		return f.rescan(t, force)
-	} else if prereqs && !force {
-		f.debugf("Prepared queue with %s [has prereqs & not forced].", tt)
-		return nil, errPreReqs
-	}
-	revnos = assembledRevnos(t.Ops, revno)
-	if !prereqs {
-		f.debugf("Prepared queue with %s [no prereqs]. Revnos: %v", tt, revnos)
-	} else {
-		f.debugf("Prepared queue with %s [forced] Revnos: %v", tt, revnos)
-	}
-	return revnos, nil
-}
-
-func (f *flusher) unstashToken(tt token, dkey docKey) error {
-	qdoc := bson.D{{"_id", dkey}, {"txn-queue", tt}}
-	udoc := bson.D{{"$pull", bson.D{{"txn-queue", tt}}}}
-	chaos("")
-	if err := f.sc.Update(qdoc, udoc); err == nil {
-		chaos("")
-		err = f.sc.Remove(bson.D{{"_id", dkey}, {"txn-queue", bson.D{}}})
-	} else if err != mgo.ErrNotFound {
-		return err
-	}
-	return nil
-}
-
-func (f *flusher) rescan(t *transaction, force bool) (revnos []int64, err error) {
-	f.debugf("Rescanning %s", t)
-	if t.State != tprepared {
-		panic(fmt.Errorf("rescanning transaction in invalid state: %q", t.State))
-	}
-
-	// dkeys being sorted means stable iteration across all
-	// runners. This isn't strictly required, but reduces the chances
-	// of cycles.
-	dkeys := t.docKeys()
-
-	tt := t.token()
-	if !force {
-		prereqs, found := f.hasPreReqs(tt, dkeys)
-		if found && prereqs {
-			// Its state is already known.
-			return nil, errPreReqs
-		}
-	}
-
-	revno := make(map[docKey]int64)
-	info := txnInfo{}
-	for _, dkey := range dkeys {
-		const retries = 3
-		retry := -1
-
-	RetryDoc:
-		retry++
-		c := f.tc.Database.C(dkey.C)
-		if err := c.FindId(dkey.Id).Select(txnFields).One(&info); err == mgo.ErrNotFound {
-			// Document is missing. Look in stash.
-			chaos("")
-			if err := f.sc.FindId(dkey).One(&info); err == mgo.ErrNotFound {
-				// Stash also doesn't exist. Maybe someone applied it.
-				if err := f.reload(t); err != nil {
-					return nil, err
-				} else if t.State != tprepared {
-					return t.Revnos, err
-				}
-				// Not applying either.
-				if retry < retries {
-					// Retry since there might be an insert/remove race.
-					goto RetryDoc
-				}
-				// Neither the doc nor the stash seem to exist.
-				return nil, fmt.Errorf("cannot find document %v for applying transaction %s", dkey, t)
-			} else if err != nil {
-				return nil, err
-			}
-			// Stash found.
-			if info.Insert != "" {
-				// Handle insert in progress before assuming ordering is good.
-				if err := f.loadAndApply(info.Insert); err != nil {
-					return nil, err
-				}
-				goto RetryDoc
-			}
-			if info.Revno == 0 {
-				// Missing revno in the stash means -1.
-				info.Revno = -1
-			}
-		} else if err != nil {
-			return nil, err
-		} else if info.Remove != "" {
-			// Handle remove in progress before assuming ordering is good.
-			if err := f.loadAndApply(info.Remove); err != nil {
-				return nil, err
-			}
-			goto RetryDoc
-		}
-		revno[dkey] = info.Revno
-
-		found := false
-		for _, id := range info.Queue {
-			if id == tt {
-				found = true
-				break
-			}
-		}
-		f.queue[dkey] = info.Queue
-		if !found {
-			// Rescanned transaction id was not in the queue. This could mean one
-			// of three things:
-			//  1) The transaction was applied and popped by someone else. This is
-			//     the common case.
-			//  2) We've read an out-of-date queue from the stash. This can happen
-			//     when someone else was paused for a long while preparing another
-			//     transaction for this document, and improperly upserted to the
-			//     stash when unpaused (after someone else inserted the document).
-			//     This is rare but possible.
-			//  3) There's an actual bug somewhere, or outside interference. Worst
-			//     possible case.
-			f.debugf("Rescanned document %v misses %s in queue: %v", dkey, tt, info.Queue)
-			err := f.reload(t)
-			if t.State == tpreparing || t.State == tprepared {
-				if retry < retries {
-					// Case 2.
-					goto RetryDoc
-				}
-				// Case 3.
-				return nil, fmt.Errorf("cannot find transaction %s in queue for document %v", t, dkey)
-			}
-			// Case 1.
-			return t.Revnos, err
-		}
-	}
-
-	prereqs, found := f.hasPreReqs(tt, dkeys)
-	if !found {
-		panic("rescanning loop guarantees that this can't happen")
-	} else if prereqs && !force {
-		f.debugf("Rescanned queue with %s: has prereqs, not forced", tt)
-		return nil, errPreReqs
-	}
-	revnos = assembledRevnos(t.Ops, revno)
-	if !prereqs {
-		f.debugf("Rescanned queue with %s: no prereqs, revnos: %v", tt, revnos)
-	} else {
-		f.debugf("Rescanned queue with %s: has prereqs, forced, revnos: %v", tt, revnos)
-	}
-	return revnos, nil
-}
-
-func assembledRevnos(ops []Op, revno map[docKey]int64) []int64 {
-	revnos := make([]int64, len(ops))
-	for i, op := range ops {
-		dkey := op.docKey()
-		revnos[i] = revno[dkey]
-		drevno := revno[dkey]
-		switch {
-		case op.Insert != nil && drevno < 0:
-			revno[dkey] = -drevno + 1
-		case op.Update != nil && drevno >= 0:
-			revno[dkey] = drevno + 1
-		case op.Remove && drevno >= 0:
-			revno[dkey] = -drevno - 1
-		}
-	}
-	return revnos
-}
-
-func (f *flusher) hasPreReqs(tt token, dkeys docKeys) (prereqs, found bool) {
-	found = true
-NextDoc:
-	for _, dkey := range dkeys {
-		for _, dtt := range f.queue[dkey] {
-			if dtt == tt {
-				continue NextDoc
-			} else if dtt.id() != tt.id() {
-				prereqs = true
-			}
-		}
-		found = false
-	}
-	return
-}
-
-func (f *flusher) reload(t *transaction) error {
-	var newt transaction
-	query := f.tc.FindId(t.Id)
-	query.Select(bson.D{{"s", 1}, {"n", 1}, {"r", 1}})
-	if err := query.One(&newt); err != nil {
-		return fmt.Errorf("failed to reload transaction: %v", err)
-	}
-	t.State = newt.State
-	t.Nonce = newt.Nonce
-	t.Revnos = newt.Revnos
-	f.debugf("Reloaded %s: %q", t, t.State)
-	return nil
-}
-
-func (f *flusher) loadAndApply(id bson.ObjectId) error {
-	t, err := f.load(id)
-	if err != nil {
-		return err
-	}
-	return f.advance(t, nil, true)
-}
-
-// assert verifies that all assertions in t match the content that t
-// will be applied upon. If an assertion fails, the transaction state
-// is changed to aborted.
-func (f *flusher) assert(t *transaction, revnos []int64, pull map[bson.ObjectId]*transaction) error {
-	f.debugf("Asserting %s with revnos %v", t, revnos)
-	if t.State != tprepared {
-		panic(fmt.Errorf("asserting transaction in invalid state: %q", t.State))
-	}
-	qdoc := make(bson.D, 3)
-	revno := make(map[docKey]int64)
-	for i, op := range t.Ops {
-		dkey := op.docKey()
-		if _, ok := revno[dkey]; !ok {
-			revno[dkey] = revnos[i]
-		}
-		if op.Assert == nil {
-			continue
-		}
-		if op.Assert == DocMissing {
-			if revnos[i] >= 0 {
-				return f.abortOrReload(t, revnos, pull)
-			}
-			continue
-		}
-		if op.Insert != nil {
-			return fmt.Errorf("Insert can only Assert txn.DocMissing", op.Assert)
-		}
-		// if revnos[i] < 0 { abort }?
-
-		qdoc = append(qdoc[:0], bson.DocElem{"_id", op.Id})
-		if op.Assert != DocMissing {
-			var revnoq interface{}
-			if n := revno[dkey]; n == 0 {
-				revnoq = bson.D{{"$exists", false}}
-			} else {
-				revnoq = n
-			}
-			// XXX Add tt to the query here, once we're sure it's all working.
-			//     Not having it increases the chances of breaking on bad logic.
-			qdoc = append(qdoc, bson.DocElem{"txn-revno", revnoq})
-			if op.Assert != DocExists {
-				qdoc = append(qdoc, bson.DocElem{"$or", []interface{}{op.Assert}})
-			}
-		}
-
-		c := f.tc.Database.C(op.C)
-		if err := c.Find(qdoc).Select(bson.D{{"_id", 1}}).One(nil); err == mgo.ErrNotFound {
-			// Assertion failed or someone else started applying.
-			return f.abortOrReload(t, revnos, pull)
-		} else if err != nil {
-			return err
-		}
-	}
-	f.debugf("Asserting %s succeeded", t)
-	return nil
-}
-
-func (f *flusher) abortOrReload(t *transaction, revnos []int64, pull map[bson.ObjectId]*transaction) (err error) {
-	f.debugf("Aborting or reloading %s (was %q)", t, t.State)
-	if t.State == tprepared {
-		qdoc := bson.D{{"_id", t.Id}, {"s", tprepared}}
-		udoc := bson.D{{"$set", bson.D{{"s", taborting}}}}
-		chaos("set-aborting")
-		if err = f.tc.Update(qdoc, udoc); err == nil {
-			t.State = taborting
-		} else if err == mgo.ErrNotFound {
-			if err = f.reload(t); err != nil || t.State != taborting {
-				f.debugf("Won't abort %s. Reloaded state: %q", t, t.State)
-				return err
-			}
-		} else {
-			return err
-		}
-	} else if t.State != taborting {
-		panic(fmt.Errorf("aborting transaction in invalid state: %q", t.State))
-	}
-
-	if len(revnos) > 0 {
-		if pull == nil {
-			pull = map[bson.ObjectId]*transaction{t.Id: t}
-		}
-		seen := make(map[docKey]bool)
-		for i, op := range t.Ops {
-			dkey := op.docKey()
-			if seen[op.docKey()] {
-				continue
-			}
-			seen[dkey] = true
-
-			pullAll := tokensToPull(f.queue[dkey], pull, "")
-			if len(pullAll) == 0 {
-				continue
-			}
-			udoc := bson.D{{"$pullAll", bson.D{{"txn-queue", pullAll}}}}
-			chaos("")
-			if revnos[i] < 0 {
-				err = f.sc.UpdateId(dkey, udoc)
-			} else {
-				c := f.tc.Database.C(dkey.C)
-				err = c.UpdateId(dkey.Id, udoc)
-			}
-			if err != nil && err != mgo.ErrNotFound {
-				return err
-			}
-		}
-	}
-	udoc := bson.D{{"$set", bson.D{{"s", taborted}}}}
-	chaos("set-aborted")
-	if err := f.tc.UpdateId(t.Id, udoc); err != nil && err != mgo.ErrNotFound {
-		return err
-	}
-	t.State = taborted
-	f.debugf("Aborted %s", t)
-	return nil
-}
-
-func (f *flusher) checkpoint(t *transaction, revnos []int64) error {
-	var debugRevnos map[docKey][]int64
-	if debugEnabled {
-		debugRevnos = make(map[docKey][]int64)
-		for i, op := range t.Ops {
-			dkey := op.docKey()
-			debugRevnos[dkey] = append(debugRevnos[dkey], revnos[i])
-		}
-		f.debugf("Ready to apply %s. Saving revnos %v", t, debugRevnos)
-	}
-
-	// Save in t the txn-revno values the transaction must run on.
-	qdoc := bson.D{{"_id", t.Id}, {"s", tprepared}}
-	udoc := bson.D{{"$set", bson.D{{"s", tapplying}, {"r", revnos}}}}
-	chaos("set-applying")
-	err := f.tc.Update(qdoc, udoc)
-	if err == nil {
-		t.State = tapplying
-		t.Revnos = revnos
-		f.debugf("Ready to apply %s. Saving revnos %v: DONE", t, debugRevnos)
-	} else if err == mgo.ErrNotFound {
-		f.debugf("Ready to apply %s. Saving revnos %v: LOST RACE", t, debugRevnos)
-		return f.reload(t)
-	}
-	return nil
-}
-
-func (f *flusher) apply(t *transaction, pull map[bson.ObjectId]*transaction) error {
-	f.debugf("Applying transaction %s", t)
-	if t.State != tapplying {
-		panic(fmt.Errorf("applying transaction in invalid state: %q", t.State))
-	}
-	if pull == nil {
-		pull = map[bson.ObjectId]*transaction{t.Id: t}
-	}
-
-	logRevnos := append([]int64(nil), t.Revnos...)
-	logDoc := bson.D{{"_id", t.Id}}
-
-	tt := tokenFor(t)
-	for i := range t.Ops {
-		op := &t.Ops[i]
-		dkey := op.docKey()
-		dqueue := f.queue[dkey]
-		revno := t.Revnos[i]
-
-		var opName string
-		if debugEnabled {
-			opName = op.name()
-			f.debugf("Applying %s op %d (%s) on %v with txn-revno %d", t, i, opName, dkey, revno)
-		}
-
-		c := f.tc.Database.C(op.C)
-
-		qdoc := bson.D{{"_id", dkey.Id}, {"txn-revno", revno}, {"txn-queue", tt}}
-		if op.Insert != nil {
-			qdoc[0].Value = dkey
-			if revno == -1 {
-				qdoc[1].Value = bson.D{{"$exists", false}}
-			}
-		} else if revno == 0 {
-			// There's no document with revno 0. The only way to see it is
-			// when an existent document participates in a transaction the
-			// first time. Txn-inserted documents get revno -1 while in the
-			// stash for the first time, and -revno-1 == 2 when they go live.
-			qdoc[1].Value = bson.D{{"$exists", false}}
-		}
-
-		pullAll := tokensToPull(dqueue, pull, tt)
-
-		var d bson.D
-		var outcome string
-		var err error
-		switch {
-		case op.Update != nil:
-			if revno < 0 {
-				err = mgo.ErrNotFound
-				f.debugf("Won't try to apply update op; negative revision means the document is missing or stashed")
-			} else {
-				newRevno := revno + 1
-				logRevnos[i] = newRevno
-				if d, err = objToDoc(op.Update); err != nil {
-					return err
-				}
-				if d, err = addToDoc(d, "$pullAll", bson.D{{"txn-queue", pullAll}}); err != nil {
-					return err
-				}
-				if d, err = addToDoc(d, "$set", bson.D{{"txn-revno", newRevno}}); err != nil {
-					return err
-				}
-				chaos("")
-				err = c.Update(qdoc, d)
-			}
-		case op.Remove:
-			if revno < 0 {
-				err = mgo.ErrNotFound
-			} else {
-				newRevno := -revno - 1
-				logRevnos[i] = newRevno
-				nonce := newNonce()
-				stash := txnInfo{}
-				change := mgo.Change{
-					Update:    bson.D{{"$push", bson.D{{"n", nonce}}}},
-					Upsert:    true,
-					ReturnNew: true,
-				}
-				if _, err = f.sc.FindId(dkey).Apply(change, &stash); err != nil {
-					return err
-				}
-				change = mgo.Change{
-					Update:    bson.D{{"$set", bson.D{{"txn-remove", t.Id}}}},
-					ReturnNew: true,
-				}
-				var info txnInfo
-				if _, err = c.Find(qdoc).Apply(change, &info); err == nil {
-					// The document still exists so the stash previously
-					// observed was either out of date or necessarily
-					// contained the token being applied.
-					f.debugf("Marked document %v to be removed on revno %d with queue: %v", dkey, info.Revno, info.Queue)
-					updated := false
-					if !hasToken(stash.Queue, tt) {
-						var set, unset bson.D
-						if revno == 0 {
-							// Missing revno in stash means -1.
-							set = bson.D{{"txn-queue", info.Queue}}
-							unset = bson.D{{"n", 1}, {"txn-revno", 1}}
-						} else {
-							set = bson.D{{"txn-queue", info.Queue}, {"txn-revno", newRevno}}
-							unset = bson.D{{"n", 1}}
-						}
-						qdoc := bson.D{{"_id", dkey}, {"n", nonce}}
-						udoc := bson.D{{"$set", set}, {"$unset", unset}}
-						if err = f.sc.Update(qdoc, udoc); err == nil {
-							updated = true
-						} else if err != mgo.ErrNotFound {
-							return err
-						}
-					}
-					if updated {
-						f.debugf("Updated stash for document %v with revno %d and queue: %v", dkey, newRevno, info.Queue)
-					} else {
-						f.debugf("Stash for document %v was up-to-date", dkey)
-					}
-					err = c.Remove(qdoc)
-				}
-			}
-		case op.Insert != nil:
-			if revno >= 0 {
-				err = mgo.ErrNotFound
-			} else {
-				newRevno := -revno + 1
-				logRevnos[i] = newRevno
-				if d, err = objToDoc(op.Insert); err != nil {
-					return err
-				}
-				change := mgo.Change{
-					Update:    bson.D{{"$set", bson.D{{"txn-insert", t.Id}}}},
-					ReturnNew: true,
-				}
-				chaos("")
-				var info txnInfo
-				if _, err = f.sc.Find(qdoc).Apply(change, &info); err == nil {
-					f.debugf("Stash for document %v has revno %d and queue: %v", dkey, info.Revno, info.Queue)
-					d = setInDoc(d, bson.D{{"_id", op.Id}, {"txn-revno", newRevno}, {"txn-queue", info.Queue}})
-					// Unlikely yet unfortunate race in here if this gets seriously
-					// delayed. If someone inserts+removes meanwhile, this will
-					// reinsert, and there's no way to avoid that while keeping the
-					// collection clean or compromising sharding. applyOps can solve
-					// the former, but it can't shard (SERVER-1439).
-					chaos("insert")
-					err = c.Insert(d)
-					if err == nil || mgo.IsDup(err) {
-						if err == nil {
-							f.debugf("New document %v inserted with revno %d and queue: %v", dkey, info.Revno, info.Queue)
-						} else {
-							f.debugf("Document %v already existed", dkey)
-						}
-						chaos("")
-						if err = f.sc.Remove(qdoc); err == nil {
-							f.debugf("Stash for document %v removed", dkey)
-						}
-					}
-				}
-			}
-		case op.Assert != nil:
-			// Pure assertion. No changes to apply.
-		}
-		if err == nil {
-			outcome = "DONE"
-		} else if err == mgo.ErrNotFound || mgo.IsDup(err) {
-			outcome = "MISS"
-			err = nil
-		} else {
-			outcome = err.Error()
-		}
-		if debugEnabled {
-			f.debugf("Applying %s op %d (%s) on %v with txn-revno %d: %s", t, i, opName, dkey, revno, outcome)
-		}
-		if err != nil {
-			return err
-		}
-
-		if f.lc != nil && op.isChange() {
-			// Add change to the log document.
-			var dr bson.D
-			for li := range logDoc {
-				elem := &logDoc[li]
-				if elem.Name == op.C {
-					dr = elem.Value.(bson.D)
-					break
-				}
-			}
-			if dr == nil {
-				logDoc = append(logDoc, bson.DocElem{op.C, bson.D{{"d", []interface{}{}}, {"r", []int64{}}}})
-				dr = logDoc[len(logDoc)-1].Value.(bson.D)
-			}
-			dr[0].Value = append(dr[0].Value.([]interface{}), op.Id)
-			dr[1].Value = append(dr[1].Value.([]int64), logRevnos[i])
-		}
-	}
-	t.State = tapplied
-
-	if f.lc != nil {
-		// Insert log document into the changelog collection.
-		f.debugf("Inserting %s into change log", t)
-		err := f.lc.Insert(logDoc)
-		if err != nil && !mgo.IsDup(err) {
-			return err
-		}
-	}
-
-	// It's been applied, so errors are ignored here. It's fine for someone
-	// else to win the race and mark it as applied, and it's also fine for
-	// it to remain pending until a later point when someone will perceive
-	// it has been applied and mark it at such.
-	f.debugf("Marking %s as applied", t)
-	chaos("set-applied")
-	f.tc.Update(bson.D{{"_id", t.Id}, {"s", tapplying}}, bson.D{{"$set", bson.D{{"s", tapplied}}}})
-	return nil
-}
-
-func tokensToPull(dqueue []token, pull map[bson.ObjectId]*transaction, dontPull token) []token {
-	var result []token
-	for j := len(dqueue) - 1; j >= 0; j-- {
-		dtt := dqueue[j]
-		if dtt == dontPull {
-			continue
-		}
-		if _, ok := pull[dtt.id()]; ok {
-			// It was handled before and this is a leftover invalid
-			// nonce in the queue. Cherry-pick it out.
-			result = append(result, dtt)
-		}
-	}
-	return result
-}
-
-func objToDoc(obj interface{}) (d bson.D, err error) {
-	data, err := bson.Marshal(obj)
-	if err != nil {
-		return nil, err
-	}
-	err = bson.Unmarshal(data, &d)
-	if err != nil {
-		return nil, err
-	}
-	return d, err
-}
-
-func addToDoc(doc bson.D, key string, add bson.D) (bson.D, error) {
-	for i := range doc {
-		elem := &doc[i]
-		if elem.Name != key {
-			continue
-		}
-		if old, ok := elem.Value.(bson.D); ok {
-			elem.Value = append(old, add...)
-			return doc, nil
-		} else {
-			return nil, fmt.Errorf("invalid %q value in change document: %#v", key, elem.Value)
-		}
-	}
-	return append(doc, bson.DocElem{key, add}), nil
-}
-
-func setInDoc(doc bson.D, set bson.D) bson.D {
-	dlen := len(doc)
-NextS:
-	for s := range set {
-		sname := set[s].Name
-		for d := 0; d < dlen; d++ {
-			if doc[d].Name == sname {
-				doc[d].Value = set[s].Value
-				continue NextS
-			}
-		}
-		doc = append(doc, set[s])
-	}
-	return doc
-}
-
-func hasToken(tokens []token, tt token) bool {
-	for _, ttt := range tokens {
-		if ttt == tt {
-			return true
-		}
-	}
-	return false
-}
-
-func (f *flusher) debugf(format string, args ...interface{}) {
-	if !debugEnabled {
-		return
-	}
-	debugf(f.debugId+format, args...)
-}
diff --git a/Godeps/_workspace/src/gopkg.in/mgo.v2/txn/mgo_test.go b/Godeps/_workspace/src/gopkg.in/mgo.v2/txn/mgo_test.go
deleted file mode 100644
index 5abc47335..000000000
--- a/Godeps/_workspace/src/gopkg.in/mgo.v2/txn/mgo_test.go
+++ /dev/null
@@ -1,101 +0,0 @@
-package txn_test
-
-import (
-	"bytes"
-	"gopkg.in/mgo.v2"
-	. "gopkg.in/check.v1"
-	"os/exec"
-	"time"
-)
-
-// ----------------------------------------------------------------------------
-// The mgo test suite
-
-type MgoSuite struct {
-	output  bytes.Buffer
-	server  *exec.Cmd
-	session *mgo.Session
-}
-
-var mgoaddr = "127.0.0.1:50017"
-
-func (s *MgoSuite) SetUpSuite(c *C) {
-	//mgo.SetDebug(true)
-	mgo.SetStats(true)
-	dbdir := c.MkDir()
-	args := []string{
-		"--dbpath", dbdir,
-		"--bind_ip", "127.0.0.1",
-		"--port", "50017",
-		"--nssize", "1",
-		"--noprealloc",
-		"--smallfiles",
-		"--nojournal",
-		"-vvvvv",
-	}
-	s.server = exec.Command("mongod", args...)
-	s.server.Stdout = &s.output
-	s.server.Stderr = &s.output
-	err := s.server.Start()
-	if err != nil {
-		panic(err)
-	}
-}
-
-func (s *MgoSuite) TearDownSuite(c *C) {
-	s.server.Process.Kill()
-	s.server.Process.Wait()
-}
-
-func (s *MgoSuite) SetUpTest(c *C) {
-	err := DropAll(mgoaddr)
-	if err != nil {
-		panic(err)
-	}
-	mgo.SetLogger(c)
-	mgo.ResetStats()
-
-	s.session, err = mgo.Dial(mgoaddr)
-	c.Assert(err, IsNil)
-}
-
-func (s *MgoSuite) TearDownTest(c *C) {
-	if s.session != nil {
-		s.session.Close()
-	}
-	for i := 0; ; i++ {
-		stats := mgo.GetStats()
-		if stats.SocketsInUse == 0 && stats.SocketsAlive == 0 {
-			break
-		}
-		if i == 20 {
-			c.Fatal("Test left sockets in a dirty state")
-		}
-		c.Logf("Waiting for sockets to die: %d in use, %d alive", stats.SocketsInUse, stats.SocketsAlive)
-		time.Sleep(500 * time.Millisecond)
-	}
-}
-
-func DropAll(mongourl string) (err error) {
-	session, err := mgo.Dial(mongourl)
-	if err != nil {
-		return err
-	}
-	defer session.Close()
-
-	names, err := session.DatabaseNames()
-	if err != nil {
-		return err
-	}
-	for _, name := range names {
-		switch name {
-		case "admin", "local", "config":
-		default:
-			err = session.DB(name).DropDatabase()
-			if err != nil {
-				return err
-			}
-		}
-	}
-	return nil
-}
diff --git a/Godeps/_workspace/src/gopkg.in/mgo.v2/txn/sim_test.go b/Godeps/_workspace/src/gopkg.in/mgo.v2/txn/sim_test.go
deleted file mode 100644
index 399e585b3..000000000
--- a/Godeps/_workspace/src/gopkg.in/mgo.v2/txn/sim_test.go
+++ /dev/null
@@ -1,388 +0,0 @@
-package txn_test
-
-import (
-	"flag"
-	"gopkg.in/mgo.v2"
-	"gopkg.in/mgo.v2/bson"
-	"gopkg.in/mgo.v2/txn"
-	. "gopkg.in/check.v1"
-	"math/rand"
-	"time"
-)
-
-var (
-	duration = flag.Duration("duration", 200*time.Millisecond, "duration for each simulation")
-	seed     = flag.Int64("seed", 0, "seed for rand")
-)
-
-type params struct {
-	killChance     float64
-	slowdownChance float64
-	slowdown       time.Duration
-
-	unsafe         bool
-	workers        int
-	accounts       int
-	changeHalf     bool
-	reinsertCopy   bool
-	reinsertZeroed bool
-	changelog      bool
-
-	changes int
-}
-
-func (s *S) TestSim1Worker(c *C) {
-	simulate(c, params{
-		workers:        1,
-		accounts:       4,
-		killChance:     0.01,
-		slowdownChance: 0.3,
-		slowdown:       100 * time.Millisecond,
-	})
-}
-
-func (s *S) TestSim4WorkersDense(c *C) {
-	simulate(c, params{
-		workers:        4,
-		accounts:       2,
-		killChance:     0.01,
-		slowdownChance: 0.3,
-		slowdown:       100 * time.Millisecond,
-	})
-}
-
-func (s *S) TestSim4WorkersSparse(c *C) {
-	simulate(c, params{
-		workers:        4,
-		accounts:       10,
-		killChance:     0.01,
-		slowdownChance: 0.3,
-		slowdown:       100 * time.Millisecond,
-	})
-}
-
-func (s *S) TestSimHalf1Worker(c *C) {
-	simulate(c, params{
-		workers:        1,
-		accounts:       4,
-		changeHalf:     true,
-		killChance:     0.01,
-		slowdownChance: 0.3,
-		slowdown:       100 * time.Millisecond,
-	})
-}
-
-func (s *S) TestSimHalf4WorkersDense(c *C) {
-	simulate(c, params{
-		workers:        4,
-		accounts:       2,
-		changeHalf:     true,
-		killChance:     0.01,
-		slowdownChance: 0.3,
-		slowdown:       100 * time.Millisecond,
-	})
-}
-
-func (s *S) TestSimHalf4WorkersSparse(c *C) {
-	simulate(c, params{
-		workers:        4,
-		accounts:       10,
-		changeHalf:     true,
-		killChance:     0.01,
-		slowdownChance: 0.3,
-		slowdown:       100 * time.Millisecond,
-	})
-}
-
-func (s *S) TestSimReinsertCopy1Worker(c *C) {
-	simulate(c, params{
-		workers:        1,
-		accounts:       10,
-		reinsertCopy:   true,
-		killChance:     0.01,
-		slowdownChance: 0.3,
-		slowdown:       100 * time.Millisecond,
-	})
-}
-
-func (s *S) TestSimReinsertCopy4Workers(c *C) {
-	simulate(c, params{
-		workers:        4,
-		accounts:       10,
-		reinsertCopy:   true,
-		killChance:     0.01,
-		slowdownChance: 0.3,
-		slowdown:       100 * time.Millisecond,
-	})
-}
-
-func (s *S) TestSimReinsertZeroed1Worker(c *C) {
-	simulate(c, params{
-		workers:        1,
-		accounts:       10,
-		reinsertZeroed: true,
-		killChance:     0.01,
-		slowdownChance: 0.3,
-		slowdown:       100 * time.Millisecond,
-	})
-}
-
-func (s *S) TestSimReinsertZeroed4Workers(c *C) {
-	simulate(c, params{
-		workers:        4,
-		accounts:       10,
-		reinsertZeroed: true,
-		killChance:     0.01,
-		slowdownChance: 0.3,
-		slowdown:       100 * time.Millisecond,
-	})
-}
-
-func (s *S) TestSimChangeLog(c *C) {
-	simulate(c, params{
-		workers:        4,
-		accounts:       10,
-		killChance:     0.01,
-		slowdownChance: 0.3,
-		slowdown:       100 * time.Millisecond,
-		changelog:      true,
-	})
-}
-
-type balanceChange struct {
-	id     bson.ObjectId
-	origin int
-	target int
-	amount int
-}
-
-func simulate(c *C, params params) {
-	seed := *seed
-	if seed == 0 {
-		seed = time.Now().UnixNano()
-	}
-	rand.Seed(seed)
-	c.Logf("Seed: %v", seed)
-
-	txn.SetChaos(txn.Chaos{
-		KillChance:     params.killChance,
-		SlowdownChance: params.slowdownChance,
-		Slowdown:       params.slowdown,
-	})
-	defer txn.SetChaos(txn.Chaos{})
-
-	session, err := mgo.Dial(mgoaddr)
-	c.Assert(err, IsNil)
-	defer session.Close()
-
-	db := session.DB("test")
-	tc := db.C("tc")
-
-	runner := txn.NewRunner(tc)
-
-	tclog := db.C("tc.log")
-	if params.changelog {
-		info := mgo.CollectionInfo{
-			Capped:   true,
-			MaxBytes: 1000000,
-		}
-		err := tclog.Create(&info)
-		c.Assert(err, IsNil)
-		runner.ChangeLog(tclog)
-	}
-
-	accounts := db.C("accounts")
-	for i := 0; i < params.accounts; i++ {
-		err := accounts.Insert(M{"_id": i, "balance": 300})
-		c.Assert(err, IsNil)
-	}
-	var stop time.Time
-	if params.changes <= 0 {
-		stop = time.Now().Add(*duration)
-	}
-
-	max := params.accounts
-	if params.reinsertCopy || params.reinsertZeroed {
-		max = int(float64(params.accounts) * 1.5)
-	}
-
-	changes := make(chan balanceChange, 1024)
-
-	//session.SetMode(mgo.Eventual, true)
-	for i := 0; i < params.workers; i++ {
-		go func() {
-			n := 0
-			for {
-				if n > 0 && n == params.changes {
-					break
-				}
-				if !stop.IsZero() && time.Now().After(stop) {
-					break
-				}
-
-				change := balanceChange{
-					id:     bson.NewObjectId(),
-					origin: rand.Intn(max),
-					target: rand.Intn(max),
-					amount: 100,
-				}
-
-				var old Account
-				var oldExists bool
-				if params.reinsertCopy || params.reinsertZeroed {
-					if err := accounts.FindId(change.origin).One(&old); err != mgo.ErrNotFound {
-						c.Check(err, IsNil)
-						change.amount = old.Balance
-						oldExists = true
-					}
-				}
-
-				var ops []txn.Op
-				switch {
-				case params.reinsertCopy && oldExists:
-					ops = []txn.Op{{
-						C:      "accounts",
-						Id:     change.origin,
-						Assert: M{"balance": change.amount},
-						Remove: true,
-					}, {
-						C:      "accounts",
-						Id:     change.target,
-						Assert: txn.DocMissing,
-						Insert: M{"balance": change.amount},
-					}}
-				case params.reinsertZeroed && oldExists:
-					ops = []txn.Op{{
-						C:      "accounts",
-						Id:     change.target,
-						Assert: txn.DocMissing,
-						Insert: M{"balance": 0},
-					}, {
-						C:      "accounts",
-						Id:     change.origin,
-						Assert: M{"balance": change.amount},
-						Remove: true,
-					}, {
-						C:      "accounts",
-						Id:     change.target,
-						Assert: txn.DocExists,
-						Update: M{"$inc": M{"balance": change.amount}},
-					}}
-				case params.changeHalf:
-					ops = []txn.Op{{
-						C:      "accounts",
-						Id:     change.origin,
-						Assert: M{"balance": M{"$gte": change.amount}},
-						Update: M{"$inc": M{"balance": -change.amount / 2}},
-					}, {
-						C:      "accounts",
-						Id:     change.target,
-						Assert: txn.DocExists,
-						Update: M{"$inc": M{"balance": change.amount / 2}},
-					}, {
-						C:      "accounts",
-						Id:     change.origin,
-						Update: M{"$inc": M{"balance": -change.amount / 2}},
-					}, {
-						C:      "accounts",
-						Id:     change.target,
-						Update: M{"$inc": M{"balance": change.amount / 2}},
-					}}
-				default:
-					ops = []txn.Op{{
-						C:      "accounts",
-						Id:     change.origin,
-						Assert: M{"balance": M{"$gte": change.amount}},
-						Update: M{"$inc": M{"balance": -change.amount}},
-					}, {
-						C:      "accounts",
-						Id:     change.target,
-						Assert: txn.DocExists,
-						Update: M{"$inc": M{"balance": change.amount}},
-					}}
-				}
-
-				err = runner.Run(ops, change.id, nil)
-				if err != nil && err != txn.ErrAborted && err != txn.ErrChaos {
-					c.Check(err, IsNil)
-				}
-				n++
-				changes <- change
-			}
-			changes <- balanceChange{}
-		}()
-	}
-
-	alive := params.workers
-	changeLog := make([]balanceChange, 0, 1024)
-	for alive > 0 {
-		change := <-changes
-		if change.id == "" {
-			alive--
-		} else {
-			changeLog = append(changeLog, change)
-		}
-	}
-	c.Check(len(changeLog), Not(Equals), 0, Commentf("No operations were even attempted."))
-
-	txn.SetChaos(txn.Chaos{})
-	err = runner.ResumeAll()
-	c.Assert(err, IsNil)
-
-	n, err := accounts.Count()
-	c.Check(err, IsNil)
-	c.Check(n, Equals, params.accounts, Commentf("Number of accounts has changed."))
-
-	n, err = accounts.Find(M{"balance": M{"$lt": 0}}).Count()
-	c.Check(err, IsNil)
-	c.Check(n, Equals, 0, Commentf("There are %d accounts with negative balance.", n))
-
-	globalBalance := 0
-	iter := accounts.Find(nil).Iter()
-	account := Account{}
-	for iter.Next(&account) {
-		globalBalance += account.Balance
-	}
-	c.Check(iter.Close(), IsNil)
-	c.Check(globalBalance, Equals, params.accounts*300, Commentf("Total amount of money should be constant."))
-
-	// Compute and verify the exact final state of all accounts.
-	balance := make(map[int]int)
-	for i := 0; i < params.accounts; i++ {
-		balance[i] += 300
-	}
-	var applied, aborted int
-	for _, change := range changeLog {
-		err := runner.Resume(change.id)
-		if err == txn.ErrAborted {
-			aborted++
-			continue
-		} else if err != nil {
-			c.Fatalf("resuming %s failed: %v", change.id, err)
-		}
-		balance[change.origin] -= change.amount
-		balance[change.target] += change.amount
-		applied++
-	}
-	iter = accounts.Find(nil).Iter()
-	for iter.Next(&account) {
-		c.Assert(account.Balance, Equals, balance[account.Id])
-	}
-	c.Check(iter.Close(), IsNil)
-	c.Logf("Total transactions: %d (%d applied, %d aborted)", len(changeLog), applied, aborted)
-
-	if params.changelog {
-		n, err := tclog.Count()
-		c.Assert(err, IsNil)
-		// Check if the capped collection is full.
-		dummy := make([]byte, 1024)
-		tclog.Insert(M{"_id": bson.NewObjectId(), "dummy": dummy})
-		m, err := tclog.Count()
-		c.Assert(err, IsNil)
-		if m == n+1 {
-			// Wasn't full, so it must have seen it all.
-			c.Assert(err, IsNil)
-			c.Assert(n, Equals, applied)
-		}
-	}
-}
diff --git a/Godeps/_workspace/src/gopkg.in/mgo.v2/txn/tarjan.go b/Godeps/_workspace/src/gopkg.in/mgo.v2/txn/tarjan.go
deleted file mode 100644
index e56541c9b..000000000
--- a/Godeps/_workspace/src/gopkg.in/mgo.v2/txn/tarjan.go
+++ /dev/null
@@ -1,94 +0,0 @@
-package txn
-
-import (
-	"gopkg.in/mgo.v2/bson"
-	"sort"
-)
-
-func tarjanSort(successors map[bson.ObjectId][]bson.ObjectId) [][]bson.ObjectId {
-	// http://en.wikipedia.org/wiki/Tarjan%27s_strongly_connected_components_algorithm
-	data := &tarjanData{
-		successors: successors,
-		nodes:      make([]tarjanNode, 0, len(successors)),
-		index:      make(map[bson.ObjectId]int, len(successors)),
-	}
-
-	for id := range successors {
-		id := bson.ObjectId(string(id))
-		if _, seen := data.index[id]; !seen {
-			data.strongConnect(id)
-		}
-	}
-
-	// Sort connected components to stabilize the algorithm.
-	for _, ids := range data.output {
-		if len(ids) > 1 {
-			sort.Sort(idList(ids))
-		}
-	}
-	return data.output
-}
-
-type tarjanData struct {
-	successors map[bson.ObjectId][]bson.ObjectId
-	output     [][]bson.ObjectId
-
-	nodes []tarjanNode
-	stack []bson.ObjectId
-	index map[bson.ObjectId]int
-}
-
-type tarjanNode struct {
-	lowlink int
-	stacked bool
-}
-
-type idList []bson.ObjectId
-
-func (l idList) Len() int           { return len(l) }
-func (l idList) Swap(i, j int)      { l[i], l[j] = l[j], l[i] }
-func (l idList) Less(i, j int) bool { return l[i] < l[j] }
-
-func (data *tarjanData) strongConnect(id bson.ObjectId) *tarjanNode {
-	index := len(data.nodes)
-	data.index[id] = index
-	data.stack = append(data.stack, id)
-	data.nodes = append(data.nodes, tarjanNode{index, true})
-	node := &data.nodes[index]
-
-	for _, succid := range data.successors[id] {
-		succindex, seen := data.index[succid]
-		if !seen {
-			succnode := data.strongConnect(succid)
-			if succnode.lowlink < node.lowlink {
-				node.lowlink = succnode.lowlink
-			}
-		} else if data.nodes[succindex].stacked {
-			// Part of the current strongly-connected component.
-			if succindex < node.lowlink {
-				node.lowlink = succindex
-			}
-		}
-	}
-
-	if node.lowlink == index {
-		// Root node; pop stack and output new
-		// strongly-connected component.
-		var scc []bson.ObjectId
-		i := len(data.stack) - 1
-		for {
-			stackid := data.stack[i]
-			stackindex := data.index[stackid]
-			data.nodes[stackindex].stacked = false
-			scc = append(scc, stackid)
-			if stackindex == index {
-				break
-			}
-			i--
-		}
-		data.stack = data.stack[:i]
-		data.output = append(data.output, scc)
-	}
-
-	return node
-}
diff --git a/Godeps/_workspace/src/gopkg.in/mgo.v2/txn/tarjan_test.go b/Godeps/_workspace/src/gopkg.in/mgo.v2/txn/tarjan_test.go
deleted file mode 100644
index 79745c39b..000000000
--- a/Godeps/_workspace/src/gopkg.in/mgo.v2/txn/tarjan_test.go
+++ /dev/null
@@ -1,44 +0,0 @@
-package txn
-
-import (
-	"fmt"
-	"gopkg.in/mgo.v2/bson"
-	. "gopkg.in/check.v1"
-)
-
-type TarjanSuite struct{}
-
-var _ = Suite(TarjanSuite{})
-
-func bid(n int) bson.ObjectId {
-	return bson.ObjectId(fmt.Sprintf("%024d", n))
-}
-
-func bids(ns ...int) (ids []bson.ObjectId) {
-	for _, n := range ns {
-		ids = append(ids, bid(n))
-	}
-	return
-}
-
-func (TarjanSuite) TestExample(c *C) {
-	successors := map[bson.ObjectId][]bson.ObjectId{
-		bid(1): bids(2, 3),
-		bid(2): bids(1, 5),
-		bid(3): bids(4),
-		bid(4): bids(3, 5),
-		bid(5): bids(6),
-		bid(6): bids(7),
-		bid(7): bids(8),
-		bid(8): bids(6, 9),
-		bid(9): bids(),
-	}
-
-	c.Assert(tarjanSort(successors), DeepEquals, [][]bson.ObjectId{
-		bids(9),
-		bids(6, 7, 8),
-		bids(5),
-		bids(3, 4),
-		bids(1, 2),
-	})
-}
diff --git a/Godeps/_workspace/src/gopkg.in/mgo.v2/txn/txn.go b/Godeps/_workspace/src/gopkg.in/mgo.v2/txn/txn.go
deleted file mode 100644
index 204b3cf1d..000000000
--- a/Godeps/_workspace/src/gopkg.in/mgo.v2/txn/txn.go
+++ /dev/null
@@ -1,611 +0,0 @@
-// The txn package implements support for multi-document transactions.
-//
-// For details check the following blog post:
-//
-//     http://blog.labix.org/2012/08/22/multi-doc-transactions-for-mongodb
-//
-package txn
-
-import (
-	"encoding/binary"
-	"fmt"
-	"reflect"
-	"sort"
-	"strings"
-	"sync"
-
-	"gopkg.in/mgo.v2"
-	"gopkg.in/mgo.v2/bson"
-
-	crand "crypto/rand"
-	mrand "math/rand"
-)
-
-type state int
-
-const (
-	tpreparing state = 1 // One or more documents not prepared
-	tprepared  state = 2 // Prepared but not yet ready to run
-	taborting  state = 3 // Assertions failed, cleaning up
-	tapplying  state = 4 // Changes are in progress
-	taborted   state = 5 // Pre-conditions failed, nothing done
-	tapplied   state = 6 // All changes applied
-)
-
-func (s state) String() string {
-	switch s {
-	case tpreparing:
-		return "preparing"
-	case tprepared:
-		return "prepared"
-	case taborting:
-		return "aborting"
-	case tapplying:
-		return "applying"
-	case taborted:
-		return "aborted"
-	case tapplied:
-		return "applied"
-	}
-	panic(fmt.Errorf("unknown state: %d", s))
-}
-
-var rand *mrand.Rand
-var randmu sync.Mutex
-
-func init() {
-	var seed int64
-	err := binary.Read(crand.Reader, binary.BigEndian, &seed)
-	if err != nil {
-		panic(err)
-	}
-	rand = mrand.New(mrand.NewSource(seed))
-}
-
-type transaction struct {
-	Id     bson.ObjectId `bson:"_id"`
-	State  state         `bson:"s"`
-	Info   interface{}   `bson:"i,omitempty"`
-	Ops    []Op          `bson:"o"`
-	Nonce  string        `bson:"n,omitempty"`
-	Revnos []int64       `bson:"r,omitempty"`
-
-	docKeysCached docKeys
-}
-
-func (t *transaction) String() string {
-	if t.Nonce == "" {
-		return t.Id.Hex()
-	}
-	return string(t.token())
-}
-
-func (t *transaction) done() bool {
-	return t.State == tapplied || t.State == taborted
-}
-
-func (t *transaction) token() token {
-	if t.Nonce == "" {
-		panic("transaction has no nonce")
-	}
-	return tokenFor(t)
-}
-
-func (t *transaction) docKeys() docKeys {
-	if t.docKeysCached != nil {
-		return t.docKeysCached
-	}
-	dkeys := make(docKeys, 0, len(t.Ops))
-NextOp:
-	for _, op := range t.Ops {
-		dkey := op.docKey()
-		for i := range dkeys {
-			if dkey == dkeys[i] {
-				continue NextOp
-			}
-		}
-		dkeys = append(dkeys, dkey)
-	}
-	sort.Sort(dkeys)
-	t.docKeysCached = dkeys
-	return dkeys
-}
-
-// tokenFor returns a unique transaction token that
-// is composed by t's id and a nonce. If t already has
-// a nonce assigned to it, it will be used, otherwise
-// a new nonce will be generated.
-func tokenFor(t *transaction) token {
-	nonce := t.Nonce
-	if nonce == "" {
-		nonce = newNonce()
-	}
-	return token(t.Id.Hex() + "_" + nonce)
-}
-
-func newNonce() string {
-	randmu.Lock()
-	r := rand.Uint32()
-	randmu.Unlock()
-	n := make([]byte, 8)
-	for i := uint(0); i < 8; i++ {
-		n[i] = "0123456789abcdef"[(r>>(4*i))&0xf]
-	}
-	return string(n)
-}
-
-type token string
-
-func (tt token) id() bson.ObjectId { return bson.ObjectIdHex(string(tt[:24])) }
-func (tt token) nonce() string     { return string(tt[25:]) }
-
-// Op represents an operation to a single document that may be
-// applied as part of a transaction with other operations.
-type Op struct {
-	// C and Id identify the collection and document this operation
-	// refers to. Id is matched against the "_id" document field.
-	C  string      `bson:"c"`
-	Id interface{} `bson:"d"`
-
-	// Assert optionally holds a query document that is used to
-	// test the operation document at the time the transaction is
-	// going to be applied. The assertions for all operations in
-	// a transaction are tested before any changes take place,
-	// and the transaction is entirely aborted if any of them
-	// fails. This is also the only way to prevent a transaction
-	// from being being applied (the transaction continues despite
-	// the outcome of Insert, Update, and Remove).
-	Assert interface{} `bson:"a,omitempty"`
-
-	// The Insert, Update and Remove fields describe the mutation
-	// intended by the operation. At most one of them may be set
-	// per operation. If none are set, Assert must be set and the
-	// operation becomes a read-only test.
-	//
-	// Insert holds the document to be inserted at the time the
-	// transaction is applied. The Id field will be inserted
-	// into the document automatically as its _id field. The
-	// transaction will continue even if the document already
-	// exists. Use Assert with txn.DocMissing if the insertion is
-	// required.
-	//
-	// Update holds the update document to be applied at the time
-	// the transaction is applied. The transaction will continue
-	// even if a document with Id is missing. Use Assert to
-	// test for the document presence or its contents.
-	//
-	// Remove indicates whether to remove the document with Id.
-	// The transaction continues even if the document doesn't yet
-	// exist at the time the transaction is applied. Use Assert
-	// with txn.DocExists to make sure it will be removed.
-	Insert interface{} `bson:"i,omitempty"`
-	Update interface{} `bson:"u,omitempty"`
-	Remove bool        `bson:"r,omitempty"`
-}
-
-func (op *Op) isChange() bool {
-	return op.Update != nil || op.Insert != nil || op.Remove
-}
-
-func (op *Op) docKey() docKey {
-	return docKey{op.C, op.Id}
-}
-
-func (op *Op) name() string {
-	switch {
-	case op.Update != nil:
-		return "update"
-	case op.Insert != nil:
-		return "insert"
-	case op.Remove:
-		return "remove"
-	case op.Assert != nil:
-		return "assert"
-	}
-	return "none"
-}
-
-const (
-	// DocExists and DocMissing may be used on an operation's
-	// Assert value to assert that the document with the given
-	// Id exists or does not exist, respectively.
-	DocExists  = "d+"
-	DocMissing = "d-"
-)
-
-// A Runner applies operations as part of a transaction onto any number
-// of collections within a database. See the Run method for details.
-type Runner struct {
-	tc *mgo.Collection // txns
-	sc *mgo.Collection // stash
-	lc *mgo.Collection // log
-}
-
-// NewRunner returns a new transaction runner that uses tc to hold its
-// transactions.
-//
-// Multiple transaction collections may exist in a single database, but
-// all collections that are touched by operations in a given transaction
-// collection must be handled exclusively by it.
-//
-// A second collection with the same name of tc but suffixed by ".stash"
-// will be used for implementing the transactional behavior of insert
-// and remove operations.
-func NewRunner(tc *mgo.Collection) *Runner {
-	return &Runner{tc, tc.Database.C(tc.Name + ".stash"), nil}
-}
-
-var ErrAborted = fmt.Errorf("transaction aborted")
-
-// Run creates a new transaction with ops and runs it immediately.
-// The id parameter specifies the transaction id, and may be written
-// down ahead of time to later verify the success of the change and
-// resume it, when the procedure is interrupted for any reason. If
-// empty, a random id will be generated.
-// The info parameter, if not nil, is included under the "i"
-// field of the transaction document.
-//
-// Operations across documents are not atomically applied, but are
-// guaranteed to be eventually all applied in the order provided or
-// all aborted, as long as the affected documents are only modified
-// through transactions. If documents are simultaneously modified
-// by transactions and out of transactions the behavior is undefined.
-//
-// If Run returns no errors, all operations were applied successfully.
-// If it returns ErrAborted, one or more operations can't be applied
-// and the transaction was entirely aborted with no changes performed.
-// Otherwise, if the transaction is interrupted while running for any
-// reason, it may be resumed explicitly or by attempting to apply
-// another transaction on any of the documents targeted by ops, as
-// long as the interruption was made after the transaction document
-// itself was inserted. Run Resume with the obtained transaction id
-// to confirm whether the transaction was applied or not.
-//
-// Any number of transactions may be run concurrently, with one
-// runner or many.
-func (r *Runner) Run(ops []Op, id bson.ObjectId, info interface{}) (err error) {
-	const efmt = "error in transaction op %d: %s"
-	for i := range ops {
-		op := &ops[i]
-		if op.C == "" || op.Id == nil {
-			return fmt.Errorf(efmt, i, "C or Id missing")
-		}
-		changes := 0
-		if op.Insert != nil {
-			changes++
-		}
-		if op.Update != nil {
-			changes++
-		}
-		if op.Remove {
-			changes++
-		}
-		if changes > 1 {
-			return fmt.Errorf(efmt, i, "more than one of Insert/Update/Remove set")
-		}
-		if changes == 0 && op.Assert == nil {
-			return fmt.Errorf(efmt, i, "none of Assert/Insert/Update/Remove set")
-		}
-	}
-	if id == "" {
-		id = bson.NewObjectId()
-	}
-
-	// Insert transaction sooner rather than later, to stay on the safer side.
-	t := transaction{
-		Id:    id,
-		Ops:   ops,
-		State: tpreparing,
-		Info:  info,
-	}
-	if err = r.tc.Insert(&t); err != nil {
-		return err
-	}
-	if err = flush(r, &t); err != nil {
-		return err
-	}
-	if t.State == taborted {
-		return ErrAborted
-	} else if t.State != tapplied {
-		panic(fmt.Errorf("invalid state for %s after flush: %q", &t, t.State))
-	}
-	return nil
-}
-
-// ResumeAll resumes all pending transactions. All ErrAborted errors
-// from individual transactions are ignored.
-func (r *Runner) ResumeAll() (err error) {
-	debugf("Resuming all unfinished transactions")
-	iter := r.tc.Find(bson.D{{"s", bson.D{{"$in", []state{tpreparing, tprepared, tapplying}}}}}).Iter()
-	var t transaction
-	for iter.Next(&t) {
-		if t.State == tapplied || t.State == taborted {
-			continue
-		}
-		debugf("Resuming %s from %q", t.Id, t.State)
-		if err := flush(r, &t); err != nil {
-			return err
-		}
-		if !t.done() {
-			panic(fmt.Errorf("invalid state for %s after flush: %q", &t, t.State))
-		}
-	}
-	return nil
-}
-
-// Resume resumes the transaction with id. It returns mgo.ErrNotFound
-// if the transaction is not found. Otherwise, it has the same semantics
-// of the Run method after the transaction is inserted.
-func (r *Runner) Resume(id bson.ObjectId) (err error) {
-	t, err := r.load(id)
-	if err != nil {
-		return err
-	}
-	if !t.done() {
-		debugf("Resuming %s from %q", t, t.State)
-		if err := flush(r, t); err != nil {
-			return err
-		}
-	}
-	if t.State == taborted {
-		return ErrAborted
-	} else if t.State != tapplied {
-		panic(fmt.Errorf("invalid state for %s after flush: %q", t, t.State))
-	}
-	return nil
-}
-
-// ChangeLog enables logging of changes to the given collection
-// every time a transaction that modifies content is done being
-// applied.
-//
-// Saved documents are in the format:
-//
-//     {"_id": <txn id>, <collection>: {"d": [<doc id>, ...], "r": [<doc revno>, ...]}}
-//
-// The document revision is the value of the txn-revno field after
-// the change has been applied. Negative values indicate the document
-// was not present in the collection. Revisions will not change when
-// updates or removes are applied to missing documents or inserts are
-// attempted when the document isn't present.
-func (r *Runner) ChangeLog(logc *mgo.Collection) {
-	r.lc = logc
-}
-
-// PurgeMissing removes from collections any state that refers to transaction
-// documents that for whatever reason have been lost from the system (removed
-// by accident or lost in a hard crash, for example).
-//
-// This method should very rarely be needed, if at all, and should never be
-// used during the normal operation of an application. Its purpose is to put
-// a system that has seen unavoidable corruption back in a working state.
-func (r *Runner) PurgeMissing(collections ...string) error {
-	type M map[string]interface{}
-	type S []interface{}
-
-	type TDoc struct {
-		Id       interface{} "_id"
-		TxnQueue []string    "txn-queue"
-	}
-
-	found := make(map[bson.ObjectId]bool)
-
-	sort.Strings(collections)
-	for _, collection := range collections {
-		c := r.tc.Database.C(collection)
-		iter := c.Find(nil).Select(bson.M{"_id": 1, "txn-queue": 1}).Iter()
-		var tdoc TDoc
-		for iter.Next(&tdoc) {
-			for _, txnToken := range tdoc.TxnQueue {
-				txnId := bson.ObjectIdHex(txnToken[:24])
-				if found[txnId] {
-					continue
-				}
-				if r.tc.FindId(txnId).One(nil) == nil {
-					found[txnId] = true
-					continue
-				}
-				logf("WARNING: purging from document %s/%v the missing transaction id %s", collection, tdoc.Id, txnId)
-				err := c.UpdateId(tdoc.Id, M{"$pull": M{"txn-queue": M{"$regex": "^" + txnId.Hex() + "_*"}}})
-				if err != nil {
-					return fmt.Errorf("error purging missing transaction %s: %v", txnId.Hex(), err)
-				}
-			}
-		}
-		if err := iter.Close(); err != nil {
-			return fmt.Errorf("transaction queue iteration error for %s: %v", collection, err)
-		}
-	}
-
-	type StashTDoc struct {
-		Id       docKey   "_id"
-		TxnQueue []string "txn-queue"
-	}
-
-	iter := r.sc.Find(nil).Select(bson.M{"_id": 1, "txn-queue": 1}).Iter()
-	var stdoc StashTDoc
-	for iter.Next(&stdoc) {
-		for _, txnToken := range stdoc.TxnQueue {
-			txnId := bson.ObjectIdHex(txnToken[:24])
-			if found[txnId] {
-				continue
-			}
-			if r.tc.FindId(txnId).One(nil) == nil {
-				found[txnId] = true
-				continue
-			}
-			logf("WARNING: purging from stash document %s/%v the missing transaction id %s", stdoc.Id.C, stdoc.Id.Id, txnId)
-			err := r.sc.UpdateId(stdoc.Id, M{"$pull": M{"txn-queue": M{"$regex": "^" + txnId.Hex() + "_*"}}})
-			if err != nil {
-				return fmt.Errorf("error purging missing transaction %s: %v", txnId.Hex(), err)
-			}
-		}
-	}
-	if err := iter.Close(); err != nil {
-		return fmt.Errorf("transaction stash iteration error: %v", err)
-	}
-
-	return nil
-}
-
-func (r *Runner) load(id bson.ObjectId) (*transaction, error) {
-	var t transaction
-	err := r.tc.FindId(id).One(&t)
-	if err == mgo.ErrNotFound {
-		return nil, fmt.Errorf("cannot find transaction %s", id)
-	} else if err != nil {
-		return nil, err
-	}
-	return &t, nil
-}
-
-type typeNature int
-
-const (
-	// The order of these values matters. Transactions
-	// from applications using different ordering will
-	// be incompatible with each other.
-	_ typeNature = iota
-	natureString
-	natureInt
-	natureFloat
-	natureBool
-	natureStruct
-)
-
-func valueNature(v interface{}) (value interface{}, nature typeNature) {
-	rv := reflect.ValueOf(v)
-	switch rv.Kind() {
-	case reflect.String:
-		return rv.String(), natureString
-	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
-		return rv.Int(), natureInt
-	case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64:
-		return int64(rv.Uint()), natureInt
-	case reflect.Float32, reflect.Float64:
-		return rv.Float(), natureFloat
-	case reflect.Bool:
-		return rv.Bool(), natureBool
-	case reflect.Struct:
-		return v, natureStruct
-	}
-	panic("document id type unsupported by txn: " + rv.Kind().String())
-}
-
-type docKey struct {
-	C  string
-	Id interface{}
-}
-
-type docKeys []docKey
-
-func (ks docKeys) Len() int      { return len(ks) }
-func (ks docKeys) Swap(i, j int) { ks[i], ks[j] = ks[j], ks[i] }
-func (ks docKeys) Less(i, j int) bool {
-	a, b := ks[i], ks[j]
-	if a.C != b.C {
-		return a.C < b.C
-	}
-	return valuecmp(a.Id, b.Id) == -1
-}
-
-func valuecmp(a, b interface{}) int {
-	av, an := valueNature(a)
-	bv, bn := valueNature(b)
-	if an < bn {
-		return -1
-	}
-	if an > bn {
-		return 1
-	}
-
-	if av == bv {
-		return 0
-	}
-	var less bool
-	switch an {
-	case natureString:
-		less = av.(string) < bv.(string)
-	case natureInt:
-		less = av.(int64) < bv.(int64)
-	case natureFloat:
-		less = av.(float64) < bv.(float64)
-	case natureBool:
-		less = !av.(bool) && bv.(bool)
-	case natureStruct:
-		less = structcmp(av, bv) == -1
-	default:
-		panic("unreachable")
-	}
-	if less {
-		return -1
-	}
-	return 1
-}
-
-func structcmp(a, b interface{}) int {
-	av := reflect.ValueOf(a)
-	bv := reflect.ValueOf(b)
-
-	var ai, bi = 0, 0
-	var an, bn = av.NumField(), bv.NumField()
-	var avi, bvi interface{}
-	var af, bf reflect.StructField
-	for {
-		for ai < an {
-			af = av.Type().Field(ai)
-			if isExported(af.Name) {
-				avi = av.Field(ai).Interface()
-				ai++
-				break
-			}
-			ai++
-		}
-		for bi < bn {
-			bf = bv.Type().Field(bi)
-			if isExported(bf.Name) {
-				bvi = bv.Field(bi).Interface()
-				bi++
-				break
-			}
-			bi++
-		}
-		if n := valuecmp(avi, bvi); n != 0 {
-			return n
-		}
-		nameA := getFieldName(af)
-		nameB := getFieldName(bf)
-		if nameA < nameB {
-			return -1
-		}
-		if nameA > nameB {
-			return 1
-		}
-		if ai == an && bi == bn {
-			return 0
-		}
-		if ai == an || bi == bn {
-			if ai == bn {
-				return -1
-			}
-			return 1
-		}
-	}
-	panic("unreachable")
-}
-
-func isExported(name string) bool {
-	a := name[0]
-	return a >= 'A' && a <= 'Z'
-}
-
-func getFieldName(f reflect.StructField) string {
-	name := f.Tag.Get("bson")
-	if i := strings.Index(name, ","); i >= 0 {
-		name = name[:i]
-	}
-	if name == "" {
-		name = strings.ToLower(f.Name)
-	}
-	return name
-}
diff --git a/Godeps/_workspace/src/gopkg.in/mgo.v2/txn/txn_test.go b/Godeps/_workspace/src/gopkg.in/mgo.v2/txn/txn_test.go
deleted file mode 100644
index 5999ada63..000000000
--- a/Godeps/_workspace/src/gopkg.in/mgo.v2/txn/txn_test.go
+++ /dev/null
@@ -1,753 +0,0 @@
-package txn_test
-
-import (
-	"fmt"
-	"sync"
-	"testing"
-	"time"
-
-	. "gopkg.in/check.v1"
-	"gopkg.in/mgo.v2"
-	"gopkg.in/mgo.v2/bson"
-	"gopkg.in/mgo.v2/txn"
-)
-
-func TestAll(t *testing.T) {
-	TestingT(t)
-}
-
-type S struct {
-	MgoSuite
-
-	db       *mgo.Database
-	tc, sc   *mgo.Collection
-	accounts *mgo.Collection
-	runner   *txn.Runner
-}
-
-var _ = Suite(&S{})
-
-type M map[string]interface{}
-
-func (s *S) SetUpTest(c *C) {
-	txn.SetChaos(txn.Chaos{})
-	txn.SetLogger(c)
-	txn.SetDebug(true)
-	s.MgoSuite.SetUpTest(c)
-
-	s.db = s.session.DB("test")
-	s.tc = s.db.C("tc")
-	s.sc = s.db.C("tc.stash")
-	s.accounts = s.db.C("accounts")
-	s.runner = txn.NewRunner(s.tc)
-}
-
-func (s *S) TearDownTest(c *C) {
-	txn.SetLogger(nil)
-	txn.SetDebug(false)
-}
-
-type Account struct {
-	Id      int `bson:"_id"`
-	Balance int
-}
-
-func (s *S) TestDocExists(c *C) {
-	err := s.accounts.Insert(M{"_id": 0, "balance": 300})
-	c.Assert(err, IsNil)
-
-	exists := []txn.Op{{
-		C:      "accounts",
-		Id:     0,
-		Assert: txn.DocExists,
-	}}
-	missing := []txn.Op{{
-		C:      "accounts",
-		Id:     0,
-		Assert: txn.DocMissing,
-	}}
-
-	err = s.runner.Run(exists, "", nil)
-	c.Assert(err, IsNil)
-	err = s.runner.Run(missing, "", nil)
-	c.Assert(err, Equals, txn.ErrAborted)
-
-	err = s.accounts.RemoveId(0)
-	c.Assert(err, IsNil)
-
-	err = s.runner.Run(exists, "", nil)
-	c.Assert(err, Equals, txn.ErrAborted)
-	err = s.runner.Run(missing, "", nil)
-	c.Assert(err, IsNil)
-}
-
-func (s *S) TestInsert(c *C) {
-	err := s.accounts.Insert(M{"_id": 0, "balance": 300})
-	c.Assert(err, IsNil)
-
-	ops := []txn.Op{{
-		C:      "accounts",
-		Id:     0,
-		Insert: M{"balance": 200},
-	}}
-
-	err = s.runner.Run(ops, "", nil)
-	c.Assert(err, IsNil)
-
-	var account Account
-	err = s.accounts.FindId(0).One(&account)
-	c.Assert(err, IsNil)
-	c.Assert(account.Balance, Equals, 300)
-
-	ops[0].Id = 1
-	err = s.runner.Run(ops, "", nil)
-	c.Assert(err, IsNil)
-
-	err = s.accounts.FindId(1).One(&account)
-	c.Assert(err, IsNil)
-	c.Assert(account.Balance, Equals, 200)
-}
-
-func (s *S) TestInsertStructID(c *C) {
-	type id struct {
-		FirstName string
-		LastName  string
-	}
-	ops := []txn.Op{{
-		C:      "accounts",
-		Id:     id{FirstName: "John", LastName: "Jones"},
-		Assert: txn.DocMissing,
-		Insert: M{"balance": 200},
-	}, {
-		C:      "accounts",
-		Id:     id{FirstName: "Sally", LastName: "Smith"},
-		Assert: txn.DocMissing,
-		Insert: M{"balance": 800},
-	}}
-
-	err := s.runner.Run(ops, "", nil)
-	c.Assert(err, IsNil)
-
-	n, err := s.accounts.Find(nil).Count()
-	c.Assert(err, IsNil)
-	c.Assert(n, Equals, 2)
-}
-
-func (s *S) TestRemove(c *C) {
-	err := s.accounts.Insert(M{"_id": 0, "balance": 300})
-	c.Assert(err, IsNil)
-
-	ops := []txn.Op{{
-		C:      "accounts",
-		Id:     0,
-		Remove: true,
-	}}
-
-	err = s.runner.Run(ops, "", nil)
-	c.Assert(err, IsNil)
-
-	err = s.accounts.FindId(0).One(nil)
-	c.Assert(err, Equals, mgo.ErrNotFound)
-
-	err = s.runner.Run(ops, "", nil)
-	c.Assert(err, IsNil)
-}
-
-func (s *S) TestUpdate(c *C) {
-	var err error
-	err = s.accounts.Insert(M{"_id": 0, "balance": 200})
-	c.Assert(err, IsNil)
-	err = s.accounts.Insert(M{"_id": 1, "balance": 200})
-	c.Assert(err, IsNil)
-
-	ops := []txn.Op{{
-		C:      "accounts",
-		Id:     0,
-		Update: M{"$inc": M{"balance": 100}},
-	}}
-
-	err = s.runner.Run(ops, "", nil)
-	c.Assert(err, IsNil)
-
-	var account Account
-	err = s.accounts.FindId(0).One(&account)
-	c.Assert(err, IsNil)
-	c.Assert(account.Balance, Equals, 300)
-
-	ops[0].Id = 1
-
-	err = s.accounts.FindId(1).One(&account)
-	c.Assert(err, IsNil)
-	c.Assert(account.Balance, Equals, 200)
-}
-
-func (s *S) TestInsertUpdate(c *C) {
-	ops := []txn.Op{{
-		C:      "accounts",
-		Id:     0,
-		Insert: M{"_id": 0, "balance": 200},
-	}, {
-		C:      "accounts",
-		Id:     0,
-		Update: M{"$inc": M{"balance": 100}},
-	}}
-
-	err := s.runner.Run(ops, "", nil)
-	c.Assert(err, IsNil)
-
-	var account Account
-	err = s.accounts.FindId(0).One(&account)
-	c.Assert(err, IsNil)
-	c.Assert(account.Balance, Equals, 300)
-
-	err = s.runner.Run(ops, "", nil)
-	c.Assert(err, IsNil)
-
-	err = s.accounts.FindId(0).One(&account)
-	c.Assert(err, IsNil)
-	c.Assert(account.Balance, Equals, 400)
-}
-
-func (s *S) TestUpdateInsert(c *C) {
-	ops := []txn.Op{{
-		C:      "accounts",
-		Id:     0,
-		Update: M{"$inc": M{"balance": 100}},
-	}, {
-		C:      "accounts",
-		Id:     0,
-		Insert: M{"_id": 0, "balance": 200},
-	}}
-
-	err := s.runner.Run(ops, "", nil)
-	c.Assert(err, IsNil)
-
-	var account Account
-	err = s.accounts.FindId(0).One(&account)
-	c.Assert(err, IsNil)
-	c.Assert(account.Balance, Equals, 200)
-
-	err = s.runner.Run(ops, "", nil)
-	c.Assert(err, IsNil)
-
-	err = s.accounts.FindId(0).One(&account)
-	c.Assert(err, IsNil)
-	c.Assert(account.Balance, Equals, 300)
-}
-
-func (s *S) TestInsertRemoveInsert(c *C) {
-	ops := []txn.Op{{
-		C:      "accounts",
-		Id:     0,
-		Insert: M{"_id": 0, "balance": 200},
-	}, {
-		C:      "accounts",
-		Id:     0,
-		Remove: true,
-	}, {
-		C:      "accounts",
-		Id:     0,
-		Insert: M{"_id": 0, "balance": 300},
-	}}
-
-	err := s.runner.Run(ops, "", nil)
-	c.Assert(err, IsNil)
-
-	var account Account
-	err = s.accounts.FindId(0).One(&account)
-	c.Assert(err, IsNil)
-	c.Assert(account.Balance, Equals, 300)
-}
-
-func (s *S) TestQueueStashing(c *C) {
-	txn.SetChaos(txn.Chaos{
-		KillChance: 1,
-		Breakpoint: "set-applying",
-	})
-
-	opses := [][]txn.Op{{{
-		C:      "accounts",
-		Id:     0,
-		Insert: M{"balance": 100},
-	}}, {{
-		C:      "accounts",
-		Id:     0,
-		Remove: true,
-	}}, {{
-		C:      "accounts",
-		Id:     0,
-		Insert: M{"balance": 200},
-	}}, {{
-		C:      "accounts",
-		Id:     0,
-		Update: M{"$inc": M{"balance": 100}},
-	}}}
-
-	var last bson.ObjectId
-	for _, ops := range opses {
-		last = bson.NewObjectId()
-		err := s.runner.Run(ops, last, nil)
-		c.Assert(err, Equals, txn.ErrChaos)
-	}
-
-	txn.SetChaos(txn.Chaos{})
-	err := s.runner.Resume(last)
-	c.Assert(err, IsNil)
-
-	var account Account
-	err = s.accounts.FindId(0).One(&account)
-	c.Assert(err, IsNil)
-	c.Assert(account.Balance, Equals, 300)
-}
-
-func (s *S) TestInfo(c *C) {
-	ops := []txn.Op{{
-		C:      "accounts",
-		Id:     0,
-		Assert: txn.DocMissing,
-	}}
-
-	id := bson.NewObjectId()
-	err := s.runner.Run(ops, id, M{"n": 42})
-	c.Assert(err, IsNil)
-
-	var t struct{ I struct{ N int } }
-	err = s.tc.FindId(id).One(&t)
-	c.Assert(err, IsNil)
-	c.Assert(t.I.N, Equals, 42)
-}
-
-func (s *S) TestErrors(c *C) {
-	doc := bson.M{"foo": 1}
-	tests := []txn.Op{{
-		C:  "c",
-		Id: 0,
-	}, {
-		C:      "c",
-		Id:     0,
-		Insert: doc,
-		Remove: true,
-	}, {
-		C:      "c",
-		Id:     0,
-		Insert: doc,
-		Update: doc,
-	}, {
-		C:      "c",
-		Id:     0,
-		Update: doc,
-		Remove: true,
-	}, {
-		C:      "c",
-		Assert: doc,
-	}, {
-		Id:     0,
-		Assert: doc,
-	}}
-
-	txn.SetChaos(txn.Chaos{KillChance: 1.0})
-	for _, op := range tests {
-		c.Logf("op: %v", op)
-		err := s.runner.Run([]txn.Op{op}, "", nil)
-		c.Assert(err, ErrorMatches, "error in transaction op 0: .*")
-	}
-}
-
-func (s *S) TestAssertNestedOr(c *C) {
-	// Assert uses $or internally. Ensure nesting works.
-	err := s.accounts.Insert(M{"_id": 0, "balance": 300})
-	c.Assert(err, IsNil)
-
-	ops := []txn.Op{{
-		C:      "accounts",
-		Id:     0,
-		Assert: bson.D{{"$or", []bson.D{{{"balance", 100}}, {{"balance", 300}}}}},
-		Update: bson.D{{"$inc", bson.D{{"balance", 100}}}},
-	}}
-
-	err = s.runner.Run(ops, "", nil)
-	c.Assert(err, IsNil)
-
-	var account Account
-	err = s.accounts.FindId(0).One(&account)
-	c.Assert(err, IsNil)
-	c.Assert(account.Balance, Equals, 400)
-}
-
-func (s *S) TestVerifyFieldOrdering(c *C) {
-	// Used to have a map in certain operations, which means
-	// the ordering of fields would be messed up.
-	fields := bson.D{{"a", 1}, {"b", 2}, {"c", 3}}
-	ops := []txn.Op{{
-		C:      "accounts",
-		Id:     0,
-		Insert: fields,
-	}}
-
-	err := s.runner.Run(ops, "", nil)
-	c.Assert(err, IsNil)
-
-	var d bson.D
-	err = s.accounts.FindId(0).One(&d)
-	c.Assert(err, IsNil)
-
-	var filtered bson.D
-	for _, e := range d {
-		switch e.Name {
-		case "a", "b", "c":
-			filtered = append(filtered, e)
-		}
-	}
-	c.Assert(filtered, DeepEquals, fields)
-}
-
-func (s *S) TestChangeLog(c *C) {
-	chglog := s.db.C("chglog")
-	s.runner.ChangeLog(chglog)
-
-	ops := []txn.Op{{
-		C:      "debts",
-		Id:     0,
-		Assert: txn.DocMissing,
-	}, {
-		C:      "accounts",
-		Id:     0,
-		Insert: M{"balance": 300},
-	}, {
-		C:      "accounts",
-		Id:     1,
-		Insert: M{"balance": 300},
-	}, {
-		C:      "people",
-		Id:     "joe",
-		Insert: M{"accounts": []int64{0, 1}},
-	}}
-	id := bson.NewObjectId()
-	err := s.runner.Run(ops, id, nil)
-	c.Assert(err, IsNil)
-
-	type IdList []interface{}
-	type Log struct {
-		Docs   IdList  "d"
-		Revnos []int64 "r"
-	}
-	var m map[string]*Log
-	err = chglog.FindId(id).One(&m)
-	c.Assert(err, IsNil)
-
-	c.Assert(m["accounts"], DeepEquals, &Log{IdList{0, 1}, []int64{2, 2}})
-	c.Assert(m["people"], DeepEquals, &Log{IdList{"joe"}, []int64{2}})
-	c.Assert(m["debts"], IsNil)
-
-	ops = []txn.Op{{
-		C:      "accounts",
-		Id:     0,
-		Update: M{"$inc": M{"balance": 100}},
-	}, {
-		C:      "accounts",
-		Id:     1,
-		Update: M{"$inc": M{"balance": 100}},
-	}}
-	id = bson.NewObjectId()
-	err = s.runner.Run(ops, id, nil)
-	c.Assert(err, IsNil)
-
-	m = nil
-	err = chglog.FindId(id).One(&m)
-	c.Assert(err, IsNil)
-
-	c.Assert(m["accounts"], DeepEquals, &Log{IdList{0, 1}, []int64{3, 3}})
-	c.Assert(m["people"], IsNil)
-
-	ops = []txn.Op{{
-		C:      "accounts",
-		Id:     0,
-		Remove: true,
-	}, {
-		C:      "people",
-		Id:     "joe",
-		Remove: true,
-	}}
-	id = bson.NewObjectId()
-	err = s.runner.Run(ops, id, nil)
-	c.Assert(err, IsNil)
-
-	m = nil
-	err = chglog.FindId(id).One(&m)
-	c.Assert(err, IsNil)
-
-	c.Assert(m["accounts"], DeepEquals, &Log{IdList{0}, []int64{-4}})
-	c.Assert(m["people"], DeepEquals, &Log{IdList{"joe"}, []int64{-3}})
-}
-
-func (s *S) TestPurgeMissing(c *C) {
-	txn.SetChaos(txn.Chaos{
-		KillChance: 1,
-		Breakpoint: "set-applying",
-	})
-
-	err := s.accounts.Insert(M{"_id": 0, "balance": 100})
-	c.Assert(err, IsNil)
-	err = s.accounts.Insert(M{"_id": 1, "balance": 100})
-	c.Assert(err, IsNil)
-
-	ops1 := []txn.Op{{
-		C:      "accounts",
-		Id:     3,
-		Insert: M{"balance": 100},
-	}}
-
-	ops2 := []txn.Op{{
-		C:      "accounts",
-		Id:     0,
-		Remove: true,
-	}, {
-		C:      "accounts",
-		Id:     1,
-		Update: M{"$inc": M{"balance": 100}},
-	}, {
-		C:      "accounts",
-		Id:     2,
-		Insert: M{"balance": 100},
-	}}
-
-	first := bson.NewObjectId()
-	c.Logf("---- Running ops1 under transaction %q, to be canceled by chaos", first.Hex())
-	err = s.runner.Run(ops1, first, nil)
-	c.Assert(err, Equals, txn.ErrChaos)
-
-	last := bson.NewObjectId()
-	c.Logf("---- Running ops2 under transaction %q, to be canceled by chaos", last.Hex())
-	err = s.runner.Run(ops2, last, nil)
-	c.Assert(err, Equals, txn.ErrChaos)
-
-	c.Logf("---- Removing transaction %q", last.Hex())
-	err = s.tc.RemoveId(last)
-	c.Assert(err, IsNil)
-
-	c.Logf("---- Disabling chaos and attempting to resume all")
-	txn.SetChaos(txn.Chaos{})
-	err = s.runner.ResumeAll()
-	c.Assert(err, IsNil)
-
-	again := bson.NewObjectId()
-	c.Logf("---- Running ops2 again under transaction %q, to fail for missing transaction", again.Hex())
-	err = s.runner.Run(ops2, again, nil)
-	c.Assert(err, ErrorMatches, "cannot find transaction .*")
-
-	c.Logf("---- Purging missing transactions")
-	err = s.runner.PurgeMissing("accounts")
-	c.Assert(err, IsNil)
-
-	c.Logf("---- Resuming pending transactions")
-	err = s.runner.ResumeAll()
-	c.Assert(err, IsNil)
-
-	expect := []struct{ Id, Balance int }{
-		{0, -1},
-		{1, 200},
-		{2, 100},
-		{3, 100},
-	}
-	var got Account
-	for _, want := range expect {
-		err = s.accounts.FindId(want.Id).One(&got)
-		if want.Balance == -1 {
-			if err != mgo.ErrNotFound {
-				c.Errorf("Account %d should not exist, find got err=%#v", err)
-			}
-		} else if err != nil {
-			c.Errorf("Account %d should have balance of %d, but wasn't found", want.Id, want.Balance)
-		} else if got.Balance != want.Balance {
-			c.Errorf("Account %d should have balance of %d, got %d", want.Id, want.Balance, got.Balance)
-		}
-	}
-}
-
-func (s *S) TestTxnQueueStashStressTest(c *C) {
-	txn.SetChaos(txn.Chaos{
-		SlowdownChance: 0.3,
-		Slowdown:       50 * time.Millisecond,
-	})
-	defer txn.SetChaos(txn.Chaos{})
-
-	// So we can run more iterations of the test in less time.
-	txn.SetDebug(false)
-
-	const runners = 10
-	const inserts = 10
-	const repeat = 100
-
-	for r := 0; r < repeat; r++ {
-		var wg sync.WaitGroup
-		wg.Add(runners)
-		for i := 0; i < runners; i++ {
-			go func(i, r int) {
-				defer wg.Done()
-
-				session := s.session.New()
-				defer session.Close()
-				runner := txn.NewRunner(s.tc.With(session))
-
-				for j := 0; j < inserts; j++ {
-					ops := []txn.Op{{
-						C:  "accounts",
-						Id: fmt.Sprintf("insert-%d-%d", r, j),
-						Insert: bson.M{
-							"added-by": i,
-						},
-					}}
-					err := runner.Run(ops, "", nil)
-					if err != txn.ErrAborted {
-						c.Check(err, IsNil)
-					}
-				}
-			}(i, r)
-		}
-		wg.Wait()
-	}
-}
-
-func (s *S) TestPurgeMissingPipelineSizeLimit(c *C) {
-	// This test ensures that PurgeMissing can handle very large
-	// txn-queue fields. Previous iterations of PurgeMissing would
-	// trigger a 16MB aggregation pipeline result size limit when run
-	// against a documents or stashes with large numbers of txn-queue
-	// entries. PurgeMissing now no longer uses aggregation pipelines
-	// to work around this limit.
-
-	// The pipeline result size limitation was removed from MongoDB in 2.6 so
-	// this test is only run for older MongoDB version.
-	build, err := s.session.BuildInfo()
-	c.Assert(err, IsNil)
-	if build.VersionAtLeast(2, 6) {
-		c.Skip("This tests a problem that can only happen with MongoDB < 2.6 ")
-	}
-
-	// Insert a single document to work with.
-	err = s.accounts.Insert(M{"_id": 0, "balance": 100})
-	c.Assert(err, IsNil)
-
-	ops := []txn.Op{{
-		C:      "accounts",
-		Id:     0,
-		Update: M{"$inc": M{"balance": 100}},
-	}}
-
-	// Generate one successful transaction.
-	good := bson.NewObjectId()
-	c.Logf("---- Running ops under transaction %q", good.Hex())
-	err = s.runner.Run(ops, good, nil)
-	c.Assert(err, IsNil)
-
-	// Generate another transaction which which will go missing.
-	missing := bson.NewObjectId()
-	c.Logf("---- Running ops under transaction %q (which will go missing)", missing.Hex())
-	err = s.runner.Run(ops, missing, nil)
-	c.Assert(err, IsNil)
-
-	err = s.tc.RemoveId(missing)
-	c.Assert(err, IsNil)
-
-	// Generate a txn-queue on the test document that's large enough
-	// that it used to cause PurgeMissing to exceed MongoDB's pipeline
-	// result 16MB size limit (MongoDB 2.4 and older only).
-	//
-	// The contents of the txn-queue field doesn't matter, only that
-	// it's big enough to trigger the size limit. The required size
-	// can also be achieved by using multiple documents as long as the
-	// cumulative size of all the txn-queue fields exceeds the
-	// pipeline limit. A single document is easier to work with for
-	// this test however.
-	//
-	// The txn id of the successful transaction is used fill the
-	// txn-queue because this takes advantage of a short circuit in
-	// PurgeMissing, dramatically speeding up the test run time.
-	const fakeQueueLen = 250000
-	fakeTxnQueue := make([]string, fakeQueueLen)
-	token := good.Hex() + "_12345678" // txn id + nonce
-	for i := 0; i < fakeQueueLen; i++ {
-		fakeTxnQueue[i] = token
-	}
-
-	err = s.accounts.UpdateId(0, bson.M{
-		"$set": bson.M{"txn-queue": fakeTxnQueue},
-	})
-	c.Assert(err, IsNil)
-
-	// PurgeMissing could hit the same pipeline result size limit when
-	// processing the txn-queue fields of stash documents so insert
-	// the large txn-queue there too to ensure that no longer happens.
-	err = s.sc.Insert(
-		bson.D{{"c", "accounts"}, {"id", 0}},
-		bson.M{"txn-queue": fakeTxnQueue},
-	)
-	c.Assert(err, IsNil)
-
-	c.Logf("---- Purging missing transactions")
-	err = s.runner.PurgeMissing("accounts")
-	c.Assert(err, IsNil)
-}
-
-func (s *S) TestTxnQueueStressTest(c *C) {
-	txn.SetChaos(txn.Chaos{
-		SlowdownChance: 0.3,
-		Slowdown:       50 * time.Millisecond,
-	})
-	defer txn.SetChaos(txn.Chaos{})
-
-	// So we can run more iterations of the test in less time.
-	txn.SetDebug(false)
-
-	err := s.accounts.Insert(M{"_id": 0, "balance": 0}, M{"_id": 1, "balance": 0})
-	c.Assert(err, IsNil)
-
-	// Run half of the operations changing account 0 and then 1,
-	// and the other half in the opposite order.
-	ops01 := []txn.Op{{
-		C:      "accounts",
-		Id:     0,
-		Update: M{"$inc": M{"balance": 1}},
-	}, {
-		C:      "accounts",
-		Id:     1,
-		Update: M{"$inc": M{"balance": 1}},
-	}}
-
-	ops10 := []txn.Op{{
-		C:      "accounts",
-		Id:     1,
-		Update: M{"$inc": M{"balance": 1}},
-	}, {
-		C:      "accounts",
-		Id:     0,
-		Update: M{"$inc": M{"balance": 1}},
-	}}
-
-	ops := [][]txn.Op{ops01, ops10}
-
-	const runners = 4
-	const changes = 1000
-
-	var wg sync.WaitGroup
-	wg.Add(runners)
-	for n := 0; n < runners; n++ {
-		n := n
-		go func() {
-			defer wg.Done()
-			for i := 0; i < changes; i++ {
-				err = s.runner.Run(ops[n%2], "", nil)
-				c.Assert(err, IsNil)
-			}
-		}()
-	}
-	wg.Wait()
-
-	for id := 0; id < 2; id++ {
-		var account Account
-		err = s.accounts.FindId(id).One(&account)
-		if account.Balance != runners*changes {
-			c.Errorf("Account should have balance of %d, got %d", runners*changes, account.Balance)
-		}
-	}
-}
diff --git a/Godeps/_workspace/src/gopkg.in/yaml.v2/LICENSE b/Godeps/_workspace/src/gopkg.in/yaml.v2/LICENSE
deleted file mode 100644
index a68e67f01..000000000
--- a/Godeps/_workspace/src/gopkg.in/yaml.v2/LICENSE
+++ /dev/null
@@ -1,188 +0,0 @@
-
-Copyright (c) 2011-2014 - Canonical Inc.
-
-This software is licensed under the LGPLv3, included below.
-
-As a special exception to the GNU Lesser General Public License version 3
-("LGPL3"), the copyright holders of this Library give you permission to
-convey to a third party a Combined Work that links statically or dynamically
-to this Library without providing any Minimal Corresponding Source or
-Minimal Application Code as set out in 4d or providing the installation
-information set out in section 4e, provided that you comply with the other
-provisions of LGPL3 and provided that you meet, for the Application the
-terms and conditions of the license(s) which apply to the Application.
-
-Except as stated in this special exception, the provisions of LGPL3 will
-continue to comply in full to this Library. If you modify this Library, you
-may apply this exception to your version of this Library, but you are not
-obliged to do so. If you do not wish to do so, delete this exception
-statement from your version. This exception does not (and cannot) modify any
-license terms which apply to the Application, with which you must still
-comply.
-
-
-                   GNU LESSER GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-
-  This version of the GNU Lesser General Public License incorporates
-the terms and conditions of version 3 of the GNU General Public
-License, supplemented by the additional permissions listed below.
-
-  0. Additional Definitions.
-
-  As used herein, "this License" refers to version 3 of the GNU Lesser
-General Public License, and the "GNU GPL" refers to version 3 of the GNU
-General Public License.
-
-  "The Library" refers to a covered work governed by this License,
-other than an Application or a Combined Work as defined below.
-
-  An "Application" is any work that makes use of an interface provided
-by the Library, but which is not otherwise based on the Library.
-Defining a subclass of a class defined by the Library is deemed a mode
-of using an interface provided by the Library.
-
-  A "Combined Work" is a work produced by combining or linking an
-Application with the Library.  The particular version of the Library
-with which the Combined Work was made is also called the "Linked
-Version".
-
-  The "Minimal Corresponding Source" for a Combined Work means the
-Corresponding Source for the Combined Work, excluding any source code
-for portions of the Combined Work that, considered in isolation, are
-based on the Application, and not on the Linked Version.
-
-  The "Corresponding Application Code" for a Combined Work means the
-object code and/or source code for the Application, including any data
-and utility programs needed for reproducing the Combined Work from the
-Application, but excluding the System Libraries of the Combined Work.
-
-  1. Exception to Section 3 of the GNU GPL.
-
-  You may convey a covered work under sections 3 and 4 of this License
-without being bound by section 3 of the GNU GPL.
-
-  2. Conveying Modified Versions.
-
-  If you modify a copy of the Library, and, in your modifications, a
-facility refers to a function or data to be supplied by an Application
-that uses the facility (other than as an argument passed when the
-facility is invoked), then you may convey a copy of the modified
-version:
-
-   a) under this License, provided that you make a good faith effort to
-   ensure that, in the event an Application does not supply the
-   function or data, the facility still operates, and performs
-   whatever part of its purpose remains meaningful, or
-
-   b) under the GNU GPL, with none of the additional permissions of
-   this License applicable to that copy.
-
-  3. Object Code Incorporating Material from Library Header Files.
-
-  The object code form of an Application may incorporate material from
-a header file that is part of the Library.  You may convey such object
-code under terms of your choice, provided that, if the incorporated
-material is not limited to numerical parameters, data structure
-layouts and accessors, or small macros, inline functions and templates
-(ten or fewer lines in length), you do both of the following:
-
-   a) Give prominent notice with each copy of the object code that the
-   Library is used in it and that the Library and its use are
-   covered by this License.
-
-   b) Accompany the object code with a copy of the GNU GPL and this license
-   document.
-
-  4. Combined Works.
-
-  You may convey a Combined Work under terms of your choice that,
-taken together, effectively do not restrict modification of the
-portions of the Library contained in the Combined Work and reverse
-engineering for debugging such modifications, if you also do each of
-the following:
-
-   a) Give prominent notice with each copy of the Combined Work that
-   the Library is used in it and that the Library and its use are
-   covered by this License.
-
-   b) Accompany the Combined Work with a copy of the GNU GPL and this license
-   document.
-
-   c) For a Combined Work that displays copyright notices during
-   execution, include the copyright notice for the Library among
-   these notices, as well as a reference directing the user to the
-   copies of the GNU GPL and this license document.
-
-   d) Do one of the following:
-
-       0) Convey the Minimal Corresponding Source under the terms of this
-       License, and the Corresponding Application Code in a form
-       suitable for, and under terms that permit, the user to
-       recombine or relink the Application with a modified version of
-       the Linked Version to produce a modified Combined Work, in the
-       manner specified by section 6 of the GNU GPL for conveying
-       Corresponding Source.
-
-       1) Use a suitable shared library mechanism for linking with the
-       Library.  A suitable mechanism is one that (a) uses at run time
-       a copy of the Library already present on the user's computer
-       system, and (b) will operate properly with a modified version
-       of the Library that is interface-compatible with the Linked
-       Version.
-
-   e) Provide Installation Information, but only if you would otherwise
-   be required to provide such information under section 6 of the
-   GNU GPL, and only to the extent that such information is
-   necessary to install and execute a modified version of the
-   Combined Work produced by recombining or relinking the
-   Application with a modified version of the Linked Version. (If
-   you use option 4d0, the Installation Information must accompany
-   the Minimal Corresponding Source and Corresponding Application
-   Code. If you use option 4d1, you must provide the Installation
-   Information in the manner specified by section 6 of the GNU GPL
-   for conveying Corresponding Source.)
-
-  5. Combined Libraries.
-
-  You may place library facilities that are a work based on the
-Library side by side in a single library together with other library
-facilities that are not Applications and are not covered by this
-License, and convey such a combined library under terms of your
-choice, if you do both of the following:
-
-   a) Accompany the combined library with a copy of the same work based
-   on the Library, uncombined with any other library facilities,
-   conveyed under the terms of this License.
-
-   b) Give prominent notice with the combined library that part of it
-   is a work based on the Library, and explaining where to find the
-   accompanying uncombined form of the same work.
-
-  6. Revised Versions of the GNU Lesser General Public License.
-
-  The Free Software Foundation may publish revised and/or new versions
-of the GNU Lesser General Public License from time to time. Such new
-versions will be similar in spirit to the present version, but may
-differ in detail to address new problems or concerns.
-
-  Each version is given a distinguishing version number. If the
-Library as you received it specifies that a certain numbered version
-of the GNU Lesser General Public License "or any later version"
-applies to it, you have the option of following the terms and
-conditions either of that published version or of any later version
-published by the Free Software Foundation. If the Library as you
-received it does not specify a version number of the GNU Lesser
-General Public License, you may choose any version of the GNU Lesser
-General Public License ever published by the Free Software Foundation.
-
-  If the Library as you received it specifies that a proxy can decide
-whether future versions of the GNU Lesser General Public License shall
-apply, that proxy's public statement of acceptance of any version is
-permanent authorization for you to choose that version for the
-Library.
diff --git a/Godeps/_workspace/src/gopkg.in/yaml.v2/LICENSE.libyaml b/Godeps/_workspace/src/gopkg.in/yaml.v2/LICENSE.libyaml
deleted file mode 100644
index 8da58fbf6..000000000
--- a/Godeps/_workspace/src/gopkg.in/yaml.v2/LICENSE.libyaml
+++ /dev/null
@@ -1,31 +0,0 @@
-The following files were ported to Go from C files of libyaml, and thus
-are still covered by their original copyright and license:
-
-    apic.go
-    emitterc.go
-    parserc.go
-    readerc.go
-    scannerc.go
-    writerc.go
-    yamlh.go
-    yamlprivateh.go
-
-Copyright (c) 2006 Kirill Simonov
-
-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/gopkg.in/yaml.v2/README.md b/Godeps/_workspace/src/gopkg.in/yaml.v2/README.md
deleted file mode 100644
index d6c919e60..000000000
--- a/Godeps/_workspace/src/gopkg.in/yaml.v2/README.md
+++ /dev/null
@@ -1,128 +0,0 @@
-# YAML support for the Go language
-
-Introduction
-------------
-
-The yaml package enables Go programs to comfortably encode and decode YAML
-values. It was developed within [Canonical](https://www.canonical.com) as
-part of the [juju](https://juju.ubuntu.com) project, and is based on a
-pure Go port of the well-known [libyaml](http://pyyaml.org/wiki/LibYAML)
-C library to parse and generate YAML data quickly and reliably.
-
-Compatibility
--------------
-
-The yaml package supports most of YAML 1.1 and 1.2, including support for
-anchors, tags, map merging, etc. Multi-document unmarshalling is not yet
-implemented, and base-60 floats from YAML 1.1 are purposefully not
-supported since they're a poor design and are gone in YAML 1.2.
-
-Installation and usage
-----------------------
-
-The import path for the package is *gopkg.in/yaml.v2*.
-
-To install it, run:
-
-    go get gopkg.in/yaml.v2
-
-API documentation
------------------
-
-If opened in a browser, the import path itself leads to the API documentation:
-
-  * [https://gopkg.in/yaml.v2](https://gopkg.in/yaml.v2)
-
-API stability
--------------
-
-The package API for yaml v2 will remain stable as described in [gopkg.in](https://gopkg.in).
-
-
-License
--------
-
-The yaml package is licensed under the LGPL with an exception that allows it to be linked statically. Please see the LICENSE file for details.
-
-
-Example
--------
-
-```Go
-package main
-
-import (
-        "fmt"
-        "log"
-
-        "gopkg.in/yaml.v2"
-)
-
-var data = `
-a: Easy!
-b:
-  c: 2
-  d: [3, 4]
-`
-
-type T struct {
-        A string
-        B struct{C int; D []int ",flow"}
-}
-
-func main() {
-        t := T{}
-    
-        err := yaml.Unmarshal([]byte(data), &t)
-        if err != nil {
-                log.Fatalf("error: %v", err)
-        }
-        fmt.Printf("--- t:\n%v\n\n", t)
-    
-        d, err := yaml.Marshal(&t)
-        if err != nil {
-                log.Fatalf("error: %v", err)
-        }
-        fmt.Printf("--- t dump:\n%s\n\n", string(d))
-    
-        m := make(map[interface{}]interface{})
-    
-        err = yaml.Unmarshal([]byte(data), &m)
-        if err != nil {
-                log.Fatalf("error: %v", err)
-        }
-        fmt.Printf("--- m:\n%v\n\n", m)
-    
-        d, err = yaml.Marshal(&m)
-        if err != nil {
-                log.Fatalf("error: %v", err)
-        }
-        fmt.Printf("--- m dump:\n%s\n\n", string(d))
-}
-```
-
-This example will generate the following output:
-
-```
---- t:
-{Easy! {2 [3 4]}}
-
---- t dump:
-a: Easy!
-b:
-  c: 2
-  d: [3, 4]
-
-
---- m:
-map[a:Easy! b:map[c:2 d:[3 4]]]
-
---- m dump:
-a: Easy!
-b:
-  c: 2
-  d:
-  - 3
-  - 4
-```
-
diff --git a/Godeps/_workspace/src/gopkg.in/yaml.v2/apic.go b/Godeps/_workspace/src/gopkg.in/yaml.v2/apic.go
deleted file mode 100644
index 95ec014e8..000000000
--- a/Godeps/_workspace/src/gopkg.in/yaml.v2/apic.go
+++ /dev/null
@@ -1,742 +0,0 @@
-package yaml
-
-import (
-	"io"
-	"os"
-)
-
-func yaml_insert_token(parser *yaml_parser_t, pos int, token *yaml_token_t) {
-	//fmt.Println("yaml_insert_token", "pos:", pos, "typ:", token.typ, "head:", parser.tokens_head, "len:", len(parser.tokens))
-
-	// Check if we can move the queue at the beginning of the buffer.
-	if parser.tokens_head > 0 && len(parser.tokens) == cap(parser.tokens) {
-		if parser.tokens_head != len(parser.tokens) {
-			copy(parser.tokens, parser.tokens[parser.tokens_head:])
-		}
-		parser.tokens = parser.tokens[:len(parser.tokens)-parser.tokens_head]
-		parser.tokens_head = 0
-	}
-	parser.tokens = append(parser.tokens, *token)
-	if pos < 0 {
-		return
-	}
-	copy(parser.tokens[parser.tokens_head+pos+1:], parser.tokens[parser.tokens_head+pos:])
-	parser.tokens[parser.tokens_head+pos] = *token
-}
-
-// Create a new parser object.
-func yaml_parser_initialize(parser *yaml_parser_t) bool {
-	*parser = yaml_parser_t{
-		raw_buffer: make([]byte, 0, input_raw_buffer_size),
-		buffer:     make([]byte, 0, input_buffer_size),
-	}
-	return true
-}
-
-// Destroy a parser object.
-func yaml_parser_delete(parser *yaml_parser_t) {
-	*parser = yaml_parser_t{}
-}
-
-// String read handler.
-func yaml_string_read_handler(parser *yaml_parser_t, buffer []byte) (n int, err error) {
-	if parser.input_pos == len(parser.input) {
-		return 0, io.EOF
-	}
-	n = copy(buffer, parser.input[parser.input_pos:])
-	parser.input_pos += n
-	return n, nil
-}
-
-// File read handler.
-func yaml_file_read_handler(parser *yaml_parser_t, buffer []byte) (n int, err error) {
-	return parser.input_file.Read(buffer)
-}
-
-// Set a string input.
-func yaml_parser_set_input_string(parser *yaml_parser_t, input []byte) {
-	if parser.read_handler != nil {
-		panic("must set the input source only once")
-	}
-	parser.read_handler = yaml_string_read_handler
-	parser.input = input
-	parser.input_pos = 0
-}
-
-// Set a file input.
-func yaml_parser_set_input_file(parser *yaml_parser_t, file *os.File) {
-	if parser.read_handler != nil {
-		panic("must set the input source only once")
-	}
-	parser.read_handler = yaml_file_read_handler
-	parser.input_file = file
-}
-
-// Set the source encoding.
-func yaml_parser_set_encoding(parser *yaml_parser_t, encoding yaml_encoding_t) {
-	if parser.encoding != yaml_ANY_ENCODING {
-		panic("must set the encoding only once")
-	}
-	parser.encoding = encoding
-}
-
-// Create a new emitter object.
-func yaml_emitter_initialize(emitter *yaml_emitter_t) bool {
-	*emitter = yaml_emitter_t{
-		buffer:     make([]byte, output_buffer_size),
-		raw_buffer: make([]byte, 0, output_raw_buffer_size),
-		states:     make([]yaml_emitter_state_t, 0, initial_stack_size),
-		events:     make([]yaml_event_t, 0, initial_queue_size),
-	}
-	return true
-}
-
-// Destroy an emitter object.
-func yaml_emitter_delete(emitter *yaml_emitter_t) {
-	*emitter = yaml_emitter_t{}
-}
-
-// String write handler.
-func yaml_string_write_handler(emitter *yaml_emitter_t, buffer []byte) error {
-	*emitter.output_buffer = append(*emitter.output_buffer, buffer...)
-	return nil
-}
-
-// File write handler.
-func yaml_file_write_handler(emitter *yaml_emitter_t, buffer []byte) error {
-	_, err := emitter.output_file.Write(buffer)
-	return err
-}
-
-// Set a string output.
-func yaml_emitter_set_output_string(emitter *yaml_emitter_t, output_buffer *[]byte) {
-	if emitter.write_handler != nil {
-		panic("must set the output target only once")
-	}
-	emitter.write_handler = yaml_string_write_handler
-	emitter.output_buffer = output_buffer
-}
-
-// Set a file output.
-func yaml_emitter_set_output_file(emitter *yaml_emitter_t, file io.Writer) {
-	if emitter.write_handler != nil {
-		panic("must set the output target only once")
-	}
-	emitter.write_handler = yaml_file_write_handler
-	emitter.output_file = file
-}
-
-// Set the output encoding.
-func yaml_emitter_set_encoding(emitter *yaml_emitter_t, encoding yaml_encoding_t) {
-	if emitter.encoding != yaml_ANY_ENCODING {
-		panic("must set the output encoding only once")
-	}
-	emitter.encoding = encoding
-}
-
-// Set the canonical output style.
-func yaml_emitter_set_canonical(emitter *yaml_emitter_t, canonical bool) {
-	emitter.canonical = canonical
-}
-
-//// Set the indentation increment.
-func yaml_emitter_set_indent(emitter *yaml_emitter_t, indent int) {
-	if indent < 2 || indent > 9 {
-		indent = 2
-	}
-	emitter.best_indent = indent
-}
-
-// Set the preferred line width.
-func yaml_emitter_set_width(emitter *yaml_emitter_t, width int) {
-	if width < 0 {
-		width = -1
-	}
-	emitter.best_width = width
-}
-
-// Set if unescaped non-ASCII characters are allowed.
-func yaml_emitter_set_unicode(emitter *yaml_emitter_t, unicode bool) {
-	emitter.unicode = unicode
-}
-
-// Set the preferred line break character.
-func yaml_emitter_set_break(emitter *yaml_emitter_t, line_break yaml_break_t) {
-	emitter.line_break = line_break
-}
-
-///*
-// * Destroy a token object.
-// */
-//
-//YAML_DECLARE(void)
-//yaml_token_delete(yaml_token_t *token)
-//{
-//    assert(token);  // Non-NULL token object expected.
-//
-//    switch (token.type)
-//    {
-//        case YAML_TAG_DIRECTIVE_TOKEN:
-//            yaml_free(token.data.tag_directive.handle);
-//            yaml_free(token.data.tag_directive.prefix);
-//            break;
-//
-//        case YAML_ALIAS_TOKEN:
-//            yaml_free(token.data.alias.value);
-//            break;
-//
-//        case YAML_ANCHOR_TOKEN:
-//            yaml_free(token.data.anchor.value);
-//            break;
-//
-//        case YAML_TAG_TOKEN:
-//            yaml_free(token.data.tag.handle);
-//            yaml_free(token.data.tag.suffix);
-//            break;
-//
-//        case YAML_SCALAR_TOKEN:
-//            yaml_free(token.data.scalar.value);
-//            break;
-//
-//        default:
-//            break;
-//    }
-//
-//    memset(token, 0, sizeof(yaml_token_t));
-//}
-//
-///*
-// * Check if a string is a valid UTF-8 sequence.
-// *
-// * Check 'reader.c' for more details on UTF-8 encoding.
-// */
-//
-//static int
-//yaml_check_utf8(yaml_char_t *start, size_t length)
-//{
-//    yaml_char_t *end = start+length;
-//    yaml_char_t *pointer = start;
-//
-//    while (pointer < end) {
-//        unsigned char octet;
-//        unsigned int width;
-//        unsigned int value;
-//        size_t k;
-//
-//        octet = pointer[0];
-//        width = (octet & 0x80) == 0x00 ? 1 :
-//                (octet & 0xE0) == 0xC0 ? 2 :
-//                (octet & 0xF0) == 0xE0 ? 3 :
-//                (octet & 0xF8) == 0xF0 ? 4 : 0;
-//        value = (octet & 0x80) == 0x00 ? octet & 0x7F :
-//                (octet & 0xE0) == 0xC0 ? octet & 0x1F :
-//                (octet & 0xF0) == 0xE0 ? octet & 0x0F :
-//                (octet & 0xF8) == 0xF0 ? octet & 0x07 : 0;
-//        if (!width) return 0;
-//        if (pointer+width > end) return 0;
-//        for (k = 1; k < width; k ++) {
-//            octet = pointer[k];
-//            if ((octet & 0xC0) != 0x80) return 0;
-//            value = (value << 6) + (octet & 0x3F);
-//        }
-//        if (!((width == 1) ||
-//            (width == 2 && value >= 0x80) ||
-//            (width == 3 && value >= 0x800) ||
-//            (width == 4 && value >= 0x10000))) return 0;
-//
-//        pointer += width;
-//    }
-//
-//    return 1;
-//}
-//
-
-// Create STREAM-START.
-func yaml_stream_start_event_initialize(event *yaml_event_t, encoding yaml_encoding_t) bool {
-	*event = yaml_event_t{
-		typ:      yaml_STREAM_START_EVENT,
-		encoding: encoding,
-	}
-	return true
-}
-
-// Create STREAM-END.
-func yaml_stream_end_event_initialize(event *yaml_event_t) bool {
-	*event = yaml_event_t{
-		typ: yaml_STREAM_END_EVENT,
-	}
-	return true
-}
-
-// Create DOCUMENT-START.
-func yaml_document_start_event_initialize(event *yaml_event_t, version_directive *yaml_version_directive_t,
-	tag_directives []yaml_tag_directive_t, implicit bool) bool {
-	*event = yaml_event_t{
-		typ:               yaml_DOCUMENT_START_EVENT,
-		version_directive: version_directive,
-		tag_directives:    tag_directives,
-		implicit:          implicit,
-	}
-	return true
-}
-
-// Create DOCUMENT-END.
-func yaml_document_end_event_initialize(event *yaml_event_t, implicit bool) bool {
-	*event = yaml_event_t{
-		typ:      yaml_DOCUMENT_END_EVENT,
-		implicit: implicit,
-	}
-	return true
-}
-
-///*
-// * Create ALIAS.
-// */
-//
-//YAML_DECLARE(int)
-//yaml_alias_event_initialize(event *yaml_event_t, anchor *yaml_char_t)
-//{
-//    mark yaml_mark_t = { 0, 0, 0 }
-//    anchor_copy *yaml_char_t = NULL
-//
-//    assert(event) // Non-NULL event object is expected.
-//    assert(anchor) // Non-NULL anchor is expected.
-//
-//    if (!yaml_check_utf8(anchor, strlen((char *)anchor))) return 0
-//
-//    anchor_copy = yaml_strdup(anchor)
-//    if (!anchor_copy)
-//        return 0
-//
-//    ALIAS_EVENT_INIT(*event, anchor_copy, mark, mark)
-//
-//    return 1
-//}
-
-// Create SCALAR.
-func yaml_scalar_event_initialize(event *yaml_event_t, anchor, tag, value []byte, plain_implicit, quoted_implicit bool, style yaml_scalar_style_t) bool {
-	*event = yaml_event_t{
-		typ:             yaml_SCALAR_EVENT,
-		anchor:          anchor,
-		tag:             tag,
-		value:           value,
-		implicit:        plain_implicit,
-		quoted_implicit: quoted_implicit,
-		style:           yaml_style_t(style),
-	}
-	return true
-}
-
-// Create SEQUENCE-START.
-func yaml_sequence_start_event_initialize(event *yaml_event_t, anchor, tag []byte, implicit bool, style yaml_sequence_style_t) bool {
-	*event = yaml_event_t{
-		typ:      yaml_SEQUENCE_START_EVENT,
-		anchor:   anchor,
-		tag:      tag,
-		implicit: implicit,
-		style:    yaml_style_t(style),
-	}
-	return true
-}
-
-// Create SEQUENCE-END.
-func yaml_sequence_end_event_initialize(event *yaml_event_t) bool {
-	*event = yaml_event_t{
-		typ: yaml_SEQUENCE_END_EVENT,
-	}
-	return true
-}
-
-// Create MAPPING-START.
-func yaml_mapping_start_event_initialize(event *yaml_event_t, anchor, tag []byte, implicit bool, style yaml_mapping_style_t) bool {
-	*event = yaml_event_t{
-		typ:      yaml_MAPPING_START_EVENT,
-		anchor:   anchor,
-		tag:      tag,
-		implicit: implicit,
-		style:    yaml_style_t(style),
-	}
-	return true
-}
-
-// Create MAPPING-END.
-func yaml_mapping_end_event_initialize(event *yaml_event_t) bool {
-	*event = yaml_event_t{
-		typ: yaml_MAPPING_END_EVENT,
-	}
-	return true
-}
-
-// Destroy an event object.
-func yaml_event_delete(event *yaml_event_t) {
-	*event = yaml_event_t{}
-}
-
-///*
-// * Create a document object.
-// */
-//
-//YAML_DECLARE(int)
-//yaml_document_initialize(document *yaml_document_t,
-//        version_directive *yaml_version_directive_t,
-//        tag_directives_start *yaml_tag_directive_t,
-//        tag_directives_end *yaml_tag_directive_t,
-//        start_implicit int, end_implicit int)
-//{
-//    struct {
-//        error yaml_error_type_t
-//    } context
-//    struct {
-//        start *yaml_node_t
-//        end *yaml_node_t
-//        top *yaml_node_t
-//    } nodes = { NULL, NULL, NULL }
-//    version_directive_copy *yaml_version_directive_t = NULL
-//    struct {
-//        start *yaml_tag_directive_t
-//        end *yaml_tag_directive_t
-//        top *yaml_tag_directive_t
-//    } tag_directives_copy = { NULL, NULL, NULL }
-//    value yaml_tag_directive_t = { NULL, NULL }
-//    mark yaml_mark_t = { 0, 0, 0 }
-//
-//    assert(document) // Non-NULL document object is expected.
-//    assert((tag_directives_start && tag_directives_end) ||
-//            (tag_directives_start == tag_directives_end))
-//                            // Valid tag directives are expected.
-//
-//    if (!STACK_INIT(&context, nodes, INITIAL_STACK_SIZE)) goto error
-//
-//    if (version_directive) {
-//        version_directive_copy = yaml_malloc(sizeof(yaml_version_directive_t))
-//        if (!version_directive_copy) goto error
-//        version_directive_copy.major = version_directive.major
-//        version_directive_copy.minor = version_directive.minor
-//    }
-//
-//    if (tag_directives_start != tag_directives_end) {
-//        tag_directive *yaml_tag_directive_t
-//        if (!STACK_INIT(&context, tag_directives_copy, INITIAL_STACK_SIZE))
-//            goto error
-//        for (tag_directive = tag_directives_start
-//                tag_directive != tag_directives_end; tag_directive ++) {
-//            assert(tag_directive.handle)
-//            assert(tag_directive.prefix)
-//            if (!yaml_check_utf8(tag_directive.handle,
-//                        strlen((char *)tag_directive.handle)))
-//                goto error
-//            if (!yaml_check_utf8(tag_directive.prefix,
-//                        strlen((char *)tag_directive.prefix)))
-//                goto error
-//            value.handle = yaml_strdup(tag_directive.handle)
-//            value.prefix = yaml_strdup(tag_directive.prefix)
-//            if (!value.handle || !value.prefix) goto error
-//            if (!PUSH(&context, tag_directives_copy, value))
-//                goto error
-//            value.handle = NULL
-//            value.prefix = NULL
-//        }
-//    }
-//
-//    DOCUMENT_INIT(*document, nodes.start, nodes.end, version_directive_copy,
-//            tag_directives_copy.start, tag_directives_copy.top,
-//            start_implicit, end_implicit, mark, mark)
-//
-//    return 1
-//
-//error:
-//    STACK_DEL(&context, nodes)
-//    yaml_free(version_directive_copy)
-//    while (!STACK_EMPTY(&context, tag_directives_copy)) {
-//        value yaml_tag_directive_t = POP(&context, tag_directives_copy)
-//        yaml_free(value.handle)
-//        yaml_free(value.prefix)
-//    }
-//    STACK_DEL(&context, tag_directives_copy)
-//    yaml_free(value.handle)
-//    yaml_free(value.prefix)
-//
-//    return 0
-//}
-//
-///*
-// * Destroy a document object.
-// */
-//
-//YAML_DECLARE(void)
-//yaml_document_delete(document *yaml_document_t)
-//{
-//    struct {
-//        error yaml_error_type_t
-//    } context
-//    tag_directive *yaml_tag_directive_t
-//
-//    context.error = YAML_NO_ERROR // Eliminate a compliler warning.
-//
-//    assert(document) // Non-NULL document object is expected.
-//
-//    while (!STACK_EMPTY(&context, document.nodes)) {
-//        node yaml_node_t = POP(&context, document.nodes)
-//        yaml_free(node.tag)
-//        switch (node.type) {
-//            case YAML_SCALAR_NODE:
-//                yaml_free(node.data.scalar.value)
-//                break
-//            case YAML_SEQUENCE_NODE:
-//                STACK_DEL(&context, node.data.sequence.items)
-//                break
-//            case YAML_MAPPING_NODE:
-//                STACK_DEL(&context, node.data.mapping.pairs)
-//                break
-//            default:
-//                assert(0) // Should not happen.
-//        }
-//    }
-//    STACK_DEL(&context, document.nodes)
-//
-//    yaml_free(document.version_directive)
-//    for (tag_directive = document.tag_directives.start
-//            tag_directive != document.tag_directives.end
-//            tag_directive++) {
-//        yaml_free(tag_directive.handle)
-//        yaml_free(tag_directive.prefix)
-//    }
-//    yaml_free(document.tag_directives.start)
-//
-//    memset(document, 0, sizeof(yaml_document_t))
-//}
-//
-///**
-// * Get a document node.
-// */
-//
-//YAML_DECLARE(yaml_node_t *)
-//yaml_document_get_node(document *yaml_document_t, index int)
-//{
-//    assert(document) // Non-NULL document object is expected.
-//
-//    if (index > 0 && document.nodes.start + index <= document.nodes.top) {
-//        return document.nodes.start + index - 1
-//    }
-//    return NULL
-//}
-//
-///**
-// * Get the root object.
-// */
-//
-//YAML_DECLARE(yaml_node_t *)
-//yaml_document_get_root_node(document *yaml_document_t)
-//{
-//    assert(document) // Non-NULL document object is expected.
-//
-//    if (document.nodes.top != document.nodes.start) {
-//        return document.nodes.start
-//    }
-//    return NULL
-//}
-//
-///*
-// * Add a scalar node to a document.
-// */
-//
-//YAML_DECLARE(int)
-//yaml_document_add_scalar(document *yaml_document_t,
-//        tag *yaml_char_t, value *yaml_char_t, length int,
-//        style yaml_scalar_style_t)
-//{
-//    struct {
-//        error yaml_error_type_t
-//    } context
-//    mark yaml_mark_t = { 0, 0, 0 }
-//    tag_copy *yaml_char_t = NULL
-//    value_copy *yaml_char_t = NULL
-//    node yaml_node_t
-//
-//    assert(document) // Non-NULL document object is expected.
-//    assert(value) // Non-NULL value is expected.
-//
-//    if (!tag) {
-//        tag = (yaml_char_t *)YAML_DEFAULT_SCALAR_TAG
-//    }
-//
-//    if (!yaml_check_utf8(tag, strlen((char *)tag))) goto error
-//    tag_copy = yaml_strdup(tag)
-//    if (!tag_copy) goto error
-//
-//    if (length < 0) {
-//        length = strlen((char *)value)
-//    }
-//
-//    if (!yaml_check_utf8(value, length)) goto error
-//    value_copy = yaml_malloc(length+1)
-//    if (!value_copy) goto error
-//    memcpy(value_copy, value, length)
-//    value_copy[length] = '\0'
-//
-//    SCALAR_NODE_INIT(node, tag_copy, value_copy, length, style, mark, mark)
-//    if (!PUSH(&context, document.nodes, node)) goto error
-//
-//    return document.nodes.top - document.nodes.start
-//
-//error:
-//    yaml_free(tag_copy)
-//    yaml_free(value_copy)
-//
-//    return 0
-//}
-//
-///*
-// * Add a sequence node to a document.
-// */
-//
-//YAML_DECLARE(int)
-//yaml_document_add_sequence(document *yaml_document_t,
-//        tag *yaml_char_t, style yaml_sequence_style_t)
-//{
-//    struct {
-//        error yaml_error_type_t
-//    } context
-//    mark yaml_mark_t = { 0, 0, 0 }
-//    tag_copy *yaml_char_t = NULL
-//    struct {
-//        start *yaml_node_item_t
-//        end *yaml_node_item_t
-//        top *yaml_node_item_t
-//    } items = { NULL, NULL, NULL }
-//    node yaml_node_t
-//
-//    assert(document) // Non-NULL document object is expected.
-//
-//    if (!tag) {
-//        tag = (yaml_char_t *)YAML_DEFAULT_SEQUENCE_TAG
-//    }
-//
-//    if (!yaml_check_utf8(tag, strlen((char *)tag))) goto error
-//    tag_copy = yaml_strdup(tag)
-//    if (!tag_copy) goto error
-//
-//    if (!STACK_INIT(&context, items, INITIAL_STACK_SIZE)) goto error
-//
-//    SEQUENCE_NODE_INIT(node, tag_copy, items.start, items.end,
-//            style, mark, mark)
-//    if (!PUSH(&context, document.nodes, node)) goto error
-//
-//    return document.nodes.top - document.nodes.start
-//
-//error:
-//    STACK_DEL(&context, items)
-//    yaml_free(tag_copy)
-//
-//    return 0
-//}
-//
-///*
-// * Add a mapping node to a document.
-// */
-//
-//YAML_DECLARE(int)
-//yaml_document_add_mapping(document *yaml_document_t,
-//        tag *yaml_char_t, style yaml_mapping_style_t)
-//{
-//    struct {
-//        error yaml_error_type_t
-//    } context
-//    mark yaml_mark_t = { 0, 0, 0 }
-//    tag_copy *yaml_char_t = NULL
-//    struct {
-//        start *yaml_node_pair_t
-//        end *yaml_node_pair_t
-//        top *yaml_node_pair_t
-//    } pairs = { NULL, NULL, NULL }
-//    node yaml_node_t
-//
-//    assert(document) // Non-NULL document object is expected.
-//
-//    if (!tag) {
-//        tag = (yaml_char_t *)YAML_DEFAULT_MAPPING_TAG
-//    }
-//
-//    if (!yaml_check_utf8(tag, strlen((char *)tag))) goto error
-//    tag_copy = yaml_strdup(tag)
-//    if (!tag_copy) goto error
-//
-//    if (!STACK_INIT(&context, pairs, INITIAL_STACK_SIZE)) goto error
-//
-//    MAPPING_NODE_INIT(node, tag_copy, pairs.start, pairs.end,
-//            style, mark, mark)
-//    if (!PUSH(&context, document.nodes, node)) goto error
-//
-//    return document.nodes.top - document.nodes.start
-//
-//error:
-//    STACK_DEL(&context, pairs)
-//    yaml_free(tag_copy)
-//
-//    return 0
-//}
-//
-///*
-// * Append an item to a sequence node.
-// */
-//
-//YAML_DECLARE(int)
-//yaml_document_append_sequence_item(document *yaml_document_t,
-//        sequence int, item int)
-//{
-//    struct {
-//        error yaml_error_type_t
-//    } context
-//
-//    assert(document) // Non-NULL document is required.
-//    assert(sequence > 0
-//            && document.nodes.start + sequence <= document.nodes.top)
-//                            // Valid sequence id is required.
-//    assert(document.nodes.start[sequence-1].type == YAML_SEQUENCE_NODE)
-//                            // A sequence node is required.
-//    assert(item > 0 && document.nodes.start + item <= document.nodes.top)
-//                            // Valid item id is required.
-//
-//    if (!PUSH(&context,
-//                document.nodes.start[sequence-1].data.sequence.items, item))
-//        return 0
-//
-//    return 1
-//}
-//
-///*
-// * Append a pair of a key and a value to a mapping node.
-// */
-//
-//YAML_DECLARE(int)
-//yaml_document_append_mapping_pair(document *yaml_document_t,
-//        mapping int, key int, value int)
-//{
-//    struct {
-//        error yaml_error_type_t
-//    } context
-//
-//    pair yaml_node_pair_t
-//
-//    assert(document) // Non-NULL document is required.
-//    assert(mapping > 0
-//            && document.nodes.start + mapping <= document.nodes.top)
-//                            // Valid mapping id is required.
-//    assert(document.nodes.start[mapping-1].type == YAML_MAPPING_NODE)
-//                            // A mapping node is required.
-//    assert(key > 0 && document.nodes.start + key <= document.nodes.top)
-//                            // Valid key id is required.
-//    assert(value > 0 && document.nodes.start + value <= document.nodes.top)
-//                            // Valid value id is required.
-//
-//    pair.key = key
-//    pair.value = value
-//
-//    if (!PUSH(&context,
-//                document.nodes.start[mapping-1].data.mapping.pairs, pair))
-//        return 0
-//
-//    return 1
-//}
-//
-//
diff --git a/Godeps/_workspace/src/gopkg.in/yaml.v2/decode.go b/Godeps/_workspace/src/gopkg.in/yaml.v2/decode.go
deleted file mode 100644
index 085cddc44..000000000
--- a/Godeps/_workspace/src/gopkg.in/yaml.v2/decode.go
+++ /dev/null
@@ -1,683 +0,0 @@
-package yaml
-
-import (
-	"encoding"
-	"encoding/base64"
-	"fmt"
-	"math"
-	"reflect"
-	"strconv"
-	"time"
-)
-
-const (
-	documentNode = 1 << iota
-	mappingNode
-	sequenceNode
-	scalarNode
-	aliasNode
-)
-
-type node struct {
-	kind         int
-	line, column int
-	tag          string
-	value        string
-	implicit     bool
-	children     []*node
-	anchors      map[string]*node
-}
-
-// ----------------------------------------------------------------------------
-// Parser, produces a node tree out of a libyaml event stream.
-
-type parser struct {
-	parser yaml_parser_t
-	event  yaml_event_t
-	doc    *node
-}
-
-func newParser(b []byte) *parser {
-	p := parser{}
-	if !yaml_parser_initialize(&p.parser) {
-		panic("failed to initialize YAML emitter")
-	}
-
-	if len(b) == 0 {
-		b = []byte{'\n'}
-	}
-
-	yaml_parser_set_input_string(&p.parser, b)
-
-	p.skip()
-	if p.event.typ != yaml_STREAM_START_EVENT {
-		panic("expected stream start event, got " + strconv.Itoa(int(p.event.typ)))
-	}
-	p.skip()
-	return &p
-}
-
-func (p *parser) destroy() {
-	if p.event.typ != yaml_NO_EVENT {
-		yaml_event_delete(&p.event)
-	}
-	yaml_parser_delete(&p.parser)
-}
-
-func (p *parser) skip() {
-	if p.event.typ != yaml_NO_EVENT {
-		if p.event.typ == yaml_STREAM_END_EVENT {
-			failf("attempted to go past the end of stream; corrupted value?")
-		}
-		yaml_event_delete(&p.event)
-	}
-	if !yaml_parser_parse(&p.parser, &p.event) {
-		p.fail()
-	}
-}
-
-func (p *parser) fail() {
-	var where string
-	var line int
-	if p.parser.problem_mark.line != 0 {
-		line = p.parser.problem_mark.line
-	} else if p.parser.context_mark.line != 0 {
-		line = p.parser.context_mark.line
-	}
-	if line != 0 {
-		where = "line " + strconv.Itoa(line) + ": "
-	}
-	var msg string
-	if len(p.parser.problem) > 0 {
-		msg = p.parser.problem
-	} else {
-		msg = "unknown problem parsing YAML content"
-	}
-	failf("%s%s", where, msg)
-}
-
-func (p *parser) anchor(n *node, anchor []byte) {
-	if anchor != nil {
-		p.doc.anchors[string(anchor)] = n
-	}
-}
-
-func (p *parser) parse() *node {
-	switch p.event.typ {
-	case yaml_SCALAR_EVENT:
-		return p.scalar()
-	case yaml_ALIAS_EVENT:
-		return p.alias()
-	case yaml_MAPPING_START_EVENT:
-		return p.mapping()
-	case yaml_SEQUENCE_START_EVENT:
-		return p.sequence()
-	case yaml_DOCUMENT_START_EVENT:
-		return p.document()
-	case yaml_STREAM_END_EVENT:
-		// Happens when attempting to decode an empty buffer.
-		return nil
-	default:
-		panic("attempted to parse unknown event: " + strconv.Itoa(int(p.event.typ)))
-	}
-	panic("unreachable")
-}
-
-func (p *parser) node(kind int) *node {
-	return &node{
-		kind:   kind,
-		line:   p.event.start_mark.line,
-		column: p.event.start_mark.column,
-	}
-}
-
-func (p *parser) document() *node {
-	n := p.node(documentNode)
-	n.anchors = make(map[string]*node)
-	p.doc = n
-	p.skip()
-	n.children = append(n.children, p.parse())
-	if p.event.typ != yaml_DOCUMENT_END_EVENT {
-		panic("expected end of document event but got " + strconv.Itoa(int(p.event.typ)))
-	}
-	p.skip()
-	return n
-}
-
-func (p *parser) alias() *node {
-	n := p.node(aliasNode)
-	n.value = string(p.event.anchor)
-	p.skip()
-	return n
-}
-
-func (p *parser) scalar() *node {
-	n := p.node(scalarNode)
-	n.value = string(p.event.value)
-	n.tag = string(p.event.tag)
-	n.implicit = p.event.implicit
-	p.anchor(n, p.event.anchor)
-	p.skip()
-	return n
-}
-
-func (p *parser) sequence() *node {
-	n := p.node(sequenceNode)
-	p.anchor(n, p.event.anchor)
-	p.skip()
-	for p.event.typ != yaml_SEQUENCE_END_EVENT {
-		n.children = append(n.children, p.parse())
-	}
-	p.skip()
-	return n
-}
-
-func (p *parser) mapping() *node {
-	n := p.node(mappingNode)
-	p.anchor(n, p.event.anchor)
-	p.skip()
-	for p.event.typ != yaml_MAPPING_END_EVENT {
-		n.children = append(n.children, p.parse(), p.parse())
-	}
-	p.skip()
-	return n
-}
-
-// ----------------------------------------------------------------------------
-// Decoder, unmarshals a node into a provided value.
-
-type decoder struct {
-	doc     *node
-	aliases map[string]bool
-	mapType reflect.Type
-	terrors []string
-}
-
-var (
-	mapItemType    = reflect.TypeOf(MapItem{})
-	durationType   = reflect.TypeOf(time.Duration(0))
-	defaultMapType = reflect.TypeOf(map[interface{}]interface{}{})
-	ifaceType      = defaultMapType.Elem()
-)
-
-func newDecoder() *decoder {
-	d := &decoder{mapType: defaultMapType}
-	d.aliases = make(map[string]bool)
-	return d
-}
-
-func (d *decoder) terror(n *node, tag string, out reflect.Value) {
-	if n.tag != "" {
-		tag = n.tag
-	}
-	value := n.value
-	if tag != yaml_SEQ_TAG && tag != yaml_MAP_TAG {
-		if len(value) > 10 {
-			value = " `" + value[:7] + "...`"
-		} else {
-			value = " `" + value + "`"
-		}
-	}
-	d.terrors = append(d.terrors, fmt.Sprintf("line %d: cannot unmarshal %s%s into %s", n.line+1, shortTag(tag), value, out.Type()))
-}
-
-func (d *decoder) callUnmarshaler(n *node, u Unmarshaler) (good bool) {
-	terrlen := len(d.terrors)
-	err := u.UnmarshalYAML(func(v interface{}) (err error) {
-		defer handleErr(&err)
-		d.unmarshal(n, reflect.ValueOf(v))
-		if len(d.terrors) > terrlen {
-			issues := d.terrors[terrlen:]
-			d.terrors = d.terrors[:terrlen]
-			return &TypeError{issues}
-		}
-		return nil
-	})
-	if e, ok := err.(*TypeError); ok {
-		d.terrors = append(d.terrors, e.Errors...)
-		return false
-	}
-	if err != nil {
-		fail(err)
-	}
-	return true
-}
-
-// d.prepare initializes and dereferences pointers and calls UnmarshalYAML
-// if a value is found to implement it.
-// It returns the initialized and dereferenced out value, whether
-// unmarshalling was already done by UnmarshalYAML, and if so whether
-// its types unmarshalled appropriately.
-//
-// If n holds a null value, prepare returns before doing anything.
-func (d *decoder) prepare(n *node, out reflect.Value) (newout reflect.Value, unmarshaled, good bool) {
-	if n.tag == yaml_NULL_TAG || n.kind == scalarNode && n.tag == "" && (n.value == "null" || n.value == "") {
-		return out, false, false
-	}
-	again := true
-	for again {
-		again = false
-		if out.Kind() == reflect.Ptr {
-			if out.IsNil() {
-				out.Set(reflect.New(out.Type().Elem()))
-			}
-			out = out.Elem()
-			again = true
-		}
-		if out.CanAddr() {
-			if u, ok := out.Addr().Interface().(Unmarshaler); ok {
-				good = d.callUnmarshaler(n, u)
-				return out, true, good
-			}
-		}
-	}
-	return out, false, false
-}
-
-func (d *decoder) unmarshal(n *node, out reflect.Value) (good bool) {
-	switch n.kind {
-	case documentNode:
-		return d.document(n, out)
-	case aliasNode:
-		return d.alias(n, out)
-	}
-	out, unmarshaled, good := d.prepare(n, out)
-	if unmarshaled {
-		return good
-	}
-	switch n.kind {
-	case scalarNode:
-		good = d.scalar(n, out)
-	case mappingNode:
-		good = d.mapping(n, out)
-	case sequenceNode:
-		good = d.sequence(n, out)
-	default:
-		panic("internal error: unknown node kind: " + strconv.Itoa(n.kind))
-	}
-	return good
-}
-
-func (d *decoder) document(n *node, out reflect.Value) (good bool) {
-	if len(n.children) == 1 {
-		d.doc = n
-		d.unmarshal(n.children[0], out)
-		return true
-	}
-	return false
-}
-
-func (d *decoder) alias(n *node, out reflect.Value) (good bool) {
-	an, ok := d.doc.anchors[n.value]
-	if !ok {
-		failf("unknown anchor '%s' referenced", n.value)
-	}
-	if d.aliases[n.value] {
-		failf("anchor '%s' value contains itself", n.value)
-	}
-	d.aliases[n.value] = true
-	good = d.unmarshal(an, out)
-	delete(d.aliases, n.value)
-	return good
-}
-
-var zeroValue reflect.Value
-
-func resetMap(out reflect.Value) {
-	for _, k := range out.MapKeys() {
-		out.SetMapIndex(k, zeroValue)
-	}
-}
-
-func (d *decoder) scalar(n *node, out reflect.Value) (good bool) {
-	var tag string
-	var resolved interface{}
-	if n.tag == "" && !n.implicit {
-		tag = yaml_STR_TAG
-		resolved = n.value
-	} else {
-		tag, resolved = resolve(n.tag, n.value)
-		if tag == yaml_BINARY_TAG {
-			data, err := base64.StdEncoding.DecodeString(resolved.(string))
-			if err != nil {
-				failf("!!binary value contains invalid base64 data")
-			}
-			resolved = string(data)
-		}
-	}
-	if resolved == nil {
-		if out.Kind() == reflect.Map && !out.CanAddr() {
-			resetMap(out)
-		} else {
-			out.Set(reflect.Zero(out.Type()))
-		}
-		return true
-	}
-	if s, ok := resolved.(string); ok && out.CanAddr() {
-		if u, ok := out.Addr().Interface().(encoding.TextUnmarshaler); ok {
-			err := u.UnmarshalText([]byte(s))
-			if err != nil {
-				fail(err)
-			}
-			return true
-		}
-	}
-	switch out.Kind() {
-	case reflect.String:
-		if tag == yaml_BINARY_TAG {
-			out.SetString(resolved.(string))
-			good = true
-		} else if resolved != nil {
-			out.SetString(n.value)
-			good = true
-		}
-	case reflect.Interface:
-		if resolved == nil {
-			out.Set(reflect.Zero(out.Type()))
-		} else {
-			out.Set(reflect.ValueOf(resolved))
-		}
-		good = true
-	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
-		switch resolved := resolved.(type) {
-		case int:
-			if !out.OverflowInt(int64(resolved)) {
-				out.SetInt(int64(resolved))
-				good = true
-			}
-		case int64:
-			if !out.OverflowInt(resolved) {
-				out.SetInt(resolved)
-				good = true
-			}
-		case uint64:
-			if resolved <= math.MaxInt64 && !out.OverflowInt(int64(resolved)) {
-				out.SetInt(int64(resolved))
-				good = true
-			}
-		case float64:
-			if resolved <= math.MaxInt64 && !out.OverflowInt(int64(resolved)) {
-				out.SetInt(int64(resolved))
-				good = true
-			}
-		case string:
-			if out.Type() == durationType {
-				d, err := time.ParseDuration(resolved)
-				if err == nil {
-					out.SetInt(int64(d))
-					good = true
-				}
-			}
-		}
-	case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uintptr:
-		switch resolved := resolved.(type) {
-		case int:
-			if resolved >= 0 && !out.OverflowUint(uint64(resolved)) {
-				out.SetUint(uint64(resolved))
-				good = true
-			}
-		case int64:
-			if resolved >= 0 && !out.OverflowUint(uint64(resolved)) {
-				out.SetUint(uint64(resolved))
-				good = true
-			}
-		case uint64:
-			if !out.OverflowUint(uint64(resolved)) {
-				out.SetUint(uint64(resolved))
-				good = true
-			}
-		case float64:
-			if resolved <= math.MaxUint64 && !out.OverflowUint(uint64(resolved)) {
-				out.SetUint(uint64(resolved))
-				good = true
-			}
-		}
-	case reflect.Bool:
-		switch resolved := resolved.(type) {
-		case bool:
-			out.SetBool(resolved)
-			good = true
-		}
-	case reflect.Float32, reflect.Float64:
-		switch resolved := resolved.(type) {
-		case int:
-			out.SetFloat(float64(resolved))
-			good = true
-		case int64:
-			out.SetFloat(float64(resolved))
-			good = true
-		case uint64:
-			out.SetFloat(float64(resolved))
-			good = true
-		case float64:
-			out.SetFloat(resolved)
-			good = true
-		}
-	case reflect.Ptr:
-		if out.Type().Elem() == reflect.TypeOf(resolved) {
-			// TODO DOes this make sense? When is out a Ptr except when decoding a nil value?
-			elem := reflect.New(out.Type().Elem())
-			elem.Elem().Set(reflect.ValueOf(resolved))
-			out.Set(elem)
-			good = true
-		}
-	}
-	if !good {
-		d.terror(n, tag, out)
-	}
-	return good
-}
-
-func settableValueOf(i interface{}) reflect.Value {
-	v := reflect.ValueOf(i)
-	sv := reflect.New(v.Type()).Elem()
-	sv.Set(v)
-	return sv
-}
-
-func (d *decoder) sequence(n *node, out reflect.Value) (good bool) {
-	l := len(n.children)
-
-	var iface reflect.Value
-	switch out.Kind() {
-	case reflect.Slice:
-		out.Set(reflect.MakeSlice(out.Type(), l, l))
-	case reflect.Interface:
-		// No type hints. Will have to use a generic sequence.
-		iface = out
-		out = settableValueOf(make([]interface{}, l))
-	default:
-		d.terror(n, yaml_SEQ_TAG, out)
-		return false
-	}
-	et := out.Type().Elem()
-
-	j := 0
-	for i := 0; i < l; i++ {
-		e := reflect.New(et).Elem()
-		if ok := d.unmarshal(n.children[i], e); ok {
-			out.Index(j).Set(e)
-			j++
-		}
-	}
-	out.Set(out.Slice(0, j))
-	if iface.IsValid() {
-		iface.Set(out)
-	}
-	return true
-}
-
-func (d *decoder) mapping(n *node, out reflect.Value) (good bool) {
-	switch out.Kind() {
-	case reflect.Struct:
-		return d.mappingStruct(n, out)
-	case reflect.Slice:
-		return d.mappingSlice(n, out)
-	case reflect.Map:
-		// okay
-	case reflect.Interface:
-		if d.mapType.Kind() == reflect.Map {
-			iface := out
-			out = reflect.MakeMap(d.mapType)
-			iface.Set(out)
-		} else {
-			slicev := reflect.New(d.mapType).Elem()
-			if !d.mappingSlice(n, slicev) {
-				return false
-			}
-			out.Set(slicev)
-			return true
-		}
-	default:
-		d.terror(n, yaml_MAP_TAG, out)
-		return false
-	}
-	outt := out.Type()
-	kt := outt.Key()
-	et := outt.Elem()
-
-	mapType := d.mapType
-	if outt.Key() == ifaceType && outt.Elem() == ifaceType {
-		d.mapType = outt
-	}
-
-	if out.IsNil() {
-		out.Set(reflect.MakeMap(outt))
-	}
-	l := len(n.children)
-	for i := 0; i < l; i += 2 {
-		if isMerge(n.children[i]) {
-			d.merge(n.children[i+1], out)
-			continue
-		}
-		k := reflect.New(kt).Elem()
-		if d.unmarshal(n.children[i], k) {
-			kkind := k.Kind()
-			if kkind == reflect.Interface {
-				kkind = k.Elem().Kind()
-			}
-			if kkind == reflect.Map || kkind == reflect.Slice {
-				failf("invalid map key: %#v", k.Interface())
-			}
-			e := reflect.New(et).Elem()
-			if d.unmarshal(n.children[i+1], e) {
-				out.SetMapIndex(k, e)
-			}
-		}
-	}
-	d.mapType = mapType
-	return true
-}
-
-func (d *decoder) mappingSlice(n *node, out reflect.Value) (good bool) {
-	outt := out.Type()
-	if outt.Elem() != mapItemType {
-		d.terror(n, yaml_MAP_TAG, out)
-		return false
-	}
-
-	mapType := d.mapType
-	d.mapType = outt
-
-	var slice []MapItem
-	var l = len(n.children)
-	for i := 0; i < l; i += 2 {
-		if isMerge(n.children[i]) {
-			d.merge(n.children[i+1], out)
-			continue
-		}
-		item := MapItem{}
-		k := reflect.ValueOf(&item.Key).Elem()
-		if d.unmarshal(n.children[i], k) {
-			v := reflect.ValueOf(&item.Value).Elem()
-			if d.unmarshal(n.children[i+1], v) {
-				slice = append(slice, item)
-			}
-		}
-	}
-	out.Set(reflect.ValueOf(slice))
-	d.mapType = mapType
-	return true
-}
-
-func (d *decoder) mappingStruct(n *node, out reflect.Value) (good bool) {
-	sinfo, err := getStructInfo(out.Type())
-	if err != nil {
-		panic(err)
-	}
-	name := settableValueOf("")
-	l := len(n.children)
-
-	var inlineMap reflect.Value
-	var elemType reflect.Type
-	if sinfo.InlineMap != -1 {
-		inlineMap = out.Field(sinfo.InlineMap)
-		inlineMap.Set(reflect.New(inlineMap.Type()).Elem())
-		elemType = inlineMap.Type().Elem()
-	}
-
-	for i := 0; i < l; i += 2 {
-		ni := n.children[i]
-		if isMerge(ni) {
-			d.merge(n.children[i+1], out)
-			continue
-		}
-		if !d.unmarshal(ni, name) {
-			continue
-		}
-		if info, ok := sinfo.FieldsMap[name.String()]; ok {
-			var field reflect.Value
-			if info.Inline == nil {
-				field = out.Field(info.Num)
-			} else {
-				field = out.FieldByIndex(info.Inline)
-			}
-			d.unmarshal(n.children[i+1], field)
-		} else if sinfo.InlineMap != -1 {
-			if inlineMap.IsNil() {
-				inlineMap.Set(reflect.MakeMap(inlineMap.Type()))
-			}
-			value := reflect.New(elemType).Elem()
-			d.unmarshal(n.children[i+1], value)
-			inlineMap.SetMapIndex(name, value)
-		}
-	}
-	return true
-}
-
-func failWantMap() {
-	failf("map merge requires map or sequence of maps as the value")
-}
-
-func (d *decoder) merge(n *node, out reflect.Value) {
-	switch n.kind {
-	case mappingNode:
-		d.unmarshal(n, out)
-	case aliasNode:
-		an, ok := d.doc.anchors[n.value]
-		if ok && an.kind != mappingNode {
-			failWantMap()
-		}
-		d.unmarshal(n, out)
-	case sequenceNode:
-		// Step backwards as earlier nodes take precedence.
-		for i := len(n.children) - 1; i >= 0; i-- {
-			ni := n.children[i]
-			if ni.kind == aliasNode {
-				an, ok := d.doc.anchors[ni.value]
-				if ok && an.kind != mappingNode {
-					failWantMap()
-				}
-			} else if ni.kind != mappingNode {
-				failWantMap()
-			}
-			d.unmarshal(ni, out)
-		}
-	default:
-		failWantMap()
-	}
-}
-
-func isMerge(n *node) bool {
-	return n.kind == scalarNode && n.value == "<<" && (n.implicit == true || n.tag == yaml_MERGE_TAG)
-}
diff --git a/Godeps/_workspace/src/gopkg.in/yaml.v2/emitterc.go b/Godeps/_workspace/src/gopkg.in/yaml.v2/emitterc.go
deleted file mode 100644
index 2befd553e..000000000
--- a/Godeps/_workspace/src/gopkg.in/yaml.v2/emitterc.go
+++ /dev/null
@@ -1,1685 +0,0 @@
-package yaml
-
-import (
-	"bytes"
-)
-
-// Flush the buffer if needed.
-func flush(emitter *yaml_emitter_t) bool {
-	if emitter.buffer_pos+5 >= len(emitter.buffer) {
-		return yaml_emitter_flush(emitter)
-	}
-	return true
-}
-
-// Put a character to the output buffer.
-func put(emitter *yaml_emitter_t, value byte) bool {
-	if emitter.buffer_pos+5 >= len(emitter.buffer) && !yaml_emitter_flush(emitter) {
-		return false
-	}
-	emitter.buffer[emitter.buffer_pos] = value
-	emitter.buffer_pos++
-	emitter.column++
-	return true
-}
-
-// Put a line break to the output buffer.
-func put_break(emitter *yaml_emitter_t) bool {
-	if emitter.buffer_pos+5 >= len(emitter.buffer) && !yaml_emitter_flush(emitter) {
-		return false
-	}
-	switch emitter.line_break {
-	case yaml_CR_BREAK:
-		emitter.buffer[emitter.buffer_pos] = '\r'
-		emitter.buffer_pos += 1
-	case yaml_LN_BREAK:
-		emitter.buffer[emitter.buffer_pos] = '\n'
-		emitter.buffer_pos += 1
-	case yaml_CRLN_BREAK:
-		emitter.buffer[emitter.buffer_pos+0] = '\r'
-		emitter.buffer[emitter.buffer_pos+1] = '\n'
-		emitter.buffer_pos += 2
-	default:
-		panic("unknown line break setting")
-	}
-	emitter.column = 0
-	emitter.line++
-	return true
-}
-
-// Copy a character from a string into buffer.
-func write(emitter *yaml_emitter_t, s []byte, i *int) bool {
-	if emitter.buffer_pos+5 >= len(emitter.buffer) && !yaml_emitter_flush(emitter) {
-		return false
-	}
-	p := emitter.buffer_pos
-	w := width(s[*i])
-	switch w {
-	case 4:
-		emitter.buffer[p+3] = s[*i+3]
-		fallthrough
-	case 3:
-		emitter.buffer[p+2] = s[*i+2]
-		fallthrough
-	case 2:
-		emitter.buffer[p+1] = s[*i+1]
-		fallthrough
-	case 1:
-		emitter.buffer[p+0] = s[*i+0]
-	default:
-		panic("unknown character width")
-	}
-	emitter.column++
-	emitter.buffer_pos += w
-	*i += w
-	return true
-}
-
-// Write a whole string into buffer.
-func write_all(emitter *yaml_emitter_t, s []byte) bool {
-	for i := 0; i < len(s); {
-		if !write(emitter, s, &i) {
-			return false
-		}
-	}
-	return true
-}
-
-// Copy a line break character from a string into buffer.
-func write_break(emitter *yaml_emitter_t, s []byte, i *int) bool {
-	if s[*i] == '\n' {
-		if !put_break(emitter) {
-			return false
-		}
-		*i++
-	} else {
-		if !write(emitter, s, i) {
-			return false
-		}
-		emitter.column = 0
-		emitter.line++
-	}
-	return true
-}
-
-// Set an emitter error and return false.
-func yaml_emitter_set_emitter_error(emitter *yaml_emitter_t, problem string) bool {
-	emitter.error = yaml_EMITTER_ERROR
-	emitter.problem = problem
-	return false
-}
-
-// Emit an event.
-func yaml_emitter_emit(emitter *yaml_emitter_t, event *yaml_event_t) bool {
-	emitter.events = append(emitter.events, *event)
-	for !yaml_emitter_need_more_events(emitter) {
-		event := &emitter.events[emitter.events_head]
-		if !yaml_emitter_analyze_event(emitter, event) {
-			return false
-		}
-		if !yaml_emitter_state_machine(emitter, event) {
-			return false
-		}
-		yaml_event_delete(event)
-		emitter.events_head++
-	}
-	return true
-}
-
-// Check if we need to accumulate more events before emitting.
-//
-// We accumulate extra
-//  - 1 event for DOCUMENT-START
-//  - 2 events for SEQUENCE-START
-//  - 3 events for MAPPING-START
-//
-func yaml_emitter_need_more_events(emitter *yaml_emitter_t) bool {
-	if emitter.events_head == len(emitter.events) {
-		return true
-	}
-	var accumulate int
-	switch emitter.events[emitter.events_head].typ {
-	case yaml_DOCUMENT_START_EVENT:
-		accumulate = 1
-		break
-	case yaml_SEQUENCE_START_EVENT:
-		accumulate = 2
-		break
-	case yaml_MAPPING_START_EVENT:
-		accumulate = 3
-		break
-	default:
-		return false
-	}
-	if len(emitter.events)-emitter.events_head > accumulate {
-		return false
-	}
-	var level int
-	for i := emitter.events_head; i < len(emitter.events); i++ {
-		switch emitter.events[i].typ {
-		case yaml_STREAM_START_EVENT, yaml_DOCUMENT_START_EVENT, yaml_SEQUENCE_START_EVENT, yaml_MAPPING_START_EVENT:
-			level++
-		case yaml_STREAM_END_EVENT, yaml_DOCUMENT_END_EVENT, yaml_SEQUENCE_END_EVENT, yaml_MAPPING_END_EVENT:
-			level--
-		}
-		if level == 0 {
-			return false
-		}
-	}
-	return true
-}
-
-// Append a directive to the directives stack.
-func yaml_emitter_append_tag_directive(emitter *yaml_emitter_t, value *yaml_tag_directive_t, allow_duplicates bool) bool {
-	for i := 0; i < len(emitter.tag_directives); i++ {
-		if bytes.Equal(value.handle, emitter.tag_directives[i].handle) {
-			if allow_duplicates {
-				return true
-			}
-			return yaml_emitter_set_emitter_error(emitter, "duplicate %TAG directive")
-		}
-	}
-
-	// [Go] Do we actually need to copy this given garbage collection
-	// and the lack of deallocating destructors?
-	tag_copy := yaml_tag_directive_t{
-		handle: make([]byte, len(value.handle)),
-		prefix: make([]byte, len(value.prefix)),
-	}
-	copy(tag_copy.handle, value.handle)
-	copy(tag_copy.prefix, value.prefix)
-	emitter.tag_directives = append(emitter.tag_directives, tag_copy)
-	return true
-}
-
-// Increase the indentation level.
-func yaml_emitter_increase_indent(emitter *yaml_emitter_t, flow, indentless bool) bool {
-	emitter.indents = append(emitter.indents, emitter.indent)
-	if emitter.indent < 0 {
-		if flow {
-			emitter.indent = emitter.best_indent
-		} else {
-			emitter.indent = 0
-		}
-	} else if !indentless {
-		emitter.indent += emitter.best_indent
-	}
-	return true
-}
-
-// State dispatcher.
-func yaml_emitter_state_machine(emitter *yaml_emitter_t, event *yaml_event_t) bool {
-	switch emitter.state {
-	default:
-	case yaml_EMIT_STREAM_START_STATE:
-		return yaml_emitter_emit_stream_start(emitter, event)
-
-	case yaml_EMIT_FIRST_DOCUMENT_START_STATE:
-		return yaml_emitter_emit_document_start(emitter, event, true)
-
-	case yaml_EMIT_DOCUMENT_START_STATE:
-		return yaml_emitter_emit_document_start(emitter, event, false)
-
-	case yaml_EMIT_DOCUMENT_CONTENT_STATE:
-		return yaml_emitter_emit_document_content(emitter, event)
-
-	case yaml_EMIT_DOCUMENT_END_STATE:
-		return yaml_emitter_emit_document_end(emitter, event)
-
-	case yaml_EMIT_FLOW_SEQUENCE_FIRST_ITEM_STATE:
-		return yaml_emitter_emit_flow_sequence_item(emitter, event, true)
-
-	case yaml_EMIT_FLOW_SEQUENCE_ITEM_STATE:
-		return yaml_emitter_emit_flow_sequence_item(emitter, event, false)
-
-	case yaml_EMIT_FLOW_MAPPING_FIRST_KEY_STATE:
-		return yaml_emitter_emit_flow_mapping_key(emitter, event, true)
-
-	case yaml_EMIT_FLOW_MAPPING_KEY_STATE:
-		return yaml_emitter_emit_flow_mapping_key(emitter, event, false)
-
-	case yaml_EMIT_FLOW_MAPPING_SIMPLE_VALUE_STATE:
-		return yaml_emitter_emit_flow_mapping_value(emitter, event, true)
-
-	case yaml_EMIT_FLOW_MAPPING_VALUE_STATE:
-		return yaml_emitter_emit_flow_mapping_value(emitter, event, false)
-
-	case yaml_EMIT_BLOCK_SEQUENCE_FIRST_ITEM_STATE:
-		return yaml_emitter_emit_block_sequence_item(emitter, event, true)
-
-	case yaml_EMIT_BLOCK_SEQUENCE_ITEM_STATE:
-		return yaml_emitter_emit_block_sequence_item(emitter, event, false)
-
-	case yaml_EMIT_BLOCK_MAPPING_FIRST_KEY_STATE:
-		return yaml_emitter_emit_block_mapping_key(emitter, event, true)
-
-	case yaml_EMIT_BLOCK_MAPPING_KEY_STATE:
-		return yaml_emitter_emit_block_mapping_key(emitter, event, false)
-
-	case yaml_EMIT_BLOCK_MAPPING_SIMPLE_VALUE_STATE:
-		return yaml_emitter_emit_block_mapping_value(emitter, event, true)
-
-	case yaml_EMIT_BLOCK_MAPPING_VALUE_STATE:
-		return yaml_emitter_emit_block_mapping_value(emitter, event, false)
-
-	case yaml_EMIT_END_STATE:
-		return yaml_emitter_set_emitter_error(emitter, "expected nothing after STREAM-END")
-	}
-	panic("invalid emitter state")
-}
-
-// Expect STREAM-START.
-func yaml_emitter_emit_stream_start(emitter *yaml_emitter_t, event *yaml_event_t) bool {
-	if event.typ != yaml_STREAM_START_EVENT {
-		return yaml_emitter_set_emitter_error(emitter, "expected STREAM-START")
-	}
-	if emitter.encoding == yaml_ANY_ENCODING {
-		emitter.encoding = event.encoding
-		if emitter.encoding == yaml_ANY_ENCODING {
-			emitter.encoding = yaml_UTF8_ENCODING
-		}
-	}
-	if emitter.best_indent < 2 || emitter.best_indent > 9 {
-		emitter.best_indent = 2
-	}
-	if emitter.best_width >= 0 && emitter.best_width <= emitter.best_indent*2 {
-		emitter.best_width = 80
-	}
-	if emitter.best_width < 0 {
-		emitter.best_width = 1<<31 - 1
-	}
-	if emitter.line_break == yaml_ANY_BREAK {
-		emitter.line_break = yaml_LN_BREAK
-	}
-
-	emitter.indent = -1
-	emitter.line = 0
-	emitter.column = 0
-	emitter.whitespace = true
-	emitter.indention = true
-
-	if emitter.encoding != yaml_UTF8_ENCODING {
-		if !yaml_emitter_write_bom(emitter) {
-			return false
-		}
-	}
-	emitter.state = yaml_EMIT_FIRST_DOCUMENT_START_STATE
-	return true
-}
-
-// Expect DOCUMENT-START or STREAM-END.
-func yaml_emitter_emit_document_start(emitter *yaml_emitter_t, event *yaml_event_t, first bool) bool {
-
-	if event.typ == yaml_DOCUMENT_START_EVENT {
-
-		if event.version_directive != nil {
-			if !yaml_emitter_analyze_version_directive(emitter, event.version_directive) {
-				return false
-			}
-		}
-
-		for i := 0; i < len(event.tag_directives); i++ {
-			tag_directive := &event.tag_directives[i]
-			if !yaml_emitter_analyze_tag_directive(emitter, tag_directive) {
-				return false
-			}
-			if !yaml_emitter_append_tag_directive(emitter, tag_directive, false) {
-				return false
-			}
-		}
-
-		for i := 0; i < len(default_tag_directives); i++ {
-			tag_directive := &default_tag_directives[i]
-			if !yaml_emitter_append_tag_directive(emitter, tag_directive, true) {
-				return false
-			}
-		}
-
-		implicit := event.implicit
-		if !first || emitter.canonical {
-			implicit = false
-		}
-
-		if emitter.open_ended && (event.version_directive != nil || len(event.tag_directives) > 0) {
-			if !yaml_emitter_write_indicator(emitter, []byte("..."), true, false, false) {
-				return false
-			}
-			if !yaml_emitter_write_indent(emitter) {
-				return false
-			}
-		}
-
-		if event.version_directive != nil {
-			implicit = false
-			if !yaml_emitter_write_indicator(emitter, []byte("%YAML"), true, false, false) {
-				return false
-			}
-			if !yaml_emitter_write_indicator(emitter, []byte("1.1"), true, false, false) {
-				return false
-			}
-			if !yaml_emitter_write_indent(emitter) {
-				return false
-			}
-		}
-
-		if len(event.tag_directives) > 0 {
-			implicit = false
-			for i := 0; i < len(event.tag_directives); i++ {
-				tag_directive := &event.tag_directives[i]
-				if !yaml_emitter_write_indicator(emitter, []byte("%TAG"), true, false, false) {
-					return false
-				}
-				if !yaml_emitter_write_tag_handle(emitter, tag_directive.handle) {
-					return false
-				}
-				if !yaml_emitter_write_tag_content(emitter, tag_directive.prefix, true) {
-					return false
-				}
-				if !yaml_emitter_write_indent(emitter) {
-					return false
-				}
-			}
-		}
-
-		if yaml_emitter_check_empty_document(emitter) {
-			implicit = false
-		}
-		if !implicit {
-			if !yaml_emitter_write_indent(emitter) {
-				return false
-			}
-			if !yaml_emitter_write_indicator(emitter, []byte("---"), true, false, false) {
-				return false
-			}
-			if emitter.canonical {
-				if !yaml_emitter_write_indent(emitter) {
-					return false
-				}
-			}
-		}
-
-		emitter.state = yaml_EMIT_DOCUMENT_CONTENT_STATE
-		return true
-	}
-
-	if event.typ == yaml_STREAM_END_EVENT {
-		if emitter.open_ended {
-			if !yaml_emitter_write_indicator(emitter, []byte("..."), true, false, false) {
-				return false
-			}
-			if !yaml_emitter_write_indent(emitter) {
-				return false
-			}
-		}
-		if !yaml_emitter_flush(emitter) {
-			return false
-		}
-		emitter.state = yaml_EMIT_END_STATE
-		return true
-	}
-
-	return yaml_emitter_set_emitter_error(emitter, "expected DOCUMENT-START or STREAM-END")
-}
-
-// Expect the root node.
-func yaml_emitter_emit_document_content(emitter *yaml_emitter_t, event *yaml_event_t) bool {
-	emitter.states = append(emitter.states, yaml_EMIT_DOCUMENT_END_STATE)
-	return yaml_emitter_emit_node(emitter, event, true, false, false, false)
-}
-
-// Expect DOCUMENT-END.
-func yaml_emitter_emit_document_end(emitter *yaml_emitter_t, event *yaml_event_t) bool {
-	if event.typ != yaml_DOCUMENT_END_EVENT {
-		return yaml_emitter_set_emitter_error(emitter, "expected DOCUMENT-END")
-	}
-	if !yaml_emitter_write_indent(emitter) {
-		return false
-	}
-	if !event.implicit {
-		// [Go] Allocate the slice elsewhere.
-		if !yaml_emitter_write_indicator(emitter, []byte("..."), true, false, false) {
-			return false
-		}
-		if !yaml_emitter_write_indent(emitter) {
-			return false
-		}
-	}
-	if !yaml_emitter_flush(emitter) {
-		return false
-	}
-	emitter.state = yaml_EMIT_DOCUMENT_START_STATE
-	emitter.tag_directives = emitter.tag_directives[:0]
-	return true
-}
-
-// Expect a flow item node.
-func yaml_emitter_emit_flow_sequence_item(emitter *yaml_emitter_t, event *yaml_event_t, first bool) bool {
-	if first {
-		if !yaml_emitter_write_indicator(emitter, []byte{'['}, true, true, false) {
-			return false
-		}
-		if !yaml_emitter_increase_indent(emitter, true, false) {
-			return false
-		}
-		emitter.flow_level++
-	}
-
-	if event.typ == yaml_SEQUENCE_END_EVENT {
-		emitter.flow_level--
-		emitter.indent = emitter.indents[len(emitter.indents)-1]
-		emitter.indents = emitter.indents[:len(emitter.indents)-1]
-		if emitter.canonical && !first {
-			if !yaml_emitter_write_indicator(emitter, []byte{','}, false, false, false) {
-				return false
-			}
-			if !yaml_emitter_write_indent(emitter) {
-				return false
-			}
-		}
-		if !yaml_emitter_write_indicator(emitter, []byte{']'}, false, false, false) {
-			return false
-		}
-		emitter.state = emitter.states[len(emitter.states)-1]
-		emitter.states = emitter.states[:len(emitter.states)-1]
-
-		return true
-	}
-
-	if !first {
-		if !yaml_emitter_write_indicator(emitter, []byte{','}, false, false, false) {
-			return false
-		}
-	}
-
-	if emitter.canonical || emitter.column > emitter.best_width {
-		if !yaml_emitter_write_indent(emitter) {
-			return false
-		}
-	}
-	emitter.states = append(emitter.states, yaml_EMIT_FLOW_SEQUENCE_ITEM_STATE)
-	return yaml_emitter_emit_node(emitter, event, false, true, false, false)
-}
-
-// Expect a flow key node.
-func yaml_emitter_emit_flow_mapping_key(emitter *yaml_emitter_t, event *yaml_event_t, first bool) bool {
-	if first {
-		if !yaml_emitter_write_indicator(emitter, []byte{'{'}, true, true, false) {
-			return false
-		}
-		if !yaml_emitter_increase_indent(emitter, true, false) {
-			return false
-		}
-		emitter.flow_level++
-	}
-
-	if event.typ == yaml_MAPPING_END_EVENT {
-		emitter.flow_level--
-		emitter.indent = emitter.indents[len(emitter.indents)-1]
-		emitter.indents = emitter.indents[:len(emitter.indents)-1]
-		if emitter.canonical && !first {
-			if !yaml_emitter_write_indicator(emitter, []byte{','}, false, false, false) {
-				return false
-			}
-			if !yaml_emitter_write_indent(emitter) {
-				return false
-			}
-		}
-		if !yaml_emitter_write_indicator(emitter, []byte{'}'}, false, false, false) {
-			return false
-		}
-		emitter.state = emitter.states[len(emitter.states)-1]
-		emitter.states = emitter.states[:len(emitter.states)-1]
-		return true
-	}
-
-	if !first {
-		if !yaml_emitter_write_indicator(emitter, []byte{','}, false, false, false) {
-			return false
-		}
-	}
-	if emitter.canonical || emitter.column > emitter.best_width {
-		if !yaml_emitter_write_indent(emitter) {
-			return false
-		}
-	}
-
-	if !emitter.canonical && yaml_emitter_check_simple_key(emitter) {
-		emitter.states = append(emitter.states, yaml_EMIT_FLOW_MAPPING_SIMPLE_VALUE_STATE)
-		return yaml_emitter_emit_node(emitter, event, false, false, true, true)
-	}
-	if !yaml_emitter_write_indicator(emitter, []byte{'?'}, true, false, false) {
-		return false
-	}
-	emitter.states = append(emitter.states, yaml_EMIT_FLOW_MAPPING_VALUE_STATE)
-	return yaml_emitter_emit_node(emitter, event, false, false, true, false)
-}
-
-// Expect a flow value node.
-func yaml_emitter_emit_flow_mapping_value(emitter *yaml_emitter_t, event *yaml_event_t, simple bool) bool {
-	if simple {
-		if !yaml_emitter_write_indicator(emitter, []byte{':'}, false, false, false) {
-			return false
-		}
-	} else {
-		if emitter.canonical || emitter.column > emitter.best_width {
-			if !yaml_emitter_write_indent(emitter) {
-				return false
-			}
-		}
-		if !yaml_emitter_write_indicator(emitter, []byte{':'}, true, false, false) {
-			return false
-		}
-	}
-	emitter.states = append(emitter.states, yaml_EMIT_FLOW_MAPPING_KEY_STATE)
-	return yaml_emitter_emit_node(emitter, event, false, false, true, false)
-}
-
-// Expect a block item node.
-func yaml_emitter_emit_block_sequence_item(emitter *yaml_emitter_t, event *yaml_event_t, first bool) bool {
-	if first {
-		if !yaml_emitter_increase_indent(emitter, false, emitter.mapping_context && !emitter.indention) {
-			return false
-		}
-	}
-	if event.typ == yaml_SEQUENCE_END_EVENT {
-		emitter.indent = emitter.indents[len(emitter.indents)-1]
-		emitter.indents = emitter.indents[:len(emitter.indents)-1]
-		emitter.state = emitter.states[len(emitter.states)-1]
-		emitter.states = emitter.states[:len(emitter.states)-1]
-		return true
-	}
-	if !yaml_emitter_write_indent(emitter) {
-		return false
-	}
-	if !yaml_emitter_write_indicator(emitter, []byte{'-'}, true, false, true) {
-		return false
-	}
-	emitter.states = append(emitter.states, yaml_EMIT_BLOCK_SEQUENCE_ITEM_STATE)
-	return yaml_emitter_emit_node(emitter, event, false, true, false, false)
-}
-
-// Expect a block key node.
-func yaml_emitter_emit_block_mapping_key(emitter *yaml_emitter_t, event *yaml_event_t, first bool) bool {
-	if first {
-		if !yaml_emitter_increase_indent(emitter, false, false) {
-			return false
-		}
-	}
-	if event.typ == yaml_MAPPING_END_EVENT {
-		emitter.indent = emitter.indents[len(emitter.indents)-1]
-		emitter.indents = emitter.indents[:len(emitter.indents)-1]
-		emitter.state = emitter.states[len(emitter.states)-1]
-		emitter.states = emitter.states[:len(emitter.states)-1]
-		return true
-	}
-	if !yaml_emitter_write_indent(emitter) {
-		return false
-	}
-	if yaml_emitter_check_simple_key(emitter) {
-		emitter.states = append(emitter.states, yaml_EMIT_BLOCK_MAPPING_SIMPLE_VALUE_STATE)
-		return yaml_emitter_emit_node(emitter, event, false, false, true, true)
-	}
-	if !yaml_emitter_write_indicator(emitter, []byte{'?'}, true, false, true) {
-		return false
-	}
-	emitter.states = append(emitter.states, yaml_EMIT_BLOCK_MAPPING_VALUE_STATE)
-	return yaml_emitter_emit_node(emitter, event, false, false, true, false)
-}
-
-// Expect a block value node.
-func yaml_emitter_emit_block_mapping_value(emitter *yaml_emitter_t, event *yaml_event_t, simple bool) bool {
-	if simple {
-		if !yaml_emitter_write_indicator(emitter, []byte{':'}, false, false, false) {
-			return false
-		}
-	} else {
-		if !yaml_emitter_write_indent(emitter) {
-			return false
-		}
-		if !yaml_emitter_write_indicator(emitter, []byte{':'}, true, false, true) {
-			return false
-		}
-	}
-	emitter.states = append(emitter.states, yaml_EMIT_BLOCK_MAPPING_KEY_STATE)
-	return yaml_emitter_emit_node(emitter, event, false, false, true, false)
-}
-
-// Expect a node.
-func yaml_emitter_emit_node(emitter *yaml_emitter_t, event *yaml_event_t,
-	root bool, sequence bool, mapping bool, simple_key bool) bool {
-
-	emitter.root_context = root
-	emitter.sequence_context = sequence
-	emitter.mapping_context = mapping
-	emitter.simple_key_context = simple_key
-
-	switch event.typ {
-	case yaml_ALIAS_EVENT:
-		return yaml_emitter_emit_alias(emitter, event)
-	case yaml_SCALAR_EVENT:
-		return yaml_emitter_emit_scalar(emitter, event)
-	case yaml_SEQUENCE_START_EVENT:
-		return yaml_emitter_emit_sequence_start(emitter, event)
-	case yaml_MAPPING_START_EVENT:
-		return yaml_emitter_emit_mapping_start(emitter, event)
-	default:
-		return yaml_emitter_set_emitter_error(emitter,
-			"expected SCALAR, SEQUENCE-START, MAPPING-START, or ALIAS")
-	}
-	return false
-}
-
-// Expect ALIAS.
-func yaml_emitter_emit_alias(emitter *yaml_emitter_t, event *yaml_event_t) bool {
-	if !yaml_emitter_process_anchor(emitter) {
-		return false
-	}
-	emitter.state = emitter.states[len(emitter.states)-1]
-	emitter.states = emitter.states[:len(emitter.states)-1]
-	return true
-}
-
-// Expect SCALAR.
-func yaml_emitter_emit_scalar(emitter *yaml_emitter_t, event *yaml_event_t) bool {
-	if !yaml_emitter_select_scalar_style(emitter, event) {
-		return false
-	}
-	if !yaml_emitter_process_anchor(emitter) {
-		return false
-	}
-	if !yaml_emitter_process_tag(emitter) {
-		return false
-	}
-	if !yaml_emitter_increase_indent(emitter, true, false) {
-		return false
-	}
-	if !yaml_emitter_process_scalar(emitter) {
-		return false
-	}
-	emitter.indent = emitter.indents[len(emitter.indents)-1]
-	emitter.indents = emitter.indents[:len(emitter.indents)-1]
-	emitter.state = emitter.states[len(emitter.states)-1]
-	emitter.states = emitter.states[:len(emitter.states)-1]
-	return true
-}
-
-// Expect SEQUENCE-START.
-func yaml_emitter_emit_sequence_start(emitter *yaml_emitter_t, event *yaml_event_t) bool {
-	if !yaml_emitter_process_anchor(emitter) {
-		return false
-	}
-	if !yaml_emitter_process_tag(emitter) {
-		return false
-	}
-	if emitter.flow_level > 0 || emitter.canonical || event.sequence_style() == yaml_FLOW_SEQUENCE_STYLE ||
-		yaml_emitter_check_empty_sequence(emitter) {
-		emitter.state = yaml_EMIT_FLOW_SEQUENCE_FIRST_ITEM_STATE
-	} else {
-		emitter.state = yaml_EMIT_BLOCK_SEQUENCE_FIRST_ITEM_STATE
-	}
-	return true
-}
-
-// Expect MAPPING-START.
-func yaml_emitter_emit_mapping_start(emitter *yaml_emitter_t, event *yaml_event_t) bool {
-	if !yaml_emitter_process_anchor(emitter) {
-		return false
-	}
-	if !yaml_emitter_process_tag(emitter) {
-		return false
-	}
-	if emitter.flow_level > 0 || emitter.canonical || event.mapping_style() == yaml_FLOW_MAPPING_STYLE ||
-		yaml_emitter_check_empty_mapping(emitter) {
-		emitter.state = yaml_EMIT_FLOW_MAPPING_FIRST_KEY_STATE
-	} else {
-		emitter.state = yaml_EMIT_BLOCK_MAPPING_FIRST_KEY_STATE
-	}
-	return true
-}
-
-// Check if the document content is an empty scalar.
-func yaml_emitter_check_empty_document(emitter *yaml_emitter_t) bool {
-	return false // [Go] Huh?
-}
-
-// Check if the next events represent an empty sequence.
-func yaml_emitter_check_empty_sequence(emitter *yaml_emitter_t) bool {
-	if len(emitter.events)-emitter.events_head < 2 {
-		return false
-	}
-	return emitter.events[emitter.events_head].typ == yaml_SEQUENCE_START_EVENT &&
-		emitter.events[emitter.events_head+1].typ == yaml_SEQUENCE_END_EVENT
-}
-
-// Check if the next events represent an empty mapping.
-func yaml_emitter_check_empty_mapping(emitter *yaml_emitter_t) bool {
-	if len(emitter.events)-emitter.events_head < 2 {
-		return false
-	}
-	return emitter.events[emitter.events_head].typ == yaml_MAPPING_START_EVENT &&
-		emitter.events[emitter.events_head+1].typ == yaml_MAPPING_END_EVENT
-}
-
-// Check if the next node can be expressed as a simple key.
-func yaml_emitter_check_simple_key(emitter *yaml_emitter_t) bool {
-	length := 0
-	switch emitter.events[emitter.events_head].typ {
-	case yaml_ALIAS_EVENT:
-		length += len(emitter.anchor_data.anchor)
-	case yaml_SCALAR_EVENT:
-		if emitter.scalar_data.multiline {
-			return false
-		}
-		length += len(emitter.anchor_data.anchor) +
-			len(emitter.tag_data.handle) +
-			len(emitter.tag_data.suffix) +
-			len(emitter.scalar_data.value)
-	case yaml_SEQUENCE_START_EVENT:
-		if !yaml_emitter_check_empty_sequence(emitter) {
-			return false
-		}
-		length += len(emitter.anchor_data.anchor) +
-			len(emitter.tag_data.handle) +
-			len(emitter.tag_data.suffix)
-	case yaml_MAPPING_START_EVENT:
-		if !yaml_emitter_check_empty_mapping(emitter) {
-			return false
-		}
-		length += len(emitter.anchor_data.anchor) +
-			len(emitter.tag_data.handle) +
-			len(emitter.tag_data.suffix)
-	default:
-		return false
-	}
-	return length <= 128
-}
-
-// Determine an acceptable scalar style.
-func yaml_emitter_select_scalar_style(emitter *yaml_emitter_t, event *yaml_event_t) bool {
-
-	no_tag := len(emitter.tag_data.handle) == 0 && len(emitter.tag_data.suffix) == 0
-	if no_tag && !event.implicit && !event.quoted_implicit {
-		return yaml_emitter_set_emitter_error(emitter, "neither tag nor implicit flags are specified")
-	}
-
-	style := event.scalar_style()
-	if style == yaml_ANY_SCALAR_STYLE {
-		style = yaml_PLAIN_SCALAR_STYLE
-	}
-	if emitter.canonical {
-		style = yaml_DOUBLE_QUOTED_SCALAR_STYLE
-	}
-	if emitter.simple_key_context && emitter.scalar_data.multiline {
-		style = yaml_DOUBLE_QUOTED_SCALAR_STYLE
-	}
-
-	if style == yaml_PLAIN_SCALAR_STYLE {
-		if emitter.flow_level > 0 && !emitter.scalar_data.flow_plain_allowed ||
-			emitter.flow_level == 0 && !emitter.scalar_data.block_plain_allowed {
-			style = yaml_SINGLE_QUOTED_SCALAR_STYLE
-		}
-		if len(emitter.scalar_data.value) == 0 && (emitter.flow_level > 0 || emitter.simple_key_context) {
-			style = yaml_SINGLE_QUOTED_SCALAR_STYLE
-		}
-		if no_tag && !event.implicit {
-			style = yaml_SINGLE_QUOTED_SCALAR_STYLE
-		}
-	}
-	if style == yaml_SINGLE_QUOTED_SCALAR_STYLE {
-		if !emitter.scalar_data.single_quoted_allowed {
-			style = yaml_DOUBLE_QUOTED_SCALAR_STYLE
-		}
-	}
-	if style == yaml_LITERAL_SCALAR_STYLE || style == yaml_FOLDED_SCALAR_STYLE {
-		if !emitter.scalar_data.block_allowed || emitter.flow_level > 0 || emitter.simple_key_context {
-			style = yaml_DOUBLE_QUOTED_SCALAR_STYLE
-		}
-	}
-
-	if no_tag && !event.quoted_implicit && style != yaml_PLAIN_SCALAR_STYLE {
-		emitter.tag_data.handle = []byte{'!'}
-	}
-	emitter.scalar_data.style = style
-	return true
-}
-
-// Write an achor.
-func yaml_emitter_process_anchor(emitter *yaml_emitter_t) bool {
-	if emitter.anchor_data.anchor == nil {
-		return true
-	}
-	c := []byte{'&'}
-	if emitter.anchor_data.alias {
-		c[0] = '*'
-	}
-	if !yaml_emitter_write_indicator(emitter, c, true, false, false) {
-		return false
-	}
-	return yaml_emitter_write_anchor(emitter, emitter.anchor_data.anchor)
-}
-
-// Write a tag.
-func yaml_emitter_process_tag(emitter *yaml_emitter_t) bool {
-	if len(emitter.tag_data.handle) == 0 && len(emitter.tag_data.suffix) == 0 {
-		return true
-	}
-	if len(emitter.tag_data.handle) > 0 {
-		if !yaml_emitter_write_tag_handle(emitter, emitter.tag_data.handle) {
-			return false
-		}
-		if len(emitter.tag_data.suffix) > 0 {
-			if !yaml_emitter_write_tag_content(emitter, emitter.tag_data.suffix, false) {
-				return false
-			}
-		}
-	} else {
-		// [Go] Allocate these slices elsewhere.
-		if !yaml_emitter_write_indicator(emitter, []byte("!<"), true, false, false) {
-			return false
-		}
-		if !yaml_emitter_write_tag_content(emitter, emitter.tag_data.suffix, false) {
-			return false
-		}
-		if !yaml_emitter_write_indicator(emitter, []byte{'>'}, false, false, false) {
-			return false
-		}
-	}
-	return true
-}
-
-// Write a scalar.
-func yaml_emitter_process_scalar(emitter *yaml_emitter_t) bool {
-	switch emitter.scalar_data.style {
-	case yaml_PLAIN_SCALAR_STYLE:
-		return yaml_emitter_write_plain_scalar(emitter, emitter.scalar_data.value, !emitter.simple_key_context)
-
-	case yaml_SINGLE_QUOTED_SCALAR_STYLE:
-		return yaml_emitter_write_single_quoted_scalar(emitter, emitter.scalar_data.value, !emitter.simple_key_context)
-
-	case yaml_DOUBLE_QUOTED_SCALAR_STYLE:
-		return yaml_emitter_write_double_quoted_scalar(emitter, emitter.scalar_data.value, !emitter.simple_key_context)
-
-	case yaml_LITERAL_SCALAR_STYLE:
-		return yaml_emitter_write_literal_scalar(emitter, emitter.scalar_data.value)
-
-	case yaml_FOLDED_SCALAR_STYLE:
-		return yaml_emitter_write_folded_scalar(emitter, emitter.scalar_data.value)
-	}
-	panic("unknown scalar style")
-}
-
-// Check if a %YAML directive is valid.
-func yaml_emitter_analyze_version_directive(emitter *yaml_emitter_t, version_directive *yaml_version_directive_t) bool {
-	if version_directive.major != 1 || version_directive.minor != 1 {
-		return yaml_emitter_set_emitter_error(emitter, "incompatible %YAML directive")
-	}
-	return true
-}
-
-// Check if a %TAG directive is valid.
-func yaml_emitter_analyze_tag_directive(emitter *yaml_emitter_t, tag_directive *yaml_tag_directive_t) bool {
-	handle := tag_directive.handle
-	prefix := tag_directive.prefix
-	if len(handle) == 0 {
-		return yaml_emitter_set_emitter_error(emitter, "tag handle must not be empty")
-	}
-	if handle[0] != '!' {
-		return yaml_emitter_set_emitter_error(emitter, "tag handle must start with '!'")
-	}
-	if handle[len(handle)-1] != '!' {
-		return yaml_emitter_set_emitter_error(emitter, "tag handle must end with '!'")
-	}
-	for i := 1; i < len(handle)-1; i += width(handle[i]) {
-		if !is_alpha(handle, i) {
-			return yaml_emitter_set_emitter_error(emitter, "tag handle must contain alphanumerical characters only")
-		}
-	}
-	if len(prefix) == 0 {
-		return yaml_emitter_set_emitter_error(emitter, "tag prefix must not be empty")
-	}
-	return true
-}
-
-// Check if an anchor is valid.
-func yaml_emitter_analyze_anchor(emitter *yaml_emitter_t, anchor []byte, alias bool) bool {
-	if len(anchor) == 0 {
-		problem := "anchor value must not be empty"
-		if alias {
-			problem = "alias value must not be empty"
-		}
-		return yaml_emitter_set_emitter_error(emitter, problem)
-	}
-	for i := 0; i < len(anchor); i += width(anchor[i]) {
-		if !is_alpha(anchor, i) {
-			problem := "anchor value must contain alphanumerical characters only"
-			if alias {
-				problem = "alias value must contain alphanumerical characters only"
-			}
-			return yaml_emitter_set_emitter_error(emitter, problem)
-		}
-	}
-	emitter.anchor_data.anchor = anchor
-	emitter.anchor_data.alias = alias
-	return true
-}
-
-// Check if a tag is valid.
-func yaml_emitter_analyze_tag(emitter *yaml_emitter_t, tag []byte) bool {
-	if len(tag) == 0 {
-		return yaml_emitter_set_emitter_error(emitter, "tag value must not be empty")
-	}
-	for i := 0; i < len(emitter.tag_directives); i++ {
-		tag_directive := &emitter.tag_directives[i]
-		if bytes.HasPrefix(tag, tag_directive.prefix) {
-			emitter.tag_data.handle = tag_directive.handle
-			emitter.tag_data.suffix = tag[len(tag_directive.prefix):]
-			return true
-		}
-	}
-	emitter.tag_data.suffix = tag
-	return true
-}
-
-// Check if a scalar is valid.
-func yaml_emitter_analyze_scalar(emitter *yaml_emitter_t, value []byte) bool {
-	var (
-		block_indicators   = false
-		flow_indicators    = false
-		line_breaks        = false
-		special_characters = false
-
-		leading_space  = false
-		leading_break  = false
-		trailing_space = false
-		trailing_break = false
-		break_space    = false
-		space_break    = false
-
-		preceeded_by_whitespace = false
-		followed_by_whitespace  = false
-		previous_space          = false
-		previous_break          = false
-	)
-
-	emitter.scalar_data.value = value
-
-	if len(value) == 0 {
-		emitter.scalar_data.multiline = false
-		emitter.scalar_data.flow_plain_allowed = false
-		emitter.scalar_data.block_plain_allowed = true
-		emitter.scalar_data.single_quoted_allowed = true
-		emitter.scalar_data.block_allowed = false
-		return true
-	}
-
-	if len(value) >= 3 && ((value[0] == '-' && value[1] == '-' && value[2] == '-') || (value[0] == '.' && value[1] == '.' && value[2] == '.')) {
-		block_indicators = true
-		flow_indicators = true
-	}
-
-	preceeded_by_whitespace = true
-	for i, w := 0, 0; i < len(value); i += w {
-		w = width(value[i])
-		followed_by_whitespace = i+w >= len(value) || is_blank(value, i+w)
-
-		if i == 0 {
-			switch value[i] {
-			case '#', ',', '[', ']', '{', '}', '&', '*', '!', '|', '>', '\'', '"', '%', '@', '`':
-				flow_indicators = true
-				block_indicators = true
-			case '?', ':':
-				flow_indicators = true
-				if followed_by_whitespace {
-					block_indicators = true
-				}
-			case '-':
-				if followed_by_whitespace {
-					flow_indicators = true
-					block_indicators = true
-				}
-			}
-		} else {
-			switch value[i] {
-			case ',', '?', '[', ']', '{', '}':
-				flow_indicators = true
-			case ':':
-				flow_indicators = true
-				if followed_by_whitespace {
-					block_indicators = true
-				}
-			case '#':
-				if preceeded_by_whitespace {
-					flow_indicators = true
-					block_indicators = true
-				}
-			}
-		}
-
-		if !is_printable(value, i) || !is_ascii(value, i) && !emitter.unicode {
-			special_characters = true
-		}
-		if is_space(value, i) {
-			if i == 0 {
-				leading_space = true
-			}
-			if i+width(value[i]) == len(value) {
-				trailing_space = true
-			}
-			if previous_break {
-				break_space = true
-			}
-			previous_space = true
-			previous_break = false
-		} else if is_break(value, i) {
-			line_breaks = true
-			if i == 0 {
-				leading_break = true
-			}
-			if i+width(value[i]) == len(value) {
-				trailing_break = true
-			}
-			if previous_space {
-				space_break = true
-			}
-			previous_space = false
-			previous_break = true
-		} else {
-			previous_space = false
-			previous_break = false
-		}
-
-		// [Go]: Why 'z'? Couldn't be the end of the string as that's the loop condition.
-		preceeded_by_whitespace = is_blankz(value, i)
-	}
-
-	emitter.scalar_data.multiline = line_breaks
-	emitter.scalar_data.flow_plain_allowed = true
-	emitter.scalar_data.block_plain_allowed = true
-	emitter.scalar_data.single_quoted_allowed = true
-	emitter.scalar_data.block_allowed = true
-
-	if leading_space || leading_break || trailing_space || trailing_break {
-		emitter.scalar_data.flow_plain_allowed = false
-		emitter.scalar_data.block_plain_allowed = false
-	}
-	if trailing_space {
-		emitter.scalar_data.block_allowed = false
-	}
-	if break_space {
-		emitter.scalar_data.flow_plain_allowed = false
-		emitter.scalar_data.block_plain_allowed = false
-		emitter.scalar_data.single_quoted_allowed = false
-	}
-	if space_break || special_characters {
-		emitter.scalar_data.flow_plain_allowed = false
-		emitter.scalar_data.block_plain_allowed = false
-		emitter.scalar_data.single_quoted_allowed = false
-		emitter.scalar_data.block_allowed = false
-	}
-	if line_breaks {
-		emitter.scalar_data.flow_plain_allowed = false
-		emitter.scalar_data.block_plain_allowed = false
-	}
-	if flow_indicators {
-		emitter.scalar_data.flow_plain_allowed = false
-	}
-	if block_indicators {
-		emitter.scalar_data.block_plain_allowed = false
-	}
-	return true
-}
-
-// Check if the event data is valid.
-func yaml_emitter_analyze_event(emitter *yaml_emitter_t, event *yaml_event_t) bool {
-
-	emitter.anchor_data.anchor = nil
-	emitter.tag_data.handle = nil
-	emitter.tag_data.suffix = nil
-	emitter.scalar_data.value = nil
-
-	switch event.typ {
-	case yaml_ALIAS_EVENT:
-		if !yaml_emitter_analyze_anchor(emitter, event.anchor, true) {
-			return false
-		}
-
-	case yaml_SCALAR_EVENT:
-		if len(event.anchor) > 0 {
-			if !yaml_emitter_analyze_anchor(emitter, event.anchor, false) {
-				return false
-			}
-		}
-		if len(event.tag) > 0 && (emitter.canonical || (!event.implicit && !event.quoted_implicit)) {
-			if !yaml_emitter_analyze_tag(emitter, event.tag) {
-				return false
-			}
-		}
-		if !yaml_emitter_analyze_scalar(emitter, event.value) {
-			return false
-		}
-
-	case yaml_SEQUENCE_START_EVENT:
-		if len(event.anchor) > 0 {
-			if !yaml_emitter_analyze_anchor(emitter, event.anchor, false) {
-				return false
-			}
-		}
-		if len(event.tag) > 0 && (emitter.canonical || !event.implicit) {
-			if !yaml_emitter_analyze_tag(emitter, event.tag) {
-				return false
-			}
-		}
-
-	case yaml_MAPPING_START_EVENT:
-		if len(event.anchor) > 0 {
-			if !yaml_emitter_analyze_anchor(emitter, event.anchor, false) {
-				return false
-			}
-		}
-		if len(event.tag) > 0 && (emitter.canonical || !event.implicit) {
-			if !yaml_emitter_analyze_tag(emitter, event.tag) {
-				return false
-			}
-		}
-	}
-	return true
-}
-
-// Write the BOM character.
-func yaml_emitter_write_bom(emitter *yaml_emitter_t) bool {
-	if !flush(emitter) {
-		return false
-	}
-	pos := emitter.buffer_pos
-	emitter.buffer[pos+0] = '\xEF'
-	emitter.buffer[pos+1] = '\xBB'
-	emitter.buffer[pos+2] = '\xBF'
-	emitter.buffer_pos += 3
-	return true
-}
-
-func yaml_emitter_write_indent(emitter *yaml_emitter_t) bool {
-	indent := emitter.indent
-	if indent < 0 {
-		indent = 0
-	}
-	if !emitter.indention || emitter.column > indent || (emitter.column == indent && !emitter.whitespace) {
-		if !put_break(emitter) {
-			return false
-		}
-	}
-	for emitter.column < indent {
-		if !put(emitter, ' ') {
-			return false
-		}
-	}
-	emitter.whitespace = true
-	emitter.indention = true
-	return true
-}
-
-func yaml_emitter_write_indicator(emitter *yaml_emitter_t, indicator []byte, need_whitespace, is_whitespace, is_indention bool) bool {
-	if need_whitespace && !emitter.whitespace {
-		if !put(emitter, ' ') {
-			return false
-		}
-	}
-	if !write_all(emitter, indicator) {
-		return false
-	}
-	emitter.whitespace = is_whitespace
-	emitter.indention = (emitter.indention && is_indention)
-	emitter.open_ended = false
-	return true
-}
-
-func yaml_emitter_write_anchor(emitter *yaml_emitter_t, value []byte) bool {
-	if !write_all(emitter, value) {
-		return false
-	}
-	emitter.whitespace = false
-	emitter.indention = false
-	return true
-}
-
-func yaml_emitter_write_tag_handle(emitter *yaml_emitter_t, value []byte) bool {
-	if !emitter.whitespace {
-		if !put(emitter, ' ') {
-			return false
-		}
-	}
-	if !write_all(emitter, value) {
-		return false
-	}
-	emitter.whitespace = false
-	emitter.indention = false
-	return true
-}
-
-func yaml_emitter_write_tag_content(emitter *yaml_emitter_t, value []byte, need_whitespace bool) bool {
-	if need_whitespace && !emitter.whitespace {
-		if !put(emitter, ' ') {
-			return false
-		}
-	}
-	for i := 0; i < len(value); {
-		var must_write bool
-		switch value[i] {
-		case ';', '/', '?', ':', '@', '&', '=', '+', '$', ',', '_', '.', '~', '*', '\'', '(', ')', '[', ']':
-			must_write = true
-		default:
-			must_write = is_alpha(value, i)
-		}
-		if must_write {
-			if !write(emitter, value, &i) {
-				return false
-			}
-		} else {
-			w := width(value[i])
-			for k := 0; k < w; k++ {
-				octet := value[i]
-				i++
-				if !put(emitter, '%') {
-					return false
-				}
-
-				c := octet >> 4
-				if c < 10 {
-					c += '0'
-				} else {
-					c += 'A' - 10
-				}
-				if !put(emitter, c) {
-					return false
-				}
-
-				c = octet & 0x0f
-				if c < 10 {
-					c += '0'
-				} else {
-					c += 'A' - 10
-				}
-				if !put(emitter, c) {
-					return false
-				}
-			}
-		}
-	}
-	emitter.whitespace = false
-	emitter.indention = false
-	return true
-}
-
-func yaml_emitter_write_plain_scalar(emitter *yaml_emitter_t, value []byte, allow_breaks bool) bool {
-	if !emitter.whitespace {
-		if !put(emitter, ' ') {
-			return false
-		}
-	}
-
-	spaces := false
-	breaks := false
-	for i := 0; i < len(value); {
-		if is_space(value, i) {
-			if allow_breaks && !spaces && emitter.column > emitter.best_width && !is_space(value, i+1) {
-				if !yaml_emitter_write_indent(emitter) {
-					return false
-				}
-				i += width(value[i])
-			} else {
-				if !write(emitter, value, &i) {
-					return false
-				}
-			}
-			spaces = true
-		} else if is_break(value, i) {
-			if !breaks && value[i] == '\n' {
-				if !put_break(emitter) {
-					return false
-				}
-			}
-			if !write_break(emitter, value, &i) {
-				return false
-			}
-			emitter.indention = true
-			breaks = true
-		} else {
-			if breaks {
-				if !yaml_emitter_write_indent(emitter) {
-					return false
-				}
-			}
-			if !write(emitter, value, &i) {
-				return false
-			}
-			emitter.indention = false
-			spaces = false
-			breaks = false
-		}
-	}
-
-	emitter.whitespace = false
-	emitter.indention = false
-	if emitter.root_context {
-		emitter.open_ended = true
-	}
-
-	return true
-}
-
-func yaml_emitter_write_single_quoted_scalar(emitter *yaml_emitter_t, value []byte, allow_breaks bool) bool {
-
-	if !yaml_emitter_write_indicator(emitter, []byte{'\''}, true, false, false) {
-		return false
-	}
-
-	spaces := false
-	breaks := false
-	for i := 0; i < len(value); {
-		if is_space(value, i) {
-			if allow_breaks && !spaces && emitter.column > emitter.best_width && i > 0 && i < len(value)-1 && !is_space(value, i+1) {
-				if !yaml_emitter_write_indent(emitter) {
-					return false
-				}
-				i += width(value[i])
-			} else {
-				if !write(emitter, value, &i) {
-					return false
-				}
-			}
-			spaces = true
-		} else if is_break(value, i) {
-			if !breaks && value[i] == '\n' {
-				if !put_break(emitter) {
-					return false
-				}
-			}
-			if !write_break(emitter, value, &i) {
-				return false
-			}
-			emitter.indention = true
-			breaks = true
-		} else {
-			if breaks {
-				if !yaml_emitter_write_indent(emitter) {
-					return false
-				}
-			}
-			if value[i] == '\'' {
-				if !put(emitter, '\'') {
-					return false
-				}
-			}
-			if !write(emitter, value, &i) {
-				return false
-			}
-			emitter.indention = false
-			spaces = false
-			breaks = false
-		}
-	}
-	if !yaml_emitter_write_indicator(emitter, []byte{'\''}, false, false, false) {
-		return false
-	}
-	emitter.whitespace = false
-	emitter.indention = false
-	return true
-}
-
-func yaml_emitter_write_double_quoted_scalar(emitter *yaml_emitter_t, value []byte, allow_breaks bool) bool {
-	spaces := false
-	if !yaml_emitter_write_indicator(emitter, []byte{'"'}, true, false, false) {
-		return false
-	}
-
-	for i := 0; i < len(value); {
-		if !is_printable(value, i) || (!emitter.unicode && !is_ascii(value, i)) ||
-			is_bom(value, i) || is_break(value, i) ||
-			value[i] == '"' || value[i] == '\\' {
-
-			octet := value[i]
-
-			var w int
-			var v rune
-			switch {
-			case octet&0x80 == 0x00:
-				w, v = 1, rune(octet&0x7F)
-			case octet&0xE0 == 0xC0:
-				w, v = 2, rune(octet&0x1F)
-			case octet&0xF0 == 0xE0:
-				w, v = 3, rune(octet&0x0F)
-			case octet&0xF8 == 0xF0:
-				w, v = 4, rune(octet&0x07)
-			}
-			for k := 1; k < w; k++ {
-				octet = value[i+k]
-				v = (v << 6) + (rune(octet) & 0x3F)
-			}
-			i += w
-
-			if !put(emitter, '\\') {
-				return false
-			}
-
-			var ok bool
-			switch v {
-			case 0x00:
-				ok = put(emitter, '0')
-			case 0x07:
-				ok = put(emitter, 'a')
-			case 0x08:
-				ok = put(emitter, 'b')
-			case 0x09:
-				ok = put(emitter, 't')
-			case 0x0A:
-				ok = put(emitter, 'n')
-			case 0x0b:
-				ok = put(emitter, 'v')
-			case 0x0c:
-				ok = put(emitter, 'f')
-			case 0x0d:
-				ok = put(emitter, 'r')
-			case 0x1b:
-				ok = put(emitter, 'e')
-			case 0x22:
-				ok = put(emitter, '"')
-			case 0x5c:
-				ok = put(emitter, '\\')
-			case 0x85:
-				ok = put(emitter, 'N')
-			case 0xA0:
-				ok = put(emitter, '_')
-			case 0x2028:
-				ok = put(emitter, 'L')
-			case 0x2029:
-				ok = put(emitter, 'P')
-			default:
-				if v <= 0xFF {
-					ok = put(emitter, 'x')
-					w = 2
-				} else if v <= 0xFFFF {
-					ok = put(emitter, 'u')
-					w = 4
-				} else {
-					ok = put(emitter, 'U')
-					w = 8
-				}
-				for k := (w - 1) * 4; ok && k >= 0; k -= 4 {
-					digit := byte((v >> uint(k)) & 0x0F)
-					if digit < 10 {
-						ok = put(emitter, digit+'0')
-					} else {
-						ok = put(emitter, digit+'A'-10)
-					}
-				}
-			}
-			if !ok {
-				return false
-			}
-			spaces = false
-		} else if is_space(value, i) {
-			if allow_breaks && !spaces && emitter.column > emitter.best_width && i > 0 && i < len(value)-1 {
-				if !yaml_emitter_write_indent(emitter) {
-					return false
-				}
-				if is_space(value, i+1) {
-					if !put(emitter, '\\') {
-						return false
-					}
-				}
-				i += width(value[i])
-			} else if !write(emitter, value, &i) {
-				return false
-			}
-			spaces = true
-		} else {
-			if !write(emitter, value, &i) {
-				return false
-			}
-			spaces = false
-		}
-	}
-	if !yaml_emitter_write_indicator(emitter, []byte{'"'}, false, false, false) {
-		return false
-	}
-	emitter.whitespace = false
-	emitter.indention = false
-	return true
-}
-
-func yaml_emitter_write_block_scalar_hints(emitter *yaml_emitter_t, value []byte) bool {
-	if is_space(value, 0) || is_break(value, 0) {
-		indent_hint := []byte{'0' + byte(emitter.best_indent)}
-		if !yaml_emitter_write_indicator(emitter, indent_hint, false, false, false) {
-			return false
-		}
-	}
-
-	emitter.open_ended = false
-
-	var chomp_hint [1]byte
-	if len(value) == 0 {
-		chomp_hint[0] = '-'
-	} else {
-		i := len(value) - 1
-		for value[i]&0xC0 == 0x80 {
-			i--
-		}
-		if !is_break(value, i) {
-			chomp_hint[0] = '-'
-		} else if i == 0 {
-			chomp_hint[0] = '+'
-			emitter.open_ended = true
-		} else {
-			i--
-			for value[i]&0xC0 == 0x80 {
-				i--
-			}
-			if is_break(value, i) {
-				chomp_hint[0] = '+'
-				emitter.open_ended = true
-			}
-		}
-	}
-	if chomp_hint[0] != 0 {
-		if !yaml_emitter_write_indicator(emitter, chomp_hint[:], false, false, false) {
-			return false
-		}
-	}
-	return true
-}
-
-func yaml_emitter_write_literal_scalar(emitter *yaml_emitter_t, value []byte) bool {
-	if !yaml_emitter_write_indicator(emitter, []byte{'|'}, true, false, false) {
-		return false
-	}
-	if !yaml_emitter_write_block_scalar_hints(emitter, value) {
-		return false
-	}
-	if !put_break(emitter) {
-		return false
-	}
-	emitter.indention = true
-	emitter.whitespace = true
-	breaks := true
-	for i := 0; i < len(value); {
-		if is_break(value, i) {
-			if !write_break(emitter, value, &i) {
-				return false
-			}
-			emitter.indention = true
-			breaks = true
-		} else {
-			if breaks {
-				if !yaml_emitter_write_indent(emitter) {
-					return false
-				}
-			}
-			if !write(emitter, value, &i) {
-				return false
-			}
-			emitter.indention = false
-			breaks = false
-		}
-	}
-
-	return true
-}
-
-func yaml_emitter_write_folded_scalar(emitter *yaml_emitter_t, value []byte) bool {
-	if !yaml_emitter_write_indicator(emitter, []byte{'>'}, true, false, false) {
-		return false
-	}
-	if !yaml_emitter_write_block_scalar_hints(emitter, value) {
-		return false
-	}
-
-	if !put_break(emitter) {
-		return false
-	}
-	emitter.indention = true
-	emitter.whitespace = true
-
-	breaks := true
-	leading_spaces := true
-	for i := 0; i < len(value); {
-		if is_break(value, i) {
-			if !breaks && !leading_spaces && value[i] == '\n' {
-				k := 0
-				for is_break(value, k) {
-					k += width(value[k])
-				}
-				if !is_blankz(value, k) {
-					if !put_break(emitter) {
-						return false
-					}
-				}
-			}
-			if !write_break(emitter, value, &i) {
-				return false
-			}
-			emitter.indention = true
-			breaks = true
-		} else {
-			if breaks {
-				if !yaml_emitter_write_indent(emitter) {
-					return false
-				}
-				leading_spaces = is_blank(value, i)
-			}
-			if !breaks && is_space(value, i) && !is_space(value, i+1) && emitter.column > emitter.best_width {
-				if !yaml_emitter_write_indent(emitter) {
-					return false
-				}
-				i += width(value[i])
-			} else {
-				if !write(emitter, value, &i) {
-					return false
-				}
-			}
-			emitter.indention = false
-			breaks = false
-		}
-	}
-	return true
-}
diff --git a/Godeps/_workspace/src/gopkg.in/yaml.v2/encode.go b/Godeps/_workspace/src/gopkg.in/yaml.v2/encode.go
deleted file mode 100644
index 84f849955..000000000
--- a/Godeps/_workspace/src/gopkg.in/yaml.v2/encode.go
+++ /dev/null
@@ -1,306 +0,0 @@
-package yaml
-
-import (
-	"encoding"
-	"fmt"
-	"reflect"
-	"regexp"
-	"sort"
-	"strconv"
-	"strings"
-	"time"
-)
-
-type encoder struct {
-	emitter yaml_emitter_t
-	event   yaml_event_t
-	out     []byte
-	flow    bool
-}
-
-func newEncoder() (e *encoder) {
-	e = &encoder{}
-	e.must(yaml_emitter_initialize(&e.emitter))
-	yaml_emitter_set_output_string(&e.emitter, &e.out)
-	yaml_emitter_set_unicode(&e.emitter, true)
-	e.must(yaml_stream_start_event_initialize(&e.event, yaml_UTF8_ENCODING))
-	e.emit()
-	e.must(yaml_document_start_event_initialize(&e.event, nil, nil, true))
-	e.emit()
-	return e
-}
-
-func (e *encoder) finish() {
-	e.must(yaml_document_end_event_initialize(&e.event, true))
-	e.emit()
-	e.emitter.open_ended = false
-	e.must(yaml_stream_end_event_initialize(&e.event))
-	e.emit()
-}
-
-func (e *encoder) destroy() {
-	yaml_emitter_delete(&e.emitter)
-}
-
-func (e *encoder) emit() {
-	// This will internally delete the e.event value.
-	if !yaml_emitter_emit(&e.emitter, &e.event) && e.event.typ != yaml_DOCUMENT_END_EVENT && e.event.typ != yaml_STREAM_END_EVENT {
-		e.must(false)
-	}
-}
-
-func (e *encoder) must(ok bool) {
-	if !ok {
-		msg := e.emitter.problem
-		if msg == "" {
-			msg = "unknown problem generating YAML content"
-		}
-		failf("%s", msg)
-	}
-}
-
-func (e *encoder) marshal(tag string, in reflect.Value) {
-	if !in.IsValid() {
-		e.nilv()
-		return
-	}
-	iface := in.Interface()
-	if m, ok := iface.(Marshaler); ok {
-		v, err := m.MarshalYAML()
-		if err != nil {
-			fail(err)
-		}
-		if v == nil {
-			e.nilv()
-			return
-		}
-		in = reflect.ValueOf(v)
-	} else if m, ok := iface.(encoding.TextMarshaler); ok {
-		text, err := m.MarshalText()
-		if err != nil {
-			fail(err)
-		}
-		in = reflect.ValueOf(string(text))
-	}
-	switch in.Kind() {
-	case reflect.Interface:
-		if in.IsNil() {
-			e.nilv()
-		} else {
-			e.marshal(tag, in.Elem())
-		}
-	case reflect.Map:
-		e.mapv(tag, in)
-	case reflect.Ptr:
-		if in.IsNil() {
-			e.nilv()
-		} else {
-			e.marshal(tag, in.Elem())
-		}
-	case reflect.Struct:
-		e.structv(tag, in)
-	case reflect.Slice:
-		if in.Type().Elem() == mapItemType {
-			e.itemsv(tag, in)
-		} else {
-			e.slicev(tag, in)
-		}
-	case reflect.String:
-		e.stringv(tag, in)
-	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
-		if in.Type() == durationType {
-			e.stringv(tag, reflect.ValueOf(iface.(time.Duration).String()))
-		} else {
-			e.intv(tag, in)
-		}
-	case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uintptr:
-		e.uintv(tag, in)
-	case reflect.Float32, reflect.Float64:
-		e.floatv(tag, in)
-	case reflect.Bool:
-		e.boolv(tag, in)
-	default:
-		panic("cannot marshal type: " + in.Type().String())
-	}
-}
-
-func (e *encoder) mapv(tag string, in reflect.Value) {
-	e.mappingv(tag, func() {
-		keys := keyList(in.MapKeys())
-		sort.Sort(keys)
-		for _, k := range keys {
-			e.marshal("", k)
-			e.marshal("", in.MapIndex(k))
-		}
-	})
-}
-
-func (e *encoder) itemsv(tag string, in reflect.Value) {
-	e.mappingv(tag, func() {
-		slice := in.Convert(reflect.TypeOf([]MapItem{})).Interface().([]MapItem)
-		for _, item := range slice {
-			e.marshal("", reflect.ValueOf(item.Key))
-			e.marshal("", reflect.ValueOf(item.Value))
-		}
-	})
-}
-
-func (e *encoder) structv(tag string, in reflect.Value) {
-	sinfo, err := getStructInfo(in.Type())
-	if err != nil {
-		panic(err)
-	}
-	e.mappingv(tag, func() {
-		for _, info := range sinfo.FieldsList {
-			var value reflect.Value
-			if info.Inline == nil {
-				value = in.Field(info.Num)
-			} else {
-				value = in.FieldByIndex(info.Inline)
-			}
-			if info.OmitEmpty && isZero(value) {
-				continue
-			}
-			e.marshal("", reflect.ValueOf(info.Key))
-			e.flow = info.Flow
-			e.marshal("", value)
-		}
-		if sinfo.InlineMap >= 0 {
-			m := in.Field(sinfo.InlineMap)
-			if m.Len() > 0 {
-				e.flow = false
-				keys := keyList(m.MapKeys())
-				sort.Sort(keys)
-				for _, k := range keys {
-					if _, found := sinfo.FieldsMap[k.String()]; found {
-						panic(fmt.Sprintf("Can't have key %q in inlined map; conflicts with struct field", k.String()))
-					}
-					e.marshal("", k)
-					e.flow = false
-					e.marshal("", m.MapIndex(k))
-				}
-			}
-		}
-	})
-}
-
-func (e *encoder) mappingv(tag string, f func()) {
-	implicit := tag == ""
-	style := yaml_BLOCK_MAPPING_STYLE
-	if e.flow {
-		e.flow = false
-		style = yaml_FLOW_MAPPING_STYLE
-	}
-	e.must(yaml_mapping_start_event_initialize(&e.event, nil, []byte(tag), implicit, style))
-	e.emit()
-	f()
-	e.must(yaml_mapping_end_event_initialize(&e.event))
-	e.emit()
-}
-
-func (e *encoder) slicev(tag string, in reflect.Value) {
-	implicit := tag == ""
-	style := yaml_BLOCK_SEQUENCE_STYLE
-	if e.flow {
-		e.flow = false
-		style = yaml_FLOW_SEQUENCE_STYLE
-	}
-	e.must(yaml_sequence_start_event_initialize(&e.event, nil, []byte(tag), implicit, style))
-	e.emit()
-	n := in.Len()
-	for i := 0; i < n; i++ {
-		e.marshal("", in.Index(i))
-	}
-	e.must(yaml_sequence_end_event_initialize(&e.event))
-	e.emit()
-}
-
-// isBase60 returns whether s is in base 60 notation as defined in YAML 1.1.
-//
-// The base 60 float notation in YAML 1.1 is a terrible idea and is unsupported
-// in YAML 1.2 and by this package, but these should be marshalled quoted for
-// the time being for compatibility with other parsers.
-func isBase60Float(s string) (result bool) {
-	// Fast path.
-	if s == "" {
-		return false
-	}
-	c := s[0]
-	if !(c == '+' || c == '-' || c >= '0' && c <= '9') || strings.IndexByte(s, ':') < 0 {
-		return false
-	}
-	// Do the full match.
-	return base60float.MatchString(s)
-}
-
-// From http://yaml.org/type/float.html, except the regular expression there
-// is bogus. In practice parsers do not enforce the "\.[0-9_]*" suffix.
-var base60float = regexp.MustCompile(`^[-+]?[0-9][0-9_]*(?::[0-5]?[0-9])+(?:\.[0-9_]*)?$`)
-
-func (e *encoder) stringv(tag string, in reflect.Value) {
-	var style yaml_scalar_style_t
-	s := in.String()
-	rtag, rs := resolve("", s)
-	if rtag == yaml_BINARY_TAG {
-		if tag == "" || tag == yaml_STR_TAG {
-			tag = rtag
-			s = rs.(string)
-		} else if tag == yaml_BINARY_TAG {
-			failf("explicitly tagged !!binary data must be base64-encoded")
-		} else {
-			failf("cannot marshal invalid UTF-8 data as %s", shortTag(tag))
-		}
-	}
-	if tag == "" && (rtag != yaml_STR_TAG || isBase60Float(s)) {
-		style = yaml_DOUBLE_QUOTED_SCALAR_STYLE
-	} else if strings.Contains(s, "\n") {
-		style = yaml_LITERAL_SCALAR_STYLE
-	} else {
-		style = yaml_PLAIN_SCALAR_STYLE
-	}
-	e.emitScalar(s, "", tag, style)
-}
-
-func (e *encoder) boolv(tag string, in reflect.Value) {
-	var s string
-	if in.Bool() {
-		s = "true"
-	} else {
-		s = "false"
-	}
-	e.emitScalar(s, "", tag, yaml_PLAIN_SCALAR_STYLE)
-}
-
-func (e *encoder) intv(tag string, in reflect.Value) {
-	s := strconv.FormatInt(in.Int(), 10)
-	e.emitScalar(s, "", tag, yaml_PLAIN_SCALAR_STYLE)
-}
-
-func (e *encoder) uintv(tag string, in reflect.Value) {
-	s := strconv.FormatUint(in.Uint(), 10)
-	e.emitScalar(s, "", tag, yaml_PLAIN_SCALAR_STYLE)
-}
-
-func (e *encoder) floatv(tag string, in reflect.Value) {
-	// FIXME: Handle 64 bits here.
-	s := strconv.FormatFloat(float64(in.Float()), 'g', -1, 32)
-	switch s {
-	case "+Inf":
-		s = ".inf"
-	case "-Inf":
-		s = "-.inf"
-	case "NaN":
-		s = ".nan"
-	}
-	e.emitScalar(s, "", tag, yaml_PLAIN_SCALAR_STYLE)
-}
-
-func (e *encoder) nilv() {
-	e.emitScalar("null", "", "", yaml_PLAIN_SCALAR_STYLE)
-}
-
-func (e *encoder) emitScalar(value, anchor, tag string, style yaml_scalar_style_t) {
-	implicit := tag == ""
-	e.must(yaml_scalar_event_initialize(&e.event, []byte(anchor), []byte(tag), []byte(value), implicit, implicit, style))
-	e.emit()
-}
diff --git a/Godeps/_workspace/src/gopkg.in/yaml.v2/parserc.go b/Godeps/_workspace/src/gopkg.in/yaml.v2/parserc.go
deleted file mode 100644
index 0a7037ad1..000000000
--- a/Godeps/_workspace/src/gopkg.in/yaml.v2/parserc.go
+++ /dev/null
@@ -1,1096 +0,0 @@
-package yaml
-
-import (
-	"bytes"
-)
-
-// The parser implements the following grammar:
-//
-// stream               ::= STREAM-START implicit_document? explicit_document* STREAM-END
-// implicit_document    ::= block_node DOCUMENT-END*
-// explicit_document    ::= DIRECTIVE* DOCUMENT-START block_node? DOCUMENT-END*
-// block_node_or_indentless_sequence    ::=
-//                          ALIAS
-//                          | properties (block_content | indentless_block_sequence)?
-//                          | block_content
-//                          | indentless_block_sequence
-// block_node           ::= ALIAS
-//                          | properties block_content?
-//                          | block_content
-// flow_node            ::= ALIAS
-//                          | properties flow_content?
-//                          | flow_content
-// properties           ::= TAG ANCHOR? | ANCHOR TAG?
-// block_content        ::= block_collection | flow_collection | SCALAR
-// flow_content         ::= flow_collection | SCALAR
-// block_collection     ::= block_sequence | block_mapping
-// flow_collection      ::= flow_sequence | flow_mapping
-// block_sequence       ::= BLOCK-SEQUENCE-START (BLOCK-ENTRY block_node?)* BLOCK-END
-// indentless_sequence  ::= (BLOCK-ENTRY block_node?)+
-// block_mapping        ::= BLOCK-MAPPING_START
-//                          ((KEY block_node_or_indentless_sequence?)?
-//                          (VALUE block_node_or_indentless_sequence?)?)*
-//                          BLOCK-END
-// flow_sequence        ::= FLOW-SEQUENCE-START
-//                          (flow_sequence_entry FLOW-ENTRY)*
-//                          flow_sequence_entry?
-//                          FLOW-SEQUENCE-END
-// flow_sequence_entry  ::= flow_node | KEY flow_node? (VALUE flow_node?)?
-// flow_mapping         ::= FLOW-MAPPING-START
-//                          (flow_mapping_entry FLOW-ENTRY)*
-//                          flow_mapping_entry?
-//                          FLOW-MAPPING-END
-// flow_mapping_entry   ::= flow_node | KEY flow_node? (VALUE flow_node?)?
-
-// Peek the next token in the token queue.
-func peek_token(parser *yaml_parser_t) *yaml_token_t {
-	if parser.token_available || yaml_parser_fetch_more_tokens(parser) {
-		return &parser.tokens[parser.tokens_head]
-	}
-	return nil
-}
-
-// Remove the next token from the queue (must be called after peek_token).
-func skip_token(parser *yaml_parser_t) {
-	parser.token_available = false
-	parser.tokens_parsed++
-	parser.stream_end_produced = parser.tokens[parser.tokens_head].typ == yaml_STREAM_END_TOKEN
-	parser.tokens_head++
-}
-
-// Get the next event.
-func yaml_parser_parse(parser *yaml_parser_t, event *yaml_event_t) bool {
-	// Erase the event object.
-	*event = yaml_event_t{}
-
-	// No events after the end of the stream or error.
-	if parser.stream_end_produced || parser.error != yaml_NO_ERROR || parser.state == yaml_PARSE_END_STATE {
-		return true
-	}
-
-	// Generate the next event.
-	return yaml_parser_state_machine(parser, event)
-}
-
-// Set parser error.
-func yaml_parser_set_parser_error(parser *yaml_parser_t, problem string, problem_mark yaml_mark_t) bool {
-	parser.error = yaml_PARSER_ERROR
-	parser.problem = problem
-	parser.problem_mark = problem_mark
-	return false
-}
-
-func yaml_parser_set_parser_error_context(parser *yaml_parser_t, context string, context_mark yaml_mark_t, problem string, problem_mark yaml_mark_t) bool {
-	parser.error = yaml_PARSER_ERROR
-	parser.context = context
-	parser.context_mark = context_mark
-	parser.problem = problem
-	parser.problem_mark = problem_mark
-	return false
-}
-
-// State dispatcher.
-func yaml_parser_state_machine(parser *yaml_parser_t, event *yaml_event_t) bool {
-	//trace("yaml_parser_state_machine", "state:", parser.state.String())
-
-	switch parser.state {
-	case yaml_PARSE_STREAM_START_STATE:
-		return yaml_parser_parse_stream_start(parser, event)
-
-	case yaml_PARSE_IMPLICIT_DOCUMENT_START_STATE:
-		return yaml_parser_parse_document_start(parser, event, true)
-
-	case yaml_PARSE_DOCUMENT_START_STATE:
-		return yaml_parser_parse_document_start(parser, event, false)
-
-	case yaml_PARSE_DOCUMENT_CONTENT_STATE:
-		return yaml_parser_parse_document_content(parser, event)
-
-	case yaml_PARSE_DOCUMENT_END_STATE:
-		return yaml_parser_parse_document_end(parser, event)
-
-	case yaml_PARSE_BLOCK_NODE_STATE:
-		return yaml_parser_parse_node(parser, event, true, false)
-
-	case yaml_PARSE_BLOCK_NODE_OR_INDENTLESS_SEQUENCE_STATE:
-		return yaml_parser_parse_node(parser, event, true, true)
-
-	case yaml_PARSE_FLOW_NODE_STATE:
-		return yaml_parser_parse_node(parser, event, false, false)
-
-	case yaml_PARSE_BLOCK_SEQUENCE_FIRST_ENTRY_STATE:
-		return yaml_parser_parse_block_sequence_entry(parser, event, true)
-
-	case yaml_PARSE_BLOCK_SEQUENCE_ENTRY_STATE:
-		return yaml_parser_parse_block_sequence_entry(parser, event, false)
-
-	case yaml_PARSE_INDENTLESS_SEQUENCE_ENTRY_STATE:
-		return yaml_parser_parse_indentless_sequence_entry(parser, event)
-
-	case yaml_PARSE_BLOCK_MAPPING_FIRST_KEY_STATE:
-		return yaml_parser_parse_block_mapping_key(parser, event, true)
-
-	case yaml_PARSE_BLOCK_MAPPING_KEY_STATE:
-		return yaml_parser_parse_block_mapping_key(parser, event, false)
-
-	case yaml_PARSE_BLOCK_MAPPING_VALUE_STATE:
-		return yaml_parser_parse_block_mapping_value(parser, event)
-
-	case yaml_PARSE_FLOW_SEQUENCE_FIRST_ENTRY_STATE:
-		return yaml_parser_parse_flow_sequence_entry(parser, event, true)
-
-	case yaml_PARSE_FLOW_SEQUENCE_ENTRY_STATE:
-		return yaml_parser_parse_flow_sequence_entry(parser, event, false)
-
-	case yaml_PARSE_FLOW_SEQUENCE_ENTRY_MAPPING_KEY_STATE:
-		return yaml_parser_parse_flow_sequence_entry_mapping_key(parser, event)
-
-	case yaml_PARSE_FLOW_SEQUENCE_ENTRY_MAPPING_VALUE_STATE:
-		return yaml_parser_parse_flow_sequence_entry_mapping_value(parser, event)
-
-	case yaml_PARSE_FLOW_SEQUENCE_ENTRY_MAPPING_END_STATE:
-		return yaml_parser_parse_flow_sequence_entry_mapping_end(parser, event)
-
-	case yaml_PARSE_FLOW_MAPPING_FIRST_KEY_STATE:
-		return yaml_parser_parse_flow_mapping_key(parser, event, true)
-
-	case yaml_PARSE_FLOW_MAPPING_KEY_STATE:
-		return yaml_parser_parse_flow_mapping_key(parser, event, false)
-
-	case yaml_PARSE_FLOW_MAPPING_VALUE_STATE:
-		return yaml_parser_parse_flow_mapping_value(parser, event, false)
-
-	case yaml_PARSE_FLOW_MAPPING_EMPTY_VALUE_STATE:
-		return yaml_parser_parse_flow_mapping_value(parser, event, true)
-
-	default:
-		panic("invalid parser state")
-	}
-	return false
-}
-
-// Parse the production:
-// stream   ::= STREAM-START implicit_document? explicit_document* STREAM-END
-//              ************
-func yaml_parser_parse_stream_start(parser *yaml_parser_t, event *yaml_event_t) bool {
-	token := peek_token(parser)
-	if token == nil {
-		return false
-	}
-	if token.typ != yaml_STREAM_START_TOKEN {
-		return yaml_parser_set_parser_error(parser, "did not find expected <stream-start>", token.start_mark)
-	}
-	parser.state = yaml_PARSE_IMPLICIT_DOCUMENT_START_STATE
-	*event = yaml_event_t{
-		typ:        yaml_STREAM_START_EVENT,
-		start_mark: token.start_mark,
-		end_mark:   token.end_mark,
-		encoding:   token.encoding,
-	}
-	skip_token(parser)
-	return true
-}
-
-// Parse the productions:
-// implicit_document    ::= block_node DOCUMENT-END*
-//                          *
-// explicit_document    ::= DIRECTIVE* DOCUMENT-START block_node? DOCUMENT-END*
-//                          *************************
-func yaml_parser_parse_document_start(parser *yaml_parser_t, event *yaml_event_t, implicit bool) bool {
-
-	token := peek_token(parser)
-	if token == nil {
-		return false
-	}
-
-	// Parse extra document end indicators.
-	if !implicit {
-		for token.typ == yaml_DOCUMENT_END_TOKEN {
-			skip_token(parser)
-			token = peek_token(parser)
-			if token == nil {
-				return false
-			}
-		}
-	}
-
-	if implicit && token.typ != yaml_VERSION_DIRECTIVE_TOKEN &&
-		token.typ != yaml_TAG_DIRECTIVE_TOKEN &&
-		token.typ != yaml_DOCUMENT_START_TOKEN &&
-		token.typ != yaml_STREAM_END_TOKEN {
-		// Parse an implicit document.
-		if !yaml_parser_process_directives(parser, nil, nil) {
-			return false
-		}
-		parser.states = append(parser.states, yaml_PARSE_DOCUMENT_END_STATE)
-		parser.state = yaml_PARSE_BLOCK_NODE_STATE
-
-		*event = yaml_event_t{
-			typ:        yaml_DOCUMENT_START_EVENT,
-			start_mark: token.start_mark,
-			end_mark:   token.end_mark,
-		}
-
-	} else if token.typ != yaml_STREAM_END_TOKEN {
-		// Parse an explicit document.
-		var version_directive *yaml_version_directive_t
-		var tag_directives []yaml_tag_directive_t
-		start_mark := token.start_mark
-		if !yaml_parser_process_directives(parser, &version_directive, &tag_directives) {
-			return false
-		}
-		token = peek_token(parser)
-		if token == nil {
-			return false
-		}
-		if token.typ != yaml_DOCUMENT_START_TOKEN {
-			yaml_parser_set_parser_error(parser,
-				"did not find expected <document start>", token.start_mark)
-			return false
-		}
-		parser.states = append(parser.states, yaml_PARSE_DOCUMENT_END_STATE)
-		parser.state = yaml_PARSE_DOCUMENT_CONTENT_STATE
-		end_mark := token.end_mark
-
-		*event = yaml_event_t{
-			typ:               yaml_DOCUMENT_START_EVENT,
-			start_mark:        start_mark,
-			end_mark:          end_mark,
-			version_directive: version_directive,
-			tag_directives:    tag_directives,
-			implicit:          false,
-		}
-		skip_token(parser)
-
-	} else {
-		// Parse the stream end.
-		parser.state = yaml_PARSE_END_STATE
-		*event = yaml_event_t{
-			typ:        yaml_STREAM_END_EVENT,
-			start_mark: token.start_mark,
-			end_mark:   token.end_mark,
-		}
-		skip_token(parser)
-	}
-
-	return true
-}
-
-// Parse the productions:
-// explicit_document    ::= DIRECTIVE* DOCUMENT-START block_node? DOCUMENT-END*
-//                                                    ***********
-//
-func yaml_parser_parse_document_content(parser *yaml_parser_t, event *yaml_event_t) bool {
-	token := peek_token(parser)
-	if token == nil {
-		return false
-	}
-	if token.typ == yaml_VERSION_DIRECTIVE_TOKEN ||
-		token.typ == yaml_TAG_DIRECTIVE_TOKEN ||
-		token.typ == yaml_DOCUMENT_START_TOKEN ||
-		token.typ == yaml_DOCUMENT_END_TOKEN ||
-		token.typ == yaml_STREAM_END_TOKEN {
-		parser.state = parser.states[len(parser.states)-1]
-		parser.states = parser.states[:len(parser.states)-1]
-		return yaml_parser_process_empty_scalar(parser, event,
-			token.start_mark)
-	}
-	return yaml_parser_parse_node(parser, event, true, false)
-}
-
-// Parse the productions:
-// implicit_document    ::= block_node DOCUMENT-END*
-//                                     *************
-// explicit_document    ::= DIRECTIVE* DOCUMENT-START block_node? DOCUMENT-END*
-//
-func yaml_parser_parse_document_end(parser *yaml_parser_t, event *yaml_event_t) bool {
-	token := peek_token(parser)
-	if token == nil {
-		return false
-	}
-
-	start_mark := token.start_mark
-	end_mark := token.start_mark
-
-	implicit := true
-	if token.typ == yaml_DOCUMENT_END_TOKEN {
-		end_mark = token.end_mark
-		skip_token(parser)
-		implicit = false
-	}
-
-	parser.tag_directives = parser.tag_directives[:0]
-
-	parser.state = yaml_PARSE_DOCUMENT_START_STATE
-	*event = yaml_event_t{
-		typ:        yaml_DOCUMENT_END_EVENT,
-		start_mark: start_mark,
-		end_mark:   end_mark,
-		implicit:   implicit,
-	}
-	return true
-}
-
-// Parse the productions:
-// block_node_or_indentless_sequence    ::=
-//                          ALIAS
-//                          *****
-//                          | properties (block_content | indentless_block_sequence)?
-//                            **********  *
-//                          | block_content | indentless_block_sequence
-//                            *
-// block_node           ::= ALIAS
-//                          *****
-//                          | properties block_content?
-//                            ********** *
-//                          | block_content
-//                            *
-// flow_node            ::= ALIAS
-//                          *****
-//                          | properties flow_content?
-//                            ********** *
-//                          | flow_content
-//                            *
-// properties           ::= TAG ANCHOR? | ANCHOR TAG?
-//                          *************************
-// block_content        ::= block_collection | flow_collection | SCALAR
-//                                                               ******
-// flow_content         ::= flow_collection | SCALAR
-//                                            ******
-func yaml_parser_parse_node(parser *yaml_parser_t, event *yaml_event_t, block, indentless_sequence bool) bool {
-	//defer trace("yaml_parser_parse_node", "block:", block, "indentless_sequence:", indentless_sequence)()
-
-	token := peek_token(parser)
-	if token == nil {
-		return false
-	}
-
-	if token.typ == yaml_ALIAS_TOKEN {
-		parser.state = parser.states[len(parser.states)-1]
-		parser.states = parser.states[:len(parser.states)-1]
-		*event = yaml_event_t{
-			typ:        yaml_ALIAS_EVENT,
-			start_mark: token.start_mark,
-			end_mark:   token.end_mark,
-			anchor:     token.value,
-		}
-		skip_token(parser)
-		return true
-	}
-
-	start_mark := token.start_mark
-	end_mark := token.start_mark
-
-	var tag_token bool
-	var tag_handle, tag_suffix, anchor []byte
-	var tag_mark yaml_mark_t
-	if token.typ == yaml_ANCHOR_TOKEN {
-		anchor = token.value
-		start_mark = token.start_mark
-		end_mark = token.end_mark
-		skip_token(parser)
-		token = peek_token(parser)
-		if token == nil {
-			return false
-		}
-		if token.typ == yaml_TAG_TOKEN {
-			tag_token = true
-			tag_handle = token.value
-			tag_suffix = token.suffix
-			tag_mark = token.start_mark
-			end_mark = token.end_mark
-			skip_token(parser)
-			token = peek_token(parser)
-			if token == nil {
-				return false
-			}
-		}
-	} else if token.typ == yaml_TAG_TOKEN {
-		tag_token = true
-		tag_handle = token.value
-		tag_suffix = token.suffix
-		start_mark = token.start_mark
-		tag_mark = token.start_mark
-		end_mark = token.end_mark
-		skip_token(parser)
-		token = peek_token(parser)
-		if token == nil {
-			return false
-		}
-		if token.typ == yaml_ANCHOR_TOKEN {
-			anchor = token.value
-			end_mark = token.end_mark
-			skip_token(parser)
-			token = peek_token(parser)
-			if token == nil {
-				return false
-			}
-		}
-	}
-
-	var tag []byte
-	if tag_token {
-		if len(tag_handle) == 0 {
-			tag = tag_suffix
-			tag_suffix = nil
-		} else {
-			for i := range parser.tag_directives {
-				if bytes.Equal(parser.tag_directives[i].handle, tag_handle) {
-					tag = append([]byte(nil), parser.tag_directives[i].prefix...)
-					tag = append(tag, tag_suffix...)
-					break
-				}
-			}
-			if len(tag) == 0 {
-				yaml_parser_set_parser_error_context(parser,
-					"while parsing a node", start_mark,
-					"found undefined tag handle", tag_mark)
-				return false
-			}
-		}
-	}
-
-	implicit := len(tag) == 0
-	if indentless_sequence && token.typ == yaml_BLOCK_ENTRY_TOKEN {
-		end_mark = token.end_mark
-		parser.state = yaml_PARSE_INDENTLESS_SEQUENCE_ENTRY_STATE
-		*event = yaml_event_t{
-			typ:        yaml_SEQUENCE_START_EVENT,
-			start_mark: start_mark,
-			end_mark:   end_mark,
-			anchor:     anchor,
-			tag:        tag,
-			implicit:   implicit,
-			style:      yaml_style_t(yaml_BLOCK_SEQUENCE_STYLE),
-		}
-		return true
-	}
-	if token.typ == yaml_SCALAR_TOKEN {
-		var plain_implicit, quoted_implicit bool
-		end_mark = token.end_mark
-		if (len(tag) == 0 && token.style == yaml_PLAIN_SCALAR_STYLE) || (len(tag) == 1 && tag[0] == '!') {
-			plain_implicit = true
-		} else if len(tag) == 0 {
-			quoted_implicit = true
-		}
-		parser.state = parser.states[len(parser.states)-1]
-		parser.states = parser.states[:len(parser.states)-1]
-
-		*event = yaml_event_t{
-			typ:             yaml_SCALAR_EVENT,
-			start_mark:      start_mark,
-			end_mark:        end_mark,
-			anchor:          anchor,
-			tag:             tag,
-			value:           token.value,
-			implicit:        plain_implicit,
-			quoted_implicit: quoted_implicit,
-			style:           yaml_style_t(token.style),
-		}
-		skip_token(parser)
-		return true
-	}
-	if token.typ == yaml_FLOW_SEQUENCE_START_TOKEN {
-		// [Go] Some of the events below can be merged as they differ only on style.
-		end_mark = token.end_mark
-		parser.state = yaml_PARSE_FLOW_SEQUENCE_FIRST_ENTRY_STATE
-		*event = yaml_event_t{
-			typ:        yaml_SEQUENCE_START_EVENT,
-			start_mark: start_mark,
-			end_mark:   end_mark,
-			anchor:     anchor,
-			tag:        tag,
-			implicit:   implicit,
-			style:      yaml_style_t(yaml_FLOW_SEQUENCE_STYLE),
-		}
-		return true
-	}
-	if token.typ == yaml_FLOW_MAPPING_START_TOKEN {
-		end_mark = token.end_mark
-		parser.state = yaml_PARSE_FLOW_MAPPING_FIRST_KEY_STATE
-		*event = yaml_event_t{
-			typ:        yaml_MAPPING_START_EVENT,
-			start_mark: start_mark,
-			end_mark:   end_mark,
-			anchor:     anchor,
-			tag:        tag,
-			implicit:   implicit,
-			style:      yaml_style_t(yaml_FLOW_MAPPING_STYLE),
-		}
-		return true
-	}
-	if block && token.typ == yaml_BLOCK_SEQUENCE_START_TOKEN {
-		end_mark = token.end_mark
-		parser.state = yaml_PARSE_BLOCK_SEQUENCE_FIRST_ENTRY_STATE
-		*event = yaml_event_t{
-			typ:        yaml_SEQUENCE_START_EVENT,
-			start_mark: start_mark,
-			end_mark:   end_mark,
-			anchor:     anchor,
-			tag:        tag,
-			implicit:   implicit,
-			style:      yaml_style_t(yaml_BLOCK_SEQUENCE_STYLE),
-		}
-		return true
-	}
-	if block && token.typ == yaml_BLOCK_MAPPING_START_TOKEN {
-		end_mark = token.end_mark
-		parser.state = yaml_PARSE_BLOCK_MAPPING_FIRST_KEY_STATE
-		*event = yaml_event_t{
-			typ:        yaml_MAPPING_START_EVENT,
-			start_mark: start_mark,
-			end_mark:   end_mark,
-			anchor:     anchor,
-			tag:        tag,
-			implicit:   implicit,
-			style:      yaml_style_t(yaml_BLOCK_MAPPING_STYLE),
-		}
-		return true
-	}
-	if len(anchor) > 0 || len(tag) > 0 {
-		parser.state = parser.states[len(parser.states)-1]
-		parser.states = parser.states[:len(parser.states)-1]
-
-		*event = yaml_event_t{
-			typ:             yaml_SCALAR_EVENT,
-			start_mark:      start_mark,
-			end_mark:        end_mark,
-			anchor:          anchor,
-			tag:             tag,
-			implicit:        implicit,
-			quoted_implicit: false,
-			style:           yaml_style_t(yaml_PLAIN_SCALAR_STYLE),
-		}
-		return true
-	}
-
-	context := "while parsing a flow node"
-	if block {
-		context = "while parsing a block node"
-	}
-	yaml_parser_set_parser_error_context(parser, context, start_mark,
-		"did not find expected node content", token.start_mark)
-	return false
-}
-
-// Parse the productions:
-// block_sequence ::= BLOCK-SEQUENCE-START (BLOCK-ENTRY block_node?)* BLOCK-END
-//                    ********************  *********** *             *********
-//
-func yaml_parser_parse_block_sequence_entry(parser *yaml_parser_t, event *yaml_event_t, first bool) bool {
-	if first {
-		token := peek_token(parser)
-		parser.marks = append(parser.marks, token.start_mark)
-		skip_token(parser)
-	}
-
-	token := peek_token(parser)
-	if token == nil {
-		return false
-	}
-
-	if token.typ == yaml_BLOCK_ENTRY_TOKEN {
-		mark := token.end_mark
-		skip_token(parser)
-		token = peek_token(parser)
-		if token == nil {
-			return false
-		}
-		if token.typ != yaml_BLOCK_ENTRY_TOKEN && token.typ != yaml_BLOCK_END_TOKEN {
-			parser.states = append(parser.states, yaml_PARSE_BLOCK_SEQUENCE_ENTRY_STATE)
-			return yaml_parser_parse_node(parser, event, true, false)
-		} else {
-			parser.state = yaml_PARSE_BLOCK_SEQUENCE_ENTRY_STATE
-			return yaml_parser_process_empty_scalar(parser, event, mark)
-		}
-	}
-	if token.typ == yaml_BLOCK_END_TOKEN {
-		parser.state = parser.states[len(parser.states)-1]
-		parser.states = parser.states[:len(parser.states)-1]
-		parser.marks = parser.marks[:len(parser.marks)-1]
-
-		*event = yaml_event_t{
-			typ:        yaml_SEQUENCE_END_EVENT,
-			start_mark: token.start_mark,
-			end_mark:   token.end_mark,
-		}
-
-		skip_token(parser)
-		return true
-	}
-
-	context_mark := parser.marks[len(parser.marks)-1]
-	parser.marks = parser.marks[:len(parser.marks)-1]
-	return yaml_parser_set_parser_error_context(parser,
-		"while parsing a block collection", context_mark,
-		"did not find expected '-' indicator", token.start_mark)
-}
-
-// Parse the productions:
-// indentless_sequence  ::= (BLOCK-ENTRY block_node?)+
-//                           *********** *
-func yaml_parser_parse_indentless_sequence_entry(parser *yaml_parser_t, event *yaml_event_t) bool {
-	token := peek_token(parser)
-	if token == nil {
-		return false
-	}
-
-	if token.typ == yaml_BLOCK_ENTRY_TOKEN {
-		mark := token.end_mark
-		skip_token(parser)
-		token = peek_token(parser)
-		if token == nil {
-			return false
-		}
-		if token.typ != yaml_BLOCK_ENTRY_TOKEN &&
-			token.typ != yaml_KEY_TOKEN &&
-			token.typ != yaml_VALUE_TOKEN &&
-			token.typ != yaml_BLOCK_END_TOKEN {
-			parser.states = append(parser.states, yaml_PARSE_INDENTLESS_SEQUENCE_ENTRY_STATE)
-			return yaml_parser_parse_node(parser, event, true, false)
-		}
-		parser.state = yaml_PARSE_INDENTLESS_SEQUENCE_ENTRY_STATE
-		return yaml_parser_process_empty_scalar(parser, event, mark)
-	}
-	parser.state = parser.states[len(parser.states)-1]
-	parser.states = parser.states[:len(parser.states)-1]
-
-	*event = yaml_event_t{
-		typ:        yaml_SEQUENCE_END_EVENT,
-		start_mark: token.start_mark,
-		end_mark:   token.start_mark, // [Go] Shouldn't this be token.end_mark?
-	}
-	return true
-}
-
-// Parse the productions:
-// block_mapping        ::= BLOCK-MAPPING_START
-//                          *******************
-//                          ((KEY block_node_or_indentless_sequence?)?
-//                            *** *
-//                          (VALUE block_node_or_indentless_sequence?)?)*
-//
-//                          BLOCK-END
-//                          *********
-//
-func yaml_parser_parse_block_mapping_key(parser *yaml_parser_t, event *yaml_event_t, first bool) bool {
-	if first {
-		token := peek_token(parser)
-		parser.marks = append(parser.marks, token.start_mark)
-		skip_token(parser)
-	}
-
-	token := peek_token(parser)
-	if token == nil {
-		return false
-	}
-
-	if token.typ == yaml_KEY_TOKEN {
-		mark := token.end_mark
-		skip_token(parser)
-		token = peek_token(parser)
-		if token == nil {
-			return false
-		}
-		if token.typ != yaml_KEY_TOKEN &&
-			token.typ != yaml_VALUE_TOKEN &&
-			token.typ != yaml_BLOCK_END_TOKEN {
-			parser.states = append(parser.states, yaml_PARSE_BLOCK_MAPPING_VALUE_STATE)
-			return yaml_parser_parse_node(parser, event, true, true)
-		} else {
-			parser.state = yaml_PARSE_BLOCK_MAPPING_VALUE_STATE
-			return yaml_parser_process_empty_scalar(parser, event, mark)
-		}
-	} else if token.typ == yaml_BLOCK_END_TOKEN {
-		parser.state = parser.states[len(parser.states)-1]
-		parser.states = parser.states[:len(parser.states)-1]
-		parser.marks = parser.marks[:len(parser.marks)-1]
-		*event = yaml_event_t{
-			typ:        yaml_MAPPING_END_EVENT,
-			start_mark: token.start_mark,
-			end_mark:   token.end_mark,
-		}
-		skip_token(parser)
-		return true
-	}
-
-	context_mark := parser.marks[len(parser.marks)-1]
-	parser.marks = parser.marks[:len(parser.marks)-1]
-	return yaml_parser_set_parser_error_context(parser,
-		"while parsing a block mapping", context_mark,
-		"did not find expected key", token.start_mark)
-}
-
-// Parse the productions:
-// block_mapping        ::= BLOCK-MAPPING_START
-//
-//                          ((KEY block_node_or_indentless_sequence?)?
-//
-//                          (VALUE block_node_or_indentless_sequence?)?)*
-//                           ***** *
-//                          BLOCK-END
-//
-//
-func yaml_parser_parse_block_mapping_value(parser *yaml_parser_t, event *yaml_event_t) bool {
-	token := peek_token(parser)
-	if token == nil {
-		return false
-	}
-	if token.typ == yaml_VALUE_TOKEN {
-		mark := token.end_mark
-		skip_token(parser)
-		token = peek_token(parser)
-		if token == nil {
-			return false
-		}
-		if token.typ != yaml_KEY_TOKEN &&
-			token.typ != yaml_VALUE_TOKEN &&
-			token.typ != yaml_BLOCK_END_TOKEN {
-			parser.states = append(parser.states, yaml_PARSE_BLOCK_MAPPING_KEY_STATE)
-			return yaml_parser_parse_node(parser, event, true, true)
-		}
-		parser.state = yaml_PARSE_BLOCK_MAPPING_KEY_STATE
-		return yaml_parser_process_empty_scalar(parser, event, mark)
-	}
-	parser.state = yaml_PARSE_BLOCK_MAPPING_KEY_STATE
-	return yaml_parser_process_empty_scalar(parser, event, token.start_mark)
-}
-
-// Parse the productions:
-// flow_sequence        ::= FLOW-SEQUENCE-START
-//                          *******************
-//                          (flow_sequence_entry FLOW-ENTRY)*
-//                           *                   **********
-//                          flow_sequence_entry?
-//                          *
-//                          FLOW-SEQUENCE-END
-//                          *****************
-// flow_sequence_entry  ::= flow_node | KEY flow_node? (VALUE flow_node?)?
-//                          *
-//
-func yaml_parser_parse_flow_sequence_entry(parser *yaml_parser_t, event *yaml_event_t, first bool) bool {
-	if first {
-		token := peek_token(parser)
-		parser.marks = append(parser.marks, token.start_mark)
-		skip_token(parser)
-	}
-	token := peek_token(parser)
-	if token == nil {
-		return false
-	}
-	if token.typ != yaml_FLOW_SEQUENCE_END_TOKEN {
-		if !first {
-			if token.typ == yaml_FLOW_ENTRY_TOKEN {
-				skip_token(parser)
-				token = peek_token(parser)
-				if token == nil {
-					return false
-				}
-			} else {
-				context_mark := parser.marks[len(parser.marks)-1]
-				parser.marks = parser.marks[:len(parser.marks)-1]
-				return yaml_parser_set_parser_error_context(parser,
-					"while parsing a flow sequence", context_mark,
-					"did not find expected ',' or ']'", token.start_mark)
-			}
-		}
-
-		if token.typ == yaml_KEY_TOKEN {
-			parser.state = yaml_PARSE_FLOW_SEQUENCE_ENTRY_MAPPING_KEY_STATE
-			*event = yaml_event_t{
-				typ:        yaml_MAPPING_START_EVENT,
-				start_mark: token.start_mark,
-				end_mark:   token.end_mark,
-				implicit:   true,
-				style:      yaml_style_t(yaml_FLOW_MAPPING_STYLE),
-			}
-			skip_token(parser)
-			return true
-		} else if token.typ != yaml_FLOW_SEQUENCE_END_TOKEN {
-			parser.states = append(parser.states, yaml_PARSE_FLOW_SEQUENCE_ENTRY_STATE)
-			return yaml_parser_parse_node(parser, event, false, false)
-		}
-	}
-
-	parser.state = parser.states[len(parser.states)-1]
-	parser.states = parser.states[:len(parser.states)-1]
-	parser.marks = parser.marks[:len(parser.marks)-1]
-
-	*event = yaml_event_t{
-		typ:        yaml_SEQUENCE_END_EVENT,
-		start_mark: token.start_mark,
-		end_mark:   token.end_mark,
-	}
-
-	skip_token(parser)
-	return true
-}
-
-//
-// Parse the productions:
-// flow_sequence_entry  ::= flow_node | KEY flow_node? (VALUE flow_node?)?
-//                                      *** *
-//
-func yaml_parser_parse_flow_sequence_entry_mapping_key(parser *yaml_parser_t, event *yaml_event_t) bool {
-	token := peek_token(parser)
-	if token == nil {
-		return false
-	}
-	if token.typ != yaml_VALUE_TOKEN &&
-		token.typ != yaml_FLOW_ENTRY_TOKEN &&
-		token.typ != yaml_FLOW_SEQUENCE_END_TOKEN {
-		parser.states = append(parser.states, yaml_PARSE_FLOW_SEQUENCE_ENTRY_MAPPING_VALUE_STATE)
-		return yaml_parser_parse_node(parser, event, false, false)
-	}
-	mark := token.end_mark
-	skip_token(parser)
-	parser.state = yaml_PARSE_FLOW_SEQUENCE_ENTRY_MAPPING_VALUE_STATE
-	return yaml_parser_process_empty_scalar(parser, event, mark)
-}
-
-// Parse the productions:
-// flow_sequence_entry  ::= flow_node | KEY flow_node? (VALUE flow_node?)?
-//                                                      ***** *
-//
-func yaml_parser_parse_flow_sequence_entry_mapping_value(parser *yaml_parser_t, event *yaml_event_t) bool {
-	token := peek_token(parser)
-	if token == nil {
-		return false
-	}
-	if token.typ == yaml_VALUE_TOKEN {
-		skip_token(parser)
-		token := peek_token(parser)
-		if token == nil {
-			return false
-		}
-		if token.typ != yaml_FLOW_ENTRY_TOKEN && token.typ != yaml_FLOW_SEQUENCE_END_TOKEN {
-			parser.states = append(parser.states, yaml_PARSE_FLOW_SEQUENCE_ENTRY_MAPPING_END_STATE)
-			return yaml_parser_parse_node(parser, event, false, false)
-		}
-	}
-	parser.state = yaml_PARSE_FLOW_SEQUENCE_ENTRY_MAPPING_END_STATE
-	return yaml_parser_process_empty_scalar(parser, event, token.start_mark)
-}
-
-// Parse the productions:
-// flow_sequence_entry  ::= flow_node | KEY flow_node? (VALUE flow_node?)?
-//                                                                      *
-//
-func yaml_parser_parse_flow_sequence_entry_mapping_end(parser *yaml_parser_t, event *yaml_event_t) bool {
-	token := peek_token(parser)
-	if token == nil {
-		return false
-	}
-	parser.state = yaml_PARSE_FLOW_SEQUENCE_ENTRY_STATE
-	*event = yaml_event_t{
-		typ:        yaml_MAPPING_END_EVENT,
-		start_mark: token.start_mark,
-		end_mark:   token.start_mark, // [Go] Shouldn't this be end_mark?
-	}
-	return true
-}
-
-// Parse the productions:
-// flow_mapping         ::= FLOW-MAPPING-START
-//                          ******************
-//                          (flow_mapping_entry FLOW-ENTRY)*
-//                           *                  **********
-//                          flow_mapping_entry?
-//                          ******************
-//                          FLOW-MAPPING-END
-//                          ****************
-// flow_mapping_entry   ::= flow_node | KEY flow_node? (VALUE flow_node?)?
-//                          *           *** *
-//
-func yaml_parser_parse_flow_mapping_key(parser *yaml_parser_t, event *yaml_event_t, first bool) bool {
-	if first {
-		token := peek_token(parser)
-		parser.marks = append(parser.marks, token.start_mark)
-		skip_token(parser)
-	}
-
-	token := peek_token(parser)
-	if token == nil {
-		return false
-	}
-
-	if token.typ != yaml_FLOW_MAPPING_END_TOKEN {
-		if !first {
-			if token.typ == yaml_FLOW_ENTRY_TOKEN {
-				skip_token(parser)
-				token = peek_token(parser)
-				if token == nil {
-					return false
-				}
-			} else {
-				context_mark := parser.marks[len(parser.marks)-1]
-				parser.marks = parser.marks[:len(parser.marks)-1]
-				return yaml_parser_set_parser_error_context(parser,
-					"while parsing a flow mapping", context_mark,
-					"did not find expected ',' or '}'", token.start_mark)
-			}
-		}
-
-		if token.typ == yaml_KEY_TOKEN {
-			skip_token(parser)
-			token = peek_token(parser)
-			if token == nil {
-				return false
-			}
-			if token.typ != yaml_VALUE_TOKEN &&
-				token.typ != yaml_FLOW_ENTRY_TOKEN &&
-				token.typ != yaml_FLOW_MAPPING_END_TOKEN {
-				parser.states = append(parser.states, yaml_PARSE_FLOW_MAPPING_VALUE_STATE)
-				return yaml_parser_parse_node(parser, event, false, false)
-			} else {
-				parser.state = yaml_PARSE_FLOW_MAPPING_VALUE_STATE
-				return yaml_parser_process_empty_scalar(parser, event, token.start_mark)
-			}
-		} else if token.typ != yaml_FLOW_MAPPING_END_TOKEN {
-			parser.states = append(parser.states, yaml_PARSE_FLOW_MAPPING_EMPTY_VALUE_STATE)
-			return yaml_parser_parse_node(parser, event, false, false)
-		}
-	}
-
-	parser.state = parser.states[len(parser.states)-1]
-	parser.states = parser.states[:len(parser.states)-1]
-	parser.marks = parser.marks[:len(parser.marks)-1]
-	*event = yaml_event_t{
-		typ:        yaml_MAPPING_END_EVENT,
-		start_mark: token.start_mark,
-		end_mark:   token.end_mark,
-	}
-	skip_token(parser)
-	return true
-}
-
-// Parse the productions:
-// flow_mapping_entry   ::= flow_node | KEY flow_node? (VALUE flow_node?)?
-//                                   *                  ***** *
-//
-func yaml_parser_parse_flow_mapping_value(parser *yaml_parser_t, event *yaml_event_t, empty bool) bool {
-	token := peek_token(parser)
-	if token == nil {
-		return false
-	}
-	if empty {
-		parser.state = yaml_PARSE_FLOW_MAPPING_KEY_STATE
-		return yaml_parser_process_empty_scalar(parser, event, token.start_mark)
-	}
-	if token.typ == yaml_VALUE_TOKEN {
-		skip_token(parser)
-		token = peek_token(parser)
-		if token == nil {
-			return false
-		}
-		if token.typ != yaml_FLOW_ENTRY_TOKEN && token.typ != yaml_FLOW_MAPPING_END_TOKEN {
-			parser.states = append(parser.states, yaml_PARSE_FLOW_MAPPING_KEY_STATE)
-			return yaml_parser_parse_node(parser, event, false, false)
-		}
-	}
-	parser.state = yaml_PARSE_FLOW_MAPPING_KEY_STATE
-	return yaml_parser_process_empty_scalar(parser, event, token.start_mark)
-}
-
-// Generate an empty scalar event.
-func yaml_parser_process_empty_scalar(parser *yaml_parser_t, event *yaml_event_t, mark yaml_mark_t) bool {
-	*event = yaml_event_t{
-		typ:        yaml_SCALAR_EVENT,
-		start_mark: mark,
-		end_mark:   mark,
-		value:      nil, // Empty
-		implicit:   true,
-		style:      yaml_style_t(yaml_PLAIN_SCALAR_STYLE),
-	}
-	return true
-}
-
-var default_tag_directives = []yaml_tag_directive_t{
-	{[]byte("!"), []byte("!")},
-	{[]byte("!!"), []byte("tag:yaml.org,2002:")},
-}
-
-// Parse directives.
-func yaml_parser_process_directives(parser *yaml_parser_t,
-	version_directive_ref **yaml_version_directive_t,
-	tag_directives_ref *[]yaml_tag_directive_t) bool {
-
-	var version_directive *yaml_version_directive_t
-	var tag_directives []yaml_tag_directive_t
-
-	token := peek_token(parser)
-	if token == nil {
-		return false
-	}
-
-	for token.typ == yaml_VERSION_DIRECTIVE_TOKEN || token.typ == yaml_TAG_DIRECTIVE_TOKEN {
-		if token.typ == yaml_VERSION_DIRECTIVE_TOKEN {
-			if version_directive != nil {
-				yaml_parser_set_parser_error(parser,
-					"found duplicate %YAML directive", token.start_mark)
-				return false
-			}
-			if token.major != 1 || token.minor != 1 {
-				yaml_parser_set_parser_error(parser,
-					"found incompatible YAML document", token.start_mark)
-				return false
-			}
-			version_directive = &yaml_version_directive_t{
-				major: token.major,
-				minor: token.minor,
-			}
-		} else if token.typ == yaml_TAG_DIRECTIVE_TOKEN {
-			value := yaml_tag_directive_t{
-				handle: token.value,
-				prefix: token.prefix,
-			}
-			if !yaml_parser_append_tag_directive(parser, value, false, token.start_mark) {
-				return false
-			}
-			tag_directives = append(tag_directives, value)
-		}
-
-		skip_token(parser)
-		token = peek_token(parser)
-		if token == nil {
-			return false
-		}
-	}
-
-	for i := range default_tag_directives {
-		if !yaml_parser_append_tag_directive(parser, default_tag_directives[i], true, token.start_mark) {
-			return false
-		}
-	}
-
-	if version_directive_ref != nil {
-		*version_directive_ref = version_directive
-	}
-	if tag_directives_ref != nil {
-		*tag_directives_ref = tag_directives
-	}
-	return true
-}
-
-// Append a tag directive to the directives stack.
-func yaml_parser_append_tag_directive(parser *yaml_parser_t, value yaml_tag_directive_t, allow_duplicates bool, mark yaml_mark_t) bool {
-	for i := range parser.tag_directives {
-		if bytes.Equal(value.handle, parser.tag_directives[i].handle) {
-			if allow_duplicates {
-				return true
-			}
-			return yaml_parser_set_parser_error(parser, "found duplicate %TAG directive", mark)
-		}
-	}
-
-	// [Go] I suspect the copy is unnecessary. This was likely done
-	// because there was no way to track ownership of the data.
-	value_copy := yaml_tag_directive_t{
-		handle: make([]byte, len(value.handle)),
-		prefix: make([]byte, len(value.prefix)),
-	}
-	copy(value_copy.handle, value.handle)
-	copy(value_copy.prefix, value.prefix)
-	parser.tag_directives = append(parser.tag_directives, value_copy)
-	return true
-}
diff --git a/Godeps/_workspace/src/gopkg.in/yaml.v2/readerc.go b/Godeps/_workspace/src/gopkg.in/yaml.v2/readerc.go
deleted file mode 100644
index d5fb09727..000000000
--- a/Godeps/_workspace/src/gopkg.in/yaml.v2/readerc.go
+++ /dev/null
@@ -1,391 +0,0 @@
-package yaml
-
-import (
-	"io"
-)
-
-// Set the reader error and return 0.
-func yaml_parser_set_reader_error(parser *yaml_parser_t, problem string, offset int, value int) bool {
-	parser.error = yaml_READER_ERROR
-	parser.problem = problem
-	parser.problem_offset = offset
-	parser.problem_value = value
-	return false
-}
-
-// Byte order marks.
-const (
-	bom_UTF8    = "\xef\xbb\xbf"
-	bom_UTF16LE = "\xff\xfe"
-	bom_UTF16BE = "\xfe\xff"
-)
-
-// Determine the input stream encoding by checking the BOM symbol. If no BOM is
-// found, the UTF-8 encoding is assumed. Return 1 on success, 0 on failure.
-func yaml_parser_determine_encoding(parser *yaml_parser_t) bool {
-	// Ensure that we had enough bytes in the raw buffer.
-	for !parser.eof && len(parser.raw_buffer)-parser.raw_buffer_pos < 3 {
-		if !yaml_parser_update_raw_buffer(parser) {
-			return false
-		}
-	}
-
-	// Determine the encoding.
-	buf := parser.raw_buffer
-	pos := parser.raw_buffer_pos
-	avail := len(buf) - pos
-	if avail >= 2 && buf[pos] == bom_UTF16LE[0] && buf[pos+1] == bom_UTF16LE[1] {
-		parser.encoding = yaml_UTF16LE_ENCODING
-		parser.raw_buffer_pos += 2
-		parser.offset += 2
-	} else if avail >= 2 && buf[pos] == bom_UTF16BE[0] && buf[pos+1] == bom_UTF16BE[1] {
-		parser.encoding = yaml_UTF16BE_ENCODING
-		parser.raw_buffer_pos += 2
-		parser.offset += 2
-	} else if avail >= 3 && buf[pos] == bom_UTF8[0] && buf[pos+1] == bom_UTF8[1] && buf[pos+2] == bom_UTF8[2] {
-		parser.encoding = yaml_UTF8_ENCODING
-		parser.raw_buffer_pos += 3
-		parser.offset += 3
-	} else {
-		parser.encoding = yaml_UTF8_ENCODING
-	}
-	return true
-}
-
-// Update the raw buffer.
-func yaml_parser_update_raw_buffer(parser *yaml_parser_t) bool {
-	size_read := 0
-
-	// Return if the raw buffer is full.
-	if parser.raw_buffer_pos == 0 && len(parser.raw_buffer) == cap(parser.raw_buffer) {
-		return true
-	}
-
-	// Return on EOF.
-	if parser.eof {
-		return true
-	}
-
-	// Move the remaining bytes in the raw buffer to the beginning.
-	if parser.raw_buffer_pos > 0 && parser.raw_buffer_pos < len(parser.raw_buffer) {
-		copy(parser.raw_buffer, parser.raw_buffer[parser.raw_buffer_pos:])
-	}
-	parser.raw_buffer = parser.raw_buffer[:len(parser.raw_buffer)-parser.raw_buffer_pos]
-	parser.raw_buffer_pos = 0
-
-	// Call the read handler to fill the buffer.
-	size_read, err := parser.read_handler(parser, parser.raw_buffer[len(parser.raw_buffer):cap(parser.raw_buffer)])
-	parser.raw_buffer = parser.raw_buffer[:len(parser.raw_buffer)+size_read]
-	if err == io.EOF {
-		parser.eof = true
-	} else if err != nil {
-		return yaml_parser_set_reader_error(parser, "input error: "+err.Error(), parser.offset, -1)
-	}
-	return true
-}
-
-// Ensure that the buffer contains at least `length` characters.
-// Return true on success, false on failure.
-//
-// The length is supposed to be significantly less that the buffer size.
-func yaml_parser_update_buffer(parser *yaml_parser_t, length int) bool {
-	if parser.read_handler == nil {
-		panic("read handler must be set")
-	}
-
-	// If the EOF flag is set and the raw buffer is empty, do nothing.
-	if parser.eof && parser.raw_buffer_pos == len(parser.raw_buffer) {
-		return true
-	}
-
-	// Return if the buffer contains enough characters.
-	if parser.unread >= length {
-		return true
-	}
-
-	// Determine the input encoding if it is not known yet.
-	if parser.encoding == yaml_ANY_ENCODING {
-		if !yaml_parser_determine_encoding(parser) {
-			return false
-		}
-	}
-
-	// Move the unread characters to the beginning of the buffer.
-	buffer_len := len(parser.buffer)
-	if parser.buffer_pos > 0 && parser.buffer_pos < buffer_len {
-		copy(parser.buffer, parser.buffer[parser.buffer_pos:])
-		buffer_len -= parser.buffer_pos
-		parser.buffer_pos = 0
-	} else if parser.buffer_pos == buffer_len {
-		buffer_len = 0
-		parser.buffer_pos = 0
-	}
-
-	// Open the whole buffer for writing, and cut it before returning.
-	parser.buffer = parser.buffer[:cap(parser.buffer)]
-
-	// Fill the buffer until it has enough characters.
-	first := true
-	for parser.unread < length {
-
-		// Fill the raw buffer if necessary.
-		if !first || parser.raw_buffer_pos == len(parser.raw_buffer) {
-			if !yaml_parser_update_raw_buffer(parser) {
-				parser.buffer = parser.buffer[:buffer_len]
-				return false
-			}
-		}
-		first = false
-
-		// Decode the raw buffer.
-	inner:
-		for parser.raw_buffer_pos != len(parser.raw_buffer) {
-			var value rune
-			var width int
-
-			raw_unread := len(parser.raw_buffer) - parser.raw_buffer_pos
-
-			// Decode the next character.
-			switch parser.encoding {
-			case yaml_UTF8_ENCODING:
-				// Decode a UTF-8 character.  Check RFC 3629
-				// (http://www.ietf.org/rfc/rfc3629.txt) for more details.
-				//
-				// The following table (taken from the RFC) is used for
-				// decoding.
-				//
-				//    Char. number range |        UTF-8 octet sequence
-				//      (hexadecimal)    |              (binary)
-				//   --------------------+------------------------------------
-				//   0000 0000-0000 007F | 0xxxxxxx
-				//   0000 0080-0000 07FF | 110xxxxx 10xxxxxx
-				//   0000 0800-0000 FFFF | 1110xxxx 10xxxxxx 10xxxxxx
-				//   0001 0000-0010 FFFF | 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx
-				//
-				// Additionally, the characters in the range 0xD800-0xDFFF
-				// are prohibited as they are reserved for use with UTF-16
-				// surrogate pairs.
-
-				// Determine the length of the UTF-8 sequence.
-				octet := parser.raw_buffer[parser.raw_buffer_pos]
-				switch {
-				case octet&0x80 == 0x00:
-					width = 1
-				case octet&0xE0 == 0xC0:
-					width = 2
-				case octet&0xF0 == 0xE0:
-					width = 3
-				case octet&0xF8 == 0xF0:
-					width = 4
-				default:
-					// The leading octet is invalid.
-					return yaml_parser_set_reader_error(parser,
-						"invalid leading UTF-8 octet",
-						parser.offset, int(octet))
-				}
-
-				// Check if the raw buffer contains an incomplete character.
-				if width > raw_unread {
-					if parser.eof {
-						return yaml_parser_set_reader_error(parser,
-							"incomplete UTF-8 octet sequence",
-							parser.offset, -1)
-					}
-					break inner
-				}
-
-				// Decode the leading octet.
-				switch {
-				case octet&0x80 == 0x00:
-					value = rune(octet & 0x7F)
-				case octet&0xE0 == 0xC0:
-					value = rune(octet & 0x1F)
-				case octet&0xF0 == 0xE0:
-					value = rune(octet & 0x0F)
-				case octet&0xF8 == 0xF0:
-					value = rune(octet & 0x07)
-				default:
-					value = 0
-				}
-
-				// Check and decode the trailing octets.
-				for k := 1; k < width; k++ {
-					octet = parser.raw_buffer[parser.raw_buffer_pos+k]
-
-					// Check if the octet is valid.
-					if (octet & 0xC0) != 0x80 {
-						return yaml_parser_set_reader_error(parser,
-							"invalid trailing UTF-8 octet",
-							parser.offset+k, int(octet))
-					}
-
-					// Decode the octet.
-					value = (value << 6) + rune(octet&0x3F)
-				}
-
-				// Check the length of the sequence against the value.
-				switch {
-				case width == 1:
-				case width == 2 && value >= 0x80:
-				case width == 3 && value >= 0x800:
-				case width == 4 && value >= 0x10000:
-				default:
-					return yaml_parser_set_reader_error(parser,
-						"invalid length of a UTF-8 sequence",
-						parser.offset, -1)
-				}
-
-				// Check the range of the value.
-				if value >= 0xD800 && value <= 0xDFFF || value > 0x10FFFF {
-					return yaml_parser_set_reader_error(parser,
-						"invalid Unicode character",
-						parser.offset, int(value))
-				}
-
-			case yaml_UTF16LE_ENCODING, yaml_UTF16BE_ENCODING:
-				var low, high int
-				if parser.encoding == yaml_UTF16LE_ENCODING {
-					low, high = 0, 1
-				} else {
-					high, low = 1, 0
-				}
-
-				// The UTF-16 encoding is not as simple as one might
-				// naively think.  Check RFC 2781
-				// (http://www.ietf.org/rfc/rfc2781.txt).
-				//
-				// Normally, two subsequent bytes describe a Unicode
-				// character.  However a special technique (called a
-				// surrogate pair) is used for specifying character
-				// values larger than 0xFFFF.
-				//
-				// A surrogate pair consists of two pseudo-characters:
-				//      high surrogate area (0xD800-0xDBFF)
-				//      low surrogate area (0xDC00-0xDFFF)
-				//
-				// The following formulas are used for decoding
-				// and encoding characters using surrogate pairs:
-				//
-				//  U  = U' + 0x10000   (0x01 00 00 <= U <= 0x10 FF FF)
-				//  U' = yyyyyyyyyyxxxxxxxxxx   (0 <= U' <= 0x0F FF FF)
-				//  W1 = 110110yyyyyyyyyy
-				//  W2 = 110111xxxxxxxxxx
-				//
-				// where U is the character value, W1 is the high surrogate
-				// area, W2 is the low surrogate area.
-
-				// Check for incomplete UTF-16 character.
-				if raw_unread < 2 {
-					if parser.eof {
-						return yaml_parser_set_reader_error(parser,
-							"incomplete UTF-16 character",
-							parser.offset, -1)
-					}
-					break inner
-				}
-
-				// Get the character.
-				value = rune(parser.raw_buffer[parser.raw_buffer_pos+low]) +
-					(rune(parser.raw_buffer[parser.raw_buffer_pos+high]) << 8)
-
-				// Check for unexpected low surrogate area.
-				if value&0xFC00 == 0xDC00 {
-					return yaml_parser_set_reader_error(parser,
-						"unexpected low surrogate area",
-						parser.offset, int(value))
-				}
-
-				// Check for a high surrogate area.
-				if value&0xFC00 == 0xD800 {
-					width = 4
-
-					// Check for incomplete surrogate pair.
-					if raw_unread < 4 {
-						if parser.eof {
-							return yaml_parser_set_reader_error(parser,
-								"incomplete UTF-16 surrogate pair",
-								parser.offset, -1)
-						}
-						break inner
-					}
-
-					// Get the next character.
-					value2 := rune(parser.raw_buffer[parser.raw_buffer_pos+low+2]) +
-						(rune(parser.raw_buffer[parser.raw_buffer_pos+high+2]) << 8)
-
-					// Check for a low surrogate area.
-					if value2&0xFC00 != 0xDC00 {
-						return yaml_parser_set_reader_error(parser,
-							"expected low surrogate area",
-							parser.offset+2, int(value2))
-					}
-
-					// Generate the value of the surrogate pair.
-					value = 0x10000 + ((value & 0x3FF) << 10) + (value2 & 0x3FF)
-				} else {
-					width = 2
-				}
-
-			default:
-				panic("impossible")
-			}
-
-			// Check if the character is in the allowed range:
-			//      #x9 | #xA | #xD | [#x20-#x7E]               (8 bit)
-			//      | #x85 | [#xA0-#xD7FF] | [#xE000-#xFFFD]    (16 bit)
-			//      | [#x10000-#x10FFFF]                        (32 bit)
-			switch {
-			case value == 0x09:
-			case value == 0x0A:
-			case value == 0x0D:
-			case value >= 0x20 && value <= 0x7E:
-			case value == 0x85:
-			case value >= 0xA0 && value <= 0xD7FF:
-			case value >= 0xE000 && value <= 0xFFFD:
-			case value >= 0x10000 && value <= 0x10FFFF:
-			default:
-				return yaml_parser_set_reader_error(parser,
-					"control characters are not allowed",
-					parser.offset, int(value))
-			}
-
-			// Move the raw pointers.
-			parser.raw_buffer_pos += width
-			parser.offset += width
-
-			// Finally put the character into the buffer.
-			if value <= 0x7F {
-				// 0000 0000-0000 007F . 0xxxxxxx
-				parser.buffer[buffer_len+0] = byte(value)
-			} else if value <= 0x7FF {
-				// 0000 0080-0000 07FF . 110xxxxx 10xxxxxx
-				parser.buffer[buffer_len+0] = byte(0xC0 + (value >> 6))
-				parser.buffer[buffer_len+1] = byte(0x80 + (value & 0x3F))
-			} else if value <= 0xFFFF {
-				// 0000 0800-0000 FFFF . 1110xxxx 10xxxxxx 10xxxxxx
-				parser.buffer[buffer_len+0] = byte(0xE0 + (value >> 12))
-				parser.buffer[buffer_len+1] = byte(0x80 + ((value >> 6) & 0x3F))
-				parser.buffer[buffer_len+2] = byte(0x80 + (value & 0x3F))
-			} else {
-				// 0001 0000-0010 FFFF . 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx
-				parser.buffer[buffer_len+0] = byte(0xF0 + (value >> 18))
-				parser.buffer[buffer_len+1] = byte(0x80 + ((value >> 12) & 0x3F))
-				parser.buffer[buffer_len+2] = byte(0x80 + ((value >> 6) & 0x3F))
-				parser.buffer[buffer_len+3] = byte(0x80 + (value & 0x3F))
-			}
-			buffer_len += width
-
-			parser.unread++
-		}
-
-		// On EOF, put NUL into the buffer and return.
-		if parser.eof {
-			parser.buffer[buffer_len] = 0
-			buffer_len++
-			parser.unread++
-			break
-		}
-	}
-	parser.buffer = parser.buffer[:buffer_len]
-	return true
-}
diff --git a/Godeps/_workspace/src/gopkg.in/yaml.v2/resolve.go b/Godeps/_workspace/src/gopkg.in/yaml.v2/resolve.go
deleted file mode 100644
index 93a863274..000000000
--- a/Godeps/_workspace/src/gopkg.in/yaml.v2/resolve.go
+++ /dev/null
@@ -1,203 +0,0 @@
-package yaml
-
-import (
-	"encoding/base64"
-	"math"
-	"strconv"
-	"strings"
-	"unicode/utf8"
-)
-
-type resolveMapItem struct {
-	value interface{}
-	tag   string
-}
-
-var resolveTable = make([]byte, 256)
-var resolveMap = make(map[string]resolveMapItem)
-
-func init() {
-	t := resolveTable
-	t[int('+')] = 'S' // Sign
-	t[int('-')] = 'S'
-	for _, c := range "0123456789" {
-		t[int(c)] = 'D' // Digit
-	}
-	for _, c := range "yYnNtTfFoO~" {
-		t[int(c)] = 'M' // In map
-	}
-	t[int('.')] = '.' // Float (potentially in map)
-
-	var resolveMapList = []struct {
-		v   interface{}
-		tag string
-		l   []string
-	}{
-		{true, yaml_BOOL_TAG, []string{"y", "Y", "yes", "Yes", "YES"}},
-		{true, yaml_BOOL_TAG, []string{"true", "True", "TRUE"}},
-		{true, yaml_BOOL_TAG, []string{"on", "On", "ON"}},
-		{false, yaml_BOOL_TAG, []string{"n", "N", "no", "No", "NO"}},
-		{false, yaml_BOOL_TAG, []string{"false", "False", "FALSE"}},
-		{false, yaml_BOOL_TAG, []string{"off", "Off", "OFF"}},
-		{nil, yaml_NULL_TAG, []string{"", "~", "null", "Null", "NULL"}},
-		{math.NaN(), yaml_FLOAT_TAG, []string{".nan", ".NaN", ".NAN"}},
-		{math.Inf(+1), yaml_FLOAT_TAG, []string{".inf", ".Inf", ".INF"}},
-		{math.Inf(+1), yaml_FLOAT_TAG, []string{"+.inf", "+.Inf", "+.INF"}},
-		{math.Inf(-1), yaml_FLOAT_TAG, []string{"-.inf", "-.Inf", "-.INF"}},
-		{"<<", yaml_MERGE_TAG, []string{"<<"}},
-	}
-
-	m := resolveMap
-	for _, item := range resolveMapList {
-		for _, s := range item.l {
-			m[s] = resolveMapItem{item.v, item.tag}
-		}
-	}
-}
-
-const longTagPrefix = "tag:yaml.org,2002:"
-
-func shortTag(tag string) string {
-	// TODO This can easily be made faster and produce less garbage.
-	if strings.HasPrefix(tag, longTagPrefix) {
-		return "!!" + tag[len(longTagPrefix):]
-	}
-	return tag
-}
-
-func longTag(tag string) string {
-	if strings.HasPrefix(tag, "!!") {
-		return longTagPrefix + tag[2:]
-	}
-	return tag
-}
-
-func resolvableTag(tag string) bool {
-	switch tag {
-	case "", yaml_STR_TAG, yaml_BOOL_TAG, yaml_INT_TAG, yaml_FLOAT_TAG, yaml_NULL_TAG:
-		return true
-	}
-	return false
-}
-
-func resolve(tag string, in string) (rtag string, out interface{}) {
-	if !resolvableTag(tag) {
-		return tag, in
-	}
-
-	defer func() {
-		switch tag {
-		case "", rtag, yaml_STR_TAG, yaml_BINARY_TAG:
-			return
-		}
-		failf("cannot decode %s `%s` as a %s", shortTag(rtag), in, shortTag(tag))
-	}()
-
-	// Any data is accepted as a !!str or !!binary.
-	// Otherwise, the prefix is enough of a hint about what it might be.
-	hint := byte('N')
-	if in != "" {
-		hint = resolveTable[in[0]]
-	}
-	if hint != 0 && tag != yaml_STR_TAG && tag != yaml_BINARY_TAG {
-		// Handle things we can lookup in a map.
-		if item, ok := resolveMap[in]; ok {
-			return item.tag, item.value
-		}
-
-		// Base 60 floats are a bad idea, were dropped in YAML 1.2, and
-		// are purposefully unsupported here. They're still quoted on
-		// the way out for compatibility with other parser, though.
-
-		switch hint {
-		case 'M':
-			// We've already checked the map above.
-
-		case '.':
-			// Not in the map, so maybe a normal float.
-			floatv, err := strconv.ParseFloat(in, 64)
-			if err == nil {
-				return yaml_FLOAT_TAG, floatv
-			}
-
-		case 'D', 'S':
-			// Int, float, or timestamp.
-			plain := strings.Replace(in, "_", "", -1)
-			intv, err := strconv.ParseInt(plain, 0, 64)
-			if err == nil {
-				if intv == int64(int(intv)) {
-					return yaml_INT_TAG, int(intv)
-				} else {
-					return yaml_INT_TAG, intv
-				}
-			}
-			uintv, err := strconv.ParseUint(plain, 0, 64)
-			if err == nil {
-				return yaml_INT_TAG, uintv
-			}
-			floatv, err := strconv.ParseFloat(plain, 64)
-			if err == nil {
-				return yaml_FLOAT_TAG, floatv
-			}
-			if strings.HasPrefix(plain, "0b") {
-				intv, err := strconv.ParseInt(plain[2:], 2, 64)
-				if err == nil {
-					if intv == int64(int(intv)) {
-						return yaml_INT_TAG, int(intv)
-					} else {
-						return yaml_INT_TAG, intv
-					}
-				}
-				uintv, err := strconv.ParseUint(plain[2:], 2, 64)
-				if err == nil {
-					return yaml_INT_TAG, uintv
-				}
-			} else if strings.HasPrefix(plain, "-0b") {
-				intv, err := strconv.ParseInt(plain[3:], 2, 64)
-				if err == nil {
-					if intv == int64(int(intv)) {
-						return yaml_INT_TAG, -int(intv)
-					} else {
-						return yaml_INT_TAG, -intv
-					}
-				}
-			}
-			// XXX Handle timestamps here.
-
-		default:
-			panic("resolveTable item not yet handled: " + string(rune(hint)) + " (with " + in + ")")
-		}
-	}
-	if tag == yaml_BINARY_TAG {
-		return yaml_BINARY_TAG, in
-	}
-	if utf8.ValidString(in) {
-		return yaml_STR_TAG, in
-	}
-	return yaml_BINARY_TAG, encodeBase64(in)
-}
-
-// encodeBase64 encodes s as base64 that is broken up into multiple lines
-// as appropriate for the resulting length.
-func encodeBase64(s string) string {
-	const lineLen = 70
-	encLen := base64.StdEncoding.EncodedLen(len(s))
-	lines := encLen/lineLen + 1
-	buf := make([]byte, encLen*2+lines)
-	in := buf[0:encLen]
-	out := buf[encLen:]
-	base64.StdEncoding.Encode(in, []byte(s))
-	k := 0
-	for i := 0; i < len(in); i += lineLen {
-		j := i + lineLen
-		if j > len(in) {
-			j = len(in)
-		}
-		k += copy(out[k:], in[i:j])
-		if lines > 1 {
-			out[k] = '\n'
-			k++
-		}
-	}
-	return string(out[:k])
-}
diff --git a/Godeps/_workspace/src/gopkg.in/yaml.v2/scannerc.go b/Godeps/_workspace/src/gopkg.in/yaml.v2/scannerc.go
deleted file mode 100644
index fe93b190c..000000000
--- a/Godeps/_workspace/src/gopkg.in/yaml.v2/scannerc.go
+++ /dev/null
@@ -1,2710 +0,0 @@
-package yaml
-
-import (
-	"bytes"
-	"fmt"
-)
-
-// Introduction
-// ************
-//
-// The following notes assume that you are familiar with the YAML specification
-// (http://yaml.org/spec/cvs/current.html).  We mostly follow it, although in
-// some cases we are less restrictive that it requires.
-//
-// The process of transforming a YAML stream into a sequence of events is
-// divided on two steps: Scanning and Parsing.
-//
-// The Scanner transforms the input stream into a sequence of tokens, while the
-// parser transform the sequence of tokens produced by the Scanner into a
-// sequence of parsing events.
-//
-// The Scanner is rather clever and complicated. The Parser, on the contrary,
-// is a straightforward implementation of a recursive-descendant parser (or,
-// LL(1) parser, as it is usually called).
-//
-// Actually there are two issues of Scanning that might be called "clever", the
-// rest is quite straightforward.  The issues are "block collection start" and
-// "simple keys".  Both issues are explained below in details.
-//
-// Here the Scanning step is explained and implemented.  We start with the list
-// of all the tokens produced by the Scanner together with short descriptions.
-//
-// Now, tokens:
-//
-//      STREAM-START(encoding)          # The stream start.
-//      STREAM-END                      # The stream end.
-//      VERSION-DIRECTIVE(major,minor)  # The '%YAML' directive.
-//      TAG-DIRECTIVE(handle,prefix)    # The '%TAG' directive.
-//      DOCUMENT-START                  # '---'
-//      DOCUMENT-END                    # '...'
-//      BLOCK-SEQUENCE-START            # Indentation increase denoting a block
-//      BLOCK-MAPPING-START             # sequence or a block mapping.
-//      BLOCK-END                       # Indentation decrease.
-//      FLOW-SEQUENCE-START             # '['
-//      FLOW-SEQUENCE-END               # ']'
-//      BLOCK-SEQUENCE-START            # '{'
-//      BLOCK-SEQUENCE-END              # '}'
-//      BLOCK-ENTRY                     # '-'
-//      FLOW-ENTRY                      # ','
-//      KEY                             # '?' or nothing (simple keys).
-//      VALUE                           # ':'
-//      ALIAS(anchor)                   # '*anchor'
-//      ANCHOR(anchor)                  # '&anchor'
-//      TAG(handle,suffix)              # '!handle!suffix'
-//      SCALAR(value,style)             # A scalar.
-//
-// The following two tokens are "virtual" tokens denoting the beginning and the
-// end of the stream:
-//
-//      STREAM-START(encoding)
-//      STREAM-END
-//
-// We pass the information about the input stream encoding with the
-// STREAM-START token.
-//
-// The next two tokens are responsible for tags:
-//
-//      VERSION-DIRECTIVE(major,minor)
-//      TAG-DIRECTIVE(handle,prefix)
-//
-// Example:
-//
-//      %YAML   1.1
-//      %TAG    !   !foo
-//      %TAG    !yaml!  tag:yaml.org,2002:
-//      ---
-//
-// The correspoding sequence of tokens:
-//
-//      STREAM-START(utf-8)
-//      VERSION-DIRECTIVE(1,1)
-//      TAG-DIRECTIVE("!","!foo")
-//      TAG-DIRECTIVE("!yaml","tag:yaml.org,2002:")
-//      DOCUMENT-START
-//      STREAM-END
-//
-// Note that the VERSION-DIRECTIVE and TAG-DIRECTIVE tokens occupy a whole
-// line.
-//
-// The document start and end indicators are represented by:
-//
-//      DOCUMENT-START
-//      DOCUMENT-END
-//
-// Note that if a YAML stream contains an implicit document (without '---'
-// and '...' indicators), no DOCUMENT-START and DOCUMENT-END tokens will be
-// produced.
-//
-// In the following examples, we present whole documents together with the
-// produced tokens.
-//
-//      1. An implicit document:
-//
-//          'a scalar'
-//
-//      Tokens:
-//
-//          STREAM-START(utf-8)
-//          SCALAR("a scalar",single-quoted)
-//          STREAM-END
-//
-//      2. An explicit document:
-//
-//          ---
-//          'a scalar'
-//          ...
-//
-//      Tokens:
-//
-//          STREAM-START(utf-8)
-//          DOCUMENT-START
-//          SCALAR("a scalar",single-quoted)
-//          DOCUMENT-END
-//          STREAM-END
-//
-//      3. Several documents in a stream:
-//
-//          'a scalar'
-//          ---
-//          'another scalar'
-//          ---
-//          'yet another scalar'
-//
-//      Tokens:
-//
-//          STREAM-START(utf-8)
-//          SCALAR("a scalar",single-quoted)
-//          DOCUMENT-START
-//          SCALAR("another scalar",single-quoted)
-//          DOCUMENT-START
-//          SCALAR("yet another scalar",single-quoted)
-//          STREAM-END
-//
-// We have already introduced the SCALAR token above.  The following tokens are
-// used to describe aliases, anchors, tag, and scalars:
-//
-//      ALIAS(anchor)
-//      ANCHOR(anchor)
-//      TAG(handle,suffix)
-//      SCALAR(value,style)
-//
-// The following series of examples illustrate the usage of these tokens:
-//
-//      1. A recursive sequence:
-//
-//          &A [ *A ]
-//
-//      Tokens:
-//
-//          STREAM-START(utf-8)
-//          ANCHOR("A")
-//          FLOW-SEQUENCE-START
-//          ALIAS("A")
-//          FLOW-SEQUENCE-END
-//          STREAM-END
-//
-//      2. A tagged scalar:
-//
-//          !!float "3.14"  # A good approximation.
-//
-//      Tokens:
-//
-//          STREAM-START(utf-8)
-//          TAG("!!","float")
-//          SCALAR("3.14",double-quoted)
-//          STREAM-END
-//
-//      3. Various scalar styles:
-//
-//          --- # Implicit empty plain scalars do not produce tokens.
-//          --- a plain scalar
-//          --- 'a single-quoted scalar'
-//          --- "a double-quoted scalar"
-//          --- |-
-//            a literal scalar
-//          --- >-
-//            a folded
-//            scalar
-//
-//      Tokens:
-//
-//          STREAM-START(utf-8)
-//          DOCUMENT-START
-//          DOCUMENT-START
-//          SCALAR("a plain scalar",plain)
-//          DOCUMENT-START
-//          SCALAR("a single-quoted scalar",single-quoted)
-//          DOCUMENT-START
-//          SCALAR("a double-quoted scalar",double-quoted)
-//          DOCUMENT-START
-//          SCALAR("a literal scalar",literal)
-//          DOCUMENT-START
-//          SCALAR("a folded scalar",folded)
-//          STREAM-END
-//
-// Now it's time to review collection-related tokens. We will start with
-// flow collections:
-//
-//      FLOW-SEQUENCE-START
-//      FLOW-SEQUENCE-END
-//      FLOW-MAPPING-START
-//      FLOW-MAPPING-END
-//      FLOW-ENTRY
-//      KEY
-//      VALUE
-//
-// The tokens FLOW-SEQUENCE-START, FLOW-SEQUENCE-END, FLOW-MAPPING-START, and
-// FLOW-MAPPING-END represent the indicators '[', ']', '{', and '}'
-// correspondingly.  FLOW-ENTRY represent the ',' indicator.  Finally the
-// indicators '?' and ':', which are used for denoting mapping keys and values,
-// are represented by the KEY and VALUE tokens.
-//
-// The following examples show flow collections:
-//
-//      1. A flow sequence:
-//
-//          [item 1, item 2, item 3]
-//
-//      Tokens:
-//
-//          STREAM-START(utf-8)
-//          FLOW-SEQUENCE-START
-//          SCALAR("item 1",plain)
-//          FLOW-ENTRY
-//          SCALAR("item 2",plain)
-//          FLOW-ENTRY
-//          SCALAR("item 3",plain)
-//          FLOW-SEQUENCE-END
-//          STREAM-END
-//
-//      2. A flow mapping:
-//
-//          {
-//              a simple key: a value,  # Note that the KEY token is produced.
-//              ? a complex key: another value,
-//          }
-//
-//      Tokens:
-//
-//          STREAM-START(utf-8)
-//          FLOW-MAPPING-START
-//          KEY
-//          SCALAR("a simple key",plain)
-//          VALUE
-//          SCALAR("a value",plain)
-//          FLOW-ENTRY
-//          KEY
-//          SCALAR("a complex key",plain)
-//          VALUE
-//          SCALAR("another value",plain)
-//          FLOW-ENTRY
-//          FLOW-MAPPING-END
-//          STREAM-END
-//
-// A simple key is a key which is not denoted by the '?' indicator.  Note that
-// the Scanner still produce the KEY token whenever it encounters a simple key.
-//
-// For scanning block collections, the following tokens are used (note that we
-// repeat KEY and VALUE here):
-//
-//      BLOCK-SEQUENCE-START
-//      BLOCK-MAPPING-START
-//      BLOCK-END
-//      BLOCK-ENTRY
-//      KEY
-//      VALUE
-//
-// The tokens BLOCK-SEQUENCE-START and BLOCK-MAPPING-START denote indentation
-// increase that precedes a block collection (cf. the INDENT token in Python).
-// The token BLOCK-END denote indentation decrease that ends a block collection
-// (cf. the DEDENT token in Python).  However YAML has some syntax pecularities
-// that makes detections of these tokens more complex.
-//
-// The tokens BLOCK-ENTRY, KEY, and VALUE are used to represent the indicators
-// '-', '?', and ':' correspondingly.
-//
-// The following examples show how the tokens BLOCK-SEQUENCE-START,
-// BLOCK-MAPPING-START, and BLOCK-END are emitted by the Scanner:
-//
-//      1. Block sequences:
-//
-//          - item 1
-//          - item 2
-//          -
-//            - item 3.1
-//            - item 3.2
-//          -
-//            key 1: value 1
-//            key 2: value 2
-//
-//      Tokens:
-//
-//          STREAM-START(utf-8)
-//          BLOCK-SEQUENCE-START
-//          BLOCK-ENTRY
-//          SCALAR("item 1",plain)
-//          BLOCK-ENTRY
-//          SCALAR("item 2",plain)
-//          BLOCK-ENTRY
-//          BLOCK-SEQUENCE-START
-//          BLOCK-ENTRY
-//          SCALAR("item 3.1",plain)
-//          BLOCK-ENTRY
-//          SCALAR("item 3.2",plain)
-//          BLOCK-END
-//          BLOCK-ENTRY
-//          BLOCK-MAPPING-START
-//          KEY
-//          SCALAR("key 1",plain)
-//          VALUE
-//          SCALAR("value 1",plain)
-//          KEY
-//          SCALAR("key 2",plain)
-//          VALUE
-//          SCALAR("value 2",plain)
-//          BLOCK-END
-//          BLOCK-END
-//          STREAM-END
-//
-//      2. Block mappings:
-//
-//          a simple key: a value   # The KEY token is produced here.
-//          ? a complex key
-//          : another value
-//          a mapping:
-//            key 1: value 1
-//            key 2: value 2
-//          a sequence:
-//            - item 1
-//            - item 2
-//
-//      Tokens:
-//
-//          STREAM-START(utf-8)
-//          BLOCK-MAPPING-START
-//          KEY
-//          SCALAR("a simple key",plain)
-//          VALUE
-//          SCALAR("a value",plain)
-//          KEY
-//          SCALAR("a complex key",plain)
-//          VALUE
-//          SCALAR("another value",plain)
-//          KEY
-//          SCALAR("a mapping",plain)
-//          BLOCK-MAPPING-START
-//          KEY
-//          SCALAR("key 1",plain)
-//          VALUE
-//          SCALAR("value 1",plain)
-//          KEY
-//          SCALAR("key 2",plain)
-//          VALUE
-//          SCALAR("value 2",plain)
-//          BLOCK-END
-//          KEY
-//          SCALAR("a sequence",plain)
-//          VALUE
-//          BLOCK-SEQUENCE-START
-//          BLOCK-ENTRY
-//          SCALAR("item 1",plain)
-//          BLOCK-ENTRY
-//          SCALAR("item 2",plain)
-//          BLOCK-END
-//          BLOCK-END
-//          STREAM-END
-//
-// YAML does not always require to start a new block collection from a new
-// line.  If the current line contains only '-', '?', and ':' indicators, a new
-// block collection may start at the current line.  The following examples
-// illustrate this case:
-//
-//      1. Collections in a sequence:
-//
-//          - - item 1
-//            - item 2
-//          - key 1: value 1
-//            key 2: value 2
-//          - ? complex key
-//            : complex value
-//
-//      Tokens:
-//
-//          STREAM-START(utf-8)
-//          BLOCK-SEQUENCE-START
-//          BLOCK-ENTRY
-//          BLOCK-SEQUENCE-START
-//          BLOCK-ENTRY
-//          SCALAR("item 1",plain)
-//          BLOCK-ENTRY
-//          SCALAR("item 2",plain)
-//          BLOCK-END
-//          BLOCK-ENTRY
-//          BLOCK-MAPPING-START
-//          KEY
-//          SCALAR("key 1",plain)
-//          VALUE
-//          SCALAR("value 1",plain)
-//          KEY
-//          SCALAR("key 2",plain)
-//          VALUE
-//          SCALAR("value 2",plain)
-//          BLOCK-END
-//          BLOCK-ENTRY
-//          BLOCK-MAPPING-START
-//          KEY
-//          SCALAR("complex key")
-//          VALUE
-//          SCALAR("complex value")
-//          BLOCK-END
-//          BLOCK-END
-//          STREAM-END
-//
-//      2. Collections in a mapping:
-//
-//          ? a sequence
-//          : - item 1
-//            - item 2
-//          ? a mapping
-//          : key 1: value 1
-//            key 2: value 2
-//
-//      Tokens:
-//
-//          STREAM-START(utf-8)
-//          BLOCK-MAPPING-START
-//          KEY
-//          SCALAR("a sequence",plain)
-//          VALUE
-//          BLOCK-SEQUENCE-START
-//          BLOCK-ENTRY
-//          SCALAR("item 1",plain)
-//          BLOCK-ENTRY
-//          SCALAR("item 2",plain)
-//          BLOCK-END
-//          KEY
-//          SCALAR("a mapping",plain)
-//          VALUE
-//          BLOCK-MAPPING-START
-//          KEY
-//          SCALAR("key 1",plain)
-//          VALUE
-//          SCALAR("value 1",plain)
-//          KEY
-//          SCALAR("key 2",plain)
-//          VALUE
-//          SCALAR("value 2",plain)
-//          BLOCK-END
-//          BLOCK-END
-//          STREAM-END
-//
-// YAML also permits non-indented sequences if they are included into a block
-// mapping.  In this case, the token BLOCK-SEQUENCE-START is not produced:
-//
-//      key:
-//      - item 1    # BLOCK-SEQUENCE-START is NOT produced here.
-//      - item 2
-//
-// Tokens:
-//
-//      STREAM-START(utf-8)
-//      BLOCK-MAPPING-START
-//      KEY
-//      SCALAR("key",plain)
-//      VALUE
-//      BLOCK-ENTRY
-//      SCALAR("item 1",plain)
-//      BLOCK-ENTRY
-//      SCALAR("item 2",plain)
-//      BLOCK-END
-//
-
-// Ensure that the buffer contains the required number of characters.
-// Return true on success, false on failure (reader error or memory error).
-func cache(parser *yaml_parser_t, length int) bool {
-	// [Go] This was inlined: !cache(A, B) -> unread < B && !update(A, B)
-	return parser.unread >= length || yaml_parser_update_buffer(parser, length)
-}
-
-// Advance the buffer pointer.
-func skip(parser *yaml_parser_t) {
-	parser.mark.index++
-	parser.mark.column++
-	parser.unread--
-	parser.buffer_pos += width(parser.buffer[parser.buffer_pos])
-}
-
-func skip_line(parser *yaml_parser_t) {
-	if is_crlf(parser.buffer, parser.buffer_pos) {
-		parser.mark.index += 2
-		parser.mark.column = 0
-		parser.mark.line++
-		parser.unread -= 2
-		parser.buffer_pos += 2
-	} else if is_break(parser.buffer, parser.buffer_pos) {
-		parser.mark.index++
-		parser.mark.column = 0
-		parser.mark.line++
-		parser.unread--
-		parser.buffer_pos += width(parser.buffer[parser.buffer_pos])
-	}
-}
-
-// Copy a character to a string buffer and advance pointers.
-func read(parser *yaml_parser_t, s []byte) []byte {
-	w := width(parser.buffer[parser.buffer_pos])
-	if w == 0 {
-		panic("invalid character sequence")
-	}
-	if len(s) == 0 {
-		s = make([]byte, 0, 32)
-	}
-	if w == 1 && len(s)+w <= cap(s) {
-		s = s[:len(s)+1]
-		s[len(s)-1] = parser.buffer[parser.buffer_pos]
-		parser.buffer_pos++
-	} else {
-		s = append(s, parser.buffer[parser.buffer_pos:parser.buffer_pos+w]...)
-		parser.buffer_pos += w
-	}
-	parser.mark.index++
-	parser.mark.column++
-	parser.unread--
-	return s
-}
-
-// Copy a line break character to a string buffer and advance pointers.
-func read_line(parser *yaml_parser_t, s []byte) []byte {
-	buf := parser.buffer
-	pos := parser.buffer_pos
-	switch {
-	case buf[pos] == '\r' && buf[pos+1] == '\n':
-		// CR LF . LF
-		s = append(s, '\n')
-		parser.buffer_pos += 2
-		parser.mark.index++
-		parser.unread--
-	case buf[pos] == '\r' || buf[pos] == '\n':
-		// CR|LF . LF
-		s = append(s, '\n')
-		parser.buffer_pos += 1
-	case buf[pos] == '\xC2' && buf[pos+1] == '\x85':
-		// NEL . LF
-		s = append(s, '\n')
-		parser.buffer_pos += 2
-	case buf[pos] == '\xE2' && buf[pos+1] == '\x80' && (buf[pos+2] == '\xA8' || buf[pos+2] == '\xA9'):
-		// LS|PS . LS|PS
-		s = append(s, buf[parser.buffer_pos:pos+3]...)
-		parser.buffer_pos += 3
-	default:
-		return s
-	}
-	parser.mark.index++
-	parser.mark.column = 0
-	parser.mark.line++
-	parser.unread--
-	return s
-}
-
-// Get the next token.
-func yaml_parser_scan(parser *yaml_parser_t, token *yaml_token_t) bool {
-	// Erase the token object.
-	*token = yaml_token_t{} // [Go] Is this necessary?
-
-	// No tokens after STREAM-END or error.
-	if parser.stream_end_produced || parser.error != yaml_NO_ERROR {
-		return true
-	}
-
-	// Ensure that the tokens queue contains enough tokens.
-	if !parser.token_available {
-		if !yaml_parser_fetch_more_tokens(parser) {
-			return false
-		}
-	}
-
-	// Fetch the next token from the queue.
-	*token = parser.tokens[parser.tokens_head]
-	parser.tokens_head++
-	parser.tokens_parsed++
-	parser.token_available = false
-
-	if token.typ == yaml_STREAM_END_TOKEN {
-		parser.stream_end_produced = true
-	}
-	return true
-}
-
-// Set the scanner error and return false.
-func yaml_parser_set_scanner_error(parser *yaml_parser_t, context string, context_mark yaml_mark_t, problem string) bool {
-	parser.error = yaml_SCANNER_ERROR
-	parser.context = context
-	parser.context_mark = context_mark
-	parser.problem = problem
-	parser.problem_mark = parser.mark
-	return false
-}
-
-func yaml_parser_set_scanner_tag_error(parser *yaml_parser_t, directive bool, context_mark yaml_mark_t, problem string) bool {
-	context := "while parsing a tag"
-	if directive {
-		context = "while parsing a %TAG directive"
-	}
-	return yaml_parser_set_scanner_error(parser, context, context_mark, "did not find URI escaped octet")
-}
-
-func trace(args ...interface{}) func() {
-	pargs := append([]interface{}{"+++"}, args...)
-	fmt.Println(pargs...)
-	pargs = append([]interface{}{"---"}, args...)
-	return func() { fmt.Println(pargs...) }
-}
-
-// Ensure that the tokens queue contains at least one token which can be
-// returned to the Parser.
-func yaml_parser_fetch_more_tokens(parser *yaml_parser_t) bool {
-	// While we need more tokens to fetch, do it.
-	for {
-		// Check if we really need to fetch more tokens.
-		need_more_tokens := false
-
-		if parser.tokens_head == len(parser.tokens) {
-			// Queue is empty.
-			need_more_tokens = true
-		} else {
-			// Check if any potential simple key may occupy the head position.
-			if !yaml_parser_stale_simple_keys(parser) {
-				return false
-			}
-
-			for i := range parser.simple_keys {
-				simple_key := &parser.simple_keys[i]
-				if simple_key.possible && simple_key.token_number == parser.tokens_parsed {
-					need_more_tokens = true
-					break
-				}
-			}
-		}
-
-		// We are finished.
-		if !need_more_tokens {
-			break
-		}
-		// Fetch the next token.
-		if !yaml_parser_fetch_next_token(parser) {
-			return false
-		}
-	}
-
-	parser.token_available = true
-	return true
-}
-
-// The dispatcher for token fetchers.
-func yaml_parser_fetch_next_token(parser *yaml_parser_t) bool {
-	// Ensure that the buffer is initialized.
-	if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
-		return false
-	}
-
-	// Check if we just started scanning.  Fetch STREAM-START then.
-	if !parser.stream_start_produced {
-		return yaml_parser_fetch_stream_start(parser)
-	}
-
-	// Eat whitespaces and comments until we reach the next token.
-	if !yaml_parser_scan_to_next_token(parser) {
-		return false
-	}
-
-	// Remove obsolete potential simple keys.
-	if !yaml_parser_stale_simple_keys(parser) {
-		return false
-	}
-
-	// Check the indentation level against the current column.
-	if !yaml_parser_unroll_indent(parser, parser.mark.column) {
-		return false
-	}
-
-	// Ensure that the buffer contains at least 4 characters.  4 is the length
-	// of the longest indicators ('--- ' and '... ').
-	if parser.unread < 4 && !yaml_parser_update_buffer(parser, 4) {
-		return false
-	}
-
-	// Is it the end of the stream?
-	if is_z(parser.buffer, parser.buffer_pos) {
-		return yaml_parser_fetch_stream_end(parser)
-	}
-
-	// Is it a directive?
-	if parser.mark.column == 0 && parser.buffer[parser.buffer_pos] == '%' {
-		return yaml_parser_fetch_directive(parser)
-	}
-
-	buf := parser.buffer
-	pos := parser.buffer_pos
-
-	// Is it the document start indicator?
-	if parser.mark.column == 0 && buf[pos] == '-' && buf[pos+1] == '-' && buf[pos+2] == '-' && is_blankz(buf, pos+3) {
-		return yaml_parser_fetch_document_indicator(parser, yaml_DOCUMENT_START_TOKEN)
-	}
-
-	// Is it the document end indicator?
-	if parser.mark.column == 0 && buf[pos] == '.' && buf[pos+1] == '.' && buf[pos+2] == '.' && is_blankz(buf, pos+3) {
-		return yaml_parser_fetch_document_indicator(parser, yaml_DOCUMENT_END_TOKEN)
-	}
-
-	// Is it the flow sequence start indicator?
-	if buf[pos] == '[' {
-		return yaml_parser_fetch_flow_collection_start(parser, yaml_FLOW_SEQUENCE_START_TOKEN)
-	}
-
-	// Is it the flow mapping start indicator?
-	if parser.buffer[parser.buffer_pos] == '{' {
-		return yaml_parser_fetch_flow_collection_start(parser, yaml_FLOW_MAPPING_START_TOKEN)
-	}
-
-	// Is it the flow sequence end indicator?
-	if parser.buffer[parser.buffer_pos] == ']' {
-		return yaml_parser_fetch_flow_collection_end(parser,
-			yaml_FLOW_SEQUENCE_END_TOKEN)
-	}
-
-	// Is it the flow mapping end indicator?
-	if parser.buffer[parser.buffer_pos] == '}' {
-		return yaml_parser_fetch_flow_collection_end(parser,
-			yaml_FLOW_MAPPING_END_TOKEN)
-	}
-
-	// Is it the flow entry indicator?
-	if parser.buffer[parser.buffer_pos] == ',' {
-		return yaml_parser_fetch_flow_entry(parser)
-	}
-
-	// Is it the block entry indicator?
-	if parser.buffer[parser.buffer_pos] == '-' && is_blankz(parser.buffer, parser.buffer_pos+1) {
-		return yaml_parser_fetch_block_entry(parser)
-	}
-
-	// Is it the key indicator?
-	if parser.buffer[parser.buffer_pos] == '?' && (parser.flow_level > 0 || is_blankz(parser.buffer, parser.buffer_pos+1)) {
-		return yaml_parser_fetch_key(parser)
-	}
-
-	// Is it the value indicator?
-	if parser.buffer[parser.buffer_pos] == ':' && (parser.flow_level > 0 || is_blankz(parser.buffer, parser.buffer_pos+1)) {
-		return yaml_parser_fetch_value(parser)
-	}
-
-	// Is it an alias?
-	if parser.buffer[parser.buffer_pos] == '*' {
-		return yaml_parser_fetch_anchor(parser, yaml_ALIAS_TOKEN)
-	}
-
-	// Is it an anchor?
-	if parser.buffer[parser.buffer_pos] == '&' {
-		return yaml_parser_fetch_anchor(parser, yaml_ANCHOR_TOKEN)
-	}
-
-	// Is it a tag?
-	if parser.buffer[parser.buffer_pos] == '!' {
-		return yaml_parser_fetch_tag(parser)
-	}
-
-	// Is it a literal scalar?
-	if parser.buffer[parser.buffer_pos] == '|' && parser.flow_level == 0 {
-		return yaml_parser_fetch_block_scalar(parser, true)
-	}
-
-	// Is it a folded scalar?
-	if parser.buffer[parser.buffer_pos] == '>' && parser.flow_level == 0 {
-		return yaml_parser_fetch_block_scalar(parser, false)
-	}
-
-	// Is it a single-quoted scalar?
-	if parser.buffer[parser.buffer_pos] == '\'' {
-		return yaml_parser_fetch_flow_scalar(parser, true)
-	}
-
-	// Is it a double-quoted scalar?
-	if parser.buffer[parser.buffer_pos] == '"' {
-		return yaml_parser_fetch_flow_scalar(parser, false)
-	}
-
-	// Is it a plain scalar?
-	//
-	// A plain scalar may start with any non-blank characters except
-	//
-	//      '-', '?', ':', ',', '[', ']', '{', '}',
-	//      '#', '&', '*', '!', '|', '>', '\'', '\"',
-	//      '%', '@', '`'.
-	//
-	// In the block context (and, for the '-' indicator, in the flow context
-	// too), it may also start with the characters
-	//
-	//      '-', '?', ':'
-	//
-	// if it is followed by a non-space character.
-	//
-	// The last rule is more restrictive than the specification requires.
-	// [Go] Make this logic more reasonable.
-	//switch parser.buffer[parser.buffer_pos] {
-	//case '-', '?', ':', ',', '?', '-', ',', ':', ']', '[', '}', '{', '&', '#', '!', '*', '>', '|', '"', '\'', '@', '%', '-', '`':
-	//}
-	if !(is_blankz(parser.buffer, parser.buffer_pos) || parser.buffer[parser.buffer_pos] == '-' ||
-		parser.buffer[parser.buffer_pos] == '?' || parser.buffer[parser.buffer_pos] == ':' ||
-		parser.buffer[parser.buffer_pos] == ',' || parser.buffer[parser.buffer_pos] == '[' ||
-		parser.buffer[parser.buffer_pos] == ']' || parser.buffer[parser.buffer_pos] == '{' ||
-		parser.buffer[parser.buffer_pos] == '}' || parser.buffer[parser.buffer_pos] == '#' ||
-		parser.buffer[parser.buffer_pos] == '&' || parser.buffer[parser.buffer_pos] == '*' ||
-		parser.buffer[parser.buffer_pos] == '!' || parser.buffer[parser.buffer_pos] == '|' ||
-		parser.buffer[parser.buffer_pos] == '>' || parser.buffer[parser.buffer_pos] == '\'' ||
-		parser.buffer[parser.buffer_pos] == '"' || parser.buffer[parser.buffer_pos] == '%' ||
-		parser.buffer[parser.buffer_pos] == '@' || parser.buffer[parser.buffer_pos] == '`') ||
-		(parser.buffer[parser.buffer_pos] == '-' && !is_blank(parser.buffer, parser.buffer_pos+1)) ||
-		(parser.flow_level == 0 &&
-			(parser.buffer[parser.buffer_pos] == '?' || parser.buffer[parser.buffer_pos] == ':') &&
-			!is_blankz(parser.buffer, parser.buffer_pos+1)) {
-		return yaml_parser_fetch_plain_scalar(parser)
-	}
-
-	// If we don't determine the token type so far, it is an error.
-	return yaml_parser_set_scanner_error(parser,
-		"while scanning for the next token", parser.mark,
-		"found character that cannot start any token")
-}
-
-// Check the list of potential simple keys and remove the positions that
-// cannot contain simple keys anymore.
-func yaml_parser_stale_simple_keys(parser *yaml_parser_t) bool {
-	// Check for a potential simple key for each flow level.
-	for i := range parser.simple_keys {
-		simple_key := &parser.simple_keys[i]
-
-		// The specification requires that a simple key
-		//
-		//  - is limited to a single line,
-		//  - is shorter than 1024 characters.
-		if simple_key.possible && (simple_key.mark.line < parser.mark.line || simple_key.mark.index+1024 < parser.mark.index) {
-
-			// Check if the potential simple key to be removed is required.
-			if simple_key.required {
-				return yaml_parser_set_scanner_error(parser,
-					"while scanning a simple key", simple_key.mark,
-					"could not find expected ':'")
-			}
-			simple_key.possible = false
-		}
-	}
-	return true
-}
-
-// Check if a simple key may start at the current position and add it if
-// needed.
-func yaml_parser_save_simple_key(parser *yaml_parser_t) bool {
-	// A simple key is required at the current position if the scanner is in
-	// the block context and the current column coincides with the indentation
-	// level.
-
-	required := parser.flow_level == 0 && parser.indent == parser.mark.column
-
-	// A simple key is required only when it is the first token in the current
-	// line.  Therefore it is always allowed.  But we add a check anyway.
-	if required && !parser.simple_key_allowed {
-		panic("should not happen")
-	}
-
-	//
-	// If the current position may start a simple key, save it.
-	//
-	if parser.simple_key_allowed {
-		simple_key := yaml_simple_key_t{
-			possible:     true,
-			required:     required,
-			token_number: parser.tokens_parsed + (len(parser.tokens) - parser.tokens_head),
-		}
-		simple_key.mark = parser.mark
-
-		if !yaml_parser_remove_simple_key(parser) {
-			return false
-		}
-		parser.simple_keys[len(parser.simple_keys)-1] = simple_key
-	}
-	return true
-}
-
-// Remove a potential simple key at the current flow level.
-func yaml_parser_remove_simple_key(parser *yaml_parser_t) bool {
-	i := len(parser.simple_keys) - 1
-	if parser.simple_keys[i].possible {
-		// If the key is required, it is an error.
-		if parser.simple_keys[i].required {
-			return yaml_parser_set_scanner_error(parser,
-				"while scanning a simple key", parser.simple_keys[i].mark,
-				"could not find expected ':'")
-		}
-	}
-	// Remove the key from the stack.
-	parser.simple_keys[i].possible = false
-	return true
-}
-
-// Increase the flow level and resize the simple key list if needed.
-func yaml_parser_increase_flow_level(parser *yaml_parser_t) bool {
-	// Reset the simple key on the next level.
-	parser.simple_keys = append(parser.simple_keys, yaml_simple_key_t{})
-
-	// Increase the flow level.
-	parser.flow_level++
-	return true
-}
-
-// Decrease the flow level.
-func yaml_parser_decrease_flow_level(parser *yaml_parser_t) bool {
-	if parser.flow_level > 0 {
-		parser.flow_level--
-		parser.simple_keys = parser.simple_keys[:len(parser.simple_keys)-1]
-	}
-	return true
-}
-
-// Push the current indentation level to the stack and set the new level
-// the current column is greater than the indentation level.  In this case,
-// append or insert the specified token into the token queue.
-func yaml_parser_roll_indent(parser *yaml_parser_t, column, number int, typ yaml_token_type_t, mark yaml_mark_t) bool {
-	// In the flow context, do nothing.
-	if parser.flow_level > 0 {
-		return true
-	}
-
-	if parser.indent < column {
-		// Push the current indentation level to the stack and set the new
-		// indentation level.
-		parser.indents = append(parser.indents, parser.indent)
-		parser.indent = column
-
-		// Create a token and insert it into the queue.
-		token := yaml_token_t{
-			typ:        typ,
-			start_mark: mark,
-			end_mark:   mark,
-		}
-		if number > -1 {
-			number -= parser.tokens_parsed
-		}
-		yaml_insert_token(parser, number, &token)
-	}
-	return true
-}
-
-// Pop indentation levels from the indents stack until the current level
-// becomes less or equal to the column.  For each intendation level, append
-// the BLOCK-END token.
-func yaml_parser_unroll_indent(parser *yaml_parser_t, column int) bool {
-	// In the flow context, do nothing.
-	if parser.flow_level > 0 {
-		return true
-	}
-
-	// Loop through the intendation levels in the stack.
-	for parser.indent > column {
-		// Create a token and append it to the queue.
-		token := yaml_token_t{
-			typ:        yaml_BLOCK_END_TOKEN,
-			start_mark: parser.mark,
-			end_mark:   parser.mark,
-		}
-		yaml_insert_token(parser, -1, &token)
-
-		// Pop the indentation level.
-		parser.indent = parser.indents[len(parser.indents)-1]
-		parser.indents = parser.indents[:len(parser.indents)-1]
-	}
-	return true
-}
-
-// Initialize the scanner and produce the STREAM-START token.
-func yaml_parser_fetch_stream_start(parser *yaml_parser_t) bool {
-
-	// Set the initial indentation.
-	parser.indent = -1
-
-	// Initialize the simple key stack.
-	parser.simple_keys = append(parser.simple_keys, yaml_simple_key_t{})
-
-	// A simple key is allowed at the beginning of the stream.
-	parser.simple_key_allowed = true
-
-	// We have started.
-	parser.stream_start_produced = true
-
-	// Create the STREAM-START token and append it to the queue.
-	token := yaml_token_t{
-		typ:        yaml_STREAM_START_TOKEN,
-		start_mark: parser.mark,
-		end_mark:   parser.mark,
-		encoding:   parser.encoding,
-	}
-	yaml_insert_token(parser, -1, &token)
-	return true
-}
-
-// Produce the STREAM-END token and shut down the scanner.
-func yaml_parser_fetch_stream_end(parser *yaml_parser_t) bool {
-
-	// Force new line.
-	if parser.mark.column != 0 {
-		parser.mark.column = 0
-		parser.mark.line++
-	}
-
-	// Reset the indentation level.
-	if !yaml_parser_unroll_indent(parser, -1) {
-		return false
-	}
-
-	// Reset simple keys.
-	if !yaml_parser_remove_simple_key(parser) {
-		return false
-	}
-
-	parser.simple_key_allowed = false
-
-	// Create the STREAM-END token and append it to the queue.
-	token := yaml_token_t{
-		typ:        yaml_STREAM_END_TOKEN,
-		start_mark: parser.mark,
-		end_mark:   parser.mark,
-	}
-	yaml_insert_token(parser, -1, &token)
-	return true
-}
-
-// Produce a VERSION-DIRECTIVE or TAG-DIRECTIVE token.
-func yaml_parser_fetch_directive(parser *yaml_parser_t) bool {
-	// Reset the indentation level.
-	if !yaml_parser_unroll_indent(parser, -1) {
-		return false
-	}
-
-	// Reset simple keys.
-	if !yaml_parser_remove_simple_key(parser) {
-		return false
-	}
-
-	parser.simple_key_allowed = false
-
-	// Create the YAML-DIRECTIVE or TAG-DIRECTIVE token.
-	token := yaml_token_t{}
-	if !yaml_parser_scan_directive(parser, &token) {
-		return false
-	}
-	// Append the token to the queue.
-	yaml_insert_token(parser, -1, &token)
-	return true
-}
-
-// Produce the DOCUMENT-START or DOCUMENT-END token.
-func yaml_parser_fetch_document_indicator(parser *yaml_parser_t, typ yaml_token_type_t) bool {
-	// Reset the indentation level.
-	if !yaml_parser_unroll_indent(parser, -1) {
-		return false
-	}
-
-	// Reset simple keys.
-	if !yaml_parser_remove_simple_key(parser) {
-		return false
-	}
-
-	parser.simple_key_allowed = false
-
-	// Consume the token.
-	start_mark := parser.mark
-
-	skip(parser)
-	skip(parser)
-	skip(parser)
-
-	end_mark := parser.mark
-
-	// Create the DOCUMENT-START or DOCUMENT-END token.
-	token := yaml_token_t{
-		typ:        typ,
-		start_mark: start_mark,
-		end_mark:   end_mark,
-	}
-	// Append the token to the queue.
-	yaml_insert_token(parser, -1, &token)
-	return true
-}
-
-// Produce the FLOW-SEQUENCE-START or FLOW-MAPPING-START token.
-func yaml_parser_fetch_flow_collection_start(parser *yaml_parser_t, typ yaml_token_type_t) bool {
-	// The indicators '[' and '{' may start a simple key.
-	if !yaml_parser_save_simple_key(parser) {
-		return false
-	}
-
-	// Increase the flow level.
-	if !yaml_parser_increase_flow_level(parser) {
-		return false
-	}
-
-	// A simple key may follow the indicators '[' and '{'.
-	parser.simple_key_allowed = true
-
-	// Consume the token.
-	start_mark := parser.mark
-	skip(parser)
-	end_mark := parser.mark
-
-	// Create the FLOW-SEQUENCE-START of FLOW-MAPPING-START token.
-	token := yaml_token_t{
-		typ:        typ,
-		start_mark: start_mark,
-		end_mark:   end_mark,
-	}
-	// Append the token to the queue.
-	yaml_insert_token(parser, -1, &token)
-	return true
-}
-
-// Produce the FLOW-SEQUENCE-END or FLOW-MAPPING-END token.
-func yaml_parser_fetch_flow_collection_end(parser *yaml_parser_t, typ yaml_token_type_t) bool {
-	// Reset any potential simple key on the current flow level.
-	if !yaml_parser_remove_simple_key(parser) {
-		return false
-	}
-
-	// Decrease the flow level.
-	if !yaml_parser_decrease_flow_level(parser) {
-		return false
-	}
-
-	// No simple keys after the indicators ']' and '}'.
-	parser.simple_key_allowed = false
-
-	// Consume the token.
-
-	start_mark := parser.mark
-	skip(parser)
-	end_mark := parser.mark
-
-	// Create the FLOW-SEQUENCE-END of FLOW-MAPPING-END token.
-	token := yaml_token_t{
-		typ:        typ,
-		start_mark: start_mark,
-		end_mark:   end_mark,
-	}
-	// Append the token to the queue.
-	yaml_insert_token(parser, -1, &token)
-	return true
-}
-
-// Produce the FLOW-ENTRY token.
-func yaml_parser_fetch_flow_entry(parser *yaml_parser_t) bool {
-	// Reset any potential simple keys on the current flow level.
-	if !yaml_parser_remove_simple_key(parser) {
-		return false
-	}
-
-	// Simple keys are allowed after ','.
-	parser.simple_key_allowed = true
-
-	// Consume the token.
-	start_mark := parser.mark
-	skip(parser)
-	end_mark := parser.mark
-
-	// Create the FLOW-ENTRY token and append it to the queue.
-	token := yaml_token_t{
-		typ:        yaml_FLOW_ENTRY_TOKEN,
-		start_mark: start_mark,
-		end_mark:   end_mark,
-	}
-	yaml_insert_token(parser, -1, &token)
-	return true
-}
-
-// Produce the BLOCK-ENTRY token.
-func yaml_parser_fetch_block_entry(parser *yaml_parser_t) bool {
-	// Check if the scanner is in the block context.
-	if parser.flow_level == 0 {
-		// Check if we are allowed to start a new entry.
-		if !parser.simple_key_allowed {
-			return yaml_parser_set_scanner_error(parser, "", parser.mark,
-				"block sequence entries are not allowed in this context")
-		}
-		// Add the BLOCK-SEQUENCE-START token if needed.
-		if !yaml_parser_roll_indent(parser, parser.mark.column, -1, yaml_BLOCK_SEQUENCE_START_TOKEN, parser.mark) {
-			return false
-		}
-	} else {
-		// It is an error for the '-' indicator to occur in the flow context,
-		// but we let the Parser detect and report about it because the Parser
-		// is able to point to the context.
-	}
-
-	// Reset any potential simple keys on the current flow level.
-	if !yaml_parser_remove_simple_key(parser) {
-		return false
-	}
-
-	// Simple keys are allowed after '-'.
-	parser.simple_key_allowed = true
-
-	// Consume the token.
-	start_mark := parser.mark
-	skip(parser)
-	end_mark := parser.mark
-
-	// Create the BLOCK-ENTRY token and append it to the queue.
-	token := yaml_token_t{
-		typ:        yaml_BLOCK_ENTRY_TOKEN,
-		start_mark: start_mark,
-		end_mark:   end_mark,
-	}
-	yaml_insert_token(parser, -1, &token)
-	return true
-}
-
-// Produce the KEY token.
-func yaml_parser_fetch_key(parser *yaml_parser_t) bool {
-
-	// In the block context, additional checks are required.
-	if parser.flow_level == 0 {
-		// Check if we are allowed to start a new key (not nessesary simple).
-		if !parser.simple_key_allowed {
-			return yaml_parser_set_scanner_error(parser, "", parser.mark,
-				"mapping keys are not allowed in this context")
-		}
-		// Add the BLOCK-MAPPING-START token if needed.
-		if !yaml_parser_roll_indent(parser, parser.mark.column, -1, yaml_BLOCK_MAPPING_START_TOKEN, parser.mark) {
-			return false
-		}
-	}
-
-	// Reset any potential simple keys on the current flow level.
-	if !yaml_parser_remove_simple_key(parser) {
-		return false
-	}
-
-	// Simple keys are allowed after '?' in the block context.
-	parser.simple_key_allowed = parser.flow_level == 0
-
-	// Consume the token.
-	start_mark := parser.mark
-	skip(parser)
-	end_mark := parser.mark
-
-	// Create the KEY token and append it to the queue.
-	token := yaml_token_t{
-		typ:        yaml_KEY_TOKEN,
-		start_mark: start_mark,
-		end_mark:   end_mark,
-	}
-	yaml_insert_token(parser, -1, &token)
-	return true
-}
-
-// Produce the VALUE token.
-func yaml_parser_fetch_value(parser *yaml_parser_t) bool {
-
-	simple_key := &parser.simple_keys[len(parser.simple_keys)-1]
-
-	// Have we found a simple key?
-	if simple_key.possible {
-		// Create the KEY token and insert it into the queue.
-		token := yaml_token_t{
-			typ:        yaml_KEY_TOKEN,
-			start_mark: simple_key.mark,
-			end_mark:   simple_key.mark,
-		}
-		yaml_insert_token(parser, simple_key.token_number-parser.tokens_parsed, &token)
-
-		// In the block context, we may need to add the BLOCK-MAPPING-START token.
-		if !yaml_parser_roll_indent(parser, simple_key.mark.column,
-			simple_key.token_number,
-			yaml_BLOCK_MAPPING_START_TOKEN, simple_key.mark) {
-			return false
-		}
-
-		// Remove the simple key.
-		simple_key.possible = false
-
-		// A simple key cannot follow another simple key.
-		parser.simple_key_allowed = false
-
-	} else {
-		// The ':' indicator follows a complex key.
-
-		// In the block context, extra checks are required.
-		if parser.flow_level == 0 {
-
-			// Check if we are allowed to start a complex value.
-			if !parser.simple_key_allowed {
-				return yaml_parser_set_scanner_error(parser, "", parser.mark,
-					"mapping values are not allowed in this context")
-			}
-
-			// Add the BLOCK-MAPPING-START token if needed.
-			if !yaml_parser_roll_indent(parser, parser.mark.column, -1, yaml_BLOCK_MAPPING_START_TOKEN, parser.mark) {
-				return false
-			}
-		}
-
-		// Simple keys after ':' are allowed in the block context.
-		parser.simple_key_allowed = parser.flow_level == 0
-	}
-
-	// Consume the token.
-	start_mark := parser.mark
-	skip(parser)
-	end_mark := parser.mark
-
-	// Create the VALUE token and append it to the queue.
-	token := yaml_token_t{
-		typ:        yaml_VALUE_TOKEN,
-		start_mark: start_mark,
-		end_mark:   end_mark,
-	}
-	yaml_insert_token(parser, -1, &token)
-	return true
-}
-
-// Produce the ALIAS or ANCHOR token.
-func yaml_parser_fetch_anchor(parser *yaml_parser_t, typ yaml_token_type_t) bool {
-	// An anchor or an alias could be a simple key.
-	if !yaml_parser_save_simple_key(parser) {
-		return false
-	}
-
-	// A simple key cannot follow an anchor or an alias.
-	parser.simple_key_allowed = false
-
-	// Create the ALIAS or ANCHOR token and append it to the queue.
-	var token yaml_token_t
-	if !yaml_parser_scan_anchor(parser, &token, typ) {
-		return false
-	}
-	yaml_insert_token(parser, -1, &token)
-	return true
-}
-
-// Produce the TAG token.
-func yaml_parser_fetch_tag(parser *yaml_parser_t) bool {
-	// A tag could be a simple key.
-	if !yaml_parser_save_simple_key(parser) {
-		return false
-	}
-
-	// A simple key cannot follow a tag.
-	parser.simple_key_allowed = false
-
-	// Create the TAG token and append it to the queue.
-	var token yaml_token_t
-	if !yaml_parser_scan_tag(parser, &token) {
-		return false
-	}
-	yaml_insert_token(parser, -1, &token)
-	return true
-}
-
-// Produce the SCALAR(...,literal) or SCALAR(...,folded) tokens.
-func yaml_parser_fetch_block_scalar(parser *yaml_parser_t, literal bool) bool {
-	// Remove any potential simple keys.
-	if !yaml_parser_remove_simple_key(parser) {
-		return false
-	}
-
-	// A simple key may follow a block scalar.
-	parser.simple_key_allowed = true
-
-	// Create the SCALAR token and append it to the queue.
-	var token yaml_token_t
-	if !yaml_parser_scan_block_scalar(parser, &token, literal) {
-		return false
-	}
-	yaml_insert_token(parser, -1, &token)
-	return true
-}
-
-// Produce the SCALAR(...,single-quoted) or SCALAR(...,double-quoted) tokens.
-func yaml_parser_fetch_flow_scalar(parser *yaml_parser_t, single bool) bool {
-	// A plain scalar could be a simple key.
-	if !yaml_parser_save_simple_key(parser) {
-		return false
-	}
-
-	// A simple key cannot follow a flow scalar.
-	parser.simple_key_allowed = false
-
-	// Create the SCALAR token and append it to the queue.
-	var token yaml_token_t
-	if !yaml_parser_scan_flow_scalar(parser, &token, single) {
-		return false
-	}
-	yaml_insert_token(parser, -1, &token)
-	return true
-}
-
-// Produce the SCALAR(...,plain) token.
-func yaml_parser_fetch_plain_scalar(parser *yaml_parser_t) bool {
-	// A plain scalar could be a simple key.
-	if !yaml_parser_save_simple_key(parser) {
-		return false
-	}
-
-	// A simple key cannot follow a flow scalar.
-	parser.simple_key_allowed = false
-
-	// Create the SCALAR token and append it to the queue.
-	var token yaml_token_t
-	if !yaml_parser_scan_plain_scalar(parser, &token) {
-		return false
-	}
-	yaml_insert_token(parser, -1, &token)
-	return true
-}
-
-// Eat whitespaces and comments until the next token is found.
-func yaml_parser_scan_to_next_token(parser *yaml_parser_t) bool {
-
-	// Until the next token is not found.
-	for {
-		// Allow the BOM mark to start a line.
-		if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
-			return false
-		}
-		if parser.mark.column == 0 && is_bom(parser.buffer, parser.buffer_pos) {
-			skip(parser)
-		}
-
-		// Eat whitespaces.
-		// Tabs are allowed:
-		//  - in the flow context
-		//  - in the block context, but not at the beginning of the line or
-		//  after '-', '?', or ':' (complex value).
-		if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
-			return false
-		}
-
-		for parser.buffer[parser.buffer_pos] == ' ' || ((parser.flow_level > 0 || !parser.simple_key_allowed) && parser.buffer[parser.buffer_pos] == '\t') {
-			skip(parser)
-			if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
-				return false
-			}
-		}
-
-		// Eat a comment until a line break.
-		if parser.buffer[parser.buffer_pos] == '#' {
-			for !is_breakz(parser.buffer, parser.buffer_pos) {
-				skip(parser)
-				if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
-					return false
-				}
-			}
-		}
-
-		// If it is a line break, eat it.
-		if is_break(parser.buffer, parser.buffer_pos) {
-			if parser.unread < 2 && !yaml_parser_update_buffer(parser, 2) {
-				return false
-			}
-			skip_line(parser)
-
-			// In the block context, a new line may start a simple key.
-			if parser.flow_level == 0 {
-				parser.simple_key_allowed = true
-			}
-		} else {
-			break // We have found a token.
-		}
-	}
-
-	return true
-}
-
-// Scan a YAML-DIRECTIVE or TAG-DIRECTIVE token.
-//
-// Scope:
-//      %YAML    1.1    # a comment \n
-//      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-//      %TAG    !yaml!  tag:yaml.org,2002:  \n
-//      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-//
-func yaml_parser_scan_directive(parser *yaml_parser_t, token *yaml_token_t) bool {
-	// Eat '%'.
-	start_mark := parser.mark
-	skip(parser)
-
-	// Scan the directive name.
-	var name []byte
-	if !yaml_parser_scan_directive_name(parser, start_mark, &name) {
-		return false
-	}
-
-	// Is it a YAML directive?
-	if bytes.Equal(name, []byte("YAML")) {
-		// Scan the VERSION directive value.
-		var major, minor int8
-		if !yaml_parser_scan_version_directive_value(parser, start_mark, &major, &minor) {
-			return false
-		}
-		end_mark := parser.mark
-
-		// Create a VERSION-DIRECTIVE token.
-		*token = yaml_token_t{
-			typ:        yaml_VERSION_DIRECTIVE_TOKEN,
-			start_mark: start_mark,
-			end_mark:   end_mark,
-			major:      major,
-			minor:      minor,
-		}
-
-		// Is it a TAG directive?
-	} else if bytes.Equal(name, []byte("TAG")) {
-		// Scan the TAG directive value.
-		var handle, prefix []byte
-		if !yaml_parser_scan_tag_directive_value(parser, start_mark, &handle, &prefix) {
-			return false
-		}
-		end_mark := parser.mark
-
-		// Create a TAG-DIRECTIVE token.
-		*token = yaml_token_t{
-			typ:        yaml_TAG_DIRECTIVE_TOKEN,
-			start_mark: start_mark,
-			end_mark:   end_mark,
-			value:      handle,
-			prefix:     prefix,
-		}
-
-		// Unknown directive.
-	} else {
-		yaml_parser_set_scanner_error(parser, "while scanning a directive",
-			start_mark, "found uknown directive name")
-		return false
-	}
-
-	// Eat the rest of the line including any comments.
-	if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
-		return false
-	}
-
-	for is_blank(parser.buffer, parser.buffer_pos) {
-		skip(parser)
-		if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
-			return false
-		}
-	}
-
-	if parser.buffer[parser.buffer_pos] == '#' {
-		for !is_breakz(parser.buffer, parser.buffer_pos) {
-			skip(parser)
-			if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
-				return false
-			}
-		}
-	}
-
-	// Check if we are at the end of the line.
-	if !is_breakz(parser.buffer, parser.buffer_pos) {
-		yaml_parser_set_scanner_error(parser, "while scanning a directive",
-			start_mark, "did not find expected comment or line break")
-		return false
-	}
-
-	// Eat a line break.
-	if is_break(parser.buffer, parser.buffer_pos) {
-		if parser.unread < 2 && !yaml_parser_update_buffer(parser, 2) {
-			return false
-		}
-		skip_line(parser)
-	}
-
-	return true
-}
-
-// Scan the directive name.
-//
-// Scope:
-//      %YAML   1.1     # a comment \n
-//       ^^^^
-//      %TAG    !yaml!  tag:yaml.org,2002:  \n
-//       ^^^
-//
-func yaml_parser_scan_directive_name(parser *yaml_parser_t, start_mark yaml_mark_t, name *[]byte) bool {
-	// Consume the directive name.
-	if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
-		return false
-	}
-
-	var s []byte
-	for is_alpha(parser.buffer, parser.buffer_pos) {
-		s = read(parser, s)
-		if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
-			return false
-		}
-	}
-
-	// Check if the name is empty.
-	if len(s) == 0 {
-		yaml_parser_set_scanner_error(parser, "while scanning a directive",
-			start_mark, "could not find expected directive name")
-		return false
-	}
-
-	// Check for an blank character after the name.
-	if !is_blankz(parser.buffer, parser.buffer_pos) {
-		yaml_parser_set_scanner_error(parser, "while scanning a directive",
-			start_mark, "found unexpected non-alphabetical character")
-		return false
-	}
-	*name = s
-	return true
-}
-
-// Scan the value of VERSION-DIRECTIVE.
-//
-// Scope:
-//      %YAML   1.1     # a comment \n
-//           ^^^^^^
-func yaml_parser_scan_version_directive_value(parser *yaml_parser_t, start_mark yaml_mark_t, major, minor *int8) bool {
-	// Eat whitespaces.
-	if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
-		return false
-	}
-	for is_blank(parser.buffer, parser.buffer_pos) {
-		skip(parser)
-		if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
-			return false
-		}
-	}
-
-	// Consume the major version number.
-	if !yaml_parser_scan_version_directive_number(parser, start_mark, major) {
-		return false
-	}
-
-	// Eat '.'.
-	if parser.buffer[parser.buffer_pos] != '.' {
-		return yaml_parser_set_scanner_error(parser, "while scanning a %YAML directive",
-			start_mark, "did not find expected digit or '.' character")
-	}
-
-	skip(parser)
-
-	// Consume the minor version number.
-	if !yaml_parser_scan_version_directive_number(parser, start_mark, minor) {
-		return false
-	}
-	return true
-}
-
-const max_number_length = 2
-
-// Scan the version number of VERSION-DIRECTIVE.
-//
-// Scope:
-//      %YAML   1.1     # a comment \n
-//              ^
-//      %YAML   1.1     # a comment \n
-//                ^
-func yaml_parser_scan_version_directive_number(parser *yaml_parser_t, start_mark yaml_mark_t, number *int8) bool {
-
-	// Repeat while the next character is digit.
-	if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
-		return false
-	}
-	var value, length int8
-	for is_digit(parser.buffer, parser.buffer_pos) {
-		// Check if the number is too long.
-		length++
-		if length > max_number_length {
-			return yaml_parser_set_scanner_error(parser, "while scanning a %YAML directive",
-				start_mark, "found extremely long version number")
-		}
-		value = value*10 + int8(as_digit(parser.buffer, parser.buffer_pos))
-		skip(parser)
-		if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
-			return false
-		}
-	}
-
-	// Check if the number was present.
-	if length == 0 {
-		return yaml_parser_set_scanner_error(parser, "while scanning a %YAML directive",
-			start_mark, "did not find expected version number")
-	}
-	*number = value
-	return true
-}
-
-// Scan the value of a TAG-DIRECTIVE token.
-//
-// Scope:
-//      %TAG    !yaml!  tag:yaml.org,2002:  \n
-//          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-//
-func yaml_parser_scan_tag_directive_value(parser *yaml_parser_t, start_mark yaml_mark_t, handle, prefix *[]byte) bool {
-	var handle_value, prefix_value []byte
-
-	// Eat whitespaces.
-	if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
-		return false
-	}
-
-	for is_blank(parser.buffer, parser.buffer_pos) {
-		skip(parser)
-		if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
-			return false
-		}
-	}
-
-	// Scan a handle.
-	if !yaml_parser_scan_tag_handle(parser, true, start_mark, &handle_value) {
-		return false
-	}
-
-	// Expect a whitespace.
-	if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
-		return false
-	}
-	if !is_blank(parser.buffer, parser.buffer_pos) {
-		yaml_parser_set_scanner_error(parser, "while scanning a %TAG directive",
-			start_mark, "did not find expected whitespace")
-		return false
-	}
-
-	// Eat whitespaces.
-	for is_blank(parser.buffer, parser.buffer_pos) {
-		skip(parser)
-		if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
-			return false
-		}
-	}
-
-	// Scan a prefix.
-	if !yaml_parser_scan_tag_uri(parser, true, nil, start_mark, &prefix_value) {
-		return false
-	}
-
-	// Expect a whitespace or line break.
-	if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
-		return false
-	}
-	if !is_blankz(parser.buffer, parser.buffer_pos) {
-		yaml_parser_set_scanner_error(parser, "while scanning a %TAG directive",
-			start_mark, "did not find expected whitespace or line break")
-		return false
-	}
-
-	*handle = handle_value
-	*prefix = prefix_value
-	return true
-}
-
-func yaml_parser_scan_anchor(parser *yaml_parser_t, token *yaml_token_t, typ yaml_token_type_t) bool {
-	var s []byte
-
-	// Eat the indicator character.
-	start_mark := parser.mark
-	skip(parser)
-
-	// Consume the value.
-	if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
-		return false
-	}
-
-	for is_alpha(parser.buffer, parser.buffer_pos) {
-		s = read(parser, s)
-		if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
-			return false
-		}
-	}
-
-	end_mark := parser.mark
-
-	/*
-	 * Check if length of the anchor is greater than 0 and it is followed by
-	 * a whitespace character or one of the indicators:
-	 *
-	 *      '?', ':', ',', ']', '}', '%', '@', '`'.
-	 */
-
-	if len(s) == 0 ||
-		!(is_blankz(parser.buffer, parser.buffer_pos) || parser.buffer[parser.buffer_pos] == '?' ||
-			parser.buffer[parser.buffer_pos] == ':' || parser.buffer[parser.buffer_pos] == ',' ||
-			parser.buffer[parser.buffer_pos] == ']' || parser.buffer[parser.buffer_pos] == '}' ||
-			parser.buffer[parser.buffer_pos] == '%' || parser.buffer[parser.buffer_pos] == '@' ||
-			parser.buffer[parser.buffer_pos] == '`') {
-		context := "while scanning an alias"
-		if typ == yaml_ANCHOR_TOKEN {
-			context = "while scanning an anchor"
-		}
-		yaml_parser_set_scanner_error(parser, context, start_mark,
-			"did not find expected alphabetic or numeric character")
-		return false
-	}
-
-	// Create a token.
-	*token = yaml_token_t{
-		typ:        typ,
-		start_mark: start_mark,
-		end_mark:   end_mark,
-		value:      s,
-	}
-
-	return true
-}
-
-/*
- * Scan a TAG token.
- */
-
-func yaml_parser_scan_tag(parser *yaml_parser_t, token *yaml_token_t) bool {
-	var handle, suffix []byte
-
-	start_mark := parser.mark
-
-	// Check if the tag is in the canonical form.
-	if parser.unread < 2 && !yaml_parser_update_buffer(parser, 2) {
-		return false
-	}
-
-	if parser.buffer[parser.buffer_pos+1] == '<' {
-		// Keep the handle as ''
-
-		// Eat '!<'
-		skip(parser)
-		skip(parser)
-
-		// Consume the tag value.
-		if !yaml_parser_scan_tag_uri(parser, false, nil, start_mark, &suffix) {
-			return false
-		}
-
-		// Check for '>' and eat it.
-		if parser.buffer[parser.buffer_pos] != '>' {
-			yaml_parser_set_scanner_error(parser, "while scanning a tag",
-				start_mark, "did not find the expected '>'")
-			return false
-		}
-
-		skip(parser)
-	} else {
-		// The tag has either the '!suffix' or the '!handle!suffix' form.
-
-		// First, try to scan a handle.
-		if !yaml_parser_scan_tag_handle(parser, false, start_mark, &handle) {
-			return false
-		}
-
-		// Check if it is, indeed, handle.
-		if handle[0] == '!' && len(handle) > 1 && handle[len(handle)-1] == '!' {
-			// Scan the suffix now.
-			if !yaml_parser_scan_tag_uri(parser, false, nil, start_mark, &suffix) {
-				return false
-			}
-		} else {
-			// It wasn't a handle after all.  Scan the rest of the tag.
-			if !yaml_parser_scan_tag_uri(parser, false, handle, start_mark, &suffix) {
-				return false
-			}
-
-			// Set the handle to '!'.
-			handle = []byte{'!'}
-
-			// A special case: the '!' tag.  Set the handle to '' and the
-			// suffix to '!'.
-			if len(suffix) == 0 {
-				handle, suffix = suffix, handle
-			}
-		}
-	}
-
-	// Check the character which ends the tag.
-	if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
-		return false
-	}
-	if !is_blankz(parser.buffer, parser.buffer_pos) {
-		yaml_parser_set_scanner_error(parser, "while scanning a tag",
-			start_mark, "did not find expected whitespace or line break")
-		return false
-	}
-
-	end_mark := parser.mark
-
-	// Create a token.
-	*token = yaml_token_t{
-		typ:        yaml_TAG_TOKEN,
-		start_mark: start_mark,
-		end_mark:   end_mark,
-		value:      handle,
-		suffix:     suffix,
-	}
-	return true
-}
-
-// Scan a tag handle.
-func yaml_parser_scan_tag_handle(parser *yaml_parser_t, directive bool, start_mark yaml_mark_t, handle *[]byte) bool {
-	// Check the initial '!' character.
-	if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
-		return false
-	}
-	if parser.buffer[parser.buffer_pos] != '!' {
-		yaml_parser_set_scanner_tag_error(parser, directive,
-			start_mark, "did not find expected '!'")
-		return false
-	}
-
-	var s []byte
-
-	// Copy the '!' character.
-	s = read(parser, s)
-
-	// Copy all subsequent alphabetical and numerical characters.
-	if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
-		return false
-	}
-	for is_alpha(parser.buffer, parser.buffer_pos) {
-		s = read(parser, s)
-		if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
-			return false
-		}
-	}
-
-	// Check if the trailing character is '!' and copy it.
-	if parser.buffer[parser.buffer_pos] == '!' {
-		s = read(parser, s)
-	} else {
-		// It's either the '!' tag or not really a tag handle.  If it's a %TAG
-		// directive, it's an error.  If it's a tag token, it must be a part of URI.
-		if directive && !(s[0] == '!' && s[1] == 0) {
-			yaml_parser_set_scanner_tag_error(parser, directive,
-				start_mark, "did not find expected '!'")
-			return false
-		}
-	}
-
-	*handle = s
-	return true
-}
-
-// Scan a tag.
-func yaml_parser_scan_tag_uri(parser *yaml_parser_t, directive bool, head []byte, start_mark yaml_mark_t, uri *[]byte) bool {
-	//size_t length = head ? strlen((char *)head) : 0
-	var s []byte
-
-	// Copy the head if needed.
-	//
-	// Note that we don't copy the leading '!' character.
-	if len(head) > 1 {
-		s = append(s, head[1:]...)
-	}
-
-	// Scan the tag.
-	if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
-		return false
-	}
-
-	// The set of characters that may appear in URI is as follows:
-	//
-	//      '0'-'9', 'A'-'Z', 'a'-'z', '_', '-', ';', '/', '?', ':', '@', '&',
-	//      '=', '+', '$', ',', '.', '!', '~', '*', '\'', '(', ')', '[', ']',
-	//      '%'.
-	// [Go] Convert this into more reasonable logic.
-	for is_alpha(parser.buffer, parser.buffer_pos) || parser.buffer[parser.buffer_pos] == ';' ||
-		parser.buffer[parser.buffer_pos] == '/' || parser.buffer[parser.buffer_pos] == '?' ||
-		parser.buffer[parser.buffer_pos] == ':' || parser.buffer[parser.buffer_pos] == '@' ||
-		parser.buffer[parser.buffer_pos] == '&' || parser.buffer[parser.buffer_pos] == '=' ||
-		parser.buffer[parser.buffer_pos] == '+' || parser.buffer[parser.buffer_pos] == '$' ||
-		parser.buffer[parser.buffer_pos] == ',' || parser.buffer[parser.buffer_pos] == '.' ||
-		parser.buffer[parser.buffer_pos] == '!' || parser.buffer[parser.buffer_pos] == '~' ||
-		parser.buffer[parser.buffer_pos] == '*' || parser.buffer[parser.buffer_pos] == '\'' ||
-		parser.buffer[parser.buffer_pos] == '(' || parser.buffer[parser.buffer_pos] == ')' ||
-		parser.buffer[parser.buffer_pos] == '[' || parser.buffer[parser.buffer_pos] == ']' ||
-		parser.buffer[parser.buffer_pos] == '%' {
-		// Check if it is a URI-escape sequence.
-		if parser.buffer[parser.buffer_pos] == '%' {
-			if !yaml_parser_scan_uri_escapes(parser, directive, start_mark, &s) {
-				return false
-			}
-		} else {
-			s = read(parser, s)
-		}
-		if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
-			return false
-		}
-	}
-
-	// Check if the tag is non-empty.
-	if len(s) == 0 {
-		yaml_parser_set_scanner_tag_error(parser, directive,
-			start_mark, "did not find expected tag URI")
-		return false
-	}
-	*uri = s
-	return true
-}
-
-// Decode an URI-escape sequence corresponding to a single UTF-8 character.
-func yaml_parser_scan_uri_escapes(parser *yaml_parser_t, directive bool, start_mark yaml_mark_t, s *[]byte) bool {
-
-	// Decode the required number of characters.
-	w := 1024
-	for w > 0 {
-		// Check for a URI-escaped octet.
-		if parser.unread < 3 && !yaml_parser_update_buffer(parser, 3) {
-			return false
-		}
-
-		if !(parser.buffer[parser.buffer_pos] == '%' &&
-			is_hex(parser.buffer, parser.buffer_pos+1) &&
-			is_hex(parser.buffer, parser.buffer_pos+2)) {
-			return yaml_parser_set_scanner_tag_error(parser, directive,
-				start_mark, "did not find URI escaped octet")
-		}
-
-		// Get the octet.
-		octet := byte((as_hex(parser.buffer, parser.buffer_pos+1) << 4) + as_hex(parser.buffer, parser.buffer_pos+2))
-
-		// If it is the leading octet, determine the length of the UTF-8 sequence.
-		if w == 1024 {
-			w = width(octet)
-			if w == 0 {
-				return yaml_parser_set_scanner_tag_error(parser, directive,
-					start_mark, "found an incorrect leading UTF-8 octet")
-			}
-		} else {
-			// Check if the trailing octet is correct.
-			if octet&0xC0 != 0x80 {
-				return yaml_parser_set_scanner_tag_error(parser, directive,
-					start_mark, "found an incorrect trailing UTF-8 octet")
-			}
-		}
-
-		// Copy the octet and move the pointers.
-		*s = append(*s, octet)
-		skip(parser)
-		skip(parser)
-		skip(parser)
-		w--
-	}
-	return true
-}
-
-// Scan a block scalar.
-func yaml_parser_scan_block_scalar(parser *yaml_parser_t, token *yaml_token_t, literal bool) bool {
-	// Eat the indicator '|' or '>'.
-	start_mark := parser.mark
-	skip(parser)
-
-	// Scan the additional block scalar indicators.
-	if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
-		return false
-	}
-
-	// Check for a chomping indicator.
-	var chomping, increment int
-	if parser.buffer[parser.buffer_pos] == '+' || parser.buffer[parser.buffer_pos] == '-' {
-		// Set the chomping method and eat the indicator.
-		if parser.buffer[parser.buffer_pos] == '+' {
-			chomping = +1
-		} else {
-			chomping = -1
-		}
-		skip(parser)
-
-		// Check for an indentation indicator.
-		if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
-			return false
-		}
-		if is_digit(parser.buffer, parser.buffer_pos) {
-			// Check that the intendation is greater than 0.
-			if parser.buffer[parser.buffer_pos] == '0' {
-				yaml_parser_set_scanner_error(parser, "while scanning a block scalar",
-					start_mark, "found an intendation indicator equal to 0")
-				return false
-			}
-
-			// Get the intendation level and eat the indicator.
-			increment = as_digit(parser.buffer, parser.buffer_pos)
-			skip(parser)
-		}
-
-	} else if is_digit(parser.buffer, parser.buffer_pos) {
-		// Do the same as above, but in the opposite order.
-
-		if parser.buffer[parser.buffer_pos] == '0' {
-			yaml_parser_set_scanner_error(parser, "while scanning a block scalar",
-				start_mark, "found an intendation indicator equal to 0")
-			return false
-		}
-		increment = as_digit(parser.buffer, parser.buffer_pos)
-		skip(parser)
-
-		if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
-			return false
-		}
-		if parser.buffer[parser.buffer_pos] == '+' || parser.buffer[parser.buffer_pos] == '-' {
-			if parser.buffer[parser.buffer_pos] == '+' {
-				chomping = +1
-			} else {
-				chomping = -1
-			}
-			skip(parser)
-		}
-	}
-
-	// Eat whitespaces and comments to the end of the line.
-	if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
-		return false
-	}
-	for is_blank(parser.buffer, parser.buffer_pos) {
-		skip(parser)
-		if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
-			return false
-		}
-	}
-	if parser.buffer[parser.buffer_pos] == '#' {
-		for !is_breakz(parser.buffer, parser.buffer_pos) {
-			skip(parser)
-			if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
-				return false
-			}
-		}
-	}
-
-	// Check if we are at the end of the line.
-	if !is_breakz(parser.buffer, parser.buffer_pos) {
-		yaml_parser_set_scanner_error(parser, "while scanning a block scalar",
-			start_mark, "did not find expected comment or line break")
-		return false
-	}
-
-	// Eat a line break.
-	if is_break(parser.buffer, parser.buffer_pos) {
-		if parser.unread < 2 && !yaml_parser_update_buffer(parser, 2) {
-			return false
-		}
-		skip_line(parser)
-	}
-
-	end_mark := parser.mark
-
-	// Set the intendation level if it was specified.
-	var indent int
-	if increment > 0 {
-		if parser.indent >= 0 {
-			indent = parser.indent + increment
-		} else {
-			indent = increment
-		}
-	}
-
-	// Scan the leading line breaks and determine the indentation level if needed.
-	var s, leading_break, trailing_breaks []byte
-	if !yaml_parser_scan_block_scalar_breaks(parser, &indent, &trailing_breaks, start_mark, &end_mark) {
-		return false
-	}
-
-	// Scan the block scalar content.
-	if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
-		return false
-	}
-	var leading_blank, trailing_blank bool
-	for parser.mark.column == indent && !is_z(parser.buffer, parser.buffer_pos) {
-		// We are at the beginning of a non-empty line.
-
-		// Is it a trailing whitespace?
-		trailing_blank = is_blank(parser.buffer, parser.buffer_pos)
-
-		// Check if we need to fold the leading line break.
-		if !literal && !leading_blank && !trailing_blank && len(leading_break) > 0 && leading_break[0] == '\n' {
-			// Do we need to join the lines by space?
-			if len(trailing_breaks) == 0 {
-				s = append(s, ' ')
-			}
-		} else {
-			s = append(s, leading_break...)
-		}
-		leading_break = leading_break[:0]
-
-		// Append the remaining line breaks.
-		s = append(s, trailing_breaks...)
-		trailing_breaks = trailing_breaks[:0]
-
-		// Is it a leading whitespace?
-		leading_blank = is_blank(parser.buffer, parser.buffer_pos)
-
-		// Consume the current line.
-		for !is_breakz(parser.buffer, parser.buffer_pos) {
-			s = read(parser, s)
-			if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
-				return false
-			}
-		}
-
-		// Consume the line break.
-		if parser.unread < 2 && !yaml_parser_update_buffer(parser, 2) {
-			return false
-		}
-
-		leading_break = read_line(parser, leading_break)
-
-		// Eat the following intendation spaces and line breaks.
-		if !yaml_parser_scan_block_scalar_breaks(parser, &indent, &trailing_breaks, start_mark, &end_mark) {
-			return false
-		}
-	}
-
-	// Chomp the tail.
-	if chomping != -1 {
-		s = append(s, leading_break...)
-	}
-	if chomping == 1 {
-		s = append(s, trailing_breaks...)
-	}
-
-	// Create a token.
-	*token = yaml_token_t{
-		typ:        yaml_SCALAR_TOKEN,
-		start_mark: start_mark,
-		end_mark:   end_mark,
-		value:      s,
-		style:      yaml_LITERAL_SCALAR_STYLE,
-	}
-	if !literal {
-		token.style = yaml_FOLDED_SCALAR_STYLE
-	}
-	return true
-}
-
-// Scan intendation spaces and line breaks for a block scalar.  Determine the
-// intendation level if needed.
-func yaml_parser_scan_block_scalar_breaks(parser *yaml_parser_t, indent *int, breaks *[]byte, start_mark yaml_mark_t, end_mark *yaml_mark_t) bool {
-	*end_mark = parser.mark
-
-	// Eat the intendation spaces and line breaks.
-	max_indent := 0
-	for {
-		// Eat the intendation spaces.
-		if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
-			return false
-		}
-		for (*indent == 0 || parser.mark.column < *indent) && is_space(parser.buffer, parser.buffer_pos) {
-			skip(parser)
-			if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
-				return false
-			}
-		}
-		if parser.mark.column > max_indent {
-			max_indent = parser.mark.column
-		}
-
-		// Check for a tab character messing the intendation.
-		if (*indent == 0 || parser.mark.column < *indent) && is_tab(parser.buffer, parser.buffer_pos) {
-			return yaml_parser_set_scanner_error(parser, "while scanning a block scalar",
-				start_mark, "found a tab character where an intendation space is expected")
-		}
-
-		// Have we found a non-empty line?
-		if !is_break(parser.buffer, parser.buffer_pos) {
-			break
-		}
-
-		// Consume the line break.
-		if parser.unread < 2 && !yaml_parser_update_buffer(parser, 2) {
-			return false
-		}
-		// [Go] Should really be returning breaks instead.
-		*breaks = read_line(parser, *breaks)
-		*end_mark = parser.mark
-	}
-
-	// Determine the indentation level if needed.
-	if *indent == 0 {
-		*indent = max_indent
-		if *indent < parser.indent+1 {
-			*indent = parser.indent + 1
-		}
-		if *indent < 1 {
-			*indent = 1
-		}
-	}
-	return true
-}
-
-// Scan a quoted scalar.
-func yaml_parser_scan_flow_scalar(parser *yaml_parser_t, token *yaml_token_t, single bool) bool {
-	// Eat the left quote.
-	start_mark := parser.mark
-	skip(parser)
-
-	// Consume the content of the quoted scalar.
-	var s, leading_break, trailing_breaks, whitespaces []byte
-	for {
-		// Check that there are no document indicators at the beginning of the line.
-		if parser.unread < 4 && !yaml_parser_update_buffer(parser, 4) {
-			return false
-		}
-
-		if parser.mark.column == 0 &&
-			((parser.buffer[parser.buffer_pos+0] == '-' &&
-				parser.buffer[parser.buffer_pos+1] == '-' &&
-				parser.buffer[parser.buffer_pos+2] == '-') ||
-				(parser.buffer[parser.buffer_pos+0] == '.' &&
-					parser.buffer[parser.buffer_pos+1] == '.' &&
-					parser.buffer[parser.buffer_pos+2] == '.')) &&
-			is_blankz(parser.buffer, parser.buffer_pos+3) {
-			yaml_parser_set_scanner_error(parser, "while scanning a quoted scalar",
-				start_mark, "found unexpected document indicator")
-			return false
-		}
-
-		// Check for EOF.
-		if is_z(parser.buffer, parser.buffer_pos) {
-			yaml_parser_set_scanner_error(parser, "while scanning a quoted scalar",
-				start_mark, "found unexpected end of stream")
-			return false
-		}
-
-		// Consume non-blank characters.
-		leading_blanks := false
-		for !is_blankz(parser.buffer, parser.buffer_pos) {
-			if single && parser.buffer[parser.buffer_pos] == '\'' && parser.buffer[parser.buffer_pos+1] == '\'' {
-				// Is is an escaped single quote.
-				s = append(s, '\'')
-				skip(parser)
-				skip(parser)
-
-			} else if single && parser.buffer[parser.buffer_pos] == '\'' {
-				// It is a right single quote.
-				break
-			} else if !single && parser.buffer[parser.buffer_pos] == '"' {
-				// It is a right double quote.
-				break
-
-			} else if !single && parser.buffer[parser.buffer_pos] == '\\' && is_break(parser.buffer, parser.buffer_pos+1) {
-				// It is an escaped line break.
-				if parser.unread < 3 && !yaml_parser_update_buffer(parser, 3) {
-					return false
-				}
-				skip(parser)
-				skip_line(parser)
-				leading_blanks = true
-				break
-
-			} else if !single && parser.buffer[parser.buffer_pos] == '\\' {
-				// It is an escape sequence.
-				code_length := 0
-
-				// Check the escape character.
-				switch parser.buffer[parser.buffer_pos+1] {
-				case '0':
-					s = append(s, 0)
-				case 'a':
-					s = append(s, '\x07')
-				case 'b':
-					s = append(s, '\x08')
-				case 't', '\t':
-					s = append(s, '\x09')
-				case 'n':
-					s = append(s, '\x0A')
-				case 'v':
-					s = append(s, '\x0B')
-				case 'f':
-					s = append(s, '\x0C')
-				case 'r':
-					s = append(s, '\x0D')
-				case 'e':
-					s = append(s, '\x1B')
-				case ' ':
-					s = append(s, '\x20')
-				case '"':
-					s = append(s, '"')
-				case '\'':
-					s = append(s, '\'')
-				case '\\':
-					s = append(s, '\\')
-				case 'N': // NEL (#x85)
-					s = append(s, '\xC2')
-					s = append(s, '\x85')
-				case '_': // #xA0
-					s = append(s, '\xC2')
-					s = append(s, '\xA0')
-				case 'L': // LS (#x2028)
-					s = append(s, '\xE2')
-					s = append(s, '\x80')
-					s = append(s, '\xA8')
-				case 'P': // PS (#x2029)
-					s = append(s, '\xE2')
-					s = append(s, '\x80')
-					s = append(s, '\xA9')
-				case 'x':
-					code_length = 2
-				case 'u':
-					code_length = 4
-				case 'U':
-					code_length = 8
-				default:
-					yaml_parser_set_scanner_error(parser, "while parsing a quoted scalar",
-						start_mark, "found unknown escape character")
-					return false
-				}
-
-				skip(parser)
-				skip(parser)
-
-				// Consume an arbitrary escape code.
-				if code_length > 0 {
-					var value int
-
-					// Scan the character value.
-					if parser.unread < code_length && !yaml_parser_update_buffer(parser, code_length) {
-						return false
-					}
-					for k := 0; k < code_length; k++ {
-						if !is_hex(parser.buffer, parser.buffer_pos+k) {
-							yaml_parser_set_scanner_error(parser, "while parsing a quoted scalar",
-								start_mark, "did not find expected hexdecimal number")
-							return false
-						}
-						value = (value << 4) + as_hex(parser.buffer, parser.buffer_pos+k)
-					}
-
-					// Check the value and write the character.
-					if (value >= 0xD800 && value <= 0xDFFF) || value > 0x10FFFF {
-						yaml_parser_set_scanner_error(parser, "while parsing a quoted scalar",
-							start_mark, "found invalid Unicode character escape code")
-						return false
-					}
-					if value <= 0x7F {
-						s = append(s, byte(value))
-					} else if value <= 0x7FF {
-						s = append(s, byte(0xC0+(value>>6)))
-						s = append(s, byte(0x80+(value&0x3F)))
-					} else if value <= 0xFFFF {
-						s = append(s, byte(0xE0+(value>>12)))
-						s = append(s, byte(0x80+((value>>6)&0x3F)))
-						s = append(s, byte(0x80+(value&0x3F)))
-					} else {
-						s = append(s, byte(0xF0+(value>>18)))
-						s = append(s, byte(0x80+((value>>12)&0x3F)))
-						s = append(s, byte(0x80+((value>>6)&0x3F)))
-						s = append(s, byte(0x80+(value&0x3F)))
-					}
-
-					// Advance the pointer.
-					for k := 0; k < code_length; k++ {
-						skip(parser)
-					}
-				}
-			} else {
-				// It is a non-escaped non-blank character.
-				s = read(parser, s)
-			}
-			if parser.unread < 2 && !yaml_parser_update_buffer(parser, 2) {
-				return false
-			}
-		}
-
-		// Check if we are at the end of the scalar.
-		if single {
-			if parser.buffer[parser.buffer_pos] == '\'' {
-				break
-			}
-		} else {
-			if parser.buffer[parser.buffer_pos] == '"' {
-				break
-			}
-		}
-
-		// Consume blank characters.
-		if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
-			return false
-		}
-
-		for is_blank(parser.buffer, parser.buffer_pos) || is_break(parser.buffer, parser.buffer_pos) {
-			if is_blank(parser.buffer, parser.buffer_pos) {
-				// Consume a space or a tab character.
-				if !leading_blanks {
-					whitespaces = read(parser, whitespaces)
-				} else {
-					skip(parser)
-				}
-			} else {
-				if parser.unread < 2 && !yaml_parser_update_buffer(parser, 2) {
-					return false
-				}
-
-				// Check if it is a first line break.
-				if !leading_blanks {
-					whitespaces = whitespaces[:0]
-					leading_break = read_line(parser, leading_break)
-					leading_blanks = true
-				} else {
-					trailing_breaks = read_line(parser, trailing_breaks)
-				}
-			}
-			if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
-				return false
-			}
-		}
-
-		// Join the whitespaces or fold line breaks.
-		if leading_blanks {
-			// Do we need to fold line breaks?
-			if len(leading_break) > 0 && leading_break[0] == '\n' {
-				if len(trailing_breaks) == 0 {
-					s = append(s, ' ')
-				} else {
-					s = append(s, trailing_breaks...)
-				}
-			} else {
-				s = append(s, leading_break...)
-				s = append(s, trailing_breaks...)
-			}
-			trailing_breaks = trailing_breaks[:0]
-			leading_break = leading_break[:0]
-		} else {
-			s = append(s, whitespaces...)
-			whitespaces = whitespaces[:0]
-		}
-	}
-
-	// Eat the right quote.
-	skip(parser)
-	end_mark := parser.mark
-
-	// Create a token.
-	*token = yaml_token_t{
-		typ:        yaml_SCALAR_TOKEN,
-		start_mark: start_mark,
-		end_mark:   end_mark,
-		value:      s,
-		style:      yaml_SINGLE_QUOTED_SCALAR_STYLE,
-	}
-	if !single {
-		token.style = yaml_DOUBLE_QUOTED_SCALAR_STYLE
-	}
-	return true
-}
-
-// Scan a plain scalar.
-func yaml_parser_scan_plain_scalar(parser *yaml_parser_t, token *yaml_token_t) bool {
-
-	var s, leading_break, trailing_breaks, whitespaces []byte
-	var leading_blanks bool
-	var indent = parser.indent + 1
-
-	start_mark := parser.mark
-	end_mark := parser.mark
-
-	// Consume the content of the plain scalar.
-	for {
-		// Check for a document indicator.
-		if parser.unread < 4 && !yaml_parser_update_buffer(parser, 4) {
-			return false
-		}
-		if parser.mark.column == 0 &&
-			((parser.buffer[parser.buffer_pos+0] == '-' &&
-				parser.buffer[parser.buffer_pos+1] == '-' &&
-				parser.buffer[parser.buffer_pos+2] == '-') ||
-				(parser.buffer[parser.buffer_pos+0] == '.' &&
-					parser.buffer[parser.buffer_pos+1] == '.' &&
-					parser.buffer[parser.buffer_pos+2] == '.')) &&
-			is_blankz(parser.buffer, parser.buffer_pos+3) {
-			break
-		}
-
-		// Check for a comment.
-		if parser.buffer[parser.buffer_pos] == '#' {
-			break
-		}
-
-		// Consume non-blank characters.
-		for !is_blankz(parser.buffer, parser.buffer_pos) {
-
-			// Check for 'x:x' in the flow context. TODO: Fix the test "spec-08-13".
-			if parser.flow_level > 0 &&
-				parser.buffer[parser.buffer_pos] == ':' &&
-				!is_blankz(parser.buffer, parser.buffer_pos+1) {
-				yaml_parser_set_scanner_error(parser, "while scanning a plain scalar",
-					start_mark, "found unexpected ':'")
-				return false
-			}
-
-			// Check for indicators that may end a plain scalar.
-			if (parser.buffer[parser.buffer_pos] == ':' && is_blankz(parser.buffer, parser.buffer_pos+1)) ||
-				(parser.flow_level > 0 &&
-					(parser.buffer[parser.buffer_pos] == ',' || parser.buffer[parser.buffer_pos] == ':' ||
-						parser.buffer[parser.buffer_pos] == '?' || parser.buffer[parser.buffer_pos] == '[' ||
-						parser.buffer[parser.buffer_pos] == ']' || parser.buffer[parser.buffer_pos] == '{' ||
-						parser.buffer[parser.buffer_pos] == '}')) {
-				break
-			}
-
-			// Check if we need to join whitespaces and breaks.
-			if leading_blanks || len(whitespaces) > 0 {
-				if leading_blanks {
-					// Do we need to fold line breaks?
-					if leading_break[0] == '\n' {
-						if len(trailing_breaks) == 0 {
-							s = append(s, ' ')
-						} else {
-							s = append(s, trailing_breaks...)
-						}
-					} else {
-						s = append(s, leading_break...)
-						s = append(s, trailing_breaks...)
-					}
-					trailing_breaks = trailing_breaks[:0]
-					leading_break = leading_break[:0]
-					leading_blanks = false
-				} else {
-					s = append(s, whitespaces...)
-					whitespaces = whitespaces[:0]
-				}
-			}
-
-			// Copy the character.
-			s = read(parser, s)
-
-			end_mark = parser.mark
-			if parser.unread < 2 && !yaml_parser_update_buffer(parser, 2) {
-				return false
-			}
-		}
-
-		// Is it the end?
-		if !(is_blank(parser.buffer, parser.buffer_pos) || is_break(parser.buffer, parser.buffer_pos)) {
-			break
-		}
-
-		// Consume blank characters.
-		if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
-			return false
-		}
-
-		for is_blank(parser.buffer, parser.buffer_pos) || is_break(parser.buffer, parser.buffer_pos) {
-			if is_blank(parser.buffer, parser.buffer_pos) {
-
-				// Check for tab character that abuse intendation.
-				if leading_blanks && parser.mark.column < indent && is_tab(parser.buffer, parser.buffer_pos) {
-					yaml_parser_set_scanner_error(parser, "while scanning a plain scalar",
-						start_mark, "found a tab character that violate intendation")
-					return false
-				}
-
-				// Consume a space or a tab character.
-				if !leading_blanks {
-					whitespaces = read(parser, whitespaces)
-				} else {
-					skip(parser)
-				}
-			} else {
-				if parser.unread < 2 && !yaml_parser_update_buffer(parser, 2) {
-					return false
-				}
-
-				// Check if it is a first line break.
-				if !leading_blanks {
-					whitespaces = whitespaces[:0]
-					leading_break = read_line(parser, leading_break)
-					leading_blanks = true
-				} else {
-					trailing_breaks = read_line(parser, trailing_breaks)
-				}
-			}
-			if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
-				return false
-			}
-		}
-
-		// Check intendation level.
-		if parser.flow_level == 0 && parser.mark.column < indent {
-			break
-		}
-	}
-
-	// Create a token.
-	*token = yaml_token_t{
-		typ:        yaml_SCALAR_TOKEN,
-		start_mark: start_mark,
-		end_mark:   end_mark,
-		value:      s,
-		style:      yaml_PLAIN_SCALAR_STYLE,
-	}
-
-	// Note that we change the 'simple_key_allowed' flag.
-	if leading_blanks {
-		parser.simple_key_allowed = true
-	}
-	return true
-}
diff --git a/Godeps/_workspace/src/gopkg.in/yaml.v2/sorter.go b/Godeps/_workspace/src/gopkg.in/yaml.v2/sorter.go
deleted file mode 100644
index 5958822f9..000000000
--- a/Godeps/_workspace/src/gopkg.in/yaml.v2/sorter.go
+++ /dev/null
@@ -1,104 +0,0 @@
-package yaml
-
-import (
-	"reflect"
-	"unicode"
-)
-
-type keyList []reflect.Value
-
-func (l keyList) Len() int      { return len(l) }
-func (l keyList) Swap(i, j int) { l[i], l[j] = l[j], l[i] }
-func (l keyList) Less(i, j int) bool {
-	a := l[i]
-	b := l[j]
-	ak := a.Kind()
-	bk := b.Kind()
-	for (ak == reflect.Interface || ak == reflect.Ptr) && !a.IsNil() {
-		a = a.Elem()
-		ak = a.Kind()
-	}
-	for (bk == reflect.Interface || bk == reflect.Ptr) && !b.IsNil() {
-		b = b.Elem()
-		bk = b.Kind()
-	}
-	af, aok := keyFloat(a)
-	bf, bok := keyFloat(b)
-	if aok && bok {
-		if af != bf {
-			return af < bf
-		}
-		if ak != bk {
-			return ak < bk
-		}
-		return numLess(a, b)
-	}
-	if ak != reflect.String || bk != reflect.String {
-		return ak < bk
-	}
-	ar, br := []rune(a.String()), []rune(b.String())
-	for i := 0; i < len(ar) && i < len(br); i++ {
-		if ar[i] == br[i] {
-			continue
-		}
-		al := unicode.IsLetter(ar[i])
-		bl := unicode.IsLetter(br[i])
-		if al && bl {
-			return ar[i] < br[i]
-		}
-		if al || bl {
-			return bl
-		}
-		var ai, bi int
-		var an, bn int64
-		for ai = i; ai < len(ar) && unicode.IsDigit(ar[ai]); ai++ {
-			an = an*10 + int64(ar[ai]-'0')
-		}
-		for bi = i; bi < len(br) && unicode.IsDigit(br[bi]); bi++ {
-			bn = bn*10 + int64(br[bi]-'0')
-		}
-		if an != bn {
-			return an < bn
-		}
-		if ai != bi {
-			return ai < bi
-		}
-		return ar[i] < br[i]
-	}
-	return len(ar) < len(br)
-}
-
-// keyFloat returns a float value for v if it is a number/bool
-// and whether it is a number/bool or not.
-func keyFloat(v reflect.Value) (f float64, ok bool) {
-	switch v.Kind() {
-	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
-		return float64(v.Int()), true
-	case reflect.Float32, reflect.Float64:
-		return v.Float(), true
-	case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uintptr:
-		return float64(v.Uint()), true
-	case reflect.Bool:
-		if v.Bool() {
-			return 1, true
-		}
-		return 0, true
-	}
-	return 0, false
-}
-
-// numLess returns whether a < b.
-// a and b must necessarily have the same kind.
-func numLess(a, b reflect.Value) bool {
-	switch a.Kind() {
-	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
-		return a.Int() < b.Int()
-	case reflect.Float32, reflect.Float64:
-		return a.Float() < b.Float()
-	case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uintptr:
-		return a.Uint() < b.Uint()
-	case reflect.Bool:
-		return !a.Bool() && b.Bool()
-	}
-	panic("not a number")
-}
diff --git a/Godeps/_workspace/src/gopkg.in/yaml.v2/writerc.go b/Godeps/_workspace/src/gopkg.in/yaml.v2/writerc.go
deleted file mode 100644
index 190362f25..000000000
--- a/Godeps/_workspace/src/gopkg.in/yaml.v2/writerc.go
+++ /dev/null
@@ -1,89 +0,0 @@
-package yaml
-
-// Set the writer error and return false.
-func yaml_emitter_set_writer_error(emitter *yaml_emitter_t, problem string) bool {
-	emitter.error = yaml_WRITER_ERROR
-	emitter.problem = problem
-	return false
-}
-
-// Flush the output buffer.
-func yaml_emitter_flush(emitter *yaml_emitter_t) bool {
-	if emitter.write_handler == nil {
-		panic("write handler not set")
-	}
-
-	// Check if the buffer is empty.
-	if emitter.buffer_pos == 0 {
-		return true
-	}
-
-	// If the output encoding is UTF-8, we don't need to recode the buffer.
-	if emitter.encoding == yaml_UTF8_ENCODING {
-		if err := emitter.write_handler(emitter, emitter.buffer[:emitter.buffer_pos]); err != nil {
-			return yaml_emitter_set_writer_error(emitter, "write error: "+err.Error())
-		}
-		emitter.buffer_pos = 0
-		return true
-	}
-
-	// Recode the buffer into the raw buffer.
-	var low, high int
-	if emitter.encoding == yaml_UTF16LE_ENCODING {
-		low, high = 0, 1
-	} else {
-		high, low = 1, 0
-	}
-
-	pos := 0
-	for pos < emitter.buffer_pos {
-		// See the "reader.c" code for more details on UTF-8 encoding.  Note
-		// that we assume that the buffer contains a valid UTF-8 sequence.
-
-		// Read the next UTF-8 character.
-		octet := emitter.buffer[pos]
-
-		var w int
-		var value rune
-		switch {
-		case octet&0x80 == 0x00:
-			w, value = 1, rune(octet&0x7F)
-		case octet&0xE0 == 0xC0:
-			w, value = 2, rune(octet&0x1F)
-		case octet&0xF0 == 0xE0:
-			w, value = 3, rune(octet&0x0F)
-		case octet&0xF8 == 0xF0:
-			w, value = 4, rune(octet&0x07)
-		}
-		for k := 1; k < w; k++ {
-			octet = emitter.buffer[pos+k]
-			value = (value << 6) + (rune(octet) & 0x3F)
-		}
-		pos += w
-
-		// Write the character.
-		if value < 0x10000 {
-			var b [2]byte
-			b[high] = byte(value >> 8)
-			b[low] = byte(value & 0xFF)
-			emitter.raw_buffer = append(emitter.raw_buffer, b[0], b[1])
-		} else {
-			// Write the character using a surrogate pair (check "reader.c").
-			var b [4]byte
-			value -= 0x10000
-			b[high] = byte(0xD8 + (value >> 18))
-			b[low] = byte((value >> 10) & 0xFF)
-			b[high+2] = byte(0xDC + ((value >> 8) & 0xFF))
-			b[low+2] = byte(value & 0xFF)
-			emitter.raw_buffer = append(emitter.raw_buffer, b[0], b[1], b[2], b[3])
-		}
-	}
-
-	// Write the raw buffer.
-	if err := emitter.write_handler(emitter, emitter.raw_buffer); err != nil {
-		return yaml_emitter_set_writer_error(emitter, "write error: "+err.Error())
-	}
-	emitter.buffer_pos = 0
-	emitter.raw_buffer = emitter.raw_buffer[:0]
-	return true
-}
diff --git a/Godeps/_workspace/src/gopkg.in/yaml.v2/yaml.go b/Godeps/_workspace/src/gopkg.in/yaml.v2/yaml.go
deleted file mode 100644
index d133edf9d..000000000
--- a/Godeps/_workspace/src/gopkg.in/yaml.v2/yaml.go
+++ /dev/null
@@ -1,346 +0,0 @@
-// Package yaml implements YAML support for the Go language.
-//
-// Source code and other details for the project are available at GitHub:
-//
-//   https://github.com/go-yaml/yaml
-//
-package yaml
-
-import (
-	"errors"
-	"fmt"
-	"reflect"
-	"strings"
-	"sync"
-)
-
-// MapSlice encodes and decodes as a YAML map.
-// The order of keys is preserved when encoding and decoding.
-type MapSlice []MapItem
-
-// MapItem is an item in a MapSlice.
-type MapItem struct {
-	Key, Value interface{}
-}
-
-// The Unmarshaler interface may be implemented by types to customize their
-// behavior when being unmarshaled from a YAML document. The UnmarshalYAML
-// method receives a function that may be called to unmarshal the original
-// YAML value into a field or variable. It is safe to call the unmarshal
-// function parameter more than once if necessary.
-type Unmarshaler interface {
-	UnmarshalYAML(unmarshal func(interface{}) error) error
-}
-
-// The Marshaler interface may be implemented by types to customize their
-// behavior when being marshaled into a YAML document. The returned value
-// is marshaled in place of the original value implementing Marshaler.
-//
-// If an error is returned by MarshalYAML, the marshaling procedure stops
-// and returns with the provided error.
-type Marshaler interface {
-	MarshalYAML() (interface{}, error)
-}
-
-// Unmarshal decodes the first document found within the in byte slice
-// and assigns decoded values into the out value.
-//
-// Maps and pointers (to a struct, string, int, etc) are accepted as out
-// values. If an internal pointer within a struct is not initialized,
-// the yaml package will initialize it if necessary for unmarshalling
-// the provided data. The out parameter must not be nil.
-//
-// The type of the decoded values should be compatible with the respective
-// values in out. If one or more values cannot be decoded due to a type
-// mismatches, decoding continues partially until the end of the YAML
-// content, and a *yaml.TypeError is returned with details for all
-// missed values.
-//
-// Struct fields are only unmarshalled if they are exported (have an
-// upper case first letter), and are unmarshalled using the field name
-// lowercased as the default key. Custom keys may be defined via the
-// "yaml" name in the field tag: the content preceding the first comma
-// is used as the key, and the following comma-separated options are
-// used to tweak the marshalling process (see Marshal).
-// Conflicting names result in a runtime error.
-//
-// For example:
-//
-//     type T struct {
-//         F int `yaml:"a,omitempty"`
-//         B int
-//     }
-//     var t T
-//     yaml.Unmarshal([]byte("a: 1\nb: 2"), &t)
-//
-// See the documentation of Marshal for the format of tags and a list of
-// supported tag options.
-//
-func Unmarshal(in []byte, out interface{}) (err error) {
-	defer handleErr(&err)
-	d := newDecoder()
-	p := newParser(in)
-	defer p.destroy()
-	node := p.parse()
-	if node != nil {
-		v := reflect.ValueOf(out)
-		if v.Kind() == reflect.Ptr && !v.IsNil() {
-			v = v.Elem()
-		}
-		d.unmarshal(node, v)
-	}
-	if len(d.terrors) > 0 {
-		return &TypeError{d.terrors}
-	}
-	return nil
-}
-
-// Marshal serializes the value provided into a YAML document. The structure
-// of the generated document will reflect the structure of the value itself.
-// Maps and pointers (to struct, string, int, etc) are accepted as the in value.
-//
-// Struct fields are only unmarshalled if they are exported (have an upper case
-// first letter), and are unmarshalled using the field name lowercased as the
-// default key. Custom keys may be defined via the "yaml" name in the field
-// tag: the content preceding the first comma is used as the key, and the
-// following comma-separated options are used to tweak the marshalling process.
-// Conflicting names result in a runtime error.
-//
-// The field tag format accepted is:
-//
-//     `(...) yaml:"[<key>][,<flag1>[,<flag2>]]" (...)`
-//
-// The following flags are currently supported:
-//
-//     omitempty    Only include the field if it's not set to the zero
-//                  value for the type or to empty slices or maps.
-//                  Does not apply to zero valued structs.
-//
-//     flow         Marshal using a flow style (useful for structs,
-//                  sequences and maps).
-//
-//     inline       Inline the field, which must be a struct or a map,
-//                  causing all of its fields or keys to be processed as if
-//                  they were part of the outer struct. For maps, keys must
-//                  not conflict with the yaml keys of other struct fields.
-//
-// In addition, if the key is "-", the field is ignored.
-//
-// For example:
-//
-//     type T struct {
-//         F int "a,omitempty"
-//         B int
-//     }
-//     yaml.Marshal(&T{B: 2}) // Returns "b: 2\n"
-//     yaml.Marshal(&T{F: 1}} // Returns "a: 1\nb: 0\n"
-//
-func Marshal(in interface{}) (out []byte, err error) {
-	defer handleErr(&err)
-	e := newEncoder()
-	defer e.destroy()
-	e.marshal("", reflect.ValueOf(in))
-	e.finish()
-	out = e.out
-	return
-}
-
-func handleErr(err *error) {
-	if v := recover(); v != nil {
-		if e, ok := v.(yamlError); ok {
-			*err = e.err
-		} else {
-			panic(v)
-		}
-	}
-}
-
-type yamlError struct {
-	err error
-}
-
-func fail(err error) {
-	panic(yamlError{err})
-}
-
-func failf(format string, args ...interface{}) {
-	panic(yamlError{fmt.Errorf("yaml: "+format, args...)})
-}
-
-// A TypeError is returned by Unmarshal when one or more fields in
-// the YAML document cannot be properly decoded into the requested
-// types. When this error is returned, the value is still
-// unmarshaled partially.
-type TypeError struct {
-	Errors []string
-}
-
-func (e *TypeError) Error() string {
-	return fmt.Sprintf("yaml: unmarshal errors:\n  %s", strings.Join(e.Errors, "\n  "))
-}
-
-// --------------------------------------------------------------------------
-// Maintain a mapping of keys to structure field indexes
-
-// The code in this section was copied from mgo/bson.
-
-// structInfo holds details for the serialization of fields of
-// a given struct.
-type structInfo struct {
-	FieldsMap  map[string]fieldInfo
-	FieldsList []fieldInfo
-
-	// InlineMap is the number of the field in the struct that
-	// contains an ,inline map, or -1 if there's none.
-	InlineMap int
-}
-
-type fieldInfo struct {
-	Key       string
-	Num       int
-	OmitEmpty bool
-	Flow      bool
-
-	// Inline holds the field index if the field is part of an inlined struct.
-	Inline []int
-}
-
-var structMap = make(map[reflect.Type]*structInfo)
-var fieldMapMutex sync.RWMutex
-
-func getStructInfo(st reflect.Type) (*structInfo, error) {
-	fieldMapMutex.RLock()
-	sinfo, found := structMap[st]
-	fieldMapMutex.RUnlock()
-	if found {
-		return sinfo, nil
-	}
-
-	n := st.NumField()
-	fieldsMap := make(map[string]fieldInfo)
-	fieldsList := make([]fieldInfo, 0, n)
-	inlineMap := -1
-	for i := 0; i != n; i++ {
-		field := st.Field(i)
-		if field.PkgPath != "" {
-			continue // Private field
-		}
-
-		info := fieldInfo{Num: i}
-
-		tag := field.Tag.Get("yaml")
-		if tag == "" && strings.Index(string(field.Tag), ":") < 0 {
-			tag = string(field.Tag)
-		}
-		if tag == "-" {
-			continue
-		}
-
-		inline := false
-		fields := strings.Split(tag, ",")
-		if len(fields) > 1 {
-			for _, flag := range fields[1:] {
-				switch flag {
-				case "omitempty":
-					info.OmitEmpty = true
-				case "flow":
-					info.Flow = true
-				case "inline":
-					inline = true
-				default:
-					return nil, errors.New(fmt.Sprintf("Unsupported flag %q in tag %q of type %s", flag, tag, st))
-				}
-			}
-			tag = fields[0]
-		}
-
-		if inline {
-			switch field.Type.Kind() {
-			case reflect.Map:
-				if inlineMap >= 0 {
-					return nil, errors.New("Multiple ,inline maps in struct " + st.String())
-				}
-				if field.Type.Key() != reflect.TypeOf("") {
-					return nil, errors.New("Option ,inline needs a map with string keys in struct " + st.String())
-				}
-				inlineMap = info.Num
-			case reflect.Struct:
-				sinfo, err := getStructInfo(field.Type)
-				if err != nil {
-					return nil, err
-				}
-				for _, finfo := range sinfo.FieldsList {
-					if _, found := fieldsMap[finfo.Key]; found {
-						msg := "Duplicated key '" + finfo.Key + "' in struct " + st.String()
-						return nil, errors.New(msg)
-					}
-					if finfo.Inline == nil {
-						finfo.Inline = []int{i, finfo.Num}
-					} else {
-						finfo.Inline = append([]int{i}, finfo.Inline...)
-					}
-					fieldsMap[finfo.Key] = finfo
-					fieldsList = append(fieldsList, finfo)
-				}
-			default:
-				//return nil, errors.New("Option ,inline needs a struct value or map field")
-				return nil, errors.New("Option ,inline needs a struct value field")
-			}
-			continue
-		}
-
-		if tag != "" {
-			info.Key = tag
-		} else {
-			info.Key = strings.ToLower(field.Name)
-		}
-
-		if _, found = fieldsMap[info.Key]; found {
-			msg := "Duplicated key '" + info.Key + "' in struct " + st.String()
-			return nil, errors.New(msg)
-		}
-
-		fieldsList = append(fieldsList, info)
-		fieldsMap[info.Key] = info
-	}
-
-	sinfo = &structInfo{fieldsMap, fieldsList, inlineMap}
-
-	fieldMapMutex.Lock()
-	structMap[st] = sinfo
-	fieldMapMutex.Unlock()
-	return sinfo, nil
-}
-
-func isZero(v reflect.Value) bool {
-	switch v.Kind() {
-	case reflect.String:
-		return len(v.String()) == 0
-	case reflect.Interface, reflect.Ptr:
-		return v.IsNil()
-	case reflect.Slice:
-		return v.Len() == 0
-	case reflect.Map:
-		return v.Len() == 0
-	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
-		return v.Int() == 0
-	case reflect.Float32, reflect.Float64:
-		return v.Float() == 0
-	case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uintptr:
-		return v.Uint() == 0
-	case reflect.Bool:
-		return !v.Bool()
-	case reflect.Struct:
-		vt := v.Type()
-		for i := v.NumField() - 1; i >= 0; i-- {
-			if vt.Field(i).PkgPath != "" {
-				continue // Private field
-			}
-			if !isZero(v.Field(i)) {
-				return false
-			}
-		}
-		return true
-	}
-	return false
-}
diff --git a/Godeps/_workspace/src/gopkg.in/yaml.v2/yamlh.go b/Godeps/_workspace/src/gopkg.in/yaml.v2/yamlh.go
deleted file mode 100644
index d60a6b6b0..000000000
--- a/Godeps/_workspace/src/gopkg.in/yaml.v2/yamlh.go
+++ /dev/null
@@ -1,716 +0,0 @@
-package yaml
-
-import (
-	"io"
-)
-
-// The version directive data.
-type yaml_version_directive_t struct {
-	major int8 // The major version number.
-	minor int8 // The minor version number.
-}
-
-// The tag directive data.
-type yaml_tag_directive_t struct {
-	handle []byte // The tag handle.
-	prefix []byte // The tag prefix.
-}
-
-type yaml_encoding_t int
-
-// The stream encoding.
-const (
-	// Let the parser choose the encoding.
-	yaml_ANY_ENCODING yaml_encoding_t = iota
-
-	yaml_UTF8_ENCODING    // The default UTF-8 encoding.
-	yaml_UTF16LE_ENCODING // The UTF-16-LE encoding with BOM.
-	yaml_UTF16BE_ENCODING // The UTF-16-BE encoding with BOM.
-)
-
-type yaml_break_t int
-
-// Line break types.
-const (
-	// Let the parser choose the break type.
-	yaml_ANY_BREAK yaml_break_t = iota
-
-	yaml_CR_BREAK   // Use CR for line breaks (Mac style).
-	yaml_LN_BREAK   // Use LN for line breaks (Unix style).
-	yaml_CRLN_BREAK // Use CR LN for line breaks (DOS style).
-)
-
-type yaml_error_type_t int
-
-// Many bad things could happen with the parser and emitter.
-const (
-	// No error is produced.
-	yaml_NO_ERROR yaml_error_type_t = iota
-
-	yaml_MEMORY_ERROR   // Cannot allocate or reallocate a block of memory.
-	yaml_READER_ERROR   // Cannot read or decode the input stream.
-	yaml_SCANNER_ERROR  // Cannot scan the input stream.
-	yaml_PARSER_ERROR   // Cannot parse the input stream.
-	yaml_COMPOSER_ERROR // Cannot compose a YAML document.
-	yaml_WRITER_ERROR   // Cannot write to the output stream.
-	yaml_EMITTER_ERROR  // Cannot emit a YAML stream.
-)
-
-// The pointer position.
-type yaml_mark_t struct {
-	index  int // The position index.
-	line   int // The position line.
-	column int // The position column.
-}
-
-// Node Styles
-
-type yaml_style_t int8
-
-type yaml_scalar_style_t yaml_style_t
-
-// Scalar styles.
-const (
-	// Let the emitter choose the style.
-	yaml_ANY_SCALAR_STYLE yaml_scalar_style_t = iota
-
-	yaml_PLAIN_SCALAR_STYLE         // The plain scalar style.
-	yaml_SINGLE_QUOTED_SCALAR_STYLE // The single-quoted scalar style.
-	yaml_DOUBLE_QUOTED_SCALAR_STYLE // The double-quoted scalar style.
-	yaml_LITERAL_SCALAR_STYLE       // The literal scalar style.
-	yaml_FOLDED_SCALAR_STYLE        // The folded scalar style.
-)
-
-type yaml_sequence_style_t yaml_style_t
-
-// Sequence styles.
-const (
-	// Let the emitter choose the style.
-	yaml_ANY_SEQUENCE_STYLE yaml_sequence_style_t = iota
-
-	yaml_BLOCK_SEQUENCE_STYLE // The block sequence style.
-	yaml_FLOW_SEQUENCE_STYLE  // The flow sequence style.
-)
-
-type yaml_mapping_style_t yaml_style_t
-
-// Mapping styles.
-const (
-	// Let the emitter choose the style.
-	yaml_ANY_MAPPING_STYLE yaml_mapping_style_t = iota
-
-	yaml_BLOCK_MAPPING_STYLE // The block mapping style.
-	yaml_FLOW_MAPPING_STYLE  // The flow mapping style.
-)
-
-// Tokens
-
-type yaml_token_type_t int
-
-// Token types.
-const (
-	// An empty token.
-	yaml_NO_TOKEN yaml_token_type_t = iota
-
-	yaml_STREAM_START_TOKEN // A STREAM-START token.
-	yaml_STREAM_END_TOKEN   // A STREAM-END token.
-
-	yaml_VERSION_DIRECTIVE_TOKEN // A VERSION-DIRECTIVE token.
-	yaml_TAG_DIRECTIVE_TOKEN     // A TAG-DIRECTIVE token.
-	yaml_DOCUMENT_START_TOKEN    // A DOCUMENT-START token.
-	yaml_DOCUMENT_END_TOKEN      // A DOCUMENT-END token.
-
-	yaml_BLOCK_SEQUENCE_START_TOKEN // A BLOCK-SEQUENCE-START token.
-	yaml_BLOCK_MAPPING_START_TOKEN  // A BLOCK-SEQUENCE-END token.
-	yaml_BLOCK_END_TOKEN            // A BLOCK-END token.
-
-	yaml_FLOW_SEQUENCE_START_TOKEN // A FLOW-SEQUENCE-START token.
-	yaml_FLOW_SEQUENCE_END_TOKEN   // A FLOW-SEQUENCE-END token.
-	yaml_FLOW_MAPPING_START_TOKEN  // A FLOW-MAPPING-START token.
-	yaml_FLOW_MAPPING_END_TOKEN    // A FLOW-MAPPING-END token.
-
-	yaml_BLOCK_ENTRY_TOKEN // A BLOCK-ENTRY token.
-	yaml_FLOW_ENTRY_TOKEN  // A FLOW-ENTRY token.
-	yaml_KEY_TOKEN         // A KEY token.
-	yaml_VALUE_TOKEN       // A VALUE token.
-
-	yaml_ALIAS_TOKEN  // An ALIAS token.
-	yaml_ANCHOR_TOKEN // An ANCHOR token.
-	yaml_TAG_TOKEN    // A TAG token.
-	yaml_SCALAR_TOKEN // A SCALAR token.
-)
-
-func (tt yaml_token_type_t) String() string {
-	switch tt {
-	case yaml_NO_TOKEN:
-		return "yaml_NO_TOKEN"
-	case yaml_STREAM_START_TOKEN:
-		return "yaml_STREAM_START_TOKEN"
-	case yaml_STREAM_END_TOKEN:
-		return "yaml_STREAM_END_TOKEN"
-	case yaml_VERSION_DIRECTIVE_TOKEN:
-		return "yaml_VERSION_DIRECTIVE_TOKEN"
-	case yaml_TAG_DIRECTIVE_TOKEN:
-		return "yaml_TAG_DIRECTIVE_TOKEN"
-	case yaml_DOCUMENT_START_TOKEN:
-		return "yaml_DOCUMENT_START_TOKEN"
-	case yaml_DOCUMENT_END_TOKEN:
-		return "yaml_DOCUMENT_END_TOKEN"
-	case yaml_BLOCK_SEQUENCE_START_TOKEN:
-		return "yaml_BLOCK_SEQUENCE_START_TOKEN"
-	case yaml_BLOCK_MAPPING_START_TOKEN:
-		return "yaml_BLOCK_MAPPING_START_TOKEN"
-	case yaml_BLOCK_END_TOKEN:
-		return "yaml_BLOCK_END_TOKEN"
-	case yaml_FLOW_SEQUENCE_START_TOKEN:
-		return "yaml_FLOW_SEQUENCE_START_TOKEN"
-	case yaml_FLOW_SEQUENCE_END_TOKEN:
-		return "yaml_FLOW_SEQUENCE_END_TOKEN"
-	case yaml_FLOW_MAPPING_START_TOKEN:
-		return "yaml_FLOW_MAPPING_START_TOKEN"
-	case yaml_FLOW_MAPPING_END_TOKEN:
-		return "yaml_FLOW_MAPPING_END_TOKEN"
-	case yaml_BLOCK_ENTRY_TOKEN:
-		return "yaml_BLOCK_ENTRY_TOKEN"
-	case yaml_FLOW_ENTRY_TOKEN:
-		return "yaml_FLOW_ENTRY_TOKEN"
-	case yaml_KEY_TOKEN:
-		return "yaml_KEY_TOKEN"
-	case yaml_VALUE_TOKEN:
-		return "yaml_VALUE_TOKEN"
-	case yaml_ALIAS_TOKEN:
-		return "yaml_ALIAS_TOKEN"
-	case yaml_ANCHOR_TOKEN:
-		return "yaml_ANCHOR_TOKEN"
-	case yaml_TAG_TOKEN:
-		return "yaml_TAG_TOKEN"
-	case yaml_SCALAR_TOKEN:
-		return "yaml_SCALAR_TOKEN"
-	}
-	return "<unknown token>"
-}
-
-// The token structure.
-type yaml_token_t struct {
-	// The token type.
-	typ yaml_token_type_t
-
-	// The start/end of the token.
-	start_mark, end_mark yaml_mark_t
-
-	// The stream encoding (for yaml_STREAM_START_TOKEN).
-	encoding yaml_encoding_t
-
-	// The alias/anchor/scalar value or tag/tag directive handle
-	// (for yaml_ALIAS_TOKEN, yaml_ANCHOR_TOKEN, yaml_SCALAR_TOKEN, yaml_TAG_TOKEN, yaml_TAG_DIRECTIVE_TOKEN).
-	value []byte
-
-	// The tag suffix (for yaml_TAG_TOKEN).
-	suffix []byte
-
-	// The tag directive prefix (for yaml_TAG_DIRECTIVE_TOKEN).
-	prefix []byte
-
-	// The scalar style (for yaml_SCALAR_TOKEN).
-	style yaml_scalar_style_t
-
-	// The version directive major/minor (for yaml_VERSION_DIRECTIVE_TOKEN).
-	major, minor int8
-}
-
-// Events
-
-type yaml_event_type_t int8
-
-// Event types.
-const (
-	// An empty event.
-	yaml_NO_EVENT yaml_event_type_t = iota
-
-	yaml_STREAM_START_EVENT   // A STREAM-START event.
-	yaml_STREAM_END_EVENT     // A STREAM-END event.
-	yaml_DOCUMENT_START_EVENT // A DOCUMENT-START event.
-	yaml_DOCUMENT_END_EVENT   // A DOCUMENT-END event.
-	yaml_ALIAS_EVENT          // An ALIAS event.
-	yaml_SCALAR_EVENT         // A SCALAR event.
-	yaml_SEQUENCE_START_EVENT // A SEQUENCE-START event.
-	yaml_SEQUENCE_END_EVENT   // A SEQUENCE-END event.
-	yaml_MAPPING_START_EVENT  // A MAPPING-START event.
-	yaml_MAPPING_END_EVENT    // A MAPPING-END event.
-)
-
-// The event structure.
-type yaml_event_t struct {
-
-	// The event type.
-	typ yaml_event_type_t
-
-	// The start and end of the event.
-	start_mark, end_mark yaml_mark_t
-
-	// The document encoding (for yaml_STREAM_START_EVENT).
-	encoding yaml_encoding_t
-
-	// The version directive (for yaml_DOCUMENT_START_EVENT).
-	version_directive *yaml_version_directive_t
-
-	// The list of tag directives (for yaml_DOCUMENT_START_EVENT).
-	tag_directives []yaml_tag_directive_t
-
-	// The anchor (for yaml_SCALAR_EVENT, yaml_SEQUENCE_START_EVENT, yaml_MAPPING_START_EVENT, yaml_ALIAS_EVENT).
-	anchor []byte
-
-	// The tag (for yaml_SCALAR_EVENT, yaml_SEQUENCE_START_EVENT, yaml_MAPPING_START_EVENT).
-	tag []byte
-
-	// The scalar value (for yaml_SCALAR_EVENT).
-	value []byte
-
-	// Is the document start/end indicator implicit, or the tag optional?
-	// (for yaml_DOCUMENT_START_EVENT, yaml_DOCUMENT_END_EVENT, yaml_SEQUENCE_START_EVENT, yaml_MAPPING_START_EVENT, yaml_SCALAR_EVENT).
-	implicit bool
-
-	// Is the tag optional for any non-plain style? (for yaml_SCALAR_EVENT).
-	quoted_implicit bool
-
-	// The style (for yaml_SCALAR_EVENT, yaml_SEQUENCE_START_EVENT, yaml_MAPPING_START_EVENT).
-	style yaml_style_t
-}
-
-func (e *yaml_event_t) scalar_style() yaml_scalar_style_t     { return yaml_scalar_style_t(e.style) }
-func (e *yaml_event_t) sequence_style() yaml_sequence_style_t { return yaml_sequence_style_t(e.style) }
-func (e *yaml_event_t) mapping_style() yaml_mapping_style_t   { return yaml_mapping_style_t(e.style) }
-
-// Nodes
-
-const (
-	yaml_NULL_TAG      = "tag:yaml.org,2002:null"      // The tag !!null with the only possible value: null.
-	yaml_BOOL_TAG      = "tag:yaml.org,2002:bool"      // The tag !!bool with the values: true and false.
-	yaml_STR_TAG       = "tag:yaml.org,2002:str"       // The tag !!str for string values.
-	yaml_INT_TAG       = "tag:yaml.org,2002:int"       // The tag !!int for integer values.
-	yaml_FLOAT_TAG     = "tag:yaml.org,2002:float"     // The tag !!float for float values.
-	yaml_TIMESTAMP_TAG = "tag:yaml.org,2002:timestamp" // The tag !!timestamp for date and time values.
-
-	yaml_SEQ_TAG = "tag:yaml.org,2002:seq" // The tag !!seq is used to denote sequences.
-	yaml_MAP_TAG = "tag:yaml.org,2002:map" // The tag !!map is used to denote mapping.
-
-	// Not in original libyaml.
-	yaml_BINARY_TAG = "tag:yaml.org,2002:binary"
-	yaml_MERGE_TAG  = "tag:yaml.org,2002:merge"
-
-	yaml_DEFAULT_SCALAR_TAG   = yaml_STR_TAG // The default scalar tag is !!str.
-	yaml_DEFAULT_SEQUENCE_TAG = yaml_SEQ_TAG // The default sequence tag is !!seq.
-	yaml_DEFAULT_MAPPING_TAG  = yaml_MAP_TAG // The default mapping tag is !!map.
-)
-
-type yaml_node_type_t int
-
-// Node types.
-const (
-	// An empty node.
-	yaml_NO_NODE yaml_node_type_t = iota
-
-	yaml_SCALAR_NODE   // A scalar node.
-	yaml_SEQUENCE_NODE // A sequence node.
-	yaml_MAPPING_NODE  // A mapping node.
-)
-
-// An element of a sequence node.
-type yaml_node_item_t int
-
-// An element of a mapping node.
-type yaml_node_pair_t struct {
-	key   int // The key of the element.
-	value int // The value of the element.
-}
-
-// The node structure.
-type yaml_node_t struct {
-	typ yaml_node_type_t // The node type.
-	tag []byte           // The node tag.
-
-	// The node data.
-
-	// The scalar parameters (for yaml_SCALAR_NODE).
-	scalar struct {
-		value  []byte              // The scalar value.
-		length int                 // The length of the scalar value.
-		style  yaml_scalar_style_t // The scalar style.
-	}
-
-	// The sequence parameters (for YAML_SEQUENCE_NODE).
-	sequence struct {
-		items_data []yaml_node_item_t    // The stack of sequence items.
-		style      yaml_sequence_style_t // The sequence style.
-	}
-
-	// The mapping parameters (for yaml_MAPPING_NODE).
-	mapping struct {
-		pairs_data  []yaml_node_pair_t   // The stack of mapping pairs (key, value).
-		pairs_start *yaml_node_pair_t    // The beginning of the stack.
-		pairs_end   *yaml_node_pair_t    // The end of the stack.
-		pairs_top   *yaml_node_pair_t    // The top of the stack.
-		style       yaml_mapping_style_t // The mapping style.
-	}
-
-	start_mark yaml_mark_t // The beginning of the node.
-	end_mark   yaml_mark_t // The end of the node.
-
-}
-
-// The document structure.
-type yaml_document_t struct {
-
-	// The document nodes.
-	nodes []yaml_node_t
-
-	// The version directive.
-	version_directive *yaml_version_directive_t
-
-	// The list of tag directives.
-	tag_directives_data  []yaml_tag_directive_t
-	tag_directives_start int // The beginning of the tag directives list.
-	tag_directives_end   int // The end of the tag directives list.
-
-	start_implicit int // Is the document start indicator implicit?
-	end_implicit   int // Is the document end indicator implicit?
-
-	// The start/end of the document.
-	start_mark, end_mark yaml_mark_t
-}
-
-// The prototype of a read handler.
-//
-// The read handler is called when the parser needs to read more bytes from the
-// source. The handler should write not more than size bytes to the buffer.
-// The number of written bytes should be set to the size_read variable.
-//
-// [in,out]   data        A pointer to an application data specified by
-//                        yaml_parser_set_input().
-// [out]      buffer      The buffer to write the data from the source.
-// [in]       size        The size of the buffer.
-// [out]      size_read   The actual number of bytes read from the source.
-//
-// On success, the handler should return 1.  If the handler failed,
-// the returned value should be 0. On EOF, the handler should set the
-// size_read to 0 and return 1.
-type yaml_read_handler_t func(parser *yaml_parser_t, buffer []byte) (n int, err error)
-
-// This structure holds information about a potential simple key.
-type yaml_simple_key_t struct {
-	possible     bool        // Is a simple key possible?
-	required     bool        // Is a simple key required?
-	token_number int         // The number of the token.
-	mark         yaml_mark_t // The position mark.
-}
-
-// The states of the parser.
-type yaml_parser_state_t int
-
-const (
-	yaml_PARSE_STREAM_START_STATE yaml_parser_state_t = iota
-
-	yaml_PARSE_IMPLICIT_DOCUMENT_START_STATE           // Expect the beginning of an implicit document.
-	yaml_PARSE_DOCUMENT_START_STATE                    // Expect DOCUMENT-START.
-	yaml_PARSE_DOCUMENT_CONTENT_STATE                  // Expect the content of a document.
-	yaml_PARSE_DOCUMENT_END_STATE                      // Expect DOCUMENT-END.
-	yaml_PARSE_BLOCK_NODE_STATE                        // Expect a block node.
-	yaml_PARSE_BLOCK_NODE_OR_INDENTLESS_SEQUENCE_STATE // Expect a block node or indentless sequence.
-	yaml_PARSE_FLOW_NODE_STATE                         // Expect a flow node.
-	yaml_PARSE_BLOCK_SEQUENCE_FIRST_ENTRY_STATE        // Expect the first entry of a block sequence.
-	yaml_PARSE_BLOCK_SEQUENCE_ENTRY_STATE              // Expect an entry of a block sequence.
-	yaml_PARSE_INDENTLESS_SEQUENCE_ENTRY_STATE         // Expect an entry of an indentless sequence.
-	yaml_PARSE_BLOCK_MAPPING_FIRST_KEY_STATE           // Expect the first key of a block mapping.
-	yaml_PARSE_BLOCK_MAPPING_KEY_STATE                 // Expect a block mapping key.
-	yaml_PARSE_BLOCK_MAPPING_VALUE_STATE               // Expect a block mapping value.
-	yaml_PARSE_FLOW_SEQUENCE_FIRST_ENTRY_STATE         // Expect the first entry of a flow sequence.
-	yaml_PARSE_FLOW_SEQUENCE_ENTRY_STATE               // Expect an entry of a flow sequence.
-	yaml_PARSE_FLOW_SEQUENCE_ENTRY_MAPPING_KEY_STATE   // Expect a key of an ordered mapping.
-	yaml_PARSE_FLOW_SEQUENCE_ENTRY_MAPPING_VALUE_STATE // Expect a value of an ordered mapping.
-	yaml_PARSE_FLOW_SEQUENCE_ENTRY_MAPPING_END_STATE   // Expect the and of an ordered mapping entry.
-	yaml_PARSE_FLOW_MAPPING_FIRST_KEY_STATE            // Expect the first key of a flow mapping.
-	yaml_PARSE_FLOW_MAPPING_KEY_STATE                  // Expect a key of a flow mapping.
-	yaml_PARSE_FLOW_MAPPING_VALUE_STATE                // Expect a value of a flow mapping.
-	yaml_PARSE_FLOW_MAPPING_EMPTY_VALUE_STATE          // Expect an empty value of a flow mapping.
-	yaml_PARSE_END_STATE                               // Expect nothing.
-)
-
-func (ps yaml_parser_state_t) String() string {
-	switch ps {
-	case yaml_PARSE_STREAM_START_STATE:
-		return "yaml_PARSE_STREAM_START_STATE"
-	case yaml_PARSE_IMPLICIT_DOCUMENT_START_STATE:
-		return "yaml_PARSE_IMPLICIT_DOCUMENT_START_STATE"
-	case yaml_PARSE_DOCUMENT_START_STATE:
-		return "yaml_PARSE_DOCUMENT_START_STATE"
-	case yaml_PARSE_DOCUMENT_CONTENT_STATE:
-		return "yaml_PARSE_DOCUMENT_CONTENT_STATE"
-	case yaml_PARSE_DOCUMENT_END_STATE:
-		return "yaml_PARSE_DOCUMENT_END_STATE"
-	case yaml_PARSE_BLOCK_NODE_STATE:
-		return "yaml_PARSE_BLOCK_NODE_STATE"
-	case yaml_PARSE_BLOCK_NODE_OR_INDENTLESS_SEQUENCE_STATE:
-		return "yaml_PARSE_BLOCK_NODE_OR_INDENTLESS_SEQUENCE_STATE"
-	case yaml_PARSE_FLOW_NODE_STATE:
-		return "yaml_PARSE_FLOW_NODE_STATE"
-	case yaml_PARSE_BLOCK_SEQUENCE_FIRST_ENTRY_STATE:
-		return "yaml_PARSE_BLOCK_SEQUENCE_FIRST_ENTRY_STATE"
-	case yaml_PARSE_BLOCK_SEQUENCE_ENTRY_STATE:
-		return "yaml_PARSE_BLOCK_SEQUENCE_ENTRY_STATE"
-	case yaml_PARSE_INDENTLESS_SEQUENCE_ENTRY_STATE:
-		return "yaml_PARSE_INDENTLESS_SEQUENCE_ENTRY_STATE"
-	case yaml_PARSE_BLOCK_MAPPING_FIRST_KEY_STATE:
-		return "yaml_PARSE_BLOCK_MAPPING_FIRST_KEY_STATE"
-	case yaml_PARSE_BLOCK_MAPPING_KEY_STATE:
-		return "yaml_PARSE_BLOCK_MAPPING_KEY_STATE"
-	case yaml_PARSE_BLOCK_MAPPING_VALUE_STATE:
-		return "yaml_PARSE_BLOCK_MAPPING_VALUE_STATE"
-	case yaml_PARSE_FLOW_SEQUENCE_FIRST_ENTRY_STATE:
-		return "yaml_PARSE_FLOW_SEQUENCE_FIRST_ENTRY_STATE"
-	case yaml_PARSE_FLOW_SEQUENCE_ENTRY_STATE:
-		return "yaml_PARSE_FLOW_SEQUENCE_ENTRY_STATE"
-	case yaml_PARSE_FLOW_SEQUENCE_ENTRY_MAPPING_KEY_STATE:
-		return "yaml_PARSE_FLOW_SEQUENCE_ENTRY_MAPPING_KEY_STATE"
-	case yaml_PARSE_FLOW_SEQUENCE_ENTRY_MAPPING_VALUE_STATE:
-		return "yaml_PARSE_FLOW_SEQUENCE_ENTRY_MAPPING_VALUE_STATE"
-	case yaml_PARSE_FLOW_SEQUENCE_ENTRY_MAPPING_END_STATE:
-		return "yaml_PARSE_FLOW_SEQUENCE_ENTRY_MAPPING_END_STATE"
-	case yaml_PARSE_FLOW_MAPPING_FIRST_KEY_STATE:
-		return "yaml_PARSE_FLOW_MAPPING_FIRST_KEY_STATE"
-	case yaml_PARSE_FLOW_MAPPING_KEY_STATE:
-		return "yaml_PARSE_FLOW_MAPPING_KEY_STATE"
-	case yaml_PARSE_FLOW_MAPPING_VALUE_STATE:
-		return "yaml_PARSE_FLOW_MAPPING_VALUE_STATE"
-	case yaml_PARSE_FLOW_MAPPING_EMPTY_VALUE_STATE:
-		return "yaml_PARSE_FLOW_MAPPING_EMPTY_VALUE_STATE"
-	case yaml_PARSE_END_STATE:
-		return "yaml_PARSE_END_STATE"
-	}
-	return "<unknown parser state>"
-}
-
-// This structure holds aliases data.
-type yaml_alias_data_t struct {
-	anchor []byte      // The anchor.
-	index  int         // The node id.
-	mark   yaml_mark_t // The anchor mark.
-}
-
-// The parser structure.
-//
-// All members are internal. Manage the structure using the
-// yaml_parser_ family of functions.
-type yaml_parser_t struct {
-
-	// Error handling
-
-	error yaml_error_type_t // Error type.
-
-	problem string // Error description.
-
-	// The byte about which the problem occured.
-	problem_offset int
-	problem_value  int
-	problem_mark   yaml_mark_t
-
-	// The error context.
-	context      string
-	context_mark yaml_mark_t
-
-	// Reader stuff
-
-	read_handler yaml_read_handler_t // Read handler.
-
-	input_file io.Reader // File input data.
-	input      []byte    // String input data.
-	input_pos  int
-
-	eof bool // EOF flag
-
-	buffer     []byte // The working buffer.
-	buffer_pos int    // The current position of the buffer.
-
-	unread int // The number of unread characters in the buffer.
-
-	raw_buffer     []byte // The raw buffer.
-	raw_buffer_pos int    // The current position of the buffer.
-
-	encoding yaml_encoding_t // The input encoding.
-
-	offset int         // The offset of the current position (in bytes).
-	mark   yaml_mark_t // The mark of the current position.
-
-	// Scanner stuff
-
-	stream_start_produced bool // Have we started to scan the input stream?
-	stream_end_produced   bool // Have we reached the end of the input stream?
-
-	flow_level int // The number of unclosed '[' and '{' indicators.
-
-	tokens          []yaml_token_t // The tokens queue.
-	tokens_head     int            // The head of the tokens queue.
-	tokens_parsed   int            // The number of tokens fetched from the queue.
-	token_available bool           // Does the tokens queue contain a token ready for dequeueing.
-
-	indent  int   // The current indentation level.
-	indents []int // The indentation levels stack.
-
-	simple_key_allowed bool                // May a simple key occur at the current position?
-	simple_keys        []yaml_simple_key_t // The stack of simple keys.
-
-	// Parser stuff
-
-	state          yaml_parser_state_t    // The current parser state.
-	states         []yaml_parser_state_t  // The parser states stack.
-	marks          []yaml_mark_t          // The stack of marks.
-	tag_directives []yaml_tag_directive_t // The list of TAG directives.
-
-	// Dumper stuff
-
-	aliases []yaml_alias_data_t // The alias data.
-
-	document *yaml_document_t // The currently parsed document.
-}
-
-// Emitter Definitions
-
-// The prototype of a write handler.
-//
-// The write handler is called when the emitter needs to flush the accumulated
-// characters to the output.  The handler should write @a size bytes of the
-// @a buffer to the output.
-//
-// @param[in,out]   data        A pointer to an application data specified by
-//                              yaml_emitter_set_output().
-// @param[in]       buffer      The buffer with bytes to be written.
-// @param[in]       size        The size of the buffer.
-//
-// @returns On success, the handler should return @c 1.  If the handler failed,
-// the returned value should be @c 0.
-//
-type yaml_write_handler_t func(emitter *yaml_emitter_t, buffer []byte) error
-
-type yaml_emitter_state_t int
-
-// The emitter states.
-const (
-	// Expect STREAM-START.
-	yaml_EMIT_STREAM_START_STATE yaml_emitter_state_t = iota
-
-	yaml_EMIT_FIRST_DOCUMENT_START_STATE       // Expect the first DOCUMENT-START or STREAM-END.
-	yaml_EMIT_DOCUMENT_START_STATE             // Expect DOCUMENT-START or STREAM-END.
-	yaml_EMIT_DOCUMENT_CONTENT_STATE           // Expect the content of a document.
-	yaml_EMIT_DOCUMENT_END_STATE               // Expect DOCUMENT-END.
-	yaml_EMIT_FLOW_SEQUENCE_FIRST_ITEM_STATE   // Expect the first item of a flow sequence.
-	yaml_EMIT_FLOW_SEQUENCE_ITEM_STATE         // Expect an item of a flow sequence.
-	yaml_EMIT_FLOW_MAPPING_FIRST_KEY_STATE     // Expect the first key of a flow mapping.
-	yaml_EMIT_FLOW_MAPPING_KEY_STATE           // Expect a key of a flow mapping.
-	yaml_EMIT_FLOW_MAPPING_SIMPLE_VALUE_STATE  // Expect a value for a simple key of a flow mapping.
-	yaml_EMIT_FLOW_MAPPING_VALUE_STATE         // Expect a value of a flow mapping.
-	yaml_EMIT_BLOCK_SEQUENCE_FIRST_ITEM_STATE  // Expect the first item of a block sequence.
-	yaml_EMIT_BLOCK_SEQUENCE_ITEM_STATE        // Expect an item of a block sequence.
-	yaml_EMIT_BLOCK_MAPPING_FIRST_KEY_STATE    // Expect the first key of a block mapping.
-	yaml_EMIT_BLOCK_MAPPING_KEY_STATE          // Expect the key of a block mapping.
-	yaml_EMIT_BLOCK_MAPPING_SIMPLE_VALUE_STATE // Expect a value for a simple key of a block mapping.
-	yaml_EMIT_BLOCK_MAPPING_VALUE_STATE        // Expect a value of a block mapping.
-	yaml_EMIT_END_STATE                        // Expect nothing.
-)
-
-// The emitter structure.
-//
-// All members are internal.  Manage the structure using the @c yaml_emitter_
-// family of functions.
-type yaml_emitter_t struct {
-
-	// Error handling
-
-	error   yaml_error_type_t // Error type.
-	problem string            // Error description.
-
-	// Writer stuff
-
-	write_handler yaml_write_handler_t // Write handler.
-
-	output_buffer *[]byte   // String output data.
-	output_file   io.Writer // File output data.
-
-	buffer     []byte // The working buffer.
-	buffer_pos int    // The current position of the buffer.
-
-	raw_buffer     []byte // The raw buffer.
-	raw_buffer_pos int    // The current position of the buffer.
-
-	encoding yaml_encoding_t // The stream encoding.
-
-	// Emitter stuff
-
-	canonical   bool         // If the output is in the canonical style?
-	best_indent int          // The number of indentation spaces.
-	best_width  int          // The preferred width of the output lines.
-	unicode     bool         // Allow unescaped non-ASCII characters?
-	line_break  yaml_break_t // The preferred line break.
-
-	state  yaml_emitter_state_t   // The current emitter state.
-	states []yaml_emitter_state_t // The stack of states.
-
-	events      []yaml_event_t // The event queue.
-	events_head int            // The head of the event queue.
-
-	indents []int // The stack of indentation levels.
-
-	tag_directives []yaml_tag_directive_t // The list of tag directives.
-
-	indent int // The current indentation level.
-
-	flow_level int // The current flow level.
-
-	root_context       bool // Is it the document root context?
-	sequence_context   bool // Is it a sequence context?
-	mapping_context    bool // Is it a mapping context?
-	simple_key_context bool // Is it a simple mapping key context?
-
-	line       int  // The current line.
-	column     int  // The current column.
-	whitespace bool // If the last character was a whitespace?
-	indention  bool // If the last character was an indentation character (' ', '-', '?', ':')?
-	open_ended bool // If an explicit document end is required?
-
-	// Anchor analysis.
-	anchor_data struct {
-		anchor []byte // The anchor value.
-		alias  bool   // Is it an alias?
-	}
-
-	// Tag analysis.
-	tag_data struct {
-		handle []byte // The tag handle.
-		suffix []byte // The tag suffix.
-	}
-
-	// Scalar analysis.
-	scalar_data struct {
-		value                 []byte              // The scalar value.
-		multiline             bool                // Does the scalar contain line breaks?
-		flow_plain_allowed    bool                // Can the scalar be expessed in the flow plain style?
-		block_plain_allowed   bool                // Can the scalar be expressed in the block plain style?
-		single_quoted_allowed bool                // Can the scalar be expressed in the single quoted style?
-		block_allowed         bool                // Can the scalar be expressed in the literal or folded styles?
-		style                 yaml_scalar_style_t // The output style.
-	}
-
-	// Dumper stuff
-
-	opened bool // If the stream was already opened?
-	closed bool // If the stream was already closed?
-
-	// The information associated with the document nodes.
-	anchors *struct {
-		references int  // The number of references.
-		anchor     int  // The anchor id.
-		serialized bool // If the node has been emitted?
-	}
-
-	last_anchor_id int // The last assigned anchor id.
-
-	document *yaml_document_t // The currently emitted document.
-}
diff --git a/Godeps/_workspace/src/gopkg.in/yaml.v2/yamlprivateh.go b/Godeps/_workspace/src/gopkg.in/yaml.v2/yamlprivateh.go
deleted file mode 100644
index 8110ce3c3..000000000
--- a/Godeps/_workspace/src/gopkg.in/yaml.v2/yamlprivateh.go
+++ /dev/null
@@ -1,173 +0,0 @@
-package yaml
-
-const (
-	// The size of the input raw buffer.
-	input_raw_buffer_size = 512
-
-	// The size of the input buffer.
-	// It should be possible to decode the whole raw buffer.
-	input_buffer_size = input_raw_buffer_size * 3
-
-	// The size of the output buffer.
-	output_buffer_size = 128
-
-	// The size of the output raw buffer.
-	// It should be possible to encode the whole output buffer.
-	output_raw_buffer_size = (output_buffer_size*2 + 2)
-
-	// The size of other stacks and queues.
-	initial_stack_size  = 16
-	initial_queue_size  = 16
-	initial_string_size = 16
-)
-
-// Check if the character at the specified position is an alphabetical
-// character, a digit, '_', or '-'.
-func is_alpha(b []byte, i int) bool {
-	return b[i] >= '0' && b[i] <= '9' || b[i] >= 'A' && b[i] <= 'Z' || b[i] >= 'a' && b[i] <= 'z' || b[i] == '_' || b[i] == '-'
-}
-
-// Check if the character at the specified position is a digit.
-func is_digit(b []byte, i int) bool {
-	return b[i] >= '0' && b[i] <= '9'
-}
-
-// Get the value of a digit.
-func as_digit(b []byte, i int) int {
-	return int(b[i]) - '0'
-}
-
-// Check if the character at the specified position is a hex-digit.
-func is_hex(b []byte, i int) bool {
-	return b[i] >= '0' && b[i] <= '9' || b[i] >= 'A' && b[i] <= 'F' || b[i] >= 'a' && b[i] <= 'f'
-}
-
-// Get the value of a hex-digit.
-func as_hex(b []byte, i int) int {
-	bi := b[i]
-	if bi >= 'A' && bi <= 'F' {
-		return int(bi) - 'A' + 10
-	}
-	if bi >= 'a' && bi <= 'f' {
-		return int(bi) - 'a' + 10
-	}
-	return int(bi) - '0'
-}
-
-// Check if the character is ASCII.
-func is_ascii(b []byte, i int) bool {
-	return b[i] <= 0x7F
-}
-
-// Check if the character at the start of the buffer can be printed unescaped.
-func is_printable(b []byte, i int) bool {
-	return ((b[i] == 0x0A) || // . == #x0A
-		(b[i] >= 0x20 && b[i] <= 0x7E) || // #x20 <= . <= #x7E
-		(b[i] == 0xC2 && b[i+1] >= 0xA0) || // #0xA0 <= . <= #xD7FF
-		(b[i] > 0xC2 && b[i] < 0xED) ||
-		(b[i] == 0xED && b[i+1] < 0xA0) ||
-		(b[i] == 0xEE) ||
-		(b[i] == 0xEF && // #xE000 <= . <= #xFFFD
-			!(b[i+1] == 0xBB && b[i+2] == 0xBF) && // && . != #xFEFF
-			!(b[i+1] == 0xBF && (b[i+2] == 0xBE || b[i+2] == 0xBF))))
-}
-
-// Check if the character at the specified position is NUL.
-func is_z(b []byte, i int) bool {
-	return b[i] == 0x00
-}
-
-// Check if the beginning of the buffer is a BOM.
-func is_bom(b []byte, i int) bool {
-	return b[0] == 0xEF && b[1] == 0xBB && b[2] == 0xBF
-}
-
-// Check if the character at the specified position is space.
-func is_space(b []byte, i int) bool {
-	return b[i] == ' '
-}
-
-// Check if the character at the specified position is tab.
-func is_tab(b []byte, i int) bool {
-	return b[i] == '\t'
-}
-
-// Check if the character at the specified position is blank (space or tab).
-func is_blank(b []byte, i int) bool {
-	//return is_space(b, i) || is_tab(b, i)
-	return b[i] == ' ' || b[i] == '\t'
-}
-
-// Check if the character at the specified position is a line break.
-func is_break(b []byte, i int) bool {
-	return (b[i] == '\r' || // CR (#xD)
-		b[i] == '\n' || // LF (#xA)
-		b[i] == 0xC2 && b[i+1] == 0x85 || // NEL (#x85)
-		b[i] == 0xE2 && b[i+1] == 0x80 && b[i+2] == 0xA8 || // LS (#x2028)
-		b[i] == 0xE2 && b[i+1] == 0x80 && b[i+2] == 0xA9) // PS (#x2029)
-}
-
-func is_crlf(b []byte, i int) bool {
-	return b[i] == '\r' && b[i+1] == '\n'
-}
-
-// Check if the character is a line break or NUL.
-func is_breakz(b []byte, i int) bool {
-	//return is_break(b, i) || is_z(b, i)
-	return (        // is_break:
-	b[i] == '\r' || // CR (#xD)
-		b[i] == '\n' || // LF (#xA)
-		b[i] == 0xC2 && b[i+1] == 0x85 || // NEL (#x85)
-		b[i] == 0xE2 && b[i+1] == 0x80 && b[i+2] == 0xA8 || // LS (#x2028)
-		b[i] == 0xE2 && b[i+1] == 0x80 && b[i+2] == 0xA9 || // PS (#x2029)
-		// is_z:
-		b[i] == 0)
-}
-
-// Check if the character is a line break, space, or NUL.
-func is_spacez(b []byte, i int) bool {
-	//return is_space(b, i) || is_breakz(b, i)
-	return ( // is_space:
-	b[i] == ' ' ||
-		// is_breakz:
-		b[i] == '\r' || // CR (#xD)
-		b[i] == '\n' || // LF (#xA)
-		b[i] == 0xC2 && b[i+1] == 0x85 || // NEL (#x85)
-		b[i] == 0xE2 && b[i+1] == 0x80 && b[i+2] == 0xA8 || // LS (#x2028)
-		b[i] == 0xE2 && b[i+1] == 0x80 && b[i+2] == 0xA9 || // PS (#x2029)
-		b[i] == 0)
-}
-
-// Check if the character is a line break, space, tab, or NUL.
-func is_blankz(b []byte, i int) bool {
-	//return is_blank(b, i) || is_breakz(b, i)
-	return ( // is_blank:
-	b[i] == ' ' || b[i] == '\t' ||
-		// is_breakz:
-		b[i] == '\r' || // CR (#xD)
-		b[i] == '\n' || // LF (#xA)
-		b[i] == 0xC2 && b[i+1] == 0x85 || // NEL (#x85)
-		b[i] == 0xE2 && b[i+1] == 0x80 && b[i+2] == 0xA8 || // LS (#x2028)
-		b[i] == 0xE2 && b[i+1] == 0x80 && b[i+2] == 0xA9 || // PS (#x2029)
-		b[i] == 0)
-}
-
-// Determine the width of the character.
-func width(b byte) int {
-	// Don't replace these by a switch without first
-	// confirming that it is being inlined.
-	if b&0x80 == 0x00 {
-		return 1
-	}
-	if b&0xE0 == 0xC0 {
-		return 2
-	}
-	if b&0xF0 == 0xE0 {
-		return 3
-	}
-	if b&0xF8 == 0xF0 {
-		return 4
-	}
-	return 0
-
-}